Merge new symbian4 packages, adds mw/qttranslations.
--- a/symbian2/single/job_props.ant.xml Wed May 05 12:21:47 2010 +0100
+++ b/symbian2/single/job_props.ant.xml Tue Jul 13 12:21:44 2010 +0100
@@ -29,9 +29,9 @@
<!-- and set sf.spec.baseline.enable to 'true' -->
<!-- get full source env and binaries from pdk -->
- <property name="sf.spec.baseline.location" value="\\v800008\Builds01\Releases\${sf.previous.pdk.tag}" />
+ <property name="sf.spec.baseline.location" value="\\v800008\PDT\prebuilt_default.22_custom" />
- <property name="sf.spec.toolsbaseline.location" value="\\v800008\Builds01\PDT\PDT_1.2" /> <!-- for TEF etc -->
+ <property name="sf.spec.toolsbaseline.location" value="\\v800008\Builds01\Releases\${sf.previous.pdk.tag}_custom" /> <!-- for TEF etc -->
<!-- platform build specific properties -->
<property name="sf.spec.s60.sysdef.clean.configurations.list" value="S60_5_1_sf" />
--- a/symbian2/single/job_refs.ant.xml Wed May 05 12:21:47 2010 +0100
+++ b/symbian2/single/job_refs.ant.xml Tue Jul 13 12:21:44 2010 +0100
@@ -3,16 +3,10 @@
<project name="SF-JOB-REFS">
<!-- For a combined model GT+S60, sf.spec.os.system.definition.files must be used -->
-<path id="sf.spec.os.system.definition.files">
- <fileset dir="${sf.project.location}/" casesensitive="false">
- <include name="sysdefs/system_model.xml" />
+ <path id="sf.spec.os.system.definition.files">
+ <fileset dir="${sf.spec.systemdefinition.location}/" casesensitive="false">
+ <include name="${sf.spec.systemdefinition.filename}" />
</fileset>
- </path>
-
- <path id="sf.spec.s60.system.definition.files">
- <fileset dir="${sf.project.location}/" casesensitive="false">
- <include name="sysdefs/system_model_s60.xml" />
- </fileset>
- </path>
+ </path>
</project>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian2/single/public_override_props.ant.xml Tue Jul 13 12:21:44 2010 +0100
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+
+<project name="SF-PUBLIC-PROPS">
+
+ <dirname property="sf.spec.job.dir" file="${ant.file.SF-PUBLIC-PROPS}"/>
+ <property name="sf.suppress.buildenv.check" value="true" />
+ <property name="sf.suppress.drive.space.check" value="true" />
+ <property name="sf.drive.space.needed" value="40G"/>
+ <property name="sf.spec.job.drive" value="M:"/>
+
+ <!-- unpack prebuilt binaries and bom? if so from where? -->
+ <property name="sf.spec.baseline.enable" value="true" />
+ <property name="sf.spec.baseline.location" value="D:\PDK_3.0.i_download" />
+ <property name="sf.spec.baseline.getenv_options" value="-i emu -i prebuilt -i info -k" />
+
+ <!-- unpack tools? if so, from same location as baseline? -->
+ <property name="sf.spec.toolsbaseline.enable" value="true" />
+ <property name="sf.spec.toolsbaseline.location" value="${sf.spec.baseline.location}" />
+ <property name="sf.spec.toolsbaseline.getenv_options" value="-i tools -k" />
+
+ <!-- packaging options -->
+ <property name="sf.spec.package.src.enable" value="false" />
+ <property name="sf.spec.package.bin.enable" value="false" />
+
+ <!-- default build configurations -->
+ <property name="sf.spec.sbs.config" value="winscw_udeb.whatlog" />
+ <property name="sf.spec.sbs.tools.config" value="tools2.whatlog" />
+
+ <!-- default localisation variant -->
+ <property name="sf.spec.bldmefirst.s60.variant" value="engineering" />
+
+ <!-- prevent trying to access default SF servers -->
+ <property name="sf.spec.publish.enable" value="false" />
+ <property name="sf.spec.smoketest.enable" value="false" />
+ <property name="sf.spec.test.sendpkg.enable" value="false" />
+
+ <!-- public rnd binaries are in baseline.location, not from mercurial -->
+ <property name="sf.spec.sourcesync.sourcespecfile.rnd" value="nul:"/>
+
+ <!-- use sources defined in BOM as this will rebuild that PDK -->
+ <property name="sf.spec.sourcesync.sourcespecdir" value="${sf.spec.job.drive}\build_info\logs\BOM"/>
+ <property name="sf.spec.systemdefinition.location" value="${sf.spec.job.drive}\build_info\logs\BOM"/>
+</project>
--- a/symbian3/micro/job_props.ant.xml Wed May 05 12:21:47 2010 +0100
+++ b/symbian3/micro/job_props.ant.xml Tue Jul 13 12:21:44 2010 +0100
@@ -5,7 +5,7 @@
<dirname property="sf.spec.job.dir" file="${ant.file.SF-JOB-PROPS}"/>
<property name="sf.project.type" value="platform" />
- <property name="sf.previous.pdk.tag" value="PDK_3.0.g" />
+ <property name="sf.previous.pdk.tag" value="PDK_3.0.0" />
<property name="sf.spec.corebuildversion" value="week37"/>
--- a/symbian3/micro/sources.csv Wed May 05 12:21:47 2010 +0100
+++ b/symbian3/micro/sources.csv Tue Jul 13 12:21:44 2010 +0100
@@ -1,6 +1,5 @@
source,dst,type,pattern,sysdef
http://developer.symbian.org/oss/FCL/sftools/fbf/utilities/,/utilities,branch,default,
-//v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,RCL_3,
http://developer.symbian.org/oss/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,S3_LATESTGOOD,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,S3_LATESTGOOD,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/os/buildtools/,/sf/os/buildtools,branch,S3_LATESTGOOD,layers.sysdef.xml
--- a/symbian3/prebuilt_excludelist.txt Wed May 05 12:21:47 2010 +0100
+++ b/symbian3/prebuilt_excludelist.txt Tue Jul 13 12:21:44 2010 +0100
@@ -1,218 +0,0 @@
-epoc32\data\z\system\data\testexecute.ini
-epoc32\engineeringtools\plugins\tef.vp
-epoc32\engineeringtools\tefutilities\eventlogserver\data\eventlogcontroler.ini
-epoc32\engineeringtools\tefutilities\eventlogserver\scripts\example.script
-epoc32\engineeringtools\tefutilities\eventlogserver\xml\eventlogserver.xml
-epoc32\engineeringtools\tefutilities\eventlogserver\xml\eventlogserver\example.xml
-epoc32\engineeringtools\tefutilities\platsec\data\capabilitypolicing.ini
-epoc32\engineeringtools\tefutilities\platsec\scripts\capabilitypolicing.script
-epoc32\engineeringtools\tefutilities\platsec\scripts\cleanup.script
-epoc32\engineeringtools\tefutilities\platsec\xml\platsecserver.xml
-epoc32\engineeringtools\tefutilities\platsec\xml\platsecserver\capabilitypolicing.xml
-epoc32\engineeringtools\tefutilities\platsec\xml\platsecserver\cleanup.xml
-epoc32\engineeringtools\tefutilities\tefutilityserver\data\formatdrivetest.ini
-epoc32\engineeringtools\tefutilities\tefutilityserver\scripts\buildinfologtest.script
-epoc32\engineeringtools\tefutilities\tefutilityserver\scripts\formatdrivetest.script
-epoc32\engineeringtools\tefutilities\tefutilityserver\xml\tefutilityserver.xml
-epoc32\engineeringtools\tefutilities\tefutilityserver\xml\tefutilityserver\buildinfologtest.xml
-epoc32\engineeringtools\tefutilities\tefutilityserver\xml\tefutilityserver\formatdrivetest.xml
-epoc32\include\iniparser.h
-epoc32\include\test\activecallback.h
-epoc32\include\test\blockitems.h
-epoc32\include\test\commandprocessor.h
-epoc32\include\test\cteflogger.h
-epoc32\include\test\ctefunitserver.h
-epoc32\include\test\dataaccess.h
-epoc32\include\test\datadictionary.h
-epoc32\include\test\datawrapper.h
-epoc32\include\test\datawrapper.inl
-epoc32\include\test\fileservplugin.h
-epoc32\include\test\rfilelogger.h
-epoc32\include\test\rfileloggermacro.h
-epoc32\include\test\sysstartplugin.h
-epoc32\include\test\tefexportconst.h
-epoc32\include\test\tefresult.h
-epoc32\include\test\tefscriptutils.h
-epoc32\include\test\tefshareddata.h
-epoc32\include\test\tefshareddata.inl
-epoc32\include\test\teftimer.h
-epoc32\include\test\tefunit.h
-epoc32\include\test\tefunit.inl
-epoc32\include\test\TEFUtils.h
-epoc32\include\test\testblockcontroller.h
-epoc32\include\test\testblockcontroller.inl
-epoc32\include\test\testexecuteclient.h
-epoc32\include\test\testexecutelog.h
-epoc32\include\test\testexecutelogbase.h
-epoc32\include\test\testexecutelogger.h
-epoc32\include\test\testexecutepipslog.h
-epoc32\include\test\testexecuteserverbase.h
-epoc32\include\test\testexecuteserverutils.h
-epoc32\include\test\testexecuteserverutils.inl
-epoc32\include\test\testexecutestepbase.h
-epoc32\include\test\testserver2.h
-epoc32\include\test\testshareddata.h
-epoc32\include\test\testshareddata.inl
-epoc32\include\test\wrapperutilsplugin.h
-epoc32\release\armv5\lib\IniParser.dso
-epoc32\release\armv5\lib\IniParser.lib
-epoc32\release\armv5\lib\IniParser{000a0000}.dso
-epoc32\release\armv5\lib\IniParser{000a0000}.lib
-epoc32\release\armv5\lib\rfileloggerclient.dso
-epoc32\release\armv5\lib\rfileloggerclient.lib
-epoc32\release\armv5\lib\rfileloggerclient{000a0000}.dso
-epoc32\release\armv5\lib\rfileloggerclient{000a0000}.lib
-epoc32\release\armv5\lib\testexecutelogclient.dso
-epoc32\release\armv5\lib\testexecutelogclient.lib
-epoc32\release\armv5\lib\testexecutelogclient{000a0000}.dso
-epoc32\release\armv5\lib\testexecutelogclient{000a0000}.lib
-epoc32\release\armv5\lib\testexecutepipslogclient.dso
-epoc32\release\armv5\lib\testexecutepipslogclient.lib
-epoc32\release\armv5\lib\testexecutepipslogclient{000a0000}.dso
-epoc32\release\armv5\lib\testexecutepipslogclient{000a0000}.lib
-epoc32\release\armv5\lib\testexecuteutils.dso
-epoc32\release\armv5\lib\testexecuteutils.lib
-epoc32\release\armv5\lib\testexecuteutils{000a0000}.dso
-epoc32\release\armv5\lib\testexecuteutils{000a0000}.lib
-epoc32\release\armv5\lib\WrapperUtilsPlugin1.dso
-epoc32\release\armv5\lib\WrapperUtilsPlugin1.lib
-epoc32\release\armv5\lib\WrapperUtilsPlugin1{000a0000}.dso
-epoc32\release\armv5\lib\WrapperUtilsPlugin1{000a0000}.lib
-epoc32\release\armv5\udeb\gwstestexecute.exe
-epoc32\release\armv5\udeb\gwstestexecute.exe.map
-epoc32\release\armv5\udeb\IniParser.dll
-epoc32\release\armv5\udeb\IniParser.dll.map
-epoc32\release\armv5\udeb\rfileloggerclient.dll
-epoc32\release\armv5\udeb\rfileloggerclient.dll.map
-epoc32\release\armv5\udeb\rfileloggerserver.exe
-epoc32\release\armv5\udeb\rfileloggerserver.exe.map
-epoc32\release\armv5\udeb\tefcleanup.exe
-epoc32\release\armv5\udeb\tefcleanup.exe.map
-epoc32\release\armv5\udeb\tefplatsec.exe
-epoc32\release\armv5\udeb\tefplatsec.exe.map
-epoc32\release\armv5\udeb\tefunit.lib
-epoc32\release\armv5\udeb\tefutilityserver.exe
-epoc32\release\armv5\udeb\tefutilityserver.exe.map
-epoc32\release\armv5\udeb\tefutilityserverlite.exe
-epoc32\release\armv5\udeb\tefutilityserverlite.exe.map
-epoc32\release\armv5\udeb\testexecute.exe
-epoc32\release\armv5\udeb\testexecute.exe.map
-epoc32\release\armv5\udeb\testexecutelite.exe
-epoc32\release\armv5\udeb\testexecutelite.exe.map
-epoc32\release\armv5\udeb\testexecutelogclient.dll
-epoc32\release\armv5\udeb\testexecutelogclient.dll.map
-epoc32\release\armv5\udeb\testexecutelogengine.exe
-epoc32\release\armv5\udeb\testexecutelogengine.exe.map
-epoc32\release\armv5\udeb\testexecutepipslogclient.dll
-epoc32\release\armv5\udeb\testexecutepipslogclient.dll.map
-epoc32\release\armv5\udeb\testexecutepipslogengine.exe
-epoc32\release\armv5\udeb\testexecutepipslogengine.exe.map
-epoc32\release\armv5\udeb\testexecuteutils.dll
-epoc32\release\armv5\udeb\testexecuteutils.dll.map
-epoc32\release\armv5\udeb\WrapperUtilsPlugin1.dll
-epoc32\release\armv5\udeb\WrapperUtilsPlugin1.dll.map
-epoc32\release\armv5\urel\gwstestexecute.exe
-epoc32\release\armv5\urel\gwstestexecute.exe.map
-epoc32\release\armv5\urel\IniParser.dll
-epoc32\release\armv5\urel\IniParser.dll.map
-epoc32\release\armv5\urel\rfileloggerclient.dll
-epoc32\release\armv5\urel\rfileloggerclient.dll.map
-epoc32\release\armv5\urel\rfileloggerserver.exe
-epoc32\release\armv5\urel\rfileloggerserver.exe.map
-epoc32\release\armv5\urel\tefcleanup.exe
-epoc32\release\armv5\urel\tefcleanup.exe.map
-epoc32\release\armv5\urel\tefplatsec.exe
-epoc32\release\armv5\urel\tefplatsec.exe.map
-epoc32\release\armv5\urel\tefunit.lib
-epoc32\release\armv5\urel\tefutilityserver.exe
-epoc32\release\armv5\urel\tefutilityserver.exe.map
-epoc32\release\armv5\urel\tefutilityserverlite.exe
-epoc32\release\armv5\urel\tefutilityserverlite.exe.map
-epoc32\release\armv5\urel\testexecute.exe
-epoc32\release\armv5\urel\testexecute.exe.map
-epoc32\release\armv5\urel\testexecutelite.exe
-epoc32\release\armv5\urel\testexecutelite.exe.map
-epoc32\release\armv5\urel\testexecutelogclient.dll
-epoc32\release\armv5\urel\testexecutelogclient.dll.map
-epoc32\release\armv5\urel\testexecutelogengine.exe
-epoc32\release\armv5\urel\testexecutelogengine.exe.map
-epoc32\release\armv5\urel\testexecutepipslogclient.dll
-epoc32\release\armv5\urel\testexecutepipslogclient.dll.map
-epoc32\release\armv5\urel\testexecutepipslogengine.exe
-epoc32\release\armv5\urel\testexecutepipslogengine.exe.map
-epoc32\release\armv5\urel\testexecuteutils.dll
-epoc32\release\armv5\urel\testexecuteutils.dll.map
-epoc32\release\armv5\urel\WrapperUtilsPlugin1.dll
-epoc32\release\armv5\urel\WrapperUtilsPlugin1.dll.map
-epoc32\release\winscw\udeb\gwstestexecute.exe
-epoc32\release\winscw\udeb\IniParser.dll
-epoc32\release\winscw\udeb\IniParser.lib
-epoc32\release\winscw\udeb\rfileloggerclient.dll
-epoc32\release\winscw\udeb\rfileloggerclient.lib
-epoc32\release\winscw\udeb\rfileloggerserver.exe
-epoc32\release\winscw\udeb\tefcleanup.exe
-epoc32\release\winscw\udeb\tefplatsec.exe
-epoc32\release\winscw\udeb\tefunit.lib
-epoc32\release\winscw\udeb\tefutilityserver.exe
-epoc32\release\winscw\udeb\tefutilityserverlite.exe
-epoc32\release\winscw\udeb\testexecute.exe
-epoc32\release\winscw\udeb\testexecutelite.exe
-epoc32\release\winscw\udeb\testexecutelogclient.dll
-epoc32\release\winscw\udeb\testexecutelogclient.lib
-epoc32\release\winscw\udeb\testexecutelogengine.exe
-epoc32\release\winscw\udeb\testexecutepipslogclient.dll
-epoc32\release\winscw\udeb\testexecutepipslogclient.lib
-epoc32\release\winscw\udeb\testexecutepipslogengine.exe
-epoc32\release\winscw\udeb\testexecuteutils.dll
-epoc32\release\winscw\udeb\testexecuteutils.lib
-epoc32\release\winscw\udeb\WrapperUtilsPlugin1.dll
-epoc32\release\winscw\udeb\WrapperUtilsPlugin1.lib
-epoc32\release\winscw\urel\gwstestexecute.exe
-epoc32\release\winscw\urel\gwstestexecute.exe.map
-epoc32\release\winscw\urel\IniParser.dll
-epoc32\release\winscw\urel\IniParser.dll.map
-epoc32\release\winscw\urel\rfileloggerclient.dll
-epoc32\release\winscw\urel\rfileloggerclient.dll.map
-epoc32\release\winscw\urel\rfileloggerserver.exe
-epoc32\release\winscw\urel\rfileloggerserver.exe.map
-epoc32\release\winscw\urel\tefcleanup.exe
-epoc32\release\winscw\urel\tefcleanup.exe.map
-epoc32\release\winscw\urel\tefplatsec.exe
-epoc32\release\winscw\urel\tefplatsec.exe.map
-epoc32\release\winscw\urel\tefunit.lib
-epoc32\release\winscw\urel\tefutilityserver.exe
-epoc32\release\winscw\urel\tefutilityserver.exe.map
-epoc32\release\winscw\urel\tefutilityserverlite.exe
-epoc32\release\winscw\urel\tefutilityserverlite.exe.map
-epoc32\release\winscw\urel\testexecute.exe
-epoc32\release\winscw\urel\testexecute.exe.map
-epoc32\release\winscw\urel\testexecutelite.exe
-epoc32\release\winscw\urel\testexecutelite.exe.map
-epoc32\release\winscw\urel\testexecutelogclient.dll
-epoc32\release\winscw\urel\testexecutelogclient.dll.map
-epoc32\release\winscw\urel\testexecutelogengine.exe
-epoc32\release\winscw\urel\testexecutelogengine.exe.map
-epoc32\release\winscw\urel\testexecutepipslogclient.dll
-epoc32\release\winscw\urel\testexecutepipslogclient.dll.map
-epoc32\release\winscw\urel\testexecutepipslogengine.exe
-epoc32\release\winscw\urel\testexecutepipslogengine.exe.map
-epoc32\release\winscw\urel\testexecuteutils.dll
-epoc32\release\winscw\urel\testexecuteutils.dll.map
-epoc32\release\winscw\urel\WrapperUtilsPlugin1.dll
-epoc32\release\winscw\urel\WrapperUtilsPlugin1.dll.map
-epoc32\rom\include\base_testexecutelite.iby
-epoc32\rom\include\iniparser.iby
-epoc32\rom\include\rfilelogger.iby
-epoc32\rom\include\tefcleanup.iby
-epoc32\rom\include\tefplatsec.iby
-epoc32\rom\include\tefutilityserver.iby
-epoc32\rom\include\testexecute.iby
-epoc32\rom\include\testexecutelogger.iby
-epoc32\rom\include\testexecutepipslogger.iby
-epoc32\rom\include\testexecutepipsloggerclient.iby
-epoc32\rom\include\wrapperutilsplugin.iby
-epoc32\winscw\c\system\data\testexecute.ini
-epoc32\include\testconfigfileparser.h
-epoc32\include\testconfigfileparser.inl
-epoc32\release\winscw\udeb\testconfigfileparser.dll
-epoc32\release\winscw\udeb\testconfigfileparser.lib
\ No newline at end of file
--- a/symbian3/sdkFiles.txt Wed May 05 12:21:47 2010 +0100
+++ b/symbian3/sdkFiles.txt Tue Jul 13 12:21:44 2010 +0100
@@ -5,17 +5,34 @@
epoc32/include/a3f/mmfaudiosvrservice.hrh
epoc32/include/a3f/mmfaudiosvruids.hrh
epoc32/include/a3f/mmfdevsoundcustominterfaceextensions.hrh
-epoc32/include/AccMonitor.h
-epoc32/include/AccMonitorCapabilities.h
-epoc32/include/AccMonitorInfo.h
-epoc32/include/AccMonitorInfo.inl
+epoc32/include/about.mbg
+epoc32/include/aboutgsplugin.mbg
+epoc32/include/accmonitor.h
+epoc32/include/accmonitorcapabilities.h
+epoc32/include/accmonitorinfo.h
+epoc32/include/accmonitorinfo.inl
+epoc32/include/acpicons.mbg
+epoc32/include/activeidle2.mbg
+epoc32/include/activepalette2graphics.mbg
epoc32/include/advancedpointerevent.h
+epoc32/include/advancedpointerevent.inl
epoc32/include/agentdialog.h
+epoc32/include/aicalendarplugin2.mbg
epoc32/include/aiftool.rh
+epoc32/include/aimcsplugin.mbg
+epoc32/include/aiwcommon.hrh
+epoc32/include/aiwgenericparam.hrh
+epoc32/include/aknfepuictrls.mbg
+epoc32/include/aknlayout.lag
+epoc32/include/aknmemorycardui.mbg
+epoc32/include/ALL_SDK.txt
+epoc32/include/animationcmd.h
+epoc32/include/aol_brand_graphics.mbg
+epoc32/include/apcontrollistplugin.mbg
epoc32/include/apmrec.h
epoc32/include/apmrec.inl
epoc32/include/apmstd.h
-epoc32/include/app/BCardEng.h
+epoc32/include/app/bcardeng.h
epoc32/include/app/btmsgtypeuid.h
epoc32/include/app/cacheman.h
epoc32/include/app/calalarm.h
@@ -29,7 +46,7 @@
epoc32/include/app/caldataexchange.h
epoc32/include/app/caldataformat.h
epoc32/include/app/calendarconverter.h
-epoc32/include/app/CalenInterimUtils2.h
+epoc32/include/app/caleninterimutils2.h
epoc32/include/app/calentry.h
epoc32/include/app/calentryview.h
epoc32/include/app/calfilechangenotification.h
@@ -46,9 +63,9 @@
epoc32/include/app/cemailaccounts.h
epoc32/include/app/cimattachmentwaiter.h
epoc32/include/app/cimplainbodytext.h
-epoc32/include/app/CLmkCategorySelectorDlg.h
-epoc32/include/app/CLmkEditorDlg.h
-epoc32/include/app/CLmkLandmarkSelectorDlg.h
+epoc32/include/app/clmkcategoryselectordlg.h
+epoc32/include/app/clmkeditordlg.h
+epoc32/include/app/clmklandmarkselectordlg.h
epoc32/include/app/cmmsaccounts.h
epoc32/include/app/cmmssettings.h
epoc32/include/app/cntdb.h
@@ -64,61 +81,61 @@
epoc32/include/app/cntviewbase.h
epoc32/include/app/cntviewsortplugin.h
epoc32/include/app/cobexsendoperation.h
-epoc32/include/app/CPbk2SortOrderManager.h
-epoc32/include/app/CPbk2ViewState.h
-epoc32/include/app/CPbkAddressSelect.h
-epoc32/include/app/CPbkContactChangeNotifier.h
-epoc32/include/app/CPbkContactEditorDlg.h
-epoc32/include/app/CPbkContactEngine.h
-epoc32/include/app/CPbkContactItem.h
-epoc32/include/app/CPbkContactIter.h
-epoc32/include/app/CPbkDataSaveAppUi.h
-epoc32/include/app/CPbkEmailAddressSelect.h
-epoc32/include/app/CPbkEmailOverSmsAddressSelect.h
-epoc32/include/app/CPbkFieldInfo.h
-epoc32/include/app/CPbkFieldsInfo.h
-epoc32/include/app/CPbkIdleFinder.h
-epoc32/include/app/CPbkMemoryEntryAddItemDlg.h
-epoc32/include/app/CPbkMmsAddressSelect.h
-epoc32/include/app/CPbkMultipleEntryFetchDlg.h
-epoc32/include/app/CPbkPhoneNumberSelect.h
-epoc32/include/app/CPbkPhoneNumberSelectBase.h
-epoc32/include/app/CPbkPocAddressSelect.h
-epoc32/include/app/CPbkSelectFieldDlg.h
-epoc32/include/app/CPbkSingleEntryFetchDlg.h
-epoc32/include/app/CPbkSingleItemFetchDlg.h
-epoc32/include/app/CPbkSmsAddressSelect.h
-epoc32/include/app/CPbkVideoNumberSelect.h
-epoc32/include/app/CPbkViewState.h
-epoc32/include/app/CPbkVoipAddressSelect.h
-epoc32/include/app/CRichBio.h
+epoc32/include/app/cpbk2sortordermanager.h
+epoc32/include/app/cpbk2viewstate.h
+epoc32/include/app/cpbkaddressselect.h
+epoc32/include/app/cpbkcontactchangenotifier.h
+epoc32/include/app/cpbkcontacteditordlg.h
+epoc32/include/app/cpbkcontactengine.h
+epoc32/include/app/cpbkcontactitem.h
+epoc32/include/app/cpbkcontactiter.h
+epoc32/include/app/cpbkdatasaveappui.h
+epoc32/include/app/cpbkemailaddressselect.h
+epoc32/include/app/cpbkemailoversmsaddressselect.h
+epoc32/include/app/cpbkfieldinfo.h
+epoc32/include/app/cpbkfieldsinfo.h
+epoc32/include/app/cpbkidlefinder.h
+epoc32/include/app/cpbkmemoryentryadditemdlg.h
+epoc32/include/app/cpbkmmsaddressselect.h
+epoc32/include/app/cpbkmultipleentryfetchdlg.h
+epoc32/include/app/cpbkphonenumberselect.h
+epoc32/include/app/cpbkphonenumberselectbase.h
+epoc32/include/app/cpbkpocaddressselect.h
+epoc32/include/app/cpbkselectfielddlg.h
+epoc32/include/app/cpbksingleentryfetchdlg.h
+epoc32/include/app/cpbksingleitemfetchdlg.h
+epoc32/include/app/cpbksmsaddressselect.h
+epoc32/include/app/cpbkvideonumberselect.h
+epoc32/include/app/cpbkviewstate.h
+epoc32/include/app/cpbkvoipaddressselect.h
+epoc32/include/app/crichbio.h
epoc32/include/app/csmsaccount.h
epoc32/include/app/csmsemailfields.h
-epoc32/include/app/CVPbkContactCopier.h
-epoc32/include/app/CVPbkContactFieldIterator.h
-epoc32/include/app/CVPbkContactIdConverter.h
-epoc32/include/app/CVPbkContactLinkArray.h
-epoc32/include/app/CVPbkContactManager.h
-epoc32/include/app/CVPbkContactStoreUriArray.h
-epoc32/include/app/CVPbkContactViewDefinition.h
-epoc32/include/app/CVPbkDefaultAttribute.h
-epoc32/include/app/CVPbkFieldFilter.h
-epoc32/include/app/CVPbkFieldTypeIterator.h
-epoc32/include/app/CVPbkFieldTypeRefsList.h
-epoc32/include/app/CVPbkFieldTypeSelector.h
-epoc32/include/app/CVPbkFilteredContactView.h
-epoc32/include/app/CVPbkPhoneNumberMatchStrategy.h
-epoc32/include/app/CVPbkSortOrder.h
-epoc32/include/app/CVPbkSpeedDialAttribute.h
-epoc32/include/app/CVPbkTopContactManager.h
-epoc32/include/app/CVPbkVCardEng.h
-epoc32/include/app/CVPbkVoiceTagAttribute.h
-epoc32/include/app/CVPbkxSPContacts.h
+epoc32/include/app/cvpbkcontactcopier.h
+epoc32/include/app/cvpbkcontactfielditerator.h
+epoc32/include/app/cvpbkcontactidconverter.h
+epoc32/include/app/cvpbkcontactlinkarray.h
+epoc32/include/app/cvpbkcontactmanager.h
+epoc32/include/app/cvpbkcontactstoreuriarray.h
+epoc32/include/app/cvpbkcontactviewdefinition.h
+epoc32/include/app/cvpbkdefaultattribute.h
+epoc32/include/app/cvpbkfieldfilter.h
+epoc32/include/app/cvpbkfieldtypeiterator.h
+epoc32/include/app/cvpbkfieldtyperefslist.h
+epoc32/include/app/cvpbkfieldtypeselector.h
+epoc32/include/app/cvpbkfilteredcontactview.h
+epoc32/include/app/cvpbkphonenumbermatchstrategy.h
+epoc32/include/app/cvpbksortorder.h
+epoc32/include/app/cvpbkspeeddialattribute.h
+epoc32/include/app/cvpbktopcontactmanager.h
+epoc32/include/app/cvpbkvcardeng.h
+epoc32/include/app/cvpbkvoicetagattribute.h
+epoc32/include/app/cvpbkxspcontacts.h
epoc32/include/app/dbwriter.h
epoc32/include/app/emailobserverinterface.hrh
epoc32/include/app/emailobserverplugin.h
epoc32/include/app/emailobserverplugin.inl
-epoc32/include/app/ExtendedMTMIDS.hrh
+epoc32/include/app/extendedmtmids.hrh
epoc32/include/app/hlplch.h
epoc32/include/app/hlpmodel.h
epoc32/include/app/hlpzoom.h
@@ -126,8 +143,14 @@
epoc32/include/app/imapcmds.h
epoc32/include/app/imapconnectionobserver.h
epoc32/include/app/imapset.h
+epoc32/include/app/imclient.h
epoc32/include/app/imcmmain.h
+epoc32/include/app/imconnection.h
+epoc32/include/app/imconnection.inl
epoc32/include/app/imcvcodc.h
+epoc32/include/app/imerrors.h
+epoc32/include/app/imlauncherplugin.h
+epoc32/include/app/imlauncherplugin.inl
epoc32/include/app/impcmtm.h
epoc32/include/app/imsk.h
epoc32/include/app/irmsgtypeuid.h
@@ -138,7 +161,7 @@
epoc32/include/app/memailmailboxdata.h
epoc32/include/app/memailmessagedata.h
epoc32/include/app/memailobserverlistener.h
-epoc32/include/app/MessagingSDKCRKeys.h
+epoc32/include/app/messagingsdkcrkeys.h
epoc32/include/app/miut_err.h
epoc32/include/app/miutatch.h
epoc32/include/app/miutconv.h
@@ -153,101 +176,101 @@
epoc32/include/app/mmsconst.h
epoc32/include/app/mmserrors.h
epoc32/include/app/mmsgbiocontrol.h
-epoc32/include/app/MMsgBioControlExtension.h
-epoc32/include/app/MNcnNotification.h
-epoc32/include/app/MNcnNotification.inl
-epoc32/include/app/MPbk2ContactNameFormatter.h
-epoc32/include/app/MPbk2ContactNameFormatter2.h
-epoc32/include/app/MPbk2FieldProperty.h
-epoc32/include/app/MPbk2FieldProperty2.h
-epoc32/include/app/MPbk2FieldPropertyArray.h
-epoc32/include/app/MPbk2FieldPropertyArray2.h
-epoc32/include/app/MPbkContactDbObserver.h
-epoc32/include/app/MPbkEditorOkToExitCallback.h
-epoc32/include/app/MPbkFetchCallbacks.h
-epoc32/include/app/MPbkFetchDlgSelection.h
-epoc32/include/app/MPbkFieldData.h
-epoc32/include/app/MPbkThumbnailOperationObservers.h
+epoc32/include/app/mmsgbiocontrolextension.h
+epoc32/include/app/mncnnotification.h
+epoc32/include/app/mncnnotification.inl
+epoc32/include/app/mpbk2contactnameformatter.h
+epoc32/include/app/mpbk2contactnameformatter2.h
+epoc32/include/app/mpbk2fieldproperty.h
+epoc32/include/app/mpbk2fieldproperty2.h
+epoc32/include/app/mpbk2fieldpropertyarray.h
+epoc32/include/app/mpbk2fieldpropertyarray2.h
+epoc32/include/app/mpbkcontactdbobserver.h
+epoc32/include/app/mpbkeditoroktoexitcallback.h
+epoc32/include/app/mpbkfetchcallbacks.h
+epoc32/include/app/mpbkfetchdlgselection.h
+epoc32/include/app/mpbkfielddata.h
+epoc32/include/app/mpbkthumbnailoperationobservers.h
epoc32/include/app/msgbiocontrol.h
-epoc32/include/app/msgbiocontrolObserver.h
-epoc32/include/app/MsgBioUids.h
-epoc32/include/app/MsgEditor.hrh
-epoc32/include/app/MVPbkBaseContact.h
-epoc32/include/app/MVPbkBaseContactField.h
-epoc32/include/app/MVPbkBaseContactFieldCollection.h
-epoc32/include/app/MVPbkBatchOperationObserver.h
-epoc32/include/app/MVPbkContactAttribute.h
-epoc32/include/app/MVPbkContactAttributeManager.h
-epoc32/include/app/MVPbkContactBookmark.h
-epoc32/include/app/MVPbkContactBookmarkCollection.h
-epoc32/include/app/MVPbkContactCopyObserver.h
-epoc32/include/app/MVPbkContactFieldBinaryData.h
-epoc32/include/app/MVPbkContactFieldData.h
-epoc32/include/app/MVPbkContactFieldDateTimeData.h
-epoc32/include/app/MVPbkContactFieldOrdering.h
-epoc32/include/app/MVPbkContactFieldSelector.h
-epoc32/include/app/MVPbkContactFieldTextData.h
-epoc32/include/app/MVPbkContactFieldUriData.h
-epoc32/include/app/MVPbkContactFindFromStoresObserver.h
-epoc32/include/app/MVPbkContactFindObserver.h
-epoc32/include/app/MVPbkContactGroup.h
-epoc32/include/app/MVPbkContactLink.h
-epoc32/include/app/MVPbkContactLinkArray.h
-epoc32/include/app/MVPbkContactLinkPacking.h
-epoc32/include/app/MVPbkContactObserver.h
-epoc32/include/app/MVPbkContactOperation.h
-epoc32/include/app/MVPbkContactOperationBase.h
-epoc32/include/app/MVPbkContactOperationFactory.h
-epoc32/include/app/MVPbkContactOperationFactory2.h
-epoc32/include/app/MVPbkContactSelector.h
-epoc32/include/app/MVPbkContactStore.h
-epoc32/include/app/MVPbkContactStore2.h
-epoc32/include/app/MVPbkContactStoreInfo.h
-epoc32/include/app/MVPbkContactStoreList.h
-epoc32/include/app/MVPbkContactStoreListObserver.h
-epoc32/include/app/MVPbkContactStoreObserver.h
-epoc32/include/app/MVPbkContactStoreProperties.h
-epoc32/include/app/MVPbkContactStoreProperties2.h
-epoc32/include/app/MVPbkContactView.h
-epoc32/include/app/MVPbkContactViewBase.h
-epoc32/include/app/MVPbkContactViewBaseChildAccessExtension.h
-epoc32/include/app/MVPbkContactViewFiltering.h
-epoc32/include/app/MVPbkContactViewObserver.h
-epoc32/include/app/MVPbkExpandable.h
-epoc32/include/app/MVPbkFieldType.h
-epoc32/include/app/MVPbkFieldTypeSelector.h
-epoc32/include/app/MVPbkObjectHierarchy.h
-epoc32/include/app/MVPbkOperationObserver.h
-epoc32/include/app/MVPbkSingleContactLinkOperationObserver.h
-epoc32/include/app/MVPbkSingleContactOperationObserver.h
-epoc32/include/app/MVPbkStoreContact.h
-epoc32/include/app/MVPbkStoreContact2.h
-epoc32/include/app/MVPbkStoreContactField.h
-epoc32/include/app/MVPbkStoreContactField2.h
-epoc32/include/app/MVPbkStoreContactFieldCollection.h
-epoc32/include/app/MVPbkStoreContactProperties.h
-epoc32/include/app/MVPbkStreamable.h
-epoc32/include/app/MVPbkViewContact.h
-epoc32/include/app/MVPbkViewContactField.h
-epoc32/include/app/MVPbkViewContactFieldCollection.h
-epoc32/include/app/NpdApi.h
+epoc32/include/app/msgbiocontrolobserver.h
+epoc32/include/app/msgbiouids.h
+epoc32/include/app/msgeditor.hrh
+epoc32/include/app/mvpbkbasecontact.h
+epoc32/include/app/mvpbkbasecontactfield.h
+epoc32/include/app/mvpbkbasecontactfieldcollection.h
+epoc32/include/app/mvpbkbatchoperationobserver.h
+epoc32/include/app/mvpbkcontactattribute.h
+epoc32/include/app/mvpbkcontactattributemanager.h
+epoc32/include/app/mvpbkcontactbookmark.h
+epoc32/include/app/mvpbkcontactbookmarkcollection.h
+epoc32/include/app/mvpbkcontactcopyobserver.h
+epoc32/include/app/mvpbkcontactfieldbinarydata.h
+epoc32/include/app/mvpbkcontactfielddata.h
+epoc32/include/app/mvpbkcontactfielddatetimedata.h
+epoc32/include/app/mvpbkcontactfieldordering.h
+epoc32/include/app/mvpbkcontactfieldselector.h
+epoc32/include/app/mvpbkcontactfieldtextdata.h
+epoc32/include/app/mvpbkcontactfielduridata.h
+epoc32/include/app/mvpbkcontactfindfromstoresobserver.h
+epoc32/include/app/mvpbkcontactfindobserver.h
+epoc32/include/app/mvpbkcontactgroup.h
+epoc32/include/app/mvpbkcontactlink.h
+epoc32/include/app/mvpbkcontactlinkarray.h
+epoc32/include/app/mvpbkcontactlinkpacking.h
+epoc32/include/app/mvpbkcontactobserver.h
+epoc32/include/app/mvpbkcontactoperation.h
+epoc32/include/app/mvpbkcontactoperationbase.h
+epoc32/include/app/mvpbkcontactoperationfactory.h
+epoc32/include/app/mvpbkcontactoperationfactory2.h
+epoc32/include/app/mvpbkcontactselector.h
+epoc32/include/app/mvpbkcontactstore.h
+epoc32/include/app/mvpbkcontactstore2.h
+epoc32/include/app/mvpbkcontactstoreinfo.h
+epoc32/include/app/mvpbkcontactstorelist.h
+epoc32/include/app/mvpbkcontactstorelistobserver.h
+epoc32/include/app/mvpbkcontactstoreobserver.h
+epoc32/include/app/mvpbkcontactstoreproperties.h
+epoc32/include/app/mvpbkcontactstoreproperties2.h
+epoc32/include/app/mvpbkcontactview.h
+epoc32/include/app/mvpbkcontactviewbase.h
+epoc32/include/app/mvpbkcontactviewbasechildaccessextension.h
+epoc32/include/app/mvpbkcontactviewfiltering.h
+epoc32/include/app/mvpbkcontactviewobserver.h
+epoc32/include/app/mvpbkexpandable.h
+epoc32/include/app/mvpbkfieldtype.h
+epoc32/include/app/mvpbkfieldtypeselector.h
+epoc32/include/app/mvpbkobjecthierarchy.h
+epoc32/include/app/mvpbkoperationobserver.h
+epoc32/include/app/mvpbksinglecontactlinkoperationobserver.h
+epoc32/include/app/mvpbksinglecontactoperationobserver.h
+epoc32/include/app/mvpbkstorecontact.h
+epoc32/include/app/mvpbkstorecontact2.h
+epoc32/include/app/mvpbkstorecontactfield.h
+epoc32/include/app/mvpbkstorecontactfield2.h
+epoc32/include/app/mvpbkstorecontactfieldcollection.h
+epoc32/include/app/mvpbkstorecontactproperties.h
+epoc32/include/app/mvpbkstreamable.h
+epoc32/include/app/mvpbkviewcontact.h
+epoc32/include/app/mvpbkviewcontactfield.h
+epoc32/include/app/mvpbkviewcontactfieldcollection.h
+epoc32/include/app/npdapi.h
epoc32/include/app/obexheaderlist.h
-epoc32/include/app/Pbk2ContactNameFormatterFactory.h
-epoc32/include/app/Pbk2FieldPropertiesFactory.h
-epoc32/include/app/Pbk2FieldProperty.hrh
-epoc32/include/app/Pbk2IconId.hrh
-epoc32/include/app/Pbk2IconId.rh
-epoc32/include/app/Pbk2ViewId.hrh
-epoc32/include/app/PbkDataSaveAppUi.hrh
-epoc32/include/app/PbkFields.hrh
-epoc32/include/app/PbkIconId.hrh
-epoc32/include/app/PbkIconInfo.h
+epoc32/include/app/pbk2contactnameformatterfactory.h
+epoc32/include/app/pbk2fieldpropertiesfactory.h
+epoc32/include/app/pbk2fieldproperty.hrh
+epoc32/include/app/pbk2iconid.hrh
+epoc32/include/app/pbk2iconid.rh
+epoc32/include/app/pbk2viewid.hrh
+epoc32/include/app/pbkdatasaveappui.hrh
+epoc32/include/app/pbkfields.hrh
+epoc32/include/app/pbkiconid.hrh
+epoc32/include/app/pbkiconinfo.h
epoc32/include/app/phbksync.h
epoc32/include/app/pop3cmds.h
epoc32/include/app/pop3set.h
epoc32/include/app/popcmtm.h
-epoc32/include/app/RPbkViewResourceFile.h
-epoc32/include/app/RVPbkContactFieldDefaultPriorities.h
+epoc32/include/app/rpbkviewresourcefile.h
+epoc32/include/app/rvpbkcontactfielddefaultpriorities.h
epoc32/include/app/smcmmain.h
epoc32/include/app/smsclnt.h
epoc32/include/app/smscmds.h
@@ -258,16 +281,16 @@
epoc32/include/app/smuthdr.h
epoc32/include/app/smutset.h
epoc32/include/app/smutsimparam.h
-epoc32/include/app/SpdiaControl.h
-epoc32/include/app/TLmkItemIdDbCombiInfo.h
-epoc32/include/app/TPbk2IconId.h
-epoc32/include/app/TPbkContactItemField.h
-epoc32/include/app/TVPbkContactStoreUriPtr.h
-epoc32/include/app/TVPbkFieldTypeMapping.h
-epoc32/include/app/TVPbkFieldTypeParameters.h
-epoc32/include/app/TVPbkFieldVersitProperty.h
-epoc32/include/app/TVPbkStoreContactAnalyzer.h
-epoc32/include/app/TVPbkWordParserCallbackParam.h
+epoc32/include/app/spdiacontrol.h
+epoc32/include/app/tlmkitemiddbcombiinfo.h
+epoc32/include/app/tpbk2iconid.h
+epoc32/include/app/tpbkcontactitemfield.h
+epoc32/include/app/tvpbkcontactstoreuriptr.h
+epoc32/include/app/tvpbkfieldtypemapping.h
+epoc32/include/app/tvpbkfieldtypeparameters.h
+epoc32/include/app/tvpbkfieldversitproperty.h
+epoc32/include/app/tvpbkstorecontactanalyzer.h
+epoc32/include/app/tvpbkwordparsercallbackparam.h
epoc32/include/app/vcal.h
epoc32/include/app/vcal.inl
epoc32/include/app/vcard.h
@@ -276,17 +299,17 @@
epoc32/include/app/versit.inl
epoc32/include/app/versittls.h
epoc32/include/app/vobserv.h
-epoc32/include/app/VPbkContactStoreUris.h
-epoc32/include/app/VPbkContactView.hrh
-epoc32/include/app/VPbkContactView.rh
-epoc32/include/app/VPbkContactViewFilterBuilder.h
-epoc32/include/app/VPbkError.h
-epoc32/include/app/VPbkFieldType.hrh
-epoc32/include/app/VPbkFieldType.rh
-epoc32/include/app/VPbkFieldTypeSelectorFactory.h
-epoc32/include/app/VPbkPublicUid.h
-epoc32/include/app/VPbkSyncConstants.h
-epoc32/include/app/VPbkUtils.h
+epoc32/include/app/vpbkcontactstoreuris.h
+epoc32/include/app/vpbkcontactview.hrh
+epoc32/include/app/vpbkcontactview.rh
+epoc32/include/app/vpbkcontactviewfilterbuilder.h
+epoc32/include/app/vpbkerror.h
+epoc32/include/app/vpbkfieldtype.hrh
+epoc32/include/app/vpbkfieldtype.rh
+epoc32/include/app/vpbkfieldtypeselectorfactory.h
+epoc32/include/app/vpbkpublicuid.h
+epoc32/include/app/vpbksyncconstants.h
+epoc32/include/app/vpbkutils.h
epoc32/include/app/vprop.h
epoc32/include/app/vprop.inl
epoc32/include/app/vrecur.h
@@ -296,57 +319,34 @@
epoc32/include/app/vuid.h
epoc32/include/app/vutil.h
epoc32/include/appinfo.rh
+epoc32/include/appmngr2.mbg
+epoc32/include/appmngr2midlet.mbg
+epoc32/include/appmngr2sisx.mbg
+epoc32/include/appmngr2widget.mbg
+epoc32/include/apsettings.mbg
+epoc32/include/apsettingsplugin.mbg
epoc32/include/arp_hdr.h
epoc32/include/asn1cons.h
epoc32/include/asn1dec.h
epoc32/include/asn1enc.h
-epoc32/include/assp/omap3530_assp/assp.mmh
-epoc32/include/assp/omap3530_assp/CyAsSymbianStorageDriver.h
-epoc32/include/assp/omap3530_assp/gpio.h
-epoc32/include/assp/omap3530_assp/locks.h
-epoc32/include/assp/omap3530_assp/omap3530_assp_priv.h
-epoc32/include/assp/omap3530_assp/omap3530_asspreg.h
-epoc32/include/assp/omap3530_assp/omap3530_gpio.h
-epoc32/include/assp/omap3530_assp/omap3530_hardware_base.h
-epoc32/include/assp/omap3530_assp/omap3530_i2c.h
-epoc32/include/assp/omap3530_assp/omap3530_i2creg.h
-epoc32/include/assp/omap3530_assp/omap3530_irqmap.h
-epoc32/include/assp/omap3530_assp/omap3530_ktrace.h
-epoc32/include/assp/omap3530_assp/omap3530_prcm.h
-epoc32/include/assp/omap3530_assp/omap3530_timer.h
-epoc32/include/assp/omap3530_assp/omap3530_uart.h
-epoc32/include/assp/omap3530_assp/omap3530_usbc.h
-epoc32/include/assp/omap3530_shared/omap3_mstick.h
-epoc32/include/assp/omap3530_shared/tps65950.h
-epoc32/include/assp/omap3530_shared/tps65950_registers.h
+epoc32/include/aspsyncutil.mbg
epoc32/include/asymmetric.h
epoc32/include/asymmetric.inl
epoc32/include/asymmetrickeys.h
-epoc32/include/ataudioeventapi.h
-epoc32/include/AudioEffectBase.h
-epoc32/include/AudioEffectData.h
-epoc32/include/AudioEqualizerBase.h
-epoc32/include/AudioEqualizerData.h
-epoc32/include/AudioEqualizerUtility.h
-epoc32/include/AudioEqualizerUtilityData.h
+epoc32/include/audioeffectbase.h
+epoc32/include/audioeffectdata.h
+epoc32/include/audioequalizerbase.h
+epoc32/include/audioequalizerdata.h
+epoc32/include/audioequalizerutility.h
+epoc32/include/audioequalizerutilitydata.h
+epoc32/include/audiofetcher.mbg
+epoc32/include/audiomessage.mbg
epoc32/include/authority16.h
epoc32/include/authority8.h
epoc32/include/authoritycommon.h
-epoc32/include/authserver/aspubsubdefs.h
-epoc32/include/authserver/auth_srv_errs.h
-epoc32/include/authserver/authclient.h
-epoc32/include/authserver/authexpression.h
-epoc32/include/authserver/authexpression.inl
-epoc32/include/authserver/authmgrclient.h
-epoc32/include/authserver/authplugininterface.h
-epoc32/include/authserver/authtypes.h
-epoc32/include/authserver/idandstring.h
-epoc32/include/authserver/identity.h
-epoc32/include/authserver/plugindesc.h
-epoc32/include/authserver/plugindesc.inl
-epoc32/include/authserver/protectionkey.h
+epoc32/include/authtypeplugin.mbg
+epoc32/include/autolock.mbg
epoc32/include/avkon.mbg
-epoc32/include/avkon.rsg
epoc32/include/babackup.h
epoc32/include/babitflags.h
epoc32/include/bacell.h
@@ -370,19 +370,15 @@
epoc32/include/barsread2.h
epoc32/include/basched.h
epoc32/include/baspi.h
-epoc32/include/BassBoostBase.h
-epoc32/include/BassBoostData.h
+epoc32/include/bassboostbase.h
+epoc32/include/bassboostdata.h
epoc32/include/bassnd.h
+epoc32/include/batterypopupcontrol.mbg
epoc32/include/bautils.h
-epoc32/include/beagle/beagle_gpio.h
-epoc32/include/beagle/iolines.h
-epoc32/include/beagle/mconf.h
-epoc32/include/beagle/variant.h
-epoc32/include/beagle/variant.mmh
-epoc32/include/beagle/variantmediadef.h
epoc32/include/bidi.h
epoc32/include/biditext.h
epoc32/include/bidivisual.h
+epoc32/include/big5.h
epoc32/include/bigint.h
epoc32/include/bitbase.h
epoc32/include/bitdev.h
@@ -397,7 +393,10 @@
epoc32/include/bldprivate.hrh
epoc32/include/bldpublic.hrh
epoc32/include/bldregional.hrh
+epoc32/include/bldregional_apac.hrh
+epoc32/include/bldregional_japan.hrh
epoc32/include/bldvariant.hrh
+epoc32/include/blid.mbg
epoc32/include/bluetooth/a2dpoptimisation.h
epoc32/include/bluetooth/a2dpoptimisationparams.h
epoc32/include/bluetooth/btbaseband.h
@@ -405,12 +404,17 @@
epoc32/include/bluetooth/btscoparams.h
epoc32/include/bluetooth/dutmode.h
epoc32/include/bluetooth/eirdatacodec.h
+epoc32/include/bluetooth/hci/bwins/commandseventsu.def
+epoc32/include/bluetooth/hci/eabi/commandseventsu.def
epoc32/include/bluetooth/hci/hcibase.hrh
epoc32/include/bluetooth/hci/hcierrors.h
epoc32/include/bluetooth/hci/hctlbase.hrh
epoc32/include/bluetooth/hci/initialisorbase.hrh
epoc32/include/bluetooth/hci/qdpbase.hrh
epoc32/include/bluetooth/lmoptions.h
+epoc32/include/browser.mbg
+epoc32/include/browseraudiovideoplugin.mbg
+epoc32/include/browserbitmaps.mbg
epoc32/include/bsul/bsul.h
epoc32/include/bsul/ccacheddriveinfo.h
epoc32/include/bsul/clientmessage.h
@@ -423,13 +427,19 @@
epoc32/include/btdevice.h
epoc32/include/btextnotifiers.h
epoc32/include/btextnotifiersconsts.h
+epoc32/include/btkeyboard.mbg
epoc32/include/btmanclient.h
+epoc32/include/btmousebitmaps.mbg
+epoc32/include/btmtmcmds.h
+epoc32/include/btnotif.mbg
epoc32/include/btsdp.h
epoc32/include/btsecurity.h
epoc32/include/btsockaddr.h
epoc32/include/btsocketoptionlevels.h
epoc32/include/btsyncbandwidth.h
epoc32/include/bttypes.h
+epoc32/include/btui.mbg
+epoc32/include/bubblemanager.mbg
epoc32/include/c32comm.h
epoc32/include/c32comm.inl
epoc32/include/caf/agent.h
@@ -450,7 +460,18 @@
epoc32/include/caf/stringattributeset.h
epoc32/include/caf/virtualpath.h
epoc32/include/caf/virtualpathptr.h
-epoc32/include/caldavsession.h
+epoc32/include/calcsoft.mbg
+epoc32/include/calendar.mbg
+epoc32/include/calendarsearchplugin.mbg
+epoc32/include/calendarsettings.mbg
+epoc32/include/callstatus.mbg
+epoc32/include/cameraapp.mbg
+epoc32/include/cameraapp2.mbg
+epoc32/include/camerasettingsplugin.mbg
+epoc32/include/capsimageprocessor/capsimageprocessorextension.h
+epoc32/include/capsspmoutility/capsspmoutility.h
+epoc32/include/cbsuiapp.mbg
+epoc32/include/ccappdetailsviewplugin.mbg
epoc32/include/ccertattributefilter.h
epoc32/include/cctcertinfo.h
epoc32/include/cdbcols.h
@@ -462,12 +483,24 @@
epoc32/include/certificateapps.h
epoc32/include/cflog.mmh
epoc32/include/charactersetconverter.h
+epoc32/include/charactersetconverter.inl
epoc32/include/charconv.h
-epoc32/include/cinidata.h
+epoc32/include/clockapp.mbg
+epoc32/include/clockapp_tab.mbg
+epoc32/include/cmailhandlerplugin.mbg
+epoc32/include/cmmanager.mbg
+epoc32/include/cmpluginpacketdata.mbg
+epoc32/include/cmpluginvpn.mbg
+epoc32/include/cmpluginwlan.mbg
epoc32/include/cntdef.hrh
+epoc32/include/coever.h
epoc32/include/commdb.h
epoc32/include/commdbconnpref.h
+epoc32/include/commondialogs.mbg
epoc32/include/commonphoneparser.h
+epoc32/include/commsdat.h
+epoc32/include/commsdattypesv1_1.h
+epoc32/include/comms-infras/commsdebugutility.h
epoc32/include/comms-infras/commsdebugutility.mmh
epoc32/include/comms-infras/cs_mobility_apiext.h
epoc32/include/comms-infras/datamonitormessages.h
@@ -492,18 +525,23 @@
epoc32/include/comms-infras/ss_fact_internal.h
epoc32/include/comms-infras/ss_factorycontainermap.h
epoc32/include/comms-infras/ss_protopt.h
-epoc32/include/commsdat.h
-epoc32/include/commsdattypesv1_1.h
-epoc32/include/ConeResLoader.h
+epoc32/include/coneresloader.h
epoc32/include/connect/abclient.h
epoc32/include/connect/abclientserver.h
epoc32/include/connect/panic.h
epoc32/include/connect/sbdefs.h
epoc32/include/connect/tserverstart.h
+epoc32/include/connectionmonitorplugin.mbg
+epoc32/include/connectionmonitorui.mbg
+epoc32/include/connectionuiutilities.mbg
epoc32/include/connectprog.h
+epoc32/include/connman.mbg
epoc32/include/connpref.h
epoc32/include/conpics.h
+epoc32/include/constd.h
+epoc32/include/contactssearchplugin.mbg
epoc32/include/convdata.h
+epoc32/include/conversations.mbg
epoc32/include/convgeneratedcpp.h
epoc32/include/convnames.h
epoc32/include/convutils.h
@@ -514,8 +552,10 @@
epoc32/include/cryptospi/cryptomacapi.h
epoc32/include/cryptospi/cryptoparams.h
epoc32/include/cryptospi/cryptorandomapi.h
+epoc32/include/cryptospi/cryptospi_errs.h
epoc32/include/cryptospi/cryptospistateapi.h
epoc32/include/cryptospi/extendedcharacteristics.h
+epoc32/include/cryptospi/keys.h
epoc32/include/cryptospi/plugincharacteristics.h
epoc32/include/cryptospi/pluginselectorbase.h
epoc32/include/cryptospi/ruleselector.h
@@ -525,7 +565,9 @@
epoc32/include/cs_subconevents.inl
epoc32/include/cs_subconparams.h
epoc32/include/cs_subconparams.inl
+epoc32/include/csc.mbg
epoc32/include/csch_cli.h
+epoc32/include/cshelp.mbg
epoc32/include/cshelp/conset.hlp.hrh
epoc32/include/cshelp/div.hlp.hrh
epoc32/include/cshelp/find.hlp.hrh
@@ -549,7 +591,7 @@
epoc32/include/ct/tcttokenobjecthandle.h
epoc32/include/ct/tcttokentypeattribute.h
epoc32/include/ctsy/tflogger.h
-epoc32/include/CustomCommandTypes.h
+epoc32/include/customcommandtypes.h
epoc32/include/d32dbms.h
epoc32/include/d32dbms.inl
epoc32/include/d32dbmsconstants.h
@@ -557,8 +599,62 @@
epoc32/include/data_caged_locations.mk
epoc32/include/data_caging_path_literals.hrh
epoc32/include/data_caging_paths.hrh
+epoc32/include/data_caging_paths.prf
epoc32/include/data_caging_paths_for_iby.hrh
epoc32/include/data_caging_paths_strings.hrh
+epoc32/include/dbgtrccomm.h
+epoc32/include/def/bmarm/domainpolicyu.def
+epoc32/include/def/bwins/agentdialogu.def
+epoc32/include/def/bwins/audiocontextfactory.def
+epoc32/include/def/bwins/devsoundadaptationinfo.def
+epoc32/include/def/bwins/domainpolicyu.def
+epoc32/include/def/bwins/licenseetsyu.def
+epoc32/include/def/bwins/mmfdevsound.def
+epoc32/include/def/bwins/restartsysu.def
+epoc32/include/def/bwins/ssmuiproviderdllu.def
+epoc32/include/def/eabi/agentdialogu.def
+epoc32/include/def/eabi/agentu.def
+epoc32/include/def/eabi/audiocontextfactory.def
+epoc32/include/def/eabi/coefepu.def
+epoc32/include/def/eabi/devsoundadaptationinfo.def
+epoc32/include/def/eabi/domainpolicyu.def
+epoc32/include/def/eabi/ecamadvsettingsu.def
+epoc32/include/def/eabi/ecamdirectviewfinderu.def
+epoc32/include/def/eabi/ecamhistogramu.def
+epoc32/include/def/eabi/ecamoverlayu.def
+epoc32/include/def/eabi/ecamsnapshotu.def
+epoc32/include/def/eabi/ecamu.def
+epoc32/include/def/eabi/eikinitu.def
+epoc32/include/def/eabi/eloclu.def
+epoc32/include/def/eabi/libegl12u.def
+epoc32/include/def/eabi/libegl13u.def
+epoc32/include/def/eabi/libegl14u.def
+epoc32/include/def/eabi/libglesv1_cm11u.def
+epoc32/include/def/eabi/libglesv2u.def
+epoc32/include/def/eabi/libopenvg10u.def
+epoc32/include/def/eabi/libopenvg11u.def
+epoc32/include/def/eabi/libopenvgu10u.def
+epoc32/include/def/eabi/libopenvgu11u.def
+epoc32/include/def/eabi/licenseetsyu.def
+epoc32/include/def/eabi/mmcommon.def
+epoc32/include/def/eabi/mmfdevsound.def
+epoc32/include/def/eabi/opengles11u.def
+epoc32/include/def/eabi/openglesu.def
+epoc32/include/def/eabi/restartsysu.def
+epoc32/include/def/eabi/ssmuiproviderdllu.def
+epoc32/include/def/eabi/wsclicku.def
+epoc32/include/def/win32/libegl12u.def
+epoc32/include/def/win32/libegl13u.def
+epoc32/include/def/win32/libegl14u.def
+epoc32/include/def/win32/libglesv1_cm11u.def
+epoc32/include/def/win32/libglesv2u.def
+epoc32/include/def/win32/libopenvg10u.def
+epoc32/include/def/win32/libopenvg11u.def
+epoc32/include/def/win32/libopenvgu10u.def
+epoc32/include/def/win32/libopenvgu11u.def
+epoc32/include/def/win32/mmcommon.def
+epoc32/include/def/win32/opengles11u.def
+epoc32/include/def/win32/openglesu.def
epoc32/include/defaultcaps.hrh
epoc32/include/delimitedparser16.h
epoc32/include/delimitedparser8.h
@@ -569,14 +665,23 @@
epoc32/include/delimitedpathsegment8.h
epoc32/include/delimitedquery16.h
epoc32/include/delimitedquery8.h
+epoc32/include/devdiagapp.mbg
+epoc32/include/devdiagconnectivitysuiteplugin.mbg
+epoc32/include/devdiagcoveragesuiteplugin.mbg
+epoc32/include/devdiaghardwaresuiteplugin.mbg
+epoc32/include/devdiagservicessuiteplugin.mbg
+epoc32/include/devencgsplugin.mbg
epoc32/include/dial.h
epoc32/include/dial.inl
epoc32/include/dial_consts.h
+epoc32/include/dialer.mbg
+epoc32/include/disconnectdlgui.mbg
epoc32/include/displaymode.h
-epoc32/include/DistanceAttenuationBase.h
-epoc32/include/DistanceAttenuationData.h
-epoc32/include/DopplerBase.h
-epoc32/include/DopplerData.h
+epoc32/include/distanceattenuationbase.h
+epoc32/include/distanceattenuationdata.h
+epoc32/include/dopplerbase.h
+epoc32/include/dopplerdata.h
+epoc32/include/downloadmgruilib.mbg
epoc32/include/driveinfo.h
epoc32/include/driveinfo.inl
epoc32/include/drivers/camerasc.h
@@ -595,8 +700,12 @@
epoc32/include/drivers/usbcshared.inl
epoc32/include/drivers/usbdi_channel.h
epoc32/include/drivers/usbdi_hub.h
-epoc32/include/DrmAudioSamplePlayer.h
+epoc32/include/drivers/usbware_config.mmh
+epoc32/include/drmaudiosampleplayer.h
+epoc32/include/drmencryptor.mbg
+epoc32/include/drmrightsmanager.mbg
epoc32/include/dscstorecommondefs.hrh
+epoc32/include/dummyviewfinder.mbg
epoc32/include/e32atomics.h
epoc32/include/e32base.h
epoc32/include/e32base.inl
@@ -628,6 +737,7 @@
epoc32/include/e32std.inl
epoc32/include/e32test.h
epoc32/include/e32utrace.mmh
+epoc32/include/easydialing.mbg
epoc32/include/ecam.h
epoc32/include/ecam/cameradirectviewfinderuidif.hrh
epoc32/include/ecam/cameraoverlay.h
@@ -647,6 +757,7 @@
epoc32/include/ecamuids.hrh
epoc32/include/ecamuidsconst.hrh
epoc32/include/ecamuidsdef.hrh
+epoc32/include/ecmtclient.h
epoc32/include/ecom/ecom.h
epoc32/include/ecom/ecomerrorcodes.h
epoc32/include/ecom/ecomresolverparams.h
@@ -660,31 +771,30 @@
epoc32/include/ecom/registryinfov2.rh
epoc32/include/ecom/registryinfov3.rh
epoc32/include/ecom/resolver.h
-epoc32/include/EGL/egl.h
-epoc32/include/EGL/eglext.h
-epoc32/include/EGL/egltypes.h
-epoc32/include/EGL/egluids.hrh
-epoc32/include/eglosnativewindowtype.h
-epoc32/include/eikcdlg.rsg
-epoc32/include/eikcoctl.rsg
+epoc32/include/editorundo.h
+epoc32/include/egl/egl.h
+epoc32/include/egl/eglext.h
+epoc32/include/egl/egltypes.h
+epoc32/include/egl/egluids.hrh
epoc32/include/eikcolor.hrh
-epoc32/include/eikcore.rsg
-epoc32/include/eikctl.rsg
epoc32/include/elements/cftransportmacro.h
epoc32/include/elements/metadata.h
epoc32/include/elements/metadata.inl
epoc32/include/elements/sd_mintercept.mmh
+epoc32/include/emailwidgeticon.mbg
+epoc32/include/emailwidgetsettings.mbg
epoc32/include/emanaged.h
epoc32/include/emisc.h
epoc32/include/emsinformationelement.h
epoc32/include/emsinformationelement.inl
epoc32/include/emspictureie.inl
-epoc32/include/EnvironmentalReverbBase.h
-epoc32/include/EnvironmentalReverbData.h
-epoc32/include/EnvironmentalReverbUtility.h
-epoc32/include/EnvironmentalReverbUtilityData.h
-epoc32/include/EPos_PrivacyNotifier.hrh
-epoc32/include/errorres.rsg
+epoc32/include/environmentalreverbbase.h
+epoc32/include/environmentalreverbdata.h
+epoc32/include/environmentalreverbutility.h
+epoc32/include/environmentalreverbutilitydata.h
+epoc32/include/epos_privacynotifier.hrh
+epoc32/include/eposlmglcategories.mbg
+epoc32/include/equalizer.mbg
epoc32/include/errors/generic/emailerr.ra
epoc32/include/errors/generic/emailerr.rls
epoc32/include/errors/generic/irerr.ra
@@ -696,6 +806,8 @@
epoc32/include/es_wsms.h
epoc32/include/es_wsms.inl
epoc32/include/escapeutils.h
+epoc32/include/esmrcasplugin.mbg
+epoc32/include/esmrgui.mbg
epoc32/include/estlib.h
epoc32/include/estring.h
epoc32/include/et_clsvr.h
@@ -707,12 +819,24 @@
epoc32/include/etslotnum.h
epoc32/include/eui_addr.h
epoc32/include/euserhl.h
+epoc32/include/eventmessageapi.h
+epoc32/include/eventmessageapibase.h
+epoc32/include/eventmessageapidefs.h
+epoc32/include/eventmessageapifactory.h
+epoc32/include/eventmessageapiinternaldata.h
+epoc32/include/eventmessagekeyobserversymbian.h
+epoc32/include/eventmessagekeywatchersymbian.h
+epoc32/include/evteditor.mbg
+epoc32/include/evthandlerserver.mbg
+epoc32/include/evtinfonote.mbg
+epoc32/include/evtmgmtui.mbg
epoc32/include/ewsd.h
-epoc32/include/ExifModify.h
-epoc32/include/ExifRead.h
-epoc32/include/ExifTag.h
+epoc32/include/exifmodify.h
+epoc32/include/exifread.h
+epoc32/include/exiftag.h
epoc32/include/exifutility.h
epoc32/include/ext_hdr.h
+epoc32/include/extensionmanager.mbg
epoc32/include/exterror.h
epoc32/include/ezbufman.h
epoc32/include/ezcompressor.h
@@ -727,18 +851,31 @@
epoc32/include/f32file.inl
epoc32/include/f32file64.h
epoc32/include/f32file64.inl
+epoc32/include/f32notification.h
epoc32/include/faxdefn.h
epoc32/include/fbs.h
+epoc32/include/fbsmessage.h
epoc32/include/featdiscovery.h
epoc32/include/featureinfo.h
epoc32/include/features.hrh
epoc32/include/featureuids.h
+epoc32/include/filebrowser_extraicons.mbg
+epoc32/include/filelist.mbg
+epoc32/include/filemanager.mbg
+epoc32/include/filessearchplugin.mbg
+epoc32/include/filesystem_automounter.h
+epoc32/include/filesystem_exfat.h
epoc32/include/filesystem_fat.h
epoc32/include/finditemengine.h
epoc32/include/fldbase.h
epoc32/include/fldbltin.h
epoc32/include/fldinfo.h
+epoc32/include/flogger.h
+epoc32/include/flogger.inl
+epoc32/include/fmradio.mbg
epoc32/include/fntstore.h
+epoc32/include/fotaserver.mbg
+epoc32/include/freestyleemailui.mbg
epoc32/include/frmconst.h
epoc32/include/frmframe.h
epoc32/include/frmlaydt.h
@@ -747,33 +884,69 @@
epoc32/include/frmtlay.h
epoc32/include/frmtview.h
epoc32/include/frmvis.h
+epoc32/include/fsccallplugin.mbg
+epoc32/include/fscpocplugin.mbg
+epoc32/include/fscsaveascontactplugin.mbg
+epoc32/include/fscsendplugin.mbg
+epoc32/include/fsuidatamtm.mbg
+epoc32/include/ganes.mbg
+epoc32/include/gb2312.h
+epoc32/include/gbk.h
epoc32/include/gcc.h
+epoc32/include/gcc_mingw/gcc_mingw.h
epoc32/include/gcc_mingw/gcc_mingw_3_4_2.h
epoc32/include/gcce/gcce.h
epoc32/include/gdi.h
epoc32/include/gdi.inl
epoc32/include/gifscaler.h
-epoc32/include/GLES/egl.h
-epoc32/include/GLES/egltypes.h
-epoc32/include/GLES/gl.h
-epoc32/include/GLES/glext.h
-epoc32/include/GLES/glextplatform.h
-epoc32/include/GLES/glplatform.h
-epoc32/include/GLES/legacy_egl_1_1/egl.h
-epoc32/include/GLES/legacy_egl_1_1/egltypes.h
-epoc32/include/GLES/openglesuids.hrh
-epoc32/include/GLES2/gl2.h
-epoc32/include/GLES2/gl2ext.h
-epoc32/include/GLES2/gl2extplatform.h
-epoc32/include/GLES2/gl2platform.h
-epoc32/include/GLES2/openglesuids.hrh
+epoc32/include/gles/egl.h
+epoc32/include/gles/egltypes.h
+epoc32/include/gles/gl.h
+epoc32/include/gles/glext.h
+epoc32/include/gles/glextplatform.h
+epoc32/include/gles/glplatform.h
+epoc32/include/gles/legacy_egl_1_1/egl.h
+epoc32/include/gles/legacy_egl_1_1/egltypes.h
+epoc32/include/gles/openglesuids.hrh
+epoc32/include/gles2/gl2.h
+epoc32/include/gles2/gl2ext.h
+epoc32/include/gles2/gl2extplatform.h
+epoc32/include/gles2/gl2platform.h
+epoc32/include/gles2/openglesuids.hrh
+epoc32/include/glxicons.mbg
epoc32/include/gmxmlparser.h
+epoc32/include/gnrlsearchuisvg.mbg
+epoc32/include/google_brand_graphics.mbg
epoc32/include/gprsprog.h
+epoc32/include/graphics/def/bwins/directgdiadapteru.def
+epoc32/include/graphics/def/bwins/fbsrasterizeru.def
+epoc32/include/graphics/def/bwins/graphicsresourceadapteru.def
+epoc32/include/graphics/def/eabi/directgdiadapteru.def
+epoc32/include/graphics/def/eabi/fbsrasterizeru.def
+epoc32/include/graphics/def/eabi/graphicsresourceadapteru.def
epoc32/include/graphics/eglsynchelper.h
epoc32/include/graphics/fbsdefs.h
epoc32/include/graphics/streammap.h
epoc32/include/graphics/symbianstream.h
epoc32/include/graphicsaccelerator.h
+epoc32/include/gridroot.mbg
+epoc32/include/gsaccplugin.mbg
+epoc32/include/gsadminplugin.mbg
+epoc32/include/gsappsplugin.mbg
+epoc32/include/gscallbarringplugin.mbg
+epoc32/include/gscalldivertplugin.mbg
+epoc32/include/gscallplugin.mbg
+epoc32/include/gsconnsettingsplugin.mbg
+epoc32/include/gsconplugin.mbg
+epoc32/include/gsdasplugin.mbg
+epoc32/include/gsdatacallplugin.mbg
+epoc32/include/gsdevdiagplugin.mbg
+epoc32/include/gsdevicemanagementplugin.mbg
+epoc32/include/gsdisplayplugin.mbg
+epoc32/include/gsfwicon.mbg
+epoc32/include/gsgenplugin.mbg
+epoc32/include/gsinstallationsplugin.mbg
+epoc32/include/gslangplugin.mbg
epoc32/include/gsmubuf.h
epoc32/include/gsmuelem.h
epoc32/include/gsmuelem.inl
@@ -792,10 +965,23 @@
epoc32/include/gsmuset.inl
epoc32/include/gsmustor.h
epoc32/include/gsmustor.inl
+epoc32/include/gsnetworkplugin.mbg
+epoc32/include/gsopticaljoystickplugin.mbg
+epoc32/include/gspdataplugin.mbg
+epoc32/include/gspeninputplugin.mbg
+epoc32/include/gspowersavingqueryplugin.mbg
+epoc32/include/gsprofilesplugin.mbg
+epoc32/include/gsrfsplugin.mbg
+epoc32/include/gssecplugin.mbg
+epoc32/include/gssenplugin.mbg
+epoc32/include/gssipsettingsplugin.mbg
+epoc32/include/gssynchronisationplugin.mbg
+epoc32/include/gstelplugin.mbg
+epoc32/include/gsvmbxplugin.mbg
+epoc32/include/gsvoicerecorderplugin.mbg
+epoc32/include/gsxdmplugin.mbg
epoc32/include/gulfont.hrh
epoc32/include/gulftflg.hrh
-epoc32/include/hal.h
-epoc32/include/hal_data.h
epoc32/include/hash.h
epoc32/include/httpstringconstants.h
epoc32/include/hwrmhaptics.h
@@ -807,6 +993,7 @@
epoc32/include/hwrmpowerstatesdkpskeys.h
epoc32/include/hwrmvibra.h
epoc32/include/hwrmvibrasdkcrkeys.h
+epoc32/include/iaupdate.mbg
epoc32/include/icl/exifimagedisplay.hrh
epoc32/include/icl/exifimagedisplayext.h
epoc32/include/icl/geniclimagedisplay.hrh
@@ -855,6 +1042,8 @@
epoc32/include/imageprocessor/imageprocessorpreview.h
epoc32/include/imageprocessor/imageprocessorprogressinfo.h
epoc32/include/imagetransform.h
+epoc32/include/imcvuiapp.mbg
+epoc32/include/imgprintbitmaps.mbg
epoc32/include/in_chk.h
epoc32/include/in_hdr.h
epoc32/include/in_pkt.h
@@ -863,18 +1052,21 @@
epoc32/include/in6_opt.h
epoc32/include/inet6err.h
epoc32/include/inetprottextutils.h
-epoc32/include/iniparser.h
epoc32/include/ip_subconparams.h
epoc32/include/ip_subconparams.inl
epoc32/include/ip4_hdr.h
epoc32/include/ip6_hdr.h
epoc32/include/ir_sock.h
+epoc32/include/irs.h
epoc32/include/isbaseof.h
epoc32/include/issame.h
-epoc32/include/kernel/hal_int.h
+epoc32/include/jisx0201.h
+epoc32/include/jisx0208.h
+epoc32/include/jisx0212.h
epoc32/include/kernel/kern_ext.mmh
-epoc32/include/KHR/khrplatform.h
+epoc32/include/khr/khrplatform.h
epoc32/include/khronos_types.h
+epoc32/include/landmarks.mbg
epoc32/include/lbs.h
epoc32/include/lbs.inl
epoc32/include/lbs/epos_privacynotifier.hrh
@@ -898,7 +1090,9 @@
epoc32/include/lbspositioninfo.h
epoc32/include/lbsrequestor.h
epoc32/include/lbssatellite.h
-epoc32/include/lbsSuplPsyAdaptation.h
+epoc32/include/lbssuplpsyadaptation
+epoc32/include/lbssuplpsyadaptation.h
+epoc32/include/lcdui.mbg
epoc32/include/libc/_ansi.h
epoc32/include/libc/arpa/ftp.h
epoc32/include/libc/arpa/inet.h
@@ -965,36 +1159,46 @@
epoc32/include/libc/unistd.h
epoc32/include/linebreak.h
epoc32/include/linkedfonts.h
-epoc32/include/ListenerDopplerBase.h
-epoc32/include/ListenerLocationBase.h
-epoc32/include/ListenerOrientationBase.h
+epoc32/include/listenerdopplerbase.h
+epoc32/include/listenerlocationbase.h
+epoc32/include/listenerorientationbase.h
+epoc32/include/lmkui.mbg
+epoc32/include/lmrefapp.mbg
+epoc32/include/loadgen_extraicons.mbg
epoc32/include/localtypes.h
-epoc32/include/LocationBase.h
-epoc32/include/LocationData.h
+epoc32/include/locationbase.h
+epoc32/include/locationdata.h
+epoc32/include/lockapp.mbg
+epoc32/include/locpsysettings.mbg
+epoc32/include/locsuplsettings.mbg
+epoc32/include/locsysuiview.mbg
epoc32/include/logcli.h
epoc32/include/logcli.inl
epoc32/include/logclientchangeobserver.h
epoc32/include/logeng.h
epoc32/include/logfilterandeventconstants.hrh
+epoc32/include/logs.mbg
epoc32/include/logsmspdudata.h
epoc32/include/logview.h
epoc32/include/logview.inl
epoc32/include/logviewchangeobserver.h
+epoc32/include/logwrap.h
epoc32/include/logwrap.hrh
epoc32/include/logwrap.inl
-epoc32/include/logwrap.h
epoc32/include/logwrapconst.h
-epoc32/include/LoudnessBase.h
-epoc32/include/LoudnessData.h
-epoc32/include/mateventcompleteobserver.h
-epoc32/include/MAudioEffectObserver.h
-epoc32/include/MAudioEqualizerObserver.h
-epoc32/include/MBassBoostObserver.h
+epoc32/include/loudnessbase.h
+epoc32/include/loudnessdata.h
+epoc32/include/matrixmenudata.mbg
+epoc32/include/maudioeffectobserver.h
+epoc32/include/maudioequalizerobserver.h
+epoc32/include/mbassboostobserver.h
epoc32/include/mbmstypes.h
+epoc32/include/mceextraicons.mbg
epoc32/include/mcertstore.h
+epoc32/include/mcesettingsgspluginicons.mbg
epoc32/include/mctcertapps.h
-epoc32/include/MCustomCommand.h
-epoc32/include/MCustomInterface.h
+epoc32/include/mcustomcommand.h
+epoc32/include/mcustominterface.h
epoc32/include/mda/client/utility.h
epoc32/include/mda/common/audio.h
epoc32/include/mda/common/audio.hrh
@@ -1015,22 +1219,27 @@
epoc32/include/mdaaudiosampleeditor.h
epoc32/include/mdaaudiosampleplayer.h
epoc32/include/mdaaudiotoneplayer.h
+epoc32/include/mdaframeinfo.h
epoc32/include/mdaimageconverter.h
epoc32/include/mdf/codecapiresolver.hrh
epoc32/include/mdf/codecapiuids.hrh
epoc32/include/mdf/puloaderuids.hrh
-epoc32/include/MDistanceAttenuationObserver.h
-epoc32/include/MDopplerObserver.h
+epoc32/include/mdistanceattenuationobserver.h
+epoc32/include/mdopplerobserver.h
+epoc32/include/mediafilelist.mbg
+epoc32/include/mediasettings.mbg
epoc32/include/medobsrv.h
-epoc32/include/MEnvironmentalReverbObserver.h
+epoc32/include/menvironmentalreverbobserver.h
+epoc32/include/messagessearchplugin.mbg
epoc32/include/metadatabase.h
+epoc32/include/microsoft_brand_graphics.mbg
epoc32/include/midiclientutility.h
epoc32/include/miutstd.hrh
-epoc32/include/MListenerDopplerObserver.h
-epoc32/include/MListenerLocationObserver.h
-epoc32/include/MListenerOrientationObserver.h
-epoc32/include/MLocationObserver.h
-epoc32/include/MLoudnessObserver.h
+epoc32/include/mlistenerdopplerobserver.h
+epoc32/include/mlistenerlocationobserver.h
+epoc32/include/mlistenerorientationobserver.h
+epoc32/include/mlocationobserver.h
+epoc32/include/mloudnessobserver.h
epoc32/include/mm/conversioncoefficient.h
epoc32/include/mm/mmcaf.h
epoc32/include/mmf/common/midistandardcustomcommands.h
@@ -1107,121 +1316,186 @@
epoc32/include/mmf/server/mmfdatasource.h
epoc32/include/mmf/server/mmfdatasourcesink.hrh
epoc32/include/mmf/server/mmfdes.h
+epoc32/include/mmf/server/mmfdevsoundcustominterfaceobserver.h
epoc32/include/mmf/server/mmfdevsoundcustominterfacesupport.h
+epoc32/include/mmf/server/mmfdevsoundcustominterfacesupportclasses.h
epoc32/include/mmf/server/mmffile.h
epoc32/include/mmf/server/mmfformat.h
epoc32/include/mmf/server/mmfformat.inl
epoc32/include/mmf/server/mmfhwdevice.h
epoc32/include/mmf/server/mmfhwdevice.inl
+epoc32/include/mmf/server/mmfhwdevicecmds.h
epoc32/include/mmf/server/mmfsubthreadbase.h
epoc32/include/mmf/server/mmfswcodecwrappercustominterfacesuids.hrh
epoc32/include/mmf/server/mmfurl.h
epoc32/include/mmf/server/mmfvideoframebuffer.h
epoc32/include/mmf/server/sounddevice.h
epoc32/include/mmf/server/sounddevice.inl
+epoc32/include/mmf/server/taskconfig.h
epoc32/include/mmfaudioiointerfaceuids.hrh
epoc32/include/mmfclntutility.h
epoc32/include/mmfcontrollerimplementationuids.hrh
epoc32/include/mmfformatimplementationuids.hrh
epoc32/include/mmfplugininterfaceuids.hrh
-epoc32/include/MOrientationObserver.h
+epoc32/include/mmsui.mbg
+epoc32/include/mnrefprovider.mbg
+epoc32/include/morientationobserver.h
epoc32/include/mparser.h
-epoc32/include/MRoomLevelObserver.h
-epoc32/include/MSourceDopplerObserver.h
-epoc32/include/MSourceLocationObserver.h
-epoc32/include/MSourceOrientationObserver.h
-epoc32/include/MStereoWideningObserver.h
+epoc32/include/mpx.mbg
+epoc32/include/mpxaddtracksdialog.mbg
+epoc32/include/mpxcollectionview.mbg
+epoc32/include/mpxcollectionviewhg.mbg
+epoc32/include/mpxcommonplaybackview.mbg
+epoc32/include/mpxcommonui.mbg
+epoc32/include/mpxdbhgplugin.mbg
+epoc32/include/mpxdbplugin.mbg
+epoc32/include/mpxembeddedplaybackview.mbg
+epoc32/include/mpxmainview.mbg
+epoc32/include/mpxmediakeyhandler.mbg
+epoc32/include/mpxpodcastcollectionview.mbg
+epoc32/include/mpxpodcastdbplugin.mbg
+epoc32/include/mpxpodcastplaybackview.mbg
+epoc32/include/mpxscreensaverplugin.mbg
+epoc32/include/mpxupnpplaybackview.mbg
+epoc32/include/mpxvideoplaybackcontrols.mbg
+epoc32/include/mroomlevelobserver.h
+epoc32/include/msgeditor.mbg
+epoc32/include/msgeditor_ah.mbg
+epoc32/include/msgmailutils.mbg
+epoc32/include/msgrelay.h
+epoc32/include/msgsession.h
+epoc32/include/msgtypes.h
+epoc32/include/msgurlhandler.mbg
+epoc32/include/msourcedopplerobserver.h
+epoc32/include/msourcelocationobserver.h
+epoc32/include/msourceorientationobserver.h
+epoc32/include/mstereowideningobserver.h
epoc32/include/msvstd.hrh
epoc32/include/mtmdef.hrh
epoc32/include/mtmuidef.hrh
epoc32/include/mtmuidsdef.hrh
epoc32/include/mtp/mtpdataproviderconfig.hrh
epoc32/include/mtud.hrh
+epoc32/include/muiu.mbg
+epoc32/include/mulsliderwidget.mbg
+epoc32/include/multicaluidialog.mbg
+epoc32/include/multimediasearchplugin.mbg
+epoc32/include/musichomescreenicons.mbg
+epoc32/include/musicwidgeticon.mbg
+epoc32/include/musindicatoricons.mbg
+epoc32/include/mussettingsplugin.mbg
+epoc32/include/musui.mbg
+epoc32/include/musui_aif.mbg
+epoc32/include/musuiicons.mbg
+epoc32/include/musuitoolbaricons.mbg
epoc32/include/mw/absolutevolumeapi.h
epoc32/include/mw/absolutevolumeapicontroller.h
epoc32/include/mw/absolutevolumeapicontrollerobserver.h
epoc32/include/mw/absolutevolumeapitarget.h
epoc32/include/mw/absolutevolumeapitargetobserver.h
-epoc32/include/mw/ActiveApDb.h
+epoc32/include/mw/activeapdb.h
epoc32/include/mw/activefavouritesdbnotifier.h
-epoc32/include/mw/AiwCommon.h
-epoc32/include/mw/AiwCommon.hrh
-epoc32/include/mw/AiwCommon.rh
-epoc32/include/mw/AiwGenericParam.h
-epoc32/include/mw/AiwGenericParam.hrh
-epoc32/include/mw/AiwGenericParam.inl
-epoc32/include/mw/AiwServiceHandler.h
-epoc32/include/mw/AiwVariant.h
-epoc32/include/mw/AiwVariant.inl
-epoc32/include/mw/AiwVariantType.hrh
+epoc32/include/mw/activeqt/activeqt
+epoc32/include/mw/activeqt/headers.pri
+epoc32/include/mw/activeqt/qaxaggregated
+epoc32/include/mw/activeqt/qaxaggregated.h
+epoc32/include/mw/activeqt/qaxbase
+epoc32/include/mw/activeqt/qaxbase.h
+epoc32/include/mw/activeqt/qaxbindable
+epoc32/include/mw/activeqt/qaxbindable.h
+epoc32/include/mw/activeqt/qaxclass
+epoc32/include/mw/activeqt/qaxfactory
+epoc32/include/mw/activeqt/qaxfactory.h
+epoc32/include/mw/activeqt/qaxobject
+epoc32/include/mw/activeqt/qaxobject.h
+epoc32/include/mw/activeqt/qaxscript
+epoc32/include/mw/activeqt/qaxscript.h
+epoc32/include/mw/activeqt/qaxscriptengine
+epoc32/include/mw/activeqt/qaxscriptmanager
+epoc32/include/mw/activeqt/qaxselect
+epoc32/include/mw/activeqt/qaxselect.h
+epoc32/include/mw/activeqt/qaxtypes.h
+epoc32/include/mw/activeqt/qaxwidget
+epoc32/include/mw/activeqt/qaxwidget.h
+epoc32/include/mw/aiwcommon.h
+epoc32/include/mw/aiwcommon.hrh
+epoc32/include/mw/aiwcommon.rh
+epoc32/include/mw/aiwgenericparam.h
+epoc32/include/mw/aiwgenericparam.hrh
+epoc32/include/mw/aiwgenericparam.inl
+epoc32/include/mw/aiwservicehandler.h
+epoc32/include/mw/aiwvariant.h
+epoc32/include/mw/aiwvariant.inl
+epoc32/include/mw/aiwvarianttype.hrh
epoc32/include/mw/aknanim.hrh
epoc32/include/mw/aknanim.rh
epoc32/include/mw/aknapp.h
epoc32/include/mw/aknappui.h
-epoc32/include/mw/AknBidiTextUtils.h
-epoc32/include/mw/AknBitmapAnimation.h
+epoc32/include/mw/aknbiditextutils.h
+epoc32/include/mw/aknbitmapanimation.h
epoc32/include/mw/aknborders.h
epoc32/include/mw/aknbutton.h
epoc32/include/mw/akncheckboxsettingpage.h
epoc32/include/mw/aknchoicelist.h
epoc32/include/mw/aknclearer.h
-epoc32/include/mw/AknColourSelectionGrid.h
-epoc32/include/mw/AknCommonDialogs.h
-epoc32/include/mw/AknCommonDialogsDynMem.h
+epoc32/include/mw/akncolourselectiongrid.h
+epoc32/include/mw/akncommondialogs.h
+epoc32/include/mw/akncommondialogsdynmem.h
epoc32/include/mw/aknconsts.h
epoc32/include/mw/akncontext.h
-epoc32/include/mw/AknControl.h
+epoc32/include/mw/akncontrol.h
epoc32/include/mw/akncustomtreeordering.h
-epoc32/include/mw/AknDef.h
-epoc32/include/mw/AknDef.hrh
-epoc32/include/mw/AknDesCArrayDecorator.h
-epoc32/include/mw/AknDialog.h
-epoc32/include/mw/AknDlgShut.h
-epoc32/include/mw/AknDoc.h
-epoc32/include/mw/aknEditStateIndicator.h
+epoc32/include/mw/akndef.h
+epoc32/include/mw/akndef.hrh
+epoc32/include/mw/akndescarraydecorator.h
+epoc32/include/mw/akndialog.h
+epoc32/include/mw/akndlgshut.h
+epoc32/include/mw/akndoc.h
+epoc32/include/mw/akneditstateindicator.h
epoc32/include/mw/aknedsts.h
epoc32/include/mw/aknedstsobs.h
epoc32/include/mw/aknenv.h
-epoc32/include/mw/AknFontAccess.h
-epoc32/include/mw/AknFontCategory.hrh
-epoc32/include/mw/AknFontIdOffsets.hrh
-epoc32/include/mw/AknFontSpecification.h
-epoc32/include/mw/AknForm.h
-epoc32/include/mw/AknGlobalConfirmationQuery.h
-epoc32/include/mw/AknGlobalListMsgQuery.h
-epoc32/include/mw/AknGlobalListQuery.h
-epoc32/include/mw/AknGlobalMsgQuery.h
-epoc32/include/mw/AknGlobalNote.h
-epoc32/include/mw/AknGlobalProgressDialog.h
-epoc32/include/mw/AknGMSStyleGrid.h
-epoc32/include/mw/AknGrid.h
-epoc32/include/mw/AknGridM.h
-epoc32/include/mw/AknGridView.h
+epoc32/include/mw/aknfontaccess.h
+epoc32/include/mw/aknfontcategory.hrh
+epoc32/include/mw/aknfontidoffsets.hrh
+epoc32/include/mw/aknfontspecification.h
+epoc32/include/mw/aknform.h
+epoc32/include/mw/aknglobalconfirmationquery.h
+epoc32/include/mw/akngloballistmsgquery.h
+epoc32/include/mw/akngloballistquery.h
+epoc32/include/mw/aknglobalmsgquery.h
+epoc32/include/mw/aknglobalnote.h
+epoc32/include/mw/aknglobalprogressdialog.h
+epoc32/include/mw/akngmsstylegrid.h
+epoc32/include/mw/akngrid.h
+epoc32/include/mw/akngridm.h
+epoc32/include/mw/akngridview.h
epoc32/include/mw/aknhlistpanic.h
-epoc32/include/mw/AknIconArray.h
-epoc32/include/mw/AknIconHeader.h
-epoc32/include/mw/AknIconHeader.inl
-epoc32/include/mw/AknIconObserver.h
-epoc32/include/mw/AknIconSrvClient.h
-epoc32/include/mw/AknIconUtils.h
-epoc32/include/mw/AknIconUtils.inl
-epoc32/include/mw/AknIndicatorContainer.h
-epoc32/include/mw/AknInfoPopupNoteController.h
+epoc32/include/mw/akniconarray.h
+epoc32/include/mw/akniconheader.h
+epoc32/include/mw/akniconheader.inl
+epoc32/include/mw/akniconobserver.h
+epoc32/include/mw/akniconsrvclient.h
+epoc32/include/mw/akniconutils.h
+epoc32/include/mw/akniconutils.inl
+epoc32/include/mw/aknindicatorcontainer.h
+epoc32/include/mw/akninfopopupnotecontroller.h
epoc32/include/mw/akninfrm.h
-epoc32/include/mw/AknInputLanguageInfo.h
+epoc32/include/mw/akninputlanguageinfo.h
epoc32/include/mw/aknintermediate.h
-epoc32/include/mw/AknInternalIconUtils.h
+epoc32/include/mw/akninternaliconutils.h
epoc32/include/mw/aknipfed.h
epoc32/include/mw/aknkeylock.h
-epoc32/include/mw/AknLayout2Id.h
-epoc32/include/mw/AknLayoutFont.h
-epoc32/include/mw/AknListBoxLayoutDecorator.h
-epoc32/include/mw/AknListBoxSettingPage.h
+epoc32/include/mw/aknlayout2id.h
+epoc32/include/mw/aknlayoutfont.h
+epoc32/include/mw/aknlistboxlayoutdecorator.h
+epoc32/include/mw/aknlistboxsettingpage.h
epoc32/include/mw/aknlistquerycontrol.h
epoc32/include/mw/aknlistquerydialog.h
epoc32/include/mw/aknlists.h
epoc32/include/mw/aknlocationed.h
epoc32/include/mw/aknlongtapdetector.h
+epoc32/include/mw/aknmarkingmodeobserver.h
epoc32/include/mw/aknmessagequerycontrol.h
epoc32/include/mw/aknmessagequerydialog.h
epoc32/include/mw/aknmfnecommandobserver.h
@@ -1229,88 +1503,88 @@
epoc32/include/mw/aknmultilinequerycontrol.h
epoc32/include/mw/aknnavi.h
epoc32/include/mw/aknnavide.h
-epoc32/include/mw/AknNaviDecoratorObserver.h
+epoc32/include/mw/aknnavidecoratorobserver.h
epoc32/include/mw/aknnavilabel.h
-epoc32/include/mw/AknNaviObserver.h
+epoc32/include/mw/aknnaviobserver.h
epoc32/include/mw/aknnotecontrol.h
epoc32/include/mw/aknnotedialog.h
epoc32/include/mw/aknnotewrappers.h
-epoc32/include/mw/AknNotify.h
-epoc32/include/mw/AknNotifyStd.h
+epoc32/include/mw/aknnotify.h
+epoc32/include/mw/aknnotifystd.h
epoc32/include/mw/aknnumed.h
-epoc32/include/mw/AknNumEdwin.h
-epoc32/include/mw/Aknnumseced.h
-epoc32/include/mw/AknPanic.h
+epoc32/include/mw/aknnumedwin.h
+epoc32/include/mw/aknnumseced.h
+epoc32/include/mw/aknpanic.h
epoc32/include/mw/aknpasswordsettingpage.h
-epoc32/include/mw/AknPictographDrawerInterface.h
-epoc32/include/mw/AknPictographInterface.h
-epoc32/include/mw/AknPictographInterface.inl
+epoc32/include/mw/aknpictographdrawerinterface.h
+epoc32/include/mw/aknpictographinterface.h
+epoc32/include/mw/aknpictographinterface.inl
epoc32/include/mw/aknpointereventsuppressor.h
-epoc32/include/mw/aknPopup.h
-epoc32/include/mw/AknPopupFader.h
-epoc32/include/mw/AknPopupField.h
-epoc32/include/mw/AknPopupFieldList.h
-epoc32/include/mw/AknPopupFieldText.h
-epoc32/include/mw/aknPopupHeadingPane.h
+epoc32/include/mw/aknpopup.h
+epoc32/include/mw/aknpopupfader.h
+epoc32/include/mw/aknpopupfield.h
+epoc32/include/mw/aknpopupfieldlist.h
+epoc32/include/mw/aknpopupfieldtext.h
+epoc32/include/mw/aknpopupheadingpane.h
epoc32/include/mw/aknpopuplayout.h
-epoc32/include/mw/AknPopupNotify.h
+epoc32/include/mw/aknpopupnotify.h
epoc32/include/mw/aknpopupsettingpage.h
-epoc32/include/mw/AknPreviewPopUpContentProvider.h
-epoc32/include/mw/AknPreviewPopUpController.h
-epoc32/include/mw/AknPreviewPopUpObserver.h
-epoc32/include/mw/AknProgressDialog.h
+epoc32/include/mw/aknpreviewpopupcontentprovider.h
+epoc32/include/mw/aknpreviewpopupcontroller.h
+epoc32/include/mw/aknpreviewpopupobserver.h
+epoc32/include/mw/aknprogressdialog.h
epoc32/include/mw/aknprogresstimer.h
-epoc32/include/mw/aknQueryControl.h
+epoc32/include/mw/aknquerycontrol.h
epoc32/include/mw/aknquerydata.h
-epoc32/include/mw/AknQueryDialog.h
-epoc32/include/mw/AknQueryValue.h
-epoc32/include/mw/AknQueryValueDate.h
-epoc32/include/mw/AknQueryValueDuration.h
-epoc32/include/mw/AknQueryValueNumber.h
-epoc32/include/mw/AknQueryValuePhone.h
-epoc32/include/mw/AknQueryValueText.h
-epoc32/include/mw/AknQueryValueTime.h
+epoc32/include/mw/aknquerydialog.h
+epoc32/include/mw/aknqueryvalue.h
+epoc32/include/mw/aknqueryvaluedate.h
+epoc32/include/mw/aknqueryvalueduration.h
+epoc32/include/mw/aknqueryvaluenumber.h
+epoc32/include/mw/aknqueryvaluephone.h
+epoc32/include/mw/aknqueryvaluetext.h
+epoc32/include/mw/aknqueryvaluetime.h
epoc32/include/mw/aknradiobuttonsettingpage.h
-epoc32/include/mw/AknsBasicBackgroundControlContext.h
+epoc32/include/mw/aknsbasicbackgroundcontrolcontext.h
epoc32/include/mw/aknscbut.h
-epoc32/include/mw/AknsConstants.h
+epoc32/include/mw/aknsconstants.h
epoc32/include/mw/aknsconstants.hrh
-epoc32/include/mw/AknsControlContext.h
-epoc32/include/mw/AknScreenMode.h
+epoc32/include/mw/aknscontrolcontext.h
+epoc32/include/mw/aknscreenmode.h
epoc32/include/mw/aknscrlb.h
-epoc32/include/mw/AknsDataContext.h
-epoc32/include/mw/AknsDrawUtils.h
+epoc32/include/mw/aknsdatacontext.h
+epoc32/include/mw/aknsdrawutils.h
epoc32/include/mw/aknselectionlist.h
-epoc32/include/mw/AknServerApp.h
+epoc32/include/mw/aknserverapp.h
epoc32/include/mw/aknsettingitemlist.h
epoc32/include/mw/aknsettingpage.h
epoc32/include/mw/aknsfld.h
-epoc32/include/mw/AknsFrameBackgroundControlContext.h
+epoc32/include/mw/aknsframebackgroundcontrolcontext.h
epoc32/include/mw/aknsinglecolumnstyletreelist.h
epoc32/include/mw/aknsinglestyletreelist.h
-epoc32/include/mw/AknsItemData.h
-epoc32/include/mw/AknsItemID.h
-epoc32/include/mw/AknsItemID.inl
-epoc32/include/mw/AknsLayeredBackgroundControlContext.h
+epoc32/include/mw/aknsitemdata.h
+epoc32/include/mw/aknsitemid.h
+epoc32/include/mw/aknsitemid.inl
+epoc32/include/mw/aknslayeredbackgroundcontrolcontext.h
epoc32/include/mw/aknslider.h
epoc32/include/mw/aknslidersettingpage.h
-epoc32/include/mw/AknsListBoxBackgroundControlContext.h
-epoc32/include/mw/aknSoundinfo.h
+epoc32/include/mw/aknslistboxbackgroundcontrolcontext.h
+epoc32/include/mw/aknsoundinfo.h
epoc32/include/mw/aknsoundsystem.h
-epoc32/include/mw/AknsRlEffect.h
-epoc32/include/mw/AknsRlEffectContext.h
-epoc32/include/mw/AknsRlParameter.h
-epoc32/include/mw/AknsSkinInstance.h
+epoc32/include/mw/aknsrleffect.h
+epoc32/include/mw/aknsrleffectcontext.h
+epoc32/include/mw/aknsrlparameter.h
+epoc32/include/mw/aknsskininstance.h
epoc32/include/mw/aknstaticnotedialog.h
epoc32/include/mw/aknstyluspopupmenu.h
-epoc32/include/mw/AknsUtils.h
-epoc32/include/mw/AknsWallpaperUtils.h
+epoc32/include/mw/aknsutils.h
+epoc32/include/mw/aknswallpaperutils.h
epoc32/include/mw/akntabgrp.h
-epoc32/include/mw/AknTabObserver.h
-epoc32/include/mw/AknTextDecorationMetrics.h
+epoc32/include/mw/akntabobserver.h
+epoc32/include/mw/akntextdecorationmetrics.h
epoc32/include/mw/akntextsettingpage.h
epoc32/include/mw/akntitle.h
-epoc32/include/mw/AknTitlePaneObserver.h
+epoc32/include/mw/akntitlepaneobserver.h
epoc32/include/mw/akntoolbar.h
epoc32/include/mw/akntoolbarextension.h
epoc32/include/mw/akntoolbarobserver.h
@@ -1321,14 +1595,14 @@
epoc32/include/mw/akntreelistconstants.h
epoc32/include/mw/akntreelistobserver.h
epoc32/include/mw/aknuniteditor.h
-epoc32/include/mw/AknUtils.h
+epoc32/include/mw/aknutils.h
epoc32/include/mw/aknview.h
-epoc32/include/mw/aknViewAppUi.h
-epoc32/include/mw/Aknvolumecontrol.h
+epoc32/include/mw/aknviewappui.h
+epoc32/include/mw/aknvolumecontrol.h
epoc32/include/mw/aknvolumesettingpage.h
-epoc32/include/mw/AknWaitDialog.h
-epoc32/include/mw/AknWaitNoteWrapper.h
-epoc32/include/mw/AknWsEventObserver.h
+epoc32/include/mw/aknwaitdialog.h
+epoc32/include/mw/aknwaitnotewrapper.h
+epoc32/include/mw/aknwseventobserver.h
epoc32/include/mw/animation.h
epoc32/include/mw/animationconfig.h
epoc32/include/mw/animationdataloaderobserver.h
@@ -1342,7 +1616,7 @@
epoc32/include/mw/animator.h
epoc32/include/mw/ansicomp.h
epoc32/include/mw/apaapp.h
-epoc32/include/mw/ApAccessPointItem.h
+epoc32/include/mw/apaccesspointitem.h
epoc32/include/mw/apacmdln.h
epoc32/include/mw/apadbase.h
epoc32/include/mw/apadef.h
@@ -1352,25 +1626,25 @@
epoc32/include/mw/apamdr.h
epoc32/include/mw/apaproc.h
epoc32/include/mw/apcaptionfile.rh
-epoc32/include/mw/ApDataHandler.h
-epoc32/include/mw/ApEngineConsts.h
-epoc32/include/mw/ApEngineVer.h
+epoc32/include/mw/apdatahandler.h
+epoc32/include/mw/apengineconsts.h
+epoc32/include/mw/apenginever.h
epoc32/include/mw/apgcli.h
epoc32/include/mw/apgctl.h
epoc32/include/mw/apgdoor.h
epoc32/include/mw/apgicnfl.h
epoc32/include/mw/apgtask.h
epoc32/include/mw/apgwgnam.h
-epoc32/include/mw/ApListItem.h
-epoc32/include/mw/ApListItemList.h
-epoc32/include/mw/ApNetworkItem.h
-epoc32/include/mw/ApNetworkItemList.h
-epoc32/include/mw/ApNetworks.h
+epoc32/include/mw/aplistitem.h
+epoc32/include/mw/aplistitemlist.h
+epoc32/include/mw/apnetworkitem.h
+epoc32/include/mw/apnetworkitemlist.h
+epoc32/include/mw/apnetworks.h
epoc32/include/mw/apparc.h
-epoc32/include/mw/ApSelect.h
-epoc32/include/mw/ApSettingsHandlerCommons.h
-epoc32/include/mw/ApSettingsHandlerUI.h
-epoc32/include/mw/ApUtils.h
+epoc32/include/mw/apselect.h
+epoc32/include/mw/apsettingshandlercommons.h
+epoc32/include/mw/apsettingshandlerui.h
+epoc32/include/mw/aputils.h
epoc32/include/mw/asaltdefs.h
epoc32/include/mw/ascliclientutils.h
epoc32/include/mw/asclidefinitions.h
@@ -1382,7 +1656,7 @@
epoc32/include/mw/attrlut.h
epoc32/include/mw/avkon.hrh
epoc32/include/mw/avkon.rh
-epoc32/include/mw/AvkonIcons.hrh
+epoc32/include/mw/avkonicons.hrh
epoc32/include/mw/basicanimation.h
epoc32/include/mw/bif.h
epoc32/include/mw/biocmtm.h
@@ -1407,18 +1681,18 @@
epoc32/include/mw/bsp.h
epoc32/include/mw/btnotifierapi.h
epoc32/include/mw/btserversdkcrkeys.h
-epoc32/include/mw/CAknCommonDialogsBase.h
-epoc32/include/mw/CAknFileNamePromptDialog.h
-epoc32/include/mw/CAknFileSelectionDialog.h
-epoc32/include/mw/CAknMemorySelectionDialog.h
-epoc32/include/mw/CAknMemorySelectionDialogMultiDrive.h
-epoc32/include/mw/CAknMemorySelectionSettingItem.h
-epoc32/include/mw/CAknMemorySelectionSettingItemMultiDrive.h
-epoc32/include/mw/CAknMemorySelectionSettingPage.h
+epoc32/include/mw/cakncommondialogsbase.h
+epoc32/include/mw/caknfilenamepromptdialog.h
+epoc32/include/mw/caknfileselectiondialog.h
+epoc32/include/mw/caknmemoryselectiondialog.h
+epoc32/include/mw/caknmemoryselectiondialogmultidrive.h
+epoc32/include/mw/caknmemoryselectionsettingitem.h
+epoc32/include/mw/caknmemoryselectionsettingitemmultidrive.h
+epoc32/include/mw/caknmemoryselectionsettingpage.h
epoc32/include/mw/cbioasyncwaiter.h
epoc32/include/mw/cbnfnode.h
epoc32/include/mw/cbnfparser.h
-epoc32/include/mw/CDirectoryLocalizer.h
+epoc32/include/mw/cdirectorylocalizer.h
epoc32/include/mw/cdownloadmgruibase.h
epoc32/include/mw/cdownloadmgruidownloadmenu.h
epoc32/include/mw/cdownloadmgruidownloadslist.h
@@ -1429,11 +1703,12 @@
epoc32/include/mw/cfragmentedstring.h
epoc32/include/mw/chttpclienttransaction.h
epoc32/include/mw/chttpformencoder.h
+epoc32/include/mw/chttpnetworkconnectioninfo.h
epoc32/include/mw/chttpresponse.h
epoc32/include/mw/chttpservice.h
-epoc32/include/mw/CLFContentListing.h
-epoc32/include/mw/CLFContentListing.hrh
-epoc32/include/mw/CLFContentListing.rh
+epoc32/include/mw/clfcontentlisting.h
+epoc32/include/mw/clfcontentlisting.hrh
+epoc32/include/mw/clfcontentlisting.rh
epoc32/include/mw/clock.h
epoc32/include/mw/cmapplicationsettingsui.h
epoc32/include/mw/cmarkedstack.h
@@ -1442,8 +1717,8 @@
epoc32/include/mw/cmconnectionmethoddef.h
epoc32/include/mw/cmdefconnvalues.h
epoc32/include/mw/cmdestination.h
-epoc32/include/mw/CMessageAddress.h
-epoc32/include/mw/CMessageData.h
+epoc32/include/mw/cmessageaddress.h
+epoc32/include/mw/cmessagedata.h
epoc32/include/mw/cmgenconnsettings.h
epoc32/include/mw/cmmanager.h
epoc32/include/mw/cmmanager.inl
@@ -1485,31 +1760,85 @@
epoc32/include/mw/coetextdrawer.h
epoc32/include/mw/coeutils.h
epoc32/include/mw/coeview.h
-epoc32/include/mw/CommonDialogs.hrh
-epoc32/include/mw/CommonDialogs.rh
+epoc32/include/mw/commondialogs.hrh
+epoc32/include/mw/commondialogs.rh
epoc32/include/mw/conarc.h
epoc32/include/mw/concnf.h
epoc32/include/mw/confndr.h
epoc32/include/mw/conlist.h
epoc32/include/mw/conplugin.rh
-epoc32/include/mw/ContentListingFactory.h
+epoc32/include/mw/contentlistingfactory.h
epoc32/include/mw/copydatafile.h
-epoc32/include/mw/CoreApplicationUIsSDKCRKeys.h
+epoc32/include/mw/coreapplicationuissdkcrkeys.h
epoc32/include/mw/crulemarkedstack.h
-epoc32/include/mw/CSatelliteInfoUI.h
+epoc32/include/mw/csatelliteinfoui.h
epoc32/include/mw/csendasaccounts.h
epoc32/include/mw/csendasmessagetypes.h
-epoc32/include/mw/CSendingServiceInfo.h
+epoc32/include/mw/csendingserviceinfo.h
epoc32/include/mw/csmsclass0base.h
epoc32/include/mw/cstack.h
+epoc32/include/mw/cwrt/appmgtdefs.h
+epoc32/include/mw/cwrt/appmgtinterface.h
+epoc32/include/mw/cwrt/capability.h
+epoc32/include/mw/cwrt/clientinfo.h
+epoc32/include/mw/cwrt/condition.h
+epoc32/include/mw/cwrt/configurationserviceinterface.h
+epoc32/include/mw/cwrt/cwrtregistry.h
+epoc32/include/mw/cwrt/cwrtregistryclient.h
+epoc32/include/mw/cwrt/dmdownloadproperties.h
+epoc32/include/mw/cwrt/dmdownloadstatus.h
+epoc32/include/mw/cwrt/downloadmgtclient.h
+epoc32/include/mw/cwrt/downloadmgtclientdefs.h
+epoc32/include/mw/cwrt/downloadmgtserviceinterface.h
+epoc32/include/mw/cwrt/errdefs.h
+epoc32/include/mw/cwrt/eventmessageapiservice.h
+epoc32/include/mw/cwrt/eventmessageapiserviceinterface.h
+epoc32/include/mw/cwrt/eventmessageapiserviceplugin.h
+epoc32/include/mw/cwrt/iterable.h
+epoc32/include/mw/cwrt/nativeappupdatedefs.h
+epoc32/include/mw/cwrt/nativeappupdateserviceinterface.h
+epoc32/include/mw/cwrt/runtimeinfoservicedefs.h
+epoc32/include/mw/cwrt/runtimeinfoserviceinterface.h
+epoc32/include/mw/cwrt/secmgrdefs.h
+epoc32/include/mw/cwrt/secsession.h
+epoc32/include/mw/cwrt/securestorage.h
+epoc32/include/mw/cwrt/securestorageclient.h
+epoc32/include/mw/cwrt/securestorageclientsymbian.h
+epoc32/include/mw/cwrt/securitymanager.h
+epoc32/include/mw/cwrt/service.h
+epoc32/include/mw/cwrt/servicebase.h
+epoc32/include/mw/cwrt/servicehandler.h
+epoc32/include/mw/cwrt/serviceinterfaceinfo.h
+epoc32/include/mw/cwrt/serviceipc.h
+epoc32/include/mw/cwrt/serviceipcclient.h
+epoc32/include/mw/cwrt/serviceipcdefs.h
+epoc32/include/mw/cwrt/serviceipcobserver.h
+epoc32/include/mw/cwrt/serviceipcrequest.h
+epoc32/include/mw/cwrt/serviceipcserver.h
+epoc32/include/mw/cwrt/serviceipcserversession.h
+epoc32/include/mw/cwrt/serviceplugininterface.h
+epoc32/include/mw/cwrt/servicesecurityinterface.h
+epoc32/include/mw/cwrt/sfwerrorhandler.h
+epoc32/include/mw/cwrt/sfwexception.h
+epoc32/include/mw/cwrt/sfwlog.h
+epoc32/include/mw/cwrt/sfwservicelogger.h
+epoc32/include/mw/cwrt/storage.h
+epoc32/include/mw/cwrt/trustsession.h
+epoc32/include/mw/cwrt/usercondition.h
+epoc32/include/mw/cwrt/userconditionhandler.h
+epoc32/include/mw/cwrt/webappupdateinterface.h
+epoc32/include/mw/cwrt/widgetpropertyvalue.h
+epoc32/include/mw/cwrt/widgetregistryclientwrt.h
+epoc32/include/mw/cwrt/widgetregistryconstants.h
+epoc32/include/mw/cwrt/widgetregistrydata.h
epoc32/include/mw/dclcrkeys.h
-epoc32/include/mw/DirectoryLocalizer.rh
-epoc32/include/mw/DocumentHandler.h
+epoc32/include/mw/directorylocalizer.rh
+epoc32/include/mw/documenthandler.h
epoc32/include/mw/downloadmgrclient.h
epoc32/include/mw/downloadslistdlgobserver.h
-epoc32/include/mw/DRMHelper.h
-epoc32/include/mw/DRMHelperServerInternalCRKeys.h
-epoc32/include/mw/DRMLicenseChecker.h
+epoc32/include/mw/drmhelper.h
+epoc32/include/mw/drmhelperserverinternalcrkeys.h
+epoc32/include/mw/drmlicensechecker.h
epoc32/include/mw/dtdnode.h
epoc32/include/mw/eikalert.h
epoc32/include/mw/eikalign.h
@@ -1588,7 +1917,6 @@
epoc32/include/mw/eiknotapi.h
epoc32/include/mw/eikon.hrh
epoc32/include/mw/eikon.rh
-epoc32/include/mw/eikon.rsg
epoc32/include/mw/eikproc.h
epoc32/include/mw/eikprogi.h
epoc32/include/mw/eikrted.h
@@ -1609,39 +1937,39 @@
epoc32/include/mw/eiktxlbx.h
epoc32/include/mw/eikunder.h
epoc32/include/mw/eikvcurs.h
-epoc32/include/mw/EPos_CPosLandmark.h
-epoc32/include/mw/EPos_CPosLandmarkCategory.h
-epoc32/include/mw/EPos_CPosLandmarkDatabase.h
+epoc32/include/mw/epos_cposlandmark.h
+epoc32/include/mw/epos_cposlandmarkcategory.h
+epoc32/include/mw/epos_cposlandmarkdatabase.h
epoc32/include/mw/epos_cposlandmarkdatabaseextended.h
-epoc32/include/mw/EPos_CPosLandmarkEncoder.h
-epoc32/include/mw/EPos_CPosLandmarkParser.h
-epoc32/include/mw/EPos_CPosLandmarkSearch.h
-epoc32/include/mw/EPos_CPosLmAreaCriteria.h
-epoc32/include/mw/EPos_CPosLmCategoryCriteria.h
-epoc32/include/mw/EPos_CPosLmCategoryManager.h
-epoc32/include/mw/EPos_CPosLmCatNameCriteria.h
-epoc32/include/mw/EPos_CPosLmCompositeCriteria.h
-epoc32/include/mw/EPos_CPosLmDatabaseManager.h
-epoc32/include/mw/EPos_CPosLmDatabaseManagerPluginBase.h
-epoc32/include/mw/EPos_CPosLmDisplayData.h
-epoc32/include/mw/EPos_CPosLmDisplayItem.h
-epoc32/include/mw/EPos_CPosLmIdListCriteria.h
-epoc32/include/mw/EPos_CPosLmItemIterator.h
-epoc32/include/mw/EPos_CPosLmMultiDbSearch.h
-epoc32/include/mw/EPos_CPosLmNearestCriteria.h
-epoc32/include/mw/EPos_CPosLmOperation.h
-epoc32/include/mw/EPos_CPosLmOperation.inl
-epoc32/include/mw/EPos_CPosLmPartialReadParameters.h
-epoc32/include/mw/EPos_CPosLmSearchCriteria.h
-epoc32/include/mw/EPos_CPosLmTextCriteria.h
-epoc32/include/mw/EPos_HPosLmDatabaseInfo.h
-epoc32/include/mw/EPos_Landmarks.h
+epoc32/include/mw/epos_cposlandmarkencoder.h
+epoc32/include/mw/epos_cposlandmarkparser.h
+epoc32/include/mw/epos_cposlandmarksearch.h
+epoc32/include/mw/epos_cposlmareacriteria.h
+epoc32/include/mw/epos_cposlmcategorycriteria.h
+epoc32/include/mw/epos_cposlmcategorymanager.h
+epoc32/include/mw/epos_cposlmcatnamecriteria.h
+epoc32/include/mw/epos_cposlmcompositecriteria.h
+epoc32/include/mw/epos_cposlmdatabasemanager.h
+epoc32/include/mw/epos_cposlmdatabasemanagerpluginbase.h
+epoc32/include/mw/epos_cposlmdisplaydata.h
+epoc32/include/mw/epos_cposlmdisplayitem.h
+epoc32/include/mw/epos_cposlmidlistcriteria.h
+epoc32/include/mw/epos_cposlmitemiterator.h
+epoc32/include/mw/epos_cposlmmultidbsearch.h
+epoc32/include/mw/epos_cposlmnearestcriteria.h
+epoc32/include/mw/epos_cposlmoperation.h
+epoc32/include/mw/epos_cposlmoperation.inl
+epoc32/include/mw/epos_cposlmpartialreadparameters.h
+epoc32/include/mw/epos_cposlmsearchcriteria.h
+epoc32/include/mw/epos_cposlmtextcriteria.h
+epoc32/include/mw/epos_hposlmdatabaseinfo.h
+epoc32/include/mw/epos_landmarks.h
epoc32/include/mw/epos_poslandmarkserialization.h
epoc32/include/mw/epos_poslmcategoryserialization.h
-epoc32/include/mw/EPos_TPosLmDatabaseEvent.h
-epoc32/include/mw/EPos_TPosLmDatabaseSettings.h
-epoc32/include/mw/EPos_TPosLmSortPref.h
-epoc32/include/mw/ErrorUI.h
+epoc32/include/mw/epos_tposlmdatabaseevent.h
+epoc32/include/mw/epos_tposlmdatabasesettings.h
+epoc32/include/mw/epos_tposlmsortpref.h
+epoc32/include/mw/errorui.h
epoc32/include/mw/estatus.h
epoc32/include/mw/extendedconnpref.h
epoc32/include/mw/favouritesdb.h
@@ -1691,9 +2019,11 @@
epoc32/include/mw/http/framework/csecuritypolicy.h
epoc32/include/mw/http/framework/csecuritypolicy.inl
epoc32/include/mw/http/framework/ctxdata.h
+epoc32/include/mw/http/framework/httplogger.h
epoc32/include/mw/http/framework/mrxdataobserver.h
epoc32/include/mw/http/framework/rheaderfield.h
epoc32/include/mw/http/mhttpauthenticationcallback.h
+epoc32/include/mw/http/mhttpdataoptimiser.h
epoc32/include/mw/http/mhttpdatasupplier.h
epoc32/include/mw/http/mhttpfilter.h
epoc32/include/mw/http/mhttpfilterbase.h
@@ -1763,65 +2093,65 @@
epoc32/include/mw/lbttriggeringsystemsettingschangeeventnotifier.h
epoc32/include/mw/lbttriggeringsystemsettingschangeeventobserver.h
epoc32/include/mw/logdef.h
-epoc32/include/mw/MAknFileFilter.h
-epoc32/include/mw/MAknFileSelectionObserver.h
-epoc32/include/mw/MAknMemorySelectionObserver.h
-epoc32/include/mw/MCLFChangedItemObserver.h
-epoc32/include/mw/MCLFContentListingEngine.h
-epoc32/include/mw/MCLFCustomGrouper.h
-epoc32/include/mw/MCLFCustomSorter.h
-epoc32/include/mw/MCLFItem.h
-epoc32/include/mw/MCLFItemListModel.h
-epoc32/include/mw/MCLFModifiableItem.h
-epoc32/include/mw/MCLFOperationObserver.h
-epoc32/include/mw/MCLFPostFilter.h
-epoc32/include/mw/MCLFProcessObserver.h
-epoc32/include/mw/MCLFSortingStyle.h
+epoc32/include/mw/maknfilefilter.h
+epoc32/include/mw/maknfileselectionobserver.h
+epoc32/include/mw/maknmemoryselectionobserver.h
+epoc32/include/mw/mclfchangeditemobserver.h
+epoc32/include/mw/mclfcontentlistingengine.h
+epoc32/include/mw/mclfcustomgrouper.h
+epoc32/include/mw/mclfcustomsorter.h
+epoc32/include/mw/mclfitem.h
+epoc32/include/mw/mclfitemlistmodel.h
+epoc32/include/mw/mclfmodifiableitem.h
+epoc32/include/mw/mclfoperationobserver.h
+epoc32/include/mw/mclfpostfilter.h
+epoc32/include/mw/mclfprocessobserver.h
+epoc32/include/mw/mclfsortingstyle.h
epoc32/include/mw/mdataproviderobserver.h
epoc32/include/mw/mdptx.h
-epoc32/include/mw/MediaFileTypes.hrh
-epoc32/include/mw/MemoryManager.h
+epoc32/include/mw/mediafiletypes.hrh
+epoc32/include/mw/memorymanager.h
epoc32/include/mw/mframeworksp.h
-epoc32/include/mw/MGFetch.h
+epoc32/include/mw/mgfetch.h
epoc32/include/mw/mhttpcontentsink.h
epoc32/include/mw/mhttpcontentsource.h
-epoc32/include/mw/MMFROPCustomCommandConstants.h
-epoc32/include/mw/MMGFetchCanceler.h
-epoc32/include/mw/MMGFetchVerifier.h
+epoc32/include/mw/mhttpserviceauthentication.h
+epoc32/include/mw/mmfropcustomcommandconstants.h
+epoc32/include/mw/mmgfetchcanceler.h
+epoc32/include/mw/mmgfetchverifier.h
epoc32/include/mw/mmsvattachmentmanager.h
epoc32/include/mw/mmsvattachmentmanagersync.h
epoc32/include/mw/mobexnotify.h
-epoc32/include/mw/mosshangulinputeventobserver.h
-epoc32/include/mw/MProEngActiveProfileObserver.h
-epoc32/include/mw/MProEngAlertToneSeeker.h
-epoc32/include/mw/MProEngAlertToneSeekerObserver.h
-epoc32/include/mw/MProEngEngine.h
-epoc32/include/mw/MProEngNotifyHandler.h
-epoc32/include/mw/MProEngProfile.h
-epoc32/include/mw/MProEngProfileActivationObserver.h
-epoc32/include/mw/MProEngProfileName.h
-epoc32/include/mw/MProEngProfileNameArray.h
-epoc32/include/mw/MProEngProfileNameArrayObserver.h
-epoc32/include/mw/MProEngProfileObserver.h
-epoc32/include/mw/MProEngTones.h
-epoc32/include/mw/MProEngToneSettings.h
-epoc32/include/mw/MSenAuthenticationProvider.h
+epoc32/include/mw/mproengactiveprofileobserver.h
+epoc32/include/mw/mproengalerttoneseeker.h
+epoc32/include/mw/mproengalerttoneseekerobserver.h
+epoc32/include/mw/mproengengine.h
+epoc32/include/mw/mproengnotifyhandler.h
+epoc32/include/mw/mproengprofile.h
+epoc32/include/mw/mproengprofileactivationobserver.h
+epoc32/include/mw/mproengprofilename.h
+epoc32/include/mw/mproengprofilenamearray.h
+epoc32/include/mw/mproengprofilenamearrayobserver.h
+epoc32/include/mw/mproengprofileobserver.h
+epoc32/include/mw/mproengtones.h
+epoc32/include/mw/mproengtonesettings.h
+epoc32/include/mw/msenauthenticationprovider.h
epoc32/include/mw/msencobrandinginterface.h
-epoc32/include/mw/MSenConsumerPolicy.h
-epoc32/include/mw/MSenContentHandlerClient.h
-epoc32/include/mw/MSenElement.h
-epoc32/include/mw/MSenFragment.h
-epoc32/include/mw/MSenHostlet.h
-epoc32/include/mw/MSenHostletRequest.h
-epoc32/include/mw/MSenHostletResponse.h
-epoc32/include/mw/MSenIdentityProviderIdArray.h
-epoc32/include/mw/MSenMessage.h
-epoc32/include/mw/MSenProperties.h
-epoc32/include/mw/MSenProperty.h
-epoc32/include/mw/MSenProviderPolicy.h
-epoc32/include/mw/MSenServiceConsumer.h
-epoc32/include/mw/MSenServiceDescription.h
-epoc32/include/mw/MSenServicePolicy.h
+epoc32/include/mw/msenconsumerpolicy.h
+epoc32/include/mw/msencontenthandlerclient.h
+epoc32/include/mw/msenelement.h
+epoc32/include/mw/msenfragment.h
+epoc32/include/mw/msenhostlet.h
+epoc32/include/mw/msenhostletrequest.h
+epoc32/include/mw/msenhostletresponse.h
+epoc32/include/mw/msenidentityprovideridarray.h
+epoc32/include/mw/msenmessage.h
+epoc32/include/mw/msenproperties.h
+epoc32/include/mw/msenproperty.h
+epoc32/include/mw/msenproviderpolicy.h
+epoc32/include/mw/msenserviceconsumer.h
+epoc32/include/mw/msenservicedescription.h
+epoc32/include/mw/msenservicepolicy.h
epoc32/include/mw/msvapi.h
epoc32/include/mw/msventry.h
epoc32/include/mw/msventryscheduledata.h
@@ -1875,11 +2205,156 @@
epoc32/include/mw/obsolete/protypes.h
epoc32/include/mw/ocrcommon.h
epoc32/include/mw/ocrsrv.h
-epoc32/include/mw/Oma2Agent.h
-epoc32/include/mw/osscombination.h
-epoc32/include/mw/osshangulinputcontext.h
-epoc32/include/mw/osshanja.h
-epoc32/include/mw/osskeyboard.h
+epoc32/include/mw/oma2agent.h
+epoc32/include/mw/phonon/abstractaudiooutput
+epoc32/include/mw/phonon/abstractaudiooutput.h
+epoc32/include/mw/phonon/abstractmediastream
+epoc32/include/mw/phonon/abstractmediastream.h
+epoc32/include/mw/phonon/abstractvideooutput
+epoc32/include/mw/phonon/abstractvideooutput.h
+epoc32/include/mw/phonon/addoninterface
+epoc32/include/mw/phonon/addoninterface.h
+epoc32/include/mw/phonon/audiocapturedevice
+epoc32/include/mw/phonon/audiocapturedevicemodel
+epoc32/include/mw/phonon/audiochanneldescription
+epoc32/include/mw/phonon/audiochanneldescriptionmodel
+epoc32/include/mw/phonon/audiooutput
+epoc32/include/mw/phonon/audiooutput.h
+epoc32/include/mw/phonon/audiooutputdevice
+epoc32/include/mw/phonon/audiooutputdevicemodel
+epoc32/include/mw/phonon/audiooutputinterface
+epoc32/include/mw/phonon/audiooutputinterface.h
+epoc32/include/mw/phonon/audiooutputinterface40
+epoc32/include/mw/phonon/audiooutputinterface42
+epoc32/include/mw/phonon/backendcapabilities
+epoc32/include/mw/phonon/backendcapabilities.h
+epoc32/include/mw/phonon/backendinterface
+epoc32/include/mw/phonon/backendinterface.h
+epoc32/include/mw/phonon/effect
+epoc32/include/mw/phonon/effect.h
+epoc32/include/mw/phonon/effectdescription
+epoc32/include/mw/phonon/effectdescriptionmodel
+epoc32/include/mw/phonon/effectinterface
+epoc32/include/mw/phonon/effectinterface.h
+epoc32/include/mw/phonon/effectparameter
+epoc32/include/mw/phonon/effectparameter.h
+epoc32/include/mw/phonon/effectwidget
+epoc32/include/mw/phonon/effectwidget.h
+epoc32/include/mw/phonon/global
+epoc32/include/mw/phonon/headers.pri
+epoc32/include/mw/phonon/mediacontroller
+epoc32/include/mw/phonon/mediacontroller.h
+epoc32/include/mw/phonon/medianode
+epoc32/include/mw/phonon/medianode.h
+epoc32/include/mw/phonon/mediaobject
+epoc32/include/mw/phonon/mediaobject.h
+epoc32/include/mw/phonon/mediaobjectinterface
+epoc32/include/mw/phonon/mediaobjectinterface.h
+epoc32/include/mw/phonon/mediasource
+epoc32/include/mw/phonon/mediasource.h
+epoc32/include/mw/phonon/objectdescription
+epoc32/include/mw/phonon/objectdescription.h
+epoc32/include/mw/phonon/objectdescriptiondata
+epoc32/include/mw/phonon/objectdescriptionmodel
+epoc32/include/mw/phonon/objectdescriptionmodel.h
+epoc32/include/mw/phonon/objectdescriptionmodeldata
+epoc32/include/mw/phonon/path
+epoc32/include/mw/phonon/path.h
+epoc32/include/mw/phonon/phonon
+epoc32/include/mw/phonon/phonon_export.h
+epoc32/include/mw/phonon/phonondefs.h
+epoc32/include/mw/phonon/phononnamespace.h
+epoc32/include/mw/phonon/private/abstractaudiooutput_p.h
+epoc32/include/mw/phonon/private/abstractmediastream_p.h
+epoc32/include/mw/phonon/private/abstractvideooutput_p.h
+epoc32/include/mw/phonon/private/audiooutput_p.h
+epoc32/include/mw/phonon/private/audiooutputadaptor_p.h
+epoc32/include/mw/phonon/private/backendcapabilities_p.h
+epoc32/include/mw/phonon/private/effect_p.h
+epoc32/include/mw/phonon/private/effectparameter_p.h
+epoc32/include/mw/phonon/private/effectwidget_p.h
+epoc32/include/mw/phonon/private/factory_p.h
+epoc32/include/mw/phonon/private/frontendinterface_p.h
+epoc32/include/mw/phonon/private/globalconfig_p.h
+epoc32/include/mw/phonon/private/globalstatic_p.h
+epoc32/include/mw/phonon/private/iodevicestream_p.h
+epoc32/include/mw/phonon/private/medianode_p.h
+epoc32/include/mw/phonon/private/medianodedestructionhandler_p.h
+epoc32/include/mw/phonon/private/mediaobject_p.h
+epoc32/include/mw/phonon/private/mediasource_p.h
+epoc32/include/mw/phonon/private/objectdescription_p.h
+epoc32/include/mw/phonon/private/objectdescriptionmodel_p.h
+epoc32/include/mw/phonon/private/path_p.h
+epoc32/include/mw/phonon/private/phonondefs_p.h
+epoc32/include/mw/phonon/private/phononnamespace_p.h
+epoc32/include/mw/phonon/private/qsettingsgroup_p.h
+epoc32/include/mw/phonon/private/seekslider_p.h
+epoc32/include/mw/phonon/private/streaminterface_p.h
+epoc32/include/mw/phonon/private/videowidget_p.h
+epoc32/include/mw/phonon/private/volumefadereffect_p.h
+epoc32/include/mw/phonon/private/volumeslider_p.h
+epoc32/include/mw/phonon/seekslider
+epoc32/include/mw/phonon/seekslider.h
+epoc32/include/mw/phonon/streaminterface
+epoc32/include/mw/phonon/streaminterface.h
+epoc32/include/mw/phonon/subtitledescription
+epoc32/include/mw/phonon/subtitledescriptionmodel
+epoc32/include/mw/phonon/videoplayer
+epoc32/include/mw/phonon/videoplayer.h
+epoc32/include/mw/phonon/videowidget
+epoc32/include/mw/phonon/videowidget.h
+epoc32/include/mw/phonon/videowidgetinterface
+epoc32/include/mw/phonon/videowidgetinterface.h
+epoc32/include/mw/phonon/volumefadereffect
+epoc32/include/mw/phonon/volumefadereffect.h
+epoc32/include/mw/phonon/volumefaderinterface
+epoc32/include/mw/phonon/volumefaderinterface.h
+epoc32/include/mw/phonon/volumeslider
+epoc32/include/mw/phonon/volumeslider.h
+epoc32/include/mw/phonon_compat/phonon/abstractaudiooutput
+epoc32/include/mw/phonon_compat/phonon/abstractmediastream
+epoc32/include/mw/phonon_compat/phonon/abstractvideooutput
+epoc32/include/mw/phonon_compat/phonon/addoninterface
+epoc32/include/mw/phonon_compat/phonon/audiocapturedevice
+epoc32/include/mw/phonon_compat/phonon/audiocapturedevicemodel
+epoc32/include/mw/phonon_compat/phonon/audiochanneldescription
+epoc32/include/mw/phonon_compat/phonon/audiochanneldescriptionmodel
+epoc32/include/mw/phonon_compat/phonon/audiooutput
+epoc32/include/mw/phonon_compat/phonon/audiooutputdevice
+epoc32/include/mw/phonon_compat/phonon/audiooutputdevicemodel
+epoc32/include/mw/phonon_compat/phonon/audiooutputinterface
+epoc32/include/mw/phonon_compat/phonon/audiooutputinterface40
+epoc32/include/mw/phonon_compat/phonon/audiooutputinterface42
+epoc32/include/mw/phonon_compat/phonon/backendcapabilities
+epoc32/include/mw/phonon_compat/phonon/backendinterface
+epoc32/include/mw/phonon_compat/phonon/effect
+epoc32/include/mw/phonon_compat/phonon/effectdescription
+epoc32/include/mw/phonon_compat/phonon/effectdescriptionmodel
+epoc32/include/mw/phonon_compat/phonon/effectinterface
+epoc32/include/mw/phonon_compat/phonon/effectparameter
+epoc32/include/mw/phonon_compat/phonon/effectwidget
+epoc32/include/mw/phonon_compat/phonon/global
+epoc32/include/mw/phonon_compat/phonon/mediacontroller
+epoc32/include/mw/phonon_compat/phonon/medianode
+epoc32/include/mw/phonon_compat/phonon/mediaobject
+epoc32/include/mw/phonon_compat/phonon/mediaobjectinterface
+epoc32/include/mw/phonon_compat/phonon/mediasource
+epoc32/include/mw/phonon_compat/phonon/objectdescription
+epoc32/include/mw/phonon_compat/phonon/objectdescriptiondata
+epoc32/include/mw/phonon_compat/phonon/objectdescriptionmodel
+epoc32/include/mw/phonon_compat/phonon/objectdescriptionmodeldata
+epoc32/include/mw/phonon_compat/phonon/path
+epoc32/include/mw/phonon_compat/phonon/phonon
+epoc32/include/mw/phonon_compat/phonon/seekslider
+epoc32/include/mw/phonon_compat/phonon/streaminterface
+epoc32/include/mw/phonon_compat/phonon/subtitledescription
+epoc32/include/mw/phonon_compat/phonon/subtitledescriptionmodel
+epoc32/include/mw/phonon_compat/phonon/videoplayer
+epoc32/include/mw/phonon_compat/phonon/videowidget
+epoc32/include/mw/phonon_compat/phonon/videowidgetinterface
+epoc32/include/mw/phonon_compat/phonon/volumefadereffect
+epoc32/include/mw/phonon_compat/phonon/volumefaderinterface
+epoc32/include/mw/phonon_compat/phonon/volumeslider
epoc32/include/mw/playerinformationtarget.h
epoc32/include/mw/playerinformationtargetobserver.h
epoc32/include/mw/pluginadapterinterface.h
@@ -1889,25 +2364,29 @@
epoc32/include/mw/prnprev.h
epoc32/include/mw/prnsetup.h
epoc32/include/mw/prnuids.h
-epoc32/include/mw/ProEngFactory.h
-epoc32/include/mw/Profile.hrh
-epoc32/include/mw/ProfileEngineSDKCRKeys.h
+epoc32/include/mw/proengfactory.h
+epoc32/include/mw/profile.hrh
+epoc32/include/mw/profileenginesdkcrkeys.h
epoc32/include/mw/prtypes.h
-epoc32/include/mw/PtiCompositionDataIF.h
-epoc32/include/mw/PtiCore.h
-epoc32/include/mw/PtiDefs.h
-epoc32/include/mw/PtiDefs.inl
-epoc32/include/mw/PtiEngine.h
-epoc32/include/mw/PtiKeyMappings.h
-epoc32/include/mw/PtiLanguage.h
-epoc32/include/mw/PtiLanguage.inl
-epoc32/include/mw/PtiLanguageDatabase.h
-epoc32/include/mw/PtiObserver.h
-epoc32/include/mw/PtiUids.hrh
-epoc32/include/mw/PtiUserDicEntry.h
-epoc32/include/mw/PtiUserDicEntry.inl
-epoc32/include/mw/PtiUserDictionary.h
-epoc32/include/mw/PtiUserDictionary.inl
+epoc32/include/mw/pticompositiondataif.h
+epoc32/include/mw/pticore.h
+epoc32/include/mw/ptidefs.h
+epoc32/include/mw/ptidefs.inl
+epoc32/include/mw/ptiengine.h
+epoc32/include/mw/ptikeymappings.h
+epoc32/include/mw/ptilanguage.h
+epoc32/include/mw/ptilanguage.inl
+epoc32/include/mw/ptilanguagedatabase.h
+epoc32/include/mw/ptiobserver.h
+epoc32/include/mw/ptiuids.hrh
+epoc32/include/mw/ptiuserdicentry.h
+epoc32/include/mw/ptiuserdicentry.inl
+epoc32/include/mw/ptiuserdictionary.h
+epoc32/include/mw/ptiuserdictionary.inl
+epoc32/include/mw/qmobilityglobal.h
+epoc32/include/mw/qnetworkconfigmanager.h
+epoc32/include/mw/qnetworkconfiguration.h
+epoc32/include/mw/qnetworksession.h
epoc32/include/mw/rconnmon.h
epoc32/include/mw/rdrmhelper.h
epoc32/include/mw/regpsdll.h
@@ -1941,7 +2420,7 @@
epoc32/include/mw/remconstatusapicontrollerobserver.h
epoc32/include/mw/rsendas.h
epoc32/include/mw/rsendasmessage.h
-epoc32/include/mw/RSenDocument.h
+epoc32/include/mw/rsendocument.h
epoc32/include/mw/rsfwmountentry.h
epoc32/include/mw/rsfwmountentryitem.h
epoc32/include/mw/rsfwmountman.h
@@ -1951,9 +2430,9 @@
epoc32/include/mw/schsend.rh
epoc32/include/mw/schsend_panic.h
epoc32/include/mw/screensaverplugin.h
-epoc32/include/mw/ScreensaverpluginIntDef.h
-epoc32/include/mw/ScreensaverpluginIntDef.hrh
-epoc32/include/mw/ScreensaverpluginIntDef.inl
+epoc32/include/mw/screensaverpluginintdef.h
+epoc32/include/mw/screensaverpluginintdef.hrh
+epoc32/include/mw/screensaverpluginintdef.inl
epoc32/include/mw/sdpattributefield.h
epoc32/include/mw/sdpbandwidthfield.h
epoc32/include/mw/sdpcodecconstants.h
@@ -1970,51 +2449,51 @@
epoc32/include/mw/sdptimefield.h
epoc32/include/mw/sdptypedtime.h
epoc32/include/mw/seconsdkcrkeys.h
-epoc32/include/mw/SenBaseAttribute.h
-epoc32/include/mw/SenBaseElement.h
-epoc32/include/mw/SenBaseFragment.h
-epoc32/include/mw/SenCredential.h
-epoc32/include/mw/SenCredential2.h
+epoc32/include/mw/senbaseattribute.h
+epoc32/include/mw/senbaseelement.h
+epoc32/include/mw/senbasefragment.h
+epoc32/include/mw/sencredential.h
+epoc32/include/mw/sencredential2.h
epoc32/include/mw/sencryptoutils.h
epoc32/include/mw/sendas2.h
epoc32/include/mw/sendasserver.rh
-epoc32/include/mw/SenDateUtils.h
-epoc32/include/mw/SenDomFragment.h
-epoc32/include/mw/SenDomFragmentBase.h
+epoc32/include/mw/sendateutils.h
+epoc32/include/mw/sendomfragment.h
+epoc32/include/mw/sendomfragmentbase.h
epoc32/include/mw/sendui.h
-epoc32/include/mw/SendUiConsts.h
-epoc32/include/mw/SenduiMtmUids.h
-epoc32/include/mw/SenElement.h
-epoc32/include/mw/SenFacet.h
-epoc32/include/mw/SenFragment.h
-epoc32/include/mw/SenFragmentBase.h
-epoc32/include/mw/SenHostletConnection.h
-epoc32/include/mw/SenHttpTransportProperties.h
-epoc32/include/mw/SenIdentityProvider.h
-epoc32/include/mw/SenIdentityProviderIdArray8.h
-epoc32/include/mw/SenNameSpace.h
-epoc32/include/mw/SenParser.h
+epoc32/include/mw/senduiconsts.h
+epoc32/include/mw/senduimtmuids.h
+epoc32/include/mw/senelement.h
+epoc32/include/mw/senfacet.h
+epoc32/include/mw/senfragment.h
+epoc32/include/mw/senfragmentbase.h
+epoc32/include/mw/senhostletconnection.h
+epoc32/include/mw/senhttptransportproperties.h
+epoc32/include/mw/senidentityprovider.h
+epoc32/include/mw/senidentityprovideridarray8.h
+epoc32/include/mw/sennamespace.h
+epoc32/include/mw/senparser.h
epoc32/include/mw/senpointermap.h
-epoc32/include/mw/SenServiceConnection.h
+epoc32/include/mw/senserviceconnection.h
epoc32/include/mw/senserviceconnectioninterfaces.h
-epoc32/include/mw/SenServiceManager.h
-epoc32/include/mw/SenServicePattern.h
-epoc32/include/mw/SenSoapConstants.h
-epoc32/include/mw/SenSoapEnvelope.h
-epoc32/include/mw/SenSoapEnvelope2.h
-epoc32/include/mw/SenSoapFault.h
-epoc32/include/mw/SenSoapFault2.h
-epoc32/include/mw/SenSoapMessage.h
-epoc32/include/mw/SenSoapMessage2.h
-epoc32/include/mw/SenTransportProperties.h
-epoc32/include/mw/SenWsSecurityHeader.h
-epoc32/include/mw/SenWsSecurityHeader2.h
-epoc32/include/mw/SenXmlConstants.h
-epoc32/include/mw/SenXmlElement.h
-epoc32/include/mw/SenXmlProperties.h
-epoc32/include/mw/SenXmlReader.h
-epoc32/include/mw/SenXmlServiceDescription.h
-epoc32/include/mw/SenXmlUtils.h
+epoc32/include/mw/senservicemanager.h
+epoc32/include/mw/senservicepattern.h
+epoc32/include/mw/sensoapconstants.h
+epoc32/include/mw/sensoapenvelope.h
+epoc32/include/mw/sensoapenvelope2.h
+epoc32/include/mw/sensoapfault.h
+epoc32/include/mw/sensoapfault2.h
+epoc32/include/mw/sensoapmessage.h
+epoc32/include/mw/sensoapmessage2.h
+epoc32/include/mw/sentransportproperties.h
+epoc32/include/mw/senwssecurityheader.h
+epoc32/include/mw/senwssecurityheader2.h
+epoc32/include/mw/senxmlconstants.h
+epoc32/include/mw/senxmlelement.h
+epoc32/include/mw/senxmlproperties.h
+epoc32/include/mw/senxmlreader.h
+epoc32/include/mw/senxmlservicedescription.h
+epoc32/include/mw/senxmlutils.h
epoc32/include/mw/sip.h
epoc32/include/mw/sip_subconevents.h
epoc32/include/mw/sip_subconevents.inl
@@ -2111,12 +2590,13 @@
epoc32/include/mw/sipunsupportedheader.h
epoc32/include/mw/sipwwwauthenticateheader.h
epoc32/include/mw/spriteanimation.h
-epoc32/include/mw/StartupItem.hrh
-epoc32/include/mw/StartupItem.rh
+epoc32/include/mw/startupitem.hrh
+epoc32/include/mw/startupitem.rh
+epoc32/include/mw/svgtrasterizerkeydefs.hrh
epoc32/include/mw/swi/pkgremover.h
epoc32/include/mw/swi/pkgremovererrors.h
epoc32/include/mw/telsess.h
-epoc32/include/mw/ThirdPartyBitmap.pal
+epoc32/include/mw/thirdpartybitmap.pal
epoc32/include/mw/thttpfields.h
epoc32/include/mw/thttpheadervaluevariant.h
epoc32/include/mw/tldlistdef.h
@@ -2126,8 +2606,8 @@
epoc32/include/mw/touchlogicalfeedback.h
epoc32/include/mw/tsendasclientpanic.h
epoc32/include/mw/tsendasmessagetypefilter.h
-epoc32/include/mw/TSendingCapabilities.h
-epoc32/include/mw/TSendingCapabilities.inl
+epoc32/include/mw/tsendingcapabilities.h
+epoc32/include/mw/tsendingcapabilities.inl
epoc32/include/mw/tuladdressstringtokenizer.h
epoc32/include/mw/tulpanics.h
epoc32/include/mw/tulphonenumberutils.h
@@ -2151,19 +2631,13 @@
epoc32/include/mw/wapattrdf.h
epoc32/include/mw/wapengstd.h
epoc32/include/mw/waplog.h
+epoc32/include/mw/wapmessage.h
epoc32/include/mw/wappdef.h
epoc32/include/mw/waptestutils.h
epoc32/include/mw/wbconverter.h
epoc32/include/mw/wsp/wsptypes.h
epoc32/include/mw/xmlelemt.h
epoc32/include/mw/xmllib.h
-epoc32/include/networkemulator/cnetworkemulatorsetupcommdb.h
-epoc32/include/networkemulator/cprotocoltypes.h
-epoc32/include/networkemulator/cuccsdevicecontrol.h
-epoc32/include/networkemulator/cuccsdeviceprotocol.h
-epoc32/include/networkemulator/mucctransport.h
-epoc32/include/networkemulator/networkemulatorcontrol.h
-epoc32/include/networkemulator/uccs_errorcodes.h
epoc32/include/networking/dnd_err.h
epoc32/include/networking/packetlogger.mmh
epoc32/include/networking/qos3gpp_subconparams.h
@@ -2174,23 +2648,41 @@
epoc32/include/nkern/nkern_ext.mmh
epoc32/include/nkernsmp/nkern_ext.mmh
epoc32/include/non_foundation_paths.hrh
+epoc32/include/notespluginicons.mbg
+epoc32/include/npdlib.mbg
+epoc32/include/nsmldmsync.mbg
+epoc32/include/nsmldssync.mbg
epoc32/include/numberconversion.h
epoc32/include/obex/transport/obextransport.hrh
epoc32/include/oem/simlockuikeys.h
+epoc32/include/oggvorbiscodec/bwins/oggvorbisfloatutilu.def
+epoc32/include/oggvorbiscodec/bwins/oggvorbisintutilu.def
+epoc32/include/oggvorbiscodec/eabi/oggvorbisfloatutilu.def
+epoc32/include/oggvorbiscodec/eabi/oggvorbisintutilu.def
epoc32/include/openfont.h
epoc32/include/openfontlinkedtypefaceelementspec.h
epoc32/include/openmax/il/core/omxilcontentpipeif.hrh
epoc32/include/openmax/il/core/omxilloaderif.hrh
epoc32/include/openmax/il/loader/omxilcomponentif.hrh
-epoc32/include/OrientationBase.h
-epoc32/include/OrientationData.h
+epoc32/include/operationinformation.h
+epoc32/include/orientationbase.h
+epoc32/include/orientationdata.h
+epoc32/include/ostprotdefs.h
+epoc32/include/ovi_brand_graphics.mbg
epoc32/include/padding.h
+epoc32/include/paintcursor.mbg
epoc32/include/palette.h
epoc32/include/panerr.h
epoc32/include/panorama/panorama.h
epoc32/include/panorama/panoramauids.hrh
epoc32/include/pathconfiguration.hrh
epoc32/include/pathinfo.h
+epoc32/include/pbk2rclcallplugin.mbg
+epoc32/include/pbk2rclengine.mbg
+epoc32/include/pbk2rclpocplugin.mbg
+epoc32/include/pbk2rclsaveascontactplugin.mbg
+epoc32/include/pbk2rclsendbusinesscardplugin.mbg
+epoc32/include/pbk2rclsendplugin.mbg
epoc32/include/pcstore/checkeduid.h
epoc32/include/pcstore/descriptors.h
epoc32/include/pcstore/directfilestore.h
@@ -2202,21 +2694,45 @@
epoc32/include/pcstore/streamid.h
epoc32/include/pcstore/uid.h
epoc32/include/pdrport.h
-epoc32/include/PDRRECRD.H
epoc32/include/pdrstore.h
+epoc32/include/peninputfingerhwr.mbg
+epoc32/include/peninputgenerichwr.mbg
+epoc32/include/peninputgenericitut.mbg
+epoc32/include/peninputgenericvkb.mbg
+epoc32/include/peninputhwrboxcn.mbg
+epoc32/include/peninputhwrboxjp.mbg
+epoc32/include/peninputhwrfscn.mbg
+epoc32/include/peninputmodeswitcher.mbg
+epoc32/include/peninputsplititut.mbg
+epoc32/include/peninputsplitqwerty.mbg
+epoc32/include/peninputvkbcn.mbg
+epoc32/include/peninputvkbjp.mbg
+epoc32/include/peninputvkbkr.mbg
+epoc32/include/phonebook.mbg
+epoc32/include/phonebook2.mbg
+epoc32/include/phonebook2ece.mbg
+epoc32/include/phoneui.mbg
+epoc32/include/piprofilerui_extraicons.mbg
epoc32/include/pkixcertchain.h
epoc32/include/pkixvalidationresult.h
-epoc32/include/platform_paths.hrh
-epoc32/include/PlatformStaticFeatures.hrh
epoc32/include/pls.h
epoc32/include/pointerevent.h
+epoc32/include/postcard.mbg
+epoc32/include/presenceicons.mbg
+epoc32/include/presencetrafficlights.mbg
epoc32/include/privateruntimeids.hrh
-epoc32/include/PrivateStaticFeatures.hrh
-epoc32/include/ProductVariant.hrh
-epoc32/include/PtiKoreanQwertyCoreCRDefs.h
+epoc32/include/privatestaticfeatures.hrh
+epoc32/include/productvariant.hrh
+epoc32/include/provisioningcx.mbg
+epoc32/include/pslncallimageplugin.mbg
+epoc32/include/pslngsplugin.mbg
+epoc32/include/pslnicon.mbg
+epoc32/include/psu2.mbg
+epoc32/include/psuigsplugin.mbg
epoc32/include/publicruntimeids.hrh
-epoc32/include/PublicStaticFeatures.hrh
+epoc32/include/publicstaticfeatures.hrh
epoc32/include/punycodeconverter.h
+epoc32/include/pushmtm.mbg
epoc32/include/random.h
epoc32/include/remcon/playertype.h
epoc32/include/remcon/remconinterfacefeatures.h
@@ -2226,6 +2742,7 @@
epoc32/include/remconabsvoltarget.h
epoc32/include/remconabsvoltargetobserver.h
epoc32/include/remconaddress.h
+epoc32/include/remconclient.h
epoc32/include/remconcoreapi.h
epoc32/include/remconcoreapicontroller.h
epoc32/include/remconcoreapicontrollerobserver.h
@@ -2233,15 +2750,21 @@
epoc32/include/remconcoreapitargetobserver.h
epoc32/include/remconerrorobserver.h
epoc32/include/remconinterfaceselector.h
+epoc32/include/remconserver.h
epoc32/include/remconserverpanic.h
epoc32/include/remcontrackinfocontroller.h
epoc32/include/remcontrackinfocontrollerobserver.h
epoc32/include/remcontrackinfotarget.h
epoc32/include/remcontrackinfotargetobserver.h
-epoc32/include/RoomLevelBase.h
-epoc32/include/RoomLevelData.h
+epoc32/include/ringbc.mbg
+epoc32/include/roomlevelbase.h
+epoc32/include/roomleveldata.h
epoc32/include/rsconfig.mmh
+epoc32/include/rsfwgsplugin.mbg
epoc32/include/rvct/rvct.h
+epoc32/include/rvct2_1.h
+epoc32/include/rvct2_2.h
+epoc32/include/rvct2_2/rvct2_2.h
epoc32/include/s32btree.h
epoc32/include/s32btree.inl
epoc32/include/s32buf.h
@@ -2263,9 +2786,15 @@
epoc32/include/s32strm.h
epoc32/include/s32strm.inl
epoc32/include/s32ucmp.h
+epoc32/include/s60features.xml
+epoc32/include/s60features_apac.xml
+epoc32/include/s60features_japan.xml
+epoc32/include/s60features_korea.xml
epoc32/include/sacls.h
epoc32/include/saclscommon.h
epoc32/include/saclsdefines.h
+epoc32/include/satellite.mbg
+epoc32/include/satui.mbg
epoc32/include/sbque.h
epoc32/include/schinfo.h
epoc32/include/schsend.hrh
@@ -2278,6 +2807,9 @@
epoc32/include/securitydefs.h
epoc32/include/securitydefs.inl
epoc32/include/securityerr.h
+epoc32/include/senatomentry.h
+epoc32/include/senatomfeed.h
+epoc32/include/senatommessage.h
epoc32/include/sensordatacompensationtypes.h
epoc32/include/sensordatacompensator.h
epoc32/include/sensrvaccelerometersensor.h
@@ -2299,18 +2831,22 @@
epoc32/include/sensrvproximitysensor.h
epoc32/include/sensrvtappingsensor.h
epoc32/include/sensrvtypes.h
-epoc32/include/serialdriverext.h
+epoc32/include/servicehelpplugin.mbg
epoc32/include/shapeinfo.h
+epoc32/include/shiftjis.h
epoc32/include/signed.h
+epoc32/include/simlockuikeys.h
epoc32/include/sipstrconsts.h
epoc32/include/sizemode.h
epoc32/include/smilattributes.h
epoc32/include/smilelements.h
+epoc32/include/smiley.mbg
epoc32/include/smilgenericelements.h
-epoc32/include/SmlDataFormat.h
-epoc32/include/SmlDataFormat.hrh
-epoc32/include/SmlDataFormat.rh
-epoc32/include/SmlDataProvider.h
+epoc32/include/smilplayer.mbg
+epoc32/include/smldataformat.h
+epoc32/include/smldataformat.hrh
+epoc32/include/smldataformat.rh
+epoc32/include/smldataprovider.h
epoc32/include/smldmadapter.h
epoc32/include/smldmadapter.inl
epoc32/include/smss.hrh
@@ -2322,13 +2858,21 @@
epoc32/include/smsuset.inl
epoc32/include/smsustrm.h
epoc32/include/smsustrm.inl
-epoc32/include/SourceDopplerBase.h
-epoc32/include/SourceLocationBase.h
-epoc32/include/SourceOrientationBase.h
+epoc32/include/sourcedopplerbase.h
+epoc32/include/sourcelocationbase.h
+epoc32/include/sourceorientationbase.h
+epoc32/include/spdctrl.mbg
epoc32/include/speechrecognitionuids.hrh
epoc32/include/speechrecognitionutility.h
epoc32/include/speechrecognitionutilityobserver.h
+epoc32/include/speeddialgsplugin.mbg
+epoc32/include/splashscreen.mbg
+epoc32/include/spriteanimationclient.h
epoc32/include/sqldb.h
+epoc32/include/src/tools/uic/qclass_lib_map.h
+epoc32/include/srchuiapp.mbg
+epoc32/include/srchuiindevicesvg.mbg
+epoc32/include/srchuiresviewpluginicons.mbg
epoc32/include/ssl.h
epoc32/include/ssl_compatibility.h
epoc32/include/sslerr.h
@@ -2342,6 +2886,7 @@
epoc32/include/ssm/starter.hrh
epoc32/include/starter.hrh
epoc32/include/startup.hrh
+epoc32/include/startup.mbg
epoc32/include/stdapis/_ansi.h
epoc32/include/stdapis/_ctype.h
epoc32/include/stdapis/arpa/inet.h
@@ -2720,7 +3265,7 @@
epoc32/include/stdapis/boost/mpl/aux_/nttp_decl.hpp
epoc32/include/stdapis/boost/mpl/aux_/numeric_cast_utils.hpp
epoc32/include/stdapis/boost/mpl/aux_/numeric_op.hpp
-epoc32/include/stdapis/boost/mpl/aux_/O1_size_impl.hpp
+epoc32/include/stdapis/boost/mpl/aux_/o1_size_impl.hpp
epoc32/include/stdapis/boost/mpl/aux_/overload_names.hpp
epoc32/include/stdapis/boost/mpl/aux_/pop_front_impl.hpp
epoc32/include/stdapis/boost/mpl/aux_/preprocessed/plain/advance_backward.hpp
@@ -2835,7 +3380,7 @@
epoc32/include/stdapis/boost/mpl/list/aux_/include_preprocessed.hpp
epoc32/include/stdapis/boost/mpl/list/aux_/item.hpp
epoc32/include/stdapis/boost/mpl/list/aux_/iterator.hpp
-epoc32/include/stdapis/boost/mpl/list/aux_/O1_size.hpp
+epoc32/include/stdapis/boost/mpl/list/aux_/o1_size.hpp
epoc32/include/stdapis/boost/mpl/list/aux_/pop_front.hpp
epoc32/include/stdapis/boost/mpl/list/aux_/preprocessed/plain/list10.hpp
epoc32/include/stdapis/boost/mpl/list/aux_/preprocessed/plain/list20.hpp
@@ -2858,8 +3403,8 @@
epoc32/include/stdapis/boost/mpl/next_prior.hpp
epoc32/include/stdapis/boost/mpl/not.hpp
epoc32/include/stdapis/boost/mpl/numeric_cast.hpp
-epoc32/include/stdapis/boost/mpl/O1_size.hpp
-epoc32/include/stdapis/boost/mpl/O1_size_fwd.hpp
+epoc32/include/stdapis/boost/mpl/o1_size.hpp
+epoc32/include/stdapis/boost/mpl/o1_size_fwd.hpp
epoc32/include/stdapis/boost/mpl/or.hpp
epoc32/include/stdapis/boost/mpl/pair.hpp
epoc32/include/stdapis/boost/mpl/pair_view.hpp
@@ -2915,7 +3460,7 @@
epoc32/include/stdapis/boost/mpl/vector/aux_/include_preprocessed.hpp
epoc32/include/stdapis/boost/mpl/vector/aux_/item.hpp
epoc32/include/stdapis/boost/mpl/vector/aux_/iterator.hpp
-epoc32/include/stdapis/boost/mpl/vector/aux_/O1_size.hpp
+epoc32/include/stdapis/boost/mpl/vector/aux_/o1_size.hpp
epoc32/include/stdapis/boost/mpl/vector/aux_/pop_back.hpp
epoc32/include/stdapis/boost/mpl/vector/aux_/pop_front.hpp
epoc32/include/stdapis/boost/mpl/vector/aux_/preprocessed/plain/vector10.hpp
@@ -3490,15 +4035,16 @@
epoc32/include/stdapis/boost/weak_ptr.hpp
epoc32/include/stdapis/crypt.h
epoc32/include/stdapis/ctype.h
+epoc32/include/stdapis/dbus-1.0/dbus/dbus.h
epoc32/include/stdapis/dbus-1.0/dbus/dbus-address.h
epoc32/include/stdapis/dbus-1.0/dbus/dbus-arch-deps.h
epoc32/include/stdapis/dbus-1.0/dbus/dbus-bus.h
epoc32/include/stdapis/dbus-1.0/dbus/dbus-connection.h
epoc32/include/stdapis/dbus-1.0/dbus/dbus-errors.h
+epoc32/include/stdapis/dbus-1.0/dbus/dbus-glib.h
epoc32/include/stdapis/dbus-1.0/dbus/dbus-glib-bindings.h
epoc32/include/stdapis/dbus-1.0/dbus/dbus-glib-error-enum.h
epoc32/include/stdapis/dbus-1.0/dbus/dbus-glib-lowlevel.h
-epoc32/include/stdapis/dbus-1.0/dbus/dbus-glib.h
epoc32/include/stdapis/dbus-1.0/dbus/dbus-gtype-specialized.h
epoc32/include/stdapis/dbus-1.0/dbus/dbus-macros.h
epoc32/include/stdapis/dbus-1.0/dbus/dbus-memory.h
@@ -3511,7 +4057,6 @@
epoc32/include/stdapis/dbus-1.0/dbus/dbus-signature.h
epoc32/include/stdapis/dbus-1.0/dbus/dbus-threads.h
epoc32/include/stdapis/dbus-1.0/dbus/dbus-types.h
-epoc32/include/stdapis/dbus-1.0/dbus/dbus.h
epoc32/include/stdapis/dirent.h
epoc32/include/stdapis/dlfcn.h
epoc32/include/stdapis/err.h
@@ -3521,7 +4066,6 @@
epoc32/include/stdapis/float.h
epoc32/include/stdapis/ftw.h
epoc32/include/stdapis/getopt.h
-epoc32/include/stdapis/glib-2.0/glib-object.h
epoc32/include/stdapis/glib-2.0/glib.h
epoc32/include/stdapis/glib-2.0/glib/galloca.h
epoc32/include/stdapis/glib-2.0/glib/garray.h
@@ -3538,8 +4082,8 @@
epoc32/include/stdapis/glib-2.0/glib/gfileutils.h
epoc32/include/stdapis/glib-2.0/glib/ghash.h
epoc32/include/stdapis/glib-2.0/glib/ghook.h
+epoc32/include/stdapis/glib-2.0/glib/gi18n.h
epoc32/include/stdapis/glib-2.0/glib/gi18n-lib.h
-epoc32/include/stdapis/glib-2.0/glib/gi18n.h
epoc32/include/stdapis/glib-2.0/glib/giochannel.h
epoc32/include/stdapis/glib-2.0/glib/gkeyfile.h
epoc32/include/stdapis/glib-2.0/glib/glist.h
@@ -3577,6 +4121,7 @@
epoc32/include/stdapis/glib-2.0/glib/gwin32.h
epoc32/include/stdapis/glib-2.0/glib_global.h
epoc32/include/stdapis/glib-2.0/glibconfig.h
+epoc32/include/stdapis/glib-2.0/glib-object.h
epoc32/include/stdapis/glib-2.0/glowmem.h
epoc32/include/stdapis/glib-2.0/gmodule.h
epoc32/include/stdapis/glib-2.0/gobject/gboxed.h
@@ -3641,6 +4186,8 @@
epoc32/include/stdapis/libxml2/libxml2_xpathinternals.h
epoc32/include/stdapis/libxml2/libxml2_xpointer.h
epoc32/include/stdapis/libxml2/xmlengconfig.h
+epoc32/include/stdapis/libxml2/xmlengtriodef.h
+epoc32/include/stdapis/libxml2/xmlengtrionan.h
epoc32/include/stdapis/libxml2/xmlengxeconfig.h
epoc32/include/stdapis/limits.h
epoc32/include/stdapis/locale.h
@@ -3813,7 +4360,6 @@
epoc32/include/stdapis/stlport/cwchar
epoc32/include/stdapis/stlport/cwctype
epoc32/include/stdapis/stlport/deque
-epoc32/include/stdapis/stlport/exception
epoc32/include/stdapis/stlport/exception.h
epoc32/include/stdapis/stlport/fstream
epoc32/include/stdapis/stlport/fstream.h
@@ -3832,13 +4378,11 @@
epoc32/include/stdapis/stlport/iterator
epoc32/include/stdapis/stlport/limits
epoc32/include/stdapis/stlport/list
-epoc32/include/stdapis/stlport/locale
epoc32/include/stdapis/stlport/locale.h
epoc32/include/stdapis/stlport/map
epoc32/include/stdapis/stlport/math.h
epoc32/include/stdapis/stlport/mem.h
epoc32/include/stdapis/stlport/memory
-epoc32/include/stdapis/stlport/new
epoc32/include/stdapis/stlport/new.h
epoc32/include/stdapis/stlport/numeric
epoc32/include/stdapis/stlport/ostream
@@ -3848,12 +4392,9 @@
epoc32/include/stdapis/stlport/queue
epoc32/include/stdapis/stlport/rope
epoc32/include/stdapis/stlport/runtime/exception.h
-epoc32/include/stdapis/stlport/runtime/new
epoc32/include/stdapis/stlport/runtime/new.h
epoc32/include/stdapis/stlport/runtime/numeric
-epoc32/include/stdapis/stlport/runtime/typeinfo
epoc32/include/stdapis/stlport/runtime/typeinfo.h
-epoc32/include/stdapis/stlport/set
epoc32/include/stdapis/stlport/setjmp.h
epoc32/include/stdapis/stlport/slist
epoc32/include/stdapis/stlport/sstream
@@ -4016,12 +4557,10 @@
epoc32/include/stdapis/stlport/stl_user_config.h
epoc32/include/stdapis/stlport/streambuf
epoc32/include/stdapis/stlport/streambuf.h
-epoc32/include/stdapis/stlport/string
epoc32/include/stdapis/stlport/string.h
epoc32/include/stdapis/stlport/strstream
epoc32/include/stdapis/stlport/strstream.h
epoc32/include/stdapis/stlport/time.h
-epoc32/include/stdapis/stlport/typeinfo
epoc32/include/stdapis/stlport/typeinfo.h
epoc32/include/stdapis/stlport/using/cstring
epoc32/include/stdapis/stlport/using/fstream
@@ -4351,95 +4890,52 @@
epoc32/include/stdapis/wctype.h
epoc32/include/stdapis/zconf.h
epoc32/include/stdapis/zlib.h
-epoc32/include/StereoWideningBase.h
-epoc32/include/StereoWideningData.h
-epoc32/include/StereoWideningUtility.h
-epoc32/include/StereoWideningUtilityData.h
-epoc32/include/StringLoader.h
+epoc32/include/stereowideningbase.h
+epoc32/include/stereowideningdata.h
+epoc32/include/stereowideningutility.h
+epoc32/include/stereowideningutilitydata.h
+epoc32/include/stringloader.h
epoc32/include/stringpool.h
epoc32/include/stringpool.inl
+epoc32/include/svgtuicontrol.mbg
epoc32/include/swap.h
-epoc32/include/syborg/variantmediadef.h
+epoc32/include/symbianbasictags.rh
+epoc32/include/symbiancontexts.rh
+epoc32/include/symbiantags.rh
epoc32/include/symcpp.h
-epoc32/include/syncml/SmlDataSyncDefs.h
-epoc32/include/SyncMLAlertInfo.h
-epoc32/include/SyncMLClient.h
-epoc32/include/SyncMLClientDM.h
-epoc32/include/SyncMLClientDS.h
-epoc32/include/SyncMLContactSuiteProgressClient.h
-epoc32/include/SyncMLDataFilter.h
-epoc32/include/SyncMLDataFilter.hrh
-epoc32/include/SyncMLDataFilter.rh
-epoc32/include/SyncMLDef.h
-epoc32/include/SyncMLErr.h
-epoc32/include/SyncMLHistory.h
-epoc32/include/SyncMLObservers.h
-epoc32/include/SyncMLTransportProperties.h
+epoc32/include/syncml/smldatasyncdefs.h
+epoc32/include/syncmlalertinfo.h
+epoc32/include/syncmlclient.h
+epoc32/include/syncmlclientdm.h
+epoc32/include/syncmlclientds.h
+epoc32/include/syncmlcontactsuiteprogressclient.h
+epoc32/include/syncmldatafilter.h
+epoc32/include/syncmldatafilter.hrh
+epoc32/include/syncmldatafilter.rh
+epoc32/include/syncmldef.h
+epoc32/include/syncmlerr.h
+epoc32/include/syncmlhistory.h
+epoc32/include/syncmlobservers.h
+epoc32/include/syncmltransportproperties.h
+epoc32/include/sysap.mbg
+epoc32/include/systemmonitor/configuration.h
+epoc32/include/systemmonitor/eventlog.h
+epoc32/include/systemmonitor/instrumentationhandler.h
+epoc32/include/systemmonitor/locking.h
+epoc32/include/systemmonitor/recordtypes.h
+epoc32/include/systemmonitor/systemmonitor.h
+epoc32/include/systemmonitor/systemmonitorerrors.h
+epoc32/include/systemmonitor/utilities.h
epoc32/include/sysutil.h
epoc32/include/tagma.h
epoc32/include/tcp_hdr.h
epoc32/include/tcpseq.h
epoc32/include/telephony.inl
-epoc32/include/test/activecallback.h
-epoc32/include/test/blockitems.h
-epoc32/include/test/commandprocessor.h
-epoc32/include/test/cteflogger.h
-epoc32/include/test/ctefunitserver.h
-epoc32/include/test/dataaccess.h
-epoc32/include/test/datadictionary.h
-epoc32/include/test/datawrapper.h
-epoc32/include/test/datawrapper.inl
-epoc32/include/test/fileservplugin.h
-epoc32/include/test/rfilelogger.h
-epoc32/include/test/rfileloggermacro.h
-epoc32/include/test/sysstartplugin.h
-epoc32/include/test/tefexportconst.h
-epoc32/include/test/tefresult.h
-epoc32/include/test/tefscriptutils.h
-epoc32/include/test/tefshareddata.h
-epoc32/include/test/tefshareddata.inl
-epoc32/include/test/teftimer.h
-epoc32/include/test/tefunit.h
-epoc32/include/test/tefunit.inl
-epoc32/include/test/TEFUtils.h
-epoc32/include/test/testblockcontroller.h
-epoc32/include/test/testblockcontroller.inl
-epoc32/include/test/testexecuteclient.h
-epoc32/include/test/testexecutelog.h
-epoc32/include/test/testexecutelogbase.h
-epoc32/include/test/testexecutelogger.h
-epoc32/include/test/testexecutepipslog.h
-epoc32/include/test/testexecuteserverbase.h
-epoc32/include/test/testexecuteserverutils.h
-epoc32/include/test/testexecuteserverutils.inl
-epoc32/include/test/testexecutestepbase.h
-epoc32/include/test/testserver2.h
-epoc32/include/test/testshareddata.h
-epoc32/include/test/testshareddata.inl
-epoc32/include/test/wrapperutilsplugin.h
-epoc32/include/testconfigfileparser.h
-epoc32/include/testconfigfileparser.inl
epoc32/include/textcursor.h
epoc32/include/textresolver.h
epoc32/include/textresolver.hrh
epoc32/include/tinternetdate.h
epoc32/include/tools/certapp-api.h
-epoc32/include/tools/coredump/coredumpinterface.h
-epoc32/include/tools/coredump/coredumpserverapi.h
-epoc32/include/tools/coredump/crashdata.h
-epoc32/include/tools/coredump/crashdatasave.h
-epoc32/include/tools/coredump/crashdatasave.inl
-epoc32/include/tools/coredump/crashdatasource.h
-epoc32/include/tools/coredump/debuglogging.h
-epoc32/include/tools/coredump/executabledata.h
-epoc32/include/tools/coredump/formatterapi.h
-epoc32/include/tools/coredump/formatterapi.inl
-epoc32/include/tools/coredump/optionconfig.h
-epoc32/include/tools/coredump/plugindata.h
-epoc32/include/tools/coredump/processdata.h
-epoc32/include/tools/coredump/streamelement.h
-epoc32/include/tools/coredump/symbianelfdefs.h
-epoc32/include/tools/coredump/threaddata.h
epoc32/include/tools/stlport/algorithm
epoc32/include/tools/stlport/assert.h
epoc32/include/tools/stlport/bitset
@@ -4764,7 +5260,11 @@
epoc32/include/tools/stlport/vector
epoc32/include/tools/stlport/wchar.h
epoc32/include/tools/stlport/wctype.h
+epoc32/include/toolsclientsession.h
+epoc32/include/touchscreencalib.mbg
epoc32/include/tranp.h
+epoc32/include/trkapp_200170bb.mbg
+epoc32/include/trui_icons.mbg
epoc32/include/tsy.hrh
epoc32/include/tsy.rh
epoc32/include/txtetext.h
@@ -4783,6 +5283,8 @@
epoc32/include/txtstyle.inl
epoc32/include/typerel.h
epoc32/include/udp_hdr.h
+epoc32/include/uiklaf/private/bwins/uiklafu.def
+epoc32/include/uiklaf/private/eabi/uiklafu.def
epoc32/include/uiklaf/private/pluginuid.hrh
epoc32/include/uikon.hrh
epoc32/include/uikon.rh
@@ -4794,7 +5296,10 @@
epoc32/include/uloggerplugin.h
epoc32/include/uloggerplugin.inl
epoc32/include/uloggershared.h
+epoc32/include/unified_editor.h
epoc32/include/unifiedcertstore.h
+epoc32/include/uniutils.mbg
+epoc32/include/upnpgspluginrsc.mbg
epoc32/include/ups/ups.hrh
epoc32/include/ups/upsclient.h
epoc32/include/ups/upsconst.h
@@ -4811,33 +5316,55 @@
epoc32/include/usbhost/internal/fdcplugin.hrh
epoc32/include/usbhost/internal/fdfcaps.mmh
epoc32/include/usbman.rh
+epoc32/include/usbui.mbg
epoc32/include/utf.h
-epoc32/include/variant/platform_paths.hrh
-epoc32/include/variant/Symbian_OS.hrh
+epoc32/include/variant/featurelists/s60public.txt
+epoc32/include/variant/symbian_os.hrh
+epoc32/include/variatedbitmaps.mbg
+epoc32/include/vccontrolpanelplugin.mbg
+epoc32/include/vcommand.mbg
+epoc32/include/vcxhgmyvideos.mbg
+epoc32/include/vcxhgmyvideosicons.mbg
epoc32/include/versioninfo.h
epoc32/include/versioninfo.inl
-epoc32/include/VG/1.0/openvg.h
-epoc32/include/VG/1.0/vgu.h
-epoc32/include/VG/1.1/openvg.h
-epoc32/include/VG/1.1/vgu.h
-epoc32/include/VG/openvg.h
-epoc32/include/VG/openvguids.hrh
-epoc32/include/VG/vgu.h
+epoc32/include/vg/1.0/openvg.h
+epoc32/include/vg/1.0/vgu.h
+epoc32/include/vg/1.1/openvg.h
+epoc32/include/vg/1.1/vgu.h
+epoc32/include/vg/openvg.h
+epoc32/include/vg/openvguids.hrh
+epoc32/include/vg/vgu.h
epoc32/include/videoplayer.h
epoc32/include/videorecorder.h
-epoc32/include/vpnapidefs.h
+epoc32/include/videotelui.mbg
+epoc32/include/vimpst_servicetab_default.mbg
+epoc32/include/vimpstui.mbg
+epoc32/include/vm.mbg
+epoc32/include/voicerecorder.mbg
+epoc32/include/voiceui.mbg
+epoc32/include/vpnmanagementui.mbg
epoc32/include/w32adll.h
epoc32/include/w32click.h
epoc32/include/w32std.h
epoc32/include/w32stdgraphic.h
epoc32/include/wap_sock.h
-epoc32/include/wapmessage.h
-epoc32/include/wapmsgerr.h
-epoc32/include/WF/openwfcuids.hrh
-epoc32/include/WF/wfc.h
-epoc32/include/WF/wfcext.h
-epoc32/include/WF/wfcplatform.h
+epoc32/include/webkit.mbg
+epoc32/include/webkiticons.mbg
+epoc32/include/webkitutilsicons.mbg
+epoc32/include/wf/openwfcuids.hrh
+epoc32/include/wf/wfc.h
+epoc32/include/wf/wfcext.h
+epoc32/include/wf/wfcplatform.h
+epoc32/include/widgetmanager.mbg
+epoc32/include/wifiprot.mbg
+epoc32/include/wlanplugin.mbg
epoc32/include/wlansdkpskeys.h
+epoc32/include/wmdrmdla.mbg
+epoc32/include/wngdoor.h
+epoc32/include/wngmodel.h
+epoc32/include/wngmodel.inl
+epoc32/include/wsficons.mbg
+epoc32/include/wsfwlaninfosorting.mbg
epoc32/include/wspdecoder.h
epoc32/include/wspencoder.h
epoc32/include/wtlscert.h
@@ -4927,6 +5454,11 @@
epoc32/include/xml/parserfeature.h
epoc32/include/xml/stringdictionarycollection.h
epoc32/include/xml/taginfo.h
+epoc32/include/xml/utils/xmlengmem.h
+epoc32/include/xml/utils/xmlengutils.h
+epoc32/include/xml/utils/xmlengxestd.h
+epoc32/include/xml/utils/xmlengxestrings.h
+epoc32/include/xml/utils/xmlengxestrings.inl
epoc32/include/xml/wbxmlextensionhandler.h
epoc32/include/xml/xmlframeworkerrors.h
epoc32/include/xmlengattr.h
@@ -4958,6 +5490,12 @@
epoc32/include/xmlengtext.h
epoc32/include/xmlenguserdata.h
epoc32/include/xmlentityreferences.h
+epoc32/include/yahoo_brand_graphics.mbg
+epoc32/include/z/private/102073ca/backup_registration.xml
+epoc32/include/z/private/1027509e/backup_registration.xml
+epoc32/include/z/private/10281861/backup_registration.xml
+epoc32/include/z/private/10282bc4/rules/locbtgpspsypscontextstate.rul
+epoc32/include/z/private/10282bc4/settings/10282c74/locbtgpspsypscontextstate.xml
epoc32/include/zconf.h
epoc32/include/ziparchive.h
epoc32/include/zipfile.h
--- a/symbian3/single/3.0.i_backup_candidate.csv Wed May 05 12:21:47 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,119 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_internal/rnd/rndonly/aricent/,/rnd/rndonly/aricent,changeset,2b41c6133edf,
-//v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,changeset,d179868647e4,
-//v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,changeset,afb66031ac23,
-//v800008/Builds01/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,changeset,bc65ca6d8d9c,
-//v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,changeset,3308607f8c27,
-http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,changeset,cc2ddc216a12,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/camera/,/sf/app/camera,changeset,51dda465e618,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/commonemail/,/sf/app/commonemail,changeset,8592a65ad3fb,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/app/conntools/,/sf/app/conntools,changeset,a49137138563,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/contacts/,/sf/app/contacts,changeset,5586b4d2ec3e,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/contentcontrol/,/sf/app/contentcontrol,changeset,a564f66a2339,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/conversations/,/sf/app/conversations,changeset,9fdee5e1da30,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/devicecontrol/,/sf/app/devicecontrol,changeset,4eb398b07b07,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/dictionary/,/sf/app/dictionary,changeset,abd5d081eb2d,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/files/,/sf/app/files,changeset,875fd7f60fdf,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/graphicsuis/,/sf/app/graphicsuis,changeset,2ad882606620,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/helps/,/sf/app/helps,changeset,91bbff48ea9c,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/app/homescreen/,/sf/app/homescreen,changeset,c2e9d284d779,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/im/,/sf/app/im,changeset,c303fa51f66d,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/imgeditor/,/sf/app/imgeditor,changeset,edfc90759b9f,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/iptelephony/,/sf/app/iptelephony,changeset,6134b5029079,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/jrt/,/sf/app/jrt,changeset,f5050f1da672,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/location/,/sf/app/location,changeset,3a25f69541ff,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/messaging/,/sf/app/messaging,changeset,52d61119153d,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/mmsharinguis/,/sf/app/mmsharinguis,changeset,4c163c82e7ad,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/musicplayer/,/sf/app/musicplayer,changeset,c54d95799c80,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/organizer/,/sf/app/organizer,changeset,a552c9d3f67b,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/app/phone/,/sf/app/phone,changeset,5d467ea4b3e5,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/photos/,/sf/app/photos,changeset,2dac0fdba72b,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/app/printing/,/sf/app/printing,changeset,f693f7318d3e,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/profile/,/sf/app/profile,changeset,2854d7196aaf,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/radio/,/sf/app/radio,changeset,f73067c3e563,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/screensaver/,/sf/app/screensaver,changeset,4784a3bc2236,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/settingsuis/,/sf/app/settingsuis,changeset,f42d5229d8ed,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/speechsrv/,/sf/app/speechsrv,changeset,fc313e1df071,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/techview/,/sf/app/techview,changeset,6beaa9cf4752,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/utils/,/sf/app/utils,changeset,ddecbce3dc1f,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/videoeditor/,/sf/app/videoeditor,changeset,951a5db380a0,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/videoplayer/,/sf/app/videoplayer,changeset,8970fbd719ec,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/videotelephony/,/sf/app/videotelephony,changeset,392fdfb57a78,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/voicerec/,/sf/app/voicerec,changeset,bb90e4148332,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/webuis/,/sf/app/webuis,changeset,c9249d037530,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/accesssec/,/sf/mw/accesssec,changeset,6d97dea7ee6c,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/appinstall/,/sf/mw/appinstall,changeset,09e5ea190d07,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/appsupport/,/sf/mw/appsupport,changeset,c82a39b81a38,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/btservices/,/sf/mw/btservices,changeset,f7fbeaeb166a,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/camerasrv/,/sf/mw/camerasrv,changeset,eb8cd2e3974b,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/classicui/,/sf/mw/classicui,changeset,2b7609a571c9,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/dlnasrv/,/sf/mw/dlnasrv,changeset,bfb2712e420e,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/drm/,/sf/mw/drm,changeset,656c47ca7d25,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/gsprofilesrv/,/sf/mw/gsprofilesrv,changeset,f392bfb21e08,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/hapticsservices/,/sf/mw/hapticsservices,changeset,a4df7952b706,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/helix/,/sf/mw/helix,changeset,c0474fab502e,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/homescreensrv/,/sf/mw/homescreensrv,changeset,47a0b3d74f76,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/imghandling/,/sf/mw/imghandling,changeset,ee674526fac5,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/imsrv/,/sf/mw/imsrv,changeset,b6f2a363adf7,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/inputmethods/,/sf/mw/inputmethods,changeset,4eb1ae11334f,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/ipappprotocols/,/sf/mw/ipappprotocols,changeset,532ef74cdfa0,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/ipappsrv/,/sf/mw/ipappsrv,changeset,2a28ef775f15,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/ipconnmgmt/,/sf/mw/ipconnmgmt,changeset,c14618f9de99,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/legacypresence/,/sf/mw/legacypresence,changeset,b4758b4b2d20,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/locationsrv/,/sf/mw/locationsrv,changeset,e000e7e1f1b1,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/mds/,/sf/mw/mds,changeset,82c0024438c8,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/messagingmw/,/sf/mw/messagingmw,changeset,33d4877f7b9f,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/metadatasrv/,/sf/mw/metadatasrv,changeset,533a463dabdc,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/mmappfw/,/sf/mw/mmappfw,changeset,8add8cccb322,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/mmmw/,/sf/mw/mmmw,changeset,03a293c97d5c,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/mmuifw/,/sf/mw/mmuifw,changeset,65e535be25c8,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/netprotocols/,/sf/mw/netprotocols,changeset,73e95e652591,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/networkingdm/,/sf/mw/networkingdm,changeset,ad089248fd2f,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/opensrv/,/sf/mw/opensrv,changeset,46cc8e302e43,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/phonesrv/,/sf/mw/phonesrv,changeset,ba42c4bd84dd,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/qt/,/sf/mw/qt,changeset,8c4229025c0b,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/remoteconn/,/sf/mw/remoteconn,changeset,3673b591050c,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/remotemgmt/,/sf/mw/remotemgmt,changeset,504e41245867,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/remotestorage/,/sf/mw/remotestorage,changeset,fe0554130c0f,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/securitysrv/,/sf/mw/securitysrv,changeset,bbcfd14ce6a7,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/serviceapi/,/sf/mw/serviceapi,changeset,68159986cd41,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/serviceapifw/,/sf/mw/serviceapifw,changeset,8fe836ab12d4,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/shortlinkconn/,/sf/mw/shortlinkconn,changeset,031b9cffe6e4,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/srvdiscovery/,/sf/mw/srvdiscovery,changeset,8116cc943311,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/svgt/,/sf/mw/svgt,changeset,d240fe32a15c,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/uiaccelerator/,/sf/mw/uiaccelerator,changeset,58df6de9b7bc,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/uiresources/,/sf/mw/uiresources,changeset,14a1a9556453,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/uitools/,/sf/mw/uitools,changeset,b5f2d4dc5e69,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/usbservices/,/sf/mw/usbservices,changeset,1a297fa72b1e,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/videoutils/,/sf/mw/videoutils,changeset,e16c1e402817,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/vpnclient/,/sf/mw/vpnclient,changeset,9fc0ed567871,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/web/,/sf/mw/web,changeset,ac77f89b1d9e,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/websrv/,/sf/mw/websrv,changeset,ab1e518f96da,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/wirelessacc/,/sf/mw/wirelessacc,changeset,981afc7d3841,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/boardsupport/,/sf/os/boardsupport,changeset,582f97e694c5,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/bt/,/sf/os/bt,changeset,16aa830c86c8,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/buildtools/,/sf/os/buildtools,changeset,54aa4a06a075,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/cellularsrv/,/sf/os/cellularsrv,changeset,50bae5c5c85f,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/commsfw/,/sf/os/commsfw,changeset,4ccf8e394726,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,changeset,5a3f83d60aea,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/devicesrv/,/sf/os/devicesrv,changeset,8d1d8440b626,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/graphics/,/sf/os/graphics,changeset,2ab528493d70,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/imagingext/,/sf/os/imagingext,changeset,e5ca06a707ac,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,changeset,b0c9ba7c8f31,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/lbs/,/sf/os/lbs,changeset,87328fd772e8,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/mm/,/sf/os/mm,changeset,b74061f7f3d2,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/networkingsrv/,/sf/os/networkingsrv,changeset,6d5320894977,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/ossrv/,/sf/os/ossrv,changeset,c39903cb48f6,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/persistentdata/,/sf/os/persistentdata,changeset,211563e4b919,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/security/,/sf/os/security,changeset,e0a1505373c1,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/textandloc/,/sf/os/textandloc,changeset,93dabad1a1d2,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/usb/,/sf/os/usb,changeset,573550b50543,
-http://developer.symbian.org/oss/MCL/sf/os/wlan/,/sf/os/wlan,changeset,4e2a442f3e66,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,changeset,361f875fa818,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/osrndtools/,/sf/os/osrndtools,changeset,7e287c5c61f0,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,changeset,2905910218db,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,changeset,99ca724f9829,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,changeset,324a03d02709,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/homescreentools/,/sf/app/homescreentools,changeset,7265a7871f4c,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/platformtools/,/sf/mw/platformtools,changeset,dc99d5dd2e71,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/rndtools/,/sf/app/rndtools,changeset,87e9ebfbe96a,layers.sysdef.xml
--- a/symbian3/single/job_props.ant.xml Wed May 05 12:21:47 2010 +0100
+++ b/symbian3/single/job_props.ant.xml Tue Jul 13 12:21:44 2010 +0100
@@ -5,7 +5,7 @@
<dirname property="sf.spec.job.dir" file="${ant.file.SF-JOB-PROPS}"/>
<property name="sf.project.type" value="platform" />
- <property name="sf.previous.pdk.tag" value="PDK_3.0.h" />
+ <property name="sf.previous.pdk.tag" value="PDK_3.0.0" />
<property name="sf.spec.job.name" value="symbian3"/>
<property name="sf.spec.corebuildversion" value="week37"/>
@@ -33,8 +33,8 @@
<!-- and set sf.spec.baseline.enable to 'true' -->
<!-- get full source env and binaries from pdk -->
- <property name="sf.spec.baseline.location" value="\\v800008\Builds01\Releases\${sf.previous.pdk.tag}" />
- <property name="sf.spec.toolsbaseline.location" value="\\v800008\PDT\overlay_default.8" /> <!-- for TEF etc -->
+ <property name="sf.spec.baseline.location" value="\\v800008\PDT\prebuilt_default.41" /> <!-- prebuilt stuff etc. -->
+ <property name="sf.spec.toolsbaseline.location" value="\\v800008\Builds01\Releases\${sf.previous.pdk.tag}_custom" /> <!-- tools baseline location e.g. tools_epoc.zip -->
<!-- platform build specific properties -->
<property name="sf.spec.s60.sysdef.clean.configurations.list" value="S60_5_2_sf" />
@@ -76,9 +76,6 @@
<property name="sf.spec.md5.enable" value="true"/>
<!-- Build ROMs from iMaker config defined in job_refs.ant.xml -->
- <property name="sf.spec.referenceroms.createimages.enable" value="false"/>
-
- <!-- run qmake for anything units with proFile attribs -->
- <property name="qmake.enabled" value="true"/>
+ <property name="sf.spec.referenceroms.createimages.enable" value="true"/>
</project>
--- a/symbian3/single/job_refs.ant.xml Wed May 05 12:21:47 2010 +0100
+++ b/symbian3/single/job_refs.ant.xml Tue Jul 13 12:21:44 2010 +0100
@@ -4,26 +4,20 @@
<!-- For a combined model GT+S60, sf.spec.os.system.definition.files must be used -->
<path id="sf.spec.os.system.definition.files">
- <fileset dir="${sf.project.location}/" casesensitive="false">
- <include name="sysdefs/system_model.xml" />
+ <fileset dir="${sf.spec.systemdefinition.location}/" casesensitive="false">
+ <include name="${sf.spec.systemdefinition.filename}" />
</fileset>
</path>
-
- <path id="sf.spec.s60.system.definition.files">
- <fileset dir="${sf.project.location}/" casesensitive="false">
- <include name="sysdefs/system_model_s60.xml" />
- </fileset>
- </path>
<!-- iMaker config to be used by build-roms Helium target -->
<hlm:imakerconfigurationset id="imaker.rom.config">
- <imakerconfiguration regionalVariation="false">
+ <imakerconfiguration>
<makefileset>
<!-- Note: case sensitive -->
- <include name="**/*Syborg*.mk"/>
+ <include name="**/image_conf_syborg.mk"/>
</makefileset>
<targetset>
- <include name="^core$" />
+ <include name="^flash$" />
<!--
include name="langpack_\d+" />
<include name="^custvariant_.*$" />
@@ -31,9 +25,11 @@
-->
</targetset>
<variableset>
+ <!--
<variable name="TYPE" value="rnd"/>
<variable name="USE_SYMGEN" value="1"/>
<variable name="USE_UDEB" value="1"/>
+ -->
</variableset>
</imakerconfiguration>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/single/public_override_props.ant.xml Tue Jul 13 12:21:44 2010 +0100
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+
+<project name="SF-PUBLIC-PROPS">
+
+ <dirname property="sf.spec.job.dir" file="${ant.file.SF-PUBLIC-PROPS}"/>
+ <property name="sf.suppress.buildenv.check" value="true" />
+ <property name="sf.suppress.drive.space.check" value="true" />
+ <property name="sf.drive.space.needed" value="40G"/>
+ <property name="sf.spec.job.drive" value="M:"/>
+
+ <!-- unpack prebuilt binaries and bom? if so from where? -->
+ <property name="sf.spec.baseline.enable" value="true" />
+ <property name="sf.spec.baseline.location" value="C:\PDK" />
+ <property name="sf.spec.baseline.getenv_options" value="-i prebuilt -i info -k" />
+
+ <!-- unpack tools? if so, from same location as baseline? -->
+ <property name="sf.spec.toolsbaseline.enable" value="true" />
+ <property name="sf.spec.toolsbaseline.location" value="${sf.spec.baseline.location}" />
+ <property name="sf.spec.toolsbaseline.getenv_options" value="-i tools -k" />
+
+ <!-- packaging options -->
+ <property name="sf.spec.package.src.enable" value="false" />
+ <property name="sf.spec.package.bin.enable" value="false" />
+
+ <!-- default build configurations -->
+ <property name="sf.spec.sbs.config" value="winscw_udeb.whatlog" />
+ <property name="sf.spec.sbs.tools.config" value="tools2.whatlog" />
+
+ <!-- default localisation variant -->
+ <property name="sf.spec.bldmefirst.s60.variant" value="engineering" />
+
+ <!-- prevent trying to access default SF servers -->
+ <property name="sf.spec.publish.enable" value="false" />
+ <property name="sf.spec.smoketest.enable" value="false" />
+ <property name="sf.spec.test.sendpkg.enable" value="false" />
+
+ <!-- public rnd binaries are in baseline.location, not from mercurial -->
+ <property name="sf.spec.sourcesync.sourcespecfile.rnd" value="nul:"/>
+
+ <!-- use sources defined in BOM as this will rebuild that PDK -->
+ <property name="sf.spec.sourcesync.sourcespecdir" value="${sf.spec.job.drive}\build_info\logs\BOM"/>
+ <property name="sf.spec.systemdefinition.location" value="${sf.spec.job.drive}\build_info\logs\BOM"/>
+</project>
--- a/symbian3/single/sources.csv Wed May 05 12:21:47 2010 +0100
+++ b/symbian3/single/sources.csv Tue Jul 13 12:21:44 2010 +0100
@@ -1,122 +1,113 @@
source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/MCL/sftools/fbf/utilities/,/utilities,branch,default,
-//v800008/Builds01/mercurial_internal/rnd/rndonly/aricent/,/rnd/rndonly/aricent,branch,default,
-//v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,
-//v800008/Builds01/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,branch,default,
-//v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,branch,default,
-//v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,branch,default,
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/camera/,/sf/app/camera,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/commonemail/,/sf/app/commonemail,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/conntools/,/sf/app/conntools,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/contacts/,/sf/app/contacts,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/contentcontrol/,/sf/app/contentcontrol,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/conversations/,/sf/app/conversations,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/devicecontrol/,/sf/app/devicecontrol,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/dictionary/,/sf/app/dictionary,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/files/,/sf/app/files,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/gallery/,/sf/app/gallery,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/graphicsuis/,/sf/app/graphicsuis,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/helps/,/sf/app/helps,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/homescreen/,/sf/app/homescreen,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/im/,/sf/app/im,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/imgeditor/,/sf/app/imgeditor,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/imgvieweruis/,/sf/app/imgvieweruis,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/iptelephony/,/sf/app/iptelephony,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/java/,/sf/app/java,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/location/,/sf/app/location,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/messaging/,/sf/app/messaging,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/mmsharinguis/,/sf/app/mmsharinguis,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/musicplayer/,/sf/app/musicplayer,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/organizer/,/sf/app/organizer,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/phone/,/sf/app/phone,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/photos/,/sf/app/photos,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/poc/,/sf/app/poc,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/printing/,/sf/app/printing,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/profile/,/sf/app/profile,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/radio/,/sf/app/radio,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/screensaver/,/sf/app/screensaver,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/settingsuis/,/sf/app/settingsuis,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/speechsrv/,/sf/app/speechsrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/techview/,/sf/app/techview,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/utils/,/sf/app/utils,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/videocenter/,/sf/app/videocenter,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/videoeditor/,/sf/app/videoeditor,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/videoplayer/,/sf/app/videoplayer,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/videotelephony/,/sf/app/videotelephony,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/voicerec/,/sf/app/voicerec,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/webuis/,/sf/app/webuis,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/accesssec/,/sf/mw/accesssec,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/appinstall/,/sf/mw/appinstall,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/appsupport/,/sf/mw/appsupport,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/btservices/,/sf/mw/btservices,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/camerasrv/,/sf/mw/camerasrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/classicui/,/sf/mw/classicui,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/dlnasrv/,/sf/mw/dlnasrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/drm/,/sf/mw/drm,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/gsprofilesrv,/sf/mw/gsprofilesrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/hapticsservices/,/sf/mw/hapticsservices,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/helix/,/sf/mw/helix,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/homescreensrv/,/sf/mw/homescreensrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/imghandling/,/sf/mw/imghandling,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/imsrv/,/sf/mw/imsrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/inputmethods/,/sf/mw/inputmethods,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/ipappprotocols/,/sf/mw/ipappprotocols,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/ipappsrv/,/sf/mw/ipappsrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/ipconnmgmt/,/sf/mw/ipconnmgmt,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/legacypresence/,/sf/mw/legacypresence,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/locationsrv/,/sf/mw/locationsrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/mds/,/sf/mw/mds,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/messagingmw/,/sf/mw/messagingmw,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/metadatasrv/,/sf/mw/metadatasrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/mmappfw/,/sf/mw/mmappfw,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/mmmw/,/sf/mw/mmmw,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/mmuifw/,/sf/mw/mmuifw,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/netprotocols/,/sf/mw/netprotocols,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/networkingdm/,/sf/mw/networkingdm,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/opensrv/,/sf/mw/opensrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/phonesrv/,/sf/mw/phonesrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/remoteconn/,/sf/mw/remoteconn,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/remotemgmt/,/sf/mw/remotemgmt,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/remotestorage/,/sf/mw/remotestorage,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/securitysrv/,/sf/mw/securitysrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/serviceapi/,/sf/mw/serviceapi,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/serviceapifw/,/sf/mw/serviceapifw,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/shortlinkconn/,/sf/mw/shortlinkconn,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/srvdiscovery/,/sf/mw/srvdiscovery,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/svgt/,/sf/mw/svgt,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/uiaccelerator/,/sf/mw/uiaccelerator,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/uiresources/,/sf/mw/uiresources,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/uitools/,/sf/mw/uitools,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/videoutils/,/sf/mw/videoutils,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/vpnclient/,/sf/mw/vpnclient,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/web/,/sf/mw/web,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/websrv/,/sf/mw/websrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/wirelessacc/,/sf/mw/wirelessacc,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/boardsupport/,/sf/os/boardsupport,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/os/bt/,/sf/os/bt,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/buildtools/,/sf/os/buildtools,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/cellularsrv/,/sf/os/cellularsrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/commsfw/,/sf/os/commsfw,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/devicesrv/,/sf/os/devicesrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/graphics/,/sf/os/graphics,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/imagingext/,/sf/os/imagingext,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/lbs/,/sf/os/lbs,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/mm/,/sf/os/mm,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/networkingsrv/,/sf/os/networkingsrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/ossrv/,/sf/os/ossrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/persistentdata/,/sf/os/persistentdata,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/os/security/,/sf/os/security,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/textandloc/,/sf/os/textandloc,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/unref/,/sf/os/unref,branch,default,
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/usb/,/sf/os/usb,branch,default,
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/wlan/,/sf/os/wlan,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/osrndtools/,/sf/os/osrndtools,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,branch,default,
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/tools/homescreentools/,/sf/tools/homescreentools,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/platformtools/,/sf/mw/platformtools,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/rndtools/,/sf/app/rndtools,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/tools/swconfigtools/,/sf/tools/swconfigtools,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/camera/,/sf/app/camera,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/commonemail/,/sf/app/commonemail,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/conntools/,/sf/app/conntools,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/contacts/,/sf/app/contacts,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/contentcontrol/,/sf/app/contentcontrol,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/conversations/,/sf/app/conversations,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/devicecontrol/,/sf/app/devicecontrol,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/dictionary/,/sf/app/dictionary,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/files/,/sf/app/files,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/graphicsuis/,/sf/app/graphicsuis,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/helps/,/sf/app/helps,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/homescreen/,/sf/app/homescreen,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/homescreentools/,/sf/app/homescreentools,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/im/,/sf/app/im,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/imgeditor/,/sf/app/imgeditor,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/iptelephony/,/sf/app/iptelephony,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/jrt/,/sf/app/jrt,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/location/,/sf/app/location,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/messaging/,/sf/app/messaging,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/mmsharinguis/,/sf/app/mmsharinguis,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/musicplayer/,/sf/app/musicplayer,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/organizer/,/sf/app/organizer,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/phone/,/sf/app/phone,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/photos/,/sf/app/photos,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/podcatcher/,/sf/app/podcatcher,branch,default,package_definition.xml
+http://developer.symbian.org/oss/FCL/sf/app/printing/,/sf/app/printing,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/profile/,/sf/app/profile,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/radio/,/sf/app/radio,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/rndtools/,/sf/app/rndtools,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/screensaver/,/sf/app/screensaver,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/settingsuis/,/sf/app/settingsuis,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/speechsrv/,/sf/app/speechsrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/techview/,/sf/app/techview,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/utils/,/sf/app/utils,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/videoeditor/,/sf/app/videoeditor,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/videoplayer/,/sf/app/videoplayer,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/videotelephony/,/sf/app/videotelephony,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/voicerec/,/sf/app/voicerec,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/webuis/,/sf/app/webuis,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/accesssec/,/sf/mw/accesssec,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/appinstall/,/sf/mw/appinstall,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/appsupport/,/sf/mw/appsupport,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/btservices/,/sf/mw/btservices,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/camerasrv/,/sf/mw/camerasrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/classicui/,/sf/mw/classicui,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/dlnasrv/,/sf/mw/dlnasrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/drm/,/sf/mw/drm,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/gsprofilesrv/,/sf/mw/gsprofilesrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/hapticsservices/,/sf/mw/hapticsservices,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/helix/,/sf/mw/helix,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/homescreensrv/,/sf/mw/homescreensrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/imghandling/,/sf/mw/imghandling,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/imsrv/,/sf/mw/imsrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/inputmethods/,/sf/mw/inputmethods,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/ipappprotocols/,/sf/mw/ipappprotocols,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/ipappsrv/,/sf/mw/ipappsrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/ipconnmgmt/,/sf/mw/ipconnmgmt,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/legacypresence/,/sf/mw/legacypresence,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/locationsrv/,/sf/mw/locationsrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/mds/,/sf/mw/mds,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/messagingmw/,/sf/mw/messagingmw,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/metadatasrv/,/sf/mw/metadatasrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/mmappfw/,/sf/mw/mmappfw,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/mmmw/,/sf/mw/mmmw,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/mmuifw/,/sf/mw/mmuifw,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/netprotocols/,/sf/mw/netprotocols,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/phonesrv/,/sf/mw/phonesrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/platformtools/,/sf/mw/platformtools,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/qt/,/sf/mw/qt,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/remoteconn/,/sf/mw/remoteconn,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/remotemgmt/,/sf/mw/remotemgmt,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/remotestorage/,/sf/mw/remotestorage,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/securitysrv/,/sf/mw/securitysrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/serviceapi/,/sf/mw/serviceapi,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/serviceapifw/,/sf/mw/serviceapifw,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/shortlinkconn/,/sf/mw/shortlinkconn,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/srvdiscovery/,/sf/mw/srvdiscovery,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/svgt/,/sf/mw/svgt,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/uiaccelerator/,/sf/mw/uiaccelerator,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/uiresources/,/sf/mw/uiresources,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/uitools/,/sf/mw/uitools,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/usbservices/,/sf/mw/usbservices,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/videoutils/,/sf/mw/videoutils,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/vpnclient/,/sf/mw/vpnclient,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/web/,/sf/mw/web,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/websrv/,/sf/mw/websrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/wirelessacc/,/sf/mw/wirelessacc,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/boardsupport/,/sf/os/boardsupport,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/bt/,/sf/os/bt,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/buildtools/,/sf/os/buildtools,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/cellularsrv/,/sf/os/cellularsrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/commsfw/,/sf/os/commsfw,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/devicesrv/,/sf/os/devicesrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/graphics/,/sf/os/graphics,branch,NewGraphicsArchitecture,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/imagingext/,/sf/os/imagingext,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/lbs/,/sf/os/lbs,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/mm/,/sf/os/mm,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/networkingsrv/,/sf/os/networkingsrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/ossrv/,/sf/os/ossrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/persistentdata/,/sf/os/persistentdata,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/security/,/sf/os/security,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/textandloc/,/sf/os/textandloc,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/usb/,/sf/os/usb,branch,RCL_3,
+http://developer.symbian.org/oss/MCL/sf/os/wlan/,/sf/os/wlan,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/osrndtools/,/sf/os/osrndtools,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,branch,RCL_3,layers.sysdef.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/single/sources_3.0.0.csv Tue Jul 13 12:21:44 2010 +0100
@@ -0,0 +1,114 @@
+source,dst,type,pattern,sysdef
+http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,changeset,2905910218db,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,changeset,0f0bbe5dfe4b,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,changeset,ac0dcfe5059d,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/camera/,/sf/app/camera,changeset,53c8aa5d97a3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/commonemail/,/sf/app/commonemail,changeset,67369d1b217f,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/conntools/,/sf/app/conntools,changeset,a49137138563,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/contacts/,/sf/app/contacts,changeset,35018d46c3dc,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/contentcontrol/,/sf/app/contentcontrol,changeset,8423bb7ba1d2,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/conversations/,/sf/app/conversations,changeset,76f25fb7a6a1,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/devicecontrol/,/sf/app/devicecontrol,changeset,7f4d10e92162,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/dictionary/,/sf/app/dictionary,changeset,38691ba2fda5,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/files/,/sf/app/files,changeset,efe289f793e7,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/graphicsuis/,/sf/app/graphicsuis,changeset,1882882c7f9c,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/helps/,/sf/app/helps,changeset,326673dff2bf,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/homescreen/,/sf/app/homescreen,changeset,a1e3af341cc7,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/homescreentools/,/sf/app/homescreentools,changeset,cbece5a7b057,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/im/,/sf/app/im,changeset,c303fa51f66d,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/imgeditor/,/sf/app/imgeditor,changeset,a5c0fe6456b2,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/iptelephony/,/sf/app/iptelephony,changeset,43658d24f35d,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/jrt/,/sf/app/jrt,changeset,5337859c5963,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/location/,/sf/app/location,changeset,64522df74558,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/messaging/,/sf/app/messaging,changeset,7e4e4bcc75b6,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/mmsharinguis/,/sf/app/mmsharinguis,changeset,95754dcd27ad,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/musicplayer/,/sf/app/musicplayer,changeset,56b11cf8addb,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/organizer/,/sf/app/organizer,changeset,51372538e3d3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/phone/,/sf/app/phone,changeset,4853f386dec0,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/photos/,/sf/app/photos,changeset,78ad99c24f08,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/podcatcher/,/sf/app/podcatcher,changeset,ee650bbb958e,package_definition.xml
+http://developer.symbian.org/oss/FCL/sf/app/printing/,/sf/app/printing,changeset,160f5df4c0e6,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/profile/,/sf/app/profile,changeset,232e127a1fe4,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/radio/,/sf/app/radio,changeset,9f3ff466f56b,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/rndtools/,/sf/app/rndtools,changeset,aefcba28a3e0,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/screensaver/,/sf/app/screensaver,changeset,2e08ef6b6eda,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/settingsuis/,/sf/app/settingsuis,changeset,f42d5229d8ed,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/speechsrv/,/sf/app/speechsrv,changeset,994c46bea969,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/techview/,/sf/app/techview,changeset,6beaa9cf4752,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/utils/,/sf/app/utils,changeset,82ca176301de,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/videoeditor/,/sf/app/videoeditor,changeset,951a5db380a0,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/videoplayer/,/sf/app/videoplayer,changeset,8f0df5c82986,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/videotelephony/,/sf/app/videotelephony,changeset,9ec13d39cc2e,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/voicerec/,/sf/app/voicerec,changeset,f962425b9f8b,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/webuis/,/sf/app/webuis,changeset,3154c14a33db,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/accesssec/,/sf/mw/accesssec,changeset,3634639e6dc7,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/appinstall/,/sf/mw/appinstall,changeset,f9033e605ee2,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/appsupport/,/sf/mw/appsupport,changeset,98afcc9489c0,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/btservices/,/sf/mw/btservices,changeset,53b7818cd282,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/camerasrv/,/sf/mw/camerasrv,changeset,0e2bdb6a0855,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/classicui/,/sf/mw/classicui,changeset,d304fad47bf4,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/dlnasrv/,/sf/mw/dlnasrv,changeset,bfb2712e420e,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/drm/,/sf/mw/drm,changeset,bd9b181e836a,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/gsprofilesrv/,/sf/mw/gsprofilesrv,changeset,3b47783fdf16,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/hapticsservices/,/sf/mw/hapticsservices,changeset,be046265c55d,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/helix/,/sf/mw/helix,changeset,c0474fab502e,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/homescreensrv/,/sf/mw/homescreensrv,changeset,8a75bf74485c,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/imghandling/,/sf/mw/imghandling,changeset,ad31f4183ddc,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/imsrv/,/sf/mw/imsrv,changeset,7797b2f86d2b,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/inputmethods/,/sf/mw/inputmethods,changeset,ca8eb568b410,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/ipappprotocols/,/sf/mw/ipappprotocols,changeset,a7d1e54a7332,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/ipappsrv/,/sf/mw/ipappsrv,changeset,91f50911ea81,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/ipconnmgmt/,/sf/mw/ipconnmgmt,changeset,0a9e01492035,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/legacypresence/,/sf/mw/legacypresence,changeset,10246e066a50,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/locationsrv/,/sf/mw/locationsrv,changeset,9c303455e256,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/mds/,/sf/mw/mds,changeset,4a4892eec172,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/messagingmw/,/sf/mw/messagingmw,changeset,c540a10963a1,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/metadatasrv/,/sf/mw/metadatasrv,changeset,533a463dabdc,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/mmappfw/,/sf/mw/mmappfw,changeset,1e2709dc536f,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/mmmw/,/sf/mw/mmmw,changeset,2eb3b066cc7d,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/mmuifw/,/sf/mw/mmuifw,changeset,125793e17004,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/netprotocols/,/sf/mw/netprotocols,changeset,f21293830889,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/networkingdm/,/sf/mw/networkingdm,changeset,ad089248fd2f,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/phonesrv/,/sf/mw/phonesrv,changeset,71268bfa7aea,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/platformtools/,/sf/mw/platformtools,changeset,2b9101578f5e,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/qt/,/sf/mw/qt,changeset,4b6ee5efea19,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/remoteconn/,/sf/mw/remoteconn,changeset,523717cdb0ad,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/remotemgmt/,/sf/mw/remotemgmt,changeset,4c1d1f271d77,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/remotestorage/,/sf/mw/remotestorage,changeset,6ce8d7d90cf8,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/securitysrv/,/sf/mw/securitysrv,changeset,33ad376816a8,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/serviceapi/,/sf/mw/serviceapi,changeset,1aa6688bfd6b,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/serviceapifw/,/sf/mw/serviceapifw,changeset,02db64fb1712,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/shortlinkconn/,/sf/mw/shortlinkconn,changeset,2553637c2525,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/srvdiscovery/,/sf/mw/srvdiscovery,changeset,8116cc943311,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/svgt/,/sf/mw/svgt,changeset,9be6eed35a80,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/uiaccelerator/,/sf/mw/uiaccelerator,changeset,f93c875b566e,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/uiresources/,/sf/mw/uiresources,changeset,85ecebeab216,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/uitools/,/sf/mw/uitools,changeset,3c40afc7ecad,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/usbservices/,/sf/mw/usbservices,changeset,d895b6d953c9,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/videoutils/,/sf/mw/videoutils,changeset,913622afaa4b,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/vpnclient/,/sf/mw/vpnclient,changeset,d1a0d37b52a1,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/web/,/sf/mw/web,changeset,4bd5176e1bc8,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/websrv/,/sf/mw/websrv,changeset,32ab7ae9ec94,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/wirelessacc/,/sf/mw/wirelessacc,changeset,024ee8b21fe2,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/boardsupport/,/sf/os/boardsupport,changeset,582f97e694c5,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/bt/,/sf/os/bt,changeset,32ba20339036,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/buildtools/,/sf/os/buildtools,changeset,06f00a153f2a,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/cellularsrv/,/sf/os/cellularsrv,changeset,664a5fed40c6,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/commsfw/,/sf/os/commsfw,changeset,9644881fedd0,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,changeset,ce220d94201c,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/devicesrv/,/sf/os/devicesrv,changeset,5ced40f3c181,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/graphics/,/sf/os/graphics,changeset,97c593d3e0a5,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/imagingext/,/sf/os/imagingext,changeset,e5ca06a707ac,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,changeset,99e0f09d12c3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/lbs/,/sf/os/lbs,changeset,24bd7242888d,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/mm/,/sf/os/mm,changeset,67584cc761d1,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/networkingsrv/,/sf/os/networkingsrv,changeset,f44b73583a2f,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/ossrv/,/sf/os/ossrv,changeset,ddd39d92c350,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/persistentdata/,/sf/os/persistentdata,changeset,fcc16690f446,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/security/,/sf/os/security,changeset,564220cc963b,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/textandloc/,/sf/os/textandloc,changeset,c83f1006fff0,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/usb/,/sf/os/usb,changeset,d2197ff6de2b,
+http://developer.symbian.org/oss/MCL/sf/os/wlan/,/sf/os/wlan,changeset,af3fb27c7511,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,changeset,6b9cbc8ad81c,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/osrndtools/,/sf/os/osrndtools,changeset,da2cedce4920,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,changeset,e541da0d3b0d,layers.sysdef.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/single/sources_3.0.1_candidate.csv Tue Jul 13 12:21:44 2010 +0100
@@ -0,0 +1,113 @@
+source,dst,type,pattern,sysdef
+http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,changeset,2905910218db,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,changeset,0f0bbe5dfe4b,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,changeset,ac0dcfe5059d,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/camera/,/sf/app/camera,changeset,53c8aa5d97a3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/commonemail/,/sf/app/commonemail,changeset,67369d1b217f,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/conntools/,/sf/app/conntools,changeset,a49137138563,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/contacts/,/sf/app/contacts,changeset,35018d46c3dc,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/contentcontrol/,/sf/app/contentcontrol,changeset,8423bb7ba1d2,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/conversations/,/sf/app/conversations,changeset,76f25fb7a6a1,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/devicecontrol/,/sf/app/devicecontrol,changeset,7f4d10e92162,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/dictionary/,/sf/app/dictionary,changeset,38691ba2fda5,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/files/,/sf/app/files,changeset,efe289f793e7,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/graphicsuis/,/sf/app/graphicsuis,changeset,1882882c7f9c,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/helps/,/sf/app/helps,changeset,326673dff2bf,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/homescreen/,/sf/app/homescreen,changeset,a1e3af341cc7,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/homescreentools/,/sf/app/homescreentools,changeset,cbece5a7b057,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/im/,/sf/app/im,changeset,c303fa51f66d,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/imgeditor/,/sf/app/imgeditor,changeset,a5c0fe6456b2,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/iptelephony/,/sf/app/iptelephony,changeset,43658d24f35d,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/jrt/,/sf/app/jrt,changeset,5337859c5963,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/location/,/sf/app/location,changeset,64522df74558,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/messaging/,/sf/app/messaging,changeset,7e4e4bcc75b6,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/mmsharinguis/,/sf/app/mmsharinguis,changeset,95754dcd27ad,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/musicplayer/,/sf/app/musicplayer,changeset,56b11cf8addb,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/organizer/,/sf/app/organizer,changeset,51372538e3d3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/phone/,/sf/app/phone,changeset,4853f386dec0,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/photos/,/sf/app/photos,changeset,78ad99c24f08,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/podcatcher/,/sf/app/podcatcher,changeset,ee650bbb958e,package_definition.xml
+http://developer.symbian.org/oss/FCL/sf/app/printing/,/sf/app/printing,changeset,160f5df4c0e6,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/profile/,/sf/app/profile,changeset,232e127a1fe4,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/radio/,/sf/app/radio,changeset,9f3ff466f56b,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/rndtools/,/sf/app/rndtools,changeset,aefcba28a3e0,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/screensaver/,/sf/app/screensaver,changeset,2e08ef6b6eda,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/settingsuis/,/sf/app/settingsuis,changeset,f42d5229d8ed,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/speechsrv/,/sf/app/speechsrv,changeset,994c46bea969,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/techview/,/sf/app/techview,changeset,6beaa9cf4752,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/utils/,/sf/app/utils,changeset,82ca176301de,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/videoeditor/,/sf/app/videoeditor,changeset,951a5db380a0,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/videoplayer/,/sf/app/videoplayer,changeset,8f0df5c82986,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/videotelephony/,/sf/app/videotelephony,changeset,9ec13d39cc2e,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/voicerec/,/sf/app/voicerec,changeset,f962425b9f8b,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/webuis/,/sf/app/webuis,changeset,3154c14a33db,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/accesssec/,/sf/mw/accesssec,changeset,3634639e6dc7,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/appinstall/,/sf/mw/appinstall,changeset,f9033e605ee2,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/appsupport/,/sf/mw/appsupport,changeset,98afcc9489c0,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/btservices/,/sf/mw/btservices,changeset,53b7818cd282,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/camerasrv/,/sf/mw/camerasrv,changeset,0e2bdb6a0855,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/classicui/,/sf/mw/classicui,changeset,d304fad47bf4,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/dlnasrv/,/sf/mw/dlnasrv,changeset,bfb2712e420e,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/drm/,/sf/mw/drm,changeset,bd9b181e836a,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/gsprofilesrv/,/sf/mw/gsprofilesrv,changeset,3b47783fdf16,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/hapticsservices/,/sf/mw/hapticsservices,changeset,be046265c55d,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/helix/,/sf/mw/helix,changeset,c0474fab502e,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/homescreensrv/,/sf/mw/homescreensrv,changeset,8a75bf74485c,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/imghandling/,/sf/mw/imghandling,changeset,ad31f4183ddc,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/imsrv/,/sf/mw/imsrv,changeset,7797b2f86d2b,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/inputmethods/,/sf/mw/inputmethods,changeset,ca8eb568b410,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/ipappprotocols/,/sf/mw/ipappprotocols,changeset,a7d1e54a7332,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/ipappsrv/,/sf/mw/ipappsrv,changeset,91f50911ea81,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/ipconnmgmt/,/sf/mw/ipconnmgmt,changeset,0a9e01492035,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/legacypresence/,/sf/mw/legacypresence,changeset,10246e066a50,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/locationsrv/,/sf/mw/locationsrv,changeset,9c303455e256,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/mds/,/sf/mw/mds,changeset,4a4892eec172,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/messagingmw/,/sf/mw/messagingmw,changeset,c540a10963a1,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/metadatasrv/,/sf/mw/metadatasrv,changeset,533a463dabdc,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/mmappfw/,/sf/mw/mmappfw,changeset,1e2709dc536f,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/mmmw/,/sf/mw/mmmw,changeset,2eb3b066cc7d,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/mmuifw/,/sf/mw/mmuifw,changeset,125793e17004,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/netprotocols/,/sf/mw/netprotocols,changeset,f21293830889,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/phonesrv/,/sf/mw/phonesrv,changeset,71268bfa7aea,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/platformtools/,/sf/mw/platformtools,changeset,2b9101578f5e,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/qt/,/sf/mw/qt,changeset,4b6ee5efea19,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/remoteconn/,/sf/mw/remoteconn,changeset,523717cdb0ad,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/remotemgmt/,/sf/mw/remotemgmt,changeset,4c1d1f271d77,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/remotestorage/,/sf/mw/remotestorage,changeset,6ce8d7d90cf8,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/securitysrv/,/sf/mw/securitysrv,changeset,33ad376816a8,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/serviceapi/,/sf/mw/serviceapi,changeset,1aa6688bfd6b,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/serviceapifw/,/sf/mw/serviceapifw,changeset,02db64fb1712,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/shortlinkconn/,/sf/mw/shortlinkconn,changeset,2553637c2525,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/srvdiscovery/,/sf/mw/srvdiscovery,changeset,8116cc943311,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/svgt/,/sf/mw/svgt,changeset,9be6eed35a80,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/uiaccelerator/,/sf/mw/uiaccelerator,changeset,f93c875b566e,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/uiresources/,/sf/mw/uiresources,changeset,85ecebeab216,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/uitools/,/sf/mw/uitools,changeset,3c40afc7ecad,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/usbservices/,/sf/mw/usbservices,changeset,d895b6d953c9,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/videoutils/,/sf/mw/videoutils,changeset,913622afaa4b,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/vpnclient/,/sf/mw/vpnclient,changeset,d1a0d37b52a1,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/web/,/sf/mw/web,changeset,4bd5176e1bc8,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/websrv/,/sf/mw/websrv,changeset,32ab7ae9ec94,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/wirelessacc/,/sf/mw/wirelessacc,changeset,024ee8b21fe2,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/boardsupport/,/sf/os/boardsupport,changeset,582f97e694c5,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/bt/,/sf/os/bt,changeset,32ba20339036,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/buildtools/,/sf/os/buildtools,changeset,06f00a153f2a,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/cellularsrv/,/sf/os/cellularsrv,changeset,664a5fed40c6,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/commsfw/,/sf/os/commsfw,changeset,9644881fedd0,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,changeset,bb2936fa39e6,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/devicesrv/,/sf/os/devicesrv,changeset,5ced40f3c181,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/graphics/,/sf/os/graphics,changeset,97c593d3e0a5,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/imagingext/,/sf/os/imagingext,changeset,e5ca06a707ac,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,changeset,99e0f09d12c3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/lbs/,/sf/os/lbs,changeset,24bd7242888d,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/mm/,/sf/os/mm,changeset,67584cc761d1,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/networkingsrv/,/sf/os/networkingsrv,changeset,f44b73583a2f,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/ossrv/,/sf/os/ossrv,changeset,ddd39d92c350,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/persistentdata/,/sf/os/persistentdata,changeset,fcc16690f446,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/security/,/sf/os/security,changeset,564220cc963b,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/textandloc/,/sf/os/textandloc,changeset,c83f1006fff0,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/usb/,/sf/os/usb,changeset,d2197ff6de2b,
+http://developer.symbian.org/oss/MCL/sf/os/wlan/,/sf/os/wlan,changeset,af3fb27c7511,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,changeset,6b9cbc8ad81c,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/osrndtools/,/sf/os/osrndtools,changeset,da2cedce4920,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,changeset,e541da0d3b0d,layers.sysdef.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/single/sources_3.0.i.csv Tue Jul 13 12:21:44 2010 +0100
@@ -0,0 +1,120 @@
+source,dst,type,pattern,sysdef
+//v800008/Builds01/mercurial_internal/rnd/rndonly/aricent/,/rnd/rndonly/aricent,changeset,2b41c6133edf,
+//v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,changeset,a94919327585,
+//v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,changeset,afb66031ac23,
+//v800008/Builds01/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,changeset,bc65ca6d8d9c,
+//v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,changeset,3308607f8c27,
+http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,changeset,2905910218db,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,changeset,d00bf4f57250,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,changeset,205ca2b22b4d,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/camera/,/sf/app/camera,changeset,38fb6f7eacd5,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/commonemail/,/sf/app/commonemail,changeset,b13141f05c3d,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/conntools/,/sf/app/conntools,changeset,a49137138563,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/contacts/,/sf/app/contacts,changeset,0d28c1c5b6dd,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/contentcontrol/,/sf/app/contentcontrol,changeset,2bbcc0756c6d,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/conversations/,/sf/app/conversations,changeset,d20aea8a18b6,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/devicecontrol/,/sf/app/devicecontrol,changeset,f6aa907032f4,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/dictionary/,/sf/app/dictionary,changeset,abd5d081eb2d,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/files/,/sf/app/files,changeset,649c558486f0,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/graphicsuis/,/sf/app/graphicsuis,changeset,2ad882606620,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/helps/,/sf/app/helps,changeset,67c4a6333a59,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/homescreen/,/sf/app/homescreen,changeset,45cc9ca502a9,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/homescreentools/,/sf/app/homescreentools,changeset,3432bb0230e0,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/im/,/sf/app/im,changeset,c303fa51f66d,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/imgeditor/,/sf/app/imgeditor,changeset,edfc90759b9f,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/iptelephony/,/sf/app/iptelephony,changeset,876a3df1f464,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/jrt/,/sf/app/jrt,changeset,f9bb0fca356a,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/location/,/sf/app/location,changeset,4721bd00d3da,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/messaging/,/sf/app/messaging,changeset,e00582ce7ecd,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/mmsharinguis/,/sf/app/mmsharinguis,changeset,71306c87785a,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/musicplayer/,/sf/app/musicplayer,changeset,a1247965635c,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/organizer/,/sf/app/organizer,changeset,a228fa1a8021,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/phone/,/sf/app/phone,changeset,a2e87f73f7d7,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/photos/,/sf/app/photos,changeset,191387a8b767,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/podcatcher/,/sf/app/podcatcher,changeset,70749e2f572d,package_definition.xml
+http://developer.symbian.org/oss/FCL/sf/app/printing/,/sf/app/printing,changeset,864dc4cc51e1,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/profile/,/sf/app/profile,changeset,2854d7196aaf,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/radio/,/sf/app/radio,changeset,0004e923f486,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/rndtools/,/sf/app/rndtools,changeset,404ad6c9bc20,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/screensaver/,/sf/app/screensaver,changeset,0bfd55b8504e,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/settingsuis/,/sf/app/settingsuis,changeset,f42d5229d8ed,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/speechsrv/,/sf/app/speechsrv,changeset,fc313e1df071,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/techview/,/sf/app/techview,changeset,6beaa9cf4752,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/utils/,/sf/app/utils,changeset,ddecbce3dc1f,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/videoeditor/,/sf/app/videoeditor,changeset,951a5db380a0,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/videoplayer/,/sf/app/videoplayer,changeset,7f2b2a65da29,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/videotelephony/,/sf/app/videotelephony,changeset,856ae1b15d98,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/voicerec/,/sf/app/voicerec,changeset,a2fdc35b8f46,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/webuis/,/sf/app/webuis,changeset,25214794fad6,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/accesssec/,/sf/mw/accesssec,changeset,618faafb1980,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/appinstall/,/sf/mw/appinstall,changeset,98a43fae6e2b,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/appsupport/,/sf/mw/appsupport,changeset,7d5dd0262126,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/btservices/,/sf/mw/btservices,changeset,b23265fb36da,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/camerasrv/,/sf/mw/camerasrv,changeset,130a995b5096,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/classicui/,/sf/mw/classicui,changeset,aa94898fb0b4,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/dlnasrv/,/sf/mw/dlnasrv,changeset,bfb2712e420e,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/drm/,/sf/mw/drm,changeset,34a204558a6a,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/gsprofilesrv/,/sf/mw/gsprofilesrv,changeset,9941bcf99348,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/hapticsservices/,/sf/mw/hapticsservices,changeset,897fc24e7865,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/helix/,/sf/mw/helix,changeset,c0474fab502e,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/homescreensrv/,/sf/mw/homescreensrv,changeset,d2836ea7c20d,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/imghandling/,/sf/mw/imghandling,changeset,85a88bc05e45,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/imsrv/,/sf/mw/imsrv,changeset,7797b2f86d2b,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/inputmethods/,/sf/mw/inputmethods,changeset,e6a39382bb9c,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/ipappprotocols/,/sf/mw/ipappprotocols,changeset,43c4dec3cb1f,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/ipappsrv/,/sf/mw/ipappsrv,changeset,5bf83dc720b3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/ipconnmgmt/,/sf/mw/ipconnmgmt,changeset,22c3c67e5001,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/legacypresence/,/sf/mw/legacypresence,changeset,de84881f4ac3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/locationsrv/,/sf/mw/locationsrv,changeset,d6e4203b7ebe,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/mds/,/sf/mw/mds,changeset,ab88d4a85041,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/messagingmw/,/sf/mw/messagingmw,changeset,8147bfb6c710,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/metadatasrv/,/sf/mw/metadatasrv,changeset,533a463dabdc,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/mmappfw/,/sf/mw/mmappfw,changeset,3f3e6714b28a,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/mmmw/,/sf/mw/mmmw,changeset,f5c5c82a163e,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/mmuifw/,/sf/mw/mmuifw,changeset,1ff7a906e138,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/netprotocols/,/sf/mw/netprotocols,changeset,9015645363c8,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/networkingdm/,/sf/mw/networkingdm,changeset,ad089248fd2f,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/opensrv/,/sf/mw/opensrv,changeset,3404599e4dda,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/phonesrv/,/sf/mw/phonesrv,changeset,71e7b994dff4,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/platformtools/,/sf/mw/platformtools,changeset,dc99d5dd2e71,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/qt/,/sf/mw/qt,changeset,4b6ee5efea19,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/remoteconn/,/sf/mw/remoteconn,changeset,ef55b168cedb,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/remotemgmt/,/sf/mw/remotemgmt,changeset,d73e879fec17,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/remotestorage/,/sf/mw/remotestorage,changeset,fe0554130c0f,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/securitysrv/,/sf/mw/securitysrv,changeset,9971b621ef6c,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/serviceapi/,/sf/mw/serviceapi,changeset,c210248fa89d,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/serviceapifw/,/sf/mw/serviceapifw,changeset,8fe836ab12d4,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/shortlinkconn/,/sf/mw/shortlinkconn,changeset,c47ebe2ac36c,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/srvdiscovery/,/sf/mw/srvdiscovery,changeset,8116cc943311,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/svgt/,/sf/mw/svgt,changeset,b52e29b42806,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/uiaccelerator/,/sf/mw/uiaccelerator,changeset,2adb763cd424,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/uiresources/,/sf/mw/uiresources,changeset,d3ab1e9a27d1,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/uitools/,/sf/mw/uitools,changeset,99468bbbf3dc,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/usbservices/,/sf/mw/usbservices,changeset,f6533aee8b2b,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/videoutils/,/sf/mw/videoutils,changeset,198b91596e2e,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/vpnclient/,/sf/mw/vpnclient,changeset,5db1ac3b4374,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/web/,/sf/mw/web,changeset,4917f9bf7995,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/websrv/,/sf/mw/websrv,changeset,48e9d43c1d7f,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/wirelessacc/,/sf/mw/wirelessacc,changeset,d9aaeb96a256,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/boardsupport/,/sf/os/boardsupport,changeset,582f97e694c5,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/bt/,/sf/os/bt,changeset,f8503e232b0c,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/buildtools/,/sf/os/buildtools,changeset,8c93132f4c49,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/cellularsrv/,/sf/os/cellularsrv,changeset,35fa72f4c306,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/commsfw/,/sf/os/commsfw,changeset,51722b10598b,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,changeset,2d2fd482dda9,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/devicesrv/,/sf/os/devicesrv,changeset,d80caf2a6605,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/graphics/,/sf/os/graphics,changeset,2df4c99bf614,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/imagingext/,/sf/os/imagingext,changeset,e5ca06a707ac,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,changeset,2a153f39070a,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/lbs/,/sf/os/lbs,changeset,9de97e691aa6,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/mm/,/sf/os/mm,changeset,cd271b19d824,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/networkingsrv/,/sf/os/networkingsrv,changeset,75c06c88bfa3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/ossrv/,/sf/os/ossrv,changeset,ae47160fdc54,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/persistentdata/,/sf/os/persistentdata,changeset,6b6fd149daa2,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/security/,/sf/os/security,changeset,43830850e1b2,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/textandloc/,/sf/os/textandloc,changeset,7ea2c3c49480,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/usb/,/sf/os/usb,changeset,573550b50543,
+http://developer.symbian.org/oss/MCL/sf/os/wlan/,/sf/os/wlan,changeset,191c8407e577,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,changeset,d10d750052f0,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/osrndtools/,/sf/os/osrndtools,changeset,381827f66490,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,changeset,e541da0d3b0d,layers.sysdef.xml
--- a/symbian3/single/sources_3.0.i_candidate.csv Wed May 05 12:21:47 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,119 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_internal/rnd/rndonly/aricent/,/rnd/rndonly/aricent,branch,default,
-//v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,
-//v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,branch,default,
-//v800008/Builds01/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,branch,default,
-//v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,branch,default,
-http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/camera/,/sf/app/camera,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/commonemail/,/sf/app/commonemail,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/app/conntools/,/sf/app/conntools,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/contacts/,/sf/app/contacts,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/contentcontrol/,/sf/app/contentcontrol,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/conversations/,/sf/app/conversations,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/devicecontrol/,/sf/app/devicecontrol,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/dictionary/,/sf/app/dictionary,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/files/,/sf/app/files,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/graphicsuis/,/sf/app/graphicsuis,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/helps/,/sf/app/helps,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/homescreen/,/sf/app/homescreen,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/homescreentools/,/sf/app/homescreentools,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/im/,/sf/app/im,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/imgeditor/,/sf/app/imgeditor,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/iptelephony/,/sf/app/iptelephony,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/jrt/,/sf/app/jrt,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/location/,/sf/app/location,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/messaging/,/sf/app/messaging,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/mmsharinguis/,/sf/app/mmsharinguis,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/musicplayer/,/sf/app/musicplayer,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/app/organizer/,/sf/app/organizer,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/app/phone/,/sf/app/phone,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/photos/,/sf/app/photos,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/app/printing/,/sf/app/printing,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/profile/,/sf/app/profile,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/radio/,/sf/app/radio,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/rndtools/,/sf/app/rndtools,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/screensaver/,/sf/app/screensaver,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/settingsuis/,/sf/app/settingsuis,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/speechsrv/,/sf/app/speechsrv,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/techview/,/sf/app/techview,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/utils/,/sf/app/utils,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/videoeditor/,/sf/app/videoeditor,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/videoplayer/,/sf/app/videoplayer,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/videotelephony/,/sf/app/videotelephony,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/voicerec/,/sf/app/voicerec,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/webuis/,/sf/app/webuis,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/accesssec/,/sf/mw/accesssec,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/appinstall/,/sf/mw/appinstall,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/appsupport/,/sf/mw/appsupport,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/btservices/,/sf/mw/btservices,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/camerasrv/,/sf/mw/camerasrv,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/classicui/,/sf/mw/classicui,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/dlnasrv/,/sf/mw/dlnasrv,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/drm/,/sf/mw/drm,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/gsprofilesrv/,/sf/mw/gsprofilesrv,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/hapticsservices/,/sf/mw/hapticsservices,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/helix/,/sf/mw/helix,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/homescreensrv/,/sf/mw/homescreensrv,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/imghandling/,/sf/mw/imghandling,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/imsrv/,/sf/mw/imsrv,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/inputmethods/,/sf/mw/inputmethods,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/ipappprotocols/,/sf/mw/ipappprotocols,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/ipappsrv/,/sf/mw/ipappsrv,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/ipconnmgmt/,/sf/mw/ipconnmgmt,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/legacypresence/,/sf/mw/legacypresence,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/locationsrv/,/sf/mw/locationsrv,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/mds/,/sf/mw/mds,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/messagingmw/,/sf/mw/messagingmw,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/metadatasrv/,/sf/mw/metadatasrv,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/mmappfw/,/sf/mw/mmappfw,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/mmmw/,/sf/mw/mmmw,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/mmuifw/,/sf/mw/mmuifw,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/netprotocols/,/sf/mw/netprotocols,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/networkingdm/,/sf/mw/networkingdm,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/opensrv/,/sf/mw/opensrv,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/phonesrv/,/sf/mw/phonesrv,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/platformtools/,/sf/mw/platformtools,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/qt/,/sf/mw/qt,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/remoteconn/,/sf/mw/remoteconn,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/remotemgmt/,/sf/mw/remotemgmt,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/remotestorage/,/sf/mw/remotestorage,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/securitysrv/,/sf/mw/securitysrv,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/serviceapi/,/sf/mw/serviceapi,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/serviceapifw/,/sf/mw/serviceapifw,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/shortlinkconn/,/sf/mw/shortlinkconn,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/srvdiscovery/,/sf/mw/srvdiscovery,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/svgt/,/sf/mw/svgt,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/uiaccelerator/,/sf/mw/uiaccelerator,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/uiresources/,/sf/mw/uiresources,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/uitools/,/sf/mw/uitools,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/usbservices/,/sf/mw/usbservices,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/videoutils/,/sf/mw/videoutils,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/vpnclient/,/sf/mw/vpnclient,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/web/,/sf/mw/web,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/websrv/,/sf/mw/websrv,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/wirelessacc/,/sf/mw/wirelessacc,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/boardsupport/,/sf/os/boardsupport,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/bt/,/sf/os/bt,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/buildtools/,/sf/os/buildtools,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/cellularsrv/,/sf/os/cellularsrv,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/commsfw/,/sf/os/commsfw,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/devicesrv/,/sf/os/devicesrv,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/graphics/,/sf/os/graphics,branch,NewGraphicsArchitecture,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/imagingext/,/sf/os/imagingext,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/lbs/,/sf/os/lbs,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/mm/,/sf/os/mm,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/networkingsrv/,/sf/os/networkingsrv,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/ossrv/,/sf/os/ossrv,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/persistentdata/,/sf/os/persistentdata,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/security/,/sf/os/security,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/textandloc/,/sf/os/textandloc,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/usb/,/sf/os/usb,branch,RCL_3,
-http://developer.symbian.org/oss/MCL/sf/os/wlan/,/sf/os/wlan,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/osrndtools/,/sf/os/osrndtools,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,branch,RCL_3,layers.sysdef.xml
--- a/symbian3/single/sources_fcl.csv Wed May 05 12:21:47 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +0,0 @@
-source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/FCL/sftools/fbf/utilities/,/utilities,branch,default,
-//v800008/Builds01/mercurial_internal/rnd/rndonly/aricent/,/rnd/rndonly/aricent,branch,default,
-//v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,
-//v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,branch,default,
-//v800008/Builds01/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,branch,default,
-//v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,branch,default,
-http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/camera/,/sf/app/camera,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/commonemail/,/sf/app/commonemail,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/app/conntools/,/sf/app/conntools,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/contacts/,/sf/app/contacts,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/contentcontrol/,/sf/app/contentcontrol,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/conversations/,/sf/app/conversations,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/devicecontrol/,/sf/app/devicecontrol,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/dictionary/,/sf/app/dictionary,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/files/,/sf/app/files,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/graphicsuis/,/sf/app/graphicsuis,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/helps/,/sf/app/helps,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/homescreen/,/sf/app/homescreen,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/homescreentools/,/sf/app/homescreentools,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/im/,/sf/app/im,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/imgeditor/,/sf/app/imgeditor,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/iptelephony/,/sf/app/iptelephony,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/jrt/,/sf/app/jrt,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/location/,/sf/app/location,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/messaging/,/sf/app/messaging,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/mmsharinguis/,/sf/app/mmsharinguis,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/musicplayer/,/sf/app/musicplayer,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/app/organizer/,/sf/app/organizer,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/app/phone/,/sf/app/phone,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/photos/,/sf/app/photos,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/app/printing/,/sf/app/printing,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/profile/,/sf/app/profile,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/radio/,/sf/app/radio,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/rndtools/,/sf/app/rndtools,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/screensaver/,/sf/app/screensaver,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/settingsuis/,/sf/app/settingsuis,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/speechsrv/,/sf/app/speechsrv,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/techview/,/sf/app/techview,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/utils/,/sf/app/utils,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/videoeditor/,/sf/app/videoeditor,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/videoplayer/,/sf/app/videoplayer,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/videotelephony/,/sf/app/videotelephony,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/voicerec/,/sf/app/voicerec,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/webuis/,/sf/app/webuis,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/accesssec/,/sf/mw/accesssec,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/appinstall/,/sf/mw/appinstall,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/appsupport/,/sf/mw/appsupport,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/btservices/,/sf/mw/btservices,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/camerasrv/,/sf/mw/camerasrv,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/classicui/,/sf/mw/classicui,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/dlnasrv/,/sf/mw/dlnasrv,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/drm/,/sf/mw/drm,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/gsprofilesrv/,/sf/mw/gsprofilesrv,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/hapticsservices/,/sf/mw/hapticsservices,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/helix/,/sf/mw/helix,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/homescreensrv/,/sf/mw/homescreensrv,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/imghandling/,/sf/mw/imghandling,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/imsrv/,/sf/mw/imsrv,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/inputmethods/,/sf/mw/inputmethods,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/ipappprotocols/,/sf/mw/ipappprotocols,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/ipappsrv/,/sf/mw/ipappsrv,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/ipconnmgmt/,/sf/mw/ipconnmgmt,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/legacypresence/,/sf/mw/legacypresence,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/locationsrv/,/sf/mw/locationsrv,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/mds/,/sf/mw/mds,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/messagingmw/,/sf/mw/messagingmw,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/metadatasrv/,/sf/mw/metadatasrv,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/mmappfw/,/sf/mw/mmappfw,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/mmmw/,/sf/mw/mmmw,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/mmuifw/,/sf/mw/mmuifw,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/netprotocols/,/sf/mw/netprotocols,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/networkingdm/,/sf/mw/networkingdm,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/opensrv/,/sf/mw/opensrv,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/phonesrv/,/sf/mw/phonesrv,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/platformtools/,/sf/mw/platformtools,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/qt/,/sf/mw/qt,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/remoteconn/,/sf/mw/remoteconn,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/remotemgmt/,/sf/mw/remotemgmt,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/remotestorage/,/sf/mw/remotestorage,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/securitysrv/,/sf/mw/securitysrv,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/serviceapi/,/sf/mw/serviceapi,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/serviceapifw/,/sf/mw/serviceapifw,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/shortlinkconn/,/sf/mw/shortlinkconn,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/srvdiscovery/,/sf/mw/srvdiscovery,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/svgt/,/sf/mw/svgt,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/uiaccelerator/,/sf/mw/uiaccelerator,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/uiresources/,/sf/mw/uiresources,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/uitools/,/sf/mw/uitools,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/usbservices/,/sf/mw/usbservices,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/videoutils/,/sf/mw/videoutils,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/vpnclient/,/sf/mw/vpnclient,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/web/,/sf/mw/web,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/websrv/,/sf/mw/websrv,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/wirelessacc/,/sf/mw/wirelessacc,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/boardsupport/,/sf/os/boardsupport,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/bt/,/sf/os/bt,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/buildtools/,/sf/os/buildtools,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/cellularsrv/,/sf/os/cellularsrv,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/commsfw/,/sf/os/commsfw,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/devicesrv/,/sf/os/devicesrv,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/graphics/,/sf/os/graphics,branch,NewGraphicsArchitecture,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/imagingext/,/sf/os/imagingext,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/lbs/,/sf/os/lbs,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/mm/,/sf/os/mm,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/networkingsrv/,/sf/os/networkingsrv,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/ossrv/,/sf/os/ossrv,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/persistentdata/,/sf/os/persistentdata,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/security/,/sf/os/security,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/textandloc/,/sf/os/textandloc,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/usb/,/sf/os/usb,branch,RCL_3,
-http://developer.symbian.org/oss/MCL/sf/os/wlan/,/sf/os/wlan,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/osrndtools/,/sf/os/osrndtools,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,branch,RCL_3,layers.sysdef.xml
--- a/symbian3/single/sources_good.csv Wed May 05 12:21:47 2010 +0100
+++ b/symbian3/single/sources_good.csv Tue Jul 13 12:21:44 2010 +0100
@@ -1,6 +1,5 @@
source,dst,type,pattern,sysdef
http://developer.symbian.org/oss/FCL/sftools/fbf/utilities/,/utilities,branch,default,
-//v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,tag,S3_LATESTGOOD,
//v800008/Builds01/mercurial_internal/rnd/rndonly/aricent/,/rnd/rndonly/aricent,branch,default,
//v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,
//v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,branch,default,
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/single/sources_rnd.csv Tue Jul 13 12:21:44 2010 +0100
@@ -0,0 +1,7 @@
+source,dst,type,pattern,sysdef
+//v800008/Builds01/mercurial_internal/rnd/rndonly/aricent/,/rnd/rndonly/aricent,branch,default,
+//v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,
+//v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,branch,default,
+//v800008/Builds01/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,branch,default,
+//v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,branch,default,
+//v800008/Builds01/mercurial_internal/rnd/rndonly/ibm/,/rnd/rndonly/ibm,branch,default,
\ No newline at end of file
--- a/symbian3/single/sysdefs/auto/model_20100407133037_5ae8e73210e8.xml Wed May 05 12:21:47 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10866 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a package or prebuilt -->
-<!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) "N"
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile may someday be removed in favour of mrp -->
-<!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
-<systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="low mw high">
-<block name="stubs" level="high" long-name="Stubs" levels="stub">
-<collection name="s60_stubs" level="stub">
-<component name="audiostubs" long-name="Audio Stubs">
-<unit bldFile="adaptation/stubs/audiostubs/group"/>
-</component>
-<component name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaptation Stub">
-<unit bldFile="adaptation/stubs/btaudioadaptation_stub/group"/>
-</component>
-<component name="drm_stubs" long-name="DRM Stubs">
-<unit bldFile="adaptation/stubs/drm_stubs/group"/>
-</component>
-<component name="ocrsrv_stub" long-name="OCR Services Stub">
-<unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
-</component>
-<component name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation">
-<unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
-</component>
-<component name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" plugin="Y">
-<unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
-</component>
-<component name="srsfenginestub" long-name="SRSF Engine Stub">
-<unit bldFile="adaptation/stubs/srsfenginestub/group"/>
-</component>
-<component name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub">
-<unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
-</component>
-<component name="systemswstubs" long-name="System Software Stubs">
-<unit bldFile="adaptation/stubs/systemswstubs/group"/>
-</component>
-<component name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" plugin="Y">
-<unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
-</component>
-<component name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub">
-<unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
-<collection name="omap3530" long-name="OMAP 3530" level="hw-if">
-<component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530" mrp="adaptation/beagleboard/omap3530/base_beagle.mrp"/>
-</component>
-<component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/kernel"/>
-</component>
-<component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/beagleboard"/>
-</component>
-</collection>
-</block>
-<block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
-<collection name="qemu_baseport" long-name="Baseport" level="hw-if">
-<component name="syborg" long-name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/qemu/baseport/syborg" mrp="adaptation/qemu/baseport/syborg/syborg.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
-<collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
-<component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
-<unit mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
-</component>
-</collection>
-<collection name="bsptemplate" long-name="Board Support Package Template" level="hw-if">
-<component name="asspandvariant" long-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 name="kernel" long-name="Kernel Architecture" level="adaptation">
-<component name="eka" long-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 name="kerneltest" long-name="Kernel Test" level="hw-if">
-<component name="e32utils" long-name="E32 Utilities" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32utils/group" mrp="os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/>
-</component>
-<component name="e32test" long-name="E32 Tests" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32test/group" mrp="os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
-</component>
-<component name="f32test" long-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 name="ldds" long-name="Logical Device Drivers" level="adaptation">
-<component name="ethernetldd" long-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 name="audioldd" long-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>
-<component name="serialldd" long-name="Serial Port Drivers" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
-</component>
-<component name="legacydrivers" long-name="Legacy Drivers" purpose="optional">
-<unit mrp="os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
-</component>
-<component name="locmedia" long-name="Local Media Subsystem" introduced="8.1b" purpose="mandatory">
-<!-- these are LDDs for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
-</component>
-<component name="runmodedebugger" long-name="Run Mode Debugger" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/debug/group" mrp="os/kernelhwsrv/kernel/eka/drivers/debug/group/base_e32_drivers_debug.mrp"/>
-</component>
-<component name="btrace" long-name="Kernel Trace Tool" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/trace" mrp="os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
-</component>
-<component name="cameraldd" long-name="Camera Drivers" introduced="^3" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/camerasc" mrp="os/kernelhwsrv/kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
-</component>
-<component name="displayldd" long-name="Display Drivers" introduced="^3" purpose="optional">
-<!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/display" mrp="os/kernelhwsrv/kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
-</component>
-<component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
-</component>
-</collection>
-<collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
-<component name="mediadrivers" long-name="Media Drivers" purpose="optional">
-<!-- these are for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/media" mrp="os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
-</component>
-<component name="genericboardsupport" long-name="Generic Board Support" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
-</component>
-</collection>
-<collection name="userlibandfileserver" long-name="User Library and File Server" level="framework">
-<component name="euser" long-name="User Library" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/euser" mrp="os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
-</component>
-<component name="compsupp" long-name="Compiler Runtime Support" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/compsupp" mrp="os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
-</component>
-<component name="fileserver" long-name="File Server" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
-</component>
-<component name="estart" long-name="Base Starter" filter="gt" purpose="optional">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
-</component>
-<component name="domainmgr" long-name="Domain Manager" introduced="8.1b" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
-</component>
-</collection>
-<collection name="filesystems" long-name="File Systems" level="framework">
-<component name="romfs" long-name="ROM File System" filter="gt" purpose="optional" plugin="Y">
-<unit mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
-</component>
-<component name="rofs" long-name="ROFS" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
-</component>
-<component name="usbmsfs" long-name="USB Mass Storage File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
-</component>
-<component name="usbhostmssrv" long-name="USB Host Mass Storage Server" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage/base_f32_shostmassstorage.mrp"/>
-</component>
-<component name="fat32fs" long-name="FAT32 File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
-</component>
-<component name="fatfs" long-name="FAT File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
-</component>
-<component name="compfs" long-name="Composite File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
-</component>
-</collection>
-<collection name="halservices" long-name="HAL Services" level="framework">
-<component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
-<unit bldFile="os/kernelhwsrv/halservices/hal" mrp="os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
-</component>
-</collection>
-<collection name="textmodeshell" long-name="Text Mode Shell" level="test">
-<component name="e32wsrv" long-name="Text Window Server" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/ewsrv" mrp="os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
-</component>
-<component name="textshell" long-name="Text Shell" filter="gt" purpose="development">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
-</component>
-</collection>
-<collection name="baseapitest" long-name="Base API Tests" level="test"/>
-<collection name="kernelhwsrv_info" long-name="Kernel and Hardware Services Info" level="test">
-<component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 config">
-<collection name="emulator" long-name="Emulator" level="bsp">
-<component name="emulatorbsp" long-name="Emulator BSP" purpose="optional">
-<unit bldFile="os/boardsupport/emulator/emulatorbsp" mrp="os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
-</component>
-</collection>
-<collection name="haitest" long-name="HAI Test Suites" level="test">
-<component name="bspsvs" long-name="BSP Verification Suite" introduced="^2" purpose="development">
-<unit mrp="os/boardsupport/haitest/bspsvs/group/bspsvs.mrp"/>
-</component>
-</collection>
-<collection name="boardsupport_info" long-name="Board Support Info" level="config">
-<component name="boardsupport_metadata" long-name="Board Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/boardsupport/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
-<collection name="bldsystemtools" long-name="Build System Tools" level="bld">
-<component name="sysdeftools" long-name="System Definition Tools" purpose="development" introduced="^2">
-<unit mrp="os/buildtools/bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
-</component>
-<component name="commonbldutils" long-name="Common Utils" purpose="development">
-<unit mrp="os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
-</component>
-</collection>
-<collection name="toolsandutils" long-name="Tools and Utils" level="mw">
-<component name="productionbldtools" long-name="Production Build Tools" filter="gt" purpose="development">
-<unit mrp="os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
-</component>
-<component name="e32tools" long-name="E32 Tools" deprecated="^2" purpose="development" class="PC">
-<unit bldFile="os/buildtools/toolsandutils/e32tools/group" mrp="os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
-</component>
-<component name="autotest" long-name="Autotest" purpose="development">
-<unit bldFile="os/buildtools/toolsandutils/autotest/group" mrp="os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
-</component>
-</collection>
-<collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
-<component name="e32toolp" long-name="E32 Perl Tools" purpose="development" filter="sf_build" class="PC">
-<unit mrp="os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="os/buildtools/sbsv1_os/e32toolp/group"/>
-</component>
-</collection>
-<collection name="imgtools_os" long-name="Image Tools" level="fw">
-<component name="romkiteka2" long-name="ROMKIT EKA2" deprecated="^2" purpose="development">
-<unit bldFile="os/buildtools/imgtools_os/romkiteka2/group" mrp="os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
-</component>
-</collection>
-<collection name="misccomponents" long-name="Misc Components" level="mw">
-<component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt" purpose="development">
-<unit bldFile="os/buildtools/misccomponents/emulatorlauncher/group" mrp="os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
-</component>
-</collection>
-<collection name="buildtools_info" long-name="Build Tools Info" level="ui">
-<component name="buildtools_metadata" long-name="Build Tools Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/buildtools/buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
-<collection name="ossrv_pub" long-name="Generic OS Services Public Interfaces" level="utilities">
-<component name="boost_apis" long-name="Boost APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/boost_apis/group"/>
-</component>
-<component name="cpp_wrappers" long-name="Cpp wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cpp_wrappers/group"/>
-</component>
-<component name="character_type_apis" long-name="Character Type APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/character_type_apis/group"/>
-</component>
-<component name="compiler_specific_runtime_support" long-name="Compiler Specific Runtime Support" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/compiler_specific_runtime_support/group"/>
-</component>
-<component name="ossrv_configuration_api" long-name="Generic OS Services Configuration API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/configuration/group"/>
-</component>
-<component name="crypto_authentication_codes_and_hash_functions_api" long-name="Crypto Authentication Codes and Hash Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
-</component>
-<component name="crypto_auxillary_functions_api" long-name="Crypto Auxillary Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_auxillary_functions_api/group"/>
-</component>
-<component name="crypto_certificates_api" long-name="Crypto Certificates API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_certificates_api/group"/>
-</component>
-<component name="crypto_inputoutput_and_data_encoding_api" long-name="Crypto Input/Output and Data Encoding API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
-</component>
-<component name="crypto_public_key_cryptography_and_key_agreement_api" long-name="Crypto Public Key Cryptography and Key Agreement API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
-</component>
-<component name="crypto_symmetric_ciphers_api" long-name="Crypto Symmetric Ciphers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_symmetric_ciphers_api/group"/>
-</component>
-<component name="crypto_utility_functions_api" long-name="Crypto Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_utility_functions_api/group"/>
-</component>
-<component name="cryptogaphy_related_api" long-name="Cryptogaphy Related API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cryptogaphy_related_api/group"/>
-</component>
-<component name="ossrv_debug_api" long-name="Generic OS Services Debug API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/debug/group"/>
-</component>
-<component name="ossrv_exceptions_api" long-name="Generic OS Services Exceptions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/exceptions/group"/>
-</component>
-<component name="gboxed" long-name="GBoxed API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gboxed/group"/>
-</component>
-<component name="glib_arrays" long-name="Glib Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_arrays/group"/>
-</component>
-<component name="glib_asynchronous_queues" long-name="Glib Asynchronous Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_asynchronous_queues/group"/>
-</component>
-<component name="glib_atomic_operations" long-name="Glib Atomic Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_atomic_operations/group"/>
-</component>
-<component name="glib_automatic_string_completion" long-name="Glib Automatic String Completion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_automatic_string_completion/group"/>
-</component>
-<component name="glib_balanced_binary_trees" long-name="Glib Balanced Binary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_balanced_binary_trees/group"/>
-</component>
-<component name="glib_basic_types" long-name="Glib Basic Types API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_basic_types/group"/>
-</component>
-<component name="glib_caches" long-name="Glib Caches API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_caches/group"/>
-</component>
-<component name="glib_character_set_conversion" long-name="Glib Character Set Conversion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_character_set_conversion/group"/>
-</component>
-<component name="glib_closures" long-name="Glib Closures API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_closures/group"/>
-</component>
-<component name="glib_commandline_option_parser" long-name="Glib Command Line Option Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_commandline_option_parser/group"/>
-</component>
-<component name="glib_datasets" long-name="Glib Datasets API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_datasets/group"/>
-</component>
-<component name="glib_date_and_time_functions" long-name="Glib Date and Time Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_date_and_time_functions/group"/>
-</component>
-<component name="glib_doubleended_queues" long-name="Glib Double-ended Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doubleended_queues/group"/>
-</component>
-<component name="glib_doublylinked_lists" long-name="Glib Doubly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doublylinked_lists/group"/>
-</component>
-<component name="glib_dynamic_loading_of_modules" long-name="Glib Dynamic Loading of Modules API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_dynamic_loading_of_modules/group"/>
-</component>
-<component name="glib_enums_and_flags" long-name="Glib Enums and Flags API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_enums_and_flags/group"/>
-</component>
-<component name="glib_error_reporting" long-name="Glib Error Reporting API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_error_reporting/group"/>
-</component>
-<component name="glib_file_utilities" long-name="Glib File Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_file_utilities/group"/>
-</component>
-<component name="glib_generic_values" long-name="Glib Generic Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_generic_values/group"/>
-</component>
-<component name="glib_globstyle_pattern_matching" long-name="Glib Glob-Style Pattern Matching API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_globstyle_pattern_matching/group"/>
-</component>
-<component name="glib_hash_tables" long-name="Glib Hash Tables API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hash_tables/group"/>
-</component>
-<component name="glib_hook_functions" long-name="Glib Hook Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hook_functions/group"/>
-</component>
-<component name="glib_internationalization" long-name="Glib Internationalization API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_internationalization/group"/>
-</component>
-<component name="glib_io_channels" long-name="Glib I/O Channels API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_io_channels/group"/>
-</component>
-<component name="glib_keyvalue_file_parser" long-name="Glib Key-Value File Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_keyvalue_file_parser/group"/>
-</component>
-<component name="glib_lexical_scanner" long-name="Glib Lexical Scanner API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_lexical_scanner/group"/>
-</component>
-<component name="glib_main_event_loop" long-name="Glib Main Event Loop API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_main_event_loop/group"/>
-</component>
-<component name="glib_memory_allocation" long-name="Glib Memory Allocation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_allocation/group"/>
-</component>
-<component name="glib_memory_slices" long-name="Glib Memory Slices API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_slices/group"/>
-</component>
-<component name="glib_message_logging" long-name="Glib Message Logging API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_message_logging/group"/>
-</component>
-<component name="glib_miscellaneous_utility_functions" long-name="Glib Miscellaneous Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_miscellaneous_utility_functions/group"/>
-</component>
-<component name="glib_nary_trees" long-name="Glib N-ary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_nary_trees/group"/>
-</component>
-<component name="glib_parameters_and_values" long-name="Glib Parameters and Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_parameters_and_values/group"/>
-</component>
-<component name="glib_quarks" long-name="Glib Quarks API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_quarks/group"/>
-</component>
-<component name="glib_random_numbers" long-name="Glib Random Numbers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_random_numbers/group"/>
-</component>
-<component name="glib_relations_and_tuples" long-name="Glib Relations and Tuples API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_relations_and_tuples/group"/>
-</component>
-<component name="glib_shellrelated_utilities" long-name="Glib Shell-related Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_shellrelated_utilities/group"/>
-</component>
-<component name="glib_signals" long-name="Glib Signals API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_signals/group"/>
-</component>
-<component name="glib_simple_xml_subset_parser" long-name="Glib Simple XML Subset Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_simple_xml_subset_parser/group"/>
-</component>
-<component name="glib_singlylinked_lists" long-name="Glib Singly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_singlylinked_lists/group"/>
-</component>
-<component name="glib_spawning_processes" long-name="Glib Spawning Processes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_spawning_processes/group"/>
-</component>
-<component name="glib_standard_macros" long-name="Glib Standard Macros API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_standard_macros/group"/>
-</component>
-<component name="glib_string_utility_functions" long-name="Glib String Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_string_utility_functions/group"/>
-</component>
-<component name="glib_strings" long-name="Glib Strings API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_strings/group"/>
-</component>
-<component name="glib_thread_pools" long-name="Glib Thread Pools API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_thread_pools/group"/>
-</component>
-<component name="glib_threads" long-name="Glib Threads API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_threads/group"/>
-</component>
-<component name="glib_timers" long-name="Glib Timers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_timers/group"/>
-</component>
-<component name="glib_unicode_manipulation" long-name="Glib Unicode Manipulation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_unicode_manipulation/group"/>
-</component>
-<component name="glib_value_arrays" long-name="Glib Value Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_value_arrays/group"/>
-</component>
-<component name="glib_varargs_value_collection" long-name="Glib Varargs Value Collection API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_varargs_value_collection/group"/>
-</component>
-<component name="gobject" long-name="GObject API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gobject/group"/>
-</component>
-<component name="gparamspec" long-name="GParamSpec API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gparamspec/group"/>
-</component>
-<component name="gtype" long-name="GType API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtype/group"/>
-</component>
-<component name="gtypemodule" long-name="GTypeModule API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypemodule/group"/>
-</component>
-<component name="gtypeplugin" long-name="GTypePlugin API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypeplugin/group"/>
-</component>
-<component name="io_stream_api" long-name="I/O stream API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/io_stream_api/group"/>
-</component>
-<component name="localization_function_api" long-name="Localization Function API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/localization_function_api/group"/>
-</component>
-<component name="math_operations_api" long-name="Math Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/math_operations_api/group"/>
-</component>
-<component name="ossrv_memory_api" long-name="Generic OS Services Memory API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/memory/group"/>
-</component>
-<component name="no_namespace_headers" long-name="No Namespace Headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/no_namespace_headers/group"/>
-</component>
-<component name="openc_headers" long-name="OpenC headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_headers/group"/>
-</component>
-<component name="openc_wrappers" long-name="OpenC wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_wrappers/group"/>
-</component>
-<component name="ssl_general_api" long-name="SSL General API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_general_api/group"/>
-</component>
-<component name="ssl_protocol_methods_api" long-name="SSL Protocol Methods API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_protocol_methods_api/group"/>
-</component>
-<component name="standard_compressiondecompression_api" long-name="Standard Compression/Decompression API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/standard_compressiondecompression_api/group"/>
-</component>
-<component name="stl" long-name="STL API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/stl/group"/>
-</component>
-<component name="thread_api" long-name="Thread API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/thread_api/group"/>
-</component>
-<component name="type_attributes" long-name="Type Attributes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/type_attributes/group"/>
-</component>
-<component name="typeinfo" long-name="Type Info API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/typeinfo/group"/>
-</component>
-<component name="utility_apis" long-name="Utility APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/utility_apis/group"/>
-</component>
-<component name="wide_character_classapis" long-name="Wide character class/apis" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/wide_character_classapis/group"/>
-</component>
-<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">
-<unit bldFile="os/ossrv/ossrv_pub/dbus-glib/group"/>
-</component>
-</collection>
-<collection name="ossrv_plat" long-name="Generic OS Services Platform Interfaces" level="utilities">
-<component name="libutils_apis" long-name="Utility Library APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_plat/libutils/group"/>
-</component>
-</collection>
-<collection name="stdlibs" long-name="Standard Libraries" level="translation">
-<component name="libz" filter="s60" long-name="Z Compression Library">
-<unit bldFile="os/ossrv/stdlibs/libz/group"/>
-</component>
-<component name="libcrypt" filter="s60" long-name="Crypt Library">
-<unit bldFile="os/ossrv/stdlibs/libcrypt/group"/>
-</component>
-</collection>
-<collection name="ssl" long-name="SSL" level="data-services">
-<component name="libcrypto" filter="s60" long-name="Crypto Library">
-<unit bldFile="os/ossrv/ssl/libcrypto/group"/>
-</component>
-<component name="libssl" filter="s60" purpose="development" long-name="SSL Library">
-<unit bldFile="os/ossrv/ssl/libssl/group"/>
-</component>
-</collection>
-<collection name="glib" long-name="GLib" level="utilities">
-<component name="glibbackend" filter="s60" long-name="GLib Backend">
-<unit bldFile="os/ossrv/glib/glibbackend/group"/>
-</component>
-<component name="libglib" filter="s60" long-name="GLib Library">
-<unit bldFile="os/ossrv/glib/libglib/group"/>
-</component>
-<component name="libgthread" filter="s60" long-name="Libg Thread">
-<unit bldFile="os/ossrv/glib/libgthread/group"/>
-</component>
-<component name="libgmodule" filter="s60" long-name="Libg Module">
-<unit bldFile="os/ossrv/glib/libgmodule/group"/>
-</component>
-<component name="libgobject" filter="s60" long-name="Libg Object">
-<unit bldFile="os/ossrv/glib/libgobject/group"/>
-</component>
-</collection>
-<collection name="stdcpp" long-name="C++ Standard Library" level="translation">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="stdcpp_build" filter="s60" long-name="Stdcpp">
-<unit bldFile="os/ossrv/stdcpp/group"/>
-</component>
-</collection>
-<collection name="ofdbus" long-name="Open Foundation D-Bus" level="utilities">
-<component name="dbus" filter="s60" long-name="D-Bus">
-<unit bldFile="os/ossrv/ofdbus/dbus/group"/>
-</component>
-<component name="dbus-glib" filter="s60" long-name="D-Bus GLib">
-<unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
-</component>
-<component name="ofdbus_rom" filter="s60" long-name="D-Bus ROM">
-<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory
- Consider moving IBY file to one of the above as well and removing this component entirely -->
-<unit bldFile="os/ossrv/ofdbus/group"/>
-</component>
-</collection>
-<collection name="utilitylibraries" long-name="Utility Libraries" level="encoding">
-<component name="libutils" filter="s60" long-name="Utility Library">
-<unit bldFile="os/ossrv/utilitylibraries/libutils/group"/>
-</component>
-</collection>
-<collection name="genericservices" long-name="Generic Services" level="utilities">
-<component name="s60compatibilityheaders" long-name="S60 Compatibility Headers" filter="gt" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp" version="tb101sf"/>
-</component>
-<component name="mimerecognitionfw" long-name="MIME Recognition Framework" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/mimerecognitionfw/group" mrp="os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
-</component>
-<component name="systemagent" long-name="System Agent" introduced="9.0" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/systemagent/group" mrp="os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
-</component>
-<component name="taskscheduler" long-name="Task Scheduler" introduced="6.0" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/taskscheduler/group" mrp="os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
-</component>
-<component name="activebackupclient" long-name="Active Backup Client" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/activebackupclient/group" mrp="os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
-</component>
-<component name="syslibsdocs" long-name="Syslibs Documentation" purpose="development" class="doc">
-<unit mrp="os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
-</component>
-<component name="httputils" long-name="HTTP Utilities Library" introduced="6.2" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/httputils/group" mrp="os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
-</component>
-</collection>
-<collection name="syslibsapitest" long-name="SysLibs API Tests" level="utilities"/>
-<collection name="compressionlibs" long-name="Compression Libraries" level="data-services">
-<component name="ziplib" long-name="Zip Compression Library" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/ossrv/compressionlibs/ziplib/group" mrp="os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
-</component>
-</collection>
-<collection name="genericopenlibs" long-name="Generic Open Libraries" level="translation">
-<component name="cstdlib" long-name="C Standard Library" introduced="ER5" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/cstdlib/group" mrp="os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
-</component>
-<component name="cppstdlib" long-name="C++ Standard Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/cppstdlib/group" mrp="os/ossrv/genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
-</component>
-<component name="openenvcore" long-name="Open Environment Core" introduced="^2" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/openenvcore/group" mrp="os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
-</component>
-<component name="posixrealtimeextensions" long-name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/posixrealtimeextensions/group" mrp="os/ossrv/genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
-</component>
-</collection>
-<collection name="lowlevellibsandfws" long-name="Low Level Libraries and Frameworks" level="app-libs">
-<component name="pluginfw" long-name="Plugin Framework" introduced="6.2" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp" version="3"/>
-</component>
-<component name="apputils" long-name="Application Utilities" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/apputils/group" mrp="os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
-</component>
-<component name="genericusabilitylib" long-name="Generic Usability Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/genericusabilitylib/group" mrp="os/ossrv/lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
-</component>
-</collection>
-<collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
-<component name="ossrv_build" filter="s60" long-name="Generic OS Services Build">
-<!-- exports should be moved to individual components -->
-<unit bldFile="os/ossrv/group"/>
-</component>
-<component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="featuremgmt" long-name="Feature Management" level="framework">
-<component name="featuremgr" long-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 name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/persistentdata/featuremgmt/featureregistry/group" mrp="os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
-</component>
-</collection>
-<collection name="loggingservices" long-name="Logging Services" level="server">
-<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">
-<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">
-<unit bldFile="os/persistentdata/loggingservices/rfilelogger/group" mrp="os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
-</component>
-</collection>
-<collection name="traceservices" long-name="Trace Services" level="server">
-<component name="commsdebugutility" long-name="Comms Debug Utility" introduced="7.0s" purpose="optional">
-<unit bldFile="os/persistentdata/traceservices/commsdebugutility/group" mrp="os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
-</component>
-<component name="tracefw" long-name="Trace Framework" introduced="9.2" purpose="development">
-<unit bldFile="os/persistentdata/traceservices/tracefw/ulogger/group" mrp="os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
-</component>
-</collection>
-<collection name="persistentstorage" long-name="Persistent Storage" level="framework">
-<component name="store" long-name="Store" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/store/group" mrp="os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
-</component>
-<component name="dbms" long-name="DBMS" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/dbms/group" mrp="os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
-</component>
-<component name="centralrepository" long-name="Central Repository" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/persistentdata/persistentstorage/centralrepository/group" mrp="os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
-</component>
-<component name="sql" long-name="SQL" introduced="9.3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sql/GROUP" mrp="os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
-</component>
-<component name="sqlite3api" long-name="SQLite 3 API" introduced="^3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sqlite3api/GROUP" mrp="os/persistentdata/persistentstorage/sqlite3api/GROUP/syslibs_sqlite3.mrp"/>
-</component>
-</collection>
-<collection name="persistentdata_info" long-name="Persistent Data Services Info" level="app-if">
-<component name="persistentdata_metadata" long-name="Persistent Data Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/persistentdata/persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
-<component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
-</component>
-<component name="common_platform_security_definitions_api" long-name="Common Platform Security Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group"/>
-</component>
-<component name="feature_discovery_api" long-name="Feature Discovery API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/group"/>
-</component>
-<component name="platform_environment_api" long-name="Platform Environment API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_environment_api/group"/>
-</component>
-<component name="sensor_channel_api" long-name="Sensor Channel API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_channel_api/group"/>
-</component>
-<component name="sensor_definitions_api" long-name="Sensor Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_definitions_api/group"/>
-</component>
-<component name="version_info_api" long-name="Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/group"/>
-</component>
-<component name="accessory_monitoring_api" long-name="Accessory Monitoring API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/group"/>
-</component>
-<component name="haptics_api" long-name="Haptics API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/haptics_api/group"/>
-</component>
-<component name="sensor_data_compensator_api" long-name="Sensor Data Compensator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
-</component>
-</collection>
-<collection name="devicesrv_plat" long-name="Device Services Platform Interfaces" level="app-if">
-<component name="configuration_file_parser_api" long-name="Configuration File Parser API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/configuration_file_parser_api/group"/>
-</component>
-<component name="dos_extension_plugin_api" long-name="DOS Extension Plug-In API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_plugin_api/group"/>
-</component>
-<component name="mediator_command_initiator_api" long-name="Mediator Command Initiator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_initiator_api/group"/>
-</component>
-<component name="syslangutil_api" long-name="SysLangUtil API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/syslangutil_api/group"/>
-</component>
-<component name="wakeup_alarm_api" long-name="Wakeup Alarm API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/wakeup_alarm_api/group"/>
-</component>
-<component name="disk_and_memory_level_keys_api" long-name="Disk and Memory Level Keys API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_and_memory_level_keys_api/group"/>
-</component>
-<component name="mediator_plugin_api" long-name="Mediator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_plugin_api/group"/>
-</component>
-<component name="headset_status_api" long-name="Headset Status API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/headset_status_api/group"/>
-</component>
-<component name="system_startup_extension_plugin_api" long-name="System Startup Extension Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/system_startup_extension_plugin_api/group"/>
-</component>
-<component name="sensor_plugin_api" long-name="Sensor Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_plugin_api/group"/>
-</component>
-<component name="accessory_api" long-name="Accessory API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_api/group"/>
-</component>
-<component name="display_language_definition_api" long-name="Display Language Definition API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/display_language_definition_api/group"/>
-</component>
-<component name="mediator_command_responder_api" long-name="Mediator Command Responder API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_responder_api/group"/>
-</component>
-<component name="accessory_policy_definitions_api" long-name="Accessory Policy Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_definitions_api/group"/>
-</component>
-<component name="hw_settings_api" long-name="Hardware Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/hw_settings_api/group"/>
-</component>
-<component name="mediator_domain_definitions_api" long-name="Mediator Domain Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_domain_definitions_api/group"/>
-</component>
-<component name="sensor_extension_api" long-name="Sensor Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_extension_api/group"/>
-</component>
-<component name="accessory_plugin_api" long-name="Accessory Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_plugin_api/group"/>
-</component>
-<component name="sae_api" long-name="SAE API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sae_api/group"/>
-</component>
-<component name="accessory_control_api" long-name="Accessory Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_control_api/group"/>
-</component>
-<component name="mediator_static_registration_api" long-name="Mediator Static Registration API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_static_registration_api/group"/>
-</component>
-<component name="accessory_key_event_handling_api" long-name="Accessory Key Event Handling API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_key_event_handling_api/group"/>
-</component>
-<component name="mediator_notification_api" long-name="Mediator Notification API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_notification_api/group"/>
-</component>
-<component name="accessory_policy_utility_api" long-name="Accessory Policy Utility API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_utility_api/group"/>
-</component>
-<component name="common_dsy_plugin_api" long-name="Common DSY Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/common_dsy_plugin_api/group"/>
-</component>
-<component name="remote_control_extension_api" long-name="Remote Control Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/remote_control_extension_api/group"/>
-</component>
-<component name="sensor_channel_filter_api" long-name="Sensor Channel Filter API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_channel_filter_api/group"/>
-</component>
-<component name="dos_extension_api" long-name="DOS Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_api/group"/>
-</component>
-<component name="accessory_audio_control_api" long-name="Accessory Audio Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_audio_control_api/group"/>
-</component>
-<component name="mediator_event_consumer_api" long-name="Mediator Event Consumer API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_consumer_api/group"/>
-</component>
-<component name="shared_data_api" long-name="Shared Data API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/shared_data_api/group"/>
-</component>
-<component name="accessory_settings_api" long-name="Accessory Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_settings_api/group"/>
-</component>
-<component name="accessory_bluetooth_control_api" long-name="Accessory Bluetooth Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_bluetooth_control_api/group"/>
-</component>
-<component name="extended_version_info_api" long-name="Extended Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_api/group"/>
-</component>
-<component name="mediator_event_provider_api" long-name="Mediator Event Provider API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_provider_api/group"/>
-</component>
-<component name="tv_out_config_api" long-name="TV Out Config API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_config_api/group"/>
-</component>
-<component name="tspclientmapper_api" long-name="TSP Client Mapper API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tspclientmapper_api/group"/>
-</component>
-<component name="powersave_api" long-name="Power Save API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_api/group"/>
-</component>
-<component name="powersave_definitions_api" long-name="Power Save Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_definitions_api/group"/>
-</component>
-<component name="powersave_plugin_api" long-name="Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_plugin_api/group"/>
-</component>
-<component name="extended_version_info_plugin_api" long-name="Extended Version Info Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_plugin_api/group"/>
-</component>
-<component name="haptics_plugin_api" long-name="Haptics Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_plugin_api/group"/>
-</component>
-<component name="haptics_effect_data_getter_plugin_api" long-name="Haptics Effect Data Getter Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
-</component>
-<component name="haptics_packetizer_plugin_api" long-name="Haptics Packetizer Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_packetizer_plugin_api/group"/>
-</component>
-<component name="tiltcompensation_api" long-name="Tilt Compensation API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tiltcompensation_api/group"/>
-</component>
-<component name="disk_notification_handler_api" long-name="Disk Notification Handler API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_notification_handler_api/group"/>
-</component>
-<component name="accessory_policy_usb_audio_api" long-name="Accessory Policy USB Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_usb_audio_api/group"/>
-</component>
-<component name="accessory_policy_hdmi_audio_api" long-name="Accessory Policy HDMI Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_hdmi_audio_api/group"/>
-</component>
-<component name="sensor_data_compensator_plugin_api" long-name="Sensor Data Compensator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
-</component>
-<component name="ddc_access_api" long-name="DDC Access API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/ddc_access_api/group"/>
-</component>
-<component name="tv_out_behaviour_api" long-name="TV Out Behaviour API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_behaviour_api/group"/>
-</component>
-</collection>
-<collection name="accessoryservices" long-name="Accessory Services" level="framework">
-<component name="accessorymonitor" filter="s60" long-name="Accessory Monitor">
-<unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/group"/>
-</component>
-<component name="accessoryremotecontrol" filter="s60" long-name="Accessory Remote Control">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
-</component>
-<component name="accessoryserver" filter="s60" long-name="Accessory Server">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryserver/group"/>
-</component>
-<component name="pluggeddisplay" filter="s60" long-name="Plugged Display" introduced="^3">
-<unit bldFile="os/devicesrv/accessoryservices/pluggeddisplay/group"/>
-</component>
-<component name="headsetstatusapi" filter="s60" long-name="Headset Status API">
-<unit bldFile="os/devicesrv/accessoryservices/headsetstatusapi/group"/>
-</component>
-<component name="tspclientmapper" filter="s60" long-name="TSP Client Mapper">
-<unit bldFile="os/devicesrv/accessoryservices/tspclientmapper/group"/>
-</component>
-<component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional">
-<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
-</component>
-<component name="gid_pc_tool" filter="s60" long-name="Generic ID PC Tool" class="tool PC">
-<unit bldFile="os/devicesrv/accessoryservices/gid_pc_tool/group"/>
-</component>
-</collection>
-<collection name="commonservices" long-name="Common Services" level="app-if">
-<component name="commonengine" filter="s60" long-name="Common Engine">
-<unit bldFile="os/devicesrv/commonservices/commonengine/group"/>
-</component>
-<component name="commonengineresources" filter="s60" long-name="Common Engine Resources" class="config">
-<unit bldFile="os/devicesrv/commonservices/commonengineresources/group"/>
-</component>
-<component name="platformenv" filter="s60" long-name="Platform Environment">
-<unit bldFile="os/devicesrv/commonservices/platformenv/group"/>
-</component>
-<component name="sysutil" long-name="System Utilities" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/sysutil/group" mrp="os/devicesrv/commonservices/sysutil/group/sysutil.mrp"/>
-</component>
-<component name="activitymanager" long-name="Activity Manager" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/activitymanager/group" mrp="os/devicesrv/commonservices/activitymanager/group/activitymanager.mrp"/>
-</component>
-</collection>
-<collection name="dosservices" long-name="Domestic Operating System Services" level="hw-if">
-<component name="commondsy" filter="s60" long-name="Common DSY" plugin="Y">
-<unit bldFile="os/devicesrv/dosservices/commondsy/group"/>
-</component>
-<component name="dosserver" filter="s60" long-name="Domestic OS Server">
-<unit bldFile="os/devicesrv/dosservices/dosserver/group"/>
-</component>
-</collection>
-<collection name="sensorservices" long-name="Sensor Services" level="framework">
-<component name="sensorserver" filter="s60" long-name="Sensor Server">
-<unit bldFile="os/devicesrv/sensorservices/sensorserver/group"/>
-</component>
-<component name="orientationssy" filter="s60" long-name="Orientation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/orientationssy/group"/>
-</component>
-<component name="tiltcompensationssy" filter="s60" long-name="Tilt Compensation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/tiltcompensationssy/group"/>
-</component>
-<component name="sensordatacompensator" filter="s60" long-name="Sensor Data Compensator">
-<unit bldFile="os/devicesrv/sensorservices/sensordatacompensator/group"/>
-</component>
-</collection>
-<collection name="hwrmhaptics" long-name="HWRM Haptics" level="plugin">
-<component name="hapticseffectdatagetterfw" filter="s60" long-name="Haptics Effect Data Getter Framework">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
-</component>
-<component name="hapticspluginservice" filter="s60" long-name="Haptics Plugin Service">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
-</component>
-<component name="hapticspacketizer" filter="s60" long-name="Haptics Packetizer">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
-</component>
-<component name="hapticspluginmanager" filter="s60" long-name="Haptics Plugin Manager">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
-</component>
-<component name="hapticsserver" filter="s60" long-name="Haptics Server">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsserver/group"/>
-</component>
-<component name="hapticsclient" filter="s60" long-name="Haptics Client">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsclient/group"/>
-</component>
-<component name="hwrmhaptics_build" filter="s60" long-name="HWRM Haptics Build">
-<!-- move these exports into the appropriate above components and delete this component-->
-<unit bldFile="os/devicesrv/hwrmhaptics/group"/>
-</component>
-</collection>
-<collection name="mediator" long-name="Mediator" level="app-if">
-<!--collection is really a component. Move it down a directory -->
-<component name="mediator_build" filter="s60" long-name="Mediator Build">
-<unit bldFile="os/devicesrv/mediator/group"/>
-</component>
-</collection>
-<collection name="psmservices" long-name="Power Save Mode Services" level="app-if">
-<component name="psmserver" filter="s60" long-name="PSM Server">
-<unit bldFile="os/devicesrv/psmservices/psmserver/group"/>
-</component>
-</collection>
-<collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
-<component name="hwrmfmtxwatcherplugin" filter="s60" long-name="HWRM FM Transmitter Watcher Plugin" plugin="Y">
-<unit bldFile="os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
-</component>
-<component name="hwrmtargetmodifierplugin" filter="s60" long-name="HWRM Target Modifier Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build,
- may need to -->
-<!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
-</component>
-<component name="vibractrl" filter="s60" long-name="Vibra Control" deprecated="9.1">
-<unit bldFile="os/devicesrv/resourcemgmt/vibractrl/group"/>
-</component>
-<component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="^2" purpose="optional">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
-</component>
-<component name="hwresourcesmgrconfig" long-name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
-</component>
-<component name="resourcemgmt_build" filter="s60" long-name="Resource Management Build">
-<!-- Move exports to a self-contained component.
- This needs to be kept around until configuration is in place -->
-<unit bldFile="os/devicesrv/resourcemgmt/group"/>
-</component>
-<component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
-</component>
-</collection>
-<collection name="sysstatemgmt" long-name="System State Management" level="server">
-<component name="ssmmapperutility" filter="s60" long-name="SSM Mapper Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmmapperutility/group"/>
-</component>
-<component name="ssmpolicyplugins" filter="s60" long-name="SSM Policy Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmpolicyplugins/group"/>
-</component>
-<component name="ssmutilityplugins" filter="s60" long-name="SSM Utility Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmutilityplugins/group"/>
-</component>
-<component name="ssmcmdlists" filter="s60" long-name="SSM Command Lists" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcmdlists/group"/>
-</component>
-<component name="ssmcustcmds" filter="s60" long-name="SSM Custom Commands" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcustcmds/group"/>
-</component>
-<component name="syslangutil" filter="s60" long-name="System Language Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/syslangutil/group"/>
-</component>
-<component name="sysrestart" filter="s60" long-name="System Restart" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysrestart/group"/>
-</component>
-<component name="sysuiprovider" filter="s60" long-name="System UI Provider" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysuiprovider/group"/>
-</component>
-<component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/group" mrp="os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
-</component>
-<component name="systemstatemgr" long-name="System State Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
-</component>
-<component name="systemstateplugins" long-name="System State Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
-</component>
-<component name="systemstatereferenceplugins" long-name="System State Reference Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
-</component>
-</collection>
-<collection name="resourceinterfaces" long-name="Resource Interfaces" level="hw-if">
-<component name="fmtransmittercontrol" long-name="FM Transmitter Control" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group" mrp="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
-</component>
-</collection>
-<collection name="systemhealthmanagement" long-name="System Health Management" level="server">
-<component name="systemhealthmgr" long-name="System Health Manager" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
-</component>
-</collection>
-<collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if"/>
-<collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
-<component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
-<collection name="authenticationservices" long-name="Authentication Services" level="utilities">
-<component name="authenticationserver" long-name="Authentication Server" introduced="^3" purpose="optional">
-<unit bldFile="os/security/authenticationservices/authenticationserver/group" mrp="os/security/authenticationservices/authenticationserver/group/security_authserver.mrp"/>
-</component>
-</collection>
-<collection name="authorisation" long-name="Authorisation" level="utilities">
-<component name="userpromptservice" long-name="User Prompt Service" introduced="^3" purpose="mandatory">
-<unit bldFile="os/security/authorisation/userpromptservice/group" mrp="os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
-</component>
-<component name="userpromptutils" long-name="User Prompt Utils" introduced="^3" purpose="optional">
-<unit bldFile="os/security/authorisation/userpromptutils/group" mrp="os/security/authorisation/userpromptutils/group/security_ups_utils.mrp"/>
-</component>
-</collection>
-<collection name="contentmgmt" long-name="Content Management" level="utilities">
-<component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
-<unit bldFile="os/security/contentmgmt/contentaccessfwfordrm/group" mrp="os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
-</component>
-<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>
-</collection>
-<collection name="crypto" long-name="Crypto Libraries" level="libraries">
-<component name="weakcryptospi" long-name="Weak Crypto SPI" filter="gt" introduced="^3" purpose="optional">
-<unit bldFile="os/security/crypto/weakcryptospi/group" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
-</component>
-<component name="strongcryptospi" long-name="Strong Crypto SPI" filter="gt" introduced="^3" purpose="optional">
-<unit bldFile="os/security/crypto/weakcryptospi/strong" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
-</component>
-</collection>
-<collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
-<component name="securityutils" long-name="Security Utils" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/securityutils/group" mrp="os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
-</component>
-<component name="securitydocs" long-name="Security Documentation" purpose="development" class="doc">
-<unit mrp="os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
-</component>
-<component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
-</component>
-<component name="securitycommonutils" long-name="Security Common Utils" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/security/cryptomgmtlibs/securitycommonutils/group" mrp="os/security/cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
-</component>
-</collection>
-<collection name="securityanddataprivacytools" long-name="Security and Data Privacy Tools" level="services">
-<component name="securityconfig" long-name="Security Config" introduced="9.1" purpose="optional">
-<unit bldFile="os/security/securityanddataprivacytools/securityconfig/group" mrp="os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
-</component>
-<component name="securitytools" long-name="Security Tools" introduced="^3" purpose="optional" class="PC">
-<unit bldFile="os/security/securityanddataprivacytools/securitytools/group" mrp="os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
-</component>
-</collection>
-<collection name="cryptoplugins" long-name="Crypto Plugins" level="plugins">
-<component name="cryptospiplugins" long-name="Crypto SPI Plugins" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/security/cryptoplugins/cryptospiplugins/group" mrp="os/security/cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
-</component>
-</collection>
-<collection name="cryptoservices" long-name="Crypto Services" level="plugins">
-<component name="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/certificateandkeymgmt/group" mrp="os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
-</component>
-<component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
-</component>
-<component name="browserrootcertificates" long-name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
-<unit mrp="os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
-</component>
-<component name="rootcertificates" filter="sf_build" long-name="Root Certificates" introduced="7.0s" purpose="optional">
-<!-- not in S60 codebase -->
-<unit bldFile="os/security/cryptoservices/rootcertificates/group" mrp="os/security/cryptoservices/rootcertificates/group/rootcerts.mrp"/>
-</component>
-<component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/asnpkcs/group" mrp="os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
-</component>
-</collection>
-<collection name="security_info" long-name="OS Security Info" level="utilities">
-<component name="security_metadata" long-name="OS Security Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/security/security_info/security_metadata/security_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
-<collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
-<component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
-</component>
-<component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
-</component>
-<component name="simulationpositioningmodule" long-name="Simulation Positioning Module" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
-</component>
-<component name="gpspositioningmodule" long-name="GPS/A-GPS Positioning Module" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/gpspositioningmodule/group" mrp="os/lbs/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
-</component>
-<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>
-</collection>
-<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
-<component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
-</component>
-</collection>
-<collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
-<component name="locationserver" long-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 name="networkrequesthandler" long-name="Network Request Handler" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
-</component>
-</collection>
-<collection name="lbstest" long-name="Locating Services Tests" level="application-interface">
-<component name="locationprotocoltest" long-name="Location Protocol Tests" introduced="9.2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/lbstest/locationprotocoltest/group" mrp="os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
-</component>
-</collection>
-<collection name="locationmgmt" long-name="Location Management" level="management">
-<component name="locmonitor" long-name="Location Monitor" introduced="^3" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
-</component>
-<component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/agpslocationmgr/group" mrp="os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
-</component>
-<component name="networklocationmgr" long-name="Network Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/networklocationmgr/group" mrp="os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
-</component>
-<component name="locationcore" long-name="Location Core" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locationcore/group" mrp="os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
-</component>
-<component name="networkgateway" long-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 name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
-<component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
-</component>
-<component name="suplproxyprotocolmodule" long-name="SUPL Proxy Protocol Module" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
-</component>
-<component name="suplprotocolmodule" long-name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/networkprotocolmodules/suplprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
-</component>
-<component name="suplrrlpasn1" filter="sf_build" long-name="SUPL RRLP ASN1 Parser">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
-</component>
-<component name="suplrrlpprotocol" filter="sf_build" long-name="SUPL RRLP Protocol Module">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/group"/>
-</component>
-</collection>
-<collection name="lbsapitest" long-name="Location API Tests" level="application-interface"/>
-<collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
-<component name="lbs_metadata" long-name="Locating Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commsfw" level="services" long-name="Communications Framework" levels="server support framework process app-if">
-<collection name="commsprocess" long-name="Comms Process" level="process">
-<component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/commsfw/commsprocess/commsrootserverconfig/group" mrp="os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
-</component>
-</collection>
-<collection name="commsconfig" long-name="Comms Config" level="process">
-<component name="commsdatabase" long-name="Comms Database" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
-</component>
-<component name="commsdatabaseshim" long-name="Comms Database Shim" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/commsfw/commsconfig/commsdatabaseshim/group" mrp="os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
-</component>
-</collection>
-<collection name="datacommsserver" long-name="Data Comms Server" level="framework">
-<component name="esockserver" long-name="ESock Server" purpose="mandatory">
-<unit bldFile="os/commsfw/datacommsserver/esockserver/group" mrp="os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp" version="3"/>
-</component>
-<component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/group" mrp="os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
-</component>
-<component name="networkingdialogstub" long-name="Networking Dialog Stub" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/default" mrp="os/commsfw/datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
-</component>
-<component name="networkcontroller" long-name="Network Controller" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/datacommsserver/networkcontroller/group" mrp="os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
-</component>
-</collection>
-<collection name="serialserver" long-name="Serial Server" level="server">
-<component name="serialportcsy" long-name="Serial Port CSY" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/serialserver/serialportcsy" mrp="os/commsfw/serialserver/serialportcsy/ser-comms_serialportcsy.mrp"/>
-</component>
-<component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" purpose="development">
-<unit bldFile="os/commsfw/serialserver/packetloopbackcsy/group" mrp="os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
-</component>
-<component name="c32serialserver" long-name="C32 Serial Server" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/commsfw/serialserver/c32serialserver/group" mrp="os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
-</component>
-<component name="c32serialserverconfig" long-name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config">
-<unit bldFile="os/commsfw/serialserver/c32serialserverconfig" mrp="os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
-</component>
-<component name="c32serialserverdocs" long-name="C32 Serial Server Documentation" purpose="development" class="doc">
-<unit mrp="os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
-</component>
-</collection>
-<collection name="commsfwutils" long-name="Comms Framework Utilities" level="framework">
-<component name="commsbufs" long-name="Comms Buffers" introduced="^3" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwutils/commsbufs/group" mrp="os/commsfw/commsfwutils/commsbufs/group/comms-infras_commsbufs.mrp"/>
-</component>
-</collection>
-<collection name="commsfw_info" long-name="Comms Framework Info" level="app-if">
-<component name="commsinfrastructuredocs" long-name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
-<unit mrp="os/commsfw/commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
-</component>
-<component name="commsfw_metadata" long-name="Communications Framework Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/commsfw/commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
-</component>
-</collection>
-<collection name="commsfwsupport" long-name="Comms Framework Support" level="support">
-<component name="commselements" long-name="Comms Elements" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwsupport/commselements/group" mrp="os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
-</component>
-</collection>
-<collection name="commsinfrastructureapitest" long-name="Comms-Infras API Tests" level="app-if">
-<component name="commsinfrastructuresvs" long-name="Comms Infrastructure Verification Suite" introduced="^3" purpose="development">
-<unit mrp="os/commsfw/commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
-</component>
-</collection>
-<collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
-<component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
-</component>
-<component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" purpose="mandatory" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
-</component>
-<component name="commstools" long-name="Comms Tools" introduced="^3" purpose="development" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/commstools/group" mrp="os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
-</component>
-</collection>
-</block>
-<block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
-<component name="internetsockets" long-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>
-<collection name="tcpiputils" long-name="TCP/IP Utilities" level="plugin">
-<component name="dnd" long-name="DND" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/dnd/group" mrp="os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
-</component>
-<component name="dhcp" long-name="DHCP" introduced="8.0" purpose="optional">
-<unit bldFile="os/networkingsrv/tcpiputils/dhcp/group" mrp="os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
-</component>
-<component name="networkaddressandporttranslation" long-name="Network Address and Port Translation" introduced="^2" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
-</component>
-<component name="punycodeconv" long-name="Punycode Converter" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/punycodeconv/group" mrp="os/networkingsrv/tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
-</component>
-</collection>
-<collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
-<component name="nullagt" long-name="NULL AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/nullagt/group" mrp="os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
-</component>
-<component name="genericscprparameters" long-name="Generic SCPR Parameters" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/linklayercontrol/genericscprparameters/group" mrp="os/networkingsrv/linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
-</component>
-<component name="mbmsparameters" long-name="MBMS Parameters" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/mbmsparameters/group" mrp="os/networkingsrv/linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
-</component>
-<component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
-<unit bldFile="os/networkingsrv/linklayercontrol/networkinterfacemgr/group" mrp="os/networkingsrv/linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp" version="2"/>
-</component>
-</collection>
-<collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
-<component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
-</component>
-<component name="pppnif" long-name="PPP NIF" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/pppnif/group" mrp="os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp" version="2"/>
-</component>
-<component name="slipnif" long-name="SLIP NIF" purpose="development" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/slipnif/group" mrp="os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
-</component>
-<component name="tunnelnif" long-name="Tunnel NIF" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
-</component>
-</collection>
-<collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
-<component name="packetlogger" long-name="Packet Logger" introduced="8.1" purpose="development">
-<unit bldFile="os/networkingsrv/linklayerutils/packetlogger/group" mrp="os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
-</component>
-</collection>
-<collection name="networkcontrol" long-name="Network Control" level="plugin">
-<component name="qoslib" long-name="QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/qoslib/group" mrp="os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
-</component>
-<component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/pfqoslib/group" mrp="os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
-</component>
-<component name="qosfwprt" long-name="QoS Framework PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
-</component>
-<component name="qosipscpr" long-name="QoS IP SCPR" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosipscpr/group" mrp="os/networkingsrv/networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
-</component>
-<component name="ipnetworklayer" long-name="IP Network Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/ipnetworklayer/group" mrp="os/networkingsrv/networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
-</component>
-<component name="iptransportlayer" long-name="IP Transport Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/iptransportlayer/group" mrp="os/networkingsrv/networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
-</component>
-<component name="commsuserpromptmgr" long-name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkcontrol/commsuserpromptmgr/group" mrp="os/networkingsrv/networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
-</component>
-</collection>
-<collection name="networkprotocols" long-name="Network Protocols" level="plugin">
-<component name="ipeventnotifier" long-name="IP Event Notifier" introduced="8.1" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
-</component>
-<component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
-</component>
-<component name="iphook" long-name="IP Hook" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
-</component>
-<component name="mobileip" long-name="Mobile IP" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/mobileip/group" mrp="os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
-</component>
-<component name="dnsproxy" long-name="DNS Proxy" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/networkprotocols/dnsproxy/group" mrp="os/networkingsrv/networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
-</component>
-</collection>
-<collection name="networksecurity" long-name="Network Security" level="framework">
-<component name="tls" long-name="TLS" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tls/group" mrp="os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
-</component>
-<component name="tlsprovider" long-name="TLS Provider" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tlsprovider/group" mrp="os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
-</component>
-<component name="ipsec" long-name="IPsec" introduced="7.0" purpose="optional">
-<unit bldFile="os/networkingsrv/networksecurity/ipsec/group" mrp="os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
-</component>
-</collection>
-<collection name="networkingtestandutils" long-name="Networking Test and Utils" level="app-if">
-<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">
-<!-- production component: contains the IBY files -->
-<unit bldFile="os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
-</component>
-<component name="networkingdocs" long-name="Networking Documentation" purpose="development" class="doc">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
-</component>
-<component name="networkingsrv_metadata" long-name="Networking Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
-<component name="predictorcompression" long-name="Predictor Compression" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wlan" level="services" long-name="WLAN" levels="hw low mid high tools test">
-<collection name="wlan_plat" long-name="WLAN Platform Interfaces" level="test">
-<component name="wlan_dbif_api" long-name="WLAN DBIF API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_dbif_api/group"/>
-</component>
-<component name="wlan_hal_api" long-name="WLAN HAL API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hal_api/group"/>
-</component>
-<component name="wlan_management_api" long-name="WLAN Management API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_management_api/group"/>
-</component>
-<component name="wlan_device_settings_api" long-name="WLAN Device Settings API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_device_settings_api/group"/>
-</component>
-<component name="wlan_control_api" long-name="WLAN Control API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_control_api/group"/>
-</component>
-<component name="wlan_hw_initialization_data_api" long-name="WLAN Hardware Initialization Data API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hw_initialization_data_api/group"/>
-</component>
-<component name="wlan_power_save_plugin_api" long-name="WLAN Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_power_save_plugin_api/group"/>
-</component>
-<component name="wlan_info_api" long-name="WLAN Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_info_api/group"/>
-</component>
-<component name="wlan_agent_hotspot_plugin_api" long-name="WLAN Agent Hotspot Plug-in API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
-</component>
-<component name="wlan_osa_api" long-name="WLAN OSA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_osa_api/group"/>
-</component>
-<component name="wlan_spia_api" long-name="WLAN SPIA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_spia_api/group"/>
-</component>
-<component name="wlan_hpa_api" long-name="WLAN HPA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hpa_api/group"/>
-</component>
-<component name="wlan_eapol_plugin_api" long-name="WLAN EAPOL Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_eapol_plugin_api/group"/>
-</component>
-<component name="wlan_generic_plugin_api" long-name="WLAN Generic Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_generic_plugin_api/group"/>
-</component>
-<component name="wlan_aws_plugin_api" long-name="WLAN AWS Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_aws_plugin_api/group"/>
-</component>
-</collection>
-<collection name="wlan_pub" long-name="WLAN Public Interfaces" level="test">
-<component name="wlan_sdk_info_api" long-name="WLAN SDK Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_pub/wlan_sdk_info_api/group"/>
-</component>
-</collection>
-<collection name="wlan_bearer" long-name="WLAN Bearer" level="hw">
-<component name="wlanpsmplugin" filter="s60" long-name="WLAN PSM Plugin" plugin="Y">
-<unit bldFile="os/wlan/wlan_bearer/wlanpsmplugin/group"/>
-</component>
-<component name="wlanagent" filter="s60" long-name="WLAN Agent">
-<unit bldFile="os/wlan/wlan_bearer/wlanagent/group"/>
-</component>
-<component name="wlandbif_cd" filter="s60" long-name="WLAN CommsDat interface">
-<unit bldFile="os/wlan/wlan_bearer/wlandbif_cd/group"/>
-</component>
-<!-- should follow component directory rules for stuff in wlan_symbian/ and put in a single component or split up properly -->
-<component name="wlanengine" filter="s60" long-name="WLAN Engine">
-<unit bldFile="os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
-</component>
-<component name="wlanldd" filter="s60" long-name="WLAN LDD">
-<unit bldFile="os/wlan/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
-</component>
-<component name="wlannwif" filter="s60" long-name="WLAN Network Interface">
-<unit bldFile="os/wlan/wlan_bearer/wlannwif/group"/>
-</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="adaptation hw-if plugin framework server app-if">
-<collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
-<component name="basebandchanneladaptor" long-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 name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
-<component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
-</component>
-</collection>
-<collection name="fax" long-name="Fax" level="server">
-<component name="faxclientandserver" long-name="Fax Client and Server" purpose="optional">
-<unit bldFile="os/cellularsrv/fax/faxclientandserver/Group" mrp="os/cellularsrv/fax/faxclientandserver/Group/telephony_fax.mrp"/>
-</component>
-</collection>
-<collection name="smsprotocols" long-name="SMS Protocols" level="framework">
-<component name="smsstack" long-name="SMS Stack" introduced="6.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/cellularsrv/smsprotocols/smsstack/group" mrp="os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
-</component>
-</collection>
-<collection name="telephonyprotocols" long-name="Telephony Protocols" level="framework">
-<component name="csdagt" long-name="CSD AGT" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/csdagt/group" mrp="os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
-</component>
-<component name="psdagt" long-name="PSD AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/psdagt/group" mrp="os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
-</component>
-<component name="gprsumtsqosprt" long-name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
-</component>
-<component name="gprsumtsqosinterface" long-name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
-</component>
-<component name="qosextnapi" long-name="QoS Extn API" introduced="9.2" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
-</component>
-<component name="secondarypdpcontextumtsdriver" long-name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
-</component>
-<component name="qos3gppcpr" long-name="QoS 3GPP CPR" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
-</component>
-<component name="pdplayer" long-name="PDP Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/pdplayer/group" mrp="os/cellularsrv/telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
-</component>
-<component name="rawipnif" long-name="Raw IP NIF" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserver" long-name="Telephony Server" level="server">
-<component name="etelserverandcore" long-name="ETel Server and Core" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
-</component>
-<component name="etelmultimode" long-name="ETel Multimode" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelmultimode/group" mrp="os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
-</component>
-<component name="etelpacketdata" long-name="ETel Packet Data" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
-</component>
-<component name="etelsimtoolkit" long-name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
-<component name="common_tsy" long-name="Common TSY" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
-</component>
-<component name="licenseetsystub" long-name="Licensee TSY Stub" introduced="^2" purpose="development" filter="sf_build" plugin="Y">
-<unit mrp="os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="os/cellularsrv/telephonyserverplugins/licenseetsystub/group"/>
-</component>
-<component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
-</component>
-<component name="simtsy" long-name="SIM TSY" introduced="7.0" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
-</component>
-<component name="ctsydispatchlayer" long-name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
-</component>
-<component name="simatktsy" long-name="SIMATK TSY" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simatktsy/group" mrp="os/cellularsrv/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
-</component>
-</collection>
-<collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
-<component name="dial" long-name="Dial" deprecated="9.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyutils/dial/group" mrp="os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
-</component>
-<component name="telephonywatchers" long-name="Telephony Watchers" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
-</component>
-<component name="etel3rdpartyapi" long-name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrv_info" long-name="Cellular Baseband Services Info" level="app-if">
-<component name="telephonyconfidentialdocs" long-name="Telephony Confidential Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
-</component>
-<component name="telephonydocs" long-name="Telephony Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
-</component>
-<component name="cellularsrv_metadata" long-name="Cellular Baseband Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
-<component name="mocksy" long-name="MockSY" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if"/>
-</block>
-<block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
-<collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
-<component name="bluetooth_audio_adaptation_api" long-name="Bluetooth Audio Adaptation API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
-</component>
-<component name="bluetooth_power_management_api" long-name="Bluetooth Power Management API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_power_management_api/group"/>
-</component>
-<component name="at_command_handler_plugin_api" long-name="AT Command Handler Plugin API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/at_command_handler_plugin_api/group"/>
-</component>
-</collection>
-<collection name="bluetooth" long-name="Bluetooth Core" level="framework">
-<component name="btstack" long-name="Bluetooth Stack" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btstack" mrp="os/bt/bluetooth/btstack/bluetooth_stack.mrp"/>
-</component>
-<component name="btcomm" long-name="Bluetooth CSY" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetooth/btcomm" mrp="os/bt/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
-</component>
-<component name="btsdp" long-name="Bluetooth SDP" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btsdp" mrp="os/bt/bluetooth/btsdp/bluetooth_sdp.mrp"/>
-</component>
-<component name="btextnotifiers" long-name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btextnotifiers" mrp="os/bt/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
-</component>
-<component name="gavdp" long-name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/gavdp/group" mrp="os/bt/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
-</component>
-<component name="btlogger" long-name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btlogger/group" mrp="os/bt/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
-</component>
-<component name="btdocs" long-name="Bluetooth Documentation" purpose="development" class="doc">
-<unit mrp="os/bt/bluetooth/btdocs/bluetooth_documentation.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothmgmt" long-name="Bluetooth Management" level="plugin">
-<component name="btmgr" long-name="Bluetooth Manager" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btmgr" mrp="os/bt/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
-</component>
-<component name="btconfig" long-name="Bluetooth Config" purpose="optional" class="config">
-<unit bldFile="os/bt/bluetoothmgmt/btconfig" mrp="os/bt/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
-</component>
-<component name="btrom" long-name="Bluetooth ROM" introduced="9.1" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btrom" mrp="os/bt/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
-</component>
-<component name="bluetoothclientlib" long-name="Bluetooth Client Library" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/bluetoothclientlib" mrp="os/bt/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothcommsprofiles" long-name="Bluetooth Comms Profiles" level="app-if">
-<component name="btpan" long-name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetoothcommsprofiles/btpan/group" mrp="os/bt/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
-</component>
-</collection>
-<collection name="bthci" long-name="Host Controller Interface" level="server">
-<component name="bthci2" long-name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bthci/bthci2/group" mrp="os/bt/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
-</component>
-<component name="hciextensioninterface" long-name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bthci/hciextensioninterface" mrp="os/bt/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
-</component>
-<component name="hci2implementations" long-name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bthci/hci2implementations/group" mrp="os/bt/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
-</component>
-</collection>
-<collection name="irda" long-name="IrDA" level="plugin">
-<component name="irdastack" long-name="IrDA Stack" purpose="optional">
-<unit bldFile="os/bt/irda/irdastack/group" mrp="os/bt/irda/irdastack/group/infra-red_irda.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if"/>
-<collection name="atext" long-name="AT Extensions" level="server">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="atext_build" long-name="AT Extension Build" introduced="^3" purpose="optional" filter="s60">
-<unit bldFile="os/bt/atext/group"/>
-</component>
-</collection>
-<collection name="bt_info" long-name="Bluetooth Info" level="app-if">
-<component name="bt_metadata" long-name="Bluetooth Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/bt/bt_info/bt_metadata/bt_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
-<collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
-<!-- usbclientdrivers to be moved here from kernelhwsrv-->
-</collection>
-<collection name="usbmgmt" long-name="USB Management" level="server">
-<component name="usbmgr" long-name="USB Manager" purpose="optional">
-<unit bldFile="os/usb/usbmgmt/usbmgr/group" mrp="os/usb/usbmgmt/usbmgr/group/usb_manager.mrp" version="2"/>
-</component>
-<component name="usbclassandmgrdocs" long-name="USB Class and Manager Documentation" purpose="development" class="doc">
-<unit mrp="os/usb/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
-</component>
-</collection>
-<collection name="usb_info" long-name="USB Info" level="app-if">
-<component name="usb_metadata" long-name="USB Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/usb/usb_info/usb_metadata/usb_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="mm" level="services" long-name="Multimedia" levels="adaptation 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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-</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"/>
-</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"/>
-</component>
-<component name="aac_decoder_config_proxy_api" long-name="AAC Decoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/aac_decoder_config_proxy_api/group"/>
-</component>
-<component name="added_devsound_control_api" long-name="Added DevSound Control API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_api/group"/>
-</component>
-<component name="added_devsound_control_msg_hdlr_api" long-name="Added DevSound Control Msg Hdlr API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_msg_hdlr_api/group"/>
-</component>
-<component name="added_devsound_control_proxy_api" long-name="Added DevSound Control Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_proxy_api/group"/>
-</component>
-<component name="audio_effects_msg_hdlr_api" long-name="Audio Effects Message Handler API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_msg_hdlr_api/group"/>
-</component>
-<component name="audio_effects_proxy_api" long-name="Audio Effects Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_proxy_api/group"/>
-</component>
-<component name="audio_policy_header_api" long-name="Audio Policy Header API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="audio_routing_proxy_api" long-name="Audio Routing Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_routing_proxy_api/group"/>
-</component>
-<component name="custom_interface_builder_api" long-name="Custom Interface Builder API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_builder_api/group"/>
-</component>
-<component name="custom_interface_message_handler_factory_api" long-name="Custom Interface Message Handler Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_message_handler_factory_api/group"/>
-</component>
-<component name="custom_interface_proxy_factory_api" long-name="Custom Interface Proxy Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_proxy_factory_api/group"/>
-</component>
-<component name="custom_interface_utility_api" long-name="Custom Interface Utility API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_utility_api/group"/>
-</component>
-<component name="devsound_adaptation_api" long-name="DevSound Adaptation API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/devsound_adaptation_api/group"/>
-</component>
-<component name="display_posting_api" long-name="Display Posting API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="eaac_plus_decoder_interface_proxy_api" long-name="eAAC Plus Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="error_concealment_interface_proxy_api" long-name="Error Concealment Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
-</component>
-<component name="fm_radio_adaptation_api" long-name="FM Radio Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_decoder_interface_proxy_api" long-name="G711 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_encoder_interface_proxy_api" long-name="G711 Encoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_decoder_interface_proxy_api" long-name="G729 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_encoder_interface_msg_hdlr_api" long-name="G729 Encoder Interface Message Handler API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</component>
-<component name="ilbc_decoder_interface_proxy_api" long-name="Ilbc Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ilbc_encoder_interface_proxy_api" long-name="Ilbc Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="mdf_plugin_uids" long-name="MDF Plug-in UIDs" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/mdf_plugin_uids/group"/>
-</component>
-<component name="multimedia_fourcc_definitions_api" long-name="Multimedia FourCC Definitions API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/multimedia_fourcc_definitions_api/group"/>
-</component>
-<component name="nokia_audio_policy_header_api" long-name="Nokia Audio Policy Header API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/nokia_audio_policy_header_api/group"/>
-</component>
-<component name="nokia_multimedia_fourcc_definitions_api" long-name="Nokia Multimedia Fourcc Definitions API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ra8_decoder_interface_proxy_api" long-name="RA8 Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
-</component>
-<component name="rds_adaptation_api" long-name="RDS Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="restricted_audio_output_proxy_api" long-name="Restricted Audio Output Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="sbc_encoder_interface_proxy_api" long-name="SBC Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/sbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="secure_output_mdf_custom_interface" long-name="Secure Output MDF Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="speech_encoder_config_proxy_api" long-name="Speech Encoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/speech_encoder_config_proxy_api/group"/>
-</component>
-<component name="telephony_audio_routing_client_api" long-name="Telephony Audio Routing Client API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_client_api/group"/>
-</component>
-<component name="telephony_audio_routing_manager_api" long-name="Telephony Audio Routing Manager API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_manager_api/group"/>
-</component>
-<component name="video_buffer_management_mdf_custom_interface" long-name="Video Buffer Management MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_buffer_management_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_rotation_mdf_custom_interface" long-name="Video Decoder Rotation MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_scaling_mdf_custom_interface" long-name="Video Decoder Scaling MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
-</component>
-<component name="video_reclaim_extbuffers_ci" long-name="Video Reclaim Extbuffers Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_reclaim_extbuffers_ci/group"/>
-</component>
-<component name="video_window_control_custom_interface" long-name="Video Window Control Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="wma_decoder_interface_proxy_api" long-name="WMA Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/wma_decoder_interface_proxy_api/group"/>
-</component>
-<component name="eaacplusutil_api" long-name="EAac Plus Util API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/eaacplusutil_api/group"/>
-</component>
-<component name="frametable_api" long-name="Frametable API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/frametable_api/group"/>
-</component>
-</collection>
-<collection name="devsoundextensions" long-name="Devsound Extensions" level="device-fw">
-<component name="drmaudioplayer" filter="s60" long-name="DRM Audio Player">
-<unit bldFile="os/mm/devsoundextensions/drmaudioplayer/group"/>
-</component>
-<component name="mmextfw" filter="s60" long-name="Multimedia Extension Framework">
-<unit bldFile="os/mm/devsoundextensions/mmextfw/group"/>
-</component>
-<component name="audiorouting" filter="s60" long-name="Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/audiorouting/group"/>
-</component>
-<component name="effects" filter="s60" long-name="Effects">
-<unit bldFile="os/mm/devsoundextensions/effects/group"/>
-</component>
-<component name="effectspresets" filter="s60" long-name="Effects Presets">
-<unit bldFile="os/mm/devsoundextensions/effectspresets/group"/>
-</component>
-<component name="effectspresets_utils" filter="s60" long-name="Effects Presets Utils">
-<!-- need to #include the lot from a single bld.inf
- Also move to a standard component location, not under effectspresets -->
-<unit bldFile="os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
-<unit bldFile="os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
-<unit bldFile="os/mm/devsoundextensions/effectspresets/StereoWideningUtility/group" filter="!dfs_build"/>
-</component>
-<component name="telephonyaudiorouting" filter="s60" long-name="Telephony Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/group"/>
-</component>
-<component name="mmfcustominterfaces" filter="s60" long-name="MMF Custom Interfaces">
-<unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/group"/>
-</component>
-<component name="addeddevsoundcontrol" filter="s60" long-name="Added DevSound Control">
-<unit bldFile="os/mm/devsoundextensions/addeddevsoundcontrol/group"/>
-</component>
-<component name="globalaudiosettings" filter="s60" long-name="Global Audio Settings">
-<unit bldFile="os/mm/devsoundextensions/globalaudiosettings/group"/>
-</component>
-<component name="restrictedaudiooutput" filter="s60" long-name="Restricted Audio Output">
-<unit bldFile="os/mm/devsoundextensions/restrictedaudiooutput/group"/>
-</component>
-<component name="ciextnfactoryplugins" filter="s60" long-name="Custom Interface Extension Factory Plugins" plugin="Y">
-<unit bldFile="os/mm/devsoundextensions/ciextnfactoryplugins/group"/>
-</component>
-</collection>
-<collection name="mdfdevvideoextensions" long-name="MDF Dev Video Extensions" level="device-fw">
-<component name="nga_mdf_postprocessor" long-name="NGA MDF Postprocessor" filter="s60">
-<unit bldFile="os/mm/mdfdevvideoextensions/nga_mdf_postprocessor/group"/>
-</component>
-</collection>
-<collection name="audio" long-name="Audio Codecs" level="middleware">
-<component name="arm_cmmf_codecs" filter="s60" long-name="ARM CMMF Codecs" plugin="Y">
-<unit bldFile="os/mm/audio/arm_cmmf_codecs/group"/>
-</component>
-</collection>
-<collection name="video" long-name="Video Codecs" level="middleware">
-<!-- empty -->
-</collection>
-<collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
-<component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/imagingandcamerafws/imagingfws/group" mrp="os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
-</component>
-<component name="camerafw" long-name="Camera Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/imagingandcamerafws/camerafw/group" mrp="os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
-</component>
-</collection>
-<collection name="mmlibs" long-name="Multimedia Libraries" level="middleware">
-<component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmutilitylib/group" mrp="os/mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
-</component>
-<component name="mmfw" long-name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmfw/group" mrp="os/mm/mmlibs/mmfw/group/multimedia_mmf.mrp"/>
-</component>
-</collection>
-<collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
-<component name="imagingplugins" long-name="Imaging Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/imagingplugins/group" mrp="os/mm/mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
-</component>
-<component name="cameraplugins" long-name="Camera Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/cameraplugins/group" mrp="os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
-</component>
-<component name="lib3gp" long-name="3GP Library" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/mmplugins/lib3gp/group" mrp="os/mm/mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
-</component>
-<component name="mmfwplugins" long-name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/mmfwplugins/group" mrp="os/mm/mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
-</component>
-</collection>
-<collection name="mm_info" long-name="Multimedia Info" level="app-if">
-<component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc">
-<unit mrp="os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
-</component>
-<component name="mm_metadata" long-name="Multimedia Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
-<component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="^2" purpose="development">
-<unit bldFile="os/mm/mmresourcemgmt/mmresctrl/group" mrp="os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
-</component>
-</collection>
-<collection name="mmdevicefw" long-name="Multimedia Device Framework" level="device-fw">
-<component name="mdf" long-name="Media Device Framework" introduced="9.2" purpose="mandatory">
-<unit bldFile="os/mm/mmdevicefw/mdf/group" mrp="os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
-</component>
-<component name="speechrecogsupport" long-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 name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
-<component name="videorenderer" long-name="Video Renderer" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/mmswadaptation/videorenderer/group" mrp="os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
-</component>
-</collection>
-<collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw"/>
-<collection name="omxil" long-name="OpenMAX IL" level="hw-if">
-<component name="omxilapi" long-name="OpenMAX IL API" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilapi/group" mrp="os/mm/omxil/omxilapi/group/multimedia_omx_il_api.mrp" version="1"/>
-</component>
-<component name="omxilcore" long-name="OpenMAX IL Core" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcore/group" mrp="os/mm/omxil/omxilcore/group/multimedia_omx_il_core.mrp" version="1"/>
-</component>
-<component name="omxilcomponentcommon" long-name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcomponentcommon/group" mrp="os/mm/omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp" version="1"/>
-</component>
-<component name="omxilrefcomps" long-name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilrefcomps/ref_components/group" mrp="os/mm/omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp" version="1"/>
-</component>
-<component name="mmilapi" long-name="Multimedia Integration Layer API" introduced="^3" purpose="development">
-<unit bldFile="os/mm/omxil/mmilapi/group" mrp="os/mm/omxil/mmilapi/group/multimedia_il_api.mrp"/>
-</component>
-</collection>
-<collection name="devsound" long-name="Sound Device" level="devices">
-<component name="devsoundapi" long-name="DevSound API" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/devsound/devsoundapi/group" mrp="os/mm/devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
-</component>
-<component name="a3fdevsound" long-name="A3F DevSound" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3fdevsound/group" mrp="os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
-</component>
-<component name="a3facf" long-name="A3F Audio Component Framework" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3facf/group" mrp="os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
-</component>
-<component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/devsound/devsoundpluginsupport/group" mrp="os/mm/devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
-</component>
-<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">
-<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">
-<unit bldFile="os/mm/devsound/a3ftrace/group" mrp="os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
-</component>
-<component name="a3fsrvstart" long-name="A3F Server Start" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
-</component>
-</collection>
-<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
-<component name="devsoundhwdeviceapi" long-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 name="a3facl" long-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 name="a3fdevsoundcustomisation" long-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"/>
-</component>
-<component name="refacladapt" long-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"/>
-</component>
-<component name="videohai" long-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 name="dvbhreceiverhai" long-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>
-<collection name="mmapitest" long-name="Multimedia API Tests" level="app-if">
-<component name="mmsvs" long-name="Multimedia Verification Suite" introduced="^2" purpose="development">
-<unit mrp="os/mm/mmapitest/mmsvs/group/mmsvs.mrp"/>
-</component>
-</collection>
-</block>
-<block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
-<collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
-<component name="exif_api" long-name="Exif API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagingext_plat" long-name="Imaging Extensions Platform Interfaces" level="app-if">
-<component name="jpeg2000_icl_plugin_api" long-name="JPEG2000 ICL plugin API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/jpeg2000_icl_plugin_api/group"/>
-</component>
-<component name="extended_icl_jpeg_api" long-name="Extended ICL Jpeg API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
-</component>
-<component name="h324_annex_k_custom_api" long-name="H324 Annex K Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/h324_annex_k_custom_api/group"/>
-</component>
-<component name="ecam_orientation_custom_api" long-name="ECam Orientation Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_orientation_custom_api/group"/>
-</component>
-<component name="ecam_ui_orientation_override_custom_api" long-name="ECam UI Orientation Override Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
-</component>
-<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>
-</collection>
-<collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
-<component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
-<unit bldFile="os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
-</component>
-<component name="imageadaptationextensions_build" filter="s60" long-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"/>
-</component>
-</collection>
-<collection name="imagingmodules" long-name="Imaging Modules" level="hw-if">
-<component name="exiflib" filter="s60" long-name="Exif Library">
-<unit bldFile="os/imagingext/imagingmodules/exiflib/group"/>
-</component>
-<component name="jp2kcodec" filter="s60" long-name="JPEG2000 Decoder Plugin" plugin="Y">
-<unit bldFile="os/imagingext/imagingmodules/jp2kcodec/group"/>
-</component>
-</collection>
-</block>
-<block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
-<component name="vgi" filter="s60" long-name="VGI">
-<unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
-</component>
-</collection>
-<collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adaptations">
-<component name="m3gcore11" filter="s60" long-name="M3G Core 1.1">
-<unit bldFile="os/graphics/m3g/m3gcore11/group"/>
-</component>
-</collection>
-<collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines">
-<component name="graphicsresource" long-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 name="graphicsresourceadaptation" long-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"/>
-</component>
-</collection>
-<collection name="graphicsutils" long-name="Graphics Utils" level="engines">
-<component name="commongraphicsheaders" long-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 name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
-<!-- displayldd to be moved here -->
-<component name="surfacemgr" long-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 name="graphicscomposition" long-name="Graphics Composition" level="engines">
-<component name="openwfcinterface" long-name="OpenWF Composition Interface" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfcinterface/group" mrp="os/graphics/graphicscomposition/openwfcinterface/group/graphics_openwfcinterface.mrp"/>
-</component>
-<component name="openwfcompositionengine" long-name="OpenWF Composition Engine" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/graphicscomposition/openwfcompositionengine/group" mrp="os/graphics/graphicscomposition/openwfcompositionengine/group/graphics_openwfcompositionengine.mrp"/>
-</component>
-<component name="openwfsupport" long-name="OpenWF Support" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfsupport/group" mrp="os/graphics/graphicscomposition/openwfsupport/group/graphics_openwfsupport.mrp"/>
-</component>
-<component name="surfaceupdate" long-name="Surface Update" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/surfaceupdate/group" mrp="os/graphics/graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
-</component>
-</collection>
-<collection name="graphicstest" long-name="Graphics Test" level="app-if">
-<component name="uibench" long-name="UI Bench" introduced="9.2" purpose="development">
-<unit bldFile="os/graphics/graphicstest/uibench/group" mrp="os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
-</component>
-</collection>
-<collection name="graphics_plat" long-name="Graphics Platform Interfaces" level="app-if">
-<component name="m3g_core_api" filter="sf_build" long-name="M3G Core API" class="api">
-<unit bldFile="os/graphics/graphics_plat/m3g_core_api/group"/>
-</component>
-</collection>
-<collection name="graphics_info" long-name="Graphics Info" level="app-if">
-<component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc">
-<unit mrp="os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
-</component>
-<component name="graphics_metadata" long-name="Graphics Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
-</component>
-</collection>
-<collection name="windowing" long-name="Windowing" level="app-if">
-<component name="windowserver" long-name="Window Server" purpose="mandatory">
-<unit bldFile="os/graphics/windowing/windowserver/group" mrp="os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
-</component>
-<component name="windowserverplugins" long-name="Window Server Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/windowing/windowserverplugins/group" mrp="os/graphics/windowing/windowserverplugins/group/graphics_wserv_std_plugins.mrp"/>
-</component>
-</collection>
-<collection name="printingservices" long-name="Printing Services" level="app-if">
-<component name="printerdriversupport" long-name="Printer Driver Support" purpose="optional">
-<unit bldFile="os/graphics/printingservices/printerdriversupport/group" mrp="os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
-</component>
-<component name="printerdrivers" long-name="Printer Drivers" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/printingservices/printerdrivers/group" mrp="os/graphics/printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
-</component>
-</collection>
-<collection name="fbs" long-name="Font and Bitmap Server" level="device-interface">
-<component name="fontandbitmapserver" long-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 name="opengles" long-name="OpenGLES" level="internal-adaptations">
-<component name="openglesinterface" long-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 name="opengles_stub" filter="sf_build" long-name="OpenGL ES Stub" purpose="optional" introduced="^2">
-<unit bldFile="os/graphics/opengles/openglesinterface/group/opengles_stub"/>
-</component>
-</collection>
-<collection name="openvg" long-name="OpenVG" level="internal-adaptations">
-<component name="openvginterface" long-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 name="openvg11" filter="s60" long-name="OpenVG 1.1">
-<!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
-<unit bldFile="os/graphics/openvg/openvginterface/group/openvg11"/>
-</component>
-<component name="sfopenvg" filter="sf_build" long-name="Khronos OpenVG Reference Implementation" introduced="^2" purpose="optional">
-<unit bldFile="os/graphics/openvg/openvgrefimplementation/sfopenvg/group"/>
-</component>
-</collection>
-<collection name="egl" long-name="EGL" level="internal-adaptations">
-<component name="eglinterface" long-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 name="eglswitch" long-name="EGL Switch" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglswitch/group" mrp="os/graphics/egl/eglswitch/group/graphics_eglswitch.mrp"/>
-</component>
-<component name="eglrefimpl" long-name="EGL Reference Implementation" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglrefimpl/group" mrp="os/graphics/egl/eglrefimpl/group/graphics_eglrefimpl.mrp"/>
-</component>
-<component name="egltest" long-name="EGL Tests" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/egl/egltest/group" mrp="os/graphics/egl/egltest/group/graphics_egltest.mrp"/>
-</component>
-</collection>
-<collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
-<component name="gdi" long-name="GDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/gdi/group" mrp="os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
-</component>
-<component name="bitgdi" long-name="BitGDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
-</component>
-<component name="colourpalette" long-name="Colour Palette" introduced="7.0s" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
-</component>
-<component name="screendriver" long-name="Screen Driver" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/graphicsdeviceinterface/screendriver/group" mrp="os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
-</component>
-<component name="directgdi" long-name="DirectGDI" introduced="^3" deprecated="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/directgdi/group" mrp="os/graphics/graphicsdeviceinterface/directgdi/group/graphics_directgdi.mrp"/>
-</component>
-<component name="directgdiinterface" long-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 name="directgdiadaptation" long-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"/>
-</component>
-</collection>
-<collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
-<component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/gdi_tools/group" mrp="os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
-</component>
-</collection>
-<collection name="graphicsapitest" long-name="Graphics API Tests" level="app-if"/>
-</block>
-<block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
-<collection name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" level="text">
-<component name="findutil_api" long-name="Find Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/findutil_api/group"/>
-</component>
-<component name="japanese_language_utilities_api" long-name="Japanese Language Utilities API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
-</component>
-<component name="sortutil_api" long-name="Sorting Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/sortutil_api/group"/>
-</component>
-</collection>
-<collection name="textandloc_pub" long-name="Text and Localisation Public Interfaces" level="text">
-<component name="directory_localizer_api" long-name="Directory Localizer API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_pub/directory_localizer_api/group"/>
-</component>
-</collection>
-<collection name="charconvfw" long-name="Character Conversion" level="encoding">
-<component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional">
-<unit bldFile="os/textandloc/charconvfw/charconv_fw/group" mrp="os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
-</component>
-<component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/charconvplugins/group" mrp="os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
-</component>
-<component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/fatfilenameconversionplugins/group" mrp="os/textandloc/charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
-</component>
-</collection>
-<collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
-<component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/textshaperplugin/group" mrp="os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
-</component>
-<component name="fontstore" long-name="Font Store" purpose="mandatory">
-<unit bldFile="os/textandloc/fontservices/fontstore/group" mrp="os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
-</component>
-<component name="textrendering" long-name="Text Rendering" purpose="mandatory" class="placeholder">
-<!-- placeholder for text code from GDI -->
-</component>
-<component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/freetypefontrasteriser/group" mrp="os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
-</component>
-<component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional">
-<unit bldFile="os/textandloc/fontservices/referencefonts/group" mrp="os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
-</component>
-</collection>
-<collection name="textlayout" long-name="Text Layout" level="text">
-<component name="texthandling" long-name="Text Handling" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/texthandling/group" mrp="os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
-</component>
-<component name="textformatting" long-name="Text Formatting" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/textformatting/group" mrp="os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
-</component>
-</collection>
-<collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
-<!-- components in this collection need to be moved to the right collection.
- Either move into the units' directories, or create a new textandlocutils directory -->
-<component name="numbergrouping" filter="s60" long-name="Number Grouping">
-<unit bldFile="os/textandloc/charconvfw/numbergrouping/group"/>
-</component>
-<component name="jplangutil" filter="s60" long-name="Japanese Language Utilities">
-<unit bldFile="os/textandloc/charconvfw/jplangutil/group"/>
-</component>
-<component name="sortutil" filter="s60" long-name="Sorting Utility">
-<unit bldFile="os/textandloc/charconvfw/sortutil/group"/>
-</component>
-<component name="inlinetext" filter="s60" long-name="Inline Text">
-<unit bldFile="os/textandloc/charconvfw/inlinetext/group"/>
-</component>
-<component name="nearestlangutil" long-name="Nearest Language Util" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-<component name="numberformatting" long-name="Number Formatting" introduced="7.0s" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/numberformatting/group" mrp="os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
-</component>
-</collection>
-<collection name="localesupport" long-name="Locale Support" level="util">
-<component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/localisation/localesupport" mrp="os/textandloc/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
-</component>
-<component name="initlocale" long-name="Initialise Locale" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-</collection>
-<collection name="textandloctools" long-name="Text and Localisation Tools" level="tools">
-<component name="fontcompiler" long-name="Font Compiler" purpose="development" class="placeholder PC">
-<!-- placeholder for split from GDI Tools -->
-</component>
-<component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/bitmapfonttools/group" mrp="os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
-</component>
-</collection>
-<collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
-<component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
-<collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
-<component name="xmlsrv_plat_build" long-name="XML Services Platform Interface Build" filter="s60" class="api">
-<!-- need to fix the configuration used here.
- Either destribute to other components or use the new feature flags confguration mechanisms.
- Remove this component and uncomment the other units when fixed-->
-<unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
-</component>
-<component name="xml_encryption_api" long-name="XML Encryption API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/> -->
-</component>
-<component name="xml_signature_api" long-name="XML Signature API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_signature_api/group"/> -->
-</component>
-<component name="xml_security_engine_utils_api" long-name="XML Security Engine Utils API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/> -->
-</component>
-</collection>
-<collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
-<component name="xmlseccertman" filter="s60" long-name="XML Security Certificate Manager">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
-</component>
-<component name="xmlsec" filter="s60" long-name="XML Security">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsec/group"/>
-</component>
-<component name="xmlseccrypto" filter="s60" long-name="XML Security Crypto">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccrypto/group"/>
-</component>
-<component name="xmlsecwrapper" filter="s60" long-name="XML Security Wrapper">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsecwrapper/group"/>
-</component>
-</collection>
-<collection name="xml" long-name="XML" level="generic">
-<component name="xmlfw" long-name="XML Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmlfw/group" mrp="os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
-</component>
-<component name="libxml2libs" long-name="Libxml2 Libraries" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/libxml2libs/group" mrp="os/xmlsrv/xml/libxml2libs/group/syslibs_libxml2.mrp"/>
-</component>
-<component name="legacyminidomparser" long-name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/legacyminidomparser/GROUP" mrp="os/xmlsrv/xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp"/>
-</component>
-<component name="xmldomandxpath" long-name="XML DOM and XPath" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmldomandxpath/group" mrp="os/xmlsrv/xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
-</component>
-<component name="xmlexpatparser" long-name="XML Expat Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmlexpatparser/group" mrp="os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
-</component>
-<component name="xmllibxml2parser" long-name="XML Libxml2 Parser" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmllibxml2parser/group" mrp="os/xmlsrv/xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
-</component>
-<component name="wbxmlparser" long-name="WBXML Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/wbxmlparser/group" mrp="os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
-</component>
-</collection>
-<collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
-<component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="deviceplatformrelease" level="services" long-name="Device Platform Release" levels="bld mid top">
-<collection name="s60extras" long-name="S60 Extras" level="mid">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="s60extras_build" filter="s60" long-name="S60 Extras Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/S60Extras/group"/>
-</component>
-</collection>
-<collection name="locfiles" long-name="Locale Files" level="mid">
-<component name="locfiles_build" filter="s60" long-name="S60 Locale Files Build" purpose="development" class="config">
-<!-- need to move component down a directory -->
-<unit bldFile="os/deviceplatformrelease/locfiles/group"/>
-</component>
-<component name="locfiles_set1" long-name="Locale Files Set 1" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set1"/>
-</component>
-<component name="locfiles_set2" long-name="Locale Files Set 2" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set2"/>
-</component>
-<component name="locfiles_set3" long-name="Locale Files Set 3" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set3"/>
-</component>
-<component name="locfiles_set4" long-name="Locale Files Set 4" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set4"/>
-</component>
-<component name="locfiles_set5" long-name="Locale Files Set 5" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set5"/>
-</component>
-<component name="locfiles_set6" long-name="Locale Files Set 6" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set6"/>
-</component>
-<!-- is the a problem with SF builds with the following? -->
-<component name="locfiles_set7" long-name="Locale Files Set 7" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set7"/>
-</component>
-<component name="locfiles_set8" long-name="Locale Files Set 8" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set8"/>
-</component>
-<component name="locfiles_set9" long-name="Locale Files Set 9" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set9"/>
-</component>
-<component name="locfiles_set10" long-name="Locale Files Set 10" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set10"/>
-</component>
-<component name="locfiles_set11" long-name="Locale Files Set 11" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set11"/>
-</component>
-<component name="locfiles_set12" long-name="Locale Files Set 12" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set12"/>
-</component>
-<component name="locfiles_set13" long-name="Locale Files Set 13" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set13"/>
-</component>
-<component name="locfiles_set14" long-name="Locale Files Set 14" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set14"/>
-</component>
-<component name="locfiles_set15" long-name="Locale Files Set 15" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set15"/>
-</component>
-<component name="locfiles_set16" long-name="Locale Files Set 16" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set16"/>
-</component>
-</collection>
-<collection name="version" long-name="Version" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="version_build" filter="s60" long-name="Version Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/Version/group"/>
-</component>
-</collection>
-<collection name="helps_loc2" long-name="Helps Locale 2" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helps_loc2_build" long-name="Helps Locale 2 Build" filter="s60">
-<unit bldFile="os/deviceplatformrelease/helps_loc2/group"/>
-</component>
-</collection>
-<collection name="sf_config" long-name="SF Config" level="mid">
-<component name="config" filter="s60" long-name="Config" purpose="development" class="config"/>
-<component name="cenrep" filter="sf_build" long-name="ConE Central Repository Config" purpose="development" class="config">
-<!-- will shoudl give the id/path something more unique than cenrep -->
-<unit bldFile="os/deviceplatformrelease/sf_config/cenrep/group"/>
-</component>
-</collection>
-<!-- should be located locally in buildplatforms/group
- <collection id="s60bld" name="S60 Build">
- <component id="buildplatforms" filter="s60" name="Build Platforms">
- <unit bldFile="/tools/buildplatforms/group"/>
- </component>
- </collection>-->
-<collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
-<component name="cedarutils" long-name="Cedar Utils" purpose="development">
-<unit mrp="os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
-</component>
-<component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt" purpose="development" class="config">
-<unit mrp="os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
-</component>
-<component name="foundation_s60_packages" long-name="Foundation S60 Packages" introduced="^3" deprecated="^3" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/symbianosbld/foundation_s60_packages/foundation_s60_packages.mrp"/>
-</component>
-</collection>
-<collection name="foundation_system" long-name="Foundation System" level="top">
-<component name="system_model" long-name="System Model" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
-</component>
-</collection>
-<collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
-<component name="deviceplatformrelease_metadata" long-name="Device Platform Release Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="osrndtools" level="services" long-name="OS R&D tools" levels="fw trace">
-<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"/>
-</component>
-<component name="testinterface" filter="s60" long-name="Test Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/testinterface/group"/>
-</component>
-<component name="testserver" filter="s60" long-name="Test Server" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserver/group"/>
-</component>
-<component name="testengine" filter="s60" long-name="Test Engine" purpose="development">
-<unit bldFile="os/osrndtools/stif/testengine/group"/>
-</component>
-<component name="testserverstarter" filter="s60" long-name="Test Server Starter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserverstarter/group"/>
-</component>
-<component name="stiftfwif" filter="s60" long-name="STIF Test Framework Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/stiftfwif/group"/>
-</component>
-<component name="consoleui" filter="s60" long-name="Console UI" purpose="development">
-<unit bldFile="os/osrndtools/stif/consoleui/group"/>
-</component>
-<component name="testcombiner" filter="s60" long-name="Test Combiner" purpose="development">
-<unit bldFile="os/osrndtools/stif/testcombiner/group"/>
-</component>
-<component name="demomodule" filter="s60" long-name="Demo Module" purpose="development">
-<unit bldFile="os/osrndtools/stif/demomodule/group"/>
-</component>
-<component name="atslogger" filter="s60" long-name="ATS Logger" purpose="development">
-<unit bldFile="os/osrndtools/stif/atslogger/group"/>
-</component>
-<component name="atsinterface" filter="s60" long-name="ATS Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/atsinterface/group"/>
-</component>
-<component name="testscripter" filter="s60" long-name="Test Scripter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testscripter/group"/>
-</component>
-<component name="suevent" filter="s60" long-name="SU Event" purpose="development">
-<unit bldFile="os/osrndtools/stif/suevent/group"/>
-</component>
-<component name="stifkerneltestclassbase" filter="s60" long-name="STIF Kernel Test Class Base" purpose="development">
-<!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
-<!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
-</component>
-<component name="stif_build" filter="s60" long-name="STIF Build" purpose="development">
-<!-- move exports into self-contained component. Remove this when configuration is in place-->
-<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">
-<unit bldFile="os/osrndtools/memspy/memspy_plat/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/engine/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/console/group"/>
-</component>
-<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>
-</collection>
-<collection name="hti" long-name="Harmonized Test Interface" level="trace">
-<component name="hti_plat" filter="s60" long-name="HTI Platform Interfaces" purpose="development" class="api">
-<unit bldFile="os/osrndtools/hti/hti_plat/group"/>
-</component>
-<component name="hticfg" filter="s60" long-name="HTI Config" purpose="development">
-<unit bldFile="os/osrndtools/hti/hticfg/group"/>
-</component>
-<component name="htiautostart" filter="s60" long-name="HTI Autostart" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiautostart/group"/>
-</component>
-<component name="htiframework" filter="s60" long-name="HTI Framework" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiframework/group"/>
-</component>
-<component name="hticommplugins" filter="s60" long-name="HTI Communication Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
-</component>
-<component name="htiserviceplugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
-</component>
-<component name="htifilehlp" filter="s60" long-name="HTI File Help" purpose="development">
-<unit bldFile="os/osrndtools/hti/htifilehlp/group"/>
-</component>
-<component name="htiwatchdog" filter="s60" long-name="HTI Watchdog" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiwatchdog/group"/>
-</component>
-<component name="hti_build" filter="s60" long-name="HTI Build" purpose="development">
-<!-- move exports into self-contained component.-->
-<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">
-<block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
-<collection name="appsupport_pub" long-name="Generic Application Support Public Interfaces" level="specific">
-<component name="flash_viewer_framework_api" long-name="Flash Viewer Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
-</component>
-<component name="network_status_api" long-name="Network Status API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/network_status_api/group"/>
-</component>
-</collection>
-<collection name="appsupport_plat" long-name="Generic Application Support Platform Interfaces" level="specific">
-<component name="action_plugin_api" long-name="Action Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/action_plugin_api/group"/>
-</component>
-<component name="application_orientation_api" long-name="Application Orientation API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/application_orientation_api/group"/>
-</component>
-<component name="context_access_api" long-name="Context Access API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_access_api/group"/>
-</component>
-<component name="context_framework_services_api" long-name="Context Framework Services API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_services_api/group"/>
-</component>
-<component name="context_framework_client_api" long-name="Context Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_client_api/group"/>
-</component>
-<component name="context_framework_listener_api" long-name="Context Framework Listener API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_listener_api/group"/>
-</component>
-<component name="context_framework_version_api" long-name="Context Framework Version API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_version_api/group"/>
-</component>
-<component name="context_source_plugin_api" long-name="Context Source Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_plugin_api/group"/>
-</component>
-<component name="context_source_settings_manager_api" long-name="Context Source Settings Manager API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_settings_manager_api/group"/>
-</component>
-<component name="context_subscription_api" long-name="Context Subscription API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_subscription_api/group"/>
-</component>
-<component name="key_event_framework_api" long-name="Key Event Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_api/group"/>
-</component>
-<component name="key_event_framework_mapper_api" long-name="Key Event Framework Mapper API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_mapper_api/group"/>
-</component>
-<component name="media_keys_definition_api" long-name="Media Keys Definition API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/media_keys_definition_api/group"/>
-</component>
-<component name="ood_threshold_api" long-name="OOD Threshold API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/ood_threshold_api/group"/>
-</component>
-<component name="oom_monitor_api" long-name="OOM Monitor API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_api/group"/>
-</component>
-<component name="oom_monitor_plugin_api" long-name="OOM Monitor Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_plugin_api/group"/>
-</component>
-<component name="operation_provider_api" long-name="Operation Provider API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/operation_provider_api/group"/>
-</component>
-<component name="phonecmdhandler_api" long-name="Phone Command Handler API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/phonecmdhandler_api/group"/>
-</component>
-<component name="restore_factory_settings_api" long-name="Restore Factory Settings API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_api/group"/>
-</component>
-<component name="restore_factory_settings_plugin_api" long-name="Restore Factory Settings Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_plugin_api/group"/>
-</component>
-<component name="secondary_display_accfw_api" long-name="Secondary Display Accessory Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_accfw_api/group"/>
-</component>
-<component name="secondary_display_startup_api" long-name="Secondary Display Startup API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_startup_api/group"/>
-</component>
-<component name="secondary_display_sysap_api" long-name="Secondary Display System Application API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_sysap_api/group"/>
-</component>
-<component name="secondary_display_system_state_api" long-name="Secondary Display System State API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_system_state_api/group"/>
-</component>
-<component name="sensor_user_setting_api" long-name="Sensor User Setting API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/sensor_user_setting_api/group"/>
-</component>
-<component name="startup_configuration_api" long-name="Startup Configuration API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/startup_configuration_api/group"/>
-</component>
-<component name="system_application_key_handler_plugin_api" long-name="System Application Key Handler Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_key_handler_plugin_api/group"/>
-</component>
-<component name="system_application_light_control_plugin_api" long-name="System Application Light Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_light_control_plugin_api/group"/>
-</component>
-<component name="system_application_notification_api" long-name="System Application Notification API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_notification_api/group"/>
-</component>
-<component name="system_application_plugin_callback_api" long-name="System Application Plug-in Callback API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
-</component>
-</collection>
-<collection name="contextframework" long-name="Context Framework" level="framework">
-<!-- the units that are commented out need to be put back when configuration is in place.
- They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
-<component name="cfw" filter="s60" long-name="Context Framework">
-<!--<unit bldFile="contextframework/cfw/group"/> -->
-</component>
-<component name="cfwplugins" filter="s60" long-name="Context Framework Plugins" plugin="Y">
-<!--<unit bldFile="contextframework/cfwplugins/group"/>-->
-</component>
-<component name="contextframework_build" filter="s60" long-name="Context Framework Build">
-<unit bldFile="mw/appsupport/contextframework/group"/>
-</component>
-</collection>
-<collection name="coreapplicationuis" long-name="Core Application UIs" level="server">
-<component name="dbrecovery" filter="s60" long-name="Database Recovery">
-<unit bldFile="mw/appsupport/coreapplicationuis/dbrecovery/group"/>
-</component>
-<component name="nspswsplugin" filter="s60" long-name="NSPS WS Plugin" plugin="Y">
-<!-- No Service Power Save? Window Server? Please elaborate-->
-<unit bldFile="mw/appsupport/coreapplicationuis/nspswsplugin/group"/>
-</component>
-<component name="rfs" filter="s60" long-name="Restore Factory Settings">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfs/group"/>
-</component>
-<component name="rfsplugins" filter="s60" long-name="Restore Factory Settings Plugins" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/group"/>
-</component>
-<component name="sysap" filter="s60" long-name="System Application">
-<unit bldFile="mw/appsupport/coreapplicationuis/sysap/group"/>
-</component>
-<component name="variatedsettings" filter="s60" long-name="Variated Settings" class="config">
-<unit bldFile="mw/appsupport/coreapplicationuis/variatedsettings/group"/>
-</component>
-<component name="accfwuinotifier" filter="s60" long-name="Accessory Framework UI Notifier" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/accfwuinotifier/group"/>
-</component>
-<component name="kefmapper" filter="s60" long-name="Key Event Framework">
-<unit bldFile="mw/appsupport/coreapplicationuis/kefmapper/group"/>
-</component>
-<component name="advancedtspcontroller" filter="s60" long-name="Advanced TSP Controller">
-<unit bldFile="mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
-</component>
-<component name="powersaveutilities" filter="s60" long-name="Power Save Utilities">
-<unit bldFile="mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
-</component>
-<component name="gsserverenginestub" filter="s60" long-name="GS Server Engine Stub">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
-</component>
-<component name="gsserverengine" filter="s60" long-name="GS Server Engine">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverengine/group"/>
-</component>
-<component name="sensordatacompensatorplugin" filter="s60" long-name="Sensor Data Compensator Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/group"/>
-</component>
-</collection>
-<collection name="flashliteapi_3_1" long-name="Flash Lite API 3.1" level="specific">
-<!-- collection is really a component. Move down a directory -->
-<component name="flashliteapi_3_1_build" long-name="Flash Lite API Build" filter="s60" introduced="^2"/>
-</collection>
-<collection name="mediakeys" long-name="Media Keys" level="plugin">
-<!-- collection is really a component. Move down a directory -->
-<component name="mediakeys_build" filter="s60" long-name="Media Keys Build">
-<unit bldFile="mw/appsupport/mediakeys/group"/>
-</component>
-</collection>
-<collection name="startupservices" long-name="Startup Services" level="system">
-<component name="splashscreen" filter="s60" long-name="Splash Screen">
-<unit bldFile="mw/appsupport/startupservices/splashscreen/group"/>
-</component>
-<component name="startupanimation" filter="s60" long-name="Startup Animation">
-<unit bldFile="mw/appsupport/startupservices/startupanimation/group"/>
-</component>
-<component name="startup" long-name="Startup Application" filter="s60">
-<unit bldFile="mw/appsupport/startupservices/startup/group"/>
-</component>
-</collection>
-<collection name="sysresmonitoring" long-name="System Resource Monitoring" level="system">
-<component name="oodmonitor" filter="s60" long-name="OOD Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oodmonitor/group"/>
-</component>
-<component name="oommonitor" filter="s60" long-name="OOM Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oommonitor/group"/>
-</component>
-</collection>
-<collection name="systemsettings" long-name="System Settings" level="system">
-<component name="gssensorplugin" filter="s60" long-name="GS Sensor Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gssensorplugin/group"/>
-</component>
-<component name="gsaccessoryplugin" filter="s60" long-name="GS Accessory Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gsaccessoryplugin/group"/>
-</component>
-</collection>
-<collection name="filehandling" long-name="File Handling" level="server">
-<component name="fileconverterfw" long-name="File Converter Framework" purpose="optional">
-<unit bldFile="mw/appsupport/filehandling/fileconverterfw/group" mrp="mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
-</component>
-<component name="htmltorichtextconverter" long-name="HTML to RichText Converter" introduced="7.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/htmltorichtextconverter/group" mrp="mw/appsupport/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
-</component>
-<component name="richtexttohtmlconverter" long-name="RichText to HTML Converter" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
-</component>
-</collection>
-<collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
-<component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
-</component>
-</collection>
-<collection name="commonappservices" long-name="Common Application Services" level="framework">
-<component name="alarmserver" long-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"/>
-</component>
-<component name="alarmservertest" long-name="Alarm Server Test" deprecated="^3" introduced="8.1" purpose="development">
-<unit bldFile="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
-</component>
-<component name="appservicesdocs" long-name="Application Services Documentation" purpose="development" class="doc">
-<unit mrp="mw/appsupport/commonappservices/appservicesdocs/app-services_documentation.mrp"/>
-</component>
-<component name="backuprestorenotification" long-name="Backup Restore Notification" introduced="8.1" purpose="optional">
-<unit bldFile="mw/appsupport/commonappservices/backuprestorenotification/group" mrp="mw/appsupport/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
-</component>
-</collection>
-<collection name="tzservices" long-name="Time Zone Services" level="plugin">
-<component name="tzserver" long-name="Time Zone Server" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzserver/group" mrp="mw/appsupport/tzservices/tzserver/group/app-services_tz.mrp"/>
-</component>
-<component name="tzloc" long-name="Time Zone Localization" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzloc/group" mrp="mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
-</component>
-<component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzlocrscfactory/group" mrp="mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
-</component>
-<component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzdatabase/group" mrp="mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
-</component>
-</collection>
-<collection name="contenthandling" long-name="Content Handling" level="plugin">
-<component name="webrecognisers" long-name="Web Recognisers" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/contenthandling/webrecognisers/group" mrp="mw/appsupport/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
-</component>
-</collection>
-<collection name="openenvutils" long-name="Open Environment Utilities" level="specific">
-<component name="commandshell" long-name="Command Shell" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/commandshell/group" mrp="mw/appsupport/openenvutils/commandshell/group/oetools_zsh.mrp"/>
-</component>
-<component name="telnetserver" long-name="Telnet Server" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/telnetserver/group" mrp="mw/appsupport/openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
-</component>
-</collection>
-<collection name="printingsupport" long-name="Printing Support" level="generic">
-<component name="printinguisupport" long-name="Printing UI Support" purpose="optional" introduced="^2" deprecated="^3">
-<unit bldFile="mw/appsupport/printingsupport/printinguisupport/group" mrp="mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
-</component>
-</collection>
-<collection name="appfw" long-name="Application Framework" level="framework">
-<component name="apparchitecture" long-name="Application Architecture" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/apparchitecture/group" mrp="mw/appsupport/appfw/apparchitecture/group/app-framework_apparc.mrp"/>
-</component>
-<component name="viewserver" long-name="View Server" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/viewserver/group" mrp="mw/appsupport/appfw/viewserver/group/app-framework_viewsrv.mrp"/>
-</component>
-</collection>
-<collection name="applaunchservices" long-name="Application Launch Services" level="generic">
-<component name="aftermarketappstarter" long-name="After Market Application Starter" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/aftermarketappstarter/group" mrp="mw/appsupport/applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
-</component>
-<component name="applaunchplugins" long-name="Application Launch Plugins" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/applaunchplugins/group" mrp="mw/appsupport/applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
-</component>
-</collection>
-<collection name="tzpcside" long-name="Time Zone PC Side" level="plugin">
-<component name="tzcompiler" long-name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config PC">
-<unit bldFile="mw/appsupport/tzpcside/tzcompiler/group" mrp="mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
-</component>
-</collection>
-<collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
-<component name="appsupport_metadata" long-name="Generic Application Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="securitysrv" level="generic" long-name="Security Services" levels="plugin framework server generic specific">
-<collection name="secsrv_plat" long-name="Security Services Platform Interfaces" level="specific">
-<component name="cms_api" long-name="CMS API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/cms_api/group"/>
-</component>
-<component name="pkcs12_parser_api" long-name="PKCS12 Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkcs12_parser_api/group"/>
-</component>
-<component name="java_utils_api" long-name="Java Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/java_utils_api/group"/>
-</component>
-<component name="wim_cert_api" long-name="WIM Cert API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/wim_cert_api/group"/>
-</component>
-<component name="device_key_store_encryption_plugin_api" long-name="Device Key Store Encryption Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/device_key_store_encryption_plugin_api/group"/>
-</component>
-<component name="x509certnameparser_api" long-name="X.509 Certificate Name Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
-</component>
-<component name="remote_lock_api" long-name="Remote Lock API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
-</component>
-<component name="pkidialog_api" long-name="PKI Dialog API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
-</component>
-<component name="provisioning_api" long-name="Provisioning API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/provisioning_api/group"/>
-</component>
-<component name="keyguard_configuration_api" long-name="Keyguard Configuration API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_configuration_api/group"/>
-</component>
-<component name="keylock_policy_api" long-name="Keylock Policy API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keylock_policy_api/group"/>
-</component>
-<component name="security_code_ui_api" long-name="Security Code UI API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
-</component>
-<component name="gba_api" long-name="GBA API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/gba_api/group"/>
-</component>
-<component name="keyguard_access_api" long-name="Keyguard Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_access_api/group"/>
-</component>
-<component name="devicelock_access_api" long-name="Device Lock Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devicelock_access_api/group"/>
-</component>
-<component name="lockapp_server_api" long-name="Lock Application Server API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
-</component>
-<component name="devencadaptation_api" long-name="Device Encryption Adaptation API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
-</component>
-<component name="devenccommonutils_api" long-name="Device Encryption Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
-</component>
-</collection>
-<collection name="cms" long-name="Certificate Management Service" level="server">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="cms_build" filter="s60" long-name="CMS" introduced="^3">
-<unit bldFile="mw/securitysrv/cms/group"/>
-</component>
-</collection>
-<collection name="pkiutilities" long-name="PKI Utilities" level="plugin">
-<component name="x509certnameparser" filter="s60" long-name="X.509 Certificate Name Parser">
-<unit bldFile="mw/securitysrv/pkiutilities/x509certnameparser/group"/>
-</component>
-<component name="pkcs12" filter="s60" long-name="PKCS #12">
-<unit bldFile="mw/securitysrv/pkiutilities/pkcs12/group"/>
-</component>
-<component name="certmanui" filter="s60" long-name="Certificate Management UI">
-<unit bldFile="mw/securitysrv/pkiutilities/certmanui/group"/>
-</component>
-<component name="ctsecuritydialogs" filter="s60" long-name="Crypto Token Security Dialogs">
-<unit bldFile="mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
-</component>
-<component name="certsaver" filter="s60" long-name="Certificate Saver">
-<unit bldFile="mw/securitysrv/pkiutilities/certsaver/group"/>
-</component>
-<component name="secmodui" filter="s60" long-name="Security Module UI">
-<unit bldFile="mw/securitysrv/pkiutilities/secmodui/group"/>
-</component>
-<component name="devicetoken" filter="s60" long-name="Device Token">
-<unit bldFile="mw/securitysrv/pkiutilities/devicetoken/group"/>
-</component>
-<component name="certificates" filter="s60" long-name="Certificates">
-<unit bldFile="mw/securitysrv/pkiutilities/Certificates/group" filter="sf_build"/>
-</component>
-<component name="pkiutilities_build" filter="s60" long-name="PKI Utilities Build">
-<!-- need to split this into the above components -->
-<unit bldFile="mw/securitysrv/pkiutilities/group"/>
-</component>
-<component name="ocsp" long-name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
-<unit bldFile="mw/securitysrv/pkiutilities/ocsp/group" mrp="mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
-</component>
-</collection>
-<collection name="wim" long-name="Wireless Identity Module " level="framework">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="wim_build" filter="s60" long-name="WIM Build">
-<unit bldFile="mw/securitysrv/wim/group"/>
-</component>
-</collection>
-<collection name="remotelock" long-name="Remote Lock" level="generic">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="remotelock_build" filter="s60" long-name="Remote Lock Build">
-<unit bldFile="mw/securitysrv/remotelock/group"/>
-</component>
-</collection>
-<collection name="securitydialogs" long-name="Security Dialogs" level="specific">
-<component name="keylockpolicyapi" filter="s60" long-name="Keylock Policy API">
-<unit bldFile="mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
-</component>
-<component name="autolock" long-name="Autolock" filter="s60">
-<unit bldFile="mw/securitysrv/securitydialogs/autolock/group"/>
-</component>
-<component name="secui" filter="s60" long-name="Security UI">
-<unit bldFile="mw/securitysrv/securitydialogs/secui/group"/>
-</component>
-<component name="securitynotifier" filter="s60" long-name="Security Notifier">
-<unit bldFile="mw/securitysrv/securitydialogs/securitynotifier/group"/>
-</component>
-<component name="lockclient" filter="s60" long-name="Lock Client" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockclient/group"/>
-</component>
-<component name="lockapp" filter="s60" long-name="Lock Application" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockapp/group"/>
-</component>
-<component name="simlockui" filter="s60" long-name="SIM Lock UI" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/simlockui/group"/>
-</component>
-</collection>
-<collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="boottimeintegritycheck_build" filter="s60" long-name="Boot Time Integrity Check Build">
-<unit bldFile="mw/securitysrv/boottimeintegritycheck/group"/>
-</component>
-</collection>
-<collection name="gba" long-name="Generic Bootstrapping Architecture" level="server">
-<component name="uicc" filter="s60" long-name="UICC" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/uicc/group"/>
-</component>
-<component name="gbaserver" filter="s60" long-name="GBA Server" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaserver/group"/>
-</component>
-<component name="gbaapi" filter="s60" long-name="GBA API" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaapi/group"/>
-</component>
-<component name="gbafilter" filter="s60" long-name="GBA HTTP Filter" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/gbafilter/group"/>
-</component>
-<component name="gba_build" filter="s60" long-name="Generic Boot Architecture Build" introduced="^2">
-<!-- need to split this into the above components, or remove #includes and make this GBA ROM -->
-<unit bldFile="mw/securitysrv/gba/group"/>
-</component>
-</collection>
-<collection name="devencdiskutils" long-name="Device Encryption Disk Utils" level="server">
-<component name="devenccommonutils" filter="s60" long-name="Device Encryption Common Utils" introduced="^3">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncCommonUtils/group"/>
-</component>
-<component name="devencrfsplugin" filter="s60" long-name="Device Encryption RFS Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncRfsPlugin/group"/>
-</component>
-<component name="pk5recognizer" filter="s60" long-name="Device Encryption Pk5 Recognizer" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/Pk5Recognizer/group"/>
-</component>
-<component name="devencstarter" filter="s60" long-name="Device Encryption Starter" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncStarter/group"/>
-</component>
-<component name="devencdiskutils" filter="s60" long-name="Device Encryption Disk Utils Build" introduced="^3">
-<!-- need to split this into the above components, or remove #includes and make this a ROM component-->
-<unit bldFile="mw/securitysrv/devencdiskutils/group"/>
-</component>
-</collection>
-<collection name="securitysrv_info" long-name="Security Services Info" level="specific">
-<component name="securitysrv_metadata" long-name="Security Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="drm" level="generic" long-name="DRM" levels="plugin framework server generic specific">
-<collection name="drm_plat" long-name="DRM Platform Interfaces" level="specific">
-<component name="roap_api" long-name="ROAP API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/roap_api/group"/>
-</component>
-<component name="drm_common_api" long-name="DRM Common API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_common_api/group"/>
-</component>
-<component name="drm_rights_api" long-name="DRM Rights API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_rights_api/group"/>
-</component>
-<component name="drm_legacy_api" long-name="DRM Legacy API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_legacy_api/group"/>
-</component>
-<component name="dcf_repository_api" long-name="DCF Repository API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/dcf_repository_api/group"/>
-</component>
-<component name="drm_service_api" long-name="DRM Service API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_service_api/group"/>
-</component>
-<component name="drm_secondary_display_api" long-name="DRM Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_secondary_display_api/group"/>
-</component>
-<component name="drm_license_manager_api" long-name="DRM License Manager API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_license_manager_api/group"/>
-</component>
-<component name="drm_utility_api" long-name="DRM Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_utility_api/group"/>
-</component>
-<component name="drm_agents_api" long-name="DRM Agents API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_agents_api/group"/>
-</component>
-<component name="wmdrm_core_api" long-name="WM DRM Core API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_core_api/group"/>
-</component>
-<component name="wmdrm_access_api" long-name="WMDRM Access API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_access_api/group"/>
-</component>
-<component name="camese_utility_api" long-name="Camese Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_utility_api/group"/>
-</component>
-<component name="camese_framework_api" long-name="Camese Framework API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_framework_api/group"/>
-</component>
-</collection>
-<collection name="drm_pub" long-name="DRM Public Interfaces" level="specific">
-<component name="drm_helper_api" long-name="DRM Helper API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_helper_api/group"/>
-</component>
-<component name="oma_drm_caf_agent_api" long-name="OMA DRM CAF Agent API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/group"/>
-</component>
-<component name="drm_license_checker_api" long-name="DRM License Checker API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_license_checker_api/group"/>
-</component>
-</collection>
-<collection name="commondrm" long-name="Common DRM" level="generic">
-<!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
-<component name="drmencryptor" filter="s60" long-name="DRM Encryptor" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmsettingsplugin" filter="s60" long-name="DRM Settings Plugin" plugin="Y" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmrightsmanagerui" filter="s60" long-name="DRM Rights Manager UI">
-<unit bldFile="mw/drm/commondrm/drmrightsmanagerui/help/group"/>
-</component>
-<component name="drmutility" filter="s60" long-name="DRM Utility">
-<!-- Uncomment unit when configuration is in place. Currently #included from commondrm_build -->
-<!--<unit bldFile="commondrm/drmutility/group"/>-->
-</component>
-<component name="drmserviceapiwrapper" filter="s60" long-name="DRM Service API Wrapper">
-<unit bldFile="mw/drm/commondrm/drmserviceapiwrapper/group"/>
-</component>
-<component name="drmrightsstoringlocation" filter="s60" long-name="DRM Rights Storing Location">
-<unit bldFile="mw/drm/commondrm/drmrightsstoringlocation/group"/>
-</component>
-<component name="commondrm_build" filter="s60" long-name="Common DRM Build">
-<!-- should be split into the above files, or them collapsed into a single component -->
-<unit bldFile="mw/drm/commondrm/group"/>
-</component>
-</collection>
-<collection name="omadrm" long-name="OMA DRM" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="omadrm_build" filter="s60" long-name="OMA DRM Build">
-<unit bldFile="mw/drm/omadrm/group"/>
-</component>
-<component name="foundationcerts" filter="sf_build" long-name="Foundation Certificates">
-<unit bldFile="mw/drm/omadrm/foundationcerts/group"/>
-</component>
-</collection>
-<collection name="wmdrm" long-name="Windows Media DRM" level="framework">
-<!-- collection is really a component. Move down a directory -->
-<component name="wmdrm_build" filter="s60" long-name="WM DRM Build">
-<unit bldFile="mw/drm/wmdrm/group"/>
-</component>
-</collection>
-<collection name="drm_info" long-name="DRM Info" level="specific"/>
-</block>
-<block name="locationsrv" level="specific" long-name="Location Services" levels="plugin fw server if">
-<collection name="locsrv_pub" long-name="Location Services Public Interfaces" level="if">
-<component name="landmarks_search_api" long-name="Landmarks Search API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
-</component>
-<component name="landmarks_api" long-name="Landmarks API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/group"/>
-</component>
-<component name="landmarks_database_management_api" long-name="Landmarks Database Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/group"/>
-</component>
-<component name="location_triggering_api" long-name="Location Triggering API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/location_triggering_api/group"/>
-</component>
-<component name="blid_application_satellite_info_api" long-name="BLID Application Satellite Info API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/group"/>
-</component>
-</collection>
-<collection name="locsrv_plat" long-name="Location Services Platform Interfaces" level="if">
-<component name="map_and_navigation_api" long-name="Map and Navigation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/group"/>
-</component>
-<component name="map_and_navigation_provider_discovery_api" long-name="Map and Navigation Provider Discovery API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/group"/>
-</component>
-<component name="geocoding_api" long-name="Geocoding API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
-</component>
-<component name="map_image_api" long-name="Map Image API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/group"/>
-</component>
-<component name="map_and_navigation_aiw_api" long-name="Map and Navigation AIW API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_aiw_api/group"/>
-</component>
-<component name="map_and_navigation_provider_api" long-name="Map and Navigation Provider API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_api/group"/>
-</component>
-<component name="landmarks_category_definition_api" long-name="Landmarks Category Definition API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
-</component>
-<component name="supl_settings_api" long-name="SUPL Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
-</component>
-<component name="location_settings_launch_api" long-name="Location Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/group"/>
-</component>
-<component name="map_image_conversion_plugin_api" long-name="Map Image Conversion Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/group"/>
-</component>
-<component name="psy_configuration_ui_plugin_api" long-name="PSY Configuration UI Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/psy_configuration_ui_plugin_api/group"/>
-</component>
-<component name="np_proxy_configuration_api" long-name="NP Proxy Configuration API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/np_proxy_configuration_api/group"/>
-</component>
-<component name="supl_terminal_initiation_api" long-name="SUPL Terminal Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/group"/>
-</component>
-<component name="location_notation_preferences_settings_api" long-name="Location Notation Preferences Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_notation_preferences_settings_api/group"/>
-</component>
-<component name="supl_settings_notifier_secondary_display_api" long-name="SUPL Settings Notifier Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_notifier_secondary_display_api/group"/>
-</component>
-<component name="supl_network_initiation_api" long-name="SUPL Network Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/group"/>
-</component>
-<component name="privacy_notifiers_secondary_display_api" long-name="Privacy Notifiers Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/privacy_notifiers_secondary_display_api/group"/>
-</component>
-<component name="oma_supl_configuration_parameter_api" long-name="OMA SUPL Configuration Parameter API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_configuration_parameter_api/group"/>
-</component>
-<component name="supl_query_secondary_display_api" long-name="SUPL Query Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_query_secondary_display_api/group"/>
-</component>
-<component name="location_triggering_management_api" long-name="Location Triggering Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_management_api/group"/>
-</component>
-<component name="location_triggering_status_information_api" long-name="Location Triggering Status Information API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_status_information_api/group"/>
-</component>
-<component name="oma_supl_asn_codec_plugin_api" long-name="OMA SUPL ASN Codec Plugin API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
-</component>
-<component name="location_local_variation_api" long-name="Location Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_local_variation_api/group"/>
-</component>
-</collection>
-<collection name="genericpositioningplugins" long-name="Generic Positioning Plugins" level="plugin">
-<component name="locationnpppsy" filter="s60" long-name="Location Positioning Proxy PSY" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
-</component>
-<component name="locationsuplpsy" filter="s60" long-name="Location SUPL PSY" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationsuplpsy/group"/>
-</component>
-<component name="genericpositioningplugins_build" filter="s60" long-name="Generic Positioning Plugins Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/genericpositioningplugins/group"/>
-</component>
-</collection>
-<collection name="landmarks" long-name="Landmarks" level="server">
-<component name="locationlandmarks" filter="s60" long-name="Location Landmarks">
-<unit bldFile="mw/locationsrv/landmarks/locationlandmarks/group"/>
-</component>
-</collection>
-<collection name="locationmapnavfw" long-name="Location Map and Navigation Framework" level="fw">
-<component name="mnlibrary" filter="s60" long-name="Map and Navigation Library">
-<unit bldFile="mw/locationsrv/locationmapnavfw/library/group"/>
-</component>
-<component name="mnaiwprovider" filter="s60" long-name="Map and Navigation AIW Provider" plugin="Y">
-<unit bldFile="mw/locationsrv/locationmapnavfw/aiwprovider/group"/>
-</component>
-<component name="locationmapnavfw_build" filter="s60" long-name="Location Map and Navigation Framework Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/locationmapnavfw/group"/>
-</component>
-</collection>
-<collection name="locationsystemui" long-name="Location System UI" level="if">
-<component name="locationsysui" filter="s60" long-name="Location System UI">
-<unit bldFile="mw/locationsrv/locationsystemui/locationsysui/group"/>
-</component>
-</collection>
-<collection name="supl" long-name="SUPL" level="fw">
-<component name="locationsuplfw" filter="s60" long-name="Location SUPL Framework">
-<unit bldFile="mw/locationsrv/supl/locationsuplfw/group"/>
-</component>
-<component name="locationomasuplprotocolhandler" filter="s60" long-name="OMA SUPL Protocol Handler">
-<unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/group"/>
-</component>
-<component name="supltiapiimplementation" filter="s60" long-name="SUPL TI API Implementation" introduced="^3">
-<unit bldFile="mw/locationsrv/supl/supltiapiimplementation/group"/>
-</component>
-</collection>
-<collection name="locationtriggering" long-name="Location Triggering" level="server">
-<component name="ltlogger" filter="s60" long-name="LT Logger">
-<unit bldFile="mw/locationsrv/locationtriggering/ltlogger/group"/>
-</component>
-<component name="ltclientlib" filter="s60" long-name="LT Client Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltclientlib/group"/>
-</component>
-<component name="ltmanagementlib" filter="s60" long-name="LT Management Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmanagementlib/group"/>
-</component>
-<component name="ltcontainer" filter="s60" long-name="LT Container">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontainer/group"/>
-</component>
-<component name="ltserver" filter="s60" long-name="LT Server">
-<unit bldFile="mw/locationsrv/locationtriggering/ltserver/group"/>
-</component>
-<component name="ltstrategypluginapi" filter="s60" long-name="LT Strategy Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategypluginapi/group"/>
-</component>
-<component name="ltstrategyengine" filter="s60" long-name="LT Strategy Engine">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategyengine/group"/>
-</component>
-<component name="ltmovementdetectionpluginapi" filter="s60" long-name="Movement Detection Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmovementdetectionpluginapi/group"/>
-</component>
-<component name="ltcellidmovementdetector" filter="s60" long-name="Cell ID Movement Detector">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/>
-</component>
-<component name="lbtmgmtui" filter="s60" long-name="LBT Management UI" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/lbtmgmtui/group"/>
-</component>
-<component name="ltcontextsourceplugin" filter="s60" long-name="LT Context Source Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontextsourceplugin/group"/>
-</component>
-<component name="locationtriggering_build" filter="s60" long-name="Location Triggering Build">
-<!-- should remove #include from this and maybe put exports in the above components -->
-<unit bldFile="mw/locationsrv/locationtriggering/group"/>
-</component>
-</collection>
-</block>
-<block name="accesssec" level="generic" long-name="Access Security" levels="plugin framework server generic specific">
-<collection name="accesssec_plat" long-name="Access Security Platform Interfaces" level="specific">
-<component name="wapi_security_settings_ui_api" long-name="WAPI Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_security_settings_ui_api/group"/>
-</component>
-<component name="wep_security_settings_ui_api" long-name="WEP Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wep_security_settings_ui_api/group"/>
-</component>
-<component name="wi-fi_protected_setup_ui_api" long-name="Wi-Fi Protected Setup UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
-</component>
-<component name="wlan_eap_settings_ui_api" long-name="WLAN EAP Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wlan_eap_settings_ui_api/group"/>
-</component>
-<component name="wpa_security_settings_ui_api" long-name="WPA Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wpa_security_settings_ui_api/group"/>
-</component>
-<component name="eap_vpn_api" long-name="EAP VPN API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
-</component>
-<component name="eapsim_db_api" long-name="EAP-SIM DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapsim_db_api/group"/>
-</component>
-<component name="eap_type_api" long-name="EAP Type API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_type_api/group"/>
-</component>
-<component name="eaptlspeap_db_api" long-name="EAP-TLS-PEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eaptlspeap_db_api/group"/>
-</component>
-<component name="eapleap_db_api" long-name="LEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapleap_db_api/group"/>
-</component>
-<component name="eapgtc_db_api" long-name="EAP-GTC DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapgtc_db_api/group"/>
-</component>
-<component name="eapmschapv2_db_api" long-name="EAP-MSCHAPV2 DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapmschapv2_db_api/group"/>
-</component>
-<component name="eapaka_db_api" long-name="EAP-AKA DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapaka_db_api/group"/>
-</component>
-<component name="wapi_db_api" long-name="WAPI DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_db_api/group"/>
-</component>
-</collection>
-<collection name="wlansecuritysettings" long-name="WLAN Security Settings" level="specific">
-<component name="wapisecuritysettingsui" filter="s60" long-name="WAPI Security Settings UI" introduced="9.1">
-<!-- the directory for this needs to be moved up to the right level -->
-<unit bldFile="mw/accesssec/wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
-</component>
-<component name="wepsecuritysettingsui" filter="s60" long-name="WEP Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wepsecuritysettingsui/group"/>
-</component>
-<component name="wifiprotectedsetup" filter="s60" long-name="WIFI Protected Setup" introduced="^1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wifiprotectedsetup/group"/>
-</component>
-<component name="wlaneapsettingsui" filter="s60" long-name="WLAN EAP Settings UI" introduced="9.3">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wlaneapsettingsui/group"/>
-</component>
-<component name="wpasecuritysettingsui" filter="s60" long-name="WPA Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wpasecuritysettingsui/group"/>
-</component>
-</collection>
-<collection name="eapol" long-name="EAPOL" level="framework">
-<component name="eapol_framework" filter="s60" long-name="EAPOL Framework" introduced="9.2">
-<unit bldFile="mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
-</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">
-<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>
-<component name="bearer_settings_plugin_api" long-name="Bearer Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/bearer_settings_plugin_api/group"/>
-</component>
-<component name="commsdat_wlan_api" long-name="CommsDat WLAN API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/commsdat_wlan_api/group"/>
-</component>
-<component name="connection_monitor_extension_api" long-name="Connection Monitor Extension API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_monitor_extension_api/group"/>
-</component>
-<component name="connection_ui_utilities_api" long-name="Connection UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_ui_utilities_api/group"/>
-</component>
-<component name="disconnect_dialog_api" long-name="Disconnect Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_api/group"/>
-</component>
-<component name="disconnect_dialog_disable_api" long-name="Disconnect Dialog Disable API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_disable_api/group"/>
-</component>
-<component name="extended_connection_settings_api" long-name="Extended Connection Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/extended_connection_settings_api/group"/>
-</component>
-<component name="mpm_default_connection_api" long-name="MPM Default Connection API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_default_connection_api/group"/>
-</component>
-<component name="pdpcontextmanager2_reset_factory_settings_api" long-name="PDP Context Manager 2 Reset Factory Settings API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_settings_api/group"/>
-</component>
-<component name="mpm_connect_screen_api" long-name="MPM Connect Screen API" filter="s60" class="api">
-<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">
-<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>
-<component name="access_point_engine_api" long-name="Access Point Engine API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_monitor_server_api/group"/>
-</component>
-<component name="connection_settings_ui_api" long-name="Connection Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_ui_api/group"/>
-</component>
-<component name="agent_dialog_api" long-name="Agent Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/agent_dialog_api/group"/>
-</component>
-<component name="extendedconnpref_api" long-name="Extended Connection Preferences API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/extendedconnpref_api/group"/>
-</component>
-</collection>
-<collection name="accesspointcontrol" long-name="Access Point Control" level="plugin">
-<component name="apcontrollistplugin" filter="s60" long-name="Access Point Control List Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
-</component>
-</collection>
-<collection name="alwayson_net_plugin" long-name="Always Online Net Plugin" level="server">
-<component name="pdpcontextmanager2" filter="s60" long-name="PDP Context Manager 2">
-<unit bldFile="mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
-</component>
-</collection>
-<collection name="apengine" long-name="Access Point Engine" level="framework">
-<component name="apeng" filter="s60" long-name="Access Point Engine">
-<unit bldFile="mw/ipconnmgmt/apengine/apeng/group"/>
-</component>
-<component name="apsettingshandlerui" filter="s60" long-name="Access Point Settings Handler UI">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingshandlerui/group"/>
-</component>
-<component name="apsettingsplugin" filter="s60" long-name="Access Point Settings Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="bearermanagement" long-name="Bearer Management" level="framework">
-<component name="mpm" filter="s60" long-name="Mobility Policy Manager">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/mpm/group"/>
-</component>
-<component name="extendedconnpref" filter="s60" long-name="Extended Connection Preferences">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/extendedconnpref/group"/>
-</component>
-<component name="s60mcpr" filter="s60" long-name="S60 Meta-Connection Provider" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/S60MCPR/group"/>
-</component>
-</collection>
-<collection name="cmmanager" long-name="Connection Method Manager" level="framework">
-<component name="cmmgr" filter="s60" long-name="CM Manager">
-<unit bldFile="mw/ipconnmgmt/cmmanager/cmmgr/group"/>
-</component>
-<component name="gsconnsettingsplugin" filter="s60" long-name="GS Connection Settings Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/cmmanager/gsconnsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="connectionmonitoring" long-name="Connection Monitoring" level="server">
-<component name="connectionmonitorplugin" filter="s60" long-name="Connection Monitor Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorplugin/group"/>
-</component>
-<component name="connectionmonitorui" filter="s60" long-name="Connection Monitor UI">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorui/group"/>
-</component>
-<component name="connmon" filter="s60" long-name="Connection Monitor">
-<!-- either split into two components, or #include from a common bld.inf -->
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/connectionmonitor/group"/>
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/dataconnectionlogger/group"/>
-</component>
-<component name="connmonext" filter="s60" long-name="Connection Monitor Extension API">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmonext/group"/>
-</component>
-</collection>
-<collection name="connectionutilities" long-name="Connection Utilities" level="utils">
-<component name="connectiondialogs" filter="s60" long-name="Connection Dialogs">
-<unit bldFile="mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/>
-</component>
-</collection>
-<collection name="dbcreator" long-name="DB Creator" level="utils">
-<component name="commsdatcreator" filter="s60" long-name="Comms Database Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
-</component>
-<component name="commsdatcreatorrfsplugin" filter="s60" long-name="Comms Database Creator RFS Plugin" introduced="9.3" plugin="Y">
-<!-- uncomment when config is turned on -->
-<!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
-</component>
-<component name="commsdatstartup" filter="s60" long-name="Comms Database Startup" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
-</component>
-<component name="dbcreatorexe" filter="s60" long-name="DB Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
-</component>
-<component name="dbcreator_build" filter="s60" long-name="DB Creator Build" introduced="9.3">
-<!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
-<unit bldFile="mw/ipconnmgmt/dbcreator/group"/>
-</component>
-</collection>
-<collection name="ipconnmgmt_info" long-name="IP Connectivity Management Info" level="utils">
-<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"/>
-</component>
-</collection>
-</block>
-<block name="netprotocols" level="generic" long-name="High-level Internet Protocols" levels="plugin framework server generic specific">
-<collection name="netprotocols_plat" long-name="High-level Internet Protocols Platform Interfaces" level="specific">
-<component name="cookie_manager_api" long-name="Cookie Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/cookie_manager_api/group"/>
-</component>
-<component name="http_cache_mgr_api" long-name="HTTP Cache Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_cache_mgr_api/group"/>
-</component>
-<component name="http_filters_api" long-name="HTTP Filters API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_filters_api/group"/>
-</component>
-</collection>
-<collection name="httpfilters" long-name="HTTP Filters" level="plugin">
-<component name="httpfiltercommon" filter="s60" long-name="HTTP Filter Common">
-<unit bldFile="mw/netprotocols/httpfilters/httpfiltercommon/group"/>
-</component>
-<component name="cookie" filter="s60" long-name="Cookie Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/cookie/group"/>
-</component>
-<component name="deflatefilter" filter="s60" long-name="Deflate Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/deflatefilter/group"/>
-</component>
-<component name="httpfilteracceptheader" filter="s60" long-name="Accept Header Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteracceptheader/group"/>
-</component>
-<component name="httpfilterauthentication" filter="s60" long-name="Authentication Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterauthentication/group"/>
-</component>
-<component name="httpfilterconnhandler" filter="s60" long-name="Connection Handler Fitler" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterconnhandler/group"/>
-</component>
-<component name="httpfilteriop" filter="s60" long-name="HTTP IOP Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteriop/group"/>
-</component>
-<component name="httpfilterproxy" filter="s60" long-name="HTTP Proxy Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterproxy/group"/>
-</component>
-<component name="uaproffilter" filter="s60" long-name="UAProf Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/uaproffilter/group"/>
-</component>
-</collection>
-<collection name="applayerprotocols" long-name="Application Layer Protocols" level="server">
-<component name="httptransportfw" long-name="HTTP Transport Framework" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
-</component>
-<component name="httpexamples" long-name="HTTP Examples" introduced="6.2" purpose="development">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpexamples/group" mrp="mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
-</component>
-<component name="wappushsupport" long-name="WAP Push Support" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
-</component>
-<component name="wapbase" long-name="WAP Base" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wapbase/Group" mrp="mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
-</component>
-<component name="ftpengine" long-name="FTP Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/ftpengine/group" mrp="mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
-</component>
-<component name="telnetengine" long-name="Telnet Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/telnetengine/group" mrp="mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
-</component>
-<component name="httpserviceapi" long-name="HTTP Service API" introduced="TB9.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpservice/group" mrp="mw/netprotocols/applayerprotocols/httpservice/group/http_service.mrp"/>
-</component>
-</collection>
-<collection name="applayerpluginsandutils" long-name="Application Layer Plugins and Utils" level="framework">
-<component name="uripermissionservices" long-name="URI Permission Services" introduced="^2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
-</component>
-<component name="bookmarksupport" long-name="Bookmark Support" introduced="9.1" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
-</component>
-<component name="httpprotocolplugins" long-name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
-</component>
-<component name="httptransportplugins" long-name="HTTP Transport Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
-</component>
-</collection>
-<collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
-<component name="netprotocols_metadata" long-name="High-level Internet Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ipappprotocols" level="generic" long-name="IP App Protocols" levels="plugin conn server if">
-<collection name="ipappprotocols_plat" long-name="IP App Protocols Platform Interfaces" level="if">
-<component name="srtp_api" long-name="SRTP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/srtp_api/group"/>
-</component>
-<component name="rtprtcp_api" long-name="RTP/RTCP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/rtprtcp_api/group"/>
-</component>
-</collection>
-<collection name="rtp" long-name="RTP" level="server">
-<component name="srtpstack" filter="s60" long-name="SRTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/srtpstack/group"/>
-</component>
-<component name="rtpstack" filter="s60" long-name="RTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/rtpstack/group"/>
-</component>
-</collection>
-<collection name="realtimenetprots" long-name="Real Time Net Protocols" level="server">
-<component name="symrtp" long-name="RTP" introduced="9.0" purpose="optional">
-<!-- Real Time Data Protocol -->
-<unit bldFile="mw/ipappprotocols/realtimenetprots/rtp/group" mrp="mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
-</component>
-<component name="sipfw" long-name="SIP Framework" introduced="9.2" purpose="optional">
-<unit bldFile="mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp" version="2"/>
-</component>
-</collection>
-<collection name="sipplugins" long-name="SIP Plugins" level="plugin">
-<component name="sippwlanplugin" filter="s60" long-name="SIP WLAN Plugin" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
-</component>
-<component name="sippsipsettingsui" filter="s60" long-name="SIP Settings UI" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
-</component>
-<component name="sippdevmgmtsipadapter" filter="s60" long-name="Device Management SIP Settings Adapter" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
-</component>
-<component name="sippsystemstatemonitor" filter="s60" long-name="SIP System State Monitor" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsystemstatemonitor/group"/>
-</component>
-<component name="sippsipadapter" filter="s60" long-name="SIP Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipadapter/group"/>
-</component>
-</collection>
-<collection name="sipproviderplugins" long-name="SIP Provider Plugins" level="conn">
-<component name="sipprovider" long-name="SIP Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipproviderplugins/sipprovider/group" mrp="mw/ipappprotocols/sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
-</component>
-</collection>
-<collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="if">
-<component name="ipappprotocols_metadata" long-name="IP App Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wirelessacc" level="specific" long-name="Wireless Access" levels="framework generic ui">
-<collection name="hsfw_plat" long-name="HotSpot Framework Platform Interfaces" level="ui">
-<component name="hotspot_framework_client_api" long-name="HotSpot Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_api" long-name="Internet Connectivity Test Service API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_settings_api" long-name="Internet Connectivity Test Service Settings API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
-</component>
-<component name="hotspot_framework_client_plugin_api" long-name="HotSpot Framework Client Plugin API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
-</component>
-</collection>
-<collection name="hotspotfw" long-name="HotSpot Framework" level="framework">
-<component name="hsserver" filter="s60" long-name="HotSpot Server" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="hsclient" filter="s60" long-name="HotSpot Client" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="internetconnectivitytestservice" filter="s60" long-name="Internet Connectivity Test Service" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
-</component>
-<component name="ictsdialogs" filter="s60" long-name="Internet Connectivity Test Service Dialogs" deprecated="^3" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
-</component>
-<component name="hspluginforagent" filter="s60" long-name="HotSpot Plugin for Agent" plugin="Y" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
-</component>
-<component name="hsbrowser" filter="s60" long-name="HotSpot Browser" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
-</component>
-<component name="hotspotfw_build" filter="s60" long-name="Hotspot Framework Build">
-<!-- should break up this bld.inf into the above components, or collapse them all into a single component -->
-<unit bldFile="mw/wirelessacc/hotspotfw/group"/>
-</component>
-</collection>
-<collection name="wlanutilities" long-name="WLAN Utilities" level="generic">
-<component name="wlanplugin" filter="s60" long-name="WLAN Plugin" plugin="Y">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlanplugin/group"/>
-</component>
-<component name="wlansettingsui" filter="s60" long-name="WLAN Settings UI">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlansettingsui/group"/>
-</component>
-<component name="wlansniffer" filter="s60" long-name="WLAN Sniffer">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlansniffer/group"/>
-</component>
-<component name="wlanindicatorplugin" filter="s60" long-name="WLAN Indicator Plugin" plugin="Y">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlanindicatorplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="vpnclient" level="specific" long-name="VPN Client" levels="engine ui api">
-<!-- is the !oem_build filter needed? -->
-<collection name="vpnc_plat" long-name="VPN Client Platform Interfaces" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API" class="api">
-<unit bldFile="mw/vpnclient/vpnc_plat/vpnapi/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API">
-<unit bldFile="mw/vpnclient/vpnapiimpl/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnengine" long-name="VPN Engine" level="engine">
-<!-- too many components in this collection.
- Probably best to group the binaries together into larger components
- or maybe split the collection into more reasonable groups -->
-<component name="eventmediatorapi" filter="s60" long-name="Event Mediator API">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediatorapi/group" filter="!oem_build"/>
-</component>
-<component name="eventviewer" filter="s60" long-name="Event Viewer">
-<unit bldFile="mw/vpnclient/vpnengine/eventviewer/group" filter="!oem_build"/>
-</component>
-<component name="vpnins" filter="s60" long-name="VPN Installer">
-<unit bldFile="mw/vpnclient/vpnengine/vpnins/group" filter="!oem_build"/>
-</component>
-<component name="ikepolparser" filter="s60" long-name="IKE Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/ikepolparser/group" filter="!oem_build"/>
-</component>
-<component name="utlbase64" filter="s60" long-name="Base64 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlbase64/group" filter="!oem_build"/>
-</component>
-<component name="utlcrypto" filter="s60" long-name="Crypto Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlcrypto/group" filter="!oem_build"/>
-</component>
-<component name="utlxml" filter="s60" long-name="XML Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlxml/group" filter="!oem_build"/>
-</component>
-<component name="utlpkcs10" filter="s60" long-name="PKCS#10 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs10/group" filter="!oem_build"/>
-</component>
-<component name="pkiserviceapi" filter="s60" long-name="PKI Service API">
-<unit bldFile="mw/vpnclient/vpnengine/pkiserviceapi/group" filter="!oem_build"/>
-</component>
-<component name="ikecert" filter="s60" long-name="IKE Certificate Management">
-<unit bldFile="mw/vpnclient/vpnengine/ikecert/group" filter="!oem_build"/>
-</component>
-<component name="kmdapi" filter="s60" long-name="Key Management Daemon API">
-<unit bldFile="mw/vpnclient/vpnengine/kmdapi/group" filter="!oem_build"/>
-</component>
-<component name="kmdserver" filter="s60" long-name="Key Management Daemon Server">
-<unit bldFile="mw/vpnclient/vpnengine/kmdserver/group" filter="!oem_build"/>
-</component>
-<component name="ikeutils" filter="s60" long-name="Internet Key Exchange Utils">
-<unit bldFile="mw/vpnclient/vpnengine/ikeutils/group" filter="!oem_build"/>
-</component>
-<component name="ikev1lib" filter="s60" long-name="IKEv1 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev1lib/group" filter="!oem_build"/>
-</component>
-<component name="ikev2lib" filter="s60" long-name="IKEv2 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev2lib/group" filter="!oem_build"/>
-</component>
-<component name="vpnipsecpolparser" filter="s60" long-name="VPN IPsec Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/vpnipsecpolparser/group" filter="!oem_build"/>
-</component>
-<component name="sit" filter="s60" long-name="Socket Interaction Thread">
-<unit bldFile="mw/vpnclient/vpnengine/sit/group" filter="!oem_build"/>
-</component>
-<component name="vpntcwrapper" filter="s60" long-name="VPN Terminal Control Wrapper">
-<unit bldFile="mw/vpnclient/vpnengine/vpntcwrapper/group" filter="!oem_build"/>
-</component>
-<component name="eventmediator" filter="s60" long-name="Event Mediator">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediator/group" filter="!oem_build"/>
-</component>
-<component name="pkiservice" filter="s60" long-name="PKI Service">
-<unit bldFile="mw/vpnclient/vpnengine/pkiservice/group" filter="!oem_build"/>
-</component>
-<component name="vpnconnagt" filter="s60" long-name="VPN Connection Agent">
-<unit bldFile="mw/vpnclient/vpnengine/vpnconnagt/group" filter="!oem_build"/>
-</component>
-<component name="vpnmanager" filter="s60" long-name="VPN Manager">
-<unit bldFile="mw/vpnclient/vpnengine/vpnmanager/group" filter="!oem_build"/>
-</component>
-<component name="vpncleaner" filter="s60" long-name="VPN Cleaner">
-<unit bldFile="mw/vpnclient/vpnengine/vpncleaner/group" filter="!oem_build"/>
-</component>
-<component name="utlpkcs12" filter="s60" long-name="PKCS#12 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs12/group" filter="!oem_build"/>
-</component>
-<component name="dmadengine" filter="s60" long-name="DM Adapter Engine">
-<unit bldFile="mw/vpnclient/vpnengine/dmadengine/group" filter="!oem_build"/>
-</component>
-<component name="dmadipsecvpn" filter="s60" long-name="IPsec VPN DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadipsecvpn/group" filter="!oem_build"/>
-</component>
-<component name="dmadpki" filter="s60" long-name="PKI DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadpki/group" filter="!oem_build"/>
-</component>
-<component name="ikesocket" filter="s60" long-name="IKE Socket" introduced="^3">
-<unit bldFile="mw/vpnclient/vpnengine/ikesocket/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnui" long-name="VPN UI" level="ui">
-<component name="vpnecomnotifier" filter="s60" long-name="VPN ECOM Notifier" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnecomnotifier/group" filter="!oem_build"/>
-</component>
-<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">
-<unit bldFile="mw/vpnclient/vpnui/vpnmanagementui/group" filter="!oem_build"/>
-</component>
-<component name="vpnpolins" filter="s60" long-name="VPN Policy Installer">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolins/group" filter="!oem_build"/>
-</component>
-<component name="vpnpolicyrecognizer" filter="s60" long-name="VPN Policy Recognizer" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolicyrecognizer/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnclient_info" long-name="VPN Client Info" level="api">
-<component name="vpnclient_help" filter="s60" long-name="VPN Client Help">
-<unit bldFile="mw/vpnclient/help/group" filter="!oem_build"/>
-</component>
-<component name="vpnclient_build" filter="s60" long-name="VPN Client Build">
-<!-- should split this up into the other components and remove this-->
-<unit bldFile="mw/vpnclient/group" filter="!oem_build"/>
-</component>
-</collection>
-</block>
-<block name="ipappsrv" level="specific" long-name="IP App Services" levels="framework generic server conn plugin">
-<collection name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" level="plugin">
-<component name="transcoder_api" long-name="Transcoder API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
-</component>
-<component name="comms_event_api" long-name="Comms Event API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/comms_event_api/group"/>
-</component>
-<component name="floor_control_api" long-name="Floor Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/floor_control_api/group"/>
-</component>
-<component name="media_control_api" long-name="Media Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/media_control_api/group"/>
-</component>
-<component name="multimedia_comms_api" long-name="Multimedia Comms API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/multimedia_comms_api/group"/>
-</component>
-<component name="nat_settings_api" long-name="NAT Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/nat_settings_api/group"/>
-</component>
-</collection>
-<collection name="natfw" long-name="NAT Framework" level="framework">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="natfw_build" filter="s60" long-name="NAT Framework Build" introduced="^2">
-<unit bldFile="mw/ipappsrv/natfw/group"/>
-</component>
-</collection>
-<collection name="multimediacommscontroller" long-name="Multimedia Comms Controller" level="conn">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommscontroller_build" filter="s60" long-name="Multimedia Comms Controller Build">
-<unit bldFile="mw/ipappsrv/multimediacommscontroller/group"/>
-</component>
-</collection>
-<collection name="multimediacommsengine" long-name="Multimedia Comms Engine" level="generic">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommsengine_build" filter="s60" long-name="Multimedia Comms Engine Build">
-<unit bldFile="mw/ipappsrv/multimediacommsengine/group"/>
-</component>
-</collection>
-<collection name="natplugins" long-name="NAT Plugins" level="plugin">
-<component name="natpcliprovisioningnatfwadapter" filter="s60" long-name="Client Provisioning NAT Framework Traversal Adapter" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/group"/>
-</component>
-<component name="natpdevmgmtnatfwadapter" filter="s60" long-name="Device Management NAT Framework Traversal Adapter" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/group"/>
-</component>
-<component name="natptraversalcontroller" filter="s60" long-name="NAT Traversal Controller" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natptraversalcontroller/group"/>
-</component>
-<component name="natpnatfwsdpprovider" filter="s60" long-name="NAT Framework SDP Provider" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpnatfwsdpprovider/group"/>
-</component>
-</collection>
-<collection name="ipappsrv_info" long-name="IP App Services Info" level="plugin">
-<component name="ipappsrv_build" long-name="IP App Services Build" filter="s60">
-<!-- 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">
-<collection name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" level="specific">
-<component name="string_parser_api" long-name="String Parser API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/string_parser_api/group"/>
-</component>
-<component name="cbs_mcn_client_api" long-name="CBS MCN Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cbs_mcn_client_api/group"/>
-</component>
-<component name="converged_call_engine_api" long-name="Converged Call Engine API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_engine_api/group"/>
-</component>
-<component name="aiw_dial_data_consumer_api" long-name="AIW Dial Data Consumer API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/aiw_dial_data_consumer_api/group"/>
-</component>
-<component name="phone_client_ussd_api" long-name="Phone Client USSD API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_api/group"/>
-</component>
-<component name="sat_refresh_api" long-name="SAT Refresh API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_refresh_api/group" filter="!test"/>
-</component>
-<component name="network_handling_engine_api" long-name="Network Handling Engine API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/network_handling_engine_api/group"/>
-</component>
-<component name="phone_client_emergency_call_api" long-name="Phone Client Emergency Call API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/group"/>
-</component>
-<component name="sat_configuration_api" long-name="SAT Configuration API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_configuration_api/group"/>
-</component>
-<component name="dial_utils_api" long-name="Dial Utils API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/dial_utils_api/group"/>
-</component>
-<component name="phone_client_image_handler_api" long-name="Phone Client Image Handler API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_image_handler_api/group"/>
-</component>
-<component name="phone_client_messenger_api" long-name="Phone Client Messenger API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_messenger_api/group"/>
-</component>
-<component name="sat_client_api" long-name="SAT Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_client_api/group" filter="!test"/>
-</component>
-<component name="phone_client_api" long-name="Phone Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_api/group"/>
-</component>
-<component name="sat_service_api" long-name="SAT Service API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_service_api/group" filter="!test"/>
-</component>
-<component name="cbs_message_api" long-name="CBS Message API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cbs_message_api/group"/>
-</component>
-<component name="phone_client_server_information_api" long-name="Phone Client Server Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_server_information_api/group"/>
-</component>
-<component name="phone_client_ussd_internal_api" long-name="Phone Client USSD Internal API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_internal_api/group"/>
-</component>
-<component name="phone_client_command_handler_api" long-name="Phone Client Command Handler API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_command_handler_api/group"/>
-</component>
-<component name="phone_client_notify_api" long-name="Phone Client Notify API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_notify_api/group"/>
-</component>
-<component name="phone_client_utility_api" long-name="Phone Client Utility API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_utility_api/group"/>
-</component>
-<component name="telephony_network_information_api" long-name="Telephony Network Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_network_information_api/group"/>
-</component>
-<component name="secondary_display_sat_api" long-name="Secondary Display SAT API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/secondary_display_sat_api/group"/>
-</component>
-<component name="callui_reconnect_query_api" long-name="CallUI Reconnect Query API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/callui_reconnect_query_api/group"/>
-</component>
-<component name="service_provider_settings_api" long-name="Service Provider Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/service_provider_settings_api/group"/>
-</component>
-<component name="converged_call_provider_api" long-name="Converged Call Provider API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_provider_api/group"/>
-</component>
-<component name="incoming_call_monitor_api" long-name="Incoming Call Monitor API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/incoming_call_monitor_api/group"/>
-</component>
-<component name="default_emergency_numbers_api" long-name="Default Emergency Numbers API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/default_emergency_numbers_api/group"/>
-</component>
-<component name="cenrep_database_api" long-name="Central Repository Database API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cenrep_database_api/group"/>
-</component>
-<component name="ss_settings_api" long-name="SS Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/ss_settings_api/group"/>
-</component>
-<component name="phone_settings_observer_api" long-name="Phone Settings Observer API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_observer_api/group"/>
-</component>
-<component name="phone_settings_notes_ui_api" long-name="Phone Settings Notes UI API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_notes_ui_api/group"/>
-</component>
-<component name="phone_settings_api" long-name="Phone Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_api/group"/>
-</component>
-<component name="voice_mailbox_number_api" long-name="Voice Mailbox Number API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_number_api/group"/>
-</component>
-<component name="voice_mailbox_settings_api" long-name="Voice Mailbox Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_settings_api/group"/>
-</component>
-<component name="call_information_api" long-name="Call Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/call_information_api/group" filter="!test"/>
-</component>
-<component name="call_remote_party_information_api" long-name="Call Remote Party Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/call_remote_party_information_api/group" filter="!test"/>
-</component>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_mediator_api/group"/>
-</component>
-</collection>
-<collection name="telutils" long-name="Telephony Utils" level="generic">
-<component name="phoneparser" filter="s60" long-name="Phone Parser">
-<unit bldFile="mw/phonesrv/telutils/phoneparser/group"/>
-</component>
-<component name="telephonyservice" filter="s60" long-name="Telephony Service">
-<unit bldFile="mw/phonesrv/telutils/telephonyservice/group"/>
-</component>
-</collection>
-<collection name="cbs" long-name="Cellular Baseband Services" level="plugin">
-<component name="cbsserver" filter="s60" long-name="CBS Server">
-<unit bldFile="mw/phonesrv/cbs/cbsserver/group"/>
-</component>
-<component name="cbsui" filter="s60" long-name="CBS UI">
-<unit bldFile="mw/phonesrv/cbs/cbsui/group"/>
-</component>
-</collection>
-<collection name="cellular" long-name="Cellular" level="server">
-<component name="telephonysettings" filter="s60" long-name="Telephony Settings">
-<unit bldFile="mw/phonesrv/cellular/telephonysettings/group"/>
-</component>
-<component name="sssettings" filter="s60" long-name="Supplementary Service Settings">
-<unit bldFile="mw/phonesrv/cellular/sssettings/group"/>
-</component>
-<component name="psetnotesui" filter="s60" long-name="Phone Settings Notes UI">
-<unit bldFile="mw/phonesrv/cellular/psetnotesui/group"/>
-</component>
-<component name="servicerequest" filter="s60" long-name="Service Request">
-<unit bldFile="mw/phonesrv/cellular/servicerequest/group"/>
-</component>
-</collection>
-<collection name="convergedcallengine" long-name="Converged Call Engine" level="framework">
-<component name="callprovider" filter="s60" long-name="Call Provider">
-<unit bldFile="mw/phonesrv/convergedcallengine/callprovider/group"/>
-</component>
-<component name="cce" filter="s60" long-name="CCE">
-<unit bldFile="mw/phonesrv/convergedcallengine/cce/group"/>
-</component>
-<component name="spsettings" filter="s60" long-name="Service Provider Settings">
-<unit bldFile="mw/phonesrv/convergedcallengine/spsettings/group"/>
-</component>
-<component name="cenrepdatabase" filter="s60" long-name="CCE Cenrep Database">
-<unit bldFile="mw/phonesrv/convergedcallengine/cenrepdatabase/group"/>
-</component>
-<component name="serviceselector" filter="s60" long-name="Service Selector">
-<unit bldFile="mw/phonesrv/convergedcallengine/serviceselector/group"/>
-</component>
-<component name="csplugin" filter="s60" long-name="CS Plugin" plugin="Y">
-<!-- should spell out CS in name -->
-<unit bldFile="mw/phonesrv/convergedcallengine/csplugin/group"/>
-</component>
-</collection>
-<collection name="engines" long-name="Telephony Engines" level="specific">
-<component name="vmbxengine" filter="s60" long-name="Voice Mailbox Engine">
-<unit bldFile="mw/phonesrv/engines/vmbxengine/group"/>
-</component>
-</collection>
-<collection name="networkhandling" long-name="Network Handling" level="plugin">
-<component name="networkhandlingengine" filter="s60" long-name="Network Handling Engine">
-<unit bldFile="mw/phonesrv/networkhandling/networkhandlingengine/group"/>
-</component>
-</collection>
-<collection name="phoneclientserver" long-name="Phone Client/Server" level="server">
-<component name="enpolicy" filter="s60" long-name="Emergency Number Policy">
-<unit bldFile="mw/phonesrv/phoneclientserver/enpolicy/group"/>
-</component>
-<component name="aiwdialdata" filter="s60" long-name="AIW Dial Data">
-<unit bldFile="mw/phonesrv/phoneclientserver/aiwdialdata/group"/>
-</component>
-<component name="dialutils" filter="s60" long-name="Dial Utils">
-<unit bldFile="mw/phonesrv/phoneclientserver/dialutils/group"/>
-</component>
-<component name="phoneclient" filter="s60" long-name="Phone Client">
-<unit bldFile="mw/phonesrv/phoneclientserver/phoneclient/group"/>
-</component>
-<component name="phoneserver" filter="s60" long-name="Phone Server">
-<unit bldFile="mw/phonesrv/phoneclientserver/phoneserver/group"/>
-</component>
-<component name="callui" filter="s60" long-name="Call UI">
-<unit bldFile="mw/phonesrv/phoneclientserver/callui/group"/>
-</component>
-</collection>
-<collection name="satengine" long-name="SIM Application Toolkit Engine" level="generic">
-<component name="satserver" filter="s60" long-name="SAT Server">
-<unit bldFile="mw/phonesrv/satengine/satserver/group"/>
-</component>
-</collection>
-<collection name="satui" long-name="SIM Application Toolkit UI" level="specific">
-<component name="satapp" filter="s60" long-name="SAT Application">
-<unit bldFile="mw/phonesrv/satui/satapp/group"/>
-</component>
-<component name="satplugin" filter="s60" long-name="SAT Plugin" plugin="Y">
-<unit bldFile="mw/phonesrv/satui/satplugin/group"/>
-</component>
-</collection>
-<collection name="phonecmdhandler" long-name="Phone Command Handler" level="generic">
-<component name="phonecmdhnlr" filter="s60" long-name="Phone Command Handler">
-<unit bldFile="mw/phonesrv/phonecmdhandler/phonecmdhnlr/group"/>
-</component>
-</collection>
-<collection name="phonesrv_info" long-name="Telephony and SIM Services Info" level="specific"/>
-</block>
-<block name="messagingmw" level="specific" long-name="Messaging Middleware" levels="stack fw api">
-<collection name="msgfw_pub" long-name="Messaging Middleware Public Interfaces" level="api">
-<component name="send_ui_api" long-name="Send UI API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_pub/send_ui_api/group"/>
-</component>
-</collection>
-<collection name="msgfw_plat" long-name="Messaging Middleware Platform Interfaces" level="api">
-<component name="always_online_plugin_api" long-name="Always Online Plugin API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_plugin_api/group"/>
-</component>
-<component name="always_online_client_api" long-name="Always Online Client API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_client_api/group"/>
-</component>
-<component name="msg_common_utils_api" long-name="Messaging Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/msg_common_utils_api/group"/>
-</component>
-<component name="send_ui_plugin_api" long-name="Send UI Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/send_ui_plugin_api/group"/>
-</component>
-<component name="send_ui_datautils_api" long-name="Send UI Data Utils API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/send_ui_datautils_api/group"/>
-</component>
-</collection>
-<collection name="msgbranched" long-name="Messaging Branched" level="fw">
-<!-- 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"/>
-</component>
-</collection>
-<collection name="messagingfw" long-name="Messaging Framework" level="fw">
-<!-- should break this collection up into smaller related collections -->
-<component name="alwaysonline" filter="s60" long-name="Always Online Server" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/alwaysonline/group"/>
-</component>
-<component name="msgcommonutils" filter="s60" long-name="Messaging Common Utils" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/msgcommonutils/group"/>
-</component>
-<component name="senduiservices" filter="s60" long-name="Send UI Services" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/senduiservices/group"/>
-</component>
-<component name="scheduledsendmtm" long-name="Scheduled Send MTM" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/group" mrp="mw/messagingmw/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
-</component>
-<component name="msgsrvnstore" long-name="Message Server and Store" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/group" mrp="mw/messagingmw/messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
-</component>
-<component name="biomsgfw" long-name="BIO Messaging Framework" introduced="6.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/group" mrp="mw/messagingmw/messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
-</component>
-<component name="msgconf" long-name="Messaging Config" introduced="^2" purpose="optional" class="config">
-<unit bldFile="mw/messagingmw/messagingfw/msgconf/group" mrp="mw/messagingmw/messagingfw/msgconf/group/messaging_config.mrp"/>
-</component>
-<component name="watcherfw" long-name="Watcher Framework" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/watcherfw/group" mrp="mw/messagingmw/messagingfw/watcherfw/group/messaging_watcher.mrp"/>
-</component>
-<component name="msgtest" long-name="Messaging Test" purpose="development">
-<unit bldFile="mw/messagingmw/messagingfw/msgtest/group" mrp="mw/messagingmw/messagingfw/msgtest/group/messaging_test.mrp"/>
-</component>
-<component name="sendas" long-name="Send As" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/sendas/group" mrp="mw/messagingmw/messagingfw/sendas/group/messaging_sendas2.mrp"/>
-</component>
-<component name="msgurlhandler" long-name="Message URL Handler" introduced="7.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/group" mrp="mw/messagingmw/messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
-</component>
-<component name="wappushfw" long-name="WAP Push Framework" introduced="6.1" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/wappushfw/group" mrp="mw/messagingmw/messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
-</component>
-<component name="suplsmshandler" long-name="SUPL SMS Handler" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplsmshandler/group" mrp="mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/>
-</component>
-<component name="suplwappushhandler" long-name="SUPL WAP Push Handler" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
-</component>
-</collection>
-<collection name="messagingmw_info" long-name="Messaging Middleware Info" level="api">
-<component name="messagingmw_metadata" long-name="Messaging Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="imsrv" level="specific" long-name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
-<collection name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" level="specific">
-<component name="ximp_core_data_model_api" long-name="XIMP Core Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_host_api" long-name="XIMP Presence Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_presence_data_model_api" long-name="XIMP Presence Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_api" long-name="XIMP Presence Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_presence_management_api" long-name="XIMP Presence Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_management_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_host_api" long-name="XIMP Core Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_core_management_api" long-name="XIMP Core Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_management_api/group"/>
-</component>
-<component name="ximp_presence_base_api" long-name="XIMP Presence Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_base_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_api" long-name="XIMP Core Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_core_base_api" long-name="XIMP Core Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_base_api/group"/>
-</component>
-<component name="ximp_presence_cache_api" long-name="XIMP Presence Cache API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_cache_api/group"/>
-</component>
-<component name="ximp_core_feature_plugin_api" long-name="XIMP Core Feature Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_host_api" long-name="XIMP IM Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_im_data_model_api" long-name="XIMP IM Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_data_model_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_api" long-name="XIMP IM Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_im_management_api" long-name="XIMP IM Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_management_api/group"/>
-</component>
-<component name="ximp_im_base_api" long-name="XIMP IM Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_base_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_host_api" long-name="XIMP Search Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_search_data_model_api" long-name="XIMP Search Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_data_model_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_api" long-name="XIMP search Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_search_management_api" long-name="XIMP Search Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_management_api/group"/>
-</component>
-<component name="ximp_search_base_api" long-name="XIMP Search Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_base_api/group"/>
-</component>
-<component name="xmpp_settings_api" long-name="XMPP Settings API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/group"/>
-</component>
-<component name="im_cache_client_api" long-name="IM Cache Client API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/im_cache_client_api/group"/>
-</component>
-<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 Avability Text" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
-</component>
-</collection>
-<collection name="ximpfw" long-name="XIMP Framework" level="framework">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="ximpfw_build" filter="s60" long-name="XIMP Framework Build">
-<unit bldFile="mw/imsrv/ximpfw/group"/>
-</component>
-</collection>
-<collection name="imservices" long-name="IM Services" level="generic">
-<component name="imfeatureplugin" filter="s60" long-name="IM Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/imfeatureplugin/group"/>
-</component>
-<component name="searchfeatureplugin" filter="s60" long-name="Search Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/searchfeatureplugin/group"/>
-</component>
-<component name="xmppsettingsapi" filter="s60" long-name="XMPP Settings API" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsapi/group"/>
-</component>
-<component name="xmppsettingsfetcher" filter="s60" long-name="XMPP Settings Fetcher" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/group"/>
-</component>
-<component name="ossprotocoladaptation" filter="s60" long-name="OSS Protocol Adaptation" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/ossprotocoladaptation/group"/>
-</component>
-<component name="instantmessagingcache" filter="s60" long-name="Instant Messaging Cache" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/instantmessagingcache/group"/>
-</component>
-</collection>
-<collection name="brandingserver" long-name="Branding Server" level="specific">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="brandingserver_build" filter="s60" long-name="Branding Server Build">
-<unit bldFile="mw/imsrv/brandingserver/group"/>
-</component>
-</collection>
-</block>
-<block name="legacypresence" level="specific" long-name="Legacy Presence Services" levels="engine fw ui">
-<collection name="pressrv_plat" long-name="Legacy Presence Services Platform Interfaces" level="ui">
-<component name="presence_list_api" long-name="Presence List API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/presence_list_api/group"/>
-</component>
-<component name="watcher_info_api" long-name="Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_info_api/group"/>
-</component>
-<component name="simple_documents_api" long-name="SIMPLE Documents API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_documents_api/group"/>
-</component>
-<component name="authorization_api" long-name="Authorization API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/authorization_api/group"/>
-</component>
-<component name="xdm_protocol_plugin_api" long-name="XDM Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_protocol_plugin_api/group"/>
-</component>
-<component name="watcher_api" long-name="Watcher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_api/group"/>
-</component>
-<component name="xdm_api" long-name="XDM API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_api/group"/>
-</component>
-<component name="registration_api" long-name="Registration API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/registration_api/group"/>
-</component>
-<component name="publisher_api" long-name="Publisher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/publisher_api/group"/>
-</component>
-<component name="messaging_connection_manager_api" long-name="Messaging Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/messaging_connection_manager_api/group"/>
-</component>
-<component name="xdm_settings_api" long-name="XDM Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_settings_api/group"/>
-</component>
-<component name="simple_settings_api" long-name="SIMPLE Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_settings_api/group"/>
-</component>
-<component name="simple_instant_msg_api" long-name="Simple Instant Msg API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_instant_msg_api/group"/>
-</component>
-</collection>
-<collection name="xdmengine" long-name="XDM Engine" level="engine">
-<!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
-<component name="xdmengine_build" filter="s60" long-name="XDM Engine Build">
-<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">
-<unit bldFile="mw/legacypresence/xdmprotocols/group"/>
-</component>
-</collection>
-<collection name="msgconnmanager" long-name="Messaging Connection Manager" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="msgconnmanager_build" filter="s60" long-name="Messaging Connection Manager Build">
-<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">
-<unit bldFile="mw/legacypresence/simpleengine/group"/>
-</component>
-</collection>
-<collection name="presencefwsimpleadpt" long-name="Presence Framework SIMPLE Adaptation" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="simpleplugin" filter="s60" long-name="SIMPLE Plugin" plugin="Y">
-<unit bldFile="mw/legacypresence/presencefwsimpleadpt/group"/>
-</component>
-</collection>
-<collection name="simpledatamodeladapter" long-name="SIMPLE Data Model Adapter" level="fw">
-<component name="presenceplugin" filter="s60" long-name="Presence Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/legacypresence/simpledatamodeladapter/group"/>
-</component>
-</collection>
-</block>
-<block name="opensrv" level="specific" long-name="Open Services" levels="prt lib server eng">
-<collection name="opensrv_plat" long-name="Open Services Platform Interfaces" level="eng">
-<component name="messagequeue_api" long-name="Message Queue API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/opensrv/opensrv_plat/messagequeue_api/group"/>
-</component>
-</collection>
-<collection name="loudmouth" long-name="Loudmouth" level="prt">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="loudmouth_build" filter="s60" long-name="Loudmouth Build" introduced="^2">
-<unit bldFile="mw/opensrv/loudmouth/group"/>
-</component>
-</collection>
-<collection name="libtelepathy" long-name="Telepathy Library" level="lib">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="libtelepathy_build" filter="s60" long-name="Telepathy Library Build" introduced="^2">
-<unit bldFile="mw/opensrv/libtelepathy/group"/>
-</component>
-</collection>
-<collection name="telepathygabble" long-name="Telepathy Gabble" level="eng">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="telepathygabble_build" filter="s60" long-name="Telepathy Gabble Build" introduced="^2">
-<unit bldFile="mw/opensrv/telepathygabble/group"/>
-</component>
-</collection>
-<collection name="isolationserver" long-name="Isolation Server" level="server">
-<component name="messagequeue" filter="s60" long-name="Message Queue" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/messagequeue/group"/>
-</component>
-<component name="isoserver" filter="s60" long-name="ISO Server" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/isoserver/group"/>
-</component>
-<component name="isolationserver_build" filter="s60" long-name="Isloation Server Build" introduced="^2">
-<!-- needs #includes removed. either move the exports to another component or make this a ROM component -->
-<unit bldFile="mw/opensrv/isolationserver/group"/>
-</component>
-</collection>
-</block>
-<block name="remotemgmt" level="specific" long-name="Remote Management" levels="plugin framework server generic specific">
-<collection name="remotemgmt_pub" long-name="Remote Management Public Interfaces" level="specific">
-<component name="synchronization_capability_api" long-name="Synchronization Capability API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
-</component>
-</collection>
-<collection name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" level="specific">
-<component name="common_agent_util_and_definitions_api" long-name="Common Agent util and definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
-</component>
-<component name="policy_management_certificate_api" long-name="Policy Management Certificate API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/group"/>
-</component>
-<component name="oma_provisioning_adapter_api" long-name="OMA Provisioning Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_adapter_api/group"/>
-</component>
-<component name="device_management_parameter_api" long-name="Device Management Parameter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_parameter_api/group"/>
-</component>
-<component name="data_synchronization_plugin_api" long-name="Data Synchronization Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/group"/>
-</component>
-<component name="sync_alert_handler_api" long-name="Sync Alert Handler API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
-</component>
-<component name="syncml_notifier_api" long-name="SyncML Notifier API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
-</component>
-<component name="syncml_client_api" long-name="SyncML Client API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
-</component>
-<component name="device_management_plugin_api" long-name="Device Management plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_plugin_api/group"/>
-</component>
-<component name="dm_tree_apis" long-name="DM Tree APIs" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
-</component>
-<component name="terminal_security_device_lock_api" long-name="Terminal Security Device Lock API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/group"/>
-</component>
-<component name="policy_management_request_api" long-name="Policy Management Request API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/group"/>
-</component>
-<component name="ds_constant_definitions_api" long-name="DS Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_constant_definitions_api/group"/>
-</component>
-<component name="scp_server_api" long-name="SCP Server API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/group"/>
-</component>
-<component name="data_synchronization_notification_api" long-name="Data Synchronization Notification API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_notification_api/group"/>
-</component>
-<component name="oma_provisioning_engine_api" long-name="OMA Provisioning Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/group"/>
-</component>
-<component name="dm_utils_api" long-name="DM Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/group"/>
-</component>
-<component name="syncml_alert_api" long-name="SyncML Alert API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/group"/>
-</component>
-<component name="obex_client_session_api" long-name="OBEX Client session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/obex_client_session_api/group"/>
-</component>
-<component name="setting_enforcement_info_api" long-name="Setting Enforcement Info API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/group"/>
-</component>
-<component name="dm_constant_definitions_api" long-name="DM Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
-</component>
-<component name="oma_ds_extensions_api" long-name="OMA DS Extensions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
-</component>
-<component name="pnpms_utils_api" long-name="PNPMS Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
-</component>
-<component name="diagnostics_plugin_utility_api" long-name="Diagnostics Plugin Utility API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
-</component>
-<component name="diagnostics_plugin_api" long-name="Diagnostics Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
-</component>
-<component name="diagnostics_framework_api" long-name="Diagnostics Framework API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
-</component>
-<component name="diagnostics_results_api" long-name="Diagnostics Results API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
-</component>
-<component name="diagnostics_plugin_pool_api" long-name="Diagnostics Plugin Pool API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
-</component>
-<component name="adaptive_history_list_api" long-name="Adaptive History List API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
-</component>
-<component name="adaptive_history_list_session_api" long-name="Adaptive History List Session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
-</component>
-<component name="fota_engine_api" long-name="FOTA Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
-</component>
-<component name="update_package_storage_plugin_api" long-name="Update Package Storage Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
-</component>
-<component name="syncml_notifier_roaming_api" long-name="SyncML Notifier Roaming API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
-</component>
-<component name="sync_service_api" long-name="Sync Service API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_service_api/group"/>
-</component>
-<component name="dcmo_adapter_api" long-name="DCMO Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_adapter_api/group"/>
-</component>
-<component name="dcmo_control_api" long-name="DCMO Control API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_control_api/group"/>
-</component>
-<component name="ds_capability_mgmt_plugin_api" long-name="DS Capability Management Plugin API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
-</component>
-<component name="dm_native_notifier_api" long-name="DM Native Notifier API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_native_notifier_api/group"/>
-</component>
-</collection>
-<collection name="policymanagement" long-name="Policy Management" level="generic">
-<component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">
-<unit bldFile="mw/remotemgmt/policymanagement/pmdmadapter/group"/>
-</component>
-<component name="dmutilserver" filter="s60" long-name="DM Util Server">
-<unit bldFile="mw/remotemgmt/policymanagement/dmutilserver/group"/>
-</component>
-<component name="policyengine" filter="s60" long-name="Policy Engine">
-<unit bldFile="mw/remotemgmt/policymanagement/policyengine/group"/>
-</component>
-<component name="policymanagement_build" filter="s60" long-name="Policy Management Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/policymanagement/group"/>
-</component>
-</collection>
-<collection name="syncmlfw" long-name="SyncML Framework" level="server">
-<component name="syncmlfw_build" filter="s60" long-name="SyncML Framework Build">
-<!-- need to break this up into components. Too convoluted a structure to be in a single bld.inf-->
-<unit bldFile="mw/remotemgmt/syncmlfw/group"/>
-</component>
-</collection>
-<collection name="terminalsecurity" long-name="Terminal Security" level="specific">
-<component name="scp" filter="s60" long-name="Security Code Proxy">
-<!-- can only have one unit, need to have these #included from a single bld.inf -->
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpdatabase/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpserver/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scppatternplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scphistoryplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scptimestampplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpeventhandler/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/dmeventnotifier/group"/>
-</component>
-<component name="terminalsecurity_client" filter="s60" long-name="Terminal Control Client">
-<unit bldFile="mw/remotemgmt/terminalsecurity/client/group"/>
-</component>
-<component name="terminalsecurity_server" filter="s60" long-name="Terminal Control Server">
-<unit bldFile="mw/remotemgmt/terminalsecurity/server/group"/>
-</component>
-<component name="tcadapter" filter="s60" long-name="Terminal Control Adapter">
-<unit bldFile="mw/remotemgmt/terminalsecurity/tcadapter/bld"/>
-</component>
-<component name="terminalsecurity_build" filter="s60" long-name="Terminal Security Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/terminalsecurity/group"/>
-</component>
-</collection>
-<collection name="omaprovisioning" long-name="OMA Provisioning" level="specific">
-<component name="pnputil" filter="s60" long-name="PnP Util">
-<unit bldFile="mw/remotemgmt/omaprovisioning/pnputil/group"/>
-</component>
-<component name="provisioning" filter="s60" long-name="Provisioning">
-<unit bldFile="mw/remotemgmt/omaprovisioning/provisioning/group"/>
-</component>
-</collection>
-<collection name="devicediagnosticsfw" long-name="Device Diagnostics Framework" level="framework">
-<component name="diagframework" filter="s60" long-name="Diagnostics Framework">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
-</component>
-<component name="diagpluginbase" filter="s60" long-name="Diagnostics Plugin Base">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
-</component>
-<component name="diagresultsdb" filter="s60" long-name="Diagnostics Results Database">
-<!-- can only have one unit, merge or split into two components -->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
-</component>
-<component name="devicediagnosticsfw_build" filter="s60" long-name="Device Diagnostics Framework Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/group"/>
-</component>
-</collection>
-<collection name="dcmofw" long-name="Device Capability Management Object Framework" level="framework">
-<component name="dcmoclient" filter="s60" long-name="DCMO Client">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoclient/group"/>
-</component>
-<component name="dcmoserver" filter="s60" long-name="DCMO Server">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoserver/group"/>
-</component>
-<component name="dcmocustcmd" filter="s60" long-name="DCMO Custom Commands">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmocustcmd/group"/>
-</component>
-<component name="dcmofw_build" filter="s60" long-name="DCMO Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/dcmofw/group"/>
-</component>
-</collection>
-<collection name="fotaapplication" long-name="FOTA Application" level="generic">
-<component name="fotaapplication_build" filter="s60" long-name="FOTA Application Build">
-<!-- remove this component when configuration is in place and the #ifdefs have been worked out -->
-<unit bldFile="mw/remotemgmt/fotaapplication/group"/>
-</component>
-<component name="fotaserver" filter="s60" long-name="FOTA Server">
-<!-- uncomment when #ifdefs are resolved -->
-<!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
-</component>
-<component name="fotacustcmds" filter="s60" long-name="FOTA Custom Commands" class="placeholder">
-<!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
-<!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
-</component>
-</collection>
-</block>
-<block name="remotestorage" level="generic" long-name="Remote Storage" levels="framework if">
-<collection name="rsfw_plat" long-name="Remote Storage Platform Interfaces" level="if">
-<component name="rsfw_access_protocol_plugin_api" filter="s60" long-name="Remote Storage Framework Access Protocol Plugin API" class="api">
-<unit bldFile="mw/remotestorage/rsfw_plat/rsfw_access_protocol_plugin_api/group"/>
-</component>
-</collection>
-<collection name="remotestoragefw" long-name="Remote Storage Framework" level="framework">
-<component name="mountstore" filter="s60" long-name="RSFW Mount Store">
-<unit bldFile="mw/remotestorage/remotestoragefw/mountstore/group"/>
-</component>
-<component name="rsfwnotifierplugins" filter="s60" long-name="RSFW Notifier Plugins" plugin="Y">
-<unit bldFile="mw/remotestorage/remotestoragefw/rsfwnotifierplugins/group"/>
-</component>
-<component name="remotefileengine" filter="s60" long-name="Remote File Engine">
-<unit bldFile="mw/remotestorage/remotestoragefw/remotefileengine/group"/>
-</component>
-<component name="mountmanager" filter="s60" long-name="RSFW Mount Manager">
-<unit bldFile="mw/remotestorage/remotestoragefw/mountmanager/group"/>
-</component>
-<component name="webdavaccessplugin" filter="s60" long-name="WebDAV Access Plugin" plugin="Y">
-<unit bldFile="mw/remotestorage/remotestoragefw/webdavaccessplugin/group"/>
-</component>
-<component name="remotefilesystemplugin" filter="s60" long-name="Remote Filesystem Plugin" plugin="Y">
-<unit bldFile="mw/remotestorage/remotestoragefw/remotefilesystemplugin/group"/>
-</component>
-<component name="remotestoragegsplugin" filter="s60" long-name="RS GS Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
-<!-- <unit bldFile="remotestoragefw/gsplugin/group"/>-->
-</component>
-<component name="remotedriveconfigurationbiocontrol" filter="s60" long-name="Remote Drive Configuration BIO Control">
-<!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
-<!-- <unit bldFile="remotestoragefw/remotedriveconfigurationbiocontrol/group"/>-->
-</component>
-<component name="remotestoragefw_build" filter="s60" long-name="Remote Storage Framework Build">
-<!-- move exports to other components.
- This is needed for #includes of configured component until congigiration is in place -->
-<unit bldFile="mw/remotestorage/remotestoragefw/group"/>
-</component>
-</collection>
-</block>
-<block name="remoteconn" level="generic" long-name="Remote Connectivity" levels="plugin framework server generic specific">
-<collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
-<component name="secon" filter="s60" long-name="Service Controllers">
-<unit bldFile="mw/remoteconn/connectivitymodules/secon/group"/>
-</component>
-</collection>
-<collection name="remoteconn_info" long-name="Remote Connectivity Info" level="specific">
-<component name="remoteconn_metadata" long-name="Remote Connectivity Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mtptransports" long-name="MTP Transports" level="plugin">
-<component name="mtpusbtransport" long-name="MTP USB Transport" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpusbtransport/group" mrp="mw/remoteconn/mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
-</component>
-<component name="mtpptpiptransport" long-name="MTP PTP-IP Transport" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpptpiptransport/group" mrp="mw/remoteconn/mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
-</component>
-<component name="mtpcontroller" long-name="MTP Controller" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpcontroller/group" mrp="mw/remoteconn/mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
-</component>
-</collection>
-<collection name="mtpfws" long-name="MTP Frameworks" level="framework">
-<component name="mtpfw" long-name="MTP Framework" introduced="^2" purpose="optional">
-<unit bldFile="mw/remoteconn/mtpfws/mtpfw/group" mrp="mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/>
-</component>
-</collection>
-<collection name="mtpdataproviders" long-name="MTP Data Providers" level="generic">
-<component name="mtpfileandfolderdp" long-name="MTP File and Folder Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group" mrp="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
-</component>
-<component name="mtpimagedp" long-name="MTP Image Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpimagedp/group" mrp="mw/remoteconn/mtpdataproviders/mtpimagedp/group/mtp_imagedp.mrp"/>
-</component>
-<component name="mtppictbridgedp" long-name="MTP PictBridge Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group" mrp="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group/mtp_pictbridgedp.mrp"/>
-</component>
-</collection>
-<collection name="backupandrestore" long-name="Backup and Restore" level="specific">
-<component name="backupengine" long-name="Backup Engine" introduced="9.0" purpose="optional">
-<unit bldFile="mw/remoteconn/backupandrestore/backupengine/group" mrp="mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
-</component>
-<component name="backuptest" long-name="Backup Test" introduced="^2" purpose="development">
-<unit bldFile="mw/remoteconn/backupandrestore/backuptest/group" mrp="mw/remoteconn/backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
-</component>
-</collection>
-<collection name="obex" long-name="OBEX" level="generic">
-<component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexprotocol/group" mrp="mw/remoteconn/obex/obexprotocol/group/obex.mrp"/>
-</component>
-<component name="obexextensionapi" long-name="OBEX Extension API" introduced="9.2" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexextensionapi/group" mrp="mw/remoteconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
-</component>
-</collection>
-</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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<unit mrp="mw/srvdiscovery/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="dlnasrv" level="specific" long-name="DLNA Services" levels="stack server ctrl framework plugin">
-<!-- uncomment all the units when configuration is in place, they're currently #included from other xxx_build components -->
-<collection name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" level="plugin">
-<component name="upnp_media_server_settings_api" long-name="UPnP Media Server Settings API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_settings_api/group"/>
-</component>
-<component name="upnp_av_objects_api" long-name="UPnP A/V Objects API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_av_objects_api/group"/>
-</component>
-<component name="upnp_media_server_api" long-name="UPnP Media Server API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_api/group"/>
-</component>
-<component name="upnp_security_plugin_api" long-name="UPnP Security Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_security_plugin_api/group"/>
-</component>
-<component name="upnp_avcp_api" long-name="UPnP AVCP API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_avcp_api/group"/>
-</component>
-<component name="upnp_media_server_metadata_api" long-name="UPnP Media Server Metadata API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_metadata_api/group"/>
-</component>
-<component name="upnp_command_api" long-name="UPnP Command API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_command_api/group"/>
-</component>
-<component name="upnp_plugin_api" long-name="UPnP Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_plugin_api/group"/>
-</component>
-</collection>
-<collection name="upnpavcontrolpoint" long-name="UPnP A/V Control Point" level="plugin">
-<component name="avcontrolframework" filter="s60" long-name="A/V Control Famework" introduced="9.1" deprecated="^3">
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
-</component>
-<component name="upnpavcontrolpoint_build" filter="s60" long-name="UPnP A/V Control Point Build" introduced="9.1" deprecated="^3">
-<!-- put exports in other component instead -->
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/group"/>
-</component>
-</collection>
-<collection name="upnpmediaserver" long-name="UPnP Media Server" level="server">
-<component name="avobjects" filter="s60" long-name="A/V Objects">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/avobjects/group"/>
-</component>
-<component name="mediaserverclient" filter="s60" long-name="Media Server Client">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverclient/group"/>
-</component>
-<component name="connectionmanagerservice" filter="s60" long-name="Connection Manager Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/connectionmanagerservice/group"/>
-</component>
-<component name="contentdirectoryservice" filter="s60" long-name="Content Directory Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/contentdirectoryservice/group"/>
-</component>
-<component name="mediaserverengine" filter="s60" long-name="Media Server Engine">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverengine/group"/>
-</component>
-<component name="upnpmediaserver_build" filter="s60" long-name="UPnP Media Server Build">
-<!-- move exports into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpmediaserver/group"/>
-</component>
-</collection>
-<collection name="upnpavcontroller" long-name="UPnP A/V Controller" level="ctrl">
-<component name="upnpxmlparser" filter="s60" long-name="UPnP XML Parser" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpxmlparser/group"/>
-</component>
-<component name="upnpavcontrollerserver" filter="s60" long-name="UPnP A/V Controller Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerserver/group"/>
-</component>
-<component name="upnpavcontrollerclient" filter="s60" long-name="UPnP A/V Ccontroller Client" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerclient/group"/>
-</component>
-<component name="upnpavcontrollerhelper" filter="s60" long-name="UPnP A/V Controller Helper" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerhelper/group"/>
-</component>
-<component name="upnpavcontroller_build" filter="s60" long-name="UPnP A/V Controller Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpavcontroller/group"/>
-</component>
-</collection>
-<collection name="upnpframework" long-name="UPnP Framework" level="framework">
-<component name="upnputilities" filter="s60" long-name="UPnP Utilities" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnputilities/group"/>
-</component>
-<component name="upnpextensionpluginif" filter="s60" long-name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpextensionpluginif/group"/> -->
-</component>
-<component name="upnpfiletransferengine" filter="s60" long-name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>-->
-</component>
-<component name="upnpcommonui" filter="s60" long-name="UPnP Common UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpcommonui/group"/>-->
-</component>
-<component name="upnpaiwengine" filter="s60" long-name="UPnP AIW Engine" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpaiwengine/group"/> -->
-</component>
-<component name="upnpaiwprovider" filter="s60" long-name="UPnP AIW Provider" introduced="^2" deprecated="^3" plugin="Y">
-<!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
-</component>
-<component name="upnpmusicadapter" filter="s60" long-name="UPnP Music Adapter" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
-</component>
-<component name="upnpcommand" filter="s60" long-name="UPnP Command" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpcommand/group"/>
-</component>
-<component name="upnpframework_build" filter="s60" long-name="UPnP Framework Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpframework/group"/>
-</component>
-</collection>
-<collection name="upnpsettings" long-name="UPnP Settings" level="framework">
-<component name="upnpsettingsengine" filter="s60" long-name="UPnP Settings Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
-</component>
-<component name="multiselectionui" filter="s60" long-name="Multi-Selection UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/multiselectionui/group"/>-->
-</component>
-<component name="appwizard" filter="s60" long-name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/appwizard/group"/>-->
-</component>
-<component name="upnpsharingui" filter="s60" long-name="UPnP Sharing UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
-</component>
-<component name="upnpgsplugin" filter="s60" long-name="UPnP GS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
-</component>
-<component name="upnpsettings_build" filter="s60" long-name="UPnP Settings Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsettings/group"/>
-</component>
-</collection>
-<collection name="upnpsharing" long-name="UPnP Sharing" level="server">
-<component name="upnpdlnaprofiler" filter="s60" long-name="UPnP DLNA Profiler" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpdlnaprofiler/group"/>
-</component>
-<component name="upnpsecurity" filter="s60" long-name="UPnP Security" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpsecurity/group"/>
-</component>
-<component name="upnpcontentserver" filter="s60" long-name="UPnP Content Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpcontentserver/group"/>
-</component>
-<component name="applicationengine" filter="s60" long-name="UPnP Application Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/applicationengine/group"/>
-</component>
-<component name="upnpsharing_build" filter="s60" long-name="UPnP Sharing Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsharing/group"/>
-</component>
-</collection>
-<collection name="upnpmpxplugins" long-name="UPnP MPX Plugins" level="plugin">
-<component name="upnpplaybackplugins" filter="s60" long-name="UPnP Playback Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/upnpplaybackplugins/group"/>
-</component>
-<component name="upnpmpxplugins_build" filter="s60" long-name="UPnP MPX Plugins Build" introduced="^2">
-<!-- move exports content into other component? -->
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/group"/>
-</component>
-</collection>
-<collection name="upnpharvester" long-name="UPnP Harvester" level="ctrl">
-<component name="upnpharvester_common" filter="s60" long-name="UPnP Harvester Common" introduced="^2" deprecated="^3" class="placeholder">
-<!-- need to merge or #include these to a single bld.inf -->
-<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
- <unit bldFile="upnpharvester/common/cmsettings/group"/>
- <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
- <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
-</component>
-<component name="cdssync" filter="s60" long-name="CDS Sync" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
-</component>
-<component name="mdhserver" filter="s60" long-name="Metadata Harvester Server" introduced="^2" deprecated="^3" class="placeholder">
-<!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
-</component>
-<component name="upnpharvester_build" filter="s60" long-name="UPnP Harvester Build" introduced="^2" deprecated="^3" class="placeholder">
-<!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
-<!--<unit bldFile="upnpharvester/group"/>-->
-</component>
-</collection>
-<collection name="homesync" long-name="Home Sync" level="plugin">
-<component name="contentmanager" filter="s60" long-name="Content Manager" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homesync/group"/>-->
-<!-- move bld.inf into contentmanager dir -->
-</component>
-</collection>
-<collection name="homemedia" long-name="Home Media" level="framework">
-<!-- collection is really just a component. Move down a directory -->
-<component name="homemedia_build" filter="s60" long-name="Home Media" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homemedia/group"/> -->
-</component>
-</collection>
-<collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin">
-<component name="dlnasrv_build" filter="s60" long-name="DLNA Services Build">
-<!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed -->
-<unit bldFile="mw/dlnasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="btservices" level="generic" long-name="Bluetooth Services" levels="framework server generic specific plugin">
-<collection name="btservices_pub" long-name="BT Services Public Interfaces" level="plugin">
-<component name="bluetooth_power_state_api" long-name="Bluetooth Power State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_power_state_api/group"/>
-</component>
-<component name="bluetooth_notifier_api" long-name="Bluetooth Notifier API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_notifier_api/group"/>
-</component>
-</collection>
-<collection name="btservices_plat" long-name="BT Services Platform Interfaces" level="plugin">
-<component name="bluetooth_dosserver_audio_api" long-name="Bluetooth DOS Server Audio API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dosserver_audio_api/group"/>
-</component>
-<component name="bluetooth_dut_mode_api" long-name="Bluetooth DUT Mode API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dut_mode_api/group"/>
-</component>
-<component name="bluetooth_engine_api" long-name="Bluetooth Engine API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-<component name="bluetooth_local_variation_api" long-name="Bluetooth Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_local_variation_api/group"/>
-</component>
-<component name="bluetooth_notifier_internal_api" long-name="Bluetooth Notifier internal API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_notifier_internal_api/group"/>
-</component>
-<component name="bluetooth_sap_connection_state_api" long-name="Bluetooth SAP Connection State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_sap_connection_state_api/group"/>
-</component>
-<component name="bluetooth_secondary_display_notification_api" long-name="Bluetooth Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_secondary_display_notification_api/group"/>
-</component>
-</collection>
-<collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
-<component name="bteng" filter="s60" long-name="Bluetooth Engine">
-<unit bldFile="mw/btservices/bluetoothengine/bteng/group"/>
-</component>
-<component name="btnotif" filter="s60" long-name="Bluetooth Notifier">
-<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"/>
-</component>
-<component name="btmac" filter="s60" long-name="Bluetooth Mono Audio Controller" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btmac/group"/>
-</component>
-<component name="btsac" filter="s60" long-name="Bluetooth Stereo Audio Controller" plugin="Y">
-<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"/>
-</component>
-<component name="btsap" filter="s60" long-name="Bluetooth SIM Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btsap/group"/>
-</component>
-<component name="btui" filter="s60" long-name="Bluetooth UI">
-<unit bldFile="mw/btservices/bluetoothengine/btui/group"/>
-</component>
-<component name="btpbap" filter="s60" long-name="Bluetooth Phonebook Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btpbap/group"/>
-</component>
-<component name="bthid" filter="s60" long-name="Bluetooth HID">
-<unit bldFile="mw/btservices/bluetoothengine/bthid/group"/>
-</component>
-<component name="btctrldcmoadapter" filter="s60" long-name="Bluetooth Control DCMO Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btctrldcmoadapter/group"/>
-</component>
-</collection>
-<collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
-<component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
-<unit bldFile="mw/btservices/bluetoothappprofiles/avrcp" mrp="mw/btservices/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
-</component>
-</collection>
-<collection name="btservices_info" long-name="BT Services Info" level="plugin">
-<component name="btservices_metadata" long-name="BT Services Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usbservices" level="generic" long-name="USB Services" levels="framework server generic specific plugin">
-<collection name="usbservices_plat" long-name="USB Services Platform Interfaces" level="plugin">
-<component name="pictbridge_api" long-name="PictBridge API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/pictbridge_api/group"/>
-</component>
-<component name="ptp_responder_api" long-name="PTP Responder API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_responder_api/group"/>
-</component>
-<component name="ptp_transport_api" long-name="PTP Transport API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_transport_api/group"/>
-</component>
-<component name="usb_device_control_plugin_api" long-name="USB Device Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_device_control_plugin_api/group"/>
-</component>
-<component name="usb_notifier_api" long-name="USB Notifier API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_notifier_api/group"/>
-</component>
-<component name="usb_personality_api_header" long-name="USB Personality API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_api_header/group"/>
-</component>
-<component name="usb_personality_plugin_api" long-name="USB Personality Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_plugin_api/group"/>
-</component>
-<component name="usb_secondary_display_api" long-name="USB Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_secondary_display_api/group"/>
-</component>
-<component name="usb_watcher_api" long-name="USB Watcher API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_api/group"/>
-</component>
-<component name="usb_watcher_info_api_header" long-name="USB Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_info_api_header/group"/>
-</component>
-</collection>
-<collection name="usbservices_info" long-name="USB Services Info" level="plugin"/>
-<collection name="usbengines" long-name="USB Engines" level="generic">
-<component name="usbotgwatcher" filter="s60" long-name="USB OTG Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbotgwatcher/group"/>
-</component>
-<component name="usbwatcher" filter="s60" long-name="USB Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbwatcher/group"/>
-</component>
-<component name="usblocodplugin" filter="s60" long-name="USB Local Connectivity Domain Plugin" plugin="Y">
-<unit bldFile="mw/usbservices/usbengines/usblocodplugin/group"/>
-</component>
-<component name="usbdevcon" filter="s60" long-name="USB Device Control">
-<unit bldFile="mw/usbservices/usbengines/usbdevcon/group"/>
-</component>
-<component name="usbremotepersonality" filter="s60" long-name="USB Remote Personality">
-<unit bldFile="mw/usbservices/usbengines/usbremotepersonality/group"/>
-</component>
-</collection>
-<collection name="usbclasses" long-name="USB Classes" level="framework">
-<component name="usbobexclasscontroller" filter="s60" long-name="USB OBEX Class Controller" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbobexclasscontroller/group"/>
-</component>
-<component name="usbbasicpersonality" filter="s60" long-name="USB Basic Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbbasicpersonality/group"/>
-</component>
-<component name="usbmscpersonality" filter="s60" long-name="USB MSC Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbmscpersonality/group"/>
-</component>
-<!-- commented out in bld.inf. Should this be deleted?
- <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
- <unit bldFile="usbclasses/ptpstack/group"/>
- </component>
- <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
- <unit bldFile="usbclasses/sicdusbplugin/group"/>
- </component>
- <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
- <unit bldFile="usbclasses/ptpserver/group"/>
- </component>-->
-<component name="pictbridgeengine" filter="s60" long-name="PictBridge Engine">
-<unit bldFile="mw/usbservices/usbclasses/pictbridgeengine/group"/>
-</component>
-<component name="usbphoneasmodem" filter="s60" long-name="USB Phone as Modem" introduced="^3">
-<unit bldFile="mw/usbservices/usbclasses/usbphoneasmodem/group"/>
-</component>
-</collection>
-<collection name="usbuis" long-name="USB UIs" level="specific">
-<component name="usbui" filter="s60" long-name="USB UI">
-<unit bldFile="mw/usbservices/usbuis/usbui/group"/>
-</component>
-<component name="usbuinotif" filter="s60" long-name="USB UI Notifiers">
-<unit bldFile="mw/usbservices/usbuis/usbuinotif/group"/>
-</component>
-<component name="imageprintuiprovider" filter="s60" long-name="ImagePrint UI Provider" plugin="Y">
-<unit bldFile="mw/usbservices/usbuis/imageprintuiprovider/group"/>
-</component>
-<component name="usbimageprintui" filter="s60" long-name="ImagePrint UI">
-<unit bldFile="mw/usbservices/usbuis/imageprintui/group"/>
-</component>
-</collection>
-</block>
-<block name="shortlinkconn" level="generic" long-name="Shortlink Connectivity" levels="framework server generic specific plugin">
-<!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
-<collection name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" level="plugin">
-<component name="obex_service_utils_api" long-name="OBEX Service Utils API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_utils_api/group"/>
-</component>
-<component name="obex_service_plugin_api" long-name="OBEX Service Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_plugin_api/group"/>
-</component>
-<component name="dialup_connection_status_api" long-name="Dial-up Connection Status API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dialup_connection_status_api/group"/>
-</component>
-<component name="dun_secondary_display_notification_api" long-name="DUN Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
-</component>
-<component name="obex_secondary_display_notification_api" long-name="OBEX Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
-</component>
-<component name="generic_hid_api" long-name="Generic HID API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/generic_hid_api/group"/>
-</component>
-<component name="locod_bearer_plugin_api" long-name="Locod Bearer Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/locod_bearer_plugin_api/group"/>
-</component>
-<component name="usb_obexservicemanager_client_api" long-name="USB OBEX Service Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_obexservicemanager_client_api/group"/>
-</component>
-</collection>
-<collection name="localconnectivityservice" long-name="Local Connectivity Service" level="server">
-<component name="locod" long-name="Local Connectivity Daemon">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/locod/group"/>
-</component>
-<component name="obexserviceman" long-name="OBEX Service Managar">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
-</component>
-<component name="obexsendservices" long-name="OBEX Send Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
-</component>
-<component name="obexreceiveservices" long-name="OBEX Receive Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
-</component>
-<component name="dun" long-name="Dial Up Networking">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/dun/group"/>
-</component>
-<component name="lccustomplugin" long-name="LC Custom Plugins" plugin="Y">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/lccustomplugin/group"/>
-</component>
-<component name="lcstylustap" long-name="LC Stylus Tap Plugins" plugin="Y">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/lcstylustap/group"/>
-</component>
-<component name="legacymodemplugin" long-name="Legacy Modem Plugin" plugin="Y">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/legacymodemplugin/group"/>
-</component>
-<component name="modematplugin" long-name="Modem AT Plugin" plugin="Y">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/modematplugin/group"/>
-</component>
-<component name="generichid" long-name="Generic HID">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/generichid/group"/>
-</component>
-<component name="headset" long-name="Headset">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/headset/group"/>
-</component>
-</collection>
-</block>
-<block name="imghandling" level="specific" long-name="Image Handling" levels="lib util if">
-<collection name="imagehandling_plat" long-name="Image Handling Platform Interfaces" level="if">
-<component name="image_handling_library_api" long-name="Image Handling Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
-</component>
-<component name="3gp_library_api" long-name="3GP Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
-</component>
-<component name="thumbnailmanager_api" long-name="Thumbnail Manager API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagehandlinglib" long-name="Image Handling Library" level="lib">
-<!-- collection is really a component, need to move down a directory -->
-<component name="ihl" filter="s60" long-name="IHL">
-<unit bldFile="mw/imghandling/imagehandlinglib/group"/>
-</component>
-</collection>
-<collection name="imagehandlingutilities" long-name="Image Handling Utilities" level="util">
-<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager">
-<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
-</component>
-</collection>
-</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">
-<unit bldFile="mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
-</component>
-</collection>
-</block>
-<block name="mds" level="specific" long-name="Metadata Services" levels="mgr eng server int">
-<collection name="mds_plat" long-name="Metadata Services Platform Interfaces" level="int">
-<component name="context_engine_plugin_api" long-name="Context Engine Plugin API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/group" filter="!test"/>
-</component>
-<component name="harvester_framework_api" long-name="Harvester Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/harvester_framework_api/group" filter="!test"/>
-<!-- can only have one unit with the same filter, #include the following from the previous unit -->
-</component>
-<component name="location_manager_api" long-name="Location Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/location_manager_api/group" filter="!test"/>
-</component>
-<component name="metadata_engine_api" long-name="Metadata Engine API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/metadata_engine_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_collection_manager_api" long-name="Content Listing Framework Collection Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_extended_api" long-name="Content Listing Framework Extended API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_extended_api/group"/>
-</component>
-</collection>
-<collection name="mds_pub" long-name="Metadata Services Public Interfaces" level="int">
-<component name="content_listing_framework_api" long-name="Content Listing Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_pub/content_listing_framework_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="metadataengine" long-name="Metadata Engine" level="eng">
-<component name="metadataengine_common" filter="s60" long-name="Metadata Engine Common" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/common/group"/>
-</component>
-<component name="metadataengine_server" filter="s60" long-name="Metadata Engine Server" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/server/group"/>
-</component>
-<component name="metadataengine_client" filter="s60" long-name="Metadata Engine Client" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/client/group"/>
-</component>
-<component name="metadataengine_build" filter="s60" long-name="Metadata Engine Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/metadataengine/group"/>
-</component>
-</collection>
-<collection name="locationmanager" long-name="Location Manager" level="mgr">
-<component name="locationtrail" filter="s60" long-name="Location Trail" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/locationtrail/group"/>
-</component>
-<component name="locationmanager_server" filter="s60" long-name="Location Manager Server" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/server/group"/>
-</component>
-<component name="locationmanager_client" filter="s60" long-name="Location Manager Client" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/client/group"/>
-</component>
-<component name="locationmanager_build" filter="s60" long-name="Location Manager Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/locationmanager/group"/>
-</component>
-</collection>
-<collection name="contextengine" long-name="Context Engine" level="eng">
-<component name="contextengine_plugins" filter="s60" long-name="Context Engine Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/contextengine/plugins/group"/>
-</component>
-<component name="contextengine_build" filter="s60" long-name="Context Engine Build" introduced="^2">
-<!--make this collection a single component, or make this unit self-contained -->
-<unit bldFile="mw/mds/contextengine/group"/>
-</component>
-</collection>
-<collection name="harvester" long-name="Harvester" level="eng">
-<component name="blacklistclient" filter="s60" long-name="Blacklist Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistclient/group"/>
-</component>
-<component name="blacklistserver" filter="s60" long-name="Blacklist Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistserver/group"/>
-</component>
-<component name="harvester_common" filter="s60" long-name="Harvester Common" introduced="^2">
-<unit bldFile="mw/mds/harvester/common/group"/>
-</component>
-<component name="composerplugins" filter="s60" long-name="Composer Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/composerplugins/group"/>
-</component>
-<component name="harvesterplugins" filter="s60" long-name="Harvester Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/harvesterplugins/group"/>
-</component>
-<component name="monitorplugins" filter="s60" long-name="Monitor Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/monitorplugins/group"/>
-</component>
-<component name="harvester_server" filter="s60" long-name="Harvester Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/server/group"/>
-</component>
-<component name="harvester_client" filter="s60" long-name="Harvester Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/client/group"/>
-</component>
-<component name="harvester_build" filter="s60" long-name="Harvester Build" introduced="^2">
-<!-- split these exports into the other components -->
-<unit bldFile="mw/mds/harvester/group"/>
-</component>
-</collection>
-<collection name="watchdog" long-name="Watchdog" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="mdswatchdog" filter="s60" long-name="Metadata Watchdog" introduced="^2">
-<unit bldFile="mw/mds/watchdog/group"/>
-</component>
-</collection>
-<collection name="clfwrapper" long-name="Content Listing Framework Wrapper" level="int">
-<!-- collection is really a component. Move down a directory -->
-<component name="clfwrapper_build" filter="s60" long-name="CLF Wrapper Build" introduced="^2" class="placeholder">
-<!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
-<!--<unit bldFile="clfwrapper/group"/>-->
-</component>
-</collection>
-<collection name="mds_info" long-name="Metadata Services Info" level="int">
-<component name="mds_build" filter="s60" long-name="Metadata Services Build" introduced="^2">
-<!-- consider distributiing this into the rest of the components in the package -->
-<unit bldFile="mw/mds/group"/>
-</component>
-</collection>
-</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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<unit bldFile="mw/mmuifw/mmuifw_plat/alf_customlayoutmanagers_api/group"/>
-</component>
-<component name="gesturehelper_api" long-name="Gesture Helper API" filter="s60" 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">
-<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">
-<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">
-<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">
-<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">
-<!-- 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">
-<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">
-<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">
-<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">
-<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">
-<unit bldFile="mw/mmuifw/mulwidgets/mullogging/group"/>
-</component>
-<component name="muldatamodel" filter="s60" long-name="MUL Data Model">
-<unit bldFile="mw/mmuifw/mulwidgets/muldatamodel/group"/>
-</component>
-<component name="mulwidgets_common" filter="s60" long-name="MUL Common Utils">
-<unit bldFile="mw/mmuifw/mulwidgets/common/group"/>
-</component>
-<component name="gesturehelper" filter="s60" long-name="Gesture Helper">
-<unit bldFile="mw/mmuifw/mulwidgets/gesturehelper/group"/>
-</component>
-<component name="mulcoverflowwidget" filter="s60" long-name="MUL CoverFlow Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/mulcoverflowwidget/group"/>
-</component>
-<component name="mulsliderwidget" filter="s60" long-name="MUL Slider Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/mulsliderwidget/group"/>
-</component>
-<component name="alfviewwidget" filter="s60" long-name="ALF View Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/alfviewwidget/group"/>
-</component>
-<component name="alfcontainerwidget" filter="s60" long-name="ALF Container Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/alfcontainerwidget/group"/>
-</component>
-<component name="alfscrollbarwidget" filter="s60" long-name="ALF Scrollbar Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/alfscrollbarwidget/group"/>
-</component>
-</collection>
-</block>
-<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"/>
-</component>
-<component name="videoconnutility_api" long-name="Video Connection Utility API" filter="s60" class="api">
-<unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/group"/>
-</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"/>
-</component>
-</collection>
-<collection name="videoscheduler" long-name="Video Scheduler" level="util">
-<component name="schedulerclient" filter="s60" long-name="Video Scheduler Client">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerclient/group"/>
-</component>
-<component name="schedulerserver" filter="s60" long-name="Video Scheduler Server">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerserver/group"/>
-</component>
-</collection>
-<collection name="videoconnutility" long-name="Video Connection Utility" level="util">
-<component name="connutilpsworker" filter="s60" long-name="Connection Utility Publish and Subscribe Worker">
-<unit bldFile="mw/videoutils/videoconnutility/connutilpsworker/group"/>
-</component>
-<component name="video_connutility" filter="s60" long-name="Video Connection Utility">
-<unit bldFile="mw/videoutils/videoconnutility/connutility/group"/>
-</component>
-</collection>
-<collection name="videoutils_info" long-name="Video Utils Info" level="if"/>
-</block>
-<block name="mmmw" level="generic" long-name="Multimedia Middleware" levels="plugin framework server generic specific">
-<collection name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" level="specific">
-<component name="multimedia_data_source_api" long-name="Multimedia Data Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
-</component>
-<component name="progressive_download_api" long-name="Progressive Download API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/progressive_download_api/group"/>
-</component>
-<component name="equalizer_ui_api" long-name="Equalizer UI API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
-</component>
-<component name="enhanced_media_client_api" long-name="Enhanced Media Client API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
-</component>
-<component name="stream_control_custom_command_api" long-name="Stream Control Custom Command API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
-</component>
-<component name="emc_buffer_source_api" long-name="EMC Buffer Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_buffer_source_api/group"/>
-</component>
-<component name="emc_file_source_api" long-name="EMC File Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
-</component>
-<component name="audio_metadata_reader_api" long-name="Audio MetaData Reader API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
-</component>
-<component name="emc_progressive_download_source_api" long-name="EMC Progressive Download Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
-</component>
-<component name="emc_volume_effect_api" long-name="EMC Volume Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
-</component>
-<component name="emc_balance_effect_api" long-name="EMC Balance Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_balance_effect_api/group"/>
-</component>
-<component name="emc_descriptor_source_api" long-name="EMC Descriptor Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_descriptor_source_api/group"/>
-</component>
-<component name="emc_drm_config_intfc_api" long-name="EMC DRM Config Intfc API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
-</component>
-<component name="voip_audio_services_api" long-name="VoIP Audio Services" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/group"/>
-</component>
-<component name="configuration_components_factory_api" long-name="Configuration Components Factory API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
-</component>
-<component name="audio_output_control_utility_api" long-name="Audio Output Control Utility API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/group"/>
-</component>
-<component name="audio_output_control_utility_proxy_api" long-name="Audio Output Control Utility Proxy API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
-</component>
-<component name="emc_audio_effects_api" long-name="EMC Audio Effects API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
-</component>
-<component name="call_audio_control_api" long-name="Call AudioControl API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/group"/>
-</component>
-<component name="radio_utilities_api" long-name="Radio Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/group"/>
-</component>
-<component name="radio_preset_utilities_api" long-name="Radio Preset Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
-</component>
-<component name="radio_monitor_api" long-name="Radio Monitor API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
-</component>
-<component name="thumbnail_engine_api" long-name="Thumbnail Engine API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/thumbnail_engine_api/group"/>
-</component>
-<component name="telephony_multimedia_service_api" long-name="Telephony Multimedia Service API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="mmfenh" long-name="MMF Enhancements" level="generic">
-<component name="advancedaudiocontroller" filter="s60" long-name="Advanced Audio Controllers" plugin="Y">
-<unit bldFile="mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
-</component>
-<component name="audiooutputcontrolutility" filter="s60" long-name="Audio Output Control Utility">
-<unit bldFile="mw/mmmw/mmfenh/audiooutputcontrolutility/group"/>
-</component>
-<component name="configurationcomponentsfactory" filter="s60" long-name="Configuration Components Factory">
-<unit bldFile="mw/mmmw/mmfenh/configurationcomponentsfactory/group"/>
-</component>
-<component name="enhancedaudioplayerutility" filter="s60" long-name="Enhanced Audio Player Utility">
-<unit bldFile="mw/mmmw/mmfenh/enhancedaudioplayerutility/group"/>
-</component>
-<component name="enhancedmediaclient" filter="s60" long-name="Enhanced Media Client">
-<unit bldFile="mw/mmmw/mmfenh/enhancedmediaclient/group"/>
-</component>
-<component name="profilesettingsmonitor" filter="s60" long-name="Profile Settings Monitor">
-<unit bldFile="mw/mmmw/mmfenh/profilesettingsmonitor/group"/>
-</component>
-<component name="progressivedownload" filter="s60" long-name="Progressive Download">
-<unit bldFile="mw/mmmw/mmfenh/progressivedownload/group"/>
-</component>
-</collection>
-<collection name="mm_fw" long-name="Multimedia Frameworks" level="framework">
-<!-- Id needs to be unique, mmfw already in use -->
-<!-- Placeholder for OpenAX AL and other stuff -->
-</collection>
-<collection name="mmserv" long-name="Multimedia Services" level="specific">
-<component name="audioeffectsui" filter="s60" long-name="Audio Effects UI">
-<unit bldFile="mw/mmmw/mmserv/audioeffectsui/group"/>
-</component>
-<component name="callaudiocontrol" filter="s60" long-name="Call Audio Control">
-<unit bldFile="mw/mmmw/mmserv/callaudiocontrol/group"/>
-</component>
-<component name="metadatautility" filter="s60" long-name="Metadata Utility">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/group"/>
-</component>
-<component name="radioutility" filter="s60" long-name="Radio Utility">
-<unit bldFile="mw/mmmw/mmserv/radioutility/group"/>
-</component>
-<component name="thumbnailengine" filter="s60" long-name="Thumbnail Engine" introduced="^2">
-<unit bldFile="mw/mmmw/mmserv/thumbnailengine/group"/>
-</component>
-<component name="tms" filter="s60" long-name="Telephony Multimedia Service" introduced="^3">
-<unit bldFile="mw/mmmw/mmserv/tms/group"/>
-</component>
-<component name="voipaudioservices" filter="s60" long-name="VoIP Audio Services">
-<unit bldFile="mw/mmmw/mmserv/voipaudioservices/group"/>
-</component>
-<component name="lib3gpextparser" filter="s60" long-name="3GP Extension Metadata Parser Library">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group" filter="sf_build"/>
-</component>
-</collection>
-<collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
-<component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="helix" level="generic" long-name="Helix" levels="plugin framework server generic specific">
-<collection name="helix_ren" long-name="Helix Engine" level="framework">
-<!-- what does "ren" stand for? -->
-<component name="helix_stub" filter="s60" long-name="Helix Stub" introduced="^2" class="api">
-<unit bldFile="mw/helix/helix_ren/helix_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="camerasrv" level="specific" long-name="Camera Services" levels="plugin fw api">
-<collection name="camerasrv_plat" long-name="Camera Services Platform Interfaces" level="api">
-<component name="media_recorder_sink_api" long-name="Media Recorder Sink API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
-</component>
-<component name="cae_extentension_api" long-name="CAE Extension API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/cae_extentension_api/group"/>
-</component>
-<component name="camera_application_engine_api" long-name="Camera Application Engine API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/camera_application_engine_api/group" filter="!test"/>
-</component>
-<component name="custom_onboard_camera_api" long-name="Custom Onboard Camera API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
-</component>
-<component name="imaging_configuration_manager_api" long-name="Imaging Configuration Manager API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
-</component>
-<component name="media_recorder_api" long-name="Media Recorder API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_api/group" filter="!test"/>
-</component>
-<component name="3gp_file_composer_api" long-name="3GP File Composer API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
-</component>
-<component name="asynchronous_file_saving_queue_api" long-name="Asynchronous File Saving Queue API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="camappengine" long-name="Camera App Engine" level="fw">
-<!-- is this collection really a component? If so, move down a directory -->
-<component name="stillconverter" filter="s60" long-name="Still Image Converter" class="placeholder">
-<!-- should separate this from parent engine's bld.inf -->
-<!-- <unit bldFile="camappengine/stillconverter/group"/> -->
-</component>
-<component name="camappengine_engine" filter="s60" long-name="Camera App Engine" class="placeholder">
-<!-- should separate this from parent engine's bld.inf -->
-<!-- <unit bldFile="camappengine/engine/group"/> -->
-</component>
-<component name="asynchfilesavequeue" filter="s60" long-name="Asynch File Save Queue">
-<unit bldFile="mw/camerasrv/camappengine/asynchfilesavequeue/group"/>
-</component>
-<component name="camappengine_build" filter="s60" long-name="Camera App Engine Build">
-<unit bldFile="mw/camerasrv/camappengine/build"/>
-</component>
-</collection>
-<collection name="camcordermmfplugin" long-name="Camcorder MMF Plugin" level="plugin">
-<!-- collection is really a component. Should move down a directory -->
-<component name="camcordermmfplugin_build" filter="s60" long-name="Camcorder MMF Plugin Build" plugin="Y">
-<unit bldFile="mw/camerasrv/camcordermmfplugin/build"/>
-</component>
-</collection>
-<collection name="configmanagers" long-name="Config Managers" level="api">
-<component name="imagingconfigmanager" filter="s60" long-name="Imaging Config Manager">
-<unit bldFile="mw/camerasrv/configmanagers/imagingconfigmanager/group"/>
-</component>
-</collection>
-<collection name="camerasrv_info" long-name="Camera Services Info" level="api">
-<component name="camerasrv_build" filter="s60" long-name="Camera Services Build">
-<!-- should split into individual bld.infs -->
-<unit bldFile="mw/camerasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="mmappfw" level="specific" long-name="Multimedia App Framework" levels="fw utils if">
-<collection name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" level="if">
-<component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interfaces Build" introduced="^1" filter="s60">
-<!-- this is no longer necessary when confguration is put in place -->
-<unit bldFile="mw/mmappfw/mmappfw_plat"/>
-</component>
-<component name="collection_helper_api" long-name="Collection Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
-</component>
-<component name="harvester_collection_mediator_api" long-name="Harvester Collection Mediator API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/group"/>
-</component>
-<component name="harvester_metadata_extractor_api" long-name="Harvester Metadata Extractor API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/group"/>
-</component>
-<component name="harvester_server_api" long-name="Harvester Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_server_api/group"/>
-</component>
-<component name="harvester_utility_api" long-name="Harvester Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_utility_api/group"/>
-</component>
-<component name="playlist_engine_api" long-name="Playlist Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playlist_engine_api/group"/>
-</component>
-<component name="mtp_keys_api" long-name="MTP Keys API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mtp_keys_api/group"/>
-</component>
-<component name="mpx_collection_common_definition_api" long-name="MPX Collection Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_common_definition_api/group"/>
-</component>
-<component name="mpx_collection_utility_api" long-name="MPX Collection Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/group"/>
-</component>
-<component name="mpx_common_api" long-name="MPX Common API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_api/group"/>
-</component>
-<component name="mpx_common_definition_api" long-name="MPX Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_common_definition_api" long-name="MPX Playback Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_utility_api" long-name="MPX Playback Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/group"/>
-</component>
-<component name="mpx_base_view_plugins_api" long-name="MPX Base View Plugins API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/group"/>
-</component>
-<component name="mpx_view_utility_api" long-name="MPX View Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_view_utility_api/group"/>
-</component>
-<component name="mpx_albumart_utility_api" long-name="MPX Album Art Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/group"/>
-</component>
-<component name="media_player_settings_engine_api" long-name="Media Player Settings Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
-</component>
-<component name="mpx_backstepping_utility_api" long-name="MPX Backstepping Utility API" introduced="^1" filter="s60" class="api">
-<!-- uncomment when configuration is put in place
- <unit bldFile="mmappfw_plat/mpx_backstepping_utility_api/group"/> -->
-</component>
-<component name="asx_parser_api" long-name="ASX Parser API" introduced="^1" filter="s60" class="api">
-<!-- uncomment when configuration is put in place
- <unit bldFile="mmappfw_plat/asx_parser_api/group"/> -->
-</component>
-<component name="playback_helper_api" long-name="Playback Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playback_helper_api/group"/>
-</component>
-<component name="videoplaylist_utility_api" long-name="Video Playlist Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/videoplaylist_utility_api/group"/>
-</component>
-<component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interface Build" introduced="^1" filter="s60" class="api">
-<!-- needed only for #ifdefs. Remove anmd uncomment above units when configuration is in place -->
-<unit bldFile="mw/mmappfw/mmappfw_plat/group"/>
-</component>
-</collection>
-<collection name="mpx" long-name="Multimedia Player" level="fw">
-<component name="commonframework" filter="s60" long-name="MPX Common Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/commonframework/group"/>
-</component>
-<component name="playbackframework" filter="s60" long-name="MPX Playback Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/playbackframework/group"/>
-</component>
-<component name="mpxcollectionfw" filter="s60" long-name="MPX Collection Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/collectionframework/group"/>
-</component>
-<component name="mpxviewfw" filter="s60" long-name="MPX View Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/viewframework/group"/>
-</component>
-<component name="mpx_build" filter="s60" long-name="MPX Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/mpx/group"/>
-</component>
-</collection>
-<collection name="mmappcomponents" long-name="Multimedia App Components" level="utils">
-<component name="mmappcomponents_build" filter="s60" long-name="Multimedia App Components Build" introduced="^1">
-<!-- needed for #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
- Can remove this once configuration is in place-->
-<unit bldFile="mw/mmappfw/mmappcomponents/group"/>
-</component>
-<component name="collectionhelper" filter="s60" long-name="Media Player Collection Helper" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/collectionhelper/group"/>
-</component>
-<component name="playlistengine" filter="s60" long-name="Playlist Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/playlistengine/group"/>
-</component>
-<component name="mpxharvester" filter="s60" long-name="Media Player Harvester" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/harvester/group"/>
-</component>
-<component name="mmappcommonui" filter="s60" long-name="Multimedia App Common UI" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmappcommonui/group"/>
-</component>
-<component name="mediaplayersettingsengine" filter="s60" long-name="Media Player Settings Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
-</component>
-<component name="audiofetcher" filter="s60" long-name="Audio Fetcher" introduced="^1" plugin="Y">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
-</component>
-<component name="asxparser" filter="s60" long-name="ASX Parser" introduced="^1">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
-</component>
-<component name="playbackhelper" filter="s60" long-name="Playback Helper" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/playbackhelper/group"/>
-</component>
-<component name="videoplaylistutility" filter="s60" long-name="Video Playlist Utility" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/videoplaylistutility/group"/>
-</component>
-<component name="mmmtpdataprovider" filter="s60" long-name="Multimedia MTP Data Provider" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmmtpdataprovider/group"/>
-</component>
-</collection>
-<collection name="mmappfw_info" long-name="Multimedia App Framework Info" level="if">
-<component name="mmappfw_build" filter="s60" long-name="Multimedia App Framework Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/group"/>
-</component>
-<component name="mmappfw_test" filter="s60,test,api_test,pref_test" long-name="Multimedia App Framework Test" purpose="development" introduced="^1"/>
-</collection>
-</block>
-<block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework api">
-<collection name="inputmethods_pub" long-name="Input Methods Public Interfaces" level="api">
-<component name="ptiengine_iti_api" long-name="PTI Engine API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
-</component>
-<component name="optical_character_recognition_api" long-name="Optical Character Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
-</component>
-<component name="input_language_info_api" long-name="Input Language Info API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
-</component>
-</collection>
-<collection name="inputmethods_plat" long-name="Input Methods Platform Interfaces" level="api">
-<component name="pen_input_server_api" long-name="Pen Input Server API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/group" filter="!test"/>
-</component>
-<component name="ptiengine_hwr_api" long-name="PTI Engine Handwriting Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group" filter="!test"/>
-</component>
-<component name="aknfep_settings_api" long-name="Avkon FEP Settings API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
-</component>
-<component name="aknfep_status_api" long-name="Avkon FEP Status API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
-</component>
-<component name="ptiengine_key_definations_api" long-name="PTI Engine Key Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
-</component>
-<component name="aknfep_definitions_api" long-name="Avkon FEP Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
-</component>
-<component name="aknfep_pen_support_api" long-name="Avkon FEP Pen Support API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
-</component>
-<component name="ptiengine_indic_definitions_api" long-name="PTI Engine Indic Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
-</component>
-<component name="aknfep_uiinterface_api" long-name="Avkon FEP UI Interface API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="textinput" long-name="Text Input" level="framework">
-<component name="ptienginev2" filter="s60" long-name="Predictive Text Input Engine">
-<!--uncomment when configuration is turned on and textinput_build is removed-->
-<!-- <unit bldFile="textinput/ptienginev2/group"/>-->
-</component>
-<component name="akninputlanguage" filter="s60" long-name="Avkon Input Language">
-<unit bldFile="mw/inputmethods/textinput/akninputlanguage/group"/>
-</component>
-<component name="ptihangulcore" filter="s60" long-name="PIT Hangul Core" introduced="^3">
-<unit bldFile="mw/inputmethods/textinput/ptihangulcore/group"/>
-</component>
-<component name="ptikoreanqwertycore" filter="s60" long-name="PTI Korean QWERTY Core" introduced="^3">
-<unit bldFile="mw/inputmethods/textinput/ptikoreanqwertycore/group"/>
-</component>
-<component name="peninputarc" filter="s60" long-name="Pen Input Arc">
-<unit bldFile="mw/inputmethods/textinput/peninputarc/group"/>
-</component>
-<component name="peninputcommonctrls" filter="s60" long-name="Pen Input Common Controls">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonctrls/group"/>
-</component>
-<component name="peninputhwrboxcn" filter="s60" long-name="Chinese Handwriting Recognition Box" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrboxcn/group"/>
-</component>
-<component name="peninputvkbcn" filter="s60" long-name="Chinese Virtual Keyboard" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputvkbcn/group"/>
-</component>
-<component name="peninputcommonlayout" filter="s60" long-name="Pen Input Common Layout">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonlayout/group"/>
-</component>
-<component name="peninputgenerichwr" filter="s60" long-name="Pen Input Generic Handwriting Recognition" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputgenerichwr/group"/>
-</component>
-<component name="peninputgenericvkb" filter="s60" long-name="Pen Input Generic Virtual Keyboard" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputgenericvkb/group"/>
-</component>
-<component name="peninputcommonctrlsjp" filter="s60" long-name="Pen Input Common Controls Japanese">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonctrlsjp/group"/>
-</component>
-<component name="peninputhwrboxjp" filter="s60" long-name="Japanese Handwriting Recognition Box" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrboxjp/group"/>
-</component>
-<component name="peninputvkbjp" filter="s60" long-name="Japanese Virtual Keyboard" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputvkbjp/group"/>
-</component>
-<component name="gslangplugin" filter="s60" long-name="GS Language Plugin" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/GSLangPlugin"/>
-</component>
-<component name="peninputgenericitut" filter="s60" long-name="Pen Input Generic ITU-T" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputgenericitut/group"/>
-</component>
-<component name="peninputhwrtrui" filter="s60" long-name="Pen Input Handwriting Recognition Training UI" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrtrui/group"/>
-</component>
-<component name="peninputhwrfscn" filter="s60" long-name="Pen Input Chinese Full Screen Handwriting Recognition" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrfscn/group"/>
-</component>
-<component name="peninputvkbkr" filter="s60" long-name="Pen Input Korean Virtual Keyboard" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputvkbkr/group"/>
-</component>
-<component name="peninputfingerhwr" filter="s60" long-name="Pen Input Finger Handwriting Recognition" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputfingerhwr/group"/>
-</component>
-<component name="peninputsplititut" filter="s60" long-name="Pen Input Split ITU-T" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputsplititut/group"/>
-</component>
-<component name="peninputsplitqwerty" filter="s60" long-name="Pen Input Split QWERTY" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputsplitqwerty/group"/>
-</component>
-<component name="textinput_build" filter="s60" long-name="Text Input Build">
-<!--needed for #ifdef, can be removed when configuration is implemented -->
-<unit bldFile="mw/inputmethods/textinput/group"/>
-</component>
-</collection>
-<collection name="fep" long-name="FEP" level="engine">
-<component name="aknfep" filter="s60" long-name="Avkon FEP" plugin="Y">
-<unit bldFile="mw/inputmethods/fep/aknfep/group"/>
-</component>
-<component name="frontendprocessor" long-name="Front End Processor" purpose="mandatory">
-<unit bldFile="mw/inputmethods/fep/frontendprocessor/group" mrp="mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
-</component>
-</collection>
-<collection name="inputmethods_info" long-name="Input Methods Info" level="api">
-<component name="inputmethods_metadata" long-name="Input Methods Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="qt" level="generic" long-name="Qt" levels="tool mw app">
-<collection name="qtconf" long-name="Qt Config" level="tool">
-<component name="qt_deviceconfiguration" long-name="Qt Device Configuration" introduced="^2" class="config tool">
-<unit bldFile="mw/qt/src/s60installs/deviceconfiguration"/>
-</component>
-</collection>
-<collection name="qt_info" long-name="Qt Info" level="mw">
-<component name="qt_build" long-name="Qt Build" introduced="^2">
-<unit bldFile="mw/qt"/>
-</component>
-</collection>
-<collection name="qtdemos" long-name="Qt Demos" level="app">
-<component name="qtdemos_build" long-name="Qt Demos Build" introduced="^2" filter="qtdemos">
-<unit bldFile="mw/qt/demos"/>
-</component>
-</collection>
-<collection name="qtexamples" long-name="Qt Examples" level="app">
-<component name="qtexamples_build" long-name="Qt Examples Build" introduced="^2" filter="qtexamples">
-<unit bldFile="mw/qt/examples"/>
-</component>
-</collection>
-<collection name="qt_tests" long-name="Qt Tests" level="app">
-<component name="qttestsauto" long-name="Qt Automated Tests" introduced="^2" filter="qttestsauto">
-<unit bldFile="mw/qt/tests/auto"/>
-</component>
-<component name="qttestsbenchmarks" long-name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks">
-<unit bldFile="mw/qt/tests/benchmarks"/>
-</component>
-</collection>
-</block>
-<block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
-<collection name="classicui_plat" long-name="Classic UI Platform Interfaces" level="specific">
-<component name="personalisation_framework_api" long-name="Personalisation Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_framework_api/group" filter="!test"/>
-</component>
-<component name="signal_pane_api" long-name="Signal Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
-</component>
-<component name="japanese_reading_api" long-name="Japanese Reading API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/japanese_reading_api/group" filter="!test"/>
-</component>
-<component name="global_popup_priority_controller_api" long-name="Global Popup Priority Controller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
-</component>
-<component name="item_finder_api" long-name="Item Finder API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/item_finder_api/group" filter="!test"/>
-</component>
-<component name="avkon_fonts_api" long-name="Avkon Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_fonts_api/group" filter="!test"/>
-</component>
-<component name="extended_utilities_api" long-name="Extended Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
-</component>
-<component name="personalisation_plugin_api" long-name="Personalisation Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
-</component>
-<component name="extended_aiw_criteria_api" long-name="Extended AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="personalisation_application_api" long-name="Personalisation Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_application_api/group"/>
-</component>
-<component name="volume_popup_api" long-name="Volume Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
-</component>
-<component name="avkon_secondary_display_support_api" long-name="AVKON Secondary Display Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_support_api/group" filter="!test"/>
-</component>
-<component name="extended_setting_pages_api" long-name="Extended Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_setting_pages_api/group" filter="!test"/>
-</component>
-<component name="extended_lists_api" long-name="Extended Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_lists_api/group" filter="!test"/>
-</component>
-<component name="input_block_api" long-name="Input Block API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/input_block_api/group" filter="!test"/>
-</component>
-<component name="avkon_ui_server_api" long-name="AVKON UI Server API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_ui_server_api/group" filter="!test"/>
-</component>
-<component name="number_grouping_api" long-name="Number Grouping API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/number_grouping_api/group" filter="!test"/>
-</component>
-<component name="extended_status_pane_api" long-name="Extended Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_status_pane_api/group" filter="!test"/>
-</component>
-<component name="extended_notifiers_api" long-name="Extended Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notifiers_api/group" filter="!test"/>
-</component>
-<component name="task_list_api" long-name="Task List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
-</component>
-<component name="personalisation_slide_show_dialog_api" long-name="Personalisation Slide Show Dialog API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
-</component>
-<component name="key_event_utilities_api" long-name="Key Event Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_event_utilities_api/group"/>
-</component>
-<component name="emergency_call_support_api" long-name="Emergency Call Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/emergency_call_support_api/group" filter="!test"/>
-</component>
-<component name="extended_dialogs_api" long-name="Extended Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_dialogs_api/group"/>
-</component>
-<component name="legacy_ui_framework_headers_api" long-name="Legacy UI Framework Headers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/legacy_ui_framework_headers_api/group"/>
-</component>
-<component name="extended_editors_api" long-name="Extended Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_editors_api/group" filter="!test"/>
-</component>
-<component name="alarm_api" long-name="Alarm API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alarm_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_interface_base_api" long-name="AIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_base_api/group" filter="!test"/>
-</component>
-<component name="list_effects_api" long-name="List Effects API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/list_effects_api/group" filter="!test"/>
-</component>
-<component name="find_item_ui_api" long-name="Find Item UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/find_item_ui_api/group" filter="!test"/>
-</component>
-<component name="server_application_services_api" long-name="Server Application Services API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/server_application_services_api/group" filter="!test"/>
-</component>
-<component name="common_ui_settings_api" long-name="Common UI Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_ui_settings_api/group"/>
-</component>
-<component name="aiw_service_interface_menu_api" long-name="AIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_menu_api/group" filter="!test"/>
-</component>
-<component name="eikon_server_extension_client_api" long-name="EIKON Server Extension Client API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/eikon_server_extension_client_api/group" filter="!test"/>
-</component>
-<component name="skinnable_clock_api" long-name="Skinnable Clock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/skinnable_clock_api/group" filter="!test"/>
-</component>
-<component name="battery_pane_api" long-name="Battery Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/battery_pane_api/group" filter="!test"/>
-</component>
-<component name="fep_document_navigation_api" long-name="FEP Document Navigation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
-</component>
-<component name="personalisation_localised_texts_api" long-name="Personalisation Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
-</component>
-<component name="memory_card_ui_api" long-name="Memory Card UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
-</component>
-<component name="avkon_status_api" long-name="AVKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_status_api/group"/>
-</component>
-<component name="application_switching_api" long-name="Application Switching API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/application_switching_api/group" filter="!test"/>
-</component>
-<component name="avkon_localised_texts_api" long-name="AVKON Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_localised_texts_api/group"/>
-</component>
-<component name="avkon_secondary_display_api" long-name="AVKON Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_api/group"/>
-</component>
-<component name="extended_animation_api" long-name="Extended Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_notes_api" long-name="Extended Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notes_api/group" filter="!test"/>
-</component>
-<component name="screensaver_animation_plugin_definitions_api" long-name="Screensaver Animation Plugin Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/screensaver_animation_plugin_definitions_api/group"/>
-</component>
-<component name="text_scroller_api" long-name="Text Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/text_scroller_api/group" filter="!test"/>
-</component>
-<component name="custom_cursors_api" long-name="Custom Cursors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/custom_cursors_api/group" filter="!test"/>
-</component>
-<component name="screensaver_settings_api" long-name="Screensaver Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/screensaver_settings_api/group"/>
-</component>
-<component name="global_window_priorities_api" long-name="Global Window Priorities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_window_priorities_api/group"/>
-</component>
-<component name="extended_indicators_api" long-name="Extended Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_indicators_api/group" filter="!test"/>
-</component>
-<component name="special_character_table_api" long-name="Special Character Table API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/special_character_table_api/group" filter="!test"/>
-</component>
-<component name="avkon_settings_api" long-name="AVKON Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_settings_api/group"/>
-</component>
-<component name="extended_sounds_api" long-name="Extended Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_sounds_api/group"/>
-</component>
-<component name="themes_settings_api" long-name="Themes Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/themes_settings_api/group"/>
-</component>
-<component name="media_shared_document_api" long-name="Media Shared Document API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/media_shared_document_api/group" filter="!test"/>
-</component>
-<component name="extended_queries_api" long-name="Extended Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_queries_api/group"/>
-</component>
-<component name="phone_number_text_utilities_api" long-name="Phone Number Text Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
-</component>
-<component name="screensaver_runtime_api" long-name="Screensaver Runtime API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/screensaver_runtime_api/group"/>
-</component>
-<component name="extended_scroller_api" long-name="Extended Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_scroller_api/group"/>
-</component>
-<component name="key_rotator_api" long-name="Key Rotator API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_rotator_api/group" filter="!test"/>
-</component>
-<component name="extended_grids_api" long-name="Extended Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_grids_api/group" filter="!test"/>
-</component>
-<component name="generic_parameter_api" long-name="Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="indicator_touch_observer_api" long-name="Indicator Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_touch_observer_api/group"/>
-</component>
-<component name="popup_form_api" long-name="Popup Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/popup_form_api/group" filter="!test"/>
-</component>
-<component name="stylus_activated_popup_api" long-name="Stylus Activated Pop-up API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/stylus_activated_popup_api/group" filter="!test"/>
-</component>
-<component name="indicator_plugin_api" long-name="Indicator Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_plugin_api/group" filter="!test"/>
-</component>
-<component name="layout_configuration_api" long-name="Layout Configuration API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/layout_configuration_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_filter_factory_api" long-name="Common File Dialogs Filter Factory API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group" filter="!test"/>
-</component>
-<component name="avkon_anim_dll_api" long-name="AVKON Anim DLL API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_anim_dll_api/group"/>
-</component>
-<component name="extended_initialization_api" long-name="Extended Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_initialization_api/group" filter="!test"/>
-</component>
-<component name="long_tap_animation_api" long-name="Long Tap Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/long_tap_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_ui_framework_definitions_api" long-name="Extended UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_ui_framework_definitions_api/group"/>
-</component>
-<component name="extended_buttons_api" long-name="Extended Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_buttons_api/group" filter="!test"/>
-</component>
-<component name="aiw_provider_utility_api" long-name="AIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_provider_utility_api/group" filter="!test"/>
-</component>
-<component name="transition_effect_parameters_api" long-name="Transition Effect Parameters API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_parameters_api/group" filter="!test"/>
-</component>
-<component name="extended_input_capabilities_api" long-name="Extended Input Capabilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_input_capabilities_api/group" filter="!test"/>
-</component>
-<component name="uikon_status_api" long-name="UIKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/uikon_status_api/group"/>
-</component>
-<component name="transition_effect_utilities_api" long-name="Transition Effect Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_utilities_api/group" filter="!test"/>
-</component>
-<component name="pointer_event_modifier_api" long-name="Pointer Event Modifier API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/pointer_event_modifier_api/group" filter="!test"/>
-</component>
-<component name="avkon_testability_api" long-name="AVKON Testability API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_testability_api/group"/>
-</component>
-<component name="ganes_api" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ganes_api/group"/>
-</component>
-<component name="ode_api" long-name="Ode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ode_api/group"/>
-</component>
-<component name="physics_api" long-name="Physics API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/physics_api/group"/>
-</component>
-<component name="touch_pane_api" long-name="Touch Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_api/group" filter="!test"/>
-</component>
-<component name="touch_pane_observer_api" long-name="Touch Pane Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_observer_api/group"/>
-</component>
-<component name="alternate_fs_api" long-name="Alternate FS API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alternate_fs_api/group"/>
-</component>
-<component name="discreet_popup_api" long-name="Discreet Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/discreet_popup_api/group"/>
-</component>
-<component name="touch_gesture_framework_api" long-name="Touch Gesture Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_gesture_framework_api/group"/>
-<!-- should this be commented out? -->
-<!--<unit bldFile="classicui_plat/touch_gesture_framework_api/tsrc/group" filter="test,api_test"/> -->
-</component>
-<component name="extended_options_menu_api" long-name="Extended Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="classicui_pub" long-name="Classic UI Public Interfaces" level="specific">
-<component name="input_frame_api" long-name="Input Frame API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/input_frame_api/group" filter="!test"/>
-</component>
-<component name="window_server_event_observer_api" long-name="Window Server Event Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/window_server_event_observer_api/group" filter="!test"/>
-</component>
-<component name="application_framework_api" long-name="Application Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/application_framework_api/group" filter="!test"/>
-</component>
-<component name="scroller_api" long-name="Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/scroller_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_utilities_api" long-name="UI Framework Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_utilities_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_definitions_api" long-name="UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_definitions_api/group" filter="!test"/>
-</component>
-<component name="buttons_api" long-name="Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/buttons_api/group" filter="!test"/>
-</component>
-<component name="queries_api" long-name="Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/queries_api/group" filter="!test"/>
-</component>
-<component name="aiw_generic_parameter_api" long-name="AIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="editors_api" long-name="Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/editors_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_api" long-name="Common File Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/common_file_dialogs_api/group" filter="!test"/>
-</component>
-<component name="dialog_shutter_api" long-name="Dialog Shutter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialog_shutter_api/group" filter="!test"/>
-</component>
-<component name="fonts_api" long-name="Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/fonts_api/group" filter="!test"/>
-</component>
-<component name="screen_clearer_api" long-name="Screen Clearer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_clearer_api/group" filter="!test"/>
-</component>
-<component name="notifiers_api" long-name="Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notifiers_api/group" filter="!test"/>
-</component>
-<component name="notes_api" long-name="Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notes_api/group" filter="!test"/>
-</component>
-<component name="screen_saver_api" long-name="Screen Saver API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_saver_api/group" filter="!test"/>
-</component>
-<component name="status_pane_api" long-name="Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/status_pane_api/group" filter="!test"/>
-</component>
-<component name="base_controls_api" long-name="Base Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/base_controls_api/group" filter="!test"/>
-</component>
-<component name="grids_api" long-name="Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/grids_api/group" filter="!test"/>
-</component>
-<component name="context_pane_api" long-name="Context Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/context_pane_api/group" filter="!test"/>
-</component>
-<component name="lists_api" long-name="Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/lists_api/group" filter="!test"/>
-</component>
-<component name="popups_api" long-name="Popups API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/popups_api/group" filter="!test"/>
-</component>
-<component name="misc_controls_api" long-name="Misc Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/misc_controls_api/group" filter="!test"/>
-</component>
-<component name="keylock_api" long-name="Keylock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/keylock_api/group" filter="!test"/>
-</component>
-<component name="options_menu_api" long-name="Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/options_menu_api/group" filter="!test"/>
-</component>
-<component name="hierarchical_lists_api" long-name="Hierarchical Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hierarchical_lists_api/group" filter="!test"/>
-</component>
-<component name="navigation_pane_api" long-name="Navigation Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/navigation_pane_api/group" filter="!test"/>
-</component>
-<component name="tabs_api" long-name="Tabs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/tabs_api/group" filter="!test"/>
-</component>
-<component name="title_pane_touch_observer_api" long-name="Title Pane Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_touch_observer_api/group"/>
-</component>
-<component name="choice_list_api" long-name="Choice List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/choice_list_api/group" filter="!test"/>
-</component>
-<component name="info_popup_note_api" long-name="Info Popup Note API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/info_popup_note_api/group" filter="!test"/>
-</component>
-<component name="setting_pages_api" long-name="Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/setting_pages_api/group" filter="!test"/>
-</component>
-<component name="screen_mode_api" long-name="Screen Mode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_mode_api/group" filter="!test"/>
-</component>
-<component name="indicators_api" long-name="Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/indicators_api/group" filter="!test"/>
-</component>
-<component name="error_ui_api" long-name="Error UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/error_ui_api/group" filter="!test"/>
-</component>
-<component name="animation_api" long-name="Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/animation_api/group" filter="!test"/>
-</component>
-<component name="searchfield_api" long-name="Searchfield API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/searchfield_api/group" filter="!test"/>
-</component>
-<component name="labels_api" long-name="Labels API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/labels_api/group" filter="!test"/>
-</component>
-<component name="hotkeys_api" long-name="Hotkeys API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hotkeys_api/group" filter="!test"/>
-</component>
-<component name="initialization_api" long-name="Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/initialization_api/group" filter="!test"/>
-</component>
-<component name="volume_control_api" long-name="Volume Control API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/volume_control_api/group" filter="!test"/>
-</component>
-<component name="title_pane_api" long-name="Title Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_api/group" filter="!test"/>
-</component>
-<component name="sounds_api" long-name="Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/sounds_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_handler_api" long-name="AIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_service_handler_api/group" filter="!test"/>
-</component>
-<component name="aiw_criteria_api" long-name="AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="touch_ui_utilities_api" long-name="Touch UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/touch_ui_utilities_api/group" filter="!test"/>
-</component>
-<component name="generic_button_api" long-name="Generic Button API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/generic_button_api/group" filter="!test"/>
-</component>
-<component name="form_api" long-name="Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/form_api/group" filter="!test"/>
-</component>
-<component name="uikon_core_controls" long-name="Uikon Core Controls" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/uikon_core_controls/group" filter="!test"/>
-</component>
-<component name="calendar_api" long-name="Calendar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/calendar_api/group"/>
-</component>
-<component name="toolbar_api" long-name="Toolbar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/toolbar_api/group" filter="!test"/>
-</component>
-<component name="server_application_api" long-name="Server Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/server_application_api/group"/>
-</component>
-<component name="slider_api" long-name="Slider API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/slider_api/group" filter="!test"/>
-</component>
-<component name="private_ui_framework_api" long-name="Private UI Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/private_ui_framework_api/group" filter="!test"/>
-</component>
-<component name="dialogs_api" long-name="Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialogs_api/group" filter="!test"/>
-</component>
-<component name="document_handler_api" long-name="Document handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/document_handler_api/group"/>
-</component>
-<component name="images_api" long-name="Images API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/images_api/group" filter="!test"/>
-</component>
-<component name="stylus_popup_menu_api" long-name="Stylus Pop-up Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/stylus_popup_menu_api/group" filter="!test"/>
-</component>
-<component name="information_preview_popup_api" long-name="Information Preview Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/information_preview_popup_api/group" filter="!test"/>
-</component>
-<component name="intermediate_state_api" long-name="Intermediate State API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/intermediate_state_api/group"/>
-</component>
-<component name="help_launcher_api" long-name="Help Launcher API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/help_launcher_api/group"/>
-</component>
-</collection>
-<collection name="ode" long-name="Open Dynamics Engine" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="ode_build" filter="s60" long-name="ODE">
-<unit bldFile="mw/classicui/ode/group"/>
-</component>
-</collection>
-<collection name="uifw" long-name="UI Framework" level="server">
-<component name="uiklaf" filter="s60" long-name="Uikon Look-and-Feel">
-<unit bldFile="mw/classicui/uifw/uiklaf/group"/>
-</component>
-<component name="eikctl" filter="s60" long-name="Eikon Controls">
-<unit bldFile="mw/classicui/uifw/eikctl/group"/>
-</component>
-<component name="avkon" filter="s60" long-name="Avkon">
-<!-- can only have one unit. Split into 3 components, or #include all from same bld.inf -->
-<unit bldFile="mw/classicui/uifw/avkon/aknphysics/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/aknconf/group"/>
-</component>
-<component name="eikstd" filter="s60" long-name="Eikon Standard">
-<unit bldFile="mw/classicui/uifw/eikstd/group"/>
-</component>
-<component name="aknglobalui" filter="s60" long-name="Avkon Global UI">
-<unit bldFile="mw/classicui/uifw/aknglobalui/group"/>
-</component>
-<component name="ganes" filter="s60" long-name="Ganes">
-<unit bldFile="mw/classicui/uifw/ganes/group"/>
-</component>
-</collection>
-<collection name="commonuis" long-name="Common UIs" level="specific">
-<component name="commonui" filter="s60" long-name="Common UI">
-<unit bldFile="mw/classicui/commonuis/commonui/group"/>
-</component>
-<component name="commondialogs" filter="s60" long-name="Common Dialogs">
-<unit bldFile="mw/classicui/commonuis/commondialogs/group"/>
-</component>
-</collection>
-<collection name="applicationinterworkingfw" long-name="Application Interworking Framework" level="generic">
-<component name="aifwservicehandler" filter="s60" long-name="Application Interworking Service Handler">
-<unit bldFile="mw/classicui/applicationinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-<collection name="psln" long-name="Personalization" level="specific">
-<!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
-<component name="psln_build" filter="s60" long-name="Personalization Build">
-<unit bldFile="mw/classicui/psln/group"/>
-</component>
-</collection>
-<collection name="commonadapter" long-name="Common Adapter" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="commonadapter_build" filter="s60" long-name="Common Adapter Build">
-<unit bldFile="mw/classicui/commonadapter/group"/>
-</component>
-</collection>
-<collection name="akntouchgesturefw" long-name="Avkon Touch Gesture Framework" level="generic">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="akntouchgesturefw_build" filter="s60" long-name="Avkon Touch Gesture Framework Build" introduced="^3">
-<unit bldFile="mw/classicui/akntouchgesturefw/group"/>
-</component>
-</collection>
-<collection name="uiutils" long-name="UI Utils" level="specific">
-<component name="localizer" filter="s60" long-name="Directory Localizer">
-<unit bldFile="mw/classicui/uiutils/localizer/group"/>
-</component>
-<component name="findutil" filter="s60" long-name="Find Utility">
-<unit bldFile="mw/classicui/uiutils/findutil/group"/>
-</component>
-<component name="gamerecognizer" filter="s60" long-name="Game Recognizer" plugin="Y">
-<unit bldFile="mw/classicui/uiutils/gamerecognizer/group"/>
-</component>
-<component name="aknjapanesereading" filter="s60" long-name="Avkon Japanese Reading">
-<unit bldFile="mw/classicui/uiutils/aknjapanesereading/group"/>
-</component>
-</collection>
-<collection name="commonuisupport" long-name="Common UI Support" level="support">
-<component name="uikon" long-name="Uikon" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uikon/group" mrp="mw/classicui/commonuisupport/uikon/group/app-framework_uikon.mrp"/>
-</component>
-<component name="errorresolverdata" long-name="Error Resolver Data" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/errorresolverdata/group" mrp="mw/classicui/commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
-</component>
-<component name="uilaf" long-name="UI Look and Feel" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uilaf/GROUP" mrp="mw/classicui/commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
-</component>
-<component name="grid" long-name="Grid" purpose="optional">
-<unit bldFile="mw/classicui/commonuisupport/grid/group" mrp="mw/classicui/commonuisupport/grid/group/app-framework_grid.mrp"/>
-</component>
-<component name="uifwsdocs" long-name="UI Frameworks Documentation" purpose="development" class="doc">
-<unit mrp="mw/classicui/commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
-</component>
-</collection>
-<collection name="lafagnosticuifoundation" long-name="Look-and-Feel Agnostic UI Foundation" level="base">
-<component name="cone" long-name="Control Environment" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/cone/group" mrp="mw/classicui/lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
-</component>
-<component name="graphicseffects" long-name="Graphics Effects" introduced="9.2" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/graphicseffects/group" mrp="mw/classicui/lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
-</component>
-<component name="uigraphicsutils" long-name="UI Graphics Utilities" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group" mrp="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
-</component>
-<component name="clockanim" long-name="Clock" purpose="optional" plugin="Y">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/clockanim/group" mrp="mw/classicui/lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
-</component>
-<component name="bmpanimation" long-name="BMP Animation" introduced="6.0" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/bmpanimation/group" mrp="mw/classicui/lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
-</component>
-<component name="animation" long-name="Animation" introduced="9.1" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/animation/group" mrp="mw/classicui/lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
-</component>
-</collection>
-<collection name="classicui_info" long-name="Classic UI Info" level="specific">
-<!-- the multiple units in the API test components need to be resolved -->
-<component name="classicui_metadata" long-name="Classic UI Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/classicui/classicui_info/classicui_metadata/classicui_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="svgt" level="generic" long-name="SVG Tiny" levels="util ui">
-<collection name="svgt_plat" long-name="SVG Tiny Platform Interfaces" level="ui">
-<component name="svgt_api" long-name="SVGT API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/svgt_api/group"/>
-</component>
-<component name="nvg_api" long-name="NVG API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/nvg_api/group"/>
-</component>
-</collection>
-<collection name="svgtopt" long-name="SVG-T Engine" level="util">
-<component name="svgtopt_build" filter="s60" long-name="SVG Engine" introduced="9.2">
-<!-- component is at collection level. Needs to be moved down a directory -->
-<unit bldFile="mw/svgt/svgtopt/group"/>
-</component>
-<component name="svgtplugin" filter="s60" long-name="SVG Plugin" introduced="9.2" plugin="Y">
-<unit bldFile="mw/svgt/svgtopt/svgtplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="uiaccelerator" level="generic" long-name="UI Accelerator" levels="plugin framework server ex if">
-<collection name="uiaccelerator_plat" long-name="UI Accelerator Platform Interfaces" level="if">
-<component name="alf_core_toolkit_api" long-name="ALF Core Toolkit API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/group"/>
-</component>
-<component name="alf_visual_api" long-name="ALF Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/group"/>
-</component>
-<component name="alf_extended_visual_api" long-name="ALF Extended Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/group"/>
-</component>
-<component name="alf_extension_api" long-name="ALF Extension API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/group"/>
-</component>
-<component name="alf_tracing_api" long-name="ALF Tracing API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/group"/>
-</component>
-<component name="alf_client_server_api" long-name="ALF Client Server API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/group"/>
-</component>
-</collection>
-<collection name="uiacceltk" long-name="UI Accelerator Toolkit" level="framework">
-<component name="hitchcock" filter="s60" long-name="Hitchcock">
-<unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/group"/>
-</component>
-<component name="uiacceltk_build" filter="s60" long-name="UI Accelerator Toolkit Build">
-<!-- move into the other component, or remove the #include and make this UI Accelerator Toolkit ROM-->
-<unit bldFile="mw/uiaccelerator/uiacceltk/group"/>
-</component>
-</collection>
-</block>
-<block name="uiresources" level="generic" long-name="UI Resources" levels="compile plugin framework server generic data">
-<!-- are the custom filters below needed? -->
-<collection name="uiresources_pub" long-name="UI Resources Public Interfaces" level="data">
-<component name="pictograph_api" long-name="Pictograph API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/pictograph_api/group" filter="!test"/>
-</component>
-<component name="skins_api" long-name="Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/skins_api/group" filter="!test"/>
-</component>
-<component name="font_definition_api" long-name="Font Definition API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/font_definition_api/group" filter="!test"/>
-</component>
-<component name="graphics_api" long-name="Graphics API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/graphics_api/group" filter="!test"/>
-</component>
-<component name="scalable_icons_api" long-name="Scalable Icons API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/scalable_icons_api/group"/>
-</component>
-<component name="layout_id_definitions_api" long-name="Layout ID Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/layout_id_definitions_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_plat" long-name="UI Resources Platform Interfaces" level="data">
-<component name="layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_system_private_api/group" filter="!test"/>
-</component>
-<component name="layout_data_api" long-name="Layout Data API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_data_api/group" filter="!test"/>
-</component>
-<component name="cdl_api" long-name="CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/cdl_api/group" filter="!test"/>
-</component>
-<component name="extended_skins_api" long-name="Extended Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_skins_api/group" filter="!test"/>
-</component>
-<component name="tfx_server_controller_plugin_api" long-name="TFX Server Controller Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_controller_plugin_api/group"/>
-</component>
-<component name="extended_fonts_api" long-name="Extended Fonts API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_fonts_api/group" filter="!test"/>
-</component>
-<component name="graphic_configuration_api" long-name="Graphic Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/graphic_configuration_api/group" filter="!test"/>
-</component>
-<component name="mif_header_cdl_api" long-name="MIF Header CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mif_header_cdl_api/group"/>
-</component>
-<component name="personalisation_and_skins_settings_api" long-name="Personalisation and Skins Settings API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/personalisation_and_skins_settings_api/group"/>
-</component>
-<component name="tfx_effect_setup_plugin_api" long-name="TFX Effect Setup Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_effect_setup_plugin_api/group"/>
-</component>
-<component name="mifconv_definitions_api" long-name="Mifconv Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mifconv_definitions_api/group"/>
-</component>
-<component name="wallpaper_configuration_api" long-name="Wallpaper Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/wallpaper_configuration_api/group"/>
-</component>
-<component name="language_code_definitions_api" long-name="Language Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/language_code_definitions_api/group"/>
-</component>
-<component name="skins_image_attributes_api" long-name="Skins Image Attributes API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
-</component>
-<component name="private_user_area_code_definitions_api" long-name="Private User Area Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/private_user_area_code_definitions_api/group"/>
-</component>
-<component name="tfx_server_plugin_ids_api" long-name="TFX Server Plug-in IDs API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_plugin_ids_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_info" long-name="UI Resources Info" level="data">
-<component name="uiresources_test" filter="s60,test,api_test" long-name="UI Resources Tests" purpose="development"/>
-</collection>
-<collection name="uigraphics" long-name="UI Graphics" level="generic">
-<component name="bitmaps2" filter="s60" long-name="Bitmaps 2" class="config">
-<unit bldFile="mw/uiresources/uigraphics/bitmaps2/group"/>
-</component>
-<component name="icons" filter="s60" long-name="Icons" class="config">
-<unit bldFile="mw/uiresources/uigraphics/icons/group"/>
-</component>
-<component name="variatedbitmaps" filter="s60" long-name="Variated Bitmaps" class="config">
-<unit bldFile="mw/uiresources/uigraphics/variatedbitmaps/group"/>
-</component>
-<component name="aknicon" filter="s60" long-name="Avkon Icon Framework">
-<unit bldFile="mw/uiresources/uigraphics/aknicon/group"/>
-</component>
-<component name="nvgrenderstage" filter="sf_build" long-name="NVG Render Stage">
-<unit bldFile="mw/uiresources/uigraphics/nvgrenderstage/group"/>
-</component>
-</collection>
-<collection name="layouts" long-name="Layouts" level="plugin">
-<component name="cdl" filter="s60" long-name="Customization Definition Language">
-<!-- can only have one unit. Need to #include them or split into multiple components -->
-<unit bldFile="mw/uiresources/layouts/cdl/cdlengine/group"/>
-<unit bldFile="mw/uiresources/layouts/cdl/cdlserver/group"/>
-</component>
-<component name="aknlayout2" filter="s60" long-name="Avkon Layout 2">
-<unit bldFile="mw/uiresources/layouts/aknlayout2/group"/>
-</component>
-</collection>
-<collection name="skins" long-name="Skins" level="data">
-<component name="aknskincontent" filter="s60" long-name="Avkon Skin Content" class="config">
-<unit bldFile="mw/uiresources/skins/aknskincontent/group"/>
-</component>
-<component name="aknskins" filter="s60" long-name="Avkon Skin Compiler">
-<unit bldFile="mw/uiresources/skins/aknskins/group"/>
-</component>
-</collection>
-<collection name="pictographs" long-name="Pictographs" level="data">
-<component name="aknpictograph" filter="s60" long-name="Avkon Pictograph">
-<unit bldFile="mw/uiresources/pictographs/aknpictograph/group"/>
-</component>
-</collection>
-<collection name="locales" long-name="Locales" level="framework">
-<component name="locales_build" filter="s60" long-name="Locales Build">
-<unit bldFile="mw/uiresources/locales/loce32"/>
-</component>
-</collection>
-<collection name="uiconfig" long-name="UI Config" level="server">
-<component name="s60config" filter="s60" long-name="S60 UI Config">
-<unit bldFile="mw/uiresources/uiconfig/s60config/group"/>
-</component>
-</collection>
-<collection name="fontsupport" long-name="Font Support" level="generic">
-<component name="fontprovider" filter="s60" long-name="Font Provider">
-<unit bldFile="mw/uiresources/fontsupport/fontprovider/group"/>
-</component>
-<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
- <component id="s60_fonts" filter="s60" name="S60 Fonts">
- <unit bldFile="fontsupport/fontutils/group"/>
- </component>
--->
-<component name="fontutils" filter="sf_build" long-name="Font Utils">
-<unit bldFile="mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
-</component>
-</collection>
-<collection name="helpthemes" long-name="Help Themes" level="data">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helpthemes_build" filter="s60" long-name="Help Themes Build" class="config">
-<unit bldFile="mw/uiresources/helpthemes/group"/>
-</component>
-</collection>
-</block>
-<block name="hapticsservices" level="generic" long-name="Haptics Services" levels="fw server api">
-<collection name="hapticsservices_plat" long-name="Haptics Services Platform Interfaces" level="api">
-<component name="tacticon_api" long-name="Tacticon API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tacticon_api/group"/>
-</component>
-<component name="tactile_feedback_core_api" long-name="Tactile Feedback Core API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_core_api/group"/>
-</component>
-<component name="tactile_feedback_server_api" long-name="Tactile Feedback Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_server_api/group"/>
-</component>
-</collection>
-<collection name="hapticsservices_pub" long-name="Haptics Services Public Interfaces" level="api">
-<component name="tactile_feedback_client_api" long-name="Tactile Feedback Client API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_pub/tactile_feedback_client_api/group"/>
-</component>
-</collection>
-<collection name="tacticonserver" long-name="Tacticon Server" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="tacticonserver_build" filter="s60" long-name="Tacticon Server Build" introduced="^3">
-<unit bldFile="mw/hapticsservices/tacticonserver/group"/>
-<!-- clients and servers are suauly the same component. Consider moving pluign to a separate component if needed -->
-</component>
-</collection>
-<collection name="tactilefeedback" long-name="Tactile Feedback" level="fw">
-<component name="tactilearearegistry" filter="s60" long-name="Tactile Area Registry" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilearearegistry/group"/>
-</component>
-<component name="tactilefeedbackresolver" filter="s60" long-name="Tactile Feedback Resolver" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackresolver/group"/>
-</component>
-<component name="tactileclickplugin" filter="s60" long-name="Tactile Click Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileclickplugin/group"/>
-</component>
-<component name="tactilefeedbackclient" filter="s60" long-name="Tactile Feedback Client" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackclient/group"/>
-</component>
-<component name="tactileactionplugin" filter="s60" long-name="Tactile Action Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileactionplugin/group"/>
-</component>
-<component name="tactilefeedback_build" filter="s60" long-name="Tactile Feedback Build" introduced="^1">
-<!-- consider moving IBY to one fo the above components -->
-<unit bldFile="mw/hapticsservices/tactilefeedback/group"/>
-</component>
-</collection>
-</block>
-<block name="gsprofilesrv" level="generic" long-name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
-<collection name="gsprofilesrv_pub" long-name="GS and Profiles Services Public Interfaces" level="specific">
-<component name="profiles_engine_active_profile_settings_api" long-name="Profiles Engine Active Profile Settings API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_active_profile_settings_api/group"/>
-</component>
-<component name="profiles_engine_wrapper_api" long-name="Profiles Engine Wrapper API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_wrapper_api/group"/>
-</component>
-</collection>
-<collection name="gsprofilesrv_plat" long-name="GS and Profiles Services Platform Interfaces" level="specific">
-<component name="profiles_engine_api" long-name="Profiles Engine API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_engine_api/group"/>
-</component>
-<component name="profiles_mediafilelist_api" long-name="Media File List API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_mediafilelist_api/group"/>
-</component>
-<component name="filelist_api" long-name="File List API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/filelist_api/group"/>
-</component>
-<component name="settings_backgroundimage_api" long-name="Settings Background Image API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_backgroundimage_api/group"/>
-</component>
-<component name="settings_framework_api" long-name="Settings Framework API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_framework_api/group"/>
-</component>
-<component name="settings_launch_api" long-name="Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_launch_api/group"/>
-</component>
-<component name="settings_listbox_api" long-name="Settings List Box API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_listbox_api/group"/>
-</component>
-<component name="settings_plugin_api" long-name="Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_plugin_api/group"/>
-</component>
-<component name="settings_uis_cenrep_collection_api" long-name="Settings UIs CenRep Collection API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
-</component>
-</collection>
-<collection name="gssettingsuis" long-name="General Settings UIs" level="framework">
-<component name="gs" filter="s60" long-name="General Settings" introduced="9.2">
-<unit bldFile="mw/gsprofilesrv/gssettingsuis/gs/group"/>
-</component>
-</collection>
-<collection name="profilesservices" long-name="Profiles Services" level="server">
-<component name="filelist" filter="s60" long-name="File List" introduced="9.1">
-<unit bldFile="mw/gsprofilesrv/profilesservices/filelist/group"/>
-</component>
-<component name="mediafilelist" filter="s60" long-name="Media File List" introduced="^2">
-<unit bldFile="mw/gsprofilesrv/profilesservices/mediafilelist/group"/>
-</component>
-<component name="profileengine" filter="s60" long-name="Profile Engine" introduced="9.1">
-<unit bldFile="mw/gsprofilesrv/profilesservices/profileengine/group"/>
-</component>
-<component name="ringingtone3dplugin" filter="s60" long-name="Ringing Tone 3D Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/gsprofilesrv/profilesservices/ringingtone3dplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreensrv" level="specific" long-name="Home Screen Services" levels="plugin framework server generic specific">
-<collection name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" level="specific">
-<component name="ai_content_model_api" long-name="AI Content Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_content_model_api/group"/>
-</component>
-<component name="ai_utilities_api" long-name="AI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_utilities_api/group" filter="!test"/>
-</component>
-<component name="ai_plugin_management_api" long-name="AI Plug-in Management API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_management_api/group"/>
-</component>
-<component name="ai_plugin_information_api" long-name="AI Plug-in Information API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_information_api/group"/>
-</component>
-<component name="ai_variation_api" long-name="AI Variation API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_variation_api/group"/>
-</component>
-<component name="action_handler_plugin_api" long-name="Action Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/group" filter="!test"/>
-</component>
-<component name="content_harvester_plugin_api" long-name="Content Harvester Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/group" filter="!test"/>
-</component>
-<component name="menu_model_api" long-name="Menu Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_model_api/group"/>
-</component>
-<component name="menu_sat_interface_api" long-name="Menu SAT Interface API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/group" filter="!test"/>
-</component>
-<component name="external_home_screen_api" long-name="External Home Screen API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/external_home_screen_api/group"/>
-</component>
-<component name="menu_content_service_api" long-name="Menu Content Service API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_content_service_api/group" filter="!test"/>
-</component>
-<component name="sapi_contentpublishing" long-name="SAPI Content Publishing" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing/group"/>
-</component>
-<component name="sapi_backstepping" long-name="SAPI Backstepping" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_backstepping/group"/>
-</component>
-<component name="sapi_actionhandler" long-name="SAPI Action Handler" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_actionhandler/group"/>
-</component>
-<component name="sapi_homescreenplugin" long-name="SAPI Homescreen Plugin" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_homescreenplugin/group" filter="!test"/>
-</component>
-<component name="sapi_menucontent" long-name="SAPI Menu Content" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_menucontent/group"/>
-</component>
-<component name="xcfw_api" long-name="XCFW API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/xcfw_api/group"/>
-</component>
-<component name="idlefw_api" long-name="Idle Framework API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/idlefw_api/group"/>
-</component>
-<component name="hs_widget_publisher_api" long-name="Home Screen Publishing API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_widget_publisher_api/group"/>
-</component>
-<component name="context_utility_api" long-name="UI Context Utility API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/context_utility_api/group"/>
-</component>
-<component name="hs_settings_api" long-name="HS Settings API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_settings_api/group"/>
-</component>
-<component name="hs_content_control_api" long-name="HS Content Control API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_content_control_api/group"/>
-</component>
-</collection>
-<collection name="xcfw" long-name="XML Content Framework" level="framework">
-<!-- collection is really a component, needs to be moved down a directory -->
-<component name="xcfw_build" filter="s60" long-name="XML Content Framework Build">
-<unit bldFile="mw/homescreensrv/xcfw/group"/>
-</component>
-</collection>
-<collection name="homescreenpluginsrv" long-name="Home Screen Plugin Service" level="plugin">
-<component name="hspsdefinitionengine" filter="s60" long-name="HS Plugin Service Definition Engine" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsdefinitionengine/group"/> -->
-</component>
-<component name="hspsdom" filter="s60" long-name="HS Plugin Service DOM" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsdom/group"/> -->
-</component>
-<component name="hspstools" filter="s60" long-name="HS Server Tools">
-<!-- <unit bldFile="homescreenpluginsrv/hspstools/group"/> -->
-</component>
-<component name="hspspluginregistry" filter="s60" long-name="HS Plugin Registry" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspspluginregistry/group"/>-->
-</component>
-<component name="hspsmanager" filter="s60" long-name="HSPS Manager" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsmanager/group"/>-->
-</component>
-<component name="hspsodt" filter="s60" long-name="HSPS Object Description Tree" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsodt/group"/>-->
-</component>
-<component name="hspsresource" filter="s60" long-name="HS Plugin Server Resource" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresource/group"/>-->
-</component>
-<component name="hspsresult" filter="s60" long-name="HS Plugin Server Result" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
-</component>
-<component name="homescreen_settings_api" filter="s60" long-name="HS Settings API" class="api placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
-</component>
-<component name="homescreenpluginsrv_build" filter="s60" long-name="HSPS Build">
-<!-- need to break this up into the self-contained components above and uncomment them -->
-<unit bldFile="mw/homescreensrv/homescreenpluginsrv/group"/>
-</component>
-</collection>
-<collection name="idlefw" long-name="Idle Framework" level="framework">
-<!-- Uncomment all units when configuration is in place. All currently #included from idlefw_build -->
-<component name="idlefw_plugins" filter="s60" long-name="Idle Framework Plugins" plugin="Y" class="placeholder">
-<!--<unit bldFile="idlefw/plugins/group"/>-->
-</component>
-<component name="hslaunch" filter="s60" long-name="Home Screen Launch" class="placeholder">
-<!--<unit bldFile="idlefw/plugins/group"/>-->
-</component>
-<component name="idlefw_build" filter="s60" long-name="Idle Framework Build">
-<!--split this into components, or separate from the above components and move this down a directory -->
-<unit bldFile="mw/homescreensrv/idlefw/group"/>
-</component>
-</collection>
-<collection name="menucontentsrv" long-name="Menu Content Service" level="generic">
-<component name="menusatinterface" filter="s60" long-name="Menu SAT Interface">
-<unit bldFile="mw/homescreensrv/menucontentsrv/menusatinterface/group"/>
-</component>
-<component name="menucontentsrv_build" filter="s60" long-name="Menu Content Service Build">
-<!--split this into components, or separate from the above component and move this down a directory -->
-<unit bldFile="mw/homescreensrv/menucontentsrv/group"/>
-</component>
-</collection>
-<collection name="backsteppingsrv" long-name="Back Stepping Service" level="server">
-<!-- collection is really a component, needs to be moved down a directory -->
-<component name="bsengine" long-name="Back Stepping Engine" filter="s60">
-<unit bldFile="mw/homescreensrv/backsteppingsrv/group"/>
-</component>
-</collection>
-<collection name="contentpublishingsrv" long-name="Content Publishing Service" level="server">
-<component name="contentpublishingdebug" filter="s60" long-name="Content Publishing Debug">
-<!-- need to move this component outside of contentpublishingutils and into separate component directory -->
-<!-- <unit bldFile="contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/> -->
-</component>
-<component name="contentpublishingutils" filter="s60" long-name="Content Publishing Utils">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingutils/group"/>
-</component>
-<component name="contentpublishingserver" filter="s60" long-name="Content Publishing Server">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingserver/group"/>
-</component>
-<component name="contentharvester" filter="s60" long-name="Content Harvester">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
-</component>
-<component name="contentpublishingsrv_build" filter="s60" long-name="Content Publishing Service Build">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/group"/>
-</component>
-</collection>
-<collection name="contextutility" long-name="Context Utility" level="generic">
-<!-- collection is really a component, needs to be moved down a directory -->
-<component name="contextutility_build" long-name="Context Utility Build" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contextutility/group"/>
-</component>
-</collection>
-<collection name="contentcontrolsrv" long-name="Content Control Service" level="server">
-<component name="ccsrv" long-name="Content Control Service" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccsrv/group"/>
-</component>
-<component name="ccsrvapi" long-name="Content Control Service API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccsrvapi/group"/>
-</component>
-<component name="ccclientsession" long-name="Content Control Client Session" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccclientsession/group"/>
-</component>
-<component name="hsccclient" long-name="HS Content Control Client" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/hsccclient/group"/>
-</component>
-<component name="hscontentinfo" long-name="Home Screen Content Info" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/hscontentinfo/group"/>
-</component>
-<component name="contentcontrolsrv_build" long-name="Content Control Service Build" filter="s60" introduced="^3">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/group"/>
-</component>
-</collection>
-</block>
-<block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
-<collection name="appinstall_plat" long-name="Application Installation Platform Interfaces" level="api">
-<component name="iaupdate_api" long-name="IA Update API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/iaupdate_api/group"/>
-</component>
-<component name="task_plugin_api" long-name="Task Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_plugin_api/group"/>
-</component>
-<component name="sw_installer_common_ui_api" long-name="SW Installer Common UI API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_common_ui_api/group"/>
-</component>
-<component name="sw_installer_launcher_api" long-name="SW Installer Launcher API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_launcher_api/group"/>
-</component>
-<component name="task_management_api" long-name="Task Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_management_api/group"/>
-</component>
-<component name="sw_installer_ui_plugin_api" long-name="SW Installer UI Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ui_plugin_api/group"/>
-</component>
-<component name="sw_installer_cr_keys" long-name="SW Installer CR Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_cr_keys/group"/>
-</component>
-<component name="sw_installer_ps_keys" long-name="SW Installer PS Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
-</component>
-<component name="appmngr2runtimeapi" long-name="Application Manager 2 Runtime Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
-</component>
-</collection>
-<collection name="appinstall_pub" long-name="Application Installation Public Interfaces" level="api">
-<component name="startup_list_management_api" long-name="Startup List Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
-</component>
-</collection>
-<collection name="ncdengine" long-name="Nokia Content Discover" level="framework">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="ncdengine_engine" filter="s60" long-name="NCD Engine" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/engine/group"/>
-</component>
-<component name="debuglogger" filter="s60" long-name="NCD Debug Logger" introduced="^1" class="placeholder">
-<!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
-</component>
-<component name="ncdengine_build" filter="s60" long-name="NCD Build" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/group"/>
-</component>
-</collection>
-<collection name="appinstaller" long-name="Application Installer" level="generic">
-<component name="appmngr2" filter="s60" long-name="Application Manager 2" introduced="^2">
-<unit bldFile="mw/appinstall/appinstaller/appmngr2/group"/>
-</component>
-<component name="appinstui" filter="s60" long-name="Application Installer UI" introduced="^2">
-<unit bldFile="mw/appinstall/appinstaller/appinstui/group"/>
-</component>
-</collection>
-<collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="api">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="iaupdateapi_stub_build" long-name="IA Update API Stub Build" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdateapi_stub/group"/>
-</component>
-</collection>
-<collection name="iaupdate" long-name="Independent Apps Update" level="api">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="iad" long-name="Software Update" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/iad/group"/>
-</component>
-<component name="iaupdate_help" filter="s60" long-name="IA Update Help" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/help/group"/>
-</component>
-<component name="iaupdate_build" filter="s60" long-name="IA Update Build" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/group"/>
-</component>
-</collection>
-<collection name="installationservices" long-name="Installation Services" level="generic">
-<component name="swi" long-name="Secure Software Install" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swi/group" mrp="mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
-</component>
-<component name="swidevicetools" long-name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
-<unit bldFile="mw/appinstall/installationservices/swidevicetools/group" mrp="mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
-</component>
-<component name="swiconfig" long-name="Software Install Config" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appinstall/installationservices/swiconfig/group" mrp="mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
-</component>
-</collection>
-<collection name="secureswitools" long-name="Secure Software Install Tools" level="tool">
-<component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/makekeys/group" mrp="mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
-</component>
-<component name="swianalysistoolkit" long-name="SWI Analysis Toolkit" purpose="development" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
-</component>
-<component name="openssllib" long-name="OpenSSL Library" purpose="optional" class="PC">
-<unit mrp="mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
-</component>
-<component name="swisistools" long-name="Secure Software Install SIS Tools" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swisistools/group" mrp="mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
-</component>
-</collection>
-<collection name="appinstall_info" long-name="Application Installation Info" level="api">
-<component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="serviceapifw" level="specific" long-name="Service API Framework" levels="plugin framework server generic specific">
-<collection name="serviceapifw_pub" long-name="Service API Framework Public Interfaces" level="specific"/>
-<collection name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" level="specific">
-<component name="rtsecuritymanager_common_api" long-name="Runtime Security Manager Common API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/group"/>
-</component>
-<component name="rtsecuritymanager_utility_api" long-name="Runtime Security Manager Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
-</component>
-<component name="rtsecuritymanager_client_api" long-name="Runtime Security Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/group"/>
-</component>
-<component name="liw_provider_utility_api" long-name="LIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_provider_utility_api/group"/>
-</component>
-<component name="liw_service_interface_base_api" long-name="LIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_base_api/group"/>
-</component>
-<component name="liw_service_interface_menu_api" long-name="LIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_menu_api/group"/>
-</component>
-<component name="liw_criteria_api" long-name="LIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_criteria_api/group"/>
-</component>
-<component name="liw_generic_parameter_api" long-name="LIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_generic_parameter_api/group"/>
-</component>
-<component name="liw_service_handler_api" long-name="LIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_handler_api/group"/>
-</component>
-</collection>
-<collection name="rtsecuritymanager" long-name="Runtime Security Manager" level="server">
-<component name="rtsecuritymanagerutil" filter="s60" long-name="Runtime Security Manager Util">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
-</component>
-<component name="rtsecuritymanagerserver" filter="s60" long-name="Runtime Security Manager Server">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/>
-</component>
-<component name="rtsecuritymanagerclient" filter="s60" long-name="Runtime Security Manager Client">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/>
-</component>
-<component name="rtsecuritymanager_build" filter="s60" long-name="Runtime Security Manager Build">
-<!-- Move the export to the appropriate components, or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/group"/>
-</component>
-</collection>
-<collection name="languageinterworkingfw" long-name="Language Interworking Framework" level="framework">
-<component name="lifwservicehandler" filter="s60" long-name="Service Handler">
-<unit bldFile="mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-</block>
-<block name="serviceapi" level="specific" long-name="Service API" levels="os mw1 mw2 app">
-<!-- should break up this collection into something meaningful -->
-<collection name="serviceproviders" long-name="Service Providers" level="mw1">
-<component name="sapi_contacts_vpbk" long-name="Contacts Phonebook SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
-</component>
-<component name="sapi_location" long-name="Location SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_location/group"/>
-</component>
-<component name="sapi_mediamanagement" long-name="Media Management SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/group"/>
-</component>
-<component name="sapi_landmarks" long-name="Landmarks SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
-</component>
-<component name="sapi_messaging" long-name="Messaging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/group"/>
-</component>
-<component name="sapi_applicationmanager" long-name="Application Manager SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
-</component>
-<component name="sapi_calendar" long-name="Calendar SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_calendar/group"/>
-</component>
-<component name="sapi_logging" long-name="Logging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_logging/group"/>
-</component>
-<component name="sapi_sensor" long-name="Sensor SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sensor/group"/>
-</component>
-<component name="sapi_sysinfo" long-name="Sysinfo SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sysinfo/group"/>
-</component>
-<component name="sapi_serviceregistry" long-name="Service Registry SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
-</component>
-<component name="jsapi" long-name="Javascript API" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/jsapi/group"/>
-</component>
-<component name="serviceproviders_build" filter="s60" long-name="Service API Build">
-<!-- distribute the exports or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapi/serviceproviders/group"/>
-</component>
-</collection>
-</block>
-<block name="web" level="specific" long-name="Web" levels="plugin utils server generic specific">
-<collection name="web_pub" long-name="Web Public Interfaces" level="specific">
-<component name="browser_control_api" long-name="Browser Control API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_control_api/group"/>
-</component>
-<component name="download_mgr_client_api" long-name="Download Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_client_api/group"/>
-</component>
-<component name="download_mgr_ui_api" long-name="Download Manager UI Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_ui_api/group"/>
-</component>
-<component name="favourites_engine_api" long-name="Favourites Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/favourites_engine_api/group"/>
-</component>
-<component name="browser_plugin_api" long-name="Browser Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_plugin_api/group"/>
-</component>
-<component name="settings_api" long-name="Settings API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/settings_api/group"/>
-</component>
-</collection>
-<collection name="web_plat" long-name="Web Platform Interfaces" level="specific">
-<component name="aiw_browser_provider_api" long-name="AIW Browser Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/aiw_browser_provider_api/group"/>
-</component>
-<component name="browser_dialogs_provider_api" long-name="Browser Dialogs Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_dialogs_provider_api/group"/>
-</component>
-<component name="browser_platform_api" long-name="Browser Platform API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_platform_api/group"/>
-</component>
-<component name="cod_handler_api" long-name="COD Handler API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cod_handler_api/group"/>
-</component>
-<component name="connection_manager_api" long-name="Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/connection_manager_api/group"/>
-</component>
-<component name="cxml_library_api" long-name="cXml Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cxml_library_api/group"/>
-</component>
-<component name="download_mgr_client_api_extn" long-name="Download Manager Client API Extension" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/download_mgr_client_api_extn/group"/>
-</component>
-<component name="feeds_engine_api" long-name="Feeds Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/feeds_engine_api/group"/>
-</component>
-<component name="launcher_api" long-name="Launcher API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/launcher_api/group"/>
-</component>
-<component name="multipart_parser_api" long-name="Multipart Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/multipart_parser_api/group"/>
-</component>
-<component name="recent_url_store_api" long-name="Recent URL Store API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/recent_url_store_api/group"/>
-</component>
-<component name="scheme_handler_plugin_api" long-name="Scheme Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scheme_handler_plugin_api/group"/>
-</component>
-<component name="scriptable_plugin_api" long-name="Scriptable Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scriptable_plugin_api/group"/>
-</component>
-<component name="webutils_api" long-name="Web Utils API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/webutils_api/group"/>
-</component>
-<component name="widget_registry_api" long-name="Widget Registry API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/widget_registry_api/group"/>
-</component>
-<component name="xml_parser_api" long-name="XML Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/xml_parser_api/group"/>
-</component>
-<component name="stmgesturefw_api" long-name="State Machine Gesture Framework API " filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/stmgesturefw_api/group"/>
-</component>
-</collection>
-<collection name="web_info" long-name="Web Info" level="specific">
-<component name="web_build" filter="s60" long-name="Web Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/group"/>
-</component>
-</collection>
-<collection name="browserutilities" long-name="Browser Utilities" level="utils">
-<component name="browserdialogsprovider" filter="s60" long-name="Browser Dialogs Provider">
-<unit bldFile="mw/web/browserutilities/browserdialogsprovider/group"/>
-</component>
-<component name="recenturlstore" filter="s60" long-name="Recent URL Store">
-<unit bldFile="mw/web/browserutilities/recenturlstore/group"/>
-</component>
-<component name="xmlparser" filter="s60" long-name="XML Interface">
-<unit bldFile="mw/web/browserutilities/xmlparser/group"/>
-</component>
-<component name="cxmllibrary" filter="s60" long-name="XML Parser Implementation">
-<unit bldFile="mw/web/browserutilities/cxmllibrary/group"/>
-</component>
-<component name="downloadmgr" filter="s60" long-name="Download Manager">
-<unit bldFile="mw/web/browserutilities/downloadmgr/group"/>
-</component>
-<component name="connectionmanager" filter="s60" long-name="Connection Manager">
-<unit bldFile="mw/web/browserutilities/connectionmanager/group"/>
-</component>
-<component name="browsertelservice" filter="s60" long-name="Browser Telephony Service">
-<unit bldFile="mw/web/browserutilities/browsertelservice/group"/>
-</component>
-<component name="favouritesengine" filter="s60" long-name="Favourites Engine">
-<unit bldFile="mw/web/browserutilities/favouritesengine/group"/>
-</component>
-<component name="feedsengine" filter="s60" long-name="Feeds Engine">
-<unit bldFile="mw/web/browserutilities/feedsengine/group"/>
-</component>
-<component name="multipartparser" filter="s60" long-name="Multipart Parser">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
-<!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
-</component>
-<component name="schemehandler" filter="s60" long-name="Scheme Handler">
-<unit bldFile="mw/web/browserutilities/schemehandler/group"/>
-</component>
-<component name="webutils" filter="s60" long-name="Web Utils">
-<unit bldFile="mw/web/browserutilities/webutils/group"/>
-</component>
-<component name="aiwbrowserprovider" filter="s60" long-name="AIW Browser Provider" plugin="Y">
-<unit bldFile="mw/web/browserutilities/aiwbrowserprovider/group"/>
-</component>
-<component name="browserutilities_build" filter="s60" long-name="Browser Utilities Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/browserutilities/group"/>
-</component>
-</collection>
-<collection name="webengine" long-name="Web Engine" level="server">
-<component name="osswebengine" filter="s60" long-name="OSS Web Engine">
-<!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
-<unit bldFile="mw/web/webengine/osswebengine/cache/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/memorymanager/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/npscript/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group/javascriptcore"/>
-</component>
-<component name="webkitutils" filter="s60" long-name="WebKit Utils">
-<unit bldFile="mw/web/webengine/webkitutils/group"/>
-</component>
-<component name="pagescaler" filter="s60" long-name="Page Scaler">
-<unit bldFile="mw/web/webengine/pagescaler/group"/>
-</component>
-<component name="webwidgetinstaller" filter="s60" long-name="Widget Installer">
-<unit bldFile="mw/web/webengine/widgetinstaller/group"/>
-</component>
-<component name="widgetregistry" filter="s60" long-name="Widget Registry">
-<unit bldFile="mw/web/webengine/widgetregistry/group"/>
-</component>
-<component name="wmlengine" filter="s60" long-name="WML Engine">
-<unit bldFile="mw/web/webengine/wmlengine/group"/>
-</component>
-<component name="device" filter="s60" long-name="Device">
-<!-- this needs a more meaningful name -->
-<unit bldFile="mw/web/webengine/device/group"/>
-</component>
-<component name="widgetengine" filter="s60" long-name="Widget Engine">
-<unit bldFile="mw/web/webengine/widgetengine/group"/>
-</component>
-<component name="web_memoryplugin" long-name="Memory Plugin" filter="s60" plugin="Y">
-<unit bldFile="mw/web/webengine/memoryplugin/group"/>
-</component>
-<component name="widgetmemoryplugin" filter="s60" long-name="Widget Memory Plugin" plugin="Y">
-<unit bldFile="mw/web/webengine/widgetmemoryplugin/group"/>
-</component>
-<component name="widgetbackuprestore" filter="s60" long-name="Widget Backup and Restore">
-<unit bldFile="mw/web/webengine/widgetbackuprestore/group"/>
-</component>
-<component name="browserrecognizers" filter="s60" long-name="Browser Recognizers" plugin="Y">
-<unit bldFile="mw/web/webengine/browserrecognizers/group"/>
-</component>
-<component name="wrtharvester" filter="s60" long-name="Web Runtime Harvester" plugin="Y">
-<unit bldFile="mw/web/webengine/wrtharvester/group"/>
-</component>
-</collection>
-<collection name="codhandler" long-name="Content Object Descriptor Handler" level="specific">
-<component name="codeng" filter="s60" long-name="COD Engine">
-<unit bldFile="mw/web/codhandler/codeng/group"/>
-</component>
-<component name="codui" filter="s60" long-name="COD UI">
-<unit bldFile="mw/web/codhandler/codui/group"/>
-</component>
-<component name="codrecog" filter="s60" long-name="COD Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/codrecog/group"/>
-</component>
-<component name="codviewer" filter="s60" long-name="COD Viewer">
-<unit bldFile="mw/web/codhandler/codviewer/group"/>
-</component>
-<component name="ddrecog" filter="s60" long-name="Download Descriptor Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/ddrecog/group"/>
-</component>
-<component name="ddviewer" filter="s60" long-name="Download Descriptor Viewer">
-<unit bldFile="mw/web/codhandler/ddviewer/group"/>
-</component>
-<component name="coddownload" filter="s60" long-name="COD Download">
-<unit bldFile="mw/web/codhandler/coddownload/group"/>
-</component>
-<component name="roapapp" filter="s60" long-name="ROAP Application">
-<unit bldFile="mw/web/codhandler/roapapp/group"/>
-</component>
-<component name="codhandler_build" filter="s60" long-name="COD Handler Build">
-<!-- Exports need to go into another component or make this self-contained.
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/codhandler/group"/>
-</component>
-</collection>
-<collection name="widgets" long-name="Web Widget Framework" level="generic">
-<!-- the following units can be uncommented when configuration is put in place -->
-<component name="widgetrecognizer" filter="s60" long-name="Widget Recognizer" plugin="Y">
-<!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
-</component>
-<component name="widgetinstaller" filter="s60" long-name="Widget Installer UI" plugin="Y">
-<!--<unit bldFile="widgets/widgetinstaller/group"/>-->
-</component>
-<component name="widgetlauncher" filter="s60" long-name="Widget Launcher">
-<!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
-</component>
-<component name="widgetapp" filter="s60" long-name="Widget UI">
-<!--<unit bldFile="widgets/widgetapp/group"/>-->
-</component>
-<component name="widgetsidchecker" filter="s60" long-name="Widget SID Checker" introduced="^3">
-<!--<unit bldFile="widgets/widgetsidchecker/group"/>-->
-</component>
-<component name="widgetpreinstaller" filter="s60" long-name="Widget Pre-Installer">
-<!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
-</component>
-<component name="widgetstartup" filter="s60" long-name="Widget Startup">
-<!--<unit bldFile="widgets/widgetstartup/group"/>-->
-</component>
-<component name="widgets_build" filter="s60" long-name="Widgets Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/widgets/group"/>
-</component>
-</collection>
-</block>
-<block name="websrv" level="generic" long-name="Web Services" levels="plugin framework server generic specific">
-<collection name="websrv_pub" long-name="Web Services Public Interfaces" level="specific">
-<component name="web_service_description_api" long-name="Web Service Description API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_description_api/group"/>
-</component>
-<component name="web_service_connection_api" long-name="Web Service Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/group"/>
-</component>
-<component name="web_service_manager_api" long-name="Web Service Manager API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/group"/>
-</component>
-<component name="hostlet_connection_api" long-name="Hostlet Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/group"/>
-</component>
-<component name="web_service_messaging_api" long-name="Web Service Messaging API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/group"/>
-</component>
-<component name="xml_extensions_api" long-name="XML Extensions API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/group"/>
-</component>
-<component name="xml_fragment_api" long-name="XML Fragment API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/group"/>
-</component>
-</collection>
-<collection name="webservices" long-name="Web Services Framework" level="generic">
-<!-- consider breaking this collection into more meaningful subsets -->
-<component name="wsnotifierplugins" filter="s60" long-name="WS Notifier Plugins" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsnotifierplugins/group"/>
-</component>
-<component name="wslogger" filter="s60" long-name="WS Logger">
-<unit bldFile="mw/websrv/webservices/wslogger/group"/>
-</component>
-<component name="wsxml" filter="s60" long-name="WS XML Extensions">
-<unit bldFile="mw/websrv/webservices/wsxml/group"/>
-</component>
-<component name="wsutils" filter="s60" long-name="WS Utils">
-<unit bldFile="mw/websrv/webservices/wsutils/group"/>
-</component>
-<component name="wsfragment" filter="s60" long-name="WS Fragment">
-<unit bldFile="mw/websrv/webservices/wsfragment/group"/>
-</component>
-<component name="wsdescription" filter="s60" long-name="WS Service Description">
-<unit bldFile="mw/websrv/webservices/wsdescription/group"/>
-</component>
-<component name="wsconnection" filter="s60" long-name="WS Service Connection">
-<unit bldFile="mw/websrv/webservices/wsconnection/group"/>
-</component>
-<component name="wsmessages" filter="s60" long-name="WS Messages">
-<unit bldFile="mw/websrv/webservices/wsmessages/group"/>
-</component>
-<component name="wscredentialmanager" filter="s60" long-name="WS Credential Manager">
-<unit bldFile="mw/websrv/webservices/wscredentialmanager/group"/>
-</component>
-<component name="wsframework" filter="s60" long-name="WS Framework">
-<unit bldFile="mw/websrv/webservices/wsframework/group"/>
-</component>
-<component name="wshttpchanneltransportplugin" filter="s60" long-name="WS HTTP Channel Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshttpchanneltransportplugin/group"/>
-</component>
-<component name="wsconnectionagent" filter="s60" long-name="WS Connection Agent">
-<unit bldFile="mw/websrv/webservices/wsconnectionagent/group"/>
-</component>
-<component name="wsprovider" filter="s60" long-name="WS Provider">
-<unit bldFile="mw/websrv/webservices/wsprovider/group"/>
-</component>
-<component name="wshostletconnection" filter="s60" long-name="WS Hostlet Connection">
-<unit bldFile="mw/websrv/webservices/wshostletconnection/group"/>
-</component>
-<component name="wsmanager" filter="s60" long-name="WS Service Manager">
-<unit bldFile="mw/websrv/webservices/wsmanager/group"/>
-</component>
-<component name="wsidentitymanager" filter="s60" long-name="WS Identity Manager">
-<unit bldFile="mw/websrv/webservices/wsidentitymanager/group"/>
-</component>
-<component name="idwsfplugin" filter="s60" long-name="ID-WSF Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/idwsfplugin/group"/>
-</component>
-<component name="wsibasicplugin" filter="s60" long-name="WS-I Basic Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsibasicplugin/group"/>
-</component>
-<component name="wsrestplugin" filter="s60" long-name="WS REST Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsrestplugin/group"/>
-</component>
-<component name="idwsfsecuritymechanism" filter="s60" long-name="ID-WSF Security Mechanism">
-<unit bldFile="mw/websrv/webservices/idwsfsecuritymechanism/group"/>
-</component>
-<component name="wspasswordtransforms" filter="s60" long-name="WS Password Transforms">
-<unit bldFile="mw/websrv/webservices/wspasswordtransforms/group"/>
-</component>
-<component name="wscore" filter="s60" long-name="WS Core Service Manager">
-<unit bldFile="mw/websrv/webservices/wscore/group"/>
-</component>
-<component name="wslocaltransportplugin" filter="s60" long-name="WS Local Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wslocaltransportplugin/group"/>
-</component>
-<component name="wshostlettransportplugin" filter="s60" long-name="WS Hostlet Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshostlettransportplugin/group"/>
-</component>
-<component name="wsstar" filter="s60" long-name="WS Star">
-<!-- can only have one unit. Need to split into separate components or #include from a single bld.inf -->
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarpolicy/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarplugin/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarmessagehandlers/group"/>
-</component>
-<component name="wsoviplugin" filter="s60" long-name="WS Ovi Plugin">
-<unit bldFile="mw/websrv/webservices/wsoviplugin/group"/>
-</component>
-<component name="webservices_build" filter="s60" long-name="Web Services Build">
-<!-- need to split into self-contained components -->
-<unit bldFile="mw/websrv/webservices/group"/>
-</component>
-</collection>
-<collection name="websrv_info" long-name="Web Services Info" level="specific">
-<component name="websrv_bld" filter="s60" long-name="Web Services Build">
-<!-- need to include common .hrh in each unit -->
-<unit bldFile="mw/websrv/group"/>
-</component>
-</collection>
-</block>
-<block name="platformtools" level="generic" long-name="Platform Tools">
-<collection name="gfxconversion" long-name="Graphics Conversion">
-<component name="bmconv_s60" filter="s60" long-name="S60 Bitmap Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/bmconv_s60/group"/>
-</component>
-<component name="mifconv" filter="s60" long-name="Multi Icon File Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/mifconv/group"/>
-</component>
-</collection>
-</block>
-<block name="uitools" level="specific" long-name="UI Tools" levels="compile encode tool if">
-<collection name="uitools_pub" long-name="UI Tools Public Interfaces" level="if">
-<component name="third_party_bitmap_palette_api" long-name="Third Party Bitmap Palette API" filter="s60" class="api">
-<unit bldFile="mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
-</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">
-<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">
-<unit bldFile="mw/uitools/uitools_plat/layout_system_private_api/group"/>
-</component>
-</collection>
-<collection name="cdlcompilertoolkit" long-name="CDL Compiler Toolkit" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompilertoolkit_build" filter="s60" long-name="CDL Compiler Toolkit Build">
-<unit bldFile="mw/uitools/cdlcompilertoolkit/group"/>
-</component>
-</collection>
-<collection name="cdlcompiler" long-name="CDL Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompiler_build" filter="s60" long-name="CDL Compiler Build">
-<unit bldFile="mw/uitools/cdlcompiler/group"/>
-</component>
-</collection>
-<collection name="gfxtools" long-name="Graphics Tools" level="tool">
-<component name="gditools" filter="s60" long-name="GDI Tools" class="PC">
-<unit bldFile="mw/uitools/gfxtools/gditools/group"/>
-</component>
-<component name="color" filter="s60" long-name="Bitmap Colour Palette" class="PC">
-<unit bldFile="mw/uitools/gfxtools/color/group"/>
-</component>
-</collection>
-<collection name="aknlayoutcompiler" long-name="Avkon Layout Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="aknlayoutcompiler_build" filter="s60" long-name="Avkon Layout Compiler Build">
-<unit bldFile="mw/uitools/aknlayoutcompiler/group"/>
-</component>
-</collection>
-<collection name="skincompiler" long-name="Skin Compiler" level="compile">
-<component name="aknskindesccompiler" filter="s60" long-name="Avkon Skin Descriptor Compiler">
-<unit bldFile="mw/uitools/skincompiler/AknSkinDescCompiler/group"/>
-</component>
-</collection>
-<collection name="reszip" long-name="Resource Zip" level="encode">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="reszip_build" filter="s60" long-name="Resource Zip Build">
-<unit bldFile="mw/uitools/reszip/group"/>
-</component>
-</collection>
-<collection name="toollibraries" long-name="Tool Libraries" level="tool"/>
-<collection name="svgtencoder" long-name="SVGT Encoder" level="encode">
-<component name="svgtenc" filter="s60" long-name="Standalone SVGT Encoder" class="PC">
-<unit bldFile="mw/uitools/svgtencoder/svgtenc/standalone/group"/>
-</component>
-</collection>
-</block>
-</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">
-<component name="location_centre_api" long-name="Location Centre API" introduced="^3" filter="s60" class="api">
-<unit bldFile="app/location/loc_plat/location_centre_api/group"/>
-</component>
-</collection>
-<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"/>
-</component>
-<component name="landmarks_ui_addedit_api" long-name="Landmarks UI Add/Edit API" filter="s60" class="api">
-<unit bldFile="app/location/loc_pub/landmarks_ui_addedit_api/group"/>
-</component>
-</collection>
-<collection name="basiclocationinfodisplay" long-name="Basic Location Info Display" level="ui">
-<component name="blid" filter="s60" long-name="Basic Location Info Display Build">
-<unit bldFile="app/location/basiclocationinfodisplay/blid/group"/>
-</component>
-</collection>
-<collection name="landmarksui" long-name="Landmarks UI" level="loc">
-<component name="landmarksui_help" filter="s60" long-name="Landmarks UI Help">
-<unit bldFile="app/location/landmarksui/help/group"/>
-</component>
-<component name="landmarksui_engine" filter="s60" long-name="Landmarks UI Engine">
-<unit bldFile="app/location/landmarksui/engine/group"/>
-</component>
-<component name="uicontrols" filter="s60" long-name="Landmarks UI Controls">
-<unit bldFile="app/location/landmarksui/uicontrols/group"/>
-</component>
-<component name="landmarksui_commonui" filter="s60" long-name="Landmarks Common UI">
-<unit bldFile="app/location/landmarksui/commonui/group"/>
-</component>
-<component name="landmarksui_app" filter="s60" long-name="Landmarks Application">
-<unit bldFile="app/location/landmarksui/app/group"/>
-</component>
-<component name="msgviewer" filter="s60" long-name="Landmarks Message Viewer">
-<unit bldFile="app/location/landmarksui/msgviewer/group"/>
-</component>
-<component name="landmarksui_build" filter="s60" long-name="Landmarks UI Build">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="app/location/landmarksui/group"/>
-</component>
-</collection>
-<collection name="eventsui" long-name="Location Events UI" level="events">
-<component name="eventsui_help" filter="s60" long-name="Events Help">
-<unit bldFile="app/location/eventsui/help/group"/>
-</component>
-<component name="eventsutils" filter="s60" long-name="Events Utils">
-<unit bldFile="app/location/eventsui/eventsutils/group"/>
-</component>
-<component name="eventsengine" filter="s60" long-name="Events Engine">
-<unit bldFile="app/location/eventsui/eventsengine/group"/>
-</component>
-<component name="eventshandlerui" filter="s60" long-name="Events Handler UI">
-<unit bldFile="app/location/eventsui/eventshandlerui/group"/>
-</component>
-<component name="eventseditor" filter="s60" long-name="Events Editor">
-<unit bldFile="app/location/eventsui/eventseditor/group"/>
-</component>
-<component name="eventsmgmtui" filter="s60" long-name="Events Management UI">
-<unit bldFile="app/location/eventsui/eventsmgmtui/group"/>
-</component>
-<component name="eventsui_build" filter="s60" long-name="Events UI Build">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="app/location/eventsui/group"/>
-</component>
-</collection>
-<collection name="locationlandmarksrefappfors60" long-name="Location Landmarks Reference App for S60" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="lmrefapp" filter="s60" long-name="Landmarks Reference Application">
-<unit bldFile="app/location/locationlandmarksrefappfors60/group"/>
-</component>
-</collection>
-<collection name="locationlandmarksuirefapp" long-name="Location Landmarks UI Reference App" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="lmuirefapp" filter="s60" long-name="Landmarks UI Reference Application">
-<unit bldFile="app/location/locationlandmarksuirefapp/group"/>
-</component>
-</collection>
-<collection name="locationsatviewrefapp" long-name="Location Satellite View Reference App" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="satellitereference" filter="s60" long-name="Satellite Info UI Reference Application">
-<unit bldFile="app/location/locationsatviewrefapp/group"/>
-</component>
-</collection>
-<collection name="simpsyconfigurator" long-name="Simulation PSY Configurator" level="ui">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="simpsyui" filter="s60" long-name="Simulation PSY UI">
-<unit bldFile="app/location/simpsyconfigurator/group"/>
-</component>
-</collection>
-<collection name="mapnavproviderrefapp" long-name="Map and Navigation Provider Reference App" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="mapnavproviderrefapp_build" filter="s60" long-name="Map and Navigation Provider Reference Application">
-<unit bldFile="app/location/mapnavproviderrefapp/group"/>
-</component>
-</collection>
-<collection name="locationcentre" long-name="Location Centre" level="loc">
-<component name="lcutils" long-name="Location Centre Utilities" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcutils/group"/>
-</component>
-<component name="lcservice" long-name="Location Centre Service Project" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcservice/group"/>
-</component>
-<component name="lcserver" long-name="Location Centre Server Project" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcserver/group"/>
-</component>
-<component name="lcapp" long-name="Location Centre Application" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcapp/group"/>
-</component>
-<component name="locationcentre_build" filter="s60" long-name="Location Centre Build" introduced="^3">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="app/location/locationcentre/group"/>
-</component>
-</collection>
-</block>
-<block name="mmsharinguis" level="services" long-name="Multimedia Sharing UIs" levels="base plugin if">
-<collection name="mmsharinguis_plat" long-name="Multimedia Sharing UIs Platform Interfaces" level="if">
-<component name="multimedia_sharing_settings_api" long-name="Multimedia Sharing Settings API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_settings_api/group"/>
-</component>
-<component name="multimedia_sharing_resource_api" long-name="Multimedia Sharing Resource API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_resource_api/group"/>
-</component>
-<component name="multimedia_sharing_manager_api" long-name="Multimedia Sharing Manager API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/group"/>
-</component>
-</collection>
-<collection name="mmsharing" long-name="Multimedia Sharing" level="base">
-<component name="mmshavailability" filter="s60" long-name="Multimedia Sharing Availability">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshavailability/group"/>
-</component>
-<component name="mmshindicator" filter="s60" long-name="Multimedia Sharing Indicator">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshindicator/group"/>
-</component>
-<!-- consider putting client and server in the same component -->
-<component name="mmshmanagercli" filter="s60" long-name="Multimedia Sharing Manager Client">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshmanagercli/group" filter="!test"/>
-</component>
-<component name="mmshmanagersrv" filter="s60" long-name="Multimedia Sharing Manager Server">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshmanagersrv/group"/>
-</component>
-<component name="mmshengine" filter="s60" long-name="Multimedia Sharing Engine">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshengine/group"/>
-</component>
-<component name="mmshui" filter="s60" long-name="Multimedia Sharing UI">
-<!-- can only have one unit: need to #include one from the other if it's needed -->
-<unit bldFile="app/mmsharinguis/mmsharing/mmshui/group"/>
-<unit bldFile="app/mmsharinguis/mmsharing/mmshui/help/group"/>
-</component>
-<component name="mmsharing_build" filter="s60" long-name="MM Sharing Build">
-<unit bldFile="app/mmsharinguis/mmsharing/group"/>
-</component>
-</collection>
-<collection name="mmshplugins" long-name="Multimedia Sharing Plugins" level="plugin">
-<component name="mmshaoplugin" filter="s60" long-name="Multimedia Sharing Always Online Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshaoplugin/group"/>
-</component>
-<component name="mmshaiwplugin" filter="s60" long-name="Multimedia Sharing AIW Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshaiwplugin/group"/>
-</component>
-<component name="mmshsipcrplugin" filter="s60" long-name="Multimedia Sharing SIP Client Resolver Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshsipcrplugin/group"/>
-</component>
-<component name="mmshsettingsuiplugin" filter="s60" long-name="Multimedia Sharing Settings UI Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshsettingsuiplugin/group"/>
-</component>
-<component name="mmshwpadapterplugin" filter="s60" long-name="Multimedia Sharing WAP Provisioning Adapter" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshwpadapterplugin/group"/>
-</component>
-</collection>
-<collection name="mmsharinguis_info" long-name="Multimedia Sharing UIs Info" level="if">
-<component name="mmsharinguis_build" filter="s60" long-name="Multimedia Sharing UIs Build">
-<!-- consider distributing to other components -->
-<unit bldFile="app/mmsharinguis/group"/>
-</component>
-</collection>
-</block>
-<block name="phone" level="apps" span="2" long-name="Phone Apps" levels="engine plugin ui app">
-<collection name="phone_plat" long-name="Phone Apps Platform Interfaces" level="app">
-<component name="3d_ringing_tone_enabler_api" long-name="3D Ringing Tone Enabler API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
-</component>
-<component name="telephony_comms_information_api" long-name="Telephony Comms Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_comms_information_api/group"/>
-</component>
-<component name="telephony_information_api" long-name="Telephony Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_information_api/group"/>
-</component>
-<component name="telephony_device_mode_api" long-name="Telephony Device Mode API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_device_mode_api/group"/>
-</component>
-<component name="telephony_remote_party_information_api" long-name="Telephony Remote Party Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_remote_party_information_api/group"/>
-</component>
-<component name="telephony_video_mailbox_settings_api" long-name="Telephony Video Mailbox Settings API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_video_mailbox_settings_api/group"/>
-</component>
-<component name="telephony_configuration_api" long-name="Telephony Configuration API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_configuration_api/group"/>
-</component>
-<component name="telephony_microphone_mute_status_api" long-name="Telephony Microphone Mute Status API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_microphone_mute_status_api/group"/>
-</component>
-<component name="dialer_keypad_api" long-name="Dialer Keypad API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/dialer_keypad_api/group"/>
-</component>
-<component name="telephony_logging_extension_api" long-name="Telephony Logging Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_logging_extension_api/group"/>
-</component>
-<component name="telephony_matching_extension_api" long-name="Telephony Matching Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_matching_extension_api/group"/>
-</component>
-<component name="telephony_bubble_extension_api" long-name="Telephony Bubble Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_bubble_extension_api/group"/>
-</component>
-<component name="telephony_menu_extension_api" long-name="Telephony Menu Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_menu_extension_api/group"/>
-</component>
-<component name="phone_application_commands_api" long-name="Phone Application Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_commands_api/group"/>
-</component>
-<component name="phone_application_voip_commands_api" long-name="Phone Application VOIP Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_voip_commands_api/group"/>
-</component>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_mediator_api/group"/>
-</component>
-<component name="video_telephony_mediator_api" long-name="Video Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/video_telephony_mediator_api/group"/>
-</component>
-</collection>
-<collection name="phoneapp" long-name="Phone Application" level="app">
-<component name="blacklist" filter="s60" long-name="Phone Blacklist Clearing" plugin="Y">
-<unit bldFile="app/phone/phoneapp/blacklist/group"/>
-</component>
-<component name="phoneui" filter="s60" long-name="Phone UI">
-<unit bldFile="app/phone/phoneapp/phoneui/group" filter="!test"/>
-</component>
-<component name="phoneuicontrol" filter="s60" long-name="Phone UI Control">
-<unit bldFile="app/phone/phoneapp/phoneuicontrol/group"/>
-</component>
-<component name="phoneuistates" filter="s60" long-name="Phone UI States">
-<unit bldFile="app/phone/phoneapp/phoneuistates/group"/>
-</component>
-<component name="phoneuiutils" filter="s60" long-name="Phone UI Utils">
-<unit bldFile="app/phone/phoneapp/phoneuiutils/group"/>
-</component>
-<component name="phoneuiview" filter="s60" long-name="Phone UI View">
-<unit bldFile="app/phone/phoneapp/phoneuiview/group"/>
-</component>
-<component name="phoneuivoipextension" filter="s60" long-name="Phone UI VOIP Extension">
-<unit bldFile="app/phone/phoneapp/phoneuivoipextension/group"/>
-</component>
-<component name="silenceactionplugin" filter="s60" long-name="Silence Action Plugin" plugin="Y">
-<unit bldFile="app/phone/phoneapp/silenceactionplugin/group"/>
-</component>
-<component name="phonemediatorcenter" filter="s60" long-name="Phone Mediator Center">
-<unit bldFile="app/phone/phoneapp/phonemediatorcenter/group"/>
-</component>
-</collection>
-<collection name="phoneengine" long-name="Phone Engine" level="engine">
-<component name="phonecntfinder" filter="s60" long-name="Phone Contact Finder">
-<unit bldFile="app/phone/phoneengine/phonecntfinder/group"/>
-</component>
-<component name="audiohandling" filter="s60" long-name="Phone Audio Handling">
-<unit bldFile="app/phone/phoneengine/audiohandling/group"/>
-</component>
-<component name="callhandling" filter="s60" long-name="Call Handling">
-<unit bldFile="app/phone/phoneengine/callhandling/group"/>
-</component>
-<component name="contacthandling" filter="s60" long-name="Phone Contact Handling">
-<unit bldFile="app/phone/phoneengine/contacthandling/group"/>
-</component>
-<component name="loghandling" filter="s60" long-name="Phone Log Handling">
-<unit bldFile="app/phone/phoneengine/loghandling/group"/>
-</component>
-<component name="engineinfo" filter="s60" long-name="Phone Engine Info">
-<unit bldFile="app/phone/phoneengine/engineinfo/group"/>
-</component>
-<component name="phonemodel" filter="s60" long-name="Phone Model">
-<unit bldFile="app/phone/phoneengine/phonemodel/group"/>
-</component>
-<component name="servicehandling" filter="s60" long-name="Phone Service Handling">
-<unit bldFile="app/phone/phoneengine/servicehandling/group"/>
-</component>
-</collection>
-<collection name="phonesettings" long-name="Phone Settings" level="plugin">
-<component name="aiwcallimageplugin" filter="s60" long-name="Call Image AIW Plugin" plugin="Y">
-<unit bldFile="app/phone/phonesettings/aiwcallimageplugin/group"/>
-</component>
-<component name="pslncallimageplugin" filter="s60" long-name="Call Image Personalization Plugin" plugin="Y">
-<unit bldFile="app/phone/phonesettings/pslncallimageplugin/group"/>
-</component>
-</collection>
-<collection name="phoneuis" long-name="Phone UIs" level="ui">
-<component name="dialer" filter="s60" long-name="Dialer">
-<unit bldFile="app/phone/phoneuis/dialer/group" filter="!test"/>
-</component>
-<component name="easydialing" filter="s60" long-name="Easy Dialing Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/phone/phoneuis/easydialing/group"/>
-</component>
-<component name="bubblemanager" filter="s60" long-name="Phone Bubble Manager">
-<unit bldFile="app/phone/phoneuis/bubblemanager/group"/>
-</component>
-<component name="connectutil" filter="s60" long-name="Connection Utility" plugin="Y">
-<unit bldFile="app/phone/phoneuis/connectutil/group"/>
-</component>
-<component name="ussd" filter="s60" long-name="Unstructured Supplementary Services Data">
-<unit bldFile="app/phone/phoneuis/ussd/group"/>
-</component>
-<component name="vmbx" filter="s60" long-name="Voice Mailbox">
-<unit bldFile="app/phone/phoneuis/vmbx/group"/>
-</component>
-<component name="telephonydevicemode" filter="s60" long-name="Telephony Device Mode">
-<unit bldFile="app/phone/phoneuis/telephonydevicemode/group"/>
-</component>
-</collection>
-<collection name="phoneplugins" long-name="Phone Plugins" level="plugin">
-<component name="telbranding" filter="s60" long-name="Tel Branding" introduced="^2" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/telbranding/group"/>
-</component>
-</collection>
-</block>
-<block name="videotelephony" level="apps" long-name="Video Telephony Apps" levels="engine plugin prot ui">
-<collection name="videotelephony_plat" long-name="VT Apps Platform Interfaces" level="ui">
-<component name="video_telephony_control_mediator_api" long-name="Video Telephony Control Mediator API" filter="s60" class="api">
-<unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_control_mediator_api/group"/>
-</component>
-<component name="video_telephony_media_configuration_api" long-name="Video Telephony Media Configuration API" filter="s60" class="api">
-<unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_media_configuration_api/group"/>
-</component>
-</collection>
-<collection name="vtengines" long-name="Video Telephony Engines" level="engine">
-<component name="videoteleng" filter="s60" long-name="Video Telephony Engine">
-<unit bldFile="app/videotelephony/vtengines/videoteleng/Group"/>
-</component>
-<component name="vtmediatorplugin" filter="s60" long-name="VT Mediator Plugin" plugin="Y">
-<unit bldFile="app/videotelephony/vtengines/vtmediatorplugin/group"/>
-</component>
-</collection>
-<collection name="vtuis" long-name="Video Telephony UIs" level="ui">
-<component name="videotelui" filter="s60" long-name="Video Telephony UI">
-<unit bldFile="app/videotelephony/vtuis/videotelui/group"/>
-</component>
-</collection>
-<collection name="vtprotocolplugins" long-name="VT Protocol Plugins" level="plugin">
-<component name="displaysink" filter="s60" long-name="Display Sink" introduced="^2">
-<unit bldFile="app/videotelephony/vtprotocolplugins/DisplaySink/group"/>
-</component>
-<component name="videosource" filter="s60" long-name="Video Source" introduced="^2">
-<unit bldFile="app/videotelephony/vtprotocolplugins/VideoSource/group"/>
-</component>
-</collection>
-<collection name="vtprotocolsstub" long-name="VT Protocols Stub" level="prot">
-<!-- this collection is really a component, move down a directory -->
-<component name="videotelproto" filter="s60" long-name="Video Telephony Protocol">
-<unit bldFile="app/videotelephony/vtprotocolsstub/group" filter="sf_build"/>
-</component>
-</collection>
-</block>
-<block name="iptelephony" level="apps" long-name="IP Telephony" levels="eng plugin util ui">
-<collection name="iptel_plat" long-name="IP Telephony Platform Interfaces" level="ui">
-<component name="richcallsettingsengine_api" long-name="Rich Call Settings Engine API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/richcallsettingsengine_api/group"/>
-</component>
-<component name="cch_client_api" long-name="CCH Client API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/cch_client_api/group"/>
-</component>
-<component name="cch_server_api" long-name="CCH Server API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/cch_server_api/group"/>
-</component>
-<component name="csc_settingsui_api" long-name="CSC Settings UI API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/csc_settingsui_api/group"/>
-</component>
-<component name="vccpropertyhandler_api" long-name="VCC Property Handler API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/vccpropertyhandler_api/group"/>
-</component>
-<component name="vcc_api" long-name="VCC API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/vcc_api/group"/>
-</component>
-</collection>
-<collection name="iptelcommsconfig" long-name="IP Telephony Comms Config" level="ui">
-<component name="cscgsplugin" filter="s60" long-name="CSC GS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/commsconfig/cscgsplugin/group"/>
-</component>
-<component name="cscsipvoipcleanupplugin" filter="s60" long-name="CSC SIP VoIP Cleanup Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/commsconfig/cscsipvoipcleanupplugin/group"/>
-</component>
-<component name="cscengine" filter="s60" long-name="Connection Service Configurator Engine" introduced="^2">
-<unit bldFile="app/iptelephony/commsconfig/cscengine/group"/>
-</component>
-<component name="cscsettingsui" filter="s60" long-name="CSC Settings UI" introduced="^2">
-<unit bldFile="app/iptelephony/commsconfig/cscsettingsui/group"/>
-</component>
-<component name="cscapplicationui" filter="s60" long-name="CSC Application UI" introduced="^2">
-<unit bldFile="app/iptelephony/commsconfig/cscapplicationui/group"/>
-</component>
-<component name="commsconfig_build" filter="s60" long-name="Comms Config Build" introduced="^2">
-<!-- consider distributing this into the above components -->
-<unit bldFile="app/iptelephony/commsconfig/group"/>
-</component>
-</collection>
-<collection name="convergedconnectionhandler" long-name="Converged Connection Handler" level="eng">
-<component name="cchserver" filter="s60" long-name="CCH Server" introduced="^2">
-<unit bldFile="app/iptelephony/convergedconnectionhandler/cchserver/group"/>
-</component>
-<component name="cchclient" filter="s60" long-name="CCH Client" introduced="^2">
-<unit bldFile="app/iptelephony/convergedconnectionhandler/cchclient/group"/>
-</component>
-<component name="cchclientapi" filter="s60" long-name="CCH Client API" introduced="^2">
-<unit bldFile="app/iptelephony/convergedconnectionhandler/cchclientapi/group"/>
-</component>
-<component name="convergedconnectionhandler_build" filter="s60" long-name="CCH Build" introduced="^2">
-<!-- consider distributing this into the above components, or collapse the collection into a single component.
- The latter is a better option since clients and sevrers are rarely separate components -->
-<unit bldFile="app/iptelephony/convergedconnectionhandler/group"/>
-</component>
-</collection>
-<collection name="richcallsettingsengine" long-name="Rich Call Settings Engine" level="eng">
-<component name="rcse2" filter="s60" long-name="Rich Call Settings Engine Build" introduced="^2">
-<unit bldFile="app/iptelephony/richcallsettingsengine/rcse2/group"/>
-</component>
-</collection>
-<collection name="sipvoipprovider" long-name="SIP VoIP Provider" level="plugin">
-<!-- collection is really a component. Should move down a directory -->
-<component name="svp" filter="s60" long-name="SIP VoIP Provider Build" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/sipvoipprovider/group"/>
-</component>
-</collection>
-<collection name="voipplugins" long-name="VoIP Plugins" level="plugin">
-<component name="sipmxresolver" filter="s60" long-name="SIP MX Resolver" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/sipmxresolver/group"/>
-</component>
-<component name="sipconnectionprovider" filter="s60" long-name="SIP Connection Provider" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/sipconnectionprovider/group"/>
-<!-- can only have one unit, can the next be #'included from the above? -->
-<unit bldFile="app/iptelephony/voipplugins/sipconnectionprovider/ipvoicemailengine/group"/>
-</component>
-<component name="ipapputils" filter="s60" long-name="IP App Utils" introduced="^2">
-<unit bldFile="app/iptelephony/voipplugins/ipapputils/group"/>
-</component>
-<component name="voipadapters" filter="s60" long-name="VoIP Adapters" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/voipadapters/group"/>
-</component>
-<component name="accountcreationplugin" filter="s60" long-name="Account Creation Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/accountcreationplugin/group"/>
-</component>
-<component name="dhcppositionprovider" filter="s60" long-name="DHCP Position Provider" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/dhcppositionprovider/group"/>
-</component>
-<component name="svtmatching" filter="s60" long-name="SIP VoIP Telephony Matching" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/svtmatching/group"/>
-</component>
-<component name="svtlogging" filter="s60" long-name="SVT Logging" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/svtlogging/group"/>
-</component>
-<component name="svtcallmenu" filter="s60" long-name="SVT Call Menu" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/svtcallmenu/group"/>
-</component>
-<component name="sipimresolver" filter="s60" long-name="SIP IM Resolver" introduced="^3" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/sipimresolver/group"/>
-</component>
-</collection>
-<collection name="callcontinuity" long-name="Call Continuity" level="util">
-<component name="vccutils" filter="s60" long-name="VCC Utils" introduced="^2">
-<unit bldFile="app/iptelephony/callcontinuity/vccutils/group"/>
-</component>
-<component name="nsmldmvccadapter" filter="s60" long-name="SyncML DM VCC Adapter" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/callcontinuity/nsmldmvccadapter/group"/>
-</component>
-<component name="vccclientprovisioningadapter" filter="s60" long-name="VCC Client Provisioning Adapter" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/callcontinuity/vccclientprovisioningadapter/group"/>
-</component>
-<component name="vccpropertyhandler" filter="s60" long-name="VCC Property Handler" introduced="^2">
-<unit bldFile="app/iptelephony/callcontinuity/vccpropertyhandler/group"/>
-</component>
-<component name="vcchotrigger" filter="s60" long-name="VCC HO Trigger" introduced="^2">
-<unit bldFile="app/iptelephony/callcontinuity/vcchotrigger/group"/>
-</component>
-<component name="vcc" filter="s60" long-name="VoIP Call Continuity" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/callcontinuity/vcc/group"/>
-</component>
-<component name="callcontinuity_build" filter="s60" long-name="Call Continuity Build" introduced="^2">
-<!-- consider distributing this into the above components -->
-<unit bldFile="app/iptelephony/callcontinuity/group"/>
-</component>
-</collection>
-</block>
-<block name="settingsuis" level="services" long-name="Settings UIs" levels="rsc ui">
-<collection name="devmngt_plat" long-name="Settings UIs Platform Interfaces" level="ui">
-<component name="default_app_client_api" long-name="Default App Client API" introduced="^1" filter="s60" class="api">
-<unit bldFile="app/settingsuis/devmngt_plat/default_app_client_api/group"/>
-</component>
-<component name="services_db_api" long-name="Services DB API" introduced="^1" filter="s60" class="api">
-<unit bldFile="app/settingsuis/devmngt_plat/services_db_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="defaultapplicationsettings" long-name="Default Application Settings" level="rsc">
-<component name="services_db" filter="s60" long-name="Services Database" introduced="^1">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/services_db/group"/>
-</component>
-<component name="defaultapplicationsettings_server" filter="s60" long-name="Default Application Server" introduced="^1">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/server/group"/>
-</component>
-<component name="service" filter="s60" long-name="Default Application Service" introduced="^1">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/service/group"/>
-</component>
-<component name="dasgsplugin" filter="s60" long-name="Default Application Settings GS Plugin" introduced="^1" plugin="Y">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/gsplugin/group"/>
-</component>
-<component name="defaultapplicationsettings_build" filter="s60" long-name="Default Application Settings Build" introduced="^1">
-<!-- split the IBYs up into the appropriate components? Make this a ROM component? -->
-<unit bldFile="app/settingsuis/defaultapplicationsettings/group"/>
-</component>
-</collection>
-<collection name="systemswuis" long-name="System SW UIs" level="ui">
-<component name="touchscreencalib" filter="s60" long-name="Touchscreen Calibration" introduced="^1">
-<unit bldFile="app/settingsuis/systemswuis/touchscreencalib/group"/>
-</component>
-</collection>
-</block>
-<block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin app">
-<collection name="contentctrl_plat" long-name="Content Control Daemons Platforn Interfaces" level="app">
-<component name="oma_ds_presync_plugin_api" long-name="OMA DS PreSync Plugin API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/oma_ds_presync_plugin_api/group"/>
-</component>
-<component name="ds_agenda_handler_plugin_api" long-name="DS Agenda Handler Plugin API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_agenda_handler_plugin_api/group"/>
-</component>
-<component name="ds_folder_util_api" long-name="DS Folder Util API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_folder_util_api/group"/>
-</component>
-</collection>
-<collection name="dsdcmoadapter" long-name="Data Sync DCMO Adapter" level="plugin">
-<!-- Component at wrong rank, should move down a directory -->
-<component name="dsdcmoadapter_build" filter="s60" long-name="Data Sync Control DCMO Adapter">
-<unit bldFile="app/contentcontrol/dsdcmoadapter/group"/>
-</component>
-</collection>
-<collection name="omads" long-name="OMA Data Sync" level="app">
-<component name="omadsappui" filter="s60" long-name="OMA DS Application UI">
-<unit bldFile="app/contentcontrol/omads/omadsappui/group"/>
-</component>
-<component name="omadsextensions" filter="s60" long-name="OMA DS Extensions" plugin="Y">
-<unit bldFile="app/contentcontrol/omads/omadsextensions/group"/>
-</component>
-</collection>
-</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">
-<unit bldFile="app/devicecontrol/devicediagnostics/devdiagapp/group"/>
-</component>
-<component name="devdiaggsplugin" filter="s60" long-name="Device Diagnostics GS Plugin" plugin="Y">
-<unit bldFile="app/devicecontrol/devicediagnostics/devdiaggsplugin/group"/>
-</component>
-<component name="diagplugins" filter="s60" long-name="Diagnostics Plugins" plugin="Y">
-<unit bldFile="app/devicecontrol/devicediagnostics/diagplugins/group"/>
-</component>
-<component name="diagsuites" filter="s60" long-name="Diagnostics Suites" plugin="Y">
-<unit bldFile="app/devicecontrol/devicediagnostics/diagsuites/group"/>
-</component>
-<component name="devicediagnostics_build" filter="s60" long-name="Device Diagnostics Build">
-<!-- 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">
-<unit bldFile="app/devicecontrol/omadm/omadmappui/group"/>
-</component>
-<component name="omadmextensions" filter="s60" long-name="OMA DM Extensions" 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">
-<unit bldFile="app/devicecontrol/omadm/dcmo/group"/>
-</component>
-</collection>
-<collection name="pnpmobileservices" long-name="PnP Mobile Services" level="mid">
-<component name="pnpms" filter="s60" long-name="PnP MS">
-<unit bldFile="app/devicecontrol/pnpmobileservices/pnpms/group"/>
-</component>
-</collection>
-<collection name="applicationmanagement" long-name="Application Management" level="app">
-<!-- could this collection be collapsed into a single component and moved down a dir? Do all these need to be noted separately? -->
-<component name="applicationmanagement_options" filter="s60" long-name="AM Install Options">
-<unit bldFile="app/devicecontrol/applicationmanagement/options/group"/>
-</component>
-<component name="applicationmanagement_client" filter="s60" long-name="AM Client">
-<unit bldFile="app/devicecontrol/applicationmanagement/client/group"/>
-</component>
-<component name="applicationmanagement_server" filter="s60" long-name="AM Server">
-<unit bldFile="app/devicecontrol/applicationmanagement/server/group"/>
-</component>
-<component name="rfsplugin" filter="s60" long-name="AM RFS Plugin" plugin="Y">
-<unit bldFile="app/devicecontrol/applicationmanagement/rfsplugin/group"/>
-</component>
-<component name="amadapter2" filter="s60" long-name="AM Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/applicationmanagement/amadapter2/group"/>
-</component>
-<component name="omascomoadapter" filter="s60" long-name="OMA SCOMO Adapter" introduced="^3" plugin="Y">
-<unit bldFile="app/devicecontrol/applicationmanagement/omascomoadapter/group"/>
-</component>
-<component name="applicationmanagement_build" filter="s60" long-name="AM Build">
-<!-- If thes aren't collapsed into one cmp, can all #includes removed from here, and it renamed AM ROM? -->
-<unit bldFile="app/devicecontrol/applicationmanagement/group"/>
-</component>
-</collection>
-<collection name="customization" long-name="DM Customization Adapters" level="mid">
-<component name="dmutils" long-name="DM Utils" filter="s60">
-<unit bldFile="app/devicecontrol/customization/dmutils/bld"/>
-</component>
-<component name="uisettingssrv" filter="s60" long-name="UI Settings Server">
-<unit bldFile="app/devicecontrol/customization/uisettingssrv/bld"/>
-</component>
-<component name="isadapter" filter="s60" long-name="Idle State Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/isadapter/bld"/>
-</component>
-<component name="supadapter" filter="s60" long-name="Startup Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/supadapter/bld"/>
-</component>
-<component name="wallpaperadapter" filter="s60" long-name="Wallpaper Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/wallpaperadapter/bld"/>
-</component>
-<component name="operatorlogoadapter" filter="s60" long-name="Operator Logo Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/operatorlogoadapter/bld"/>
-</component>
-<component name="screensaveradapter" filter="s60" long-name="Screen Saver Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/screensaveradapter/bld"/>
-</component>
-<component name="themesadapter" filter="s60" long-name="Themes Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/themesadapter/bld"/>
-</component>
-<component name="embeddedlinkadapter" filter="s60" long-name="Embedded Link Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/embeddedlinkadapter/bld"/>
-</component>
-<component name="customization_build" filter="s60" long-name="DM Customization Build">
-<!-- If thes aren't collapsed into one cmp, can all #includes removed from here, and it renamed DM Customization ROM? -->
-<unit bldFile="app/devicecontrol/customization/group"/>
-</component>
-</collection>
-<collection name="omacp" long-name="OMA Content Provisioning" level="oma">
-<component name="omacpadapters" filter="s60" long-name="OMA CP Adapters" plugin="Y">
-<unit bldFile="app/devicecontrol/omacp/omacpadapters/group"/>
-</component>
-</collection>
-</block>
-<block name="printing" level="services" long-name="Printing" levels="app">
-<collection name="imageprint" long-name="ImagePrint" level="app">
-<component name="clog" filter="s60" long-name="ImagePrint Logging" introduced="^2">
-<unit bldFile="app/printing/imageprint/clog/group"/>
-</component>
-<component name="imageprintengine" filter="s60" long-name="ImagePrint Engine" introduced="^2">
-<unit bldFile="app/printing/imageprint/imageprintengine/group"/>
-</component>
-<component name="imageprintui" filter="s60" long-name="ImagePrint UI" introduced="^2">
-<unit bldFile="app/printing/imageprint/imageprintui/group"/>
-</component>
-<component name="imageprint_build" filter="s60" long-name="ImagePrint Build" introduced="^2">
-<!-- Need to break the IBY includes into the other components, or remove #includes and make this a ROM component -->
-<unit bldFile="app/printing/imageprint/group"/>
-</component>
-</collection>
-</block>
-<block name="files" level="apps" long-name="File Manager Apps" levels="support apps">
-<collection name="files_plat" long-name="File Manager Apps Platform Interfaces" level="apps">
-<component name="memory_scan_popup_ui_api" long-name="Memory Scan Popup UI API" filter="s60" class="api">
-<unit bldFile="app/files/files_plat/memory_scan_popup_ui_api/group"/>
-</component>
-</collection>
-<collection name="deviceencryption" long-name="Device Encryption" level="support">
-<!-- this is either needs to be broken up into idependent bld.infs, or it's really a component and should move down a directory -->
-<component name="devencnotifplugin" filter="s60" long-name="Device Encryption Notifier Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/files/deviceencryption/devencnotifplugin/group"/>
-</component>
-<component name="devencui" filter="s60" long-name="Device Encryption UI" introduced="^3">
-<unit bldFile="app/files/deviceencryption/devencui/group"/>
-</component>
-<component name="devencdmadapter" filter="s60" long-name="Device Encryption DM Adapter" introduced="^3" plugin="Y">
-<unit bldFile="app/files/deviceencryption/devencdmadapter/group"/>
-</component>
-<component name="devencgsplugin" filter="s60" long-name="Device Encryption GS Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/files/deviceencryption/devencgsplugin/group"/>
-</component>
-<component name="deviceencryption_help" filter="s60" long-name="Device Encryption Help" introduced="^3">
-<unit bldFile="app/files/deviceencryption/help/group"/>
-</component>
-<component name="deviceencryption_build" filter="s60" long-name="Device Encryption Build" introduced="^3">
-<unit bldFile="app/files/deviceencryption/group"/>
-</component>
-</collection>
-<collection name="filemanager" long-name="File Manager" level="apps">
-<!-- this is really a component, should move down a directory -->
-<component name="filemanager_build" filter="s60" long-name="File Manager Build">
-<unit bldFile="app/files/filemanager/group"/>
-</component>
-</collection>
-<collection name="filesystemuis" long-name="File System UIs" level="support">
-<component name="memscaneng" filter="s60" long-name="Memory Scan Server">
-<unit bldFile="app/files/filesystemuis/memscaneng/group"/>
-</component>
-<component name="memstatepopup" filter="s60" long-name="Memory State Popup">
-<unit bldFile="app/files/filesystemuis/memstatepopup/group"/>
-</component>
-</collection>
-</block>
-<block name="utils" level="apps" long-name="Utility Apps" levels="app">
-<collection name="extras" long-name="Extras" level="app">
-<component name="about" filter="s60" long-name="About Application">
-<unit bldFile="app/utils/extras/about/group"/>
-</component>
-<component name="calcsoft" filter="s60" long-name="Calculator Application">
-<unit bldFile="app/utils/extras/calcsoft/group"/>
-</component>
-<component name="converter" filter="s60" long-name="Unit Converter">
-<unit bldFile="app/utils/extras/converter/group"/>
-</component>
-</collection>
-</block>
-<block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
-<collection name="contacts_pub" long-name="Contacts Apps Public Interfaces" level="ui">
-<component name="phonebook_fetch_ui_api" long-name="Phonebook Fetch UI API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_fetch_ui_api/group"/>
-</component>
-<component name="phonebook_data_management_api" long-name="Phonebook Data Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_data_management_api/group"/>
-</component>
-<component name="phonebook_vcard_importexport_api" long-name="Phonebook vCard Import/Export API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_vcard_importexport_api/group"/>
-</component>
-<component name="phonebook_data_addedit_ui_api" long-name="Phonebook Data Add/Edit UI API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_data_addedit_ui_api/group"/>
-</component>
-<component name="phonebook_ui_utilities_api" long-name="Phonebook UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_ui_utilities_api/group"/>
-</component>
-<component name="phonebook_thumbnail_operation_api" long-name="Phonebook Thumbnail Operation API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_thumbnail_operation_api/group"/>
-</component>
-<component name="speed_dial_utility_control_api" long-name="Speed Dial Utility Control API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/speed_dial_utility_control_api/group"/>
-</component>
-</collection>
-<collection name="contacts_plat" long-name="Contacts Apps Platform Interfaces" level="ui">
-<component name="virtual_phonebook_store_api" long-name="Virtual Phonebook Store API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_store_api/group"/>
-</component>
-<component name="virtual_phonebook_sim_services_api" long-name="Virtual Phonebook SIM Services API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_sim_services_api/group"/>
-</component>
-<component name="virtual_phonebook_configuration_api" long-name="Virtual Phonebook Configuration API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_configuration_api/group"/>
-</component>
-<component name="virtual_phonebook_copy_policy_api" long-name="Virtual Phonebook Copy Policy API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_copy_policy_api/group"/>
-</component>
-<component name="virtual_phonebook_policy_api" long-name="Virtual Phonebook Policy API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_policy_api/group"/>
-</component>
-<component name="virtual_phonebook_engine_api" long-name="Virtual Phonebook Engine API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_engine_api/group"/>
-</component>
-<component name="virtual_phonebook_migration_support_api" long-name="Virtual Phonebook Migration Support API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_migration_support_api/group"/>
-</component>
-<component name="virtual_phonebook_view_definition_api" long-name="Virtual Phonebook View Definition API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_view_definition_api/group"/>
-</component>
-<component name="virtual_phonebook_vcard_api" long-name="Virtual Phonebook vCard API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_vcard_api/group"/>
-</component>
-<component name="cms_contactor_api" long-name="CMS Contactor API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/cms_contactor_api/group"/>
-</component>
-<component name="contactpresence_api" long-name="Contact Presence API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/contactpresence_api/group"/>
-</component>
-<component name="presence_cache_api" long-name="Presence Cache API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/presence_cache_api/group"/>
-</component>
-<component name="phonebook_internal_common_api" long-name="Phonebook Internal Common API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_common_api/group"/>
-</component>
-<component name="phonebook_internal_appfw_api" long-name="Phonebook Internal App Framework API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_appfw_api/group"/>
-</component>
-<component name="phonebook_internal_data_management_api" long-name="Phonebook Internal Data Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_data_management_api/group"/>
-</component>
-<component name="phonebook_2_xsp_extension_manager_api" long-name="Phonebook 2 xSP Extension Manager API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_xsp_extension_manager_api/group"/>
-</component>
-<component name="phonebook_ui_controls_api" long-name="Phonebook UI Controls API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_ui_controls_api/group"/>
-</component>
-<component name="phonebook_2_image_management_api" long-name="Phonebook 2 Image Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_image_management_api/group"/>
-</component>
-<component name="phonebook_extension_api" long-name="Phonebook Extension API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_extension_api/group"/>
-</component>
-<component name="phonebook_public_constants_api" long-name="Phonebook Public Constants API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_public_constants_api/group"/>
-</component>
-<component name="phonebook_internal_ui_utilities_api" long-name="Phonebook Internal UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_ui_utilities_api/group"/>
-</component>
-<component name="logs_engine_api_extensions" long-name="Logs Engine API Extensions" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/logs_engine_api_extensions/group"/>
-</component>
-<component name="phonebook_thumbnails_api" long-name="Phonebook Thumbnails API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_thumbnails_api/group"/>
-</component>
-<component name="phonebook_2_icon_api" long-name="Phonebook 2 Icon API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_icon_api/group"/>
-</component>
-<component name="phonebook_engine_extension_api" long-name="Phonebook Engine Extension API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_engine_extension_api/group"/>
-</component>
-<component name="phonebook_2_store_configuration_management_api" long-name="Phonebook 2 Store Configuration Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_store_configuration_management_api/group"/>
-</component>
-<component name="logs_ui_command_line_api" long-name="Logs UI Command Line API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/logs_ui_command_line_api/group"/>
-</component>
-<component name="speed_dial_dialogs_api" long-name="Speed Dial Dialogs API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/speed_dial_dialogs_api/group"/>
-</component>
-<component name="phonebook_2_xsp_view_activation_api" long-name="Phonebook 2 xSP View Activation API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_xsp_view_activation_api/group"/>
-</component>
-<component name="logs_timers_api" long-name="Logs Timers API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/logs_timers_api/group"/>
-</component>
-<component name="phonebook_2_ui_extension_definition_api" long-name="Phonebook 2 UI Extension Definition API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_definition_api/group"/>
-</component>
-<component name="phonebook_2_common_ui_api" long-name="Phonebook 2 Common UI API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_common_ui_api/group"/>
-</component>
-<component name="phonebook_2_ui_extension_api" long-name="Phonebook 2 UI Extension API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_api/group"/>
-</component>
-<component name="phonebook_2_store_property_api" long-name="Phonebook 2 Store Property API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_store_property_api/group"/>
-</component>
-<component name="phonebook_2_ui_extension_plugin_api" long-name="Phonebook 2 UI Extension Plug-In API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_plugin_api/group"/>
-</component>
-<component name="phonebook_2_ui_controls_api" long-name="Phonebook 2 UI Controls API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_controls_api/group"/>
-</component>
-<component name="phonebook_2_thin_ui_extension_plugin_api" long-name="Phonebook 2 Thin UI Extension Plugin API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_thin_ui_extension_plugin_api/group"/>
-</component>
-<component name="phonebook_2_commands_api" long-name="Phonebook 2 Commands API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_commands_api/group"/>
-</component>
-<component name="phonebook_2_presentation_api" long-name="Phonebook 2 Presentation API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_presentation_api/group"/>
-</component>
-<component name="phonebook_2_ui_utilities_api" long-name="Phonebook 2 UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_utilities_api/group"/>
-</component>
-<component name="cca_launch_api" long-name="CCA Launch API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/cca_launch_api/group"/>
-</component>
-<component name="cca_view_plugin_api" long-name="CCA View Plugin API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/cca_view_plugin_api/group"/>
-</component>
-<component name="predictivesearch_client_api" long-name="Predictive Search Client API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_client_api/group"/>
-</component>
-<component name="predictivesearch_utils_api" long-name="Predictive Search Utils API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_utils_api/group"/>
-</component>
-<component name="predictivesearch_adapters_api" long-name="Predictive Search Adapters API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_adapters_api/group"/>
-</component>
-<component name="predictivesearch_algorithm_api" long-name="Predictive Search Algorithm API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_algorithm_api/group"/>
-</component>
-<component name="phonebook_2_rcl_api" long-name="Phonebook 2 RCL API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_rcl_api/group"/>
-</component>
-</collection>
-<collection name="contactextensions" long-name="Contacts Extensions" level="services">
-<component name="predefinedcontacts" filter="s60" long-name="Predefined Contacts">
-<unit bldFile="app/contacts/contactextensions/predefinedcontacts/group"/>
-</component>
-</collection>
-<collection name="logsui" long-name="Logs UI" level="ui">
-<component name="logsui_build" filter="s60" long-name="Logs UI Build">
-<!-- component at too high a rank, should move down one directory -->
-<unit bldFile="app/contacts/logsui/group"/>
-</component>
-</collection>
-<collection name="phonebookui" long-name="Phonebook UI" level="ui">
-<component name="phonebook" filter="s60" long-name="Phonebook">
-<unit bldFile="app/contacts/phonebookui/phonebook/group"/>
-</component>
-<component name="speeddial" filter="s60" long-name="Speed Dial">
-<unit bldFile="app/contacts/phonebookui/speeddial/group"/>
-</component>
-<component name="phonebook2" filter="s60" long-name="Phone Book 2">
-<unit bldFile="app/contacts/phonebookui/phonebook2/group"/>
-</component>
-</collection>
-<collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
-<component name="cntfindplugin" filter="s60" long-name="Contacts Find Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntfindplugin/group"/>
-</component>
-<component name="cntsortplugin" filter="s60" long-name="Contacts Sort Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntsortplugin/group"/>
-</component>
-<component name="virtualphonebook" filter="s60" long-name="Virtual Phonebook" introduced="^2">
-<unit bldFile="app/contacts/phonebookengines/virtualphonebook/group"/>
-</component>
-<component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
-<unit bldFile="app/contacts/phonebookengines/contactsmodel/groupsql" mrp="app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
-</component>
-</collection>
-<collection name="pimprotocols" long-name="PIM Protocols" level="services">
-<component name="phonebooksync" long-name="Phonebook Sync" purpose="optional" plugin="Y">
-<unit bldFile="app/contacts/pimprotocols/phonebooksync/group" mrp="app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
-</component>
-<component name="pbap" long-name="Bluetooth PBAP" introduced="9.2" purpose="optional">
-<unit bldFile="app/contacts/pimprotocols/pbap/group" mrp="app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
-</component>
-</collection>
-<collection name="ccservices" long-name="Contacts Centric Services" level="services">
-<component name="cmsservices" filter="s60" long-name="Contact Method Selector Services" introduced="^2">
-<unit bldFile="app/contacts/ccservices/cmsservices/group"/>
-</component>
-</collection>
-<collection name="presencecache" long-name="Presence Cache" level="support">
-<component name="presencecacheutils" filter="s60" long-name="Presence Cache Utils" introduced="^2" class="placeholder">
-<!-- <unit bldFile="presencecache/presencecacheutils/group"/> -->
-</component>
-<component name="presencecacheserver2" filter="s60" long-name="Presence Cache Server" introduced="^2" class="placeholder">
-<!-- <unit bldFile="presencecache/presencecacheserver2/group"/> -->
-</component>
-<component name="presencecacheclient2" filter="s60" long-name="Presence Cache Client" introduced="^2" class="placeholder">
-<!-- <unit bldFile="presencecache/presencecacheclient2/group"/> -->
-</component>
-<component name="presencecache_build" filter="s60" long-name="Presence Cache Build" introduced="^2">
-<!-- should divide this bld.inf into the other components, or collapse them into a single component -->
-<unit bldFile="app/contacts/presencecache/group"/>
-</component>
-</collection>
-<collection name="predictivesearch" long-name="Predictive Search" level="support">
-<component name="pcsutils" filter="s60" long-name="PCS Utils" introduced="^2">
-<unit bldFile="app/contacts/predictivesearch/pcsutils/group"/>
-</component>
-<component name="pcsserverclientapi" filter="s60" long-name="PCS Server Client API" introduced="^2">
-<unit bldFile="app/contacts/predictivesearch/pcsserverclientapi/group"/>
-</component>
-<component name="pcsserver" filter="s60" long-name="PCS Server" introduced="^2">
-<unit bldFile="app/contacts/predictivesearch/pcsserver/group"/>
-</component>
-<component name="pcsadapters" filter="s60" long-name="PCS Adapters" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/predictivesearch/adapters/contacts/group"/>
-</component>
-<component name="pcsalgorithm" filter="s60" long-name="PCS Algorithm" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/predictivesearch/pcsalgorithm/group"/>
-</component>
-<component name="predictivesearch_build" filter="s60" long-name="Predictive Search Build" introduced="^2">
-<!-- need to remove #includes from bld.inf and rename as Predictive Search ROM -->
-<unit bldFile="app/contacts/predictivesearch/group"/>
-</component>
-</collection>
-<collection name="contacts_info" long-name="Contacts Apps Info" level="ui">
-<component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="organizer" level="apps" span="2" long-name="Organizer Application Suite" levels="support services engine ui app">
-<collection name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" level="app">
-<component name="meeting_request_mailbox_utilities_api" long-name="Meeting Request Mailbox Utilities API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_mailbox_utilities_api/group"/>
-</component>
-<component name="meeting_request_uids_api" long-name="Meeting Request UIDs API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_uids_api/group"/>
-</component>
-<component name="calendar_exporter_api" long-name="Calendar Exporter API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_exporter_api/group"/>
-</component>
-<component name="agenda_versit_2_api" long-name="Agenda Versit 2 API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/agenda_versit_2_api/group"/>
-</component>
-<component name="calendar_importer_api" long-name="Calendar Importer API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_importer_api/group"/>
-</component>
-<component name="calendar_launcher_api" long-name="Calendar Launcher API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_launcher_api/group"/>
-</component>
-<component name="calendar_common_utils_api" long-name="Calendar Common Utils API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_common_utils_api/group"/>
-</component>
-<component name="searchfw_launcher_api" long-name="Search Framework Launcher API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/searchfw_launcher_api/group"/>
-</component>
-<component name="alarm_const_api" long-name="Alarm Const API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/alarm_const_api/group"/>
-</component>
-<component name="alarm_ui_external_control_api" long-name="Alarm UI External Control API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/alarm_ui_external_control_api/group"/>
-</component>
-<component name="calendar_settings_keys_api" long-name="Calendar Settings Keys API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_settings_keys_api/group"/>
-</component>
-<component name="calendar_tones_settings_keys_api" long-name="Calendar Tones Settings Keys API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_tones_settings_keys_api/group"/>
-</component>
-<component name="clock_settings_api" long-name="Clock Settings API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/clock_settings_api/group"/>
-</component>
-<component name="common_alarm_editor_api" long-name="Common Alarm Editor API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/common_alarm_editor_api/group"/>
-</component>
-<component name="alarm_ui_secondary_display_api" long-name="Alarm UI Secondary Display API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/alarm_ui_secondary_display_api/group"/>
-</component>
-<component name="searchui_launcher_api" long-name="Search UI Launcher API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/searchui_launcher_api/group"/>
-</component>
-<component name="agenda_entry_ui_api" long-name="Agenda Entry UI API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/agenda_entry_ui_api/group"/>
-</component>
-<component name="meeting_request_utillities_api" long-name="Meeting Request Utillities API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_utillities_api/group"/>
-</component>
-<component name="meeting_request_viewer_api" long-name="Meeting Request Viewer API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_viewer_api/group"/>
-</component>
-<component name="calendar_custamization_api" long-name="Calendar Customization API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_custamization_api/group"/>
-</component>
-</collection>
-<collection name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" level="app">
-<component name="calendar_interim_utils2_api" long-name="Calendar Interim Utils 2 API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_pub/calendar_interim_utils2_api/group"/>
-</component>
-<component name="notepad_library_api" long-name="Notepad Library API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_pub/notepad_library_api/group"/>
-</component>
-</collection>
-<collection name="alarmengines" long-name="Alarm Engines" level="engine">
-<component name="missedalarmstore" filter="s60" long-name="Missed Alarm Store">
-<unit bldFile="app/organizer/alarmengines/missedalarmstore/group"/>
-</component>
-</collection>
-<collection name="calendarengines" long-name="Calendar Engines" level="engine">
-<component name="versit2" filter="s60" long-name="Versit 2 iCal Parser" introduced="9.2">
-<unit bldFile="app/organizer/calendarengines/versit2/group"/>
-</component>
-<component name="agnversit2" filter="s60" long-name="Versit 2 Agenda Interface" introduced="9.2" plugin="Y">
-<unit bldFile="app/organizer/calendarengines/agnversit2/group"/>
-</component>
-<component name="caleninterimutils" filter="s60" long-name="Calendar Interim Utils" introduced="9.1">
-<unit bldFile="app/organizer/calendarengines/caleninterimutils/group"/>
-</component>
-<component name="calenimp" filter="s60" long-name="Calendar Import Wrapper" introduced="7.0s">
-<unit bldFile="app/organizer/calendarengines/calenimp/group"/>
-</component>
-<component name="calenlauncher" filter="s60" long-name="Calendar Launcher">
-<unit bldFile="app/organizer/calendarengines/calenlauncher/group"/>
-</component>
-<component name="caldavsrv" filter="sf_build" long-name="CalDAV Server" introduced="^3">
-<unit bldFile="app/organizer/calendarengines/caldav/group"/>
-</component>
-</collection>
-<collection name="meetingrequestengines" long-name="Meeting Request Engines" level="engine">
-<component name="mrmailbox" filter="s60" long-name="Meeting Request Mailbox">
-<unit bldFile="app/organizer/meetingrequestengines/mrmailbox/group"/>
-</component>
-<component name="mrmailboxutils" filter="s60" long-name="Meeting Request Mailbox Utils" plugin="Y">
-<unit bldFile="app/organizer/meetingrequestengines/mrmailboxutils/group"/>
-</component>
-</collection>
-<collection name="searchfw" long-name="Search Framework" level="services">
-<!-- Uncomment all units when configuration is in place. All currently #included from searchfw_build, which should be removed at the same time. -->
-<component name="coresearchfw" filter="s60" long-name="Core Search Framework" introduced="^1" class="placeholder">
-<!--<unit bldFile="searchfw/coresearchfw/group"/>-->
-</component>
-<component name="searchfw_plugins" filter="s60" long-name="Search Plugins" introduced="^1" plugin="Y" class="placeholder">
-<!--<unit bldFile="searchfw/plugins/group"/>-->
-</component>
-<component name="searchfw_build" filter="s60" long-name="Search Framework Build" introduced="^1">
-<unit bldFile="app/organizer/searchfw/group"/>
-</component>
-</collection>
-<collection name="alarmui" long-name="Alarm UI" level="app">
-<!-- collection is really a component, should move down a directory -->
-<component name="alarmui_build" filter="s60" long-name="Alarm UI Build">
-<unit bldFile="app/organizer/alarmui/group"/>
-</component>
-</collection>
-<collection name="calendarui" long-name="Calendar UI" level="ui">
-<component name="calendarui_help" filter="s60" long-name="Calendar UI Help">
-<unit bldFile="app/organizer/calendarui/help/group"/>
-</component>
-<component name="commonutils" filter="s60" long-name="Calendar Common Utils">
-<unit bldFile="app/organizer/calendarui/commonutils/group"/>
-</component>
-<component name="globaldata" filter="s60" long-name="Calendar Global Data">
-<unit bldFile="app/organizer/calendarui/globaldata/group"/>
-</component>
-<component name="settings" filter="s60" long-name="Calendar Settings">
-<!-- these should be merged into a single bld.inf or split into two components -->
-<unit bldFile="app/organizer/calendarui/settings/gsplugin/group"/>
-<unit bldFile="app/organizer/calendarui/settings/settingsui/group"/>
-</component>
-<component name="customisation" filter="s60" long-name="Calendar Customisation">
-<unit bldFile="app/organizer/calendarui/customisation/group"/>
-</component>
-<component name="customisationmanager" filter="s60" long-name="Calendar Customisation Manager">
-<unit bldFile="app/organizer/calendarui/customisationmanager/group"/>
-</component>
-<component name="multicaluidialog" filter="s60" long-name="Multi-Calendar UI Dialog" introduced="^3">
-<unit bldFile="app/organizer/calendarui/multicaluidialog/group"/>
-</component>
-<component name="views" filter="s60" long-name="Calendar Views">
-<unit bldFile="app/organizer/calendarui/views/group"/>
-</component>
-<component name="calendarui_controller" filter="s60" long-name="Calendar Controller">
-<unit bldFile="app/organizer/calendarui/controller/group"/>
-</component>
-<component name="calendarui_editors" filter="s60" long-name="Calendar Editors">
-<unit bldFile="app/organizer/calendarui/editors/group"/>
-</component>
-<component name="calendarui_application" filter="s60" long-name="Calendar Application">
-<unit bldFile="app/organizer/calendarui/application/group"/>
-</component>
-<component name="missedalarmindicatorplugin" filter="s60" long-name="Missed Alarm Indicator Plugin" plugin="Y">
-<unit bldFile="app/organizer/calendarui/missedalarmindicatorplugin/group"/>
-</component>
-<component name="calendarui_server" filter="s60" long-name="Calendar Server">
-<!-- these should be merged into a single bld.inf or split into two components -->
-<unit bldFile="app/organizer/calendarui/server/calensvr/group"/>
-<unit bldFile="app/organizer/calendarui/server/calensvrclient/group"/>
-</component>
-<component name="regionalplugins" filter="s60" long-name="Calendar Regional Plugins" plugin="Y">
-<!-- these should be merged into a single bld.inf or split into four components -->
-<unit bldFile="app/organizer/calendarui/regionalplugins/calenregionalutil/group"/>
-<unit bldFile="app/organizer/calendarui/regionalplugins/lunarchinese/group"/>
-<unit bldFile="app/organizer/calendarui/regionalplugins/lunarvietnamese/group"/>
-<unit bldFile="app/organizer/calendarui/regionalplugins/thai/group"/>
-</component>
-<component name="calenaiwprovider" filter="s60" long-name="Calendar AIW Proivder" introduced="^3" plugin="Y">
-<unit bldFile="app/organizer/calendarui/calenaiwprovider/group"/>
-</component>
-<component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y">
-<unit bldFile="app/organizer/calendarui/caldav/group"/>
-</component>
-<component name="calendarui_build" filter="s60" long-name="Calendar UI Build">
-<!-- split contents into separate components -->
-<unit bldFile="app/organizer/calendarui/group"/>
-</component>
-</collection>
-<collection name="meetingui" long-name="Meeting UI" level="ui">
-<component name="attendeeview" filter="s60" long-name="Attendee View">
-<unit bldFile="app/organizer/meetingui/attendeeview/group"/>
-</component>
-<component name="agnentryui" filter="s60" long-name="Agenda Entry UI" plugin="Y">
-<unit bldFile="app/organizer/meetingui/agnentryui/group"/>
-</component>
-<component name="meetingrequestutils" filter="s60" long-name="Meeting Request Utils">
-<unit bldFile="app/organizer/meetingui/meetingrequestutils/group"/>
-</component>
-<component name="meetingrequestviewers" filter="s60" long-name="Meeting Request Viewers" plugin="Y">
-<unit bldFile="app/organizer/meetingui/meetingrequestviewers/group"/>
-</component>
-<component name="meetingui_build" filter="s60" long-name="Meeting UI Build">
-<!-- split contents into separate components -->
-<unit bldFile="app/organizer/meetingui/group"/>
-</component>
-</collection>
-<collection name="clock2" long-name="Clock" level="app">
-<component name="clockengines" filter="s60" long-name="Clock Engines">
-<unit bldFile="app/organizer/clock2/clockengines/group"/>
-</component>
-<component name="clockui" filter="s60" long-name="Clock UI">
-<unit bldFile="app/organizer/clock2/clockui/group"/>
-</component>
-<component name="clock2_help" filter="s60" long-name="Clock Help">
-<unit bldFile="app/organizer/clock2/help/group"/>
-</component>
-<component name="clock2_build" filter="s60" long-name="Clock Build">
-<!-- split contents into separate components, or just make this one component -->
-<unit bldFile="app/organizer/clock2/group"/>
-</component>
-</collection>
-<collection name="notepad" long-name="Notepad" level="ui">
-<component name="notepad_help" filter="s60" long-name="Notepad Help">
-<unit bldFile="app/organizer/notepad/help/group"/>
-</component>
-<component name="notepad1" filter="s60" long-name="Notepad Application 1">
-<unit bldFile="app/organizer/notepad/notepad1/group"/>
-</component>
-<component name="txtrecog" filter="s60" long-name="Text Recognizer" plugin="Y">
-<unit bldFile="app/organizer/notepad/txtrecog/group"/>
-</component>
-</collection>
-<collection name="searchui" long-name="Search UI" level="app">
-<!-- consider making this a single component -->
-<!-- Uncomment all units when configuration is in place. All currently #included from searchui_build, which should be removed at the same time. -->
-<component name="searchui_help" filter="s60" long-name="Search UI Help" class="placeholder">
-<!--<unit bldFile="searchui/help/group"/>-->
-</component>
-<component name="searchapp" filter="s60" long-name="Search Application" class="placeholder">
-<!--<unit bldFile="searchui/searchapp/group"/>-->
-</component>
-<component name="searchui_build" filter="s60" long-name="Search UI Build">
-<unit bldFile="app/organizer/searchui/group"/>
-</component>
-</collection>
-<collection name="pimappservices" long-name="PIM Application Services" level="services">
-<component name="calendar" long-name="Calendar" introduced="9.2" purpose="optional">
-<unit bldFile="app/organizer/pimappservices/calendar/group" mrp="app/organizer/pimappservices/calendar/group/app-engines_calendar.mrp" version="2"/>
-</component>
-<component name="calendarvcalplugin" long-name="Calendar vCal Plugin" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="app/organizer/pimappservices/calendarvcalplugin/group" mrp="app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp" version="2"/>
-</component>
-<component name="appenginesdocs" long-name="Application Engines Documentation" purpose="development" class="doc">
-<unit mrp="app/organizer/pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
-</component>
-</collection>
-<collection name="pimappsupport" long-name="PIM Application Support" level="support">
-<component name="vcardandvcal" long-name="vCard and vCal" introduced="ER5" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/vcardandvcal/group" mrp="app/organizer/pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
-</component>
-<component name="chinesecalendarconverter" long-name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
-</component>
-</collection>
-<collection name="organizer_info" long-name="Organizer Application Suite Info" level="app">
-<component name="organizer_metadata" long-name="Organizer Application Suite Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="mail eng base ui">
-<collection name="msg_pub" long-name="Messaging Apps Public APIs" level="ui">
-<component name="messaging_integration_api" long-name="Messaging Integration API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/messaging_integration_api/group"/>
-</component>
-<component name="plugin_bio_control_api" long-name="Plug-in Bio Control API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/plugin_bio_control_api/group"/>
-</component>
-<component name="mms_client_mtm_api" long-name="MMS Client MTM API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/mms_client_mtm_api/group"/>
-</component>
-<component name="open_new_message_notification_api" long-name="Open New Message Notification API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/open_new_message_notification_api/group"/>
-</component>
-<component name="messaging_editor_constants_api" long-name="Messaging Editor Constants API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/messaging_editor_constants_api/group"/>
-</component>
-</collection>
-<collection name="msg_plat" long-name="Messaging Apps Platform APIs" level="ui">
-<component name="smil_player_launch_api" long-name="SMIL Player Launch API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/smil_player_launch_api/group"/>
-</component>
-<component name="messaging_media_resolver_api" long-name="Messaging Media Resolver API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/messaging_media_resolver_api/group"/>
-</component>
-<component name="smil_engine_api" long-name="SMIL Engine API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/smil_engine_api/group"/>
-</component>
-<component name="mms_server_settings_api" long-name="MMS Server Settings API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_server_settings_api/group"/>
-</component>
-<component name="new_contacts_note_secondary_display_api" long-name="New Contacts Note Secondary Display API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contacts_note_secondary_display_api/group"/>
-</component>
-<component name="messaging_center_ui_utilities_api" long-name="Messaging Center UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/messaging_center_ui_utilities_api/group"/>
-</component>
-<component name="internet_mail_mtm_ui_api" long-name="Internet Mail MTM UI API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/internet_mail_mtm_ui_api/group"/>
-</component>
-<component name="messaging_editor_api" long-name="Messaging Editor API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/messaging_editor_api/group"/>
-</component>
-<component name="email_domain_utilities_api" long-name="Email Domain Utilities API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/email_domain_utilities_api/group"/>
-</component>
-<component name="smil_transition_api" long-name="SMIL Transition API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/smil_transition_api/group"/>
-</component>
-<component name="new_contacts_note_status_api" long-name="New Contacts Note Status API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contacts_note_status_api/group"/>
-</component>
-<component name="unified_editor_video_conversion_api" long-name="Unified Editor Video Conversion API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/unified_editor_video_conversion_api/group"/>
-</component>
-<component name="mms_conformance_api" long-name="MMS Conformance API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_conformance_api/group"/>
-</component>
-<component name="new_contacts_note_variables_api" long-name="New Contacts Note Variables API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contacts_note_variables_api/group"/>
-</component>
-<component name="new_message_notification_api" long-name="New Message Notification API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_message_notification_api/group"/>
-</component>
-<component name="mms_application_api" long-name="MMS Application API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_application_api/group"/>
-</component>
-<component name="mms_engine_settings_api" long-name="MMS Engine Settings API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_engine_settings_api/group"/>
-</component>
-<component name="mms_codec_client_api" long-name="MMS Codec Client API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_codec_client_api/group"/>
-</component>
-<component name="send_ui_meeting_request_api" long-name="Send UI Meeting Request API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/send_ui_meeting_request_api/group"/>
-</component>
-<component name="new_contact_notes_extended_api" long-name="New Contact Notes Extended API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contact_notes_extended_api/group"/>
-</component>
-<component name="mail_ui_constants_api" long-name="Mail UI Constants API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mail_ui_constants_api/group"/>
-</component>
-<component name="sim_dialog_launch_api" long-name="SIM Dialog Launch API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/sim_dialog_launch_api/group"/>
-</component>
-</collection>
-<collection name="mobilemessaging" long-name="Mobile Messaging" level="ui">
-<component name="audiomsg" filter="s60" long-name="Audio Message">
-<unit bldFile="app/messaging/mobilemessaging/audiomsg/group"/>
-</component>
-<component name="msgmedia" filter="s60" long-name="Message Media">
-<unit bldFile="app/messaging/mobilemessaging/msgmedia/group"/>
-</component>
-<component name="unieditor" filter="s60" long-name="Unified Editor">
-<unit bldFile="app/messaging/mobilemessaging/unieditor/group"/>
-</component>
-<component name="mmsui" filter="s60" long-name="MMS UI">
-<unit bldFile="app/messaging/mobilemessaging/mmsui/group"/>
-</component>
-<component name="postcard" filter="s60" long-name="Postcard">
-<unit bldFile="app/messaging/mobilemessaging/postcard/group"/>
-</component>
-<component name="smilui" filter="s60" long-name="SMIL UI">
-<unit bldFile="app/messaging/mobilemessaging/smilui/group"/>
-</component>
-<component name="smum" filter="s60" long-name="SMS UI MTM and UI Data MTM" plugin="Y">
-<unit bldFile="app/messaging/mobilemessaging/smum/group"/>
-</component>
-<component name="smsui" filter="s60" long-name="SMS UI">
-<unit bldFile="app/messaging/mobilemessaging/smsui/group"/>
-</component>
-<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/mobilemessaging/smsmtm/group" mrp="app/messaging/mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
-</component>
-</collection>
-<collection name="mmsengine" long-name="MMS Engine" level="eng">
-<component name="mmsconninit" filter="s60" long-name="MMS Connection Initiator" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsconninit/bld"/> -->
-</component>
-<component name="genutils" filter="s60" long-name="General Utils" class="placeholder">
-<!-- <unit bldFile="mmsengine/genutils/bld"/> -->
-</component>
-<component name="mmsserversettings" filter="s60" long-name="MMS Server Settings" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserversettings/bld"/> -->
-</component>
-<component name="mmsmessage" filter="s60" long-name="MMS Message" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsmessage/bld"/> -->
-</component>
-<component name="mmshttptransport" filter="s60" long-name="MMS HTTP Transport" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmshttptransport/bld"/> -->
-</component>
-<component name="mmscodec" filter="s60" long-name="MMS Codec" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodec/bld"/> -->
-</component>
-<component name="mmsserver" filter="s60" long-name="MMS Server" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserver/bld"/> -->
-</component>
-<component name="clientmtm" filter="s60" long-name="MMS Client MTM" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/clientmtm/bld"/> -->
-</component>
-<component name="mmswatcher" filter="s60" long-name="MMS Watcher" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmswatcher/bld"/> -->
-</component>
-<component name="mmspushhandler" filter="s60" long-name="MMS Push Handler" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmspushhandler/bld"/> -->
-</component>
-<component name="applicationadapter" filter="s60" long-name="MMS Application Adapter" class="placeholder">
-<!-- <unit bldFile="mmsengine/applicationadapter/bld"/> -->
-</component>
-<component name="mmscodecclient" filter="s60" long-name="MMS Codec Client" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodecclient/bld"/> -->
-</component>
-<component name="mmssettings" long-name="MMS Settings" introduced="9.2" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmssettings/group" mrp="app/messaging/mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
-</component>
-<component name="mmsconf" long-name="MMS Configuration" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmsconf" mrp="app/messaging/mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
-</component>
-<component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
-<!-- this bld.inf should be broken up into the individual other components -->
-<unit bldFile="app/messaging/mmsengine/group"/>
-</component>
-</collection>
-<collection name="messagingappbase" long-name="Messaging App Base" level="base">
-<component name="msgavkon" filter="s60" long-name="Messaging Avkon UI">
-<unit bldFile="app/messaging/messagingappbase/msgavkon/group"/>
-</component>
-<component name="mce" filter="s60" long-name="Message Center Application">
-<unit bldFile="app/messaging/messagingappbase/mce/group"/>
-</component>
-<component name="mceextraitems" filter="s60" long-name="Message Center Extra Items">
-<unit bldFile="app/messaging/messagingappbase/mceextraitems/group"/>
-</component>
-<component name="mcesettings" filter="s60" long-name="Message Center Settings">
-<unit bldFile="app/messaging/messagingappbase/mcesettings/group"/>
-</component>
-<component name="msgerrorwatcher" filter="s60" long-name="Messaging Error Watcher" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/msgerrorwatcher/group"/>
-</component>
-<component name="ncnlist" filter="s60" long-name="New Contacts Note List">
-<unit bldFile="app/messaging/messagingappbase/ncnlist/group"/>
-</component>
-<component name="schemeplugin" filter="s60" long-name="Scheme Handler Plugin" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/schemeplugin/group"/>
-</component>
-<component name="sendui" filter="s60" long-name="Send UI" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/sendui/group"/>
-</component>
-<component name="smilengine" filter="s60" long-name="SMIL Engine">
-<unit bldFile="app/messaging/messagingappbase/smilengine/group"/>
-</component>
-<component name="bium" filter="s60" long-name="BIO UI MTM" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/bium/group"/>
-</component>
-<component name="smartmessaging" filter="s60" long-name="Smart Messaging">
-<unit bldFile="app/messaging/messagingappbase/smartmessaging/group"/>
-</component>
-<component name="msgeditor" filter="s60" long-name="Messaging Editor">
-<unit bldFile="app/messaging/messagingappbase/msgeditor/group"/>
-</component>
-<component name="smilparser" long-name="SMIL Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="app/messaging/messagingappbase/smilparser/GROUP" mrp="app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
-</component>
-<component name="obexmtms" long-name="OBEX MTMs" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/obexmtms/Group" mrp="app/messaging/messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
-</component>
-</collection>
-<collection name="email" long-name="Email" level="mail">
-<!-- use commonemail instead -->
-<component name="alwaysonlineemailplugin" filter="s60" long-name="Always Online Mail Plugin" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/alwaysonlineemailplugin/group"/>
-</component>
-<component name="emailnotificationhandler" filter="s60" long-name="Email Notification Handler" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/emailnotificationhandler/group"/>
-</component>
-<component name="imum" filter="s60" long-name="Internet Mail UI MTM" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/imum/group"/>
-</component>
-<component name="mail" filter="s60" long-name="Mail Application" deprecated="^3">
-<unit bldFile="app/messaging/email/mail/group"/>
-</component>
-<component name="pop3andsmtpmtm" long-name="POP3 and SMTP MTM" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/pop3andsmtpmtm/group" mrp="app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
-</component>
-<component name="imap4mtm" long-name="IMAP4 MTM" introduced="9.2" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/imap4mtm/group" mrp="app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
-</component>
-</collection>
-<collection name="messaging_info" long-name="Messaging Apps Info" level="ui">
-<component name="messaging_metadata" long-name="Messaging Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commonemail" level="apps" span="2" long-name="Email Apps" levels="service support ui app">
-<collection name="email_pub" long-name="Email Apps Public Interfaces" level="app">
-<component name="email_widget_api" long-name="Email Widget API" filter="s60" class="api">
-<unit bldFile="app/commonemail/email_pub/email_widget_api/group"/>
-</component>
-</collection>
-<collection name="email_plat" long-name="Email Apps Platform Interfaces" level="app">
-<component name="email_client_api" long-name="Email Client API" filter="s60" class="api">
-<unit bldFile="app/commonemail/email_plat/email_client_api/group"/>
-</component>
-<component name="email_setup_plugin_api" long-name="Email Setup Plugin API" filter="s60" class="api">
-<unit bldFile="app/commonemail/email_plat/email_setup_plugin_api/group"/>
-</component>
-</collection>
-<collection name="emailservices" long-name="Email Services" level="service">
-<component name="emailframework" filter="s60" long-name="Email Framework" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailframework/group"/>
-</component>
-<component name="emailclientapi" filter="s60" long-name="Email Client API" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailclientapi/group"/>
-</component>
-<component name="emailserver" filter="s60" long-name="Email Server" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailserver/group"/>
-</component>
-<component name="emailservermonitor" filter="s60" long-name="Email Server Monitor" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailservermonitor/group"/>
-</component>
-<component name="psmruadapter" filter="s60" long-name="Predictive Search Most Recent Used Adapter" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailservices/psmruadapter/group"/>
-</component>
-<component name="emailstore" filter="s60" long-name="Email Store" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailstore/group"/>
-</component>
-<component name="emaildebug" filter="s60" long-name="Email Debug" introduced="^2" class="api">
-<unit bldFile="app/commonemail/emailservices/emaildebug/group"/>
-</component>
-<component name="emailinstallationinitiator" filter="s60" long-name="Email Installation Initiator" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailinstallationinitiator/group"/>
-</component>
-</collection>
-<collection name="ipsservices" long-name="IMAP/POP/SMTP Services" level="service">
-<component name="ipssossettings" filter="s60" long-name="IPS SOS Settings" introduced="^2">
-<!-- SOS? Consider spelling it out since the abbreviation is ambiguous -->
-<unit bldFile="app/commonemail/ipsservices/ipssossettings/group"/>
-</component>
-<component name="ipssosplugin" filter="s60" long-name="IPS SOS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/ipsservices/ipssosplugin/group"/>
-</component>
-<component name="ipssosaoplugin" filter="s60" long-name="IPS SOS Always Online Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/ipsservices/ipssosaoplugin/group"/>
-</component>
-<component name="ipsservices_build" filter="s60" long-name="IPS Services Build" introduced="^2">
-<unit bldFile="app/commonemail/ipsservices/group"/>
-<!-- can the exports be broken up into the other components or made a config component?-->
-</component>
-</collection>
-<collection name="emailcontacts" long-name="Email Contacts" level="support">
-<component name="contactactionservice" filter="s60" long-name="Contact Action Service" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailcontacts/contactactionservice/group"/>
-</component>
-<component name="contactactionmenu" filter="s60" long-name="Contact Action Menu" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailcontacts/contactactionmenu/group"/>
-</component>
-<component name="remotecontactlookup" filter="s60" long-name="Remote Contact Lookup" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailcontacts/remotecontactlookup/group"/>
-</component>
-</collection>
-<collection name="meetingrequest" long-name="Meeting Request" level="ui">
-<component name="mrcommon" filter="s60" long-name="MR Common" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrcommon/group"/>
-</component>
-<component name="mrdb" filter="s60" long-name="MR Database" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrdb/group"/>
-</component>
-<component name="mrpolicy" filter="s60" long-name="MR Policy" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrpolicy/group"/>
-</component>
-<component name="mrservices" filter="s60" long-name="MR Services" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrservices/group"/>
-</component>
-<component name="mrgui" filter="s60" long-name="MR GUI" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrgui/group"/>
-</component>
-<component name="mrentry" filter="s60" long-name="MR Entry" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrentry/group"/>
-</component>
-<component name="mrtasks" filter="s60" long-name="MR Tasks" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrtasks/group"/>
-</component>
-<component name="mrutils" filter="s60" long-name="MR Utils" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrutils/group"/>
-</component>
-<component name="mrutilscalplugin" filter="s60" long-name="MR Utils Calendar Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mrutilscalplugin/group"/>
-</component>
-<component name="mrviewer" filter="s60" long-name="MR Viewer" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrviewer/group"/>
-</component>
-<component name="mrviewercalplugin" filter="s60" long-name="MR Viewer Calendar Plugin" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrviewercalplugin/group"/>
-</component>
-<component name="mricalviewer" filter="s60" long-name="MR iCal Viewer" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mricalviewer/group"/>
-</component>
-<component name="mrversit2" filter="s60" long-name="MR Versit2" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrversit2/group"/>
-</component>
-<component name="mragnversit2" filter="s60" long-name="MR Agenda Versit2" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mragnversit2/group"/>
-</component>
-<component name="mrcasplugin" filter="s60" long-name="MR Contact Action Service Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mrcasplugin/group"/>
-</component>
-<component name="mrurlparserplugin" filter="s60" long-name="MR URL Parser Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mrurlparserplugin/group"/>
-</component>
-<component name="meetingrequest_build" filter="s60" long-name="MR Build" introduced="^2">
-<!-- can the exports be broken up into the other components ?
- alternatively, move the exports into a RM Config component-->
-<unit bldFile="app/commonemail/meetingrequest/group"/>
-</component>
-</collection>
-<collection name="emailuis" long-name="Email UIs" level="app">
-<component name="emailui" filter="s60" long-name="Email UI" introduced="^2">
-<unit bldFile="app/commonemail/emailuis/emailui/group"/>
-</component>
-<component name="gsemailsettings" filter="s60" long-name="Email GS Settings" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailuis/gsemailsettings/group"/>
-</component>
-<component name="uicomponents" filter="s60" long-name="Email UI Components" introduced="^2">
-<unit bldFile="app/commonemail/emailuis/uicomponents/group"/>
-</component>
-<component name="widget" filter="s60" long-name="Email Widget" introduced="^2">
-<!-- Uncomment unit when configuration is in place. Currently #included from emailuis_build, which should be removed at the same time. -->
-<!--<unit bldFile="emailuis/widget/group"/>-->
-</component>
-<component name="emailuis_build" filter="s60" long-name="Email UIs Build" introduced="^2">
-<unit bldFile="app/commonemail/emailuis/group"/>
-</component>
-</collection>
-<collection name="commonemail_info" long-name="Email Apps Info" level="app">
-<component name="emailhelp" filter="s60" long-name="Email Help" class="placeholder">
-<!-- should this be commented out or not? -->
-<!-- <unit bldFile="emailhelp/group"/> -->
-</component>
-<component name="commonemail_help" filter="s60" long-name="Email Help" introduced="^2" class="placeholder">
-<!-- should this be commented out or not? -->
-<!-- <unit bldFile="help/group"/> -->
-</component>
-</collection>
-</block>
-<block name="conversations" level="apps" long-name="Conversation Apps" levels="settings utils plugin ui">
-<collection name="conversations_plat" long-name="Conversation Apps Platform Interfaces" level="ui">
-<component name="im_cv_launcher_api" long-name="IM CV Launcher API" filter="s60" class="api">
-<unit bldFile="app/conversations/conversations_plat/im_cv_launcher_api/group"/>
-</component>
-<component name="im_connection_api" long-name="IM Connection API" filter="s60" class="api">
-<unit bldFile="app/conversations/conversations_plat/im_connection_api/group"/>
-</component>
-<component name="im_cv_appui_api" long-name="IM CV App UI API" filter="s60" class="api">
-<unit bldFile="app/conversations/conversations_plat/im_cv_appui_api/group"/>
-</component>
-</collection>
-<collection name="uiservicetabsettings" long-name="UI Service Tab Settings" level="settings">
-<!-- this is really at the wrong rank. should move down a directory -->
-<component name="vimpstsettings" filter="s60" long-name="VIMP Service Tab Settings">
-<unit bldFile="app/conversations/uiservicetabsettings/group"/>
-</component>
-</collection>
-<collection name="instantmessagesalert" long-name="Instant Messages Alert" level="utils">
-<!-- this is really at the wrong rank. should move down a directory -->
-<component name="instantmessagesalert_build" filter="s60" long-name="Instant Messages Alert build" introduced="^3">
-<unit bldFile="app/conversations/instantmessagesalert/group"/>
-</component>
-</collection>
-<collection name="imstutils" long-name="IM Service Tab Utils" level="utils">
-<component name="imstutils_help" filter="s60" long-name="IM Service Tab Help">
-<unit bldFile="app/conversations/imstutils/help/group"/>
-</component>
-<component name="imconnectionprovider" filter="s60" long-name="IM Connection Provider" plugin="Y">
-<unit bldFile="app/conversations/imstutils/imconnectionprovider/group"/>
-</component>
-<component name="xmppadapter" filter="s60" long-name="XMPP Settings Adapter" plugin="Y">
-<unit bldFile="app/conversations/imstutils/xmppadapter/group"/>
-</component>
-<component name="imconversationview" filter="s60" long-name="IM Conversation View">
-<unit bldFile="app/conversations/imstutils/imconversationview/group"/>
-</component>
-<component name="imstutils_config" filter="s60" long-name="IM Service Tab Utils config" class="config">
-<!-- remove the #includes and or moved ithe loc file into one the above components -->
-<unit bldFile="app/conversations/imstutils/group"/>
-</component>
-</collection>
-<collection name="uiservicetab" long-name="UI Service Tab" level="ui">
-<component name="vimpstutils" filter="s60" long-name="VIMP Service Tab Utilities">
-<!-- need to spell out VIMP at least once -->
-<unit bldFile="app/conversations/uiservicetab/vimpstutils/group"/>
-</component>
-<component name="vimpststorage" filter="s60" long-name="VIMP Service Tab Storage">
-<unit bldFile="app/conversations/uiservicetab/vimpststorage/group"/>
-</component>
-<component name="vimpstengine" filter="s60" long-name="VIMP Service Tab Engine">
-<unit bldFile="app/conversations/uiservicetab/vimpstengine/group"/>
-</component>
-<component name="vimpstcmdprocess" filter="s60" long-name="VIMP Service Tab Command Process">
-<unit bldFile="app/conversations/uiservicetab/vimpstcmdprocess/group"/>
-</component>
-<component name="vimpstui" filter="s60" long-name="VIMP Service Tab UI">
-<unit bldFile="app/conversations/uiservicetab/vimpstui/group"/>
-</component>
-<component name="vimpstdetailsviewplugin" filter="s60" long-name="VIMP ST Details View Plugin" plugin="Y">
-<unit bldFile="app/conversations/uiservicetab/vimpstdetailsviewplugin/group"/>
-</component>
-<component name="uiservicetab_build" filter="s60" long-name="UI Service Tab Build">
-<!-- can this be distributed into the above bld.infs? -->
-<unit bldFile="app/conversations/uiservicetab/group"/>
-</component>
-</collection>
-<collection name="servicewidget" long-name="Service Widget" level="ui">
-<component name="servicewidgetdatapublisher" filter="s60" long-name="Service Widget Data Publisher" plugin="Y">
-<unit bldFile="app/conversations/servicewidget/servicewidgetdatapublisher/group"/>
-</component>
-<component name="themes" filter="s60" long-name="Service Widget Themes" class="config">
-<!-- does this really need to have that number in the directory name? -->
-<unit bldFile="app/conversations/servicewidget/themes/install-themes/install/servicewidget_20021383/group"/>
-</component>
-<component name="servicewidget_build" filter="s60" long-name="Service Widget Build">
-<!-- Either move the whole collection down one directory into a single component, or move the ROM and SIS parts into a Service Widget ROM component -->
-<unit bldFile="app/conversations/servicewidget/group"/>
-</component>
-</collection>
-<collection name="instantmsgindicatorplugin" long-name="Instant Message Indicator Plugin" level="plugin">
-<!-- collection is really a component. should move down a directory -->
-<component name="instantmsgindicatorplugin_build" filter="s60" long-name="Instant Message Indicator Plugin Build" introduced="^3" plugin="Y">
-<unit bldFile="app/conversations/instantmsgindicatorplugin/group"/>
-</component>
-</collection>
-<collection name="imstatuspaneindicatorplugin" long-name="IM Status Pane Indicator Plugin" level="plugin">
-<!-- collection is really a component. should move down a directory -->
-<component name="imstatuspaneindicatorplugin_build" filter="s60" long-name="IM Status Pane Indicator Plugin Build" introduced="^3" plugin="Y">
-<unit bldFile="app/conversations/imstatuspaneindicatorplugin/group"/>
-</component>
-</collection>
-<collection name="conversations_info" long-name="Conversation Apps Info" level="ui">
-<component name="conversations_build" filter="s60" long-name="Conversation Apps Build">
-<!-- can the exports be moved to other components? or this remade into a configuration component?-->
-<unit bldFile="app/conversations/group"/>
-</component>
-</collection>
-</block>
-<block name="im" level="apps" long-name="Instant Messaging Apps" levels="support prot engine apps">
-<collection name="im_plat" long-name="Instant Messaging Apps Platform Interfaces" level="apps">
-<component name="wv_sap_settings_api" long-name="WV SAP Settings API" filter="s60" class="api">
-<unit bldFile="app/im/im_plat/wv_sap_settings_api/group"/>
-</component>
-</collection>
-<collection name="wvsettings20" long-name="Wireless Village Settings Engine" level="support">
-<!-- this is really a component. should move down a directory -->
-<component name="wvsapsettingsstore" long-name="WV SAP Settings Store" filter="s60" introduced="9.3">
-<unit bldFile="app/im/wvsettings20/group"/>
-</component>
-</collection>
-</block>
-<block name="dictionary" level="services" long-name="Dictionary" levels="utils ui">
-<collection name="dictionary_plat" long-name="Dictionary Platform Interfaces" level="ui">
-<component name="menu_suites_macros_api" long-name="Menu Suites Macros API" filter="s60" class="api">
-<unit bldFile="app/dictionary/dictionary_plat/menu_suites_macros_api/group"/>
-</component>
-</collection>
-<collection name="userdict" long-name="User Dictionary" level="ui">
-<!-- collection is really a component, move down a dir -->
-<component name="userdict_build" filter="s60" long-name="Japanese User Dictionary">
-<unit bldFile="app/dictionary/userdict/group"/>
-</component>
-</collection>
-</block>
-<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"/>
-</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"/>
-</component>
-</collection>
-<collection name="camerauis" long-name="Camera UIs">
-<component name="activepalette" filter="s60" long-name="Active Palette">
-<unit bldFile="app/camera/camerauis/activepalette/group"/>
-</component>
-<component name="cameraapp" filter="s60" long-name="Camera Application">
-<unit bldFile="app/camera/camerauis/cameraapp/group"/>
-<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">
-<component name="image_editor_debug_utilities_api" long-name="Image Editor Debug Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
-</component>
-<component name="image_editor_utilities_api" long-name="Image Editor Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_utilities_api/group"/>
-</component>
-<component name="image_editor_definitions_api" long-name="Image Editor Definitions API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_definitions_api/group"/>
-</component>
-<component name="image_editor_system_parameters_api" long-name="Image Editor System Parameters API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_system_parameters_api/group"/>
-</component>
-<component name="image_processing_engine_api" long-name="Image Processing Engine API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_processing_engine_api/group"/>
-</component>
-</collection>
-<collection name="imageeditor" long-name="Image Editor UI" level="ui">
-<component name="pb" filter="s60" long-name="Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/pb/group"/>
-</component>
-<component name="iepb" filter="s60" long-name="Image Editor Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/iepb/group"/>
-</component>
-<component name="imageeditorui" filter="s60" long-name="Image Editor UI">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorui/group"/>
-</component>
-<component name="imageeditormanager" filter="s60" long-name="Image Editor Manager">
-<unit bldFile="app/imgeditor/imageeditor/imageeditormanager/group"/>
-</component>
-<component name="imageeditorapp" filter="s60" long-name="Image Editor Application">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorapp/group"/>
-</component>
-<component name="imageeditor_plugins" filter="s60" long-name="Image Editor Plugins" plugin="Y">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditor/plugins/blackwhiteplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/brightnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/bubbleplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cartoonizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/clipartplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/contrastplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cropplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/drawplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/frameplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/negativeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/redeyeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/resizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotatelplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotaterplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/textplugin/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditor/plugins/drawplugin/group"/>
- -->
-</component>
-<component name="editorprovider" filter="s60" long-name="Image Editor Provider">
-<unit bldFile="app/imgeditor/imageeditor/editorprovider/group"/>
-</component>
-<component name="imageeditor_build" filter="s60" long-name="Image Editor Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditor/group"/>
-</component>
-</collection>
-<collection name="imageeditorengine" long-name="Image Editor Engine" level="engine">
-<component name="filters" filter="s60" long-name="Image Editor Filters">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbrightness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbubble/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbuffer/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercartoon/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterclipart/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercontrast/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercrop/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterdraw/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterframe/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtergrayscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtericlsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegtarget/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filternegate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterredeye/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterrotate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtertext/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
- -->
-</component>
-<component name="imageeditorutils" filter="s60" long-name="Image Editor Utilities">
-<unit bldFile="app/imgeditor/imageeditorengine/imageeditorutils/group"/>
-</component>
-<component name="systemparameters" filter="s60" long-name="System Parameters">
-<unit bldFile="app/imgeditor/imageeditorengine/systemparameters/group"/>
-</component>
-<component name="enginewrapper" filter="s60" long-name="Image Editor Engine Wrapper">
-<unit bldFile="app/imgeditor/imageeditorengine/enginewrapper/group"/>
-</component>
-<component name="imageeditorengine_build" filter="s60" long-name="Image Editor Engine Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoeditor" level="apps" long-name="Video Editor Apps" levels="engine ui">
-<collection name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" level="ui">
-<component name="video_editor_engine_api" long-name="Video Editor Engine API" introduced="^2" class="api">
-<unit bldFile="app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
-</component>
-</collection>
-<collection name="videditor" long-name="Video Editor" level="ui">
-<component name="videoeditorcommon" filter="s60" long-name="Video Editor Common" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditorcommon/group"/>
-</component>
-<component name="videoeditoruicomponents" filter="s60" long-name="Video Editor UI Components" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditoruicomponents/group"/>
-</component>
-<component name="simplevideoeditor" filter="s60" long-name="Simple Video Editor" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplevideoeditor/group"/>
-</component>
-<component name="simplecutvideo" filter="s60" long-name="Simple Cut Video" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplecutvideo/group"/>
-</component>
-<component name="videoprovider" filter="s60" long-name="Video Provider" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoprovider/group"/>
-</component>
-<component name="manualvideoeditor" filter="s60" long-name="Manual Video Editor" introduced="^2" class="placeholder">
-<!-- uncomment when supported
- <meta rel="config">
- <defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
- </meta>
- <unit bldFile="videditor/manualvideoeditor/group"/> -->
-</component>
-<component name="videditor_build" filter="s60" long-name="Video Editor Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videditor/group"/>
-</component>
-</collection>
-<collection name="videoeditorengine" long-name="Video Editor Engine" level="engine">
-<component name="audioeditorengine" filter="s60" long-name="Audio Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/audioeditorengine/group"/>
-</component>
-<component name="avcedit" filter="s60" long-name="AVC Editing" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/avcedit/group"/>
-</component>
-<component name="h263decoder" filter="s60" long-name="H.263 Decoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/h263decoder/group"/>
-</component>
-<component name="mp3aacmaniplib" filter="s60" long-name="MP3 and AAC Manipulation Library" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
-</component>
-<component name="vedtranscoder" filter="s60" long-name="Video Editor Transcoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedtranscoder/group"/>
-</component>
-<component name="vedengine" filter="s60" long-name="Video Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedengine/group"/>
-</component>
-<component name="videoeditorengine_build" filter="s60" long-name="Video Editor Engine Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videoeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
-<collection name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" level="apps">
-<component name="videoplayer_startup_api" long-name="Video Player Startup API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videoplayer_startup_api/group" filter="!test"/>
-</component>
-<component name="video_player_file_details_dialog_api" long-name="Media Player File Details Dialog API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/video_player_file_details_dialog_api/group" filter="!test"/>
-</component>
-<component name="videocollection_api" long-name="Video Collection API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videocollection_api/group"/>
-</component>
-</collection>
-<collection name="videofeeds" long-name="Video Feeds" level="util">
-<component name="iptv_utils" filter="s60" long-name="IPTV Util" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/utils/group"/>
-</component>
-<component name="viewmessageutility" filter="s60" long-name="View Message Utility" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/viewmessageutility/group"/>
-</component>
-<component name="vcxnotifier" filter="s60" long-name="Video Connection Notifier" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/vcxnotifier/group"/>
-</component>
-<component name="vccommon" filter="s60" long-name="Video Connection Common" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/vccommon/group"/>
-</component>
-<component name="clientapi" long-name="Server Client" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/clientapi/group"/>
-</component>
-<component name="provisioningprocessor" long-name="Provisioning Processor" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/provisioningprocessor/group"/>
-</component>
-<component name="mrssplugin" long-name="RSS plugin" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/mrssplugin/group"/>
-</component>
-<component name="videofeeds_server" long-name="Server" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/server/group"/>
-</component>
-<component name="livetvutils" long-name="LiveTV Utils" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/livetvutils/group"/>
-</component>
-<component name="iptvprovisioningrecognizer" long-name="IP TV Provisioning Recognizer" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/provisioningrecognizer/group"/>
-</component>
-<component name="iptvprovisioningappui" long-name="IP TV Provisioning App UI" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/provisioningappui/group"/>
-</component>
-<component name="iptvomaprovisioning" long-name="IP TV OMA Provisioning" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/omaprovisioning/group"/>
-</component>
-<component name="vcnsuiengine" long-name="VoD UI Engine" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/vcnsuiengine/group"/>
-</component>
-<component name="hgvodui" long-name="Ganes UX2.0 VoD UI" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/hgvodui/group"/>
-</component>
-<component name="hgvodplugin" long-name="Ganes UX2.0 VoD UI Plugin" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/hgvodplugin/group"/>
-</component>
-<component name="vcnsscheduleview" long-name="Scheduled Download Settings View" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/vcnsscheduleview/group"/>
-</component>
-<component name="vcnsscheduleplugin" long-name="Scheduled Download Settings Plugin" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/vcnsscheduleplugin/group"/>
-</component>
-<component name="scheduleddlplugin" long-name="Scheduled download plugin" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/scheduleddlplugin/group"/>
-</component>
-</collection>
-<collection name="videocollection" long-name="Video Collection" level="util">
-<component name="mpxmyvideoscollection" filter="s60" long-name="MPX My Videos Collection" introduced="^3">
-<unit bldFile="app/videoplayer/videocollection/mpxmyvideoscollection/group"/>
-</component>
-<component name="myvideosindicatorplugin" filter="s60" long-name="My Videos Indicator Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videocollection/myvideosindicatorplugin/group"/>
-</component>
-<component name="hgmyvideos" filter="s60" long-name="Huriganes My Videos" introduced="^3">
-<unit bldFile="app/videoplayer/videocollection/hgmyvideos/group"/>
-</component>
-<component name="hgmyvideosplugin" filter="s60" long-name="Huriganes My VideosPlugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videocollection/hgmyvideosplugin/group"/>
-</component>
-</collection>
-<collection name="videoplayer_homescreenplugins" long-name="Videoplayer Homescreen Plugins" level="plugin">
-<component name="videosuiteconf" filter="s60" long-name="Video Suite Configuration" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/homescreenplugins/videosuiteconf/group"/>
-</component>
-<component name="videoahlplugin" filter="s60" long-name="Video Player Action Handler" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/homescreenplugins/videoahlplugin/group"/>
-</component>
-<component name="videochplugin" filter="s60" long-name="Video Player Content Harvester " introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/homescreenplugins/videochplugin/group"/>
-</component>
-</collection>
-<collection name="mediasettings" long-name="Media Settings" level="support">
-<!-- this is really a component. Should be moved down a directory -->
-<component name="mediasettings_build" filter="s60" long-name="Media Settings Build">
-<unit bldFile="app/videoplayer/mediasettings/group"/>
-</component>
-<component name="videoplayer_test" filter="s60" purpose="development" long-name="Video Player Apps Test">
-<!-- can only have one unit. Can thes be #included from the above or another bld.inf?-->
-<unit bldFile="app/videoplayer/tsrc/VCXTestCommon/group"/>
-<unit bldFile="app/videoplayer/tsrc/VCXTestUtilModule/group"/>
-<unit bldFile="app/videoplayer/tsrc/VCXTestMyVideosCollectionClient/group"/>
-<unit bldFile="app/videoplayer/mediasettings/mediasettingsengine/tsrc/mediasettingsenginetest/group"/>
-<unit bldFile="app/videoplayer/mediasettings/videoplayersettingsengine/tsrc/vpsettingsenginetest/group"/>
-</component>
-</collection>
-<collection name="filedetails" long-name="File Details" level="support">
-<component name="filedetailsplugin" filter="s60" long-name="File Details Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/filedetails/filedetailsplugin/group"/>
-</component>
-<component name="filedetailsdialog" filter="s60" long-name="File Details Dialog" introduced="^3">
-<unit bldFile="app/videoplayer/filedetails/filedetailsdialog/group"/>
-</component>
-</collection>
-<collection name="videoplayerapp" long-name="Video Player App" level="apps">
-<component name="lwplayer" long-name="Lightweight Player" filter="s60">
-<unit bldFile="app/videoplayer/videoplayerapp/lwplayer/group"/>
-</component>
-<component name="mpxvideoplayer" filter="s60" long-name="MPX Video Player" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayerapp/mpxvideoplayer/group" filter="!test"/>
-</component>
-<component name="videoplayerlauncher" filter="s60" long-name="Video Player Launcher">
-<unit bldFile="app/videoplayer/videoplayerapp/videoplayerlauncher/group"/>
-</component>
-</collection>
-<collection name="videoplayback" long-name="Video Playback Plugins" level="plugin">
-<component name="videohelix" long-name="Video Helix" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videohelix/group" filter="!test"/>
-</component>
-<component name="videopdlplaybackviewplugin" filter="s60" long-name="Video PDL Playback View Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videopdlplaybackviewplugin/group" filter="!test"/>
-</component>
-<component name="videoplaybackcontrols" filter="s60" long-name="Video Playback Controls" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videoplaybackcontrols/group" filter="!test"/>
-</component>
-<component name="videoplaybackviewplugin" filter="s60" long-name="Video Playback View Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videoplaybackviewplugin/group"/>
-</component>
-<component name="videoplaybackviews" filter="s60" long-name="Video Playback Views" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videoplaybackviews/group" filter="!test"/>
-</component>
-</collection>
-</block>
-<block name="photos" level="apps" long-name="Photos" levels="support fw ui app">
-<collection name="photos_plat" long-name="Photos Platform Interfaces" level="app">
-<component name="collection_plugins_api" long-name="Collection Plugins API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/collection_plugins_api/group"/>
-</component>
-<component name="controllers_collection_api" long-name="Controllers Collection API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/controllers_collection_api/group"/>
-</component>
-<component name="gallery_utilities_api" long-name="Gallery Utilities API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/gallery_utilities_api/group"/>
-</component>
-<component name="slideshow_ui_constants_api" long-name="Slideshow Ui Constants API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/slideshow_ui_constants_api/group"/>
-</component>
-<component name="views_metadatadialog_api" long-name="Views Metadata Dialog API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/views_metadatadialog_api/group"/>
-</component>
-</collection>
-<collection name="photosgallery" long-name="Photos Gallery" level="app">
-<!-- consider splitting this collection into the application itself, and the frameworks behind it -->
-<component name="photosgallery_help" filter="s60" long-name="Photos Help" introduced="^2">
-<unit bldFile="app/photos/photosgallery/help/group"/>
-</component>
-<component name="logging" filter="s60" long-name="Photos Logging" introduced="^2">
-<unit bldFile="app/photos/photosgallery/logging/group"/>
-</component>
-<component name="photosgallery_common" filter="s60" long-name="Photos Common" introduced="^2">
-<unit bldFile="app/photos/photosgallery/common/group"/>
-</component>
-<component name="photosgallery_commonui" filter="s60" long-name="Photos Common UI" introduced="^2">
-<unit bldFile="app/photos/photosgallery/commonui/group"/>
-</component>
-<component name="photosgalleryollectionfw" filter="s60" long-name="Photos Collection Framework" introduced="^2">
-<unit bldFile="app/photos/photosgallery/collectionframework/group"/>
-</component>
-<component name="galleryicons" filter="s60" long-name="Photos Icons" introduced="^2" class="config">
-<unit bldFile="app/photos/photosgallery/icons"/>
-</component>
-<component name="imageviewer" filter="s60" long-name="Image Viewer" introduced="^3">
-<!-- this is really a part of controllers component, #include from there instead -->
-<unit bldFile="app/photos/photosgallery/controllers/imageviewer/group"/>
-</component>
-<component name="photosgalleryviewfw" filter="s60" long-name="View Framework" introduced="^2">
-<unit bldFile="app/photos/photosgallery/viewframework/group"/>
-</component>
-<component name="controllers" filter="s60" long-name="Photos Controllers" introduced="^2">
-<unit bldFile="app/photos/photosgallery/controllers/group"/>
-</component>
-<component name="photogallery" filter="s60" long-name="Media Gallery" introduced="^2">
-<unit bldFile="app/photos/photosgallery/gallery/group"/>
-</component>
-<component name="slideshow" filter="s60" long-name="Slideshow" introduced="^2">
-<unit bldFile="app/photos/photosgallery/slideshow/group"/>
-</component>
-<component name="contentharvesterplugin" filter="s60" long-name="Gallery Content Harvester Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/photos/photosgallery/contentharvesterplugin/group"/>
-</component>
-<component name="photossuite" filter="s60" long-name="Photos Suite" introduced="^2" class="config">
-<unit bldFile="app/photos/photosgallery/photossuite/group"/>
-</component>
-<component name="memoryplugin" long-name="Memory Plugin" filter="s60" introduced="^2" plugin="Y">
-<unit bldFile="app/photos/photosgallery/memoryplugin/group"/>
-</component>
-<component name="imgvwr" filter="s60" long-name="Photos Image Viewer" introduced="^3">
-<unit bldFile="app/photos/photosgallery/imgvwr/group"/>
-</component>
-<component name="photosgallery_build" filter="s60" long-name="Photos Gallery Build" introduced="^2">
-<!-- need to remove the #included above bld.infs from this -->
-<unit bldFile="app/photos/photosgallery/group"/>
-</component>
-</collection>
-</block>
-<block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support hs app">
-<collection name="musicplayer_plat" long-name="Music Player Apps Platform Interfaces" level="app">
-<component name="mpx_music_player_app_api" long-name="MPX Music Player App API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_app_api/group"/>
-</component>
-<component name="mpx_music_player_commonui_api" long-name="MPX Music Player Common UI API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_commonui_api/group"/>
-</component>
-<component name="mpx_music_player_media_key_handler_api" long-name="MPX Music Player Media Key Handler API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_media_key_handler_api/group"/>
-</component>
-<component name="mpx_music_player_remote_control_api" long-name="MPX Music Player Remote Control API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_remote_control_api/group"/>
-</component>
-<component name="mpx_music_shop_ui_api" long-name="MPX Music Shop UI API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_shop_ui_api/group"/>
-</component>
-<component name="mpx_music_wap_adapter_cenrep_api" long-name="MPX Music Wap Adapter CenRep API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_wap_adapter_cenrep_api/group"/>
-</component>
-<component name="mpx_music_store_api" long-name="MPX Music Store Find API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_store_api/group"/>
-</component>
-<component name="audio_application_features_api" long-name="Audio Application Features API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/audio_application_features_api/group"/>
-</component>
-<component name="music_content_publisher_plugin_api" long-name="Music Content Publisher Plugin API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/music_content_publisher_plugin_api/group"/>
-</component>
-</collection>
-<collection name="mpxmusicplayer" long-name="MPX Music Player" level="app">
-<component name="mpxmusicplayer_help" filter="s60" long-name="Help">
-<unit bldFile="app/musicplayer/mpxmusicplayer/help/group"/>
-</component>
-<component name="mpxmusicplayer_commonui" filter="s60" long-name="MPX Common UI">
-<unit bldFile="app/musicplayer/mpxmusicplayer/commonui/group"/>
-</component>
-<component name="mpx_metadatahandler" filter="s60" long-name="MPX Metadata Handler">
-<unit bldFile="app/musicplayer/mpxmusicplayer/metadatahandler/group"/>
-</component>
-<component name="mediakeyhandler" filter="s60" long-name="MPX Media Key Handler">
-<unit bldFile="app/musicplayer/mpxmusicplayer/mediakeyhandler/group"/>
-</component>
-<component name="mpxmusicplayer_app" filter="s60" long-name="MPX Application">
-<unit bldFile="app/musicplayer/mpxmusicplayer/app/group"/>
-</component>
-<component name="mpxmusicplayer_build" filter="s60" long-name="MPX Music Player Build">
-<!-- can the exports be distributed to the above components? -->
-<unit bldFile="app/musicplayer/mpxmusicplayer/group"/>
-</component>
-</collection>
-<collection name="musichomescreen_multiview" long-name="Music Home Screen Multiview" level="hs">
-<!-- Uncomment all units when configuration is in place. All currently #included from musichomescreen_build -->
-<component name="mpxcollectionpublisher" filter="s60" long-name="MPX Collection Publisher" introduced="^2" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/mpxcollectionpublisher/group"/>-->
-</component>
-<component name="musiccontentpublisher" filter="s60" long-name="Music Content Publisher" introduced="^2" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/musiccontentpublisher/group"/>-->
-</component>
-<component name="mcpmusicplayer" filter="s60" long-name="Music Player MCP Plugin" introduced="^2" plugin="Y" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/mcpmusicplayer/group"/>-->
-</component>
-<component name="musicplayeractionhandlerplugin" filter="s60" long-name="Music Player Action Handler Plugin" introduced="^2" plugin="Y" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/musicplayeractionhandlerplugin/group"/>-->
-</component>
-<component name="mpx_data" filter="s60" long-name="MPX Data" introduced="^2" class="placeholder">
-<!-- does this make sense to be a component? should it just be #include from musichomescreen_multiview/group? -->
-<!--<unit bldFile="musichomescreen_multiview/data/themes/default/group"/>-->
-</component>
-<component name="musichomescreen_build" filter="s60" long-name="Music Homescreen Multiview Build" introduced="^2">
-<unit bldFile="app/musicplayer/musichomescreen_multiview/group"/>
-</component>
-</collection>
-<collection name="mpxplugins" long-name="MPX Plugins" level="plugins">
-<component name="serviceplugins" filter="s60" long-name="MPX Service Plugins" plugin="Y">
-<unit bldFile="app/musicplayer/mpxplugins/serviceplugins/group"/>
-</component>
-<component name="viewplugins" filter="s60" long-name="MPX View Plugins" plugin="Y">
-<unit bldFile="app/musicplayer/mpxplugins/viewplugins/group"/>
-</component>
-<component name="mpxplugins_build" filter="s60" long-name="MPX Plugins Build">
-<!-- can the exports be distributed to the above components? -->
-<unit bldFile="app/musicplayer/mpxplugins/group"/>
-</component>
-</collection>
-<collection name="musicplayer_info" long-name="Music Player Apps Info" level="app">
-<component name="musicplayer_build" filter="s60" long-name="Music Player Build">
-<!-- should explicitly #inlcude musicplayerbldvariant.hrh in each component -->
-<unit bldFile="app/musicplayer/group"/>
-</component>
-</collection>
-</block>
-<block name="radio" level="apps" long-name="Radio Apps" levels="engine ui">
-<collection name="fmradio" long-name="FM Radio" level="ui">
-<component name="activeidleengine" filter="s60" long-name="FM Radio Active Idle Engine">
-<unit bldFile="app/radio/fmradio/activeidleengine/group"/>
-</component>
-<component name="fmradioengine" filter="s60" long-name="FM Radio Engine">
-<unit bldFile="app/radio/fmradio/fmradioengine/group"/>
-</component>
-<component name="fmradioactionhandler" filter="s60" long-name="FM Radio Action Handler" plugin="Y">
-<unit bldFile="app/radio/fmradio/fmradioactionhandler/group"/>
-</component>
-<component name="fmradiomcpplugin" filter="s60" long-name="FM Radio Content Publisher Plugin" plugin="Y">
-<unit bldFile="app/radio/fmradio/fmradiomcpplugin/group"/>
-</component>
-<component name="fmradio_build" filter="s60" long-name="FM Radio Build">
-<unit bldFile="app/radio/fmradio/fmradio/group"/>
-</component>
-<component name="fmradio_help" filter="s60" long-name="FM Radio Help">
-<unit bldFile="app/radio/fmradio/help/group"/>
-</component>
-<component name="fmradio_build" filter="s60" long-name="FM Radio ROM">
-<!-- remove above #included bld.infs -->
-<unit bldFile="app/radio/fmradio/group"/>
-</component>
-</collection>
-</block>
-<block name="internetradio" level="apps" long-name="Internet Radio Apps"/>
-<block name="tv" level="services" long-name="TV Apps"/>
-<block name="voicerec" level="apps" long-name="Voice Recorder Apps">
-<!-- custom filter pref_test-->
-<collection name="voicerec_plat" long-name="Voice Recorder Apps Platform Interfaces">
-<component name="new_file_service_api" long-name="New File Service API" filter="s60" class="api">
-<unit bldFile="app/voicerec/voicerec_plat/new_file_service_api/group"/>
-</component>
-<component name="voicerecorder_public_constants_api" long-name="Voice Recorder Public Constants API" filter="s60" class="api">
-<unit bldFile="app/voicerec/voicerec_plat/voicerecorder_public_constants_api/group"/>
-</component>
-</collection>
-<collection name="voicerecorder" long-name="Voice Recorder">
-<!--this is really a component, move down a directory -->
-<component name="voicerecorder_build" filter="s60" long-name="Voice Recorder Build">
-<unit bldFile="app/voicerec/voicerecorder/group"/>
-</component>
-</collection>
-<collection name="voicerec_info" long-name="Voice Recorder Apps Info"/>
-</block>
-<block name="screensaver" level="apps" long-name="Screen Saver Apps" levels="plugin ui">
-<!-- is this a user-facing application or a daemon? -->
-<!-- units need to be commented out until configuration is in place. They are currently #included from screensaver_build-->
-<collection name="scrsaver" long-name="Screen Saver" level="plugin">
-<component name="scrsaverplugins" filter="s60" long-name="Screen Saver Plugins" plugin="Y">
-<!-- must have only one component. #include from a common bld.inf, or move up a directory and make scrsaverplugins a collection -->
-<!--<unit bldFile="scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/"/>
- <unit bldFile="scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/group/"/>-->
-</component>
-<component name="scrsaver_slideshowplugin" filter="s60" long-name="Screen Saver Slideshow Plugin" plugin="Y">
-<!--<unit bldFile="scrsaver/scrsaverplugins/SlideshowPlugin/group"/> -->
-</component>
-<component name="screensaveraiwplugin" filter="s60" long-name="Screen Saver AIW Plugin" plugin="Y">
-<!-- <unit bldFile="scrsaver/screensaveraiwplugin/group"/>-->
-</component>
-</collection>
-<collection name="screensaver_info" long-name="Screen Saver Apps Info" level="ui">
-<component name="screensaver_build" filter="s60" long-name="Screen Saver Application">
-<!--the app should be a separate component -->
-<unit bldFile="app/screensaver/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreen" level="apps" long-name="Home Screen Apps" levels="fw support apps">
-<collection name="homescreen_plat" long-name="Home Screen Apps Platform Interfaces" level="apps">
-<component name="menu_settings_api" long-name="Menu Settings API" filter="s60" class="api">
-<unit bldFile="app/homescreen/homescreen_plat/menu_settings_api/group"/>
-</component>
-<component name="hs_content_control_ui" long-name="HS Content Control Ui" filter="s60" class="api">
-<unit bldFile="app/homescreen/homescreen_plat/hs_content_control_ui/group"/>
-</component>
-<component name="hs_renderingplugin_api" long-name="HS Rendering Plugin API" filter="s60" class="api">
-<unit bldFile="app/homescreen/homescreen_plat/hs_renderingplugin_api/group"/>
-</component>
-</collection>
-<collection name="idlehomescreen" long-name="Idle Home Screen" level="apps">
-<component name="nativeuicontroller" filter="s60" long-name="Native UI Controller">
-<unit bldFile="app/homescreen/idlehomescreen/nativeuicontroller/group"/>
-</component>
-<component name="exths" filter="s60" long-name="Active Idle Container" plugin="Y">
-<!-- why is the ID so different from the name? Is one wrong? -->
-<unit bldFile="app/homescreen/idlehomescreen/exths/group"/>
-</component>
-<component name="hscontentcontrol" filter="s60" long-name="Home Screen Content Control" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/hscontentcontrol/group"/>
-</component>
-<component name="hssapiwrapper" filter="s60" long-name="HS SAPI Wrapper" introduced="^3">
-<!-- can only have one unit. #include from a common bld.inf, or split into two components -->
-<unit bldFile="app/homescreen/idlehomescreen/sapiwrapper/cpswrapper/group"/>
-<unit bldFile="app/homescreen/idlehomescreen/sapiwrapper/hspswrapper/group"/>
-</component>
-<component name="xmluirendering" filter="s60" long-name="XML UI Rendering" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/xmluirendering/group"/>
-</component>
-<component name="xmluicontroller" filter="s60" long-name="XML UI Controller" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/xmluicontroller/group"/>
-</component>
-<component name="widgetmanager" filter="s60" long-name="Widget Manager" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/widgetmanager/group"/>
-</component>
-<component name="idlehomescreen_help" filter="s60" long-name="Idle Home Screen Help">
-<unit bldFile="app/homescreen/idlehomescreen/help/group"/>
-</component>
-<component name="idlehomescreen_data" filter="s60" long-name="Idle Home Screen Data">
-<unit bldFile="app/homescreen/idlehomescreen/data/group"/>
-</component>
-<component name="idlehomescreen_build" filter="s60" long-name="Idle Home Screen Build">
-<!-- can the loc file be moved to another comopnent and this one removed? -->
-<unit bldFile="app/homescreen/idlehomescreen/group"/>
-</component>
-</collection>
-<collection name="menufw" long-name="Menu Framework" level="fw">
-<component name="hierarchynavigator" filter="s60" long-name="Hierarchy Navigator">
-<unit bldFile="app/homescreen/menufw/hierarchynavigator/group"/>
-</component>
-<component name="menufwui" filter="s60" long-name="Menu Framework UI">
-<unit bldFile="app/homescreen/menufw/menufwui/group"/>
-</component>
-<component name="menusuites" filter="s60" long-name="Menu Suites">
-<unit bldFile="app/homescreen/menufw/menusuites/group"/>
-</component>
-<component name="menufw_build" filter="s60" long-name="Menu Framework Build">
-<!-- can the exports be exported by the other components? -->
-<unit bldFile="app/homescreen/menufw/group"/>
-</component>
-</collection>
-<collection name="taskswitcher" long-name="Task Switcher" level="support">
-<component name="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">
-<unit bldFile="app/homescreen/taskswitcher/taskswitcherui/group"/>
-</component>
-</collection>
-</block>
-<block name="graphicsuis" level="services" long-name="Graphics UIs" levels="util ui">
-<collection name="graphicsuis_plat" long-name="Graphics UIs Platform Interfaces" level="ui">
-<component name="svgt_viewer_ui_api" long-name="SVG-T Viewer UI API" filter="s60" class="api">
-<unit bldFile="app/graphicsuis/graphicsuis_plat/svgt_viewer_ui_api/group"/>
-</component>
-<component name="svg_application_observer_utility_api" long-name="SVG Application Observer Utility API" filter="s60" class="api">
-<unit bldFile="app/graphicsuis/graphicsuis_plat/svg_application_observer_utility_api/group"/>
-</component>
-<component name="svgt_file_view_details_dialog_api" long-name="SVG-T File View Details Dialog API" filter="s60" class="api">
-<unit bldFile="app/graphicsuis/graphicsuis_plat/svgt_file_view_details_dialog_api/group"/>
-</component>
-</collection>
-<collection name="svgtviewer" long-name="SVG-T Viewer" level="ui">
-<component name="svgtviewerplugin" filter="s60" long-name="SVG-T Viewer Plugin">
-<unit bldFile="app/graphicsuis/svgtviewer/svgtviewerplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="profile" level="apps" long-name="Profiles" levels="app">
-<collection name="profile_plat" long-name="Profiles Platform Interfaces" level="app">
-<component name="profiles_settings_view_api" long-name="Profiles Settings View API" filter="s60" class="api">
-<unit bldFile="app/profile/profile_plat/profiles_settings_view_api/group"/>
-</component>
-</collection>
-<collection name="profilesapplication" long-name="Profiles Application" level="app">
-<component name="profiles" filter="s60" long-name="Profiles">
-<unit bldFile="app/profile/profilesapplication/profiles/group"/>
-</component>
-</collection>
-<collection name="profile_info" long-name="Profiles Info" level="app">
-<component name="profile_help" filter="s60" long-name="Profiles Help">
-<unit bldFile="app/profile/help/group"/>
-</component>
-</collection>
-</block>
-<block name="speechsrv" level="services" long-name="Speech Recognition UIs" levels="engine framework ui">
-<collection name="speechsrv_plat" long-name="Speech Recognition UIs Platform Interfaces" level="ui">
-<component name="vas_api" long-name="VAS API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vas_api/group"/>
-</component>
-<component name="nss_devasr_api" long-name="NSS DevASR API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_devasr_api/group"/>
-</component>
-<component name="tts_hw_device_api" long-name="TTS HW Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/tts_hw_device_api/group"/>
-</component>
-<component name="voice_commands_resource_header_api" long-name="Voice Commands Resource Header API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/voice_commands_resource_header_api/group"/>
-</component>
-<component name="nss_mmf_tts_custom_commands_api" long-name="NSS MMF TTS Custom Commands API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_mmf_tts_custom_commands_api/group"/>
-</component>
-<component name="srsf_cenrep_settings_api" long-name="SRSF CenRep Settings API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/srsf_cenrep_settings_api/group"/>
-</component>
-<component name="voice_ui_plugin_api" long-name="Voice UI Plug-in API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/voice_ui_plugin_api/group"/>
-</component>
-<component name="nss_tts_utility_api" long-name="NSS TTS Utility API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_tts_utility_api/group"/>
-</component>
-<component name="nss_srs_custom_commands_api" long-name="NSS SRS Custom Commands API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_srs_custom_commands_api/group"/>
-</component>
-<component name="srsf_secondarydisplay_api" long-name="SRSF Secondary Display API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/srsf_secondarydisplay_api/group"/>
-</component>
-<component name="asrs_hw_device_api" long-name="ASRS Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/asrs_hw_device_api/group"/>
-</component>
-<component name="vas_vcommand_api" long-name="VAS Voice Command API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vas_vcommand_api/group"/>
-</component>
-<component name="adaptation_hw_device_api" long-name="Adaptation Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/adaptation_hw_device_api/group"/>
-</component>
-<component name="nss_devtts_api" long-name="NSS DevTTS API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_devtts_api/group"/>
-</component>
-<component name="nss_srs_utility_api" long-name="NSS SRS Utility API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_srs_utility_api/group"/>
-</component>
-<component name="recognition_hw_device_api" long-name="Recognition Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/recognition_hw_device_api/group"/>
-</component>
-<component name="vas_contact_handler_api" long-name="VAS Contact Handler API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vas_contact_handler_api/group"/>
-</component>
-<component name="nlp_hw_device" long-name="NLP Hardware Device" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nlp_hw_device/group"/>
-</component>
-<component name="nss_si_speech_recognition_data_api" long-name="NSS SI Speech Recognition Data API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_si_speech_recognition_data_api/group"/>
-</component>
-<component name="nss_tts_common_api" long-name="NSS TTS Common API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_tts_common_api/group"/>
-</component>
-<component name="grcompiler_hw_device_api" long-name="Grammar Compiler Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/grcompiler_hw_device_api/group"/>
-</component>
-<component name="ttp_hw_device_api" long-name="TTP Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/ttp_hw_device_api/group"/>
-</component>
-<component name="vocman_hw_device_api" long-name="VocMan Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vocman_hw_device_api/group"/>
-</component>
-<component name="speech_synthesis_clientserver_api" long-name="Speech Synthesis Client-Server API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/speech_synthesis_clientserver_api/group"/>
-</component>
-<component name="voice_ui_accessory_button_handling_api" long-name="Voice UI Accessory Button Handling API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/voice_ui_accessory_button_handling_api/group"/>
-</component>
-<component name="ui_voice_recognition_api" long-name="UI Voice Recognition API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/ui_voice_recognition_api/group"/>
-</component>
-<component name="vcommand_settings_cenrep_api" long-name="Voice Command Settings CenRep API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vcommand_settings_cenrep_api/group"/>
-</component>
-</collection>
-<collection name="voiceui" long-name="Voice UI" level="ui">
-<component name="vcommand" filter="s60" long-name="Voice Commands UI" introduced="^1">
-<unit bldFile="app/speechsrv/voiceui/vcommand/group"/>
-</component>
-<component name="voiceuivoicerecognition" filter="s60" long-name="Voice UI Recognition" introduced="^1">
-<unit bldFile="app/speechsrv/voiceui/voiceuivoicerecognition/group"/>
-</component>
-<component name="pbkinfoviewimpl" filter="s60" long-name="Phonebook Info View Implementation" introduced="^1">
-<unit bldFile="app/speechsrv/voiceui/pbkinfoviewimpl/group"/>
-</component>
-<component name="aiwpbkinfoviewprovider" filter="s60" long-name="AIW Phonebook Info View Provider" introduced="^1" plugin="Y">
-<unit bldFile="app/speechsrv/voiceui/aiwpbkinfoviewprovider/group"/>
-</component>
-<component name="vccontrolpanelplugin" filter="s60" long-name="Voice Commands Control Panel Plugin" introduced="^1" plugin="Y">
-<!-- component is commented out until configuration is in place. Currently #included from voiceui_build -->
-<!--<unit bldFile="voiceui/vccontrolpanelplugin/group"/>-->
-</component>
-<component name="voiceui_build" filter="s60" long-name="Voice UI Build" introduced="^1">
-<!-- can this be put into the other components? -->
-<unit bldFile="app/speechsrv/voiceui/group"/>
-</component>
-</collection>
-<collection name="srsf" long-name="Speech Recognition and Synthesis Framework" level="framework">
-<component name="sispeechrecognitiondata" filter="s60" long-name="SI Speech Recognition Data">
-<unit bldFile="app/speechsrv/srsf/sispeechrecognitiondata/group"/>
-</component>
-<component name="ttscommon" filter="s60" long-name="TTS Common">
-<unit bldFile="app/speechsrv/srsf/ttscommon/group"/>
-</component>
-<component name="devtts" filter="s60" long-name="Text to Speech">
-<unit bldFile="app/speechsrv/srsf/devtts/group"/>
-</component>
-<component name="ttscustomcommands" filter="s60" long-name="TTS Custom Commands">
-<unit bldFile="app/speechsrv/srsf/ttscustomcommands/group"/>
-</component>
-<component name="ttscontrollerplugin" filter="s60" long-name="TTS Controller Plugin" plugin="Y">
-<unit bldFile="app/speechsrv/srsf/ttscontrollerplugin/group"/>
-</component>
-<component name="ttsutility" filter="s60" long-name="TTS Utility">
-<unit bldFile="app/speechsrv/srsf/ttsutility/group"/>
-</component>
-<component name="speechsynthesis" filter="s60" long-name="Speech Synthesis">
-<!-- can only have one unit. #include these from a common bld.inf -->
-<unit bldFile="app/speechsrv/srsf/speechsynthesis/client/group"/>
-<unit bldFile="app/speechsrv/srsf/speechsynthesis/server/group"/>
-</component>
-<component name="devasr" filter="s60" long-name="Audio Recording and Speech Recognition">
-<unit bldFile="app/speechsrv/srsf/devasr/group"/>
-</component>
-<component name="sicc" filter="s60" long-name="Speaker Independent Custom Commands">
-<unit bldFile="app/speechsrv/srsf/sicc/group"/>
-</component>
-<component name="sisrscontrollerplugin" filter="s60" long-name="SI SRS Controller Plugin" plugin="Y">
-<unit bldFile="app/speechsrv/srsf/sisrscontrollerplugin/group"/>
-</component>
-<component name="siutility" filter="s60" long-name="Speaker Independent Utility">
-<unit bldFile="app/speechsrv/srsf/siutility/group"/>
-</component>
-<component name="nssvasapi" filter="s60" long-name="NSS VAS API">
-<unit bldFile="app/speechsrv/srsf/nssvasapi/group"/>
-</component>
-<component name="nssvascontacthdlr" filter="s60" long-name="NSS VAS Contact Handler">
-<unit bldFile="app/speechsrv/srsf/nssvascontacthdlr/group"/>
-</component>
-<component name="vcommandhandler" filter="s60" long-name="Voice Command Handler">
-<unit bldFile="app/speechsrv/srsf/vcommandhandler/group"/>
-</component>
-<component name="vuiphandler" filter="s60" long-name="Voice UI Plugin Handler">
-<unit bldFile="app/speechsrv/srsf/vuiphandler/group"/>
-</component>
-<component name="vcommandexecutor" filter="s60" long-name="Voice Command Executor">
-<unit bldFile="app/speechsrv/srsf/vcommandexecutor/group"/>
-</component>
-<component name="vcommandexecutorbearer" filter="s60" long-name="Voice Command Executor Bearer">
-<unit bldFile="app/speechsrv/srsf/vcommandexecutorbearer/group"/>
-</component>
-<component name="vcommandmanager" filter="s60" long-name="Voice Command Manager">
-<unit bldFile="app/speechsrv/srsf/vcommandmanager/group"/>
-</component>
-<component name="vcexecutorapp" filter="s60" long-name="Voice Command Executor Application">
-<unit bldFile="app/speechsrv/srsf/vcexecutorapp/group"/>
-</component>
-<component name="profileobserverplugin" filter="s60" long-name="Profile Observer Plugin" plugin="Y">
-<unit bldFile="app/speechsrv/srsf/profileobserverplugin/group"/>
-</component>
-<component name="srsf_build" filter="s60" long-name="Speech Recognition and Synthesis Framework Build">
-<!-- should distribute this into the above components -->
-<unit bldFile="app/speechsrv/srsf/group"/>
-</component>
-</collection>
-<collection name="speechsrv_info" long-name="Speech Recognition UIs Info" level="ui"/>
-</block>
-<block name="homescreentools" level="services" long-name="Home Screen Tools" levels="tool install">
-<collection name="dtdinstaller" long-name="DTD Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<!-- this needs to be built first, does build order need to be forced with filters? -->
-<component name="dtdinstaller_build" filter="s60" long-name="DTD Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/dtdinstaller/group"/>
-</component>
-</collection>
-<collection name="themeinstaller" long-name="Theme Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="themeinstaller_build" filter="s60" long-name="Theme Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/themeinstaller/group"/>
-</component>
-</collection>
-<collection name="widgettools" long-name="Widget Tools" level="install">
-<component name="hspluginpreinstaller" filter="s60" long-name="HS Plugin Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/hspluginspreinstaller/group"/>
-</component>
-<component name="wrtwidgetpreinstaller" filter="s60" long-name="WRT Widget Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
-</component>
-</collection>
-</block>
-<block name="webuis" level="services" long-name="Web UIs" levels="plugin app">
-<collection name="browserui" long-name="Browser UI" level="app">
-<component name="browser" filter="s60" long-name="Browser">
-<unit bldFile="app/webuis/browserui/browser/group"/>
-</component>
-<component name="operatormenu" filter="s60" long-name="Browser Operator Menu">
-<unit bldFile="app/webuis/browserui/operatormenu/group"/>
-</component>
-<component name="videoservices" filter="s60" long-name="Browser Video Services">
-<unit bldFile="app/webuis/browserui/videoservices/group"/>
-</component>
-</collection>
-<collection name="browserplugins" long-name="Browser Plugins" level="plugin">
-<component name="browsersysteminfoplugin" filter="s60" long-name="Browser System Info Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsersysteminfoplugin/group"/>-->
-</component>
-<component name="browsergpsplugin" filter="s60" long-name="Browser GPS Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsergpsplugin/group"/>-->
-</component>
-<component name="browseraudiovideoplugin" filter="s60" long-name="Browser Audio Video Plugin" plugin="Y">
-<unit bldFile="app/webuis/browserplugins/browseraudiovideoplugin/group"/>
-</component>
-<component name="browserplugins_build" filter="s60" long-name="Browser Plugins Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="app/webuis/browserplugins/group"/>
-</component>
-</collection>
-<collection name="pushmtm" long-name="Push MTM" level="plugin">
-<component name="pushmtm_help" filter="s60" long-name="Push MTM Help">
-<unit bldFile="app/webuis/pushmtm/help/group"/>
-</component>
-<component name="plugins" filter="s60" long-name="Push MTM Plugins" plugin="Y">
-<unit bldFile="app/webuis/pushmtm/plugins/group"/>
-</component>
-<component name="pushmtm_build" filter="s60" long-name="Push MTM Build">
-<!-- Some content is at collection level and some is at comopnent level. Either make this a single
- component and move it down a diretcory, or make separate independent components in this collection -->
-<unit bldFile="app/webuis/pushmtm/group"/>
-</component>
-</collection>
-</block>
-<block name="jrt" level="services" long-name="Java Runtime" levels="util generic rt ui">
-<collection name="jrt_plat" long-name="JRT Platform Interfaces" level="ui">
-<component name="java_registry_api" long-name="Java Registry API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_registry_api/build"/>
-</component>
-<component name="java_env_info_api" long-name="Java Environment Info API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_env_info_api/build"/>
-</component>
-<component name="java_debug_api" long-name="Java Debug API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_debug_api/build"/>
-</component>
-</collection>
-<collection name="java_stubs" long-name="Java Stubs" level="util">
-<!-- uncomment all components when configuration is in place. Currently #included from jrt_build -->
-<component name="javadrmutils" long-name="Java DRM Utils" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtdrmutils/group"/>-->
-</component>
-<component name="javaenvinfo" long-name="Java Environment Info" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtenvinfo/group"/>-->
-</component>
-<component name="javaregistry" filter="s60,sf_build" long-name="Java Registry" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtregistry/clientserver/client/group"/>-->
-</component>
-<component name="java_stubs_build" filter="s60,sf_build" long-name="Java Stubs ROM" class="placeholder">
-<!-- Remove the #includes and rename JRT ROM-->
-<!--<unit bldFile="java_stubs/group"/>-->
-</component>
-</collection>
-<collection name="jrt_info" long-name="JRT Info" level="rt">
-<component name="jrt_build" filter="s60" long-name="JRT Build">
-<!-- needed for __JAVA_STUBS condition -->
-<unit bldFile="app/jrt/group"/>
-</component>
-</collection>
-</block>
-<block name="conntools" level="services" long-name="Connectivity Tools" levels="config app">
-<collection name="nettools" long-name="Net Tools" level="app">
-<component name="conntest" filter="s60" long-name="Connection Test" purpose="development">
-<unit bldFile="app/conntools/nettools/conntest/group"/>
-</component>
-</collection>
-<collection name="emulatorlan" long-name="Emulator LAN" level="config">
-<!-- component is actually a colleciton, should be moved down a directory -->
-<component name="emulatorlan_build" filter="s60" long-name="Emulator LAN Build" purpose="development" class="config">
-<unit bldFile="app/conntools/emulatorlan/group"/>
-</component>
-</collection>
-</block>
-<block name="rndtools" level="services" long-name="R&D tools" levels="support generic test util">
-<collection name="creator" long-name="Creator" level="support">
-<!-- collection is really a component. Should move down a directory -->
-<component name="creator_build" filter="s60" long-name="Creator Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/creator/group"/>
-</component>
-</collection>
-<collection name="filebrowser" long-name="File Browser" level="util">
-<!-- consider collapsing into a single component -->
-<component name="fileopserver" filter="s60" long-name="File Operations Server" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
-</component>
-<component name="fileopclient" filter="s60" long-name="File Operations Client" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!--<unit bldFile="filebrowser/fileopclient/group"/>-->
-</component>
-<component name="filebrowser_build" filter="s60" long-name="File Browser Application" purpose="development" class="tool">
-<!-- Need to make this a self-contained component by removing #includes. Can only do when configuration is in place-->
-<unit bldFile="app/rndtools/filebrowser/group"/>
-</component>
-</collection>
-<collection name="launcher" long-name="Launcher" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="launcher_build" filter="s60" long-name="Launcher Utility" purpose="development" class="tool">
-<unit bldFile="app/rndtools/launcher/group"/>
-</component>
-</collection>
-<collection name="loadgen" long-name="Load Generator" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="loadgen_build" filter="s60" long-name="Load Generator Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/loadgen/group"/>
-</component>
-</collection>
-<collection name="perfmon" long-name="Performance Monitor" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="perfmon_build" filter="s60" long-name="Performance Monitor Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/perfmon/group"/>
-</component>
-</collection>
-<collection name="screengrabber" long-name="Screen Grabber" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="screengrabber_build" filter="s60" long-name="ScreenGrabber" purpose="development" class="tool">
-<unit bldFile="app/rndtools/screengrabber/group"/>
-</component>
-</collection>
-<collection name="stifui" long-name="STIF UI" level="generic">
-<component name="stifui_stifui" filter="s60" long-name="STIF UI" purpose="development">
-<unit bldFile="app/rndtools/stifui/stifui/group"/>
-</component>
-<component name="uitestserverstarter" filter="s60" long-name="UI Test Server Starter" purpose="development">
-<unit bldFile="app/rndtools/stifui/uitestserverstarter/group"/>
-</component>
-<component name="stifui_build" filter="s60" long-name="STIF UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/stifui/group"/>
-</component>
-</collection>
-<collection name="memspyui" long-name="Memspy UI" level="generic">
-<!-- collection is really a component. Should move down a directory -->
-<component name="memspyui_build" filter="s60" long-name="Memspy UI Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/memspyui/group"/>
-</component>
-</collection>
-<collection name="htiui" long-name="Harmonized Test Interface UI" level="generic">
-<component name="HtiCommPlugins" filter="s60" long-name="HTI Comm Plugins" purpose="development" plugin="Y">
-<unit bldFile="app/rndtools/htiui/HtiCommPlugins/HtiBtCommPlugin/group"/>
-</component>
-<component name="HtiServicePlugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- can only have a single unit. Should #include from a common bld.inf file -->
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiFtpBackupFake/group"/>
-</component>
-<component name="htidevicereboot" filter="s60" long-name="HTI Device Reboot" purpose="development">
-<unit bldFile="app/rndtools/htiui/htidevicereboot/group"/>
-</component>
-<component name="htistartupwait" filter="s60" long-name="HTI Startup Wait" purpose="development">
-<unit bldFile="app/rndtools/htiui/htistartupwait/group"/>
-</component>
-<component name="htiadmin" filter="s60" long-name="HTI Admin" purpose="development">
-<unit bldFile="app/rndtools/htiui/htiadmin/group"/>
-</component>
-<component name="htiui_build" filter="s60" long-name="HTI UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/htiui/group"/>
-</component>
-</collection>
-</block>
-<block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools if ui">
-<collection name="csxhelp" long-name="Context Sensitive Extended Help" level="if">
-<!-- this is really a component. Should move it down a directory -->
-<component name="csxhelp_build" filter="s60" long-name="Context Sensitive Extended Help Build">
-<unit bldFile="app/helps/csxhelp/group"/>
-</component>
-</collection>
-<collection name="symhelp" long-name="Symbian Help" level="eng">
-<component name="helpmodel" long-name="Help" introduced="6.0" purpose="optional">
-<unit bldFile="app/helps/symhelp/helpmodel/group" mrp="app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
-</component>
-</collection>
-<collection name="helps_info" long-name="Help Apps Info" level="ui">
-<component name="helps_metadata" long-name="Help Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/helps/helps_info/helps_metadata/helps_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
-<collection name="buildverification" long-name="Build Verification" level="services">
-<component name="autosmoketest" long-name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
-<unit bldFile="app/techview/buildverification/autosmoketest/Group" mrp="app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
-</component>
-<component name="smoketest" long-name="Smoke Test" filter="gt" purpose="development">
-<unit bldFile="app/techview/buildverification/smoketest/Group" mrp="app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
-</component>
-</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="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"/>
-<collection name="installationapps" long-name="Installation Apps" level="apps2"/>
-<collection name="messagingapps" long-name="Messaging Apps" level="apps2"/>
-<collection name="telephonyapps" long-name="Telephony Apps" level="apps1"/>
-<collection name="networkingapps" long-name="Networking Apps" level="apps1"/>
-<collection name="networkingutils" long-name="Networking Utils" level="utils"/>
-<collection name="shortlinkapps" long-name="Shortlink Apps" level="apps1"/>
-<collection name="testapps" long-name="Test Apps" level="utils"/>
-<collection name="avapps" long-name="A/V Apps" level="apps3"/>
-<collection name="toolkit" long-name="Toolkit" level="utils"/>
-<collection name="techview_info" long-name="Techview Info" level="apps3">
-<component name="techview_metadata" long-name="Techview Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/techview/techview_info/techview_metadata/techview_metadata.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
--- a/symbian3/single/sysdefs/auto/model_20100413110255_709e3d74b072.xml Wed May 05 12:21:47 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10817 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a package or prebuilt -->
-<!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) "N"
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile may someday be removed in favour of mrp -->
-<!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
-<systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="low mw high">
-<block name="stubs" level="high" long-name="Stubs" levels="stub">
-<collection name="s60_stubs" level="stub">
-<component name="audiostubs" long-name="Audio Stubs">
-<unit bldFile="adaptation/stubs/audiostubs/group"/>
-</component>
-<component name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaptation Stub">
-<unit bldFile="adaptation/stubs/btaudioadaptation_stub/group"/>
-</component>
-<component name="drm_stubs" long-name="DRM Stubs">
-<unit bldFile="adaptation/stubs/drm_stubs/group"/>
-</component>
-<component name="ocrsrv_stub" long-name="OCR Services Stub">
-<unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
-</component>
-<component name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation">
-<unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
-</component>
-<component name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" plugin="Y">
-<unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
-</component>
-<component name="srsfenginestub" long-name="SRSF Engine Stub">
-<unit bldFile="adaptation/stubs/srsfenginestub/group"/>
-</component>
-<component name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub">
-<unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
-</component>
-<component name="systemswstubs" long-name="System Software Stubs">
-<unit bldFile="adaptation/stubs/systemswstubs/group"/>
-</component>
-<component name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" plugin="Y">
-<unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
-</component>
-<component name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub">
-<unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
-<collection name="omap3530" long-name="OMAP 3530" level="hw-if">
-<component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530" mrp="adaptation/beagleboard/omap3530/base_beagle.mrp"/>
-</component>
-<component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/kernel"/>
-</component>
-<component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/beagleboard"/>
-</component>
-</collection>
-</block>
-<block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
-<collection name="qemu_baseport" long-name="Baseport" level="hw-if">
-<component name="syborg" long-name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/qemu/baseport/syborg" mrp="adaptation/qemu/baseport/syborg/syborg.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
-<collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
-<component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
-<unit mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
-</component>
-</collection>
-<collection name="bsptemplate" long-name="Board Support Package Template" level="hw-if">
-<component name="asspandvariant" long-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 name="kernel" long-name="Kernel Architecture" level="adaptation">
-<component name="eka" long-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 name="kerneltest" long-name="Kernel Test" level="hw-if">
-<component name="e32utils" long-name="E32 Utilities" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32utils/group" mrp="os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/>
-</component>
-<component name="e32test" long-name="E32 Tests" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32test/group" mrp="os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
-</component>
-<component name="f32test" long-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 name="ldds" long-name="Logical Device Drivers" level="adaptation">
-<component name="ethernetldd" long-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 name="audioldd" long-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>
-<component name="serialldd" long-name="Serial Port Drivers" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
-</component>
-<component name="legacydrivers" long-name="Legacy Drivers" purpose="optional">
-<unit mrp="os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
-</component>
-<component name="locmedia" long-name="Local Media Subsystem" introduced="8.1b" purpose="mandatory">
-<!-- these are LDDs for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
-</component>
-<component name="runmodedebugger" long-name="Run Mode Debugger" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/debug/group" mrp="os/kernelhwsrv/kernel/eka/drivers/debug/group/base_e32_drivers_debug.mrp"/>
-</component>
-<component name="btrace" long-name="Kernel Trace Tool" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/trace" mrp="os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
-</component>
-<component name="cameraldd" long-name="Camera Drivers" introduced="^3" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/camerasc" mrp="os/kernelhwsrv/kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
-</component>
-<component name="displayldd" long-name="Display Drivers" introduced="^3" purpose="optional">
-<!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/display" mrp="os/kernelhwsrv/kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
-</component>
-<component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
-</component>
-</collection>
-<collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
-<component name="mediadrivers" long-name="Media Drivers" purpose="optional">
-<!-- these are for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/media" mrp="os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
-</component>
-<component name="genericboardsupport" long-name="Generic Board Support" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
-</component>
-</collection>
-<collection name="userlibandfileserver" long-name="User Library and File Server" level="framework">
-<component name="euser" long-name="User Library" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/euser" mrp="os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
-</component>
-<component name="compsupp" long-name="Compiler Runtime Support" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/compsupp" mrp="os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
-</component>
-<component name="fileserver" long-name="File Server" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
-</component>
-<component name="estart" long-name="Base Starter" filter="gt" purpose="optional">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
-</component>
-<component name="domainmgr" long-name="Domain Manager" introduced="8.1b" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
-</component>
-</collection>
-<collection name="filesystems" long-name="File Systems" level="framework">
-<component name="romfs" long-name="ROM File System" filter="gt" purpose="optional" plugin="Y">
-<unit mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
-</component>
-<component name="rofs" long-name="ROFS" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
-</component>
-<component name="usbmsfs" long-name="USB Mass Storage File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
-</component>
-<component name="usbhostmssrv" long-name="USB Host Mass Storage Server" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage/base_f32_shostmassstorage.mrp"/>
-</component>
-<component name="fat32fs" long-name="FAT32 File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
-</component>
-<component name="fatfs" long-name="FAT File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
-</component>
-<component name="compfs" long-name="Composite File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
-</component>
-</collection>
-<collection name="halservices" long-name="HAL Services" level="framework">
-<component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
-<unit bldFile="os/kernelhwsrv/halservices/hal" mrp="os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
-</component>
-</collection>
-<collection name="textmodeshell" long-name="Text Mode Shell" level="test">
-<component name="e32wsrv" long-name="Text Window Server" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/ewsrv" mrp="os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
-</component>
-<component name="textshell" long-name="Text Shell" filter="gt" purpose="development">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
-</component>
-</collection>
-<collection name="baseapitest" long-name="Base API Tests" level="test"/>
-<collection name="kernelhwsrv_info" long-name="Kernel and Hardware Services Info" level="test">
-<component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 config">
-<collection name="emulator" long-name="Emulator" level="bsp">
-<component name="emulatorbsp" long-name="Emulator BSP" purpose="optional">
-<unit bldFile="os/boardsupport/emulator/emulatorbsp" mrp="os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
-</component>
-</collection>
-<collection name="haitest" long-name="HAI Test Suites" level="test">
-<component name="bspsvs" long-name="BSP Verification Suite" introduced="^2" purpose="development">
-<unit mrp="os/boardsupport/haitest/bspsvs/group/bspsvs.mrp"/>
-</component>
-</collection>
-<collection name="boardsupport_info" long-name="Board Support Info" level="config">
-<component name="boardsupport_metadata" long-name="Board Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/boardsupport/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
-<collection name="bldsystemtools" long-name="Build System Tools" level="bld">
-<component name="sysdeftools" long-name="System Definition Tools" purpose="development" introduced="^2">
-<unit mrp="os/buildtools/bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
-</component>
-<component name="commonbldutils" long-name="Common Utils" purpose="development">
-<unit mrp="os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
-</component>
-</collection>
-<collection name="toolsandutils" long-name="Tools and Utils" level="mw">
-<component name="productionbldtools" long-name="Production Build Tools" filter="gt" purpose="development">
-<unit mrp="os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
-</component>
-<component name="e32tools" long-name="E32 Tools" deprecated="^2" purpose="development" class="PC">
-<unit bldFile="os/buildtools/toolsandutils/e32tools/group" mrp="os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
-</component>
-<component name="autotest" long-name="Autotest" purpose="development">
-<unit bldFile="os/buildtools/toolsandutils/autotest/group" mrp="os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
-</component>
-</collection>
-<collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
-<component name="e32toolp" long-name="E32 Perl Tools" purpose="development" filter="sf_build" class="PC">
-<unit mrp="os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="os/buildtools/sbsv1_os/e32toolp/group"/>
-</component>
-</collection>
-<collection name="imgtools_os" long-name="Image Tools" level="fw">
-<component name="romkiteka2" long-name="ROMKIT EKA2" deprecated="^2" purpose="development">
-<unit bldFile="os/buildtools/imgtools_os/romkiteka2/group" mrp="os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
-</component>
-</collection>
-<collection name="misccomponents" long-name="Misc Components" level="mw">
-<component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt" purpose="development">
-<unit bldFile="os/buildtools/misccomponents/emulatorlauncher/group" mrp="os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
-</component>
-</collection>
-<collection name="buildtools_info" long-name="Build Tools Info" level="ui">
-<component name="buildtools_metadata" long-name="Build Tools Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/buildtools/buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
-<collection name="ossrv_pub" long-name="Generic OS Services Public Interfaces" level="utilities">
-<component name="boost_apis" long-name="Boost APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/boost_apis/group"/>
-</component>
-<component name="cpp_wrappers" long-name="Cpp wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cpp_wrappers/group"/>
-</component>
-<component name="character_type_apis" long-name="Character Type APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/character_type_apis/group"/>
-</component>
-<component name="compiler_specific_runtime_support" long-name="Compiler Specific Runtime Support" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/compiler_specific_runtime_support/group"/>
-</component>
-<component name="ossrv_configuration_api" long-name="Generic OS Services Configuration API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/configuration/group"/>
-</component>
-<component name="crypto_authentication_codes_and_hash_functions_api" long-name="Crypto Authentication Codes and Hash Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
-</component>
-<component name="crypto_auxillary_functions_api" long-name="Crypto Auxillary Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_auxillary_functions_api/group"/>
-</component>
-<component name="crypto_certificates_api" long-name="Crypto Certificates API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_certificates_api/group"/>
-</component>
-<component name="crypto_inputoutput_and_data_encoding_api" long-name="Crypto Input/Output and Data Encoding API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
-</component>
-<component name="crypto_public_key_cryptography_and_key_agreement_api" long-name="Crypto Public Key Cryptography and Key Agreement API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
-</component>
-<component name="crypto_symmetric_ciphers_api" long-name="Crypto Symmetric Ciphers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_symmetric_ciphers_api/group"/>
-</component>
-<component name="crypto_utility_functions_api" long-name="Crypto Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_utility_functions_api/group"/>
-</component>
-<component name="cryptogaphy_related_api" long-name="Cryptogaphy Related API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cryptogaphy_related_api/group"/>
-</component>
-<component name="ossrv_debug_api" long-name="Generic OS Services Debug API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/debug/group"/>
-</component>
-<component name="ossrv_exceptions_api" long-name="Generic OS Services Exceptions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/exceptions/group"/>
-</component>
-<component name="gboxed" long-name="GBoxed API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gboxed/group"/>
-</component>
-<component name="glib_arrays" long-name="Glib Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_arrays/group"/>
-</component>
-<component name="glib_asynchronous_queues" long-name="Glib Asynchronous Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_asynchronous_queues/group"/>
-</component>
-<component name="glib_atomic_operations" long-name="Glib Atomic Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_atomic_operations/group"/>
-</component>
-<component name="glib_automatic_string_completion" long-name="Glib Automatic String Completion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_automatic_string_completion/group"/>
-</component>
-<component name="glib_balanced_binary_trees" long-name="Glib Balanced Binary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_balanced_binary_trees/group"/>
-</component>
-<component name="glib_basic_types" long-name="Glib Basic Types API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_basic_types/group"/>
-</component>
-<component name="glib_caches" long-name="Glib Caches API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_caches/group"/>
-</component>
-<component name="glib_character_set_conversion" long-name="Glib Character Set Conversion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_character_set_conversion/group"/>
-</component>
-<component name="glib_closures" long-name="Glib Closures API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_closures/group"/>
-</component>
-<component name="glib_commandline_option_parser" long-name="Glib Command Line Option Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_commandline_option_parser/group"/>
-</component>
-<component name="glib_datasets" long-name="Glib Datasets API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_datasets/group"/>
-</component>
-<component name="glib_date_and_time_functions" long-name="Glib Date and Time Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_date_and_time_functions/group"/>
-</component>
-<component name="glib_doubleended_queues" long-name="Glib Double-ended Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doubleended_queues/group"/>
-</component>
-<component name="glib_doublylinked_lists" long-name="Glib Doubly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doublylinked_lists/group"/>
-</component>
-<component name="glib_dynamic_loading_of_modules" long-name="Glib Dynamic Loading of Modules API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_dynamic_loading_of_modules/group"/>
-</component>
-<component name="glib_enums_and_flags" long-name="Glib Enums and Flags API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_enums_and_flags/group"/>
-</component>
-<component name="glib_error_reporting" long-name="Glib Error Reporting API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_error_reporting/group"/>
-</component>
-<component name="glib_file_utilities" long-name="Glib File Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_file_utilities/group"/>
-</component>
-<component name="glib_generic_values" long-name="Glib Generic Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_generic_values/group"/>
-</component>
-<component name="glib_globstyle_pattern_matching" long-name="Glib Glob-Style Pattern Matching API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_globstyle_pattern_matching/group"/>
-</component>
-<component name="glib_hash_tables" long-name="Glib Hash Tables API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hash_tables/group"/>
-</component>
-<component name="glib_hook_functions" long-name="Glib Hook Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hook_functions/group"/>
-</component>
-<component name="glib_internationalization" long-name="Glib Internationalization API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_internationalization/group"/>
-</component>
-<component name="glib_io_channels" long-name="Glib I/O Channels API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_io_channels/group"/>
-</component>
-<component name="glib_keyvalue_file_parser" long-name="Glib Key-Value File Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_keyvalue_file_parser/group"/>
-</component>
-<component name="glib_lexical_scanner" long-name="Glib Lexical Scanner API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_lexical_scanner/group"/>
-</component>
-<component name="glib_main_event_loop" long-name="Glib Main Event Loop API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_main_event_loop/group"/>
-</component>
-<component name="glib_memory_allocation" long-name="Glib Memory Allocation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_allocation/group"/>
-</component>
-<component name="glib_memory_slices" long-name="Glib Memory Slices API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_slices/group"/>
-</component>
-<component name="glib_message_logging" long-name="Glib Message Logging API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_message_logging/group"/>
-</component>
-<component name="glib_miscellaneous_utility_functions" long-name="Glib Miscellaneous Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_miscellaneous_utility_functions/group"/>
-</component>
-<component name="glib_nary_trees" long-name="Glib N-ary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_nary_trees/group"/>
-</component>
-<component name="glib_parameters_and_values" long-name="Glib Parameters and Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_parameters_and_values/group"/>
-</component>
-<component name="glib_quarks" long-name="Glib Quarks API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_quarks/group"/>
-</component>
-<component name="glib_random_numbers" long-name="Glib Random Numbers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_random_numbers/group"/>
-</component>
-<component name="glib_relations_and_tuples" long-name="Glib Relations and Tuples API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_relations_and_tuples/group"/>
-</component>
-<component name="glib_shellrelated_utilities" long-name="Glib Shell-related Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_shellrelated_utilities/group"/>
-</component>
-<component name="glib_signals" long-name="Glib Signals API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_signals/group"/>
-</component>
-<component name="glib_simple_xml_subset_parser" long-name="Glib Simple XML Subset Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_simple_xml_subset_parser/group"/>
-</component>
-<component name="glib_singlylinked_lists" long-name="Glib Singly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_singlylinked_lists/group"/>
-</component>
-<component name="glib_spawning_processes" long-name="Glib Spawning Processes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_spawning_processes/group"/>
-</component>
-<component name="glib_standard_macros" long-name="Glib Standard Macros API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_standard_macros/group"/>
-</component>
-<component name="glib_string_utility_functions" long-name="Glib String Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_string_utility_functions/group"/>
-</component>
-<component name="glib_strings" long-name="Glib Strings API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_strings/group"/>
-</component>
-<component name="glib_thread_pools" long-name="Glib Thread Pools API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_thread_pools/group"/>
-</component>
-<component name="glib_threads" long-name="Glib Threads API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_threads/group"/>
-</component>
-<component name="glib_timers" long-name="Glib Timers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_timers/group"/>
-</component>
-<component name="glib_unicode_manipulation" long-name="Glib Unicode Manipulation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_unicode_manipulation/group"/>
-</component>
-<component name="glib_value_arrays" long-name="Glib Value Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_value_arrays/group"/>
-</component>
-<component name="glib_varargs_value_collection" long-name="Glib Varargs Value Collection API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_varargs_value_collection/group"/>
-</component>
-<component name="gobject" long-name="GObject API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gobject/group"/>
-</component>
-<component name="gparamspec" long-name="GParamSpec API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gparamspec/group"/>
-</component>
-<component name="gtype" long-name="GType API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtype/group"/>
-</component>
-<component name="gtypemodule" long-name="GTypeModule API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypemodule/group"/>
-</component>
-<component name="gtypeplugin" long-name="GTypePlugin API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypeplugin/group"/>
-</component>
-<component name="io_stream_api" long-name="I/O stream API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/io_stream_api/group"/>
-</component>
-<component name="localization_function_api" long-name="Localization Function API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/localization_function_api/group"/>
-</component>
-<component name="math_operations_api" long-name="Math Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/math_operations_api/group"/>
-</component>
-<component name="ossrv_memory_api" long-name="Generic OS Services Memory API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/memory/group"/>
-</component>
-<component name="no_namespace_headers" long-name="No Namespace Headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/no_namespace_headers/group"/>
-</component>
-<component name="openc_headers" long-name="OpenC headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_headers/group"/>
-</component>
-<component name="openc_wrappers" long-name="OpenC wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_wrappers/group"/>
-</component>
-<component name="ssl_general_api" long-name="SSL General API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_general_api/group"/>
-</component>
-<component name="ssl_protocol_methods_api" long-name="SSL Protocol Methods API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_protocol_methods_api/group"/>
-</component>
-<component name="standard_compressiondecompression_api" long-name="Standard Compression/Decompression API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/standard_compressiondecompression_api/group"/>
-</component>
-<component name="stl" long-name="STL API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/stl/group"/>
-</component>
-<component name="thread_api" long-name="Thread API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/thread_api/group"/>
-</component>
-<component name="type_attributes" long-name="Type Attributes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/type_attributes/group"/>
-</component>
-<component name="typeinfo" long-name="Type Info API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/typeinfo/group"/>
-</component>
-<component name="utility_apis" long-name="Utility APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/utility_apis/group"/>
-</component>
-<component name="wide_character_classapis" long-name="Wide character class/apis" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/wide_character_classapis/group"/>
-</component>
-<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">
-<unit bldFile="os/ossrv/ossrv_pub/dbus-glib/group"/>
-</component>
-</collection>
-<collection name="ossrv_plat" long-name="Generic OS Services Platform Interfaces" level="utilities">
-<component name="libutils_apis" long-name="Utility Library APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_plat/libutils/group"/>
-</component>
-</collection>
-<collection name="stdlibs" long-name="Standard Libraries" level="translation">
-<component name="libz" filter="s60" long-name="Z Compression Library">
-<unit bldFile="os/ossrv/stdlibs/libz/group"/>
-</component>
-<component name="libcrypt" filter="s60" long-name="Crypt Library">
-<unit bldFile="os/ossrv/stdlibs/libcrypt/group"/>
-</component>
-</collection>
-<collection name="ssl" long-name="SSL" level="data-services">
-<component name="libcrypto" filter="s60" long-name="Crypto Library">
-<unit bldFile="os/ossrv/ssl/libcrypto/group"/>
-</component>
-<component name="libssl" filter="s60" purpose="development" long-name="SSL Library">
-<unit bldFile="os/ossrv/ssl/libssl/group"/>
-</component>
-</collection>
-<collection name="glib" long-name="GLib" level="utilities">
-<component name="glibbackend" filter="s60" long-name="GLib Backend">
-<unit bldFile="os/ossrv/glib/glibbackend/group"/>
-</component>
-<component name="libglib" filter="s60" long-name="GLib Library">
-<unit bldFile="os/ossrv/glib/libglib/group"/>
-</component>
-<component name="libgthread" filter="s60" long-name="Libg Thread">
-<unit bldFile="os/ossrv/glib/libgthread/group"/>
-</component>
-<component name="libgmodule" filter="s60" long-name="Libg Module">
-<unit bldFile="os/ossrv/glib/libgmodule/group"/>
-</component>
-<component name="libgobject" filter="s60" long-name="Libg Object">
-<unit bldFile="os/ossrv/glib/libgobject/group"/>
-</component>
-</collection>
-<collection name="stdcpp" long-name="C++ Standard Library" level="translation">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="stdcpp_build" filter="s60" long-name="Stdcpp">
-<unit bldFile="os/ossrv/stdcpp/group"/>
-</component>
-</collection>
-<collection name="ofdbus" long-name="Open Foundation D-Bus" level="utilities">
-<component name="dbus" filter="s60" long-name="D-Bus">
-<unit bldFile="os/ossrv/ofdbus/dbus/group"/>
-</component>
-<component name="dbus-glib" filter="s60" long-name="D-Bus GLib">
-<unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
-</component>
-<component name="ofdbus_rom" filter="s60" long-name="D-Bus ROM">
-<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory
- Consider moving IBY file to one of the above as well and removing this component entirely -->
-<unit bldFile="os/ossrv/ofdbus/group"/>
-</component>
-</collection>
-<collection name="utilitylibraries" long-name="Utility Libraries" level="encoding">
-<component name="libutils" filter="s60" long-name="Utility Library">
-<unit bldFile="os/ossrv/utilitylibraries/libutils/group"/>
-</component>
-</collection>
-<collection name="genericservices" long-name="Generic Services" level="utilities">
-<component name="s60compatibilityheaders" long-name="S60 Compatibility Headers" filter="gt" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp" version="tb101sf"/>
-</component>
-<component name="mimerecognitionfw" long-name="MIME Recognition Framework" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/mimerecognitionfw/group" mrp="os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
-</component>
-<component name="systemagent" long-name="System Agent" introduced="9.0" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/systemagent/group" mrp="os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
-</component>
-<component name="taskscheduler" long-name="Task Scheduler" introduced="6.0" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/taskscheduler/group" mrp="os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
-</component>
-<component name="activebackupclient" long-name="Active Backup Client" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/activebackupclient/group" mrp="os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
-</component>
-<component name="syslibsdocs" long-name="Syslibs Documentation" purpose="development" class="doc">
-<unit mrp="os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
-</component>
-<component name="httputils" long-name="HTTP Utilities Library" introduced="6.2" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/httputils/group" mrp="os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
-</component>
-</collection>
-<collection name="syslibsapitest" long-name="SysLibs API Tests" level="utilities"/>
-<collection name="compressionlibs" long-name="Compression Libraries" level="data-services">
-<component name="ziplib" long-name="Zip Compression Library" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/ossrv/compressionlibs/ziplib/group" mrp="os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
-</component>
-</collection>
-<collection name="genericopenlibs" long-name="Generic Open Libraries" level="translation">
-<component name="cstdlib" long-name="C Standard Library" introduced="ER5" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/cstdlib/group" mrp="os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
-</component>
-<component name="cppstdlib" long-name="C++ Standard Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/cppstdlib/group" mrp="os/ossrv/genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
-</component>
-<component name="openenvcore" long-name="Open Environment Core" introduced="^2" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/openenvcore/group" mrp="os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
-</component>
-<component name="posixrealtimeextensions" long-name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/posixrealtimeextensions/group" mrp="os/ossrv/genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
-</component>
-</collection>
-<collection name="lowlevellibsandfws" long-name="Low Level Libraries and Frameworks" level="app-libs">
-<component name="pluginfw" long-name="Plugin Framework" introduced="6.2" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp" version="3"/>
-</component>
-<component name="apputils" long-name="Application Utilities" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/apputils/group" mrp="os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
-</component>
-<component name="genericusabilitylib" long-name="Generic Usability Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/genericusabilitylib/group" mrp="os/ossrv/lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
-</component>
-</collection>
-<collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
-<component name="ossrv_build" filter="s60" long-name="Generic OS Services Build">
-<!-- exports should be moved to individual components -->
-<unit bldFile="os/ossrv/group"/>
-</component>
-<component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="featuremgmt" long-name="Feature Management" level="framework">
-<component name="featuremgr" long-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 name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/persistentdata/featuremgmt/featureregistry/group" mrp="os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
-</component>
-</collection>
-<collection name="loggingservices" long-name="Logging Services" level="server">
-<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">
-<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">
-<unit bldFile="os/persistentdata/loggingservices/rfilelogger/group" mrp="os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
-</component>
-</collection>
-<collection name="traceservices" long-name="Trace Services" level="server">
-<component name="commsdebugutility" long-name="Comms Debug Utility" introduced="7.0s" purpose="optional">
-<unit bldFile="os/persistentdata/traceservices/commsdebugutility/group" mrp="os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
-</component>
-<component name="tracefw" long-name="Trace Framework" introduced="9.2" purpose="development">
-<unit bldFile="os/persistentdata/traceservices/tracefw/ulogger/group" mrp="os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
-</component>
-</collection>
-<collection name="persistentstorage" long-name="Persistent Storage" level="framework">
-<component name="store" long-name="Store" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/store/group" mrp="os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
-</component>
-<component name="dbms" long-name="DBMS" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/dbms/group" mrp="os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
-</component>
-<component name="centralrepository" long-name="Central Repository" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/persistentdata/persistentstorage/centralrepository/group" mrp="os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
-</component>
-<component name="sql" long-name="SQL" introduced="9.3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sql/GROUP" mrp="os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
-</component>
-<component name="sqlite3api" long-name="SQLite 3 API" introduced="^3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sqlite3api/GROUP" mrp="os/persistentdata/persistentstorage/sqlite3api/GROUP/syslibs_sqlite3.mrp"/>
-</component>
-</collection>
-<collection name="persistentdata_info" long-name="Persistent Data Services Info" level="app-if">
-<component name="persistentdata_metadata" long-name="Persistent Data Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/persistentdata/persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
-<component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
-</component>
-<component name="common_platform_security_definitions_api" long-name="Common Platform Security Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group"/>
-</component>
-<component name="feature_discovery_api" long-name="Feature Discovery API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/group"/>
-</component>
-<component name="platform_environment_api" long-name="Platform Environment API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_environment_api/group"/>
-</component>
-<component name="sensor_channel_api" long-name="Sensor Channel API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_channel_api/group"/>
-</component>
-<component name="sensor_definitions_api" long-name="Sensor Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_definitions_api/group"/>
-</component>
-<component name="version_info_api" long-name="Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/group"/>
-</component>
-<component name="accessory_monitoring_api" long-name="Accessory Monitoring API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/group"/>
-</component>
-<component name="haptics_api" long-name="Haptics API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/haptics_api/group"/>
-</component>
-<component name="sensor_data_compensator_api" long-name="Sensor Data Compensator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
-</component>
-</collection>
-<collection name="devicesrv_plat" long-name="Device Services Platform Interfaces" level="app-if">
-<component name="configuration_file_parser_api" long-name="Configuration File Parser API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/configuration_file_parser_api/group"/>
-</component>
-<component name="dos_extension_plugin_api" long-name="DOS Extension Plug-In API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_plugin_api/group"/>
-</component>
-<component name="mediator_command_initiator_api" long-name="Mediator Command Initiator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_initiator_api/group"/>
-</component>
-<component name="syslangutil_api" long-name="SysLangUtil API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/syslangutil_api/group"/>
-</component>
-<component name="wakeup_alarm_api" long-name="Wakeup Alarm API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/wakeup_alarm_api/group"/>
-</component>
-<component name="disk_and_memory_level_keys_api" long-name="Disk and Memory Level Keys API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_and_memory_level_keys_api/group"/>
-</component>
-<component name="mediator_plugin_api" long-name="Mediator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_plugin_api/group"/>
-</component>
-<component name="headset_status_api" long-name="Headset Status API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/headset_status_api/group"/>
-</component>
-<component name="system_startup_extension_plugin_api" long-name="System Startup Extension Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/system_startup_extension_plugin_api/group"/>
-</component>
-<component name="sensor_plugin_api" long-name="Sensor Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_plugin_api/group"/>
-</component>
-<component name="accessory_api" long-name="Accessory API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_api/group"/>
-</component>
-<component name="display_language_definition_api" long-name="Display Language Definition API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/display_language_definition_api/group"/>
-</component>
-<component name="mediator_command_responder_api" long-name="Mediator Command Responder API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_responder_api/group"/>
-</component>
-<component name="accessory_policy_definitions_api" long-name="Accessory Policy Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_definitions_api/group"/>
-</component>
-<component name="hw_settings_api" long-name="Hardware Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/hw_settings_api/group"/>
-</component>
-<component name="mediator_domain_definitions_api" long-name="Mediator Domain Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_domain_definitions_api/group"/>
-</component>
-<component name="sensor_extension_api" long-name="Sensor Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_extension_api/group"/>
-</component>
-<component name="accessory_plugin_api" long-name="Accessory Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_plugin_api/group"/>
-</component>
-<component name="sae_api" long-name="SAE API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sae_api/group"/>
-</component>
-<component name="accessory_control_api" long-name="Accessory Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_control_api/group"/>
-</component>
-<component name="mediator_static_registration_api" long-name="Mediator Static Registration API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_static_registration_api/group"/>
-</component>
-<component name="accessory_key_event_handling_api" long-name="Accessory Key Event Handling API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_key_event_handling_api/group"/>
-</component>
-<component name="mediator_notification_api" long-name="Mediator Notification API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_notification_api/group"/>
-</component>
-<component name="accessory_policy_utility_api" long-name="Accessory Policy Utility API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_utility_api/group"/>
-</component>
-<component name="common_dsy_plugin_api" long-name="Common DSY Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/common_dsy_plugin_api/group"/>
-</component>
-<component name="remote_control_extension_api" long-name="Remote Control Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/remote_control_extension_api/group"/>
-</component>
-<component name="sensor_channel_filter_api" long-name="Sensor Channel Filter API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_channel_filter_api/group"/>
-</component>
-<component name="dos_extension_api" long-name="DOS Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_api/group"/>
-</component>
-<component name="accessory_audio_control_api" long-name="Accessory Audio Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_audio_control_api/group"/>
-</component>
-<component name="mediator_event_consumer_api" long-name="Mediator Event Consumer API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_consumer_api/group"/>
-</component>
-<component name="shared_data_api" long-name="Shared Data API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/shared_data_api/group"/>
-</component>
-<component name="accessory_settings_api" long-name="Accessory Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_settings_api/group"/>
-</component>
-<component name="accessory_bluetooth_control_api" long-name="Accessory Bluetooth Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_bluetooth_control_api/group"/>
-</component>
-<component name="extended_version_info_api" long-name="Extended Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_api/group"/>
-</component>
-<component name="mediator_event_provider_api" long-name="Mediator Event Provider API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_provider_api/group"/>
-</component>
-<component name="tv_out_config_api" long-name="TV Out Config API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_config_api/group"/>
-</component>
-<component name="tspclientmapper_api" long-name="TSP Client Mapper API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tspclientmapper_api/group"/>
-</component>
-<component name="powersave_api" long-name="Power Save API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_api/group"/>
-</component>
-<component name="powersave_definitions_api" long-name="Power Save Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_definitions_api/group"/>
-</component>
-<component name="powersave_plugin_api" long-name="Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_plugin_api/group"/>
-</component>
-<component name="extended_version_info_plugin_api" long-name="Extended Version Info Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_plugin_api/group"/>
-</component>
-<component name="haptics_plugin_api" long-name="Haptics Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_plugin_api/group"/>
-</component>
-<component name="haptics_effect_data_getter_plugin_api" long-name="Haptics Effect Data Getter Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
-</component>
-<component name="haptics_packetizer_plugin_api" long-name="Haptics Packetizer Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_packetizer_plugin_api/group"/>
-</component>
-<component name="tiltcompensation_api" long-name="Tilt Compensation API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tiltcompensation_api/group"/>
-</component>
-<component name="disk_notification_handler_api" long-name="Disk Notification Handler API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_notification_handler_api/group"/>
-</component>
-<component name="accessory_policy_usb_audio_api" long-name="Accessory Policy USB Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_usb_audio_api/group"/>
-</component>
-<component name="accessory_policy_hdmi_audio_api" long-name="Accessory Policy HDMI Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_hdmi_audio_api/group"/>
-</component>
-<component name="sensor_data_compensator_plugin_api" long-name="Sensor Data Compensator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
-</component>
-<component name="ddc_access_api" long-name="DDC Access API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/ddc_access_api/group"/>
-</component>
-<component name="tv_out_behaviour_api" long-name="TV Out Behaviour API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_behaviour_api/group"/>
-</component>
-</collection>
-<collection name="accessoryservices" long-name="Accessory Services" level="framework">
-<component name="accessorymonitor" filter="s60" long-name="Accessory Monitor">
-<unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/group"/>
-</component>
-<component name="accessoryremotecontrol" filter="s60" long-name="Accessory Remote Control">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
-</component>
-<component name="accessoryserver" filter="s60" long-name="Accessory Server">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryserver/group"/>
-</component>
-<component name="pluggeddisplay" filter="s60" long-name="Plugged Display" introduced="^3">
-<unit bldFile="os/devicesrv/accessoryservices/pluggeddisplay/group"/>
-</component>
-<component name="headsetstatusapi" filter="s60" long-name="Headset Status API">
-<unit bldFile="os/devicesrv/accessoryservices/headsetstatusapi/group"/>
-</component>
-<component name="tspclientmapper" filter="s60" long-name="TSP Client Mapper">
-<unit bldFile="os/devicesrv/accessoryservices/tspclientmapper/group"/>
-</component>
-<component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional">
-<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
-</component>
-<component name="gid_pc_tool" filter="s60" long-name="Generic ID PC Tool" class="tool PC">
-<unit bldFile="os/devicesrv/accessoryservices/gid_pc_tool/group"/>
-</component>
-</collection>
-<collection name="commonservices" long-name="Common Services" level="app-if">
-<component name="commonengine" filter="s60" long-name="Common Engine">
-<unit bldFile="os/devicesrv/commonservices/commonengine/group"/>
-</component>
-<component name="commonengineresources" filter="s60" long-name="Common Engine Resources" class="config">
-<unit bldFile="os/devicesrv/commonservices/commonengineresources/group"/>
-</component>
-<component name="platformenv" filter="s60" long-name="Platform Environment">
-<unit bldFile="os/devicesrv/commonservices/platformenv/group"/>
-</component>
-<component name="sysutil" long-name="System Utilities" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/sysutil/group" mrp="os/devicesrv/commonservices/sysutil/group/sysutil.mrp"/>
-</component>
-<component name="activitymanager" long-name="Activity Manager" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/activitymanager/group" mrp="os/devicesrv/commonservices/activitymanager/group/activitymanager.mrp"/>
-</component>
-</collection>
-<collection name="dosservices" long-name="Domestic Operating System Services" level="hw-if">
-<component name="commondsy" filter="s60" long-name="Common DSY" plugin="Y">
-<unit bldFile="os/devicesrv/dosservices/commondsy/group"/>
-</component>
-<component name="dosserver" filter="s60" long-name="Domestic OS Server">
-<unit bldFile="os/devicesrv/dosservices/dosserver/group"/>
-</component>
-</collection>
-<collection name="sensorservices" long-name="Sensor Services" level="framework">
-<component name="sensorserver" filter="s60" long-name="Sensor Server">
-<unit bldFile="os/devicesrv/sensorservices/sensorserver/group"/>
-</component>
-<component name="orientationssy" filter="s60" long-name="Orientation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/orientationssy/group"/>
-</component>
-<component name="tiltcompensationssy" filter="s60" long-name="Tilt Compensation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/tiltcompensationssy/group"/>
-</component>
-<component name="sensordatacompensator" filter="s60" long-name="Sensor Data Compensator">
-<unit bldFile="os/devicesrv/sensorservices/sensordatacompensator/group"/>
-</component>
-</collection>
-<collection name="hwrmhaptics" long-name="HWRM Haptics" level="plugin">
-<component name="hapticseffectdatagetterfw" filter="s60" long-name="Haptics Effect Data Getter Framework">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
-</component>
-<component name="hapticspluginservice" filter="s60" long-name="Haptics Plugin Service">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
-</component>
-<component name="hapticspacketizer" filter="s60" long-name="Haptics Packetizer">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
-</component>
-<component name="hapticspluginmanager" filter="s60" long-name="Haptics Plugin Manager">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
-</component>
-<component name="hapticsserver" filter="s60" long-name="Haptics Server">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsserver/group"/>
-</component>
-<component name="hapticsclient" filter="s60" long-name="Haptics Client">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsclient/group"/>
-</component>
-<component name="hwrmhaptics_build" filter="s60" long-name="HWRM Haptics Build">
-<!-- move these exports into the appropriate above components and delete this component-->
-<unit bldFile="os/devicesrv/hwrmhaptics/group"/>
-</component>
-</collection>
-<collection name="mediator" long-name="Mediator" level="app-if">
-<!--collection is really a component. Move it down a directory -->
-<component name="mediator_build" filter="s60" long-name="Mediator Build">
-<unit bldFile="os/devicesrv/mediator/group"/>
-</component>
-</collection>
-<collection name="psmservices" long-name="Power Save Mode Services" level="app-if">
-<component name="psmserver" filter="s60" long-name="PSM Server">
-<unit bldFile="os/devicesrv/psmservices/psmserver/group"/>
-</component>
-</collection>
-<collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
-<component name="hwrmfmtxwatcherplugin" filter="s60" long-name="HWRM FM Transmitter Watcher Plugin" plugin="Y">
-<unit bldFile="os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
-</component>
-<component name="hwrmtargetmodifierplugin" filter="s60" long-name="HWRM Target Modifier Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build,
- may need to -->
-<!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
-</component>
-<component name="vibractrl" filter="s60" long-name="Vibra Control" deprecated="9.1">
-<unit bldFile="os/devicesrv/resourcemgmt/vibractrl/group"/>
-</component>
-<component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="^2" purpose="optional">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
-</component>
-<component name="hwresourcesmgrconfig" long-name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
-</component>
-<component name="resourcemgmt_build" filter="s60" long-name="Resource Management Build">
-<!-- Move exports to a self-contained component.
- This needs to be kept around until configuration is in place -->
-<unit bldFile="os/devicesrv/resourcemgmt/group"/>
-</component>
-<component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
-</component>
-</collection>
-<collection name="sysstatemgmt" long-name="System State Management" level="server">
-<component name="ssmmapperutility" filter="s60" long-name="SSM Mapper Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmmapperutility/group"/>
-</component>
-<component name="ssmpolicyplugins" filter="s60" long-name="SSM Policy Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmpolicyplugins/group"/>
-</component>
-<component name="ssmutilityplugins" filter="s60" long-name="SSM Utility Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmutilityplugins/group"/>
-</component>
-<component name="ssmcmdlists" filter="s60" long-name="SSM Command Lists" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcmdlists/group"/>
-</component>
-<component name="ssmcustcmds" filter="s60" long-name="SSM Custom Commands" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcustcmds/group"/>
-</component>
-<component name="syslangutil" filter="s60" long-name="System Language Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/syslangutil/group"/>
-</component>
-<component name="sysrestart" filter="s60" long-name="System Restart" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysrestart/group"/>
-</component>
-<component name="sysuiprovider" filter="s60" long-name="System UI Provider" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysuiprovider/group"/>
-</component>
-<component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/group" mrp="os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
-</component>
-<component name="systemstatemgr" long-name="System State Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
-</component>
-<component name="systemstateplugins" long-name="System State Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
-</component>
-<component name="systemstatereferenceplugins" long-name="System State Reference Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
-</component>
-</collection>
-<collection name="resourceinterfaces" long-name="Resource Interfaces" level="hw-if">
-<component name="fmtransmittercontrol" long-name="FM Transmitter Control" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group" mrp="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
-</component>
-</collection>
-<collection name="systemhealthmanagement" long-name="System Health Management" level="server">
-<component name="systemhealthmgr" long-name="System Health Manager" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
-</component>
-</collection>
-<collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if"/>
-<collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
-<component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
-<collection name="authenticationservices" long-name="Authentication Services" level="utilities">
-<component name="authenticationserver" long-name="Authentication Server" introduced="^3" purpose="optional">
-<unit bldFile="os/security/authenticationservices/authenticationserver/group" mrp="os/security/authenticationservices/authenticationserver/group/security_authserver.mrp"/>
-</component>
-</collection>
-<collection name="authorisation" long-name="Authorisation" level="utilities">
-<component name="userpromptservice" long-name="User Prompt Service" introduced="^3" purpose="mandatory">
-<unit bldFile="os/security/authorisation/userpromptservice/group" mrp="os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
-</component>
-<component name="userpromptutils" long-name="User Prompt Utils" introduced="^3" purpose="optional">
-<unit bldFile="os/security/authorisation/userpromptutils/group" mrp="os/security/authorisation/userpromptutils/group/security_ups_utils.mrp"/>
-</component>
-</collection>
-<collection name="contentmgmt" long-name="Content Management" level="utilities">
-<component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
-<unit bldFile="os/security/contentmgmt/contentaccessfwfordrm/group" mrp="os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
-</component>
-<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>
-</collection>
-<collection name="crypto" long-name="Crypto Libraries" level="libraries">
-<component name="weakcryptospi" long-name="Weak Crypto SPI" filter="gt" introduced="^3" purpose="optional">
-<unit bldFile="os/security/crypto/weakcryptospi/group" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
-</component>
-<component name="strongcryptospi" long-name="Strong Crypto SPI" filter="gt" introduced="^3" purpose="optional">
-<unit bldFile="os/security/crypto/weakcryptospi/strong" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
-</component>
-</collection>
-<collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
-<component name="securityutils" long-name="Security Utils" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/securityutils/group" mrp="os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
-</component>
-<component name="securitydocs" long-name="Security Documentation" purpose="development" class="doc">
-<unit mrp="os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
-</component>
-<component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
-</component>
-<component name="securitycommonutils" long-name="Security Common Utils" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/security/cryptomgmtlibs/securitycommonutils/group" mrp="os/security/cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
-</component>
-</collection>
-<collection name="securityanddataprivacytools" long-name="Security and Data Privacy Tools" level="services">
-<component name="securityconfig" long-name="Security Config" introduced="9.1" purpose="optional">
-<unit bldFile="os/security/securityanddataprivacytools/securityconfig/group" mrp="os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
-</component>
-<component name="securitytools" long-name="Security Tools" introduced="^3" purpose="optional" class="PC">
-<unit bldFile="os/security/securityanddataprivacytools/securitytools/group" mrp="os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
-</component>
-</collection>
-<collection name="cryptoplugins" long-name="Crypto Plugins" level="plugins">
-<component name="cryptospiplugins" long-name="Crypto SPI Plugins" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/security/cryptoplugins/cryptospiplugins/group" mrp="os/security/cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
-</component>
-</collection>
-<collection name="cryptoservices" long-name="Crypto Services" level="plugins">
-<component name="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/certificateandkeymgmt/group" mrp="os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
-</component>
-<component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
-</component>
-<component name="browserrootcertificates" long-name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
-<unit mrp="os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
-</component>
-<component name="rootcertificates" filter="sf_build" long-name="Root Certificates" introduced="7.0s" purpose="optional">
-<!-- not in S60 codebase -->
-<unit bldFile="os/security/cryptoservices/rootcertificates/group" mrp="os/security/cryptoservices/rootcertificates/group/rootcerts.mrp"/>
-</component>
-<component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/asnpkcs/group" mrp="os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
-</component>
-</collection>
-<collection name="security_info" long-name="OS Security Info" level="utilities">
-<component name="security_metadata" long-name="OS Security Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/security/security_info/security_metadata/security_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
-<collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
-<component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
-</component>
-<component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
-</component>
-<component name="simulationpositioningmodule" long-name="Simulation Positioning Module" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
-</component>
-<component name="gpspositioningmodule" long-name="GPS/A-GPS Positioning Module" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/gpspositioningmodule/group" mrp="os/lbs/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
-</component>
-<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>
-</collection>
-<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
-<component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
-</component>
-</collection>
-<collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
-<component name="locationserver" long-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 name="networkrequesthandler" long-name="Network Request Handler" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
-</component>
-</collection>
-<collection name="lbstest" long-name="Locating Services Tests" level="application-interface">
-<component name="locationprotocoltest" long-name="Location Protocol Tests" introduced="9.2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/lbstest/locationprotocoltest/group" mrp="os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
-</component>
-</collection>
-<collection name="locationmgmt" long-name="Location Management" level="management">
-<component name="locmonitor" long-name="Location Monitor" introduced="^3" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
-</component>
-<component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/agpslocationmgr/group" mrp="os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
-</component>
-<component name="networklocationmgr" long-name="Network Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/networklocationmgr/group" mrp="os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
-</component>
-<component name="locationcore" long-name="Location Core" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locationcore/group" mrp="os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
-</component>
-<component name="networkgateway" long-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 name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
-<component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
-</component>
-<component name="suplrrlpasn1" filter="sf_build" long-name="SUPL RRLP ASN1 Parser">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
-</component>
-</collection>
-<collection name="lbsapitest" long-name="Location API Tests" level="application-interface"/>
-<collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
-<component name="lbs_metadata" long-name="Locating Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commsfw" level="services" long-name="Communications Framework" levels="server support framework process app-if">
-<collection name="commsprocess" long-name="Comms Process" level="process">
-<component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/commsfw/commsprocess/commsrootserverconfig/group" mrp="os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
-</component>
-</collection>
-<collection name="commsconfig" long-name="Comms Config" level="process">
-<component name="commsdatabase" long-name="Comms Database" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
-</component>
-<component name="commsdatabaseshim" long-name="Comms Database Shim" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/commsfw/commsconfig/commsdatabaseshim/group" mrp="os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
-</component>
-</collection>
-<collection name="datacommsserver" long-name="Data Comms Server" level="framework">
-<component name="esockserver" long-name="ESock Server" purpose="mandatory">
-<unit bldFile="os/commsfw/datacommsserver/esockserver/group" mrp="os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp" version="3"/>
-</component>
-<component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/group" mrp="os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
-</component>
-<component name="networkingdialogstub" long-name="Networking Dialog Stub" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/default" mrp="os/commsfw/datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
-</component>
-<component name="networkcontroller" long-name="Network Controller" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/datacommsserver/networkcontroller/group" mrp="os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
-</component>
-</collection>
-<collection name="serialserver" long-name="Serial Server" level="server">
-<component name="serialportcsy" long-name="Serial Port CSY" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/serialserver/serialportcsy" mrp="os/commsfw/serialserver/serialportcsy/ser-comms_serialportcsy.mrp"/>
-</component>
-<component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" purpose="development">
-<unit bldFile="os/commsfw/serialserver/packetloopbackcsy/group" mrp="os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
-</component>
-<component name="c32serialserver" long-name="C32 Serial Server" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/commsfw/serialserver/c32serialserver/group" mrp="os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
-</component>
-<component name="c32serialserverconfig" long-name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config">
-<unit bldFile="os/commsfw/serialserver/c32serialserverconfig" mrp="os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
-</component>
-<component name="c32serialserverdocs" long-name="C32 Serial Server Documentation" purpose="development" class="doc">
-<unit mrp="os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
-</component>
-</collection>
-<collection name="commsfwutils" long-name="Comms Framework Utilities" level="framework">
-<component name="commsbufs" long-name="Comms Buffers" introduced="^3" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwutils/commsbufs/group" mrp="os/commsfw/commsfwutils/commsbufs/group/comms-infras_commsbufs.mrp"/>
-</component>
-</collection>
-<collection name="commsfw_info" long-name="Comms Framework Info" level="app-if">
-<component name="commsinfrastructuredocs" long-name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
-<unit mrp="os/commsfw/commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
-</component>
-<component name="commsfw_metadata" long-name="Communications Framework Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/commsfw/commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
-</component>
-</collection>
-<collection name="commsfwsupport" long-name="Comms Framework Support" level="support">
-<component name="commselements" long-name="Comms Elements" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwsupport/commselements/group" mrp="os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
-</component>
-</collection>
-<collection name="commsinfrastructureapitest" long-name="Comms-Infras API Tests" level="app-if">
-<component name="commsinfrastructuresvs" long-name="Comms Infrastructure Verification Suite" introduced="^3" purpose="development">
-<unit mrp="os/commsfw/commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
-</component>
-</collection>
-<collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
-<component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
-</component>
-<component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" purpose="mandatory" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
-</component>
-<component name="commstools" long-name="Comms Tools" introduced="^3" purpose="development" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/commstools/group" mrp="os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
-</component>
-</collection>
-</block>
-<block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
-<component name="internetsockets" long-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>
-<collection name="tcpiputils" long-name="TCP/IP Utilities" level="plugin">
-<component name="dnd" long-name="DND" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/dnd/group" mrp="os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
-</component>
-<component name="dhcp" long-name="DHCP" introduced="8.0" purpose="optional">
-<unit bldFile="os/networkingsrv/tcpiputils/dhcp/group" mrp="os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
-</component>
-<component name="networkaddressandporttranslation" long-name="Network Address and Port Translation" introduced="^2" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
-</component>
-<component name="punycodeconv" long-name="Punycode Converter" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/punycodeconv/group" mrp="os/networkingsrv/tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
-</component>
-</collection>
-<collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
-<component name="nullagt" long-name="NULL AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/nullagt/group" mrp="os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
-</component>
-<component name="genericscprparameters" long-name="Generic SCPR Parameters" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/linklayercontrol/genericscprparameters/group" mrp="os/networkingsrv/linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
-</component>
-<component name="mbmsparameters" long-name="MBMS Parameters" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/mbmsparameters/group" mrp="os/networkingsrv/linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
-</component>
-<component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
-<unit bldFile="os/networkingsrv/linklayercontrol/networkinterfacemgr/group" mrp="os/networkingsrv/linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp" version="2"/>
-</component>
-</collection>
-<collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
-<component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
-</component>
-<component name="pppnif" long-name="PPP NIF" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/pppnif/group" mrp="os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp" version="2"/>
-</component>
-<component name="slipnif" long-name="SLIP NIF" purpose="development" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/slipnif/group" mrp="os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
-</component>
-<component name="tunnelnif" long-name="Tunnel NIF" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
-</component>
-</collection>
-<collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
-<component name="packetlogger" long-name="Packet Logger" introduced="8.1" purpose="development">
-<unit bldFile="os/networkingsrv/linklayerutils/packetlogger/group" mrp="os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
-</component>
-</collection>
-<collection name="networkcontrol" long-name="Network Control" level="plugin">
-<component name="qoslib" long-name="QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/qoslib/group" mrp="os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
-</component>
-<component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/pfqoslib/group" mrp="os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
-</component>
-<component name="qosfwprt" long-name="QoS Framework PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
-</component>
-<component name="qosipscpr" long-name="QoS IP SCPR" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosipscpr/group" mrp="os/networkingsrv/networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
-</component>
-<component name="ipnetworklayer" long-name="IP Network Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/ipnetworklayer/group" mrp="os/networkingsrv/networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
-</component>
-<component name="iptransportlayer" long-name="IP Transport Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/iptransportlayer/group" mrp="os/networkingsrv/networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
-</component>
-<component name="commsuserpromptmgr" long-name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkcontrol/commsuserpromptmgr/group" mrp="os/networkingsrv/networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
-</component>
-</collection>
-<collection name="networkprotocols" long-name="Network Protocols" level="plugin">
-<component name="ipeventnotifier" long-name="IP Event Notifier" introduced="8.1" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
-</component>
-<component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
-</component>
-<component name="iphook" long-name="IP Hook" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
-</component>
-<component name="mobileip" long-name="Mobile IP" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/mobileip/group" mrp="os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
-</component>
-<component name="dnsproxy" long-name="DNS Proxy" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/networkprotocols/dnsproxy/group" mrp="os/networkingsrv/networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
-</component>
-</collection>
-<collection name="networksecurity" long-name="Network Security" level="framework">
-<component name="tls" long-name="TLS" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tls/group" mrp="os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
-</component>
-<component name="tlsprovider" long-name="TLS Provider" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tlsprovider/group" mrp="os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
-</component>
-<component name="ipsec" long-name="IPsec" introduced="7.0" purpose="optional">
-<unit bldFile="os/networkingsrv/networksecurity/ipsec/group" mrp="os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
-</component>
-</collection>
-<collection name="networkingtestandutils" long-name="Networking Test and Utils" level="app-if">
-<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">
-<!-- production component: contains the IBY files -->
-<unit bldFile="os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
-</component>
-<component name="networkingdocs" long-name="Networking Documentation" purpose="development" class="doc">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
-</component>
-<component name="networkingsrv_metadata" long-name="Networking Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
-<component name="predictorcompression" long-name="Predictor Compression" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wlan" level="services" long-name="WLAN" levels="hw low mid high tools test">
-<collection name="wlan_plat" long-name="WLAN Platform Interfaces" level="test">
-<component name="wlan_dbif_api" long-name="WLAN DBIF API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_dbif_api/group"/>
-</component>
-<component name="wlan_hal_api" long-name="WLAN HAL API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hal_api/group"/>
-</component>
-<component name="wlan_management_api" long-name="WLAN Management API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_management_api/group"/>
-</component>
-<component name="wlan_device_settings_api" long-name="WLAN Device Settings API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_device_settings_api/group"/>
-</component>
-<component name="wlan_control_api" long-name="WLAN Control API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_control_api/group"/>
-</component>
-<component name="wlan_hw_initialization_data_api" long-name="WLAN Hardware Initialization Data API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hw_initialization_data_api/group"/>
-</component>
-<component name="wlan_power_save_plugin_api" long-name="WLAN Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_power_save_plugin_api/group"/>
-</component>
-<component name="wlan_info_api" long-name="WLAN Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_info_api/group"/>
-</component>
-<component name="wlan_agent_hotspot_plugin_api" long-name="WLAN Agent Hotspot Plug-in API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
-</component>
-<component name="wlan_osa_api" long-name="WLAN OSA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_osa_api/group"/>
-</component>
-<component name="wlan_spia_api" long-name="WLAN SPIA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_spia_api/group"/>
-</component>
-<component name="wlan_hpa_api" long-name="WLAN HPA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hpa_api/group"/>
-</component>
-<component name="wlan_eapol_plugin_api" long-name="WLAN EAPOL Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_eapol_plugin_api/group"/>
-</component>
-<component name="wlan_generic_plugin_api" long-name="WLAN Generic Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_generic_plugin_api/group"/>
-</component>
-<component name="wlan_aws_plugin_api" long-name="WLAN AWS Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_aws_plugin_api/group"/>
-</component>
-</collection>
-<collection name="wlan_pub" long-name="WLAN Public Interfaces" level="test">
-<component name="wlan_sdk_info_api" long-name="WLAN SDK Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_pub/wlan_sdk_info_api/group"/>
-</component>
-</collection>
-<collection name="wlan_bearer" long-name="WLAN Bearer" level="hw">
-<component name="wlanpsmplugin" filter="s60" long-name="WLAN PSM Plugin" plugin="Y">
-<unit bldFile="os/wlan/wlan_bearer/wlanpsmplugin/group"/>
-</component>
-<component name="wlanagent" filter="s60" long-name="WLAN Agent">
-<unit bldFile="os/wlan/wlan_bearer/wlanagent/group"/>
-</component>
-<component name="wlandbif_cd" filter="s60" long-name="WLAN CommsDat interface">
-<unit bldFile="os/wlan/wlan_bearer/wlandbif_cd/group"/>
-</component>
-<!-- should follow component directory rules for stuff in wlan_symbian/ and put in a single component or split up properly -->
-<component name="wlanengine" filter="s60" long-name="WLAN Engine">
-<unit bldFile="os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
-</component>
-<component name="wlanldd" filter="s60" long-name="WLAN LDD">
-<unit bldFile="os/wlan/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
-</component>
-<component name="wlannwif" filter="s60" long-name="WLAN Network Interface">
-<unit bldFile="os/wlan/wlan_bearer/wlannwif/group"/>
-</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="adaptation hw-if plugin framework server app-if">
-<collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
-<component name="basebandchanneladaptor" long-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 name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
-<component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
-</component>
-</collection>
-<collection name="fax" long-name="Fax" level="server">
-<component name="faxclientandserver" long-name="Fax Client and Server" purpose="optional">
-<unit bldFile="os/cellularsrv/fax/faxclientandserver/Group" mrp="os/cellularsrv/fax/faxclientandserver/Group/telephony_fax.mrp"/>
-</component>
-</collection>
-<collection name="smsprotocols" long-name="SMS Protocols" level="framework">
-<component name="smsstack" long-name="SMS Stack" introduced="6.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/cellularsrv/smsprotocols/smsstack/group" mrp="os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
-</component>
-</collection>
-<collection name="telephonyprotocols" long-name="Telephony Protocols" level="framework">
-<component name="csdagt" long-name="CSD AGT" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/csdagt/group" mrp="os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
-</component>
-<component name="psdagt" long-name="PSD AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/psdagt/group" mrp="os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
-</component>
-<component name="gprsumtsqosprt" long-name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
-</component>
-<component name="gprsumtsqosinterface" long-name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
-</component>
-<component name="qosextnapi" long-name="QoS Extn API" introduced="9.2" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
-</component>
-<component name="secondarypdpcontextumtsdriver" long-name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
-</component>
-<component name="qos3gppcpr" long-name="QoS 3GPP CPR" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
-</component>
-<component name="pdplayer" long-name="PDP Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/pdplayer/group" mrp="os/cellularsrv/telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
-</component>
-<component name="rawipnif" long-name="Raw IP NIF" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserver" long-name="Telephony Server" level="server">
-<component name="etelserverandcore" long-name="ETel Server and Core" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
-</component>
-<component name="etelmultimode" long-name="ETel Multimode" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelmultimode/group" mrp="os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
-</component>
-<component name="etelpacketdata" long-name="ETel Packet Data" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
-</component>
-<component name="etelsimtoolkit" long-name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
-<component name="common_tsy" long-name="Common TSY" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
-</component>
-<component name="licenseetsystub" long-name="Licensee TSY Stub" introduced="^2" purpose="development" filter="sf_build" plugin="Y">
-<unit mrp="os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="os/cellularsrv/telephonyserverplugins/licenseetsystub/group"/>
-</component>
-<component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
-</component>
-<component name="simtsy" long-name="SIM TSY" introduced="7.0" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
-</component>
-<component name="ctsydispatchlayer" long-name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
-</component>
-<component name="simatktsy" long-name="SIMATK TSY" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simatktsy/group" mrp="os/cellularsrv/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
-</component>
-</collection>
-<collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
-<component name="dial" long-name="Dial" deprecated="9.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyutils/dial/group" mrp="os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
-</component>
-<component name="telephonywatchers" long-name="Telephony Watchers" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
-</component>
-<component name="etel3rdpartyapi" long-name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrv_info" long-name="Cellular Baseband Services Info" level="app-if">
-<component name="telephonyconfidentialdocs" long-name="Telephony Confidential Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
-</component>
-<component name="telephonydocs" long-name="Telephony Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
-</component>
-<component name="cellularsrv_metadata" long-name="Cellular Baseband Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
-<component name="mocksy" long-name="MockSY" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if"/>
-</block>
-<block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
-<collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
-<component name="bluetooth_audio_adaptation_api" long-name="Bluetooth Audio Adaptation API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
-</component>
-<component name="bluetooth_power_management_api" long-name="Bluetooth Power Management API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_power_management_api/group"/>
-</component>
-<component name="at_command_handler_plugin_api" long-name="AT Command Handler Plugin API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/at_command_handler_plugin_api/group"/>
-</component>
-</collection>
-<collection name="bluetooth" long-name="Bluetooth Core" level="framework">
-<component name="btstack" long-name="Bluetooth Stack" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btstack" mrp="os/bt/bluetooth/btstack/bluetooth_stack.mrp"/>
-</component>
-<component name="btcomm" long-name="Bluetooth CSY" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetooth/btcomm" mrp="os/bt/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
-</component>
-<component name="btsdp" long-name="Bluetooth SDP" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btsdp" mrp="os/bt/bluetooth/btsdp/bluetooth_sdp.mrp"/>
-</component>
-<component name="btextnotifiers" long-name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btextnotifiers" mrp="os/bt/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
-</component>
-<component name="gavdp" long-name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/gavdp/group" mrp="os/bt/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
-</component>
-<component name="btlogger" long-name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btlogger/group" mrp="os/bt/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
-</component>
-<component name="btdocs" long-name="Bluetooth Documentation" purpose="development" class="doc">
-<unit mrp="os/bt/bluetooth/btdocs/bluetooth_documentation.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothmgmt" long-name="Bluetooth Management" level="plugin">
-<component name="btmgr" long-name="Bluetooth Manager" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btmgr" mrp="os/bt/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
-</component>
-<component name="btconfig" long-name="Bluetooth Config" purpose="optional" class="config">
-<unit bldFile="os/bt/bluetoothmgmt/btconfig" mrp="os/bt/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
-</component>
-<component name="btrom" long-name="Bluetooth ROM" introduced="9.1" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btrom" mrp="os/bt/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
-</component>
-<component name="bluetoothclientlib" long-name="Bluetooth Client Library" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/bluetoothclientlib" mrp="os/bt/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothcommsprofiles" long-name="Bluetooth Comms Profiles" level="app-if">
-<component name="btpan" long-name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetoothcommsprofiles/btpan/group" mrp="os/bt/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
-</component>
-</collection>
-<collection name="bthci" long-name="Host Controller Interface" level="server">
-<component name="bthci2" long-name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bthci/bthci2/group" mrp="os/bt/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
-</component>
-<component name="hciextensioninterface" long-name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bthci/hciextensioninterface" mrp="os/bt/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
-</component>
-<component name="hci2implementations" long-name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bthci/hci2implementations/group" mrp="os/bt/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
-</component>
-</collection>
-<collection name="irda" long-name="IrDA" level="plugin">
-<component name="irdastack" long-name="IrDA Stack" purpose="optional">
-<unit bldFile="os/bt/irda/irdastack/group" mrp="os/bt/irda/irdastack/group/infra-red_irda.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if"/>
-<collection name="atext" long-name="AT Extensions" level="server">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="atext_build" long-name="AT Extension Build" introduced="^3" purpose="optional" filter="s60">
-<unit bldFile="os/bt/atext/group"/>
-</component>
-</collection>
-<collection name="bt_info" long-name="Bluetooth Info" level="app-if">
-<component name="bt_metadata" long-name="Bluetooth Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/bt/bt_info/bt_metadata/bt_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
-<collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
-<!-- usbclientdrivers to be moved here from kernelhwsrv-->
-</collection>
-<collection name="usbmgmt" long-name="USB Management" level="server">
-<component name="usbmgr" long-name="USB Manager" purpose="optional">
-<unit bldFile="os/usb/usbmgmt/usbmgr/group" mrp="os/usb/usbmgmt/usbmgr/group/usb_manager.mrp" version="2"/>
-</component>
-<component name="usbclassandmgrdocs" long-name="USB Class and Manager Documentation" purpose="development" class="doc">
-<unit mrp="os/usb/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
-</component>
-</collection>
-<collection name="usb_info" long-name="USB Info" level="app-if">
-<component name="usb_metadata" long-name="USB Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/usb/usb_info/usb_metadata/usb_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="mm" level="services" long-name="Multimedia" levels="adaptation 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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-</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"/>
-</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"/>
-</component>
-<component name="aac_decoder_config_proxy_api" long-name="AAC Decoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/aac_decoder_config_proxy_api/group"/>
-</component>
-<component name="added_devsound_control_api" long-name="Added DevSound Control API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_api/group"/>
-</component>
-<component name="added_devsound_control_msg_hdlr_api" long-name="Added DevSound Control Msg Hdlr API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_msg_hdlr_api/group"/>
-</component>
-<component name="added_devsound_control_proxy_api" long-name="Added DevSound Control Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_proxy_api/group"/>
-</component>
-<component name="audio_effects_msg_hdlr_api" long-name="Audio Effects Message Handler API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_msg_hdlr_api/group"/>
-</component>
-<component name="audio_effects_proxy_api" long-name="Audio Effects Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_proxy_api/group"/>
-</component>
-<component name="audio_policy_header_api" long-name="Audio Policy Header API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="audio_routing_proxy_api" long-name="Audio Routing Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_routing_proxy_api/group"/>
-</component>
-<component name="custom_interface_builder_api" long-name="Custom Interface Builder API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_builder_api/group"/>
-</component>
-<component name="custom_interface_message_handler_factory_api" long-name="Custom Interface Message Handler Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_message_handler_factory_api/group"/>
-</component>
-<component name="custom_interface_proxy_factory_api" long-name="Custom Interface Proxy Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_proxy_factory_api/group"/>
-</component>
-<component name="custom_interface_utility_api" long-name="Custom Interface Utility API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_utility_api/group"/>
-</component>
-<component name="devsound_adaptation_api" long-name="DevSound Adaptation API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/devsound_adaptation_api/group"/>
-</component>
-<component name="display_posting_api" long-name="Display Posting API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="eaac_plus_decoder_interface_proxy_api" long-name="eAAC Plus Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="error_concealment_interface_proxy_api" long-name="Error Concealment Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
-</component>
-<component name="fm_radio_adaptation_api" long-name="FM Radio Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_decoder_interface_proxy_api" long-name="G711 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_encoder_interface_proxy_api" long-name="G711 Encoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_decoder_interface_proxy_api" long-name="G729 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_encoder_interface_msg_hdlr_api" long-name="G729 Encoder Interface Message Handler API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</component>
-<component name="ilbc_decoder_interface_proxy_api" long-name="Ilbc Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ilbc_encoder_interface_proxy_api" long-name="Ilbc Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="mdf_plugin_uids" long-name="MDF Plug-in UIDs" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/mdf_plugin_uids/group"/>
-</component>
-<component name="multimedia_fourcc_definitions_api" long-name="Multimedia FourCC Definitions API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/multimedia_fourcc_definitions_api/group"/>
-</component>
-<component name="nokia_audio_policy_header_api" long-name="Nokia Audio Policy Header API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/nokia_audio_policy_header_api/group"/>
-</component>
-<component name="nokia_multimedia_fourcc_definitions_api" long-name="Nokia Multimedia Fourcc Definitions API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ra8_decoder_interface_proxy_api" long-name="RA8 Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
-</component>
-<component name="rds_adaptation_api" long-name="RDS Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="restricted_audio_output_proxy_api" long-name="Restricted Audio Output Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="sbc_encoder_interface_proxy_api" long-name="SBC Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/sbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="secure_output_mdf_custom_interface" long-name="Secure Output MDF Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="speech_encoder_config_proxy_api" long-name="Speech Encoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/speech_encoder_config_proxy_api/group"/>
-</component>
-<component name="telephony_audio_routing_client_api" long-name="Telephony Audio Routing Client API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_client_api/group"/>
-</component>
-<component name="telephony_audio_routing_manager_api" long-name="Telephony Audio Routing Manager API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_manager_api/group"/>
-</component>
-<component name="video_buffer_management_mdf_custom_interface" long-name="Video Buffer Management MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_buffer_management_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_rotation_mdf_custom_interface" long-name="Video Decoder Rotation MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_scaling_mdf_custom_interface" long-name="Video Decoder Scaling MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
-</component>
-<component name="video_reclaim_extbuffers_ci" long-name="Video Reclaim Extbuffers Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_reclaim_extbuffers_ci/group"/>
-</component>
-<component name="video_window_control_custom_interface" long-name="Video Window Control Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="wma_decoder_interface_proxy_api" long-name="WMA Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/wma_decoder_interface_proxy_api/group"/>
-</component>
-<component name="eaacplusutil_api" long-name="EAac Plus Util API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/eaacplusutil_api/group"/>
-</component>
-<component name="frametable_api" long-name="Frametable API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/frametable_api/group"/>
-</component>
-</collection>
-<collection name="devsoundextensions" long-name="Devsound Extensions" level="device-fw">
-<component name="drmaudioplayer" filter="s60" long-name="DRM Audio Player">
-<unit bldFile="os/mm/devsoundextensions/drmaudioplayer/group"/>
-</component>
-<component name="mmextfw" filter="s60" long-name="Multimedia Extension Framework">
-<unit bldFile="os/mm/devsoundextensions/mmextfw/group"/>
-</component>
-<component name="audiorouting" filter="s60" long-name="Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/audiorouting/group"/>
-</component>
-<component name="effects" filter="s60" long-name="Effects">
-<unit bldFile="os/mm/devsoundextensions/effects/group"/>
-</component>
-<component name="effectspresets" filter="s60" long-name="Effects Presets">
-<unit bldFile="os/mm/devsoundextensions/effectspresets/group"/>
-</component>
-<component name="effectspresets_utils" filter="s60" long-name="Effects Presets Utils">
-<!-- need to #include the lot from a single bld.inf
- Also move to a standard component location, not under effectspresets -->
-<unit bldFile="os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
-<unit bldFile="os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
-</component>
-<component name="telephonyaudiorouting" filter="s60" long-name="Telephony Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/group"/>
-</component>
-<component name="mmfcustominterfaces" filter="s60" long-name="MMF Custom Interfaces">
-<unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/group"/>
-</component>
-<component name="addeddevsoundcontrol" filter="s60" long-name="Added DevSound Control">
-<unit bldFile="os/mm/devsoundextensions/addeddevsoundcontrol/group"/>
-</component>
-<component name="globalaudiosettings" filter="s60" long-name="Global Audio Settings">
-<unit bldFile="os/mm/devsoundextensions/globalaudiosettings/group"/>
-</component>
-<component name="restrictedaudiooutput" filter="s60" long-name="Restricted Audio Output">
-<unit bldFile="os/mm/devsoundextensions/restrictedaudiooutput/group"/>
-</component>
-<component name="ciextnfactoryplugins" filter="s60" long-name="Custom Interface Extension Factory Plugins" plugin="Y">
-<unit bldFile="os/mm/devsoundextensions/ciextnfactoryplugins/group"/>
-</component>
-</collection>
-<collection name="mdfdevvideoextensions" long-name="MDF Dev Video Extensions" level="device-fw">
-<component name="nga_mdf_postprocessor" long-name="NGA MDF Postprocessor" filter="s60">
-<unit bldFile="os/mm/mdfdevvideoextensions/nga_mdf_postprocessor/group"/>
-</component>
-</collection>
-<collection name="audio" long-name="Audio Codecs" level="middleware">
-<component name="arm_cmmf_codecs" filter="s60" long-name="ARM CMMF Codecs" plugin="Y">
-<unit bldFile="os/mm/audio/arm_cmmf_codecs/group"/>
-</component>
-</collection>
-<collection name="video" long-name="Video Codecs" level="middleware">
-<!-- empty -->
-</collection>
-<collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
-<component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/imagingandcamerafws/imagingfws/group" mrp="os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
-</component>
-<component name="camerafw" long-name="Camera Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/imagingandcamerafws/camerafw/group" mrp="os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
-</component>
-</collection>
-<collection name="mmlibs" long-name="Multimedia Libraries" level="middleware">
-<component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmutilitylib/group" mrp="os/mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
-</component>
-<component name="mmfw" long-name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmfw/group" mrp="os/mm/mmlibs/mmfw/group/multimedia_mmf.mrp"/>
-</component>
-</collection>
-<collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
-<component name="imagingplugins" long-name="Imaging Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/imagingplugins/group" mrp="os/mm/mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
-</component>
-<component name="cameraplugins" long-name="Camera Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/cameraplugins/group" mrp="os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
-</component>
-<component name="lib3gp" long-name="3GP Library" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/mmplugins/lib3gp/group" mrp="os/mm/mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
-</component>
-<component name="mmfwplugins" long-name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/mmfwplugins/group" mrp="os/mm/mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
-</component>
-</collection>
-<collection name="mm_info" long-name="Multimedia Info" level="app-if">
-<component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc">
-<unit mrp="os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
-</component>
-<component name="mm_metadata" long-name="Multimedia Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
-<component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="^2" purpose="development">
-<unit bldFile="os/mm/mmresourcemgmt/mmresctrl/group" mrp="os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
-</component>
-</collection>
-<collection name="mmdevicefw" long-name="Multimedia Device Framework" level="device-fw">
-<component name="mdf" long-name="Media Device Framework" introduced="9.2" purpose="mandatory">
-<unit bldFile="os/mm/mmdevicefw/mdf/group" mrp="os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
-</component>
-<component name="speechrecogsupport" long-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 name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
-<component name="videorenderer" long-name="Video Renderer" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/mmswadaptation/videorenderer/group" mrp="os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
-</component>
-</collection>
-<collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw"/>
-<collection name="omxil" long-name="OpenMAX IL" level="hw-if">
-<component name="omxilapi" long-name="OpenMAX IL API" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilapi/group" mrp="os/mm/omxil/omxilapi/group/multimedia_omx_il_api.mrp" version="1"/>
-</component>
-<component name="omxilcore" long-name="OpenMAX IL Core" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcore/group" mrp="os/mm/omxil/omxilcore/group/multimedia_omx_il_core.mrp" version="1"/>
-</component>
-<component name="omxilcomponentcommon" long-name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcomponentcommon/group" mrp="os/mm/omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp" version="1"/>
-</component>
-<component name="omxilrefcomps" long-name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilrefcomps/ref_components/group" mrp="os/mm/omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp" version="1"/>
-</component>
-<component name="mmilapi" long-name="Multimedia Integration Layer API" introduced="^3" purpose="development">
-<unit bldFile="os/mm/omxil/mmilapi/group" mrp="os/mm/omxil/mmilapi/group/multimedia_il_api.mrp"/>
-</component>
-</collection>
-<collection name="devsound" long-name="Sound Device" level="devices">
-<component name="devsoundapi" long-name="DevSound API" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/devsound/devsoundapi/group" mrp="os/mm/devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
-</component>
-<component name="a3fdevsound" long-name="A3F DevSound" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3fdevsound/group" mrp="os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
-</component>
-<component name="a3facf" long-name="A3F Audio Component Framework" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3facf/group" mrp="os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
-</component>
-<component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/devsound/devsoundpluginsupport/group" mrp="os/mm/devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
-</component>
-<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">
-<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">
-<unit bldFile="os/mm/devsound/a3ftrace/group" mrp="os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
-</component>
-<component name="a3fsrvstart" long-name="A3F Server Start" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
-</component>
-</collection>
-<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
-<component name="devsoundhwdeviceapi" long-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 name="a3facl" long-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 name="a3fdevsoundcustomisation" long-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"/>
-</component>
-<component name="refacladapt" long-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"/>
-</component>
-<component name="videohai" long-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 name="dvbhreceiverhai" long-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>
-</block>
-<block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
-<collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
-<component name="exif_api" long-name="Exif API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagingext_plat" long-name="Imaging Extensions Platform Interfaces" level="app-if">
-<component name="jpeg2000_icl_plugin_api" long-name="JPEG2000 ICL plugin API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/jpeg2000_icl_plugin_api/group"/>
-</component>
-<component name="extended_icl_jpeg_api" long-name="Extended ICL Jpeg API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
-</component>
-<component name="h324_annex_k_custom_api" long-name="H324 Annex K Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/h324_annex_k_custom_api/group"/>
-</component>
-<component name="ecam_orientation_custom_api" long-name="ECam Orientation Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_orientation_custom_api/group"/>
-</component>
-<component name="ecam_ui_orientation_override_custom_api" long-name="ECam UI Orientation Override Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
-</component>
-<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>
-</collection>
-<collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
-<component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
-<unit bldFile="os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
-</component>
-<component name="imageadaptationextensions_build" filter="s60" long-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"/>
-</component>
-</collection>
-<collection name="imagingmodules" long-name="Imaging Modules" level="hw-if">
-<component name="exiflib" filter="s60" long-name="Exif Library">
-<unit bldFile="os/imagingext/imagingmodules/exiflib/group"/>
-</component>
-<component name="jp2kcodec" filter="s60" long-name="JPEG2000 Decoder Plugin" plugin="Y">
-<unit bldFile="os/imagingext/imagingmodules/jp2kcodec/group"/>
-</component>
-</collection>
-</block>
-<block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
-<component name="vgi" filter="s60" long-name="VGI">
-<unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
-</component>
-</collection>
-<collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adaptations">
-<component name="m3gcore11" filter="s60" long-name="M3G Core 1.1">
-<unit bldFile="os/graphics/m3g/m3gcore11/group"/>
-</component>
-</collection>
-<collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines">
-<component name="graphicsresource" long-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 name="graphicsresourceadaptation" long-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"/>
-</component>
-</collection>
-<collection name="graphicsutils" long-name="Graphics Utils" level="engines">
-<component name="commongraphicsheaders" long-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 name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
-<!-- displayldd to be moved here -->
-<component name="surfacemgr" long-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 name="graphicscomposition" long-name="Graphics Composition" level="engines">
-<component name="openwfcinterface" long-name="OpenWF Composition Interface" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfcinterface/group" mrp="os/graphics/graphicscomposition/openwfcinterface/group/graphics_openwfcinterface.mrp"/>
-</component>
-<component name="openwfcompositionengine" long-name="OpenWF Composition Engine" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/graphicscomposition/openwfcompositionengine/group" mrp="os/graphics/graphicscomposition/openwfcompositionengine/group/graphics_openwfcompositionengine.mrp"/>
-</component>
-<component name="openwfsupport" long-name="OpenWF Support" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfsupport/group" mrp="os/graphics/graphicscomposition/openwfsupport/group/graphics_openwfsupport.mrp"/>
-</component>
-<component name="surfaceupdate" long-name="Surface Update" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/surfaceupdate/group" mrp="os/graphics/graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
-</component>
-</collection>
-<collection name="graphicstest" long-name="Graphics Test" level="app-if">
-<component name="uibench" long-name="UI Bench" introduced="9.2" purpose="development">
-<unit bldFile="os/graphics/graphicstest/uibench/group" mrp="os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
-</component>
-</collection>
-<collection name="graphics_plat" long-name="Graphics Platform Interfaces" level="app-if">
-<component name="m3g_core_api" filter="sf_build" long-name="M3G Core API" class="api">
-<unit bldFile="os/graphics/graphics_plat/m3g_core_api/group"/>
-</component>
-</collection>
-<collection name="graphics_info" long-name="Graphics Info" level="app-if">
-<component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc">
-<unit mrp="os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
-</component>
-<component name="graphics_metadata" long-name="Graphics Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
-</component>
-</collection>
-<collection name="windowing" long-name="Windowing" level="app-if">
-<component name="windowserver" long-name="Window Server" purpose="mandatory">
-<unit bldFile="os/graphics/windowing/windowserver/group" mrp="os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
-</component>
-<component name="windowserverplugins" long-name="Window Server Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/windowing/windowserverplugins/group" mrp="os/graphics/windowing/windowserverplugins/group/graphics_wserv_std_plugins.mrp"/>
-</component>
-</collection>
-<collection name="printingservices" long-name="Printing Services" level="app-if">
-<component name="printerdriversupport" long-name="Printer Driver Support" purpose="optional">
-<unit bldFile="os/graphics/printingservices/printerdriversupport/group" mrp="os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
-</component>
-<component name="printerdrivers" long-name="Printer Drivers" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/printingservices/printerdrivers/group" mrp="os/graphics/printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
-</component>
-</collection>
-<collection name="fbs" long-name="Font and Bitmap Server" level="device-interface">
-<component name="fontandbitmapserver" long-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 name="opengles" long-name="OpenGLES" level="internal-adaptations">
-<component name="openglesinterface" long-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 name="opengles_stub" filter="sf_build" long-name="OpenGL ES Stub" purpose="optional" introduced="^2">
-<unit bldFile="os/graphics/opengles/openglesinterface/group/opengles_stub"/>
-</component>
-</collection>
-<collection name="openvg" long-name="OpenVG" level="internal-adaptations">
-<component name="openvginterface" long-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 name="openvg11" filter="s60" long-name="OpenVG 1.1">
-<!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
-<unit bldFile="os/graphics/openvg/openvginterface/group/openvg11"/>
-</component>
-<component name="sfopenvg" filter="sf_build" long-name="Khronos OpenVG Reference Implementation" introduced="^2" purpose="optional">
-<unit bldFile="os/graphics/openvg/openvgrefimplementation/sfopenvg/group"/>
-</component>
-</collection>
-<collection name="egl" long-name="EGL" level="internal-adaptations">
-<component name="eglinterface" long-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 name="eglswitch" long-name="EGL Switch" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglswitch/group" mrp="os/graphics/egl/eglswitch/group/graphics_eglswitch.mrp"/>
-</component>
-<component name="eglrefimpl" long-name="EGL Reference Implementation" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglrefimpl/group" mrp="os/graphics/egl/eglrefimpl/group/graphics_eglrefimpl.mrp"/>
-</component>
-<component name="egltest" long-name="EGL Tests" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/egl/egltest/group" mrp="os/graphics/egl/egltest/group/graphics_egltest.mrp"/>
-</component>
-</collection>
-<collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
-<component name="gdi" long-name="GDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/gdi/group" mrp="os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
-</component>
-<component name="bitgdi" long-name="BitGDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
-</component>
-<component name="colourpalette" long-name="Colour Palette" introduced="7.0s" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
-</component>
-<component name="screendriver" long-name="Screen Driver" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/graphicsdeviceinterface/screendriver/group" mrp="os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
-</component>
-<component name="directgdi" long-name="DirectGDI" introduced="^3" deprecated="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/directgdi/group" mrp="os/graphics/graphicsdeviceinterface/directgdi/group/graphics_directgdi.mrp"/>
-</component>
-<component name="directgdiinterface" long-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 name="directgdiadaptation" long-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"/>
-</component>
-</collection>
-<collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
-<component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/gdi_tools/group" mrp="os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
-</component>
-</collection>
-<collection name="graphicsapitest" long-name="Graphics API Tests" level="app-if"/>
-</block>
-<block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
-<collection name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" level="text">
-<component name="findutil_api" long-name="Find Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/findutil_api/group"/>
-</component>
-<component name="japanese_language_utilities_api" long-name="Japanese Language Utilities API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
-</component>
-<component name="sortutil_api" long-name="Sorting Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/sortutil_api/group"/>
-</component>
-</collection>
-<collection name="textandloc_pub" long-name="Text and Localisation Public Interfaces" level="text">
-<component name="directory_localizer_api" long-name="Directory Localizer API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_pub/directory_localizer_api/group"/>
-</component>
-</collection>
-<collection name="charconvfw" long-name="Character Conversion" level="encoding">
-<component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional">
-<unit bldFile="os/textandloc/charconvfw/charconv_fw/group" mrp="os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
-</component>
-<component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/charconvplugins/group" mrp="os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
-</component>
-<component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/fatfilenameconversionplugins/group" mrp="os/textandloc/charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
-</component>
-</collection>
-<collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
-<component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/textshaperplugin/group" mrp="os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
-</component>
-<component name="fontstore" long-name="Font Store" purpose="mandatory">
-<unit bldFile="os/textandloc/fontservices/fontstore/group" mrp="os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
-</component>
-<component name="textrendering" long-name="Text Rendering" purpose="mandatory" class="placeholder">
-<!-- placeholder for text code from GDI -->
-</component>
-<component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/freetypefontrasteriser/group" mrp="os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
-</component>
-<component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional">
-<unit bldFile="os/textandloc/fontservices/referencefonts/group" mrp="os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
-</component>
-</collection>
-<collection name="textlayout" long-name="Text Layout" level="text">
-<component name="texthandling" long-name="Text Handling" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/texthandling/group" mrp="os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
-</component>
-<component name="textformatting" long-name="Text Formatting" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/textformatting/group" mrp="os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
-</component>
-</collection>
-<collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
-<!-- components in this collection need to be moved to the right collection.
- Either move into the units' directories, or create a new textandlocutils directory -->
-<component name="numbergrouping" filter="s60" long-name="Number Grouping">
-<unit bldFile="os/textandloc/charconvfw/numbergrouping/group"/>
-</component>
-<component name="jplangutil" filter="s60" long-name="Japanese Language Utilities">
-<unit bldFile="os/textandloc/charconvfw/jplangutil/group"/>
-</component>
-<component name="sortutil" filter="s60" long-name="Sorting Utility">
-<unit bldFile="os/textandloc/charconvfw/sortutil/group"/>
-</component>
-<component name="inlinetext" filter="s60" long-name="Inline Text">
-<unit bldFile="os/textandloc/charconvfw/inlinetext/group"/>
-</component>
-<component name="nearestlangutil" long-name="Nearest Language Util" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-<component name="numberformatting" long-name="Number Formatting" introduced="7.0s" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/numberformatting/group" mrp="os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
-</component>
-</collection>
-<collection name="localesupport" long-name="Locale Support" level="util">
-<component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/localisation/localesupport" mrp="os/textandloc/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
-</component>
-<component name="initlocale" long-name="Initialise Locale" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-</collection>
-<collection name="textandloctools" long-name="Text and Localisation Tools" level="tools">
-<component name="fontcompiler" long-name="Font Compiler" purpose="development" class="placeholder PC">
-<!-- placeholder for split from GDI Tools -->
-</component>
-<component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/bitmapfonttools/group" mrp="os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
-</component>
-</collection>
-<collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
-<component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
-<collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
-<component name="xmlsrv_plat_build" long-name="XML Services Platform Interface Build" filter="s60" class="api">
-<!-- need to fix the configuration used here.
- Either destribute to other components or use the new feature flags confguration mechanisms.
- Remove this component and uncomment the other units when fixed-->
-<unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
-</component>
-<component name="xml_encryption_api" long-name="XML Encryption API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/> -->
-</component>
-<component name="xml_signature_api" long-name="XML Signature API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_signature_api/group"/> -->
-</component>
-<component name="xml_security_engine_utils_api" long-name="XML Security Engine Utils API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/> -->
-</component>
-</collection>
-<collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
-<component name="xmlseccertman" filter="s60" long-name="XML Security Certificate Manager">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
-</component>
-<component name="xmlsec" filter="s60" long-name="XML Security">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsec/group"/>
-</component>
-<component name="xmlseccrypto" filter="s60" long-name="XML Security Crypto">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccrypto/group"/>
-</component>
-<component name="xmlsecwrapper" filter="s60" long-name="XML Security Wrapper">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsecwrapper/group"/>
-</component>
-</collection>
-<collection name="xml" long-name="XML" level="generic">
-<component name="xmlfw" long-name="XML Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmlfw/group" mrp="os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
-</component>
-<component name="libxml2libs" long-name="Libxml2 Libraries" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/libxml2libs/group" mrp="os/xmlsrv/xml/libxml2libs/group/syslibs_libxml2.mrp"/>
-</component>
-<component name="legacyminidomparser" long-name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/legacyminidomparser/GROUP" mrp="os/xmlsrv/xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp"/>
-</component>
-<component name="xmldomandxpath" long-name="XML DOM and XPath" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmldomandxpath/group" mrp="os/xmlsrv/xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
-</component>
-<component name="xmlexpatparser" long-name="XML Expat Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmlexpatparser/group" mrp="os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
-</component>
-<component name="xmllibxml2parser" long-name="XML Libxml2 Parser" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmllibxml2parser/group" mrp="os/xmlsrv/xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
-</component>
-<component name="wbxmlparser" long-name="WBXML Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/wbxmlparser/group" mrp="os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
-</component>
-</collection>
-<collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
-<component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="deviceplatformrelease" level="services" long-name="Device Platform Release" levels="bld mid top">
-<collection name="s60extras" long-name="S60 Extras" level="mid">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="s60extras_build" filter="s60" long-name="S60 Extras Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/S60Extras/group"/>
-</component>
-</collection>
-<collection name="locfiles" long-name="Locale Files" level="mid">
-<component name="locfiles_build" filter="s60" long-name="S60 Locale Files Build" purpose="development" class="config">
-<!-- need to move component down a directory -->
-<unit bldFile="os/deviceplatformrelease/locfiles/group"/>
-</component>
-<component name="locfiles_set1" long-name="Locale Files Set 1" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set1"/>
-</component>
-<component name="locfiles_set2" long-name="Locale Files Set 2" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set2"/>
-</component>
-<component name="locfiles_set3" long-name="Locale Files Set 3" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set3"/>
-</component>
-<component name="locfiles_set4" long-name="Locale Files Set 4" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set4"/>
-</component>
-<component name="locfiles_set5" long-name="Locale Files Set 5" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set5"/>
-</component>
-<component name="locfiles_set6" long-name="Locale Files Set 6" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set6"/>
-</component>
-<!-- is the a problem with SF builds with the following? -->
-<component name="locfiles_set7" long-name="Locale Files Set 7" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set7"/>
-</component>
-<component name="locfiles_set8" long-name="Locale Files Set 8" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set8"/>
-</component>
-<component name="locfiles_set9" long-name="Locale Files Set 9" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set9"/>
-</component>
-<component name="locfiles_set10" long-name="Locale Files Set 10" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set10"/>
-</component>
-<component name="locfiles_set11" long-name="Locale Files Set 11" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set11"/>
-</component>
-<component name="locfiles_set12" long-name="Locale Files Set 12" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set12"/>
-</component>
-<component name="locfiles_set13" long-name="Locale Files Set 13" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set13"/>
-</component>
-<component name="locfiles_set14" long-name="Locale Files Set 14" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set14"/>
-</component>
-<component name="locfiles_set15" long-name="Locale Files Set 15" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set15"/>
-</component>
-<component name="locfiles_set16" long-name="Locale Files Set 16" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set16"/>
-</component>
-</collection>
-<collection name="version" long-name="Version" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="version_build" filter="s60" long-name="Version Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/Version/group"/>
-</component>
-</collection>
-<collection name="helps_loc2" long-name="Helps Locale 2" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helps_loc2_build" long-name="Helps Locale 2 Build" filter="s60">
-<unit bldFile="os/deviceplatformrelease/helps_loc2/group"/>
-</component>
-</collection>
-<collection name="sf_config" long-name="SF Config" level="mid">
-<component name="config" filter="s60" long-name="Config" purpose="development" class="config"/>
-<component name="cenrep" filter="sf_build" long-name="ConE Central Repository Config" purpose="development" class="config">
-<!-- will shoudl give the id/path something more unique than cenrep -->
-<unit bldFile="os/deviceplatformrelease/sf_config/cenrep/group"/>
-</component>
-</collection>
-<!-- should be located locally in buildplatforms/group
- <collection id="s60bld" name="S60 Build">
- <component id="buildplatforms" filter="s60" name="Build Platforms">
- <unit bldFile="/tools/buildplatforms/group"/>
- </component>
- </collection>-->
-<collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
-<component name="cedarutils" long-name="Cedar Utils" purpose="development">
-<unit mrp="os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
-</component>
-<component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt" purpose="development" class="config">
-<unit mrp="os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
-</component>
-<component name="foundation_s60_packages" long-name="Foundation S60 Packages" introduced="^3" deprecated="^3" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/symbianosbld/foundation_s60_packages/foundation_s60_packages.mrp"/>
-</component>
-</collection>
-<collection name="foundation_system" long-name="Foundation System" level="top">
-<component name="system_model" long-name="System Model" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
-</component>
-</collection>
-<collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
-<component name="deviceplatformrelease_metadata" long-name="Device Platform Release Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="osrndtools" level="services" long-name="OS R&D tools" levels="fw trace">
-<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"/>
-</component>
-<component name="testinterface" filter="s60" long-name="Test Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/testinterface/group"/>
-</component>
-<component name="testserver" filter="s60" long-name="Test Server" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserver/group"/>
-</component>
-<component name="testengine" filter="s60" long-name="Test Engine" purpose="development">
-<unit bldFile="os/osrndtools/stif/testengine/group"/>
-</component>
-<component name="testserverstarter" filter="s60" long-name="Test Server Starter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserverstarter/group"/>
-</component>
-<component name="stiftfwif" filter="s60" long-name="STIF Test Framework Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/stiftfwif/group"/>
-</component>
-<component name="consoleui" filter="s60" long-name="Console UI" purpose="development">
-<unit bldFile="os/osrndtools/stif/consoleui/group"/>
-</component>
-<component name="testcombiner" filter="s60" long-name="Test Combiner" purpose="development">
-<unit bldFile="os/osrndtools/stif/testcombiner/group"/>
-</component>
-<component name="demomodule" filter="s60" long-name="Demo Module" purpose="development">
-<unit bldFile="os/osrndtools/stif/demomodule/group"/>
-</component>
-<component name="atslogger" filter="s60" long-name="ATS Logger" purpose="development">
-<unit bldFile="os/osrndtools/stif/atslogger/group"/>
-</component>
-<component name="atsinterface" filter="s60" long-name="ATS Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/atsinterface/group"/>
-</component>
-<component name="testscripter" filter="s60" long-name="Test Scripter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testscripter/group"/>
-</component>
-<component name="suevent" filter="s60" long-name="SU Event" purpose="development">
-<unit bldFile="os/osrndtools/stif/suevent/group"/>
-</component>
-<component name="stifkerneltestclassbase" filter="s60" long-name="STIF Kernel Test Class Base" purpose="development">
-<!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
-<!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
-</component>
-<component name="stif_build" filter="s60" long-name="STIF Build" purpose="development">
-<!-- move exports into self-contained component. Remove this when configuration is in place-->
-<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">
-<unit bldFile="os/osrndtools/memspy/memspy_plat/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/engine/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/console/group"/>
-</component>
-<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>
-</collection>
-<collection name="hti" long-name="Harmonized Test Interface" level="trace">
-<component name="hti_plat" filter="s60" long-name="HTI Platform Interfaces" purpose="development" class="api">
-<unit bldFile="os/osrndtools/hti/hti_plat/group"/>
-</component>
-<component name="hticfg" filter="s60" long-name="HTI Config" purpose="development">
-<unit bldFile="os/osrndtools/hti/hticfg/group"/>
-</component>
-<component name="htiautostart" filter="s60" long-name="HTI Autostart" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiautostart/group"/>
-</component>
-<component name="htiframework" filter="s60" long-name="HTI Framework" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiframework/group"/>
-</component>
-<component name="hticommplugins" filter="s60" long-name="HTI Communication Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
-</component>
-<component name="htiserviceplugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
-</component>
-<component name="htifilehlp" filter="s60" long-name="HTI File Help" purpose="development">
-<unit bldFile="os/osrndtools/hti/htifilehlp/group"/>
-</component>
-<component name="htiwatchdog" filter="s60" long-name="HTI Watchdog" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiwatchdog/group"/>
-</component>
-<component name="hti_build" filter="s60" long-name="HTI Build" purpose="development">
-<!-- move exports into self-contained component.-->
-<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">
-<block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
-<collection name="appsupport_pub" long-name="Generic Application Support Public Interfaces" level="specific">
-<component name="flash_viewer_framework_api" long-name="Flash Viewer Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
-</component>
-<component name="network_status_api" long-name="Network Status API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/network_status_api/group"/>
-</component>
-</collection>
-<collection name="appsupport_plat" long-name="Generic Application Support Platform Interfaces" level="specific">
-<component name="action_plugin_api" long-name="Action Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/action_plugin_api/group"/>
-</component>
-<component name="application_orientation_api" long-name="Application Orientation API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/application_orientation_api/group"/>
-</component>
-<component name="context_access_api" long-name="Context Access API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_access_api/group"/>
-</component>
-<component name="context_framework_services_api" long-name="Context Framework Services API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_services_api/group"/>
-</component>
-<component name="context_framework_client_api" long-name="Context Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_client_api/group"/>
-</component>
-<component name="context_framework_listener_api" long-name="Context Framework Listener API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_listener_api/group"/>
-</component>
-<component name="context_framework_version_api" long-name="Context Framework Version API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_version_api/group"/>
-</component>
-<component name="context_source_plugin_api" long-name="Context Source Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_plugin_api/group"/>
-</component>
-<component name="context_source_settings_manager_api" long-name="Context Source Settings Manager API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_settings_manager_api/group"/>
-</component>
-<component name="context_subscription_api" long-name="Context Subscription API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_subscription_api/group"/>
-</component>
-<component name="key_event_framework_api" long-name="Key Event Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_api/group"/>
-</component>
-<component name="key_event_framework_mapper_api" long-name="Key Event Framework Mapper API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_mapper_api/group"/>
-</component>
-<component name="media_keys_definition_api" long-name="Media Keys Definition API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/media_keys_definition_api/group"/>
-</component>
-<component name="ood_threshold_api" long-name="OOD Threshold API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/ood_threshold_api/group"/>
-</component>
-<component name="oom_monitor_api" long-name="OOM Monitor API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_api/group"/>
-</component>
-<component name="oom_monitor_plugin_api" long-name="OOM Monitor Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_plugin_api/group"/>
-</component>
-<component name="operation_provider_api" long-name="Operation Provider API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/operation_provider_api/group"/>
-</component>
-<component name="phonecmdhandler_api" long-name="Phone Command Handler API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/phonecmdhandler_api/group"/>
-</component>
-<component name="restore_factory_settings_api" long-name="Restore Factory Settings API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_api/group"/>
-</component>
-<component name="restore_factory_settings_plugin_api" long-name="Restore Factory Settings Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_plugin_api/group"/>
-</component>
-<component name="secondary_display_accfw_api" long-name="Secondary Display Accessory Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_accfw_api/group"/>
-</component>
-<component name="secondary_display_startup_api" long-name="Secondary Display Startup API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_startup_api/group"/>
-</component>
-<component name="secondary_display_sysap_api" long-name="Secondary Display System Application API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_sysap_api/group"/>
-</component>
-<component name="secondary_display_system_state_api" long-name="Secondary Display System State API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_system_state_api/group"/>
-</component>
-<component name="sensor_user_setting_api" long-name="Sensor User Setting API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/sensor_user_setting_api/group"/>
-</component>
-<component name="startup_configuration_api" long-name="Startup Configuration API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/startup_configuration_api/group"/>
-</component>
-<component name="system_application_key_handler_plugin_api" long-name="System Application Key Handler Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_key_handler_plugin_api/group"/>
-</component>
-<component name="system_application_light_control_plugin_api" long-name="System Application Light Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_light_control_plugin_api/group"/>
-</component>
-<component name="system_application_notification_api" long-name="System Application Notification API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_notification_api/group"/>
-</component>
-<component name="system_application_plugin_callback_api" long-name="System Application Plug-in Callback API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
-</component>
-</collection>
-<collection name="contextframework" long-name="Context Framework" level="framework">
-<!-- the units that are commented out need to be put back when configuration is in place.
- They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
-<component name="cfw" filter="s60" long-name="Context Framework">
-<!--<unit bldFile="contextframework/cfw/group"/> -->
-</component>
-<component name="cfwplugins" filter="s60" long-name="Context Framework Plugins" plugin="Y">
-<!--<unit bldFile="contextframework/cfwplugins/group"/>-->
-</component>
-<component name="contextframework_build" filter="s60" long-name="Context Framework Build">
-<unit bldFile="mw/appsupport/contextframework/group"/>
-</component>
-</collection>
-<collection name="coreapplicationuis" long-name="Core Application UIs" level="server">
-<component name="dbrecovery" filter="s60" long-name="Database Recovery">
-<unit bldFile="mw/appsupport/coreapplicationuis/dbrecovery/group"/>
-</component>
-<component name="nspswsplugin" filter="s60" long-name="NSPS WS Plugin" plugin="Y">
-<!-- No Service Power Save? Window Server? Please elaborate-->
-<unit bldFile="mw/appsupport/coreapplicationuis/nspswsplugin/group"/>
-</component>
-<component name="rfs" filter="s60" long-name="Restore Factory Settings">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfs/group"/>
-</component>
-<component name="rfsplugins" filter="s60" long-name="Restore Factory Settings Plugins" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/group"/>
-</component>
-<component name="sysap" filter="s60" long-name="System Application">
-<unit bldFile="mw/appsupport/coreapplicationuis/sysap/group"/>
-</component>
-<component name="variatedsettings" filter="s60" long-name="Variated Settings" class="config">
-<unit bldFile="mw/appsupport/coreapplicationuis/variatedsettings/group"/>
-</component>
-<component name="accfwuinotifier" filter="s60" long-name="Accessory Framework UI Notifier" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/accfwuinotifier/group"/>
-</component>
-<component name="kefmapper" filter="s60" long-name="Key Event Framework">
-<unit bldFile="mw/appsupport/coreapplicationuis/kefmapper/group"/>
-</component>
-<component name="advancedtspcontroller" filter="s60" long-name="Advanced TSP Controller">
-<unit bldFile="mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
-</component>
-<component name="powersaveutilities" filter="s60" long-name="Power Save Utilities">
-<unit bldFile="mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
-</component>
-<component name="gsserverenginestub" filter="s60" long-name="GS Server Engine Stub">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
-</component>
-<component name="gsserverengine" filter="s60" long-name="GS Server Engine">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverengine/group"/>
-</component>
-<component name="sensordatacompensatorplugin" filter="s60" long-name="Sensor Data Compensator Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/group"/>
-</component>
-</collection>
-<collection name="flashliteapi_3_1" long-name="Flash Lite API 3.1" level="specific">
-<!-- collection is really a component. Move down a directory -->
-<component name="flashliteapi_3_1_build" long-name="Flash Lite API Build" filter="s60" introduced="^2"/>
-</collection>
-<collection name="mediakeys" long-name="Media Keys" level="plugin">
-<!-- collection is really a component. Move down a directory -->
-<component name="mediakeys_build" filter="s60" long-name="Media Keys Build">
-<unit bldFile="mw/appsupport/mediakeys/group"/>
-</component>
-</collection>
-<collection name="startupservices" long-name="Startup Services" level="system">
-<component name="splashscreen" filter="s60" long-name="Splash Screen">
-<unit bldFile="mw/appsupport/startupservices/splashscreen/group"/>
-</component>
-<component name="startupanimation" filter="s60" long-name="Startup Animation">
-<unit bldFile="mw/appsupport/startupservices/startupanimation/group"/>
-</component>
-<component name="startup" long-name="Startup Application" filter="s60">
-<unit bldFile="mw/appsupport/startupservices/startup/group"/>
-</component>
-</collection>
-<collection name="sysresmonitoring" long-name="System Resource Monitoring" level="system">
-<component name="oodmonitor" filter="s60" long-name="OOD Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oodmonitor/group"/>
-</component>
-<component name="oommonitor" filter="s60" long-name="OOM Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oommonitor/group"/>
-</component>
-</collection>
-<collection name="systemsettings" long-name="System Settings" level="system">
-<component name="gssensorplugin" filter="s60" long-name="GS Sensor Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gssensorplugin/group"/>
-</component>
-<component name="gsaccessoryplugin" filter="s60" long-name="GS Accessory Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gsaccessoryplugin/group"/>
-</component>
-</collection>
-<collection name="filehandling" long-name="File Handling" level="server">
-<component name="fileconverterfw" long-name="File Converter Framework" purpose="optional">
-<unit bldFile="mw/appsupport/filehandling/fileconverterfw/group" mrp="mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
-</component>
-<component name="htmltorichtextconverter" long-name="HTML to RichText Converter" introduced="7.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/htmltorichtextconverter/group" mrp="mw/appsupport/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
-</component>
-<component name="richtexttohtmlconverter" long-name="RichText to HTML Converter" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
-</component>
-</collection>
-<collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
-<component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
-</component>
-</collection>
-<collection name="commonappservices" long-name="Common Application Services" level="framework">
-<component name="alarmserver" long-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"/>
-</component>
-<component name="alarmservertest" long-name="Alarm Server Test" deprecated="^3" introduced="8.1" purpose="development">
-<unit bldFile="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
-</component>
-<component name="appservicesdocs" long-name="Application Services Documentation" purpose="development" class="doc">
-<unit mrp="mw/appsupport/commonappservices/appservicesdocs/app-services_documentation.mrp"/>
-</component>
-<component name="backuprestorenotification" long-name="Backup Restore Notification" introduced="8.1" purpose="optional">
-<unit bldFile="mw/appsupport/commonappservices/backuprestorenotification/group" mrp="mw/appsupport/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
-</component>
-</collection>
-<collection name="tzservices" long-name="Time Zone Services" level="plugin">
-<component name="tzserver" long-name="Time Zone Server" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzserver/group" mrp="mw/appsupport/tzservices/tzserver/group/app-services_tz.mrp"/>
-</component>
-<component name="tzloc" long-name="Time Zone Localization" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzloc/group" mrp="mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
-</component>
-<component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzlocrscfactory/group" mrp="mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
-</component>
-<component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzdatabase/group" mrp="mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
-</component>
-</collection>
-<collection name="contenthandling" long-name="Content Handling" level="plugin">
-<component name="webrecognisers" long-name="Web Recognisers" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/contenthandling/webrecognisers/group" mrp="mw/appsupport/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
-</component>
-</collection>
-<collection name="openenvutils" long-name="Open Environment Utilities" level="specific">
-<component name="commandshell" long-name="Command Shell" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/commandshell/group" mrp="mw/appsupport/openenvutils/commandshell/group/oetools_zsh.mrp"/>
-</component>
-<component name="telnetserver" long-name="Telnet Server" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/telnetserver/group" mrp="mw/appsupport/openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
-</component>
-</collection>
-<collection name="printingsupport" long-name="Printing Support" level="generic">
-<component name="printinguisupport" long-name="Printing UI Support" purpose="optional" introduced="^2" deprecated="^3">
-<unit bldFile="mw/appsupport/printingsupport/printinguisupport/group" mrp="mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
-</component>
-</collection>
-<collection name="appfw" long-name="Application Framework" level="framework">
-<component name="apparchitecture" long-name="Application Architecture" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/apparchitecture/group" mrp="mw/appsupport/appfw/apparchitecture/group/app-framework_apparc.mrp"/>
-</component>
-<component name="viewserver" long-name="View Server" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/viewserver/group" mrp="mw/appsupport/appfw/viewserver/group/app-framework_viewsrv.mrp"/>
-</component>
-</collection>
-<collection name="applaunchservices" long-name="Application Launch Services" level="generic">
-<component name="aftermarketappstarter" long-name="After Market Application Starter" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/aftermarketappstarter/group" mrp="mw/appsupport/applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
-</component>
-<component name="applaunchplugins" long-name="Application Launch Plugins" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/applaunchplugins/group" mrp="mw/appsupport/applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
-</component>
-</collection>
-<collection name="tzpcside" long-name="Time Zone PC Side" level="plugin">
-<component name="tzcompiler" long-name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config PC">
-<unit bldFile="mw/appsupport/tzpcside/tzcompiler/group" mrp="mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
-</component>
-</collection>
-<collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
-<component name="appsupport_metadata" long-name="Generic Application Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="securitysrv" level="generic" long-name="Security Services" levels="plugin framework server generic specific">
-<collection name="secsrv_plat" long-name="Security Services Platform Interfaces" level="specific">
-<component name="cms_api" long-name="CMS API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/cms_api/group"/>
-</component>
-<component name="pkcs12_parser_api" long-name="PKCS12 Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkcs12_parser_api/group"/>
-</component>
-<component name="java_utils_api" long-name="Java Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/java_utils_api/group"/>
-</component>
-<component name="wim_cert_api" long-name="WIM Cert API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/wim_cert_api/group"/>
-</component>
-<component name="device_key_store_encryption_plugin_api" long-name="Device Key Store Encryption Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/device_key_store_encryption_plugin_api/group"/>
-</component>
-<component name="x509certnameparser_api" long-name="X.509 Certificate Name Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
-</component>
-<component name="remote_lock_api" long-name="Remote Lock API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
-</component>
-<component name="pkidialog_api" long-name="PKI Dialog API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
-</component>
-<component name="provisioning_api" long-name="Provisioning API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/provisioning_api/group"/>
-</component>
-<component name="keyguard_configuration_api" long-name="Keyguard Configuration API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_configuration_api/group"/>
-</component>
-<component name="keylock_policy_api" long-name="Keylock Policy API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keylock_policy_api/group"/>
-</component>
-<component name="security_code_ui_api" long-name="Security Code UI API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
-</component>
-<component name="gba_api" long-name="GBA API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/gba_api/group"/>
-</component>
-<component name="keyguard_access_api" long-name="Keyguard Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_access_api/group"/>
-</component>
-<component name="devicelock_access_api" long-name="Device Lock Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devicelock_access_api/group"/>
-</component>
-<component name="lockapp_server_api" long-name="Lock Application Server API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
-</component>
-<component name="devencadaptation_api" long-name="Device Encryption Adaptation API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
-</component>
-<component name="devenccommonutils_api" long-name="Device Encryption Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
-</component>
-</collection>
-<collection name="cms" long-name="Certificate Management Service" level="server">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="cms_build" filter="s60" long-name="CMS" introduced="^3">
-<unit bldFile="mw/securitysrv/cms/group"/>
-</component>
-</collection>
-<collection name="pkiutilities" long-name="PKI Utilities" level="plugin">
-<component name="x509certnameparser" filter="s60" long-name="X.509 Certificate Name Parser">
-<unit bldFile="mw/securitysrv/pkiutilities/x509certnameparser/group"/>
-</component>
-<component name="pkcs12" filter="s60" long-name="PKCS #12">
-<unit bldFile="mw/securitysrv/pkiutilities/pkcs12/group"/>
-</component>
-<component name="certmanui" filter="s60" long-name="Certificate Management UI">
-<unit bldFile="mw/securitysrv/pkiutilities/certmanui/group"/>
-</component>
-<component name="ctsecuritydialogs" filter="s60" long-name="Crypto Token Security Dialogs">
-<unit bldFile="mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
-</component>
-<component name="certsaver" filter="s60" long-name="Certificate Saver">
-<unit bldFile="mw/securitysrv/pkiutilities/certsaver/group"/>
-</component>
-<component name="secmodui" filter="s60" long-name="Security Module UI">
-<unit bldFile="mw/securitysrv/pkiutilities/secmodui/group"/>
-</component>
-<component name="devicetoken" filter="s60" long-name="Device Token">
-<unit bldFile="mw/securitysrv/pkiutilities/devicetoken/group"/>
-</component>
-<component name="certificates" filter="s60" long-name="Certificates">
-<unit bldFile="mw/securitysrv/pkiutilities/Certificates/group" filter="sf_build"/>
-</component>
-<component name="pkiutilities_build" filter="s60" long-name="PKI Utilities Build">
-<!-- need to split this into the above components -->
-<unit bldFile="mw/securitysrv/pkiutilities/group"/>
-</component>
-<component name="ocsp" long-name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
-<unit bldFile="mw/securitysrv/pkiutilities/ocsp/group" mrp="mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
-</component>
-</collection>
-<collection name="wim" long-name="Wireless Identity Module " level="framework">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="wim_build" filter="s60" long-name="WIM Build">
-<unit bldFile="mw/securitysrv/wim/group"/>
-</component>
-</collection>
-<collection name="remotelock" long-name="Remote Lock" level="generic">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="remotelock_build" filter="s60" long-name="Remote Lock Build">
-<unit bldFile="mw/securitysrv/remotelock/group"/>
-</component>
-</collection>
-<collection name="securitydialogs" long-name="Security Dialogs" level="specific">
-<component name="keylockpolicyapi" filter="s60" long-name="Keylock Policy API">
-<unit bldFile="mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
-</component>
-<component name="autolock" long-name="Autolock" filter="s60">
-<unit bldFile="mw/securitysrv/securitydialogs/autolock/group"/>
-</component>
-<component name="secui" filter="s60" long-name="Security UI">
-<unit bldFile="mw/securitysrv/securitydialogs/secui/group"/>
-</component>
-<component name="securitynotifier" filter="s60" long-name="Security Notifier">
-<unit bldFile="mw/securitysrv/securitydialogs/securitynotifier/group"/>
-</component>
-<component name="lockclient" filter="s60" long-name="Lock Client" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockclient/group"/>
-</component>
-<component name="lockapp" filter="s60" long-name="Lock Application" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockapp/group"/>
-</component>
-<component name="simlockui" filter="s60" long-name="SIM Lock UI" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/simlockui/group"/>
-</component>
-</collection>
-<collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="boottimeintegritycheck_build" filter="s60" long-name="Boot Time Integrity Check Build">
-<unit bldFile="mw/securitysrv/boottimeintegritycheck/group"/>
-</component>
-</collection>
-<collection name="gba" long-name="Generic Bootstrapping Architecture" level="server">
-<component name="uicc" filter="s60" long-name="UICC" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/uicc/group"/>
-</component>
-<component name="gbaserver" filter="s60" long-name="GBA Server" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaserver/group"/>
-</component>
-<component name="gbaapi" filter="s60" long-name="GBA API" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaapi/group"/>
-</component>
-<component name="gbafilter" filter="s60" long-name="GBA HTTP Filter" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/gbafilter/group"/>
-</component>
-<component name="gba_build" filter="s60" long-name="Generic Boot Architecture Build" introduced="^2">
-<!-- need to split this into the above components, or remove #includes and make this GBA ROM -->
-<unit bldFile="mw/securitysrv/gba/group"/>
-</component>
-</collection>
-<collection name="devencdiskutils" long-name="Device Encryption Disk Utils" level="server">
-<component name="devenccommonutils" filter="s60" long-name="Device Encryption Common Utils" introduced="^3">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncCommonUtils/group"/>
-</component>
-<component name="devencrfsplugin" filter="s60" long-name="Device Encryption RFS Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncRfsPlugin/group"/>
-</component>
-<component name="pk5recognizer" filter="s60" long-name="Device Encryption Pk5 Recognizer" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/Pk5Recognizer/group"/>
-</component>
-<component name="devencstarter" filter="s60" long-name="Device Encryption Starter" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncStarter/group"/>
-</component>
-<component name="devencdiskutils" filter="s60" long-name="Device Encryption Disk Utils Build" introduced="^3">
-<!-- need to split this into the above components, or remove #includes and make this a ROM component-->
-<unit bldFile="mw/securitysrv/devencdiskutils/group"/>
-</component>
-</collection>
-<collection name="securitysrv_info" long-name="Security Services Info" level="specific">
-<component name="securitysrv_metadata" long-name="Security Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="drm" level="generic" long-name="DRM" levels="plugin framework server generic specific">
-<collection name="drm_plat" long-name="DRM Platform Interfaces" level="specific">
-<component name="roap_api" long-name="ROAP API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/roap_api/group"/>
-</component>
-<component name="drm_common_api" long-name="DRM Common API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_common_api/group"/>
-</component>
-<component name="drm_rights_api" long-name="DRM Rights API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_rights_api/group"/>
-</component>
-<component name="drm_legacy_api" long-name="DRM Legacy API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_legacy_api/group"/>
-</component>
-<component name="dcf_repository_api" long-name="DCF Repository API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/dcf_repository_api/group"/>
-</component>
-<component name="drm_service_api" long-name="DRM Service API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_service_api/group"/>
-</component>
-<component name="drm_secondary_display_api" long-name="DRM Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_secondary_display_api/group"/>
-</component>
-<component name="drm_license_manager_api" long-name="DRM License Manager API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_license_manager_api/group"/>
-</component>
-<component name="drm_utility_api" long-name="DRM Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_utility_api/group"/>
-</component>
-<component name="drm_agents_api" long-name="DRM Agents API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_agents_api/group"/>
-</component>
-<component name="wmdrm_core_api" long-name="WM DRM Core API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_core_api/group"/>
-</component>
-<component name="wmdrm_access_api" long-name="WMDRM Access API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_access_api/group"/>
-</component>
-<component name="camese_utility_api" long-name="Camese Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_utility_api/group"/>
-</component>
-<component name="camese_framework_api" long-name="Camese Framework API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_framework_api/group"/>
-</component>
-</collection>
-<collection name="drm_pub" long-name="DRM Public Interfaces" level="specific">
-<component name="drm_helper_api" long-name="DRM Helper API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_helper_api/group"/>
-</component>
-<component name="oma_drm_caf_agent_api" long-name="OMA DRM CAF Agent API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/group"/>
-</component>
-<component name="drm_license_checker_api" long-name="DRM License Checker API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_license_checker_api/group"/>
-</component>
-</collection>
-<collection name="commondrm" long-name="Common DRM" level="generic">
-<!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
-<component name="drmencryptor" filter="s60" long-name="DRM Encryptor" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmsettingsplugin" filter="s60" long-name="DRM Settings Plugin" plugin="Y" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmrightsmanagerui" filter="s60" long-name="DRM Rights Manager UI">
-<unit bldFile="mw/drm/commondrm/drmrightsmanagerui/help/group"/>
-</component>
-<component name="drmutility" filter="s60" long-name="DRM Utility">
-<!-- Uncomment unit when configuration is in place. Currently #included from commondrm_build -->
-<!--<unit bldFile="commondrm/drmutility/group"/>-->
-</component>
-<component name="drmserviceapiwrapper" filter="s60" long-name="DRM Service API Wrapper">
-<unit bldFile="mw/drm/commondrm/drmserviceapiwrapper/group"/>
-</component>
-<component name="drmrightsstoringlocation" filter="s60" long-name="DRM Rights Storing Location">
-<unit bldFile="mw/drm/commondrm/drmrightsstoringlocation/group"/>
-</component>
-<component name="commondrm_build" filter="s60" long-name="Common DRM Build">
-<!-- should be split into the above files, or them collapsed into a single component -->
-<unit bldFile="mw/drm/commondrm/group"/>
-</component>
-</collection>
-<collection name="omadrm" long-name="OMA DRM" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="omadrm_build" filter="s60" long-name="OMA DRM Build">
-<unit bldFile="mw/drm/omadrm/group"/>
-</component>
-<component name="foundationcerts" filter="sf_build" long-name="Foundation Certificates">
-<unit bldFile="mw/drm/omadrm/foundationcerts/group"/>
-</component>
-</collection>
-<collection name="wmdrm" long-name="Windows Media DRM" level="framework">
-<!-- collection is really a component. Move down a directory -->
-<component name="wmdrm_build" filter="s60" long-name="WM DRM Build">
-<unit bldFile="mw/drm/wmdrm/group"/>
-</component>
-</collection>
-<collection name="drm_info" long-name="DRM Info" level="specific"/>
-</block>
-<block name="locationsrv" level="specific" long-name="Location Services" levels="plugin fw server if">
-<collection name="locsrv_pub" long-name="Location Services Public Interfaces" level="if">
-<component name="landmarks_search_api" long-name="Landmarks Search API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
-</component>
-<component name="landmarks_api" long-name="Landmarks API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/group"/>
-</component>
-<component name="landmarks_database_management_api" long-name="Landmarks Database Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/group"/>
-</component>
-<component name="location_triggering_api" long-name="Location Triggering API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/location_triggering_api/group"/>
-</component>
-<component name="blid_application_satellite_info_api" long-name="BLID Application Satellite Info API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/group"/>
-</component>
-</collection>
-<collection name="locsrv_plat" long-name="Location Services Platform Interfaces" level="if">
-<component name="map_and_navigation_api" long-name="Map and Navigation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/group"/>
-</component>
-<component name="map_and_navigation_provider_discovery_api" long-name="Map and Navigation Provider Discovery API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/group"/>
-</component>
-<component name="geocoding_api" long-name="Geocoding API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
-</component>
-<component name="map_image_api" long-name="Map Image API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/group"/>
-</component>
-<component name="map_and_navigation_aiw_api" long-name="Map and Navigation AIW API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_aiw_api/group"/>
-</component>
-<component name="map_and_navigation_provider_api" long-name="Map and Navigation Provider API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_api/group"/>
-</component>
-<component name="landmarks_category_definition_api" long-name="Landmarks Category Definition API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
-</component>
-<component name="supl_settings_api" long-name="SUPL Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
-</component>
-<component name="location_settings_launch_api" long-name="Location Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/group"/>
-</component>
-<component name="map_image_conversion_plugin_api" long-name="Map Image Conversion Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/group"/>
-</component>
-<component name="psy_configuration_ui_plugin_api" long-name="PSY Configuration UI Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/psy_configuration_ui_plugin_api/group"/>
-</component>
-<component name="np_proxy_configuration_api" long-name="NP Proxy Configuration API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/np_proxy_configuration_api/group"/>
-</component>
-<component name="supl_terminal_initiation_api" long-name="SUPL Terminal Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/group"/>
-</component>
-<component name="location_notation_preferences_settings_api" long-name="Location Notation Preferences Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_notation_preferences_settings_api/group"/>
-</component>
-<component name="supl_settings_notifier_secondary_display_api" long-name="SUPL Settings Notifier Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_notifier_secondary_display_api/group"/>
-</component>
-<component name="supl_network_initiation_api" long-name="SUPL Network Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/group"/>
-</component>
-<component name="privacy_notifiers_secondary_display_api" long-name="Privacy Notifiers Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/privacy_notifiers_secondary_display_api/group"/>
-</component>
-<component name="oma_supl_configuration_parameter_api" long-name="OMA SUPL Configuration Parameter API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_configuration_parameter_api/group"/>
-</component>
-<component name="supl_query_secondary_display_api" long-name="SUPL Query Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_query_secondary_display_api/group"/>
-</component>
-<component name="location_triggering_management_api" long-name="Location Triggering Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_management_api/group"/>
-</component>
-<component name="location_triggering_status_information_api" long-name="Location Triggering Status Information API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_status_information_api/group"/>
-</component>
-<component name="oma_supl_asn_codec_plugin_api" long-name="OMA SUPL ASN Codec Plugin API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
-</component>
-<component name="location_local_variation_api" long-name="Location Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_local_variation_api/group"/>
-</component>
-</collection>
-<collection name="genericpositioningplugins" long-name="Generic Positioning Plugins" level="plugin">
-<component name="locationnpppsy" filter="s60" long-name="Location Positioning Proxy PSY" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
-</component>
-<component name="locationsuplpsy" filter="s60" long-name="Location SUPL PSY" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationsuplpsy/group"/>
-</component>
-<component name="genericpositioningplugins_build" filter="s60" long-name="Generic Positioning Plugins Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/genericpositioningplugins/group"/>
-</component>
-</collection>
-<collection name="landmarks" long-name="Landmarks" level="server">
-<component name="locationlandmarks" filter="s60" long-name="Location Landmarks">
-<unit bldFile="mw/locationsrv/landmarks/locationlandmarks/group"/>
-</component>
-</collection>
-<collection name="locationmapnavfw" long-name="Location Map and Navigation Framework" level="fw">
-<component name="mnlibrary" filter="s60" long-name="Map and Navigation Library">
-<unit bldFile="mw/locationsrv/locationmapnavfw/library/group"/>
-</component>
-<component name="mnaiwprovider" filter="s60" long-name="Map and Navigation AIW Provider" plugin="Y">
-<unit bldFile="mw/locationsrv/locationmapnavfw/aiwprovider/group"/>
-</component>
-<component name="locationmapnavfw_build" filter="s60" long-name="Location Map and Navigation Framework Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/locationmapnavfw/group"/>
-</component>
-</collection>
-<collection name="locationsystemui" long-name="Location System UI" level="if">
-<component name="locationsysui" filter="s60" long-name="Location System UI">
-<unit bldFile="mw/locationsrv/locationsystemui/locationsysui/group"/>
-</component>
-</collection>
-<collection name="supl" long-name="SUPL" level="fw">
-<component name="locationsuplfw" filter="s60" long-name="Location SUPL Framework">
-<unit bldFile="mw/locationsrv/supl/locationsuplfw/group"/>
-</component>
-<component name="locationomasuplprotocolhandler" filter="s60" long-name="OMA SUPL Protocol Handler">
-<unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/group"/>
-</component>
-<component name="supltiapiimplementation" filter="s60" long-name="SUPL TI API Implementation" introduced="^3">
-<unit bldFile="mw/locationsrv/supl/supltiapiimplementation/group"/>
-</component>
-</collection>
-<collection name="locationtriggering" long-name="Location Triggering" level="server">
-<component name="ltlogger" filter="s60" long-name="LT Logger">
-<unit bldFile="mw/locationsrv/locationtriggering/ltlogger/group"/>
-</component>
-<component name="ltclientlib" filter="s60" long-name="LT Client Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltclientlib/group"/>
-</component>
-<component name="ltmanagementlib" filter="s60" long-name="LT Management Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmanagementlib/group"/>
-</component>
-<component name="ltcontainer" filter="s60" long-name="LT Container">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontainer/group"/>
-</component>
-<component name="ltserver" filter="s60" long-name="LT Server">
-<unit bldFile="mw/locationsrv/locationtriggering/ltserver/group"/>
-</component>
-<component name="ltstrategypluginapi" filter="s60" long-name="LT Strategy Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategypluginapi/group"/>
-</component>
-<component name="ltstrategyengine" filter="s60" long-name="LT Strategy Engine">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategyengine/group"/>
-</component>
-<component name="ltmovementdetectionpluginapi" filter="s60" long-name="Movement Detection Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmovementdetectionpluginapi/group"/>
-</component>
-<component name="ltcellidmovementdetector" filter="s60" long-name="Cell ID Movement Detector">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/>
-</component>
-<component name="lbtmgmtui" filter="s60" long-name="LBT Management UI" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/lbtmgmtui/group"/>
-</component>
-<component name="ltcontextsourceplugin" filter="s60" long-name="LT Context Source Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontextsourceplugin/group"/>
-</component>
-<component name="locationtriggering_build" filter="s60" long-name="Location Triggering Build">
-<!-- should remove #include from this and maybe put exports in the above components -->
-<unit bldFile="mw/locationsrv/locationtriggering/group"/>
-</component>
-</collection>
-</block>
-<block name="accesssec" level="generic" long-name="Access Security" levels="plugin framework server generic specific">
-<collection name="accesssec_plat" long-name="Access Security Platform Interfaces" level="specific">
-<component name="wapi_security_settings_ui_api" long-name="WAPI Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_security_settings_ui_api/group"/>
-</component>
-<component name="wep_security_settings_ui_api" long-name="WEP Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wep_security_settings_ui_api/group"/>
-</component>
-<component name="wi-fi_protected_setup_ui_api" long-name="Wi-Fi Protected Setup UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
-</component>
-<component name="wlan_eap_settings_ui_api" long-name="WLAN EAP Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wlan_eap_settings_ui_api/group"/>
-</component>
-<component name="wpa_security_settings_ui_api" long-name="WPA Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wpa_security_settings_ui_api/group"/>
-</component>
-<component name="eap_vpn_api" long-name="EAP VPN API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
-</component>
-<component name="eapsim_db_api" long-name="EAP-SIM DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapsim_db_api/group"/>
-</component>
-<component name="eap_type_api" long-name="EAP Type API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_type_api/group"/>
-</component>
-<component name="eaptlspeap_db_api" long-name="EAP-TLS-PEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eaptlspeap_db_api/group"/>
-</component>
-<component name="eapleap_db_api" long-name="LEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapleap_db_api/group"/>
-</component>
-<component name="eapgtc_db_api" long-name="EAP-GTC DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapgtc_db_api/group"/>
-</component>
-<component name="eapmschapv2_db_api" long-name="EAP-MSCHAPV2 DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapmschapv2_db_api/group"/>
-</component>
-<component name="eapaka_db_api" long-name="EAP-AKA DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapaka_db_api/group"/>
-</component>
-<component name="wapi_db_api" long-name="WAPI DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_db_api/group"/>
-</component>
-</collection>
-<collection name="wlansecuritysettings" long-name="WLAN Security Settings" level="specific">
-<component name="wapisecuritysettingsui" filter="s60" long-name="WAPI Security Settings UI" introduced="9.1">
-<!-- the directory for this needs to be moved up to the right level -->
-<unit bldFile="mw/accesssec/wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
-</component>
-<component name="wepsecuritysettingsui" filter="s60" long-name="WEP Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wepsecuritysettingsui/group"/>
-</component>
-<component name="wifiprotectedsetup" filter="s60" long-name="WIFI Protected Setup" introduced="^1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wifiprotectedsetup/group"/>
-</component>
-<component name="wlaneapsettingsui" filter="s60" long-name="WLAN EAP Settings UI" introduced="9.3">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wlaneapsettingsui/group"/>
-</component>
-<component name="wpasecuritysettingsui" filter="s60" long-name="WPA Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wpasecuritysettingsui/group"/>
-</component>
-</collection>
-<collection name="eapol" long-name="EAPOL" level="framework">
-<component name="eapol_framework" filter="s60" long-name="EAPOL Framework" introduced="9.2">
-<unit bldFile="mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
-</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">
-<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>
-<component name="bearer_settings_plugin_api" long-name="Bearer Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/bearer_settings_plugin_api/group"/>
-</component>
-<component name="commsdat_wlan_api" long-name="CommsDat WLAN API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/commsdat_wlan_api/group"/>
-</component>
-<component name="connection_monitor_extension_api" long-name="Connection Monitor Extension API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_monitor_extension_api/group"/>
-</component>
-<component name="connection_ui_utilities_api" long-name="Connection UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_ui_utilities_api/group"/>
-</component>
-<component name="disconnect_dialog_api" long-name="Disconnect Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_api/group"/>
-</component>
-<component name="disconnect_dialog_disable_api" long-name="Disconnect Dialog Disable API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_disable_api/group"/>
-</component>
-<component name="extended_connection_settings_api" long-name="Extended Connection Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/extended_connection_settings_api/group"/>
-</component>
-<component name="mpm_default_connection_api" long-name="MPM Default Connection API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_default_connection_api/group"/>
-</component>
-<component name="pdpcontextmanager2_reset_factory_settings_api" long-name="PDP Context Manager 2 Reset Factory Settings API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_settings_api/group"/>
-</component>
-<component name="mpm_connect_screen_api" long-name="MPM Connect Screen API" filter="s60" class="api">
-<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">
-<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>
-<component name="access_point_engine_api" long-name="Access Point Engine API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_monitor_server_api/group"/>
-</component>
-<component name="connection_settings_ui_api" long-name="Connection Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_ui_api/group"/>
-</component>
-<component name="agent_dialog_api" long-name="Agent Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/agent_dialog_api/group"/>
-</component>
-<component name="extendedconnpref_api" long-name="Extended Connection Preferences API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/extendedconnpref_api/group"/>
-</component>
-</collection>
-<collection name="accesspointcontrol" long-name="Access Point Control" level="plugin">
-<component name="apcontrollistplugin" filter="s60" long-name="Access Point Control List Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
-</component>
-</collection>
-<collection name="alwayson_net_plugin" long-name="Always Online Net Plugin" level="server">
-<component name="pdpcontextmanager2" filter="s60" long-name="PDP Context Manager 2">
-<unit bldFile="mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
-</component>
-</collection>
-<collection name="apengine" long-name="Access Point Engine" level="framework">
-<component name="apeng" filter="s60" long-name="Access Point Engine">
-<unit bldFile="mw/ipconnmgmt/apengine/apeng/group"/>
-</component>
-<component name="apsettingshandlerui" filter="s60" long-name="Access Point Settings Handler UI">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingshandlerui/group"/>
-</component>
-<component name="apsettingsplugin" filter="s60" long-name="Access Point Settings Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="bearermanagement" long-name="Bearer Management" level="framework">
-<component name="mpm" filter="s60" long-name="Mobility Policy Manager">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/mpm/group"/>
-</component>
-<component name="extendedconnpref" filter="s60" long-name="Extended Connection Preferences">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/extendedconnpref/group"/>
-</component>
-<component name="s60mcpr" filter="s60" long-name="S60 Meta-Connection Provider" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/S60MCPR/group"/>
-</component>
-</collection>
-<collection name="cmmanager" long-name="Connection Method Manager" level="framework">
-<component name="cmmgr" filter="s60" long-name="CM Manager">
-<unit bldFile="mw/ipconnmgmt/cmmanager/cmmgr/group"/>
-</component>
-<component name="gsconnsettingsplugin" filter="s60" long-name="GS Connection Settings Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/cmmanager/gsconnsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="connectionmonitoring" long-name="Connection Monitoring" level="server">
-<component name="connectionmonitorplugin" filter="s60" long-name="Connection Monitor Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorplugin/group"/>
-</component>
-<component name="connectionmonitorui" filter="s60" long-name="Connection Monitor UI">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorui/group"/>
-</component>
-<component name="connmon" filter="s60" long-name="Connection Monitor">
-<!-- either split into two components, or #include from a common bld.inf -->
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/connectionmonitor/group"/>
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/dataconnectionlogger/group"/>
-</component>
-<component name="connmonext" filter="s60" long-name="Connection Monitor Extension API">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmonext/group"/>
-</component>
-</collection>
-<collection name="connectionutilities" long-name="Connection Utilities" level="utils">
-<component name="connectiondialogs" filter="s60" long-name="Connection Dialogs">
-<unit bldFile="mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/>
-</component>
-</collection>
-<collection name="dbcreator" long-name="DB Creator" level="utils">
-<component name="commsdatcreator" filter="s60" long-name="Comms Database Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
-</component>
-<component name="commsdatcreatorrfsplugin" filter="s60" long-name="Comms Database Creator RFS Plugin" introduced="9.3" plugin="Y">
-<!-- uncomment when config is turned on -->
-<!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
-</component>
-<component name="commsdatstartup" filter="s60" long-name="Comms Database Startup" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
-</component>
-<component name="dbcreatorexe" filter="s60" long-name="DB Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
-</component>
-<component name="dbcreator_build" filter="s60" long-name="DB Creator Build" introduced="9.3">
-<!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
-<unit bldFile="mw/ipconnmgmt/dbcreator/group"/>
-</component>
-</collection>
-<collection name="ipconnmgmt_info" long-name="IP Connectivity Management Info" level="utils">
-<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"/>
-</component>
-</collection>
-</block>
-<block name="netprotocols" level="generic" long-name="High-level Internet Protocols" levels="plugin framework server generic specific">
-<collection name="netprotocols_plat" long-name="High-level Internet Protocols Platform Interfaces" level="specific">
-<component name="cookie_manager_api" long-name="Cookie Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/cookie_manager_api/group"/>
-</component>
-<component name="http_cache_mgr_api" long-name="HTTP Cache Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_cache_mgr_api/group"/>
-</component>
-<component name="http_filters_api" long-name="HTTP Filters API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_filters_api/group"/>
-</component>
-</collection>
-<collection name="httpfilters" long-name="HTTP Filters" level="plugin">
-<component name="httpfiltercommon" filter="s60" long-name="HTTP Filter Common">
-<unit bldFile="mw/netprotocols/httpfilters/httpfiltercommon/group"/>
-</component>
-<component name="cookie" filter="s60" long-name="Cookie Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/cookie/group"/>
-</component>
-<component name="deflatefilter" filter="s60" long-name="Deflate Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/deflatefilter/group"/>
-</component>
-<component name="httpfilteracceptheader" filter="s60" long-name="Accept Header Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteracceptheader/group"/>
-</component>
-<component name="httpfilterauthentication" filter="s60" long-name="Authentication Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterauthentication/group"/>
-</component>
-<component name="httpfilterconnhandler" filter="s60" long-name="Connection Handler Fitler" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterconnhandler/group"/>
-</component>
-<component name="httpfilteriop" filter="s60" long-name="HTTP IOP Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteriop/group"/>
-</component>
-<component name="httpfilterproxy" filter="s60" long-name="HTTP Proxy Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterproxy/group"/>
-</component>
-<component name="uaproffilter" filter="s60" long-name="UAProf Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/uaproffilter/group"/>
-</component>
-</collection>
-<collection name="applayerprotocols" long-name="Application Layer Protocols" level="server">
-<component name="httptransportfw" long-name="HTTP Transport Framework" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
-</component>
-<component name="httpexamples" long-name="HTTP Examples" introduced="6.2" purpose="development">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpexamples/group" mrp="mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
-</component>
-<component name="wappushsupport" long-name="WAP Push Support" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
-</component>
-<component name="wapbase" long-name="WAP Base" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wapbase/Group" mrp="mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
-</component>
-<component name="ftpengine" long-name="FTP Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/ftpengine/group" mrp="mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
-</component>
-<component name="telnetengine" long-name="Telnet Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/telnetengine/group" mrp="mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
-</component>
-<component name="httpserviceapi" long-name="HTTP Service API" introduced="TB9.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpservice/group" mrp="mw/netprotocols/applayerprotocols/httpservice/group/http_service.mrp"/>
-</component>
-</collection>
-<collection name="applayerpluginsandutils" long-name="Application Layer Plugins and Utils" level="framework">
-<component name="uripermissionservices" long-name="URI Permission Services" introduced="^2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
-</component>
-<component name="bookmarksupport" long-name="Bookmark Support" introduced="9.1" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
-</component>
-<component name="httpprotocolplugins" long-name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
-</component>
-<component name="httptransportplugins" long-name="HTTP Transport Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
-</component>
-</collection>
-<collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
-<component name="netprotocols_metadata" long-name="High-level Internet Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ipappprotocols" level="generic" long-name="IP App Protocols" levels="plugin conn server if">
-<collection name="ipappprotocols_plat" long-name="IP App Protocols Platform Interfaces" level="if">
-<component name="srtp_api" long-name="SRTP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/srtp_api/group"/>
-</component>
-<component name="rtprtcp_api" long-name="RTP/RTCP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/rtprtcp_api/group"/>
-</component>
-</collection>
-<collection name="rtp" long-name="RTP" level="server">
-<component name="srtpstack" filter="s60" long-name="SRTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/srtpstack/group"/>
-</component>
-<component name="rtpstack" filter="s60" long-name="RTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/rtpstack/group"/>
-</component>
-</collection>
-<collection name="realtimenetprots" long-name="Real Time Net Protocols" level="server">
-<component name="symrtp" long-name="RTP" introduced="9.0" purpose="optional">
-<!-- Real Time Data Protocol -->
-<unit bldFile="mw/ipappprotocols/realtimenetprots/rtp/group" mrp="mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
-</component>
-<component name="sipfw" long-name="SIP Framework" introduced="9.2" purpose="optional">
-<unit bldFile="mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp" version="2"/>
-</component>
-</collection>
-<collection name="sipplugins" long-name="SIP Plugins" level="plugin">
-<component name="sippwlanplugin" filter="s60" long-name="SIP WLAN Plugin" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
-</component>
-<component name="sippsipsettingsui" filter="s60" long-name="SIP Settings UI" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
-</component>
-<component name="sippdevmgmtsipadapter" filter="s60" long-name="Device Management SIP Settings Adapter" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
-</component>
-<component name="sippsystemstatemonitor" filter="s60" long-name="SIP System State Monitor" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsystemstatemonitor/group"/>
-</component>
-<component name="sippsipadapter" filter="s60" long-name="SIP Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipadapter/group"/>
-</component>
-</collection>
-<collection name="sipproviderplugins" long-name="SIP Provider Plugins" level="conn">
-<component name="sipprovider" long-name="SIP Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipproviderplugins/sipprovider/group" mrp="mw/ipappprotocols/sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
-</component>
-</collection>
-<collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="if">
-<component name="ipappprotocols_metadata" long-name="IP App Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wirelessacc" level="specific" long-name="Wireless Access" levels="framework generic ui">
-<collection name="hsfw_plat" long-name="HotSpot Framework Platform Interfaces" level="ui">
-<component name="hotspot_framework_client_api" long-name="HotSpot Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_api" long-name="Internet Connectivity Test Service API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_settings_api" long-name="Internet Connectivity Test Service Settings API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
-</component>
-<component name="hotspot_framework_client_plugin_api" long-name="HotSpot Framework Client Plugin API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
-</component>
-</collection>
-<collection name="hotspotfw" long-name="HotSpot Framework" level="framework">
-<component name="hsserver" filter="s60" long-name="HotSpot Server" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="hsclient" filter="s60" long-name="HotSpot Client" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="internetconnectivitytestservice" filter="s60" long-name="Internet Connectivity Test Service" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
-</component>
-<component name="ictsdialogs" filter="s60" long-name="Internet Connectivity Test Service Dialogs" deprecated="^3" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
-</component>
-<component name="hspluginforagent" filter="s60" long-name="HotSpot Plugin for Agent" plugin="Y" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
-</component>
-<component name="hsbrowser" filter="s60" long-name="HotSpot Browser" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
-</component>
-<component name="hotspotfw_build" filter="s60" long-name="Hotspot Framework Build">
-<!-- should break up this bld.inf into the above components, or collapse them all into a single component -->
-<unit bldFile="mw/wirelessacc/hotspotfw/group"/>
-</component>
-</collection>
-<collection name="wlanutilities" long-name="WLAN Utilities" level="generic">
-<component name="wlanplugin" filter="s60" long-name="WLAN Plugin" plugin="Y">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlanplugin/group"/>
-</component>
-<component name="wlansettingsui" filter="s60" long-name="WLAN Settings UI">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlansettingsui/group"/>
-</component>
-<component name="wlansniffer" filter="s60" long-name="WLAN Sniffer">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlansniffer/group"/>
-</component>
-<component name="wlanindicatorplugin" filter="s60" long-name="WLAN Indicator Plugin" plugin="Y">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlanindicatorplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="vpnclient" level="specific" long-name="VPN Client" levels="engine ui api">
-<!-- is the !oem_build filter needed? -->
-<collection name="vpnc_plat" long-name="VPN Client Platform Interfaces" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API" class="api">
-<unit bldFile="mw/vpnclient/vpnc_plat/vpnapi/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API">
-<unit bldFile="mw/vpnclient/vpnapiimpl/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnengine" long-name="VPN Engine" level="engine">
-<!-- too many components in this collection.
- Probably best to group the binaries together into larger components
- or maybe split the collection into more reasonable groups -->
-<component name="eventmediatorapi" filter="s60" long-name="Event Mediator API">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediatorapi/group" filter="!oem_build"/>
-</component>
-<component name="eventviewer" filter="s60" long-name="Event Viewer">
-<unit bldFile="mw/vpnclient/vpnengine/eventviewer/group" filter="!oem_build"/>
-</component>
-<component name="vpnins" filter="s60" long-name="VPN Installer">
-<unit bldFile="mw/vpnclient/vpnengine/vpnins/group" filter="!oem_build"/>
-</component>
-<component name="ikepolparser" filter="s60" long-name="IKE Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/ikepolparser/group" filter="!oem_build"/>
-</component>
-<component name="utlbase64" filter="s60" long-name="Base64 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlbase64/group" filter="!oem_build"/>
-</component>
-<component name="utlcrypto" filter="s60" long-name="Crypto Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlcrypto/group" filter="!oem_build"/>
-</component>
-<component name="utlxml" filter="s60" long-name="XML Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlxml/group" filter="!oem_build"/>
-</component>
-<component name="utlpkcs10" filter="s60" long-name="PKCS#10 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs10/group" filter="!oem_build"/>
-</component>
-<component name="pkiserviceapi" filter="s60" long-name="PKI Service API">
-<unit bldFile="mw/vpnclient/vpnengine/pkiserviceapi/group" filter="!oem_build"/>
-</component>
-<component name="ikecert" filter="s60" long-name="IKE Certificate Management">
-<unit bldFile="mw/vpnclient/vpnengine/ikecert/group" filter="!oem_build"/>
-</component>
-<component name="kmdapi" filter="s60" long-name="Key Management Daemon API">
-<unit bldFile="mw/vpnclient/vpnengine/kmdapi/group" filter="!oem_build"/>
-</component>
-<component name="kmdserver" filter="s60" long-name="Key Management Daemon Server">
-<unit bldFile="mw/vpnclient/vpnengine/kmdserver/group" filter="!oem_build"/>
-</component>
-<component name="ikeutils" filter="s60" long-name="Internet Key Exchange Utils">
-<unit bldFile="mw/vpnclient/vpnengine/ikeutils/group" filter="!oem_build"/>
-</component>
-<component name="ikev1lib" filter="s60" long-name="IKEv1 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev1lib/group" filter="!oem_build"/>
-</component>
-<component name="ikev2lib" filter="s60" long-name="IKEv2 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev2lib/group" filter="!oem_build"/>
-</component>
-<component name="vpnipsecpolparser" filter="s60" long-name="VPN IPsec Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/vpnipsecpolparser/group" filter="!oem_build"/>
-</component>
-<component name="sit" filter="s60" long-name="Socket Interaction Thread">
-<unit bldFile="mw/vpnclient/vpnengine/sit/group" filter="!oem_build"/>
-</component>
-<component name="vpntcwrapper" filter="s60" long-name="VPN Terminal Control Wrapper">
-<unit bldFile="mw/vpnclient/vpnengine/vpntcwrapper/group" filter="!oem_build"/>
-</component>
-<component name="eventmediator" filter="s60" long-name="Event Mediator">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediator/group" filter="!oem_build"/>
-</component>
-<component name="pkiservice" filter="s60" long-name="PKI Service">
-<unit bldFile="mw/vpnclient/vpnengine/pkiservice/group" filter="!oem_build"/>
-</component>
-<component name="vpnconnagt" filter="s60" long-name="VPN Connection Agent">
-<unit bldFile="mw/vpnclient/vpnengine/vpnconnagt/group" filter="!oem_build"/>
-</component>
-<component name="vpnmanager" filter="s60" long-name="VPN Manager">
-<unit bldFile="mw/vpnclient/vpnengine/vpnmanager/group" filter="!oem_build"/>
-</component>
-<component name="vpncleaner" filter="s60" long-name="VPN Cleaner">
-<unit bldFile="mw/vpnclient/vpnengine/vpncleaner/group" filter="!oem_build"/>
-</component>
-<component name="utlpkcs12" filter="s60" long-name="PKCS#12 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs12/group" filter="!oem_build"/>
-</component>
-<component name="dmadengine" filter="s60" long-name="DM Adapter Engine">
-<unit bldFile="mw/vpnclient/vpnengine/dmadengine/group" filter="!oem_build"/>
-</component>
-<component name="dmadipsecvpn" filter="s60" long-name="IPsec VPN DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadipsecvpn/group" filter="!oem_build"/>
-</component>
-<component name="dmadpki" filter="s60" long-name="PKI DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadpki/group" filter="!oem_build"/>
-</component>
-<component name="ikesocket" filter="s60" long-name="IKE Socket" introduced="^3">
-<unit bldFile="mw/vpnclient/vpnengine/ikesocket/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnui" long-name="VPN UI" level="ui">
-<component name="vpnecomnotifier" filter="s60" long-name="VPN ECOM Notifier" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnecomnotifier/group" filter="!oem_build"/>
-</component>
-<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">
-<unit bldFile="mw/vpnclient/vpnui/vpnmanagementui/group" filter="!oem_build"/>
-</component>
-<component name="vpnpolins" filter="s60" long-name="VPN Policy Installer">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolins/group" filter="!oem_build"/>
-</component>
-<component name="vpnpolicyrecognizer" filter="s60" long-name="VPN Policy Recognizer" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolicyrecognizer/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnclient_info" long-name="VPN Client Info" level="api">
-<component name="vpnclient_help" filter="s60" long-name="VPN Client Help">
-<unit bldFile="mw/vpnclient/help/group" filter="!oem_build"/>
-</component>
-<component name="vpnclient_build" filter="s60" long-name="VPN Client Build">
-<!-- should split this up into the other components and remove this-->
-<unit bldFile="mw/vpnclient/group" filter="!oem_build"/>
-</component>
-</collection>
-</block>
-<block name="ipappsrv" level="specific" long-name="IP App Services" levels="framework generic server conn plugin">
-<collection name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" level="plugin">
-<component name="transcoder_api" long-name="Transcoder API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
-</component>
-<component name="comms_event_api" long-name="Comms Event API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/comms_event_api/group"/>
-</component>
-<component name="floor_control_api" long-name="Floor Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/floor_control_api/group"/>
-</component>
-<component name="media_control_api" long-name="Media Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/media_control_api/group"/>
-</component>
-<component name="multimedia_comms_api" long-name="Multimedia Comms API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/multimedia_comms_api/group"/>
-</component>
-<component name="nat_settings_api" long-name="NAT Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/nat_settings_api/group"/>
-</component>
-</collection>
-<collection name="natfw" long-name="NAT Framework" level="framework">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="natfw_build" filter="s60" long-name="NAT Framework Build" introduced="^2">
-<unit bldFile="mw/ipappsrv/natfw/group"/>
-</component>
-</collection>
-<collection name="multimediacommscontroller" long-name="Multimedia Comms Controller" level="conn">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommscontroller_build" filter="s60" long-name="Multimedia Comms Controller Build">
-<unit bldFile="mw/ipappsrv/multimediacommscontroller/group"/>
-</component>
-</collection>
-<collection name="multimediacommsengine" long-name="Multimedia Comms Engine" level="generic">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommsengine_build" filter="s60" long-name="Multimedia Comms Engine Build">
-<unit bldFile="mw/ipappsrv/multimediacommsengine/group"/>
-</component>
-</collection>
-<collection name="natplugins" long-name="NAT Plugins" level="plugin">
-<component name="natpcliprovisioningnatfwadapter" filter="s60" long-name="Client Provisioning NAT Framework Traversal Adapter" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/group"/>
-</component>
-<component name="natpdevmgmtnatfwadapter" filter="s60" long-name="Device Management NAT Framework Traversal Adapter" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/group"/>
-</component>
-<component name="natptraversalcontroller" filter="s60" long-name="NAT Traversal Controller" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natptraversalcontroller/group"/>
-</component>
-<component name="natpnatfwsdpprovider" filter="s60" long-name="NAT Framework SDP Provider" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpnatfwsdpprovider/group"/>
-</component>
-</collection>
-<collection name="ipappsrv_info" long-name="IP App Services Info" level="plugin">
-<component name="ipappsrv_build" long-name="IP App Services Build" filter="s60">
-<!-- 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">
-<collection name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" level="specific">
-<component name="string_parser_api" long-name="String Parser API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/string_parser_api/group"/>
-</component>
-<component name="cbs_mcn_client_api" long-name="CBS MCN Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cbs_mcn_client_api/group"/>
-</component>
-<component name="converged_call_engine_api" long-name="Converged Call Engine API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_engine_api/group"/>
-</component>
-<component name="aiw_dial_data_consumer_api" long-name="AIW Dial Data Consumer API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/aiw_dial_data_consumer_api/group"/>
-</component>
-<component name="phone_client_ussd_api" long-name="Phone Client USSD API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_api/group"/>
-</component>
-<component name="sat_refresh_api" long-name="SAT Refresh API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_refresh_api/group" filter="!test"/>
-</component>
-<component name="network_handling_engine_api" long-name="Network Handling Engine API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/network_handling_engine_api/group"/>
-</component>
-<component name="phone_client_emergency_call_api" long-name="Phone Client Emergency Call API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/group"/>
-</component>
-<component name="sat_configuration_api" long-name="SAT Configuration API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_configuration_api/group"/>
-</component>
-<component name="dial_utils_api" long-name="Dial Utils API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/dial_utils_api/group"/>
-</component>
-<component name="phone_client_image_handler_api" long-name="Phone Client Image Handler API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_image_handler_api/group"/>
-</component>
-<component name="phone_client_messenger_api" long-name="Phone Client Messenger API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_messenger_api/group"/>
-</component>
-<component name="sat_client_api" long-name="SAT Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_client_api/group" filter="!test"/>
-</component>
-<component name="phone_client_api" long-name="Phone Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_api/group"/>
-</component>
-<component name="sat_service_api" long-name="SAT Service API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_service_api/group" filter="!test"/>
-</component>
-<component name="cbs_message_api" long-name="CBS Message API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cbs_message_api/group"/>
-</component>
-<component name="phone_client_server_information_api" long-name="Phone Client Server Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_server_information_api/group"/>
-</component>
-<component name="phone_client_ussd_internal_api" long-name="Phone Client USSD Internal API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_internal_api/group"/>
-</component>
-<component name="phone_client_command_handler_api" long-name="Phone Client Command Handler API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_command_handler_api/group"/>
-</component>
-<component name="phone_client_notify_api" long-name="Phone Client Notify API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_notify_api/group"/>
-</component>
-<component name="phone_client_utility_api" long-name="Phone Client Utility API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_utility_api/group"/>
-</component>
-<component name="telephony_network_information_api" long-name="Telephony Network Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_network_information_api/group"/>
-</component>
-<component name="secondary_display_sat_api" long-name="Secondary Display SAT API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/secondary_display_sat_api/group"/>
-</component>
-<component name="callui_reconnect_query_api" long-name="CallUI Reconnect Query API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/callui_reconnect_query_api/group"/>
-</component>
-<component name="service_provider_settings_api" long-name="Service Provider Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/service_provider_settings_api/group"/>
-</component>
-<component name="converged_call_provider_api" long-name="Converged Call Provider API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_provider_api/group"/>
-</component>
-<component name="incoming_call_monitor_api" long-name="Incoming Call Monitor API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/incoming_call_monitor_api/group"/>
-</component>
-<component name="default_emergency_numbers_api" long-name="Default Emergency Numbers API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/default_emergency_numbers_api/group"/>
-</component>
-<component name="cenrep_database_api" long-name="Central Repository Database API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cenrep_database_api/group"/>
-</component>
-<component name="ss_settings_api" long-name="SS Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/ss_settings_api/group"/>
-</component>
-<component name="phone_settings_observer_api" long-name="Phone Settings Observer API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_observer_api/group"/>
-</component>
-<component name="phone_settings_notes_ui_api" long-name="Phone Settings Notes UI API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_notes_ui_api/group"/>
-</component>
-<component name="phone_settings_api" long-name="Phone Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_api/group"/>
-</component>
-<component name="voice_mailbox_number_api" long-name="Voice Mailbox Number API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_number_api/group"/>
-</component>
-<component name="voice_mailbox_settings_api" long-name="Voice Mailbox Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_settings_api/group"/>
-</component>
-<component name="call_information_api" long-name="Call Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/call_information_api/group" filter="!test"/>
-</component>
-<component name="call_remote_party_information_api" long-name="Call Remote Party Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/call_remote_party_information_api/group" filter="!test"/>
-</component>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_mediator_api/group"/>
-</component>
-</collection>
-<collection name="telutils" long-name="Telephony Utils" level="generic">
-<component name="phoneparser" filter="s60" long-name="Phone Parser">
-<unit bldFile="mw/phonesrv/telutils/phoneparser/group"/>
-</component>
-<component name="telephonyservice" filter="s60" long-name="Telephony Service">
-<unit bldFile="mw/phonesrv/telutils/telephonyservice/group"/>
-</component>
-</collection>
-<collection name="cbs" long-name="Cellular Baseband Services" level="plugin">
-<component name="cbsserver" filter="s60" long-name="CBS Server">
-<unit bldFile="mw/phonesrv/cbs/cbsserver/group"/>
-</component>
-<component name="cbsui" filter="s60" long-name="CBS UI">
-<unit bldFile="mw/phonesrv/cbs/cbsui/group"/>
-</component>
-</collection>
-<collection name="cellular" long-name="Cellular" level="server">
-<component name="telephonysettings" filter="s60" long-name="Telephony Settings">
-<unit bldFile="mw/phonesrv/cellular/telephonysettings/group"/>
-</component>
-<component name="sssettings" filter="s60" long-name="Supplementary Service Settings">
-<unit bldFile="mw/phonesrv/cellular/sssettings/group"/>
-</component>
-<component name="psetnotesui" filter="s60" long-name="Phone Settings Notes UI">
-<unit bldFile="mw/phonesrv/cellular/psetnotesui/group"/>
-</component>
-<component name="servicerequest" filter="s60" long-name="Service Request">
-<unit bldFile="mw/phonesrv/cellular/servicerequest/group"/>
-</component>
-</collection>
-<collection name="convergedcallengine" long-name="Converged Call Engine" level="framework">
-<component name="callprovider" filter="s60" long-name="Call Provider">
-<unit bldFile="mw/phonesrv/convergedcallengine/callprovider/group"/>
-</component>
-<component name="cce" filter="s60" long-name="CCE">
-<unit bldFile="mw/phonesrv/convergedcallengine/cce/group"/>
-</component>
-<component name="spsettings" filter="s60" long-name="Service Provider Settings">
-<unit bldFile="mw/phonesrv/convergedcallengine/spsettings/group"/>
-</component>
-<component name="cenrepdatabase" filter="s60" long-name="CCE Cenrep Database">
-<unit bldFile="mw/phonesrv/convergedcallengine/cenrepdatabase/group"/>
-</component>
-<component name="serviceselector" filter="s60" long-name="Service Selector">
-<unit bldFile="mw/phonesrv/convergedcallengine/serviceselector/group"/>
-</component>
-<component name="csplugin" filter="s60" long-name="CS Plugin" plugin="Y">
-<!-- should spell out CS in name -->
-<unit bldFile="mw/phonesrv/convergedcallengine/csplugin/group"/>
-</component>
-</collection>
-<collection name="engines" long-name="Telephony Engines" level="specific">
-<component name="vmbxengine" filter="s60" long-name="Voice Mailbox Engine">
-<unit bldFile="mw/phonesrv/engines/vmbxengine/group"/>
-</component>
-</collection>
-<collection name="networkhandling" long-name="Network Handling" level="plugin">
-<component name="networkhandlingengine" filter="s60" long-name="Network Handling Engine">
-<unit bldFile="mw/phonesrv/networkhandling/networkhandlingengine/group"/>
-</component>
-</collection>
-<collection name="phoneclientserver" long-name="Phone Client/Server" level="server">
-<component name="enpolicy" filter="s60" long-name="Emergency Number Policy">
-<unit bldFile="mw/phonesrv/phoneclientserver/enpolicy/group"/>
-</component>
-<component name="aiwdialdata" filter="s60" long-name="AIW Dial Data">
-<unit bldFile="mw/phonesrv/phoneclientserver/aiwdialdata/group"/>
-</component>
-<component name="dialutils" filter="s60" long-name="Dial Utils">
-<unit bldFile="mw/phonesrv/phoneclientserver/dialutils/group"/>
-</component>
-<component name="phoneclient" filter="s60" long-name="Phone Client">
-<unit bldFile="mw/phonesrv/phoneclientserver/phoneclient/group"/>
-</component>
-<component name="phoneserver" filter="s60" long-name="Phone Server">
-<unit bldFile="mw/phonesrv/phoneclientserver/phoneserver/group"/>
-</component>
-<component name="callui" filter="s60" long-name="Call UI">
-<unit bldFile="mw/phonesrv/phoneclientserver/callui/group"/>
-</component>
-</collection>
-<collection name="satengine" long-name="SIM Application Toolkit Engine" level="generic">
-<component name="satserver" filter="s60" long-name="SAT Server">
-<unit bldFile="mw/phonesrv/satengine/satserver/group"/>
-</component>
-</collection>
-<collection name="satui" long-name="SIM Application Toolkit UI" level="specific">
-<component name="satapp" filter="s60" long-name="SAT Application">
-<unit bldFile="mw/phonesrv/satui/satapp/group"/>
-</component>
-<component name="satplugin" filter="s60" long-name="SAT Plugin" plugin="Y">
-<unit bldFile="mw/phonesrv/satui/satplugin/group"/>
-</component>
-</collection>
-<collection name="phonecmdhandler" long-name="Phone Command Handler" level="generic">
-<component name="phonecmdhnlr" filter="s60" long-name="Phone Command Handler">
-<unit bldFile="mw/phonesrv/phonecmdhandler/phonecmdhnlr/group"/>
-</component>
-</collection>
-<collection name="phonesrv_info" long-name="Telephony and SIM Services Info" level="specific"/>
-</block>
-<block name="messagingmw" level="specific" long-name="Messaging Middleware" levels="stack fw api">
-<collection name="msgfw_pub" long-name="Messaging Middleware Public Interfaces" level="api">
-<component name="send_ui_api" long-name="Send UI API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_pub/send_ui_api/group"/>
-</component>
-</collection>
-<collection name="msgfw_plat" long-name="Messaging Middleware Platform Interfaces" level="api">
-<component name="always_online_plugin_api" long-name="Always Online Plugin API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_plugin_api/group"/>
-</component>
-<component name="always_online_client_api" long-name="Always Online Client API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_client_api/group"/>
-</component>
-<component name="msg_common_utils_api" long-name="Messaging Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/msg_common_utils_api/group"/>
-</component>
-<component name="send_ui_plugin_api" long-name="Send UI Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/send_ui_plugin_api/group"/>
-</component>
-<component name="send_ui_datautils_api" long-name="Send UI Data Utils API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/send_ui_datautils_api/group"/>
-</component>
-</collection>
-<collection name="msgbranched" long-name="Messaging Branched" level="fw">
-<!-- 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"/>
-</component>
-</collection>
-<collection name="messagingfw" long-name="Messaging Framework" level="fw">
-<!-- should break this collection up into smaller related collections -->
-<component name="alwaysonline" filter="s60" long-name="Always Online Server" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/alwaysonline/group"/>
-</component>
-<component name="msgcommonutils" filter="s60" long-name="Messaging Common Utils" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/msgcommonutils/group"/>
-</component>
-<component name="senduiservices" filter="s60" long-name="Send UI Services" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/senduiservices/group"/>
-</component>
-<component name="scheduledsendmtm" long-name="Scheduled Send MTM" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/group" mrp="mw/messagingmw/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
-</component>
-<component name="msgsrvnstore" long-name="Message Server and Store" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/group" mrp="mw/messagingmw/messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
-</component>
-<component name="biomsgfw" long-name="BIO Messaging Framework" introduced="6.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/group" mrp="mw/messagingmw/messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
-</component>
-<component name="msgconf" long-name="Messaging Config" introduced="^2" purpose="optional" class="config">
-<unit bldFile="mw/messagingmw/messagingfw/msgconf/group" mrp="mw/messagingmw/messagingfw/msgconf/group/messaging_config.mrp"/>
-</component>
-<component name="watcherfw" long-name="Watcher Framework" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/watcherfw/group" mrp="mw/messagingmw/messagingfw/watcherfw/group/messaging_watcher.mrp"/>
-</component>
-<component name="msgtest" long-name="Messaging Test" purpose="development">
-<unit bldFile="mw/messagingmw/messagingfw/msgtest/group" mrp="mw/messagingmw/messagingfw/msgtest/group/messaging_test.mrp"/>
-</component>
-<component name="sendas" long-name="Send As" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/sendas/group" mrp="mw/messagingmw/messagingfw/sendas/group/messaging_sendas2.mrp"/>
-</component>
-<component name="msgurlhandler" long-name="Message URL Handler" introduced="7.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/group" mrp="mw/messagingmw/messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
-</component>
-<component name="wappushfw" long-name="WAP Push Framework" introduced="6.1" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/wappushfw/group" mrp="mw/messagingmw/messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
-</component>
-<component name="suplsmshandler" long-name="SUPL SMS Handler" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplsmshandler/group" mrp="mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/>
-</component>
-<component name="suplwappushhandler" long-name="SUPL WAP Push Handler" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
-</component>
-</collection>
-<collection name="messagingmw_info" long-name="Messaging Middleware Info" level="api">
-<component name="messagingmw_metadata" long-name="Messaging Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="imsrv" level="specific" long-name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
-<collection name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" level="specific">
-<component name="ximp_core_data_model_api" long-name="XIMP Core Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_host_api" long-name="XIMP Presence Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_presence_data_model_api" long-name="XIMP Presence Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_api" long-name="XIMP Presence Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_presence_management_api" long-name="XIMP Presence Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_management_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_host_api" long-name="XIMP Core Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_core_management_api" long-name="XIMP Core Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_management_api/group"/>
-</component>
-<component name="ximp_presence_base_api" long-name="XIMP Presence Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_base_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_api" long-name="XIMP Core Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_core_base_api" long-name="XIMP Core Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_base_api/group"/>
-</component>
-<component name="ximp_presence_cache_api" long-name="XIMP Presence Cache API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_cache_api/group"/>
-</component>
-<component name="ximp_core_feature_plugin_api" long-name="XIMP Core Feature Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_host_api" long-name="XIMP IM Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_im_data_model_api" long-name="XIMP IM Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_data_model_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_api" long-name="XIMP IM Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_im_management_api" long-name="XIMP IM Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_management_api/group"/>
-</component>
-<component name="ximp_im_base_api" long-name="XIMP IM Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_base_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_host_api" long-name="XIMP Search Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_search_data_model_api" long-name="XIMP Search Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_data_model_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_api" long-name="XIMP search Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_search_management_api" long-name="XIMP Search Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_management_api/group"/>
-</component>
-<component name="ximp_search_base_api" long-name="XIMP Search Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_base_api/group"/>
-</component>
-<component name="xmpp_settings_api" long-name="XMPP Settings API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/group"/>
-</component>
-<component name="im_cache_client_api" long-name="IM Cache Client API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/im_cache_client_api/group"/>
-</component>
-<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 Avability Text" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
-</component>
-</collection>
-<collection name="ximpfw" long-name="XIMP Framework" level="framework">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="ximpfw_build" filter="s60" long-name="XIMP Framework Build">
-<unit bldFile="mw/imsrv/ximpfw/group"/>
-</component>
-</collection>
-<collection name="imservices" long-name="IM Services" level="generic">
-<component name="imfeatureplugin" filter="s60" long-name="IM Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/imfeatureplugin/group"/>
-</component>
-<component name="searchfeatureplugin" filter="s60" long-name="Search Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/searchfeatureplugin/group"/>
-</component>
-<component name="xmppsettingsapi" filter="s60" long-name="XMPP Settings API" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsapi/group"/>
-</component>
-<component name="xmppsettingsfetcher" filter="s60" long-name="XMPP Settings Fetcher" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/group"/>
-</component>
-<component name="ossprotocoladaptation" filter="s60" long-name="OSS Protocol Adaptation" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/ossprotocoladaptation/group"/>
-</component>
-<component name="instantmessagingcache" filter="s60" long-name="Instant Messaging Cache" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/instantmessagingcache/group"/>
-</component>
-</collection>
-<collection name="brandingserver" long-name="Branding Server" level="specific">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="brandingserver_build" filter="s60" long-name="Branding Server Build">
-<unit bldFile="mw/imsrv/brandingserver/group"/>
-</component>
-</collection>
-</block>
-<block name="legacypresence" level="specific" long-name="Legacy Presence Services" levels="engine fw ui">
-<collection name="pressrv_plat" long-name="Legacy Presence Services Platform Interfaces" level="ui">
-<component name="presence_list_api" long-name="Presence List API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/presence_list_api/group"/>
-</component>
-<component name="watcher_info_api" long-name="Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_info_api/group"/>
-</component>
-<component name="simple_documents_api" long-name="SIMPLE Documents API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_documents_api/group"/>
-</component>
-<component name="authorization_api" long-name="Authorization API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/authorization_api/group"/>
-</component>
-<component name="xdm_protocol_plugin_api" long-name="XDM Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_protocol_plugin_api/group"/>
-</component>
-<component name="watcher_api" long-name="Watcher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_api/group"/>
-</component>
-<component name="xdm_api" long-name="XDM API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_api/group"/>
-</component>
-<component name="registration_api" long-name="Registration API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/registration_api/group"/>
-</component>
-<component name="publisher_api" long-name="Publisher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/publisher_api/group"/>
-</component>
-<component name="messaging_connection_manager_api" long-name="Messaging Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/messaging_connection_manager_api/group"/>
-</component>
-<component name="xdm_settings_api" long-name="XDM Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_settings_api/group"/>
-</component>
-<component name="simple_settings_api" long-name="SIMPLE Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_settings_api/group"/>
-</component>
-<component name="simple_instant_msg_api" long-name="Simple Instant Msg API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_instant_msg_api/group"/>
-</component>
-</collection>
-<collection name="xdmengine" long-name="XDM Engine" level="engine">
-<!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
-<component name="xdmengine_build" filter="s60" long-name="XDM Engine Build">
-<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">
-<unit bldFile="mw/legacypresence/xdmprotocols/group"/>
-</component>
-</collection>
-<collection name="msgconnmanager" long-name="Messaging Connection Manager" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="msgconnmanager_build" filter="s60" long-name="Messaging Connection Manager Build">
-<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">
-<unit bldFile="mw/legacypresence/simpleengine/group"/>
-</component>
-</collection>
-<collection name="presencefwsimpleadpt" long-name="Presence Framework SIMPLE Adaptation" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="simpleplugin" filter="s60" long-name="SIMPLE Plugin" plugin="Y">
-<unit bldFile="mw/legacypresence/presencefwsimpleadpt/group"/>
-</component>
-</collection>
-<collection name="simpledatamodeladapter" long-name="SIMPLE Data Model Adapter" level="fw">
-<component name="presenceplugin" filter="s60" long-name="Presence Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/legacypresence/simpledatamodeladapter/group"/>
-</component>
-</collection>
-</block>
-<block name="opensrv" level="specific" long-name="Open Services" levels="prt lib server eng">
-<collection name="opensrv_plat" long-name="Open Services Platform Interfaces" level="eng">
-<component name="messagequeue_api" long-name="Message Queue API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/opensrv/opensrv_plat/messagequeue_api/group"/>
-</component>
-</collection>
-<collection name="loudmouth" long-name="Loudmouth" level="prt">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="loudmouth_build" filter="s60" long-name="Loudmouth Build" introduced="^2">
-<unit bldFile="mw/opensrv/loudmouth/group"/>
-</component>
-</collection>
-<collection name="libtelepathy" long-name="Telepathy Library" level="lib">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="libtelepathy_build" filter="s60" long-name="Telepathy Library Build" introduced="^2">
-<unit bldFile="mw/opensrv/libtelepathy/group"/>
-</component>
-</collection>
-<collection name="telepathygabble" long-name="Telepathy Gabble" level="eng">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="telepathygabble_build" filter="s60" long-name="Telepathy Gabble Build" introduced="^2">
-<unit bldFile="mw/opensrv/telepathygabble/group"/>
-</component>
-</collection>
-<collection name="isolationserver" long-name="Isolation Server" level="server">
-<component name="messagequeue" filter="s60" long-name="Message Queue" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/messagequeue/group"/>
-</component>
-<component name="isoserver" filter="s60" long-name="ISO Server" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/isoserver/group"/>
-</component>
-<component name="isolationserver_build" filter="s60" long-name="Isloation Server Build" introduced="^2">
-<!-- needs #includes removed. either move the exports to another component or make this a ROM component -->
-<unit bldFile="mw/opensrv/isolationserver/group"/>
-</component>
-</collection>
-</block>
-<block name="remotemgmt" level="specific" long-name="Remote Management" levels="plugin framework server generic specific">
-<collection name="remotemgmt_pub" long-name="Remote Management Public Interfaces" level="specific">
-<component name="synchronization_capability_api" long-name="Synchronization Capability API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
-</component>
-</collection>
-<collection name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" level="specific">
-<component name="common_agent_util_and_definitions_api" long-name="Common Agent util and definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
-</component>
-<component name="policy_management_certificate_api" long-name="Policy Management Certificate API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/group"/>
-</component>
-<component name="oma_provisioning_adapter_api" long-name="OMA Provisioning Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_adapter_api/group"/>
-</component>
-<component name="device_management_parameter_api" long-name="Device Management Parameter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_parameter_api/group"/>
-</component>
-<component name="data_synchronization_plugin_api" long-name="Data Synchronization Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/group"/>
-</component>
-<component name="sync_alert_handler_api" long-name="Sync Alert Handler API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
-</component>
-<component name="syncml_notifier_api" long-name="SyncML Notifier API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
-</component>
-<component name="syncml_client_api" long-name="SyncML Client API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
-</component>
-<component name="device_management_plugin_api" long-name="Device Management plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_plugin_api/group"/>
-</component>
-<component name="dm_tree_apis" long-name="DM Tree APIs" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
-</component>
-<component name="terminal_security_device_lock_api" long-name="Terminal Security Device Lock API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/group"/>
-</component>
-<component name="policy_management_request_api" long-name="Policy Management Request API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/group"/>
-</component>
-<component name="ds_constant_definitions_api" long-name="DS Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_constant_definitions_api/group"/>
-</component>
-<component name="scp_server_api" long-name="SCP Server API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/group"/>
-</component>
-<component name="data_synchronization_notification_api" long-name="Data Synchronization Notification API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_notification_api/group"/>
-</component>
-<component name="oma_provisioning_engine_api" long-name="OMA Provisioning Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/group"/>
-</component>
-<component name="dm_utils_api" long-name="DM Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/group"/>
-</component>
-<component name="syncml_alert_api" long-name="SyncML Alert API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/group"/>
-</component>
-<component name="obex_client_session_api" long-name="OBEX Client session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/obex_client_session_api/group"/>
-</component>
-<component name="setting_enforcement_info_api" long-name="Setting Enforcement Info API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/group"/>
-</component>
-<component name="dm_constant_definitions_api" long-name="DM Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
-</component>
-<component name="oma_ds_extensions_api" long-name="OMA DS Extensions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
-</component>
-<component name="pnpms_utils_api" long-name="PNPMS Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
-</component>
-<component name="diagnostics_plugin_utility_api" long-name="Diagnostics Plugin Utility API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
-</component>
-<component name="diagnostics_plugin_api" long-name="Diagnostics Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
-</component>
-<component name="diagnostics_framework_api" long-name="Diagnostics Framework API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
-</component>
-<component name="diagnostics_results_api" long-name="Diagnostics Results API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
-</component>
-<component name="diagnostics_plugin_pool_api" long-name="Diagnostics Plugin Pool API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
-</component>
-<component name="adaptive_history_list_api" long-name="Adaptive History List API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
-</component>
-<component name="adaptive_history_list_session_api" long-name="Adaptive History List Session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
-</component>
-<component name="fota_engine_api" long-name="FOTA Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
-</component>
-<component name="update_package_storage_plugin_api" long-name="Update Package Storage Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
-</component>
-<component name="syncml_notifier_roaming_api" long-name="SyncML Notifier Roaming API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
-</component>
-<component name="sync_service_api" long-name="Sync Service API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_service_api/group"/>
-</component>
-<component name="dcmo_adapter_api" long-name="DCMO Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_adapter_api/group"/>
-</component>
-<component name="dcmo_control_api" long-name="DCMO Control API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_control_api/group"/>
-</component>
-<component name="ds_capability_mgmt_plugin_api" long-name="DS Capability Management Plugin API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
-</component>
-<component name="dm_native_notifier_api" long-name="DM Native Notifier API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_native_notifier_api/group"/>
-</component>
-<component name="syncml_ds_error_reporting_api" long-name="SyncML DS Error Reporting API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_ds_error_reporting_api/group"/>
-</component>
-<component name="syncml_ds_customization_api" long-name="SyncML DS Customization API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_ds_customization_api/group"/>
-</component>
-</collection>
-<collection name="policymanagement" long-name="Policy Management" level="generic">
-<component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">
-<unit bldFile="mw/remotemgmt/policymanagement/pmdmadapter/group"/>
-</component>
-<component name="dmutilserver" filter="s60" long-name="DM Util Server">
-<unit bldFile="mw/remotemgmt/policymanagement/dmutilserver/group"/>
-</component>
-<component name="policyengine" filter="s60" long-name="Policy Engine">
-<unit bldFile="mw/remotemgmt/policymanagement/policyengine/group"/>
-</component>
-<component name="policymanagement_build" filter="s60" long-name="Policy Management Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/policymanagement/group"/>
-</component>
-</collection>
-<collection name="syncmlfw" long-name="SyncML Framework" level="server">
-<component name="syncmlfw_build" filter="s60" long-name="SyncML Framework Build">
-<!-- need to break this up into components. Too convoluted a structure to be in a single bld.inf-->
-<unit bldFile="mw/remotemgmt/syncmlfw/group"/>
-</component>
-</collection>
-<collection name="terminalsecurity" long-name="Terminal Security" level="specific">
-<component name="scp" filter="s60" long-name="Security Code Proxy">
-<!-- can only have one unit, need to have these #included from a single bld.inf -->
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpdatabase/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpserver/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scppatternplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scphistoryplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scptimestampplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpeventhandler/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/dmeventnotifier/group"/>
-</component>
-<component name="terminalsecurity_client" filter="s60" long-name="Terminal Control Client">
-<unit bldFile="mw/remotemgmt/terminalsecurity/client/group"/>
-</component>
-<component name="terminalsecurity_server" filter="s60" long-name="Terminal Control Server">
-<unit bldFile="mw/remotemgmt/terminalsecurity/server/group"/>
-</component>
-<component name="tcadapter" filter="s60" long-name="Terminal Control Adapter">
-<unit bldFile="mw/remotemgmt/terminalsecurity/tcadapter/bld"/>
-</component>
-<component name="terminalsecurity_build" filter="s60" long-name="Terminal Security Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/terminalsecurity/group"/>
-</component>
-</collection>
-<collection name="omaprovisioning" long-name="OMA Provisioning" level="specific">
-<component name="pnputil" filter="s60" long-name="PnP Util">
-<unit bldFile="mw/remotemgmt/omaprovisioning/pnputil/group"/>
-</component>
-<component name="provisioning" filter="s60" long-name="Provisioning">
-<unit bldFile="mw/remotemgmt/omaprovisioning/provisioning/group"/>
-</component>
-</collection>
-<collection name="devicediagnosticsfw" long-name="Device Diagnostics Framework" level="framework">
-<component name="diagframework" filter="s60" long-name="Diagnostics Framework">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
-</component>
-<component name="diagpluginbase" filter="s60" long-name="Diagnostics Plugin Base">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
-</component>
-<component name="diagresultsdb" filter="s60" long-name="Diagnostics Results Database">
-<!-- can only have one unit, merge or split into two components -->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
-</component>
-<component name="devicediagnosticsfw_build" filter="s60" long-name="Device Diagnostics Framework Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/group"/>
-</component>
-</collection>
-<collection name="dcmofw" long-name="Device Capability Management Object Framework" level="framework">
-<component name="dcmoclient" filter="s60" long-name="DCMO Client">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoclient/group"/>
-</component>
-<component name="dcmoserver" filter="s60" long-name="DCMO Server">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoserver/group"/>
-</component>
-<component name="dcmocustcmd" filter="s60" long-name="DCMO Custom Commands">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmocustcmd/group"/>
-</component>
-<component name="dcmofw_build" filter="s60" long-name="DCMO Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/dcmofw/group"/>
-</component>
-</collection>
-<collection name="fotaapplication" long-name="FOTA Application" level="generic">
-<component name="fotaapplication_build" filter="s60" long-name="FOTA Application Build">
-<!-- remove this component when configuration is in place and the #ifdefs have been worked out -->
-<unit bldFile="mw/remotemgmt/fotaapplication/group"/>
-</component>
-<component name="fotaserver" filter="s60" long-name="FOTA Server">
-<!-- uncomment when #ifdefs are resolved -->
-<!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
-</component>
-<component name="fotacustcmds" filter="s60" long-name="FOTA Custom Commands" class="placeholder">
-<!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
-<!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
-</component>
-</collection>
-</block>
-<block name="remotestorage" level="generic" long-name="Remote Storage" levels="framework if">
-<collection name="rsfw_plat" long-name="Remote Storage Platform Interfaces" level="if">
-<component name="rsfw_access_protocol_plugin_api" filter="s60" long-name="Remote Storage Framework Access Protocol Plugin API" class="api">
-<unit bldFile="mw/remotestorage/rsfw_plat/rsfw_access_protocol_plugin_api/group"/>
-</component>
-</collection>
-<collection name="remotestoragefw" long-name="Remote Storage Framework" level="framework">
-<component name="mountstore" filter="s60" long-name="RSFW Mount Store">
-<unit bldFile="mw/remotestorage/remotestoragefw/mountstore/group"/>
-</component>
-<component name="rsfwnotifierplugins" filter="s60" long-name="RSFW Notifier Plugins" plugin="Y">
-<unit bldFile="mw/remotestorage/remotestoragefw/rsfwnotifierplugins/group"/>
-</component>
-<component name="remotefileengine" filter="s60" long-name="Remote File Engine">
-<unit bldFile="mw/remotestorage/remotestoragefw/remotefileengine/group"/>
-</component>
-<component name="mountmanager" filter="s60" long-name="RSFW Mount Manager">
-<unit bldFile="mw/remotestorage/remotestoragefw/mountmanager/group"/>
-</component>
-<component name="webdavaccessplugin" filter="s60" long-name="WebDAV Access Plugin" plugin="Y">
-<unit bldFile="mw/remotestorage/remotestoragefw/webdavaccessplugin/group"/>
-</component>
-<component name="remotefilesystemplugin" filter="s60" long-name="Remote Filesystem Plugin" plugin="Y">
-<unit bldFile="mw/remotestorage/remotestoragefw/remotefilesystemplugin/group"/>
-</component>
-<component name="remotestoragegsplugin" filter="s60" long-name="RS GS Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
-<!-- <unit bldFile="remotestoragefw/gsplugin/group"/>-->
-</component>
-<component name="remotedriveconfigurationbiocontrol" filter="s60" long-name="Remote Drive Configuration BIO Control">
-<!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
-<!-- <unit bldFile="remotestoragefw/remotedriveconfigurationbiocontrol/group"/>-->
-</component>
-<component name="remotestoragefw_build" filter="s60" long-name="Remote Storage Framework Build">
-<!-- move exports to other components.
- This is needed for #includes of configured component until congigiration is in place -->
-<unit bldFile="mw/remotestorage/remotestoragefw/group"/>
-</component>
-</collection>
-</block>
-<block name="remoteconn" level="generic" long-name="Remote Connectivity" levels="plugin framework server generic specific">
-<collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
-<component name="secon" filter="s60" long-name="Service Controllers">
-<unit bldFile="mw/remoteconn/connectivitymodules/secon/group"/>
-</component>
-</collection>
-<collection name="remoteconn_info" long-name="Remote Connectivity Info" level="specific">
-<component name="remoteconn_metadata" long-name="Remote Connectivity Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mtptransports" long-name="MTP Transports" level="plugin">
-<component name="mtpusbtransport" long-name="MTP USB Transport" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpusbtransport/group" mrp="mw/remoteconn/mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
-</component>
-<component name="mtpptpiptransport" long-name="MTP PTP-IP Transport" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpptpiptransport/group" mrp="mw/remoteconn/mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
-</component>
-<component name="mtpcontroller" long-name="MTP Controller" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpcontroller/group" mrp="mw/remoteconn/mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
-</component>
-</collection>
-<collection name="mtpfws" long-name="MTP Frameworks" level="framework">
-<component name="mtpfw" long-name="MTP Framework" introduced="^2" purpose="optional">
-<unit bldFile="mw/remoteconn/mtpfws/mtpfw/group" mrp="mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/>
-</component>
-</collection>
-<collection name="mtpdataproviders" long-name="MTP Data Providers" level="generic">
-<component name="mtpfileandfolderdp" long-name="MTP File and Folder Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group" mrp="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
-</component>
-<component name="mtpimagedp" long-name="MTP Image Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpimagedp/group" mrp="mw/remoteconn/mtpdataproviders/mtpimagedp/group/mtp_imagedp.mrp"/>
-</component>
-<component name="mtppictbridgedp" long-name="MTP PictBridge Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group" mrp="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group/mtp_pictbridgedp.mrp"/>
-</component>
-</collection>
-<collection name="backupandrestore" long-name="Backup and Restore" level="specific">
-<component name="backupengine" long-name="Backup Engine" introduced="9.0" purpose="optional">
-<unit bldFile="mw/remoteconn/backupandrestore/backupengine/group" mrp="mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
-</component>
-<component name="backuptest" long-name="Backup Test" introduced="^2" purpose="development">
-<unit bldFile="mw/remoteconn/backupandrestore/backuptest/group" mrp="mw/remoteconn/backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
-</component>
-</collection>
-<collection name="obex" long-name="OBEX" level="generic">
-<component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexprotocol/group" mrp="mw/remoteconn/obex/obexprotocol/group/obex.mrp"/>
-</component>
-<component name="obexextensionapi" long-name="OBEX Extension API" introduced="9.2" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexextensionapi/group" mrp="mw/remoteconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
-</component>
-</collection>
-</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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<unit mrp="mw/srvdiscovery/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="dlnasrv" level="specific" long-name="DLNA Services" levels="stack server ctrl framework plugin">
-<!-- uncomment all the units when configuration is in place, they're currently #included from other xxx_build components -->
-<collection name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" level="plugin">
-<component name="upnp_media_server_settings_api" long-name="UPnP Media Server Settings API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_settings_api/group"/>
-</component>
-<component name="upnp_av_objects_api" long-name="UPnP A/V Objects API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_av_objects_api/group"/>
-</component>
-<component name="upnp_media_server_api" long-name="UPnP Media Server API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_api/group"/>
-</component>
-<component name="upnp_security_plugin_api" long-name="UPnP Security Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_security_plugin_api/group"/>
-</component>
-<component name="upnp_avcp_api" long-name="UPnP AVCP API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_avcp_api/group"/>
-</component>
-<component name="upnp_media_server_metadata_api" long-name="UPnP Media Server Metadata API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_metadata_api/group"/>
-</component>
-<component name="upnp_command_api" long-name="UPnP Command API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_command_api/group"/>
-</component>
-<component name="upnp_plugin_api" long-name="UPnP Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_plugin_api/group"/>
-</component>
-</collection>
-<collection name="upnpavcontrolpoint" long-name="UPnP A/V Control Point" level="plugin">
-<component name="avcontrolframework" filter="s60" long-name="A/V Control Famework" introduced="9.1" deprecated="^3">
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
-</component>
-<component name="upnpavcontrolpoint_build" filter="s60" long-name="UPnP A/V Control Point Build" introduced="9.1" deprecated="^3">
-<!-- put exports in other component instead -->
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/group"/>
-</component>
-</collection>
-<collection name="upnpmediaserver" long-name="UPnP Media Server" level="server">
-<component name="avobjects" filter="s60" long-name="A/V Objects">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/avobjects/group"/>
-</component>
-<component name="mediaserverclient" filter="s60" long-name="Media Server Client">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverclient/group"/>
-</component>
-<component name="connectionmanagerservice" filter="s60" long-name="Connection Manager Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/connectionmanagerservice/group"/>
-</component>
-<component name="contentdirectoryservice" filter="s60" long-name="Content Directory Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/contentdirectoryservice/group"/>
-</component>
-<component name="mediaserverengine" filter="s60" long-name="Media Server Engine">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverengine/group"/>
-</component>
-<component name="upnpmediaserver_build" filter="s60" long-name="UPnP Media Server Build">
-<!-- move exports into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpmediaserver/group"/>
-</component>
-</collection>
-<collection name="upnpavcontroller" long-name="UPnP A/V Controller" level="ctrl">
-<component name="upnpxmlparser" filter="s60" long-name="UPnP XML Parser" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpxmlparser/group"/>
-</component>
-<component name="upnpavcontrollerserver" filter="s60" long-name="UPnP A/V Controller Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerserver/group"/>
-</component>
-<component name="upnpavcontrollerclient" filter="s60" long-name="UPnP A/V Ccontroller Client" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerclient/group"/>
-</component>
-<component name="upnpavcontrollerhelper" filter="s60" long-name="UPnP A/V Controller Helper" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerhelper/group"/>
-</component>
-<component name="upnpavcontroller_build" filter="s60" long-name="UPnP A/V Controller Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpavcontroller/group"/>
-</component>
-</collection>
-<collection name="upnpframework" long-name="UPnP Framework" level="framework">
-<component name="upnputilities" filter="s60" long-name="UPnP Utilities" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnputilities/group"/>
-</component>
-<component name="upnpextensionpluginif" filter="s60" long-name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpextensionpluginif/group"/> -->
-</component>
-<component name="upnpfiletransferengine" filter="s60" long-name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>-->
-</component>
-<component name="upnpcommonui" filter="s60" long-name="UPnP Common UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpcommonui/group"/>-->
-</component>
-<component name="upnpaiwengine" filter="s60" long-name="UPnP AIW Engine" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpaiwengine/group"/> -->
-</component>
-<component name="upnpaiwprovider" filter="s60" long-name="UPnP AIW Provider" introduced="^2" deprecated="^3" plugin="Y">
-<!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
-</component>
-<component name="upnpmusicadapter" filter="s60" long-name="UPnP Music Adapter" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
-</component>
-<component name="upnpcommand" filter="s60" long-name="UPnP Command" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpcommand/group"/>
-</component>
-<component name="upnpframework_build" filter="s60" long-name="UPnP Framework Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpframework/group"/>
-</component>
-</collection>
-<collection name="upnpsettings" long-name="UPnP Settings" level="framework">
-<component name="upnpsettingsengine" filter="s60" long-name="UPnP Settings Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
-</component>
-<component name="multiselectionui" filter="s60" long-name="Multi-Selection UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/multiselectionui/group"/>-->
-</component>
-<component name="appwizard" filter="s60" long-name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/appwizard/group"/>-->
-</component>
-<component name="upnpsharingui" filter="s60" long-name="UPnP Sharing UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
-</component>
-<component name="upnpgsplugin" filter="s60" long-name="UPnP GS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
-</component>
-<component name="upnpsettings_build" filter="s60" long-name="UPnP Settings Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsettings/group"/>
-</component>
-</collection>
-<collection name="upnpsharing" long-name="UPnP Sharing" level="server">
-<component name="upnpdlnaprofiler" filter="s60" long-name="UPnP DLNA Profiler" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpdlnaprofiler/group"/>
-</component>
-<component name="upnpsecurity" filter="s60" long-name="UPnP Security" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpsecurity/group"/>
-</component>
-<component name="upnpcontentserver" filter="s60" long-name="UPnP Content Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpcontentserver/group"/>
-</component>
-<component name="applicationengine" filter="s60" long-name="UPnP Application Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/applicationengine/group"/>
-</component>
-<component name="upnpsharing_build" filter="s60" long-name="UPnP Sharing Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsharing/group"/>
-</component>
-</collection>
-<collection name="upnpmpxplugins" long-name="UPnP MPX Plugins" level="plugin">
-<component name="upnpplaybackplugins" filter="s60" long-name="UPnP Playback Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/upnpplaybackplugins/group"/>
-</component>
-<component name="upnpmpxplugins_build" filter="s60" long-name="UPnP MPX Plugins Build" introduced="^2">
-<!-- move exports content into other component? -->
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/group"/>
-</component>
-</collection>
-<collection name="upnpharvester" long-name="UPnP Harvester" level="ctrl">
-<component name="upnpharvester_common" filter="s60" long-name="UPnP Harvester Common" introduced="^2" deprecated="^3" class="placeholder">
-<!-- need to merge or #include these to a single bld.inf -->
-<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
- <unit bldFile="upnpharvester/common/cmsettings/group"/>
- <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
- <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
-</component>
-<component name="cdssync" filter="s60" long-name="CDS Sync" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
-</component>
-<component name="mdhserver" filter="s60" long-name="Metadata Harvester Server" introduced="^2" deprecated="^3" class="placeholder">
-<!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
-</component>
-<component name="upnpharvester_build" filter="s60" long-name="UPnP Harvester Build" introduced="^2" deprecated="^3" class="placeholder">
-<!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
-<!--<unit bldFile="upnpharvester/group"/>-->
-</component>
-</collection>
-<collection name="homesync" long-name="Home Sync" level="plugin">
-<component name="contentmanager" filter="s60" long-name="Content Manager" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homesync/group"/>-->
-<!-- move bld.inf into contentmanager dir -->
-</component>
-</collection>
-<collection name="homemedia" long-name="Home Media" level="framework">
-<!-- collection is really just a component. Move down a directory -->
-<component name="homemedia_build" filter="s60" long-name="Home Media" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homemedia/group"/> -->
-</component>
-</collection>
-<collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin">
-<component name="dlnasrv_build" filter="s60" long-name="DLNA Services Build">
-<!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed -->
-<unit bldFile="mw/dlnasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="btservices" level="generic" long-name="Bluetooth Services" levels="framework server generic specific plugin">
-<collection name="btservices_pub" long-name="BT Services Public Interfaces" level="plugin">
-<component name="bluetooth_power_state_api" long-name="Bluetooth Power State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_power_state_api/group"/>
-</component>
-<component name="bluetooth_notifier_api" long-name="Bluetooth Notifier API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_notifier_api/group"/>
-</component>
-</collection>
-<collection name="btservices_plat" long-name="BT Services Platform Interfaces" level="plugin">
-<component name="bluetooth_dosserver_audio_api" long-name="Bluetooth DOS Server Audio API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dosserver_audio_api/group"/>
-</component>
-<component name="bluetooth_dut_mode_api" long-name="Bluetooth DUT Mode API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dut_mode_api/group"/>
-</component>
-<component name="bluetooth_engine_api" long-name="Bluetooth Engine API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-<component name="bluetooth_local_variation_api" long-name="Bluetooth Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_local_variation_api/group"/>
-</component>
-<component name="bluetooth_notifier_internal_api" long-name="Bluetooth Notifier internal API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_notifier_internal_api/group"/>
-</component>
-<component name="bluetooth_sap_connection_state_api" long-name="Bluetooth SAP Connection State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_sap_connection_state_api/group"/>
-</component>
-<component name="bluetooth_secondary_display_notification_api" long-name="Bluetooth Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_secondary_display_notification_api/group"/>
-</component>
-</collection>
-<collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
-<component name="bteng" filter="s60" long-name="Bluetooth Engine">
-<unit bldFile="mw/btservices/bluetoothengine/bteng/group"/>
-</component>
-<component name="btnotif" filter="s60" long-name="Bluetooth Notifier">
-<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"/>
-</component>
-<component name="btmac" filter="s60" long-name="Bluetooth Mono Audio Controller" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btmac/group"/>
-</component>
-<component name="btsac" filter="s60" long-name="Bluetooth Stereo Audio Controller" plugin="Y">
-<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"/>
-</component>
-<component name="btsap" filter="s60" long-name="Bluetooth SIM Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btsap/group"/>
-</component>
-<component name="btui" filter="s60" long-name="Bluetooth UI">
-<unit bldFile="mw/btservices/bluetoothengine/btui/group"/>
-</component>
-<component name="btpbap" filter="s60" long-name="Bluetooth Phonebook Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btpbap/group"/>
-</component>
-<component name="bthid" filter="s60" long-name="Bluetooth HID">
-<unit bldFile="mw/btservices/bluetoothengine/bthid/group"/>
-</component>
-<component name="btctrldcmoadapter" filter="s60" long-name="Bluetooth Control DCMO Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btctrldcmoadapter/group"/>
-</component>
-</collection>
-<collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
-<component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
-<unit bldFile="mw/btservices/bluetoothappprofiles/avrcp" mrp="mw/btservices/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
-</component>
-</collection>
-<collection name="atcommands" long-name="AT Commands" level="generic">
-<component name="modematplugin" long-name="Modem AT Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/modematplugin/group"/>
-</component>
-<component name="lccustomplugin" long-name="LC Custom Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/lccustomplugin/group"/>
-</component>
-</collection>
-<collection name="btservices_info" long-name="BT Services Info" level="plugin">
-<component name="btservices_metadata" long-name="BT Services Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usbservices" level="generic" long-name="USB Services" levels="framework server generic specific plugin">
-<collection name="usbservices_plat" long-name="USB Services Platform Interfaces" level="plugin">
-<component name="pictbridge_api" long-name="PictBridge API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/pictbridge_api/group"/>
-</component>
-<component name="ptp_responder_api" long-name="PTP Responder API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_responder_api/group"/>
-</component>
-<component name="ptp_transport_api" long-name="PTP Transport API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_transport_api/group"/>
-</component>
-<component name="usb_device_control_plugin_api" long-name="USB Device Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_device_control_plugin_api/group"/>
-</component>
-<component name="usb_notifier_api" long-name="USB Notifier API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_notifier_api/group"/>
-</component>
-<component name="usb_personality_api_header" long-name="USB Personality API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_api_header/group"/>
-</component>
-<component name="usb_personality_plugin_api" long-name="USB Personality Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_plugin_api/group"/>
-</component>
-<component name="usb_secondary_display_api" long-name="USB Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_secondary_display_api/group"/>
-</component>
-<component name="usb_watcher_api" long-name="USB Watcher API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_api/group"/>
-</component>
-<component name="usb_watcher_info_api_header" long-name="USB Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_info_api_header/group"/>
-</component>
-</collection>
-<collection name="usbservices_info" long-name="USB Services Info" level="plugin"/>
-<collection name="usbengines" long-name="USB Engines" level="generic">
-<component name="usbotgwatcher" filter="s60" long-name="USB OTG Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbotgwatcher/group"/>
-</component>
-<component name="usbwatcher" filter="s60" long-name="USB Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbwatcher/group"/>
-</component>
-<component name="usblocodplugin" filter="s60" long-name="USB Local Connectivity Domain Plugin" plugin="Y">
-<unit bldFile="mw/usbservices/usbengines/usblocodplugin/group"/>
-</component>
-<component name="usbdevcon" filter="s60" long-name="USB Device Control">
-<unit bldFile="mw/usbservices/usbengines/usbdevcon/group"/>
-</component>
-<component name="usbremotepersonality" filter="s60" long-name="USB Remote Personality">
-<unit bldFile="mw/usbservices/usbengines/usbremotepersonality/group"/>
-</component>
-</collection>
-<collection name="usbclasses" long-name="USB Classes" level="framework">
-<component name="usbobexclasscontroller" filter="s60" long-name="USB OBEX Class Controller" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbobexclasscontroller/group"/>
-</component>
-<component name="usbbasicpersonality" filter="s60" long-name="USB Basic Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbbasicpersonality/group"/>
-</component>
-<component name="usbmscpersonality" filter="s60" long-name="USB MSC Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbmscpersonality/group"/>
-</component>
-<!-- commented out in bld.inf. Should this be deleted?
- <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
- <unit bldFile="usbclasses/ptpstack/group"/>
- </component>
- <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
- <unit bldFile="usbclasses/sicdusbplugin/group"/>
- </component>
- <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
- <unit bldFile="usbclasses/ptpserver/group"/>
- </component>-->
-<component name="pictbridgeengine" filter="s60" long-name="PictBridge Engine">
-<unit bldFile="mw/usbservices/usbclasses/pictbridgeengine/group"/>
-</component>
-<component name="usbphoneasmodem" filter="s60" long-name="USB Phone as Modem" introduced="^3">
-<unit bldFile="mw/usbservices/usbclasses/usbphoneasmodem/group"/>
-</component>
-</collection>
-<collection name="usbuis" long-name="USB UIs" level="specific">
-<component name="usbui" filter="s60" long-name="USB UI">
-<unit bldFile="mw/usbservices/usbuis/usbui/group"/>
-</component>
-<component name="usbuinotif" filter="s60" long-name="USB UI Notifiers">
-<unit bldFile="mw/usbservices/usbuis/usbuinotif/group"/>
-</component>
-<component name="imageprintuiprovider" filter="s60" long-name="ImagePrint UI Provider" plugin="Y">
-<unit bldFile="mw/usbservices/usbuis/imageprintuiprovider/group"/>
-</component>
-<component name="usbimageprintui" filter="s60" long-name="ImagePrint UI">
-<unit bldFile="mw/usbservices/usbuis/imageprintui/group"/>
-</component>
-</collection>
-</block>
-<block name="shortlinkconn" level="generic" long-name="Shortlink Connectivity" levels="framework server generic specific plugin">
-<!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
-<collection name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" level="plugin">
-<component name="obex_service_utils_api" long-name="OBEX Service Utils API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_utils_api/group"/>
-</component>
-<component name="obex_service_plugin_api" long-name="OBEX Service Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_plugin_api/group"/>
-</component>
-<component name="dialup_connection_status_api" long-name="Dial-up Connection Status API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dialup_connection_status_api/group"/>
-</component>
-<component name="dun_secondary_display_notification_api" long-name="DUN Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
-</component>
-<component name="obex_secondary_display_notification_api" long-name="OBEX Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
-</component>
-<component name="generic_hid_api" long-name="Generic HID API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/generic_hid_api/group"/>
-</component>
-<component name="locod_bearer_plugin_api" long-name="Locod Bearer Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/locod_bearer_plugin_api/group"/>
-</component>
-<component name="usb_obexservicemanager_client_api" long-name="USB OBEX Service Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_obexservicemanager_client_api/group"/>
-</component>
-</collection>
-<collection name="localconnectivityservice" long-name="Local Connectivity Service" level="server">
-<component name="locod" long-name="Local Connectivity Daemon">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/locod/group"/>
-</component>
-<component name="obexserviceman" long-name="OBEX Service Managar">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
-</component>
-<component name="obexsendservices" long-name="OBEX Send Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
-</component>
-<component name="obexreceiveservices" long-name="OBEX Receive Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
-</component>
-<component name="dun" long-name="Dial Up Networking">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/dun/group"/>
-</component>
-<component name="lcstylustap" long-name="LC Stylus Tap Plugins" plugin="Y">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/lcstylustap/group"/>
-</component>
-<component name="generichid" long-name="Generic HID">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/generichid/group"/>
-</component>
-<component name="headset" long-name="Headset">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/headset/group"/>
-</component>
-</collection>
-</block>
-<block name="imghandling" level="specific" long-name="Image Handling" levels="lib util if">
-<collection name="imagehandling_plat" long-name="Image Handling Platform Interfaces" level="if">
-<component name="image_handling_library_api" long-name="Image Handling Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
-</component>
-<component name="3gp_library_api" long-name="3GP Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
-</component>
-<component name="thumbnailmanager_api" long-name="Thumbnail Manager API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagehandlinglib" long-name="Image Handling Library" level="lib">
-<!-- collection is really a component, need to move down a directory -->
-<component name="ihl" filter="s60" long-name="IHL">
-<unit bldFile="mw/imghandling/imagehandlinglib/group"/>
-</component>
-</collection>
-<collection name="imagehandlingutilities" long-name="Image Handling Utilities" level="util">
-<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager">
-<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
-</component>
-</collection>
-</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">
-<unit bldFile="mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
-</component>
-</collection>
-</block>
-<block name="mds" level="specific" long-name="Metadata Services" levels="mgr eng server int">
-<collection name="mds_plat" long-name="Metadata Services Platform Interfaces" level="int">
-<component name="context_engine_plugin_api" long-name="Context Engine Plugin API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/group" filter="!test"/>
-</component>
-<component name="harvester_framework_api" long-name="Harvester Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/harvester_framework_api/group" filter="!test"/>
-<!-- can only have one unit with the same filter, #include the following from the previous unit -->
-</component>
-<component name="location_manager_api" long-name="Location Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/location_manager_api/group" filter="!test"/>
-</component>
-<component name="metadata_engine_api" long-name="Metadata Engine API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/metadata_engine_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_collection_manager_api" long-name="Content Listing Framework Collection Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_extended_api" long-name="Content Listing Framework Extended API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_extended_api/group"/>
-</component>
-</collection>
-<collection name="mds_pub" long-name="Metadata Services Public Interfaces" level="int">
-<component name="content_listing_framework_api" long-name="Content Listing Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_pub/content_listing_framework_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="metadataengine" long-name="Metadata Engine" level="eng">
-<component name="metadataengine_common" filter="s60" long-name="Metadata Engine Common" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/common/group"/>
-</component>
-<component name="metadataengine_server" filter="s60" long-name="Metadata Engine Server" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/server/group"/>
-</component>
-<component name="metadataengine_client" filter="s60" long-name="Metadata Engine Client" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/client/group"/>
-</component>
-<component name="metadataengine_build" filter="s60" long-name="Metadata Engine Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/metadataengine/group"/>
-</component>
-</collection>
-<collection name="locationmanager" long-name="Location Manager" level="mgr">
-<component name="locationtrail" filter="s60" long-name="Location Trail" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/locationtrail/group"/>
-</component>
-<component name="locationmanager_server" filter="s60" long-name="Location Manager Server" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/server/group"/>
-</component>
-<component name="locationmanager_client" filter="s60" long-name="Location Manager Client" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/client/group"/>
-</component>
-<component name="locationmanager_build" filter="s60" long-name="Location Manager Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/locationmanager/group"/>
-</component>
-</collection>
-<collection name="contextengine" long-name="Context Engine" level="eng">
-<component name="contextengine_plugins" filter="s60" long-name="Context Engine Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/contextengine/plugins/group"/>
-</component>
-<component name="contextengine_build" filter="s60" long-name="Context Engine Build" introduced="^2">
-<!--make this collection a single component, or make this unit self-contained -->
-<unit bldFile="mw/mds/contextengine/group"/>
-</component>
-</collection>
-<collection name="harvester" long-name="Harvester" level="eng">
-<component name="blacklistclient" filter="s60" long-name="Blacklist Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistclient/group"/>
-</component>
-<component name="blacklistserver" filter="s60" long-name="Blacklist Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistserver/group"/>
-</component>
-<component name="harvester_common" filter="s60" long-name="Harvester Common" introduced="^2">
-<unit bldFile="mw/mds/harvester/common/group"/>
-</component>
-<component name="composerplugins" filter="s60" long-name="Composer Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/composerplugins/group"/>
-</component>
-<component name="harvesterplugins" filter="s60" long-name="Harvester Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/harvesterplugins/group"/>
-</component>
-<component name="monitorplugins" filter="s60" long-name="Monitor Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/monitorplugins/group"/>
-</component>
-<component name="harvester_server" filter="s60" long-name="Harvester Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/server/group"/>
-</component>
-<component name="harvester_client" filter="s60" long-name="Harvester Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/client/group"/>
-</component>
-<component name="harvester_build" filter="s60" long-name="Harvester Build" introduced="^2">
-<!-- split these exports into the other components -->
-<unit bldFile="mw/mds/harvester/group"/>
-</component>
-</collection>
-<collection name="watchdog" long-name="Watchdog" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="mdswatchdog" filter="s60" long-name="Metadata Watchdog" introduced="^2">
-<unit bldFile="mw/mds/watchdog/group"/>
-</component>
-</collection>
-<collection name="clfwrapper" long-name="Content Listing Framework Wrapper" level="int">
-<!-- collection is really a component. Move down a directory -->
-<component name="clfwrapper_build" filter="s60" long-name="CLF Wrapper Build" introduced="^2" class="placeholder">
-<!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
-<!--<unit bldFile="clfwrapper/group"/>-->
-</component>
-</collection>
-<collection name="mds_info" long-name="Metadata Services Info" level="int">
-<component name="mds_build" filter="s60" long-name="Metadata Services Build" introduced="^2">
-<!-- consider distributiing this into the rest of the components in the package -->
-<unit bldFile="mw/mds/group"/>
-</component>
-</collection>
-</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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<unit bldFile="mw/mmuifw/mmuifw_plat/alf_customlayoutmanagers_api/group"/>
-</component>
-<component name="gesturehelper_api" long-name="Gesture Helper API" filter="s60" 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">
-<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">
-<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">
-<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">
-<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">
-<!-- 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">
-<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">
-<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">
-<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">
-<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">
-<unit bldFile="mw/mmuifw/mulwidgets/mullogging/group"/>
-</component>
-<component name="muldatamodel" filter="s60" long-name="MUL Data Model">
-<unit bldFile="mw/mmuifw/mulwidgets/muldatamodel/group"/>
-</component>
-<component name="mulwidgets_common" filter="s60" long-name="MUL Common Utils">
-<unit bldFile="mw/mmuifw/mulwidgets/common/group"/>
-</component>
-<component name="gesturehelper" filter="s60" long-name="Gesture Helper">
-<unit bldFile="mw/mmuifw/mulwidgets/gesturehelper/group"/>
-</component>
-<component name="mulcoverflowwidget" filter="s60" long-name="MUL CoverFlow Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/mulcoverflowwidget/group"/>
-</component>
-<component name="mulsliderwidget" filter="s60" long-name="MUL Slider Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/mulsliderwidget/group"/>
-</component>
-<component name="alfviewwidget" filter="s60" long-name="ALF View Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/alfviewwidget/group"/>
-</component>
-<component name="alfcontainerwidget" filter="s60" long-name="ALF Container Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/alfcontainerwidget/group"/>
-</component>
-<component name="alfscrollbarwidget" filter="s60" long-name="ALF Scrollbar Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/alfscrollbarwidget/group"/>
-</component>
-</collection>
-</block>
-<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"/>
-</component>
-<component name="videoconnutility_api" long-name="Video Connection Utility API" filter="s60" class="api">
-<unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/group"/>
-</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"/>
-</component>
-</collection>
-<collection name="videoscheduler" long-name="Video Scheduler" level="util">
-<component name="schedulerclient" filter="s60" long-name="Video Scheduler Client">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerclient/group"/>
-</component>
-<component name="schedulerserver" filter="s60" long-name="Video Scheduler Server">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerserver/group"/>
-</component>
-</collection>
-<collection name="videoconnutility" long-name="Video Connection Utility" level="util">
-<component name="connutilpsworker" filter="s60" long-name="Connection Utility Publish and Subscribe Worker">
-<unit bldFile="mw/videoutils/videoconnutility/connutilpsworker/group"/>
-</component>
-<component name="video_connutility" filter="s60" long-name="Video Connection Utility">
-<unit bldFile="mw/videoutils/videoconnutility/connutility/group"/>
-</component>
-</collection>
-<collection name="videoutils_info" long-name="Video Utils Info" level="if"/>
-</block>
-<block name="mmmw" level="generic" long-name="Multimedia Middleware" levels="plugin framework server generic specific">
-<collection name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" level="specific">
-<component name="multimedia_data_source_api" long-name="Multimedia Data Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
-</component>
-<component name="progressive_download_api" long-name="Progressive Download API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/progressive_download_api/group"/>
-</component>
-<component name="equalizer_ui_api" long-name="Equalizer UI API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
-</component>
-<component name="enhanced_media_client_api" long-name="Enhanced Media Client API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
-</component>
-<component name="stream_control_custom_command_api" long-name="Stream Control Custom Command API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
-</component>
-<component name="emc_buffer_source_api" long-name="EMC Buffer Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_buffer_source_api/group"/>
-</component>
-<component name="emc_file_source_api" long-name="EMC File Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
-</component>
-<component name="audio_metadata_reader_api" long-name="Audio MetaData Reader API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
-</component>
-<component name="emc_progressive_download_source_api" long-name="EMC Progressive Download Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
-</component>
-<component name="emc_volume_effect_api" long-name="EMC Volume Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
-</component>
-<component name="emc_balance_effect_api" long-name="EMC Balance Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_balance_effect_api/group"/>
-</component>
-<component name="emc_descriptor_source_api" long-name="EMC Descriptor Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_descriptor_source_api/group"/>
-</component>
-<component name="emc_drm_config_intfc_api" long-name="EMC DRM Config Intfc API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
-</component>
-<component name="voip_audio_services_api" long-name="VoIP Audio Services" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/group"/>
-</component>
-<component name="configuration_components_factory_api" long-name="Configuration Components Factory API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
-</component>
-<component name="audio_output_control_utility_api" long-name="Audio Output Control Utility API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/group"/>
-</component>
-<component name="audio_output_control_utility_proxy_api" long-name="Audio Output Control Utility Proxy API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
-</component>
-<component name="emc_audio_effects_api" long-name="EMC Audio Effects API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
-</component>
-<component name="call_audio_control_api" long-name="Call AudioControl API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/group"/>
-</component>
-<component name="radio_utilities_api" long-name="Radio Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/group"/>
-</component>
-<component name="radio_preset_utilities_api" long-name="Radio Preset Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
-</component>
-<component name="radio_monitor_api" long-name="Radio Monitor API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
-</component>
-<component name="thumbnail_engine_api" long-name="Thumbnail Engine API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/thumbnail_engine_api/group"/>
-</component>
-<component name="telephony_multimedia_service_api" long-name="Telephony Multimedia Service API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="mmfenh" long-name="MMF Enhancements" level="generic">
-<component name="advancedaudiocontroller" filter="s60" long-name="Advanced Audio Controllers" plugin="Y">
-<unit bldFile="mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
-</component>
-<component name="audiooutputcontrolutility" filter="s60" long-name="Audio Output Control Utility">
-<unit bldFile="mw/mmmw/mmfenh/audiooutputcontrolutility/group"/>
-</component>
-<component name="configurationcomponentsfactory" filter="s60" long-name="Configuration Components Factory">
-<unit bldFile="mw/mmmw/mmfenh/configurationcomponentsfactory/group"/>
-</component>
-<component name="enhancedaudioplayerutility" filter="s60" long-name="Enhanced Audio Player Utility">
-<unit bldFile="mw/mmmw/mmfenh/enhancedaudioplayerutility/group"/>
-</component>
-<component name="enhancedmediaclient" filter="s60" long-name="Enhanced Media Client">
-<unit bldFile="mw/mmmw/mmfenh/enhancedmediaclient/group"/>
-</component>
-<component name="profilesettingsmonitor" filter="s60" long-name="Profile Settings Monitor">
-<unit bldFile="mw/mmmw/mmfenh/profilesettingsmonitor/group"/>
-</component>
-<component name="progressivedownload" filter="s60" long-name="Progressive Download">
-<unit bldFile="mw/mmmw/mmfenh/progressivedownload/group"/>
-</component>
-</collection>
-<collection name="mm_fw" long-name="Multimedia Frameworks" level="framework">
-<!-- Id needs to be unique, mmfw already in use -->
-<!-- Placeholder for OpenAX AL and other stuff -->
-</collection>
-<collection name="mmserv" long-name="Multimedia Services" level="specific">
-<component name="audioeffectsui" filter="s60" long-name="Audio Effects UI">
-<unit bldFile="mw/mmmw/mmserv/audioeffectsui/group"/>
-</component>
-<component name="callaudiocontrol" filter="s60" long-name="Call Audio Control">
-<unit bldFile="mw/mmmw/mmserv/callaudiocontrol/group"/>
-</component>
-<component name="metadatautility" filter="s60" long-name="Metadata Utility">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/group"/>
-</component>
-<component name="radioutility" filter="s60" long-name="Radio Utility">
-<unit bldFile="mw/mmmw/mmserv/radioutility/group"/>
-</component>
-<component name="thumbnailengine" filter="s60" long-name="Thumbnail Engine" introduced="^2">
-<unit bldFile="mw/mmmw/mmserv/thumbnailengine/group"/>
-</component>
-<component name="tms" filter="s60" long-name="Telephony Multimedia Service" introduced="^3">
-<unit bldFile="mw/mmmw/mmserv/tms/group"/>
-</component>
-<component name="voipaudioservices" filter="s60" long-name="VoIP Audio Services">
-<unit bldFile="mw/mmmw/mmserv/voipaudioservices/group"/>
-</component>
-<component name="lib3gpextparser" filter="s60" long-name="3GP Extension Metadata Parser Library">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group" filter="sf_build"/>
-</component>
-</collection>
-<collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
-<component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="helix" level="generic" long-name="Helix" levels="plugin framework server generic specific">
-<collection name="helix_ren" long-name="Helix Engine" level="framework">
-<!-- what does "ren" stand for? -->
-<component name="helix_stub" filter="s60" long-name="Helix Stub" introduced="^2" class="api">
-<unit bldFile="mw/helix/helix_ren/helix_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="camerasrv" level="specific" long-name="Camera Services" levels="plugin fw api">
-<collection name="camerasrv_plat" long-name="Camera Services Platform Interfaces" level="api">
-<component name="media_recorder_sink_api" long-name="Media Recorder Sink API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
-</component>
-<component name="cae_extentension_api" long-name="CAE Extension API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/cae_extentension_api/group"/>
-</component>
-<component name="camera_application_engine_api" long-name="Camera Application Engine API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/camera_application_engine_api/group" filter="!test"/>
-</component>
-<component name="custom_onboard_camera_api" long-name="Custom Onboard Camera API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
-</component>
-<component name="imaging_configuration_manager_api" long-name="Imaging Configuration Manager API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
-</component>
-<component name="media_recorder_api" long-name="Media Recorder API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_api/group" filter="!test"/>
-</component>
-<component name="3gp_file_composer_api" long-name="3GP File Composer API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
-</component>
-<component name="asynchronous_file_saving_queue_api" long-name="Asynchronous File Saving Queue API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="camappengine" long-name="Camera App Engine" level="fw">
-<!-- is this collection really a component? If so, move down a directory -->
-<component name="stillconverter" filter="s60" long-name="Still Image Converter" class="placeholder">
-<!-- should separate this from parent engine's bld.inf -->
-<!-- <unit bldFile="camappengine/stillconverter/group"/> -->
-</component>
-<component name="camappengine_engine" filter="s60" long-name="Camera App Engine" class="placeholder">
-<!-- should separate this from parent engine's bld.inf -->
-<!-- <unit bldFile="camappengine/engine/group"/> -->
-</component>
-<component name="asynchfilesavequeue" filter="s60" long-name="Asynch File Save Queue">
-<unit bldFile="mw/camerasrv/camappengine/asynchfilesavequeue/group"/>
-</component>
-<component name="camappengine_build" filter="s60" long-name="Camera App Engine Build">
-<unit bldFile="mw/camerasrv/camappengine/build"/>
-</component>
-</collection>
-<collection name="camcordermmfplugin" long-name="Camcorder MMF Plugin" level="plugin">
-<!-- collection is really a component. Should move down a directory -->
-<component name="camcordermmfplugin_build" filter="s60" long-name="Camcorder MMF Plugin Build" plugin="Y">
-<unit bldFile="mw/camerasrv/camcordermmfplugin/build"/>
-</component>
-</collection>
-<collection name="configmanagers" long-name="Config Managers" level="api">
-<component name="imagingconfigmanager" filter="s60" long-name="Imaging Config Manager">
-<unit bldFile="mw/camerasrv/configmanagers/imagingconfigmanager/group"/>
-</component>
-</collection>
-<collection name="camerasrv_info" long-name="Camera Services Info" level="api">
-<component name="camerasrv_build" filter="s60" long-name="Camera Services Build">
-<!-- should split into individual bld.infs -->
-<unit bldFile="mw/camerasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="mmappfw" level="specific" long-name="Multimedia App Framework" levels="fw utils if">
-<collection name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" level="if">
-<component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interfaces Build" introduced="^1" filter="s60">
-<!-- this is no longer necessary when confguration is put in place -->
-<unit bldFile="mw/mmappfw/mmappfw_plat"/>
-</component>
-<component name="collection_helper_api" long-name="Collection Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
-</component>
-<component name="harvester_collection_mediator_api" long-name="Harvester Collection Mediator API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/group"/>
-</component>
-<component name="harvester_metadata_extractor_api" long-name="Harvester Metadata Extractor API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/group"/>
-</component>
-<component name="harvester_server_api" long-name="Harvester Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_server_api/group"/>
-</component>
-<component name="harvester_utility_api" long-name="Harvester Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_utility_api/group"/>
-</component>
-<component name="playlist_engine_api" long-name="Playlist Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playlist_engine_api/group"/>
-</component>
-<component name="mtp_keys_api" long-name="MTP Keys API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mtp_keys_api/group"/>
-</component>
-<component name="mpx_collection_common_definition_api" long-name="MPX Collection Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_common_definition_api/group"/>
-</component>
-<component name="mpx_collection_utility_api" long-name="MPX Collection Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/group"/>
-</component>
-<component name="mpx_common_api" long-name="MPX Common API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_api/group"/>
-</component>
-<component name="mpx_common_definition_api" long-name="MPX Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_common_definition_api" long-name="MPX Playback Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_utility_api" long-name="MPX Playback Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/group"/>
-</component>
-<component name="mpx_base_view_plugins_api" long-name="MPX Base View Plugins API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/group"/>
-</component>
-<component name="mpx_view_utility_api" long-name="MPX View Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_view_utility_api/group"/>
-</component>
-<component name="mpx_albumart_utility_api" long-name="MPX Album Art Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/group"/>
-</component>
-<component name="media_player_settings_engine_api" long-name="Media Player Settings Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
-</component>
-<component name="mpx_backstepping_utility_api" long-name="MPX Backstepping Utility API" introduced="^1" filter="s60" class="api">
-<!-- uncomment when configuration is put in place
- <unit bldFile="mmappfw_plat/mpx_backstepping_utility_api/group"/> -->
-</component>
-<component name="asx_parser_api" long-name="ASX Parser API" introduced="^1" filter="s60" class="api">
-<!-- uncomment when configuration is put in place
- <unit bldFile="mmappfw_plat/asx_parser_api/group"/> -->
-</component>
-<component name="playback_helper_api" long-name="Playback Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playback_helper_api/group"/>
-</component>
-<component name="videoplaylist_utility_api" long-name="Video Playlist Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/videoplaylist_utility_api/group"/>
-</component>
-<component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interface Build" introduced="^1" filter="s60" class="api">
-<!-- needed only for #ifdefs. Remove anmd uncomment above units when configuration is in place -->
-<unit bldFile="mw/mmappfw/mmappfw_plat/group"/>
-</component>
-</collection>
-<collection name="mpx" long-name="Multimedia Player" level="fw">
-<component name="commonframework" filter="s60" long-name="MPX Common Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/commonframework/group"/>
-</component>
-<component name="playbackframework" filter="s60" long-name="MPX Playback Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/playbackframework/group"/>
-</component>
-<component name="mpxcollectionfw" filter="s60" long-name="MPX Collection Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/collectionframework/group"/>
-</component>
-<component name="mpxviewfw" filter="s60" long-name="MPX View Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/viewframework/group"/>
-</component>
-<component name="mpx_build" filter="s60" long-name="MPX Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/mpx/group"/>
-</component>
-</collection>
-<collection name="mmappcomponents" long-name="Multimedia App Components" level="utils">
-<component name="mmappcomponents_build" filter="s60" long-name="Multimedia App Components Build" introduced="^1">
-<!-- needed for #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
- Can remove this once configuration is in place-->
-<unit bldFile="mw/mmappfw/mmappcomponents/group"/>
-</component>
-<component name="collectionhelper" filter="s60" long-name="Media Player Collection Helper" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/collectionhelper/group"/>
-</component>
-<component name="playlistengine" filter="s60" long-name="Playlist Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/playlistengine/group"/>
-</component>
-<component name="mpxharvester" filter="s60" long-name="Media Player Harvester" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/harvester/group"/>
-</component>
-<component name="mmappcommonui" filter="s60" long-name="Multimedia App Common UI" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmappcommonui/group"/>
-</component>
-<component name="mediaplayersettingsengine" filter="s60" long-name="Media Player Settings Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
-</component>
-<component name="audiofetcher" filter="s60" long-name="Audio Fetcher" introduced="^1" plugin="Y">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
-</component>
-<component name="asxparser" filter="s60" long-name="ASX Parser" introduced="^1">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
-</component>
-<component name="playbackhelper" filter="s60" long-name="Playback Helper" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/playbackhelper/group"/>
-</component>
-<component name="videoplaylistutility" filter="s60" long-name="Video Playlist Utility" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/videoplaylistutility/group"/>
-</component>
-<component name="mmmtpdataprovider" filter="s60" long-name="Multimedia MTP Data Provider" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmmtpdataprovider/group"/>
-</component>
-</collection>
-<collection name="mmappfw_info" long-name="Multimedia App Framework Info" level="if">
-<component name="mmappfw_build" filter="s60" long-name="Multimedia App Framework Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/group"/>
-</component>
-<component name="mmappfw_test" filter="s60,test,api_test,pref_test" long-name="Multimedia App Framework Test" purpose="development" introduced="^1"/>
-</collection>
-</block>
-<block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework api">
-<collection name="inputmethods_pub" long-name="Input Methods Public Interfaces" level="api">
-<component name="ptiengine_iti_api" long-name="PTI Engine API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
-</component>
-<component name="optical_character_recognition_api" long-name="Optical Character Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
-</component>
-<component name="input_language_info_api" long-name="Input Language Info API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
-</component>
-</collection>
-<collection name="inputmethods_plat" long-name="Input Methods Platform Interfaces" level="api">
-<component name="pen_input_server_api" long-name="Pen Input Server API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/group" filter="!test"/>
-</component>
-<component name="ptiengine_hwr_api" long-name="PTI Engine Handwriting Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group" filter="!test"/>
-</component>
-<component name="aknfep_settings_api" long-name="Avkon FEP Settings API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
-</component>
-<component name="aknfep_status_api" long-name="Avkon FEP Status API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
-</component>
-<component name="ptiengine_key_definations_api" long-name="PTI Engine Key Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
-</component>
-<component name="aknfep_definitions_api" long-name="Avkon FEP Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
-</component>
-<component name="aknfep_pen_support_api" long-name="Avkon FEP Pen Support API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
-</component>
-<component name="ptiengine_indic_definitions_api" long-name="PTI Engine Indic Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
-</component>
-<component name="aknfep_uiinterface_api" long-name="Avkon FEP UI Interface API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="textinput" long-name="Text Input" level="framework">
-<component name="ptienginev2" filter="s60" long-name="Predictive Text Input Engine">
-<!--uncomment when configuration is turned on and textinput_build is removed-->
-<!-- <unit bldFile="textinput/ptienginev2/group"/>-->
-</component>
-<component name="akninputlanguage" filter="s60" long-name="Avkon Input Language">
-<unit bldFile="mw/inputmethods/textinput/akninputlanguage/group"/>
-</component>
-<component name="peninputarc" filter="s60" long-name="Pen Input Arc">
-<unit bldFile="mw/inputmethods/textinput/peninputarc/group"/>
-</component>
-<component name="peninputcommonctrls" filter="s60" long-name="Pen Input Common Controls">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonctrls/group"/>
-</component>
-<component name="peninputhwrboxcn" filter="s60" long-name="Chinese Handwriting Recognition Box" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrboxcn/group"/>
-</component>
-<component name="peninputvkbcn" filter="s60" long-name="Chinese Virtual Keyboard" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputvkbcn/group"/>
-</component>
-<component name="peninputcommonlayout" filter="s60" long-name="Pen Input Common Layout">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonlayout/group"/>
-</component>
-<component name="peninputgenerichwr" filter="s60" long-name="Pen Input Generic Handwriting Recognition" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputgenerichwr/group"/>
-</component>
-<component name="peninputgenericvkb" filter="s60" long-name="Pen Input Generic Virtual Keyboard" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputgenericvkb/group"/>
-</component>
-<component name="peninputcommonctrlsjp" filter="s60" long-name="Pen Input Common Controls Japanese">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonctrlsjp/group"/>
-</component>
-<component name="peninputhwrboxjp" filter="s60" long-name="Japanese Handwriting Recognition Box" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrboxjp/group"/>
-</component>
-<component name="peninputvkbjp" filter="s60" long-name="Japanese Virtual Keyboard" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputvkbjp/group"/>
-</component>
-<component name="gslangplugin" filter="s60" long-name="GS Language Plugin" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/GSLangPlugin"/>
-</component>
-<component name="peninputgenericitut" filter="s60" long-name="Pen Input Generic ITU-T" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputgenericitut/group"/>
-</component>
-<component name="peninputhwrtrui" filter="s60" long-name="Pen Input Handwriting Recognition Training UI" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrtrui/group"/>
-</component>
-<component name="peninputhwrfscn" filter="s60" long-name="Pen Input Chinese Full Screen Handwriting Recognition" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrfscn/group"/>
-</component>
-<component name="peninputvkbkr" filter="s60" long-name="Pen Input Korean Virtual Keyboard" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputvkbkr/group"/>
-</component>
-<component name="peninputfingerhwr" filter="s60" long-name="Pen Input Finger Handwriting Recognition" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputfingerhwr/group"/>
-</component>
-<component name="peninputsplititut" filter="s60" long-name="Pen Input Split ITU-T" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputsplititut/group"/>
-</component>
-<component name="peninputsplitqwerty" filter="s60" long-name="Pen Input Split QWERTY" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputsplitqwerty/group"/>
-</component>
-<component name="textinput_build" filter="s60" long-name="Text Input Build">
-<!--needed for #ifdef, can be removed when configuration is implemented -->
-<unit bldFile="mw/inputmethods/textinput/group"/>
-</component>
-</collection>
-<collection name="fep" long-name="FEP" level="engine">
-<component name="aknfep" filter="s60" long-name="Avkon FEP" plugin="Y">
-<unit bldFile="mw/inputmethods/fep/aknfep/group"/>
-</component>
-<component name="frontendprocessor" long-name="Front End Processor" purpose="mandatory">
-<unit bldFile="mw/inputmethods/fep/frontendprocessor/group" mrp="mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
-</component>
-</collection>
-<collection name="inputmethods_info" long-name="Input Methods Info" level="api">
-<component name="inputmethods_metadata" long-name="Input Methods Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="qt" level="generic" long-name="Qt" levels="tool mw app">
-<collection name="qtconf" long-name="Qt Config" level="tool">
-<component name="qt_deviceconfiguration" long-name="Qt Device Configuration" introduced="^2" class="config tool">
-<unit bldFile="mw/qt/src/s60installs/deviceconfiguration"/>
-</component>
-</collection>
-<collection name="qt_info" long-name="Qt Info" level="mw">
-<component name="qt_build" long-name="Qt Build" introduced="^2">
-<unit bldFile="mw/qt"/>
-</component>
-</collection>
-<collection name="qtdemos" long-name="Qt Demos" level="app">
-<component name="qtdemos_build" long-name="Qt Demos Build" introduced="^2" filter="qtdemos">
-<unit bldFile="mw/qt/demos"/>
-</component>
-</collection>
-<collection name="qtexamples" long-name="Qt Examples" level="app">
-<component name="qtexamples_build" long-name="Qt Examples Build" introduced="^2" filter="qtexamples">
-<unit bldFile="mw/qt/examples"/>
-</component>
-</collection>
-<collection name="qt_tests" long-name="Qt Tests" level="app">
-<component name="qttestsauto" long-name="Qt Automated Tests" introduced="^2" filter="qttestsauto">
-<unit bldFile="mw/qt/tests/auto"/>
-</component>
-<component name="qttestsbenchmarks" long-name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks">
-<unit bldFile="mw/qt/tests/benchmarks"/>
-</component>
-</collection>
-</block>
-<block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
-<collection name="classicui_plat" long-name="Classic UI Platform Interfaces" level="specific">
-<component name="personalisation_framework_api" long-name="Personalisation Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_framework_api/group" filter="!test"/>
-</component>
-<component name="signal_pane_api" long-name="Signal Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
-</component>
-<component name="japanese_reading_api" long-name="Japanese Reading API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/japanese_reading_api/group" filter="!test"/>
-</component>
-<component name="global_popup_priority_controller_api" long-name="Global Popup Priority Controller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
-</component>
-<component name="item_finder_api" long-name="Item Finder API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/item_finder_api/group" filter="!test"/>
-</component>
-<component name="avkon_fonts_api" long-name="Avkon Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_fonts_api/group" filter="!test"/>
-</component>
-<component name="extended_utilities_api" long-name="Extended Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
-</component>
-<component name="personalisation_plugin_api" long-name="Personalisation Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
-</component>
-<component name="extended_aiw_criteria_api" long-name="Extended AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="personalisation_application_api" long-name="Personalisation Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_application_api/group"/>
-</component>
-<component name="volume_popup_api" long-name="Volume Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
-</component>
-<component name="avkon_secondary_display_support_api" long-name="AVKON Secondary Display Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_support_api/group" filter="!test"/>
-</component>
-<component name="extended_setting_pages_api" long-name="Extended Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_setting_pages_api/group" filter="!test"/>
-</component>
-<component name="extended_lists_api" long-name="Extended Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_lists_api/group" filter="!test"/>
-</component>
-<component name="input_block_api" long-name="Input Block API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/input_block_api/group" filter="!test"/>
-</component>
-<component name="avkon_ui_server_api" long-name="AVKON UI Server API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_ui_server_api/group" filter="!test"/>
-</component>
-<component name="number_grouping_api" long-name="Number Grouping API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/number_grouping_api/group" filter="!test"/>
-</component>
-<component name="extended_status_pane_api" long-name="Extended Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_status_pane_api/group" filter="!test"/>
-</component>
-<component name="extended_notifiers_api" long-name="Extended Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notifiers_api/group" filter="!test"/>
-</component>
-<component name="task_list_api" long-name="Task List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
-</component>
-<component name="personalisation_slide_show_dialog_api" long-name="Personalisation Slide Show Dialog API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
-</component>
-<component name="key_event_utilities_api" long-name="Key Event Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_event_utilities_api/group"/>
-</component>
-<component name="emergency_call_support_api" long-name="Emergency Call Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/emergency_call_support_api/group" filter="!test"/>
-</component>
-<component name="extended_dialogs_api" long-name="Extended Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_dialogs_api/group"/>
-</component>
-<component name="legacy_ui_framework_headers_api" long-name="Legacy UI Framework Headers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/legacy_ui_framework_headers_api/group"/>
-</component>
-<component name="extended_editors_api" long-name="Extended Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_editors_api/group" filter="!test"/>
-</component>
-<component name="alarm_api" long-name="Alarm API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alarm_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_interface_base_api" long-name="AIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_base_api/group" filter="!test"/>
-</component>
-<component name="list_effects_api" long-name="List Effects API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/list_effects_api/group" filter="!test"/>
-</component>
-<component name="find_item_ui_api" long-name="Find Item UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/find_item_ui_api/group" filter="!test"/>
-</component>
-<component name="server_application_services_api" long-name="Server Application Services API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/server_application_services_api/group" filter="!test"/>
-</component>
-<component name="common_ui_settings_api" long-name="Common UI Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_ui_settings_api/group"/>
-</component>
-<component name="aiw_service_interface_menu_api" long-name="AIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_menu_api/group" filter="!test"/>
-</component>
-<component name="eikon_server_extension_client_api" long-name="EIKON Server Extension Client API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/eikon_server_extension_client_api/group" filter="!test"/>
-</component>
-<component name="skinnable_clock_api" long-name="Skinnable Clock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/skinnable_clock_api/group" filter="!test"/>
-</component>
-<component name="battery_pane_api" long-name="Battery Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/battery_pane_api/group" filter="!test"/>
-</component>
-<component name="fep_document_navigation_api" long-name="FEP Document Navigation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
-</component>
-<component name="personalisation_localised_texts_api" long-name="Personalisation Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
-</component>
-<component name="memory_card_ui_api" long-name="Memory Card UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
-</component>
-<component name="avkon_status_api" long-name="AVKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_status_api/group"/>
-</component>
-<component name="application_switching_api" long-name="Application Switching API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/application_switching_api/group" filter="!test"/>
-</component>
-<component name="avkon_localised_texts_api" long-name="AVKON Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_localised_texts_api/group"/>
-</component>
-<component name="avkon_secondary_display_api" long-name="AVKON Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_api/group"/>
-</component>
-<component name="extended_animation_api" long-name="Extended Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_notes_api" long-name="Extended Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notes_api/group" filter="!test"/>
-</component>
-<component name="screensaver_animation_plugin_definitions_api" long-name="Screensaver Animation Plugin Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/screensaver_animation_plugin_definitions_api/group"/>
-</component>
-<component name="text_scroller_api" long-name="Text Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/text_scroller_api/group" filter="!test"/>
-</component>
-<component name="custom_cursors_api" long-name="Custom Cursors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/custom_cursors_api/group" filter="!test"/>
-</component>
-<component name="screensaver_settings_api" long-name="Screensaver Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/screensaver_settings_api/group"/>
-</component>
-<component name="global_window_priorities_api" long-name="Global Window Priorities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_window_priorities_api/group"/>
-</component>
-<component name="extended_indicators_api" long-name="Extended Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_indicators_api/group" filter="!test"/>
-</component>
-<component name="special_character_table_api" long-name="Special Character Table API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/special_character_table_api/group" filter="!test"/>
-</component>
-<component name="avkon_settings_api" long-name="AVKON Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_settings_api/group"/>
-</component>
-<component name="extended_sounds_api" long-name="Extended Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_sounds_api/group"/>
-</component>
-<component name="themes_settings_api" long-name="Themes Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/themes_settings_api/group"/>
-</component>
-<component name="media_shared_document_api" long-name="Media Shared Document API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/media_shared_document_api/group" filter="!test"/>
-</component>
-<component name="extended_queries_api" long-name="Extended Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_queries_api/group"/>
-</component>
-<component name="phone_number_text_utilities_api" long-name="Phone Number Text Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
-</component>
-<component name="screensaver_runtime_api" long-name="Screensaver Runtime API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/screensaver_runtime_api/group"/>
-</component>
-<component name="extended_scroller_api" long-name="Extended Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_scroller_api/group"/>
-</component>
-<component name="key_rotator_api" long-name="Key Rotator API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_rotator_api/group" filter="!test"/>
-</component>
-<component name="extended_grids_api" long-name="Extended Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_grids_api/group" filter="!test"/>
-</component>
-<component name="generic_parameter_api" long-name="Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="indicator_touch_observer_api" long-name="Indicator Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_touch_observer_api/group"/>
-</component>
-<component name="popup_form_api" long-name="Popup Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/popup_form_api/group" filter="!test"/>
-</component>
-<component name="stylus_activated_popup_api" long-name="Stylus Activated Pop-up API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/stylus_activated_popup_api/group" filter="!test"/>
-</component>
-<component name="indicator_plugin_api" long-name="Indicator Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_plugin_api/group" filter="!test"/>
-</component>
-<component name="layout_configuration_api" long-name="Layout Configuration API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/layout_configuration_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_filter_factory_api" long-name="Common File Dialogs Filter Factory API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group" filter="!test"/>
-</component>
-<component name="avkon_anim_dll_api" long-name="AVKON Anim DLL API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_anim_dll_api/group"/>
-</component>
-<component name="extended_initialization_api" long-name="Extended Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_initialization_api/group" filter="!test"/>
-</component>
-<component name="long_tap_animation_api" long-name="Long Tap Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/long_tap_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_ui_framework_definitions_api" long-name="Extended UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_ui_framework_definitions_api/group"/>
-</component>
-<component name="extended_buttons_api" long-name="Extended Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_buttons_api/group" filter="!test"/>
-</component>
-<component name="aiw_provider_utility_api" long-name="AIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_provider_utility_api/group" filter="!test"/>
-</component>
-<component name="transition_effect_parameters_api" long-name="Transition Effect Parameters API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_parameters_api/group" filter="!test"/>
-</component>
-<component name="extended_input_capabilities_api" long-name="Extended Input Capabilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_input_capabilities_api/group" filter="!test"/>
-</component>
-<component name="uikon_status_api" long-name="UIKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/uikon_status_api/group"/>
-</component>
-<component name="transition_effect_utilities_api" long-name="Transition Effect Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_utilities_api/group" filter="!test"/>
-</component>
-<component name="pointer_event_modifier_api" long-name="Pointer Event Modifier API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/pointer_event_modifier_api/group" filter="!test"/>
-</component>
-<component name="avkon_testability_api" long-name="AVKON Testability API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_testability_api/group"/>
-</component>
-<component name="ganes_api" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ganes_api/group"/>
-</component>
-<component name="ode_api" long-name="Ode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ode_api/group"/>
-</component>
-<component name="physics_api" long-name="Physics API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/physics_api/group"/>
-</component>
-<component name="touch_pane_api" long-name="Touch Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_api/group" filter="!test"/>
-</component>
-<component name="touch_pane_observer_api" long-name="Touch Pane Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_observer_api/group"/>
-</component>
-<component name="alternate_fs_api" long-name="Alternate FS API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alternate_fs_api/group"/>
-</component>
-<component name="discreet_popup_api" long-name="Discreet Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/discreet_popup_api/group"/>
-</component>
-<component name="touch_gesture_framework_api" long-name="Touch Gesture Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_gesture_framework_api/group"/>
-<!-- should this be commented out? -->
-<!--<unit bldFile="classicui_plat/touch_gesture_framework_api/tsrc/group" filter="test,api_test"/> -->
-</component>
-<component name="extended_options_menu_api" long-name="Extended Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="classicui_pub" long-name="Classic UI Public Interfaces" level="specific">
-<component name="input_frame_api" long-name="Input Frame API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/input_frame_api/group" filter="!test"/>
-</component>
-<component name="window_server_event_observer_api" long-name="Window Server Event Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/window_server_event_observer_api/group" filter="!test"/>
-</component>
-<component name="application_framework_api" long-name="Application Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/application_framework_api/group" filter="!test"/>
-</component>
-<component name="scroller_api" long-name="Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/scroller_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_utilities_api" long-name="UI Framework Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_utilities_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_definitions_api" long-name="UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_definitions_api/group" filter="!test"/>
-</component>
-<component name="buttons_api" long-name="Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/buttons_api/group" filter="!test"/>
-</component>
-<component name="queries_api" long-name="Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/queries_api/group" filter="!test"/>
-</component>
-<component name="aiw_generic_parameter_api" long-name="AIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="editors_api" long-name="Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/editors_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_api" long-name="Common File Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/common_file_dialogs_api/group" filter="!test"/>
-</component>
-<component name="dialog_shutter_api" long-name="Dialog Shutter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialog_shutter_api/group" filter="!test"/>
-</component>
-<component name="fonts_api" long-name="Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/fonts_api/group" filter="!test"/>
-</component>
-<component name="screen_clearer_api" long-name="Screen Clearer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_clearer_api/group" filter="!test"/>
-</component>
-<component name="notifiers_api" long-name="Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notifiers_api/group" filter="!test"/>
-</component>
-<component name="notes_api" long-name="Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notes_api/group" filter="!test"/>
-</component>
-<component name="screen_saver_api" long-name="Screen Saver API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_saver_api/group" filter="!test"/>
-</component>
-<component name="status_pane_api" long-name="Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/status_pane_api/group" filter="!test"/>
-</component>
-<component name="base_controls_api" long-name="Base Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/base_controls_api/group" filter="!test"/>
-</component>
-<component name="grids_api" long-name="Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/grids_api/group" filter="!test"/>
-</component>
-<component name="context_pane_api" long-name="Context Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/context_pane_api/group" filter="!test"/>
-</component>
-<component name="lists_api" long-name="Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/lists_api/group" filter="!test"/>
-</component>
-<component name="popups_api" long-name="Popups API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/popups_api/group" filter="!test"/>
-</component>
-<component name="misc_controls_api" long-name="Misc Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/misc_controls_api/group" filter="!test"/>
-</component>
-<component name="keylock_api" long-name="Keylock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/keylock_api/group" filter="!test"/>
-</component>
-<component name="options_menu_api" long-name="Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/options_menu_api/group" filter="!test"/>
-</component>
-<component name="hierarchical_lists_api" long-name="Hierarchical Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hierarchical_lists_api/group" filter="!test"/>
-</component>
-<component name="navigation_pane_api" long-name="Navigation Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/navigation_pane_api/group" filter="!test"/>
-</component>
-<component name="tabs_api" long-name="Tabs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/tabs_api/group" filter="!test"/>
-</component>
-<component name="title_pane_touch_observer_api" long-name="Title Pane Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_touch_observer_api/group"/>
-</component>
-<component name="choice_list_api" long-name="Choice List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/choice_list_api/group" filter="!test"/>
-</component>
-<component name="info_popup_note_api" long-name="Info Popup Note API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/info_popup_note_api/group" filter="!test"/>
-</component>
-<component name="setting_pages_api" long-name="Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/setting_pages_api/group" filter="!test"/>
-</component>
-<component name="screen_mode_api" long-name="Screen Mode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_mode_api/group" filter="!test"/>
-</component>
-<component name="indicators_api" long-name="Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/indicators_api/group" filter="!test"/>
-</component>
-<component name="error_ui_api" long-name="Error UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/error_ui_api/group" filter="!test"/>
-</component>
-<component name="animation_api" long-name="Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/animation_api/group" filter="!test"/>
-</component>
-<component name="searchfield_api" long-name="Searchfield API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/searchfield_api/group" filter="!test"/>
-</component>
-<component name="labels_api" long-name="Labels API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/labels_api/group" filter="!test"/>
-</component>
-<component name="hotkeys_api" long-name="Hotkeys API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hotkeys_api/group" filter="!test"/>
-</component>
-<component name="initialization_api" long-name="Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/initialization_api/group" filter="!test"/>
-</component>
-<component name="volume_control_api" long-name="Volume Control API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/volume_control_api/group" filter="!test"/>
-</component>
-<component name="title_pane_api" long-name="Title Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_api/group" filter="!test"/>
-</component>
-<component name="sounds_api" long-name="Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/sounds_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_handler_api" long-name="AIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_service_handler_api/group" filter="!test"/>
-</component>
-<component name="aiw_criteria_api" long-name="AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="touch_ui_utilities_api" long-name="Touch UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/touch_ui_utilities_api/group" filter="!test"/>
-</component>
-<component name="generic_button_api" long-name="Generic Button API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/generic_button_api/group" filter="!test"/>
-</component>
-<component name="form_api" long-name="Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/form_api/group" filter="!test"/>
-</component>
-<component name="uikon_core_controls" long-name="Uikon Core Controls" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/uikon_core_controls/group" filter="!test"/>
-</component>
-<component name="calendar_api" long-name="Calendar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/calendar_api/group"/>
-</component>
-<component name="toolbar_api" long-name="Toolbar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/toolbar_api/group" filter="!test"/>
-</component>
-<component name="server_application_api" long-name="Server Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/server_application_api/group"/>
-</component>
-<component name="slider_api" long-name="Slider API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/slider_api/group" filter="!test"/>
-</component>
-<component name="private_ui_framework_api" long-name="Private UI Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/private_ui_framework_api/group" filter="!test"/>
-</component>
-<component name="dialogs_api" long-name="Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialogs_api/group" filter="!test"/>
-</component>
-<component name="document_handler_api" long-name="Document handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/document_handler_api/group"/>
-</component>
-<component name="images_api" long-name="Images API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/images_api/group" filter="!test"/>
-</component>
-<component name="stylus_popup_menu_api" long-name="Stylus Pop-up Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/stylus_popup_menu_api/group" filter="!test"/>
-</component>
-<component name="information_preview_popup_api" long-name="Information Preview Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/information_preview_popup_api/group" filter="!test"/>
-</component>
-<component name="intermediate_state_api" long-name="Intermediate State API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/intermediate_state_api/group"/>
-</component>
-<component name="help_launcher_api" long-name="Help Launcher API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/help_launcher_api/group"/>
-</component>
-</collection>
-<collection name="ode" long-name="Open Dynamics Engine" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="ode_build" filter="s60" long-name="ODE">
-<unit bldFile="mw/classicui/ode/group"/>
-</component>
-</collection>
-<collection name="uifw" long-name="UI Framework" level="server">
-<component name="uiklaf" filter="s60" long-name="Uikon Look-and-Feel">
-<unit bldFile="mw/classicui/uifw/uiklaf/group"/>
-</component>
-<component name="eikctl" filter="s60" long-name="Eikon Controls">
-<unit bldFile="mw/classicui/uifw/eikctl/group"/>
-</component>
-<component name="avkon" filter="s60" long-name="Avkon">
-<!-- can only have one unit. Split into 3 components, or #include all from same bld.inf -->
-<unit bldFile="mw/classicui/uifw/avkon/aknphysics/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/aknconf/group"/>
-</component>
-<component name="eikstd" filter="s60" long-name="Eikon Standard">
-<unit bldFile="mw/classicui/uifw/eikstd/group"/>
-</component>
-<component name="aknglobalui" filter="s60" long-name="Avkon Global UI">
-<unit bldFile="mw/classicui/uifw/aknglobalui/group"/>
-</component>
-<component name="ganes" filter="s60" long-name="Ganes">
-<unit bldFile="mw/classicui/uifw/ganes/group"/>
-</component>
-</collection>
-<collection name="commonuis" long-name="Common UIs" level="specific">
-<component name="commonui" filter="s60" long-name="Common UI">
-<unit bldFile="mw/classicui/commonuis/commonui/group"/>
-</component>
-<component name="commondialogs" filter="s60" long-name="Common Dialogs">
-<unit bldFile="mw/classicui/commonuis/commondialogs/group"/>
-</component>
-</collection>
-<collection name="applicationinterworkingfw" long-name="Application Interworking Framework" level="generic">
-<component name="aifwservicehandler" filter="s60" long-name="Application Interworking Service Handler">
-<unit bldFile="mw/classicui/applicationinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-<collection name="psln" long-name="Personalization" level="specific">
-<!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
-<component name="psln_build" filter="s60" long-name="Personalization Build">
-<unit bldFile="mw/classicui/psln/group"/>
-</component>
-</collection>
-<collection name="commonadapter" long-name="Common Adapter" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="commonadapter_build" filter="s60" long-name="Common Adapter Build">
-<unit bldFile="mw/classicui/commonadapter/group"/>
-</component>
-</collection>
-<collection name="akntouchgesturefw" long-name="Avkon Touch Gesture Framework" level="generic">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="akntouchgesturefw_build" filter="s60" long-name="Avkon Touch Gesture Framework Build" introduced="^3">
-<unit bldFile="mw/classicui/akntouchgesturefw/group"/>
-</component>
-</collection>
-<collection name="uiutils" long-name="UI Utils" level="specific">
-<component name="localizer" filter="s60" long-name="Directory Localizer">
-<unit bldFile="mw/classicui/uiutils/localizer/group"/>
-</component>
-<component name="findutil" filter="s60" long-name="Find Utility">
-<unit bldFile="mw/classicui/uiutils/findutil/group"/>
-</component>
-<component name="gamerecognizer" filter="s60" long-name="Game Recognizer" plugin="Y">
-<unit bldFile="mw/classicui/uiutils/gamerecognizer/group"/>
-</component>
-<component name="aknjapanesereading" filter="s60" long-name="Avkon Japanese Reading">
-<unit bldFile="mw/classicui/uiutils/aknjapanesereading/group"/>
-</component>
-</collection>
-<collection name="commonuisupport" long-name="Common UI Support" level="support">
-<component name="uikon" long-name="Uikon" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uikon/group" mrp="mw/classicui/commonuisupport/uikon/group/app-framework_uikon.mrp"/>
-</component>
-<component name="errorresolverdata" long-name="Error Resolver Data" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/errorresolverdata/group" mrp="mw/classicui/commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
-</component>
-<component name="uilaf" long-name="UI Look and Feel" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uilaf/GROUP" mrp="mw/classicui/commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
-</component>
-<component name="grid" long-name="Grid" purpose="optional">
-<unit bldFile="mw/classicui/commonuisupport/grid/group" mrp="mw/classicui/commonuisupport/grid/group/app-framework_grid.mrp"/>
-</component>
-<component name="uifwsdocs" long-name="UI Frameworks Documentation" purpose="development" class="doc">
-<unit mrp="mw/classicui/commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
-</component>
-</collection>
-<collection name="lafagnosticuifoundation" long-name="Look-and-Feel Agnostic UI Foundation" level="base">
-<component name="cone" long-name="Control Environment" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/cone/group" mrp="mw/classicui/lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
-</component>
-<component name="graphicseffects" long-name="Graphics Effects" introduced="9.2" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/graphicseffects/group" mrp="mw/classicui/lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
-</component>
-<component name="uigraphicsutils" long-name="UI Graphics Utilities" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group" mrp="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
-</component>
-<component name="clockanim" long-name="Clock" purpose="optional" plugin="Y">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/clockanim/group" mrp="mw/classicui/lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
-</component>
-<component name="bmpanimation" long-name="BMP Animation" introduced="6.0" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/bmpanimation/group" mrp="mw/classicui/lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
-</component>
-<component name="animation" long-name="Animation" introduced="9.1" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/animation/group" mrp="mw/classicui/lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
-</component>
-</collection>
-<collection name="classicui_info" long-name="Classic UI Info" level="specific">
-<!-- the multiple units in the API test components need to be resolved -->
-<component name="classicui_metadata" long-name="Classic UI Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/classicui/classicui_info/classicui_metadata/classicui_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="svgt" level="generic" long-name="SVG Tiny" levels="util ui">
-<collection name="svgt_plat" long-name="SVG Tiny Platform Interfaces" level="ui">
-<component name="svgt_api" long-name="SVGT API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/svgt_api/group"/>
-</component>
-<component name="nvg_api" long-name="NVG API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/nvg_api/group"/>
-</component>
-</collection>
-<collection name="svgtopt" long-name="SVG-T Engine" level="util">
-<component name="svgtopt_build" filter="s60" long-name="SVG Engine" introduced="9.2">
-<!-- component is at collection level. Needs to be moved down a directory -->
-<unit bldFile="mw/svgt/svgtopt/group"/>
-</component>
-<component name="svgtplugin" filter="s60" long-name="SVG Plugin" introduced="9.2" plugin="Y">
-<unit bldFile="mw/svgt/svgtopt/svgtplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="uiaccelerator" level="generic" long-name="UI Accelerator" levels="plugin framework server ex if">
-<collection name="uiaccelerator_plat" long-name="UI Accelerator Platform Interfaces" level="if">
-<component name="alf_core_toolkit_api" long-name="ALF Core Toolkit API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/group"/>
-</component>
-<component name="alf_visual_api" long-name="ALF Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/group"/>
-</component>
-<component name="alf_extended_visual_api" long-name="ALF Extended Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/group"/>
-</component>
-<component name="alf_extension_api" long-name="ALF Extension API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/group"/>
-</component>
-<component name="alf_tracing_api" long-name="ALF Tracing API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/group"/>
-</component>
-<component name="alf_client_server_api" long-name="ALF Client Server API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/group"/>
-</component>
-</collection>
-<collection name="uiacceltk" long-name="UI Accelerator Toolkit" level="framework">
-<component name="hitchcock" filter="s60" long-name="Hitchcock">
-<unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/group"/>
-</component>
-<component name="uiacceltk_build" filter="s60" long-name="UI Accelerator Toolkit Build">
-<!-- move into the other component, or remove the #include and make this UI Accelerator Toolkit ROM-->
-<unit bldFile="mw/uiaccelerator/uiacceltk/group"/>
-</component>
-</collection>
-</block>
-<block name="uiresources" level="generic" long-name="UI Resources" levels="compile plugin framework server generic data">
-<!-- are the custom filters below needed? -->
-<collection name="uiresources_pub" long-name="UI Resources Public Interfaces" level="data">
-<component name="pictograph_api" long-name="Pictograph API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/pictograph_api/group" filter="!test"/>
-</component>
-<component name="skins_api" long-name="Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/skins_api/group" filter="!test"/>
-</component>
-<component name="font_definition_api" long-name="Font Definition API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/font_definition_api/group" filter="!test"/>
-</component>
-<component name="graphics_api" long-name="Graphics API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/graphics_api/group" filter="!test"/>
-</component>
-<component name="scalable_icons_api" long-name="Scalable Icons API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/scalable_icons_api/group"/>
-</component>
-<component name="layout_id_definitions_api" long-name="Layout ID Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/layout_id_definitions_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_plat" long-name="UI Resources Platform Interfaces" level="data">
-<component name="layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_system_private_api/group" filter="!test"/>
-</component>
-<component name="layout_data_api" long-name="Layout Data API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_data_api/group" filter="!test"/>
-</component>
-<component name="cdl_api" long-name="CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/cdl_api/group" filter="!test"/>
-</component>
-<component name="extended_skins_api" long-name="Extended Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_skins_api/group" filter="!test"/>
-</component>
-<component name="tfx_server_controller_plugin_api" long-name="TFX Server Controller Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_controller_plugin_api/group"/>
-</component>
-<component name="extended_fonts_api" long-name="Extended Fonts API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_fonts_api/group" filter="!test"/>
-</component>
-<component name="graphic_configuration_api" long-name="Graphic Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/graphic_configuration_api/group" filter="!test"/>
-</component>
-<component name="mif_header_cdl_api" long-name="MIF Header CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mif_header_cdl_api/group"/>
-</component>
-<component name="personalisation_and_skins_settings_api" long-name="Personalisation and Skins Settings API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/personalisation_and_skins_settings_api/group"/>
-</component>
-<component name="tfx_effect_setup_plugin_api" long-name="TFX Effect Setup Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_effect_setup_plugin_api/group"/>
-</component>
-<component name="mifconv_definitions_api" long-name="Mifconv Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mifconv_definitions_api/group"/>
-</component>
-<component name="wallpaper_configuration_api" long-name="Wallpaper Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/wallpaper_configuration_api/group"/>
-</component>
-<component name="language_code_definitions_api" long-name="Language Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/language_code_definitions_api/group"/>
-</component>
-<component name="skins_image_attributes_api" long-name="Skins Image Attributes API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
-</component>
-<component name="private_user_area_code_definitions_api" long-name="Private User Area Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/private_user_area_code_definitions_api/group"/>
-</component>
-<component name="tfx_server_plugin_ids_api" long-name="TFX Server Plug-in IDs API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_plugin_ids_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_info" long-name="UI Resources Info" level="data">
-<component name="uiresources_test" filter="s60,test,api_test" long-name="UI Resources Tests" purpose="development"/>
-</collection>
-<collection name="uigraphics" long-name="UI Graphics" level="generic">
-<component name="bitmaps2" filter="s60" long-name="Bitmaps 2" class="config">
-<unit bldFile="mw/uiresources/uigraphics/bitmaps2/group"/>
-</component>
-<component name="icons" filter="s60" long-name="Icons" class="config">
-<unit bldFile="mw/uiresources/uigraphics/icons/group"/>
-</component>
-<component name="variatedbitmaps" filter="s60" long-name="Variated Bitmaps" class="config">
-<unit bldFile="mw/uiresources/uigraphics/variatedbitmaps/group"/>
-</component>
-<component name="aknicon" filter="s60" long-name="Avkon Icon Framework">
-<unit bldFile="mw/uiresources/uigraphics/aknicon/group"/>
-</component>
-<component name="nvgrenderstage" filter="sf_build" long-name="NVG Render Stage">
-<unit bldFile="mw/uiresources/uigraphics/nvgrenderstage/group"/>
-</component>
-</collection>
-<collection name="layouts" long-name="Layouts" level="plugin">
-<component name="cdl" filter="s60" long-name="Customization Definition Language">
-<!-- can only have one unit. Need to #include them or split into multiple components -->
-<unit bldFile="mw/uiresources/layouts/cdl/cdlengine/group"/>
-<unit bldFile="mw/uiresources/layouts/cdl/cdlserver/group"/>
-</component>
-<component name="aknlayout2" filter="s60" long-name="Avkon Layout 2">
-<unit bldFile="mw/uiresources/layouts/aknlayout2/group"/>
-</component>
-</collection>
-<collection name="skins" long-name="Skins" level="data">
-<component name="aknskincontent" filter="s60" long-name="Avkon Skin Content" class="config">
-<unit bldFile="mw/uiresources/skins/aknskincontent/group"/>
-</component>
-<component name="aknskins" filter="s60" long-name="Avkon Skin Compiler">
-<unit bldFile="mw/uiresources/skins/aknskins/group"/>
-</component>
-</collection>
-<collection name="pictographs" long-name="Pictographs" level="data">
-<component name="aknpictograph" filter="s60" long-name="Avkon Pictograph">
-<unit bldFile="mw/uiresources/pictographs/aknpictograph/group"/>
-</component>
-</collection>
-<collection name="locales" long-name="Locales" level="framework">
-<component name="locales_build" filter="s60" long-name="Locales Build">
-<unit bldFile="mw/uiresources/locales/loce32"/>
-</component>
-</collection>
-<collection name="uiconfig" long-name="UI Config" level="server">
-<component name="s60config" filter="s60" long-name="S60 UI Config">
-<unit bldFile="mw/uiresources/uiconfig/s60config/group"/>
-</component>
-</collection>
-<collection name="fontsupport" long-name="Font Support" level="generic">
-<component name="fontprovider" filter="s60" long-name="Font Provider">
-<unit bldFile="mw/uiresources/fontsupport/fontprovider/group"/>
-</component>
-<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
- <component id="s60_fonts" filter="s60" name="S60 Fonts">
- <unit bldFile="fontsupport/fontutils/group"/>
- </component>
--->
-<component name="fontutils" filter="sf_build" long-name="Font Utils">
-<unit bldFile="mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
-</component>
-</collection>
-<collection name="helpthemes" long-name="Help Themes" level="data">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helpthemes_build" filter="s60" long-name="Help Themes Build" class="config">
-<unit bldFile="mw/uiresources/helpthemes/group"/>
-</component>
-</collection>
-</block>
-<block name="hapticsservices" level="generic" long-name="Haptics Services" levels="fw server api">
-<collection name="hapticsservices_plat" long-name="Haptics Services Platform Interfaces" level="api">
-<component name="tacticon_api" long-name="Tacticon API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tacticon_api/group"/>
-</component>
-<component name="tactile_feedback_core_api" long-name="Tactile Feedback Core API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_core_api/group"/>
-</component>
-<component name="tactile_feedback_server_api" long-name="Tactile Feedback Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_server_api/group"/>
-</component>
-</collection>
-<collection name="hapticsservices_pub" long-name="Haptics Services Public Interfaces" level="api">
-<component name="tactile_feedback_client_api" long-name="Tactile Feedback Client API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_pub/tactile_feedback_client_api/group"/>
-</component>
-</collection>
-<collection name="tacticonserver" long-name="Tacticon Server" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="tacticonserver_build" filter="s60" long-name="Tacticon Server Build" introduced="^3">
-<unit bldFile="mw/hapticsservices/tacticonserver/group"/>
-<!-- clients and servers are suauly the same component. Consider moving pluign to a separate component if needed -->
-</component>
-</collection>
-<collection name="tactilefeedback" long-name="Tactile Feedback" level="fw">
-<component name="tactilearearegistry" filter="s60" long-name="Tactile Area Registry" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilearearegistry/group"/>
-</component>
-<component name="tactilefeedbackresolver" filter="s60" long-name="Tactile Feedback Resolver" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackresolver/group"/>
-</component>
-<component name="tactileclickplugin" filter="s60" long-name="Tactile Click Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileclickplugin/group"/>
-</component>
-<component name="tactilefeedbackclient" filter="s60" long-name="Tactile Feedback Client" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackclient/group"/>
-</component>
-<component name="tactileactionplugin" filter="s60" long-name="Tactile Action Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileactionplugin/group"/>
-</component>
-<component name="tactilefeedback_build" filter="s60" long-name="Tactile Feedback Build" introduced="^1">
-<!-- consider moving IBY to one fo the above components -->
-<unit bldFile="mw/hapticsservices/tactilefeedback/group"/>
-</component>
-</collection>
-</block>
-<block name="gsprofilesrv" level="generic" long-name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
-<collection name="gsprofilesrv_pub" long-name="GS and Profiles Services Public Interfaces" level="specific">
-<component name="profiles_engine_active_profile_settings_api" long-name="Profiles Engine Active Profile Settings API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_active_profile_settings_api/group"/>
-</component>
-<component name="profiles_engine_wrapper_api" long-name="Profiles Engine Wrapper API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_wrapper_api/group"/>
-</component>
-</collection>
-<collection name="gsprofilesrv_plat" long-name="GS and Profiles Services Platform Interfaces" level="specific">
-<component name="profiles_engine_api" long-name="Profiles Engine API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_engine_api/group"/>
-</component>
-<component name="profiles_mediafilelist_api" long-name="Media File List API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_mediafilelist_api/group"/>
-</component>
-<component name="filelist_api" long-name="File List API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/filelist_api/group"/>
-</component>
-<component name="settings_backgroundimage_api" long-name="Settings Background Image API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_backgroundimage_api/group"/>
-</component>
-<component name="settings_framework_api" long-name="Settings Framework API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_framework_api/group"/>
-</component>
-<component name="settings_launch_api" long-name="Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_launch_api/group"/>
-</component>
-<component name="settings_listbox_api" long-name="Settings List Box API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_listbox_api/group"/>
-</component>
-<component name="settings_plugin_api" long-name="Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_plugin_api/group"/>
-</component>
-<component name="settings_uis_cenrep_collection_api" long-name="Settings UIs CenRep Collection API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
-</component>
-</collection>
-<collection name="gssettingsuis" long-name="General Settings UIs" level="framework">
-<component name="gs" filter="s60" long-name="General Settings" introduced="9.2">
-<unit bldFile="mw/gsprofilesrv/gssettingsuis/gs/group"/>
-</component>
-</collection>
-<collection name="profilesservices" long-name="Profiles Services" level="server">
-<component name="filelist" filter="s60" long-name="File List" introduced="9.1">
-<unit bldFile="mw/gsprofilesrv/profilesservices/filelist/group"/>
-</component>
-<component name="mediafilelist" filter="s60" long-name="Media File List" introduced="^2">
-<unit bldFile="mw/gsprofilesrv/profilesservices/mediafilelist/group"/>
-</component>
-<component name="profileengine" filter="s60" long-name="Profile Engine" introduced="9.1">
-<unit bldFile="mw/gsprofilesrv/profilesservices/profileengine/group"/>
-</component>
-<component name="ringingtone3dplugin" filter="s60" long-name="Ringing Tone 3D Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/gsprofilesrv/profilesservices/ringingtone3dplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreensrv" level="specific" long-name="Home Screen Services" levels="plugin framework server generic specific">
-<collection name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" level="specific">
-<component name="ai_content_model_api" long-name="AI Content Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_content_model_api/group"/>
-</component>
-<component name="ai_utilities_api" long-name="AI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_utilities_api/group" filter="!test"/>
-</component>
-<component name="ai_plugin_management_api" long-name="AI Plug-in Management API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_management_api/group"/>
-</component>
-<component name="ai_plugin_information_api" long-name="AI Plug-in Information API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_information_api/group"/>
-</component>
-<component name="ai_variation_api" long-name="AI Variation API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_variation_api/group"/>
-</component>
-<component name="action_handler_plugin_api" long-name="Action Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/group" filter="!test"/>
-</component>
-<component name="content_harvester_plugin_api" long-name="Content Harvester Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/group" filter="!test"/>
-</component>
-<component name="menu_model_api" long-name="Menu Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_model_api/group"/>
-</component>
-<component name="menu_sat_interface_api" long-name="Menu SAT Interface API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/group" filter="!test"/>
-</component>
-<component name="external_home_screen_api" long-name="External Home Screen API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/external_home_screen_api/group"/>
-</component>
-<component name="menu_content_service_api" long-name="Menu Content Service API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_content_service_api/group" filter="!test"/>
-</component>
-<component name="sapi_contentpublishing" long-name="SAPI Content Publishing" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing/group"/>
-</component>
-<component name="sapi_backstepping" long-name="SAPI Backstepping" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_backstepping/group"/>
-</component>
-<component name="sapi_actionhandler" long-name="SAPI Action Handler" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_actionhandler/group"/>
-</component>
-<component name="sapi_homescreenplugin" long-name="SAPI Homescreen Plugin" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_homescreenplugin/group" filter="!test"/>
-</component>
-<component name="sapi_menucontent" long-name="SAPI Menu Content" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_menucontent/group"/>
-</component>
-<component name="xcfw_api" long-name="XCFW API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/xcfw_api/group"/>
-</component>
-<component name="idlefw_api" long-name="Idle Framework API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/idlefw_api/group"/>
-</component>
-<component name="hs_widget_publisher_api" long-name="Home Screen Publishing API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_widget_publisher_api/group"/>
-</component>
-<component name="hs_settings_api" long-name="HS Settings API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_settings_api/group"/>
-</component>
-<component name="hs_content_control_api" long-name="HS Content Control API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_content_control_api/group"/>
-</component>
-</collection>
-<collection name="xcfw" long-name="XML Content Framework" level="framework">
-<!-- collection is really a component, needs to be moved down a directory -->
-<component name="xcfw_build" filter="s60" long-name="XML Content Framework Build">
-<unit bldFile="mw/homescreensrv/xcfw/group"/>
-</component>
-</collection>
-<collection name="homescreenpluginsrv" long-name="Home Screen Plugin Service" level="plugin">
-<component name="hspsdefinitionengine" filter="s60" long-name="HS Plugin Service Definition Engine" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsdefinitionengine/group"/> -->
-</component>
-<component name="hspsdom" filter="s60" long-name="HS Plugin Service DOM" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsdom/group"/> -->
-</component>
-<component name="hspstools" filter="s60" long-name="HS Server Tools">
-<!-- <unit bldFile="homescreenpluginsrv/hspstools/group"/> -->
-</component>
-<component name="hspspluginregistry" filter="s60" long-name="HS Plugin Registry" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspspluginregistry/group"/>-->
-</component>
-<component name="hspsmanager" filter="s60" long-name="HSPS Manager" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsmanager/group"/>-->
-</component>
-<component name="hspsodt" filter="s60" long-name="HSPS Object Description Tree" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsodt/group"/>-->
-</component>
-<component name="hspsresource" filter="s60" long-name="HS Plugin Server Resource" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresource/group"/>-->
-</component>
-<component name="hspsresult" filter="s60" long-name="HS Plugin Server Result" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
-</component>
-<component name="homescreen_settings_api" filter="s60" long-name="HS Settings API" class="api placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
-</component>
-<component name="homescreenpluginsrv_build" filter="s60" long-name="HSPS Build">
-<!-- need to break this up into the self-contained components above and uncomment them -->
-<unit bldFile="mw/homescreensrv/homescreenpluginsrv/group"/>
-</component>
-</collection>
-<collection name="idlefw" long-name="Idle Framework" level="framework">
-<!-- Uncomment all units when configuration is in place. All currently #included from idlefw_build -->
-<component name="idlefw_plugins" filter="s60" long-name="Idle Framework Plugins" plugin="Y" class="placeholder">
-<!--<unit bldFile="idlefw/plugins/group"/>-->
-</component>
-<component name="hslaunch" filter="s60" long-name="Home Screen Launch" class="placeholder">
-<!--<unit bldFile="idlefw/plugins/group"/>-->
-</component>
-<component name="idlefw_build" filter="s60" long-name="Idle Framework Build">
-<!--split this into components, or separate from the above components and move this down a directory -->
-<unit bldFile="mw/homescreensrv/idlefw/group"/>
-</component>
-</collection>
-<collection name="menucontentsrv" long-name="Menu Content Service" level="generic">
-<component name="menusatinterface" filter="s60" long-name="Menu SAT Interface">
-<unit bldFile="mw/homescreensrv/menucontentsrv/menusatinterface/group"/>
-</component>
-<component name="menucontentsrv_build" filter="s60" long-name="Menu Content Service Build">
-<!--split this into components, or separate from the above component and move this down a directory -->
-<unit bldFile="mw/homescreensrv/menucontentsrv/group"/>
-</component>
-</collection>
-<collection name="backsteppingsrv" long-name="Back Stepping Service" level="server">
-<!-- collection is really a component, needs to be moved down a directory -->
-<component name="bsengine" long-name="Back Stepping Engine" filter="s60">
-<unit bldFile="mw/homescreensrv/backsteppingsrv/group"/>
-</component>
-</collection>
-<collection name="contentpublishingsrv" long-name="Content Publishing Service" level="server">
-<component name="contentpublishingdebug" filter="s60" long-name="Content Publishing Debug">
-<!-- need to move this component outside of contentpublishingutils and into separate component directory -->
-<!-- <unit bldFile="contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/> -->
-</component>
-<component name="contentpublishingutils" filter="s60" long-name="Content Publishing Utils">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingutils/group"/>
-</component>
-<component name="contentpublishingserver" filter="s60" long-name="Content Publishing Server">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingserver/group"/>
-</component>
-<component name="contentharvester" filter="s60" long-name="Content Harvester">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
-</component>
-<component name="contentpublishingsrv_build" filter="s60" long-name="Content Publishing Service Build">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/group"/>
-</component>
-</collection>
-<collection name="contentcontrolsrv" long-name="Content Control Service" level="server">
-<component name="ccsrv" long-name="Content Control Service" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccsrv/group"/>
-</component>
-<component name="ccsrvapi" long-name="Content Control Service API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccsrvapi/group"/>
-</component>
-<component name="ccclientsession" long-name="Content Control Client Session" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccclientsession/group"/>
-</component>
-<component name="hsccclient" long-name="HS Content Control Client" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/hsccclient/group"/>
-</component>
-<component name="hscontentinfo" long-name="Home Screen Content Info" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/hscontentinfo/group"/>
-</component>
-<component name="contentcontrolsrv_build" long-name="Content Control Service Build" filter="s60" introduced="^3">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/group"/>
-</component>
-</collection>
-</block>
-<block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
-<collection name="appinstall_plat" long-name="Application Installation Platform Interfaces" level="api">
-<component name="iaupdate_api" long-name="IA Update API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/iaupdate_api/group"/>
-</component>
-<component name="task_plugin_api" long-name="Task Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_plugin_api/group"/>
-</component>
-<component name="sw_installer_common_ui_api" long-name="SW Installer Common UI API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_common_ui_api/group"/>
-</component>
-<component name="sw_installer_launcher_api" long-name="SW Installer Launcher API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_launcher_api/group"/>
-</component>
-<component name="task_management_api" long-name="Task Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_management_api/group"/>
-</component>
-<component name="sw_installer_ui_plugin_api" long-name="SW Installer UI Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ui_plugin_api/group"/>
-</component>
-<component name="sw_installer_cr_keys" long-name="SW Installer CR Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_cr_keys/group"/>
-</component>
-<component name="sw_installer_ps_keys" long-name="SW Installer PS Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
-</component>
-<component name="appmngr2runtimeapi" long-name="Application Manager 2 Runtime Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
-</component>
-</collection>
-<collection name="appinstall_pub" long-name="Application Installation Public Interfaces" level="api">
-<component name="startup_list_management_api" long-name="Startup List Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
-</component>
-</collection>
-<collection name="ncdengine" long-name="Nokia Content Discover" level="framework">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="ncdengine_engine" filter="s60" long-name="NCD Engine" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/engine/group"/>
-</component>
-<component name="debuglogger" filter="s60" long-name="NCD Debug Logger" introduced="^1" class="placeholder">
-<!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
-</component>
-<component name="ncdengine_build" filter="s60" long-name="NCD Build" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/group"/>
-</component>
-</collection>
-<collection name="appinstaller" long-name="Application Installer" level="generic">
-<component name="appmngr2" filter="s60" long-name="Application Manager 2" introduced="^2">
-<unit bldFile="mw/appinstall/appinstaller/appmngr2/group"/>
-</component>
-<component name="appinstui" filter="s60" long-name="Application Installer UI" introduced="^2">
-<unit bldFile="mw/appinstall/appinstaller/appinstui/group"/>
-</component>
-</collection>
-<collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="api">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="iaupdateapi_stub_build" long-name="IA Update API Stub Build" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdateapi_stub/group"/>
-</component>
-</collection>
-<collection name="iaupdate" long-name="Independent Apps Update" level="api">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="iad" long-name="Software Update" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/iad/group"/>
-</component>
-<component name="iaupdate_help" filter="s60" long-name="IA Update Help" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/help/group"/>
-</component>
-<component name="iaupdate_build" filter="s60" long-name="IA Update Build" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/group"/>
-</component>
-</collection>
-<collection name="installationservices" long-name="Installation Services" level="generic">
-<component name="swi" long-name="Secure Software Install" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swi/group" mrp="mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
-</component>
-<component name="swidevicetools" long-name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
-<unit bldFile="mw/appinstall/installationservices/swidevicetools/group" mrp="mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
-</component>
-<component name="swiconfig" long-name="Software Install Config" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appinstall/installationservices/swiconfig/group" mrp="mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
-</component>
-</collection>
-<collection name="secureswitools" long-name="Secure Software Install Tools" level="tool">
-<component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/makekeys/group" mrp="mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
-</component>
-<component name="swianalysistoolkit" long-name="SWI Analysis Toolkit" purpose="development" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
-</component>
-<component name="openssllib" long-name="OpenSSL Library" purpose="optional" class="PC">
-<unit mrp="mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
-</component>
-<component name="swisistools" long-name="Secure Software Install SIS Tools" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swisistools/group" mrp="mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
-</component>
-</collection>
-<collection name="appinstall_info" long-name="Application Installation Info" level="api">
-<component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="serviceapifw" level="specific" long-name="Service API Framework" levels="plugin framework server generic specific">
-<collection name="serviceapifw_pub" long-name="Service API Framework Public Interfaces" level="specific"/>
-<collection name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" level="specific">
-<component name="rtsecuritymanager_common_api" long-name="Runtime Security Manager Common API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/group"/>
-</component>
-<component name="rtsecuritymanager_utility_api" long-name="Runtime Security Manager Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
-</component>
-<component name="rtsecuritymanager_client_api" long-name="Runtime Security Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/group"/>
-</component>
-<component name="liw_provider_utility_api" long-name="LIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_provider_utility_api/group"/>
-</component>
-<component name="liw_service_interface_base_api" long-name="LIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_base_api/group"/>
-</component>
-<component name="liw_service_interface_menu_api" long-name="LIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_menu_api/group"/>
-</component>
-<component name="liw_criteria_api" long-name="LIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_criteria_api/group"/>
-</component>
-<component name="liw_generic_parameter_api" long-name="LIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_generic_parameter_api/group"/>
-</component>
-<component name="liw_service_handler_api" long-name="LIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_handler_api/group"/>
-</component>
-</collection>
-<collection name="rtsecuritymanager" long-name="Runtime Security Manager" level="server">
-<component name="rtsecuritymanagerutil" filter="s60" long-name="Runtime Security Manager Util">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
-</component>
-<component name="rtsecuritymanagerserver" filter="s60" long-name="Runtime Security Manager Server">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/>
-</component>
-<component name="rtsecuritymanagerclient" filter="s60" long-name="Runtime Security Manager Client">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/>
-</component>
-<component name="rtsecuritymanager_build" filter="s60" long-name="Runtime Security Manager Build">
-<!-- Move the export to the appropriate components, or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/group"/>
-</component>
-</collection>
-<collection name="languageinterworkingfw" long-name="Language Interworking Framework" level="framework">
-<component name="lifwservicehandler" filter="s60" long-name="Service Handler">
-<unit bldFile="mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-</block>
-<block name="serviceapi" level="specific" long-name="Service API" levels="os mw1 mw2 app">
-<!-- should break up this collection into something meaningful -->
-<collection name="serviceproviders" long-name="Service Providers" level="mw1">
-<component name="sapi_contacts_vpbk" long-name="Contacts Phonebook SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
-</component>
-<component name="sapi_location" long-name="Location SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_location/group"/>
-</component>
-<component name="sapi_mediamanagement" long-name="Media Management SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/group"/>
-</component>
-<component name="sapi_landmarks" long-name="Landmarks SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
-</component>
-<component name="sapi_messaging" long-name="Messaging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/group"/>
-</component>
-<component name="sapi_applicationmanager" long-name="Application Manager SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
-</component>
-<component name="sapi_calendar" long-name="Calendar SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_calendar/group"/>
-</component>
-<component name="sapi_logging" long-name="Logging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_logging/group"/>
-</component>
-<component name="sapi_sensor" long-name="Sensor SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sensor/group"/>
-</component>
-<component name="sapi_sysinfo" long-name="Sysinfo SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sysinfo/group"/>
-</component>
-<component name="sapi_serviceregistry" long-name="Service Registry SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
-</component>
-<component name="jsapi" long-name="Javascript API" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/jsapi/group"/>
-</component>
-<component name="serviceproviders_build" filter="s60" long-name="Service API Build">
-<!-- distribute the exports or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapi/serviceproviders/group"/>
-</component>
-</collection>
-</block>
-<block name="web" level="specific" long-name="Web" levels="plugin utils server generic specific">
-<collection name="web_pub" long-name="Web Public Interfaces" level="specific">
-<component name="browser_control_api" long-name="Browser Control API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_control_api/group"/>
-</component>
-<component name="download_mgr_client_api" long-name="Download Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_client_api/group"/>
-</component>
-<component name="download_mgr_ui_api" long-name="Download Manager UI Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_ui_api/group"/>
-</component>
-<component name="favourites_engine_api" long-name="Favourites Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/favourites_engine_api/group"/>
-</component>
-<component name="browser_plugin_api" long-name="Browser Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_plugin_api/group"/>
-</component>
-<component name="settings_api" long-name="Settings API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/settings_api/group"/>
-</component>
-</collection>
-<collection name="web_plat" long-name="Web Platform Interfaces" level="specific">
-<component name="aiw_browser_provider_api" long-name="AIW Browser Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/aiw_browser_provider_api/group"/>
-</component>
-<component name="browser_dialogs_provider_api" long-name="Browser Dialogs Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_dialogs_provider_api/group"/>
-</component>
-<component name="browser_platform_api" long-name="Browser Platform API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_platform_api/group"/>
-</component>
-<component name="cod_handler_api" long-name="COD Handler API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cod_handler_api/group"/>
-</component>
-<component name="connection_manager_api" long-name="Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/connection_manager_api/group"/>
-</component>
-<component name="cxml_library_api" long-name="cXml Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cxml_library_api/group"/>
-</component>
-<component name="download_mgr_client_api_extn" long-name="Download Manager Client API Extension" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/download_mgr_client_api_extn/group"/>
-</component>
-<component name="feeds_engine_api" long-name="Feeds Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/feeds_engine_api/group"/>
-</component>
-<component name="launcher_api" long-name="Launcher API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/launcher_api/group"/>
-</component>
-<component name="multipart_parser_api" long-name="Multipart Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/multipart_parser_api/group"/>
-</component>
-<component name="recent_url_store_api" long-name="Recent URL Store API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/recent_url_store_api/group"/>
-</component>
-<component name="scheme_handler_plugin_api" long-name="Scheme Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scheme_handler_plugin_api/group"/>
-</component>
-<component name="scriptable_plugin_api" long-name="Scriptable Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scriptable_plugin_api/group"/>
-</component>
-<component name="webutils_api" long-name="Web Utils API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/webutils_api/group"/>
-</component>
-<component name="widget_registry_api" long-name="Widget Registry API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/widget_registry_api/group"/>
-</component>
-<component name="xml_parser_api" long-name="XML Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/xml_parser_api/group"/>
-</component>
-<component name="stmgesturefw_api" long-name="State Machine Gesture Framework API " filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/stmgesturefw_api/group"/>
-</component>
-</collection>
-<collection name="web_info" long-name="Web Info" level="specific">
-<component name="web_build" filter="s60" long-name="Web Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/group"/>
-</component>
-</collection>
-<collection name="browserutilities" long-name="Browser Utilities" level="utils">
-<component name="browserdialogsprovider" filter="s60" long-name="Browser Dialogs Provider">
-<unit bldFile="mw/web/browserutilities/browserdialogsprovider/group"/>
-</component>
-<component name="recenturlstore" filter="s60" long-name="Recent URL Store">
-<unit bldFile="mw/web/browserutilities/recenturlstore/group"/>
-</component>
-<component name="xmlparser" filter="s60" long-name="XML Interface">
-<unit bldFile="mw/web/browserutilities/xmlparser/group"/>
-</component>
-<component name="cxmllibrary" filter="s60" long-name="XML Parser Implementation">
-<unit bldFile="mw/web/browserutilities/cxmllibrary/group"/>
-</component>
-<component name="downloadmgr" filter="s60" long-name="Download Manager">
-<unit bldFile="mw/web/browserutilities/downloadmgr/group"/>
-</component>
-<component name="connectionmanager" filter="s60" long-name="Connection Manager">
-<unit bldFile="mw/web/browserutilities/connectionmanager/group"/>
-</component>
-<component name="browsertelservice" filter="s60" long-name="Browser Telephony Service">
-<unit bldFile="mw/web/browserutilities/browsertelservice/group"/>
-</component>
-<component name="favouritesengine" filter="s60" long-name="Favourites Engine">
-<unit bldFile="mw/web/browserutilities/favouritesengine/group"/>
-</component>
-<component name="feedsengine" filter="s60" long-name="Feeds Engine">
-<unit bldFile="mw/web/browserutilities/feedsengine/group"/>
-</component>
-<component name="multipartparser" filter="s60" long-name="Multipart Parser">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
-<!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
-</component>
-<component name="schemehandler" filter="s60" long-name="Scheme Handler">
-<unit bldFile="mw/web/browserutilities/schemehandler/group"/>
-</component>
-<component name="webutils" filter="s60" long-name="Web Utils">
-<unit bldFile="mw/web/browserutilities/webutils/group"/>
-</component>
-<component name="aiwbrowserprovider" filter="s60" long-name="AIW Browser Provider" plugin="Y">
-<unit bldFile="mw/web/browserutilities/aiwbrowserprovider/group"/>
-</component>
-<component name="browserutilities_build" filter="s60" long-name="Browser Utilities Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/browserutilities/group"/>
-</component>
-</collection>
-<collection name="webengine" long-name="Web Engine" level="server">
-<component name="osswebengine" filter="s60" long-name="OSS Web Engine">
-<!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
-<unit bldFile="mw/web/webengine/osswebengine/cache/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/memorymanager/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/npscript/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group/javascriptcore"/>
-</component>
-<component name="webkitutils" filter="s60" long-name="WebKit Utils">
-<unit bldFile="mw/web/webengine/webkitutils/group"/>
-</component>
-<component name="pagescaler" filter="s60" long-name="Page Scaler">
-<unit bldFile="mw/web/webengine/pagescaler/group"/>
-</component>
-<component name="webwidgetinstaller" filter="s60" long-name="Widget Installer">
-<unit bldFile="mw/web/webengine/widgetinstaller/group"/>
-</component>
-<component name="widgetregistry" filter="s60" long-name="Widget Registry">
-<unit bldFile="mw/web/webengine/widgetregistry/group"/>
-</component>
-<component name="wmlengine" filter="s60" long-name="WML Engine">
-<unit bldFile="mw/web/webengine/wmlengine/group"/>
-</component>
-<component name="device" filter="s60" long-name="Device">
-<!-- this needs a more meaningful name -->
-<unit bldFile="mw/web/webengine/device/group"/>
-</component>
-<component name="widgetengine" filter="s60" long-name="Widget Engine">
-<unit bldFile="mw/web/webengine/widgetengine/group"/>
-</component>
-<component name="web_memoryplugin" long-name="Memory Plugin" filter="s60" plugin="Y">
-<unit bldFile="mw/web/webengine/memoryplugin/group"/>
-</component>
-<component name="widgetmemoryplugin" filter="s60" long-name="Widget Memory Plugin" plugin="Y">
-<unit bldFile="mw/web/webengine/widgetmemoryplugin/group"/>
-</component>
-<component name="widgetbackuprestore" filter="s60" long-name="Widget Backup and Restore">
-<unit bldFile="mw/web/webengine/widgetbackuprestore/group"/>
-</component>
-<component name="browserrecognizers" filter="s60" long-name="Browser Recognizers" plugin="Y">
-<unit bldFile="mw/web/webengine/browserrecognizers/group"/>
-</component>
-<component name="wrtharvester" filter="s60" long-name="Web Runtime Harvester" plugin="Y">
-<unit bldFile="mw/web/webengine/wrtharvester/group"/>
-</component>
-</collection>
-<collection name="codhandler" long-name="Content Object Descriptor Handler" level="specific">
-<component name="codeng" filter="s60" long-name="COD Engine">
-<unit bldFile="mw/web/codhandler/codeng/group"/>
-</component>
-<component name="codui" filter="s60" long-name="COD UI">
-<unit bldFile="mw/web/codhandler/codui/group"/>
-</component>
-<component name="codrecog" filter="s60" long-name="COD Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/codrecog/group"/>
-</component>
-<component name="codviewer" filter="s60" long-name="COD Viewer">
-<unit bldFile="mw/web/codhandler/codviewer/group"/>
-</component>
-<component name="ddrecog" filter="s60" long-name="Download Descriptor Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/ddrecog/group"/>
-</component>
-<component name="ddviewer" filter="s60" long-name="Download Descriptor Viewer">
-<unit bldFile="mw/web/codhandler/ddviewer/group"/>
-</component>
-<component name="coddownload" filter="s60" long-name="COD Download">
-<unit bldFile="mw/web/codhandler/coddownload/group"/>
-</component>
-<component name="roapapp" filter="s60" long-name="ROAP Application">
-<unit bldFile="mw/web/codhandler/roapapp/group"/>
-</component>
-<component name="codhandler_build" filter="s60" long-name="COD Handler Build">
-<!-- Exports need to go into another component or make this self-contained.
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/codhandler/group"/>
-</component>
-</collection>
-<collection name="widgets" long-name="Web Widget Framework" level="generic">
-<!-- the following units can be uncommented when configuration is put in place -->
-<component name="widgetrecognizer" filter="s60" long-name="Widget Recognizer" plugin="Y">
-<!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
-</component>
-<component name="widgetinstaller" filter="s60" long-name="Widget Installer UI" plugin="Y">
-<!--<unit bldFile="widgets/widgetinstaller/group"/>-->
-</component>
-<component name="widgetlauncher" filter="s60" long-name="Widget Launcher">
-<!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
-</component>
-<component name="widgetapp" filter="s60" long-name="Widget UI">
-<!--<unit bldFile="widgets/widgetapp/group"/>-->
-</component>
-<component name="widgetsidchecker" filter="s60" long-name="Widget SID Checker" introduced="^3">
-<!--<unit bldFile="widgets/widgetsidchecker/group"/>-->
-</component>
-<component name="widgetpreinstaller" filter="s60" long-name="Widget Pre-Installer">
-<!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
-</component>
-<component name="widgetstartup" filter="s60" long-name="Widget Startup">
-<!--<unit bldFile="widgets/widgetstartup/group"/>-->
-</component>
-<component name="widgets_build" filter="s60" long-name="Widgets Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/widgets/group"/>
-</component>
-</collection>
-</block>
-<block name="websrv" level="generic" long-name="Web Services" levels="plugin framework server generic specific">
-<collection name="websrv_pub" long-name="Web Services Public Interfaces" level="specific">
-<component name="web_service_description_api" long-name="Web Service Description API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_description_api/group"/>
-</component>
-<component name="web_service_connection_api" long-name="Web Service Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/group"/>
-</component>
-<component name="web_service_manager_api" long-name="Web Service Manager API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/group"/>
-</component>
-<component name="hostlet_connection_api" long-name="Hostlet Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/group"/>
-</component>
-<component name="web_service_messaging_api" long-name="Web Service Messaging API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/group"/>
-</component>
-<component name="xml_extensions_api" long-name="XML Extensions API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/group"/>
-</component>
-<component name="xml_fragment_api" long-name="XML Fragment API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/group"/>
-</component>
-</collection>
-<collection name="webservices" long-name="Web Services Framework" level="generic">
-<!-- consider breaking this collection into more meaningful subsets -->
-<component name="wsnotifierplugins" filter="s60" long-name="WS Notifier Plugins" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsnotifierplugins/group"/>
-</component>
-<component name="wslogger" filter="s60" long-name="WS Logger">
-<unit bldFile="mw/websrv/webservices/wslogger/group"/>
-</component>
-<component name="wsxml" filter="s60" long-name="WS XML Extensions">
-<unit bldFile="mw/websrv/webservices/wsxml/group"/>
-</component>
-<component name="wsutils" filter="s60" long-name="WS Utils">
-<unit bldFile="mw/websrv/webservices/wsutils/group"/>
-</component>
-<component name="wsfragment" filter="s60" long-name="WS Fragment">
-<unit bldFile="mw/websrv/webservices/wsfragment/group"/>
-</component>
-<component name="wsdescription" filter="s60" long-name="WS Service Description">
-<unit bldFile="mw/websrv/webservices/wsdescription/group"/>
-</component>
-<component name="wsconnection" filter="s60" long-name="WS Service Connection">
-<unit bldFile="mw/websrv/webservices/wsconnection/group"/>
-</component>
-<component name="wsmessages" filter="s60" long-name="WS Messages">
-<unit bldFile="mw/websrv/webservices/wsmessages/group"/>
-</component>
-<component name="wscredentialmanager" filter="s60" long-name="WS Credential Manager">
-<unit bldFile="mw/websrv/webservices/wscredentialmanager/group"/>
-</component>
-<component name="wsframework" filter="s60" long-name="WS Framework">
-<unit bldFile="mw/websrv/webservices/wsframework/group"/>
-</component>
-<component name="wshttpchanneltransportplugin" filter="s60" long-name="WS HTTP Channel Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshttpchanneltransportplugin/group"/>
-</component>
-<component name="wsconnectionagent" filter="s60" long-name="WS Connection Agent">
-<unit bldFile="mw/websrv/webservices/wsconnectionagent/group"/>
-</component>
-<component name="wsprovider" filter="s60" long-name="WS Provider">
-<unit bldFile="mw/websrv/webservices/wsprovider/group"/>
-</component>
-<component name="wshostletconnection" filter="s60" long-name="WS Hostlet Connection">
-<unit bldFile="mw/websrv/webservices/wshostletconnection/group"/>
-</component>
-<component name="wsmanager" filter="s60" long-name="WS Service Manager">
-<unit bldFile="mw/websrv/webservices/wsmanager/group"/>
-</component>
-<component name="wsidentitymanager" filter="s60" long-name="WS Identity Manager">
-<unit bldFile="mw/websrv/webservices/wsidentitymanager/group"/>
-</component>
-<component name="idwsfplugin" filter="s60" long-name="ID-WSF Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/idwsfplugin/group"/>
-</component>
-<component name="wsibasicplugin" filter="s60" long-name="WS-I Basic Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsibasicplugin/group"/>
-</component>
-<component name="wsrestplugin" filter="s60" long-name="WS REST Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsrestplugin/group"/>
-</component>
-<component name="idwsfsecuritymechanism" filter="s60" long-name="ID-WSF Security Mechanism">
-<unit bldFile="mw/websrv/webservices/idwsfsecuritymechanism/group"/>
-</component>
-<component name="wspasswordtransforms" filter="s60" long-name="WS Password Transforms">
-<unit bldFile="mw/websrv/webservices/wspasswordtransforms/group"/>
-</component>
-<component name="wscore" filter="s60" long-name="WS Core Service Manager">
-<unit bldFile="mw/websrv/webservices/wscore/group"/>
-</component>
-<component name="wslocaltransportplugin" filter="s60" long-name="WS Local Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wslocaltransportplugin/group"/>
-</component>
-<component name="wshostlettransportplugin" filter="s60" long-name="WS Hostlet Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshostlettransportplugin/group"/>
-</component>
-<component name="wsstar" filter="s60" long-name="WS Star">
-<!-- can only have one unit. Need to split into separate components or #include from a single bld.inf -->
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarpolicy/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarplugin/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarmessagehandlers/group"/>
-</component>
-<component name="wsoviplugin" filter="s60" long-name="WS Ovi Plugin">
-<unit bldFile="mw/websrv/webservices/wsoviplugin/group"/>
-</component>
-<component name="webservices_build" filter="s60" long-name="Web Services Build">
-<!-- need to split into self-contained components -->
-<unit bldFile="mw/websrv/webservices/group"/>
-</component>
-</collection>
-<collection name="websrv_info" long-name="Web Services Info" level="specific">
-<component name="websrv_bld" filter="s60" long-name="Web Services Build">
-<!-- need to include common .hrh in each unit -->
-<unit bldFile="mw/websrv/group"/>
-</component>
-</collection>
-</block>
-<block name="platformtools" level="generic" long-name="Platform Tools">
-<collection name="gfxconversion" long-name="Graphics Conversion">
-<component name="bmconv_s60" filter="s60" long-name="S60 Bitmap Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/bmconv_s60/group"/>
-</component>
-<component name="mifconv" filter="s60" long-name="Multi Icon File Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/mifconv/group"/>
-</component>
-</collection>
-</block>
-<block name="uitools" level="specific" long-name="UI Tools" levels="compile encode tool if">
-<collection name="uitools_pub" long-name="UI Tools Public Interfaces" level="if">
-<component name="third_party_bitmap_palette_api" long-name="Third Party Bitmap Palette API" filter="s60" class="api">
-<unit bldFile="mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
-</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">
-<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">
-<unit bldFile="mw/uitools/uitools_plat/layout_system_private_api/group"/>
-</component>
-</collection>
-<collection name="cdlcompilertoolkit" long-name="CDL Compiler Toolkit" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompilertoolkit_build" filter="s60" long-name="CDL Compiler Toolkit Build">
-<unit bldFile="mw/uitools/cdlcompilertoolkit/group"/>
-</component>
-</collection>
-<collection name="cdlcompiler" long-name="CDL Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompiler_build" filter="s60" long-name="CDL Compiler Build">
-<unit bldFile="mw/uitools/cdlcompiler/group"/>
-</component>
-</collection>
-<collection name="gfxtools" long-name="Graphics Tools" level="tool">
-<component name="gditools" filter="s60" long-name="GDI Tools" class="PC">
-<unit bldFile="mw/uitools/gfxtools/gditools/group"/>
-</component>
-<component name="color" filter="s60" long-name="Bitmap Colour Palette" class="PC">
-<unit bldFile="mw/uitools/gfxtools/color/group"/>
-</component>
-</collection>
-<collection name="aknlayoutcompiler" long-name="Avkon Layout Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="aknlayoutcompiler_build" filter="s60" long-name="Avkon Layout Compiler Build">
-<unit bldFile="mw/uitools/aknlayoutcompiler/group"/>
-</component>
-</collection>
-<collection name="skincompiler" long-name="Skin Compiler" level="compile">
-<component name="aknskindesccompiler" filter="s60" long-name="Avkon Skin Descriptor Compiler">
-<unit bldFile="mw/uitools/skincompiler/AknSkinDescCompiler/group"/>
-</component>
-</collection>
-<collection name="reszip" long-name="Resource Zip" level="encode">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="reszip_build" filter="s60" long-name="Resource Zip Build">
-<unit bldFile="mw/uitools/reszip/group"/>
-</component>
-</collection>
-<collection name="toollibraries" long-name="Tool Libraries" level="tool"/>
-<collection name="svgtencoder" long-name="SVGT Encoder" level="encode">
-<component name="svgtenc" filter="s60" long-name="Standalone SVGT Encoder" class="PC">
-<unit bldFile="mw/uitools/svgtencoder/svgtenc/standalone/group"/>
-</component>
-</collection>
-</block>
-</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">
-<component name="location_centre_api" long-name="Location Centre API" introduced="^3" filter="s60" class="api">
-<unit bldFile="app/location/loc_plat/location_centre_api/group"/>
-</component>
-</collection>
-<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"/>
-</component>
-<component name="landmarks_ui_addedit_api" long-name="Landmarks UI Add/Edit API" filter="s60" class="api">
-<unit bldFile="app/location/loc_pub/landmarks_ui_addedit_api/group"/>
-</component>
-</collection>
-<collection name="basiclocationinfodisplay" long-name="Basic Location Info Display" level="ui">
-<component name="blid" filter="s60" long-name="Basic Location Info Display Build">
-<unit bldFile="app/location/basiclocationinfodisplay/blid/group"/>
-</component>
-</collection>
-<collection name="landmarksui" long-name="Landmarks UI" level="loc">
-<component name="landmarksui_help" filter="s60" long-name="Landmarks UI Help">
-<unit bldFile="app/location/landmarksui/help/group"/>
-</component>
-<component name="landmarksui_engine" filter="s60" long-name="Landmarks UI Engine">
-<unit bldFile="app/location/landmarksui/engine/group"/>
-</component>
-<component name="uicontrols" filter="s60" long-name="Landmarks UI Controls">
-<unit bldFile="app/location/landmarksui/uicontrols/group"/>
-</component>
-<component name="landmarksui_commonui" filter="s60" long-name="Landmarks Common UI">
-<unit bldFile="app/location/landmarksui/commonui/group"/>
-</component>
-<component name="landmarksui_app" filter="s60" long-name="Landmarks Application">
-<unit bldFile="app/location/landmarksui/app/group"/>
-</component>
-<component name="msgviewer" filter="s60" long-name="Landmarks Message Viewer">
-<unit bldFile="app/location/landmarksui/msgviewer/group"/>
-</component>
-<component name="landmarksui_build" filter="s60" long-name="Landmarks UI Build">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="app/location/landmarksui/group"/>
-</component>
-</collection>
-<collection name="eventsui" long-name="Location Events UI" level="events">
-<component name="eventsui_help" filter="s60" long-name="Events Help">
-<unit bldFile="app/location/eventsui/help/group"/>
-</component>
-<component name="eventsutils" filter="s60" long-name="Events Utils">
-<unit bldFile="app/location/eventsui/eventsutils/group"/>
-</component>
-<component name="eventsengine" filter="s60" long-name="Events Engine">
-<unit bldFile="app/location/eventsui/eventsengine/group"/>
-</component>
-<component name="eventshandlerui" filter="s60" long-name="Events Handler UI">
-<unit bldFile="app/location/eventsui/eventshandlerui/group"/>
-</component>
-<component name="eventseditor" filter="s60" long-name="Events Editor">
-<unit bldFile="app/location/eventsui/eventseditor/group"/>
-</component>
-<component name="eventsmgmtui" filter="s60" long-name="Events Management UI">
-<unit bldFile="app/location/eventsui/eventsmgmtui/group"/>
-</component>
-<component name="eventsui_build" filter="s60" long-name="Events UI Build">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="app/location/eventsui/group"/>
-</component>
-</collection>
-<collection name="locationlandmarksrefappfors60" long-name="Location Landmarks Reference App for S60" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="lmrefapp" filter="s60" long-name="Landmarks Reference Application">
-<unit bldFile="app/location/locationlandmarksrefappfors60/group"/>
-</component>
-</collection>
-<collection name="locationlandmarksuirefapp" long-name="Location Landmarks UI Reference App" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="lmuirefapp" filter="s60" long-name="Landmarks UI Reference Application">
-<unit bldFile="app/location/locationlandmarksuirefapp/group"/>
-</component>
-</collection>
-<collection name="locationsatviewrefapp" long-name="Location Satellite View Reference App" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="satellitereference" filter="s60" long-name="Satellite Info UI Reference Application">
-<unit bldFile="app/location/locationsatviewrefapp/group"/>
-</component>
-</collection>
-<collection name="simpsyconfigurator" long-name="Simulation PSY Configurator" level="ui">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="simpsyui" filter="s60" long-name="Simulation PSY UI">
-<unit bldFile="app/location/simpsyconfigurator/group"/>
-</component>
-</collection>
-<collection name="mapnavproviderrefapp" long-name="Map and Navigation Provider Reference App" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="mapnavproviderrefapp_build" filter="s60" long-name="Map and Navigation Provider Reference Application">
-<unit bldFile="app/location/mapnavproviderrefapp/group"/>
-</component>
-</collection>
-<collection name="locationcentre" long-name="Location Centre" level="loc">
-<component name="lcutils" long-name="Location Centre Utilities" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcutils/group"/>
-</component>
-<component name="lcservice" long-name="Location Centre Service Project" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcservice/group"/>
-</component>
-<component name="lcserver" long-name="Location Centre Server Project" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcserver/group"/>
-</component>
-<component name="lcapp" long-name="Location Centre Application" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcapp/group"/>
-</component>
-<component name="locationcentre_build" filter="s60" long-name="Location Centre Build" introduced="^3">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="app/location/locationcentre/group"/>
-</component>
-</collection>
-</block>
-<block name="mmsharinguis" level="services" long-name="Multimedia Sharing UIs" levels="base plugin if">
-<collection name="mmsharinguis_plat" long-name="Multimedia Sharing UIs Platform Interfaces" level="if">
-<component name="multimedia_sharing_settings_api" long-name="Multimedia Sharing Settings API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_settings_api/group"/>
-</component>
-<component name="multimedia_sharing_resource_api" long-name="Multimedia Sharing Resource API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_resource_api/group"/>
-</component>
-<component name="multimedia_sharing_manager_api" long-name="Multimedia Sharing Manager API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/group"/>
-</component>
-</collection>
-<collection name="mmsharing" long-name="Multimedia Sharing" level="base">
-<component name="mmshavailability" filter="s60" long-name="Multimedia Sharing Availability">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshavailability/group"/>
-</component>
-<component name="mmshindicator" filter="s60" long-name="Multimedia Sharing Indicator">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshindicator/group"/>
-</component>
-<!-- consider putting client and server in the same component -->
-<component name="mmshmanagercli" filter="s60" long-name="Multimedia Sharing Manager Client">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshmanagercli/group" filter="!test"/>
-</component>
-<component name="mmshmanagersrv" filter="s60" long-name="Multimedia Sharing Manager Server">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshmanagersrv/group"/>
-</component>
-<component name="mmshengine" filter="s60" long-name="Multimedia Sharing Engine">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshengine/group"/>
-</component>
-<component name="mmshui" filter="s60" long-name="Multimedia Sharing UI">
-<!-- can only have one unit: need to #include one from the other if it's needed -->
-<unit bldFile="app/mmsharinguis/mmsharing/mmshui/group"/>
-<unit bldFile="app/mmsharinguis/mmsharing/mmshui/help/group"/>
-</component>
-<component name="mmsharing_build" filter="s60" long-name="MM Sharing Build">
-<unit bldFile="app/mmsharinguis/mmsharing/group"/>
-</component>
-</collection>
-<collection name="mmshplugins" long-name="Multimedia Sharing Plugins" level="plugin">
-<component name="mmshaoplugin" filter="s60" long-name="Multimedia Sharing Always Online Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshaoplugin/group"/>
-</component>
-<component name="mmshaiwplugin" filter="s60" long-name="Multimedia Sharing AIW Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshaiwplugin/group"/>
-</component>
-<component name="mmshsipcrplugin" filter="s60" long-name="Multimedia Sharing SIP Client Resolver Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshsipcrplugin/group"/>
-</component>
-<component name="mmshsettingsuiplugin" filter="s60" long-name="Multimedia Sharing Settings UI Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshsettingsuiplugin/group"/>
-</component>
-<component name="mmshwpadapterplugin" filter="s60" long-name="Multimedia Sharing WAP Provisioning Adapter" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshwpadapterplugin/group"/>
-</component>
-</collection>
-<collection name="mmsharinguis_info" long-name="Multimedia Sharing UIs Info" level="if">
-<component name="mmsharinguis_build" filter="s60" long-name="Multimedia Sharing UIs Build">
-<!-- consider distributing to other components -->
-<unit bldFile="app/mmsharinguis/group"/>
-</component>
-</collection>
-</block>
-<block name="phone" level="apps" span="2" long-name="Phone Apps" levels="engine plugin ui app">
-<collection name="phone_plat" long-name="Phone Apps Platform Interfaces" level="app">
-<component name="3d_ringing_tone_enabler_api" long-name="3D Ringing Tone Enabler API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
-</component>
-<component name="telephony_comms_information_api" long-name="Telephony Comms Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_comms_information_api/group"/>
-</component>
-<component name="telephony_information_api" long-name="Telephony Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_information_api/group"/>
-</component>
-<component name="telephony_device_mode_api" long-name="Telephony Device Mode API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_device_mode_api/group"/>
-</component>
-<component name="telephony_remote_party_information_api" long-name="Telephony Remote Party Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_remote_party_information_api/group"/>
-</component>
-<component name="telephony_video_mailbox_settings_api" long-name="Telephony Video Mailbox Settings API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_video_mailbox_settings_api/group"/>
-</component>
-<component name="telephony_configuration_api" long-name="Telephony Configuration API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_configuration_api/group"/>
-</component>
-<component name="telephony_microphone_mute_status_api" long-name="Telephony Microphone Mute Status API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_microphone_mute_status_api/group"/>
-</component>
-<component name="dialer_keypad_api" long-name="Dialer Keypad API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/dialer_keypad_api/group"/>
-</component>
-<component name="telephony_logging_extension_api" long-name="Telephony Logging Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_logging_extension_api/group"/>
-</component>
-<component name="telephony_matching_extension_api" long-name="Telephony Matching Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_matching_extension_api/group"/>
-</component>
-<component name="telephony_bubble_extension_api" long-name="Telephony Bubble Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_bubble_extension_api/group"/>
-</component>
-<component name="telephony_menu_extension_api" long-name="Telephony Menu Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_menu_extension_api/group"/>
-</component>
-<component name="phone_application_commands_api" long-name="Phone Application Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_commands_api/group"/>
-</component>
-<component name="phone_application_voip_commands_api" long-name="Phone Application VOIP Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_voip_commands_api/group"/>
-</component>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_mediator_api/group"/>
-</component>
-<component name="video_telephony_mediator_api" long-name="Video Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/video_telephony_mediator_api/group"/>
-</component>
-</collection>
-<collection name="phoneapp" long-name="Phone Application" level="app">
-<component name="blacklist" filter="s60" long-name="Phone Blacklist Clearing" plugin="Y">
-<unit bldFile="app/phone/phoneapp/blacklist/group"/>
-</component>
-<component name="phoneui" filter="s60" long-name="Phone UI">
-<unit bldFile="app/phone/phoneapp/phoneui/group" filter="!test"/>
-</component>
-<component name="phoneuicontrol" filter="s60" long-name="Phone UI Control">
-<unit bldFile="app/phone/phoneapp/phoneuicontrol/group"/>
-</component>
-<component name="phoneuistates" filter="s60" long-name="Phone UI States">
-<unit bldFile="app/phone/phoneapp/phoneuistates/group"/>
-</component>
-<component name="phoneuiutils" filter="s60" long-name="Phone UI Utils">
-<unit bldFile="app/phone/phoneapp/phoneuiutils/group"/>
-</component>
-<component name="phoneuiview" filter="s60" long-name="Phone UI View">
-<unit bldFile="app/phone/phoneapp/phoneuiview/group"/>
-</component>
-<component name="phoneuivoipextension" filter="s60" long-name="Phone UI VOIP Extension">
-<unit bldFile="app/phone/phoneapp/phoneuivoipextension/group"/>
-</component>
-<component name="silenceactionplugin" filter="s60" long-name="Silence Action Plugin" plugin="Y">
-<unit bldFile="app/phone/phoneapp/silenceactionplugin/group"/>
-</component>
-<component name="phonemediatorcenter" filter="s60" long-name="Phone Mediator Center">
-<unit bldFile="app/phone/phoneapp/phonemediatorcenter/group"/>
-</component>
-</collection>
-<collection name="phoneengine" long-name="Phone Engine" level="engine">
-<component name="phonecntfinder" filter="s60" long-name="Phone Contact Finder">
-<unit bldFile="app/phone/phoneengine/phonecntfinder/group"/>
-</component>
-<component name="audiohandling" filter="s60" long-name="Phone Audio Handling">
-<unit bldFile="app/phone/phoneengine/audiohandling/group"/>
-</component>
-<component name="callhandling" filter="s60" long-name="Call Handling">
-<unit bldFile="app/phone/phoneengine/callhandling/group"/>
-</component>
-<component name="contacthandling" filter="s60" long-name="Phone Contact Handling">
-<unit bldFile="app/phone/phoneengine/contacthandling/group"/>
-</component>
-<component name="loghandling" filter="s60" long-name="Phone Log Handling">
-<unit bldFile="app/phone/phoneengine/loghandling/group"/>
-</component>
-<component name="engineinfo" filter="s60" long-name="Phone Engine Info">
-<unit bldFile="app/phone/phoneengine/engineinfo/group"/>
-</component>
-<component name="phonemodel" filter="s60" long-name="Phone Model">
-<unit bldFile="app/phone/phoneengine/phonemodel/group"/>
-</component>
-<component name="servicehandling" filter="s60" long-name="Phone Service Handling">
-<unit bldFile="app/phone/phoneengine/servicehandling/group"/>
-</component>
-</collection>
-<collection name="phonesettings" long-name="Phone Settings" level="plugin">
-<component name="aiwcallimageplugin" filter="s60" long-name="Call Image AIW Plugin" plugin="Y">
-<unit bldFile="app/phone/phonesettings/aiwcallimageplugin/group"/>
-</component>
-<component name="pslncallimageplugin" filter="s60" long-name="Call Image Personalization Plugin" plugin="Y">
-<unit bldFile="app/phone/phonesettings/pslncallimageplugin/group"/>
-</component>
-</collection>
-<collection name="phoneuis" long-name="Phone UIs" level="ui">
-<component name="dialer" filter="s60" long-name="Dialer">
-<unit bldFile="app/phone/phoneuis/dialer/group" filter="!test"/>
-</component>
-<component name="easydialing" filter="s60" long-name="Easy Dialing Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/phone/phoneuis/easydialing/group"/>
-</component>
-<component name="bubblemanager" filter="s60" long-name="Phone Bubble Manager">
-<unit bldFile="app/phone/phoneuis/bubblemanager/group"/>
-</component>
-<component name="connectutil" filter="s60" long-name="Connection Utility" plugin="Y">
-<unit bldFile="app/phone/phoneuis/connectutil/group"/>
-</component>
-<component name="ussd" filter="s60" long-name="Unstructured Supplementary Services Data">
-<unit bldFile="app/phone/phoneuis/ussd/group"/>
-</component>
-<component name="vmbx" filter="s60" long-name="Voice Mailbox">
-<unit bldFile="app/phone/phoneuis/vmbx/group"/>
-</component>
-<component name="telephonydevicemode" filter="s60" long-name="Telephony Device Mode">
-<unit bldFile="app/phone/phoneuis/telephonydevicemode/group"/>
-</component>
-</collection>
-<collection name="phoneplugins" long-name="Phone Plugins" level="plugin">
-<component name="telbranding" filter="s60" long-name="Tel Branding" introduced="^2" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/telbranding/group"/>
-</component>
-</collection>
-</block>
-<block name="videotelephony" level="apps" long-name="Video Telephony Apps" levels="engine plugin prot ui">
-<collection name="videotelephony_plat" long-name="VT Apps Platform Interfaces" level="ui">
-<component name="video_telephony_control_mediator_api" long-name="Video Telephony Control Mediator API" filter="s60" class="api">
-<unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_control_mediator_api/group"/>
-</component>
-<component name="video_telephony_media_configuration_api" long-name="Video Telephony Media Configuration API" filter="s60" class="api">
-<unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_media_configuration_api/group"/>
-</component>
-</collection>
-<collection name="vtengines" long-name="Video Telephony Engines" level="engine">
-<component name="videoteleng" filter="s60" long-name="Video Telephony Engine">
-<unit bldFile="app/videotelephony/vtengines/videoteleng/Group"/>
-</component>
-<component name="vtmediatorplugin" filter="s60" long-name="VT Mediator Plugin" plugin="Y">
-<unit bldFile="app/videotelephony/vtengines/vtmediatorplugin/group"/>
-</component>
-</collection>
-<collection name="vtuis" long-name="Video Telephony UIs" level="ui">
-<component name="videotelui" filter="s60" long-name="Video Telephony UI">
-<unit bldFile="app/videotelephony/vtuis/videotelui/group"/>
-</component>
-</collection>
-<collection name="vtprotocolplugins" long-name="VT Protocol Plugins" level="plugin">
-<component name="displaysink" filter="s60" long-name="Display Sink" introduced="^2">
-<unit bldFile="app/videotelephony/vtprotocolplugins/DisplaySink/group"/>
-</component>
-<component name="videosource" filter="s60" long-name="Video Source" introduced="^2">
-<unit bldFile="app/videotelephony/vtprotocolplugins/VideoSource/group"/>
-</component>
-</collection>
-<collection name="vtprotocolsstub" long-name="VT Protocols Stub" level="prot">
-<!-- this collection is really a component, move down a directory -->
-<component name="videotelproto" filter="s60" long-name="Video Telephony Protocol">
-<unit bldFile="app/videotelephony/vtprotocolsstub/group" filter="sf_build"/>
-</component>
-</collection>
-</block>
-<block name="iptelephony" level="apps" long-name="IP Telephony" levels="eng plugin util ui">
-<collection name="iptel_plat" long-name="IP Telephony Platform Interfaces" level="ui">
-<component name="richcallsettingsengine_api" long-name="Rich Call Settings Engine API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/richcallsettingsengine_api/group"/>
-</component>
-<component name="cch_client_api" long-name="CCH Client API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/cch_client_api/group"/>
-</component>
-<component name="cch_server_api" long-name="CCH Server API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/cch_server_api/group"/>
-</component>
-<component name="csc_settingsui_api" long-name="CSC Settings UI API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/csc_settingsui_api/group"/>
-</component>
-<component name="vccpropertyhandler_api" long-name="VCC Property Handler API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/vccpropertyhandler_api/group"/>
-</component>
-<component name="vcc_api" long-name="VCC API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/vcc_api/group"/>
-</component>
-</collection>
-<collection name="iptelcommsconfig" long-name="IP Telephony Comms Config" level="ui">
-<component name="cscgsplugin" filter="s60" long-name="CSC GS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/commsconfig/cscgsplugin/group"/>
-</component>
-<component name="cscsipvoipcleanupplugin" filter="s60" long-name="CSC SIP VoIP Cleanup Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/commsconfig/cscsipvoipcleanupplugin/group"/>
-</component>
-<component name="cscengine" filter="s60" long-name="Connection Service Configurator Engine" introduced="^2">
-<unit bldFile="app/iptelephony/commsconfig/cscengine/group"/>
-</component>
-<component name="cscsettingsui" filter="s60" long-name="CSC Settings UI" introduced="^2">
-<unit bldFile="app/iptelephony/commsconfig/cscsettingsui/group"/>
-</component>
-<component name="cscapplicationui" filter="s60" long-name="CSC Application UI" introduced="^2">
-<unit bldFile="app/iptelephony/commsconfig/cscapplicationui/group"/>
-</component>
-<component name="commsconfig_build" filter="s60" long-name="Comms Config Build" introduced="^2">
-<!-- consider distributing this into the above components -->
-<unit bldFile="app/iptelephony/commsconfig/group"/>
-</component>
-</collection>
-<collection name="convergedconnectionhandler" long-name="Converged Connection Handler" level="eng">
-<component name="cchserver" filter="s60" long-name="CCH Server" introduced="^2">
-<unit bldFile="app/iptelephony/convergedconnectionhandler/cchserver/group"/>
-</component>
-<component name="cchclient" filter="s60" long-name="CCH Client" introduced="^2">
-<unit bldFile="app/iptelephony/convergedconnectionhandler/cchclient/group"/>
-</component>
-<component name="cchclientapi" filter="s60" long-name="CCH Client API" introduced="^2">
-<unit bldFile="app/iptelephony/convergedconnectionhandler/cchclientapi/group"/>
-</component>
-<component name="convergedconnectionhandler_build" filter="s60" long-name="CCH Build" introduced="^2">
-<!-- consider distributing this into the above components, or collapse the collection into a single component.
- The latter is a better option since clients and sevrers are rarely separate components -->
-<unit bldFile="app/iptelephony/convergedconnectionhandler/group"/>
-</component>
-</collection>
-<collection name="richcallsettingsengine" long-name="Rich Call Settings Engine" level="eng">
-<component name="rcse2" filter="s60" long-name="Rich Call Settings Engine Build" introduced="^2">
-<unit bldFile="app/iptelephony/richcallsettingsengine/rcse2/group"/>
-</component>
-</collection>
-<collection name="sipvoipprovider" long-name="SIP VoIP Provider" level="plugin">
-<!-- collection is really a component. Should move down a directory -->
-<component name="svp" filter="s60" long-name="SIP VoIP Provider Build" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/sipvoipprovider/group"/>
-</component>
-</collection>
-<collection name="voipplugins" long-name="VoIP Plugins" level="plugin">
-<component name="sipmxresolver" filter="s60" long-name="SIP MX Resolver" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/sipmxresolver/group"/>
-</component>
-<component name="sipconnectionprovider" filter="s60" long-name="SIP Connection Provider" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/sipconnectionprovider/group"/>
-<!-- can only have one unit, can the next be #'included from the above? -->
-<unit bldFile="app/iptelephony/voipplugins/sipconnectionprovider/ipvoicemailengine/group"/>
-</component>
-<component name="ipapputils" filter="s60" long-name="IP App Utils" introduced="^2">
-<unit bldFile="app/iptelephony/voipplugins/ipapputils/group"/>
-</component>
-<component name="voipadapters" filter="s60" long-name="VoIP Adapters" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/voipadapters/group"/>
-</component>
-<component name="accountcreationplugin" filter="s60" long-name="Account Creation Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/accountcreationplugin/group"/>
-</component>
-<component name="dhcppositionprovider" filter="s60" long-name="DHCP Position Provider" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/dhcppositionprovider/group"/>
-</component>
-<component name="svtmatching" filter="s60" long-name="SIP VoIP Telephony Matching" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/svtmatching/group"/>
-</component>
-<component name="svtlogging" filter="s60" long-name="SVT Logging" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/svtlogging/group"/>
-</component>
-<component name="svtcallmenu" filter="s60" long-name="SVT Call Menu" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/svtcallmenu/group"/>
-</component>
-<component name="sipimresolver" filter="s60" long-name="SIP IM Resolver" introduced="^3" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/sipimresolver/group"/>
-</component>
-</collection>
-<collection name="callcontinuity" long-name="Call Continuity" level="util">
-<component name="vccutils" filter="s60" long-name="VCC Utils" introduced="^2">
-<unit bldFile="app/iptelephony/callcontinuity/vccutils/group"/>
-</component>
-<component name="nsmldmvccadapter" filter="s60" long-name="SyncML DM VCC Adapter" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/callcontinuity/nsmldmvccadapter/group"/>
-</component>
-<component name="vccclientprovisioningadapter" filter="s60" long-name="VCC Client Provisioning Adapter" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/callcontinuity/vccclientprovisioningadapter/group"/>
-</component>
-<component name="vccpropertyhandler" filter="s60" long-name="VCC Property Handler" introduced="^2">
-<unit bldFile="app/iptelephony/callcontinuity/vccpropertyhandler/group"/>
-</component>
-<component name="vcchotrigger" filter="s60" long-name="VCC HO Trigger" introduced="^2">
-<unit bldFile="app/iptelephony/callcontinuity/vcchotrigger/group"/>
-</component>
-<component name="vcc" filter="s60" long-name="VoIP Call Continuity" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/callcontinuity/vcc/group"/>
-</component>
-<component name="callcontinuity_build" filter="s60" long-name="Call Continuity Build" introduced="^2">
-<!-- consider distributing this into the above components -->
-<unit bldFile="app/iptelephony/callcontinuity/group"/>
-</component>
-</collection>
-</block>
-<block name="settingsuis" level="services" long-name="Settings UIs" levels="rsc ui">
-<collection name="devmngt_plat" long-name="Settings UIs Platform Interfaces" level="ui">
-<component name="default_app_client_api" long-name="Default App Client API" introduced="^1" filter="s60" class="api">
-<unit bldFile="app/settingsuis/devmngt_plat/default_app_client_api/group"/>
-</component>
-<component name="services_db_api" long-name="Services DB API" introduced="^1" filter="s60" class="api">
-<unit bldFile="app/settingsuis/devmngt_plat/services_db_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="defaultapplicationsettings" long-name="Default Application Settings" level="rsc">
-<component name="services_db" filter="s60" long-name="Services Database" introduced="^1">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/services_db/group"/>
-</component>
-<component name="defaultapplicationsettings_server" filter="s60" long-name="Default Application Server" introduced="^1">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/server/group"/>
-</component>
-<component name="service" filter="s60" long-name="Default Application Service" introduced="^1">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/service/group"/>
-</component>
-<component name="dasgsplugin" filter="s60" long-name="Default Application Settings GS Plugin" introduced="^1" plugin="Y">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/gsplugin/group"/>
-</component>
-<component name="defaultapplicationsettings_build" filter="s60" long-name="Default Application Settings Build" introduced="^1">
-<!-- split the IBYs up into the appropriate components? Make this a ROM component? -->
-<unit bldFile="app/settingsuis/defaultapplicationsettings/group"/>
-</component>
-</collection>
-<collection name="systemswuis" long-name="System SW UIs" level="ui">
-<component name="touchscreencalib" filter="s60" long-name="Touchscreen Calibration" introduced="^1">
-<unit bldFile="app/settingsuis/systemswuis/touchscreencalib/group"/>
-</component>
-</collection>
-</block>
-<block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin app">
-<collection name="contentctrl_plat" long-name="Content Control Daemons Platforn Interfaces" level="app">
-<component name="oma_ds_presync_plugin_api" long-name="OMA DS PreSync Plugin API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/oma_ds_presync_plugin_api/group"/>
-</component>
-<component name="ds_agenda_handler_plugin_api" long-name="DS Agenda Handler Plugin API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_agenda_handler_plugin_api/group"/>
-</component>
-<component name="ds_folder_util_api" long-name="DS Folder Util API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_folder_util_api/group"/>
-</component>
-</collection>
-<collection name="dsdcmoadapter" long-name="Data Sync DCMO Adapter" level="plugin">
-<!-- Component at wrong rank, should move down a directory -->
-<component name="dsdcmoadapter_build" filter="s60" long-name="Data Sync Control DCMO Adapter">
-<unit bldFile="app/contentcontrol/dsdcmoadapter/group"/>
-</component>
-</collection>
-<collection name="omads" long-name="OMA Data Sync" level="app">
-<component name="omadsappui" filter="s60" long-name="OMA DS Application UI">
-<unit bldFile="app/contentcontrol/omads/omadsappui/group"/>
-</component>
-<component name="omadsextensions" filter="s60" long-name="OMA DS Extensions" plugin="Y">
-<unit bldFile="app/contentcontrol/omads/omadsextensions/group"/>
-</component>
-</collection>
-</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">
-<unit bldFile="app/devicecontrol/devicediagnostics/devdiagapp/group"/>
-</component>
-<component name="devdiaggsplugin" filter="s60" long-name="Device Diagnostics GS Plugin" plugin="Y">
-<unit bldFile="app/devicecontrol/devicediagnostics/devdiaggsplugin/group"/>
-</component>
-<component name="diagplugins" filter="s60" long-name="Diagnostics Plugins" plugin="Y">
-<unit bldFile="app/devicecontrol/devicediagnostics/diagplugins/group"/>
-</component>
-<component name="diagsuites" filter="s60" long-name="Diagnostics Suites" plugin="Y">
-<unit bldFile="app/devicecontrol/devicediagnostics/diagsuites/group"/>
-</component>
-<component name="devicediagnostics_build" filter="s60" long-name="Device Diagnostics Build">
-<!-- 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">
-<unit bldFile="app/devicecontrol/omadm/omadmappui/group"/>
-</component>
-<component name="omadmextensions" filter="s60" long-name="OMA DM Extensions" 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">
-<unit bldFile="app/devicecontrol/omadm/dcmo/group"/>
-</component>
-</collection>
-<collection name="pnpmobileservices" long-name="PnP Mobile Services" level="mid">
-<component name="pnpms" filter="s60" long-name="PnP MS">
-<unit bldFile="app/devicecontrol/pnpmobileservices/pnpms/group"/>
-</component>
-</collection>
-<collection name="applicationmanagement" long-name="Application Management" level="app">
-<!-- could this collection be collapsed into a single component and moved down a dir? Do all these need to be noted separately? -->
-<component name="applicationmanagement_options" filter="s60" long-name="AM Install Options">
-<unit bldFile="app/devicecontrol/applicationmanagement/options/group"/>
-</component>
-<component name="applicationmanagement_client" filter="s60" long-name="AM Client">
-<unit bldFile="app/devicecontrol/applicationmanagement/client/group"/>
-</component>
-<component name="applicationmanagement_server" filter="s60" long-name="AM Server">
-<unit bldFile="app/devicecontrol/applicationmanagement/server/group"/>
-</component>
-<component name="rfsplugin" filter="s60" long-name="AM RFS Plugin" plugin="Y">
-<unit bldFile="app/devicecontrol/applicationmanagement/rfsplugin/group"/>
-</component>
-<component name="amadapter2" filter="s60" long-name="AM Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/applicationmanagement/amadapter2/group"/>
-</component>
-<component name="omascomoadapter" filter="s60" long-name="OMA SCOMO Adapter" introduced="^3" plugin="Y">
-<unit bldFile="app/devicecontrol/applicationmanagement/omascomoadapter/group"/>
-</component>
-<component name="applicationmanagement_build" filter="s60" long-name="AM Build">
-<!-- If thes aren't collapsed into one cmp, can all #includes removed from here, and it renamed AM ROM? -->
-<unit bldFile="app/devicecontrol/applicationmanagement/group"/>
-</component>
-</collection>
-<collection name="customization" long-name="DM Customization Adapters" level="mid">
-<component name="dmutils" long-name="DM Utils" filter="s60">
-<unit bldFile="app/devicecontrol/customization/dmutils/bld"/>
-</component>
-<component name="uisettingssrv" filter="s60" long-name="UI Settings Server">
-<unit bldFile="app/devicecontrol/customization/uisettingssrv/bld"/>
-</component>
-<component name="isadapter" filter="s60" long-name="Idle State Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/isadapter/bld"/>
-</component>
-<component name="supadapter" filter="s60" long-name="Startup Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/supadapter/bld"/>
-</component>
-<component name="wallpaperadapter" filter="s60" long-name="Wallpaper Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/wallpaperadapter/bld"/>
-</component>
-<component name="operatorlogoadapter" filter="s60" long-name="Operator Logo Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/operatorlogoadapter/bld"/>
-</component>
-<component name="screensaveradapter" filter="s60" long-name="Screen Saver Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/screensaveradapter/bld"/>
-</component>
-<component name="themesadapter" filter="s60" long-name="Themes Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/themesadapter/bld"/>
-</component>
-<component name="embeddedlinkadapter" filter="s60" long-name="Embedded Link Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/embeddedlinkadapter/bld"/>
-</component>
-<component name="customization_build" filter="s60" long-name="DM Customization Build">
-<!-- If thes aren't collapsed into one cmp, can all #includes removed from here, and it renamed DM Customization ROM? -->
-<unit bldFile="app/devicecontrol/customization/group"/>
-</component>
-</collection>
-<collection name="omacp" long-name="OMA Content Provisioning" level="oma">
-<component name="omacpadapters" filter="s60" long-name="OMA CP Adapters" plugin="Y">
-<unit bldFile="app/devicecontrol/omacp/omacpadapters/group"/>
-</component>
-</collection>
-</block>
-<block name="printing" level="services" long-name="Printing" levels="app">
-<collection name="imageprint" long-name="ImagePrint" level="app">
-<component name="clog" filter="s60" long-name="ImagePrint Logging" introduced="^2">
-<unit bldFile="app/printing/imageprint/clog/group"/>
-</component>
-<component name="imageprintengine" filter="s60" long-name="ImagePrint Engine" introduced="^2">
-<unit bldFile="app/printing/imageprint/imageprintengine/group"/>
-</component>
-<component name="imageprintui" filter="s60" long-name="ImagePrint UI" introduced="^2">
-<unit bldFile="app/printing/imageprint/imageprintui/group"/>
-</component>
-<component name="imageprint_build" filter="s60" long-name="ImagePrint Build" introduced="^2">
-<!-- Need to break the IBY includes into the other components, or remove #includes and make this a ROM component -->
-<unit bldFile="app/printing/imageprint/group"/>
-</component>
-</collection>
-</block>
-<block name="files" level="apps" long-name="File Manager Apps" levels="support apps">
-<collection name="files_plat" long-name="File Manager Apps Platform Interfaces" level="apps">
-<component name="memory_scan_popup_ui_api" long-name="Memory Scan Popup UI API" filter="s60" class="api">
-<unit bldFile="app/files/files_plat/memory_scan_popup_ui_api/group"/>
-</component>
-</collection>
-<collection name="deviceencryption" long-name="Device Encryption" level="support">
-<!-- this is either needs to be broken up into idependent bld.infs, or it's really a component and should move down a directory -->
-<component name="devencnotifplugin" filter="s60" long-name="Device Encryption Notifier Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/files/deviceencryption/devencnotifplugin/group"/>
-</component>
-<component name="devencui" filter="s60" long-name="Device Encryption UI" introduced="^3">
-<unit bldFile="app/files/deviceencryption/devencui/group"/>
-</component>
-<component name="devencdmadapter" filter="s60" long-name="Device Encryption DM Adapter" introduced="^3" plugin="Y">
-<unit bldFile="app/files/deviceencryption/devencdmadapter/group"/>
-</component>
-<component name="devencgsplugin" filter="s60" long-name="Device Encryption GS Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/files/deviceencryption/devencgsplugin/group"/>
-</component>
-<component name="deviceencryption_help" filter="s60" long-name="Device Encryption Help" introduced="^3">
-<unit bldFile="app/files/deviceencryption/help/group"/>
-</component>
-<component name="deviceencryption_build" filter="s60" long-name="Device Encryption Build" introduced="^3">
-<unit bldFile="app/files/deviceencryption/group"/>
-</component>
-</collection>
-<collection name="filemanager" long-name="File Manager" level="apps">
-<!-- this is really a component, should move down a directory -->
-<component name="filemanager_build" filter="s60" long-name="File Manager Build">
-<unit bldFile="app/files/filemanager/group"/>
-</component>
-</collection>
-<collection name="filesystemuis" long-name="File System UIs" level="support">
-<component name="memscaneng" filter="s60" long-name="Memory Scan Server">
-<unit bldFile="app/files/filesystemuis/memscaneng/group"/>
-</component>
-<component name="memstatepopup" filter="s60" long-name="Memory State Popup">
-<unit bldFile="app/files/filesystemuis/memstatepopup/group"/>
-</component>
-</collection>
-</block>
-<block name="utils" level="apps" long-name="Utility Apps" levels="app">
-<collection name="extras" long-name="Extras" level="app">
-<component name="about" filter="s60" long-name="About Application">
-<unit bldFile="app/utils/extras/about/group"/>
-</component>
-<component name="calcsoft" filter="s60" long-name="Calculator Application">
-<unit bldFile="app/utils/extras/calcsoft/group"/>
-</component>
-<component name="converter" filter="s60" long-name="Unit Converter">
-<unit bldFile="app/utils/extras/converter/group"/>
-</component>
-</collection>
-</block>
-<block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
-<collection name="contacts_pub" long-name="Contacts Apps Public Interfaces" level="ui">
-<component name="phonebook_fetch_ui_api" long-name="Phonebook Fetch UI API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_fetch_ui_api/group"/>
-</component>
-<component name="phonebook_data_management_api" long-name="Phonebook Data Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_data_management_api/group"/>
-</component>
-<component name="phonebook_vcard_importexport_api" long-name="Phonebook vCard Import/Export API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_vcard_importexport_api/group"/>
-</component>
-<component name="phonebook_data_addedit_ui_api" long-name="Phonebook Data Add/Edit UI API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_data_addedit_ui_api/group"/>
-</component>
-<component name="phonebook_ui_utilities_api" long-name="Phonebook UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_ui_utilities_api/group"/>
-</component>
-<component name="phonebook_thumbnail_operation_api" long-name="Phonebook Thumbnail Operation API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_thumbnail_operation_api/group"/>
-</component>
-<component name="speed_dial_utility_control_api" long-name="Speed Dial Utility Control API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/speed_dial_utility_control_api/group"/>
-</component>
-</collection>
-<collection name="contacts_plat" long-name="Contacts Apps Platform Interfaces" level="ui">
-<component name="virtual_phonebook_store_api" long-name="Virtual Phonebook Store API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_store_api/group"/>
-</component>
-<component name="virtual_phonebook_sim_services_api" long-name="Virtual Phonebook SIM Services API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_sim_services_api/group"/>
-</component>
-<component name="virtual_phonebook_configuration_api" long-name="Virtual Phonebook Configuration API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_configuration_api/group"/>
-</component>
-<component name="virtual_phonebook_copy_policy_api" long-name="Virtual Phonebook Copy Policy API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_copy_policy_api/group"/>
-</component>
-<component name="virtual_phonebook_policy_api" long-name="Virtual Phonebook Policy API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_policy_api/group"/>
-</component>
-<component name="virtual_phonebook_engine_api" long-name="Virtual Phonebook Engine API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_engine_api/group"/>
-</component>
-<component name="virtual_phonebook_migration_support_api" long-name="Virtual Phonebook Migration Support API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_migration_support_api/group"/>
-</component>
-<component name="virtual_phonebook_view_definition_api" long-name="Virtual Phonebook View Definition API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_view_definition_api/group"/>
-</component>
-<component name="virtual_phonebook_vcard_api" long-name="Virtual Phonebook vCard API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_vcard_api/group"/>
-</component>
-<component name="cms_contactor_api" long-name="CMS Contactor API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/cms_contactor_api/group"/>
-</component>
-<component name="contactpresence_api" long-name="Contact Presence API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/contactpresence_api/group"/>
-</component>
-<component name="presence_cache_api" long-name="Presence Cache API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/presence_cache_api/group"/>
-</component>
-<component name="phonebook_internal_common_api" long-name="Phonebook Internal Common API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_common_api/group"/>
-</component>
-<component name="phonebook_internal_appfw_api" long-name="Phonebook Internal App Framework API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_appfw_api/group"/>
-</component>
-<component name="phonebook_internal_data_management_api" long-name="Phonebook Internal Data Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_data_management_api/group"/>
-</component>
-<component name="phonebook_2_xsp_extension_manager_api" long-name="Phonebook 2 xSP Extension Manager API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_xsp_extension_manager_api/group"/>
-</component>
-<component name="phonebook_ui_controls_api" long-name="Phonebook UI Controls API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_ui_controls_api/group"/>
-</component>
-<component name="phonebook_2_image_management_api" long-name="Phonebook 2 Image Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_image_management_api/group"/>
-</component>
-<component name="phonebook_extension_api" long-name="Phonebook Extension API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_extension_api/group"/>
-</component>
-<component name="phonebook_public_constants_api" long-name="Phonebook Public Constants API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_public_constants_api/group"/>
-</component>
-<component name="phonebook_internal_ui_utilities_api" long-name="Phonebook Internal UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_ui_utilities_api/group"/>
-</component>
-<component name="logs_engine_api_extensions" long-name="Logs Engine API Extensions" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/logs_engine_api_extensions/group"/>
-</component>
-<component name="phonebook_thumbnails_api" long-name="Phonebook Thumbnails API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_thumbnails_api/group"/>
-</component>
-<component name="phonebook_2_icon_api" long-name="Phonebook 2 Icon API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_icon_api/group"/>
-</component>
-<component name="phonebook_engine_extension_api" long-name="Phonebook Engine Extension API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_engine_extension_api/group"/>
-</component>
-<component name="phonebook_2_store_configuration_management_api" long-name="Phonebook 2 Store Configuration Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_store_configuration_management_api/group"/>
-</component>
-<component name="logs_ui_command_line_api" long-name="Logs UI Command Line API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/logs_ui_command_line_api/group"/>
-</component>
-<component name="speed_dial_dialogs_api" long-name="Speed Dial Dialogs API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/speed_dial_dialogs_api/group"/>
-</component>
-<component name="phonebook_2_xsp_view_activation_api" long-name="Phonebook 2 xSP View Activation API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_xsp_view_activation_api/group"/>
-</component>
-<component name="logs_timers_api" long-name="Logs Timers API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/logs_timers_api/group"/>
-</component>
-<component name="phonebook_2_ui_extension_definition_api" long-name="Phonebook 2 UI Extension Definition API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_definition_api/group"/>
-</component>
-<component name="phonebook_2_common_ui_api" long-name="Phonebook 2 Common UI API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_common_ui_api/group"/>
-</component>
-<component name="phonebook_2_ui_extension_api" long-name="Phonebook 2 UI Extension API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_api/group"/>
-</component>
-<component name="phonebook_2_store_property_api" long-name="Phonebook 2 Store Property API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_store_property_api/group"/>
-</component>
-<component name="phonebook_2_ui_extension_plugin_api" long-name="Phonebook 2 UI Extension Plug-In API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_plugin_api/group"/>
-</component>
-<component name="phonebook_2_ui_controls_api" long-name="Phonebook 2 UI Controls API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_controls_api/group"/>
-</component>
-<component name="phonebook_2_thin_ui_extension_plugin_api" long-name="Phonebook 2 Thin UI Extension Plugin API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_thin_ui_extension_plugin_api/group"/>
-</component>
-<component name="phonebook_2_commands_api" long-name="Phonebook 2 Commands API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_commands_api/group"/>
-</component>
-<component name="phonebook_2_presentation_api" long-name="Phonebook 2 Presentation API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_presentation_api/group"/>
-</component>
-<component name="phonebook_2_ui_utilities_api" long-name="Phonebook 2 UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_utilities_api/group"/>
-</component>
-<component name="cca_launch_api" long-name="CCA Launch API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/cca_launch_api/group"/>
-</component>
-<component name="cca_view_plugin_api" long-name="CCA View Plugin API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/cca_view_plugin_api/group"/>
-</component>
-<component name="predictivesearch_client_api" long-name="Predictive Search Client API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_client_api/group"/>
-</component>
-<component name="predictivesearch_utils_api" long-name="Predictive Search Utils API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_utils_api/group"/>
-</component>
-<component name="predictivesearch_adapters_api" long-name="Predictive Search Adapters API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_adapters_api/group"/>
-</component>
-<component name="predictivesearch_algorithm_api" long-name="Predictive Search Algorithm API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_algorithm_api/group"/>
-</component>
-<component name="phonebook_2_rcl_api" long-name="Phonebook 2 RCL API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_rcl_api/group"/>
-</component>
-</collection>
-<collection name="contactextensions" long-name="Contacts Extensions" level="services">
-<component name="predefinedcontacts" filter="s60" long-name="Predefined Contacts">
-<unit bldFile="app/contacts/contactextensions/predefinedcontacts/group"/>
-</component>
-</collection>
-<collection name="logsui" long-name="Logs UI" level="ui">
-<component name="logsui_build" filter="s60" long-name="Logs UI Build">
-<!-- component at too high a rank, should move down one directory -->
-<unit bldFile="app/contacts/logsui/group"/>
-</component>
-</collection>
-<collection name="phonebookui" long-name="Phonebook UI" level="ui">
-<component name="phonebook" filter="s60" long-name="Phonebook">
-<unit bldFile="app/contacts/phonebookui/phonebook/group"/>
-</component>
-<component name="speeddial" filter="s60" long-name="Speed Dial">
-<unit bldFile="app/contacts/phonebookui/speeddial/group"/>
-</component>
-<component name="phonebook2" filter="s60" long-name="Phone Book 2">
-<unit bldFile="app/contacts/phonebookui/phonebook2/group"/>
-</component>
-</collection>
-<collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
-<component name="cntfindplugin" filter="s60" long-name="Contacts Find Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntfindplugin/group"/>
-</component>
-<component name="cntsortplugin" filter="s60" long-name="Contacts Sort Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntsortplugin/group"/>
-</component>
-<component name="virtualphonebook" filter="s60" long-name="Virtual Phonebook" introduced="^2">
-<unit bldFile="app/contacts/phonebookengines/virtualphonebook/group"/>
-</component>
-<component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
-<unit bldFile="app/contacts/phonebookengines/contactsmodel/groupsql" mrp="app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
-</component>
-</collection>
-<collection name="pimprotocols" long-name="PIM Protocols" level="services">
-<component name="phonebooksync" long-name="Phonebook Sync" purpose="optional" plugin="Y">
-<unit bldFile="app/contacts/pimprotocols/phonebooksync/group" mrp="app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
-</component>
-<component name="pbap" long-name="Bluetooth PBAP" introduced="9.2" purpose="optional">
-<unit bldFile="app/contacts/pimprotocols/pbap/group" mrp="app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
-</component>
-</collection>
-<collection name="ccservices" long-name="Contacts Centric Services" level="services">
-<component name="cmsservices" filter="s60" long-name="Contact Method Selector Services" introduced="^2">
-<unit bldFile="app/contacts/ccservices/cmsservices/group"/>
-</component>
-</collection>
-<collection name="presencecache" long-name="Presence Cache" level="support">
-<component name="presencecacheutils" filter="s60" long-name="Presence Cache Utils" introduced="^2" class="placeholder">
-<!-- <unit bldFile="presencecache/presencecacheutils/group"/> -->
-</component>
-<component name="presencecacheserver2" filter="s60" long-name="Presence Cache Server" introduced="^2" class="placeholder">
-<!-- <unit bldFile="presencecache/presencecacheserver2/group"/> -->
-</component>
-<component name="presencecacheclient2" filter="s60" long-name="Presence Cache Client" introduced="^2" class="placeholder">
-<!-- <unit bldFile="presencecache/presencecacheclient2/group"/> -->
-</component>
-<component name="presencecache_build" filter="s60" long-name="Presence Cache Build" introduced="^2">
-<!-- should divide this bld.inf into the other components, or collapse them into a single component -->
-<unit bldFile="app/contacts/presencecache/group"/>
-</component>
-</collection>
-<collection name="predictivesearch" long-name="Predictive Search" level="support">
-<component name="pcsutils" filter="s60" long-name="PCS Utils" introduced="^2">
-<unit bldFile="app/contacts/predictivesearch/pcsutils/group"/>
-</component>
-<component name="pcsserverclientapi" filter="s60" long-name="PCS Server Client API" introduced="^2">
-<unit bldFile="app/contacts/predictivesearch/pcsserverclientapi/group"/>
-</component>
-<component name="pcsserver" filter="s60" long-name="PCS Server" introduced="^2">
-<unit bldFile="app/contacts/predictivesearch/pcsserver/group"/>
-</component>
-<component name="pcsadapters" filter="s60" long-name="PCS Adapters" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/predictivesearch/adapters/contacts/group"/>
-</component>
-<component name="pcsalgorithm" filter="s60" long-name="PCS Algorithm" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/predictivesearch/pcsalgorithm/group"/>
-</component>
-<component name="predictivesearch_build" filter="s60" long-name="Predictive Search Build" introduced="^2">
-<!-- need to remove #includes from bld.inf and rename as Predictive Search ROM -->
-<unit bldFile="app/contacts/predictivesearch/group"/>
-</component>
-</collection>
-<collection name="contacts_info" long-name="Contacts Apps Info" level="ui">
-<component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="organizer" level="apps" span="2" long-name="Organizer Application Suite" levels="support services engine ui app">
-<collection name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" level="app">
-<component name="meeting_request_mailbox_utilities_api" long-name="Meeting Request Mailbox Utilities API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_mailbox_utilities_api/group"/>
-</component>
-<component name="meeting_request_uids_api" long-name="Meeting Request UIDs API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_uids_api/group"/>
-</component>
-<component name="calendar_exporter_api" long-name="Calendar Exporter API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_exporter_api/group"/>
-</component>
-<component name="agenda_versit_2_api" long-name="Agenda Versit 2 API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/agenda_versit_2_api/group"/>
-</component>
-<component name="calendar_importer_api" long-name="Calendar Importer API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_importer_api/group"/>
-</component>
-<component name="calendar_launcher_api" long-name="Calendar Launcher API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_launcher_api/group"/>
-</component>
-<component name="calendar_common_utils_api" long-name="Calendar Common Utils API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_common_utils_api/group"/>
-</component>
-<component name="searchfw_launcher_api" long-name="Search Framework Launcher API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/searchfw_launcher_api/group"/>
-</component>
-<component name="alarm_const_api" long-name="Alarm Const API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/alarm_const_api/group"/>
-</component>
-<component name="alarm_ui_external_control_api" long-name="Alarm UI External Control API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/alarm_ui_external_control_api/group"/>
-</component>
-<component name="calendar_settings_keys_api" long-name="Calendar Settings Keys API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_settings_keys_api/group"/>
-</component>
-<component name="calendar_tones_settings_keys_api" long-name="Calendar Tones Settings Keys API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_tones_settings_keys_api/group"/>
-</component>
-<component name="clock_settings_api" long-name="Clock Settings API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/clock_settings_api/group"/>
-</component>
-<component name="common_alarm_editor_api" long-name="Common Alarm Editor API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/common_alarm_editor_api/group"/>
-</component>
-<component name="alarm_ui_secondary_display_api" long-name="Alarm UI Secondary Display API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/alarm_ui_secondary_display_api/group"/>
-</component>
-<component name="searchui_launcher_api" long-name="Search UI Launcher API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/searchui_launcher_api/group"/>
-</component>
-<component name="agenda_entry_ui_api" long-name="Agenda Entry UI API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/agenda_entry_ui_api/group"/>
-</component>
-<component name="meeting_request_utillities_api" long-name="Meeting Request Utillities API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_utillities_api/group"/>
-</component>
-<component name="meeting_request_viewer_api" long-name="Meeting Request Viewer API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_viewer_api/group"/>
-</component>
-<component name="calendar_custamization_api" long-name="Calendar Customization API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_custamization_api/group"/>
-</component>
-</collection>
-<collection name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" level="app">
-<component name="calendar_interim_utils2_api" long-name="Calendar Interim Utils 2 API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_pub/calendar_interim_utils2_api/group"/>
-</component>
-<component name="notepad_library_api" long-name="Notepad Library API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_pub/notepad_library_api/group"/>
-</component>
-</collection>
-<collection name="alarmengines" long-name="Alarm Engines" level="engine">
-<component name="missedalarmstore" filter="s60" long-name="Missed Alarm Store">
-<unit bldFile="app/organizer/alarmengines/missedalarmstore/group"/>
-</component>
-</collection>
-<collection name="calendarengines" long-name="Calendar Engines" level="engine">
-<component name="versit2" filter="s60" long-name="Versit 2 iCal Parser" introduced="9.2">
-<unit bldFile="app/organizer/calendarengines/versit2/group"/>
-</component>
-<component name="agnversit2" filter="s60" long-name="Versit 2 Agenda Interface" introduced="9.2" plugin="Y">
-<unit bldFile="app/organizer/calendarengines/agnversit2/group"/>
-</component>
-<component name="caleninterimutils" filter="s60" long-name="Calendar Interim Utils" introduced="9.1">
-<unit bldFile="app/organizer/calendarengines/caleninterimutils/group"/>
-</component>
-<component name="calenimp" filter="s60" long-name="Calendar Import Wrapper" introduced="7.0s">
-<unit bldFile="app/organizer/calendarengines/calenimp/group"/>
-</component>
-<component name="calenlauncher" filter="s60" long-name="Calendar Launcher">
-<unit bldFile="app/organizer/calendarengines/calenlauncher/group"/>
-</component>
-<component name="caldavsrv" filter="sf_build" long-name="CalDAV Server" introduced="^3">
-<unit bldFile="app/organizer/calendarengines/caldav/group"/>
-</component>
-</collection>
-<collection name="meetingrequestengines" long-name="Meeting Request Engines" level="engine">
-<component name="mrmailbox" filter="s60" long-name="Meeting Request Mailbox">
-<unit bldFile="app/organizer/meetingrequestengines/mrmailbox/group"/>
-</component>
-<component name="mrmailboxutils" filter="s60" long-name="Meeting Request Mailbox Utils" plugin="Y">
-<unit bldFile="app/organizer/meetingrequestengines/mrmailboxutils/group"/>
-</component>
-</collection>
-<collection name="searchfw" long-name="Search Framework" level="services">
-<!-- Uncomment all units when configuration is in place. All currently #included from searchfw_build, which should be removed at the same time. -->
-<component name="coresearchfw" filter="s60" long-name="Core Search Framework" introduced="^1" class="placeholder">
-<!--<unit bldFile="searchfw/coresearchfw/group"/>-->
-</component>
-<component name="searchfw_plugins" filter="s60" long-name="Search Plugins" introduced="^1" plugin="Y" class="placeholder">
-<!--<unit bldFile="searchfw/plugins/group"/>-->
-</component>
-<component name="searchfw_build" filter="s60" long-name="Search Framework Build" introduced="^1">
-<unit bldFile="app/organizer/searchfw/group"/>
-</component>
-</collection>
-<collection name="alarmui" long-name="Alarm UI" level="app">
-<!-- collection is really a component, should move down a directory -->
-<component name="alarmui_build" filter="s60" long-name="Alarm UI Build">
-<unit bldFile="app/organizer/alarmui/group"/>
-</component>
-</collection>
-<collection name="calendarui" long-name="Calendar UI" level="ui">
-<component name="calendarui_help" filter="s60" long-name="Calendar UI Help">
-<unit bldFile="app/organizer/calendarui/help/group"/>
-</component>
-<component name="commonutils" filter="s60" long-name="Calendar Common Utils">
-<unit bldFile="app/organizer/calendarui/commonutils/group"/>
-</component>
-<component name="globaldata" filter="s60" long-name="Calendar Global Data">
-<unit bldFile="app/organizer/calendarui/globaldata/group"/>
-</component>
-<component name="settings" filter="s60" long-name="Calendar Settings">
-<!-- these should be merged into a single bld.inf or split into two components -->
-<unit bldFile="app/organizer/calendarui/settings/gsplugin/group"/>
-<unit bldFile="app/organizer/calendarui/settings/settingsui/group"/>
-</component>
-<component name="customisation" filter="s60" long-name="Calendar Customisation">
-<unit bldFile="app/organizer/calendarui/customisation/group"/>
-</component>
-<component name="customisationmanager" filter="s60" long-name="Calendar Customisation Manager">
-<unit bldFile="app/organizer/calendarui/customisationmanager/group"/>
-</component>
-<component name="multicaluidialog" filter="s60" long-name="Multi-Calendar UI Dialog" introduced="^3">
-<unit bldFile="app/organizer/calendarui/multicaluidialog/group"/>
-</component>
-<component name="views" filter="s60" long-name="Calendar Views">
-<unit bldFile="app/organizer/calendarui/views/group"/>
-</component>
-<component name="calendarui_controller" filter="s60" long-name="Calendar Controller">
-<unit bldFile="app/organizer/calendarui/controller/group"/>
-</component>
-<component name="calendarui_editors" filter="s60" long-name="Calendar Editors">
-<unit bldFile="app/organizer/calendarui/editors/group"/>
-</component>
-<component name="calendarui_application" filter="s60" long-name="Calendar Application">
-<unit bldFile="app/organizer/calendarui/application/group"/>
-</component>
-<component name="missedalarmindicatorplugin" filter="s60" long-name="Missed Alarm Indicator Plugin" plugin="Y">
-<unit bldFile="app/organizer/calendarui/missedalarmindicatorplugin/group"/>
-</component>
-<component name="calendarui_server" filter="s60" long-name="Calendar Server">
-<!-- these should be merged into a single bld.inf or split into two components -->
-<unit bldFile="app/organizer/calendarui/server/calensvr/group"/>
-<unit bldFile="app/organizer/calendarui/server/calensvrclient/group"/>
-</component>
-<component name="regionalplugins" filter="s60" long-name="Calendar Regional Plugins" plugin="Y">
-<!-- these should be merged into a single bld.inf or split into four components -->
-<unit bldFile="app/organizer/calendarui/regionalplugins/calenregionalutil/group"/>
-<unit bldFile="app/organizer/calendarui/regionalplugins/lunarchinese/group"/>
-<unit bldFile="app/organizer/calendarui/regionalplugins/lunarvietnamese/group"/>
-<unit bldFile="app/organizer/calendarui/regionalplugins/thai/group"/>
-</component>
-<component name="calenaiwprovider" filter="s60" long-name="Calendar AIW Proivder" introduced="^3" plugin="Y">
-<unit bldFile="app/organizer/calendarui/calenaiwprovider/group"/>
-</component>
-<component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y">
-<unit bldFile="app/organizer/calendarui/caldav/group"/>
-</component>
-<component name="calendarui_build" filter="s60" long-name="Calendar UI Build">
-<!-- split contents into separate components -->
-<unit bldFile="app/organizer/calendarui/group"/>
-</component>
-</collection>
-<collection name="meetingui" long-name="Meeting UI" level="ui">
-<component name="attendeeview" filter="s60" long-name="Attendee View">
-<unit bldFile="app/organizer/meetingui/attendeeview/group"/>
-</component>
-<component name="agnentryui" filter="s60" long-name="Agenda Entry UI" plugin="Y">
-<unit bldFile="app/organizer/meetingui/agnentryui/group"/>
-</component>
-<component name="meetingrequestutils" filter="s60" long-name="Meeting Request Utils">
-<unit bldFile="app/organizer/meetingui/meetingrequestutils/group"/>
-</component>
-<component name="meetingrequestviewers" filter="s60" long-name="Meeting Request Viewers" plugin="Y">
-<unit bldFile="app/organizer/meetingui/meetingrequestviewers/group"/>
-</component>
-<component name="meetingui_build" filter="s60" long-name="Meeting UI Build">
-<!-- split contents into separate components -->
-<unit bldFile="app/organizer/meetingui/group"/>
-</component>
-</collection>
-<collection name="clock2" long-name="Clock" level="app">
-<component name="clockengines" filter="s60" long-name="Clock Engines">
-<unit bldFile="app/organizer/clock2/clockengines/group"/>
-</component>
-<component name="clockui" filter="s60" long-name="Clock UI">
-<unit bldFile="app/organizer/clock2/clockui/group"/>
-</component>
-<component name="clock2_help" filter="s60" long-name="Clock Help">
-<unit bldFile="app/organizer/clock2/help/group"/>
-</component>
-<component name="clock2_build" filter="s60" long-name="Clock Build">
-<!-- split contents into separate components, or just make this one component -->
-<unit bldFile="app/organizer/clock2/group"/>
-</component>
-</collection>
-<collection name="notepad" long-name="Notepad" level="ui">
-<component name="notepad_help" filter="s60" long-name="Notepad Help">
-<unit bldFile="app/organizer/notepad/help/group"/>
-</component>
-<component name="notepad1" filter="s60" long-name="Notepad Application 1">
-<unit bldFile="app/organizer/notepad/notepad1/group"/>
-</component>
-<component name="txtrecog" filter="s60" long-name="Text Recognizer" plugin="Y">
-<unit bldFile="app/organizer/notepad/txtrecog/group"/>
-</component>
-</collection>
-<collection name="searchui" long-name="Search UI" level="app">
-<!-- consider making this a single component -->
-<!-- Uncomment all units when configuration is in place. All currently #included from searchui_build, which should be removed at the same time. -->
-<component name="searchui_help" filter="s60" long-name="Search UI Help" class="placeholder">
-<!--<unit bldFile="searchui/help/group"/>-->
-</component>
-<component name="searchapp" filter="s60" long-name="Search Application" class="placeholder">
-<!--<unit bldFile="searchui/searchapp/group"/>-->
-</component>
-<component name="searchui_build" filter="s60" long-name="Search UI Build">
-<unit bldFile="app/organizer/searchui/group"/>
-</component>
-</collection>
-<collection name="pimappservices" long-name="PIM Application Services" level="services">
-<component name="calendar" long-name="Calendar" introduced="9.2" purpose="optional">
-<unit bldFile="app/organizer/pimappservices/calendar/group" mrp="app/organizer/pimappservices/calendar/group/app-engines_calendar.mrp" version="2"/>
-</component>
-<component name="calendarvcalplugin" long-name="Calendar vCal Plugin" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="app/organizer/pimappservices/calendarvcalplugin/group" mrp="app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp" version="2"/>
-</component>
-<component name="appenginesdocs" long-name="Application Engines Documentation" purpose="development" class="doc">
-<unit mrp="app/organizer/pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
-</component>
-</collection>
-<collection name="pimappsupport" long-name="PIM Application Support" level="support">
-<component name="vcardandvcal" long-name="vCard and vCal" introduced="ER5" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/vcardandvcal/group" mrp="app/organizer/pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
-</component>
-<component name="chinesecalendarconverter" long-name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
-</component>
-</collection>
-<collection name="organizer_info" long-name="Organizer Application Suite Info" level="app">
-<component name="organizer_metadata" long-name="Organizer Application Suite Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="mail eng base ui">
-<collection name="msg_pub" long-name="Messaging Apps Public APIs" level="ui">
-<component name="messaging_integration_api" long-name="Messaging Integration API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/messaging_integration_api/group"/>
-</component>
-<component name="plugin_bio_control_api" long-name="Plug-in Bio Control API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/plugin_bio_control_api/group"/>
-</component>
-<component name="mms_client_mtm_api" long-name="MMS Client MTM API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/mms_client_mtm_api/group"/>
-</component>
-<component name="open_new_message_notification_api" long-name="Open New Message Notification API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/open_new_message_notification_api/group"/>
-</component>
-<component name="messaging_editor_constants_api" long-name="Messaging Editor Constants API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/messaging_editor_constants_api/group"/>
-</component>
-</collection>
-<collection name="msg_plat" long-name="Messaging Apps Platform APIs" level="ui">
-<component name="smil_player_launch_api" long-name="SMIL Player Launch API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/smil_player_launch_api/group"/>
-</component>
-<component name="messaging_media_resolver_api" long-name="Messaging Media Resolver API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/messaging_media_resolver_api/group"/>
-</component>
-<component name="smil_engine_api" long-name="SMIL Engine API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/smil_engine_api/group"/>
-</component>
-<component name="mms_server_settings_api" long-name="MMS Server Settings API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_server_settings_api/group"/>
-</component>
-<component name="new_contacts_note_secondary_display_api" long-name="New Contacts Note Secondary Display API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contacts_note_secondary_display_api/group"/>
-</component>
-<component name="messaging_center_ui_utilities_api" long-name="Messaging Center UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/messaging_center_ui_utilities_api/group"/>
-</component>
-<component name="internet_mail_mtm_ui_api" long-name="Internet Mail MTM UI API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/internet_mail_mtm_ui_api/group"/>
-</component>
-<component name="messaging_editor_api" long-name="Messaging Editor API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/messaging_editor_api/group"/>
-</component>
-<component name="email_domain_utilities_api" long-name="Email Domain Utilities API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/email_domain_utilities_api/group"/>
-</component>
-<component name="smil_transition_api" long-name="SMIL Transition API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/smil_transition_api/group"/>
-</component>
-<component name="new_contacts_note_status_api" long-name="New Contacts Note Status API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contacts_note_status_api/group"/>
-</component>
-<component name="unified_editor_video_conversion_api" long-name="Unified Editor Video Conversion API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/unified_editor_video_conversion_api/group"/>
-</component>
-<component name="mms_conformance_api" long-name="MMS Conformance API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_conformance_api/group"/>
-</component>
-<component name="new_contacts_note_variables_api" long-name="New Contacts Note Variables API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contacts_note_variables_api/group"/>
-</component>
-<component name="new_message_notification_api" long-name="New Message Notification API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_message_notification_api/group"/>
-</component>
-<component name="mms_application_api" long-name="MMS Application API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_application_api/group"/>
-</component>
-<component name="mms_engine_settings_api" long-name="MMS Engine Settings API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_engine_settings_api/group"/>
-</component>
-<component name="mms_codec_client_api" long-name="MMS Codec Client API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_codec_client_api/group"/>
-</component>
-<component name="send_ui_meeting_request_api" long-name="Send UI Meeting Request API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/send_ui_meeting_request_api/group"/>
-</component>
-<component name="new_contact_notes_extended_api" long-name="New Contact Notes Extended API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contact_notes_extended_api/group"/>
-</component>
-<component name="mail_ui_constants_api" long-name="Mail UI Constants API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mail_ui_constants_api/group"/>
-</component>
-<component name="sim_dialog_launch_api" long-name="SIM Dialog Launch API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/sim_dialog_launch_api/group"/>
-</component>
-</collection>
-<collection name="mobilemessaging" long-name="Mobile Messaging" level="ui">
-<component name="audiomsg" filter="s60" long-name="Audio Message">
-<unit bldFile="app/messaging/mobilemessaging/audiomsg/group"/>
-</component>
-<component name="msgmedia" filter="s60" long-name="Message Media">
-<unit bldFile="app/messaging/mobilemessaging/msgmedia/group"/>
-</component>
-<component name="unieditor" filter="s60" long-name="Unified Editor">
-<unit bldFile="app/messaging/mobilemessaging/unieditor/group"/>
-</component>
-<component name="mmsui" filter="s60" long-name="MMS UI">
-<unit bldFile="app/messaging/mobilemessaging/mmsui/group"/>
-</component>
-<component name="postcard" filter="s60" long-name="Postcard">
-<unit bldFile="app/messaging/mobilemessaging/postcard/group"/>
-</component>
-<component name="smilui" filter="s60" long-name="SMIL UI">
-<unit bldFile="app/messaging/mobilemessaging/smilui/group"/>
-</component>
-<component name="smum" filter="s60" long-name="SMS UI MTM and UI Data MTM" plugin="Y">
-<unit bldFile="app/messaging/mobilemessaging/smum/group"/>
-</component>
-<component name="smsui" filter="s60" long-name="SMS UI">
-<unit bldFile="app/messaging/mobilemessaging/smsui/group"/>
-</component>
-<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/mobilemessaging/smsmtm/group" mrp="app/messaging/mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
-</component>
-</collection>
-<collection name="mmsengine" long-name="MMS Engine" level="eng">
-<component name="mmsconninit" filter="s60" long-name="MMS Connection Initiator" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsconninit/bld"/> -->
-</component>
-<component name="genutils" filter="s60" long-name="General Utils" class="placeholder">
-<!-- <unit bldFile="mmsengine/genutils/bld"/> -->
-</component>
-<component name="mmsserversettings" filter="s60" long-name="MMS Server Settings" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserversettings/bld"/> -->
-</component>
-<component name="mmsmessage" filter="s60" long-name="MMS Message" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsmessage/bld"/> -->
-</component>
-<component name="mmshttptransport" filter="s60" long-name="MMS HTTP Transport" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmshttptransport/bld"/> -->
-</component>
-<component name="mmscodec" filter="s60" long-name="MMS Codec" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodec/bld"/> -->
-</component>
-<component name="mmsserver" filter="s60" long-name="MMS Server" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserver/bld"/> -->
-</component>
-<component name="clientmtm" filter="s60" long-name="MMS Client MTM" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/clientmtm/bld"/> -->
-</component>
-<component name="mmswatcher" filter="s60" long-name="MMS Watcher" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmswatcher/bld"/> -->
-</component>
-<component name="mmspushhandler" filter="s60" long-name="MMS Push Handler" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmspushhandler/bld"/> -->
-</component>
-<component name="applicationadapter" filter="s60" long-name="MMS Application Adapter" class="placeholder">
-<!-- <unit bldFile="mmsengine/applicationadapter/bld"/> -->
-</component>
-<component name="mmscodecclient" filter="s60" long-name="MMS Codec Client" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodecclient/bld"/> -->
-</component>
-<component name="mmssettings" long-name="MMS Settings" introduced="9.2" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmssettings/group" mrp="app/messaging/mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
-</component>
-<component name="mmsconf" long-name="MMS Configuration" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmsconf" mrp="app/messaging/mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
-</component>
-<component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
-<!-- this bld.inf should be broken up into the individual other components -->
-<unit bldFile="app/messaging/mmsengine/group"/>
-</component>
-</collection>
-<collection name="messagingappbase" long-name="Messaging App Base" level="base">
-<component name="msgavkon" filter="s60" long-name="Messaging Avkon UI">
-<unit bldFile="app/messaging/messagingappbase/msgavkon/group"/>
-</component>
-<component name="mce" filter="s60" long-name="Message Center Application">
-<unit bldFile="app/messaging/messagingappbase/mce/group"/>
-</component>
-<component name="mceextraitems" filter="s60" long-name="Message Center Extra Items">
-<unit bldFile="app/messaging/messagingappbase/mceextraitems/group"/>
-</component>
-<component name="mcesettings" filter="s60" long-name="Message Center Settings">
-<unit bldFile="app/messaging/messagingappbase/mcesettings/group"/>
-</component>
-<component name="msgerrorwatcher" filter="s60" long-name="Messaging Error Watcher" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/msgerrorwatcher/group"/>
-</component>
-<component name="ncnlist" filter="s60" long-name="New Contacts Note List">
-<unit bldFile="app/messaging/messagingappbase/ncnlist/group"/>
-</component>
-<component name="schemeplugin" filter="s60" long-name="Scheme Handler Plugin" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/schemeplugin/group"/>
-</component>
-<component name="sendui" filter="s60" long-name="Send UI" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/sendui/group"/>
-</component>
-<component name="smilengine" filter="s60" long-name="SMIL Engine">
-<unit bldFile="app/messaging/messagingappbase/smilengine/group"/>
-</component>
-<component name="bium" filter="s60" long-name="BIO UI MTM" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/bium/group"/>
-</component>
-<component name="smartmessaging" filter="s60" long-name="Smart Messaging">
-<unit bldFile="app/messaging/messagingappbase/smartmessaging/group"/>
-</component>
-<component name="msgeditor" filter="s60" long-name="Messaging Editor">
-<unit bldFile="app/messaging/messagingappbase/msgeditor/group"/>
-</component>
-<component name="smilparser" long-name="SMIL Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="app/messaging/messagingappbase/smilparser/GROUP" mrp="app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
-</component>
-<component name="obexmtms" long-name="OBEX MTMs" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/obexmtms/Group" mrp="app/messaging/messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
-</component>
-</collection>
-<collection name="email" long-name="Email" level="mail">
-<!-- use commonemail instead -->
-<component name="alwaysonlineemailplugin" filter="s60" long-name="Always Online Mail Plugin" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/alwaysonlineemailplugin/group"/>
-</component>
-<component name="emailnotificationhandler" filter="s60" long-name="Email Notification Handler" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/emailnotificationhandler/group"/>
-</component>
-<component name="imum" filter="s60" long-name="Internet Mail UI MTM" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/imum/group"/>
-</component>
-<component name="mail" filter="s60" long-name="Mail Application" deprecated="^3">
-<unit bldFile="app/messaging/email/mail/group"/>
-</component>
-<component name="pop3andsmtpmtm" long-name="POP3 and SMTP MTM" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/pop3andsmtpmtm/group" mrp="app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
-</component>
-<component name="imap4mtm" long-name="IMAP4 MTM" introduced="9.2" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/imap4mtm/group" mrp="app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
-</component>
-</collection>
-<collection name="messaging_info" long-name="Messaging Apps Info" level="ui">
-<component name="messaging_metadata" long-name="Messaging Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commonemail" level="apps" span="2" long-name="Email Apps" levels="service support ui app">
-<collection name="email_pub" long-name="Email Apps Public Interfaces" level="app">
-<component name="email_widget_api" long-name="Email Widget API" filter="s60" class="api">
-<unit bldFile="app/commonemail/email_pub/email_widget_api/group"/>
-</component>
-</collection>
-<collection name="email_plat" long-name="Email Apps Platform Interfaces" level="app">
-<component name="email_client_api" long-name="Email Client API" filter="s60" class="api">
-<unit bldFile="app/commonemail/email_plat/email_client_api/group"/>
-</component>
-<component name="email_setup_plugin_api" long-name="Email Setup Plugin API" filter="s60" class="api">
-<unit bldFile="app/commonemail/email_plat/email_setup_plugin_api/group"/>
-</component>
-</collection>
-<collection name="emailservices" long-name="Email Services" level="service">
-<component name="emailframework" filter="s60" long-name="Email Framework" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailframework/group"/>
-</component>
-<component name="emailclientapi" filter="s60" long-name="Email Client API" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailclientapi/group"/>
-</component>
-<component name="emailserver" filter="s60" long-name="Email Server" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailserver/group"/>
-</component>
-<component name="emailservermonitor" filter="s60" long-name="Email Server Monitor" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailservermonitor/group"/>
-</component>
-<component name="psmruadapter" filter="s60" long-name="Predictive Search Most Recent Used Adapter" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailservices/psmruadapter/group"/>
-</component>
-<component name="emailstore" filter="s60" long-name="Email Store" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailstore/group"/>
-</component>
-<component name="emaildebug" filter="s60" long-name="Email Debug" introduced="^2" class="api">
-<unit bldFile="app/commonemail/emailservices/emaildebug/group"/>
-</component>
-<component name="emailinstallationinitiator" filter="s60" long-name="Email Installation Initiator" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailinstallationinitiator/group"/>
-</component>
-</collection>
-<collection name="ipsservices" long-name="IMAP/POP/SMTP Services" level="service">
-<component name="ipssossettings" filter="s60" long-name="IPS SOS Settings" introduced="^2">
-<!-- SOS? Consider spelling it out since the abbreviation is ambiguous -->
-<unit bldFile="app/commonemail/ipsservices/ipssossettings/group"/>
-</component>
-<component name="ipssosplugin" filter="s60" long-name="IPS SOS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/ipsservices/ipssosplugin/group"/>
-</component>
-<component name="ipssosaoplugin" filter="s60" long-name="IPS SOS Always Online Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/ipsservices/ipssosaoplugin/group"/>
-</component>
-<component name="ipsservices_build" filter="s60" long-name="IPS Services Build" introduced="^2">
-<unit bldFile="app/commonemail/ipsservices/group"/>
-<!-- can the exports be broken up into the other components or made a config component?-->
-</component>
-</collection>
-<collection name="emailcontacts" long-name="Email Contacts" level="support">
-<component name="contactactionservice" filter="s60" long-name="Contact Action Service" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailcontacts/contactactionservice/group"/>
-</component>
-<component name="contactactionmenu" filter="s60" long-name="Contact Action Menu" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailcontacts/contactactionmenu/group"/>
-</component>
-</collection>
-<collection name="meetingrequest" long-name="Meeting Request" level="ui">
-<component name="mrcommon" filter="s60" long-name="MR Common" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrcommon/group"/>
-</component>
-<component name="mrdb" filter="s60" long-name="MR Database" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrdb/group"/>
-</component>
-<component name="mrpolicy" filter="s60" long-name="MR Policy" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrpolicy/group"/>
-</component>
-<component name="mrservices" filter="s60" long-name="MR Services" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrservices/group"/>
-</component>
-<component name="mrgui" filter="s60" long-name="MR GUI" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrgui/group"/>
-</component>
-<component name="mrentry" filter="s60" long-name="MR Entry" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrentry/group"/>
-</component>
-<component name="mrtasks" filter="s60" long-name="MR Tasks" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrtasks/group"/>
-</component>
-<component name="mrutils" filter="s60" long-name="MR Utils" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrutils/group"/>
-</component>
-<component name="mrutilscalplugin" filter="s60" long-name="MR Utils Calendar Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mrutilscalplugin/group"/>
-</component>
-<component name="mrviewer" filter="s60" long-name="MR Viewer" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrviewer/group"/>
-</component>
-<component name="mrviewercalplugin" filter="s60" long-name="MR Viewer Calendar Plugin" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrviewercalplugin/group"/>
-</component>
-<component name="mricalviewer" filter="s60" long-name="MR iCal Viewer" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mricalviewer/group"/>
-</component>
-<component name="mrversit2" filter="s60" long-name="MR Versit2" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrversit2/group"/>
-</component>
-<component name="mragnversit2" filter="s60" long-name="MR Agenda Versit2" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mragnversit2/group"/>
-</component>
-<component name="mrcasplugin" filter="s60" long-name="MR Contact Action Service Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mrcasplugin/group"/>
-</component>
-<component name="mrurlparserplugin" filter="s60" long-name="MR URL Parser Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mrurlparserplugin/group"/>
-</component>
-<component name="meetingrequest_build" filter="s60" long-name="MR Build" introduced="^2">
-<!-- can the exports be broken up into the other components ?
- alternatively, move the exports into a RM Config component-->
-<unit bldFile="app/commonemail/meetingrequest/group"/>
-</component>
-</collection>
-<collection name="emailuis" long-name="Email UIs" level="app">
-<component name="emailui" filter="s60" long-name="Email UI" introduced="^2">
-<unit bldFile="app/commonemail/emailuis/emailui/group"/>
-</component>
-<component name="gsemailsettings" filter="s60" long-name="Email GS Settings" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailuis/gsemailsettings/group"/>
-</component>
-<component name="uicomponents" filter="s60" long-name="Email UI Components" introduced="^2">
-<unit bldFile="app/commonemail/emailuis/uicomponents/group"/>
-</component>
-<component name="widget" filter="s60" long-name="Email Widget" introduced="^2">
-<!-- Uncomment unit when configuration is in place. Currently #included from emailuis_build, which should be removed at the same time. -->
-<!--<unit bldFile="emailuis/widget/group"/>-->
-</component>
-<component name="emailuis_build" filter="s60" long-name="Email UIs Build" introduced="^2">
-<unit bldFile="app/commonemail/emailuis/group"/>
-</component>
-</collection>
-<collection name="commonemail_info" long-name="Email Apps Info" level="app">
-<component name="emailhelp" filter="s60" long-name="Email Help" class="placeholder">
-<!-- should this be commented out or not? -->
-<!-- <unit bldFile="emailhelp/group"/> -->
-</component>
-<component name="commonemail_help" filter="s60" long-name="Email Help" introduced="^2" class="placeholder">
-<!-- should this be commented out or not? -->
-<!-- <unit bldFile="help/group"/> -->
-</component>
-</collection>
-</block>
-<block name="conversations" level="apps" long-name="Conversation Apps" levels="settings utils plugin ui">
-<collection name="conversations_plat" long-name="Conversation Apps Platform Interfaces" level="ui">
-<component name="im_cv_launcher_api" long-name="IM CV Launcher API" filter="s60" class="api">
-<unit bldFile="app/conversations/conversations_plat/im_cv_launcher_api/group"/>
-</component>
-<component name="im_connection_api" long-name="IM Connection API" filter="s60" class="api">
-<unit bldFile="app/conversations/conversations_plat/im_connection_api/group"/>
-</component>
-<component name="im_cv_appui_api" long-name="IM CV App UI API" filter="s60" class="api">
-<unit bldFile="app/conversations/conversations_plat/im_cv_appui_api/group"/>
-</component>
-</collection>
-<collection name="uiservicetabsettings" long-name="UI Service Tab Settings" level="settings">
-<!-- this is really at the wrong rank. should move down a directory -->
-<component name="vimpstsettings" filter="s60" long-name="VIMP Service Tab Settings">
-<unit bldFile="app/conversations/uiservicetabsettings/group"/>
-</component>
-</collection>
-<collection name="instantmessagesalert" long-name="Instant Messages Alert" level="utils">
-<!-- this is really at the wrong rank. should move down a directory -->
-<component name="instantmessagesalert_build" filter="s60" long-name="Instant Messages Alert build" introduced="^3">
-<unit bldFile="app/conversations/instantmessagesalert/group"/>
-</component>
-</collection>
-<collection name="imstutils" long-name="IM Service Tab Utils" level="utils">
-<component name="imstutils_help" filter="s60" long-name="IM Service Tab Help">
-<unit bldFile="app/conversations/imstutils/help/group"/>
-</component>
-<component name="imconnectionprovider" filter="s60" long-name="IM Connection Provider" plugin="Y">
-<unit bldFile="app/conversations/imstutils/imconnectionprovider/group"/>
-</component>
-<component name="xmppadapter" filter="s60" long-name="XMPP Settings Adapter" plugin="Y">
-<unit bldFile="app/conversations/imstutils/xmppadapter/group"/>
-</component>
-<component name="imconversationview" filter="s60" long-name="IM Conversation View">
-<unit bldFile="app/conversations/imstutils/imconversationview/group"/>
-</component>
-<component name="imstutils_config" filter="s60" long-name="IM Service Tab Utils config" class="config">
-<!-- remove the #includes and or moved ithe loc file into one the above components -->
-<unit bldFile="app/conversations/imstutils/group"/>
-</component>
-</collection>
-<collection name="uiservicetab" long-name="UI Service Tab" level="ui">
-<component name="vimpstutils" filter="s60" long-name="VIMP Service Tab Utilities">
-<!-- need to spell out VIMP at least once -->
-<unit bldFile="app/conversations/uiservicetab/vimpstutils/group"/>
-</component>
-<component name="vimpststorage" filter="s60" long-name="VIMP Service Tab Storage">
-<unit bldFile="app/conversations/uiservicetab/vimpststorage/group"/>
-</component>
-<component name="vimpstengine" filter="s60" long-name="VIMP Service Tab Engine">
-<unit bldFile="app/conversations/uiservicetab/vimpstengine/group"/>
-</component>
-<component name="vimpstcmdprocess" filter="s60" long-name="VIMP Service Tab Command Process">
-<unit bldFile="app/conversations/uiservicetab/vimpstcmdprocess/group"/>
-</component>
-<component name="vimpstui" filter="s60" long-name="VIMP Service Tab UI">
-<unit bldFile="app/conversations/uiservicetab/vimpstui/group"/>
-</component>
-<component name="vimpstdetailsviewplugin" filter="s60" long-name="VIMP ST Details View Plugin" plugin="Y">
-<unit bldFile="app/conversations/uiservicetab/vimpstdetailsviewplugin/group"/>
-</component>
-<component name="uiservicetab_build" filter="s60" long-name="UI Service Tab Build">
-<!-- can this be distributed into the above bld.infs? -->
-<unit bldFile="app/conversations/uiservicetab/group"/>
-</component>
-</collection>
-<collection name="servicewidget" long-name="Service Widget" level="ui">
-<component name="servicewidgetdatapublisher" filter="s60" long-name="Service Widget Data Publisher" plugin="Y">
-<unit bldFile="app/conversations/servicewidget/servicewidgetdatapublisher/group"/>
-</component>
-<component name="themes" filter="s60" long-name="Service Widget Themes" class="config">
-<!-- does this really need to have that number in the directory name? -->
-<unit bldFile="app/conversations/servicewidget/themes/install-themes/install/servicewidget_20021383/group"/>
-</component>
-<component name="servicewidget_build" filter="s60" long-name="Service Widget Build">
-<!-- Either move the whole collection down one directory into a single component, or move the ROM and SIS parts into a Service Widget ROM component -->
-<unit bldFile="app/conversations/servicewidget/group"/>
-</component>
-</collection>
-<collection name="instantmsgindicatorplugin" long-name="Instant Message Indicator Plugin" level="plugin">
-<!-- collection is really a component. should move down a directory -->
-<component name="instantmsgindicatorplugin_build" filter="s60" long-name="Instant Message Indicator Plugin Build" introduced="^3" plugin="Y">
-<unit bldFile="app/conversations/instantmsgindicatorplugin/group"/>
-</component>
-</collection>
-<collection name="imstatuspaneindicatorplugin" long-name="IM Status Pane Indicator Plugin" level="plugin">
-<!-- collection is really a component. should move down a directory -->
-<component name="imstatuspaneindicatorplugin_build" filter="s60" long-name="IM Status Pane Indicator Plugin Build" introduced="^3" plugin="Y">
-<unit bldFile="app/conversations/imstatuspaneindicatorplugin/group"/>
-</component>
-</collection>
-<collection name="conversations_info" long-name="Conversation Apps Info" level="ui">
-<component name="conversations_build" filter="s60" long-name="Conversation Apps Build">
-<!-- can the exports be moved to other components? or this remade into a configuration component?-->
-<unit bldFile="app/conversations/group"/>
-</component>
-</collection>
-</block>
-<block name="im" level="apps" long-name="Instant Messaging Apps" levels="support prot engine apps">
-<collection name="im_plat" long-name="Instant Messaging Apps Platform Interfaces" level="apps">
-<component name="wv_sap_settings_api" long-name="WV SAP Settings API" filter="s60" class="api">
-<unit bldFile="app/im/im_plat/wv_sap_settings_api/group"/>
-</component>
-</collection>
-<collection name="wvsettings20" long-name="Wireless Village Settings Engine" level="support">
-<!-- this is really a component. should move down a directory -->
-<component name="wvsapsettingsstore" long-name="WV SAP Settings Store" filter="s60" introduced="9.3">
-<unit bldFile="app/im/wvsettings20/group"/>
-</component>
-</collection>
-</block>
-<block name="dictionary" level="services" long-name="Dictionary" levels="utils ui">
-<collection name="dictionary_plat" long-name="Dictionary Platform Interfaces" level="ui">
-<component name="menu_suites_macros_api" long-name="Menu Suites Macros API" filter="s60" class="api">
-<unit bldFile="app/dictionary/dictionary_plat/menu_suites_macros_api/group"/>
-</component>
-</collection>
-<collection name="userdict" long-name="User Dictionary" level="ui">
-<!-- collection is really a component, move down a dir -->
-<component name="userdict_build" filter="s60" long-name="Japanese User Dictionary">
-<unit bldFile="app/dictionary/userdict/group"/>
-</component>
-</collection>
-</block>
-<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"/>
-</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"/>
-</component>
-</collection>
-<collection name="camerauis" long-name="Camera UIs">
-<component name="activepalette" filter="s60" long-name="Active Palette">
-<unit bldFile="app/camera/camerauis/activepalette/group"/>
-</component>
-<component name="cameraapp" filter="s60" long-name="Camera Application">
-<unit bldFile="app/camera/camerauis/cameraapp/group"/>
-<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">
-<component name="image_editor_debug_utilities_api" long-name="Image Editor Debug Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
-</component>
-<component name="image_editor_utilities_api" long-name="Image Editor Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_utilities_api/group"/>
-</component>
-<component name="image_editor_definitions_api" long-name="Image Editor Definitions API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_definitions_api/group"/>
-</component>
-<component name="image_editor_system_parameters_api" long-name="Image Editor System Parameters API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_system_parameters_api/group"/>
-</component>
-<component name="image_processing_engine_api" long-name="Image Processing Engine API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_processing_engine_api/group"/>
-</component>
-</collection>
-<collection name="imageeditor" long-name="Image Editor UI" level="ui">
-<component name="pb" filter="s60" long-name="Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/pb/group"/>
-</component>
-<component name="iepb" filter="s60" long-name="Image Editor Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/iepb/group"/>
-</component>
-<component name="imageeditorui" filter="s60" long-name="Image Editor UI">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorui/group"/>
-</component>
-<component name="imageeditormanager" filter="s60" long-name="Image Editor Manager">
-<unit bldFile="app/imgeditor/imageeditor/imageeditormanager/group"/>
-</component>
-<component name="imageeditorapp" filter="s60" long-name="Image Editor Application">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorapp/group"/>
-</component>
-<component name="imageeditor_plugins" filter="s60" long-name="Image Editor Plugins" plugin="Y">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditor/plugins/blackwhiteplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/brightnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/bubbleplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cartoonizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/clipartplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/contrastplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cropplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/drawplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/frameplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/negativeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/redeyeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/resizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotatelplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotaterplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/textplugin/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditor/plugins/drawplugin/group"/>
- -->
-</component>
-<component name="editorprovider" filter="s60" long-name="Image Editor Provider">
-<unit bldFile="app/imgeditor/imageeditor/editorprovider/group"/>
-</component>
-<component name="imageeditor_build" filter="s60" long-name="Image Editor Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditor/group"/>
-</component>
-</collection>
-<collection name="imageeditorengine" long-name="Image Editor Engine" level="engine">
-<component name="filters" filter="s60" long-name="Image Editor Filters">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbrightness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbubble/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbuffer/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercartoon/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterclipart/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercontrast/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercrop/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterdraw/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterframe/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtergrayscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtericlsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegtarget/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filternegate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterredeye/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterrotate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtertext/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
- -->
-</component>
-<component name="imageeditorutils" filter="s60" long-name="Image Editor Utilities">
-<unit bldFile="app/imgeditor/imageeditorengine/imageeditorutils/group"/>
-</component>
-<component name="systemparameters" filter="s60" long-name="System Parameters">
-<unit bldFile="app/imgeditor/imageeditorengine/systemparameters/group"/>
-</component>
-<component name="enginewrapper" filter="s60" long-name="Image Editor Engine Wrapper">
-<unit bldFile="app/imgeditor/imageeditorengine/enginewrapper/group"/>
-</component>
-<component name="imageeditorengine_build" filter="s60" long-name="Image Editor Engine Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoeditor" level="apps" long-name="Video Editor Apps" levels="engine ui">
-<collection name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" level="ui">
-<component name="video_editor_engine_api" long-name="Video Editor Engine API" introduced="^2" class="api">
-<unit bldFile="app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
-</component>
-</collection>
-<collection name="videditor" long-name="Video Editor" level="ui">
-<component name="videoeditorcommon" filter="s60" long-name="Video Editor Common" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditorcommon/group"/>
-</component>
-<component name="videoeditoruicomponents" filter="s60" long-name="Video Editor UI Components" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditoruicomponents/group"/>
-</component>
-<component name="simplevideoeditor" filter="s60" long-name="Simple Video Editor" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplevideoeditor/group"/>
-</component>
-<component name="simplecutvideo" filter="s60" long-name="Simple Cut Video" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplecutvideo/group"/>
-</component>
-<component name="videoprovider" filter="s60" long-name="Video Provider" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoprovider/group"/>
-</component>
-<component name="manualvideoeditor" filter="s60" long-name="Manual Video Editor" introduced="^2" class="placeholder">
-<!-- uncomment when supported
- <meta rel="config">
- <defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
- </meta>
- <unit bldFile="videditor/manualvideoeditor/group"/> -->
-</component>
-<component name="videditor_build" filter="s60" long-name="Video Editor Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videditor/group"/>
-</component>
-</collection>
-<collection name="videoeditorengine" long-name="Video Editor Engine" level="engine">
-<component name="audioeditorengine" filter="s60" long-name="Audio Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/audioeditorengine/group"/>
-</component>
-<component name="avcedit" filter="s60" long-name="AVC Editing" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/avcedit/group"/>
-</component>
-<component name="h263decoder" filter="s60" long-name="H.263 Decoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/h263decoder/group"/>
-</component>
-<component name="mp3aacmaniplib" filter="s60" long-name="MP3 and AAC Manipulation Library" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
-</component>
-<component name="vedtranscoder" filter="s60" long-name="Video Editor Transcoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedtranscoder/group"/>
-</component>
-<component name="vedengine" filter="s60" long-name="Video Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedengine/group"/>
-</component>
-<component name="videoeditorengine_build" filter="s60" long-name="Video Editor Engine Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videoeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
-<collection name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" level="apps">
-<component name="videoplayer_startup_api" long-name="Video Player Startup API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videoplayer_startup_api/group" filter="!test"/>
-</component>
-<component name="video_player_file_details_dialog_api" long-name="Media Player File Details Dialog API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/video_player_file_details_dialog_api/group" filter="!test"/>
-</component>
-<component name="videocollection_api" long-name="Video Collection API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videocollection_api/group"/>
-</component>
-</collection>
-<collection name="videofeeds" long-name="Video Feeds" level="util">
-<component name="iptv_utils" filter="s60" long-name="IPTV Util" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/utils/group"/>
-</component>
-<component name="viewmessageutility" filter="s60" long-name="View Message Utility" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/viewmessageutility/group"/>
-</component>
-<component name="vcxnotifier" filter="s60" long-name="Video Connection Notifier" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/vcxnotifier/group"/>
-</component>
-<component name="vccommon" filter="s60" long-name="Video Connection Common" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/vccommon/group"/>
-</component>
-<component name="clientapi" long-name="Server Client" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/clientapi/group"/>
-</component>
-<component name="provisioningprocessor" long-name="Provisioning Processor" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/provisioningprocessor/group"/>
-</component>
-<component name="mrssplugin" long-name="RSS plugin" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/mrssplugin/group"/>
-</component>
-<component name="videofeeds_server" long-name="Server" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/server/group"/>
-</component>
-<component name="livetvutils" long-name="LiveTV Utils" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/livetvutils/group"/>
-</component>
-<component name="iptvprovisioningrecognizer" long-name="IP TV Provisioning Recognizer" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/provisioningrecognizer/group"/>
-</component>
-<component name="iptvprovisioningappui" long-name="IP TV Provisioning App UI" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/provisioningappui/group"/>
-</component>
-<component name="iptvomaprovisioning" long-name="IP TV OMA Provisioning" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/omaprovisioning/group"/>
-</component>
-<component name="vcnsuiengine" long-name="VoD UI Engine" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/vcnsuiengine/group"/>
-</component>
-<component name="hgvodui" long-name="Ganes UX2.0 VoD UI" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/hgvodui/group"/>
-</component>
-<component name="hgvodplugin" long-name="Ganes UX2.0 VoD UI Plugin" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/hgvodplugin/group"/>
-</component>
-<component name="vcnsscheduleview" long-name="Scheduled Download Settings View" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/vcnsscheduleview/group"/>
-</component>
-<component name="vcnsscheduleplugin" long-name="Scheduled Download Settings Plugin" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/vcnsscheduleplugin/group"/>
-</component>
-<component name="scheduleddlplugin" long-name="Scheduled download plugin" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/scheduleddlplugin/group"/>
-</component>
-</collection>
-<collection name="videocollection" long-name="Video Collection" level="util">
-<component name="mpxmyvideoscollection" filter="s60" long-name="MPX My Videos Collection" introduced="^3">
-<unit bldFile="app/videoplayer/videocollection/mpxmyvideoscollection/group"/>
-</component>
-<component name="myvideosindicatorplugin" filter="s60" long-name="My Videos Indicator Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videocollection/myvideosindicatorplugin/group"/>
-</component>
-<component name="hgmyvideos" filter="s60" long-name="Huriganes My Videos" introduced="^3">
-<unit bldFile="app/videoplayer/videocollection/hgmyvideos/group"/>
-</component>
-<component name="hgmyvideosplugin" filter="s60" long-name="Huriganes My VideosPlugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videocollection/hgmyvideosplugin/group"/>
-</component>
-</collection>
-<collection name="mediasettings" long-name="Media Settings" level="support">
-<!-- this is really a component. Should be moved down a directory -->
-<component name="mediasettings_build" filter="s60" long-name="Media Settings Build">
-<unit bldFile="app/videoplayer/mediasettings/group"/>
-</component>
-<component name="videoplayer_test" filter="s60" purpose="development" long-name="Video Player Apps Test">
-<!-- can only have one unit. Can thes be #included from the above or another bld.inf?-->
-<unit bldFile="app/videoplayer/tsrc/VCXTestCommon/group"/>
-<unit bldFile="app/videoplayer/tsrc/VCXTestUtilModule/group"/>
-<unit bldFile="app/videoplayer/tsrc/VCXTestMyVideosCollectionClient/group"/>
-<unit bldFile="app/videoplayer/mediasettings/mediasettingsengine/tsrc/mediasettingsenginetest/group"/>
-<unit bldFile="app/videoplayer/mediasettings/videoplayersettingsengine/tsrc/vpsettingsenginetest/group"/>
-</component>
-</collection>
-<collection name="filedetails" long-name="File Details" level="support">
-<component name="filedetailsplugin" filter="s60" long-name="File Details Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/filedetails/filedetailsplugin/group"/>
-</component>
-<component name="filedetailsdialog" filter="s60" long-name="File Details Dialog" introduced="^3">
-<unit bldFile="app/videoplayer/filedetails/filedetailsdialog/group"/>
-</component>
-</collection>
-<collection name="videoplayerapp" long-name="Video Player App" level="apps">
-<component name="lwplayer" long-name="Lightweight Player" filter="s60">
-<unit bldFile="app/videoplayer/videoplayerapp/lwplayer/group"/>
-</component>
-<component name="mpxvideoplayer" filter="s60" long-name="MPX Video Player" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayerapp/mpxvideoplayer/group" filter="!test"/>
-</component>
-</collection>
-<collection name="videoplayback" long-name="Video Playback Plugins" level="plugin">
-<component name="videohelix" long-name="Video Helix" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videohelix/group" filter="!test"/>
-</component>
-<component name="videopdlplaybackviewplugin" filter="s60" long-name="Video PDL Playback View Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videopdlplaybackviewplugin/group" filter="!test"/>
-</component>
-<component name="videoplaybackcontrols" filter="s60" long-name="Video Playback Controls" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videoplaybackcontrols/group" filter="!test"/>
-</component>
-<component name="videoplaybackviewplugin" filter="s60" long-name="Video Playback View Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videoplaybackviewplugin/group"/>
-</component>
-<component name="videoplaybackviews" filter="s60" long-name="Video Playback Views" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videoplaybackviews/group" filter="!test"/>
-</component>
-</collection>
-</block>
-<block name="photos" level="apps" long-name="Photos" levels="support fw ui app">
-<collection name="photos_plat" long-name="Photos Platform Interfaces" level="app">
-<component name="collection_plugins_api" long-name="Collection Plugins API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/collection_plugins_api/group"/>
-</component>
-<component name="controllers_collection_api" long-name="Controllers Collection API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/controllers_collection_api/group"/>
-</component>
-<component name="gallery_utilities_api" long-name="Gallery Utilities API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/gallery_utilities_api/group"/>
-</component>
-<component name="slideshow_ui_constants_api" long-name="Slideshow Ui Constants API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/slideshow_ui_constants_api/group"/>
-</component>
-<component name="views_metadatadialog_api" long-name="Views Metadata Dialog API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/views_metadatadialog_api/group"/>
-</component>
-</collection>
-<collection name="photosgallery" long-name="Photos Gallery" level="app">
-<!-- consider splitting this collection into the application itself, and the frameworks behind it -->
-<component name="photosgallery_help" filter="s60" long-name="Photos Help" introduced="^2">
-<unit bldFile="app/photos/photosgallery/help/group"/>
-</component>
-<component name="logging" filter="s60" long-name="Photos Logging" introduced="^2">
-<unit bldFile="app/photos/photosgallery/logging/group"/>
-</component>
-<component name="photosgallery_common" filter="s60" long-name="Photos Common" introduced="^2">
-<unit bldFile="app/photos/photosgallery/common/group"/>
-</component>
-<component name="photosgallery_commonui" filter="s60" long-name="Photos Common UI" introduced="^2">
-<unit bldFile="app/photos/photosgallery/commonui/group"/>
-</component>
-<component name="photosgalleryollectionfw" filter="s60" long-name="Photos Collection Framework" introduced="^2">
-<unit bldFile="app/photos/photosgallery/collectionframework/group"/>
-</component>
-<component name="galleryicons" filter="s60" long-name="Photos Icons" introduced="^2" class="config">
-<unit bldFile="app/photos/photosgallery/icons"/>
-</component>
-<component name="imageviewer" filter="s60" long-name="Image Viewer" introduced="^3">
-<!-- this is really a part of controllers component, #include from there instead -->
-<unit bldFile="app/photos/photosgallery/controllers/imageviewer/group"/>
-</component>
-<component name="photosgalleryviewfw" filter="s60" long-name="View Framework" introduced="^2">
-<unit bldFile="app/photos/photosgallery/viewframework/group"/>
-</component>
-<component name="controllers" filter="s60" long-name="Photos Controllers" introduced="^2">
-<unit bldFile="app/photos/photosgallery/controllers/group"/>
-</component>
-<component name="photogallery" filter="s60" long-name="Media Gallery" introduced="^2">
-<unit bldFile="app/photos/photosgallery/gallery/group"/>
-</component>
-<component name="slideshow" filter="s60" long-name="Slideshow" introduced="^2">
-<unit bldFile="app/photos/photosgallery/slideshow/group"/>
-</component>
-<component name="memoryplugin" long-name="Memory Plugin" filter="s60" introduced="^2" plugin="Y">
-<unit bldFile="app/photos/photosgallery/memoryplugin/group"/>
-</component>
-<component name="imgvwr" filter="s60" long-name="Photos Image Viewer" introduced="^3">
-<unit bldFile="app/photos/photosgallery/imgvwr/group"/>
-</component>
-<component name="photosgallery_build" filter="s60" long-name="Photos Gallery Build" introduced="^2">
-<!-- need to remove the #included above bld.infs from this -->
-<unit bldFile="app/photos/photosgallery/group"/>
-</component>
-</collection>
-</block>
-<block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support hs app">
-<collection name="musicplayer_plat" long-name="Music Player Apps Platform Interfaces" level="app">
-<component name="mpx_music_player_app_api" long-name="MPX Music Player App API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_app_api/group"/>
-</component>
-<component name="mpx_music_player_commonui_api" long-name="MPX Music Player Common UI API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_commonui_api/group"/>
-</component>
-<component name="mpx_music_player_media_key_handler_api" long-name="MPX Music Player Media Key Handler API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_media_key_handler_api/group"/>
-</component>
-<component name="mpx_music_player_remote_control_api" long-name="MPX Music Player Remote Control API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_remote_control_api/group"/>
-</component>
-<component name="mpx_music_shop_ui_api" long-name="MPX Music Shop UI API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_shop_ui_api/group"/>
-</component>
-<component name="mpx_music_wap_adapter_cenrep_api" long-name="MPX Music Wap Adapter CenRep API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_wap_adapter_cenrep_api/group"/>
-</component>
-<component name="mpx_music_store_api" long-name="MPX Music Store Find API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_store_api/group"/>
-</component>
-<component name="audio_application_features_api" long-name="Audio Application Features API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/audio_application_features_api/group"/>
-</component>
-<component name="music_content_publisher_plugin_api" long-name="Music Content Publisher Plugin API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/music_content_publisher_plugin_api/group"/>
-</component>
-</collection>
-<collection name="mpxmusicplayer" long-name="MPX Music Player" level="app">
-<component name="mpxmusicplayer_help" filter="s60" long-name="Help">
-<unit bldFile="app/musicplayer/mpxmusicplayer/help/group"/>
-</component>
-<component name="mpxmusicplayer_commonui" filter="s60" long-name="MPX Common UI">
-<unit bldFile="app/musicplayer/mpxmusicplayer/commonui/group"/>
-</component>
-<component name="mpx_metadatahandler" filter="s60" long-name="MPX Metadata Handler">
-<unit bldFile="app/musicplayer/mpxmusicplayer/metadatahandler/group"/>
-</component>
-<component name="mediakeyhandler" filter="s60" long-name="MPX Media Key Handler">
-<unit bldFile="app/musicplayer/mpxmusicplayer/mediakeyhandler/group"/>
-</component>
-<component name="mpxmusicplayer_app" filter="s60" long-name="MPX Application">
-<unit bldFile="app/musicplayer/mpxmusicplayer/app/group"/>
-</component>
-<component name="mpxmusicplayer_build" filter="s60" long-name="MPX Music Player Build">
-<!-- can the exports be distributed to the above components? -->
-<unit bldFile="app/musicplayer/mpxmusicplayer/group"/>
-</component>
-</collection>
-<collection name="musichomescreen_multiview" long-name="Music Home Screen Multiview" level="hs">
-<!-- Uncomment all units when configuration is in place. All currently #included from musichomescreen_build -->
-<component name="mpxcollectionpublisher" filter="s60" long-name="MPX Collection Publisher" introduced="^2" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/mpxcollectionpublisher/group"/>-->
-</component>
-<component name="musiccontentpublisher" filter="s60" long-name="Music Content Publisher" introduced="^2" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/musiccontentpublisher/group"/>-->
-</component>
-<component name="mcpmusicplayer" filter="s60" long-name="Music Player MCP Plugin" introduced="^2" plugin="Y" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/mcpmusicplayer/group"/>-->
-</component>
-<component name="musicplayeractionhandlerplugin" filter="s60" long-name="Music Player Action Handler Plugin" introduced="^2" plugin="Y" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/musicplayeractionhandlerplugin/group"/>-->
-</component>
-<component name="mpx_data" filter="s60" long-name="MPX Data" introduced="^2" class="placeholder">
-<!-- does this make sense to be a component? should it just be #include from musichomescreen_multiview/group? -->
-<!--<unit bldFile="musichomescreen_multiview/data/themes/default/group"/>-->
-</component>
-<component name="musichomescreen_build" filter="s60" long-name="Music Homescreen Multiview Build" introduced="^2">
-<unit bldFile="app/musicplayer/musichomescreen_multiview/group"/>
-</component>
-</collection>
-<collection name="mpxplugins" long-name="MPX Plugins" level="plugins">
-<component name="serviceplugins" filter="s60" long-name="MPX Service Plugins" plugin="Y">
-<unit bldFile="app/musicplayer/mpxplugins/serviceplugins/group"/>
-</component>
-<component name="viewplugins" filter="s60" long-name="MPX View Plugins" plugin="Y">
-<unit bldFile="app/musicplayer/mpxplugins/viewplugins/group"/>
-</component>
-<component name="mpxplugins_build" filter="s60" long-name="MPX Plugins Build">
-<!-- can the exports be distributed to the above components? -->
-<unit bldFile="app/musicplayer/mpxplugins/group"/>
-</component>
-</collection>
-<collection name="musicplayer_info" long-name="Music Player Apps Info" level="app">
-<component name="musicplayer_build" filter="s60" long-name="Music Player Build">
-<!-- should explicitly #inlcude musicplayerbldvariant.hrh in each component -->
-<unit bldFile="app/musicplayer/group"/>
-</component>
-</collection>
-</block>
-<block name="radio" level="apps" long-name="Radio Apps" levels="engine ui">
-<collection name="fmradio" long-name="FM Radio" level="ui">
-<component name="activeidleengine" filter="s60" long-name="FM Radio Active Idle Engine">
-<unit bldFile="app/radio/fmradio/activeidleengine/group"/>
-</component>
-<component name="fmradioengine" filter="s60" long-name="FM Radio Engine">
-<unit bldFile="app/radio/fmradio/fmradioengine/group"/>
-</component>
-<component name="fmradioactionhandler" filter="s60" long-name="FM Radio Action Handler" plugin="Y">
-<unit bldFile="app/radio/fmradio/fmradioactionhandler/group"/>
-</component>
-<component name="fmradiomcpplugin" filter="s60" long-name="FM Radio Content Publisher Plugin" plugin="Y">
-<unit bldFile="app/radio/fmradio/fmradiomcpplugin/group"/>
-</component>
-<component name="fmradio_build" filter="s60" long-name="FM Radio Build">
-<unit bldFile="app/radio/fmradio/fmradio/group"/>
-</component>
-<component name="fmradio_help" filter="s60" long-name="FM Radio Help">
-<unit bldFile="app/radio/fmradio/help/group"/>
-</component>
-<component name="fmradio_build" filter="s60" long-name="FM Radio ROM">
-<!-- remove above #included bld.infs -->
-<unit bldFile="app/radio/fmradio/group"/>
-</component>
-</collection>
-</block>
-<block name="internetradio" level="apps" long-name="Internet Radio Apps"/>
-<block name="tv" level="services" long-name="TV Apps"/>
-<block name="voicerec" level="apps" long-name="Voice Recorder Apps">
-<!-- custom filter pref_test-->
-<collection name="voicerec_plat" long-name="Voice Recorder Apps Platform Interfaces">
-<component name="new_file_service_api" long-name="New File Service API" filter="s60" class="api">
-<unit bldFile="app/voicerec/voicerec_plat/new_file_service_api/group"/>
-</component>
-<component name="voicerecorder_public_constants_api" long-name="Voice Recorder Public Constants API" filter="s60" class="api">
-<unit bldFile="app/voicerec/voicerec_plat/voicerecorder_public_constants_api/group"/>
-</component>
-</collection>
-<collection name="voicerecorder" long-name="Voice Recorder">
-<!--this is really a component, move down a directory -->
-<component name="voicerecorder_build" filter="s60" long-name="Voice Recorder Build">
-<unit bldFile="app/voicerec/voicerecorder/group"/>
-</component>
-</collection>
-<collection name="voicerec_info" long-name="Voice Recorder Apps Info"/>
-</block>
-<block name="screensaver" level="apps" long-name="Screen Saver Apps" levels="plugin ui">
-<!-- is this a user-facing application or a daemon? -->
-<!-- units need to be commented out until configuration is in place. They are currently #included from screensaver_build-->
-<collection name="scrsaver" long-name="Screen Saver" level="plugin">
-<component name="scrsaverplugins" filter="s60" long-name="Screen Saver Plugins" plugin="Y">
-<!-- must have only one component. #include from a common bld.inf, or move up a directory and make scrsaverplugins a collection -->
-<!--<unit bldFile="scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/"/>
- <unit bldFile="scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/group/"/>-->
-</component>
-<component name="scrsaver_slideshowplugin" filter="s60" long-name="Screen Saver Slideshow Plugin" plugin="Y">
-<!--<unit bldFile="scrsaver/scrsaverplugins/SlideshowPlugin/group"/> -->
-</component>
-<component name="screensaveraiwplugin" filter="s60" long-name="Screen Saver AIW Plugin" plugin="Y">
-<!-- <unit bldFile="scrsaver/screensaveraiwplugin/group"/>-->
-</component>
-</collection>
-<collection name="screensaver_info" long-name="Screen Saver Apps Info" level="ui">
-<component name="screensaver_build" filter="s60" long-name="Screen Saver Application">
-<!--the app should be a separate component -->
-<unit bldFile="app/screensaver/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreen" level="apps" long-name="Home Screen Apps" levels="fw support apps">
-<collection name="homescreen_plat" long-name="Home Screen Apps Platform Interfaces" level="apps">
-<component name="menu_settings_api" long-name="Menu Settings API" filter="s60" class="api">
-<unit bldFile="app/homescreen/homescreen_plat/menu_settings_api/group"/>
-</component>
-<component name="hs_content_control_ui" long-name="HS Content Control Ui" filter="s60" class="api">
-<unit bldFile="app/homescreen/homescreen_plat/hs_content_control_ui/group"/>
-</component>
-<component name="hs_renderingplugin_api" long-name="HS Rendering Plugin API" filter="s60" class="api">
-<unit bldFile="app/homescreen/homescreen_plat/hs_renderingplugin_api/group"/>
-</component>
-</collection>
-<collection name="idlehomescreen" long-name="Idle Home Screen" level="apps">
-<component name="nativeuicontroller" filter="s60" long-name="Native UI Controller">
-<unit bldFile="app/homescreen/idlehomescreen/nativeuicontroller/group"/>
-</component>
-<component name="exths" filter="s60" long-name="Active Idle Container" plugin="Y">
-<!-- why is the ID so different from the name? Is one wrong? -->
-<unit bldFile="app/homescreen/idlehomescreen/exths/group"/>
-</component>
-<component name="hscontentcontrol" filter="s60" long-name="Home Screen Content Control" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/hscontentcontrol/group"/>
-</component>
-<component name="hssapiwrapper" filter="s60" long-name="HS SAPI Wrapper" introduced="^3">
-<!-- can only have one unit. #include from a common bld.inf, or split into two components -->
-<unit bldFile="app/homescreen/idlehomescreen/sapiwrapper/cpswrapper/group"/>
-<unit bldFile="app/homescreen/idlehomescreen/sapiwrapper/hspswrapper/group"/>
-</component>
-<component name="xmluirendering" filter="s60" long-name="XML UI Rendering" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/xmluirendering/group"/>
-</component>
-<component name="xmluicontroller" filter="s60" long-name="XML UI Controller" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/xmluicontroller/group"/>
-</component>
-<component name="widgetmanager" filter="s60" long-name="Widget Manager" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/widgetmanager/group"/>
-</component>
-<component name="idlehomescreen_help" filter="s60" long-name="Idle Home Screen Help">
-<unit bldFile="app/homescreen/idlehomescreen/help/group"/>
-</component>
-<component name="idlehomescreen_data" filter="s60" long-name="Idle Home Screen Data">
-<unit bldFile="app/homescreen/idlehomescreen/data/group"/>
-</component>
-<component name="idlehomescreen_build" filter="s60" long-name="Idle Home Screen Build">
-<!-- can the loc file be moved to another comopnent and this one removed? -->
-<unit bldFile="app/homescreen/idlehomescreen/group"/>
-</component>
-</collection>
-<collection name="menufw" long-name="Menu Framework" level="fw">
-<component name="hierarchynavigator" filter="s60" long-name="Hierarchy Navigator">
-<unit bldFile="app/homescreen/menufw/hierarchynavigator/group"/>
-</component>
-<component name="menufwui" filter="s60" long-name="Menu Framework UI">
-<unit bldFile="app/homescreen/menufw/menufwui/group"/>
-</component>
-<component name="menusuites" filter="s60" long-name="Menu Suites">
-<unit bldFile="app/homescreen/menufw/menusuites/group"/>
-</component>
-<component name="menufw_build" filter="s60" long-name="Menu Framework Build">
-<!-- can the exports be exported by the other components? -->
-<unit bldFile="app/homescreen/menufw/group"/>
-</component>
-</collection>
-<collection name="taskswitcher" long-name="Task Switcher" level="support">
-<component name="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">
-<unit bldFile="app/homescreen/taskswitcher/taskswitcherui/group"/>
-</component>
-</collection>
-</block>
-<block name="graphicsuis" level="services" long-name="Graphics UIs" levels="util ui">
-<collection name="graphicsuis_plat" long-name="Graphics UIs Platform Interfaces" level="ui">
-<component name="svgt_viewer_ui_api" long-name="SVG-T Viewer UI API" filter="s60" class="api">
-<unit bldFile="app/graphicsuis/graphicsuis_plat/svgt_viewer_ui_api/group"/>
-</component>
-<component name="svg_application_observer_utility_api" long-name="SVG Application Observer Utility API" filter="s60" class="api">
-<unit bldFile="app/graphicsuis/graphicsuis_plat/svg_application_observer_utility_api/group"/>
-</component>
-<component name="svgt_file_view_details_dialog_api" long-name="SVG-T File View Details Dialog API" filter="s60" class="api">
-<unit bldFile="app/graphicsuis/graphicsuis_plat/svgt_file_view_details_dialog_api/group"/>
-</component>
-</collection>
-<collection name="svgtviewer" long-name="SVG-T Viewer" level="ui">
-<component name="svgtviewerplugin" filter="s60" long-name="SVG-T Viewer Plugin">
-<unit bldFile="app/graphicsuis/svgtviewer/svgtviewerplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="profile" level="apps" long-name="Profiles" levels="app">
-<collection name="profile_plat" long-name="Profiles Platform Interfaces" level="app">
-<component name="profiles_settings_view_api" long-name="Profiles Settings View API" filter="s60" class="api">
-<unit bldFile="app/profile/profile_plat/profiles_settings_view_api/group"/>
-</component>
-</collection>
-<collection name="profilesapplication" long-name="Profiles Application" level="app">
-<component name="profiles" filter="s60" long-name="Profiles">
-<unit bldFile="app/profile/profilesapplication/profiles/group"/>
-</component>
-</collection>
-<collection name="profile_info" long-name="Profiles Info" level="app">
-<component name="profile_help" filter="s60" long-name="Profiles Help">
-<unit bldFile="app/profile/help/group"/>
-</component>
-</collection>
-</block>
-<block name="speechsrv" level="services" long-name="Speech Recognition UIs" levels="engine framework ui">
-<collection name="speechsrv_plat" long-name="Speech Recognition UIs Platform Interfaces" level="ui">
-<component name="vas_api" long-name="VAS API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vas_api/group"/>
-</component>
-<component name="nss_devasr_api" long-name="NSS DevASR API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_devasr_api/group"/>
-</component>
-<component name="tts_hw_device_api" long-name="TTS HW Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/tts_hw_device_api/group"/>
-</component>
-<component name="voice_commands_resource_header_api" long-name="Voice Commands Resource Header API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/voice_commands_resource_header_api/group"/>
-</component>
-<component name="nss_mmf_tts_custom_commands_api" long-name="NSS MMF TTS Custom Commands API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_mmf_tts_custom_commands_api/group"/>
-</component>
-<component name="srsf_cenrep_settings_api" long-name="SRSF CenRep Settings API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/srsf_cenrep_settings_api/group"/>
-</component>
-<component name="voice_ui_plugin_api" long-name="Voice UI Plug-in API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/voice_ui_plugin_api/group"/>
-</component>
-<component name="nss_tts_utility_api" long-name="NSS TTS Utility API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_tts_utility_api/group"/>
-</component>
-<component name="nss_srs_custom_commands_api" long-name="NSS SRS Custom Commands API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_srs_custom_commands_api/group"/>
-</component>
-<component name="srsf_secondarydisplay_api" long-name="SRSF Secondary Display API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/srsf_secondarydisplay_api/group"/>
-</component>
-<component name="asrs_hw_device_api" long-name="ASRS Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/asrs_hw_device_api/group"/>
-</component>
-<component name="vas_vcommand_api" long-name="VAS Voice Command API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vas_vcommand_api/group"/>
-</component>
-<component name="adaptation_hw_device_api" long-name="Adaptation Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/adaptation_hw_device_api/group"/>
-</component>
-<component name="nss_devtts_api" long-name="NSS DevTTS API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_devtts_api/group"/>
-</component>
-<component name="nss_srs_utility_api" long-name="NSS SRS Utility API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_srs_utility_api/group"/>
-</component>
-<component name="recognition_hw_device_api" long-name="Recognition Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/recognition_hw_device_api/group"/>
-</component>
-<component name="vas_contact_handler_api" long-name="VAS Contact Handler API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vas_contact_handler_api/group"/>
-</component>
-<component name="nlp_hw_device" long-name="NLP Hardware Device" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nlp_hw_device/group"/>
-</component>
-<component name="nss_si_speech_recognition_data_api" long-name="NSS SI Speech Recognition Data API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_si_speech_recognition_data_api/group"/>
-</component>
-<component name="nss_tts_common_api" long-name="NSS TTS Common API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_tts_common_api/group"/>
-</component>
-<component name="grcompiler_hw_device_api" long-name="Grammar Compiler Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/grcompiler_hw_device_api/group"/>
-</component>
-<component name="ttp_hw_device_api" long-name="TTP Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/ttp_hw_device_api/group"/>
-</component>
-<component name="vocman_hw_device_api" long-name="VocMan Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vocman_hw_device_api/group"/>
-</component>
-<component name="speech_synthesis_clientserver_api" long-name="Speech Synthesis Client-Server API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/speech_synthesis_clientserver_api/group"/>
-</component>
-<component name="voice_ui_accessory_button_handling_api" long-name="Voice UI Accessory Button Handling API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/voice_ui_accessory_button_handling_api/group"/>
-</component>
-<component name="ui_voice_recognition_api" long-name="UI Voice Recognition API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/ui_voice_recognition_api/group"/>
-</component>
-<component name="vcommand_settings_cenrep_api" long-name="Voice Command Settings CenRep API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vcommand_settings_cenrep_api/group"/>
-</component>
-</collection>
-<collection name="voiceui" long-name="Voice UI" level="ui">
-<component name="vcommand" filter="s60" long-name="Voice Commands UI" introduced="^1">
-<unit bldFile="app/speechsrv/voiceui/vcommand/group"/>
-</component>
-<component name="voiceuivoicerecognition" filter="s60" long-name="Voice UI Recognition" introduced="^1">
-<unit bldFile="app/speechsrv/voiceui/voiceuivoicerecognition/group"/>
-</component>
-<component name="pbkinfoviewimpl" filter="s60" long-name="Phonebook Info View Implementation" introduced="^1">
-<unit bldFile="app/speechsrv/voiceui/pbkinfoviewimpl/group"/>
-</component>
-<component name="aiwpbkinfoviewprovider" filter="s60" long-name="AIW Phonebook Info View Provider" introduced="^1" plugin="Y">
-<unit bldFile="app/speechsrv/voiceui/aiwpbkinfoviewprovider/group"/>
-</component>
-<component name="vccontrolpanelplugin" filter="s60" long-name="Voice Commands Control Panel Plugin" introduced="^1" plugin="Y">
-<!-- component is commented out until configuration is in place. Currently #included from voiceui_build -->
-<!--<unit bldFile="voiceui/vccontrolpanelplugin/group"/>-->
-</component>
-<component name="voiceui_build" filter="s60" long-name="Voice UI Build" introduced="^1">
-<!-- can this be put into the other components? -->
-<unit bldFile="app/speechsrv/voiceui/group"/>
-</component>
-</collection>
-<collection name="srsf" long-name="Speech Recognition and Synthesis Framework" level="framework">
-<component name="sispeechrecognitiondata" filter="s60" long-name="SI Speech Recognition Data">
-<unit bldFile="app/speechsrv/srsf/sispeechrecognitiondata/group"/>
-</component>
-<component name="ttscommon" filter="s60" long-name="TTS Common">
-<unit bldFile="app/speechsrv/srsf/ttscommon/group"/>
-</component>
-<component name="devtts" filter="s60" long-name="Text to Speech">
-<unit bldFile="app/speechsrv/srsf/devtts/group"/>
-</component>
-<component name="ttscustomcommands" filter="s60" long-name="TTS Custom Commands">
-<unit bldFile="app/speechsrv/srsf/ttscustomcommands/group"/>
-</component>
-<component name="ttscontrollerplugin" filter="s60" long-name="TTS Controller Plugin" plugin="Y">
-<unit bldFile="app/speechsrv/srsf/ttscontrollerplugin/group"/>
-</component>
-<component name="ttsutility" filter="s60" long-name="TTS Utility">
-<unit bldFile="app/speechsrv/srsf/ttsutility/group"/>
-</component>
-<component name="speechsynthesis" filter="s60" long-name="Speech Synthesis">
-<!-- can only have one unit. #include these from a common bld.inf -->
-<unit bldFile="app/speechsrv/srsf/speechsynthesis/client/group"/>
-<unit bldFile="app/speechsrv/srsf/speechsynthesis/server/group"/>
-</component>
-<component name="devasr" filter="s60" long-name="Audio Recording and Speech Recognition">
-<unit bldFile="app/speechsrv/srsf/devasr/group"/>
-</component>
-<component name="sicc" filter="s60" long-name="Speaker Independent Custom Commands">
-<unit bldFile="app/speechsrv/srsf/sicc/group"/>
-</component>
-<component name="sisrscontrollerplugin" filter="s60" long-name="SI SRS Controller Plugin" plugin="Y">
-<unit bldFile="app/speechsrv/srsf/sisrscontrollerplugin/group"/>
-</component>
-<component name="siutility" filter="s60" long-name="Speaker Independent Utility">
-<unit bldFile="app/speechsrv/srsf/siutility/group"/>
-</component>
-<component name="nssvasapi" filter="s60" long-name="NSS VAS API">
-<unit bldFile="app/speechsrv/srsf/nssvasapi/group"/>
-</component>
-<component name="nssvascontacthdlr" filter="s60" long-name="NSS VAS Contact Handler">
-<unit bldFile="app/speechsrv/srsf/nssvascontacthdlr/group"/>
-</component>
-<component name="vcommandhandler" filter="s60" long-name="Voice Command Handler">
-<unit bldFile="app/speechsrv/srsf/vcommandhandler/group"/>
-</component>
-<component name="vuiphandler" filter="s60" long-name="Voice UI Plugin Handler">
-<unit bldFile="app/speechsrv/srsf/vuiphandler/group"/>
-</component>
-<component name="vcommandexecutor" filter="s60" long-name="Voice Command Executor">
-<unit bldFile="app/speechsrv/srsf/vcommandexecutor/group"/>
-</component>
-<component name="vcommandexecutorbearer" filter="s60" long-name="Voice Command Executor Bearer">
-<unit bldFile="app/speechsrv/srsf/vcommandexecutorbearer/group"/>
-</component>
-<component name="vcommandmanager" filter="s60" long-name="Voice Command Manager">
-<unit bldFile="app/speechsrv/srsf/vcommandmanager/group"/>
-</component>
-<component name="vcexecutorapp" filter="s60" long-name="Voice Command Executor Application">
-<unit bldFile="app/speechsrv/srsf/vcexecutorapp/group"/>
-</component>
-<component name="profileobserverplugin" filter="s60" long-name="Profile Observer Plugin" plugin="Y">
-<unit bldFile="app/speechsrv/srsf/profileobserverplugin/group"/>
-</component>
-<component name="srsf_build" filter="s60" long-name="Speech Recognition and Synthesis Framework Build">
-<!-- should distribute this into the above components -->
-<unit bldFile="app/speechsrv/srsf/group"/>
-</component>
-</collection>
-<collection name="speechsrv_info" long-name="Speech Recognition UIs Info" level="ui"/>
-</block>
-<block name="homescreentools" level="services" long-name="Home Screen Tools" levels="tool install">
-<collection name="dtdinstaller" long-name="DTD Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<!-- this needs to be built first, does build order need to be forced with filters? -->
-<component name="dtdinstaller_build" filter="s60" long-name="DTD Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/dtdinstaller/group"/>
-</component>
-</collection>
-<collection name="themeinstaller" long-name="Theme Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="themeinstaller_build" filter="s60" long-name="Theme Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/themeinstaller/group"/>
-</component>
-</collection>
-<collection name="widgettools" long-name="Widget Tools" level="install">
-<component name="hspluginpreinstaller" filter="s60" long-name="HS Plugin Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/hspluginspreinstaller/group"/>
-</component>
-<component name="wrtwidgetpreinstaller" filter="s60" long-name="WRT Widget Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
-</component>
-</collection>
-</block>
-<block name="webuis" level="services" long-name="Web UIs" levels="plugin app">
-<collection name="browserui" long-name="Browser UI" level="app">
-<component name="browser" filter="s60" long-name="Browser">
-<unit bldFile="app/webuis/browserui/browser/group"/>
-</component>
-<component name="operatormenu" filter="s60" long-name="Browser Operator Menu">
-<unit bldFile="app/webuis/browserui/operatormenu/group"/>
-</component>
-<component name="videoservices" filter="s60" long-name="Browser Video Services">
-<unit bldFile="app/webuis/browserui/videoservices/group"/>
-</component>
-</collection>
-<collection name="browserplugins" long-name="Browser Plugins" level="plugin">
-<component name="browsersysteminfoplugin" filter="s60" long-name="Browser System Info Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsersysteminfoplugin/group"/>-->
-</component>
-<component name="browsergpsplugin" filter="s60" long-name="Browser GPS Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsergpsplugin/group"/>-->
-</component>
-<component name="browseraudiovideoplugin" filter="s60" long-name="Browser Audio Video Plugin" plugin="Y">
-<unit bldFile="app/webuis/browserplugins/browseraudiovideoplugin/group"/>
-</component>
-<component name="browserplugins_build" filter="s60" long-name="Browser Plugins Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="app/webuis/browserplugins/group"/>
-</component>
-</collection>
-<collection name="pushmtm" long-name="Push MTM" level="plugin">
-<component name="pushmtm_help" filter="s60" long-name="Push MTM Help">
-<unit bldFile="app/webuis/pushmtm/help/group"/>
-</component>
-<component name="plugins" filter="s60" long-name="Push MTM Plugins" plugin="Y">
-<unit bldFile="app/webuis/pushmtm/plugins/group"/>
-</component>
-<component name="pushmtm_build" filter="s60" long-name="Push MTM Build">
-<!-- Some content is at collection level and some is at comopnent level. Either make this a single
- component and move it down a diretcory, or make separate independent components in this collection -->
-<unit bldFile="app/webuis/pushmtm/group"/>
-</component>
-</collection>
-</block>
-<block name="jrt" level="services" long-name="Java Runtime" levels="util generic rt ui">
-<collection name="jrt_plat" long-name="JRT Platform Interfaces" level="ui">
-<component name="java_registry_api" long-name="Java Registry API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_registry_api/build"/>
-</component>
-<component name="java_env_info_api" long-name="Java Environment Info API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_env_info_api/build"/>
-</component>
-<component name="java_debug_api" long-name="Java Debug API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_debug_api/build"/>
-</component>
-</collection>
-<collection name="java_stubs" long-name="Java Stubs" level="util">
-<!-- uncomment all components when configuration is in place. Currently #included from jrt_build -->
-<component name="javadrmutils" long-name="Java DRM Utils" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtdrmutils/group"/>-->
-</component>
-<component name="javaenvinfo" long-name="Java Environment Info" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtenvinfo/group"/>-->
-</component>
-<component name="javaregistry" filter="s60,sf_build" long-name="Java Registry" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtregistry/clientserver/client/group"/>-->
-</component>
-<component name="java_stubs_build" filter="s60,sf_build" long-name="Java Stubs ROM" class="placeholder">
-<!-- Remove the #includes and rename JRT ROM-->
-<!--<unit bldFile="java_stubs/group"/>-->
-</component>
-</collection>
-<collection name="jrt_info" long-name="JRT Info" level="rt">
-<component name="jrt_build" filter="s60" long-name="JRT Build">
-<!-- needed for __JAVA_STUBS condition -->
-<unit bldFile="app/jrt/group"/>
-</component>
-</collection>
-</block>
-<block name="conntools" level="services" long-name="Connectivity Tools" levels="config app">
-<collection name="nettools" long-name="Net Tools" level="app">
-<component name="conntest" filter="s60" long-name="Connection Test" purpose="development">
-<unit bldFile="app/conntools/nettools/conntest/group"/>
-</component>
-</collection>
-<collection name="emulatorlan" long-name="Emulator LAN" level="config">
-<!-- component is actually a colleciton, should be moved down a directory -->
-<component name="emulatorlan_build" filter="s60" long-name="Emulator LAN Build" purpose="development" class="config">
-<unit bldFile="app/conntools/emulatorlan/group"/>
-</component>
-</collection>
-</block>
-<block name="rndtools" level="services" long-name="R&D tools" levels="support generic test util">
-<collection name="creator" long-name="Creator" level="support">
-<!-- collection is really a component. Should move down a directory -->
-<component name="creator_build" filter="s60" long-name="Creator Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/creator/group"/>
-</component>
-</collection>
-<collection name="filebrowser" long-name="File Browser" level="util">
-<!-- consider collapsing into a single component -->
-<component name="fileopserver" filter="s60" long-name="File Operations Server" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
-</component>
-<component name="fileopclient" filter="s60" long-name="File Operations Client" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!--<unit bldFile="filebrowser/fileopclient/group"/>-->
-</component>
-<component name="filebrowser_build" filter="s60" long-name="File Browser Application" purpose="development" class="tool">
-<!-- Need to make this a self-contained component by removing #includes. Can only do when configuration is in place-->
-<unit bldFile="app/rndtools/filebrowser/group"/>
-</component>
-</collection>
-<collection name="launcher" long-name="Launcher" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="launcher_build" filter="s60" long-name="Launcher Utility" purpose="development" class="tool">
-<unit bldFile="app/rndtools/launcher/group"/>
-</component>
-</collection>
-<collection name="loadgen" long-name="Load Generator" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="loadgen_build" filter="s60" long-name="Load Generator Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/loadgen/group"/>
-</component>
-</collection>
-<collection name="perfmon" long-name="Performance Monitor" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="perfmon_build" filter="s60" long-name="Performance Monitor Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/perfmon/group"/>
-</component>
-</collection>
-<collection name="screengrabber" long-name="Screen Grabber" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="screengrabber_build" filter="s60" long-name="ScreenGrabber" purpose="development" class="tool">
-<unit bldFile="app/rndtools/screengrabber/group"/>
-</component>
-</collection>
-<collection name="stifui" long-name="STIF UI" level="generic">
-<component name="stifui_stifui" filter="s60" long-name="STIF UI" purpose="development">
-<unit bldFile="app/rndtools/stifui/stifui/group"/>
-</component>
-<component name="uitestserverstarter" filter="s60" long-name="UI Test Server Starter" purpose="development">
-<unit bldFile="app/rndtools/stifui/uitestserverstarter/group"/>
-</component>
-<component name="stifui_build" filter="s60" long-name="STIF UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/stifui/group"/>
-</component>
-</collection>
-<collection name="memspyui" long-name="Memspy UI" level="generic">
-<!-- collection is really a component. Should move down a directory -->
-<component name="memspyui_build" filter="s60" long-name="Memspy UI Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/memspyui/group"/>
-</component>
-</collection>
-<collection name="htiui" long-name="Harmonized Test Interface UI" level="generic">
-<component name="HtiCommPlugins" filter="s60" long-name="HTI Comm Plugins" purpose="development" plugin="Y">
-<unit bldFile="app/rndtools/htiui/HtiCommPlugins/HtiBtCommPlugin/group"/>
-</component>
-<component name="HtiServicePlugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- can only have a single unit. Should #include from a common bld.inf file -->
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiFtpBackupFake/group"/>
-</component>
-<component name="htidevicereboot" filter="s60" long-name="HTI Device Reboot" purpose="development">
-<unit bldFile="app/rndtools/htiui/htidevicereboot/group"/>
-</component>
-<component name="htistartupwait" filter="s60" long-name="HTI Startup Wait" purpose="development">
-<unit bldFile="app/rndtools/htiui/htistartupwait/group"/>
-</component>
-<component name="htiadmin" filter="s60" long-name="HTI Admin" purpose="development">
-<unit bldFile="app/rndtools/htiui/htiadmin/group"/>
-</component>
-<component name="htiui_build" filter="s60" long-name="HTI UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/htiui/group"/>
-</component>
-</collection>
-</block>
-<block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools if ui">
-<collection name="csxhelp" long-name="Context Sensitive Extended Help" level="if">
-<!-- this is really a component. Should move it down a directory -->
-<component name="csxhelp_build" filter="s60" long-name="Context Sensitive Extended Help Build">
-<unit bldFile="app/helps/csxhelp/group"/>
-</component>
-</collection>
-<collection name="symhelp" long-name="Symbian Help" level="eng">
-<component name="helpmodel" long-name="Help" introduced="6.0" purpose="optional">
-<unit bldFile="app/helps/symhelp/helpmodel/group" mrp="app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
-</component>
-</collection>
-<collection name="helps_info" long-name="Help Apps Info" level="ui">
-<component name="helps_metadata" long-name="Help Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/helps/helps_info/helps_metadata/helps_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
-<collection name="buildverification" long-name="Build Verification" level="services">
-<component name="autosmoketest" long-name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
-<unit bldFile="app/techview/buildverification/autosmoketest/Group" mrp="app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
-</component>
-<component name="smoketest" long-name="Smoke Test" filter="gt" purpose="development">
-<unit bldFile="app/techview/buildverification/smoketest/Group" mrp="app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
-</component>
-</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="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"/>
-<collection name="installationapps" long-name="Installation Apps" level="apps2"/>
-<collection name="messagingapps" long-name="Messaging Apps" level="apps2"/>
-<collection name="telephonyapps" long-name="Telephony Apps" level="apps1"/>
-<collection name="networkingapps" long-name="Networking Apps" level="apps1"/>
-<collection name="networkingutils" long-name="Networking Utils" level="utils"/>
-<collection name="shortlinkapps" long-name="Shortlink Apps" level="apps1"/>
-<collection name="testapps" long-name="Test Apps" level="utils"/>
-<collection name="avapps" long-name="A/V Apps" level="apps3"/>
-<collection name="toolkit" long-name="Toolkit" level="utils"/>
-<collection name="techview_info" long-name="Techview Info" level="apps3">
-<component name="techview_metadata" long-name="Techview Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/techview/techview_info/techview_metadata/techview_metadata.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
--- a/symbian3/single/sysdefs/auto/model_20100413173226_705be3c6488c.xml Wed May 05 12:21:47 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10837 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a package or prebuilt -->
-<!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) "N"
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile may someday be removed in favour of mrp -->
-<!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
-<systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="low mw high">
-<block name="stubs" level="high" long-name="Stubs" levels="stub">
-<collection name="s60_stubs" level="stub">
-<component name="audiostubs" long-name="Audio Stubs">
-<unit bldFile="adaptation/stubs/audiostubs/group"/>
-</component>
-<component name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaptation Stub">
-<unit bldFile="adaptation/stubs/btaudioadaptation_stub/group"/>
-</component>
-<component name="drm_stubs" long-name="DRM Stubs">
-<unit bldFile="adaptation/stubs/drm_stubs/group"/>
-</component>
-<component name="ocrsrv_stub" long-name="OCR Services Stub">
-<unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
-</component>
-<component name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation">
-<unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
-</component>
-<component name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" plugin="Y">
-<unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
-</component>
-<component name="srsfenginestub" long-name="SRSF Engine Stub">
-<unit bldFile="adaptation/stubs/srsfenginestub/group"/>
-</component>
-<component name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub">
-<unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
-</component>
-<component name="systemswstubs" long-name="System Software Stubs">
-<unit bldFile="adaptation/stubs/systemswstubs/group"/>
-</component>
-<component name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" plugin="Y">
-<unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
-</component>
-<component name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub">
-<unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
-<collection name="omap3530" long-name="OMAP 3530" level="hw-if">
-<component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530" mrp="adaptation/beagleboard/omap3530/base_beagle.mrp"/>
-</component>
-<component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/kernel"/>
-</component>
-<component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/beagleboard"/>
-</component>
-</collection>
-</block>
-<block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
-<collection name="qemu_baseport" long-name="Baseport" level="hw-if">
-<component name="syborg" long-name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/qemu/baseport/syborg" mrp="adaptation/qemu/baseport/syborg/syborg.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
-<collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
-<component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
-<unit mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
-</component>
-</collection>
-<collection name="bsptemplate" long-name="Board Support Package Template" level="hw-if">
-<component name="asspandvariant" long-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 name="kernel" long-name="Kernel Architecture" level="adaptation">
-<component name="eka" long-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 name="kerneltest" long-name="Kernel Test" level="hw-if">
-<component name="e32utils" long-name="E32 Utilities" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32utils/group" mrp="os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/>
-</component>
-<component name="e32test" long-name="E32 Tests" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32test/group" mrp="os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
-</component>
-<component name="f32test" long-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 name="ldds" long-name="Logical Device Drivers" level="adaptation">
-<component name="ethernetldd" long-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 name="audioldd" long-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>
-<component name="serialldd" long-name="Serial Port Drivers" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
-</component>
-<component name="legacydrivers" long-name="Legacy Drivers" purpose="optional">
-<unit mrp="os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
-</component>
-<component name="locmedia" long-name="Local Media Subsystem" introduced="8.1b" purpose="mandatory">
-<!-- these are LDDs for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
-</component>
-<component name="runmodedebugger" long-name="Run Mode Debugger" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/debug/group" mrp="os/kernelhwsrv/kernel/eka/drivers/debug/group/base_e32_drivers_debug.mrp"/>
-</component>
-<component name="btrace" long-name="Kernel Trace Tool" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/trace" mrp="os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
-</component>
-<component name="cameraldd" long-name="Camera Drivers" introduced="^3" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/camerasc" mrp="os/kernelhwsrv/kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
-</component>
-<component name="displayldd" long-name="Display Drivers" introduced="^3" purpose="optional">
-<!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/display" mrp="os/kernelhwsrv/kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
-</component>
-<component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
-</component>
-</collection>
-<collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
-<component name="mediadrivers" long-name="Media Drivers" purpose="optional">
-<!-- these are for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/media" mrp="os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
-</component>
-<component name="genericboardsupport" long-name="Generic Board Support" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
-</component>
-</collection>
-<collection name="userlibandfileserver" long-name="User Library and File Server" level="framework">
-<component name="euser" long-name="User Library" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/euser" mrp="os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
-</component>
-<component name="compsupp" long-name="Compiler Runtime Support" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/compsupp" mrp="os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
-</component>
-<component name="fileserver" long-name="File Server" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
-</component>
-<component name="estart" long-name="Base Starter" filter="gt" purpose="optional">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
-</component>
-<component name="domainmgr" long-name="Domain Manager" introduced="8.1b" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
-</component>
-</collection>
-<collection name="filesystems" long-name="File Systems" level="framework">
-<component name="romfs" long-name="ROM File System" filter="gt" purpose="optional" plugin="Y">
-<unit mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
-</component>
-<component name="rofs" long-name="ROFS" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
-</component>
-<component name="usbmsfs" long-name="USB Mass Storage File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
-</component>
-<component name="usbhostmssrv" long-name="USB Host Mass Storage Server" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage/base_f32_shostmassstorage.mrp"/>
-</component>
-<component name="fat32fs" long-name="FAT32 File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
-</component>
-<component name="fatfs" long-name="FAT File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
-</component>
-<component name="compfs" long-name="Composite File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
-</component>
-</collection>
-<collection name="halservices" long-name="HAL Services" level="framework">
-<component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
-<unit bldFile="os/kernelhwsrv/halservices/hal" mrp="os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
-</component>
-</collection>
-<collection name="textmodeshell" long-name="Text Mode Shell" level="test">
-<component name="e32wsrv" long-name="Text Window Server" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/ewsrv" mrp="os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
-</component>
-<component name="textshell" long-name="Text Shell" filter="gt" purpose="development">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
-</component>
-</collection>
-<collection name="baseapitest" long-name="Base API Tests" level="test"/>
-<collection name="kernelhwsrv_info" long-name="Kernel and Hardware Services Info" level="test">
-<component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 config">
-<collection name="emulator" long-name="Emulator" level="bsp">
-<component name="emulatorbsp" long-name="Emulator BSP" purpose="optional">
-<unit bldFile="os/boardsupport/emulator/emulatorbsp" mrp="os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
-</component>
-</collection>
-<collection name="haitest" long-name="HAI Test Suites" level="test">
-<component name="bspsvs" long-name="BSP Verification Suite" introduced="^2" purpose="development">
-<unit mrp="os/boardsupport/haitest/bspsvs/group/bspsvs.mrp"/>
-</component>
-</collection>
-<collection name="boardsupport_info" long-name="Board Support Info" level="config">
-<component name="boardsupport_metadata" long-name="Board Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/boardsupport/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
-<collection name="bldsystemtools" long-name="Build System Tools" level="bld">
-<component name="sysdeftools" long-name="System Definition Tools" purpose="development" introduced="^2">
-<unit mrp="os/buildtools/bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
-</component>
-<component name="commonbldutils" long-name="Common Utils" purpose="development">
-<unit mrp="os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
-</component>
-</collection>
-<collection name="toolsandutils" long-name="Tools and Utils" level="mw">
-<component name="productionbldtools" long-name="Production Build Tools" filter="gt" purpose="development">
-<unit mrp="os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
-</component>
-<component name="e32tools" long-name="E32 Tools" deprecated="^2" purpose="development" class="PC">
-<unit bldFile="os/buildtools/toolsandutils/e32tools/group" mrp="os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
-</component>
-<component name="autotest" long-name="Autotest" purpose="development">
-<unit bldFile="os/buildtools/toolsandutils/autotest/group" mrp="os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
-</component>
-</collection>
-<collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
-<component name="e32toolp" long-name="E32 Perl Tools" purpose="development" filter="sf_build" class="PC">
-<unit mrp="os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="os/buildtools/sbsv1_os/e32toolp/group"/>
-</component>
-</collection>
-<collection name="imgtools_os" long-name="Image Tools" level="fw">
-<component name="romkiteka2" long-name="ROMKIT EKA2" deprecated="^2" purpose="development">
-<unit bldFile="os/buildtools/imgtools_os/romkiteka2/group" mrp="os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
-</component>
-</collection>
-<collection name="misccomponents" long-name="Misc Components" level="mw">
-<component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt" purpose="development">
-<unit bldFile="os/buildtools/misccomponents/emulatorlauncher/group" mrp="os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
-</component>
-</collection>
-<collection name="buildtools_info" long-name="Build Tools Info" level="ui">
-<component name="buildtools_metadata" long-name="Build Tools Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/buildtools/buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
-<collection name="ossrv_pub" long-name="Generic OS Services Public Interfaces" level="utilities">
-<component name="boost_apis" long-name="Boost APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/boost_apis/group"/>
-</component>
-<component name="cpp_wrappers" long-name="Cpp wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cpp_wrappers/group"/>
-</component>
-<component name="character_type_apis" long-name="Character Type APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/character_type_apis/group"/>
-</component>
-<component name="compiler_specific_runtime_support" long-name="Compiler Specific Runtime Support" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/compiler_specific_runtime_support/group"/>
-</component>
-<component name="ossrv_configuration_api" long-name="Generic OS Services Configuration API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/configuration/group"/>
-</component>
-<component name="crypto_authentication_codes_and_hash_functions_api" long-name="Crypto Authentication Codes and Hash Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
-</component>
-<component name="crypto_auxillary_functions_api" long-name="Crypto Auxillary Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_auxillary_functions_api/group"/>
-</component>
-<component name="crypto_certificates_api" long-name="Crypto Certificates API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_certificates_api/group"/>
-</component>
-<component name="crypto_inputoutput_and_data_encoding_api" long-name="Crypto Input/Output and Data Encoding API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
-</component>
-<component name="crypto_public_key_cryptography_and_key_agreement_api" long-name="Crypto Public Key Cryptography and Key Agreement API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
-</component>
-<component name="crypto_symmetric_ciphers_api" long-name="Crypto Symmetric Ciphers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_symmetric_ciphers_api/group"/>
-</component>
-<component name="crypto_utility_functions_api" long-name="Crypto Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_utility_functions_api/group"/>
-</component>
-<component name="cryptogaphy_related_api" long-name="Cryptogaphy Related API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cryptogaphy_related_api/group"/>
-</component>
-<component name="ossrv_debug_api" long-name="Generic OS Services Debug API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/debug/group"/>
-</component>
-<component name="ossrv_exceptions_api" long-name="Generic OS Services Exceptions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/exceptions/group"/>
-</component>
-<component name="gboxed" long-name="GBoxed API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gboxed/group"/>
-</component>
-<component name="glib_arrays" long-name="Glib Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_arrays/group"/>
-</component>
-<component name="glib_asynchronous_queues" long-name="Glib Asynchronous Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_asynchronous_queues/group"/>
-</component>
-<component name="glib_atomic_operations" long-name="Glib Atomic Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_atomic_operations/group"/>
-</component>
-<component name="glib_automatic_string_completion" long-name="Glib Automatic String Completion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_automatic_string_completion/group"/>
-</component>
-<component name="glib_balanced_binary_trees" long-name="Glib Balanced Binary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_balanced_binary_trees/group"/>
-</component>
-<component name="glib_basic_types" long-name="Glib Basic Types API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_basic_types/group"/>
-</component>
-<component name="glib_caches" long-name="Glib Caches API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_caches/group"/>
-</component>
-<component name="glib_character_set_conversion" long-name="Glib Character Set Conversion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_character_set_conversion/group"/>
-</component>
-<component name="glib_closures" long-name="Glib Closures API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_closures/group"/>
-</component>
-<component name="glib_commandline_option_parser" long-name="Glib Command Line Option Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_commandline_option_parser/group"/>
-</component>
-<component name="glib_datasets" long-name="Glib Datasets API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_datasets/group"/>
-</component>
-<component name="glib_date_and_time_functions" long-name="Glib Date and Time Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_date_and_time_functions/group"/>
-</component>
-<component name="glib_doubleended_queues" long-name="Glib Double-ended Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doubleended_queues/group"/>
-</component>
-<component name="glib_doublylinked_lists" long-name="Glib Doubly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doublylinked_lists/group"/>
-</component>
-<component name="glib_dynamic_loading_of_modules" long-name="Glib Dynamic Loading of Modules API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_dynamic_loading_of_modules/group"/>
-</component>
-<component name="glib_enums_and_flags" long-name="Glib Enums and Flags API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_enums_and_flags/group"/>
-</component>
-<component name="glib_error_reporting" long-name="Glib Error Reporting API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_error_reporting/group"/>
-</component>
-<component name="glib_file_utilities" long-name="Glib File Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_file_utilities/group"/>
-</component>
-<component name="glib_generic_values" long-name="Glib Generic Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_generic_values/group"/>
-</component>
-<component name="glib_globstyle_pattern_matching" long-name="Glib Glob-Style Pattern Matching API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_globstyle_pattern_matching/group"/>
-</component>
-<component name="glib_hash_tables" long-name="Glib Hash Tables API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hash_tables/group"/>
-</component>
-<component name="glib_hook_functions" long-name="Glib Hook Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hook_functions/group"/>
-</component>
-<component name="glib_internationalization" long-name="Glib Internationalization API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_internationalization/group"/>
-</component>
-<component name="glib_io_channels" long-name="Glib I/O Channels API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_io_channels/group"/>
-</component>
-<component name="glib_keyvalue_file_parser" long-name="Glib Key-Value File Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_keyvalue_file_parser/group"/>
-</component>
-<component name="glib_lexical_scanner" long-name="Glib Lexical Scanner API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_lexical_scanner/group"/>
-</component>
-<component name="glib_main_event_loop" long-name="Glib Main Event Loop API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_main_event_loop/group"/>
-</component>
-<component name="glib_memory_allocation" long-name="Glib Memory Allocation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_allocation/group"/>
-</component>
-<component name="glib_memory_slices" long-name="Glib Memory Slices API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_slices/group"/>
-</component>
-<component name="glib_message_logging" long-name="Glib Message Logging API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_message_logging/group"/>
-</component>
-<component name="glib_miscellaneous_utility_functions" long-name="Glib Miscellaneous Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_miscellaneous_utility_functions/group"/>
-</component>
-<component name="glib_nary_trees" long-name="Glib N-ary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_nary_trees/group"/>
-</component>
-<component name="glib_parameters_and_values" long-name="Glib Parameters and Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_parameters_and_values/group"/>
-</component>
-<component name="glib_quarks" long-name="Glib Quarks API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_quarks/group"/>
-</component>
-<component name="glib_random_numbers" long-name="Glib Random Numbers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_random_numbers/group"/>
-</component>
-<component name="glib_relations_and_tuples" long-name="Glib Relations and Tuples API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_relations_and_tuples/group"/>
-</component>
-<component name="glib_shellrelated_utilities" long-name="Glib Shell-related Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_shellrelated_utilities/group"/>
-</component>
-<component name="glib_signals" long-name="Glib Signals API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_signals/group"/>
-</component>
-<component name="glib_simple_xml_subset_parser" long-name="Glib Simple XML Subset Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_simple_xml_subset_parser/group"/>
-</component>
-<component name="glib_singlylinked_lists" long-name="Glib Singly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_singlylinked_lists/group"/>
-</component>
-<component name="glib_spawning_processes" long-name="Glib Spawning Processes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_spawning_processes/group"/>
-</component>
-<component name="glib_standard_macros" long-name="Glib Standard Macros API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_standard_macros/group"/>
-</component>
-<component name="glib_string_utility_functions" long-name="Glib String Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_string_utility_functions/group"/>
-</component>
-<component name="glib_strings" long-name="Glib Strings API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_strings/group"/>
-</component>
-<component name="glib_thread_pools" long-name="Glib Thread Pools API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_thread_pools/group"/>
-</component>
-<component name="glib_threads" long-name="Glib Threads API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_threads/group"/>
-</component>
-<component name="glib_timers" long-name="Glib Timers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_timers/group"/>
-</component>
-<component name="glib_unicode_manipulation" long-name="Glib Unicode Manipulation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_unicode_manipulation/group"/>
-</component>
-<component name="glib_value_arrays" long-name="Glib Value Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_value_arrays/group"/>
-</component>
-<component name="glib_varargs_value_collection" long-name="Glib Varargs Value Collection API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_varargs_value_collection/group"/>
-</component>
-<component name="gobject" long-name="GObject API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gobject/group"/>
-</component>
-<component name="gparamspec" long-name="GParamSpec API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gparamspec/group"/>
-</component>
-<component name="gtype" long-name="GType API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtype/group"/>
-</component>
-<component name="gtypemodule" long-name="GTypeModule API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypemodule/group"/>
-</component>
-<component name="gtypeplugin" long-name="GTypePlugin API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypeplugin/group"/>
-</component>
-<component name="io_stream_api" long-name="I/O stream API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/io_stream_api/group"/>
-</component>
-<component name="localization_function_api" long-name="Localization Function API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/localization_function_api/group"/>
-</component>
-<component name="math_operations_api" long-name="Math Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/math_operations_api/group"/>
-</component>
-<component name="ossrv_memory_api" long-name="Generic OS Services Memory API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/memory/group"/>
-</component>
-<component name="no_namespace_headers" long-name="No Namespace Headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/no_namespace_headers/group"/>
-</component>
-<component name="openc_headers" long-name="OpenC headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_headers/group"/>
-</component>
-<component name="openc_wrappers" long-name="OpenC wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_wrappers/group"/>
-</component>
-<component name="ssl_general_api" long-name="SSL General API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_general_api/group"/>
-</component>
-<component name="ssl_protocol_methods_api" long-name="SSL Protocol Methods API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_protocol_methods_api/group"/>
-</component>
-<component name="standard_compressiondecompression_api" long-name="Standard Compression/Decompression API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/standard_compressiondecompression_api/group"/>
-</component>
-<component name="stl" long-name="STL API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/stl/group"/>
-</component>
-<component name="thread_api" long-name="Thread API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/thread_api/group"/>
-</component>
-<component name="type_attributes" long-name="Type Attributes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/type_attributes/group"/>
-</component>
-<component name="typeinfo" long-name="Type Info API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/typeinfo/group"/>
-</component>
-<component name="utility_apis" long-name="Utility APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/utility_apis/group"/>
-</component>
-<component name="wide_character_classapis" long-name="Wide character class/apis" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/wide_character_classapis/group"/>
-</component>
-<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">
-<unit bldFile="os/ossrv/ossrv_pub/dbus-glib/group"/>
-</component>
-</collection>
-<collection name="ossrv_plat" long-name="Generic OS Services Platform Interfaces" level="utilities">
-<component name="libutils_apis" long-name="Utility Library APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_plat/libutils/group"/>
-</component>
-</collection>
-<collection name="stdlibs" long-name="Standard Libraries" level="translation">
-<component name="libz" filter="s60" long-name="Z Compression Library">
-<unit bldFile="os/ossrv/stdlibs/libz/group"/>
-</component>
-<component name="libcrypt" filter="s60" long-name="Crypt Library">
-<unit bldFile="os/ossrv/stdlibs/libcrypt/group"/>
-</component>
-</collection>
-<collection name="ssl" long-name="SSL" level="data-services">
-<component name="libcrypto" filter="s60" long-name="Crypto Library">
-<unit bldFile="os/ossrv/ssl/libcrypto/group"/>
-</component>
-<component name="libssl" filter="s60" purpose="development" long-name="SSL Library">
-<unit bldFile="os/ossrv/ssl/libssl/group"/>
-</component>
-</collection>
-<collection name="glib" long-name="GLib" level="utilities">
-<component name="glibbackend" filter="s60" long-name="GLib Backend">
-<unit bldFile="os/ossrv/glib/glibbackend/group"/>
-</component>
-<component name="libglib" filter="s60" long-name="GLib Library">
-<unit bldFile="os/ossrv/glib/libglib/group"/>
-</component>
-<component name="libgthread" filter="s60" long-name="Libg Thread">
-<unit bldFile="os/ossrv/glib/libgthread/group"/>
-</component>
-<component name="libgmodule" filter="s60" long-name="Libg Module">
-<unit bldFile="os/ossrv/glib/libgmodule/group"/>
-</component>
-<component name="libgobject" filter="s60" long-name="Libg Object">
-<unit bldFile="os/ossrv/glib/libgobject/group"/>
-</component>
-</collection>
-<collection name="stdcpp" long-name="C++ Standard Library" level="translation">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="stdcpp_build" filter="s60" long-name="Stdcpp">
-<unit bldFile="os/ossrv/stdcpp/group"/>
-</component>
-</collection>
-<collection name="ofdbus" long-name="Open Foundation D-Bus" level="utilities">
-<component name="dbus" filter="s60" long-name="D-Bus">
-<unit bldFile="os/ossrv/ofdbus/dbus/group"/>
-</component>
-<component name="dbus-glib" filter="s60" long-name="D-Bus GLib">
-<unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
-</component>
-<component name="ofdbus_rom" filter="s60" long-name="D-Bus ROM">
-<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory
- Consider moving IBY file to one of the above as well and removing this component entirely -->
-<unit bldFile="os/ossrv/ofdbus/group"/>
-</component>
-</collection>
-<collection name="utilitylibraries" long-name="Utility Libraries" level="encoding">
-<component name="libutils" filter="s60" long-name="Utility Library">
-<unit bldFile="os/ossrv/utilitylibraries/libutils/group"/>
-</component>
-</collection>
-<collection name="genericservices" long-name="Generic Services" level="utilities">
-<component name="s60compatibilityheaders" long-name="S60 Compatibility Headers" filter="gt" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp" version="tb101sf"/>
-</component>
-<component name="mimerecognitionfw" long-name="MIME Recognition Framework" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/mimerecognitionfw/group" mrp="os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
-</component>
-<component name="systemagent" long-name="System Agent" introduced="9.0" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/systemagent/group" mrp="os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
-</component>
-<component name="taskscheduler" long-name="Task Scheduler" introduced="6.0" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/taskscheduler/group" mrp="os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
-</component>
-<component name="activebackupclient" long-name="Active Backup Client" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/activebackupclient/group" mrp="os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
-</component>
-<component name="syslibsdocs" long-name="Syslibs Documentation" purpose="development" class="doc">
-<unit mrp="os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
-</component>
-<component name="httputils" long-name="HTTP Utilities Library" introduced="6.2" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/httputils/group" mrp="os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
-</component>
-</collection>
-<collection name="syslibsapitest" long-name="SysLibs API Tests" level="utilities"/>
-<collection name="compressionlibs" long-name="Compression Libraries" level="data-services">
-<component name="ziplib" long-name="Zip Compression Library" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/ossrv/compressionlibs/ziplib/group" mrp="os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
-</component>
-</collection>
-<collection name="genericopenlibs" long-name="Generic Open Libraries" level="translation">
-<component name="cstdlib" long-name="C Standard Library" introduced="ER5" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/cstdlib/group" mrp="os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
-</component>
-<component name="cppstdlib" long-name="C++ Standard Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/cppstdlib/group" mrp="os/ossrv/genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
-</component>
-<component name="openenvcore" long-name="Open Environment Core" introduced="^2" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/openenvcore/group" mrp="os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
-</component>
-<component name="posixrealtimeextensions" long-name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/posixrealtimeextensions/group" mrp="os/ossrv/genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
-</component>
-</collection>
-<collection name="lowlevellibsandfws" long-name="Low Level Libraries and Frameworks" level="app-libs">
-<component name="pluginfw" long-name="Plugin Framework" introduced="6.2" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp" version="3"/>
-</component>
-<component name="apputils" long-name="Application Utilities" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/apputils/group" mrp="os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
-</component>
-<component name="genericusabilitylib" long-name="Generic Usability Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/genericusabilitylib/group" mrp="os/ossrv/lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
-</component>
-</collection>
-<collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
-<component name="ossrv_build" filter="s60" long-name="Generic OS Services Build">
-<!-- exports should be moved to individual components -->
-<unit bldFile="os/ossrv/group"/>
-</component>
-<component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="featuremgmt" long-name="Feature Management" level="framework">
-<component name="featuremgr" long-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 name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/persistentdata/featuremgmt/featureregistry/group" mrp="os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
-</component>
-</collection>
-<collection name="loggingservices" long-name="Logging Services" level="server">
-<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">
-<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">
-<unit bldFile="os/persistentdata/loggingservices/rfilelogger/group" mrp="os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
-</component>
-</collection>
-<collection name="traceservices" long-name="Trace Services" level="server">
-<component name="commsdebugutility" long-name="Comms Debug Utility" introduced="7.0s" purpose="optional">
-<unit bldFile="os/persistentdata/traceservices/commsdebugutility/group" mrp="os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
-</component>
-<component name="tracefw" long-name="Trace Framework" introduced="9.2" purpose="development">
-<unit bldFile="os/persistentdata/traceservices/tracefw/ulogger/group" mrp="os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
-</component>
-</collection>
-<collection name="persistentstorage" long-name="Persistent Storage" level="framework">
-<component name="store" long-name="Store" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/store/group" mrp="os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
-</component>
-<component name="dbms" long-name="DBMS" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/dbms/group" mrp="os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
-</component>
-<component name="centralrepository" long-name="Central Repository" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/persistentdata/persistentstorage/centralrepository/group" mrp="os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
-</component>
-<component name="sql" long-name="SQL" introduced="9.3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sql/GROUP" mrp="os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
-</component>
-<component name="sqlite3api" long-name="SQLite 3 API" introduced="^3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sqlite3api/GROUP" mrp="os/persistentdata/persistentstorage/sqlite3api/GROUP/syslibs_sqlite3.mrp"/>
-</component>
-</collection>
-<collection name="persistentdata_info" long-name="Persistent Data Services Info" level="app-if">
-<component name="persistentdata_metadata" long-name="Persistent Data Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/persistentdata/persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
-<component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
-</component>
-<component name="common_platform_security_definitions_api" long-name="Common Platform Security Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group"/>
-</component>
-<component name="feature_discovery_api" long-name="Feature Discovery API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/group"/>
-</component>
-<component name="platform_environment_api" long-name="Platform Environment API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_environment_api/group"/>
-</component>
-<component name="sensor_channel_api" long-name="Sensor Channel API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_channel_api/group"/>
-</component>
-<component name="sensor_definitions_api" long-name="Sensor Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_definitions_api/group"/>
-</component>
-<component name="version_info_api" long-name="Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/group"/>
-</component>
-<component name="accessory_monitoring_api" long-name="Accessory Monitoring API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/group"/>
-</component>
-<component name="haptics_api" long-name="Haptics API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/haptics_api/group"/>
-</component>
-<component name="sensor_data_compensator_api" long-name="Sensor Data Compensator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
-</component>
-</collection>
-<collection name="devicesrv_plat" long-name="Device Services Platform Interfaces" level="app-if">
-<component name="configuration_file_parser_api" long-name="Configuration File Parser API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/configuration_file_parser_api/group"/>
-</component>
-<component name="dos_extension_plugin_api" long-name="DOS Extension Plug-In API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_plugin_api/group"/>
-</component>
-<component name="mediator_command_initiator_api" long-name="Mediator Command Initiator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_initiator_api/group"/>
-</component>
-<component name="syslangutil_api" long-name="SysLangUtil API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/syslangutil_api/group"/>
-</component>
-<component name="wakeup_alarm_api" long-name="Wakeup Alarm API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/wakeup_alarm_api/group"/>
-</component>
-<component name="disk_and_memory_level_keys_api" long-name="Disk and Memory Level Keys API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_and_memory_level_keys_api/group"/>
-</component>
-<component name="mediator_plugin_api" long-name="Mediator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_plugin_api/group"/>
-</component>
-<component name="headset_status_api" long-name="Headset Status API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/headset_status_api/group"/>
-</component>
-<component name="system_startup_extension_plugin_api" long-name="System Startup Extension Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/system_startup_extension_plugin_api/group"/>
-</component>
-<component name="sensor_plugin_api" long-name="Sensor Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_plugin_api/group"/>
-</component>
-<component name="accessory_api" long-name="Accessory API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_api/group"/>
-</component>
-<component name="display_language_definition_api" long-name="Display Language Definition API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/display_language_definition_api/group"/>
-</component>
-<component name="mediator_command_responder_api" long-name="Mediator Command Responder API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_responder_api/group"/>
-</component>
-<component name="accessory_policy_definitions_api" long-name="Accessory Policy Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_definitions_api/group"/>
-</component>
-<component name="hw_settings_api" long-name="Hardware Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/hw_settings_api/group"/>
-</component>
-<component name="mediator_domain_definitions_api" long-name="Mediator Domain Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_domain_definitions_api/group"/>
-</component>
-<component name="sensor_extension_api" long-name="Sensor Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_extension_api/group"/>
-</component>
-<component name="accessory_plugin_api" long-name="Accessory Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_plugin_api/group"/>
-</component>
-<component name="sae_api" long-name="SAE API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sae_api/group"/>
-</component>
-<component name="accessory_control_api" long-name="Accessory Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_control_api/group"/>
-</component>
-<component name="mediator_static_registration_api" long-name="Mediator Static Registration API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_static_registration_api/group"/>
-</component>
-<component name="accessory_key_event_handling_api" long-name="Accessory Key Event Handling API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_key_event_handling_api/group"/>
-</component>
-<component name="mediator_notification_api" long-name="Mediator Notification API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_notification_api/group"/>
-</component>
-<component name="accessory_policy_utility_api" long-name="Accessory Policy Utility API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_utility_api/group"/>
-</component>
-<component name="common_dsy_plugin_api" long-name="Common DSY Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/common_dsy_plugin_api/group"/>
-</component>
-<component name="remote_control_extension_api" long-name="Remote Control Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/remote_control_extension_api/group"/>
-</component>
-<component name="sensor_channel_filter_api" long-name="Sensor Channel Filter API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_channel_filter_api/group"/>
-</component>
-<component name="dos_extension_api" long-name="DOS Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_api/group"/>
-</component>
-<component name="accessory_audio_control_api" long-name="Accessory Audio Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_audio_control_api/group"/>
-</component>
-<component name="mediator_event_consumer_api" long-name="Mediator Event Consumer API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_consumer_api/group"/>
-</component>
-<component name="shared_data_api" long-name="Shared Data API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/shared_data_api/group"/>
-</component>
-<component name="accessory_settings_api" long-name="Accessory Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_settings_api/group"/>
-</component>
-<component name="accessory_bluetooth_control_api" long-name="Accessory Bluetooth Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_bluetooth_control_api/group"/>
-</component>
-<component name="extended_version_info_api" long-name="Extended Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_api/group"/>
-</component>
-<component name="mediator_event_provider_api" long-name="Mediator Event Provider API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_provider_api/group"/>
-</component>
-<component name="tv_out_config_api" long-name="TV Out Config API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_config_api/group"/>
-</component>
-<component name="tspclientmapper_api" long-name="TSP Client Mapper API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tspclientmapper_api/group"/>
-</component>
-<component name="powersave_api" long-name="Power Save API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_api/group"/>
-</component>
-<component name="powersave_definitions_api" long-name="Power Save Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_definitions_api/group"/>
-</component>
-<component name="powersave_plugin_api" long-name="Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_plugin_api/group"/>
-</component>
-<component name="extended_version_info_plugin_api" long-name="Extended Version Info Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_plugin_api/group"/>
-</component>
-<component name="haptics_plugin_api" long-name="Haptics Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_plugin_api/group"/>
-</component>
-<component name="haptics_effect_data_getter_plugin_api" long-name="Haptics Effect Data Getter Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
-</component>
-<component name="haptics_packetizer_plugin_api" long-name="Haptics Packetizer Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_packetizer_plugin_api/group"/>
-</component>
-<component name="tiltcompensation_api" long-name="Tilt Compensation API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tiltcompensation_api/group"/>
-</component>
-<component name="disk_notification_handler_api" long-name="Disk Notification Handler API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_notification_handler_api/group"/>
-</component>
-<component name="accessory_policy_usb_audio_api" long-name="Accessory Policy USB Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_usb_audio_api/group"/>
-</component>
-<component name="accessory_policy_hdmi_audio_api" long-name="Accessory Policy HDMI Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_hdmi_audio_api/group"/>
-</component>
-<component name="sensor_data_compensator_plugin_api" long-name="Sensor Data Compensator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
-</component>
-<component name="ddc_access_api" long-name="DDC Access API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/ddc_access_api/group"/>
-</component>
-<component name="tv_out_behaviour_api" long-name="TV Out Behaviour API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_behaviour_api/group"/>
-</component>
-</collection>
-<collection name="accessoryservices" long-name="Accessory Services" level="framework">
-<component name="accessorymonitor" filter="s60" long-name="Accessory Monitor">
-<unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/group"/>
-</component>
-<component name="accessoryremotecontrol" filter="s60" long-name="Accessory Remote Control">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
-</component>
-<component name="accessoryserver" filter="s60" long-name="Accessory Server">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryserver/group"/>
-</component>
-<component name="pluggeddisplay" filter="s60" long-name="Plugged Display" introduced="^3">
-<unit bldFile="os/devicesrv/accessoryservices/pluggeddisplay/group"/>
-</component>
-<component name="headsetstatusapi" filter="s60" long-name="Headset Status API">
-<unit bldFile="os/devicesrv/accessoryservices/headsetstatusapi/group"/>
-</component>
-<component name="tspclientmapper" filter="s60" long-name="TSP Client Mapper">
-<unit bldFile="os/devicesrv/accessoryservices/tspclientmapper/group"/>
-</component>
-<component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional">
-<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
-</component>
-<component name="gid_pc_tool" filter="s60" long-name="Generic ID PC Tool" class="tool PC">
-<unit bldFile="os/devicesrv/accessoryservices/gid_pc_tool/group"/>
-</component>
-</collection>
-<collection name="commonservices" long-name="Common Services" level="app-if">
-<component name="commonengine" filter="s60" long-name="Common Engine">
-<unit bldFile="os/devicesrv/commonservices/commonengine/group"/>
-</component>
-<component name="commonengineresources" filter="s60" long-name="Common Engine Resources" class="config">
-<unit bldFile="os/devicesrv/commonservices/commonengineresources/group"/>
-</component>
-<component name="platformenv" filter="s60" long-name="Platform Environment">
-<unit bldFile="os/devicesrv/commonservices/platformenv/group"/>
-</component>
-<component name="sysutil" long-name="System Utilities" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/sysutil/group" mrp="os/devicesrv/commonservices/sysutil/group/sysutil.mrp"/>
-</component>
-<component name="activitymanager" long-name="Activity Manager" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/activitymanager/group" mrp="os/devicesrv/commonservices/activitymanager/group/activitymanager.mrp"/>
-</component>
-</collection>
-<collection name="dosservices" long-name="Domestic Operating System Services" level="hw-if">
-<component name="commondsy" filter="s60" long-name="Common DSY" plugin="Y">
-<unit bldFile="os/devicesrv/dosservices/commondsy/group"/>
-</component>
-<component name="dosserver" filter="s60" long-name="Domestic OS Server">
-<unit bldFile="os/devicesrv/dosservices/dosserver/group"/>
-</component>
-</collection>
-<collection name="sensorservices" long-name="Sensor Services" level="framework">
-<component name="sensorserver" filter="s60" long-name="Sensor Server">
-<unit bldFile="os/devicesrv/sensorservices/sensorserver/group"/>
-</component>
-<component name="orientationssy" filter="s60" long-name="Orientation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/orientationssy/group"/>
-</component>
-<component name="tiltcompensationssy" filter="s60" long-name="Tilt Compensation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/tiltcompensationssy/group"/>
-</component>
-<component name="sensordatacompensator" filter="s60" long-name="Sensor Data Compensator">
-<unit bldFile="os/devicesrv/sensorservices/sensordatacompensator/group"/>
-</component>
-</collection>
-<collection name="hwrmhaptics" long-name="HWRM Haptics" level="plugin">
-<component name="hapticseffectdatagetterfw" filter="s60" long-name="Haptics Effect Data Getter Framework">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
-</component>
-<component name="hapticspluginservice" filter="s60" long-name="Haptics Plugin Service">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
-</component>
-<component name="hapticspacketizer" filter="s60" long-name="Haptics Packetizer">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
-</component>
-<component name="hapticspluginmanager" filter="s60" long-name="Haptics Plugin Manager">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
-</component>
-<component name="hapticsserver" filter="s60" long-name="Haptics Server">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsserver/group"/>
-</component>
-<component name="hapticsclient" filter="s60" long-name="Haptics Client">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsclient/group"/>
-</component>
-<component name="hwrmhaptics_build" filter="s60" long-name="HWRM Haptics Build">
-<!-- move these exports into the appropriate above components and delete this component-->
-<unit bldFile="os/devicesrv/hwrmhaptics/group"/>
-</component>
-</collection>
-<collection name="mediator" long-name="Mediator" level="app-if">
-<!--collection is really a component. Move it down a directory -->
-<component name="mediator_build" filter="s60" long-name="Mediator Build">
-<unit bldFile="os/devicesrv/mediator/group"/>
-</component>
-</collection>
-<collection name="psmservices" long-name="Power Save Mode Services" level="app-if">
-<component name="psmserver" filter="s60" long-name="PSM Server">
-<unit bldFile="os/devicesrv/psmservices/psmserver/group"/>
-</component>
-</collection>
-<collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
-<component name="hwrmfmtxwatcherplugin" filter="s60" long-name="HWRM FM Transmitter Watcher Plugin" plugin="Y">
-<unit bldFile="os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
-</component>
-<component name="hwrmtargetmodifierplugin" filter="s60" long-name="HWRM Target Modifier Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build,
- may need to -->
-<!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
-</component>
-<component name="vibractrl" filter="s60" long-name="Vibra Control" deprecated="9.1">
-<unit bldFile="os/devicesrv/resourcemgmt/vibractrl/group"/>
-</component>
-<component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="^2" purpose="optional">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
-</component>
-<component name="hwresourcesmgrconfig" long-name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
-</component>
-<component name="resourcemgmt_build" filter="s60" long-name="Resource Management Build">
-<!-- Move exports to a self-contained component.
- This needs to be kept around until configuration is in place -->
-<unit bldFile="os/devicesrv/resourcemgmt/group"/>
-</component>
-<component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
-</component>
-</collection>
-<collection name="sysstatemgmt" long-name="System State Management" level="server">
-<component name="ssmmapperutility" filter="s60" long-name="SSM Mapper Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmmapperutility/group"/>
-</component>
-<component name="ssmpolicyplugins" filter="s60" long-name="SSM Policy Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmpolicyplugins/group"/>
-</component>
-<component name="ssmutilityplugins" filter="s60" long-name="SSM Utility Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmutilityplugins/group"/>
-</component>
-<component name="ssmcmdlists" filter="s60" long-name="SSM Command Lists" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcmdlists/group"/>
-</component>
-<component name="ssmcustcmds" filter="s60" long-name="SSM Custom Commands" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcustcmds/group"/>
-</component>
-<component name="syslangutil" filter="s60" long-name="System Language Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/syslangutil/group"/>
-</component>
-<component name="sysrestart" filter="s60" long-name="System Restart" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysrestart/group"/>
-</component>
-<component name="sysuiprovider" filter="s60" long-name="System UI Provider" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysuiprovider/group"/>
-</component>
-<component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/group" mrp="os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
-</component>
-<component name="systemstatemgr" long-name="System State Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
-</component>
-<component name="systemstateplugins" long-name="System State Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
-</component>
-<component name="systemstatereferenceplugins" long-name="System State Reference Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
-</component>
-</collection>
-<collection name="resourceinterfaces" long-name="Resource Interfaces" level="hw-if">
-<component name="fmtransmittercontrol" long-name="FM Transmitter Control" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group" mrp="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
-</component>
-</collection>
-<collection name="systemhealthmanagement" long-name="System Health Management" level="server">
-<component name="systemhealthmgr" long-name="System Health Manager" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
-</component>
-</collection>
-<collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if"/>
-<collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
-<component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
-<collection name="authenticationservices" long-name="Authentication Services" level="utilities">
-<component name="authenticationserver" long-name="Authentication Server" introduced="^3" purpose="optional">
-<unit bldFile="os/security/authenticationservices/authenticationserver/group" mrp="os/security/authenticationservices/authenticationserver/group/security_authserver.mrp"/>
-</component>
-</collection>
-<collection name="authorisation" long-name="Authorisation" level="utilities">
-<component name="userpromptservice" long-name="User Prompt Service" introduced="^3" purpose="mandatory">
-<unit bldFile="os/security/authorisation/userpromptservice/group" mrp="os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
-</component>
-<component name="userpromptutils" long-name="User Prompt Utils" introduced="^3" purpose="optional">
-<unit bldFile="os/security/authorisation/userpromptutils/group" mrp="os/security/authorisation/userpromptutils/group/security_ups_utils.mrp"/>
-</component>
-</collection>
-<collection name="contentmgmt" long-name="Content Management" level="utilities">
-<component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
-<unit bldFile="os/security/contentmgmt/contentaccessfwfordrm/group" mrp="os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
-</component>
-<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>
-</collection>
-<collection name="crypto" long-name="Crypto Libraries" level="libraries">
-<component name="weakcryptospi" long-name="Weak Crypto SPI" filter="gt" introduced="^3" purpose="optional">
-<unit bldFile="os/security/crypto/weakcryptospi/group" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
-</component>
-<component name="strongcryptospi" long-name="Strong Crypto SPI" filter="gt" introduced="^3" purpose="optional">
-<unit bldFile="os/security/crypto/weakcryptospi/strong" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
-</component>
-</collection>
-<collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
-<component name="securityutils" long-name="Security Utils" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/securityutils/group" mrp="os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
-</component>
-<component name="securitydocs" long-name="Security Documentation" purpose="development" class="doc">
-<unit mrp="os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
-</component>
-<component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
-</component>
-<component name="securitycommonutils" long-name="Security Common Utils" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/security/cryptomgmtlibs/securitycommonutils/group" mrp="os/security/cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
-</component>
-</collection>
-<collection name="securityanddataprivacytools" long-name="Security and Data Privacy Tools" level="services">
-<component name="securityconfig" long-name="Security Config" introduced="9.1" purpose="optional">
-<unit bldFile="os/security/securityanddataprivacytools/securityconfig/group" mrp="os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
-</component>
-<component name="securitytools" long-name="Security Tools" introduced="^3" purpose="optional" class="PC">
-<unit bldFile="os/security/securityanddataprivacytools/securitytools/group" mrp="os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
-</component>
-</collection>
-<collection name="cryptoplugins" long-name="Crypto Plugins" level="plugins">
-<component name="cryptospiplugins" long-name="Crypto SPI Plugins" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/security/cryptoplugins/cryptospiplugins/group" mrp="os/security/cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
-</component>
-</collection>
-<collection name="cryptoservices" long-name="Crypto Services" level="plugins">
-<component name="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/certificateandkeymgmt/group" mrp="os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
-</component>
-<component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
-</component>
-<component name="browserrootcertificates" long-name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
-<unit mrp="os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
-</component>
-<component name="rootcertificates" filter="sf_build" long-name="Root Certificates" introduced="7.0s" purpose="optional">
-<!-- not in S60 codebase -->
-<unit bldFile="os/security/cryptoservices/rootcertificates/group" mrp="os/security/cryptoservices/rootcertificates/group/rootcerts.mrp"/>
-</component>
-<component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/asnpkcs/group" mrp="os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
-</component>
-</collection>
-<collection name="security_info" long-name="OS Security Info" level="utilities">
-<component name="security_metadata" long-name="OS Security Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/security/security_info/security_metadata/security_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
-<collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
-<component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
-</component>
-<component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
-</component>
-<component name="simulationpositioningmodule" long-name="Simulation Positioning Module" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
-</component>
-<component name="gpspositioningmodule" long-name="GPS/A-GPS Positioning Module" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/gpspositioningmodule/group" mrp="os/lbs/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
-</component>
-<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>
-</collection>
-<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
-<component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
-</component>
-</collection>
-<collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
-<component name="locationserver" long-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 name="networkrequesthandler" long-name="Network Request Handler" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
-</component>
-</collection>
-<collection name="lbstest" long-name="Locating Services Tests" level="application-interface">
-<component name="locationprotocoltest" long-name="Location Protocol Tests" introduced="9.2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/lbstest/locationprotocoltest/group" mrp="os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
-</component>
-</collection>
-<collection name="locationmgmt" long-name="Location Management" level="management">
-<component name="locmonitor" long-name="Location Monitor" introduced="^3" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
-</component>
-<component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/agpslocationmgr/group" mrp="os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
-</component>
-<component name="networklocationmgr" long-name="Network Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/networklocationmgr/group" mrp="os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
-</component>
-<component name="locationcore" long-name="Location Core" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locationcore/group" mrp="os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
-</component>
-<component name="networkgateway" long-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 name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
-<component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
-</component>
-<component name="networkprotoutils" long-name="Network Protocol Common Utilities" introduced="^3">
-<unit bldFile="os/lbs/networkprotocolmodules/common/utils/group"/>
-</component>
-<component name="suplproxyprotocolmodule" long-name="SUPL Proxy Protocol Module" filter="sf_build" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/networkprotocolmodules/suplproxyprotocolmodule/sfgroup"/>
-</component>
-<component name="suplrrlpasn1" filter="sf_build" long-name="SUPL RRLP ASN1 Parser">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
-</component>
-<component name="suplrrlpprotocol" filter="sf_build" long-name="SUPL RRLP Protocol Module">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup"/>
-</component>
-</collection>
-<collection name="lbsapitest" long-name="Location API Tests" level="application-interface"/>
-<collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
-<component name="lbs_metadata" long-name="Locating Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commsfw" level="services" long-name="Communications Framework" levels="server support framework process app-if">
-<collection name="commsprocess" long-name="Comms Process" level="process">
-<component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/commsfw/commsprocess/commsrootserverconfig/group" mrp="os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
-</component>
-</collection>
-<collection name="commsconfig" long-name="Comms Config" level="process">
-<component name="commsdatabase" long-name="Comms Database" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
-</component>
-<component name="commsdatabaseshim" long-name="Comms Database Shim" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/commsfw/commsconfig/commsdatabaseshim/group" mrp="os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
-</component>
-</collection>
-<collection name="datacommsserver" long-name="Data Comms Server" level="framework">
-<component name="esockserver" long-name="ESock Server" purpose="mandatory">
-<unit bldFile="os/commsfw/datacommsserver/esockserver/group" mrp="os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp" version="3"/>
-</component>
-<component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/group" mrp="os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
-</component>
-<component name="networkingdialogstub" long-name="Networking Dialog Stub" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/default" mrp="os/commsfw/datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
-</component>
-<component name="networkcontroller" long-name="Network Controller" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/datacommsserver/networkcontroller/group" mrp="os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
-</component>
-</collection>
-<collection name="serialserver" long-name="Serial Server" level="server">
-<component name="serialportcsy" long-name="Serial Port CSY" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/serialserver/serialportcsy" mrp="os/commsfw/serialserver/serialportcsy/ser-comms_serialportcsy.mrp"/>
-</component>
-<component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" purpose="development">
-<unit bldFile="os/commsfw/serialserver/packetloopbackcsy/group" mrp="os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
-</component>
-<component name="c32serialserver" long-name="C32 Serial Server" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/commsfw/serialserver/c32serialserver/group" mrp="os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
-</component>
-<component name="c32serialserverconfig" long-name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config">
-<unit bldFile="os/commsfw/serialserver/c32serialserverconfig" mrp="os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
-</component>
-<component name="c32serialserverdocs" long-name="C32 Serial Server Documentation" purpose="development" class="doc">
-<unit mrp="os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
-</component>
-</collection>
-<collection name="commsfwutils" long-name="Comms Framework Utilities" level="framework">
-<component name="commsbufs" long-name="Comms Buffers" introduced="^3" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwutils/commsbufs/group" mrp="os/commsfw/commsfwutils/commsbufs/group/comms-infras_commsbufs.mrp"/>
-</component>
-</collection>
-<collection name="commsfw_info" long-name="Comms Framework Info" level="app-if">
-<component name="commsinfrastructuredocs" long-name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
-<unit mrp="os/commsfw/commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
-</component>
-<component name="commsfw_metadata" long-name="Communications Framework Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/commsfw/commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
-</component>
-</collection>
-<collection name="commsfwsupport" long-name="Comms Framework Support" level="support">
-<component name="commselements" long-name="Comms Elements" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwsupport/commselements/group" mrp="os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
-</component>
-</collection>
-<collection name="commsinfrastructureapitest" long-name="Comms-Infras API Tests" level="app-if">
-<component name="commsinfrastructuresvs" long-name="Comms Infrastructure Verification Suite" introduced="^3" purpose="development">
-<unit mrp="os/commsfw/commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
-</component>
-</collection>
-<collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
-<component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
-</component>
-<component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" purpose="mandatory" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
-</component>
-<component name="commstools" long-name="Comms Tools" introduced="^3" purpose="development" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/commstools/group" mrp="os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
-</component>
-</collection>
-</block>
-<block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
-<component name="internetsockets" long-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>
-<collection name="tcpiputils" long-name="TCP/IP Utilities" level="plugin">
-<component name="dnd" long-name="DND" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/dnd/group" mrp="os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
-</component>
-<component name="dhcp" long-name="DHCP" introduced="8.0" purpose="optional">
-<unit bldFile="os/networkingsrv/tcpiputils/dhcp/group" mrp="os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
-</component>
-<component name="networkaddressandporttranslation" long-name="Network Address and Port Translation" introduced="^2" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
-</component>
-<component name="punycodeconv" long-name="Punycode Converter" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/punycodeconv/group" mrp="os/networkingsrv/tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
-</component>
-</collection>
-<collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
-<component name="nullagt" long-name="NULL AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/nullagt/group" mrp="os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
-</component>
-<component name="genericscprparameters" long-name="Generic SCPR Parameters" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/linklayercontrol/genericscprparameters/group" mrp="os/networkingsrv/linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
-</component>
-<component name="mbmsparameters" long-name="MBMS Parameters" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/mbmsparameters/group" mrp="os/networkingsrv/linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
-</component>
-<component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
-<unit bldFile="os/networkingsrv/linklayercontrol/networkinterfacemgr/group" mrp="os/networkingsrv/linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp" version="2"/>
-</component>
-</collection>
-<collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
-<component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
-</component>
-<component name="pppnif" long-name="PPP NIF" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/pppnif/group" mrp="os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp" version="2"/>
-</component>
-<component name="slipnif" long-name="SLIP NIF" purpose="development" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/slipnif/group" mrp="os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
-</component>
-<component name="tunnelnif" long-name="Tunnel NIF" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
-</component>
-</collection>
-<collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
-<component name="packetlogger" long-name="Packet Logger" introduced="8.1" purpose="development">
-<unit bldFile="os/networkingsrv/linklayerutils/packetlogger/group" mrp="os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
-</component>
-</collection>
-<collection name="networkcontrol" long-name="Network Control" level="plugin">
-<component name="qoslib" long-name="QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/qoslib/group" mrp="os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
-</component>
-<component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/pfqoslib/group" mrp="os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
-</component>
-<component name="qosfwprt" long-name="QoS Framework PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
-</component>
-<component name="qosipscpr" long-name="QoS IP SCPR" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosipscpr/group" mrp="os/networkingsrv/networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
-</component>
-<component name="ipnetworklayer" long-name="IP Network Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/ipnetworklayer/group" mrp="os/networkingsrv/networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
-</component>
-<component name="iptransportlayer" long-name="IP Transport Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/iptransportlayer/group" mrp="os/networkingsrv/networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
-</component>
-<component name="commsuserpromptmgr" long-name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkcontrol/commsuserpromptmgr/group" mrp="os/networkingsrv/networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
-</component>
-</collection>
-<collection name="networkprotocols" long-name="Network Protocols" level="plugin">
-<component name="ipeventnotifier" long-name="IP Event Notifier" introduced="8.1" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
-</component>
-<component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
-</component>
-<component name="iphook" long-name="IP Hook" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
-</component>
-<component name="mobileip" long-name="Mobile IP" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/mobileip/group" mrp="os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
-</component>
-<component name="dnsproxy" long-name="DNS Proxy" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/networkprotocols/dnsproxy/group" mrp="os/networkingsrv/networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
-</component>
-</collection>
-<collection name="networksecurity" long-name="Network Security" level="framework">
-<component name="tls" long-name="TLS" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tls/group" mrp="os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
-</component>
-<component name="tlsprovider" long-name="TLS Provider" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tlsprovider/group" mrp="os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
-</component>
-<component name="ipsec" long-name="IPsec" introduced="7.0" purpose="optional">
-<unit bldFile="os/networkingsrv/networksecurity/ipsec/group" mrp="os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
-</component>
-</collection>
-<collection name="networkingtestandutils" long-name="Networking Test and Utils" level="app-if">
-<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">
-<!-- production component: contains the IBY files -->
-<unit bldFile="os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
-</component>
-<component name="networkingdocs" long-name="Networking Documentation" purpose="development" class="doc">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
-</component>
-<component name="networkingsrv_metadata" long-name="Networking Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
-<component name="predictorcompression" long-name="Predictor Compression" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wlan" level="services" long-name="WLAN" levels="hw low mid high tools test">
-<collection name="wlan_plat" long-name="WLAN Platform Interfaces" level="test">
-<component name="wlan_dbif_api" long-name="WLAN DBIF API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_dbif_api/group"/>
-</component>
-<component name="wlan_hal_api" long-name="WLAN HAL API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hal_api/group"/>
-</component>
-<component name="wlan_management_api" long-name="WLAN Management API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_management_api/group"/>
-</component>
-<component name="wlan_device_settings_api" long-name="WLAN Device Settings API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_device_settings_api/group"/>
-</component>
-<component name="wlan_control_api" long-name="WLAN Control API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_control_api/group"/>
-</component>
-<component name="wlan_hw_initialization_data_api" long-name="WLAN Hardware Initialization Data API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hw_initialization_data_api/group"/>
-</component>
-<component name="wlan_power_save_plugin_api" long-name="WLAN Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_power_save_plugin_api/group"/>
-</component>
-<component name="wlan_info_api" long-name="WLAN Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_info_api/group"/>
-</component>
-<component name="wlan_agent_hotspot_plugin_api" long-name="WLAN Agent Hotspot Plug-in API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
-</component>
-<component name="wlan_osa_api" long-name="WLAN OSA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_osa_api/group"/>
-</component>
-<component name="wlan_spia_api" long-name="WLAN SPIA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_spia_api/group"/>
-</component>
-<component name="wlan_hpa_api" long-name="WLAN HPA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hpa_api/group"/>
-</component>
-<component name="wlan_eapol_plugin_api" long-name="WLAN EAPOL Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_eapol_plugin_api/group"/>
-</component>
-<component name="wlan_generic_plugin_api" long-name="WLAN Generic Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_generic_plugin_api/group"/>
-</component>
-<component name="wlan_aws_plugin_api" long-name="WLAN AWS Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_aws_plugin_api/group"/>
-</component>
-</collection>
-<collection name="wlan_pub" long-name="WLAN Public Interfaces" level="test">
-<component name="wlan_sdk_info_api" long-name="WLAN SDK Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_pub/wlan_sdk_info_api/group"/>
-</component>
-</collection>
-<collection name="wlan_bearer" long-name="WLAN Bearer" level="hw">
-<component name="wlanpsmplugin" filter="s60" long-name="WLAN PSM Plugin" plugin="Y">
-<unit bldFile="os/wlan/wlan_bearer/wlanpsmplugin/group"/>
-</component>
-<component name="wlanagent" filter="s60" long-name="WLAN Agent">
-<unit bldFile="os/wlan/wlan_bearer/wlanagent/group"/>
-</component>
-<component name="wlandbif_cd" filter="s60" long-name="WLAN CommsDat interface">
-<unit bldFile="os/wlan/wlan_bearer/wlandbif_cd/group"/>
-</component>
-<!-- should follow component directory rules for stuff in wlan_symbian/ and put in a single component or split up properly -->
-<component name="wlanengine" filter="s60" long-name="WLAN Engine">
-<unit bldFile="os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
-</component>
-<component name="wlanldd" filter="s60" long-name="WLAN LDD">
-<unit bldFile="os/wlan/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
-</component>
-<component name="wlannwif" filter="s60" long-name="WLAN Network Interface">
-<unit bldFile="os/wlan/wlan_bearer/wlannwif/group"/>
-</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="adaptation hw-if plugin framework server app-if">
-<collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
-<component name="basebandchanneladaptor" long-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 name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
-<component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
-</component>
-</collection>
-<collection name="fax" long-name="Fax" level="server">
-<component name="faxclientandserver" long-name="Fax Client and Server" purpose="optional">
-<unit bldFile="os/cellularsrv/fax/faxclientandserver/Group" mrp="os/cellularsrv/fax/faxclientandserver/Group/telephony_fax.mrp"/>
-</component>
-</collection>
-<collection name="smsprotocols" long-name="SMS Protocols" level="framework">
-<component name="smsstack" long-name="SMS Stack" introduced="6.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/cellularsrv/smsprotocols/smsstack/group" mrp="os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
-</component>
-</collection>
-<collection name="telephonyprotocols" long-name="Telephony Protocols" level="framework">
-<component name="csdagt" long-name="CSD AGT" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/csdagt/group" mrp="os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
-</component>
-<component name="psdagt" long-name="PSD AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/psdagt/group" mrp="os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
-</component>
-<component name="gprsumtsqosprt" long-name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
-</component>
-<component name="gprsumtsqosinterface" long-name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
-</component>
-<component name="qosextnapi" long-name="QoS Extn API" introduced="9.2" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
-</component>
-<component name="secondarypdpcontextumtsdriver" long-name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
-</component>
-<component name="qos3gppcpr" long-name="QoS 3GPP CPR" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
-</component>
-<component name="pdplayer" long-name="PDP Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/pdplayer/group" mrp="os/cellularsrv/telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
-</component>
-<component name="rawipnif" long-name="Raw IP NIF" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserver" long-name="Telephony Server" level="server">
-<component name="etelserverandcore" long-name="ETel Server and Core" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
-</component>
-<component name="etelmultimode" long-name="ETel Multimode" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelmultimode/group" mrp="os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
-</component>
-<component name="etelpacketdata" long-name="ETel Packet Data" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
-</component>
-<component name="etelsimtoolkit" long-name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
-<component name="common_tsy" long-name="Common TSY" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
-</component>
-<component name="licenseetsystub" long-name="Licensee TSY Stub" introduced="^2" purpose="development" filter="sf_build" plugin="Y">
-<unit mrp="os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="os/cellularsrv/telephonyserverplugins/licenseetsystub/group"/>
-</component>
-<component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
-</component>
-<component name="simtsy" long-name="SIM TSY" introduced="7.0" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
-</component>
-<component name="ctsydispatchlayer" long-name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
-</component>
-<component name="simatktsy" long-name="SIMATK TSY" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simatktsy/group" mrp="os/cellularsrv/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
-</component>
-</collection>
-<collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
-<component name="dial" long-name="Dial" deprecated="9.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyutils/dial/group" mrp="os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
-</component>
-<component name="telephonywatchers" long-name="Telephony Watchers" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
-</component>
-<component name="etel3rdpartyapi" long-name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrv_info" long-name="Cellular Baseband Services Info" level="app-if">
-<component name="telephonyconfidentialdocs" long-name="Telephony Confidential Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
-</component>
-<component name="telephonydocs" long-name="Telephony Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
-</component>
-<component name="cellularsrv_metadata" long-name="Cellular Baseband Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
-<component name="mocksy" long-name="MockSY" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if"/>
-</block>
-<block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
-<collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
-<component name="bluetooth_audio_adaptation_api" long-name="Bluetooth Audio Adaptation API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
-</component>
-<component name="bluetooth_power_management_api" long-name="Bluetooth Power Management API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_power_management_api/group"/>
-</component>
-<component name="at_command_handler_plugin_api" long-name="AT Command Handler Plugin API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/at_command_handler_plugin_api/group"/>
-</component>
-</collection>
-<collection name="bluetooth" long-name="Bluetooth Core" level="framework">
-<component name="btstack" long-name="Bluetooth Stack" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btstack" mrp="os/bt/bluetooth/btstack/bluetooth_stack.mrp"/>
-</component>
-<component name="btcomm" long-name="Bluetooth CSY" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetooth/btcomm" mrp="os/bt/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
-</component>
-<component name="btsdp" long-name="Bluetooth SDP" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btsdp" mrp="os/bt/bluetooth/btsdp/bluetooth_sdp.mrp"/>
-</component>
-<component name="btextnotifiers" long-name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btextnotifiers" mrp="os/bt/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
-</component>
-<component name="gavdp" long-name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/gavdp/group" mrp="os/bt/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
-</component>
-<component name="btlogger" long-name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btlogger/group" mrp="os/bt/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
-</component>
-<component name="btdocs" long-name="Bluetooth Documentation" purpose="development" class="doc">
-<unit mrp="os/bt/bluetooth/btdocs/bluetooth_documentation.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothmgmt" long-name="Bluetooth Management" level="plugin">
-<component name="btmgr" long-name="Bluetooth Manager" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btmgr" mrp="os/bt/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
-</component>
-<component name="btconfig" long-name="Bluetooth Config" purpose="optional" class="config">
-<unit bldFile="os/bt/bluetoothmgmt/btconfig" mrp="os/bt/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
-</component>
-<component name="btrom" long-name="Bluetooth ROM" introduced="9.1" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btrom" mrp="os/bt/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
-</component>
-<component name="bluetoothclientlib" long-name="Bluetooth Client Library" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/bluetoothclientlib" mrp="os/bt/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothcommsprofiles" long-name="Bluetooth Comms Profiles" level="app-if">
-<component name="btpan" long-name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetoothcommsprofiles/btpan/group" mrp="os/bt/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
-</component>
-</collection>
-<collection name="bthci" long-name="Host Controller Interface" level="server">
-<component name="bthci2" long-name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bthci/bthci2/group" mrp="os/bt/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
-</component>
-<component name="hciextensioninterface" long-name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bthci/hciextensioninterface" mrp="os/bt/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
-</component>
-<component name="hci2implementations" long-name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bthci/hci2implementations/group" mrp="os/bt/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
-</component>
-</collection>
-<collection name="irda" long-name="IrDA" level="plugin">
-<component name="irdastack" long-name="IrDA Stack" purpose="optional">
-<unit bldFile="os/bt/irda/irdastack/group" mrp="os/bt/irda/irdastack/group/infra-red_irda.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if"/>
-<collection name="atext" long-name="AT Extensions" level="server">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="atext_build" long-name="AT Extension Build" introduced="^3" purpose="optional" filter="s60">
-<unit bldFile="os/bt/atext/group"/>
-</component>
-</collection>
-<collection name="bt_info" long-name="Bluetooth Info" level="app-if">
-<component name="bt_metadata" long-name="Bluetooth Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/bt/bt_info/bt_metadata/bt_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
-<collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
-<!-- usbclientdrivers to be moved here from kernelhwsrv-->
-</collection>
-<collection name="usbmgmt" long-name="USB Management" level="server">
-<component name="usbmgr" long-name="USB Manager" purpose="optional">
-<unit bldFile="os/usb/usbmgmt/usbmgr/group" mrp="os/usb/usbmgmt/usbmgr/group/usb_manager.mrp" version="2"/>
-</component>
-<component name="usbclassandmgrdocs" long-name="USB Class and Manager Documentation" purpose="development" class="doc">
-<unit mrp="os/usb/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
-</component>
-</collection>
-<collection name="usb_info" long-name="USB Info" level="app-if">
-<component name="usb_metadata" long-name="USB Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/usb/usb_info/usb_metadata/usb_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="mm" level="services" long-name="Multimedia" levels="adaptation 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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-</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"/>
-</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"/>
-</component>
-<component name="aac_decoder_config_proxy_api" long-name="AAC Decoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/aac_decoder_config_proxy_api/group"/>
-</component>
-<component name="added_devsound_control_api" long-name="Added DevSound Control API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_api/group"/>
-</component>
-<component name="added_devsound_control_msg_hdlr_api" long-name="Added DevSound Control Msg Hdlr API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_msg_hdlr_api/group"/>
-</component>
-<component name="added_devsound_control_proxy_api" long-name="Added DevSound Control Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_proxy_api/group"/>
-</component>
-<component name="audio_effects_msg_hdlr_api" long-name="Audio Effects Message Handler API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_msg_hdlr_api/group"/>
-</component>
-<component name="audio_effects_proxy_api" long-name="Audio Effects Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_proxy_api/group"/>
-</component>
-<component name="audio_policy_header_api" long-name="Audio Policy Header API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="audio_routing_proxy_api" long-name="Audio Routing Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_routing_proxy_api/group"/>
-</component>
-<component name="custom_interface_builder_api" long-name="Custom Interface Builder API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_builder_api/group"/>
-</component>
-<component name="custom_interface_message_handler_factory_api" long-name="Custom Interface Message Handler Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_message_handler_factory_api/group"/>
-</component>
-<component name="custom_interface_proxy_factory_api" long-name="Custom Interface Proxy Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_proxy_factory_api/group"/>
-</component>
-<component name="custom_interface_utility_api" long-name="Custom Interface Utility API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_utility_api/group"/>
-</component>
-<component name="devsound_adaptation_api" long-name="DevSound Adaptation API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/devsound_adaptation_api/group"/>
-</component>
-<component name="display_posting_api" long-name="Display Posting API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="eaac_plus_decoder_interface_proxy_api" long-name="eAAC Plus Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="error_concealment_interface_proxy_api" long-name="Error Concealment Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
-</component>
-<component name="fm_radio_adaptation_api" long-name="FM Radio Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_decoder_interface_proxy_api" long-name="G711 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_encoder_interface_proxy_api" long-name="G711 Encoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_decoder_interface_proxy_api" long-name="G729 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_encoder_interface_msg_hdlr_api" long-name="G729 Encoder Interface Message Handler API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</component>
-<component name="ilbc_decoder_interface_proxy_api" long-name="Ilbc Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ilbc_encoder_interface_proxy_api" long-name="Ilbc Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="mdf_plugin_uids" long-name="MDF Plug-in UIDs" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/mdf_plugin_uids/group"/>
-</component>
-<component name="multimedia_fourcc_definitions_api" long-name="Multimedia FourCC Definitions API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/multimedia_fourcc_definitions_api/group"/>
-</component>
-<component name="nokia_audio_policy_header_api" long-name="Nokia Audio Policy Header API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/nokia_audio_policy_header_api/group"/>
-</component>
-<component name="nokia_multimedia_fourcc_definitions_api" long-name="Nokia Multimedia Fourcc Definitions API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ra8_decoder_interface_proxy_api" long-name="RA8 Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
-</component>
-<component name="rds_adaptation_api" long-name="RDS Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="restricted_audio_output_proxy_api" long-name="Restricted Audio Output Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="sbc_encoder_interface_proxy_api" long-name="SBC Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/sbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="secure_output_mdf_custom_interface" long-name="Secure Output MDF Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="speech_encoder_config_proxy_api" long-name="Speech Encoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/speech_encoder_config_proxy_api/group"/>
-</component>
-<component name="telephony_audio_routing_client_api" long-name="Telephony Audio Routing Client API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_client_api/group"/>
-</component>
-<component name="telephony_audio_routing_manager_api" long-name="Telephony Audio Routing Manager API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_manager_api/group"/>
-</component>
-<component name="video_buffer_management_mdf_custom_interface" long-name="Video Buffer Management MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_buffer_management_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_rotation_mdf_custom_interface" long-name="Video Decoder Rotation MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_scaling_mdf_custom_interface" long-name="Video Decoder Scaling MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
-</component>
-<component name="video_reclaim_extbuffers_ci" long-name="Video Reclaim Extbuffers Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_reclaim_extbuffers_ci/group"/>
-</component>
-<component name="video_window_control_custom_interface" long-name="Video Window Control Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="wma_decoder_interface_proxy_api" long-name="WMA Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/wma_decoder_interface_proxy_api/group"/>
-</component>
-<component name="eaacplusutil_api" long-name="EAac Plus Util API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/eaacplusutil_api/group"/>
-</component>
-<component name="frametable_api" long-name="Frametable API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/frametable_api/group"/>
-</component>
-</collection>
-<collection name="devsoundextensions" long-name="Devsound Extensions" level="device-fw">
-<component name="drmaudioplayer" filter="s60" long-name="DRM Audio Player">
-<unit bldFile="os/mm/devsoundextensions/drmaudioplayer/group"/>
-</component>
-<component name="mmextfw" filter="s60" long-name="Multimedia Extension Framework">
-<unit bldFile="os/mm/devsoundextensions/mmextfw/group"/>
-</component>
-<component name="audiorouting" filter="s60" long-name="Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/audiorouting/group"/>
-</component>
-<component name="effects" filter="s60" long-name="Effects">
-<unit bldFile="os/mm/devsoundextensions/effects/group"/>
-</component>
-<component name="effectspresets" filter="s60" long-name="Effects Presets">
-<unit bldFile="os/mm/devsoundextensions/effectspresets/group"/>
-</component>
-<component name="effectspresets_utils" filter="s60" long-name="Effects Presets Utils">
-<!-- need to #include the lot from a single bld.inf
- Also move to a standard component location, not under effectspresets -->
-<unit bldFile="os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
-<unit bldFile="os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
-</component>
-<component name="telephonyaudiorouting" filter="s60" long-name="Telephony Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/group"/>
-</component>
-<component name="mmfcustominterfaces" filter="s60" long-name="MMF Custom Interfaces">
-<unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/group"/>
-</component>
-<component name="addeddevsoundcontrol" filter="s60" long-name="Added DevSound Control">
-<unit bldFile="os/mm/devsoundextensions/addeddevsoundcontrol/group"/>
-</component>
-<component name="globalaudiosettings" filter="s60" long-name="Global Audio Settings">
-<unit bldFile="os/mm/devsoundextensions/globalaudiosettings/group"/>
-</component>
-<component name="restrictedaudiooutput" filter="s60" long-name="Restricted Audio Output">
-<unit bldFile="os/mm/devsoundextensions/restrictedaudiooutput/group"/>
-</component>
-<component name="ciextnfactoryplugins" filter="s60" long-name="Custom Interface Extension Factory Plugins" plugin="Y">
-<unit bldFile="os/mm/devsoundextensions/ciextnfactoryplugins/group"/>
-</component>
-</collection>
-<collection name="mdfdevvideoextensions" long-name="MDF Dev Video Extensions" level="device-fw">
-<component name="nga_mdf_postprocessor" long-name="NGA MDF Postprocessor" filter="s60">
-<unit bldFile="os/mm/mdfdevvideoextensions/nga_mdf_postprocessor/group"/>
-</component>
-</collection>
-<collection name="audio" long-name="Audio Codecs" level="middleware">
-<component name="arm_cmmf_codecs" filter="s60" long-name="ARM CMMF Codecs" plugin="Y">
-<unit bldFile="os/mm/audio/arm_cmmf_codecs/group"/>
-</component>
-</collection>
-<collection name="video" long-name="Video Codecs" level="middleware">
-<!-- empty -->
-</collection>
-<collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
-<component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/imagingandcamerafws/imagingfws/group" mrp="os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
-</component>
-<component name="camerafw" long-name="Camera Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/imagingandcamerafws/camerafw/group" mrp="os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
-</component>
-</collection>
-<collection name="mmlibs" long-name="Multimedia Libraries" level="middleware">
-<component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmutilitylib/group" mrp="os/mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
-</component>
-<component name="mmfw" long-name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmfw/group" mrp="os/mm/mmlibs/mmfw/group/multimedia_mmf.mrp"/>
-</component>
-</collection>
-<collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
-<component name="imagingplugins" long-name="Imaging Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/imagingplugins/group" mrp="os/mm/mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
-</component>
-<component name="cameraplugins" long-name="Camera Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/cameraplugins/group" mrp="os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
-</component>
-<component name="lib3gp" long-name="3GP Library" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/mmplugins/lib3gp/group" mrp="os/mm/mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
-</component>
-<component name="mmfwplugins" long-name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/mmfwplugins/group" mrp="os/mm/mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
-</component>
-</collection>
-<collection name="mm_info" long-name="Multimedia Info" level="app-if">
-<component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc">
-<unit mrp="os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
-</component>
-<component name="mm_metadata" long-name="Multimedia Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
-<component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="^2" purpose="development">
-<unit bldFile="os/mm/mmresourcemgmt/mmresctrl/group" mrp="os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
-</component>
-</collection>
-<collection name="mmdevicefw" long-name="Multimedia Device Framework" level="device-fw">
-<component name="mdf" long-name="Media Device Framework" introduced="9.2" purpose="mandatory">
-<unit bldFile="os/mm/mmdevicefw/mdf/group" mrp="os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
-</component>
-<component name="speechrecogsupport" long-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 name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
-<component name="videorenderer" long-name="Video Renderer" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/mmswadaptation/videorenderer/group" mrp="os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
-</component>
-</collection>
-<collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw"/>
-<collection name="omxil" long-name="OpenMAX IL" level="hw-if">
-<component name="omxilapi" long-name="OpenMAX IL API" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilapi/group" mrp="os/mm/omxil/omxilapi/group/multimedia_omx_il_api.mrp" version="1"/>
-</component>
-<component name="omxilcore" long-name="OpenMAX IL Core" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcore/group" mrp="os/mm/omxil/omxilcore/group/multimedia_omx_il_core.mrp" version="1"/>
-</component>
-<component name="omxilcomponentcommon" long-name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcomponentcommon/group" mrp="os/mm/omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp" version="1"/>
-</component>
-<component name="omxilrefcomps" long-name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilrefcomps/ref_components/group" mrp="os/mm/omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp" version="1"/>
-</component>
-<component name="mmilapi" long-name="Multimedia Integration Layer API" introduced="^3" purpose="development">
-<unit bldFile="os/mm/omxil/mmilapi/group" mrp="os/mm/omxil/mmilapi/group/multimedia_il_api.mrp"/>
-</component>
-</collection>
-<collection name="devsound" long-name="Sound Device" level="devices">
-<component name="devsoundapi" long-name="DevSound API" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/devsound/devsoundapi/group" mrp="os/mm/devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
-</component>
-<component name="a3fdevsound" long-name="A3F DevSound" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3fdevsound/group" mrp="os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
-</component>
-<component name="a3facf" long-name="A3F Audio Component Framework" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3facf/group" mrp="os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
-</component>
-<component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/devsound/devsoundpluginsupport/group" mrp="os/mm/devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
-</component>
-<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">
-<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">
-<unit bldFile="os/mm/devsound/a3ftrace/group" mrp="os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
-</component>
-<component name="a3fsrvstart" long-name="A3F Server Start" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
-</component>
-</collection>
-<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
-<component name="devsoundhwdeviceapi" long-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 name="a3facl" long-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 name="a3fdevsoundcustomisation" long-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"/>
-</component>
-<component name="refacladapt" long-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"/>
-</component>
-<component name="videohai" long-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 name="dvbhreceiverhai" long-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>
-</block>
-<block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
-<collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
-<component name="exif_api" long-name="Exif API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagingext_plat" long-name="Imaging Extensions Platform Interfaces" level="app-if">
-<component name="jpeg2000_icl_plugin_api" long-name="JPEG2000 ICL plugin API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/jpeg2000_icl_plugin_api/group"/>
-</component>
-<component name="extended_icl_jpeg_api" long-name="Extended ICL Jpeg API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
-</component>
-<component name="h324_annex_k_custom_api" long-name="H324 Annex K Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/h324_annex_k_custom_api/group"/>
-</component>
-<component name="ecam_orientation_custom_api" long-name="ECam Orientation Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_orientation_custom_api/group"/>
-</component>
-<component name="ecam_ui_orientation_override_custom_api" long-name="ECam UI Orientation Override Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
-</component>
-<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>
-</collection>
-<collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
-<component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
-<unit bldFile="os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
-</component>
-<component name="imageadaptationextensions_build" filter="s60" long-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"/>
-</component>
-</collection>
-<collection name="imagingmodules" long-name="Imaging Modules" level="hw-if">
-<component name="exiflib" filter="s60" long-name="Exif Library">
-<unit bldFile="os/imagingext/imagingmodules/exiflib/group"/>
-</component>
-<component name="jp2kcodec" filter="s60" long-name="JPEG2000 Decoder Plugin" plugin="Y">
-<unit bldFile="os/imagingext/imagingmodules/jp2kcodec/group"/>
-</component>
-</collection>
-</block>
-<block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
-<component name="vgi" filter="s60" long-name="VGI">
-<unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
-</component>
-</collection>
-<collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adaptations">
-<component name="m3gcore11" filter="s60" long-name="M3G Core 1.1">
-<unit bldFile="os/graphics/m3g/m3gcore11/group"/>
-</component>
-</collection>
-<collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines">
-<component name="graphicsresource" long-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 name="graphicsresourceadaptation" long-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"/>
-</component>
-</collection>
-<collection name="graphicsutils" long-name="Graphics Utils" level="engines">
-<component name="commongraphicsheaders" long-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 name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
-<!-- displayldd to be moved here -->
-<component name="surfacemgr" long-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 name="graphicscomposition" long-name="Graphics Composition" level="engines">
-<component name="openwfcinterface" long-name="OpenWF Composition Interface" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfcinterface/group" mrp="os/graphics/graphicscomposition/openwfcinterface/group/graphics_openwfcinterface.mrp"/>
-</component>
-<component name="openwfcompositionengine" long-name="OpenWF Composition Engine" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/graphicscomposition/openwfcompositionengine/group" mrp="os/graphics/graphicscomposition/openwfcompositionengine/group/graphics_openwfcompositionengine.mrp"/>
-</component>
-<component name="openwfsupport" long-name="OpenWF Support" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfsupport/group" mrp="os/graphics/graphicscomposition/openwfsupport/group/graphics_openwfsupport.mrp"/>
-</component>
-<component name="surfaceupdate" long-name="Surface Update" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/surfaceupdate/group" mrp="os/graphics/graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
-</component>
-</collection>
-<collection name="graphicstest" long-name="Graphics Test" level="app-if">
-<component name="uibench" long-name="UI Bench" introduced="9.2" purpose="development">
-<unit bldFile="os/graphics/graphicstest/uibench/group" mrp="os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
-</component>
-</collection>
-<collection name="graphics_plat" long-name="Graphics Platform Interfaces" level="app-if">
-<component name="m3g_core_api" filter="sf_build" long-name="M3G Core API" class="api">
-<unit bldFile="os/graphics/graphics_plat/m3g_core_api/group"/>
-</component>
-</collection>
-<collection name="graphics_info" long-name="Graphics Info" level="app-if">
-<component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc">
-<unit mrp="os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
-</component>
-<component name="graphics_metadata" long-name="Graphics Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
-</component>
-</collection>
-<collection name="windowing" long-name="Windowing" level="app-if">
-<component name="windowserver" long-name="Window Server" purpose="mandatory">
-<unit bldFile="os/graphics/windowing/windowserver/group" mrp="os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
-</component>
-<component name="windowserverplugins" long-name="Window Server Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/windowing/windowserverplugins/group" mrp="os/graphics/windowing/windowserverplugins/group/graphics_wserv_std_plugins.mrp"/>
-</component>
-</collection>
-<collection name="printingservices" long-name="Printing Services" level="app-if">
-<component name="printerdriversupport" long-name="Printer Driver Support" purpose="optional">
-<unit bldFile="os/graphics/printingservices/printerdriversupport/group" mrp="os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
-</component>
-<component name="printerdrivers" long-name="Printer Drivers" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/printingservices/printerdrivers/group" mrp="os/graphics/printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
-</component>
-</collection>
-<collection name="fbs" long-name="Font and Bitmap Server" level="device-interface">
-<component name="fontandbitmapserver" long-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 name="opengles" long-name="OpenGLES" level="internal-adaptations">
-<component name="openglesinterface" long-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 name="opengles_stub" filter="sf_build" long-name="OpenGL ES Stub" purpose="optional" introduced="^2">
-<unit bldFile="os/graphics/opengles/openglesinterface/group/opengles_stub"/>
-</component>
-</collection>
-<collection name="openvg" long-name="OpenVG" level="internal-adaptations">
-<component name="openvginterface" long-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 name="openvg11" filter="s60" long-name="OpenVG 1.1">
-<!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
-<unit bldFile="os/graphics/openvg/openvginterface/group/openvg11"/>
-</component>
-<component name="sfopenvg" filter="sf_build" long-name="Khronos OpenVG Reference Implementation" introduced="^2" purpose="optional">
-<unit bldFile="os/graphics/openvg/openvgrefimplementation/sfopenvg/group"/>
-</component>
-</collection>
-<collection name="egl" long-name="EGL" level="internal-adaptations">
-<component name="eglinterface" long-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 name="eglswitch" long-name="EGL Switch" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglswitch/group" mrp="os/graphics/egl/eglswitch/group/graphics_eglswitch.mrp"/>
-</component>
-<component name="eglrefimpl" long-name="EGL Reference Implementation" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglrefimpl/group" mrp="os/graphics/egl/eglrefimpl/group/graphics_eglrefimpl.mrp"/>
-</component>
-<component name="egltest" long-name="EGL Tests" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/egl/egltest/group" mrp="os/graphics/egl/egltest/group/graphics_egltest.mrp"/>
-</component>
-</collection>
-<collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
-<component name="gdi" long-name="GDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/gdi/group" mrp="os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
-</component>
-<component name="bitgdi" long-name="BitGDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
-</component>
-<component name="colourpalette" long-name="Colour Palette" introduced="7.0s" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
-</component>
-<component name="screendriver" long-name="Screen Driver" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/graphicsdeviceinterface/screendriver/group" mrp="os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
-</component>
-<component name="directgdi" long-name="DirectGDI" introduced="^3" deprecated="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/directgdi/group" mrp="os/graphics/graphicsdeviceinterface/directgdi/group/graphics_directgdi.mrp"/>
-</component>
-<component name="directgdiinterface" long-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 name="directgdiadaptation" long-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"/>
-</component>
-</collection>
-<collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
-<component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/gdi_tools/group" mrp="os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
-</component>
-</collection>
-<collection name="graphicsapitest" long-name="Graphics API Tests" level="app-if"/>
-</block>
-<block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
-<collection name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" level="text">
-<component name="findutil_api" long-name="Find Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/findutil_api/group"/>
-</component>
-<component name="japanese_language_utilities_api" long-name="Japanese Language Utilities API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
-</component>
-<component name="sortutil_api" long-name="Sorting Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/sortutil_api/group"/>
-</component>
-</collection>
-<collection name="textandloc_pub" long-name="Text and Localisation Public Interfaces" level="text">
-<component name="directory_localizer_api" long-name="Directory Localizer API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_pub/directory_localizer_api/group"/>
-</component>
-</collection>
-<collection name="charconvfw" long-name="Character Conversion" level="encoding">
-<component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional">
-<unit bldFile="os/textandloc/charconvfw/charconv_fw/group" mrp="os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
-</component>
-<component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/charconvplugins/group" mrp="os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
-</component>
-<component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/fatfilenameconversionplugins/group" mrp="os/textandloc/charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
-</component>
-</collection>
-<collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
-<component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/textshaperplugin/group" mrp="os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
-</component>
-<component name="fontstore" long-name="Font Store" purpose="mandatory">
-<unit bldFile="os/textandloc/fontservices/fontstore/group" mrp="os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
-</component>
-<component name="textrendering" long-name="Text Rendering" purpose="mandatory" class="placeholder">
-<!-- placeholder for text code from GDI -->
-</component>
-<component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/freetypefontrasteriser/group" mrp="os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
-</component>
-<component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional">
-<unit bldFile="os/textandloc/fontservices/referencefonts/group" mrp="os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
-</component>
-</collection>
-<collection name="textlayout" long-name="Text Layout" level="text">
-<component name="texthandling" long-name="Text Handling" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/texthandling/group" mrp="os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
-</component>
-<component name="textformatting" long-name="Text Formatting" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/textformatting/group" mrp="os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
-</component>
-</collection>
-<collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
-<!-- components in this collection need to be moved to the right collection.
- Either move into the units' directories, or create a new textandlocutils directory -->
-<component name="numbergrouping" filter="s60" long-name="Number Grouping">
-<unit bldFile="os/textandloc/charconvfw/numbergrouping/group"/>
-</component>
-<component name="jplangutil" filter="s60" long-name="Japanese Language Utilities">
-<unit bldFile="os/textandloc/charconvfw/jplangutil/group"/>
-</component>
-<component name="sortutil" filter="s60" long-name="Sorting Utility">
-<unit bldFile="os/textandloc/charconvfw/sortutil/group"/>
-</component>
-<component name="inlinetext" filter="s60" long-name="Inline Text">
-<unit bldFile="os/textandloc/charconvfw/inlinetext/group"/>
-</component>
-<component name="nearestlangutil" long-name="Nearest Language Util" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-<component name="numberformatting" long-name="Number Formatting" introduced="7.0s" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/numberformatting/group" mrp="os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
-</component>
-</collection>
-<collection name="localesupport" long-name="Locale Support" level="util">
-<component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/localisation/localesupport" mrp="os/textandloc/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
-</component>
-<component name="initlocale" long-name="Initialise Locale" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-</collection>
-<collection name="textandloctools" long-name="Text and Localisation Tools" level="tools">
-<component name="fontcompiler" long-name="Font Compiler" purpose="development" class="placeholder PC">
-<!-- placeholder for split from GDI Tools -->
-</component>
-<component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/bitmapfonttools/group" mrp="os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
-</component>
-</collection>
-<collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
-<component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
-<collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
-<component name="xmlsrv_plat_build" long-name="XML Services Platform Interface Build" filter="s60" class="api">
-<!-- need to fix the configuration used here.
- Either destribute to other components or use the new feature flags confguration mechanisms.
- Remove this component and uncomment the other units when fixed-->
-<unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
-</component>
-<component name="xml_encryption_api" long-name="XML Encryption API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/> -->
-</component>
-<component name="xml_signature_api" long-name="XML Signature API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_signature_api/group"/> -->
-</component>
-<component name="xml_security_engine_utils_api" long-name="XML Security Engine Utils API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/> -->
-</component>
-</collection>
-<collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
-<component name="xmlseccertman" filter="s60" long-name="XML Security Certificate Manager">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
-</component>
-<component name="xmlsec" filter="s60" long-name="XML Security">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsec/group"/>
-</component>
-<component name="xmlseccrypto" filter="s60" long-name="XML Security Crypto">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccrypto/group"/>
-</component>
-<component name="xmlsecwrapper" filter="s60" long-name="XML Security Wrapper">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsecwrapper/group"/>
-</component>
-</collection>
-<collection name="xml" long-name="XML" level="generic">
-<component name="xmlfw" long-name="XML Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmlfw/group" mrp="os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
-</component>
-<component name="libxml2libs" long-name="Libxml2 Libraries" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/libxml2libs/group" mrp="os/xmlsrv/xml/libxml2libs/group/syslibs_libxml2.mrp"/>
-</component>
-<component name="legacyminidomparser" long-name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/legacyminidomparser/GROUP" mrp="os/xmlsrv/xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp"/>
-</component>
-<component name="xmldomandxpath" long-name="XML DOM and XPath" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmldomandxpath/group" mrp="os/xmlsrv/xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
-</component>
-<component name="xmlexpatparser" long-name="XML Expat Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmlexpatparser/group" mrp="os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
-</component>
-<component name="xmllibxml2parser" long-name="XML Libxml2 Parser" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmllibxml2parser/group" mrp="os/xmlsrv/xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
-</component>
-<component name="wbxmlparser" long-name="WBXML Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/wbxmlparser/group" mrp="os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
-</component>
-</collection>
-<collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
-<component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="deviceplatformrelease" level="services" long-name="Device Platform Release" levels="bld mid top">
-<collection name="s60extras" long-name="S60 Extras" level="mid">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="s60extras_build" filter="s60" long-name="S60 Extras Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/S60Extras/group"/>
-</component>
-</collection>
-<collection name="locfiles" long-name="Locale Files" level="mid">
-<component name="locfiles_build" filter="s60" long-name="S60 Locale Files Build" purpose="development" class="config">
-<!-- need to move component down a directory -->
-<unit bldFile="os/deviceplatformrelease/locfiles/group"/>
-</component>
-<component name="locfiles_set1" long-name="Locale Files Set 1" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set1"/>
-</component>
-<component name="locfiles_set2" long-name="Locale Files Set 2" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set2"/>
-</component>
-<component name="locfiles_set3" long-name="Locale Files Set 3" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set3"/>
-</component>
-<component name="locfiles_set4" long-name="Locale Files Set 4" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set4"/>
-</component>
-<component name="locfiles_set5" long-name="Locale Files Set 5" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set5"/>
-</component>
-<component name="locfiles_set6" long-name="Locale Files Set 6" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set6"/>
-</component>
-<!-- is the a problem with SF builds with the following? -->
-<component name="locfiles_set7" long-name="Locale Files Set 7" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set7"/>
-</component>
-<component name="locfiles_set8" long-name="Locale Files Set 8" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set8"/>
-</component>
-<component name="locfiles_set9" long-name="Locale Files Set 9" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set9"/>
-</component>
-<component name="locfiles_set10" long-name="Locale Files Set 10" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set10"/>
-</component>
-<component name="locfiles_set11" long-name="Locale Files Set 11" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set11"/>
-</component>
-<component name="locfiles_set12" long-name="Locale Files Set 12" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set12"/>
-</component>
-<component name="locfiles_set13" long-name="Locale Files Set 13" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set13"/>
-</component>
-<component name="locfiles_set14" long-name="Locale Files Set 14" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set14"/>
-</component>
-<component name="locfiles_set15" long-name="Locale Files Set 15" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set15"/>
-</component>
-<component name="locfiles_set16" long-name="Locale Files Set 16" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set16"/>
-</component>
-</collection>
-<collection name="version" long-name="Version" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="version_build" filter="s60" long-name="Version Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/Version/group"/>
-</component>
-</collection>
-<collection name="helps_loc2" long-name="Helps Locale 2" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helps_loc2_build" long-name="Helps Locale 2 Build" filter="s60">
-<unit bldFile="os/deviceplatformrelease/helps_loc2/group"/>
-</component>
-</collection>
-<collection name="sf_config" long-name="SF Config" level="mid">
-<component name="config" filter="s60" long-name="Config" purpose="development" class="config"/>
-<component name="cenrep" filter="sf_build" long-name="ConE Central Repository Config" purpose="development" class="config">
-<!-- will shoudl give the id/path something more unique than cenrep -->
-<unit bldFile="os/deviceplatformrelease/sf_config/cenrep/group"/>
-</component>
-</collection>
-<!-- should be located locally in buildplatforms/group
- <collection id="s60bld" name="S60 Build">
- <component id="buildplatforms" filter="s60" name="Build Platforms">
- <unit bldFile="/tools/buildplatforms/group"/>
- </component>
- </collection>-->
-<collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
-<component name="cedarutils" long-name="Cedar Utils" purpose="development">
-<unit mrp="os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
-</component>
-<component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt" purpose="development" class="config">
-<unit mrp="os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
-</component>
-<component name="foundation_s60_packages" long-name="Foundation S60 Packages" introduced="^3" deprecated="^3" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/symbianosbld/foundation_s60_packages/foundation_s60_packages.mrp"/>
-</component>
-</collection>
-<collection name="foundation_system" long-name="Foundation System" level="top">
-<component name="system_model" long-name="System Model" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
-</component>
-</collection>
-<collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
-<component name="deviceplatformrelease_metadata" long-name="Device Platform Release Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="osrndtools" level="services" long-name="OS R&D tools" levels="fw trace">
-<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"/>
-</component>
-<component name="testinterface" filter="s60" long-name="Test Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/testinterface/group"/>
-</component>
-<component name="testserver" filter="s60" long-name="Test Server" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserver/group"/>
-</component>
-<component name="testengine" filter="s60" long-name="Test Engine" purpose="development">
-<unit bldFile="os/osrndtools/stif/testengine/group"/>
-</component>
-<component name="testserverstarter" filter="s60" long-name="Test Server Starter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserverstarter/group"/>
-</component>
-<component name="stiftfwif" filter="s60" long-name="STIF Test Framework Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/stiftfwif/group"/>
-</component>
-<component name="consoleui" filter="s60" long-name="Console UI" purpose="development">
-<unit bldFile="os/osrndtools/stif/consoleui/group"/>
-</component>
-<component name="testcombiner" filter="s60" long-name="Test Combiner" purpose="development">
-<unit bldFile="os/osrndtools/stif/testcombiner/group"/>
-</component>
-<component name="demomodule" filter="s60" long-name="Demo Module" purpose="development">
-<unit bldFile="os/osrndtools/stif/demomodule/group"/>
-</component>
-<component name="atslogger" filter="s60" long-name="ATS Logger" purpose="development">
-<unit bldFile="os/osrndtools/stif/atslogger/group"/>
-</component>
-<component name="atsinterface" filter="s60" long-name="ATS Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/atsinterface/group"/>
-</component>
-<component name="testscripter" filter="s60" long-name="Test Scripter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testscripter/group"/>
-</component>
-<component name="suevent" filter="s60" long-name="SU Event" purpose="development">
-<unit bldFile="os/osrndtools/stif/suevent/group"/>
-</component>
-<component name="stifkerneltestclassbase" filter="s60" long-name="STIF Kernel Test Class Base" purpose="development">
-<!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
-<!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
-</component>
-<component name="stif_build" filter="s60" long-name="STIF Build" purpose="development">
-<!-- move exports into self-contained component. Remove this when configuration is in place-->
-<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">
-<unit bldFile="os/osrndtools/memspy/memspy_plat/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/engine/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/console/group"/>
-</component>
-<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>
-</collection>
-<collection name="hti" long-name="Harmonized Test Interface" level="trace">
-<component name="hti_plat" filter="s60" long-name="HTI Platform Interfaces" purpose="development" class="api">
-<unit bldFile="os/osrndtools/hti/hti_plat/group"/>
-</component>
-<component name="hticfg" filter="s60" long-name="HTI Config" purpose="development">
-<unit bldFile="os/osrndtools/hti/hticfg/group"/>
-</component>
-<component name="htiautostart" filter="s60" long-name="HTI Autostart" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiautostart/group"/>
-</component>
-<component name="htiframework" filter="s60" long-name="HTI Framework" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiframework/group"/>
-</component>
-<component name="hticommplugins" filter="s60" long-name="HTI Communication Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
-</component>
-<component name="htiserviceplugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
-</component>
-<component name="htifilehlp" filter="s60" long-name="HTI File Help" purpose="development">
-<unit bldFile="os/osrndtools/hti/htifilehlp/group"/>
-</component>
-<component name="htiwatchdog" filter="s60" long-name="HTI Watchdog" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiwatchdog/group"/>
-</component>
-<component name="hti_build" filter="s60" long-name="HTI Build" purpose="development">
-<!-- move exports into self-contained component.-->
-<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">
-<block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
-<collection name="appsupport_pub" long-name="Generic Application Support Public Interfaces" level="specific">
-<component name="flash_viewer_framework_api" long-name="Flash Viewer Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
-</component>
-<component name="network_status_api" long-name="Network Status API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/network_status_api/group"/>
-</component>
-</collection>
-<collection name="appsupport_plat" long-name="Generic Application Support Platform Interfaces" level="specific">
-<component name="action_plugin_api" long-name="Action Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/action_plugin_api/group"/>
-</component>
-<component name="application_orientation_api" long-name="Application Orientation API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/application_orientation_api/group"/>
-</component>
-<component name="context_access_api" long-name="Context Access API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_access_api/group"/>
-</component>
-<component name="context_framework_services_api" long-name="Context Framework Services API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_services_api/group"/>
-</component>
-<component name="context_framework_client_api" long-name="Context Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_client_api/group"/>
-</component>
-<component name="context_framework_listener_api" long-name="Context Framework Listener API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_listener_api/group"/>
-</component>
-<component name="context_framework_version_api" long-name="Context Framework Version API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_version_api/group"/>
-</component>
-<component name="context_source_plugin_api" long-name="Context Source Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_plugin_api/group"/>
-</component>
-<component name="context_source_settings_manager_api" long-name="Context Source Settings Manager API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_settings_manager_api/group"/>
-</component>
-<component name="context_subscription_api" long-name="Context Subscription API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_subscription_api/group"/>
-</component>
-<component name="key_event_framework_api" long-name="Key Event Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_api/group"/>
-</component>
-<component name="key_event_framework_mapper_api" long-name="Key Event Framework Mapper API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_mapper_api/group"/>
-</component>
-<component name="media_keys_definition_api" long-name="Media Keys Definition API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/media_keys_definition_api/group"/>
-</component>
-<component name="ood_threshold_api" long-name="OOD Threshold API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/ood_threshold_api/group"/>
-</component>
-<component name="oom_monitor_api" long-name="OOM Monitor API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_api/group"/>
-</component>
-<component name="oom_monitor_plugin_api" long-name="OOM Monitor Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_plugin_api/group"/>
-</component>
-<component name="operation_provider_api" long-name="Operation Provider API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/operation_provider_api/group"/>
-</component>
-<component name="phonecmdhandler_api" long-name="Phone Command Handler API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/phonecmdhandler_api/group"/>
-</component>
-<component name="restore_factory_settings_api" long-name="Restore Factory Settings API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_api/group"/>
-</component>
-<component name="restore_factory_settings_plugin_api" long-name="Restore Factory Settings Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_plugin_api/group"/>
-</component>
-<component name="secondary_display_accfw_api" long-name="Secondary Display Accessory Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_accfw_api/group"/>
-</component>
-<component name="secondary_display_startup_api" long-name="Secondary Display Startup API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_startup_api/group"/>
-</component>
-<component name="secondary_display_sysap_api" long-name="Secondary Display System Application API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_sysap_api/group"/>
-</component>
-<component name="secondary_display_system_state_api" long-name="Secondary Display System State API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_system_state_api/group"/>
-</component>
-<component name="sensor_user_setting_api" long-name="Sensor User Setting API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/sensor_user_setting_api/group"/>
-</component>
-<component name="startup_configuration_api" long-name="Startup Configuration API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/startup_configuration_api/group"/>
-</component>
-<component name="system_application_key_handler_plugin_api" long-name="System Application Key Handler Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_key_handler_plugin_api/group"/>
-</component>
-<component name="system_application_light_control_plugin_api" long-name="System Application Light Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_light_control_plugin_api/group"/>
-</component>
-<component name="system_application_notification_api" long-name="System Application Notification API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_notification_api/group"/>
-</component>
-<component name="system_application_plugin_callback_api" long-name="System Application Plug-in Callback API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
-</component>
-</collection>
-<collection name="contextframework" long-name="Context Framework" level="framework">
-<!-- the units that are commented out need to be put back when configuration is in place.
- They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
-<component name="cfw" filter="s60" long-name="Context Framework">
-<!--<unit bldFile="contextframework/cfw/group"/> -->
-</component>
-<component name="cfwplugins" filter="s60" long-name="Context Framework Plugins" plugin="Y">
-<!--<unit bldFile="contextframework/cfwplugins/group"/>-->
-</component>
-<component name="contextframework_build" filter="s60" long-name="Context Framework Build">
-<unit bldFile="mw/appsupport/contextframework/group"/>
-</component>
-</collection>
-<collection name="coreapplicationuis" long-name="Core Application UIs" level="server">
-<component name="dbrecovery" filter="s60" long-name="Database Recovery">
-<unit bldFile="mw/appsupport/coreapplicationuis/dbrecovery/group"/>
-</component>
-<component name="nspswsplugin" filter="s60" long-name="NSPS WS Plugin" plugin="Y">
-<!-- No Service Power Save? Window Server? Please elaborate-->
-<unit bldFile="mw/appsupport/coreapplicationuis/nspswsplugin/group"/>
-</component>
-<component name="rfs" filter="s60" long-name="Restore Factory Settings">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfs/group"/>
-</component>
-<component name="rfsplugins" filter="s60" long-name="Restore Factory Settings Plugins" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/group"/>
-</component>
-<component name="sysap" filter="s60" long-name="System Application">
-<unit bldFile="mw/appsupport/coreapplicationuis/sysap/group"/>
-</component>
-<component name="variatedsettings" filter="s60" long-name="Variated Settings" class="config">
-<unit bldFile="mw/appsupport/coreapplicationuis/variatedsettings/group"/>
-</component>
-<component name="accfwuinotifier" filter="s60" long-name="Accessory Framework UI Notifier" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/accfwuinotifier/group"/>
-</component>
-<component name="kefmapper" filter="s60" long-name="Key Event Framework">
-<unit bldFile="mw/appsupport/coreapplicationuis/kefmapper/group"/>
-</component>
-<component name="advancedtspcontroller" filter="s60" long-name="Advanced TSP Controller">
-<unit bldFile="mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
-</component>
-<component name="powersaveutilities" filter="s60" long-name="Power Save Utilities">
-<unit bldFile="mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
-</component>
-<component name="gsserverenginestub" filter="s60" long-name="GS Server Engine Stub">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
-</component>
-<component name="gsserverengine" filter="s60" long-name="GS Server Engine">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverengine/group"/>
-</component>
-<component name="sensordatacompensatorplugin" filter="s60" long-name="Sensor Data Compensator Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/group"/>
-</component>
-</collection>
-<collection name="flashliteapi_3_1" long-name="Flash Lite API 3.1" level="specific">
-<!-- collection is really a component. Move down a directory -->
-<component name="flashliteapi_3_1_build" long-name="Flash Lite API Build" filter="s60" introduced="^2"/>
-</collection>
-<collection name="mediakeys" long-name="Media Keys" level="plugin">
-<!-- collection is really a component. Move down a directory -->
-<component name="mediakeys_build" filter="s60" long-name="Media Keys Build">
-<unit bldFile="mw/appsupport/mediakeys/group"/>
-</component>
-</collection>
-<collection name="startupservices" long-name="Startup Services" level="system">
-<component name="splashscreen" filter="s60" long-name="Splash Screen">
-<unit bldFile="mw/appsupport/startupservices/splashscreen/group"/>
-</component>
-<component name="startupanimation" filter="s60" long-name="Startup Animation">
-<unit bldFile="mw/appsupport/startupservices/startupanimation/group"/>
-</component>
-<component name="startup" long-name="Startup Application" filter="s60">
-<unit bldFile="mw/appsupport/startupservices/startup/group"/>
-</component>
-</collection>
-<collection name="sysresmonitoring" long-name="System Resource Monitoring" level="system">
-<component name="oodmonitor" filter="s60" long-name="OOD Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oodmonitor/group"/>
-</component>
-<component name="oommonitor" filter="s60" long-name="OOM Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oommonitor/group"/>
-</component>
-</collection>
-<collection name="systemsettings" long-name="System Settings" level="system">
-<component name="gssensorplugin" filter="s60" long-name="GS Sensor Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gssensorplugin/group"/>
-</component>
-<component name="gsaccessoryplugin" filter="s60" long-name="GS Accessory Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gsaccessoryplugin/group"/>
-</component>
-</collection>
-<collection name="filehandling" long-name="File Handling" level="server">
-<component name="fileconverterfw" long-name="File Converter Framework" purpose="optional">
-<unit bldFile="mw/appsupport/filehandling/fileconverterfw/group" mrp="mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
-</component>
-<component name="htmltorichtextconverter" long-name="HTML to RichText Converter" introduced="7.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/htmltorichtextconverter/group" mrp="mw/appsupport/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
-</component>
-<component name="richtexttohtmlconverter" long-name="RichText to HTML Converter" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
-</component>
-</collection>
-<collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
-<component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
-</component>
-</collection>
-<collection name="commonappservices" long-name="Common Application Services" level="framework">
-<component name="alarmserver" long-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"/>
-</component>
-<component name="alarmservertest" long-name="Alarm Server Test" deprecated="^3" introduced="8.1" purpose="development">
-<unit bldFile="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
-</component>
-<component name="appservicesdocs" long-name="Application Services Documentation" purpose="development" class="doc">
-<unit mrp="mw/appsupport/commonappservices/appservicesdocs/app-services_documentation.mrp"/>
-</component>
-<component name="backuprestorenotification" long-name="Backup Restore Notification" introduced="8.1" purpose="optional">
-<unit bldFile="mw/appsupport/commonappservices/backuprestorenotification/group" mrp="mw/appsupport/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
-</component>
-</collection>
-<collection name="tzservices" long-name="Time Zone Services" level="plugin">
-<component name="tzserver" long-name="Time Zone Server" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzserver/group" mrp="mw/appsupport/tzservices/tzserver/group/app-services_tz.mrp"/>
-</component>
-<component name="tzloc" long-name="Time Zone Localization" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzloc/group" mrp="mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
-</component>
-<component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzlocrscfactory/group" mrp="mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
-</component>
-<component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzdatabase/group" mrp="mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
-</component>
-</collection>
-<collection name="contenthandling" long-name="Content Handling" level="plugin">
-<component name="webrecognisers" long-name="Web Recognisers" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/contenthandling/webrecognisers/group" mrp="mw/appsupport/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
-</component>
-</collection>
-<collection name="openenvutils" long-name="Open Environment Utilities" level="specific">
-<component name="commandshell" long-name="Command Shell" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/commandshell/group" mrp="mw/appsupport/openenvutils/commandshell/group/oetools_zsh.mrp"/>
-</component>
-<component name="telnetserver" long-name="Telnet Server" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/telnetserver/group" mrp="mw/appsupport/openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
-</component>
-</collection>
-<collection name="printingsupport" long-name="Printing Support" level="generic">
-<component name="printinguisupport" long-name="Printing UI Support" purpose="optional" introduced="^2" deprecated="^3">
-<unit bldFile="mw/appsupport/printingsupport/printinguisupport/group" mrp="mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
-</component>
-</collection>
-<collection name="appfw" long-name="Application Framework" level="framework">
-<component name="apparchitecture" long-name="Application Architecture" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/apparchitecture/group" mrp="mw/appsupport/appfw/apparchitecture/group/app-framework_apparc.mrp"/>
-</component>
-<component name="viewserver" long-name="View Server" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/viewserver/group" mrp="mw/appsupport/appfw/viewserver/group/app-framework_viewsrv.mrp"/>
-</component>
-</collection>
-<collection name="applaunchservices" long-name="Application Launch Services" level="generic">
-<component name="aftermarketappstarter" long-name="After Market Application Starter" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/aftermarketappstarter/group" mrp="mw/appsupport/applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
-</component>
-<component name="applaunchplugins" long-name="Application Launch Plugins" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/applaunchplugins/group" mrp="mw/appsupport/applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
-</component>
-</collection>
-<collection name="tzpcside" long-name="Time Zone PC Side" level="plugin">
-<component name="tzcompiler" long-name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config PC">
-<unit bldFile="mw/appsupport/tzpcside/tzcompiler/group" mrp="mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
-</component>
-</collection>
-<collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
-<component name="appsupport_metadata" long-name="Generic Application Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="securitysrv" level="generic" long-name="Security Services" levels="plugin framework server generic specific">
-<collection name="secsrv_plat" long-name="Security Services Platform Interfaces" level="specific">
-<component name="cms_api" long-name="CMS API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/cms_api/group"/>
-</component>
-<component name="pkcs12_parser_api" long-name="PKCS12 Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkcs12_parser_api/group"/>
-</component>
-<component name="java_utils_api" long-name="Java Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/java_utils_api/group"/>
-</component>
-<component name="wim_cert_api" long-name="WIM Cert API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/wim_cert_api/group"/>
-</component>
-<component name="device_key_store_encryption_plugin_api" long-name="Device Key Store Encryption Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/device_key_store_encryption_plugin_api/group"/>
-</component>
-<component name="x509certnameparser_api" long-name="X.509 Certificate Name Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
-</component>
-<component name="remote_lock_api" long-name="Remote Lock API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
-</component>
-<component name="pkidialog_api" long-name="PKI Dialog API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
-</component>
-<component name="provisioning_api" long-name="Provisioning API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/provisioning_api/group"/>
-</component>
-<component name="keyguard_configuration_api" long-name="Keyguard Configuration API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_configuration_api/group"/>
-</component>
-<component name="keylock_policy_api" long-name="Keylock Policy API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keylock_policy_api/group"/>
-</component>
-<component name="security_code_ui_api" long-name="Security Code UI API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
-</component>
-<component name="gba_api" long-name="GBA API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/gba_api/group"/>
-</component>
-<component name="keyguard_access_api" long-name="Keyguard Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_access_api/group"/>
-</component>
-<component name="devicelock_access_api" long-name="Device Lock Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devicelock_access_api/group"/>
-</component>
-<component name="lockapp_server_api" long-name="Lock Application Server API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
-</component>
-<component name="devencadaptation_api" long-name="Device Encryption Adaptation API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
-</component>
-<component name="devenccommonutils_api" long-name="Device Encryption Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
-</component>
-</collection>
-<collection name="cms" long-name="Certificate Management Service" level="server">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="cms_build" filter="s60" long-name="CMS" introduced="^3">
-<unit bldFile="mw/securitysrv/cms/group"/>
-</component>
-</collection>
-<collection name="pkiutilities" long-name="PKI Utilities" level="plugin">
-<component name="x509certnameparser" filter="s60" long-name="X.509 Certificate Name Parser">
-<unit bldFile="mw/securitysrv/pkiutilities/x509certnameparser/group"/>
-</component>
-<component name="pkcs12" filter="s60" long-name="PKCS #12">
-<unit bldFile="mw/securitysrv/pkiutilities/pkcs12/group"/>
-</component>
-<component name="certmanui" filter="s60" long-name="Certificate Management UI">
-<unit bldFile="mw/securitysrv/pkiutilities/certmanui/group"/>
-</component>
-<component name="ctsecuritydialogs" filter="s60" long-name="Crypto Token Security Dialogs">
-<unit bldFile="mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
-</component>
-<component name="certsaver" filter="s60" long-name="Certificate Saver">
-<unit bldFile="mw/securitysrv/pkiutilities/certsaver/group"/>
-</component>
-<component name="secmodui" filter="s60" long-name="Security Module UI">
-<unit bldFile="mw/securitysrv/pkiutilities/secmodui/group"/>
-</component>
-<component name="devicetoken" filter="s60" long-name="Device Token">
-<unit bldFile="mw/securitysrv/pkiutilities/devicetoken/group"/>
-</component>
-<component name="certificates" filter="s60" long-name="Certificates">
-<unit bldFile="mw/securitysrv/pkiutilities/Certificates/group" filter="sf_build"/>
-</component>
-<component name="pkiutilities_build" filter="s60" long-name="PKI Utilities Build">
-<!-- need to split this into the above components -->
-<unit bldFile="mw/securitysrv/pkiutilities/group"/>
-</component>
-<component name="ocsp" long-name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
-<unit bldFile="mw/securitysrv/pkiutilities/ocsp/group" mrp="mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
-</component>
-</collection>
-<collection name="wim" long-name="Wireless Identity Module " level="framework">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="wim_build" filter="s60" long-name="WIM Build">
-<unit bldFile="mw/securitysrv/wim/group"/>
-</component>
-</collection>
-<collection name="remotelock" long-name="Remote Lock" level="generic">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="remotelock_build" filter="s60" long-name="Remote Lock Build">
-<unit bldFile="mw/securitysrv/remotelock/group"/>
-</component>
-</collection>
-<collection name="securitydialogs" long-name="Security Dialogs" level="specific">
-<component name="keylockpolicyapi" filter="s60" long-name="Keylock Policy API">
-<unit bldFile="mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
-</component>
-<component name="autolock" long-name="Autolock" filter="s60">
-<unit bldFile="mw/securitysrv/securitydialogs/autolock/group"/>
-</component>
-<component name="secui" filter="s60" long-name="Security UI">
-<unit bldFile="mw/securitysrv/securitydialogs/secui/group"/>
-</component>
-<component name="securitynotifier" filter="s60" long-name="Security Notifier">
-<unit bldFile="mw/securitysrv/securitydialogs/securitynotifier/group"/>
-</component>
-<component name="lockclient" filter="s60" long-name="Lock Client" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockclient/group"/>
-</component>
-<component name="lockapp" filter="s60" long-name="Lock Application" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockapp/group"/>
-</component>
-<component name="simlockui" filter="s60" long-name="SIM Lock UI" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/simlockui/group"/>
-</component>
-</collection>
-<collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="boottimeintegritycheck_build" filter="s60" long-name="Boot Time Integrity Check Build">
-<unit bldFile="mw/securitysrv/boottimeintegritycheck/group"/>
-</component>
-</collection>
-<collection name="gba" long-name="Generic Bootstrapping Architecture" level="server">
-<component name="uicc" filter="s60" long-name="UICC" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/uicc/group"/>
-</component>
-<component name="gbaserver" filter="s60" long-name="GBA Server" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaserver/group"/>
-</component>
-<component name="gbaapi" filter="s60" long-name="GBA API" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaapi/group"/>
-</component>
-<component name="gbafilter" filter="s60" long-name="GBA HTTP Filter" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/gbafilter/group"/>
-</component>
-<component name="gba_build" filter="s60" long-name="Generic Boot Architecture Build" introduced="^2">
-<!-- need to split this into the above components, or remove #includes and make this GBA ROM -->
-<unit bldFile="mw/securitysrv/gba/group"/>
-</component>
-</collection>
-<collection name="devencdiskutils" long-name="Device Encryption Disk Utils" level="server">
-<component name="devenccommonutils" filter="s60" long-name="Device Encryption Common Utils" introduced="^3">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncCommonUtils/group"/>
-</component>
-<component name="devencrfsplugin" filter="s60" long-name="Device Encryption RFS Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncRfsPlugin/group"/>
-</component>
-<component name="pk5recognizer" filter="s60" long-name="Device Encryption Pk5 Recognizer" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/Pk5Recognizer/group"/>
-</component>
-<component name="devencstarter" filter="s60" long-name="Device Encryption Starter" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncStarter/group"/>
-</component>
-<component name="devencdiskutils" filter="s60" long-name="Device Encryption Disk Utils Build" introduced="^3">
-<!-- need to split this into the above components, or remove #includes and make this a ROM component-->
-<unit bldFile="mw/securitysrv/devencdiskutils/group"/>
-</component>
-</collection>
-<collection name="securitysrv_info" long-name="Security Services Info" level="specific">
-<component name="securitysrv_metadata" long-name="Security Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="drm" level="generic" long-name="DRM" levels="plugin framework server generic specific">
-<collection name="drm_plat" long-name="DRM Platform Interfaces" level="specific">
-<component name="roap_api" long-name="ROAP API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/roap_api/group"/>
-</component>
-<component name="drm_common_api" long-name="DRM Common API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_common_api/group"/>
-</component>
-<component name="drm_rights_api" long-name="DRM Rights API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_rights_api/group"/>
-</component>
-<component name="drm_legacy_api" long-name="DRM Legacy API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_legacy_api/group"/>
-</component>
-<component name="dcf_repository_api" long-name="DCF Repository API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/dcf_repository_api/group"/>
-</component>
-<component name="drm_service_api" long-name="DRM Service API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_service_api/group"/>
-</component>
-<component name="drm_secondary_display_api" long-name="DRM Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_secondary_display_api/group"/>
-</component>
-<component name="drm_license_manager_api" long-name="DRM License Manager API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_license_manager_api/group"/>
-</component>
-<component name="drm_utility_api" long-name="DRM Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_utility_api/group"/>
-</component>
-<component name="drm_agents_api" long-name="DRM Agents API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_agents_api/group"/>
-</component>
-<component name="wmdrm_core_api" long-name="WM DRM Core API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_core_api/group"/>
-</component>
-<component name="wmdrm_access_api" long-name="WMDRM Access API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_access_api/group"/>
-</component>
-<component name="camese_utility_api" long-name="Camese Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_utility_api/group"/>
-</component>
-<component name="camese_framework_api" long-name="Camese Framework API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_framework_api/group"/>
-</component>
-</collection>
-<collection name="drm_pub" long-name="DRM Public Interfaces" level="specific">
-<component name="drm_helper_api" long-name="DRM Helper API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_helper_api/group"/>
-</component>
-<component name="oma_drm_caf_agent_api" long-name="OMA DRM CAF Agent API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/group"/>
-</component>
-<component name="drm_license_checker_api" long-name="DRM License Checker API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_license_checker_api/group"/>
-</component>
-</collection>
-<collection name="commondrm" long-name="Common DRM" level="generic">
-<!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
-<component name="drmencryptor" filter="s60" long-name="DRM Encryptor" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmsettingsplugin" filter="s60" long-name="DRM Settings Plugin" plugin="Y" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmrightsmanagerui" filter="s60" long-name="DRM Rights Manager UI">
-<unit bldFile="mw/drm/commondrm/drmrightsmanagerui/help/group"/>
-</component>
-<component name="drmutility" filter="s60" long-name="DRM Utility">
-<!-- Uncomment unit when configuration is in place. Currently #included from commondrm_build -->
-<!--<unit bldFile="commondrm/drmutility/group"/>-->
-</component>
-<component name="drmserviceapiwrapper" filter="s60" long-name="DRM Service API Wrapper">
-<unit bldFile="mw/drm/commondrm/drmserviceapiwrapper/group"/>
-</component>
-<component name="drmrightsstoringlocation" filter="s60" long-name="DRM Rights Storing Location">
-<unit bldFile="mw/drm/commondrm/drmrightsstoringlocation/group"/>
-</component>
-<component name="commondrm_build" filter="s60" long-name="Common DRM Build">
-<!-- should be split into the above files, or them collapsed into a single component -->
-<unit bldFile="mw/drm/commondrm/group"/>
-</component>
-</collection>
-<collection name="omadrm" long-name="OMA DRM" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="omadrm_build" filter="s60" long-name="OMA DRM Build">
-<unit bldFile="mw/drm/omadrm/group"/>
-</component>
-<component name="foundationcerts" filter="sf_build" long-name="Foundation Certificates">
-<unit bldFile="mw/drm/omadrm/foundationcerts/group"/>
-</component>
-</collection>
-<collection name="wmdrm" long-name="Windows Media DRM" level="framework">
-<!-- collection is really a component. Move down a directory -->
-<component name="wmdrm_build" filter="s60" long-name="WM DRM Build">
-<unit bldFile="mw/drm/wmdrm/group"/>
-</component>
-</collection>
-<collection name="drm_info" long-name="DRM Info" level="specific"/>
-</block>
-<block name="locationsrv" level="specific" long-name="Location Services" levels="plugin fw server if">
-<collection name="locsrv_pub" long-name="Location Services Public Interfaces" level="if">
-<component name="landmarks_search_api" long-name="Landmarks Search API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
-</component>
-<component name="landmarks_api" long-name="Landmarks API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/group"/>
-</component>
-<component name="landmarks_database_management_api" long-name="Landmarks Database Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/group"/>
-</component>
-<component name="location_triggering_api" long-name="Location Triggering API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/location_triggering_api/group"/>
-</component>
-<component name="blid_application_satellite_info_api" long-name="BLID Application Satellite Info API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/group"/>
-</component>
-</collection>
-<collection name="locsrv_plat" long-name="Location Services Platform Interfaces" level="if">
-<component name="map_and_navigation_api" long-name="Map and Navigation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/group"/>
-</component>
-<component name="map_and_navigation_provider_discovery_api" long-name="Map and Navigation Provider Discovery API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/group"/>
-</component>
-<component name="geocoding_api" long-name="Geocoding API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
-</component>
-<component name="map_image_api" long-name="Map Image API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/group"/>
-</component>
-<component name="map_and_navigation_aiw_api" long-name="Map and Navigation AIW API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_aiw_api/group"/>
-</component>
-<component name="map_and_navigation_provider_api" long-name="Map and Navigation Provider API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_api/group"/>
-</component>
-<component name="landmarks_category_definition_api" long-name="Landmarks Category Definition API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
-</component>
-<component name="supl_settings_api" long-name="SUPL Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
-</component>
-<component name="location_settings_launch_api" long-name="Location Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/group"/>
-</component>
-<component name="map_image_conversion_plugin_api" long-name="Map Image Conversion Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/group"/>
-</component>
-<component name="psy_configuration_ui_plugin_api" long-name="PSY Configuration UI Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/psy_configuration_ui_plugin_api/group"/>
-</component>
-<component name="np_proxy_configuration_api" long-name="NP Proxy Configuration API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/np_proxy_configuration_api/group"/>
-</component>
-<component name="supl_terminal_initiation_api" long-name="SUPL Terminal Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/group"/>
-</component>
-<component name="location_notation_preferences_settings_api" long-name="Location Notation Preferences Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_notation_preferences_settings_api/group"/>
-</component>
-<component name="supl_settings_notifier_secondary_display_api" long-name="SUPL Settings Notifier Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_notifier_secondary_display_api/group"/>
-</component>
-<component name="supl_network_initiation_api" long-name="SUPL Network Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/group"/>
-</component>
-<component name="privacy_notifiers_secondary_display_api" long-name="Privacy Notifiers Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/privacy_notifiers_secondary_display_api/group"/>
-</component>
-<component name="oma_supl_configuration_parameter_api" long-name="OMA SUPL Configuration Parameter API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_configuration_parameter_api/group"/>
-</component>
-<component name="supl_query_secondary_display_api" long-name="SUPL Query Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_query_secondary_display_api/group"/>
-</component>
-<component name="location_triggering_management_api" long-name="Location Triggering Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_management_api/group"/>
-</component>
-<component name="location_triggering_status_information_api" long-name="Location Triggering Status Information API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_status_information_api/group"/>
-</component>
-<component name="oma_supl_asn_codec_plugin_api" long-name="OMA SUPL ASN Codec Plugin API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
-</component>
-<component name="location_local_variation_api" long-name="Location Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_local_variation_api/group"/>
-</component>
-<component name="query_and_notification_api" long-name="Query and Notification API" filter="s60" class="api">
-<!-- not yet supplied <meta rel="Api" href="locsrv_plat/query_and_notification_api/query_and_notification_api.metaxml"/> -->
-<unit bldFile="mw/locationsrv/locsrv_plat/query_and_notification_api/group"/>
-</component>
-</collection>
-<collection name="genericpositioningplugins" long-name="Generic Positioning Plugins" level="plugin">
-<component name="locationnpppsy" filter="s60" long-name="Location Positioning Proxy PSY" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
-</component>
-<component name="locationsuplpsy" filter="s60" long-name="Location SUPL PSY" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationsuplpsy/group"/>
-</component>
-<component name="genericpositioningplugins_build" filter="s60" long-name="Generic Positioning Plugins Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/genericpositioningplugins/group"/>
-</component>
-</collection>
-<collection name="landmarks" long-name="Landmarks" level="server">
-<component name="locationlandmarks" filter="s60" long-name="Location Landmarks">
-<unit bldFile="mw/locationsrv/landmarks/locationlandmarks/group"/>
-</component>
-</collection>
-<collection name="locationmapnavfw" long-name="Location Map and Navigation Framework" level="fw">
-<component name="mnlibrary" filter="s60" long-name="Map and Navigation Library">
-<unit bldFile="mw/locationsrv/locationmapnavfw/library/group"/>
-</component>
-<component name="mnaiwprovider" filter="s60" long-name="Map and Navigation AIW Provider" plugin="Y">
-<unit bldFile="mw/locationsrv/locationmapnavfw/aiwprovider/group"/>
-</component>
-<component name="locationmapnavfw_build" filter="s60" long-name="Location Map and Navigation Framework Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/locationmapnavfw/group"/>
-</component>
-</collection>
-<collection name="locationsystemui" long-name="Location System UI" level="if">
-<component name="locationsysui" filter="s60" long-name="Location System UI">
-<unit bldFile="mw/locationsrv/locationsystemui/locationsysui/group"/>
-</component>
-</collection>
-<collection name="supl" long-name="SUPL" level="fw">
-<component name="locationsuplfw" filter="s60" long-name="Location SUPL Framework">
-<unit bldFile="mw/locationsrv/supl/locationsuplfw/group"/>
-</component>
-<component name="locationomasuplprotocolhandler" filter="s60" long-name="OMA SUPL Protocol Handler">
-<unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/group"/>
-</component>
-<component name="supltiapiimplementation" filter="s60" long-name="SUPL TI API Implementation" introduced="^3">
-<unit bldFile="mw/locationsrv/supl/supltiapiimplementation/group"/>
-</component>
-</collection>
-<collection name="locationtriggering" long-name="Location Triggering" level="server">
-<component name="ltlogger" filter="s60" long-name="LT Logger">
-<unit bldFile="mw/locationsrv/locationtriggering/ltlogger/group"/>
-</component>
-<component name="ltclientlib" filter="s60" long-name="LT Client Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltclientlib/group"/>
-</component>
-<component name="ltmanagementlib" filter="s60" long-name="LT Management Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmanagementlib/group"/>
-</component>
-<component name="ltcontainer" filter="s60" long-name="LT Container">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontainer/group"/>
-</component>
-<component name="ltserver" filter="s60" long-name="LT Server">
-<unit bldFile="mw/locationsrv/locationtriggering/ltserver/group"/>
-</component>
-<component name="ltstrategypluginapi" filter="s60" long-name="LT Strategy Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategypluginapi/group"/>
-</component>
-<component name="ltstrategyengine" filter="s60" long-name="LT Strategy Engine">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategyengine/group"/>
-</component>
-<component name="ltmovementdetectionpluginapi" filter="s60" long-name="Movement Detection Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmovementdetectionpluginapi/group"/>
-</component>
-<component name="ltcellidmovementdetector" filter="s60" long-name="Cell ID Movement Detector">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/>
-</component>
-<component name="lbtmgmtui" filter="s60" long-name="LBT Management UI" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/lbtmgmtui/group"/>
-</component>
-<component name="ltcontextsourceplugin" filter="s60" long-name="LT Context Source Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontextsourceplugin/group"/>
-</component>
-<component name="locationtriggering_build" filter="s60" long-name="Location Triggering Build">
-<!-- should remove #include from this and maybe put exports in the above components -->
-<unit bldFile="mw/locationsrv/locationtriggering/group"/>
-</component>
-</collection>
-</block>
-<block name="accesssec" level="generic" long-name="Access Security" levels="plugin framework server generic specific">
-<collection name="accesssec_plat" long-name="Access Security Platform Interfaces" level="specific">
-<component name="wapi_security_settings_ui_api" long-name="WAPI Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_security_settings_ui_api/group"/>
-</component>
-<component name="wep_security_settings_ui_api" long-name="WEP Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wep_security_settings_ui_api/group"/>
-</component>
-<component name="wi-fi_protected_setup_ui_api" long-name="Wi-Fi Protected Setup UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
-</component>
-<component name="wlan_eap_settings_ui_api" long-name="WLAN EAP Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wlan_eap_settings_ui_api/group"/>
-</component>
-<component name="wpa_security_settings_ui_api" long-name="WPA Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wpa_security_settings_ui_api/group"/>
-</component>
-<component name="eap_vpn_api" long-name="EAP VPN API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
-</component>
-<component name="eapsim_db_api" long-name="EAP-SIM DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapsim_db_api/group"/>
-</component>
-<component name="eap_type_api" long-name="EAP Type API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_type_api/group"/>
-</component>
-<component name="eaptlspeap_db_api" long-name="EAP-TLS-PEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eaptlspeap_db_api/group"/>
-</component>
-<component name="eapleap_db_api" long-name="LEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapleap_db_api/group"/>
-</component>
-<component name="eapgtc_db_api" long-name="EAP-GTC DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapgtc_db_api/group"/>
-</component>
-<component name="eapmschapv2_db_api" long-name="EAP-MSCHAPV2 DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapmschapv2_db_api/group"/>
-</component>
-<component name="eapaka_db_api" long-name="EAP-AKA DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapaka_db_api/group"/>
-</component>
-<component name="wapi_db_api" long-name="WAPI DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_db_api/group"/>
-</component>
-</collection>
-<collection name="wlansecuritysettings" long-name="WLAN Security Settings" level="specific">
-<component name="wapisecuritysettingsui" filter="s60" long-name="WAPI Security Settings UI" introduced="9.1">
-<!-- the directory for this needs to be moved up to the right level -->
-<unit bldFile="mw/accesssec/wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
-</component>
-<component name="wepsecuritysettingsui" filter="s60" long-name="WEP Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wepsecuritysettingsui/group"/>
-</component>
-<component name="wifiprotectedsetup" filter="s60" long-name="WIFI Protected Setup" introduced="^1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wifiprotectedsetup/group"/>
-</component>
-<component name="wlaneapsettingsui" filter="s60" long-name="WLAN EAP Settings UI" introduced="9.3">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wlaneapsettingsui/group"/>
-</component>
-<component name="wpasecuritysettingsui" filter="s60" long-name="WPA Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wpasecuritysettingsui/group"/>
-</component>
-</collection>
-<collection name="eapol" long-name="EAPOL" level="framework">
-<component name="eapol_framework" filter="s60" long-name="EAPOL Framework" introduced="9.2">
-<unit bldFile="mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
-</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">
-<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>
-<component name="bearer_settings_plugin_api" long-name="Bearer Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/bearer_settings_plugin_api/group"/>
-</component>
-<component name="commsdat_wlan_api" long-name="CommsDat WLAN API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/commsdat_wlan_api/group"/>
-</component>
-<component name="connection_monitor_extension_api" long-name="Connection Monitor Extension API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_monitor_extension_api/group"/>
-</component>
-<component name="connection_ui_utilities_api" long-name="Connection UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_ui_utilities_api/group"/>
-</component>
-<component name="disconnect_dialog_api" long-name="Disconnect Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_api/group"/>
-</component>
-<component name="disconnect_dialog_disable_api" long-name="Disconnect Dialog Disable API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_disable_api/group"/>
-</component>
-<component name="extended_connection_settings_api" long-name="Extended Connection Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/extended_connection_settings_api/group"/>
-</component>
-<component name="mpm_default_connection_api" long-name="MPM Default Connection API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_default_connection_api/group"/>
-</component>
-<component name="pdpcontextmanager2_reset_factory_settings_api" long-name="PDP Context Manager 2 Reset Factory Settings API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_settings_api/group"/>
-</component>
-<component name="mpm_connect_screen_api" long-name="MPM Connect Screen API" filter="s60" class="api">
-<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">
-<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>
-<component name="access_point_engine_api" long-name="Access Point Engine API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_monitor_server_api/group"/>
-</component>
-<component name="connection_settings_ui_api" long-name="Connection Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_ui_api/group"/>
-</component>
-<component name="agent_dialog_api" long-name="Agent Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/agent_dialog_api/group"/>
-</component>
-<component name="extendedconnpref_api" long-name="Extended Connection Preferences API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/extendedconnpref_api/group"/>
-</component>
-</collection>
-<collection name="accesspointcontrol" long-name="Access Point Control" level="plugin">
-<component name="apcontrollistplugin" filter="s60" long-name="Access Point Control List Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
-</component>
-</collection>
-<collection name="alwayson_net_plugin" long-name="Always Online Net Plugin" level="server">
-<component name="pdpcontextmanager2" filter="s60" long-name="PDP Context Manager 2">
-<unit bldFile="mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
-</component>
-</collection>
-<collection name="apengine" long-name="Access Point Engine" level="framework">
-<component name="apeng" filter="s60" long-name="Access Point Engine">
-<unit bldFile="mw/ipconnmgmt/apengine/apeng/group"/>
-</component>
-<component name="apsettingshandlerui" filter="s60" long-name="Access Point Settings Handler UI">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingshandlerui/group"/>
-</component>
-<component name="apsettingsplugin" filter="s60" long-name="Access Point Settings Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="bearermanagement" long-name="Bearer Management" level="framework">
-<component name="mpm" filter="s60" long-name="Mobility Policy Manager">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/mpm/group"/>
-</component>
-<component name="extendedconnpref" filter="s60" long-name="Extended Connection Preferences">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/extendedconnpref/group"/>
-</component>
-<component name="s60mcpr" filter="s60" long-name="S60 Meta-Connection Provider" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/S60MCPR/group"/>
-</component>
-</collection>
-<collection name="cmmanager" long-name="Connection Method Manager" level="framework">
-<component name="cmmgr" filter="s60" long-name="CM Manager">
-<unit bldFile="mw/ipconnmgmt/cmmanager/cmmgr/group"/>
-</component>
-<component name="gsconnsettingsplugin" filter="s60" long-name="GS Connection Settings Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/cmmanager/gsconnsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="connectionmonitoring" long-name="Connection Monitoring" level="server">
-<component name="connectionmonitorplugin" filter="s60" long-name="Connection Monitor Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorplugin/group"/>
-</component>
-<component name="connectionmonitorui" filter="s60" long-name="Connection Monitor UI">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorui/group"/>
-</component>
-<component name="connmon" filter="s60" long-name="Connection Monitor">
-<!-- either split into two components, or #include from a common bld.inf -->
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/connectionmonitor/group"/>
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/dataconnectionlogger/group"/>
-</component>
-<component name="connmonext" filter="s60" long-name="Connection Monitor Extension API">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmonext/group"/>
-</component>
-</collection>
-<collection name="connectionutilities" long-name="Connection Utilities" level="utils">
-<component name="connectiondialogs" filter="s60" long-name="Connection Dialogs">
-<unit bldFile="mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/>
-</component>
-</collection>
-<collection name="dbcreator" long-name="DB Creator" level="utils">
-<component name="commsdatcreator" filter="s60" long-name="Comms Database Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
-</component>
-<component name="commsdatcreatorrfsplugin" filter="s60" long-name="Comms Database Creator RFS Plugin" introduced="9.3" plugin="Y">
-<!-- uncomment when config is turned on -->
-<!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
-</component>
-<component name="commsdatstartup" filter="s60" long-name="Comms Database Startup" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
-</component>
-<component name="dbcreatorexe" filter="s60" long-name="DB Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
-</component>
-<component name="dbcreator_build" filter="s60" long-name="DB Creator Build" introduced="9.3">
-<!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
-<unit bldFile="mw/ipconnmgmt/dbcreator/group"/>
-</component>
-</collection>
-<collection name="ipconnmgmt_info" long-name="IP Connectivity Management Info" level="utils">
-<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"/>
-</component>
-</collection>
-</block>
-<block name="netprotocols" level="generic" long-name="High-level Internet Protocols" levels="plugin framework server generic specific">
-<collection name="netprotocols_plat" long-name="High-level Internet Protocols Platform Interfaces" level="specific">
-<component name="cookie_manager_api" long-name="Cookie Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/cookie_manager_api/group"/>
-</component>
-<component name="http_cache_mgr_api" long-name="HTTP Cache Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_cache_mgr_api/group"/>
-</component>
-<component name="http_filters_api" long-name="HTTP Filters API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_filters_api/group"/>
-</component>
-</collection>
-<collection name="httpfilters" long-name="HTTP Filters" level="plugin">
-<component name="httpfiltercommon" filter="s60" long-name="HTTP Filter Common">
-<unit bldFile="mw/netprotocols/httpfilters/httpfiltercommon/group"/>
-</component>
-<component name="cookie" filter="s60" long-name="Cookie Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/cookie/group"/>
-</component>
-<component name="deflatefilter" filter="s60" long-name="Deflate Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/deflatefilter/group"/>
-</component>
-<component name="httpfilteracceptheader" filter="s60" long-name="Accept Header Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteracceptheader/group"/>
-</component>
-<component name="httpfilterauthentication" filter="s60" long-name="Authentication Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterauthentication/group"/>
-</component>
-<component name="httpfilterconnhandler" filter="s60" long-name="Connection Handler Fitler" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterconnhandler/group"/>
-</component>
-<component name="httpfilteriop" filter="s60" long-name="HTTP IOP Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteriop/group"/>
-</component>
-<component name="httpfilterproxy" filter="s60" long-name="HTTP Proxy Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterproxy/group"/>
-</component>
-<component name="uaproffilter" filter="s60" long-name="UAProf Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/uaproffilter/group"/>
-</component>
-</collection>
-<collection name="applayerprotocols" long-name="Application Layer Protocols" level="server">
-<component name="httptransportfw" long-name="HTTP Transport Framework" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
-</component>
-<component name="httpexamples" long-name="HTTP Examples" introduced="6.2" purpose="development">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpexamples/group" mrp="mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
-</component>
-<component name="wappushsupport" long-name="WAP Push Support" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
-</component>
-<component name="wapbase" long-name="WAP Base" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wapbase/Group" mrp="mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
-</component>
-<component name="ftpengine" long-name="FTP Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/ftpengine/group" mrp="mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
-</component>
-<component name="telnetengine" long-name="Telnet Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/telnetengine/group" mrp="mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
-</component>
-<component name="httpserviceapi" long-name="HTTP Service API" introduced="TB9.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpservice/group" mrp="mw/netprotocols/applayerprotocols/httpservice/group/http_service.mrp"/>
-</component>
-</collection>
-<collection name="applayerpluginsandutils" long-name="Application Layer Plugins and Utils" level="framework">
-<component name="uripermissionservices" long-name="URI Permission Services" introduced="^2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
-</component>
-<component name="bookmarksupport" long-name="Bookmark Support" introduced="9.1" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
-</component>
-<component name="httpprotocolplugins" long-name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
-</component>
-<component name="httptransportplugins" long-name="HTTP Transport Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
-</component>
-</collection>
-<collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
-<component name="netprotocols_metadata" long-name="High-level Internet Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ipappprotocols" level="generic" long-name="IP App Protocols" levels="plugin conn server if">
-<collection name="ipappprotocols_plat" long-name="IP App Protocols Platform Interfaces" level="if">
-<component name="srtp_api" long-name="SRTP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/srtp_api/group"/>
-</component>
-<component name="rtprtcp_api" long-name="RTP/RTCP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/rtprtcp_api/group"/>
-</component>
-</collection>
-<collection name="rtp" long-name="RTP" level="server">
-<component name="srtpstack" filter="s60" long-name="SRTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/srtpstack/group"/>
-</component>
-<component name="rtpstack" filter="s60" long-name="RTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/rtpstack/group"/>
-</component>
-</collection>
-<collection name="realtimenetprots" long-name="Real Time Net Protocols" level="server">
-<component name="symrtp" long-name="RTP" introduced="9.0" purpose="optional">
-<!-- Real Time Data Protocol -->
-<unit bldFile="mw/ipappprotocols/realtimenetprots/rtp/group" mrp="mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
-</component>
-<component name="sipfw" long-name="SIP Framework" introduced="9.2" purpose="optional">
-<unit bldFile="mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp" version="2"/>
-</component>
-</collection>
-<collection name="sipplugins" long-name="SIP Plugins" level="plugin">
-<component name="sippwlanplugin" filter="s60" long-name="SIP WLAN Plugin" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
-</component>
-<component name="sippsipsettingsui" filter="s60" long-name="SIP Settings UI" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
-</component>
-<component name="sippdevmgmtsipadapter" filter="s60" long-name="Device Management SIP Settings Adapter" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
-</component>
-<component name="sippsystemstatemonitor" filter="s60" long-name="SIP System State Monitor" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsystemstatemonitor/group"/>
-</component>
-<component name="sippsipadapter" filter="s60" long-name="SIP Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipadapter/group"/>
-</component>
-</collection>
-<collection name="sipproviderplugins" long-name="SIP Provider Plugins" level="conn">
-<component name="sipprovider" long-name="SIP Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipproviderplugins/sipprovider/group" mrp="mw/ipappprotocols/sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
-</component>
-</collection>
-<collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="if">
-<component name="ipappprotocols_metadata" long-name="IP App Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wirelessacc" level="specific" long-name="Wireless Access" levels="framework generic ui">
-<collection name="hsfw_plat" long-name="HotSpot Framework Platform Interfaces" level="ui">
-<component name="hotspot_framework_client_api" long-name="HotSpot Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_api" long-name="Internet Connectivity Test Service API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_settings_api" long-name="Internet Connectivity Test Service Settings API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
-</component>
-<component name="hotspot_framework_client_plugin_api" long-name="HotSpot Framework Client Plugin API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
-</component>
-</collection>
-<collection name="hotspotfw" long-name="HotSpot Framework" level="framework">
-<component name="hsserver" filter="s60" long-name="HotSpot Server" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="hsclient" filter="s60" long-name="HotSpot Client" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="internetconnectivitytestservice" filter="s60" long-name="Internet Connectivity Test Service" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
-</component>
-<component name="ictsdialogs" filter="s60" long-name="Internet Connectivity Test Service Dialogs" deprecated="^3" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
-</component>
-<component name="hspluginforagent" filter="s60" long-name="HotSpot Plugin for Agent" plugin="Y" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
-</component>
-<component name="hsbrowser" filter="s60" long-name="HotSpot Browser" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
-</component>
-<component name="hotspotfw_build" filter="s60" long-name="Hotspot Framework Build">
-<!-- should break up this bld.inf into the above components, or collapse them all into a single component -->
-<unit bldFile="mw/wirelessacc/hotspotfw/group"/>
-</component>
-</collection>
-<collection name="wlanutilities" long-name="WLAN Utilities" level="generic">
-<component name="wlanplugin" filter="s60" long-name="WLAN Plugin" plugin="Y">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlanplugin/group"/>
-</component>
-<component name="wlansettingsui" filter="s60" long-name="WLAN Settings UI">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlansettingsui/group"/>
-</component>
-<component name="wlansniffer" filter="s60" long-name="WLAN Sniffer">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlansniffer/group"/>
-</component>
-<component name="wlanindicatorplugin" filter="s60" long-name="WLAN Indicator Plugin" plugin="Y">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlanindicatorplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="vpnclient" level="specific" long-name="VPN Client" levels="engine ui api">
-<!-- is the !oem_build filter needed? -->
-<collection name="vpnc_plat" long-name="VPN Client Platform Interfaces" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API" class="api">
-<unit bldFile="mw/vpnclient/vpnc_plat/vpnapi/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API">
-<unit bldFile="mw/vpnclient/vpnapiimpl/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnengine" long-name="VPN Engine" level="engine">
-<!-- too many components in this collection.
- Probably best to group the binaries together into larger components
- or maybe split the collection into more reasonable groups -->
-<component name="eventmediatorapi" filter="s60" long-name="Event Mediator API">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediatorapi/group" filter="!oem_build"/>
-</component>
-<component name="eventviewer" filter="s60" long-name="Event Viewer">
-<unit bldFile="mw/vpnclient/vpnengine/eventviewer/group" filter="!oem_build"/>
-</component>
-<component name="vpnins" filter="s60" long-name="VPN Installer">
-<unit bldFile="mw/vpnclient/vpnengine/vpnins/group" filter="!oem_build"/>
-</component>
-<component name="ikepolparser" filter="s60" long-name="IKE Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/ikepolparser/group" filter="!oem_build"/>
-</component>
-<component name="utlbase64" filter="s60" long-name="Base64 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlbase64/group" filter="!oem_build"/>
-</component>
-<component name="utlcrypto" filter="s60" long-name="Crypto Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlcrypto/group" filter="!oem_build"/>
-</component>
-<component name="utlxml" filter="s60" long-name="XML Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlxml/group" filter="!oem_build"/>
-</component>
-<component name="utlpkcs10" filter="s60" long-name="PKCS#10 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs10/group" filter="!oem_build"/>
-</component>
-<component name="pkiserviceapi" filter="s60" long-name="PKI Service API">
-<unit bldFile="mw/vpnclient/vpnengine/pkiserviceapi/group" filter="!oem_build"/>
-</component>
-<component name="ikecert" filter="s60" long-name="IKE Certificate Management">
-<unit bldFile="mw/vpnclient/vpnengine/ikecert/group" filter="!oem_build"/>
-</component>
-<component name="kmdapi" filter="s60" long-name="Key Management Daemon API">
-<unit bldFile="mw/vpnclient/vpnengine/kmdapi/group" filter="!oem_build"/>
-</component>
-<component name="kmdserver" filter="s60" long-name="Key Management Daemon Server">
-<unit bldFile="mw/vpnclient/vpnengine/kmdserver/group" filter="!oem_build"/>
-</component>
-<component name="ikeutils" filter="s60" long-name="Internet Key Exchange Utils">
-<unit bldFile="mw/vpnclient/vpnengine/ikeutils/group" filter="!oem_build"/>
-</component>
-<component name="ikev1lib" filter="s60" long-name="IKEv1 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev1lib/group" filter="!oem_build"/>
-</component>
-<component name="ikev2lib" filter="s60" long-name="IKEv2 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev2lib/group" filter="!oem_build"/>
-</component>
-<component name="vpnipsecpolparser" filter="s60" long-name="VPN IPsec Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/vpnipsecpolparser/group" filter="!oem_build"/>
-</component>
-<component name="sit" filter="s60" long-name="Socket Interaction Thread">
-<unit bldFile="mw/vpnclient/vpnengine/sit/group" filter="!oem_build"/>
-</component>
-<component name="vpntcwrapper" filter="s60" long-name="VPN Terminal Control Wrapper">
-<unit bldFile="mw/vpnclient/vpnengine/vpntcwrapper/group" filter="!oem_build"/>
-</component>
-<component name="eventmediator" filter="s60" long-name="Event Mediator">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediator/group" filter="!oem_build"/>
-</component>
-<component name="pkiservice" filter="s60" long-name="PKI Service">
-<unit bldFile="mw/vpnclient/vpnengine/pkiservice/group" filter="!oem_build"/>
-</component>
-<component name="vpnconnagt" filter="s60" long-name="VPN Connection Agent">
-<unit bldFile="mw/vpnclient/vpnengine/vpnconnagt/group" filter="!oem_build"/>
-</component>
-<component name="vpnmanager" filter="s60" long-name="VPN Manager">
-<unit bldFile="mw/vpnclient/vpnengine/vpnmanager/group" filter="!oem_build"/>
-</component>
-<component name="vpncleaner" filter="s60" long-name="VPN Cleaner">
-<unit bldFile="mw/vpnclient/vpnengine/vpncleaner/group" filter="!oem_build"/>
-</component>
-<component name="utlpkcs12" filter="s60" long-name="PKCS#12 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs12/group" filter="!oem_build"/>
-</component>
-<component name="dmadengine" filter="s60" long-name="DM Adapter Engine">
-<unit bldFile="mw/vpnclient/vpnengine/dmadengine/group" filter="!oem_build"/>
-</component>
-<component name="dmadipsecvpn" filter="s60" long-name="IPsec VPN DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadipsecvpn/group" filter="!oem_build"/>
-</component>
-<component name="dmadpki" filter="s60" long-name="PKI DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadpki/group" filter="!oem_build"/>
-</component>
-<component name="ikesocket" filter="s60" long-name="IKE Socket" introduced="^3">
-<unit bldFile="mw/vpnclient/vpnengine/ikesocket/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnui" long-name="VPN UI" level="ui">
-<component name="vpnecomnotifier" filter="s60" long-name="VPN ECOM Notifier" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnecomnotifier/group" filter="!oem_build"/>
-</component>
-<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">
-<unit bldFile="mw/vpnclient/vpnui/vpnmanagementui/group" filter="!oem_build"/>
-</component>
-<component name="vpnpolins" filter="s60" long-name="VPN Policy Installer">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolins/group" filter="!oem_build"/>
-</component>
-<component name="vpnpolicyrecognizer" filter="s60" long-name="VPN Policy Recognizer" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolicyrecognizer/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnclient_info" long-name="VPN Client Info" level="api">
-<component name="vpnclient_help" filter="s60" long-name="VPN Client Help">
-<unit bldFile="mw/vpnclient/help/group" filter="!oem_build"/>
-</component>
-<component name="vpnclient_build" filter="s60" long-name="VPN Client Build">
-<!-- should split this up into the other components and remove this-->
-<unit bldFile="mw/vpnclient/group" filter="!oem_build"/>
-</component>
-</collection>
-</block>
-<block name="ipappsrv" level="specific" long-name="IP App Services" levels="framework generic server conn plugin">
-<collection name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" level="plugin">
-<component name="transcoder_api" long-name="Transcoder API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
-</component>
-<component name="comms_event_api" long-name="Comms Event API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/comms_event_api/group"/>
-</component>
-<component name="floor_control_api" long-name="Floor Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/floor_control_api/group"/>
-</component>
-<component name="media_control_api" long-name="Media Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/media_control_api/group"/>
-</component>
-<component name="multimedia_comms_api" long-name="Multimedia Comms API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/multimedia_comms_api/group"/>
-</component>
-<component name="nat_settings_api" long-name="NAT Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/nat_settings_api/group"/>
-</component>
-</collection>
-<collection name="natfw" long-name="NAT Framework" level="framework">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="natfw_build" filter="s60" long-name="NAT Framework Build" introduced="^2">
-<unit bldFile="mw/ipappsrv/natfw/group"/>
-</component>
-</collection>
-<collection name="multimediacommscontroller" long-name="Multimedia Comms Controller" level="conn">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommscontroller_build" filter="s60" long-name="Multimedia Comms Controller Build">
-<unit bldFile="mw/ipappsrv/multimediacommscontroller/group"/>
-</component>
-</collection>
-<collection name="multimediacommsengine" long-name="Multimedia Comms Engine" level="generic">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommsengine_build" filter="s60" long-name="Multimedia Comms Engine Build">
-<unit bldFile="mw/ipappsrv/multimediacommsengine/group"/>
-</component>
-</collection>
-<collection name="natplugins" long-name="NAT Plugins" level="plugin">
-<component name="natpcliprovisioningnatfwadapter" filter="s60" long-name="Client Provisioning NAT Framework Traversal Adapter" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/group"/>
-</component>
-<component name="natpdevmgmtnatfwadapter" filter="s60" long-name="Device Management NAT Framework Traversal Adapter" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/group"/>
-</component>
-<component name="natptraversalcontroller" filter="s60" long-name="NAT Traversal Controller" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natptraversalcontroller/group"/>
-</component>
-<component name="natpnatfwsdpprovider" filter="s60" long-name="NAT Framework SDP Provider" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpnatfwsdpprovider/group"/>
-</component>
-</collection>
-<collection name="ipappsrv_info" long-name="IP App Services Info" level="plugin">
-<component name="ipappsrv_build" long-name="IP App Services Build" filter="s60">
-<!-- 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">
-<collection name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" level="specific">
-<component name="string_parser_api" long-name="String Parser API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/string_parser_api/group"/>
-</component>
-<component name="cbs_mcn_client_api" long-name="CBS MCN Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cbs_mcn_client_api/group"/>
-</component>
-<component name="converged_call_engine_api" long-name="Converged Call Engine API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_engine_api/group"/>
-</component>
-<component name="aiw_dial_data_consumer_api" long-name="AIW Dial Data Consumer API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/aiw_dial_data_consumer_api/group"/>
-</component>
-<component name="phone_client_ussd_api" long-name="Phone Client USSD API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_api/group"/>
-</component>
-<component name="sat_refresh_api" long-name="SAT Refresh API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_refresh_api/group" filter="!test"/>
-</component>
-<component name="network_handling_engine_api" long-name="Network Handling Engine API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/network_handling_engine_api/group"/>
-</component>
-<component name="phone_client_emergency_call_api" long-name="Phone Client Emergency Call API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/group"/>
-</component>
-<component name="sat_configuration_api" long-name="SAT Configuration API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_configuration_api/group"/>
-</component>
-<component name="dial_utils_api" long-name="Dial Utils API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/dial_utils_api/group"/>
-</component>
-<component name="phone_client_image_handler_api" long-name="Phone Client Image Handler API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_image_handler_api/group"/>
-</component>
-<component name="phone_client_messenger_api" long-name="Phone Client Messenger API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_messenger_api/group"/>
-</component>
-<component name="sat_client_api" long-name="SAT Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_client_api/group" filter="!test"/>
-</component>
-<component name="phone_client_api" long-name="Phone Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_api/group"/>
-</component>
-<component name="sat_service_api" long-name="SAT Service API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_service_api/group" filter="!test"/>
-</component>
-<component name="cbs_message_api" long-name="CBS Message API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cbs_message_api/group"/>
-</component>
-<component name="phone_client_server_information_api" long-name="Phone Client Server Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_server_information_api/group"/>
-</component>
-<component name="phone_client_ussd_internal_api" long-name="Phone Client USSD Internal API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_internal_api/group"/>
-</component>
-<component name="phone_client_command_handler_api" long-name="Phone Client Command Handler API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_command_handler_api/group"/>
-</component>
-<component name="phone_client_notify_api" long-name="Phone Client Notify API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_notify_api/group"/>
-</component>
-<component name="phone_client_utility_api" long-name="Phone Client Utility API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_utility_api/group"/>
-</component>
-<component name="telephony_network_information_api" long-name="Telephony Network Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_network_information_api/group"/>
-</component>
-<component name="secondary_display_sat_api" long-name="Secondary Display SAT API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/secondary_display_sat_api/group"/>
-</component>
-<component name="callui_reconnect_query_api" long-name="CallUI Reconnect Query API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/callui_reconnect_query_api/group"/>
-</component>
-<component name="service_provider_settings_api" long-name="Service Provider Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/service_provider_settings_api/group"/>
-</component>
-<component name="converged_call_provider_api" long-name="Converged Call Provider API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_provider_api/group"/>
-</component>
-<component name="incoming_call_monitor_api" long-name="Incoming Call Monitor API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/incoming_call_monitor_api/group"/>
-</component>
-<component name="default_emergency_numbers_api" long-name="Default Emergency Numbers API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/default_emergency_numbers_api/group"/>
-</component>
-<component name="cenrep_database_api" long-name="Central Repository Database API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cenrep_database_api/group"/>
-</component>
-<component name="ss_settings_api" long-name="SS Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/ss_settings_api/group"/>
-</component>
-<component name="phone_settings_observer_api" long-name="Phone Settings Observer API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_observer_api/group"/>
-</component>
-<component name="phone_settings_notes_ui_api" long-name="Phone Settings Notes UI API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_notes_ui_api/group"/>
-</component>
-<component name="phone_settings_api" long-name="Phone Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_api/group"/>
-</component>
-<component name="voice_mailbox_number_api" long-name="Voice Mailbox Number API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_number_api/group"/>
-</component>
-<component name="voice_mailbox_settings_api" long-name="Voice Mailbox Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_settings_api/group"/>
-</component>
-<component name="call_information_api" long-name="Call Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/call_information_api/group" filter="!test"/>
-</component>
-<component name="call_remote_party_information_api" long-name="Call Remote Party Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/call_remote_party_information_api/group" filter="!test"/>
-</component>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_mediator_api/group"/>
-</component>
-</collection>
-<collection name="telutils" long-name="Telephony Utils" level="generic">
-<component name="phoneparser" filter="s60" long-name="Phone Parser">
-<unit bldFile="mw/phonesrv/telutils/phoneparser/group"/>
-</component>
-<component name="telephonyservice" filter="s60" long-name="Telephony Service">
-<unit bldFile="mw/phonesrv/telutils/telephonyservice/group"/>
-</component>
-</collection>
-<collection name="cbs" long-name="Cellular Baseband Services" level="plugin">
-<component name="cbsserver" filter="s60" long-name="CBS Server">
-<unit bldFile="mw/phonesrv/cbs/cbsserver/group"/>
-</component>
-<component name="cbsui" filter="s60" long-name="CBS UI">
-<unit bldFile="mw/phonesrv/cbs/cbsui/group"/>
-</component>
-</collection>
-<collection name="cellular" long-name="Cellular" level="server">
-<component name="telephonysettings" filter="s60" long-name="Telephony Settings">
-<unit bldFile="mw/phonesrv/cellular/telephonysettings/group"/>
-</component>
-<component name="sssettings" filter="s60" long-name="Supplementary Service Settings">
-<unit bldFile="mw/phonesrv/cellular/sssettings/group"/>
-</component>
-<component name="psetnotesui" filter="s60" long-name="Phone Settings Notes UI">
-<unit bldFile="mw/phonesrv/cellular/psetnotesui/group"/>
-</component>
-<component name="servicerequest" filter="s60" long-name="Service Request">
-<unit bldFile="mw/phonesrv/cellular/servicerequest/group"/>
-</component>
-</collection>
-<collection name="convergedcallengine" long-name="Converged Call Engine" level="framework">
-<component name="callprovider" filter="s60" long-name="Call Provider">
-<unit bldFile="mw/phonesrv/convergedcallengine/callprovider/group"/>
-</component>
-<component name="cce" filter="s60" long-name="CCE">
-<unit bldFile="mw/phonesrv/convergedcallengine/cce/group"/>
-</component>
-<component name="spsettings" filter="s60" long-name="Service Provider Settings">
-<unit bldFile="mw/phonesrv/convergedcallengine/spsettings/group"/>
-</component>
-<component name="cenrepdatabase" filter="s60" long-name="CCE Cenrep Database">
-<unit bldFile="mw/phonesrv/convergedcallengine/cenrepdatabase/group"/>
-</component>
-<component name="serviceselector" filter="s60" long-name="Service Selector">
-<unit bldFile="mw/phonesrv/convergedcallengine/serviceselector/group"/>
-</component>
-<component name="csplugin" filter="s60" long-name="CS Plugin" plugin="Y">
-<!-- should spell out CS in name -->
-<unit bldFile="mw/phonesrv/convergedcallengine/csplugin/group"/>
-</component>
-</collection>
-<collection name="engines" long-name="Telephony Engines" level="specific">
-<component name="vmbxengine" filter="s60" long-name="Voice Mailbox Engine">
-<unit bldFile="mw/phonesrv/engines/vmbxengine/group"/>
-</component>
-</collection>
-<collection name="networkhandling" long-name="Network Handling" level="plugin">
-<component name="networkhandlingengine" filter="s60" long-name="Network Handling Engine">
-<unit bldFile="mw/phonesrv/networkhandling/networkhandlingengine/group"/>
-</component>
-</collection>
-<collection name="phoneclientserver" long-name="Phone Client/Server" level="server">
-<component name="enpolicy" filter="s60" long-name="Emergency Number Policy">
-<unit bldFile="mw/phonesrv/phoneclientserver/enpolicy/group"/>
-</component>
-<component name="aiwdialdata" filter="s60" long-name="AIW Dial Data">
-<unit bldFile="mw/phonesrv/phoneclientserver/aiwdialdata/group"/>
-</component>
-<component name="dialutils" filter="s60" long-name="Dial Utils">
-<unit bldFile="mw/phonesrv/phoneclientserver/dialutils/group"/>
-</component>
-<component name="phoneclient" filter="s60" long-name="Phone Client">
-<unit bldFile="mw/phonesrv/phoneclientserver/phoneclient/group"/>
-</component>
-<component name="phoneserver" filter="s60" long-name="Phone Server">
-<unit bldFile="mw/phonesrv/phoneclientserver/phoneserver/group"/>
-</component>
-<component name="callui" filter="s60" long-name="Call UI">
-<unit bldFile="mw/phonesrv/phoneclientserver/callui/group"/>
-</component>
-</collection>
-<collection name="satengine" long-name="SIM Application Toolkit Engine" level="generic">
-<component name="satserver" filter="s60" long-name="SAT Server">
-<unit bldFile="mw/phonesrv/satengine/satserver/group"/>
-</component>
-</collection>
-<collection name="satui" long-name="SIM Application Toolkit UI" level="specific">
-<component name="satapp" filter="s60" long-name="SAT Application">
-<unit bldFile="mw/phonesrv/satui/satapp/group"/>
-</component>
-<component name="satplugin" filter="s60" long-name="SAT Plugin" plugin="Y">
-<unit bldFile="mw/phonesrv/satui/satplugin/group"/>
-</component>
-</collection>
-<collection name="phonecmdhandler" long-name="Phone Command Handler" level="generic">
-<component name="phonecmdhnlr" filter="s60" long-name="Phone Command Handler">
-<unit bldFile="mw/phonesrv/phonecmdhandler/phonecmdhnlr/group"/>
-</component>
-</collection>
-<collection name="phonesrv_info" long-name="Telephony and SIM Services Info" level="specific"/>
-</block>
-<block name="messagingmw" level="specific" long-name="Messaging Middleware" levels="stack fw api">
-<collection name="msgfw_pub" long-name="Messaging Middleware Public Interfaces" level="api">
-<component name="send_ui_api" long-name="Send UI API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_pub/send_ui_api/group"/>
-</component>
-</collection>
-<collection name="msgfw_plat" long-name="Messaging Middleware Platform Interfaces" level="api">
-<component name="always_online_plugin_api" long-name="Always Online Plugin API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_plugin_api/group"/>
-</component>
-<component name="always_online_client_api" long-name="Always Online Client API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_client_api/group"/>
-</component>
-<component name="msg_common_utils_api" long-name="Messaging Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/msg_common_utils_api/group"/>
-</component>
-<component name="send_ui_plugin_api" long-name="Send UI Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/send_ui_plugin_api/group"/>
-</component>
-<component name="send_ui_datautils_api" long-name="Send UI Data Utils API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/send_ui_datautils_api/group"/>
-</component>
-</collection>
-<collection name="msgbranched" long-name="Messaging Branched" level="fw">
-<!-- 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"/>
-</component>
-</collection>
-<collection name="messagingfw" long-name="Messaging Framework" level="fw">
-<!-- should break this collection up into smaller related collections -->
-<component name="alwaysonline" filter="s60" long-name="Always Online Server" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/alwaysonline/group"/>
-</component>
-<component name="msgcommonutils" filter="s60" long-name="Messaging Common Utils" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/msgcommonutils/group"/>
-</component>
-<component name="senduiservices" filter="s60" long-name="Send UI Services" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/senduiservices/group"/>
-</component>
-<component name="scheduledsendmtm" long-name="Scheduled Send MTM" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/group" mrp="mw/messagingmw/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
-</component>
-<component name="msgsrvnstore" long-name="Message Server and Store" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/group" mrp="mw/messagingmw/messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
-</component>
-<component name="biomsgfw" long-name="BIO Messaging Framework" introduced="6.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/group" mrp="mw/messagingmw/messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
-</component>
-<component name="msgconf" long-name="Messaging Config" introduced="^2" purpose="optional" class="config">
-<unit bldFile="mw/messagingmw/messagingfw/msgconf/group" mrp="mw/messagingmw/messagingfw/msgconf/group/messaging_config.mrp"/>
-</component>
-<component name="watcherfw" long-name="Watcher Framework" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/watcherfw/group" mrp="mw/messagingmw/messagingfw/watcherfw/group/messaging_watcher.mrp"/>
-</component>
-<component name="msgtest" long-name="Messaging Test" purpose="development">
-<unit bldFile="mw/messagingmw/messagingfw/msgtest/group" mrp="mw/messagingmw/messagingfw/msgtest/group/messaging_test.mrp"/>
-</component>
-<component name="sendas" long-name="Send As" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/sendas/group" mrp="mw/messagingmw/messagingfw/sendas/group/messaging_sendas2.mrp"/>
-</component>
-<component name="msgurlhandler" long-name="Message URL Handler" introduced="7.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/group" mrp="mw/messagingmw/messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
-</component>
-<component name="wappushfw" long-name="WAP Push Framework" introduced="6.1" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/wappushfw/group" mrp="mw/messagingmw/messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
-</component>
-<component name="suplsmshandler" long-name="SUPL SMS Handler" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplsmshandler/group" mrp="mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/>
-</component>
-<component name="suplwappushhandler" long-name="SUPL WAP Push Handler" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
-</component>
-</collection>
-<collection name="messagingmw_info" long-name="Messaging Middleware Info" level="api">
-<component name="messagingmw_metadata" long-name="Messaging Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="imsrv" level="specific" long-name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
-<collection name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" level="specific">
-<component name="ximp_core_data_model_api" long-name="XIMP Core Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_host_api" long-name="XIMP Presence Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_presence_data_model_api" long-name="XIMP Presence Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_api" long-name="XIMP Presence Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_presence_management_api" long-name="XIMP Presence Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_management_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_host_api" long-name="XIMP Core Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_core_management_api" long-name="XIMP Core Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_management_api/group"/>
-</component>
-<component name="ximp_presence_base_api" long-name="XIMP Presence Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_base_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_api" long-name="XIMP Core Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_core_base_api" long-name="XIMP Core Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_base_api/group"/>
-</component>
-<component name="ximp_presence_cache_api" long-name="XIMP Presence Cache API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_cache_api/group"/>
-</component>
-<component name="ximp_core_feature_plugin_api" long-name="XIMP Core Feature Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_host_api" long-name="XIMP IM Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_im_data_model_api" long-name="XIMP IM Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_data_model_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_api" long-name="XIMP IM Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_im_management_api" long-name="XIMP IM Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_management_api/group"/>
-</component>
-<component name="ximp_im_base_api" long-name="XIMP IM Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_base_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_host_api" long-name="XIMP Search Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_search_data_model_api" long-name="XIMP Search Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_data_model_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_api" long-name="XIMP search Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_search_management_api" long-name="XIMP Search Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_management_api/group"/>
-</component>
-<component name="ximp_search_base_api" long-name="XIMP Search Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_base_api/group"/>
-</component>
-<component name="xmpp_settings_api" long-name="XMPP Settings API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/group"/>
-</component>
-<component name="im_cache_client_api" long-name="IM Cache Client API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/im_cache_client_api/group"/>
-</component>
-<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 Avability Text" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
-</component>
-</collection>
-<collection name="ximpfw" long-name="XIMP Framework" level="framework">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="ximpfw_build" filter="s60" long-name="XIMP Framework Build">
-<unit bldFile="mw/imsrv/ximpfw/group"/>
-</component>
-</collection>
-<collection name="imservices" long-name="IM Services" level="generic">
-<component name="imfeatureplugin" filter="s60" long-name="IM Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/imfeatureplugin/group"/>
-</component>
-<component name="searchfeatureplugin" filter="s60" long-name="Search Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/searchfeatureplugin/group"/>
-</component>
-<component name="xmppsettingsapi" filter="s60" long-name="XMPP Settings API" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsapi/group"/>
-</component>
-<component name="xmppsettingsfetcher" filter="s60" long-name="XMPP Settings Fetcher" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/group"/>
-</component>
-<component name="ossprotocoladaptation" filter="s60" long-name="OSS Protocol Adaptation" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/ossprotocoladaptation/group"/>
-</component>
-<component name="instantmessagingcache" filter="s60" long-name="Instant Messaging Cache" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/instantmessagingcache/group"/>
-</component>
-</collection>
-<collection name="brandingserver" long-name="Branding Server" level="specific">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="brandingserver_build" filter="s60" long-name="Branding Server Build">
-<unit bldFile="mw/imsrv/brandingserver/group"/>
-</component>
-</collection>
-</block>
-<block name="legacypresence" level="specific" long-name="Legacy Presence Services" levels="engine fw ui">
-<collection name="pressrv_plat" long-name="Legacy Presence Services Platform Interfaces" level="ui">
-<component name="presence_list_api" long-name="Presence List API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/presence_list_api/group"/>
-</component>
-<component name="watcher_info_api" long-name="Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_info_api/group"/>
-</component>
-<component name="simple_documents_api" long-name="SIMPLE Documents API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_documents_api/group"/>
-</component>
-<component name="authorization_api" long-name="Authorization API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/authorization_api/group"/>
-</component>
-<component name="xdm_protocol_plugin_api" long-name="XDM Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_protocol_plugin_api/group"/>
-</component>
-<component name="watcher_api" long-name="Watcher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_api/group"/>
-</component>
-<component name="xdm_api" long-name="XDM API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_api/group"/>
-</component>
-<component name="registration_api" long-name="Registration API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/registration_api/group"/>
-</component>
-<component name="publisher_api" long-name="Publisher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/publisher_api/group"/>
-</component>
-<component name="messaging_connection_manager_api" long-name="Messaging Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/messaging_connection_manager_api/group"/>
-</component>
-<component name="xdm_settings_api" long-name="XDM Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_settings_api/group"/>
-</component>
-<component name="simple_settings_api" long-name="SIMPLE Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_settings_api/group"/>
-</component>
-<component name="simple_instant_msg_api" long-name="Simple Instant Msg API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_instant_msg_api/group"/>
-</component>
-</collection>
-<collection name="xdmengine" long-name="XDM Engine" level="engine">
-<!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
-<component name="xdmengine_build" filter="s60" long-name="XDM Engine Build">
-<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">
-<unit bldFile="mw/legacypresence/xdmprotocols/group"/>
-</component>
-</collection>
-<collection name="msgconnmanager" long-name="Messaging Connection Manager" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="msgconnmanager_build" filter="s60" long-name="Messaging Connection Manager Build">
-<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">
-<unit bldFile="mw/legacypresence/simpleengine/group"/>
-</component>
-</collection>
-<collection name="presencefwsimpleadpt" long-name="Presence Framework SIMPLE Adaptation" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="simpleplugin" filter="s60" long-name="SIMPLE Plugin" plugin="Y">
-<unit bldFile="mw/legacypresence/presencefwsimpleadpt/group"/>
-</component>
-</collection>
-<collection name="simpledatamodeladapter" long-name="SIMPLE Data Model Adapter" level="fw">
-<component name="presenceplugin" filter="s60" long-name="Presence Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/legacypresence/simpledatamodeladapter/group"/>
-</component>
-</collection>
-</block>
-<block name="opensrv" level="specific" long-name="Open Services" levels="prt lib server eng">
-<collection name="opensrv_plat" long-name="Open Services Platform Interfaces" level="eng">
-<component name="messagequeue_api" long-name="Message Queue API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/opensrv/opensrv_plat/messagequeue_api/group"/>
-</component>
-</collection>
-<collection name="loudmouth" long-name="Loudmouth" level="prt">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="loudmouth_build" filter="s60" long-name="Loudmouth Build" introduced="^2">
-<unit bldFile="mw/opensrv/loudmouth/group"/>
-</component>
-</collection>
-<collection name="libtelepathy" long-name="Telepathy Library" level="lib">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="libtelepathy_build" filter="s60" long-name="Telepathy Library Build" introduced="^2">
-<unit bldFile="mw/opensrv/libtelepathy/group"/>
-</component>
-</collection>
-<collection name="telepathygabble" long-name="Telepathy Gabble" level="eng">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="telepathygabble_build" filter="s60" long-name="Telepathy Gabble Build" introduced="^2">
-<unit bldFile="mw/opensrv/telepathygabble/group"/>
-</component>
-</collection>
-<collection name="isolationserver" long-name="Isolation Server" level="server">
-<component name="messagequeue" filter="s60" long-name="Message Queue" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/messagequeue/group"/>
-</component>
-<component name="isoserver" filter="s60" long-name="ISO Server" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/isoserver/group"/>
-</component>
-<component name="isolationserver_build" filter="s60" long-name="Isloation Server Build" introduced="^2">
-<!-- needs #includes removed. either move the exports to another component or make this a ROM component -->
-<unit bldFile="mw/opensrv/isolationserver/group"/>
-</component>
-</collection>
-</block>
-<block name="remotemgmt" level="specific" long-name="Remote Management" levels="plugin framework server generic specific">
-<collection name="remotemgmt_pub" long-name="Remote Management Public Interfaces" level="specific">
-<component name="synchronization_capability_api" long-name="Synchronization Capability API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
-</component>
-</collection>
-<collection name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" level="specific">
-<component name="common_agent_util_and_definitions_api" long-name="Common Agent util and definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
-</component>
-<component name="policy_management_certificate_api" long-name="Policy Management Certificate API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/group"/>
-</component>
-<component name="oma_provisioning_adapter_api" long-name="OMA Provisioning Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_adapter_api/group"/>
-</component>
-<component name="device_management_parameter_api" long-name="Device Management Parameter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_parameter_api/group"/>
-</component>
-<component name="data_synchronization_plugin_api" long-name="Data Synchronization Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/group"/>
-</component>
-<component name="sync_alert_handler_api" long-name="Sync Alert Handler API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
-</component>
-<component name="syncml_notifier_api" long-name="SyncML Notifier API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
-</component>
-<component name="syncml_client_api" long-name="SyncML Client API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
-</component>
-<component name="device_management_plugin_api" long-name="Device Management plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_plugin_api/group"/>
-</component>
-<component name="dm_tree_apis" long-name="DM Tree APIs" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
-</component>
-<component name="terminal_security_device_lock_api" long-name="Terminal Security Device Lock API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/group"/>
-</component>
-<component name="policy_management_request_api" long-name="Policy Management Request API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/group"/>
-</component>
-<component name="ds_constant_definitions_api" long-name="DS Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_constant_definitions_api/group"/>
-</component>
-<component name="scp_server_api" long-name="SCP Server API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/group"/>
-</component>
-<component name="data_synchronization_notification_api" long-name="Data Synchronization Notification API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_notification_api/group"/>
-</component>
-<component name="oma_provisioning_engine_api" long-name="OMA Provisioning Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/group"/>
-</component>
-<component name="dm_utils_api" long-name="DM Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/group"/>
-</component>
-<component name="syncml_alert_api" long-name="SyncML Alert API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/group"/>
-</component>
-<component name="obex_client_session_api" long-name="OBEX Client session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/obex_client_session_api/group"/>
-</component>
-<component name="setting_enforcement_info_api" long-name="Setting Enforcement Info API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/group"/>
-</component>
-<component name="dm_constant_definitions_api" long-name="DM Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
-</component>
-<component name="oma_ds_extensions_api" long-name="OMA DS Extensions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
-</component>
-<component name="pnpms_utils_api" long-name="PNPMS Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
-</component>
-<component name="diagnostics_plugin_utility_api" long-name="Diagnostics Plugin Utility API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
-</component>
-<component name="diagnostics_plugin_api" long-name="Diagnostics Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
-</component>
-<component name="diagnostics_framework_api" long-name="Diagnostics Framework API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
-</component>
-<component name="diagnostics_results_api" long-name="Diagnostics Results API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
-</component>
-<component name="diagnostics_plugin_pool_api" long-name="Diagnostics Plugin Pool API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
-</component>
-<component name="adaptive_history_list_api" long-name="Adaptive History List API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
-</component>
-<component name="adaptive_history_list_session_api" long-name="Adaptive History List Session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
-</component>
-<component name="fota_engine_api" long-name="FOTA Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
-</component>
-<component name="update_package_storage_plugin_api" long-name="Update Package Storage Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
-</component>
-<component name="syncml_notifier_roaming_api" long-name="SyncML Notifier Roaming API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
-</component>
-<component name="sync_service_api" long-name="Sync Service API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_service_api/group"/>
-</component>
-<component name="dcmo_adapter_api" long-name="DCMO Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_adapter_api/group"/>
-</component>
-<component name="dcmo_control_api" long-name="DCMO Control API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_control_api/group"/>
-</component>
-<component name="ds_capability_mgmt_plugin_api" long-name="DS Capability Management Plugin API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
-</component>
-<component name="dm_native_notifier_api" long-name="DM Native Notifier API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_native_notifier_api/group"/>
-</component>
-<component name="syncml_ds_error_reporting_api" long-name="SyncML DS Error Reporting API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_ds_error_reporting_api/group"/>
-</component>
-<component name="syncml_ds_customization_api" long-name="SyncML DS Customization API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_ds_customization_api/group"/>
-</component>
-</collection>
-<collection name="policymanagement" long-name="Policy Management" level="generic">
-<component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">
-<unit bldFile="mw/remotemgmt/policymanagement/pmdmadapter/group"/>
-</component>
-<component name="dmutilserver" filter="s60" long-name="DM Util Server">
-<unit bldFile="mw/remotemgmt/policymanagement/dmutilserver/group"/>
-</component>
-<component name="policyengine" filter="s60" long-name="Policy Engine">
-<unit bldFile="mw/remotemgmt/policymanagement/policyengine/group"/>
-</component>
-<component name="policymanagement_build" filter="s60" long-name="Policy Management Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/policymanagement/group"/>
-</component>
-</collection>
-<collection name="syncmlfw" long-name="SyncML Framework" level="server">
-<component name="syncmlfw_build" filter="s60" long-name="SyncML Framework Build">
-<!-- need to break this up into components. Too convoluted a structure to be in a single bld.inf-->
-<unit bldFile="mw/remotemgmt/syncmlfw/group"/>
-</component>
-</collection>
-<collection name="terminalsecurity" long-name="Terminal Security" level="specific">
-<component name="scp" filter="s60" long-name="Security Code Proxy">
-<!-- can only have one unit, need to have these #included from a single bld.inf -->
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpdatabase/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpserver/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scppatternplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scphistoryplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scptimestampplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpeventhandler/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/dmeventnotifier/group"/>
-</component>
-<component name="terminalsecurity_client" filter="s60" long-name="Terminal Control Client">
-<unit bldFile="mw/remotemgmt/terminalsecurity/client/group"/>
-</component>
-<component name="terminalsecurity_server" filter="s60" long-name="Terminal Control Server">
-<unit bldFile="mw/remotemgmt/terminalsecurity/server/group"/>
-</component>
-<component name="tcadapter" filter="s60" long-name="Terminal Control Adapter">
-<unit bldFile="mw/remotemgmt/terminalsecurity/tcadapter/bld"/>
-</component>
-<component name="terminalsecurity_build" filter="s60" long-name="Terminal Security Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/terminalsecurity/group"/>
-</component>
-</collection>
-<collection name="omaprovisioning" long-name="OMA Provisioning" level="specific">
-<component name="pnputil" filter="s60" long-name="PnP Util">
-<unit bldFile="mw/remotemgmt/omaprovisioning/pnputil/group"/>
-</component>
-<component name="provisioning" filter="s60" long-name="Provisioning">
-<unit bldFile="mw/remotemgmt/omaprovisioning/provisioning/group"/>
-</component>
-</collection>
-<collection name="devicediagnosticsfw" long-name="Device Diagnostics Framework" level="framework">
-<component name="diagframework" filter="s60" long-name="Diagnostics Framework">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
-</component>
-<component name="diagpluginbase" filter="s60" long-name="Diagnostics Plugin Base">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
-</component>
-<component name="diagresultsdb" filter="s60" long-name="Diagnostics Results Database">
-<!-- can only have one unit, merge or split into two components -->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
-</component>
-<component name="devicediagnosticsfw_build" filter="s60" long-name="Device Diagnostics Framework Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/group"/>
-</component>
-</collection>
-<collection name="dcmofw" long-name="Device Capability Management Object Framework" level="framework">
-<component name="dcmoclient" filter="s60" long-name="DCMO Client">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoclient/group"/>
-</component>
-<component name="dcmoserver" filter="s60" long-name="DCMO Server">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoserver/group"/>
-</component>
-<component name="dcmocustcmd" filter="s60" long-name="DCMO Custom Commands">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmocustcmd/group"/>
-</component>
-<component name="dcmofw_build" filter="s60" long-name="DCMO Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/dcmofw/group"/>
-</component>
-</collection>
-<collection name="fotaapplication" long-name="FOTA Application" level="generic">
-<component name="fotaapplication_build" filter="s60" long-name="FOTA Application Build">
-<!-- remove this component when configuration is in place and the #ifdefs have been worked out -->
-<unit bldFile="mw/remotemgmt/fotaapplication/group"/>
-</component>
-<component name="fotaserver" filter="s60" long-name="FOTA Server">
-<!-- uncomment when #ifdefs are resolved -->
-<!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
-</component>
-<component name="fotacustcmds" filter="s60" long-name="FOTA Custom Commands" class="placeholder">
-<!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
-<!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
-</component>
-</collection>
-</block>
-<block name="remotestorage" level="generic" long-name="Remote Storage" levels="framework if">
-<collection name="rsfw_plat" long-name="Remote Storage Platform Interfaces" level="if">
-<component name="rsfw_access_protocol_plugin_api" filter="s60" long-name="Remote Storage Framework Access Protocol Plugin API" class="api">
-<unit bldFile="mw/remotestorage/rsfw_plat/rsfw_access_protocol_plugin_api/group"/>
-</component>
-</collection>
-<collection name="remotestoragefw" long-name="Remote Storage Framework" level="framework">
-<component name="mountstore" filter="s60" long-name="RSFW Mount Store">
-<unit bldFile="mw/remotestorage/remotestoragefw/mountstore/group"/>
-</component>
-<component name="rsfwnotifierplugins" filter="s60" long-name="RSFW Notifier Plugins" plugin="Y">
-<unit bldFile="mw/remotestorage/remotestoragefw/rsfwnotifierplugins/group"/>
-</component>
-<component name="remotefileengine" filter="s60" long-name="Remote File Engine">
-<unit bldFile="mw/remotestorage/remotestoragefw/remotefileengine/group"/>
-</component>
-<component name="mountmanager" filter="s60" long-name="RSFW Mount Manager">
-<unit bldFile="mw/remotestorage/remotestoragefw/mountmanager/group"/>
-</component>
-<component name="webdavaccessplugin" filter="s60" long-name="WebDAV Access Plugin" plugin="Y">
-<unit bldFile="mw/remotestorage/remotestoragefw/webdavaccessplugin/group"/>
-</component>
-<component name="remotefilesystemplugin" filter="s60" long-name="Remote Filesystem Plugin" plugin="Y">
-<unit bldFile="mw/remotestorage/remotestoragefw/remotefilesystemplugin/group"/>
-</component>
-<component name="remotestoragegsplugin" filter="s60" long-name="RS GS Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
-<!-- <unit bldFile="remotestoragefw/gsplugin/group"/>-->
-</component>
-<component name="remotedriveconfigurationbiocontrol" filter="s60" long-name="Remote Drive Configuration BIO Control">
-<!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
-<!-- <unit bldFile="remotestoragefw/remotedriveconfigurationbiocontrol/group"/>-->
-</component>
-<component name="remotestoragefw_build" filter="s60" long-name="Remote Storage Framework Build">
-<!-- move exports to other components.
- This is needed for #includes of configured component until congigiration is in place -->
-<unit bldFile="mw/remotestorage/remotestoragefw/group"/>
-</component>
-</collection>
-</block>
-<block name="remoteconn" level="generic" long-name="Remote Connectivity" levels="plugin framework server generic specific">
-<collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
-<component name="secon" filter="s60" long-name="Service Controllers">
-<unit bldFile="mw/remoteconn/connectivitymodules/secon/group"/>
-</component>
-</collection>
-<collection name="remoteconn_info" long-name="Remote Connectivity Info" level="specific">
-<component name="remoteconn_metadata" long-name="Remote Connectivity Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mtptransports" long-name="MTP Transports" level="plugin">
-<component name="mtpusbtransport" long-name="MTP USB Transport" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpusbtransport/group" mrp="mw/remoteconn/mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
-</component>
-<component name="mtpptpiptransport" long-name="MTP PTP-IP Transport" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpptpiptransport/group" mrp="mw/remoteconn/mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
-</component>
-<component name="mtpcontroller" long-name="MTP Controller" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpcontroller/group" mrp="mw/remoteconn/mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
-</component>
-</collection>
-<collection name="mtpfws" long-name="MTP Frameworks" level="framework">
-<component name="mtpfw" long-name="MTP Framework" introduced="^2" purpose="optional">
-<unit bldFile="mw/remoteconn/mtpfws/mtpfw/group" mrp="mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/>
-</component>
-</collection>
-<collection name="mtpdataproviders" long-name="MTP Data Providers" level="generic">
-<component name="mtpfileandfolderdp" long-name="MTP File and Folder Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group" mrp="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
-</component>
-<component name="mtpimagedp" long-name="MTP Image Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpimagedp/group" mrp="mw/remoteconn/mtpdataproviders/mtpimagedp/group/mtp_imagedp.mrp"/>
-</component>
-<component name="mtppictbridgedp" long-name="MTP PictBridge Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group" mrp="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group/mtp_pictbridgedp.mrp"/>
-</component>
-</collection>
-<collection name="backupandrestore" long-name="Backup and Restore" level="specific">
-<component name="backupengine" long-name="Backup Engine" introduced="9.0" purpose="optional">
-<unit bldFile="mw/remoteconn/backupandrestore/backupengine/group" mrp="mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
-</component>
-<component name="backuptest" long-name="Backup Test" introduced="^2" purpose="development">
-<unit bldFile="mw/remoteconn/backupandrestore/backuptest/group" mrp="mw/remoteconn/backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
-</component>
-</collection>
-<collection name="obex" long-name="OBEX" level="generic">
-<component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexprotocol/group" mrp="mw/remoteconn/obex/obexprotocol/group/obex.mrp"/>
-</component>
-<component name="obexextensionapi" long-name="OBEX Extension API" introduced="9.2" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexextensionapi/group" mrp="mw/remoteconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
-</component>
-</collection>
-</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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<unit mrp="mw/srvdiscovery/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="dlnasrv" level="specific" long-name="DLNA Services" levels="stack server ctrl framework plugin">
-<!-- uncomment all the units when configuration is in place, they're currently #included from other xxx_build components -->
-<collection name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" level="plugin">
-<component name="upnp_media_server_settings_api" long-name="UPnP Media Server Settings API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_settings_api/group"/>
-</component>
-<component name="upnp_av_objects_api" long-name="UPnP A/V Objects API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_av_objects_api/group"/>
-</component>
-<component name="upnp_media_server_api" long-name="UPnP Media Server API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_api/group"/>
-</component>
-<component name="upnp_security_plugin_api" long-name="UPnP Security Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_security_plugin_api/group"/>
-</component>
-<component name="upnp_avcp_api" long-name="UPnP AVCP API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_avcp_api/group"/>
-</component>
-<component name="upnp_media_server_metadata_api" long-name="UPnP Media Server Metadata API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_metadata_api/group"/>
-</component>
-<component name="upnp_command_api" long-name="UPnP Command API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_command_api/group"/>
-</component>
-<component name="upnp_plugin_api" long-name="UPnP Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_plugin_api/group"/>
-</component>
-</collection>
-<collection name="upnpavcontrolpoint" long-name="UPnP A/V Control Point" level="plugin">
-<component name="avcontrolframework" filter="s60" long-name="A/V Control Famework" introduced="9.1" deprecated="^3">
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
-</component>
-<component name="upnpavcontrolpoint_build" filter="s60" long-name="UPnP A/V Control Point Build" introduced="9.1" deprecated="^3">
-<!-- put exports in other component instead -->
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/group"/>
-</component>
-</collection>
-<collection name="upnpmediaserver" long-name="UPnP Media Server" level="server">
-<component name="avobjects" filter="s60" long-name="A/V Objects">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/avobjects/group"/>
-</component>
-<component name="mediaserverclient" filter="s60" long-name="Media Server Client">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverclient/group"/>
-</component>
-<component name="connectionmanagerservice" filter="s60" long-name="Connection Manager Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/connectionmanagerservice/group"/>
-</component>
-<component name="contentdirectoryservice" filter="s60" long-name="Content Directory Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/contentdirectoryservice/group"/>
-</component>
-<component name="mediaserverengine" filter="s60" long-name="Media Server Engine">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverengine/group"/>
-</component>
-<component name="upnpmediaserver_build" filter="s60" long-name="UPnP Media Server Build">
-<!-- move exports into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpmediaserver/group"/>
-</component>
-</collection>
-<collection name="upnpavcontroller" long-name="UPnP A/V Controller" level="ctrl">
-<component name="upnpxmlparser" filter="s60" long-name="UPnP XML Parser" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpxmlparser/group"/>
-</component>
-<component name="upnpavcontrollerserver" filter="s60" long-name="UPnP A/V Controller Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerserver/group"/>
-</component>
-<component name="upnpavcontrollerclient" filter="s60" long-name="UPnP A/V Ccontroller Client" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerclient/group"/>
-</component>
-<component name="upnpavcontrollerhelper" filter="s60" long-name="UPnP A/V Controller Helper" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerhelper/group"/>
-</component>
-<component name="upnpavcontroller_build" filter="s60" long-name="UPnP A/V Controller Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpavcontroller/group"/>
-</component>
-</collection>
-<collection name="upnpframework" long-name="UPnP Framework" level="framework">
-<component name="upnputilities" filter="s60" long-name="UPnP Utilities" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnputilities/group"/>
-</component>
-<component name="upnpextensionpluginif" filter="s60" long-name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpextensionpluginif/group"/> -->
-</component>
-<component name="upnpfiletransferengine" filter="s60" long-name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>-->
-</component>
-<component name="upnpcommonui" filter="s60" long-name="UPnP Common UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpcommonui/group"/>-->
-</component>
-<component name="upnpaiwengine" filter="s60" long-name="UPnP AIW Engine" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpaiwengine/group"/> -->
-</component>
-<component name="upnpaiwprovider" filter="s60" long-name="UPnP AIW Provider" introduced="^2" deprecated="^3" plugin="Y">
-<!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
-</component>
-<component name="upnpmusicadapter" filter="s60" long-name="UPnP Music Adapter" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
-</component>
-<component name="upnpcommand" filter="s60" long-name="UPnP Command" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpcommand/group"/>
-</component>
-<component name="upnpframework_build" filter="s60" long-name="UPnP Framework Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpframework/group"/>
-</component>
-</collection>
-<collection name="upnpsettings" long-name="UPnP Settings" level="framework">
-<component name="upnpsettingsengine" filter="s60" long-name="UPnP Settings Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
-</component>
-<component name="multiselectionui" filter="s60" long-name="Multi-Selection UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/multiselectionui/group"/>-->
-</component>
-<component name="appwizard" filter="s60" long-name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/appwizard/group"/>-->
-</component>
-<component name="upnpsharingui" filter="s60" long-name="UPnP Sharing UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
-</component>
-<component name="upnpgsplugin" filter="s60" long-name="UPnP GS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
-</component>
-<component name="upnpsettings_build" filter="s60" long-name="UPnP Settings Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsettings/group"/>
-</component>
-</collection>
-<collection name="upnpsharing" long-name="UPnP Sharing" level="server">
-<component name="upnpdlnaprofiler" filter="s60" long-name="UPnP DLNA Profiler" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpdlnaprofiler/group"/>
-</component>
-<component name="upnpsecurity" filter="s60" long-name="UPnP Security" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpsecurity/group"/>
-</component>
-<component name="upnpcontentserver" filter="s60" long-name="UPnP Content Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpcontentserver/group"/>
-</component>
-<component name="applicationengine" filter="s60" long-name="UPnP Application Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/applicationengine/group"/>
-</component>
-<component name="upnpsharing_build" filter="s60" long-name="UPnP Sharing Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsharing/group"/>
-</component>
-</collection>
-<collection name="upnpmpxplugins" long-name="UPnP MPX Plugins" level="plugin">
-<component name="upnpplaybackplugins" filter="s60" long-name="UPnP Playback Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/upnpplaybackplugins/group"/>
-</component>
-<component name="upnpmpxplugins_build" filter="s60" long-name="UPnP MPX Plugins Build" introduced="^2">
-<!-- move exports content into other component? -->
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/group"/>
-</component>
-</collection>
-<collection name="upnpharvester" long-name="UPnP Harvester" level="ctrl">
-<component name="upnpharvester_common" filter="s60" long-name="UPnP Harvester Common" introduced="^2" deprecated="^3" class="placeholder">
-<!-- need to merge or #include these to a single bld.inf -->
-<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
- <unit bldFile="upnpharvester/common/cmsettings/group"/>
- <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
- <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
-</component>
-<component name="cdssync" filter="s60" long-name="CDS Sync" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
-</component>
-<component name="mdhserver" filter="s60" long-name="Metadata Harvester Server" introduced="^2" deprecated="^3" class="placeholder">
-<!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
-</component>
-<component name="upnpharvester_build" filter="s60" long-name="UPnP Harvester Build" introduced="^2" deprecated="^3" class="placeholder">
-<!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
-<!--<unit bldFile="upnpharvester/group"/>-->
-</component>
-</collection>
-<collection name="homesync" long-name="Home Sync" level="plugin">
-<component name="contentmanager" filter="s60" long-name="Content Manager" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homesync/group"/>-->
-<!-- move bld.inf into contentmanager dir -->
-</component>
-</collection>
-<collection name="homemedia" long-name="Home Media" level="framework">
-<!-- collection is really just a component. Move down a directory -->
-<component name="homemedia_build" filter="s60" long-name="Home Media" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homemedia/group"/> -->
-</component>
-</collection>
-<collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin">
-<component name="dlnasrv_build" filter="s60" long-name="DLNA Services Build">
-<!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed -->
-<unit bldFile="mw/dlnasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="btservices" level="generic" long-name="Bluetooth Services" levels="framework server generic specific plugin">
-<collection name="btservices_pub" long-name="BT Services Public Interfaces" level="plugin">
-<component name="bluetooth_power_state_api" long-name="Bluetooth Power State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_power_state_api/group"/>
-</component>
-<component name="bluetooth_notifier_api" long-name="Bluetooth Notifier API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_notifier_api/group"/>
-</component>
-</collection>
-<collection name="btservices_plat" long-name="BT Services Platform Interfaces" level="plugin">
-<component name="bluetooth_dosserver_audio_api" long-name="Bluetooth DOS Server Audio API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dosserver_audio_api/group"/>
-</component>
-<component name="bluetooth_dut_mode_api" long-name="Bluetooth DUT Mode API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dut_mode_api/group"/>
-</component>
-<component name="bluetooth_engine_api" long-name="Bluetooth Engine API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-<component name="bluetooth_local_variation_api" long-name="Bluetooth Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_local_variation_api/group"/>
-</component>
-<component name="bluetooth_notifier_internal_api" long-name="Bluetooth Notifier internal API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_notifier_internal_api/group"/>
-</component>
-<component name="bluetooth_sap_connection_state_api" long-name="Bluetooth SAP Connection State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_sap_connection_state_api/group"/>
-</component>
-<component name="bluetooth_secondary_display_notification_api" long-name="Bluetooth Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_secondary_display_notification_api/group"/>
-</component>
-</collection>
-<collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
-<component name="bteng" filter="s60" long-name="Bluetooth Engine">
-<unit bldFile="mw/btservices/bluetoothengine/bteng/group"/>
-</component>
-<component name="btnotif" filter="s60" long-name="Bluetooth Notifier">
-<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"/>
-</component>
-<component name="btmac" filter="s60" long-name="Bluetooth Mono Audio Controller" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btmac/group"/>
-</component>
-<component name="btsac" filter="s60" long-name="Bluetooth Stereo Audio Controller" plugin="Y">
-<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"/>
-</component>
-<component name="btsap" filter="s60" long-name="Bluetooth SIM Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btsap/group"/>
-</component>
-<component name="btui" filter="s60" long-name="Bluetooth UI">
-<unit bldFile="mw/btservices/bluetoothengine/btui/group"/>
-</component>
-<component name="btpbap" filter="s60" long-name="Bluetooth Phonebook Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btpbap/group"/>
-</component>
-<component name="bthid" filter="s60" long-name="Bluetooth HID">
-<unit bldFile="mw/btservices/bluetoothengine/bthid/group"/>
-</component>
-<component name="btctrldcmoadapter" filter="s60" long-name="Bluetooth Control DCMO Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btctrldcmoadapter/group"/>
-</component>
-</collection>
-<collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
-<component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
-<unit bldFile="mw/btservices/bluetoothappprofiles/avrcp" mrp="mw/btservices/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
-</component>
-</collection>
-<collection name="atcommands" long-name="AT Commands" level="generic">
-<component name="modematplugin" long-name="Modem AT Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/modematplugin/group"/>
-</component>
-<component name="lccustomplugin" long-name="LC Custom Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/lccustomplugin/group"/>
-</component>
-</collection>
-<collection name="btservices_info" long-name="BT Services Info" level="plugin">
-<component name="btservices_metadata" long-name="BT Services Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usbservices" level="generic" long-name="USB Services" levels="framework server generic specific plugin">
-<collection name="usbservices_plat" long-name="USB Services Platform Interfaces" level="plugin">
-<component name="pictbridge_api" long-name="PictBridge API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/pictbridge_api/group"/>
-</component>
-<component name="ptp_responder_api" long-name="PTP Responder API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_responder_api/group"/>
-</component>
-<component name="ptp_transport_api" long-name="PTP Transport API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_transport_api/group"/>
-</component>
-<component name="usb_device_control_plugin_api" long-name="USB Device Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_device_control_plugin_api/group"/>
-</component>
-<component name="usb_notifier_api" long-name="USB Notifier API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_notifier_api/group"/>
-</component>
-<component name="usb_personality_api_header" long-name="USB Personality API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_api_header/group"/>
-</component>
-<component name="usb_personality_plugin_api" long-name="USB Personality Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_plugin_api/group"/>
-</component>
-<component name="usb_secondary_display_api" long-name="USB Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_secondary_display_api/group"/>
-</component>
-<component name="usb_watcher_api" long-name="USB Watcher API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_api/group"/>
-</component>
-<component name="usb_watcher_info_api_header" long-name="USB Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_info_api_header/group"/>
-</component>
-</collection>
-<collection name="usbservices_info" long-name="USB Services Info" level="plugin"/>
-<collection name="usbengines" long-name="USB Engines" level="generic">
-<component name="usbotgwatcher" filter="s60" long-name="USB OTG Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbotgwatcher/group"/>
-</component>
-<component name="usbwatcher" filter="s60" long-name="USB Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbwatcher/group"/>
-</component>
-<component name="usblocodplugin" filter="s60" long-name="USB Local Connectivity Domain Plugin" plugin="Y">
-<unit bldFile="mw/usbservices/usbengines/usblocodplugin/group"/>
-</component>
-<component name="usbdevcon" filter="s60" long-name="USB Device Control">
-<unit bldFile="mw/usbservices/usbengines/usbdevcon/group"/>
-</component>
-<component name="usbremotepersonality" filter="s60" long-name="USB Remote Personality">
-<unit bldFile="mw/usbservices/usbengines/usbremotepersonality/group"/>
-</component>
-</collection>
-<collection name="usbclasses" long-name="USB Classes" level="framework">
-<component name="usbobexclasscontroller" filter="s60" long-name="USB OBEX Class Controller" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbobexclasscontroller/group"/>
-</component>
-<component name="usbbasicpersonality" filter="s60" long-name="USB Basic Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbbasicpersonality/group"/>
-</component>
-<component name="usbmscpersonality" filter="s60" long-name="USB MSC Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbmscpersonality/group"/>
-</component>
-<!-- commented out in bld.inf. Should this be deleted?
- <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
- <unit bldFile="usbclasses/ptpstack/group"/>
- </component>
- <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
- <unit bldFile="usbclasses/sicdusbplugin/group"/>
- </component>
- <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
- <unit bldFile="usbclasses/ptpserver/group"/>
- </component>-->
-<component name="pictbridgeengine" filter="s60" long-name="PictBridge Engine">
-<unit bldFile="mw/usbservices/usbclasses/pictbridgeengine/group"/>
-</component>
-<component name="usbphoneasmodem" filter="s60" long-name="USB Phone as Modem" introduced="^3">
-<unit bldFile="mw/usbservices/usbclasses/usbphoneasmodem/group"/>
-</component>
-</collection>
-<collection name="usbuis" long-name="USB UIs" level="specific">
-<component name="usbui" filter="s60" long-name="USB UI">
-<unit bldFile="mw/usbservices/usbuis/usbui/group"/>
-</component>
-<component name="usbuinotif" filter="s60" long-name="USB UI Notifiers">
-<unit bldFile="mw/usbservices/usbuis/usbuinotif/group"/>
-</component>
-<component name="imageprintuiprovider" filter="s60" long-name="ImagePrint UI Provider" plugin="Y">
-<unit bldFile="mw/usbservices/usbuis/imageprintuiprovider/group"/>
-</component>
-<component name="usbimageprintui" filter="s60" long-name="ImagePrint UI">
-<unit bldFile="mw/usbservices/usbuis/imageprintui/group"/>
-</component>
-</collection>
-</block>
-<block name="shortlinkconn" level="generic" long-name="Shortlink Connectivity" levels="framework server generic specific plugin">
-<!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
-<collection name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" level="plugin">
-<component name="obex_service_utils_api" long-name="OBEX Service Utils API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_utils_api/group"/>
-</component>
-<component name="obex_service_plugin_api" long-name="OBEX Service Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_plugin_api/group"/>
-</component>
-<component name="dialup_connection_status_api" long-name="Dial-up Connection Status API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dialup_connection_status_api/group"/>
-</component>
-<component name="dun_secondary_display_notification_api" long-name="DUN Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
-</component>
-<component name="obex_secondary_display_notification_api" long-name="OBEX Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
-</component>
-<component name="generic_hid_api" long-name="Generic HID API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/generic_hid_api/group"/>
-</component>
-<component name="locod_bearer_plugin_api" long-name="Locod Bearer Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/locod_bearer_plugin_api/group"/>
-</component>
-<component name="usb_obexservicemanager_client_api" long-name="USB OBEX Service Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_obexservicemanager_client_api/group"/>
-</component>
-</collection>
-<collection name="localconnectivityservice" long-name="Local Connectivity Service" level="server">
-<component name="locod" long-name="Local Connectivity Daemon">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/locod/group"/>
-</component>
-<component name="obexserviceman" long-name="OBEX Service Managar">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
-</component>
-<component name="obexsendservices" long-name="OBEX Send Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
-</component>
-<component name="obexreceiveservices" long-name="OBEX Receive Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
-</component>
-<component name="dun" long-name="Dial Up Networking">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/dun/group"/>
-</component>
-<component name="lcstylustap" long-name="LC Stylus Tap Plugins" plugin="Y">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/lcstylustap/group"/>
-</component>
-<component name="generichid" long-name="Generic HID">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/generichid/group"/>
-</component>
-<component name="headset" long-name="Headset">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/headset/group"/>
-</component>
-</collection>
-</block>
-<block name="imghandling" level="specific" long-name="Image Handling" levels="lib util if">
-<collection name="imagehandling_plat" long-name="Image Handling Platform Interfaces" level="if">
-<component name="image_handling_library_api" long-name="Image Handling Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
-</component>
-<component name="3gp_library_api" long-name="3GP Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
-</component>
-<component name="thumbnailmanager_api" long-name="Thumbnail Manager API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagehandlinglib" long-name="Image Handling Library" level="lib">
-<!-- collection is really a component, need to move down a directory -->
-<component name="ihl" filter="s60" long-name="IHL">
-<unit bldFile="mw/imghandling/imagehandlinglib/group"/>
-</component>
-</collection>
-<collection name="imagehandlingutilities" long-name="Image Handling Utilities" level="util">
-<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager">
-<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
-</component>
-</collection>
-</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">
-<unit bldFile="mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
-</component>
-</collection>
-</block>
-<block name="mds" level="specific" long-name="Metadata Services" levels="mgr eng server int">
-<collection name="mds_plat" long-name="Metadata Services Platform Interfaces" level="int">
-<component name="context_engine_plugin_api" long-name="Context Engine Plugin API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/group" filter="!test"/>
-</component>
-<component name="harvester_framework_api" long-name="Harvester Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/harvester_framework_api/group" filter="!test"/>
-<!-- can only have one unit with the same filter, #include the following from the previous unit -->
-</component>
-<component name="location_manager_api" long-name="Location Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/location_manager_api/group" filter="!test"/>
-</component>
-<component name="metadata_engine_api" long-name="Metadata Engine API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/metadata_engine_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_collection_manager_api" long-name="Content Listing Framework Collection Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_extended_api" long-name="Content Listing Framework Extended API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_extended_api/group"/>
-</component>
-</collection>
-<collection name="mds_pub" long-name="Metadata Services Public Interfaces" level="int">
-<component name="content_listing_framework_api" long-name="Content Listing Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_pub/content_listing_framework_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="metadataengine" long-name="Metadata Engine" level="eng">
-<component name="metadataengine_common" filter="s60" long-name="Metadata Engine Common" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/common/group"/>
-</component>
-<component name="metadataengine_server" filter="s60" long-name="Metadata Engine Server" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/server/group"/>
-</component>
-<component name="metadataengine_client" filter="s60" long-name="Metadata Engine Client" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/client/group"/>
-</component>
-<component name="metadataengine_build" filter="s60" long-name="Metadata Engine Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/metadataengine/group"/>
-</component>
-</collection>
-<collection name="locationmanager" long-name="Location Manager" level="mgr">
-<component name="locationtrail" filter="s60" long-name="Location Trail" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/locationtrail/group"/>
-</component>
-<component name="locationmanager_server" filter="s60" long-name="Location Manager Server" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/server/group"/>
-</component>
-<component name="locationmanager_client" filter="s60" long-name="Location Manager Client" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/client/group"/>
-</component>
-<component name="locationmanager_build" filter="s60" long-name="Location Manager Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/locationmanager/group"/>
-</component>
-</collection>
-<collection name="contextengine" long-name="Context Engine" level="eng">
-<component name="contextengine_plugins" filter="s60" long-name="Context Engine Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/contextengine/plugins/group"/>
-</component>
-<component name="contextengine_build" filter="s60" long-name="Context Engine Build" introduced="^2">
-<!--make this collection a single component, or make this unit self-contained -->
-<unit bldFile="mw/mds/contextengine/group"/>
-</component>
-</collection>
-<collection name="harvester" long-name="Harvester" level="eng">
-<component name="blacklistclient" filter="s60" long-name="Blacklist Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistclient/group"/>
-</component>
-<component name="blacklistserver" filter="s60" long-name="Blacklist Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistserver/group"/>
-</component>
-<component name="harvester_common" filter="s60" long-name="Harvester Common" introduced="^2">
-<unit bldFile="mw/mds/harvester/common/group"/>
-</component>
-<component name="composerplugins" filter="s60" long-name="Composer Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/composerplugins/group"/>
-</component>
-<component name="harvesterplugins" filter="s60" long-name="Harvester Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/harvesterplugins/group"/>
-</component>
-<component name="monitorplugins" filter="s60" long-name="Monitor Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/monitorplugins/group"/>
-</component>
-<component name="harvester_server" filter="s60" long-name="Harvester Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/server/group"/>
-</component>
-<component name="harvester_client" filter="s60" long-name="Harvester Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/client/group"/>
-</component>
-<component name="harvester_build" filter="s60" long-name="Harvester Build" introduced="^2">
-<!-- split these exports into the other components -->
-<unit bldFile="mw/mds/harvester/group"/>
-</component>
-</collection>
-<collection name="watchdog" long-name="Watchdog" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="mdswatchdog" filter="s60" long-name="Metadata Watchdog" introduced="^2">
-<unit bldFile="mw/mds/watchdog/group"/>
-</component>
-</collection>
-<collection name="clfwrapper" long-name="Content Listing Framework Wrapper" level="int">
-<!-- collection is really a component. Move down a directory -->
-<component name="clfwrapper_build" filter="s60" long-name="CLF Wrapper Build" introduced="^2" class="placeholder">
-<!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
-<!--<unit bldFile="clfwrapper/group"/>-->
-</component>
-</collection>
-<collection name="mds_info" long-name="Metadata Services Info" level="int">
-<component name="mds_build" filter="s60" long-name="Metadata Services Build" introduced="^2">
-<!-- consider distributiing this into the rest of the components in the package -->
-<unit bldFile="mw/mds/group"/>
-</component>
-</collection>
-</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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<unit bldFile="mw/mmuifw/mmuifw_plat/alf_customlayoutmanagers_api/group"/>
-</component>
-<component name="gesturehelper_api" long-name="Gesture Helper API" filter="s60" 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">
-<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">
-<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">
-<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">
-<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">
-<!-- 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">
-<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">
-<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">
-<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">
-<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">
-<unit bldFile="mw/mmuifw/mulwidgets/mullogging/group"/>
-</component>
-<component name="muldatamodel" filter="s60" long-name="MUL Data Model">
-<unit bldFile="mw/mmuifw/mulwidgets/muldatamodel/group"/>
-</component>
-<component name="mulwidgets_common" filter="s60" long-name="MUL Common Utils">
-<unit bldFile="mw/mmuifw/mulwidgets/common/group"/>
-</component>
-<component name="gesturehelper" filter="s60" long-name="Gesture Helper">
-<unit bldFile="mw/mmuifw/mulwidgets/gesturehelper/group"/>
-</component>
-<component name="mulcoverflowwidget" filter="s60" long-name="MUL CoverFlow Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/mulcoverflowwidget/group"/>
-</component>
-<component name="mulsliderwidget" filter="s60" long-name="MUL Slider Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/mulsliderwidget/group"/>
-</component>
-<component name="alfviewwidget" filter="s60" long-name="ALF View Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/alfviewwidget/group"/>
-</component>
-<component name="alfcontainerwidget" filter="s60" long-name="ALF Container Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/alfcontainerwidget/group"/>
-</component>
-<component name="alfscrollbarwidget" filter="s60" long-name="ALF Scrollbar Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/alfscrollbarwidget/group"/>
-</component>
-</collection>
-</block>
-<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"/>
-</component>
-<component name="videoconnutility_api" long-name="Video Connection Utility API" filter="s60" class="api">
-<unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/group"/>
-</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"/>
-</component>
-</collection>
-<collection name="videoscheduler" long-name="Video Scheduler" level="util">
-<component name="schedulerclient" filter="s60" long-name="Video Scheduler Client">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerclient/group"/>
-</component>
-<component name="schedulerserver" filter="s60" long-name="Video Scheduler Server">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerserver/group"/>
-</component>
-</collection>
-<collection name="videoconnutility" long-name="Video Connection Utility" level="util">
-<component name="connutilpsworker" filter="s60" long-name="Connection Utility Publish and Subscribe Worker">
-<unit bldFile="mw/videoutils/videoconnutility/connutilpsworker/group"/>
-</component>
-<component name="video_connutility" filter="s60" long-name="Video Connection Utility">
-<unit bldFile="mw/videoutils/videoconnutility/connutility/group"/>
-</component>
-</collection>
-<collection name="videoutils_info" long-name="Video Utils Info" level="if"/>
-</block>
-<block name="mmmw" level="generic" long-name="Multimedia Middleware" levels="plugin framework server generic specific">
-<collection name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" level="specific">
-<component name="multimedia_data_source_api" long-name="Multimedia Data Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
-</component>
-<component name="progressive_download_api" long-name="Progressive Download API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/progressive_download_api/group"/>
-</component>
-<component name="equalizer_ui_api" long-name="Equalizer UI API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
-</component>
-<component name="enhanced_media_client_api" long-name="Enhanced Media Client API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
-</component>
-<component name="stream_control_custom_command_api" long-name="Stream Control Custom Command API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
-</component>
-<component name="emc_buffer_source_api" long-name="EMC Buffer Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_buffer_source_api/group"/>
-</component>
-<component name="emc_file_source_api" long-name="EMC File Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
-</component>
-<component name="audio_metadata_reader_api" long-name="Audio MetaData Reader API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
-</component>
-<component name="emc_progressive_download_source_api" long-name="EMC Progressive Download Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
-</component>
-<component name="emc_volume_effect_api" long-name="EMC Volume Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
-</component>
-<component name="emc_balance_effect_api" long-name="EMC Balance Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_balance_effect_api/group"/>
-</component>
-<component name="emc_descriptor_source_api" long-name="EMC Descriptor Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_descriptor_source_api/group"/>
-</component>
-<component name="emc_drm_config_intfc_api" long-name="EMC DRM Config Intfc API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
-</component>
-<component name="voip_audio_services_api" long-name="VoIP Audio Services" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/group"/>
-</component>
-<component name="configuration_components_factory_api" long-name="Configuration Components Factory API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
-</component>
-<component name="audio_output_control_utility_api" long-name="Audio Output Control Utility API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/group"/>
-</component>
-<component name="audio_output_control_utility_proxy_api" long-name="Audio Output Control Utility Proxy API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
-</component>
-<component name="emc_audio_effects_api" long-name="EMC Audio Effects API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
-</component>
-<component name="call_audio_control_api" long-name="Call AudioControl API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/group"/>
-</component>
-<component name="radio_utilities_api" long-name="Radio Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/group"/>
-</component>
-<component name="radio_preset_utilities_api" long-name="Radio Preset Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
-</component>
-<component name="radio_monitor_api" long-name="Radio Monitor API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
-</component>
-<component name="thumbnail_engine_api" long-name="Thumbnail Engine API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/thumbnail_engine_api/group"/>
-</component>
-<component name="telephony_multimedia_service_api" long-name="Telephony Multimedia Service API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="mmfenh" long-name="MMF Enhancements" level="generic">
-<component name="advancedaudiocontroller" filter="s60" long-name="Advanced Audio Controllers" plugin="Y">
-<unit bldFile="mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
-</component>
-<component name="audiooutputcontrolutility" filter="s60" long-name="Audio Output Control Utility">
-<unit bldFile="mw/mmmw/mmfenh/audiooutputcontrolutility/group"/>
-</component>
-<component name="configurationcomponentsfactory" filter="s60" long-name="Configuration Components Factory">
-<unit bldFile="mw/mmmw/mmfenh/configurationcomponentsfactory/group"/>
-</component>
-<component name="enhancedaudioplayerutility" filter="s60" long-name="Enhanced Audio Player Utility">
-<unit bldFile="mw/mmmw/mmfenh/enhancedaudioplayerutility/group"/>
-</component>
-<component name="enhancedmediaclient" filter="s60" long-name="Enhanced Media Client">
-<unit bldFile="mw/mmmw/mmfenh/enhancedmediaclient/group"/>
-</component>
-<component name="profilesettingsmonitor" filter="s60" long-name="Profile Settings Monitor">
-<unit bldFile="mw/mmmw/mmfenh/profilesettingsmonitor/group"/>
-</component>
-<component name="progressivedownload" filter="s60" long-name="Progressive Download">
-<unit bldFile="mw/mmmw/mmfenh/progressivedownload/group"/>
-</component>
-</collection>
-<collection name="mm_fw" long-name="Multimedia Frameworks" level="framework">
-<!-- Id needs to be unique, mmfw already in use -->
-<!-- Placeholder for OpenAX AL and other stuff -->
-</collection>
-<collection name="mmserv" long-name="Multimedia Services" level="specific">
-<component name="audioeffectsui" filter="s60" long-name="Audio Effects UI">
-<unit bldFile="mw/mmmw/mmserv/audioeffectsui/group"/>
-</component>
-<component name="callaudiocontrol" filter="s60" long-name="Call Audio Control">
-<unit bldFile="mw/mmmw/mmserv/callaudiocontrol/group"/>
-</component>
-<component name="metadatautility" filter="s60" long-name="Metadata Utility">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/group"/>
-</component>
-<component name="radioutility" filter="s60" long-name="Radio Utility">
-<unit bldFile="mw/mmmw/mmserv/radioutility/group"/>
-</component>
-<component name="thumbnailengine" filter="s60" long-name="Thumbnail Engine" introduced="^2">
-<unit bldFile="mw/mmmw/mmserv/thumbnailengine/group"/>
-</component>
-<component name="tms" filter="s60" long-name="Telephony Multimedia Service" introduced="^3">
-<unit bldFile="mw/mmmw/mmserv/tms/group"/>
-</component>
-<component name="voipaudioservices" filter="s60" long-name="VoIP Audio Services">
-<unit bldFile="mw/mmmw/mmserv/voipaudioservices/group"/>
-</component>
-<component name="lib3gpextparser" filter="s60" long-name="3GP Extension Metadata Parser Library">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group" filter="sf_build"/>
-</component>
-</collection>
-<collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
-<component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="helix" level="generic" long-name="Helix" levels="plugin framework server generic specific">
-<collection name="helix_ren" long-name="Helix Engine" level="framework">
-<!-- what does "ren" stand for? -->
-<component name="helix_stub" filter="s60" long-name="Helix Stub" introduced="^2" class="api">
-<unit bldFile="mw/helix/helix_ren/helix_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="camerasrv" level="specific" long-name="Camera Services" levels="plugin fw api">
-<collection name="camerasrv_plat" long-name="Camera Services Platform Interfaces" level="api">
-<component name="media_recorder_sink_api" long-name="Media Recorder Sink API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
-</component>
-<component name="cae_extentension_api" long-name="CAE Extension API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/cae_extentension_api/group"/>
-</component>
-<component name="camera_application_engine_api" long-name="Camera Application Engine API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/camera_application_engine_api/group" filter="!test"/>
-</component>
-<component name="custom_onboard_camera_api" long-name="Custom Onboard Camera API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
-</component>
-<component name="imaging_configuration_manager_api" long-name="Imaging Configuration Manager API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
-</component>
-<component name="media_recorder_api" long-name="Media Recorder API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_api/group" filter="!test"/>
-</component>
-<component name="3gp_file_composer_api" long-name="3GP File Composer API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
-</component>
-<component name="asynchronous_file_saving_queue_api" long-name="Asynchronous File Saving Queue API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="camappengine" long-name="Camera App Engine" level="fw">
-<!-- is this collection really a component? If so, move down a directory -->
-<component name="stillconverter" filter="s60" long-name="Still Image Converter" class="placeholder">
-<!-- should separate this from parent engine's bld.inf -->
-<!-- <unit bldFile="camappengine/stillconverter/group"/> -->
-</component>
-<component name="camappengine_engine" filter="s60" long-name="Camera App Engine" class="placeholder">
-<!-- should separate this from parent engine's bld.inf -->
-<!-- <unit bldFile="camappengine/engine/group"/> -->
-</component>
-<component name="asynchfilesavequeue" filter="s60" long-name="Asynch File Save Queue">
-<unit bldFile="mw/camerasrv/camappengine/asynchfilesavequeue/group"/>
-</component>
-<component name="camappengine_build" filter="s60" long-name="Camera App Engine Build">
-<unit bldFile="mw/camerasrv/camappengine/build"/>
-</component>
-</collection>
-<collection name="camcordermmfplugin" long-name="Camcorder MMF Plugin" level="plugin">
-<!-- collection is really a component. Should move down a directory -->
-<component name="camcordermmfplugin_build" filter="s60" long-name="Camcorder MMF Plugin Build" plugin="Y">
-<unit bldFile="mw/camerasrv/camcordermmfplugin/build"/>
-</component>
-</collection>
-<collection name="configmanagers" long-name="Config Managers" level="api">
-<component name="imagingconfigmanager" filter="s60" long-name="Imaging Config Manager">
-<unit bldFile="mw/camerasrv/configmanagers/imagingconfigmanager/group"/>
-</component>
-</collection>
-<collection name="camerasrv_info" long-name="Camera Services Info" level="api">
-<component name="camerasrv_build" filter="s60" long-name="Camera Services Build">
-<!-- should split into individual bld.infs -->
-<unit bldFile="mw/camerasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="mmappfw" level="specific" long-name="Multimedia App Framework" levels="fw utils if">
-<collection name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" level="if">
-<component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interfaces Build" introduced="^1" filter="s60">
-<!-- this is no longer necessary when confguration is put in place -->
-<unit bldFile="mw/mmappfw/mmappfw_plat"/>
-</component>
-<component name="collection_helper_api" long-name="Collection Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
-</component>
-<component name="harvester_collection_mediator_api" long-name="Harvester Collection Mediator API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/group"/>
-</component>
-<component name="harvester_metadata_extractor_api" long-name="Harvester Metadata Extractor API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/group"/>
-</component>
-<component name="harvester_server_api" long-name="Harvester Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_server_api/group"/>
-</component>
-<component name="harvester_utility_api" long-name="Harvester Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_utility_api/group"/>
-</component>
-<component name="playlist_engine_api" long-name="Playlist Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playlist_engine_api/group"/>
-</component>
-<component name="mtp_keys_api" long-name="MTP Keys API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mtp_keys_api/group"/>
-</component>
-<component name="mpx_collection_common_definition_api" long-name="MPX Collection Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_common_definition_api/group"/>
-</component>
-<component name="mpx_collection_utility_api" long-name="MPX Collection Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/group"/>
-</component>
-<component name="mpx_common_api" long-name="MPX Common API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_api/group"/>
-</component>
-<component name="mpx_common_definition_api" long-name="MPX Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_common_definition_api" long-name="MPX Playback Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_utility_api" long-name="MPX Playback Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/group"/>
-</component>
-<component name="mpx_base_view_plugins_api" long-name="MPX Base View Plugins API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/group"/>
-</component>
-<component name="mpx_view_utility_api" long-name="MPX View Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_view_utility_api/group"/>
-</component>
-<component name="mpx_albumart_utility_api" long-name="MPX Album Art Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/group"/>
-</component>
-<component name="media_player_settings_engine_api" long-name="Media Player Settings Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
-</component>
-<component name="mpx_backstepping_utility_api" long-name="MPX Backstepping Utility API" introduced="^1" filter="s60" class="api">
-<!-- uncomment when configuration is put in place
- <unit bldFile="mmappfw_plat/mpx_backstepping_utility_api/group"/> -->
-</component>
-<component name="asx_parser_api" long-name="ASX Parser API" introduced="^1" filter="s60" class="api">
-<!-- uncomment when configuration is put in place
- <unit bldFile="mmappfw_plat/asx_parser_api/group"/> -->
-</component>
-<component name="playback_helper_api" long-name="Playback Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playback_helper_api/group"/>
-</component>
-<component name="videoplaylist_utility_api" long-name="Video Playlist Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/videoplaylist_utility_api/group"/>
-</component>
-<component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interface Build" introduced="^1" filter="s60" class="api">
-<!-- needed only for #ifdefs. Remove anmd uncomment above units when configuration is in place -->
-<unit bldFile="mw/mmappfw/mmappfw_plat/group"/>
-</component>
-</collection>
-<collection name="mpx" long-name="Multimedia Player" level="fw">
-<component name="commonframework" filter="s60" long-name="MPX Common Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/commonframework/group"/>
-</component>
-<component name="playbackframework" filter="s60" long-name="MPX Playback Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/playbackframework/group"/>
-</component>
-<component name="mpxcollectionfw" filter="s60" long-name="MPX Collection Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/collectionframework/group"/>
-</component>
-<component name="mpxviewfw" filter="s60" long-name="MPX View Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/viewframework/group"/>
-</component>
-<component name="mpx_build" filter="s60" long-name="MPX Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/mpx/group"/>
-</component>
-</collection>
-<collection name="mmappcomponents" long-name="Multimedia App Components" level="utils">
-<component name="mmappcomponents_build" filter="s60" long-name="Multimedia App Components Build" introduced="^1">
-<!-- needed for #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
- Can remove this once configuration is in place-->
-<unit bldFile="mw/mmappfw/mmappcomponents/group"/>
-</component>
-<component name="collectionhelper" filter="s60" long-name="Media Player Collection Helper" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/collectionhelper/group"/>
-</component>
-<component name="playlistengine" filter="s60" long-name="Playlist Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/playlistengine/group"/>
-</component>
-<component name="mpxharvester" filter="s60" long-name="Media Player Harvester" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/harvester/group"/>
-</component>
-<component name="mmappcommonui" filter="s60" long-name="Multimedia App Common UI" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmappcommonui/group"/>
-</component>
-<component name="mediaplayersettingsengine" filter="s60" long-name="Media Player Settings Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
-</component>
-<component name="audiofetcher" filter="s60" long-name="Audio Fetcher" introduced="^1" plugin="Y">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
-</component>
-<component name="asxparser" filter="s60" long-name="ASX Parser" introduced="^1">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
-</component>
-<component name="playbackhelper" filter="s60" long-name="Playback Helper" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/playbackhelper/group"/>
-</component>
-<component name="videoplaylistutility" filter="s60" long-name="Video Playlist Utility" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/videoplaylistutility/group"/>
-</component>
-<component name="mmmtpdataprovider" filter="s60" long-name="Multimedia MTP Data Provider" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmmtpdataprovider/group"/>
-</component>
-</collection>
-<collection name="mmappfw_info" long-name="Multimedia App Framework Info" level="if">
-<component name="mmappfw_build" filter="s60" long-name="Multimedia App Framework Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/group"/>
-</component>
-<component name="mmappfw_test" filter="s60,test,api_test,pref_test" long-name="Multimedia App Framework Test" purpose="development" introduced="^1"/>
-</collection>
-</block>
-<block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework api">
-<collection name="inputmethods_pub" long-name="Input Methods Public Interfaces" level="api">
-<component name="ptiengine_iti_api" long-name="PTI Engine API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
-</component>
-<component name="optical_character_recognition_api" long-name="Optical Character Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
-</component>
-<component name="input_language_info_api" long-name="Input Language Info API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
-</component>
-</collection>
-<collection name="inputmethods_plat" long-name="Input Methods Platform Interfaces" level="api">
-<component name="pen_input_server_api" long-name="Pen Input Server API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/group" filter="!test"/>
-</component>
-<component name="ptiengine_hwr_api" long-name="PTI Engine Handwriting Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group" filter="!test"/>
-</component>
-<component name="aknfep_settings_api" long-name="Avkon FEP Settings API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
-</component>
-<component name="aknfep_status_api" long-name="Avkon FEP Status API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
-</component>
-<component name="ptiengine_key_definations_api" long-name="PTI Engine Key Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
-</component>
-<component name="aknfep_definitions_api" long-name="Avkon FEP Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
-</component>
-<component name="aknfep_pen_support_api" long-name="Avkon FEP Pen Support API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
-</component>
-<component name="ptiengine_indic_definitions_api" long-name="PTI Engine Indic Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
-</component>
-<component name="aknfep_uiinterface_api" long-name="Avkon FEP UI Interface API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="textinput" long-name="Text Input" level="framework">
-<component name="ptienginev2" filter="s60" long-name="Predictive Text Input Engine">
-<!--uncomment when configuration is turned on and textinput_build is removed-->
-<!-- <unit bldFile="textinput/ptienginev2/group"/>-->
-</component>
-<component name="akninputlanguage" filter="s60" long-name="Avkon Input Language">
-<unit bldFile="mw/inputmethods/textinput/akninputlanguage/group"/>
-</component>
-<component name="peninputarc" filter="s60" long-name="Pen Input Arc">
-<unit bldFile="mw/inputmethods/textinput/peninputarc/group"/>
-</component>
-<component name="peninputcommonctrls" filter="s60" long-name="Pen Input Common Controls">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonctrls/group"/>
-</component>
-<component name="peninputhwrboxcn" filter="s60" long-name="Chinese Handwriting Recognition Box" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrboxcn/group"/>
-</component>
-<component name="peninputvkbcn" filter="s60" long-name="Chinese Virtual Keyboard" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputvkbcn/group"/>
-</component>
-<component name="peninputcommonlayout" filter="s60" long-name="Pen Input Common Layout">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonlayout/group"/>
-</component>
-<component name="peninputgenerichwr" filter="s60" long-name="Pen Input Generic Handwriting Recognition" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputgenerichwr/group"/>
-</component>
-<component name="peninputgenericvkb" filter="s60" long-name="Pen Input Generic Virtual Keyboard" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputgenericvkb/group"/>
-</component>
-<component name="peninputcommonctrlsjp" filter="s60" long-name="Pen Input Common Controls Japanese">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonctrlsjp/group"/>
-</component>
-<component name="peninputhwrboxjp" filter="s60" long-name="Japanese Handwriting Recognition Box" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrboxjp/group"/>
-</component>
-<component name="peninputvkbjp" filter="s60" long-name="Japanese Virtual Keyboard" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputvkbjp/group"/>
-</component>
-<component name="gslangplugin" filter="s60" long-name="GS Language Plugin" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/GSLangPlugin"/>
-</component>
-<component name="peninputgenericitut" filter="s60" long-name="Pen Input Generic ITU-T" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputgenericitut/group"/>
-</component>
-<component name="peninputhwrtrui" filter="s60" long-name="Pen Input Handwriting Recognition Training UI" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrtrui/group"/>
-</component>
-<component name="peninputhwrfscn" filter="s60" long-name="Pen Input Chinese Full Screen Handwriting Recognition" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrfscn/group"/>
-</component>
-<component name="peninputvkbkr" filter="s60" long-name="Pen Input Korean Virtual Keyboard" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputvkbkr/group"/>
-</component>
-<component name="peninputfingerhwr" filter="s60" long-name="Pen Input Finger Handwriting Recognition" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputfingerhwr/group"/>
-</component>
-<component name="peninputsplititut" filter="s60" long-name="Pen Input Split ITU-T" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputsplititut/group"/>
-</component>
-<component name="peninputsplitqwerty" filter="s60" long-name="Pen Input Split QWERTY" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputsplitqwerty/group"/>
-</component>
-<component name="textinput_build" filter="s60" long-name="Text Input Build">
-<!--needed for #ifdef, can be removed when configuration is implemented -->
-<unit bldFile="mw/inputmethods/textinput/group"/>
-</component>
-</collection>
-<collection name="fep" long-name="FEP" level="engine">
-<component name="aknfep" filter="s60" long-name="Avkon FEP" plugin="Y">
-<unit bldFile="mw/inputmethods/fep/aknfep/group"/>
-</component>
-<component name="frontendprocessor" long-name="Front End Processor" purpose="mandatory">
-<unit bldFile="mw/inputmethods/fep/frontendprocessor/group" mrp="mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
-</component>
-</collection>
-<collection name="inputmethods_info" long-name="Input Methods Info" level="api">
-<component name="inputmethods_metadata" long-name="Input Methods Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="qt" level="generic" long-name="Qt" levels="tool mw app">
-<collection name="qtconf" long-name="Qt Config" level="tool">
-<component name="qt_deviceconfiguration" long-name="Qt Device Configuration" introduced="^2" class="config tool">
-<unit bldFile="mw/qt/src/s60installs/deviceconfiguration"/>
-</component>
-</collection>
-<collection name="qt_info" long-name="Qt Info" level="mw">
-<component name="qt_build" long-name="Qt Build" introduced="^2">
-<unit bldFile="mw/qt"/>
-</component>
-</collection>
-<collection name="qtdemos" long-name="Qt Demos" level="app">
-<component name="qtdemos_build" long-name="Qt Demos Build" introduced="^2" filter="qtdemos">
-<unit bldFile="mw/qt/demos"/>
-</component>
-</collection>
-<collection name="qtexamples" long-name="Qt Examples" level="app">
-<component name="qtexamples_build" long-name="Qt Examples Build" introduced="^2" filter="qtexamples">
-<unit bldFile="mw/qt/examples"/>
-</component>
-</collection>
-<collection name="qt_tests" long-name="Qt Tests" level="app">
-<component name="qttestsauto" long-name="Qt Automated Tests" introduced="^2" filter="qttestsauto">
-<unit bldFile="mw/qt/tests/auto"/>
-</component>
-<component name="qttestsbenchmarks" long-name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks">
-<unit bldFile="mw/qt/tests/benchmarks"/>
-</component>
-</collection>
-</block>
-<block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
-<collection name="classicui_plat" long-name="Classic UI Platform Interfaces" level="specific">
-<component name="personalisation_framework_api" long-name="Personalisation Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_framework_api/group" filter="!test"/>
-</component>
-<component name="signal_pane_api" long-name="Signal Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
-</component>
-<component name="japanese_reading_api" long-name="Japanese Reading API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/japanese_reading_api/group" filter="!test"/>
-</component>
-<component name="global_popup_priority_controller_api" long-name="Global Popup Priority Controller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
-</component>
-<component name="item_finder_api" long-name="Item Finder API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/item_finder_api/group" filter="!test"/>
-</component>
-<component name="avkon_fonts_api" long-name="Avkon Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_fonts_api/group" filter="!test"/>
-</component>
-<component name="extended_utilities_api" long-name="Extended Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
-</component>
-<component name="personalisation_plugin_api" long-name="Personalisation Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
-</component>
-<component name="extended_aiw_criteria_api" long-name="Extended AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="personalisation_application_api" long-name="Personalisation Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_application_api/group"/>
-</component>
-<component name="volume_popup_api" long-name="Volume Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
-</component>
-<component name="avkon_secondary_display_support_api" long-name="AVKON Secondary Display Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_support_api/group" filter="!test"/>
-</component>
-<component name="extended_setting_pages_api" long-name="Extended Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_setting_pages_api/group" filter="!test"/>
-</component>
-<component name="extended_lists_api" long-name="Extended Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_lists_api/group" filter="!test"/>
-</component>
-<component name="input_block_api" long-name="Input Block API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/input_block_api/group" filter="!test"/>
-</component>
-<component name="avkon_ui_server_api" long-name="AVKON UI Server API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_ui_server_api/group" filter="!test"/>
-</component>
-<component name="number_grouping_api" long-name="Number Grouping API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/number_grouping_api/group" filter="!test"/>
-</component>
-<component name="extended_status_pane_api" long-name="Extended Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_status_pane_api/group" filter="!test"/>
-</component>
-<component name="extended_notifiers_api" long-name="Extended Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notifiers_api/group" filter="!test"/>
-</component>
-<component name="task_list_api" long-name="Task List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
-</component>
-<component name="personalisation_slide_show_dialog_api" long-name="Personalisation Slide Show Dialog API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
-</component>
-<component name="key_event_utilities_api" long-name="Key Event Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_event_utilities_api/group"/>
-</component>
-<component name="emergency_call_support_api" long-name="Emergency Call Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/emergency_call_support_api/group" filter="!test"/>
-</component>
-<component name="extended_dialogs_api" long-name="Extended Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_dialogs_api/group"/>
-</component>
-<component name="legacy_ui_framework_headers_api" long-name="Legacy UI Framework Headers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/legacy_ui_framework_headers_api/group"/>
-</component>
-<component name="extended_editors_api" long-name="Extended Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_editors_api/group" filter="!test"/>
-</component>
-<component name="alarm_api" long-name="Alarm API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alarm_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_interface_base_api" long-name="AIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_base_api/group" filter="!test"/>
-</component>
-<component name="list_effects_api" long-name="List Effects API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/list_effects_api/group" filter="!test"/>
-</component>
-<component name="find_item_ui_api" long-name="Find Item UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/find_item_ui_api/group" filter="!test"/>
-</component>
-<component name="server_application_services_api" long-name="Server Application Services API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/server_application_services_api/group" filter="!test"/>
-</component>
-<component name="common_ui_settings_api" long-name="Common UI Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_ui_settings_api/group"/>
-</component>
-<component name="aiw_service_interface_menu_api" long-name="AIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_menu_api/group" filter="!test"/>
-</component>
-<component name="eikon_server_extension_client_api" long-name="EIKON Server Extension Client API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/eikon_server_extension_client_api/group" filter="!test"/>
-</component>
-<component name="skinnable_clock_api" long-name="Skinnable Clock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/skinnable_clock_api/group" filter="!test"/>
-</component>
-<component name="battery_pane_api" long-name="Battery Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/battery_pane_api/group" filter="!test"/>
-</component>
-<component name="fep_document_navigation_api" long-name="FEP Document Navigation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
-</component>
-<component name="personalisation_localised_texts_api" long-name="Personalisation Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
-</component>
-<component name="memory_card_ui_api" long-name="Memory Card UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
-</component>
-<component name="avkon_status_api" long-name="AVKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_status_api/group"/>
-</component>
-<component name="application_switching_api" long-name="Application Switching API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/application_switching_api/group" filter="!test"/>
-</component>
-<component name="avkon_localised_texts_api" long-name="AVKON Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_localised_texts_api/group"/>
-</component>
-<component name="avkon_secondary_display_api" long-name="AVKON Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_api/group"/>
-</component>
-<component name="extended_animation_api" long-name="Extended Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_notes_api" long-name="Extended Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notes_api/group" filter="!test"/>
-</component>
-<component name="screensaver_animation_plugin_definitions_api" long-name="Screensaver Animation Plugin Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/screensaver_animation_plugin_definitions_api/group"/>
-</component>
-<component name="text_scroller_api" long-name="Text Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/text_scroller_api/group" filter="!test"/>
-</component>
-<component name="custom_cursors_api" long-name="Custom Cursors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/custom_cursors_api/group" filter="!test"/>
-</component>
-<component name="screensaver_settings_api" long-name="Screensaver Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/screensaver_settings_api/group"/>
-</component>
-<component name="global_window_priorities_api" long-name="Global Window Priorities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_window_priorities_api/group"/>
-</component>
-<component name="extended_indicators_api" long-name="Extended Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_indicators_api/group" filter="!test"/>
-</component>
-<component name="special_character_table_api" long-name="Special Character Table API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/special_character_table_api/group" filter="!test"/>
-</component>
-<component name="avkon_settings_api" long-name="AVKON Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_settings_api/group"/>
-</component>
-<component name="extended_sounds_api" long-name="Extended Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_sounds_api/group"/>
-</component>
-<component name="themes_settings_api" long-name="Themes Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/themes_settings_api/group"/>
-</component>
-<component name="media_shared_document_api" long-name="Media Shared Document API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/media_shared_document_api/group" filter="!test"/>
-</component>
-<component name="extended_queries_api" long-name="Extended Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_queries_api/group"/>
-</component>
-<component name="phone_number_text_utilities_api" long-name="Phone Number Text Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
-</component>
-<component name="screensaver_runtime_api" long-name="Screensaver Runtime API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/screensaver_runtime_api/group"/>
-</component>
-<component name="extended_scroller_api" long-name="Extended Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_scroller_api/group"/>
-</component>
-<component name="key_rotator_api" long-name="Key Rotator API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_rotator_api/group" filter="!test"/>
-</component>
-<component name="extended_grids_api" long-name="Extended Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_grids_api/group" filter="!test"/>
-</component>
-<component name="generic_parameter_api" long-name="Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="indicator_touch_observer_api" long-name="Indicator Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_touch_observer_api/group"/>
-</component>
-<component name="popup_form_api" long-name="Popup Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/popup_form_api/group" filter="!test"/>
-</component>
-<component name="stylus_activated_popup_api" long-name="Stylus Activated Pop-up API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/stylus_activated_popup_api/group" filter="!test"/>
-</component>
-<component name="indicator_plugin_api" long-name="Indicator Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_plugin_api/group" filter="!test"/>
-</component>
-<component name="layout_configuration_api" long-name="Layout Configuration API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/layout_configuration_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_filter_factory_api" long-name="Common File Dialogs Filter Factory API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group" filter="!test"/>
-</component>
-<component name="avkon_anim_dll_api" long-name="AVKON Anim DLL API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_anim_dll_api/group"/>
-</component>
-<component name="extended_initialization_api" long-name="Extended Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_initialization_api/group" filter="!test"/>
-</component>
-<component name="long_tap_animation_api" long-name="Long Tap Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/long_tap_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_ui_framework_definitions_api" long-name="Extended UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_ui_framework_definitions_api/group"/>
-</component>
-<component name="extended_buttons_api" long-name="Extended Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_buttons_api/group" filter="!test"/>
-</component>
-<component name="aiw_provider_utility_api" long-name="AIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_provider_utility_api/group" filter="!test"/>
-</component>
-<component name="transition_effect_parameters_api" long-name="Transition Effect Parameters API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_parameters_api/group" filter="!test"/>
-</component>
-<component name="extended_input_capabilities_api" long-name="Extended Input Capabilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_input_capabilities_api/group" filter="!test"/>
-</component>
-<component name="uikon_status_api" long-name="UIKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/uikon_status_api/group"/>
-</component>
-<component name="transition_effect_utilities_api" long-name="Transition Effect Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_utilities_api/group" filter="!test"/>
-</component>
-<component name="pointer_event_modifier_api" long-name="Pointer Event Modifier API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/pointer_event_modifier_api/group" filter="!test"/>
-</component>
-<component name="avkon_testability_api" long-name="AVKON Testability API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_testability_api/group"/>
-</component>
-<component name="ganes_api" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ganes_api/group"/>
-</component>
-<component name="ode_api" long-name="Ode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ode_api/group"/>
-</component>
-<component name="physics_api" long-name="Physics API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/physics_api/group"/>
-</component>
-<component name="touch_pane_api" long-name="Touch Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_api/group" filter="!test"/>
-</component>
-<component name="touch_pane_observer_api" long-name="Touch Pane Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_observer_api/group"/>
-</component>
-<component name="alternate_fs_api" long-name="Alternate FS API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alternate_fs_api/group"/>
-</component>
-<component name="discreet_popup_api" long-name="Discreet Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/discreet_popup_api/group"/>
-</component>
-<component name="touch_gesture_framework_api" long-name="Touch Gesture Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_gesture_framework_api/group"/>
-<!-- should this be commented out? -->
-<!--<unit bldFile="classicui_plat/touch_gesture_framework_api/tsrc/group" filter="test,api_test"/> -->
-</component>
-<component name="extended_options_menu_api" long-name="Extended Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="classicui_pub" long-name="Classic UI Public Interfaces" level="specific">
-<component name="input_frame_api" long-name="Input Frame API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/input_frame_api/group" filter="!test"/>
-</component>
-<component name="window_server_event_observer_api" long-name="Window Server Event Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/window_server_event_observer_api/group" filter="!test"/>
-</component>
-<component name="application_framework_api" long-name="Application Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/application_framework_api/group" filter="!test"/>
-</component>
-<component name="scroller_api" long-name="Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/scroller_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_utilities_api" long-name="UI Framework Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_utilities_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_definitions_api" long-name="UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_definitions_api/group" filter="!test"/>
-</component>
-<component name="buttons_api" long-name="Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/buttons_api/group" filter="!test"/>
-</component>
-<component name="queries_api" long-name="Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/queries_api/group" filter="!test"/>
-</component>
-<component name="aiw_generic_parameter_api" long-name="AIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="editors_api" long-name="Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/editors_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_api" long-name="Common File Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/common_file_dialogs_api/group" filter="!test"/>
-</component>
-<component name="dialog_shutter_api" long-name="Dialog Shutter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialog_shutter_api/group" filter="!test"/>
-</component>
-<component name="fonts_api" long-name="Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/fonts_api/group" filter="!test"/>
-</component>
-<component name="screen_clearer_api" long-name="Screen Clearer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_clearer_api/group" filter="!test"/>
-</component>
-<component name="notifiers_api" long-name="Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notifiers_api/group" filter="!test"/>
-</component>
-<component name="notes_api" long-name="Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notes_api/group" filter="!test"/>
-</component>
-<component name="screen_saver_api" long-name="Screen Saver API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_saver_api/group" filter="!test"/>
-</component>
-<component name="status_pane_api" long-name="Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/status_pane_api/group" filter="!test"/>
-</component>
-<component name="base_controls_api" long-name="Base Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/base_controls_api/group" filter="!test"/>
-</component>
-<component name="grids_api" long-name="Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/grids_api/group" filter="!test"/>
-</component>
-<component name="context_pane_api" long-name="Context Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/context_pane_api/group" filter="!test"/>
-</component>
-<component name="lists_api" long-name="Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/lists_api/group" filter="!test"/>
-</component>
-<component name="popups_api" long-name="Popups API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/popups_api/group" filter="!test"/>
-</component>
-<component name="misc_controls_api" long-name="Misc Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/misc_controls_api/group" filter="!test"/>
-</component>
-<component name="keylock_api" long-name="Keylock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/keylock_api/group" filter="!test"/>
-</component>
-<component name="options_menu_api" long-name="Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/options_menu_api/group" filter="!test"/>
-</component>
-<component name="hierarchical_lists_api" long-name="Hierarchical Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hierarchical_lists_api/group" filter="!test"/>
-</component>
-<component name="navigation_pane_api" long-name="Navigation Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/navigation_pane_api/group" filter="!test"/>
-</component>
-<component name="tabs_api" long-name="Tabs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/tabs_api/group" filter="!test"/>
-</component>
-<component name="title_pane_touch_observer_api" long-name="Title Pane Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_touch_observer_api/group"/>
-</component>
-<component name="choice_list_api" long-name="Choice List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/choice_list_api/group" filter="!test"/>
-</component>
-<component name="info_popup_note_api" long-name="Info Popup Note API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/info_popup_note_api/group" filter="!test"/>
-</component>
-<component name="setting_pages_api" long-name="Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/setting_pages_api/group" filter="!test"/>
-</component>
-<component name="screen_mode_api" long-name="Screen Mode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_mode_api/group" filter="!test"/>
-</component>
-<component name="indicators_api" long-name="Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/indicators_api/group" filter="!test"/>
-</component>
-<component name="error_ui_api" long-name="Error UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/error_ui_api/group" filter="!test"/>
-</component>
-<component name="animation_api" long-name="Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/animation_api/group" filter="!test"/>
-</component>
-<component name="searchfield_api" long-name="Searchfield API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/searchfield_api/group" filter="!test"/>
-</component>
-<component name="labels_api" long-name="Labels API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/labels_api/group" filter="!test"/>
-</component>
-<component name="hotkeys_api" long-name="Hotkeys API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hotkeys_api/group" filter="!test"/>
-</component>
-<component name="initialization_api" long-name="Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/initialization_api/group" filter="!test"/>
-</component>
-<component name="volume_control_api" long-name="Volume Control API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/volume_control_api/group" filter="!test"/>
-</component>
-<component name="title_pane_api" long-name="Title Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_api/group" filter="!test"/>
-</component>
-<component name="sounds_api" long-name="Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/sounds_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_handler_api" long-name="AIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_service_handler_api/group" filter="!test"/>
-</component>
-<component name="aiw_criteria_api" long-name="AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="touch_ui_utilities_api" long-name="Touch UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/touch_ui_utilities_api/group" filter="!test"/>
-</component>
-<component name="generic_button_api" long-name="Generic Button API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/generic_button_api/group" filter="!test"/>
-</component>
-<component name="form_api" long-name="Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/form_api/group" filter="!test"/>
-</component>
-<component name="uikon_core_controls" long-name="Uikon Core Controls" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/uikon_core_controls/group" filter="!test"/>
-</component>
-<component name="calendar_api" long-name="Calendar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/calendar_api/group"/>
-</component>
-<component name="toolbar_api" long-name="Toolbar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/toolbar_api/group" filter="!test"/>
-</component>
-<component name="server_application_api" long-name="Server Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/server_application_api/group"/>
-</component>
-<component name="slider_api" long-name="Slider API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/slider_api/group" filter="!test"/>
-</component>
-<component name="private_ui_framework_api" long-name="Private UI Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/private_ui_framework_api/group" filter="!test"/>
-</component>
-<component name="dialogs_api" long-name="Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialogs_api/group" filter="!test"/>
-</component>
-<component name="document_handler_api" long-name="Document handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/document_handler_api/group"/>
-</component>
-<component name="images_api" long-name="Images API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/images_api/group" filter="!test"/>
-</component>
-<component name="stylus_popup_menu_api" long-name="Stylus Pop-up Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/stylus_popup_menu_api/group" filter="!test"/>
-</component>
-<component name="information_preview_popup_api" long-name="Information Preview Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/information_preview_popup_api/group" filter="!test"/>
-</component>
-<component name="intermediate_state_api" long-name="Intermediate State API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/intermediate_state_api/group"/>
-</component>
-<component name="help_launcher_api" long-name="Help Launcher API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/help_launcher_api/group"/>
-</component>
-</collection>
-<collection name="ode" long-name="Open Dynamics Engine" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="ode_build" filter="s60" long-name="ODE">
-<unit bldFile="mw/classicui/ode/group"/>
-</component>
-</collection>
-<collection name="uifw" long-name="UI Framework" level="server">
-<component name="uiklaf" filter="s60" long-name="Uikon Look-and-Feel">
-<unit bldFile="mw/classicui/uifw/uiklaf/group"/>
-</component>
-<component name="eikctl" filter="s60" long-name="Eikon Controls">
-<unit bldFile="mw/classicui/uifw/eikctl/group"/>
-</component>
-<component name="avkon" filter="s60" long-name="Avkon">
-<!-- can only have one unit. Split into 3 components, or #include all from same bld.inf -->
-<unit bldFile="mw/classicui/uifw/avkon/aknphysics/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/aknconf/group"/>
-</component>
-<component name="eikstd" filter="s60" long-name="Eikon Standard">
-<unit bldFile="mw/classicui/uifw/eikstd/group"/>
-</component>
-<component name="aknglobalui" filter="s60" long-name="Avkon Global UI">
-<unit bldFile="mw/classicui/uifw/aknglobalui/group"/>
-</component>
-<component name="ganes" filter="s60" long-name="Ganes">
-<unit bldFile="mw/classicui/uifw/ganes/group"/>
-</component>
-</collection>
-<collection name="commonuis" long-name="Common UIs" level="specific">
-<component name="commonui" filter="s60" long-name="Common UI">
-<unit bldFile="mw/classicui/commonuis/commonui/group"/>
-</component>
-<component name="commondialogs" filter="s60" long-name="Common Dialogs">
-<unit bldFile="mw/classicui/commonuis/commondialogs/group"/>
-</component>
-</collection>
-<collection name="applicationinterworkingfw" long-name="Application Interworking Framework" level="generic">
-<component name="aifwservicehandler" filter="s60" long-name="Application Interworking Service Handler">
-<unit bldFile="mw/classicui/applicationinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-<collection name="psln" long-name="Personalization" level="specific">
-<!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
-<component name="psln_build" filter="s60" long-name="Personalization Build">
-<unit bldFile="mw/classicui/psln/group"/>
-</component>
-</collection>
-<collection name="commonadapter" long-name="Common Adapter" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="commonadapter_build" filter="s60" long-name="Common Adapter Build">
-<unit bldFile="mw/classicui/commonadapter/group"/>
-</component>
-</collection>
-<collection name="akntouchgesturefw" long-name="Avkon Touch Gesture Framework" level="generic">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="akntouchgesturefw_build" filter="s60" long-name="Avkon Touch Gesture Framework Build" introduced="^3">
-<unit bldFile="mw/classicui/akntouchgesturefw/group"/>
-</component>
-</collection>
-<collection name="uiutils" long-name="UI Utils" level="specific">
-<component name="localizer" filter="s60" long-name="Directory Localizer">
-<unit bldFile="mw/classicui/uiutils/localizer/group"/>
-</component>
-<component name="findutil" filter="s60" long-name="Find Utility">
-<unit bldFile="mw/classicui/uiutils/findutil/group"/>
-</component>
-<component name="gamerecognizer" filter="s60" long-name="Game Recognizer" plugin="Y">
-<unit bldFile="mw/classicui/uiutils/gamerecognizer/group"/>
-</component>
-<component name="aknjapanesereading" filter="s60" long-name="Avkon Japanese Reading">
-<unit bldFile="mw/classicui/uiutils/aknjapanesereading/group"/>
-</component>
-</collection>
-<collection name="commonuisupport" long-name="Common UI Support" level="support">
-<component name="uikon" long-name="Uikon" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uikon/group" mrp="mw/classicui/commonuisupport/uikon/group/app-framework_uikon.mrp"/>
-</component>
-<component name="errorresolverdata" long-name="Error Resolver Data" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/errorresolverdata/group" mrp="mw/classicui/commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
-</component>
-<component name="uilaf" long-name="UI Look and Feel" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uilaf/GROUP" mrp="mw/classicui/commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
-</component>
-<component name="grid" long-name="Grid" purpose="optional">
-<unit bldFile="mw/classicui/commonuisupport/grid/group" mrp="mw/classicui/commonuisupport/grid/group/app-framework_grid.mrp"/>
-</component>
-<component name="uifwsdocs" long-name="UI Frameworks Documentation" purpose="development" class="doc">
-<unit mrp="mw/classicui/commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
-</component>
-</collection>
-<collection name="lafagnosticuifoundation" long-name="Look-and-Feel Agnostic UI Foundation" level="base">
-<component name="cone" long-name="Control Environment" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/cone/group" mrp="mw/classicui/lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
-</component>
-<component name="graphicseffects" long-name="Graphics Effects" introduced="9.2" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/graphicseffects/group" mrp="mw/classicui/lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
-</component>
-<component name="uigraphicsutils" long-name="UI Graphics Utilities" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group" mrp="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
-</component>
-<component name="clockanim" long-name="Clock" purpose="optional" plugin="Y">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/clockanim/group" mrp="mw/classicui/lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
-</component>
-<component name="bmpanimation" long-name="BMP Animation" introduced="6.0" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/bmpanimation/group" mrp="mw/classicui/lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
-</component>
-<component name="animation" long-name="Animation" introduced="9.1" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/animation/group" mrp="mw/classicui/lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
-</component>
-</collection>
-<collection name="classicui_info" long-name="Classic UI Info" level="specific">
-<!-- the multiple units in the API test components need to be resolved -->
-<component name="classicui_metadata" long-name="Classic UI Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/classicui/classicui_info/classicui_metadata/classicui_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="svgt" level="generic" long-name="SVG Tiny" levels="util ui">
-<collection name="svgt_plat" long-name="SVG Tiny Platform Interfaces" level="ui">
-<component name="svgt_api" long-name="SVGT API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/svgt_api/group"/>
-</component>
-<component name="nvg_api" long-name="NVG API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/nvg_api/group"/>
-</component>
-</collection>
-<collection name="svgtopt" long-name="SVG-T Engine" level="util">
-<component name="svgtopt_build" filter="s60" long-name="SVG Engine" introduced="9.2">
-<!-- component is at collection level. Needs to be moved down a directory -->
-<unit bldFile="mw/svgt/svgtopt/group"/>
-</component>
-<component name="svgtplugin" filter="s60" long-name="SVG Plugin" introduced="9.2" plugin="Y">
-<unit bldFile="mw/svgt/svgtopt/svgtplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="uiaccelerator" level="generic" long-name="UI Accelerator" levels="plugin framework server ex if">
-<collection name="uiaccelerator_plat" long-name="UI Accelerator Platform Interfaces" level="if">
-<component name="alf_core_toolkit_api" long-name="ALF Core Toolkit API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/group"/>
-</component>
-<component name="alf_visual_api" long-name="ALF Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/group"/>
-</component>
-<component name="alf_extended_visual_api" long-name="ALF Extended Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/group"/>
-</component>
-<component name="alf_extension_api" long-name="ALF Extension API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/group"/>
-</component>
-<component name="alf_tracing_api" long-name="ALF Tracing API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/group"/>
-</component>
-<component name="alf_client_server_api" long-name="ALF Client Server API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/group"/>
-</component>
-</collection>
-<collection name="uiacceltk" long-name="UI Accelerator Toolkit" level="framework">
-<component name="hitchcock" filter="s60" long-name="Hitchcock">
-<unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/group"/>
-</component>
-<component name="uiacceltk_build" filter="s60" long-name="UI Accelerator Toolkit Build">
-<!-- move into the other component, or remove the #include and make this UI Accelerator Toolkit ROM-->
-<unit bldFile="mw/uiaccelerator/uiacceltk/group"/>
-</component>
-</collection>
-</block>
-<block name="uiresources" level="generic" long-name="UI Resources" levels="compile plugin framework server generic data">
-<!-- are the custom filters below needed? -->
-<collection name="uiresources_pub" long-name="UI Resources Public Interfaces" level="data">
-<component name="pictograph_api" long-name="Pictograph API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/pictograph_api/group" filter="!test"/>
-</component>
-<component name="skins_api" long-name="Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/skins_api/group" filter="!test"/>
-</component>
-<component name="font_definition_api" long-name="Font Definition API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/font_definition_api/group" filter="!test"/>
-</component>
-<component name="graphics_api" long-name="Graphics API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/graphics_api/group" filter="!test"/>
-</component>
-<component name="scalable_icons_api" long-name="Scalable Icons API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/scalable_icons_api/group"/>
-</component>
-<component name="layout_id_definitions_api" long-name="Layout ID Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/layout_id_definitions_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_plat" long-name="UI Resources Platform Interfaces" level="data">
-<component name="layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_system_private_api/group" filter="!test"/>
-</component>
-<component name="layout_data_api" long-name="Layout Data API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_data_api/group" filter="!test"/>
-</component>
-<component name="cdl_api" long-name="CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/cdl_api/group" filter="!test"/>
-</component>
-<component name="extended_skins_api" long-name="Extended Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_skins_api/group" filter="!test"/>
-</component>
-<component name="tfx_server_controller_plugin_api" long-name="TFX Server Controller Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_controller_plugin_api/group"/>
-</component>
-<component name="extended_fonts_api" long-name="Extended Fonts API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_fonts_api/group" filter="!test"/>
-</component>
-<component name="graphic_configuration_api" long-name="Graphic Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/graphic_configuration_api/group" filter="!test"/>
-</component>
-<component name="mif_header_cdl_api" long-name="MIF Header CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mif_header_cdl_api/group"/>
-</component>
-<component name="personalisation_and_skins_settings_api" long-name="Personalisation and Skins Settings API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/personalisation_and_skins_settings_api/group"/>
-</component>
-<component name="tfx_effect_setup_plugin_api" long-name="TFX Effect Setup Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_effect_setup_plugin_api/group"/>
-</component>
-<component name="mifconv_definitions_api" long-name="Mifconv Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mifconv_definitions_api/group"/>
-</component>
-<component name="wallpaper_configuration_api" long-name="Wallpaper Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/wallpaper_configuration_api/group"/>
-</component>
-<component name="language_code_definitions_api" long-name="Language Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/language_code_definitions_api/group"/>
-</component>
-<component name="skins_image_attributes_api" long-name="Skins Image Attributes API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
-</component>
-<component name="private_user_area_code_definitions_api" long-name="Private User Area Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/private_user_area_code_definitions_api/group"/>
-</component>
-<component name="tfx_server_plugin_ids_api" long-name="TFX Server Plug-in IDs API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_plugin_ids_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_info" long-name="UI Resources Info" level="data">
-<component name="uiresources_test" filter="s60,test,api_test" long-name="UI Resources Tests" purpose="development"/>
-</collection>
-<collection name="uigraphics" long-name="UI Graphics" level="generic">
-<component name="bitmaps2" filter="s60" long-name="Bitmaps 2" class="config">
-<unit bldFile="mw/uiresources/uigraphics/bitmaps2/group"/>
-</component>
-<component name="icons" filter="s60" long-name="Icons" class="config">
-<unit bldFile="mw/uiresources/uigraphics/icons/group"/>
-</component>
-<component name="variatedbitmaps" filter="s60" long-name="Variated Bitmaps" class="config">
-<unit bldFile="mw/uiresources/uigraphics/variatedbitmaps/group"/>
-</component>
-<component name="aknicon" filter="s60" long-name="Avkon Icon Framework">
-<unit bldFile="mw/uiresources/uigraphics/aknicon/group"/>
-</component>
-<component name="nvgrenderstage" filter="sf_build" long-name="NVG Render Stage">
-<unit bldFile="mw/uiresources/uigraphics/nvgrenderstage/group"/>
-</component>
-</collection>
-<collection name="layouts" long-name="Layouts" level="plugin">
-<component name="cdl" filter="s60" long-name="Customization Definition Language">
-<!-- can only have one unit. Need to #include them or split into multiple components -->
-<unit bldFile="mw/uiresources/layouts/cdl/cdlengine/group"/>
-<unit bldFile="mw/uiresources/layouts/cdl/cdlserver/group"/>
-</component>
-<component name="aknlayout2" filter="s60" long-name="Avkon Layout 2">
-<unit bldFile="mw/uiresources/layouts/aknlayout2/group"/>
-</component>
-</collection>
-<collection name="skins" long-name="Skins" level="data">
-<component name="aknskincontent" filter="s60" long-name="Avkon Skin Content" class="config">
-<unit bldFile="mw/uiresources/skins/aknskincontent/group"/>
-</component>
-<component name="aknskins" filter="s60" long-name="Avkon Skin Compiler">
-<unit bldFile="mw/uiresources/skins/aknskins/group"/>
-</component>
-</collection>
-<collection name="pictographs" long-name="Pictographs" level="data">
-<component name="aknpictograph" filter="s60" long-name="Avkon Pictograph">
-<unit bldFile="mw/uiresources/pictographs/aknpictograph/group"/>
-</component>
-</collection>
-<collection name="locales" long-name="Locales" level="framework">
-<component name="locales_build" filter="s60" long-name="Locales Build">
-<unit bldFile="mw/uiresources/locales/loce32"/>
-</component>
-</collection>
-<collection name="uiconfig" long-name="UI Config" level="server">
-<component name="s60config" filter="s60" long-name="S60 UI Config">
-<unit bldFile="mw/uiresources/uiconfig/s60config/group"/>
-</component>
-</collection>
-<collection name="fontsupport" long-name="Font Support" level="generic">
-<component name="fontprovider" filter="s60" long-name="Font Provider">
-<unit bldFile="mw/uiresources/fontsupport/fontprovider/group"/>
-</component>
-<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
- <component id="s60_fonts" filter="s60" name="S60 Fonts">
- <unit bldFile="fontsupport/fontutils/group"/>
- </component>
--->
-<component name="fontutils" filter="sf_build" long-name="Font Utils">
-<unit bldFile="mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
-</component>
-</collection>
-<collection name="helpthemes" long-name="Help Themes" level="data">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helpthemes_build" filter="s60" long-name="Help Themes Build" class="config">
-<unit bldFile="mw/uiresources/helpthemes/group"/>
-</component>
-</collection>
-</block>
-<block name="hapticsservices" level="generic" long-name="Haptics Services" levels="fw server api">
-<collection name="hapticsservices_plat" long-name="Haptics Services Platform Interfaces" level="api">
-<component name="tacticon_api" long-name="Tacticon API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tacticon_api/group"/>
-</component>
-<component name="tactile_feedback_core_api" long-name="Tactile Feedback Core API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_core_api/group"/>
-</component>
-<component name="tactile_feedback_server_api" long-name="Tactile Feedback Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_server_api/group"/>
-</component>
-</collection>
-<collection name="hapticsservices_pub" long-name="Haptics Services Public Interfaces" level="api">
-<component name="tactile_feedback_client_api" long-name="Tactile Feedback Client API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_pub/tactile_feedback_client_api/group"/>
-</component>
-</collection>
-<collection name="tacticonserver" long-name="Tacticon Server" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="tacticonserver_build" filter="s60" long-name="Tacticon Server Build" introduced="^3">
-<unit bldFile="mw/hapticsservices/tacticonserver/group"/>
-<!-- clients and servers are suauly the same component. Consider moving pluign to a separate component if needed -->
-</component>
-</collection>
-<collection name="tactilefeedback" long-name="Tactile Feedback" level="fw">
-<component name="tactilearearegistry" filter="s60" long-name="Tactile Area Registry" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilearearegistry/group"/>
-</component>
-<component name="tactilefeedbackresolver" filter="s60" long-name="Tactile Feedback Resolver" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackresolver/group"/>
-</component>
-<component name="tactileclickplugin" filter="s60" long-name="Tactile Click Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileclickplugin/group"/>
-</component>
-<component name="tactilefeedbackclient" filter="s60" long-name="Tactile Feedback Client" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackclient/group"/>
-</component>
-<component name="tactileactionplugin" filter="s60" long-name="Tactile Action Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileactionplugin/group"/>
-</component>
-<component name="tactilefeedback_build" filter="s60" long-name="Tactile Feedback Build" introduced="^1">
-<!-- consider moving IBY to one fo the above components -->
-<unit bldFile="mw/hapticsservices/tactilefeedback/group"/>
-</component>
-</collection>
-</block>
-<block name="gsprofilesrv" level="generic" long-name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
-<collection name="gsprofilesrv_pub" long-name="GS and Profiles Services Public Interfaces" level="specific">
-<component name="profiles_engine_active_profile_settings_api" long-name="Profiles Engine Active Profile Settings API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_active_profile_settings_api/group"/>
-</component>
-<component name="profiles_engine_wrapper_api" long-name="Profiles Engine Wrapper API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_wrapper_api/group"/>
-</component>
-</collection>
-<collection name="gsprofilesrv_plat" long-name="GS and Profiles Services Platform Interfaces" level="specific">
-<component name="profiles_engine_api" long-name="Profiles Engine API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_engine_api/group"/>
-</component>
-<component name="profiles_mediafilelist_api" long-name="Media File List API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_mediafilelist_api/group"/>
-</component>
-<component name="filelist_api" long-name="File List API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/filelist_api/group"/>
-</component>
-<component name="settings_backgroundimage_api" long-name="Settings Background Image API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_backgroundimage_api/group"/>
-</component>
-<component name="settings_framework_api" long-name="Settings Framework API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_framework_api/group"/>
-</component>
-<component name="settings_launch_api" long-name="Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_launch_api/group"/>
-</component>
-<component name="settings_listbox_api" long-name="Settings List Box API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_listbox_api/group"/>
-</component>
-<component name="settings_plugin_api" long-name="Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_plugin_api/group"/>
-</component>
-<component name="settings_uis_cenrep_collection_api" long-name="Settings UIs CenRep Collection API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
-</component>
-</collection>
-<collection name="gssettingsuis" long-name="General Settings UIs" level="framework">
-<component name="gs" filter="s60" long-name="General Settings" introduced="9.2">
-<unit bldFile="mw/gsprofilesrv/gssettingsuis/gs/group"/>
-</component>
-</collection>
-<collection name="profilesservices" long-name="Profiles Services" level="server">
-<component name="filelist" filter="s60" long-name="File List" introduced="9.1">
-<unit bldFile="mw/gsprofilesrv/profilesservices/filelist/group"/>
-</component>
-<component name="mediafilelist" filter="s60" long-name="Media File List" introduced="^2">
-<unit bldFile="mw/gsprofilesrv/profilesservices/mediafilelist/group"/>
-</component>
-<component name="profileengine" filter="s60" long-name="Profile Engine" introduced="9.1">
-<unit bldFile="mw/gsprofilesrv/profilesservices/profileengine/group"/>
-</component>
-<component name="ringingtone3dplugin" filter="s60" long-name="Ringing Tone 3D Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/gsprofilesrv/profilesservices/ringingtone3dplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreensrv" level="specific" long-name="Home Screen Services" levels="plugin framework server generic specific">
-<collection name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" level="specific">
-<component name="ai_content_model_api" long-name="AI Content Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_content_model_api/group"/>
-</component>
-<component name="ai_utilities_api" long-name="AI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_utilities_api/group" filter="!test"/>
-</component>
-<component name="ai_plugin_management_api" long-name="AI Plug-in Management API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_management_api/group"/>
-</component>
-<component name="ai_plugin_information_api" long-name="AI Plug-in Information API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_information_api/group"/>
-</component>
-<component name="ai_variation_api" long-name="AI Variation API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_variation_api/group"/>
-</component>
-<component name="action_handler_plugin_api" long-name="Action Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/group" filter="!test"/>
-</component>
-<component name="content_harvester_plugin_api" long-name="Content Harvester Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/group" filter="!test"/>
-</component>
-<component name="menu_model_api" long-name="Menu Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_model_api/group"/>
-</component>
-<component name="menu_sat_interface_api" long-name="Menu SAT Interface API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/group" filter="!test"/>
-</component>
-<component name="external_home_screen_api" long-name="External Home Screen API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/external_home_screen_api/group"/>
-</component>
-<component name="menu_content_service_api" long-name="Menu Content Service API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_content_service_api/group" filter="!test"/>
-</component>
-<component name="sapi_contentpublishing" long-name="SAPI Content Publishing" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing/group"/>
-</component>
-<component name="sapi_backstepping" long-name="SAPI Backstepping" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_backstepping/group"/>
-</component>
-<component name="sapi_actionhandler" long-name="SAPI Action Handler" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_actionhandler/group"/>
-</component>
-<component name="sapi_homescreenplugin" long-name="SAPI Homescreen Plugin" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_homescreenplugin/group" filter="!test"/>
-</component>
-<component name="sapi_menucontent" long-name="SAPI Menu Content" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_menucontent/group"/>
-</component>
-<component name="xcfw_api" long-name="XCFW API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/xcfw_api/group"/>
-</component>
-<component name="idlefw_api" long-name="Idle Framework API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/idlefw_api/group"/>
-</component>
-<component name="hs_widget_publisher_api" long-name="Home Screen Publishing API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_widget_publisher_api/group"/>
-</component>
-<component name="hs_settings_api" long-name="HS Settings API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_settings_api/group"/>
-</component>
-<component name="hs_content_control_api" long-name="HS Content Control API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_content_control_api/group"/>
-</component>
-</collection>
-<collection name="xcfw" long-name="XML Content Framework" level="framework">
-<!-- collection is really a component, needs to be moved down a directory -->
-<component name="xcfw_build" filter="s60" long-name="XML Content Framework Build">
-<unit bldFile="mw/homescreensrv/xcfw/group"/>
-</component>
-</collection>
-<collection name="homescreenpluginsrv" long-name="Home Screen Plugin Service" level="plugin">
-<component name="hspsdefinitionengine" filter="s60" long-name="HS Plugin Service Definition Engine" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsdefinitionengine/group"/> -->
-</component>
-<component name="hspsdom" filter="s60" long-name="HS Plugin Service DOM" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsdom/group"/> -->
-</component>
-<component name="hspstools" filter="s60" long-name="HS Server Tools">
-<!-- <unit bldFile="homescreenpluginsrv/hspstools/group"/> -->
-</component>
-<component name="hspspluginregistry" filter="s60" long-name="HS Plugin Registry" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspspluginregistry/group"/>-->
-</component>
-<component name="hspsmanager" filter="s60" long-name="HSPS Manager" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsmanager/group"/>-->
-</component>
-<component name="hspsodt" filter="s60" long-name="HSPS Object Description Tree" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsodt/group"/>-->
-</component>
-<component name="hspsresource" filter="s60" long-name="HS Plugin Server Resource" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresource/group"/>-->
-</component>
-<component name="hspsresult" filter="s60" long-name="HS Plugin Server Result" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
-</component>
-<component name="homescreen_settings_api" filter="s60" long-name="HS Settings API" class="api placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
-</component>
-<component name="homescreenpluginsrv_build" filter="s60" long-name="HSPS Build">
-<!-- need to break this up into the self-contained components above and uncomment them -->
-<unit bldFile="mw/homescreensrv/homescreenpluginsrv/group"/>
-</component>
-</collection>
-<collection name="idlefw" long-name="Idle Framework" level="framework">
-<!-- Uncomment all units when configuration is in place. All currently #included from idlefw_build -->
-<component name="idlefw_plugins" filter="s60" long-name="Idle Framework Plugins" plugin="Y" class="placeholder">
-<!--<unit bldFile="idlefw/plugins/group"/>-->
-</component>
-<component name="hslaunch" filter="s60" long-name="Home Screen Launch" class="placeholder">
-<!--<unit bldFile="idlefw/plugins/group"/>-->
-</component>
-<component name="idlefw_build" filter="s60" long-name="Idle Framework Build">
-<!--split this into components, or separate from the above components and move this down a directory -->
-<unit bldFile="mw/homescreensrv/idlefw/group"/>
-</component>
-</collection>
-<collection name="menucontentsrv" long-name="Menu Content Service" level="generic">
-<component name="menusatinterface" filter="s60" long-name="Menu SAT Interface">
-<unit bldFile="mw/homescreensrv/menucontentsrv/menusatinterface/group"/>
-</component>
-<component name="menucontentsrv_build" filter="s60" long-name="Menu Content Service Build">
-<!--split this into components, or separate from the above component and move this down a directory -->
-<unit bldFile="mw/homescreensrv/menucontentsrv/group"/>
-</component>
-</collection>
-<collection name="backsteppingsrv" long-name="Back Stepping Service" level="server">
-<!-- collection is really a component, needs to be moved down a directory -->
-<component name="bsengine" long-name="Back Stepping Engine" filter="s60">
-<unit bldFile="mw/homescreensrv/backsteppingsrv/group"/>
-</component>
-</collection>
-<collection name="contentpublishingsrv" long-name="Content Publishing Service" level="server">
-<component name="contentpublishingdebug" filter="s60" long-name="Content Publishing Debug">
-<!-- need to move this component outside of contentpublishingutils and into separate component directory -->
-<!-- <unit bldFile="contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/> -->
-</component>
-<component name="contentpublishingutils" filter="s60" long-name="Content Publishing Utils">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingutils/group"/>
-</component>
-<component name="contentpublishingserver" filter="s60" long-name="Content Publishing Server">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingserver/group"/>
-</component>
-<component name="contentharvester" filter="s60" long-name="Content Harvester">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
-</component>
-<component name="contentpublishingsrv_build" filter="s60" long-name="Content Publishing Service Build">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/group"/>
-</component>
-</collection>
-<collection name="contentcontrolsrv" long-name="Content Control Service" level="server">
-<component name="ccsrv" long-name="Content Control Service" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccsrv/group"/>
-</component>
-<component name="ccsrvapi" long-name="Content Control Service API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccsrvapi/group"/>
-</component>
-<component name="ccclientsession" long-name="Content Control Client Session" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccclientsession/group"/>
-</component>
-<component name="hsccclient" long-name="HS Content Control Client" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/hsccclient/group"/>
-</component>
-<component name="hscontentinfo" long-name="Home Screen Content Info" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/hscontentinfo/group"/>
-</component>
-<component name="contentcontrolsrv_build" long-name="Content Control Service Build" filter="s60" introduced="^3">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/group"/>
-</component>
-</collection>
-</block>
-<block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
-<collection name="appinstall_plat" long-name="Application Installation Platform Interfaces" level="api">
-<component name="iaupdate_api" long-name="IA Update API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/iaupdate_api/group"/>
-</component>
-<component name="task_plugin_api" long-name="Task Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_plugin_api/group"/>
-</component>
-<component name="sw_installer_common_ui_api" long-name="SW Installer Common UI API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_common_ui_api/group"/>
-</component>
-<component name="sw_installer_launcher_api" long-name="SW Installer Launcher API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_launcher_api/group"/>
-</component>
-<component name="task_management_api" long-name="Task Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_management_api/group"/>
-</component>
-<component name="sw_installer_ui_plugin_api" long-name="SW Installer UI Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ui_plugin_api/group"/>
-</component>
-<component name="sw_installer_cr_keys" long-name="SW Installer CR Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_cr_keys/group"/>
-</component>
-<component name="sw_installer_ps_keys" long-name="SW Installer PS Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
-</component>
-<component name="appmngr2runtimeapi" long-name="Application Manager 2 Runtime Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
-</component>
-</collection>
-<collection name="appinstall_pub" long-name="Application Installation Public Interfaces" level="api">
-<component name="startup_list_management_api" long-name="Startup List Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
-</component>
-</collection>
-<collection name="ncdengine" long-name="Nokia Content Discover" level="framework">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="ncdengine_engine" filter="s60" long-name="NCD Engine" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/engine/group"/>
-</component>
-<component name="debuglogger" filter="s60" long-name="NCD Debug Logger" introduced="^1" class="placeholder">
-<!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
-</component>
-<component name="ncdengine_build" filter="s60" long-name="NCD Build" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/group"/>
-</component>
-</collection>
-<collection name="appinstaller" long-name="Application Installer" level="generic">
-<component name="appmngr2" filter="s60" long-name="Application Manager 2" introduced="^2">
-<unit bldFile="mw/appinstall/appinstaller/appmngr2/group"/>
-</component>
-<component name="appinstui" filter="s60" long-name="Application Installer UI" introduced="^2">
-<unit bldFile="mw/appinstall/appinstaller/appinstui/group"/>
-</component>
-</collection>
-<collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="api">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="iaupdateapi_stub_build" long-name="IA Update API Stub Build" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdateapi_stub/group"/>
-</component>
-</collection>
-<collection name="iaupdate" long-name="Independent Apps Update" level="api">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="iad" long-name="Software Update" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/iad/group"/>
-</component>
-<component name="iaupdate_help" filter="s60" long-name="IA Update Help" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/help/group"/>
-</component>
-<component name="iaupdate_build" filter="s60" long-name="IA Update Build" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/group"/>
-</component>
-</collection>
-<collection name="installationservices" long-name="Installation Services" level="generic">
-<component name="swi" long-name="Secure Software Install" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swi/group" mrp="mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
-</component>
-<component name="swidevicetools" long-name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
-<unit bldFile="mw/appinstall/installationservices/swidevicetools/group" mrp="mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
-</component>
-<component name="swiconfig" long-name="Software Install Config" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appinstall/installationservices/swiconfig/group" mrp="mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
-</component>
-</collection>
-<collection name="secureswitools" long-name="Secure Software Install Tools" level="tool">
-<component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/makekeys/group" mrp="mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
-</component>
-<component name="swianalysistoolkit" long-name="SWI Analysis Toolkit" purpose="development" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
-</component>
-<component name="openssllib" long-name="OpenSSL Library" purpose="optional" class="PC">
-<unit mrp="mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
-</component>
-<component name="swisistools" long-name="Secure Software Install SIS Tools" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swisistools/group" mrp="mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
-</component>
-</collection>
-<collection name="appinstall_info" long-name="Application Installation Info" level="api">
-<component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="serviceapifw" level="specific" long-name="Service API Framework" levels="plugin framework server generic specific">
-<collection name="serviceapifw_pub" long-name="Service API Framework Public Interfaces" level="specific"/>
-<collection name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" level="specific">
-<component name="rtsecuritymanager_common_api" long-name="Runtime Security Manager Common API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/group"/>
-</component>
-<component name="rtsecuritymanager_utility_api" long-name="Runtime Security Manager Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
-</component>
-<component name="rtsecuritymanager_client_api" long-name="Runtime Security Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/group"/>
-</component>
-<component name="liw_provider_utility_api" long-name="LIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_provider_utility_api/group"/>
-</component>
-<component name="liw_service_interface_base_api" long-name="LIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_base_api/group"/>
-</component>
-<component name="liw_service_interface_menu_api" long-name="LIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_menu_api/group"/>
-</component>
-<component name="liw_criteria_api" long-name="LIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_criteria_api/group"/>
-</component>
-<component name="liw_generic_parameter_api" long-name="LIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_generic_parameter_api/group"/>
-</component>
-<component name="liw_service_handler_api" long-name="LIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_handler_api/group"/>
-</component>
-</collection>
-<collection name="rtsecuritymanager" long-name="Runtime Security Manager" level="server">
-<component name="rtsecuritymanagerutil" filter="s60" long-name="Runtime Security Manager Util">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
-</component>
-<component name="rtsecuritymanagerserver" filter="s60" long-name="Runtime Security Manager Server">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/>
-</component>
-<component name="rtsecuritymanagerclient" filter="s60" long-name="Runtime Security Manager Client">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/>
-</component>
-<component name="rtsecuritymanager_build" filter="s60" long-name="Runtime Security Manager Build">
-<!-- Move the export to the appropriate components, or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/group"/>
-</component>
-</collection>
-<collection name="languageinterworkingfw" long-name="Language Interworking Framework" level="framework">
-<component name="lifwservicehandler" filter="s60" long-name="Service Handler">
-<unit bldFile="mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-</block>
-<block name="serviceapi" level="specific" long-name="Service API" levels="os mw1 mw2 app">
-<!-- should break up this collection into something meaningful -->
-<collection name="serviceproviders" long-name="Service Providers" level="mw1">
-<component name="sapi_contacts_vpbk" long-name="Contacts Phonebook SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
-</component>
-<component name="sapi_location" long-name="Location SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_location/group"/>
-</component>
-<component name="sapi_mediamanagement" long-name="Media Management SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/group"/>
-</component>
-<component name="sapi_landmarks" long-name="Landmarks SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
-</component>
-<component name="sapi_messaging" long-name="Messaging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/group"/>
-</component>
-<component name="sapi_applicationmanager" long-name="Application Manager SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
-</component>
-<component name="sapi_calendar" long-name="Calendar SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_calendar/group"/>
-</component>
-<component name="sapi_logging" long-name="Logging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_logging/group"/>
-</component>
-<component name="sapi_sensor" long-name="Sensor SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sensor/group"/>
-</component>
-<component name="sapi_sysinfo" long-name="Sysinfo SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sysinfo/group"/>
-</component>
-<component name="sapi_serviceregistry" long-name="Service Registry SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
-</component>
-<component name="jsapi" long-name="Javascript API" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/jsapi/group"/>
-</component>
-<component name="serviceproviders_build" filter="s60" long-name="Service API Build">
-<!-- distribute the exports or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapi/serviceproviders/group"/>
-</component>
-</collection>
-</block>
-<block name="web" level="specific" long-name="Web" levels="plugin utils server generic specific">
-<collection name="web_pub" long-name="Web Public Interfaces" level="specific">
-<component name="browser_control_api" long-name="Browser Control API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_control_api/group"/>
-</component>
-<component name="download_mgr_client_api" long-name="Download Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_client_api/group"/>
-</component>
-<component name="download_mgr_ui_api" long-name="Download Manager UI Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_ui_api/group"/>
-</component>
-<component name="favourites_engine_api" long-name="Favourites Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/favourites_engine_api/group"/>
-</component>
-<component name="browser_plugin_api" long-name="Browser Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_plugin_api/group"/>
-</component>
-<component name="settings_api" long-name="Settings API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/settings_api/group"/>
-</component>
-</collection>
-<collection name="web_plat" long-name="Web Platform Interfaces" level="specific">
-<component name="aiw_browser_provider_api" long-name="AIW Browser Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/aiw_browser_provider_api/group"/>
-</component>
-<component name="browser_dialogs_provider_api" long-name="Browser Dialogs Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_dialogs_provider_api/group"/>
-</component>
-<component name="browser_platform_api" long-name="Browser Platform API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_platform_api/group"/>
-</component>
-<component name="cod_handler_api" long-name="COD Handler API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cod_handler_api/group"/>
-</component>
-<component name="connection_manager_api" long-name="Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/connection_manager_api/group"/>
-</component>
-<component name="cxml_library_api" long-name="cXml Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cxml_library_api/group"/>
-</component>
-<component name="download_mgr_client_api_extn" long-name="Download Manager Client API Extension" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/download_mgr_client_api_extn/group"/>
-</component>
-<component name="download_path_plugin_api" long-name="Download Path Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/download_path_plugin_api/group"/>
-</component>
-<component name="feeds_engine_api" long-name="Feeds Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/feeds_engine_api/group"/>
-</component>
-<component name="launcher_api" long-name="Launcher API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/launcher_api/group"/>
-</component>
-<component name="multipart_parser_api" long-name="Multipart Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/multipart_parser_api/group"/>
-</component>
-<component name="recent_url_store_api" long-name="Recent URL Store API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/recent_url_store_api/group"/>
-</component>
-<component name="scheme_handler_plugin_api" long-name="Scheme Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scheme_handler_plugin_api/group"/>
-</component>
-<component name="scriptable_plugin_api" long-name="Scriptable Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scriptable_plugin_api/group"/>
-</component>
-<component name="webutils_api" long-name="Web Utils API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/webutils_api/group"/>
-</component>
-<component name="widget_registry_api" long-name="Widget Registry API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/widget_registry_api/group"/>
-</component>
-<component name="xml_parser_api" long-name="XML Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/xml_parser_api/group"/>
-</component>
-<component name="stmgesturefw_api" long-name="State Machine Gesture Framework API " filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/stmgesturefw_api/group"/>
-</component>
-</collection>
-<collection name="web_info" long-name="Web Info" level="specific">
-<component name="web_build" filter="s60" long-name="Web Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/group"/>
-</component>
-</collection>
-<collection name="browserutilities" long-name="Browser Utilities" level="utils">
-<component name="browserdialogsprovider" filter="s60" long-name="Browser Dialogs Provider">
-<unit bldFile="mw/web/browserutilities/browserdialogsprovider/group"/>
-</component>
-<component name="recenturlstore" filter="s60" long-name="Recent URL Store">
-<unit bldFile="mw/web/browserutilities/recenturlstore/group"/>
-</component>
-<component name="xmlparser" filter="s60" long-name="XML Interface">
-<unit bldFile="mw/web/browserutilities/xmlparser/group"/>
-</component>
-<component name="cxmllibrary" filter="s60" long-name="XML Parser Implementation">
-<unit bldFile="mw/web/browserutilities/cxmllibrary/group"/>
-</component>
-<component name="downloadmgr" filter="s60" long-name="Download Manager">
-<unit bldFile="mw/web/browserutilities/downloadmgr/group"/>
-</component>
-<component name="connectionmanager" filter="s60" long-name="Connection Manager">
-<unit bldFile="mw/web/browserutilities/connectionmanager/group"/>
-</component>
-<component name="browsertelservice" filter="s60" long-name="Browser Telephony Service">
-<unit bldFile="mw/web/browserutilities/browsertelservice/group"/>
-</component>
-<component name="favouritesengine" filter="s60" long-name="Favourites Engine">
-<unit bldFile="mw/web/browserutilities/favouritesengine/group"/>
-</component>
-<component name="feedsengine" filter="s60" long-name="Feeds Engine">
-<unit bldFile="mw/web/browserutilities/feedsengine/group"/>
-</component>
-<component name="multipartparser" filter="s60" long-name="Multipart Parser">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
-<!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
-</component>
-<component name="schemehandler" filter="s60" long-name="Scheme Handler">
-<unit bldFile="mw/web/browserutilities/schemehandler/group"/>
-</component>
-<component name="webutils" filter="s60" long-name="Web Utils">
-<unit bldFile="mw/web/browserutilities/webutils/group"/>
-</component>
-<component name="aiwbrowserprovider" filter="s60" long-name="AIW Browser Provider" plugin="Y">
-<unit bldFile="mw/web/browserutilities/aiwbrowserprovider/group"/>
-</component>
-<component name="browserutilities_build" filter="s60" long-name="Browser Utilities Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/browserutilities/group"/>
-</component>
-</collection>
-<collection name="webengine" long-name="Web Engine" level="server">
-<component name="osswebengine" filter="s60" long-name="OSS Web Engine">
-<!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
-<unit bldFile="mw/web/webengine/osswebengine/cache/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/memorymanager/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/npscript/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group/javascriptcore"/>
-</component>
-<component name="webkitutils" filter="s60" long-name="WebKit Utils">
-<unit bldFile="mw/web/webengine/webkitutils/group"/>
-</component>
-<component name="pagescaler" filter="s60" long-name="Page Scaler">
-<unit bldFile="mw/web/webengine/pagescaler/group"/>
-</component>
-<component name="webwidgetinstaller" filter="s60" long-name="Widget Installer">
-<unit bldFile="mw/web/webengine/widgetinstaller/group"/>
-</component>
-<component name="widgetregistry" filter="s60" long-name="Widget Registry">
-<unit bldFile="mw/web/webengine/widgetregistry/group"/>
-</component>
-<component name="wmlengine" filter="s60" long-name="WML Engine">
-<unit bldFile="mw/web/webengine/wmlengine/group"/>
-</component>
-<component name="device" filter="s60" long-name="Device">
-<!-- this needs a more meaningful name -->
-<unit bldFile="mw/web/webengine/device/group"/>
-</component>
-<component name="widgetengine" filter="s60" long-name="Widget Engine">
-<unit bldFile="mw/web/webengine/widgetengine/group"/>
-</component>
-<component name="web_memoryplugin" long-name="Memory Plugin" filter="s60" plugin="Y">
-<unit bldFile="mw/web/webengine/memoryplugin/group"/>
-</component>
-<component name="widgetmemoryplugin" filter="s60" long-name="Widget Memory Plugin" plugin="Y">
-<unit bldFile="mw/web/webengine/widgetmemoryplugin/group"/>
-</component>
-<component name="widgetbackuprestore" filter="s60" long-name="Widget Backup and Restore">
-<unit bldFile="mw/web/webengine/widgetbackuprestore/group"/>
-</component>
-<component name="browserrecognizers" filter="s60" long-name="Browser Recognizers" plugin="Y">
-<unit bldFile="mw/web/webengine/browserrecognizers/group"/>
-</component>
-<component name="wrtharvester" filter="s60" long-name="Web Runtime Harvester" plugin="Y">
-<unit bldFile="mw/web/webengine/wrtharvester/group"/>
-</component>
-</collection>
-<collection name="codhandler" long-name="Content Object Descriptor Handler" level="specific">
-<component name="codeng" filter="s60" long-name="COD Engine">
-<unit bldFile="mw/web/codhandler/codeng/group"/>
-</component>
-<component name="codui" filter="s60" long-name="COD UI">
-<unit bldFile="mw/web/codhandler/codui/group"/>
-</component>
-<component name="codrecog" filter="s60" long-name="COD Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/codrecog/group"/>
-</component>
-<component name="codviewer" filter="s60" long-name="COD Viewer">
-<unit bldFile="mw/web/codhandler/codviewer/group"/>
-</component>
-<component name="ddrecog" filter="s60" long-name="Download Descriptor Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/ddrecog/group"/>
-</component>
-<component name="ddviewer" filter="s60" long-name="Download Descriptor Viewer">
-<unit bldFile="mw/web/codhandler/ddviewer/group"/>
-</component>
-<component name="coddownload" filter="s60" long-name="COD Download">
-<unit bldFile="mw/web/codhandler/coddownload/group"/>
-</component>
-<component name="roapapp" filter="s60" long-name="ROAP Application">
-<unit bldFile="mw/web/codhandler/roapapp/group"/>
-</component>
-<component name="codhandler_build" filter="s60" long-name="COD Handler Build">
-<!-- Exports need to go into another component or make this self-contained.
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/codhandler/group"/>
-</component>
-</collection>
-<collection name="widgets" long-name="Web Widget Framework" level="generic">
-<!-- the following units can be uncommented when configuration is put in place -->
-<component name="widgetrecognizer" filter="s60" long-name="Widget Recognizer" plugin="Y">
-<!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
-</component>
-<component name="widgetinstaller" filter="s60" long-name="Widget Installer UI" plugin="Y">
-<!--<unit bldFile="widgets/widgetinstaller/group"/>-->
-</component>
-<component name="widgetlauncher" filter="s60" long-name="Widget Launcher">
-<!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
-</component>
-<component name="widgetapp" filter="s60" long-name="Widget UI">
-<!--<unit bldFile="widgets/widgetapp/group"/>-->
-</component>
-<component name="widgetsidchecker" filter="s60" long-name="Widget SID Checker" introduced="^3">
-<!--<unit bldFile="widgets/widgetsidchecker/group"/>-->
-</component>
-<component name="widgetpreinstaller" filter="s60" long-name="Widget Pre-Installer">
-<!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
-</component>
-<component name="widgetstartup" filter="s60" long-name="Widget Startup">
-<!--<unit bldFile="widgets/widgetstartup/group"/>-->
-</component>
-<component name="widgets_build" filter="s60" long-name="Widgets Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/widgets/group"/>
-</component>
-</collection>
-</block>
-<block name="websrv" level="generic" long-name="Web Services" levels="plugin framework server generic specific">
-<collection name="websrv_pub" long-name="Web Services Public Interfaces" level="specific">
-<component name="web_service_description_api" long-name="Web Service Description API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_description_api/group"/>
-</component>
-<component name="web_service_connection_api" long-name="Web Service Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/group"/>
-</component>
-<component name="web_service_manager_api" long-name="Web Service Manager API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/group"/>
-</component>
-<component name="hostlet_connection_api" long-name="Hostlet Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/group"/>
-</component>
-<component name="web_service_messaging_api" long-name="Web Service Messaging API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/group"/>
-</component>
-<component name="xml_extensions_api" long-name="XML Extensions API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/group"/>
-</component>
-<component name="xml_fragment_api" long-name="XML Fragment API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/group"/>
-</component>
-</collection>
-<collection name="webservices" long-name="Web Services Framework" level="generic">
-<!-- consider breaking this collection into more meaningful subsets -->
-<component name="wsnotifierplugins" filter="s60" long-name="WS Notifier Plugins" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsnotifierplugins/group"/>
-</component>
-<component name="wslogger" filter="s60" long-name="WS Logger">
-<unit bldFile="mw/websrv/webservices/wslogger/group"/>
-</component>
-<component name="wsxml" filter="s60" long-name="WS XML Extensions">
-<unit bldFile="mw/websrv/webservices/wsxml/group"/>
-</component>
-<component name="wsutils" filter="s60" long-name="WS Utils">
-<unit bldFile="mw/websrv/webservices/wsutils/group"/>
-</component>
-<component name="wsfragment" filter="s60" long-name="WS Fragment">
-<unit bldFile="mw/websrv/webservices/wsfragment/group"/>
-</component>
-<component name="wsdescription" filter="s60" long-name="WS Service Description">
-<unit bldFile="mw/websrv/webservices/wsdescription/group"/>
-</component>
-<component name="wsconnection" filter="s60" long-name="WS Service Connection">
-<unit bldFile="mw/websrv/webservices/wsconnection/group"/>
-</component>
-<component name="wsmessages" filter="s60" long-name="WS Messages">
-<unit bldFile="mw/websrv/webservices/wsmessages/group"/>
-</component>
-<component name="wscredentialmanager" filter="s60" long-name="WS Credential Manager">
-<unit bldFile="mw/websrv/webservices/wscredentialmanager/group"/>
-</component>
-<component name="wsframework" filter="s60" long-name="WS Framework">
-<unit bldFile="mw/websrv/webservices/wsframework/group"/>
-</component>
-<component name="wshttpchanneltransportplugin" filter="s60" long-name="WS HTTP Channel Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshttpchanneltransportplugin/group"/>
-</component>
-<component name="wsconnectionagent" filter="s60" long-name="WS Connection Agent">
-<unit bldFile="mw/websrv/webservices/wsconnectionagent/group"/>
-</component>
-<component name="wsprovider" filter="s60" long-name="WS Provider">
-<unit bldFile="mw/websrv/webservices/wsprovider/group"/>
-</component>
-<component name="wshostletconnection" filter="s60" long-name="WS Hostlet Connection">
-<unit bldFile="mw/websrv/webservices/wshostletconnection/group"/>
-</component>
-<component name="wsmanager" filter="s60" long-name="WS Service Manager">
-<unit bldFile="mw/websrv/webservices/wsmanager/group"/>
-</component>
-<component name="wsidentitymanager" filter="s60" long-name="WS Identity Manager">
-<unit bldFile="mw/websrv/webservices/wsidentitymanager/group"/>
-</component>
-<component name="idwsfplugin" filter="s60" long-name="ID-WSF Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/idwsfplugin/group"/>
-</component>
-<component name="wsibasicplugin" filter="s60" long-name="WS-I Basic Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsibasicplugin/group"/>
-</component>
-<component name="wsrestplugin" filter="s60" long-name="WS REST Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsrestplugin/group"/>
-</component>
-<component name="idwsfsecuritymechanism" filter="s60" long-name="ID-WSF Security Mechanism">
-<unit bldFile="mw/websrv/webservices/idwsfsecuritymechanism/group"/>
-</component>
-<component name="wspasswordtransforms" filter="s60" long-name="WS Password Transforms">
-<unit bldFile="mw/websrv/webservices/wspasswordtransforms/group"/>
-</component>
-<component name="wscore" filter="s60" long-name="WS Core Service Manager">
-<unit bldFile="mw/websrv/webservices/wscore/group"/>
-</component>
-<component name="wslocaltransportplugin" filter="s60" long-name="WS Local Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wslocaltransportplugin/group"/>
-</component>
-<component name="wshostlettransportplugin" filter="s60" long-name="WS Hostlet Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshostlettransportplugin/group"/>
-</component>
-<component name="wsstar" filter="s60" long-name="WS Star">
-<!-- can only have one unit. Need to split into separate components or #include from a single bld.inf -->
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarpolicy/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarplugin/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarmessagehandlers/group"/>
-</component>
-<component name="wsoviplugin" filter="s60" long-name="WS Ovi Plugin">
-<unit bldFile="mw/websrv/webservices/wsoviplugin/group"/>
-</component>
-<component name="webservices_build" filter="s60" long-name="Web Services Build">
-<!-- need to split into self-contained components -->
-<unit bldFile="mw/websrv/webservices/group"/>
-</component>
-</collection>
-<collection name="websrv_info" long-name="Web Services Info" level="specific">
-<component name="websrv_bld" filter="s60" long-name="Web Services Build">
-<!-- need to include common .hrh in each unit -->
-<unit bldFile="mw/websrv/group"/>
-</component>
-</collection>
-</block>
-<block name="platformtools" level="generic" long-name="Platform Tools">
-<collection name="gfxconversion" long-name="Graphics Conversion">
-<component name="bmconv_s60" filter="s60" long-name="S60 Bitmap Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/bmconv_s60/group"/>
-</component>
-<component name="mifconv" filter="s60" long-name="Multi Icon File Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/mifconv/group"/>
-</component>
-</collection>
-</block>
-<block name="uitools" level="specific" long-name="UI Tools" levels="compile encode tool if">
-<collection name="uitools_pub" long-name="UI Tools Public Interfaces" level="if">
-<component name="third_party_bitmap_palette_api" long-name="Third Party Bitmap Palette API" filter="s60" class="api">
-<unit bldFile="mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
-</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">
-<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">
-<unit bldFile="mw/uitools/uitools_plat/layout_system_private_api/group"/>
-</component>
-</collection>
-<collection name="cdlcompilertoolkit" long-name="CDL Compiler Toolkit" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompilertoolkit_build" filter="s60" long-name="CDL Compiler Toolkit Build">
-<unit bldFile="mw/uitools/cdlcompilertoolkit/group"/>
-</component>
-</collection>
-<collection name="cdlcompiler" long-name="CDL Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompiler_build" filter="s60" long-name="CDL Compiler Build">
-<unit bldFile="mw/uitools/cdlcompiler/group"/>
-</component>
-</collection>
-<collection name="gfxtools" long-name="Graphics Tools" level="tool">
-<component name="gditools" filter="s60" long-name="GDI Tools" class="PC">
-<unit bldFile="mw/uitools/gfxtools/gditools/group"/>
-</component>
-<component name="color" filter="s60" long-name="Bitmap Colour Palette" class="PC">
-<unit bldFile="mw/uitools/gfxtools/color/group"/>
-</component>
-</collection>
-<collection name="aknlayoutcompiler" long-name="Avkon Layout Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="aknlayoutcompiler_build" filter="s60" long-name="Avkon Layout Compiler Build">
-<unit bldFile="mw/uitools/aknlayoutcompiler/group"/>
-</component>
-</collection>
-<collection name="skincompiler" long-name="Skin Compiler" level="compile">
-<component name="aknskindesccompiler" filter="s60" long-name="Avkon Skin Descriptor Compiler">
-<unit bldFile="mw/uitools/skincompiler/AknSkinDescCompiler/group"/>
-</component>
-</collection>
-<collection name="reszip" long-name="Resource Zip" level="encode">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="reszip_build" filter="s60" long-name="Resource Zip Build">
-<unit bldFile="mw/uitools/reszip/group"/>
-</component>
-</collection>
-<collection name="toollibraries" long-name="Tool Libraries" level="tool"/>
-<collection name="svgtencoder" long-name="SVGT Encoder" level="encode">
-<component name="svgtenc" filter="s60" long-name="Standalone SVGT Encoder" class="PC">
-<unit bldFile="mw/uitools/svgtencoder/svgtenc/standalone/group"/>
-</component>
-</collection>
-</block>
-</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">
-<component name="location_centre_api" long-name="Location Centre API" introduced="^3" filter="s60" class="api">
-<unit bldFile="app/location/loc_plat/location_centre_api/group"/>
-</component>
-</collection>
-<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"/>
-</component>
-<component name="landmarks_ui_addedit_api" long-name="Landmarks UI Add/Edit API" filter="s60" class="api">
-<unit bldFile="app/location/loc_pub/landmarks_ui_addedit_api/group"/>
-</component>
-</collection>
-<collection name="basiclocationinfodisplay" long-name="Basic Location Info Display" level="ui">
-<component name="blid" filter="s60" long-name="Basic Location Info Display Build">
-<unit bldFile="app/location/basiclocationinfodisplay/blid/group"/>
-</component>
-</collection>
-<collection name="landmarksui" long-name="Landmarks UI" level="loc">
-<component name="landmarksui_help" filter="s60" long-name="Landmarks UI Help">
-<unit bldFile="app/location/landmarksui/help/group"/>
-</component>
-<component name="landmarksui_engine" filter="s60" long-name="Landmarks UI Engine">
-<unit bldFile="app/location/landmarksui/engine/group"/>
-</component>
-<component name="uicontrols" filter="s60" long-name="Landmarks UI Controls">
-<unit bldFile="app/location/landmarksui/uicontrols/group"/>
-</component>
-<component name="landmarksui_commonui" filter="s60" long-name="Landmarks Common UI">
-<unit bldFile="app/location/landmarksui/commonui/group"/>
-</component>
-<component name="landmarksui_app" filter="s60" long-name="Landmarks Application">
-<unit bldFile="app/location/landmarksui/app/group"/>
-</component>
-<component name="msgviewer" filter="s60" long-name="Landmarks Message Viewer">
-<unit bldFile="app/location/landmarksui/msgviewer/group"/>
-</component>
-<component name="landmarksui_build" filter="s60" long-name="Landmarks UI Build">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="app/location/landmarksui/group"/>
-</component>
-</collection>
-<collection name="eventsui" long-name="Location Events UI" level="events">
-<component name="eventsui_help" filter="s60" long-name="Events Help">
-<unit bldFile="app/location/eventsui/help/group"/>
-</component>
-<component name="eventsutils" filter="s60" long-name="Events Utils">
-<unit bldFile="app/location/eventsui/eventsutils/group"/>
-</component>
-<component name="eventsengine" filter="s60" long-name="Events Engine">
-<unit bldFile="app/location/eventsui/eventsengine/group"/>
-</component>
-<component name="eventshandlerui" filter="s60" long-name="Events Handler UI">
-<unit bldFile="app/location/eventsui/eventshandlerui/group"/>
-</component>
-<component name="eventseditor" filter="s60" long-name="Events Editor">
-<unit bldFile="app/location/eventsui/eventseditor/group"/>
-</component>
-<component name="eventsmgmtui" filter="s60" long-name="Events Management UI">
-<unit bldFile="app/location/eventsui/eventsmgmtui/group"/>
-</component>
-<component name="eventsui_build" filter="s60" long-name="Events UI Build">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="app/location/eventsui/group"/>
-</component>
-</collection>
-<collection name="locationlandmarksrefappfors60" long-name="Location Landmarks Reference App for S60" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="lmrefapp" filter="s60" long-name="Landmarks Reference Application">
-<unit bldFile="app/location/locationlandmarksrefappfors60/group"/>
-</component>
-</collection>
-<collection name="locationlandmarksuirefapp" long-name="Location Landmarks UI Reference App" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="lmuirefapp" filter="s60" long-name="Landmarks UI Reference Application">
-<unit bldFile="app/location/locationlandmarksuirefapp/group"/>
-</component>
-</collection>
-<collection name="locationsatviewrefapp" long-name="Location Satellite View Reference App" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="satellitereference" filter="s60" long-name="Satellite Info UI Reference Application">
-<unit bldFile="app/location/locationsatviewrefapp/group"/>
-</component>
-</collection>
-<collection name="simpsyconfigurator" long-name="Simulation PSY Configurator" level="ui">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="simpsyui" filter="s60" long-name="Simulation PSY UI">
-<unit bldFile="app/location/simpsyconfigurator/group"/>
-</component>
-</collection>
-<collection name="mapnavproviderrefapp" long-name="Map and Navigation Provider Reference App" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="mapnavproviderrefapp_build" filter="s60" long-name="Map and Navigation Provider Reference Application">
-<unit bldFile="app/location/mapnavproviderrefapp/group"/>
-</component>
-</collection>
-<collection name="locationcentre" long-name="Location Centre" level="loc">
-<component name="lcutils" long-name="Location Centre Utilities" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcutils/group"/>
-</component>
-<component name="lcservice" long-name="Location Centre Service Project" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcservice/group"/>
-</component>
-<component name="lcserver" long-name="Location Centre Server Project" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcserver/group"/>
-</component>
-<component name="lcapp" long-name="Location Centre Application" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcapp/group"/>
-</component>
-<component name="locationcentre_build" filter="s60" long-name="Location Centre Build" introduced="^3">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="app/location/locationcentre/group"/>
-</component>
-</collection>
-</block>
-<block name="mmsharinguis" level="services" long-name="Multimedia Sharing UIs" levels="base plugin if">
-<collection name="mmsharinguis_plat" long-name="Multimedia Sharing UIs Platform Interfaces" level="if">
-<component name="multimedia_sharing_settings_api" long-name="Multimedia Sharing Settings API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_settings_api/group"/>
-</component>
-<component name="multimedia_sharing_resource_api" long-name="Multimedia Sharing Resource API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_resource_api/group"/>
-</component>
-<component name="multimedia_sharing_manager_api" long-name="Multimedia Sharing Manager API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/group"/>
-</component>
-</collection>
-<collection name="mmsharing" long-name="Multimedia Sharing" level="base">
-<component name="mmshavailability" filter="s60" long-name="Multimedia Sharing Availability">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshavailability/group"/>
-</component>
-<component name="mmshindicator" filter="s60" long-name="Multimedia Sharing Indicator">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshindicator/group"/>
-</component>
-<!-- consider putting client and server in the same component -->
-<component name="mmshmanagercli" filter="s60" long-name="Multimedia Sharing Manager Client">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshmanagercli/group" filter="!test"/>
-</component>
-<component name="mmshmanagersrv" filter="s60" long-name="Multimedia Sharing Manager Server">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshmanagersrv/group"/>
-</component>
-<component name="mmshengine" filter="s60" long-name="Multimedia Sharing Engine">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshengine/group"/>
-</component>
-<component name="mmshui" filter="s60" long-name="Multimedia Sharing UI">
-<!-- can only have one unit: need to #include one from the other if it's needed -->
-<unit bldFile="app/mmsharinguis/mmsharing/mmshui/group"/>
-<unit bldFile="app/mmsharinguis/mmsharing/mmshui/help/group"/>
-</component>
-<component name="mmsharing_build" filter="s60" long-name="MM Sharing Build">
-<unit bldFile="app/mmsharinguis/mmsharing/group"/>
-</component>
-</collection>
-<collection name="mmshplugins" long-name="Multimedia Sharing Plugins" level="plugin">
-<component name="mmshaoplugin" filter="s60" long-name="Multimedia Sharing Always Online Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshaoplugin/group"/>
-</component>
-<component name="mmshaiwplugin" filter="s60" long-name="Multimedia Sharing AIW Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshaiwplugin/group"/>
-</component>
-<component name="mmshsipcrplugin" filter="s60" long-name="Multimedia Sharing SIP Client Resolver Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshsipcrplugin/group"/>
-</component>
-<component name="mmshsettingsuiplugin" filter="s60" long-name="Multimedia Sharing Settings UI Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshsettingsuiplugin/group"/>
-</component>
-<component name="mmshwpadapterplugin" filter="s60" long-name="Multimedia Sharing WAP Provisioning Adapter" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshwpadapterplugin/group"/>
-</component>
-</collection>
-<collection name="mmsharinguis_info" long-name="Multimedia Sharing UIs Info" level="if">
-<component name="mmsharinguis_build" filter="s60" long-name="Multimedia Sharing UIs Build">
-<!-- consider distributing to other components -->
-<unit bldFile="app/mmsharinguis/group"/>
-</component>
-</collection>
-</block>
-<block name="phone" level="apps" span="2" long-name="Phone Apps" levels="engine plugin ui app">
-<collection name="phone_plat" long-name="Phone Apps Platform Interfaces" level="app">
-<component name="3d_ringing_tone_enabler_api" long-name="3D Ringing Tone Enabler API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
-</component>
-<component name="telephony_comms_information_api" long-name="Telephony Comms Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_comms_information_api/group"/>
-</component>
-<component name="telephony_information_api" long-name="Telephony Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_information_api/group"/>
-</component>
-<component name="telephony_device_mode_api" long-name="Telephony Device Mode API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_device_mode_api/group"/>
-</component>
-<component name="telephony_remote_party_information_api" long-name="Telephony Remote Party Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_remote_party_information_api/group"/>
-</component>
-<component name="telephony_video_mailbox_settings_api" long-name="Telephony Video Mailbox Settings API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_video_mailbox_settings_api/group"/>
-</component>
-<component name="telephony_configuration_api" long-name="Telephony Configuration API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_configuration_api/group"/>
-</component>
-<component name="telephony_microphone_mute_status_api" long-name="Telephony Microphone Mute Status API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_microphone_mute_status_api/group"/>
-</component>
-<component name="dialer_keypad_api" long-name="Dialer Keypad API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/dialer_keypad_api/group"/>
-</component>
-<component name="telephony_logging_extension_api" long-name="Telephony Logging Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_logging_extension_api/group"/>
-</component>
-<component name="telephony_matching_extension_api" long-name="Telephony Matching Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_matching_extension_api/group"/>
-</component>
-<component name="telephony_bubble_extension_api" long-name="Telephony Bubble Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_bubble_extension_api/group"/>
-</component>
-<component name="telephony_menu_extension_api" long-name="Telephony Menu Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_menu_extension_api/group"/>
-</component>
-<component name="phone_application_commands_api" long-name="Phone Application Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_commands_api/group"/>
-</component>
-<component name="phone_application_voip_commands_api" long-name="Phone Application VOIP Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_voip_commands_api/group"/>
-</component>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_mediator_api/group"/>
-</component>
-<component name="video_telephony_mediator_api" long-name="Video Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/video_telephony_mediator_api/group"/>
-</component>
-</collection>
-<collection name="phoneapp" long-name="Phone Application" level="app">
-<component name="blacklist" filter="s60" long-name="Phone Blacklist Clearing" plugin="Y">
-<unit bldFile="app/phone/phoneapp/blacklist/group"/>
-</component>
-<component name="phoneui" filter="s60" long-name="Phone UI">
-<unit bldFile="app/phone/phoneapp/phoneui/group" filter="!test"/>
-</component>
-<component name="phoneuicontrol" filter="s60" long-name="Phone UI Control">
-<unit bldFile="app/phone/phoneapp/phoneuicontrol/group"/>
-</component>
-<component name="phoneuistates" filter="s60" long-name="Phone UI States">
-<unit bldFile="app/phone/phoneapp/phoneuistates/group"/>
-</component>
-<component name="phoneuiutils" filter="s60" long-name="Phone UI Utils">
-<unit bldFile="app/phone/phoneapp/phoneuiutils/group"/>
-</component>
-<component name="phoneuiview" filter="s60" long-name="Phone UI View">
-<unit bldFile="app/phone/phoneapp/phoneuiview/group"/>
-</component>
-<component name="phoneuivoipextension" filter="s60" long-name="Phone UI VOIP Extension">
-<unit bldFile="app/phone/phoneapp/phoneuivoipextension/group"/>
-</component>
-<component name="silenceactionplugin" filter="s60" long-name="Silence Action Plugin" plugin="Y">
-<unit bldFile="app/phone/phoneapp/silenceactionplugin/group"/>
-</component>
-<component name="phonemediatorcenter" filter="s60" long-name="Phone Mediator Center">
-<unit bldFile="app/phone/phoneapp/phonemediatorcenter/group"/>
-</component>
-</collection>
-<collection name="phoneengine" long-name="Phone Engine" level="engine">
-<component name="phonecntfinder" filter="s60" long-name="Phone Contact Finder">
-<unit bldFile="app/phone/phoneengine/phonecntfinder/group"/>
-</component>
-<component name="audiohandling" filter="s60" long-name="Phone Audio Handling">
-<unit bldFile="app/phone/phoneengine/audiohandling/group"/>
-</component>
-<component name="callhandling" filter="s60" long-name="Call Handling">
-<unit bldFile="app/phone/phoneengine/callhandling/group"/>
-</component>
-<component name="contacthandling" filter="s60" long-name="Phone Contact Handling">
-<unit bldFile="app/phone/phoneengine/contacthandling/group"/>
-</component>
-<component name="loghandling" filter="s60" long-name="Phone Log Handling">
-<unit bldFile="app/phone/phoneengine/loghandling/group"/>
-</component>
-<component name="engineinfo" filter="s60" long-name="Phone Engine Info">
-<unit bldFile="app/phone/phoneengine/engineinfo/group"/>
-</component>
-<component name="phonemodel" filter="s60" long-name="Phone Model">
-<unit bldFile="app/phone/phoneengine/phonemodel/group"/>
-</component>
-<component name="servicehandling" filter="s60" long-name="Phone Service Handling">
-<unit bldFile="app/phone/phoneengine/servicehandling/group"/>
-</component>
-</collection>
-<collection name="phonesettings" long-name="Phone Settings" level="plugin">
-<component name="aiwcallimageplugin" filter="s60" long-name="Call Image AIW Plugin" plugin="Y">
-<unit bldFile="app/phone/phonesettings/aiwcallimageplugin/group"/>
-</component>
-<component name="pslncallimageplugin" filter="s60" long-name="Call Image Personalization Plugin" plugin="Y">
-<unit bldFile="app/phone/phonesettings/pslncallimageplugin/group"/>
-</component>
-</collection>
-<collection name="phoneuis" long-name="Phone UIs" level="ui">
-<component name="dialer" filter="s60" long-name="Dialer">
-<unit bldFile="app/phone/phoneuis/dialer/group" filter="!test"/>
-</component>
-<component name="easydialing" filter="s60" long-name="Easy Dialing Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/phone/phoneuis/easydialing/group"/>
-</component>
-<component name="bubblemanager" filter="s60" long-name="Phone Bubble Manager">
-<unit bldFile="app/phone/phoneuis/bubblemanager/group"/>
-</component>
-<component name="connectutil" filter="s60" long-name="Connection Utility" plugin="Y">
-<unit bldFile="app/phone/phoneuis/connectutil/group"/>
-</component>
-<component name="ussd" filter="s60" long-name="Unstructured Supplementary Services Data">
-<unit bldFile="app/phone/phoneuis/ussd/group"/>
-</component>
-<component name="vmbx" filter="s60" long-name="Voice Mailbox">
-<unit bldFile="app/phone/phoneuis/vmbx/group"/>
-</component>
-<component name="telephonydevicemode" filter="s60" long-name="Telephony Device Mode">
-<unit bldFile="app/phone/phoneuis/telephonydevicemode/group"/>
-</component>
-</collection>
-<collection name="phoneplugins" long-name="Phone Plugins" level="plugin">
-<component name="telbranding" filter="s60" long-name="Tel Branding" introduced="^2" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/telbranding/group"/>
-</component>
-</collection>
-</block>
-<block name="videotelephony" level="apps" long-name="Video Telephony Apps" levels="engine plugin prot ui">
-<collection name="videotelephony_plat" long-name="VT Apps Platform Interfaces" level="ui">
-<component name="video_telephony_control_mediator_api" long-name="Video Telephony Control Mediator API" filter="s60" class="api">
-<unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_control_mediator_api/group"/>
-</component>
-<component name="video_telephony_media_configuration_api" long-name="Video Telephony Media Configuration API" filter="s60" class="api">
-<unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_media_configuration_api/group"/>
-</component>
-</collection>
-<collection name="vtengines" long-name="Video Telephony Engines" level="engine">
-<component name="videoteleng" filter="s60" long-name="Video Telephony Engine">
-<unit bldFile="app/videotelephony/vtengines/videoteleng/Group"/>
-</component>
-<component name="vtmediatorplugin" filter="s60" long-name="VT Mediator Plugin" plugin="Y">
-<unit bldFile="app/videotelephony/vtengines/vtmediatorplugin/group"/>
-</component>
-</collection>
-<collection name="vtuis" long-name="Video Telephony UIs" level="ui">
-<component name="videotelui" filter="s60" long-name="Video Telephony UI">
-<unit bldFile="app/videotelephony/vtuis/videotelui/group"/>
-</component>
-</collection>
-<collection name="vtprotocolplugins" long-name="VT Protocol Plugins" level="plugin">
-<component name="displaysink" filter="s60" long-name="Display Sink" introduced="^2">
-<unit bldFile="app/videotelephony/vtprotocolplugins/DisplaySink/group"/>
-</component>
-<component name="videosource" filter="s60" long-name="Video Source" introduced="^2">
-<unit bldFile="app/videotelephony/vtprotocolplugins/VideoSource/group"/>
-</component>
-</collection>
-<collection name="vtprotocolsstub" long-name="VT Protocols Stub" level="prot">
-<!-- this collection is really a component, move down a directory -->
-<component name="videotelproto" filter="s60" long-name="Video Telephony Protocol">
-<unit bldFile="app/videotelephony/vtprotocolsstub/group" filter="sf_build"/>
-</component>
-</collection>
-</block>
-<block name="iptelephony" level="apps" long-name="IP Telephony" levels="eng plugin util ui">
-<collection name="iptel_plat" long-name="IP Telephony Platform Interfaces" level="ui">
-<component name="richcallsettingsengine_api" long-name="Rich Call Settings Engine API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/richcallsettingsengine_api/group"/>
-</component>
-<component name="cch_client_api" long-name="CCH Client API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/cch_client_api/group"/>
-</component>
-<component name="cch_server_api" long-name="CCH Server API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/cch_server_api/group"/>
-</component>
-<component name="csc_settingsui_api" long-name="CSC Settings UI API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/csc_settingsui_api/group"/>
-</component>
-<component name="vccpropertyhandler_api" long-name="VCC Property Handler API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/vccpropertyhandler_api/group"/>
-</component>
-<component name="vcc_api" long-name="VCC API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/vcc_api/group"/>
-</component>
-</collection>
-<collection name="iptelcommsconfig" long-name="IP Telephony Comms Config" level="ui">
-<component name="cscgsplugin" filter="s60" long-name="CSC GS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/commsconfig/cscgsplugin/group"/>
-</component>
-<component name="cscsipvoipcleanupplugin" filter="s60" long-name="CSC SIP VoIP Cleanup Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/commsconfig/cscsipvoipcleanupplugin/group"/>
-</component>
-<component name="cscengine" filter="s60" long-name="Connection Service Configurator Engine" introduced="^2">
-<unit bldFile="app/iptelephony/commsconfig/cscengine/group"/>
-</component>
-<component name="cscsettingsui" filter="s60" long-name="CSC Settings UI" introduced="^2">
-<unit bldFile="app/iptelephony/commsconfig/cscsettingsui/group"/>
-</component>
-<component name="cscapplicationui" filter="s60" long-name="CSC Application UI" introduced="^2">
-<unit bldFile="app/iptelephony/commsconfig/cscapplicationui/group"/>
-</component>
-<component name="commsconfig_build" filter="s60" long-name="Comms Config Build" introduced="^2">
-<!-- consider distributing this into the above components -->
-<unit bldFile="app/iptelephony/commsconfig/group"/>
-</component>
-</collection>
-<collection name="convergedconnectionhandler" long-name="Converged Connection Handler" level="eng">
-<component name="cchserver" filter="s60" long-name="CCH Server" introduced="^2">
-<unit bldFile="app/iptelephony/convergedconnectionhandler/cchserver/group"/>
-</component>
-<component name="cchclient" filter="s60" long-name="CCH Client" introduced="^2">
-<unit bldFile="app/iptelephony/convergedconnectionhandler/cchclient/group"/>
-</component>
-<component name="cchclientapi" filter="s60" long-name="CCH Client API" introduced="^2">
-<unit bldFile="app/iptelephony/convergedconnectionhandler/cchclientapi/group"/>
-</component>
-<component name="convergedconnectionhandler_build" filter="s60" long-name="CCH Build" introduced="^2">
-<!-- consider distributing this into the above components, or collapse the collection into a single component.
- The latter is a better option since clients and sevrers are rarely separate components -->
-<unit bldFile="app/iptelephony/convergedconnectionhandler/group"/>
-</component>
-</collection>
-<collection name="richcallsettingsengine" long-name="Rich Call Settings Engine" level="eng">
-<component name="rcse2" filter="s60" long-name="Rich Call Settings Engine Build" introduced="^2">
-<unit bldFile="app/iptelephony/richcallsettingsengine/rcse2/group"/>
-</component>
-</collection>
-<collection name="sipvoipprovider" long-name="SIP VoIP Provider" level="plugin">
-<!-- collection is really a component. Should move down a directory -->
-<component name="svp" filter="s60" long-name="SIP VoIP Provider Build" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/sipvoipprovider/group"/>
-</component>
-</collection>
-<collection name="voipplugins" long-name="VoIP Plugins" level="plugin">
-<component name="sipmxresolver" filter="s60" long-name="SIP MX Resolver" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/sipmxresolver/group"/>
-</component>
-<component name="sipconnectionprovider" filter="s60" long-name="SIP Connection Provider" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/sipconnectionprovider/group"/>
-<!-- can only have one unit, can the next be #'included from the above? -->
-<unit bldFile="app/iptelephony/voipplugins/sipconnectionprovider/ipvoicemailengine/group"/>
-</component>
-<component name="ipapputils" filter="s60" long-name="IP App Utils" introduced="^2">
-<unit bldFile="app/iptelephony/voipplugins/ipapputils/group"/>
-</component>
-<component name="voipadapters" filter="s60" long-name="VoIP Adapters" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/voipadapters/group"/>
-</component>
-<component name="accountcreationplugin" filter="s60" long-name="Account Creation Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/accountcreationplugin/group"/>
-</component>
-<component name="dhcppositionprovider" filter="s60" long-name="DHCP Position Provider" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/dhcppositionprovider/group"/>
-</component>
-<component name="svtmatching" filter="s60" long-name="SIP VoIP Telephony Matching" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/svtmatching/group"/>
-</component>
-<component name="svtlogging" filter="s60" long-name="SVT Logging" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/svtlogging/group"/>
-</component>
-<component name="svtcallmenu" filter="s60" long-name="SVT Call Menu" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/svtcallmenu/group"/>
-</component>
-<component name="sipimresolver" filter="s60" long-name="SIP IM Resolver" introduced="^3" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/sipimresolver/group"/>
-</component>
-</collection>
-<collection name="callcontinuity" long-name="Call Continuity" level="util">
-<component name="vccutils" filter="s60" long-name="VCC Utils" introduced="^2">
-<unit bldFile="app/iptelephony/callcontinuity/vccutils/group"/>
-</component>
-<component name="nsmldmvccadapter" filter="s60" long-name="SyncML DM VCC Adapter" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/callcontinuity/nsmldmvccadapter/group"/>
-</component>
-<component name="vccclientprovisioningadapter" filter="s60" long-name="VCC Client Provisioning Adapter" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/callcontinuity/vccclientprovisioningadapter/group"/>
-</component>
-<component name="vccpropertyhandler" filter="s60" long-name="VCC Property Handler" introduced="^2">
-<unit bldFile="app/iptelephony/callcontinuity/vccpropertyhandler/group"/>
-</component>
-<component name="vcchotrigger" filter="s60" long-name="VCC HO Trigger" introduced="^2">
-<unit bldFile="app/iptelephony/callcontinuity/vcchotrigger/group"/>
-</component>
-<component name="vcc" filter="s60" long-name="VoIP Call Continuity" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/callcontinuity/vcc/group"/>
-</component>
-<component name="callcontinuity_build" filter="s60" long-name="Call Continuity Build" introduced="^2">
-<!-- consider distributing this into the above components -->
-<unit bldFile="app/iptelephony/callcontinuity/group"/>
-</component>
-</collection>
-</block>
-<block name="settingsuis" level="services" long-name="Settings UIs" levels="rsc ui">
-<collection name="devmngt_plat" long-name="Settings UIs Platform Interfaces" level="ui">
-<component name="default_app_client_api" long-name="Default App Client API" introduced="^1" filter="s60" class="api">
-<unit bldFile="app/settingsuis/devmngt_plat/default_app_client_api/group"/>
-</component>
-<component name="services_db_api" long-name="Services DB API" introduced="^1" filter="s60" class="api">
-<unit bldFile="app/settingsuis/devmngt_plat/services_db_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="defaultapplicationsettings" long-name="Default Application Settings" level="rsc">
-<component name="services_db" filter="s60" long-name="Services Database" introduced="^1">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/services_db/group"/>
-</component>
-<component name="defaultapplicationsettings_server" filter="s60" long-name="Default Application Server" introduced="^1">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/server/group"/>
-</component>
-<component name="service" filter="s60" long-name="Default Application Service" introduced="^1">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/service/group"/>
-</component>
-<component name="dasgsplugin" filter="s60" long-name="Default Application Settings GS Plugin" introduced="^1" plugin="Y">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/gsplugin/group"/>
-</component>
-<component name="defaultapplicationsettings_build" filter="s60" long-name="Default Application Settings Build" introduced="^1">
-<!-- split the IBYs up into the appropriate components? Make this a ROM component? -->
-<unit bldFile="app/settingsuis/defaultapplicationsettings/group"/>
-</component>
-</collection>
-<collection name="systemswuis" long-name="System SW UIs" level="ui">
-<component name="touchscreencalib" filter="s60" long-name="Touchscreen Calibration" introduced="^1">
-<unit bldFile="app/settingsuis/systemswuis/touchscreencalib/group"/>
-</component>
-</collection>
-</block>
-<block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin app">
-<collection name="contentctrl_plat" long-name="Content Control Daemons Platforn Interfaces" level="app">
-<component name="oma_ds_presync_plugin_api" long-name="OMA DS PreSync Plugin API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/oma_ds_presync_plugin_api/group"/>
-</component>
-<component name="ds_agenda_handler_plugin_api" long-name="DS Agenda Handler Plugin API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_agenda_handler_plugin_api/group"/>
-</component>
-<component name="ds_folder_util_api" long-name="DS Folder Util API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_folder_util_api/group"/>
-</component>
-</collection>
-<collection name="dsdcmoadapter" long-name="Data Sync DCMO Adapter" level="plugin">
-<!-- Component at wrong rank, should move down a directory -->
-<component name="dsdcmoadapter_build" filter="s60" long-name="Data Sync Control DCMO Adapter">
-<unit bldFile="app/contentcontrol/dsdcmoadapter/group"/>
-</component>
-</collection>
-<collection name="omads" long-name="OMA Data Sync" level="app">
-<component name="omadsappui" filter="s60" long-name="OMA DS Application UI">
-<unit bldFile="app/contentcontrol/omads/omadsappui/group"/>
-</component>
-<component name="omadsextensions" filter="s60" long-name="OMA DS Extensions" plugin="Y">
-<unit bldFile="app/contentcontrol/omads/omadsextensions/group"/>
-</component>
-</collection>
-</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">
-<unit bldFile="app/devicecontrol/devicediagnostics/devdiagapp/group"/>
-</component>
-<component name="devdiaggsplugin" filter="s60" long-name="Device Diagnostics GS Plugin" plugin="Y">
-<unit bldFile="app/devicecontrol/devicediagnostics/devdiaggsplugin/group"/>
-</component>
-<component name="diagplugins" filter="s60" long-name="Diagnostics Plugins" plugin="Y">
-<unit bldFile="app/devicecontrol/devicediagnostics/diagplugins/group"/>
-</component>
-<component name="diagsuites" filter="s60" long-name="Diagnostics Suites" plugin="Y">
-<unit bldFile="app/devicecontrol/devicediagnostics/diagsuites/group"/>
-</component>
-<component name="devicediagnostics_build" filter="s60" long-name="Device Diagnostics Build">
-<!-- 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">
-<unit bldFile="app/devicecontrol/omadm/omadmappui/group"/>
-</component>
-<component name="omadmextensions" filter="s60" long-name="OMA DM Extensions" 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">
-<unit bldFile="app/devicecontrol/omadm/dcmo/group"/>
-</component>
-</collection>
-<collection name="pnpmobileservices" long-name="PnP Mobile Services" level="mid">
-<component name="pnpms" filter="s60" long-name="PnP MS">
-<unit bldFile="app/devicecontrol/pnpmobileservices/pnpms/group"/>
-</component>
-</collection>
-<collection name="applicationmanagement" long-name="Application Management" level="app">
-<!-- could this collection be collapsed into a single component and moved down a dir? Do all these need to be noted separately? -->
-<component name="applicationmanagement_options" filter="s60" long-name="AM Install Options">
-<unit bldFile="app/devicecontrol/applicationmanagement/options/group"/>
-</component>
-<component name="applicationmanagement_client" filter="s60" long-name="AM Client">
-<unit bldFile="app/devicecontrol/applicationmanagement/client/group"/>
-</component>
-<component name="applicationmanagement_server" filter="s60" long-name="AM Server">
-<unit bldFile="app/devicecontrol/applicationmanagement/server/group"/>
-</component>
-<component name="rfsplugin" filter="s60" long-name="AM RFS Plugin" plugin="Y">
-<unit bldFile="app/devicecontrol/applicationmanagement/rfsplugin/group"/>
-</component>
-<component name="amadapter2" filter="s60" long-name="AM Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/applicationmanagement/amadapter2/group"/>
-</component>
-<component name="omascomoadapter" filter="s60" long-name="OMA SCOMO Adapter" introduced="^3" plugin="Y">
-<unit bldFile="app/devicecontrol/applicationmanagement/omascomoadapter/group"/>
-</component>
-<component name="applicationmanagement_build" filter="s60" long-name="AM Build">
-<!-- If thes aren't collapsed into one cmp, can all #includes removed from here, and it renamed AM ROM? -->
-<unit bldFile="app/devicecontrol/applicationmanagement/group"/>
-</component>
-</collection>
-<collection name="customization" long-name="DM Customization Adapters" level="mid">
-<component name="dmutils" long-name="DM Utils" filter="s60">
-<unit bldFile="app/devicecontrol/customization/dmutils/bld"/>
-</component>
-<component name="uisettingssrv" filter="s60" long-name="UI Settings Server">
-<unit bldFile="app/devicecontrol/customization/uisettingssrv/bld"/>
-</component>
-<component name="isadapter" filter="s60" long-name="Idle State Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/isadapter/bld"/>
-</component>
-<component name="supadapter" filter="s60" long-name="Startup Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/supadapter/bld"/>
-</component>
-<component name="wallpaperadapter" filter="s60" long-name="Wallpaper Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/wallpaperadapter/bld"/>
-</component>
-<component name="operatorlogoadapter" filter="s60" long-name="Operator Logo Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/operatorlogoadapter/bld"/>
-</component>
-<component name="screensaveradapter" filter="s60" long-name="Screen Saver Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/screensaveradapter/bld"/>
-</component>
-<component name="themesadapter" filter="s60" long-name="Themes Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/themesadapter/bld"/>
-</component>
-<component name="embeddedlinkadapter" filter="s60" long-name="Embedded Link Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/embeddedlinkadapter/bld"/>
-</component>
-<component name="customization_build" filter="s60" long-name="DM Customization Build">
-<!-- If thes aren't collapsed into one cmp, can all #includes removed from here, and it renamed DM Customization ROM? -->
-<unit bldFile="app/devicecontrol/customization/group"/>
-</component>
-</collection>
-<collection name="omacp" long-name="OMA Content Provisioning" level="oma">
-<component name="omacpadapters" filter="s60" long-name="OMA CP Adapters" plugin="Y">
-<unit bldFile="app/devicecontrol/omacp/omacpadapters/group"/>
-</component>
-</collection>
-</block>
-<block name="printing" level="services" long-name="Printing" levels="app">
-<collection name="imageprint" long-name="ImagePrint" level="app">
-<component name="clog" filter="s60" long-name="ImagePrint Logging" introduced="^2">
-<unit bldFile="app/printing/imageprint/clog/group"/>
-</component>
-<component name="imageprintengine" filter="s60" long-name="ImagePrint Engine" introduced="^2">
-<unit bldFile="app/printing/imageprint/imageprintengine/group"/>
-</component>
-<component name="imageprintui" filter="s60" long-name="ImagePrint UI" introduced="^2">
-<unit bldFile="app/printing/imageprint/imageprintui/group"/>
-</component>
-<component name="imageprint_build" filter="s60" long-name="ImagePrint Build" introduced="^2">
-<!-- Need to break the IBY includes into the other components, or remove #includes and make this a ROM component -->
-<unit bldFile="app/printing/imageprint/group"/>
-</component>
-</collection>
-</block>
-<block name="files" level="apps" long-name="File Manager Apps" levels="support apps">
-<collection name="files_plat" long-name="File Manager Apps Platform Interfaces" level="apps">
-<component name="memory_scan_popup_ui_api" long-name="Memory Scan Popup UI API" filter="s60" class="api">
-<unit bldFile="app/files/files_plat/memory_scan_popup_ui_api/group"/>
-</component>
-</collection>
-<collection name="deviceencryption" long-name="Device Encryption" level="support">
-<!-- this is either needs to be broken up into idependent bld.infs, or it's really a component and should move down a directory -->
-<component name="devencnotifplugin" filter="s60" long-name="Device Encryption Notifier Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/files/deviceencryption/devencnotifplugin/group"/>
-</component>
-<component name="devencui" filter="s60" long-name="Device Encryption UI" introduced="^3">
-<unit bldFile="app/files/deviceencryption/devencui/group"/>
-</component>
-<component name="devencdmadapter" filter="s60" long-name="Device Encryption DM Adapter" introduced="^3" plugin="Y">
-<unit bldFile="app/files/deviceencryption/devencdmadapter/group"/>
-</component>
-<component name="devencgsplugin" filter="s60" long-name="Device Encryption GS Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/files/deviceencryption/devencgsplugin/group"/>
-</component>
-<component name="deviceencryption_help" filter="s60" long-name="Device Encryption Help" introduced="^3">
-<unit bldFile="app/files/deviceencryption/help/group"/>
-</component>
-<component name="deviceencryption_build" filter="s60" long-name="Device Encryption Build" introduced="^3">
-<unit bldFile="app/files/deviceencryption/group"/>
-</component>
-</collection>
-<collection name="filemanager" long-name="File Manager" level="apps">
-<!-- this is really a component, should move down a directory -->
-<component name="filemanager_build" filter="s60" long-name="File Manager Build">
-<unit bldFile="app/files/filemanager/group"/>
-</component>
-</collection>
-<collection name="filesystemuis" long-name="File System UIs" level="support">
-<component name="memscaneng" filter="s60" long-name="Memory Scan Server">
-<unit bldFile="app/files/filesystemuis/memscaneng/group"/>
-</component>
-<component name="memstatepopup" filter="s60" long-name="Memory State Popup">
-<unit bldFile="app/files/filesystemuis/memstatepopup/group"/>
-</component>
-</collection>
-</block>
-<block name="utils" level="apps" long-name="Utility Apps" levels="app">
-<collection name="extras" long-name="Extras" level="app">
-<component name="about" filter="s60" long-name="About Application">
-<unit bldFile="app/utils/extras/about/group"/>
-</component>
-<component name="calcsoft" filter="s60" long-name="Calculator Application">
-<unit bldFile="app/utils/extras/calcsoft/group"/>
-</component>
-<component name="converter" filter="s60" long-name="Unit Converter">
-<unit bldFile="app/utils/extras/converter/group"/>
-</component>
-</collection>
-</block>
-<block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
-<collection name="contacts_pub" long-name="Contacts Apps Public Interfaces" level="ui">
-<component name="phonebook_fetch_ui_api" long-name="Phonebook Fetch UI API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_fetch_ui_api/group"/>
-</component>
-<component name="phonebook_data_management_api" long-name="Phonebook Data Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_data_management_api/group"/>
-</component>
-<component name="phonebook_vcard_importexport_api" long-name="Phonebook vCard Import/Export API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_vcard_importexport_api/group"/>
-</component>
-<component name="phonebook_data_addedit_ui_api" long-name="Phonebook Data Add/Edit UI API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_data_addedit_ui_api/group"/>
-</component>
-<component name="phonebook_ui_utilities_api" long-name="Phonebook UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_ui_utilities_api/group"/>
-</component>
-<component name="phonebook_thumbnail_operation_api" long-name="Phonebook Thumbnail Operation API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_thumbnail_operation_api/group"/>
-</component>
-<component name="speed_dial_utility_control_api" long-name="Speed Dial Utility Control API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/speed_dial_utility_control_api/group"/>
-</component>
-</collection>
-<collection name="contacts_plat" long-name="Contacts Apps Platform Interfaces" level="ui">
-<component name="virtual_phonebook_store_api" long-name="Virtual Phonebook Store API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_store_api/group"/>
-</component>
-<component name="virtual_phonebook_sim_services_api" long-name="Virtual Phonebook SIM Services API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_sim_services_api/group"/>
-</component>
-<component name="virtual_phonebook_configuration_api" long-name="Virtual Phonebook Configuration API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_configuration_api/group"/>
-</component>
-<component name="virtual_phonebook_copy_policy_api" long-name="Virtual Phonebook Copy Policy API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_copy_policy_api/group"/>
-</component>
-<component name="virtual_phonebook_policy_api" long-name="Virtual Phonebook Policy API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_policy_api/group"/>
-</component>
-<component name="virtual_phonebook_engine_api" long-name="Virtual Phonebook Engine API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_engine_api/group"/>
-</component>
-<component name="virtual_phonebook_migration_support_api" long-name="Virtual Phonebook Migration Support API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_migration_support_api/group"/>
-</component>
-<component name="virtual_phonebook_view_definition_api" long-name="Virtual Phonebook View Definition API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_view_definition_api/group"/>
-</component>
-<component name="virtual_phonebook_vcard_api" long-name="Virtual Phonebook vCard API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_vcard_api/group"/>
-</component>
-<component name="cms_contactor_api" long-name="CMS Contactor API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/cms_contactor_api/group"/>
-</component>
-<component name="contactpresence_api" long-name="Contact Presence API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/contactpresence_api/group"/>
-</component>
-<component name="presence_cache_api" long-name="Presence Cache API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/presence_cache_api/group"/>
-</component>
-<component name="phonebook_internal_common_api" long-name="Phonebook Internal Common API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_common_api/group"/>
-</component>
-<component name="phonebook_internal_appfw_api" long-name="Phonebook Internal App Framework API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_appfw_api/group"/>
-</component>
-<component name="phonebook_internal_data_management_api" long-name="Phonebook Internal Data Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_data_management_api/group"/>
-</component>
-<component name="phonebook_2_xsp_extension_manager_api" long-name="Phonebook 2 xSP Extension Manager API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_xsp_extension_manager_api/group"/>
-</component>
-<component name="phonebook_ui_controls_api" long-name="Phonebook UI Controls API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_ui_controls_api/group"/>
-</component>
-<component name="phonebook_2_image_management_api" long-name="Phonebook 2 Image Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_image_management_api/group"/>
-</component>
-<component name="phonebook_extension_api" long-name="Phonebook Extension API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_extension_api/group"/>
-</component>
-<component name="phonebook_public_constants_api" long-name="Phonebook Public Constants API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_public_constants_api/group"/>
-</component>
-<component name="phonebook_internal_ui_utilities_api" long-name="Phonebook Internal UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_ui_utilities_api/group"/>
-</component>
-<component name="logs_engine_api_extensions" long-name="Logs Engine API Extensions" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/logs_engine_api_extensions/group"/>
-</component>
-<component name="phonebook_thumbnails_api" long-name="Phonebook Thumbnails API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_thumbnails_api/group"/>
-</component>
-<component name="phonebook_2_icon_api" long-name="Phonebook 2 Icon API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_icon_api/group"/>
-</component>
-<component name="phonebook_engine_extension_api" long-name="Phonebook Engine Extension API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_engine_extension_api/group"/>
-</component>
-<component name="phonebook_2_store_configuration_management_api" long-name="Phonebook 2 Store Configuration Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_store_configuration_management_api/group"/>
-</component>
-<component name="logs_ui_command_line_api" long-name="Logs UI Command Line API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/logs_ui_command_line_api/group"/>
-</component>
-<component name="speed_dial_dialogs_api" long-name="Speed Dial Dialogs API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/speed_dial_dialogs_api/group"/>
-</component>
-<component name="phonebook_2_xsp_view_activation_api" long-name="Phonebook 2 xSP View Activation API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_xsp_view_activation_api/group"/>
-</component>
-<component name="logs_timers_api" long-name="Logs Timers API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/logs_timers_api/group"/>
-</component>
-<component name="phonebook_2_ui_extension_definition_api" long-name="Phonebook 2 UI Extension Definition API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_definition_api/group"/>
-</component>
-<component name="phonebook_2_common_ui_api" long-name="Phonebook 2 Common UI API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_common_ui_api/group"/>
-</component>
-<component name="phonebook_2_ui_extension_api" long-name="Phonebook 2 UI Extension API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_api/group"/>
-</component>
-<component name="phonebook_2_store_property_api" long-name="Phonebook 2 Store Property API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_store_property_api/group"/>
-</component>
-<component name="phonebook_2_ui_extension_plugin_api" long-name="Phonebook 2 UI Extension Plug-In API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_plugin_api/group"/>
-</component>
-<component name="phonebook_2_ui_controls_api" long-name="Phonebook 2 UI Controls API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_controls_api/group"/>
-</component>
-<component name="phonebook_2_thin_ui_extension_plugin_api" long-name="Phonebook 2 Thin UI Extension Plugin API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_thin_ui_extension_plugin_api/group"/>
-</component>
-<component name="phonebook_2_commands_api" long-name="Phonebook 2 Commands API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_commands_api/group"/>
-</component>
-<component name="phonebook_2_presentation_api" long-name="Phonebook 2 Presentation API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_presentation_api/group"/>
-</component>
-<component name="phonebook_2_ui_utilities_api" long-name="Phonebook 2 UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_utilities_api/group"/>
-</component>
-<component name="cca_launch_api" long-name="CCA Launch API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/cca_launch_api/group"/>
-</component>
-<component name="cca_view_plugin_api" long-name="CCA View Plugin API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/cca_view_plugin_api/group"/>
-</component>
-<component name="predictivesearch_client_api" long-name="Predictive Search Client API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_client_api/group"/>
-</component>
-<component name="predictivesearch_utils_api" long-name="Predictive Search Utils API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_utils_api/group"/>
-</component>
-<component name="predictivesearch_adapters_api" long-name="Predictive Search Adapters API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_adapters_api/group"/>
-</component>
-<component name="predictivesearch_algorithm_api" long-name="Predictive Search Algorithm API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_algorithm_api/group"/>
-</component>
-<component name="phonebook_2_rcl_api" long-name="Phonebook 2 RCL API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_rcl_api/group"/>
-</component>
-</collection>
-<collection name="contactextensions" long-name="Contacts Extensions" level="services">
-<component name="predefinedcontacts" filter="s60" long-name="Predefined Contacts">
-<unit bldFile="app/contacts/contactextensions/predefinedcontacts/group"/>
-</component>
-</collection>
-<collection name="logsui" long-name="Logs UI" level="ui">
-<component name="logsui_build" filter="s60" long-name="Logs UI Build">
-<!-- component at too high a rank, should move down one directory -->
-<unit bldFile="app/contacts/logsui/group"/>
-</component>
-</collection>
-<collection name="phonebookui" long-name="Phonebook UI" level="ui">
-<component name="phonebook" filter="s60" long-name="Phonebook">
-<unit bldFile="app/contacts/phonebookui/phonebook/group"/>
-</component>
-<component name="speeddial" filter="s60" long-name="Speed Dial">
-<unit bldFile="app/contacts/phonebookui/speeddial/group"/>
-</component>
-<component name="phonebook2" filter="s60" long-name="Phone Book 2">
-<unit bldFile="app/contacts/phonebookui/phonebook2/group"/>
-</component>
-</collection>
-<collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
-<component name="cntfindplugin" filter="s60" long-name="Contacts Find Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntfindplugin/group"/>
-</component>
-<component name="cntsortplugin" filter="s60" long-name="Contacts Sort Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntsortplugin/group"/>
-</component>
-<component name="virtualphonebook" filter="s60" long-name="Virtual Phonebook" introduced="^2">
-<unit bldFile="app/contacts/phonebookengines/virtualphonebook/group"/>
-</component>
-<component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
-<unit bldFile="app/contacts/phonebookengines/contactsmodel/groupsql" mrp="app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
-</component>
-</collection>
-<collection name="pimprotocols" long-name="PIM Protocols" level="services">
-<component name="phonebooksync" long-name="Phonebook Sync" purpose="optional" plugin="Y">
-<unit bldFile="app/contacts/pimprotocols/phonebooksync/group" mrp="app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
-</component>
-<component name="pbap" long-name="Bluetooth PBAP" introduced="9.2" purpose="optional">
-<unit bldFile="app/contacts/pimprotocols/pbap/group" mrp="app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
-</component>
-</collection>
-<collection name="ccservices" long-name="Contacts Centric Services" level="services">
-<component name="cmsservices" filter="s60" long-name="Contact Method Selector Services" introduced="^2">
-<unit bldFile="app/contacts/ccservices/cmsservices/group"/>
-</component>
-</collection>
-<collection name="presencecache" long-name="Presence Cache" level="support">
-<component name="presencecacheutils" filter="s60" long-name="Presence Cache Utils" introduced="^2" class="placeholder">
-<!-- <unit bldFile="presencecache/presencecacheutils/group"/> -->
-</component>
-<component name="presencecacheserver2" filter="s60" long-name="Presence Cache Server" introduced="^2" class="placeholder">
-<!-- <unit bldFile="presencecache/presencecacheserver2/group"/> -->
-</component>
-<component name="presencecacheclient2" filter="s60" long-name="Presence Cache Client" introduced="^2" class="placeholder">
-<!-- <unit bldFile="presencecache/presencecacheclient2/group"/> -->
-</component>
-<component name="presencecache_build" filter="s60" long-name="Presence Cache Build" introduced="^2">
-<!-- should divide this bld.inf into the other components, or collapse them into a single component -->
-<unit bldFile="app/contacts/presencecache/group"/>
-</component>
-</collection>
-<collection name="predictivesearch" long-name="Predictive Search" level="support">
-<component name="pcsutils" filter="s60" long-name="PCS Utils" introduced="^2">
-<unit bldFile="app/contacts/predictivesearch/pcsutils/group"/>
-</component>
-<component name="pcsserverclientapi" filter="s60" long-name="PCS Server Client API" introduced="^2">
-<unit bldFile="app/contacts/predictivesearch/pcsserverclientapi/group"/>
-</component>
-<component name="pcsserver" filter="s60" long-name="PCS Server" introduced="^2">
-<unit bldFile="app/contacts/predictivesearch/pcsserver/group"/>
-</component>
-<component name="pcsadapters" filter="s60" long-name="PCS Adapters" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/predictivesearch/adapters/contacts/group"/>
-</component>
-<component name="pcsalgorithm" filter="s60" long-name="PCS Algorithm" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/predictivesearch/pcsalgorithm/group"/>
-</component>
-<component name="predictivesearch_build" filter="s60" long-name="Predictive Search Build" introduced="^2">
-<!-- need to remove #includes from bld.inf and rename as Predictive Search ROM -->
-<unit bldFile="app/contacts/predictivesearch/group"/>
-</component>
-</collection>
-<collection name="contacts_info" long-name="Contacts Apps Info" level="ui">
-<component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="organizer" level="apps" span="2" long-name="Organizer Application Suite" levels="support services engine ui app">
-<collection name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" level="app">
-<component name="meeting_request_mailbox_utilities_api" long-name="Meeting Request Mailbox Utilities API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_mailbox_utilities_api/group"/>
-</component>
-<component name="meeting_request_uids_api" long-name="Meeting Request UIDs API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_uids_api/group"/>
-</component>
-<component name="calendar_exporter_api" long-name="Calendar Exporter API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_exporter_api/group"/>
-</component>
-<component name="agenda_versit_2_api" long-name="Agenda Versit 2 API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/agenda_versit_2_api/group"/>
-</component>
-<component name="calendar_importer_api" long-name="Calendar Importer API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_importer_api/group"/>
-</component>
-<component name="calendar_launcher_api" long-name="Calendar Launcher API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_launcher_api/group"/>
-</component>
-<component name="calendar_common_utils_api" long-name="Calendar Common Utils API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_common_utils_api/group"/>
-</component>
-<component name="searchfw_launcher_api" long-name="Search Framework Launcher API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/searchfw_launcher_api/group"/>
-</component>
-<component name="alarm_const_api" long-name="Alarm Const API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/alarm_const_api/group"/>
-</component>
-<component name="alarm_ui_external_control_api" long-name="Alarm UI External Control API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/alarm_ui_external_control_api/group"/>
-</component>
-<component name="calendar_settings_keys_api" long-name="Calendar Settings Keys API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_settings_keys_api/group"/>
-</component>
-<component name="calendar_tones_settings_keys_api" long-name="Calendar Tones Settings Keys API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_tones_settings_keys_api/group"/>
-</component>
-<component name="clock_settings_api" long-name="Clock Settings API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/clock_settings_api/group"/>
-</component>
-<component name="common_alarm_editor_api" long-name="Common Alarm Editor API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/common_alarm_editor_api/group"/>
-</component>
-<component name="alarm_ui_secondary_display_api" long-name="Alarm UI Secondary Display API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/alarm_ui_secondary_display_api/group"/>
-</component>
-<component name="searchui_launcher_api" long-name="Search UI Launcher API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/searchui_launcher_api/group"/>
-</component>
-<component name="agenda_entry_ui_api" long-name="Agenda Entry UI API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/agenda_entry_ui_api/group"/>
-</component>
-<component name="meeting_request_utillities_api" long-name="Meeting Request Utillities API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_utillities_api/group"/>
-</component>
-<component name="meeting_request_viewer_api" long-name="Meeting Request Viewer API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_viewer_api/group"/>
-</component>
-<component name="calendar_custamization_api" long-name="Calendar Customization API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_custamization_api/group"/>
-</component>
-</collection>
-<collection name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" level="app">
-<component name="calendar_interim_utils2_api" long-name="Calendar Interim Utils 2 API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_pub/calendar_interim_utils2_api/group"/>
-</component>
-<component name="notepad_library_api" long-name="Notepad Library API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_pub/notepad_library_api/group"/>
-</component>
-</collection>
-<collection name="alarmengines" long-name="Alarm Engines" level="engine">
-<component name="missedalarmstore" filter="s60" long-name="Missed Alarm Store">
-<unit bldFile="app/organizer/alarmengines/missedalarmstore/group"/>
-</component>
-</collection>
-<collection name="calendarengines" long-name="Calendar Engines" level="engine">
-<component name="versit2" filter="s60" long-name="Versit 2 iCal Parser" introduced="9.2">
-<unit bldFile="app/organizer/calendarengines/versit2/group"/>
-</component>
-<component name="agnversit2" filter="s60" long-name="Versit 2 Agenda Interface" introduced="9.2" plugin="Y">
-<unit bldFile="app/organizer/calendarengines/agnversit2/group"/>
-</component>
-<component name="caleninterimutils" filter="s60" long-name="Calendar Interim Utils" introduced="9.1">
-<unit bldFile="app/organizer/calendarengines/caleninterimutils/group"/>
-</component>
-<component name="calenimp" filter="s60" long-name="Calendar Import Wrapper" introduced="7.0s">
-<unit bldFile="app/organizer/calendarengines/calenimp/group"/>
-</component>
-<component name="calenlauncher" filter="s60" long-name="Calendar Launcher">
-<unit bldFile="app/organizer/calendarengines/calenlauncher/group"/>
-</component>
-<component name="caldavsrv" filter="sf_build" long-name="CalDAV Server" introduced="^3">
-<unit bldFile="app/organizer/calendarengines/caldav/group"/>
-</component>
-</collection>
-<collection name="meetingrequestengines" long-name="Meeting Request Engines" level="engine">
-<component name="mrmailbox" filter="s60" long-name="Meeting Request Mailbox">
-<unit bldFile="app/organizer/meetingrequestengines/mrmailbox/group"/>
-</component>
-<component name="mrmailboxutils" filter="s60" long-name="Meeting Request Mailbox Utils" plugin="Y">
-<unit bldFile="app/organizer/meetingrequestengines/mrmailboxutils/group"/>
-</component>
-</collection>
-<collection name="searchfw" long-name="Search Framework" level="services">
-<!-- Uncomment all units when configuration is in place. All currently #included from searchfw_build, which should be removed at the same time. -->
-<component name="coresearchfw" filter="s60" long-name="Core Search Framework" introduced="^1" class="placeholder">
-<!--<unit bldFile="searchfw/coresearchfw/group"/>-->
-</component>
-<component name="searchfw_plugins" filter="s60" long-name="Search Plugins" introduced="^1" plugin="Y" class="placeholder">
-<!--<unit bldFile="searchfw/plugins/group"/>-->
-</component>
-<component name="searchfw_build" filter="s60" long-name="Search Framework Build" introduced="^1">
-<unit bldFile="app/organizer/searchfw/group"/>
-</component>
-</collection>
-<collection name="alarmui" long-name="Alarm UI" level="app">
-<!-- collection is really a component, should move down a directory -->
-<component name="alarmui_build" filter="s60" long-name="Alarm UI Build">
-<unit bldFile="app/organizer/alarmui/group"/>
-</component>
-</collection>
-<collection name="calendarui" long-name="Calendar UI" level="ui">
-<component name="calendarui_help" filter="s60" long-name="Calendar UI Help">
-<unit bldFile="app/organizer/calendarui/help/group"/>
-</component>
-<component name="commonutils" filter="s60" long-name="Calendar Common Utils">
-<unit bldFile="app/organizer/calendarui/commonutils/group"/>
-</component>
-<component name="globaldata" filter="s60" long-name="Calendar Global Data">
-<unit bldFile="app/organizer/calendarui/globaldata/group"/>
-</component>
-<component name="settings" filter="s60" long-name="Calendar Settings">
-<!-- these should be merged into a single bld.inf or split into two components -->
-<unit bldFile="app/organizer/calendarui/settings/gsplugin/group"/>
-<unit bldFile="app/organizer/calendarui/settings/settingsui/group"/>
-</component>
-<component name="customisation" filter="s60" long-name="Calendar Customisation">
-<unit bldFile="app/organizer/calendarui/customisation/group"/>
-</component>
-<component name="customisationmanager" filter="s60" long-name="Calendar Customisation Manager">
-<unit bldFile="app/organizer/calendarui/customisationmanager/group"/>
-</component>
-<component name="multicaluidialog" filter="s60" long-name="Multi-Calendar UI Dialog" introduced="^3">
-<unit bldFile="app/organizer/calendarui/multicaluidialog/group"/>
-</component>
-<component name="views" filter="s60" long-name="Calendar Views">
-<unit bldFile="app/organizer/calendarui/views/group"/>
-</component>
-<component name="calendarui_controller" filter="s60" long-name="Calendar Controller">
-<unit bldFile="app/organizer/calendarui/controller/group"/>
-</component>
-<component name="calendarui_editors" filter="s60" long-name="Calendar Editors">
-<unit bldFile="app/organizer/calendarui/editors/group"/>
-</component>
-<component name="calendarui_application" filter="s60" long-name="Calendar Application">
-<unit bldFile="app/organizer/calendarui/application/group"/>
-</component>
-<component name="missedalarmindicatorplugin" filter="s60" long-name="Missed Alarm Indicator Plugin" plugin="Y">
-<unit bldFile="app/organizer/calendarui/missedalarmindicatorplugin/group"/>
-</component>
-<component name="calendarui_server" filter="s60" long-name="Calendar Server">
-<!-- these should be merged into a single bld.inf or split into two components -->
-<unit bldFile="app/organizer/calendarui/server/calensvr/group"/>
-<unit bldFile="app/organizer/calendarui/server/calensvrclient/group"/>
-</component>
-<component name="regionalplugins" filter="s60" long-name="Calendar Regional Plugins" plugin="Y">
-<!-- these should be merged into a single bld.inf or split into four components -->
-<unit bldFile="app/organizer/calendarui/regionalplugins/calenregionalutil/group"/>
-<unit bldFile="app/organizer/calendarui/regionalplugins/lunarchinese/group"/>
-<unit bldFile="app/organizer/calendarui/regionalplugins/lunarvietnamese/group"/>
-<unit bldFile="app/organizer/calendarui/regionalplugins/thai/group"/>
-</component>
-<component name="calenaiwprovider" filter="s60" long-name="Calendar AIW Proivder" introduced="^3" plugin="Y">
-<unit bldFile="app/organizer/calendarui/calenaiwprovider/group"/>
-</component>
-<component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y">
-<unit bldFile="app/organizer/calendarui/caldav/group"/>
-</component>
-<component name="calendarui_build" filter="s60" long-name="Calendar UI Build">
-<!-- split contents into separate components -->
-<unit bldFile="app/organizer/calendarui/group"/>
-</component>
-</collection>
-<collection name="meetingui" long-name="Meeting UI" level="ui">
-<component name="attendeeview" filter="s60" long-name="Attendee View">
-<unit bldFile="app/organizer/meetingui/attendeeview/group"/>
-</component>
-<component name="agnentryui" filter="s60" long-name="Agenda Entry UI" plugin="Y">
-<unit bldFile="app/organizer/meetingui/agnentryui/group"/>
-</component>
-<component name="meetingrequestutils" filter="s60" long-name="Meeting Request Utils">
-<unit bldFile="app/organizer/meetingui/meetingrequestutils/group"/>
-</component>
-<component name="meetingrequestviewers" filter="s60" long-name="Meeting Request Viewers" plugin="Y">
-<unit bldFile="app/organizer/meetingui/meetingrequestviewers/group"/>
-</component>
-<component name="meetingui_build" filter="s60" long-name="Meeting UI Build">
-<!-- split contents into separate components -->
-<unit bldFile="app/organizer/meetingui/group"/>
-</component>
-</collection>
-<collection name="clock2" long-name="Clock" level="app">
-<component name="clockengines" filter="s60" long-name="Clock Engines">
-<unit bldFile="app/organizer/clock2/clockengines/group"/>
-</component>
-<component name="clockui" filter="s60" long-name="Clock UI">
-<unit bldFile="app/organizer/clock2/clockui/group"/>
-</component>
-<component name="clock2_help" filter="s60" long-name="Clock Help">
-<unit bldFile="app/organizer/clock2/help/group"/>
-</component>
-<component name="clock2_build" filter="s60" long-name="Clock Build">
-<!-- split contents into separate components, or just make this one component -->
-<unit bldFile="app/organizer/clock2/group"/>
-</component>
-</collection>
-<collection name="notepad" long-name="Notepad" level="ui">
-<component name="notepad_help" filter="s60" long-name="Notepad Help">
-<unit bldFile="app/organizer/notepad/help/group"/>
-</component>
-<component name="notepad1" filter="s60" long-name="Notepad Application 1">
-<unit bldFile="app/organizer/notepad/notepad1/group"/>
-</component>
-<component name="txtrecog" filter="s60" long-name="Text Recognizer" plugin="Y">
-<unit bldFile="app/organizer/notepad/txtrecog/group"/>
-</component>
-</collection>
-<collection name="searchui" long-name="Search UI" level="app">
-<!-- consider making this a single component -->
-<!-- Uncomment all units when configuration is in place. All currently #included from searchui_build, which should be removed at the same time. -->
-<component name="searchui_help" filter="s60" long-name="Search UI Help" class="placeholder">
-<!--<unit bldFile="searchui/help/group"/>-->
-</component>
-<component name="searchapp" filter="s60" long-name="Search Application" class="placeholder">
-<!--<unit bldFile="searchui/searchapp/group"/>-->
-</component>
-<component name="searchui_build" filter="s60" long-name="Search UI Build">
-<unit bldFile="app/organizer/searchui/group"/>
-</component>
-</collection>
-<collection name="pimappservices" long-name="PIM Application Services" level="services">
-<component name="calendar" long-name="Calendar" introduced="9.2" purpose="optional">
-<unit bldFile="app/organizer/pimappservices/calendar/group" mrp="app/organizer/pimappservices/calendar/group/app-engines_calendar.mrp" version="2"/>
-</component>
-<component name="calendarvcalplugin" long-name="Calendar vCal Plugin" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="app/organizer/pimappservices/calendarvcalplugin/group" mrp="app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp" version="2"/>
-</component>
-<component name="appenginesdocs" long-name="Application Engines Documentation" purpose="development" class="doc">
-<unit mrp="app/organizer/pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
-</component>
-</collection>
-<collection name="pimappsupport" long-name="PIM Application Support" level="support">
-<component name="vcardandvcal" long-name="vCard and vCal" introduced="ER5" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/vcardandvcal/group" mrp="app/organizer/pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
-</component>
-<component name="chinesecalendarconverter" long-name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
-</component>
-<component name="chinesecalendaralg" long-name="Chinese Calendar Algorithm" introduced="S^3" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendaralg/group" mrp="app/organizer/pimappsupport/chinesecalendaralg/group/app-services_chinesecalendaralgorithm.mrp"/>
-</component>
-</collection>
-<collection name="organizer_info" long-name="Organizer Application Suite Info" level="app">
-<component name="organizer_metadata" long-name="Organizer Application Suite Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="mail eng base ui">
-<collection name="msg_pub" long-name="Messaging Apps Public APIs" level="ui">
-<component name="messaging_integration_api" long-name="Messaging Integration API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/messaging_integration_api/group"/>
-</component>
-<component name="plugin_bio_control_api" long-name="Plug-in Bio Control API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/plugin_bio_control_api/group"/>
-</component>
-<component name="mms_client_mtm_api" long-name="MMS Client MTM API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/mms_client_mtm_api/group"/>
-</component>
-<component name="open_new_message_notification_api" long-name="Open New Message Notification API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/open_new_message_notification_api/group"/>
-</component>
-<component name="messaging_editor_constants_api" long-name="Messaging Editor Constants API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/messaging_editor_constants_api/group"/>
-</component>
-</collection>
-<collection name="msg_plat" long-name="Messaging Apps Platform APIs" level="ui">
-<component name="smil_player_launch_api" long-name="SMIL Player Launch API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/smil_player_launch_api/group"/>
-</component>
-<component name="messaging_media_resolver_api" long-name="Messaging Media Resolver API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/messaging_media_resolver_api/group"/>
-</component>
-<component name="smil_engine_api" long-name="SMIL Engine API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/smil_engine_api/group"/>
-</component>
-<component name="mms_server_settings_api" long-name="MMS Server Settings API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_server_settings_api/group"/>
-</component>
-<component name="new_contacts_note_secondary_display_api" long-name="New Contacts Note Secondary Display API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contacts_note_secondary_display_api/group"/>
-</component>
-<component name="messaging_center_ui_utilities_api" long-name="Messaging Center UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/messaging_center_ui_utilities_api/group"/>
-</component>
-<component name="internet_mail_mtm_ui_api" long-name="Internet Mail MTM UI API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/internet_mail_mtm_ui_api/group"/>
-</component>
-<component name="messaging_editor_api" long-name="Messaging Editor API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/messaging_editor_api/group"/>
-</component>
-<component name="email_domain_utilities_api" long-name="Email Domain Utilities API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/email_domain_utilities_api/group"/>
-</component>
-<component name="smil_transition_api" long-name="SMIL Transition API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/smil_transition_api/group"/>
-</component>
-<component name="new_contacts_note_status_api" long-name="New Contacts Note Status API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contacts_note_status_api/group"/>
-</component>
-<component name="unified_editor_video_conversion_api" long-name="Unified Editor Video Conversion API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/unified_editor_video_conversion_api/group"/>
-</component>
-<component name="mms_conformance_api" long-name="MMS Conformance API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_conformance_api/group"/>
-</component>
-<component name="new_contacts_note_variables_api" long-name="New Contacts Note Variables API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contacts_note_variables_api/group"/>
-</component>
-<component name="new_message_notification_api" long-name="New Message Notification API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_message_notification_api/group"/>
-</component>
-<component name="mms_application_api" long-name="MMS Application API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_application_api/group"/>
-</component>
-<component name="mms_engine_settings_api" long-name="MMS Engine Settings API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_engine_settings_api/group"/>
-</component>
-<component name="mms_codec_client_api" long-name="MMS Codec Client API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_codec_client_api/group"/>
-</component>
-<component name="send_ui_meeting_request_api" long-name="Send UI Meeting Request API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/send_ui_meeting_request_api/group"/>
-</component>
-<component name="new_contact_notes_extended_api" long-name="New Contact Notes Extended API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contact_notes_extended_api/group"/>
-</component>
-<component name="mail_ui_constants_api" long-name="Mail UI Constants API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mail_ui_constants_api/group"/>
-</component>
-<component name="sim_dialog_launch_api" long-name="SIM Dialog Launch API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/sim_dialog_launch_api/group"/>
-</component>
-</collection>
-<collection name="mobilemessaging" long-name="Mobile Messaging" level="ui">
-<component name="audiomsg" filter="s60" long-name="Audio Message">
-<unit bldFile="app/messaging/mobilemessaging/audiomsg/group"/>
-</component>
-<component name="msgmedia" filter="s60" long-name="Message Media">
-<unit bldFile="app/messaging/mobilemessaging/msgmedia/group"/>
-</component>
-<component name="unieditor" filter="s60" long-name="Unified Editor">
-<unit bldFile="app/messaging/mobilemessaging/unieditor/group"/>
-</component>
-<component name="mmsui" filter="s60" long-name="MMS UI">
-<unit bldFile="app/messaging/mobilemessaging/mmsui/group"/>
-</component>
-<component name="postcard" filter="s60" long-name="Postcard">
-<unit bldFile="app/messaging/mobilemessaging/postcard/group"/>
-</component>
-<component name="smilui" filter="s60" long-name="SMIL UI">
-<unit bldFile="app/messaging/mobilemessaging/smilui/group"/>
-</component>
-<component name="smum" filter="s60" long-name="SMS UI MTM and UI Data MTM" plugin="Y">
-<unit bldFile="app/messaging/mobilemessaging/smum/group"/>
-</component>
-<component name="smsui" filter="s60" long-name="SMS UI">
-<unit bldFile="app/messaging/mobilemessaging/smsui/group"/>
-</component>
-<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/mobilemessaging/smsmtm/group" mrp="app/messaging/mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
-</component>
-</collection>
-<collection name="mmsengine" long-name="MMS Engine" level="eng">
-<component name="mmsconninit" filter="s60" long-name="MMS Connection Initiator" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsconninit/bld"/> -->
-</component>
-<component name="genutils" filter="s60" long-name="General Utils" class="placeholder">
-<!-- <unit bldFile="mmsengine/genutils/bld"/> -->
-</component>
-<component name="mmsserversettings" filter="s60" long-name="MMS Server Settings" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserversettings/bld"/> -->
-</component>
-<component name="mmsmessage" filter="s60" long-name="MMS Message" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsmessage/bld"/> -->
-</component>
-<component name="mmshttptransport" filter="s60" long-name="MMS HTTP Transport" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmshttptransport/bld"/> -->
-</component>
-<component name="mmscodec" filter="s60" long-name="MMS Codec" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodec/bld"/> -->
-</component>
-<component name="mmsserver" filter="s60" long-name="MMS Server" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserver/bld"/> -->
-</component>
-<component name="clientmtm" filter="s60" long-name="MMS Client MTM" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/clientmtm/bld"/> -->
-</component>
-<component name="mmswatcher" filter="s60" long-name="MMS Watcher" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmswatcher/bld"/> -->
-</component>
-<component name="mmspushhandler" filter="s60" long-name="MMS Push Handler" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmspushhandler/bld"/> -->
-</component>
-<component name="applicationadapter" filter="s60" long-name="MMS Application Adapter" class="placeholder">
-<!-- <unit bldFile="mmsengine/applicationadapter/bld"/> -->
-</component>
-<component name="mmscodecclient" filter="s60" long-name="MMS Codec Client" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodecclient/bld"/> -->
-</component>
-<component name="mmssettings" long-name="MMS Settings" introduced="9.2" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmssettings/group" mrp="app/messaging/mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
-</component>
-<component name="mmsconf" long-name="MMS Configuration" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmsconf" mrp="app/messaging/mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
-</component>
-<component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
-<!-- this bld.inf should be broken up into the individual other components -->
-<unit bldFile="app/messaging/mmsengine/group"/>
-</component>
-</collection>
-<collection name="messagingappbase" long-name="Messaging App Base" level="base">
-<component name="msgavkon" filter="s60" long-name="Messaging Avkon UI">
-<unit bldFile="app/messaging/messagingappbase/msgavkon/group"/>
-</component>
-<component name="mce" filter="s60" long-name="Message Center Application">
-<unit bldFile="app/messaging/messagingappbase/mce/group"/>
-</component>
-<component name="mceextraitems" filter="s60" long-name="Message Center Extra Items">
-<unit bldFile="app/messaging/messagingappbase/mceextraitems/group"/>
-</component>
-<component name="mcesettings" filter="s60" long-name="Message Center Settings">
-<unit bldFile="app/messaging/messagingappbase/mcesettings/group"/>
-</component>
-<component name="msgerrorwatcher" filter="s60" long-name="Messaging Error Watcher" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/msgerrorwatcher/group"/>
-</component>
-<component name="ncnlist" filter="s60" long-name="New Contacts Note List">
-<unit bldFile="app/messaging/messagingappbase/ncnlist/group"/>
-</component>
-<component name="schemeplugin" filter="s60" long-name="Scheme Handler Plugin" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/schemeplugin/group"/>
-</component>
-<component name="sendui" filter="s60" long-name="Send UI" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/sendui/group"/>
-</component>
-<component name="smilengine" filter="s60" long-name="SMIL Engine">
-<unit bldFile="app/messaging/messagingappbase/smilengine/group"/>
-</component>
-<component name="bium" filter="s60" long-name="BIO UI MTM" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/bium/group"/>
-</component>
-<component name="smartmessaging" filter="s60" long-name="Smart Messaging">
-<unit bldFile="app/messaging/messagingappbase/smartmessaging/group"/>
-</component>
-<component name="msgeditor" filter="s60" long-name="Messaging Editor">
-<unit bldFile="app/messaging/messagingappbase/msgeditor/group"/>
-</component>
-<component name="smilparser" long-name="SMIL Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="app/messaging/messagingappbase/smilparser/GROUP" mrp="app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
-</component>
-<component name="obexmtms" long-name="OBEX MTMs" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/obexmtms/Group" mrp="app/messaging/messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
-</component>
-</collection>
-<collection name="email" long-name="Email" level="mail">
-<!-- use commonemail instead -->
-<component name="alwaysonlineemailplugin" filter="s60" long-name="Always Online Mail Plugin" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/alwaysonlineemailplugin/group"/>
-</component>
-<component name="emailnotificationhandler" filter="s60" long-name="Email Notification Handler" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/emailnotificationhandler/group"/>
-</component>
-<component name="imum" filter="s60" long-name="Internet Mail UI MTM" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/imum/group"/>
-</component>
-<component name="mail" filter="s60" long-name="Mail Application" deprecated="^3">
-<unit bldFile="app/messaging/email/mail/group"/>
-</component>
-<component name="pop3andsmtpmtm" long-name="POP3 and SMTP MTM" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/pop3andsmtpmtm/group" mrp="app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
-</component>
-<component name="imap4mtm" long-name="IMAP4 MTM" introduced="9.2" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/imap4mtm/group" mrp="app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
-</component>
-</collection>
-<collection name="messaging_info" long-name="Messaging Apps Info" level="ui">
-<component name="messaging_metadata" long-name="Messaging Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commonemail" level="apps" span="2" long-name="Email Apps" levels="service support ui app">
-<collection name="email_pub" long-name="Email Apps Public Interfaces" level="app">
-<component name="email_widget_api" long-name="Email Widget API" filter="s60" class="api">
-<unit bldFile="app/commonemail/email_pub/email_widget_api/group"/>
-</component>
-</collection>
-<collection name="email_plat" long-name="Email Apps Platform Interfaces" level="app">
-<component name="email_client_api" long-name="Email Client API" filter="s60" class="api">
-<unit bldFile="app/commonemail/email_plat/email_client_api/group"/>
-</component>
-<component name="email_setup_plugin_api" long-name="Email Setup Plugin API" filter="s60" class="api">
-<unit bldFile="app/commonemail/email_plat/email_setup_plugin_api/group"/>
-</component>
-</collection>
-<collection name="emailservices" long-name="Email Services" level="service">
-<component name="emailframework" filter="s60" long-name="Email Framework" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailframework/group"/>
-</component>
-<component name="emailclientapi" filter="s60" long-name="Email Client API" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailclientapi/group"/>
-</component>
-<component name="emailserver" filter="s60" long-name="Email Server" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailserver/group"/>
-</component>
-<component name="emailservermonitor" filter="s60" long-name="Email Server Monitor" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailservermonitor/group"/>
-</component>
-<component name="psmruadapter" filter="s60" long-name="Predictive Search Most Recent Used Adapter" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailservices/psmruadapter/group"/>
-</component>
-<component name="emailstore" filter="s60" long-name="Email Store" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailstore/group"/>
-</component>
-<component name="emaildebug" filter="s60" long-name="Email Debug" introduced="^2" class="api">
-<unit bldFile="app/commonemail/emailservices/emaildebug/group"/>
-</component>
-<component name="emailinstallationinitiator" filter="s60" long-name="Email Installation Initiator" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailinstallationinitiator/group"/>
-</component>
-</collection>
-<collection name="ipsservices" long-name="IMAP/POP/SMTP Services" level="service">
-<component name="ipssossettings" filter="s60" long-name="IPS SOS Settings" introduced="^2">
-<!-- SOS? Consider spelling it out since the abbreviation is ambiguous -->
-<unit bldFile="app/commonemail/ipsservices/ipssossettings/group"/>
-</component>
-<component name="ipssosplugin" filter="s60" long-name="IPS SOS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/ipsservices/ipssosplugin/group"/>
-</component>
-<component name="ipssosaoplugin" filter="s60" long-name="IPS SOS Always Online Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/ipsservices/ipssosaoplugin/group"/>
-</component>
-<component name="ipsservices_build" filter="s60" long-name="IPS Services Build" introduced="^2">
-<unit bldFile="app/commonemail/ipsservices/group"/>
-<!-- can the exports be broken up into the other components or made a config component?-->
-</component>
-</collection>
-<collection name="emailcontacts" long-name="Email Contacts" level="support">
-<component name="contactactionservice" filter="s60" long-name="Contact Action Service" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailcontacts/contactactionservice/group"/>
-</component>
-<component name="contactactionmenu" filter="s60" long-name="Contact Action Menu" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailcontacts/contactactionmenu/group"/>
-</component>
-</collection>
-<collection name="meetingrequest" long-name="Meeting Request" level="ui">
-<component name="mrcommon" filter="s60" long-name="MR Common" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrcommon/group"/>
-</component>
-<component name="mrdb" filter="s60" long-name="MR Database" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrdb/group"/>
-</component>
-<component name="mrpolicy" filter="s60" long-name="MR Policy" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrpolicy/group"/>
-</component>
-<component name="mrservices" filter="s60" long-name="MR Services" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrservices/group"/>
-</component>
-<component name="mrgui" filter="s60" long-name="MR GUI" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrgui/group"/>
-</component>
-<component name="mrentry" filter="s60" long-name="MR Entry" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrentry/group"/>
-</component>
-<component name="mrtasks" filter="s60" long-name="MR Tasks" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrtasks/group"/>
-</component>
-<component name="mrutils" filter="s60" long-name="MR Utils" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrutils/group"/>
-</component>
-<component name="mrutilscalplugin" filter="s60" long-name="MR Utils Calendar Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mrutilscalplugin/group"/>
-</component>
-<component name="mrviewer" filter="s60" long-name="MR Viewer" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrviewer/group"/>
-</component>
-<component name="mrviewercalplugin" filter="s60" long-name="MR Viewer Calendar Plugin" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrviewercalplugin/group"/>
-</component>
-<component name="mricalviewer" filter="s60" long-name="MR iCal Viewer" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mricalviewer/group"/>
-</component>
-<component name="mrversit2" filter="s60" long-name="MR Versit2" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrversit2/group"/>
-</component>
-<component name="mragnversit2" filter="s60" long-name="MR Agenda Versit2" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mragnversit2/group"/>
-</component>
-<component name="mrcasplugin" filter="s60" long-name="MR Contact Action Service Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mrcasplugin/group"/>
-</component>
-<component name="mrurlparserplugin" filter="s60" long-name="MR URL Parser Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mrurlparserplugin/group"/>
-</component>
-<component name="meetingrequest_build" filter="s60" long-name="MR Build" introduced="^2">
-<!-- can the exports be broken up into the other components ?
- alternatively, move the exports into a RM Config component-->
-<unit bldFile="app/commonemail/meetingrequest/group"/>
-</component>
-</collection>
-<collection name="emailuis" long-name="Email UIs" level="app">
-<component name="emailui" filter="s60" long-name="Email UI" introduced="^2">
-<unit bldFile="app/commonemail/emailuis/emailui/group"/>
-</component>
-<component name="gsemailsettings" filter="s60" long-name="Email GS Settings" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailuis/gsemailsettings/group"/>
-</component>
-<component name="uicomponents" filter="s60" long-name="Email UI Components" introduced="^2">
-<unit bldFile="app/commonemail/emailuis/uicomponents/group"/>
-</component>
-<component name="widget" filter="s60" long-name="Email Widget" introduced="^2">
-<!-- Uncomment unit when configuration is in place. Currently #included from emailuis_build, which should be removed at the same time. -->
-<!--<unit bldFile="emailuis/widget/group"/>-->
-</component>
-<component name="emailuis_build" filter="s60" long-name="Email UIs Build" introduced="^2">
-<unit bldFile="app/commonemail/emailuis/group"/>
-</component>
-</collection>
-<collection name="commonemail_info" long-name="Email Apps Info" level="app">
-<component name="emailhelp" filter="s60" long-name="Email Help" class="placeholder">
-<!-- should this be commented out or not? -->
-<!-- <unit bldFile="emailhelp/group"/> -->
-</component>
-<component name="commonemail_help" filter="s60" long-name="Email Help" introduced="^2" class="placeholder">
-<!-- should this be commented out or not? -->
-<!-- <unit bldFile="help/group"/> -->
-</component>
-</collection>
-</block>
-<block name="conversations" level="apps" long-name="Conversation Apps" levels="settings utils plugin ui">
-<collection name="conversations_plat" long-name="Conversation Apps Platform Interfaces" level="ui">
-<component name="im_cv_launcher_api" long-name="IM CV Launcher API" filter="s60" class="api">
-<unit bldFile="app/conversations/conversations_plat/im_cv_launcher_api/group"/>
-</component>
-<component name="im_connection_api" long-name="IM Connection API" filter="s60" class="api">
-<unit bldFile="app/conversations/conversations_plat/im_connection_api/group"/>
-</component>
-<component name="im_cv_appui_api" long-name="IM CV App UI API" filter="s60" class="api">
-<unit bldFile="app/conversations/conversations_plat/im_cv_appui_api/group"/>
-</component>
-</collection>
-<collection name="uiservicetabsettings" long-name="UI Service Tab Settings" level="settings">
-<!-- this is really at the wrong rank. should move down a directory -->
-<component name="vimpstsettings" filter="s60" long-name="VIMP Service Tab Settings">
-<unit bldFile="app/conversations/uiservicetabsettings/group"/>
-</component>
-</collection>
-<collection name="instantmessagesalert" long-name="Instant Messages Alert" level="utils">
-<!-- this is really at the wrong rank. should move down a directory -->
-<component name="instantmessagesalert_build" filter="s60" long-name="Instant Messages Alert build" introduced="^3">
-<unit bldFile="app/conversations/instantmessagesalert/group"/>
-</component>
-</collection>
-<collection name="imstutils" long-name="IM Service Tab Utils" level="utils">
-<component name="imstutils_help" filter="s60" long-name="IM Service Tab Help">
-<unit bldFile="app/conversations/imstutils/help/group"/>
-</component>
-<component name="imconnectionprovider" filter="s60" long-name="IM Connection Provider" plugin="Y">
-<unit bldFile="app/conversations/imstutils/imconnectionprovider/group"/>
-</component>
-<component name="xmppadapter" filter="s60" long-name="XMPP Settings Adapter" plugin="Y">
-<unit bldFile="app/conversations/imstutils/xmppadapter/group"/>
-</component>
-<component name="imconversationview" filter="s60" long-name="IM Conversation View">
-<unit bldFile="app/conversations/imstutils/imconversationview/group"/>
-</component>
-<component name="imstutils_config" filter="s60" long-name="IM Service Tab Utils config" class="config">
-<!-- remove the #includes and or moved ithe loc file into one the above components -->
-<unit bldFile="app/conversations/imstutils/group"/>
-</component>
-</collection>
-<collection name="uiservicetab" long-name="UI Service Tab" level="ui">
-<component name="vimpstutils" filter="s60" long-name="VIMP Service Tab Utilities">
-<!-- need to spell out VIMP at least once -->
-<unit bldFile="app/conversations/uiservicetab/vimpstutils/group"/>
-</component>
-<component name="vimpststorage" filter="s60" long-name="VIMP Service Tab Storage">
-<unit bldFile="app/conversations/uiservicetab/vimpststorage/group"/>
-</component>
-<component name="vimpstengine" filter="s60" long-name="VIMP Service Tab Engine">
-<unit bldFile="app/conversations/uiservicetab/vimpstengine/group"/>
-</component>
-<component name="vimpstcmdprocess" filter="s60" long-name="VIMP Service Tab Command Process">
-<unit bldFile="app/conversations/uiservicetab/vimpstcmdprocess/group"/>
-</component>
-<component name="vimpstui" filter="s60" long-name="VIMP Service Tab UI">
-<unit bldFile="app/conversations/uiservicetab/vimpstui/group"/>
-</component>
-<component name="vimpstdetailsviewplugin" filter="s60" long-name="VIMP ST Details View Plugin" plugin="Y">
-<unit bldFile="app/conversations/uiservicetab/vimpstdetailsviewplugin/group"/>
-</component>
-<component name="uiservicetab_build" filter="s60" long-name="UI Service Tab Build">
-<!-- can this be distributed into the above bld.infs? -->
-<unit bldFile="app/conversations/uiservicetab/group"/>
-</component>
-</collection>
-<collection name="servicewidget" long-name="Service Widget" level="ui">
-<component name="servicewidgetdatapublisher" filter="s60" long-name="Service Widget Data Publisher" plugin="Y">
-<unit bldFile="app/conversations/servicewidget/servicewidgetdatapublisher/group"/>
-</component>
-<component name="themes" filter="s60" long-name="Service Widget Themes" class="config">
-<!-- does this really need to have that number in the directory name? -->
-<unit bldFile="app/conversations/servicewidget/themes/install-themes/install/servicewidget_20021383/group"/>
-</component>
-<component name="servicewidget_build" filter="s60" long-name="Service Widget Build">
-<!-- Either move the whole collection down one directory into a single component, or move the ROM and SIS parts into a Service Widget ROM component -->
-<unit bldFile="app/conversations/servicewidget/group"/>
-</component>
-</collection>
-<collection name="instantmsgindicatorplugin" long-name="Instant Message Indicator Plugin" level="plugin">
-<!-- collection is really a component. should move down a directory -->
-<component name="instantmsgindicatorplugin_build" filter="s60" long-name="Instant Message Indicator Plugin Build" introduced="^3" plugin="Y">
-<unit bldFile="app/conversations/instantmsgindicatorplugin/group"/>
-</component>
-</collection>
-<collection name="imstatuspaneindicatorplugin" long-name="IM Status Pane Indicator Plugin" level="plugin">
-<!-- collection is really a component. should move down a directory -->
-<component name="imstatuspaneindicatorplugin_build" filter="s60" long-name="IM Status Pane Indicator Plugin Build" introduced="^3" plugin="Y">
-<unit bldFile="app/conversations/imstatuspaneindicatorplugin/group"/>
-</component>
-</collection>
-<collection name="conversations_info" long-name="Conversation Apps Info" level="ui">
-<component name="conversations_build" filter="s60" long-name="Conversation Apps Build">
-<!-- can the exports be moved to other components? or this remade into a configuration component?-->
-<unit bldFile="app/conversations/group"/>
-</component>
-</collection>
-</block>
-<block name="im" level="apps" long-name="Instant Messaging Apps" levels="support prot engine apps">
-<collection name="im_plat" long-name="Instant Messaging Apps Platform Interfaces" level="apps">
-<component name="wv_sap_settings_api" long-name="WV SAP Settings API" filter="s60" class="api">
-<unit bldFile="app/im/im_plat/wv_sap_settings_api/group"/>
-</component>
-</collection>
-<collection name="wvsettings20" long-name="Wireless Village Settings Engine" level="support">
-<!-- this is really a component. should move down a directory -->
-<component name="wvsapsettingsstore" long-name="WV SAP Settings Store" filter="s60" introduced="9.3">
-<unit bldFile="app/im/wvsettings20/group"/>
-</component>
-</collection>
-</block>
-<block name="dictionary" level="services" long-name="Dictionary" levels="utils ui">
-<collection name="dictionary_plat" long-name="Dictionary Platform Interfaces" level="ui">
-<component name="menu_suites_macros_api" long-name="Menu Suites Macros API" filter="s60" class="api">
-<unit bldFile="app/dictionary/dictionary_plat/menu_suites_macros_api/group"/>
-</component>
-</collection>
-<collection name="userdict" long-name="User Dictionary" level="ui">
-<!-- collection is really a component, move down a dir -->
-<component name="userdict_build" filter="s60" long-name="Japanese User Dictionary">
-<unit bldFile="app/dictionary/userdict/group"/>
-</component>
-</collection>
-</block>
-<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"/>
-</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"/>
-</component>
-</collection>
-<collection name="camerauis" long-name="Camera UIs">
-<component name="activepalette" filter="s60" long-name="Active Palette">
-<unit bldFile="app/camera/camerauis/activepalette/group"/>
-</component>
-<component name="cameraapp" filter="s60" long-name="Camera Application">
-<unit bldFile="app/camera/camerauis/cameraapp/group"/>
-<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">
-<component name="image_editor_debug_utilities_api" long-name="Image Editor Debug Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
-</component>
-<component name="image_editor_utilities_api" long-name="Image Editor Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_utilities_api/group"/>
-</component>
-<component name="image_editor_definitions_api" long-name="Image Editor Definitions API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_definitions_api/group"/>
-</component>
-<component name="image_editor_system_parameters_api" long-name="Image Editor System Parameters API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_system_parameters_api/group"/>
-</component>
-<component name="image_processing_engine_api" long-name="Image Processing Engine API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_processing_engine_api/group"/>
-</component>
-</collection>
-<collection name="imageeditor" long-name="Image Editor UI" level="ui">
-<component name="pb" filter="s60" long-name="Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/pb/group"/>
-</component>
-<component name="iepb" filter="s60" long-name="Image Editor Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/iepb/group"/>
-</component>
-<component name="imageeditorui" filter="s60" long-name="Image Editor UI">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorui/group"/>
-</component>
-<component name="imageeditormanager" filter="s60" long-name="Image Editor Manager">
-<unit bldFile="app/imgeditor/imageeditor/imageeditormanager/group"/>
-</component>
-<component name="imageeditorapp" filter="s60" long-name="Image Editor Application">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorapp/group"/>
-</component>
-<component name="imageeditor_plugins" filter="s60" long-name="Image Editor Plugins" plugin="Y">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditor/plugins/blackwhiteplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/brightnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/bubbleplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cartoonizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/clipartplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/contrastplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cropplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/drawplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/frameplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/negativeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/redeyeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/resizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotatelplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotaterplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/textplugin/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditor/plugins/drawplugin/group"/>
- -->
-</component>
-<component name="editorprovider" filter="s60" long-name="Image Editor Provider">
-<unit bldFile="app/imgeditor/imageeditor/editorprovider/group"/>
-</component>
-<component name="imageeditor_build" filter="s60" long-name="Image Editor Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditor/group"/>
-</component>
-</collection>
-<collection name="imageeditorengine" long-name="Image Editor Engine" level="engine">
-<component name="filters" filter="s60" long-name="Image Editor Filters">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbrightness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbubble/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbuffer/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercartoon/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterclipart/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercontrast/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercrop/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterdraw/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterframe/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtergrayscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtericlsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegtarget/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filternegate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterredeye/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterrotate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtertext/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
- -->
-</component>
-<component name="imageeditorutils" filter="s60" long-name="Image Editor Utilities">
-<unit bldFile="app/imgeditor/imageeditorengine/imageeditorutils/group"/>
-</component>
-<component name="systemparameters" filter="s60" long-name="System Parameters">
-<unit bldFile="app/imgeditor/imageeditorengine/systemparameters/group"/>
-</component>
-<component name="enginewrapper" filter="s60" long-name="Image Editor Engine Wrapper">
-<unit bldFile="app/imgeditor/imageeditorengine/enginewrapper/group"/>
-</component>
-<component name="imageeditorengine_build" filter="s60" long-name="Image Editor Engine Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoeditor" level="apps" long-name="Video Editor Apps" levels="engine ui">
-<collection name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" level="ui">
-<component name="video_editor_engine_api" long-name="Video Editor Engine API" introduced="^2" class="api">
-<unit bldFile="app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
-</component>
-</collection>
-<collection name="videditor" long-name="Video Editor" level="ui">
-<component name="videoeditorcommon" filter="s60" long-name="Video Editor Common" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditorcommon/group"/>
-</component>
-<component name="videoeditoruicomponents" filter="s60" long-name="Video Editor UI Components" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditoruicomponents/group"/>
-</component>
-<component name="simplevideoeditor" filter="s60" long-name="Simple Video Editor" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplevideoeditor/group"/>
-</component>
-<component name="simplecutvideo" filter="s60" long-name="Simple Cut Video" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplecutvideo/group"/>
-</component>
-<component name="videoprovider" filter="s60" long-name="Video Provider" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoprovider/group"/>
-</component>
-<component name="manualvideoeditor" filter="s60" long-name="Manual Video Editor" introduced="^2" class="placeholder">
-<!-- uncomment when supported
- <meta rel="config">
- <defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
- </meta>
- <unit bldFile="videditor/manualvideoeditor/group"/> -->
-</component>
-<component name="videditor_build" filter="s60" long-name="Video Editor Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videditor/group"/>
-</component>
-</collection>
-<collection name="videoeditorengine" long-name="Video Editor Engine" level="engine">
-<component name="audioeditorengine" filter="s60" long-name="Audio Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/audioeditorengine/group"/>
-</component>
-<component name="avcedit" filter="s60" long-name="AVC Editing" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/avcedit/group"/>
-</component>
-<component name="h263decoder" filter="s60" long-name="H.263 Decoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/h263decoder/group"/>
-</component>
-<component name="mp3aacmaniplib" filter="s60" long-name="MP3 and AAC Manipulation Library" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
-</component>
-<component name="vedtranscoder" filter="s60" long-name="Video Editor Transcoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedtranscoder/group"/>
-</component>
-<component name="vedengine" filter="s60" long-name="Video Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedengine/group"/>
-</component>
-<component name="videoeditorengine_build" filter="s60" long-name="Video Editor Engine Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videoeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
-<collection name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" level="apps">
-<component name="videoplayer_startup_api" long-name="Video Player Startup API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videoplayer_startup_api/group" filter="!test"/>
-</component>
-<component name="video_player_file_details_dialog_api" long-name="Media Player File Details Dialog API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/video_player_file_details_dialog_api/group" filter="!test"/>
-</component>
-<component name="videocollection_api" long-name="Video Collection API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videocollection_api/group"/>
-</component>
-</collection>
-<collection name="videofeeds" long-name="Video Feeds" level="util">
-<component name="iptv_utils" filter="s60" long-name="IPTV Util" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/utils/group"/>
-</component>
-<component name="viewmessageutility" filter="s60" long-name="View Message Utility" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/viewmessageutility/group"/>
-</component>
-<component name="vcxnotifier" filter="s60" long-name="Video Connection Notifier" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/vcxnotifier/group"/>
-</component>
-<component name="vccommon" filter="s60" long-name="Video Connection Common" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/vccommon/group"/>
-</component>
-<component name="clientapi" long-name="Server Client" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/clientapi/group"/>
-</component>
-<component name="provisioningprocessor" long-name="Provisioning Processor" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/provisioningprocessor/group"/>
-</component>
-<component name="mrssplugin" long-name="RSS plugin" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/mrssplugin/group"/>
-</component>
-<component name="videofeeds_server" long-name="Server" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/server/group"/>
-</component>
-<component name="livetvutils" long-name="LiveTV Utils" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/livetvutils/group"/>
-</component>
-<component name="iptvprovisioningrecognizer" long-name="IP TV Provisioning Recognizer" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/provisioningrecognizer/group"/>
-</component>
-<component name="iptvprovisioningappui" long-name="IP TV Provisioning App UI" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/provisioningappui/group"/>
-</component>
-<component name="iptvomaprovisioning" long-name="IP TV OMA Provisioning" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/omaprovisioning/group"/>
-</component>
-<component name="vcnsuiengine" long-name="VoD UI Engine" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/vcnsuiengine/group"/>
-</component>
-<component name="hgvodui" long-name="Ganes UX2.0 VoD UI" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/hgvodui/group"/>
-</component>
-<component name="hgvodplugin" long-name="Ganes UX2.0 VoD UI Plugin" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/hgvodplugin/group"/>
-</component>
-<component name="vcnsscheduleview" long-name="Scheduled Download Settings View" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/vcnsscheduleview/group"/>
-</component>
-<component name="vcnsscheduleplugin" long-name="Scheduled Download Settings Plugin" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/vcnsscheduleplugin/group"/>
-</component>
-<component name="scheduleddlplugin" long-name="Scheduled download plugin" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/scheduleddlplugin/group"/>
-</component>
-</collection>
-<collection name="videocollection" long-name="Video Collection" level="util">
-<component name="mpxmyvideoscollection" filter="s60" long-name="MPX My Videos Collection" introduced="^3">
-<unit bldFile="app/videoplayer/videocollection/mpxmyvideoscollection/group"/>
-</component>
-<component name="myvideosindicatorplugin" filter="s60" long-name="My Videos Indicator Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videocollection/myvideosindicatorplugin/group"/>
-</component>
-<component name="hgmyvideos" filter="s60" long-name="Huriganes My Videos" introduced="^3">
-<unit bldFile="app/videoplayer/videocollection/hgmyvideos/group"/>
-</component>
-<component name="hgmyvideosplugin" filter="s60" long-name="Huriganes My VideosPlugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videocollection/hgmyvideosplugin/group"/>
-</component>
-</collection>
-<collection name="mediasettings" long-name="Media Settings" level="support">
-<!-- this is really a component. Should be moved down a directory -->
-<component name="mediasettings_build" filter="s60" long-name="Media Settings Build">
-<unit bldFile="app/videoplayer/mediasettings/group"/>
-</component>
-<component name="videoplayer_test" filter="s60" purpose="development" long-name="Video Player Apps Test">
-<!-- can only have one unit. Can thes be #included from the above or another bld.inf?-->
-<unit bldFile="app/videoplayer/tsrc/VCXTestCommon/group"/>
-<unit bldFile="app/videoplayer/tsrc/VCXTestUtilModule/group"/>
-<unit bldFile="app/videoplayer/tsrc/VCXTestMyVideosCollectionClient/group"/>
-<unit bldFile="app/videoplayer/mediasettings/mediasettingsengine/tsrc/mediasettingsenginetest/group"/>
-<unit bldFile="app/videoplayer/mediasettings/videoplayersettingsengine/tsrc/vpsettingsenginetest/group"/>
-</component>
-</collection>
-<collection name="filedetails" long-name="File Details" level="support">
-<component name="filedetailsplugin" filter="s60" long-name="File Details Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/filedetails/filedetailsplugin/group"/>
-</component>
-<component name="filedetailsdialog" filter="s60" long-name="File Details Dialog" introduced="^3">
-<unit bldFile="app/videoplayer/filedetails/filedetailsdialog/group"/>
-</component>
-</collection>
-<collection name="videoplayerapp" long-name="Video Player App" level="apps">
-<component name="lwplayer" long-name="Lightweight Player" filter="s60">
-<unit bldFile="app/videoplayer/videoplayerapp/lwplayer/group"/>
-</component>
-<component name="mpxvideoplayer" filter="s60" long-name="MPX Video Player" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayerapp/mpxvideoplayer/group" filter="!test"/>
-</component>
-</collection>
-<collection name="videoplayback" long-name="Video Playback Plugins" level="plugin">
-<component name="videohelix" long-name="Video Helix" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videohelix/group" filter="!test"/>
-</component>
-<component name="videopdlplaybackviewplugin" filter="s60" long-name="Video PDL Playback View Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videopdlplaybackviewplugin/group" filter="!test"/>
-</component>
-<component name="videoplaybackcontrols" filter="s60" long-name="Video Playback Controls" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videoplaybackcontrols/group" filter="!test"/>
-</component>
-<component name="videoplaybackviewplugin" filter="s60" long-name="Video Playback View Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videoplaybackviewplugin/group"/>
-</component>
-<component name="videoplaybackviews" filter="s60" long-name="Video Playback Views" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videoplaybackviews/group" filter="!test"/>
-</component>
-</collection>
-</block>
-<block name="photos" level="apps" long-name="Photos" levels="support fw ui app">
-<collection name="photos_plat" long-name="Photos Platform Interfaces" level="app">
-<component name="collection_plugins_api" long-name="Collection Plugins API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/collection_plugins_api/group"/>
-</component>
-<component name="controllers_collection_api" long-name="Controllers Collection API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/controllers_collection_api/group"/>
-</component>
-<component name="gallery_utilities_api" long-name="Gallery Utilities API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/gallery_utilities_api/group"/>
-</component>
-<component name="slideshow_ui_constants_api" long-name="Slideshow Ui Constants API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/slideshow_ui_constants_api/group"/>
-</component>
-<component name="views_metadatadialog_api" long-name="Views Metadata Dialog API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/views_metadatadialog_api/group"/>
-</component>
-</collection>
-<collection name="photosgallery" long-name="Photos Gallery" level="app">
-<!-- consider splitting this collection into the application itself, and the frameworks behind it -->
-<component name="photosgallery_help" filter="s60" long-name="Photos Help" introduced="^2">
-<unit bldFile="app/photos/photosgallery/help/group"/>
-</component>
-<component name="logging" filter="s60" long-name="Photos Logging" introduced="^2">
-<unit bldFile="app/photos/photosgallery/logging/group"/>
-</component>
-<component name="photosgallery_common" filter="s60" long-name="Photos Common" introduced="^2">
-<unit bldFile="app/photos/photosgallery/common/group"/>
-</component>
-<component name="photosgallery_commonui" filter="s60" long-name="Photos Common UI" introduced="^2">
-<unit bldFile="app/photos/photosgallery/commonui/group"/>
-</component>
-<component name="photosgalleryollectionfw" filter="s60" long-name="Photos Collection Framework" introduced="^2">
-<unit bldFile="app/photos/photosgallery/collectionframework/group"/>
-</component>
-<component name="galleryicons" filter="s60" long-name="Photos Icons" introduced="^2" class="config">
-<unit bldFile="app/photos/photosgallery/icons"/>
-</component>
-<component name="imageviewer" filter="s60" long-name="Image Viewer" introduced="^3">
-<!-- this is really a part of controllers component, #include from there instead -->
-<unit bldFile="app/photos/photosgallery/controllers/imageviewer/group"/>
-</component>
-<component name="photosgalleryviewfw" filter="s60" long-name="View Framework" introduced="^2">
-<unit bldFile="app/photos/photosgallery/viewframework/group"/>
-</component>
-<component name="controllers" filter="s60" long-name="Photos Controllers" introduced="^2">
-<unit bldFile="app/photos/photosgallery/controllers/group"/>
-</component>
-<component name="photogallery" filter="s60" long-name="Media Gallery" introduced="^2">
-<unit bldFile="app/photos/photosgallery/gallery/group"/>
-</component>
-<component name="slideshow" filter="s60" long-name="Slideshow" introduced="^2">
-<unit bldFile="app/photos/photosgallery/slideshow/group"/>
-</component>
-<component name="memoryplugin" long-name="Memory Plugin" filter="s60" introduced="^2" plugin="Y">
-<unit bldFile="app/photos/photosgallery/memoryplugin/group"/>
-</component>
-<component name="imgvwr" filter="s60" long-name="Photos Image Viewer" introduced="^3">
-<unit bldFile="app/photos/photosgallery/imgvwr/group"/>
-</component>
-<component name="photosgallery_build" filter="s60" long-name="Photos Gallery Build" introduced="^2">
-<!-- need to remove the #included above bld.infs from this -->
-<unit bldFile="app/photos/photosgallery/group"/>
-</component>
-</collection>
-</block>
-<block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support hs app">
-<collection name="musicplayer_plat" long-name="Music Player Apps Platform Interfaces" level="app">
-<component name="mpx_music_player_app_api" long-name="MPX Music Player App API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_app_api/group"/>
-</component>
-<component name="mpx_music_player_commonui_api" long-name="MPX Music Player Common UI API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_commonui_api/group"/>
-</component>
-<component name="mpx_music_player_media_key_handler_api" long-name="MPX Music Player Media Key Handler API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_media_key_handler_api/group"/>
-</component>
-<component name="mpx_music_player_remote_control_api" long-name="MPX Music Player Remote Control API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_remote_control_api/group"/>
-</component>
-<component name="mpx_music_shop_ui_api" long-name="MPX Music Shop UI API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_shop_ui_api/group"/>
-</component>
-<component name="mpx_music_wap_adapter_cenrep_api" long-name="MPX Music Wap Adapter CenRep API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_wap_adapter_cenrep_api/group"/>
-</component>
-<component name="mpx_music_store_api" long-name="MPX Music Store Find API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_store_api/group"/>
-</component>
-<component name="audio_application_features_api" long-name="Audio Application Features API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/audio_application_features_api/group"/>
-</component>
-<component name="music_content_publisher_plugin_api" long-name="Music Content Publisher Plugin API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/music_content_publisher_plugin_api/group"/>
-</component>
-</collection>
-<collection name="mpxmusicplayer" long-name="MPX Music Player" level="app">
-<component name="mpxmusicplayer_help" filter="s60" long-name="Help">
-<unit bldFile="app/musicplayer/mpxmusicplayer/help/group"/>
-</component>
-<component name="mpxmusicplayer_commonui" filter="s60" long-name="MPX Common UI">
-<unit bldFile="app/musicplayer/mpxmusicplayer/commonui/group"/>
-</component>
-<component name="mpx_metadatahandler" filter="s60" long-name="MPX Metadata Handler">
-<unit bldFile="app/musicplayer/mpxmusicplayer/metadatahandler/group"/>
-</component>
-<component name="mediakeyhandler" filter="s60" long-name="MPX Media Key Handler">
-<unit bldFile="app/musicplayer/mpxmusicplayer/mediakeyhandler/group"/>
-</component>
-<component name="mpxmusicplayer_app" filter="s60" long-name="MPX Application">
-<unit bldFile="app/musicplayer/mpxmusicplayer/app/group"/>
-</component>
-<component name="mpxmusicplayer_build" filter="s60" long-name="MPX Music Player Build">
-<!-- can the exports be distributed to the above components? -->
-<unit bldFile="app/musicplayer/mpxmusicplayer/group"/>
-</component>
-</collection>
-<collection name="musichomescreen_multiview" long-name="Music Home Screen Multiview" level="hs">
-<!-- Uncomment all units when configuration is in place. All currently #included from musichomescreen_build -->
-<component name="mpxcollectionpublisher" filter="s60" long-name="MPX Collection Publisher" introduced="^2" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/mpxcollectionpublisher/group"/>-->
-</component>
-<component name="musiccontentpublisher" filter="s60" long-name="Music Content Publisher" introduced="^2" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/musiccontentpublisher/group"/>-->
-</component>
-<component name="mcpmusicplayer" filter="s60" long-name="Music Player MCP Plugin" introduced="^2" plugin="Y" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/mcpmusicplayer/group"/>-->
-</component>
-<component name="musicplayeractionhandlerplugin" filter="s60" long-name="Music Player Action Handler Plugin" introduced="^2" plugin="Y" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/musicplayeractionhandlerplugin/group"/>-->
-</component>
-<component name="mpx_data" filter="s60" long-name="MPX Data" introduced="^2" class="placeholder">
-<!-- does this make sense to be a component? should it just be #include from musichomescreen_multiview/group? -->
-<!--<unit bldFile="musichomescreen_multiview/data/themes/default/group"/>-->
-</component>
-<component name="musichomescreen_build" filter="s60" long-name="Music Homescreen Multiview Build" introduced="^2">
-<unit bldFile="app/musicplayer/musichomescreen_multiview/group"/>
-</component>
-</collection>
-<collection name="mpxplugins" long-name="MPX Plugins" level="plugins">
-<component name="serviceplugins" filter="s60" long-name="MPX Service Plugins" plugin="Y">
-<unit bldFile="app/musicplayer/mpxplugins/serviceplugins/group"/>
-</component>
-<component name="viewplugins" filter="s60" long-name="MPX View Plugins" plugin="Y">
-<unit bldFile="app/musicplayer/mpxplugins/viewplugins/group"/>
-</component>
-<component name="mpxplugins_build" filter="s60" long-name="MPX Plugins Build">
-<!-- can the exports be distributed to the above components? -->
-<unit bldFile="app/musicplayer/mpxplugins/group"/>
-</component>
-</collection>
-<collection name="musicplayer_info" long-name="Music Player Apps Info" level="app">
-<component name="musicplayer_build" filter="s60" long-name="Music Player Build">
-<!-- should explicitly #inlcude musicplayerbldvariant.hrh in each component -->
-<unit bldFile="app/musicplayer/group"/>
-</component>
-</collection>
-</block>
-<block name="radio" level="apps" long-name="Radio Apps" levels="engine ui">
-<collection name="fmradio" long-name="FM Radio" level="ui">
-<component name="activeidleengine" filter="s60" long-name="FM Radio Active Idle Engine">
-<unit bldFile="app/radio/fmradio/activeidleengine/group"/>
-</component>
-<component name="fmradioengine" filter="s60" long-name="FM Radio Engine">
-<unit bldFile="app/radio/fmradio/fmradioengine/group"/>
-</component>
-<component name="fmradioactionhandler" filter="s60" long-name="FM Radio Action Handler" plugin="Y">
-<unit bldFile="app/radio/fmradio/fmradioactionhandler/group"/>
-</component>
-<component name="fmradiomcpplugin" filter="s60" long-name="FM Radio Content Publisher Plugin" plugin="Y">
-<unit bldFile="app/radio/fmradio/fmradiomcpplugin/group"/>
-</component>
-<component name="fmradio_build" filter="s60" long-name="FM Radio Build">
-<unit bldFile="app/radio/fmradio/fmradio/group"/>
-</component>
-<component name="fmradio_help" filter="s60" long-name="FM Radio Help">
-<unit bldFile="app/radio/fmradio/help/group"/>
-</component>
-<component name="fmradio_build" filter="s60" long-name="FM Radio ROM">
-<!-- remove above #included bld.infs -->
-<unit bldFile="app/radio/fmradio/group"/>
-</component>
-</collection>
-</block>
-<block name="internetradio" level="apps" long-name="Internet Radio Apps"/>
-<block name="tv" level="services" long-name="TV Apps"/>
-<block name="voicerec" level="apps" long-name="Voice Recorder Apps">
-<!-- custom filter pref_test-->
-<collection name="voicerec_plat" long-name="Voice Recorder Apps Platform Interfaces">
-<component name="new_file_service_api" long-name="New File Service API" filter="s60" class="api">
-<unit bldFile="app/voicerec/voicerec_plat/new_file_service_api/group"/>
-</component>
-<component name="voicerecorder_public_constants_api" long-name="Voice Recorder Public Constants API" filter="s60" class="api">
-<unit bldFile="app/voicerec/voicerec_plat/voicerecorder_public_constants_api/group"/>
-</component>
-</collection>
-<collection name="voicerecorder" long-name="Voice Recorder">
-<!--this is really a component, move down a directory -->
-<component name="voicerecorder_build" filter="s60" long-name="Voice Recorder Build">
-<unit bldFile="app/voicerec/voicerecorder/group"/>
-</component>
-</collection>
-<collection name="voicerec_info" long-name="Voice Recorder Apps Info"/>
-</block>
-<block name="screensaver" level="apps" long-name="Screen Saver Apps" levels="plugin ui">
-<!-- is this a user-facing application or a daemon? -->
-<!-- units need to be commented out until configuration is in place. They are currently #included from screensaver_build-->
-<collection name="scrsaver" long-name="Screen Saver" level="plugin">
-<component name="scrsaverplugins" filter="s60" long-name="Screen Saver Plugins" plugin="Y">
-<!-- must have only one component. #include from a common bld.inf, or move up a directory and make scrsaverplugins a collection -->
-<!--<unit bldFile="scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/"/>
- <unit bldFile="scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/group/"/>-->
-</component>
-<component name="scrsaver_slideshowplugin" filter="s60" long-name="Screen Saver Slideshow Plugin" plugin="Y">
-<!--<unit bldFile="scrsaver/scrsaverplugins/SlideshowPlugin/group"/> -->
-</component>
-<component name="screensaveraiwplugin" filter="s60" long-name="Screen Saver AIW Plugin" plugin="Y">
-<!-- <unit bldFile="scrsaver/screensaveraiwplugin/group"/>-->
-</component>
-</collection>
-<collection name="screensaver_info" long-name="Screen Saver Apps Info" level="ui">
-<component name="screensaver_build" filter="s60" long-name="Screen Saver Application">
-<!--the app should be a separate component -->
-<unit bldFile="app/screensaver/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreen" level="apps" long-name="Home Screen Apps" levels="fw support apps">
-<collection name="homescreen_plat" long-name="Home Screen Apps Platform Interfaces" level="apps">
-<component name="menu_settings_api" long-name="Menu Settings API" filter="s60" class="api">
-<unit bldFile="app/homescreen/homescreen_plat/menu_settings_api/group"/>
-</component>
-<component name="hs_content_control_ui" long-name="HS Content Control Ui" filter="s60" class="api">
-<unit bldFile="app/homescreen/homescreen_plat/hs_content_control_ui/group"/>
-</component>
-<component name="hs_renderingplugin_api" long-name="HS Rendering Plugin API" filter="s60" class="api">
-<unit bldFile="app/homescreen/homescreen_plat/hs_renderingplugin_api/group"/>
-</component>
-</collection>
-<collection name="idlehomescreen" long-name="Idle Home Screen" level="apps">
-<component name="nativeuicontroller" filter="s60" long-name="Native UI Controller">
-<unit bldFile="app/homescreen/idlehomescreen/nativeuicontroller/group"/>
-</component>
-<component name="exths" filter="s60" long-name="Active Idle Container" plugin="Y">
-<!-- why is the ID so different from the name? Is one wrong? -->
-<unit bldFile="app/homescreen/idlehomescreen/exths/group"/>
-</component>
-<component name="hscontentcontrol" filter="s60" long-name="Home Screen Content Control" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/hscontentcontrol/group"/>
-</component>
-<component name="hssapiwrapper" filter="s60" long-name="HS SAPI Wrapper" introduced="^3">
-<!-- can only have one unit. #include from a common bld.inf, or split into two components -->
-<unit bldFile="app/homescreen/idlehomescreen/sapiwrapper/cpswrapper/group"/>
-<unit bldFile="app/homescreen/idlehomescreen/sapiwrapper/hspswrapper/group"/>
-</component>
-<component name="xmluirendering" filter="s60" long-name="XML UI Rendering" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/xmluirendering/group"/>
-</component>
-<component name="xmluicontroller" filter="s60" long-name="XML UI Controller" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/xmluicontroller/group"/>
-</component>
-<component name="widgetmanager" filter="s60" long-name="Widget Manager" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/widgetmanager/group"/>
-</component>
-<component name="idlehomescreen_help" filter="s60" long-name="Idle Home Screen Help">
-<unit bldFile="app/homescreen/idlehomescreen/help/group"/>
-</component>
-<component name="idlehomescreen_data" filter="s60" long-name="Idle Home Screen Data">
-<unit bldFile="app/homescreen/idlehomescreen/data/group"/>
-</component>
-<component name="idlehomescreen_build" filter="s60" long-name="Idle Home Screen Build">
-<!-- can the loc file be moved to another comopnent and this one removed? -->
-<unit bldFile="app/homescreen/idlehomescreen/group"/>
-</component>
-</collection>
-<collection name="menufw" long-name="Menu Framework" level="fw">
-<component name="hierarchynavigator" filter="s60" long-name="Hierarchy Navigator">
-<unit bldFile="app/homescreen/menufw/hierarchynavigator/group"/>
-</component>
-<component name="menufwui" filter="s60" long-name="Menu Framework UI">
-<unit bldFile="app/homescreen/menufw/menufwui/group"/>
-</component>
-<component name="menusuites" filter="s60" long-name="Menu Suites">
-<unit bldFile="app/homescreen/menufw/menusuites/group"/>
-</component>
-<component name="menufw_build" filter="s60" long-name="Menu Framework Build">
-<!-- can the exports be exported by the other components? -->
-<unit bldFile="app/homescreen/menufw/group"/>
-</component>
-</collection>
-<collection name="taskswitcher" long-name="Task Switcher" level="support">
-<component name="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">
-<unit bldFile="app/homescreen/taskswitcher/taskswitcherui/group"/>
-</component>
-</collection>
-</block>
-<block name="graphicsuis" level="services" long-name="Graphics UIs" levels="util ui">
-<collection name="graphicsuis_plat" long-name="Graphics UIs Platform Interfaces" level="ui">
-<component name="svgt_viewer_ui_api" long-name="SVG-T Viewer UI API" filter="s60" class="api">
-<unit bldFile="app/graphicsuis/graphicsuis_plat/svgt_viewer_ui_api/group"/>
-</component>
-<component name="svg_application_observer_utility_api" long-name="SVG Application Observer Utility API" filter="s60" class="api">
-<unit bldFile="app/graphicsuis/graphicsuis_plat/svg_application_observer_utility_api/group"/>
-</component>
-<component name="svgt_file_view_details_dialog_api" long-name="SVG-T File View Details Dialog API" filter="s60" class="api">
-<unit bldFile="app/graphicsuis/graphicsuis_plat/svgt_file_view_details_dialog_api/group"/>
-</component>
-</collection>
-<collection name="svgtviewer" long-name="SVG-T Viewer" level="ui">
-<component name="svgtviewerplugin" filter="s60" long-name="SVG-T Viewer Plugin">
-<unit bldFile="app/graphicsuis/svgtviewer/svgtviewerplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="profile" level="apps" long-name="Profiles" levels="app">
-<collection name="profile_plat" long-name="Profiles Platform Interfaces" level="app">
-<component name="profiles_settings_view_api" long-name="Profiles Settings View API" filter="s60" class="api">
-<unit bldFile="app/profile/profile_plat/profiles_settings_view_api/group"/>
-</component>
-</collection>
-<collection name="profilesapplication" long-name="Profiles Application" level="app">
-<component name="profiles" filter="s60" long-name="Profiles">
-<unit bldFile="app/profile/profilesapplication/profiles/group"/>
-</component>
-</collection>
-<collection name="profile_info" long-name="Profiles Info" level="app">
-<component name="profile_help" filter="s60" long-name="Profiles Help">
-<unit bldFile="app/profile/help/group"/>
-</component>
-</collection>
-</block>
-<block name="speechsrv" level="services" long-name="Speech Recognition UIs" levels="engine framework ui">
-<collection name="speechsrv_plat" long-name="Speech Recognition UIs Platform Interfaces" level="ui">
-<component name="vas_api" long-name="VAS API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vas_api/group"/>
-</component>
-<component name="nss_devasr_api" long-name="NSS DevASR API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_devasr_api/group"/>
-</component>
-<component name="tts_hw_device_api" long-name="TTS HW Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/tts_hw_device_api/group"/>
-</component>
-<component name="voice_commands_resource_header_api" long-name="Voice Commands Resource Header API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/voice_commands_resource_header_api/group"/>
-</component>
-<component name="nss_mmf_tts_custom_commands_api" long-name="NSS MMF TTS Custom Commands API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_mmf_tts_custom_commands_api/group"/>
-</component>
-<component name="srsf_cenrep_settings_api" long-name="SRSF CenRep Settings API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/srsf_cenrep_settings_api/group"/>
-</component>
-<component name="voice_ui_plugin_api" long-name="Voice UI Plug-in API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/voice_ui_plugin_api/group"/>
-</component>
-<component name="nss_tts_utility_api" long-name="NSS TTS Utility API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_tts_utility_api/group"/>
-</component>
-<component name="nss_srs_custom_commands_api" long-name="NSS SRS Custom Commands API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_srs_custom_commands_api/group"/>
-</component>
-<component name="srsf_secondarydisplay_api" long-name="SRSF Secondary Display API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/srsf_secondarydisplay_api/group"/>
-</component>
-<component name="asrs_hw_device_api" long-name="ASRS Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/asrs_hw_device_api/group"/>
-</component>
-<component name="vas_vcommand_api" long-name="VAS Voice Command API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vas_vcommand_api/group"/>
-</component>
-<component name="adaptation_hw_device_api" long-name="Adaptation Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/adaptation_hw_device_api/group"/>
-</component>
-<component name="nss_devtts_api" long-name="NSS DevTTS API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_devtts_api/group"/>
-</component>
-<component name="nss_srs_utility_api" long-name="NSS SRS Utility API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_srs_utility_api/group"/>
-</component>
-<component name="recognition_hw_device_api" long-name="Recognition Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/recognition_hw_device_api/group"/>
-</component>
-<component name="vas_contact_handler_api" long-name="VAS Contact Handler API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vas_contact_handler_api/group"/>
-</component>
-<component name="nlp_hw_device" long-name="NLP Hardware Device" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nlp_hw_device/group"/>
-</component>
-<component name="nss_si_speech_recognition_data_api" long-name="NSS SI Speech Recognition Data API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_si_speech_recognition_data_api/group"/>
-</component>
-<component name="nss_tts_common_api" long-name="NSS TTS Common API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_tts_common_api/group"/>
-</component>
-<component name="grcompiler_hw_device_api" long-name="Grammar Compiler Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/grcompiler_hw_device_api/group"/>
-</component>
-<component name="ttp_hw_device_api" long-name="TTP Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/ttp_hw_device_api/group"/>
-</component>
-<component name="vocman_hw_device_api" long-name="VocMan Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vocman_hw_device_api/group"/>
-</component>
-<component name="speech_synthesis_clientserver_api" long-name="Speech Synthesis Client-Server API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/speech_synthesis_clientserver_api/group"/>
-</component>
-<component name="voice_ui_accessory_button_handling_api" long-name="Voice UI Accessory Button Handling API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/voice_ui_accessory_button_handling_api/group"/>
-</component>
-<component name="ui_voice_recognition_api" long-name="UI Voice Recognition API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/ui_voice_recognition_api/group"/>
-</component>
-<component name="vcommand_settings_cenrep_api" long-name="Voice Command Settings CenRep API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vcommand_settings_cenrep_api/group"/>
-</component>
-</collection>
-<collection name="voiceui" long-name="Voice UI" level="ui">
-<component name="vcommand" filter="s60" long-name="Voice Commands UI" introduced="^1">
-<unit bldFile="app/speechsrv/voiceui/vcommand/group"/>
-</component>
-<component name="voiceuivoicerecognition" filter="s60" long-name="Voice UI Recognition" introduced="^1">
-<unit bldFile="app/speechsrv/voiceui/voiceuivoicerecognition/group"/>
-</component>
-<component name="pbkinfoviewimpl" filter="s60" long-name="Phonebook Info View Implementation" introduced="^1">
-<unit bldFile="app/speechsrv/voiceui/pbkinfoviewimpl/group"/>
-</component>
-<component name="aiwpbkinfoviewprovider" filter="s60" long-name="AIW Phonebook Info View Provider" introduced="^1" plugin="Y">
-<unit bldFile="app/speechsrv/voiceui/aiwpbkinfoviewprovider/group"/>
-</component>
-<component name="vccontrolpanelplugin" filter="s60" long-name="Voice Commands Control Panel Plugin" introduced="^1" plugin="Y">
-<!-- component is commented out until configuration is in place. Currently #included from voiceui_build -->
-<!--<unit bldFile="voiceui/vccontrolpanelplugin/group"/>-->
-</component>
-<component name="voiceui_build" filter="s60" long-name="Voice UI Build" introduced="^1">
-<!-- can this be put into the other components? -->
-<unit bldFile="app/speechsrv/voiceui/group"/>
-</component>
-</collection>
-<collection name="srsf" long-name="Speech Recognition and Synthesis Framework" level="framework">
-<component name="sispeechrecognitiondata" filter="s60" long-name="SI Speech Recognition Data">
-<unit bldFile="app/speechsrv/srsf/sispeechrecognitiondata/group"/>
-</component>
-<component name="ttscommon" filter="s60" long-name="TTS Common">
-<unit bldFile="app/speechsrv/srsf/ttscommon/group"/>
-</component>
-<component name="devtts" filter="s60" long-name="Text to Speech">
-<unit bldFile="app/speechsrv/srsf/devtts/group"/>
-</component>
-<component name="ttscustomcommands" filter="s60" long-name="TTS Custom Commands">
-<unit bldFile="app/speechsrv/srsf/ttscustomcommands/group"/>
-</component>
-<component name="ttscontrollerplugin" filter="s60" long-name="TTS Controller Plugin" plugin="Y">
-<unit bldFile="app/speechsrv/srsf/ttscontrollerplugin/group"/>
-</component>
-<component name="ttsutility" filter="s60" long-name="TTS Utility">
-<unit bldFile="app/speechsrv/srsf/ttsutility/group"/>
-</component>
-<component name="speechsynthesis" filter="s60" long-name="Speech Synthesis">
-<!-- can only have one unit. #include these from a common bld.inf -->
-<unit bldFile="app/speechsrv/srsf/speechsynthesis/client/group"/>
-<unit bldFile="app/speechsrv/srsf/speechsynthesis/server/group"/>
-</component>
-<component name="devasr" filter="s60" long-name="Audio Recording and Speech Recognition">
-<unit bldFile="app/speechsrv/srsf/devasr/group"/>
-</component>
-<component name="sicc" filter="s60" long-name="Speaker Independent Custom Commands">
-<unit bldFile="app/speechsrv/srsf/sicc/group"/>
-</component>
-<component name="sisrscontrollerplugin" filter="s60" long-name="SI SRS Controller Plugin" plugin="Y">
-<unit bldFile="app/speechsrv/srsf/sisrscontrollerplugin/group"/>
-</component>
-<component name="siutility" filter="s60" long-name="Speaker Independent Utility">
-<unit bldFile="app/speechsrv/srsf/siutility/group"/>
-</component>
-<component name="nssvasapi" filter="s60" long-name="NSS VAS API">
-<unit bldFile="app/speechsrv/srsf/nssvasapi/group"/>
-</component>
-<component name="nssvascontacthdlr" filter="s60" long-name="NSS VAS Contact Handler">
-<unit bldFile="app/speechsrv/srsf/nssvascontacthdlr/group"/>
-</component>
-<component name="vcommandhandler" filter="s60" long-name="Voice Command Handler">
-<unit bldFile="app/speechsrv/srsf/vcommandhandler/group"/>
-</component>
-<component name="vuiphandler" filter="s60" long-name="Voice UI Plugin Handler">
-<unit bldFile="app/speechsrv/srsf/vuiphandler/group"/>
-</component>
-<component name="vcommandexecutor" filter="s60" long-name="Voice Command Executor">
-<unit bldFile="app/speechsrv/srsf/vcommandexecutor/group"/>
-</component>
-<component name="vcommandexecutorbearer" filter="s60" long-name="Voice Command Executor Bearer">
-<unit bldFile="app/speechsrv/srsf/vcommandexecutorbearer/group"/>
-</component>
-<component name="vcommandmanager" filter="s60" long-name="Voice Command Manager">
-<unit bldFile="app/speechsrv/srsf/vcommandmanager/group"/>
-</component>
-<component name="vcexecutorapp" filter="s60" long-name="Voice Command Executor Application">
-<unit bldFile="app/speechsrv/srsf/vcexecutorapp/group"/>
-</component>
-<component name="profileobserverplugin" filter="s60" long-name="Profile Observer Plugin" plugin="Y">
-<unit bldFile="app/speechsrv/srsf/profileobserverplugin/group"/>
-</component>
-<component name="srsf_build" filter="s60" long-name="Speech Recognition and Synthesis Framework Build">
-<!-- should distribute this into the above components -->
-<unit bldFile="app/speechsrv/srsf/group"/>
-</component>
-</collection>
-<collection name="speechsrv_info" long-name="Speech Recognition UIs Info" level="ui"/>
-</block>
-<block name="homescreentools" level="services" long-name="Home Screen Tools" levels="tool install">
-<collection name="dtdinstaller" long-name="DTD Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<!-- this needs to be built first, does build order need to be forced with filters? -->
-<component name="dtdinstaller_build" filter="s60" long-name="DTD Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/dtdinstaller/group"/>
-</component>
-</collection>
-<collection name="themeinstaller" long-name="Theme Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="themeinstaller_build" filter="s60" long-name="Theme Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/themeinstaller/group"/>
-</component>
-</collection>
-<collection name="widgettools" long-name="Widget Tools" level="install">
-<component name="hspluginpreinstaller" filter="s60" long-name="HS Plugin Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/hspluginspreinstaller/group"/>
-</component>
-<component name="wrtwidgetpreinstaller" filter="s60" long-name="WRT Widget Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
-</component>
-</collection>
-</block>
-<block name="webuis" level="services" long-name="Web UIs" levels="plugin app">
-<collection name="browserui" long-name="Browser UI" level="app">
-<component name="browser" filter="s60" long-name="Browser">
-<unit bldFile="app/webuis/browserui/browser/group"/>
-</component>
-<component name="operatormenu" filter="s60" long-name="Browser Operator Menu">
-<unit bldFile="app/webuis/browserui/operatormenu/group"/>
-</component>
-<component name="videoservices" filter="s60" long-name="Browser Video Services">
-<unit bldFile="app/webuis/browserui/videoservices/group"/>
-</component>
-</collection>
-<collection name="browserplugins" long-name="Browser Plugins" level="plugin">
-<component name="browsersysteminfoplugin" filter="s60" long-name="Browser System Info Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsersysteminfoplugin/group"/>-->
-</component>
-<component name="browsergpsplugin" filter="s60" long-name="Browser GPS Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsergpsplugin/group"/>-->
-</component>
-<component name="browseraudiovideoplugin" filter="s60" long-name="Browser Audio Video Plugin" plugin="Y">
-<unit bldFile="app/webuis/browserplugins/browseraudiovideoplugin/group"/>
-</component>
-<component name="browserplugins_build" filter="s60" long-name="Browser Plugins Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="app/webuis/browserplugins/group"/>
-</component>
-</collection>
-<collection name="pushmtm" long-name="Push MTM" level="plugin">
-<component name="pushmtm_help" filter="s60" long-name="Push MTM Help">
-<unit bldFile="app/webuis/pushmtm/help/group"/>
-</component>
-<component name="plugins" filter="s60" long-name="Push MTM Plugins" plugin="Y">
-<unit bldFile="app/webuis/pushmtm/plugins/group"/>
-</component>
-<component name="pushmtm_build" filter="s60" long-name="Push MTM Build">
-<!-- Some content is at collection level and some is at comopnent level. Either make this a single
- component and move it down a diretcory, or make separate independent components in this collection -->
-<unit bldFile="app/webuis/pushmtm/group"/>
-</component>
-</collection>
-</block>
-<block name="jrt" level="services" long-name="Java Runtime" levels="util generic rt ui">
-<collection name="jrt_plat" long-name="JRT Platform Interfaces" level="ui">
-<component name="java_registry_api" long-name="Java Registry API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_registry_api/build"/>
-</component>
-<component name="java_env_info_api" long-name="Java Environment Info API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_env_info_api/build"/>
-</component>
-<component name="java_debug_api" long-name="Java Debug API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_debug_api/build"/>
-</component>
-</collection>
-<collection name="java_stubs" long-name="Java Stubs" level="util">
-<!-- uncomment all components when configuration is in place. Currently #included from jrt_build -->
-<component name="javadrmutils" long-name="Java DRM Utils" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtdrmutils/group"/>-->
-</component>
-<component name="javaenvinfo" long-name="Java Environment Info" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtenvinfo/group"/>-->
-</component>
-<component name="javaregistry" filter="s60,sf_build" long-name="Java Registry" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtregistry/clientserver/client/group"/>-->
-</component>
-<component name="java_stubs_build" filter="s60,sf_build" long-name="Java Stubs ROM" class="placeholder">
-<!-- Remove the #includes and rename JRT ROM-->
-<!--<unit bldFile="java_stubs/group"/>-->
-</component>
-</collection>
-<collection name="jrt_info" long-name="JRT Info" level="rt">
-<component name="jrt_build" filter="s60" long-name="JRT Build">
-<!-- needed for __JAVA_STUBS condition -->
-<unit bldFile="app/jrt/group"/>
-</component>
-</collection>
-</block>
-<block name="conntools" level="services" long-name="Connectivity Tools" levels="config app">
-<collection name="nettools" long-name="Net Tools" level="app">
-<component name="conntest" filter="s60" long-name="Connection Test" purpose="development">
-<unit bldFile="app/conntools/nettools/conntest/group"/>
-</component>
-</collection>
-<collection name="emulatorlan" long-name="Emulator LAN" level="config">
-<!-- component is actually a colleciton, should be moved down a directory -->
-<component name="emulatorlan_build" filter="s60" long-name="Emulator LAN Build" purpose="development" class="config">
-<unit bldFile="app/conntools/emulatorlan/group"/>
-</component>
-</collection>
-</block>
-<block name="rndtools" level="services" long-name="R&D tools" levels="support generic test util">
-<collection name="creator" long-name="Creator" level="support">
-<!-- collection is really a component. Should move down a directory -->
-<component name="creator_build" filter="s60" long-name="Creator Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/creator/group"/>
-</component>
-</collection>
-<collection name="filebrowser" long-name="File Browser" level="util">
-<!-- consider collapsing into a single component -->
-<component name="fileopserver" filter="s60" long-name="File Operations Server" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
-</component>
-<component name="fileopclient" filter="s60" long-name="File Operations Client" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!--<unit bldFile="filebrowser/fileopclient/group"/>-->
-</component>
-<component name="filebrowser_build" filter="s60" long-name="File Browser Application" purpose="development" class="tool">
-<!-- Need to make this a self-contained component by removing #includes. Can only do when configuration is in place-->
-<unit bldFile="app/rndtools/filebrowser/group"/>
-</component>
-</collection>
-<collection name="launcher" long-name="Launcher" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="launcher_build" filter="s60" long-name="Launcher Utility" purpose="development" class="tool">
-<unit bldFile="app/rndtools/launcher/group"/>
-</component>
-</collection>
-<collection name="loadgen" long-name="Load Generator" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="loadgen_build" filter="s60" long-name="Load Generator Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/loadgen/group"/>
-</component>
-</collection>
-<collection name="perfmon" long-name="Performance Monitor" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="perfmon_build" filter="s60" long-name="Performance Monitor Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/perfmon/group"/>
-</component>
-</collection>
-<collection name="screengrabber" long-name="Screen Grabber" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="screengrabber_build" filter="s60" long-name="ScreenGrabber" purpose="development" class="tool">
-<unit bldFile="app/rndtools/screengrabber/group"/>
-</component>
-</collection>
-<collection name="stifui" long-name="STIF UI" level="generic">
-<component name="stifui_stifui" filter="s60" long-name="STIF UI" purpose="development">
-<unit bldFile="app/rndtools/stifui/stifui/group"/>
-</component>
-<component name="uitestserverstarter" filter="s60" long-name="UI Test Server Starter" purpose="development">
-<unit bldFile="app/rndtools/stifui/uitestserverstarter/group"/>
-</component>
-<component name="stifui_build" filter="s60" long-name="STIF UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/stifui/group"/>
-</component>
-</collection>
-<collection name="memspyui" long-name="Memspy UI" level="generic">
-<!-- collection is really a component. Should move down a directory -->
-<component name="memspyui_build" filter="s60" long-name="Memspy UI Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/memspyui/group"/>
-</component>
-</collection>
-<collection name="htiui" long-name="Harmonized Test Interface UI" level="generic">
-<component name="HtiCommPlugins" filter="s60" long-name="HTI Comm Plugins" purpose="development" plugin="Y">
-<unit bldFile="app/rndtools/htiui/HtiCommPlugins/HtiBtCommPlugin/group"/>
-</component>
-<component name="HtiServicePlugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- can only have a single unit. Should #include from a common bld.inf file -->
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiFtpBackupFake/group"/>
-</component>
-<component name="htidevicereboot" filter="s60" long-name="HTI Device Reboot" purpose="development">
-<unit bldFile="app/rndtools/htiui/htidevicereboot/group"/>
-</component>
-<component name="htistartupwait" filter="s60" long-name="HTI Startup Wait" purpose="development">
-<unit bldFile="app/rndtools/htiui/htistartupwait/group"/>
-</component>
-<component name="htiadmin" filter="s60" long-name="HTI Admin" purpose="development">
-<unit bldFile="app/rndtools/htiui/htiadmin/group"/>
-</component>
-<component name="htiui_build" filter="s60" long-name="HTI UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/htiui/group"/>
-</component>
-</collection>
-</block>
-<block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools if ui">
-<collection name="csxhelp" long-name="Context Sensitive Extended Help" level="if">
-<!-- this is really a component. Should move it down a directory -->
-<component name="csxhelp_build" filter="s60" long-name="Context Sensitive Extended Help Build">
-<unit bldFile="app/helps/csxhelp/group"/>
-</component>
-</collection>
-<collection name="symhelp" long-name="Symbian Help" level="eng">
-<component name="helpmodel" long-name="Help" introduced="6.0" purpose="optional">
-<unit bldFile="app/helps/symhelp/helpmodel/group" mrp="app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
-</component>
-</collection>
-<collection name="helps_info" long-name="Help Apps Info" level="ui">
-<component name="helps_metadata" long-name="Help Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/helps/helps_info/helps_metadata/helps_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
-<collection name="buildverification" long-name="Build Verification" level="services">
-<component name="autosmoketest" long-name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
-<unit bldFile="app/techview/buildverification/autosmoketest/Group" mrp="app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
-</component>
-<component name="smoketest" long-name="Smoke Test" filter="gt" purpose="development">
-<unit bldFile="app/techview/buildverification/smoketest/Group" mrp="app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
-</component>
-</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="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"/>
-<collection name="installationapps" long-name="Installation Apps" level="apps2"/>
-<collection name="messagingapps" long-name="Messaging Apps" level="apps2"/>
-<collection name="telephonyapps" long-name="Telephony Apps" level="apps1"/>
-<collection name="networkingapps" long-name="Networking Apps" level="apps1"/>
-<collection name="networkingutils" long-name="Networking Utils" level="utils"/>
-<collection name="shortlinkapps" long-name="Shortlink Apps" level="apps1"/>
-<collection name="testapps" long-name="Test Apps" level="utils"/>
-<collection name="avapps" long-name="A/V Apps" level="apps3"/>
-<collection name="toolkit" long-name="Toolkit" level="utils"/>
-<collection name="techview_info" long-name="Techview Info" level="apps3">
-<component name="techview_metadata" long-name="Techview Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/techview/techview_info/techview_metadata/techview_metadata.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
--- a/symbian3/single/sysdefs/auto/model_20100414113239_e80d80ee2e92.xml Wed May 05 12:21:47 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10843 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a package or prebuilt -->
-<!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) "N"
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile may someday be removed in favour of mrp -->
-<!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
-<systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="low mw high">
-<block name="stubs" level="high" long-name="Stubs" levels="stub">
-<collection name="s60_stubs" level="stub">
-<component name="audiostubs" long-name="Audio Stubs">
-<unit bldFile="adaptation/stubs/audiostubs/group"/>
-</component>
-<component name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaptation Stub">
-<unit bldFile="adaptation/stubs/btaudioadaptation_stub/group"/>
-</component>
-<component name="drm_stubs" long-name="DRM Stubs">
-<unit bldFile="adaptation/stubs/drm_stubs/group"/>
-</component>
-<component name="ocrsrv_stub" long-name="OCR Services Stub">
-<unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
-</component>
-<component name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation">
-<unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
-</component>
-<component name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" plugin="Y">
-<unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
-</component>
-<component name="srsfenginestub" long-name="SRSF Engine Stub">
-<unit bldFile="adaptation/stubs/srsfenginestub/group"/>
-</component>
-<component name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub">
-<unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
-</component>
-<component name="systemswstubs" long-name="System Software Stubs">
-<unit bldFile="adaptation/stubs/systemswstubs/group"/>
-</component>
-<component name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" plugin="Y">
-<unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
-</component>
-<component name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub">
-<unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
-<collection name="omap3530" long-name="OMAP 3530" level="hw-if">
-<component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530" mrp="adaptation/beagleboard/omap3530/base_beagle.mrp"/>
-</component>
-<component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/kernel"/>
-</component>
-<component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/beagleboard"/>
-</component>
-</collection>
-</block>
-<block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
-<collection name="qemu_baseport" long-name="Baseport" level="hw-if">
-<component name="syborg" long-name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/qemu/baseport/syborg" mrp="adaptation/qemu/baseport/syborg/syborg.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
-<collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
-<component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
-<unit mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
-</component>
-</collection>
-<collection name="bsptemplate" long-name="Board Support Package Template" level="hw-if">
-<component name="asspandvariant" long-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 name="kernel" long-name="Kernel Architecture" level="adaptation">
-<component name="eka" long-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 name="kerneltest" long-name="Kernel Test" level="hw-if">
-<component name="e32utils" long-name="E32 Utilities" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32utils/group" mrp="os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/>
-</component>
-<component name="e32test" long-name="E32 Tests" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32test/group" mrp="os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
-</component>
-<component name="f32test" long-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 name="ldds" long-name="Logical Device Drivers" level="adaptation">
-<component name="ethernetldd" long-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 name="audioldd" long-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>
-<component name="serialldd" long-name="Serial Port Drivers" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
-</component>
-<component name="legacydrivers" long-name="Legacy Drivers" purpose="optional">
-<unit mrp="os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
-</component>
-<component name="locmedia" long-name="Local Media Subsystem" introduced="8.1b" purpose="mandatory">
-<!-- these are LDDs for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
-</component>
-<component name="runmodedebugger" long-name="Run Mode Debugger" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/debug/group" mrp="os/kernelhwsrv/kernel/eka/drivers/debug/group/base_e32_drivers_debug.mrp"/>
-</component>
-<component name="btrace" long-name="Kernel Trace Tool" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/trace" mrp="os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
-</component>
-<component name="cameraldd" long-name="Camera Drivers" introduced="^3" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/camerasc" mrp="os/kernelhwsrv/kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
-</component>
-<component name="displayldd" long-name="Display Drivers" introduced="^3" purpose="optional">
-<!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/display" mrp="os/kernelhwsrv/kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
-</component>
-<component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
-</component>
-</collection>
-<collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
-<component name="mediadrivers" long-name="Media Drivers" purpose="optional">
-<!-- these are for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/media" mrp="os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
-</component>
-<component name="genericboardsupport" long-name="Generic Board Support" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
-</component>
-</collection>
-<collection name="userlibandfileserver" long-name="User Library and File Server" level="framework">
-<component name="euser" long-name="User Library" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/euser" mrp="os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
-</component>
-<component name="compsupp" long-name="Compiler Runtime Support" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/compsupp" mrp="os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
-</component>
-<component name="fileserver" long-name="File Server" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
-</component>
-<component name="estart" long-name="Base Starter" filter="gt" purpose="optional">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
-</component>
-<component name="domainmgr" long-name="Domain Manager" introduced="8.1b" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
-</component>
-</collection>
-<collection name="filesystems" long-name="File Systems" level="framework">
-<component name="romfs" long-name="ROM File System" filter="gt" purpose="optional" plugin="Y">
-<unit mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
-</component>
-<component name="rofs" long-name="ROFS" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
-</component>
-<component name="usbmsfs" long-name="USB Mass Storage File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
-</component>
-<component name="usbhostmssrv" long-name="USB Host Mass Storage Server" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage/base_f32_shostmassstorage.mrp"/>
-</component>
-<component name="fat32fs" long-name="FAT32 File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
-</component>
-<component name="fatfs" long-name="FAT File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
-</component>
-<component name="compfs" long-name="Composite File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
-</component>
-</collection>
-<collection name="halservices" long-name="HAL Services" level="framework">
-<component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
-<unit bldFile="os/kernelhwsrv/halservices/hal" mrp="os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
-</component>
-</collection>
-<collection name="textmodeshell" long-name="Text Mode Shell" level="test">
-<component name="e32wsrv" long-name="Text Window Server" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/ewsrv" mrp="os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
-</component>
-<component name="textshell" long-name="Text Shell" filter="gt" purpose="development">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
-</component>
-</collection>
-<collection name="baseapitest" long-name="Base API Tests" level="test"/>
-<collection name="kernelhwsrv_info" long-name="Kernel and Hardware Services Info" level="test">
-<component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 config">
-<collection name="emulator" long-name="Emulator" level="bsp">
-<component name="emulatorbsp" long-name="Emulator BSP" purpose="optional">
-<unit bldFile="os/boardsupport/emulator/emulatorbsp" mrp="os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
-</component>
-</collection>
-<collection name="haitest" long-name="HAI Test Suites" level="test">
-<component name="bspsvs" long-name="BSP Verification Suite" introduced="^2" purpose="development">
-<unit mrp="os/boardsupport/haitest/bspsvs/group/bspsvs.mrp"/>
-</component>
-</collection>
-<collection name="boardsupport_info" long-name="Board Support Info" level="config">
-<component name="boardsupport_metadata" long-name="Board Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/boardsupport/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
-<collection name="bldsystemtools" long-name="Build System Tools" level="bld">
-<component name="sysdeftools" long-name="System Definition Tools" purpose="development" introduced="^2">
-<unit mrp="os/buildtools/bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
-</component>
-<component name="commonbldutils" long-name="Common Utils" purpose="development">
-<unit mrp="os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
-</component>
-</collection>
-<collection name="toolsandutils" long-name="Tools and Utils" level="mw">
-<component name="productionbldtools" long-name="Production Build Tools" filter="gt" purpose="development">
-<unit mrp="os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
-</component>
-<component name="e32tools" long-name="E32 Tools" deprecated="^2" purpose="development" class="PC">
-<unit bldFile="os/buildtools/toolsandutils/e32tools/group" mrp="os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
-</component>
-<component name="autotest" long-name="Autotest" purpose="development">
-<unit bldFile="os/buildtools/toolsandutils/autotest/group" mrp="os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
-</component>
-</collection>
-<collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
-<component name="e32toolp" long-name="E32 Perl Tools" purpose="development" filter="sf_build" class="PC">
-<unit mrp="os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="os/buildtools/sbsv1_os/e32toolp/group"/>
-</component>
-</collection>
-<collection name="imgtools_os" long-name="Image Tools" level="fw">
-<component name="romkiteka2" long-name="ROMKIT EKA2" deprecated="^2" purpose="development">
-<unit bldFile="os/buildtools/imgtools_os/romkiteka2/group" mrp="os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
-</component>
-</collection>
-<collection name="misccomponents" long-name="Misc Components" level="mw">
-<component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt" purpose="development">
-<unit bldFile="os/buildtools/misccomponents/emulatorlauncher/group" mrp="os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
-</component>
-</collection>
-<collection name="buildtools_info" long-name="Build Tools Info" level="ui">
-<component name="buildtools_metadata" long-name="Build Tools Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/buildtools/buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
-<collection name="ossrv_pub" long-name="Generic OS Services Public Interfaces" level="utilities">
-<component name="boost_apis" long-name="Boost APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/boost_apis/group"/>
-</component>
-<component name="cpp_wrappers" long-name="Cpp wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cpp_wrappers/group"/>
-</component>
-<component name="character_type_apis" long-name="Character Type APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/character_type_apis/group"/>
-</component>
-<component name="compiler_specific_runtime_support" long-name="Compiler Specific Runtime Support" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/compiler_specific_runtime_support/group"/>
-</component>
-<component name="ossrv_configuration_api" long-name="Generic OS Services Configuration API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/configuration/group"/>
-</component>
-<component name="crypto_authentication_codes_and_hash_functions_api" long-name="Crypto Authentication Codes and Hash Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
-</component>
-<component name="crypto_auxillary_functions_api" long-name="Crypto Auxillary Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_auxillary_functions_api/group"/>
-</component>
-<component name="crypto_certificates_api" long-name="Crypto Certificates API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_certificates_api/group"/>
-</component>
-<component name="crypto_inputoutput_and_data_encoding_api" long-name="Crypto Input/Output and Data Encoding API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
-</component>
-<component name="crypto_public_key_cryptography_and_key_agreement_api" long-name="Crypto Public Key Cryptography and Key Agreement API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
-</component>
-<component name="crypto_symmetric_ciphers_api" long-name="Crypto Symmetric Ciphers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_symmetric_ciphers_api/group"/>
-</component>
-<component name="crypto_utility_functions_api" long-name="Crypto Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_utility_functions_api/group"/>
-</component>
-<component name="cryptogaphy_related_api" long-name="Cryptogaphy Related API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cryptogaphy_related_api/group"/>
-</component>
-<component name="ossrv_debug_api" long-name="Generic OS Services Debug API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/debug/group"/>
-</component>
-<component name="ossrv_exceptions_api" long-name="Generic OS Services Exceptions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/exceptions/group"/>
-</component>
-<component name="gboxed" long-name="GBoxed API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gboxed/group"/>
-</component>
-<component name="glib_arrays" long-name="Glib Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_arrays/group"/>
-</component>
-<component name="glib_asynchronous_queues" long-name="Glib Asynchronous Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_asynchronous_queues/group"/>
-</component>
-<component name="glib_atomic_operations" long-name="Glib Atomic Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_atomic_operations/group"/>
-</component>
-<component name="glib_automatic_string_completion" long-name="Glib Automatic String Completion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_automatic_string_completion/group"/>
-</component>
-<component name="glib_balanced_binary_trees" long-name="Glib Balanced Binary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_balanced_binary_trees/group"/>
-</component>
-<component name="glib_basic_types" long-name="Glib Basic Types API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_basic_types/group"/>
-</component>
-<component name="glib_caches" long-name="Glib Caches API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_caches/group"/>
-</component>
-<component name="glib_character_set_conversion" long-name="Glib Character Set Conversion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_character_set_conversion/group"/>
-</component>
-<component name="glib_closures" long-name="Glib Closures API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_closures/group"/>
-</component>
-<component name="glib_commandline_option_parser" long-name="Glib Command Line Option Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_commandline_option_parser/group"/>
-</component>
-<component name="glib_datasets" long-name="Glib Datasets API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_datasets/group"/>
-</component>
-<component name="glib_date_and_time_functions" long-name="Glib Date and Time Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_date_and_time_functions/group"/>
-</component>
-<component name="glib_doubleended_queues" long-name="Glib Double-ended Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doubleended_queues/group"/>
-</component>
-<component name="glib_doublylinked_lists" long-name="Glib Doubly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doublylinked_lists/group"/>
-</component>
-<component name="glib_dynamic_loading_of_modules" long-name="Glib Dynamic Loading of Modules API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_dynamic_loading_of_modules/group"/>
-</component>
-<component name="glib_enums_and_flags" long-name="Glib Enums and Flags API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_enums_and_flags/group"/>
-</component>
-<component name="glib_error_reporting" long-name="Glib Error Reporting API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_error_reporting/group"/>
-</component>
-<component name="glib_file_utilities" long-name="Glib File Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_file_utilities/group"/>
-</component>
-<component name="glib_generic_values" long-name="Glib Generic Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_generic_values/group"/>
-</component>
-<component name="glib_globstyle_pattern_matching" long-name="Glib Glob-Style Pattern Matching API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_globstyle_pattern_matching/group"/>
-</component>
-<component name="glib_hash_tables" long-name="Glib Hash Tables API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hash_tables/group"/>
-</component>
-<component name="glib_hook_functions" long-name="Glib Hook Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hook_functions/group"/>
-</component>
-<component name="glib_internationalization" long-name="Glib Internationalization API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_internationalization/group"/>
-</component>
-<component name="glib_io_channels" long-name="Glib I/O Channels API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_io_channels/group"/>
-</component>
-<component name="glib_keyvalue_file_parser" long-name="Glib Key-Value File Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_keyvalue_file_parser/group"/>
-</component>
-<component name="glib_lexical_scanner" long-name="Glib Lexical Scanner API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_lexical_scanner/group"/>
-</component>
-<component name="glib_main_event_loop" long-name="Glib Main Event Loop API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_main_event_loop/group"/>
-</component>
-<component name="glib_memory_allocation" long-name="Glib Memory Allocation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_allocation/group"/>
-</component>
-<component name="glib_memory_slices" long-name="Glib Memory Slices API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_slices/group"/>
-</component>
-<component name="glib_message_logging" long-name="Glib Message Logging API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_message_logging/group"/>
-</component>
-<component name="glib_miscellaneous_utility_functions" long-name="Glib Miscellaneous Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_miscellaneous_utility_functions/group"/>
-</component>
-<component name="glib_nary_trees" long-name="Glib N-ary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_nary_trees/group"/>
-</component>
-<component name="glib_parameters_and_values" long-name="Glib Parameters and Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_parameters_and_values/group"/>
-</component>
-<component name="glib_quarks" long-name="Glib Quarks API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_quarks/group"/>
-</component>
-<component name="glib_random_numbers" long-name="Glib Random Numbers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_random_numbers/group"/>
-</component>
-<component name="glib_relations_and_tuples" long-name="Glib Relations and Tuples API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_relations_and_tuples/group"/>
-</component>
-<component name="glib_shellrelated_utilities" long-name="Glib Shell-related Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_shellrelated_utilities/group"/>
-</component>
-<component name="glib_signals" long-name="Glib Signals API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_signals/group"/>
-</component>
-<component name="glib_simple_xml_subset_parser" long-name="Glib Simple XML Subset Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_simple_xml_subset_parser/group"/>
-</component>
-<component name="glib_singlylinked_lists" long-name="Glib Singly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_singlylinked_lists/group"/>
-</component>
-<component name="glib_spawning_processes" long-name="Glib Spawning Processes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_spawning_processes/group"/>
-</component>
-<component name="glib_standard_macros" long-name="Glib Standard Macros API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_standard_macros/group"/>
-</component>
-<component name="glib_string_utility_functions" long-name="Glib String Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_string_utility_functions/group"/>
-</component>
-<component name="glib_strings" long-name="Glib Strings API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_strings/group"/>
-</component>
-<component name="glib_thread_pools" long-name="Glib Thread Pools API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_thread_pools/group"/>
-</component>
-<component name="glib_threads" long-name="Glib Threads API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_threads/group"/>
-</component>
-<component name="glib_timers" long-name="Glib Timers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_timers/group"/>
-</component>
-<component name="glib_unicode_manipulation" long-name="Glib Unicode Manipulation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_unicode_manipulation/group"/>
-</component>
-<component name="glib_value_arrays" long-name="Glib Value Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_value_arrays/group"/>
-</component>
-<component name="glib_varargs_value_collection" long-name="Glib Varargs Value Collection API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_varargs_value_collection/group"/>
-</component>
-<component name="gobject" long-name="GObject API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gobject/group"/>
-</component>
-<component name="gparamspec" long-name="GParamSpec API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gparamspec/group"/>
-</component>
-<component name="gtype" long-name="GType API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtype/group"/>
-</component>
-<component name="gtypemodule" long-name="GTypeModule API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypemodule/group"/>
-</component>
-<component name="gtypeplugin" long-name="GTypePlugin API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypeplugin/group"/>
-</component>
-<component name="io_stream_api" long-name="I/O stream API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/io_stream_api/group"/>
-</component>
-<component name="localization_function_api" long-name="Localization Function API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/localization_function_api/group"/>
-</component>
-<component name="math_operations_api" long-name="Math Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/math_operations_api/group"/>
-</component>
-<component name="ossrv_memory_api" long-name="Generic OS Services Memory API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/memory/group"/>
-</component>
-<component name="no_namespace_headers" long-name="No Namespace Headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/no_namespace_headers/group"/>
-</component>
-<component name="openc_headers" long-name="OpenC headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_headers/group"/>
-</component>
-<component name="openc_wrappers" long-name="OpenC wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_wrappers/group"/>
-</component>
-<component name="ssl_general_api" long-name="SSL General API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_general_api/group"/>
-</component>
-<component name="ssl_protocol_methods_api" long-name="SSL Protocol Methods API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_protocol_methods_api/group"/>
-</component>
-<component name="standard_compressiondecompression_api" long-name="Standard Compression/Decompression API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/standard_compressiondecompression_api/group"/>
-</component>
-<component name="stl" long-name="STL API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/stl/group"/>
-</component>
-<component name="thread_api" long-name="Thread API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/thread_api/group"/>
-</component>
-<component name="type_attributes" long-name="Type Attributes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/type_attributes/group"/>
-</component>
-<component name="typeinfo" long-name="Type Info API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/typeinfo/group"/>
-</component>
-<component name="utility_apis" long-name="Utility APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/utility_apis/group"/>
-</component>
-<component name="wide_character_classapis" long-name="Wide character class/apis" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/wide_character_classapis/group"/>
-</component>
-<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">
-<unit bldFile="os/ossrv/ossrv_pub/dbus-glib/group"/>
-</component>
-</collection>
-<collection name="ossrv_plat" long-name="Generic OS Services Platform Interfaces" level="utilities">
-<component name="libutils_apis" long-name="Utility Library APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_plat/libutils/group"/>
-</component>
-</collection>
-<collection name="stdlibs" long-name="Standard Libraries" level="translation">
-<component name="libz" filter="s60" long-name="Z Compression Library">
-<unit bldFile="os/ossrv/stdlibs/libz/group"/>
-</component>
-<component name="libcrypt" filter="s60" long-name="Crypt Library">
-<unit bldFile="os/ossrv/stdlibs/libcrypt/group"/>
-</component>
-</collection>
-<collection name="ssl" long-name="SSL" level="data-services">
-<component name="libcrypto" filter="s60" long-name="Crypto Library">
-<unit bldFile="os/ossrv/ssl/libcrypto/group"/>
-</component>
-<component name="libssl" filter="s60" purpose="development" long-name="SSL Library">
-<unit bldFile="os/ossrv/ssl/libssl/group"/>
-</component>
-</collection>
-<collection name="glib" long-name="GLib" level="utilities">
-<component name="glibbackend" filter="s60" long-name="GLib Backend">
-<unit bldFile="os/ossrv/glib/glibbackend/group"/>
-</component>
-<component name="libglib" filter="s60" long-name="GLib Library">
-<unit bldFile="os/ossrv/glib/libglib/group"/>
-</component>
-<component name="libgthread" filter="s60" long-name="Libg Thread">
-<unit bldFile="os/ossrv/glib/libgthread/group"/>
-</component>
-<component name="libgmodule" filter="s60" long-name="Libg Module">
-<unit bldFile="os/ossrv/glib/libgmodule/group"/>
-</component>
-<component name="libgobject" filter="s60" long-name="Libg Object">
-<unit bldFile="os/ossrv/glib/libgobject/group"/>
-</component>
-</collection>
-<collection name="stdcpp" long-name="C++ Standard Library" level="translation">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="stdcpp_build" filter="s60" long-name="Stdcpp">
-<unit bldFile="os/ossrv/stdcpp/group"/>
-</component>
-</collection>
-<collection name="ofdbus" long-name="Open Foundation D-Bus" level="utilities">
-<component name="dbus" filter="s60" long-name="D-Bus">
-<unit bldFile="os/ossrv/ofdbus/dbus/group"/>
-</component>
-<component name="dbus-glib" filter="s60" long-name="D-Bus GLib">
-<unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
-</component>
-<component name="ofdbus_rom" filter="s60" long-name="D-Bus ROM">
-<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory
- Consider moving IBY file to one of the above as well and removing this component entirely -->
-<unit bldFile="os/ossrv/ofdbus/group"/>
-</component>
-</collection>
-<collection name="utilitylibraries" long-name="Utility Libraries" level="encoding">
-<component name="libutils" filter="s60" long-name="Utility Library">
-<unit bldFile="os/ossrv/utilitylibraries/libutils/group"/>
-</component>
-</collection>
-<collection name="genericservices" long-name="Generic Services" level="utilities">
-<component name="s60compatibilityheaders" long-name="S60 Compatibility Headers" filter="gt" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp" version="tb101sf"/>
-</component>
-<component name="mimerecognitionfw" long-name="MIME Recognition Framework" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/mimerecognitionfw/group" mrp="os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
-</component>
-<component name="systemagent" long-name="System Agent" introduced="9.0" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/systemagent/group" mrp="os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
-</component>
-<component name="taskscheduler" long-name="Task Scheduler" introduced="6.0" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/taskscheduler/group" mrp="os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
-</component>
-<component name="activebackupclient" long-name="Active Backup Client" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/activebackupclient/group" mrp="os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
-</component>
-<component name="syslibsdocs" long-name="Syslibs Documentation" purpose="development" class="doc">
-<unit mrp="os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
-</component>
-<component name="httputils" long-name="HTTP Utilities Library" introduced="6.2" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/httputils/group" mrp="os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
-</component>
-</collection>
-<collection name="syslibsapitest" long-name="SysLibs API Tests" level="utilities"/>
-<collection name="compressionlibs" long-name="Compression Libraries" level="data-services">
-<component name="ziplib" long-name="Zip Compression Library" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/ossrv/compressionlibs/ziplib/group" mrp="os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
-</component>
-</collection>
-<collection name="genericopenlibs" long-name="Generic Open Libraries" level="translation">
-<component name="cstdlib" long-name="C Standard Library" introduced="ER5" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/cstdlib/group" mrp="os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
-</component>
-<component name="cppstdlib" long-name="C++ Standard Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/cppstdlib/group" mrp="os/ossrv/genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
-</component>
-<component name="openenvcore" long-name="Open Environment Core" introduced="^2" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/openenvcore/group" mrp="os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
-</component>
-<component name="posixrealtimeextensions" long-name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/posixrealtimeextensions/group" mrp="os/ossrv/genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
-</component>
-</collection>
-<collection name="lowlevellibsandfws" long-name="Low Level Libraries and Frameworks" level="app-libs">
-<component name="pluginfw" long-name="Plugin Framework" introduced="6.2" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp" version="3"/>
-</component>
-<component name="apputils" long-name="Application Utilities" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/apputils/group" mrp="os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
-</component>
-<component name="genericusabilitylib" long-name="Generic Usability Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/genericusabilitylib/group" mrp="os/ossrv/lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
-</component>
-</collection>
-<collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
-<component name="ossrv_build" filter="s60" long-name="Generic OS Services Build">
-<!-- exports should be moved to individual components -->
-<unit bldFile="os/ossrv/group"/>
-</component>
-<component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="featuremgmt" long-name="Feature Management" level="framework">
-<component name="featuremgr" long-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 name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/persistentdata/featuremgmt/featureregistry/group" mrp="os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
-</component>
-</collection>
-<collection name="loggingservices" long-name="Logging Services" level="server">
-<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">
-<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">
-<unit bldFile="os/persistentdata/loggingservices/rfilelogger/group" mrp="os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
-</component>
-</collection>
-<collection name="traceservices" long-name="Trace Services" level="server">
-<component name="commsdebugutility" long-name="Comms Debug Utility" introduced="7.0s" purpose="optional">
-<unit bldFile="os/persistentdata/traceservices/commsdebugutility/group" mrp="os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
-</component>
-<component name="tracefw" long-name="Trace Framework" introduced="9.2" purpose="development">
-<unit bldFile="os/persistentdata/traceservices/tracefw/ulogger/group" mrp="os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
-</component>
-</collection>
-<collection name="persistentstorage" long-name="Persistent Storage" level="framework">
-<component name="store" long-name="Store" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/store/group" mrp="os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
-</component>
-<component name="dbms" long-name="DBMS" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/dbms/group" mrp="os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
-</component>
-<component name="centralrepository" long-name="Central Repository" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/persistentdata/persistentstorage/centralrepository/group" mrp="os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
-</component>
-<component name="sql" long-name="SQL" introduced="9.3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sql/GROUP" mrp="os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
-</component>
-<component name="sqlite3api" long-name="SQLite 3 API" introduced="^3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sqlite3api/GROUP" mrp="os/persistentdata/persistentstorage/sqlite3api/GROUP/syslibs_sqlite3.mrp"/>
-</component>
-</collection>
-<collection name="persistentdata_info" long-name="Persistent Data Services Info" level="app-if">
-<component name="persistentdata_metadata" long-name="Persistent Data Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/persistentdata/persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
-<component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
-</component>
-<component name="common_platform_security_definitions_api" long-name="Common Platform Security Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group"/>
-</component>
-<component name="feature_discovery_api" long-name="Feature Discovery API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/group"/>
-</component>
-<component name="platform_environment_api" long-name="Platform Environment API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_environment_api/group"/>
-</component>
-<component name="sensor_channel_api" long-name="Sensor Channel API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_channel_api/group"/>
-</component>
-<component name="sensor_definitions_api" long-name="Sensor Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_definitions_api/group"/>
-</component>
-<component name="version_info_api" long-name="Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/group"/>
-</component>
-<component name="accessory_monitoring_api" long-name="Accessory Monitoring API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/group"/>
-</component>
-<component name="haptics_api" long-name="Haptics API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/haptics_api/group"/>
-</component>
-<component name="sensor_data_compensator_api" long-name="Sensor Data Compensator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
-</component>
-</collection>
-<collection name="devicesrv_plat" long-name="Device Services Platform Interfaces" level="app-if">
-<component name="configuration_file_parser_api" long-name="Configuration File Parser API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/configuration_file_parser_api/group"/>
-</component>
-<component name="dos_extension_plugin_api" long-name="DOS Extension Plug-In API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_plugin_api/group"/>
-</component>
-<component name="mediator_command_initiator_api" long-name="Mediator Command Initiator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_initiator_api/group"/>
-</component>
-<component name="syslangutil_api" long-name="SysLangUtil API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/syslangutil_api/group"/>
-</component>
-<component name="wakeup_alarm_api" long-name="Wakeup Alarm API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/wakeup_alarm_api/group"/>
-</component>
-<component name="disk_and_memory_level_keys_api" long-name="Disk and Memory Level Keys API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_and_memory_level_keys_api/group"/>
-</component>
-<component name="mediator_plugin_api" long-name="Mediator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_plugin_api/group"/>
-</component>
-<component name="headset_status_api" long-name="Headset Status API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/headset_status_api/group"/>
-</component>
-<component name="system_startup_extension_plugin_api" long-name="System Startup Extension Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/system_startup_extension_plugin_api/group"/>
-</component>
-<component name="sensor_plugin_api" long-name="Sensor Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_plugin_api/group"/>
-</component>
-<component name="accessory_api" long-name="Accessory API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_api/group"/>
-</component>
-<component name="display_language_definition_api" long-name="Display Language Definition API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/display_language_definition_api/group"/>
-</component>
-<component name="mediator_command_responder_api" long-name="Mediator Command Responder API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_responder_api/group"/>
-</component>
-<component name="accessory_policy_definitions_api" long-name="Accessory Policy Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_definitions_api/group"/>
-</component>
-<component name="hw_settings_api" long-name="Hardware Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/hw_settings_api/group"/>
-</component>
-<component name="mediator_domain_definitions_api" long-name="Mediator Domain Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_domain_definitions_api/group"/>
-</component>
-<component name="sensor_extension_api" long-name="Sensor Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_extension_api/group"/>
-</component>
-<component name="accessory_plugin_api" long-name="Accessory Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_plugin_api/group"/>
-</component>
-<component name="sae_api" long-name="SAE API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sae_api/group"/>
-</component>
-<component name="accessory_control_api" long-name="Accessory Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_control_api/group"/>
-</component>
-<component name="mediator_static_registration_api" long-name="Mediator Static Registration API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_static_registration_api/group"/>
-</component>
-<component name="accessory_key_event_handling_api" long-name="Accessory Key Event Handling API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_key_event_handling_api/group"/>
-</component>
-<component name="mediator_notification_api" long-name="Mediator Notification API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_notification_api/group"/>
-</component>
-<component name="accessory_policy_utility_api" long-name="Accessory Policy Utility API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_utility_api/group"/>
-</component>
-<component name="common_dsy_plugin_api" long-name="Common DSY Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/common_dsy_plugin_api/group"/>
-</component>
-<component name="remote_control_extension_api" long-name="Remote Control Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/remote_control_extension_api/group"/>
-</component>
-<component name="sensor_channel_filter_api" long-name="Sensor Channel Filter API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_channel_filter_api/group"/>
-</component>
-<component name="dos_extension_api" long-name="DOS Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_api/group"/>
-</component>
-<component name="accessory_audio_control_api" long-name="Accessory Audio Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_audio_control_api/group"/>
-</component>
-<component name="mediator_event_consumer_api" long-name="Mediator Event Consumer API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_consumer_api/group"/>
-</component>
-<component name="shared_data_api" long-name="Shared Data API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/shared_data_api/group"/>
-</component>
-<component name="accessory_settings_api" long-name="Accessory Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_settings_api/group"/>
-</component>
-<component name="accessory_bluetooth_control_api" long-name="Accessory Bluetooth Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_bluetooth_control_api/group"/>
-</component>
-<component name="extended_version_info_api" long-name="Extended Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_api/group"/>
-</component>
-<component name="mediator_event_provider_api" long-name="Mediator Event Provider API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_provider_api/group"/>
-</component>
-<component name="tv_out_config_api" long-name="TV Out Config API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_config_api/group"/>
-</component>
-<component name="tspclientmapper_api" long-name="TSP Client Mapper API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tspclientmapper_api/group"/>
-</component>
-<component name="powersave_api" long-name="Power Save API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_api/group"/>
-</component>
-<component name="powersave_definitions_api" long-name="Power Save Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_definitions_api/group"/>
-</component>
-<component name="powersave_plugin_api" long-name="Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_plugin_api/group"/>
-</component>
-<component name="extended_version_info_plugin_api" long-name="Extended Version Info Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_plugin_api/group"/>
-</component>
-<component name="haptics_plugin_api" long-name="Haptics Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_plugin_api/group"/>
-</component>
-<component name="haptics_effect_data_getter_plugin_api" long-name="Haptics Effect Data Getter Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
-</component>
-<component name="haptics_packetizer_plugin_api" long-name="Haptics Packetizer Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_packetizer_plugin_api/group"/>
-</component>
-<component name="tiltcompensation_api" long-name="Tilt Compensation API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tiltcompensation_api/group"/>
-</component>
-<component name="disk_notification_handler_api" long-name="Disk Notification Handler API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_notification_handler_api/group"/>
-</component>
-<component name="accessory_policy_usb_audio_api" long-name="Accessory Policy USB Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_usb_audio_api/group"/>
-</component>
-<component name="accessory_policy_hdmi_audio_api" long-name="Accessory Policy HDMI Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_hdmi_audio_api/group"/>
-</component>
-<component name="sensor_data_compensator_plugin_api" long-name="Sensor Data Compensator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
-</component>
-<component name="ddc_access_api" long-name="DDC Access API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/ddc_access_api/group"/>
-</component>
-<component name="tv_out_behaviour_api" long-name="TV Out Behaviour API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_behaviour_api/group"/>
-</component>
-</collection>
-<collection name="accessoryservices" long-name="Accessory Services" level="framework">
-<component name="accessorymonitor" filter="s60" long-name="Accessory Monitor">
-<unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/group"/>
-</component>
-<component name="accessoryremotecontrol" filter="s60" long-name="Accessory Remote Control">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
-</component>
-<component name="accessoryserver" filter="s60" long-name="Accessory Server">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryserver/group"/>
-</component>
-<component name="pluggeddisplay" filter="s60" long-name="Plugged Display" introduced="^3">
-<unit bldFile="os/devicesrv/accessoryservices/pluggeddisplay/group"/>
-</component>
-<component name="headsetstatusapi" filter="s60" long-name="Headset Status API">
-<unit bldFile="os/devicesrv/accessoryservices/headsetstatusapi/group"/>
-</component>
-<component name="tspclientmapper" filter="s60" long-name="TSP Client Mapper">
-<unit bldFile="os/devicesrv/accessoryservices/tspclientmapper/group"/>
-</component>
-<component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional">
-<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
-</component>
-<component name="gid_pc_tool" filter="s60" long-name="Generic ID PC Tool" class="tool PC">
-<unit bldFile="os/devicesrv/accessoryservices/gid_pc_tool/group"/>
-</component>
-</collection>
-<collection name="commonservices" long-name="Common Services" level="app-if">
-<component name="commonengine" filter="s60" long-name="Common Engine">
-<unit bldFile="os/devicesrv/commonservices/commonengine/group"/>
-</component>
-<component name="commonengineresources" filter="s60" long-name="Common Engine Resources" class="config">
-<unit bldFile="os/devicesrv/commonservices/commonengineresources/group"/>
-</component>
-<component name="platformenv" filter="s60" long-name="Platform Environment">
-<unit bldFile="os/devicesrv/commonservices/platformenv/group"/>
-</component>
-<component name="sysutil" long-name="System Utilities" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/sysutil/group" mrp="os/devicesrv/commonservices/sysutil/group/sysutil.mrp"/>
-</component>
-<component name="activitymanager" long-name="Activity Manager" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/activitymanager/group" mrp="os/devicesrv/commonservices/activitymanager/group/activitymanager.mrp"/>
-</component>
-</collection>
-<collection name="dosservices" long-name="Domestic Operating System Services" level="hw-if">
-<component name="commondsy" filter="s60" long-name="Common DSY" plugin="Y">
-<unit bldFile="os/devicesrv/dosservices/commondsy/group"/>
-</component>
-<component name="dosserver" filter="s60" long-name="Domestic OS Server">
-<unit bldFile="os/devicesrv/dosservices/dosserver/group"/>
-</component>
-</collection>
-<collection name="sensorservices" long-name="Sensor Services" level="framework">
-<component name="sensorserver" filter="s60" long-name="Sensor Server">
-<unit bldFile="os/devicesrv/sensorservices/sensorserver/group"/>
-</component>
-<component name="orientationssy" filter="s60" long-name="Orientation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/orientationssy/group"/>
-</component>
-<component name="tiltcompensationssy" filter="s60" long-name="Tilt Compensation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/tiltcompensationssy/group"/>
-</component>
-<component name="sensordatacompensator" filter="s60" long-name="Sensor Data Compensator">
-<unit bldFile="os/devicesrv/sensorservices/sensordatacompensator/group"/>
-</component>
-</collection>
-<collection name="hwrmhaptics" long-name="HWRM Haptics" level="plugin">
-<component name="hapticseffectdatagetterfw" filter="s60" long-name="Haptics Effect Data Getter Framework">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
-</component>
-<component name="hapticspluginservice" filter="s60" long-name="Haptics Plugin Service">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
-</component>
-<component name="hapticspacketizer" filter="s60" long-name="Haptics Packetizer">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
-</component>
-<component name="hapticspluginmanager" filter="s60" long-name="Haptics Plugin Manager">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
-</component>
-<component name="hapticsserver" filter="s60" long-name="Haptics Server">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsserver/group"/>
-</component>
-<component name="hapticsclient" filter="s60" long-name="Haptics Client">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsclient/group"/>
-</component>
-<component name="hwrmhaptics_build" filter="s60" long-name="HWRM Haptics Build">
-<!-- move these exports into the appropriate above components and delete this component-->
-<unit bldFile="os/devicesrv/hwrmhaptics/group"/>
-</component>
-</collection>
-<collection name="mediator" long-name="Mediator" level="app-if">
-<!--collection is really a component. Move it down a directory -->
-<component name="mediator_build" filter="s60" long-name="Mediator Build">
-<unit bldFile="os/devicesrv/mediator/group"/>
-</component>
-</collection>
-<collection name="psmservices" long-name="Power Save Mode Services" level="app-if">
-<component name="psmserver" filter="s60" long-name="PSM Server">
-<unit bldFile="os/devicesrv/psmservices/psmserver/group"/>
-</component>
-</collection>
-<collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
-<component name="hwrmfmtxwatcherplugin" filter="s60" long-name="HWRM FM Transmitter Watcher Plugin" plugin="Y">
-<unit bldFile="os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
-</component>
-<component name="hwrmtargetmodifierplugin" filter="s60" long-name="HWRM Target Modifier Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build,
- may need to -->
-<!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
-</component>
-<component name="vibractrl" filter="s60" long-name="Vibra Control" deprecated="9.1">
-<unit bldFile="os/devicesrv/resourcemgmt/vibractrl/group"/>
-</component>
-<component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="^2" purpose="optional">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
-</component>
-<component name="hwresourcesmgrconfig" long-name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
-</component>
-<component name="resourcemgmt_build" filter="s60" long-name="Resource Management Build">
-<!-- Move exports to a self-contained component.
- This needs to be kept around until configuration is in place -->
-<unit bldFile="os/devicesrv/resourcemgmt/group"/>
-</component>
-<component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
-</component>
-</collection>
-<collection name="sysstatemgmt" long-name="System State Management" level="server">
-<component name="ssmmapperutility" filter="s60" long-name="SSM Mapper Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmmapperutility/group"/>
-</component>
-<component name="ssmpolicyplugins" filter="s60" long-name="SSM Policy Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmpolicyplugins/group"/>
-</component>
-<component name="ssmutilityplugins" filter="s60" long-name="SSM Utility Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmutilityplugins/group"/>
-</component>
-<component name="ssmcmdlists" filter="s60" long-name="SSM Command Lists" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcmdlists/group"/>
-</component>
-<component name="ssmcustcmds" filter="s60" long-name="SSM Custom Commands" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcustcmds/group"/>
-</component>
-<component name="syslangutil" filter="s60" long-name="System Language Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/syslangutil/group"/>
-</component>
-<component name="sysrestart" filter="s60" long-name="System Restart" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysrestart/group"/>
-</component>
-<component name="sysuiprovider" filter="s60" long-name="System UI Provider" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysuiprovider/group"/>
-</component>
-<component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/group" mrp="os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
-</component>
-<component name="systemstatemgr" long-name="System State Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
-</component>
-<component name="systemstateplugins" long-name="System State Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
-</component>
-<component name="systemstatereferenceplugins" long-name="System State Reference Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
-</component>
-</collection>
-<collection name="resourceinterfaces" long-name="Resource Interfaces" level="hw-if">
-<component name="fmtransmittercontrol" long-name="FM Transmitter Control" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group" mrp="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
-</component>
-</collection>
-<collection name="systemhealthmanagement" long-name="System Health Management" level="server">
-<component name="systemhealthmgr" long-name="System Health Manager" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
-</component>
-</collection>
-<collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if"/>
-<collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
-<component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
-<collection name="authenticationservices" long-name="Authentication Services" level="utilities">
-<component name="authenticationserver" long-name="Authentication Server" introduced="^3" purpose="optional">
-<unit bldFile="os/security/authenticationservices/authenticationserver/group" mrp="os/security/authenticationservices/authenticationserver/group/security_authserver.mrp"/>
-</component>
-</collection>
-<collection name="authorisation" long-name="Authorisation" level="utilities">
-<component name="userpromptservice" long-name="User Prompt Service" introduced="^3" purpose="mandatory">
-<unit bldFile="os/security/authorisation/userpromptservice/group" mrp="os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
-</component>
-<component name="userpromptutils" long-name="User Prompt Utils" introduced="^3" purpose="optional">
-<unit bldFile="os/security/authorisation/userpromptutils/group" mrp="os/security/authorisation/userpromptutils/group/security_ups_utils.mrp"/>
-</component>
-</collection>
-<collection name="contentmgmt" long-name="Content Management" level="utilities">
-<component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
-<unit bldFile="os/security/contentmgmt/contentaccessfwfordrm/group" mrp="os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
-</component>
-<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>
-</collection>
-<collection name="crypto" long-name="Crypto Libraries" level="libraries">
-<component name="weakcryptospi" long-name="Weak Crypto SPI" filter="gt" introduced="^3" purpose="optional">
-<unit bldFile="os/security/crypto/weakcryptospi/group" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
-</component>
-<component name="strongcryptospi" long-name="Strong Crypto SPI" filter="gt" introduced="^3" purpose="optional">
-<unit bldFile="os/security/crypto/weakcryptospi/strong" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
-</component>
-</collection>
-<collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
-<component name="securityutils" long-name="Security Utils" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/securityutils/group" mrp="os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
-</component>
-<component name="securitydocs" long-name="Security Documentation" purpose="development" class="doc">
-<unit mrp="os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
-</component>
-<component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
-</component>
-<component name="securitycommonutils" long-name="Security Common Utils" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/security/cryptomgmtlibs/securitycommonutils/group" mrp="os/security/cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
-</component>
-</collection>
-<collection name="securityanddataprivacytools" long-name="Security and Data Privacy Tools" level="services">
-<component name="securityconfig" long-name="Security Config" introduced="9.1" purpose="optional">
-<unit bldFile="os/security/securityanddataprivacytools/securityconfig/group" mrp="os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
-</component>
-<component name="securitytools" long-name="Security Tools" introduced="^3" purpose="optional" class="PC">
-<unit bldFile="os/security/securityanddataprivacytools/securitytools/group" mrp="os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
-</component>
-</collection>
-<collection name="cryptoplugins" long-name="Crypto Plugins" level="plugins">
-<component name="cryptospiplugins" long-name="Crypto SPI Plugins" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/security/cryptoplugins/cryptospiplugins/group" mrp="os/security/cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
-</component>
-</collection>
-<collection name="cryptoservices" long-name="Crypto Services" level="plugins">
-<component name="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/certificateandkeymgmt/group" mrp="os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
-</component>
-<component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
-</component>
-<component name="browserrootcertificates" long-name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
-<unit mrp="os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
-</component>
-<component name="rootcertificates" filter="sf_build" long-name="Root Certificates" introduced="7.0s" purpose="optional">
-<!-- not in S60 codebase -->
-<unit bldFile="os/security/cryptoservices/rootcertificates/group" mrp="os/security/cryptoservices/rootcertificates/group/rootcerts.mrp"/>
-</component>
-<component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/asnpkcs/group" mrp="os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
-</component>
-</collection>
-<collection name="security_info" long-name="OS Security Info" level="utilities">
-<component name="security_metadata" long-name="OS Security Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/security/security_info/security_metadata/security_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
-<collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
-<component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
-</component>
-<component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
-</component>
-<component name="simulationpositioningmodule" long-name="Simulation Positioning Module" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
-</component>
-<component name="gpspositioningmodule" long-name="GPS/A-GPS Positioning Module" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/gpspositioningmodule/group" mrp="os/lbs/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
-</component>
-<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>
-</collection>
-<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
-<component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
-</component>
-</collection>
-<collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
-<component name="locationserver" long-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 name="networkrequesthandler" long-name="Network Request Handler" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
-</component>
-</collection>
-<collection name="lbstest" long-name="Locating Services Tests" level="application-interface">
-<component name="locationprotocoltest" long-name="Location Protocol Tests" introduced="9.2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/lbstest/locationprotocoltest/group" mrp="os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
-</component>
-</collection>
-<collection name="locationmgmt" long-name="Location Management" level="management">
-<component name="locmonitor" long-name="Location Monitor" introduced="^3" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
-</component>
-<component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/agpslocationmgr/group" mrp="os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
-</component>
-<component name="networklocationmgr" long-name="Network Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/networklocationmgr/group" mrp="os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
-</component>
-<component name="locationcore" long-name="Location Core" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locationcore/group" mrp="os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
-</component>
-<component name="networkgateway" long-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 name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
-<component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
-</component>
-<component name="networkprotoutils" long-name="Network Protocol Common Utilities" introduced="^3">
-<unit bldFile="os/lbs/networkprotocolmodules/common/utils/group"/>
-</component>
-<component name="suplproxyprotocolmodule" long-name="SUPL Proxy Protocol Module" filter="sf_build" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/networkprotocolmodules/suplproxyprotocolmodule/sfgroup"/>
-</component>
-<component name="suplrrlpasn1" filter="sf_build" long-name="SUPL RRLP ASN1 Parser">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
-</component>
-<component name="suplrrlpprotocol" filter="sf_build" long-name="SUPL RRLP Protocol Module">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup"/>
-</component>
-</collection>
-<collection name="lbsapitest" long-name="Location API Tests" level="application-interface"/>
-<collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
-<component name="lbs_metadata" long-name="Locating Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commsfw" level="services" long-name="Communications Framework" levels="server support framework process app-if">
-<collection name="commsprocess" long-name="Comms Process" level="process">
-<component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/commsfw/commsprocess/commsrootserverconfig/group" mrp="os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
-</component>
-</collection>
-<collection name="commsconfig" long-name="Comms Config" level="process">
-<component name="commsdatabase" long-name="Comms Database" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
-</component>
-<component name="commsdatabaseshim" long-name="Comms Database Shim" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/commsfw/commsconfig/commsdatabaseshim/group" mrp="os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
-</component>
-</collection>
-<collection name="datacommsserver" long-name="Data Comms Server" level="framework">
-<component name="esockserver" long-name="ESock Server" purpose="mandatory">
-<unit bldFile="os/commsfw/datacommsserver/esockserver/group" mrp="os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp" version="3"/>
-</component>
-<component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/group" mrp="os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
-</component>
-<component name="networkingdialogstub" long-name="Networking Dialog Stub" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/default" mrp="os/commsfw/datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
-</component>
-<component name="networkcontroller" long-name="Network Controller" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/datacommsserver/networkcontroller/group" mrp="os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
-</component>
-</collection>
-<collection name="serialserver" long-name="Serial Server" level="server">
-<component name="serialportcsy" long-name="Serial Port CSY" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/serialserver/serialportcsy" mrp="os/commsfw/serialserver/serialportcsy/ser-comms_serialportcsy.mrp"/>
-</component>
-<component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" purpose="development">
-<unit bldFile="os/commsfw/serialserver/packetloopbackcsy/group" mrp="os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
-</component>
-<component name="c32serialserver" long-name="C32 Serial Server" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/commsfw/serialserver/c32serialserver/group" mrp="os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
-</component>
-<component name="c32serialserverconfig" long-name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config">
-<unit bldFile="os/commsfw/serialserver/c32serialserverconfig" mrp="os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
-</component>
-<component name="c32serialserverdocs" long-name="C32 Serial Server Documentation" purpose="development" class="doc">
-<unit mrp="os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
-</component>
-</collection>
-<collection name="commsfwutils" long-name="Comms Framework Utilities" level="framework">
-<component name="commsbufs" long-name="Comms Buffers" introduced="^3" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwutils/commsbufs/group" mrp="os/commsfw/commsfwutils/commsbufs/group/comms-infras_commsbufs.mrp"/>
-</component>
-</collection>
-<collection name="commsfw_info" long-name="Comms Framework Info" level="app-if">
-<component name="commsinfrastructuredocs" long-name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
-<unit mrp="os/commsfw/commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
-</component>
-<component name="commsfw_metadata" long-name="Communications Framework Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/commsfw/commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
-</component>
-</collection>
-<collection name="commsfwsupport" long-name="Comms Framework Support" level="support">
-<component name="commselements" long-name="Comms Elements" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwsupport/commselements/group" mrp="os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
-</component>
-</collection>
-<collection name="commsinfrastructureapitest" long-name="Comms-Infras API Tests" level="app-if">
-<component name="commsinfrastructuresvs" long-name="Comms Infrastructure Verification Suite" introduced="^3" purpose="development">
-<unit mrp="os/commsfw/commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
-</component>
-</collection>
-<collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
-<component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
-</component>
-<component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" purpose="mandatory" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
-</component>
-<component name="commstools" long-name="Comms Tools" introduced="^3" purpose="development" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/commstools/group" mrp="os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
-</component>
-</collection>
-</block>
-<block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
-<component name="internetsockets" long-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>
-<collection name="tcpiputils" long-name="TCP/IP Utilities" level="plugin">
-<component name="dnd" long-name="DND" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/dnd/group" mrp="os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
-</component>
-<component name="dhcp" long-name="DHCP" introduced="8.0" purpose="optional">
-<unit bldFile="os/networkingsrv/tcpiputils/dhcp/group" mrp="os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
-</component>
-<component name="networkaddressandporttranslation" long-name="Network Address and Port Translation" introduced="^2" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
-</component>
-<component name="punycodeconv" long-name="Punycode Converter" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/punycodeconv/group" mrp="os/networkingsrv/tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
-</component>
-</collection>
-<collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
-<component name="nullagt" long-name="NULL AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/nullagt/group" mrp="os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
-</component>
-<component name="genericscprparameters" long-name="Generic SCPR Parameters" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/linklayercontrol/genericscprparameters/group" mrp="os/networkingsrv/linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
-</component>
-<component name="mbmsparameters" long-name="MBMS Parameters" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/mbmsparameters/group" mrp="os/networkingsrv/linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
-</component>
-<component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
-<unit bldFile="os/networkingsrv/linklayercontrol/networkinterfacemgr/group" mrp="os/networkingsrv/linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp" version="2"/>
-</component>
-</collection>
-<collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
-<component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
-</component>
-<component name="pppnif" long-name="PPP NIF" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/pppnif/group" mrp="os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp" version="2"/>
-</component>
-<component name="slipnif" long-name="SLIP NIF" purpose="development" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/slipnif/group" mrp="os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
-</component>
-<component name="tunnelnif" long-name="Tunnel NIF" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
-</component>
-</collection>
-<collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
-<component name="packetlogger" long-name="Packet Logger" introduced="8.1" purpose="development">
-<unit bldFile="os/networkingsrv/linklayerutils/packetlogger/group" mrp="os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
-</component>
-</collection>
-<collection name="networkcontrol" long-name="Network Control" level="plugin">
-<component name="qoslib" long-name="QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/qoslib/group" mrp="os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
-</component>
-<component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/pfqoslib/group" mrp="os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
-</component>
-<component name="qosfwprt" long-name="QoS Framework PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
-</component>
-<component name="qosipscpr" long-name="QoS IP SCPR" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosipscpr/group" mrp="os/networkingsrv/networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
-</component>
-<component name="ipnetworklayer" long-name="IP Network Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/ipnetworklayer/group" mrp="os/networkingsrv/networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
-</component>
-<component name="iptransportlayer" long-name="IP Transport Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/iptransportlayer/group" mrp="os/networkingsrv/networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
-</component>
-<component name="commsuserpromptmgr" long-name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkcontrol/commsuserpromptmgr/group" mrp="os/networkingsrv/networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
-</component>
-</collection>
-<collection name="networkprotocols" long-name="Network Protocols" level="plugin">
-<component name="ipeventnotifier" long-name="IP Event Notifier" introduced="8.1" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
-</component>
-<component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
-</component>
-<component name="iphook" long-name="IP Hook" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
-</component>
-<component name="mobileip" long-name="Mobile IP" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/mobileip/group" mrp="os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
-</component>
-<component name="dnsproxy" long-name="DNS Proxy" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/networkprotocols/dnsproxy/group" mrp="os/networkingsrv/networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
-</component>
-</collection>
-<collection name="networksecurity" long-name="Network Security" level="framework">
-<component name="tls" long-name="TLS" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tls/group" mrp="os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
-</component>
-<component name="tlsprovider" long-name="TLS Provider" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tlsprovider/group" mrp="os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
-</component>
-<component name="ipsec" long-name="IPsec" introduced="7.0" purpose="optional">
-<unit bldFile="os/networkingsrv/networksecurity/ipsec/group" mrp="os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
-</component>
-</collection>
-<collection name="networkingtestandutils" long-name="Networking Test and Utils" level="app-if">
-<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">
-<!-- production component: contains the IBY files -->
-<unit bldFile="os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
-</component>
-<component name="networkingdocs" long-name="Networking Documentation" purpose="development" class="doc">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
-</component>
-<component name="networkingsrv_metadata" long-name="Networking Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
-<component name="predictorcompression" long-name="Predictor Compression" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wlan" level="services" long-name="WLAN" levels="hw low mid high tools test">
-<collection name="wlan_plat" long-name="WLAN Platform Interfaces" level="test">
-<component name="wlan_dbif_api" long-name="WLAN DBIF API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_dbif_api/group"/>
-</component>
-<component name="wlan_hal_api" long-name="WLAN HAL API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hal_api/group"/>
-</component>
-<component name="wlan_management_api" long-name="WLAN Management API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_management_api/group"/>
-</component>
-<component name="wlan_device_settings_api" long-name="WLAN Device Settings API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_device_settings_api/group"/>
-</component>
-<component name="wlan_control_api" long-name="WLAN Control API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_control_api/group"/>
-</component>
-<component name="wlan_hw_initialization_data_api" long-name="WLAN Hardware Initialization Data API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hw_initialization_data_api/group"/>
-</component>
-<component name="wlan_power_save_plugin_api" long-name="WLAN Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_power_save_plugin_api/group"/>
-</component>
-<component name="wlan_info_api" long-name="WLAN Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_info_api/group"/>
-</component>
-<component name="wlan_agent_hotspot_plugin_api" long-name="WLAN Agent Hotspot Plug-in API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
-</component>
-<component name="wlan_osa_api" long-name="WLAN OSA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_osa_api/group"/>
-</component>
-<component name="wlan_spia_api" long-name="WLAN SPIA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_spia_api/group"/>
-</component>
-<component name="wlan_hpa_api" long-name="WLAN HPA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hpa_api/group"/>
-</component>
-<component name="wlan_eapol_plugin_api" long-name="WLAN EAPOL Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_eapol_plugin_api/group"/>
-</component>
-<component name="wlan_generic_plugin_api" long-name="WLAN Generic Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_generic_plugin_api/group"/>
-</component>
-<component name="wlan_aws_plugin_api" long-name="WLAN AWS Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_aws_plugin_api/group"/>
-</component>
-</collection>
-<collection name="wlan_pub" long-name="WLAN Public Interfaces" level="test">
-<component name="wlan_sdk_info_api" long-name="WLAN SDK Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_pub/wlan_sdk_info_api/group"/>
-</component>
-</collection>
-<collection name="wlan_bearer" long-name="WLAN Bearer" level="hw">
-<component name="wlanpsmplugin" filter="s60" long-name="WLAN PSM Plugin" plugin="Y">
-<unit bldFile="os/wlan/wlan_bearer/wlanpsmplugin/group"/>
-</component>
-<component name="wlanagent" filter="s60" long-name="WLAN Agent">
-<unit bldFile="os/wlan/wlan_bearer/wlanagent/group"/>
-</component>
-<component name="wlandbif_cd" filter="s60" long-name="WLAN CommsDat interface">
-<unit bldFile="os/wlan/wlan_bearer/wlandbif_cd/group"/>
-</component>
-<!-- should follow component directory rules for stuff in wlan_symbian/ and put in a single component or split up properly -->
-<component name="wlanengine" filter="s60" long-name="WLAN Engine">
-<unit bldFile="os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
-</component>
-<component name="wlanldd" filter="s60" long-name="WLAN LDD">
-<unit bldFile="os/wlan/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
-</component>
-<component name="wlannwif" filter="s60" long-name="WLAN Network Interface">
-<unit bldFile="os/wlan/wlan_bearer/wlannwif/group"/>
-</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="adaptation hw-if plugin framework server app-if">
-<collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
-<component name="basebandchanneladaptor" long-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 name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
-<component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
-</component>
-</collection>
-<collection name="fax" long-name="Fax" level="server">
-<component name="faxclientandserver" long-name="Fax Client and Server" purpose="optional">
-<unit bldFile="os/cellularsrv/fax/faxclientandserver/Group" mrp="os/cellularsrv/fax/faxclientandserver/Group/telephony_fax.mrp"/>
-</component>
-</collection>
-<collection name="smsprotocols" long-name="SMS Protocols" level="framework">
-<component name="smsstack" long-name="SMS Stack" introduced="6.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/cellularsrv/smsprotocols/smsstack/group" mrp="os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
-</component>
-</collection>
-<collection name="telephonyprotocols" long-name="Telephony Protocols" level="framework">
-<component name="csdagt" long-name="CSD AGT" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/csdagt/group" mrp="os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
-</component>
-<component name="psdagt" long-name="PSD AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/psdagt/group" mrp="os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
-</component>
-<component name="gprsumtsqosprt" long-name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
-</component>
-<component name="gprsumtsqosinterface" long-name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
-</component>
-<component name="qosextnapi" long-name="QoS Extn API" introduced="9.2" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
-</component>
-<component name="secondarypdpcontextumtsdriver" long-name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
-</component>
-<component name="qos3gppcpr" long-name="QoS 3GPP CPR" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
-</component>
-<component name="pdplayer" long-name="PDP Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/pdplayer/group" mrp="os/cellularsrv/telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
-</component>
-<component name="rawipnif" long-name="Raw IP NIF" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserver" long-name="Telephony Server" level="server">
-<component name="etelserverandcore" long-name="ETel Server and Core" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
-</component>
-<component name="etelmultimode" long-name="ETel Multimode" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelmultimode/group" mrp="os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
-</component>
-<component name="etelpacketdata" long-name="ETel Packet Data" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
-</component>
-<component name="etelsimtoolkit" long-name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
-<component name="common_tsy" long-name="Common TSY" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
-</component>
-<component name="licenseetsystub" long-name="Licensee TSY Stub" introduced="^2" purpose="development" filter="sf_build" plugin="Y">
-<unit mrp="os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="os/cellularsrv/telephonyserverplugins/licenseetsystub/group"/>
-</component>
-<component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
-</component>
-<component name="simtsy" long-name="SIM TSY" introduced="7.0" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
-</component>
-<component name="ctsydispatchlayer" long-name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
-</component>
-<component name="simatktsy" long-name="SIMATK TSY" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simatktsy/group" mrp="os/cellularsrv/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
-</component>
-</collection>
-<collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
-<component name="dial" long-name="Dial" deprecated="9.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyutils/dial/group" mrp="os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
-</component>
-<component name="telephonywatchers" long-name="Telephony Watchers" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
-</component>
-<component name="etel3rdpartyapi" long-name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrv_info" long-name="Cellular Baseband Services Info" level="app-if">
-<component name="telephonyconfidentialdocs" long-name="Telephony Confidential Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
-</component>
-<component name="telephonydocs" long-name="Telephony Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
-</component>
-<component name="cellularsrv_metadata" long-name="Cellular Baseband Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
-<component name="mocksy" long-name="MockSY" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if"/>
-</block>
-<block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
-<collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
-<component name="bluetooth_audio_adaptation_api" long-name="Bluetooth Audio Adaptation API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
-</component>
-<component name="bluetooth_power_management_api" long-name="Bluetooth Power Management API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_power_management_api/group"/>
-</component>
-<component name="at_command_handler_plugin_api" long-name="AT Command Handler Plugin API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/at_command_handler_plugin_api/group"/>
-</component>
-</collection>
-<collection name="bluetooth" long-name="Bluetooth Core" level="framework">
-<component name="btstack" long-name="Bluetooth Stack" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btstack" mrp="os/bt/bluetooth/btstack/bluetooth_stack.mrp"/>
-</component>
-<component name="btcomm" long-name="Bluetooth CSY" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetooth/btcomm" mrp="os/bt/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
-</component>
-<component name="btsdp" long-name="Bluetooth SDP" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btsdp" mrp="os/bt/bluetooth/btsdp/bluetooth_sdp.mrp"/>
-</component>
-<component name="btextnotifiers" long-name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btextnotifiers" mrp="os/bt/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
-</component>
-<component name="gavdp" long-name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/gavdp/group" mrp="os/bt/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
-</component>
-<component name="btlogger" long-name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btlogger/group" mrp="os/bt/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
-</component>
-<component name="btdocs" long-name="Bluetooth Documentation" purpose="development" class="doc">
-<unit mrp="os/bt/bluetooth/btdocs/bluetooth_documentation.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothmgmt" long-name="Bluetooth Management" level="plugin">
-<component name="btmgr" long-name="Bluetooth Manager" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btmgr" mrp="os/bt/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
-</component>
-<component name="btconfig" long-name="Bluetooth Config" purpose="optional" class="config">
-<unit bldFile="os/bt/bluetoothmgmt/btconfig" mrp="os/bt/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
-</component>
-<component name="btrom" long-name="Bluetooth ROM" introduced="9.1" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btrom" mrp="os/bt/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
-</component>
-<component name="bluetoothclientlib" long-name="Bluetooth Client Library" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/bluetoothclientlib" mrp="os/bt/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothcommsprofiles" long-name="Bluetooth Comms Profiles" level="app-if">
-<component name="btpan" long-name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetoothcommsprofiles/btpan/group" mrp="os/bt/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
-</component>
-</collection>
-<collection name="bthci" long-name="Host Controller Interface" level="server">
-<component name="bthci2" long-name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bthci/bthci2/group" mrp="os/bt/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
-</component>
-<component name="hciextensioninterface" long-name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bthci/hciextensioninterface" mrp="os/bt/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
-</component>
-<component name="hci2implementations" long-name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bthci/hci2implementations/group" mrp="os/bt/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
-</component>
-</collection>
-<collection name="irda" long-name="IrDA" level="plugin">
-<component name="irdastack" long-name="IrDA Stack" purpose="optional">
-<unit bldFile="os/bt/irda/irdastack/group" mrp="os/bt/irda/irdastack/group/infra-red_irda.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if"/>
-<collection name="atext" long-name="AT Extensions" level="server">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="atext_build" long-name="AT Extension Build" introduced="^3" purpose="optional" filter="s60">
-<unit bldFile="os/bt/atext/group"/>
-</component>
-</collection>
-<collection name="bt_info" long-name="Bluetooth Info" level="app-if">
-<component name="bt_metadata" long-name="Bluetooth Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/bt/bt_info/bt_metadata/bt_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
-<collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
-<!-- usbclientdrivers to be moved here from kernelhwsrv-->
-</collection>
-<collection name="usbmgmt" long-name="USB Management" level="server">
-<component name="usbmgr" long-name="USB Manager" purpose="optional">
-<unit bldFile="os/usb/usbmgmt/usbmgr/group" mrp="os/usb/usbmgmt/usbmgr/group/usb_manager.mrp" version="2"/>
-</component>
-<component name="usbclassandmgrdocs" long-name="USB Class and Manager Documentation" purpose="development" class="doc">
-<unit mrp="os/usb/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
-</component>
-</collection>
-<collection name="usb_info" long-name="USB Info" level="app-if">
-<component name="usb_metadata" long-name="USB Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/usb/usb_info/usb_metadata/usb_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="mm" level="services" long-name="Multimedia" levels="adaptation 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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-</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"/>
-</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"/>
-</component>
-<component name="aac_decoder_config_proxy_api" long-name="AAC Decoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/aac_decoder_config_proxy_api/group"/>
-</component>
-<component name="added_devsound_control_api" long-name="Added DevSound Control API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_api/group"/>
-</component>
-<component name="added_devsound_control_msg_hdlr_api" long-name="Added DevSound Control Msg Hdlr API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_msg_hdlr_api/group"/>
-</component>
-<component name="added_devsound_control_proxy_api" long-name="Added DevSound Control Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_proxy_api/group"/>
-</component>
-<component name="audio_effects_msg_hdlr_api" long-name="Audio Effects Message Handler API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_msg_hdlr_api/group"/>
-</component>
-<component name="audio_effects_proxy_api" long-name="Audio Effects Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_proxy_api/group"/>
-</component>
-<component name="audio_policy_header_api" long-name="Audio Policy Header API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="audio_routing_proxy_api" long-name="Audio Routing Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_routing_proxy_api/group"/>
-</component>
-<component name="custom_interface_builder_api" long-name="Custom Interface Builder API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_builder_api/group"/>
-</component>
-<component name="custom_interface_message_handler_factory_api" long-name="Custom Interface Message Handler Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_message_handler_factory_api/group"/>
-</component>
-<component name="custom_interface_proxy_factory_api" long-name="Custom Interface Proxy Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_proxy_factory_api/group"/>
-</component>
-<component name="custom_interface_utility_api" long-name="Custom Interface Utility API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_utility_api/group"/>
-</component>
-<component name="devsound_adaptation_api" long-name="DevSound Adaptation API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/devsound_adaptation_api/group"/>
-</component>
-<component name="display_posting_api" long-name="Display Posting API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="eaac_plus_decoder_interface_proxy_api" long-name="eAAC Plus Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="error_concealment_interface_proxy_api" long-name="Error Concealment Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
-</component>
-<component name="fm_radio_adaptation_api" long-name="FM Radio Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_decoder_interface_proxy_api" long-name="G711 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_encoder_interface_proxy_api" long-name="G711 Encoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_decoder_interface_proxy_api" long-name="G729 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_encoder_interface_msg_hdlr_api" long-name="G729 Encoder Interface Message Handler API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</component>
-<component name="ilbc_decoder_interface_proxy_api" long-name="Ilbc Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ilbc_encoder_interface_proxy_api" long-name="Ilbc Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="mdf_plugin_uids" long-name="MDF Plug-in UIDs" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/mdf_plugin_uids/group"/>
-</component>
-<component name="multimedia_fourcc_definitions_api" long-name="Multimedia FourCC Definitions API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/multimedia_fourcc_definitions_api/group"/>
-</component>
-<component name="nokia_audio_policy_header_api" long-name="Nokia Audio Policy Header API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/nokia_audio_policy_header_api/group"/>
-</component>
-<component name="nokia_multimedia_fourcc_definitions_api" long-name="Nokia Multimedia Fourcc Definitions API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ra8_decoder_interface_proxy_api" long-name="RA8 Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
-</component>
-<component name="rds_adaptation_api" long-name="RDS Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="restricted_audio_output_proxy_api" long-name="Restricted Audio Output Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="sbc_encoder_interface_proxy_api" long-name="SBC Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/sbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="secure_output_mdf_custom_interface" long-name="Secure Output MDF Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="speech_encoder_config_proxy_api" long-name="Speech Encoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/speech_encoder_config_proxy_api/group"/>
-</component>
-<component name="telephony_audio_routing_client_api" long-name="Telephony Audio Routing Client API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_client_api/group"/>
-</component>
-<component name="telephony_audio_routing_manager_api" long-name="Telephony Audio Routing Manager API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_manager_api/group"/>
-</component>
-<component name="video_buffer_management_mdf_custom_interface" long-name="Video Buffer Management MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_buffer_management_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_rotation_mdf_custom_interface" long-name="Video Decoder Rotation MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_scaling_mdf_custom_interface" long-name="Video Decoder Scaling MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
-</component>
-<component name="video_reclaim_extbuffers_ci" long-name="Video Reclaim Extbuffers Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_reclaim_extbuffers_ci/group"/>
-</component>
-<component name="video_window_control_custom_interface" long-name="Video Window Control Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="wma_decoder_interface_proxy_api" long-name="WMA Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/wma_decoder_interface_proxy_api/group"/>
-</component>
-<component name="eaacplusutil_api" long-name="EAac Plus Util API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/eaacplusutil_api/group"/>
-</component>
-<component name="frametable_api" long-name="Frametable API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/frametable_api/group"/>
-</component>
-</collection>
-<collection name="devsoundextensions" long-name="Devsound Extensions" level="device-fw">
-<component name="drmaudioplayer" filter="s60" long-name="DRM Audio Player">
-<unit bldFile="os/mm/devsoundextensions/drmaudioplayer/group"/>
-</component>
-<component name="mmextfw" filter="s60" long-name="Multimedia Extension Framework">
-<unit bldFile="os/mm/devsoundextensions/mmextfw/group"/>
-</component>
-<component name="audiorouting" filter="s60" long-name="Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/audiorouting/group"/>
-</component>
-<component name="effects" filter="s60" long-name="Effects">
-<unit bldFile="os/mm/devsoundextensions/effects/group"/>
-</component>
-<component name="effectspresets" filter="s60" long-name="Effects Presets">
-<unit bldFile="os/mm/devsoundextensions/effectspresets/group"/>
-</component>
-<component name="effectspresets_utils" filter="s60" long-name="Effects Presets Utils">
-<!-- need to #include the lot from a single bld.inf
- Also move to a standard component location, not under effectspresets -->
-<unit bldFile="os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
-<unit bldFile="os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
-</component>
-<component name="telephonyaudiorouting" filter="s60" long-name="Telephony Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/group"/>
-</component>
-<component name="mmfcustominterfaces" filter="s60" long-name="MMF Custom Interfaces">
-<unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/group"/>
-</component>
-<component name="addeddevsoundcontrol" filter="s60" long-name="Added DevSound Control">
-<unit bldFile="os/mm/devsoundextensions/addeddevsoundcontrol/group"/>
-</component>
-<component name="globalaudiosettings" filter="s60" long-name="Global Audio Settings">
-<unit bldFile="os/mm/devsoundextensions/globalaudiosettings/group"/>
-</component>
-<component name="restrictedaudiooutput" filter="s60" long-name="Restricted Audio Output">
-<unit bldFile="os/mm/devsoundextensions/restrictedaudiooutput/group"/>
-</component>
-<component name="ciextnfactoryplugins" filter="s60" long-name="Custom Interface Extension Factory Plugins" plugin="Y">
-<unit bldFile="os/mm/devsoundextensions/ciextnfactoryplugins/group"/>
-</component>
-</collection>
-<collection name="mdfdevvideoextensions" long-name="MDF Dev Video Extensions" level="device-fw">
-<component name="nga_mdf_postprocessor" long-name="NGA MDF Postprocessor" filter="s60">
-<unit bldFile="os/mm/mdfdevvideoextensions/nga_mdf_postprocessor/group"/>
-</component>
-</collection>
-<collection name="audio" long-name="Audio Codecs" level="middleware">
-<component name="arm_cmmf_codecs" filter="s60" long-name="ARM CMMF Codecs" plugin="Y">
-<unit bldFile="os/mm/audio/arm_cmmf_codecs/group"/>
-</component>
-</collection>
-<collection name="video" long-name="Video Codecs" level="middleware">
-<!-- empty -->
-</collection>
-<collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
-<component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/imagingandcamerafws/imagingfws/group" mrp="os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
-</component>
-<component name="camerafw" long-name="Camera Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/imagingandcamerafws/camerafw/group" mrp="os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
-</component>
-</collection>
-<collection name="mmlibs" long-name="Multimedia Libraries" level="middleware">
-<component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmutilitylib/group" mrp="os/mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
-</component>
-<component name="mmfw" long-name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmfw/group" mrp="os/mm/mmlibs/mmfw/group/multimedia_mmf.mrp"/>
-</component>
-</collection>
-<collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
-<component name="imagingplugins" long-name="Imaging Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/imagingplugins/group" mrp="os/mm/mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
-</component>
-<component name="cameraplugins" long-name="Camera Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/cameraplugins/group" mrp="os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
-</component>
-<component name="lib3gp" long-name="3GP Library" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/mmplugins/lib3gp/group" mrp="os/mm/mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
-</component>
-<component name="mmfwplugins" long-name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/mmfwplugins/group" mrp="os/mm/mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
-</component>
-</collection>
-<collection name="mm_info" long-name="Multimedia Info" level="app-if">
-<component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc">
-<unit mrp="os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
-</component>
-<component name="mm_metadata" long-name="Multimedia Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
-<component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="^2" purpose="development">
-<unit bldFile="os/mm/mmresourcemgmt/mmresctrl/group" mrp="os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
-</component>
-</collection>
-<collection name="mmdevicefw" long-name="Multimedia Device Framework" level="device-fw">
-<component name="mdf" long-name="Media Device Framework" introduced="9.2" purpose="mandatory">
-<unit bldFile="os/mm/mmdevicefw/mdf/group" mrp="os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
-</component>
-<component name="speechrecogsupport" long-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 name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
-<component name="videorenderer" long-name="Video Renderer" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/mmswadaptation/videorenderer/group" mrp="os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
-</component>
-</collection>
-<collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw"/>
-<collection name="omxil" long-name="OpenMAX IL" level="hw-if">
-<component name="omxilapi" long-name="OpenMAX IL API" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilapi/group" mrp="os/mm/omxil/omxilapi/group/multimedia_omx_il_api.mrp" version="1"/>
-</component>
-<component name="omxilcore" long-name="OpenMAX IL Core" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcore/group" mrp="os/mm/omxil/omxilcore/group/multimedia_omx_il_core.mrp" version="1"/>
-</component>
-<component name="omxilcomponentcommon" long-name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcomponentcommon/group" mrp="os/mm/omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp" version="1"/>
-</component>
-<component name="omxilrefcomps" long-name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilrefcomps/ref_components/group" mrp="os/mm/omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp" version="1"/>
-</component>
-<component name="mmilapi" long-name="Multimedia Integration Layer API" introduced="^3" purpose="development">
-<unit bldFile="os/mm/omxil/mmilapi/group" mrp="os/mm/omxil/mmilapi/group/multimedia_il_api.mrp"/>
-</component>
-</collection>
-<collection name="devsound" long-name="Sound Device" level="devices">
-<component name="devsoundapi" long-name="DevSound API" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/devsound/devsoundapi/group" mrp="os/mm/devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
-</component>
-<component name="a3fdevsound" long-name="A3F DevSound" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3fdevsound/group" mrp="os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
-</component>
-<component name="a3facf" long-name="A3F Audio Component Framework" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3facf/group" mrp="os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
-</component>
-<component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/devsound/devsoundpluginsupport/group" mrp="os/mm/devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
-</component>
-<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">
-<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">
-<unit bldFile="os/mm/devsound/a3ftrace/group" mrp="os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
-</component>
-<component name="a3fsrvstart" long-name="A3F Server Start" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
-</component>
-</collection>
-<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
-<component name="devsoundhwdeviceapi" long-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 name="a3facl" long-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 name="a3fdevsoundcustomisation" long-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"/>
-</component>
-<component name="refacladapt" long-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"/>
-</component>
-<component name="videohai" long-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 name="dvbhreceiverhai" long-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>
-</block>
-<block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
-<collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
-<component name="exif_api" long-name="Exif API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagingext_plat" long-name="Imaging Extensions Platform Interfaces" level="app-if">
-<component name="jpeg2000_icl_plugin_api" long-name="JPEG2000 ICL plugin API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/jpeg2000_icl_plugin_api/group"/>
-</component>
-<component name="extended_icl_jpeg_api" long-name="Extended ICL Jpeg API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
-</component>
-<component name="h324_annex_k_custom_api" long-name="H324 Annex K Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/h324_annex_k_custom_api/group"/>
-</component>
-<component name="ecam_orientation_custom_api" long-name="ECam Orientation Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_orientation_custom_api/group"/>
-</component>
-<component name="ecam_ui_orientation_override_custom_api" long-name="ECam UI Orientation Override Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
-</component>
-<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>
-</collection>
-<collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
-<component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
-<unit bldFile="os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
-</component>
-<component name="imageadaptationextensions_build" filter="s60" long-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"/>
-</component>
-</collection>
-<collection name="imagingmodules" long-name="Imaging Modules" level="hw-if">
-<component name="exiflib" filter="s60" long-name="Exif Library">
-<unit bldFile="os/imagingext/imagingmodules/exiflib/group"/>
-</component>
-<component name="jp2kcodec" filter="s60" long-name="JPEG2000 Decoder Plugin" plugin="Y">
-<unit bldFile="os/imagingext/imagingmodules/jp2kcodec/group"/>
-</component>
-</collection>
-</block>
-<block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
-<component name="vgi" filter="s60" long-name="VGI">
-<unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
-</component>
-</collection>
-<collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adaptations">
-<component name="m3gcore11" filter="s60" long-name="M3G Core 1.1">
-<unit bldFile="os/graphics/m3g/m3gcore11/group"/>
-</component>
-</collection>
-<collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines">
-<component name="graphicsresource" long-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 name="graphicsresourceadaptation" long-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"/>
-</component>
-</collection>
-<collection name="graphicsutils" long-name="Graphics Utils" level="engines">
-<component name="commongraphicsheaders" long-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 name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
-<!-- displayldd to be moved here -->
-<component name="surfacemgr" long-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 name="graphicscomposition" long-name="Graphics Composition" level="engines">
-<component name="openwfcinterface" long-name="OpenWF Composition Interface" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfcinterface/group" mrp="os/graphics/graphicscomposition/openwfcinterface/group/graphics_openwfcinterface.mrp"/>
-</component>
-<component name="openwfcompositionengine" long-name="OpenWF Composition Engine" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/graphicscomposition/openwfcompositionengine/group" mrp="os/graphics/graphicscomposition/openwfcompositionengine/group/graphics_openwfcompositionengine.mrp"/>
-</component>
-<component name="openwfsupport" long-name="OpenWF Support" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfsupport/group" mrp="os/graphics/graphicscomposition/openwfsupport/group/graphics_openwfsupport.mrp"/>
-</component>
-<component name="surfaceupdate" long-name="Surface Update" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/surfaceupdate/group" mrp="os/graphics/graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
-</component>
-</collection>
-<collection name="graphicstest" long-name="Graphics Test" level="app-if">
-<component name="uibench" long-name="UI Bench" introduced="9.2" purpose="development">
-<unit bldFile="os/graphics/graphicstest/uibench/group" mrp="os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
-</component>
-</collection>
-<collection name="graphics_plat" long-name="Graphics Platform Interfaces" level="app-if">
-<component name="m3g_core_api" filter="sf_build" long-name="M3G Core API" class="api">
-<unit bldFile="os/graphics/graphics_plat/m3g_core_api/group"/>
-</component>
-</collection>
-<collection name="graphics_info" long-name="Graphics Info" level="app-if">
-<component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc">
-<unit mrp="os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
-</component>
-<component name="graphics_metadata" long-name="Graphics Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
-</component>
-</collection>
-<collection name="windowing" long-name="Windowing" level="app-if">
-<component name="windowserver" long-name="Window Server" purpose="mandatory">
-<unit bldFile="os/graphics/windowing/windowserver/group" mrp="os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
-</component>
-<component name="windowserverplugins" long-name="Window Server Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/windowing/windowserverplugins/group" mrp="os/graphics/windowing/windowserverplugins/group/graphics_wserv_std_plugins.mrp"/>
-</component>
-</collection>
-<collection name="printingservices" long-name="Printing Services" level="app-if">
-<component name="printerdriversupport" long-name="Printer Driver Support" purpose="optional">
-<unit bldFile="os/graphics/printingservices/printerdriversupport/group" mrp="os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
-</component>
-<component name="printerdrivers" long-name="Printer Drivers" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/printingservices/printerdrivers/group" mrp="os/graphics/printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
-</component>
-</collection>
-<collection name="fbs" long-name="Font and Bitmap Server" level="device-interface">
-<component name="fontandbitmapserver" long-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 name="opengles" long-name="OpenGLES" level="internal-adaptations">
-<component name="openglesinterface" long-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 name="opengles_stub" filter="sf_build" long-name="OpenGL ES Stub" purpose="optional" introduced="^2">
-<unit bldFile="os/graphics/opengles/openglesinterface/group/opengles_stub"/>
-</component>
-</collection>
-<collection name="openvg" long-name="OpenVG" level="internal-adaptations">
-<component name="openvginterface" long-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 name="openvg11" filter="s60" long-name="OpenVG 1.1">
-<!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
-<unit bldFile="os/graphics/openvg/openvginterface/group/openvg11"/>
-</component>
-<component name="sfopenvg" filter="sf_build" long-name="Khronos OpenVG Reference Implementation" introduced="^2" purpose="optional">
-<unit bldFile="os/graphics/openvg/openvgrefimplementation/sfopenvg/group"/>
-</component>
-</collection>
-<collection name="egl" long-name="EGL" level="internal-adaptations">
-<component name="eglinterface" long-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 name="eglswitch" long-name="EGL Switch" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglswitch/group" mrp="os/graphics/egl/eglswitch/group/graphics_eglswitch.mrp"/>
-</component>
-<component name="eglrefimpl" long-name="EGL Reference Implementation" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglrefimpl/group" mrp="os/graphics/egl/eglrefimpl/group/graphics_eglrefimpl.mrp"/>
-</component>
-<component name="egltest" long-name="EGL Tests" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/egl/egltest/group" mrp="os/graphics/egl/egltest/group/graphics_egltest.mrp"/>
-</component>
-</collection>
-<collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
-<component name="gdi" long-name="GDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/gdi/group" mrp="os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
-</component>
-<component name="bitgdi" long-name="BitGDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
-</component>
-<component name="colourpalette" long-name="Colour Palette" introduced="7.0s" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
-</component>
-<component name="screendriver" long-name="Screen Driver" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/graphicsdeviceinterface/screendriver/group" mrp="os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
-</component>
-<component name="directgdi" long-name="DirectGDI" introduced="^3" deprecated="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/directgdi/group" mrp="os/graphics/graphicsdeviceinterface/directgdi/group/graphics_directgdi.mrp"/>
-</component>
-<component name="directgdiinterface" long-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 name="directgdiadaptation" long-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"/>
-</component>
-</collection>
-<collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
-<component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/gdi_tools/group" mrp="os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
-</component>
-</collection>
-<collection name="graphicsapitest" long-name="Graphics API Tests" level="app-if"/>
-</block>
-<block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
-<collection name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" level="text">
-<component name="findutil_api" long-name="Find Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/findutil_api/group"/>
-</component>
-<component name="japanese_language_utilities_api" long-name="Japanese Language Utilities API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
-</component>
-<component name="sortutil_api" long-name="Sorting Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/sortutil_api/group"/>
-</component>
-</collection>
-<collection name="textandloc_pub" long-name="Text and Localisation Public Interfaces" level="text">
-<component name="directory_localizer_api" long-name="Directory Localizer API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_pub/directory_localizer_api/group"/>
-</component>
-</collection>
-<collection name="charconvfw" long-name="Character Conversion" level="encoding">
-<component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional">
-<unit bldFile="os/textandloc/charconvfw/charconv_fw/group" mrp="os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
-</component>
-<component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/charconvplugins/group" mrp="os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
-</component>
-<component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/fatfilenameconversionplugins/group" mrp="os/textandloc/charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
-</component>
-</collection>
-<collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
-<component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/textshaperplugin/group" mrp="os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
-</component>
-<component name="fontstore" long-name="Font Store" purpose="mandatory">
-<unit bldFile="os/textandloc/fontservices/fontstore/group" mrp="os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
-</component>
-<component name="textrendering" long-name="Text Rendering" purpose="mandatory" class="placeholder">
-<!-- placeholder for text code from GDI -->
-</component>
-<component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/freetypefontrasteriser/group" mrp="os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
-</component>
-<component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional">
-<unit bldFile="os/textandloc/fontservices/referencefonts/group" mrp="os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
-</component>
-</collection>
-<collection name="textlayout" long-name="Text Layout" level="text">
-<component name="texthandling" long-name="Text Handling" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/texthandling/group" mrp="os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
-</component>
-<component name="textformatting" long-name="Text Formatting" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/textformatting/group" mrp="os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
-</component>
-</collection>
-<collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
-<!-- components in this collection need to be moved to the right collection.
- Either move into the units' directories, or create a new textandlocutils directory -->
-<component name="numbergrouping" filter="s60" long-name="Number Grouping">
-<unit bldFile="os/textandloc/charconvfw/numbergrouping/group"/>
-</component>
-<component name="jplangutil" filter="s60" long-name="Japanese Language Utilities">
-<unit bldFile="os/textandloc/charconvfw/jplangutil/group"/>
-</component>
-<component name="sortutil" filter="s60" long-name="Sorting Utility">
-<unit bldFile="os/textandloc/charconvfw/sortutil/group"/>
-</component>
-<component name="inlinetext" filter="s60" long-name="Inline Text">
-<unit bldFile="os/textandloc/charconvfw/inlinetext/group"/>
-</component>
-<component name="nearestlangutil" long-name="Nearest Language Util" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-<component name="numberformatting" long-name="Number Formatting" introduced="7.0s" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/numberformatting/group" mrp="os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
-</component>
-</collection>
-<collection name="localesupport" long-name="Locale Support" level="util">
-<component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/localisation/localesupport" mrp="os/textandloc/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
-</component>
-<component name="initlocale" long-name="Initialise Locale" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-</collection>
-<collection name="textandloctools" long-name="Text and Localisation Tools" level="tools">
-<component name="fontcompiler" long-name="Font Compiler" purpose="development" class="placeholder PC">
-<!-- placeholder for split from GDI Tools -->
-</component>
-<component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/bitmapfonttools/group" mrp="os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
-</component>
-</collection>
-<collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
-<component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
-<collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
-<component name="xmlsrv_plat_build" long-name="XML Services Platform Interface Build" filter="s60" class="api">
-<!-- need to fix the configuration used here.
- Either destribute to other components or use the new feature flags confguration mechanisms.
- Remove this component and uncomment the other units when fixed-->
-<unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
-</component>
-<component name="xml_encryption_api" long-name="XML Encryption API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/> -->
-</component>
-<component name="xml_signature_api" long-name="XML Signature API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_signature_api/group"/> -->
-</component>
-<component name="xml_security_engine_utils_api" long-name="XML Security Engine Utils API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/> -->
-</component>
-</collection>
-<collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
-<component name="xmlseccertman" filter="s60" long-name="XML Security Certificate Manager">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
-</component>
-<component name="xmlsec" filter="s60" long-name="XML Security">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsec/group"/>
-</component>
-<component name="xmlseccrypto" filter="s60" long-name="XML Security Crypto">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccrypto/group"/>
-</component>
-<component name="xmlsecwrapper" filter="s60" long-name="XML Security Wrapper">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsecwrapper/group"/>
-</component>
-</collection>
-<collection name="xml" long-name="XML" level="generic">
-<component name="xmlfw" long-name="XML Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmlfw/group" mrp="os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
-</component>
-<component name="libxml2libs" long-name="Libxml2 Libraries" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/libxml2libs/group" mrp="os/xmlsrv/xml/libxml2libs/group/syslibs_libxml2.mrp"/>
-</component>
-<component name="legacyminidomparser" long-name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/legacyminidomparser/GROUP" mrp="os/xmlsrv/xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp"/>
-</component>
-<component name="xmldomandxpath" long-name="XML DOM and XPath" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmldomandxpath/group" mrp="os/xmlsrv/xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
-</component>
-<component name="xmlexpatparser" long-name="XML Expat Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmlexpatparser/group" mrp="os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
-</component>
-<component name="xmllibxml2parser" long-name="XML Libxml2 Parser" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmllibxml2parser/group" mrp="os/xmlsrv/xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
-</component>
-<component name="wbxmlparser" long-name="WBXML Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/wbxmlparser/group" mrp="os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
-</component>
-</collection>
-<collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
-<component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="deviceplatformrelease" level="services" long-name="Device Platform Release" levels="bld mid top">
-<collection name="s60extras" long-name="S60 Extras" level="mid">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="s60extras_build" filter="s60" long-name="S60 Extras Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/S60Extras/group"/>
-</component>
-</collection>
-<collection name="locfiles" long-name="Locale Files" level="mid">
-<component name="locfiles_build" filter="s60" long-name="S60 Locale Files Build" purpose="development" class="config">
-<!-- need to move component down a directory -->
-<unit bldFile="os/deviceplatformrelease/locfiles/group"/>
-</component>
-<component name="locfiles_set1" long-name="Locale Files Set 1" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set1"/>
-</component>
-<component name="locfiles_set2" long-name="Locale Files Set 2" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set2"/>
-</component>
-<component name="locfiles_set3" long-name="Locale Files Set 3" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set3"/>
-</component>
-<component name="locfiles_set4" long-name="Locale Files Set 4" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set4"/>
-</component>
-<component name="locfiles_set5" long-name="Locale Files Set 5" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set5"/>
-</component>
-<component name="locfiles_set6" long-name="Locale Files Set 6" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set6"/>
-</component>
-<!-- is the a problem with SF builds with the following? -->
-<component name="locfiles_set7" long-name="Locale Files Set 7" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set7"/>
-</component>
-<component name="locfiles_set8" long-name="Locale Files Set 8" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set8"/>
-</component>
-<component name="locfiles_set9" long-name="Locale Files Set 9" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set9"/>
-</component>
-<component name="locfiles_set10" long-name="Locale Files Set 10" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set10"/>
-</component>
-<component name="locfiles_set11" long-name="Locale Files Set 11" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set11"/>
-</component>
-<component name="locfiles_set12" long-name="Locale Files Set 12" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set12"/>
-</component>
-<component name="locfiles_set13" long-name="Locale Files Set 13" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set13"/>
-</component>
-<component name="locfiles_set14" long-name="Locale Files Set 14" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set14"/>
-</component>
-<component name="locfiles_set15" long-name="Locale Files Set 15" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set15"/>
-</component>
-<component name="locfiles_set16" long-name="Locale Files Set 16" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set16"/>
-</component>
-</collection>
-<collection name="version" long-name="Version" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="version_build" filter="s60" long-name="Version Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/Version/group"/>
-</component>
-</collection>
-<collection name="helps_loc2" long-name="Helps Locale 2" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helps_loc2_build" long-name="Helps Locale 2 Build" filter="s60">
-<unit bldFile="os/deviceplatformrelease/helps_loc2/group"/>
-</component>
-</collection>
-<collection name="sf_config" long-name="SF Config" level="mid">
-<component name="config" filter="s60" long-name="Config" purpose="development" class="config"/>
-<component name="cenrep" filter="sf_build" long-name="ConE Central Repository Config" purpose="development" class="config">
-<!-- will should give the id/path something more unique than cenrep -->
-<unit bldFile="os/deviceplatformrelease/sf_config/cenrep/group"/>
-</component>
-<component name="rombuild_syborg" filter="sf_build" long-name="Syborg iMaker Config" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/sf_config/rombuild/syborg/group"/>
-</component>
-<component name="rombuild_zoom2" filter="sf_build" long-name="Zoom2 iMaker Config" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/sf_config/rombuild/zoom2/group"/>
-</component>
-</collection>
-<!-- should be located locally in buildplatforms/group
- <collection id="s60bld" name="S60 Build">
- <component id="buildplatforms" filter="s60" name="Build Platforms">
- <unit bldFile="/tools/buildplatforms/group"/>
- </component>
- </collection>-->
-<collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
-<component name="cedarutils" long-name="Cedar Utils" purpose="development">
-<unit mrp="os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
-</component>
-<component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt" purpose="development" class="config">
-<unit mrp="os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
-</component>
-<component name="foundation_s60_packages" long-name="Foundation S60 Packages" introduced="^3" deprecated="^3" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/symbianosbld/foundation_s60_packages/foundation_s60_packages.mrp"/>
-</component>
-</collection>
-<collection name="foundation_system" long-name="Foundation System" level="top">
-<component name="system_model" long-name="System Model" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
-</component>
-</collection>
-<collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
-<component name="deviceplatformrelease_metadata" long-name="Device Platform Release Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="osrndtools" level="services" long-name="OS R&D tools" levels="fw trace">
-<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"/>
-</component>
-<component name="testinterface" filter="s60" long-name="Test Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/testinterface/group"/>
-</component>
-<component name="testserver" filter="s60" long-name="Test Server" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserver/group"/>
-</component>
-<component name="testengine" filter="s60" long-name="Test Engine" purpose="development">
-<unit bldFile="os/osrndtools/stif/testengine/group"/>
-</component>
-<component name="testserverstarter" filter="s60" long-name="Test Server Starter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserverstarter/group"/>
-</component>
-<component name="stiftfwif" filter="s60" long-name="STIF Test Framework Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/stiftfwif/group"/>
-</component>
-<component name="consoleui" filter="s60" long-name="Console UI" purpose="development">
-<unit bldFile="os/osrndtools/stif/consoleui/group"/>
-</component>
-<component name="testcombiner" filter="s60" long-name="Test Combiner" purpose="development">
-<unit bldFile="os/osrndtools/stif/testcombiner/group"/>
-</component>
-<component name="demomodule" filter="s60" long-name="Demo Module" purpose="development">
-<unit bldFile="os/osrndtools/stif/demomodule/group"/>
-</component>
-<component name="atslogger" filter="s60" long-name="ATS Logger" purpose="development">
-<unit bldFile="os/osrndtools/stif/atslogger/group"/>
-</component>
-<component name="atsinterface" filter="s60" long-name="ATS Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/atsinterface/group"/>
-</component>
-<component name="testscripter" filter="s60" long-name="Test Scripter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testscripter/group"/>
-</component>
-<component name="suevent" filter="s60" long-name="SU Event" purpose="development">
-<unit bldFile="os/osrndtools/stif/suevent/group"/>
-</component>
-<component name="stifkerneltestclassbase" filter="s60" long-name="STIF Kernel Test Class Base" purpose="development">
-<!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
-<!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
-</component>
-<component name="stif_build" filter="s60" long-name="STIF Build" purpose="development">
-<!-- move exports into self-contained component. Remove this when configuration is in place-->
-<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">
-<unit bldFile="os/osrndtools/memspy/memspy_plat/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/engine/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/console/group"/>
-</component>
-<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>
-</collection>
-<collection name="hti" long-name="Harmonized Test Interface" level="trace">
-<component name="hti_plat" filter="s60" long-name="HTI Platform Interfaces" purpose="development" class="api">
-<unit bldFile="os/osrndtools/hti/hti_plat/group"/>
-</component>
-<component name="hticfg" filter="s60" long-name="HTI Config" purpose="development">
-<unit bldFile="os/osrndtools/hti/hticfg/group"/>
-</component>
-<component name="htiautostart" filter="s60" long-name="HTI Autostart" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiautostart/group"/>
-</component>
-<component name="htiframework" filter="s60" long-name="HTI Framework" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiframework/group"/>
-</component>
-<component name="hticommplugins" filter="s60" long-name="HTI Communication Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
-</component>
-<component name="htiserviceplugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
-</component>
-<component name="htifilehlp" filter="s60" long-name="HTI File Help" purpose="development">
-<unit bldFile="os/osrndtools/hti/htifilehlp/group"/>
-</component>
-<component name="htiwatchdog" filter="s60" long-name="HTI Watchdog" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiwatchdog/group"/>
-</component>
-<component name="hti_build" filter="s60" long-name="HTI Build" purpose="development">
-<!-- move exports into self-contained component.-->
-<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">
-<block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
-<collection name="appsupport_pub" long-name="Generic Application Support Public Interfaces" level="specific">
-<component name="flash_viewer_framework_api" long-name="Flash Viewer Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
-</component>
-<component name="network_status_api" long-name="Network Status API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/network_status_api/group"/>
-</component>
-</collection>
-<collection name="appsupport_plat" long-name="Generic Application Support Platform Interfaces" level="specific">
-<component name="action_plugin_api" long-name="Action Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/action_plugin_api/group"/>
-</component>
-<component name="application_orientation_api" long-name="Application Orientation API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/application_orientation_api/group"/>
-</component>
-<component name="context_access_api" long-name="Context Access API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_access_api/group"/>
-</component>
-<component name="context_framework_services_api" long-name="Context Framework Services API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_services_api/group"/>
-</component>
-<component name="context_framework_client_api" long-name="Context Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_client_api/group"/>
-</component>
-<component name="context_framework_listener_api" long-name="Context Framework Listener API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_listener_api/group"/>
-</component>
-<component name="context_framework_version_api" long-name="Context Framework Version API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_version_api/group"/>
-</component>
-<component name="context_source_plugin_api" long-name="Context Source Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_plugin_api/group"/>
-</component>
-<component name="context_source_settings_manager_api" long-name="Context Source Settings Manager API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_settings_manager_api/group"/>
-</component>
-<component name="context_subscription_api" long-name="Context Subscription API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_subscription_api/group"/>
-</component>
-<component name="key_event_framework_api" long-name="Key Event Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_api/group"/>
-</component>
-<component name="key_event_framework_mapper_api" long-name="Key Event Framework Mapper API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_mapper_api/group"/>
-</component>
-<component name="media_keys_definition_api" long-name="Media Keys Definition API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/media_keys_definition_api/group"/>
-</component>
-<component name="ood_threshold_api" long-name="OOD Threshold API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/ood_threshold_api/group"/>
-</component>
-<component name="oom_monitor_api" long-name="OOM Monitor API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_api/group"/>
-</component>
-<component name="oom_monitor_plugin_api" long-name="OOM Monitor Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_plugin_api/group"/>
-</component>
-<component name="operation_provider_api" long-name="Operation Provider API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/operation_provider_api/group"/>
-</component>
-<component name="phonecmdhandler_api" long-name="Phone Command Handler API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/phonecmdhandler_api/group"/>
-</component>
-<component name="restore_factory_settings_api" long-name="Restore Factory Settings API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_api/group"/>
-</component>
-<component name="restore_factory_settings_plugin_api" long-name="Restore Factory Settings Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_plugin_api/group"/>
-</component>
-<component name="secondary_display_accfw_api" long-name="Secondary Display Accessory Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_accfw_api/group"/>
-</component>
-<component name="secondary_display_startup_api" long-name="Secondary Display Startup API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_startup_api/group"/>
-</component>
-<component name="secondary_display_sysap_api" long-name="Secondary Display System Application API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_sysap_api/group"/>
-</component>
-<component name="secondary_display_system_state_api" long-name="Secondary Display System State API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_system_state_api/group"/>
-</component>
-<component name="sensor_user_setting_api" long-name="Sensor User Setting API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/sensor_user_setting_api/group"/>
-</component>
-<component name="startup_configuration_api" long-name="Startup Configuration API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/startup_configuration_api/group"/>
-</component>
-<component name="system_application_key_handler_plugin_api" long-name="System Application Key Handler Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_key_handler_plugin_api/group"/>
-</component>
-<component name="system_application_light_control_plugin_api" long-name="System Application Light Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_light_control_plugin_api/group"/>
-</component>
-<component name="system_application_notification_api" long-name="System Application Notification API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_notification_api/group"/>
-</component>
-<component name="system_application_plugin_callback_api" long-name="System Application Plug-in Callback API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
-</component>
-</collection>
-<collection name="contextframework" long-name="Context Framework" level="framework">
-<!-- the units that are commented out need to be put back when configuration is in place.
- They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
-<component name="cfw" filter="s60" long-name="Context Framework">
-<!--<unit bldFile="contextframework/cfw/group"/> -->
-</component>
-<component name="cfwplugins" filter="s60" long-name="Context Framework Plugins" plugin="Y">
-<!--<unit bldFile="contextframework/cfwplugins/group"/>-->
-</component>
-<component name="contextframework_build" filter="s60" long-name="Context Framework Build">
-<unit bldFile="mw/appsupport/contextframework/group"/>
-</component>
-</collection>
-<collection name="coreapplicationuis" long-name="Core Application UIs" level="server">
-<component name="dbrecovery" filter="s60" long-name="Database Recovery">
-<unit bldFile="mw/appsupport/coreapplicationuis/dbrecovery/group"/>
-</component>
-<component name="nspswsplugin" filter="s60" long-name="NSPS WS Plugin" plugin="Y">
-<!-- No Service Power Save? Window Server? Please elaborate-->
-<unit bldFile="mw/appsupport/coreapplicationuis/nspswsplugin/group"/>
-</component>
-<component name="rfs" filter="s60" long-name="Restore Factory Settings">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfs/group"/>
-</component>
-<component name="rfsplugins" filter="s60" long-name="Restore Factory Settings Plugins" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/group"/>
-</component>
-<component name="sysap" filter="s60" long-name="System Application">
-<unit bldFile="mw/appsupport/coreapplicationuis/sysap/group"/>
-</component>
-<component name="variatedsettings" filter="s60" long-name="Variated Settings" class="config">
-<unit bldFile="mw/appsupport/coreapplicationuis/variatedsettings/group"/>
-</component>
-<component name="accfwuinotifier" filter="s60" long-name="Accessory Framework UI Notifier" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/accfwuinotifier/group"/>
-</component>
-<component name="kefmapper" filter="s60" long-name="Key Event Framework">
-<unit bldFile="mw/appsupport/coreapplicationuis/kefmapper/group"/>
-</component>
-<component name="advancedtspcontroller" filter="s60" long-name="Advanced TSP Controller">
-<unit bldFile="mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
-</component>
-<component name="powersaveutilities" filter="s60" long-name="Power Save Utilities">
-<unit bldFile="mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
-</component>
-<component name="gsserverenginestub" filter="s60" long-name="GS Server Engine Stub">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
-</component>
-<component name="gsserverengine" filter="s60" long-name="GS Server Engine">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverengine/group"/>
-</component>
-<component name="sensordatacompensatorplugin" filter="s60" long-name="Sensor Data Compensator Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/group"/>
-</component>
-</collection>
-<collection name="flashliteapi_3_1" long-name="Flash Lite API 3.1" level="specific">
-<!-- collection is really a component. Move down a directory -->
-<component name="flashliteapi_3_1_build" long-name="Flash Lite API Build" filter="s60" introduced="^2"/>
-</collection>
-<collection name="mediakeys" long-name="Media Keys" level="plugin">
-<!-- collection is really a component. Move down a directory -->
-<component name="mediakeys_build" filter="s60" long-name="Media Keys Build">
-<unit bldFile="mw/appsupport/mediakeys/group"/>
-</component>
-</collection>
-<collection name="startupservices" long-name="Startup Services" level="system">
-<component name="splashscreen" filter="s60" long-name="Splash Screen">
-<unit bldFile="mw/appsupport/startupservices/splashscreen/group"/>
-</component>
-<component name="startupanimation" filter="s60" long-name="Startup Animation">
-<unit bldFile="mw/appsupport/startupservices/startupanimation/group"/>
-</component>
-<component name="startup" long-name="Startup Application" filter="s60">
-<unit bldFile="mw/appsupport/startupservices/startup/group"/>
-</component>
-</collection>
-<collection name="sysresmonitoring" long-name="System Resource Monitoring" level="system">
-<component name="oodmonitor" filter="s60" long-name="OOD Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oodmonitor/group"/>
-</component>
-<component name="oommonitor" filter="s60" long-name="OOM Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oommonitor/group"/>
-</component>
-</collection>
-<collection name="systemsettings" long-name="System Settings" level="system">
-<component name="gssensorplugin" filter="s60" long-name="GS Sensor Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gssensorplugin/group"/>
-</component>
-<component name="gsaccessoryplugin" filter="s60" long-name="GS Accessory Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gsaccessoryplugin/group"/>
-</component>
-</collection>
-<collection name="filehandling" long-name="File Handling" level="server">
-<component name="fileconverterfw" long-name="File Converter Framework" purpose="optional">
-<unit bldFile="mw/appsupport/filehandling/fileconverterfw/group" mrp="mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
-</component>
-<component name="htmltorichtextconverter" long-name="HTML to RichText Converter" introduced="7.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/htmltorichtextconverter/group" mrp="mw/appsupport/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
-</component>
-<component name="richtexttohtmlconverter" long-name="RichText to HTML Converter" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
-</component>
-</collection>
-<collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
-<component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
-</component>
-</collection>
-<collection name="commonappservices" long-name="Common Application Services" level="framework">
-<component name="alarmserver" long-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"/>
-</component>
-<component name="alarmservertest" long-name="Alarm Server Test" deprecated="^3" introduced="8.1" purpose="development">
-<unit bldFile="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
-</component>
-<component name="appservicesdocs" long-name="Application Services Documentation" purpose="development" class="doc">
-<unit mrp="mw/appsupport/commonappservices/appservicesdocs/app-services_documentation.mrp"/>
-</component>
-<component name="backuprestorenotification" long-name="Backup Restore Notification" introduced="8.1" purpose="optional">
-<unit bldFile="mw/appsupport/commonappservices/backuprestorenotification/group" mrp="mw/appsupport/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
-</component>
-</collection>
-<collection name="tzservices" long-name="Time Zone Services" level="plugin">
-<component name="tzserver" long-name="Time Zone Server" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzserver/group" mrp="mw/appsupport/tzservices/tzserver/group/app-services_tz.mrp"/>
-</component>
-<component name="tzloc" long-name="Time Zone Localization" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzloc/group" mrp="mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
-</component>
-<component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzlocrscfactory/group" mrp="mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
-</component>
-<component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzdatabase/group" mrp="mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
-</component>
-</collection>
-<collection name="contenthandling" long-name="Content Handling" level="plugin">
-<component name="webrecognisers" long-name="Web Recognisers" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/contenthandling/webrecognisers/group" mrp="mw/appsupport/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
-</component>
-</collection>
-<collection name="openenvutils" long-name="Open Environment Utilities" level="specific">
-<component name="commandshell" long-name="Command Shell" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/commandshell/group" mrp="mw/appsupport/openenvutils/commandshell/group/oetools_zsh.mrp"/>
-</component>
-<component name="telnetserver" long-name="Telnet Server" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/telnetserver/group" mrp="mw/appsupport/openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
-</component>
-</collection>
-<collection name="printingsupport" long-name="Printing Support" level="generic">
-<component name="printinguisupport" long-name="Printing UI Support" purpose="optional" introduced="^2" deprecated="^3">
-<unit bldFile="mw/appsupport/printingsupport/printinguisupport/group" mrp="mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
-</component>
-</collection>
-<collection name="appfw" long-name="Application Framework" level="framework">
-<component name="apparchitecture" long-name="Application Architecture" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/apparchitecture/group" mrp="mw/appsupport/appfw/apparchitecture/group/app-framework_apparc.mrp"/>
-</component>
-<component name="viewserver" long-name="View Server" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/viewserver/group" mrp="mw/appsupport/appfw/viewserver/group/app-framework_viewsrv.mrp"/>
-</component>
-</collection>
-<collection name="applaunchservices" long-name="Application Launch Services" level="generic">
-<component name="aftermarketappstarter" long-name="After Market Application Starter" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/aftermarketappstarter/group" mrp="mw/appsupport/applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
-</component>
-<component name="applaunchplugins" long-name="Application Launch Plugins" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/applaunchplugins/group" mrp="mw/appsupport/applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
-</component>
-</collection>
-<collection name="tzpcside" long-name="Time Zone PC Side" level="plugin">
-<component name="tzcompiler" long-name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config PC">
-<unit bldFile="mw/appsupport/tzpcside/tzcompiler/group" mrp="mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
-</component>
-</collection>
-<collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
-<component name="appsupport_metadata" long-name="Generic Application Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="securitysrv" level="generic" long-name="Security Services" levels="plugin framework server generic specific">
-<collection name="secsrv_plat" long-name="Security Services Platform Interfaces" level="specific">
-<component name="cms_api" long-name="CMS API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/cms_api/group"/>
-</component>
-<component name="pkcs12_parser_api" long-name="PKCS12 Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkcs12_parser_api/group"/>
-</component>
-<component name="java_utils_api" long-name="Java Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/java_utils_api/group"/>
-</component>
-<component name="wim_cert_api" long-name="WIM Cert API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/wim_cert_api/group"/>
-</component>
-<component name="device_key_store_encryption_plugin_api" long-name="Device Key Store Encryption Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/device_key_store_encryption_plugin_api/group"/>
-</component>
-<component name="x509certnameparser_api" long-name="X.509 Certificate Name Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
-</component>
-<component name="remote_lock_api" long-name="Remote Lock API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
-</component>
-<component name="pkidialog_api" long-name="PKI Dialog API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
-</component>
-<component name="provisioning_api" long-name="Provisioning API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/provisioning_api/group"/>
-</component>
-<component name="keyguard_configuration_api" long-name="Keyguard Configuration API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_configuration_api/group"/>
-</component>
-<component name="keylock_policy_api" long-name="Keylock Policy API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keylock_policy_api/group"/>
-</component>
-<component name="security_code_ui_api" long-name="Security Code UI API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
-</component>
-<component name="gba_api" long-name="GBA API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/gba_api/group"/>
-</component>
-<component name="keyguard_access_api" long-name="Keyguard Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_access_api/group"/>
-</component>
-<component name="devicelock_access_api" long-name="Device Lock Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devicelock_access_api/group"/>
-</component>
-<component name="lockapp_server_api" long-name="Lock Application Server API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
-</component>
-<component name="devencadaptation_api" long-name="Device Encryption Adaptation API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
-</component>
-<component name="devenccommonutils_api" long-name="Device Encryption Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
-</component>
-</collection>
-<collection name="cms" long-name="Certificate Management Service" level="server">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="cms_build" filter="s60" long-name="CMS" introduced="^3">
-<unit bldFile="mw/securitysrv/cms/group"/>
-</component>
-</collection>
-<collection name="pkiutilities" long-name="PKI Utilities" level="plugin">
-<component name="x509certnameparser" filter="s60" long-name="X.509 Certificate Name Parser">
-<unit bldFile="mw/securitysrv/pkiutilities/x509certnameparser/group"/>
-</component>
-<component name="pkcs12" filter="s60" long-name="PKCS #12">
-<unit bldFile="mw/securitysrv/pkiutilities/pkcs12/group"/>
-</component>
-<component name="certmanui" filter="s60" long-name="Certificate Management UI">
-<unit bldFile="mw/securitysrv/pkiutilities/certmanui/group"/>
-</component>
-<component name="ctsecuritydialogs" filter="s60" long-name="Crypto Token Security Dialogs">
-<unit bldFile="mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
-</component>
-<component name="certsaver" filter="s60" long-name="Certificate Saver">
-<unit bldFile="mw/securitysrv/pkiutilities/certsaver/group"/>
-</component>
-<component name="secmodui" filter="s60" long-name="Security Module UI">
-<unit bldFile="mw/securitysrv/pkiutilities/secmodui/group"/>
-</component>
-<component name="devicetoken" filter="s60" long-name="Device Token">
-<unit bldFile="mw/securitysrv/pkiutilities/devicetoken/group"/>
-</component>
-<component name="certificates" filter="s60" long-name="Certificates">
-<unit bldFile="mw/securitysrv/pkiutilities/Certificates/group" filter="sf_build"/>
-</component>
-<component name="pkiutilities_build" filter="s60" long-name="PKI Utilities Build">
-<!-- need to split this into the above components -->
-<unit bldFile="mw/securitysrv/pkiutilities/group"/>
-</component>
-<component name="ocsp" long-name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
-<unit bldFile="mw/securitysrv/pkiutilities/ocsp/group" mrp="mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
-</component>
-</collection>
-<collection name="wim" long-name="Wireless Identity Module " level="framework">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="wim_build" filter="s60" long-name="WIM Build">
-<unit bldFile="mw/securitysrv/wim/group"/>
-</component>
-</collection>
-<collection name="remotelock" long-name="Remote Lock" level="generic">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="remotelock_build" filter="s60" long-name="Remote Lock Build">
-<unit bldFile="mw/securitysrv/remotelock/group"/>
-</component>
-</collection>
-<collection name="securitydialogs" long-name="Security Dialogs" level="specific">
-<component name="keylockpolicyapi" filter="s60" long-name="Keylock Policy API">
-<unit bldFile="mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
-</component>
-<component name="autolock" long-name="Autolock" filter="s60">
-<unit bldFile="mw/securitysrv/securitydialogs/autolock/group"/>
-</component>
-<component name="secui" filter="s60" long-name="Security UI">
-<unit bldFile="mw/securitysrv/securitydialogs/secui/group"/>
-</component>
-<component name="securitynotifier" filter="s60" long-name="Security Notifier">
-<unit bldFile="mw/securitysrv/securitydialogs/securitynotifier/group"/>
-</component>
-<component name="lockclient" filter="s60" long-name="Lock Client" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockclient/group"/>
-</component>
-<component name="lockapp" filter="s60" long-name="Lock Application" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockapp/group"/>
-</component>
-<component name="simlockui" filter="s60" long-name="SIM Lock UI" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/simlockui/group"/>
-</component>
-</collection>
-<collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="boottimeintegritycheck_build" filter="s60" long-name="Boot Time Integrity Check Build">
-<unit bldFile="mw/securitysrv/boottimeintegritycheck/group"/>
-</component>
-</collection>
-<collection name="gba" long-name="Generic Bootstrapping Architecture" level="server">
-<component name="uicc" filter="s60" long-name="UICC" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/uicc/group"/>
-</component>
-<component name="gbaserver" filter="s60" long-name="GBA Server" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaserver/group"/>
-</component>
-<component name="gbaapi" filter="s60" long-name="GBA API" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaapi/group"/>
-</component>
-<component name="gbafilter" filter="s60" long-name="GBA HTTP Filter" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/gbafilter/group"/>
-</component>
-<component name="gba_build" filter="s60" long-name="Generic Boot Architecture Build" introduced="^2">
-<!-- need to split this into the above components, or remove #includes and make this GBA ROM -->
-<unit bldFile="mw/securitysrv/gba/group"/>
-</component>
-</collection>
-<collection name="devencdiskutils" long-name="Device Encryption Disk Utils" level="server">
-<component name="devenccommonutils" filter="s60" long-name="Device Encryption Common Utils" introduced="^3">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncCommonUtils/group"/>
-</component>
-<component name="devencrfsplugin" filter="s60" long-name="Device Encryption RFS Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncRfsPlugin/group"/>
-</component>
-<component name="pk5recognizer" filter="s60" long-name="Device Encryption Pk5 Recognizer" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/Pk5Recognizer/group"/>
-</component>
-<component name="devencstarter" filter="s60" long-name="Device Encryption Starter" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncStarter/group"/>
-</component>
-<component name="devencdiskutils" filter="s60" long-name="Device Encryption Disk Utils Build" introduced="^3">
-<!-- need to split this into the above components, or remove #includes and make this a ROM component-->
-<unit bldFile="mw/securitysrv/devencdiskutils/group"/>
-</component>
-</collection>
-<collection name="securitysrv_info" long-name="Security Services Info" level="specific">
-<component name="securitysrv_metadata" long-name="Security Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="drm" level="generic" long-name="DRM" levels="plugin framework server generic specific">
-<collection name="drm_plat" long-name="DRM Platform Interfaces" level="specific">
-<component name="roap_api" long-name="ROAP API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/roap_api/group"/>
-</component>
-<component name="drm_common_api" long-name="DRM Common API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_common_api/group"/>
-</component>
-<component name="drm_rights_api" long-name="DRM Rights API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_rights_api/group"/>
-</component>
-<component name="drm_legacy_api" long-name="DRM Legacy API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_legacy_api/group"/>
-</component>
-<component name="dcf_repository_api" long-name="DCF Repository API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/dcf_repository_api/group"/>
-</component>
-<component name="drm_service_api" long-name="DRM Service API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_service_api/group"/>
-</component>
-<component name="drm_secondary_display_api" long-name="DRM Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_secondary_display_api/group"/>
-</component>
-<component name="drm_license_manager_api" long-name="DRM License Manager API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_license_manager_api/group"/>
-</component>
-<component name="drm_utility_api" long-name="DRM Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_utility_api/group"/>
-</component>
-<component name="drm_agents_api" long-name="DRM Agents API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_agents_api/group"/>
-</component>
-<component name="wmdrm_core_api" long-name="WM DRM Core API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_core_api/group"/>
-</component>
-<component name="wmdrm_access_api" long-name="WMDRM Access API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_access_api/group"/>
-</component>
-<component name="camese_utility_api" long-name="Camese Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_utility_api/group"/>
-</component>
-<component name="camese_framework_api" long-name="Camese Framework API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_framework_api/group"/>
-</component>
-</collection>
-<collection name="drm_pub" long-name="DRM Public Interfaces" level="specific">
-<component name="drm_helper_api" long-name="DRM Helper API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_helper_api/group"/>
-</component>
-<component name="oma_drm_caf_agent_api" long-name="OMA DRM CAF Agent API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/group"/>
-</component>
-<component name="drm_license_checker_api" long-name="DRM License Checker API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_license_checker_api/group"/>
-</component>
-</collection>
-<collection name="commondrm" long-name="Common DRM" level="generic">
-<!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
-<component name="drmencryptor" filter="s60" long-name="DRM Encryptor" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmsettingsplugin" filter="s60" long-name="DRM Settings Plugin" plugin="Y" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmrightsmanagerui" filter="s60" long-name="DRM Rights Manager UI">
-<unit bldFile="mw/drm/commondrm/drmrightsmanagerui/help/group"/>
-</component>
-<component name="drmutility" filter="s60" long-name="DRM Utility">
-<!-- Uncomment unit when configuration is in place. Currently #included from commondrm_build -->
-<!--<unit bldFile="commondrm/drmutility/group"/>-->
-</component>
-<component name="drmserviceapiwrapper" filter="s60" long-name="DRM Service API Wrapper">
-<unit bldFile="mw/drm/commondrm/drmserviceapiwrapper/group"/>
-</component>
-<component name="drmrightsstoringlocation" filter="s60" long-name="DRM Rights Storing Location">
-<unit bldFile="mw/drm/commondrm/drmrightsstoringlocation/group"/>
-</component>
-<component name="commondrm_build" filter="s60" long-name="Common DRM Build">
-<!-- should be split into the above files, or them collapsed into a single component -->
-<unit bldFile="mw/drm/commondrm/group"/>
-</component>
-</collection>
-<collection name="omadrm" long-name="OMA DRM" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="omadrm_build" filter="s60" long-name="OMA DRM Build">
-<unit bldFile="mw/drm/omadrm/group"/>
-</component>
-<component name="foundationcerts" filter="sf_build" long-name="Foundation Certificates">
-<unit bldFile="mw/drm/omadrm/foundationcerts/group"/>
-</component>
-</collection>
-<collection name="wmdrm" long-name="Windows Media DRM" level="framework">
-<!-- collection is really a component. Move down a directory -->
-<component name="wmdrm_build" filter="s60" long-name="WM DRM Build">
-<unit bldFile="mw/drm/wmdrm/group"/>
-</component>
-</collection>
-<collection name="drm_info" long-name="DRM Info" level="specific"/>
-</block>
-<block name="locationsrv" level="specific" long-name="Location Services" levels="plugin fw server if">
-<collection name="locsrv_pub" long-name="Location Services Public Interfaces" level="if">
-<component name="landmarks_search_api" long-name="Landmarks Search API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
-</component>
-<component name="landmarks_api" long-name="Landmarks API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/group"/>
-</component>
-<component name="landmarks_database_management_api" long-name="Landmarks Database Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/group"/>
-</component>
-<component name="location_triggering_api" long-name="Location Triggering API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/location_triggering_api/group"/>
-</component>
-<component name="blid_application_satellite_info_api" long-name="BLID Application Satellite Info API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/group"/>
-</component>
-</collection>
-<collection name="locsrv_plat" long-name="Location Services Platform Interfaces" level="if">
-<component name="map_and_navigation_api" long-name="Map and Navigation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/group"/>
-</component>
-<component name="map_and_navigation_provider_discovery_api" long-name="Map and Navigation Provider Discovery API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/group"/>
-</component>
-<component name="geocoding_api" long-name="Geocoding API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
-</component>
-<component name="map_image_api" long-name="Map Image API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/group"/>
-</component>
-<component name="map_and_navigation_aiw_api" long-name="Map and Navigation AIW API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_aiw_api/group"/>
-</component>
-<component name="map_and_navigation_provider_api" long-name="Map and Navigation Provider API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_api/group"/>
-</component>
-<component name="landmarks_category_definition_api" long-name="Landmarks Category Definition API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
-</component>
-<component name="supl_settings_api" long-name="SUPL Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
-</component>
-<component name="location_settings_launch_api" long-name="Location Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/group"/>
-</component>
-<component name="map_image_conversion_plugin_api" long-name="Map Image Conversion Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/group"/>
-</component>
-<component name="psy_configuration_ui_plugin_api" long-name="PSY Configuration UI Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/psy_configuration_ui_plugin_api/group"/>
-</component>
-<component name="np_proxy_configuration_api" long-name="NP Proxy Configuration API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/np_proxy_configuration_api/group"/>
-</component>
-<component name="supl_terminal_initiation_api" long-name="SUPL Terminal Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/group"/>
-</component>
-<component name="location_notation_preferences_settings_api" long-name="Location Notation Preferences Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_notation_preferences_settings_api/group"/>
-</component>
-<component name="supl_settings_notifier_secondary_display_api" long-name="SUPL Settings Notifier Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_notifier_secondary_display_api/group"/>
-</component>
-<component name="supl_network_initiation_api" long-name="SUPL Network Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/group"/>
-</component>
-<component name="privacy_notifiers_secondary_display_api" long-name="Privacy Notifiers Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/privacy_notifiers_secondary_display_api/group"/>
-</component>
-<component name="oma_supl_configuration_parameter_api" long-name="OMA SUPL Configuration Parameter API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_configuration_parameter_api/group"/>
-</component>
-<component name="supl_query_secondary_display_api" long-name="SUPL Query Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_query_secondary_display_api/group"/>
-</component>
-<component name="location_triggering_management_api" long-name="Location Triggering Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_management_api/group"/>
-</component>
-<component name="location_triggering_status_information_api" long-name="Location Triggering Status Information API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_status_information_api/group"/>
-</component>
-<component name="oma_supl_asn_codec_plugin_api" long-name="OMA SUPL ASN Codec Plugin API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
-</component>
-<component name="location_local_variation_api" long-name="Location Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_local_variation_api/group"/>
-</component>
-<component name="query_and_notification_api" long-name="Query and Notification API" filter="s60" class="api">
-<!-- not yet supplied <meta rel="Api" href="locsrv_plat/query_and_notification_api/query_and_notification_api.metaxml"/> -->
-<unit bldFile="mw/locationsrv/locsrv_plat/query_and_notification_api/group"/>
-</component>
-</collection>
-<collection name="genericpositioningplugins" long-name="Generic Positioning Plugins" level="plugin">
-<component name="locationnpppsy" filter="s60" long-name="Location Positioning Proxy PSY" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
-</component>
-<component name="locationsuplpsy" filter="s60" long-name="Location SUPL PSY" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationsuplpsy/group"/>
-</component>
-<component name="genericpositioningplugins_build" filter="s60" long-name="Generic Positioning Plugins Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/genericpositioningplugins/group"/>
-</component>
-</collection>
-<collection name="landmarks" long-name="Landmarks" level="server">
-<component name="locationlandmarks" filter="s60" long-name="Location Landmarks">
-<unit bldFile="mw/locationsrv/landmarks/locationlandmarks/group"/>
-</component>
-</collection>
-<collection name="locationmapnavfw" long-name="Location Map and Navigation Framework" level="fw">
-<component name="mnlibrary" filter="s60" long-name="Map and Navigation Library">
-<unit bldFile="mw/locationsrv/locationmapnavfw/library/group"/>
-</component>
-<component name="mnaiwprovider" filter="s60" long-name="Map and Navigation AIW Provider" plugin="Y">
-<unit bldFile="mw/locationsrv/locationmapnavfw/aiwprovider/group"/>
-</component>
-<component name="locationmapnavfw_build" filter="s60" long-name="Location Map and Navigation Framework Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/locationmapnavfw/group"/>
-</component>
-</collection>
-<collection name="locationsystemui" long-name="Location System UI" level="if">
-<component name="locationsysui" filter="s60" long-name="Location System UI">
-<unit bldFile="mw/locationsrv/locationsystemui/locationsysui/group"/>
-</component>
-</collection>
-<collection name="supl" long-name="SUPL" level="fw">
-<component name="locationsuplfw" filter="s60" long-name="Location SUPL Framework">
-<unit bldFile="mw/locationsrv/supl/locationsuplfw/group"/>
-</component>
-<component name="locationomasuplprotocolhandler" filter="s60" long-name="OMA SUPL Protocol Handler">
-<unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/group"/>
-</component>
-<component name="supltiapiimplementation" filter="s60" long-name="SUPL TI API Implementation" introduced="^3">
-<unit bldFile="mw/locationsrv/supl/supltiapiimplementation/group"/>
-</component>
-</collection>
-<collection name="locationtriggering" long-name="Location Triggering" level="server">
-<component name="ltlogger" filter="s60" long-name="LT Logger">
-<unit bldFile="mw/locationsrv/locationtriggering/ltlogger/group"/>
-</component>
-<component name="ltclientlib" filter="s60" long-name="LT Client Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltclientlib/group"/>
-</component>
-<component name="ltmanagementlib" filter="s60" long-name="LT Management Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmanagementlib/group"/>
-</component>
-<component name="ltcontainer" filter="s60" long-name="LT Container">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontainer/group"/>
-</component>
-<component name="ltserver" filter="s60" long-name="LT Server">
-<unit bldFile="mw/locationsrv/locationtriggering/ltserver/group"/>
-</component>
-<component name="ltstrategypluginapi" filter="s60" long-name="LT Strategy Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategypluginapi/group"/>
-</component>
-<component name="ltstrategyengine" filter="s60" long-name="LT Strategy Engine">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategyengine/group"/>
-</component>
-<component name="ltmovementdetectionpluginapi" filter="s60" long-name="Movement Detection Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmovementdetectionpluginapi/group"/>
-</component>
-<component name="ltcellidmovementdetector" filter="s60" long-name="Cell ID Movement Detector">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/>
-</component>
-<component name="lbtmgmtui" filter="s60" long-name="LBT Management UI" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/lbtmgmtui/group"/>
-</component>
-<component name="ltcontextsourceplugin" filter="s60" long-name="LT Context Source Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontextsourceplugin/group"/>
-</component>
-<component name="locationtriggering_build" filter="s60" long-name="Location Triggering Build">
-<!-- should remove #include from this and maybe put exports in the above components -->
-<unit bldFile="mw/locationsrv/locationtriggering/group"/>
-</component>
-</collection>
-</block>
-<block name="accesssec" level="generic" long-name="Access Security" levels="plugin framework server generic specific">
-<collection name="accesssec_plat" long-name="Access Security Platform Interfaces" level="specific">
-<component name="wapi_security_settings_ui_api" long-name="WAPI Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_security_settings_ui_api/group"/>
-</component>
-<component name="wep_security_settings_ui_api" long-name="WEP Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wep_security_settings_ui_api/group"/>
-</component>
-<component name="wi-fi_protected_setup_ui_api" long-name="Wi-Fi Protected Setup UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
-</component>
-<component name="wlan_eap_settings_ui_api" long-name="WLAN EAP Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wlan_eap_settings_ui_api/group"/>
-</component>
-<component name="wpa_security_settings_ui_api" long-name="WPA Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wpa_security_settings_ui_api/group"/>
-</component>
-<component name="eap_vpn_api" long-name="EAP VPN API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
-</component>
-<component name="eapsim_db_api" long-name="EAP-SIM DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapsim_db_api/group"/>
-</component>
-<component name="eap_type_api" long-name="EAP Type API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_type_api/group"/>
-</component>
-<component name="eaptlspeap_db_api" long-name="EAP-TLS-PEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eaptlspeap_db_api/group"/>
-</component>
-<component name="eapleap_db_api" long-name="LEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapleap_db_api/group"/>
-</component>
-<component name="eapgtc_db_api" long-name="EAP-GTC DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapgtc_db_api/group"/>
-</component>
-<component name="eapmschapv2_db_api" long-name="EAP-MSCHAPV2 DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapmschapv2_db_api/group"/>
-</component>
-<component name="eapaka_db_api" long-name="EAP-AKA DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapaka_db_api/group"/>
-</component>
-<component name="wapi_db_api" long-name="WAPI DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_db_api/group"/>
-</component>
-</collection>
-<collection name="wlansecuritysettings" long-name="WLAN Security Settings" level="specific">
-<component name="wapisecuritysettingsui" filter="s60" long-name="WAPI Security Settings UI" introduced="9.1">
-<!-- the directory for this needs to be moved up to the right level -->
-<unit bldFile="mw/accesssec/wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
-</component>
-<component name="wepsecuritysettingsui" filter="s60" long-name="WEP Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wepsecuritysettingsui/group"/>
-</component>
-<component name="wifiprotectedsetup" filter="s60" long-name="WIFI Protected Setup" introduced="^1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wifiprotectedsetup/group"/>
-</component>
-<component name="wlaneapsettingsui" filter="s60" long-name="WLAN EAP Settings UI" introduced="9.3">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wlaneapsettingsui/group"/>
-</component>
-<component name="wpasecuritysettingsui" filter="s60" long-name="WPA Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wpasecuritysettingsui/group"/>
-</component>
-</collection>
-<collection name="eapol" long-name="EAPOL" level="framework">
-<component name="eapol_framework" filter="s60" long-name="EAPOL Framework" introduced="9.2">
-<unit bldFile="mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
-</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">
-<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>
-<component name="bearer_settings_plugin_api" long-name="Bearer Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/bearer_settings_plugin_api/group"/>
-</component>
-<component name="commsdat_wlan_api" long-name="CommsDat WLAN API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/commsdat_wlan_api/group"/>
-</component>
-<component name="connection_monitor_extension_api" long-name="Connection Monitor Extension API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_monitor_extension_api/group"/>
-</component>
-<component name="connection_ui_utilities_api" long-name="Connection UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_ui_utilities_api/group"/>
-</component>
-<component name="disconnect_dialog_api" long-name="Disconnect Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_api/group"/>
-</component>
-<component name="disconnect_dialog_disable_api" long-name="Disconnect Dialog Disable API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_disable_api/group"/>
-</component>
-<component name="extended_connection_settings_api" long-name="Extended Connection Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/extended_connection_settings_api/group"/>
-</component>
-<component name="mpm_default_connection_api" long-name="MPM Default Connection API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_default_connection_api/group"/>
-</component>
-<component name="pdpcontextmanager2_reset_factory_settings_api" long-name="PDP Context Manager 2 Reset Factory Settings API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_settings_api/group"/>
-</component>
-<component name="mpm_connect_screen_api" long-name="MPM Connect Screen API" filter="s60" class="api">
-<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">
-<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>
-<component name="access_point_engine_api" long-name="Access Point Engine API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_monitor_server_api/group"/>
-</component>
-<component name="connection_settings_ui_api" long-name="Connection Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_ui_api/group"/>
-</component>
-<component name="agent_dialog_api" long-name="Agent Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/agent_dialog_api/group"/>
-</component>
-<component name="extendedconnpref_api" long-name="Extended Connection Preferences API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/extendedconnpref_api/group"/>
-</component>
-</collection>
-<collection name="accesspointcontrol" long-name="Access Point Control" level="plugin">
-<component name="apcontrollistplugin" filter="s60" long-name="Access Point Control List Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
-</component>
-</collection>
-<collection name="alwayson_net_plugin" long-name="Always Online Net Plugin" level="server">
-<component name="pdpcontextmanager2" filter="s60" long-name="PDP Context Manager 2">
-<unit bldFile="mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
-</component>
-</collection>
-<collection name="apengine" long-name="Access Point Engine" level="framework">
-<component name="apeng" filter="s60" long-name="Access Point Engine">
-<unit bldFile="mw/ipconnmgmt/apengine/apeng/group"/>
-</component>
-<component name="apsettingshandlerui" filter="s60" long-name="Access Point Settings Handler UI">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingshandlerui/group"/>
-</component>
-<component name="apsettingsplugin" filter="s60" long-name="Access Point Settings Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="bearermanagement" long-name="Bearer Management" level="framework">
-<component name="mpm" filter="s60" long-name="Mobility Policy Manager">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/mpm/group"/>
-</component>
-<component name="extendedconnpref" filter="s60" long-name="Extended Connection Preferences">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/extendedconnpref/group"/>
-</component>
-<component name="s60mcpr" filter="s60" long-name="S60 Meta-Connection Provider" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/S60MCPR/group"/>
-</component>
-</collection>
-<collection name="cmmanager" long-name="Connection Method Manager" level="framework">
-<component name="cmmgr" filter="s60" long-name="CM Manager">
-<unit bldFile="mw/ipconnmgmt/cmmanager/cmmgr/group"/>
-</component>
-<component name="gsconnsettingsplugin" filter="s60" long-name="GS Connection Settings Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/cmmanager/gsconnsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="connectionmonitoring" long-name="Connection Monitoring" level="server">
-<component name="connectionmonitorplugin" filter="s60" long-name="Connection Monitor Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorplugin/group"/>
-</component>
-<component name="connectionmonitorui" filter="s60" long-name="Connection Monitor UI">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorui/group"/>
-</component>
-<component name="connmon" filter="s60" long-name="Connection Monitor">
-<!-- either split into two components, or #include from a common bld.inf -->
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/connectionmonitor/group"/>
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/dataconnectionlogger/group"/>
-</component>
-<component name="connmonext" filter="s60" long-name="Connection Monitor Extension API">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmonext/group"/>
-</component>
-</collection>
-<collection name="connectionutilities" long-name="Connection Utilities" level="utils">
-<component name="connectiondialogs" filter="s60" long-name="Connection Dialogs">
-<unit bldFile="mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/>
-</component>
-</collection>
-<collection name="dbcreator" long-name="DB Creator" level="utils">
-<component name="commsdatcreator" filter="s60" long-name="Comms Database Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
-</component>
-<component name="commsdatcreatorrfsplugin" filter="s60" long-name="Comms Database Creator RFS Plugin" introduced="9.3" plugin="Y">
-<!-- uncomment when config is turned on -->
-<!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
-</component>
-<component name="commsdatstartup" filter="s60" long-name="Comms Database Startup" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
-</component>
-<component name="dbcreatorexe" filter="s60" long-name="DB Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
-</component>
-<component name="dbcreator_build" filter="s60" long-name="DB Creator Build" introduced="9.3">
-<!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
-<unit bldFile="mw/ipconnmgmt/dbcreator/group"/>
-</component>
-</collection>
-<collection name="ipconnmgmt_info" long-name="IP Connectivity Management Info" level="utils">
-<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"/>
-</component>
-</collection>
-</block>
-<block name="netprotocols" level="generic" long-name="High-level Internet Protocols" levels="plugin framework server generic specific">
-<collection name="netprotocols_plat" long-name="High-level Internet Protocols Platform Interfaces" level="specific">
-<component name="cookie_manager_api" long-name="Cookie Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/cookie_manager_api/group"/>
-</component>
-<component name="http_cache_mgr_api" long-name="HTTP Cache Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_cache_mgr_api/group"/>
-</component>
-<component name="http_filters_api" long-name="HTTP Filters API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_filters_api/group"/>
-</component>
-</collection>
-<collection name="httpfilters" long-name="HTTP Filters" level="plugin">
-<component name="httpfiltercommon" filter="s60" long-name="HTTP Filter Common">
-<unit bldFile="mw/netprotocols/httpfilters/httpfiltercommon/group"/>
-</component>
-<component name="cookie" filter="s60" long-name="Cookie Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/cookie/group"/>
-</component>
-<component name="deflatefilter" filter="s60" long-name="Deflate Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/deflatefilter/group"/>
-</component>
-<component name="httpfilteracceptheader" filter="s60" long-name="Accept Header Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteracceptheader/group"/>
-</component>
-<component name="httpfilterauthentication" filter="s60" long-name="Authentication Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterauthentication/group"/>
-</component>
-<component name="httpfilterconnhandler" filter="s60" long-name="Connection Handler Fitler" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterconnhandler/group"/>
-</component>
-<component name="httpfilteriop" filter="s60" long-name="HTTP IOP Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteriop/group"/>
-</component>
-<component name="httpfilterproxy" filter="s60" long-name="HTTP Proxy Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterproxy/group"/>
-</component>
-<component name="uaproffilter" filter="s60" long-name="UAProf Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/uaproffilter/group"/>
-</component>
-</collection>
-<collection name="applayerprotocols" long-name="Application Layer Protocols" level="server">
-<component name="httptransportfw" long-name="HTTP Transport Framework" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
-</component>
-<component name="httpexamples" long-name="HTTP Examples" introduced="6.2" purpose="development">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpexamples/group" mrp="mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
-</component>
-<component name="wappushsupport" long-name="WAP Push Support" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
-</component>
-<component name="wapbase" long-name="WAP Base" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wapbase/Group" mrp="mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
-</component>
-<component name="ftpengine" long-name="FTP Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/ftpengine/group" mrp="mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
-</component>
-<component name="telnetengine" long-name="Telnet Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/telnetengine/group" mrp="mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
-</component>
-<component name="httpserviceapi" long-name="HTTP Service API" introduced="TB9.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpservice/group" mrp="mw/netprotocols/applayerprotocols/httpservice/group/http_service.mrp"/>
-</component>
-</collection>
-<collection name="applayerpluginsandutils" long-name="Application Layer Plugins and Utils" level="framework">
-<component name="uripermissionservices" long-name="URI Permission Services" introduced="^2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
-</component>
-<component name="bookmarksupport" long-name="Bookmark Support" introduced="9.1" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
-</component>
-<component name="httpprotocolplugins" long-name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
-</component>
-<component name="httptransportplugins" long-name="HTTP Transport Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
-</component>
-</collection>
-<collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
-<component name="netprotocols_metadata" long-name="High-level Internet Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ipappprotocols" level="generic" long-name="IP App Protocols" levels="plugin conn server if">
-<collection name="ipappprotocols_plat" long-name="IP App Protocols Platform Interfaces" level="if">
-<component name="srtp_api" long-name="SRTP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/srtp_api/group"/>
-</component>
-<component name="rtprtcp_api" long-name="RTP/RTCP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/rtprtcp_api/group"/>
-</component>
-</collection>
-<collection name="rtp" long-name="RTP" level="server">
-<component name="srtpstack" filter="s60" long-name="SRTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/srtpstack/group"/>
-</component>
-<component name="rtpstack" filter="s60" long-name="RTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/rtpstack/group"/>
-</component>
-</collection>
-<collection name="realtimenetprots" long-name="Real Time Net Protocols" level="server">
-<component name="symrtp" long-name="RTP" introduced="9.0" purpose="optional">
-<!-- Real Time Data Protocol -->
-<unit bldFile="mw/ipappprotocols/realtimenetprots/rtp/group" mrp="mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
-</component>
-<component name="sipfw" long-name="SIP Framework" introduced="9.2" purpose="optional">
-<unit bldFile="mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp" version="2"/>
-</component>
-</collection>
-<collection name="sipplugins" long-name="SIP Plugins" level="plugin">
-<component name="sippwlanplugin" filter="s60" long-name="SIP WLAN Plugin" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
-</component>
-<component name="sippsipsettingsui" filter="s60" long-name="SIP Settings UI" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
-</component>
-<component name="sippdevmgmtsipadapter" filter="s60" long-name="Device Management SIP Settings Adapter" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
-</component>
-<component name="sippsystemstatemonitor" filter="s60" long-name="SIP System State Monitor" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsystemstatemonitor/group"/>
-</component>
-<component name="sippsipadapter" filter="s60" long-name="SIP Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipadapter/group"/>
-</component>
-</collection>
-<collection name="sipproviderplugins" long-name="SIP Provider Plugins" level="conn">
-<component name="sipprovider" long-name="SIP Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipproviderplugins/sipprovider/group" mrp="mw/ipappprotocols/sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
-</component>
-</collection>
-<collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="if">
-<component name="ipappprotocols_metadata" long-name="IP App Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wirelessacc" level="specific" long-name="Wireless Access" levels="framework generic ui">
-<collection name="hsfw_plat" long-name="HotSpot Framework Platform Interfaces" level="ui">
-<component name="hotspot_framework_client_api" long-name="HotSpot Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_api" long-name="Internet Connectivity Test Service API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_settings_api" long-name="Internet Connectivity Test Service Settings API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
-</component>
-<component name="hotspot_framework_client_plugin_api" long-name="HotSpot Framework Client Plugin API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
-</component>
-</collection>
-<collection name="hotspotfw" long-name="HotSpot Framework" level="framework">
-<component name="hsserver" filter="s60" long-name="HotSpot Server" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="hsclient" filter="s60" long-name="HotSpot Client" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="internetconnectivitytestservice" filter="s60" long-name="Internet Connectivity Test Service" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
-</component>
-<component name="ictsdialogs" filter="s60" long-name="Internet Connectivity Test Service Dialogs" deprecated="^3" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
-</component>
-<component name="hspluginforagent" filter="s60" long-name="HotSpot Plugin for Agent" plugin="Y" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
-</component>
-<component name="hsbrowser" filter="s60" long-name="HotSpot Browser" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
-</component>
-<component name="hotspotfw_build" filter="s60" long-name="Hotspot Framework Build">
-<!-- should break up this bld.inf into the above components, or collapse them all into a single component -->
-<unit bldFile="mw/wirelessacc/hotspotfw/group"/>
-</component>
-</collection>
-<collection name="wlanutilities" long-name="WLAN Utilities" level="generic">
-<component name="wlanplugin" filter="s60" long-name="WLAN Plugin" plugin="Y">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlanplugin/group"/>
-</component>
-<component name="wlansettingsui" filter="s60" long-name="WLAN Settings UI">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlansettingsui/group"/>
-</component>
-<component name="wlansniffer" filter="s60" long-name="WLAN Sniffer">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlansniffer/group"/>
-</component>
-<component name="wlanindicatorplugin" filter="s60" long-name="WLAN Indicator Plugin" plugin="Y">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlanindicatorplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="vpnclient" level="specific" long-name="VPN Client" levels="engine ui api">
-<!-- is the !oem_build filter needed? -->
-<collection name="vpnc_plat" long-name="VPN Client Platform Interfaces" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API" class="api">
-<unit bldFile="mw/vpnclient/vpnc_plat/vpnapi/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API">
-<unit bldFile="mw/vpnclient/vpnapiimpl/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnengine" long-name="VPN Engine" level="engine">
-<!-- too many components in this collection.
- Probably best to group the binaries together into larger components
- or maybe split the collection into more reasonable groups -->
-<component name="eventmediatorapi" filter="s60" long-name="Event Mediator API">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediatorapi/group" filter="!oem_build"/>
-</component>
-<component name="eventviewer" filter="s60" long-name="Event Viewer">
-<unit bldFile="mw/vpnclient/vpnengine/eventviewer/group" filter="!oem_build"/>
-</component>
-<component name="vpnins" filter="s60" long-name="VPN Installer">
-<unit bldFile="mw/vpnclient/vpnengine/vpnins/group" filter="!oem_build"/>
-</component>
-<component name="ikepolparser" filter="s60" long-name="IKE Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/ikepolparser/group" filter="!oem_build"/>
-</component>
-<component name="utlbase64" filter="s60" long-name="Base64 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlbase64/group" filter="!oem_build"/>
-</component>
-<component name="utlcrypto" filter="s60" long-name="Crypto Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlcrypto/group" filter="!oem_build"/>
-</component>
-<component name="utlxml" filter="s60" long-name="XML Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlxml/group" filter="!oem_build"/>
-</component>
-<component name="utlpkcs10" filter="s60" long-name="PKCS#10 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs10/group" filter="!oem_build"/>
-</component>
-<component name="pkiserviceapi" filter="s60" long-name="PKI Service API">
-<unit bldFile="mw/vpnclient/vpnengine/pkiserviceapi/group" filter="!oem_build"/>
-</component>
-<component name="ikecert" filter="s60" long-name="IKE Certificate Management">
-<unit bldFile="mw/vpnclient/vpnengine/ikecert/group" filter="!oem_build"/>
-</component>
-<component name="kmdapi" filter="s60" long-name="Key Management Daemon API">
-<unit bldFile="mw/vpnclient/vpnengine/kmdapi/group" filter="!oem_build"/>
-</component>
-<component name="kmdserver" filter="s60" long-name="Key Management Daemon Server">
-<unit bldFile="mw/vpnclient/vpnengine/kmdserver/group" filter="!oem_build"/>
-</component>
-<component name="ikeutils" filter="s60" long-name="Internet Key Exchange Utils">
-<unit bldFile="mw/vpnclient/vpnengine/ikeutils/group" filter="!oem_build"/>
-</component>
-<component name="ikev1lib" filter="s60" long-name="IKEv1 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev1lib/group" filter="!oem_build"/>
-</component>
-<component name="ikev2lib" filter="s60" long-name="IKEv2 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev2lib/group" filter="!oem_build"/>
-</component>
-<component name="vpnipsecpolparser" filter="s60" long-name="VPN IPsec Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/vpnipsecpolparser/group" filter="!oem_build"/>
-</component>
-<component name="sit" filter="s60" long-name="Socket Interaction Thread">
-<unit bldFile="mw/vpnclient/vpnengine/sit/group" filter="!oem_build"/>
-</component>
-<component name="vpntcwrapper" filter="s60" long-name="VPN Terminal Control Wrapper">
-<unit bldFile="mw/vpnclient/vpnengine/vpntcwrapper/group" filter="!oem_build"/>
-</component>
-<component name="eventmediator" filter="s60" long-name="Event Mediator">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediator/group" filter="!oem_build"/>
-</component>
-<component name="pkiservice" filter="s60" long-name="PKI Service">
-<unit bldFile="mw/vpnclient/vpnengine/pkiservice/group" filter="!oem_build"/>
-</component>
-<component name="vpnconnagt" filter="s60" long-name="VPN Connection Agent">
-<unit bldFile="mw/vpnclient/vpnengine/vpnconnagt/group" filter="!oem_build"/>
-</component>
-<component name="vpnmanager" filter="s60" long-name="VPN Manager">
-<unit bldFile="mw/vpnclient/vpnengine/vpnmanager/group" filter="!oem_build"/>
-</component>
-<component name="vpncleaner" filter="s60" long-name="VPN Cleaner">
-<unit bldFile="mw/vpnclient/vpnengine/vpncleaner/group" filter="!oem_build"/>
-</component>
-<component name="utlpkcs12" filter="s60" long-name="PKCS#12 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs12/group" filter="!oem_build"/>
-</component>
-<component name="dmadengine" filter="s60" long-name="DM Adapter Engine">
-<unit bldFile="mw/vpnclient/vpnengine/dmadengine/group" filter="!oem_build"/>
-</component>
-<component name="dmadipsecvpn" filter="s60" long-name="IPsec VPN DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadipsecvpn/group" filter="!oem_build"/>
-</component>
-<component name="dmadpki" filter="s60" long-name="PKI DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadpki/group" filter="!oem_build"/>
-</component>
-<component name="ikesocket" filter="s60" long-name="IKE Socket" introduced="^3">
-<unit bldFile="mw/vpnclient/vpnengine/ikesocket/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnui" long-name="VPN UI" level="ui">
-<component name="vpnecomnotifier" filter="s60" long-name="VPN ECOM Notifier" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnecomnotifier/group" filter="!oem_build"/>
-</component>
-<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">
-<unit bldFile="mw/vpnclient/vpnui/vpnmanagementui/group" filter="!oem_build"/>
-</component>
-<component name="vpnpolins" filter="s60" long-name="VPN Policy Installer">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolins/group" filter="!oem_build"/>
-</component>
-<component name="vpnpolicyrecognizer" filter="s60" long-name="VPN Policy Recognizer" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolicyrecognizer/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnclient_info" long-name="VPN Client Info" level="api">
-<component name="vpnclient_help" filter="s60" long-name="VPN Client Help">
-<unit bldFile="mw/vpnclient/help/group" filter="!oem_build"/>
-</component>
-<component name="vpnclient_build" filter="s60" long-name="VPN Client Build">
-<!-- should split this up into the other components and remove this-->
-<unit bldFile="mw/vpnclient/group" filter="!oem_build"/>
-</component>
-</collection>
-</block>
-<block name="ipappsrv" level="specific" long-name="IP App Services" levels="framework generic server conn plugin">
-<collection name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" level="plugin">
-<component name="transcoder_api" long-name="Transcoder API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
-</component>
-<component name="comms_event_api" long-name="Comms Event API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/comms_event_api/group"/>
-</component>
-<component name="floor_control_api" long-name="Floor Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/floor_control_api/group"/>
-</component>
-<component name="media_control_api" long-name="Media Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/media_control_api/group"/>
-</component>
-<component name="multimedia_comms_api" long-name="Multimedia Comms API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/multimedia_comms_api/group"/>
-</component>
-<component name="nat_settings_api" long-name="NAT Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/nat_settings_api/group"/>
-</component>
-</collection>
-<collection name="natfw" long-name="NAT Framework" level="framework">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="natfw_build" filter="s60" long-name="NAT Framework Build" introduced="^2">
-<unit bldFile="mw/ipappsrv/natfw/group"/>
-</component>
-</collection>
-<collection name="multimediacommscontroller" long-name="Multimedia Comms Controller" level="conn">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommscontroller_build" filter="s60" long-name="Multimedia Comms Controller Build">
-<unit bldFile="mw/ipappsrv/multimediacommscontroller/group"/>
-</component>
-</collection>
-<collection name="multimediacommsengine" long-name="Multimedia Comms Engine" level="generic">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommsengine_build" filter="s60" long-name="Multimedia Comms Engine Build">
-<unit bldFile="mw/ipappsrv/multimediacommsengine/group"/>
-</component>
-</collection>
-<collection name="natplugins" long-name="NAT Plugins" level="plugin">
-<component name="natpcliprovisioningnatfwadapter" filter="s60" long-name="Client Provisioning NAT Framework Traversal Adapter" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/group"/>
-</component>
-<component name="natpdevmgmtnatfwadapter" filter="s60" long-name="Device Management NAT Framework Traversal Adapter" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/group"/>
-</component>
-<component name="natptraversalcontroller" filter="s60" long-name="NAT Traversal Controller" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natptraversalcontroller/group"/>
-</component>
-<component name="natpnatfwsdpprovider" filter="s60" long-name="NAT Framework SDP Provider" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpnatfwsdpprovider/group"/>
-</component>
-</collection>
-<collection name="ipappsrv_info" long-name="IP App Services Info" level="plugin">
-<component name="ipappsrv_build" long-name="IP App Services Build" filter="s60">
-<!-- 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">
-<collection name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" level="specific">
-<component name="string_parser_api" long-name="String Parser API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/string_parser_api/group"/>
-</component>
-<component name="cbs_mcn_client_api" long-name="CBS MCN Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cbs_mcn_client_api/group"/>
-</component>
-<component name="converged_call_engine_api" long-name="Converged Call Engine API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_engine_api/group"/>
-</component>
-<component name="aiw_dial_data_consumer_api" long-name="AIW Dial Data Consumer API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/aiw_dial_data_consumer_api/group"/>
-</component>
-<component name="phone_client_ussd_api" long-name="Phone Client USSD API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_api/group"/>
-</component>
-<component name="sat_refresh_api" long-name="SAT Refresh API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_refresh_api/group" filter="!test"/>
-</component>
-<component name="network_handling_engine_api" long-name="Network Handling Engine API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/network_handling_engine_api/group"/>
-</component>
-<component name="phone_client_emergency_call_api" long-name="Phone Client Emergency Call API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/group"/>
-</component>
-<component name="sat_configuration_api" long-name="SAT Configuration API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_configuration_api/group"/>
-</component>
-<component name="dial_utils_api" long-name="Dial Utils API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/dial_utils_api/group"/>
-</component>
-<component name="phone_client_image_handler_api" long-name="Phone Client Image Handler API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_image_handler_api/group"/>
-</component>
-<component name="phone_client_messenger_api" long-name="Phone Client Messenger API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_messenger_api/group"/>
-</component>
-<component name="sat_client_api" long-name="SAT Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_client_api/group" filter="!test"/>
-</component>
-<component name="phone_client_api" long-name="Phone Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_api/group"/>
-</component>
-<component name="sat_service_api" long-name="SAT Service API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_service_api/group" filter="!test"/>
-</component>
-<component name="cbs_message_api" long-name="CBS Message API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cbs_message_api/group"/>
-</component>
-<component name="phone_client_server_information_api" long-name="Phone Client Server Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_server_information_api/group"/>
-</component>
-<component name="phone_client_ussd_internal_api" long-name="Phone Client USSD Internal API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_internal_api/group"/>
-</component>
-<component name="phone_client_command_handler_api" long-name="Phone Client Command Handler API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_command_handler_api/group"/>
-</component>
-<component name="phone_client_notify_api" long-name="Phone Client Notify API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_notify_api/group"/>
-</component>
-<component name="phone_client_utility_api" long-name="Phone Client Utility API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_utility_api/group"/>
-</component>
-<component name="telephony_network_information_api" long-name="Telephony Network Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_network_information_api/group"/>
-</component>
-<component name="secondary_display_sat_api" long-name="Secondary Display SAT API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/secondary_display_sat_api/group"/>
-</component>
-<component name="callui_reconnect_query_api" long-name="CallUI Reconnect Query API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/callui_reconnect_query_api/group"/>
-</component>
-<component name="service_provider_settings_api" long-name="Service Provider Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/service_provider_settings_api/group"/>
-</component>
-<component name="converged_call_provider_api" long-name="Converged Call Provider API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_provider_api/group"/>
-</component>
-<component name="incoming_call_monitor_api" long-name="Incoming Call Monitor API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/incoming_call_monitor_api/group"/>
-</component>
-<component name="default_emergency_numbers_api" long-name="Default Emergency Numbers API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/default_emergency_numbers_api/group"/>
-</component>
-<component name="cenrep_database_api" long-name="Central Repository Database API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cenrep_database_api/group"/>
-</component>
-<component name="ss_settings_api" long-name="SS Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/ss_settings_api/group"/>
-</component>
-<component name="phone_settings_observer_api" long-name="Phone Settings Observer API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_observer_api/group"/>
-</component>
-<component name="phone_settings_notes_ui_api" long-name="Phone Settings Notes UI API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_notes_ui_api/group"/>
-</component>
-<component name="phone_settings_api" long-name="Phone Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_api/group"/>
-</component>
-<component name="voice_mailbox_number_api" long-name="Voice Mailbox Number API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_number_api/group"/>
-</component>
-<component name="voice_mailbox_settings_api" long-name="Voice Mailbox Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_settings_api/group"/>
-</component>
-<component name="call_information_api" long-name="Call Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/call_information_api/group" filter="!test"/>
-</component>
-<component name="call_remote_party_information_api" long-name="Call Remote Party Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/call_remote_party_information_api/group" filter="!test"/>
-</component>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_mediator_api/group"/>
-</component>
-</collection>
-<collection name="telutils" long-name="Telephony Utils" level="generic">
-<component name="phoneparser" filter="s60" long-name="Phone Parser">
-<unit bldFile="mw/phonesrv/telutils/phoneparser/group"/>
-</component>
-<component name="telephonyservice" filter="s60" long-name="Telephony Service">
-<unit bldFile="mw/phonesrv/telutils/telephonyservice/group"/>
-</component>
-</collection>
-<collection name="cbs" long-name="Cellular Baseband Services" level="plugin">
-<component name="cbsserver" filter="s60" long-name="CBS Server">
-<unit bldFile="mw/phonesrv/cbs/cbsserver/group"/>
-</component>
-<component name="cbsui" filter="s60" long-name="CBS UI">
-<unit bldFile="mw/phonesrv/cbs/cbsui/group"/>
-</component>
-</collection>
-<collection name="cellular" long-name="Cellular" level="server">
-<component name="telephonysettings" filter="s60" long-name="Telephony Settings">
-<unit bldFile="mw/phonesrv/cellular/telephonysettings/group"/>
-</component>
-<component name="sssettings" filter="s60" long-name="Supplementary Service Settings">
-<unit bldFile="mw/phonesrv/cellular/sssettings/group"/>
-</component>
-<component name="psetnotesui" filter="s60" long-name="Phone Settings Notes UI">
-<unit bldFile="mw/phonesrv/cellular/psetnotesui/group"/>
-</component>
-<component name="servicerequest" filter="s60" long-name="Service Request">
-<unit bldFile="mw/phonesrv/cellular/servicerequest/group"/>
-</component>
-</collection>
-<collection name="convergedcallengine" long-name="Converged Call Engine" level="framework">
-<component name="callprovider" filter="s60" long-name="Call Provider">
-<unit bldFile="mw/phonesrv/convergedcallengine/callprovider/group"/>
-</component>
-<component name="cce" filter="s60" long-name="CCE">
-<unit bldFile="mw/phonesrv/convergedcallengine/cce/group"/>
-</component>
-<component name="spsettings" filter="s60" long-name="Service Provider Settings">
-<unit bldFile="mw/phonesrv/convergedcallengine/spsettings/group"/>
-</component>
-<component name="cenrepdatabase" filter="s60" long-name="CCE Cenrep Database">
-<unit bldFile="mw/phonesrv/convergedcallengine/cenrepdatabase/group"/>
-</component>
-<component name="serviceselector" filter="s60" long-name="Service Selector">
-<unit bldFile="mw/phonesrv/convergedcallengine/serviceselector/group"/>
-</component>
-<component name="csplugin" filter="s60" long-name="CS Plugin" plugin="Y">
-<!-- should spell out CS in name -->
-<unit bldFile="mw/phonesrv/convergedcallengine/csplugin/group"/>
-</component>
-</collection>
-<collection name="engines" long-name="Telephony Engines" level="specific">
-<component name="vmbxengine" filter="s60" long-name="Voice Mailbox Engine">
-<unit bldFile="mw/phonesrv/engines/vmbxengine/group"/>
-</component>
-</collection>
-<collection name="networkhandling" long-name="Network Handling" level="plugin">
-<component name="networkhandlingengine" filter="s60" long-name="Network Handling Engine">
-<unit bldFile="mw/phonesrv/networkhandling/networkhandlingengine/group"/>
-</component>
-</collection>
-<collection name="phoneclientserver" long-name="Phone Client/Server" level="server">
-<component name="enpolicy" filter="s60" long-name="Emergency Number Policy">
-<unit bldFile="mw/phonesrv/phoneclientserver/enpolicy/group"/>
-</component>
-<component name="aiwdialdata" filter="s60" long-name="AIW Dial Data">
-<unit bldFile="mw/phonesrv/phoneclientserver/aiwdialdata/group"/>
-</component>
-<component name="dialutils" filter="s60" long-name="Dial Utils">
-<unit bldFile="mw/phonesrv/phoneclientserver/dialutils/group"/>
-</component>
-<component name="phoneclient" filter="s60" long-name="Phone Client">
-<unit bldFile="mw/phonesrv/phoneclientserver/phoneclient/group"/>
-</component>
-<component name="phoneserver" filter="s60" long-name="Phone Server">
-<unit bldFile="mw/phonesrv/phoneclientserver/phoneserver/group"/>
-</component>
-<component name="callui" filter="s60" long-name="Call UI">
-<unit bldFile="mw/phonesrv/phoneclientserver/callui/group"/>
-</component>
-</collection>
-<collection name="satengine" long-name="SIM Application Toolkit Engine" level="generic">
-<component name="satserver" filter="s60" long-name="SAT Server">
-<unit bldFile="mw/phonesrv/satengine/satserver/group"/>
-</component>
-</collection>
-<collection name="satui" long-name="SIM Application Toolkit UI" level="specific">
-<component name="satapp" filter="s60" long-name="SAT Application">
-<unit bldFile="mw/phonesrv/satui/satapp/group"/>
-</component>
-<component name="satplugin" filter="s60" long-name="SAT Plugin" plugin="Y">
-<unit bldFile="mw/phonesrv/satui/satplugin/group"/>
-</component>
-</collection>
-<collection name="phonecmdhandler" long-name="Phone Command Handler" level="generic">
-<component name="phonecmdhnlr" filter="s60" long-name="Phone Command Handler">
-<unit bldFile="mw/phonesrv/phonecmdhandler/phonecmdhnlr/group"/>
-</component>
-</collection>
-<collection name="phonesrv_info" long-name="Telephony and SIM Services Info" level="specific"/>
-</block>
-<block name="messagingmw" level="specific" long-name="Messaging Middleware" levels="stack fw api">
-<collection name="msgfw_pub" long-name="Messaging Middleware Public Interfaces" level="api">
-<component name="send_ui_api" long-name="Send UI API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_pub/send_ui_api/group"/>
-</component>
-</collection>
-<collection name="msgfw_plat" long-name="Messaging Middleware Platform Interfaces" level="api">
-<component name="always_online_plugin_api" long-name="Always Online Plugin API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_plugin_api/group"/>
-</component>
-<component name="always_online_client_api" long-name="Always Online Client API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_client_api/group"/>
-</component>
-<component name="msg_common_utils_api" long-name="Messaging Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/msg_common_utils_api/group"/>
-</component>
-<component name="send_ui_plugin_api" long-name="Send UI Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/send_ui_plugin_api/group"/>
-</component>
-<component name="send_ui_datautils_api" long-name="Send UI Data Utils API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/send_ui_datautils_api/group"/>
-</component>
-</collection>
-<collection name="msgbranched" long-name="Messaging Branched" level="fw">
-<!-- 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"/>
-</component>
-</collection>
-<collection name="messagingfw" long-name="Messaging Framework" level="fw">
-<!-- should break this collection up into smaller related collections -->
-<component name="alwaysonline" filter="s60" long-name="Always Online Server" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/alwaysonline/group"/>
-</component>
-<component name="msgcommonutils" filter="s60" long-name="Messaging Common Utils" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/msgcommonutils/group"/>
-</component>
-<component name="senduiservices" filter="s60" long-name="Send UI Services" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/senduiservices/group"/>
-</component>
-<component name="scheduledsendmtm" long-name="Scheduled Send MTM" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/group" mrp="mw/messagingmw/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
-</component>
-<component name="msgsrvnstore" long-name="Message Server and Store" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/group" mrp="mw/messagingmw/messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
-</component>
-<component name="biomsgfw" long-name="BIO Messaging Framework" introduced="6.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/group" mrp="mw/messagingmw/messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
-</component>
-<component name="msgconf" long-name="Messaging Config" introduced="^2" purpose="optional" class="config">
-<unit bldFile="mw/messagingmw/messagingfw/msgconf/group" mrp="mw/messagingmw/messagingfw/msgconf/group/messaging_config.mrp"/>
-</component>
-<component name="watcherfw" long-name="Watcher Framework" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/watcherfw/group" mrp="mw/messagingmw/messagingfw/watcherfw/group/messaging_watcher.mrp"/>
-</component>
-<component name="msgtest" long-name="Messaging Test" purpose="development">
-<unit bldFile="mw/messagingmw/messagingfw/msgtest/group" mrp="mw/messagingmw/messagingfw/msgtest/group/messaging_test.mrp"/>
-</component>
-<component name="sendas" long-name="Send As" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/sendas/group" mrp="mw/messagingmw/messagingfw/sendas/group/messaging_sendas2.mrp"/>
-</component>
-<component name="msgurlhandler" long-name="Message URL Handler" introduced="7.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/group" mrp="mw/messagingmw/messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
-</component>
-<component name="wappushfw" long-name="WAP Push Framework" introduced="6.1" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/wappushfw/group" mrp="mw/messagingmw/messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
-</component>
-<component name="suplsmshandler" long-name="SUPL SMS Handler" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplsmshandler/group" mrp="mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/>
-</component>
-<component name="suplwappushhandler" long-name="SUPL WAP Push Handler" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
-</component>
-</collection>
-<collection name="messagingmw_info" long-name="Messaging Middleware Info" level="api">
-<component name="messagingmw_metadata" long-name="Messaging Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="imsrv" level="specific" long-name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
-<collection name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" level="specific">
-<component name="ximp_core_data_model_api" long-name="XIMP Core Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_host_api" long-name="XIMP Presence Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_presence_data_model_api" long-name="XIMP Presence Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_api" long-name="XIMP Presence Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_presence_management_api" long-name="XIMP Presence Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_management_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_host_api" long-name="XIMP Core Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_core_management_api" long-name="XIMP Core Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_management_api/group"/>
-</component>
-<component name="ximp_presence_base_api" long-name="XIMP Presence Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_base_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_api" long-name="XIMP Core Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_core_base_api" long-name="XIMP Core Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_base_api/group"/>
-</component>
-<component name="ximp_presence_cache_api" long-name="XIMP Presence Cache API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_cache_api/group"/>
-</component>
-<component name="ximp_core_feature_plugin_api" long-name="XIMP Core Feature Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_host_api" long-name="XIMP IM Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_im_data_model_api" long-name="XIMP IM Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_data_model_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_api" long-name="XIMP IM Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_im_management_api" long-name="XIMP IM Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_management_api/group"/>
-</component>
-<component name="ximp_im_base_api" long-name="XIMP IM Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_base_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_host_api" long-name="XIMP Search Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_search_data_model_api" long-name="XIMP Search Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_data_model_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_api" long-name="XIMP search Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_search_management_api" long-name="XIMP Search Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_management_api/group"/>
-</component>
-<component name="ximp_search_base_api" long-name="XIMP Search Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_base_api/group"/>
-</component>
-<component name="xmpp_settings_api" long-name="XMPP Settings API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/group"/>
-</component>
-<component name="im_cache_client_api" long-name="IM Cache Client API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/im_cache_client_api/group"/>
-</component>
-<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 Avability Text" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
-</component>
-</collection>
-<collection name="ximpfw" long-name="XIMP Framework" level="framework">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="ximpfw_build" filter="s60" long-name="XIMP Framework Build">
-<unit bldFile="mw/imsrv/ximpfw/group"/>
-</component>
-</collection>
-<collection name="imservices" long-name="IM Services" level="generic">
-<component name="imfeatureplugin" filter="s60" long-name="IM Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/imfeatureplugin/group"/>
-</component>
-<component name="searchfeatureplugin" filter="s60" long-name="Search Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/searchfeatureplugin/group"/>
-</component>
-<component name="xmppsettingsapi" filter="s60" long-name="XMPP Settings API" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsapi/group"/>
-</component>
-<component name="xmppsettingsfetcher" filter="s60" long-name="XMPP Settings Fetcher" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/group"/>
-</component>
-<component name="ossprotocoladaptation" filter="s60" long-name="OSS Protocol Adaptation" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/ossprotocoladaptation/group"/>
-</component>
-<component name="instantmessagingcache" filter="s60" long-name="Instant Messaging Cache" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/instantmessagingcache/group"/>
-</component>
-</collection>
-<collection name="brandingserver" long-name="Branding Server" level="specific">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="brandingserver_build" filter="s60" long-name="Branding Server Build">
-<unit bldFile="mw/imsrv/brandingserver/group"/>
-</component>
-</collection>
-</block>
-<block name="legacypresence" level="specific" long-name="Legacy Presence Services" levels="engine fw ui">
-<collection name="pressrv_plat" long-name="Legacy Presence Services Platform Interfaces" level="ui">
-<component name="presence_list_api" long-name="Presence List API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/presence_list_api/group"/>
-</component>
-<component name="watcher_info_api" long-name="Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_info_api/group"/>
-</component>
-<component name="simple_documents_api" long-name="SIMPLE Documents API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_documents_api/group"/>
-</component>
-<component name="authorization_api" long-name="Authorization API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/authorization_api/group"/>
-</component>
-<component name="xdm_protocol_plugin_api" long-name="XDM Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_protocol_plugin_api/group"/>
-</component>
-<component name="watcher_api" long-name="Watcher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_api/group"/>
-</component>
-<component name="xdm_api" long-name="XDM API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_api/group"/>
-</component>
-<component name="registration_api" long-name="Registration API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/registration_api/group"/>
-</component>
-<component name="publisher_api" long-name="Publisher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/publisher_api/group"/>
-</component>
-<component name="messaging_connection_manager_api" long-name="Messaging Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/messaging_connection_manager_api/group"/>
-</component>
-<component name="xdm_settings_api" long-name="XDM Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_settings_api/group"/>
-</component>
-<component name="simple_settings_api" long-name="SIMPLE Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_settings_api/group"/>
-</component>
-<component name="simple_instant_msg_api" long-name="Simple Instant Msg API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_instant_msg_api/group"/>
-</component>
-</collection>
-<collection name="xdmengine" long-name="XDM Engine" level="engine">
-<!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
-<component name="xdmengine_build" filter="s60" long-name="XDM Engine Build">
-<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">
-<unit bldFile="mw/legacypresence/xdmprotocols/group"/>
-</component>
-</collection>
-<collection name="msgconnmanager" long-name="Messaging Connection Manager" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="msgconnmanager_build" filter="s60" long-name="Messaging Connection Manager Build">
-<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">
-<unit bldFile="mw/legacypresence/simpleengine/group"/>
-</component>
-</collection>
-<collection name="presencefwsimpleadpt" long-name="Presence Framework SIMPLE Adaptation" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="simpleplugin" filter="s60" long-name="SIMPLE Plugin" plugin="Y">
-<unit bldFile="mw/legacypresence/presencefwsimpleadpt/group"/>
-</component>
-</collection>
-<collection name="simpledatamodeladapter" long-name="SIMPLE Data Model Adapter" level="fw">
-<component name="presenceplugin" filter="s60" long-name="Presence Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/legacypresence/simpledatamodeladapter/group"/>
-</component>
-</collection>
-</block>
-<block name="opensrv" level="specific" long-name="Open Services" levels="prt lib server eng">
-<collection name="opensrv_plat" long-name="Open Services Platform Interfaces" level="eng">
-<component name="messagequeue_api" long-name="Message Queue API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/opensrv/opensrv_plat/messagequeue_api/group"/>
-</component>
-</collection>
-<collection name="loudmouth" long-name="Loudmouth" level="prt">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="loudmouth_build" filter="s60" long-name="Loudmouth Build" introduced="^2">
-<unit bldFile="mw/opensrv/loudmouth/group"/>
-</component>
-</collection>
-<collection name="libtelepathy" long-name="Telepathy Library" level="lib">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="libtelepathy_build" filter="s60" long-name="Telepathy Library Build" introduced="^2">
-<unit bldFile="mw/opensrv/libtelepathy/group"/>
-</component>
-</collection>
-<collection name="telepathygabble" long-name="Telepathy Gabble" level="eng">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="telepathygabble_build" filter="s60" long-name="Telepathy Gabble Build" introduced="^2">
-<unit bldFile="mw/opensrv/telepathygabble/group"/>
-</component>
-</collection>
-<collection name="isolationserver" long-name="Isolation Server" level="server">
-<component name="messagequeue" filter="s60" long-name="Message Queue" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/messagequeue/group"/>
-</component>
-<component name="isoserver" filter="s60" long-name="ISO Server" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/isoserver/group"/>
-</component>
-<component name="isolationserver_build" filter="s60" long-name="Isloation Server Build" introduced="^2">
-<!-- needs #includes removed. either move the exports to another component or make this a ROM component -->
-<unit bldFile="mw/opensrv/isolationserver/group"/>
-</component>
-</collection>
-</block>
-<block name="remotemgmt" level="specific" long-name="Remote Management" levels="plugin framework server generic specific">
-<collection name="remotemgmt_pub" long-name="Remote Management Public Interfaces" level="specific">
-<component name="synchronization_capability_api" long-name="Synchronization Capability API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
-</component>
-</collection>
-<collection name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" level="specific">
-<component name="common_agent_util_and_definitions_api" long-name="Common Agent util and definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
-</component>
-<component name="policy_management_certificate_api" long-name="Policy Management Certificate API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/group"/>
-</component>
-<component name="oma_provisioning_adapter_api" long-name="OMA Provisioning Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_adapter_api/group"/>
-</component>
-<component name="device_management_parameter_api" long-name="Device Management Parameter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_parameter_api/group"/>
-</component>
-<component name="data_synchronization_plugin_api" long-name="Data Synchronization Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/group"/>
-</component>
-<component name="sync_alert_handler_api" long-name="Sync Alert Handler API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
-</component>
-<component name="syncml_notifier_api" long-name="SyncML Notifier API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
-</component>
-<component name="syncml_client_api" long-name="SyncML Client API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
-</component>
-<component name="device_management_plugin_api" long-name="Device Management plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_plugin_api/group"/>
-</component>
-<component name="dm_tree_apis" long-name="DM Tree APIs" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
-</component>
-<component name="terminal_security_device_lock_api" long-name="Terminal Security Device Lock API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/group"/>
-</component>
-<component name="policy_management_request_api" long-name="Policy Management Request API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/group"/>
-</component>
-<component name="ds_constant_definitions_api" long-name="DS Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_constant_definitions_api/group"/>
-</component>
-<component name="scp_server_api" long-name="SCP Server API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/group"/>
-</component>
-<component name="data_synchronization_notification_api" long-name="Data Synchronization Notification API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_notification_api/group"/>
-</component>
-<component name="oma_provisioning_engine_api" long-name="OMA Provisioning Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/group"/>
-</component>
-<component name="dm_utils_api" long-name="DM Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/group"/>
-</component>
-<component name="syncml_alert_api" long-name="SyncML Alert API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/group"/>
-</component>
-<component name="obex_client_session_api" long-name="OBEX Client session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/obex_client_session_api/group"/>
-</component>
-<component name="setting_enforcement_info_api" long-name="Setting Enforcement Info API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/group"/>
-</component>
-<component name="dm_constant_definitions_api" long-name="DM Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
-</component>
-<component name="oma_ds_extensions_api" long-name="OMA DS Extensions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
-</component>
-<component name="pnpms_utils_api" long-name="PNPMS Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
-</component>
-<component name="diagnostics_plugin_utility_api" long-name="Diagnostics Plugin Utility API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
-</component>
-<component name="diagnostics_plugin_api" long-name="Diagnostics Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
-</component>
-<component name="diagnostics_framework_api" long-name="Diagnostics Framework API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
-</component>
-<component name="diagnostics_results_api" long-name="Diagnostics Results API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
-</component>
-<component name="diagnostics_plugin_pool_api" long-name="Diagnostics Plugin Pool API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
-</component>
-<component name="adaptive_history_list_api" long-name="Adaptive History List API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
-</component>
-<component name="adaptive_history_list_session_api" long-name="Adaptive History List Session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
-</component>
-<component name="fota_engine_api" long-name="FOTA Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
-</component>
-<component name="update_package_storage_plugin_api" long-name="Update Package Storage Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
-</component>
-<component name="syncml_notifier_roaming_api" long-name="SyncML Notifier Roaming API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
-</component>
-<component name="sync_service_api" long-name="Sync Service API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_service_api/group"/>
-</component>
-<component name="dcmo_adapter_api" long-name="DCMO Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_adapter_api/group"/>
-</component>
-<component name="dcmo_control_api" long-name="DCMO Control API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_control_api/group"/>
-</component>
-<component name="ds_capability_mgmt_plugin_api" long-name="DS Capability Management Plugin API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
-</component>
-<component name="dm_native_notifier_api" long-name="DM Native Notifier API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_native_notifier_api/group"/>
-</component>
-<component name="syncml_ds_error_reporting_api" long-name="SyncML DS Error Reporting API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_ds_error_reporting_api/group"/>
-</component>
-<component name="syncml_ds_customization_api" long-name="SyncML DS Customization API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_ds_customization_api/group"/>
-</component>
-</collection>
-<collection name="policymanagement" long-name="Policy Management" level="generic">
-<component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">
-<unit bldFile="mw/remotemgmt/policymanagement/pmdmadapter/group"/>
-</component>
-<component name="dmutilserver" filter="s60" long-name="DM Util Server">
-<unit bldFile="mw/remotemgmt/policymanagement/dmutilserver/group"/>
-</component>
-<component name="policyengine" filter="s60" long-name="Policy Engine">
-<unit bldFile="mw/remotemgmt/policymanagement/policyengine/group"/>
-</component>
-<component name="policymanagement_build" filter="s60" long-name="Policy Management Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/policymanagement/group"/>
-</component>
-</collection>
-<collection name="syncmlfw" long-name="SyncML Framework" level="server">
-<component name="syncmlfw_build" filter="s60" long-name="SyncML Framework Build">
-<!-- need to break this up into components. Too convoluted a structure to be in a single bld.inf-->
-<unit bldFile="mw/remotemgmt/syncmlfw/group"/>
-</component>
-</collection>
-<collection name="terminalsecurity" long-name="Terminal Security" level="specific">
-<component name="scp" filter="s60" long-name="Security Code Proxy">
-<!-- can only have one unit, need to have these #included from a single bld.inf -->
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpdatabase/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpserver/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scppatternplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scphistoryplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scptimestampplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpeventhandler/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/dmeventnotifier/group"/>
-</component>
-<component name="terminalsecurity_client" filter="s60" long-name="Terminal Control Client">
-<unit bldFile="mw/remotemgmt/terminalsecurity/client/group"/>
-</component>
-<component name="terminalsecurity_server" filter="s60" long-name="Terminal Control Server">
-<unit bldFile="mw/remotemgmt/terminalsecurity/server/group"/>
-</component>
-<component name="tcadapter" filter="s60" long-name="Terminal Control Adapter">
-<unit bldFile="mw/remotemgmt/terminalsecurity/tcadapter/bld"/>
-</component>
-<component name="terminalsecurity_build" filter="s60" long-name="Terminal Security Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/terminalsecurity/group"/>
-</component>
-</collection>
-<collection name="omaprovisioning" long-name="OMA Provisioning" level="specific">
-<component name="pnputil" filter="s60" long-name="PnP Util">
-<unit bldFile="mw/remotemgmt/omaprovisioning/pnputil/group"/>
-</component>
-<component name="provisioning" filter="s60" long-name="Provisioning">
-<unit bldFile="mw/remotemgmt/omaprovisioning/provisioning/group"/>
-</component>
-</collection>
-<collection name="devicediagnosticsfw" long-name="Device Diagnostics Framework" level="framework">
-<component name="diagframework" filter="s60" long-name="Diagnostics Framework">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
-</component>
-<component name="diagpluginbase" filter="s60" long-name="Diagnostics Plugin Base">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
-</component>
-<component name="diagresultsdb" filter="s60" long-name="Diagnostics Results Database">
-<!-- can only have one unit, merge or split into two components -->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
-</component>
-<component name="devicediagnosticsfw_build" filter="s60" long-name="Device Diagnostics Framework Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/group"/>
-</component>
-</collection>
-<collection name="dcmofw" long-name="Device Capability Management Object Framework" level="framework">
-<component name="dcmoclient" filter="s60" long-name="DCMO Client">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoclient/group"/>
-</component>
-<component name="dcmoserver" filter="s60" long-name="DCMO Server">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoserver/group"/>
-</component>
-<component name="dcmocustcmd" filter="s60" long-name="DCMO Custom Commands">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmocustcmd/group"/>
-</component>
-<component name="dcmofw_build" filter="s60" long-name="DCMO Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/dcmofw/group"/>
-</component>
-</collection>
-<collection name="fotaapplication" long-name="FOTA Application" level="generic">
-<component name="fotaapplication_build" filter="s60" long-name="FOTA Application Build">
-<!-- remove this component when configuration is in place and the #ifdefs have been worked out -->
-<unit bldFile="mw/remotemgmt/fotaapplication/group"/>
-</component>
-<component name="fotaserver" filter="s60" long-name="FOTA Server">
-<!-- uncomment when #ifdefs are resolved -->
-<!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
-</component>
-<component name="fotacustcmds" filter="s60" long-name="FOTA Custom Commands" class="placeholder">
-<!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
-<!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
-</component>
-</collection>
-</block>
-<block name="remotestorage" level="generic" long-name="Remote Storage" levels="framework if">
-<collection name="rsfw_plat" long-name="Remote Storage Platform Interfaces" level="if">
-<component name="rsfw_access_protocol_plugin_api" filter="s60" long-name="Remote Storage Framework Access Protocol Plugin API" class="api">
-<unit bldFile="mw/remotestorage/rsfw_plat/rsfw_access_protocol_plugin_api/group"/>
-</component>
-</collection>
-<collection name="remotestoragefw" long-name="Remote Storage Framework" level="framework">
-<component name="mountstore" filter="s60" long-name="RSFW Mount Store">
-<unit bldFile="mw/remotestorage/remotestoragefw/mountstore/group"/>
-</component>
-<component name="rsfwnotifierplugins" filter="s60" long-name="RSFW Notifier Plugins" plugin="Y">
-<unit bldFile="mw/remotestorage/remotestoragefw/rsfwnotifierplugins/group"/>
-</component>
-<component name="remotefileengine" filter="s60" long-name="Remote File Engine">
-<unit bldFile="mw/remotestorage/remotestoragefw/remotefileengine/group"/>
-</component>
-<component name="mountmanager" filter="s60" long-name="RSFW Mount Manager">
-<unit bldFile="mw/remotestorage/remotestoragefw/mountmanager/group"/>
-</component>
-<component name="webdavaccessplugin" filter="s60" long-name="WebDAV Access Plugin" plugin="Y">
-<unit bldFile="mw/remotestorage/remotestoragefw/webdavaccessplugin/group"/>
-</component>
-<component name="remotefilesystemplugin" filter="s60" long-name="Remote Filesystem Plugin" plugin="Y">
-<unit bldFile="mw/remotestorage/remotestoragefw/remotefilesystemplugin/group"/>
-</component>
-<component name="remotestoragegsplugin" filter="s60" long-name="RS GS Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
-<!-- <unit bldFile="remotestoragefw/gsplugin/group"/>-->
-</component>
-<component name="remotedriveconfigurationbiocontrol" filter="s60" long-name="Remote Drive Configuration BIO Control">
-<!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
-<!-- <unit bldFile="remotestoragefw/remotedriveconfigurationbiocontrol/group"/>-->
-</component>
-<component name="remotestoragefw_build" filter="s60" long-name="Remote Storage Framework Build">
-<!-- move exports to other components.
- This is needed for #includes of configured component until congigiration is in place -->
-<unit bldFile="mw/remotestorage/remotestoragefw/group"/>
-</component>
-</collection>
-</block>
-<block name="remoteconn" level="generic" long-name="Remote Connectivity" levels="plugin framework server generic specific">
-<collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
-<component name="secon" filter="s60" long-name="Service Controllers">
-<unit bldFile="mw/remoteconn/connectivitymodules/secon/group"/>
-</component>
-</collection>
-<collection name="remoteconn_info" long-name="Remote Connectivity Info" level="specific">
-<component name="remoteconn_metadata" long-name="Remote Connectivity Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mtptransports" long-name="MTP Transports" level="plugin">
-<component name="mtpusbtransport" long-name="MTP USB Transport" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpusbtransport/group" mrp="mw/remoteconn/mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
-</component>
-<component name="mtpptpiptransport" long-name="MTP PTP-IP Transport" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpptpiptransport/group" mrp="mw/remoteconn/mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
-</component>
-<component name="mtpcontroller" long-name="MTP Controller" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpcontroller/group" mrp="mw/remoteconn/mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
-</component>
-</collection>
-<collection name="mtpfws" long-name="MTP Frameworks" level="framework">
-<component name="mtpfw" long-name="MTP Framework" introduced="^2" purpose="optional">
-<unit bldFile="mw/remoteconn/mtpfws/mtpfw/group" mrp="mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/>
-</component>
-</collection>
-<collection name="mtpdataproviders" long-name="MTP Data Providers" level="generic">
-<component name="mtpfileandfolderdp" long-name="MTP File and Folder Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group" mrp="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
-</component>
-<component name="mtpimagedp" long-name="MTP Image Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpimagedp/group" mrp="mw/remoteconn/mtpdataproviders/mtpimagedp/group/mtp_imagedp.mrp"/>
-</component>
-<component name="mtppictbridgedp" long-name="MTP PictBridge Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group" mrp="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group/mtp_pictbridgedp.mrp"/>
-</component>
-</collection>
-<collection name="backupandrestore" long-name="Backup and Restore" level="specific">
-<component name="backupengine" long-name="Backup Engine" introduced="9.0" purpose="optional">
-<unit bldFile="mw/remoteconn/backupandrestore/backupengine/group" mrp="mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
-</component>
-<component name="backuptest" long-name="Backup Test" introduced="^2" purpose="development">
-<unit bldFile="mw/remoteconn/backupandrestore/backuptest/group" mrp="mw/remoteconn/backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
-</component>
-</collection>
-<collection name="obex" long-name="OBEX" level="generic">
-<component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexprotocol/group" mrp="mw/remoteconn/obex/obexprotocol/group/obex.mrp"/>
-</component>
-<component name="obexextensionapi" long-name="OBEX Extension API" introduced="9.2" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexextensionapi/group" mrp="mw/remoteconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
-</component>
-</collection>
-</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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<unit mrp="mw/srvdiscovery/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="dlnasrv" level="specific" long-name="DLNA Services" levels="stack server ctrl framework plugin">
-<!-- uncomment all the units when configuration is in place, they're currently #included from other xxx_build components -->
-<collection name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" level="plugin">
-<component name="upnp_media_server_settings_api" long-name="UPnP Media Server Settings API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_settings_api/group"/>
-</component>
-<component name="upnp_av_objects_api" long-name="UPnP A/V Objects API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_av_objects_api/group"/>
-</component>
-<component name="upnp_media_server_api" long-name="UPnP Media Server API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_api/group"/>
-</component>
-<component name="upnp_security_plugin_api" long-name="UPnP Security Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_security_plugin_api/group"/>
-</component>
-<component name="upnp_avcp_api" long-name="UPnP AVCP API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_avcp_api/group"/>
-</component>
-<component name="upnp_media_server_metadata_api" long-name="UPnP Media Server Metadata API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_metadata_api/group"/>
-</component>
-<component name="upnp_command_api" long-name="UPnP Command API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_command_api/group"/>
-</component>
-<component name="upnp_plugin_api" long-name="UPnP Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_plugin_api/group"/>
-</component>
-</collection>
-<collection name="upnpavcontrolpoint" long-name="UPnP A/V Control Point" level="plugin">
-<component name="avcontrolframework" filter="s60" long-name="A/V Control Famework" introduced="9.1" deprecated="^3">
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
-</component>
-<component name="upnpavcontrolpoint_build" filter="s60" long-name="UPnP A/V Control Point Build" introduced="9.1" deprecated="^3">
-<!-- put exports in other component instead -->
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/group"/>
-</component>
-</collection>
-<collection name="upnpmediaserver" long-name="UPnP Media Server" level="server">
-<component name="avobjects" filter="s60" long-name="A/V Objects">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/avobjects/group"/>
-</component>
-<component name="mediaserverclient" filter="s60" long-name="Media Server Client">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverclient/group"/>
-</component>
-<component name="connectionmanagerservice" filter="s60" long-name="Connection Manager Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/connectionmanagerservice/group"/>
-</component>
-<component name="contentdirectoryservice" filter="s60" long-name="Content Directory Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/contentdirectoryservice/group"/>
-</component>
-<component name="mediaserverengine" filter="s60" long-name="Media Server Engine">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverengine/group"/>
-</component>
-<component name="upnpmediaserver_build" filter="s60" long-name="UPnP Media Server Build">
-<!-- move exports into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpmediaserver/group"/>
-</component>
-</collection>
-<collection name="upnpavcontroller" long-name="UPnP A/V Controller" level="ctrl">
-<component name="upnpxmlparser" filter="s60" long-name="UPnP XML Parser" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpxmlparser/group"/>
-</component>
-<component name="upnpavcontrollerserver" filter="s60" long-name="UPnP A/V Controller Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerserver/group"/>
-</component>
-<component name="upnpavcontrollerclient" filter="s60" long-name="UPnP A/V Ccontroller Client" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerclient/group"/>
-</component>
-<component name="upnpavcontrollerhelper" filter="s60" long-name="UPnP A/V Controller Helper" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerhelper/group"/>
-</component>
-<component name="upnpavcontroller_build" filter="s60" long-name="UPnP A/V Controller Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpavcontroller/group"/>
-</component>
-</collection>
-<collection name="upnpframework" long-name="UPnP Framework" level="framework">
-<component name="upnputilities" filter="s60" long-name="UPnP Utilities" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnputilities/group"/>
-</component>
-<component name="upnpextensionpluginif" filter="s60" long-name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpextensionpluginif/group"/> -->
-</component>
-<component name="upnpfiletransferengine" filter="s60" long-name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>-->
-</component>
-<component name="upnpcommonui" filter="s60" long-name="UPnP Common UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpcommonui/group"/>-->
-</component>
-<component name="upnpaiwengine" filter="s60" long-name="UPnP AIW Engine" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpaiwengine/group"/> -->
-</component>
-<component name="upnpaiwprovider" filter="s60" long-name="UPnP AIW Provider" introduced="^2" deprecated="^3" plugin="Y">
-<!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
-</component>
-<component name="upnpmusicadapter" filter="s60" long-name="UPnP Music Adapter" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
-</component>
-<component name="upnpcommand" filter="s60" long-name="UPnP Command" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpcommand/group"/>
-</component>
-<component name="upnpframework_build" filter="s60" long-name="UPnP Framework Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpframework/group"/>
-</component>
-</collection>
-<collection name="upnpsettings" long-name="UPnP Settings" level="framework">
-<component name="upnpsettingsengine" filter="s60" long-name="UPnP Settings Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
-</component>
-<component name="multiselectionui" filter="s60" long-name="Multi-Selection UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/multiselectionui/group"/>-->
-</component>
-<component name="appwizard" filter="s60" long-name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/appwizard/group"/>-->
-</component>
-<component name="upnpsharingui" filter="s60" long-name="UPnP Sharing UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
-</component>
-<component name="upnpgsplugin" filter="s60" long-name="UPnP GS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
-</component>
-<component name="upnpsettings_build" filter="s60" long-name="UPnP Settings Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsettings/group"/>
-</component>
-</collection>
-<collection name="upnpsharing" long-name="UPnP Sharing" level="server">
-<component name="upnpdlnaprofiler" filter="s60" long-name="UPnP DLNA Profiler" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpdlnaprofiler/group"/>
-</component>
-<component name="upnpsecurity" filter="s60" long-name="UPnP Security" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpsecurity/group"/>
-</component>
-<component name="upnpcontentserver" filter="s60" long-name="UPnP Content Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpcontentserver/group"/>
-</component>
-<component name="applicationengine" filter="s60" long-name="UPnP Application Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/applicationengine/group"/>
-</component>
-<component name="upnpsharing_build" filter="s60" long-name="UPnP Sharing Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsharing/group"/>
-</component>
-</collection>
-<collection name="upnpmpxplugins" long-name="UPnP MPX Plugins" level="plugin">
-<component name="upnpplaybackplugins" filter="s60" long-name="UPnP Playback Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/upnpplaybackplugins/group"/>
-</component>
-<component name="upnpmpxplugins_build" filter="s60" long-name="UPnP MPX Plugins Build" introduced="^2">
-<!-- move exports content into other component? -->
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/group"/>
-</component>
-</collection>
-<collection name="upnpharvester" long-name="UPnP Harvester" level="ctrl">
-<component name="upnpharvester_common" filter="s60" long-name="UPnP Harvester Common" introduced="^2" deprecated="^3" class="placeholder">
-<!-- need to merge or #include these to a single bld.inf -->
-<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
- <unit bldFile="upnpharvester/common/cmsettings/group"/>
- <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
- <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
-</component>
-<component name="cdssync" filter="s60" long-name="CDS Sync" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
-</component>
-<component name="mdhserver" filter="s60" long-name="Metadata Harvester Server" introduced="^2" deprecated="^3" class="placeholder">
-<!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
-</component>
-<component name="upnpharvester_build" filter="s60" long-name="UPnP Harvester Build" introduced="^2" deprecated="^3" class="placeholder">
-<!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
-<!--<unit bldFile="upnpharvester/group"/>-->
-</component>
-</collection>
-<collection name="homesync" long-name="Home Sync" level="plugin">
-<component name="contentmanager" filter="s60" long-name="Content Manager" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homesync/group"/>-->
-<!-- move bld.inf into contentmanager dir -->
-</component>
-</collection>
-<collection name="homemedia" long-name="Home Media" level="framework">
-<!-- collection is really just a component. Move down a directory -->
-<component name="homemedia_build" filter="s60" long-name="Home Media" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homemedia/group"/> -->
-</component>
-</collection>
-<collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin">
-<component name="dlnasrv_build" filter="s60" long-name="DLNA Services Build">
-<!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed -->
-<unit bldFile="mw/dlnasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="btservices" level="generic" long-name="Bluetooth Services" levels="framework server generic specific plugin">
-<collection name="btservices_pub" long-name="BT Services Public Interfaces" level="plugin">
-<component name="bluetooth_power_state_api" long-name="Bluetooth Power State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_power_state_api/group"/>
-</component>
-<component name="bluetooth_notifier_api" long-name="Bluetooth Notifier API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_notifier_api/group"/>
-</component>
-</collection>
-<collection name="btservices_plat" long-name="BT Services Platform Interfaces" level="plugin">
-<component name="bluetooth_dosserver_audio_api" long-name="Bluetooth DOS Server Audio API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dosserver_audio_api/group"/>
-</component>
-<component name="bluetooth_dut_mode_api" long-name="Bluetooth DUT Mode API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dut_mode_api/group"/>
-</component>
-<component name="bluetooth_engine_api" long-name="Bluetooth Engine API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-<component name="bluetooth_local_variation_api" long-name="Bluetooth Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_local_variation_api/group"/>
-</component>
-<component name="bluetooth_notifier_internal_api" long-name="Bluetooth Notifier internal API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_notifier_internal_api/group"/>
-</component>
-<component name="bluetooth_sap_connection_state_api" long-name="Bluetooth SAP Connection State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_sap_connection_state_api/group"/>
-</component>
-<component name="bluetooth_secondary_display_notification_api" long-name="Bluetooth Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_secondary_display_notification_api/group"/>
-</component>
-</collection>
-<collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
-<component name="bteng" filter="s60" long-name="Bluetooth Engine">
-<unit bldFile="mw/btservices/bluetoothengine/bteng/group"/>
-</component>
-<component name="btnotif" filter="s60" long-name="Bluetooth Notifier">
-<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"/>
-</component>
-<component name="btmac" filter="s60" long-name="Bluetooth Mono Audio Controller" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btmac/group"/>
-</component>
-<component name="btsac" filter="s60" long-name="Bluetooth Stereo Audio Controller" plugin="Y">
-<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"/>
-</component>
-<component name="btsap" filter="s60" long-name="Bluetooth SIM Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btsap/group"/>
-</component>
-<component name="btui" filter="s60" long-name="Bluetooth UI">
-<unit bldFile="mw/btservices/bluetoothengine/btui/group"/>
-</component>
-<component name="btpbap" filter="s60" long-name="Bluetooth Phonebook Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btpbap/group"/>
-</component>
-<component name="bthid" filter="s60" long-name="Bluetooth HID">
-<unit bldFile="mw/btservices/bluetoothengine/bthid/group"/>
-</component>
-<component name="btctrldcmoadapter" filter="s60" long-name="Bluetooth Control DCMO Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btctrldcmoadapter/group"/>
-</component>
-</collection>
-<collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
-<component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
-<unit bldFile="mw/btservices/bluetoothappprofiles/avrcp" mrp="mw/btservices/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
-</component>
-</collection>
-<collection name="atcommands" long-name="AT Commands" level="generic">
-<component name="modematplugin" long-name="Modem AT Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/modematplugin/group"/>
-</component>
-<component name="lccustomplugin" long-name="LC Custom Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/lccustomplugin/group"/>
-</component>
-</collection>
-<collection name="btservices_info" long-name="BT Services Info" level="plugin">
-<component name="btservices_metadata" long-name="BT Services Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usbservices" level="generic" long-name="USB Services" levels="framework server generic specific plugin">
-<collection name="usbservices_plat" long-name="USB Services Platform Interfaces" level="plugin">
-<component name="pictbridge_api" long-name="PictBridge API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/pictbridge_api/group"/>
-</component>
-<component name="ptp_responder_api" long-name="PTP Responder API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_responder_api/group"/>
-</component>
-<component name="ptp_transport_api" long-name="PTP Transport API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_transport_api/group"/>
-</component>
-<component name="usb_device_control_plugin_api" long-name="USB Device Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_device_control_plugin_api/group"/>
-</component>
-<component name="usb_notifier_api" long-name="USB Notifier API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_notifier_api/group"/>
-</component>
-<component name="usb_personality_api_header" long-name="USB Personality API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_api_header/group"/>
-</component>
-<component name="usb_personality_plugin_api" long-name="USB Personality Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_plugin_api/group"/>
-</component>
-<component name="usb_secondary_display_api" long-name="USB Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_secondary_display_api/group"/>
-</component>
-<component name="usb_watcher_api" long-name="USB Watcher API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_api/group"/>
-</component>
-<component name="usb_watcher_info_api_header" long-name="USB Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_info_api_header/group"/>
-</component>
-</collection>
-<collection name="usbservices_info" long-name="USB Services Info" level="plugin"/>
-<collection name="usbengines" long-name="USB Engines" level="generic">
-<component name="usbotgwatcher" filter="s60" long-name="USB OTG Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbotgwatcher/group"/>
-</component>
-<component name="usbwatcher" filter="s60" long-name="USB Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbwatcher/group"/>
-</component>
-<component name="usblocodplugin" filter="s60" long-name="USB Local Connectivity Domain Plugin" plugin="Y">
-<unit bldFile="mw/usbservices/usbengines/usblocodplugin/group"/>
-</component>
-<component name="usbdevcon" filter="s60" long-name="USB Device Control">
-<unit bldFile="mw/usbservices/usbengines/usbdevcon/group"/>
-</component>
-<component name="usbremotepersonality" filter="s60" long-name="USB Remote Personality">
-<unit bldFile="mw/usbservices/usbengines/usbremotepersonality/group"/>
-</component>
-</collection>
-<collection name="usbclasses" long-name="USB Classes" level="framework">
-<component name="usbobexclasscontroller" filter="s60" long-name="USB OBEX Class Controller" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbobexclasscontroller/group"/>
-</component>
-<component name="usbbasicpersonality" filter="s60" long-name="USB Basic Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbbasicpersonality/group"/>
-</component>
-<component name="usbmscpersonality" filter="s60" long-name="USB MSC Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbmscpersonality/group"/>
-</component>
-<!-- commented out in bld.inf. Should this be deleted?
- <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
- <unit bldFile="usbclasses/ptpstack/group"/>
- </component>
- <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
- <unit bldFile="usbclasses/sicdusbplugin/group"/>
- </component>
- <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
- <unit bldFile="usbclasses/ptpserver/group"/>
- </component>-->
-<component name="pictbridgeengine" filter="s60" long-name="PictBridge Engine">
-<unit bldFile="mw/usbservices/usbclasses/pictbridgeengine/group"/>
-</component>
-<component name="usbphoneasmodem" filter="s60" long-name="USB Phone as Modem" introduced="^3">
-<unit bldFile="mw/usbservices/usbclasses/usbphoneasmodem/group"/>
-</component>
-</collection>
-<collection name="usbuis" long-name="USB UIs" level="specific">
-<component name="usbui" filter="s60" long-name="USB UI">
-<unit bldFile="mw/usbservices/usbuis/usbui/group"/>
-</component>
-<component name="usbuinotif" filter="s60" long-name="USB UI Notifiers">
-<unit bldFile="mw/usbservices/usbuis/usbuinotif/group"/>
-</component>
-<component name="imageprintuiprovider" filter="s60" long-name="ImagePrint UI Provider" plugin="Y">
-<unit bldFile="mw/usbservices/usbuis/imageprintuiprovider/group"/>
-</component>
-<component name="usbimageprintui" filter="s60" long-name="ImagePrint UI">
-<unit bldFile="mw/usbservices/usbuis/imageprintui/group"/>
-</component>
-</collection>
-</block>
-<block name="shortlinkconn" level="generic" long-name="Shortlink Connectivity" levels="framework server generic specific plugin">
-<!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
-<collection name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" level="plugin">
-<component name="obex_service_utils_api" long-name="OBEX Service Utils API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_utils_api/group"/>
-</component>
-<component name="obex_service_plugin_api" long-name="OBEX Service Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_plugin_api/group"/>
-</component>
-<component name="dialup_connection_status_api" long-name="Dial-up Connection Status API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dialup_connection_status_api/group"/>
-</component>
-<component name="dun_secondary_display_notification_api" long-name="DUN Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
-</component>
-<component name="obex_secondary_display_notification_api" long-name="OBEX Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
-</component>
-<component name="generic_hid_api" long-name="Generic HID API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/generic_hid_api/group"/>
-</component>
-<component name="locod_bearer_plugin_api" long-name="Locod Bearer Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/locod_bearer_plugin_api/group"/>
-</component>
-<component name="usb_obexservicemanager_client_api" long-name="USB OBEX Service Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_obexservicemanager_client_api/group"/>
-</component>
-</collection>
-<collection name="localconnectivityservice" long-name="Local Connectivity Service" level="server">
-<component name="locod" long-name="Local Connectivity Daemon">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/locod/group"/>
-</component>
-<component name="obexserviceman" long-name="OBEX Service Managar">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
-</component>
-<component name="obexsendservices" long-name="OBEX Send Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
-</component>
-<component name="obexreceiveservices" long-name="OBEX Receive Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
-</component>
-<component name="dun" long-name="Dial Up Networking">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/dun/group"/>
-</component>
-<component name="lcstylustap" long-name="LC Stylus Tap Plugins" plugin="Y">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/lcstylustap/group"/>
-</component>
-<component name="generichid" long-name="Generic HID">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/generichid/group"/>
-</component>
-<component name="headset" long-name="Headset">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/headset/group"/>
-</component>
-</collection>
-</block>
-<block name="imghandling" level="specific" long-name="Image Handling" levels="lib util if">
-<collection name="imagehandling_plat" long-name="Image Handling Platform Interfaces" level="if">
-<component name="image_handling_library_api" long-name="Image Handling Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
-</component>
-<component name="3gp_library_api" long-name="3GP Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
-</component>
-<component name="thumbnailmanager_api" long-name="Thumbnail Manager API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagehandlinglib" long-name="Image Handling Library" level="lib">
-<!-- collection is really a component, need to move down a directory -->
-<component name="ihl" filter="s60" long-name="IHL">
-<unit bldFile="mw/imghandling/imagehandlinglib/group"/>
-</component>
-</collection>
-<collection name="imagehandlingutilities" long-name="Image Handling Utilities" level="util">
-<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager">
-<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
-</component>
-</collection>
-</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">
-<unit bldFile="mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
-</component>
-</collection>
-</block>
-<block name="mds" level="specific" long-name="Metadata Services" levels="mgr eng server int">
-<collection name="mds_plat" long-name="Metadata Services Platform Interfaces" level="int">
-<component name="context_engine_plugin_api" long-name="Context Engine Plugin API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/group" filter="!test"/>
-</component>
-<component name="harvester_framework_api" long-name="Harvester Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/harvester_framework_api/group" filter="!test"/>
-<!-- can only have one unit with the same filter, #include the following from the previous unit -->
-</component>
-<component name="location_manager_api" long-name="Location Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/location_manager_api/group" filter="!test"/>
-</component>
-<component name="metadata_engine_api" long-name="Metadata Engine API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/metadata_engine_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_collection_manager_api" long-name="Content Listing Framework Collection Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_extended_api" long-name="Content Listing Framework Extended API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_extended_api/group"/>
-</component>
-</collection>
-<collection name="mds_pub" long-name="Metadata Services Public Interfaces" level="int">
-<component name="content_listing_framework_api" long-name="Content Listing Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_pub/content_listing_framework_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="metadataengine" long-name="Metadata Engine" level="eng">
-<component name="metadataengine_common" filter="s60" long-name="Metadata Engine Common" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/common/group"/>
-</component>
-<component name="metadataengine_server" filter="s60" long-name="Metadata Engine Server" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/server/group"/>
-</component>
-<component name="metadataengine_client" filter="s60" long-name="Metadata Engine Client" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/client/group"/>
-</component>
-<component name="metadataengine_build" filter="s60" long-name="Metadata Engine Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/metadataengine/group"/>
-</component>
-</collection>
-<collection name="locationmanager" long-name="Location Manager" level="mgr">
-<component name="locationtrail" filter="s60" long-name="Location Trail" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/locationtrail/group"/>
-</component>
-<component name="locationmanager_server" filter="s60" long-name="Location Manager Server" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/server/group"/>
-</component>
-<component name="locationmanager_client" filter="s60" long-name="Location Manager Client" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/client/group"/>
-</component>
-<component name="locationmanager_build" filter="s60" long-name="Location Manager Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/locationmanager/group"/>
-</component>
-</collection>
-<collection name="contextengine" long-name="Context Engine" level="eng">
-<component name="contextengine_plugins" filter="s60" long-name="Context Engine Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/contextengine/plugins/group"/>
-</component>
-<component name="contextengine_build" filter="s60" long-name="Context Engine Build" introduced="^2">
-<!--make this collection a single component, or make this unit self-contained -->
-<unit bldFile="mw/mds/contextengine/group"/>
-</component>
-</collection>
-<collection name="harvester" long-name="Harvester" level="eng">
-<component name="blacklistclient" filter="s60" long-name="Blacklist Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistclient/group"/>
-</component>
-<component name="blacklistserver" filter="s60" long-name="Blacklist Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistserver/group"/>
-</component>
-<component name="harvester_common" filter="s60" long-name="Harvester Common" introduced="^2">
-<unit bldFile="mw/mds/harvester/common/group"/>
-</component>
-<component name="composerplugins" filter="s60" long-name="Composer Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/composerplugins/group"/>
-</component>
-<component name="harvesterplugins" filter="s60" long-name="Harvester Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/harvesterplugins/group"/>
-</component>
-<component name="monitorplugins" filter="s60" long-name="Monitor Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/monitorplugins/group"/>
-</component>
-<component name="harvester_server" filter="s60" long-name="Harvester Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/server/group"/>
-</component>
-<component name="harvester_client" filter="s60" long-name="Harvester Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/client/group"/>
-</component>
-<component name="harvester_build" filter="s60" long-name="Harvester Build" introduced="^2">
-<!-- split these exports into the other components -->
-<unit bldFile="mw/mds/harvester/group"/>
-</component>
-</collection>
-<collection name="watchdog" long-name="Watchdog" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="mdswatchdog" filter="s60" long-name="Metadata Watchdog" introduced="^2">
-<unit bldFile="mw/mds/watchdog/group"/>
-</component>
-</collection>
-<collection name="clfwrapper" long-name="Content Listing Framework Wrapper" level="int">
-<!-- collection is really a component. Move down a directory -->
-<component name="clfwrapper_build" filter="s60" long-name="CLF Wrapper Build" introduced="^2" class="placeholder">
-<!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
-<!--<unit bldFile="clfwrapper/group"/>-->
-</component>
-</collection>
-<collection name="mds_info" long-name="Metadata Services Info" level="int">
-<component name="mds_build" filter="s60" long-name="Metadata Services Build" introduced="^2">
-<!-- consider distributiing this into the rest of the components in the package -->
-<unit bldFile="mw/mds/group"/>
-</component>
-</collection>
-</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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<unit bldFile="mw/mmuifw/mmuifw_plat/alf_customlayoutmanagers_api/group"/>
-</component>
-<component name="gesturehelper_api" long-name="Gesture Helper API" filter="s60" 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">
-<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">
-<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">
-<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">
-<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">
-<!-- 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">
-<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">
-<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">
-<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">
-<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">
-<unit bldFile="mw/mmuifw/mulwidgets/mullogging/group"/>
-</component>
-<component name="muldatamodel" filter="s60" long-name="MUL Data Model">
-<unit bldFile="mw/mmuifw/mulwidgets/muldatamodel/group"/>
-</component>
-<component name="mulwidgets_common" filter="s60" long-name="MUL Common Utils">
-<unit bldFile="mw/mmuifw/mulwidgets/common/group"/>
-</component>
-<component name="gesturehelper" filter="s60" long-name="Gesture Helper">
-<unit bldFile="mw/mmuifw/mulwidgets/gesturehelper/group"/>
-</component>
-<component name="mulcoverflowwidget" filter="s60" long-name="MUL CoverFlow Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/mulcoverflowwidget/group"/>
-</component>
-<component name="mulsliderwidget" filter="s60" long-name="MUL Slider Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/mulsliderwidget/group"/>
-</component>
-<component name="alfviewwidget" filter="s60" long-name="ALF View Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/alfviewwidget/group"/>
-</component>
-<component name="alfcontainerwidget" filter="s60" long-name="ALF Container Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/alfcontainerwidget/group"/>
-</component>
-<component name="alfscrollbarwidget" filter="s60" long-name="ALF Scrollbar Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/alfscrollbarwidget/group"/>
-</component>
-</collection>
-</block>
-<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"/>
-</component>
-<component name="videoconnutility_api" long-name="Video Connection Utility API" filter="s60" class="api">
-<unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/group"/>
-</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"/>
-</component>
-</collection>
-<collection name="videoscheduler" long-name="Video Scheduler" level="util">
-<component name="schedulerclient" filter="s60" long-name="Video Scheduler Client">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerclient/group"/>
-</component>
-<component name="schedulerserver" filter="s60" long-name="Video Scheduler Server">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerserver/group"/>
-</component>
-</collection>
-<collection name="videoconnutility" long-name="Video Connection Utility" level="util">
-<component name="connutilpsworker" filter="s60" long-name="Connection Utility Publish and Subscribe Worker">
-<unit bldFile="mw/videoutils/videoconnutility/connutilpsworker/group"/>
-</component>
-<component name="video_connutility" filter="s60" long-name="Video Connection Utility">
-<unit bldFile="mw/videoutils/videoconnutility/connutility/group"/>
-</component>
-</collection>
-<collection name="videoutils_info" long-name="Video Utils Info" level="if"/>
-</block>
-<block name="mmmw" level="generic" long-name="Multimedia Middleware" levels="plugin framework server generic specific">
-<collection name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" level="specific">
-<component name="multimedia_data_source_api" long-name="Multimedia Data Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
-</component>
-<component name="progressive_download_api" long-name="Progressive Download API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/progressive_download_api/group"/>
-</component>
-<component name="equalizer_ui_api" long-name="Equalizer UI API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
-</component>
-<component name="enhanced_media_client_api" long-name="Enhanced Media Client API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
-</component>
-<component name="stream_control_custom_command_api" long-name="Stream Control Custom Command API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
-</component>
-<component name="emc_buffer_source_api" long-name="EMC Buffer Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_buffer_source_api/group"/>
-</component>
-<component name="emc_file_source_api" long-name="EMC File Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
-</component>
-<component name="audio_metadata_reader_api" long-name="Audio MetaData Reader API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
-</component>
-<component name="emc_progressive_download_source_api" long-name="EMC Progressive Download Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
-</component>
-<component name="emc_volume_effect_api" long-name="EMC Volume Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
-</component>
-<component name="emc_balance_effect_api" long-name="EMC Balance Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_balance_effect_api/group"/>
-</component>
-<component name="emc_descriptor_source_api" long-name="EMC Descriptor Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_descriptor_source_api/group"/>
-</component>
-<component name="emc_drm_config_intfc_api" long-name="EMC DRM Config Intfc API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
-</component>
-<component name="voip_audio_services_api" long-name="VoIP Audio Services" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/group"/>
-</component>
-<component name="configuration_components_factory_api" long-name="Configuration Components Factory API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
-</component>
-<component name="audio_output_control_utility_api" long-name="Audio Output Control Utility API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/group"/>
-</component>
-<component name="audio_output_control_utility_proxy_api" long-name="Audio Output Control Utility Proxy API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
-</component>
-<component name="emc_audio_effects_api" long-name="EMC Audio Effects API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
-</component>
-<component name="call_audio_control_api" long-name="Call AudioControl API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/group"/>
-</component>
-<component name="radio_utilities_api" long-name="Radio Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/group"/>
-</component>
-<component name="radio_preset_utilities_api" long-name="Radio Preset Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
-</component>
-<component name="radio_monitor_api" long-name="Radio Monitor API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
-</component>
-<component name="thumbnail_engine_api" long-name="Thumbnail Engine API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/thumbnail_engine_api/group"/>
-</component>
-<component name="telephony_multimedia_service_api" long-name="Telephony Multimedia Service API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="mmfenh" long-name="MMF Enhancements" level="generic">
-<component name="advancedaudiocontroller" filter="s60" long-name="Advanced Audio Controllers" plugin="Y">
-<unit bldFile="mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
-</component>
-<component name="audiooutputcontrolutility" filter="s60" long-name="Audio Output Control Utility">
-<unit bldFile="mw/mmmw/mmfenh/audiooutputcontrolutility/group"/>
-</component>
-<component name="configurationcomponentsfactory" filter="s60" long-name="Configuration Components Factory">
-<unit bldFile="mw/mmmw/mmfenh/configurationcomponentsfactory/group"/>
-</component>
-<component name="enhancedaudioplayerutility" filter="s60" long-name="Enhanced Audio Player Utility">
-<unit bldFile="mw/mmmw/mmfenh/enhancedaudioplayerutility/group"/>
-</component>
-<component name="enhancedmediaclient" filter="s60" long-name="Enhanced Media Client">
-<unit bldFile="mw/mmmw/mmfenh/enhancedmediaclient/group"/>
-</component>
-<component name="profilesettingsmonitor" filter="s60" long-name="Profile Settings Monitor">
-<unit bldFile="mw/mmmw/mmfenh/profilesettingsmonitor/group"/>
-</component>
-<component name="progressivedownload" filter="s60" long-name="Progressive Download">
-<unit bldFile="mw/mmmw/mmfenh/progressivedownload/group"/>
-</component>
-</collection>
-<collection name="mm_fw" long-name="Multimedia Frameworks" level="framework">
-<!-- Id needs to be unique, mmfw already in use -->
-<!-- Placeholder for OpenAX AL and other stuff -->
-</collection>
-<collection name="mmserv" long-name="Multimedia Services" level="specific">
-<component name="audioeffectsui" filter="s60" long-name="Audio Effects UI">
-<unit bldFile="mw/mmmw/mmserv/audioeffectsui/group"/>
-</component>
-<component name="callaudiocontrol" filter="s60" long-name="Call Audio Control">
-<unit bldFile="mw/mmmw/mmserv/callaudiocontrol/group"/>
-</component>
-<component name="metadatautility" filter="s60" long-name="Metadata Utility">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/group"/>
-</component>
-<component name="radioutility" filter="s60" long-name="Radio Utility">
-<unit bldFile="mw/mmmw/mmserv/radioutility/group"/>
-</component>
-<component name="thumbnailengine" filter="s60" long-name="Thumbnail Engine" introduced="^2">
-<unit bldFile="mw/mmmw/mmserv/thumbnailengine/group"/>
-</component>
-<component name="tms" filter="s60" long-name="Telephony Multimedia Service" introduced="^3">
-<unit bldFile="mw/mmmw/mmserv/tms/group"/>
-</component>
-<component name="voipaudioservices" filter="s60" long-name="VoIP Audio Services">
-<unit bldFile="mw/mmmw/mmserv/voipaudioservices/group"/>
-</component>
-<component name="lib3gpextparser" filter="s60" long-name="3GP Extension Metadata Parser Library">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group" filter="sf_build"/>
-</component>
-</collection>
-<collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
-<component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="helix" level="generic" long-name="Helix" levels="plugin framework server generic specific">
-<collection name="helix_ren" long-name="Helix Engine" level="framework">
-<!-- what does "ren" stand for? -->
-<component name="helix_stub" filter="s60" long-name="Helix Stub" introduced="^2" class="api">
-<unit bldFile="mw/helix/helix_ren/helix_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="camerasrv" level="specific" long-name="Camera Services" levels="plugin fw api">
-<collection name="camerasrv_plat" long-name="Camera Services Platform Interfaces" level="api">
-<component name="media_recorder_sink_api" long-name="Media Recorder Sink API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
-</component>
-<component name="cae_extentension_api" long-name="CAE Extension API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/cae_extentension_api/group"/>
-</component>
-<component name="camera_application_engine_api" long-name="Camera Application Engine API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/camera_application_engine_api/group" filter="!test"/>
-</component>
-<component name="custom_onboard_camera_api" long-name="Custom Onboard Camera API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
-</component>
-<component name="imaging_configuration_manager_api" long-name="Imaging Configuration Manager API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
-</component>
-<component name="media_recorder_api" long-name="Media Recorder API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_api/group" filter="!test"/>
-</component>
-<component name="3gp_file_composer_api" long-name="3GP File Composer API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
-</component>
-<component name="asynchronous_file_saving_queue_api" long-name="Asynchronous File Saving Queue API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="camappengine" long-name="Camera App Engine" level="fw">
-<!-- is this collection really a component? If so, move down a directory -->
-<component name="stillconverter" filter="s60" long-name="Still Image Converter" class="placeholder">
-<!-- should separate this from parent engine's bld.inf -->
-<!-- <unit bldFile="camappengine/stillconverter/group"/> -->
-</component>
-<component name="camappengine_engine" filter="s60" long-name="Camera App Engine" class="placeholder">
-<!-- should separate this from parent engine's bld.inf -->
-<!-- <unit bldFile="camappengine/engine/group"/> -->
-</component>
-<component name="asynchfilesavequeue" filter="s60" long-name="Asynch File Save Queue">
-<unit bldFile="mw/camerasrv/camappengine/asynchfilesavequeue/group"/>
-</component>
-<component name="camappengine_build" filter="s60" long-name="Camera App Engine Build">
-<unit bldFile="mw/camerasrv/camappengine/build"/>
-</component>
-</collection>
-<collection name="camcordermmfplugin" long-name="Camcorder MMF Plugin" level="plugin">
-<!-- collection is really a component. Should move down a directory -->
-<component name="camcordermmfplugin_build" filter="s60" long-name="Camcorder MMF Plugin Build" plugin="Y">
-<unit bldFile="mw/camerasrv/camcordermmfplugin/build"/>
-</component>
-</collection>
-<collection name="configmanagers" long-name="Config Managers" level="api">
-<component name="imagingconfigmanager" filter="s60" long-name="Imaging Config Manager">
-<unit bldFile="mw/camerasrv/configmanagers/imagingconfigmanager/group"/>
-</component>
-</collection>
-<collection name="camerasrv_info" long-name="Camera Services Info" level="api">
-<component name="camerasrv_build" filter="s60" long-name="Camera Services Build">
-<!-- should split into individual bld.infs -->
-<unit bldFile="mw/camerasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="mmappfw" level="specific" long-name="Multimedia App Framework" levels="fw utils if">
-<collection name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" level="if">
-<component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interfaces Build" introduced="^1" filter="s60">
-<!-- this is no longer necessary when confguration is put in place -->
-<unit bldFile="mw/mmappfw/mmappfw_plat"/>
-</component>
-<component name="collection_helper_api" long-name="Collection Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
-</component>
-<component name="harvester_collection_mediator_api" long-name="Harvester Collection Mediator API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/group"/>
-</component>
-<component name="harvester_metadata_extractor_api" long-name="Harvester Metadata Extractor API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/group"/>
-</component>
-<component name="harvester_server_api" long-name="Harvester Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_server_api/group"/>
-</component>
-<component name="harvester_utility_api" long-name="Harvester Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_utility_api/group"/>
-</component>
-<component name="playlist_engine_api" long-name="Playlist Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playlist_engine_api/group"/>
-</component>
-<component name="mtp_keys_api" long-name="MTP Keys API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mtp_keys_api/group"/>
-</component>
-<component name="mpx_collection_common_definition_api" long-name="MPX Collection Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_common_definition_api/group"/>
-</component>
-<component name="mpx_collection_utility_api" long-name="MPX Collection Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/group"/>
-</component>
-<component name="mpx_common_api" long-name="MPX Common API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_api/group"/>
-</component>
-<component name="mpx_common_definition_api" long-name="MPX Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_common_definition_api" long-name="MPX Playback Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_utility_api" long-name="MPX Playback Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/group"/>
-</component>
-<component name="mpx_base_view_plugins_api" long-name="MPX Base View Plugins API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/group"/>
-</component>
-<component name="mpx_view_utility_api" long-name="MPX View Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_view_utility_api/group"/>
-</component>
-<component name="mpx_albumart_utility_api" long-name="MPX Album Art Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/group"/>
-</component>
-<component name="media_player_settings_engine_api" long-name="Media Player Settings Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
-</component>
-<component name="mpx_backstepping_utility_api" long-name="MPX Backstepping Utility API" introduced="^1" filter="s60" class="api">
-<!-- uncomment when configuration is put in place
- <unit bldFile="mmappfw_plat/mpx_backstepping_utility_api/group"/> -->
-</component>
-<component name="asx_parser_api" long-name="ASX Parser API" introduced="^1" filter="s60" class="api">
-<!-- uncomment when configuration is put in place
- <unit bldFile="mmappfw_plat/asx_parser_api/group"/> -->
-</component>
-<component name="playback_helper_api" long-name="Playback Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playback_helper_api/group"/>
-</component>
-<component name="videoplaylist_utility_api" long-name="Video Playlist Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/videoplaylist_utility_api/group"/>
-</component>
-<component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interface Build" introduced="^1" filter="s60" class="api">
-<!-- needed only for #ifdefs. Remove anmd uncomment above units when configuration is in place -->
-<unit bldFile="mw/mmappfw/mmappfw_plat/group"/>
-</component>
-</collection>
-<collection name="mpx" long-name="Multimedia Player" level="fw">
-<component name="commonframework" filter="s60" long-name="MPX Common Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/commonframework/group"/>
-</component>
-<component name="playbackframework" filter="s60" long-name="MPX Playback Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/playbackframework/group"/>
-</component>
-<component name="mpxcollectionfw" filter="s60" long-name="MPX Collection Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/collectionframework/group"/>
-</component>
-<component name="mpxviewfw" filter="s60" long-name="MPX View Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/viewframework/group"/>
-</component>
-<component name="mpx_build" filter="s60" long-name="MPX Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/mpx/group"/>
-</component>
-</collection>
-<collection name="mmappcomponents" long-name="Multimedia App Components" level="utils">
-<component name="mmappcomponents_build" filter="s60" long-name="Multimedia App Components Build" introduced="^1">
-<!-- needed for #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
- Can remove this once configuration is in place-->
-<unit bldFile="mw/mmappfw/mmappcomponents/group"/>
-</component>
-<component name="collectionhelper" filter="s60" long-name="Media Player Collection Helper" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/collectionhelper/group"/>
-</component>
-<component name="playlistengine" filter="s60" long-name="Playlist Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/playlistengine/group"/>
-</component>
-<component name="mpxharvester" filter="s60" long-name="Media Player Harvester" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/harvester/group"/>
-</component>
-<component name="mmappcommonui" filter="s60" long-name="Multimedia App Common UI" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmappcommonui/group"/>
-</component>
-<component name="mediaplayersettingsengine" filter="s60" long-name="Media Player Settings Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
-</component>
-<component name="audiofetcher" filter="s60" long-name="Audio Fetcher" introduced="^1" plugin="Y">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
-</component>
-<component name="asxparser" filter="s60" long-name="ASX Parser" introduced="^1">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
-</component>
-<component name="playbackhelper" filter="s60" long-name="Playback Helper" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/playbackhelper/group"/>
-</component>
-<component name="videoplaylistutility" filter="s60" long-name="Video Playlist Utility" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/videoplaylistutility/group"/>
-</component>
-<component name="mmmtpdataprovider" filter="s60" long-name="Multimedia MTP Data Provider" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmmtpdataprovider/group"/>
-</component>
-</collection>
-<collection name="mmappfw_info" long-name="Multimedia App Framework Info" level="if">
-<component name="mmappfw_build" filter="s60" long-name="Multimedia App Framework Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/group"/>
-</component>
-<component name="mmappfw_test" filter="s60,test,api_test,pref_test" long-name="Multimedia App Framework Test" purpose="development" introduced="^1"/>
-</collection>
-</block>
-<block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework api">
-<collection name="inputmethods_pub" long-name="Input Methods Public Interfaces" level="api">
-<component name="ptiengine_iti_api" long-name="PTI Engine API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
-</component>
-<component name="optical_character_recognition_api" long-name="Optical Character Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
-</component>
-<component name="input_language_info_api" long-name="Input Language Info API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
-</component>
-</collection>
-<collection name="inputmethods_plat" long-name="Input Methods Platform Interfaces" level="api">
-<component name="pen_input_server_api" long-name="Pen Input Server API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/group" filter="!test"/>
-</component>
-<component name="ptiengine_hwr_api" long-name="PTI Engine Handwriting Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group" filter="!test"/>
-</component>
-<component name="aknfep_settings_api" long-name="Avkon FEP Settings API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
-</component>
-<component name="aknfep_status_api" long-name="Avkon FEP Status API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
-</component>
-<component name="ptiengine_key_definations_api" long-name="PTI Engine Key Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
-</component>
-<component name="aknfep_definitions_api" long-name="Avkon FEP Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
-</component>
-<component name="aknfep_pen_support_api" long-name="Avkon FEP Pen Support API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
-</component>
-<component name="ptiengine_indic_definitions_api" long-name="PTI Engine Indic Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
-</component>
-<component name="aknfep_uiinterface_api" long-name="Avkon FEP UI Interface API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="textinput" long-name="Text Input" level="framework">
-<component name="ptienginev2" filter="s60" long-name="Predictive Text Input Engine">
-<!--uncomment when configuration is turned on and textinput_build is removed-->
-<!-- <unit bldFile="textinput/ptienginev2/group"/>-->
-</component>
-<component name="akninputlanguage" filter="s60" long-name="Avkon Input Language">
-<unit bldFile="mw/inputmethods/textinput/akninputlanguage/group"/>
-</component>
-<component name="peninputarc" filter="s60" long-name="Pen Input Arc">
-<unit bldFile="mw/inputmethods/textinput/peninputarc/group"/>
-</component>
-<component name="peninputcommonctrls" filter="s60" long-name="Pen Input Common Controls">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonctrls/group"/>
-</component>
-<component name="peninputhwrboxcn" filter="s60" long-name="Chinese Handwriting Recognition Box" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrboxcn/group"/>
-</component>
-<component name="peninputvkbcn" filter="s60" long-name="Chinese Virtual Keyboard" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputvkbcn/group"/>
-</component>
-<component name="peninputcommonlayout" filter="s60" long-name="Pen Input Common Layout">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonlayout/group"/>
-</component>
-<component name="peninputgenerichwr" filter="s60" long-name="Pen Input Generic Handwriting Recognition" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputgenerichwr/group"/>
-</component>
-<component name="peninputgenericvkb" filter="s60" long-name="Pen Input Generic Virtual Keyboard" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputgenericvkb/group"/>
-</component>
-<component name="peninputcommonctrlsjp" filter="s60" long-name="Pen Input Common Controls Japanese">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonctrlsjp/group"/>
-</component>
-<component name="peninputhwrboxjp" filter="s60" long-name="Japanese Handwriting Recognition Box" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrboxjp/group"/>
-</component>
-<component name="peninputvkbjp" filter="s60" long-name="Japanese Virtual Keyboard" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputvkbjp/group"/>
-</component>
-<component name="gslangplugin" filter="s60" long-name="GS Language Plugin" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/GSLangPlugin"/>
-</component>
-<component name="peninputgenericitut" filter="s60" long-name="Pen Input Generic ITU-T" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputgenericitut/group"/>
-</component>
-<component name="peninputhwrtrui" filter="s60" long-name="Pen Input Handwriting Recognition Training UI" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrtrui/group"/>
-</component>
-<component name="peninputhwrfscn" filter="s60" long-name="Pen Input Chinese Full Screen Handwriting Recognition" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrfscn/group"/>
-</component>
-<component name="peninputvkbkr" filter="s60" long-name="Pen Input Korean Virtual Keyboard" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputvkbkr/group"/>
-</component>
-<component name="peninputfingerhwr" filter="s60" long-name="Pen Input Finger Handwriting Recognition" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputfingerhwr/group"/>
-</component>
-<component name="peninputsplititut" filter="s60" long-name="Pen Input Split ITU-T" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputsplititut/group"/>
-</component>
-<component name="peninputsplitqwerty" filter="s60" long-name="Pen Input Split QWERTY" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputsplitqwerty/group"/>
-</component>
-<component name="textinput_build" filter="s60" long-name="Text Input Build">
-<!--needed for #ifdef, can be removed when configuration is implemented -->
-<unit bldFile="mw/inputmethods/textinput/group"/>
-</component>
-</collection>
-<collection name="fep" long-name="FEP" level="engine">
-<component name="aknfep" filter="s60" long-name="Avkon FEP" plugin="Y">
-<unit bldFile="mw/inputmethods/fep/aknfep/group"/>
-</component>
-<component name="frontendprocessor" long-name="Front End Processor" purpose="mandatory">
-<unit bldFile="mw/inputmethods/fep/frontendprocessor/group" mrp="mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
-</component>
-</collection>
-<collection name="inputmethods_info" long-name="Input Methods Info" level="api">
-<component name="inputmethods_metadata" long-name="Input Methods Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="qt" level="generic" long-name="Qt" levels="tool mw app">
-<collection name="qtconf" long-name="Qt Config" level="tool">
-<component name="qt_deviceconfiguration" long-name="Qt Device Configuration" introduced="^2" class="config tool">
-<unit bldFile="mw/qt/src/s60installs/deviceconfiguration"/>
-</component>
-</collection>
-<collection name="qt_info" long-name="Qt Info" level="mw">
-<component name="qt_build" long-name="Qt Build" introduced="^2">
-<unit bldFile="mw/qt"/>
-</component>
-</collection>
-<collection name="qtdemos" long-name="Qt Demos" level="app">
-<component name="qtdemos_build" long-name="Qt Demos Build" introduced="^2" filter="qtdemos">
-<unit bldFile="mw/qt/demos"/>
-</component>
-</collection>
-<collection name="qtexamples" long-name="Qt Examples" level="app">
-<component name="qtexamples_build" long-name="Qt Examples Build" introduced="^2" filter="qtexamples">
-<unit bldFile="mw/qt/examples"/>
-</component>
-</collection>
-<collection name="qt_tests" long-name="Qt Tests" level="app">
-<component name="qttestsauto" long-name="Qt Automated Tests" introduced="^2" filter="qttestsauto">
-<unit bldFile="mw/qt/tests/auto"/>
-</component>
-<component name="qttestsbenchmarks" long-name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks">
-<unit bldFile="mw/qt/tests/benchmarks"/>
-</component>
-</collection>
-</block>
-<block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
-<collection name="classicui_plat" long-name="Classic UI Platform Interfaces" level="specific">
-<component name="personalisation_framework_api" long-name="Personalisation Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_framework_api/group" filter="!test"/>
-</component>
-<component name="signal_pane_api" long-name="Signal Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
-</component>
-<component name="japanese_reading_api" long-name="Japanese Reading API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/japanese_reading_api/group" filter="!test"/>
-</component>
-<component name="global_popup_priority_controller_api" long-name="Global Popup Priority Controller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
-</component>
-<component name="item_finder_api" long-name="Item Finder API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/item_finder_api/group" filter="!test"/>
-</component>
-<component name="avkon_fonts_api" long-name="Avkon Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_fonts_api/group" filter="!test"/>
-</component>
-<component name="extended_utilities_api" long-name="Extended Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
-</component>
-<component name="personalisation_plugin_api" long-name="Personalisation Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
-</component>
-<component name="extended_aiw_criteria_api" long-name="Extended AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="personalisation_application_api" long-name="Personalisation Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_application_api/group"/>
-</component>
-<component name="volume_popup_api" long-name="Volume Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
-</component>
-<component name="avkon_secondary_display_support_api" long-name="AVKON Secondary Display Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_support_api/group" filter="!test"/>
-</component>
-<component name="extended_setting_pages_api" long-name="Extended Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_setting_pages_api/group" filter="!test"/>
-</component>
-<component name="extended_lists_api" long-name="Extended Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_lists_api/group" filter="!test"/>
-</component>
-<component name="input_block_api" long-name="Input Block API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/input_block_api/group" filter="!test"/>
-</component>
-<component name="avkon_ui_server_api" long-name="AVKON UI Server API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_ui_server_api/group" filter="!test"/>
-</component>
-<component name="number_grouping_api" long-name="Number Grouping API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/number_grouping_api/group" filter="!test"/>
-</component>
-<component name="extended_status_pane_api" long-name="Extended Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_status_pane_api/group" filter="!test"/>
-</component>
-<component name="extended_notifiers_api" long-name="Extended Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notifiers_api/group" filter="!test"/>
-</component>
-<component name="task_list_api" long-name="Task List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
-</component>
-<component name="personalisation_slide_show_dialog_api" long-name="Personalisation Slide Show Dialog API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
-</component>
-<component name="key_event_utilities_api" long-name="Key Event Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_event_utilities_api/group"/>
-</component>
-<component name="emergency_call_support_api" long-name="Emergency Call Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/emergency_call_support_api/group" filter="!test"/>
-</component>
-<component name="extended_dialogs_api" long-name="Extended Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_dialogs_api/group"/>
-</component>
-<component name="legacy_ui_framework_headers_api" long-name="Legacy UI Framework Headers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/legacy_ui_framework_headers_api/group"/>
-</component>
-<component name="extended_editors_api" long-name="Extended Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_editors_api/group" filter="!test"/>
-</component>
-<component name="alarm_api" long-name="Alarm API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alarm_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_interface_base_api" long-name="AIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_base_api/group" filter="!test"/>
-</component>
-<component name="list_effects_api" long-name="List Effects API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/list_effects_api/group" filter="!test"/>
-</component>
-<component name="find_item_ui_api" long-name="Find Item UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/find_item_ui_api/group" filter="!test"/>
-</component>
-<component name="server_application_services_api" long-name="Server Application Services API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/server_application_services_api/group" filter="!test"/>
-</component>
-<component name="common_ui_settings_api" long-name="Common UI Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_ui_settings_api/group"/>
-</component>
-<component name="aiw_service_interface_menu_api" long-name="AIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_menu_api/group" filter="!test"/>
-</component>
-<component name="eikon_server_extension_client_api" long-name="EIKON Server Extension Client API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/eikon_server_extension_client_api/group" filter="!test"/>
-</component>
-<component name="skinnable_clock_api" long-name="Skinnable Clock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/skinnable_clock_api/group" filter="!test"/>
-</component>
-<component name="battery_pane_api" long-name="Battery Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/battery_pane_api/group" filter="!test"/>
-</component>
-<component name="fep_document_navigation_api" long-name="FEP Document Navigation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
-</component>
-<component name="personalisation_localised_texts_api" long-name="Personalisation Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
-</component>
-<component name="memory_card_ui_api" long-name="Memory Card UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
-</component>
-<component name="avkon_status_api" long-name="AVKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_status_api/group"/>
-</component>
-<component name="application_switching_api" long-name="Application Switching API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/application_switching_api/group" filter="!test"/>
-</component>
-<component name="avkon_localised_texts_api" long-name="AVKON Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_localised_texts_api/group"/>
-</component>
-<component name="avkon_secondary_display_api" long-name="AVKON Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_api/group"/>
-</component>
-<component name="extended_animation_api" long-name="Extended Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_notes_api" long-name="Extended Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notes_api/group" filter="!test"/>
-</component>
-<component name="screensaver_animation_plugin_definitions_api" long-name="Screensaver Animation Plugin Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/screensaver_animation_plugin_definitions_api/group"/>
-</component>
-<component name="text_scroller_api" long-name="Text Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/text_scroller_api/group" filter="!test"/>
-</component>
-<component name="custom_cursors_api" long-name="Custom Cursors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/custom_cursors_api/group" filter="!test"/>
-</component>
-<component name="screensaver_settings_api" long-name="Screensaver Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/screensaver_settings_api/group"/>
-</component>
-<component name="global_window_priorities_api" long-name="Global Window Priorities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_window_priorities_api/group"/>
-</component>
-<component name="extended_indicators_api" long-name="Extended Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_indicators_api/group" filter="!test"/>
-</component>
-<component name="special_character_table_api" long-name="Special Character Table API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/special_character_table_api/group" filter="!test"/>
-</component>
-<component name="avkon_settings_api" long-name="AVKON Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_settings_api/group"/>
-</component>
-<component name="extended_sounds_api" long-name="Extended Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_sounds_api/group"/>
-</component>
-<component name="themes_settings_api" long-name="Themes Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/themes_settings_api/group"/>
-</component>
-<component name="media_shared_document_api" long-name="Media Shared Document API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/media_shared_document_api/group" filter="!test"/>
-</component>
-<component name="extended_queries_api" long-name="Extended Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_queries_api/group"/>
-</component>
-<component name="phone_number_text_utilities_api" long-name="Phone Number Text Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
-</component>
-<component name="screensaver_runtime_api" long-name="Screensaver Runtime API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/screensaver_runtime_api/group"/>
-</component>
-<component name="extended_scroller_api" long-name="Extended Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_scroller_api/group"/>
-</component>
-<component name="key_rotator_api" long-name="Key Rotator API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_rotator_api/group" filter="!test"/>
-</component>
-<component name="extended_grids_api" long-name="Extended Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_grids_api/group" filter="!test"/>
-</component>
-<component name="generic_parameter_api" long-name="Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="indicator_touch_observer_api" long-name="Indicator Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_touch_observer_api/group"/>
-</component>
-<component name="popup_form_api" long-name="Popup Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/popup_form_api/group" filter="!test"/>
-</component>
-<component name="stylus_activated_popup_api" long-name="Stylus Activated Pop-up API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/stylus_activated_popup_api/group" filter="!test"/>
-</component>
-<component name="indicator_plugin_api" long-name="Indicator Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_plugin_api/group" filter="!test"/>
-</component>
-<component name="layout_configuration_api" long-name="Layout Configuration API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/layout_configuration_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_filter_factory_api" long-name="Common File Dialogs Filter Factory API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group" filter="!test"/>
-</component>
-<component name="avkon_anim_dll_api" long-name="AVKON Anim DLL API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_anim_dll_api/group"/>
-</component>
-<component name="extended_initialization_api" long-name="Extended Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_initialization_api/group" filter="!test"/>
-</component>
-<component name="long_tap_animation_api" long-name="Long Tap Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/long_tap_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_ui_framework_definitions_api" long-name="Extended UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_ui_framework_definitions_api/group"/>
-</component>
-<component name="extended_buttons_api" long-name="Extended Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_buttons_api/group" filter="!test"/>
-</component>
-<component name="aiw_provider_utility_api" long-name="AIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_provider_utility_api/group" filter="!test"/>
-</component>
-<component name="transition_effect_parameters_api" long-name="Transition Effect Parameters API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_parameters_api/group" filter="!test"/>
-</component>
-<component name="extended_input_capabilities_api" long-name="Extended Input Capabilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_input_capabilities_api/group" filter="!test"/>
-</component>
-<component name="uikon_status_api" long-name="UIKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/uikon_status_api/group"/>
-</component>
-<component name="transition_effect_utilities_api" long-name="Transition Effect Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_utilities_api/group" filter="!test"/>
-</component>
-<component name="pointer_event_modifier_api" long-name="Pointer Event Modifier API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/pointer_event_modifier_api/group" filter="!test"/>
-</component>
-<component name="avkon_testability_api" long-name="AVKON Testability API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_testability_api/group"/>
-</component>
-<component name="ganes_api" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ganes_api/group"/>
-</component>
-<component name="ode_api" long-name="Ode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ode_api/group"/>
-</component>
-<component name="physics_api" long-name="Physics API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/physics_api/group"/>
-</component>
-<component name="touch_pane_api" long-name="Touch Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_api/group" filter="!test"/>
-</component>
-<component name="touch_pane_observer_api" long-name="Touch Pane Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_observer_api/group"/>
-</component>
-<component name="alternate_fs_api" long-name="Alternate FS API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alternate_fs_api/group"/>
-</component>
-<component name="discreet_popup_api" long-name="Discreet Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/discreet_popup_api/group"/>
-</component>
-<component name="touch_gesture_framework_api" long-name="Touch Gesture Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_gesture_framework_api/group"/>
-<!-- should this be commented out? -->
-<!--<unit bldFile="classicui_plat/touch_gesture_framework_api/tsrc/group" filter="test,api_test"/> -->
-</component>
-<component name="extended_options_menu_api" long-name="Extended Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="classicui_pub" long-name="Classic UI Public Interfaces" level="specific">
-<component name="input_frame_api" long-name="Input Frame API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/input_frame_api/group" filter="!test"/>
-</component>
-<component name="window_server_event_observer_api" long-name="Window Server Event Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/window_server_event_observer_api/group" filter="!test"/>
-</component>
-<component name="application_framework_api" long-name="Application Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/application_framework_api/group" filter="!test"/>
-</component>
-<component name="scroller_api" long-name="Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/scroller_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_utilities_api" long-name="UI Framework Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_utilities_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_definitions_api" long-name="UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_definitions_api/group" filter="!test"/>
-</component>
-<component name="buttons_api" long-name="Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/buttons_api/group" filter="!test"/>
-</component>
-<component name="queries_api" long-name="Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/queries_api/group" filter="!test"/>
-</component>
-<component name="aiw_generic_parameter_api" long-name="AIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="editors_api" long-name="Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/editors_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_api" long-name="Common File Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/common_file_dialogs_api/group" filter="!test"/>
-</component>
-<component name="dialog_shutter_api" long-name="Dialog Shutter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialog_shutter_api/group" filter="!test"/>
-</component>
-<component name="fonts_api" long-name="Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/fonts_api/group" filter="!test"/>
-</component>
-<component name="screen_clearer_api" long-name="Screen Clearer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_clearer_api/group" filter="!test"/>
-</component>
-<component name="notifiers_api" long-name="Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notifiers_api/group" filter="!test"/>
-</component>
-<component name="notes_api" long-name="Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notes_api/group" filter="!test"/>
-</component>
-<component name="screen_saver_api" long-name="Screen Saver API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_saver_api/group" filter="!test"/>
-</component>
-<component name="status_pane_api" long-name="Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/status_pane_api/group" filter="!test"/>
-</component>
-<component name="base_controls_api" long-name="Base Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/base_controls_api/group" filter="!test"/>
-</component>
-<component name="grids_api" long-name="Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/grids_api/group" filter="!test"/>
-</component>
-<component name="context_pane_api" long-name="Context Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/context_pane_api/group" filter="!test"/>
-</component>
-<component name="lists_api" long-name="Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/lists_api/group" filter="!test"/>
-</component>
-<component name="popups_api" long-name="Popups API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/popups_api/group" filter="!test"/>
-</component>
-<component name="misc_controls_api" long-name="Misc Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/misc_controls_api/group" filter="!test"/>
-</component>
-<component name="keylock_api" long-name="Keylock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/keylock_api/group" filter="!test"/>
-</component>
-<component name="options_menu_api" long-name="Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/options_menu_api/group" filter="!test"/>
-</component>
-<component name="hierarchical_lists_api" long-name="Hierarchical Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hierarchical_lists_api/group" filter="!test"/>
-</component>
-<component name="navigation_pane_api" long-name="Navigation Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/navigation_pane_api/group" filter="!test"/>
-</component>
-<component name="tabs_api" long-name="Tabs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/tabs_api/group" filter="!test"/>
-</component>
-<component name="title_pane_touch_observer_api" long-name="Title Pane Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_touch_observer_api/group"/>
-</component>
-<component name="choice_list_api" long-name="Choice List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/choice_list_api/group" filter="!test"/>
-</component>
-<component name="info_popup_note_api" long-name="Info Popup Note API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/info_popup_note_api/group" filter="!test"/>
-</component>
-<component name="setting_pages_api" long-name="Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/setting_pages_api/group" filter="!test"/>
-</component>
-<component name="screen_mode_api" long-name="Screen Mode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_mode_api/group" filter="!test"/>
-</component>
-<component name="indicators_api" long-name="Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/indicators_api/group" filter="!test"/>
-</component>
-<component name="error_ui_api" long-name="Error UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/error_ui_api/group" filter="!test"/>
-</component>
-<component name="animation_api" long-name="Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/animation_api/group" filter="!test"/>
-</component>
-<component name="searchfield_api" long-name="Searchfield API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/searchfield_api/group" filter="!test"/>
-</component>
-<component name="labels_api" long-name="Labels API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/labels_api/group" filter="!test"/>
-</component>
-<component name="hotkeys_api" long-name="Hotkeys API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hotkeys_api/group" filter="!test"/>
-</component>
-<component name="initialization_api" long-name="Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/initialization_api/group" filter="!test"/>
-</component>
-<component name="volume_control_api" long-name="Volume Control API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/volume_control_api/group" filter="!test"/>
-</component>
-<component name="title_pane_api" long-name="Title Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_api/group" filter="!test"/>
-</component>
-<component name="sounds_api" long-name="Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/sounds_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_handler_api" long-name="AIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_service_handler_api/group" filter="!test"/>
-</component>
-<component name="aiw_criteria_api" long-name="AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="touch_ui_utilities_api" long-name="Touch UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/touch_ui_utilities_api/group" filter="!test"/>
-</component>
-<component name="generic_button_api" long-name="Generic Button API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/generic_button_api/group" filter="!test"/>
-</component>
-<component name="form_api" long-name="Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/form_api/group" filter="!test"/>
-</component>
-<component name="uikon_core_controls" long-name="Uikon Core Controls" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/uikon_core_controls/group" filter="!test"/>
-</component>
-<component name="calendar_api" long-name="Calendar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/calendar_api/group"/>
-</component>
-<component name="toolbar_api" long-name="Toolbar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/toolbar_api/group" filter="!test"/>
-</component>
-<component name="server_application_api" long-name="Server Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/server_application_api/group"/>
-</component>
-<component name="slider_api" long-name="Slider API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/slider_api/group" filter="!test"/>
-</component>
-<component name="private_ui_framework_api" long-name="Private UI Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/private_ui_framework_api/group" filter="!test"/>
-</component>
-<component name="dialogs_api" long-name="Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialogs_api/group" filter="!test"/>
-</component>
-<component name="document_handler_api" long-name="Document handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/document_handler_api/group"/>
-</component>
-<component name="images_api" long-name="Images API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/images_api/group" filter="!test"/>
-</component>
-<component name="stylus_popup_menu_api" long-name="Stylus Pop-up Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/stylus_popup_menu_api/group" filter="!test"/>
-</component>
-<component name="information_preview_popup_api" long-name="Information Preview Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/information_preview_popup_api/group" filter="!test"/>
-</component>
-<component name="intermediate_state_api" long-name="Intermediate State API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/intermediate_state_api/group"/>
-</component>
-<component name="help_launcher_api" long-name="Help Launcher API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/help_launcher_api/group"/>
-</component>
-</collection>
-<collection name="ode" long-name="Open Dynamics Engine" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="ode_build" filter="s60" long-name="ODE">
-<unit bldFile="mw/classicui/ode/group"/>
-</component>
-</collection>
-<collection name="uifw" long-name="UI Framework" level="server">
-<component name="uiklaf" filter="s60" long-name="Uikon Look-and-Feel">
-<unit bldFile="mw/classicui/uifw/uiklaf/group"/>
-</component>
-<component name="eikctl" filter="s60" long-name="Eikon Controls">
-<unit bldFile="mw/classicui/uifw/eikctl/group"/>
-</component>
-<component name="avkon" filter="s60" long-name="Avkon">
-<!-- can only have one unit. Split into 3 components, or #include all from same bld.inf -->
-<unit bldFile="mw/classicui/uifw/avkon/aknphysics/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/aknconf/group"/>
-</component>
-<component name="eikstd" filter="s60" long-name="Eikon Standard">
-<unit bldFile="mw/classicui/uifw/eikstd/group"/>
-</component>
-<component name="aknglobalui" filter="s60" long-name="Avkon Global UI">
-<unit bldFile="mw/classicui/uifw/aknglobalui/group"/>
-</component>
-<component name="ganes" filter="s60" long-name="Ganes">
-<unit bldFile="mw/classicui/uifw/ganes/group"/>
-</component>
-</collection>
-<collection name="commonuis" long-name="Common UIs" level="specific">
-<component name="commonui" filter="s60" long-name="Common UI">
-<unit bldFile="mw/classicui/commonuis/commonui/group"/>
-</component>
-<component name="commondialogs" filter="s60" long-name="Common Dialogs">
-<unit bldFile="mw/classicui/commonuis/commondialogs/group"/>
-</component>
-</collection>
-<collection name="applicationinterworkingfw" long-name="Application Interworking Framework" level="generic">
-<component name="aifwservicehandler" filter="s60" long-name="Application Interworking Service Handler">
-<unit bldFile="mw/classicui/applicationinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-<collection name="psln" long-name="Personalization" level="specific">
-<!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
-<component name="psln_build" filter="s60" long-name="Personalization Build">
-<unit bldFile="mw/classicui/psln/group"/>
-</component>
-</collection>
-<collection name="commonadapter" long-name="Common Adapter" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="commonadapter_build" filter="s60" long-name="Common Adapter Build">
-<unit bldFile="mw/classicui/commonadapter/group"/>
-</component>
-</collection>
-<collection name="akntouchgesturefw" long-name="Avkon Touch Gesture Framework" level="generic">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="akntouchgesturefw_build" filter="s60" long-name="Avkon Touch Gesture Framework Build" introduced="^3">
-<unit bldFile="mw/classicui/akntouchgesturefw/group"/>
-</component>
-</collection>
-<collection name="uiutils" long-name="UI Utils" level="specific">
-<component name="localizer" filter="s60" long-name="Directory Localizer">
-<unit bldFile="mw/classicui/uiutils/localizer/group"/>
-</component>
-<component name="findutil" filter="s60" long-name="Find Utility">
-<unit bldFile="mw/classicui/uiutils/findutil/group"/>
-</component>
-<component name="gamerecognizer" filter="s60" long-name="Game Recognizer" plugin="Y">
-<unit bldFile="mw/classicui/uiutils/gamerecognizer/group"/>
-</component>
-<component name="aknjapanesereading" filter="s60" long-name="Avkon Japanese Reading">
-<unit bldFile="mw/classicui/uiutils/aknjapanesereading/group"/>
-</component>
-</collection>
-<collection name="commonuisupport" long-name="Common UI Support" level="support">
-<component name="uikon" long-name="Uikon" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uikon/group" mrp="mw/classicui/commonuisupport/uikon/group/app-framework_uikon.mrp"/>
-</component>
-<component name="errorresolverdata" long-name="Error Resolver Data" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/errorresolverdata/group" mrp="mw/classicui/commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
-</component>
-<component name="uilaf" long-name="UI Look and Feel" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uilaf/GROUP" mrp="mw/classicui/commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
-</component>
-<component name="grid" long-name="Grid" purpose="optional">
-<unit bldFile="mw/classicui/commonuisupport/grid/group" mrp="mw/classicui/commonuisupport/grid/group/app-framework_grid.mrp"/>
-</component>
-<component name="uifwsdocs" long-name="UI Frameworks Documentation" purpose="development" class="doc">
-<unit mrp="mw/classicui/commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
-</component>
-</collection>
-<collection name="lafagnosticuifoundation" long-name="Look-and-Feel Agnostic UI Foundation" level="base">
-<component name="cone" long-name="Control Environment" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/cone/group" mrp="mw/classicui/lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
-</component>
-<component name="graphicseffects" long-name="Graphics Effects" introduced="9.2" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/graphicseffects/group" mrp="mw/classicui/lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
-</component>
-<component name="uigraphicsutils" long-name="UI Graphics Utilities" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group" mrp="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
-</component>
-<component name="clockanim" long-name="Clock" purpose="optional" plugin="Y">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/clockanim/group" mrp="mw/classicui/lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
-</component>
-<component name="bmpanimation" long-name="BMP Animation" introduced="6.0" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/bmpanimation/group" mrp="mw/classicui/lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
-</component>
-<component name="animation" long-name="Animation" introduced="9.1" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/animation/group" mrp="mw/classicui/lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
-</component>
-</collection>
-<collection name="classicui_info" long-name="Classic UI Info" level="specific">
-<!-- the multiple units in the API test components need to be resolved -->
-<component name="classicui_metadata" long-name="Classic UI Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/classicui/classicui_info/classicui_metadata/classicui_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="svgt" level="generic" long-name="SVG Tiny" levels="util ui">
-<collection name="svgt_plat" long-name="SVG Tiny Platform Interfaces" level="ui">
-<component name="svgt_api" long-name="SVGT API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/svgt_api/group"/>
-</component>
-<component name="nvg_api" long-name="NVG API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/nvg_api/group"/>
-</component>
-</collection>
-<collection name="svgtopt" long-name="SVG-T Engine" level="util">
-<component name="svgtopt_build" filter="s60" long-name="SVG Engine" introduced="9.2">
-<!-- component is at collection level. Needs to be moved down a directory -->
-<unit bldFile="mw/svgt/svgtopt/group"/>
-</component>
-<component name="svgtplugin" filter="s60" long-name="SVG Plugin" introduced="9.2" plugin="Y">
-<unit bldFile="mw/svgt/svgtopt/svgtplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="uiaccelerator" level="generic" long-name="UI Accelerator" levels="plugin framework server ex if">
-<collection name="uiaccelerator_plat" long-name="UI Accelerator Platform Interfaces" level="if">
-<component name="alf_core_toolkit_api" long-name="ALF Core Toolkit API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/group"/>
-</component>
-<component name="alf_visual_api" long-name="ALF Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/group"/>
-</component>
-<component name="alf_extended_visual_api" long-name="ALF Extended Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/group"/>
-</component>
-<component name="alf_extension_api" long-name="ALF Extension API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/group"/>
-</component>
-<component name="alf_tracing_api" long-name="ALF Tracing API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/group"/>
-</component>
-<component name="alf_client_server_api" long-name="ALF Client Server API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/group"/>
-</component>
-</collection>
-<collection name="uiacceltk" long-name="UI Accelerator Toolkit" level="framework">
-<component name="hitchcock" filter="s60" long-name="Hitchcock">
-<unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/group"/>
-</component>
-<component name="uiacceltk_build" filter="s60" long-name="UI Accelerator Toolkit Build">
-<!-- move into the other component, or remove the #include and make this UI Accelerator Toolkit ROM-->
-<unit bldFile="mw/uiaccelerator/uiacceltk/group"/>
-</component>
-</collection>
-</block>
-<block name="uiresources" level="generic" long-name="UI Resources" levels="compile plugin framework server generic data">
-<!-- are the custom filters below needed? -->
-<collection name="uiresources_pub" long-name="UI Resources Public Interfaces" level="data">
-<component name="pictograph_api" long-name="Pictograph API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/pictograph_api/group" filter="!test"/>
-</component>
-<component name="skins_api" long-name="Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/skins_api/group" filter="!test"/>
-</component>
-<component name="font_definition_api" long-name="Font Definition API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/font_definition_api/group" filter="!test"/>
-</component>
-<component name="graphics_api" long-name="Graphics API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/graphics_api/group" filter="!test"/>
-</component>
-<component name="scalable_icons_api" long-name="Scalable Icons API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/scalable_icons_api/group"/>
-</component>
-<component name="layout_id_definitions_api" long-name="Layout ID Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/layout_id_definitions_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_plat" long-name="UI Resources Platform Interfaces" level="data">
-<component name="layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_system_private_api/group" filter="!test"/>
-</component>
-<component name="layout_data_api" long-name="Layout Data API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_data_api/group" filter="!test"/>
-</component>
-<component name="cdl_api" long-name="CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/cdl_api/group" filter="!test"/>
-</component>
-<component name="extended_skins_api" long-name="Extended Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_skins_api/group" filter="!test"/>
-</component>
-<component name="tfx_server_controller_plugin_api" long-name="TFX Server Controller Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_controller_plugin_api/group"/>
-</component>
-<component name="extended_fonts_api" long-name="Extended Fonts API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_fonts_api/group" filter="!test"/>
-</component>
-<component name="graphic_configuration_api" long-name="Graphic Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/graphic_configuration_api/group" filter="!test"/>
-</component>
-<component name="mif_header_cdl_api" long-name="MIF Header CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mif_header_cdl_api/group"/>
-</component>
-<component name="personalisation_and_skins_settings_api" long-name="Personalisation and Skins Settings API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/personalisation_and_skins_settings_api/group"/>
-</component>
-<component name="tfx_effect_setup_plugin_api" long-name="TFX Effect Setup Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_effect_setup_plugin_api/group"/>
-</component>
-<component name="mifconv_definitions_api" long-name="Mifconv Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mifconv_definitions_api/group"/>
-</component>
-<component name="wallpaper_configuration_api" long-name="Wallpaper Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/wallpaper_configuration_api/group"/>
-</component>
-<component name="language_code_definitions_api" long-name="Language Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/language_code_definitions_api/group"/>
-</component>
-<component name="skins_image_attributes_api" long-name="Skins Image Attributes API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
-</component>
-<component name="private_user_area_code_definitions_api" long-name="Private User Area Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/private_user_area_code_definitions_api/group"/>
-</component>
-<component name="tfx_server_plugin_ids_api" long-name="TFX Server Plug-in IDs API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_plugin_ids_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_info" long-name="UI Resources Info" level="data">
-<component name="uiresources_test" filter="s60,test,api_test" long-name="UI Resources Tests" purpose="development"/>
-</collection>
-<collection name="uigraphics" long-name="UI Graphics" level="generic">
-<component name="bitmaps2" filter="s60" long-name="Bitmaps 2" class="config">
-<unit bldFile="mw/uiresources/uigraphics/bitmaps2/group"/>
-</component>
-<component name="icons" filter="s60" long-name="Icons" class="config">
-<unit bldFile="mw/uiresources/uigraphics/icons/group"/>
-</component>
-<component name="variatedbitmaps" filter="s60" long-name="Variated Bitmaps" class="config">
-<unit bldFile="mw/uiresources/uigraphics/variatedbitmaps/group"/>
-</component>
-<component name="aknicon" filter="s60" long-name="Avkon Icon Framework">
-<unit bldFile="mw/uiresources/uigraphics/aknicon/group"/>
-</component>
-<component name="nvgrenderstage" filter="sf_build" long-name="NVG Render Stage">
-<unit bldFile="mw/uiresources/uigraphics/nvgrenderstage/group"/>
-</component>
-</collection>
-<collection name="layouts" long-name="Layouts" level="plugin">
-<component name="cdl" filter="s60" long-name="Customization Definition Language">
-<!-- can only have one unit. Need to #include them or split into multiple components -->
-<unit bldFile="mw/uiresources/layouts/cdl/cdlengine/group"/>
-<unit bldFile="mw/uiresources/layouts/cdl/cdlserver/group"/>
-</component>
-<component name="aknlayout2" filter="s60" long-name="Avkon Layout 2">
-<unit bldFile="mw/uiresources/layouts/aknlayout2/group"/>
-</component>
-</collection>
-<collection name="skins" long-name="Skins" level="data">
-<component name="aknskincontent" filter="s60" long-name="Avkon Skin Content" class="config">
-<unit bldFile="mw/uiresources/skins/aknskincontent/group"/>
-</component>
-<component name="aknskins" filter="s60" long-name="Avkon Skin Compiler">
-<unit bldFile="mw/uiresources/skins/aknskins/group"/>
-</component>
-</collection>
-<collection name="pictographs" long-name="Pictographs" level="data">
-<component name="aknpictograph" filter="s60" long-name="Avkon Pictograph">
-<unit bldFile="mw/uiresources/pictographs/aknpictograph/group"/>
-</component>
-</collection>
-<collection name="locales" long-name="Locales" level="framework">
-<component name="locales_build" filter="s60" long-name="Locales Build">
-<unit bldFile="mw/uiresources/locales/loce32"/>
-</component>
-</collection>
-<collection name="uiconfig" long-name="UI Config" level="server">
-<component name="s60config" filter="s60" long-name="S60 UI Config">
-<unit bldFile="mw/uiresources/uiconfig/s60config/group"/>
-</component>
-</collection>
-<collection name="fontsupport" long-name="Font Support" level="generic">
-<component name="fontprovider" filter="s60" long-name="Font Provider">
-<unit bldFile="mw/uiresources/fontsupport/fontprovider/group"/>
-</component>
-<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
- <component id="s60_fonts" filter="s60" name="S60 Fonts">
- <unit bldFile="fontsupport/fontutils/group"/>
- </component>
--->
-<component name="fontutils" filter="sf_build" long-name="Font Utils">
-<unit bldFile="mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
-</component>
-</collection>
-<collection name="helpthemes" long-name="Help Themes" level="data">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helpthemes_build" filter="s60" long-name="Help Themes Build" class="config">
-<unit bldFile="mw/uiresources/helpthemes/group"/>
-</component>
-</collection>
-</block>
-<block name="hapticsservices" level="generic" long-name="Haptics Services" levels="fw server api">
-<collection name="hapticsservices_plat" long-name="Haptics Services Platform Interfaces" level="api">
-<component name="tacticon_api" long-name="Tacticon API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tacticon_api/group"/>
-</component>
-<component name="tactile_feedback_core_api" long-name="Tactile Feedback Core API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_core_api/group"/>
-</component>
-<component name="tactile_feedback_server_api" long-name="Tactile Feedback Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_server_api/group"/>
-</component>
-</collection>
-<collection name="hapticsservices_pub" long-name="Haptics Services Public Interfaces" level="api">
-<component name="tactile_feedback_client_api" long-name="Tactile Feedback Client API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_pub/tactile_feedback_client_api/group"/>
-</component>
-</collection>
-<collection name="tacticonserver" long-name="Tacticon Server" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="tacticonserver_build" filter="s60" long-name="Tacticon Server Build" introduced="^3">
-<unit bldFile="mw/hapticsservices/tacticonserver/group"/>
-<!-- clients and servers are suauly the same component. Consider moving pluign to a separate component if needed -->
-</component>
-</collection>
-<collection name="tactilefeedback" long-name="Tactile Feedback" level="fw">
-<component name="tactilearearegistry" filter="s60" long-name="Tactile Area Registry" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilearearegistry/group"/>
-</component>
-<component name="tactilefeedbackresolver" filter="s60" long-name="Tactile Feedback Resolver" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackresolver/group"/>
-</component>
-<component name="tactileclickplugin" filter="s60" long-name="Tactile Click Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileclickplugin/group"/>
-</component>
-<component name="tactilefeedbackclient" filter="s60" long-name="Tactile Feedback Client" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackclient/group"/>
-</component>
-<component name="tactileactionplugin" filter="s60" long-name="Tactile Action Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileactionplugin/group"/>
-</component>
-<component name="tactilefeedback_build" filter="s60" long-name="Tactile Feedback Build" introduced="^1">
-<!-- consider moving IBY to one fo the above components -->
-<unit bldFile="mw/hapticsservices/tactilefeedback/group"/>
-</component>
-</collection>
-</block>
-<block name="gsprofilesrv" level="generic" long-name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
-<collection name="gsprofilesrv_pub" long-name="GS and Profiles Services Public Interfaces" level="specific">
-<component name="profiles_engine_active_profile_settings_api" long-name="Profiles Engine Active Profile Settings API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_active_profile_settings_api/group"/>
-</component>
-<component name="profiles_engine_wrapper_api" long-name="Profiles Engine Wrapper API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_wrapper_api/group"/>
-</component>
-</collection>
-<collection name="gsprofilesrv_plat" long-name="GS and Profiles Services Platform Interfaces" level="specific">
-<component name="profiles_engine_api" long-name="Profiles Engine API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_engine_api/group"/>
-</component>
-<component name="profiles_mediafilelist_api" long-name="Media File List API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_mediafilelist_api/group"/>
-</component>
-<component name="filelist_api" long-name="File List API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/filelist_api/group"/>
-</component>
-<component name="settings_backgroundimage_api" long-name="Settings Background Image API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_backgroundimage_api/group"/>
-</component>
-<component name="settings_framework_api" long-name="Settings Framework API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_framework_api/group"/>
-</component>
-<component name="settings_launch_api" long-name="Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_launch_api/group"/>
-</component>
-<component name="settings_listbox_api" long-name="Settings List Box API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_listbox_api/group"/>
-</component>
-<component name="settings_plugin_api" long-name="Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_plugin_api/group"/>
-</component>
-<component name="settings_uis_cenrep_collection_api" long-name="Settings UIs CenRep Collection API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
-</component>
-</collection>
-<collection name="gssettingsuis" long-name="General Settings UIs" level="framework">
-<component name="gs" filter="s60" long-name="General Settings" introduced="9.2">
-<unit bldFile="mw/gsprofilesrv/gssettingsuis/gs/group"/>
-</component>
-</collection>
-<collection name="profilesservices" long-name="Profiles Services" level="server">
-<component name="filelist" filter="s60" long-name="File List" introduced="9.1">
-<unit bldFile="mw/gsprofilesrv/profilesservices/filelist/group"/>
-</component>
-<component name="mediafilelist" filter="s60" long-name="Media File List" introduced="^2">
-<unit bldFile="mw/gsprofilesrv/profilesservices/mediafilelist/group"/>
-</component>
-<component name="profileengine" filter="s60" long-name="Profile Engine" introduced="9.1">
-<unit bldFile="mw/gsprofilesrv/profilesservices/profileengine/group"/>
-</component>
-<component name="ringingtone3dplugin" filter="s60" long-name="Ringing Tone 3D Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/gsprofilesrv/profilesservices/ringingtone3dplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreensrv" level="specific" long-name="Home Screen Services" levels="plugin framework server generic specific">
-<collection name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" level="specific">
-<component name="ai_content_model_api" long-name="AI Content Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_content_model_api/group"/>
-</component>
-<component name="ai_utilities_api" long-name="AI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_utilities_api/group" filter="!test"/>
-</component>
-<component name="ai_plugin_management_api" long-name="AI Plug-in Management API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_management_api/group"/>
-</component>
-<component name="ai_plugin_information_api" long-name="AI Plug-in Information API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_information_api/group"/>
-</component>
-<component name="ai_variation_api" long-name="AI Variation API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_variation_api/group"/>
-</component>
-<component name="action_handler_plugin_api" long-name="Action Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/group" filter="!test"/>
-</component>
-<component name="content_harvester_plugin_api" long-name="Content Harvester Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/group" filter="!test"/>
-</component>
-<component name="menu_model_api" long-name="Menu Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_model_api/group"/>
-</component>
-<component name="menu_sat_interface_api" long-name="Menu SAT Interface API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/group" filter="!test"/>
-</component>
-<component name="external_home_screen_api" long-name="External Home Screen API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/external_home_screen_api/group"/>
-</component>
-<component name="menu_content_service_api" long-name="Menu Content Service API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_content_service_api/group" filter="!test"/>
-</component>
-<component name="sapi_contentpublishing" long-name="SAPI Content Publishing" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing/group"/>
-</component>
-<component name="sapi_backstepping" long-name="SAPI Backstepping" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_backstepping/group"/>
-</component>
-<component name="sapi_actionhandler" long-name="SAPI Action Handler" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_actionhandler/group"/>
-</component>
-<component name="sapi_homescreenplugin" long-name="SAPI Homescreen Plugin" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_homescreenplugin/group" filter="!test"/>
-</component>
-<component name="sapi_menucontent" long-name="SAPI Menu Content" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_menucontent/group"/>
-</component>
-<component name="xcfw_api" long-name="XCFW API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/xcfw_api/group"/>
-</component>
-<component name="idlefw_api" long-name="Idle Framework API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/idlefw_api/group"/>
-</component>
-<component name="hs_widget_publisher_api" long-name="Home Screen Publishing API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_widget_publisher_api/group"/>
-</component>
-<component name="hs_settings_api" long-name="HS Settings API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_settings_api/group"/>
-</component>
-<component name="hs_content_control_api" long-name="HS Content Control API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_content_control_api/group"/>
-</component>
-</collection>
-<collection name="xcfw" long-name="XML Content Framework" level="framework">
-<!-- collection is really a component, needs to be moved down a directory -->
-<component name="xcfw_build" filter="s60" long-name="XML Content Framework Build">
-<unit bldFile="mw/homescreensrv/xcfw/group"/>
-</component>
-</collection>
-<collection name="homescreenpluginsrv" long-name="Home Screen Plugin Service" level="plugin">
-<component name="hspsdefinitionengine" filter="s60" long-name="HS Plugin Service Definition Engine" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsdefinitionengine/group"/> -->
-</component>
-<component name="hspsdom" filter="s60" long-name="HS Plugin Service DOM" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsdom/group"/> -->
-</component>
-<component name="hspstools" filter="s60" long-name="HS Server Tools">
-<!-- <unit bldFile="homescreenpluginsrv/hspstools/group"/> -->
-</component>
-<component name="hspspluginregistry" filter="s60" long-name="HS Plugin Registry" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspspluginregistry/group"/>-->
-</component>
-<component name="hspsmanager" filter="s60" long-name="HSPS Manager" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsmanager/group"/>-->
-</component>
-<component name="hspsodt" filter="s60" long-name="HSPS Object Description Tree" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsodt/group"/>-->
-</component>
-<component name="hspsresource" filter="s60" long-name="HS Plugin Server Resource" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresource/group"/>-->
-</component>
-<component name="hspsresult" filter="s60" long-name="HS Plugin Server Result" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
-</component>
-<component name="homescreen_settings_api" filter="s60" long-name="HS Settings API" class="api placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
-</component>
-<component name="homescreenpluginsrv_build" filter="s60" long-name="HSPS Build">
-<!-- need to break this up into the self-contained components above and uncomment them -->
-<unit bldFile="mw/homescreensrv/homescreenpluginsrv/group"/>
-</component>
-</collection>
-<collection name="idlefw" long-name="Idle Framework" level="framework">
-<!-- Uncomment all units when configuration is in place. All currently #included from idlefw_build -->
-<component name="idlefw_plugins" filter="s60" long-name="Idle Framework Plugins" plugin="Y" class="placeholder">
-<!--<unit bldFile="idlefw/plugins/group"/>-->
-</component>
-<component name="hslaunch" filter="s60" long-name="Home Screen Launch" class="placeholder">
-<!--<unit bldFile="idlefw/plugins/group"/>-->
-</component>
-<component name="idlefw_build" filter="s60" long-name="Idle Framework Build">
-<!--split this into components, or separate from the above components and move this down a directory -->
-<unit bldFile="mw/homescreensrv/idlefw/group"/>
-</component>
-</collection>
-<collection name="menucontentsrv" long-name="Menu Content Service" level="generic">
-<component name="menusatinterface" filter="s60" long-name="Menu SAT Interface">
-<unit bldFile="mw/homescreensrv/menucontentsrv/menusatinterface/group"/>
-</component>
-<component name="menucontentsrv_build" filter="s60" long-name="Menu Content Service Build">
-<!--split this into components, or separate from the above component and move this down a directory -->
-<unit bldFile="mw/homescreensrv/menucontentsrv/group"/>
-</component>
-</collection>
-<collection name="backsteppingsrv" long-name="Back Stepping Service" level="server">
-<!-- collection is really a component, needs to be moved down a directory -->
-<component name="bsengine" long-name="Back Stepping Engine" filter="s60">
-<unit bldFile="mw/homescreensrv/backsteppingsrv/group"/>
-</component>
-</collection>
-<collection name="contentpublishingsrv" long-name="Content Publishing Service" level="server">
-<component name="contentpublishingdebug" filter="s60" long-name="Content Publishing Debug">
-<!-- need to move this component outside of contentpublishingutils and into separate component directory -->
-<!-- <unit bldFile="contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/> -->
-</component>
-<component name="contentpublishingutils" filter="s60" long-name="Content Publishing Utils">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingutils/group"/>
-</component>
-<component name="contentpublishingserver" filter="s60" long-name="Content Publishing Server">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingserver/group"/>
-</component>
-<component name="contentharvester" filter="s60" long-name="Content Harvester">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
-</component>
-<component name="contentpublishingsrv_build" filter="s60" long-name="Content Publishing Service Build">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/group"/>
-</component>
-</collection>
-<collection name="contentcontrolsrv" long-name="Content Control Service" level="server">
-<component name="ccsrv" long-name="Content Control Service" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccsrv/group"/>
-</component>
-<component name="ccsrvapi" long-name="Content Control Service API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccsrvapi/group"/>
-</component>
-<component name="ccclientsession" long-name="Content Control Client Session" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccclientsession/group"/>
-</component>
-<component name="hsccclient" long-name="HS Content Control Client" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/hsccclient/group"/>
-</component>
-<component name="hscontentinfo" long-name="Home Screen Content Info" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/hscontentinfo/group"/>
-</component>
-<component name="contentcontrolsrv_build" long-name="Content Control Service Build" filter="s60" introduced="^3">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/group"/>
-</component>
-</collection>
-</block>
-<block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
-<collection name="appinstall_plat" long-name="Application Installation Platform Interfaces" level="api">
-<component name="iaupdate_api" long-name="IA Update API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/iaupdate_api/group"/>
-</component>
-<component name="task_plugin_api" long-name="Task Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_plugin_api/group"/>
-</component>
-<component name="sw_installer_common_ui_api" long-name="SW Installer Common UI API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_common_ui_api/group"/>
-</component>
-<component name="sw_installer_launcher_api" long-name="SW Installer Launcher API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_launcher_api/group"/>
-</component>
-<component name="task_management_api" long-name="Task Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_management_api/group"/>
-</component>
-<component name="sw_installer_ui_plugin_api" long-name="SW Installer UI Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ui_plugin_api/group"/>
-</component>
-<component name="sw_installer_cr_keys" long-name="SW Installer CR Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_cr_keys/group"/>
-</component>
-<component name="sw_installer_ps_keys" long-name="SW Installer PS Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
-</component>
-<component name="appmngr2runtimeapi" long-name="Application Manager 2 Runtime Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
-</component>
-</collection>
-<collection name="appinstall_pub" long-name="Application Installation Public Interfaces" level="api">
-<component name="startup_list_management_api" long-name="Startup List Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
-</component>
-</collection>
-<collection name="ncdengine" long-name="Nokia Content Discover" level="framework">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="ncdengine_engine" filter="s60" long-name="NCD Engine" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/engine/group"/>
-</component>
-<component name="debuglogger" filter="s60" long-name="NCD Debug Logger" introduced="^1" class="placeholder">
-<!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
-</component>
-<component name="ncdengine_build" filter="s60" long-name="NCD Build" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/group"/>
-</component>
-</collection>
-<collection name="appinstaller" long-name="Application Installer" level="generic">
-<component name="appmngr2" filter="s60" long-name="Application Manager 2" introduced="^2">
-<unit bldFile="mw/appinstall/appinstaller/appmngr2/group"/>
-</component>
-<component name="appinstui" filter="s60" long-name="Application Installer UI" introduced="^2">
-<unit bldFile="mw/appinstall/appinstaller/appinstui/group"/>
-</component>
-</collection>
-<collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="api">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="iaupdateapi_stub_build" long-name="IA Update API Stub Build" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdateapi_stub/group"/>
-</component>
-</collection>
-<collection name="iaupdate" long-name="Independent Apps Update" level="api">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="iad" long-name="Software Update" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/iad/group"/>
-</component>
-<component name="iaupdate_help" filter="s60" long-name="IA Update Help" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/help/group"/>
-</component>
-<component name="iaupdate_build" filter="s60" long-name="IA Update Build" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/group"/>
-</component>
-</collection>
-<collection name="installationservices" long-name="Installation Services" level="generic">
-<component name="swi" long-name="Secure Software Install" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swi/group" mrp="mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
-</component>
-<component name="swidevicetools" long-name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
-<unit bldFile="mw/appinstall/installationservices/swidevicetools/group" mrp="mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
-</component>
-<component name="swiconfig" long-name="Software Install Config" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appinstall/installationservices/swiconfig/group" mrp="mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
-</component>
-</collection>
-<collection name="secureswitools" long-name="Secure Software Install Tools" level="tool">
-<component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/makekeys/group" mrp="mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
-</component>
-<component name="swianalysistoolkit" long-name="SWI Analysis Toolkit" purpose="development" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
-</component>
-<component name="openssllib" long-name="OpenSSL Library" purpose="optional" class="PC">
-<unit mrp="mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
-</component>
-<component name="swisistools" long-name="Secure Software Install SIS Tools" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swisistools/group" mrp="mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
-</component>
-</collection>
-<collection name="appinstall_info" long-name="Application Installation Info" level="api">
-<component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="serviceapifw" level="specific" long-name="Service API Framework" levels="plugin framework server generic specific">
-<collection name="serviceapifw_pub" long-name="Service API Framework Public Interfaces" level="specific"/>
-<collection name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" level="specific">
-<component name="rtsecuritymanager_common_api" long-name="Runtime Security Manager Common API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/group"/>
-</component>
-<component name="rtsecuritymanager_utility_api" long-name="Runtime Security Manager Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
-</component>
-<component name="rtsecuritymanager_client_api" long-name="Runtime Security Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/group"/>
-</component>
-<component name="liw_provider_utility_api" long-name="LIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_provider_utility_api/group"/>
-</component>
-<component name="liw_service_interface_base_api" long-name="LIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_base_api/group"/>
-</component>
-<component name="liw_service_interface_menu_api" long-name="LIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_menu_api/group"/>
-</component>
-<component name="liw_criteria_api" long-name="LIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_criteria_api/group"/>
-</component>
-<component name="liw_generic_parameter_api" long-name="LIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_generic_parameter_api/group"/>
-</component>
-<component name="liw_service_handler_api" long-name="LIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_handler_api/group"/>
-</component>
-</collection>
-<collection name="rtsecuritymanager" long-name="Runtime Security Manager" level="server">
-<component name="rtsecuritymanagerutil" filter="s60" long-name="Runtime Security Manager Util">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
-</component>
-<component name="rtsecuritymanagerserver" filter="s60" long-name="Runtime Security Manager Server">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/>
-</component>
-<component name="rtsecuritymanagerclient" filter="s60" long-name="Runtime Security Manager Client">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/>
-</component>
-<component name="rtsecuritymanager_build" filter="s60" long-name="Runtime Security Manager Build">
-<!-- Move the export to the appropriate components, or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/group"/>
-</component>
-</collection>
-<collection name="languageinterworkingfw" long-name="Language Interworking Framework" level="framework">
-<component name="lifwservicehandler" filter="s60" long-name="Service Handler">
-<unit bldFile="mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-</block>
-<block name="serviceapi" level="specific" long-name="Service API" levels="os mw1 mw2 app">
-<!-- should break up this collection into something meaningful -->
-<collection name="serviceproviders" long-name="Service Providers" level="mw1">
-<component name="sapi_contacts_vpbk" long-name="Contacts Phonebook SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
-</component>
-<component name="sapi_location" long-name="Location SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_location/group"/>
-</component>
-<component name="sapi_mediamanagement" long-name="Media Management SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/group"/>
-</component>
-<component name="sapi_landmarks" long-name="Landmarks SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
-</component>
-<component name="sapi_messaging" long-name="Messaging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/group"/>
-</component>
-<component name="sapi_applicationmanager" long-name="Application Manager SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
-</component>
-<component name="sapi_calendar" long-name="Calendar SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_calendar/group"/>
-</component>
-<component name="sapi_logging" long-name="Logging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_logging/group"/>
-</component>
-<component name="sapi_sensor" long-name="Sensor SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sensor/group"/>
-</component>
-<component name="sapi_sysinfo" long-name="Sysinfo SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sysinfo/group"/>
-</component>
-<component name="sapi_serviceregistry" long-name="Service Registry SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
-</component>
-<component name="jsapi" long-name="Javascript API" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/jsapi/group"/>
-</component>
-<component name="serviceproviders_build" filter="s60" long-name="Service API Build">
-<!-- distribute the exports or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapi/serviceproviders/group"/>
-</component>
-</collection>
-</block>
-<block name="web" level="specific" long-name="Web" levels="plugin utils server generic specific">
-<collection name="web_pub" long-name="Web Public Interfaces" level="specific">
-<component name="browser_control_api" long-name="Browser Control API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_control_api/group"/>
-</component>
-<component name="download_mgr_client_api" long-name="Download Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_client_api/group"/>
-</component>
-<component name="download_mgr_ui_api" long-name="Download Manager UI Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_ui_api/group"/>
-</component>
-<component name="favourites_engine_api" long-name="Favourites Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/favourites_engine_api/group"/>
-</component>
-<component name="browser_plugin_api" long-name="Browser Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_plugin_api/group"/>
-</component>
-<component name="settings_api" long-name="Settings API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/settings_api/group"/>
-</component>
-</collection>
-<collection name="web_plat" long-name="Web Platform Interfaces" level="specific">
-<component name="aiw_browser_provider_api" long-name="AIW Browser Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/aiw_browser_provider_api/group"/>
-</component>
-<component name="browser_dialogs_provider_api" long-name="Browser Dialogs Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_dialogs_provider_api/group"/>
-</component>
-<component name="browser_platform_api" long-name="Browser Platform API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_platform_api/group"/>
-</component>
-<component name="cod_handler_api" long-name="COD Handler API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cod_handler_api/group"/>
-</component>
-<component name="connection_manager_api" long-name="Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/connection_manager_api/group"/>
-</component>
-<component name="cxml_library_api" long-name="cXml Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cxml_library_api/group"/>
-</component>
-<component name="download_mgr_client_api_extn" long-name="Download Manager Client API Extension" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/download_mgr_client_api_extn/group"/>
-</component>
-<component name="download_path_plugin_api" long-name="Download Path Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/download_path_plugin_api/group"/>
-</component>
-<component name="feeds_engine_api" long-name="Feeds Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/feeds_engine_api/group"/>
-</component>
-<component name="launcher_api" long-name="Launcher API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/launcher_api/group"/>
-</component>
-<component name="multipart_parser_api" long-name="Multipart Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/multipart_parser_api/group"/>
-</component>
-<component name="recent_url_store_api" long-name="Recent URL Store API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/recent_url_store_api/group"/>
-</component>
-<component name="scheme_handler_plugin_api" long-name="Scheme Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scheme_handler_plugin_api/group"/>
-</component>
-<component name="scriptable_plugin_api" long-name="Scriptable Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scriptable_plugin_api/group"/>
-</component>
-<component name="webutils_api" long-name="Web Utils API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/webutils_api/group"/>
-</component>
-<component name="widget_registry_api" long-name="Widget Registry API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/widget_registry_api/group"/>
-</component>
-<component name="xml_parser_api" long-name="XML Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/xml_parser_api/group"/>
-</component>
-<component name="stmgesturefw_api" long-name="State Machine Gesture Framework API " filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/stmgesturefw_api/group"/>
-</component>
-</collection>
-<collection name="web_info" long-name="Web Info" level="specific">
-<component name="web_build" filter="s60" long-name="Web Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/group"/>
-</component>
-</collection>
-<collection name="browserutilities" long-name="Browser Utilities" level="utils">
-<component name="browserdialogsprovider" filter="s60" long-name="Browser Dialogs Provider">
-<unit bldFile="mw/web/browserutilities/browserdialogsprovider/group"/>
-</component>
-<component name="recenturlstore" filter="s60" long-name="Recent URL Store">
-<unit bldFile="mw/web/browserutilities/recenturlstore/group"/>
-</component>
-<component name="xmlparser" filter="s60" long-name="XML Interface">
-<unit bldFile="mw/web/browserutilities/xmlparser/group"/>
-</component>
-<component name="cxmllibrary" filter="s60" long-name="XML Parser Implementation">
-<unit bldFile="mw/web/browserutilities/cxmllibrary/group"/>
-</component>
-<component name="downloadmgr" filter="s60" long-name="Download Manager">
-<unit bldFile="mw/web/browserutilities/downloadmgr/group"/>
-</component>
-<component name="connectionmanager" filter="s60" long-name="Connection Manager">
-<unit bldFile="mw/web/browserutilities/connectionmanager/group"/>
-</component>
-<component name="browsertelservice" filter="s60" long-name="Browser Telephony Service">
-<unit bldFile="mw/web/browserutilities/browsertelservice/group"/>
-</component>
-<component name="favouritesengine" filter="s60" long-name="Favourites Engine">
-<unit bldFile="mw/web/browserutilities/favouritesengine/group"/>
-</component>
-<component name="feedsengine" filter="s60" long-name="Feeds Engine">
-<unit bldFile="mw/web/browserutilities/feedsengine/group"/>
-</component>
-<component name="multipartparser" filter="s60" long-name="Multipart Parser">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
-<!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
-</component>
-<component name="schemehandler" filter="s60" long-name="Scheme Handler">
-<unit bldFile="mw/web/browserutilities/schemehandler/group"/>
-</component>
-<component name="webutils" filter="s60" long-name="Web Utils">
-<unit bldFile="mw/web/browserutilities/webutils/group"/>
-</component>
-<component name="aiwbrowserprovider" filter="s60" long-name="AIW Browser Provider" plugin="Y">
-<unit bldFile="mw/web/browserutilities/aiwbrowserprovider/group"/>
-</component>
-<component name="browserutilities_build" filter="s60" long-name="Browser Utilities Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/browserutilities/group"/>
-</component>
-</collection>
-<collection name="webengine" long-name="Web Engine" level="server">
-<component name="osswebengine" filter="s60" long-name="OSS Web Engine">
-<!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
-<unit bldFile="mw/web/webengine/osswebengine/cache/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/memorymanager/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/npscript/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group/javascriptcore"/>
-</component>
-<component name="webkitutils" filter="s60" long-name="WebKit Utils">
-<unit bldFile="mw/web/webengine/webkitutils/group"/>
-</component>
-<component name="pagescaler" filter="s60" long-name="Page Scaler">
-<unit bldFile="mw/web/webengine/pagescaler/group"/>
-</component>
-<component name="webwidgetinstaller" filter="s60" long-name="Widget Installer">
-<unit bldFile="mw/web/webengine/widgetinstaller/group"/>
-</component>
-<component name="widgetregistry" filter="s60" long-name="Widget Registry">
-<unit bldFile="mw/web/webengine/widgetregistry/group"/>
-</component>
-<component name="wmlengine" filter="s60" long-name="WML Engine">
-<unit bldFile="mw/web/webengine/wmlengine/group"/>
-</component>
-<component name="device" filter="s60" long-name="Device">
-<!-- this needs a more meaningful name -->
-<unit bldFile="mw/web/webengine/device/group"/>
-</component>
-<component name="widgetengine" filter="s60" long-name="Widget Engine">
-<unit bldFile="mw/web/webengine/widgetengine/group"/>
-</component>
-<component name="web_memoryplugin" long-name="Memory Plugin" filter="s60" plugin="Y">
-<unit bldFile="mw/web/webengine/memoryplugin/group"/>
-</component>
-<component name="widgetmemoryplugin" filter="s60" long-name="Widget Memory Plugin" plugin="Y">
-<unit bldFile="mw/web/webengine/widgetmemoryplugin/group"/>
-</component>
-<component name="widgetbackuprestore" filter="s60" long-name="Widget Backup and Restore">
-<unit bldFile="mw/web/webengine/widgetbackuprestore/group"/>
-</component>
-<component name="browserrecognizers" filter="s60" long-name="Browser Recognizers" plugin="Y">
-<unit bldFile="mw/web/webengine/browserrecognizers/group"/>
-</component>
-<component name="wrtharvester" filter="s60" long-name="Web Runtime Harvester" plugin="Y">
-<unit bldFile="mw/web/webengine/wrtharvester/group"/>
-</component>
-</collection>
-<collection name="codhandler" long-name="Content Object Descriptor Handler" level="specific">
-<component name="codeng" filter="s60" long-name="COD Engine">
-<unit bldFile="mw/web/codhandler/codeng/group"/>
-</component>
-<component name="codui" filter="s60" long-name="COD UI">
-<unit bldFile="mw/web/codhandler/codui/group"/>
-</component>
-<component name="codrecog" filter="s60" long-name="COD Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/codrecog/group"/>
-</component>
-<component name="codviewer" filter="s60" long-name="COD Viewer">
-<unit bldFile="mw/web/codhandler/codviewer/group"/>
-</component>
-<component name="ddrecog" filter="s60" long-name="Download Descriptor Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/ddrecog/group"/>
-</component>
-<component name="ddviewer" filter="s60" long-name="Download Descriptor Viewer">
-<unit bldFile="mw/web/codhandler/ddviewer/group"/>
-</component>
-<component name="coddownload" filter="s60" long-name="COD Download">
-<unit bldFile="mw/web/codhandler/coddownload/group"/>
-</component>
-<component name="roapapp" filter="s60" long-name="ROAP Application">
-<unit bldFile="mw/web/codhandler/roapapp/group"/>
-</component>
-<component name="codhandler_build" filter="s60" long-name="COD Handler Build">
-<!-- Exports need to go into another component or make this self-contained.
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/codhandler/group"/>
-</component>
-</collection>
-<collection name="widgets" long-name="Web Widget Framework" level="generic">
-<!-- the following units can be uncommented when configuration is put in place -->
-<component name="widgetrecognizer" filter="s60" long-name="Widget Recognizer" plugin="Y">
-<!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
-</component>
-<component name="widgetinstaller" filter="s60" long-name="Widget Installer UI" plugin="Y">
-<!--<unit bldFile="widgets/widgetinstaller/group"/>-->
-</component>
-<component name="widgetlauncher" filter="s60" long-name="Widget Launcher">
-<!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
-</component>
-<component name="widgetapp" filter="s60" long-name="Widget UI">
-<!--<unit bldFile="widgets/widgetapp/group"/>-->
-</component>
-<component name="widgetsidchecker" filter="s60" long-name="Widget SID Checker" introduced="^3">
-<!--<unit bldFile="widgets/widgetsidchecker/group"/>-->
-</component>
-<component name="widgetpreinstaller" filter="s60" long-name="Widget Pre-Installer">
-<!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
-</component>
-<component name="widgetstartup" filter="s60" long-name="Widget Startup">
-<!--<unit bldFile="widgets/widgetstartup/group"/>-->
-</component>
-<component name="widgets_build" filter="s60" long-name="Widgets Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/widgets/group"/>
-</component>
-</collection>
-</block>
-<block name="websrv" level="generic" long-name="Web Services" levels="plugin framework server generic specific">
-<collection name="websrv_pub" long-name="Web Services Public Interfaces" level="specific">
-<component name="web_service_description_api" long-name="Web Service Description API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_description_api/group"/>
-</component>
-<component name="web_service_connection_api" long-name="Web Service Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/group"/>
-</component>
-<component name="web_service_manager_api" long-name="Web Service Manager API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/group"/>
-</component>
-<component name="hostlet_connection_api" long-name="Hostlet Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/group"/>
-</component>
-<component name="web_service_messaging_api" long-name="Web Service Messaging API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/group"/>
-</component>
-<component name="xml_extensions_api" long-name="XML Extensions API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/group"/>
-</component>
-<component name="xml_fragment_api" long-name="XML Fragment API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/group"/>
-</component>
-</collection>
-<collection name="webservices" long-name="Web Services Framework" level="generic">
-<!-- consider breaking this collection into more meaningful subsets -->
-<component name="wsnotifierplugins" filter="s60" long-name="WS Notifier Plugins" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsnotifierplugins/group"/>
-</component>
-<component name="wslogger" filter="s60" long-name="WS Logger">
-<unit bldFile="mw/websrv/webservices/wslogger/group"/>
-</component>
-<component name="wsxml" filter="s60" long-name="WS XML Extensions">
-<unit bldFile="mw/websrv/webservices/wsxml/group"/>
-</component>
-<component name="wsutils" filter="s60" long-name="WS Utils">
-<unit bldFile="mw/websrv/webservices/wsutils/group"/>
-</component>
-<component name="wsfragment" filter="s60" long-name="WS Fragment">
-<unit bldFile="mw/websrv/webservices/wsfragment/group"/>
-</component>
-<component name="wsdescription" filter="s60" long-name="WS Service Description">
-<unit bldFile="mw/websrv/webservices/wsdescription/group"/>
-</component>
-<component name="wsconnection" filter="s60" long-name="WS Service Connection">
-<unit bldFile="mw/websrv/webservices/wsconnection/group"/>
-</component>
-<component name="wsmessages" filter="s60" long-name="WS Messages">
-<unit bldFile="mw/websrv/webservices/wsmessages/group"/>
-</component>
-<component name="wscredentialmanager" filter="s60" long-name="WS Credential Manager">
-<unit bldFile="mw/websrv/webservices/wscredentialmanager/group"/>
-</component>
-<component name="wsframework" filter="s60" long-name="WS Framework">
-<unit bldFile="mw/websrv/webservices/wsframework/group"/>
-</component>
-<component name="wshttpchanneltransportplugin" filter="s60" long-name="WS HTTP Channel Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshttpchanneltransportplugin/group"/>
-</component>
-<component name="wsconnectionagent" filter="s60" long-name="WS Connection Agent">
-<unit bldFile="mw/websrv/webservices/wsconnectionagent/group"/>
-</component>
-<component name="wsprovider" filter="s60" long-name="WS Provider">
-<unit bldFile="mw/websrv/webservices/wsprovider/group"/>
-</component>
-<component name="wshostletconnection" filter="s60" long-name="WS Hostlet Connection">
-<unit bldFile="mw/websrv/webservices/wshostletconnection/group"/>
-</component>
-<component name="wsmanager" filter="s60" long-name="WS Service Manager">
-<unit bldFile="mw/websrv/webservices/wsmanager/group"/>
-</component>
-<component name="wsidentitymanager" filter="s60" long-name="WS Identity Manager">
-<unit bldFile="mw/websrv/webservices/wsidentitymanager/group"/>
-</component>
-<component name="idwsfplugin" filter="s60" long-name="ID-WSF Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/idwsfplugin/group"/>
-</component>
-<component name="wsibasicplugin" filter="s60" long-name="WS-I Basic Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsibasicplugin/group"/>
-</component>
-<component name="wsrestplugin" filter="s60" long-name="WS REST Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsrestplugin/group"/>
-</component>
-<component name="idwsfsecuritymechanism" filter="s60" long-name="ID-WSF Security Mechanism">
-<unit bldFile="mw/websrv/webservices/idwsfsecuritymechanism/group"/>
-</component>
-<component name="wspasswordtransforms" filter="s60" long-name="WS Password Transforms">
-<unit bldFile="mw/websrv/webservices/wspasswordtransforms/group"/>
-</component>
-<component name="wscore" filter="s60" long-name="WS Core Service Manager">
-<unit bldFile="mw/websrv/webservices/wscore/group"/>
-</component>
-<component name="wslocaltransportplugin" filter="s60" long-name="WS Local Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wslocaltransportplugin/group"/>
-</component>
-<component name="wshostlettransportplugin" filter="s60" long-name="WS Hostlet Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshostlettransportplugin/group"/>
-</component>
-<component name="wsstar" filter="s60" long-name="WS Star">
-<!-- can only have one unit. Need to split into separate components or #include from a single bld.inf -->
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarpolicy/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarplugin/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarmessagehandlers/group"/>
-</component>
-<component name="wsoviplugin" filter="s60" long-name="WS Ovi Plugin">
-<unit bldFile="mw/websrv/webservices/wsoviplugin/group"/>
-</component>
-<component name="webservices_build" filter="s60" long-name="Web Services Build">
-<!-- need to split into self-contained components -->
-<unit bldFile="mw/websrv/webservices/group"/>
-</component>
-</collection>
-<collection name="websrv_info" long-name="Web Services Info" level="specific">
-<component name="websrv_bld" filter="s60" long-name="Web Services Build">
-<!-- need to include common .hrh in each unit -->
-<unit bldFile="mw/websrv/group"/>
-</component>
-</collection>
-</block>
-<block name="platformtools" level="generic" long-name="Platform Tools">
-<collection name="gfxconversion" long-name="Graphics Conversion">
-<component name="bmconv_s60" filter="s60" long-name="S60 Bitmap Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/bmconv_s60/group"/>
-</component>
-<component name="mifconv" filter="s60" long-name="Multi Icon File Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/mifconv/group"/>
-</component>
-</collection>
-</block>
-<block name="uitools" level="specific" long-name="UI Tools" levels="compile encode tool if">
-<collection name="uitools_pub" long-name="UI Tools Public Interfaces" level="if">
-<component name="third_party_bitmap_palette_api" long-name="Third Party Bitmap Palette API" filter="s60" class="api">
-<unit bldFile="mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
-</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">
-<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">
-<unit bldFile="mw/uitools/uitools_plat/layout_system_private_api/group"/>
-</component>
-</collection>
-<collection name="cdlcompilertoolkit" long-name="CDL Compiler Toolkit" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompilertoolkit_build" filter="s60" long-name="CDL Compiler Toolkit Build">
-<unit bldFile="mw/uitools/cdlcompilertoolkit/group"/>
-</component>
-</collection>
-<collection name="cdlcompiler" long-name="CDL Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompiler_build" filter="s60" long-name="CDL Compiler Build">
-<unit bldFile="mw/uitools/cdlcompiler/group"/>
-</component>
-</collection>
-<collection name="gfxtools" long-name="Graphics Tools" level="tool">
-<component name="gditools" filter="s60" long-name="GDI Tools" class="PC">
-<unit bldFile="mw/uitools/gfxtools/gditools/group"/>
-</component>
-<component name="color" filter="s60" long-name="Bitmap Colour Palette" class="PC">
-<unit bldFile="mw/uitools/gfxtools/color/group"/>
-</component>
-</collection>
-<collection name="aknlayoutcompiler" long-name="Avkon Layout Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="aknlayoutcompiler_build" filter="s60" long-name="Avkon Layout Compiler Build">
-<unit bldFile="mw/uitools/aknlayoutcompiler/group"/>
-</component>
-</collection>
-<collection name="skincompiler" long-name="Skin Compiler" level="compile">
-<component name="aknskindesccompiler" filter="s60" long-name="Avkon Skin Descriptor Compiler">
-<unit bldFile="mw/uitools/skincompiler/AknSkinDescCompiler/group"/>
-</component>
-</collection>
-<collection name="reszip" long-name="Resource Zip" level="encode">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="reszip_build" filter="s60" long-name="Resource Zip Build">
-<unit bldFile="mw/uitools/reszip/group"/>
-</component>
-</collection>
-<collection name="toollibraries" long-name="Tool Libraries" level="tool"/>
-<collection name="svgtencoder" long-name="SVGT Encoder" level="encode">
-<component name="svgtenc" filter="s60" long-name="Standalone SVGT Encoder" class="PC">
-<unit bldFile="mw/uitools/svgtencoder/svgtenc/standalone/group"/>
-</component>
-</collection>
-</block>
-</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">
-<component name="location_centre_api" long-name="Location Centre API" introduced="^3" filter="s60" class="api">
-<unit bldFile="app/location/loc_plat/location_centre_api/group"/>
-</component>
-</collection>
-<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"/>
-</component>
-<component name="landmarks_ui_addedit_api" long-name="Landmarks UI Add/Edit API" filter="s60" class="api">
-<unit bldFile="app/location/loc_pub/landmarks_ui_addedit_api/group"/>
-</component>
-</collection>
-<collection name="basiclocationinfodisplay" long-name="Basic Location Info Display" level="ui">
-<component name="blid" filter="s60" long-name="Basic Location Info Display Build">
-<unit bldFile="app/location/basiclocationinfodisplay/blid/group"/>
-</component>
-</collection>
-<collection name="landmarksui" long-name="Landmarks UI" level="loc">
-<component name="landmarksui_help" filter="s60" long-name="Landmarks UI Help">
-<unit bldFile="app/location/landmarksui/help/group"/>
-</component>
-<component name="landmarksui_engine" filter="s60" long-name="Landmarks UI Engine">
-<unit bldFile="app/location/landmarksui/engine/group"/>
-</component>
-<component name="uicontrols" filter="s60" long-name="Landmarks UI Controls">
-<unit bldFile="app/location/landmarksui/uicontrols/group"/>
-</component>
-<component name="landmarksui_commonui" filter="s60" long-name="Landmarks Common UI">
-<unit bldFile="app/location/landmarksui/commonui/group"/>
-</component>
-<component name="landmarksui_app" filter="s60" long-name="Landmarks Application">
-<unit bldFile="app/location/landmarksui/app/group"/>
-</component>
-<component name="msgviewer" filter="s60" long-name="Landmarks Message Viewer">
-<unit bldFile="app/location/landmarksui/msgviewer/group"/>
-</component>
-<component name="landmarksui_build" filter="s60" long-name="Landmarks UI Build">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="app/location/landmarksui/group"/>
-</component>
-</collection>
-<collection name="eventsui" long-name="Location Events UI" level="events">
-<component name="eventsui_help" filter="s60" long-name="Events Help">
-<unit bldFile="app/location/eventsui/help/group"/>
-</component>
-<component name="eventsutils" filter="s60" long-name="Events Utils">
-<unit bldFile="app/location/eventsui/eventsutils/group"/>
-</component>
-<component name="eventsengine" filter="s60" long-name="Events Engine">
-<unit bldFile="app/location/eventsui/eventsengine/group"/>
-</component>
-<component name="eventshandlerui" filter="s60" long-name="Events Handler UI">
-<unit bldFile="app/location/eventsui/eventshandlerui/group"/>
-</component>
-<component name="eventseditor" filter="s60" long-name="Events Editor">
-<unit bldFile="app/location/eventsui/eventseditor/group"/>
-</component>
-<component name="eventsmgmtui" filter="s60" long-name="Events Management UI">
-<unit bldFile="app/location/eventsui/eventsmgmtui/group"/>
-</component>
-<component name="eventsui_build" filter="s60" long-name="Events UI Build">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="app/location/eventsui/group"/>
-</component>
-</collection>
-<collection name="locationlandmarksrefappfors60" long-name="Location Landmarks Reference App for S60" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="lmrefapp" filter="s60" long-name="Landmarks Reference Application">
-<unit bldFile="app/location/locationlandmarksrefappfors60/group"/>
-</component>
-</collection>
-<collection name="locationlandmarksuirefapp" long-name="Location Landmarks UI Reference App" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="lmuirefapp" filter="s60" long-name="Landmarks UI Reference Application">
-<unit bldFile="app/location/locationlandmarksuirefapp/group"/>
-</component>
-</collection>
-<collection name="locationsatviewrefapp" long-name="Location Satellite View Reference App" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="satellitereference" filter="s60" long-name="Satellite Info UI Reference Application">
-<unit bldFile="app/location/locationsatviewrefapp/group"/>
-</component>
-</collection>
-<collection name="simpsyconfigurator" long-name="Simulation PSY Configurator" level="ui">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="simpsyui" filter="s60" long-name="Simulation PSY UI">
-<unit bldFile="app/location/simpsyconfigurator/group"/>
-</component>
-</collection>
-<collection name="mapnavproviderrefapp" long-name="Map and Navigation Provider Reference App" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="mapnavproviderrefapp_build" filter="s60" long-name="Map and Navigation Provider Reference Application">
-<unit bldFile="app/location/mapnavproviderrefapp/group"/>
-</component>
-</collection>
-<collection name="locationcentre" long-name="Location Centre" level="loc">
-<component name="lcutils" long-name="Location Centre Utilities" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcutils/group"/>
-</component>
-<component name="lcservice" long-name="Location Centre Service Project" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcservice/group"/>
-</component>
-<component name="lcserver" long-name="Location Centre Server Project" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcserver/group"/>
-</component>
-<component name="lcapp" long-name="Location Centre Application" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcapp/group"/>
-</component>
-<component name="locationcentre_build" filter="s60" long-name="Location Centre Build" introduced="^3">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="app/location/locationcentre/group"/>
-</component>
-</collection>
-</block>
-<block name="mmsharinguis" level="services" long-name="Multimedia Sharing UIs" levels="base plugin if">
-<collection name="mmsharinguis_plat" long-name="Multimedia Sharing UIs Platform Interfaces" level="if">
-<component name="multimedia_sharing_settings_api" long-name="Multimedia Sharing Settings API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_settings_api/group"/>
-</component>
-<component name="multimedia_sharing_resource_api" long-name="Multimedia Sharing Resource API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_resource_api/group"/>
-</component>
-<component name="multimedia_sharing_manager_api" long-name="Multimedia Sharing Manager API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/group"/>
-</component>
-</collection>
-<collection name="mmsharing" long-name="Multimedia Sharing" level="base">
-<component name="mmshavailability" filter="s60" long-name="Multimedia Sharing Availability">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshavailability/group"/>
-</component>
-<component name="mmshindicator" filter="s60" long-name="Multimedia Sharing Indicator">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshindicator/group"/>
-</component>
-<!-- consider putting client and server in the same component -->
-<component name="mmshmanagercli" filter="s60" long-name="Multimedia Sharing Manager Client">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshmanagercli/group" filter="!test"/>
-</component>
-<component name="mmshmanagersrv" filter="s60" long-name="Multimedia Sharing Manager Server">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshmanagersrv/group"/>
-</component>
-<component name="mmshengine" filter="s60" long-name="Multimedia Sharing Engine">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshengine/group"/>
-</component>
-<component name="mmshui" filter="s60" long-name="Multimedia Sharing UI">
-<!-- can only have one unit: need to #include one from the other if it's needed -->
-<unit bldFile="app/mmsharinguis/mmsharing/mmshui/group"/>
-<unit bldFile="app/mmsharinguis/mmsharing/mmshui/help/group"/>
-</component>
-<component name="mmsharing_build" filter="s60" long-name="MM Sharing Build">
-<unit bldFile="app/mmsharinguis/mmsharing/group"/>
-</component>
-</collection>
-<collection name="mmshplugins" long-name="Multimedia Sharing Plugins" level="plugin">
-<component name="mmshaoplugin" filter="s60" long-name="Multimedia Sharing Always Online Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshaoplugin/group"/>
-</component>
-<component name="mmshaiwplugin" filter="s60" long-name="Multimedia Sharing AIW Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshaiwplugin/group"/>
-</component>
-<component name="mmshsipcrplugin" filter="s60" long-name="Multimedia Sharing SIP Client Resolver Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshsipcrplugin/group"/>
-</component>
-<component name="mmshsettingsuiplugin" filter="s60" long-name="Multimedia Sharing Settings UI Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshsettingsuiplugin/group"/>
-</component>
-<component name="mmshwpadapterplugin" filter="s60" long-name="Multimedia Sharing WAP Provisioning Adapter" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshwpadapterplugin/group"/>
-</component>
-</collection>
-<collection name="mmsharinguis_info" long-name="Multimedia Sharing UIs Info" level="if">
-<component name="mmsharinguis_build" filter="s60" long-name="Multimedia Sharing UIs Build">
-<!-- consider distributing to other components -->
-<unit bldFile="app/mmsharinguis/group"/>
-</component>
-</collection>
-</block>
-<block name="phone" level="apps" span="2" long-name="Phone Apps" levels="engine plugin ui app">
-<collection name="phone_plat" long-name="Phone Apps Platform Interfaces" level="app">
-<component name="3d_ringing_tone_enabler_api" long-name="3D Ringing Tone Enabler API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
-</component>
-<component name="telephony_comms_information_api" long-name="Telephony Comms Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_comms_information_api/group"/>
-</component>
-<component name="telephony_information_api" long-name="Telephony Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_information_api/group"/>
-</component>
-<component name="telephony_device_mode_api" long-name="Telephony Device Mode API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_device_mode_api/group"/>
-</component>
-<component name="telephony_remote_party_information_api" long-name="Telephony Remote Party Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_remote_party_information_api/group"/>
-</component>
-<component name="telephony_video_mailbox_settings_api" long-name="Telephony Video Mailbox Settings API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_video_mailbox_settings_api/group"/>
-</component>
-<component name="telephony_configuration_api" long-name="Telephony Configuration API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_configuration_api/group"/>
-</component>
-<component name="telephony_microphone_mute_status_api" long-name="Telephony Microphone Mute Status API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_microphone_mute_status_api/group"/>
-</component>
-<component name="dialer_keypad_api" long-name="Dialer Keypad API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/dialer_keypad_api/group"/>
-</component>
-<component name="telephony_logging_extension_api" long-name="Telephony Logging Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_logging_extension_api/group"/>
-</component>
-<component name="telephony_matching_extension_api" long-name="Telephony Matching Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_matching_extension_api/group"/>
-</component>
-<component name="telephony_bubble_extension_api" long-name="Telephony Bubble Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_bubble_extension_api/group"/>
-</component>
-<component name="telephony_menu_extension_api" long-name="Telephony Menu Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_menu_extension_api/group"/>
-</component>
-<component name="phone_application_commands_api" long-name="Phone Application Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_commands_api/group"/>
-</component>
-<component name="phone_application_voip_commands_api" long-name="Phone Application VOIP Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_voip_commands_api/group"/>
-</component>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_mediator_api/group"/>
-</component>
-<component name="video_telephony_mediator_api" long-name="Video Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/video_telephony_mediator_api/group"/>
-</component>
-</collection>
-<collection name="phoneapp" long-name="Phone Application" level="app">
-<component name="blacklist" filter="s60" long-name="Phone Blacklist Clearing" plugin="Y">
-<unit bldFile="app/phone/phoneapp/blacklist/group"/>
-</component>
-<component name="phoneui" filter="s60" long-name="Phone UI">
-<unit bldFile="app/phone/phoneapp/phoneui/group" filter="!test"/>
-</component>
-<component name="phoneuicontrol" filter="s60" long-name="Phone UI Control">
-<unit bldFile="app/phone/phoneapp/phoneuicontrol/group"/>
-</component>
-<component name="phoneuistates" filter="s60" long-name="Phone UI States">
-<unit bldFile="app/phone/phoneapp/phoneuistates/group"/>
-</component>
-<component name="phoneuiutils" filter="s60" long-name="Phone UI Utils">
-<unit bldFile="app/phone/phoneapp/phoneuiutils/group"/>
-</component>
-<component name="phoneuiview" filter="s60" long-name="Phone UI View">
-<unit bldFile="app/phone/phoneapp/phoneuiview/group"/>
-</component>
-<component name="phoneuivoipextension" filter="s60" long-name="Phone UI VOIP Extension">
-<unit bldFile="app/phone/phoneapp/phoneuivoipextension/group"/>
-</component>
-<component name="silenceactionplugin" filter="s60" long-name="Silence Action Plugin" plugin="Y">
-<unit bldFile="app/phone/phoneapp/silenceactionplugin/group"/>
-</component>
-<component name="phonemediatorcenter" filter="s60" long-name="Phone Mediator Center">
-<unit bldFile="app/phone/phoneapp/phonemediatorcenter/group"/>
-</component>
-</collection>
-<collection name="phoneengine" long-name="Phone Engine" level="engine">
-<component name="phonecntfinder" filter="s60" long-name="Phone Contact Finder">
-<unit bldFile="app/phone/phoneengine/phonecntfinder/group"/>
-</component>
-<component name="audiohandling" filter="s60" long-name="Phone Audio Handling">
-<unit bldFile="app/phone/phoneengine/audiohandling/group"/>
-</component>
-<component name="callhandling" filter="s60" long-name="Call Handling">
-<unit bldFile="app/phone/phoneengine/callhandling/group"/>
-</component>
-<component name="contacthandling" filter="s60" long-name="Phone Contact Handling">
-<unit bldFile="app/phone/phoneengine/contacthandling/group"/>
-</component>
-<component name="loghandling" filter="s60" long-name="Phone Log Handling">
-<unit bldFile="app/phone/phoneengine/loghandling/group"/>
-</component>
-<component name="engineinfo" filter="s60" long-name="Phone Engine Info">
-<unit bldFile="app/phone/phoneengine/engineinfo/group"/>
-</component>
-<component name="phonemodel" filter="s60" long-name="Phone Model">
-<unit bldFile="app/phone/phoneengine/phonemodel/group"/>
-</component>
-<component name="servicehandling" filter="s60" long-name="Phone Service Handling">
-<unit bldFile="app/phone/phoneengine/servicehandling/group"/>
-</component>
-</collection>
-<collection name="phonesettings" long-name="Phone Settings" level="plugin">
-<component name="aiwcallimageplugin" filter="s60" long-name="Call Image AIW Plugin" plugin="Y">
-<unit bldFile="app/phone/phonesettings/aiwcallimageplugin/group"/>
-</component>
-<component name="pslncallimageplugin" filter="s60" long-name="Call Image Personalization Plugin" plugin="Y">
-<unit bldFile="app/phone/phonesettings/pslncallimageplugin/group"/>
-</component>
-</collection>
-<collection name="phoneuis" long-name="Phone UIs" level="ui">
-<component name="dialer" filter="s60" long-name="Dialer">
-<unit bldFile="app/phone/phoneuis/dialer/group" filter="!test"/>
-</component>
-<component name="easydialing" filter="s60" long-name="Easy Dialing Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/phone/phoneuis/easydialing/group"/>
-</component>
-<component name="bubblemanager" filter="s60" long-name="Phone Bubble Manager">
-<unit bldFile="app/phone/phoneuis/bubblemanager/group"/>
-</component>
-<component name="connectutil" filter="s60" long-name="Connection Utility" plugin="Y">
-<unit bldFile="app/phone/phoneuis/connectutil/group"/>
-</component>
-<component name="ussd" filter="s60" long-name="Unstructured Supplementary Services Data">
-<unit bldFile="app/phone/phoneuis/ussd/group"/>
-</component>
-<component name="vmbx" filter="s60" long-name="Voice Mailbox">
-<unit bldFile="app/phone/phoneuis/vmbx/group"/>
-</component>
-<component name="telephonydevicemode" filter="s60" long-name="Telephony Device Mode">
-<unit bldFile="app/phone/phoneuis/telephonydevicemode/group"/>
-</component>
-</collection>
-<collection name="phoneplugins" long-name="Phone Plugins" level="plugin">
-<component name="telbranding" filter="s60" long-name="Tel Branding" introduced="^2" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/telbranding/group"/>
-</component>
-</collection>
-</block>
-<block name="videotelephony" level="apps" long-name="Video Telephony Apps" levels="engine plugin prot ui">
-<collection name="videotelephony_plat" long-name="VT Apps Platform Interfaces" level="ui">
-<component name="video_telephony_control_mediator_api" long-name="Video Telephony Control Mediator API" filter="s60" class="api">
-<unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_control_mediator_api/group"/>
-</component>
-<component name="video_telephony_media_configuration_api" long-name="Video Telephony Media Configuration API" filter="s60" class="api">
-<unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_media_configuration_api/group"/>
-</component>
-</collection>
-<collection name="vtengines" long-name="Video Telephony Engines" level="engine">
-<component name="videoteleng" filter="s60" long-name="Video Telephony Engine">
-<unit bldFile="app/videotelephony/vtengines/videoteleng/Group"/>
-</component>
-<component name="vtmediatorplugin" filter="s60" long-name="VT Mediator Plugin" plugin="Y">
-<unit bldFile="app/videotelephony/vtengines/vtmediatorplugin/group"/>
-</component>
-</collection>
-<collection name="vtuis" long-name="Video Telephony UIs" level="ui">
-<component name="videotelui" filter="s60" long-name="Video Telephony UI">
-<unit bldFile="app/videotelephony/vtuis/videotelui/group"/>
-</component>
-</collection>
-<collection name="vtprotocolplugins" long-name="VT Protocol Plugins" level="plugin">
-<component name="displaysink" filter="s60" long-name="Display Sink" introduced="^2">
-<unit bldFile="app/videotelephony/vtprotocolplugins/DisplaySink/group"/>
-</component>
-<component name="videosource" filter="s60" long-name="Video Source" introduced="^2">
-<unit bldFile="app/videotelephony/vtprotocolplugins/VideoSource/group"/>
-</component>
-</collection>
-<collection name="vtprotocolsstub" long-name="VT Protocols Stub" level="prot">
-<!-- this collection is really a component, move down a directory -->
-<component name="videotelproto" filter="s60" long-name="Video Telephony Protocol">
-<unit bldFile="app/videotelephony/vtprotocolsstub/group" filter="sf_build"/>
-</component>
-</collection>
-</block>
-<block name="iptelephony" level="apps" long-name="IP Telephony" levels="eng plugin util ui">
-<collection name="iptel_plat" long-name="IP Telephony Platform Interfaces" level="ui">
-<component name="richcallsettingsengine_api" long-name="Rich Call Settings Engine API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/richcallsettingsengine_api/group"/>
-</component>
-<component name="cch_client_api" long-name="CCH Client API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/cch_client_api/group"/>
-</component>
-<component name="cch_server_api" long-name="CCH Server API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/cch_server_api/group"/>
-</component>
-<component name="csc_settingsui_api" long-name="CSC Settings UI API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/csc_settingsui_api/group"/>
-</component>
-<component name="vccpropertyhandler_api" long-name="VCC Property Handler API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/vccpropertyhandler_api/group"/>
-</component>
-<component name="vcc_api" long-name="VCC API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/vcc_api/group"/>
-</component>
-</collection>
-<collection name="iptelcommsconfig" long-name="IP Telephony Comms Config" level="ui">
-<component name="cscgsplugin" filter="s60" long-name="CSC GS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/commsconfig/cscgsplugin/group"/>
-</component>
-<component name="cscsipvoipcleanupplugin" filter="s60" long-name="CSC SIP VoIP Cleanup Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/commsconfig/cscsipvoipcleanupplugin/group"/>
-</component>
-<component name="cscengine" filter="s60" long-name="Connection Service Configurator Engine" introduced="^2">
-<unit bldFile="app/iptelephony/commsconfig/cscengine/group"/>
-</component>
-<component name="cscsettingsui" filter="s60" long-name="CSC Settings UI" introduced="^2">
-<unit bldFile="app/iptelephony/commsconfig/cscsettingsui/group"/>
-</component>
-<component name="cscapplicationui" filter="s60" long-name="CSC Application UI" introduced="^2">
-<unit bldFile="app/iptelephony/commsconfig/cscapplicationui/group"/>
-</component>
-<component name="commsconfig_build" filter="s60" long-name="Comms Config Build" introduced="^2">
-<!-- consider distributing this into the above components -->
-<unit bldFile="app/iptelephony/commsconfig/group"/>
-</component>
-</collection>
-<collection name="convergedconnectionhandler" long-name="Converged Connection Handler" level="eng">
-<component name="cchserver" filter="s60" long-name="CCH Server" introduced="^2">
-<unit bldFile="app/iptelephony/convergedconnectionhandler/cchserver/group"/>
-</component>
-<component name="cchclient" filter="s60" long-name="CCH Client" introduced="^2">
-<unit bldFile="app/iptelephony/convergedconnectionhandler/cchclient/group"/>
-</component>
-<component name="cchclientapi" filter="s60" long-name="CCH Client API" introduced="^2">
-<unit bldFile="app/iptelephony/convergedconnectionhandler/cchclientapi/group"/>
-</component>
-<component name="convergedconnectionhandler_build" filter="s60" long-name="CCH Build" introduced="^2">
-<!-- consider distributing this into the above components, or collapse the collection into a single component.
- The latter is a better option since clients and sevrers are rarely separate components -->
-<unit bldFile="app/iptelephony/convergedconnectionhandler/group"/>
-</component>
-</collection>
-<collection name="richcallsettingsengine" long-name="Rich Call Settings Engine" level="eng">
-<component name="rcse2" filter="s60" long-name="Rich Call Settings Engine Build" introduced="^2">
-<unit bldFile="app/iptelephony/richcallsettingsengine/rcse2/group"/>
-</component>
-</collection>
-<collection name="sipvoipprovider" long-name="SIP VoIP Provider" level="plugin">
-<!-- collection is really a component. Should move down a directory -->
-<component name="svp" filter="s60" long-name="SIP VoIP Provider Build" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/sipvoipprovider/group"/>
-</component>
-</collection>
-<collection name="voipplugins" long-name="VoIP Plugins" level="plugin">
-<component name="sipmxresolver" filter="s60" long-name="SIP MX Resolver" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/sipmxresolver/group"/>
-</component>
-<component name="sipconnectionprovider" filter="s60" long-name="SIP Connection Provider" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/sipconnectionprovider/group"/>
-<!-- can only have one unit, can the next be #'included from the above? -->
-<unit bldFile="app/iptelephony/voipplugins/sipconnectionprovider/ipvoicemailengine/group"/>
-</component>
-<component name="ipapputils" filter="s60" long-name="IP App Utils" introduced="^2">
-<unit bldFile="app/iptelephony/voipplugins/ipapputils/group"/>
-</component>
-<component name="voipadapters" filter="s60" long-name="VoIP Adapters" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/voipadapters/group"/>
-</component>
-<component name="accountcreationplugin" filter="s60" long-name="Account Creation Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/accountcreationplugin/group"/>
-</component>
-<component name="dhcppositionprovider" filter="s60" long-name="DHCP Position Provider" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/dhcppositionprovider/group"/>
-</component>
-<component name="svtmatching" filter="s60" long-name="SIP VoIP Telephony Matching" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/svtmatching/group"/>
-</component>
-<component name="svtlogging" filter="s60" long-name="SVT Logging" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/svtlogging/group"/>
-</component>
-<component name="svtcallmenu" filter="s60" long-name="SVT Call Menu" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/svtcallmenu/group"/>
-</component>
-<component name="sipimresolver" filter="s60" long-name="SIP IM Resolver" introduced="^3" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/sipimresolver/group"/>
-</component>
-</collection>
-<collection name="callcontinuity" long-name="Call Continuity" level="util">
-<component name="vccutils" filter="s60" long-name="VCC Utils" introduced="^2">
-<unit bldFile="app/iptelephony/callcontinuity/vccutils/group"/>
-</component>
-<component name="nsmldmvccadapter" filter="s60" long-name="SyncML DM VCC Adapter" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/callcontinuity/nsmldmvccadapter/group"/>
-</component>
-<component name="vccclientprovisioningadapter" filter="s60" long-name="VCC Client Provisioning Adapter" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/callcontinuity/vccclientprovisioningadapter/group"/>
-</component>
-<component name="vccpropertyhandler" filter="s60" long-name="VCC Property Handler" introduced="^2">
-<unit bldFile="app/iptelephony/callcontinuity/vccpropertyhandler/group"/>
-</component>
-<component name="vcchotrigger" filter="s60" long-name="VCC HO Trigger" introduced="^2">
-<unit bldFile="app/iptelephony/callcontinuity/vcchotrigger/group"/>
-</component>
-<component name="vcc" filter="s60" long-name="VoIP Call Continuity" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/callcontinuity/vcc/group"/>
-</component>
-<component name="callcontinuity_build" filter="s60" long-name="Call Continuity Build" introduced="^2">
-<!-- consider distributing this into the above components -->
-<unit bldFile="app/iptelephony/callcontinuity/group"/>
-</component>
-</collection>
-</block>
-<block name="settingsuis" level="services" long-name="Settings UIs" levels="rsc ui">
-<collection name="devmngt_plat" long-name="Settings UIs Platform Interfaces" level="ui">
-<component name="default_app_client_api" long-name="Default App Client API" introduced="^1" filter="s60" class="api">
-<unit bldFile="app/settingsuis/devmngt_plat/default_app_client_api/group"/>
-</component>
-<component name="services_db_api" long-name="Services DB API" introduced="^1" filter="s60" class="api">
-<unit bldFile="app/settingsuis/devmngt_plat/services_db_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="defaultapplicationsettings" long-name="Default Application Settings" level="rsc">
-<component name="services_db" filter="s60" long-name="Services Database" introduced="^1">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/services_db/group"/>
-</component>
-<component name="defaultapplicationsettings_server" filter="s60" long-name="Default Application Server" introduced="^1">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/server/group"/>
-</component>
-<component name="service" filter="s60" long-name="Default Application Service" introduced="^1">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/service/group"/>
-</component>
-<component name="dasgsplugin" filter="s60" long-name="Default Application Settings GS Plugin" introduced="^1" plugin="Y">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/gsplugin/group"/>
-</component>
-<component name="defaultapplicationsettings_build" filter="s60" long-name="Default Application Settings Build" introduced="^1">
-<!-- split the IBYs up into the appropriate components? Make this a ROM component? -->
-<unit bldFile="app/settingsuis/defaultapplicationsettings/group"/>
-</component>
-</collection>
-<collection name="systemswuis" long-name="System SW UIs" level="ui">
-<component name="touchscreencalib" filter="s60" long-name="Touchscreen Calibration" introduced="^1">
-<unit bldFile="app/settingsuis/systemswuis/touchscreencalib/group"/>
-</component>
-</collection>
-</block>
-<block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin app">
-<collection name="contentctrl_plat" long-name="Content Control Daemons Platforn Interfaces" level="app">
-<component name="oma_ds_presync_plugin_api" long-name="OMA DS PreSync Plugin API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/oma_ds_presync_plugin_api/group"/>
-</component>
-<component name="ds_agenda_handler_plugin_api" long-name="DS Agenda Handler Plugin API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_agenda_handler_plugin_api/group"/>
-</component>
-<component name="ds_folder_util_api" long-name="DS Folder Util API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_folder_util_api/group"/>
-</component>
-</collection>
-<collection name="dsdcmoadapter" long-name="Data Sync DCMO Adapter" level="plugin">
-<!-- Component at wrong rank, should move down a directory -->
-<component name="dsdcmoadapter_build" filter="s60" long-name="Data Sync Control DCMO Adapter">
-<unit bldFile="app/contentcontrol/dsdcmoadapter/group"/>
-</component>
-</collection>
-<collection name="omads" long-name="OMA Data Sync" level="app">
-<component name="omadsappui" filter="s60" long-name="OMA DS Application UI">
-<unit bldFile="app/contentcontrol/omads/omadsappui/group"/>
-</component>
-<component name="omadsextensions" filter="s60" long-name="OMA DS Extensions" plugin="Y">
-<unit bldFile="app/contentcontrol/omads/omadsextensions/group"/>
-</component>
-</collection>
-</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">
-<unit bldFile="app/devicecontrol/devicediagnostics/devdiagapp/group"/>
-</component>
-<component name="devdiaggsplugin" filter="s60" long-name="Device Diagnostics GS Plugin" plugin="Y">
-<unit bldFile="app/devicecontrol/devicediagnostics/devdiaggsplugin/group"/>
-</component>
-<component name="diagplugins" filter="s60" long-name="Diagnostics Plugins" plugin="Y">
-<unit bldFile="app/devicecontrol/devicediagnostics/diagplugins/group"/>
-</component>
-<component name="diagsuites" filter="s60" long-name="Diagnostics Suites" plugin="Y">
-<unit bldFile="app/devicecontrol/devicediagnostics/diagsuites/group"/>
-</component>
-<component name="devicediagnostics_build" filter="s60" long-name="Device Diagnostics Build">
-<!-- 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">
-<unit bldFile="app/devicecontrol/omadm/omadmappui/group"/>
-</component>
-<component name="omadmextensions" filter="s60" long-name="OMA DM Extensions" 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">
-<unit bldFile="app/devicecontrol/omadm/dcmo/group"/>
-</component>
-</collection>
-<collection name="pnpmobileservices" long-name="PnP Mobile Services" level="mid">
-<component name="pnpms" filter="s60" long-name="PnP MS">
-<unit bldFile="app/devicecontrol/pnpmobileservices/pnpms/group"/>
-</component>
-</collection>
-<collection name="applicationmanagement" long-name="Application Management" level="app">
-<!-- could this collection be collapsed into a single component and moved down a dir? Do all these need to be noted separately? -->
-<component name="applicationmanagement_options" filter="s60" long-name="AM Install Options">
-<unit bldFile="app/devicecontrol/applicationmanagement/options/group"/>
-</component>
-<component name="applicationmanagement_client" filter="s60" long-name="AM Client">
-<unit bldFile="app/devicecontrol/applicationmanagement/client/group"/>
-</component>
-<component name="applicationmanagement_server" filter="s60" long-name="AM Server">
-<unit bldFile="app/devicecontrol/applicationmanagement/server/group"/>
-</component>
-<component name="rfsplugin" filter="s60" long-name="AM RFS Plugin" plugin="Y">
-<unit bldFile="app/devicecontrol/applicationmanagement/rfsplugin/group"/>
-</component>
-<component name="amadapter2" filter="s60" long-name="AM Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/applicationmanagement/amadapter2/group"/>
-</component>
-<component name="omascomoadapter" filter="s60" long-name="OMA SCOMO Adapter" introduced="^3" plugin="Y">
-<unit bldFile="app/devicecontrol/applicationmanagement/omascomoadapter/group"/>
-</component>
-<component name="applicationmanagement_build" filter="s60" long-name="AM Build">
-<!-- If thes aren't collapsed into one cmp, can all #includes removed from here, and it renamed AM ROM? -->
-<unit bldFile="app/devicecontrol/applicationmanagement/group"/>
-</component>
-</collection>
-<collection name="customization" long-name="DM Customization Adapters" level="mid">
-<component name="dmutils" long-name="DM Utils" filter="s60">
-<unit bldFile="app/devicecontrol/customization/dmutils/bld"/>
-</component>
-<component name="uisettingssrv" filter="s60" long-name="UI Settings Server">
-<unit bldFile="app/devicecontrol/customization/uisettingssrv/bld"/>
-</component>
-<component name="isadapter" filter="s60" long-name="Idle State Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/isadapter/bld"/>
-</component>
-<component name="supadapter" filter="s60" long-name="Startup Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/supadapter/bld"/>
-</component>
-<component name="wallpaperadapter" filter="s60" long-name="Wallpaper Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/wallpaperadapter/bld"/>
-</component>
-<component name="operatorlogoadapter" filter="s60" long-name="Operator Logo Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/operatorlogoadapter/bld"/>
-</component>
-<component name="screensaveradapter" filter="s60" long-name="Screen Saver Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/screensaveradapter/bld"/>
-</component>
-<component name="themesadapter" filter="s60" long-name="Themes Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/themesadapter/bld"/>
-</component>
-<component name="embeddedlinkadapter" filter="s60" long-name="Embedded Link Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/embeddedlinkadapter/bld"/>
-</component>
-<component name="customization_build" filter="s60" long-name="DM Customization Build">
-<!-- If thes aren't collapsed into one cmp, can all #includes removed from here, and it renamed DM Customization ROM? -->
-<unit bldFile="app/devicecontrol/customization/group"/>
-</component>
-</collection>
-<collection name="omacp" long-name="OMA Content Provisioning" level="oma">
-<component name="omacpadapters" filter="s60" long-name="OMA CP Adapters" plugin="Y">
-<unit bldFile="app/devicecontrol/omacp/omacpadapters/group"/>
-</component>
-</collection>
-</block>
-<block name="printing" level="services" long-name="Printing" levels="app">
-<collection name="imageprint" long-name="ImagePrint" level="app">
-<component name="clog" filter="s60" long-name="ImagePrint Logging" introduced="^2">
-<unit bldFile="app/printing/imageprint/clog/group"/>
-</component>
-<component name="imageprintengine" filter="s60" long-name="ImagePrint Engine" introduced="^2">
-<unit bldFile="app/printing/imageprint/imageprintengine/group"/>
-</component>
-<component name="imageprintui" filter="s60" long-name="ImagePrint UI" introduced="^2">
-<unit bldFile="app/printing/imageprint/imageprintui/group"/>
-</component>
-<component name="imageprint_build" filter="s60" long-name="ImagePrint Build" introduced="^2">
-<!-- Need to break the IBY includes into the other components, or remove #includes and make this a ROM component -->
-<unit bldFile="app/printing/imageprint/group"/>
-</component>
-</collection>
-</block>
-<block name="files" level="apps" long-name="File Manager Apps" levels="support apps">
-<collection name="files_plat" long-name="File Manager Apps Platform Interfaces" level="apps">
-<component name="memory_scan_popup_ui_api" long-name="Memory Scan Popup UI API" filter="s60" class="api">
-<unit bldFile="app/files/files_plat/memory_scan_popup_ui_api/group"/>
-</component>
-</collection>
-<collection name="deviceencryption" long-name="Device Encryption" level="support">
-<!-- this is either needs to be broken up into idependent bld.infs, or it's really a component and should move down a directory -->
-<component name="devencnotifplugin" filter="s60" long-name="Device Encryption Notifier Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/files/deviceencryption/devencnotifplugin/group"/>
-</component>
-<component name="devencui" filter="s60" long-name="Device Encryption UI" introduced="^3">
-<unit bldFile="app/files/deviceencryption/devencui/group"/>
-</component>
-<component name="devencdmadapter" filter="s60" long-name="Device Encryption DM Adapter" introduced="^3" plugin="Y">
-<unit bldFile="app/files/deviceencryption/devencdmadapter/group"/>
-</component>
-<component name="devencgsplugin" filter="s60" long-name="Device Encryption GS Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/files/deviceencryption/devencgsplugin/group"/>
-</component>
-<component name="deviceencryption_help" filter="s60" long-name="Device Encryption Help" introduced="^3">
-<unit bldFile="app/files/deviceencryption/help/group"/>
-</component>
-<component name="deviceencryption_build" filter="s60" long-name="Device Encryption Build" introduced="^3">
-<unit bldFile="app/files/deviceencryption/group"/>
-</component>
-</collection>
-<collection name="filemanager" long-name="File Manager" level="apps">
-<!-- this is really a component, should move down a directory -->
-<component name="filemanager_build" filter="s60" long-name="File Manager Build">
-<unit bldFile="app/files/filemanager/group"/>
-</component>
-</collection>
-<collection name="filesystemuis" long-name="File System UIs" level="support">
-<component name="memscaneng" filter="s60" long-name="Memory Scan Server">
-<unit bldFile="app/files/filesystemuis/memscaneng/group"/>
-</component>
-<component name="memstatepopup" filter="s60" long-name="Memory State Popup">
-<unit bldFile="app/files/filesystemuis/memstatepopup/group"/>
-</component>
-</collection>
-</block>
-<block name="utils" level="apps" long-name="Utility Apps" levels="app">
-<collection name="extras" long-name="Extras" level="app">
-<component name="about" filter="s60" long-name="About Application">
-<unit bldFile="app/utils/extras/about/group"/>
-</component>
-<component name="calcsoft" filter="s60" long-name="Calculator Application">
-<unit bldFile="app/utils/extras/calcsoft/group"/>
-</component>
-<component name="converter" filter="s60" long-name="Unit Converter">
-<unit bldFile="app/utils/extras/converter/group"/>
-</component>
-</collection>
-</block>
-<block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
-<collection name="contacts_pub" long-name="Contacts Apps Public Interfaces" level="ui">
-<component name="phonebook_fetch_ui_api" long-name="Phonebook Fetch UI API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_fetch_ui_api/group"/>
-</component>
-<component name="phonebook_data_management_api" long-name="Phonebook Data Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_data_management_api/group"/>
-</component>
-<component name="phonebook_vcard_importexport_api" long-name="Phonebook vCard Import/Export API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_vcard_importexport_api/group"/>
-</component>
-<component name="phonebook_data_addedit_ui_api" long-name="Phonebook Data Add/Edit UI API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_data_addedit_ui_api/group"/>
-</component>
-<component name="phonebook_ui_utilities_api" long-name="Phonebook UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_ui_utilities_api/group"/>
-</component>
-<component name="phonebook_thumbnail_operation_api" long-name="Phonebook Thumbnail Operation API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_thumbnail_operation_api/group"/>
-</component>
-<component name="speed_dial_utility_control_api" long-name="Speed Dial Utility Control API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/speed_dial_utility_control_api/group"/>
-</component>
-</collection>
-<collection name="contacts_plat" long-name="Contacts Apps Platform Interfaces" level="ui">
-<component name="virtual_phonebook_store_api" long-name="Virtual Phonebook Store API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_store_api/group"/>
-</component>
-<component name="virtual_phonebook_sim_services_api" long-name="Virtual Phonebook SIM Services API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_sim_services_api/group"/>
-</component>
-<component name="virtual_phonebook_configuration_api" long-name="Virtual Phonebook Configuration API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_configuration_api/group"/>
-</component>
-<component name="virtual_phonebook_copy_policy_api" long-name="Virtual Phonebook Copy Policy API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_copy_policy_api/group"/>
-</component>
-<component name="virtual_phonebook_policy_api" long-name="Virtual Phonebook Policy API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_policy_api/group"/>
-</component>
-<component name="virtual_phonebook_engine_api" long-name="Virtual Phonebook Engine API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_engine_api/group"/>
-</component>
-<component name="virtual_phonebook_migration_support_api" long-name="Virtual Phonebook Migration Support API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_migration_support_api/group"/>
-</component>
-<component name="virtual_phonebook_view_definition_api" long-name="Virtual Phonebook View Definition API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_view_definition_api/group"/>
-</component>
-<component name="virtual_phonebook_vcard_api" long-name="Virtual Phonebook vCard API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_vcard_api/group"/>
-</component>
-<component name="cms_contactor_api" long-name="CMS Contactor API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/cms_contactor_api/group"/>
-</component>
-<component name="contactpresence_api" long-name="Contact Presence API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/contactpresence_api/group"/>
-</component>
-<component name="presence_cache_api" long-name="Presence Cache API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/presence_cache_api/group"/>
-</component>
-<component name="phonebook_internal_common_api" long-name="Phonebook Internal Common API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_common_api/group"/>
-</component>
-<component name="phonebook_internal_appfw_api" long-name="Phonebook Internal App Framework API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_appfw_api/group"/>
-</component>
-<component name="phonebook_internal_data_management_api" long-name="Phonebook Internal Data Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_data_management_api/group"/>
-</component>
-<component name="phonebook_2_xsp_extension_manager_api" long-name="Phonebook 2 xSP Extension Manager API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_xsp_extension_manager_api/group"/>
-</component>
-<component name="phonebook_ui_controls_api" long-name="Phonebook UI Controls API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_ui_controls_api/group"/>
-</component>
-<component name="phonebook_2_image_management_api" long-name="Phonebook 2 Image Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_image_management_api/group"/>
-</component>
-<component name="phonebook_extension_api" long-name="Phonebook Extension API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_extension_api/group"/>
-</component>
-<component name="phonebook_public_constants_api" long-name="Phonebook Public Constants API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_public_constants_api/group"/>
-</component>
-<component name="phonebook_internal_ui_utilities_api" long-name="Phonebook Internal UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_ui_utilities_api/group"/>
-</component>
-<component name="logs_engine_api_extensions" long-name="Logs Engine API Extensions" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/logs_engine_api_extensions/group"/>
-</component>
-<component name="phonebook_thumbnails_api" long-name="Phonebook Thumbnails API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_thumbnails_api/group"/>
-</component>
-<component name="phonebook_2_icon_api" long-name="Phonebook 2 Icon API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_icon_api/group"/>
-</component>
-<component name="phonebook_engine_extension_api" long-name="Phonebook Engine Extension API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_engine_extension_api/group"/>
-</component>
-<component name="phonebook_2_store_configuration_management_api" long-name="Phonebook 2 Store Configuration Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_store_configuration_management_api/group"/>
-</component>
-<component name="logs_ui_command_line_api" long-name="Logs UI Command Line API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/logs_ui_command_line_api/group"/>
-</component>
-<component name="speed_dial_dialogs_api" long-name="Speed Dial Dialogs API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/speed_dial_dialogs_api/group"/>
-</component>
-<component name="phonebook_2_xsp_view_activation_api" long-name="Phonebook 2 xSP View Activation API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_xsp_view_activation_api/group"/>
-</component>
-<component name="logs_timers_api" long-name="Logs Timers API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/logs_timers_api/group"/>
-</component>
-<component name="phonebook_2_ui_extension_definition_api" long-name="Phonebook 2 UI Extension Definition API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_definition_api/group"/>
-</component>
-<component name="phonebook_2_common_ui_api" long-name="Phonebook 2 Common UI API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_common_ui_api/group"/>
-</component>
-<component name="phonebook_2_ui_extension_api" long-name="Phonebook 2 UI Extension API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_api/group"/>
-</component>
-<component name="phonebook_2_store_property_api" long-name="Phonebook 2 Store Property API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_store_property_api/group"/>
-</component>
-<component name="phonebook_2_ui_extension_plugin_api" long-name="Phonebook 2 UI Extension Plug-In API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_plugin_api/group"/>
-</component>
-<component name="phonebook_2_ui_controls_api" long-name="Phonebook 2 UI Controls API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_controls_api/group"/>
-</component>
-<component name="phonebook_2_thin_ui_extension_plugin_api" long-name="Phonebook 2 Thin UI Extension Plugin API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_thin_ui_extension_plugin_api/group"/>
-</component>
-<component name="phonebook_2_commands_api" long-name="Phonebook 2 Commands API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_commands_api/group"/>
-</component>
-<component name="phonebook_2_presentation_api" long-name="Phonebook 2 Presentation API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_presentation_api/group"/>
-</component>
-<component name="phonebook_2_ui_utilities_api" long-name="Phonebook 2 UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_utilities_api/group"/>
-</component>
-<component name="cca_launch_api" long-name="CCA Launch API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/cca_launch_api/group"/>
-</component>
-<component name="cca_view_plugin_api" long-name="CCA View Plugin API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/cca_view_plugin_api/group"/>
-</component>
-<component name="predictivesearch_client_api" long-name="Predictive Search Client API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_client_api/group"/>
-</component>
-<component name="predictivesearch_utils_api" long-name="Predictive Search Utils API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_utils_api/group"/>
-</component>
-<component name="predictivesearch_adapters_api" long-name="Predictive Search Adapters API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_adapters_api/group"/>
-</component>
-<component name="predictivesearch_algorithm_api" long-name="Predictive Search Algorithm API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_algorithm_api/group"/>
-</component>
-<component name="phonebook_2_rcl_api" long-name="Phonebook 2 RCL API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_rcl_api/group"/>
-</component>
-</collection>
-<collection name="contactextensions" long-name="Contacts Extensions" level="services">
-<component name="predefinedcontacts" filter="s60" long-name="Predefined Contacts">
-<unit bldFile="app/contacts/contactextensions/predefinedcontacts/group"/>
-</component>
-</collection>
-<collection name="logsui" long-name="Logs UI" level="ui">
-<component name="logsui_build" filter="s60" long-name="Logs UI Build">
-<!-- component at too high a rank, should move down one directory -->
-<unit bldFile="app/contacts/logsui/group"/>
-</component>
-</collection>
-<collection name="phonebookui" long-name="Phonebook UI" level="ui">
-<component name="phonebook" filter="s60" long-name="Phonebook">
-<unit bldFile="app/contacts/phonebookui/phonebook/group"/>
-</component>
-<component name="speeddial" filter="s60" long-name="Speed Dial">
-<unit bldFile="app/contacts/phonebookui/speeddial/group"/>
-</component>
-<component name="phonebook2" filter="s60" long-name="Phone Book 2">
-<unit bldFile="app/contacts/phonebookui/phonebook2/group"/>
-</component>
-</collection>
-<collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
-<component name="cntfindplugin" filter="s60" long-name="Contacts Find Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntfindplugin/group"/>
-</component>
-<component name="cntsortplugin" filter="s60" long-name="Contacts Sort Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntsortplugin/group"/>
-</component>
-<component name="virtualphonebook" filter="s60" long-name="Virtual Phonebook" introduced="^2">
-<unit bldFile="app/contacts/phonebookengines/virtualphonebook/group"/>
-</component>
-<component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
-<unit bldFile="app/contacts/phonebookengines/contactsmodel/groupsql" mrp="app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
-</component>
-</collection>
-<collection name="pimprotocols" long-name="PIM Protocols" level="services">
-<component name="phonebooksync" long-name="Phonebook Sync" purpose="optional" plugin="Y">
-<unit bldFile="app/contacts/pimprotocols/phonebooksync/group" mrp="app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
-</component>
-<component name="pbap" long-name="Bluetooth PBAP" introduced="9.2" purpose="optional">
-<unit bldFile="app/contacts/pimprotocols/pbap/group" mrp="app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
-</component>
-</collection>
-<collection name="ccservices" long-name="Contacts Centric Services" level="services">
-<component name="cmsservices" filter="s60" long-name="Contact Method Selector Services" introduced="^2">
-<unit bldFile="app/contacts/ccservices/cmsservices/group"/>
-</component>
-</collection>
-<collection name="presencecache" long-name="Presence Cache" level="support">
-<component name="presencecacheutils" filter="s60" long-name="Presence Cache Utils" introduced="^2" class="placeholder">
-<!-- <unit bldFile="presencecache/presencecacheutils/group"/> -->
-</component>
-<component name="presencecacheserver2" filter="s60" long-name="Presence Cache Server" introduced="^2" class="placeholder">
-<!-- <unit bldFile="presencecache/presencecacheserver2/group"/> -->
-</component>
-<component name="presencecacheclient2" filter="s60" long-name="Presence Cache Client" introduced="^2" class="placeholder">
-<!-- <unit bldFile="presencecache/presencecacheclient2/group"/> -->
-</component>
-<component name="presencecache_build" filter="s60" long-name="Presence Cache Build" introduced="^2">
-<!-- should divide this bld.inf into the other components, or collapse them into a single component -->
-<unit bldFile="app/contacts/presencecache/group"/>
-</component>
-</collection>
-<collection name="predictivesearch" long-name="Predictive Search" level="support">
-<component name="pcsutils" filter="s60" long-name="PCS Utils" introduced="^2">
-<unit bldFile="app/contacts/predictivesearch/pcsutils/group"/>
-</component>
-<component name="pcsserverclientapi" filter="s60" long-name="PCS Server Client API" introduced="^2">
-<unit bldFile="app/contacts/predictivesearch/pcsserverclientapi/group"/>
-</component>
-<component name="pcsserver" filter="s60" long-name="PCS Server" introduced="^2">
-<unit bldFile="app/contacts/predictivesearch/pcsserver/group"/>
-</component>
-<component name="pcsadapters" filter="s60" long-name="PCS Adapters" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/predictivesearch/adapters/contacts/group"/>
-</component>
-<component name="pcsalgorithm" filter="s60" long-name="PCS Algorithm" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/predictivesearch/pcsalgorithm/group"/>
-</component>
-<component name="predictivesearch_build" filter="s60" long-name="Predictive Search Build" introduced="^2">
-<!-- need to remove #includes from bld.inf and rename as Predictive Search ROM -->
-<unit bldFile="app/contacts/predictivesearch/group"/>
-</component>
-</collection>
-<collection name="contacts_info" long-name="Contacts Apps Info" level="ui">
-<component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="organizer" level="apps" span="2" long-name="Organizer Application Suite" levels="support services engine ui app">
-<collection name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" level="app">
-<component name="meeting_request_mailbox_utilities_api" long-name="Meeting Request Mailbox Utilities API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_mailbox_utilities_api/group"/>
-</component>
-<component name="meeting_request_uids_api" long-name="Meeting Request UIDs API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_uids_api/group"/>
-</component>
-<component name="calendar_exporter_api" long-name="Calendar Exporter API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_exporter_api/group"/>
-</component>
-<component name="agenda_versit_2_api" long-name="Agenda Versit 2 API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/agenda_versit_2_api/group"/>
-</component>
-<component name="calendar_importer_api" long-name="Calendar Importer API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_importer_api/group"/>
-</component>
-<component name="calendar_launcher_api" long-name="Calendar Launcher API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_launcher_api/group"/>
-</component>
-<component name="calendar_common_utils_api" long-name="Calendar Common Utils API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_common_utils_api/group"/>
-</component>
-<component name="searchfw_launcher_api" long-name="Search Framework Launcher API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/searchfw_launcher_api/group"/>
-</component>
-<component name="alarm_const_api" long-name="Alarm Const API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/alarm_const_api/group"/>
-</component>
-<component name="alarm_ui_external_control_api" long-name="Alarm UI External Control API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/alarm_ui_external_control_api/group"/>
-</component>
-<component name="calendar_settings_keys_api" long-name="Calendar Settings Keys API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_settings_keys_api/group"/>
-</component>
-<component name="calendar_tones_settings_keys_api" long-name="Calendar Tones Settings Keys API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_tones_settings_keys_api/group"/>
-</component>
-<component name="clock_settings_api" long-name="Clock Settings API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/clock_settings_api/group"/>
-</component>
-<component name="common_alarm_editor_api" long-name="Common Alarm Editor API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/common_alarm_editor_api/group"/>
-</component>
-<component name="alarm_ui_secondary_display_api" long-name="Alarm UI Secondary Display API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/alarm_ui_secondary_display_api/group"/>
-</component>
-<component name="searchui_launcher_api" long-name="Search UI Launcher API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/searchui_launcher_api/group"/>
-</component>
-<component name="agenda_entry_ui_api" long-name="Agenda Entry UI API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/agenda_entry_ui_api/group"/>
-</component>
-<component name="meeting_request_utillities_api" long-name="Meeting Request Utillities API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_utillities_api/group"/>
-</component>
-<component name="meeting_request_viewer_api" long-name="Meeting Request Viewer API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_viewer_api/group"/>
-</component>
-<component name="calendar_custamization_api" long-name="Calendar Customization API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_custamization_api/group"/>
-</component>
-</collection>
-<collection name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" level="app">
-<component name="calendar_interim_utils2_api" long-name="Calendar Interim Utils 2 API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_pub/calendar_interim_utils2_api/group"/>
-</component>
-<component name="notepad_library_api" long-name="Notepad Library API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_pub/notepad_library_api/group"/>
-</component>
-</collection>
-<collection name="alarmengines" long-name="Alarm Engines" level="engine">
-<component name="missedalarmstore" filter="s60" long-name="Missed Alarm Store">
-<unit bldFile="app/organizer/alarmengines/missedalarmstore/group"/>
-</component>
-</collection>
-<collection name="calendarengines" long-name="Calendar Engines" level="engine">
-<component name="versit2" filter="s60" long-name="Versit 2 iCal Parser" introduced="9.2">
-<unit bldFile="app/organizer/calendarengines/versit2/group"/>
-</component>
-<component name="agnversit2" filter="s60" long-name="Versit 2 Agenda Interface" introduced="9.2" plugin="Y">
-<unit bldFile="app/organizer/calendarengines/agnversit2/group"/>
-</component>
-<component name="caleninterimutils" filter="s60" long-name="Calendar Interim Utils" introduced="9.1">
-<unit bldFile="app/organizer/calendarengines/caleninterimutils/group"/>
-</component>
-<component name="calenimp" filter="s60" long-name="Calendar Import Wrapper" introduced="7.0s">
-<unit bldFile="app/organizer/calendarengines/calenimp/group"/>
-</component>
-<component name="calenlauncher" filter="s60" long-name="Calendar Launcher">
-<unit bldFile="app/organizer/calendarengines/calenlauncher/group"/>
-</component>
-<component name="caldavsrv" filter="sf_build" long-name="CalDAV Server" introduced="^3">
-<unit bldFile="app/organizer/calendarengines/caldav/group"/>
-</component>
-</collection>
-<collection name="meetingrequestengines" long-name="Meeting Request Engines" level="engine">
-<component name="mrmailbox" filter="s60" long-name="Meeting Request Mailbox">
-<unit bldFile="app/organizer/meetingrequestengines/mrmailbox/group"/>
-</component>
-<component name="mrmailboxutils" filter="s60" long-name="Meeting Request Mailbox Utils" plugin="Y">
-<unit bldFile="app/organizer/meetingrequestengines/mrmailboxutils/group"/>
-</component>
-</collection>
-<collection name="searchfw" long-name="Search Framework" level="services">
-<!-- Uncomment all units when configuration is in place. All currently #included from searchfw_build, which should be removed at the same time. -->
-<component name="coresearchfw" filter="s60" long-name="Core Search Framework" introduced="^1" class="placeholder">
-<!--<unit bldFile="searchfw/coresearchfw/group"/>-->
-</component>
-<component name="searchfw_plugins" filter="s60" long-name="Search Plugins" introduced="^1" plugin="Y" class="placeholder">
-<!--<unit bldFile="searchfw/plugins/group"/>-->
-</component>
-<component name="searchfw_build" filter="s60" long-name="Search Framework Build" introduced="^1">
-<unit bldFile="app/organizer/searchfw/group"/>
-</component>
-</collection>
-<collection name="alarmui" long-name="Alarm UI" level="app">
-<!-- collection is really a component, should move down a directory -->
-<component name="alarmui_build" filter="s60" long-name="Alarm UI Build">
-<unit bldFile="app/organizer/alarmui/group"/>
-</component>
-</collection>
-<collection name="calendarui" long-name="Calendar UI" level="ui">
-<component name="calendarui_help" filter="s60" long-name="Calendar UI Help">
-<unit bldFile="app/organizer/calendarui/help/group"/>
-</component>
-<component name="commonutils" filter="s60" long-name="Calendar Common Utils">
-<unit bldFile="app/organizer/calendarui/commonutils/group"/>
-</component>
-<component name="globaldata" filter="s60" long-name="Calendar Global Data">
-<unit bldFile="app/organizer/calendarui/globaldata/group"/>
-</component>
-<component name="settings" filter="s60" long-name="Calendar Settings">
-<!-- these should be merged into a single bld.inf or split into two components -->
-<unit bldFile="app/organizer/calendarui/settings/gsplugin/group"/>
-<unit bldFile="app/organizer/calendarui/settings/settingsui/group"/>
-</component>
-<component name="customisation" filter="s60" long-name="Calendar Customisation">
-<unit bldFile="app/organizer/calendarui/customisation/group"/>
-</component>
-<component name="customisationmanager" filter="s60" long-name="Calendar Customisation Manager">
-<unit bldFile="app/organizer/calendarui/customisationmanager/group"/>
-</component>
-<component name="multicaluidialog" filter="s60" long-name="Multi-Calendar UI Dialog" introduced="^3">
-<unit bldFile="app/organizer/calendarui/multicaluidialog/group"/>
-</component>
-<component name="views" filter="s60" long-name="Calendar Views">
-<unit bldFile="app/organizer/calendarui/views/group"/>
-</component>
-<component name="calendarui_controller" filter="s60" long-name="Calendar Controller">
-<unit bldFile="app/organizer/calendarui/controller/group"/>
-</component>
-<component name="calendarui_editors" filter="s60" long-name="Calendar Editors">
-<unit bldFile="app/organizer/calendarui/editors/group"/>
-</component>
-<component name="calendarui_application" filter="s60" long-name="Calendar Application">
-<unit bldFile="app/organizer/calendarui/application/group"/>
-</component>
-<component name="missedalarmindicatorplugin" filter="s60" long-name="Missed Alarm Indicator Plugin" plugin="Y">
-<unit bldFile="app/organizer/calendarui/missedalarmindicatorplugin/group"/>
-</component>
-<component name="calendarui_server" filter="s60" long-name="Calendar Server">
-<!-- these should be merged into a single bld.inf or split into two components -->
-<unit bldFile="app/organizer/calendarui/server/calensvr/group"/>
-<unit bldFile="app/organizer/calendarui/server/calensvrclient/group"/>
-</component>
-<component name="regionalplugins" filter="s60" long-name="Calendar Regional Plugins" plugin="Y">
-<!-- these should be merged into a single bld.inf or split into four components -->
-<unit bldFile="app/organizer/calendarui/regionalplugins/calenregionalutil/group"/>
-<unit bldFile="app/organizer/calendarui/regionalplugins/lunarchinese/group"/>
-<unit bldFile="app/organizer/calendarui/regionalplugins/lunarvietnamese/group"/>
-<unit bldFile="app/organizer/calendarui/regionalplugins/thai/group"/>
-</component>
-<component name="calenaiwprovider" filter="s60" long-name="Calendar AIW Proivder" introduced="^3" plugin="Y">
-<unit bldFile="app/organizer/calendarui/calenaiwprovider/group"/>
-</component>
-<component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y">
-<unit bldFile="app/organizer/calendarui/caldav/group"/>
-</component>
-<component name="calendarui_build" filter="s60" long-name="Calendar UI Build">
-<!-- split contents into separate components -->
-<unit bldFile="app/organizer/calendarui/group"/>
-</component>
-</collection>
-<collection name="meetingui" long-name="Meeting UI" level="ui">
-<component name="attendeeview" filter="s60" long-name="Attendee View">
-<unit bldFile="app/organizer/meetingui/attendeeview/group"/>
-</component>
-<component name="agnentryui" filter="s60" long-name="Agenda Entry UI" plugin="Y">
-<unit bldFile="app/organizer/meetingui/agnentryui/group"/>
-</component>
-<component name="meetingrequestutils" filter="s60" long-name="Meeting Request Utils">
-<unit bldFile="app/organizer/meetingui/meetingrequestutils/group"/>
-</component>
-<component name="meetingrequestviewers" filter="s60" long-name="Meeting Request Viewers" plugin="Y">
-<unit bldFile="app/organizer/meetingui/meetingrequestviewers/group"/>
-</component>
-<component name="meetingui_build" filter="s60" long-name="Meeting UI Build">
-<!-- split contents into separate components -->
-<unit bldFile="app/organizer/meetingui/group"/>
-</component>
-</collection>
-<collection name="clock2" long-name="Clock" level="app">
-<component name="clockengines" filter="s60" long-name="Clock Engines">
-<unit bldFile="app/organizer/clock2/clockengines/group"/>
-</component>
-<component name="clockui" filter="s60" long-name="Clock UI">
-<unit bldFile="app/organizer/clock2/clockui/group"/>
-</component>
-<component name="clock2_help" filter="s60" long-name="Clock Help">
-<unit bldFile="app/organizer/clock2/help/group"/>
-</component>
-<component name="clock2_build" filter="s60" long-name="Clock Build">
-<!-- split contents into separate components, or just make this one component -->
-<unit bldFile="app/organizer/clock2/group"/>
-</component>
-</collection>
-<collection name="notepad" long-name="Notepad" level="ui">
-<component name="notepad_help" filter="s60" long-name="Notepad Help">
-<unit bldFile="app/organizer/notepad/help/group"/>
-</component>
-<component name="notepad1" filter="s60" long-name="Notepad Application 1">
-<unit bldFile="app/organizer/notepad/notepad1/group"/>
-</component>
-<component name="txtrecog" filter="s60" long-name="Text Recognizer" plugin="Y">
-<unit bldFile="app/organizer/notepad/txtrecog/group"/>
-</component>
-</collection>
-<collection name="searchui" long-name="Search UI" level="app">
-<!-- consider making this a single component -->
-<!-- Uncomment all units when configuration is in place. All currently #included from searchui_build, which should be removed at the same time. -->
-<component name="searchui_help" filter="s60" long-name="Search UI Help" class="placeholder">
-<!--<unit bldFile="searchui/help/group"/>-->
-</component>
-<component name="searchapp" filter="s60" long-name="Search Application" class="placeholder">
-<!--<unit bldFile="searchui/searchapp/group"/>-->
-</component>
-<component name="searchui_build" filter="s60" long-name="Search UI Build">
-<unit bldFile="app/organizer/searchui/group"/>
-</component>
-</collection>
-<collection name="pimappservices" long-name="PIM Application Services" level="services">
-<component name="calendar" long-name="Calendar" introduced="9.2" purpose="optional">
-<unit bldFile="app/organizer/pimappservices/calendar/group" mrp="app/organizer/pimappservices/calendar/group/app-engines_calendar.mrp" version="2"/>
-</component>
-<component name="calendarvcalplugin" long-name="Calendar vCal Plugin" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="app/organizer/pimappservices/calendarvcalplugin/group" mrp="app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp" version="2"/>
-</component>
-<component name="appenginesdocs" long-name="Application Engines Documentation" purpose="development" class="doc">
-<unit mrp="app/organizer/pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
-</component>
-</collection>
-<collection name="pimappsupport" long-name="PIM Application Support" level="support">
-<component name="vcardandvcal" long-name="vCard and vCal" introduced="ER5" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/vcardandvcal/group" mrp="app/organizer/pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
-</component>
-<component name="chinesecalendarconverter" long-name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
-</component>
-<component name="chinesecalendaralg" long-name="Chinese Calendar Algorithm" introduced="S^3" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendaralg/group" mrp="app/organizer/pimappsupport/chinesecalendaralg/group/app-services_chinesecalendaralgorithm.mrp"/>
-</component>
-</collection>
-<collection name="organizer_info" long-name="Organizer Application Suite Info" level="app">
-<component name="organizer_metadata" long-name="Organizer Application Suite Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="mail eng base ui">
-<collection name="msg_pub" long-name="Messaging Apps Public APIs" level="ui">
-<component name="messaging_integration_api" long-name="Messaging Integration API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/messaging_integration_api/group"/>
-</component>
-<component name="plugin_bio_control_api" long-name="Plug-in Bio Control API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/plugin_bio_control_api/group"/>
-</component>
-<component name="mms_client_mtm_api" long-name="MMS Client MTM API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/mms_client_mtm_api/group"/>
-</component>
-<component name="open_new_message_notification_api" long-name="Open New Message Notification API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/open_new_message_notification_api/group"/>
-</component>
-<component name="messaging_editor_constants_api" long-name="Messaging Editor Constants API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/messaging_editor_constants_api/group"/>
-</component>
-</collection>
-<collection name="msg_plat" long-name="Messaging Apps Platform APIs" level="ui">
-<component name="smil_player_launch_api" long-name="SMIL Player Launch API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/smil_player_launch_api/group"/>
-</component>
-<component name="messaging_media_resolver_api" long-name="Messaging Media Resolver API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/messaging_media_resolver_api/group"/>
-</component>
-<component name="smil_engine_api" long-name="SMIL Engine API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/smil_engine_api/group"/>
-</component>
-<component name="mms_server_settings_api" long-name="MMS Server Settings API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_server_settings_api/group"/>
-</component>
-<component name="new_contacts_note_secondary_display_api" long-name="New Contacts Note Secondary Display API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contacts_note_secondary_display_api/group"/>
-</component>
-<component name="messaging_center_ui_utilities_api" long-name="Messaging Center UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/messaging_center_ui_utilities_api/group"/>
-</component>
-<component name="internet_mail_mtm_ui_api" long-name="Internet Mail MTM UI API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/internet_mail_mtm_ui_api/group"/>
-</component>
-<component name="messaging_editor_api" long-name="Messaging Editor API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/messaging_editor_api/group"/>
-</component>
-<component name="email_domain_utilities_api" long-name="Email Domain Utilities API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/email_domain_utilities_api/group"/>
-</component>
-<component name="smil_transition_api" long-name="SMIL Transition API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/smil_transition_api/group"/>
-</component>
-<component name="new_contacts_note_status_api" long-name="New Contacts Note Status API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contacts_note_status_api/group"/>
-</component>
-<component name="unified_editor_video_conversion_api" long-name="Unified Editor Video Conversion API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/unified_editor_video_conversion_api/group"/>
-</component>
-<component name="mms_conformance_api" long-name="MMS Conformance API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_conformance_api/group"/>
-</component>
-<component name="new_contacts_note_variables_api" long-name="New Contacts Note Variables API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contacts_note_variables_api/group"/>
-</component>
-<component name="new_message_notification_api" long-name="New Message Notification API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_message_notification_api/group"/>
-</component>
-<component name="mms_application_api" long-name="MMS Application API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_application_api/group"/>
-</component>
-<component name="mms_engine_settings_api" long-name="MMS Engine Settings API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_engine_settings_api/group"/>
-</component>
-<component name="mms_codec_client_api" long-name="MMS Codec Client API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_codec_client_api/group"/>
-</component>
-<component name="send_ui_meeting_request_api" long-name="Send UI Meeting Request API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/send_ui_meeting_request_api/group"/>
-</component>
-<component name="new_contact_notes_extended_api" long-name="New Contact Notes Extended API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contact_notes_extended_api/group"/>
-</component>
-<component name="mail_ui_constants_api" long-name="Mail UI Constants API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mail_ui_constants_api/group"/>
-</component>
-<component name="sim_dialog_launch_api" long-name="SIM Dialog Launch API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/sim_dialog_launch_api/group"/>
-</component>
-</collection>
-<collection name="mobilemessaging" long-name="Mobile Messaging" level="ui">
-<component name="audiomsg" filter="s60" long-name="Audio Message">
-<unit bldFile="app/messaging/mobilemessaging/audiomsg/group"/>
-</component>
-<component name="msgmedia" filter="s60" long-name="Message Media">
-<unit bldFile="app/messaging/mobilemessaging/msgmedia/group"/>
-</component>
-<component name="unieditor" filter="s60" long-name="Unified Editor">
-<unit bldFile="app/messaging/mobilemessaging/unieditor/group"/>
-</component>
-<component name="mmsui" filter="s60" long-name="MMS UI">
-<unit bldFile="app/messaging/mobilemessaging/mmsui/group"/>
-</component>
-<component name="postcard" filter="s60" long-name="Postcard">
-<unit bldFile="app/messaging/mobilemessaging/postcard/group"/>
-</component>
-<component name="smilui" filter="s60" long-name="SMIL UI">
-<unit bldFile="app/messaging/mobilemessaging/smilui/group"/>
-</component>
-<component name="smum" filter="s60" long-name="SMS UI MTM and UI Data MTM" plugin="Y">
-<unit bldFile="app/messaging/mobilemessaging/smum/group"/>
-</component>
-<component name="smsui" filter="s60" long-name="SMS UI">
-<unit bldFile="app/messaging/mobilemessaging/smsui/group"/>
-</component>
-<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/mobilemessaging/smsmtm/group" mrp="app/messaging/mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
-</component>
-</collection>
-<collection name="mmsengine" long-name="MMS Engine" level="eng">
-<component name="mmsconninit" filter="s60" long-name="MMS Connection Initiator" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsconninit/bld"/> -->
-</component>
-<component name="genutils" filter="s60" long-name="General Utils" class="placeholder">
-<!-- <unit bldFile="mmsengine/genutils/bld"/> -->
-</component>
-<component name="mmsserversettings" filter="s60" long-name="MMS Server Settings" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserversettings/bld"/> -->
-</component>
-<component name="mmsmessage" filter="s60" long-name="MMS Message" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsmessage/bld"/> -->
-</component>
-<component name="mmshttptransport" filter="s60" long-name="MMS HTTP Transport" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmshttptransport/bld"/> -->
-</component>
-<component name="mmscodec" filter="s60" long-name="MMS Codec" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodec/bld"/> -->
-</component>
-<component name="mmsserver" filter="s60" long-name="MMS Server" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserver/bld"/> -->
-</component>
-<component name="clientmtm" filter="s60" long-name="MMS Client MTM" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/clientmtm/bld"/> -->
-</component>
-<component name="mmswatcher" filter="s60" long-name="MMS Watcher" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmswatcher/bld"/> -->
-</component>
-<component name="mmspushhandler" filter="s60" long-name="MMS Push Handler" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmspushhandler/bld"/> -->
-</component>
-<component name="applicationadapter" filter="s60" long-name="MMS Application Adapter" class="placeholder">
-<!-- <unit bldFile="mmsengine/applicationadapter/bld"/> -->
-</component>
-<component name="mmscodecclient" filter="s60" long-name="MMS Codec Client" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodecclient/bld"/> -->
-</component>
-<component name="mmssettings" long-name="MMS Settings" introduced="9.2" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmssettings/group" mrp="app/messaging/mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
-</component>
-<component name="mmsconf" long-name="MMS Configuration" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmsconf" mrp="app/messaging/mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
-</component>
-<component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
-<!-- this bld.inf should be broken up into the individual other components -->
-<unit bldFile="app/messaging/mmsengine/group"/>
-</component>
-</collection>
-<collection name="messagingappbase" long-name="Messaging App Base" level="base">
-<component name="msgavkon" filter="s60" long-name="Messaging Avkon UI">
-<unit bldFile="app/messaging/messagingappbase/msgavkon/group"/>
-</component>
-<component name="mce" filter="s60" long-name="Message Center Application">
-<unit bldFile="app/messaging/messagingappbase/mce/group"/>
-</component>
-<component name="mceextraitems" filter="s60" long-name="Message Center Extra Items">
-<unit bldFile="app/messaging/messagingappbase/mceextraitems/group"/>
-</component>
-<component name="mcesettings" filter="s60" long-name="Message Center Settings">
-<unit bldFile="app/messaging/messagingappbase/mcesettings/group"/>
-</component>
-<component name="msgerrorwatcher" filter="s60" long-name="Messaging Error Watcher" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/msgerrorwatcher/group"/>
-</component>
-<component name="ncnlist" filter="s60" long-name="New Contacts Note List">
-<unit bldFile="app/messaging/messagingappbase/ncnlist/group"/>
-</component>
-<component name="schemeplugin" filter="s60" long-name="Scheme Handler Plugin" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/schemeplugin/group"/>
-</component>
-<component name="sendui" filter="s60" long-name="Send UI" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/sendui/group"/>
-</component>
-<component name="smilengine" filter="s60" long-name="SMIL Engine">
-<unit bldFile="app/messaging/messagingappbase/smilengine/group"/>
-</component>
-<component name="bium" filter="s60" long-name="BIO UI MTM" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/bium/group"/>
-</component>
-<component name="smartmessaging" filter="s60" long-name="Smart Messaging">
-<unit bldFile="app/messaging/messagingappbase/smartmessaging/group"/>
-</component>
-<component name="msgeditor" filter="s60" long-name="Messaging Editor">
-<unit bldFile="app/messaging/messagingappbase/msgeditor/group"/>
-</component>
-<component name="smilparser" long-name="SMIL Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="app/messaging/messagingappbase/smilparser/GROUP" mrp="app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
-</component>
-<component name="obexmtms" long-name="OBEX MTMs" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/obexmtms/Group" mrp="app/messaging/messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
-</component>
-</collection>
-<collection name="email" long-name="Email" level="mail">
-<!-- use commonemail instead -->
-<component name="alwaysonlineemailplugin" filter="s60" long-name="Always Online Mail Plugin" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/alwaysonlineemailplugin/group"/>
-</component>
-<component name="emailnotificationhandler" filter="s60" long-name="Email Notification Handler" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/emailnotificationhandler/group"/>
-</component>
-<component name="imum" filter="s60" long-name="Internet Mail UI MTM" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/imum/group"/>
-</component>
-<component name="mail" filter="s60" long-name="Mail Application" deprecated="^3">
-<unit bldFile="app/messaging/email/mail/group"/>
-</component>
-<component name="pop3andsmtpmtm" long-name="POP3 and SMTP MTM" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/pop3andsmtpmtm/group" mrp="app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
-</component>
-<component name="imap4mtm" long-name="IMAP4 MTM" introduced="9.2" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/imap4mtm/group" mrp="app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
-</component>
-</collection>
-<collection name="messaging_info" long-name="Messaging Apps Info" level="ui">
-<component name="messaging_metadata" long-name="Messaging Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commonemail" level="apps" span="2" long-name="Email Apps" levels="service support ui app">
-<collection name="email_pub" long-name="Email Apps Public Interfaces" level="app">
-<component name="email_widget_api" long-name="Email Widget API" filter="s60" class="api">
-<unit bldFile="app/commonemail/email_pub/email_widget_api/group"/>
-</component>
-</collection>
-<collection name="email_plat" long-name="Email Apps Platform Interfaces" level="app">
-<component name="email_client_api" long-name="Email Client API" filter="s60" class="api">
-<unit bldFile="app/commonemail/email_plat/email_client_api/group"/>
-</component>
-<component name="email_setup_plugin_api" long-name="Email Setup Plugin API" filter="s60" class="api">
-<unit bldFile="app/commonemail/email_plat/email_setup_plugin_api/group"/>
-</component>
-</collection>
-<collection name="emailservices" long-name="Email Services" level="service">
-<component name="emailframework" filter="s60" long-name="Email Framework" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailframework/group"/>
-</component>
-<component name="emailclientapi" filter="s60" long-name="Email Client API" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailclientapi/group"/>
-</component>
-<component name="emailserver" filter="s60" long-name="Email Server" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailserver/group"/>
-</component>
-<component name="emailservermonitor" filter="s60" long-name="Email Server Monitor" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailservermonitor/group"/>
-</component>
-<component name="psmruadapter" filter="s60" long-name="Predictive Search Most Recent Used Adapter" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailservices/psmruadapter/group"/>
-</component>
-<component name="emailstore" filter="s60" long-name="Email Store" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailstore/group"/>
-</component>
-<component name="emaildebug" filter="s60" long-name="Email Debug" introduced="^2" class="api">
-<unit bldFile="app/commonemail/emailservices/emaildebug/group"/>
-</component>
-<component name="emailinstallationinitiator" filter="s60" long-name="Email Installation Initiator" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailinstallationinitiator/group"/>
-</component>
-</collection>
-<collection name="ipsservices" long-name="IMAP/POP/SMTP Services" level="service">
-<component name="ipssossettings" filter="s60" long-name="IPS SOS Settings" introduced="^2">
-<!-- SOS? Consider spelling it out since the abbreviation is ambiguous -->
-<unit bldFile="app/commonemail/ipsservices/ipssossettings/group"/>
-</component>
-<component name="ipssosplugin" filter="s60" long-name="IPS SOS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/ipsservices/ipssosplugin/group"/>
-</component>
-<component name="ipssosaoplugin" filter="s60" long-name="IPS SOS Always Online Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/ipsservices/ipssosaoplugin/group"/>
-</component>
-<component name="ipsservices_build" filter="s60" long-name="IPS Services Build" introduced="^2">
-<unit bldFile="app/commonemail/ipsservices/group"/>
-<!-- can the exports be broken up into the other components or made a config component?-->
-</component>
-</collection>
-<collection name="emailcontacts" long-name="Email Contacts" level="support">
-<component name="contactactionservice" filter="s60" long-name="Contact Action Service" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailcontacts/contactactionservice/group"/>
-</component>
-<component name="contactactionmenu" filter="s60" long-name="Contact Action Menu" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailcontacts/contactactionmenu/group"/>
-</component>
-</collection>
-<collection name="meetingrequest" long-name="Meeting Request" level="ui">
-<component name="mrcommon" filter="s60" long-name="MR Common" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrcommon/group"/>
-</component>
-<component name="mrdb" filter="s60" long-name="MR Database" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrdb/group"/>
-</component>
-<component name="mrpolicy" filter="s60" long-name="MR Policy" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrpolicy/group"/>
-</component>
-<component name="mrservices" filter="s60" long-name="MR Services" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrservices/group"/>
-</component>
-<component name="mrgui" filter="s60" long-name="MR GUI" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrgui/group"/>
-</component>
-<component name="mrentry" filter="s60" long-name="MR Entry" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrentry/group"/>
-</component>
-<component name="mrtasks" filter="s60" long-name="MR Tasks" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrtasks/group"/>
-</component>
-<component name="mrutils" filter="s60" long-name="MR Utils" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrutils/group"/>
-</component>
-<component name="mrutilscalplugin" filter="s60" long-name="MR Utils Calendar Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mrutilscalplugin/group"/>
-</component>
-<component name="mrviewer" filter="s60" long-name="MR Viewer" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrviewer/group"/>
-</component>
-<component name="mrviewercalplugin" filter="s60" long-name="MR Viewer Calendar Plugin" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrviewercalplugin/group"/>
-</component>
-<component name="mricalviewer" filter="s60" long-name="MR iCal Viewer" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mricalviewer/group"/>
-</component>
-<component name="mrversit2" filter="s60" long-name="MR Versit2" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrversit2/group"/>
-</component>
-<component name="mragnversit2" filter="s60" long-name="MR Agenda Versit2" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mragnversit2/group"/>
-</component>
-<component name="mrcasplugin" filter="s60" long-name="MR Contact Action Service Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mrcasplugin/group"/>
-</component>
-<component name="mrurlparserplugin" filter="s60" long-name="MR URL Parser Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mrurlparserplugin/group"/>
-</component>
-<component name="meetingrequest_build" filter="s60" long-name="MR Build" introduced="^2">
-<!-- can the exports be broken up into the other components ?
- alternatively, move the exports into a RM Config component-->
-<unit bldFile="app/commonemail/meetingrequest/group"/>
-</component>
-</collection>
-<collection name="emailuis" long-name="Email UIs" level="app">
-<component name="emailui" filter="s60" long-name="Email UI" introduced="^2">
-<unit bldFile="app/commonemail/emailuis/emailui/group"/>
-</component>
-<component name="gsemailsettings" filter="s60" long-name="Email GS Settings" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailuis/gsemailsettings/group"/>
-</component>
-<component name="uicomponents" filter="s60" long-name="Email UI Components" introduced="^2">
-<unit bldFile="app/commonemail/emailuis/uicomponents/group"/>
-</component>
-<component name="widget" filter="s60" long-name="Email Widget" introduced="^2">
-<!-- Uncomment unit when configuration is in place. Currently #included from emailuis_build, which should be removed at the same time. -->
-<!--<unit bldFile="emailuis/widget/group"/>-->
-</component>
-<component name="emailuis_build" filter="s60" long-name="Email UIs Build" introduced="^2">
-<unit bldFile="app/commonemail/emailuis/group"/>
-</component>
-</collection>
-<collection name="commonemail_info" long-name="Email Apps Info" level="app">
-<component name="emailhelp" filter="s60" long-name="Email Help" class="placeholder">
-<!-- should this be commented out or not? -->
-<!-- <unit bldFile="emailhelp/group"/> -->
-</component>
-<component name="commonemail_help" filter="s60" long-name="Email Help" introduced="^2" class="placeholder">
-<!-- should this be commented out or not? -->
-<!-- <unit bldFile="help/group"/> -->
-</component>
-</collection>
-</block>
-<block name="conversations" level="apps" long-name="Conversation Apps" levels="settings utils plugin ui">
-<collection name="conversations_plat" long-name="Conversation Apps Platform Interfaces" level="ui">
-<component name="im_cv_launcher_api" long-name="IM CV Launcher API" filter="s60" class="api">
-<unit bldFile="app/conversations/conversations_plat/im_cv_launcher_api/group"/>
-</component>
-<component name="im_connection_api" long-name="IM Connection API" filter="s60" class="api">
-<unit bldFile="app/conversations/conversations_plat/im_connection_api/group"/>
-</component>
-<component name="im_cv_appui_api" long-name="IM CV App UI API" filter="s60" class="api">
-<unit bldFile="app/conversations/conversations_plat/im_cv_appui_api/group"/>
-</component>
-</collection>
-<collection name="uiservicetabsettings" long-name="UI Service Tab Settings" level="settings">
-<!-- this is really at the wrong rank. should move down a directory -->
-<component name="vimpstsettings" filter="s60" long-name="VIMP Service Tab Settings">
-<unit bldFile="app/conversations/uiservicetabsettings/group"/>
-</component>
-</collection>
-<collection name="instantmessagesalert" long-name="Instant Messages Alert" level="utils">
-<!-- this is really at the wrong rank. should move down a directory -->
-<component name="instantmessagesalert_build" filter="s60" long-name="Instant Messages Alert build" introduced="^3">
-<unit bldFile="app/conversations/instantmessagesalert/group"/>
-</component>
-</collection>
-<collection name="imstutils" long-name="IM Service Tab Utils" level="utils">
-<component name="imstutils_help" filter="s60" long-name="IM Service Tab Help">
-<unit bldFile="app/conversations/imstutils/help/group"/>
-</component>
-<component name="imconnectionprovider" filter="s60" long-name="IM Connection Provider" plugin="Y">
-<unit bldFile="app/conversations/imstutils/imconnectionprovider/group"/>
-</component>
-<component name="xmppadapter" filter="s60" long-name="XMPP Settings Adapter" plugin="Y">
-<unit bldFile="app/conversations/imstutils/xmppadapter/group"/>
-</component>
-<component name="imconversationview" filter="s60" long-name="IM Conversation View">
-<unit bldFile="app/conversations/imstutils/imconversationview/group"/>
-</component>
-<component name="imstutils_config" filter="s60" long-name="IM Service Tab Utils config" class="config">
-<!-- remove the #includes and or moved ithe loc file into one the above components -->
-<unit bldFile="app/conversations/imstutils/group"/>
-</component>
-</collection>
-<collection name="uiservicetab" long-name="UI Service Tab" level="ui">
-<component name="vimpstutils" filter="s60" long-name="VIMP Service Tab Utilities">
-<!-- need to spell out VIMP at least once -->
-<unit bldFile="app/conversations/uiservicetab/vimpstutils/group"/>
-</component>
-<component name="vimpststorage" filter="s60" long-name="VIMP Service Tab Storage">
-<unit bldFile="app/conversations/uiservicetab/vimpststorage/group"/>
-</component>
-<component name="vimpstengine" filter="s60" long-name="VIMP Service Tab Engine">
-<unit bldFile="app/conversations/uiservicetab/vimpstengine/group"/>
-</component>
-<component name="vimpstcmdprocess" filter="s60" long-name="VIMP Service Tab Command Process">
-<unit bldFile="app/conversations/uiservicetab/vimpstcmdprocess/group"/>
-</component>
-<component name="vimpstui" filter="s60" long-name="VIMP Service Tab UI">
-<unit bldFile="app/conversations/uiservicetab/vimpstui/group"/>
-</component>
-<component name="vimpstdetailsviewplugin" filter="s60" long-name="VIMP ST Details View Plugin" plugin="Y">
-<unit bldFile="app/conversations/uiservicetab/vimpstdetailsviewplugin/group"/>
-</component>
-<component name="uiservicetab_build" filter="s60" long-name="UI Service Tab Build">
-<!-- can this be distributed into the above bld.infs? -->
-<unit bldFile="app/conversations/uiservicetab/group"/>
-</component>
-</collection>
-<collection name="servicewidget" long-name="Service Widget" level="ui">
-<component name="servicewidgetdatapublisher" filter="s60" long-name="Service Widget Data Publisher" plugin="Y">
-<unit bldFile="app/conversations/servicewidget/servicewidgetdatapublisher/group"/>
-</component>
-<component name="themes" filter="s60" long-name="Service Widget Themes" class="config">
-<!-- does this really need to have that number in the directory name? -->
-<unit bldFile="app/conversations/servicewidget/themes/install-themes/install/servicewidget_20021383/group"/>
-</component>
-<component name="servicewidget_build" filter="s60" long-name="Service Widget Build">
-<!-- Either move the whole collection down one directory into a single component, or move the ROM and SIS parts into a Service Widget ROM component -->
-<unit bldFile="app/conversations/servicewidget/group"/>
-</component>
-</collection>
-<collection name="instantmsgindicatorplugin" long-name="Instant Message Indicator Plugin" level="plugin">
-<!-- collection is really a component. should move down a directory -->
-<component name="instantmsgindicatorplugin_build" filter="s60" long-name="Instant Message Indicator Plugin Build" introduced="^3" plugin="Y">
-<unit bldFile="app/conversations/instantmsgindicatorplugin/group"/>
-</component>
-</collection>
-<collection name="imstatuspaneindicatorplugin" long-name="IM Status Pane Indicator Plugin" level="plugin">
-<!-- collection is really a component. should move down a directory -->
-<component name="imstatuspaneindicatorplugin_build" filter="s60" long-name="IM Status Pane Indicator Plugin Build" introduced="^3" plugin="Y">
-<unit bldFile="app/conversations/imstatuspaneindicatorplugin/group"/>
-</component>
-</collection>
-<collection name="conversations_info" long-name="Conversation Apps Info" level="ui">
-<component name="conversations_build" filter="s60" long-name="Conversation Apps Build">
-<!-- can the exports be moved to other components? or this remade into a configuration component?-->
-<unit bldFile="app/conversations/group"/>
-</component>
-</collection>
-</block>
-<block name="im" level="apps" long-name="Instant Messaging Apps" levels="support prot engine apps">
-<collection name="im_plat" long-name="Instant Messaging Apps Platform Interfaces" level="apps">
-<component name="wv_sap_settings_api" long-name="WV SAP Settings API" filter="s60" class="api">
-<unit bldFile="app/im/im_plat/wv_sap_settings_api/group"/>
-</component>
-</collection>
-<collection name="wvsettings20" long-name="Wireless Village Settings Engine" level="support">
-<!-- this is really a component. should move down a directory -->
-<component name="wvsapsettingsstore" long-name="WV SAP Settings Store" filter="s60" introduced="9.3">
-<unit bldFile="app/im/wvsettings20/group"/>
-</component>
-</collection>
-</block>
-<block name="dictionary" level="services" long-name="Dictionary" levels="utils ui">
-<collection name="dictionary_plat" long-name="Dictionary Platform Interfaces" level="ui">
-<component name="menu_suites_macros_api" long-name="Menu Suites Macros API" filter="s60" class="api">
-<unit bldFile="app/dictionary/dictionary_plat/menu_suites_macros_api/group"/>
-</component>
-</collection>
-<collection name="userdict" long-name="User Dictionary" level="ui">
-<!-- collection is really a component, move down a dir -->
-<component name="userdict_build" filter="s60" long-name="Japanese User Dictionary">
-<unit bldFile="app/dictionary/userdict/group"/>
-</component>
-</collection>
-</block>
-<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"/>
-</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"/>
-</component>
-</collection>
-<collection name="camerauis" long-name="Camera UIs">
-<component name="activepalette" filter="s60" long-name="Active Palette">
-<unit bldFile="app/camera/camerauis/activepalette/group"/>
-</component>
-<component name="cameraapp" filter="s60" long-name="Camera Application">
-<unit bldFile="app/camera/camerauis/cameraapp/group"/>
-<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">
-<component name="image_editor_debug_utilities_api" long-name="Image Editor Debug Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
-</component>
-<component name="image_editor_utilities_api" long-name="Image Editor Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_utilities_api/group"/>
-</component>
-<component name="image_editor_definitions_api" long-name="Image Editor Definitions API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_definitions_api/group"/>
-</component>
-<component name="image_editor_system_parameters_api" long-name="Image Editor System Parameters API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_system_parameters_api/group"/>
-</component>
-<component name="image_processing_engine_api" long-name="Image Processing Engine API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_processing_engine_api/group"/>
-</component>
-</collection>
-<collection name="imageeditor" long-name="Image Editor UI" level="ui">
-<component name="pb" filter="s60" long-name="Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/pb/group"/>
-</component>
-<component name="iepb" filter="s60" long-name="Image Editor Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/iepb/group"/>
-</component>
-<component name="imageeditorui" filter="s60" long-name="Image Editor UI">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorui/group"/>
-</component>
-<component name="imageeditormanager" filter="s60" long-name="Image Editor Manager">
-<unit bldFile="app/imgeditor/imageeditor/imageeditormanager/group"/>
-</component>
-<component name="imageeditorapp" filter="s60" long-name="Image Editor Application">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorapp/group"/>
-</component>
-<component name="imageeditor_plugins" filter="s60" long-name="Image Editor Plugins" plugin="Y">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditor/plugins/blackwhiteplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/brightnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/bubbleplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cartoonizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/clipartplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/contrastplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cropplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/drawplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/frameplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/negativeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/redeyeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/resizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotatelplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotaterplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/textplugin/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditor/plugins/drawplugin/group"/>
- -->
-</component>
-<component name="editorprovider" filter="s60" long-name="Image Editor Provider">
-<unit bldFile="app/imgeditor/imageeditor/editorprovider/group"/>
-</component>
-<component name="imageeditor_build" filter="s60" long-name="Image Editor Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditor/group"/>
-</component>
-</collection>
-<collection name="imageeditorengine" long-name="Image Editor Engine" level="engine">
-<component name="filters" filter="s60" long-name="Image Editor Filters">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbrightness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbubble/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbuffer/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercartoon/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterclipart/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercontrast/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercrop/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterdraw/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterframe/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtergrayscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtericlsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegtarget/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filternegate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterredeye/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterrotate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtertext/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
- -->
-</component>
-<component name="imageeditorutils" filter="s60" long-name="Image Editor Utilities">
-<unit bldFile="app/imgeditor/imageeditorengine/imageeditorutils/group"/>
-</component>
-<component name="systemparameters" filter="s60" long-name="System Parameters">
-<unit bldFile="app/imgeditor/imageeditorengine/systemparameters/group"/>
-</component>
-<component name="enginewrapper" filter="s60" long-name="Image Editor Engine Wrapper">
-<unit bldFile="app/imgeditor/imageeditorengine/enginewrapper/group"/>
-</component>
-<component name="imageeditorengine_build" filter="s60" long-name="Image Editor Engine Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoeditor" level="apps" long-name="Video Editor Apps" levels="engine ui">
-<collection name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" level="ui">
-<component name="video_editor_engine_api" long-name="Video Editor Engine API" introduced="^2" class="api">
-<unit bldFile="app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
-</component>
-</collection>
-<collection name="videditor" long-name="Video Editor" level="ui">
-<component name="videoeditorcommon" filter="s60" long-name="Video Editor Common" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditorcommon/group"/>
-</component>
-<component name="videoeditoruicomponents" filter="s60" long-name="Video Editor UI Components" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditoruicomponents/group"/>
-</component>
-<component name="simplevideoeditor" filter="s60" long-name="Simple Video Editor" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplevideoeditor/group"/>
-</component>
-<component name="simplecutvideo" filter="s60" long-name="Simple Cut Video" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplecutvideo/group"/>
-</component>
-<component name="videoprovider" filter="s60" long-name="Video Provider" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoprovider/group"/>
-</component>
-<component name="manualvideoeditor" filter="s60" long-name="Manual Video Editor" introduced="^2" class="placeholder">
-<!-- uncomment when supported
- <meta rel="config">
- <defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
- </meta>
- <unit bldFile="videditor/manualvideoeditor/group"/> -->
-</component>
-<component name="videditor_build" filter="s60" long-name="Video Editor Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videditor/group"/>
-</component>
-</collection>
-<collection name="videoeditorengine" long-name="Video Editor Engine" level="engine">
-<component name="audioeditorengine" filter="s60" long-name="Audio Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/audioeditorengine/group"/>
-</component>
-<component name="avcedit" filter="s60" long-name="AVC Editing" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/avcedit/group"/>
-</component>
-<component name="h263decoder" filter="s60" long-name="H.263 Decoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/h263decoder/group"/>
-</component>
-<component name="mp3aacmaniplib" filter="s60" long-name="MP3 and AAC Manipulation Library" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
-</component>
-<component name="vedtranscoder" filter="s60" long-name="Video Editor Transcoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedtranscoder/group"/>
-</component>
-<component name="vedengine" filter="s60" long-name="Video Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedengine/group"/>
-</component>
-<component name="videoeditorengine_build" filter="s60" long-name="Video Editor Engine Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videoeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
-<collection name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" level="apps">
-<component name="videoplayer_startup_api" long-name="Video Player Startup API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videoplayer_startup_api/group" filter="!test"/>
-</component>
-<component name="video_player_file_details_dialog_api" long-name="Media Player File Details Dialog API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/video_player_file_details_dialog_api/group" filter="!test"/>
-</component>
-<component name="videocollection_api" long-name="Video Collection API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videocollection_api/group"/>
-</component>
-</collection>
-<collection name="videofeeds" long-name="Video Feeds" level="util">
-<component name="iptv_utils" filter="s60" long-name="IPTV Util" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/utils/group"/>
-</component>
-<component name="viewmessageutility" filter="s60" long-name="View Message Utility" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/viewmessageutility/group"/>
-</component>
-<component name="vcxnotifier" filter="s60" long-name="Video Connection Notifier" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/vcxnotifier/group"/>
-</component>
-<component name="vccommon" filter="s60" long-name="Video Connection Common" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/vccommon/group"/>
-</component>
-<component name="clientapi" long-name="Server Client" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/clientapi/group"/>
-</component>
-<component name="provisioningprocessor" long-name="Provisioning Processor" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/provisioningprocessor/group"/>
-</component>
-<component name="mrssplugin" long-name="RSS plugin" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/mrssplugin/group"/>
-</component>
-<component name="videofeeds_server" long-name="Server" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/server/group"/>
-</component>
-<component name="livetvutils" long-name="LiveTV Utils" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/livetvutils/group"/>
-</component>
-<component name="iptvprovisioningrecognizer" long-name="IP TV Provisioning Recognizer" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/provisioningrecognizer/group"/>
-</component>
-<component name="iptvprovisioningappui" long-name="IP TV Provisioning App UI" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/provisioningappui/group"/>
-</component>
-<component name="iptvomaprovisioning" long-name="IP TV OMA Provisioning" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/omaprovisioning/group"/>
-</component>
-<component name="vcnsuiengine" long-name="VoD UI Engine" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/vcnsuiengine/group"/>
-</component>
-<component name="hgvodui" long-name="Ganes UX2.0 VoD UI" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/hgvodui/group"/>
-</component>
-<component name="hgvodplugin" long-name="Ganes UX2.0 VoD UI Plugin" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/hgvodplugin/group"/>
-</component>
-<component name="vcnsscheduleview" long-name="Scheduled Download Settings View" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/vcnsscheduleview/group"/>
-</component>
-<component name="vcnsscheduleplugin" long-name="Scheduled Download Settings Plugin" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/vcnsscheduleplugin/group"/>
-</component>
-<component name="scheduleddlplugin" long-name="Scheduled download plugin" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/scheduleddlplugin/group"/>
-</component>
-</collection>
-<collection name="videocollection" long-name="Video Collection" level="util">
-<component name="mpxmyvideoscollection" filter="s60" long-name="MPX My Videos Collection" introduced="^3">
-<unit bldFile="app/videoplayer/videocollection/mpxmyvideoscollection/group"/>
-</component>
-<component name="myvideosindicatorplugin" filter="s60" long-name="My Videos Indicator Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videocollection/myvideosindicatorplugin/group"/>
-</component>
-<component name="hgmyvideos" filter="s60" long-name="Huriganes My Videos" introduced="^3">
-<unit bldFile="app/videoplayer/videocollection/hgmyvideos/group"/>
-</component>
-<component name="hgmyvideosplugin" filter="s60" long-name="Huriganes My VideosPlugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videocollection/hgmyvideosplugin/group"/>
-</component>
-</collection>
-<collection name="mediasettings" long-name="Media Settings" level="support">
-<!-- this is really a component. Should be moved down a directory -->
-<component name="mediasettings_build" filter="s60" long-name="Media Settings Build">
-<unit bldFile="app/videoplayer/mediasettings/group"/>
-</component>
-<component name="videoplayer_test" filter="s60" purpose="development" long-name="Video Player Apps Test">
-<!-- can only have one unit. Can thes be #included from the above or another bld.inf?-->
-<unit bldFile="app/videoplayer/tsrc/VCXTestCommon/group"/>
-<unit bldFile="app/videoplayer/tsrc/VCXTestUtilModule/group"/>
-<unit bldFile="app/videoplayer/tsrc/VCXTestMyVideosCollectionClient/group"/>
-<unit bldFile="app/videoplayer/mediasettings/mediasettingsengine/tsrc/mediasettingsenginetest/group"/>
-<unit bldFile="app/videoplayer/mediasettings/videoplayersettingsengine/tsrc/vpsettingsenginetest/group"/>
-</component>
-</collection>
-<collection name="filedetails" long-name="File Details" level="support">
-<component name="filedetailsplugin" filter="s60" long-name="File Details Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/filedetails/filedetailsplugin/group"/>
-</component>
-<component name="filedetailsdialog" filter="s60" long-name="File Details Dialog" introduced="^3">
-<unit bldFile="app/videoplayer/filedetails/filedetailsdialog/group"/>
-</component>
-</collection>
-<collection name="videoplayerapp" long-name="Video Player App" level="apps">
-<component name="lwplayer" long-name="Lightweight Player" filter="s60">
-<unit bldFile="app/videoplayer/videoplayerapp/lwplayer/group"/>
-</component>
-<component name="mpxvideoplayer" filter="s60" long-name="MPX Video Player" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayerapp/mpxvideoplayer/group" filter="!test"/>
-</component>
-</collection>
-<collection name="videoplayback" long-name="Video Playback Plugins" level="plugin">
-<component name="videohelix" long-name="Video Helix" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videohelix/group" filter="!test"/>
-</component>
-<component name="videopdlplaybackviewplugin" filter="s60" long-name="Video PDL Playback View Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videopdlplaybackviewplugin/group" filter="!test"/>
-</component>
-<component name="videoplaybackcontrols" filter="s60" long-name="Video Playback Controls" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videoplaybackcontrols/group" filter="!test"/>
-</component>
-<component name="videoplaybackviewplugin" filter="s60" long-name="Video Playback View Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videoplaybackviewplugin/group"/>
-</component>
-<component name="videoplaybackviews" filter="s60" long-name="Video Playback Views" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videoplaybackviews/group" filter="!test"/>
-</component>
-</collection>
-</block>
-<block name="photos" level="apps" long-name="Photos" levels="support fw ui app">
-<collection name="photos_plat" long-name="Photos Platform Interfaces" level="app">
-<component name="collection_plugins_api" long-name="Collection Plugins API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/collection_plugins_api/group"/>
-</component>
-<component name="controllers_collection_api" long-name="Controllers Collection API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/controllers_collection_api/group"/>
-</component>
-<component name="gallery_utilities_api" long-name="Gallery Utilities API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/gallery_utilities_api/group"/>
-</component>
-<component name="slideshow_ui_constants_api" long-name="Slideshow Ui Constants API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/slideshow_ui_constants_api/group"/>
-</component>
-<component name="views_metadatadialog_api" long-name="Views Metadata Dialog API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/views_metadatadialog_api/group"/>
-</component>
-</collection>
-<collection name="photosgallery" long-name="Photos Gallery" level="app">
-<!-- consider splitting this collection into the application itself, and the frameworks behind it -->
-<component name="photosgallery_help" filter="s60" long-name="Photos Help" introduced="^2">
-<unit bldFile="app/photos/photosgallery/help/group"/>
-</component>
-<component name="logging" filter="s60" long-name="Photos Logging" introduced="^2">
-<unit bldFile="app/photos/photosgallery/logging/group"/>
-</component>
-<component name="photosgallery_common" filter="s60" long-name="Photos Common" introduced="^2">
-<unit bldFile="app/photos/photosgallery/common/group"/>
-</component>
-<component name="photosgallery_commonui" filter="s60" long-name="Photos Common UI" introduced="^2">
-<unit bldFile="app/photos/photosgallery/commonui/group"/>
-</component>
-<component name="photosgalleryollectionfw" filter="s60" long-name="Photos Collection Framework" introduced="^2">
-<unit bldFile="app/photos/photosgallery/collectionframework/group"/>
-</component>
-<component name="galleryicons" filter="s60" long-name="Photos Icons" introduced="^2" class="config">
-<unit bldFile="app/photos/photosgallery/icons"/>
-</component>
-<component name="imageviewer" filter="s60" long-name="Image Viewer" introduced="^3">
-<!-- this is really a part of controllers component, #include from there instead -->
-<unit bldFile="app/photos/photosgallery/controllers/imageviewer/group"/>
-</component>
-<component name="photosgalleryviewfw" filter="s60" long-name="View Framework" introduced="^2">
-<unit bldFile="app/photos/photosgallery/viewframework/group"/>
-</component>
-<component name="controllers" filter="s60" long-name="Photos Controllers" introduced="^2">
-<unit bldFile="app/photos/photosgallery/controllers/group"/>
-</component>
-<component name="photogallery" filter="s60" long-name="Media Gallery" introduced="^2">
-<unit bldFile="app/photos/photosgallery/gallery/group"/>
-</component>
-<component name="slideshow" filter="s60" long-name="Slideshow" introduced="^2">
-<unit bldFile="app/photos/photosgallery/slideshow/group"/>
-</component>
-<component name="memoryplugin" long-name="Memory Plugin" filter="s60" introduced="^2" plugin="Y">
-<unit bldFile="app/photos/photosgallery/memoryplugin/group"/>
-</component>
-<component name="imgvwr" filter="s60" long-name="Photos Image Viewer" introduced="^3">
-<unit bldFile="app/photos/photosgallery/imgvwr/group"/>
-</component>
-<component name="photosgallery_build" filter="s60" long-name="Photos Gallery Build" introduced="^2">
-<!-- need to remove the #included above bld.infs from this -->
-<unit bldFile="app/photos/photosgallery/group"/>
-</component>
-</collection>
-</block>
-<block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support hs app">
-<collection name="musicplayer_plat" long-name="Music Player Apps Platform Interfaces" level="app">
-<component name="mpx_music_player_app_api" long-name="MPX Music Player App API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_app_api/group"/>
-</component>
-<component name="mpx_music_player_commonui_api" long-name="MPX Music Player Common UI API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_commonui_api/group"/>
-</component>
-<component name="mpx_music_player_media_key_handler_api" long-name="MPX Music Player Media Key Handler API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_media_key_handler_api/group"/>
-</component>
-<component name="mpx_music_player_remote_control_api" long-name="MPX Music Player Remote Control API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_remote_control_api/group"/>
-</component>
-<component name="mpx_music_shop_ui_api" long-name="MPX Music Shop UI API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_shop_ui_api/group"/>
-</component>
-<component name="mpx_music_wap_adapter_cenrep_api" long-name="MPX Music Wap Adapter CenRep API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_wap_adapter_cenrep_api/group"/>
-</component>
-<component name="mpx_music_store_api" long-name="MPX Music Store Find API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_store_api/group"/>
-</component>
-<component name="audio_application_features_api" long-name="Audio Application Features API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/audio_application_features_api/group"/>
-</component>
-<component name="music_content_publisher_plugin_api" long-name="Music Content Publisher Plugin API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/music_content_publisher_plugin_api/group"/>
-</component>
-</collection>
-<collection name="mpxmusicplayer" long-name="MPX Music Player" level="app">
-<component name="mpxmusicplayer_help" filter="s60" long-name="Help">
-<unit bldFile="app/musicplayer/mpxmusicplayer/help/group"/>
-</component>
-<component name="mpxmusicplayer_commonui" filter="s60" long-name="MPX Common UI">
-<unit bldFile="app/musicplayer/mpxmusicplayer/commonui/group"/>
-</component>
-<component name="mpx_metadatahandler" filter="s60" long-name="MPX Metadata Handler">
-<unit bldFile="app/musicplayer/mpxmusicplayer/metadatahandler/group"/>
-</component>
-<component name="mediakeyhandler" filter="s60" long-name="MPX Media Key Handler">
-<unit bldFile="app/musicplayer/mpxmusicplayer/mediakeyhandler/group"/>
-</component>
-<component name="mpxmusicplayer_app" filter="s60" long-name="MPX Application">
-<unit bldFile="app/musicplayer/mpxmusicplayer/app/group"/>
-</component>
-<component name="mpxmusicplayer_build" filter="s60" long-name="MPX Music Player Build">
-<!-- can the exports be distributed to the above components? -->
-<unit bldFile="app/musicplayer/mpxmusicplayer/group"/>
-</component>
-</collection>
-<collection name="musichomescreen_multiview" long-name="Music Home Screen Multiview" level="hs">
-<!-- Uncomment all units when configuration is in place. All currently #included from musichomescreen_build -->
-<component name="mpxcollectionpublisher" filter="s60" long-name="MPX Collection Publisher" introduced="^2" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/mpxcollectionpublisher/group"/>-->
-</component>
-<component name="musiccontentpublisher" filter="s60" long-name="Music Content Publisher" introduced="^2" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/musiccontentpublisher/group"/>-->
-</component>
-<component name="mcpmusicplayer" filter="s60" long-name="Music Player MCP Plugin" introduced="^2" plugin="Y" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/mcpmusicplayer/group"/>-->
-</component>
-<component name="musicplayeractionhandlerplugin" filter="s60" long-name="Music Player Action Handler Plugin" introduced="^2" plugin="Y" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/musicplayeractionhandlerplugin/group"/>-->
-</component>
-<component name="mpx_data" filter="s60" long-name="MPX Data" introduced="^2" class="placeholder">
-<!-- does this make sense to be a component? should it just be #include from musichomescreen_multiview/group? -->
-<!--<unit bldFile="musichomescreen_multiview/data/themes/default/group"/>-->
-</component>
-<component name="musichomescreen_build" filter="s60" long-name="Music Homescreen Multiview Build" introduced="^2">
-<unit bldFile="app/musicplayer/musichomescreen_multiview/group"/>
-</component>
-</collection>
-<collection name="mpxplugins" long-name="MPX Plugins" level="plugins">
-<component name="serviceplugins" filter="s60" long-name="MPX Service Plugins" plugin="Y">
-<unit bldFile="app/musicplayer/mpxplugins/serviceplugins/group"/>
-</component>
-<component name="viewplugins" filter="s60" long-name="MPX View Plugins" plugin="Y">
-<unit bldFile="app/musicplayer/mpxplugins/viewplugins/group"/>
-</component>
-<component name="mpxplugins_build" filter="s60" long-name="MPX Plugins Build">
-<!-- can the exports be distributed to the above components? -->
-<unit bldFile="app/musicplayer/mpxplugins/group"/>
-</component>
-</collection>
-<collection name="musicplayer_info" long-name="Music Player Apps Info" level="app">
-<component name="musicplayer_build" filter="s60" long-name="Music Player Build">
-<!-- should explicitly #inlcude musicplayerbldvariant.hrh in each component -->
-<unit bldFile="app/musicplayer/group"/>
-</component>
-</collection>
-</block>
-<block name="radio" level="apps" long-name="Radio Apps" levels="engine ui">
-<collection name="fmradio" long-name="FM Radio" level="ui">
-<component name="activeidleengine" filter="s60" long-name="FM Radio Active Idle Engine">
-<unit bldFile="app/radio/fmradio/activeidleengine/group"/>
-</component>
-<component name="fmradioengine" filter="s60" long-name="FM Radio Engine">
-<unit bldFile="app/radio/fmradio/fmradioengine/group"/>
-</component>
-<component name="fmradioactionhandler" filter="s60" long-name="FM Radio Action Handler" plugin="Y">
-<unit bldFile="app/radio/fmradio/fmradioactionhandler/group"/>
-</component>
-<component name="fmradiomcpplugin" filter="s60" long-name="FM Radio Content Publisher Plugin" plugin="Y">
-<unit bldFile="app/radio/fmradio/fmradiomcpplugin/group"/>
-</component>
-<component name="fmradio_build" filter="s60" long-name="FM Radio Build">
-<unit bldFile="app/radio/fmradio/fmradio/group"/>
-</component>
-<component name="fmradio_help" filter="s60" long-name="FM Radio Help">
-<unit bldFile="app/radio/fmradio/help/group"/>
-</component>
-<component name="fmradio_build" filter="s60" long-name="FM Radio ROM">
-<!-- remove above #included bld.infs -->
-<unit bldFile="app/radio/fmradio/group"/>
-</component>
-</collection>
-</block>
-<block name="internetradio" level="apps" long-name="Internet Radio Apps"/>
-<block name="tv" level="services" long-name="TV Apps"/>
-<block name="voicerec" level="apps" long-name="Voice Recorder Apps">
-<!-- custom filter pref_test-->
-<collection name="voicerec_plat" long-name="Voice Recorder Apps Platform Interfaces">
-<component name="new_file_service_api" long-name="New File Service API" filter="s60" class="api">
-<unit bldFile="app/voicerec/voicerec_plat/new_file_service_api/group"/>
-</component>
-<component name="voicerecorder_public_constants_api" long-name="Voice Recorder Public Constants API" filter="s60" class="api">
-<unit bldFile="app/voicerec/voicerec_plat/voicerecorder_public_constants_api/group"/>
-</component>
-</collection>
-<collection name="voicerecorder" long-name="Voice Recorder">
-<!--this is really a component, move down a directory -->
-<component name="voicerecorder_build" filter="s60" long-name="Voice Recorder Build">
-<unit bldFile="app/voicerec/voicerecorder/group"/>
-</component>
-</collection>
-<collection name="voicerec_info" long-name="Voice Recorder Apps Info"/>
-</block>
-<block name="screensaver" level="apps" long-name="Screen Saver Apps" levels="plugin ui">
-<!-- is this a user-facing application or a daemon? -->
-<!-- units need to be commented out until configuration is in place. They are currently #included from screensaver_build-->
-<collection name="scrsaver" long-name="Screen Saver" level="plugin">
-<component name="scrsaverplugins" filter="s60" long-name="Screen Saver Plugins" plugin="Y">
-<!-- must have only one component. #include from a common bld.inf, or move up a directory and make scrsaverplugins a collection -->
-<!--<unit bldFile="scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/"/>
- <unit bldFile="scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/group/"/>-->
-</component>
-<component name="scrsaver_slideshowplugin" filter="s60" long-name="Screen Saver Slideshow Plugin" plugin="Y">
-<!--<unit bldFile="scrsaver/scrsaverplugins/SlideshowPlugin/group"/> -->
-</component>
-<component name="screensaveraiwplugin" filter="s60" long-name="Screen Saver AIW Plugin" plugin="Y">
-<!-- <unit bldFile="scrsaver/screensaveraiwplugin/group"/>-->
-</component>
-</collection>
-<collection name="screensaver_info" long-name="Screen Saver Apps Info" level="ui">
-<component name="screensaver_build" filter="s60" long-name="Screen Saver Application">
-<!--the app should be a separate component -->
-<unit bldFile="app/screensaver/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreen" level="apps" long-name="Home Screen Apps" levels="fw support apps">
-<collection name="homescreen_plat" long-name="Home Screen Apps Platform Interfaces" level="apps">
-<component name="menu_settings_api" long-name="Menu Settings API" filter="s60" class="api">
-<unit bldFile="app/homescreen/homescreen_plat/menu_settings_api/group"/>
-</component>
-<component name="hs_content_control_ui" long-name="HS Content Control Ui" filter="s60" class="api">
-<unit bldFile="app/homescreen/homescreen_plat/hs_content_control_ui/group"/>
-</component>
-<component name="hs_renderingplugin_api" long-name="HS Rendering Plugin API" filter="s60" class="api">
-<unit bldFile="app/homescreen/homescreen_plat/hs_renderingplugin_api/group"/>
-</component>
-</collection>
-<collection name="idlehomescreen" long-name="Idle Home Screen" level="apps">
-<component name="nativeuicontroller" filter="s60" long-name="Native UI Controller">
-<unit bldFile="app/homescreen/idlehomescreen/nativeuicontroller/group"/>
-</component>
-<component name="exths" filter="s60" long-name="Active Idle Container" plugin="Y">
-<!-- why is the ID so different from the name? Is one wrong? -->
-<unit bldFile="app/homescreen/idlehomescreen/exths/group"/>
-</component>
-<component name="hscontentcontrol" filter="s60" long-name="Home Screen Content Control" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/hscontentcontrol/group"/>
-</component>
-<component name="hssapiwrapper" filter="s60" long-name="HS SAPI Wrapper" introduced="^3">
-<!-- can only have one unit. #include from a common bld.inf, or split into two components -->
-<unit bldFile="app/homescreen/idlehomescreen/sapiwrapper/cpswrapper/group"/>
-<unit bldFile="app/homescreen/idlehomescreen/sapiwrapper/hspswrapper/group"/>
-</component>
-<component name="xmluirendering" filter="s60" long-name="XML UI Rendering" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/xmluirendering/group"/>
-</component>
-<component name="xmluicontroller" filter="s60" long-name="XML UI Controller" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/xmluicontroller/group"/>
-</component>
-<component name="widgetmanager" filter="s60" long-name="Widget Manager" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/widgetmanager/group"/>
-</component>
-<component name="idlehomescreen_help" filter="s60" long-name="Idle Home Screen Help">
-<unit bldFile="app/homescreen/idlehomescreen/help/group"/>
-</component>
-<component name="idlehomescreen_data" filter="s60" long-name="Idle Home Screen Data">
-<unit bldFile="app/homescreen/idlehomescreen/data/group"/>
-</component>
-<component name="idlehomescreen_build" filter="s60" long-name="Idle Home Screen Build">
-<!-- can the loc file be moved to another comopnent and this one removed? -->
-<unit bldFile="app/homescreen/idlehomescreen/group"/>
-</component>
-</collection>
-<collection name="menufw" long-name="Menu Framework" level="fw">
-<component name="hierarchynavigator" filter="s60" long-name="Hierarchy Navigator">
-<unit bldFile="app/homescreen/menufw/hierarchynavigator/group"/>
-</component>
-<component name="menufwui" filter="s60" long-name="Menu Framework UI">
-<unit bldFile="app/homescreen/menufw/menufwui/group"/>
-</component>
-<component name="menusuites" filter="s60" long-name="Menu Suites">
-<unit bldFile="app/homescreen/menufw/menusuites/group"/>
-</component>
-<component name="menufw_build" filter="s60" long-name="Menu Framework Build">
-<!-- can the exports be exported by the other components? -->
-<unit bldFile="app/homescreen/menufw/group"/>
-</component>
-</collection>
-<collection name="taskswitcher" long-name="Task Switcher" level="support">
-<component name="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">
-<unit bldFile="app/homescreen/taskswitcher/taskswitcherui/group"/>
-</component>
-</collection>
-</block>
-<block name="graphicsuis" level="services" long-name="Graphics UIs" levels="util ui">
-<collection name="graphicsuis_plat" long-name="Graphics UIs Platform Interfaces" level="ui">
-<component name="svgt_viewer_ui_api" long-name="SVG-T Viewer UI API" filter="s60" class="api">
-<unit bldFile="app/graphicsuis/graphicsuis_plat/svgt_viewer_ui_api/group"/>
-</component>
-<component name="svg_application_observer_utility_api" long-name="SVG Application Observer Utility API" filter="s60" class="api">
-<unit bldFile="app/graphicsuis/graphicsuis_plat/svg_application_observer_utility_api/group"/>
-</component>
-<component name="svgt_file_view_details_dialog_api" long-name="SVG-T File View Details Dialog API" filter="s60" class="api">
-<unit bldFile="app/graphicsuis/graphicsuis_plat/svgt_file_view_details_dialog_api/group"/>
-</component>
-</collection>
-<collection name="svgtviewer" long-name="SVG-T Viewer" level="ui">
-<component name="svgtviewerplugin" filter="s60" long-name="SVG-T Viewer Plugin">
-<unit bldFile="app/graphicsuis/svgtviewer/svgtviewerplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="profile" level="apps" long-name="Profiles" levels="app">
-<collection name="profile_plat" long-name="Profiles Platform Interfaces" level="app">
-<component name="profiles_settings_view_api" long-name="Profiles Settings View API" filter="s60" class="api">
-<unit bldFile="app/profile/profile_plat/profiles_settings_view_api/group"/>
-</component>
-</collection>
-<collection name="profilesapplication" long-name="Profiles Application" level="app">
-<component name="profiles" filter="s60" long-name="Profiles">
-<unit bldFile="app/profile/profilesapplication/profiles/group"/>
-</component>
-</collection>
-<collection name="profile_info" long-name="Profiles Info" level="app">
-<component name="profile_help" filter="s60" long-name="Profiles Help">
-<unit bldFile="app/profile/help/group"/>
-</component>
-</collection>
-</block>
-<block name="speechsrv" level="services" long-name="Speech Recognition UIs" levels="engine framework ui">
-<collection name="speechsrv_plat" long-name="Speech Recognition UIs Platform Interfaces" level="ui">
-<component name="vas_api" long-name="VAS API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vas_api/group"/>
-</component>
-<component name="nss_devasr_api" long-name="NSS DevASR API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_devasr_api/group"/>
-</component>
-<component name="tts_hw_device_api" long-name="TTS HW Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/tts_hw_device_api/group"/>
-</component>
-<component name="voice_commands_resource_header_api" long-name="Voice Commands Resource Header API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/voice_commands_resource_header_api/group"/>
-</component>
-<component name="nss_mmf_tts_custom_commands_api" long-name="NSS MMF TTS Custom Commands API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_mmf_tts_custom_commands_api/group"/>
-</component>
-<component name="srsf_cenrep_settings_api" long-name="SRSF CenRep Settings API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/srsf_cenrep_settings_api/group"/>
-</component>
-<component name="voice_ui_plugin_api" long-name="Voice UI Plug-in API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/voice_ui_plugin_api/group"/>
-</component>
-<component name="nss_tts_utility_api" long-name="NSS TTS Utility API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_tts_utility_api/group"/>
-</component>
-<component name="nss_srs_custom_commands_api" long-name="NSS SRS Custom Commands API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_srs_custom_commands_api/group"/>
-</component>
-<component name="srsf_secondarydisplay_api" long-name="SRSF Secondary Display API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/srsf_secondarydisplay_api/group"/>
-</component>
-<component name="asrs_hw_device_api" long-name="ASRS Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/asrs_hw_device_api/group"/>
-</component>
-<component name="vas_vcommand_api" long-name="VAS Voice Command API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vas_vcommand_api/group"/>
-</component>
-<component name="adaptation_hw_device_api" long-name="Adaptation Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/adaptation_hw_device_api/group"/>
-</component>
-<component name="nss_devtts_api" long-name="NSS DevTTS API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_devtts_api/group"/>
-</component>
-<component name="nss_srs_utility_api" long-name="NSS SRS Utility API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_srs_utility_api/group"/>
-</component>
-<component name="recognition_hw_device_api" long-name="Recognition Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/recognition_hw_device_api/group"/>
-</component>
-<component name="vas_contact_handler_api" long-name="VAS Contact Handler API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vas_contact_handler_api/group"/>
-</component>
-<component name="nlp_hw_device" long-name="NLP Hardware Device" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nlp_hw_device/group"/>
-</component>
-<component name="nss_si_speech_recognition_data_api" long-name="NSS SI Speech Recognition Data API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_si_speech_recognition_data_api/group"/>
-</component>
-<component name="nss_tts_common_api" long-name="NSS TTS Common API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_tts_common_api/group"/>
-</component>
-<component name="grcompiler_hw_device_api" long-name="Grammar Compiler Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/grcompiler_hw_device_api/group"/>
-</component>
-<component name="ttp_hw_device_api" long-name="TTP Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/ttp_hw_device_api/group"/>
-</component>
-<component name="vocman_hw_device_api" long-name="VocMan Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vocman_hw_device_api/group"/>
-</component>
-<component name="speech_synthesis_clientserver_api" long-name="Speech Synthesis Client-Server API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/speech_synthesis_clientserver_api/group"/>
-</component>
-<component name="voice_ui_accessory_button_handling_api" long-name="Voice UI Accessory Button Handling API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/voice_ui_accessory_button_handling_api/group"/>
-</component>
-<component name="ui_voice_recognition_api" long-name="UI Voice Recognition API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/ui_voice_recognition_api/group"/>
-</component>
-<component name="vcommand_settings_cenrep_api" long-name="Voice Command Settings CenRep API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vcommand_settings_cenrep_api/group"/>
-</component>
-</collection>
-<collection name="voiceui" long-name="Voice UI" level="ui">
-<component name="vcommand" filter="s60" long-name="Voice Commands UI" introduced="^1">
-<unit bldFile="app/speechsrv/voiceui/vcommand/group"/>
-</component>
-<component name="voiceuivoicerecognition" filter="s60" long-name="Voice UI Recognition" introduced="^1">
-<unit bldFile="app/speechsrv/voiceui/voiceuivoicerecognition/group"/>
-</component>
-<component name="pbkinfoviewimpl" filter="s60" long-name="Phonebook Info View Implementation" introduced="^1">
-<unit bldFile="app/speechsrv/voiceui/pbkinfoviewimpl/group"/>
-</component>
-<component name="aiwpbkinfoviewprovider" filter="s60" long-name="AIW Phonebook Info View Provider" introduced="^1" plugin="Y">
-<unit bldFile="app/speechsrv/voiceui/aiwpbkinfoviewprovider/group"/>
-</component>
-<component name="vccontrolpanelplugin" filter="s60" long-name="Voice Commands Control Panel Plugin" introduced="^1" plugin="Y">
-<!-- component is commented out until configuration is in place. Currently #included from voiceui_build -->
-<!--<unit bldFile="voiceui/vccontrolpanelplugin/group"/>-->
-</component>
-<component name="voiceui_build" filter="s60" long-name="Voice UI Build" introduced="^1">
-<!-- can this be put into the other components? -->
-<unit bldFile="app/speechsrv/voiceui/group"/>
-</component>
-</collection>
-<collection name="srsf" long-name="Speech Recognition and Synthesis Framework" level="framework">
-<component name="sispeechrecognitiondata" filter="s60" long-name="SI Speech Recognition Data">
-<unit bldFile="app/speechsrv/srsf/sispeechrecognitiondata/group"/>
-</component>
-<component name="ttscommon" filter="s60" long-name="TTS Common">
-<unit bldFile="app/speechsrv/srsf/ttscommon/group"/>
-</component>
-<component name="devtts" filter="s60" long-name="Text to Speech">
-<unit bldFile="app/speechsrv/srsf/devtts/group"/>
-</component>
-<component name="ttscustomcommands" filter="s60" long-name="TTS Custom Commands">
-<unit bldFile="app/speechsrv/srsf/ttscustomcommands/group"/>
-</component>
-<component name="ttscontrollerplugin" filter="s60" long-name="TTS Controller Plugin" plugin="Y">
-<unit bldFile="app/speechsrv/srsf/ttscontrollerplugin/group"/>
-</component>
-<component name="ttsutility" filter="s60" long-name="TTS Utility">
-<unit bldFile="app/speechsrv/srsf/ttsutility/group"/>
-</component>
-<component name="speechsynthesis" filter="s60" long-name="Speech Synthesis">
-<!-- can only have one unit. #include these from a common bld.inf -->
-<unit bldFile="app/speechsrv/srsf/speechsynthesis/client/group"/>
-<unit bldFile="app/speechsrv/srsf/speechsynthesis/server/group"/>
-</component>
-<component name="devasr" filter="s60" long-name="Audio Recording and Speech Recognition">
-<unit bldFile="app/speechsrv/srsf/devasr/group"/>
-</component>
-<component name="sicc" filter="s60" long-name="Speaker Independent Custom Commands">
-<unit bldFile="app/speechsrv/srsf/sicc/group"/>
-</component>
-<component name="sisrscontrollerplugin" filter="s60" long-name="SI SRS Controller Plugin" plugin="Y">
-<unit bldFile="app/speechsrv/srsf/sisrscontrollerplugin/group"/>
-</component>
-<component name="siutility" filter="s60" long-name="Speaker Independent Utility">
-<unit bldFile="app/speechsrv/srsf/siutility/group"/>
-</component>
-<component name="nssvasapi" filter="s60" long-name="NSS VAS API">
-<unit bldFile="app/speechsrv/srsf/nssvasapi/group"/>
-</component>
-<component name="nssvascontacthdlr" filter="s60" long-name="NSS VAS Contact Handler">
-<unit bldFile="app/speechsrv/srsf/nssvascontacthdlr/group"/>
-</component>
-<component name="vcommandhandler" filter="s60" long-name="Voice Command Handler">
-<unit bldFile="app/speechsrv/srsf/vcommandhandler/group"/>
-</component>
-<component name="vuiphandler" filter="s60" long-name="Voice UI Plugin Handler">
-<unit bldFile="app/speechsrv/srsf/vuiphandler/group"/>
-</component>
-<component name="vcommandexecutor" filter="s60" long-name="Voice Command Executor">
-<unit bldFile="app/speechsrv/srsf/vcommandexecutor/group"/>
-</component>
-<component name="vcommandexecutorbearer" filter="s60" long-name="Voice Command Executor Bearer">
-<unit bldFile="app/speechsrv/srsf/vcommandexecutorbearer/group"/>
-</component>
-<component name="vcommandmanager" filter="s60" long-name="Voice Command Manager">
-<unit bldFile="app/speechsrv/srsf/vcommandmanager/group"/>
-</component>
-<component name="vcexecutorapp" filter="s60" long-name="Voice Command Executor Application">
-<unit bldFile="app/speechsrv/srsf/vcexecutorapp/group"/>
-</component>
-<component name="profileobserverplugin" filter="s60" long-name="Profile Observer Plugin" plugin="Y">
-<unit bldFile="app/speechsrv/srsf/profileobserverplugin/group"/>
-</component>
-<component name="srsf_build" filter="s60" long-name="Speech Recognition and Synthesis Framework Build">
-<!-- should distribute this into the above components -->
-<unit bldFile="app/speechsrv/srsf/group"/>
-</component>
-</collection>
-<collection name="speechsrv_info" long-name="Speech Recognition UIs Info" level="ui"/>
-</block>
-<block name="homescreentools" level="services" long-name="Home Screen Tools" levels="tool install">
-<collection name="dtdinstaller" long-name="DTD Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<!-- this needs to be built first, does build order need to be forced with filters? -->
-<component name="dtdinstaller_build" filter="s60" long-name="DTD Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/dtdinstaller/group"/>
-</component>
-</collection>
-<collection name="themeinstaller" long-name="Theme Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="themeinstaller_build" filter="s60" long-name="Theme Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/themeinstaller/group"/>
-</component>
-</collection>
-<collection name="widgettools" long-name="Widget Tools" level="install">
-<component name="hspluginpreinstaller" filter="s60" long-name="HS Plugin Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/hspluginspreinstaller/group"/>
-</component>
-<component name="wrtwidgetpreinstaller" filter="s60" long-name="WRT Widget Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
-</component>
-</collection>
-</block>
-<block name="webuis" level="services" long-name="Web UIs" levels="plugin app">
-<collection name="browserui" long-name="Browser UI" level="app">
-<component name="browser" filter="s60" long-name="Browser">
-<unit bldFile="app/webuis/browserui/browser/group"/>
-</component>
-<component name="operatormenu" filter="s60" long-name="Browser Operator Menu">
-<unit bldFile="app/webuis/browserui/operatormenu/group"/>
-</component>
-<component name="videoservices" filter="s60" long-name="Browser Video Services">
-<unit bldFile="app/webuis/browserui/videoservices/group"/>
-</component>
-</collection>
-<collection name="browserplugins" long-name="Browser Plugins" level="plugin">
-<component name="browsersysteminfoplugin" filter="s60" long-name="Browser System Info Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsersysteminfoplugin/group"/>-->
-</component>
-<component name="browsergpsplugin" filter="s60" long-name="Browser GPS Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsergpsplugin/group"/>-->
-</component>
-<component name="browseraudiovideoplugin" filter="s60" long-name="Browser Audio Video Plugin" plugin="Y">
-<unit bldFile="app/webuis/browserplugins/browseraudiovideoplugin/group"/>
-</component>
-<component name="browserplugins_build" filter="s60" long-name="Browser Plugins Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="app/webuis/browserplugins/group"/>
-</component>
-</collection>
-<collection name="pushmtm" long-name="Push MTM" level="plugin">
-<component name="pushmtm_help" filter="s60" long-name="Push MTM Help">
-<unit bldFile="app/webuis/pushmtm/help/group"/>
-</component>
-<component name="plugins" filter="s60" long-name="Push MTM Plugins" plugin="Y">
-<unit bldFile="app/webuis/pushmtm/plugins/group"/>
-</component>
-<component name="pushmtm_build" filter="s60" long-name="Push MTM Build">
-<!-- Some content is at collection level and some is at comopnent level. Either make this a single
- component and move it down a diretcory, or make separate independent components in this collection -->
-<unit bldFile="app/webuis/pushmtm/group"/>
-</component>
-</collection>
-</block>
-<block name="jrt" level="services" long-name="Java Runtime" levels="util generic rt ui">
-<collection name="jrt_plat" long-name="JRT Platform Interfaces" level="ui">
-<component name="java_registry_api" long-name="Java Registry API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_registry_api/build"/>
-</component>
-<component name="java_env_info_api" long-name="Java Environment Info API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_env_info_api/build"/>
-</component>
-<component name="java_debug_api" long-name="Java Debug API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_debug_api/build"/>
-</component>
-</collection>
-<collection name="java_stubs" long-name="Java Stubs" level="util">
-<!-- uncomment all components when configuration is in place. Currently #included from jrt_build -->
-<component name="javadrmutils" long-name="Java DRM Utils" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtdrmutils/group"/>-->
-</component>
-<component name="javaenvinfo" long-name="Java Environment Info" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtenvinfo/group"/>-->
-</component>
-<component name="javaregistry" filter="s60,sf_build" long-name="Java Registry" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtregistry/clientserver/client/group"/>-->
-</component>
-<component name="java_stubs_build" filter="s60,sf_build" long-name="Java Stubs ROM" class="placeholder">
-<!-- Remove the #includes and rename JRT ROM-->
-<!--<unit bldFile="java_stubs/group"/>-->
-</component>
-</collection>
-<collection name="jrt_info" long-name="JRT Info" level="rt">
-<component name="jrt_build" filter="s60" long-name="JRT Build">
-<!-- needed for __JAVA_STUBS condition -->
-<unit bldFile="app/jrt/group"/>
-</component>
-</collection>
-</block>
-<block name="conntools" level="services" long-name="Connectivity Tools" levels="config app">
-<collection name="nettools" long-name="Net Tools" level="app">
-<component name="conntest" filter="s60" long-name="Connection Test" purpose="development">
-<unit bldFile="app/conntools/nettools/conntest/group"/>
-</component>
-</collection>
-<collection name="emulatorlan" long-name="Emulator LAN" level="config">
-<!-- component is actually a colleciton, should be moved down a directory -->
-<component name="emulatorlan_build" filter="s60" long-name="Emulator LAN Build" purpose="development" class="config">
-<unit bldFile="app/conntools/emulatorlan/group"/>
-</component>
-</collection>
-</block>
-<block name="rndtools" level="services" long-name="R&D tools" levels="support generic test util">
-<collection name="creator" long-name="Creator" level="support">
-<!-- collection is really a component. Should move down a directory -->
-<component name="creator_build" filter="s60" long-name="Creator Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/creator/group"/>
-</component>
-</collection>
-<collection name="filebrowser" long-name="File Browser" level="util">
-<!-- consider collapsing into a single component -->
-<component name="fileopserver" filter="s60" long-name="File Operations Server" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
-</component>
-<component name="fileopclient" filter="s60" long-name="File Operations Client" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!--<unit bldFile="filebrowser/fileopclient/group"/>-->
-</component>
-<component name="filebrowser_build" filter="s60" long-name="File Browser Application" purpose="development" class="tool">
-<!-- Need to make this a self-contained component by removing #includes. Can only do when configuration is in place-->
-<unit bldFile="app/rndtools/filebrowser/group"/>
-</component>
-</collection>
-<collection name="launcher" long-name="Launcher" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="launcher_build" filter="s60" long-name="Launcher Utility" purpose="development" class="tool">
-<unit bldFile="app/rndtools/launcher/group"/>
-</component>
-</collection>
-<collection name="loadgen" long-name="Load Generator" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="loadgen_build" filter="s60" long-name="Load Generator Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/loadgen/group"/>
-</component>
-</collection>
-<collection name="perfmon" long-name="Performance Monitor" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="perfmon_build" filter="s60" long-name="Performance Monitor Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/perfmon/group"/>
-</component>
-</collection>
-<collection name="screengrabber" long-name="Screen Grabber" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="screengrabber_build" filter="s60" long-name="ScreenGrabber" purpose="development" class="tool">
-<unit bldFile="app/rndtools/screengrabber/group"/>
-</component>
-</collection>
-<collection name="stifui" long-name="STIF UI" level="generic">
-<component name="stifui_stifui" filter="s60" long-name="STIF UI" purpose="development">
-<unit bldFile="app/rndtools/stifui/stifui/group"/>
-</component>
-<component name="uitestserverstarter" filter="s60" long-name="UI Test Server Starter" purpose="development">
-<unit bldFile="app/rndtools/stifui/uitestserverstarter/group"/>
-</component>
-<component name="stifui_build" filter="s60" long-name="STIF UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/stifui/group"/>
-</component>
-</collection>
-<collection name="memspyui" long-name="Memspy UI" level="generic">
-<!-- collection is really a component. Should move down a directory -->
-<component name="memspyui_build" filter="s60" long-name="Memspy UI Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/memspyui/group"/>
-</component>
-</collection>
-<collection name="htiui" long-name="Harmonized Test Interface UI" level="generic">
-<component name="HtiCommPlugins" filter="s60" long-name="HTI Comm Plugins" purpose="development" plugin="Y">
-<unit bldFile="app/rndtools/htiui/HtiCommPlugins/HtiBtCommPlugin/group"/>
-</component>
-<component name="HtiServicePlugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- can only have a single unit. Should #include from a common bld.inf file -->
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiFtpBackupFake/group"/>
-</component>
-<component name="htidevicereboot" filter="s60" long-name="HTI Device Reboot" purpose="development">
-<unit bldFile="app/rndtools/htiui/htidevicereboot/group"/>
-</component>
-<component name="htistartupwait" filter="s60" long-name="HTI Startup Wait" purpose="development">
-<unit bldFile="app/rndtools/htiui/htistartupwait/group"/>
-</component>
-<component name="htiadmin" filter="s60" long-name="HTI Admin" purpose="development">
-<unit bldFile="app/rndtools/htiui/htiadmin/group"/>
-</component>
-<component name="htiui_build" filter="s60" long-name="HTI UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/htiui/group"/>
-</component>
-</collection>
-</block>
-<block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools if ui">
-<collection name="csxhelp" long-name="Context Sensitive Extended Help" level="if">
-<!-- this is really a component. Should move it down a directory -->
-<component name="csxhelp_build" filter="s60" long-name="Context Sensitive Extended Help Build">
-<unit bldFile="app/helps/csxhelp/group"/>
-</component>
-</collection>
-<collection name="symhelp" long-name="Symbian Help" level="eng">
-<component name="helpmodel" long-name="Help" introduced="6.0" purpose="optional">
-<unit bldFile="app/helps/symhelp/helpmodel/group" mrp="app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
-</component>
-</collection>
-<collection name="helps_info" long-name="Help Apps Info" level="ui">
-<component name="helps_metadata" long-name="Help Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/helps/helps_info/helps_metadata/helps_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
-<collection name="buildverification" long-name="Build Verification" level="services">
-<component name="autosmoketest" long-name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
-<unit bldFile="app/techview/buildverification/autosmoketest/Group" mrp="app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
-</component>
-<component name="smoketest" long-name="Smoke Test" filter="gt" purpose="development">
-<unit bldFile="app/techview/buildverification/smoketest/Group" mrp="app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
-</component>
-</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="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"/>
-<collection name="installationapps" long-name="Installation Apps" level="apps2"/>
-<collection name="messagingapps" long-name="Messaging Apps" level="apps2"/>
-<collection name="telephonyapps" long-name="Telephony Apps" level="apps1"/>
-<collection name="networkingapps" long-name="Networking Apps" level="apps1"/>
-<collection name="networkingutils" long-name="Networking Utils" level="utils"/>
-<collection name="shortlinkapps" long-name="Shortlink Apps" level="apps1"/>
-<collection name="testapps" long-name="Test Apps" level="utils"/>
-<collection name="avapps" long-name="A/V Apps" level="apps3"/>
-<collection name="toolkit" long-name="Toolkit" level="utils"/>
-<collection name="techview_info" long-name="Techview Info" level="apps3">
-<component name="techview_metadata" long-name="Techview Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/techview/techview_info/techview_metadata/techview_metadata.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
--- a/symbian3/single/sysdefs/auto/model_20100415171308_c004c9299c6f.xml Wed May 05 12:21:47 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10843 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a package or prebuilt -->
-<!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) "N"
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile may someday be removed in favour of mrp -->
-<!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
-<systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="low mw high">
-<block name="stubs" level="high" long-name="Stubs" levels="stub">
-<collection name="s60_stubs" level="stub">
-<component name="audiostubs" long-name="Audio Stubs">
-<unit bldFile="adaptation/stubs/audiostubs/group"/>
-</component>
-<component name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaptation Stub">
-<unit bldFile="adaptation/stubs/btaudioadaptation_stub/group"/>
-</component>
-<component name="drm_stubs" long-name="DRM Stubs">
-<unit bldFile="adaptation/stubs/drm_stubs/group"/>
-</component>
-<component name="ocrsrv_stub" long-name="OCR Services Stub">
-<unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
-</component>
-<component name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation">
-<unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
-</component>
-<component name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" plugin="Y">
-<unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
-</component>
-<component name="srsfenginestub" long-name="SRSF Engine Stub">
-<unit bldFile="adaptation/stubs/srsfenginestub/group"/>
-</component>
-<component name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub">
-<unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
-</component>
-<component name="systemswstubs" long-name="System Software Stubs">
-<unit bldFile="adaptation/stubs/systemswstubs/group"/>
-</component>
-<component name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" plugin="Y">
-<unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
-</component>
-<component name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub">
-<unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
-<collection name="omap3530" long-name="OMAP 3530" level="hw-if">
-<component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530" mrp="adaptation/beagleboard/omap3530/base_beagle.mrp"/>
-</component>
-<component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/kernel"/>
-</component>
-<component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/beagleboard"/>
-</component>
-</collection>
-</block>
-<block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
-<collection name="qemu_baseport" long-name="Baseport" level="hw-if">
-<component name="syborg" long-name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/qemu/baseport/syborg" mrp="adaptation/qemu/baseport/syborg/syborg.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
-<collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
-<component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
-<unit mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
-</component>
-</collection>
-<collection name="bsptemplate" long-name="Board Support Package Template" level="hw-if">
-<component name="asspandvariant" long-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 name="kernel" long-name="Kernel Architecture" level="adaptation">
-<component name="eka" long-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 name="kerneltest" long-name="Kernel Test" level="hw-if">
-<component name="e32utils" long-name="E32 Utilities" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32utils/group" mrp="os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/>
-</component>
-<component name="e32test" long-name="E32 Tests" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32test/group" mrp="os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
-</component>
-<component name="f32test" long-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 name="ldds" long-name="Logical Device Drivers" level="adaptation">
-<component name="ethernetldd" long-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 name="audioldd" long-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>
-<component name="serialldd" long-name="Serial Port Drivers" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
-</component>
-<component name="legacydrivers" long-name="Legacy Drivers" purpose="optional">
-<unit mrp="os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
-</component>
-<component name="locmedia" long-name="Local Media Subsystem" introduced="8.1b" purpose="mandatory">
-<!-- these are LDDs for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
-</component>
-<component name="runmodedebugger" long-name="Run Mode Debugger" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/debug/group" mrp="os/kernelhwsrv/kernel/eka/drivers/debug/group/base_e32_drivers_debug.mrp"/>
-</component>
-<component name="btrace" long-name="Kernel Trace Tool" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/trace" mrp="os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
-</component>
-<component name="cameraldd" long-name="Camera Drivers" introduced="^3" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/camerasc" mrp="os/kernelhwsrv/kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
-</component>
-<component name="displayldd" long-name="Display Drivers" introduced="^3" purpose="optional">
-<!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/display" mrp="os/kernelhwsrv/kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
-</component>
-<component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
-</component>
-</collection>
-<collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
-<component name="mediadrivers" long-name="Media Drivers" purpose="optional">
-<!-- these are for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/media" mrp="os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
-</component>
-<component name="genericboardsupport" long-name="Generic Board Support" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
-</component>
-</collection>
-<collection name="userlibandfileserver" long-name="User Library and File Server" level="framework">
-<component name="euser" long-name="User Library" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/euser" mrp="os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
-</component>
-<component name="compsupp" long-name="Compiler Runtime Support" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/compsupp" mrp="os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
-</component>
-<component name="fileserver" long-name="File Server" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
-</component>
-<component name="estart" long-name="Base Starter" filter="gt" purpose="optional">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
-</component>
-<component name="domainmgr" long-name="Domain Manager" introduced="8.1b" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
-</component>
-</collection>
-<collection name="filesystems" long-name="File Systems" level="framework">
-<component name="romfs" long-name="ROM File System" filter="gt" purpose="optional" plugin="Y">
-<unit mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
-</component>
-<component name="rofs" long-name="ROFS" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
-</component>
-<component name="usbmsfs" long-name="USB Mass Storage File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
-</component>
-<component name="usbhostmssrv" long-name="USB Host Mass Storage Server" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage/base_f32_shostmassstorage.mrp"/>
-</component>
-<component name="fat32fs" long-name="FAT32 File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
-</component>
-<component name="fatfs" long-name="FAT File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
-</component>
-<component name="compfs" long-name="Composite File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
-</component>
-</collection>
-<collection name="halservices" long-name="HAL Services" level="framework">
-<component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
-<unit bldFile="os/kernelhwsrv/halservices/hal" mrp="os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
-</component>
-</collection>
-<collection name="textmodeshell" long-name="Text Mode Shell" level="test">
-<component name="e32wsrv" long-name="Text Window Server" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/ewsrv" mrp="os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
-</component>
-<component name="textshell" long-name="Text Shell" filter="gt" purpose="development">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
-</component>
-</collection>
-<collection name="baseapitest" long-name="Base API Tests" level="test"/>
-<collection name="kernelhwsrv_info" long-name="Kernel and Hardware Services Info" level="test">
-<component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 config">
-<collection name="emulator" long-name="Emulator" level="bsp">
-<component name="emulatorbsp" long-name="Emulator BSP" purpose="optional">
-<unit bldFile="os/boardsupport/emulator/emulatorbsp" mrp="os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
-</component>
-</collection>
-<collection name="haitest" long-name="HAI Test Suites" level="test">
-<component name="bspsvs" long-name="BSP Verification Suite" introduced="^2" purpose="development">
-<unit mrp="os/boardsupport/haitest/bspsvs/group/bspsvs.mrp"/>
-</component>
-</collection>
-<collection name="boardsupport_info" long-name="Board Support Info" level="config">
-<component name="boardsupport_metadata" long-name="Board Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/boardsupport/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
-<collection name="bldsystemtools" long-name="Build System Tools" level="bld">
-<component name="sysdeftools" long-name="System Definition Tools" purpose="development" introduced="^2">
-<unit mrp="os/buildtools/bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
-</component>
-<component name="commonbldutils" long-name="Common Utils" purpose="development">
-<unit mrp="os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
-</component>
-</collection>
-<collection name="toolsandutils" long-name="Tools and Utils" level="mw">
-<component name="productionbldtools" long-name="Production Build Tools" filter="gt" purpose="development">
-<unit mrp="os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
-</component>
-<component name="e32tools" long-name="E32 Tools" deprecated="^2" purpose="development" class="PC">
-<unit bldFile="os/buildtools/toolsandutils/e32tools/group" mrp="os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
-</component>
-<component name="autotest" long-name="Autotest" purpose="development">
-<unit bldFile="os/buildtools/toolsandutils/autotest/group" mrp="os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
-</component>
-</collection>
-<collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
-<component name="e32toolp" long-name="E32 Perl Tools" purpose="development" filter="sf_build" class="PC">
-<unit mrp="os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="os/buildtools/sbsv1_os/e32toolp/group"/>
-</component>
-</collection>
-<collection name="imgtools_os" long-name="Image Tools" level="fw">
-<component name="romkiteka2" long-name="ROMKIT EKA2" deprecated="^2" purpose="development">
-<unit bldFile="os/buildtools/imgtools_os/romkiteka2/group" mrp="os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
-</component>
-</collection>
-<collection name="misccomponents" long-name="Misc Components" level="mw">
-<component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt" purpose="development">
-<unit bldFile="os/buildtools/misccomponents/emulatorlauncher/group" mrp="os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
-</component>
-</collection>
-<collection name="buildtools_info" long-name="Build Tools Info" level="ui">
-<component name="buildtools_metadata" long-name="Build Tools Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/buildtools/buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
-<collection name="ossrv_pub" long-name="Generic OS Services Public Interfaces" level="utilities">
-<component name="boost_apis" long-name="Boost APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/boost_apis/group"/>
-</component>
-<component name="cpp_wrappers" long-name="Cpp wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cpp_wrappers/group"/>
-</component>
-<component name="character_type_apis" long-name="Character Type APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/character_type_apis/group"/>
-</component>
-<component name="compiler_specific_runtime_support" long-name="Compiler Specific Runtime Support" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/compiler_specific_runtime_support/group"/>
-</component>
-<component name="ossrv_configuration_api" long-name="Generic OS Services Configuration API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/configuration/group"/>
-</component>
-<component name="crypto_authentication_codes_and_hash_functions_api" long-name="Crypto Authentication Codes and Hash Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
-</component>
-<component name="crypto_auxillary_functions_api" long-name="Crypto Auxillary Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_auxillary_functions_api/group"/>
-</component>
-<component name="crypto_certificates_api" long-name="Crypto Certificates API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_certificates_api/group"/>
-</component>
-<component name="crypto_inputoutput_and_data_encoding_api" long-name="Crypto Input/Output and Data Encoding API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
-</component>
-<component name="crypto_public_key_cryptography_and_key_agreement_api" long-name="Crypto Public Key Cryptography and Key Agreement API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
-</component>
-<component name="crypto_symmetric_ciphers_api" long-name="Crypto Symmetric Ciphers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_symmetric_ciphers_api/group"/>
-</component>
-<component name="crypto_utility_functions_api" long-name="Crypto Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_utility_functions_api/group"/>
-</component>
-<component name="cryptogaphy_related_api" long-name="Cryptogaphy Related API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cryptogaphy_related_api/group"/>
-</component>
-<component name="ossrv_debug_api" long-name="Generic OS Services Debug API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/debug/group"/>
-</component>
-<component name="ossrv_exceptions_api" long-name="Generic OS Services Exceptions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/exceptions/group"/>
-</component>
-<component name="gboxed" long-name="GBoxed API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gboxed/group"/>
-</component>
-<component name="glib_arrays" long-name="Glib Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_arrays/group"/>
-</component>
-<component name="glib_asynchronous_queues" long-name="Glib Asynchronous Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_asynchronous_queues/group"/>
-</component>
-<component name="glib_atomic_operations" long-name="Glib Atomic Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_atomic_operations/group"/>
-</component>
-<component name="glib_automatic_string_completion" long-name="Glib Automatic String Completion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_automatic_string_completion/group"/>
-</component>
-<component name="glib_balanced_binary_trees" long-name="Glib Balanced Binary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_balanced_binary_trees/group"/>
-</component>
-<component name="glib_basic_types" long-name="Glib Basic Types API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_basic_types/group"/>
-</component>
-<component name="glib_caches" long-name="Glib Caches API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_caches/group"/>
-</component>
-<component name="glib_character_set_conversion" long-name="Glib Character Set Conversion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_character_set_conversion/group"/>
-</component>
-<component name="glib_closures" long-name="Glib Closures API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_closures/group"/>
-</component>
-<component name="glib_commandline_option_parser" long-name="Glib Command Line Option Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_commandline_option_parser/group"/>
-</component>
-<component name="glib_datasets" long-name="Glib Datasets API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_datasets/group"/>
-</component>
-<component name="glib_date_and_time_functions" long-name="Glib Date and Time Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_date_and_time_functions/group"/>
-</component>
-<component name="glib_doubleended_queues" long-name="Glib Double-ended Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doubleended_queues/group"/>
-</component>
-<component name="glib_doublylinked_lists" long-name="Glib Doubly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doublylinked_lists/group"/>
-</component>
-<component name="glib_dynamic_loading_of_modules" long-name="Glib Dynamic Loading of Modules API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_dynamic_loading_of_modules/group"/>
-</component>
-<component name="glib_enums_and_flags" long-name="Glib Enums and Flags API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_enums_and_flags/group"/>
-</component>
-<component name="glib_error_reporting" long-name="Glib Error Reporting API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_error_reporting/group"/>
-</component>
-<component name="glib_file_utilities" long-name="Glib File Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_file_utilities/group"/>
-</component>
-<component name="glib_generic_values" long-name="Glib Generic Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_generic_values/group"/>
-</component>
-<component name="glib_globstyle_pattern_matching" long-name="Glib Glob-Style Pattern Matching API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_globstyle_pattern_matching/group"/>
-</component>
-<component name="glib_hash_tables" long-name="Glib Hash Tables API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hash_tables/group"/>
-</component>
-<component name="glib_hook_functions" long-name="Glib Hook Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hook_functions/group"/>
-</component>
-<component name="glib_internationalization" long-name="Glib Internationalization API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_internationalization/group"/>
-</component>
-<component name="glib_io_channels" long-name="Glib I/O Channels API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_io_channels/group"/>
-</component>
-<component name="glib_keyvalue_file_parser" long-name="Glib Key-Value File Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_keyvalue_file_parser/group"/>
-</component>
-<component name="glib_lexical_scanner" long-name="Glib Lexical Scanner API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_lexical_scanner/group"/>
-</component>
-<component name="glib_main_event_loop" long-name="Glib Main Event Loop API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_main_event_loop/group"/>
-</component>
-<component name="glib_memory_allocation" long-name="Glib Memory Allocation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_allocation/group"/>
-</component>
-<component name="glib_memory_slices" long-name="Glib Memory Slices API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_slices/group"/>
-</component>
-<component name="glib_message_logging" long-name="Glib Message Logging API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_message_logging/group"/>
-</component>
-<component name="glib_miscellaneous_utility_functions" long-name="Glib Miscellaneous Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_miscellaneous_utility_functions/group"/>
-</component>
-<component name="glib_nary_trees" long-name="Glib N-ary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_nary_trees/group"/>
-</component>
-<component name="glib_parameters_and_values" long-name="Glib Parameters and Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_parameters_and_values/group"/>
-</component>
-<component name="glib_quarks" long-name="Glib Quarks API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_quarks/group"/>
-</component>
-<component name="glib_random_numbers" long-name="Glib Random Numbers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_random_numbers/group"/>
-</component>
-<component name="glib_relations_and_tuples" long-name="Glib Relations and Tuples API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_relations_and_tuples/group"/>
-</component>
-<component name="glib_shellrelated_utilities" long-name="Glib Shell-related Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_shellrelated_utilities/group"/>
-</component>
-<component name="glib_signals" long-name="Glib Signals API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_signals/group"/>
-</component>
-<component name="glib_simple_xml_subset_parser" long-name="Glib Simple XML Subset Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_simple_xml_subset_parser/group"/>
-</component>
-<component name="glib_singlylinked_lists" long-name="Glib Singly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_singlylinked_lists/group"/>
-</component>
-<component name="glib_spawning_processes" long-name="Glib Spawning Processes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_spawning_processes/group"/>
-</component>
-<component name="glib_standard_macros" long-name="Glib Standard Macros API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_standard_macros/group"/>
-</component>
-<component name="glib_string_utility_functions" long-name="Glib String Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_string_utility_functions/group"/>
-</component>
-<component name="glib_strings" long-name="Glib Strings API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_strings/group"/>
-</component>
-<component name="glib_thread_pools" long-name="Glib Thread Pools API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_thread_pools/group"/>
-</component>
-<component name="glib_threads" long-name="Glib Threads API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_threads/group"/>
-</component>
-<component name="glib_timers" long-name="Glib Timers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_timers/group"/>
-</component>
-<component name="glib_unicode_manipulation" long-name="Glib Unicode Manipulation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_unicode_manipulation/group"/>
-</component>
-<component name="glib_value_arrays" long-name="Glib Value Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_value_arrays/group"/>
-</component>
-<component name="glib_varargs_value_collection" long-name="Glib Varargs Value Collection API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_varargs_value_collection/group"/>
-</component>
-<component name="gobject" long-name="GObject API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gobject/group"/>
-</component>
-<component name="gparamspec" long-name="GParamSpec API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gparamspec/group"/>
-</component>
-<component name="gtype" long-name="GType API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtype/group"/>
-</component>
-<component name="gtypemodule" long-name="GTypeModule API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypemodule/group"/>
-</component>
-<component name="gtypeplugin" long-name="GTypePlugin API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypeplugin/group"/>
-</component>
-<component name="io_stream_api" long-name="I/O stream API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/io_stream_api/group"/>
-</component>
-<component name="localization_function_api" long-name="Localization Function API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/localization_function_api/group"/>
-</component>
-<component name="math_operations_api" long-name="Math Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/math_operations_api/group"/>
-</component>
-<component name="ossrv_memory_api" long-name="Generic OS Services Memory API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/memory/group"/>
-</component>
-<component name="no_namespace_headers" long-name="No Namespace Headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/no_namespace_headers/group"/>
-</component>
-<component name="openc_headers" long-name="OpenC headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_headers/group"/>
-</component>
-<component name="openc_wrappers" long-name="OpenC wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_wrappers/group"/>
-</component>
-<component name="ssl_general_api" long-name="SSL General API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_general_api/group"/>
-</component>
-<component name="ssl_protocol_methods_api" long-name="SSL Protocol Methods API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_protocol_methods_api/group"/>
-</component>
-<component name="standard_compressiondecompression_api" long-name="Standard Compression/Decompression API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/standard_compressiondecompression_api/group"/>
-</component>
-<component name="stl" long-name="STL API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/stl/group"/>
-</component>
-<component name="thread_api" long-name="Thread API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/thread_api/group"/>
-</component>
-<component name="type_attributes" long-name="Type Attributes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/type_attributes/group"/>
-</component>
-<component name="typeinfo" long-name="Type Info API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/typeinfo/group"/>
-</component>
-<component name="utility_apis" long-name="Utility APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/utility_apis/group"/>
-</component>
-<component name="wide_character_classapis" long-name="Wide character class/apis" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/wide_character_classapis/group"/>
-</component>
-<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">
-<unit bldFile="os/ossrv/ossrv_pub/dbus-glib/group"/>
-</component>
-</collection>
-<collection name="ossrv_plat" long-name="Generic OS Services Platform Interfaces" level="utilities">
-<component name="libutils_apis" long-name="Utility Library APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_plat/libutils/group"/>
-</component>
-</collection>
-<collection name="stdlibs" long-name="Standard Libraries" level="translation">
-<component name="libz" filter="s60" long-name="Z Compression Library">
-<unit bldFile="os/ossrv/stdlibs/libz/group"/>
-</component>
-<component name="libcrypt" filter="s60" long-name="Crypt Library">
-<unit bldFile="os/ossrv/stdlibs/libcrypt/group"/>
-</component>
-</collection>
-<collection name="ssl" long-name="SSL" level="data-services">
-<component name="libcrypto" filter="s60" long-name="Crypto Library">
-<unit bldFile="os/ossrv/ssl/libcrypto/group"/>
-</component>
-<component name="libssl" filter="s60" purpose="development" long-name="SSL Library">
-<unit bldFile="os/ossrv/ssl/libssl/group"/>
-</component>
-</collection>
-<collection name="glib" long-name="GLib" level="utilities">
-<component name="glibbackend" filter="s60" long-name="GLib Backend">
-<unit bldFile="os/ossrv/glib/glibbackend/group"/>
-</component>
-<component name="libglib" filter="s60" long-name="GLib Library">
-<unit bldFile="os/ossrv/glib/libglib/group"/>
-</component>
-<component name="libgthread" filter="s60" long-name="Libg Thread">
-<unit bldFile="os/ossrv/glib/libgthread/group"/>
-</component>
-<component name="libgmodule" filter="s60" long-name="Libg Module">
-<unit bldFile="os/ossrv/glib/libgmodule/group"/>
-</component>
-<component name="libgobject" filter="s60" long-name="Libg Object">
-<unit bldFile="os/ossrv/glib/libgobject/group"/>
-</component>
-</collection>
-<collection name="stdcpp" long-name="C++ Standard Library" level="translation">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="stdcpp_build" filter="s60" long-name="Stdcpp">
-<unit bldFile="os/ossrv/stdcpp/group"/>
-</component>
-</collection>
-<collection name="ofdbus" long-name="Open Foundation D-Bus" level="utilities">
-<component name="dbus" filter="s60" long-name="D-Bus">
-<unit bldFile="os/ossrv/ofdbus/dbus/group"/>
-</component>
-<component name="dbus-glib" filter="s60" long-name="D-Bus GLib">
-<unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
-</component>
-<component name="ofdbus_rom" filter="s60" long-name="D-Bus ROM">
-<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory
- Consider moving IBY file to one of the above as well and removing this component entirely -->
-<unit bldFile="os/ossrv/ofdbus/group"/>
-</component>
-</collection>
-<collection name="utilitylibraries" long-name="Utility Libraries" level="encoding">
-<component name="libutils" filter="s60" long-name="Utility Library">
-<unit bldFile="os/ossrv/utilitylibraries/libutils/group"/>
-</component>
-</collection>
-<collection name="genericservices" long-name="Generic Services" level="utilities">
-<component name="s60compatibilityheaders" long-name="S60 Compatibility Headers" filter="gt" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp" version="tb101sf"/>
-</component>
-<component name="mimerecognitionfw" long-name="MIME Recognition Framework" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/mimerecognitionfw/group" mrp="os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
-</component>
-<component name="systemagent" long-name="System Agent" introduced="9.0" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/systemagent/group" mrp="os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
-</component>
-<component name="taskscheduler" long-name="Task Scheduler" introduced="6.0" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/taskscheduler/group" mrp="os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
-</component>
-<component name="activebackupclient" long-name="Active Backup Client" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/activebackupclient/group" mrp="os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
-</component>
-<component name="syslibsdocs" long-name="Syslibs Documentation" purpose="development" class="doc">
-<unit mrp="os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
-</component>
-<component name="httputils" long-name="HTTP Utilities Library" introduced="6.2" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/httputils/group" mrp="os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
-</component>
-</collection>
-<collection name="syslibsapitest" long-name="SysLibs API Tests" level="utilities"/>
-<collection name="compressionlibs" long-name="Compression Libraries" level="data-services">
-<component name="ziplib" long-name="Zip Compression Library" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/ossrv/compressionlibs/ziplib/group" mrp="os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
-</component>
-</collection>
-<collection name="genericopenlibs" long-name="Generic Open Libraries" level="translation">
-<component name="cstdlib" long-name="C Standard Library" introduced="ER5" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/cstdlib/group" mrp="os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
-</component>
-<component name="cppstdlib" long-name="C++ Standard Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/cppstdlib/group" mrp="os/ossrv/genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
-</component>
-<component name="openenvcore" long-name="Open Environment Core" introduced="^2" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/openenvcore/group" mrp="os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
-</component>
-<component name="posixrealtimeextensions" long-name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/posixrealtimeextensions/group" mrp="os/ossrv/genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
-</component>
-</collection>
-<collection name="lowlevellibsandfws" long-name="Low Level Libraries and Frameworks" level="app-libs">
-<component name="pluginfw" long-name="Plugin Framework" introduced="6.2" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp" version="3"/>
-</component>
-<component name="apputils" long-name="Application Utilities" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/apputils/group" mrp="os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
-</component>
-<component name="genericusabilitylib" long-name="Generic Usability Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/genericusabilitylib/group" mrp="os/ossrv/lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
-</component>
-</collection>
-<collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
-<component name="ossrv_build" filter="s60" long-name="Generic OS Services Build">
-<!-- exports should be moved to individual components -->
-<unit bldFile="os/ossrv/group"/>
-</component>
-<component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="featuremgmt" long-name="Feature Management" level="framework">
-<component name="featuremgr" long-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 name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/persistentdata/featuremgmt/featureregistry/group" mrp="os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
-</component>
-</collection>
-<collection name="loggingservices" long-name="Logging Services" level="server">
-<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">
-<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">
-<unit bldFile="os/persistentdata/loggingservices/rfilelogger/group" mrp="os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
-</component>
-</collection>
-<collection name="traceservices" long-name="Trace Services" level="server">
-<component name="commsdebugutility" long-name="Comms Debug Utility" introduced="7.0s" purpose="optional">
-<unit bldFile="os/persistentdata/traceservices/commsdebugutility/group" mrp="os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
-</component>
-<component name="tracefw" long-name="Trace Framework" introduced="9.2" purpose="development">
-<unit bldFile="os/persistentdata/traceservices/tracefw/ulogger/group" mrp="os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
-</component>
-</collection>
-<collection name="persistentstorage" long-name="Persistent Storage" level="framework">
-<component name="store" long-name="Store" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/store/group" mrp="os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
-</component>
-<component name="dbms" long-name="DBMS" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/dbms/group" mrp="os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
-</component>
-<component name="centralrepository" long-name="Central Repository" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/persistentdata/persistentstorage/centralrepository/group" mrp="os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
-</component>
-<component name="sql" long-name="SQL" introduced="9.3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sql/GROUP" mrp="os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
-</component>
-<component name="sqlite3api" long-name="SQLite 3 API" introduced="^3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sqlite3api/GROUP" mrp="os/persistentdata/persistentstorage/sqlite3api/GROUP/syslibs_sqlite3.mrp"/>
-</component>
-</collection>
-<collection name="persistentdata_info" long-name="Persistent Data Services Info" level="app-if">
-<component name="persistentdata_metadata" long-name="Persistent Data Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/persistentdata/persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
-<component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
-</component>
-<component name="common_platform_security_definitions_api" long-name="Common Platform Security Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group"/>
-</component>
-<component name="feature_discovery_api" long-name="Feature Discovery API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/group"/>
-</component>
-<component name="platform_environment_api" long-name="Platform Environment API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_environment_api/group"/>
-</component>
-<component name="sensor_channel_api" long-name="Sensor Channel API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_channel_api/group"/>
-</component>
-<component name="sensor_definitions_api" long-name="Sensor Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_definitions_api/group"/>
-</component>
-<component name="version_info_api" long-name="Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/group"/>
-</component>
-<component name="accessory_monitoring_api" long-name="Accessory Monitoring API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/group"/>
-</component>
-<component name="haptics_api" long-name="Haptics API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/haptics_api/group"/>
-</component>
-<component name="sensor_data_compensator_api" long-name="Sensor Data Compensator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
-</component>
-</collection>
-<collection name="devicesrv_plat" long-name="Device Services Platform Interfaces" level="app-if">
-<component name="configuration_file_parser_api" long-name="Configuration File Parser API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/configuration_file_parser_api/group"/>
-</component>
-<component name="dos_extension_plugin_api" long-name="DOS Extension Plug-In API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_plugin_api/group"/>
-</component>
-<component name="mediator_command_initiator_api" long-name="Mediator Command Initiator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_initiator_api/group"/>
-</component>
-<component name="syslangutil_api" long-name="SysLangUtil API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/syslangutil_api/group"/>
-</component>
-<component name="wakeup_alarm_api" long-name="Wakeup Alarm API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/wakeup_alarm_api/group"/>
-</component>
-<component name="disk_and_memory_level_keys_api" long-name="Disk and Memory Level Keys API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_and_memory_level_keys_api/group"/>
-</component>
-<component name="mediator_plugin_api" long-name="Mediator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_plugin_api/group"/>
-</component>
-<component name="headset_status_api" long-name="Headset Status API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/headset_status_api/group"/>
-</component>
-<component name="system_startup_extension_plugin_api" long-name="System Startup Extension Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/system_startup_extension_plugin_api/group"/>
-</component>
-<component name="sensor_plugin_api" long-name="Sensor Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_plugin_api/group"/>
-</component>
-<component name="accessory_api" long-name="Accessory API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_api/group"/>
-</component>
-<component name="display_language_definition_api" long-name="Display Language Definition API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/display_language_definition_api/group"/>
-</component>
-<component name="mediator_command_responder_api" long-name="Mediator Command Responder API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_responder_api/group"/>
-</component>
-<component name="accessory_policy_definitions_api" long-name="Accessory Policy Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_definitions_api/group"/>
-</component>
-<component name="hw_settings_api" long-name="Hardware Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/hw_settings_api/group"/>
-</component>
-<component name="mediator_domain_definitions_api" long-name="Mediator Domain Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_domain_definitions_api/group"/>
-</component>
-<component name="sensor_extension_api" long-name="Sensor Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_extension_api/group"/>
-</component>
-<component name="accessory_plugin_api" long-name="Accessory Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_plugin_api/group"/>
-</component>
-<component name="sae_api" long-name="SAE API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sae_api/group"/>
-</component>
-<component name="accessory_control_api" long-name="Accessory Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_control_api/group"/>
-</component>
-<component name="mediator_static_registration_api" long-name="Mediator Static Registration API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_static_registration_api/group"/>
-</component>
-<component name="accessory_key_event_handling_api" long-name="Accessory Key Event Handling API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_key_event_handling_api/group"/>
-</component>
-<component name="mediator_notification_api" long-name="Mediator Notification API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_notification_api/group"/>
-</component>
-<component name="accessory_policy_utility_api" long-name="Accessory Policy Utility API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_utility_api/group"/>
-</component>
-<component name="common_dsy_plugin_api" long-name="Common DSY Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/common_dsy_plugin_api/group"/>
-</component>
-<component name="remote_control_extension_api" long-name="Remote Control Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/remote_control_extension_api/group"/>
-</component>
-<component name="sensor_channel_filter_api" long-name="Sensor Channel Filter API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_channel_filter_api/group"/>
-</component>
-<component name="dos_extension_api" long-name="DOS Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_api/group"/>
-</component>
-<component name="accessory_audio_control_api" long-name="Accessory Audio Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_audio_control_api/group"/>
-</component>
-<component name="mediator_event_consumer_api" long-name="Mediator Event Consumer API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_consumer_api/group"/>
-</component>
-<component name="shared_data_api" long-name="Shared Data API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/shared_data_api/group"/>
-</component>
-<component name="accessory_settings_api" long-name="Accessory Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_settings_api/group"/>
-</component>
-<component name="accessory_bluetooth_control_api" long-name="Accessory Bluetooth Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_bluetooth_control_api/group"/>
-</component>
-<component name="extended_version_info_api" long-name="Extended Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_api/group"/>
-</component>
-<component name="mediator_event_provider_api" long-name="Mediator Event Provider API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_provider_api/group"/>
-</component>
-<component name="tv_out_config_api" long-name="TV Out Config API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_config_api/group"/>
-</component>
-<component name="tspclientmapper_api" long-name="TSP Client Mapper API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tspclientmapper_api/group"/>
-</component>
-<component name="powersave_api" long-name="Power Save API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_api/group"/>
-</component>
-<component name="powersave_definitions_api" long-name="Power Save Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_definitions_api/group"/>
-</component>
-<component name="powersave_plugin_api" long-name="Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_plugin_api/group"/>
-</component>
-<component name="extended_version_info_plugin_api" long-name="Extended Version Info Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_plugin_api/group"/>
-</component>
-<component name="haptics_plugin_api" long-name="Haptics Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_plugin_api/group"/>
-</component>
-<component name="haptics_effect_data_getter_plugin_api" long-name="Haptics Effect Data Getter Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
-</component>
-<component name="haptics_packetizer_plugin_api" long-name="Haptics Packetizer Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_packetizer_plugin_api/group"/>
-</component>
-<component name="tiltcompensation_api" long-name="Tilt Compensation API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tiltcompensation_api/group"/>
-</component>
-<component name="disk_notification_handler_api" long-name="Disk Notification Handler API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_notification_handler_api/group"/>
-</component>
-<component name="accessory_policy_usb_audio_api" long-name="Accessory Policy USB Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_usb_audio_api/group"/>
-</component>
-<component name="accessory_policy_hdmi_audio_api" long-name="Accessory Policy HDMI Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_hdmi_audio_api/group"/>
-</component>
-<component name="sensor_data_compensator_plugin_api" long-name="Sensor Data Compensator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
-</component>
-<component name="ddc_access_api" long-name="DDC Access API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/ddc_access_api/group"/>
-</component>
-<component name="tv_out_behaviour_api" long-name="TV Out Behaviour API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_behaviour_api/group"/>
-</component>
-</collection>
-<collection name="accessoryservices" long-name="Accessory Services" level="framework">
-<component name="accessorymonitor" filter="s60" long-name="Accessory Monitor">
-<unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/group"/>
-</component>
-<component name="accessoryremotecontrol" filter="s60" long-name="Accessory Remote Control">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
-</component>
-<component name="accessoryserver" filter="s60" long-name="Accessory Server">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryserver/group"/>
-</component>
-<component name="pluggeddisplay" filter="s60" long-name="Plugged Display" introduced="^3">
-<unit bldFile="os/devicesrv/accessoryservices/pluggeddisplay/group"/>
-</component>
-<component name="headsetstatusapi" filter="s60" long-name="Headset Status API">
-<unit bldFile="os/devicesrv/accessoryservices/headsetstatusapi/group"/>
-</component>
-<component name="tspclientmapper" filter="s60" long-name="TSP Client Mapper">
-<unit bldFile="os/devicesrv/accessoryservices/tspclientmapper/group"/>
-</component>
-<component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional">
-<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
-</component>
-<component name="gid_pc_tool" filter="s60" long-name="Generic ID PC Tool" class="tool PC">
-<unit bldFile="os/devicesrv/accessoryservices/gid_pc_tool/group"/>
-</component>
-</collection>
-<collection name="commonservices" long-name="Common Services" level="app-if">
-<component name="commonengine" filter="s60" long-name="Common Engine">
-<unit bldFile="os/devicesrv/commonservices/commonengine/group"/>
-</component>
-<component name="commonengineresources" filter="s60" long-name="Common Engine Resources" class="config">
-<unit bldFile="os/devicesrv/commonservices/commonengineresources/group"/>
-</component>
-<component name="platformenv" filter="s60" long-name="Platform Environment">
-<unit bldFile="os/devicesrv/commonservices/platformenv/group"/>
-</component>
-<component name="sysutil" long-name="System Utilities" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/sysutil/group" mrp="os/devicesrv/commonservices/sysutil/group/sysutil.mrp"/>
-</component>
-<component name="activitymanager" long-name="Activity Manager" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/activitymanager/group" mrp="os/devicesrv/commonservices/activitymanager/group/activitymanager.mrp"/>
-</component>
-</collection>
-<collection name="dosservices" long-name="Domestic Operating System Services" level="hw-if">
-<component name="commondsy" filter="s60" long-name="Common DSY" plugin="Y">
-<unit bldFile="os/devicesrv/dosservices/commondsy/group"/>
-</component>
-<component name="dosserver" filter="s60" long-name="Domestic OS Server">
-<unit bldFile="os/devicesrv/dosservices/dosserver/group"/>
-</component>
-</collection>
-<collection name="sensorservices" long-name="Sensor Services" level="framework">
-<component name="sensorserver" filter="s60" long-name="Sensor Server">
-<unit bldFile="os/devicesrv/sensorservices/sensorserver/group"/>
-</component>
-<component name="orientationssy" filter="s60" long-name="Orientation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/orientationssy/group"/>
-</component>
-<component name="tiltcompensationssy" filter="s60" long-name="Tilt Compensation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/tiltcompensationssy/group"/>
-</component>
-<component name="sensordatacompensator" filter="s60" long-name="Sensor Data Compensator">
-<unit bldFile="os/devicesrv/sensorservices/sensordatacompensator/group"/>
-</component>
-</collection>
-<collection name="hwrmhaptics" long-name="HWRM Haptics" level="plugin">
-<component name="hapticseffectdatagetterfw" filter="s60" long-name="Haptics Effect Data Getter Framework">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
-</component>
-<component name="hapticspluginservice" filter="s60" long-name="Haptics Plugin Service">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
-</component>
-<component name="hapticspacketizer" filter="s60" long-name="Haptics Packetizer">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
-</component>
-<component name="hapticspluginmanager" filter="s60" long-name="Haptics Plugin Manager">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
-</component>
-<component name="hapticsserver" filter="s60" long-name="Haptics Server">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsserver/group"/>
-</component>
-<component name="hapticsclient" filter="s60" long-name="Haptics Client">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsclient/group"/>
-</component>
-<component name="hwrmhaptics_build" filter="s60" long-name="HWRM Haptics Build">
-<!-- move these exports into the appropriate above components and delete this component-->
-<unit bldFile="os/devicesrv/hwrmhaptics/group"/>
-</component>
-</collection>
-<collection name="mediator" long-name="Mediator" level="app-if">
-<!--collection is really a component. Move it down a directory -->
-<component name="mediator_build" filter="s60" long-name="Mediator Build">
-<unit bldFile="os/devicesrv/mediator/group"/>
-</component>
-</collection>
-<collection name="psmservices" long-name="Power Save Mode Services" level="app-if">
-<component name="psmserver" filter="s60" long-name="PSM Server">
-<unit bldFile="os/devicesrv/psmservices/psmserver/group"/>
-</component>
-</collection>
-<collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
-<component name="hwrmfmtxwatcherplugin" filter="s60" long-name="HWRM FM Transmitter Watcher Plugin" plugin="Y">
-<unit bldFile="os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
-</component>
-<component name="hwrmtargetmodifierplugin" filter="s60" long-name="HWRM Target Modifier Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build,
- may need to -->
-<!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
-</component>
-<component name="vibractrl" filter="s60" long-name="Vibra Control" deprecated="9.1">
-<unit bldFile="os/devicesrv/resourcemgmt/vibractrl/group"/>
-</component>
-<component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="^2" purpose="optional">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
-</component>
-<component name="hwresourcesmgrconfig" long-name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
-</component>
-<component name="resourcemgmt_build" filter="s60" long-name="Resource Management Build">
-<!-- Move exports to a self-contained component.
- This needs to be kept around until configuration is in place -->
-<unit bldFile="os/devicesrv/resourcemgmt/group"/>
-</component>
-<component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
-</component>
-</collection>
-<collection name="sysstatemgmt" long-name="System State Management" level="server">
-<component name="ssmmapperutility" filter="s60" long-name="SSM Mapper Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmmapperutility/group"/>
-</component>
-<component name="ssmpolicyplugins" filter="s60" long-name="SSM Policy Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmpolicyplugins/group"/>
-</component>
-<component name="ssmutilityplugins" filter="s60" long-name="SSM Utility Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmutilityplugins/group"/>
-</component>
-<component name="ssmcmdlists" filter="s60" long-name="SSM Command Lists" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcmdlists/group"/>
-</component>
-<component name="ssmcustcmds" filter="s60" long-name="SSM Custom Commands" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcustcmds/group"/>
-</component>
-<component name="syslangutil" filter="s60" long-name="System Language Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/syslangutil/group"/>
-</component>
-<component name="sysrestart" filter="s60" long-name="System Restart" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysrestart/group"/>
-</component>
-<component name="sysuiprovider" filter="s60" long-name="System UI Provider" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysuiprovider/group"/>
-</component>
-<component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/group" mrp="os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
-</component>
-<component name="systemstatemgr" long-name="System State Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
-</component>
-<component name="systemstateplugins" long-name="System State Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
-</component>
-<component name="systemstatereferenceplugins" long-name="System State Reference Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
-</component>
-</collection>
-<collection name="resourceinterfaces" long-name="Resource Interfaces" level="hw-if">
-<component name="fmtransmittercontrol" long-name="FM Transmitter Control" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group" mrp="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
-</component>
-</collection>
-<collection name="systemhealthmanagement" long-name="System Health Management" level="server">
-<component name="systemhealthmgr" long-name="System Health Manager" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
-</component>
-</collection>
-<collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if"/>
-<collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
-<component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
-<collection name="authenticationservices" long-name="Authentication Services" level="utilities">
-<component name="authenticationserver" long-name="Authentication Server" introduced="^3" purpose="optional">
-<unit bldFile="os/security/authenticationservices/authenticationserver/group" mrp="os/security/authenticationservices/authenticationserver/group/security_authserver.mrp"/>
-</component>
-</collection>
-<collection name="authorisation" long-name="Authorisation" level="utilities">
-<component name="userpromptservice" long-name="User Prompt Service" introduced="^3" purpose="mandatory">
-<unit bldFile="os/security/authorisation/userpromptservice/group" mrp="os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
-</component>
-<component name="userpromptutils" long-name="User Prompt Utils" introduced="^3" purpose="optional">
-<unit bldFile="os/security/authorisation/userpromptutils/group" mrp="os/security/authorisation/userpromptutils/group/security_ups_utils.mrp"/>
-</component>
-</collection>
-<collection name="contentmgmt" long-name="Content Management" level="utilities">
-<component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
-<unit bldFile="os/security/contentmgmt/contentaccessfwfordrm/group" mrp="os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
-</component>
-<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>
-</collection>
-<collection name="crypto" long-name="Crypto Libraries" level="libraries">
-<component name="weakcryptospi" long-name="Weak Crypto SPI" filter="gt" introduced="^3" purpose="optional">
-<unit bldFile="os/security/crypto/weakcryptospi/group" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
-</component>
-<component name="strongcryptospi" long-name="Strong Crypto SPI" filter="gt" introduced="^3" purpose="optional">
-<unit bldFile="os/security/crypto/weakcryptospi/strong" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
-</component>
-</collection>
-<collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
-<component name="securityutils" long-name="Security Utils" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/securityutils/group" mrp="os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
-</component>
-<component name="securitydocs" long-name="Security Documentation" purpose="development" class="doc">
-<unit mrp="os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
-</component>
-<component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
-</component>
-<component name="securitycommonutils" long-name="Security Common Utils" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/security/cryptomgmtlibs/securitycommonutils/group" mrp="os/security/cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
-</component>
-</collection>
-<collection name="securityanddataprivacytools" long-name="Security and Data Privacy Tools" level="services">
-<component name="securityconfig" long-name="Security Config" introduced="9.1" purpose="optional">
-<unit bldFile="os/security/securityanddataprivacytools/securityconfig/group" mrp="os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
-</component>
-<component name="securitytools" long-name="Security Tools" introduced="^3" purpose="optional" class="PC">
-<unit bldFile="os/security/securityanddataprivacytools/securitytools/group" mrp="os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
-</component>
-</collection>
-<collection name="cryptoplugins" long-name="Crypto Plugins" level="plugins">
-<component name="cryptospiplugins" long-name="Crypto SPI Plugins" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/security/cryptoplugins/cryptospiplugins/group" mrp="os/security/cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
-</component>
-</collection>
-<collection name="cryptoservices" long-name="Crypto Services" level="plugins">
-<component name="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/certificateandkeymgmt/group" mrp="os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
-</component>
-<component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
-</component>
-<component name="browserrootcertificates" long-name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
-<unit mrp="os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
-</component>
-<component name="rootcertificates" filter="sf_build" long-name="Root Certificates" introduced="7.0s" purpose="optional">
-<!-- not in S60 codebase -->
-<unit bldFile="os/security/cryptoservices/rootcertificates/group" mrp="os/security/cryptoservices/rootcertificates/group/rootcerts.mrp"/>
-</component>
-<component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/asnpkcs/group" mrp="os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
-</component>
-</collection>
-<collection name="security_info" long-name="OS Security Info" level="utilities">
-<component name="security_metadata" long-name="OS Security Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/security/security_info/security_metadata/security_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
-<collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
-<component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
-</component>
-<component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
-</component>
-<component name="simulationpositioningmodule" long-name="Simulation Positioning Module" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
-</component>
-<component name="gpspositioningmodule" long-name="GPS/A-GPS Positioning Module" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/gpspositioningmodule/group" mrp="os/lbs/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
-</component>
-<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>
-</collection>
-<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
-<component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
-</component>
-</collection>
-<collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
-<component name="locationserver" long-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 name="networkrequesthandler" long-name="Network Request Handler" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
-</component>
-</collection>
-<collection name="lbstest" long-name="Locating Services Tests" level="application-interface">
-<component name="locationprotocoltest" long-name="Location Protocol Tests" introduced="9.2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/lbstest/locationprotocoltest/group" mrp="os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
-</component>
-</collection>
-<collection name="locationmgmt" long-name="Location Management" level="management">
-<component name="locmonitor" long-name="Location Monitor" introduced="^3" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
-</component>
-<component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/agpslocationmgr/group" mrp="os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
-</component>
-<component name="networklocationmgr" long-name="Network Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/networklocationmgr/group" mrp="os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
-</component>
-<component name="locationcore" long-name="Location Core" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locationcore/group" mrp="os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
-</component>
-<component name="networkgateway" long-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 name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
-<component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
-</component>
-<component name="networkprotoutils" long-name="Network Protocol Common Utilities" introduced="^3">
-<unit bldFile="os/lbs/networkprotocolmodules/common/utils/group"/>
-</component>
-<component name="suplproxyprotocolmodule" long-name="SUPL Proxy Protocol Module" filter="sf_build" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/networkprotocolmodules/suplproxyprotocolmodule/sfgroup"/>
-</component>
-<component name="suplrrlpasn1" filter="sf_build" long-name="SUPL RRLP ASN1 Parser">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
-</component>
-<component name="suplrrlpprotocol" filter="sf_build" long-name="SUPL RRLP Protocol Module">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup"/>
-</component>
-</collection>
-<collection name="lbsapitest" long-name="Location API Tests" level="application-interface"/>
-<collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
-<component name="lbs_metadata" long-name="Locating Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commsfw" level="services" long-name="Communications Framework" levels="server support framework process app-if">
-<collection name="commsprocess" long-name="Comms Process" level="process">
-<component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/commsfw/commsprocess/commsrootserverconfig/group" mrp="os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
-</component>
-</collection>
-<collection name="commsconfig" long-name="Comms Config" level="process">
-<component name="commsdatabase" long-name="Comms Database" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
-</component>
-<component name="commsdatabaseshim" long-name="Comms Database Shim" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/commsfw/commsconfig/commsdatabaseshim/group" mrp="os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
-</component>
-</collection>
-<collection name="datacommsserver" long-name="Data Comms Server" level="framework">
-<component name="esockserver" long-name="ESock Server" purpose="mandatory">
-<unit bldFile="os/commsfw/datacommsserver/esockserver/group" mrp="os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp" version="3"/>
-</component>
-<component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/group" mrp="os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
-</component>
-<component name="networkingdialogstub" long-name="Networking Dialog Stub" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/default" mrp="os/commsfw/datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
-</component>
-<component name="networkcontroller" long-name="Network Controller" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/datacommsserver/networkcontroller/group" mrp="os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
-</component>
-</collection>
-<collection name="serialserver" long-name="Serial Server" level="server">
-<component name="serialportcsy" long-name="Serial Port CSY" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/serialserver/serialportcsy" mrp="os/commsfw/serialserver/serialportcsy/ser-comms_serialportcsy.mrp"/>
-</component>
-<component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" purpose="development">
-<unit bldFile="os/commsfw/serialserver/packetloopbackcsy/group" mrp="os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
-</component>
-<component name="c32serialserver" long-name="C32 Serial Server" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/commsfw/serialserver/c32serialserver/group" mrp="os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
-</component>
-<component name="c32serialserverconfig" long-name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config">
-<unit bldFile="os/commsfw/serialserver/c32serialserverconfig" mrp="os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
-</component>
-<component name="c32serialserverdocs" long-name="C32 Serial Server Documentation" purpose="development" class="doc">
-<unit mrp="os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
-</component>
-</collection>
-<collection name="commsfwutils" long-name="Comms Framework Utilities" level="framework">
-<component name="commsbufs" long-name="Comms Buffers" introduced="^3" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwutils/commsbufs/group" mrp="os/commsfw/commsfwutils/commsbufs/group/comms-infras_commsbufs.mrp"/>
-</component>
-</collection>
-<collection name="commsfw_info" long-name="Comms Framework Info" level="app-if">
-<component name="commsinfrastructuredocs" long-name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
-<unit mrp="os/commsfw/commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
-</component>
-<component name="commsfw_metadata" long-name="Communications Framework Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/commsfw/commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
-</component>
-</collection>
-<collection name="commsfwsupport" long-name="Comms Framework Support" level="support">
-<component name="commselements" long-name="Comms Elements" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwsupport/commselements/group" mrp="os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
-</component>
-</collection>
-<collection name="commsinfrastructureapitest" long-name="Comms-Infras API Tests" level="app-if">
-<component name="commsinfrastructuresvs" long-name="Comms Infrastructure Verification Suite" introduced="^3" purpose="development">
-<unit mrp="os/commsfw/commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
-</component>
-</collection>
-<collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
-<component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
-</component>
-<component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" purpose="mandatory" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
-</component>
-<component name="commstools" long-name="Comms Tools" introduced="^3" purpose="development" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/commstools/group" mrp="os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
-</component>
-</collection>
-</block>
-<block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
-<component name="internetsockets" long-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>
-<collection name="tcpiputils" long-name="TCP/IP Utilities" level="plugin">
-<component name="dnd" long-name="DND" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/dnd/group" mrp="os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
-</component>
-<component name="dhcp" long-name="DHCP" introduced="8.0" purpose="optional">
-<unit bldFile="os/networkingsrv/tcpiputils/dhcp/group" mrp="os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
-</component>
-<component name="networkaddressandporttranslation" long-name="Network Address and Port Translation" introduced="^2" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
-</component>
-<component name="punycodeconv" long-name="Punycode Converter" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/punycodeconv/group" mrp="os/networkingsrv/tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
-</component>
-</collection>
-<collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
-<component name="nullagt" long-name="NULL AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/nullagt/group" mrp="os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
-</component>
-<component name="genericscprparameters" long-name="Generic SCPR Parameters" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/linklayercontrol/genericscprparameters/group" mrp="os/networkingsrv/linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
-</component>
-<component name="mbmsparameters" long-name="MBMS Parameters" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/mbmsparameters/group" mrp="os/networkingsrv/linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
-</component>
-<component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
-<unit bldFile="os/networkingsrv/linklayercontrol/networkinterfacemgr/group" mrp="os/networkingsrv/linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp" version="2"/>
-</component>
-</collection>
-<collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
-<component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
-</component>
-<component name="pppnif" long-name="PPP NIF" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/pppnif/group" mrp="os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp" version="2"/>
-</component>
-<component name="slipnif" long-name="SLIP NIF" purpose="development" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/slipnif/group" mrp="os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
-</component>
-<component name="tunnelnif" long-name="Tunnel NIF" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
-</component>
-</collection>
-<collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
-<component name="packetlogger" long-name="Packet Logger" introduced="8.1" purpose="development">
-<unit bldFile="os/networkingsrv/linklayerutils/packetlogger/group" mrp="os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
-</component>
-</collection>
-<collection name="networkcontrol" long-name="Network Control" level="plugin">
-<component name="qoslib" long-name="QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/qoslib/group" mrp="os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
-</component>
-<component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/pfqoslib/group" mrp="os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
-</component>
-<component name="qosfwprt" long-name="QoS Framework PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
-</component>
-<component name="qosipscpr" long-name="QoS IP SCPR" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosipscpr/group" mrp="os/networkingsrv/networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
-</component>
-<component name="ipnetworklayer" long-name="IP Network Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/ipnetworklayer/group" mrp="os/networkingsrv/networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
-</component>
-<component name="iptransportlayer" long-name="IP Transport Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/iptransportlayer/group" mrp="os/networkingsrv/networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
-</component>
-<component name="commsuserpromptmgr" long-name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkcontrol/commsuserpromptmgr/group" mrp="os/networkingsrv/networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
-</component>
-</collection>
-<collection name="networkprotocols" long-name="Network Protocols" level="plugin">
-<component name="ipeventnotifier" long-name="IP Event Notifier" introduced="8.1" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
-</component>
-<component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
-</component>
-<component name="iphook" long-name="IP Hook" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
-</component>
-<component name="mobileip" long-name="Mobile IP" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/mobileip/group" mrp="os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
-</component>
-<component name="dnsproxy" long-name="DNS Proxy" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/networkprotocols/dnsproxy/group" mrp="os/networkingsrv/networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
-</component>
-</collection>
-<collection name="networksecurity" long-name="Network Security" level="framework">
-<component name="tls" long-name="TLS" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tls/group" mrp="os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
-</component>
-<component name="tlsprovider" long-name="TLS Provider" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tlsprovider/group" mrp="os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
-</component>
-<component name="ipsec" long-name="IPsec" introduced="7.0" purpose="optional">
-<unit bldFile="os/networkingsrv/networksecurity/ipsec/group" mrp="os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
-</component>
-</collection>
-<collection name="networkingtestandutils" long-name="Networking Test and Utils" level="app-if">
-<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">
-<!-- production component: contains the IBY files -->
-<unit bldFile="os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
-</component>
-<component name="networkingdocs" long-name="Networking Documentation" purpose="development" class="doc">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
-</component>
-<component name="networkingsrv_metadata" long-name="Networking Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
-<component name="predictorcompression" long-name="Predictor Compression" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wlan" level="services" long-name="WLAN" levels="hw low mid high tools test">
-<collection name="wlan_plat" long-name="WLAN Platform Interfaces" level="test">
-<component name="wlan_dbif_api" long-name="WLAN DBIF API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_dbif_api/group"/>
-</component>
-<component name="wlan_hal_api" long-name="WLAN HAL API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hal_api/group"/>
-</component>
-<component name="wlan_management_api" long-name="WLAN Management API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_management_api/group"/>
-</component>
-<component name="wlan_device_settings_api" long-name="WLAN Device Settings API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_device_settings_api/group"/>
-</component>
-<component name="wlan_control_api" long-name="WLAN Control API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_control_api/group"/>
-</component>
-<component name="wlan_hw_initialization_data_api" long-name="WLAN Hardware Initialization Data API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hw_initialization_data_api/group"/>
-</component>
-<component name="wlan_power_save_plugin_api" long-name="WLAN Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_power_save_plugin_api/group"/>
-</component>
-<component name="wlan_info_api" long-name="WLAN Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_info_api/group"/>
-</component>
-<component name="wlan_agent_hotspot_plugin_api" long-name="WLAN Agent Hotspot Plug-in API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
-</component>
-<component name="wlan_osa_api" long-name="WLAN OSA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_osa_api/group"/>
-</component>
-<component name="wlan_spia_api" long-name="WLAN SPIA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_spia_api/group"/>
-</component>
-<component name="wlan_hpa_api" long-name="WLAN HPA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hpa_api/group"/>
-</component>
-<component name="wlan_eapol_plugin_api" long-name="WLAN EAPOL Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_eapol_plugin_api/group"/>
-</component>
-<component name="wlan_generic_plugin_api" long-name="WLAN Generic Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_generic_plugin_api/group"/>
-</component>
-<component name="wlan_aws_plugin_api" long-name="WLAN AWS Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_aws_plugin_api/group"/>
-</component>
-</collection>
-<collection name="wlan_pub" long-name="WLAN Public Interfaces" level="test">
-<component name="wlan_sdk_info_api" long-name="WLAN SDK Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_pub/wlan_sdk_info_api/group"/>
-</component>
-</collection>
-<collection name="wlan_bearer" long-name="WLAN Bearer" level="hw">
-<component name="wlanpsmplugin" filter="s60" long-name="WLAN PSM Plugin" plugin="Y">
-<unit bldFile="os/wlan/wlan_bearer/wlanpsmplugin/group"/>
-</component>
-<component name="wlanagent" filter="s60" long-name="WLAN Agent">
-<unit bldFile="os/wlan/wlan_bearer/wlanagent/group"/>
-</component>
-<component name="wlandbif_cd" filter="s60" long-name="WLAN CommsDat interface">
-<unit bldFile="os/wlan/wlan_bearer/wlandbif_cd/group"/>
-</component>
-<!-- should follow component directory rules for stuff in wlan_symbian/ and put in a single component or split up properly -->
-<component name="wlanengine" filter="s60" long-name="WLAN Engine">
-<unit bldFile="os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
-</component>
-<component name="wlanldd" filter="s60" long-name="WLAN LDD">
-<unit bldFile="os/wlan/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
-</component>
-<component name="wlannwif" filter="s60" long-name="WLAN Network Interface">
-<unit bldFile="os/wlan/wlan_bearer/wlannwif/group"/>
-</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="adaptation hw-if plugin framework server app-if">
-<collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
-<component name="basebandchanneladaptor" long-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 name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
-<component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
-</component>
-</collection>
-<collection name="fax" long-name="Fax" level="server">
-<component name="faxclientandserver" long-name="Fax Client and Server" purpose="optional">
-<unit bldFile="os/cellularsrv/fax/faxclientandserver/Group" mrp="os/cellularsrv/fax/faxclientandserver/Group/telephony_fax.mrp"/>
-</component>
-</collection>
-<collection name="smsprotocols" long-name="SMS Protocols" level="framework">
-<component name="smsstack" long-name="SMS Stack" introduced="6.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/cellularsrv/smsprotocols/smsstack/group" mrp="os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
-</component>
-</collection>
-<collection name="telephonyprotocols" long-name="Telephony Protocols" level="framework">
-<component name="csdagt" long-name="CSD AGT" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/csdagt/group" mrp="os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
-</component>
-<component name="psdagt" long-name="PSD AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/psdagt/group" mrp="os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
-</component>
-<component name="gprsumtsqosprt" long-name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
-</component>
-<component name="gprsumtsqosinterface" long-name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
-</component>
-<component name="qosextnapi" long-name="QoS Extn API" introduced="9.2" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
-</component>
-<component name="secondarypdpcontextumtsdriver" long-name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
-</component>
-<component name="qos3gppcpr" long-name="QoS 3GPP CPR" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
-</component>
-<component name="pdplayer" long-name="PDP Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/pdplayer/group" mrp="os/cellularsrv/telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
-</component>
-<component name="rawipnif" long-name="Raw IP NIF" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserver" long-name="Telephony Server" level="server">
-<component name="etelserverandcore" long-name="ETel Server and Core" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
-</component>
-<component name="etelmultimode" long-name="ETel Multimode" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelmultimode/group" mrp="os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
-</component>
-<component name="etelpacketdata" long-name="ETel Packet Data" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
-</component>
-<component name="etelsimtoolkit" long-name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
-<component name="common_tsy" long-name="Common TSY" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
-</component>
-<component name="licenseetsystub" long-name="Licensee TSY Stub" introduced="^2" purpose="development" filter="sf_build" plugin="Y">
-<unit mrp="os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="os/cellularsrv/telephonyserverplugins/licenseetsystub/group"/>
-</component>
-<component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
-</component>
-<component name="simtsy" long-name="SIM TSY" introduced="7.0" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
-</component>
-<component name="ctsydispatchlayer" long-name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
-</component>
-<component name="simatktsy" long-name="SIMATK TSY" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simatktsy/group" mrp="os/cellularsrv/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
-</component>
-</collection>
-<collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
-<component name="dial" long-name="Dial" deprecated="9.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyutils/dial/group" mrp="os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
-</component>
-<component name="telephonywatchers" long-name="Telephony Watchers" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
-</component>
-<component name="etel3rdpartyapi" long-name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrv_info" long-name="Cellular Baseband Services Info" level="app-if">
-<component name="telephonyconfidentialdocs" long-name="Telephony Confidential Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
-</component>
-<component name="telephonydocs" long-name="Telephony Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
-</component>
-<component name="cellularsrv_metadata" long-name="Cellular Baseband Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
-<component name="mocksy" long-name="MockSY" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if"/>
-</block>
-<block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
-<collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
-<component name="bluetooth_audio_adaptation_api" long-name="Bluetooth Audio Adaptation API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
-</component>
-<component name="bluetooth_power_management_api" long-name="Bluetooth Power Management API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_power_management_api/group"/>
-</component>
-<component name="at_command_handler_plugin_api" long-name="AT Command Handler Plugin API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/at_command_handler_plugin_api/group"/>
-</component>
-</collection>
-<collection name="bluetooth" long-name="Bluetooth Core" level="framework">
-<component name="btstack" long-name="Bluetooth Stack" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btstack" mrp="os/bt/bluetooth/btstack/bluetooth_stack.mrp"/>
-</component>
-<component name="btcomm" long-name="Bluetooth CSY" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetooth/btcomm" mrp="os/bt/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
-</component>
-<component name="btsdp" long-name="Bluetooth SDP" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btsdp" mrp="os/bt/bluetooth/btsdp/bluetooth_sdp.mrp"/>
-</component>
-<component name="btextnotifiers" long-name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btextnotifiers" mrp="os/bt/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
-</component>
-<component name="gavdp" long-name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/gavdp/group" mrp="os/bt/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
-</component>
-<component name="btlogger" long-name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btlogger/group" mrp="os/bt/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
-</component>
-<component name="btdocs" long-name="Bluetooth Documentation" purpose="development" class="doc">
-<unit mrp="os/bt/bluetooth/btdocs/bluetooth_documentation.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothmgmt" long-name="Bluetooth Management" level="plugin">
-<component name="btmgr" long-name="Bluetooth Manager" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btmgr" mrp="os/bt/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
-</component>
-<component name="btconfig" long-name="Bluetooth Config" purpose="optional" class="config">
-<unit bldFile="os/bt/bluetoothmgmt/btconfig" mrp="os/bt/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
-</component>
-<component name="btrom" long-name="Bluetooth ROM" introduced="9.1" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btrom" mrp="os/bt/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
-</component>
-<component name="bluetoothclientlib" long-name="Bluetooth Client Library" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/bluetoothclientlib" mrp="os/bt/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothcommsprofiles" long-name="Bluetooth Comms Profiles" level="app-if">
-<component name="btpan" long-name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetoothcommsprofiles/btpan/group" mrp="os/bt/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
-</component>
-</collection>
-<collection name="bthci" long-name="Host Controller Interface" level="server">
-<component name="bthci2" long-name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bthci/bthci2/group" mrp="os/bt/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
-</component>
-<component name="hciextensioninterface" long-name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bthci/hciextensioninterface" mrp="os/bt/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
-</component>
-<component name="hci2implementations" long-name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bthci/hci2implementations/group" mrp="os/bt/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
-</component>
-</collection>
-<collection name="irda" long-name="IrDA" level="plugin">
-<component name="irdastack" long-name="IrDA Stack" purpose="optional">
-<unit bldFile="os/bt/irda/irdastack/group" mrp="os/bt/irda/irdastack/group/infra-red_irda.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if"/>
-<collection name="atext" long-name="AT Extensions" level="server">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="atext_build" long-name="AT Extension Build" introduced="^3" purpose="optional" filter="s60">
-<unit bldFile="os/bt/atext/group"/>
-</component>
-</collection>
-<collection name="bt_info" long-name="Bluetooth Info" level="app-if">
-<component name="bt_metadata" long-name="Bluetooth Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/bt/bt_info/bt_metadata/bt_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
-<collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
-<!-- usbclientdrivers to be moved here from kernelhwsrv-->
-</collection>
-<collection name="usbmgmt" long-name="USB Management" level="server">
-<component name="usbmgr" long-name="USB Manager" purpose="optional">
-<unit bldFile="os/usb/usbmgmt/usbmgr/group" mrp="os/usb/usbmgmt/usbmgr/group/usb_manager.mrp" version="2"/>
-</component>
-<component name="usbclassandmgrdocs" long-name="USB Class and Manager Documentation" purpose="development" class="doc">
-<unit mrp="os/usb/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
-</component>
-</collection>
-<collection name="usb_info" long-name="USB Info" level="app-if">
-<component name="usb_metadata" long-name="USB Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/usb/usb_info/usb_metadata/usb_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="mm" level="services" long-name="Multimedia" levels="adaptation 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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-</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"/>
-</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"/>
-</component>
-<component name="aac_decoder_config_proxy_api" long-name="AAC Decoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/aac_decoder_config_proxy_api/group"/>
-</component>
-<component name="added_devsound_control_api" long-name="Added DevSound Control API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_api/group"/>
-</component>
-<component name="added_devsound_control_msg_hdlr_api" long-name="Added DevSound Control Msg Hdlr API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_msg_hdlr_api/group"/>
-</component>
-<component name="added_devsound_control_proxy_api" long-name="Added DevSound Control Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_proxy_api/group"/>
-</component>
-<component name="audio_effects_msg_hdlr_api" long-name="Audio Effects Message Handler API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_msg_hdlr_api/group"/>
-</component>
-<component name="audio_effects_proxy_api" long-name="Audio Effects Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_proxy_api/group"/>
-</component>
-<component name="audio_policy_header_api" long-name="Audio Policy Header API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="audio_routing_proxy_api" long-name="Audio Routing Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_routing_proxy_api/group"/>
-</component>
-<component name="custom_interface_builder_api" long-name="Custom Interface Builder API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_builder_api/group"/>
-</component>
-<component name="custom_interface_message_handler_factory_api" long-name="Custom Interface Message Handler Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_message_handler_factory_api/group"/>
-</component>
-<component name="custom_interface_proxy_factory_api" long-name="Custom Interface Proxy Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_proxy_factory_api/group"/>
-</component>
-<component name="custom_interface_utility_api" long-name="Custom Interface Utility API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_utility_api/group"/>
-</component>
-<component name="devsound_adaptation_api" long-name="DevSound Adaptation API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/devsound_adaptation_api/group"/>
-</component>
-<component name="display_posting_api" long-name="Display Posting API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="eaac_plus_decoder_interface_proxy_api" long-name="eAAC Plus Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="error_concealment_interface_proxy_api" long-name="Error Concealment Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
-</component>
-<component name="fm_radio_adaptation_api" long-name="FM Radio Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_decoder_interface_proxy_api" long-name="G711 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_encoder_interface_proxy_api" long-name="G711 Encoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_decoder_interface_proxy_api" long-name="G729 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_encoder_interface_msg_hdlr_api" long-name="G729 Encoder Interface Message Handler API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</component>
-<component name="ilbc_decoder_interface_proxy_api" long-name="Ilbc Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ilbc_encoder_interface_proxy_api" long-name="Ilbc Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="mdf_plugin_uids" long-name="MDF Plug-in UIDs" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/mdf_plugin_uids/group"/>
-</component>
-<component name="multimedia_fourcc_definitions_api" long-name="Multimedia FourCC Definitions API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/multimedia_fourcc_definitions_api/group"/>
-</component>
-<component name="nokia_audio_policy_header_api" long-name="Nokia Audio Policy Header API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/nokia_audio_policy_header_api/group"/>
-</component>
-<component name="nokia_multimedia_fourcc_definitions_api" long-name="Nokia Multimedia Fourcc Definitions API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ra8_decoder_interface_proxy_api" long-name="RA8 Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
-</component>
-<component name="rds_adaptation_api" long-name="RDS Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="restricted_audio_output_proxy_api" long-name="Restricted Audio Output Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="sbc_encoder_interface_proxy_api" long-name="SBC Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/sbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="secure_output_mdf_custom_interface" long-name="Secure Output MDF Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="speech_encoder_config_proxy_api" long-name="Speech Encoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/speech_encoder_config_proxy_api/group"/>
-</component>
-<component name="telephony_audio_routing_client_api" long-name="Telephony Audio Routing Client API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_client_api/group"/>
-</component>
-<component name="telephony_audio_routing_manager_api" long-name="Telephony Audio Routing Manager API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_manager_api/group"/>
-</component>
-<component name="video_buffer_management_mdf_custom_interface" long-name="Video Buffer Management MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_buffer_management_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_rotation_mdf_custom_interface" long-name="Video Decoder Rotation MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_scaling_mdf_custom_interface" long-name="Video Decoder Scaling MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
-</component>
-<component name="video_reclaim_extbuffers_ci" long-name="Video Reclaim Extbuffers Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_reclaim_extbuffers_ci/group"/>
-</component>
-<component name="video_window_control_custom_interface" long-name="Video Window Control Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="wma_decoder_interface_proxy_api" long-name="WMA Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/wma_decoder_interface_proxy_api/group"/>
-</component>
-<component name="eaacplusutil_api" long-name="EAac Plus Util API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/eaacplusutil_api/group"/>
-</component>
-<component name="frametable_api" long-name="Frametable API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/frametable_api/group"/>
-</component>
-</collection>
-<collection name="devsoundextensions" long-name="Devsound Extensions" level="device-fw">
-<component name="drmaudioplayer" filter="s60" long-name="DRM Audio Player">
-<unit bldFile="os/mm/devsoundextensions/drmaudioplayer/group"/>
-</component>
-<component name="mmextfw" filter="s60" long-name="Multimedia Extension Framework">
-<unit bldFile="os/mm/devsoundextensions/mmextfw/group"/>
-</component>
-<component name="audiorouting" filter="s60" long-name="Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/audiorouting/group"/>
-</component>
-<component name="effects" filter="s60" long-name="Effects">
-<unit bldFile="os/mm/devsoundextensions/effects/group"/>
-</component>
-<component name="effectspresets" filter="s60" long-name="Effects Presets">
-<unit bldFile="os/mm/devsoundextensions/effectspresets/group"/>
-</component>
-<component name="effectspresets_utils" filter="s60" long-name="Effects Presets Utils">
-<!-- need to #include the lot from a single bld.inf
- Also move to a standard component location, not under effectspresets -->
-<unit bldFile="os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
-<unit bldFile="os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
-</component>
-<component name="telephonyaudiorouting" filter="s60" long-name="Telephony Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/group"/>
-</component>
-<component name="mmfcustominterfaces" filter="s60" long-name="MMF Custom Interfaces">
-<unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/group"/>
-</component>
-<component name="addeddevsoundcontrol" filter="s60" long-name="Added DevSound Control">
-<unit bldFile="os/mm/devsoundextensions/addeddevsoundcontrol/group"/>
-</component>
-<component name="globalaudiosettings" filter="s60" long-name="Global Audio Settings">
-<unit bldFile="os/mm/devsoundextensions/globalaudiosettings/group"/>
-</component>
-<component name="restrictedaudiooutput" filter="s60" long-name="Restricted Audio Output">
-<unit bldFile="os/mm/devsoundextensions/restrictedaudiooutput/group"/>
-</component>
-<component name="ciextnfactoryplugins" filter="s60" long-name="Custom Interface Extension Factory Plugins" plugin="Y">
-<unit bldFile="os/mm/devsoundextensions/ciextnfactoryplugins/group"/>
-</component>
-</collection>
-<collection name="mdfdevvideoextensions" long-name="MDF Dev Video Extensions" level="device-fw">
-<component name="nga_mdf_postprocessor" long-name="NGA MDF Postprocessor" filter="s60">
-<unit bldFile="os/mm/mdfdevvideoextensions/nga_mdf_postprocessor/group"/>
-</component>
-</collection>
-<collection name="audio" long-name="Audio Codecs" level="middleware">
-<component name="arm_cmmf_codecs" filter="s60" long-name="ARM CMMF Codecs" plugin="Y">
-<unit bldFile="os/mm/audio/arm_cmmf_codecs/group"/>
-</component>
-</collection>
-<collection name="video" long-name="Video Codecs" level="middleware">
-<!-- empty -->
-</collection>
-<collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
-<component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/imagingandcamerafws/imagingfws/group" mrp="os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
-</component>
-<component name="camerafw" long-name="Camera Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/imagingandcamerafws/camerafw/group" mrp="os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
-</component>
-</collection>
-<collection name="mmlibs" long-name="Multimedia Libraries" level="middleware">
-<component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmutilitylib/group" mrp="os/mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
-</component>
-<component name="mmfw" long-name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmfw/group" mrp="os/mm/mmlibs/mmfw/group/multimedia_mmf.mrp"/>
-</component>
-</collection>
-<collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
-<component name="imagingplugins" long-name="Imaging Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/imagingplugins/group" mrp="os/mm/mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
-</component>
-<component name="cameraplugins" long-name="Camera Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/cameraplugins/group" mrp="os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
-</component>
-<component name="lib3gp" long-name="3GP Library" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/mmplugins/lib3gp/group" mrp="os/mm/mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
-</component>
-<component name="mmfwplugins" long-name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/mmfwplugins/group" mrp="os/mm/mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
-</component>
-</collection>
-<collection name="mm_info" long-name="Multimedia Info" level="app-if">
-<component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc">
-<unit mrp="os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
-</component>
-<component name="mm_metadata" long-name="Multimedia Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
-<component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="^2" purpose="development">
-<unit bldFile="os/mm/mmresourcemgmt/mmresctrl/group" mrp="os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
-</component>
-</collection>
-<collection name="mmdevicefw" long-name="Multimedia Device Framework" level="device-fw">
-<component name="mdf" long-name="Media Device Framework" introduced="9.2" purpose="mandatory">
-<unit bldFile="os/mm/mmdevicefw/mdf/group" mrp="os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
-</component>
-<component name="speechrecogsupport" long-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 name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
-<component name="videorenderer" long-name="Video Renderer" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/mmswadaptation/videorenderer/group" mrp="os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
-</component>
-</collection>
-<collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw"/>
-<collection name="omxil" long-name="OpenMAX IL" level="hw-if">
-<component name="omxilapi" long-name="OpenMAX IL API" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilapi/group" mrp="os/mm/omxil/omxilapi/group/multimedia_omx_il_api.mrp" version="1"/>
-</component>
-<component name="omxilcore" long-name="OpenMAX IL Core" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcore/group" mrp="os/mm/omxil/omxilcore/group/multimedia_omx_il_core.mrp" version="1"/>
-</component>
-<component name="omxilcomponentcommon" long-name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcomponentcommon/group" mrp="os/mm/omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp" version="1"/>
-</component>
-<component name="omxilrefcomps" long-name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilrefcomps/ref_components/group" mrp="os/mm/omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp" version="1"/>
-</component>
-<component name="mmilapi" long-name="Multimedia Integration Layer API" introduced="^3" purpose="development">
-<unit bldFile="os/mm/omxil/mmilapi/group" mrp="os/mm/omxil/mmilapi/group/multimedia_il_api.mrp"/>
-</component>
-</collection>
-<collection name="devsound" long-name="Sound Device" level="devices">
-<component name="devsoundapi" long-name="DevSound API" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/devsound/devsoundapi/group" mrp="os/mm/devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
-</component>
-<component name="a3fdevsound" long-name="A3F DevSound" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3fdevsound/group" mrp="os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
-</component>
-<component name="a3facf" long-name="A3F Audio Component Framework" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3facf/group" mrp="os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
-</component>
-<component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/devsound/devsoundpluginsupport/group" mrp="os/mm/devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
-</component>
-<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">
-<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">
-<unit bldFile="os/mm/devsound/a3ftrace/group" mrp="os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
-</component>
-<component name="a3fsrvstart" long-name="A3F Server Start" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
-</component>
-</collection>
-<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
-<component name="devsoundhwdeviceapi" long-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 name="a3facl" long-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 name="a3fdevsoundcustomisation" long-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"/>
-</component>
-<component name="refacladapt" long-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"/>
-</component>
-<component name="videohai" long-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 name="dvbhreceiverhai" long-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>
-</block>
-<block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
-<collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
-<component name="exif_api" long-name="Exif API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagingext_plat" long-name="Imaging Extensions Platform Interfaces" level="app-if">
-<component name="jpeg2000_icl_plugin_api" long-name="JPEG2000 ICL plugin API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/jpeg2000_icl_plugin_api/group"/>
-</component>
-<component name="extended_icl_jpeg_api" long-name="Extended ICL Jpeg API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
-</component>
-<component name="h324_annex_k_custom_api" long-name="H324 Annex K Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/h324_annex_k_custom_api/group"/>
-</component>
-<component name="ecam_orientation_custom_api" long-name="ECam Orientation Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_orientation_custom_api/group"/>
-</component>
-<component name="ecam_ui_orientation_override_custom_api" long-name="ECam UI Orientation Override Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
-</component>
-<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>
-</collection>
-<collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
-<component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
-<unit bldFile="os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
-</component>
-<component name="imageadaptationextensions_build" filter="s60" long-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"/>
-</component>
-</collection>
-<collection name="imagingmodules" long-name="Imaging Modules" level="hw-if">
-<component name="exiflib" filter="s60" long-name="Exif Library">
-<unit bldFile="os/imagingext/imagingmodules/exiflib/group"/>
-</component>
-<component name="jp2kcodec" filter="s60" long-name="JPEG2000 Decoder Plugin" plugin="Y">
-<unit bldFile="os/imagingext/imagingmodules/jp2kcodec/group"/>
-</component>
-</collection>
-</block>
-<block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
-<component name="vgi" filter="s60" long-name="VGI">
-<unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
-</component>
-</collection>
-<collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adaptations">
-<component name="m3gcore11" filter="s60" long-name="M3G Core 1.1">
-<unit bldFile="os/graphics/m3g/m3gcore11/group"/>
-</component>
-</collection>
-<collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines">
-<component name="graphicsresource" long-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 name="graphicsresourceadaptation" long-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"/>
-</component>
-</collection>
-<collection name="graphicsutils" long-name="Graphics Utils" level="engines">
-<component name="commongraphicsheaders" long-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 name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
-<!-- displayldd to be moved here -->
-<component name="surfacemgr" long-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 name="graphicscomposition" long-name="Graphics Composition" level="engines">
-<component name="openwfcinterface" long-name="OpenWF Composition Interface" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfcinterface/group" mrp="os/graphics/graphicscomposition/openwfcinterface/group/graphics_openwfcinterface.mrp"/>
-</component>
-<component name="openwfcompositionengine" long-name="OpenWF Composition Engine" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/graphicscomposition/openwfcompositionengine/group" mrp="os/graphics/graphicscomposition/openwfcompositionengine/group/graphics_openwfcompositionengine.mrp"/>
-</component>
-<component name="openwfsupport" long-name="OpenWF Support" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfsupport/group" mrp="os/graphics/graphicscomposition/openwfsupport/group/graphics_openwfsupport.mrp"/>
-</component>
-<component name="surfaceupdate" long-name="Surface Update" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/surfaceupdate/group" mrp="os/graphics/graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
-</component>
-</collection>
-<collection name="graphicstest" long-name="Graphics Test" level="app-if">
-<component name="uibench" long-name="UI Bench" introduced="9.2" purpose="development">
-<unit bldFile="os/graphics/graphicstest/uibench/group" mrp="os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
-</component>
-</collection>
-<collection name="graphics_plat" long-name="Graphics Platform Interfaces" level="app-if">
-<component name="m3g_core_api" filter="sf_build" long-name="M3G Core API" class="api">
-<unit bldFile="os/graphics/graphics_plat/m3g_core_api/group"/>
-</component>
-</collection>
-<collection name="graphics_info" long-name="Graphics Info" level="app-if">
-<component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc">
-<unit mrp="os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
-</component>
-<component name="graphics_metadata" long-name="Graphics Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
-</component>
-</collection>
-<collection name="windowing" long-name="Windowing" level="app-if">
-<component name="windowserver" long-name="Window Server" purpose="mandatory">
-<unit bldFile="os/graphics/windowing/windowserver/group" mrp="os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
-</component>
-<component name="windowserverplugins" long-name="Window Server Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/windowing/windowserverplugins/group" mrp="os/graphics/windowing/windowserverplugins/group/graphics_wserv_std_plugins.mrp"/>
-</component>
-</collection>
-<collection name="printingservices" long-name="Printing Services" level="app-if">
-<component name="printerdriversupport" long-name="Printer Driver Support" purpose="optional">
-<unit bldFile="os/graphics/printingservices/printerdriversupport/group" mrp="os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
-</component>
-<component name="printerdrivers" long-name="Printer Drivers" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/printingservices/printerdrivers/group" mrp="os/graphics/printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
-</component>
-</collection>
-<collection name="fbs" long-name="Font and Bitmap Server" level="device-interface">
-<component name="fontandbitmapserver" long-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 name="opengles" long-name="OpenGLES" level="internal-adaptations">
-<component name="openglesinterface" long-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 name="opengles_stub" filter="sf_build" long-name="OpenGL ES Stub" purpose="optional" introduced="^2">
-<unit bldFile="os/graphics/opengles/openglesinterface/group/opengles_stub"/>
-</component>
-</collection>
-<collection name="openvg" long-name="OpenVG" level="internal-adaptations">
-<component name="openvginterface" long-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 name="openvg11" filter="s60" long-name="OpenVG 1.1">
-<!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
-<unit bldFile="os/graphics/openvg/openvginterface/group/openvg11"/>
-</component>
-<component name="sfopenvg" filter="sf_build" long-name="Khronos OpenVG Reference Implementation" introduced="^2" purpose="optional">
-<unit bldFile="os/graphics/openvg/openvgrefimplementation/sfopenvg/group"/>
-</component>
-</collection>
-<collection name="egl" long-name="EGL" level="internal-adaptations">
-<component name="eglinterface" long-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 name="eglswitch" long-name="EGL Switch" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglswitch/group" mrp="os/graphics/egl/eglswitch/group/graphics_eglswitch.mrp"/>
-</component>
-<component name="eglrefimpl" long-name="EGL Reference Implementation" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglrefimpl/group" mrp="os/graphics/egl/eglrefimpl/group/graphics_eglrefimpl.mrp"/>
-</component>
-<component name="egltest" long-name="EGL Tests" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/egl/egltest/group" mrp="os/graphics/egl/egltest/group/graphics_egltest.mrp"/>
-</component>
-</collection>
-<collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
-<component name="gdi" long-name="GDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/gdi/group" mrp="os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
-</component>
-<component name="bitgdi" long-name="BitGDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
-</component>
-<component name="colourpalette" long-name="Colour Palette" introduced="7.0s" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
-</component>
-<component name="screendriver" long-name="Screen Driver" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/graphicsdeviceinterface/screendriver/group" mrp="os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
-</component>
-<component name="directgdi" long-name="DirectGDI" introduced="^3" deprecated="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/directgdi/group" mrp="os/graphics/graphicsdeviceinterface/directgdi/group/graphics_directgdi.mrp"/>
-</component>
-<component name="directgdiinterface" long-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 name="directgdiadaptation" long-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"/>
-</component>
-</collection>
-<collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
-<component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/gdi_tools/group" mrp="os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
-</component>
-</collection>
-<collection name="graphicsapitest" long-name="Graphics API Tests" level="app-if"/>
-</block>
-<block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
-<collection name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" level="text">
-<component name="findutil_api" long-name="Find Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/findutil_api/group"/>
-</component>
-<component name="japanese_language_utilities_api" long-name="Japanese Language Utilities API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
-</component>
-<component name="sortutil_api" long-name="Sorting Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/sortutil_api/group"/>
-</component>
-</collection>
-<collection name="textandloc_pub" long-name="Text and Localisation Public Interfaces" level="text">
-<component name="directory_localizer_api" long-name="Directory Localizer API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_pub/directory_localizer_api/group"/>
-</component>
-</collection>
-<collection name="charconvfw" long-name="Character Conversion" level="encoding">
-<component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional">
-<unit bldFile="os/textandloc/charconvfw/charconv_fw/group" mrp="os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
-</component>
-<component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/charconvplugins/group" mrp="os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
-</component>
-<component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/fatfilenameconversionplugins/group" mrp="os/textandloc/charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
-</component>
-</collection>
-<collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
-<component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/textshaperplugin/group" mrp="os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
-</component>
-<component name="fontstore" long-name="Font Store" purpose="mandatory">
-<unit bldFile="os/textandloc/fontservices/fontstore/group" mrp="os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
-</component>
-<component name="textrendering" long-name="Text Rendering" purpose="mandatory" class="placeholder">
-<!-- placeholder for text code from GDI -->
-</component>
-<component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/freetypefontrasteriser/group" mrp="os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
-</component>
-<component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional">
-<unit bldFile="os/textandloc/fontservices/referencefonts/group" mrp="os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
-</component>
-</collection>
-<collection name="textlayout" long-name="Text Layout" level="text">
-<component name="texthandling" long-name="Text Handling" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/texthandling/group" mrp="os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
-</component>
-<component name="textformatting" long-name="Text Formatting" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/textformatting/group" mrp="os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
-</component>
-</collection>
-<collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
-<!-- components in this collection need to be moved to the right collection.
- Either move into the units' directories, or create a new textandlocutils directory -->
-<component name="numbergrouping" filter="s60" long-name="Number Grouping">
-<unit bldFile="os/textandloc/charconvfw/numbergrouping/group"/>
-</component>
-<component name="jplangutil" filter="s60" long-name="Japanese Language Utilities">
-<unit bldFile="os/textandloc/charconvfw/jplangutil/group"/>
-</component>
-<component name="sortutil" filter="s60" long-name="Sorting Utility">
-<unit bldFile="os/textandloc/charconvfw/sortutil/group"/>
-</component>
-<component name="inlinetext" filter="s60" long-name="Inline Text">
-<unit bldFile="os/textandloc/charconvfw/inlinetext/group"/>
-</component>
-<component name="nearestlangutil" long-name="Nearest Language Util" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-<component name="numberformatting" long-name="Number Formatting" introduced="7.0s" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/numberformatting/group" mrp="os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
-</component>
-</collection>
-<collection name="localesupport" long-name="Locale Support" level="util">
-<component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/localisation/localesupport" mrp="os/textandloc/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
-</component>
-<component name="initlocale" long-name="Initialise Locale" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-</collection>
-<collection name="textandloctools" long-name="Text and Localisation Tools" level="tools">
-<component name="fontcompiler" long-name="Font Compiler" purpose="development" class="placeholder PC">
-<!-- placeholder for split from GDI Tools -->
-</component>
-<component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/bitmapfonttools/group" mrp="os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
-</component>
-</collection>
-<collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
-<component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
-<collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
-<component name="xmlsrv_plat_build" long-name="XML Services Platform Interface Build" filter="s60" class="api">
-<!-- need to fix the configuration used here.
- Either destribute to other components or use the new feature flags confguration mechanisms.
- Remove this component and uncomment the other units when fixed-->
-<unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
-</component>
-<component name="xml_encryption_api" long-name="XML Encryption API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/> -->
-</component>
-<component name="xml_signature_api" long-name="XML Signature API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_signature_api/group"/> -->
-</component>
-<component name="xml_security_engine_utils_api" long-name="XML Security Engine Utils API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/> -->
-</component>
-</collection>
-<collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
-<component name="xmlseccertman" filter="s60" long-name="XML Security Certificate Manager">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
-</component>
-<component name="xmlsec" filter="s60" long-name="XML Security">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsec/group"/>
-</component>
-<component name="xmlseccrypto" filter="s60" long-name="XML Security Crypto">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccrypto/group"/>
-</component>
-<component name="xmlsecwrapper" filter="s60" long-name="XML Security Wrapper">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsecwrapper/group"/>
-</component>
-</collection>
-<collection name="xml" long-name="XML" level="generic">
-<component name="xmlfw" long-name="XML Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmlfw/group" mrp="os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
-</component>
-<component name="libxml2libs" long-name="Libxml2 Libraries" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/libxml2libs/group" mrp="os/xmlsrv/xml/libxml2libs/group/syslibs_libxml2.mrp"/>
-</component>
-<component name="legacyminidomparser" long-name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/legacyminidomparser/GROUP" mrp="os/xmlsrv/xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp"/>
-</component>
-<component name="xmldomandxpath" long-name="XML DOM and XPath" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmldomandxpath/group" mrp="os/xmlsrv/xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
-</component>
-<component name="xmlexpatparser" long-name="XML Expat Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmlexpatparser/group" mrp="os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
-</component>
-<component name="xmllibxml2parser" long-name="XML Libxml2 Parser" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmllibxml2parser/group" mrp="os/xmlsrv/xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
-</component>
-<component name="wbxmlparser" long-name="WBXML Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/wbxmlparser/group" mrp="os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
-</component>
-</collection>
-<collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
-<component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="deviceplatformrelease" level="services" long-name="Device Platform Release" levels="bld mid top">
-<collection name="s60extras" long-name="S60 Extras" level="mid">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="s60extras_build" filter="s60" long-name="S60 Extras Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/S60Extras/group"/>
-</component>
-</collection>
-<collection name="locfiles" long-name="Locale Files" level="mid">
-<component name="locfiles_build" filter="s60" long-name="S60 Locale Files Build" purpose="development" class="config">
-<!-- need to move component down a directory -->
-<unit bldFile="os/deviceplatformrelease/locfiles/group"/>
-</component>
-<component name="locfiles_set1" long-name="Locale Files Set 1" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set1"/>
-</component>
-<component name="locfiles_set2" long-name="Locale Files Set 2" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set2"/>
-</component>
-<component name="locfiles_set3" long-name="Locale Files Set 3" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set3"/>
-</component>
-<component name="locfiles_set4" long-name="Locale Files Set 4" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set4"/>
-</component>
-<component name="locfiles_set5" long-name="Locale Files Set 5" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set5"/>
-</component>
-<component name="locfiles_set6" long-name="Locale Files Set 6" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set6"/>
-</component>
-<!-- is the a problem with SF builds with the following? -->
-<component name="locfiles_set7" long-name="Locale Files Set 7" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set7"/>
-</component>
-<component name="locfiles_set8" long-name="Locale Files Set 8" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set8"/>
-</component>
-<component name="locfiles_set9" long-name="Locale Files Set 9" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set9"/>
-</component>
-<component name="locfiles_set10" long-name="Locale Files Set 10" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set10"/>
-</component>
-<component name="locfiles_set11" long-name="Locale Files Set 11" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set11"/>
-</component>
-<component name="locfiles_set12" long-name="Locale Files Set 12" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set12"/>
-</component>
-<component name="locfiles_set13" long-name="Locale Files Set 13" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set13"/>
-</component>
-<component name="locfiles_set14" long-name="Locale Files Set 14" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set14"/>
-</component>
-<component name="locfiles_set15" long-name="Locale Files Set 15" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set15"/>
-</component>
-<component name="locfiles_set16" long-name="Locale Files Set 16" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set16"/>
-</component>
-</collection>
-<collection name="version" long-name="Version" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="version_build" filter="s60" long-name="Version Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/Version/group"/>
-</component>
-</collection>
-<collection name="helps_loc2" long-name="Helps Locale 2" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helps_loc2_build" long-name="Helps Locale 2 Build" filter="s60">
-<unit bldFile="os/deviceplatformrelease/helps_loc2/group"/>
-</component>
-</collection>
-<collection name="sf_config" long-name="SF Config" level="mid">
-<component name="config" filter="s60" long-name="Config" purpose="development" class="config"/>
-<component name="cenrep" filter="sf_build" long-name="ConE Central Repository Config" purpose="development" class="config">
-<!-- will should give the id/path something more unique than cenrep -->
-<unit bldFile="os/deviceplatformrelease/sf_config/cenrep/group"/>
-</component>
-<component name="rombuild_syborg" filter="sf_build" long-name="Syborg iMaker Config" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/sf_config/rombuild/syborg/group"/>
-</component>
-<component name="rombuild_zoom2" filter="sf_build" long-name="Zoom2 iMaker Config" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/sf_config/rombuild/zoom2/group"/>
-</component>
-</collection>
-<!-- should be located locally in buildplatforms/group
- <collection id="s60bld" name="S60 Build">
- <component id="buildplatforms" filter="s60" name="Build Platforms">
- <unit bldFile="/tools/buildplatforms/group"/>
- </component>
- </collection>-->
-<collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
-<component name="cedarutils" long-name="Cedar Utils" purpose="development">
-<unit mrp="os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
-</component>
-<component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt" purpose="development" class="config">
-<unit mrp="os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
-</component>
-<component name="foundation_s60_packages" long-name="Foundation S60 Packages" introduced="^3" deprecated="^3" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/symbianosbld/foundation_s60_packages/foundation_s60_packages.mrp"/>
-</component>
-</collection>
-<collection name="foundation_system" long-name="Foundation System" level="top">
-<component name="system_model" long-name="System Model" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
-</component>
-</collection>
-<collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
-<component name="deviceplatformrelease_metadata" long-name="Device Platform Release Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="osrndtools" level="services" long-name="OS R&D tools" levels="fw trace">
-<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"/>
-</component>
-<component name="testinterface" filter="s60" long-name="Test Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/testinterface/group"/>
-</component>
-<component name="testserver" filter="s60" long-name="Test Server" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserver/group"/>
-</component>
-<component name="testengine" filter="s60" long-name="Test Engine" purpose="development">
-<unit bldFile="os/osrndtools/stif/testengine/group"/>
-</component>
-<component name="testserverstarter" filter="s60" long-name="Test Server Starter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserverstarter/group"/>
-</component>
-<component name="stiftfwif" filter="s60" long-name="STIF Test Framework Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/stiftfwif/group"/>
-</component>
-<component name="consoleui" filter="s60" long-name="Console UI" purpose="development">
-<unit bldFile="os/osrndtools/stif/consoleui/group"/>
-</component>
-<component name="testcombiner" filter="s60" long-name="Test Combiner" purpose="development">
-<unit bldFile="os/osrndtools/stif/testcombiner/group"/>
-</component>
-<component name="demomodule" filter="s60" long-name="Demo Module" purpose="development">
-<unit bldFile="os/osrndtools/stif/demomodule/group"/>
-</component>
-<component name="atslogger" filter="s60" long-name="ATS Logger" purpose="development">
-<unit bldFile="os/osrndtools/stif/atslogger/group"/>
-</component>
-<component name="atsinterface" filter="s60" long-name="ATS Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/atsinterface/group"/>
-</component>
-<component name="testscripter" filter="s60" long-name="Test Scripter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testscripter/group"/>
-</component>
-<component name="suevent" filter="s60" long-name="SU Event" purpose="development">
-<unit bldFile="os/osrndtools/stif/suevent/group"/>
-</component>
-<component name="stifkerneltestclassbase" filter="s60" long-name="STIF Kernel Test Class Base" purpose="development">
-<!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
-<!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
-</component>
-<component name="stif_build" filter="s60" long-name="STIF Build" purpose="development">
-<!-- move exports into self-contained component. Remove this when configuration is in place-->
-<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">
-<unit bldFile="os/osrndtools/memspy/memspy_plat/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/engine/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/console/group"/>
-</component>
-<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>
-</collection>
-<collection name="hti" long-name="Harmonized Test Interface" level="trace">
-<component name="hti_plat" filter="s60" long-name="HTI Platform Interfaces" purpose="development" class="api">
-<unit bldFile="os/osrndtools/hti/hti_plat/group"/>
-</component>
-<component name="hticfg" filter="s60" long-name="HTI Config" purpose="development">
-<unit bldFile="os/osrndtools/hti/hticfg/group"/>
-</component>
-<component name="htiautostart" filter="s60" long-name="HTI Autostart" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiautostart/group"/>
-</component>
-<component name="htiframework" filter="s60" long-name="HTI Framework" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiframework/group"/>
-</component>
-<component name="hticommplugins" filter="s60" long-name="HTI Communication Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
-</component>
-<component name="htiserviceplugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
-</component>
-<component name="htifilehlp" filter="s60" long-name="HTI File Help" purpose="development">
-<unit bldFile="os/osrndtools/hti/htifilehlp/group"/>
-</component>
-<component name="htiwatchdog" filter="s60" long-name="HTI Watchdog" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiwatchdog/group"/>
-</component>
-<component name="hti_build" filter="s60" long-name="HTI Build" purpose="development">
-<!-- move exports into self-contained component.-->
-<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">
-<block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
-<collection name="appsupport_pub" long-name="Generic Application Support Public Interfaces" level="specific">
-<component name="flash_viewer_framework_api" long-name="Flash Viewer Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
-</component>
-<component name="network_status_api" long-name="Network Status API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/network_status_api/group"/>
-</component>
-</collection>
-<collection name="appsupport_plat" long-name="Generic Application Support Platform Interfaces" level="specific">
-<component name="action_plugin_api" long-name="Action Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/action_plugin_api/group"/>
-</component>
-<component name="application_orientation_api" long-name="Application Orientation API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/application_orientation_api/group"/>
-</component>
-<component name="context_access_api" long-name="Context Access API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_access_api/group"/>
-</component>
-<component name="context_framework_services_api" long-name="Context Framework Services API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_services_api/group"/>
-</component>
-<component name="context_framework_client_api" long-name="Context Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_client_api/group"/>
-</component>
-<component name="context_framework_listener_api" long-name="Context Framework Listener API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_listener_api/group"/>
-</component>
-<component name="context_framework_version_api" long-name="Context Framework Version API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_version_api/group"/>
-</component>
-<component name="context_source_plugin_api" long-name="Context Source Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_plugin_api/group"/>
-</component>
-<component name="context_source_settings_manager_api" long-name="Context Source Settings Manager API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_settings_manager_api/group"/>
-</component>
-<component name="context_subscription_api" long-name="Context Subscription API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_subscription_api/group"/>
-</component>
-<component name="key_event_framework_api" long-name="Key Event Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_api/group"/>
-</component>
-<component name="key_event_framework_mapper_api" long-name="Key Event Framework Mapper API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_mapper_api/group"/>
-</component>
-<component name="media_keys_definition_api" long-name="Media Keys Definition API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/media_keys_definition_api/group"/>
-</component>
-<component name="ood_threshold_api" long-name="OOD Threshold API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/ood_threshold_api/group"/>
-</component>
-<component name="oom_monitor_api" long-name="OOM Monitor API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_api/group"/>
-</component>
-<component name="oom_monitor_plugin_api" long-name="OOM Monitor Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_plugin_api/group"/>
-</component>
-<component name="operation_provider_api" long-name="Operation Provider API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/operation_provider_api/group"/>
-</component>
-<component name="phonecmdhandler_api" long-name="Phone Command Handler API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/phonecmdhandler_api/group"/>
-</component>
-<component name="restore_factory_settings_api" long-name="Restore Factory Settings API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_api/group"/>
-</component>
-<component name="restore_factory_settings_plugin_api" long-name="Restore Factory Settings Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_plugin_api/group"/>
-</component>
-<component name="secondary_display_accfw_api" long-name="Secondary Display Accessory Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_accfw_api/group"/>
-</component>
-<component name="secondary_display_startup_api" long-name="Secondary Display Startup API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_startup_api/group"/>
-</component>
-<component name="secondary_display_sysap_api" long-name="Secondary Display System Application API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_sysap_api/group"/>
-</component>
-<component name="secondary_display_system_state_api" long-name="Secondary Display System State API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_system_state_api/group"/>
-</component>
-<component name="sensor_user_setting_api" long-name="Sensor User Setting API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/sensor_user_setting_api/group"/>
-</component>
-<component name="startup_configuration_api" long-name="Startup Configuration API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/startup_configuration_api/group"/>
-</component>
-<component name="system_application_key_handler_plugin_api" long-name="System Application Key Handler Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_key_handler_plugin_api/group"/>
-</component>
-<component name="system_application_light_control_plugin_api" long-name="System Application Light Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_light_control_plugin_api/group"/>
-</component>
-<component name="system_application_notification_api" long-name="System Application Notification API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_notification_api/group"/>
-</component>
-<component name="system_application_plugin_callback_api" long-name="System Application Plug-in Callback API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
-</component>
-</collection>
-<collection name="contextframework" long-name="Context Framework" level="framework">
-<!-- the units that are commented out need to be put back when configuration is in place.
- They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
-<component name="cfw" filter="s60" long-name="Context Framework">
-<!--<unit bldFile="contextframework/cfw/group"/> -->
-</component>
-<component name="cfwplugins" filter="s60" long-name="Context Framework Plugins" plugin="Y">
-<!--<unit bldFile="contextframework/cfwplugins/group"/>-->
-</component>
-<component name="contextframework_build" filter="s60" long-name="Context Framework Build">
-<unit bldFile="mw/appsupport/contextframework/group"/>
-</component>
-</collection>
-<collection name="coreapplicationuis" long-name="Core Application UIs" level="server">
-<component name="dbrecovery" filter="s60" long-name="Database Recovery">
-<unit bldFile="mw/appsupport/coreapplicationuis/dbrecovery/group"/>
-</component>
-<component name="nspswsplugin" filter="s60" long-name="NSPS WS Plugin" plugin="Y">
-<!-- No Service Power Save? Window Server? Please elaborate-->
-<unit bldFile="mw/appsupport/coreapplicationuis/nspswsplugin/group"/>
-</component>
-<component name="rfs" filter="s60" long-name="Restore Factory Settings">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfs/group"/>
-</component>
-<component name="rfsplugins" filter="s60" long-name="Restore Factory Settings Plugins" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/group"/>
-</component>
-<component name="sysap" filter="s60" long-name="System Application">
-<unit bldFile="mw/appsupport/coreapplicationuis/sysap/group"/>
-</component>
-<component name="variatedsettings" filter="s60" long-name="Variated Settings" class="config">
-<unit bldFile="mw/appsupport/coreapplicationuis/variatedsettings/group"/>
-</component>
-<component name="accfwuinotifier" filter="s60" long-name="Accessory Framework UI Notifier" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/accfwuinotifier/group"/>
-</component>
-<component name="kefmapper" filter="s60" long-name="Key Event Framework">
-<unit bldFile="mw/appsupport/coreapplicationuis/kefmapper/group"/>
-</component>
-<component name="advancedtspcontroller" filter="s60" long-name="Advanced TSP Controller">
-<unit bldFile="mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
-</component>
-<component name="powersaveutilities" filter="s60" long-name="Power Save Utilities">
-<unit bldFile="mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
-</component>
-<component name="gsserverenginestub" filter="s60" long-name="GS Server Engine Stub">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
-</component>
-<component name="gsserverengine" filter="s60" long-name="GS Server Engine">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverengine/group"/>
-</component>
-<component name="sensordatacompensatorplugin" filter="s60" long-name="Sensor Data Compensator Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/group"/>
-</component>
-</collection>
-<collection name="flashliteapi_3_1" long-name="Flash Lite API 3.1" level="specific">
-<!-- collection is really a component. Move down a directory -->
-<component name="flashliteapi_3_1_build" long-name="Flash Lite API Build" filter="s60" introduced="^2"/>
-</collection>
-<collection name="mediakeys" long-name="Media Keys" level="plugin">
-<!-- collection is really a component. Move down a directory -->
-<component name="mediakeys_build" filter="s60" long-name="Media Keys Build">
-<unit bldFile="mw/appsupport/mediakeys/group"/>
-</component>
-</collection>
-<collection name="startupservices" long-name="Startup Services" level="system">
-<component name="splashscreen" filter="s60" long-name="Splash Screen">
-<unit bldFile="mw/appsupport/startupservices/splashscreen/group"/>
-</component>
-<component name="startupanimation" filter="s60" long-name="Startup Animation">
-<unit bldFile="mw/appsupport/startupservices/startupanimation/group"/>
-</component>
-<component name="startup" long-name="Startup Application" filter="s60">
-<unit bldFile="mw/appsupport/startupservices/startup/group"/>
-</component>
-</collection>
-<collection name="sysresmonitoring" long-name="System Resource Monitoring" level="system">
-<component name="oodmonitor" filter="s60" long-name="OOD Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oodmonitor/group"/>
-</component>
-<component name="oommonitor" filter="s60" long-name="OOM Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oommonitor/group"/>
-</component>
-</collection>
-<collection name="systemsettings" long-name="System Settings" level="system">
-<component name="gssensorplugin" filter="s60" long-name="GS Sensor Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gssensorplugin/group"/>
-</component>
-<component name="gsaccessoryplugin" filter="s60" long-name="GS Accessory Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gsaccessoryplugin/group"/>
-</component>
-</collection>
-<collection name="filehandling" long-name="File Handling" level="server">
-<component name="fileconverterfw" long-name="File Converter Framework" purpose="optional">
-<unit bldFile="mw/appsupport/filehandling/fileconverterfw/group" mrp="mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
-</component>
-<component name="htmltorichtextconverter" long-name="HTML to RichText Converter" introduced="7.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/htmltorichtextconverter/group" mrp="mw/appsupport/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
-</component>
-<component name="richtexttohtmlconverter" long-name="RichText to HTML Converter" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
-</component>
-</collection>
-<collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
-<component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
-</component>
-</collection>
-<collection name="commonappservices" long-name="Common Application Services" level="framework">
-<component name="alarmserver" long-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"/>
-</component>
-<component name="alarmservertest" long-name="Alarm Server Test" deprecated="^3" introduced="8.1" purpose="development">
-<unit bldFile="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
-</component>
-<component name="appservicesdocs" long-name="Application Services Documentation" purpose="development" class="doc">
-<unit mrp="mw/appsupport/commonappservices/appservicesdocs/app-services_documentation.mrp"/>
-</component>
-<component name="backuprestorenotification" long-name="Backup Restore Notification" introduced="8.1" purpose="optional">
-<unit bldFile="mw/appsupport/commonappservices/backuprestorenotification/group" mrp="mw/appsupport/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
-</component>
-</collection>
-<collection name="tzservices" long-name="Time Zone Services" level="plugin">
-<component name="tzserver" long-name="Time Zone Server" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzserver/group" mrp="mw/appsupport/tzservices/tzserver/group/app-services_tz.mrp"/>
-</component>
-<component name="tzloc" long-name="Time Zone Localization" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzloc/group" mrp="mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
-</component>
-<component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzlocrscfactory/group" mrp="mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
-</component>
-<component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzdatabase/group" mrp="mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
-</component>
-</collection>
-<collection name="contenthandling" long-name="Content Handling" level="plugin">
-<component name="webrecognisers" long-name="Web Recognisers" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/contenthandling/webrecognisers/group" mrp="mw/appsupport/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
-</component>
-</collection>
-<collection name="openenvutils" long-name="Open Environment Utilities" level="specific">
-<component name="commandshell" long-name="Command Shell" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/commandshell/group" mrp="mw/appsupport/openenvutils/commandshell/group/oetools_zsh.mrp"/>
-</component>
-<component name="telnetserver" long-name="Telnet Server" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/telnetserver/group" mrp="mw/appsupport/openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
-</component>
-</collection>
-<collection name="printingsupport" long-name="Printing Support" level="generic">
-<component name="printinguisupport" long-name="Printing UI Support" purpose="optional" introduced="^2" deprecated="^3">
-<unit bldFile="mw/appsupport/printingsupport/printinguisupport/group" mrp="mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
-</component>
-</collection>
-<collection name="appfw" long-name="Application Framework" level="framework">
-<component name="apparchitecture" long-name="Application Architecture" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/apparchitecture/group" mrp="mw/appsupport/appfw/apparchitecture/group/app-framework_apparc.mrp"/>
-</component>
-<component name="viewserver" long-name="View Server" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/viewserver/group" mrp="mw/appsupport/appfw/viewserver/group/app-framework_viewsrv.mrp"/>
-</component>
-</collection>
-<collection name="applaunchservices" long-name="Application Launch Services" level="generic">
-<component name="aftermarketappstarter" long-name="After Market Application Starter" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/aftermarketappstarter/group" mrp="mw/appsupport/applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
-</component>
-<component name="applaunchplugins" long-name="Application Launch Plugins" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/applaunchplugins/group" mrp="mw/appsupport/applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
-</component>
-</collection>
-<collection name="tzpcside" long-name="Time Zone PC Side" level="plugin">
-<component name="tzcompiler" long-name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config PC">
-<unit bldFile="mw/appsupport/tzpcside/tzcompiler/group" mrp="mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
-</component>
-</collection>
-<collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
-<component name="appsupport_metadata" long-name="Generic Application Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="securitysrv" level="generic" long-name="Security Services" levels="plugin framework server generic specific">
-<collection name="secsrv_plat" long-name="Security Services Platform Interfaces" level="specific">
-<component name="cms_api" long-name="CMS API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/cms_api/group"/>
-</component>
-<component name="pkcs12_parser_api" long-name="PKCS12 Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkcs12_parser_api/group"/>
-</component>
-<component name="java_utils_api" long-name="Java Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/java_utils_api/group"/>
-</component>
-<component name="wim_cert_api" long-name="WIM Cert API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/wim_cert_api/group"/>
-</component>
-<component name="device_key_store_encryption_plugin_api" long-name="Device Key Store Encryption Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/device_key_store_encryption_plugin_api/group"/>
-</component>
-<component name="x509certnameparser_api" long-name="X.509 Certificate Name Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
-</component>
-<component name="remote_lock_api" long-name="Remote Lock API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
-</component>
-<component name="pkidialog_api" long-name="PKI Dialog API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
-</component>
-<component name="provisioning_api" long-name="Provisioning API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/provisioning_api/group"/>
-</component>
-<component name="keyguard_configuration_api" long-name="Keyguard Configuration API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_configuration_api/group"/>
-</component>
-<component name="keylock_policy_api" long-name="Keylock Policy API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keylock_policy_api/group"/>
-</component>
-<component name="security_code_ui_api" long-name="Security Code UI API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
-</component>
-<component name="gba_api" long-name="GBA API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/gba_api/group"/>
-</component>
-<component name="keyguard_access_api" long-name="Keyguard Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_access_api/group"/>
-</component>
-<component name="devicelock_access_api" long-name="Device Lock Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devicelock_access_api/group"/>
-</component>
-<component name="lockapp_server_api" long-name="Lock Application Server API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
-</component>
-<component name="devencadaptation_api" long-name="Device Encryption Adaptation API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
-</component>
-<component name="devenccommonutils_api" long-name="Device Encryption Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
-</component>
-</collection>
-<collection name="cms" long-name="Certificate Management Service" level="server">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="cms_build" filter="s60" long-name="CMS" introduced="^3">
-<unit bldFile="mw/securitysrv/cms/group"/>
-</component>
-</collection>
-<collection name="pkiutilities" long-name="PKI Utilities" level="plugin">
-<component name="x509certnameparser" filter="s60" long-name="X.509 Certificate Name Parser">
-<unit bldFile="mw/securitysrv/pkiutilities/x509certnameparser/group"/>
-</component>
-<component name="pkcs12" filter="s60" long-name="PKCS #12">
-<unit bldFile="mw/securitysrv/pkiutilities/pkcs12/group"/>
-</component>
-<component name="certmanui" filter="s60" long-name="Certificate Management UI">
-<unit bldFile="mw/securitysrv/pkiutilities/certmanui/group"/>
-</component>
-<component name="ctsecuritydialogs" filter="s60" long-name="Crypto Token Security Dialogs">
-<unit bldFile="mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
-</component>
-<component name="certsaver" filter="s60" long-name="Certificate Saver">
-<unit bldFile="mw/securitysrv/pkiutilities/certsaver/group"/>
-</component>
-<component name="secmodui" filter="s60" long-name="Security Module UI">
-<unit bldFile="mw/securitysrv/pkiutilities/secmodui/group"/>
-</component>
-<component name="devicetoken" filter="s60" long-name="Device Token">
-<unit bldFile="mw/securitysrv/pkiutilities/devicetoken/group"/>
-</component>
-<component name="certificates" filter="s60" long-name="Certificates">
-<unit bldFile="mw/securitysrv/pkiutilities/Certificates/group" filter="sf_build"/>
-</component>
-<component name="pkiutilities_build" filter="s60" long-name="PKI Utilities Build">
-<!-- need to split this into the above components -->
-<unit bldFile="mw/securitysrv/pkiutilities/group"/>
-</component>
-<component name="ocsp" long-name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
-<unit bldFile="mw/securitysrv/pkiutilities/ocsp/group" mrp="mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
-</component>
-</collection>
-<collection name="wim" long-name="Wireless Identity Module " level="framework">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="wim_build" filter="s60" long-name="WIM Build">
-<unit bldFile="mw/securitysrv/wim/group"/>
-</component>
-</collection>
-<collection name="remotelock" long-name="Remote Lock" level="generic">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="remotelock_build" filter="s60" long-name="Remote Lock Build">
-<unit bldFile="mw/securitysrv/remotelock/group"/>
-</component>
-</collection>
-<collection name="securitydialogs" long-name="Security Dialogs" level="specific">
-<component name="keylockpolicyapi" filter="s60" long-name="Keylock Policy API">
-<unit bldFile="mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
-</component>
-<component name="autolock" long-name="Autolock" filter="s60">
-<unit bldFile="mw/securitysrv/securitydialogs/autolock/group"/>
-</component>
-<component name="secui" filter="s60" long-name="Security UI">
-<unit bldFile="mw/securitysrv/securitydialogs/secui/group"/>
-</component>
-<component name="securitynotifier" filter="s60" long-name="Security Notifier">
-<unit bldFile="mw/securitysrv/securitydialogs/securitynotifier/group"/>
-</component>
-<component name="lockclient" filter="s60" long-name="Lock Client" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockclient/group"/>
-</component>
-<component name="lockapp" filter="s60" long-name="Lock Application" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockapp/group"/>
-</component>
-<component name="simlockui" filter="s60" long-name="SIM Lock UI" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/simlockui/group"/>
-</component>
-</collection>
-<collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="boottimeintegritycheck_build" filter="s60" long-name="Boot Time Integrity Check Build">
-<unit bldFile="mw/securitysrv/boottimeintegritycheck/group"/>
-</component>
-</collection>
-<collection name="gba" long-name="Generic Bootstrapping Architecture" level="server">
-<component name="uicc" filter="s60" long-name="UICC" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/uicc/group"/>
-</component>
-<component name="gbaserver" filter="s60" long-name="GBA Server" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaserver/group"/>
-</component>
-<component name="gbaapi" filter="s60" long-name="GBA API" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaapi/group"/>
-</component>
-<component name="gbafilter" filter="s60" long-name="GBA HTTP Filter" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/gbafilter/group"/>
-</component>
-<component name="gba_build" filter="s60" long-name="Generic Boot Architecture Build" introduced="^2">
-<!-- need to split this into the above components, or remove #includes and make this GBA ROM -->
-<unit bldFile="mw/securitysrv/gba/group"/>
-</component>
-</collection>
-<collection name="devencdiskutils" long-name="Device Encryption Disk Utils" level="server">
-<component name="devenccommonutils" filter="s60" long-name="Device Encryption Common Utils" introduced="^3">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncCommonUtils/group"/>
-</component>
-<component name="devencrfsplugin" filter="s60" long-name="Device Encryption RFS Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncRfsPlugin/group"/>
-</component>
-<component name="pk5recognizer" filter="s60" long-name="Device Encryption Pk5 Recognizer" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/Pk5Recognizer/group"/>
-</component>
-<component name="devencstarter" filter="s60" long-name="Device Encryption Starter" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncStarter/group"/>
-</component>
-<component name="devencdiskutils" filter="s60" long-name="Device Encryption Disk Utils Build" introduced="^3">
-<!-- need to split this into the above components, or remove #includes and make this a ROM component-->
-<unit bldFile="mw/securitysrv/devencdiskutils/group"/>
-</component>
-</collection>
-<collection name="securitysrv_info" long-name="Security Services Info" level="specific">
-<component name="securitysrv_metadata" long-name="Security Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="drm" level="generic" long-name="DRM" levels="plugin framework server generic specific">
-<collection name="drm_plat" long-name="DRM Platform Interfaces" level="specific">
-<component name="roap_api" long-name="ROAP API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/roap_api/group"/>
-</component>
-<component name="drm_common_api" long-name="DRM Common API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_common_api/group"/>
-</component>
-<component name="drm_rights_api" long-name="DRM Rights API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_rights_api/group"/>
-</component>
-<component name="drm_legacy_api" long-name="DRM Legacy API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_legacy_api/group"/>
-</component>
-<component name="dcf_repository_api" long-name="DCF Repository API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/dcf_repository_api/group"/>
-</component>
-<component name="drm_service_api" long-name="DRM Service API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_service_api/group"/>
-</component>
-<component name="drm_secondary_display_api" long-name="DRM Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_secondary_display_api/group"/>
-</component>
-<component name="drm_license_manager_api" long-name="DRM License Manager API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_license_manager_api/group"/>
-</component>
-<component name="drm_utility_api" long-name="DRM Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_utility_api/group"/>
-</component>
-<component name="drm_agents_api" long-name="DRM Agents API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_agents_api/group"/>
-</component>
-<component name="wmdrm_core_api" long-name="WM DRM Core API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_core_api/group"/>
-</component>
-<component name="wmdrm_access_api" long-name="WMDRM Access API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_access_api/group"/>
-</component>
-<component name="camese_utility_api" long-name="Camese Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_utility_api/group"/>
-</component>
-<component name="camese_framework_api" long-name="Camese Framework API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_framework_api/group"/>
-</component>
-</collection>
-<collection name="drm_pub" long-name="DRM Public Interfaces" level="specific">
-<component name="drm_helper_api" long-name="DRM Helper API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_helper_api/group"/>
-</component>
-<component name="oma_drm_caf_agent_api" long-name="OMA DRM CAF Agent API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/group"/>
-</component>
-<component name="drm_license_checker_api" long-name="DRM License Checker API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_license_checker_api/group"/>
-</component>
-</collection>
-<collection name="commondrm" long-name="Common DRM" level="generic">
-<!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
-<component name="drmencryptor" filter="s60" long-name="DRM Encryptor" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmsettingsplugin" filter="s60" long-name="DRM Settings Plugin" plugin="Y" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmrightsmanagerui" filter="s60" long-name="DRM Rights Manager UI">
-<unit bldFile="mw/drm/commondrm/drmrightsmanagerui/help/group"/>
-</component>
-<component name="drmutility" filter="s60" long-name="DRM Utility">
-<!-- Uncomment unit when configuration is in place. Currently #included from commondrm_build -->
-<!--<unit bldFile="commondrm/drmutility/group"/>-->
-</component>
-<component name="drmserviceapiwrapper" filter="s60" long-name="DRM Service API Wrapper">
-<unit bldFile="mw/drm/commondrm/drmserviceapiwrapper/group"/>
-</component>
-<component name="drmrightsstoringlocation" filter="s60" long-name="DRM Rights Storing Location">
-<unit bldFile="mw/drm/commondrm/drmrightsstoringlocation/group"/>
-</component>
-<component name="commondrm_build" filter="s60" long-name="Common DRM Build">
-<!-- should be split into the above files, or them collapsed into a single component -->
-<unit bldFile="mw/drm/commondrm/group"/>
-</component>
-</collection>
-<collection name="omadrm" long-name="OMA DRM" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="omadrm_build" filter="s60" long-name="OMA DRM Build">
-<unit bldFile="mw/drm/omadrm/group"/>
-</component>
-<component name="foundationcerts" filter="sf_build" long-name="Foundation Certificates">
-<unit bldFile="mw/drm/omadrm/foundationcerts/group"/>
-</component>
-</collection>
-<collection name="wmdrm" long-name="Windows Media DRM" level="framework">
-<!-- collection is really a component. Move down a directory -->
-<component name="wmdrm_build" filter="s60" long-name="WM DRM Build">
-<unit bldFile="mw/drm/wmdrm/group"/>
-</component>
-</collection>
-<collection name="drm_info" long-name="DRM Info" level="specific"/>
-</block>
-<block name="locationsrv" level="specific" long-name="Location Services" levels="plugin fw server if">
-<collection name="locsrv_pub" long-name="Location Services Public Interfaces" level="if">
-<component name="landmarks_search_api" long-name="Landmarks Search API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
-</component>
-<component name="landmarks_api" long-name="Landmarks API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/group"/>
-</component>
-<component name="landmarks_database_management_api" long-name="Landmarks Database Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/group"/>
-</component>
-<component name="location_triggering_api" long-name="Location Triggering API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/location_triggering_api/group"/>
-</component>
-<component name="blid_application_satellite_info_api" long-name="BLID Application Satellite Info API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/group"/>
-</component>
-</collection>
-<collection name="locsrv_plat" long-name="Location Services Platform Interfaces" level="if">
-<component name="map_and_navigation_api" long-name="Map and Navigation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/group"/>
-</component>
-<component name="map_and_navigation_provider_discovery_api" long-name="Map and Navigation Provider Discovery API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/group"/>
-</component>
-<component name="geocoding_api" long-name="Geocoding API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
-</component>
-<component name="map_image_api" long-name="Map Image API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/group"/>
-</component>
-<component name="map_and_navigation_aiw_api" long-name="Map and Navigation AIW API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_aiw_api/group"/>
-</component>
-<component name="map_and_navigation_provider_api" long-name="Map and Navigation Provider API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_api/group"/>
-</component>
-<component name="landmarks_category_definition_api" long-name="Landmarks Category Definition API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
-</component>
-<component name="supl_settings_api" long-name="SUPL Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
-</component>
-<component name="location_settings_launch_api" long-name="Location Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/group"/>
-</component>
-<component name="map_image_conversion_plugin_api" long-name="Map Image Conversion Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/group"/>
-</component>
-<component name="psy_configuration_ui_plugin_api" long-name="PSY Configuration UI Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/psy_configuration_ui_plugin_api/group"/>
-</component>
-<component name="np_proxy_configuration_api" long-name="NP Proxy Configuration API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/np_proxy_configuration_api/group"/>
-</component>
-<component name="supl_terminal_initiation_api" long-name="SUPL Terminal Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/group"/>
-</component>
-<component name="location_notation_preferences_settings_api" long-name="Location Notation Preferences Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_notation_preferences_settings_api/group"/>
-</component>
-<component name="supl_settings_notifier_secondary_display_api" long-name="SUPL Settings Notifier Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_notifier_secondary_display_api/group"/>
-</component>
-<component name="supl_network_initiation_api" long-name="SUPL Network Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/group"/>
-</component>
-<component name="privacy_notifiers_secondary_display_api" long-name="Privacy Notifiers Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/privacy_notifiers_secondary_display_api/group"/>
-</component>
-<component name="oma_supl_configuration_parameter_api" long-name="OMA SUPL Configuration Parameter API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_configuration_parameter_api/group"/>
-</component>
-<component name="supl_query_secondary_display_api" long-name="SUPL Query Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_query_secondary_display_api/group"/>
-</component>
-<component name="location_triggering_management_api" long-name="Location Triggering Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_management_api/group"/>
-</component>
-<component name="location_triggering_status_information_api" long-name="Location Triggering Status Information API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_status_information_api/group"/>
-</component>
-<component name="oma_supl_asn_codec_plugin_api" long-name="OMA SUPL ASN Codec Plugin API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
-</component>
-<component name="location_local_variation_api" long-name="Location Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_local_variation_api/group"/>
-</component>
-<component name="query_and_notification_api" long-name="Query and Notification API" filter="s60" class="api">
-<!-- not yet supplied <meta rel="Api" href="locsrv_plat/query_and_notification_api/query_and_notification_api.metaxml"/> -->
-<unit bldFile="mw/locationsrv/locsrv_plat/query_and_notification_api/group"/>
-</component>
-</collection>
-<collection name="genericpositioningplugins" long-name="Generic Positioning Plugins" level="plugin">
-<component name="locationnpppsy" filter="s60" long-name="Location Positioning Proxy PSY" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
-</component>
-<component name="locationsuplpsy" filter="s60" long-name="Location SUPL PSY" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationsuplpsy/group"/>
-</component>
-<component name="genericpositioningplugins_build" filter="s60" long-name="Generic Positioning Plugins Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/genericpositioningplugins/group"/>
-</component>
-</collection>
-<collection name="landmarks" long-name="Landmarks" level="server">
-<component name="locationlandmarks" filter="s60" long-name="Location Landmarks">
-<unit bldFile="mw/locationsrv/landmarks/locationlandmarks/group"/>
-</component>
-</collection>
-<collection name="locationmapnavfw" long-name="Location Map and Navigation Framework" level="fw">
-<component name="mnlibrary" filter="s60" long-name="Map and Navigation Library">
-<unit bldFile="mw/locationsrv/locationmapnavfw/library/group"/>
-</component>
-<component name="mnaiwprovider" filter="s60" long-name="Map and Navigation AIW Provider" plugin="Y">
-<unit bldFile="mw/locationsrv/locationmapnavfw/aiwprovider/group"/>
-</component>
-<component name="locationmapnavfw_build" filter="s60" long-name="Location Map and Navigation Framework Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/locationmapnavfw/group"/>
-</component>
-</collection>
-<collection name="locationsystemui" long-name="Location System UI" level="if">
-<component name="locationsysui" filter="s60" long-name="Location System UI">
-<unit bldFile="mw/locationsrv/locationsystemui/locationsysui/group"/>
-</component>
-</collection>
-<collection name="supl" long-name="SUPL" level="fw">
-<component name="locationsuplfw" filter="s60" long-name="Location SUPL Framework">
-<unit bldFile="mw/locationsrv/supl/locationsuplfw/group"/>
-</component>
-<component name="locationomasuplprotocolhandler" filter="s60" long-name="OMA SUPL Protocol Handler">
-<unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/group"/>
-</component>
-<component name="supltiapiimplementation" filter="s60" long-name="SUPL TI API Implementation" introduced="^3">
-<unit bldFile="mw/locationsrv/supl/supltiapiimplementation/group"/>
-</component>
-</collection>
-<collection name="locationtriggering" long-name="Location Triggering" level="server">
-<component name="ltlogger" filter="s60" long-name="LT Logger">
-<unit bldFile="mw/locationsrv/locationtriggering/ltlogger/group"/>
-</component>
-<component name="ltclientlib" filter="s60" long-name="LT Client Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltclientlib/group"/>
-</component>
-<component name="ltmanagementlib" filter="s60" long-name="LT Management Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmanagementlib/group"/>
-</component>
-<component name="ltcontainer" filter="s60" long-name="LT Container">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontainer/group"/>
-</component>
-<component name="ltserver" filter="s60" long-name="LT Server">
-<unit bldFile="mw/locationsrv/locationtriggering/ltserver/group"/>
-</component>
-<component name="ltstrategypluginapi" filter="s60" long-name="LT Strategy Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategypluginapi/group"/>
-</component>
-<component name="ltstrategyengine" filter="s60" long-name="LT Strategy Engine">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategyengine/group"/>
-</component>
-<component name="ltmovementdetectionpluginapi" filter="s60" long-name="Movement Detection Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmovementdetectionpluginapi/group"/>
-</component>
-<component name="ltcellidmovementdetector" filter="s60" long-name="Cell ID Movement Detector">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/>
-</component>
-<component name="lbtmgmtui" filter="s60" long-name="LBT Management UI" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/lbtmgmtui/group"/>
-</component>
-<component name="ltcontextsourceplugin" filter="s60" long-name="LT Context Source Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontextsourceplugin/group"/>
-</component>
-<component name="locationtriggering_build" filter="s60" long-name="Location Triggering Build">
-<!-- should remove #include from this and maybe put exports in the above components -->
-<unit bldFile="mw/locationsrv/locationtriggering/group"/>
-</component>
-</collection>
-</block>
-<block name="accesssec" level="generic" long-name="Access Security" levels="plugin framework server generic specific">
-<collection name="accesssec_plat" long-name="Access Security Platform Interfaces" level="specific">
-<component name="wapi_security_settings_ui_api" long-name="WAPI Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_security_settings_ui_api/group"/>
-</component>
-<component name="wep_security_settings_ui_api" long-name="WEP Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wep_security_settings_ui_api/group"/>
-</component>
-<component name="wi-fi_protected_setup_ui_api" long-name="Wi-Fi Protected Setup UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
-</component>
-<component name="wlan_eap_settings_ui_api" long-name="WLAN EAP Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wlan_eap_settings_ui_api/group"/>
-</component>
-<component name="wpa_security_settings_ui_api" long-name="WPA Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wpa_security_settings_ui_api/group"/>
-</component>
-<component name="eap_vpn_api" long-name="EAP VPN API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
-</component>
-<component name="eapsim_db_api" long-name="EAP-SIM DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapsim_db_api/group"/>
-</component>
-<component name="eap_type_api" long-name="EAP Type API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_type_api/group"/>
-</component>
-<component name="eaptlspeap_db_api" long-name="EAP-TLS-PEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eaptlspeap_db_api/group"/>
-</component>
-<component name="eapleap_db_api" long-name="LEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapleap_db_api/group"/>
-</component>
-<component name="eapgtc_db_api" long-name="EAP-GTC DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapgtc_db_api/group"/>
-</component>
-<component name="eapmschapv2_db_api" long-name="EAP-MSCHAPV2 DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapmschapv2_db_api/group"/>
-</component>
-<component name="eapaka_db_api" long-name="EAP-AKA DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapaka_db_api/group"/>
-</component>
-<component name="wapi_db_api" long-name="WAPI DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_db_api/group"/>
-</component>
-</collection>
-<collection name="wlansecuritysettings" long-name="WLAN Security Settings" level="specific">
-<component name="wapisecuritysettingsui" filter="s60" long-name="WAPI Security Settings UI" introduced="9.1">
-<!-- the directory for this needs to be moved up to the right level -->
-<unit bldFile="mw/accesssec/wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
-</component>
-<component name="wepsecuritysettingsui" filter="s60" long-name="WEP Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wepsecuritysettingsui/group"/>
-</component>
-<component name="wifiprotectedsetup" filter="s60" long-name="WIFI Protected Setup" introduced="^1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wifiprotectedsetup/group"/>
-</component>
-<component name="wlaneapsettingsui" filter="s60" long-name="WLAN EAP Settings UI" introduced="9.3">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wlaneapsettingsui/group"/>
-</component>
-<component name="wpasecuritysettingsui" filter="s60" long-name="WPA Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wpasecuritysettingsui/group"/>
-</component>
-</collection>
-<collection name="eapol" long-name="EAPOL" level="framework">
-<component name="eapol_framework" filter="s60" long-name="EAPOL Framework" introduced="9.2">
-<unit bldFile="mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
-</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">
-<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>
-<component name="bearer_settings_plugin_api" long-name="Bearer Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/bearer_settings_plugin_api/group"/>
-</component>
-<component name="commsdat_wlan_api" long-name="CommsDat WLAN API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/commsdat_wlan_api/group"/>
-</component>
-<component name="connection_monitor_extension_api" long-name="Connection Monitor Extension API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_monitor_extension_api/group"/>
-</component>
-<component name="connection_ui_utilities_api" long-name="Connection UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_ui_utilities_api/group"/>
-</component>
-<component name="disconnect_dialog_api" long-name="Disconnect Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_api/group"/>
-</component>
-<component name="disconnect_dialog_disable_api" long-name="Disconnect Dialog Disable API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_disable_api/group"/>
-</component>
-<component name="extended_connection_settings_api" long-name="Extended Connection Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/extended_connection_settings_api/group"/>
-</component>
-<component name="mpm_default_connection_api" long-name="MPM Default Connection API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_default_connection_api/group"/>
-</component>
-<component name="pdpcontextmanager2_reset_factory_settings_api" long-name="PDP Context Manager 2 Reset Factory Settings API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_settings_api/group"/>
-</component>
-<component name="mpm_connect_screen_api" long-name="MPM Connect Screen API" filter="s60" class="api">
-<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">
-<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>
-<component name="access_point_engine_api" long-name="Access Point Engine API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_monitor_server_api/group"/>
-</component>
-<component name="connection_settings_ui_api" long-name="Connection Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_ui_api/group"/>
-</component>
-<component name="agent_dialog_api" long-name="Agent Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/agent_dialog_api/group"/>
-</component>
-<component name="extendedconnpref_api" long-name="Extended Connection Preferences API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/extendedconnpref_api/group"/>
-</component>
-</collection>
-<collection name="accesspointcontrol" long-name="Access Point Control" level="plugin">
-<component name="apcontrollistplugin" filter="s60" long-name="Access Point Control List Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
-</component>
-</collection>
-<collection name="alwayson_net_plugin" long-name="Always Online Net Plugin" level="server">
-<component name="pdpcontextmanager2" filter="s60" long-name="PDP Context Manager 2">
-<unit bldFile="mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
-</component>
-</collection>
-<collection name="apengine" long-name="Access Point Engine" level="framework">
-<component name="apeng" filter="s60" long-name="Access Point Engine">
-<unit bldFile="mw/ipconnmgmt/apengine/apeng/group"/>
-</component>
-<component name="apsettingshandlerui" filter="s60" long-name="Access Point Settings Handler UI">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingshandlerui/group"/>
-</component>
-<component name="apsettingsplugin" filter="s60" long-name="Access Point Settings Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="bearermanagement" long-name="Bearer Management" level="framework">
-<component name="mpm" filter="s60" long-name="Mobility Policy Manager">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/mpm/group"/>
-</component>
-<component name="extendedconnpref" filter="s60" long-name="Extended Connection Preferences">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/extendedconnpref/group"/>
-</component>
-<component name="s60mcpr" filter="s60" long-name="S60 Meta-Connection Provider" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/S60MCPR/group"/>
-</component>
-</collection>
-<collection name="cmmanager" long-name="Connection Method Manager" level="framework">
-<component name="cmmgr" filter="s60" long-name="CM Manager">
-<unit bldFile="mw/ipconnmgmt/cmmanager/cmmgr/group"/>
-</component>
-<component name="gsconnsettingsplugin" filter="s60" long-name="GS Connection Settings Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/cmmanager/gsconnsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="connectionmonitoring" long-name="Connection Monitoring" level="server">
-<component name="connectionmonitorplugin" filter="s60" long-name="Connection Monitor Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorplugin/group"/>
-</component>
-<component name="connectionmonitorui" filter="s60" long-name="Connection Monitor UI">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorui/group"/>
-</component>
-<component name="connmon" filter="s60" long-name="Connection Monitor">
-<!-- either split into two components, or #include from a common bld.inf -->
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/connectionmonitor/group"/>
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/dataconnectionlogger/group"/>
-</component>
-<component name="connmonext" filter="s60" long-name="Connection Monitor Extension API">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmonext/group"/>
-</component>
-</collection>
-<collection name="connectionutilities" long-name="Connection Utilities" level="utils">
-<component name="connectiondialogs" filter="s60" long-name="Connection Dialogs">
-<unit bldFile="mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/>
-</component>
-</collection>
-<collection name="dbcreator" long-name="DB Creator" level="utils">
-<component name="commsdatcreator" filter="s60" long-name="Comms Database Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
-</component>
-<component name="commsdatcreatorrfsplugin" filter="s60" long-name="Comms Database Creator RFS Plugin" introduced="9.3" plugin="Y">
-<!-- uncomment when config is turned on -->
-<!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
-</component>
-<component name="commsdatstartup" filter="s60" long-name="Comms Database Startup" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
-</component>
-<component name="dbcreatorexe" filter="s60" long-name="DB Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
-</component>
-<component name="dbcreator_build" filter="s60" long-name="DB Creator Build" introduced="9.3">
-<!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
-<unit bldFile="mw/ipconnmgmt/dbcreator/group"/>
-</component>
-</collection>
-<collection name="ipconnmgmt_info" long-name="IP Connectivity Management Info" level="utils">
-<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"/>
-</component>
-</collection>
-</block>
-<block name="netprotocols" level="generic" long-name="High-level Internet Protocols" levels="plugin framework server generic specific">
-<collection name="netprotocols_plat" long-name="High-level Internet Protocols Platform Interfaces" level="specific">
-<component name="cookie_manager_api" long-name="Cookie Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/cookie_manager_api/group"/>
-</component>
-<component name="http_cache_mgr_api" long-name="HTTP Cache Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_cache_mgr_api/group"/>
-</component>
-<component name="http_filters_api" long-name="HTTP Filters API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_filters_api/group"/>
-</component>
-</collection>
-<collection name="httpfilters" long-name="HTTP Filters" level="plugin">
-<component name="httpfiltercommon" filter="s60" long-name="HTTP Filter Common">
-<unit bldFile="mw/netprotocols/httpfilters/httpfiltercommon/group"/>
-</component>
-<component name="cookie" filter="s60" long-name="Cookie Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/cookie/group"/>
-</component>
-<component name="deflatefilter" filter="s60" long-name="Deflate Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/deflatefilter/group"/>
-</component>
-<component name="httpfilteracceptheader" filter="s60" long-name="Accept Header Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteracceptheader/group"/>
-</component>
-<component name="httpfilterauthentication" filter="s60" long-name="Authentication Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterauthentication/group"/>
-</component>
-<component name="httpfilterconnhandler" filter="s60" long-name="Connection Handler Fitler" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterconnhandler/group"/>
-</component>
-<component name="httpfilteriop" filter="s60" long-name="HTTP IOP Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteriop/group"/>
-</component>
-<component name="httpfilterproxy" filter="s60" long-name="HTTP Proxy Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterproxy/group"/>
-</component>
-<component name="uaproffilter" filter="s60" long-name="UAProf Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/uaproffilter/group"/>
-</component>
-</collection>
-<collection name="applayerprotocols" long-name="Application Layer Protocols" level="server">
-<component name="httptransportfw" long-name="HTTP Transport Framework" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
-</component>
-<component name="httpexamples" long-name="HTTP Examples" introduced="6.2" purpose="development">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpexamples/group" mrp="mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
-</component>
-<component name="wappushsupport" long-name="WAP Push Support" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
-</component>
-<component name="wapbase" long-name="WAP Base" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wapbase/Group" mrp="mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
-</component>
-<component name="ftpengine" long-name="FTP Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/ftpengine/group" mrp="mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
-</component>
-<component name="telnetengine" long-name="Telnet Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/telnetengine/group" mrp="mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
-</component>
-<component name="httpserviceapi" long-name="HTTP Service API" introduced="TB9.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpservice/group" mrp="mw/netprotocols/applayerprotocols/httpservice/group/http_service.mrp"/>
-</component>
-</collection>
-<collection name="applayerpluginsandutils" long-name="Application Layer Plugins and Utils" level="framework">
-<component name="uripermissionservices" long-name="URI Permission Services" introduced="^2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
-</component>
-<component name="bookmarksupport" long-name="Bookmark Support" introduced="9.1" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
-</component>
-<component name="httpprotocolplugins" long-name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
-</component>
-<component name="httptransportplugins" long-name="HTTP Transport Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
-</component>
-</collection>
-<collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
-<component name="netprotocols_metadata" long-name="High-level Internet Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ipappprotocols" level="generic" long-name="IP App Protocols" levels="plugin conn server if">
-<collection name="ipappprotocols_plat" long-name="IP App Protocols Platform Interfaces" level="if">
-<component name="srtp_api" long-name="SRTP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/srtp_api/group"/>
-</component>
-<component name="rtprtcp_api" long-name="RTP/RTCP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/rtprtcp_api/group"/>
-</component>
-</collection>
-<collection name="rtp" long-name="RTP" level="server">
-<component name="srtpstack" filter="s60" long-name="SRTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/srtpstack/group"/>
-</component>
-<component name="rtpstack" filter="s60" long-name="RTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/rtpstack/group"/>
-</component>
-</collection>
-<collection name="realtimenetprots" long-name="Real Time Net Protocols" level="server">
-<component name="symrtp" long-name="RTP" introduced="9.0" purpose="optional">
-<!-- Real Time Data Protocol -->
-<unit bldFile="mw/ipappprotocols/realtimenetprots/rtp/group" mrp="mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
-</component>
-<component name="sipfw" long-name="SIP Framework" introduced="9.2" purpose="optional">
-<unit bldFile="mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp" version="2"/>
-</component>
-</collection>
-<collection name="sipplugins" long-name="SIP Plugins" level="plugin">
-<component name="sippwlanplugin" filter="s60" long-name="SIP WLAN Plugin" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
-</component>
-<component name="sippsipsettingsui" filter="s60" long-name="SIP Settings UI" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
-</component>
-<component name="sippdevmgmtsipadapter" filter="s60" long-name="Device Management SIP Settings Adapter" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
-</component>
-<component name="sippsystemstatemonitor" filter="s60" long-name="SIP System State Monitor" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsystemstatemonitor/group"/>
-</component>
-<component name="sippsipadapter" filter="s60" long-name="SIP Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipadapter/group"/>
-</component>
-</collection>
-<collection name="sipproviderplugins" long-name="SIP Provider Plugins" level="conn">
-<component name="sipprovider" long-name="SIP Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipproviderplugins/sipprovider/group" mrp="mw/ipappprotocols/sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
-</component>
-</collection>
-<collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="if">
-<component name="ipappprotocols_metadata" long-name="IP App Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wirelessacc" level="specific" long-name="Wireless Access" levels="framework generic ui">
-<collection name="hsfw_plat" long-name="HotSpot Framework Platform Interfaces" level="ui">
-<component name="hotspot_framework_client_api" long-name="HotSpot Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_api" long-name="Internet Connectivity Test Service API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_settings_api" long-name="Internet Connectivity Test Service Settings API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
-</component>
-<component name="hotspot_framework_client_plugin_api" long-name="HotSpot Framework Client Plugin API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
-</component>
-</collection>
-<collection name="hotspotfw" long-name="HotSpot Framework" level="framework">
-<component name="hsserver" filter="s60" long-name="HotSpot Server" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="hsclient" filter="s60" long-name="HotSpot Client" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="internetconnectivitytestservice" filter="s60" long-name="Internet Connectivity Test Service" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
-</component>
-<component name="ictsdialogs" filter="s60" long-name="Internet Connectivity Test Service Dialogs" deprecated="^3" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
-</component>
-<component name="hspluginforagent" filter="s60" long-name="HotSpot Plugin for Agent" plugin="Y" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
-</component>
-<component name="hsbrowser" filter="s60" long-name="HotSpot Browser" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
-</component>
-<component name="hotspotfw_build" filter="s60" long-name="Hotspot Framework Build">
-<!-- should break up this bld.inf into the above components, or collapse them all into a single component -->
-<unit bldFile="mw/wirelessacc/hotspotfw/group"/>
-</component>
-</collection>
-<collection name="wlanutilities" long-name="WLAN Utilities" level="generic">
-<component name="wlanplugin" filter="s60" long-name="WLAN Plugin" plugin="Y">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlanplugin/group"/>
-</component>
-<component name="wlansettingsui" filter="s60" long-name="WLAN Settings UI">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlansettingsui/group"/>
-</component>
-<component name="wlansniffer" filter="s60" long-name="WLAN Sniffer">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlansniffer/group"/>
-</component>
-<component name="wlanindicatorplugin" filter="s60" long-name="WLAN Indicator Plugin" plugin="Y">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlanindicatorplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="vpnclient" level="specific" long-name="VPN Client" levels="engine ui api">
-<!-- is the !oem_build filter needed? -->
-<collection name="vpnc_plat" long-name="VPN Client Platform Interfaces" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API" class="api">
-<unit bldFile="mw/vpnclient/vpnc_plat/vpnapi/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API">
-<unit bldFile="mw/vpnclient/vpnapiimpl/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnengine" long-name="VPN Engine" level="engine">
-<!-- too many components in this collection.
- Probably best to group the binaries together into larger components
- or maybe split the collection into more reasonable groups -->
-<component name="eventmediatorapi" filter="s60" long-name="Event Mediator API">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediatorapi/group" filter="!oem_build"/>
-</component>
-<component name="eventviewer" filter="s60" long-name="Event Viewer">
-<unit bldFile="mw/vpnclient/vpnengine/eventviewer/group" filter="!oem_build"/>
-</component>
-<component name="vpnins" filter="s60" long-name="VPN Installer">
-<unit bldFile="mw/vpnclient/vpnengine/vpnins/group" filter="!oem_build"/>
-</component>
-<component name="ikepolparser" filter="s60" long-name="IKE Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/ikepolparser/group" filter="!oem_build"/>
-</component>
-<component name="utlbase64" filter="s60" long-name="Base64 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlbase64/group" filter="!oem_build"/>
-</component>
-<component name="utlcrypto" filter="s60" long-name="Crypto Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlcrypto/group" filter="!oem_build"/>
-</component>
-<component name="utlxml" filter="s60" long-name="XML Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlxml/group" filter="!oem_build"/>
-</component>
-<component name="utlpkcs10" filter="s60" long-name="PKCS#10 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs10/group" filter="!oem_build"/>
-</component>
-<component name="pkiserviceapi" filter="s60" long-name="PKI Service API">
-<unit bldFile="mw/vpnclient/vpnengine/pkiserviceapi/group" filter="!oem_build"/>
-</component>
-<component name="ikecert" filter="s60" long-name="IKE Certificate Management">
-<unit bldFile="mw/vpnclient/vpnengine/ikecert/group" filter="!oem_build"/>
-</component>
-<component name="kmdapi" filter="s60" long-name="Key Management Daemon API">
-<unit bldFile="mw/vpnclient/vpnengine/kmdapi/group" filter="!oem_build"/>
-</component>
-<component name="kmdserver" filter="s60" long-name="Key Management Daemon Server">
-<unit bldFile="mw/vpnclient/vpnengine/kmdserver/group" filter="!oem_build"/>
-</component>
-<component name="ikeutils" filter="s60" long-name="Internet Key Exchange Utils">
-<unit bldFile="mw/vpnclient/vpnengine/ikeutils/group" filter="!oem_build"/>
-</component>
-<component name="ikev1lib" filter="s60" long-name="IKEv1 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev1lib/group" filter="!oem_build"/>
-</component>
-<component name="ikev2lib" filter="s60" long-name="IKEv2 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev2lib/group" filter="!oem_build"/>
-</component>
-<component name="vpnipsecpolparser" filter="s60" long-name="VPN IPsec Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/vpnipsecpolparser/group" filter="!oem_build"/>
-</component>
-<component name="sit" filter="s60" long-name="Socket Interaction Thread">
-<unit bldFile="mw/vpnclient/vpnengine/sit/group" filter="!oem_build"/>
-</component>
-<component name="vpntcwrapper" filter="s60" long-name="VPN Terminal Control Wrapper">
-<unit bldFile="mw/vpnclient/vpnengine/vpntcwrapper/group" filter="!oem_build"/>
-</component>
-<component name="eventmediator" filter="s60" long-name="Event Mediator">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediator/group" filter="!oem_build"/>
-</component>
-<component name="pkiservice" filter="s60" long-name="PKI Service">
-<unit bldFile="mw/vpnclient/vpnengine/pkiservice/group" filter="!oem_build"/>
-</component>
-<component name="vpnconnagt" filter="s60" long-name="VPN Connection Agent">
-<unit bldFile="mw/vpnclient/vpnengine/vpnconnagt/group" filter="!oem_build"/>
-</component>
-<component name="vpnmanager" filter="s60" long-name="VPN Manager">
-<unit bldFile="mw/vpnclient/vpnengine/vpnmanager/group" filter="!oem_build"/>
-</component>
-<component name="vpncleaner" filter="s60" long-name="VPN Cleaner">
-<unit bldFile="mw/vpnclient/vpnengine/vpncleaner/group" filter="!oem_build"/>
-</component>
-<component name="utlpkcs12" filter="s60" long-name="PKCS#12 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs12/group" filter="!oem_build"/>
-</component>
-<component name="dmadengine" filter="s60" long-name="DM Adapter Engine">
-<unit bldFile="mw/vpnclient/vpnengine/dmadengine/group" filter="!oem_build"/>
-</component>
-<component name="dmadipsecvpn" filter="s60" long-name="IPsec VPN DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadipsecvpn/group" filter="!oem_build"/>
-</component>
-<component name="dmadpki" filter="s60" long-name="PKI DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadpki/group" filter="!oem_build"/>
-</component>
-<component name="ikesocket" filter="s60" long-name="IKE Socket" introduced="^3">
-<unit bldFile="mw/vpnclient/vpnengine/ikesocket/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnui" long-name="VPN UI" level="ui">
-<component name="vpnecomnotifier" filter="s60" long-name="VPN ECOM Notifier" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnecomnotifier/group" filter="!oem_build"/>
-</component>
-<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">
-<unit bldFile="mw/vpnclient/vpnui/vpnmanagementui/group" filter="!oem_build"/>
-</component>
-<component name="vpnpolins" filter="s60" long-name="VPN Policy Installer">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolins/group" filter="!oem_build"/>
-</component>
-<component name="vpnpolicyrecognizer" filter="s60" long-name="VPN Policy Recognizer" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolicyrecognizer/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnclient_info" long-name="VPN Client Info" level="api">
-<component name="vpnclient_help" filter="s60" long-name="VPN Client Help">
-<unit bldFile="mw/vpnclient/help/group" filter="!oem_build"/>
-</component>
-<component name="vpnclient_build" filter="s60" long-name="VPN Client Build">
-<!-- should split this up into the other components and remove this-->
-<unit bldFile="mw/vpnclient/group" filter="!oem_build"/>
-</component>
-</collection>
-</block>
-<block name="ipappsrv" level="specific" long-name="IP App Services" levels="framework generic server conn plugin">
-<collection name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" level="plugin">
-<component name="transcoder_api" long-name="Transcoder API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
-</component>
-<component name="comms_event_api" long-name="Comms Event API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/comms_event_api/group"/>
-</component>
-<component name="floor_control_api" long-name="Floor Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/floor_control_api/group"/>
-</component>
-<component name="media_control_api" long-name="Media Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/media_control_api/group"/>
-</component>
-<component name="multimedia_comms_api" long-name="Multimedia Comms API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/multimedia_comms_api/group"/>
-</component>
-<component name="nat_settings_api" long-name="NAT Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/nat_settings_api/group"/>
-</component>
-</collection>
-<collection name="natfw" long-name="NAT Framework" level="framework">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="natfw_build" filter="s60" long-name="NAT Framework Build" introduced="^2">
-<unit bldFile="mw/ipappsrv/natfw/group"/>
-</component>
-</collection>
-<collection name="multimediacommscontroller" long-name="Multimedia Comms Controller" level="conn">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommscontroller_build" filter="s60" long-name="Multimedia Comms Controller Build">
-<unit bldFile="mw/ipappsrv/multimediacommscontroller/group"/>
-</component>
-</collection>
-<collection name="multimediacommsengine" long-name="Multimedia Comms Engine" level="generic">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommsengine_build" filter="s60" long-name="Multimedia Comms Engine Build">
-<unit bldFile="mw/ipappsrv/multimediacommsengine/group"/>
-</component>
-</collection>
-<collection name="natplugins" long-name="NAT Plugins" level="plugin">
-<component name="natpcliprovisioningnatfwadapter" filter="s60" long-name="Client Provisioning NAT Framework Traversal Adapter" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/group"/>
-</component>
-<component name="natpdevmgmtnatfwadapter" filter="s60" long-name="Device Management NAT Framework Traversal Adapter" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/group"/>
-</component>
-<component name="natptraversalcontroller" filter="s60" long-name="NAT Traversal Controller" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natptraversalcontroller/group"/>
-</component>
-<component name="natpnatfwsdpprovider" filter="s60" long-name="NAT Framework SDP Provider" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpnatfwsdpprovider/group"/>
-</component>
-</collection>
-<collection name="ipappsrv_info" long-name="IP App Services Info" level="plugin">
-<component name="ipappsrv_build" long-name="IP App Services Build" filter="s60">
-<!-- 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">
-<collection name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" level="specific">
-<component name="string_parser_api" long-name="String Parser API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/string_parser_api/group"/>
-</component>
-<component name="cbs_mcn_client_api" long-name="CBS MCN Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cbs_mcn_client_api/group"/>
-</component>
-<component name="converged_call_engine_api" long-name="Converged Call Engine API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_engine_api/group"/>
-</component>
-<component name="aiw_dial_data_consumer_api" long-name="AIW Dial Data Consumer API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/aiw_dial_data_consumer_api/group"/>
-</component>
-<component name="phone_client_ussd_api" long-name="Phone Client USSD API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_api/group"/>
-</component>
-<component name="sat_refresh_api" long-name="SAT Refresh API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_refresh_api/group" filter="!test"/>
-</component>
-<component name="network_handling_engine_api" long-name="Network Handling Engine API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/network_handling_engine_api/group"/>
-</component>
-<component name="phone_client_emergency_call_api" long-name="Phone Client Emergency Call API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/group"/>
-</component>
-<component name="sat_configuration_api" long-name="SAT Configuration API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_configuration_api/group"/>
-</component>
-<component name="dial_utils_api" long-name="Dial Utils API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/dial_utils_api/group"/>
-</component>
-<component name="phone_client_image_handler_api" long-name="Phone Client Image Handler API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_image_handler_api/group"/>
-</component>
-<component name="phone_client_messenger_api" long-name="Phone Client Messenger API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_messenger_api/group"/>
-</component>
-<component name="sat_client_api" long-name="SAT Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_client_api/group" filter="!test"/>
-</component>
-<component name="phone_client_api" long-name="Phone Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_api/group"/>
-</component>
-<component name="sat_service_api" long-name="SAT Service API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_service_api/group" filter="!test"/>
-</component>
-<component name="cbs_message_api" long-name="CBS Message API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cbs_message_api/group"/>
-</component>
-<component name="phone_client_server_information_api" long-name="Phone Client Server Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_server_information_api/group"/>
-</component>
-<component name="phone_client_ussd_internal_api" long-name="Phone Client USSD Internal API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_internal_api/group"/>
-</component>
-<component name="phone_client_command_handler_api" long-name="Phone Client Command Handler API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_command_handler_api/group"/>
-</component>
-<component name="phone_client_notify_api" long-name="Phone Client Notify API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_notify_api/group"/>
-</component>
-<component name="phone_client_utility_api" long-name="Phone Client Utility API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_utility_api/group"/>
-</component>
-<component name="telephony_network_information_api" long-name="Telephony Network Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_network_information_api/group"/>
-</component>
-<component name="secondary_display_sat_api" long-name="Secondary Display SAT API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/secondary_display_sat_api/group"/>
-</component>
-<component name="callui_reconnect_query_api" long-name="CallUI Reconnect Query API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/callui_reconnect_query_api/group"/>
-</component>
-<component name="service_provider_settings_api" long-name="Service Provider Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/service_provider_settings_api/group"/>
-</component>
-<component name="converged_call_provider_api" long-name="Converged Call Provider API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_provider_api/group"/>
-</component>
-<component name="incoming_call_monitor_api" long-name="Incoming Call Monitor API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/incoming_call_monitor_api/group"/>
-</component>
-<component name="default_emergency_numbers_api" long-name="Default Emergency Numbers API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/default_emergency_numbers_api/group"/>
-</component>
-<component name="cenrep_database_api" long-name="Central Repository Database API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cenrep_database_api/group"/>
-</component>
-<component name="ss_settings_api" long-name="SS Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/ss_settings_api/group"/>
-</component>
-<component name="phone_settings_observer_api" long-name="Phone Settings Observer API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_observer_api/group"/>
-</component>
-<component name="phone_settings_notes_ui_api" long-name="Phone Settings Notes UI API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_notes_ui_api/group"/>
-</component>
-<component name="phone_settings_api" long-name="Phone Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_api/group"/>
-</component>
-<component name="voice_mailbox_number_api" long-name="Voice Mailbox Number API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_number_api/group"/>
-</component>
-<component name="voice_mailbox_settings_api" long-name="Voice Mailbox Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_settings_api/group"/>
-</component>
-<component name="call_information_api" long-name="Call Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/call_information_api/group" filter="!test"/>
-</component>
-<component name="call_remote_party_information_api" long-name="Call Remote Party Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/call_remote_party_information_api/group" filter="!test"/>
-</component>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_mediator_api/group"/>
-</component>
-</collection>
-<collection name="telutils" long-name="Telephony Utils" level="generic">
-<component name="phoneparser" filter="s60" long-name="Phone Parser">
-<unit bldFile="mw/phonesrv/telutils/phoneparser/group"/>
-</component>
-<component name="telephonyservice" filter="s60" long-name="Telephony Service">
-<unit bldFile="mw/phonesrv/telutils/telephonyservice/group"/>
-</component>
-</collection>
-<collection name="cbs" long-name="Cellular Baseband Services" level="plugin">
-<component name="cbsserver" filter="s60" long-name="CBS Server">
-<unit bldFile="mw/phonesrv/cbs/cbsserver/group"/>
-</component>
-<component name="cbsui" filter="s60" long-name="CBS UI">
-<unit bldFile="mw/phonesrv/cbs/cbsui/group"/>
-</component>
-</collection>
-<collection name="cellular" long-name="Cellular" level="server">
-<component name="telephonysettings" filter="s60" long-name="Telephony Settings">
-<unit bldFile="mw/phonesrv/cellular/telephonysettings/group"/>
-</component>
-<component name="sssettings" filter="s60" long-name="Supplementary Service Settings">
-<unit bldFile="mw/phonesrv/cellular/sssettings/group"/>
-</component>
-<component name="psetnotesui" filter="s60" long-name="Phone Settings Notes UI">
-<unit bldFile="mw/phonesrv/cellular/psetnotesui/group"/>
-</component>
-<component name="servicerequest" filter="s60" long-name="Service Request">
-<unit bldFile="mw/phonesrv/cellular/servicerequest/group"/>
-</component>
-</collection>
-<collection name="convergedcallengine" long-name="Converged Call Engine" level="framework">
-<component name="callprovider" filter="s60" long-name="Call Provider">
-<unit bldFile="mw/phonesrv/convergedcallengine/callprovider/group"/>
-</component>
-<component name="cce" filter="s60" long-name="CCE">
-<unit bldFile="mw/phonesrv/convergedcallengine/cce/group"/>
-</component>
-<component name="spsettings" filter="s60" long-name="Service Provider Settings">
-<unit bldFile="mw/phonesrv/convergedcallengine/spsettings/group"/>
-</component>
-<component name="cenrepdatabase" filter="s60" long-name="CCE Cenrep Database">
-<unit bldFile="mw/phonesrv/convergedcallengine/cenrepdatabase/group"/>
-</component>
-<component name="serviceselector" filter="s60" long-name="Service Selector">
-<unit bldFile="mw/phonesrv/convergedcallengine/serviceselector/group"/>
-</component>
-<component name="csplugin" filter="s60" long-name="CS Plugin" plugin="Y">
-<!-- should spell out CS in name -->
-<unit bldFile="mw/phonesrv/convergedcallengine/csplugin/group"/>
-</component>
-</collection>
-<collection name="engines" long-name="Telephony Engines" level="specific">
-<component name="vmbxengine" filter="s60" long-name="Voice Mailbox Engine">
-<unit bldFile="mw/phonesrv/engines/vmbxengine/group"/>
-</component>
-</collection>
-<collection name="networkhandling" long-name="Network Handling" level="plugin">
-<component name="networkhandlingengine" filter="s60" long-name="Network Handling Engine">
-<unit bldFile="mw/phonesrv/networkhandling/networkhandlingengine/group"/>
-</component>
-</collection>
-<collection name="phoneclientserver" long-name="Phone Client/Server" level="server">
-<component name="enpolicy" filter="s60" long-name="Emergency Number Policy">
-<unit bldFile="mw/phonesrv/phoneclientserver/enpolicy/group"/>
-</component>
-<component name="aiwdialdata" filter="s60" long-name="AIW Dial Data">
-<unit bldFile="mw/phonesrv/phoneclientserver/aiwdialdata/group"/>
-</component>
-<component name="dialutils" filter="s60" long-name="Dial Utils">
-<unit bldFile="mw/phonesrv/phoneclientserver/dialutils/group"/>
-</component>
-<component name="phoneclient" filter="s60" long-name="Phone Client">
-<unit bldFile="mw/phonesrv/phoneclientserver/phoneclient/group"/>
-</component>
-<component name="phoneserver" filter="s60" long-name="Phone Server">
-<unit bldFile="mw/phonesrv/phoneclientserver/phoneserver/group"/>
-</component>
-<component name="callui" filter="s60" long-name="Call UI">
-<unit bldFile="mw/phonesrv/phoneclientserver/callui/group"/>
-</component>
-</collection>
-<collection name="satengine" long-name="SIM Application Toolkit Engine" level="generic">
-<component name="satserver" filter="s60" long-name="SAT Server">
-<unit bldFile="mw/phonesrv/satengine/satserver/group"/>
-</component>
-</collection>
-<collection name="satui" long-name="SIM Application Toolkit UI" level="specific">
-<component name="satapp" filter="s60" long-name="SAT Application">
-<unit bldFile="mw/phonesrv/satui/satapp/group"/>
-</component>
-<component name="satplugin" filter="s60" long-name="SAT Plugin" plugin="Y">
-<unit bldFile="mw/phonesrv/satui/satplugin/group"/>
-</component>
-</collection>
-<collection name="phonecmdhandler" long-name="Phone Command Handler" level="generic">
-<component name="phonecmdhnlr" filter="s60" long-name="Phone Command Handler">
-<unit bldFile="mw/phonesrv/phonecmdhandler/phonecmdhnlr/group"/>
-</component>
-</collection>
-<collection name="phonesrv_info" long-name="Telephony and SIM Services Info" level="specific"/>
-</block>
-<block name="messagingmw" level="specific" long-name="Messaging Middleware" levels="stack fw api">
-<collection name="msgfw_pub" long-name="Messaging Middleware Public Interfaces" level="api">
-<component name="send_ui_api" long-name="Send UI API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_pub/send_ui_api/group"/>
-</component>
-</collection>
-<collection name="msgfw_plat" long-name="Messaging Middleware Platform Interfaces" level="api">
-<component name="always_online_plugin_api" long-name="Always Online Plugin API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_plugin_api/group"/>
-</component>
-<component name="always_online_client_api" long-name="Always Online Client API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_client_api/group"/>
-</component>
-<component name="msg_common_utils_api" long-name="Messaging Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/msg_common_utils_api/group"/>
-</component>
-<component name="send_ui_plugin_api" long-name="Send UI Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/send_ui_plugin_api/group"/>
-</component>
-<component name="send_ui_datautils_api" long-name="Send UI Data Utils API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/send_ui_datautils_api/group"/>
-</component>
-</collection>
-<collection name="msgbranched" long-name="Messaging Branched" level="fw">
-<!-- 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"/>
-</component>
-</collection>
-<collection name="messagingfw" long-name="Messaging Framework" level="fw">
-<!-- should break this collection up into smaller related collections -->
-<component name="alwaysonline" filter="s60" long-name="Always Online Server" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/alwaysonline/group"/>
-</component>
-<component name="msgcommonutils" filter="s60" long-name="Messaging Common Utils" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/msgcommonutils/group"/>
-</component>
-<component name="senduiservices" filter="s60" long-name="Send UI Services" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/senduiservices/group"/>
-</component>
-<component name="scheduledsendmtm" long-name="Scheduled Send MTM" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/group" mrp="mw/messagingmw/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
-</component>
-<component name="msgsrvnstore" long-name="Message Server and Store" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/group" mrp="mw/messagingmw/messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
-</component>
-<component name="biomsgfw" long-name="BIO Messaging Framework" introduced="6.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/group" mrp="mw/messagingmw/messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
-</component>
-<component name="msgconf" long-name="Messaging Config" introduced="^2" purpose="optional" class="config">
-<unit bldFile="mw/messagingmw/messagingfw/msgconf/group" mrp="mw/messagingmw/messagingfw/msgconf/group/messaging_config.mrp"/>
-</component>
-<component name="watcherfw" long-name="Watcher Framework" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/watcherfw/group" mrp="mw/messagingmw/messagingfw/watcherfw/group/messaging_watcher.mrp"/>
-</component>
-<component name="msgtest" long-name="Messaging Test" purpose="development">
-<unit bldFile="mw/messagingmw/messagingfw/msgtest/group" mrp="mw/messagingmw/messagingfw/msgtest/group/messaging_test.mrp"/>
-</component>
-<component name="sendas" long-name="Send As" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/sendas/group" mrp="mw/messagingmw/messagingfw/sendas/group/messaging_sendas2.mrp"/>
-</component>
-<component name="msgurlhandler" long-name="Message URL Handler" introduced="7.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/group" mrp="mw/messagingmw/messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
-</component>
-<component name="wappushfw" long-name="WAP Push Framework" introduced="6.1" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/wappushfw/group" mrp="mw/messagingmw/messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
-</component>
-<component name="suplsmshandler" long-name="SUPL SMS Handler" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplsmshandler/group" mrp="mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/>
-</component>
-<component name="suplwappushhandler" long-name="SUPL WAP Push Handler" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
-</component>
-</collection>
-<collection name="messagingmw_info" long-name="Messaging Middleware Info" level="api">
-<component name="messagingmw_metadata" long-name="Messaging Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="imsrv" level="specific" long-name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
-<collection name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" level="specific">
-<component name="ximp_core_data_model_api" long-name="XIMP Core Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_host_api" long-name="XIMP Presence Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_presence_data_model_api" long-name="XIMP Presence Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_api" long-name="XIMP Presence Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_presence_management_api" long-name="XIMP Presence Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_management_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_host_api" long-name="XIMP Core Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_core_management_api" long-name="XIMP Core Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_management_api/group"/>
-</component>
-<component name="ximp_presence_base_api" long-name="XIMP Presence Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_base_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_api" long-name="XIMP Core Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_core_base_api" long-name="XIMP Core Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_base_api/group"/>
-</component>
-<component name="ximp_presence_cache_api" long-name="XIMP Presence Cache API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_cache_api/group"/>
-</component>
-<component name="ximp_core_feature_plugin_api" long-name="XIMP Core Feature Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_host_api" long-name="XIMP IM Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_im_data_model_api" long-name="XIMP IM Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_data_model_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_api" long-name="XIMP IM Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_im_management_api" long-name="XIMP IM Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_management_api/group"/>
-</component>
-<component name="ximp_im_base_api" long-name="XIMP IM Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_base_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_host_api" long-name="XIMP Search Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_search_data_model_api" long-name="XIMP Search Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_data_model_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_api" long-name="XIMP search Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_search_management_api" long-name="XIMP Search Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_management_api/group"/>
-</component>
-<component name="ximp_search_base_api" long-name="XIMP Search Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_base_api/group"/>
-</component>
-<component name="xmpp_settings_api" long-name="XMPP Settings API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/group"/>
-</component>
-<component name="im_cache_client_api" long-name="IM Cache Client API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/im_cache_client_api/group"/>
-</component>
-<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 Avability Text" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
-</component>
-</collection>
-<collection name="ximpfw" long-name="XIMP Framework" level="framework">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="ximpfw_build" filter="s60" long-name="XIMP Framework Build">
-<unit bldFile="mw/imsrv/ximpfw/group"/>
-</component>
-</collection>
-<collection name="imservices" long-name="IM Services" level="generic">
-<component name="imfeatureplugin" filter="s60" long-name="IM Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/imfeatureplugin/group"/>
-</component>
-<component name="searchfeatureplugin" filter="s60" long-name="Search Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/searchfeatureplugin/group"/>
-</component>
-<component name="xmppsettingsapi" filter="s60" long-name="XMPP Settings API" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsapi/group"/>
-</component>
-<component name="xmppsettingsfetcher" filter="s60" long-name="XMPP Settings Fetcher" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/group"/>
-</component>
-<component name="ossprotocoladaptation" filter="s60" long-name="OSS Protocol Adaptation" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/ossprotocoladaptation/group"/>
-</component>
-<component name="instantmessagingcache" filter="s60" long-name="Instant Messaging Cache" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/instantmessagingcache/group"/>
-</component>
-</collection>
-<collection name="brandingserver" long-name="Branding Server" level="specific">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="brandingserver_build" filter="s60" long-name="Branding Server Build">
-<unit bldFile="mw/imsrv/brandingserver/group"/>
-</component>
-</collection>
-</block>
-<block name="legacypresence" level="specific" long-name="Legacy Presence Services" levels="engine fw ui">
-<collection name="pressrv_plat" long-name="Legacy Presence Services Platform Interfaces" level="ui">
-<component name="presence_list_api" long-name="Presence List API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/presence_list_api/group"/>
-</component>
-<component name="watcher_info_api" long-name="Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_info_api/group"/>
-</component>
-<component name="simple_documents_api" long-name="SIMPLE Documents API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_documents_api/group"/>
-</component>
-<component name="authorization_api" long-name="Authorization API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/authorization_api/group"/>
-</component>
-<component name="xdm_protocol_plugin_api" long-name="XDM Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_protocol_plugin_api/group"/>
-</component>
-<component name="watcher_api" long-name="Watcher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_api/group"/>
-</component>
-<component name="xdm_api" long-name="XDM API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_api/group"/>
-</component>
-<component name="registration_api" long-name="Registration API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/registration_api/group"/>
-</component>
-<component name="publisher_api" long-name="Publisher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/publisher_api/group"/>
-</component>
-<component name="messaging_connection_manager_api" long-name="Messaging Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/messaging_connection_manager_api/group"/>
-</component>
-<component name="xdm_settings_api" long-name="XDM Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_settings_api/group"/>
-</component>
-<component name="simple_settings_api" long-name="SIMPLE Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_settings_api/group"/>
-</component>
-<component name="simple_instant_msg_api" long-name="Simple Instant Msg API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_instant_msg_api/group"/>
-</component>
-</collection>
-<collection name="xdmengine" long-name="XDM Engine" level="engine">
-<!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
-<component name="xdmengine_build" filter="s60" long-name="XDM Engine Build">
-<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">
-<unit bldFile="mw/legacypresence/xdmprotocols/group"/>
-</component>
-</collection>
-<collection name="msgconnmanager" long-name="Messaging Connection Manager" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="msgconnmanager_build" filter="s60" long-name="Messaging Connection Manager Build">
-<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">
-<unit bldFile="mw/legacypresence/simpleengine/group"/>
-</component>
-</collection>
-<collection name="presencefwsimpleadpt" long-name="Presence Framework SIMPLE Adaptation" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="simpleplugin" filter="s60" long-name="SIMPLE Plugin" plugin="Y">
-<unit bldFile="mw/legacypresence/presencefwsimpleadpt/group"/>
-</component>
-</collection>
-<collection name="simpledatamodeladapter" long-name="SIMPLE Data Model Adapter" level="fw">
-<component name="presenceplugin" filter="s60" long-name="Presence Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/legacypresence/simpledatamodeladapter/group"/>
-</component>
-</collection>
-</block>
-<block name="opensrv" level="specific" long-name="Open Services" levels="prt lib server eng">
-<collection name="opensrv_plat" long-name="Open Services Platform Interfaces" level="eng">
-<component name="messagequeue_api" long-name="Message Queue API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/opensrv/opensrv_plat/messagequeue_api/group"/>
-</component>
-</collection>
-<collection name="loudmouth" long-name="Loudmouth" level="prt">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="loudmouth_build" filter="s60" long-name="Loudmouth Build" introduced="^2">
-<unit bldFile="mw/opensrv/loudmouth/group"/>
-</component>
-</collection>
-<collection name="libtelepathy" long-name="Telepathy Library" level="lib">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="libtelepathy_build" filter="s60" long-name="Telepathy Library Build" introduced="^2">
-<unit bldFile="mw/opensrv/libtelepathy/group"/>
-</component>
-</collection>
-<collection name="telepathygabble" long-name="Telepathy Gabble" level="eng">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="telepathygabble_build" filter="s60" long-name="Telepathy Gabble Build" introduced="^2">
-<unit bldFile="mw/opensrv/telepathygabble/group"/>
-</component>
-</collection>
-<collection name="isolationserver" long-name="Isolation Server" level="server">
-<component name="messagequeue" filter="s60" long-name="Message Queue" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/messagequeue/group"/>
-</component>
-<component name="isoserver" filter="s60" long-name="ISO Server" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/isoserver/group"/>
-</component>
-<component name="isolationserver_build" filter="s60" long-name="Isloation Server Build" introduced="^2">
-<!-- needs #includes removed. either move the exports to another component or make this a ROM component -->
-<unit bldFile="mw/opensrv/isolationserver/group"/>
-</component>
-</collection>
-</block>
-<block name="remotemgmt" level="specific" long-name="Remote Management" levels="plugin framework server generic specific">
-<collection name="remotemgmt_pub" long-name="Remote Management Public Interfaces" level="specific">
-<component name="synchronization_capability_api" long-name="Synchronization Capability API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
-</component>
-</collection>
-<collection name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" level="specific">
-<component name="common_agent_util_and_definitions_api" long-name="Common Agent util and definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
-</component>
-<component name="policy_management_certificate_api" long-name="Policy Management Certificate API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/group"/>
-</component>
-<component name="oma_provisioning_adapter_api" long-name="OMA Provisioning Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_adapter_api/group"/>
-</component>
-<component name="device_management_parameter_api" long-name="Device Management Parameter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_parameter_api/group"/>
-</component>
-<component name="data_synchronization_plugin_api" long-name="Data Synchronization Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/group"/>
-</component>
-<component name="sync_alert_handler_api" long-name="Sync Alert Handler API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
-</component>
-<component name="syncml_notifier_api" long-name="SyncML Notifier API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
-</component>
-<component name="syncml_client_api" long-name="SyncML Client API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
-</component>
-<component name="device_management_plugin_api" long-name="Device Management plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_plugin_api/group"/>
-</component>
-<component name="dm_tree_apis" long-name="DM Tree APIs" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
-</component>
-<component name="terminal_security_device_lock_api" long-name="Terminal Security Device Lock API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/group"/>
-</component>
-<component name="policy_management_request_api" long-name="Policy Management Request API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/group"/>
-</component>
-<component name="ds_constant_definitions_api" long-name="DS Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_constant_definitions_api/group"/>
-</component>
-<component name="scp_server_api" long-name="SCP Server API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/group"/>
-</component>
-<component name="data_synchronization_notification_api" long-name="Data Synchronization Notification API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_notification_api/group"/>
-</component>
-<component name="oma_provisioning_engine_api" long-name="OMA Provisioning Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/group"/>
-</component>
-<component name="dm_utils_api" long-name="DM Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/group"/>
-</component>
-<component name="syncml_alert_api" long-name="SyncML Alert API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/group"/>
-</component>
-<component name="obex_client_session_api" long-name="OBEX Client session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/obex_client_session_api/group"/>
-</component>
-<component name="setting_enforcement_info_api" long-name="Setting Enforcement Info API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/group"/>
-</component>
-<component name="dm_constant_definitions_api" long-name="DM Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
-</component>
-<component name="oma_ds_extensions_api" long-name="OMA DS Extensions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
-</component>
-<component name="pnpms_utils_api" long-name="PNPMS Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
-</component>
-<component name="diagnostics_plugin_utility_api" long-name="Diagnostics Plugin Utility API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
-</component>
-<component name="diagnostics_plugin_api" long-name="Diagnostics Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
-</component>
-<component name="diagnostics_framework_api" long-name="Diagnostics Framework API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
-</component>
-<component name="diagnostics_results_api" long-name="Diagnostics Results API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
-</component>
-<component name="diagnostics_plugin_pool_api" long-name="Diagnostics Plugin Pool API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
-</component>
-<component name="adaptive_history_list_api" long-name="Adaptive History List API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
-</component>
-<component name="adaptive_history_list_session_api" long-name="Adaptive History List Session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
-</component>
-<component name="fota_engine_api" long-name="FOTA Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
-</component>
-<component name="update_package_storage_plugin_api" long-name="Update Package Storage Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
-</component>
-<component name="syncml_notifier_roaming_api" long-name="SyncML Notifier Roaming API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
-</component>
-<component name="sync_service_api" long-name="Sync Service API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_service_api/group"/>
-</component>
-<component name="dcmo_adapter_api" long-name="DCMO Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_adapter_api/group"/>
-</component>
-<component name="dcmo_control_api" long-name="DCMO Control API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_control_api/group"/>
-</component>
-<component name="ds_capability_mgmt_plugin_api" long-name="DS Capability Management Plugin API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
-</component>
-<component name="dm_native_notifier_api" long-name="DM Native Notifier API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_native_notifier_api/group"/>
-</component>
-<component name="syncml_ds_error_reporting_api" long-name="SyncML DS Error Reporting API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_ds_error_reporting_api/group"/>
-</component>
-<component name="syncml_ds_customization_api" long-name="SyncML DS Customization API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_ds_customization_api/group"/>
-</component>
-</collection>
-<collection name="policymanagement" long-name="Policy Management" level="generic">
-<component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">
-<unit bldFile="mw/remotemgmt/policymanagement/pmdmadapter/group"/>
-</component>
-<component name="dmutilserver" filter="s60" long-name="DM Util Server">
-<unit bldFile="mw/remotemgmt/policymanagement/dmutilserver/group"/>
-</component>
-<component name="policyengine" filter="s60" long-name="Policy Engine">
-<unit bldFile="mw/remotemgmt/policymanagement/policyengine/group"/>
-</component>
-<component name="policymanagement_build" filter="s60" long-name="Policy Management Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/policymanagement/group"/>
-</component>
-</collection>
-<collection name="syncmlfw" long-name="SyncML Framework" level="server">
-<component name="syncmlfw_build" filter="s60" long-name="SyncML Framework Build">
-<!-- need to break this up into components. Too convoluted a structure to be in a single bld.inf-->
-<unit bldFile="mw/remotemgmt/syncmlfw/group"/>
-</component>
-</collection>
-<collection name="terminalsecurity" long-name="Terminal Security" level="specific">
-<component name="scp" filter="s60" long-name="Security Code Proxy">
-<!-- can only have one unit, need to have these #included from a single bld.inf -->
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpdatabase/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpserver/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scppatternplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scphistoryplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scptimestampplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpeventhandler/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/dmeventnotifier/group"/>
-</component>
-<component name="terminalsecurity_client" filter="s60" long-name="Terminal Control Client">
-<unit bldFile="mw/remotemgmt/terminalsecurity/client/group"/>
-</component>
-<component name="terminalsecurity_server" filter="s60" long-name="Terminal Control Server">
-<unit bldFile="mw/remotemgmt/terminalsecurity/server/group"/>
-</component>
-<component name="tcadapter" filter="s60" long-name="Terminal Control Adapter">
-<unit bldFile="mw/remotemgmt/terminalsecurity/tcadapter/bld"/>
-</component>
-<component name="terminalsecurity_build" filter="s60" long-name="Terminal Security Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/terminalsecurity/group"/>
-</component>
-</collection>
-<collection name="omaprovisioning" long-name="OMA Provisioning" level="specific">
-<component name="pnputil" filter="s60" long-name="PnP Util">
-<unit bldFile="mw/remotemgmt/omaprovisioning/pnputil/group"/>
-</component>
-<component name="provisioning" filter="s60" long-name="Provisioning">
-<unit bldFile="mw/remotemgmt/omaprovisioning/provisioning/group"/>
-</component>
-</collection>
-<collection name="devicediagnosticsfw" long-name="Device Diagnostics Framework" level="framework">
-<component name="diagframework" filter="s60" long-name="Diagnostics Framework">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
-</component>
-<component name="diagpluginbase" filter="s60" long-name="Diagnostics Plugin Base">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
-</component>
-<component name="diagresultsdb" filter="s60" long-name="Diagnostics Results Database">
-<!-- can only have one unit, merge or split into two components -->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
-</component>
-<component name="devicediagnosticsfw_build" filter="s60" long-name="Device Diagnostics Framework Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/group"/>
-</component>
-</collection>
-<collection name="dcmofw" long-name="Device Capability Management Object Framework" level="framework">
-<component name="dcmoclient" filter="s60" long-name="DCMO Client">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoclient/group"/>
-</component>
-<component name="dcmoserver" filter="s60" long-name="DCMO Server">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoserver/group"/>
-</component>
-<component name="dcmocustcmd" filter="s60" long-name="DCMO Custom Commands">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmocustcmd/group"/>
-</component>
-<component name="dcmofw_build" filter="s60" long-name="DCMO Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/dcmofw/group"/>
-</component>
-</collection>
-<collection name="fotaapplication" long-name="FOTA Application" level="generic">
-<component name="fotaapplication_build" filter="s60" long-name="FOTA Application Build">
-<!-- remove this component when configuration is in place and the #ifdefs have been worked out -->
-<unit bldFile="mw/remotemgmt/fotaapplication/group"/>
-</component>
-<component name="fotaserver" filter="s60" long-name="FOTA Server">
-<!-- uncomment when #ifdefs are resolved -->
-<!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
-</component>
-<component name="fotacustcmds" filter="s60" long-name="FOTA Custom Commands" class="placeholder">
-<!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
-<!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
-</component>
-</collection>
-</block>
-<block name="remotestorage" level="generic" long-name="Remote Storage" levels="framework if">
-<collection name="rsfw_plat" long-name="Remote Storage Platform Interfaces" level="if">
-<component name="rsfw_access_protocol_plugin_api" filter="s60" long-name="Remote Storage Framework Access Protocol Plugin API" class="api">
-<unit bldFile="mw/remotestorage/rsfw_plat/rsfw_access_protocol_plugin_api/group"/>
-</component>
-</collection>
-<collection name="remotestoragefw" long-name="Remote Storage Framework" level="framework">
-<component name="mountstore" filter="s60" long-name="RSFW Mount Store">
-<unit bldFile="mw/remotestorage/remotestoragefw/mountstore/group"/>
-</component>
-<component name="rsfwnotifierplugins" filter="s60" long-name="RSFW Notifier Plugins" plugin="Y">
-<unit bldFile="mw/remotestorage/remotestoragefw/rsfwnotifierplugins/group"/>
-</component>
-<component name="remotefileengine" filter="s60" long-name="Remote File Engine">
-<unit bldFile="mw/remotestorage/remotestoragefw/remotefileengine/group"/>
-</component>
-<component name="mountmanager" filter="s60" long-name="RSFW Mount Manager">
-<unit bldFile="mw/remotestorage/remotestoragefw/mountmanager/group"/>
-</component>
-<component name="webdavaccessplugin" filter="s60" long-name="WebDAV Access Plugin" plugin="Y">
-<unit bldFile="mw/remotestorage/remotestoragefw/webdavaccessplugin/group"/>
-</component>
-<component name="remotefilesystemplugin" filter="s60" long-name="Remote Filesystem Plugin" plugin="Y">
-<unit bldFile="mw/remotestorage/remotestoragefw/remotefilesystemplugin/group"/>
-</component>
-<component name="remotestoragegsplugin" filter="s60" long-name="RS GS Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
-<!-- <unit bldFile="remotestoragefw/gsplugin/group"/>-->
-</component>
-<component name="remotedriveconfigurationbiocontrol" filter="s60" long-name="Remote Drive Configuration BIO Control">
-<!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
-<!-- <unit bldFile="remotestoragefw/remotedriveconfigurationbiocontrol/group"/>-->
-</component>
-<component name="remotestoragefw_build" filter="s60" long-name="Remote Storage Framework Build">
-<!-- move exports to other components.
- This is needed for #includes of configured component until congigiration is in place -->
-<unit bldFile="mw/remotestorage/remotestoragefw/group"/>
-</component>
-</collection>
-</block>
-<block name="remoteconn" level="generic" long-name="Remote Connectivity" levels="plugin framework server generic specific">
-<collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
-<component name="secon" filter="s60" long-name="Service Controllers">
-<unit bldFile="mw/remoteconn/connectivitymodules/secon/group"/>
-</component>
-</collection>
-<collection name="remoteconn_info" long-name="Remote Connectivity Info" level="specific">
-<component name="remoteconn_metadata" long-name="Remote Connectivity Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mtptransports" long-name="MTP Transports" level="plugin">
-<component name="mtpusbtransport" long-name="MTP USB Transport" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpusbtransport/group" mrp="mw/remoteconn/mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
-</component>
-<component name="mtpptpiptransport" long-name="MTP PTP-IP Transport" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpptpiptransport/group" mrp="mw/remoteconn/mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
-</component>
-<component name="mtpcontroller" long-name="MTP Controller" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpcontroller/group" mrp="mw/remoteconn/mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
-</component>
-</collection>
-<collection name="mtpfws" long-name="MTP Frameworks" level="framework">
-<component name="mtpfw" long-name="MTP Framework" introduced="^2" purpose="optional">
-<unit bldFile="mw/remoteconn/mtpfws/mtpfw/group" mrp="mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/>
-</component>
-</collection>
-<collection name="mtpdataproviders" long-name="MTP Data Providers" level="generic">
-<component name="mtpfileandfolderdp" long-name="MTP File and Folder Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group" mrp="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
-</component>
-<component name="mtpimagedp" long-name="MTP Image Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpimagedp/group" mrp="mw/remoteconn/mtpdataproviders/mtpimagedp/group/mtp_imagedp.mrp"/>
-</component>
-<component name="mtppictbridgedp" long-name="MTP PictBridge Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group" mrp="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group/mtp_pictbridgedp.mrp"/>
-</component>
-</collection>
-<collection name="backupandrestore" long-name="Backup and Restore" level="specific">
-<component name="backupengine" long-name="Backup Engine" introduced="9.0" purpose="optional">
-<unit bldFile="mw/remoteconn/backupandrestore/backupengine/group" mrp="mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
-</component>
-<component name="backuptest" long-name="Backup Test" introduced="^2" purpose="development">
-<unit bldFile="mw/remoteconn/backupandrestore/backuptest/group" mrp="mw/remoteconn/backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
-</component>
-</collection>
-<collection name="obex" long-name="OBEX" level="generic">
-<component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexprotocol/group" mrp="mw/remoteconn/obex/obexprotocol/group/obex.mrp"/>
-</component>
-<component name="obexextensionapi" long-name="OBEX Extension API" introduced="9.2" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexextensionapi/group" mrp="mw/remoteconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
-</component>
-</collection>
-</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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<unit mrp="mw/srvdiscovery/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="dlnasrv" level="specific" long-name="DLNA Services" levels="stack server ctrl framework plugin">
-<!-- uncomment all the units when configuration is in place, they're currently #included from other xxx_build components -->
-<collection name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" level="plugin">
-<component name="upnp_media_server_settings_api" long-name="UPnP Media Server Settings API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_settings_api/group"/>
-</component>
-<component name="upnp_av_objects_api" long-name="UPnP A/V Objects API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_av_objects_api/group"/>
-</component>
-<component name="upnp_media_server_api" long-name="UPnP Media Server API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_api/group"/>
-</component>
-<component name="upnp_security_plugin_api" long-name="UPnP Security Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_security_plugin_api/group"/>
-</component>
-<component name="upnp_avcp_api" long-name="UPnP AVCP API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_avcp_api/group"/>
-</component>
-<component name="upnp_media_server_metadata_api" long-name="UPnP Media Server Metadata API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_metadata_api/group"/>
-</component>
-<component name="upnp_command_api" long-name="UPnP Command API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_command_api/group"/>
-</component>
-<component name="upnp_plugin_api" long-name="UPnP Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_plugin_api/group"/>
-</component>
-</collection>
-<collection name="upnpavcontrolpoint" long-name="UPnP A/V Control Point" level="plugin">
-<component name="avcontrolframework" filter="s60" long-name="A/V Control Famework" introduced="9.1" deprecated="^3">
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
-</component>
-<component name="upnpavcontrolpoint_build" filter="s60" long-name="UPnP A/V Control Point Build" introduced="9.1" deprecated="^3">
-<!-- put exports in other component instead -->
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/group"/>
-</component>
-</collection>
-<collection name="upnpmediaserver" long-name="UPnP Media Server" level="server">
-<component name="avobjects" filter="s60" long-name="A/V Objects">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/avobjects/group"/>
-</component>
-<component name="mediaserverclient" filter="s60" long-name="Media Server Client">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverclient/group"/>
-</component>
-<component name="connectionmanagerservice" filter="s60" long-name="Connection Manager Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/connectionmanagerservice/group"/>
-</component>
-<component name="contentdirectoryservice" filter="s60" long-name="Content Directory Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/contentdirectoryservice/group"/>
-</component>
-<component name="mediaserverengine" filter="s60" long-name="Media Server Engine">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverengine/group"/>
-</component>
-<component name="upnpmediaserver_build" filter="s60" long-name="UPnP Media Server Build">
-<!-- move exports into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpmediaserver/group"/>
-</component>
-</collection>
-<collection name="upnpavcontroller" long-name="UPnP A/V Controller" level="ctrl">
-<component name="upnpxmlparser" filter="s60" long-name="UPnP XML Parser" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpxmlparser/group"/>
-</component>
-<component name="upnpavcontrollerserver" filter="s60" long-name="UPnP A/V Controller Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerserver/group"/>
-</component>
-<component name="upnpavcontrollerclient" filter="s60" long-name="UPnP A/V Ccontroller Client" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerclient/group"/>
-</component>
-<component name="upnpavcontrollerhelper" filter="s60" long-name="UPnP A/V Controller Helper" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerhelper/group"/>
-</component>
-<component name="upnpavcontroller_build" filter="s60" long-name="UPnP A/V Controller Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpavcontroller/group"/>
-</component>
-</collection>
-<collection name="upnpframework" long-name="UPnP Framework" level="framework">
-<component name="upnputilities" filter="s60" long-name="UPnP Utilities" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnputilities/group"/>
-</component>
-<component name="upnpextensionpluginif" filter="s60" long-name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpextensionpluginif/group"/> -->
-</component>
-<component name="upnpfiletransferengine" filter="s60" long-name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>-->
-</component>
-<component name="upnpcommonui" filter="s60" long-name="UPnP Common UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpcommonui/group"/>-->
-</component>
-<component name="upnpaiwengine" filter="s60" long-name="UPnP AIW Engine" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpaiwengine/group"/> -->
-</component>
-<component name="upnpaiwprovider" filter="s60" long-name="UPnP AIW Provider" introduced="^2" deprecated="^3" plugin="Y">
-<!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
-</component>
-<component name="upnpmusicadapter" filter="s60" long-name="UPnP Music Adapter" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
-</component>
-<component name="upnpcommand" filter="s60" long-name="UPnP Command" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpcommand/group"/>
-</component>
-<component name="upnpframework_build" filter="s60" long-name="UPnP Framework Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpframework/group"/>
-</component>
-</collection>
-<collection name="upnpsettings" long-name="UPnP Settings" level="framework">
-<component name="upnpsettingsengine" filter="s60" long-name="UPnP Settings Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
-</component>
-<component name="multiselectionui" filter="s60" long-name="Multi-Selection UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/multiselectionui/group"/>-->
-</component>
-<component name="appwizard" filter="s60" long-name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/appwizard/group"/>-->
-</component>
-<component name="upnpsharingui" filter="s60" long-name="UPnP Sharing UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
-</component>
-<component name="upnpgsplugin" filter="s60" long-name="UPnP GS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
-</component>
-<component name="upnpsettings_build" filter="s60" long-name="UPnP Settings Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsettings/group"/>
-</component>
-</collection>
-<collection name="upnpsharing" long-name="UPnP Sharing" level="server">
-<component name="upnpdlnaprofiler" filter="s60" long-name="UPnP DLNA Profiler" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpdlnaprofiler/group"/>
-</component>
-<component name="upnpsecurity" filter="s60" long-name="UPnP Security" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpsecurity/group"/>
-</component>
-<component name="upnpcontentserver" filter="s60" long-name="UPnP Content Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpcontentserver/group"/>
-</component>
-<component name="applicationengine" filter="s60" long-name="UPnP Application Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/applicationengine/group"/>
-</component>
-<component name="upnpsharing_build" filter="s60" long-name="UPnP Sharing Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsharing/group"/>
-</component>
-</collection>
-<collection name="upnpmpxplugins" long-name="UPnP MPX Plugins" level="plugin">
-<component name="upnpplaybackplugins" filter="s60" long-name="UPnP Playback Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/upnpplaybackplugins/group"/>
-</component>
-<component name="upnpmpxplugins_build" filter="s60" long-name="UPnP MPX Plugins Build" introduced="^2">
-<!-- move exports content into other component? -->
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/group"/>
-</component>
-</collection>
-<collection name="upnpharvester" long-name="UPnP Harvester" level="ctrl">
-<component name="upnpharvester_common" filter="s60" long-name="UPnP Harvester Common" introduced="^2" deprecated="^3" class="placeholder">
-<!-- need to merge or #include these to a single bld.inf -->
-<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
- <unit bldFile="upnpharvester/common/cmsettings/group"/>
- <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
- <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
-</component>
-<component name="cdssync" filter="s60" long-name="CDS Sync" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
-</component>
-<component name="mdhserver" filter="s60" long-name="Metadata Harvester Server" introduced="^2" deprecated="^3" class="placeholder">
-<!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
-</component>
-<component name="upnpharvester_build" filter="s60" long-name="UPnP Harvester Build" introduced="^2" deprecated="^3" class="placeholder">
-<!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
-<!--<unit bldFile="upnpharvester/group"/>-->
-</component>
-</collection>
-<collection name="homesync" long-name="Home Sync" level="plugin">
-<component name="contentmanager" filter="s60" long-name="Content Manager" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homesync/group"/>-->
-<!-- move bld.inf into contentmanager dir -->
-</component>
-</collection>
-<collection name="homemedia" long-name="Home Media" level="framework">
-<!-- collection is really just a component. Move down a directory -->
-<component name="homemedia_build" filter="s60" long-name="Home Media" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homemedia/group"/> -->
-</component>
-</collection>
-<collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin">
-<component name="dlnasrv_build" filter="s60" long-name="DLNA Services Build">
-<!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed -->
-<unit bldFile="mw/dlnasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="btservices" level="generic" long-name="Bluetooth Services" levels="framework server generic specific plugin">
-<collection name="btservices_pub" long-name="BT Services Public Interfaces" level="plugin">
-<component name="bluetooth_power_state_api" long-name="Bluetooth Power State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_power_state_api/group"/>
-</component>
-<component name="bluetooth_notifier_api" long-name="Bluetooth Notifier API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_notifier_api/group"/>
-</component>
-</collection>
-<collection name="btservices_plat" long-name="BT Services Platform Interfaces" level="plugin">
-<component name="bluetooth_dosserver_audio_api" long-name="Bluetooth DOS Server Audio API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dosserver_audio_api/group"/>
-</component>
-<component name="bluetooth_dut_mode_api" long-name="Bluetooth DUT Mode API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dut_mode_api/group"/>
-</component>
-<component name="bluetooth_engine_api" long-name="Bluetooth Engine API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-<component name="bluetooth_local_variation_api" long-name="Bluetooth Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_local_variation_api/group"/>
-</component>
-<component name="bluetooth_notifier_internal_api" long-name="Bluetooth Notifier internal API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_notifier_internal_api/group"/>
-</component>
-<component name="bluetooth_sap_connection_state_api" long-name="Bluetooth SAP Connection State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_sap_connection_state_api/group"/>
-</component>
-<component name="bluetooth_secondary_display_notification_api" long-name="Bluetooth Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_secondary_display_notification_api/group"/>
-</component>
-</collection>
-<collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
-<component name="bteng" filter="s60" long-name="Bluetooth Engine">
-<unit bldFile="mw/btservices/bluetoothengine/bteng/group"/>
-</component>
-<component name="btnotif" filter="s60" long-name="Bluetooth Notifier">
-<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"/>
-</component>
-<component name="btmac" filter="s60" long-name="Bluetooth Mono Audio Controller" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btmac/group"/>
-</component>
-<component name="btsac" filter="s60" long-name="Bluetooth Stereo Audio Controller" plugin="Y">
-<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"/>
-</component>
-<component name="btsap" filter="s60" long-name="Bluetooth SIM Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btsap/group"/>
-</component>
-<component name="btui" filter="s60" long-name="Bluetooth UI">
-<unit bldFile="mw/btservices/bluetoothengine/btui/group"/>
-</component>
-<component name="btpbap" filter="s60" long-name="Bluetooth Phonebook Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btpbap/group"/>
-</component>
-<component name="bthid" filter="s60" long-name="Bluetooth HID">
-<unit bldFile="mw/btservices/bluetoothengine/bthid/group"/>
-</component>
-<component name="btctrldcmoadapter" filter="s60" long-name="Bluetooth Control DCMO Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btctrldcmoadapter/group"/>
-</component>
-</collection>
-<collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
-<component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
-<unit bldFile="mw/btservices/bluetoothappprofiles/avrcp" mrp="mw/btservices/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
-</component>
-</collection>
-<collection name="atcommands" long-name="AT Commands" level="generic">
-<component name="modematplugin" long-name="Modem AT Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/modematplugin/group"/>
-</component>
-<component name="lccustomplugin" long-name="LC Custom Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/lccustomplugin/group"/>
-</component>
-</collection>
-<collection name="btservices_info" long-name="BT Services Info" level="plugin">
-<component name="btservices_metadata" long-name="BT Services Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usbservices" level="generic" long-name="USB Services" levels="framework server generic specific plugin">
-<collection name="usbservices_plat" long-name="USB Services Platform Interfaces" level="plugin">
-<component name="pictbridge_api" long-name="PictBridge API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/pictbridge_api/group"/>
-</component>
-<component name="ptp_responder_api" long-name="PTP Responder API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_responder_api/group"/>
-</component>
-<component name="ptp_transport_api" long-name="PTP Transport API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_transport_api/group"/>
-</component>
-<component name="usb_device_control_plugin_api" long-name="USB Device Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_device_control_plugin_api/group"/>
-</component>
-<component name="usb_notifier_api" long-name="USB Notifier API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_notifier_api/group"/>
-</component>
-<component name="usb_personality_api_header" long-name="USB Personality API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_api_header/group"/>
-</component>
-<component name="usb_personality_plugin_api" long-name="USB Personality Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_plugin_api/group"/>
-</component>
-<component name="usb_secondary_display_api" long-name="USB Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_secondary_display_api/group"/>
-</component>
-<component name="usb_watcher_api" long-name="USB Watcher API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_api/group"/>
-</component>
-<component name="usb_watcher_info_api_header" long-name="USB Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_info_api_header/group"/>
-</component>
-</collection>
-<collection name="usbservices_info" long-name="USB Services Info" level="plugin"/>
-<collection name="usbengines" long-name="USB Engines" level="generic">
-<component name="usbotgwatcher" filter="s60" long-name="USB OTG Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbotgwatcher/group"/>
-</component>
-<component name="usbwatcher" filter="s60" long-name="USB Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbwatcher/group"/>
-</component>
-<component name="usblocodplugin" filter="s60" long-name="USB Local Connectivity Domain Plugin" plugin="Y">
-<unit bldFile="mw/usbservices/usbengines/usblocodplugin/group"/>
-</component>
-<component name="usbdevcon" filter="s60" long-name="USB Device Control">
-<unit bldFile="mw/usbservices/usbengines/usbdevcon/group"/>
-</component>
-<component name="usbremotepersonality" filter="s60" long-name="USB Remote Personality">
-<unit bldFile="mw/usbservices/usbengines/usbremotepersonality/group"/>
-</component>
-</collection>
-<collection name="usbclasses" long-name="USB Classes" level="framework">
-<component name="usbobexclasscontroller" filter="s60" long-name="USB OBEX Class Controller" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbobexclasscontroller/group"/>
-</component>
-<component name="usbbasicpersonality" filter="s60" long-name="USB Basic Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbbasicpersonality/group"/>
-</component>
-<component name="usbmscpersonality" filter="s60" long-name="USB MSC Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbmscpersonality/group"/>
-</component>
-<!-- commented out in bld.inf. Should this be deleted?
- <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
- <unit bldFile="usbclasses/ptpstack/group"/>
- </component>
- <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
- <unit bldFile="usbclasses/sicdusbplugin/group"/>
- </component>
- <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
- <unit bldFile="usbclasses/ptpserver/group"/>
- </component>-->
-<component name="pictbridgeengine" filter="s60" long-name="PictBridge Engine">
-<unit bldFile="mw/usbservices/usbclasses/pictbridgeengine/group"/>
-</component>
-<component name="usbphoneasmodem" filter="s60" long-name="USB Phone as Modem" introduced="^3">
-<unit bldFile="mw/usbservices/usbclasses/usbphoneasmodem/group"/>
-</component>
-</collection>
-<collection name="usbuis" long-name="USB UIs" level="specific">
-<component name="usbui" filter="s60" long-name="USB UI">
-<unit bldFile="mw/usbservices/usbuis/usbui/group"/>
-</component>
-<component name="usbuinotif" filter="s60" long-name="USB UI Notifiers">
-<unit bldFile="mw/usbservices/usbuis/usbuinotif/group"/>
-</component>
-<component name="imageprintuiprovider" filter="s60" long-name="ImagePrint UI Provider" plugin="Y">
-<unit bldFile="mw/usbservices/usbuis/imageprintuiprovider/group"/>
-</component>
-<component name="usbimageprintui" filter="s60" long-name="ImagePrint UI">
-<unit bldFile="mw/usbservices/usbuis/imageprintui/group"/>
-</component>
-</collection>
-</block>
-<block name="shortlinkconn" level="generic" long-name="Shortlink Connectivity" levels="framework server generic specific plugin">
-<!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
-<collection name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" level="plugin">
-<component name="obex_service_utils_api" long-name="OBEX Service Utils API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_utils_api/group"/>
-</component>
-<component name="obex_service_plugin_api" long-name="OBEX Service Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_plugin_api/group"/>
-</component>
-<component name="dialup_connection_status_api" long-name="Dial-up Connection Status API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dialup_connection_status_api/group"/>
-</component>
-<component name="dun_secondary_display_notification_api" long-name="DUN Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
-</component>
-<component name="obex_secondary_display_notification_api" long-name="OBEX Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
-</component>
-<component name="generic_hid_api" long-name="Generic HID API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/generic_hid_api/group"/>
-</component>
-<component name="locod_bearer_plugin_api" long-name="Locod Bearer Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/locod_bearer_plugin_api/group"/>
-</component>
-<component name="usb_obexservicemanager_client_api" long-name="USB OBEX Service Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_obexservicemanager_client_api/group"/>
-</component>
-</collection>
-<collection name="localconnectivityservice" long-name="Local Connectivity Service" level="server">
-<component name="locod" long-name="Local Connectivity Daemon">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/locod/group"/>
-</component>
-<component name="obexserviceman" long-name="OBEX Service Managar">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
-</component>
-<component name="obexsendservices" long-name="OBEX Send Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
-</component>
-<component name="obexreceiveservices" long-name="OBEX Receive Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
-</component>
-<component name="dun" long-name="Dial Up Networking">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/dun/group"/>
-</component>
-<component name="lcstylustap" long-name="LC Stylus Tap Plugins" plugin="Y">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/lcstylustap/group"/>
-</component>
-<component name="generichid" long-name="Generic HID">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/generichid/group"/>
-</component>
-<component name="headset" long-name="Headset">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/headset/group"/>
-</component>
-</collection>
-</block>
-<block name="imghandling" level="specific" long-name="Image Handling" levels="lib util if">
-<collection name="imagehandling_plat" long-name="Image Handling Platform Interfaces" level="if">
-<component name="image_handling_library_api" long-name="Image Handling Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
-</component>
-<component name="3gp_library_api" long-name="3GP Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
-</component>
-<component name="thumbnailmanager_api" long-name="Thumbnail Manager API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagehandlinglib" long-name="Image Handling Library" level="lib">
-<!-- collection is really a component, need to move down a directory -->
-<component name="ihl" filter="s60" long-name="IHL">
-<unit bldFile="mw/imghandling/imagehandlinglib/group"/>
-</component>
-</collection>
-<collection name="imagehandlingutilities" long-name="Image Handling Utilities" level="util">
-<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager">
-<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
-</component>
-</collection>
-</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">
-<unit bldFile="mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
-</component>
-</collection>
-</block>
-<block name="mds" level="specific" long-name="Metadata Services" levels="mgr eng server int">
-<collection name="mds_plat" long-name="Metadata Services Platform Interfaces" level="int">
-<component name="context_engine_plugin_api" long-name="Context Engine Plugin API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/group" filter="!test"/>
-</component>
-<component name="harvester_framework_api" long-name="Harvester Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/harvester_framework_api/group" filter="!test"/>
-<!-- can only have one unit with the same filter, #include the following from the previous unit -->
-</component>
-<component name="location_manager_api" long-name="Location Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/location_manager_api/group" filter="!test"/>
-</component>
-<component name="metadata_engine_api" long-name="Metadata Engine API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/metadata_engine_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_collection_manager_api" long-name="Content Listing Framework Collection Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_extended_api" long-name="Content Listing Framework Extended API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_extended_api/group"/>
-</component>
-</collection>
-<collection name="mds_pub" long-name="Metadata Services Public Interfaces" level="int">
-<component name="content_listing_framework_api" long-name="Content Listing Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_pub/content_listing_framework_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="metadataengine" long-name="Metadata Engine" level="eng">
-<component name="metadataengine_common" filter="s60" long-name="Metadata Engine Common" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/common/group"/>
-</component>
-<component name="metadataengine_server" filter="s60" long-name="Metadata Engine Server" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/server/group"/>
-</component>
-<component name="metadataengine_client" filter="s60" long-name="Metadata Engine Client" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/client/group"/>
-</component>
-<component name="metadataengine_build" filter="s60" long-name="Metadata Engine Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/metadataengine/group"/>
-</component>
-</collection>
-<collection name="locationmanager" long-name="Location Manager" level="mgr">
-<component name="locationtrail" filter="s60" long-name="Location Trail" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/locationtrail/group"/>
-</component>
-<component name="locationmanager_server" filter="s60" long-name="Location Manager Server" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/server/group"/>
-</component>
-<component name="locationmanager_client" filter="s60" long-name="Location Manager Client" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/client/group"/>
-</component>
-<component name="locationmanager_build" filter="s60" long-name="Location Manager Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/locationmanager/group"/>
-</component>
-</collection>
-<collection name="contextengine" long-name="Context Engine" level="eng">
-<component name="contextengine_plugins" filter="s60" long-name="Context Engine Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/contextengine/plugins/group"/>
-</component>
-<component name="contextengine_build" filter="s60" long-name="Context Engine Build" introduced="^2">
-<!--make this collection a single component, or make this unit self-contained -->
-<unit bldFile="mw/mds/contextengine/group"/>
-</component>
-</collection>
-<collection name="harvester" long-name="Harvester" level="eng">
-<component name="blacklistclient" filter="s60" long-name="Blacklist Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistclient/group"/>
-</component>
-<component name="blacklistserver" filter="s60" long-name="Blacklist Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistserver/group"/>
-</component>
-<component name="harvester_common" filter="s60" long-name="Harvester Common" introduced="^2">
-<unit bldFile="mw/mds/harvester/common/group"/>
-</component>
-<component name="composerplugins" filter="s60" long-name="Composer Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/composerplugins/group"/>
-</component>
-<component name="harvesterplugins" filter="s60" long-name="Harvester Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/harvesterplugins/group"/>
-</component>
-<component name="monitorplugins" filter="s60" long-name="Monitor Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/monitorplugins/group"/>
-</component>
-<component name="harvester_server" filter="s60" long-name="Harvester Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/server/group"/>
-</component>
-<component name="harvester_client" filter="s60" long-name="Harvester Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/client/group"/>
-</component>
-<component name="harvester_build" filter="s60" long-name="Harvester Build" introduced="^2">
-<!-- split these exports into the other components -->
-<unit bldFile="mw/mds/harvester/group"/>
-</component>
-</collection>
-<collection name="watchdog" long-name="Watchdog" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="mdswatchdog" filter="s60" long-name="Metadata Watchdog" introduced="^2">
-<unit bldFile="mw/mds/watchdog/group"/>
-</component>
-</collection>
-<collection name="clfwrapper" long-name="Content Listing Framework Wrapper" level="int">
-<!-- collection is really a component. Move down a directory -->
-<component name="clfwrapper_build" filter="s60" long-name="CLF Wrapper Build" introduced="^2" class="placeholder">
-<!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
-<!--<unit bldFile="clfwrapper/group"/>-->
-</component>
-</collection>
-<collection name="mds_info" long-name="Metadata Services Info" level="int">
-<component name="mds_build" filter="s60" long-name="Metadata Services Build" introduced="^2">
-<!-- consider distributiing this into the rest of the components in the package -->
-<unit bldFile="mw/mds/group"/>
-</component>
-</collection>
-</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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<unit bldFile="mw/mmuifw/mmuifw_plat/alf_customlayoutmanagers_api/group"/>
-</component>
-<component name="gesturehelper_api" long-name="Gesture Helper API" filter="s60" 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">
-<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">
-<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">
-<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">
-<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">
-<!-- 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">
-<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">
-<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">
-<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">
-<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">
-<unit bldFile="mw/mmuifw/mulwidgets/mullogging/group"/>
-</component>
-<component name="muldatamodel" filter="s60" long-name="MUL Data Model">
-<unit bldFile="mw/mmuifw/mulwidgets/muldatamodel/group"/>
-</component>
-<component name="mulwidgets_common" filter="s60" long-name="MUL Common Utils">
-<unit bldFile="mw/mmuifw/mulwidgets/common/group"/>
-</component>
-<component name="gesturehelper" filter="s60" long-name="Gesture Helper">
-<unit bldFile="mw/mmuifw/mulwidgets/gesturehelper/group"/>
-</component>
-<component name="mulcoverflowwidget" filter="s60" long-name="MUL CoverFlow Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/mulcoverflowwidget/group"/>
-</component>
-<component name="mulsliderwidget" filter="s60" long-name="MUL Slider Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/mulsliderwidget/group"/>
-</component>
-<component name="alfviewwidget" filter="s60" long-name="ALF View Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/alfviewwidget/group"/>
-</component>
-<component name="alfcontainerwidget" filter="s60" long-name="ALF Container Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/alfcontainerwidget/group"/>
-</component>
-<component name="alfscrollbarwidget" filter="s60" long-name="ALF Scrollbar Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/alfscrollbarwidget/group"/>
-</component>
-</collection>
-</block>
-<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"/>
-</component>
-<component name="videoconnutility_api" long-name="Video Connection Utility API" filter="s60" class="api">
-<unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/group"/>
-</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"/>
-</component>
-</collection>
-<collection name="videoscheduler" long-name="Video Scheduler" level="util">
-<component name="schedulerclient" filter="s60" long-name="Video Scheduler Client">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerclient/group"/>
-</component>
-<component name="schedulerserver" filter="s60" long-name="Video Scheduler Server">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerserver/group"/>
-</component>
-</collection>
-<collection name="videoconnutility" long-name="Video Connection Utility" level="util">
-<component name="connutilpsworker" filter="s60" long-name="Connection Utility Publish and Subscribe Worker">
-<unit bldFile="mw/videoutils/videoconnutility/connutilpsworker/group"/>
-</component>
-<component name="video_connutility" filter="s60" long-name="Video Connection Utility">
-<unit bldFile="mw/videoutils/videoconnutility/connutility/group"/>
-</component>
-</collection>
-<collection name="videoutils_info" long-name="Video Utils Info" level="if"/>
-</block>
-<block name="mmmw" level="generic" long-name="Multimedia Middleware" levels="plugin framework server generic specific">
-<collection name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" level="specific">
-<component name="multimedia_data_source_api" long-name="Multimedia Data Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
-</component>
-<component name="progressive_download_api" long-name="Progressive Download API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/progressive_download_api/group"/>
-</component>
-<component name="equalizer_ui_api" long-name="Equalizer UI API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
-</component>
-<component name="enhanced_media_client_api" long-name="Enhanced Media Client API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
-</component>
-<component name="stream_control_custom_command_api" long-name="Stream Control Custom Command API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
-</component>
-<component name="emc_buffer_source_api" long-name="EMC Buffer Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_buffer_source_api/group"/>
-</component>
-<component name="emc_file_source_api" long-name="EMC File Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
-</component>
-<component name="audio_metadata_reader_api" long-name="Audio MetaData Reader API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
-</component>
-<component name="emc_progressive_download_source_api" long-name="EMC Progressive Download Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
-</component>
-<component name="emc_volume_effect_api" long-name="EMC Volume Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
-</component>
-<component name="emc_balance_effect_api" long-name="EMC Balance Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_balance_effect_api/group"/>
-</component>
-<component name="emc_descriptor_source_api" long-name="EMC Descriptor Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_descriptor_source_api/group"/>
-</component>
-<component name="emc_drm_config_intfc_api" long-name="EMC DRM Config Intfc API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
-</component>
-<component name="voip_audio_services_api" long-name="VoIP Audio Services" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/group"/>
-</component>
-<component name="configuration_components_factory_api" long-name="Configuration Components Factory API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
-</component>
-<component name="audio_output_control_utility_api" long-name="Audio Output Control Utility API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/group"/>
-</component>
-<component name="audio_output_control_utility_proxy_api" long-name="Audio Output Control Utility Proxy API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
-</component>
-<component name="emc_audio_effects_api" long-name="EMC Audio Effects API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
-</component>
-<component name="call_audio_control_api" long-name="Call AudioControl API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/group"/>
-</component>
-<component name="radio_utilities_api" long-name="Radio Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/group"/>
-</component>
-<component name="radio_preset_utilities_api" long-name="Radio Preset Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
-</component>
-<component name="radio_monitor_api" long-name="Radio Monitor API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
-</component>
-<component name="thumbnail_engine_api" long-name="Thumbnail Engine API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/thumbnail_engine_api/group"/>
-</component>
-<component name="telephony_multimedia_service_api" long-name="Telephony Multimedia Service API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="mmfenh" long-name="MMF Enhancements" level="generic">
-<component name="advancedaudiocontroller" filter="s60" long-name="Advanced Audio Controllers" plugin="Y">
-<unit bldFile="mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
-</component>
-<component name="audiooutputcontrolutility" filter="s60" long-name="Audio Output Control Utility">
-<unit bldFile="mw/mmmw/mmfenh/audiooutputcontrolutility/group"/>
-</component>
-<component name="configurationcomponentsfactory" filter="s60" long-name="Configuration Components Factory">
-<unit bldFile="mw/mmmw/mmfenh/configurationcomponentsfactory/group"/>
-</component>
-<component name="enhancedaudioplayerutility" filter="s60" long-name="Enhanced Audio Player Utility">
-<unit bldFile="mw/mmmw/mmfenh/enhancedaudioplayerutility/group"/>
-</component>
-<component name="enhancedmediaclient" filter="s60" long-name="Enhanced Media Client">
-<unit bldFile="mw/mmmw/mmfenh/enhancedmediaclient/group"/>
-</component>
-<component name="profilesettingsmonitor" filter="s60" long-name="Profile Settings Monitor">
-<unit bldFile="mw/mmmw/mmfenh/profilesettingsmonitor/group"/>
-</component>
-<component name="progressivedownload" filter="s60" long-name="Progressive Download">
-<unit bldFile="mw/mmmw/mmfenh/progressivedownload/group"/>
-</component>
-</collection>
-<collection name="mm_fw" long-name="Multimedia Frameworks" level="framework">
-<!-- Id needs to be unique, mmfw already in use -->
-<!-- Placeholder for OpenAX AL and other stuff -->
-</collection>
-<collection name="mmserv" long-name="Multimedia Services" level="specific">
-<component name="audioeffectsui" filter="s60" long-name="Audio Effects UI">
-<unit bldFile="mw/mmmw/mmserv/audioeffectsui/group"/>
-</component>
-<component name="callaudiocontrol" filter="s60" long-name="Call Audio Control">
-<unit bldFile="mw/mmmw/mmserv/callaudiocontrol/group"/>
-</component>
-<component name="metadatautility" filter="s60" long-name="Metadata Utility">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/group"/>
-</component>
-<component name="radioutility" filter="s60" long-name="Radio Utility">
-<unit bldFile="mw/mmmw/mmserv/radioutility/group"/>
-</component>
-<component name="thumbnailengine" filter="s60" long-name="Thumbnail Engine" introduced="^2">
-<unit bldFile="mw/mmmw/mmserv/thumbnailengine/group"/>
-</component>
-<component name="tms" filter="s60" long-name="Telephony Multimedia Service" introduced="^3">
-<unit bldFile="mw/mmmw/mmserv/tms/group"/>
-</component>
-<component name="voipaudioservices" filter="s60" long-name="VoIP Audio Services">
-<unit bldFile="mw/mmmw/mmserv/voipaudioservices/group"/>
-</component>
-<component name="lib3gpextparser" filter="s60" long-name="3GP Extension Metadata Parser Library">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group" filter="sf_build"/>
-</component>
-</collection>
-<collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
-<component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="helix" level="generic" long-name="Helix" levels="plugin framework server generic specific">
-<collection name="helix_ren" long-name="Helix Engine" level="framework">
-<!-- what does "ren" stand for? -->
-<component name="helix_stub" filter="s60" long-name="Helix Stub" introduced="^2" class="api">
-<unit bldFile="mw/helix/helix_ren/helix_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="camerasrv" level="specific" long-name="Camera Services" levels="plugin fw api">
-<collection name="camerasrv_plat" long-name="Camera Services Platform Interfaces" level="api">
-<component name="media_recorder_sink_api" long-name="Media Recorder Sink API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
-</component>
-<component name="cae_extentension_api" long-name="CAE Extension API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/cae_extentension_api/group"/>
-</component>
-<component name="camera_application_engine_api" long-name="Camera Application Engine API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/camera_application_engine_api/group" filter="!test"/>
-</component>
-<component name="custom_onboard_camera_api" long-name="Custom Onboard Camera API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
-</component>
-<component name="imaging_configuration_manager_api" long-name="Imaging Configuration Manager API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
-</component>
-<component name="media_recorder_api" long-name="Media Recorder API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_api/group" filter="!test"/>
-</component>
-<component name="3gp_file_composer_api" long-name="3GP File Composer API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
-</component>
-<component name="asynchronous_file_saving_queue_api" long-name="Asynchronous File Saving Queue API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="camappengine" long-name="Camera App Engine" level="fw">
-<!-- is this collection really a component? If so, move down a directory -->
-<component name="stillconverter" filter="s60" long-name="Still Image Converter" class="placeholder">
-<!-- should separate this from parent engine's bld.inf -->
-<!-- <unit bldFile="camappengine/stillconverter/group"/> -->
-</component>
-<component name="camappengine_engine" filter="s60" long-name="Camera App Engine" class="placeholder">
-<!-- should separate this from parent engine's bld.inf -->
-<!-- <unit bldFile="camappengine/engine/group"/> -->
-</component>
-<component name="asynchfilesavequeue" filter="s60" long-name="Asynch File Save Queue">
-<unit bldFile="mw/camerasrv/camappengine/asynchfilesavequeue/group"/>
-</component>
-<component name="camappengine_build" filter="s60" long-name="Camera App Engine Build">
-<unit bldFile="mw/camerasrv/camappengine/build"/>
-</component>
-</collection>
-<collection name="camcordermmfplugin" long-name="Camcorder MMF Plugin" level="plugin">
-<!-- collection is really a component. Should move down a directory -->
-<component name="camcordermmfplugin_build" filter="s60" long-name="Camcorder MMF Plugin Build" plugin="Y">
-<unit bldFile="mw/camerasrv/camcordermmfplugin/build"/>
-</component>
-</collection>
-<collection name="configmanagers" long-name="Config Managers" level="api">
-<component name="imagingconfigmanager" filter="s60" long-name="Imaging Config Manager">
-<unit bldFile="mw/camerasrv/configmanagers/imagingconfigmanager/group"/>
-</component>
-</collection>
-<collection name="camerasrv_info" long-name="Camera Services Info" level="api">
-<component name="camerasrv_build" filter="s60" long-name="Camera Services Build">
-<!-- should split into individual bld.infs -->
-<unit bldFile="mw/camerasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="mmappfw" level="specific" long-name="Multimedia App Framework" levels="fw utils if">
-<collection name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" level="if">
-<component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interfaces Build" introduced="^1" filter="s60">
-<!-- this is no longer necessary when confguration is put in place -->
-<unit bldFile="mw/mmappfw/mmappfw_plat"/>
-</component>
-<component name="collection_helper_api" long-name="Collection Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
-</component>
-<component name="harvester_collection_mediator_api" long-name="Harvester Collection Mediator API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/group"/>
-</component>
-<component name="harvester_metadata_extractor_api" long-name="Harvester Metadata Extractor API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/group"/>
-</component>
-<component name="harvester_server_api" long-name="Harvester Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_server_api/group"/>
-</component>
-<component name="harvester_utility_api" long-name="Harvester Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_utility_api/group"/>
-</component>
-<component name="playlist_engine_api" long-name="Playlist Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playlist_engine_api/group"/>
-</component>
-<component name="mtp_keys_api" long-name="MTP Keys API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mtp_keys_api/group"/>
-</component>
-<component name="mpx_collection_common_definition_api" long-name="MPX Collection Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_common_definition_api/group"/>
-</component>
-<component name="mpx_collection_utility_api" long-name="MPX Collection Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/group"/>
-</component>
-<component name="mpx_common_api" long-name="MPX Common API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_api/group"/>
-</component>
-<component name="mpx_common_definition_api" long-name="MPX Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_common_definition_api" long-name="MPX Playback Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_utility_api" long-name="MPX Playback Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/group"/>
-</component>
-<component name="mpx_base_view_plugins_api" long-name="MPX Base View Plugins API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/group"/>
-</component>
-<component name="mpx_view_utility_api" long-name="MPX View Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_view_utility_api/group"/>
-</component>
-<component name="mpx_albumart_utility_api" long-name="MPX Album Art Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/group"/>
-</component>
-<component name="media_player_settings_engine_api" long-name="Media Player Settings Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
-</component>
-<component name="mpx_backstepping_utility_api" long-name="MPX Backstepping Utility API" introduced="^1" filter="s60" class="api">
-<!-- uncomment when configuration is put in place
- <unit bldFile="mmappfw_plat/mpx_backstepping_utility_api/group"/> -->
-</component>
-<component name="asx_parser_api" long-name="ASX Parser API" introduced="^1" filter="s60" class="api">
-<!-- uncomment when configuration is put in place
- <unit bldFile="mmappfw_plat/asx_parser_api/group"/> -->
-</component>
-<component name="playback_helper_api" long-name="Playback Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playback_helper_api/group"/>
-</component>
-<component name="videoplaylist_utility_api" long-name="Video Playlist Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/videoplaylist_utility_api/group"/>
-</component>
-<component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interface Build" introduced="^1" filter="s60" class="api">
-<!-- needed only for #ifdefs. Remove anmd uncomment above units when configuration is in place -->
-<unit bldFile="mw/mmappfw/mmappfw_plat/group"/>
-</component>
-</collection>
-<collection name="mpx" long-name="Multimedia Player" level="fw">
-<component name="commonframework" filter="s60" long-name="MPX Common Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/commonframework/group"/>
-</component>
-<component name="playbackframework" filter="s60" long-name="MPX Playback Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/playbackframework/group"/>
-</component>
-<component name="mpxcollectionfw" filter="s60" long-name="MPX Collection Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/collectionframework/group"/>
-</component>
-<component name="mpxviewfw" filter="s60" long-name="MPX View Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/viewframework/group"/>
-</component>
-<component name="mpx_build" filter="s60" long-name="MPX Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/mpx/group"/>
-</component>
-</collection>
-<collection name="mmappcomponents" long-name="Multimedia App Components" level="utils">
-<component name="mmappcomponents_build" filter="s60" long-name="Multimedia App Components Build" introduced="^1">
-<!-- needed for #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
- Can remove this once configuration is in place-->
-<unit bldFile="mw/mmappfw/mmappcomponents/group"/>
-</component>
-<component name="collectionhelper" filter="s60" long-name="Media Player Collection Helper" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/collectionhelper/group"/>
-</component>
-<component name="playlistengine" filter="s60" long-name="Playlist Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/playlistengine/group"/>
-</component>
-<component name="mpxharvester" filter="s60" long-name="Media Player Harvester" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/harvester/group"/>
-</component>
-<component name="mmappcommonui" filter="s60" long-name="Multimedia App Common UI" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmappcommonui/group"/>
-</component>
-<component name="mediaplayersettingsengine" filter="s60" long-name="Media Player Settings Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
-</component>
-<component name="audiofetcher" filter="s60" long-name="Audio Fetcher" introduced="^1" plugin="Y">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
-</component>
-<component name="asxparser" filter="s60" long-name="ASX Parser" introduced="^1">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
-</component>
-<component name="playbackhelper" filter="s60" long-name="Playback Helper" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/playbackhelper/group"/>
-</component>
-<component name="videoplaylistutility" filter="s60" long-name="Video Playlist Utility" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/videoplaylistutility/group"/>
-</component>
-<component name="mmmtpdataprovider" filter="s60" long-name="Multimedia MTP Data Provider" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmmtpdataprovider/group"/>
-</component>
-</collection>
-<collection name="mmappfw_info" long-name="Multimedia App Framework Info" level="if">
-<component name="mmappfw_build" filter="s60" long-name="Multimedia App Framework Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/group"/>
-</component>
-<component name="mmappfw_test" filter="s60,test,api_test,pref_test" long-name="Multimedia App Framework Test" purpose="development" introduced="^1"/>
-</collection>
-</block>
-<block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework api">
-<collection name="inputmethods_pub" long-name="Input Methods Public Interfaces" level="api">
-<component name="ptiengine_iti_api" long-name="PTI Engine API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
-</component>
-<component name="optical_character_recognition_api" long-name="Optical Character Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
-</component>
-<component name="input_language_info_api" long-name="Input Language Info API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
-</component>
-</collection>
-<collection name="inputmethods_plat" long-name="Input Methods Platform Interfaces" level="api">
-<component name="pen_input_server_api" long-name="Pen Input Server API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/group" filter="!test"/>
-</component>
-<component name="ptiengine_hwr_api" long-name="PTI Engine Handwriting Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group" filter="!test"/>
-</component>
-<component name="aknfep_settings_api" long-name="Avkon FEP Settings API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
-</component>
-<component name="aknfep_status_api" long-name="Avkon FEP Status API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
-</component>
-<component name="ptiengine_key_definations_api" long-name="PTI Engine Key Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
-</component>
-<component name="aknfep_definitions_api" long-name="Avkon FEP Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
-</component>
-<component name="aknfep_pen_support_api" long-name="Avkon FEP Pen Support API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
-</component>
-<component name="ptiengine_indic_definitions_api" long-name="PTI Engine Indic Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
-</component>
-<component name="aknfep_uiinterface_api" long-name="Avkon FEP UI Interface API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="textinput" long-name="Text Input" level="framework">
-<component name="ptienginev2" filter="s60" long-name="Predictive Text Input Engine">
-<!--uncomment when configuration is turned on and textinput_build is removed-->
-<!-- <unit bldFile="textinput/ptienginev2/group"/>-->
-</component>
-<component name="akninputlanguage" filter="s60" long-name="Avkon Input Language">
-<unit bldFile="mw/inputmethods/textinput/akninputlanguage/group"/>
-</component>
-<component name="peninputarc" filter="s60" long-name="Pen Input Arc">
-<unit bldFile="mw/inputmethods/textinput/peninputarc/group"/>
-</component>
-<component name="peninputcommonctrls" filter="s60" long-name="Pen Input Common Controls">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonctrls/group"/>
-</component>
-<component name="peninputhwrboxcn" filter="s60" long-name="Chinese Handwriting Recognition Box" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrboxcn/group"/>
-</component>
-<component name="peninputvkbcn" filter="s60" long-name="Chinese Virtual Keyboard" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputvkbcn/group"/>
-</component>
-<component name="peninputcommonlayout" filter="s60" long-name="Pen Input Common Layout">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonlayout/group"/>
-</component>
-<component name="peninputgenerichwr" filter="s60" long-name="Pen Input Generic Handwriting Recognition" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputgenerichwr/group"/>
-</component>
-<component name="peninputgenericvkb" filter="s60" long-name="Pen Input Generic Virtual Keyboard" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputgenericvkb/group"/>
-</component>
-<component name="peninputcommonctrlsjp" filter="s60" long-name="Pen Input Common Controls Japanese">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonctrlsjp/group"/>
-</component>
-<component name="peninputhwrboxjp" filter="s60" long-name="Japanese Handwriting Recognition Box" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrboxjp/group"/>
-</component>
-<component name="peninputvkbjp" filter="s60" long-name="Japanese Virtual Keyboard" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputvkbjp/group"/>
-</component>
-<component name="gslangplugin" filter="s60" long-name="GS Language Plugin" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/GSLangPlugin"/>
-</component>
-<component name="peninputgenericitut" filter="s60" long-name="Pen Input Generic ITU-T" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputgenericitut/group"/>
-</component>
-<component name="peninputhwrtrui" filter="s60" long-name="Pen Input Handwriting Recognition Training UI" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrtrui/group"/>
-</component>
-<component name="peninputhwrfscn" filter="s60" long-name="Pen Input Chinese Full Screen Handwriting Recognition" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrfscn/group"/>
-</component>
-<component name="peninputvkbkr" filter="s60" long-name="Pen Input Korean Virtual Keyboard" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputvkbkr/group"/>
-</component>
-<component name="peninputfingerhwr" filter="s60" long-name="Pen Input Finger Handwriting Recognition" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputfingerhwr/group"/>
-</component>
-<component name="peninputsplititut" filter="s60" long-name="Pen Input Split ITU-T" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputsplititut/group"/>
-</component>
-<component name="peninputsplitqwerty" filter="s60" long-name="Pen Input Split QWERTY" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputsplitqwerty/group"/>
-</component>
-<component name="textinput_build" filter="s60" long-name="Text Input Build">
-<!--needed for #ifdef, can be removed when configuration is implemented -->
-<unit bldFile="mw/inputmethods/textinput/group"/>
-</component>
-</collection>
-<collection name="fep" long-name="FEP" level="engine">
-<component name="aknfep" filter="s60" long-name="Avkon FEP" plugin="Y">
-<unit bldFile="mw/inputmethods/fep/aknfep/group"/>
-</component>
-<component name="frontendprocessor" long-name="Front End Processor" purpose="mandatory">
-<unit bldFile="mw/inputmethods/fep/frontendprocessor/group" mrp="mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
-</component>
-</collection>
-<collection name="inputmethods_info" long-name="Input Methods Info" level="api">
-<component name="inputmethods_metadata" long-name="Input Methods Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="qt" level="generic" long-name="Qt" levels="tool mw app">
-<collection name="qtconf" long-name="Qt Config" level="tool">
-<component name="qt_deviceconfiguration" long-name="Qt Device Configuration" introduced="^2" class="config tool">
-<unit bldFile="mw/qt/src/s60installs/deviceconfiguration"/>
-</component>
-</collection>
-<collection name="qt_info" long-name="Qt Info" level="mw">
-<component name="qt_build" long-name="Qt Build" introduced="^2">
-<unit bldFile="mw/qt" proFile="projects.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qtdemos" long-name="Qt Demos" level="app">
-<component name="qtdemos_build" long-name="Qt Demos Build" introduced="^2" filter="qtdemos">
-<unit bldFile="mw/qt/demos" proFile="demos.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qtexamples" long-name="Qt Examples" level="app">
-<component name="qtexamples_build" long-name="Qt Examples Build" introduced="^2" filter="qtexamples">
-<unit bldFile="mw/qt/examples" proFile="examples.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qt_tests" long-name="Qt Tests" level="app">
-<component name="qttestsauto" long-name="Qt Automated Tests" introduced="^2" filter="qttestsauto">
-<unit bldFile="mw/qt/tests/auto" proFile="qtpauto.pro"/>
-</component>
-<component name="qttestsbenchmarks" long-name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks">
-<unit bldFile="mw/qt/tests/benchmarks" proFile="benchmarks.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</block>
-<block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
-<collection name="classicui_plat" long-name="Classic UI Platform Interfaces" level="specific">
-<component name="personalisation_framework_api" long-name="Personalisation Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_framework_api/group" filter="!test"/>
-</component>
-<component name="signal_pane_api" long-name="Signal Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
-</component>
-<component name="japanese_reading_api" long-name="Japanese Reading API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/japanese_reading_api/group" filter="!test"/>
-</component>
-<component name="global_popup_priority_controller_api" long-name="Global Popup Priority Controller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
-</component>
-<component name="item_finder_api" long-name="Item Finder API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/item_finder_api/group" filter="!test"/>
-</component>
-<component name="avkon_fonts_api" long-name="Avkon Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_fonts_api/group" filter="!test"/>
-</component>
-<component name="extended_utilities_api" long-name="Extended Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
-</component>
-<component name="personalisation_plugin_api" long-name="Personalisation Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
-</component>
-<component name="extended_aiw_criteria_api" long-name="Extended AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="personalisation_application_api" long-name="Personalisation Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_application_api/group"/>
-</component>
-<component name="volume_popup_api" long-name="Volume Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
-</component>
-<component name="avkon_secondary_display_support_api" long-name="AVKON Secondary Display Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_support_api/group" filter="!test"/>
-</component>
-<component name="extended_setting_pages_api" long-name="Extended Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_setting_pages_api/group" filter="!test"/>
-</component>
-<component name="extended_lists_api" long-name="Extended Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_lists_api/group" filter="!test"/>
-</component>
-<component name="input_block_api" long-name="Input Block API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/input_block_api/group" filter="!test"/>
-</component>
-<component name="avkon_ui_server_api" long-name="AVKON UI Server API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_ui_server_api/group" filter="!test"/>
-</component>
-<component name="number_grouping_api" long-name="Number Grouping API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/number_grouping_api/group" filter="!test"/>
-</component>
-<component name="extended_status_pane_api" long-name="Extended Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_status_pane_api/group" filter="!test"/>
-</component>
-<component name="extended_notifiers_api" long-name="Extended Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notifiers_api/group" filter="!test"/>
-</component>
-<component name="task_list_api" long-name="Task List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
-</component>
-<component name="personalisation_slide_show_dialog_api" long-name="Personalisation Slide Show Dialog API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
-</component>
-<component name="key_event_utilities_api" long-name="Key Event Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_event_utilities_api/group"/>
-</component>
-<component name="emergency_call_support_api" long-name="Emergency Call Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/emergency_call_support_api/group" filter="!test"/>
-</component>
-<component name="extended_dialogs_api" long-name="Extended Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_dialogs_api/group"/>
-</component>
-<component name="legacy_ui_framework_headers_api" long-name="Legacy UI Framework Headers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/legacy_ui_framework_headers_api/group"/>
-</component>
-<component name="extended_editors_api" long-name="Extended Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_editors_api/group" filter="!test"/>
-</component>
-<component name="alarm_api" long-name="Alarm API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alarm_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_interface_base_api" long-name="AIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_base_api/group" filter="!test"/>
-</component>
-<component name="list_effects_api" long-name="List Effects API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/list_effects_api/group" filter="!test"/>
-</component>
-<component name="find_item_ui_api" long-name="Find Item UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/find_item_ui_api/group" filter="!test"/>
-</component>
-<component name="server_application_services_api" long-name="Server Application Services API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/server_application_services_api/group" filter="!test"/>
-</component>
-<component name="common_ui_settings_api" long-name="Common UI Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_ui_settings_api/group"/>
-</component>
-<component name="aiw_service_interface_menu_api" long-name="AIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_menu_api/group" filter="!test"/>
-</component>
-<component name="eikon_server_extension_client_api" long-name="EIKON Server Extension Client API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/eikon_server_extension_client_api/group" filter="!test"/>
-</component>
-<component name="skinnable_clock_api" long-name="Skinnable Clock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/skinnable_clock_api/group" filter="!test"/>
-</component>
-<component name="battery_pane_api" long-name="Battery Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/battery_pane_api/group" filter="!test"/>
-</component>
-<component name="fep_document_navigation_api" long-name="FEP Document Navigation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
-</component>
-<component name="personalisation_localised_texts_api" long-name="Personalisation Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
-</component>
-<component name="memory_card_ui_api" long-name="Memory Card UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
-</component>
-<component name="avkon_status_api" long-name="AVKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_status_api/group"/>
-</component>
-<component name="application_switching_api" long-name="Application Switching API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/application_switching_api/group" filter="!test"/>
-</component>
-<component name="avkon_localised_texts_api" long-name="AVKON Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_localised_texts_api/group"/>
-</component>
-<component name="avkon_secondary_display_api" long-name="AVKON Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_api/group"/>
-</component>
-<component name="extended_animation_api" long-name="Extended Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_notes_api" long-name="Extended Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notes_api/group" filter="!test"/>
-</component>
-<component name="screensaver_animation_plugin_definitions_api" long-name="Screensaver Animation Plugin Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/screensaver_animation_plugin_definitions_api/group"/>
-</component>
-<component name="text_scroller_api" long-name="Text Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/text_scroller_api/group" filter="!test"/>
-</component>
-<component name="custom_cursors_api" long-name="Custom Cursors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/custom_cursors_api/group" filter="!test"/>
-</component>
-<component name="screensaver_settings_api" long-name="Screensaver Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/screensaver_settings_api/group"/>
-</component>
-<component name="global_window_priorities_api" long-name="Global Window Priorities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_window_priorities_api/group"/>
-</component>
-<component name="extended_indicators_api" long-name="Extended Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_indicators_api/group" filter="!test"/>
-</component>
-<component name="special_character_table_api" long-name="Special Character Table API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/special_character_table_api/group" filter="!test"/>
-</component>
-<component name="avkon_settings_api" long-name="AVKON Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_settings_api/group"/>
-</component>
-<component name="extended_sounds_api" long-name="Extended Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_sounds_api/group"/>
-</component>
-<component name="themes_settings_api" long-name="Themes Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/themes_settings_api/group"/>
-</component>
-<component name="media_shared_document_api" long-name="Media Shared Document API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/media_shared_document_api/group" filter="!test"/>
-</component>
-<component name="extended_queries_api" long-name="Extended Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_queries_api/group"/>
-</component>
-<component name="phone_number_text_utilities_api" long-name="Phone Number Text Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
-</component>
-<component name="screensaver_runtime_api" long-name="Screensaver Runtime API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/screensaver_runtime_api/group"/>
-</component>
-<component name="extended_scroller_api" long-name="Extended Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_scroller_api/group"/>
-</component>
-<component name="key_rotator_api" long-name="Key Rotator API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_rotator_api/group" filter="!test"/>
-</component>
-<component name="extended_grids_api" long-name="Extended Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_grids_api/group" filter="!test"/>
-</component>
-<component name="generic_parameter_api" long-name="Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="indicator_touch_observer_api" long-name="Indicator Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_touch_observer_api/group"/>
-</component>
-<component name="popup_form_api" long-name="Popup Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/popup_form_api/group" filter="!test"/>
-</component>
-<component name="stylus_activated_popup_api" long-name="Stylus Activated Pop-up API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/stylus_activated_popup_api/group" filter="!test"/>
-</component>
-<component name="indicator_plugin_api" long-name="Indicator Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_plugin_api/group" filter="!test"/>
-</component>
-<component name="layout_configuration_api" long-name="Layout Configuration API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/layout_configuration_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_filter_factory_api" long-name="Common File Dialogs Filter Factory API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group" filter="!test"/>
-</component>
-<component name="avkon_anim_dll_api" long-name="AVKON Anim DLL API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_anim_dll_api/group"/>
-</component>
-<component name="extended_initialization_api" long-name="Extended Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_initialization_api/group" filter="!test"/>
-</component>
-<component name="long_tap_animation_api" long-name="Long Tap Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/long_tap_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_ui_framework_definitions_api" long-name="Extended UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_ui_framework_definitions_api/group"/>
-</component>
-<component name="extended_buttons_api" long-name="Extended Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_buttons_api/group" filter="!test"/>
-</component>
-<component name="aiw_provider_utility_api" long-name="AIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_provider_utility_api/group" filter="!test"/>
-</component>
-<component name="transition_effect_parameters_api" long-name="Transition Effect Parameters API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_parameters_api/group" filter="!test"/>
-</component>
-<component name="extended_input_capabilities_api" long-name="Extended Input Capabilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_input_capabilities_api/group" filter="!test"/>
-</component>
-<component name="uikon_status_api" long-name="UIKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/uikon_status_api/group"/>
-</component>
-<component name="transition_effect_utilities_api" long-name="Transition Effect Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_utilities_api/group" filter="!test"/>
-</component>
-<component name="pointer_event_modifier_api" long-name="Pointer Event Modifier API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/pointer_event_modifier_api/group" filter="!test"/>
-</component>
-<component name="avkon_testability_api" long-name="AVKON Testability API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_testability_api/group"/>
-</component>
-<component name="ganes_api" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ganes_api/group"/>
-</component>
-<component name="ode_api" long-name="Ode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ode_api/group"/>
-</component>
-<component name="physics_api" long-name="Physics API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/physics_api/group"/>
-</component>
-<component name="touch_pane_api" long-name="Touch Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_api/group" filter="!test"/>
-</component>
-<component name="touch_pane_observer_api" long-name="Touch Pane Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_observer_api/group"/>
-</component>
-<component name="alternate_fs_api" long-name="Alternate FS API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alternate_fs_api/group"/>
-</component>
-<component name="discreet_popup_api" long-name="Discreet Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/discreet_popup_api/group"/>
-</component>
-<component name="touch_gesture_framework_api" long-name="Touch Gesture Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_gesture_framework_api/group"/>
-<!-- should this be commented out? -->
-<!--<unit bldFile="classicui_plat/touch_gesture_framework_api/tsrc/group" filter="test,api_test"/> -->
-</component>
-<component name="extended_options_menu_api" long-name="Extended Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="classicui_pub" long-name="Classic UI Public Interfaces" level="specific">
-<component name="input_frame_api" long-name="Input Frame API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/input_frame_api/group" filter="!test"/>
-</component>
-<component name="window_server_event_observer_api" long-name="Window Server Event Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/window_server_event_observer_api/group" filter="!test"/>
-</component>
-<component name="application_framework_api" long-name="Application Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/application_framework_api/group" filter="!test"/>
-</component>
-<component name="scroller_api" long-name="Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/scroller_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_utilities_api" long-name="UI Framework Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_utilities_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_definitions_api" long-name="UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_definitions_api/group" filter="!test"/>
-</component>
-<component name="buttons_api" long-name="Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/buttons_api/group" filter="!test"/>
-</component>
-<component name="queries_api" long-name="Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/queries_api/group" filter="!test"/>
-</component>
-<component name="aiw_generic_parameter_api" long-name="AIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="editors_api" long-name="Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/editors_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_api" long-name="Common File Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/common_file_dialogs_api/group" filter="!test"/>
-</component>
-<component name="dialog_shutter_api" long-name="Dialog Shutter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialog_shutter_api/group" filter="!test"/>
-</component>
-<component name="fonts_api" long-name="Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/fonts_api/group" filter="!test"/>
-</component>
-<component name="screen_clearer_api" long-name="Screen Clearer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_clearer_api/group" filter="!test"/>
-</component>
-<component name="notifiers_api" long-name="Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notifiers_api/group" filter="!test"/>
-</component>
-<component name="notes_api" long-name="Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notes_api/group" filter="!test"/>
-</component>
-<component name="screen_saver_api" long-name="Screen Saver API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_saver_api/group" filter="!test"/>
-</component>
-<component name="status_pane_api" long-name="Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/status_pane_api/group" filter="!test"/>
-</component>
-<component name="base_controls_api" long-name="Base Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/base_controls_api/group" filter="!test"/>
-</component>
-<component name="grids_api" long-name="Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/grids_api/group" filter="!test"/>
-</component>
-<component name="context_pane_api" long-name="Context Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/context_pane_api/group" filter="!test"/>
-</component>
-<component name="lists_api" long-name="Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/lists_api/group" filter="!test"/>
-</component>
-<component name="popups_api" long-name="Popups API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/popups_api/group" filter="!test"/>
-</component>
-<component name="misc_controls_api" long-name="Misc Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/misc_controls_api/group" filter="!test"/>
-</component>
-<component name="keylock_api" long-name="Keylock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/keylock_api/group" filter="!test"/>
-</component>
-<component name="options_menu_api" long-name="Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/options_menu_api/group" filter="!test"/>
-</component>
-<component name="hierarchical_lists_api" long-name="Hierarchical Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hierarchical_lists_api/group" filter="!test"/>
-</component>
-<component name="navigation_pane_api" long-name="Navigation Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/navigation_pane_api/group" filter="!test"/>
-</component>
-<component name="tabs_api" long-name="Tabs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/tabs_api/group" filter="!test"/>
-</component>
-<component name="title_pane_touch_observer_api" long-name="Title Pane Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_touch_observer_api/group"/>
-</component>
-<component name="choice_list_api" long-name="Choice List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/choice_list_api/group" filter="!test"/>
-</component>
-<component name="info_popup_note_api" long-name="Info Popup Note API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/info_popup_note_api/group" filter="!test"/>
-</component>
-<component name="setting_pages_api" long-name="Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/setting_pages_api/group" filter="!test"/>
-</component>
-<component name="screen_mode_api" long-name="Screen Mode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_mode_api/group" filter="!test"/>
-</component>
-<component name="indicators_api" long-name="Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/indicators_api/group" filter="!test"/>
-</component>
-<component name="error_ui_api" long-name="Error UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/error_ui_api/group" filter="!test"/>
-</component>
-<component name="animation_api" long-name="Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/animation_api/group" filter="!test"/>
-</component>
-<component name="searchfield_api" long-name="Searchfield API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/searchfield_api/group" filter="!test"/>
-</component>
-<component name="labels_api" long-name="Labels API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/labels_api/group" filter="!test"/>
-</component>
-<component name="hotkeys_api" long-name="Hotkeys API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hotkeys_api/group" filter="!test"/>
-</component>
-<component name="initialization_api" long-name="Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/initialization_api/group" filter="!test"/>
-</component>
-<component name="volume_control_api" long-name="Volume Control API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/volume_control_api/group" filter="!test"/>
-</component>
-<component name="title_pane_api" long-name="Title Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_api/group" filter="!test"/>
-</component>
-<component name="sounds_api" long-name="Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/sounds_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_handler_api" long-name="AIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_service_handler_api/group" filter="!test"/>
-</component>
-<component name="aiw_criteria_api" long-name="AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="touch_ui_utilities_api" long-name="Touch UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/touch_ui_utilities_api/group" filter="!test"/>
-</component>
-<component name="generic_button_api" long-name="Generic Button API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/generic_button_api/group" filter="!test"/>
-</component>
-<component name="form_api" long-name="Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/form_api/group" filter="!test"/>
-</component>
-<component name="uikon_core_controls" long-name="Uikon Core Controls" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/uikon_core_controls/group" filter="!test"/>
-</component>
-<component name="calendar_api" long-name="Calendar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/calendar_api/group"/>
-</component>
-<component name="toolbar_api" long-name="Toolbar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/toolbar_api/group" filter="!test"/>
-</component>
-<component name="server_application_api" long-name="Server Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/server_application_api/group"/>
-</component>
-<component name="slider_api" long-name="Slider API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/slider_api/group" filter="!test"/>
-</component>
-<component name="private_ui_framework_api" long-name="Private UI Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/private_ui_framework_api/group" filter="!test"/>
-</component>
-<component name="dialogs_api" long-name="Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialogs_api/group" filter="!test"/>
-</component>
-<component name="document_handler_api" long-name="Document handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/document_handler_api/group"/>
-</component>
-<component name="images_api" long-name="Images API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/images_api/group" filter="!test"/>
-</component>
-<component name="stylus_popup_menu_api" long-name="Stylus Pop-up Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/stylus_popup_menu_api/group" filter="!test"/>
-</component>
-<component name="information_preview_popup_api" long-name="Information Preview Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/information_preview_popup_api/group" filter="!test"/>
-</component>
-<component name="intermediate_state_api" long-name="Intermediate State API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/intermediate_state_api/group"/>
-</component>
-<component name="help_launcher_api" long-name="Help Launcher API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/help_launcher_api/group"/>
-</component>
-</collection>
-<collection name="ode" long-name="Open Dynamics Engine" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="ode_build" filter="s60" long-name="ODE">
-<unit bldFile="mw/classicui/ode/group"/>
-</component>
-</collection>
-<collection name="uifw" long-name="UI Framework" level="server">
-<component name="uiklaf" filter="s60" long-name="Uikon Look-and-Feel">
-<unit bldFile="mw/classicui/uifw/uiklaf/group"/>
-</component>
-<component name="eikctl" filter="s60" long-name="Eikon Controls">
-<unit bldFile="mw/classicui/uifw/eikctl/group"/>
-</component>
-<component name="avkon" filter="s60" long-name="Avkon">
-<!-- can only have one unit. Split into 3 components, or #include all from same bld.inf -->
-<unit bldFile="mw/classicui/uifw/avkon/aknphysics/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/aknconf/group"/>
-</component>
-<component name="eikstd" filter="s60" long-name="Eikon Standard">
-<unit bldFile="mw/classicui/uifw/eikstd/group"/>
-</component>
-<component name="aknglobalui" filter="s60" long-name="Avkon Global UI">
-<unit bldFile="mw/classicui/uifw/aknglobalui/group"/>
-</component>
-<component name="ganes" filter="s60" long-name="Ganes">
-<unit bldFile="mw/classicui/uifw/ganes/group"/>
-</component>
-</collection>
-<collection name="commonuis" long-name="Common UIs" level="specific">
-<component name="commonui" filter="s60" long-name="Common UI">
-<unit bldFile="mw/classicui/commonuis/commonui/group"/>
-</component>
-<component name="commondialogs" filter="s60" long-name="Common Dialogs">
-<unit bldFile="mw/classicui/commonuis/commondialogs/group"/>
-</component>
-</collection>
-<collection name="applicationinterworkingfw" long-name="Application Interworking Framework" level="generic">
-<component name="aifwservicehandler" filter="s60" long-name="Application Interworking Service Handler">
-<unit bldFile="mw/classicui/applicationinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-<collection name="psln" long-name="Personalization" level="specific">
-<!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
-<component name="psln_build" filter="s60" long-name="Personalization Build">
-<unit bldFile="mw/classicui/psln/group"/>
-</component>
-</collection>
-<collection name="commonadapter" long-name="Common Adapter" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="commonadapter_build" filter="s60" long-name="Common Adapter Build">
-<unit bldFile="mw/classicui/commonadapter/group"/>
-</component>
-</collection>
-<collection name="akntouchgesturefw" long-name="Avkon Touch Gesture Framework" level="generic">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="akntouchgesturefw_build" filter="s60" long-name="Avkon Touch Gesture Framework Build" introduced="^3">
-<unit bldFile="mw/classicui/akntouchgesturefw/group"/>
-</component>
-</collection>
-<collection name="uiutils" long-name="UI Utils" level="specific">
-<component name="localizer" filter="s60" long-name="Directory Localizer">
-<unit bldFile="mw/classicui/uiutils/localizer/group"/>
-</component>
-<component name="findutil" filter="s60" long-name="Find Utility">
-<unit bldFile="mw/classicui/uiutils/findutil/group"/>
-</component>
-<component name="gamerecognizer" filter="s60" long-name="Game Recognizer" plugin="Y">
-<unit bldFile="mw/classicui/uiutils/gamerecognizer/group"/>
-</component>
-<component name="aknjapanesereading" filter="s60" long-name="Avkon Japanese Reading">
-<unit bldFile="mw/classicui/uiutils/aknjapanesereading/group"/>
-</component>
-</collection>
-<collection name="commonuisupport" long-name="Common UI Support" level="support">
-<component name="uikon" long-name="Uikon" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uikon/group" mrp="mw/classicui/commonuisupport/uikon/group/app-framework_uikon.mrp"/>
-</component>
-<component name="errorresolverdata" long-name="Error Resolver Data" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/errorresolverdata/group" mrp="mw/classicui/commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
-</component>
-<component name="uilaf" long-name="UI Look and Feel" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uilaf/GROUP" mrp="mw/classicui/commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
-</component>
-<component name="grid" long-name="Grid" purpose="optional">
-<unit bldFile="mw/classicui/commonuisupport/grid/group" mrp="mw/classicui/commonuisupport/grid/group/app-framework_grid.mrp"/>
-</component>
-<component name="uifwsdocs" long-name="UI Frameworks Documentation" purpose="development" class="doc">
-<unit mrp="mw/classicui/commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
-</component>
-</collection>
-<collection name="lafagnosticuifoundation" long-name="Look-and-Feel Agnostic UI Foundation" level="base">
-<component name="cone" long-name="Control Environment" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/cone/group" mrp="mw/classicui/lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
-</component>
-<component name="graphicseffects" long-name="Graphics Effects" introduced="9.2" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/graphicseffects/group" mrp="mw/classicui/lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
-</component>
-<component name="uigraphicsutils" long-name="UI Graphics Utilities" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group" mrp="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
-</component>
-<component name="clockanim" long-name="Clock" purpose="optional" plugin="Y">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/clockanim/group" mrp="mw/classicui/lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
-</component>
-<component name="bmpanimation" long-name="BMP Animation" introduced="6.0" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/bmpanimation/group" mrp="mw/classicui/lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
-</component>
-<component name="animation" long-name="Animation" introduced="9.1" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/animation/group" mrp="mw/classicui/lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
-</component>
-</collection>
-<collection name="classicui_info" long-name="Classic UI Info" level="specific">
-<!-- the multiple units in the API test components need to be resolved -->
-<component name="classicui_metadata" long-name="Classic UI Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/classicui/classicui_info/classicui_metadata/classicui_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="svgt" level="generic" long-name="SVG Tiny" levels="util ui">
-<collection name="svgt_plat" long-name="SVG Tiny Platform Interfaces" level="ui">
-<component name="svgt_api" long-name="SVGT API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/svgt_api/group"/>
-</component>
-<component name="nvg_api" long-name="NVG API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/nvg_api/group"/>
-</component>
-</collection>
-<collection name="svgtopt" long-name="SVG-T Engine" level="util">
-<component name="svgtopt_build" filter="s60" long-name="SVG Engine" introduced="9.2">
-<!-- component is at collection level. Needs to be moved down a directory -->
-<unit bldFile="mw/svgt/svgtopt/group"/>
-</component>
-<component name="svgtplugin" filter="s60" long-name="SVG Plugin" introduced="9.2" plugin="Y">
-<unit bldFile="mw/svgt/svgtopt/svgtplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="uiaccelerator" level="generic" long-name="UI Accelerator" levels="plugin framework server ex if">
-<collection name="uiaccelerator_plat" long-name="UI Accelerator Platform Interfaces" level="if">
-<component name="alf_core_toolkit_api" long-name="ALF Core Toolkit API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/group"/>
-</component>
-<component name="alf_visual_api" long-name="ALF Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/group"/>
-</component>
-<component name="alf_extended_visual_api" long-name="ALF Extended Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/group"/>
-</component>
-<component name="alf_extension_api" long-name="ALF Extension API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/group"/>
-</component>
-<component name="alf_tracing_api" long-name="ALF Tracing API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/group"/>
-</component>
-<component name="alf_client_server_api" long-name="ALF Client Server API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/group"/>
-</component>
-</collection>
-<collection name="uiacceltk" long-name="UI Accelerator Toolkit" level="framework">
-<component name="hitchcock" filter="s60" long-name="Hitchcock">
-<unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/group"/>
-</component>
-<component name="uiacceltk_build" filter="s60" long-name="UI Accelerator Toolkit Build">
-<!-- move into the other component, or remove the #include and make this UI Accelerator Toolkit ROM-->
-<unit bldFile="mw/uiaccelerator/uiacceltk/group"/>
-</component>
-</collection>
-</block>
-<block name="uiresources" level="generic" long-name="UI Resources" levels="compile plugin framework server generic data">
-<!-- are the custom filters below needed? -->
-<collection name="uiresources_pub" long-name="UI Resources Public Interfaces" level="data">
-<component name="pictograph_api" long-name="Pictograph API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/pictograph_api/group" filter="!test"/>
-</component>
-<component name="skins_api" long-name="Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/skins_api/group" filter="!test"/>
-</component>
-<component name="font_definition_api" long-name="Font Definition API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/font_definition_api/group" filter="!test"/>
-</component>
-<component name="graphics_api" long-name="Graphics API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/graphics_api/group" filter="!test"/>
-</component>
-<component name="scalable_icons_api" long-name="Scalable Icons API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/scalable_icons_api/group"/>
-</component>
-<component name="layout_id_definitions_api" long-name="Layout ID Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/layout_id_definitions_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_plat" long-name="UI Resources Platform Interfaces" level="data">
-<component name="layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_system_private_api/group" filter="!test"/>
-</component>
-<component name="layout_data_api" long-name="Layout Data API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_data_api/group" filter="!test"/>
-</component>
-<component name="cdl_api" long-name="CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/cdl_api/group" filter="!test"/>
-</component>
-<component name="extended_skins_api" long-name="Extended Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_skins_api/group" filter="!test"/>
-</component>
-<component name="tfx_server_controller_plugin_api" long-name="TFX Server Controller Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_controller_plugin_api/group"/>
-</component>
-<component name="extended_fonts_api" long-name="Extended Fonts API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_fonts_api/group" filter="!test"/>
-</component>
-<component name="graphic_configuration_api" long-name="Graphic Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/graphic_configuration_api/group" filter="!test"/>
-</component>
-<component name="mif_header_cdl_api" long-name="MIF Header CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mif_header_cdl_api/group"/>
-</component>
-<component name="personalisation_and_skins_settings_api" long-name="Personalisation and Skins Settings API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/personalisation_and_skins_settings_api/group"/>
-</component>
-<component name="tfx_effect_setup_plugin_api" long-name="TFX Effect Setup Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_effect_setup_plugin_api/group"/>
-</component>
-<component name="mifconv_definitions_api" long-name="Mifconv Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mifconv_definitions_api/group"/>
-</component>
-<component name="wallpaper_configuration_api" long-name="Wallpaper Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/wallpaper_configuration_api/group"/>
-</component>
-<component name="language_code_definitions_api" long-name="Language Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/language_code_definitions_api/group"/>
-</component>
-<component name="skins_image_attributes_api" long-name="Skins Image Attributes API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
-</component>
-<component name="private_user_area_code_definitions_api" long-name="Private User Area Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/private_user_area_code_definitions_api/group"/>
-</component>
-<component name="tfx_server_plugin_ids_api" long-name="TFX Server Plug-in IDs API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_plugin_ids_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_info" long-name="UI Resources Info" level="data">
-<component name="uiresources_test" filter="s60,test,api_test" long-name="UI Resources Tests" purpose="development"/>
-</collection>
-<collection name="uigraphics" long-name="UI Graphics" level="generic">
-<component name="bitmaps2" filter="s60" long-name="Bitmaps 2" class="config">
-<unit bldFile="mw/uiresources/uigraphics/bitmaps2/group"/>
-</component>
-<component name="icons" filter="s60" long-name="Icons" class="config">
-<unit bldFile="mw/uiresources/uigraphics/icons/group"/>
-</component>
-<component name="variatedbitmaps" filter="s60" long-name="Variated Bitmaps" class="config">
-<unit bldFile="mw/uiresources/uigraphics/variatedbitmaps/group"/>
-</component>
-<component name="aknicon" filter="s60" long-name="Avkon Icon Framework">
-<unit bldFile="mw/uiresources/uigraphics/aknicon/group"/>
-</component>
-<component name="nvgrenderstage" filter="sf_build" long-name="NVG Render Stage">
-<unit bldFile="mw/uiresources/uigraphics/nvgrenderstage/group"/>
-</component>
-</collection>
-<collection name="layouts" long-name="Layouts" level="plugin">
-<component name="cdl" filter="s60" long-name="Customization Definition Language">
-<!-- can only have one unit. Need to #include them or split into multiple components -->
-<unit bldFile="mw/uiresources/layouts/cdl/cdlengine/group"/>
-<unit bldFile="mw/uiresources/layouts/cdl/cdlserver/group"/>
-</component>
-<component name="aknlayout2" filter="s60" long-name="Avkon Layout 2">
-<unit bldFile="mw/uiresources/layouts/aknlayout2/group"/>
-</component>
-</collection>
-<collection name="skins" long-name="Skins" level="data">
-<component name="aknskincontent" filter="s60" long-name="Avkon Skin Content" class="config">
-<unit bldFile="mw/uiresources/skins/aknskincontent/group"/>
-</component>
-<component name="aknskins" filter="s60" long-name="Avkon Skin Compiler">
-<unit bldFile="mw/uiresources/skins/aknskins/group"/>
-</component>
-</collection>
-<collection name="pictographs" long-name="Pictographs" level="data">
-<component name="aknpictograph" filter="s60" long-name="Avkon Pictograph">
-<unit bldFile="mw/uiresources/pictographs/aknpictograph/group"/>
-</component>
-</collection>
-<collection name="locales" long-name="Locales" level="framework">
-<component name="locales_build" filter="s60" long-name="Locales Build">
-<unit bldFile="mw/uiresources/locales/loce32"/>
-</component>
-</collection>
-<collection name="uiconfig" long-name="UI Config" level="server">
-<component name="s60config" filter="s60" long-name="S60 UI Config">
-<unit bldFile="mw/uiresources/uiconfig/s60config/group"/>
-</component>
-</collection>
-<collection name="fontsupport" long-name="Font Support" level="generic">
-<component name="fontprovider" filter="s60" long-name="Font Provider">
-<unit bldFile="mw/uiresources/fontsupport/fontprovider/group"/>
-</component>
-<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
- <component id="s60_fonts" filter="s60" name="S60 Fonts">
- <unit bldFile="fontsupport/fontutils/group"/>
- </component>
--->
-<component name="fontutils" filter="sf_build" long-name="Font Utils">
-<unit bldFile="mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
-</component>
-</collection>
-<collection name="helpthemes" long-name="Help Themes" level="data">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helpthemes_build" filter="s60" long-name="Help Themes Build" class="config">
-<unit bldFile="mw/uiresources/helpthemes/group"/>
-</component>
-</collection>
-</block>
-<block name="hapticsservices" level="generic" long-name="Haptics Services" levels="fw server api">
-<collection name="hapticsservices_plat" long-name="Haptics Services Platform Interfaces" level="api">
-<component name="tacticon_api" long-name="Tacticon API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tacticon_api/group"/>
-</component>
-<component name="tactile_feedback_core_api" long-name="Tactile Feedback Core API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_core_api/group"/>
-</component>
-<component name="tactile_feedback_server_api" long-name="Tactile Feedback Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_server_api/group"/>
-</component>
-</collection>
-<collection name="hapticsservices_pub" long-name="Haptics Services Public Interfaces" level="api">
-<component name="tactile_feedback_client_api" long-name="Tactile Feedback Client API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_pub/tactile_feedback_client_api/group"/>
-</component>
-</collection>
-<collection name="tacticonserver" long-name="Tacticon Server" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="tacticonserver_build" filter="s60" long-name="Tacticon Server Build" introduced="^3">
-<unit bldFile="mw/hapticsservices/tacticonserver/group"/>
-<!-- clients and servers are suauly the same component. Consider moving pluign to a separate component if needed -->
-</component>
-</collection>
-<collection name="tactilefeedback" long-name="Tactile Feedback" level="fw">
-<component name="tactilearearegistry" filter="s60" long-name="Tactile Area Registry" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilearearegistry/group"/>
-</component>
-<component name="tactilefeedbackresolver" filter="s60" long-name="Tactile Feedback Resolver" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackresolver/group"/>
-</component>
-<component name="tactileclickplugin" filter="s60" long-name="Tactile Click Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileclickplugin/group"/>
-</component>
-<component name="tactilefeedbackclient" filter="s60" long-name="Tactile Feedback Client" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackclient/group"/>
-</component>
-<component name="tactileactionplugin" filter="s60" long-name="Tactile Action Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileactionplugin/group"/>
-</component>
-<component name="tactilefeedback_build" filter="s60" long-name="Tactile Feedback Build" introduced="^1">
-<!-- consider moving IBY to one fo the above components -->
-<unit bldFile="mw/hapticsservices/tactilefeedback/group"/>
-</component>
-</collection>
-</block>
-<block name="gsprofilesrv" level="generic" long-name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
-<collection name="gsprofilesrv_pub" long-name="GS and Profiles Services Public Interfaces" level="specific">
-<component name="profiles_engine_active_profile_settings_api" long-name="Profiles Engine Active Profile Settings API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_active_profile_settings_api/group"/>
-</component>
-<component name="profiles_engine_wrapper_api" long-name="Profiles Engine Wrapper API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_wrapper_api/group"/>
-</component>
-</collection>
-<collection name="gsprofilesrv_plat" long-name="GS and Profiles Services Platform Interfaces" level="specific">
-<component name="profiles_engine_api" long-name="Profiles Engine API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_engine_api/group"/>
-</component>
-<component name="profiles_mediafilelist_api" long-name="Media File List API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_mediafilelist_api/group"/>
-</component>
-<component name="filelist_api" long-name="File List API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/filelist_api/group"/>
-</component>
-<component name="settings_backgroundimage_api" long-name="Settings Background Image API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_backgroundimage_api/group"/>
-</component>
-<component name="settings_framework_api" long-name="Settings Framework API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_framework_api/group"/>
-</component>
-<component name="settings_launch_api" long-name="Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_launch_api/group"/>
-</component>
-<component name="settings_listbox_api" long-name="Settings List Box API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_listbox_api/group"/>
-</component>
-<component name="settings_plugin_api" long-name="Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_plugin_api/group"/>
-</component>
-<component name="settings_uis_cenrep_collection_api" long-name="Settings UIs CenRep Collection API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
-</component>
-</collection>
-<collection name="gssettingsuis" long-name="General Settings UIs" level="framework">
-<component name="gs" filter="s60" long-name="General Settings" introduced="9.2">
-<unit bldFile="mw/gsprofilesrv/gssettingsuis/gs/group"/>
-</component>
-</collection>
-<collection name="profilesservices" long-name="Profiles Services" level="server">
-<component name="filelist" filter="s60" long-name="File List" introduced="9.1">
-<unit bldFile="mw/gsprofilesrv/profilesservices/filelist/group"/>
-</component>
-<component name="mediafilelist" filter="s60" long-name="Media File List" introduced="^2">
-<unit bldFile="mw/gsprofilesrv/profilesservices/mediafilelist/group"/>
-</component>
-<component name="profileengine" filter="s60" long-name="Profile Engine" introduced="9.1">
-<unit bldFile="mw/gsprofilesrv/profilesservices/profileengine/group"/>
-</component>
-<component name="ringingtone3dplugin" filter="s60" long-name="Ringing Tone 3D Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/gsprofilesrv/profilesservices/ringingtone3dplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreensrv" level="specific" long-name="Home Screen Services" levels="plugin framework server generic specific">
-<collection name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" level="specific">
-<component name="ai_content_model_api" long-name="AI Content Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_content_model_api/group"/>
-</component>
-<component name="ai_utilities_api" long-name="AI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_utilities_api/group" filter="!test"/>
-</component>
-<component name="ai_plugin_management_api" long-name="AI Plug-in Management API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_management_api/group"/>
-</component>
-<component name="ai_plugin_information_api" long-name="AI Plug-in Information API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_information_api/group"/>
-</component>
-<component name="ai_variation_api" long-name="AI Variation API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_variation_api/group"/>
-</component>
-<component name="action_handler_plugin_api" long-name="Action Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/group" filter="!test"/>
-</component>
-<component name="content_harvester_plugin_api" long-name="Content Harvester Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/group" filter="!test"/>
-</component>
-<component name="menu_model_api" long-name="Menu Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_model_api/group"/>
-</component>
-<component name="menu_sat_interface_api" long-name="Menu SAT Interface API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/group" filter="!test"/>
-</component>
-<component name="external_home_screen_api" long-name="External Home Screen API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/external_home_screen_api/group"/>
-</component>
-<component name="menu_content_service_api" long-name="Menu Content Service API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_content_service_api/group" filter="!test"/>
-</component>
-<component name="sapi_contentpublishing" long-name="SAPI Content Publishing" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing/group"/>
-</component>
-<component name="sapi_backstepping" long-name="SAPI Backstepping" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_backstepping/group"/>
-</component>
-<component name="sapi_actionhandler" long-name="SAPI Action Handler" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_actionhandler/group"/>
-</component>
-<component name="sapi_homescreenplugin" long-name="SAPI Homescreen Plugin" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_homescreenplugin/group" filter="!test"/>
-</component>
-<component name="sapi_menucontent" long-name="SAPI Menu Content" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_menucontent/group"/>
-</component>
-<component name="xcfw_api" long-name="XCFW API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/xcfw_api/group"/>
-</component>
-<component name="idlefw_api" long-name="Idle Framework API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/idlefw_api/group"/>
-</component>
-<component name="hs_widget_publisher_api" long-name="Home Screen Publishing API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_widget_publisher_api/group"/>
-</component>
-<component name="hs_settings_api" long-name="HS Settings API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_settings_api/group"/>
-</component>
-<component name="hs_content_control_api" long-name="HS Content Control API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_content_control_api/group"/>
-</component>
-</collection>
-<collection name="xcfw" long-name="XML Content Framework" level="framework">
-<!-- collection is really a component, needs to be moved down a directory -->
-<component name="xcfw_build" filter="s60" long-name="XML Content Framework Build">
-<unit bldFile="mw/homescreensrv/xcfw/group"/>
-</component>
-</collection>
-<collection name="homescreenpluginsrv" long-name="Home Screen Plugin Service" level="plugin">
-<component name="hspsdefinitionengine" filter="s60" long-name="HS Plugin Service Definition Engine" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsdefinitionengine/group"/> -->
-</component>
-<component name="hspsdom" filter="s60" long-name="HS Plugin Service DOM" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsdom/group"/> -->
-</component>
-<component name="hspstools" filter="s60" long-name="HS Server Tools">
-<!-- <unit bldFile="homescreenpluginsrv/hspstools/group"/> -->
-</component>
-<component name="hspspluginregistry" filter="s60" long-name="HS Plugin Registry" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspspluginregistry/group"/>-->
-</component>
-<component name="hspsmanager" filter="s60" long-name="HSPS Manager" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsmanager/group"/>-->
-</component>
-<component name="hspsodt" filter="s60" long-name="HSPS Object Description Tree" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsodt/group"/>-->
-</component>
-<component name="hspsresource" filter="s60" long-name="HS Plugin Server Resource" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresource/group"/>-->
-</component>
-<component name="hspsresult" filter="s60" long-name="HS Plugin Server Result" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
-</component>
-<component name="homescreen_settings_api" filter="s60" long-name="HS Settings API" class="api placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
-</component>
-<component name="homescreenpluginsrv_build" filter="s60" long-name="HSPS Build">
-<!-- need to break this up into the self-contained components above and uncomment them -->
-<unit bldFile="mw/homescreensrv/homescreenpluginsrv/group"/>
-</component>
-</collection>
-<collection name="idlefw" long-name="Idle Framework" level="framework">
-<!-- Uncomment all units when configuration is in place. All currently #included from idlefw_build -->
-<component name="idlefw_plugins" filter="s60" long-name="Idle Framework Plugins" plugin="Y" class="placeholder">
-<!--<unit bldFile="idlefw/plugins/group"/>-->
-</component>
-<component name="hslaunch" filter="s60" long-name="Home Screen Launch" class="placeholder">
-<!--<unit bldFile="idlefw/plugins/group"/>-->
-</component>
-<component name="idlefw_build" filter="s60" long-name="Idle Framework Build">
-<!--split this into components, or separate from the above components and move this down a directory -->
-<unit bldFile="mw/homescreensrv/idlefw/group"/>
-</component>
-</collection>
-<collection name="menucontentsrv" long-name="Menu Content Service" level="generic">
-<component name="menusatinterface" filter="s60" long-name="Menu SAT Interface">
-<unit bldFile="mw/homescreensrv/menucontentsrv/menusatinterface/group"/>
-</component>
-<component name="menucontentsrv_build" filter="s60" long-name="Menu Content Service Build">
-<!--split this into components, or separate from the above component and move this down a directory -->
-<unit bldFile="mw/homescreensrv/menucontentsrv/group"/>
-</component>
-</collection>
-<collection name="backsteppingsrv" long-name="Back Stepping Service" level="server">
-<!-- collection is really a component, needs to be moved down a directory -->
-<component name="bsengine" long-name="Back Stepping Engine" filter="s60">
-<unit bldFile="mw/homescreensrv/backsteppingsrv/group"/>
-</component>
-</collection>
-<collection name="contentpublishingsrv" long-name="Content Publishing Service" level="server">
-<component name="contentpublishingdebug" filter="s60" long-name="Content Publishing Debug">
-<!-- need to move this component outside of contentpublishingutils and into separate component directory -->
-<!-- <unit bldFile="contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/> -->
-</component>
-<component name="contentpublishingutils" filter="s60" long-name="Content Publishing Utils">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingutils/group"/>
-</component>
-<component name="contentpublishingserver" filter="s60" long-name="Content Publishing Server">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingserver/group"/>
-</component>
-<component name="contentharvester" filter="s60" long-name="Content Harvester">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
-</component>
-<component name="contentpublishingsrv_build" filter="s60" long-name="Content Publishing Service Build">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/group"/>
-</component>
-</collection>
-<collection name="contentcontrolsrv" long-name="Content Control Service" level="server">
-<component name="ccsrv" long-name="Content Control Service" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccsrv/group"/>
-</component>
-<component name="ccsrvapi" long-name="Content Control Service API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccsrvapi/group"/>
-</component>
-<component name="ccclientsession" long-name="Content Control Client Session" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccclientsession/group"/>
-</component>
-<component name="hsccclient" long-name="HS Content Control Client" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/hsccclient/group"/>
-</component>
-<component name="hscontentinfo" long-name="Home Screen Content Info" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/hscontentinfo/group"/>
-</component>
-<component name="contentcontrolsrv_build" long-name="Content Control Service Build" filter="s60" introduced="^3">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/group"/>
-</component>
-</collection>
-</block>
-<block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
-<collection name="appinstall_plat" long-name="Application Installation Platform Interfaces" level="api">
-<component name="iaupdate_api" long-name="IA Update API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/iaupdate_api/group"/>
-</component>
-<component name="task_plugin_api" long-name="Task Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_plugin_api/group"/>
-</component>
-<component name="sw_installer_common_ui_api" long-name="SW Installer Common UI API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_common_ui_api/group"/>
-</component>
-<component name="sw_installer_launcher_api" long-name="SW Installer Launcher API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_launcher_api/group"/>
-</component>
-<component name="task_management_api" long-name="Task Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_management_api/group"/>
-</component>
-<component name="sw_installer_ui_plugin_api" long-name="SW Installer UI Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ui_plugin_api/group"/>
-</component>
-<component name="sw_installer_cr_keys" long-name="SW Installer CR Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_cr_keys/group"/>
-</component>
-<component name="sw_installer_ps_keys" long-name="SW Installer PS Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
-</component>
-<component name="appmngr2runtimeapi" long-name="Application Manager 2 Runtime Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
-</component>
-</collection>
-<collection name="appinstall_pub" long-name="Application Installation Public Interfaces" level="api">
-<component name="startup_list_management_api" long-name="Startup List Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
-</component>
-</collection>
-<collection name="ncdengine" long-name="Nokia Content Discover" level="framework">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="ncdengine_engine" filter="s60" long-name="NCD Engine" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/engine/group"/>
-</component>
-<component name="debuglogger" filter="s60" long-name="NCD Debug Logger" introduced="^1" class="placeholder">
-<!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
-</component>
-<component name="ncdengine_build" filter="s60" long-name="NCD Build" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/group"/>
-</component>
-</collection>
-<collection name="appinstaller" long-name="Application Installer" level="generic">
-<component name="appmngr2" filter="s60" long-name="Application Manager 2" introduced="^2">
-<unit bldFile="mw/appinstall/appinstaller/appmngr2/group"/>
-</component>
-<component name="appinstui" filter="s60" long-name="Application Installer UI" introduced="^2">
-<unit bldFile="mw/appinstall/appinstaller/appinstui/group"/>
-</component>
-</collection>
-<collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="api">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="iaupdateapi_stub_build" long-name="IA Update API Stub Build" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdateapi_stub/group"/>
-</component>
-</collection>
-<collection name="iaupdate" long-name="Independent Apps Update" level="api">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="iad" long-name="Software Update" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/iad/group"/>
-</component>
-<component name="iaupdate_help" filter="s60" long-name="IA Update Help" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/help/group"/>
-</component>
-<component name="iaupdate_build" filter="s60" long-name="IA Update Build" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/group"/>
-</component>
-</collection>
-<collection name="installationservices" long-name="Installation Services" level="generic">
-<component name="swi" long-name="Secure Software Install" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swi/group" mrp="mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
-</component>
-<component name="swidevicetools" long-name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
-<unit bldFile="mw/appinstall/installationservices/swidevicetools/group" mrp="mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
-</component>
-<component name="swiconfig" long-name="Software Install Config" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appinstall/installationservices/swiconfig/group" mrp="mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
-</component>
-</collection>
-<collection name="secureswitools" long-name="Secure Software Install Tools" level="tool">
-<component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/makekeys/group" mrp="mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
-</component>
-<component name="swianalysistoolkit" long-name="SWI Analysis Toolkit" purpose="development" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
-</component>
-<component name="openssllib" long-name="OpenSSL Library" purpose="optional" class="PC">
-<unit mrp="mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
-</component>
-<component name="swisistools" long-name="Secure Software Install SIS Tools" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swisistools/group" mrp="mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
-</component>
-</collection>
-<collection name="appinstall_info" long-name="Application Installation Info" level="api">
-<component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="serviceapifw" level="specific" long-name="Service API Framework" levels="plugin framework server generic specific">
-<collection name="serviceapifw_pub" long-name="Service API Framework Public Interfaces" level="specific"/>
-<collection name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" level="specific">
-<component name="rtsecuritymanager_common_api" long-name="Runtime Security Manager Common API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/group"/>
-</component>
-<component name="rtsecuritymanager_utility_api" long-name="Runtime Security Manager Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
-</component>
-<component name="rtsecuritymanager_client_api" long-name="Runtime Security Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/group"/>
-</component>
-<component name="liw_provider_utility_api" long-name="LIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_provider_utility_api/group"/>
-</component>
-<component name="liw_service_interface_base_api" long-name="LIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_base_api/group"/>
-</component>
-<component name="liw_service_interface_menu_api" long-name="LIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_menu_api/group"/>
-</component>
-<component name="liw_criteria_api" long-name="LIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_criteria_api/group"/>
-</component>
-<component name="liw_generic_parameter_api" long-name="LIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_generic_parameter_api/group"/>
-</component>
-<component name="liw_service_handler_api" long-name="LIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_handler_api/group"/>
-</component>
-</collection>
-<collection name="rtsecuritymanager" long-name="Runtime Security Manager" level="server">
-<component name="rtsecuritymanagerutil" filter="s60" long-name="Runtime Security Manager Util">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
-</component>
-<component name="rtsecuritymanagerserver" filter="s60" long-name="Runtime Security Manager Server">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/>
-</component>
-<component name="rtsecuritymanagerclient" filter="s60" long-name="Runtime Security Manager Client">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/>
-</component>
-<component name="rtsecuritymanager_build" filter="s60" long-name="Runtime Security Manager Build">
-<!-- Move the export to the appropriate components, or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/group"/>
-</component>
-</collection>
-<collection name="languageinterworkingfw" long-name="Language Interworking Framework" level="framework">
-<component name="lifwservicehandler" filter="s60" long-name="Service Handler">
-<unit bldFile="mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-</block>
-<block name="serviceapi" level="specific" long-name="Service API" levels="os mw1 mw2 app">
-<!-- should break up this collection into something meaningful -->
-<collection name="serviceproviders" long-name="Service Providers" level="mw1">
-<component name="sapi_contacts_vpbk" long-name="Contacts Phonebook SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
-</component>
-<component name="sapi_location" long-name="Location SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_location/group"/>
-</component>
-<component name="sapi_mediamanagement" long-name="Media Management SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/group"/>
-</component>
-<component name="sapi_landmarks" long-name="Landmarks SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
-</component>
-<component name="sapi_messaging" long-name="Messaging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/group"/>
-</component>
-<component name="sapi_applicationmanager" long-name="Application Manager SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
-</component>
-<component name="sapi_calendar" long-name="Calendar SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_calendar/group"/>
-</component>
-<component name="sapi_logging" long-name="Logging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_logging/group"/>
-</component>
-<component name="sapi_sensor" long-name="Sensor SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sensor/group"/>
-</component>
-<component name="sapi_sysinfo" long-name="Sysinfo SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sysinfo/group"/>
-</component>
-<component name="sapi_serviceregistry" long-name="Service Registry SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
-</component>
-<component name="jsapi" long-name="Javascript API" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/jsapi/group"/>
-</component>
-<component name="serviceproviders_build" filter="s60" long-name="Service API Build">
-<!-- distribute the exports or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapi/serviceproviders/group"/>
-</component>
-</collection>
-</block>
-<block name="web" level="specific" long-name="Web" levels="plugin utils server generic specific">
-<collection name="web_pub" long-name="Web Public Interfaces" level="specific">
-<component name="browser_control_api" long-name="Browser Control API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_control_api/group"/>
-</component>
-<component name="download_mgr_client_api" long-name="Download Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_client_api/group"/>
-</component>
-<component name="download_mgr_ui_api" long-name="Download Manager UI Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_ui_api/group"/>
-</component>
-<component name="favourites_engine_api" long-name="Favourites Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/favourites_engine_api/group"/>
-</component>
-<component name="browser_plugin_api" long-name="Browser Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_plugin_api/group"/>
-</component>
-<component name="settings_api" long-name="Settings API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/settings_api/group"/>
-</component>
-</collection>
-<collection name="web_plat" long-name="Web Platform Interfaces" level="specific">
-<component name="aiw_browser_provider_api" long-name="AIW Browser Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/aiw_browser_provider_api/group"/>
-</component>
-<component name="browser_dialogs_provider_api" long-name="Browser Dialogs Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_dialogs_provider_api/group"/>
-</component>
-<component name="browser_platform_api" long-name="Browser Platform API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_platform_api/group"/>
-</component>
-<component name="cod_handler_api" long-name="COD Handler API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cod_handler_api/group"/>
-</component>
-<component name="connection_manager_api" long-name="Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/connection_manager_api/group"/>
-</component>
-<component name="cxml_library_api" long-name="cXml Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cxml_library_api/group"/>
-</component>
-<component name="download_mgr_client_api_extn" long-name="Download Manager Client API Extension" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/download_mgr_client_api_extn/group"/>
-</component>
-<component name="download_path_plugin_api" long-name="Download Path Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/download_path_plugin_api/group"/>
-</component>
-<component name="feeds_engine_api" long-name="Feeds Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/feeds_engine_api/group"/>
-</component>
-<component name="launcher_api" long-name="Launcher API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/launcher_api/group"/>
-</component>
-<component name="multipart_parser_api" long-name="Multipart Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/multipart_parser_api/group"/>
-</component>
-<component name="recent_url_store_api" long-name="Recent URL Store API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/recent_url_store_api/group"/>
-</component>
-<component name="scheme_handler_plugin_api" long-name="Scheme Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scheme_handler_plugin_api/group"/>
-</component>
-<component name="scriptable_plugin_api" long-name="Scriptable Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scriptable_plugin_api/group"/>
-</component>
-<component name="webutils_api" long-name="Web Utils API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/webutils_api/group"/>
-</component>
-<component name="widget_registry_api" long-name="Widget Registry API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/widget_registry_api/group"/>
-</component>
-<component name="xml_parser_api" long-name="XML Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/xml_parser_api/group"/>
-</component>
-<component name="stmgesturefw_api" long-name="State Machine Gesture Framework API " filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/stmgesturefw_api/group"/>
-</component>
-</collection>
-<collection name="web_info" long-name="Web Info" level="specific">
-<component name="web_build" filter="s60" long-name="Web Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/group"/>
-</component>
-</collection>
-<collection name="browserutilities" long-name="Browser Utilities" level="utils">
-<component name="browserdialogsprovider" filter="s60" long-name="Browser Dialogs Provider">
-<unit bldFile="mw/web/browserutilities/browserdialogsprovider/group"/>
-</component>
-<component name="recenturlstore" filter="s60" long-name="Recent URL Store">
-<unit bldFile="mw/web/browserutilities/recenturlstore/group"/>
-</component>
-<component name="xmlparser" filter="s60" long-name="XML Interface">
-<unit bldFile="mw/web/browserutilities/xmlparser/group"/>
-</component>
-<component name="cxmllibrary" filter="s60" long-name="XML Parser Implementation">
-<unit bldFile="mw/web/browserutilities/cxmllibrary/group"/>
-</component>
-<component name="downloadmgr" filter="s60" long-name="Download Manager">
-<unit bldFile="mw/web/browserutilities/downloadmgr/group"/>
-</component>
-<component name="connectionmanager" filter="s60" long-name="Connection Manager">
-<unit bldFile="mw/web/browserutilities/connectionmanager/group"/>
-</component>
-<component name="browsertelservice" filter="s60" long-name="Browser Telephony Service">
-<unit bldFile="mw/web/browserutilities/browsertelservice/group"/>
-</component>
-<component name="favouritesengine" filter="s60" long-name="Favourites Engine">
-<unit bldFile="mw/web/browserutilities/favouritesengine/group"/>
-</component>
-<component name="feedsengine" filter="s60" long-name="Feeds Engine">
-<unit bldFile="mw/web/browserutilities/feedsengine/group"/>
-</component>
-<component name="multipartparser" filter="s60" long-name="Multipart Parser">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
-<!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
-</component>
-<component name="schemehandler" filter="s60" long-name="Scheme Handler">
-<unit bldFile="mw/web/browserutilities/schemehandler/group"/>
-</component>
-<component name="webutils" filter="s60" long-name="Web Utils">
-<unit bldFile="mw/web/browserutilities/webutils/group"/>
-</component>
-<component name="aiwbrowserprovider" filter="s60" long-name="AIW Browser Provider" plugin="Y">
-<unit bldFile="mw/web/browserutilities/aiwbrowserprovider/group"/>
-</component>
-<component name="browserutilities_build" filter="s60" long-name="Browser Utilities Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/browserutilities/group"/>
-</component>
-</collection>
-<collection name="webengine" long-name="Web Engine" level="server">
-<component name="osswebengine" filter="s60" long-name="OSS Web Engine">
-<!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
-<unit bldFile="mw/web/webengine/osswebengine/cache/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/memorymanager/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/npscript/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group/javascriptcore"/>
-</component>
-<component name="webkitutils" filter="s60" long-name="WebKit Utils">
-<unit bldFile="mw/web/webengine/webkitutils/group"/>
-</component>
-<component name="pagescaler" filter="s60" long-name="Page Scaler">
-<unit bldFile="mw/web/webengine/pagescaler/group"/>
-</component>
-<component name="webwidgetinstaller" filter="s60" long-name="Widget Installer">
-<unit bldFile="mw/web/webengine/widgetinstaller/group"/>
-</component>
-<component name="widgetregistry" filter="s60" long-name="Widget Registry">
-<unit bldFile="mw/web/webengine/widgetregistry/group"/>
-</component>
-<component name="wmlengine" filter="s60" long-name="WML Engine">
-<unit bldFile="mw/web/webengine/wmlengine/group"/>
-</component>
-<component name="device" filter="s60" long-name="Device">
-<!-- this needs a more meaningful name -->
-<unit bldFile="mw/web/webengine/device/group"/>
-</component>
-<component name="widgetengine" filter="s60" long-name="Widget Engine">
-<unit bldFile="mw/web/webengine/widgetengine/group"/>
-</component>
-<component name="web_memoryplugin" long-name="Memory Plugin" filter="s60" plugin="Y">
-<unit bldFile="mw/web/webengine/memoryplugin/group"/>
-</component>
-<component name="widgetmemoryplugin" filter="s60" long-name="Widget Memory Plugin" plugin="Y">
-<unit bldFile="mw/web/webengine/widgetmemoryplugin/group"/>
-</component>
-<component name="widgetbackuprestore" filter="s60" long-name="Widget Backup and Restore">
-<unit bldFile="mw/web/webengine/widgetbackuprestore/group"/>
-</component>
-<component name="browserrecognizers" filter="s60" long-name="Browser Recognizers" plugin="Y">
-<unit bldFile="mw/web/webengine/browserrecognizers/group"/>
-</component>
-<component name="wrtharvester" filter="s60" long-name="Web Runtime Harvester" plugin="Y">
-<unit bldFile="mw/web/webengine/wrtharvester/group"/>
-</component>
-</collection>
-<collection name="codhandler" long-name="Content Object Descriptor Handler" level="specific">
-<component name="codeng" filter="s60" long-name="COD Engine">
-<unit bldFile="mw/web/codhandler/codeng/group"/>
-</component>
-<component name="codui" filter="s60" long-name="COD UI">
-<unit bldFile="mw/web/codhandler/codui/group"/>
-</component>
-<component name="codrecog" filter="s60" long-name="COD Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/codrecog/group"/>
-</component>
-<component name="codviewer" filter="s60" long-name="COD Viewer">
-<unit bldFile="mw/web/codhandler/codviewer/group"/>
-</component>
-<component name="ddrecog" filter="s60" long-name="Download Descriptor Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/ddrecog/group"/>
-</component>
-<component name="ddviewer" filter="s60" long-name="Download Descriptor Viewer">
-<unit bldFile="mw/web/codhandler/ddviewer/group"/>
-</component>
-<component name="coddownload" filter="s60" long-name="COD Download">
-<unit bldFile="mw/web/codhandler/coddownload/group"/>
-</component>
-<component name="roapapp" filter="s60" long-name="ROAP Application">
-<unit bldFile="mw/web/codhandler/roapapp/group"/>
-</component>
-<component name="codhandler_build" filter="s60" long-name="COD Handler Build">
-<!-- Exports need to go into another component or make this self-contained.
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/codhandler/group"/>
-</component>
-</collection>
-<collection name="widgets" long-name="Web Widget Framework" level="generic">
-<!-- the following units can be uncommented when configuration is put in place -->
-<component name="widgetrecognizer" filter="s60" long-name="Widget Recognizer" plugin="Y">
-<!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
-</component>
-<component name="widgetinstaller" filter="s60" long-name="Widget Installer UI" plugin="Y">
-<!--<unit bldFile="widgets/widgetinstaller/group"/>-->
-</component>
-<component name="widgetlauncher" filter="s60" long-name="Widget Launcher">
-<!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
-</component>
-<component name="widgetapp" filter="s60" long-name="Widget UI">
-<!--<unit bldFile="widgets/widgetapp/group"/>-->
-</component>
-<component name="widgetsidchecker" filter="s60" long-name="Widget SID Checker" introduced="^3">
-<!--<unit bldFile="widgets/widgetsidchecker/group"/>-->
-</component>
-<component name="widgetpreinstaller" filter="s60" long-name="Widget Pre-Installer">
-<!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
-</component>
-<component name="widgetstartup" filter="s60" long-name="Widget Startup">
-<!--<unit bldFile="widgets/widgetstartup/group"/>-->
-</component>
-<component name="widgets_build" filter="s60" long-name="Widgets Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/widgets/group"/>
-</component>
-</collection>
-</block>
-<block name="websrv" level="generic" long-name="Web Services" levels="plugin framework server generic specific">
-<collection name="websrv_pub" long-name="Web Services Public Interfaces" level="specific">
-<component name="web_service_description_api" long-name="Web Service Description API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_description_api/group"/>
-</component>
-<component name="web_service_connection_api" long-name="Web Service Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/group"/>
-</component>
-<component name="web_service_manager_api" long-name="Web Service Manager API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/group"/>
-</component>
-<component name="hostlet_connection_api" long-name="Hostlet Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/group"/>
-</component>
-<component name="web_service_messaging_api" long-name="Web Service Messaging API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/group"/>
-</component>
-<component name="xml_extensions_api" long-name="XML Extensions API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/group"/>
-</component>
-<component name="xml_fragment_api" long-name="XML Fragment API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/group"/>
-</component>
-</collection>
-<collection name="webservices" long-name="Web Services Framework" level="generic">
-<!-- consider breaking this collection into more meaningful subsets -->
-<component name="wsnotifierplugins" filter="s60" long-name="WS Notifier Plugins" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsnotifierplugins/group"/>
-</component>
-<component name="wslogger" filter="s60" long-name="WS Logger">
-<unit bldFile="mw/websrv/webservices/wslogger/group"/>
-</component>
-<component name="wsxml" filter="s60" long-name="WS XML Extensions">
-<unit bldFile="mw/websrv/webservices/wsxml/group"/>
-</component>
-<component name="wsutils" filter="s60" long-name="WS Utils">
-<unit bldFile="mw/websrv/webservices/wsutils/group"/>
-</component>
-<component name="wsfragment" filter="s60" long-name="WS Fragment">
-<unit bldFile="mw/websrv/webservices/wsfragment/group"/>
-</component>
-<component name="wsdescription" filter="s60" long-name="WS Service Description">
-<unit bldFile="mw/websrv/webservices/wsdescription/group"/>
-</component>
-<component name="wsconnection" filter="s60" long-name="WS Service Connection">
-<unit bldFile="mw/websrv/webservices/wsconnection/group"/>
-</component>
-<component name="wsmessages" filter="s60" long-name="WS Messages">
-<unit bldFile="mw/websrv/webservices/wsmessages/group"/>
-</component>
-<component name="wscredentialmanager" filter="s60" long-name="WS Credential Manager">
-<unit bldFile="mw/websrv/webservices/wscredentialmanager/group"/>
-</component>
-<component name="wsframework" filter="s60" long-name="WS Framework">
-<unit bldFile="mw/websrv/webservices/wsframework/group"/>
-</component>
-<component name="wshttpchanneltransportplugin" filter="s60" long-name="WS HTTP Channel Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshttpchanneltransportplugin/group"/>
-</component>
-<component name="wsconnectionagent" filter="s60" long-name="WS Connection Agent">
-<unit bldFile="mw/websrv/webservices/wsconnectionagent/group"/>
-</component>
-<component name="wsprovider" filter="s60" long-name="WS Provider">
-<unit bldFile="mw/websrv/webservices/wsprovider/group"/>
-</component>
-<component name="wshostletconnection" filter="s60" long-name="WS Hostlet Connection">
-<unit bldFile="mw/websrv/webservices/wshostletconnection/group"/>
-</component>
-<component name="wsmanager" filter="s60" long-name="WS Service Manager">
-<unit bldFile="mw/websrv/webservices/wsmanager/group"/>
-</component>
-<component name="wsidentitymanager" filter="s60" long-name="WS Identity Manager">
-<unit bldFile="mw/websrv/webservices/wsidentitymanager/group"/>
-</component>
-<component name="idwsfplugin" filter="s60" long-name="ID-WSF Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/idwsfplugin/group"/>
-</component>
-<component name="wsibasicplugin" filter="s60" long-name="WS-I Basic Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsibasicplugin/group"/>
-</component>
-<component name="wsrestplugin" filter="s60" long-name="WS REST Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsrestplugin/group"/>
-</component>
-<component name="idwsfsecuritymechanism" filter="s60" long-name="ID-WSF Security Mechanism">
-<unit bldFile="mw/websrv/webservices/idwsfsecuritymechanism/group"/>
-</component>
-<component name="wspasswordtransforms" filter="s60" long-name="WS Password Transforms">
-<unit bldFile="mw/websrv/webservices/wspasswordtransforms/group"/>
-</component>
-<component name="wscore" filter="s60" long-name="WS Core Service Manager">
-<unit bldFile="mw/websrv/webservices/wscore/group"/>
-</component>
-<component name="wslocaltransportplugin" filter="s60" long-name="WS Local Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wslocaltransportplugin/group"/>
-</component>
-<component name="wshostlettransportplugin" filter="s60" long-name="WS Hostlet Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshostlettransportplugin/group"/>
-</component>
-<component name="wsstar" filter="s60" long-name="WS Star">
-<!-- can only have one unit. Need to split into separate components or #include from a single bld.inf -->
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarpolicy/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarplugin/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarmessagehandlers/group"/>
-</component>
-<component name="wsoviplugin" filter="s60" long-name="WS Ovi Plugin">
-<unit bldFile="mw/websrv/webservices/wsoviplugin/group"/>
-</component>
-<component name="webservices_build" filter="s60" long-name="Web Services Build">
-<!-- need to split into self-contained components -->
-<unit bldFile="mw/websrv/webservices/group"/>
-</component>
-</collection>
-<collection name="websrv_info" long-name="Web Services Info" level="specific">
-<component name="websrv_bld" filter="s60" long-name="Web Services Build">
-<!-- need to include common .hrh in each unit -->
-<unit bldFile="mw/websrv/group"/>
-</component>
-</collection>
-</block>
-<block name="platformtools" level="generic" long-name="Platform Tools">
-<collection name="gfxconversion" long-name="Graphics Conversion">
-<component name="bmconv_s60" filter="s60" long-name="S60 Bitmap Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/bmconv_s60/group"/>
-</component>
-<component name="mifconv" filter="s60" long-name="Multi Icon File Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/mifconv/group"/>
-</component>
-</collection>
-</block>
-<block name="uitools" level="specific" long-name="UI Tools" levels="compile encode tool if">
-<collection name="uitools_pub" long-name="UI Tools Public Interfaces" level="if">
-<component name="third_party_bitmap_palette_api" long-name="Third Party Bitmap Palette API" filter="s60" class="api">
-<unit bldFile="mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
-</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">
-<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">
-<unit bldFile="mw/uitools/uitools_plat/layout_system_private_api/group"/>
-</component>
-</collection>
-<collection name="cdlcompilertoolkit" long-name="CDL Compiler Toolkit" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompilertoolkit_build" filter="s60" long-name="CDL Compiler Toolkit Build">
-<unit bldFile="mw/uitools/cdlcompilertoolkit/group"/>
-</component>
-</collection>
-<collection name="cdlcompiler" long-name="CDL Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompiler_build" filter="s60" long-name="CDL Compiler Build">
-<unit bldFile="mw/uitools/cdlcompiler/group"/>
-</component>
-</collection>
-<collection name="gfxtools" long-name="Graphics Tools" level="tool">
-<component name="gditools" filter="s60" long-name="GDI Tools" class="PC">
-<unit bldFile="mw/uitools/gfxtools/gditools/group"/>
-</component>
-<component name="color" filter="s60" long-name="Bitmap Colour Palette" class="PC">
-<unit bldFile="mw/uitools/gfxtools/color/group"/>
-</component>
-</collection>
-<collection name="aknlayoutcompiler" long-name="Avkon Layout Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="aknlayoutcompiler_build" filter="s60" long-name="Avkon Layout Compiler Build">
-<unit bldFile="mw/uitools/aknlayoutcompiler/group"/>
-</component>
-</collection>
-<collection name="skincompiler" long-name="Skin Compiler" level="compile">
-<component name="aknskindesccompiler" filter="s60" long-name="Avkon Skin Descriptor Compiler">
-<unit bldFile="mw/uitools/skincompiler/AknSkinDescCompiler/group"/>
-</component>
-</collection>
-<collection name="reszip" long-name="Resource Zip" level="encode">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="reszip_build" filter="s60" long-name="Resource Zip Build">
-<unit bldFile="mw/uitools/reszip/group"/>
-</component>
-</collection>
-<collection name="toollibraries" long-name="Tool Libraries" level="tool"/>
-<collection name="svgtencoder" long-name="SVGT Encoder" level="encode">
-<component name="svgtenc" filter="s60" long-name="Standalone SVGT Encoder" class="PC">
-<unit bldFile="mw/uitools/svgtencoder/svgtenc/standalone/group"/>
-</component>
-</collection>
-</block>
-</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">
-<component name="location_centre_api" long-name="Location Centre API" introduced="^3" filter="s60" class="api">
-<unit bldFile="app/location/loc_plat/location_centre_api/group"/>
-</component>
-</collection>
-<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"/>
-</component>
-<component name="landmarks_ui_addedit_api" long-name="Landmarks UI Add/Edit API" filter="s60" class="api">
-<unit bldFile="app/location/loc_pub/landmarks_ui_addedit_api/group"/>
-</component>
-</collection>
-<collection name="basiclocationinfodisplay" long-name="Basic Location Info Display" level="ui">
-<component name="blid" filter="s60" long-name="Basic Location Info Display Build">
-<unit bldFile="app/location/basiclocationinfodisplay/blid/group"/>
-</component>
-</collection>
-<collection name="landmarksui" long-name="Landmarks UI" level="loc">
-<component name="landmarksui_help" filter="s60" long-name="Landmarks UI Help">
-<unit bldFile="app/location/landmarksui/help/group"/>
-</component>
-<component name="landmarksui_engine" filter="s60" long-name="Landmarks UI Engine">
-<unit bldFile="app/location/landmarksui/engine/group"/>
-</component>
-<component name="uicontrols" filter="s60" long-name="Landmarks UI Controls">
-<unit bldFile="app/location/landmarksui/uicontrols/group"/>
-</component>
-<component name="landmarksui_commonui" filter="s60" long-name="Landmarks Common UI">
-<unit bldFile="app/location/landmarksui/commonui/group"/>
-</component>
-<component name="landmarksui_app" filter="s60" long-name="Landmarks Application">
-<unit bldFile="app/location/landmarksui/app/group"/>
-</component>
-<component name="msgviewer" filter="s60" long-name="Landmarks Message Viewer">
-<unit bldFile="app/location/landmarksui/msgviewer/group"/>
-</component>
-<component name="landmarksui_build" filter="s60" long-name="Landmarks UI Build">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="app/location/landmarksui/group"/>
-</component>
-</collection>
-<collection name="eventsui" long-name="Location Events UI" level="events">
-<component name="eventsui_help" filter="s60" long-name="Events Help">
-<unit bldFile="app/location/eventsui/help/group"/>
-</component>
-<component name="eventsutils" filter="s60" long-name="Events Utils">
-<unit bldFile="app/location/eventsui/eventsutils/group"/>
-</component>
-<component name="eventsengine" filter="s60" long-name="Events Engine">
-<unit bldFile="app/location/eventsui/eventsengine/group"/>
-</component>
-<component name="eventshandlerui" filter="s60" long-name="Events Handler UI">
-<unit bldFile="app/location/eventsui/eventshandlerui/group"/>
-</component>
-<component name="eventseditor" filter="s60" long-name="Events Editor">
-<unit bldFile="app/location/eventsui/eventseditor/group"/>
-</component>
-<component name="eventsmgmtui" filter="s60" long-name="Events Management UI">
-<unit bldFile="app/location/eventsui/eventsmgmtui/group"/>
-</component>
-<component name="eventsui_build" filter="s60" long-name="Events UI Build">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="app/location/eventsui/group"/>
-</component>
-</collection>
-<collection name="locationlandmarksrefappfors60" long-name="Location Landmarks Reference App for S60" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="lmrefapp" filter="s60" long-name="Landmarks Reference Application">
-<unit bldFile="app/location/locationlandmarksrefappfors60/group"/>
-</component>
-</collection>
-<collection name="locationlandmarksuirefapp" long-name="Location Landmarks UI Reference App" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="lmuirefapp" filter="s60" long-name="Landmarks UI Reference Application">
-<unit bldFile="app/location/locationlandmarksuirefapp/group"/>
-</component>
-</collection>
-<collection name="locationsatviewrefapp" long-name="Location Satellite View Reference App" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="satellitereference" filter="s60" long-name="Satellite Info UI Reference Application">
-<unit bldFile="app/location/locationsatviewrefapp/group"/>
-</component>
-</collection>
-<collection name="simpsyconfigurator" long-name="Simulation PSY Configurator" level="ui">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="simpsyui" filter="s60" long-name="Simulation PSY UI">
-<unit bldFile="app/location/simpsyconfigurator/group"/>
-</component>
-</collection>
-<collection name="mapnavproviderrefapp" long-name="Map and Navigation Provider Reference App" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="mapnavproviderrefapp_build" filter="s60" long-name="Map and Navigation Provider Reference Application">
-<unit bldFile="app/location/mapnavproviderrefapp/group"/>
-</component>
-</collection>
-<collection name="locationcentre" long-name="Location Centre" level="loc">
-<component name="lcutils" long-name="Location Centre Utilities" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcutils/group"/>
-</component>
-<component name="lcservice" long-name="Location Centre Service Project" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcservice/group"/>
-</component>
-<component name="lcserver" long-name="Location Centre Server Project" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcserver/group"/>
-</component>
-<component name="lcapp" long-name="Location Centre Application" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcapp/group"/>
-</component>
-<component name="locationcentre_build" filter="s60" long-name="Location Centre Build" introduced="^3">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="app/location/locationcentre/group"/>
-</component>
-</collection>
-</block>
-<block name="mmsharinguis" level="services" long-name="Multimedia Sharing UIs" levels="base plugin if">
-<collection name="mmsharinguis_plat" long-name="Multimedia Sharing UIs Platform Interfaces" level="if">
-<component name="multimedia_sharing_settings_api" long-name="Multimedia Sharing Settings API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_settings_api/group"/>
-</component>
-<component name="multimedia_sharing_resource_api" long-name="Multimedia Sharing Resource API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_resource_api/group"/>
-</component>
-<component name="multimedia_sharing_manager_api" long-name="Multimedia Sharing Manager API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/group"/>
-</component>
-</collection>
-<collection name="mmsharing" long-name="Multimedia Sharing" level="base">
-<component name="mmshavailability" filter="s60" long-name="Multimedia Sharing Availability">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshavailability/group"/>
-</component>
-<component name="mmshindicator" filter="s60" long-name="Multimedia Sharing Indicator">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshindicator/group"/>
-</component>
-<!-- consider putting client and server in the same component -->
-<component name="mmshmanagercli" filter="s60" long-name="Multimedia Sharing Manager Client">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshmanagercli/group" filter="!test"/>
-</component>
-<component name="mmshmanagersrv" filter="s60" long-name="Multimedia Sharing Manager Server">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshmanagersrv/group"/>
-</component>
-<component name="mmshengine" filter="s60" long-name="Multimedia Sharing Engine">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshengine/group"/>
-</component>
-<component name="mmshui" filter="s60" long-name="Multimedia Sharing UI">
-<!-- can only have one unit: need to #include one from the other if it's needed -->
-<unit bldFile="app/mmsharinguis/mmsharing/mmshui/group"/>
-<unit bldFile="app/mmsharinguis/mmsharing/mmshui/help/group"/>
-</component>
-<component name="mmsharing_build" filter="s60" long-name="MM Sharing Build">
-<unit bldFile="app/mmsharinguis/mmsharing/group"/>
-</component>
-</collection>
-<collection name="mmshplugins" long-name="Multimedia Sharing Plugins" level="plugin">
-<component name="mmshaoplugin" filter="s60" long-name="Multimedia Sharing Always Online Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshaoplugin/group"/>
-</component>
-<component name="mmshaiwplugin" filter="s60" long-name="Multimedia Sharing AIW Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshaiwplugin/group"/>
-</component>
-<component name="mmshsipcrplugin" filter="s60" long-name="Multimedia Sharing SIP Client Resolver Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshsipcrplugin/group"/>
-</component>
-<component name="mmshsettingsuiplugin" filter="s60" long-name="Multimedia Sharing Settings UI Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshsettingsuiplugin/group"/>
-</component>
-<component name="mmshwpadapterplugin" filter="s60" long-name="Multimedia Sharing WAP Provisioning Adapter" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshwpadapterplugin/group"/>
-</component>
-</collection>
-<collection name="mmsharinguis_info" long-name="Multimedia Sharing UIs Info" level="if">
-<component name="mmsharinguis_build" filter="s60" long-name="Multimedia Sharing UIs Build">
-<!-- consider distributing to other components -->
-<unit bldFile="app/mmsharinguis/group"/>
-</component>
-</collection>
-</block>
-<block name="phone" level="apps" span="2" long-name="Phone Apps" levels="engine plugin ui app">
-<collection name="phone_plat" long-name="Phone Apps Platform Interfaces" level="app">
-<component name="3d_ringing_tone_enabler_api" long-name="3D Ringing Tone Enabler API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
-</component>
-<component name="telephony_comms_information_api" long-name="Telephony Comms Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_comms_information_api/group"/>
-</component>
-<component name="telephony_information_api" long-name="Telephony Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_information_api/group"/>
-</component>
-<component name="telephony_device_mode_api" long-name="Telephony Device Mode API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_device_mode_api/group"/>
-</component>
-<component name="telephony_remote_party_information_api" long-name="Telephony Remote Party Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_remote_party_information_api/group"/>
-</component>
-<component name="telephony_video_mailbox_settings_api" long-name="Telephony Video Mailbox Settings API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_video_mailbox_settings_api/group"/>
-</component>
-<component name="telephony_configuration_api" long-name="Telephony Configuration API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_configuration_api/group"/>
-</component>
-<component name="telephony_microphone_mute_status_api" long-name="Telephony Microphone Mute Status API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_microphone_mute_status_api/group"/>
-</component>
-<component name="dialer_keypad_api" long-name="Dialer Keypad API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/dialer_keypad_api/group"/>
-</component>
-<component name="telephony_logging_extension_api" long-name="Telephony Logging Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_logging_extension_api/group"/>
-</component>
-<component name="telephony_matching_extension_api" long-name="Telephony Matching Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_matching_extension_api/group"/>
-</component>
-<component name="telephony_bubble_extension_api" long-name="Telephony Bubble Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_bubble_extension_api/group"/>
-</component>
-<component name="telephony_menu_extension_api" long-name="Telephony Menu Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_menu_extension_api/group"/>
-</component>
-<component name="phone_application_commands_api" long-name="Phone Application Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_commands_api/group"/>
-</component>
-<component name="phone_application_voip_commands_api" long-name="Phone Application VOIP Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_voip_commands_api/group"/>
-</component>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_mediator_api/group"/>
-</component>
-<component name="video_telephony_mediator_api" long-name="Video Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/video_telephony_mediator_api/group"/>
-</component>
-</collection>
-<collection name="phoneapp" long-name="Phone Application" level="app">
-<component name="blacklist" filter="s60" long-name="Phone Blacklist Clearing" plugin="Y">
-<unit bldFile="app/phone/phoneapp/blacklist/group"/>
-</component>
-<component name="phoneui" filter="s60" long-name="Phone UI">
-<unit bldFile="app/phone/phoneapp/phoneui/group" filter="!test"/>
-</component>
-<component name="phoneuicontrol" filter="s60" long-name="Phone UI Control">
-<unit bldFile="app/phone/phoneapp/phoneuicontrol/group"/>
-</component>
-<component name="phoneuistates" filter="s60" long-name="Phone UI States">
-<unit bldFile="app/phone/phoneapp/phoneuistates/group"/>
-</component>
-<component name="phoneuiutils" filter="s60" long-name="Phone UI Utils">
-<unit bldFile="app/phone/phoneapp/phoneuiutils/group"/>
-</component>
-<component name="phoneuiview" filter="s60" long-name="Phone UI View">
-<unit bldFile="app/phone/phoneapp/phoneuiview/group"/>
-</component>
-<component name="phoneuivoipextension" filter="s60" long-name="Phone UI VOIP Extension">
-<unit bldFile="app/phone/phoneapp/phoneuivoipextension/group"/>
-</component>
-<component name="silenceactionplugin" filter="s60" long-name="Silence Action Plugin" plugin="Y">
-<unit bldFile="app/phone/phoneapp/silenceactionplugin/group"/>
-</component>
-<component name="phonemediatorcenter" filter="s60" long-name="Phone Mediator Center">
-<unit bldFile="app/phone/phoneapp/phonemediatorcenter/group"/>
-</component>
-</collection>
-<collection name="phoneengine" long-name="Phone Engine" level="engine">
-<component name="phonecntfinder" filter="s60" long-name="Phone Contact Finder">
-<unit bldFile="app/phone/phoneengine/phonecntfinder/group"/>
-</component>
-<component name="audiohandling" filter="s60" long-name="Phone Audio Handling">
-<unit bldFile="app/phone/phoneengine/audiohandling/group"/>
-</component>
-<component name="callhandling" filter="s60" long-name="Call Handling">
-<unit bldFile="app/phone/phoneengine/callhandling/group"/>
-</component>
-<component name="contacthandling" filter="s60" long-name="Phone Contact Handling">
-<unit bldFile="app/phone/phoneengine/contacthandling/group"/>
-</component>
-<component name="loghandling" filter="s60" long-name="Phone Log Handling">
-<unit bldFile="app/phone/phoneengine/loghandling/group"/>
-</component>
-<component name="engineinfo" filter="s60" long-name="Phone Engine Info">
-<unit bldFile="app/phone/phoneengine/engineinfo/group"/>
-</component>
-<component name="phonemodel" filter="s60" long-name="Phone Model">
-<unit bldFile="app/phone/phoneengine/phonemodel/group"/>
-</component>
-<component name="servicehandling" filter="s60" long-name="Phone Service Handling">
-<unit bldFile="app/phone/phoneengine/servicehandling/group"/>
-</component>
-</collection>
-<collection name="phonesettings" long-name="Phone Settings" level="plugin">
-<component name="aiwcallimageplugin" filter="s60" long-name="Call Image AIW Plugin" plugin="Y">
-<unit bldFile="app/phone/phonesettings/aiwcallimageplugin/group"/>
-</component>
-<component name="pslncallimageplugin" filter="s60" long-name="Call Image Personalization Plugin" plugin="Y">
-<unit bldFile="app/phone/phonesettings/pslncallimageplugin/group"/>
-</component>
-</collection>
-<collection name="phoneuis" long-name="Phone UIs" level="ui">
-<component name="dialer" filter="s60" long-name="Dialer">
-<unit bldFile="app/phone/phoneuis/dialer/group" filter="!test"/>
-</component>
-<component name="easydialing" filter="s60" long-name="Easy Dialing Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/phone/phoneuis/easydialing/group"/>
-</component>
-<component name="bubblemanager" filter="s60" long-name="Phone Bubble Manager">
-<unit bldFile="app/phone/phoneuis/bubblemanager/group"/>
-</component>
-<component name="connectutil" filter="s60" long-name="Connection Utility" plugin="Y">
-<unit bldFile="app/phone/phoneuis/connectutil/group"/>
-</component>
-<component name="ussd" filter="s60" long-name="Unstructured Supplementary Services Data">
-<unit bldFile="app/phone/phoneuis/ussd/group"/>
-</component>
-<component name="vmbx" filter="s60" long-name="Voice Mailbox">
-<unit bldFile="app/phone/phoneuis/vmbx/group"/>
-</component>
-<component name="telephonydevicemode" filter="s60" long-name="Telephony Device Mode">
-<unit bldFile="app/phone/phoneuis/telephonydevicemode/group"/>
-</component>
-</collection>
-<collection name="phoneplugins" long-name="Phone Plugins" level="plugin">
-<component name="telbranding" filter="s60" long-name="Tel Branding" introduced="^2" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/telbranding/group"/>
-</component>
-</collection>
-</block>
-<block name="videotelephony" level="apps" long-name="Video Telephony Apps" levels="engine plugin prot ui">
-<collection name="videotelephony_plat" long-name="VT Apps Platform Interfaces" level="ui">
-<component name="video_telephony_control_mediator_api" long-name="Video Telephony Control Mediator API" filter="s60" class="api">
-<unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_control_mediator_api/group"/>
-</component>
-<component name="video_telephony_media_configuration_api" long-name="Video Telephony Media Configuration API" filter="s60" class="api">
-<unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_media_configuration_api/group"/>
-</component>
-</collection>
-<collection name="vtengines" long-name="Video Telephony Engines" level="engine">
-<component name="videoteleng" filter="s60" long-name="Video Telephony Engine">
-<unit bldFile="app/videotelephony/vtengines/videoteleng/Group"/>
-</component>
-<component name="vtmediatorplugin" filter="s60" long-name="VT Mediator Plugin" plugin="Y">
-<unit bldFile="app/videotelephony/vtengines/vtmediatorplugin/group"/>
-</component>
-</collection>
-<collection name="vtuis" long-name="Video Telephony UIs" level="ui">
-<component name="videotelui" filter="s60" long-name="Video Telephony UI">
-<unit bldFile="app/videotelephony/vtuis/videotelui/group"/>
-</component>
-</collection>
-<collection name="vtprotocolplugins" long-name="VT Protocol Plugins" level="plugin">
-<component name="displaysink" filter="s60" long-name="Display Sink" introduced="^2">
-<unit bldFile="app/videotelephony/vtprotocolplugins/DisplaySink/group"/>
-</component>
-<component name="videosource" filter="s60" long-name="Video Source" introduced="^2">
-<unit bldFile="app/videotelephony/vtprotocolplugins/VideoSource/group"/>
-</component>
-</collection>
-<collection name="vtprotocolsstub" long-name="VT Protocols Stub" level="prot">
-<!-- this collection is really a component, move down a directory -->
-<component name="videotelproto" filter="s60" long-name="Video Telephony Protocol">
-<unit bldFile="app/videotelephony/vtprotocolsstub/group" filter="sf_build"/>
-</component>
-</collection>
-</block>
-<block name="iptelephony" level="apps" long-name="IP Telephony" levels="eng plugin util ui">
-<collection name="iptel_plat" long-name="IP Telephony Platform Interfaces" level="ui">
-<component name="richcallsettingsengine_api" long-name="Rich Call Settings Engine API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/richcallsettingsengine_api/group"/>
-</component>
-<component name="cch_client_api" long-name="CCH Client API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/cch_client_api/group"/>
-</component>
-<component name="cch_server_api" long-name="CCH Server API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/cch_server_api/group"/>
-</component>
-<component name="csc_settingsui_api" long-name="CSC Settings UI API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/csc_settingsui_api/group"/>
-</component>
-<component name="vccpropertyhandler_api" long-name="VCC Property Handler API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/vccpropertyhandler_api/group"/>
-</component>
-<component name="vcc_api" long-name="VCC API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/vcc_api/group"/>
-</component>
-</collection>
-<collection name="iptelcommsconfig" long-name="IP Telephony Comms Config" level="ui">
-<component name="cscgsplugin" filter="s60" long-name="CSC GS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/commsconfig/cscgsplugin/group"/>
-</component>
-<component name="cscsipvoipcleanupplugin" filter="s60" long-name="CSC SIP VoIP Cleanup Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/commsconfig/cscsipvoipcleanupplugin/group"/>
-</component>
-<component name="cscengine" filter="s60" long-name="Connection Service Configurator Engine" introduced="^2">
-<unit bldFile="app/iptelephony/commsconfig/cscengine/group"/>
-</component>
-<component name="cscsettingsui" filter="s60" long-name="CSC Settings UI" introduced="^2">
-<unit bldFile="app/iptelephony/commsconfig/cscsettingsui/group"/>
-</component>
-<component name="cscapplicationui" filter="s60" long-name="CSC Application UI" introduced="^2">
-<unit bldFile="app/iptelephony/commsconfig/cscapplicationui/group"/>
-</component>
-<component name="commsconfig_build" filter="s60" long-name="Comms Config Build" introduced="^2">
-<!-- consider distributing this into the above components -->
-<unit bldFile="app/iptelephony/commsconfig/group"/>
-</component>
-</collection>
-<collection name="convergedconnectionhandler" long-name="Converged Connection Handler" level="eng">
-<component name="cchserver" filter="s60" long-name="CCH Server" introduced="^2">
-<unit bldFile="app/iptelephony/convergedconnectionhandler/cchserver/group"/>
-</component>
-<component name="cchclient" filter="s60" long-name="CCH Client" introduced="^2">
-<unit bldFile="app/iptelephony/convergedconnectionhandler/cchclient/group"/>
-</component>
-<component name="cchclientapi" filter="s60" long-name="CCH Client API" introduced="^2">
-<unit bldFile="app/iptelephony/convergedconnectionhandler/cchclientapi/group"/>
-</component>
-<component name="convergedconnectionhandler_build" filter="s60" long-name="CCH Build" introduced="^2">
-<!-- consider distributing this into the above components, or collapse the collection into a single component.
- The latter is a better option since clients and sevrers are rarely separate components -->
-<unit bldFile="app/iptelephony/convergedconnectionhandler/group"/>
-</component>
-</collection>
-<collection name="richcallsettingsengine" long-name="Rich Call Settings Engine" level="eng">
-<component name="rcse2" filter="s60" long-name="Rich Call Settings Engine Build" introduced="^2">
-<unit bldFile="app/iptelephony/richcallsettingsengine/rcse2/group"/>
-</component>
-</collection>
-<collection name="sipvoipprovider" long-name="SIP VoIP Provider" level="plugin">
-<!-- collection is really a component. Should move down a directory -->
-<component name="svp" filter="s60" long-name="SIP VoIP Provider Build" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/sipvoipprovider/group"/>
-</component>
-</collection>
-<collection name="voipplugins" long-name="VoIP Plugins" level="plugin">
-<component name="sipmxresolver" filter="s60" long-name="SIP MX Resolver" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/sipmxresolver/group"/>
-</component>
-<component name="sipconnectionprovider" filter="s60" long-name="SIP Connection Provider" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/sipconnectionprovider/group"/>
-<!-- can only have one unit, can the next be #'included from the above? -->
-<unit bldFile="app/iptelephony/voipplugins/sipconnectionprovider/ipvoicemailengine/group"/>
-</component>
-<component name="ipapputils" filter="s60" long-name="IP App Utils" introduced="^2">
-<unit bldFile="app/iptelephony/voipplugins/ipapputils/group"/>
-</component>
-<component name="voipadapters" filter="s60" long-name="VoIP Adapters" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/voipadapters/group"/>
-</component>
-<component name="accountcreationplugin" filter="s60" long-name="Account Creation Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/accountcreationplugin/group"/>
-</component>
-<component name="dhcppositionprovider" filter="s60" long-name="DHCP Position Provider" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/dhcppositionprovider/group"/>
-</component>
-<component name="svtmatching" filter="s60" long-name="SIP VoIP Telephony Matching" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/svtmatching/group"/>
-</component>
-<component name="svtlogging" filter="s60" long-name="SVT Logging" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/svtlogging/group"/>
-</component>
-<component name="svtcallmenu" filter="s60" long-name="SVT Call Menu" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/svtcallmenu/group"/>
-</component>
-<component name="sipimresolver" filter="s60" long-name="SIP IM Resolver" introduced="^3" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/sipimresolver/group"/>
-</component>
-</collection>
-<collection name="callcontinuity" long-name="Call Continuity" level="util">
-<component name="vccutils" filter="s60" long-name="VCC Utils" introduced="^2">
-<unit bldFile="app/iptelephony/callcontinuity/vccutils/group"/>
-</component>
-<component name="nsmldmvccadapter" filter="s60" long-name="SyncML DM VCC Adapter" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/callcontinuity/nsmldmvccadapter/group"/>
-</component>
-<component name="vccclientprovisioningadapter" filter="s60" long-name="VCC Client Provisioning Adapter" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/callcontinuity/vccclientprovisioningadapter/group"/>
-</component>
-<component name="vccpropertyhandler" filter="s60" long-name="VCC Property Handler" introduced="^2">
-<unit bldFile="app/iptelephony/callcontinuity/vccpropertyhandler/group"/>
-</component>
-<component name="vcchotrigger" filter="s60" long-name="VCC HO Trigger" introduced="^2">
-<unit bldFile="app/iptelephony/callcontinuity/vcchotrigger/group"/>
-</component>
-<component name="vcc" filter="s60" long-name="VoIP Call Continuity" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/callcontinuity/vcc/group"/>
-</component>
-<component name="callcontinuity_build" filter="s60" long-name="Call Continuity Build" introduced="^2">
-<!-- consider distributing this into the above components -->
-<unit bldFile="app/iptelephony/callcontinuity/group"/>
-</component>
-</collection>
-</block>
-<block name="settingsuis" level="services" long-name="Settings UIs" levels="rsc ui">
-<collection name="devmngt_plat" long-name="Settings UIs Platform Interfaces" level="ui">
-<component name="default_app_client_api" long-name="Default App Client API" introduced="^1" filter="s60" class="api">
-<unit bldFile="app/settingsuis/devmngt_plat/default_app_client_api/group"/>
-</component>
-<component name="services_db_api" long-name="Services DB API" introduced="^1" filter="s60" class="api">
-<unit bldFile="app/settingsuis/devmngt_plat/services_db_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="defaultapplicationsettings" long-name="Default Application Settings" level="rsc">
-<component name="services_db" filter="s60" long-name="Services Database" introduced="^1">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/services_db/group"/>
-</component>
-<component name="defaultapplicationsettings_server" filter="s60" long-name="Default Application Server" introduced="^1">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/server/group"/>
-</component>
-<component name="service" filter="s60" long-name="Default Application Service" introduced="^1">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/service/group"/>
-</component>
-<component name="dasgsplugin" filter="s60" long-name="Default Application Settings GS Plugin" introduced="^1" plugin="Y">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/gsplugin/group"/>
-</component>
-<component name="defaultapplicationsettings_build" filter="s60" long-name="Default Application Settings Build" introduced="^1">
-<!-- split the IBYs up into the appropriate components? Make this a ROM component? -->
-<unit bldFile="app/settingsuis/defaultapplicationsettings/group"/>
-</component>
-</collection>
-<collection name="systemswuis" long-name="System SW UIs" level="ui">
-<component name="touchscreencalib" filter="s60" long-name="Touchscreen Calibration" introduced="^1">
-<unit bldFile="app/settingsuis/systemswuis/touchscreencalib/group"/>
-</component>
-</collection>
-</block>
-<block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin app">
-<collection name="contentctrl_plat" long-name="Content Control Daemons Platforn Interfaces" level="app">
-<component name="oma_ds_presync_plugin_api" long-name="OMA DS PreSync Plugin API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/oma_ds_presync_plugin_api/group"/>
-</component>
-<component name="ds_agenda_handler_plugin_api" long-name="DS Agenda Handler Plugin API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_agenda_handler_plugin_api/group"/>
-</component>
-<component name="ds_folder_util_api" long-name="DS Folder Util API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_folder_util_api/group"/>
-</component>
-</collection>
-<collection name="dsdcmoadapter" long-name="Data Sync DCMO Adapter" level="plugin">
-<!-- Component at wrong rank, should move down a directory -->
-<component name="dsdcmoadapter_build" filter="s60" long-name="Data Sync Control DCMO Adapter">
-<unit bldFile="app/contentcontrol/dsdcmoadapter/group"/>
-</component>
-</collection>
-<collection name="omads" long-name="OMA Data Sync" level="app">
-<component name="omadsappui" filter="s60" long-name="OMA DS Application UI">
-<unit bldFile="app/contentcontrol/omads/omadsappui/group"/>
-</component>
-<component name="omadsextensions" filter="s60" long-name="OMA DS Extensions" plugin="Y">
-<unit bldFile="app/contentcontrol/omads/omadsextensions/group"/>
-</component>
-</collection>
-</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">
-<unit bldFile="app/devicecontrol/devicediagnostics/devdiagapp/group"/>
-</component>
-<component name="devdiaggsplugin" filter="s60" long-name="Device Diagnostics GS Plugin" plugin="Y">
-<unit bldFile="app/devicecontrol/devicediagnostics/devdiaggsplugin/group"/>
-</component>
-<component name="diagplugins" filter="s60" long-name="Diagnostics Plugins" plugin="Y">
-<unit bldFile="app/devicecontrol/devicediagnostics/diagplugins/group"/>
-</component>
-<component name="diagsuites" filter="s60" long-name="Diagnostics Suites" plugin="Y">
-<unit bldFile="app/devicecontrol/devicediagnostics/diagsuites/group"/>
-</component>
-<component name="devicediagnostics_build" filter="s60" long-name="Device Diagnostics Build">
-<!-- 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">
-<unit bldFile="app/devicecontrol/omadm/omadmappui/group"/>
-</component>
-<component name="omadmextensions" filter="s60" long-name="OMA DM Extensions" 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">
-<unit bldFile="app/devicecontrol/omadm/dcmo/group"/>
-</component>
-</collection>
-<collection name="pnpmobileservices" long-name="PnP Mobile Services" level="mid">
-<component name="pnpms" filter="s60" long-name="PnP MS">
-<unit bldFile="app/devicecontrol/pnpmobileservices/pnpms/group"/>
-</component>
-</collection>
-<collection name="applicationmanagement" long-name="Application Management" level="app">
-<!-- could this collection be collapsed into a single component and moved down a dir? Do all these need to be noted separately? -->
-<component name="applicationmanagement_options" filter="s60" long-name="AM Install Options">
-<unit bldFile="app/devicecontrol/applicationmanagement/options/group"/>
-</component>
-<component name="applicationmanagement_client" filter="s60" long-name="AM Client">
-<unit bldFile="app/devicecontrol/applicationmanagement/client/group"/>
-</component>
-<component name="applicationmanagement_server" filter="s60" long-name="AM Server">
-<unit bldFile="app/devicecontrol/applicationmanagement/server/group"/>
-</component>
-<component name="rfsplugin" filter="s60" long-name="AM RFS Plugin" plugin="Y">
-<unit bldFile="app/devicecontrol/applicationmanagement/rfsplugin/group"/>
-</component>
-<component name="amadapter2" filter="s60" long-name="AM Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/applicationmanagement/amadapter2/group"/>
-</component>
-<component name="omascomoadapter" filter="s60" long-name="OMA SCOMO Adapter" introduced="^3" plugin="Y">
-<unit bldFile="app/devicecontrol/applicationmanagement/omascomoadapter/group"/>
-</component>
-<component name="applicationmanagement_build" filter="s60" long-name="AM Build">
-<!-- If thes aren't collapsed into one cmp, can all #includes removed from here, and it renamed AM ROM? -->
-<unit bldFile="app/devicecontrol/applicationmanagement/group"/>
-</component>
-</collection>
-<collection name="customization" long-name="DM Customization Adapters" level="mid">
-<component name="dmutils" long-name="DM Utils" filter="s60">
-<unit bldFile="app/devicecontrol/customization/dmutils/bld"/>
-</component>
-<component name="uisettingssrv" filter="s60" long-name="UI Settings Server">
-<unit bldFile="app/devicecontrol/customization/uisettingssrv/bld"/>
-</component>
-<component name="isadapter" filter="s60" long-name="Idle State Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/isadapter/bld"/>
-</component>
-<component name="supadapter" filter="s60" long-name="Startup Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/supadapter/bld"/>
-</component>
-<component name="wallpaperadapter" filter="s60" long-name="Wallpaper Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/wallpaperadapter/bld"/>
-</component>
-<component name="operatorlogoadapter" filter="s60" long-name="Operator Logo Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/operatorlogoadapter/bld"/>
-</component>
-<component name="screensaveradapter" filter="s60" long-name="Screen Saver Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/screensaveradapter/bld"/>
-</component>
-<component name="themesadapter" filter="s60" long-name="Themes Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/themesadapter/bld"/>
-</component>
-<component name="embeddedlinkadapter" filter="s60" long-name="Embedded Link Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/embeddedlinkadapter/bld"/>
-</component>
-<component name="customization_build" filter="s60" long-name="DM Customization Build">
-<!-- If thes aren't collapsed into one cmp, can all #includes removed from here, and it renamed DM Customization ROM? -->
-<unit bldFile="app/devicecontrol/customization/group"/>
-</component>
-</collection>
-<collection name="omacp" long-name="OMA Content Provisioning" level="oma">
-<component name="omacpadapters" filter="s60" long-name="OMA CP Adapters" plugin="Y">
-<unit bldFile="app/devicecontrol/omacp/omacpadapters/group"/>
-</component>
-</collection>
-</block>
-<block name="printing" level="services" long-name="Printing" levels="app">
-<collection name="imageprint" long-name="ImagePrint" level="app">
-<component name="clog" filter="s60" long-name="ImagePrint Logging" introduced="^2">
-<unit bldFile="app/printing/imageprint/clog/group"/>
-</component>
-<component name="imageprintengine" filter="s60" long-name="ImagePrint Engine" introduced="^2">
-<unit bldFile="app/printing/imageprint/imageprintengine/group"/>
-</component>
-<component name="imageprintui" filter="s60" long-name="ImagePrint UI" introduced="^2">
-<unit bldFile="app/printing/imageprint/imageprintui/group"/>
-</component>
-<component name="imageprint_build" filter="s60" long-name="ImagePrint Build" introduced="^2">
-<!-- Need to break the IBY includes into the other components, or remove #includes and make this a ROM component -->
-<unit bldFile="app/printing/imageprint/group"/>
-</component>
-</collection>
-</block>
-<block name="files" level="apps" long-name="File Manager Apps" levels="support apps">
-<collection name="files_plat" long-name="File Manager Apps Platform Interfaces" level="apps">
-<component name="memory_scan_popup_ui_api" long-name="Memory Scan Popup UI API" filter="s60" class="api">
-<unit bldFile="app/files/files_plat/memory_scan_popup_ui_api/group"/>
-</component>
-</collection>
-<collection name="deviceencryption" long-name="Device Encryption" level="support">
-<!-- this is either needs to be broken up into idependent bld.infs, or it's really a component and should move down a directory -->
-<component name="devencnotifplugin" filter="s60" long-name="Device Encryption Notifier Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/files/deviceencryption/devencnotifplugin/group"/>
-</component>
-<component name="devencui" filter="s60" long-name="Device Encryption UI" introduced="^3">
-<unit bldFile="app/files/deviceencryption/devencui/group"/>
-</component>
-<component name="devencdmadapter" filter="s60" long-name="Device Encryption DM Adapter" introduced="^3" plugin="Y">
-<unit bldFile="app/files/deviceencryption/devencdmadapter/group"/>
-</component>
-<component name="devencgsplugin" filter="s60" long-name="Device Encryption GS Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/files/deviceencryption/devencgsplugin/group"/>
-</component>
-<component name="deviceencryption_help" filter="s60" long-name="Device Encryption Help" introduced="^3">
-<unit bldFile="app/files/deviceencryption/help/group"/>
-</component>
-<component name="deviceencryption_build" filter="s60" long-name="Device Encryption Build" introduced="^3">
-<unit bldFile="app/files/deviceencryption/group"/>
-</component>
-</collection>
-<collection name="filemanager" long-name="File Manager" level="apps">
-<!-- this is really a component, should move down a directory -->
-<component name="filemanager_build" filter="s60" long-name="File Manager Build">
-<unit bldFile="app/files/filemanager/group"/>
-</component>
-</collection>
-<collection name="filesystemuis" long-name="File System UIs" level="support">
-<component name="memscaneng" filter="s60" long-name="Memory Scan Server">
-<unit bldFile="app/files/filesystemuis/memscaneng/group"/>
-</component>
-<component name="memstatepopup" filter="s60" long-name="Memory State Popup">
-<unit bldFile="app/files/filesystemuis/memstatepopup/group"/>
-</component>
-</collection>
-</block>
-<block name="utils" level="apps" long-name="Utility Apps" levels="app">
-<collection name="extras" long-name="Extras" level="app">
-<component name="about" filter="s60" long-name="About Application">
-<unit bldFile="app/utils/extras/about/group"/>
-</component>
-<component name="calcsoft" filter="s60" long-name="Calculator Application">
-<unit bldFile="app/utils/extras/calcsoft/group"/>
-</component>
-<component name="converter" filter="s60" long-name="Unit Converter">
-<unit bldFile="app/utils/extras/converter/group"/>
-</component>
-</collection>
-</block>
-<block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
-<collection name="contacts_pub" long-name="Contacts Apps Public Interfaces" level="ui">
-<component name="phonebook_fetch_ui_api" long-name="Phonebook Fetch UI API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_fetch_ui_api/group"/>
-</component>
-<component name="phonebook_data_management_api" long-name="Phonebook Data Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_data_management_api/group"/>
-</component>
-<component name="phonebook_vcard_importexport_api" long-name="Phonebook vCard Import/Export API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_vcard_importexport_api/group"/>
-</component>
-<component name="phonebook_data_addedit_ui_api" long-name="Phonebook Data Add/Edit UI API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_data_addedit_ui_api/group"/>
-</component>
-<component name="phonebook_ui_utilities_api" long-name="Phonebook UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_ui_utilities_api/group"/>
-</component>
-<component name="phonebook_thumbnail_operation_api" long-name="Phonebook Thumbnail Operation API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_thumbnail_operation_api/group"/>
-</component>
-<component name="speed_dial_utility_control_api" long-name="Speed Dial Utility Control API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/speed_dial_utility_control_api/group"/>
-</component>
-</collection>
-<collection name="contacts_plat" long-name="Contacts Apps Platform Interfaces" level="ui">
-<component name="virtual_phonebook_store_api" long-name="Virtual Phonebook Store API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_store_api/group"/>
-</component>
-<component name="virtual_phonebook_sim_services_api" long-name="Virtual Phonebook SIM Services API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_sim_services_api/group"/>
-</component>
-<component name="virtual_phonebook_configuration_api" long-name="Virtual Phonebook Configuration API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_configuration_api/group"/>
-</component>
-<component name="virtual_phonebook_copy_policy_api" long-name="Virtual Phonebook Copy Policy API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_copy_policy_api/group"/>
-</component>
-<component name="virtual_phonebook_policy_api" long-name="Virtual Phonebook Policy API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_policy_api/group"/>
-</component>
-<component name="virtual_phonebook_engine_api" long-name="Virtual Phonebook Engine API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_engine_api/group"/>
-</component>
-<component name="virtual_phonebook_migration_support_api" long-name="Virtual Phonebook Migration Support API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_migration_support_api/group"/>
-</component>
-<component name="virtual_phonebook_view_definition_api" long-name="Virtual Phonebook View Definition API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_view_definition_api/group"/>
-</component>
-<component name="virtual_phonebook_vcard_api" long-name="Virtual Phonebook vCard API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_vcard_api/group"/>
-</component>
-<component name="cms_contactor_api" long-name="CMS Contactor API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/cms_contactor_api/group"/>
-</component>
-<component name="contactpresence_api" long-name="Contact Presence API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/contactpresence_api/group"/>
-</component>
-<component name="presence_cache_api" long-name="Presence Cache API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/presence_cache_api/group"/>
-</component>
-<component name="phonebook_internal_common_api" long-name="Phonebook Internal Common API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_common_api/group"/>
-</component>
-<component name="phonebook_internal_appfw_api" long-name="Phonebook Internal App Framework API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_appfw_api/group"/>
-</component>
-<component name="phonebook_internal_data_management_api" long-name="Phonebook Internal Data Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_data_management_api/group"/>
-</component>
-<component name="phonebook_2_xsp_extension_manager_api" long-name="Phonebook 2 xSP Extension Manager API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_xsp_extension_manager_api/group"/>
-</component>
-<component name="phonebook_ui_controls_api" long-name="Phonebook UI Controls API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_ui_controls_api/group"/>
-</component>
-<component name="phonebook_2_image_management_api" long-name="Phonebook 2 Image Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_image_management_api/group"/>
-</component>
-<component name="phonebook_extension_api" long-name="Phonebook Extension API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_extension_api/group"/>
-</component>
-<component name="phonebook_public_constants_api" long-name="Phonebook Public Constants API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_public_constants_api/group"/>
-</component>
-<component name="phonebook_internal_ui_utilities_api" long-name="Phonebook Internal UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_ui_utilities_api/group"/>
-</component>
-<component name="logs_engine_api_extensions" long-name="Logs Engine API Extensions" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/logs_engine_api_extensions/group"/>
-</component>
-<component name="phonebook_thumbnails_api" long-name="Phonebook Thumbnails API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_thumbnails_api/group"/>
-</component>
-<component name="phonebook_2_icon_api" long-name="Phonebook 2 Icon API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_icon_api/group"/>
-</component>
-<component name="phonebook_engine_extension_api" long-name="Phonebook Engine Extension API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_engine_extension_api/group"/>
-</component>
-<component name="phonebook_2_store_configuration_management_api" long-name="Phonebook 2 Store Configuration Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_store_configuration_management_api/group"/>
-</component>
-<component name="logs_ui_command_line_api" long-name="Logs UI Command Line API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/logs_ui_command_line_api/group"/>
-</component>
-<component name="speed_dial_dialogs_api" long-name="Speed Dial Dialogs API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/speed_dial_dialogs_api/group"/>
-</component>
-<component name="phonebook_2_xsp_view_activation_api" long-name="Phonebook 2 xSP View Activation API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_xsp_view_activation_api/group"/>
-</component>
-<component name="logs_timers_api" long-name="Logs Timers API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/logs_timers_api/group"/>
-</component>
-<component name="phonebook_2_ui_extension_definition_api" long-name="Phonebook 2 UI Extension Definition API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_definition_api/group"/>
-</component>
-<component name="phonebook_2_common_ui_api" long-name="Phonebook 2 Common UI API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_common_ui_api/group"/>
-</component>
-<component name="phonebook_2_ui_extension_api" long-name="Phonebook 2 UI Extension API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_api/group"/>
-</component>
-<component name="phonebook_2_store_property_api" long-name="Phonebook 2 Store Property API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_store_property_api/group"/>
-</component>
-<component name="phonebook_2_ui_extension_plugin_api" long-name="Phonebook 2 UI Extension Plug-In API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_plugin_api/group"/>
-</component>
-<component name="phonebook_2_ui_controls_api" long-name="Phonebook 2 UI Controls API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_controls_api/group"/>
-</component>
-<component name="phonebook_2_thin_ui_extension_plugin_api" long-name="Phonebook 2 Thin UI Extension Plugin API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_thin_ui_extension_plugin_api/group"/>
-</component>
-<component name="phonebook_2_commands_api" long-name="Phonebook 2 Commands API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_commands_api/group"/>
-</component>
-<component name="phonebook_2_presentation_api" long-name="Phonebook 2 Presentation API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_presentation_api/group"/>
-</component>
-<component name="phonebook_2_ui_utilities_api" long-name="Phonebook 2 UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_utilities_api/group"/>
-</component>
-<component name="cca_launch_api" long-name="CCA Launch API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/cca_launch_api/group"/>
-</component>
-<component name="cca_view_plugin_api" long-name="CCA View Plugin API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/cca_view_plugin_api/group"/>
-</component>
-<component name="predictivesearch_client_api" long-name="Predictive Search Client API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_client_api/group"/>
-</component>
-<component name="predictivesearch_utils_api" long-name="Predictive Search Utils API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_utils_api/group"/>
-</component>
-<component name="predictivesearch_adapters_api" long-name="Predictive Search Adapters API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_adapters_api/group"/>
-</component>
-<component name="predictivesearch_algorithm_api" long-name="Predictive Search Algorithm API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_algorithm_api/group"/>
-</component>
-<component name="phonebook_2_rcl_api" long-name="Phonebook 2 RCL API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_rcl_api/group"/>
-</component>
-</collection>
-<collection name="contactextensions" long-name="Contacts Extensions" level="services">
-<component name="predefinedcontacts" filter="s60" long-name="Predefined Contacts">
-<unit bldFile="app/contacts/contactextensions/predefinedcontacts/group"/>
-</component>
-</collection>
-<collection name="logsui" long-name="Logs UI" level="ui">
-<component name="logsui_build" filter="s60" long-name="Logs UI Build">
-<!-- component at too high a rank, should move down one directory -->
-<unit bldFile="app/contacts/logsui/group"/>
-</component>
-</collection>
-<collection name="phonebookui" long-name="Phonebook UI" level="ui">
-<component name="phonebook" filter="s60" long-name="Phonebook">
-<unit bldFile="app/contacts/phonebookui/phonebook/group"/>
-</component>
-<component name="speeddial" filter="s60" long-name="Speed Dial">
-<unit bldFile="app/contacts/phonebookui/speeddial/group"/>
-</component>
-<component name="phonebook2" filter="s60" long-name="Phone Book 2">
-<unit bldFile="app/contacts/phonebookui/phonebook2/group"/>
-</component>
-</collection>
-<collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
-<component name="cntfindplugin" filter="s60" long-name="Contacts Find Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntfindplugin/group"/>
-</component>
-<component name="cntsortplugin" filter="s60" long-name="Contacts Sort Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntsortplugin/group"/>
-</component>
-<component name="virtualphonebook" filter="s60" long-name="Virtual Phonebook" introduced="^2">
-<unit bldFile="app/contacts/phonebookengines/virtualphonebook/group"/>
-</component>
-<component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
-<unit bldFile="app/contacts/phonebookengines/contactsmodel/groupsql" mrp="app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
-</component>
-</collection>
-<collection name="pimprotocols" long-name="PIM Protocols" level="services">
-<component name="phonebooksync" long-name="Phonebook Sync" purpose="optional" plugin="Y">
-<unit bldFile="app/contacts/pimprotocols/phonebooksync/group" mrp="app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
-</component>
-<component name="pbap" long-name="Bluetooth PBAP" introduced="9.2" purpose="optional">
-<unit bldFile="app/contacts/pimprotocols/pbap/group" mrp="app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
-</component>
-</collection>
-<collection name="ccservices" long-name="Contacts Centric Services" level="services">
-<component name="cmsservices" filter="s60" long-name="Contact Method Selector Services" introduced="^2">
-<unit bldFile="app/contacts/ccservices/cmsservices/group"/>
-</component>
-</collection>
-<collection name="presencecache" long-name="Presence Cache" level="support">
-<component name="presencecacheutils" filter="s60" long-name="Presence Cache Utils" introduced="^2" class="placeholder">
-<!-- <unit bldFile="presencecache/presencecacheutils/group"/> -->
-</component>
-<component name="presencecacheserver2" filter="s60" long-name="Presence Cache Server" introduced="^2" class="placeholder">
-<!-- <unit bldFile="presencecache/presencecacheserver2/group"/> -->
-</component>
-<component name="presencecacheclient2" filter="s60" long-name="Presence Cache Client" introduced="^2" class="placeholder">
-<!-- <unit bldFile="presencecache/presencecacheclient2/group"/> -->
-</component>
-<component name="presencecache_build" filter="s60" long-name="Presence Cache Build" introduced="^2">
-<!-- should divide this bld.inf into the other components, or collapse them into a single component -->
-<unit bldFile="app/contacts/presencecache/group"/>
-</component>
-</collection>
-<collection name="predictivesearch" long-name="Predictive Search" level="support">
-<component name="pcsutils" filter="s60" long-name="PCS Utils" introduced="^2">
-<unit bldFile="app/contacts/predictivesearch/pcsutils/group"/>
-</component>
-<component name="pcsserverclientapi" filter="s60" long-name="PCS Server Client API" introduced="^2">
-<unit bldFile="app/contacts/predictivesearch/pcsserverclientapi/group"/>
-</component>
-<component name="pcsserver" filter="s60" long-name="PCS Server" introduced="^2">
-<unit bldFile="app/contacts/predictivesearch/pcsserver/group"/>
-</component>
-<component name="pcsadapters" filter="s60" long-name="PCS Adapters" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/predictivesearch/adapters/contacts/group"/>
-</component>
-<component name="pcsalgorithm" filter="s60" long-name="PCS Algorithm" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/predictivesearch/pcsalgorithm/group"/>
-</component>
-<component name="predictivesearch_build" filter="s60" long-name="Predictive Search Build" introduced="^2">
-<!-- need to remove #includes from bld.inf and rename as Predictive Search ROM -->
-<unit bldFile="app/contacts/predictivesearch/group"/>
-</component>
-</collection>
-<collection name="contacts_info" long-name="Contacts Apps Info" level="ui">
-<component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="organizer" level="apps" span="2" long-name="Organizer Application Suite" levels="support services engine ui app">
-<collection name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" level="app">
-<component name="meeting_request_mailbox_utilities_api" long-name="Meeting Request Mailbox Utilities API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_mailbox_utilities_api/group"/>
-</component>
-<component name="meeting_request_uids_api" long-name="Meeting Request UIDs API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_uids_api/group"/>
-</component>
-<component name="calendar_exporter_api" long-name="Calendar Exporter API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_exporter_api/group"/>
-</component>
-<component name="agenda_versit_2_api" long-name="Agenda Versit 2 API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/agenda_versit_2_api/group"/>
-</component>
-<component name="calendar_importer_api" long-name="Calendar Importer API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_importer_api/group"/>
-</component>
-<component name="calendar_launcher_api" long-name="Calendar Launcher API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_launcher_api/group"/>
-</component>
-<component name="calendar_common_utils_api" long-name="Calendar Common Utils API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_common_utils_api/group"/>
-</component>
-<component name="searchfw_launcher_api" long-name="Search Framework Launcher API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/searchfw_launcher_api/group"/>
-</component>
-<component name="alarm_const_api" long-name="Alarm Const API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/alarm_const_api/group"/>
-</component>
-<component name="alarm_ui_external_control_api" long-name="Alarm UI External Control API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/alarm_ui_external_control_api/group"/>
-</component>
-<component name="calendar_settings_keys_api" long-name="Calendar Settings Keys API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_settings_keys_api/group"/>
-</component>
-<component name="calendar_tones_settings_keys_api" long-name="Calendar Tones Settings Keys API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_tones_settings_keys_api/group"/>
-</component>
-<component name="clock_settings_api" long-name="Clock Settings API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/clock_settings_api/group"/>
-</component>
-<component name="common_alarm_editor_api" long-name="Common Alarm Editor API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/common_alarm_editor_api/group"/>
-</component>
-<component name="alarm_ui_secondary_display_api" long-name="Alarm UI Secondary Display API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/alarm_ui_secondary_display_api/group"/>
-</component>
-<component name="searchui_launcher_api" long-name="Search UI Launcher API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/searchui_launcher_api/group"/>
-</component>
-<component name="agenda_entry_ui_api" long-name="Agenda Entry UI API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/agenda_entry_ui_api/group"/>
-</component>
-<component name="meeting_request_utillities_api" long-name="Meeting Request Utillities API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_utillities_api/group"/>
-</component>
-<component name="meeting_request_viewer_api" long-name="Meeting Request Viewer API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_viewer_api/group"/>
-</component>
-<component name="calendar_custamization_api" long-name="Calendar Customization API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_custamization_api/group"/>
-</component>
-</collection>
-<collection name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" level="app">
-<component name="calendar_interim_utils2_api" long-name="Calendar Interim Utils 2 API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_pub/calendar_interim_utils2_api/group"/>
-</component>
-<component name="notepad_library_api" long-name="Notepad Library API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_pub/notepad_library_api/group"/>
-</component>
-</collection>
-<collection name="alarmengines" long-name="Alarm Engines" level="engine">
-<component name="missedalarmstore" filter="s60" long-name="Missed Alarm Store">
-<unit bldFile="app/organizer/alarmengines/missedalarmstore/group"/>
-</component>
-</collection>
-<collection name="calendarengines" long-name="Calendar Engines" level="engine">
-<component name="versit2" filter="s60" long-name="Versit 2 iCal Parser" introduced="9.2">
-<unit bldFile="app/organizer/calendarengines/versit2/group"/>
-</component>
-<component name="agnversit2" filter="s60" long-name="Versit 2 Agenda Interface" introduced="9.2" plugin="Y">
-<unit bldFile="app/organizer/calendarengines/agnversit2/group"/>
-</component>
-<component name="caleninterimutils" filter="s60" long-name="Calendar Interim Utils" introduced="9.1">
-<unit bldFile="app/organizer/calendarengines/caleninterimutils/group"/>
-</component>
-<component name="calenimp" filter="s60" long-name="Calendar Import Wrapper" introduced="7.0s">
-<unit bldFile="app/organizer/calendarengines/calenimp/group"/>
-</component>
-<component name="calenlauncher" filter="s60" long-name="Calendar Launcher">
-<unit bldFile="app/organizer/calendarengines/calenlauncher/group"/>
-</component>
-<component name="caldavsrv" filter="sf_build" long-name="CalDAV Server" introduced="^3">
-<unit bldFile="app/organizer/calendarengines/caldav/group"/>
-</component>
-</collection>
-<collection name="meetingrequestengines" long-name="Meeting Request Engines" level="engine">
-<component name="mrmailbox" filter="s60" long-name="Meeting Request Mailbox">
-<unit bldFile="app/organizer/meetingrequestengines/mrmailbox/group"/>
-</component>
-<component name="mrmailboxutils" filter="s60" long-name="Meeting Request Mailbox Utils" plugin="Y">
-<unit bldFile="app/organizer/meetingrequestengines/mrmailboxutils/group"/>
-</component>
-</collection>
-<collection name="searchfw" long-name="Search Framework" level="services">
-<!-- Uncomment all units when configuration is in place. All currently #included from searchfw_build, which should be removed at the same time. -->
-<component name="coresearchfw" filter="s60" long-name="Core Search Framework" introduced="^1" class="placeholder">
-<!--<unit bldFile="searchfw/coresearchfw/group"/>-->
-</component>
-<component name="searchfw_plugins" filter="s60" long-name="Search Plugins" introduced="^1" plugin="Y" class="placeholder">
-<!--<unit bldFile="searchfw/plugins/group"/>-->
-</component>
-<component name="searchfw_build" filter="s60" long-name="Search Framework Build" introduced="^1">
-<unit bldFile="app/organizer/searchfw/group"/>
-</component>
-</collection>
-<collection name="alarmui" long-name="Alarm UI" level="app">
-<!-- collection is really a component, should move down a directory -->
-<component name="alarmui_build" filter="s60" long-name="Alarm UI Build">
-<unit bldFile="app/organizer/alarmui/group"/>
-</component>
-</collection>
-<collection name="calendarui" long-name="Calendar UI" level="ui">
-<component name="calendarui_help" filter="s60" long-name="Calendar UI Help">
-<unit bldFile="app/organizer/calendarui/help/group"/>
-</component>
-<component name="commonutils" filter="s60" long-name="Calendar Common Utils">
-<unit bldFile="app/organizer/calendarui/commonutils/group"/>
-</component>
-<component name="globaldata" filter="s60" long-name="Calendar Global Data">
-<unit bldFile="app/organizer/calendarui/globaldata/group"/>
-</component>
-<component name="settings" filter="s60" long-name="Calendar Settings">
-<!-- these should be merged into a single bld.inf or split into two components -->
-<unit bldFile="app/organizer/calendarui/settings/gsplugin/group"/>
-<unit bldFile="app/organizer/calendarui/settings/settingsui/group"/>
-</component>
-<component name="customisation" filter="s60" long-name="Calendar Customisation">
-<unit bldFile="app/organizer/calendarui/customisation/group"/>
-</component>
-<component name="customisationmanager" filter="s60" long-name="Calendar Customisation Manager">
-<unit bldFile="app/organizer/calendarui/customisationmanager/group"/>
-</component>
-<component name="multicaluidialog" filter="s60" long-name="Multi-Calendar UI Dialog" introduced="^3">
-<unit bldFile="app/organizer/calendarui/multicaluidialog/group"/>
-</component>
-<component name="views" filter="s60" long-name="Calendar Views">
-<unit bldFile="app/organizer/calendarui/views/group"/>
-</component>
-<component name="calendarui_controller" filter="s60" long-name="Calendar Controller">
-<unit bldFile="app/organizer/calendarui/controller/group"/>
-</component>
-<component name="calendarui_editors" filter="s60" long-name="Calendar Editors">
-<unit bldFile="app/organizer/calendarui/editors/group"/>
-</component>
-<component name="calendarui_application" filter="s60" long-name="Calendar Application">
-<unit bldFile="app/organizer/calendarui/application/group"/>
-</component>
-<component name="missedalarmindicatorplugin" filter="s60" long-name="Missed Alarm Indicator Plugin" plugin="Y">
-<unit bldFile="app/organizer/calendarui/missedalarmindicatorplugin/group"/>
-</component>
-<component name="calendarui_server" filter="s60" long-name="Calendar Server">
-<!-- these should be merged into a single bld.inf or split into two components -->
-<unit bldFile="app/organizer/calendarui/server/calensvr/group"/>
-<unit bldFile="app/organizer/calendarui/server/calensvrclient/group"/>
-</component>
-<component name="regionalplugins" filter="s60" long-name="Calendar Regional Plugins" plugin="Y">
-<!-- these should be merged into a single bld.inf or split into four components -->
-<unit bldFile="app/organizer/calendarui/regionalplugins/calenregionalutil/group"/>
-<unit bldFile="app/organizer/calendarui/regionalplugins/lunarchinese/group"/>
-<unit bldFile="app/organizer/calendarui/regionalplugins/lunarvietnamese/group"/>
-<unit bldFile="app/organizer/calendarui/regionalplugins/thai/group"/>
-</component>
-<component name="calenaiwprovider" filter="s60" long-name="Calendar AIW Proivder" introduced="^3" plugin="Y">
-<unit bldFile="app/organizer/calendarui/calenaiwprovider/group"/>
-</component>
-<component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y">
-<unit bldFile="app/organizer/calendarui/caldav/group"/>
-</component>
-<component name="calendarui_build" filter="s60" long-name="Calendar UI Build">
-<!-- split contents into separate components -->
-<unit bldFile="app/organizer/calendarui/group"/>
-</component>
-</collection>
-<collection name="meetingui" long-name="Meeting UI" level="ui">
-<component name="attendeeview" filter="s60" long-name="Attendee View">
-<unit bldFile="app/organizer/meetingui/attendeeview/group"/>
-</component>
-<component name="agnentryui" filter="s60" long-name="Agenda Entry UI" plugin="Y">
-<unit bldFile="app/organizer/meetingui/agnentryui/group"/>
-</component>
-<component name="meetingrequestutils" filter="s60" long-name="Meeting Request Utils">
-<unit bldFile="app/organizer/meetingui/meetingrequestutils/group"/>
-</component>
-<component name="meetingrequestviewers" filter="s60" long-name="Meeting Request Viewers" plugin="Y">
-<unit bldFile="app/organizer/meetingui/meetingrequestviewers/group"/>
-</component>
-<component name="meetingui_build" filter="s60" long-name="Meeting UI Build">
-<!-- split contents into separate components -->
-<unit bldFile="app/organizer/meetingui/group"/>
-</component>
-</collection>
-<collection name="clock2" long-name="Clock" level="app">
-<component name="clockengines" filter="s60" long-name="Clock Engines">
-<unit bldFile="app/organizer/clock2/clockengines/group"/>
-</component>
-<component name="clockui" filter="s60" long-name="Clock UI">
-<unit bldFile="app/organizer/clock2/clockui/group"/>
-</component>
-<component name="clock2_help" filter="s60" long-name="Clock Help">
-<unit bldFile="app/organizer/clock2/help/group"/>
-</component>
-<component name="clock2_build" filter="s60" long-name="Clock Build">
-<!-- split contents into separate components, or just make this one component -->
-<unit bldFile="app/organizer/clock2/group"/>
-</component>
-</collection>
-<collection name="notepad" long-name="Notepad" level="ui">
-<component name="notepad_help" filter="s60" long-name="Notepad Help">
-<unit bldFile="app/organizer/notepad/help/group"/>
-</component>
-<component name="notepad1" filter="s60" long-name="Notepad Application 1">
-<unit bldFile="app/organizer/notepad/notepad1/group"/>
-</component>
-<component name="txtrecog" filter="s60" long-name="Text Recognizer" plugin="Y">
-<unit bldFile="app/organizer/notepad/txtrecog/group"/>
-</component>
-</collection>
-<collection name="searchui" long-name="Search UI" level="app">
-<!-- consider making this a single component -->
-<!-- Uncomment all units when configuration is in place. All currently #included from searchui_build, which should be removed at the same time. -->
-<component name="searchui_help" filter="s60" long-name="Search UI Help" class="placeholder">
-<!--<unit bldFile="searchui/help/group"/>-->
-</component>
-<component name="searchapp" filter="s60" long-name="Search Application" class="placeholder">
-<!--<unit bldFile="searchui/searchapp/group"/>-->
-</component>
-<component name="searchui_build" filter="s60" long-name="Search UI Build">
-<unit bldFile="app/organizer/searchui/group"/>
-</component>
-</collection>
-<collection name="pimappservices" long-name="PIM Application Services" level="services">
-<component name="calendar" long-name="Calendar" introduced="9.2" purpose="optional">
-<unit bldFile="app/organizer/pimappservices/calendar/group" mrp="app/organizer/pimappservices/calendar/group/app-engines_calendar.mrp" version="2"/>
-</component>
-<component name="calendarvcalplugin" long-name="Calendar vCal Plugin" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="app/organizer/pimappservices/calendarvcalplugin/group" mrp="app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp" version="2"/>
-</component>
-<component name="appenginesdocs" long-name="Application Engines Documentation" purpose="development" class="doc">
-<unit mrp="app/organizer/pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
-</component>
-</collection>
-<collection name="pimappsupport" long-name="PIM Application Support" level="support">
-<component name="vcardandvcal" long-name="vCard and vCal" introduced="ER5" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/vcardandvcal/group" mrp="app/organizer/pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
-</component>
-<component name="chinesecalendarconverter" long-name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
-</component>
-<component name="chinesecalendaralg" long-name="Chinese Calendar Algorithm" introduced="S^3" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendaralg/group" mrp="app/organizer/pimappsupport/chinesecalendaralg/group/app-services_chinesecalendaralgorithm.mrp"/>
-</component>
-</collection>
-<collection name="organizer_info" long-name="Organizer Application Suite Info" level="app">
-<component name="organizer_metadata" long-name="Organizer Application Suite Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="mail eng base ui">
-<collection name="msg_pub" long-name="Messaging Apps Public APIs" level="ui">
-<component name="messaging_integration_api" long-name="Messaging Integration API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/messaging_integration_api/group"/>
-</component>
-<component name="plugin_bio_control_api" long-name="Plug-in Bio Control API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/plugin_bio_control_api/group"/>
-</component>
-<component name="mms_client_mtm_api" long-name="MMS Client MTM API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/mms_client_mtm_api/group"/>
-</component>
-<component name="open_new_message_notification_api" long-name="Open New Message Notification API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/open_new_message_notification_api/group"/>
-</component>
-<component name="messaging_editor_constants_api" long-name="Messaging Editor Constants API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/messaging_editor_constants_api/group"/>
-</component>
-</collection>
-<collection name="msg_plat" long-name="Messaging Apps Platform APIs" level="ui">
-<component name="smil_player_launch_api" long-name="SMIL Player Launch API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/smil_player_launch_api/group"/>
-</component>
-<component name="messaging_media_resolver_api" long-name="Messaging Media Resolver API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/messaging_media_resolver_api/group"/>
-</component>
-<component name="smil_engine_api" long-name="SMIL Engine API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/smil_engine_api/group"/>
-</component>
-<component name="mms_server_settings_api" long-name="MMS Server Settings API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_server_settings_api/group"/>
-</component>
-<component name="new_contacts_note_secondary_display_api" long-name="New Contacts Note Secondary Display API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contacts_note_secondary_display_api/group"/>
-</component>
-<component name="messaging_center_ui_utilities_api" long-name="Messaging Center UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/messaging_center_ui_utilities_api/group"/>
-</component>
-<component name="internet_mail_mtm_ui_api" long-name="Internet Mail MTM UI API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/internet_mail_mtm_ui_api/group"/>
-</component>
-<component name="messaging_editor_api" long-name="Messaging Editor API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/messaging_editor_api/group"/>
-</component>
-<component name="email_domain_utilities_api" long-name="Email Domain Utilities API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/email_domain_utilities_api/group"/>
-</component>
-<component name="smil_transition_api" long-name="SMIL Transition API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/smil_transition_api/group"/>
-</component>
-<component name="new_contacts_note_status_api" long-name="New Contacts Note Status API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contacts_note_status_api/group"/>
-</component>
-<component name="unified_editor_video_conversion_api" long-name="Unified Editor Video Conversion API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/unified_editor_video_conversion_api/group"/>
-</component>
-<component name="mms_conformance_api" long-name="MMS Conformance API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_conformance_api/group"/>
-</component>
-<component name="new_contacts_note_variables_api" long-name="New Contacts Note Variables API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contacts_note_variables_api/group"/>
-</component>
-<component name="new_message_notification_api" long-name="New Message Notification API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_message_notification_api/group"/>
-</component>
-<component name="mms_application_api" long-name="MMS Application API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_application_api/group"/>
-</component>
-<component name="mms_engine_settings_api" long-name="MMS Engine Settings API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_engine_settings_api/group"/>
-</component>
-<component name="mms_codec_client_api" long-name="MMS Codec Client API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_codec_client_api/group"/>
-</component>
-<component name="send_ui_meeting_request_api" long-name="Send UI Meeting Request API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/send_ui_meeting_request_api/group"/>
-</component>
-<component name="new_contact_notes_extended_api" long-name="New Contact Notes Extended API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contact_notes_extended_api/group"/>
-</component>
-<component name="mail_ui_constants_api" long-name="Mail UI Constants API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mail_ui_constants_api/group"/>
-</component>
-<component name="sim_dialog_launch_api" long-name="SIM Dialog Launch API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/sim_dialog_launch_api/group"/>
-</component>
-</collection>
-<collection name="mobilemessaging" long-name="Mobile Messaging" level="ui">
-<component name="audiomsg" filter="s60" long-name="Audio Message">
-<unit bldFile="app/messaging/mobilemessaging/audiomsg/group"/>
-</component>
-<component name="msgmedia" filter="s60" long-name="Message Media">
-<unit bldFile="app/messaging/mobilemessaging/msgmedia/group"/>
-</component>
-<component name="unieditor" filter="s60" long-name="Unified Editor">
-<unit bldFile="app/messaging/mobilemessaging/unieditor/group"/>
-</component>
-<component name="mmsui" filter="s60" long-name="MMS UI">
-<unit bldFile="app/messaging/mobilemessaging/mmsui/group"/>
-</component>
-<component name="postcard" filter="s60" long-name="Postcard">
-<unit bldFile="app/messaging/mobilemessaging/postcard/group"/>
-</component>
-<component name="smilui" filter="s60" long-name="SMIL UI">
-<unit bldFile="app/messaging/mobilemessaging/smilui/group"/>
-</component>
-<component name="smum" filter="s60" long-name="SMS UI MTM and UI Data MTM" plugin="Y">
-<unit bldFile="app/messaging/mobilemessaging/smum/group"/>
-</component>
-<component name="smsui" filter="s60" long-name="SMS UI">
-<unit bldFile="app/messaging/mobilemessaging/smsui/group"/>
-</component>
-<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/mobilemessaging/smsmtm/group" mrp="app/messaging/mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
-</component>
-</collection>
-<collection name="mmsengine" long-name="MMS Engine" level="eng">
-<component name="mmsconninit" filter="s60" long-name="MMS Connection Initiator" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsconninit/bld"/> -->
-</component>
-<component name="genutils" filter="s60" long-name="General Utils" class="placeholder">
-<!-- <unit bldFile="mmsengine/genutils/bld"/> -->
-</component>
-<component name="mmsserversettings" filter="s60" long-name="MMS Server Settings" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserversettings/bld"/> -->
-</component>
-<component name="mmsmessage" filter="s60" long-name="MMS Message" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsmessage/bld"/> -->
-</component>
-<component name="mmshttptransport" filter="s60" long-name="MMS HTTP Transport" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmshttptransport/bld"/> -->
-</component>
-<component name="mmscodec" filter="s60" long-name="MMS Codec" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodec/bld"/> -->
-</component>
-<component name="mmsserver" filter="s60" long-name="MMS Server" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserver/bld"/> -->
-</component>
-<component name="clientmtm" filter="s60" long-name="MMS Client MTM" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/clientmtm/bld"/> -->
-</component>
-<component name="mmswatcher" filter="s60" long-name="MMS Watcher" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmswatcher/bld"/> -->
-</component>
-<component name="mmspushhandler" filter="s60" long-name="MMS Push Handler" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmspushhandler/bld"/> -->
-</component>
-<component name="applicationadapter" filter="s60" long-name="MMS Application Adapter" class="placeholder">
-<!-- <unit bldFile="mmsengine/applicationadapter/bld"/> -->
-</component>
-<component name="mmscodecclient" filter="s60" long-name="MMS Codec Client" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodecclient/bld"/> -->
-</component>
-<component name="mmssettings" long-name="MMS Settings" introduced="9.2" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmssettings/group" mrp="app/messaging/mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
-</component>
-<component name="mmsconf" long-name="MMS Configuration" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmsconf" mrp="app/messaging/mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
-</component>
-<component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
-<!-- this bld.inf should be broken up into the individual other components -->
-<unit bldFile="app/messaging/mmsengine/group"/>
-</component>
-</collection>
-<collection name="messagingappbase" long-name="Messaging App Base" level="base">
-<component name="msgavkon" filter="s60" long-name="Messaging Avkon UI">
-<unit bldFile="app/messaging/messagingappbase/msgavkon/group"/>
-</component>
-<component name="mce" filter="s60" long-name="Message Center Application">
-<unit bldFile="app/messaging/messagingappbase/mce/group"/>
-</component>
-<component name="mceextraitems" filter="s60" long-name="Message Center Extra Items">
-<unit bldFile="app/messaging/messagingappbase/mceextraitems/group"/>
-</component>
-<component name="mcesettings" filter="s60" long-name="Message Center Settings">
-<unit bldFile="app/messaging/messagingappbase/mcesettings/group"/>
-</component>
-<component name="msgerrorwatcher" filter="s60" long-name="Messaging Error Watcher" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/msgerrorwatcher/group"/>
-</component>
-<component name="ncnlist" filter="s60" long-name="New Contacts Note List">
-<unit bldFile="app/messaging/messagingappbase/ncnlist/group"/>
-</component>
-<component name="schemeplugin" filter="s60" long-name="Scheme Handler Plugin" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/schemeplugin/group"/>
-</component>
-<component name="sendui" filter="s60" long-name="Send UI" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/sendui/group"/>
-</component>
-<component name="smilengine" filter="s60" long-name="SMIL Engine">
-<unit bldFile="app/messaging/messagingappbase/smilengine/group"/>
-</component>
-<component name="bium" filter="s60" long-name="BIO UI MTM" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/bium/group"/>
-</component>
-<component name="smartmessaging" filter="s60" long-name="Smart Messaging">
-<unit bldFile="app/messaging/messagingappbase/smartmessaging/group"/>
-</component>
-<component name="msgeditor" filter="s60" long-name="Messaging Editor">
-<unit bldFile="app/messaging/messagingappbase/msgeditor/group"/>
-</component>
-<component name="smilparser" long-name="SMIL Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="app/messaging/messagingappbase/smilparser/GROUP" mrp="app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
-</component>
-<component name="obexmtms" long-name="OBEX MTMs" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/obexmtms/Group" mrp="app/messaging/messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
-</component>
-</collection>
-<collection name="email" long-name="Email" level="mail">
-<!-- use commonemail instead -->
-<component name="alwaysonlineemailplugin" filter="s60" long-name="Always Online Mail Plugin" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/alwaysonlineemailplugin/group"/>
-</component>
-<component name="emailnotificationhandler" filter="s60" long-name="Email Notification Handler" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/emailnotificationhandler/group"/>
-</component>
-<component name="imum" filter="s60" long-name="Internet Mail UI MTM" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/imum/group"/>
-</component>
-<component name="mail" filter="s60" long-name="Mail Application" deprecated="^3">
-<unit bldFile="app/messaging/email/mail/group"/>
-</component>
-<component name="pop3andsmtpmtm" long-name="POP3 and SMTP MTM" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/pop3andsmtpmtm/group" mrp="app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
-</component>
-<component name="imap4mtm" long-name="IMAP4 MTM" introduced="9.2" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/imap4mtm/group" mrp="app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
-</component>
-</collection>
-<collection name="messaging_info" long-name="Messaging Apps Info" level="ui">
-<component name="messaging_metadata" long-name="Messaging Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commonemail" level="apps" span="2" long-name="Email Apps" levels="service support ui app">
-<collection name="email_pub" long-name="Email Apps Public Interfaces" level="app">
-<component name="email_widget_api" long-name="Email Widget API" filter="s60" class="api">
-<unit bldFile="app/commonemail/email_pub/email_widget_api/group"/>
-</component>
-</collection>
-<collection name="email_plat" long-name="Email Apps Platform Interfaces" level="app">
-<component name="email_client_api" long-name="Email Client API" filter="s60" class="api">
-<unit bldFile="app/commonemail/email_plat/email_client_api/group"/>
-</component>
-<component name="email_setup_plugin_api" long-name="Email Setup Plugin API" filter="s60" class="api">
-<unit bldFile="app/commonemail/email_plat/email_setup_plugin_api/group"/>
-</component>
-</collection>
-<collection name="emailservices" long-name="Email Services" level="service">
-<component name="emailframework" filter="s60" long-name="Email Framework" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailframework/group"/>
-</component>
-<component name="emailclientapi" filter="s60" long-name="Email Client API" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailclientapi/group"/>
-</component>
-<component name="emailserver" filter="s60" long-name="Email Server" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailserver/group"/>
-</component>
-<component name="emailservermonitor" filter="s60" long-name="Email Server Monitor" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailservermonitor/group"/>
-</component>
-<component name="psmruadapter" filter="s60" long-name="Predictive Search Most Recent Used Adapter" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailservices/psmruadapter/group"/>
-</component>
-<component name="emailstore" filter="s60" long-name="Email Store" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailstore/group"/>
-</component>
-<component name="emaildebug" filter="s60" long-name="Email Debug" introduced="^2" class="api">
-<unit bldFile="app/commonemail/emailservices/emaildebug/group"/>
-</component>
-<component name="emailinstallationinitiator" filter="s60" long-name="Email Installation Initiator" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailinstallationinitiator/group"/>
-</component>
-</collection>
-<collection name="ipsservices" long-name="IMAP/POP/SMTP Services" level="service">
-<component name="ipssossettings" filter="s60" long-name="IPS SOS Settings" introduced="^2">
-<!-- SOS? Consider spelling it out since the abbreviation is ambiguous -->
-<unit bldFile="app/commonemail/ipsservices/ipssossettings/group"/>
-</component>
-<component name="ipssosplugin" filter="s60" long-name="IPS SOS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/ipsservices/ipssosplugin/group"/>
-</component>
-<component name="ipssosaoplugin" filter="s60" long-name="IPS SOS Always Online Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/ipsservices/ipssosaoplugin/group"/>
-</component>
-<component name="ipsservices_build" filter="s60" long-name="IPS Services Build" introduced="^2">
-<unit bldFile="app/commonemail/ipsservices/group"/>
-<!-- can the exports be broken up into the other components or made a config component?-->
-</component>
-</collection>
-<collection name="emailcontacts" long-name="Email Contacts" level="support">
-<component name="contactactionservice" filter="s60" long-name="Contact Action Service" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailcontacts/contactactionservice/group"/>
-</component>
-<component name="contactactionmenu" filter="s60" long-name="Contact Action Menu" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailcontacts/contactactionmenu/group"/>
-</component>
-</collection>
-<collection name="meetingrequest" long-name="Meeting Request" level="ui">
-<component name="mrcommon" filter="s60" long-name="MR Common" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrcommon/group"/>
-</component>
-<component name="mrdb" filter="s60" long-name="MR Database" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrdb/group"/>
-</component>
-<component name="mrpolicy" filter="s60" long-name="MR Policy" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrpolicy/group"/>
-</component>
-<component name="mrservices" filter="s60" long-name="MR Services" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrservices/group"/>
-</component>
-<component name="mrgui" filter="s60" long-name="MR GUI" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrgui/group"/>
-</component>
-<component name="mrentry" filter="s60" long-name="MR Entry" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrentry/group"/>
-</component>
-<component name="mrtasks" filter="s60" long-name="MR Tasks" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrtasks/group"/>
-</component>
-<component name="mrutils" filter="s60" long-name="MR Utils" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrutils/group"/>
-</component>
-<component name="mrutilscalplugin" filter="s60" long-name="MR Utils Calendar Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mrutilscalplugin/group"/>
-</component>
-<component name="mrviewer" filter="s60" long-name="MR Viewer" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrviewer/group"/>
-</component>
-<component name="mrviewercalplugin" filter="s60" long-name="MR Viewer Calendar Plugin" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrviewercalplugin/group"/>
-</component>
-<component name="mricalviewer" filter="s60" long-name="MR iCal Viewer" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mricalviewer/group"/>
-</component>
-<component name="mrversit2" filter="s60" long-name="MR Versit2" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrversit2/group"/>
-</component>
-<component name="mragnversit2" filter="s60" long-name="MR Agenda Versit2" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mragnversit2/group"/>
-</component>
-<component name="mrcasplugin" filter="s60" long-name="MR Contact Action Service Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mrcasplugin/group"/>
-</component>
-<component name="mrurlparserplugin" filter="s60" long-name="MR URL Parser Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mrurlparserplugin/group"/>
-</component>
-<component name="meetingrequest_build" filter="s60" long-name="MR Build" introduced="^2">
-<!-- can the exports be broken up into the other components ?
- alternatively, move the exports into a RM Config component-->
-<unit bldFile="app/commonemail/meetingrequest/group"/>
-</component>
-</collection>
-<collection name="emailuis" long-name="Email UIs" level="app">
-<component name="emailui" filter="s60" long-name="Email UI" introduced="^2">
-<unit bldFile="app/commonemail/emailuis/emailui/group"/>
-</component>
-<component name="gsemailsettings" filter="s60" long-name="Email GS Settings" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailuis/gsemailsettings/group"/>
-</component>
-<component name="uicomponents" filter="s60" long-name="Email UI Components" introduced="^2">
-<unit bldFile="app/commonemail/emailuis/uicomponents/group"/>
-</component>
-<component name="widget" filter="s60" long-name="Email Widget" introduced="^2">
-<!-- Uncomment unit when configuration is in place. Currently #included from emailuis_build, which should be removed at the same time. -->
-<!--<unit bldFile="emailuis/widget/group"/>-->
-</component>
-<component name="emailuis_build" filter="s60" long-name="Email UIs Build" introduced="^2">
-<unit bldFile="app/commonemail/emailuis/group"/>
-</component>
-</collection>
-<collection name="commonemail_info" long-name="Email Apps Info" level="app">
-<component name="emailhelp" filter="s60" long-name="Email Help" class="placeholder">
-<!-- should this be commented out or not? -->
-<!-- <unit bldFile="emailhelp/group"/> -->
-</component>
-<component name="commonemail_help" filter="s60" long-name="Email Help" introduced="^2" class="placeholder">
-<!-- should this be commented out or not? -->
-<!-- <unit bldFile="help/group"/> -->
-</component>
-</collection>
-</block>
-<block name="conversations" level="apps" long-name="Conversation Apps" levels="settings utils plugin ui">
-<collection name="conversations_plat" long-name="Conversation Apps Platform Interfaces" level="ui">
-<component name="im_cv_launcher_api" long-name="IM CV Launcher API" filter="s60" class="api">
-<unit bldFile="app/conversations/conversations_plat/im_cv_launcher_api/group"/>
-</component>
-<component name="im_connection_api" long-name="IM Connection API" filter="s60" class="api">
-<unit bldFile="app/conversations/conversations_plat/im_connection_api/group"/>
-</component>
-<component name="im_cv_appui_api" long-name="IM CV App UI API" filter="s60" class="api">
-<unit bldFile="app/conversations/conversations_plat/im_cv_appui_api/group"/>
-</component>
-</collection>
-<collection name="uiservicetabsettings" long-name="UI Service Tab Settings" level="settings">
-<!-- this is really at the wrong rank. should move down a directory -->
-<component name="vimpstsettings" filter="s60" long-name="VIMP Service Tab Settings">
-<unit bldFile="app/conversations/uiservicetabsettings/group"/>
-</component>
-</collection>
-<collection name="instantmessagesalert" long-name="Instant Messages Alert" level="utils">
-<!-- this is really at the wrong rank. should move down a directory -->
-<component name="instantmessagesalert_build" filter="s60" long-name="Instant Messages Alert build" introduced="^3">
-<unit bldFile="app/conversations/instantmessagesalert/group"/>
-</component>
-</collection>
-<collection name="imstutils" long-name="IM Service Tab Utils" level="utils">
-<component name="imstutils_help" filter="s60" long-name="IM Service Tab Help">
-<unit bldFile="app/conversations/imstutils/help/group"/>
-</component>
-<component name="imconnectionprovider" filter="s60" long-name="IM Connection Provider" plugin="Y">
-<unit bldFile="app/conversations/imstutils/imconnectionprovider/group"/>
-</component>
-<component name="xmppadapter" filter="s60" long-name="XMPP Settings Adapter" plugin="Y">
-<unit bldFile="app/conversations/imstutils/xmppadapter/group"/>
-</component>
-<component name="imconversationview" filter="s60" long-name="IM Conversation View">
-<unit bldFile="app/conversations/imstutils/imconversationview/group"/>
-</component>
-<component name="imstutils_config" filter="s60" long-name="IM Service Tab Utils config" class="config">
-<!-- remove the #includes and or moved ithe loc file into one the above components -->
-<unit bldFile="app/conversations/imstutils/group"/>
-</component>
-</collection>
-<collection name="uiservicetab" long-name="UI Service Tab" level="ui">
-<component name="vimpstutils" filter="s60" long-name="VIMP Service Tab Utilities">
-<!-- need to spell out VIMP at least once -->
-<unit bldFile="app/conversations/uiservicetab/vimpstutils/group"/>
-</component>
-<component name="vimpststorage" filter="s60" long-name="VIMP Service Tab Storage">
-<unit bldFile="app/conversations/uiservicetab/vimpststorage/group"/>
-</component>
-<component name="vimpstengine" filter="s60" long-name="VIMP Service Tab Engine">
-<unit bldFile="app/conversations/uiservicetab/vimpstengine/group"/>
-</component>
-<component name="vimpstcmdprocess" filter="s60" long-name="VIMP Service Tab Command Process">
-<unit bldFile="app/conversations/uiservicetab/vimpstcmdprocess/group"/>
-</component>
-<component name="vimpstui" filter="s60" long-name="VIMP Service Tab UI">
-<unit bldFile="app/conversations/uiservicetab/vimpstui/group"/>
-</component>
-<component name="vimpstdetailsviewplugin" filter="s60" long-name="VIMP ST Details View Plugin" plugin="Y">
-<unit bldFile="app/conversations/uiservicetab/vimpstdetailsviewplugin/group"/>
-</component>
-<component name="uiservicetab_build" filter="s60" long-name="UI Service Tab Build">
-<!-- can this be distributed into the above bld.infs? -->
-<unit bldFile="app/conversations/uiservicetab/group"/>
-</component>
-</collection>
-<collection name="servicewidget" long-name="Service Widget" level="ui">
-<component name="servicewidgetdatapublisher" filter="s60" long-name="Service Widget Data Publisher" plugin="Y">
-<unit bldFile="app/conversations/servicewidget/servicewidgetdatapublisher/group"/>
-</component>
-<component name="themes" filter="s60" long-name="Service Widget Themes" class="config">
-<!-- does this really need to have that number in the directory name? -->
-<unit bldFile="app/conversations/servicewidget/themes/install-themes/install/servicewidget_20021383/group"/>
-</component>
-<component name="servicewidget_build" filter="s60" long-name="Service Widget Build">
-<!-- Either move the whole collection down one directory into a single component, or move the ROM and SIS parts into a Service Widget ROM component -->
-<unit bldFile="app/conversations/servicewidget/group"/>
-</component>
-</collection>
-<collection name="instantmsgindicatorplugin" long-name="Instant Message Indicator Plugin" level="plugin">
-<!-- collection is really a component. should move down a directory -->
-<component name="instantmsgindicatorplugin_build" filter="s60" long-name="Instant Message Indicator Plugin Build" introduced="^3" plugin="Y">
-<unit bldFile="app/conversations/instantmsgindicatorplugin/group"/>
-</component>
-</collection>
-<collection name="imstatuspaneindicatorplugin" long-name="IM Status Pane Indicator Plugin" level="plugin">
-<!-- collection is really a component. should move down a directory -->
-<component name="imstatuspaneindicatorplugin_build" filter="s60" long-name="IM Status Pane Indicator Plugin Build" introduced="^3" plugin="Y">
-<unit bldFile="app/conversations/imstatuspaneindicatorplugin/group"/>
-</component>
-</collection>
-<collection name="conversations_info" long-name="Conversation Apps Info" level="ui">
-<component name="conversations_build" filter="s60" long-name="Conversation Apps Build">
-<!-- can the exports be moved to other components? or this remade into a configuration component?-->
-<unit bldFile="app/conversations/group"/>
-</component>
-</collection>
-</block>
-<block name="im" level="apps" long-name="Instant Messaging Apps" levels="support prot engine apps">
-<collection name="im_plat" long-name="Instant Messaging Apps Platform Interfaces" level="apps">
-<component name="wv_sap_settings_api" long-name="WV SAP Settings API" filter="s60" class="api">
-<unit bldFile="app/im/im_plat/wv_sap_settings_api/group"/>
-</component>
-</collection>
-<collection name="wvsettings20" long-name="Wireless Village Settings Engine" level="support">
-<!-- this is really a component. should move down a directory -->
-<component name="wvsapsettingsstore" long-name="WV SAP Settings Store" filter="s60" introduced="9.3">
-<unit bldFile="app/im/wvsettings20/group"/>
-</component>
-</collection>
-</block>
-<block name="dictionary" level="services" long-name="Dictionary" levels="utils ui">
-<collection name="dictionary_plat" long-name="Dictionary Platform Interfaces" level="ui">
-<component name="menu_suites_macros_api" long-name="Menu Suites Macros API" filter="s60" class="api">
-<unit bldFile="app/dictionary/dictionary_plat/menu_suites_macros_api/group"/>
-</component>
-</collection>
-<collection name="userdict" long-name="User Dictionary" level="ui">
-<!-- collection is really a component, move down a dir -->
-<component name="userdict_build" filter="s60" long-name="Japanese User Dictionary">
-<unit bldFile="app/dictionary/userdict/group"/>
-</component>
-</collection>
-</block>
-<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"/>
-</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"/>
-</component>
-</collection>
-<collection name="camerauis" long-name="Camera UIs">
-<component name="activepalette" filter="s60" long-name="Active Palette">
-<unit bldFile="app/camera/camerauis/activepalette/group"/>
-</component>
-<component name="cameraapp" filter="s60" long-name="Camera Application">
-<unit bldFile="app/camera/camerauis/cameraapp/group"/>
-<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">
-<component name="image_editor_debug_utilities_api" long-name="Image Editor Debug Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
-</component>
-<component name="image_editor_utilities_api" long-name="Image Editor Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_utilities_api/group"/>
-</component>
-<component name="image_editor_definitions_api" long-name="Image Editor Definitions API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_definitions_api/group"/>
-</component>
-<component name="image_editor_system_parameters_api" long-name="Image Editor System Parameters API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_system_parameters_api/group"/>
-</component>
-<component name="image_processing_engine_api" long-name="Image Processing Engine API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_processing_engine_api/group"/>
-</component>
-</collection>
-<collection name="imageeditor" long-name="Image Editor UI" level="ui">
-<component name="pb" filter="s60" long-name="Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/pb/group"/>
-</component>
-<component name="iepb" filter="s60" long-name="Image Editor Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/iepb/group"/>
-</component>
-<component name="imageeditorui" filter="s60" long-name="Image Editor UI">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorui/group"/>
-</component>
-<component name="imageeditormanager" filter="s60" long-name="Image Editor Manager">
-<unit bldFile="app/imgeditor/imageeditor/imageeditormanager/group"/>
-</component>
-<component name="imageeditorapp" filter="s60" long-name="Image Editor Application">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorapp/group"/>
-</component>
-<component name="imageeditor_plugins" filter="s60" long-name="Image Editor Plugins" plugin="Y">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditor/plugins/blackwhiteplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/brightnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/bubbleplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cartoonizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/clipartplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/contrastplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cropplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/drawplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/frameplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/negativeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/redeyeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/resizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotatelplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotaterplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/textplugin/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditor/plugins/drawplugin/group"/>
- -->
-</component>
-<component name="editorprovider" filter="s60" long-name="Image Editor Provider">
-<unit bldFile="app/imgeditor/imageeditor/editorprovider/group"/>
-</component>
-<component name="imageeditor_build" filter="s60" long-name="Image Editor Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditor/group"/>
-</component>
-</collection>
-<collection name="imageeditorengine" long-name="Image Editor Engine" level="engine">
-<component name="filters" filter="s60" long-name="Image Editor Filters">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbrightness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbubble/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbuffer/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercartoon/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterclipart/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercontrast/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercrop/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterdraw/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterframe/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtergrayscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtericlsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegtarget/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filternegate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterredeye/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterrotate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtertext/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
- -->
-</component>
-<component name="imageeditorutils" filter="s60" long-name="Image Editor Utilities">
-<unit bldFile="app/imgeditor/imageeditorengine/imageeditorutils/group"/>
-</component>
-<component name="systemparameters" filter="s60" long-name="System Parameters">
-<unit bldFile="app/imgeditor/imageeditorengine/systemparameters/group"/>
-</component>
-<component name="enginewrapper" filter="s60" long-name="Image Editor Engine Wrapper">
-<unit bldFile="app/imgeditor/imageeditorengine/enginewrapper/group"/>
-</component>
-<component name="imageeditorengine_build" filter="s60" long-name="Image Editor Engine Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoeditor" level="apps" long-name="Video Editor Apps" levels="engine ui">
-<collection name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" level="ui">
-<component name="video_editor_engine_api" long-name="Video Editor Engine API" introduced="^2" class="api">
-<unit bldFile="app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
-</component>
-</collection>
-<collection name="videditor" long-name="Video Editor" level="ui">
-<component name="videoeditorcommon" filter="s60" long-name="Video Editor Common" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditorcommon/group"/>
-</component>
-<component name="videoeditoruicomponents" filter="s60" long-name="Video Editor UI Components" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditoruicomponents/group"/>
-</component>
-<component name="simplevideoeditor" filter="s60" long-name="Simple Video Editor" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplevideoeditor/group"/>
-</component>
-<component name="simplecutvideo" filter="s60" long-name="Simple Cut Video" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplecutvideo/group"/>
-</component>
-<component name="videoprovider" filter="s60" long-name="Video Provider" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoprovider/group"/>
-</component>
-<component name="manualvideoeditor" filter="s60" long-name="Manual Video Editor" introduced="^2" class="placeholder">
-<!-- uncomment when supported
- <meta rel="config">
- <defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
- </meta>
- <unit bldFile="videditor/manualvideoeditor/group"/> -->
-</component>
-<component name="videditor_build" filter="s60" long-name="Video Editor Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videditor/group"/>
-</component>
-</collection>
-<collection name="videoeditorengine" long-name="Video Editor Engine" level="engine">
-<component name="audioeditorengine" filter="s60" long-name="Audio Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/audioeditorengine/group"/>
-</component>
-<component name="avcedit" filter="s60" long-name="AVC Editing" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/avcedit/group"/>
-</component>
-<component name="h263decoder" filter="s60" long-name="H.263 Decoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/h263decoder/group"/>
-</component>
-<component name="mp3aacmaniplib" filter="s60" long-name="MP3 and AAC Manipulation Library" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
-</component>
-<component name="vedtranscoder" filter="s60" long-name="Video Editor Transcoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedtranscoder/group"/>
-</component>
-<component name="vedengine" filter="s60" long-name="Video Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedengine/group"/>
-</component>
-<component name="videoeditorengine_build" filter="s60" long-name="Video Editor Engine Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videoeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
-<collection name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" level="apps">
-<component name="videoplayer_startup_api" long-name="Video Player Startup API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videoplayer_startup_api/group" filter="!test"/>
-</component>
-<component name="video_player_file_details_dialog_api" long-name="Media Player File Details Dialog API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/video_player_file_details_dialog_api/group" filter="!test"/>
-</component>
-<component name="videocollection_api" long-name="Video Collection API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videocollection_api/group"/>
-</component>
-</collection>
-<collection name="videofeeds" long-name="Video Feeds" level="util">
-<component name="iptv_utils" filter="s60" long-name="IPTV Util" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/utils/group"/>
-</component>
-<component name="viewmessageutility" filter="s60" long-name="View Message Utility" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/viewmessageutility/group"/>
-</component>
-<component name="vcxnotifier" filter="s60" long-name="Video Connection Notifier" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/vcxnotifier/group"/>
-</component>
-<component name="vccommon" filter="s60" long-name="Video Connection Common" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/vccommon/group"/>
-</component>
-<component name="clientapi" long-name="Server Client" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/clientapi/group"/>
-</component>
-<component name="provisioningprocessor" long-name="Provisioning Processor" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/provisioningprocessor/group"/>
-</component>
-<component name="mrssplugin" long-name="RSS plugin" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/mrssplugin/group"/>
-</component>
-<component name="videofeeds_server" long-name="Server" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/server/group"/>
-</component>
-<component name="livetvutils" long-name="LiveTV Utils" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/livetvutils/group"/>
-</component>
-<component name="iptvprovisioningrecognizer" long-name="IP TV Provisioning Recognizer" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/provisioningrecognizer/group"/>
-</component>
-<component name="iptvprovisioningappui" long-name="IP TV Provisioning App UI" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/provisioningappui/group"/>
-</component>
-<component name="iptvomaprovisioning" long-name="IP TV OMA Provisioning" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/omaprovisioning/group"/>
-</component>
-<component name="vcnsuiengine" long-name="VoD UI Engine" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/vcnsuiengine/group"/>
-</component>
-<component name="hgvodui" long-name="Ganes UX2.0 VoD UI" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/hgvodui/group"/>
-</component>
-<component name="hgvodplugin" long-name="Ganes UX2.0 VoD UI Plugin" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/hgvodplugin/group"/>
-</component>
-<component name="vcnsscheduleview" long-name="Scheduled Download Settings View" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/vcnsscheduleview/group"/>
-</component>
-<component name="vcnsscheduleplugin" long-name="Scheduled Download Settings Plugin" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/vcnsscheduleplugin/group"/>
-</component>
-<component name="scheduleddlplugin" long-name="Scheduled download plugin" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/scheduleddlplugin/group"/>
-</component>
-</collection>
-<collection name="videocollection" long-name="Video Collection" level="util">
-<component name="mpxmyvideoscollection" filter="s60" long-name="MPX My Videos Collection" introduced="^3">
-<unit bldFile="app/videoplayer/videocollection/mpxmyvideoscollection/group"/>
-</component>
-<component name="myvideosindicatorplugin" filter="s60" long-name="My Videos Indicator Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videocollection/myvideosindicatorplugin/group"/>
-</component>
-<component name="hgmyvideos" filter="s60" long-name="Huriganes My Videos" introduced="^3">
-<unit bldFile="app/videoplayer/videocollection/hgmyvideos/group"/>
-</component>
-<component name="hgmyvideosplugin" filter="s60" long-name="Huriganes My VideosPlugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videocollection/hgmyvideosplugin/group"/>
-</component>
-</collection>
-<collection name="mediasettings" long-name="Media Settings" level="support">
-<!-- this is really a component. Should be moved down a directory -->
-<component name="mediasettings_build" filter="s60" long-name="Media Settings Build">
-<unit bldFile="app/videoplayer/mediasettings/group"/>
-</component>
-<component name="videoplayer_test" filter="s60" purpose="development" long-name="Video Player Apps Test">
-<!-- can only have one unit. Can thes be #included from the above or another bld.inf?-->
-<unit bldFile="app/videoplayer/tsrc/VCXTestCommon/group"/>
-<unit bldFile="app/videoplayer/tsrc/VCXTestUtilModule/group"/>
-<unit bldFile="app/videoplayer/tsrc/VCXTestMyVideosCollectionClient/group"/>
-<unit bldFile="app/videoplayer/mediasettings/mediasettingsengine/tsrc/mediasettingsenginetest/group"/>
-<unit bldFile="app/videoplayer/mediasettings/videoplayersettingsengine/tsrc/vpsettingsenginetest/group"/>
-</component>
-</collection>
-<collection name="filedetails" long-name="File Details" level="support">
-<component name="filedetailsplugin" filter="s60" long-name="File Details Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/filedetails/filedetailsplugin/group"/>
-</component>
-<component name="filedetailsdialog" filter="s60" long-name="File Details Dialog" introduced="^3">
-<unit bldFile="app/videoplayer/filedetails/filedetailsdialog/group"/>
-</component>
-</collection>
-<collection name="videoplayerapp" long-name="Video Player App" level="apps">
-<component name="lwplayer" long-name="Lightweight Player" filter="s60">
-<unit bldFile="app/videoplayer/videoplayerapp/lwplayer/group"/>
-</component>
-<component name="mpxvideoplayer" filter="s60" long-name="MPX Video Player" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayerapp/mpxvideoplayer/group" filter="!test"/>
-</component>
-</collection>
-<collection name="videoplayback" long-name="Video Playback Plugins" level="plugin">
-<component name="videohelix" long-name="Video Helix" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videohelix/group" filter="!test"/>
-</component>
-<component name="videopdlplaybackviewplugin" filter="s60" long-name="Video PDL Playback View Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videopdlplaybackviewplugin/group" filter="!test"/>
-</component>
-<component name="videoplaybackcontrols" filter="s60" long-name="Video Playback Controls" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videoplaybackcontrols/group" filter="!test"/>
-</component>
-<component name="videoplaybackviewplugin" filter="s60" long-name="Video Playback View Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videoplaybackviewplugin/group"/>
-</component>
-<component name="videoplaybackviews" filter="s60" long-name="Video Playback Views" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videoplaybackviews/group" filter="!test"/>
-</component>
-</collection>
-</block>
-<block name="photos" level="apps" long-name="Photos" levels="support fw ui app">
-<collection name="photos_plat" long-name="Photos Platform Interfaces" level="app">
-<component name="collection_plugins_api" long-name="Collection Plugins API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/collection_plugins_api/group"/>
-</component>
-<component name="controllers_collection_api" long-name="Controllers Collection API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/controllers_collection_api/group"/>
-</component>
-<component name="gallery_utilities_api" long-name="Gallery Utilities API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/gallery_utilities_api/group"/>
-</component>
-<component name="slideshow_ui_constants_api" long-name="Slideshow Ui Constants API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/slideshow_ui_constants_api/group"/>
-</component>
-<component name="views_metadatadialog_api" long-name="Views Metadata Dialog API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/views_metadatadialog_api/group"/>
-</component>
-</collection>
-<collection name="photosgallery" long-name="Photos Gallery" level="app">
-<!-- consider splitting this collection into the application itself, and the frameworks behind it -->
-<component name="photosgallery_help" filter="s60" long-name="Photos Help" introduced="^2">
-<unit bldFile="app/photos/photosgallery/help/group"/>
-</component>
-<component name="logging" filter="s60" long-name="Photos Logging" introduced="^2">
-<unit bldFile="app/photos/photosgallery/logging/group"/>
-</component>
-<component name="photosgallery_common" filter="s60" long-name="Photos Common" introduced="^2">
-<unit bldFile="app/photos/photosgallery/common/group"/>
-</component>
-<component name="photosgallery_commonui" filter="s60" long-name="Photos Common UI" introduced="^2">
-<unit bldFile="app/photos/photosgallery/commonui/group"/>
-</component>
-<component name="photosgalleryollectionfw" filter="s60" long-name="Photos Collection Framework" introduced="^2">
-<unit bldFile="app/photos/photosgallery/collectionframework/group"/>
-</component>
-<component name="galleryicons" filter="s60" long-name="Photos Icons" introduced="^2" class="config">
-<unit bldFile="app/photos/photosgallery/icons"/>
-</component>
-<component name="imageviewer" filter="s60" long-name="Image Viewer" introduced="^3">
-<!-- this is really a part of controllers component, #include from there instead -->
-<unit bldFile="app/photos/photosgallery/controllers/imageviewer/group"/>
-</component>
-<component name="photosgalleryviewfw" filter="s60" long-name="View Framework" introduced="^2">
-<unit bldFile="app/photos/photosgallery/viewframework/group"/>
-</component>
-<component name="controllers" filter="s60" long-name="Photos Controllers" introduced="^2">
-<unit bldFile="app/photos/photosgallery/controllers/group"/>
-</component>
-<component name="photogallery" filter="s60" long-name="Media Gallery" introduced="^2">
-<unit bldFile="app/photos/photosgallery/gallery/group"/>
-</component>
-<component name="slideshow" filter="s60" long-name="Slideshow" introduced="^2">
-<unit bldFile="app/photos/photosgallery/slideshow/group"/>
-</component>
-<component name="memoryplugin" long-name="Memory Plugin" filter="s60" introduced="^2" plugin="Y">
-<unit bldFile="app/photos/photosgallery/memoryplugin/group"/>
-</component>
-<component name="imgvwr" filter="s60" long-name="Photos Image Viewer" introduced="^3">
-<unit bldFile="app/photos/photosgallery/imgvwr/group"/>
-</component>
-<component name="photosgallery_build" filter="s60" long-name="Photos Gallery Build" introduced="^2">
-<!-- need to remove the #included above bld.infs from this -->
-<unit bldFile="app/photos/photosgallery/group"/>
-</component>
-</collection>
-</block>
-<block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support hs app">
-<collection name="musicplayer_plat" long-name="Music Player Apps Platform Interfaces" level="app">
-<component name="mpx_music_player_app_api" long-name="MPX Music Player App API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_app_api/group"/>
-</component>
-<component name="mpx_music_player_commonui_api" long-name="MPX Music Player Common UI API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_commonui_api/group"/>
-</component>
-<component name="mpx_music_player_media_key_handler_api" long-name="MPX Music Player Media Key Handler API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_media_key_handler_api/group"/>
-</component>
-<component name="mpx_music_player_remote_control_api" long-name="MPX Music Player Remote Control API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_remote_control_api/group"/>
-</component>
-<component name="mpx_music_shop_ui_api" long-name="MPX Music Shop UI API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_shop_ui_api/group"/>
-</component>
-<component name="mpx_music_wap_adapter_cenrep_api" long-name="MPX Music Wap Adapter CenRep API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_wap_adapter_cenrep_api/group"/>
-</component>
-<component name="mpx_music_store_api" long-name="MPX Music Store Find API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_store_api/group"/>
-</component>
-<component name="audio_application_features_api" long-name="Audio Application Features API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/audio_application_features_api/group"/>
-</component>
-<component name="music_content_publisher_plugin_api" long-name="Music Content Publisher Plugin API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/music_content_publisher_plugin_api/group"/>
-</component>
-</collection>
-<collection name="mpxmusicplayer" long-name="MPX Music Player" level="app">
-<component name="mpxmusicplayer_help" filter="s60" long-name="Help">
-<unit bldFile="app/musicplayer/mpxmusicplayer/help/group"/>
-</component>
-<component name="mpxmusicplayer_commonui" filter="s60" long-name="MPX Common UI">
-<unit bldFile="app/musicplayer/mpxmusicplayer/commonui/group"/>
-</component>
-<component name="mpx_metadatahandler" filter="s60" long-name="MPX Metadata Handler">
-<unit bldFile="app/musicplayer/mpxmusicplayer/metadatahandler/group"/>
-</component>
-<component name="mediakeyhandler" filter="s60" long-name="MPX Media Key Handler">
-<unit bldFile="app/musicplayer/mpxmusicplayer/mediakeyhandler/group"/>
-</component>
-<component name="mpxmusicplayer_app" filter="s60" long-name="MPX Application">
-<unit bldFile="app/musicplayer/mpxmusicplayer/app/group"/>
-</component>
-<component name="mpxmusicplayer_build" filter="s60" long-name="MPX Music Player Build">
-<!-- can the exports be distributed to the above components? -->
-<unit bldFile="app/musicplayer/mpxmusicplayer/group"/>
-</component>
-</collection>
-<collection name="musichomescreen_multiview" long-name="Music Home Screen Multiview" level="hs">
-<!-- Uncomment all units when configuration is in place. All currently #included from musichomescreen_build -->
-<component name="mpxcollectionpublisher" filter="s60" long-name="MPX Collection Publisher" introduced="^2" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/mpxcollectionpublisher/group"/>-->
-</component>
-<component name="musiccontentpublisher" filter="s60" long-name="Music Content Publisher" introduced="^2" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/musiccontentpublisher/group"/>-->
-</component>
-<component name="mcpmusicplayer" filter="s60" long-name="Music Player MCP Plugin" introduced="^2" plugin="Y" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/mcpmusicplayer/group"/>-->
-</component>
-<component name="musicplayeractionhandlerplugin" filter="s60" long-name="Music Player Action Handler Plugin" introduced="^2" plugin="Y" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/musicplayeractionhandlerplugin/group"/>-->
-</component>
-<component name="mpx_data" filter="s60" long-name="MPX Data" introduced="^2" class="placeholder">
-<!-- does this make sense to be a component? should it just be #include from musichomescreen_multiview/group? -->
-<!--<unit bldFile="musichomescreen_multiview/data/themes/default/group"/>-->
-</component>
-<component name="musichomescreen_build" filter="s60" long-name="Music Homescreen Multiview Build" introduced="^2">
-<unit bldFile="app/musicplayer/musichomescreen_multiview/group"/>
-</component>
-</collection>
-<collection name="mpxplugins" long-name="MPX Plugins" level="plugins">
-<component name="serviceplugins" filter="s60" long-name="MPX Service Plugins" plugin="Y">
-<unit bldFile="app/musicplayer/mpxplugins/serviceplugins/group"/>
-</component>
-<component name="viewplugins" filter="s60" long-name="MPX View Plugins" plugin="Y">
-<unit bldFile="app/musicplayer/mpxplugins/viewplugins/group"/>
-</component>
-<component name="mpxplugins_build" filter="s60" long-name="MPX Plugins Build">
-<!-- can the exports be distributed to the above components? -->
-<unit bldFile="app/musicplayer/mpxplugins/group"/>
-</component>
-</collection>
-<collection name="musicplayer_info" long-name="Music Player Apps Info" level="app">
-<component name="musicplayer_build" filter="s60" long-name="Music Player Build">
-<!-- should explicitly #inlcude musicplayerbldvariant.hrh in each component -->
-<unit bldFile="app/musicplayer/group"/>
-</component>
-</collection>
-</block>
-<block name="radio" level="apps" long-name="Radio Apps" levels="engine ui">
-<collection name="fmradio" long-name="FM Radio" level="ui">
-<component name="activeidleengine" filter="s60" long-name="FM Radio Active Idle Engine">
-<unit bldFile="app/radio/fmradio/activeidleengine/group"/>
-</component>
-<component name="fmradioengine" filter="s60" long-name="FM Radio Engine">
-<unit bldFile="app/radio/fmradio/fmradioengine/group"/>
-</component>
-<component name="fmradioactionhandler" filter="s60" long-name="FM Radio Action Handler" plugin="Y">
-<unit bldFile="app/radio/fmradio/fmradioactionhandler/group"/>
-</component>
-<component name="fmradiomcpplugin" filter="s60" long-name="FM Radio Content Publisher Plugin" plugin="Y">
-<unit bldFile="app/radio/fmradio/fmradiomcpplugin/group"/>
-</component>
-<component name="fmradio_build" filter="s60" long-name="FM Radio Build">
-<unit bldFile="app/radio/fmradio/fmradio/group"/>
-</component>
-<component name="fmradio_help" filter="s60" long-name="FM Radio Help">
-<unit bldFile="app/radio/fmradio/help/group"/>
-</component>
-<component name="fmradio_build" filter="s60" long-name="FM Radio ROM">
-<!-- remove above #included bld.infs -->
-<unit bldFile="app/radio/fmradio/group"/>
-</component>
-</collection>
-</block>
-<block name="internetradio" level="apps" long-name="Internet Radio Apps"/>
-<block name="tv" level="services" long-name="TV Apps"/>
-<block name="voicerec" level="apps" long-name="Voice Recorder Apps">
-<!-- custom filter pref_test-->
-<collection name="voicerec_plat" long-name="Voice Recorder Apps Platform Interfaces">
-<component name="new_file_service_api" long-name="New File Service API" filter="s60" class="api">
-<unit bldFile="app/voicerec/voicerec_plat/new_file_service_api/group"/>
-</component>
-<component name="voicerecorder_public_constants_api" long-name="Voice Recorder Public Constants API" filter="s60" class="api">
-<unit bldFile="app/voicerec/voicerec_plat/voicerecorder_public_constants_api/group"/>
-</component>
-</collection>
-<collection name="voicerecorder" long-name="Voice Recorder">
-<!--this is really a component, move down a directory -->
-<component name="voicerecorder_build" filter="s60" long-name="Voice Recorder Build">
-<unit bldFile="app/voicerec/voicerecorder/group"/>
-</component>
-</collection>
-<collection name="voicerec_info" long-name="Voice Recorder Apps Info"/>
-</block>
-<block name="screensaver" level="apps" long-name="Screen Saver Apps" levels="plugin ui">
-<!-- is this a user-facing application or a daemon? -->
-<!-- units need to be commented out until configuration is in place. They are currently #included from screensaver_build-->
-<collection name="scrsaver" long-name="Screen Saver" level="plugin">
-<component name="scrsaverplugins" filter="s60" long-name="Screen Saver Plugins" plugin="Y">
-<!-- must have only one component. #include from a common bld.inf, or move up a directory and make scrsaverplugins a collection -->
-<!--<unit bldFile="scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/"/>
- <unit bldFile="scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/group/"/>-->
-</component>
-<component name="scrsaver_slideshowplugin" filter="s60" long-name="Screen Saver Slideshow Plugin" plugin="Y">
-<!--<unit bldFile="scrsaver/scrsaverplugins/SlideshowPlugin/group"/> -->
-</component>
-<component name="screensaveraiwplugin" filter="s60" long-name="Screen Saver AIW Plugin" plugin="Y">
-<!-- <unit bldFile="scrsaver/screensaveraiwplugin/group"/>-->
-</component>
-</collection>
-<collection name="screensaver_info" long-name="Screen Saver Apps Info" level="ui">
-<component name="screensaver_build" filter="s60" long-name="Screen Saver Application">
-<!--the app should be a separate component -->
-<unit bldFile="app/screensaver/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreen" level="apps" long-name="Home Screen Apps" levels="fw support apps">
-<collection name="homescreen_plat" long-name="Home Screen Apps Platform Interfaces" level="apps">
-<component name="menu_settings_api" long-name="Menu Settings API" filter="s60" class="api">
-<unit bldFile="app/homescreen/homescreen_plat/menu_settings_api/group"/>
-</component>
-<component name="hs_content_control_ui" long-name="HS Content Control Ui" filter="s60" class="api">
-<unit bldFile="app/homescreen/homescreen_plat/hs_content_control_ui/group"/>
-</component>
-<component name="hs_renderingplugin_api" long-name="HS Rendering Plugin API" filter="s60" class="api">
-<unit bldFile="app/homescreen/homescreen_plat/hs_renderingplugin_api/group"/>
-</component>
-</collection>
-<collection name="idlehomescreen" long-name="Idle Home Screen" level="apps">
-<component name="nativeuicontroller" filter="s60" long-name="Native UI Controller">
-<unit bldFile="app/homescreen/idlehomescreen/nativeuicontroller/group"/>
-</component>
-<component name="exths" filter="s60" long-name="Active Idle Container" plugin="Y">
-<!-- why is the ID so different from the name? Is one wrong? -->
-<unit bldFile="app/homescreen/idlehomescreen/exths/group"/>
-</component>
-<component name="hscontentcontrol" filter="s60" long-name="Home Screen Content Control" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/hscontentcontrol/group"/>
-</component>
-<component name="hssapiwrapper" filter="s60" long-name="HS SAPI Wrapper" introduced="^3">
-<!-- can only have one unit. #include from a common bld.inf, or split into two components -->
-<unit bldFile="app/homescreen/idlehomescreen/sapiwrapper/cpswrapper/group"/>
-<unit bldFile="app/homescreen/idlehomescreen/sapiwrapper/hspswrapper/group"/>
-</component>
-<component name="xmluirendering" filter="s60" long-name="XML UI Rendering" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/xmluirendering/group"/>
-</component>
-<component name="xmluicontroller" filter="s60" long-name="XML UI Controller" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/xmluicontroller/group"/>
-</component>
-<component name="widgetmanager" filter="s60" long-name="Widget Manager" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/widgetmanager/group"/>
-</component>
-<component name="idlehomescreen_help" filter="s60" long-name="Idle Home Screen Help">
-<unit bldFile="app/homescreen/idlehomescreen/help/group"/>
-</component>
-<component name="idlehomescreen_data" filter="s60" long-name="Idle Home Screen Data">
-<unit bldFile="app/homescreen/idlehomescreen/data/group"/>
-</component>
-<component name="idlehomescreen_build" filter="s60" long-name="Idle Home Screen Build">
-<!-- can the loc file be moved to another comopnent and this one removed? -->
-<unit bldFile="app/homescreen/idlehomescreen/group"/>
-</component>
-</collection>
-<collection name="menufw" long-name="Menu Framework" level="fw">
-<component name="hierarchynavigator" filter="s60" long-name="Hierarchy Navigator">
-<unit bldFile="app/homescreen/menufw/hierarchynavigator/group"/>
-</component>
-<component name="menufwui" filter="s60" long-name="Menu Framework UI">
-<unit bldFile="app/homescreen/menufw/menufwui/group"/>
-</component>
-<component name="menusuites" filter="s60" long-name="Menu Suites">
-<unit bldFile="app/homescreen/menufw/menusuites/group"/>
-</component>
-<component name="menufw_build" filter="s60" long-name="Menu Framework Build">
-<!-- can the exports be exported by the other components? -->
-<unit bldFile="app/homescreen/menufw/group"/>
-</component>
-</collection>
-<collection name="taskswitcher" long-name="Task Switcher" level="support">
-<component name="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">
-<unit bldFile="app/homescreen/taskswitcher/taskswitcherui/group"/>
-</component>
-</collection>
-</block>
-<block name="graphicsuis" level="services" long-name="Graphics UIs" levels="util ui">
-<collection name="graphicsuis_plat" long-name="Graphics UIs Platform Interfaces" level="ui">
-<component name="svgt_viewer_ui_api" long-name="SVG-T Viewer UI API" filter="s60" class="api">
-<unit bldFile="app/graphicsuis/graphicsuis_plat/svgt_viewer_ui_api/group"/>
-</component>
-<component name="svg_application_observer_utility_api" long-name="SVG Application Observer Utility API" filter="s60" class="api">
-<unit bldFile="app/graphicsuis/graphicsuis_plat/svg_application_observer_utility_api/group"/>
-</component>
-<component name="svgt_file_view_details_dialog_api" long-name="SVG-T File View Details Dialog API" filter="s60" class="api">
-<unit bldFile="app/graphicsuis/graphicsuis_plat/svgt_file_view_details_dialog_api/group"/>
-</component>
-</collection>
-<collection name="svgtviewer" long-name="SVG-T Viewer" level="ui">
-<component name="svgtviewerplugin" filter="s60" long-name="SVG-T Viewer Plugin">
-<unit bldFile="app/graphicsuis/svgtviewer/svgtviewerplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="profile" level="apps" long-name="Profiles" levels="app">
-<collection name="profile_plat" long-name="Profiles Platform Interfaces" level="app">
-<component name="profiles_settings_view_api" long-name="Profiles Settings View API" filter="s60" class="api">
-<unit bldFile="app/profile/profile_plat/profiles_settings_view_api/group"/>
-</component>
-</collection>
-<collection name="profilesapplication" long-name="Profiles Application" level="app">
-<component name="profiles" filter="s60" long-name="Profiles">
-<unit bldFile="app/profile/profilesapplication/profiles/group"/>
-</component>
-</collection>
-<collection name="profile_info" long-name="Profiles Info" level="app">
-<component name="profile_help" filter="s60" long-name="Profiles Help">
-<unit bldFile="app/profile/help/group"/>
-</component>
-</collection>
-</block>
-<block name="speechsrv" level="services" long-name="Speech Recognition UIs" levels="engine framework ui">
-<collection name="speechsrv_plat" long-name="Speech Recognition UIs Platform Interfaces" level="ui">
-<component name="vas_api" long-name="VAS API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vas_api/group"/>
-</component>
-<component name="nss_devasr_api" long-name="NSS DevASR API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_devasr_api/group"/>
-</component>
-<component name="tts_hw_device_api" long-name="TTS HW Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/tts_hw_device_api/group"/>
-</component>
-<component name="voice_commands_resource_header_api" long-name="Voice Commands Resource Header API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/voice_commands_resource_header_api/group"/>
-</component>
-<component name="nss_mmf_tts_custom_commands_api" long-name="NSS MMF TTS Custom Commands API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_mmf_tts_custom_commands_api/group"/>
-</component>
-<component name="srsf_cenrep_settings_api" long-name="SRSF CenRep Settings API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/srsf_cenrep_settings_api/group"/>
-</component>
-<component name="voice_ui_plugin_api" long-name="Voice UI Plug-in API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/voice_ui_plugin_api/group"/>
-</component>
-<component name="nss_tts_utility_api" long-name="NSS TTS Utility API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_tts_utility_api/group"/>
-</component>
-<component name="nss_srs_custom_commands_api" long-name="NSS SRS Custom Commands API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_srs_custom_commands_api/group"/>
-</component>
-<component name="srsf_secondarydisplay_api" long-name="SRSF Secondary Display API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/srsf_secondarydisplay_api/group"/>
-</component>
-<component name="asrs_hw_device_api" long-name="ASRS Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/asrs_hw_device_api/group"/>
-</component>
-<component name="vas_vcommand_api" long-name="VAS Voice Command API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vas_vcommand_api/group"/>
-</component>
-<component name="adaptation_hw_device_api" long-name="Adaptation Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/adaptation_hw_device_api/group"/>
-</component>
-<component name="nss_devtts_api" long-name="NSS DevTTS API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_devtts_api/group"/>
-</component>
-<component name="nss_srs_utility_api" long-name="NSS SRS Utility API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_srs_utility_api/group"/>
-</component>
-<component name="recognition_hw_device_api" long-name="Recognition Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/recognition_hw_device_api/group"/>
-</component>
-<component name="vas_contact_handler_api" long-name="VAS Contact Handler API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vas_contact_handler_api/group"/>
-</component>
-<component name="nlp_hw_device" long-name="NLP Hardware Device" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nlp_hw_device/group"/>
-</component>
-<component name="nss_si_speech_recognition_data_api" long-name="NSS SI Speech Recognition Data API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_si_speech_recognition_data_api/group"/>
-</component>
-<component name="nss_tts_common_api" long-name="NSS TTS Common API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_tts_common_api/group"/>
-</component>
-<component name="grcompiler_hw_device_api" long-name="Grammar Compiler Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/grcompiler_hw_device_api/group"/>
-</component>
-<component name="ttp_hw_device_api" long-name="TTP Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/ttp_hw_device_api/group"/>
-</component>
-<component name="vocman_hw_device_api" long-name="VocMan Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vocman_hw_device_api/group"/>
-</component>
-<component name="speech_synthesis_clientserver_api" long-name="Speech Synthesis Client-Server API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/speech_synthesis_clientserver_api/group"/>
-</component>
-<component name="voice_ui_accessory_button_handling_api" long-name="Voice UI Accessory Button Handling API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/voice_ui_accessory_button_handling_api/group"/>
-</component>
-<component name="ui_voice_recognition_api" long-name="UI Voice Recognition API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/ui_voice_recognition_api/group"/>
-</component>
-<component name="vcommand_settings_cenrep_api" long-name="Voice Command Settings CenRep API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vcommand_settings_cenrep_api/group"/>
-</component>
-</collection>
-<collection name="voiceui" long-name="Voice UI" level="ui">
-<component name="vcommand" filter="s60" long-name="Voice Commands UI" introduced="^1">
-<unit bldFile="app/speechsrv/voiceui/vcommand/group"/>
-</component>
-<component name="voiceuivoicerecognition" filter="s60" long-name="Voice UI Recognition" introduced="^1">
-<unit bldFile="app/speechsrv/voiceui/voiceuivoicerecognition/group"/>
-</component>
-<component name="pbkinfoviewimpl" filter="s60" long-name="Phonebook Info View Implementation" introduced="^1">
-<unit bldFile="app/speechsrv/voiceui/pbkinfoviewimpl/group"/>
-</component>
-<component name="aiwpbkinfoviewprovider" filter="s60" long-name="AIW Phonebook Info View Provider" introduced="^1" plugin="Y">
-<unit bldFile="app/speechsrv/voiceui/aiwpbkinfoviewprovider/group"/>
-</component>
-<component name="vccontrolpanelplugin" filter="s60" long-name="Voice Commands Control Panel Plugin" introduced="^1" plugin="Y">
-<!-- component is commented out until configuration is in place. Currently #included from voiceui_build -->
-<!--<unit bldFile="voiceui/vccontrolpanelplugin/group"/>-->
-</component>
-<component name="voiceui_build" filter="s60" long-name="Voice UI Build" introduced="^1">
-<!-- can this be put into the other components? -->
-<unit bldFile="app/speechsrv/voiceui/group"/>
-</component>
-</collection>
-<collection name="srsf" long-name="Speech Recognition and Synthesis Framework" level="framework">
-<component name="sispeechrecognitiondata" filter="s60" long-name="SI Speech Recognition Data">
-<unit bldFile="app/speechsrv/srsf/sispeechrecognitiondata/group"/>
-</component>
-<component name="ttscommon" filter="s60" long-name="TTS Common">
-<unit bldFile="app/speechsrv/srsf/ttscommon/group"/>
-</component>
-<component name="devtts" filter="s60" long-name="Text to Speech">
-<unit bldFile="app/speechsrv/srsf/devtts/group"/>
-</component>
-<component name="ttscustomcommands" filter="s60" long-name="TTS Custom Commands">
-<unit bldFile="app/speechsrv/srsf/ttscustomcommands/group"/>
-</component>
-<component name="ttscontrollerplugin" filter="s60" long-name="TTS Controller Plugin" plugin="Y">
-<unit bldFile="app/speechsrv/srsf/ttscontrollerplugin/group"/>
-</component>
-<component name="ttsutility" filter="s60" long-name="TTS Utility">
-<unit bldFile="app/speechsrv/srsf/ttsutility/group"/>
-</component>
-<component name="speechsynthesis" filter="s60" long-name="Speech Synthesis">
-<!-- can only have one unit. #include these from a common bld.inf -->
-<unit bldFile="app/speechsrv/srsf/speechsynthesis/client/group"/>
-<unit bldFile="app/speechsrv/srsf/speechsynthesis/server/group"/>
-</component>
-<component name="devasr" filter="s60" long-name="Audio Recording and Speech Recognition">
-<unit bldFile="app/speechsrv/srsf/devasr/group"/>
-</component>
-<component name="sicc" filter="s60" long-name="Speaker Independent Custom Commands">
-<unit bldFile="app/speechsrv/srsf/sicc/group"/>
-</component>
-<component name="sisrscontrollerplugin" filter="s60" long-name="SI SRS Controller Plugin" plugin="Y">
-<unit bldFile="app/speechsrv/srsf/sisrscontrollerplugin/group"/>
-</component>
-<component name="siutility" filter="s60" long-name="Speaker Independent Utility">
-<unit bldFile="app/speechsrv/srsf/siutility/group"/>
-</component>
-<component name="nssvasapi" filter="s60" long-name="NSS VAS API">
-<unit bldFile="app/speechsrv/srsf/nssvasapi/group"/>
-</component>
-<component name="nssvascontacthdlr" filter="s60" long-name="NSS VAS Contact Handler">
-<unit bldFile="app/speechsrv/srsf/nssvascontacthdlr/group"/>
-</component>
-<component name="vcommandhandler" filter="s60" long-name="Voice Command Handler">
-<unit bldFile="app/speechsrv/srsf/vcommandhandler/group"/>
-</component>
-<component name="vuiphandler" filter="s60" long-name="Voice UI Plugin Handler">
-<unit bldFile="app/speechsrv/srsf/vuiphandler/group"/>
-</component>
-<component name="vcommandexecutor" filter="s60" long-name="Voice Command Executor">
-<unit bldFile="app/speechsrv/srsf/vcommandexecutor/group"/>
-</component>
-<component name="vcommandexecutorbearer" filter="s60" long-name="Voice Command Executor Bearer">
-<unit bldFile="app/speechsrv/srsf/vcommandexecutorbearer/group"/>
-</component>
-<component name="vcommandmanager" filter="s60" long-name="Voice Command Manager">
-<unit bldFile="app/speechsrv/srsf/vcommandmanager/group"/>
-</component>
-<component name="vcexecutorapp" filter="s60" long-name="Voice Command Executor Application">
-<unit bldFile="app/speechsrv/srsf/vcexecutorapp/group"/>
-</component>
-<component name="profileobserverplugin" filter="s60" long-name="Profile Observer Plugin" plugin="Y">
-<unit bldFile="app/speechsrv/srsf/profileobserverplugin/group"/>
-</component>
-<component name="srsf_build" filter="s60" long-name="Speech Recognition and Synthesis Framework Build">
-<!-- should distribute this into the above components -->
-<unit bldFile="app/speechsrv/srsf/group"/>
-</component>
-</collection>
-<collection name="speechsrv_info" long-name="Speech Recognition UIs Info" level="ui"/>
-</block>
-<block name="homescreentools" level="services" long-name="Home Screen Tools" levels="tool install">
-<collection name="dtdinstaller" long-name="DTD Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<!-- this needs to be built first, does build order need to be forced with filters? -->
-<component name="dtdinstaller_build" filter="s60" long-name="DTD Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/dtdinstaller/group"/>
-</component>
-</collection>
-<collection name="themeinstaller" long-name="Theme Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="themeinstaller_build" filter="s60" long-name="Theme Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/themeinstaller/group"/>
-</component>
-</collection>
-<collection name="widgettools" long-name="Widget Tools" level="install">
-<component name="hspluginpreinstaller" filter="s60" long-name="HS Plugin Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/hspluginspreinstaller/group"/>
-</component>
-<component name="wrtwidgetpreinstaller" filter="s60" long-name="WRT Widget Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
-</component>
-</collection>
-</block>
-<block name="webuis" level="services" long-name="Web UIs" levels="plugin app">
-<collection name="browserui" long-name="Browser UI" level="app">
-<component name="browser" filter="s60" long-name="Browser">
-<unit bldFile="app/webuis/browserui/browser/group"/>
-</component>
-<component name="operatormenu" filter="s60" long-name="Browser Operator Menu">
-<unit bldFile="app/webuis/browserui/operatormenu/group"/>
-</component>
-<component name="videoservices" filter="s60" long-name="Browser Video Services">
-<unit bldFile="app/webuis/browserui/videoservices/group"/>
-</component>
-</collection>
-<collection name="browserplugins" long-name="Browser Plugins" level="plugin">
-<component name="browsersysteminfoplugin" filter="s60" long-name="Browser System Info Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsersysteminfoplugin/group"/>-->
-</component>
-<component name="browsergpsplugin" filter="s60" long-name="Browser GPS Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsergpsplugin/group"/>-->
-</component>
-<component name="browseraudiovideoplugin" filter="s60" long-name="Browser Audio Video Plugin" plugin="Y">
-<unit bldFile="app/webuis/browserplugins/browseraudiovideoplugin/group"/>
-</component>
-<component name="browserplugins_build" filter="s60" long-name="Browser Plugins Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="app/webuis/browserplugins/group"/>
-</component>
-</collection>
-<collection name="pushmtm" long-name="Push MTM" level="plugin">
-<component name="pushmtm_help" filter="s60" long-name="Push MTM Help">
-<unit bldFile="app/webuis/pushmtm/help/group"/>
-</component>
-<component name="plugins" filter="s60" long-name="Push MTM Plugins" plugin="Y">
-<unit bldFile="app/webuis/pushmtm/plugins/group"/>
-</component>
-<component name="pushmtm_build" filter="s60" long-name="Push MTM Build">
-<!-- Some content is at collection level and some is at comopnent level. Either make this a single
- component and move it down a diretcory, or make separate independent components in this collection -->
-<unit bldFile="app/webuis/pushmtm/group"/>
-</component>
-</collection>
-</block>
-<block name="jrt" level="services" long-name="Java Runtime" levels="util generic rt ui">
-<collection name="jrt_plat" long-name="JRT Platform Interfaces" level="ui">
-<component name="java_registry_api" long-name="Java Registry API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_registry_api/build"/>
-</component>
-<component name="java_env_info_api" long-name="Java Environment Info API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_env_info_api/build"/>
-</component>
-<component name="java_debug_api" long-name="Java Debug API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_debug_api/build"/>
-</component>
-</collection>
-<collection name="java_stubs" long-name="Java Stubs" level="util">
-<!-- uncomment all components when configuration is in place. Currently #included from jrt_build -->
-<component name="javadrmutils" long-name="Java DRM Utils" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtdrmutils/group"/>-->
-</component>
-<component name="javaenvinfo" long-name="Java Environment Info" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtenvinfo/group"/>-->
-</component>
-<component name="javaregistry" filter="s60,sf_build" long-name="Java Registry" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtregistry/clientserver/client/group"/>-->
-</component>
-<component name="java_stubs_build" filter="s60,sf_build" long-name="Java Stubs ROM" class="placeholder">
-<!-- Remove the #includes and rename JRT ROM-->
-<!--<unit bldFile="java_stubs/group"/>-->
-</component>
-</collection>
-<collection name="jrt_info" long-name="JRT Info" level="rt">
-<component name="jrt_build" filter="s60" long-name="JRT Build">
-<!-- needed for __JAVA_STUBS condition -->
-<unit bldFile="app/jrt/group"/>
-</component>
-</collection>
-</block>
-<block name="conntools" level="services" long-name="Connectivity Tools" levels="config app">
-<collection name="nettools" long-name="Net Tools" level="app">
-<component name="conntest" filter="s60" long-name="Connection Test" purpose="development">
-<unit bldFile="app/conntools/nettools/conntest/group"/>
-</component>
-</collection>
-<collection name="emulatorlan" long-name="Emulator LAN" level="config">
-<!-- component is actually a colleciton, should be moved down a directory -->
-<component name="emulatorlan_build" filter="s60" long-name="Emulator LAN Build" purpose="development" class="config">
-<unit bldFile="app/conntools/emulatorlan/group"/>
-</component>
-</collection>
-</block>
-<block name="rndtools" level="services" long-name="R&D tools" levels="support generic test util">
-<collection name="creator" long-name="Creator" level="support">
-<!-- collection is really a component. Should move down a directory -->
-<component name="creator_build" filter="s60" long-name="Creator Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/creator/group"/>
-</component>
-</collection>
-<collection name="filebrowser" long-name="File Browser" level="util">
-<!-- consider collapsing into a single component -->
-<component name="fileopserver" filter="s60" long-name="File Operations Server" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
-</component>
-<component name="fileopclient" filter="s60" long-name="File Operations Client" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!--<unit bldFile="filebrowser/fileopclient/group"/>-->
-</component>
-<component name="filebrowser_build" filter="s60" long-name="File Browser Application" purpose="development" class="tool">
-<!-- Need to make this a self-contained component by removing #includes. Can only do when configuration is in place-->
-<unit bldFile="app/rndtools/filebrowser/group"/>
-</component>
-</collection>
-<collection name="launcher" long-name="Launcher" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="launcher_build" filter="s60" long-name="Launcher Utility" purpose="development" class="tool">
-<unit bldFile="app/rndtools/launcher/group"/>
-</component>
-</collection>
-<collection name="loadgen" long-name="Load Generator" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="loadgen_build" filter="s60" long-name="Load Generator Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/loadgen/group"/>
-</component>
-</collection>
-<collection name="perfmon" long-name="Performance Monitor" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="perfmon_build" filter="s60" long-name="Performance Monitor Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/perfmon/group"/>
-</component>
-</collection>
-<collection name="screengrabber" long-name="Screen Grabber" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="screengrabber_build" filter="s60" long-name="ScreenGrabber" purpose="development" class="tool">
-<unit bldFile="app/rndtools/screengrabber/group"/>
-</component>
-</collection>
-<collection name="stifui" long-name="STIF UI" level="generic">
-<component name="stifui_stifui" filter="s60" long-name="STIF UI" purpose="development">
-<unit bldFile="app/rndtools/stifui/stifui/group"/>
-</component>
-<component name="uitestserverstarter" filter="s60" long-name="UI Test Server Starter" purpose="development">
-<unit bldFile="app/rndtools/stifui/uitestserverstarter/group"/>
-</component>
-<component name="stifui_build" filter="s60" long-name="STIF UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/stifui/group"/>
-</component>
-</collection>
-<collection name="memspyui" long-name="Memspy UI" level="generic">
-<!-- collection is really a component. Should move down a directory -->
-<component name="memspyui_build" filter="s60" long-name="Memspy UI Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/memspyui/group"/>
-</component>
-</collection>
-<collection name="htiui" long-name="Harmonized Test Interface UI" level="generic">
-<component name="HtiCommPlugins" filter="s60" long-name="HTI Comm Plugins" purpose="development" plugin="Y">
-<unit bldFile="app/rndtools/htiui/HtiCommPlugins/HtiBtCommPlugin/group"/>
-</component>
-<component name="HtiServicePlugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- can only have a single unit. Should #include from a common bld.inf file -->
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiFtpBackupFake/group"/>
-</component>
-<component name="htidevicereboot" filter="s60" long-name="HTI Device Reboot" purpose="development">
-<unit bldFile="app/rndtools/htiui/htidevicereboot/group"/>
-</component>
-<component name="htistartupwait" filter="s60" long-name="HTI Startup Wait" purpose="development">
-<unit bldFile="app/rndtools/htiui/htistartupwait/group"/>
-</component>
-<component name="htiadmin" filter="s60" long-name="HTI Admin" purpose="development">
-<unit bldFile="app/rndtools/htiui/htiadmin/group"/>
-</component>
-<component name="htiui_build" filter="s60" long-name="HTI UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/htiui/group"/>
-</component>
-</collection>
-</block>
-<block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools if ui">
-<collection name="csxhelp" long-name="Context Sensitive Extended Help" level="if">
-<!-- this is really a component. Should move it down a directory -->
-<component name="csxhelp_build" filter="s60" long-name="Context Sensitive Extended Help Build">
-<unit bldFile="app/helps/csxhelp/group"/>
-</component>
-</collection>
-<collection name="symhelp" long-name="Symbian Help" level="eng">
-<component name="helpmodel" long-name="Help" introduced="6.0" purpose="optional">
-<unit bldFile="app/helps/symhelp/helpmodel/group" mrp="app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
-</component>
-</collection>
-<collection name="helps_info" long-name="Help Apps Info" level="ui">
-<component name="helps_metadata" long-name="Help Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/helps/helps_info/helps_metadata/helps_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
-<collection name="buildverification" long-name="Build Verification" level="services">
-<component name="autosmoketest" long-name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
-<unit bldFile="app/techview/buildverification/autosmoketest/Group" mrp="app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
-</component>
-<component name="smoketest" long-name="Smoke Test" filter="gt" purpose="development">
-<unit bldFile="app/techview/buildverification/smoketest/Group" mrp="app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
-</component>
-</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="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"/>
-<collection name="installationapps" long-name="Installation Apps" level="apps2"/>
-<collection name="messagingapps" long-name="Messaging Apps" level="apps2"/>
-<collection name="telephonyapps" long-name="Telephony Apps" level="apps1"/>
-<collection name="networkingapps" long-name="Networking Apps" level="apps1"/>
-<collection name="networkingutils" long-name="Networking Utils" level="utils"/>
-<collection name="shortlinkapps" long-name="Shortlink Apps" level="apps1"/>
-<collection name="testapps" long-name="Test Apps" level="utils"/>
-<collection name="avapps" long-name="A/V Apps" level="apps3"/>
-<collection name="toolkit" long-name="Toolkit" level="utils"/>
-<collection name="techview_info" long-name="Techview Info" level="apps3">
-<component name="techview_metadata" long-name="Techview Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/techview/techview_info/techview_metadata/techview_metadata.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
--- a/symbian3/single/sysdefs/auto/model_20100420163246_d3d62c7c6308.xml Wed May 05 12:21:47 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10833 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a package or prebuilt -->
-<!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) "N"
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile may someday be removed in favour of mrp -->
-<!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
-<systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="low mw high">
-<block name="stubs" level="high" long-name="Stubs" levels="stub">
-<collection name="s60_stubs" level="stub">
-<component name="audiostubs" long-name="Audio Stubs">
-<unit bldFile="adaptation/stubs/audiostubs/group"/>
-</component>
-<component name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaptation Stub">
-<unit bldFile="adaptation/stubs/btaudioadaptation_stub/group"/>
-</component>
-<component name="drm_stubs" long-name="DRM Stubs">
-<unit bldFile="adaptation/stubs/drm_stubs/group"/>
-</component>
-<component name="ocrsrv_stub" long-name="OCR Services Stub">
-<unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
-</component>
-<component name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation">
-<unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
-</component>
-<component name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" plugin="Y">
-<unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
-</component>
-<component name="srsfenginestub" long-name="SRSF Engine Stub">
-<unit bldFile="adaptation/stubs/srsfenginestub/group"/>
-</component>
-<component name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub">
-<unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
-</component>
-<component name="systemswstubs" long-name="System Software Stubs">
-<unit bldFile="adaptation/stubs/systemswstubs/group"/>
-</component>
-<component name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" plugin="Y">
-<unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
-</component>
-<component name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub">
-<unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
-<collection name="omap3530" long-name="OMAP 3530" level="hw-if">
-<component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530" mrp="adaptation/beagleboard/omap3530/base_beagle.mrp"/>
-</component>
-<component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/kernel"/>
-</component>
-<component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/beagleboard"/>
-</component>
-</collection>
-</block>
-<block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
-<collection name="qemu_baseport" long-name="Baseport" level="hw-if">
-<component name="syborg" long-name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/qemu/baseport/syborg" mrp="adaptation/qemu/baseport/syborg/syborg.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
-<collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
-<component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
-<unit mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
-</component>
-</collection>
-<collection name="bsptemplate" long-name="Board Support Package Template" level="hw-if">
-<component name="asspandvariant" long-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 name="kernel" long-name="Kernel Architecture" level="adaptation">
-<component name="eka" long-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 name="kerneltest" long-name="Kernel Test" level="hw-if">
-<component name="e32utils" long-name="E32 Utilities" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32utils/group" mrp="os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/>
-</component>
-<component name="e32test" long-name="E32 Tests" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32test/group" mrp="os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
-</component>
-<component name="f32test" long-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 name="ldds" long-name="Logical Device Drivers" level="adaptation">
-<component name="ethernetldd" long-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 name="audioldd" long-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>
-<component name="serialldd" long-name="Serial Port Drivers" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
-</component>
-<component name="legacydrivers" long-name="Legacy Drivers" purpose="optional">
-<unit mrp="os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
-</component>
-<component name="locmedia" long-name="Local Media Subsystem" introduced="8.1b" purpose="mandatory">
-<!-- these are LDDs for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
-</component>
-<component name="runmodedebugger" long-name="Run Mode Debugger" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/debug/group" mrp="os/kernelhwsrv/kernel/eka/drivers/debug/group/base_e32_drivers_debug.mrp"/>
-</component>
-<component name="btrace" long-name="Kernel Trace Tool" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/trace" mrp="os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
-</component>
-<component name="cameraldd" long-name="Camera Drivers" introduced="^3" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/camerasc" mrp="os/kernelhwsrv/kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
-</component>
-<component name="displayldd" long-name="Display Drivers" introduced="^3" purpose="optional">
-<!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/display" mrp="os/kernelhwsrv/kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
-</component>
-<component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
-</component>
-</collection>
-<collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
-<component name="mediadrivers" long-name="Media Drivers" purpose="optional">
-<!-- these are for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/media" mrp="os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
-</component>
-<component name="genericboardsupport" long-name="Generic Board Support" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
-</component>
-</collection>
-<collection name="userlibandfileserver" long-name="User Library and File Server" level="framework">
-<component name="euser" long-name="User Library" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/euser" mrp="os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
-</component>
-<component name="compsupp" long-name="Compiler Runtime Support" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/compsupp" mrp="os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
-</component>
-<component name="fileserver" long-name="File Server" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
-</component>
-<component name="estart" long-name="Base Starter" filter="gt" purpose="optional">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
-</component>
-<component name="domainmgr" long-name="Domain Manager" introduced="8.1b" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
-</component>
-</collection>
-<collection name="filesystems" long-name="File Systems" level="framework">
-<component name="romfs" long-name="ROM File System" filter="gt" purpose="optional" plugin="Y">
-<unit mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
-</component>
-<component name="rofs" long-name="ROFS" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
-</component>
-<component name="usbmsfs" long-name="USB Mass Storage File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
-</component>
-<component name="usbhostmssrv" long-name="USB Host Mass Storage Server" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage/base_f32_shostmassstorage.mrp"/>
-</component>
-<component name="fat32fs" long-name="FAT32 File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
-</component>
-<component name="fatfs" long-name="FAT File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
-</component>
-<component name="compfs" long-name="Composite File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
-</component>
-</collection>
-<collection name="halservices" long-name="HAL Services" level="framework">
-<component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
-<unit bldFile="os/kernelhwsrv/halservices/hal" mrp="os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
-</component>
-</collection>
-<collection name="textmodeshell" long-name="Text Mode Shell" level="test">
-<component name="e32wsrv" long-name="Text Window Server" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/ewsrv" mrp="os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
-</component>
-<component name="textshell" long-name="Text Shell" filter="gt" purpose="development">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
-</component>
-</collection>
-<collection name="baseapitest" long-name="Base API Tests" level="test"/>
-<collection name="kernelhwsrv_info" long-name="Kernel and Hardware Services Info" level="test">
-<component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 config">
-<collection name="emulator" long-name="Emulator" level="bsp">
-<component name="emulatorbsp" long-name="Emulator BSP" purpose="optional">
-<unit bldFile="os/boardsupport/emulator/emulatorbsp" mrp="os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
-</component>
-</collection>
-<collection name="haitest" long-name="HAI Test Suites" level="test">
-<component name="bspsvs" long-name="BSP Verification Suite" introduced="^2" purpose="development">
-<unit mrp="os/boardsupport/haitest/bspsvs/group/bspsvs.mrp"/>
-</component>
-</collection>
-<collection name="boardsupport_info" long-name="Board Support Info" level="config">
-<component name="boardsupport_metadata" long-name="Board Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/boardsupport/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
-<collection name="bldsystemtools" long-name="Build System Tools" level="bld">
-<component name="sysdeftools" long-name="System Definition Tools" purpose="development" introduced="^2">
-<unit mrp="os/buildtools/bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
-</component>
-<component name="commonbldutils" long-name="Common Utils" purpose="development">
-<unit mrp="os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
-</component>
-</collection>
-<collection name="toolsandutils" long-name="Tools and Utils" level="mw">
-<component name="productionbldtools" long-name="Production Build Tools" filter="gt" purpose="development">
-<unit mrp="os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
-</component>
-<component name="e32tools" long-name="E32 Tools" deprecated="^2" purpose="development" class="PC">
-<unit bldFile="os/buildtools/toolsandutils/e32tools/group" mrp="os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
-</component>
-<component name="autotest" long-name="Autotest" purpose="development">
-<unit bldFile="os/buildtools/toolsandutils/autotest/group" mrp="os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
-</component>
-</collection>
-<collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
-<component name="e32toolp" long-name="E32 Perl Tools" purpose="development" filter="sf_build" class="PC">
-<unit mrp="os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="os/buildtools/sbsv1_os/e32toolp/group"/>
-</component>
-</collection>
-<collection name="imgtools_os" long-name="Image Tools" level="fw">
-<component name="romkiteka2" long-name="ROMKIT EKA2" deprecated="^2" purpose="development">
-<unit bldFile="os/buildtools/imgtools_os/romkiteka2/group" mrp="os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
-</component>
-</collection>
-<collection name="misccomponents" long-name="Misc Components" level="mw">
-<component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt" purpose="development">
-<unit bldFile="os/buildtools/misccomponents/emulatorlauncher/group" mrp="os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
-</component>
-</collection>
-<collection name="buildtools_info" long-name="Build Tools Info" level="ui">
-<component name="buildtools_metadata" long-name="Build Tools Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/buildtools/buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
-<collection name="ossrv_pub" long-name="Generic OS Services Public Interfaces" level="utilities">
-<component name="boost_apis" long-name="Boost APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/boost_apis/group"/>
-</component>
-<component name="cpp_wrappers" long-name="Cpp wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cpp_wrappers/group"/>
-</component>
-<component name="character_type_apis" long-name="Character Type APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/character_type_apis/group"/>
-</component>
-<component name="compiler_specific_runtime_support" long-name="Compiler Specific Runtime Support" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/compiler_specific_runtime_support/group"/>
-</component>
-<component name="ossrv_configuration_api" long-name="Generic OS Services Configuration API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/configuration/group"/>
-</component>
-<component name="crypto_authentication_codes_and_hash_functions_api" long-name="Crypto Authentication Codes and Hash Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
-</component>
-<component name="crypto_auxillary_functions_api" long-name="Crypto Auxillary Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_auxillary_functions_api/group"/>
-</component>
-<component name="crypto_certificates_api" long-name="Crypto Certificates API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_certificates_api/group"/>
-</component>
-<component name="crypto_inputoutput_and_data_encoding_api" long-name="Crypto Input/Output and Data Encoding API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
-</component>
-<component name="crypto_public_key_cryptography_and_key_agreement_api" long-name="Crypto Public Key Cryptography and Key Agreement API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
-</component>
-<component name="crypto_symmetric_ciphers_api" long-name="Crypto Symmetric Ciphers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_symmetric_ciphers_api/group"/>
-</component>
-<component name="crypto_utility_functions_api" long-name="Crypto Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_utility_functions_api/group"/>
-</component>
-<component name="cryptogaphy_related_api" long-name="Cryptogaphy Related API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cryptogaphy_related_api/group"/>
-</component>
-<component name="ossrv_debug_api" long-name="Generic OS Services Debug API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/debug/group"/>
-</component>
-<component name="ossrv_exceptions_api" long-name="Generic OS Services Exceptions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/exceptions/group"/>
-</component>
-<component name="gboxed" long-name="GBoxed API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gboxed/group"/>
-</component>
-<component name="glib_arrays" long-name="Glib Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_arrays/group"/>
-</component>
-<component name="glib_asynchronous_queues" long-name="Glib Asynchronous Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_asynchronous_queues/group"/>
-</component>
-<component name="glib_atomic_operations" long-name="Glib Atomic Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_atomic_operations/group"/>
-</component>
-<component name="glib_automatic_string_completion" long-name="Glib Automatic String Completion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_automatic_string_completion/group"/>
-</component>
-<component name="glib_balanced_binary_trees" long-name="Glib Balanced Binary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_balanced_binary_trees/group"/>
-</component>
-<component name="glib_basic_types" long-name="Glib Basic Types API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_basic_types/group"/>
-</component>
-<component name="glib_caches" long-name="Glib Caches API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_caches/group"/>
-</component>
-<component name="glib_character_set_conversion" long-name="Glib Character Set Conversion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_character_set_conversion/group"/>
-</component>
-<component name="glib_closures" long-name="Glib Closures API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_closures/group"/>
-</component>
-<component name="glib_commandline_option_parser" long-name="Glib Command Line Option Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_commandline_option_parser/group"/>
-</component>
-<component name="glib_datasets" long-name="Glib Datasets API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_datasets/group"/>
-</component>
-<component name="glib_date_and_time_functions" long-name="Glib Date and Time Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_date_and_time_functions/group"/>
-</component>
-<component name="glib_doubleended_queues" long-name="Glib Double-ended Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doubleended_queues/group"/>
-</component>
-<component name="glib_doublylinked_lists" long-name="Glib Doubly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doublylinked_lists/group"/>
-</component>
-<component name="glib_dynamic_loading_of_modules" long-name="Glib Dynamic Loading of Modules API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_dynamic_loading_of_modules/group"/>
-</component>
-<component name="glib_enums_and_flags" long-name="Glib Enums and Flags API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_enums_and_flags/group"/>
-</component>
-<component name="glib_error_reporting" long-name="Glib Error Reporting API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_error_reporting/group"/>
-</component>
-<component name="glib_file_utilities" long-name="Glib File Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_file_utilities/group"/>
-</component>
-<component name="glib_generic_values" long-name="Glib Generic Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_generic_values/group"/>
-</component>
-<component name="glib_globstyle_pattern_matching" long-name="Glib Glob-Style Pattern Matching API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_globstyle_pattern_matching/group"/>
-</component>
-<component name="glib_hash_tables" long-name="Glib Hash Tables API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hash_tables/group"/>
-</component>
-<component name="glib_hook_functions" long-name="Glib Hook Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hook_functions/group"/>
-</component>
-<component name="glib_internationalization" long-name="Glib Internationalization API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_internationalization/group"/>
-</component>
-<component name="glib_io_channels" long-name="Glib I/O Channels API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_io_channels/group"/>
-</component>
-<component name="glib_keyvalue_file_parser" long-name="Glib Key-Value File Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_keyvalue_file_parser/group"/>
-</component>
-<component name="glib_lexical_scanner" long-name="Glib Lexical Scanner API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_lexical_scanner/group"/>
-</component>
-<component name="glib_main_event_loop" long-name="Glib Main Event Loop API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_main_event_loop/group"/>
-</component>
-<component name="glib_memory_allocation" long-name="Glib Memory Allocation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_allocation/group"/>
-</component>
-<component name="glib_memory_slices" long-name="Glib Memory Slices API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_slices/group"/>
-</component>
-<component name="glib_message_logging" long-name="Glib Message Logging API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_message_logging/group"/>
-</component>
-<component name="glib_miscellaneous_utility_functions" long-name="Glib Miscellaneous Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_miscellaneous_utility_functions/group"/>
-</component>
-<component name="glib_nary_trees" long-name="Glib N-ary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_nary_trees/group"/>
-</component>
-<component name="glib_parameters_and_values" long-name="Glib Parameters and Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_parameters_and_values/group"/>
-</component>
-<component name="glib_quarks" long-name="Glib Quarks API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_quarks/group"/>
-</component>
-<component name="glib_random_numbers" long-name="Glib Random Numbers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_random_numbers/group"/>
-</component>
-<component name="glib_relations_and_tuples" long-name="Glib Relations and Tuples API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_relations_and_tuples/group"/>
-</component>
-<component name="glib_shellrelated_utilities" long-name="Glib Shell-related Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_shellrelated_utilities/group"/>
-</component>
-<component name="glib_signals" long-name="Glib Signals API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_signals/group"/>
-</component>
-<component name="glib_simple_xml_subset_parser" long-name="Glib Simple XML Subset Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_simple_xml_subset_parser/group"/>
-</component>
-<component name="glib_singlylinked_lists" long-name="Glib Singly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_singlylinked_lists/group"/>
-</component>
-<component name="glib_spawning_processes" long-name="Glib Spawning Processes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_spawning_processes/group"/>
-</component>
-<component name="glib_standard_macros" long-name="Glib Standard Macros API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_standard_macros/group"/>
-</component>
-<component name="glib_string_utility_functions" long-name="Glib String Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_string_utility_functions/group"/>
-</component>
-<component name="glib_strings" long-name="Glib Strings API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_strings/group"/>
-</component>
-<component name="glib_thread_pools" long-name="Glib Thread Pools API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_thread_pools/group"/>
-</component>
-<component name="glib_threads" long-name="Glib Threads API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_threads/group"/>
-</component>
-<component name="glib_timers" long-name="Glib Timers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_timers/group"/>
-</component>
-<component name="glib_unicode_manipulation" long-name="Glib Unicode Manipulation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_unicode_manipulation/group"/>
-</component>
-<component name="glib_value_arrays" long-name="Glib Value Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_value_arrays/group"/>
-</component>
-<component name="glib_varargs_value_collection" long-name="Glib Varargs Value Collection API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_varargs_value_collection/group"/>
-</component>
-<component name="gobject" long-name="GObject API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gobject/group"/>
-</component>
-<component name="gparamspec" long-name="GParamSpec API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gparamspec/group"/>
-</component>
-<component name="gtype" long-name="GType API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtype/group"/>
-</component>
-<component name="gtypemodule" long-name="GTypeModule API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypemodule/group"/>
-</component>
-<component name="gtypeplugin" long-name="GTypePlugin API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypeplugin/group"/>
-</component>
-<component name="io_stream_api" long-name="I/O stream API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/io_stream_api/group"/>
-</component>
-<component name="localization_function_api" long-name="Localization Function API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/localization_function_api/group"/>
-</component>
-<component name="math_operations_api" long-name="Math Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/math_operations_api/group"/>
-</component>
-<component name="ossrv_memory_api" long-name="Generic OS Services Memory API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/memory/group"/>
-</component>
-<component name="no_namespace_headers" long-name="No Namespace Headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/no_namespace_headers/group"/>
-</component>
-<component name="openc_headers" long-name="OpenC headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_headers/group"/>
-</component>
-<component name="openc_wrappers" long-name="OpenC wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_wrappers/group"/>
-</component>
-<component name="ssl_general_api" long-name="SSL General API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_general_api/group"/>
-</component>
-<component name="ssl_protocol_methods_api" long-name="SSL Protocol Methods API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_protocol_methods_api/group"/>
-</component>
-<component name="standard_compressiondecompression_api" long-name="Standard Compression/Decompression API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/standard_compressiondecompression_api/group"/>
-</component>
-<component name="stl" long-name="STL API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/stl/group"/>
-</component>
-<component name="thread_api" long-name="Thread API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/thread_api/group"/>
-</component>
-<component name="type_attributes" long-name="Type Attributes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/type_attributes/group"/>
-</component>
-<component name="typeinfo" long-name="Type Info API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/typeinfo/group"/>
-</component>
-<component name="utility_apis" long-name="Utility APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/utility_apis/group"/>
-</component>
-<component name="wide_character_classapis" long-name="Wide character class/apis" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/wide_character_classapis/group"/>
-</component>
-<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">
-<unit bldFile="os/ossrv/ossrv_pub/dbus-glib/group"/>
-</component>
-</collection>
-<collection name="ossrv_plat" long-name="Generic OS Services Platform Interfaces" level="utilities">
-<component name="libutils_apis" long-name="Utility Library APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_plat/libutils/group"/>
-</component>
-</collection>
-<collection name="stdlibs" long-name="Standard Libraries" level="translation">
-<component name="libz" filter="s60" long-name="Z Compression Library">
-<unit bldFile="os/ossrv/stdlibs/libz/group"/>
-</component>
-<component name="libcrypt" filter="s60" long-name="Crypt Library">
-<unit bldFile="os/ossrv/stdlibs/libcrypt/group"/>
-</component>
-</collection>
-<collection name="ssl" long-name="SSL" level="data-services">
-<component name="libcrypto" filter="s60" long-name="Crypto Library">
-<unit bldFile="os/ossrv/ssl/libcrypto/group"/>
-</component>
-<component name="libssl" filter="s60" purpose="development" long-name="SSL Library">
-<unit bldFile="os/ossrv/ssl/libssl/group"/>
-</component>
-</collection>
-<collection name="glib" long-name="GLib" level="utilities">
-<component name="glibbackend" filter="s60" long-name="GLib Backend">
-<unit bldFile="os/ossrv/glib/glibbackend/group"/>
-</component>
-<component name="libglib" filter="s60" long-name="GLib Library">
-<unit bldFile="os/ossrv/glib/libglib/group"/>
-</component>
-<component name="libgthread" filter="s60" long-name="Libg Thread">
-<unit bldFile="os/ossrv/glib/libgthread/group"/>
-</component>
-<component name="libgmodule" filter="s60" long-name="Libg Module">
-<unit bldFile="os/ossrv/glib/libgmodule/group"/>
-</component>
-<component name="libgobject" filter="s60" long-name="Libg Object">
-<unit bldFile="os/ossrv/glib/libgobject/group"/>
-</component>
-</collection>
-<collection name="stdcpp" long-name="C++ Standard Library" level="translation">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="stdcpp_build" filter="s60" long-name="Stdcpp">
-<unit bldFile="os/ossrv/stdcpp/group"/>
-</component>
-</collection>
-<collection name="ofdbus" long-name="Open Foundation D-Bus" level="utilities">
-<component name="dbus" filter="s60" long-name="D-Bus">
-<unit bldFile="os/ossrv/ofdbus/dbus/group"/>
-</component>
-<component name="dbus-glib" filter="s60" long-name="D-Bus GLib">
-<unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
-</component>
-<component name="ofdbus_rom" filter="s60" long-name="D-Bus ROM">
-<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory
- Consider moving IBY file to one of the above as well and removing this component entirely -->
-<unit bldFile="os/ossrv/ofdbus/group"/>
-</component>
-</collection>
-<collection name="utilitylibraries" long-name="Utility Libraries" level="encoding">
-<component name="libutils" filter="s60" long-name="Utility Library">
-<unit bldFile="os/ossrv/utilitylibraries/libutils/group"/>
-</component>
-</collection>
-<collection name="genericservices" long-name="Generic Services" level="utilities">
-<component name="s60compatibilityheaders" long-name="S60 Compatibility Headers" filter="gt" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp" version="tb101sf"/>
-</component>
-<component name="mimerecognitionfw" long-name="MIME Recognition Framework" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/mimerecognitionfw/group" mrp="os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
-</component>
-<component name="systemagent" long-name="System Agent" introduced="9.0" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/systemagent/group" mrp="os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
-</component>
-<component name="taskscheduler" long-name="Task Scheduler" introduced="6.0" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/taskscheduler/group" mrp="os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
-</component>
-<component name="activebackupclient" long-name="Active Backup Client" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/activebackupclient/group" mrp="os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
-</component>
-<component name="syslibsdocs" long-name="Syslibs Documentation" purpose="development" class="doc">
-<unit mrp="os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
-</component>
-<component name="httputils" long-name="HTTP Utilities Library" introduced="6.2" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/httputils/group" mrp="os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
-</component>
-</collection>
-<collection name="syslibsapitest" long-name="SysLibs API Tests" level="utilities"/>
-<collection name="compressionlibs" long-name="Compression Libraries" level="data-services">
-<component name="ziplib" long-name="Zip Compression Library" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/ossrv/compressionlibs/ziplib/group" mrp="os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
-</component>
-</collection>
-<collection name="genericopenlibs" long-name="Generic Open Libraries" level="translation">
-<component name="cstdlib" long-name="C Standard Library" introduced="ER5" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/cstdlib/group" mrp="os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
-</component>
-<component name="cppstdlib" long-name="C++ Standard Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/cppstdlib/group" mrp="os/ossrv/genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
-</component>
-<component name="openenvcore" long-name="Open Environment Core" introduced="^2" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/openenvcore/group" mrp="os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
-</component>
-<component name="posixrealtimeextensions" long-name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/posixrealtimeextensions/group" mrp="os/ossrv/genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
-</component>
-</collection>
-<collection name="lowlevellibsandfws" long-name="Low Level Libraries and Frameworks" level="app-libs">
-<component name="pluginfw" long-name="Plugin Framework" introduced="6.2" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp" version="3"/>
-</component>
-<component name="apputils" long-name="Application Utilities" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/apputils/group" mrp="os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
-</component>
-<component name="genericusabilitylib" long-name="Generic Usability Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/genericusabilitylib/group" mrp="os/ossrv/lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
-</component>
-</collection>
-<collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
-<component name="ossrv_build" filter="s60" long-name="Generic OS Services Build">
-<!-- exports should be moved to individual components -->
-<unit bldFile="os/ossrv/group"/>
-</component>
-<component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="featuremgmt" long-name="Feature Management" level="framework">
-<component name="featuremgr" long-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 name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/persistentdata/featuremgmt/featureregistry/group" mrp="os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
-</component>
-</collection>
-<collection name="loggingservices" long-name="Logging Services" level="server">
-<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">
-<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">
-<unit bldFile="os/persistentdata/loggingservices/rfilelogger/group" mrp="os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
-</component>
-</collection>
-<collection name="traceservices" long-name="Trace Services" level="server">
-<component name="commsdebugutility" long-name="Comms Debug Utility" introduced="7.0s" purpose="optional">
-<unit bldFile="os/persistentdata/traceservices/commsdebugutility/group" mrp="os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
-</component>
-<component name="tracefw" long-name="Trace Framework" introduced="9.2" purpose="development">
-<unit bldFile="os/persistentdata/traceservices/tracefw/ulogger/group" mrp="os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
-</component>
-</collection>
-<collection name="persistentstorage" long-name="Persistent Storage" level="framework">
-<component name="store" long-name="Store" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/store/group" mrp="os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
-</component>
-<component name="dbms" long-name="DBMS" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/dbms/group" mrp="os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
-</component>
-<component name="centralrepository" long-name="Central Repository" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/persistentdata/persistentstorage/centralrepository/group" mrp="os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
-</component>
-<component name="sql" long-name="SQL" introduced="9.3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sql/GROUP" mrp="os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
-</component>
-<component name="sqlite3api" long-name="SQLite 3 API" introduced="^3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sqlite3api/GROUP" mrp="os/persistentdata/persistentstorage/sqlite3api/GROUP/syslibs_sqlite3.mrp"/>
-</component>
-</collection>
-<collection name="persistentdata_info" long-name="Persistent Data Services Info" level="app-if">
-<component name="persistentdata_metadata" long-name="Persistent Data Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/persistentdata/persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
-<component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
-</component>
-<component name="common_platform_security_definitions_api" long-name="Common Platform Security Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group"/>
-</component>
-<component name="feature_discovery_api" long-name="Feature Discovery API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/group"/>
-</component>
-<component name="platform_environment_api" long-name="Platform Environment API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_environment_api/group"/>
-</component>
-<component name="sensor_channel_api" long-name="Sensor Channel API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_channel_api/group"/>
-</component>
-<component name="sensor_definitions_api" long-name="Sensor Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_definitions_api/group"/>
-</component>
-<component name="version_info_api" long-name="Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/group"/>
-</component>
-<component name="accessory_monitoring_api" long-name="Accessory Monitoring API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/group"/>
-</component>
-<component name="haptics_api" long-name="Haptics API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/haptics_api/group"/>
-</component>
-<component name="sensor_data_compensator_api" long-name="Sensor Data Compensator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
-</component>
-</collection>
-<collection name="devicesrv_plat" long-name="Device Services Platform Interfaces" level="app-if">
-<component name="configuration_file_parser_api" long-name="Configuration File Parser API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/configuration_file_parser_api/group"/>
-</component>
-<component name="dos_extension_plugin_api" long-name="DOS Extension Plug-In API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_plugin_api/group"/>
-</component>
-<component name="mediator_command_initiator_api" long-name="Mediator Command Initiator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_initiator_api/group"/>
-</component>
-<component name="syslangutil_api" long-name="SysLangUtil API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/syslangutil_api/group"/>
-</component>
-<component name="wakeup_alarm_api" long-name="Wakeup Alarm API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/wakeup_alarm_api/group"/>
-</component>
-<component name="disk_and_memory_level_keys_api" long-name="Disk and Memory Level Keys API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_and_memory_level_keys_api/group"/>
-</component>
-<component name="mediator_plugin_api" long-name="Mediator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_plugin_api/group"/>
-</component>
-<component name="headset_status_api" long-name="Headset Status API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/headset_status_api/group"/>
-</component>
-<component name="system_startup_extension_plugin_api" long-name="System Startup Extension Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/system_startup_extension_plugin_api/group"/>
-</component>
-<component name="sensor_plugin_api" long-name="Sensor Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_plugin_api/group"/>
-</component>
-<component name="accessory_api" long-name="Accessory API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_api/group"/>
-</component>
-<component name="display_language_definition_api" long-name="Display Language Definition API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/display_language_definition_api/group"/>
-</component>
-<component name="mediator_command_responder_api" long-name="Mediator Command Responder API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_responder_api/group"/>
-</component>
-<component name="accessory_policy_definitions_api" long-name="Accessory Policy Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_definitions_api/group"/>
-</component>
-<component name="hw_settings_api" long-name="Hardware Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/hw_settings_api/group"/>
-</component>
-<component name="mediator_domain_definitions_api" long-name="Mediator Domain Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_domain_definitions_api/group"/>
-</component>
-<component name="sensor_extension_api" long-name="Sensor Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_extension_api/group"/>
-</component>
-<component name="accessory_plugin_api" long-name="Accessory Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_plugin_api/group"/>
-</component>
-<component name="sae_api" long-name="SAE API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sae_api/group"/>
-</component>
-<component name="accessory_control_api" long-name="Accessory Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_control_api/group"/>
-</component>
-<component name="mediator_static_registration_api" long-name="Mediator Static Registration API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_static_registration_api/group"/>
-</component>
-<component name="accessory_key_event_handling_api" long-name="Accessory Key Event Handling API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_key_event_handling_api/group"/>
-</component>
-<component name="mediator_notification_api" long-name="Mediator Notification API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_notification_api/group"/>
-</component>
-<component name="accessory_policy_utility_api" long-name="Accessory Policy Utility API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_utility_api/group"/>
-</component>
-<component name="common_dsy_plugin_api" long-name="Common DSY Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/common_dsy_plugin_api/group"/>
-</component>
-<component name="remote_control_extension_api" long-name="Remote Control Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/remote_control_extension_api/group"/>
-</component>
-<component name="sensor_channel_filter_api" long-name="Sensor Channel Filter API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_channel_filter_api/group"/>
-</component>
-<component name="dos_extension_api" long-name="DOS Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_api/group"/>
-</component>
-<component name="accessory_audio_control_api" long-name="Accessory Audio Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_audio_control_api/group"/>
-</component>
-<component name="mediator_event_consumer_api" long-name="Mediator Event Consumer API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_consumer_api/group"/>
-</component>
-<component name="shared_data_api" long-name="Shared Data API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/shared_data_api/group"/>
-</component>
-<component name="accessory_settings_api" long-name="Accessory Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_settings_api/group"/>
-</component>
-<component name="accessory_bluetooth_control_api" long-name="Accessory Bluetooth Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_bluetooth_control_api/group"/>
-</component>
-<component name="extended_version_info_api" long-name="Extended Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_api/group"/>
-</component>
-<component name="mediator_event_provider_api" long-name="Mediator Event Provider API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_provider_api/group"/>
-</component>
-<component name="tv_out_config_api" long-name="TV Out Config API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_config_api/group"/>
-</component>
-<component name="tspclientmapper_api" long-name="TSP Client Mapper API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tspclientmapper_api/group"/>
-</component>
-<component name="powersave_api" long-name="Power Save API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_api/group"/>
-</component>
-<component name="powersave_definitions_api" long-name="Power Save Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_definitions_api/group"/>
-</component>
-<component name="powersave_plugin_api" long-name="Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_plugin_api/group"/>
-</component>
-<component name="extended_version_info_plugin_api" long-name="Extended Version Info Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_plugin_api/group"/>
-</component>
-<component name="haptics_plugin_api" long-name="Haptics Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_plugin_api/group"/>
-</component>
-<component name="haptics_effect_data_getter_plugin_api" long-name="Haptics Effect Data Getter Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
-</component>
-<component name="haptics_packetizer_plugin_api" long-name="Haptics Packetizer Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_packetizer_plugin_api/group"/>
-</component>
-<component name="tiltcompensation_api" long-name="Tilt Compensation API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tiltcompensation_api/group"/>
-</component>
-<component name="disk_notification_handler_api" long-name="Disk Notification Handler API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_notification_handler_api/group"/>
-</component>
-<component name="accessory_policy_usb_audio_api" long-name="Accessory Policy USB Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_usb_audio_api/group"/>
-</component>
-<component name="accessory_policy_hdmi_audio_api" long-name="Accessory Policy HDMI Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_hdmi_audio_api/group"/>
-</component>
-<component name="sensor_data_compensator_plugin_api" long-name="Sensor Data Compensator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
-</component>
-<component name="ddc_access_api" long-name="DDC Access API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/ddc_access_api/group"/>
-</component>
-<component name="tv_out_behaviour_api" long-name="TV Out Behaviour API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_behaviour_api/group"/>
-</component>
-</collection>
-<collection name="accessoryservices" long-name="Accessory Services" level="framework">
-<component name="accessorymonitor" filter="s60" long-name="Accessory Monitor">
-<unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/group"/>
-</component>
-<component name="accessoryremotecontrol" filter="s60" long-name="Accessory Remote Control">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
-</component>
-<component name="accessoryserver" filter="s60" long-name="Accessory Server">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryserver/group"/>
-</component>
-<component name="pluggeddisplay" filter="s60" long-name="Plugged Display" introduced="^3">
-<unit bldFile="os/devicesrv/accessoryservices/pluggeddisplay/group"/>
-</component>
-<component name="headsetstatusapi" filter="s60" long-name="Headset Status API">
-<unit bldFile="os/devicesrv/accessoryservices/headsetstatusapi/group"/>
-</component>
-<component name="tspclientmapper" filter="s60" long-name="TSP Client Mapper">
-<unit bldFile="os/devicesrv/accessoryservices/tspclientmapper/group"/>
-</component>
-<component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional">
-<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
-</component>
-<component name="gid_pc_tool" filter="s60" long-name="Generic ID PC Tool" class="tool PC">
-<unit bldFile="os/devicesrv/accessoryservices/gid_pc_tool/group"/>
-</component>
-</collection>
-<collection name="commonservices" long-name="Common Services" level="app-if">
-<component name="commonengine" filter="s60" long-name="Common Engine">
-<unit bldFile="os/devicesrv/commonservices/commonengine/group"/>
-</component>
-<component name="commonengineresources" filter="s60" long-name="Common Engine Resources" class="config">
-<unit bldFile="os/devicesrv/commonservices/commonengineresources/group"/>
-</component>
-<component name="platformenv" filter="s60" long-name="Platform Environment">
-<unit bldFile="os/devicesrv/commonservices/platformenv/group"/>
-</component>
-<component name="sysutil" long-name="System Utilities" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/sysutil/group" mrp="os/devicesrv/commonservices/sysutil/group/sysutil.mrp"/>
-</component>
-<component name="activitymanager" long-name="Activity Manager" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/activitymanager/group" mrp="os/devicesrv/commonservices/activitymanager/group/activitymanager.mrp"/>
-</component>
-</collection>
-<collection name="dosservices" long-name="Domestic Operating System Services" level="hw-if">
-<component name="commondsy" filter="s60" long-name="Common DSY" plugin="Y">
-<unit bldFile="os/devicesrv/dosservices/commondsy/group"/>
-</component>
-<component name="dosserver" filter="s60" long-name="Domestic OS Server">
-<unit bldFile="os/devicesrv/dosservices/dosserver/group"/>
-</component>
-</collection>
-<collection name="sensorservices" long-name="Sensor Services" level="framework">
-<component name="sensorserver" filter="s60" long-name="Sensor Server">
-<unit bldFile="os/devicesrv/sensorservices/sensorserver/group"/>
-</component>
-<component name="orientationssy" filter="s60" long-name="Orientation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/orientationssy/group"/>
-</component>
-<component name="tiltcompensationssy" filter="s60" long-name="Tilt Compensation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/tiltcompensationssy/group"/>
-</component>
-<component name="sensordatacompensator" filter="s60" long-name="Sensor Data Compensator">
-<unit bldFile="os/devicesrv/sensorservices/sensordatacompensator/group"/>
-</component>
-</collection>
-<collection name="hwrmhaptics" long-name="HWRM Haptics" level="plugin">
-<component name="hapticseffectdatagetterfw" filter="s60" long-name="Haptics Effect Data Getter Framework">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
-</component>
-<component name="hapticspluginservice" filter="s60" long-name="Haptics Plugin Service">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
-</component>
-<component name="hapticspacketizer" filter="s60" long-name="Haptics Packetizer">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
-</component>
-<component name="hapticspluginmanager" filter="s60" long-name="Haptics Plugin Manager">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
-</component>
-<component name="hapticsserver" filter="s60" long-name="Haptics Server">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsserver/group"/>
-</component>
-<component name="hapticsclient" filter="s60" long-name="Haptics Client">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsclient/group"/>
-</component>
-<component name="hwrmhaptics_build" filter="s60" long-name="HWRM Haptics Build">
-<!-- move these exports into the appropriate above components and delete this component-->
-<unit bldFile="os/devicesrv/hwrmhaptics/group"/>
-</component>
-</collection>
-<collection name="mediator" long-name="Mediator" level="app-if">
-<!--collection is really a component. Move it down a directory -->
-<component name="mediator_build" filter="s60" long-name="Mediator Build">
-<unit bldFile="os/devicesrv/mediator/group"/>
-</component>
-</collection>
-<collection name="psmservices" long-name="Power Save Mode Services" level="app-if">
-<component name="psmserver" filter="s60" long-name="PSM Server">
-<unit bldFile="os/devicesrv/psmservices/psmserver/group"/>
-</component>
-</collection>
-<collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
-<component name="hwrmfmtxwatcherplugin" filter="s60" long-name="HWRM FM Transmitter Watcher Plugin" plugin="Y">
-<unit bldFile="os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
-</component>
-<component name="hwrmtargetmodifierplugin" filter="s60" long-name="HWRM Target Modifier Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build,
- may need to -->
-<!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
-</component>
-<component name="vibractrl" filter="s60" long-name="Vibra Control" deprecated="9.1">
-<unit bldFile="os/devicesrv/resourcemgmt/vibractrl/group"/>
-</component>
-<component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="^2" purpose="optional">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
-</component>
-<component name="hwresourcesmgrconfig" long-name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
-</component>
-<component name="resourcemgmt_build" filter="s60" long-name="Resource Management Build">
-<!-- Move exports to a self-contained component.
- This needs to be kept around until configuration is in place -->
-<unit bldFile="os/devicesrv/resourcemgmt/group"/>
-</component>
-<component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
-</component>
-</collection>
-<collection name="sysstatemgmt" long-name="System State Management" level="server">
-<component name="ssmmapperutility" filter="s60" long-name="SSM Mapper Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmmapperutility/group"/>
-</component>
-<component name="ssmpolicyplugins" filter="s60" long-name="SSM Policy Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmpolicyplugins/group"/>
-</component>
-<component name="ssmutilityplugins" filter="s60" long-name="SSM Utility Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmutilityplugins/group"/>
-</component>
-<component name="ssmcmdlists" filter="s60" long-name="SSM Command Lists" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcmdlists/group"/>
-</component>
-<component name="ssmcustcmds" filter="s60" long-name="SSM Custom Commands" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcustcmds/group"/>
-</component>
-<component name="syslangutil" filter="s60" long-name="System Language Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/syslangutil/group"/>
-</component>
-<component name="sysrestart" filter="s60" long-name="System Restart" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysrestart/group"/>
-</component>
-<component name="sysuiprovider" filter="s60" long-name="System UI Provider" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysuiprovider/group"/>
-</component>
-<component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/group" mrp="os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
-</component>
-<component name="systemstatemgr" long-name="System State Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
-</component>
-<component name="systemstateplugins" long-name="System State Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
-</component>
-<component name="systemstatereferenceplugins" long-name="System State Reference Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
-</component>
-</collection>
-<collection name="resourceinterfaces" long-name="Resource Interfaces" level="hw-if">
-<component name="fmtransmittercontrol" long-name="FM Transmitter Control" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group" mrp="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
-</component>
-</collection>
-<collection name="systemhealthmanagement" long-name="System Health Management" level="server">
-<component name="systemhealthmgr" long-name="System Health Manager" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
-</component>
-</collection>
-<collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if"/>
-<collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
-<component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
-<collection name="authenticationservices" long-name="Authentication Services" level="utilities">
-<component name="authenticationserver" long-name="Authentication Server" introduced="^3" purpose="optional">
-<unit bldFile="os/security/authenticationservices/authenticationserver/group" mrp="os/security/authenticationservices/authenticationserver/group/security_authserver.mrp"/>
-</component>
-</collection>
-<collection name="authorisation" long-name="Authorisation" level="utilities">
-<component name="userpromptservice" long-name="User Prompt Service" introduced="^3" purpose="mandatory">
-<unit bldFile="os/security/authorisation/userpromptservice/group" mrp="os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
-</component>
-<component name="userpromptutils" long-name="User Prompt Utils" introduced="^3" purpose="optional">
-<unit bldFile="os/security/authorisation/userpromptutils/group" mrp="os/security/authorisation/userpromptutils/group/security_ups_utils.mrp"/>
-</component>
-</collection>
-<collection name="contentmgmt" long-name="Content Management" level="utilities">
-<component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
-<unit bldFile="os/security/contentmgmt/contentaccessfwfordrm/group" mrp="os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
-</component>
-<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>
-</collection>
-<collection name="crypto" long-name="Crypto Libraries" level="libraries">
-<component name="weakcryptospi" long-name="Weak Crypto SPI" filter="gt" introduced="^3" purpose="optional">
-<unit bldFile="os/security/crypto/weakcryptospi/group" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
-</component>
-<component name="strongcryptospi" long-name="Strong Crypto SPI" filter="gt" introduced="^3" purpose="optional">
-<unit bldFile="os/security/crypto/weakcryptospi/strong" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
-</component>
-</collection>
-<collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
-<component name="securityutils" long-name="Security Utils" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/securityutils/group" mrp="os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
-</component>
-<component name="securitydocs" long-name="Security Documentation" purpose="development" class="doc">
-<unit mrp="os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
-</component>
-<component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
-</component>
-<component name="securitycommonutils" long-name="Security Common Utils" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/security/cryptomgmtlibs/securitycommonutils/group" mrp="os/security/cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
-</component>
-</collection>
-<collection name="securityanddataprivacytools" long-name="Security and Data Privacy Tools" level="services">
-<component name="securityconfig" long-name="Security Config" introduced="9.1" purpose="optional">
-<unit bldFile="os/security/securityanddataprivacytools/securityconfig/group" mrp="os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
-</component>
-<component name="securitytools" long-name="Security Tools" introduced="^3" purpose="optional" class="PC">
-<unit bldFile="os/security/securityanddataprivacytools/securitytools/group" mrp="os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
-</component>
-</collection>
-<collection name="cryptoplugins" long-name="Crypto Plugins" level="plugins">
-<component name="cryptospiplugins" long-name="Crypto SPI Plugins" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/security/cryptoplugins/cryptospiplugins/group" mrp="os/security/cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
-</component>
-</collection>
-<collection name="cryptoservices" long-name="Crypto Services" level="plugins">
-<component name="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/certificateandkeymgmt/group" mrp="os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
-</component>
-<component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
-</component>
-<component name="browserrootcertificates" long-name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
-<unit mrp="os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
-</component>
-<component name="rootcertificates" filter="sf_build" long-name="Root Certificates" introduced="7.0s" purpose="optional">
-<!-- not in S60 codebase -->
-<unit bldFile="os/security/cryptoservices/rootcertificates/group" mrp="os/security/cryptoservices/rootcertificates/group/rootcerts.mrp"/>
-</component>
-<component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/asnpkcs/group" mrp="os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
-</component>
-</collection>
-<collection name="security_info" long-name="OS Security Info" level="utilities">
-<component name="security_metadata" long-name="OS Security Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/security/security_info/security_metadata/security_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
-<collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
-<component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
-</component>
-<component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
-</component>
-<component name="simulationpositioningmodule" long-name="Simulation Positioning Module" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
-</component>
-<component name="gpspositioningmodule" long-name="GPS/A-GPS Positioning Module" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/gpspositioningmodule/group" mrp="os/lbs/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
-</component>
-<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>
-</collection>
-<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
-<component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
-</component>
-</collection>
-<collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
-<component name="locationserver" long-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 name="networkrequesthandler" long-name="Network Request Handler" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
-</component>
-</collection>
-<collection name="lbstest" long-name="Locating Services Tests" level="application-interface">
-<component name="locationprotocoltest" long-name="Location Protocol Tests" introduced="9.2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/lbstest/locationprotocoltest/group" mrp="os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
-</component>
-</collection>
-<collection name="locationmgmt" long-name="Location Management" level="management">
-<component name="locmonitor" long-name="Location Monitor" introduced="^3" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
-</component>
-<component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/agpslocationmgr/group" mrp="os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
-</component>
-<component name="networklocationmgr" long-name="Network Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/networklocationmgr/group" mrp="os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
-</component>
-<component name="locationcore" long-name="Location Core" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locationcore/group" mrp="os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
-</component>
-<component name="networkgateway" long-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 name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
-<component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
-</component>
-<component name="suplrrlpasn1" filter="sf_build" long-name="SUPL RRLP ASN1 Parser">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
-</component>
-</collection>
-<collection name="lbsapitest" long-name="Location API Tests" level="application-interface"/>
-<collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
-<component name="lbs_metadata" long-name="Locating Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commsfw" level="services" long-name="Communications Framework" levels="server support framework process app-if">
-<collection name="commsprocess" long-name="Comms Process" level="process">
-<component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/commsfw/commsprocess/commsrootserverconfig/group" mrp="os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
-</component>
-</collection>
-<collection name="commsconfig" long-name="Comms Config" level="process">
-<component name="commsdatabase" long-name="Comms Database" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
-</component>
-<component name="commsdatabaseshim" long-name="Comms Database Shim" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/commsfw/commsconfig/commsdatabaseshim/group" mrp="os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
-</component>
-</collection>
-<collection name="datacommsserver" long-name="Data Comms Server" level="framework">
-<component name="esockserver" long-name="ESock Server" purpose="mandatory">
-<unit bldFile="os/commsfw/datacommsserver/esockserver/group" mrp="os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp" version="3"/>
-</component>
-<component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/group" mrp="os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
-</component>
-<component name="networkingdialogstub" long-name="Networking Dialog Stub" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/default" mrp="os/commsfw/datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
-</component>
-<component name="networkcontroller" long-name="Network Controller" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/datacommsserver/networkcontroller/group" mrp="os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
-</component>
-</collection>
-<collection name="serialserver" long-name="Serial Server" level="server">
-<component name="serialportcsy" long-name="Serial Port CSY" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/serialserver/serialportcsy" mrp="os/commsfw/serialserver/serialportcsy/ser-comms_serialportcsy.mrp"/>
-</component>
-<component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" purpose="development">
-<unit bldFile="os/commsfw/serialserver/packetloopbackcsy/group" mrp="os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
-</component>
-<component name="c32serialserver" long-name="C32 Serial Server" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/commsfw/serialserver/c32serialserver/group" mrp="os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
-</component>
-<component name="c32serialserverconfig" long-name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config">
-<unit bldFile="os/commsfw/serialserver/c32serialserverconfig" mrp="os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
-</component>
-<component name="c32serialserverdocs" long-name="C32 Serial Server Documentation" purpose="development" class="doc">
-<unit mrp="os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
-</component>
-</collection>
-<collection name="commsfwutils" long-name="Comms Framework Utilities" level="framework">
-<component name="commsbufs" long-name="Comms Buffers" introduced="^3" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwutils/commsbufs/group" mrp="os/commsfw/commsfwutils/commsbufs/group/comms-infras_commsbufs.mrp"/>
-</component>
-</collection>
-<collection name="commsfw_info" long-name="Comms Framework Info" level="app-if">
-<component name="commsinfrastructuredocs" long-name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
-<unit mrp="os/commsfw/commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
-</component>
-<component name="commsfw_metadata" long-name="Communications Framework Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/commsfw/commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
-</component>
-</collection>
-<collection name="commsfwsupport" long-name="Comms Framework Support" level="support">
-<component name="commselements" long-name="Comms Elements" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwsupport/commselements/group" mrp="os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
-</component>
-</collection>
-<collection name="commsinfrastructureapitest" long-name="Comms-Infras API Tests" level="app-if">
-<component name="commsinfrastructuresvs" long-name="Comms Infrastructure Verification Suite" introduced="^3" purpose="development">
-<unit mrp="os/commsfw/commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
-</component>
-</collection>
-<collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
-<component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
-</component>
-<component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" purpose="mandatory" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
-</component>
-<component name="commstools" long-name="Comms Tools" introduced="^3" purpose="development" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/commstools/group" mrp="os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
-</component>
-</collection>
-</block>
-<block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
-<component name="internetsockets" long-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>
-<collection name="tcpiputils" long-name="TCP/IP Utilities" level="plugin">
-<component name="dnd" long-name="DND" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/dnd/group" mrp="os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
-</component>
-<component name="dhcp" long-name="DHCP" introduced="8.0" purpose="optional">
-<unit bldFile="os/networkingsrv/tcpiputils/dhcp/group" mrp="os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
-</component>
-<component name="networkaddressandporttranslation" long-name="Network Address and Port Translation" introduced="^2" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
-</component>
-<component name="punycodeconv" long-name="Punycode Converter" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/punycodeconv/group" mrp="os/networkingsrv/tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
-</component>
-</collection>
-<collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
-<component name="nullagt" long-name="NULL AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/nullagt/group" mrp="os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
-</component>
-<component name="genericscprparameters" long-name="Generic SCPR Parameters" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/linklayercontrol/genericscprparameters/group" mrp="os/networkingsrv/linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
-</component>
-<component name="mbmsparameters" long-name="MBMS Parameters" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/mbmsparameters/group" mrp="os/networkingsrv/linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
-</component>
-<component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
-<unit bldFile="os/networkingsrv/linklayercontrol/networkinterfacemgr/group" mrp="os/networkingsrv/linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp" version="2"/>
-</component>
-</collection>
-<collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
-<component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
-</component>
-<component name="pppnif" long-name="PPP NIF" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/pppnif/group" mrp="os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp" version="2"/>
-</component>
-<component name="slipnif" long-name="SLIP NIF" purpose="development" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/slipnif/group" mrp="os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
-</component>
-<component name="tunnelnif" long-name="Tunnel NIF" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
-</component>
-</collection>
-<collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
-<component name="packetlogger" long-name="Packet Logger" introduced="8.1" purpose="development">
-<unit bldFile="os/networkingsrv/linklayerutils/packetlogger/group" mrp="os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
-</component>
-</collection>
-<collection name="networkcontrol" long-name="Network Control" level="plugin">
-<component name="qoslib" long-name="QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/qoslib/group" mrp="os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
-</component>
-<component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/pfqoslib/group" mrp="os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
-</component>
-<component name="qosfwprt" long-name="QoS Framework PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
-</component>
-<component name="qosipscpr" long-name="QoS IP SCPR" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosipscpr/group" mrp="os/networkingsrv/networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
-</component>
-<component name="ipnetworklayer" long-name="IP Network Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/ipnetworklayer/group" mrp="os/networkingsrv/networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
-</component>
-<component name="iptransportlayer" long-name="IP Transport Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/iptransportlayer/group" mrp="os/networkingsrv/networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
-</component>
-<component name="commsuserpromptmgr" long-name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkcontrol/commsuserpromptmgr/group" mrp="os/networkingsrv/networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
-</component>
-</collection>
-<collection name="networkprotocols" long-name="Network Protocols" level="plugin">
-<component name="ipeventnotifier" long-name="IP Event Notifier" introduced="8.1" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
-</component>
-<component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
-</component>
-<component name="iphook" long-name="IP Hook" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
-</component>
-<component name="mobileip" long-name="Mobile IP" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/mobileip/group" mrp="os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
-</component>
-<component name="dnsproxy" long-name="DNS Proxy" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/networkprotocols/dnsproxy/group" mrp="os/networkingsrv/networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
-</component>
-</collection>
-<collection name="networksecurity" long-name="Network Security" level="framework">
-<component name="tls" long-name="TLS" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tls/group" mrp="os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
-</component>
-<component name="tlsprovider" long-name="TLS Provider" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tlsprovider/group" mrp="os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
-</component>
-<component name="ipsec" long-name="IPsec" introduced="7.0" purpose="optional">
-<unit bldFile="os/networkingsrv/networksecurity/ipsec/group" mrp="os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
-</component>
-</collection>
-<collection name="networkingtestandutils" long-name="Networking Test and Utils" level="app-if">
-<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">
-<!-- production component: contains the IBY files -->
-<unit bldFile="os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
-</component>
-<component name="networkingdocs" long-name="Networking Documentation" purpose="development" class="doc">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
-</component>
-<component name="networkingsrv_metadata" long-name="Networking Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
-<component name="predictorcompression" long-name="Predictor Compression" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wlan" level="services" long-name="WLAN" levels="hw low mid high tools test">
-<collection name="wlan_plat" long-name="WLAN Platform Interfaces" level="test">
-<component name="wlan_dbif_api" long-name="WLAN DBIF API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_dbif_api/group"/>
-</component>
-<component name="wlan_hal_api" long-name="WLAN HAL API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hal_api/group"/>
-</component>
-<component name="wlan_management_api" long-name="WLAN Management API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_management_api/group"/>
-</component>
-<component name="wlan_device_settings_api" long-name="WLAN Device Settings API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_device_settings_api/group"/>
-</component>
-<component name="wlan_control_api" long-name="WLAN Control API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_control_api/group"/>
-</component>
-<component name="wlan_hw_initialization_data_api" long-name="WLAN Hardware Initialization Data API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hw_initialization_data_api/group"/>
-</component>
-<component name="wlan_power_save_plugin_api" long-name="WLAN Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_power_save_plugin_api/group"/>
-</component>
-<component name="wlan_info_api" long-name="WLAN Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_info_api/group"/>
-</component>
-<component name="wlan_agent_hotspot_plugin_api" long-name="WLAN Agent Hotspot Plug-in API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
-</component>
-<component name="wlan_osa_api" long-name="WLAN OSA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_osa_api/group"/>
-</component>
-<component name="wlan_spia_api" long-name="WLAN SPIA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_spia_api/group"/>
-</component>
-<component name="wlan_hpa_api" long-name="WLAN HPA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hpa_api/group"/>
-</component>
-<component name="wlan_eapol_plugin_api" long-name="WLAN EAPOL Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_eapol_plugin_api/group"/>
-</component>
-<component name="wlan_generic_plugin_api" long-name="WLAN Generic Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_generic_plugin_api/group"/>
-</component>
-<component name="wlan_aws_plugin_api" long-name="WLAN AWS Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_aws_plugin_api/group"/>
-</component>
-</collection>
-<collection name="wlan_pub" long-name="WLAN Public Interfaces" level="test">
-<component name="wlan_sdk_info_api" long-name="WLAN SDK Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_pub/wlan_sdk_info_api/group"/>
-</component>
-</collection>
-<collection name="wlan_bearer" long-name="WLAN Bearer" level="hw">
-<component name="wlanpsmplugin" filter="s60" long-name="WLAN PSM Plugin" plugin="Y">
-<unit bldFile="os/wlan/wlan_bearer/wlanpsmplugin/group"/>
-</component>
-<component name="wlanagent" filter="s60" long-name="WLAN Agent">
-<unit bldFile="os/wlan/wlan_bearer/wlanagent/group"/>
-</component>
-<component name="wlandbif_cd" filter="s60" long-name="WLAN CommsDat interface">
-<unit bldFile="os/wlan/wlan_bearer/wlandbif_cd/group"/>
-</component>
-<!-- should follow component directory rules for stuff in wlan_symbian/ and put in a single component or split up properly -->
-<component name="wlanengine" filter="s60" long-name="WLAN Engine">
-<unit bldFile="os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
-</component>
-<component name="wlanldd" filter="s60" long-name="WLAN LDD">
-<unit bldFile="os/wlan/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
-</component>
-<component name="wlannwif" filter="s60" long-name="WLAN Network Interface">
-<unit bldFile="os/wlan/wlan_bearer/wlannwif/group"/>
-</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="adaptation hw-if plugin framework server app-if">
-<collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
-<component name="basebandchanneladaptor" long-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 name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
-<component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
-</component>
-</collection>
-<collection name="fax" long-name="Fax" level="server">
-<component name="faxclientandserver" long-name="Fax Client and Server" purpose="optional">
-<unit bldFile="os/cellularsrv/fax/faxclientandserver/Group" mrp="os/cellularsrv/fax/faxclientandserver/Group/telephony_fax.mrp"/>
-</component>
-</collection>
-<collection name="smsprotocols" long-name="SMS Protocols" level="framework">
-<component name="smsstack" long-name="SMS Stack" introduced="6.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/cellularsrv/smsprotocols/smsstack/group" mrp="os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
-</component>
-</collection>
-<collection name="telephonyprotocols" long-name="Telephony Protocols" level="framework">
-<component name="csdagt" long-name="CSD AGT" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/csdagt/group" mrp="os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
-</component>
-<component name="psdagt" long-name="PSD AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/psdagt/group" mrp="os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
-</component>
-<component name="gprsumtsqosprt" long-name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
-</component>
-<component name="gprsumtsqosinterface" long-name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
-</component>
-<component name="qosextnapi" long-name="QoS Extn API" introduced="9.2" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
-</component>
-<component name="secondarypdpcontextumtsdriver" long-name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
-</component>
-<component name="qos3gppcpr" long-name="QoS 3GPP CPR" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
-</component>
-<component name="pdplayer" long-name="PDP Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/pdplayer/group" mrp="os/cellularsrv/telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
-</component>
-<component name="rawipnif" long-name="Raw IP NIF" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserver" long-name="Telephony Server" level="server">
-<component name="etelserverandcore" long-name="ETel Server and Core" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
-</component>
-<component name="etelmultimode" long-name="ETel Multimode" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelmultimode/group" mrp="os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
-</component>
-<component name="etelpacketdata" long-name="ETel Packet Data" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
-</component>
-<component name="etelsimtoolkit" long-name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
-<component name="common_tsy" long-name="Common TSY" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
-</component>
-<component name="licenseetsystub" long-name="Licensee TSY Stub" introduced="^2" purpose="development" filter="sf_build" plugin="Y">
-<unit mrp="os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="os/cellularsrv/telephonyserverplugins/licenseetsystub/group"/>
-</component>
-<component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
-</component>
-<component name="simtsy" long-name="SIM TSY" introduced="7.0" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
-</component>
-<component name="ctsydispatchlayer" long-name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
-</component>
-<component name="simatktsy" long-name="SIMATK TSY" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simatktsy/group" mrp="os/cellularsrv/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
-</component>
-</collection>
-<collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
-<component name="dial" long-name="Dial" deprecated="9.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyutils/dial/group" mrp="os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
-</component>
-<component name="telephonywatchers" long-name="Telephony Watchers" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
-</component>
-<component name="etel3rdpartyapi" long-name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrv_info" long-name="Cellular Baseband Services Info" level="app-if">
-<component name="telephonyconfidentialdocs" long-name="Telephony Confidential Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
-</component>
-<component name="telephonydocs" long-name="Telephony Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
-</component>
-<component name="cellularsrv_metadata" long-name="Cellular Baseband Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
-<component name="mocksy" long-name="MockSY" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if"/>
-</block>
-<block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
-<collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
-<component name="bluetooth_audio_adaptation_api" long-name="Bluetooth Audio Adaptation API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
-</component>
-<component name="bluetooth_power_management_api" long-name="Bluetooth Power Management API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_power_management_api/group"/>
-</component>
-<component name="at_command_handler_plugin_api" long-name="AT Command Handler Plugin API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/at_command_handler_plugin_api/group"/>
-</component>
-</collection>
-<collection name="bluetooth" long-name="Bluetooth Core" level="framework">
-<component name="btstack" long-name="Bluetooth Stack" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btstack" mrp="os/bt/bluetooth/btstack/bluetooth_stack.mrp"/>
-</component>
-<component name="btcomm" long-name="Bluetooth CSY" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetooth/btcomm" mrp="os/bt/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
-</component>
-<component name="btsdp" long-name="Bluetooth SDP" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btsdp" mrp="os/bt/bluetooth/btsdp/bluetooth_sdp.mrp"/>
-</component>
-<component name="btextnotifiers" long-name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btextnotifiers" mrp="os/bt/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
-</component>
-<component name="gavdp" long-name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/gavdp/group" mrp="os/bt/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
-</component>
-<component name="btlogger" long-name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btlogger/group" mrp="os/bt/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
-</component>
-<component name="btdocs" long-name="Bluetooth Documentation" purpose="development" class="doc">
-<unit mrp="os/bt/bluetooth/btdocs/bluetooth_documentation.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothmgmt" long-name="Bluetooth Management" level="plugin">
-<component name="btmgr" long-name="Bluetooth Manager" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btmgr" mrp="os/bt/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
-</component>
-<component name="btconfig" long-name="Bluetooth Config" purpose="optional" class="config">
-<unit bldFile="os/bt/bluetoothmgmt/btconfig" mrp="os/bt/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
-</component>
-<component name="btrom" long-name="Bluetooth ROM" introduced="9.1" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btrom" mrp="os/bt/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
-</component>
-<component name="bluetoothclientlib" long-name="Bluetooth Client Library" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/bluetoothclientlib" mrp="os/bt/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothcommsprofiles" long-name="Bluetooth Comms Profiles" level="app-if">
-<component name="btpan" long-name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetoothcommsprofiles/btpan/group" mrp="os/bt/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
-</component>
-</collection>
-<collection name="bthci" long-name="Host Controller Interface" level="server">
-<component name="bthci2" long-name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bthci/bthci2/group" mrp="os/bt/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
-</component>
-<component name="hciextensioninterface" long-name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bthci/hciextensioninterface" mrp="os/bt/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
-</component>
-<component name="hci2implementations" long-name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bthci/hci2implementations/group" mrp="os/bt/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
-</component>
-</collection>
-<collection name="irda" long-name="IrDA" level="plugin">
-<component name="irdastack" long-name="IrDA Stack" purpose="optional">
-<unit bldFile="os/bt/irda/irdastack/group" mrp="os/bt/irda/irdastack/group/infra-red_irda.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if"/>
-<collection name="atext" long-name="AT Extensions" level="server">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="atext_build" long-name="AT Extension Build" introduced="^3" purpose="optional" filter="s60">
-<unit bldFile="os/bt/atext/group"/>
-</component>
-</collection>
-<collection name="bt_info" long-name="Bluetooth Info" level="app-if">
-<component name="bt_metadata" long-name="Bluetooth Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/bt/bt_info/bt_metadata/bt_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
-<collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
-<!-- usbclientdrivers to be moved here from kernelhwsrv-->
-</collection>
-<collection name="usbmgmt" long-name="USB Management" level="server">
-<component name="usbmgr" long-name="USB Manager" purpose="optional">
-<unit bldFile="os/usb/usbmgmt/usbmgr/group" mrp="os/usb/usbmgmt/usbmgr/group/usb_manager.mrp" version="2"/>
-</component>
-<component name="usbclassandmgrdocs" long-name="USB Class and Manager Documentation" purpose="development" class="doc">
-<unit mrp="os/usb/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
-</component>
-</collection>
-<collection name="usb_info" long-name="USB Info" level="app-if">
-<component name="usb_metadata" long-name="USB Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/usb/usb_info/usb_metadata/usb_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="mm" level="services" long-name="Multimedia" levels="adaptation 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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-</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"/>
-</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"/>
-</component>
-<component name="aac_decoder_config_proxy_api" long-name="AAC Decoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/aac_decoder_config_proxy_api/group"/>
-</component>
-<component name="added_devsound_control_api" long-name="Added DevSound Control API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_api/group"/>
-</component>
-<component name="added_devsound_control_msg_hdlr_api" long-name="Added DevSound Control Msg Hdlr API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_msg_hdlr_api/group"/>
-</component>
-<component name="added_devsound_control_proxy_api" long-name="Added DevSound Control Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_proxy_api/group"/>
-</component>
-<component name="audio_effects_msg_hdlr_api" long-name="Audio Effects Message Handler API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_msg_hdlr_api/group"/>
-</component>
-<component name="audio_effects_proxy_api" long-name="Audio Effects Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_proxy_api/group"/>
-</component>
-<component name="audio_policy_header_api" long-name="Audio Policy Header API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="audio_routing_proxy_api" long-name="Audio Routing Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_routing_proxy_api/group"/>
-</component>
-<component name="custom_interface_builder_api" long-name="Custom Interface Builder API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_builder_api/group"/>
-</component>
-<component name="custom_interface_message_handler_factory_api" long-name="Custom Interface Message Handler Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_message_handler_factory_api/group"/>
-</component>
-<component name="custom_interface_proxy_factory_api" long-name="Custom Interface Proxy Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_proxy_factory_api/group"/>
-</component>
-<component name="custom_interface_utility_api" long-name="Custom Interface Utility API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_utility_api/group"/>
-</component>
-<component name="devsound_adaptation_api" long-name="DevSound Adaptation API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/devsound_adaptation_api/group"/>
-</component>
-<component name="display_posting_api" long-name="Display Posting API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="eaac_plus_decoder_interface_proxy_api" long-name="eAAC Plus Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="error_concealment_interface_proxy_api" long-name="Error Concealment Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
-</component>
-<component name="fm_radio_adaptation_api" long-name="FM Radio Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_decoder_interface_proxy_api" long-name="G711 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_encoder_interface_proxy_api" long-name="G711 Encoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_decoder_interface_proxy_api" long-name="G729 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_encoder_interface_msg_hdlr_api" long-name="G729 Encoder Interface Message Handler API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</component>
-<component name="ilbc_decoder_interface_proxy_api" long-name="Ilbc Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ilbc_encoder_interface_proxy_api" long-name="Ilbc Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="mdf_plugin_uids" long-name="MDF Plug-in UIDs" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/mdf_plugin_uids/group"/>
-</component>
-<component name="multimedia_fourcc_definitions_api" long-name="Multimedia FourCC Definitions API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/multimedia_fourcc_definitions_api/group"/>
-</component>
-<component name="nokia_audio_policy_header_api" long-name="Nokia Audio Policy Header API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/nokia_audio_policy_header_api/group"/>
-</component>
-<component name="nokia_multimedia_fourcc_definitions_api" long-name="Nokia Multimedia Fourcc Definitions API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ra8_decoder_interface_proxy_api" long-name="RA8 Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
-</component>
-<component name="rds_adaptation_api" long-name="RDS Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="restricted_audio_output_proxy_api" long-name="Restricted Audio Output Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="sbc_encoder_interface_proxy_api" long-name="SBC Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/sbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="secure_output_mdf_custom_interface" long-name="Secure Output MDF Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="speech_encoder_config_proxy_api" long-name="Speech Encoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/speech_encoder_config_proxy_api/group"/>
-</component>
-<component name="telephony_audio_routing_client_api" long-name="Telephony Audio Routing Client API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_client_api/group"/>
-</component>
-<component name="telephony_audio_routing_manager_api" long-name="Telephony Audio Routing Manager API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_manager_api/group"/>
-</component>
-<component name="video_buffer_management_mdf_custom_interface" long-name="Video Buffer Management MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_buffer_management_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_rotation_mdf_custom_interface" long-name="Video Decoder Rotation MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_scaling_mdf_custom_interface" long-name="Video Decoder Scaling MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
-</component>
-<component name="video_reclaim_extbuffers_ci" long-name="Video Reclaim Extbuffers Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_reclaim_extbuffers_ci/group"/>
-</component>
-<component name="video_window_control_custom_interface" long-name="Video Window Control Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="wma_decoder_interface_proxy_api" long-name="WMA Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/wma_decoder_interface_proxy_api/group"/>
-</component>
-<component name="eaacplusutil_api" long-name="EAac Plus Util API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/eaacplusutil_api/group"/>
-</component>
-<component name="frametable_api" long-name="Frametable API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/frametable_api/group"/>
-</component>
-</collection>
-<collection name="devsoundextensions" long-name="Devsound Extensions" level="device-fw">
-<component name="drmaudioplayer" filter="s60" long-name="DRM Audio Player">
-<unit bldFile="os/mm/devsoundextensions/drmaudioplayer/group"/>
-</component>
-<component name="mmextfw" filter="s60" long-name="Multimedia Extension Framework">
-<unit bldFile="os/mm/devsoundextensions/mmextfw/group"/>
-</component>
-<component name="audiorouting" filter="s60" long-name="Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/audiorouting/group"/>
-</component>
-<component name="effects" filter="s60" long-name="Effects">
-<unit bldFile="os/mm/devsoundextensions/effects/group"/>
-</component>
-<component name="effectspresets" filter="s60" long-name="Effects Presets">
-<unit bldFile="os/mm/devsoundextensions/effectspresets/group"/>
-</component>
-<component name="effectspresets_utils" filter="s60" long-name="Effects Presets Utils">
-<!-- need to #include the lot from a single bld.inf
- Also move to a standard component location, not under effectspresets -->
-<unit bldFile="os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
-<unit bldFile="os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
-</component>
-<component name="telephonyaudiorouting" filter="s60" long-name="Telephony Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/group"/>
-</component>
-<component name="mmfcustominterfaces" filter="s60" long-name="MMF Custom Interfaces">
-<unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/group"/>
-</component>
-<component name="addeddevsoundcontrol" filter="s60" long-name="Added DevSound Control">
-<unit bldFile="os/mm/devsoundextensions/addeddevsoundcontrol/group"/>
-</component>
-<component name="globalaudiosettings" filter="s60" long-name="Global Audio Settings">
-<unit bldFile="os/mm/devsoundextensions/globalaudiosettings/group"/>
-</component>
-<component name="restrictedaudiooutput" filter="s60" long-name="Restricted Audio Output">
-<unit bldFile="os/mm/devsoundextensions/restrictedaudiooutput/group"/>
-</component>
-<component name="ciextnfactoryplugins" filter="s60" long-name="Custom Interface Extension Factory Plugins" plugin="Y">
-<unit bldFile="os/mm/devsoundextensions/ciextnfactoryplugins/group"/>
-</component>
-</collection>
-<collection name="mdfdevvideoextensions" long-name="MDF Dev Video Extensions" level="device-fw">
-<component name="nga_mdf_postprocessor" long-name="NGA MDF Postprocessor" filter="s60">
-<unit bldFile="os/mm/mdfdevvideoextensions/nga_mdf_postprocessor/group"/>
-</component>
-</collection>
-<collection name="audio" long-name="Audio Codecs" level="middleware">
-<component name="arm_cmmf_codecs" filter="s60" long-name="ARM CMMF Codecs" plugin="Y">
-<unit bldFile="os/mm/audio/arm_cmmf_codecs/group"/>
-</component>
-</collection>
-<collection name="video" long-name="Video Codecs" level="middleware">
-<!-- empty -->
-</collection>
-<collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
-<component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/imagingandcamerafws/imagingfws/group" mrp="os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
-</component>
-<component name="camerafw" long-name="Camera Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/imagingandcamerafws/camerafw/group" mrp="os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
-</component>
-</collection>
-<collection name="mmlibs" long-name="Multimedia Libraries" level="middleware">
-<component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmutilitylib/group" mrp="os/mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
-</component>
-<component name="mmfw" long-name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmfw/group" mrp="os/mm/mmlibs/mmfw/group/multimedia_mmf.mrp"/>
-</component>
-</collection>
-<collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
-<component name="imagingplugins" long-name="Imaging Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/imagingplugins/group" mrp="os/mm/mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
-</component>
-<component name="cameraplugins" long-name="Camera Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/cameraplugins/group" mrp="os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
-</component>
-<component name="lib3gp" long-name="3GP Library" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/mmplugins/lib3gp/group" mrp="os/mm/mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
-</component>
-<component name="mmfwplugins" long-name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/mmfwplugins/group" mrp="os/mm/mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
-</component>
-</collection>
-<collection name="mm_info" long-name="Multimedia Info" level="app-if">
-<component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc">
-<unit mrp="os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
-</component>
-<component name="mm_metadata" long-name="Multimedia Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
-<component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="^2" purpose="development">
-<unit bldFile="os/mm/mmresourcemgmt/mmresctrl/group" mrp="os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
-</component>
-</collection>
-<collection name="mmdevicefw" long-name="Multimedia Device Framework" level="device-fw">
-<component name="mdf" long-name="Media Device Framework" introduced="9.2" purpose="mandatory">
-<unit bldFile="os/mm/mmdevicefw/mdf/group" mrp="os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
-</component>
-<component name="speechrecogsupport" long-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 name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
-<component name="videorenderer" long-name="Video Renderer" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/mmswadaptation/videorenderer/group" mrp="os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
-</component>
-</collection>
-<collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw"/>
-<collection name="omxil" long-name="OpenMAX IL" level="hw-if">
-<component name="omxilapi" long-name="OpenMAX IL API" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilapi/group" mrp="os/mm/omxil/omxilapi/group/multimedia_omx_il_api.mrp" version="1"/>
-</component>
-<component name="omxilcore" long-name="OpenMAX IL Core" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcore/group" mrp="os/mm/omxil/omxilcore/group/multimedia_omx_il_core.mrp" version="1"/>
-</component>
-<component name="omxilcomponentcommon" long-name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcomponentcommon/group" mrp="os/mm/omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp" version="1"/>
-</component>
-<component name="omxilrefcomps" long-name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilrefcomps/ref_components/group" mrp="os/mm/omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp" version="1"/>
-</component>
-<component name="mmilapi" long-name="Multimedia Integration Layer API" introduced="^3" purpose="development">
-<unit bldFile="os/mm/omxil/mmilapi/group" mrp="os/mm/omxil/mmilapi/group/multimedia_il_api.mrp"/>
-</component>
-</collection>
-<collection name="devsound" long-name="Sound Device" level="devices">
-<component name="devsoundapi" long-name="DevSound API" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/devsound/devsoundapi/group" mrp="os/mm/devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
-</component>
-<component name="a3fdevsound" long-name="A3F DevSound" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3fdevsound/group" mrp="os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
-</component>
-<component name="a3facf" long-name="A3F Audio Component Framework" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3facf/group" mrp="os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
-</component>
-<component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/devsound/devsoundpluginsupport/group" mrp="os/mm/devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
-</component>
-<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">
-<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">
-<unit bldFile="os/mm/devsound/a3ftrace/group" mrp="os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
-</component>
-<component name="a3fsrvstart" long-name="A3F Server Start" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
-</component>
-</collection>
-<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
-<component name="devsoundhwdeviceapi" long-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 name="a3facl" long-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 name="a3fdevsoundcustomisation" long-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"/>
-</component>
-<component name="refacladapt" long-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"/>
-</component>
-<component name="videohai" long-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 name="dvbhreceiverhai" long-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>
-</block>
-<block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
-<collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
-<component name="exif_api" long-name="Exif API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagingext_plat" long-name="Imaging Extensions Platform Interfaces" level="app-if">
-<component name="jpeg2000_icl_plugin_api" long-name="JPEG2000 ICL plugin API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/jpeg2000_icl_plugin_api/group"/>
-</component>
-<component name="extended_icl_jpeg_api" long-name="Extended ICL Jpeg API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
-</component>
-<component name="h324_annex_k_custom_api" long-name="H324 Annex K Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/h324_annex_k_custom_api/group"/>
-</component>
-<component name="ecam_orientation_custom_api" long-name="ECam Orientation Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_orientation_custom_api/group"/>
-</component>
-<component name="ecam_ui_orientation_override_custom_api" long-name="ECam UI Orientation Override Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
-</component>
-<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>
-</collection>
-<collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
-<component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
-<unit bldFile="os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
-</component>
-<component name="imageadaptationextensions_build" filter="s60" long-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"/>
-</component>
-</collection>
-<collection name="imagingmodules" long-name="Imaging Modules" level="hw-if">
-<component name="exiflib" filter="s60" long-name="Exif Library">
-<unit bldFile="os/imagingext/imagingmodules/exiflib/group"/>
-</component>
-<component name="jp2kcodec" filter="s60" long-name="JPEG2000 Decoder Plugin" plugin="Y">
-<unit bldFile="os/imagingext/imagingmodules/jp2kcodec/group"/>
-</component>
-</collection>
-</block>
-<block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
-<component name="vgi" filter="s60" long-name="VGI">
-<unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
-</component>
-</collection>
-<collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adaptations">
-<component name="m3gcore11" filter="s60" long-name="M3G Core 1.1">
-<unit bldFile="os/graphics/m3g/m3gcore11/group"/>
-</component>
-</collection>
-<collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines">
-<component name="graphicsresource" long-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 name="graphicsresourceadaptation" long-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"/>
-</component>
-</collection>
-<collection name="graphicsutils" long-name="Graphics Utils" level="engines">
-<component name="commongraphicsheaders" long-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 name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
-<!-- displayldd to be moved here -->
-<component name="surfacemgr" long-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 name="graphicscomposition" long-name="Graphics Composition" level="engines">
-<component name="openwfcinterface" long-name="OpenWF Composition Interface" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfcinterface/group" mrp="os/graphics/graphicscomposition/openwfcinterface/group/graphics_openwfcinterface.mrp"/>
-</component>
-<component name="openwfcompositionengine" long-name="OpenWF Composition Engine" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/graphicscomposition/openwfcompositionengine/group" mrp="os/graphics/graphicscomposition/openwfcompositionengine/group/graphics_openwfcompositionengine.mrp"/>
-</component>
-<component name="openwfsupport" long-name="OpenWF Support" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfsupport/group" mrp="os/graphics/graphicscomposition/openwfsupport/group/graphics_openwfsupport.mrp"/>
-</component>
-<component name="surfaceupdate" long-name="Surface Update" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/surfaceupdate/group" mrp="os/graphics/graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
-</component>
-</collection>
-<collection name="graphicstest" long-name="Graphics Test" level="app-if">
-<component name="uibench" long-name="UI Bench" introduced="9.2" purpose="development">
-<unit bldFile="os/graphics/graphicstest/uibench/group" mrp="os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
-</component>
-</collection>
-<collection name="graphics_plat" long-name="Graphics Platform Interfaces" level="app-if">
-<component name="m3g_core_api" filter="sf_build" long-name="M3G Core API" class="api">
-<unit bldFile="os/graphics/graphics_plat/m3g_core_api/group"/>
-</component>
-</collection>
-<collection name="graphics_info" long-name="Graphics Info" level="app-if">
-<component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc">
-<unit mrp="os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
-</component>
-<component name="graphics_metadata" long-name="Graphics Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
-</component>
-</collection>
-<collection name="windowing" long-name="Windowing" level="app-if">
-<component name="windowserver" long-name="Window Server" purpose="mandatory">
-<unit bldFile="os/graphics/windowing/windowserver/group" mrp="os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
-</component>
-<component name="windowserverplugins" long-name="Window Server Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/windowing/windowserverplugins/group" mrp="os/graphics/windowing/windowserverplugins/group/graphics_wserv_std_plugins.mrp"/>
-</component>
-</collection>
-<collection name="printingservices" long-name="Printing Services" level="app-if">
-<component name="printerdriversupport" long-name="Printer Driver Support" purpose="optional">
-<unit bldFile="os/graphics/printingservices/printerdriversupport/group" mrp="os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
-</component>
-<component name="printerdrivers" long-name="Printer Drivers" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/printingservices/printerdrivers/group" mrp="os/graphics/printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
-</component>
-</collection>
-<collection name="fbs" long-name="Font and Bitmap Server" level="device-interface">
-<component name="fontandbitmapserver" long-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 name="opengles" long-name="OpenGLES" level="internal-adaptations">
-<component name="openglesinterface" long-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 name="opengles_stub" filter="sf_build" long-name="OpenGL ES Stub" purpose="optional" introduced="^2">
-<unit bldFile="os/graphics/opengles/openglesinterface/group/opengles_stub"/>
-</component>
-</collection>
-<collection name="openvg" long-name="OpenVG" level="internal-adaptations">
-<component name="openvginterface" long-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 name="openvg11" filter="s60" long-name="OpenVG 1.1">
-<!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
-<unit bldFile="os/graphics/openvg/openvginterface/group/openvg11"/>
-</component>
-<component name="sfopenvg" filter="sf_build" long-name="Khronos OpenVG Reference Implementation" introduced="^2" purpose="optional">
-<unit bldFile="os/graphics/openvg/openvgrefimplementation/sfopenvg/group"/>
-</component>
-</collection>
-<collection name="egl" long-name="EGL" level="internal-adaptations">
-<component name="eglinterface" long-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 name="eglswitch" long-name="EGL Switch" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglswitch/group" mrp="os/graphics/egl/eglswitch/group/graphics_eglswitch.mrp"/>
-</component>
-<component name="eglrefimpl" long-name="EGL Reference Implementation" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglrefimpl/group" mrp="os/graphics/egl/eglrefimpl/group/graphics_eglrefimpl.mrp"/>
-</component>
-<component name="egltest" long-name="EGL Tests" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/egl/egltest/group" mrp="os/graphics/egl/egltest/group/graphics_egltest.mrp"/>
-</component>
-</collection>
-<collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
-<component name="gdi" long-name="GDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/gdi/group" mrp="os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
-</component>
-<component name="bitgdi" long-name="BitGDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
-</component>
-<component name="colourpalette" long-name="Colour Palette" introduced="7.0s" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
-</component>
-<component name="screendriver" long-name="Screen Driver" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/graphicsdeviceinterface/screendriver/group" mrp="os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
-</component>
-<component name="directgdi" long-name="DirectGDI" introduced="^3" deprecated="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/directgdi/group" mrp="os/graphics/graphicsdeviceinterface/directgdi/group/graphics_directgdi.mrp"/>
-</component>
-<component name="directgdiinterface" long-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 name="directgdiadaptation" long-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"/>
-</component>
-</collection>
-<collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
-<component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/gdi_tools/group" mrp="os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
-</component>
-</collection>
-<collection name="graphicsapitest" long-name="Graphics API Tests" level="app-if"/>
-</block>
-<block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
-<collection name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" level="text">
-<component name="findutil_api" long-name="Find Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/findutil_api/group"/>
-</component>
-<component name="japanese_language_utilities_api" long-name="Japanese Language Utilities API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
-</component>
-<component name="sortutil_api" long-name="Sorting Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/sortutil_api/group"/>
-</component>
-</collection>
-<collection name="textandloc_pub" long-name="Text and Localisation Public Interfaces" level="text">
-<component name="directory_localizer_api" long-name="Directory Localizer API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_pub/directory_localizer_api/group"/>
-</component>
-</collection>
-<collection name="charconvfw" long-name="Character Conversion" level="encoding">
-<component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional">
-<unit bldFile="os/textandloc/charconvfw/charconv_fw/group" mrp="os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
-</component>
-<component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/charconvplugins/group" mrp="os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
-</component>
-<component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/fatfilenameconversionplugins/group" mrp="os/textandloc/charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
-</component>
-</collection>
-<collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
-<component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/textshaperplugin/group" mrp="os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
-</component>
-<component name="fontstore" long-name="Font Store" purpose="mandatory">
-<unit bldFile="os/textandloc/fontservices/fontstore/group" mrp="os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
-</component>
-<component name="textrendering" long-name="Text Rendering" purpose="mandatory" class="placeholder">
-<!-- placeholder for text code from GDI -->
-</component>
-<component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/freetypefontrasteriser/group" mrp="os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
-</component>
-<component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional">
-<unit bldFile="os/textandloc/fontservices/referencefonts/group" mrp="os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
-</component>
-</collection>
-<collection name="textlayout" long-name="Text Layout" level="text">
-<component name="texthandling" long-name="Text Handling" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/texthandling/group" mrp="os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
-</component>
-<component name="textformatting" long-name="Text Formatting" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/textformatting/group" mrp="os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
-</component>
-</collection>
-<collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
-<!-- components in this collection need to be moved to the right collection.
- Either move into the units' directories, or create a new textandlocutils directory -->
-<component name="numbergrouping" filter="s60" long-name="Number Grouping">
-<unit bldFile="os/textandloc/charconvfw/numbergrouping/group"/>
-</component>
-<component name="jplangutil" filter="s60" long-name="Japanese Language Utilities">
-<unit bldFile="os/textandloc/charconvfw/jplangutil/group"/>
-</component>
-<component name="sortutil" filter="s60" long-name="Sorting Utility">
-<unit bldFile="os/textandloc/charconvfw/sortutil/group"/>
-</component>
-<component name="inlinetext" filter="s60" long-name="Inline Text">
-<unit bldFile="os/textandloc/charconvfw/inlinetext/group"/>
-</component>
-<component name="nearestlangutil" long-name="Nearest Language Util" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-<component name="numberformatting" long-name="Number Formatting" introduced="7.0s" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/numberformatting/group" mrp="os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
-</component>
-</collection>
-<collection name="localesupport" long-name="Locale Support" level="util">
-<component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/localisation/localesupport" mrp="os/textandloc/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
-</component>
-<component name="initlocale" long-name="Initialise Locale" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-</collection>
-<collection name="textandloctools" long-name="Text and Localisation Tools" level="tools">
-<component name="fontcompiler" long-name="Font Compiler" purpose="development" class="placeholder PC">
-<!-- placeholder for split from GDI Tools -->
-</component>
-<component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/bitmapfonttools/group" mrp="os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
-</component>
-</collection>
-<collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
-<component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
-<collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
-<component name="xmlsrv_plat_build" long-name="XML Services Platform Interface Build" filter="s60" class="api">
-<!-- need to fix the configuration used here.
- Either destribute to other components or use the new feature flags confguration mechanisms.
- Remove this component and uncomment the other units when fixed-->
-<unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
-</component>
-<component name="xml_encryption_api" long-name="XML Encryption API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/> -->
-</component>
-<component name="xml_signature_api" long-name="XML Signature API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_signature_api/group"/> -->
-</component>
-<component name="xml_security_engine_utils_api" long-name="XML Security Engine Utils API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/> -->
-</component>
-</collection>
-<collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
-<component name="xmlseccertman" filter="s60" long-name="XML Security Certificate Manager">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
-</component>
-<component name="xmlsec" filter="s60" long-name="XML Security">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsec/group"/>
-</component>
-<component name="xmlseccrypto" filter="s60" long-name="XML Security Crypto">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccrypto/group"/>
-</component>
-<component name="xmlsecwrapper" filter="s60" long-name="XML Security Wrapper">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsecwrapper/group"/>
-</component>
-</collection>
-<collection name="xml" long-name="XML" level="generic">
-<component name="xmlfw" long-name="XML Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmlfw/group" mrp="os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
-</component>
-<component name="libxml2libs" long-name="Libxml2 Libraries" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/libxml2libs/group" mrp="os/xmlsrv/xml/libxml2libs/group/syslibs_libxml2.mrp"/>
-</component>
-<component name="legacyminidomparser" long-name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/legacyminidomparser/GROUP" mrp="os/xmlsrv/xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp"/>
-</component>
-<component name="xmldomandxpath" long-name="XML DOM and XPath" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmldomandxpath/group" mrp="os/xmlsrv/xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
-</component>
-<component name="xmlexpatparser" long-name="XML Expat Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmlexpatparser/group" mrp="os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
-</component>
-<component name="xmllibxml2parser" long-name="XML Libxml2 Parser" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmllibxml2parser/group" mrp="os/xmlsrv/xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
-</component>
-<component name="wbxmlparser" long-name="WBXML Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/wbxmlparser/group" mrp="os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
-</component>
-</collection>
-<collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
-<component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="deviceplatformrelease" level="services" long-name="Device Platform Release" levels="bld mid top">
-<collection name="s60extras" long-name="S60 Extras" level="mid">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="s60extras_build" filter="s60" long-name="S60 Extras Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/S60Extras/group"/>
-</component>
-</collection>
-<collection name="locfiles" long-name="Locale Files" level="mid">
-<component name="locfiles_build" filter="s60" long-name="S60 Locale Files Build" purpose="development" class="config">
-<!-- need to move component down a directory -->
-<unit bldFile="os/deviceplatformrelease/locfiles/group"/>
-</component>
-<component name="locfiles_set1" long-name="Locale Files Set 1" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set1"/>
-</component>
-<component name="locfiles_set2" long-name="Locale Files Set 2" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set2"/>
-</component>
-<component name="locfiles_set3" long-name="Locale Files Set 3" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set3"/>
-</component>
-<component name="locfiles_set4" long-name="Locale Files Set 4" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set4"/>
-</component>
-<component name="locfiles_set5" long-name="Locale Files Set 5" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set5"/>
-</component>
-<component name="locfiles_set6" long-name="Locale Files Set 6" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set6"/>
-</component>
-<!-- is the a problem with SF builds with the following? -->
-<component name="locfiles_set7" long-name="Locale Files Set 7" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set7"/>
-</component>
-<component name="locfiles_set8" long-name="Locale Files Set 8" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set8"/>
-</component>
-<component name="locfiles_set9" long-name="Locale Files Set 9" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set9"/>
-</component>
-<component name="locfiles_set10" long-name="Locale Files Set 10" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set10"/>
-</component>
-<component name="locfiles_set11" long-name="Locale Files Set 11" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set11"/>
-</component>
-<component name="locfiles_set12" long-name="Locale Files Set 12" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set12"/>
-</component>
-<component name="locfiles_set13" long-name="Locale Files Set 13" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set13"/>
-</component>
-<component name="locfiles_set14" long-name="Locale Files Set 14" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set14"/>
-</component>
-<component name="locfiles_set15" long-name="Locale Files Set 15" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set15"/>
-</component>
-<component name="locfiles_set16" long-name="Locale Files Set 16" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set16"/>
-</component>
-</collection>
-<collection name="version" long-name="Version" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="version_build" filter="s60" long-name="Version Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/Version/group"/>
-</component>
-</collection>
-<collection name="helps_loc2" long-name="Helps Locale 2" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helps_loc2_build" long-name="Helps Locale 2 Build" filter="s60">
-<unit bldFile="os/deviceplatformrelease/helps_loc2/group"/>
-</component>
-</collection>
-<collection name="sf_config" long-name="SF Config" level="mid">
-<component name="config" filter="s60" long-name="Config" purpose="development" class="config"/>
-<component name="cenrep" filter="sf_build" long-name="ConE Central Repository Config" purpose="development" class="config">
-<!-- will shoudl give the id/path something more unique than cenrep -->
-<unit bldFile="os/deviceplatformrelease/sf_config/cenrep/group"/>
-</component>
-<component name="rombuild_syborg" filter="sf_build" long-name="Syborg iMaker Config" purpose="development" introduced="^3" class="config">
-<unit bldFile="os/deviceplatformrelease/sf_config/rombuild/syborg/group"/>
-</component>
-<component name="rombuild_zoom2" filter="sf_build" long-name="Zoom2 iMaker Config" purpose="development" introduced="^3" class="config">
-<unit bldFile="os/deviceplatformrelease/sf_config/rombuild/zoom2/group"/>
-</component>
-</collection>
-<!-- should be located locally in buildplatforms/group
- <collection id="s60bld" name="S60 Build">
- <component id="buildplatforms" filter="s60" name="Build Platforms">
- <unit bldFile="/tools/buildplatforms/group"/>
- </component>
- </collection>-->
-<collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
-<component name="cedarutils" long-name="Cedar Utils" purpose="development">
-<unit mrp="os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
-</component>
-<component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt" purpose="development" class="config">
-<unit mrp="os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
-</component>
-<component name="foundation_s60_packages" long-name="Foundation S60 Packages" introduced="^3" deprecated="^3" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/symbianosbld/foundation_s60_packages/foundation_s60_packages.mrp"/>
-</component>
-</collection>
-<collection name="foundation_system" long-name="Foundation System" level="top">
-<component name="system_model" long-name="System Model" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
-</component>
-</collection>
-<collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
-<component name="deviceplatformrelease_metadata" long-name="Device Platform Release Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="osrndtools" level="services" long-name="OS R&D tools" levels="fw trace">
-<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"/>
-</component>
-<component name="testinterface" filter="s60" long-name="Test Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/testinterface/group"/>
-</component>
-<component name="testserver" filter="s60" long-name="Test Server" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserver/group"/>
-</component>
-<component name="testengine" filter="s60" long-name="Test Engine" purpose="development">
-<unit bldFile="os/osrndtools/stif/testengine/group"/>
-</component>
-<component name="testserverstarter" filter="s60" long-name="Test Server Starter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserverstarter/group"/>
-</component>
-<component name="stiftfwif" filter="s60" long-name="STIF Test Framework Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/stiftfwif/group"/>
-</component>
-<component name="consoleui" filter="s60" long-name="Console UI" purpose="development">
-<unit bldFile="os/osrndtools/stif/consoleui/group"/>
-</component>
-<component name="testcombiner" filter="s60" long-name="Test Combiner" purpose="development">
-<unit bldFile="os/osrndtools/stif/testcombiner/group"/>
-</component>
-<component name="demomodule" filter="s60" long-name="Demo Module" purpose="development">
-<unit bldFile="os/osrndtools/stif/demomodule/group"/>
-</component>
-<component name="atslogger" filter="s60" long-name="ATS Logger" purpose="development">
-<unit bldFile="os/osrndtools/stif/atslogger/group"/>
-</component>
-<component name="atsinterface" filter="s60" long-name="ATS Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/atsinterface/group"/>
-</component>
-<component name="testscripter" filter="s60" long-name="Test Scripter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testscripter/group"/>
-</component>
-<component name="suevent" filter="s60" long-name="SU Event" purpose="development">
-<unit bldFile="os/osrndtools/stif/suevent/group"/>
-</component>
-<component name="stifkerneltestclassbase" filter="s60" long-name="STIF Kernel Test Class Base" purpose="development">
-<!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
-<!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
-</component>
-<component name="stif_build" filter="s60" long-name="STIF Build" purpose="development">
-<!-- move exports into self-contained component. Remove this when configuration is in place-->
-<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">
-<unit bldFile="os/osrndtools/memspy/memspy_plat/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/engine/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/console/group"/>
-</component>
-<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>
-</collection>
-<collection name="hti" long-name="Harmonized Test Interface" level="trace">
-<component name="hti_plat" filter="s60" long-name="HTI Platform Interfaces" purpose="development" class="api">
-<unit bldFile="os/osrndtools/hti/hti_plat/group"/>
-</component>
-<component name="hticfg" filter="s60" long-name="HTI Config" purpose="development">
-<unit bldFile="os/osrndtools/hti/hticfg/group"/>
-</component>
-<component name="htiautostart" filter="s60" long-name="HTI Autostart" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiautostart/group"/>
-</component>
-<component name="htiframework" filter="s60" long-name="HTI Framework" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiframework/group"/>
-</component>
-<component name="hticommplugins" filter="s60" long-name="HTI Communication Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
-</component>
-<component name="htiserviceplugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
-</component>
-<component name="htifilehlp" filter="s60" long-name="HTI File Help" purpose="development">
-<unit bldFile="os/osrndtools/hti/htifilehlp/group"/>
-</component>
-<component name="htiwatchdog" filter="s60" long-name="HTI Watchdog" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiwatchdog/group"/>
-</component>
-<component name="hti_build" filter="s60" long-name="HTI Build" purpose="development">
-<!-- move exports into self-contained component.-->
-<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">
-<block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
-<collection name="appsupport_pub" long-name="Generic Application Support Public Interfaces" level="specific">
-<component name="flash_viewer_framework_api" long-name="Flash Viewer Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
-</component>
-<component name="network_status_api" long-name="Network Status API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/network_status_api/group"/>
-</component>
-</collection>
-<collection name="appsupport_plat" long-name="Generic Application Support Platform Interfaces" level="specific">
-<component name="action_plugin_api" long-name="Action Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/action_plugin_api/group"/>
-</component>
-<component name="application_orientation_api" long-name="Application Orientation API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/application_orientation_api/group"/>
-</component>
-<component name="context_access_api" long-name="Context Access API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_access_api/group"/>
-</component>
-<component name="context_framework_services_api" long-name="Context Framework Services API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_services_api/group"/>
-</component>
-<component name="context_framework_client_api" long-name="Context Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_client_api/group"/>
-</component>
-<component name="context_framework_listener_api" long-name="Context Framework Listener API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_listener_api/group"/>
-</component>
-<component name="context_framework_version_api" long-name="Context Framework Version API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_version_api/group"/>
-</component>
-<component name="context_source_plugin_api" long-name="Context Source Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_plugin_api/group"/>
-</component>
-<component name="context_source_settings_manager_api" long-name="Context Source Settings Manager API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_settings_manager_api/group"/>
-</component>
-<component name="context_subscription_api" long-name="Context Subscription API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_subscription_api/group"/>
-</component>
-<component name="key_event_framework_api" long-name="Key Event Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_api/group"/>
-</component>
-<component name="key_event_framework_mapper_api" long-name="Key Event Framework Mapper API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_mapper_api/group"/>
-</component>
-<component name="media_keys_definition_api" long-name="Media Keys Definition API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/media_keys_definition_api/group"/>
-</component>
-<component name="ood_threshold_api" long-name="OOD Threshold API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/ood_threshold_api/group"/>
-</component>
-<component name="oom_monitor_api" long-name="OOM Monitor API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_api/group"/>
-</component>
-<component name="oom_monitor_plugin_api" long-name="OOM Monitor Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_plugin_api/group"/>
-</component>
-<component name="operation_provider_api" long-name="Operation Provider API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/operation_provider_api/group"/>
-</component>
-<component name="phonecmdhandler_api" long-name="Phone Command Handler API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/phonecmdhandler_api/group"/>
-</component>
-<component name="restore_factory_settings_api" long-name="Restore Factory Settings API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_api/group"/>
-</component>
-<component name="restore_factory_settings_plugin_api" long-name="Restore Factory Settings Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_plugin_api/group"/>
-</component>
-<component name="secondary_display_accfw_api" long-name="Secondary Display Accessory Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_accfw_api/group"/>
-</component>
-<component name="secondary_display_startup_api" long-name="Secondary Display Startup API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_startup_api/group"/>
-</component>
-<component name="secondary_display_sysap_api" long-name="Secondary Display System Application API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_sysap_api/group"/>
-</component>
-<component name="secondary_display_system_state_api" long-name="Secondary Display System State API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_system_state_api/group"/>
-</component>
-<component name="sensor_user_setting_api" long-name="Sensor User Setting API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/sensor_user_setting_api/group"/>
-</component>
-<component name="startup_configuration_api" long-name="Startup Configuration API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/startup_configuration_api/group"/>
-</component>
-<component name="system_application_key_handler_plugin_api" long-name="System Application Key Handler Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_key_handler_plugin_api/group"/>
-</component>
-<component name="system_application_light_control_plugin_api" long-name="System Application Light Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_light_control_plugin_api/group"/>
-</component>
-<component name="system_application_notification_api" long-name="System Application Notification API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_notification_api/group"/>
-</component>
-<component name="system_application_plugin_callback_api" long-name="System Application Plug-in Callback API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
-</component>
-</collection>
-<collection name="contextframework" long-name="Context Framework" level="framework">
-<!-- the units that are commented out need to be put back when configuration is in place.
- They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
-<component name="cfw" filter="s60" long-name="Context Framework">
-<!--<unit bldFile="contextframework/cfw/group"/> -->
-</component>
-<component name="cfwplugins" filter="s60" long-name="Context Framework Plugins" plugin="Y">
-<!--<unit bldFile="contextframework/cfwplugins/group"/>-->
-</component>
-<component name="contextframework_build" filter="s60" long-name="Context Framework Build">
-<unit bldFile="mw/appsupport/contextframework/group"/>
-</component>
-</collection>
-<collection name="coreapplicationuis" long-name="Core Application UIs" level="server">
-<component name="dbrecovery" filter="s60" long-name="Database Recovery">
-<unit bldFile="mw/appsupport/coreapplicationuis/dbrecovery/group"/>
-</component>
-<component name="nspswsplugin" filter="s60" long-name="NSPS WS Plugin" plugin="Y">
-<!-- No Service Power Save? Window Server? Please elaborate-->
-<unit bldFile="mw/appsupport/coreapplicationuis/nspswsplugin/group"/>
-</component>
-<component name="rfs" filter="s60" long-name="Restore Factory Settings">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfs/group"/>
-</component>
-<component name="rfsplugins" filter="s60" long-name="Restore Factory Settings Plugins" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/group"/>
-</component>
-<component name="sysap" filter="s60" long-name="System Application">
-<unit bldFile="mw/appsupport/coreapplicationuis/sysap/group"/>
-</component>
-<component name="variatedsettings" filter="s60" long-name="Variated Settings" class="config">
-<unit bldFile="mw/appsupport/coreapplicationuis/variatedsettings/group"/>
-</component>
-<component name="accfwuinotifier" filter="s60" long-name="Accessory Framework UI Notifier" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/accfwuinotifier/group"/>
-</component>
-<component name="kefmapper" filter="s60" long-name="Key Event Framework">
-<unit bldFile="mw/appsupport/coreapplicationuis/kefmapper/group"/>
-</component>
-<component name="advancedtspcontroller" filter="s60" long-name="Advanced TSP Controller">
-<unit bldFile="mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
-</component>
-<component name="powersaveutilities" filter="s60" long-name="Power Save Utilities">
-<unit bldFile="mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
-</component>
-<component name="gsserverenginestub" filter="s60" long-name="GS Server Engine Stub">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
-</component>
-<component name="gsserverengine" filter="s60" long-name="GS Server Engine">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverengine/group"/>
-</component>
-<component name="sensordatacompensatorplugin" filter="s60" long-name="Sensor Data Compensator Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/group"/>
-</component>
-</collection>
-<collection name="flashliteapi_3_1" long-name="Flash Lite API 3.1" level="specific">
-<!-- collection is really a component. Move down a directory -->
-<component name="flashliteapi_3_1_build" long-name="Flash Lite API Build" filter="s60" introduced="^2"/>
-</collection>
-<collection name="mediakeys" long-name="Media Keys" level="plugin">
-<!-- collection is really a component. Move down a directory -->
-<component name="mediakeys_build" filter="s60" long-name="Media Keys Build">
-<unit bldFile="mw/appsupport/mediakeys/group"/>
-</component>
-</collection>
-<collection name="startupservices" long-name="Startup Services" level="system">
-<component name="splashscreen" filter="s60" long-name="Splash Screen">
-<unit bldFile="mw/appsupport/startupservices/splashscreen/group"/>
-</component>
-<component name="startupanimation" filter="s60" long-name="Startup Animation">
-<unit bldFile="mw/appsupport/startupservices/startupanimation/group"/>
-</component>
-<component name="startup" long-name="Startup Application" filter="s60">
-<unit bldFile="mw/appsupport/startupservices/startup/group"/>
-</component>
-</collection>
-<collection name="sysresmonitoring" long-name="System Resource Monitoring" level="system">
-<component name="oodmonitor" filter="s60" long-name="OOD Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oodmonitor/group"/>
-</component>
-<component name="oommonitor" filter="s60" long-name="OOM Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oommonitor/group"/>
-</component>
-</collection>
-<collection name="systemsettings" long-name="System Settings" level="system">
-<component name="gssensorplugin" filter="s60" long-name="GS Sensor Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gssensorplugin/group"/>
-</component>
-<component name="gsaccessoryplugin" filter="s60" long-name="GS Accessory Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gsaccessoryplugin/group"/>
-</component>
-</collection>
-<collection name="filehandling" long-name="File Handling" level="server">
-<component name="fileconverterfw" long-name="File Converter Framework" purpose="optional">
-<unit bldFile="mw/appsupport/filehandling/fileconverterfw/group" mrp="mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
-</component>
-<component name="htmltorichtextconverter" long-name="HTML to RichText Converter" introduced="7.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/htmltorichtextconverter/group" mrp="mw/appsupport/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
-</component>
-<component name="richtexttohtmlconverter" long-name="RichText to HTML Converter" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
-</component>
-</collection>
-<collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
-<component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
-</component>
-</collection>
-<collection name="commonappservices" long-name="Common Application Services" level="framework">
-<component name="alarmserver" long-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"/>
-</component>
-<component name="alarmservertest" long-name="Alarm Server Test" deprecated="^3" introduced="8.1" purpose="development">
-<unit bldFile="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
-</component>
-<component name="appservicesdocs" long-name="Application Services Documentation" purpose="development" class="doc">
-<unit mrp="mw/appsupport/commonappservices/appservicesdocs/app-services_documentation.mrp"/>
-</component>
-<component name="backuprestorenotification" long-name="Backup Restore Notification" introduced="8.1" purpose="optional">
-<unit bldFile="mw/appsupport/commonappservices/backuprestorenotification/group" mrp="mw/appsupport/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
-</component>
-</collection>
-<collection name="tzservices" long-name="Time Zone Services" level="plugin">
-<component name="tzserver" long-name="Time Zone Server" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzserver/group" mrp="mw/appsupport/tzservices/tzserver/group/app-services_tz.mrp"/>
-</component>
-<component name="tzloc" long-name="Time Zone Localization" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzloc/group" mrp="mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
-</component>
-<component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzlocrscfactory/group" mrp="mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
-</component>
-<component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzdatabase/group" mrp="mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
-</component>
-</collection>
-<collection name="contenthandling" long-name="Content Handling" level="plugin">
-<component name="webrecognisers" long-name="Web Recognisers" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/contenthandling/webrecognisers/group" mrp="mw/appsupport/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
-</component>
-</collection>
-<collection name="openenvutils" long-name="Open Environment Utilities" level="specific">
-<component name="commandshell" long-name="Command Shell" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/commandshell/group" mrp="mw/appsupport/openenvutils/commandshell/group/oetools_zsh.mrp"/>
-</component>
-<component name="telnetserver" long-name="Telnet Server" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/telnetserver/group" mrp="mw/appsupport/openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
-</component>
-</collection>
-<collection name="printingsupport" long-name="Printing Support" level="generic">
-<component name="printinguisupport" long-name="Printing UI Support" purpose="optional" introduced="^2" deprecated="^3">
-<unit bldFile="mw/appsupport/printingsupport/printinguisupport/group" mrp="mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
-</component>
-</collection>
-<collection name="appfw" long-name="Application Framework" level="framework">
-<component name="apparchitecture" long-name="Application Architecture" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/apparchitecture/group" mrp="mw/appsupport/appfw/apparchitecture/group/app-framework_apparc.mrp"/>
-</component>
-<component name="viewserver" long-name="View Server" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/viewserver/group" mrp="mw/appsupport/appfw/viewserver/group/app-framework_viewsrv.mrp"/>
-</component>
-</collection>
-<collection name="applaunchservices" long-name="Application Launch Services" level="generic">
-<component name="aftermarketappstarter" long-name="After Market Application Starter" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/aftermarketappstarter/group" mrp="mw/appsupport/applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
-</component>
-<component name="applaunchplugins" long-name="Application Launch Plugins" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/applaunchplugins/group" mrp="mw/appsupport/applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
-</component>
-</collection>
-<collection name="tzpcside" long-name="Time Zone PC Side" level="plugin">
-<component name="tzcompiler" long-name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config PC">
-<unit bldFile="mw/appsupport/tzpcside/tzcompiler/group" mrp="mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
-</component>
-</collection>
-<collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
-<component name="appsupport_metadata" long-name="Generic Application Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="securitysrv" level="generic" long-name="Security Services" levels="plugin framework server generic specific">
-<collection name="secsrv_plat" long-name="Security Services Platform Interfaces" level="specific">
-<component name="cms_api" long-name="CMS API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/cms_api/group"/>
-</component>
-<component name="pkcs12_parser_api" long-name="PKCS12 Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkcs12_parser_api/group"/>
-</component>
-<component name="java_utils_api" long-name="Java Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/java_utils_api/group"/>
-</component>
-<component name="wim_cert_api" long-name="WIM Cert API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/wim_cert_api/group"/>
-</component>
-<component name="device_key_store_encryption_plugin_api" long-name="Device Key Store Encryption Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/device_key_store_encryption_plugin_api/group"/>
-</component>
-<component name="x509certnameparser_api" long-name="X.509 Certificate Name Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
-</component>
-<component name="remote_lock_api" long-name="Remote Lock API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
-</component>
-<component name="pkidialog_api" long-name="PKI Dialog API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
-</component>
-<component name="provisioning_api" long-name="Provisioning API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/provisioning_api/group"/>
-</component>
-<component name="keyguard_configuration_api" long-name="Keyguard Configuration API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_configuration_api/group"/>
-</component>
-<component name="keylock_policy_api" long-name="Keylock Policy API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keylock_policy_api/group"/>
-</component>
-<component name="security_code_ui_api" long-name="Security Code UI API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
-</component>
-<component name="gba_api" long-name="GBA API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/gba_api/group"/>
-</component>
-<component name="keyguard_access_api" long-name="Keyguard Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_access_api/group"/>
-</component>
-<component name="devicelock_access_api" long-name="Device Lock Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devicelock_access_api/group"/>
-</component>
-<component name="lockapp_server_api" long-name="Lock Application Server API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
-</component>
-<component name="devencadaptation_api" long-name="Device Encryption Adaptation API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
-</component>
-<component name="devenccommonutils_api" long-name="Device Encryption Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
-</component>
-</collection>
-<collection name="cms" long-name="Certificate Management Service" level="server">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="cms_build" filter="s60" long-name="CMS" introduced="^3">
-<unit bldFile="mw/securitysrv/cms/group"/>
-</component>
-</collection>
-<collection name="pkiutilities" long-name="PKI Utilities" level="plugin">
-<component name="x509certnameparser" filter="s60" long-name="X.509 Certificate Name Parser">
-<unit bldFile="mw/securitysrv/pkiutilities/x509certnameparser/group"/>
-</component>
-<component name="pkcs12" filter="s60" long-name="PKCS #12">
-<unit bldFile="mw/securitysrv/pkiutilities/pkcs12/group"/>
-</component>
-<component name="certmanui" filter="s60" long-name="Certificate Management UI">
-<unit bldFile="mw/securitysrv/pkiutilities/certmanui/group"/>
-</component>
-<component name="ctsecuritydialogs" filter="s60" long-name="Crypto Token Security Dialogs">
-<unit bldFile="mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
-</component>
-<component name="certsaver" filter="s60" long-name="Certificate Saver">
-<unit bldFile="mw/securitysrv/pkiutilities/certsaver/group"/>
-</component>
-<component name="secmodui" filter="s60" long-name="Security Module UI">
-<unit bldFile="mw/securitysrv/pkiutilities/secmodui/group"/>
-</component>
-<component name="devicetoken" filter="s60" long-name="Device Token">
-<unit bldFile="mw/securitysrv/pkiutilities/devicetoken/group"/>
-</component>
-<component name="certificates" filter="s60" long-name="Certificates">
-<unit bldFile="mw/securitysrv/pkiutilities/Certificates/group" filter="sf_build"/>
-</component>
-<component name="pkiutilities_build" filter="s60" long-name="PKI Utilities Build">
-<!-- need to split this into the above components -->
-<unit bldFile="mw/securitysrv/pkiutilities/group"/>
-</component>
-<component name="ocsp" long-name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
-<unit bldFile="mw/securitysrv/pkiutilities/ocsp/group" mrp="mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
-</component>
-</collection>
-<collection name="wim" long-name="Wireless Identity Module " level="framework">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="wim_build" filter="s60" long-name="WIM Build">
-<unit bldFile="mw/securitysrv/wim/group"/>
-</component>
-</collection>
-<collection name="remotelock" long-name="Remote Lock" level="generic">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="remotelock_build" filter="s60" long-name="Remote Lock Build">
-<unit bldFile="mw/securitysrv/remotelock/group"/>
-</component>
-</collection>
-<collection name="securitydialogs" long-name="Security Dialogs" level="specific">
-<component name="keylockpolicyapi" filter="s60" long-name="Keylock Policy API">
-<unit bldFile="mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
-</component>
-<component name="autolock" long-name="Autolock" filter="s60">
-<unit bldFile="mw/securitysrv/securitydialogs/autolock/group"/>
-</component>
-<component name="secui" filter="s60" long-name="Security UI">
-<unit bldFile="mw/securitysrv/securitydialogs/secui/group"/>
-</component>
-<component name="securitynotifier" filter="s60" long-name="Security Notifier">
-<unit bldFile="mw/securitysrv/securitydialogs/securitynotifier/group"/>
-</component>
-<component name="lockclient" filter="s60" long-name="Lock Client" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockclient/group"/>
-</component>
-<component name="lockapp" filter="s60" long-name="Lock Application" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockapp/group"/>
-</component>
-<component name="simlockui" filter="s60" long-name="SIM Lock UI" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/simlockui/group"/>
-</component>
-</collection>
-<collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="boottimeintegritycheck_build" filter="s60" long-name="Boot Time Integrity Check Build">
-<unit bldFile="mw/securitysrv/boottimeintegritycheck/group"/>
-</component>
-</collection>
-<collection name="gba" long-name="Generic Bootstrapping Architecture" level="server">
-<component name="uicc" filter="s60" long-name="UICC" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/uicc/group"/>
-</component>
-<component name="gbaserver" filter="s60" long-name="GBA Server" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaserver/group"/>
-</component>
-<component name="gbaapi" filter="s60" long-name="GBA API" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaapi/group"/>
-</component>
-<component name="gbafilter" filter="s60" long-name="GBA HTTP Filter" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/gbafilter/group"/>
-</component>
-<component name="gba_build" filter="s60" long-name="Generic Boot Architecture Build" introduced="^2">
-<!-- need to split this into the above components, or remove #includes and make this GBA ROM -->
-<unit bldFile="mw/securitysrv/gba/group"/>
-</component>
-</collection>
-<collection name="devencdiskutils" long-name="Device Encryption Disk Utils" level="server">
-<component name="devenccommonutils" filter="s60" long-name="Device Encryption Common Utils" introduced="^3">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncCommonUtils/group"/>
-</component>
-<component name="devencrfsplugin" filter="s60" long-name="Device Encryption RFS Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncRfsPlugin/group"/>
-</component>
-<component name="pk5recognizer" filter="s60" long-name="Device Encryption Pk5 Recognizer" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/Pk5Recognizer/group"/>
-</component>
-<component name="devencstarter" filter="s60" long-name="Device Encryption Starter" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncStarter/group"/>
-</component>
-<component name="devencdiskutils" filter="s60" long-name="Device Encryption Disk Utils Build" introduced="^3">
-<!-- need to split this into the above components, or remove #includes and make this a ROM component-->
-<unit bldFile="mw/securitysrv/devencdiskutils/group"/>
-</component>
-</collection>
-<collection name="securitysrv_info" long-name="Security Services Info" level="specific">
-<component name="securitysrv_metadata" long-name="Security Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="drm" level="generic" long-name="DRM" levels="plugin framework server generic specific">
-<collection name="drm_plat" long-name="DRM Platform Interfaces" level="specific">
-<component name="roap_api" long-name="ROAP API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/roap_api/group"/>
-</component>
-<component name="drm_common_api" long-name="DRM Common API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_common_api/group"/>
-</component>
-<component name="drm_rights_api" long-name="DRM Rights API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_rights_api/group"/>
-</component>
-<component name="drm_legacy_api" long-name="DRM Legacy API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_legacy_api/group"/>
-</component>
-<component name="dcf_repository_api" long-name="DCF Repository API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/dcf_repository_api/group"/>
-</component>
-<component name="drm_service_api" long-name="DRM Service API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_service_api/group"/>
-</component>
-<component name="drm_secondary_display_api" long-name="DRM Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_secondary_display_api/group"/>
-</component>
-<component name="drm_license_manager_api" long-name="DRM License Manager API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_license_manager_api/group"/>
-</component>
-<component name="drm_utility_api" long-name="DRM Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_utility_api/group"/>
-</component>
-<component name="drm_agents_api" long-name="DRM Agents API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_agents_api/group"/>
-</component>
-<component name="wmdrm_core_api" long-name="WM DRM Core API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_core_api/group"/>
-</component>
-<component name="wmdrm_access_api" long-name="WMDRM Access API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_access_api/group"/>
-</component>
-<component name="camese_utility_api" long-name="Camese Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_utility_api/group"/>
-</component>
-<component name="camese_framework_api" long-name="Camese Framework API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_framework_api/group"/>
-</component>
-</collection>
-<collection name="drm_pub" long-name="DRM Public Interfaces" level="specific">
-<component name="drm_helper_api" long-name="DRM Helper API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_helper_api/group"/>
-</component>
-<component name="oma_drm_caf_agent_api" long-name="OMA DRM CAF Agent API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/group"/>
-</component>
-<component name="drm_license_checker_api" long-name="DRM License Checker API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_license_checker_api/group"/>
-</component>
-</collection>
-<collection name="commondrm" long-name="Common DRM" level="generic">
-<!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
-<component name="drmencryptor" filter="s60" long-name="DRM Encryptor" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmsettingsplugin" filter="s60" long-name="DRM Settings Plugin" plugin="Y" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmrightsmanagerui" filter="s60" long-name="DRM Rights Manager UI">
-<unit bldFile="mw/drm/commondrm/drmrightsmanagerui/help/group"/>
-</component>
-<component name="drmutility" filter="s60" long-name="DRM Utility">
-<!-- Uncomment unit when configuration is in place. Currently #included from commondrm_build -->
-<!--<unit bldFile="commondrm/drmutility/group"/>-->
-</component>
-<component name="drmserviceapiwrapper" filter="s60" long-name="DRM Service API Wrapper">
-<unit bldFile="mw/drm/commondrm/drmserviceapiwrapper/group"/>
-</component>
-<component name="drmrightsstoringlocation" filter="s60" long-name="DRM Rights Storing Location">
-<unit bldFile="mw/drm/commondrm/drmrightsstoringlocation/group"/>
-</component>
-<component name="commondrm_build" filter="s60" long-name="Common DRM Build">
-<!-- should be split into the above files, or them collapsed into a single component -->
-<unit bldFile="mw/drm/commondrm/group"/>
-</component>
-</collection>
-<collection name="omadrm" long-name="OMA DRM" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="omadrm_build" filter="s60" long-name="OMA DRM Build">
-<unit bldFile="mw/drm/omadrm/group"/>
-</component>
-<component name="foundationcerts" filter="sf_build" long-name="Foundation Certificates">
-<unit bldFile="mw/drm/omadrm/foundationcerts/group"/>
-</component>
-</collection>
-<collection name="wmdrm" long-name="Windows Media DRM" level="framework">
-<!-- collection is really a component. Move down a directory -->
-<component name="wmdrm_build" filter="s60" long-name="WM DRM Build">
-<unit bldFile="mw/drm/wmdrm/group"/>
-</component>
-</collection>
-<collection name="drm_info" long-name="DRM Info" level="specific"/>
-</block>
-<block name="locationsrv" level="specific" long-name="Location Services" levels="plugin fw server if">
-<collection name="locsrv_pub" long-name="Location Services Public Interfaces" level="if">
-<component name="landmarks_search_api" long-name="Landmarks Search API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
-</component>
-<component name="landmarks_api" long-name="Landmarks API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/group"/>
-</component>
-<component name="landmarks_database_management_api" long-name="Landmarks Database Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/group"/>
-</component>
-<component name="location_triggering_api" long-name="Location Triggering API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/location_triggering_api/group"/>
-</component>
-<component name="blid_application_satellite_info_api" long-name="BLID Application Satellite Info API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/group"/>
-</component>
-</collection>
-<collection name="locsrv_plat" long-name="Location Services Platform Interfaces" level="if">
-<component name="map_and_navigation_api" long-name="Map and Navigation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/group"/>
-</component>
-<component name="map_and_navigation_provider_discovery_api" long-name="Map and Navigation Provider Discovery API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/group"/>
-</component>
-<component name="geocoding_api" long-name="Geocoding API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
-</component>
-<component name="map_image_api" long-name="Map Image API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/group"/>
-</component>
-<component name="map_and_navigation_aiw_api" long-name="Map and Navigation AIW API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_aiw_api/group"/>
-</component>
-<component name="map_and_navigation_provider_api" long-name="Map and Navigation Provider API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_api/group"/>
-</component>
-<component name="landmarks_category_definition_api" long-name="Landmarks Category Definition API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
-</component>
-<component name="supl_settings_api" long-name="SUPL Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
-</component>
-<component name="location_settings_launch_api" long-name="Location Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/group"/>
-</component>
-<component name="map_image_conversion_plugin_api" long-name="Map Image Conversion Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/group"/>
-</component>
-<component name="psy_configuration_ui_plugin_api" long-name="PSY Configuration UI Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/psy_configuration_ui_plugin_api/group"/>
-</component>
-<component name="np_proxy_configuration_api" long-name="NP Proxy Configuration API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/np_proxy_configuration_api/group"/>
-</component>
-<component name="supl_terminal_initiation_api" long-name="SUPL Terminal Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/group"/>
-</component>
-<component name="location_notation_preferences_settings_api" long-name="Location Notation Preferences Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_notation_preferences_settings_api/group"/>
-</component>
-<component name="supl_settings_notifier_secondary_display_api" long-name="SUPL Settings Notifier Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_notifier_secondary_display_api/group"/>
-</component>
-<component name="supl_network_initiation_api" long-name="SUPL Network Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/group"/>
-</component>
-<component name="privacy_notifiers_secondary_display_api" long-name="Privacy Notifiers Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/privacy_notifiers_secondary_display_api/group"/>
-</component>
-<component name="oma_supl_configuration_parameter_api" long-name="OMA SUPL Configuration Parameter API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_configuration_parameter_api/group"/>
-</component>
-<component name="supl_query_secondary_display_api" long-name="SUPL Query Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_query_secondary_display_api/group"/>
-</component>
-<component name="location_triggering_management_api" long-name="Location Triggering Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_management_api/group"/>
-</component>
-<component name="location_triggering_status_information_api" long-name="Location Triggering Status Information API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_status_information_api/group"/>
-</component>
-<component name="oma_supl_asn_codec_plugin_api" long-name="OMA SUPL ASN Codec Plugin API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
-</component>
-<component name="query_and_notification_api" long-name="Query and Notification API" filter="s60" introduced="^3" class="api">
-<!-- needs metadata file: <meta rel="Api" href="locsrv_plat/query_and_notification_api/query_and_notification_api.metaxml"/> -->
-<unit bldFile="mw/locationsrv/locsrv_plat/query_and_notification_api/group"/>
-</component>
-<component name="location_local_variation_api" long-name="Location Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_local_variation_api/group"/>
-</component>
-</collection>
-<collection name="genericpositioningplugins" long-name="Generic Positioning Plugins" level="plugin">
-<component name="locationnpppsy" filter="s60" long-name="Location Positioning Proxy PSY" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
-</component>
-<component name="locationsuplpsy" filter="s60" long-name="Location SUPL PSY" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationsuplpsy/group"/>
-</component>
-<component name="genericpositioningplugins_build" filter="s60" long-name="Generic Positioning Plugins Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/genericpositioningplugins/group"/>
-</component>
-</collection>
-<collection name="landmarks" long-name="Landmarks" level="server">
-<component name="locationlandmarks" filter="s60" long-name="Location Landmarks">
-<unit bldFile="mw/locationsrv/landmarks/locationlandmarks/group"/>
-</component>
-</collection>
-<collection name="locationmapnavfw" long-name="Location Map and Navigation Framework" level="fw">
-<component name="mnlibrary" filter="s60" long-name="Map and Navigation Library">
-<unit bldFile="mw/locationsrv/locationmapnavfw/library/group"/>
-</component>
-<component name="mnaiwprovider" filter="s60" long-name="Map and Navigation AIW Provider" plugin="Y">
-<unit bldFile="mw/locationsrv/locationmapnavfw/aiwprovider/group"/>
-</component>
-<component name="locationmapnavfw_build" filter="s60" long-name="Location Map and Navigation Framework Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/locationmapnavfw/group"/>
-</component>
-</collection>
-<collection name="locationsystemui" long-name="Location System UI" level="if">
-<component name="locationsysui" filter="s60" long-name="Location System UI">
-<unit bldFile="mw/locationsrv/locationsystemui/locationsysui/group"/>
-</component>
-</collection>
-<collection name="supl" long-name="SUPL" level="fw">
-<component name="locationsuplfw" filter="s60" long-name="Location SUPL Framework">
-<unit bldFile="mw/locationsrv/supl/locationsuplfw/group"/>
-</component>
-<component name="locationomasuplprotocolhandler" filter="s60" long-name="OMA SUPL Protocol Handler">
-<unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/group"/>
-</component>
-<component name="supltiapiimplementation" filter="s60" long-name="SUPL TI API Implementation" introduced="^3">
-<unit bldFile="mw/locationsrv/supl/supltiapiimplementation/group"/>
-</component>
-</collection>
-<collection name="locationtriggering" long-name="Location Triggering" level="server">
-<component name="ltlogger" filter="s60" long-name="LT Logger">
-<unit bldFile="mw/locationsrv/locationtriggering/ltlogger/group"/>
-</component>
-<component name="ltclientlib" filter="s60" long-name="LT Client Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltclientlib/group"/>
-</component>
-<component name="ltmanagementlib" filter="s60" long-name="LT Management Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmanagementlib/group"/>
-</component>
-<component name="ltcontainer" filter="s60" long-name="LT Container">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontainer/group"/>
-</component>
-<component name="ltserver" filter="s60" long-name="LT Server">
-<unit bldFile="mw/locationsrv/locationtriggering/ltserver/group"/>
-</component>
-<component name="ltstrategypluginapi" filter="s60" long-name="LT Strategy Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategypluginapi/group"/>
-</component>
-<component name="ltstrategyengine" filter="s60" long-name="LT Strategy Engine">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategyengine/group"/>
-</component>
-<component name="ltmovementdetectionpluginapi" filter="s60" long-name="Movement Detection Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmovementdetectionpluginapi/group"/>
-</component>
-<component name="ltcellidmovementdetector" filter="s60" long-name="Cell ID Movement Detector">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/>
-</component>
-<component name="lbtmgmtui" filter="s60" long-name="LBT Management UI" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/lbtmgmtui/group"/>
-</component>
-<component name="ltcontextsourceplugin" filter="s60" long-name="LT Context Source Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontextsourceplugin/group"/>
-</component>
-<component name="locationtriggering_build" filter="s60" long-name="Location Triggering Build">
-<!-- should remove #include from this and maybe put exports in the above components -->
-<unit bldFile="mw/locationsrv/locationtriggering/group"/>
-</component>
-</collection>
-</block>
-<block name="accesssec" level="generic" long-name="Access Security" levels="plugin framework server generic specific">
-<collection name="accesssec_plat" long-name="Access Security Platform Interfaces" level="specific">
-<component name="wapi_security_settings_ui_api" long-name="WAPI Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_security_settings_ui_api/group"/>
-</component>
-<component name="wep_security_settings_ui_api" long-name="WEP Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wep_security_settings_ui_api/group"/>
-</component>
-<component name="wi-fi_protected_setup_ui_api" long-name="Wi-Fi Protected Setup UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
-</component>
-<component name="wlan_eap_settings_ui_api" long-name="WLAN EAP Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wlan_eap_settings_ui_api/group"/>
-</component>
-<component name="wpa_security_settings_ui_api" long-name="WPA Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wpa_security_settings_ui_api/group"/>
-</component>
-<component name="eap_vpn_api" long-name="EAP VPN API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
-</component>
-<component name="eapsim_db_api" long-name="EAP-SIM DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapsim_db_api/group"/>
-</component>
-<component name="eap_type_api" long-name="EAP Type API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_type_api/group"/>
-</component>
-<component name="eaptlspeap_db_api" long-name="EAP-TLS-PEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eaptlspeap_db_api/group"/>
-</component>
-<component name="eapleap_db_api" long-name="LEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapleap_db_api/group"/>
-</component>
-<component name="eapgtc_db_api" long-name="EAP-GTC DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapgtc_db_api/group"/>
-</component>
-<component name="eapmschapv2_db_api" long-name="EAP-MSCHAPV2 DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapmschapv2_db_api/group"/>
-</component>
-<component name="eapaka_db_api" long-name="EAP-AKA DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapaka_db_api/group"/>
-</component>
-<component name="wapi_db_api" long-name="WAPI DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_db_api/group"/>
-</component>
-</collection>
-<collection name="wlansecuritysettings" long-name="WLAN Security Settings" level="specific">
-<component name="wapisecuritysettingsui" filter="s60" long-name="WAPI Security Settings UI" introduced="9.1">
-<!-- the directory for this needs to be moved up to the right level -->
-<unit bldFile="mw/accesssec/wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
-</component>
-<component name="wepsecuritysettingsui" filter="s60" long-name="WEP Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wepsecuritysettingsui/group"/>
-</component>
-<component name="wifiprotectedsetup" filter="s60" long-name="WIFI Protected Setup" introduced="^1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wifiprotectedsetup/group"/>
-</component>
-<component name="wlaneapsettingsui" filter="s60" long-name="WLAN EAP Settings UI" introduced="9.3">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wlaneapsettingsui/group"/>
-</component>
-<component name="wpasecuritysettingsui" filter="s60" long-name="WPA Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wpasecuritysettingsui/group"/>
-</component>
-</collection>
-<collection name="eapol" long-name="EAPOL" level="framework">
-<component name="eapol_framework" filter="s60" long-name="EAPOL Framework" introduced="9.2">
-<unit bldFile="mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
-</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">
-<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>
-<component name="bearer_settings_plugin_api" long-name="Bearer Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/bearer_settings_plugin_api/group"/>
-</component>
-<component name="commsdat_wlan_api" long-name="CommsDat WLAN API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/commsdat_wlan_api/group"/>
-</component>
-<component name="connection_monitor_extension_api" long-name="Connection Monitor Extension API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_monitor_extension_api/group"/>
-</component>
-<component name="connection_ui_utilities_api" long-name="Connection UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_ui_utilities_api/group"/>
-</component>
-<component name="disconnect_dialog_api" long-name="Disconnect Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_api/group"/>
-</component>
-<component name="disconnect_dialog_disable_api" long-name="Disconnect Dialog Disable API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_disable_api/group"/>
-</component>
-<component name="extended_connection_settings_api" long-name="Extended Connection Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/extended_connection_settings_api/group"/>
-</component>
-<component name="mpm_default_connection_api" long-name="MPM Default Connection API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_default_connection_api/group"/>
-</component>
-<component name="pdpcontextmanager2_reset_factory_settings_api" long-name="PDP Context Manager 2 Reset Factory Settings API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_settings_api/group"/>
-</component>
-<component name="mpm_connect_screen_api" long-name="MPM Connect Screen API" filter="s60" class="api">
-<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">
-<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>
-<component name="access_point_engine_api" long-name="Access Point Engine API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_monitor_server_api/group"/>
-</component>
-<component name="connection_settings_ui_api" long-name="Connection Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_ui_api/group"/>
-</component>
-<component name="agent_dialog_api" long-name="Agent Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/agent_dialog_api/group"/>
-</component>
-<component name="extendedconnpref_api" long-name="Extended Connection Preferences API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/extendedconnpref_api/group"/>
-</component>
-</collection>
-<collection name="accesspointcontrol" long-name="Access Point Control" level="plugin">
-<component name="apcontrollistplugin" filter="s60" long-name="Access Point Control List Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
-</component>
-</collection>
-<collection name="alwayson_net_plugin" long-name="Always Online Net Plugin" level="server">
-<component name="pdpcontextmanager2" filter="s60" long-name="PDP Context Manager 2">
-<unit bldFile="mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
-</component>
-</collection>
-<collection name="apengine" long-name="Access Point Engine" level="framework">
-<component name="apeng" filter="s60" long-name="Access Point Engine">
-<unit bldFile="mw/ipconnmgmt/apengine/apeng/group"/>
-</component>
-<component name="apsettingshandlerui" filter="s60" long-name="Access Point Settings Handler UI">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingshandlerui/group"/>
-</component>
-<component name="apsettingsplugin" filter="s60" long-name="Access Point Settings Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="bearermanagement" long-name="Bearer Management" level="framework">
-<component name="mpm" filter="s60" long-name="Mobility Policy Manager">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/mpm/group"/>
-</component>
-<component name="extendedconnpref" filter="s60" long-name="Extended Connection Preferences">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/extendedconnpref/group"/>
-</component>
-<component name="s60mcpr" filter="s60" long-name="S60 Meta-Connection Provider" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/S60MCPR/group"/>
-</component>
-</collection>
-<collection name="cmmanager" long-name="Connection Method Manager" level="framework">
-<component name="cmmgr" filter="s60" long-name="CM Manager">
-<unit bldFile="mw/ipconnmgmt/cmmanager/cmmgr/group"/>
-</component>
-<component name="gsconnsettingsplugin" filter="s60" long-name="GS Connection Settings Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/cmmanager/gsconnsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="connectionmonitoring" long-name="Connection Monitoring" level="server">
-<component name="connectionmonitorplugin" filter="s60" long-name="Connection Monitor Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorplugin/group"/>
-</component>
-<component name="connectionmonitorui" filter="s60" long-name="Connection Monitor UI">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorui/group"/>
-</component>
-<component name="connmon" filter="s60" long-name="Connection Monitor">
-<!-- either split into two components, or #include from a common bld.inf -->
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/connectionmonitor/group"/>
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/dataconnectionlogger/group"/>
-</component>
-<component name="connmonext" filter="s60" long-name="Connection Monitor Extension API">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmonext/group"/>
-</component>
-</collection>
-<collection name="connectionutilities" long-name="Connection Utilities" level="utils">
-<component name="connectiondialogs" filter="s60" long-name="Connection Dialogs">
-<unit bldFile="mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/>
-</component>
-</collection>
-<collection name="dbcreator" long-name="DB Creator" level="utils">
-<component name="commsdatcreator" filter="s60" long-name="Comms Database Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
-</component>
-<component name="commsdatcreatorrfsplugin" filter="s60" long-name="Comms Database Creator RFS Plugin" introduced="9.3" plugin="Y">
-<!-- uncomment when config is turned on -->
-<!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
-</component>
-<component name="commsdatstartup" filter="s60" long-name="Comms Database Startup" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
-</component>
-<component name="dbcreatorexe" filter="s60" long-name="DB Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
-</component>
-<component name="dbcreator_build" filter="s60" long-name="DB Creator Build" introduced="9.3">
-<!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
-<unit bldFile="mw/ipconnmgmt/dbcreator/group"/>
-</component>
-</collection>
-<collection name="ipconnmgmt_info" long-name="IP Connectivity Management Info" level="utils">
-<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"/>
-</component>
-</collection>
-</block>
-<block name="netprotocols" level="generic" long-name="High-level Internet Protocols" levels="plugin framework server generic specific">
-<collection name="netprotocols_plat" long-name="High-level Internet Protocols Platform Interfaces" level="specific">
-<component name="cookie_manager_api" long-name="Cookie Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/cookie_manager_api/group"/>
-</component>
-<component name="http_cache_mgr_api" long-name="HTTP Cache Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_cache_mgr_api/group"/>
-</component>
-<component name="http_filters_api" long-name="HTTP Filters API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_filters_api/group"/>
-</component>
-</collection>
-<collection name="httpfilters" long-name="HTTP Filters" level="plugin">
-<component name="httpfiltercommon" filter="s60" long-name="HTTP Filter Common">
-<unit bldFile="mw/netprotocols/httpfilters/httpfiltercommon/group"/>
-</component>
-<component name="cookie" filter="s60" long-name="Cookie Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/cookie/group"/>
-</component>
-<component name="deflatefilter" filter="s60" long-name="Deflate Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/deflatefilter/group"/>
-</component>
-<component name="httpfilteracceptheader" filter="s60" long-name="Accept Header Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteracceptheader/group"/>
-</component>
-<component name="httpfilterauthentication" filter="s60" long-name="Authentication Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterauthentication/group"/>
-</component>
-<component name="httpfilterconnhandler" filter="s60" long-name="Connection Handler Fitler" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterconnhandler/group"/>
-</component>
-<component name="httpfilteriop" filter="s60" long-name="HTTP IOP Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteriop/group"/>
-</component>
-<component name="httpfilterproxy" filter="s60" long-name="HTTP Proxy Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterproxy/group"/>
-</component>
-<component name="uaproffilter" filter="s60" long-name="UAProf Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/uaproffilter/group"/>
-</component>
-</collection>
-<collection name="applayerprotocols" long-name="Application Layer Protocols" level="server">
-<component name="httptransportfw" long-name="HTTP Transport Framework" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
-</component>
-<component name="httpexamples" long-name="HTTP Examples" introduced="6.2" purpose="development">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpexamples/group" mrp="mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
-</component>
-<component name="wappushsupport" long-name="WAP Push Support" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
-</component>
-<component name="wapbase" long-name="WAP Base" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wapbase/Group" mrp="mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
-</component>
-<component name="ftpengine" long-name="FTP Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/ftpengine/group" mrp="mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
-</component>
-<component name="telnetengine" long-name="Telnet Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/telnetengine/group" mrp="mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
-</component>
-<component name="httpserviceapi" long-name="HTTP Service API" introduced="TB9.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpservice/group" mrp="mw/netprotocols/applayerprotocols/httpservice/group/http_service.mrp"/>
-</component>
-</collection>
-<collection name="applayerpluginsandutils" long-name="Application Layer Plugins and Utils" level="framework">
-<component name="uripermissionservices" long-name="URI Permission Services" introduced="^2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
-</component>
-<component name="bookmarksupport" long-name="Bookmark Support" introduced="9.1" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
-</component>
-<component name="httpprotocolplugins" long-name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
-</component>
-<component name="httptransportplugins" long-name="HTTP Transport Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
-</component>
-</collection>
-<collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
-<component name="netprotocols_metadata" long-name="High-level Internet Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ipappprotocols" level="generic" long-name="IP App Protocols" levels="plugin conn server if">
-<collection name="ipappprotocols_plat" long-name="IP App Protocols Platform Interfaces" level="if">
-<component name="srtp_api" long-name="SRTP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/srtp_api/group"/>
-</component>
-<component name="rtprtcp_api" long-name="RTP/RTCP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/rtprtcp_api/group"/>
-</component>
-</collection>
-<collection name="rtp" long-name="RTP" level="server">
-<component name="srtpstack" filter="s60" long-name="SRTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/srtpstack/group"/>
-</component>
-<component name="rtpstack" filter="s60" long-name="RTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/rtpstack/group"/>
-</component>
-</collection>
-<collection name="realtimenetprots" long-name="Real Time Net Protocols" level="server">
-<component name="symrtp" long-name="RTP" introduced="9.0" purpose="optional">
-<!-- Real Time Data Protocol -->
-<unit bldFile="mw/ipappprotocols/realtimenetprots/rtp/group" mrp="mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
-</component>
-<component name="sipfw" long-name="SIP Framework" introduced="9.2" purpose="optional">
-<unit bldFile="mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp" version="2"/>
-</component>
-</collection>
-<collection name="sipplugins" long-name="SIP Plugins" level="plugin">
-<component name="sippwlanplugin" filter="s60" long-name="SIP WLAN Plugin" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
-</component>
-<component name="sippsipsettingsui" filter="s60" long-name="SIP Settings UI" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
-</component>
-<component name="sippdevmgmtsipadapter" filter="s60" long-name="Device Management SIP Settings Adapter" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
-</component>
-<component name="sippsystemstatemonitor" filter="s60" long-name="SIP System State Monitor" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsystemstatemonitor/group"/>
-</component>
-<component name="sippsipadapter" filter="s60" long-name="SIP Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipadapter/group"/>
-</component>
-</collection>
-<collection name="sipproviderplugins" long-name="SIP Provider Plugins" level="conn">
-<component name="sipprovider" long-name="SIP Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipproviderplugins/sipprovider/group" mrp="mw/ipappprotocols/sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
-</component>
-</collection>
-<collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="if">
-<component name="ipappprotocols_metadata" long-name="IP App Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wirelessacc" level="specific" long-name="Wireless Access" levels="framework generic ui">
-<collection name="hsfw_plat" long-name="HotSpot Framework Platform Interfaces" level="ui">
-<component name="hotspot_framework_client_api" long-name="HotSpot Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_api" long-name="Internet Connectivity Test Service API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_settings_api" long-name="Internet Connectivity Test Service Settings API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
-</component>
-<component name="hotspot_framework_client_plugin_api" long-name="HotSpot Framework Client Plugin API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
-</component>
-</collection>
-<collection name="hotspotfw" long-name="HotSpot Framework" level="framework">
-<component name="hsserver" filter="s60" long-name="HotSpot Server" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="hsclient" filter="s60" long-name="HotSpot Client" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="internetconnectivitytestservice" filter="s60" long-name="Internet Connectivity Test Service" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
-</component>
-<component name="ictsdialogs" filter="s60" long-name="Internet Connectivity Test Service Dialogs" deprecated="^3" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
-</component>
-<component name="hspluginforagent" filter="s60" long-name="HotSpot Plugin for Agent" plugin="Y" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
-</component>
-<component name="hsbrowser" filter="s60" long-name="HotSpot Browser" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
-</component>
-<component name="hotspotfw_build" filter="s60" long-name="Hotspot Framework Build">
-<!-- should break up this bld.inf into the above components, or collapse them all into a single component -->
-<unit bldFile="mw/wirelessacc/hotspotfw/group"/>
-</component>
-</collection>
-<collection name="wlanutilities" long-name="WLAN Utilities" level="generic">
-<component name="wlanplugin" filter="s60" long-name="WLAN Plugin" plugin="Y">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlanplugin/group"/>
-</component>
-<component name="wlansettingsui" filter="s60" long-name="WLAN Settings UI">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlansettingsui/group"/>
-</component>
-<component name="wlansniffer" filter="s60" long-name="WLAN Sniffer">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlansniffer/group"/>
-</component>
-<component name="wlanindicatorplugin" filter="s60" long-name="WLAN Indicator Plugin" plugin="Y">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlanindicatorplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="vpnclient" level="specific" long-name="VPN Client" levels="engine ui api">
-<!-- is the !oem_build filter needed? -->
-<collection name="vpnc_plat" long-name="VPN Client Platform Interfaces" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API" class="api">
-<unit bldFile="mw/vpnclient/vpnc_plat/vpnapi/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API">
-<unit bldFile="mw/vpnclient/vpnapiimpl/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnengine" long-name="VPN Engine" level="engine">
-<!-- too many components in this collection.
- Probably best to group the binaries together into larger components
- or maybe split the collection into more reasonable groups -->
-<component name="eventmediatorapi" filter="s60" long-name="Event Mediator API">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediatorapi/group" filter="!oem_build"/>
-</component>
-<component name="eventviewer" filter="s60" long-name="Event Viewer">
-<unit bldFile="mw/vpnclient/vpnengine/eventviewer/group" filter="!oem_build"/>
-</component>
-<component name="vpnins" filter="s60" long-name="VPN Installer">
-<unit bldFile="mw/vpnclient/vpnengine/vpnins/group" filter="!oem_build"/>
-</component>
-<component name="ikepolparser" filter="s60" long-name="IKE Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/ikepolparser/group" filter="!oem_build"/>
-</component>
-<component name="utlbase64" filter="s60" long-name="Base64 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlbase64/group" filter="!oem_build"/>
-</component>
-<component name="utlcrypto" filter="s60" long-name="Crypto Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlcrypto/group" filter="!oem_build"/>
-</component>
-<component name="utlxml" filter="s60" long-name="XML Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlxml/group" filter="!oem_build"/>
-</component>
-<component name="utlpkcs10" filter="s60" long-name="PKCS#10 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs10/group" filter="!oem_build"/>
-</component>
-<component name="pkiserviceapi" filter="s60" long-name="PKI Service API">
-<unit bldFile="mw/vpnclient/vpnengine/pkiserviceapi/group" filter="!oem_build"/>
-</component>
-<component name="ikecert" filter="s60" long-name="IKE Certificate Management">
-<unit bldFile="mw/vpnclient/vpnengine/ikecert/group" filter="!oem_build"/>
-</component>
-<component name="kmdapi" filter="s60" long-name="Key Management Daemon API">
-<unit bldFile="mw/vpnclient/vpnengine/kmdapi/group" filter="!oem_build"/>
-</component>
-<component name="kmdserver" filter="s60" long-name="Key Management Daemon Server">
-<unit bldFile="mw/vpnclient/vpnengine/kmdserver/group" filter="!oem_build"/>
-</component>
-<component name="ikeutils" filter="s60" long-name="Internet Key Exchange Utils">
-<unit bldFile="mw/vpnclient/vpnengine/ikeutils/group" filter="!oem_build"/>
-</component>
-<component name="ikev1lib" filter="s60" long-name="IKEv1 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev1lib/group" filter="!oem_build"/>
-</component>
-<component name="ikev2lib" filter="s60" long-name="IKEv2 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev2lib/group" filter="!oem_build"/>
-</component>
-<component name="vpnipsecpolparser" filter="s60" long-name="VPN IPsec Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/vpnipsecpolparser/group" filter="!oem_build"/>
-</component>
-<component name="sit" filter="s60" long-name="Socket Interaction Thread">
-<unit bldFile="mw/vpnclient/vpnengine/sit/group" filter="!oem_build"/>
-</component>
-<component name="vpntcwrapper" filter="s60" long-name="VPN Terminal Control Wrapper">
-<unit bldFile="mw/vpnclient/vpnengine/vpntcwrapper/group" filter="!oem_build"/>
-</component>
-<component name="eventmediator" filter="s60" long-name="Event Mediator">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediator/group" filter="!oem_build"/>
-</component>
-<component name="pkiservice" filter="s60" long-name="PKI Service">
-<unit bldFile="mw/vpnclient/vpnengine/pkiservice/group" filter="!oem_build"/>
-</component>
-<component name="vpnconnagt" filter="s60" long-name="VPN Connection Agent">
-<unit bldFile="mw/vpnclient/vpnengine/vpnconnagt/group" filter="!oem_build"/>
-</component>
-<component name="vpnmanager" filter="s60" long-name="VPN Manager">
-<unit bldFile="mw/vpnclient/vpnengine/vpnmanager/group" filter="!oem_build"/>
-</component>
-<component name="vpncleaner" filter="s60" long-name="VPN Cleaner">
-<unit bldFile="mw/vpnclient/vpnengine/vpncleaner/group" filter="!oem_build"/>
-</component>
-<component name="utlpkcs12" filter="s60" long-name="PKCS#12 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs12/group" filter="!oem_build"/>
-</component>
-<component name="dmadengine" filter="s60" long-name="DM Adapter Engine">
-<unit bldFile="mw/vpnclient/vpnengine/dmadengine/group" filter="!oem_build"/>
-</component>
-<component name="dmadipsecvpn" filter="s60" long-name="IPsec VPN DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadipsecvpn/group" filter="!oem_build"/>
-</component>
-<component name="dmadpki" filter="s60" long-name="PKI DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadpki/group" filter="!oem_build"/>
-</component>
-<component name="ikesocket" filter="s60" long-name="IKE Socket" introduced="^3">
-<unit bldFile="mw/vpnclient/vpnengine/ikesocket/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnui" long-name="VPN UI" level="ui">
-<component name="vpnecomnotifier" filter="s60" long-name="VPN ECOM Notifier" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnecomnotifier/group" filter="!oem_build"/>
-</component>
-<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">
-<unit bldFile="mw/vpnclient/vpnui/vpnmanagementui/group" filter="!oem_build"/>
-</component>
-<component name="vpnpolins" filter="s60" long-name="VPN Policy Installer">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolins/group" filter="!oem_build"/>
-</component>
-<component name="vpnpolicyrecognizer" filter="s60" long-name="VPN Policy Recognizer" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolicyrecognizer/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnclient_info" long-name="VPN Client Info" level="api">
-<component name="vpnclient_help" filter="s60" long-name="VPN Client Help">
-<unit bldFile="mw/vpnclient/help/group" filter="!oem_build"/>
-</component>
-<component name="vpnclient_build" filter="s60" long-name="VPN Client Build">
-<!-- should split this up into the other components and remove this-->
-<unit bldFile="mw/vpnclient/group" filter="!oem_build"/>
-</component>
-</collection>
-</block>
-<block name="ipappsrv" level="specific" long-name="IP App Services" levels="framework generic server conn plugin">
-<collection name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" level="plugin">
-<component name="transcoder_api" long-name="Transcoder API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
-</component>
-<component name="comms_event_api" long-name="Comms Event API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/comms_event_api/group"/>
-</component>
-<component name="floor_control_api" long-name="Floor Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/floor_control_api/group"/>
-</component>
-<component name="media_control_api" long-name="Media Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/media_control_api/group"/>
-</component>
-<component name="multimedia_comms_api" long-name="Multimedia Comms API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/multimedia_comms_api/group"/>
-</component>
-<component name="nat_settings_api" long-name="NAT Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/nat_settings_api/group"/>
-</component>
-</collection>
-<collection name="natfw" long-name="NAT Framework" level="framework">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="natfw_build" filter="s60" long-name="NAT Framework Build" introduced="^2">
-<unit bldFile="mw/ipappsrv/natfw/group"/>
-</component>
-</collection>
-<collection name="multimediacommscontroller" long-name="Multimedia Comms Controller" level="conn">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommscontroller_build" filter="s60" long-name="Multimedia Comms Controller Build">
-<unit bldFile="mw/ipappsrv/multimediacommscontroller/group"/>
-</component>
-</collection>
-<collection name="multimediacommsengine" long-name="Multimedia Comms Engine" level="generic">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommsengine_build" filter="s60" long-name="Multimedia Comms Engine Build">
-<unit bldFile="mw/ipappsrv/multimediacommsengine/group"/>
-</component>
-</collection>
-<collection name="natplugins" long-name="NAT Plugins" level="plugin">
-<component name="natpcliprovisioningnatfwadapter" filter="s60" long-name="Client Provisioning NAT Framework Traversal Adapter" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/group"/>
-</component>
-<component name="natpdevmgmtnatfwadapter" filter="s60" long-name="Device Management NAT Framework Traversal Adapter" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/group"/>
-</component>
-<component name="natptraversalcontroller" filter="s60" long-name="NAT Traversal Controller" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natptraversalcontroller/group"/>
-</component>
-<component name="natpnatfwsdpprovider" filter="s60" long-name="NAT Framework SDP Provider" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpnatfwsdpprovider/group"/>
-</component>
-</collection>
-<collection name="ipappsrv_info" long-name="IP App Services Info" level="plugin">
-<component name="ipappsrv_build" long-name="IP App Services Build" filter="s60">
-<!-- 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">
-<collection name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" level="specific">
-<component name="string_parser_api" long-name="String Parser API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/string_parser_api/group"/>
-</component>
-<component name="cbs_mcn_client_api" long-name="CBS MCN Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cbs_mcn_client_api/group"/>
-</component>
-<component name="converged_call_engine_api" long-name="Converged Call Engine API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_engine_api/group"/>
-</component>
-<component name="aiw_dial_data_consumer_api" long-name="AIW Dial Data Consumer API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/aiw_dial_data_consumer_api/group"/>
-</component>
-<component name="phone_client_ussd_api" long-name="Phone Client USSD API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_api/group"/>
-</component>
-<component name="sat_refresh_api" long-name="SAT Refresh API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_refresh_api/group" filter="!test"/>
-</component>
-<component name="network_handling_engine_api" long-name="Network Handling Engine API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/network_handling_engine_api/group"/>
-</component>
-<component name="phone_client_emergency_call_api" long-name="Phone Client Emergency Call API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/group"/>
-</component>
-<component name="sat_configuration_api" long-name="SAT Configuration API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_configuration_api/group"/>
-</component>
-<component name="dial_utils_api" long-name="Dial Utils API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/dial_utils_api/group"/>
-</component>
-<component name="phone_client_image_handler_api" long-name="Phone Client Image Handler API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_image_handler_api/group"/>
-</component>
-<component name="phone_client_messenger_api" long-name="Phone Client Messenger API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_messenger_api/group"/>
-</component>
-<component name="sat_client_api" long-name="SAT Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_client_api/group" filter="!test"/>
-</component>
-<component name="phone_client_api" long-name="Phone Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_api/group"/>
-</component>
-<component name="sat_service_api" long-name="SAT Service API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_service_api/group" filter="!test"/>
-</component>
-<component name="cbs_message_api" long-name="CBS Message API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cbs_message_api/group"/>
-</component>
-<component name="phone_client_server_information_api" long-name="Phone Client Server Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_server_information_api/group"/>
-</component>
-<component name="phone_client_ussd_internal_api" long-name="Phone Client USSD Internal API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_internal_api/group"/>
-</component>
-<component name="phone_client_command_handler_api" long-name="Phone Client Command Handler API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_command_handler_api/group"/>
-</component>
-<component name="phone_client_notify_api" long-name="Phone Client Notify API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_notify_api/group"/>
-</component>
-<component name="phone_client_utility_api" long-name="Phone Client Utility API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_utility_api/group"/>
-</component>
-<component name="telephony_network_information_api" long-name="Telephony Network Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_network_information_api/group"/>
-</component>
-<component name="secondary_display_sat_api" long-name="Secondary Display SAT API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/secondary_display_sat_api/group"/>
-</component>
-<component name="callui_reconnect_query_api" long-name="CallUI Reconnect Query API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/callui_reconnect_query_api/group"/>
-</component>
-<component name="service_provider_settings_api" long-name="Service Provider Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/service_provider_settings_api/group"/>
-</component>
-<component name="converged_call_provider_api" long-name="Converged Call Provider API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_provider_api/group"/>
-</component>
-<component name="incoming_call_monitor_api" long-name="Incoming Call Monitor API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/incoming_call_monitor_api/group"/>
-</component>
-<component name="default_emergency_numbers_api" long-name="Default Emergency Numbers API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/default_emergency_numbers_api/group"/>
-</component>
-<component name="cenrep_database_api" long-name="Central Repository Database API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cenrep_database_api/group"/>
-</component>
-<component name="ss_settings_api" long-name="SS Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/ss_settings_api/group"/>
-</component>
-<component name="phone_settings_observer_api" long-name="Phone Settings Observer API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_observer_api/group"/>
-</component>
-<component name="phone_settings_notes_ui_api" long-name="Phone Settings Notes UI API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_notes_ui_api/group"/>
-</component>
-<component name="phone_settings_api" long-name="Phone Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_api/group"/>
-</component>
-<component name="voice_mailbox_number_api" long-name="Voice Mailbox Number API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_number_api/group"/>
-</component>
-<component name="voice_mailbox_settings_api" long-name="Voice Mailbox Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_settings_api/group"/>
-</component>
-<component name="call_information_api" long-name="Call Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/call_information_api/group" filter="!test"/>
-</component>
-<component name="call_remote_party_information_api" long-name="Call Remote Party Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/call_remote_party_information_api/group" filter="!test"/>
-</component>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_mediator_api/group"/>
-</component>
-</collection>
-<collection name="telutils" long-name="Telephony Utils" level="generic">
-<component name="phoneparser" filter="s60" long-name="Phone Parser">
-<unit bldFile="mw/phonesrv/telutils/phoneparser/group"/>
-</component>
-<component name="telephonyservice" filter="s60" long-name="Telephony Service">
-<unit bldFile="mw/phonesrv/telutils/telephonyservice/group"/>
-</component>
-</collection>
-<collection name="cbs" long-name="Cellular Baseband Services" level="plugin">
-<component name="cbsserver" filter="s60" long-name="CBS Server">
-<unit bldFile="mw/phonesrv/cbs/cbsserver/group"/>
-</component>
-<component name="cbsui" filter="s60" long-name="CBS UI">
-<unit bldFile="mw/phonesrv/cbs/cbsui/group"/>
-</component>
-</collection>
-<collection name="cellular" long-name="Cellular" level="server">
-<component name="telephonysettings" filter="s60" long-name="Telephony Settings">
-<unit bldFile="mw/phonesrv/cellular/telephonysettings/group"/>
-</component>
-<component name="sssettings" filter="s60" long-name="Supplementary Service Settings">
-<unit bldFile="mw/phonesrv/cellular/sssettings/group"/>
-</component>
-<component name="psetnotesui" filter="s60" long-name="Phone Settings Notes UI">
-<unit bldFile="mw/phonesrv/cellular/psetnotesui/group"/>
-</component>
-<component name="servicerequest" filter="s60" long-name="Service Request">
-<unit bldFile="mw/phonesrv/cellular/servicerequest/group"/>
-</component>
-</collection>
-<collection name="convergedcallengine" long-name="Converged Call Engine" level="framework">
-<component name="callprovider" filter="s60" long-name="Call Provider">
-<unit bldFile="mw/phonesrv/convergedcallengine/callprovider/group"/>
-</component>
-<component name="cce" filter="s60" long-name="CCE">
-<unit bldFile="mw/phonesrv/convergedcallengine/cce/group"/>
-</component>
-<component name="spsettings" filter="s60" long-name="Service Provider Settings">
-<unit bldFile="mw/phonesrv/convergedcallengine/spsettings/group"/>
-</component>
-<component name="cenrepdatabase" filter="s60" long-name="CCE Cenrep Database">
-<unit bldFile="mw/phonesrv/convergedcallengine/cenrepdatabase/group"/>
-</component>
-<component name="serviceselector" filter="s60" long-name="Service Selector">
-<unit bldFile="mw/phonesrv/convergedcallengine/serviceselector/group"/>
-</component>
-<component name="csplugin" filter="s60" long-name="CS Plugin" plugin="Y">
-<!-- should spell out CS in name -->
-<unit bldFile="mw/phonesrv/convergedcallengine/csplugin/group"/>
-</component>
-</collection>
-<collection name="engines" long-name="Telephony Engines" level="specific">
-<component name="vmbxengine" filter="s60" long-name="Voice Mailbox Engine">
-<unit bldFile="mw/phonesrv/engines/vmbxengine/group"/>
-</component>
-</collection>
-<collection name="networkhandling" long-name="Network Handling" level="plugin">
-<component name="networkhandlingengine" filter="s60" long-name="Network Handling Engine">
-<unit bldFile="mw/phonesrv/networkhandling/networkhandlingengine/group"/>
-</component>
-</collection>
-<collection name="phoneclientserver" long-name="Phone Client/Server" level="server">
-<component name="enpolicy" filter="s60" long-name="Emergency Number Policy">
-<unit bldFile="mw/phonesrv/phoneclientserver/enpolicy/group"/>
-</component>
-<component name="aiwdialdata" filter="s60" long-name="AIW Dial Data">
-<unit bldFile="mw/phonesrv/phoneclientserver/aiwdialdata/group"/>
-</component>
-<component name="dialutils" filter="s60" long-name="Dial Utils">
-<unit bldFile="mw/phonesrv/phoneclientserver/dialutils/group"/>
-</component>
-<component name="phoneclient" filter="s60" long-name="Phone Client">
-<unit bldFile="mw/phonesrv/phoneclientserver/phoneclient/group"/>
-</component>
-<component name="phoneserver" filter="s60" long-name="Phone Server">
-<unit bldFile="mw/phonesrv/phoneclientserver/phoneserver/group"/>
-</component>
-<component name="callui" filter="s60" long-name="Call UI">
-<unit bldFile="mw/phonesrv/phoneclientserver/callui/group"/>
-</component>
-</collection>
-<collection name="satengine" long-name="SIM Application Toolkit Engine" level="generic">
-<component name="satserver" filter="s60" long-name="SAT Server">
-<unit bldFile="mw/phonesrv/satengine/satserver/group"/>
-</component>
-</collection>
-<collection name="satui" long-name="SIM Application Toolkit UI" level="specific">
-<component name="satapp" filter="s60" long-name="SAT Application">
-<unit bldFile="mw/phonesrv/satui/satapp/group"/>
-</component>
-<component name="satplugin" filter="s60" long-name="SAT Plugin" plugin="Y">
-<unit bldFile="mw/phonesrv/satui/satplugin/group"/>
-</component>
-</collection>
-<collection name="phonecmdhandler" long-name="Phone Command Handler" level="generic">
-<component name="phonecmdhnlr" filter="s60" long-name="Phone Command Handler">
-<unit bldFile="mw/phonesrv/phonecmdhandler/phonecmdhnlr/group"/>
-</component>
-</collection>
-<collection name="phonesrv_info" long-name="Telephony and SIM Services Info" level="specific"/>
-</block>
-<block name="messagingmw" level="specific" long-name="Messaging Middleware" levels="stack fw api">
-<collection name="msgfw_pub" long-name="Messaging Middleware Public Interfaces" level="api">
-<component name="send_ui_api" long-name="Send UI API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_pub/send_ui_api/group"/>
-</component>
-</collection>
-<collection name="msgfw_plat" long-name="Messaging Middleware Platform Interfaces" level="api">
-<component name="always_online_plugin_api" long-name="Always Online Plugin API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_plugin_api/group"/>
-</component>
-<component name="always_online_client_api" long-name="Always Online Client API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_client_api/group"/>
-</component>
-<component name="msg_common_utils_api" long-name="Messaging Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/msg_common_utils_api/group"/>
-</component>
-<component name="send_ui_plugin_api" long-name="Send UI Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/send_ui_plugin_api/group"/>
-</component>
-<component name="send_ui_datautils_api" long-name="Send UI Data Utils API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/send_ui_datautils_api/group"/>
-</component>
-</collection>
-<collection name="msgbranched" long-name="Messaging Branched" level="fw">
-<!-- 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"/>
-</component>
-</collection>
-<collection name="messagingfw" long-name="Messaging Framework" level="fw">
-<!-- should break this collection up into smaller related collections -->
-<component name="alwaysonline" filter="s60" long-name="Always Online Server" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/alwaysonline/group"/>
-</component>
-<component name="msgcommonutils" filter="s60" long-name="Messaging Common Utils" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/msgcommonutils/group"/>
-</component>
-<component name="senduiservices" filter="s60" long-name="Send UI Services" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/senduiservices/group"/>
-</component>
-<component name="scheduledsendmtm" long-name="Scheduled Send MTM" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/group" mrp="mw/messagingmw/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
-</component>
-<component name="msgsrvnstore" long-name="Message Server and Store" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/group" mrp="mw/messagingmw/messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
-</component>
-<component name="biomsgfw" long-name="BIO Messaging Framework" introduced="6.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/group" mrp="mw/messagingmw/messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
-</component>
-<component name="msgconf" long-name="Messaging Config" introduced="^2" purpose="optional" class="config">
-<unit bldFile="mw/messagingmw/messagingfw/msgconf/group" mrp="mw/messagingmw/messagingfw/msgconf/group/messaging_config.mrp"/>
-</component>
-<component name="watcherfw" long-name="Watcher Framework" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/watcherfw/group" mrp="mw/messagingmw/messagingfw/watcherfw/group/messaging_watcher.mrp"/>
-</component>
-<component name="msgtest" long-name="Messaging Test" purpose="development">
-<unit bldFile="mw/messagingmw/messagingfw/msgtest/group" mrp="mw/messagingmw/messagingfw/msgtest/group/messaging_test.mrp"/>
-</component>
-<component name="sendas" long-name="Send As" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/sendas/group" mrp="mw/messagingmw/messagingfw/sendas/group/messaging_sendas2.mrp"/>
-</component>
-<component name="msgurlhandler" long-name="Message URL Handler" introduced="7.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/group" mrp="mw/messagingmw/messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
-</component>
-<component name="wappushfw" long-name="WAP Push Framework" introduced="6.1" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/wappushfw/group" mrp="mw/messagingmw/messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
-</component>
-<component name="suplsmshandler" long-name="SUPL SMS Handler" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplsmshandler/group" mrp="mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/>
-</component>
-<component name="suplwappushhandler" long-name="SUPL WAP Push Handler" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
-</component>
-</collection>
-<collection name="messagingmw_info" long-name="Messaging Middleware Info" level="api">
-<component name="messagingmw_metadata" long-name="Messaging Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="imsrv" level="specific" long-name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
-<collection name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" level="specific">
-<component name="ximp_core_data_model_api" long-name="XIMP Core Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_host_api" long-name="XIMP Presence Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_presence_data_model_api" long-name="XIMP Presence Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_api" long-name="XIMP Presence Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_presence_management_api" long-name="XIMP Presence Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_management_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_host_api" long-name="XIMP Core Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_core_management_api" long-name="XIMP Core Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_management_api/group"/>
-</component>
-<component name="ximp_presence_base_api" long-name="XIMP Presence Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_base_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_api" long-name="XIMP Core Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_core_base_api" long-name="XIMP Core Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_base_api/group"/>
-</component>
-<component name="ximp_presence_cache_api" long-name="XIMP Presence Cache API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_cache_api/group"/>
-</component>
-<component name="ximp_core_feature_plugin_api" long-name="XIMP Core Feature Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_host_api" long-name="XIMP IM Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_im_data_model_api" long-name="XIMP IM Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_data_model_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_api" long-name="XIMP IM Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_im_management_api" long-name="XIMP IM Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_management_api/group"/>
-</component>
-<component name="ximp_im_base_api" long-name="XIMP IM Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_base_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_host_api" long-name="XIMP Search Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_search_data_model_api" long-name="XIMP Search Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_data_model_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_api" long-name="XIMP search Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_search_management_api" long-name="XIMP Search Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_management_api/group"/>
-</component>
-<component name="ximp_search_base_api" long-name="XIMP Search Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_base_api/group"/>
-</component>
-<component name="xmpp_settings_api" long-name="XMPP Settings API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/group"/>
-</component>
-<component name="im_cache_client_api" long-name="IM Cache Client API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/im_cache_client_api/group"/>
-</component>
-<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 Avability Text" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
-</component>
-</collection>
-<collection name="ximpfw" long-name="XIMP Framework" level="framework">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="ximpfw_build" filter="s60" long-name="XIMP Framework Build">
-<unit bldFile="mw/imsrv/ximpfw/group"/>
-</component>
-</collection>
-<collection name="imservices" long-name="IM Services" level="generic">
-<component name="imfeatureplugin" filter="s60" long-name="IM Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/imfeatureplugin/group"/>
-</component>
-<component name="searchfeatureplugin" filter="s60" long-name="Search Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/searchfeatureplugin/group"/>
-</component>
-<component name="xmppsettingsapi" filter="s60" long-name="XMPP Settings API" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsapi/group"/>
-</component>
-<component name="xmppsettingsfetcher" filter="s60" long-name="XMPP Settings Fetcher" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/group"/>
-</component>
-<component name="ossprotocoladaptation" filter="s60" long-name="OSS Protocol Adaptation" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/ossprotocoladaptation/group"/>
-</component>
-<component name="instantmessagingcache" filter="s60" long-name="Instant Messaging Cache" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/instantmessagingcache/group"/>
-</component>
-</collection>
-<collection name="brandingserver" long-name="Branding Server" level="specific">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="brandingserver_build" filter="s60" long-name="Branding Server Build">
-<unit bldFile="mw/imsrv/brandingserver/group"/>
-</component>
-</collection>
-</block>
-<block name="legacypresence" level="specific" long-name="Legacy Presence Services" levels="engine fw ui">
-<collection name="pressrv_plat" long-name="Legacy Presence Services Platform Interfaces" level="ui">
-<component name="presence_list_api" long-name="Presence List API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/presence_list_api/group"/>
-</component>
-<component name="watcher_info_api" long-name="Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_info_api/group"/>
-</component>
-<component name="simple_documents_api" long-name="SIMPLE Documents API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_documents_api/group"/>
-</component>
-<component name="authorization_api" long-name="Authorization API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/authorization_api/group"/>
-</component>
-<component name="xdm_protocol_plugin_api" long-name="XDM Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_protocol_plugin_api/group"/>
-</component>
-<component name="watcher_api" long-name="Watcher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_api/group"/>
-</component>
-<component name="xdm_api" long-name="XDM API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_api/group"/>
-</component>
-<component name="registration_api" long-name="Registration API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/registration_api/group"/>
-</component>
-<component name="publisher_api" long-name="Publisher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/publisher_api/group"/>
-</component>
-<component name="messaging_connection_manager_api" long-name="Messaging Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/messaging_connection_manager_api/group"/>
-</component>
-<component name="xdm_settings_api" long-name="XDM Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_settings_api/group"/>
-</component>
-<component name="simple_settings_api" long-name="SIMPLE Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_settings_api/group"/>
-</component>
-<component name="simple_instant_msg_api" long-name="Simple Instant Msg API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_instant_msg_api/group"/>
-</component>
-</collection>
-<collection name="xdmengine" long-name="XDM Engine" level="engine">
-<!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
-<component name="xdmengine_build" filter="s60" long-name="XDM Engine Build">
-<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">
-<unit bldFile="mw/legacypresence/xdmprotocols/group"/>
-</component>
-</collection>
-<collection name="msgconnmanager" long-name="Messaging Connection Manager" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="msgconnmanager_build" filter="s60" long-name="Messaging Connection Manager Build">
-<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">
-<unit bldFile="mw/legacypresence/simpleengine/group"/>
-</component>
-</collection>
-<collection name="presencefwsimpleadpt" long-name="Presence Framework SIMPLE Adaptation" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="simpleplugin" filter="s60" long-name="SIMPLE Plugin" plugin="Y">
-<unit bldFile="mw/legacypresence/presencefwsimpleadpt/group"/>
-</component>
-</collection>
-<collection name="simpledatamodeladapter" long-name="SIMPLE Data Model Adapter" level="fw">
-<component name="presenceplugin" filter="s60" long-name="Presence Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/legacypresence/simpledatamodeladapter/group"/>
-</component>
-</collection>
-</block>
-<block name="opensrv" level="specific" long-name="Open Services" levels="prt lib server eng">
-<collection name="opensrv_plat" long-name="Open Services Platform Interfaces" level="eng">
-<component name="messagequeue_api" long-name="Message Queue API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/opensrv/opensrv_plat/messagequeue_api/group"/>
-</component>
-</collection>
-<collection name="loudmouth" long-name="Loudmouth" level="prt">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="loudmouth_build" filter="s60" long-name="Loudmouth Build" introduced="^2">
-<unit bldFile="mw/opensrv/loudmouth/group"/>
-</component>
-</collection>
-<collection name="libtelepathy" long-name="Telepathy Library" level="lib">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="libtelepathy_build" filter="s60" long-name="Telepathy Library Build" introduced="^2">
-<unit bldFile="mw/opensrv/libtelepathy/group"/>
-</component>
-</collection>
-<collection name="telepathygabble" long-name="Telepathy Gabble" level="eng">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="telepathygabble_build" filter="s60" long-name="Telepathy Gabble Build" introduced="^2">
-<unit bldFile="mw/opensrv/telepathygabble/group"/>
-</component>
-</collection>
-<collection name="isolationserver" long-name="Isolation Server" level="server">
-<component name="messagequeue" filter="s60" long-name="Message Queue" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/messagequeue/group"/>
-</component>
-<component name="isoserver" filter="s60" long-name="ISO Server" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/isoserver/group"/>
-</component>
-<component name="isolationserver_build" filter="s60" long-name="Isloation Server Build" introduced="^2">
-<!-- needs #includes removed. either move the exports to another component or make this a ROM component -->
-<unit bldFile="mw/opensrv/isolationserver/group"/>
-</component>
-</collection>
-</block>
-<block name="remotemgmt" level="specific" long-name="Remote Management" levels="plugin framework server generic specific">
-<collection name="remotemgmt_pub" long-name="Remote Management Public Interfaces" level="specific">
-<component name="synchronization_capability_api" long-name="Synchronization Capability API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
-</component>
-</collection>
-<collection name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" level="specific">
-<component name="common_agent_util_and_definitions_api" long-name="Common Agent util and definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
-</component>
-<component name="policy_management_certificate_api" long-name="Policy Management Certificate API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/group"/>
-</component>
-<component name="oma_provisioning_adapter_api" long-name="OMA Provisioning Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_adapter_api/group"/>
-</component>
-<component name="device_management_parameter_api" long-name="Device Management Parameter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_parameter_api/group"/>
-</component>
-<component name="data_synchronization_plugin_api" long-name="Data Synchronization Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/group"/>
-</component>
-<component name="sync_alert_handler_api" long-name="Sync Alert Handler API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
-</component>
-<component name="syncml_notifier_api" long-name="SyncML Notifier API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
-</component>
-<component name="syncml_client_api" long-name="SyncML Client API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
-</component>
-<component name="device_management_plugin_api" long-name="Device Management plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_plugin_api/group"/>
-</component>
-<component name="dm_tree_apis" long-name="DM Tree APIs" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
-</component>
-<component name="terminal_security_device_lock_api" long-name="Terminal Security Device Lock API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/group"/>
-</component>
-<component name="policy_management_request_api" long-name="Policy Management Request API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/group"/>
-</component>
-<component name="ds_constant_definitions_api" long-name="DS Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_constant_definitions_api/group"/>
-</component>
-<component name="scp_server_api" long-name="SCP Server API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/group"/>
-</component>
-<component name="data_synchronization_notification_api" long-name="Data Synchronization Notification API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_notification_api/group"/>
-</component>
-<component name="oma_provisioning_engine_api" long-name="OMA Provisioning Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/group"/>
-</component>
-<component name="dm_utils_api" long-name="DM Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/group"/>
-</component>
-<component name="syncml_alert_api" long-name="SyncML Alert API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/group"/>
-</component>
-<component name="obex_client_session_api" long-name="OBEX Client session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/obex_client_session_api/group"/>
-</component>
-<component name="setting_enforcement_info_api" long-name="Setting Enforcement Info API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/group"/>
-</component>
-<component name="dm_constant_definitions_api" long-name="DM Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
-</component>
-<component name="oma_ds_extensions_api" long-name="OMA DS Extensions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
-</component>
-<component name="pnpms_utils_api" long-name="PNPMS Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
-</component>
-<component name="diagnostics_plugin_utility_api" long-name="Diagnostics Plugin Utility API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
-</component>
-<component name="diagnostics_plugin_api" long-name="Diagnostics Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
-</component>
-<component name="diagnostics_framework_api" long-name="Diagnostics Framework API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
-</component>
-<component name="diagnostics_results_api" long-name="Diagnostics Results API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
-</component>
-<component name="diagnostics_plugin_pool_api" long-name="Diagnostics Plugin Pool API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
-</component>
-<component name="adaptive_history_list_api" long-name="Adaptive History List API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
-</component>
-<component name="adaptive_history_list_session_api" long-name="Adaptive History List Session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
-</component>
-<component name="fota_engine_api" long-name="FOTA Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
-</component>
-<component name="update_package_storage_plugin_api" long-name="Update Package Storage Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
-</component>
-<component name="syncml_notifier_roaming_api" long-name="SyncML Notifier Roaming API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
-</component>
-<component name="sync_service_api" long-name="Sync Service API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_service_api/group"/>
-</component>
-<component name="dcmo_adapter_api" long-name="DCMO Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_adapter_api/group"/>
-</component>
-<component name="dcmo_control_api" long-name="DCMO Control API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_control_api/group"/>
-</component>
-<component name="ds_capability_mgmt_plugin_api" long-name="DS Capability Management Plugin API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
-</component>
-<component name="dm_native_notifier_api" long-name="DM Native Notifier API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_native_notifier_api/group"/>
-</component>
-<component name="syncml_ds_error_reporting_api" long-name="SyncML DS Error Reporting API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_ds_error_reporting_api/group"/>
-</component>
-<component name="syncml_ds_customization_api" long-name="SyncML DS Customization API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_ds_customization_api/group"/>
-</component>
-</collection>
-<collection name="policymanagement" long-name="Policy Management" level="generic">
-<component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">
-<unit bldFile="mw/remotemgmt/policymanagement/pmdmadapter/group"/>
-</component>
-<component name="dmutilserver" filter="s60" long-name="DM Util Server">
-<unit bldFile="mw/remotemgmt/policymanagement/dmutilserver/group"/>
-</component>
-<component name="policyengine" filter="s60" long-name="Policy Engine">
-<unit bldFile="mw/remotemgmt/policymanagement/policyengine/group"/>
-</component>
-<component name="policymanagement_build" filter="s60" long-name="Policy Management Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/policymanagement/group"/>
-</component>
-</collection>
-<collection name="syncmlfw" long-name="SyncML Framework" level="server">
-<component name="syncmlfw_build" filter="s60" long-name="SyncML Framework Build">
-<!-- need to break this up into components. Too convoluted a structure to be in a single bld.inf-->
-<unit bldFile="mw/remotemgmt/syncmlfw/group"/>
-</component>
-</collection>
-<collection name="terminalsecurity" long-name="Terminal Security" level="specific">
-<component name="scp" filter="s60" long-name="Security Code Proxy">
-<!-- can only have one unit, need to have these #included from a single bld.inf -->
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpdatabase/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpserver/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scppatternplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scphistoryplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scptimestampplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpeventhandler/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/dmeventnotifier/group"/>
-</component>
-<component name="terminalsecurity_client" filter="s60" long-name="Terminal Control Client">
-<unit bldFile="mw/remotemgmt/terminalsecurity/client/group"/>
-</component>
-<component name="terminalsecurity_server" filter="s60" long-name="Terminal Control Server">
-<unit bldFile="mw/remotemgmt/terminalsecurity/server/group"/>
-</component>
-<component name="tcadapter" filter="s60" long-name="Terminal Control Adapter">
-<unit bldFile="mw/remotemgmt/terminalsecurity/tcadapter/bld"/>
-</component>
-<component name="terminalsecurity_build" filter="s60" long-name="Terminal Security Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/terminalsecurity/group"/>
-</component>
-</collection>
-<collection name="omaprovisioning" long-name="OMA Provisioning" level="specific">
-<component name="pnputil" filter="s60" long-name="PnP Util">
-<unit bldFile="mw/remotemgmt/omaprovisioning/pnputil/group"/>
-</component>
-<component name="provisioning" filter="s60" long-name="Provisioning">
-<unit bldFile="mw/remotemgmt/omaprovisioning/provisioning/group"/>
-</component>
-</collection>
-<collection name="devicediagnosticsfw" long-name="Device Diagnostics Framework" level="framework">
-<component name="diagframework" filter="s60" long-name="Diagnostics Framework">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
-</component>
-<component name="diagpluginbase" filter="s60" long-name="Diagnostics Plugin Base">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
-</component>
-<component name="diagresultsdb" filter="s60" long-name="Diagnostics Results Database">
-<!-- can only have one unit, merge or split into two components -->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
-</component>
-<component name="devicediagnosticsfw_build" filter="s60" long-name="Device Diagnostics Framework Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/group"/>
-</component>
-</collection>
-<collection name="dcmofw" long-name="Device Capability Management Object Framework" level="framework">
-<component name="dcmoclient" filter="s60" long-name="DCMO Client">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoclient/group"/>
-</component>
-<component name="dcmoserver" filter="s60" long-name="DCMO Server">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoserver/group"/>
-</component>
-<component name="dcmocustcmd" filter="s60" long-name="DCMO Custom Commands">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmocustcmd/group"/>
-</component>
-<component name="dcmofw_build" filter="s60" long-name="DCMO Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/dcmofw/group"/>
-</component>
-</collection>
-<collection name="fotaapplication" long-name="FOTA Application" level="generic">
-<component name="fotaapplication_build" filter="s60" long-name="FOTA Application Build">
-<!-- remove this component when configuration is in place and the #ifdefs have been worked out -->
-<unit bldFile="mw/remotemgmt/fotaapplication/group"/>
-</component>
-<component name="fotaserver" filter="s60" long-name="FOTA Server">
-<!-- uncomment when #ifdefs are resolved -->
-<!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
-</component>
-<component name="fotacustcmds" filter="s60" long-name="FOTA Custom Commands" class="placeholder">
-<!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
-<!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
-</component>
-</collection>
-</block>
-<block name="remotestorage" level="generic" long-name="Remote Storage" levels="framework if">
-<collection name="rsfw_plat" long-name="Remote Storage Platform Interfaces" level="if">
-<component name="rsfw_access_protocol_plugin_api" filter="s60" long-name="Remote Storage Framework Access Protocol Plugin API" class="api">
-<unit bldFile="mw/remotestorage/rsfw_plat/rsfw_access_protocol_plugin_api/group"/>
-</component>
-</collection>
-<collection name="remotestoragefw" long-name="Remote Storage Framework" level="framework">
-<component name="mountstore" filter="s60" long-name="RSFW Mount Store">
-<unit bldFile="mw/remotestorage/remotestoragefw/mountstore/group"/>
-</component>
-<component name="rsfwnotifierplugins" filter="s60" long-name="RSFW Notifier Plugins" plugin="Y">
-<unit bldFile="mw/remotestorage/remotestoragefw/rsfwnotifierplugins/group"/>
-</component>
-<component name="remotefileengine" filter="s60" long-name="Remote File Engine">
-<unit bldFile="mw/remotestorage/remotestoragefw/remotefileengine/group"/>
-</component>
-<component name="mountmanager" filter="s60" long-name="RSFW Mount Manager">
-<unit bldFile="mw/remotestorage/remotestoragefw/mountmanager/group"/>
-</component>
-<component name="webdavaccessplugin" filter="s60" long-name="WebDAV Access Plugin" plugin="Y">
-<unit bldFile="mw/remotestorage/remotestoragefw/webdavaccessplugin/group"/>
-</component>
-<component name="remotefilesystemplugin" filter="s60" long-name="Remote Filesystem Plugin" plugin="Y">
-<unit bldFile="mw/remotestorage/remotestoragefw/remotefilesystemplugin/group"/>
-</component>
-<component name="remotestoragegsplugin" filter="s60" long-name="RS GS Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
-<!-- <unit bldFile="remotestoragefw/gsplugin/group"/>-->
-</component>
-<component name="remotedriveconfigurationbiocontrol" filter="s60" long-name="Remote Drive Configuration BIO Control">
-<!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
-<!-- <unit bldFile="remotestoragefw/remotedriveconfigurationbiocontrol/group"/>-->
-</component>
-<component name="remotestoragefw_build" filter="s60" long-name="Remote Storage Framework Build">
-<!-- move exports to other components.
- This is needed for #includes of configured component until congigiration is in place -->
-<unit bldFile="mw/remotestorage/remotestoragefw/group"/>
-</component>
-</collection>
-</block>
-<block name="remoteconn" level="generic" long-name="Remote Connectivity" levels="plugin framework server generic specific">
-<collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
-<component name="secon" filter="s60" long-name="Service Controllers">
-<unit bldFile="mw/remoteconn/connectivitymodules/secon/group"/>
-</component>
-</collection>
-<collection name="remoteconn_info" long-name="Remote Connectivity Info" level="specific">
-<component name="remoteconn_metadata" long-name="Remote Connectivity Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mtptransports" long-name="MTP Transports" level="plugin">
-<component name="mtpusbtransport" long-name="MTP USB Transport" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpusbtransport/group" mrp="mw/remoteconn/mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
-</component>
-<component name="mtpptpiptransport" long-name="MTP PTP-IP Transport" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpptpiptransport/group" mrp="mw/remoteconn/mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
-</component>
-<component name="mtpcontroller" long-name="MTP Controller" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpcontroller/group" mrp="mw/remoteconn/mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
-</component>
-</collection>
-<collection name="mtpfws" long-name="MTP Frameworks" level="framework">
-<component name="mtpfw" long-name="MTP Framework" introduced="^2" purpose="optional">
-<unit bldFile="mw/remoteconn/mtpfws/mtpfw/group" mrp="mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/>
-</component>
-</collection>
-<collection name="mtpdataproviders" long-name="MTP Data Providers" level="generic">
-<component name="mtpfileandfolderdp" long-name="MTP File and Folder Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group" mrp="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
-</component>
-<component name="mtpimagedp" long-name="MTP Image Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpimagedp/group" mrp="mw/remoteconn/mtpdataproviders/mtpimagedp/group/mtp_imagedp.mrp"/>
-</component>
-<component name="mtppictbridgedp" long-name="MTP PictBridge Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group" mrp="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group/mtp_pictbridgedp.mrp"/>
-</component>
-</collection>
-<collection name="backupandrestore" long-name="Backup and Restore" level="specific">
-<component name="backupengine" long-name="Backup Engine" introduced="9.0" purpose="optional">
-<unit bldFile="mw/remoteconn/backupandrestore/backupengine/group" mrp="mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
-</component>
-<component name="backuptest" long-name="Backup Test" introduced="^2" purpose="development">
-<unit bldFile="mw/remoteconn/backupandrestore/backuptest/group" mrp="mw/remoteconn/backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
-</component>
-</collection>
-<collection name="obex" long-name="OBEX" level="generic">
-<component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexprotocol/group" mrp="mw/remoteconn/obex/obexprotocol/group/obex.mrp"/>
-</component>
-<component name="obexextensionapi" long-name="OBEX Extension API" introduced="9.2" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexextensionapi/group" mrp="mw/remoteconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
-</component>
-</collection>
-</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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<unit mrp="mw/srvdiscovery/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="dlnasrv" level="specific" long-name="DLNA Services" levels="stack server ctrl framework plugin">
-<!-- uncomment all the units when configuration is in place, they're currently #included from other xxx_build components -->
-<collection name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" level="plugin">
-<component name="upnp_media_server_settings_api" long-name="UPnP Media Server Settings API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_settings_api/group"/>
-</component>
-<component name="upnp_av_objects_api" long-name="UPnP A/V Objects API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_av_objects_api/group"/>
-</component>
-<component name="upnp_media_server_api" long-name="UPnP Media Server API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_api/group"/>
-</component>
-<component name="upnp_security_plugin_api" long-name="UPnP Security Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_security_plugin_api/group"/>
-</component>
-<component name="upnp_avcp_api" long-name="UPnP AVCP API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_avcp_api/group"/>
-</component>
-<component name="upnp_media_server_metadata_api" long-name="UPnP Media Server Metadata API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_metadata_api/group"/>
-</component>
-<component name="upnp_command_api" long-name="UPnP Command API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_command_api/group"/>
-</component>
-<component name="upnp_plugin_api" long-name="UPnP Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_plugin_api/group"/>
-</component>
-</collection>
-<collection name="upnpavcontrolpoint" long-name="UPnP A/V Control Point" level="plugin">
-<component name="avcontrolframework" filter="s60" long-name="A/V Control Famework" introduced="9.1" deprecated="^3">
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
-</component>
-<component name="upnpavcontrolpoint_build" filter="s60" long-name="UPnP A/V Control Point Build" introduced="9.1" deprecated="^3">
-<!-- put exports in other component instead -->
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/group"/>
-</component>
-</collection>
-<collection name="upnpmediaserver" long-name="UPnP Media Server" level="server">
-<component name="avobjects" filter="s60" long-name="A/V Objects">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/avobjects/group"/>
-</component>
-<component name="mediaserverclient" filter="s60" long-name="Media Server Client">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverclient/group"/>
-</component>
-<component name="connectionmanagerservice" filter="s60" long-name="Connection Manager Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/connectionmanagerservice/group"/>
-</component>
-<component name="contentdirectoryservice" filter="s60" long-name="Content Directory Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/contentdirectoryservice/group"/>
-</component>
-<component name="mediaserverengine" filter="s60" long-name="Media Server Engine">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverengine/group"/>
-</component>
-<component name="upnpmediaserver_build" filter="s60" long-name="UPnP Media Server Build">
-<!-- move exports into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpmediaserver/group"/>
-</component>
-</collection>
-<collection name="upnpavcontroller" long-name="UPnP A/V Controller" level="ctrl">
-<component name="upnpxmlparser" filter="s60" long-name="UPnP XML Parser" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpxmlparser/group"/>
-</component>
-<component name="upnpavcontrollerserver" filter="s60" long-name="UPnP A/V Controller Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerserver/group"/>
-</component>
-<component name="upnpavcontrollerclient" filter="s60" long-name="UPnP A/V Ccontroller Client" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerclient/group"/>
-</component>
-<component name="upnpavcontrollerhelper" filter="s60" long-name="UPnP A/V Controller Helper" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerhelper/group"/>
-</component>
-<component name="upnpavcontroller_build" filter="s60" long-name="UPnP A/V Controller Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpavcontroller/group"/>
-</component>
-</collection>
-<collection name="upnpframework" long-name="UPnP Framework" level="framework">
-<component name="upnputilities" filter="s60" long-name="UPnP Utilities" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnputilities/group"/>
-</component>
-<component name="upnpextensionpluginif" filter="s60" long-name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpextensionpluginif/group"/> -->
-</component>
-<component name="upnpfiletransferengine" filter="s60" long-name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>-->
-</component>
-<component name="upnpcommonui" filter="s60" long-name="UPnP Common UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpcommonui/group"/>-->
-</component>
-<component name="upnpaiwengine" filter="s60" long-name="UPnP AIW Engine" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpaiwengine/group"/> -->
-</component>
-<component name="upnpaiwprovider" filter="s60" long-name="UPnP AIW Provider" introduced="^2" deprecated="^3" plugin="Y">
-<!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
-</component>
-<component name="upnpmusicadapter" filter="s60" long-name="UPnP Music Adapter" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
-</component>
-<component name="upnpcommand" filter="s60" long-name="UPnP Command" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpcommand/group"/>
-</component>
-<component name="upnpframework_build" filter="s60" long-name="UPnP Framework Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpframework/group"/>
-</component>
-</collection>
-<collection name="upnpsettings" long-name="UPnP Settings" level="framework">
-<component name="upnpsettingsengine" filter="s60" long-name="UPnP Settings Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
-</component>
-<component name="multiselectionui" filter="s60" long-name="Multi-Selection UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/multiselectionui/group"/>-->
-</component>
-<component name="appwizard" filter="s60" long-name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/appwizard/group"/>-->
-</component>
-<component name="upnpsharingui" filter="s60" long-name="UPnP Sharing UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
-</component>
-<component name="upnpgsplugin" filter="s60" long-name="UPnP GS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
-</component>
-<component name="upnpsettings_build" filter="s60" long-name="UPnP Settings Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsettings/group"/>
-</component>
-</collection>
-<collection name="upnpsharing" long-name="UPnP Sharing" level="server">
-<component name="upnpdlnaprofiler" filter="s60" long-name="UPnP DLNA Profiler" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpdlnaprofiler/group"/>
-</component>
-<component name="upnpsecurity" filter="s60" long-name="UPnP Security" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpsecurity/group"/>
-</component>
-<component name="upnpcontentserver" filter="s60" long-name="UPnP Content Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpcontentserver/group"/>
-</component>
-<component name="applicationengine" filter="s60" long-name="UPnP Application Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/applicationengine/group"/>
-</component>
-<component name="upnpsharing_build" filter="s60" long-name="UPnP Sharing Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsharing/group"/>
-</component>
-</collection>
-<collection name="upnpmpxplugins" long-name="UPnP MPX Plugins" level="plugin">
-<component name="upnpplaybackplugins" filter="s60" long-name="UPnP Playback Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/upnpplaybackplugins/group"/>
-</component>
-<component name="upnpmpxplugins_build" filter="s60" long-name="UPnP MPX Plugins Build" introduced="^2">
-<!-- move exports content into other component? -->
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/group"/>
-</component>
-</collection>
-<collection name="upnpharvester" long-name="UPnP Harvester" level="ctrl">
-<component name="upnpharvester_common" filter="s60" long-name="UPnP Harvester Common" introduced="^2" deprecated="^3" class="placeholder">
-<!-- need to merge or #include these to a single bld.inf -->
-<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
- <unit bldFile="upnpharvester/common/cmsettings/group"/>
- <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
- <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
-</component>
-<component name="cdssync" filter="s60" long-name="CDS Sync" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
-</component>
-<component name="mdhserver" filter="s60" long-name="Metadata Harvester Server" introduced="^2" deprecated="^3" class="placeholder">
-<!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
-</component>
-<component name="upnpharvester_build" filter="s60" long-name="UPnP Harvester Build" introduced="^2" deprecated="^3" class="placeholder">
-<!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
-<!--<unit bldFile="upnpharvester/group"/>-->
-</component>
-</collection>
-<collection name="homesync" long-name="Home Sync" level="plugin">
-<component name="contentmanager" filter="s60" long-name="Content Manager" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homesync/group"/>-->
-<!-- move bld.inf into contentmanager dir -->
-</component>
-</collection>
-<collection name="homemedia" long-name="Home Media" level="framework">
-<!-- collection is really just a component. Move down a directory -->
-<component name="homemedia_build" filter="s60" long-name="Home Media" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homemedia/group"/> -->
-</component>
-</collection>
-<collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin">
-<component name="dlnasrv_build" filter="s60" long-name="DLNA Services Build">
-<!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed -->
-<unit bldFile="mw/dlnasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="btservices" level="generic" long-name="Bluetooth Services" levels="framework server generic specific plugin">
-<collection name="btservices_pub" long-name="BT Services Public Interfaces" level="plugin">
-<component name="bluetooth_power_state_api" long-name="Bluetooth Power State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_power_state_api/group"/>
-</component>
-<component name="bluetooth_notifier_api" long-name="Bluetooth Notifier API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_notifier_api/group"/>
-</component>
-</collection>
-<collection name="btservices_plat" long-name="BT Services Platform Interfaces" level="plugin">
-<component name="bluetooth_dosserver_audio_api" long-name="Bluetooth DOS Server Audio API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dosserver_audio_api/group"/>
-</component>
-<component name="bluetooth_dut_mode_api" long-name="Bluetooth DUT Mode API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dut_mode_api/group"/>
-</component>
-<component name="bluetooth_engine_api" long-name="Bluetooth Engine API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-<component name="bluetooth_local_variation_api" long-name="Bluetooth Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_local_variation_api/group"/>
-</component>
-<component name="bluetooth_notifier_internal_api" long-name="Bluetooth Notifier internal API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_notifier_internal_api/group"/>
-</component>
-<component name="bluetooth_sap_connection_state_api" long-name="Bluetooth SAP Connection State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_sap_connection_state_api/group"/>
-</component>
-<component name="bluetooth_secondary_display_notification_api" long-name="Bluetooth Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_secondary_display_notification_api/group"/>
-</component>
-</collection>
-<collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
-<component name="bteng" filter="s60" long-name="Bluetooth Engine">
-<unit bldFile="mw/btservices/bluetoothengine/bteng/group"/>
-</component>
-<component name="btnotif" filter="s60" long-name="Bluetooth Notifier">
-<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"/>
-</component>
-<component name="btmac" filter="s60" long-name="Bluetooth Mono Audio Controller" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btmac/group"/>
-</component>
-<component name="btsac" filter="s60" long-name="Bluetooth Stereo Audio Controller" plugin="Y">
-<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"/>
-</component>
-<component name="btsap" filter="s60" long-name="Bluetooth SIM Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btsap/group"/>
-</component>
-<component name="btui" filter="s60" long-name="Bluetooth UI">
-<unit bldFile="mw/btservices/bluetoothengine/btui/group"/>
-</component>
-<component name="btpbap" filter="s60" long-name="Bluetooth Phonebook Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btpbap/group"/>
-</component>
-<component name="bthid" filter="s60" long-name="Bluetooth HID">
-<unit bldFile="mw/btservices/bluetoothengine/bthid/group"/>
-</component>
-<component name="btctrldcmoadapter" filter="s60" long-name="Bluetooth Control DCMO Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btctrldcmoadapter/group"/>
-</component>
-</collection>
-<collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
-<component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
-<unit bldFile="mw/btservices/bluetoothappprofiles/avrcp" mrp="mw/btservices/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
-</component>
-</collection>
-<collection name="atcommands" long-name="AT Commands" level="generic">
-<component name="modematplugin" long-name="Modem AT Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/modematplugin/group"/>
-</component>
-<component name="lccustomplugin" long-name="LC Custom Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/lccustomplugin/group"/>
-</component>
-</collection>
-<collection name="btservices_info" long-name="BT Services Info" level="plugin">
-<component name="btservices_metadata" long-name="BT Services Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usbservices" level="generic" long-name="USB Services" levels="framework server generic specific plugin">
-<collection name="usbservices_plat" long-name="USB Services Platform Interfaces" level="plugin">
-<component name="pictbridge_api" long-name="PictBridge API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/pictbridge_api/group"/>
-</component>
-<component name="ptp_responder_api" long-name="PTP Responder API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_responder_api/group"/>
-</component>
-<component name="ptp_transport_api" long-name="PTP Transport API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_transport_api/group"/>
-</component>
-<component name="usb_device_control_plugin_api" long-name="USB Device Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_device_control_plugin_api/group"/>
-</component>
-<component name="usb_notifier_api" long-name="USB Notifier API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_notifier_api/group"/>
-</component>
-<component name="usb_personality_api_header" long-name="USB Personality API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_api_header/group"/>
-</component>
-<component name="usb_personality_plugin_api" long-name="USB Personality Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_plugin_api/group"/>
-</component>
-<component name="usb_secondary_display_api" long-name="USB Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_secondary_display_api/group"/>
-</component>
-<component name="usb_watcher_api" long-name="USB Watcher API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_api/group"/>
-</component>
-<component name="usb_watcher_info_api_header" long-name="USB Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_info_api_header/group"/>
-</component>
-</collection>
-<collection name="usbservices_info" long-name="USB Services Info" level="plugin"/>
-<collection name="usbengines" long-name="USB Engines" level="generic">
-<component name="usbotgwatcher" filter="s60" long-name="USB OTG Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbotgwatcher/group"/>
-</component>
-<component name="usbwatcher" filter="s60" long-name="USB Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbwatcher/group"/>
-</component>
-<component name="usblocodplugin" filter="s60" long-name="USB Local Connectivity Domain Plugin" plugin="Y">
-<unit bldFile="mw/usbservices/usbengines/usblocodplugin/group"/>
-</component>
-<component name="usbdevcon" filter="s60" long-name="USB Device Control">
-<unit bldFile="mw/usbservices/usbengines/usbdevcon/group"/>
-</component>
-<component name="usbremotepersonality" filter="s60" long-name="USB Remote Personality">
-<unit bldFile="mw/usbservices/usbengines/usbremotepersonality/group"/>
-</component>
-</collection>
-<collection name="usbclasses" long-name="USB Classes" level="framework">
-<component name="usbobexclasscontroller" filter="s60" long-name="USB OBEX Class Controller" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbobexclasscontroller/group"/>
-</component>
-<component name="usbbasicpersonality" filter="s60" long-name="USB Basic Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbbasicpersonality/group"/>
-</component>
-<component name="usbmscpersonality" filter="s60" long-name="USB MSC Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbmscpersonality/group"/>
-</component>
-<!-- commented out in bld.inf. Should this be deleted?
- <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
- <unit bldFile="usbclasses/ptpstack/group"/>
- </component>
- <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
- <unit bldFile="usbclasses/sicdusbplugin/group"/>
- </component>
- <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
- <unit bldFile="usbclasses/ptpserver/group"/>
- </component>-->
-<component name="pictbridgeengine" filter="s60" long-name="PictBridge Engine">
-<unit bldFile="mw/usbservices/usbclasses/pictbridgeengine/group"/>
-</component>
-<component name="usbphoneasmodem" filter="s60" long-name="USB Phone as Modem" introduced="^3">
-<unit bldFile="mw/usbservices/usbclasses/usbphoneasmodem/group"/>
-</component>
-</collection>
-<collection name="usbuis" long-name="USB UIs" level="specific">
-<component name="usbui" filter="s60" long-name="USB UI">
-<unit bldFile="mw/usbservices/usbuis/usbui/group"/>
-</component>
-<component name="usbuinotif" filter="s60" long-name="USB UI Notifiers">
-<unit bldFile="mw/usbservices/usbuis/usbuinotif/group"/>
-</component>
-<component name="imageprintuiprovider" filter="s60" long-name="ImagePrint UI Provider" plugin="Y">
-<unit bldFile="mw/usbservices/usbuis/imageprintuiprovider/group"/>
-</component>
-<component name="usbimageprintui" filter="s60" long-name="ImagePrint UI">
-<unit bldFile="mw/usbservices/usbuis/imageprintui/group"/>
-</component>
-</collection>
-</block>
-<block name="shortlinkconn" level="generic" long-name="Shortlink Connectivity" levels="framework server generic specific plugin">
-<!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
-<collection name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" level="plugin">
-<component name="obex_service_utils_api" long-name="OBEX Service Utils API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_utils_api/group"/>
-</component>
-<component name="obex_service_plugin_api" long-name="OBEX Service Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_plugin_api/group"/>
-</component>
-<component name="dialup_connection_status_api" long-name="Dial-up Connection Status API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dialup_connection_status_api/group"/>
-</component>
-<component name="dun_secondary_display_notification_api" long-name="DUN Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
-</component>
-<component name="obex_secondary_display_notification_api" long-name="OBEX Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
-</component>
-<component name="generic_hid_api" long-name="Generic HID API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/generic_hid_api/group"/>
-</component>
-<component name="locod_bearer_plugin_api" long-name="Locod Bearer Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/locod_bearer_plugin_api/group"/>
-</component>
-<component name="usb_obexservicemanager_client_api" long-name="USB OBEX Service Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_obexservicemanager_client_api/group"/>
-</component>
-</collection>
-<collection name="localconnectivityservice" long-name="Local Connectivity Service" level="server">
-<component name="locod" long-name="Local Connectivity Daemon">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/locod/group"/>
-</component>
-<component name="obexserviceman" long-name="OBEX Service Managar">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
-</component>
-<component name="obexsendservices" long-name="OBEX Send Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
-</component>
-<component name="obexreceiveservices" long-name="OBEX Receive Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
-</component>
-<component name="dun" long-name="Dial Up Networking">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/dun/group"/>
-</component>
-<component name="lcstylustap" long-name="LC Stylus Tap Plugins" plugin="Y">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/lcstylustap/group"/>
-</component>
-<component name="generichid" long-name="Generic HID">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/generichid/group"/>
-</component>
-<component name="headset" long-name="Headset">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/headset/group"/>
-</component>
-</collection>
-</block>
-<block name="imghandling" level="specific" long-name="Image Handling" levels="lib util if">
-<collection name="imagehandling_plat" long-name="Image Handling Platform Interfaces" level="if">
-<component name="image_handling_library_api" long-name="Image Handling Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
-</component>
-<component name="3gp_library_api" long-name="3GP Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
-</component>
-<component name="thumbnailmanager_api" long-name="Thumbnail Manager API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagehandlinglib" long-name="Image Handling Library" level="lib">
-<!-- collection is really a component, need to move down a directory -->
-<component name="ihl" filter="s60" long-name="IHL">
-<unit bldFile="mw/imghandling/imagehandlinglib/group"/>
-</component>
-</collection>
-<collection name="imagehandlingutilities" long-name="Image Handling Utilities" level="util">
-<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager">
-<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
-</component>
-</collection>
-</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">
-<unit bldFile="mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
-</component>
-</collection>
-</block>
-<block name="mds" level="specific" long-name="Metadata Services" levels="mgr eng server int">
-<collection name="mds_plat" long-name="Metadata Services Platform Interfaces" level="int">
-<component name="context_engine_plugin_api" long-name="Context Engine Plugin API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/group" filter="!test"/>
-</component>
-<component name="harvester_framework_api" long-name="Harvester Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/harvester_framework_api/group" filter="!test"/>
-<!-- can only have one unit with the same filter, #include the following from the previous unit -->
-</component>
-<component name="location_manager_api" long-name="Location Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/location_manager_api/group" filter="!test"/>
-</component>
-<component name="metadata_engine_api" long-name="Metadata Engine API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/metadata_engine_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_collection_manager_api" long-name="Content Listing Framework Collection Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_extended_api" long-name="Content Listing Framework Extended API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_extended_api/group"/>
-</component>
-</collection>
-<collection name="mds_pub" long-name="Metadata Services Public Interfaces" level="int">
-<component name="content_listing_framework_api" long-name="Content Listing Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_pub/content_listing_framework_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="metadataengine" long-name="Metadata Engine" level="eng">
-<component name="metadataengine_common" filter="s60" long-name="Metadata Engine Common" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/common/group"/>
-</component>
-<component name="metadataengine_server" filter="s60" long-name="Metadata Engine Server" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/server/group"/>
-</component>
-<component name="metadataengine_client" filter="s60" long-name="Metadata Engine Client" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/client/group"/>
-</component>
-<component name="metadataengine_build" filter="s60" long-name="Metadata Engine Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/metadataengine/group"/>
-</component>
-</collection>
-<collection name="locationmanager" long-name="Location Manager" level="mgr">
-<component name="locationtrail" filter="s60" long-name="Location Trail" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/locationtrail/group"/>
-</component>
-<component name="locationmanager_server" filter="s60" long-name="Location Manager Server" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/server/group"/>
-</component>
-<component name="locationmanager_client" filter="s60" long-name="Location Manager Client" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/client/group"/>
-</component>
-<component name="locationmanager_build" filter="s60" long-name="Location Manager Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/locationmanager/group"/>
-</component>
-</collection>
-<collection name="contextengine" long-name="Context Engine" level="eng">
-<component name="contextengine_plugins" filter="s60" long-name="Context Engine Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/contextengine/plugins/group"/>
-</component>
-<component name="contextengine_build" filter="s60" long-name="Context Engine Build" introduced="^2">
-<!--make this collection a single component, or make this unit self-contained -->
-<unit bldFile="mw/mds/contextengine/group"/>
-</component>
-</collection>
-<collection name="harvester" long-name="Harvester" level="eng">
-<component name="blacklistclient" filter="s60" long-name="Blacklist Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistclient/group"/>
-</component>
-<component name="blacklistserver" filter="s60" long-name="Blacklist Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistserver/group"/>
-</component>
-<component name="harvester_common" filter="s60" long-name="Harvester Common" introduced="^2">
-<unit bldFile="mw/mds/harvester/common/group"/>
-</component>
-<component name="composerplugins" filter="s60" long-name="Composer Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/composerplugins/group"/>
-</component>
-<component name="harvesterplugins" filter="s60" long-name="Harvester Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/harvesterplugins/group"/>
-</component>
-<component name="monitorplugins" filter="s60" long-name="Monitor Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/monitorplugins/group"/>
-</component>
-<component name="harvester_server" filter="s60" long-name="Harvester Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/server/group"/>
-</component>
-<component name="harvester_client" filter="s60" long-name="Harvester Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/client/group"/>
-</component>
-<component name="harvester_build" filter="s60" long-name="Harvester Build" introduced="^2">
-<!-- split these exports into the other components -->
-<unit bldFile="mw/mds/harvester/group"/>
-</component>
-</collection>
-<collection name="watchdog" long-name="Watchdog" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="mdswatchdog" filter="s60" long-name="Metadata Watchdog" introduced="^2">
-<unit bldFile="mw/mds/watchdog/group"/>
-</component>
-</collection>
-<collection name="clfwrapper" long-name="Content Listing Framework Wrapper" level="int">
-<!-- collection is really a component. Move down a directory -->
-<component name="clfwrapper_build" filter="s60" long-name="CLF Wrapper Build" introduced="^2" class="placeholder">
-<!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
-<!--<unit bldFile="clfwrapper/group"/>-->
-</component>
-</collection>
-<collection name="mds_info" long-name="Metadata Services Info" level="int">
-<component name="mds_build" filter="s60" long-name="Metadata Services Build" introduced="^2">
-<!-- consider distributiing this into the rest of the components in the package -->
-<unit bldFile="mw/mds/group"/>
-</component>
-</collection>
-</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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<unit bldFile="mw/mmuifw/mmuifw_plat/alf_customlayoutmanagers_api/group"/>
-</component>
-<component name="gesturehelper_api" long-name="Gesture Helper API" filter="s60" 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">
-<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">
-<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">
-<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">
-<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">
-<!-- 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">
-<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">
-<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">
-<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">
-<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">
-<unit bldFile="mw/mmuifw/mulwidgets/mullogging/group"/>
-</component>
-<component name="muldatamodel" filter="s60" long-name="MUL Data Model">
-<unit bldFile="mw/mmuifw/mulwidgets/muldatamodel/group"/>
-</component>
-<component name="mulwidgets_common" filter="s60" long-name="MUL Common Utils">
-<unit bldFile="mw/mmuifw/mulwidgets/common/group"/>
-</component>
-<component name="gesturehelper" filter="s60" long-name="Gesture Helper">
-<unit bldFile="mw/mmuifw/mulwidgets/gesturehelper/group"/>
-</component>
-<component name="mulcoverflowwidget" filter="s60" long-name="MUL CoverFlow Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/mulcoverflowwidget/group"/>
-</component>
-<component name="mulsliderwidget" filter="s60" long-name="MUL Slider Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/mulsliderwidget/group"/>
-</component>
-<component name="alfviewwidget" filter="s60" long-name="ALF View Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/alfviewwidget/group"/>
-</component>
-<component name="alfcontainerwidget" filter="s60" long-name="ALF Container Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/alfcontainerwidget/group"/>
-</component>
-<component name="alfscrollbarwidget" filter="s60" long-name="ALF Scrollbar Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/alfscrollbarwidget/group"/>
-</component>
-</collection>
-</block>
-<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"/>
-</component>
-<component name="videoconnutility_api" long-name="Video Connection Utility API" filter="s60" class="api">
-<unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/group"/>
-</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"/>
-</component>
-</collection>
-<collection name="videoscheduler" long-name="Video Scheduler" level="util">
-<component name="schedulerclient" filter="s60" long-name="Video Scheduler Client">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerclient/group"/>
-</component>
-<component name="schedulerserver" filter="s60" long-name="Video Scheduler Server">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerserver/group"/>
-</component>
-</collection>
-<collection name="videoconnutility" long-name="Video Connection Utility" level="util">
-<component name="connutilpsworker" filter="s60" long-name="Connection Utility Publish and Subscribe Worker">
-<unit bldFile="mw/videoutils/videoconnutility/connutilpsworker/group"/>
-</component>
-<component name="video_connutility" filter="s60" long-name="Video Connection Utility">
-<unit bldFile="mw/videoutils/videoconnutility/connutility/group"/>
-</component>
-</collection>
-<collection name="videoutils_info" long-name="Video Utils Info" level="if"/>
-</block>
-<block name="mmmw" level="generic" long-name="Multimedia Middleware" levels="plugin framework server generic specific">
-<collection name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" level="specific">
-<component name="multimedia_data_source_api" long-name="Multimedia Data Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
-</component>
-<component name="progressive_download_api" long-name="Progressive Download API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/progressive_download_api/group"/>
-</component>
-<component name="equalizer_ui_api" long-name="Equalizer UI API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
-</component>
-<component name="enhanced_media_client_api" long-name="Enhanced Media Client API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
-</component>
-<component name="stream_control_custom_command_api" long-name="Stream Control Custom Command API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
-</component>
-<component name="emc_buffer_source_api" long-name="EMC Buffer Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_buffer_source_api/group"/>
-</component>
-<component name="emc_file_source_api" long-name="EMC File Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
-</component>
-<component name="audio_metadata_reader_api" long-name="Audio MetaData Reader API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
-</component>
-<component name="emc_progressive_download_source_api" long-name="EMC Progressive Download Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
-</component>
-<component name="emc_volume_effect_api" long-name="EMC Volume Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
-</component>
-<component name="emc_balance_effect_api" long-name="EMC Balance Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_balance_effect_api/group"/>
-</component>
-<component name="emc_descriptor_source_api" long-name="EMC Descriptor Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_descriptor_source_api/group"/>
-</component>
-<component name="emc_drm_config_intfc_api" long-name="EMC DRM Config Intfc API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
-</component>
-<component name="voip_audio_services_api" long-name="VoIP Audio Services" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/group"/>
-</component>
-<component name="configuration_components_factory_api" long-name="Configuration Components Factory API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
-</component>
-<component name="audio_output_control_utility_api" long-name="Audio Output Control Utility API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/group"/>
-</component>
-<component name="audio_output_control_utility_proxy_api" long-name="Audio Output Control Utility Proxy API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
-</component>
-<component name="emc_audio_effects_api" long-name="EMC Audio Effects API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
-</component>
-<component name="call_audio_control_api" long-name="Call AudioControl API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/group"/>
-</component>
-<component name="radio_utilities_api" long-name="Radio Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/group"/>
-</component>
-<component name="radio_preset_utilities_api" long-name="Radio Preset Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
-</component>
-<component name="radio_monitor_api" long-name="Radio Monitor API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
-</component>
-<component name="thumbnail_engine_api" long-name="Thumbnail Engine API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/thumbnail_engine_api/group"/>
-</component>
-<component name="telephony_multimedia_service_api" long-name="Telephony Multimedia Service API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="mmfenh" long-name="MMF Enhancements" level="generic">
-<component name="advancedaudiocontroller" filter="s60" long-name="Advanced Audio Controllers" plugin="Y">
-<unit bldFile="mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
-</component>
-<component name="audiooutputcontrolutility" filter="s60" long-name="Audio Output Control Utility">
-<unit bldFile="mw/mmmw/mmfenh/audiooutputcontrolutility/group"/>
-</component>
-<component name="configurationcomponentsfactory" filter="s60" long-name="Configuration Components Factory">
-<unit bldFile="mw/mmmw/mmfenh/configurationcomponentsfactory/group"/>
-</component>
-<component name="enhancedaudioplayerutility" filter="s60" long-name="Enhanced Audio Player Utility">
-<unit bldFile="mw/mmmw/mmfenh/enhancedaudioplayerutility/group"/>
-</component>
-<component name="enhancedmediaclient" filter="s60" long-name="Enhanced Media Client">
-<unit bldFile="mw/mmmw/mmfenh/enhancedmediaclient/group"/>
-</component>
-<component name="profilesettingsmonitor" filter="s60" long-name="Profile Settings Monitor">
-<unit bldFile="mw/mmmw/mmfenh/profilesettingsmonitor/group"/>
-</component>
-<component name="progressivedownload" filter="s60" long-name="Progressive Download">
-<unit bldFile="mw/mmmw/mmfenh/progressivedownload/group"/>
-</component>
-</collection>
-<collection name="mm_fw" long-name="Multimedia Frameworks" level="framework">
-<!-- Id needs to be unique, mmfw already in use -->
-<!-- Placeholder for OpenAX AL and other stuff -->
-</collection>
-<collection name="mmserv" long-name="Multimedia Services" level="specific">
-<component name="audioeffectsui" filter="s60" long-name="Audio Effects UI">
-<unit bldFile="mw/mmmw/mmserv/audioeffectsui/group"/>
-</component>
-<component name="callaudiocontrol" filter="s60" long-name="Call Audio Control">
-<unit bldFile="mw/mmmw/mmserv/callaudiocontrol/group"/>
-</component>
-<component name="metadatautility" filter="s60" long-name="Metadata Utility">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/group"/>
-</component>
-<component name="radioutility" filter="s60" long-name="Radio Utility">
-<unit bldFile="mw/mmmw/mmserv/radioutility/group"/>
-</component>
-<component name="thumbnailengine" filter="s60" long-name="Thumbnail Engine" introduced="^2">
-<unit bldFile="mw/mmmw/mmserv/thumbnailengine/group"/>
-</component>
-<component name="tms" filter="s60" long-name="Telephony Multimedia Service" introduced="^3">
-<unit bldFile="mw/mmmw/mmserv/tms/group"/>
-</component>
-<component name="voipaudioservices" filter="s60" long-name="VoIP Audio Services">
-<unit bldFile="mw/mmmw/mmserv/voipaudioservices/group"/>
-</component>
-<component name="lib3gpextparser" filter="s60" long-name="3GP Extension Metadata Parser Library">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group" filter="sf_build"/>
-</component>
-</collection>
-<collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
-<component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="helix" level="generic" long-name="Helix" levels="plugin framework server generic specific">
-<collection name="helix_ren" long-name="Helix Engine" level="framework">
-<!-- what does "ren" stand for? -->
-<component name="helix_stub" filter="s60" long-name="Helix Stub" introduced="^2" class="api">
-<unit bldFile="mw/helix/helix_ren/helix_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="camerasrv" level="specific" long-name="Camera Services" levels="plugin fw api">
-<collection name="camerasrv_plat" long-name="Camera Services Platform Interfaces" level="api">
-<component name="media_recorder_sink_api" long-name="Media Recorder Sink API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
-</component>
-<component name="cae_extentension_api" long-name="CAE Extension API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/cae_extentension_api/group"/>
-</component>
-<component name="camera_application_engine_api" long-name="Camera Application Engine API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/camera_application_engine_api/group" filter="!test"/>
-</component>
-<component name="custom_onboard_camera_api" long-name="Custom Onboard Camera API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
-</component>
-<component name="imaging_configuration_manager_api" long-name="Imaging Configuration Manager API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
-</component>
-<component name="media_recorder_api" long-name="Media Recorder API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_api/group" filter="!test"/>
-</component>
-<component name="3gp_file_composer_api" long-name="3GP File Composer API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
-</component>
-<component name="asynchronous_file_saving_queue_api" long-name="Asynchronous File Saving Queue API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="camappengine" long-name="Camera App Engine" level="fw">
-<!-- is this collection really a component? If so, move down a directory -->
-<component name="stillconverter" filter="s60" long-name="Still Image Converter" class="placeholder">
-<!-- should separate this from parent engine's bld.inf -->
-<!-- <unit bldFile="camappengine/stillconverter/group"/> -->
-</component>
-<component name="camappengine_engine" filter="s60" long-name="Camera App Engine" class="placeholder">
-<!-- should separate this from parent engine's bld.inf -->
-<!-- <unit bldFile="camappengine/engine/group"/> -->
-</component>
-<component name="asynchfilesavequeue" filter="s60" long-name="Asynch File Save Queue">
-<unit bldFile="mw/camerasrv/camappengine/asynchfilesavequeue/group"/>
-</component>
-<component name="camappengine_build" filter="s60" long-name="Camera App Engine Build">
-<unit bldFile="mw/camerasrv/camappengine/build"/>
-</component>
-</collection>
-<collection name="camcordermmfplugin" long-name="Camcorder MMF Plugin" level="plugin">
-<!-- collection is really a component. Should move down a directory -->
-<component name="camcordermmfplugin_build" filter="s60" long-name="Camcorder MMF Plugin Build" plugin="Y">
-<unit bldFile="mw/camerasrv/camcordermmfplugin/build"/>
-</component>
-</collection>
-<collection name="configmanagers" long-name="Config Managers" level="api">
-<component name="imagingconfigmanager" filter="s60" long-name="Imaging Config Manager">
-<unit bldFile="mw/camerasrv/configmanagers/imagingconfigmanager/group"/>
-</component>
-</collection>
-<collection name="camerasrv_info" long-name="Camera Services Info" level="api">
-<component name="camerasrv_build" filter="s60" long-name="Camera Services Build">
-<!-- should split into individual bld.infs -->
-<unit bldFile="mw/camerasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="mmappfw" level="specific" long-name="Multimedia App Framework" levels="fw utils if">
-<collection name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" level="if">
-<component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interfaces Build" introduced="^1" filter="s60">
-<!-- this is no longer necessary when confguration is put in place -->
-<unit bldFile="mw/mmappfw/mmappfw_plat"/>
-</component>
-<component name="collection_helper_api" long-name="Collection Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
-</component>
-<component name="harvester_collection_mediator_api" long-name="Harvester Collection Mediator API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/group"/>
-</component>
-<component name="harvester_metadata_extractor_api" long-name="Harvester Metadata Extractor API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/group"/>
-</component>
-<component name="harvester_server_api" long-name="Harvester Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_server_api/group"/>
-</component>
-<component name="harvester_utility_api" long-name="Harvester Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_utility_api/group"/>
-</component>
-<component name="playlist_engine_api" long-name="Playlist Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playlist_engine_api/group"/>
-</component>
-<component name="mtp_keys_api" long-name="MTP Keys API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mtp_keys_api/group"/>
-</component>
-<component name="mpx_collection_common_definition_api" long-name="MPX Collection Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_common_definition_api/group"/>
-</component>
-<component name="mpx_collection_utility_api" long-name="MPX Collection Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/group"/>
-</component>
-<component name="mpx_common_api" long-name="MPX Common API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_api/group"/>
-</component>
-<component name="mpx_common_definition_api" long-name="MPX Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_common_definition_api" long-name="MPX Playback Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_utility_api" long-name="MPX Playback Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/group"/>
-</component>
-<component name="mpx_base_view_plugins_api" long-name="MPX Base View Plugins API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/group"/>
-</component>
-<component name="mpx_view_utility_api" long-name="MPX View Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_view_utility_api/group"/>
-</component>
-<component name="mpx_albumart_utility_api" long-name="MPX Album Art Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/group"/>
-</component>
-<component name="media_player_settings_engine_api" long-name="Media Player Settings Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
-</component>
-<component name="mpx_backstepping_utility_api" long-name="MPX Backstepping Utility API" introduced="^1" filter="s60" class="api">
-<!-- uncomment when configuration is put in place
- <unit bldFile="mmappfw_plat/mpx_backstepping_utility_api/group"/> -->
-</component>
-<component name="asx_parser_api" long-name="ASX Parser API" introduced="^1" filter="s60" class="api">
-<!-- uncomment when configuration is put in place
- <unit bldFile="mmappfw_plat/asx_parser_api/group"/> -->
-</component>
-<component name="playback_helper_api" long-name="Playback Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playback_helper_api/group"/>
-</component>
-<component name="videoplaylist_utility_api" long-name="Video Playlist Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/videoplaylist_utility_api/group"/>
-</component>
-<component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interface Build" introduced="^1" filter="s60" class="api">
-<!-- needed only for #ifdefs. Remove anmd uncomment above units when configuration is in place -->
-<unit bldFile="mw/mmappfw/mmappfw_plat/group"/>
-</component>
-</collection>
-<collection name="mpx" long-name="Multimedia Player" level="fw">
-<component name="commonframework" filter="s60" long-name="MPX Common Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/commonframework/group"/>
-</component>
-<component name="playbackframework" filter="s60" long-name="MPX Playback Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/playbackframework/group"/>
-</component>
-<component name="mpxcollectionfw" filter="s60" long-name="MPX Collection Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/collectionframework/group"/>
-</component>
-<component name="mpxviewfw" filter="s60" long-name="MPX View Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/viewframework/group"/>
-</component>
-<component name="mpx_build" filter="s60" long-name="MPX Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/mpx/group"/>
-</component>
-</collection>
-<collection name="mmappcomponents" long-name="Multimedia App Components" level="utils">
-<component name="mmappcomponents_build" filter="s60" long-name="Multimedia App Components Build" introduced="^1">
-<!-- needed for #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
- Can remove this once configuration is in place-->
-<unit bldFile="mw/mmappfw/mmappcomponents/group"/>
-</component>
-<component name="collectionhelper" filter="s60" long-name="Media Player Collection Helper" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/collectionhelper/group"/>
-</component>
-<component name="playlistengine" filter="s60" long-name="Playlist Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/playlistengine/group"/>
-</component>
-<component name="mpxharvester" filter="s60" long-name="Media Player Harvester" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/harvester/group"/>
-</component>
-<component name="mmappcommonui" filter="s60" long-name="Multimedia App Common UI" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmappcommonui/group"/>
-</component>
-<component name="mediaplayersettingsengine" filter="s60" long-name="Media Player Settings Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
-</component>
-<component name="audiofetcher" filter="s60" long-name="Audio Fetcher" introduced="^1" plugin="Y">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
-</component>
-<component name="asxparser" filter="s60" long-name="ASX Parser" introduced="^1">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
-</component>
-<component name="playbackhelper" filter="s60" long-name="Playback Helper" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/playbackhelper/group"/>
-</component>
-<component name="videoplaylistutility" filter="s60" long-name="Video Playlist Utility" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/videoplaylistutility/group"/>
-</component>
-<component name="mmmtpdataprovider" filter="s60" long-name="Multimedia MTP Data Provider" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmmtpdataprovider/group"/>
-</component>
-</collection>
-<collection name="mmappfw_info" long-name="Multimedia App Framework Info" level="if">
-<component name="mmappfw_build" filter="s60" long-name="Multimedia App Framework Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/group"/>
-</component>
-<component name="mmappfw_test" filter="s60,test,api_test,pref_test" long-name="Multimedia App Framework Test" purpose="development" introduced="^1"/>
-</collection>
-</block>
-<block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework api">
-<collection name="inputmethods_pub" long-name="Input Methods Public Interfaces" level="api">
-<component name="ptiengine_iti_api" long-name="PTI Engine API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
-</component>
-<component name="optical_character_recognition_api" long-name="Optical Character Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
-</component>
-<component name="input_language_info_api" long-name="Input Language Info API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
-</component>
-</collection>
-<collection name="inputmethods_plat" long-name="Input Methods Platform Interfaces" level="api">
-<component name="pen_input_server_api" long-name="Pen Input Server API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/group" filter="!test"/>
-</component>
-<component name="ptiengine_hwr_api" long-name="PTI Engine Handwriting Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group" filter="!test"/>
-</component>
-<component name="aknfep_settings_api" long-name="Avkon FEP Settings API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
-</component>
-<component name="aknfep_status_api" long-name="Avkon FEP Status API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
-</component>
-<component name="ptiengine_key_definations_api" long-name="PTI Engine Key Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
-</component>
-<component name="aknfep_definitions_api" long-name="Avkon FEP Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
-</component>
-<component name="aknfep_pen_support_api" long-name="Avkon FEP Pen Support API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
-</component>
-<component name="ptiengine_indic_definitions_api" long-name="PTI Engine Indic Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
-</component>
-<component name="aknfep_uiinterface_api" long-name="Avkon FEP UI Interface API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="textinput" long-name="Text Input" level="framework">
-<component name="ptienginev2" filter="s60" long-name="Predictive Text Input Engine">
-<!--uncomment when configuration is turned on and textinput_build is removed-->
-<!-- <unit bldFile="textinput/ptienginev2/group"/>-->
-</component>
-<component name="akninputlanguage" filter="s60" long-name="Avkon Input Language">
-<unit bldFile="mw/inputmethods/textinput/akninputlanguage/group"/>
-</component>
-<component name="peninputarc" filter="s60" long-name="Pen Input Arc">
-<unit bldFile="mw/inputmethods/textinput/peninputarc/group"/>
-</component>
-<component name="peninputcommonctrls" filter="s60" long-name="Pen Input Common Controls">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonctrls/group"/>
-</component>
-<component name="peninputhwrboxcn" filter="s60" long-name="Chinese Handwriting Recognition Box" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrboxcn/group"/>
-</component>
-<component name="peninputvkbcn" filter="s60" long-name="Chinese Virtual Keyboard" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputvkbcn/group"/>
-</component>
-<component name="peninputcommonlayout" filter="s60" long-name="Pen Input Common Layout">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonlayout/group"/>
-</component>
-<component name="peninputgenerichwr" filter="s60" long-name="Pen Input Generic Handwriting Recognition" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputgenerichwr/group"/>
-</component>
-<component name="peninputgenericvkb" filter="s60" long-name="Pen Input Generic Virtual Keyboard" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputgenericvkb/group"/>
-</component>
-<component name="peninputcommonctrlsjp" filter="s60" long-name="Pen Input Common Controls Japanese">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonctrlsjp/group"/>
-</component>
-<component name="peninputhwrboxjp" filter="s60" long-name="Japanese Handwriting Recognition Box" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrboxjp/group"/>
-</component>
-<component name="peninputvkbjp" filter="s60" long-name="Japanese Virtual Keyboard" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputvkbjp/group"/>
-</component>
-<component name="gslangplugin" filter="s60" long-name="GS Language Plugin" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/GSLangPlugin"/>
-</component>
-<component name="peninputgenericitut" filter="s60" long-name="Pen Input Generic ITU-T" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputgenericitut/group"/>
-</component>
-<component name="peninputhwrtrui" filter="s60" long-name="Pen Input Handwriting Recognition Training UI" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrtrui/group"/>
-</component>
-<component name="peninputhwrfscn" filter="s60" long-name="Pen Input Chinese Full Screen Handwriting Recognition" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrfscn/group"/>
-</component>
-<component name="peninputvkbkr" filter="s60" long-name="Pen Input Korean Virtual Keyboard" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputvkbkr/group"/>
-</component>
-<component name="peninputfingerhwr" filter="s60" long-name="Pen Input Finger Handwriting Recognition" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputfingerhwr/group"/>
-</component>
-<component name="peninputsplititut" filter="s60" long-name="Pen Input Split ITU-T" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputsplititut/group"/>
-</component>
-<component name="peninputsplitqwerty" filter="s60" long-name="Pen Input Split QWERTY" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputsplitqwerty/group"/>
-</component>
-<component name="textinput_build" filter="s60" long-name="Text Input Build">
-<!--needed for #ifdef, can be removed when configuration is implemented -->
-<unit bldFile="mw/inputmethods/textinput/group"/>
-</component>
-</collection>
-<collection name="fep" long-name="FEP" level="engine">
-<component name="aknfep" filter="s60" long-name="Avkon FEP" plugin="Y">
-<unit bldFile="mw/inputmethods/fep/aknfep/group"/>
-</component>
-<component name="frontendprocessor" long-name="Front End Processor" purpose="mandatory">
-<unit bldFile="mw/inputmethods/fep/frontendprocessor/group" mrp="mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
-</component>
-</collection>
-<collection name="inputmethods_info" long-name="Input Methods Info" level="api">
-<component name="inputmethods_metadata" long-name="Input Methods Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="qt" level="generic" long-name="Qt" levels="tool mw app">
-<collection name="qtconf" long-name="Qt Config" level="tool">
-<component name="qt_deviceconfiguration" long-name="Qt Device Configuration" introduced="^2" class="config tool">
-<unit bldFile="mw/qt/src/s60installs/deviceconfiguration"/>
-</component>
-</collection>
-<collection name="qt_info" long-name="Qt Info" level="mw">
-<component name="qt_build" long-name="Qt Build" introduced="^2">
-<unit bldFile="mw/qt" proFile="projects.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-<collection name="qtdemos" long-name="Qt Demos" level="app">
-<component name="qtdemos_build" long-name="Qt Demos Build" introduced="^2" filter="qtdemos">
-<unit bldFile="mw/qt/demos" proFile="demos.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qtexamples" long-name="Qt Examples" level="app">
-<component name="qtexamples_build" long-name="Qt Examples Build" introduced="^2" filter="qtexamples">
-<unit bldFile="mw/qt/examples" proFile="examples.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qt_tests" long-name="Qt Tests" level="app">
-<component name="qttestsauto" long-name="Qt Automated Tests" introduced="^2" filter="qttestsauto">
-<unit bldFile="mw/qt/tests/auto" proFile="qtpauto.pro"/>
-</component>
-<component name="qttestsbenchmarks" long-name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks">
-<unit bldFile="mw/qt/tests/benchmarks" proFile="benchmarks.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</block>
-<block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
-<collection name="classicui_plat" long-name="Classic UI Platform Interfaces" level="specific">
-<component name="personalisation_framework_api" long-name="Personalisation Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_framework_api/group" filter="!test"/>
-</component>
-<component name="signal_pane_api" long-name="Signal Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
-</component>
-<component name="japanese_reading_api" long-name="Japanese Reading API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/japanese_reading_api/group" filter="!test"/>
-</component>
-<component name="global_popup_priority_controller_api" long-name="Global Popup Priority Controller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
-</component>
-<component name="item_finder_api" long-name="Item Finder API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/item_finder_api/group" filter="!test"/>
-</component>
-<component name="avkon_fonts_api" long-name="Avkon Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_fonts_api/group" filter="!test"/>
-</component>
-<component name="extended_utilities_api" long-name="Extended Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
-</component>
-<component name="personalisation_plugin_api" long-name="Personalisation Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
-</component>
-<component name="extended_aiw_criteria_api" long-name="Extended AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="personalisation_application_api" long-name="Personalisation Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_application_api/group"/>
-</component>
-<component name="volume_popup_api" long-name="Volume Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
-</component>
-<component name="avkon_secondary_display_support_api" long-name="AVKON Secondary Display Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_support_api/group" filter="!test"/>
-</component>
-<component name="extended_setting_pages_api" long-name="Extended Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_setting_pages_api/group" filter="!test"/>
-</component>
-<component name="extended_lists_api" long-name="Extended Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_lists_api/group" filter="!test"/>
-</component>
-<component name="input_block_api" long-name="Input Block API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/input_block_api/group" filter="!test"/>
-</component>
-<component name="avkon_ui_server_api" long-name="AVKON UI Server API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_ui_server_api/group" filter="!test"/>
-</component>
-<component name="number_grouping_api" long-name="Number Grouping API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/number_grouping_api/group" filter="!test"/>
-</component>
-<component name="extended_status_pane_api" long-name="Extended Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_status_pane_api/group" filter="!test"/>
-</component>
-<component name="extended_notifiers_api" long-name="Extended Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notifiers_api/group" filter="!test"/>
-</component>
-<component name="task_list_api" long-name="Task List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
-</component>
-<component name="personalisation_slide_show_dialog_api" long-name="Personalisation Slide Show Dialog API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
-</component>
-<component name="key_event_utilities_api" long-name="Key Event Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_event_utilities_api/group"/>
-</component>
-<component name="emergency_call_support_api" long-name="Emergency Call Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/emergency_call_support_api/group" filter="!test"/>
-</component>
-<component name="extended_dialogs_api" long-name="Extended Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_dialogs_api/group"/>
-</component>
-<component name="legacy_ui_framework_headers_api" long-name="Legacy UI Framework Headers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/legacy_ui_framework_headers_api/group"/>
-</component>
-<component name="extended_editors_api" long-name="Extended Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_editors_api/group" filter="!test"/>
-</component>
-<component name="alarm_api" long-name="Alarm API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alarm_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_interface_base_api" long-name="AIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_base_api/group" filter="!test"/>
-</component>
-<component name="list_effects_api" long-name="List Effects API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/list_effects_api/group" filter="!test"/>
-</component>
-<component name="find_item_ui_api" long-name="Find Item UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/find_item_ui_api/group" filter="!test"/>
-</component>
-<component name="server_application_services_api" long-name="Server Application Services API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/server_application_services_api/group" filter="!test"/>
-</component>
-<component name="common_ui_settings_api" long-name="Common UI Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_ui_settings_api/group"/>
-</component>
-<component name="aiw_service_interface_menu_api" long-name="AIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_menu_api/group" filter="!test"/>
-</component>
-<component name="eikon_server_extension_client_api" long-name="EIKON Server Extension Client API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/eikon_server_extension_client_api/group" filter="!test"/>
-</component>
-<component name="skinnable_clock_api" long-name="Skinnable Clock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/skinnable_clock_api/group" filter="!test"/>
-</component>
-<component name="battery_pane_api" long-name="Battery Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/battery_pane_api/group" filter="!test"/>
-</component>
-<component name="fep_document_navigation_api" long-name="FEP Document Navigation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
-</component>
-<component name="personalisation_localised_texts_api" long-name="Personalisation Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
-</component>
-<component name="memory_card_ui_api" long-name="Memory Card UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
-</component>
-<component name="avkon_status_api" long-name="AVKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_status_api/group"/>
-</component>
-<component name="application_switching_api" long-name="Application Switching API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/application_switching_api/group" filter="!test"/>
-</component>
-<component name="avkon_localised_texts_api" long-name="AVKON Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_localised_texts_api/group"/>
-</component>
-<component name="avkon_secondary_display_api" long-name="AVKON Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_api/group"/>
-</component>
-<component name="extended_animation_api" long-name="Extended Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_notes_api" long-name="Extended Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notes_api/group" filter="!test"/>
-</component>
-<component name="screensaver_animation_plugin_definitions_api" long-name="Screensaver Animation Plugin Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/screensaver_animation_plugin_definitions_api/group"/>
-</component>
-<component name="text_scroller_api" long-name="Text Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/text_scroller_api/group" filter="!test"/>
-</component>
-<component name="custom_cursors_api" long-name="Custom Cursors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/custom_cursors_api/group" filter="!test"/>
-</component>
-<component name="screensaver_settings_api" long-name="Screensaver Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/screensaver_settings_api/group"/>
-</component>
-<component name="global_window_priorities_api" long-name="Global Window Priorities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_window_priorities_api/group"/>
-</component>
-<component name="extended_indicators_api" long-name="Extended Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_indicators_api/group" filter="!test"/>
-</component>
-<component name="special_character_table_api" long-name="Special Character Table API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/special_character_table_api/group" filter="!test"/>
-</component>
-<component name="avkon_settings_api" long-name="AVKON Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_settings_api/group"/>
-</component>
-<component name="extended_sounds_api" long-name="Extended Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_sounds_api/group"/>
-</component>
-<component name="themes_settings_api" long-name="Themes Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/themes_settings_api/group"/>
-</component>
-<component name="media_shared_document_api" long-name="Media Shared Document API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/media_shared_document_api/group" filter="!test"/>
-</component>
-<component name="extended_queries_api" long-name="Extended Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_queries_api/group"/>
-</component>
-<component name="phone_number_text_utilities_api" long-name="Phone Number Text Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
-</component>
-<component name="screensaver_runtime_api" long-name="Screensaver Runtime API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/screensaver_runtime_api/group"/>
-</component>
-<component name="extended_scroller_api" long-name="Extended Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_scroller_api/group"/>
-</component>
-<component name="key_rotator_api" long-name="Key Rotator API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_rotator_api/group" filter="!test"/>
-</component>
-<component name="extended_grids_api" long-name="Extended Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_grids_api/group" filter="!test"/>
-</component>
-<component name="generic_parameter_api" long-name="Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="indicator_touch_observer_api" long-name="Indicator Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_touch_observer_api/group"/>
-</component>
-<component name="popup_form_api" long-name="Popup Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/popup_form_api/group" filter="!test"/>
-</component>
-<component name="stylus_activated_popup_api" long-name="Stylus Activated Pop-up API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/stylus_activated_popup_api/group" filter="!test"/>
-</component>
-<component name="indicator_plugin_api" long-name="Indicator Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_plugin_api/group" filter="!test"/>
-</component>
-<component name="layout_configuration_api" long-name="Layout Configuration API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/layout_configuration_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_filter_factory_api" long-name="Common File Dialogs Filter Factory API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group" filter="!test"/>
-</component>
-<component name="avkon_anim_dll_api" long-name="AVKON Anim DLL API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_anim_dll_api/group"/>
-</component>
-<component name="extended_initialization_api" long-name="Extended Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_initialization_api/group" filter="!test"/>
-</component>
-<component name="long_tap_animation_api" long-name="Long Tap Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/long_tap_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_ui_framework_definitions_api" long-name="Extended UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_ui_framework_definitions_api/group"/>
-</component>
-<component name="extended_buttons_api" long-name="Extended Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_buttons_api/group" filter="!test"/>
-</component>
-<component name="aiw_provider_utility_api" long-name="AIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_provider_utility_api/group" filter="!test"/>
-</component>
-<component name="transition_effect_parameters_api" long-name="Transition Effect Parameters API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_parameters_api/group" filter="!test"/>
-</component>
-<component name="extended_input_capabilities_api" long-name="Extended Input Capabilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_input_capabilities_api/group" filter="!test"/>
-</component>
-<component name="uikon_status_api" long-name="UIKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/uikon_status_api/group"/>
-</component>
-<component name="transition_effect_utilities_api" long-name="Transition Effect Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_utilities_api/group" filter="!test"/>
-</component>
-<component name="pointer_event_modifier_api" long-name="Pointer Event Modifier API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/pointer_event_modifier_api/group" filter="!test"/>
-</component>
-<component name="avkon_testability_api" long-name="AVKON Testability API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_testability_api/group"/>
-</component>
-<component name="ganes_api" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ganes_api/group"/>
-</component>
-<component name="ode_api" long-name="Ode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ode_api/group"/>
-</component>
-<component name="physics_api" long-name="Physics API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/physics_api/group"/>
-</component>
-<component name="touch_pane_api" long-name="Touch Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_api/group" filter="!test"/>
-</component>
-<component name="touch_pane_observer_api" long-name="Touch Pane Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_observer_api/group"/>
-</component>
-<component name="alternate_fs_api" long-name="Alternate FS API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alternate_fs_api/group"/>
-</component>
-<component name="discreet_popup_api" long-name="Discreet Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/discreet_popup_api/group"/>
-</component>
-<component name="touch_gesture_framework_api" long-name="Touch Gesture Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_gesture_framework_api/group"/>
-<!-- should this be commented out? -->
-<!--<unit bldFile="classicui_plat/touch_gesture_framework_api/tsrc/group" filter="test,api_test"/> -->
-</component>
-<component name="extended_options_menu_api" long-name="Extended Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="classicui_pub" long-name="Classic UI Public Interfaces" level="specific">
-<component name="input_frame_api" long-name="Input Frame API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/input_frame_api/group" filter="!test"/>
-</component>
-<component name="window_server_event_observer_api" long-name="Window Server Event Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/window_server_event_observer_api/group" filter="!test"/>
-</component>
-<component name="application_framework_api" long-name="Application Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/application_framework_api/group" filter="!test"/>
-</component>
-<component name="scroller_api" long-name="Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/scroller_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_utilities_api" long-name="UI Framework Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_utilities_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_definitions_api" long-name="UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_definitions_api/group" filter="!test"/>
-</component>
-<component name="buttons_api" long-name="Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/buttons_api/group" filter="!test"/>
-</component>
-<component name="queries_api" long-name="Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/queries_api/group" filter="!test"/>
-</component>
-<component name="aiw_generic_parameter_api" long-name="AIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="editors_api" long-name="Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/editors_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_api" long-name="Common File Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/common_file_dialogs_api/group" filter="!test"/>
-</component>
-<component name="dialog_shutter_api" long-name="Dialog Shutter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialog_shutter_api/group" filter="!test"/>
-</component>
-<component name="fonts_api" long-name="Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/fonts_api/group" filter="!test"/>
-</component>
-<component name="screen_clearer_api" long-name="Screen Clearer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_clearer_api/group" filter="!test"/>
-</component>
-<component name="notifiers_api" long-name="Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notifiers_api/group" filter="!test"/>
-</component>
-<component name="notes_api" long-name="Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notes_api/group" filter="!test"/>
-</component>
-<component name="screen_saver_api" long-name="Screen Saver API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_saver_api/group" filter="!test"/>
-</component>
-<component name="status_pane_api" long-name="Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/status_pane_api/group" filter="!test"/>
-</component>
-<component name="base_controls_api" long-name="Base Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/base_controls_api/group" filter="!test"/>
-</component>
-<component name="grids_api" long-name="Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/grids_api/group" filter="!test"/>
-</component>
-<component name="context_pane_api" long-name="Context Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/context_pane_api/group" filter="!test"/>
-</component>
-<component name="lists_api" long-name="Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/lists_api/group" filter="!test"/>
-</component>
-<component name="popups_api" long-name="Popups API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/popups_api/group" filter="!test"/>
-</component>
-<component name="misc_controls_api" long-name="Misc Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/misc_controls_api/group" filter="!test"/>
-</component>
-<component name="keylock_api" long-name="Keylock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/keylock_api/group" filter="!test"/>
-</component>
-<component name="options_menu_api" long-name="Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/options_menu_api/group" filter="!test"/>
-</component>
-<component name="hierarchical_lists_api" long-name="Hierarchical Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hierarchical_lists_api/group" filter="!test"/>
-</component>
-<component name="navigation_pane_api" long-name="Navigation Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/navigation_pane_api/group" filter="!test"/>
-</component>
-<component name="tabs_api" long-name="Tabs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/tabs_api/group" filter="!test"/>
-</component>
-<component name="title_pane_touch_observer_api" long-name="Title Pane Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_touch_observer_api/group"/>
-</component>
-<component name="choice_list_api" long-name="Choice List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/choice_list_api/group" filter="!test"/>
-</component>
-<component name="info_popup_note_api" long-name="Info Popup Note API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/info_popup_note_api/group" filter="!test"/>
-</component>
-<component name="setting_pages_api" long-name="Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/setting_pages_api/group" filter="!test"/>
-</component>
-<component name="screen_mode_api" long-name="Screen Mode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_mode_api/group" filter="!test"/>
-</component>
-<component name="indicators_api" long-name="Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/indicators_api/group" filter="!test"/>
-</component>
-<component name="error_ui_api" long-name="Error UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/error_ui_api/group" filter="!test"/>
-</component>
-<component name="animation_api" long-name="Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/animation_api/group" filter="!test"/>
-</component>
-<component name="searchfield_api" long-name="Searchfield API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/searchfield_api/group" filter="!test"/>
-</component>
-<component name="labels_api" long-name="Labels API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/labels_api/group" filter="!test"/>
-</component>
-<component name="hotkeys_api" long-name="Hotkeys API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hotkeys_api/group" filter="!test"/>
-</component>
-<component name="initialization_api" long-name="Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/initialization_api/group" filter="!test"/>
-</component>
-<component name="volume_control_api" long-name="Volume Control API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/volume_control_api/group" filter="!test"/>
-</component>
-<component name="title_pane_api" long-name="Title Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_api/group" filter="!test"/>
-</component>
-<component name="sounds_api" long-name="Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/sounds_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_handler_api" long-name="AIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_service_handler_api/group" filter="!test"/>
-</component>
-<component name="aiw_criteria_api" long-name="AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="touch_ui_utilities_api" long-name="Touch UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/touch_ui_utilities_api/group" filter="!test"/>
-</component>
-<component name="generic_button_api" long-name="Generic Button API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/generic_button_api/group" filter="!test"/>
-</component>
-<component name="form_api" long-name="Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/form_api/group" filter="!test"/>
-</component>
-<component name="uikon_core_controls" long-name="Uikon Core Controls" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/uikon_core_controls/group" filter="!test"/>
-</component>
-<component name="calendar_api" long-name="Calendar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/calendar_api/group"/>
-</component>
-<component name="toolbar_api" long-name="Toolbar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/toolbar_api/group" filter="!test"/>
-</component>
-<component name="server_application_api" long-name="Server Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/server_application_api/group"/>
-</component>
-<component name="slider_api" long-name="Slider API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/slider_api/group" filter="!test"/>
-</component>
-<component name="private_ui_framework_api" long-name="Private UI Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/private_ui_framework_api/group" filter="!test"/>
-</component>
-<component name="dialogs_api" long-name="Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialogs_api/group" filter="!test"/>
-</component>
-<component name="document_handler_api" long-name="Document handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/document_handler_api/group"/>
-</component>
-<component name="images_api" long-name="Images API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/images_api/group" filter="!test"/>
-</component>
-<component name="stylus_popup_menu_api" long-name="Stylus Pop-up Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/stylus_popup_menu_api/group" filter="!test"/>
-</component>
-<component name="information_preview_popup_api" long-name="Information Preview Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/information_preview_popup_api/group" filter="!test"/>
-</component>
-<component name="intermediate_state_api" long-name="Intermediate State API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/intermediate_state_api/group"/>
-</component>
-<component name="help_launcher_api" long-name="Help Launcher API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/help_launcher_api/group"/>
-</component>
-</collection>
-<collection name="ode" long-name="Open Dynamics Engine" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="ode_build" filter="s60" long-name="ODE">
-<unit bldFile="mw/classicui/ode/group"/>
-</component>
-</collection>
-<collection name="uifw" long-name="UI Framework" level="server">
-<component name="uiklaf" filter="s60" long-name="Uikon Look-and-Feel">
-<unit bldFile="mw/classicui/uifw/uiklaf/group"/>
-</component>
-<component name="eikctl" filter="s60" long-name="Eikon Controls">
-<unit bldFile="mw/classicui/uifw/eikctl/group"/>
-</component>
-<component name="avkon" filter="s60" long-name="Avkon">
-<!-- can only have one unit. Split into 3 components, or #include all from same bld.inf -->
-<unit bldFile="mw/classicui/uifw/avkon/aknphysics/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/aknconf/group"/>
-</component>
-<component name="eikstd" filter="s60" long-name="Eikon Standard">
-<unit bldFile="mw/classicui/uifw/eikstd/group"/>
-</component>
-<component name="aknglobalui" filter="s60" long-name="Avkon Global UI">
-<unit bldFile="mw/classicui/uifw/aknglobalui/group"/>
-</component>
-<component name="ganes" filter="s60" long-name="Ganes">
-<unit bldFile="mw/classicui/uifw/ganes/group"/>
-</component>
-</collection>
-<collection name="commonuis" long-name="Common UIs" level="specific">
-<component name="commonui" filter="s60" long-name="Common UI">
-<unit bldFile="mw/classicui/commonuis/commonui/group"/>
-</component>
-<component name="commondialogs" filter="s60" long-name="Common Dialogs">
-<unit bldFile="mw/classicui/commonuis/commondialogs/group"/>
-</component>
-</collection>
-<collection name="applicationinterworkingfw" long-name="Application Interworking Framework" level="generic">
-<component name="aifwservicehandler" filter="s60" long-name="Application Interworking Service Handler">
-<unit bldFile="mw/classicui/applicationinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-<collection name="psln" long-name="Personalization" level="specific">
-<!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
-<component name="psln_build" filter="s60" long-name="Personalization Build">
-<unit bldFile="mw/classicui/psln/group"/>
-</component>
-</collection>
-<collection name="commonadapter" long-name="Common Adapter" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="commonadapter_build" filter="s60" long-name="Common Adapter Build">
-<unit bldFile="mw/classicui/commonadapter/group"/>
-</component>
-</collection>
-<collection name="akntouchgesturefw" long-name="Avkon Touch Gesture Framework" level="generic">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="akntouchgesturefw_build" filter="s60" long-name="Avkon Touch Gesture Framework Build" introduced="^3">
-<unit bldFile="mw/classicui/akntouchgesturefw/group"/>
-</component>
-</collection>
-<collection name="uiutils" long-name="UI Utils" level="specific">
-<component name="localizer" filter="s60" long-name="Directory Localizer">
-<unit bldFile="mw/classicui/uiutils/localizer/group"/>
-</component>
-<component name="findutil" filter="s60" long-name="Find Utility">
-<unit bldFile="mw/classicui/uiutils/findutil/group"/>
-</component>
-<component name="gamerecognizer" filter="s60" long-name="Game Recognizer" plugin="Y">
-<unit bldFile="mw/classicui/uiutils/gamerecognizer/group"/>
-</component>
-<component name="aknjapanesereading" filter="s60" long-name="Avkon Japanese Reading">
-<unit bldFile="mw/classicui/uiutils/aknjapanesereading/group"/>
-</component>
-</collection>
-<collection name="commonuisupport" long-name="Common UI Support" level="support">
-<component name="uikon" long-name="Uikon" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uikon/group" mrp="mw/classicui/commonuisupport/uikon/group/app-framework_uikon.mrp"/>
-</component>
-<component name="errorresolverdata" long-name="Error Resolver Data" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/errorresolverdata/group" mrp="mw/classicui/commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
-</component>
-<component name="uilaf" long-name="UI Look and Feel" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uilaf/GROUP" mrp="mw/classicui/commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
-</component>
-<component name="grid" long-name="Grid" purpose="optional">
-<unit bldFile="mw/classicui/commonuisupport/grid/group" mrp="mw/classicui/commonuisupport/grid/group/app-framework_grid.mrp"/>
-</component>
-<component name="uifwsdocs" long-name="UI Frameworks Documentation" purpose="development" class="doc">
-<unit mrp="mw/classicui/commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
-</component>
-</collection>
-<collection name="lafagnosticuifoundation" long-name="Look-and-Feel Agnostic UI Foundation" level="base">
-<component name="cone" long-name="Control Environment" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/cone/group" mrp="mw/classicui/lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
-</component>
-<component name="graphicseffects" long-name="Graphics Effects" introduced="9.2" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/graphicseffects/group" mrp="mw/classicui/lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
-</component>
-<component name="uigraphicsutils" long-name="UI Graphics Utilities" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group" mrp="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
-</component>
-<component name="clockanim" long-name="Clock" purpose="optional" plugin="Y">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/clockanim/group" mrp="mw/classicui/lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
-</component>
-<component name="bmpanimation" long-name="BMP Animation" introduced="6.0" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/bmpanimation/group" mrp="mw/classicui/lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
-</component>
-<component name="animation" long-name="Animation" introduced="9.1" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/animation/group" mrp="mw/classicui/lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
-</component>
-</collection>
-<collection name="classicui_info" long-name="Classic UI Info" level="specific">
-<!-- the multiple units in the API test components need to be resolved -->
-<component name="classicui_metadata" long-name="Classic UI Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/classicui/classicui_info/classicui_metadata/classicui_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="svgt" level="generic" long-name="SVG Tiny" levels="util ui">
-<collection name="svgt_plat" long-name="SVG Tiny Platform Interfaces" level="ui">
-<component name="svgt_api" long-name="SVGT API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/svgt_api/group"/>
-</component>
-<component name="nvg_api" long-name="NVG API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/nvg_api/group"/>
-</component>
-</collection>
-<collection name="svgtopt" long-name="SVG-T Engine" level="util">
-<component name="svgtopt_build" filter="s60" long-name="SVG Engine" introduced="9.2">
-<!-- component is at collection level. Needs to be moved down a directory -->
-<unit bldFile="mw/svgt/svgtopt/group"/>
-</component>
-<component name="svgtplugin" filter="s60" long-name="SVG Plugin" introduced="9.2" plugin="Y">
-<unit bldFile="mw/svgt/svgtopt/svgtplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="uiaccelerator" level="generic" long-name="UI Accelerator" levels="plugin framework server ex if">
-<collection name="uiaccelerator_plat" long-name="UI Accelerator Platform Interfaces" level="if">
-<component name="alf_core_toolkit_api" long-name="ALF Core Toolkit API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/group"/>
-</component>
-<component name="alf_visual_api" long-name="ALF Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/group"/>
-</component>
-<component name="alf_extended_visual_api" long-name="ALF Extended Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/group"/>
-</component>
-<component name="alf_extension_api" long-name="ALF Extension API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/group"/>
-</component>
-<component name="alf_tracing_api" long-name="ALF Tracing API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/group"/>
-</component>
-<component name="alf_client_server_api" long-name="ALF Client Server API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/group"/>
-</component>
-</collection>
-<collection name="uiacceltk" long-name="UI Accelerator Toolkit" level="framework">
-<component name="hitchcock" filter="s60" long-name="Hitchcock">
-<unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/group"/>
-</component>
-<component name="uiacceltk_build" filter="s60" long-name="UI Accelerator Toolkit Build">
-<!-- move into the other component, or remove the #include and make this UI Accelerator Toolkit ROM-->
-<unit bldFile="mw/uiaccelerator/uiacceltk/group"/>
-</component>
-</collection>
-</block>
-<block name="uiresources" level="generic" long-name="UI Resources" levels="compile plugin framework server generic data">
-<!-- are the custom filters below needed? -->
-<collection name="uiresources_pub" long-name="UI Resources Public Interfaces" level="data">
-<component name="pictograph_api" long-name="Pictograph API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/pictograph_api/group" filter="!test"/>
-</component>
-<component name="skins_api" long-name="Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/skins_api/group" filter="!test"/>
-</component>
-<component name="font_definition_api" long-name="Font Definition API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/font_definition_api/group" filter="!test"/>
-</component>
-<component name="graphics_api" long-name="Graphics API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/graphics_api/group" filter="!test"/>
-</component>
-<component name="scalable_icons_api" long-name="Scalable Icons API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/scalable_icons_api/group"/>
-</component>
-<component name="layout_id_definitions_api" long-name="Layout ID Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/layout_id_definitions_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_plat" long-name="UI Resources Platform Interfaces" level="data">
-<component name="layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_system_private_api/group" filter="!test"/>
-</component>
-<component name="layout_data_api" long-name="Layout Data API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_data_api/group" filter="!test"/>
-</component>
-<component name="cdl_api" long-name="CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/cdl_api/group" filter="!test"/>
-</component>
-<component name="extended_skins_api" long-name="Extended Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_skins_api/group" filter="!test"/>
-</component>
-<component name="tfx_server_controller_plugin_api" long-name="TFX Server Controller Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_controller_plugin_api/group"/>
-</component>
-<component name="extended_fonts_api" long-name="Extended Fonts API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_fonts_api/group" filter="!test"/>
-</component>
-<component name="graphic_configuration_api" long-name="Graphic Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/graphic_configuration_api/group" filter="!test"/>
-</component>
-<component name="mif_header_cdl_api" long-name="MIF Header CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mif_header_cdl_api/group"/>
-</component>
-<component name="personalisation_and_skins_settings_api" long-name="Personalisation and Skins Settings API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/personalisation_and_skins_settings_api/group"/>
-</component>
-<component name="tfx_effect_setup_plugin_api" long-name="TFX Effect Setup Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_effect_setup_plugin_api/group"/>
-</component>
-<component name="mifconv_definitions_api" long-name="Mifconv Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mifconv_definitions_api/group"/>
-</component>
-<component name="wallpaper_configuration_api" long-name="Wallpaper Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/wallpaper_configuration_api/group"/>
-</component>
-<component name="language_code_definitions_api" long-name="Language Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/language_code_definitions_api/group"/>
-</component>
-<component name="skins_image_attributes_api" long-name="Skins Image Attributes API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
-</component>
-<component name="private_user_area_code_definitions_api" long-name="Private User Area Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/private_user_area_code_definitions_api/group"/>
-</component>
-<component name="tfx_server_plugin_ids_api" long-name="TFX Server Plug-in IDs API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_plugin_ids_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_info" long-name="UI Resources Info" level="data">
-<component name="uiresources_test" filter="s60,test,api_test" long-name="UI Resources Tests" purpose="development"/>
-</collection>
-<collection name="uigraphics" long-name="UI Graphics" level="generic">
-<component name="bitmaps2" filter="s60" long-name="Bitmaps 2" class="config">
-<unit bldFile="mw/uiresources/uigraphics/bitmaps2/group"/>
-</component>
-<component name="icons" filter="s60" long-name="Icons" class="config">
-<unit bldFile="mw/uiresources/uigraphics/icons/group"/>
-</component>
-<component name="variatedbitmaps" filter="s60" long-name="Variated Bitmaps" class="config">
-<unit bldFile="mw/uiresources/uigraphics/variatedbitmaps/group"/>
-</component>
-<component name="aknicon" filter="s60" long-name="Avkon Icon Framework">
-<unit bldFile="mw/uiresources/uigraphics/aknicon/group"/>
-</component>
-<component name="nvgrenderstage" filter="sf_build" long-name="NVG Render Stage">
-<unit bldFile="mw/uiresources/uigraphics/nvgrenderstage/group"/>
-</component>
-</collection>
-<collection name="layouts" long-name="Layouts" level="plugin">
-<component name="cdl" filter="s60" long-name="Customization Definition Language">
-<!-- can only have one unit. Need to #include them or split into multiple components -->
-<unit bldFile="mw/uiresources/layouts/cdl/cdlengine/group"/>
-<unit bldFile="mw/uiresources/layouts/cdl/cdlserver/group"/>
-</component>
-<component name="aknlayout2" filter="s60" long-name="Avkon Layout 2">
-<unit bldFile="mw/uiresources/layouts/aknlayout2/group"/>
-</component>
-</collection>
-<collection name="skins" long-name="Skins" level="data">
-<component name="aknskincontent" filter="s60" long-name="Avkon Skin Content" class="config">
-<unit bldFile="mw/uiresources/skins/aknskincontent/group"/>
-</component>
-<component name="aknskins" filter="s60" long-name="Avkon Skin Compiler">
-<unit bldFile="mw/uiresources/skins/aknskins/group"/>
-</component>
-</collection>
-<collection name="pictographs" long-name="Pictographs" level="data">
-<component name="aknpictograph" filter="s60" long-name="Avkon Pictograph">
-<unit bldFile="mw/uiresources/pictographs/aknpictograph/group"/>
-</component>
-</collection>
-<collection name="locales" long-name="Locales" level="framework">
-<component name="locales_build" filter="s60" long-name="Locales Build">
-<unit bldFile="mw/uiresources/locales/loce32"/>
-</component>
-</collection>
-<collection name="uiconfig" long-name="UI Config" level="server">
-<component name="s60config" filter="s60" long-name="S60 UI Config">
-<unit bldFile="mw/uiresources/uiconfig/s60config/group"/>
-</component>
-</collection>
-<collection name="fontsupport" long-name="Font Support" level="generic">
-<component name="fontprovider" filter="s60" long-name="Font Provider">
-<unit bldFile="mw/uiresources/fontsupport/fontprovider/group"/>
-</component>
-<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
- <component id="s60_fonts" filter="s60" name="S60 Fonts">
- <unit bldFile="fontsupport/fontutils/group"/>
- </component>
--->
-<component name="fontutils" filter="sf_build" long-name="Font Utils">
-<unit bldFile="mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
-</component>
-</collection>
-<collection name="helpthemes" long-name="Help Themes" level="data">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helpthemes_build" filter="s60" long-name="Help Themes Build" class="config">
-<unit bldFile="mw/uiresources/helpthemes/group"/>
-</component>
-</collection>
-</block>
-<block name="hapticsservices" level="generic" long-name="Haptics Services" levels="fw server api">
-<collection name="hapticsservices_plat" long-name="Haptics Services Platform Interfaces" level="api">
-<component name="tacticon_api" long-name="Tacticon API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tacticon_api/group"/>
-</component>
-<component name="tactile_feedback_core_api" long-name="Tactile Feedback Core API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_core_api/group"/>
-</component>
-<component name="tactile_feedback_server_api" long-name="Tactile Feedback Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_server_api/group"/>
-</component>
-</collection>
-<collection name="hapticsservices_pub" long-name="Haptics Services Public Interfaces" level="api">
-<component name="tactile_feedback_client_api" long-name="Tactile Feedback Client API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_pub/tactile_feedback_client_api/group"/>
-</component>
-</collection>
-<collection name="tacticonserver" long-name="Tacticon Server" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="tacticonserver_build" filter="s60" long-name="Tacticon Server Build" introduced="^3">
-<unit bldFile="mw/hapticsservices/tacticonserver/group"/>
-<!-- clients and servers are suauly the same component. Consider moving pluign to a separate component if needed -->
-</component>
-</collection>
-<collection name="tactilefeedback" long-name="Tactile Feedback" level="fw">
-<component name="tactilearearegistry" filter="s60" long-name="Tactile Area Registry" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilearearegistry/group"/>
-</component>
-<component name="tactilefeedbackresolver" filter="s60" long-name="Tactile Feedback Resolver" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackresolver/group"/>
-</component>
-<component name="tactileclickplugin" filter="s60" long-name="Tactile Click Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileclickplugin/group"/>
-</component>
-<component name="tactilefeedbackclient" filter="s60" long-name="Tactile Feedback Client" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackclient/group"/>
-</component>
-<component name="tactileactionplugin" filter="s60" long-name="Tactile Action Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileactionplugin/group"/>
-</component>
-<component name="tactilefeedback_build" filter="s60" long-name="Tactile Feedback Build" introduced="^1">
-<!-- consider moving IBY to one fo the above components -->
-<unit bldFile="mw/hapticsservices/tactilefeedback/group"/>
-</component>
-</collection>
-</block>
-<block name="gsprofilesrv" level="generic" long-name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
-<collection name="gsprofilesrv_pub" long-name="GS and Profiles Services Public Interfaces" level="specific">
-<component name="profiles_engine_active_profile_settings_api" long-name="Profiles Engine Active Profile Settings API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_active_profile_settings_api/group"/>
-</component>
-<component name="profiles_engine_wrapper_api" long-name="Profiles Engine Wrapper API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_wrapper_api/group"/>
-</component>
-</collection>
-<collection name="gsprofilesrv_plat" long-name="GS and Profiles Services Platform Interfaces" level="specific">
-<component name="profiles_engine_api" long-name="Profiles Engine API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_engine_api/group"/>
-</component>
-<component name="profiles_mediafilelist_api" long-name="Media File List API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_mediafilelist_api/group"/>
-</component>
-<component name="filelist_api" long-name="File List API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/filelist_api/group"/>
-</component>
-<component name="settings_backgroundimage_api" long-name="Settings Background Image API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_backgroundimage_api/group"/>
-</component>
-<component name="settings_framework_api" long-name="Settings Framework API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_framework_api/group"/>
-</component>
-<component name="settings_launch_api" long-name="Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_launch_api/group"/>
-</component>
-<component name="settings_listbox_api" long-name="Settings List Box API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_listbox_api/group"/>
-</component>
-<component name="settings_plugin_api" long-name="Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_plugin_api/group"/>
-</component>
-<component name="settings_uis_cenrep_collection_api" long-name="Settings UIs CenRep Collection API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
-</component>
-</collection>
-<collection name="gssettingsuis" long-name="General Settings UIs" level="framework">
-<component name="gs" filter="s60" long-name="General Settings" introduced="9.2">
-<unit bldFile="mw/gsprofilesrv/gssettingsuis/gs/group"/>
-</component>
-</collection>
-<collection name="profilesservices" long-name="Profiles Services" level="server">
-<component name="filelist" filter="s60" long-name="File List" introduced="9.1">
-<unit bldFile="mw/gsprofilesrv/profilesservices/filelist/group"/>
-</component>
-<component name="mediafilelist" filter="s60" long-name="Media File List" introduced="^2">
-<unit bldFile="mw/gsprofilesrv/profilesservices/mediafilelist/group"/>
-</component>
-<component name="profileengine" filter="s60" long-name="Profile Engine" introduced="9.1">
-<unit bldFile="mw/gsprofilesrv/profilesservices/profileengine/group"/>
-</component>
-<component name="ringingtone3dplugin" filter="s60" long-name="Ringing Tone 3D Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/gsprofilesrv/profilesservices/ringingtone3dplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreensrv" level="specific" long-name="Home Screen Services" levels="plugin framework server generic specific">
-<collection name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" level="specific">
-<component name="ai_content_model_api" long-name="AI Content Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_content_model_api/group"/>
-</component>
-<component name="ai_utilities_api" long-name="AI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_utilities_api/group" filter="!test"/>
-</component>
-<component name="ai_plugin_management_api" long-name="AI Plug-in Management API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_management_api/group"/>
-</component>
-<component name="ai_plugin_information_api" long-name="AI Plug-in Information API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_information_api/group"/>
-</component>
-<component name="ai_variation_api" long-name="AI Variation API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_variation_api/group"/>
-</component>
-<component name="action_handler_plugin_api" long-name="Action Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/group" filter="!test"/>
-</component>
-<component name="content_harvester_plugin_api" long-name="Content Harvester Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/group" filter="!test"/>
-</component>
-<component name="menu_model_api" long-name="Menu Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_model_api/group"/>
-</component>
-<component name="menu_sat_interface_api" long-name="Menu SAT Interface API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/group" filter="!test"/>
-</component>
-<component name="external_home_screen_api" long-name="External Home Screen API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/external_home_screen_api/group"/>
-</component>
-<component name="menu_content_service_api" long-name="Menu Content Service API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_content_service_api/group" filter="!test"/>
-</component>
-<component name="sapi_contentpublishing" long-name="SAPI Content Publishing" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing/group"/>
-</component>
-<component name="sapi_backstepping" long-name="SAPI Backstepping" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_backstepping/group"/>
-</component>
-<component name="sapi_actionhandler" long-name="SAPI Action Handler" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_actionhandler/group"/>
-</component>
-<component name="sapi_homescreenplugin" long-name="SAPI Homescreen Plugin" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_homescreenplugin/group" filter="!test"/>
-</component>
-<component name="sapi_menucontent" long-name="SAPI Menu Content" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_menucontent/group"/>
-</component>
-<component name="xcfw_api" long-name="XCFW API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/xcfw_api/group"/>
-</component>
-<component name="idlefw_api" long-name="Idle Framework API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/idlefw_api/group"/>
-</component>
-<component name="hs_widget_publisher_api" long-name="Home Screen Publishing API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_widget_publisher_api/group"/>
-</component>
-<component name="hs_settings_api" long-name="HS Settings API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_settings_api/group"/>
-</component>
-<component name="hs_content_control_api" long-name="HS Content Control API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_content_control_api/group"/>
-</component>
-</collection>
-<collection name="xcfw" long-name="XML Content Framework" level="framework">
-<!-- collection is really a component, needs to be moved down a directory -->
-<component name="xcfw_build" filter="s60" long-name="XML Content Framework Build">
-<unit bldFile="mw/homescreensrv/xcfw/group"/>
-</component>
-</collection>
-<collection name="homescreenpluginsrv" long-name="Home Screen Plugin Service" level="plugin">
-<component name="hspsdefinitionengine" filter="s60" long-name="HS Plugin Service Definition Engine" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsdefinitionengine/group"/> -->
-</component>
-<component name="hspsdom" filter="s60" long-name="HS Plugin Service DOM" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsdom/group"/> -->
-</component>
-<component name="hspstools" filter="s60" long-name="HS Server Tools">
-<!-- <unit bldFile="homescreenpluginsrv/hspstools/group"/> -->
-</component>
-<component name="hspspluginregistry" filter="s60" long-name="HS Plugin Registry" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspspluginregistry/group"/>-->
-</component>
-<component name="hspsmanager" filter="s60" long-name="HSPS Manager" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsmanager/group"/>-->
-</component>
-<component name="hspsodt" filter="s60" long-name="HSPS Object Description Tree" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsodt/group"/>-->
-</component>
-<component name="hspsresource" filter="s60" long-name="HS Plugin Server Resource" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresource/group"/>-->
-</component>
-<component name="hspsresult" filter="s60" long-name="HS Plugin Server Result" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
-</component>
-<component name="homescreen_settings_api" filter="s60" long-name="HS Settings API" class="api placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
-</component>
-<component name="homescreenpluginsrv_build" filter="s60" long-name="HSPS Build">
-<!-- need to break this up into the self-contained components above and uncomment them -->
-<unit bldFile="mw/homescreensrv/homescreenpluginsrv/group"/>
-</component>
-</collection>
-<collection name="idlefw" long-name="Idle Framework" level="framework">
-<!-- Uncomment all units when configuration is in place. All currently #included from idlefw_build -->
-<component name="idlefw_plugins" filter="s60" long-name="Idle Framework Plugins" plugin="Y" class="placeholder">
-<!--<unit bldFile="idlefw/plugins/group"/>-->
-</component>
-<component name="hslaunch" filter="s60" long-name="Home Screen Launch" class="placeholder">
-<!--<unit bldFile="idlefw/plugins/group"/>-->
-</component>
-<component name="idlefw_build" filter="s60" long-name="Idle Framework Build">
-<!--split this into components, or separate from the above components and move this down a directory -->
-<unit bldFile="mw/homescreensrv/idlefw/group"/>
-</component>
-</collection>
-<collection name="menucontentsrv" long-name="Menu Content Service" level="generic">
-<component name="menusatinterface" filter="s60" long-name="Menu SAT Interface">
-<unit bldFile="mw/homescreensrv/menucontentsrv/menusatinterface/group"/>
-</component>
-<component name="menucontentsrv_build" filter="s60" long-name="Menu Content Service Build">
-<!--split this into components, or separate from the above component and move this down a directory -->
-<unit bldFile="mw/homescreensrv/menucontentsrv/group"/>
-</component>
-</collection>
-<collection name="backsteppingsrv" long-name="Back Stepping Service" level="server">
-<!-- collection is really a component, needs to be moved down a directory -->
-<component name="bsengine" long-name="Back Stepping Engine" filter="s60">
-<unit bldFile="mw/homescreensrv/backsteppingsrv/group"/>
-</component>
-</collection>
-<collection name="contentpublishingsrv" long-name="Content Publishing Service" level="server">
-<component name="contentpublishingdebug" filter="s60" long-name="Content Publishing Debug">
-<!-- need to move this component outside of contentpublishingutils and into separate component directory -->
-<!-- <unit bldFile="contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/> -->
-</component>
-<component name="contentpublishingutils" filter="s60" long-name="Content Publishing Utils">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingutils/group"/>
-</component>
-<component name="contentpublishingserver" filter="s60" long-name="Content Publishing Server">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingserver/group"/>
-</component>
-<component name="contentharvester" filter="s60" long-name="Content Harvester">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
-</component>
-<component name="contentpublishingsrv_build" filter="s60" long-name="Content Publishing Service Build">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/group"/>
-</component>
-</collection>
-<collection name="contentcontrolsrv" long-name="Content Control Service" level="server">
-<component name="ccsrv" long-name="Content Control Service" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccsrv/group"/>
-</component>
-<component name="ccsrvapi" long-name="Content Control Service API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccsrvapi/group"/>
-</component>
-<component name="ccclientsession" long-name="Content Control Client Session" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccclientsession/group"/>
-</component>
-<component name="hsccclient" long-name="HS Content Control Client" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/hsccclient/group"/>
-</component>
-<component name="hscontentinfo" long-name="Home Screen Content Info" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/hscontentinfo/group"/>
-</component>
-<component name="contentcontrolsrv_build" long-name="Content Control Service Build" filter="s60" introduced="^3">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/group"/>
-</component>
-</collection>
-</block>
-<block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
-<collection name="appinstall_plat" long-name="Application Installation Platform Interfaces" level="api">
-<component name="iaupdate_api" long-name="IA Update API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/iaupdate_api/group"/>
-</component>
-<component name="task_plugin_api" long-name="Task Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_plugin_api/group"/>
-</component>
-<component name="sw_installer_common_ui_api" long-name="SW Installer Common UI API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_common_ui_api/group"/>
-</component>
-<component name="sw_installer_launcher_api" long-name="SW Installer Launcher API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_launcher_api/group"/>
-</component>
-<component name="task_management_api" long-name="Task Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_management_api/group"/>
-</component>
-<component name="sw_installer_ui_plugin_api" long-name="SW Installer UI Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ui_plugin_api/group"/>
-</component>
-<component name="sw_installer_cr_keys" long-name="SW Installer CR Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_cr_keys/group"/>
-</component>
-<component name="sw_installer_ps_keys" long-name="SW Installer PS Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
-</component>
-<component name="appmngr2runtimeapi" long-name="Application Manager 2 Runtime Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
-</component>
-</collection>
-<collection name="appinstall_pub" long-name="Application Installation Public Interfaces" level="api">
-<component name="startup_list_management_api" long-name="Startup List Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
-</component>
-</collection>
-<collection name="ncdengine" long-name="Nokia Content Discover" level="framework">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="ncdengine_engine" filter="s60" long-name="NCD Engine" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/engine/group"/>
-</component>
-<component name="debuglogger" filter="s60" long-name="NCD Debug Logger" introduced="^1" class="placeholder">
-<!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
-</component>
-<component name="ncdengine_build" filter="s60" long-name="NCD Build" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/group"/>
-</component>
-</collection>
-<collection name="appinstaller" long-name="Application Installer" level="generic">
-<component name="appmngr2" filter="s60" long-name="Application Manager 2" introduced="^2">
-<unit bldFile="mw/appinstall/appinstaller/appmngr2/group"/>
-</component>
-<component name="appinstui" filter="s60" long-name="Application Installer UI" introduced="^2">
-<unit bldFile="mw/appinstall/appinstaller/appinstui/group"/>
-</component>
-</collection>
-<collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="api">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="iaupdateapi_stub_build" long-name="IA Update API Stub Build" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdateapi_stub/group"/>
-</component>
-</collection>
-<collection name="iaupdate" long-name="Independent Apps Update" level="api">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="iad" long-name="Software Update" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/iad/group"/>
-</component>
-<component name="iaupdate_help" filter="s60" long-name="IA Update Help" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/help/group"/>
-</component>
-<component name="iaupdate_build" filter="s60" long-name="IA Update Build" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/group"/>
-</component>
-</collection>
-<collection name="installationservices" long-name="Installation Services" level="generic">
-<component name="swi" long-name="Secure Software Install" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swi/group" mrp="mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
-</component>
-<component name="swidevicetools" long-name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
-<unit bldFile="mw/appinstall/installationservices/swidevicetools/group" mrp="mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
-</component>
-<component name="swiconfig" long-name="Software Install Config" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appinstall/installationservices/swiconfig/group" mrp="mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
-</component>
-</collection>
-<collection name="secureswitools" long-name="Secure Software Install Tools" level="tool">
-<component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/makekeys/group" mrp="mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
-</component>
-<component name="swianalysistoolkit" long-name="SWI Analysis Toolkit" purpose="development" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
-</component>
-<component name="openssllib" long-name="OpenSSL Library" purpose="optional" class="PC">
-<unit mrp="mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
-</component>
-<component name="swisistools" long-name="Secure Software Install SIS Tools" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swisistools/group" mrp="mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
-</component>
-</collection>
-<collection name="appinstall_info" long-name="Application Installation Info" level="api">
-<component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="serviceapifw" level="specific" long-name="Service API Framework" levels="plugin framework server generic specific">
-<collection name="serviceapifw_pub" long-name="Service API Framework Public Interfaces" level="specific"/>
-<collection name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" level="specific">
-<component name="rtsecuritymanager_common_api" long-name="Runtime Security Manager Common API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/group"/>
-</component>
-<component name="rtsecuritymanager_utility_api" long-name="Runtime Security Manager Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
-</component>
-<component name="rtsecuritymanager_client_api" long-name="Runtime Security Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/group"/>
-</component>
-<component name="liw_provider_utility_api" long-name="LIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_provider_utility_api/group"/>
-</component>
-<component name="liw_service_interface_base_api" long-name="LIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_base_api/group"/>
-</component>
-<component name="liw_service_interface_menu_api" long-name="LIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_menu_api/group"/>
-</component>
-<component name="liw_criteria_api" long-name="LIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_criteria_api/group"/>
-</component>
-<component name="liw_generic_parameter_api" long-name="LIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_generic_parameter_api/group"/>
-</component>
-<component name="liw_service_handler_api" long-name="LIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_handler_api/group"/>
-</component>
-</collection>
-<collection name="rtsecuritymanager" long-name="Runtime Security Manager" level="server">
-<component name="rtsecuritymanagerutil" filter="s60" long-name="Runtime Security Manager Util">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
-</component>
-<component name="rtsecuritymanagerserver" filter="s60" long-name="Runtime Security Manager Server">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/>
-</component>
-<component name="rtsecuritymanagerclient" filter="s60" long-name="Runtime Security Manager Client">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/>
-</component>
-<component name="rtsecuritymanager_build" filter="s60" long-name="Runtime Security Manager Build">
-<!-- Move the export to the appropriate components, or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/group"/>
-</component>
-</collection>
-<collection name="languageinterworkingfw" long-name="Language Interworking Framework" level="framework">
-<component name="lifwservicehandler" filter="s60" long-name="Service Handler">
-<unit bldFile="mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-</block>
-<block name="serviceapi" level="specific" long-name="Service API" levels="os mw1 mw2 app">
-<!-- should break up this collection into something meaningful -->
-<collection name="serviceproviders" long-name="Service Providers" level="mw1">
-<component name="sapi_contacts_vpbk" long-name="Contacts Phonebook SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
-</component>
-<component name="sapi_location" long-name="Location SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_location/group"/>
-</component>
-<component name="sapi_mediamanagement" long-name="Media Management SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/group"/>
-</component>
-<component name="sapi_landmarks" long-name="Landmarks SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
-</component>
-<component name="sapi_messaging" long-name="Messaging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/group"/>
-</component>
-<component name="sapi_applicationmanager" long-name="Application Manager SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
-</component>
-<component name="sapi_calendar" long-name="Calendar SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_calendar/group"/>
-</component>
-<component name="sapi_logging" long-name="Logging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_logging/group"/>
-</component>
-<component name="sapi_sensor" long-name="Sensor SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sensor/group"/>
-</component>
-<component name="sapi_sysinfo" long-name="Sysinfo SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sysinfo/group"/>
-</component>
-<component name="sapi_serviceregistry" long-name="Service Registry SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
-</component>
-<component name="jsapi" long-name="Javascript API" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/jsapi/group"/>
-</component>
-<component name="serviceproviders_build" filter="s60" long-name="Service API Build">
-<!-- distribute the exports or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapi/serviceproviders/group"/>
-</component>
-</collection>
-</block>
-<block name="web" level="specific" long-name="Web" levels="plugin utils server generic specific">
-<collection name="web_pub" long-name="Web Public Interfaces" level="specific">
-<component name="browser_control_api" long-name="Browser Control API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_control_api/group"/>
-</component>
-<component name="download_mgr_client_api" long-name="Download Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_client_api/group"/>
-</component>
-<component name="download_mgr_ui_api" long-name="Download Manager UI Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_ui_api/group"/>
-</component>
-<component name="favourites_engine_api" long-name="Favourites Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/favourites_engine_api/group"/>
-</component>
-<component name="browser_plugin_api" long-name="Browser Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_plugin_api/group"/>
-</component>
-<component name="settings_api" long-name="Settings API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/settings_api/group"/>
-</component>
-</collection>
-<collection name="web_plat" long-name="Web Platform Interfaces" level="specific">
-<component name="aiw_browser_provider_api" long-name="AIW Browser Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/aiw_browser_provider_api/group"/>
-</component>
-<component name="browser_dialogs_provider_api" long-name="Browser Dialogs Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_dialogs_provider_api/group"/>
-</component>
-<component name="browser_platform_api" long-name="Browser Platform API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_platform_api/group"/>
-</component>
-<component name="cod_handler_api" long-name="COD Handler API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cod_handler_api/group"/>
-</component>
-<component name="connection_manager_api" long-name="Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/connection_manager_api/group"/>
-</component>
-<component name="cxml_library_api" long-name="cXml Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cxml_library_api/group"/>
-</component>
-<component name="download_mgr_client_api_extn" long-name="Download Manager Client API Extension" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/download_mgr_client_api_extn/group"/>
-</component>
-<component name="download_path_plugin_api" long-name="Download Path Plugin API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/web/web_plat/download_path_plugin_api/group"/>
-</component>
-<component name="feeds_engine_api" long-name="Feeds Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/feeds_engine_api/group"/>
-</component>
-<component name="launcher_api" long-name="Launcher API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/launcher_api/group"/>
-</component>
-<component name="multipart_parser_api" long-name="Multipart Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/multipart_parser_api/group"/>
-</component>
-<component name="recent_url_store_api" long-name="Recent URL Store API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/recent_url_store_api/group"/>
-</component>
-<component name="scheme_handler_plugin_api" long-name="Scheme Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scheme_handler_plugin_api/group"/>
-</component>
-<component name="scriptable_plugin_api" long-name="Scriptable Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scriptable_plugin_api/group"/>
-</component>
-<component name="webutils_api" long-name="Web Utils API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/webutils_api/group"/>
-</component>
-<component name="widget_registry_api" long-name="Widget Registry API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/widget_registry_api/group"/>
-</component>
-<component name="xml_parser_api" long-name="XML Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/xml_parser_api/group"/>
-</component>
-<component name="stmgesturefw_api" long-name="State Machine Gesture Framework API " filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/stmgesturefw_api/group"/>
-</component>
-</collection>
-<collection name="web_info" long-name="Web Info" level="specific">
-<component name="web_build" filter="s60" long-name="Web Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/group"/>
-</component>
-</collection>
-<collection name="browserutilities" long-name="Browser Utilities" level="utils">
-<component name="browserdialogsprovider" filter="s60" long-name="Browser Dialogs Provider">
-<unit bldFile="mw/web/browserutilities/browserdialogsprovider/group"/>
-</component>
-<component name="recenturlstore" filter="s60" long-name="Recent URL Store">
-<unit bldFile="mw/web/browserutilities/recenturlstore/group"/>
-</component>
-<component name="xmlparser" filter="s60" long-name="XML Interface">
-<unit bldFile="mw/web/browserutilities/xmlparser/group"/>
-</component>
-<component name="cxmllibrary" filter="s60" long-name="XML Parser Implementation">
-<unit bldFile="mw/web/browserutilities/cxmllibrary/group"/>
-</component>
-<component name="downloadmgr" filter="s60" long-name="Download Manager">
-<unit bldFile="mw/web/browserutilities/downloadmgr/group"/>
-</component>
-<component name="connectionmanager" filter="s60" long-name="Connection Manager">
-<unit bldFile="mw/web/browserutilities/connectionmanager/group"/>
-</component>
-<component name="browsertelservice" filter="s60" long-name="Browser Telephony Service">
-<unit bldFile="mw/web/browserutilities/browsertelservice/group"/>
-</component>
-<component name="favouritesengine" filter="s60" long-name="Favourites Engine">
-<unit bldFile="mw/web/browserutilities/favouritesengine/group"/>
-</component>
-<component name="feedsengine" filter="s60" long-name="Feeds Engine">
-<unit bldFile="mw/web/browserutilities/feedsengine/group"/>
-</component>
-<component name="multipartparser" filter="s60" long-name="Multipart Parser">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
-<!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
-</component>
-<component name="schemehandler" filter="s60" long-name="Scheme Handler">
-<unit bldFile="mw/web/browserutilities/schemehandler/group"/>
-</component>
-<component name="webutils" filter="s60" long-name="Web Utils">
-<unit bldFile="mw/web/browserutilities/webutils/group"/>
-</component>
-<component name="aiwbrowserprovider" filter="s60" long-name="AIW Browser Provider" plugin="Y">
-<unit bldFile="mw/web/browserutilities/aiwbrowserprovider/group"/>
-</component>
-<component name="browserutilities_build" filter="s60" long-name="Browser Utilities Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/browserutilities/group"/>
-</component>
-</collection>
-<collection name="webengine" long-name="Web Engine" level="server">
-<component name="osswebengine" filter="s60" long-name="OSS Web Engine">
-<!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
-<unit bldFile="mw/web/webengine/osswebengine/cache/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/memorymanager/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/npscript/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group/javascriptcore"/>
-</component>
-<component name="webkitutils" filter="s60" long-name="WebKit Utils">
-<unit bldFile="mw/web/webengine/webkitutils/group"/>
-</component>
-<component name="pagescaler" filter="s60" long-name="Page Scaler">
-<unit bldFile="mw/web/webengine/pagescaler/group"/>
-</component>
-<component name="webwidgetinstaller" filter="s60" long-name="Widget Installer">
-<unit bldFile="mw/web/webengine/widgetinstaller/group"/>
-</component>
-<component name="widgetregistry" filter="s60" long-name="Widget Registry">
-<unit bldFile="mw/web/webengine/widgetregistry/group"/>
-</component>
-<component name="wmlengine" filter="s60" long-name="WML Engine">
-<unit bldFile="mw/web/webengine/wmlengine/group"/>
-</component>
-<component name="device" filter="s60" long-name="Device">
-<!-- this needs a more meaningful name -->
-<unit bldFile="mw/web/webengine/device/group"/>
-</component>
-<component name="widgetengine" filter="s60" long-name="Widget Engine">
-<unit bldFile="mw/web/webengine/widgetengine/group"/>
-</component>
-<component name="web_memoryplugin" long-name="Memory Plugin" filter="s60" plugin="Y">
-<unit bldFile="mw/web/webengine/memoryplugin/group"/>
-</component>
-<component name="widgetmemoryplugin" filter="s60" long-name="Widget Memory Plugin" plugin="Y">
-<unit bldFile="mw/web/webengine/widgetmemoryplugin/group"/>
-</component>
-<component name="widgetbackuprestore" filter="s60" long-name="Widget Backup and Restore">
-<unit bldFile="mw/web/webengine/widgetbackuprestore/group"/>
-</component>
-<component name="browserrecognizers" filter="s60" long-name="Browser Recognizers" plugin="Y">
-<unit bldFile="mw/web/webengine/browserrecognizers/group"/>
-</component>
-<component name="wrtharvester" filter="s60" long-name="Web Runtime Harvester" plugin="Y">
-<unit bldFile="mw/web/webengine/wrtharvester/group"/>
-</component>
-</collection>
-<collection name="codhandler" long-name="Content Object Descriptor Handler" level="specific">
-<component name="codeng" filter="s60" long-name="COD Engine">
-<unit bldFile="mw/web/codhandler/codeng/group"/>
-</component>
-<component name="codui" filter="s60" long-name="COD UI">
-<unit bldFile="mw/web/codhandler/codui/group"/>
-</component>
-<component name="codrecog" filter="s60" long-name="COD Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/codrecog/group"/>
-</component>
-<component name="codviewer" filter="s60" long-name="COD Viewer">
-<unit bldFile="mw/web/codhandler/codviewer/group"/>
-</component>
-<component name="ddrecog" filter="s60" long-name="Download Descriptor Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/ddrecog/group"/>
-</component>
-<component name="ddviewer" filter="s60" long-name="Download Descriptor Viewer">
-<unit bldFile="mw/web/codhandler/ddviewer/group"/>
-</component>
-<component name="coddownload" filter="s60" long-name="COD Download">
-<unit bldFile="mw/web/codhandler/coddownload/group"/>
-</component>
-<component name="roapapp" filter="s60" long-name="ROAP Application">
-<unit bldFile="mw/web/codhandler/roapapp/group"/>
-</component>
-<component name="codhandler_build" filter="s60" long-name="COD Handler Build">
-<!-- Exports need to go into another component or make this self-contained.
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/codhandler/group"/>
-</component>
-</collection>
-<collection name="widgets" long-name="Web Widget Framework" level="generic">
-<!-- the following units can be uncommented when configuration is put in place -->
-<component name="widgetrecognizer" filter="s60" long-name="Widget Recognizer" plugin="Y">
-<!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
-</component>
-<component name="widgetinstaller" filter="s60" long-name="Widget Installer UI" plugin="Y">
-<!--<unit bldFile="widgets/widgetinstaller/group"/>-->
-</component>
-<component name="widgetlauncher" filter="s60" long-name="Widget Launcher">
-<!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
-</component>
-<component name="widgetapp" filter="s60" long-name="Widget UI">
-<!--<unit bldFile="widgets/widgetapp/group"/>-->
-</component>
-<component name="widgetsidchecker" filter="s60" long-name="Widget SID Checker" introduced="^3">
-<!--<unit bldFile="widgets/widgetsidchecker/group"/>-->
-</component>
-<component name="widgetpreinstaller" filter="s60" long-name="Widget Pre-Installer">
-<!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
-</component>
-<component name="widgetstartup" filter="s60" long-name="Widget Startup">
-<!--<unit bldFile="widgets/widgetstartup/group"/>-->
-</component>
-<component name="widgets_build" filter="s60" long-name="Widgets Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/widgets/group"/>
-</component>
-</collection>
-</block>
-<block name="websrv" level="generic" long-name="Web Services" levels="plugin framework server generic specific">
-<collection name="websrv_pub" long-name="Web Services Public Interfaces" level="specific">
-<component name="web_service_description_api" long-name="Web Service Description API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_description_api/group"/>
-</component>
-<component name="web_service_connection_api" long-name="Web Service Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/group"/>
-</component>
-<component name="web_service_manager_api" long-name="Web Service Manager API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/group"/>
-</component>
-<component name="hostlet_connection_api" long-name="Hostlet Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/group"/>
-</component>
-<component name="web_service_messaging_api" long-name="Web Service Messaging API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/group"/>
-</component>
-<component name="xml_extensions_api" long-name="XML Extensions API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/group"/>
-</component>
-<component name="xml_fragment_api" long-name="XML Fragment API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/group"/>
-</component>
-</collection>
-<collection name="webservices" long-name="Web Services Framework" level="generic">
-<!-- consider breaking this collection into more meaningful subsets -->
-<component name="wsnotifierplugins" filter="s60" long-name="WS Notifier Plugins" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsnotifierplugins/group"/>
-</component>
-<component name="wslogger" filter="s60" long-name="WS Logger">
-<unit bldFile="mw/websrv/webservices/wslogger/group"/>
-</component>
-<component name="wsxml" filter="s60" long-name="WS XML Extensions">
-<unit bldFile="mw/websrv/webservices/wsxml/group"/>
-</component>
-<component name="wsutils" filter="s60" long-name="WS Utils">
-<unit bldFile="mw/websrv/webservices/wsutils/group"/>
-</component>
-<component name="wsfragment" filter="s60" long-name="WS Fragment">
-<unit bldFile="mw/websrv/webservices/wsfragment/group"/>
-</component>
-<component name="wsdescription" filter="s60" long-name="WS Service Description">
-<unit bldFile="mw/websrv/webservices/wsdescription/group"/>
-</component>
-<component name="wsconnection" filter="s60" long-name="WS Service Connection">
-<unit bldFile="mw/websrv/webservices/wsconnection/group"/>
-</component>
-<component name="wsmessages" filter="s60" long-name="WS Messages">
-<unit bldFile="mw/websrv/webservices/wsmessages/group"/>
-</component>
-<component name="wscredentialmanager" filter="s60" long-name="WS Credential Manager">
-<unit bldFile="mw/websrv/webservices/wscredentialmanager/group"/>
-</component>
-<component name="wsframework" filter="s60" long-name="WS Framework">
-<unit bldFile="mw/websrv/webservices/wsframework/group"/>
-</component>
-<component name="wshttpchanneltransportplugin" filter="s60" long-name="WS HTTP Channel Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshttpchanneltransportplugin/group"/>
-</component>
-<component name="wsconnectionagent" filter="s60" long-name="WS Connection Agent">
-<unit bldFile="mw/websrv/webservices/wsconnectionagent/group"/>
-</component>
-<component name="wsprovider" filter="s60" long-name="WS Provider">
-<unit bldFile="mw/websrv/webservices/wsprovider/group"/>
-</component>
-<component name="wshostletconnection" filter="s60" long-name="WS Hostlet Connection">
-<unit bldFile="mw/websrv/webservices/wshostletconnection/group"/>
-</component>
-<component name="wsmanager" filter="s60" long-name="WS Service Manager">
-<unit bldFile="mw/websrv/webservices/wsmanager/group"/>
-</component>
-<component name="wsidentitymanager" filter="s60" long-name="WS Identity Manager">
-<unit bldFile="mw/websrv/webservices/wsidentitymanager/group"/>
-</component>
-<component name="idwsfplugin" filter="s60" long-name="ID-WSF Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/idwsfplugin/group"/>
-</component>
-<component name="wsibasicplugin" filter="s60" long-name="WS-I Basic Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsibasicplugin/group"/>
-</component>
-<component name="wsrestplugin" filter="s60" long-name="WS REST Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsrestplugin/group"/>
-</component>
-<component name="idwsfsecuritymechanism" filter="s60" long-name="ID-WSF Security Mechanism">
-<unit bldFile="mw/websrv/webservices/idwsfsecuritymechanism/group"/>
-</component>
-<component name="wspasswordtransforms" filter="s60" long-name="WS Password Transforms">
-<unit bldFile="mw/websrv/webservices/wspasswordtransforms/group"/>
-</component>
-<component name="wscore" filter="s60" long-name="WS Core Service Manager">
-<unit bldFile="mw/websrv/webservices/wscore/group"/>
-</component>
-<component name="wslocaltransportplugin" filter="s60" long-name="WS Local Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wslocaltransportplugin/group"/>
-</component>
-<component name="wshostlettransportplugin" filter="s60" long-name="WS Hostlet Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshostlettransportplugin/group"/>
-</component>
-<component name="wsstar" filter="s60" long-name="WS Star">
-<!-- can only have one unit. Need to split into separate components or #include from a single bld.inf -->
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarpolicy/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarplugin/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarmessagehandlers/group"/>
-</component>
-<component name="wsoviplugin" filter="s60" long-name="WS Ovi Plugin">
-<unit bldFile="mw/websrv/webservices/wsoviplugin/group"/>
-</component>
-<component name="webservices_build" filter="s60" long-name="Web Services Build">
-<!-- need to split into self-contained components -->
-<unit bldFile="mw/websrv/webservices/group"/>
-</component>
-</collection>
-<collection name="websrv_info" long-name="Web Services Info" level="specific">
-<component name="websrv_bld" filter="s60" long-name="Web Services Build">
-<!-- need to include common .hrh in each unit -->
-<unit bldFile="mw/websrv/group"/>
-</component>
-</collection>
-</block>
-<block name="platformtools" level="generic" long-name="Platform Tools">
-<collection name="gfxconversion" long-name="Graphics Conversion">
-<component name="bmconv_s60" filter="s60" long-name="S60 Bitmap Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/bmconv_s60/group"/>
-</component>
-<component name="mifconv" filter="s60" long-name="Multi Icon File Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/mifconv/group"/>
-</component>
-</collection>
-</block>
-<block name="uitools" level="specific" long-name="UI Tools" levels="compile encode tool if">
-<collection name="uitools_pub" long-name="UI Tools Public Interfaces" level="if">
-<component name="third_party_bitmap_palette_api" long-name="Third Party Bitmap Palette API" filter="s60" class="api">
-<unit bldFile="mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
-</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">
-<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">
-<unit bldFile="mw/uitools/uitools_plat/layout_system_private_api/group"/>
-</component>
-</collection>
-<collection name="cdlcompilertoolkit" long-name="CDL Compiler Toolkit" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompilertoolkit_build" filter="s60" long-name="CDL Compiler Toolkit Build">
-<unit bldFile="mw/uitools/cdlcompilertoolkit/group"/>
-</component>
-</collection>
-<collection name="cdlcompiler" long-name="CDL Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompiler_build" filter="s60" long-name="CDL Compiler Build">
-<unit bldFile="mw/uitools/cdlcompiler/group"/>
-</component>
-</collection>
-<collection name="gfxtools" long-name="Graphics Tools" level="tool">
-<component name="gditools" filter="s60" long-name="GDI Tools" class="PC">
-<unit bldFile="mw/uitools/gfxtools/gditools/group"/>
-</component>
-<component name="color" filter="s60" long-name="Bitmap Colour Palette" class="PC">
-<unit bldFile="mw/uitools/gfxtools/color/group"/>
-</component>
-</collection>
-<collection name="aknlayoutcompiler" long-name="Avkon Layout Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="aknlayoutcompiler_build" filter="s60" long-name="Avkon Layout Compiler Build">
-<unit bldFile="mw/uitools/aknlayoutcompiler/group"/>
-</component>
-</collection>
-<collection name="skincompiler" long-name="Skin Compiler" level="compile">
-<component name="aknskindesccompiler" filter="s60" long-name="Avkon Skin Descriptor Compiler">
-<unit bldFile="mw/uitools/skincompiler/AknSkinDescCompiler/group"/>
-</component>
-</collection>
-<collection name="reszip" long-name="Resource Zip" level="encode">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="reszip_build" filter="s60" long-name="Resource Zip Build">
-<unit bldFile="mw/uitools/reszip/group"/>
-</component>
-</collection>
-<collection name="toollibraries" long-name="Tool Libraries" level="tool"/>
-<collection name="svgtencoder" long-name="SVGT Encoder" level="encode">
-<component name="svgtenc" filter="s60" long-name="Standalone SVGT Encoder" class="PC">
-<unit bldFile="mw/uitools/svgtencoder/svgtenc/standalone/group"/>
-</component>
-</collection>
-</block>
-</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">
-<component name="location_centre_api" long-name="Location Centre API" introduced="^3" filter="s60" class="api">
-<unit bldFile="app/location/loc_plat/location_centre_api/group"/>
-</component>
-</collection>
-<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"/>
-</component>
-<component name="landmarks_ui_addedit_api" long-name="Landmarks UI Add/Edit API" filter="s60" class="api">
-<unit bldFile="app/location/loc_pub/landmarks_ui_addedit_api/group"/>
-</component>
-</collection>
-<collection name="basiclocationinfodisplay" long-name="Basic Location Info Display" level="ui">
-<component name="blid" filter="s60" long-name="Basic Location Info Display Build">
-<unit bldFile="app/location/basiclocationinfodisplay/blid/group"/>
-</component>
-</collection>
-<collection name="landmarksui" long-name="Landmarks UI" level="loc">
-<component name="landmarksui_help" filter="s60" long-name="Landmarks UI Help">
-<unit bldFile="app/location/landmarksui/help/group"/>
-</component>
-<component name="landmarksui_engine" filter="s60" long-name="Landmarks UI Engine">
-<unit bldFile="app/location/landmarksui/engine/group"/>
-</component>
-<component name="uicontrols" filter="s60" long-name="Landmarks UI Controls">
-<unit bldFile="app/location/landmarksui/uicontrols/group"/>
-</component>
-<component name="landmarksui_commonui" filter="s60" long-name="Landmarks Common UI">
-<unit bldFile="app/location/landmarksui/commonui/group"/>
-</component>
-<component name="landmarksui_app" filter="s60" long-name="Landmarks Application">
-<unit bldFile="app/location/landmarksui/app/group"/>
-</component>
-<component name="msgviewer" filter="s60" long-name="Landmarks Message Viewer">
-<unit bldFile="app/location/landmarksui/msgviewer/group"/>
-</component>
-<component name="landmarksui_build" filter="s60" long-name="Landmarks UI Build">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="app/location/landmarksui/group"/>
-</component>
-</collection>
-<collection name="eventsui" long-name="Location Events UI" level="events">
-<component name="eventsui_help" filter="s60" long-name="Events Help">
-<unit bldFile="app/location/eventsui/help/group"/>
-</component>
-<component name="eventsutils" filter="s60" long-name="Events Utils">
-<unit bldFile="app/location/eventsui/eventsutils/group"/>
-</component>
-<component name="eventsengine" filter="s60" long-name="Events Engine">
-<unit bldFile="app/location/eventsui/eventsengine/group"/>
-</component>
-<component name="eventshandlerui" filter="s60" long-name="Events Handler UI">
-<unit bldFile="app/location/eventsui/eventshandlerui/group"/>
-</component>
-<component name="eventseditor" filter="s60" long-name="Events Editor">
-<unit bldFile="app/location/eventsui/eventseditor/group"/>
-</component>
-<component name="eventsmgmtui" filter="s60" long-name="Events Management UI">
-<unit bldFile="app/location/eventsui/eventsmgmtui/group"/>
-</component>
-<component name="eventsui_build" filter="s60" long-name="Events UI Build">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="app/location/eventsui/group"/>
-</component>
-</collection>
-<collection name="locationlandmarksrefappfors60" long-name="Location Landmarks Reference App for S60" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="lmrefapp" filter="s60" long-name="Landmarks Reference Application">
-<unit bldFile="app/location/locationlandmarksrefappfors60/group"/>
-</component>
-</collection>
-<collection name="locationlandmarksuirefapp" long-name="Location Landmarks UI Reference App" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="lmuirefapp" filter="s60" long-name="Landmarks UI Reference Application">
-<unit bldFile="app/location/locationlandmarksuirefapp/group"/>
-</component>
-</collection>
-<collection name="locationsatviewrefapp" long-name="Location Satellite View Reference App" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="satellitereference" filter="s60" long-name="Satellite Info UI Reference Application">
-<unit bldFile="app/location/locationsatviewrefapp/group"/>
-</component>
-</collection>
-<collection name="simpsyconfigurator" long-name="Simulation PSY Configurator" level="ui">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="simpsyui" filter="s60" long-name="Simulation PSY UI">
-<unit bldFile="app/location/simpsyconfigurator/group"/>
-</component>
-</collection>
-<collection name="mapnavproviderrefapp" long-name="Map and Navigation Provider Reference App" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="mapnavproviderrefapp_build" filter="s60" long-name="Map and Navigation Provider Reference Application">
-<unit bldFile="app/location/mapnavproviderrefapp/group"/>
-</component>
-</collection>
-<collection name="locationcentre" long-name="Location Centre" level="loc">
-<component name="lcutils" long-name="Location Centre Utilities" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcutils/group"/>
-</component>
-<component name="lcservice" long-name="Location Centre Service Project" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcservice/group"/>
-</component>
-<component name="lcserver" long-name="Location Centre Server Project" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcserver/group"/>
-</component>
-<component name="lcapp" long-name="Location Centre Application" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcapp/group"/>
-</component>
-<component name="locationcentre_build" filter="s60" long-name="Location Centre Build" introduced="^3">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="app/location/locationcentre/group"/>
-</component>
-</collection>
-</block>
-<block name="mmsharinguis" level="services" long-name="Multimedia Sharing UIs" levels="base plugin if">
-<collection name="mmsharinguis_plat" long-name="Multimedia Sharing UIs Platform Interfaces" level="if">
-<component name="multimedia_sharing_settings_api" long-name="Multimedia Sharing Settings API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_settings_api/group"/>
-</component>
-<component name="multimedia_sharing_resource_api" long-name="Multimedia Sharing Resource API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_resource_api/group"/>
-</component>
-<component name="multimedia_sharing_manager_api" long-name="Multimedia Sharing Manager API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/group"/>
-</component>
-</collection>
-<collection name="mmsharing" long-name="Multimedia Sharing" level="base">
-<component name="mmshavailability" filter="s60" long-name="Multimedia Sharing Availability">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshavailability/group"/>
-</component>
-<component name="mmshindicator" filter="s60" long-name="Multimedia Sharing Indicator">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshindicator/group"/>
-</component>
-<!-- consider putting client and server in the same component -->
-<component name="mmshmanagercli" filter="s60" long-name="Multimedia Sharing Manager Client">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshmanagercli/group" filter="!test"/>
-</component>
-<component name="mmshmanagersrv" filter="s60" long-name="Multimedia Sharing Manager Server">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshmanagersrv/group"/>
-</component>
-<component name="mmshengine" filter="s60" long-name="Multimedia Sharing Engine">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshengine/group"/>
-</component>
-<component name="mmshui" filter="s60" long-name="Multimedia Sharing UI">
-<!-- can only have one unit: need to #include one from the other if it's needed -->
-<unit bldFile="app/mmsharinguis/mmsharing/mmshui/group"/>
-<unit bldFile="app/mmsharinguis/mmsharing/mmshui/help/group"/>
-</component>
-<component name="mmsharing_build" filter="s60" long-name="MM Sharing Build">
-<unit bldFile="app/mmsharinguis/mmsharing/group"/>
-</component>
-</collection>
-<collection name="mmshplugins" long-name="Multimedia Sharing Plugins" level="plugin">
-<component name="mmshaoplugin" filter="s60" long-name="Multimedia Sharing Always Online Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshaoplugin/group"/>
-</component>
-<component name="mmshaiwplugin" filter="s60" long-name="Multimedia Sharing AIW Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshaiwplugin/group"/>
-</component>
-<component name="mmshsipcrplugin" filter="s60" long-name="Multimedia Sharing SIP Client Resolver Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshsipcrplugin/group"/>
-</component>
-<component name="mmshsettingsuiplugin" filter="s60" long-name="Multimedia Sharing Settings UI Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshsettingsuiplugin/group"/>
-</component>
-<component name="mmshwpadapterplugin" filter="s60" long-name="Multimedia Sharing WAP Provisioning Adapter" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshwpadapterplugin/group"/>
-</component>
-</collection>
-<collection name="mmsharinguis_info" long-name="Multimedia Sharing UIs Info" level="if">
-<component name="mmsharinguis_build" filter="s60" long-name="Multimedia Sharing UIs Build">
-<!-- consider distributing to other components -->
-<unit bldFile="app/mmsharinguis/group"/>
-</component>
-</collection>
-</block>
-<block name="phone" level="apps" span="2" long-name="Phone Apps" levels="engine plugin ui app">
-<collection name="phone_plat" long-name="Phone Apps Platform Interfaces" level="app">
-<component name="3d_ringing_tone_enabler_api" long-name="3D Ringing Tone Enabler API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
-</component>
-<component name="telephony_comms_information_api" long-name="Telephony Comms Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_comms_information_api/group"/>
-</component>
-<component name="telephony_information_api" long-name="Telephony Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_information_api/group"/>
-</component>
-<component name="telephony_device_mode_api" long-name="Telephony Device Mode API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_device_mode_api/group"/>
-</component>
-<component name="telephony_remote_party_information_api" long-name="Telephony Remote Party Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_remote_party_information_api/group"/>
-</component>
-<component name="telephony_video_mailbox_settings_api" long-name="Telephony Video Mailbox Settings API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_video_mailbox_settings_api/group"/>
-</component>
-<component name="telephony_configuration_api" long-name="Telephony Configuration API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_configuration_api/group"/>
-</component>
-<component name="telephony_microphone_mute_status_api" long-name="Telephony Microphone Mute Status API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_microphone_mute_status_api/group"/>
-</component>
-<component name="dialer_keypad_api" long-name="Dialer Keypad API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/dialer_keypad_api/group"/>
-</component>
-<component name="telephony_logging_extension_api" long-name="Telephony Logging Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_logging_extension_api/group"/>
-</component>
-<component name="telephony_matching_extension_api" long-name="Telephony Matching Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_matching_extension_api/group"/>
-</component>
-<component name="telephony_bubble_extension_api" long-name="Telephony Bubble Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_bubble_extension_api/group"/>
-</component>
-<component name="telephony_menu_extension_api" long-name="Telephony Menu Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_menu_extension_api/group"/>
-</component>
-<component name="phone_application_commands_api" long-name="Phone Application Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_commands_api/group"/>
-</component>
-<component name="phone_application_voip_commands_api" long-name="Phone Application VOIP Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_voip_commands_api/group"/>
-</component>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_mediator_api/group"/>
-</component>
-<component name="video_telephony_mediator_api" long-name="Video Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/video_telephony_mediator_api/group"/>
-</component>
-</collection>
-<collection name="phoneapp" long-name="Phone Application" level="app">
-<component name="blacklist" filter="s60" long-name="Phone Blacklist Clearing" plugin="Y">
-<unit bldFile="app/phone/phoneapp/blacklist/group"/>
-</component>
-<component name="phoneui" filter="s60" long-name="Phone UI">
-<unit bldFile="app/phone/phoneapp/phoneui/group" filter="!test"/>
-</component>
-<component name="phoneuicontrol" filter="s60" long-name="Phone UI Control">
-<unit bldFile="app/phone/phoneapp/phoneuicontrol/group"/>
-</component>
-<component name="phoneuistates" filter="s60" long-name="Phone UI States">
-<unit bldFile="app/phone/phoneapp/phoneuistates/group"/>
-</component>
-<component name="phoneuiutils" filter="s60" long-name="Phone UI Utils">
-<unit bldFile="app/phone/phoneapp/phoneuiutils/group"/>
-</component>
-<component name="phoneuiview" filter="s60" long-name="Phone UI View">
-<unit bldFile="app/phone/phoneapp/phoneuiview/group"/>
-</component>
-<component name="phoneuivoipextension" filter="s60" long-name="Phone UI VOIP Extension">
-<unit bldFile="app/phone/phoneapp/phoneuivoipextension/group"/>
-</component>
-<component name="silenceactionplugin" filter="s60" long-name="Silence Action Plugin" plugin="Y">
-<unit bldFile="app/phone/phoneapp/silenceactionplugin/group"/>
-</component>
-<component name="phonemediatorcenter" filter="s60" long-name="Phone Mediator Center">
-<unit bldFile="app/phone/phoneapp/phonemediatorcenter/group"/>
-</component>
-</collection>
-<collection name="phoneengine" long-name="Phone Engine" level="engine">
-<component name="phonecntfinder" filter="s60" long-name="Phone Contact Finder">
-<unit bldFile="app/phone/phoneengine/phonecntfinder/group"/>
-</component>
-<component name="audiohandling" filter="s60" long-name="Phone Audio Handling">
-<unit bldFile="app/phone/phoneengine/audiohandling/group"/>
-</component>
-<component name="callhandling" filter="s60" long-name="Call Handling">
-<unit bldFile="app/phone/phoneengine/callhandling/group"/>
-</component>
-<component name="contacthandling" filter="s60" long-name="Phone Contact Handling">
-<unit bldFile="app/phone/phoneengine/contacthandling/group"/>
-</component>
-<component name="loghandling" filter="s60" long-name="Phone Log Handling">
-<unit bldFile="app/phone/phoneengine/loghandling/group"/>
-</component>
-<component name="engineinfo" filter="s60" long-name="Phone Engine Info">
-<unit bldFile="app/phone/phoneengine/engineinfo/group"/>
-</component>
-<component name="phonemodel" filter="s60" long-name="Phone Model">
-<unit bldFile="app/phone/phoneengine/phonemodel/group"/>
-</component>
-<component name="servicehandling" filter="s60" long-name="Phone Service Handling">
-<unit bldFile="app/phone/phoneengine/servicehandling/group"/>
-</component>
-</collection>
-<collection name="phonesettings" long-name="Phone Settings" level="plugin">
-<component name="aiwcallimageplugin" filter="s60" long-name="Call Image AIW Plugin" plugin="Y">
-<unit bldFile="app/phone/phonesettings/aiwcallimageplugin/group"/>
-</component>
-<component name="pslncallimageplugin" filter="s60" long-name="Call Image Personalization Plugin" plugin="Y">
-<unit bldFile="app/phone/phonesettings/pslncallimageplugin/group"/>
-</component>
-</collection>
-<collection name="phoneuis" long-name="Phone UIs" level="ui">
-<component name="dialer" filter="s60" long-name="Dialer">
-<unit bldFile="app/phone/phoneuis/dialer/group" filter="!test"/>
-</component>
-<component name="easydialing" filter="s60" long-name="Easy Dialing Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/phone/phoneuis/easydialing/group"/>
-</component>
-<component name="bubblemanager" filter="s60" long-name="Phone Bubble Manager">
-<unit bldFile="app/phone/phoneuis/bubblemanager/group"/>
-</component>
-<component name="connectutil" filter="s60" long-name="Connection Utility" plugin="Y">
-<unit bldFile="app/phone/phoneuis/connectutil/group"/>
-</component>
-<component name="ussd" filter="s60" long-name="Unstructured Supplementary Services Data">
-<unit bldFile="app/phone/phoneuis/ussd/group"/>
-</component>
-<component name="vmbx" filter="s60" long-name="Voice Mailbox">
-<unit bldFile="app/phone/phoneuis/vmbx/group"/>
-</component>
-<component name="telephonydevicemode" filter="s60" long-name="Telephony Device Mode">
-<unit bldFile="app/phone/phoneuis/telephonydevicemode/group"/>
-</component>
-</collection>
-<collection name="phoneplugins" long-name="Phone Plugins" level="plugin">
-<component name="telbranding" filter="s60" long-name="Tel Branding" introduced="^2" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/telbranding/group"/>
-</component>
-</collection>
-</block>
-<block name="videotelephony" level="apps" long-name="Video Telephony Apps" levels="engine plugin prot ui">
-<collection name="videotelephony_plat" long-name="VT Apps Platform Interfaces" level="ui">
-<component name="video_telephony_control_mediator_api" long-name="Video Telephony Control Mediator API" filter="s60" class="api">
-<unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_control_mediator_api/group"/>
-</component>
-<component name="video_telephony_media_configuration_api" long-name="Video Telephony Media Configuration API" filter="s60" class="api">
-<unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_media_configuration_api/group"/>
-</component>
-</collection>
-<collection name="vtengines" long-name="Video Telephony Engines" level="engine">
-<component name="videoteleng" filter="s60" long-name="Video Telephony Engine">
-<unit bldFile="app/videotelephony/vtengines/videoteleng/Group"/>
-</component>
-<component name="vtmediatorplugin" filter="s60" long-name="VT Mediator Plugin" plugin="Y">
-<unit bldFile="app/videotelephony/vtengines/vtmediatorplugin/group"/>
-</component>
-</collection>
-<collection name="vtuis" long-name="Video Telephony UIs" level="ui">
-<component name="videotelui" filter="s60" long-name="Video Telephony UI">
-<unit bldFile="app/videotelephony/vtuis/videotelui/group"/>
-</component>
-</collection>
-<collection name="vtprotocolplugins" long-name="VT Protocol Plugins" level="plugin">
-<component name="displaysink" filter="s60" long-name="Display Sink" introduced="^2">
-<unit bldFile="app/videotelephony/vtprotocolplugins/DisplaySink/group"/>
-</component>
-<component name="videosource" filter="s60" long-name="Video Source" introduced="^2">
-<unit bldFile="app/videotelephony/vtprotocolplugins/VideoSource/group"/>
-</component>
-</collection>
-<collection name="vtprotocolsstub" long-name="VT Protocols Stub" level="prot">
-<!-- this collection is really a component, move down a directory -->
-<component name="videotelproto" filter="s60" long-name="Video Telephony Protocol">
-<unit bldFile="app/videotelephony/vtprotocolsstub/group" filter="sf_build"/>
-</component>
-</collection>
-</block>
-<block name="iptelephony" level="apps" long-name="IP Telephony" levels="eng plugin util ui">
-<collection name="iptel_plat" long-name="IP Telephony Platform Interfaces" level="ui">
-<component name="richcallsettingsengine_api" long-name="Rich Call Settings Engine API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/richcallsettingsengine_api/group"/>
-</component>
-<component name="cch_client_api" long-name="CCH Client API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/cch_client_api/group"/>
-</component>
-<component name="cch_server_api" long-name="CCH Server API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/cch_server_api/group"/>
-</component>
-<component name="csc_settingsui_api" long-name="CSC Settings UI API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/csc_settingsui_api/group"/>
-</component>
-<component name="vccpropertyhandler_api" long-name="VCC Property Handler API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/vccpropertyhandler_api/group"/>
-</component>
-<component name="vcc_api" long-name="VCC API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/vcc_api/group"/>
-</component>
-</collection>
-<collection name="iptelcommsconfig" long-name="IP Telephony Comms Config" level="ui">
-<component name="cscgsplugin" filter="s60" long-name="CSC GS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/commsconfig/cscgsplugin/group"/>
-</component>
-<component name="cscsipvoipcleanupplugin" filter="s60" long-name="CSC SIP VoIP Cleanup Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/commsconfig/cscsipvoipcleanupplugin/group"/>
-</component>
-<component name="cscengine" filter="s60" long-name="Connection Service Configurator Engine" introduced="^2">
-<unit bldFile="app/iptelephony/commsconfig/cscengine/group"/>
-</component>
-<component name="cscsettingsui" filter="s60" long-name="CSC Settings UI" introduced="^2">
-<unit bldFile="app/iptelephony/commsconfig/cscsettingsui/group"/>
-</component>
-<component name="cscapplicationui" filter="s60" long-name="CSC Application UI" introduced="^2">
-<unit bldFile="app/iptelephony/commsconfig/cscapplicationui/group"/>
-</component>
-<component name="commsconfig_build" filter="s60" long-name="Comms Config Build" introduced="^2">
-<!-- consider distributing this into the above components -->
-<unit bldFile="app/iptelephony/commsconfig/group"/>
-</component>
-</collection>
-<collection name="convergedconnectionhandler" long-name="Converged Connection Handler" level="eng">
-<component name="cchserver" filter="s60" long-name="CCH Server" introduced="^2">
-<unit bldFile="app/iptelephony/convergedconnectionhandler/cchserver/group"/>
-</component>
-<component name="cchclient" filter="s60" long-name="CCH Client" introduced="^2">
-<unit bldFile="app/iptelephony/convergedconnectionhandler/cchclient/group"/>
-</component>
-<component name="cchclientapi" filter="s60" long-name="CCH Client API" introduced="^2">
-<unit bldFile="app/iptelephony/convergedconnectionhandler/cchclientapi/group"/>
-</component>
-<component name="convergedconnectionhandler_build" filter="s60" long-name="CCH Build" introduced="^2">
-<!-- consider distributing this into the above components, or collapse the collection into a single component.
- The latter is a better option since clients and sevrers are rarely separate components -->
-<unit bldFile="app/iptelephony/convergedconnectionhandler/group"/>
-</component>
-</collection>
-<collection name="richcallsettingsengine" long-name="Rich Call Settings Engine" level="eng">
-<component name="rcse2" filter="s60" long-name="Rich Call Settings Engine Build" introduced="^2">
-<unit bldFile="app/iptelephony/richcallsettingsengine/rcse2/group"/>
-</component>
-</collection>
-<collection name="sipvoipprovider" long-name="SIP VoIP Provider" level="plugin">
-<!-- collection is really a component. Should move down a directory -->
-<component name="svp" filter="s60" long-name="SIP VoIP Provider Build" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/sipvoipprovider/group"/>
-</component>
-</collection>
-<collection name="voipplugins" long-name="VoIP Plugins" level="plugin">
-<component name="sipmxresolver" filter="s60" long-name="SIP MX Resolver" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/sipmxresolver/group"/>
-</component>
-<component name="sipconnectionprovider" filter="s60" long-name="SIP Connection Provider" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/sipconnectionprovider/group"/>
-<!-- can only have one unit, can the next be #'included from the above? -->
-<unit bldFile="app/iptelephony/voipplugins/sipconnectionprovider/ipvoicemailengine/group"/>
-</component>
-<component name="ipapputils" filter="s60" long-name="IP App Utils" introduced="^2">
-<unit bldFile="app/iptelephony/voipplugins/ipapputils/group"/>
-</component>
-<component name="voipadapters" filter="s60" long-name="VoIP Adapters" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/voipadapters/group"/>
-</component>
-<component name="accountcreationplugin" filter="s60" long-name="Account Creation Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/accountcreationplugin/group"/>
-</component>
-<component name="dhcppositionprovider" filter="s60" long-name="DHCP Position Provider" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/dhcppositionprovider/group"/>
-</component>
-<component name="svtmatching" filter="s60" long-name="SIP VoIP Telephony Matching" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/svtmatching/group"/>
-</component>
-<component name="svtlogging" filter="s60" long-name="SVT Logging" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/svtlogging/group"/>
-</component>
-<component name="svtcallmenu" filter="s60" long-name="SVT Call Menu" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/svtcallmenu/group"/>
-</component>
-<component name="sipimresolver" filter="s60" long-name="SIP IM Resolver" introduced="^3" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/sipimresolver/group"/>
-</component>
-</collection>
-<collection name="callcontinuity" long-name="Call Continuity" level="util">
-<component name="vccutils" filter="s60" long-name="VCC Utils" introduced="^2">
-<unit bldFile="app/iptelephony/callcontinuity/vccutils/group"/>
-</component>
-<component name="nsmldmvccadapter" filter="s60" long-name="SyncML DM VCC Adapter" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/callcontinuity/nsmldmvccadapter/group"/>
-</component>
-<component name="vccclientprovisioningadapter" filter="s60" long-name="VCC Client Provisioning Adapter" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/callcontinuity/vccclientprovisioningadapter/group"/>
-</component>
-<component name="vccpropertyhandler" filter="s60" long-name="VCC Property Handler" introduced="^2">
-<unit bldFile="app/iptelephony/callcontinuity/vccpropertyhandler/group"/>
-</component>
-<component name="vcchotrigger" filter="s60" long-name="VCC HO Trigger" introduced="^2">
-<unit bldFile="app/iptelephony/callcontinuity/vcchotrigger/group"/>
-</component>
-<component name="vcc" filter="s60" long-name="VoIP Call Continuity" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/callcontinuity/vcc/group"/>
-</component>
-<component name="callcontinuity_build" filter="s60" long-name="Call Continuity Build" introduced="^2">
-<!-- consider distributing this into the above components -->
-<unit bldFile="app/iptelephony/callcontinuity/group"/>
-</component>
-</collection>
-</block>
-<block name="settingsuis" level="services" long-name="Settings UIs" levels="rsc ui">
-<collection name="devmngt_plat" long-name="Settings UIs Platform Interfaces" level="ui">
-<component name="default_app_client_api" long-name="Default App Client API" introduced="^1" filter="s60" class="api">
-<unit bldFile="app/settingsuis/devmngt_plat/default_app_client_api/group"/>
-</component>
-<component name="services_db_api" long-name="Services DB API" introduced="^1" filter="s60" class="api">
-<unit bldFile="app/settingsuis/devmngt_plat/services_db_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="defaultapplicationsettings" long-name="Default Application Settings" level="rsc">
-<component name="services_db" filter="s60" long-name="Services Database" introduced="^1">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/services_db/group"/>
-</component>
-<component name="defaultapplicationsettings_server" filter="s60" long-name="Default Application Server" introduced="^1">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/server/group"/>
-</component>
-<component name="service" filter="s60" long-name="Default Application Service" introduced="^1">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/service/group"/>
-</component>
-<component name="dasgsplugin" filter="s60" long-name="Default Application Settings GS Plugin" introduced="^1" plugin="Y">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/gsplugin/group"/>
-</component>
-<component name="defaultapplicationsettings_build" filter="s60" long-name="Default Application Settings Build" introduced="^1">
-<!-- split the IBYs up into the appropriate components? Make this a ROM component? -->
-<unit bldFile="app/settingsuis/defaultapplicationsettings/group"/>
-</component>
-</collection>
-<collection name="systemswuis" long-name="System SW UIs" level="ui">
-<component name="touchscreencalib" filter="s60" long-name="Touchscreen Calibration" introduced="^1">
-<unit bldFile="app/settingsuis/systemswuis/touchscreencalib/group"/>
-</component>
-</collection>
-</block>
-<block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin app">
-<collection name="contentctrl_plat" long-name="Content Control Daemons Platforn Interfaces" level="app">
-<component name="oma_ds_presync_plugin_api" long-name="OMA DS PreSync Plugin API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/oma_ds_presync_plugin_api/group"/>
-</component>
-<component name="ds_agenda_handler_plugin_api" long-name="DS Agenda Handler Plugin API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_agenda_handler_plugin_api/group"/>
-</component>
-<component name="ds_folder_util_api" long-name="DS Folder Util API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_folder_util_api/group"/>
-</component>
-</collection>
-<collection name="dsdcmoadapter" long-name="Data Sync DCMO Adapter" level="plugin">
-<!-- Component at wrong rank, should move down a directory -->
-<component name="dsdcmoadapter_build" filter="s60" long-name="Data Sync Control DCMO Adapter">
-<unit bldFile="app/contentcontrol/dsdcmoadapter/group"/>
-</component>
-</collection>
-<collection name="omads" long-name="OMA Data Sync" level="app">
-<component name="omadsappui" filter="s60" long-name="OMA DS Application UI">
-<unit bldFile="app/contentcontrol/omads/omadsappui/group"/>
-</component>
-<component name="omadsextensions" filter="s60" long-name="OMA DS Extensions" plugin="Y">
-<unit bldFile="app/contentcontrol/omads/omadsextensions/group"/>
-</component>
-</collection>
-</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">
-<unit bldFile="app/devicecontrol/devicediagnostics/devdiagapp/group"/>
-</component>
-<component name="devdiaggsplugin" filter="s60" long-name="Device Diagnostics GS Plugin" plugin="Y">
-<unit bldFile="app/devicecontrol/devicediagnostics/devdiaggsplugin/group"/>
-</component>
-<component name="diagplugins" filter="s60" long-name="Diagnostics Plugins" plugin="Y">
-<unit bldFile="app/devicecontrol/devicediagnostics/diagplugins/group"/>
-</component>
-<component name="diagsuites" filter="s60" long-name="Diagnostics Suites" plugin="Y">
-<unit bldFile="app/devicecontrol/devicediagnostics/diagsuites/group"/>
-</component>
-<component name="devicediagnostics_build" filter="s60" long-name="Device Diagnostics Build">
-<!-- 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">
-<unit bldFile="app/devicecontrol/omadm/omadmappui/group"/>
-</component>
-<component name="omadmextensions" filter="s60" long-name="OMA DM Extensions" 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">
-<unit bldFile="app/devicecontrol/omadm/dcmo/group"/>
-</component>
-</collection>
-<collection name="pnpmobileservices" long-name="PnP Mobile Services" level="mid">
-<component name="pnpms" filter="s60" long-name="PnP MS">
-<unit bldFile="app/devicecontrol/pnpmobileservices/pnpms/group"/>
-</component>
-</collection>
-<collection name="applicationmanagement" long-name="Application Management" level="app">
-<!-- could this collection be collapsed into a single component and moved down a dir? Do all these need to be noted separately? -->
-<component name="applicationmanagement_options" filter="s60" long-name="AM Install Options">
-<unit bldFile="app/devicecontrol/applicationmanagement/options/group"/>
-</component>
-<component name="applicationmanagement_client" filter="s60" long-name="AM Client">
-<unit bldFile="app/devicecontrol/applicationmanagement/client/group"/>
-</component>
-<component name="applicationmanagement_server" filter="s60" long-name="AM Server">
-<unit bldFile="app/devicecontrol/applicationmanagement/server/group"/>
-</component>
-<component name="rfsplugin" filter="s60" long-name="AM RFS Plugin" plugin="Y">
-<unit bldFile="app/devicecontrol/applicationmanagement/rfsplugin/group"/>
-</component>
-<component name="amadapter2" filter="s60" long-name="AM Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/applicationmanagement/amadapter2/group"/>
-</component>
-<component name="omascomoadapter" filter="s60" long-name="OMA SCOMO Adapter" introduced="^3" plugin="Y">
-<unit bldFile="app/devicecontrol/applicationmanagement/omascomoadapter/group"/>
-</component>
-<component name="applicationmanagement_build" filter="s60" long-name="AM Build">
-<!-- If thes aren't collapsed into one cmp, can all #includes removed from here, and it renamed AM ROM? -->
-<unit bldFile="app/devicecontrol/applicationmanagement/group"/>
-</component>
-</collection>
-<collection name="customization" long-name="DM Customization Adapters" level="mid">
-<component name="dmutils" long-name="DM Utils" filter="s60">
-<unit bldFile="app/devicecontrol/customization/dmutils/bld"/>
-</component>
-<component name="uisettingssrv" filter="s60" long-name="UI Settings Server">
-<unit bldFile="app/devicecontrol/customization/uisettingssrv/bld"/>
-</component>
-<component name="isadapter" filter="s60" long-name="Idle State Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/isadapter/bld"/>
-</component>
-<component name="supadapter" filter="s60" long-name="Startup Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/supadapter/bld"/>
-</component>
-<component name="wallpaperadapter" filter="s60" long-name="Wallpaper Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/wallpaperadapter/bld"/>
-</component>
-<component name="operatorlogoadapter" filter="s60" long-name="Operator Logo Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/operatorlogoadapter/bld"/>
-</component>
-<component name="screensaveradapter" filter="s60" long-name="Screen Saver Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/screensaveradapter/bld"/>
-</component>
-<component name="themesadapter" filter="s60" long-name="Themes Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/themesadapter/bld"/>
-</component>
-<component name="embeddedlinkadapter" filter="s60" long-name="Embedded Link Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/embeddedlinkadapter/bld"/>
-</component>
-<component name="customization_build" filter="s60" long-name="DM Customization Build">
-<!-- If thes aren't collapsed into one cmp, can all #includes removed from here, and it renamed DM Customization ROM? -->
-<unit bldFile="app/devicecontrol/customization/group"/>
-</component>
-</collection>
-<collection name="omacp" long-name="OMA Content Provisioning" level="oma">
-<component name="omacpadapters" filter="s60" long-name="OMA CP Adapters" plugin="Y">
-<unit bldFile="app/devicecontrol/omacp/omacpadapters/group"/>
-</component>
-</collection>
-</block>
-<block name="printing" level="services" long-name="Printing" levels="app">
-<collection name="imageprint" long-name="ImagePrint" level="app">
-<component name="clog" filter="s60" long-name="ImagePrint Logging" introduced="^2">
-<unit bldFile="app/printing/imageprint/clog/group"/>
-</component>
-<component name="imageprintengine" filter="s60" long-name="ImagePrint Engine" introduced="^2">
-<unit bldFile="app/printing/imageprint/imageprintengine/group"/>
-</component>
-<component name="imageprintui" filter="s60" long-name="ImagePrint UI" introduced="^2">
-<unit bldFile="app/printing/imageprint/imageprintui/group"/>
-</component>
-<component name="imageprint_build" filter="s60" long-name="ImagePrint Build" introduced="^2">
-<!-- Need to break the IBY includes into the other components, or remove #includes and make this a ROM component -->
-<unit bldFile="app/printing/imageprint/group"/>
-</component>
-</collection>
-</block>
-<block name="files" level="apps" long-name="File Manager Apps" levels="support apps">
-<collection name="files_plat" long-name="File Manager Apps Platform Interfaces" level="apps">
-<component name="memory_scan_popup_ui_api" long-name="Memory Scan Popup UI API" filter="s60" class="api">
-<unit bldFile="app/files/files_plat/memory_scan_popup_ui_api/group"/>
-</component>
-</collection>
-<collection name="deviceencryption" long-name="Device Encryption" level="support">
-<!-- this is either needs to be broken up into idependent bld.infs, or it's really a component and should move down a directory -->
-<component name="devencnotifplugin" filter="s60" long-name="Device Encryption Notifier Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/files/deviceencryption/devencnotifplugin/group"/>
-</component>
-<component name="devencui" filter="s60" long-name="Device Encryption UI" introduced="^3">
-<unit bldFile="app/files/deviceencryption/devencui/group"/>
-</component>
-<component name="devencdmadapter" filter="s60" long-name="Device Encryption DM Adapter" introduced="^3" plugin="Y">
-<unit bldFile="app/files/deviceencryption/devencdmadapter/group"/>
-</component>
-<component name="devencgsplugin" filter="s60" long-name="Device Encryption GS Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/files/deviceencryption/devencgsplugin/group"/>
-</component>
-<component name="deviceencryption_help" filter="s60" long-name="Device Encryption Help" introduced="^3">
-<unit bldFile="app/files/deviceencryption/help/group"/>
-</component>
-<component name="deviceencryption_build" filter="s60" long-name="Device Encryption Build" introduced="^3">
-<unit bldFile="app/files/deviceencryption/group"/>
-</component>
-</collection>
-<collection name="filemanager" long-name="File Manager" level="apps">
-<!-- this is really a component, should move down a directory -->
-<component name="filemanager_build" filter="s60" long-name="File Manager Build">
-<unit bldFile="app/files/filemanager/group"/>
-</component>
-</collection>
-<collection name="filesystemuis" long-name="File System UIs" level="support">
-<component name="memscaneng" filter="s60" long-name="Memory Scan Server">
-<unit bldFile="app/files/filesystemuis/memscaneng/group"/>
-</component>
-<component name="memstatepopup" filter="s60" long-name="Memory State Popup">
-<unit bldFile="app/files/filesystemuis/memstatepopup/group"/>
-</component>
-</collection>
-</block>
-<block name="utils" level="apps" long-name="Utility Apps" levels="app">
-<collection name="extras" long-name="Extras" level="app">
-<component name="about" filter="s60" long-name="About Application">
-<unit bldFile="app/utils/extras/about/group"/>
-</component>
-<component name="calcsoft" filter="s60" long-name="Calculator Application">
-<unit bldFile="app/utils/extras/calcsoft/group"/>
-</component>
-<component name="converter" filter="s60" long-name="Unit Converter">
-<unit bldFile="app/utils/extras/converter/group"/>
-</component>
-</collection>
-</block>
-<block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
-<collection name="contacts_pub" long-name="Contacts Apps Public Interfaces" level="ui">
-<component name="phonebook_fetch_ui_api" long-name="Phonebook Fetch UI API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_fetch_ui_api/group"/>
-</component>
-<component name="phonebook_data_management_api" long-name="Phonebook Data Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_data_management_api/group"/>
-</component>
-<component name="phonebook_vcard_importexport_api" long-name="Phonebook vCard Import/Export API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_vcard_importexport_api/group"/>
-</component>
-<component name="phonebook_data_addedit_ui_api" long-name="Phonebook Data Add/Edit UI API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_data_addedit_ui_api/group"/>
-</component>
-<component name="phonebook_ui_utilities_api" long-name="Phonebook UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_ui_utilities_api/group"/>
-</component>
-<component name="phonebook_thumbnail_operation_api" long-name="Phonebook Thumbnail Operation API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_thumbnail_operation_api/group"/>
-</component>
-<component name="speed_dial_utility_control_api" long-name="Speed Dial Utility Control API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/speed_dial_utility_control_api/group"/>
-</component>
-</collection>
-<collection name="contacts_plat" long-name="Contacts Apps Platform Interfaces" level="ui">
-<component name="virtual_phonebook_store_api" long-name="Virtual Phonebook Store API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_store_api/group"/>
-</component>
-<component name="virtual_phonebook_sim_services_api" long-name="Virtual Phonebook SIM Services API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_sim_services_api/group"/>
-</component>
-<component name="virtual_phonebook_configuration_api" long-name="Virtual Phonebook Configuration API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_configuration_api/group"/>
-</component>
-<component name="virtual_phonebook_copy_policy_api" long-name="Virtual Phonebook Copy Policy API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_copy_policy_api/group"/>
-</component>
-<component name="virtual_phonebook_policy_api" long-name="Virtual Phonebook Policy API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_policy_api/group"/>
-</component>
-<component name="virtual_phonebook_engine_api" long-name="Virtual Phonebook Engine API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_engine_api/group"/>
-</component>
-<component name="virtual_phonebook_migration_support_api" long-name="Virtual Phonebook Migration Support API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_migration_support_api/group"/>
-</component>
-<component name="virtual_phonebook_view_definition_api" long-name="Virtual Phonebook View Definition API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_view_definition_api/group"/>
-</component>
-<component name="virtual_phonebook_vcard_api" long-name="Virtual Phonebook vCard API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_vcard_api/group"/>
-</component>
-<component name="cms_contactor_api" long-name="CMS Contactor API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/cms_contactor_api/group"/>
-</component>
-<component name="contactpresence_api" long-name="Contact Presence API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/contactpresence_api/group"/>
-</component>
-<component name="presence_cache_api" long-name="Presence Cache API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/presence_cache_api/group"/>
-</component>
-<component name="phonebook_internal_common_api" long-name="Phonebook Internal Common API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_common_api/group"/>
-</component>
-<component name="phonebook_internal_appfw_api" long-name="Phonebook Internal App Framework API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_appfw_api/group"/>
-</component>
-<component name="phonebook_internal_data_management_api" long-name="Phonebook Internal Data Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_data_management_api/group"/>
-</component>
-<component name="phonebook_2_xsp_extension_manager_api" long-name="Phonebook 2 xSP Extension Manager API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_xsp_extension_manager_api/group"/>
-</component>
-<component name="phonebook_ui_controls_api" long-name="Phonebook UI Controls API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_ui_controls_api/group"/>
-</component>
-<component name="phonebook_2_image_management_api" long-name="Phonebook 2 Image Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_image_management_api/group"/>
-</component>
-<component name="phonebook_extension_api" long-name="Phonebook Extension API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_extension_api/group"/>
-</component>
-<component name="phonebook_public_constants_api" long-name="Phonebook Public Constants API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_public_constants_api/group"/>
-</component>
-<component name="phonebook_internal_ui_utilities_api" long-name="Phonebook Internal UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_ui_utilities_api/group"/>
-</component>
-<component name="logs_engine_api_extensions" long-name="Logs Engine API Extensions" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/logs_engine_api_extensions/group"/>
-</component>
-<component name="phonebook_thumbnails_api" long-name="Phonebook Thumbnails API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_thumbnails_api/group"/>
-</component>
-<component name="phonebook_2_icon_api" long-name="Phonebook 2 Icon API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_icon_api/group"/>
-</component>
-<component name="phonebook_engine_extension_api" long-name="Phonebook Engine Extension API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_engine_extension_api/group"/>
-</component>
-<component name="phonebook_2_store_configuration_management_api" long-name="Phonebook 2 Store Configuration Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_store_configuration_management_api/group"/>
-</component>
-<component name="logs_ui_command_line_api" long-name="Logs UI Command Line API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/logs_ui_command_line_api/group"/>
-</component>
-<component name="speed_dial_dialogs_api" long-name="Speed Dial Dialogs API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/speed_dial_dialogs_api/group"/>
-</component>
-<component name="phonebook_2_xsp_view_activation_api" long-name="Phonebook 2 xSP View Activation API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_xsp_view_activation_api/group"/>
-</component>
-<component name="logs_timers_api" long-name="Logs Timers API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/logs_timers_api/group"/>
-</component>
-<component name="phonebook_2_ui_extension_definition_api" long-name="Phonebook 2 UI Extension Definition API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_definition_api/group"/>
-</component>
-<component name="phonebook_2_common_ui_api" long-name="Phonebook 2 Common UI API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_common_ui_api/group"/>
-</component>
-<component name="phonebook_2_ui_extension_api" long-name="Phonebook 2 UI Extension API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_api/group"/>
-</component>
-<component name="phonebook_2_store_property_api" long-name="Phonebook 2 Store Property API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_store_property_api/group"/>
-</component>
-<component name="phonebook_2_ui_extension_plugin_api" long-name="Phonebook 2 UI Extension Plug-In API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_plugin_api/group"/>
-</component>
-<component name="phonebook_2_ui_controls_api" long-name="Phonebook 2 UI Controls API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_controls_api/group"/>
-</component>
-<component name="phonebook_2_thin_ui_extension_plugin_api" long-name="Phonebook 2 Thin UI Extension Plugin API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_thin_ui_extension_plugin_api/group"/>
-</component>
-<component name="phonebook_2_commands_api" long-name="Phonebook 2 Commands API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_commands_api/group"/>
-</component>
-<component name="phonebook_2_presentation_api" long-name="Phonebook 2 Presentation API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_presentation_api/group"/>
-</component>
-<component name="phonebook_2_ui_utilities_api" long-name="Phonebook 2 UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_utilities_api/group"/>
-</component>
-<component name="cca_launch_api" long-name="CCA Launch API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/cca_launch_api/group"/>
-</component>
-<component name="cca_view_plugin_api" long-name="CCA View Plugin API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/cca_view_plugin_api/group"/>
-</component>
-<component name="predictivesearch_client_api" long-name="Predictive Search Client API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_client_api/group"/>
-</component>
-<component name="predictivesearch_utils_api" long-name="Predictive Search Utils API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_utils_api/group"/>
-</component>
-<component name="predictivesearch_adapters_api" long-name="Predictive Search Adapters API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_adapters_api/group"/>
-</component>
-<component name="predictivesearch_algorithm_api" long-name="Predictive Search Algorithm API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_algorithm_api/group"/>
-</component>
-<component name="phonebook_2_rcl_api" long-name="Phonebook 2 RCL API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_rcl_api/group"/>
-</component>
-</collection>
-<collection name="contactextensions" long-name="Contacts Extensions" level="services">
-<component name="predefinedcontacts" filter="s60" long-name="Predefined Contacts">
-<unit bldFile="app/contacts/contactextensions/predefinedcontacts/group"/>
-</component>
-</collection>
-<collection name="logsui" long-name="Logs UI" level="ui">
-<component name="logsui_build" filter="s60" long-name="Logs UI Build">
-<!-- component at too high a rank, should move down one directory -->
-<unit bldFile="app/contacts/logsui/group"/>
-</component>
-</collection>
-<collection name="phonebookui" long-name="Phonebook UI" level="ui">
-<component name="phonebook" filter="s60" long-name="Phonebook">
-<unit bldFile="app/contacts/phonebookui/phonebook/group"/>
-</component>
-<component name="speeddial" filter="s60" long-name="Speed Dial">
-<unit bldFile="app/contacts/phonebookui/speeddial/group"/>
-</component>
-<component name="phonebook2" filter="s60" long-name="Phone Book 2">
-<unit bldFile="app/contacts/phonebookui/phonebook2/group"/>
-</component>
-</collection>
-<collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
-<component name="cntfindplugin" filter="s60" long-name="Contacts Find Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntfindplugin/group"/>
-</component>
-<component name="cntsortplugin" filter="s60" long-name="Contacts Sort Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntsortplugin/group"/>
-</component>
-<component name="virtualphonebook" filter="s60" long-name="Virtual Phonebook" introduced="^2">
-<unit bldFile="app/contacts/phonebookengines/virtualphonebook/group"/>
-</component>
-<component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
-<unit bldFile="app/contacts/phonebookengines/contactsmodel/groupsql" mrp="app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
-</component>
-</collection>
-<collection name="pimprotocols" long-name="PIM Protocols" level="services">
-<component name="phonebooksync" long-name="Phonebook Sync" purpose="optional" plugin="Y">
-<unit bldFile="app/contacts/pimprotocols/phonebooksync/group" mrp="app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
-</component>
-<component name="pbap" long-name="Bluetooth PBAP" introduced="9.2" purpose="optional">
-<unit bldFile="app/contacts/pimprotocols/pbap/group" mrp="app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
-</component>
-</collection>
-<collection name="ccservices" long-name="Contacts Centric Services" level="services">
-<component name="cmsservices" filter="s60" long-name="Contact Method Selector Services" introduced="^2">
-<unit bldFile="app/contacts/ccservices/cmsservices/group"/>
-</component>
-</collection>
-<collection name="presencecache" long-name="Presence Cache" level="support">
-<component name="presencecacheutils" filter="s60" long-name="Presence Cache Utils" introduced="^2" class="placeholder">
-<!-- <unit bldFile="presencecache/presencecacheutils/group"/> -->
-</component>
-<component name="presencecacheserver2" filter="s60" long-name="Presence Cache Server" introduced="^2" class="placeholder">
-<!-- <unit bldFile="presencecache/presencecacheserver2/group"/> -->
-</component>
-<component name="presencecacheclient2" filter="s60" long-name="Presence Cache Client" introduced="^2" class="placeholder">
-<!-- <unit bldFile="presencecache/presencecacheclient2/group"/> -->
-</component>
-<component name="presencecache_build" filter="s60" long-name="Presence Cache Build" introduced="^2">
-<!-- should divide this bld.inf into the other components, or collapse them into a single component -->
-<unit bldFile="app/contacts/presencecache/group"/>
-</component>
-</collection>
-<collection name="predictivesearch" long-name="Predictive Search" level="support">
-<component name="pcsutils" filter="s60" long-name="PCS Utils" introduced="^2">
-<unit bldFile="app/contacts/predictivesearch/pcsutils/group"/>
-</component>
-<component name="pcsserverclientapi" filter="s60" long-name="PCS Server Client API" introduced="^2">
-<unit bldFile="app/contacts/predictivesearch/pcsserverclientapi/group"/>
-</component>
-<component name="pcsserver" filter="s60" long-name="PCS Server" introduced="^2">
-<unit bldFile="app/contacts/predictivesearch/pcsserver/group"/>
-</component>
-<component name="pcsadapters" filter="s60" long-name="PCS Adapters" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/predictivesearch/adapters/contacts/group"/>
-</component>
-<component name="pcsalgorithm" filter="s60" long-name="PCS Algorithm" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/predictivesearch/pcsalgorithm/group"/>
-</component>
-<component name="predictivesearch_build" filter="s60" long-name="Predictive Search Build" introduced="^2">
-<!-- need to remove #includes from bld.inf and rename as Predictive Search ROM -->
-<unit bldFile="app/contacts/predictivesearch/group"/>
-</component>
-</collection>
-<collection name="contacts_info" long-name="Contacts Apps Info" level="ui">
-<component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="organizer" level="apps" span="2" long-name="Organizer Application Suite" levels="support services engine ui app">
-<collection name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" level="app">
-<component name="meeting_request_mailbox_utilities_api" long-name="Meeting Request Mailbox Utilities API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_mailbox_utilities_api/group"/>
-</component>
-<component name="meeting_request_uids_api" long-name="Meeting Request UIDs API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_uids_api/group"/>
-</component>
-<component name="calendar_exporter_api" long-name="Calendar Exporter API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_exporter_api/group"/>
-</component>
-<component name="agenda_versit_2_api" long-name="Agenda Versit 2 API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/agenda_versit_2_api/group"/>
-</component>
-<component name="calendar_importer_api" long-name="Calendar Importer API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_importer_api/group"/>
-</component>
-<component name="calendar_launcher_api" long-name="Calendar Launcher API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_launcher_api/group"/>
-</component>
-<component name="calendar_common_utils_api" long-name="Calendar Common Utils API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_common_utils_api/group"/>
-</component>
-<component name="searchfw_launcher_api" long-name="Search Framework Launcher API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/searchfw_launcher_api/group"/>
-</component>
-<component name="alarm_const_api" long-name="Alarm Const API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/alarm_const_api/group"/>
-</component>
-<component name="alarm_ui_external_control_api" long-name="Alarm UI External Control API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/alarm_ui_external_control_api/group"/>
-</component>
-<component name="calendar_settings_keys_api" long-name="Calendar Settings Keys API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_settings_keys_api/group"/>
-</component>
-<component name="calendar_tones_settings_keys_api" long-name="Calendar Tones Settings Keys API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_tones_settings_keys_api/group"/>
-</component>
-<component name="clock_settings_api" long-name="Clock Settings API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/clock_settings_api/group"/>
-</component>
-<component name="common_alarm_editor_api" long-name="Common Alarm Editor API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/common_alarm_editor_api/group"/>
-</component>
-<component name="alarm_ui_secondary_display_api" long-name="Alarm UI Secondary Display API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/alarm_ui_secondary_display_api/group"/>
-</component>
-<component name="searchui_launcher_api" long-name="Search UI Launcher API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/searchui_launcher_api/group"/>
-</component>
-<component name="agenda_entry_ui_api" long-name="Agenda Entry UI API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/agenda_entry_ui_api/group"/>
-</component>
-<component name="meeting_request_utillities_api" long-name="Meeting Request Utillities API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_utillities_api/group"/>
-</component>
-<component name="meeting_request_viewer_api" long-name="Meeting Request Viewer API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_viewer_api/group"/>
-</component>
-<component name="calendar_custamization_api" long-name="Calendar Customization API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_custamization_api/group"/>
-</component>
-</collection>
-<collection name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" level="app">
-<component name="calendar_interim_utils2_api" long-name="Calendar Interim Utils 2 API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_pub/calendar_interim_utils2_api/group"/>
-</component>
-<component name="notepad_library_api" long-name="Notepad Library API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_pub/notepad_library_api/group"/>
-</component>
-</collection>
-<collection name="alarmengines" long-name="Alarm Engines" level="engine">
-<component name="missedalarmstore" filter="s60" long-name="Missed Alarm Store">
-<unit bldFile="app/organizer/alarmengines/missedalarmstore/group"/>
-</component>
-</collection>
-<collection name="calendarengines" long-name="Calendar Engines" level="engine">
-<component name="versit2" filter="s60" long-name="Versit 2 iCal Parser" introduced="9.2">
-<unit bldFile="app/organizer/calendarengines/versit2/group"/>
-</component>
-<component name="agnversit2" filter="s60" long-name="Versit 2 Agenda Interface" introduced="9.2" plugin="Y">
-<unit bldFile="app/organizer/calendarengines/agnversit2/group"/>
-</component>
-<component name="caleninterimutils" filter="s60" long-name="Calendar Interim Utils" introduced="9.1">
-<unit bldFile="app/organizer/calendarengines/caleninterimutils/group"/>
-</component>
-<component name="calenimp" filter="s60" long-name="Calendar Import Wrapper" introduced="7.0s">
-<unit bldFile="app/organizer/calendarengines/calenimp/group"/>
-</component>
-<component name="calenlauncher" filter="s60" long-name="Calendar Launcher">
-<unit bldFile="app/organizer/calendarengines/calenlauncher/group"/>
-</component>
-<component name="caldavsrv" filter="sf_build" long-name="CalDAV Server" introduced="^3">
-<unit bldFile="app/organizer/calendarengines/caldav/group"/>
-</component>
-</collection>
-<collection name="meetingrequestengines" long-name="Meeting Request Engines" level="engine">
-<component name="mrmailbox" filter="s60" long-name="Meeting Request Mailbox">
-<unit bldFile="app/organizer/meetingrequestengines/mrmailbox/group"/>
-</component>
-<component name="mrmailboxutils" filter="s60" long-name="Meeting Request Mailbox Utils" plugin="Y">
-<unit bldFile="app/organizer/meetingrequestengines/mrmailboxutils/group"/>
-</component>
-</collection>
-<collection name="searchfw" long-name="Search Framework" level="services">
-<!-- Uncomment all units when configuration is in place. All currently #included from searchfw_build, which should be removed at the same time. -->
-<component name="coresearchfw" filter="s60" long-name="Core Search Framework" introduced="^1" class="placeholder">
-<!--<unit bldFile="searchfw/coresearchfw/group"/>-->
-</component>
-<component name="searchfw_plugins" filter="s60" long-name="Search Plugins" introduced="^1" plugin="Y" class="placeholder">
-<!--<unit bldFile="searchfw/plugins/group"/>-->
-</component>
-<component name="searchfw_build" filter="s60" long-name="Search Framework Build" introduced="^1">
-<unit bldFile="app/organizer/searchfw/group"/>
-</component>
-</collection>
-<collection name="alarmui" long-name="Alarm UI" level="app">
-<!-- collection is really a component, should move down a directory -->
-<component name="alarmui_build" filter="s60" long-name="Alarm UI Build">
-<unit bldFile="app/organizer/alarmui/group"/>
-</component>
-</collection>
-<collection name="calendarui" long-name="Calendar UI" level="ui">
-<component name="calendarui_help" filter="s60" long-name="Calendar UI Help">
-<unit bldFile="app/organizer/calendarui/help/group"/>
-</component>
-<component name="commonutils" filter="s60" long-name="Calendar Common Utils">
-<unit bldFile="app/organizer/calendarui/commonutils/group"/>
-</component>
-<component name="globaldata" filter="s60" long-name="Calendar Global Data">
-<unit bldFile="app/organizer/calendarui/globaldata/group"/>
-</component>
-<component name="settings" filter="s60" long-name="Calendar Settings">
-<!-- these should be merged into a single bld.inf or split into two components -->
-<unit bldFile="app/organizer/calendarui/settings/gsplugin/group"/>
-<unit bldFile="app/organizer/calendarui/settings/settingsui/group"/>
-</component>
-<component name="customisation" filter="s60" long-name="Calendar Customisation">
-<unit bldFile="app/organizer/calendarui/customisation/group"/>
-</component>
-<component name="customisationmanager" filter="s60" long-name="Calendar Customisation Manager">
-<unit bldFile="app/organizer/calendarui/customisationmanager/group"/>
-</component>
-<component name="multicaluidialog" filter="s60" long-name="Multi-Calendar UI Dialog" introduced="^3">
-<unit bldFile="app/organizer/calendarui/multicaluidialog/group"/>
-</component>
-<component name="views" filter="s60" long-name="Calendar Views">
-<unit bldFile="app/organizer/calendarui/views/group"/>
-</component>
-<component name="calendarui_controller" filter="s60" long-name="Calendar Controller">
-<unit bldFile="app/organizer/calendarui/controller/group"/>
-</component>
-<component name="calendarui_editors" filter="s60" long-name="Calendar Editors">
-<unit bldFile="app/organizer/calendarui/editors/group"/>
-</component>
-<component name="calendarui_application" filter="s60" long-name="Calendar Application">
-<unit bldFile="app/organizer/calendarui/application/group"/>
-</component>
-<component name="missedalarmindicatorplugin" filter="s60" long-name="Missed Alarm Indicator Plugin" plugin="Y">
-<unit bldFile="app/organizer/calendarui/missedalarmindicatorplugin/group"/>
-</component>
-<component name="calendarui_server" filter="s60" long-name="Calendar Server">
-<!-- these should be merged into a single bld.inf or split into two components -->
-<unit bldFile="app/organizer/calendarui/server/calensvr/group"/>
-<unit bldFile="app/organizer/calendarui/server/calensvrclient/group"/>
-</component>
-<component name="regionalplugins" filter="s60" long-name="Calendar Regional Plugins" plugin="Y">
-<!-- these should be merged into a single bld.inf or split into four components -->
-<unit bldFile="app/organizer/calendarui/regionalplugins/calenregionalutil/group"/>
-<unit bldFile="app/organizer/calendarui/regionalplugins/lunarchinese/group"/>
-<unit bldFile="app/organizer/calendarui/regionalplugins/lunarvietnamese/group"/>
-<unit bldFile="app/organizer/calendarui/regionalplugins/thai/group"/>
-</component>
-<component name="calenaiwprovider" filter="s60" long-name="Calendar AIW Proivder" introduced="^3" plugin="Y">
-<unit bldFile="app/organizer/calendarui/calenaiwprovider/group"/>
-</component>
-<component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y">
-<unit bldFile="app/organizer/calendarui/caldav/group"/>
-</component>
-<component name="calendarui_build" filter="s60" long-name="Calendar UI Build">
-<!-- split contents into separate components -->
-<unit bldFile="app/organizer/calendarui/group"/>
-</component>
-</collection>
-<collection name="meetingui" long-name="Meeting UI" level="ui">
-<component name="attendeeview" filter="s60" long-name="Attendee View">
-<unit bldFile="app/organizer/meetingui/attendeeview/group"/>
-</component>
-<component name="agnentryui" filter="s60" long-name="Agenda Entry UI" plugin="Y">
-<unit bldFile="app/organizer/meetingui/agnentryui/group"/>
-</component>
-<component name="meetingrequestutils" filter="s60" long-name="Meeting Request Utils">
-<unit bldFile="app/organizer/meetingui/meetingrequestutils/group"/>
-</component>
-<component name="meetingrequestviewers" filter="s60" long-name="Meeting Request Viewers" plugin="Y">
-<unit bldFile="app/organizer/meetingui/meetingrequestviewers/group"/>
-</component>
-<component name="meetingui_build" filter="s60" long-name="Meeting UI Build">
-<!-- split contents into separate components -->
-<unit bldFile="app/organizer/meetingui/group"/>
-</component>
-</collection>
-<collection name="clock2" long-name="Clock" level="app">
-<component name="clockengines" filter="s60" long-name="Clock Engines">
-<unit bldFile="app/organizer/clock2/clockengines/group"/>
-</component>
-<component name="clockui" filter="s60" long-name="Clock UI">
-<unit bldFile="app/organizer/clock2/clockui/group"/>
-</component>
-<component name="clock2_help" filter="s60" long-name="Clock Help">
-<unit bldFile="app/organizer/clock2/help/group"/>
-</component>
-<component name="clock2_build" filter="s60" long-name="Clock Build">
-<!-- split contents into separate components, or just make this one component -->
-<unit bldFile="app/organizer/clock2/group"/>
-</component>
-</collection>
-<collection name="notepad" long-name="Notepad" level="ui">
-<component name="notepad_help" filter="s60" long-name="Notepad Help">
-<unit bldFile="app/organizer/notepad/help/group"/>
-</component>
-<component name="notepad1" filter="s60" long-name="Notepad Application 1">
-<unit bldFile="app/organizer/notepad/notepad1/group"/>
-</component>
-<component name="txtrecog" filter="s60" long-name="Text Recognizer" plugin="Y">
-<unit bldFile="app/organizer/notepad/txtrecog/group"/>
-</component>
-</collection>
-<collection name="searchui" long-name="Search UI" level="app">
-<!-- consider making this a single component -->
-<!-- Uncomment all units when configuration is in place. All currently #included from searchui_build, which should be removed at the same time. -->
-<component name="searchui_help" filter="s60" long-name="Search UI Help" class="placeholder">
-<!--<unit bldFile="searchui/help/group"/>-->
-</component>
-<component name="searchapp" filter="s60" long-name="Search Application" class="placeholder">
-<!--<unit bldFile="searchui/searchapp/group"/>-->
-</component>
-<component name="searchui_build" filter="s60" long-name="Search UI Build">
-<unit bldFile="app/organizer/searchui/group"/>
-</component>
-</collection>
-<collection name="pimappservices" long-name="PIM Application Services" level="services">
-<component name="calendar" long-name="Calendar" introduced="9.2" purpose="optional">
-<unit bldFile="app/organizer/pimappservices/calendar/group" mrp="app/organizer/pimappservices/calendar/group/app-engines_calendar.mrp" version="2"/>
-</component>
-<component name="calendarvcalplugin" long-name="Calendar vCal Plugin" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="app/organizer/pimappservices/calendarvcalplugin/group" mrp="app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp" version="2"/>
-</component>
-<component name="appenginesdocs" long-name="Application Engines Documentation" purpose="development" class="doc">
-<unit mrp="app/organizer/pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
-</component>
-</collection>
-<collection name="pimappsupport" long-name="PIM Application Support" level="support">
-<component name="vcardandvcal" long-name="vCard and vCal" introduced="ER5" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/vcardandvcal/group" mrp="app/organizer/pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
-</component>
-<component name="chinesecalendarconverter" long-name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
-</component>
-<component name="chinesecalendaralg" long-name="Chinese Calendar Algorithm" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendaralg/group" mrp="app/organizer/pimappsupport/chinesecalendaralg/group/app-services_chinesecalendaralgorithm.mrp"/>
-</component>
-</collection>
-<collection name="organizer_info" long-name="Organizer Application Suite Info" level="app">
-<component name="organizer_metadata" long-name="Organizer Application Suite Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="mail eng base ui">
-<collection name="msg_pub" long-name="Messaging Apps Public APIs" level="ui">
-<component name="messaging_integration_api" long-name="Messaging Integration API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/messaging_integration_api/group"/>
-</component>
-<component name="plugin_bio_control_api" long-name="Plug-in Bio Control API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/plugin_bio_control_api/group"/>
-</component>
-<component name="mms_client_mtm_api" long-name="MMS Client MTM API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/mms_client_mtm_api/group"/>
-</component>
-<component name="open_new_message_notification_api" long-name="Open New Message Notification API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/open_new_message_notification_api/group"/>
-</component>
-<component name="messaging_editor_constants_api" long-name="Messaging Editor Constants API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/messaging_editor_constants_api/group"/>
-</component>
-</collection>
-<collection name="msg_plat" long-name="Messaging Apps Platform APIs" level="ui">
-<component name="smil_player_launch_api" long-name="SMIL Player Launch API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/smil_player_launch_api/group"/>
-</component>
-<component name="messaging_media_resolver_api" long-name="Messaging Media Resolver API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/messaging_media_resolver_api/group"/>
-</component>
-<component name="smil_engine_api" long-name="SMIL Engine API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/smil_engine_api/group"/>
-</component>
-<component name="mms_server_settings_api" long-name="MMS Server Settings API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_server_settings_api/group"/>
-</component>
-<component name="new_contacts_note_secondary_display_api" long-name="New Contacts Note Secondary Display API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contacts_note_secondary_display_api/group"/>
-</component>
-<component name="messaging_center_ui_utilities_api" long-name="Messaging Center UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/messaging_center_ui_utilities_api/group"/>
-</component>
-<component name="internet_mail_mtm_ui_api" long-name="Internet Mail MTM UI API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/internet_mail_mtm_ui_api/group"/>
-</component>
-<component name="messaging_editor_api" long-name="Messaging Editor API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/messaging_editor_api/group"/>
-</component>
-<component name="email_domain_utilities_api" long-name="Email Domain Utilities API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/email_domain_utilities_api/group"/>
-</component>
-<component name="smil_transition_api" long-name="SMIL Transition API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/smil_transition_api/group"/>
-</component>
-<component name="new_contacts_note_status_api" long-name="New Contacts Note Status API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contacts_note_status_api/group"/>
-</component>
-<component name="unified_editor_video_conversion_api" long-name="Unified Editor Video Conversion API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/unified_editor_video_conversion_api/group"/>
-</component>
-<component name="mms_conformance_api" long-name="MMS Conformance API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_conformance_api/group"/>
-</component>
-<component name="new_contacts_note_variables_api" long-name="New Contacts Note Variables API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contacts_note_variables_api/group"/>
-</component>
-<component name="new_message_notification_api" long-name="New Message Notification API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_message_notification_api/group"/>
-</component>
-<component name="mms_application_api" long-name="MMS Application API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_application_api/group"/>
-</component>
-<component name="mms_engine_settings_api" long-name="MMS Engine Settings API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_engine_settings_api/group"/>
-</component>
-<component name="mms_codec_client_api" long-name="MMS Codec Client API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_codec_client_api/group"/>
-</component>
-<component name="send_ui_meeting_request_api" long-name="Send UI Meeting Request API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/send_ui_meeting_request_api/group"/>
-</component>
-<component name="new_contact_notes_extended_api" long-name="New Contact Notes Extended API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contact_notes_extended_api/group"/>
-</component>
-<component name="mail_ui_constants_api" long-name="Mail UI Constants API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mail_ui_constants_api/group"/>
-</component>
-<component name="sim_dialog_launch_api" long-name="SIM Dialog Launch API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/sim_dialog_launch_api/group"/>
-</component>
-</collection>
-<collection name="mobilemessaging" long-name="Mobile Messaging" level="ui">
-<component name="audiomsg" filter="s60" long-name="Audio Message">
-<unit bldFile="app/messaging/mobilemessaging/audiomsg/group"/>
-</component>
-<component name="msgmedia" filter="s60" long-name="Message Media">
-<unit bldFile="app/messaging/mobilemessaging/msgmedia/group"/>
-</component>
-<component name="unieditor" filter="s60" long-name="Unified Editor">
-<unit bldFile="app/messaging/mobilemessaging/unieditor/group"/>
-</component>
-<component name="mmsui" filter="s60" long-name="MMS UI">
-<unit bldFile="app/messaging/mobilemessaging/mmsui/group"/>
-</component>
-<component name="postcard" filter="s60" long-name="Postcard">
-<unit bldFile="app/messaging/mobilemessaging/postcard/group"/>
-</component>
-<component name="smilui" filter="s60" long-name="SMIL UI">
-<unit bldFile="app/messaging/mobilemessaging/smilui/group"/>
-</component>
-<component name="smum" filter="s60" long-name="SMS UI MTM and UI Data MTM" plugin="Y">
-<unit bldFile="app/messaging/mobilemessaging/smum/group"/>
-</component>
-<component name="smsui" filter="s60" long-name="SMS UI">
-<unit bldFile="app/messaging/mobilemessaging/smsui/group"/>
-</component>
-<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/mobilemessaging/smsmtm/group" mrp="app/messaging/mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
-</component>
-</collection>
-<collection name="mmsengine" long-name="MMS Engine" level="eng">
-<component name="mmsconninit" filter="s60" long-name="MMS Connection Initiator" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsconninit/bld"/> -->
-</component>
-<component name="genutils" filter="s60" long-name="General Utils" class="placeholder">
-<!-- <unit bldFile="mmsengine/genutils/bld"/> -->
-</component>
-<component name="mmsserversettings" filter="s60" long-name="MMS Server Settings" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserversettings/bld"/> -->
-</component>
-<component name="mmsmessage" filter="s60" long-name="MMS Message" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsmessage/bld"/> -->
-</component>
-<component name="mmshttptransport" filter="s60" long-name="MMS HTTP Transport" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmshttptransport/bld"/> -->
-</component>
-<component name="mmscodec" filter="s60" long-name="MMS Codec" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodec/bld"/> -->
-</component>
-<component name="mmsserver" filter="s60" long-name="MMS Server" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserver/bld"/> -->
-</component>
-<component name="clientmtm" filter="s60" long-name="MMS Client MTM" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/clientmtm/bld"/> -->
-</component>
-<component name="mmswatcher" filter="s60" long-name="MMS Watcher" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmswatcher/bld"/> -->
-</component>
-<component name="mmspushhandler" filter="s60" long-name="MMS Push Handler" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmspushhandler/bld"/> -->
-</component>
-<component name="applicationadapter" filter="s60" long-name="MMS Application Adapter" class="placeholder">
-<!-- <unit bldFile="mmsengine/applicationadapter/bld"/> -->
-</component>
-<component name="mmscodecclient" filter="s60" long-name="MMS Codec Client" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodecclient/bld"/> -->
-</component>
-<component name="mmssettings" long-name="MMS Settings" introduced="9.2" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmssettings/group" mrp="app/messaging/mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
-</component>
-<component name="mmsconf" long-name="MMS Configuration" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmsconf" mrp="app/messaging/mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
-</component>
-<component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
-<!-- this bld.inf should be broken up into the individual other components -->
-<unit bldFile="app/messaging/mmsengine/group"/>
-</component>
-</collection>
-<collection name="messagingappbase" long-name="Messaging App Base" level="base">
-<component name="msgavkon" filter="s60" long-name="Messaging Avkon UI">
-<unit bldFile="app/messaging/messagingappbase/msgavkon/group"/>
-</component>
-<component name="mce" filter="s60" long-name="Message Center Application">
-<unit bldFile="app/messaging/messagingappbase/mce/group"/>
-</component>
-<component name="mceextraitems" filter="s60" long-name="Message Center Extra Items">
-<unit bldFile="app/messaging/messagingappbase/mceextraitems/group"/>
-</component>
-<component name="mcesettings" filter="s60" long-name="Message Center Settings">
-<unit bldFile="app/messaging/messagingappbase/mcesettings/group"/>
-</component>
-<component name="msgerrorwatcher" filter="s60" long-name="Messaging Error Watcher" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/msgerrorwatcher/group"/>
-</component>
-<component name="ncnlist" filter="s60" long-name="New Contacts Note List">
-<unit bldFile="app/messaging/messagingappbase/ncnlist/group"/>
-</component>
-<component name="schemeplugin" filter="s60" long-name="Scheme Handler Plugin" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/schemeplugin/group"/>
-</component>
-<component name="sendui" filter="s60" long-name="Send UI" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/sendui/group"/>
-</component>
-<component name="smilengine" filter="s60" long-name="SMIL Engine">
-<unit bldFile="app/messaging/messagingappbase/smilengine/group"/>
-</component>
-<component name="bium" filter="s60" long-name="BIO UI MTM" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/bium/group"/>
-</component>
-<component name="smartmessaging" filter="s60" long-name="Smart Messaging">
-<unit bldFile="app/messaging/messagingappbase/smartmessaging/group"/>
-</component>
-<component name="msgeditor" filter="s60" long-name="Messaging Editor">
-<unit bldFile="app/messaging/messagingappbase/msgeditor/group"/>
-</component>
-<component name="smilparser" long-name="SMIL Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="app/messaging/messagingappbase/smilparser/GROUP" mrp="app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
-</component>
-<component name="obexmtms" long-name="OBEX MTMs" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/obexmtms/Group" mrp="app/messaging/messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
-</component>
-</collection>
-<collection name="email" long-name="Email" level="mail">
-<!-- use commonemail instead -->
-<component name="alwaysonlineemailplugin" filter="s60" long-name="Always Online Mail Plugin" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/alwaysonlineemailplugin/group"/>
-</component>
-<component name="emailnotificationhandler" filter="s60" long-name="Email Notification Handler" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/emailnotificationhandler/group"/>
-</component>
-<component name="imum" filter="s60" long-name="Internet Mail UI MTM" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/imum/group"/>
-</component>
-<component name="mail" filter="s60" long-name="Mail Application" deprecated="^3">
-<unit bldFile="app/messaging/email/mail/group"/>
-</component>
-<component name="pop3andsmtpmtm" long-name="POP3 and SMTP MTM" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/pop3andsmtpmtm/group" mrp="app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
-</component>
-<component name="imap4mtm" long-name="IMAP4 MTM" introduced="9.2" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/imap4mtm/group" mrp="app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
-</component>
-</collection>
-<collection name="messaging_info" long-name="Messaging Apps Info" level="ui">
-<component name="messaging_metadata" long-name="Messaging Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commonemail" level="apps" span="2" long-name="Email Apps" levels="service support ui app">
-<collection name="email_pub" long-name="Email Apps Public Interfaces" level="app">
-<component name="email_widget_api" long-name="Email Widget API" filter="s60" class="api">
-<unit bldFile="app/commonemail/email_pub/email_widget_api/group"/>
-</component>
-</collection>
-<collection name="email_plat" long-name="Email Apps Platform Interfaces" level="app">
-<component name="email_client_api" long-name="Email Client API" filter="s60" class="api">
-<unit bldFile="app/commonemail/email_plat/email_client_api/group"/>
-</component>
-<component name="email_setup_plugin_api" long-name="Email Setup Plugin API" filter="s60" class="api">
-<unit bldFile="app/commonemail/email_plat/email_setup_plugin_api/group"/>
-</component>
-</collection>
-<collection name="emailservices" long-name="Email Services" level="service">
-<component name="emailframework" filter="s60" long-name="Email Framework" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailframework/group"/>
-</component>
-<component name="emailclientapi" filter="s60" long-name="Email Client API" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailclientapi/group"/>
-</component>
-<component name="emailserver" filter="s60" long-name="Email Server" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailserver/group"/>
-</component>
-<component name="emailservermonitor" filter="s60" long-name="Email Server Monitor" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailservermonitor/group"/>
-</component>
-<component name="psmruadapter" filter="s60" long-name="Predictive Search Most Recent Used Adapter" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailservices/psmruadapter/group"/>
-</component>
-<component name="emailstore" filter="s60" long-name="Email Store" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailstore/group"/>
-</component>
-<component name="emaildebug" filter="s60" long-name="Email Debug" introduced="^2" class="api">
-<unit bldFile="app/commonemail/emailservices/emaildebug/group"/>
-</component>
-<component name="emailinstallationinitiator" filter="s60" long-name="Email Installation Initiator" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailinstallationinitiator/group"/>
-</component>
-</collection>
-<collection name="ipsservices" long-name="IMAP/POP/SMTP Services" level="service">
-<component name="ipssossettings" filter="s60" long-name="IPS SOS Settings" introduced="^2">
-<!-- SOS? Consider spelling it out since the abbreviation is ambiguous -->
-<unit bldFile="app/commonemail/ipsservices/ipssossettings/group"/>
-</component>
-<component name="ipssosplugin" filter="s60" long-name="IPS SOS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/ipsservices/ipssosplugin/group"/>
-</component>
-<component name="ipssosaoplugin" filter="s60" long-name="IPS SOS Always Online Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/ipsservices/ipssosaoplugin/group"/>
-</component>
-<component name="ipsservices_build" filter="s60" long-name="IPS Services Build" introduced="^2">
-<unit bldFile="app/commonemail/ipsservices/group"/>
-<!-- can the exports be broken up into the other components or made a config component?-->
-</component>
-</collection>
-<collection name="emailcontacts" long-name="Email Contacts" level="support">
-<component name="contactactionservice" filter="s60" long-name="Contact Action Service" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailcontacts/contactactionservice/group"/>
-</component>
-<component name="contactactionmenu" filter="s60" long-name="Contact Action Menu" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailcontacts/contactactionmenu/group"/>
-</component>
-</collection>
-<collection name="meetingrequest" long-name="Meeting Request" level="ui">
-<component name="mrcommon" filter="s60" long-name="MR Common" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrcommon/group"/>
-</component>
-<component name="mrdb" filter="s60" long-name="MR Database" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrdb/group"/>
-</component>
-<component name="mrpolicy" filter="s60" long-name="MR Policy" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrpolicy/group"/>
-</component>
-<component name="mrservices" filter="s60" long-name="MR Services" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrservices/group"/>
-</component>
-<component name="mrgui" filter="s60" long-name="MR GUI" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrgui/group"/>
-</component>
-<component name="mrentry" filter="s60" long-name="MR Entry" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrentry/group"/>
-</component>
-<component name="mrtasks" filter="s60" long-name="MR Tasks" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrtasks/group"/>
-</component>
-<component name="mrutils" filter="s60" long-name="MR Utils" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrutils/group"/>
-</component>
-<component name="mrutilscalplugin" filter="s60" long-name="MR Utils Calendar Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mrutilscalplugin/group"/>
-</component>
-<component name="mrviewer" filter="s60" long-name="MR Viewer" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrviewer/group"/>
-</component>
-<component name="mrviewercalplugin" filter="s60" long-name="MR Viewer Calendar Plugin" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrviewercalplugin/group"/>
-</component>
-<component name="mricalviewer" filter="s60" long-name="MR iCal Viewer" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mricalviewer/group"/>
-</component>
-<component name="mrversit2" filter="s60" long-name="MR Versit2" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrversit2/group"/>
-</component>
-<component name="mragnversit2" filter="s60" long-name="MR Agenda Versit2" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mragnversit2/group"/>
-</component>
-<component name="mrcasplugin" filter="s60" long-name="MR Contact Action Service Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mrcasplugin/group"/>
-</component>
-<component name="mrurlparserplugin" filter="s60" long-name="MR URL Parser Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mrurlparserplugin/group"/>
-</component>
-<component name="meetingrequest_build" filter="s60" long-name="MR Build" introduced="^2">
-<!-- can the exports be broken up into the other components ?
- alternatively, move the exports into a RM Config component-->
-<unit bldFile="app/commonemail/meetingrequest/group"/>
-</component>
-</collection>
-<collection name="emailuis" long-name="Email UIs" level="app">
-<component name="emailui" filter="s60" long-name="Email UI" introduced="^2">
-<unit bldFile="app/commonemail/emailuis/emailui/group"/>
-</component>
-<component name="gsemailsettings" filter="s60" long-name="Email GS Settings" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailuis/gsemailsettings/group"/>
-</component>
-<component name="uicomponents" filter="s60" long-name="Email UI Components" introduced="^2">
-<unit bldFile="app/commonemail/emailuis/uicomponents/group"/>
-</component>
-<component name="widget" filter="s60" long-name="Email Widget" introduced="^2">
-<!-- Uncomment unit when configuration is in place. Currently #included from emailuis_build, which should be removed at the same time. -->
-<!--<unit bldFile="emailuis/widget/group"/>-->
-</component>
-<component name="emailuis_build" filter="s60" long-name="Email UIs Build" introduced="^2">
-<unit bldFile="app/commonemail/emailuis/group"/>
-</component>
-</collection>
-<collection name="commonemail_info" long-name="Email Apps Info" level="app">
-<component name="emailhelp" filter="s60" long-name="Email Help" class="placeholder">
-<!-- should this be commented out or not? -->
-<!-- <unit bldFile="emailhelp/group"/> -->
-</component>
-<component name="commonemail_help" filter="s60" long-name="Email Help" introduced="^2" class="placeholder">
-<!-- should this be commented out or not? -->
-<!-- <unit bldFile="help/group"/> -->
-</component>
-</collection>
-</block>
-<block name="conversations" level="apps" long-name="Conversation Apps" levels="settings utils plugin ui">
-<collection name="conversations_plat" long-name="Conversation Apps Platform Interfaces" level="ui">
-<component name="im_cv_launcher_api" long-name="IM CV Launcher API" filter="s60" class="api">
-<unit bldFile="app/conversations/conversations_plat/im_cv_launcher_api/group"/>
-</component>
-<component name="im_connection_api" long-name="IM Connection API" filter="s60" class="api">
-<unit bldFile="app/conversations/conversations_plat/im_connection_api/group"/>
-</component>
-<component name="im_cv_appui_api" long-name="IM CV App UI API" filter="s60" class="api">
-<unit bldFile="app/conversations/conversations_plat/im_cv_appui_api/group"/>
-</component>
-</collection>
-<collection name="uiservicetabsettings" long-name="UI Service Tab Settings" level="settings">
-<!-- this is really at the wrong rank. should move down a directory -->
-<component name="vimpstsettings" filter="s60" long-name="VIMP Service Tab Settings">
-<unit bldFile="app/conversations/uiservicetabsettings/group"/>
-</component>
-</collection>
-<collection name="instantmessagesalert" long-name="Instant Messages Alert" level="utils">
-<!-- this is really at the wrong rank. should move down a directory -->
-<component name="instantmessagesalert_build" filter="s60" long-name="Instant Messages Alert build" introduced="^3">
-<unit bldFile="app/conversations/instantmessagesalert/group"/>
-</component>
-</collection>
-<collection name="imstutils" long-name="IM Service Tab Utils" level="utils">
-<component name="imstutils_help" filter="s60" long-name="IM Service Tab Help">
-<unit bldFile="app/conversations/imstutils/help/group"/>
-</component>
-<component name="imconnectionprovider" filter="s60" long-name="IM Connection Provider" plugin="Y">
-<unit bldFile="app/conversations/imstutils/imconnectionprovider/group"/>
-</component>
-<component name="xmppadapter" filter="s60" long-name="XMPP Settings Adapter" plugin="Y">
-<unit bldFile="app/conversations/imstutils/xmppadapter/group"/>
-</component>
-<component name="imconversationview" filter="s60" long-name="IM Conversation View">
-<unit bldFile="app/conversations/imstutils/imconversationview/group"/>
-</component>
-<component name="imstutils_config" filter="s60" long-name="IM Service Tab Utils config" class="config">
-<!-- remove the #includes and or moved ithe loc file into one the above components -->
-<unit bldFile="app/conversations/imstutils/group"/>
-</component>
-</collection>
-<collection name="uiservicetab" long-name="UI Service Tab" level="ui">
-<component name="vimpstutils" filter="s60" long-name="VIMP Service Tab Utilities">
-<!-- need to spell out VIMP at least once -->
-<unit bldFile="app/conversations/uiservicetab/vimpstutils/group"/>
-</component>
-<component name="vimpststorage" filter="s60" long-name="VIMP Service Tab Storage">
-<unit bldFile="app/conversations/uiservicetab/vimpststorage/group"/>
-</component>
-<component name="vimpstengine" filter="s60" long-name="VIMP Service Tab Engine">
-<unit bldFile="app/conversations/uiservicetab/vimpstengine/group"/>
-</component>
-<component name="vimpstcmdprocess" filter="s60" long-name="VIMP Service Tab Command Process">
-<unit bldFile="app/conversations/uiservicetab/vimpstcmdprocess/group"/>
-</component>
-<component name="vimpstui" filter="s60" long-name="VIMP Service Tab UI">
-<unit bldFile="app/conversations/uiservicetab/vimpstui/group"/>
-</component>
-<component name="vimpstdetailsviewplugin" filter="s60" long-name="VIMP ST Details View Plugin" plugin="Y">
-<unit bldFile="app/conversations/uiservicetab/vimpstdetailsviewplugin/group"/>
-</component>
-<component name="uiservicetab_build" filter="s60" long-name="UI Service Tab Build">
-<!-- can this be distributed into the above bld.infs? -->
-<unit bldFile="app/conversations/uiservicetab/group"/>
-</component>
-</collection>
-<collection name="servicewidget" long-name="Service Widget" level="ui">
-<component name="servicewidgetdatapublisher" filter="s60" long-name="Service Widget Data Publisher" plugin="Y">
-<unit bldFile="app/conversations/servicewidget/servicewidgetdatapublisher/group"/>
-</component>
-<component name="themes" filter="s60" long-name="Service Widget Themes" class="config">
-<!-- does this really need to have that number in the directory name? -->
-<unit bldFile="app/conversations/servicewidget/themes/install-themes/install/servicewidget_20021383/group"/>
-</component>
-<component name="servicewidget_build" filter="s60" long-name="Service Widget Build">
-<!-- Either move the whole collection down one directory into a single component, or move the ROM and SIS parts into a Service Widget ROM component -->
-<unit bldFile="app/conversations/servicewidget/group"/>
-</component>
-</collection>
-<collection name="instantmsgindicatorplugin" long-name="Instant Message Indicator Plugin" level="plugin">
-<!-- collection is really a component. should move down a directory -->
-<component name="instantmsgindicatorplugin_build" filter="s60" long-name="Instant Message Indicator Plugin Build" introduced="^3" plugin="Y">
-<unit bldFile="app/conversations/instantmsgindicatorplugin/group"/>
-</component>
-</collection>
-<collection name="imstatuspaneindicatorplugin" long-name="IM Status Pane Indicator Plugin" level="plugin">
-<!-- collection is really a component. should move down a directory -->
-<component name="imstatuspaneindicatorplugin_build" filter="s60" long-name="IM Status Pane Indicator Plugin Build" introduced="^3" plugin="Y">
-<unit bldFile="app/conversations/imstatuspaneindicatorplugin/group"/>
-</component>
-</collection>
-<collection name="conversations_info" long-name="Conversation Apps Info" level="ui">
-<component name="conversations_build" filter="s60" long-name="Conversation Apps Build">
-<!-- can the exports be moved to other components? or this remade into a configuration component?-->
-<unit bldFile="app/conversations/group"/>
-</component>
-</collection>
-</block>
-<block name="im" level="apps" long-name="Instant Messaging Apps" levels="support prot engine apps">
-<collection name="im_plat" long-name="Instant Messaging Apps Platform Interfaces" level="apps">
-<component name="wv_sap_settings_api" long-name="WV SAP Settings API" filter="s60" class="api">
-<unit bldFile="app/im/im_plat/wv_sap_settings_api/group"/>
-</component>
-</collection>
-<collection name="wvsettings20" long-name="Wireless Village Settings Engine" level="support">
-<!-- this is really a component. should move down a directory -->
-<component name="wvsapsettingsstore" long-name="WV SAP Settings Store" filter="s60" introduced="9.3">
-<unit bldFile="app/im/wvsettings20/group"/>
-</component>
-</collection>
-</block>
-<block name="dictionary" level="services" long-name="Dictionary" levels="utils ui">
-<collection name="dictionary_plat" long-name="Dictionary Platform Interfaces" level="ui">
-<component name="menu_suites_macros_api" long-name="Menu Suites Macros API" filter="s60" class="api">
-<unit bldFile="app/dictionary/dictionary_plat/menu_suites_macros_api/group"/>
-</component>
-</collection>
-<collection name="userdict" long-name="User Dictionary" level="ui">
-<!-- collection is really a component, move down a dir -->
-<component name="userdict_build" filter="s60" long-name="Japanese User Dictionary">
-<unit bldFile="app/dictionary/userdict/group"/>
-</component>
-</collection>
-</block>
-<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"/>
-</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"/>
-</component>
-</collection>
-<collection name="camerauis" long-name="Camera UIs">
-<component name="activepalette" filter="s60" long-name="Active Palette">
-<unit bldFile="app/camera/camerauis/activepalette/group"/>
-</component>
-<component name="cameraapp" filter="s60" long-name="Camera Application">
-<unit bldFile="app/camera/camerauis/cameraapp/group"/>
-<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">
-<component name="image_editor_debug_utilities_api" long-name="Image Editor Debug Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
-</component>
-<component name="image_editor_utilities_api" long-name="Image Editor Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_utilities_api/group"/>
-</component>
-<component name="image_editor_definitions_api" long-name="Image Editor Definitions API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_definitions_api/group"/>
-</component>
-<component name="image_editor_system_parameters_api" long-name="Image Editor System Parameters API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_system_parameters_api/group"/>
-</component>
-<component name="image_processing_engine_api" long-name="Image Processing Engine API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_processing_engine_api/group"/>
-</component>
-</collection>
-<collection name="imageeditor" long-name="Image Editor UI" level="ui">
-<component name="pb" filter="s60" long-name="Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/pb/group"/>
-</component>
-<component name="iepb" filter="s60" long-name="Image Editor Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/iepb/group"/>
-</component>
-<component name="imageeditorui" filter="s60" long-name="Image Editor UI">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorui/group"/>
-</component>
-<component name="imageeditormanager" filter="s60" long-name="Image Editor Manager">
-<unit bldFile="app/imgeditor/imageeditor/imageeditormanager/group"/>
-</component>
-<component name="imageeditorapp" filter="s60" long-name="Image Editor Application">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorapp/group"/>
-</component>
-<component name="imageeditor_plugins" filter="s60" long-name="Image Editor Plugins" plugin="Y">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditor/plugins/blackwhiteplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/brightnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/bubbleplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cartoonizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/clipartplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/contrastplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cropplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/drawplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/frameplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/negativeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/redeyeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/resizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotatelplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotaterplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/textplugin/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditor/plugins/drawplugin/group"/>
- -->
-</component>
-<component name="editorprovider" filter="s60" long-name="Image Editor Provider">
-<unit bldFile="app/imgeditor/imageeditor/editorprovider/group"/>
-</component>
-<component name="imageeditor_build" filter="s60" long-name="Image Editor Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditor/group"/>
-</component>
-</collection>
-<collection name="imageeditorengine" long-name="Image Editor Engine" level="engine">
-<component name="filters" filter="s60" long-name="Image Editor Filters">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbrightness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbubble/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbuffer/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercartoon/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterclipart/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercontrast/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercrop/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterdraw/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterframe/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtergrayscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtericlsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegtarget/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filternegate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterredeye/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterrotate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtertext/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
- -->
-</component>
-<component name="imageeditorutils" filter="s60" long-name="Image Editor Utilities">
-<unit bldFile="app/imgeditor/imageeditorengine/imageeditorutils/group"/>
-</component>
-<component name="systemparameters" filter="s60" long-name="System Parameters">
-<unit bldFile="app/imgeditor/imageeditorengine/systemparameters/group"/>
-</component>
-<component name="enginewrapper" filter="s60" long-name="Image Editor Engine Wrapper">
-<unit bldFile="app/imgeditor/imageeditorengine/enginewrapper/group"/>
-</component>
-<component name="imageeditorengine_build" filter="s60" long-name="Image Editor Engine Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoeditor" level="apps" long-name="Video Editor Apps" levels="engine ui">
-<collection name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" level="ui">
-<component name="video_editor_engine_api" long-name="Video Editor Engine API" introduced="^2" class="api">
-<unit bldFile="app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
-</component>
-</collection>
-<collection name="videditor" long-name="Video Editor" level="ui">
-<component name="videoeditorcommon" filter="s60" long-name="Video Editor Common" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditorcommon/group"/>
-</component>
-<component name="videoeditoruicomponents" filter="s60" long-name="Video Editor UI Components" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditoruicomponents/group"/>
-</component>
-<component name="simplevideoeditor" filter="s60" long-name="Simple Video Editor" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplevideoeditor/group"/>
-</component>
-<component name="simplecutvideo" filter="s60" long-name="Simple Cut Video" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplecutvideo/group"/>
-</component>
-<component name="videoprovider" filter="s60" long-name="Video Provider" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoprovider/group"/>
-</component>
-<component name="manualvideoeditor" filter="s60" long-name="Manual Video Editor" introduced="^2" class="placeholder">
-<!-- uncomment when supported
- <meta rel="config">
- <defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
- </meta>
- <unit bldFile="videditor/manualvideoeditor/group"/> -->
-</component>
-<component name="videditor_build" filter="s60" long-name="Video Editor Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videditor/group"/>
-</component>
-</collection>
-<collection name="videoeditorengine" long-name="Video Editor Engine" level="engine">
-<component name="audioeditorengine" filter="s60" long-name="Audio Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/audioeditorengine/group"/>
-</component>
-<component name="avcedit" filter="s60" long-name="AVC Editing" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/avcedit/group"/>
-</component>
-<component name="h263decoder" filter="s60" long-name="H.263 Decoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/h263decoder/group"/>
-</component>
-<component name="mp3aacmaniplib" filter="s60" long-name="MP3 and AAC Manipulation Library" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
-</component>
-<component name="vedtranscoder" filter="s60" long-name="Video Editor Transcoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedtranscoder/group"/>
-</component>
-<component name="vedengine" filter="s60" long-name="Video Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedengine/group"/>
-</component>
-<component name="videoeditorengine_build" filter="s60" long-name="Video Editor Engine Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videoeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
-<collection name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" level="apps">
-<component name="videoplayer_startup_api" long-name="Video Player Startup API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videoplayer_startup_api/group" filter="!test"/>
-</component>
-<component name="video_player_file_details_dialog_api" long-name="Media Player File Details Dialog API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/video_player_file_details_dialog_api/group" filter="!test"/>
-</component>
-<component name="videocollection_api" long-name="Video Collection API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videocollection_api/group"/>
-</component>
-</collection>
-<collection name="videofeeds" long-name="Video Feeds" level="util">
-<component name="iptv_utils" filter="s60" long-name="IPTV Util" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/utils/group"/>
-</component>
-<component name="viewmessageutility" filter="s60" long-name="View Message Utility" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/viewmessageutility/group"/>
-</component>
-<component name="vcxnotifier" filter="s60" long-name="Video Connection Notifier" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/vcxnotifier/group"/>
-</component>
-<component name="vccommon" filter="s60" long-name="Video Connection Common" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/vccommon/group"/>
-</component>
-<component name="clientapi" long-name="Server Client" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/clientapi/group"/>
-</component>
-<component name="provisioningprocessor" long-name="Provisioning Processor" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/provisioningprocessor/group"/>
-</component>
-<component name="mrssplugin" long-name="RSS plugin" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/mrssplugin/group"/>
-</component>
-<component name="videofeeds_server" long-name="Server" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/server/group"/>
-</component>
-<component name="livetvutils" long-name="LiveTV Utils" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/livetvutils/group"/>
-</component>
-<component name="iptvprovisioningrecognizer" long-name="IP TV Provisioning Recognizer" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/provisioningrecognizer/group"/>
-</component>
-<component name="iptvprovisioningappui" long-name="IP TV Provisioning App UI" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/provisioningappui/group"/>
-</component>
-<component name="iptvomaprovisioning" long-name="IP TV OMA Provisioning" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/omaprovisioning/group"/>
-</component>
-<component name="vcnsuiengine" long-name="VoD UI Engine" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/vcnsuiengine/group"/>
-</component>
-<component name="hgvodui" long-name="Ganes UX2.0 VoD UI" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/hgvodui/group"/>
-</component>
-<component name="hgvodplugin" long-name="Ganes UX2.0 VoD UI Plugin" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/hgvodplugin/group"/>
-</component>
-<component name="vcnsscheduleview" long-name="Scheduled Download Settings View" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/vcnsscheduleview/group"/>
-</component>
-<component name="vcnsscheduleplugin" long-name="Scheduled Download Settings Plugin" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/vcnsscheduleplugin/group"/>
-</component>
-<component name="scheduleddlplugin" long-name="Scheduled download plugin" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/scheduleddlplugin/group"/>
-</component>
-</collection>
-<collection name="videocollection" long-name="Video Collection" level="util">
-<component name="mpxmyvideoscollection" filter="s60" long-name="MPX My Videos Collection" introduced="^3">
-<unit bldFile="app/videoplayer/videocollection/mpxmyvideoscollection/group"/>
-</component>
-<component name="myvideosindicatorplugin" filter="s60" long-name="My Videos Indicator Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videocollection/myvideosindicatorplugin/group"/>
-</component>
-<component name="hgmyvideos" filter="s60" long-name="Huriganes My Videos" introduced="^3">
-<unit bldFile="app/videoplayer/videocollection/hgmyvideos/group"/>
-</component>
-<component name="hgmyvideosplugin" filter="s60" long-name="Huriganes My VideosPlugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videocollection/hgmyvideosplugin/group"/>
-</component>
-</collection>
-<collection name="mediasettings" long-name="Media Settings" level="support">
-<!-- this is really a component. Should be moved down a directory -->
-<component name="mediasettings_build" filter="s60" long-name="Media Settings Build">
-<unit bldFile="app/videoplayer/mediasettings/group"/>
-</component>
-<component name="videoplayer_test" filter="s60" purpose="development" long-name="Video Player Apps Test">
-<!-- can only have one unit. Can thes be #included from the above or another bld.inf?-->
-<unit bldFile="app/videoplayer/tsrc/VCXTestCommon/group"/>
-<unit bldFile="app/videoplayer/tsrc/VCXTestUtilModule/group"/>
-<unit bldFile="app/videoplayer/tsrc/VCXTestMyVideosCollectionClient/group"/>
-<unit bldFile="app/videoplayer/mediasettings/mediasettingsengine/tsrc/mediasettingsenginetest/group"/>
-<unit bldFile="app/videoplayer/mediasettings/videoplayersettingsengine/tsrc/vpsettingsenginetest/group"/>
-</component>
-</collection>
-<collection name="filedetails" long-name="File Details" level="support">
-<component name="filedetailsplugin" filter="s60" long-name="File Details Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/filedetails/filedetailsplugin/group"/>
-</component>
-<component name="filedetailsdialog" filter="s60" long-name="File Details Dialog" introduced="^3">
-<unit bldFile="app/videoplayer/filedetails/filedetailsdialog/group"/>
-</component>
-</collection>
-<collection name="videoplayerapp" long-name="Video Player App" level="apps">
-<component name="lwplayer" long-name="Lightweight Player" filter="s60">
-<unit bldFile="app/videoplayer/videoplayerapp/lwplayer/group"/>
-</component>
-<component name="mpxvideoplayer" filter="s60" long-name="MPX Video Player" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayerapp/mpxvideoplayer/group" filter="!test"/>
-</component>
-</collection>
-<collection name="videoplayback" long-name="Video Playback Plugins" level="plugin">
-<component name="videohelix" long-name="Video Helix" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videohelix/group" filter="!test"/>
-</component>
-<component name="videopdlplaybackviewplugin" filter="s60" long-name="Video PDL Playback View Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videopdlplaybackviewplugin/group" filter="!test"/>
-</component>
-<component name="videoplaybackcontrols" filter="s60" long-name="Video Playback Controls" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videoplaybackcontrols/group" filter="!test"/>
-</component>
-<component name="videoplaybackviewplugin" filter="s60" long-name="Video Playback View Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videoplaybackviewplugin/group"/>
-</component>
-<component name="videoplaybackviews" filter="s60" long-name="Video Playback Views" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videoplaybackviews/group" filter="!test"/>
-</component>
-</collection>
-</block>
-<block name="photos" level="apps" long-name="Photos" levels="support fw ui app">
-<collection name="photos_plat" long-name="Photos Platform Interfaces" level="app">
-<component name="collection_plugins_api" long-name="Collection Plugins API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/collection_plugins_api/group"/>
-</component>
-<component name="controllers_collection_api" long-name="Controllers Collection API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/controllers_collection_api/group"/>
-</component>
-<component name="gallery_utilities_api" long-name="Gallery Utilities API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/gallery_utilities_api/group"/>
-</component>
-<component name="slideshow_ui_constants_api" long-name="Slideshow Ui Constants API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/slideshow_ui_constants_api/group"/>
-</component>
-<component name="views_metadatadialog_api" long-name="Views Metadata Dialog API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/views_metadatadialog_api/group"/>
-</component>
-</collection>
-<collection name="photosgallery" long-name="Photos Gallery" level="app">
-<!-- consider splitting this collection into the application itself, and the frameworks behind it -->
-<component name="photosgallery_help" filter="s60" long-name="Photos Help" introduced="^2">
-<unit bldFile="app/photos/photosgallery/help/group"/>
-</component>
-<component name="logging" filter="s60" long-name="Photos Logging" introduced="^2">
-<unit bldFile="app/photos/photosgallery/logging/group"/>
-</component>
-<component name="photosgallery_common" filter="s60" long-name="Photos Common" introduced="^2">
-<unit bldFile="app/photos/photosgallery/common/group"/>
-</component>
-<component name="photosgallery_commonui" filter="s60" long-name="Photos Common UI" introduced="^2">
-<unit bldFile="app/photos/photosgallery/commonui/group"/>
-</component>
-<component name="photosgalleryollectionfw" filter="s60" long-name="Photos Collection Framework" introduced="^2">
-<unit bldFile="app/photos/photosgallery/collectionframework/group"/>
-</component>
-<component name="galleryicons" filter="s60" long-name="Photos Icons" introduced="^2" class="config">
-<unit bldFile="app/photos/photosgallery/icons"/>
-</component>
-<component name="imageviewer" filter="s60" long-name="Image Viewer" introduced="^3">
-<!-- this is really a part of controllers component, #include from there instead -->
-<unit bldFile="app/photos/photosgallery/controllers/imageviewer/group"/>
-</component>
-<component name="photosgalleryviewfw" filter="s60" long-name="View Framework" introduced="^2">
-<unit bldFile="app/photos/photosgallery/viewframework/group"/>
-</component>
-<component name="controllers" filter="s60" long-name="Photos Controllers" introduced="^2">
-<unit bldFile="app/photos/photosgallery/controllers/group"/>
-</component>
-<component name="photogallery" filter="s60" long-name="Media Gallery" introduced="^2">
-<unit bldFile="app/photos/photosgallery/gallery/group"/>
-</component>
-<component name="slideshow" filter="s60" long-name="Slideshow" introduced="^2">
-<unit bldFile="app/photos/photosgallery/slideshow/group"/>
-</component>
-<component name="memoryplugin" long-name="Memory Plugin" filter="s60" introduced="^2" plugin="Y">
-<unit bldFile="app/photos/photosgallery/memoryplugin/group"/>
-</component>
-<component name="imgvwr" filter="s60" long-name="Photos Image Viewer" introduced="^3">
-<unit bldFile="app/photos/photosgallery/imgvwr/group"/>
-</component>
-<component name="photosgallery_build" filter="s60" long-name="Photos Gallery Build" introduced="^2">
-<!-- need to remove the #included above bld.infs from this -->
-<unit bldFile="app/photos/photosgallery/group"/>
-</component>
-</collection>
-</block>
-<block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support hs app">
-<collection name="musicplayer_plat" long-name="Music Player Apps Platform Interfaces" level="app">
-<component name="mpx_music_player_app_api" long-name="MPX Music Player App API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_app_api/group"/>
-</component>
-<component name="mpx_music_player_commonui_api" long-name="MPX Music Player Common UI API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_commonui_api/group"/>
-</component>
-<component name="mpx_music_player_media_key_handler_api" long-name="MPX Music Player Media Key Handler API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_media_key_handler_api/group"/>
-</component>
-<component name="mpx_music_player_remote_control_api" long-name="MPX Music Player Remote Control API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_remote_control_api/group"/>
-</component>
-<component name="mpx_music_shop_ui_api" long-name="MPX Music Shop UI API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_shop_ui_api/group"/>
-</component>
-<component name="mpx_music_wap_adapter_cenrep_api" long-name="MPX Music Wap Adapter CenRep API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_wap_adapter_cenrep_api/group"/>
-</component>
-<component name="mpx_music_store_api" long-name="MPX Music Store Find API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_store_api/group"/>
-</component>
-<component name="audio_application_features_api" long-name="Audio Application Features API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/audio_application_features_api/group"/>
-</component>
-<component name="music_content_publisher_plugin_api" long-name="Music Content Publisher Plugin API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/music_content_publisher_plugin_api/group"/>
-</component>
-</collection>
-<collection name="mpxmusicplayer" long-name="MPX Music Player" level="app">
-<component name="mpxmusicplayer_help" filter="s60" long-name="Help">
-<unit bldFile="app/musicplayer/mpxmusicplayer/help/group"/>
-</component>
-<component name="mpxmusicplayer_commonui" filter="s60" long-name="MPX Common UI">
-<unit bldFile="app/musicplayer/mpxmusicplayer/commonui/group"/>
-</component>
-<component name="mpx_metadatahandler" filter="s60" long-name="MPX Metadata Handler">
-<unit bldFile="app/musicplayer/mpxmusicplayer/metadatahandler/group"/>
-</component>
-<component name="mediakeyhandler" filter="s60" long-name="MPX Media Key Handler">
-<unit bldFile="app/musicplayer/mpxmusicplayer/mediakeyhandler/group"/>
-</component>
-<component name="mpxmusicplayer_app" filter="s60" long-name="MPX Application">
-<unit bldFile="app/musicplayer/mpxmusicplayer/app/group"/>
-</component>
-<component name="mpxmusicplayer_build" filter="s60" long-name="MPX Music Player Build">
-<!-- can the exports be distributed to the above components? -->
-<unit bldFile="app/musicplayer/mpxmusicplayer/group"/>
-</component>
-</collection>
-<collection name="musichomescreen_multiview" long-name="Music Home Screen Multiview" level="hs">
-<!-- Uncomment all units when configuration is in place. All currently #included from musichomescreen_build -->
-<component name="mpxcollectionpublisher" filter="s60" long-name="MPX Collection Publisher" introduced="^2" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/mpxcollectionpublisher/group"/>-->
-</component>
-<component name="musiccontentpublisher" filter="s60" long-name="Music Content Publisher" introduced="^2" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/musiccontentpublisher/group"/>-->
-</component>
-<component name="mcpmusicplayer" filter="s60" long-name="Music Player MCP Plugin" introduced="^2" plugin="Y" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/mcpmusicplayer/group"/>-->
-</component>
-<component name="musicplayeractionhandlerplugin" filter="s60" long-name="Music Player Action Handler Plugin" introduced="^2" plugin="Y" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/musicplayeractionhandlerplugin/group"/>-->
-</component>
-<component name="mpx_data" filter="s60" long-name="MPX Data" introduced="^2" class="placeholder">
-<!-- does this make sense to be a component? should it just be #include from musichomescreen_multiview/group? -->
-<!--<unit bldFile="musichomescreen_multiview/data/themes/default/group"/>-->
-</component>
-<component name="musichomescreen_build" filter="s60" long-name="Music Homescreen Multiview Build" introduced="^2">
-<unit bldFile="app/musicplayer/musichomescreen_multiview/group"/>
-</component>
-</collection>
-<collection name="mpxplugins" long-name="MPX Plugins" level="plugins">
-<component name="serviceplugins" filter="s60" long-name="MPX Service Plugins" plugin="Y">
-<unit bldFile="app/musicplayer/mpxplugins/serviceplugins/group"/>
-</component>
-<component name="viewplugins" filter="s60" long-name="MPX View Plugins" plugin="Y">
-<unit bldFile="app/musicplayer/mpxplugins/viewplugins/group"/>
-</component>
-<component name="mpxplugins_build" filter="s60" long-name="MPX Plugins Build">
-<!-- can the exports be distributed to the above components? -->
-<unit bldFile="app/musicplayer/mpxplugins/group"/>
-</component>
-</collection>
-<collection name="musicplayer_info" long-name="Music Player Apps Info" level="app">
-<component name="musicplayer_build" filter="s60" long-name="Music Player Build">
-<!-- should explicitly #inlcude musicplayerbldvariant.hrh in each component -->
-<unit bldFile="app/musicplayer/group"/>
-</component>
-</collection>
-</block>
-<block name="radio" level="apps" long-name="Radio Apps" levels="engine ui">
-<collection name="fmradio" long-name="FM Radio" level="ui">
-<component name="activeidleengine" filter="s60" long-name="FM Radio Active Idle Engine">
-<unit bldFile="app/radio/fmradio/activeidleengine/group"/>
-</component>
-<component name="fmradioengine" filter="s60" long-name="FM Radio Engine">
-<unit bldFile="app/radio/fmradio/fmradioengine/group"/>
-</component>
-<component name="fmradioactionhandler" filter="s60" long-name="FM Radio Action Handler" plugin="Y">
-<unit bldFile="app/radio/fmradio/fmradioactionhandler/group"/>
-</component>
-<component name="fmradiomcpplugin" filter="s60" long-name="FM Radio Content Publisher Plugin" plugin="Y">
-<unit bldFile="app/radio/fmradio/fmradiomcpplugin/group"/>
-</component>
-<component name="fmradio_build" filter="s60" long-name="FM Radio Build">
-<unit bldFile="app/radio/fmradio/fmradio/group"/>
-</component>
-<component name="fmradio_help" filter="s60" long-name="FM Radio Help">
-<unit bldFile="app/radio/fmradio/help/group"/>
-</component>
-<component name="fmradio_build" filter="s60" long-name="FM Radio ROM">
-<!-- remove above #included bld.infs -->
-<unit bldFile="app/radio/fmradio/group"/>
-</component>
-</collection>
-</block>
-<block name="internetradio" level="apps" long-name="Internet Radio Apps"/>
-<block name="tv" level="services" long-name="TV Apps"/>
-<block name="voicerec" level="apps" long-name="Voice Recorder Apps">
-<!-- custom filter pref_test-->
-<collection name="voicerec_plat" long-name="Voice Recorder Apps Platform Interfaces">
-<component name="new_file_service_api" long-name="New File Service API" filter="s60" class="api">
-<unit bldFile="app/voicerec/voicerec_plat/new_file_service_api/group"/>
-</component>
-<component name="voicerecorder_public_constants_api" long-name="Voice Recorder Public Constants API" filter="s60" class="api">
-<unit bldFile="app/voicerec/voicerec_plat/voicerecorder_public_constants_api/group"/>
-</component>
-</collection>
-<collection name="voicerecorder" long-name="Voice Recorder">
-<!--this is really a component, move down a directory -->
-<component name="voicerecorder_build" filter="s60" long-name="Voice Recorder Build">
-<unit bldFile="app/voicerec/voicerecorder/group"/>
-</component>
-</collection>
-<collection name="voicerec_info" long-name="Voice Recorder Apps Info"/>
-</block>
-<block name="screensaver" level="apps" long-name="Screen Saver Apps" levels="plugin ui">
-<!-- is this a user-facing application or a daemon? -->
-<!-- units need to be commented out until configuration is in place. They are currently #included from screensaver_build-->
-<collection name="scrsaver" long-name="Screen Saver" level="plugin">
-<component name="scrsaverplugins" filter="s60" long-name="Screen Saver Plugins" plugin="Y">
-<!-- must have only one component. #include from a common bld.inf, or move up a directory and make scrsaverplugins a collection -->
-<!--<unit bldFile="scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/"/>
- <unit bldFile="scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/group/"/>-->
-</component>
-<component name="scrsaver_slideshowplugin" filter="s60" long-name="Screen Saver Slideshow Plugin" plugin="Y">
-<!--<unit bldFile="scrsaver/scrsaverplugins/SlideshowPlugin/group"/> -->
-</component>
-<component name="screensaveraiwplugin" filter="s60" long-name="Screen Saver AIW Plugin" plugin="Y">
-<!-- <unit bldFile="scrsaver/screensaveraiwplugin/group"/>-->
-</component>
-</collection>
-<collection name="screensaver_info" long-name="Screen Saver Apps Info" level="ui">
-<component name="screensaver_build" filter="s60" long-name="Screen Saver Application">
-<!--the app should be a separate component -->
-<unit bldFile="app/screensaver/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreen" level="apps" long-name="Home Screen Apps" levels="fw support apps">
-<collection name="homescreen_plat" long-name="Home Screen Apps Platform Interfaces" level="apps">
-<component name="menu_settings_api" long-name="Menu Settings API" filter="s60" class="api">
-<unit bldFile="app/homescreen/homescreen_plat/menu_settings_api/group"/>
-</component>
-<component name="hs_content_control_ui" long-name="HS Content Control Ui" filter="s60" class="api">
-<unit bldFile="app/homescreen/homescreen_plat/hs_content_control_ui/group"/>
-</component>
-<component name="hs_renderingplugin_api" long-name="HS Rendering Plugin API" filter="s60" class="api">
-<unit bldFile="app/homescreen/homescreen_plat/hs_renderingplugin_api/group"/>
-</component>
-</collection>
-<collection name="idlehomescreen" long-name="Idle Home Screen" level="apps">
-<component name="nativeuicontroller" filter="s60" long-name="Native UI Controller">
-<unit bldFile="app/homescreen/idlehomescreen/nativeuicontroller/group"/>
-</component>
-<component name="exths" filter="s60" long-name="Active Idle Container" plugin="Y">
-<!-- why is the ID so different from the name? Is one wrong? -->
-<unit bldFile="app/homescreen/idlehomescreen/exths/group"/>
-</component>
-<component name="hscontentcontrol" filter="s60" long-name="Home Screen Content Control" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/hscontentcontrol/group"/>
-</component>
-<component name="hssapiwrapper" filter="s60" long-name="HS SAPI Wrapper" introduced="^3">
-<!-- can only have one unit. #include from a common bld.inf, or split into two components -->
-<unit bldFile="app/homescreen/idlehomescreen/sapiwrapper/cpswrapper/group"/>
-<unit bldFile="app/homescreen/idlehomescreen/sapiwrapper/hspswrapper/group"/>
-</component>
-<component name="xmluirendering" filter="s60" long-name="XML UI Rendering" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/xmluirendering/group"/>
-</component>
-<component name="xmluicontroller" filter="s60" long-name="XML UI Controller" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/xmluicontroller/group"/>
-</component>
-<component name="widgetmanager" filter="s60" long-name="Widget Manager" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/widgetmanager/group"/>
-</component>
-<component name="idlehomescreen_help" filter="s60" long-name="Idle Home Screen Help">
-<unit bldFile="app/homescreen/idlehomescreen/help/group"/>
-</component>
-<component name="idlehomescreen_data" filter="s60" long-name="Idle Home Screen Data">
-<unit bldFile="app/homescreen/idlehomescreen/data/group"/>
-</component>
-<component name="idlehomescreen_build" filter="s60" long-name="Idle Home Screen Build">
-<!-- can the loc file be moved to another comopnent and this one removed? -->
-<unit bldFile="app/homescreen/idlehomescreen/group"/>
-</component>
-</collection>
-<collection name="menufw" long-name="Menu Framework" level="fw">
-<component name="hierarchynavigator" filter="s60" long-name="Hierarchy Navigator">
-<unit bldFile="app/homescreen/menufw/hierarchynavigator/group"/>
-</component>
-<component name="menufwui" filter="s60" long-name="Menu Framework UI">
-<unit bldFile="app/homescreen/menufw/menufwui/group"/>
-</component>
-<component name="menusuites" filter="s60" long-name="Menu Suites">
-<unit bldFile="app/homescreen/menufw/menusuites/group"/>
-</component>
-<component name="menufw_build" filter="s60" long-name="Menu Framework Build">
-<!-- can the exports be exported by the other components? -->
-<unit bldFile="app/homescreen/menufw/group"/>
-</component>
-</collection>
-<collection name="taskswitcher" long-name="Task Switcher" level="support">
-<component name="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">
-<unit bldFile="app/homescreen/taskswitcher/taskswitcherui/group"/>
-</component>
-</collection>
-</block>
-<block name="graphicsuis" level="services" long-name="Graphics UIs" levels="util ui">
-<collection name="graphicsuis_plat" long-name="Graphics UIs Platform Interfaces" level="ui">
-<component name="svgt_viewer_ui_api" long-name="SVG-T Viewer UI API" filter="s60" class="api">
-<unit bldFile="app/graphicsuis/graphicsuis_plat/svgt_viewer_ui_api/group"/>
-</component>
-<component name="svg_application_observer_utility_api" long-name="SVG Application Observer Utility API" filter="s60" class="api">
-<unit bldFile="app/graphicsuis/graphicsuis_plat/svg_application_observer_utility_api/group"/>
-</component>
-<component name="svgt_file_view_details_dialog_api" long-name="SVG-T File View Details Dialog API" filter="s60" class="api">
-<unit bldFile="app/graphicsuis/graphicsuis_plat/svgt_file_view_details_dialog_api/group"/>
-</component>
-</collection>
-<collection name="svgtviewer" long-name="SVG-T Viewer" level="ui">
-<component name="svgtviewerplugin" filter="s60" long-name="SVG-T Viewer Plugin">
-<unit bldFile="app/graphicsuis/svgtviewer/svgtviewerplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="profile" level="apps" long-name="Profiles" levels="app">
-<collection name="profile_plat" long-name="Profiles Platform Interfaces" level="app">
-<component name="profiles_settings_view_api" long-name="Profiles Settings View API" filter="s60" class="api">
-<unit bldFile="app/profile/profile_plat/profiles_settings_view_api/group"/>
-</component>
-</collection>
-<collection name="profilesapplication" long-name="Profiles Application" level="app">
-<component name="profiles" filter="s60" long-name="Profiles">
-<unit bldFile="app/profile/profilesapplication/profiles/group"/>
-</component>
-</collection>
-<collection name="profile_info" long-name="Profiles Info" level="app">
-<component name="profile_help" filter="s60" long-name="Profiles Help">
-<unit bldFile="app/profile/help/group"/>
-</component>
-</collection>
-</block>
-<block name="speechsrv" level="services" long-name="Speech Recognition UIs" levels="engine framework ui">
-<collection name="speechsrv_plat" long-name="Speech Recognition UIs Platform Interfaces" level="ui">
-<component name="vas_api" long-name="VAS API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vas_api/group"/>
-</component>
-<component name="nss_devasr_api" long-name="NSS DevASR API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_devasr_api/group"/>
-</component>
-<component name="tts_hw_device_api" long-name="TTS HW Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/tts_hw_device_api/group"/>
-</component>
-<component name="voice_commands_resource_header_api" long-name="Voice Commands Resource Header API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/voice_commands_resource_header_api/group"/>
-</component>
-<component name="nss_mmf_tts_custom_commands_api" long-name="NSS MMF TTS Custom Commands API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_mmf_tts_custom_commands_api/group"/>
-</component>
-<component name="srsf_cenrep_settings_api" long-name="SRSF CenRep Settings API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/srsf_cenrep_settings_api/group"/>
-</component>
-<component name="voice_ui_plugin_api" long-name="Voice UI Plug-in API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/voice_ui_plugin_api/group"/>
-</component>
-<component name="nss_tts_utility_api" long-name="NSS TTS Utility API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_tts_utility_api/group"/>
-</component>
-<component name="nss_srs_custom_commands_api" long-name="NSS SRS Custom Commands API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_srs_custom_commands_api/group"/>
-</component>
-<component name="srsf_secondarydisplay_api" long-name="SRSF Secondary Display API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/srsf_secondarydisplay_api/group"/>
-</component>
-<component name="asrs_hw_device_api" long-name="ASRS Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/asrs_hw_device_api/group"/>
-</component>
-<component name="vas_vcommand_api" long-name="VAS Voice Command API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vas_vcommand_api/group"/>
-</component>
-<component name="adaptation_hw_device_api" long-name="Adaptation Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/adaptation_hw_device_api/group"/>
-</component>
-<component name="nss_devtts_api" long-name="NSS DevTTS API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_devtts_api/group"/>
-</component>
-<component name="nss_srs_utility_api" long-name="NSS SRS Utility API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_srs_utility_api/group"/>
-</component>
-<component name="recognition_hw_device_api" long-name="Recognition Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/recognition_hw_device_api/group"/>
-</component>
-<component name="vas_contact_handler_api" long-name="VAS Contact Handler API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vas_contact_handler_api/group"/>
-</component>
-<component name="nlp_hw_device" long-name="NLP Hardware Device" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nlp_hw_device/group"/>
-</component>
-<component name="nss_si_speech_recognition_data_api" long-name="NSS SI Speech Recognition Data API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_si_speech_recognition_data_api/group"/>
-</component>
-<component name="nss_tts_common_api" long-name="NSS TTS Common API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_tts_common_api/group"/>
-</component>
-<component name="grcompiler_hw_device_api" long-name="Grammar Compiler Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/grcompiler_hw_device_api/group"/>
-</component>
-<component name="ttp_hw_device_api" long-name="TTP Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/ttp_hw_device_api/group"/>
-</component>
-<component name="vocman_hw_device_api" long-name="VocMan Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vocman_hw_device_api/group"/>
-</component>
-<component name="speech_synthesis_clientserver_api" long-name="Speech Synthesis Client-Server API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/speech_synthesis_clientserver_api/group"/>
-</component>
-<component name="voice_ui_accessory_button_handling_api" long-name="Voice UI Accessory Button Handling API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/voice_ui_accessory_button_handling_api/group"/>
-</component>
-<component name="ui_voice_recognition_api" long-name="UI Voice Recognition API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/ui_voice_recognition_api/group"/>
-</component>
-<component name="vcommand_settings_cenrep_api" long-name="Voice Command Settings CenRep API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vcommand_settings_cenrep_api/group"/>
-</component>
-</collection>
-<collection name="voiceui" long-name="Voice UI" level="ui">
-<component name="vcommand" filter="s60" long-name="Voice Commands UI" introduced="^1">
-<unit bldFile="app/speechsrv/voiceui/vcommand/group"/>
-</component>
-<component name="voiceuivoicerecognition" filter="s60" long-name="Voice UI Recognition" introduced="^1">
-<unit bldFile="app/speechsrv/voiceui/voiceuivoicerecognition/group"/>
-</component>
-<component name="pbkinfoviewimpl" filter="s60" long-name="Phonebook Info View Implementation" introduced="^1">
-<unit bldFile="app/speechsrv/voiceui/pbkinfoviewimpl/group"/>
-</component>
-<component name="aiwpbkinfoviewprovider" filter="s60" long-name="AIW Phonebook Info View Provider" introduced="^1" plugin="Y">
-<unit bldFile="app/speechsrv/voiceui/aiwpbkinfoviewprovider/group"/>
-</component>
-<component name="vccontrolpanelplugin" filter="s60" long-name="Voice Commands Control Panel Plugin" introduced="^1" plugin="Y">
-<!-- component is commented out until configuration is in place. Currently #included from voiceui_build -->
-<!--<unit bldFile="voiceui/vccontrolpanelplugin/group"/>-->
-</component>
-<component name="voiceui_build" filter="s60" long-name="Voice UI Build" introduced="^1">
-<!-- can this be put into the other components? -->
-<unit bldFile="app/speechsrv/voiceui/group"/>
-</component>
-</collection>
-<collection name="srsf" long-name="Speech Recognition and Synthesis Framework" level="framework">
-<component name="sispeechrecognitiondata" filter="s60" long-name="SI Speech Recognition Data">
-<unit bldFile="app/speechsrv/srsf/sispeechrecognitiondata/group"/>
-</component>
-<component name="ttscommon" filter="s60" long-name="TTS Common">
-<unit bldFile="app/speechsrv/srsf/ttscommon/group"/>
-</component>
-<component name="devtts" filter="s60" long-name="Text to Speech">
-<unit bldFile="app/speechsrv/srsf/devtts/group"/>
-</component>
-<component name="ttscustomcommands" filter="s60" long-name="TTS Custom Commands">
-<unit bldFile="app/speechsrv/srsf/ttscustomcommands/group"/>
-</component>
-<component name="ttscontrollerplugin" filter="s60" long-name="TTS Controller Plugin" plugin="Y">
-<unit bldFile="app/speechsrv/srsf/ttscontrollerplugin/group"/>
-</component>
-<component name="ttsutility" filter="s60" long-name="TTS Utility">
-<unit bldFile="app/speechsrv/srsf/ttsutility/group"/>
-</component>
-<component name="speechsynthesis" filter="s60" long-name="Speech Synthesis">
-<!-- can only have one unit. #include these from a common bld.inf -->
-<unit bldFile="app/speechsrv/srsf/speechsynthesis/client/group"/>
-<unit bldFile="app/speechsrv/srsf/speechsynthesis/server/group"/>
-</component>
-<component name="devasr" filter="s60" long-name="Audio Recording and Speech Recognition">
-<unit bldFile="app/speechsrv/srsf/devasr/group"/>
-</component>
-<component name="sicc" filter="s60" long-name="Speaker Independent Custom Commands">
-<unit bldFile="app/speechsrv/srsf/sicc/group"/>
-</component>
-<component name="sisrscontrollerplugin" filter="s60" long-name="SI SRS Controller Plugin" plugin="Y">
-<unit bldFile="app/speechsrv/srsf/sisrscontrollerplugin/group"/>
-</component>
-<component name="siutility" filter="s60" long-name="Speaker Independent Utility">
-<unit bldFile="app/speechsrv/srsf/siutility/group"/>
-</component>
-<component name="nssvasapi" filter="s60" long-name="NSS VAS API">
-<unit bldFile="app/speechsrv/srsf/nssvasapi/group"/>
-</component>
-<component name="nssvascontacthdlr" filter="s60" long-name="NSS VAS Contact Handler">
-<unit bldFile="app/speechsrv/srsf/nssvascontacthdlr/group"/>
-</component>
-<component name="vcommandhandler" filter="s60" long-name="Voice Command Handler">
-<unit bldFile="app/speechsrv/srsf/vcommandhandler/group"/>
-</component>
-<component name="vuiphandler" filter="s60" long-name="Voice UI Plugin Handler">
-<unit bldFile="app/speechsrv/srsf/vuiphandler/group"/>
-</component>
-<component name="vcommandexecutor" filter="s60" long-name="Voice Command Executor">
-<unit bldFile="app/speechsrv/srsf/vcommandexecutor/group"/>
-</component>
-<component name="vcommandexecutorbearer" filter="s60" long-name="Voice Command Executor Bearer">
-<unit bldFile="app/speechsrv/srsf/vcommandexecutorbearer/group"/>
-</component>
-<component name="vcommandmanager" filter="s60" long-name="Voice Command Manager">
-<unit bldFile="app/speechsrv/srsf/vcommandmanager/group"/>
-</component>
-<component name="vcexecutorapp" filter="s60" long-name="Voice Command Executor Application">
-<unit bldFile="app/speechsrv/srsf/vcexecutorapp/group"/>
-</component>
-<component name="profileobserverplugin" filter="s60" long-name="Profile Observer Plugin" plugin="Y">
-<unit bldFile="app/speechsrv/srsf/profileobserverplugin/group"/>
-</component>
-<component name="srsf_build" filter="s60" long-name="Speech Recognition and Synthesis Framework Build">
-<!-- should distribute this into the above components -->
-<unit bldFile="app/speechsrv/srsf/group"/>
-</component>
-</collection>
-<collection name="speechsrv_info" long-name="Speech Recognition UIs Info" level="ui"/>
-</block>
-<block name="homescreentools" level="services" long-name="Home Screen Tools" levels="tool install">
-<collection name="dtdinstaller" long-name="DTD Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<!-- this needs to be built first, does build order need to be forced with filters? -->
-<component name="dtdinstaller_build" filter="s60" long-name="DTD Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/dtdinstaller/group"/>
-</component>
-</collection>
-<collection name="themeinstaller" long-name="Theme Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="themeinstaller_build" filter="s60" long-name="Theme Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/themeinstaller/group"/>
-</component>
-</collection>
-<collection name="widgettools" long-name="Widget Tools" level="install">
-<component name="hspluginpreinstaller" filter="s60" long-name="HS Plugin Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/hspluginspreinstaller/group"/>
-</component>
-<component name="wrtwidgetpreinstaller" filter="s60" long-name="WRT Widget Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
-</component>
-</collection>
-</block>
-<block name="webuis" level="services" long-name="Web UIs" levels="plugin app">
-<collection name="browserui" long-name="Browser UI" level="app">
-<component name="browser" filter="s60" long-name="Browser">
-<unit bldFile="app/webuis/browserui/browser/group"/>
-</component>
-<component name="operatormenu" filter="s60" long-name="Browser Operator Menu">
-<unit bldFile="app/webuis/browserui/operatormenu/group"/>
-</component>
-<component name="videoservices" filter="s60" long-name="Browser Video Services">
-<unit bldFile="app/webuis/browserui/videoservices/group"/>
-</component>
-</collection>
-<collection name="browserplugins" long-name="Browser Plugins" level="plugin">
-<component name="browsersysteminfoplugin" filter="s60" long-name="Browser System Info Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsersysteminfoplugin/group"/>-->
-</component>
-<component name="browsergpsplugin" filter="s60" long-name="Browser GPS Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsergpsplugin/group"/>-->
-</component>
-<component name="browseraudiovideoplugin" filter="s60" long-name="Browser Audio Video Plugin" plugin="Y">
-<unit bldFile="app/webuis/browserplugins/browseraudiovideoplugin/group"/>
-</component>
-<component name="browserplugins_build" filter="s60" long-name="Browser Plugins Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="app/webuis/browserplugins/group"/>
-</component>
-</collection>
-<collection name="pushmtm" long-name="Push MTM" level="plugin">
-<component name="pushmtm_help" filter="s60" long-name="Push MTM Help">
-<unit bldFile="app/webuis/pushmtm/help/group"/>
-</component>
-<component name="plugins" filter="s60" long-name="Push MTM Plugins" plugin="Y">
-<unit bldFile="app/webuis/pushmtm/plugins/group"/>
-</component>
-<component name="pushmtm_build" filter="s60" long-name="Push MTM Build">
-<!-- Some content is at collection level and some is at comopnent level. Either make this a single
- component and move it down a diretcory, or make separate independent components in this collection -->
-<unit bldFile="app/webuis/pushmtm/group"/>
-</component>
-</collection>
-</block>
-<block name="jrt" level="services" long-name="Java Runtime" levels="util generic rt ui">
-<collection name="jrt_plat" long-name="JRT Platform Interfaces" level="ui">
-<component name="java_registry_api" long-name="Java Registry API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_registry_api/build"/>
-</component>
-<component name="java_env_info_api" long-name="Java Environment Info API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_env_info_api/build"/>
-</component>
-<component name="java_debug_api" long-name="Java Debug API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_debug_api/build"/>
-</component>
-</collection>
-<collection name="java_stubs" long-name="Java Stubs" level="util">
-<!-- uncomment all components when configuration is in place. Currently #included from jrt_build -->
-<component name="javadrmutils" long-name="Java DRM Utils" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtdrmutils/group"/>-->
-</component>
-<component name="javaenvinfo" long-name="Java Environment Info" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtenvinfo/group"/>-->
-</component>
-<component name="javaregistry" filter="s60,sf_build" long-name="Java Registry" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtregistry/clientserver/client/group"/>-->
-</component>
-<component name="java_stubs_build" filter="s60,sf_build" long-name="Java Stubs ROM" class="placeholder">
-<!-- Remove the #includes and rename JRT ROM-->
-<!--<unit bldFile="java_stubs/group"/>-->
-</component>
-</collection>
-<collection name="jrt_info" long-name="JRT Info" level="rt">
-<component name="jrt_build" filter="s60" long-name="JRT Build">
-<!-- needed for __JAVA_STUBS condition -->
-<unit bldFile="app/jrt/group"/>
-</component>
-</collection>
-</block>
-<block name="conntools" level="services" long-name="Connectivity Tools" levels="config app">
-<collection name="nettools" long-name="Net Tools" level="app">
-<component name="conntest" filter="s60" long-name="Connection Test" purpose="development">
-<unit bldFile="app/conntools/nettools/conntest/group"/>
-</component>
-</collection>
-<collection name="emulatorlan" long-name="Emulator LAN" level="config">
-<!-- component is actually a colleciton, should be moved down a directory -->
-<component name="emulatorlan_build" filter="s60" long-name="Emulator LAN Build" purpose="development" class="config">
-<unit bldFile="app/conntools/emulatorlan/group"/>
-</component>
-</collection>
-</block>
-<block name="rndtools" level="services" long-name="R&D tools" levels="support generic test util">
-<collection name="creator" long-name="Creator" level="support">
-<!-- collection is really a component. Should move down a directory -->
-<component name="creator_build" filter="s60" long-name="Creator Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/creator/group"/>
-</component>
-</collection>
-<collection name="filebrowser" long-name="File Browser" level="util">
-<!-- consider collapsing into a single component -->
-<component name="fileopserver" filter="s60" long-name="File Operations Server" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
-</component>
-<component name="fileopclient" filter="s60" long-name="File Operations Client" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!--<unit bldFile="filebrowser/fileopclient/group"/>-->
-</component>
-<component name="filebrowser_build" filter="s60" long-name="File Browser Application" purpose="development" class="tool">
-<!-- Need to make this a self-contained component by removing #includes. Can only do when configuration is in place-->
-<unit bldFile="app/rndtools/filebrowser/group"/>
-</component>
-</collection>
-<collection name="launcher" long-name="Launcher" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="launcher_build" filter="s60" long-name="Launcher Utility" purpose="development" class="tool">
-<unit bldFile="app/rndtools/launcher/group"/>
-</component>
-</collection>
-<collection name="loadgen" long-name="Load Generator" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="loadgen_build" filter="s60" long-name="Load Generator Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/loadgen/group"/>
-</component>
-</collection>
-<collection name="perfmon" long-name="Performance Monitor" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="perfmon_build" filter="s60" long-name="Performance Monitor Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/perfmon/group"/>
-</component>
-</collection>
-<collection name="screengrabber" long-name="Screen Grabber" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="screengrabber_build" filter="s60" long-name="ScreenGrabber" purpose="development" class="tool">
-<unit bldFile="app/rndtools/screengrabber/group"/>
-</component>
-</collection>
-<collection name="stifui" long-name="STIF UI" level="generic">
-<component name="stifui_stifui" filter="s60" long-name="STIF UI" purpose="development">
-<unit bldFile="app/rndtools/stifui/stifui/group"/>
-</component>
-<component name="uitestserverstarter" filter="s60" long-name="UI Test Server Starter" purpose="development">
-<unit bldFile="app/rndtools/stifui/uitestserverstarter/group"/>
-</component>
-<component name="stifui_build" filter="s60" long-name="STIF UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/stifui/group"/>
-</component>
-</collection>
-<collection name="memspyui" long-name="Memspy UI" level="generic">
-<!-- collection is really a component. Should move down a directory -->
-<component name="memspyui_build" filter="s60" long-name="Memspy UI Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/memspyui/group"/>
-</component>
-</collection>
-<collection name="htiui" long-name="Harmonized Test Interface UI" level="generic">
-<component name="HtiCommPlugins" filter="s60" long-name="HTI Comm Plugins" purpose="development" plugin="Y">
-<unit bldFile="app/rndtools/htiui/HtiCommPlugins/HtiBtCommPlugin/group"/>
-</component>
-<component name="HtiServicePlugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- can only have a single unit. Should #include from a common bld.inf file -->
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiFtpBackupFake/group"/>
-</component>
-<component name="htidevicereboot" filter="s60" long-name="HTI Device Reboot" purpose="development">
-<unit bldFile="app/rndtools/htiui/htidevicereboot/group"/>
-</component>
-<component name="htistartupwait" filter="s60" long-name="HTI Startup Wait" purpose="development">
-<unit bldFile="app/rndtools/htiui/htistartupwait/group"/>
-</component>
-<component name="htiadmin" filter="s60" long-name="HTI Admin" purpose="development">
-<unit bldFile="app/rndtools/htiui/htiadmin/group"/>
-</component>
-<component name="htiui_build" filter="s60" long-name="HTI UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/htiui/group"/>
-</component>
-</collection>
-</block>
-<block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools if ui">
-<collection name="csxhelp" long-name="Context Sensitive Extended Help" level="if">
-<!-- this is really a component. Should move it down a directory -->
-<component name="csxhelp_build" filter="s60" long-name="Context Sensitive Extended Help Build">
-<unit bldFile="app/helps/csxhelp/group"/>
-</component>
-</collection>
-<collection name="symhelp" long-name="Symbian Help" level="eng">
-<component name="helpmodel" long-name="Help" introduced="6.0" purpose="optional">
-<unit bldFile="app/helps/symhelp/helpmodel/group" mrp="app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
-</component>
-</collection>
-<collection name="helps_info" long-name="Help Apps Info" level="ui">
-<component name="helps_metadata" long-name="Help Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/helps/helps_info/helps_metadata/helps_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
-<collection name="buildverification" long-name="Build Verification" level="services">
-<component name="autosmoketest" long-name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
-<unit bldFile="app/techview/buildverification/autosmoketest/Group" mrp="app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
-</component>
-<component name="smoketest" long-name="Smoke Test" filter="gt" purpose="development">
-<unit bldFile="app/techview/buildverification/smoketest/Group" mrp="app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
-</component>
-</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="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"/>
-<collection name="installationapps" long-name="Installation Apps" level="apps2"/>
-<collection name="messagingapps" long-name="Messaging Apps" level="apps2"/>
-<collection name="telephonyapps" long-name="Telephony Apps" level="apps1"/>
-<collection name="networkingapps" long-name="Networking Apps" level="apps1"/>
-<collection name="networkingutils" long-name="Networking Utils" level="utils"/>
-<collection name="shortlinkapps" long-name="Shortlink Apps" level="apps1"/>
-<collection name="testapps" long-name="Test Apps" level="utils"/>
-<collection name="avapps" long-name="A/V Apps" level="apps3"/>
-<collection name="toolkit" long-name="Toolkit" level="utils"/>
-<collection name="techview_info" long-name="Techview Info" level="apps3">
-<component name="techview_metadata" long-name="Techview Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/techview/techview_info/techview_metadata/techview_metadata.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
--- a/symbian3/single/sysdefs/auto/model_20100423165826_513cd446dccb.xml Wed May 05 12:21:47 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10838 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a package or prebuilt -->
-<!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) "N"
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile may someday be removed in favour of mrp -->
-<!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
-<systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="low mw high">
-<block name="stubs" level="high" long-name="Stubs" levels="stub">
-<collection name="s60_stubs" level="stub">
-<component name="audiostubs" long-name="Audio Stubs">
-<unit bldFile="adaptation/stubs/audiostubs/group"/>
-</component>
-<component name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaptation Stub">
-<unit bldFile="adaptation/stubs/btaudioadaptation_stub/group"/>
-</component>
-<component name="drm_stubs" long-name="DRM Stubs">
-<unit bldFile="adaptation/stubs/drm_stubs/group"/>
-</component>
-<component name="ocrsrv_stub" long-name="OCR Services Stub">
-<unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
-</component>
-<component name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation">
-<unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
-</component>
-<component name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" plugin="Y">
-<unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
-</component>
-<component name="srsfenginestub" long-name="SRSF Engine Stub">
-<unit bldFile="adaptation/stubs/srsfenginestub/group"/>
-</component>
-<component name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub">
-<unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
-</component>
-<component name="systemswstubs" long-name="System Software Stubs">
-<unit bldFile="adaptation/stubs/systemswstubs/group"/>
-</component>
-<component name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" plugin="Y">
-<unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
-</component>
-<component name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub">
-<unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
-<collection name="omap3530" long-name="OMAP 3530" level="hw-if">
-<component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530" mrp="adaptation/beagleboard/omap3530/base_beagle.mrp"/>
-</component>
-<component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/kernel"/>
-</component>
-<component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/beagleboard"/>
-</component>
-</collection>
-</block>
-<block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
-<collection name="qemu_baseport" long-name="Baseport" level="hw-if">
-<component name="syborg" long-name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/qemu/baseport/syborg" mrp="adaptation/qemu/baseport/syborg/syborg.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
-<collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
-<component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
-<unit mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
-</component>
-</collection>
-<collection name="bsptemplate" long-name="Board Support Package Template" level="hw-if">
-<component name="asspandvariant" long-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 name="kernel" long-name="Kernel Architecture" level="adaptation">
-<component name="eka" long-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 name="kerneltest" long-name="Kernel Test" level="hw-if">
-<component name="e32utils" long-name="E32 Utilities" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32utils/group" mrp="os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/>
-</component>
-<component name="e32test" long-name="E32 Tests" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32test/group" mrp="os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
-</component>
-<component name="f32test" long-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 name="ldds" long-name="Logical Device Drivers" level="adaptation">
-<component name="ethernetldd" long-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 name="audioldd" long-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>
-<component name="serialldd" long-name="Serial Port Drivers" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
-</component>
-<component name="legacydrivers" long-name="Legacy Drivers" purpose="optional">
-<unit mrp="os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
-</component>
-<component name="locmedia" long-name="Local Media Subsystem" introduced="8.1b" purpose="mandatory">
-<!-- these are LDDs for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
-</component>
-<component name="runmodedebugger" long-name="Run Mode Debugger" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/debug/group" mrp="os/kernelhwsrv/kernel/eka/drivers/debug/group/base_e32_drivers_debug.mrp"/>
-</component>
-<component name="btrace" long-name="Kernel Trace Tool" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/trace" mrp="os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
-</component>
-<component name="cameraldd" long-name="Camera Drivers" introduced="^3" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/camerasc" mrp="os/kernelhwsrv/kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
-</component>
-<component name="displayldd" long-name="Display Drivers" introduced="^3" purpose="optional">
-<!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/display" mrp="os/kernelhwsrv/kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
-</component>
-<component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
-</component>
-</collection>
-<collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
-<component name="mediadrivers" long-name="Media Drivers" purpose="optional">
-<!-- these are for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/media" mrp="os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
-</component>
-<component name="genericboardsupport" long-name="Generic Board Support" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
-</component>
-</collection>
-<collection name="userlibandfileserver" long-name="User Library and File Server" level="framework">
-<component name="euser" long-name="User Library" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/euser" mrp="os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
-</component>
-<component name="compsupp" long-name="Compiler Runtime Support" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/compsupp" mrp="os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
-</component>
-<component name="fileserver" long-name="File Server" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
-</component>
-<component name="estart" long-name="Base Starter" filter="gt" purpose="optional">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
-</component>
-<component name="domainmgr" long-name="Domain Manager" introduced="8.1b" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
-</component>
-</collection>
-<collection name="filesystems" long-name="File Systems" level="framework">
-<component name="romfs" long-name="ROM File System" filter="gt" purpose="optional" plugin="Y">
-<unit mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
-</component>
-<component name="rofs" long-name="ROFS" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
-</component>
-<component name="usbmsfs" long-name="USB Mass Storage File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
-</component>
-<component name="usbhostmssrv" long-name="USB Host Mass Storage Server" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage/base_f32_shostmassstorage.mrp"/>
-</component>
-<component name="fat32fs" long-name="FAT32 File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
-</component>
-<component name="fatfs" long-name="FAT File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
-</component>
-<component name="compfs" long-name="Composite File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
-</component>
-</collection>
-<collection name="halservices" long-name="HAL Services" level="framework">
-<component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
-<unit bldFile="os/kernelhwsrv/halservices/hal" mrp="os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
-</component>
-</collection>
-<collection name="textmodeshell" long-name="Text Mode Shell" level="test">
-<component name="e32wsrv" long-name="Text Window Server" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/ewsrv" mrp="os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
-</component>
-<component name="textshell" long-name="Text Shell" filter="gt" purpose="development">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
-</component>
-</collection>
-<collection name="baseapitest" long-name="Base API Tests" level="test"/>
-<collection name="kernelhwsrv_info" long-name="Kernel and Hardware Services Info" level="test">
-<component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 config">
-<collection name="emulator" long-name="Emulator" level="bsp">
-<component name="emulatorbsp" long-name="Emulator BSP" purpose="optional">
-<unit bldFile="os/boardsupport/emulator/emulatorbsp" mrp="os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
-</component>
-</collection>
-<collection name="haitest" long-name="HAI Test Suites" level="test">
-<component name="bspsvs" long-name="BSP Verification Suite" introduced="^2" purpose="development">
-<unit mrp="os/boardsupport/haitest/bspsvs/group/bspsvs.mrp"/>
-</component>
-</collection>
-<collection name="boardsupport_info" long-name="Board Support Info" level="config">
-<component name="boardsupport_metadata" long-name="Board Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/boardsupport/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
-<collection name="bldsystemtools" long-name="Build System Tools" level="bld">
-<component name="sysdeftools" long-name="System Definition Tools" purpose="development" introduced="^2">
-<unit mrp="os/buildtools/bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
-</component>
-<component name="commonbldutils" long-name="Common Utils" purpose="development">
-<unit mrp="os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
-</component>
-</collection>
-<collection name="toolsandutils" long-name="Tools and Utils" level="mw">
-<component name="productionbldtools" long-name="Production Build Tools" filter="gt" purpose="development">
-<unit mrp="os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
-</component>
-<component name="e32tools" long-name="E32 Tools" deprecated="^2" purpose="development" class="PC">
-<unit bldFile="os/buildtools/toolsandutils/e32tools/group" mrp="os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
-</component>
-<component name="autotest" long-name="Autotest" purpose="development">
-<unit bldFile="os/buildtools/toolsandutils/autotest/group" mrp="os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
-</component>
-</collection>
-<collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
-<component name="e32toolp" long-name="E32 Perl Tools" purpose="development" filter="sf_build" class="PC">
-<unit mrp="os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="os/buildtools/sbsv1_os/e32toolp/group"/>
-</component>
-</collection>
-<collection name="imgtools_os" long-name="Image Tools" level="fw">
-<component name="romkiteka2" long-name="ROMKIT EKA2" deprecated="^2" purpose="development">
-<unit bldFile="os/buildtools/imgtools_os/romkiteka2/group" mrp="os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
-</component>
-</collection>
-<collection name="misccomponents" long-name="Misc Components" level="mw">
-<component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt" purpose="development">
-<unit bldFile="os/buildtools/misccomponents/emulatorlauncher/group" mrp="os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
-</component>
-</collection>
-<collection name="buildtools_info" long-name="Build Tools Info" level="ui">
-<component name="buildtools_metadata" long-name="Build Tools Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/buildtools/buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
-<collection name="ossrv_pub" long-name="Generic OS Services Public Interfaces" level="utilities">
-<component name="boost_apis" long-name="Boost APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/boost_apis/group"/>
-</component>
-<component name="cpp_wrappers" long-name="Cpp wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cpp_wrappers/group"/>
-</component>
-<component name="character_type_apis" long-name="Character Type APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/character_type_apis/group"/>
-</component>
-<component name="compiler_specific_runtime_support" long-name="Compiler Specific Runtime Support" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/compiler_specific_runtime_support/group"/>
-</component>
-<component name="ossrv_configuration_api" long-name="Generic OS Services Configuration API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/configuration/group"/>
-</component>
-<component name="crypto_authentication_codes_and_hash_functions_api" long-name="Crypto Authentication Codes and Hash Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
-</component>
-<component name="crypto_auxillary_functions_api" long-name="Crypto Auxillary Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_auxillary_functions_api/group"/>
-</component>
-<component name="crypto_certificates_api" long-name="Crypto Certificates API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_certificates_api/group"/>
-</component>
-<component name="crypto_inputoutput_and_data_encoding_api" long-name="Crypto Input/Output and Data Encoding API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
-</component>
-<component name="crypto_public_key_cryptography_and_key_agreement_api" long-name="Crypto Public Key Cryptography and Key Agreement API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
-</component>
-<component name="crypto_symmetric_ciphers_api" long-name="Crypto Symmetric Ciphers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_symmetric_ciphers_api/group"/>
-</component>
-<component name="crypto_utility_functions_api" long-name="Crypto Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_utility_functions_api/group"/>
-</component>
-<component name="cryptogaphy_related_api" long-name="Cryptogaphy Related API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cryptogaphy_related_api/group"/>
-</component>
-<component name="ossrv_debug_api" long-name="Generic OS Services Debug API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/debug/group"/>
-</component>
-<component name="ossrv_exceptions_api" long-name="Generic OS Services Exceptions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/exceptions/group"/>
-</component>
-<component name="gboxed" long-name="GBoxed API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gboxed/group"/>
-</component>
-<component name="glib_arrays" long-name="Glib Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_arrays/group"/>
-</component>
-<component name="glib_asynchronous_queues" long-name="Glib Asynchronous Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_asynchronous_queues/group"/>
-</component>
-<component name="glib_atomic_operations" long-name="Glib Atomic Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_atomic_operations/group"/>
-</component>
-<component name="glib_automatic_string_completion" long-name="Glib Automatic String Completion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_automatic_string_completion/group"/>
-</component>
-<component name="glib_balanced_binary_trees" long-name="Glib Balanced Binary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_balanced_binary_trees/group"/>
-</component>
-<component name="glib_basic_types" long-name="Glib Basic Types API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_basic_types/group"/>
-</component>
-<component name="glib_caches" long-name="Glib Caches API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_caches/group"/>
-</component>
-<component name="glib_character_set_conversion" long-name="Glib Character Set Conversion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_character_set_conversion/group"/>
-</component>
-<component name="glib_closures" long-name="Glib Closures API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_closures/group"/>
-</component>
-<component name="glib_commandline_option_parser" long-name="Glib Command Line Option Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_commandline_option_parser/group"/>
-</component>
-<component name="glib_datasets" long-name="Glib Datasets API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_datasets/group"/>
-</component>
-<component name="glib_date_and_time_functions" long-name="Glib Date and Time Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_date_and_time_functions/group"/>
-</component>
-<component name="glib_doubleended_queues" long-name="Glib Double-ended Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doubleended_queues/group"/>
-</component>
-<component name="glib_doublylinked_lists" long-name="Glib Doubly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doublylinked_lists/group"/>
-</component>
-<component name="glib_dynamic_loading_of_modules" long-name="Glib Dynamic Loading of Modules API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_dynamic_loading_of_modules/group"/>
-</component>
-<component name="glib_enums_and_flags" long-name="Glib Enums and Flags API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_enums_and_flags/group"/>
-</component>
-<component name="glib_error_reporting" long-name="Glib Error Reporting API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_error_reporting/group"/>
-</component>
-<component name="glib_file_utilities" long-name="Glib File Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_file_utilities/group"/>
-</component>
-<component name="glib_generic_values" long-name="Glib Generic Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_generic_values/group"/>
-</component>
-<component name="glib_globstyle_pattern_matching" long-name="Glib Glob-Style Pattern Matching API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_globstyle_pattern_matching/group"/>
-</component>
-<component name="glib_hash_tables" long-name="Glib Hash Tables API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hash_tables/group"/>
-</component>
-<component name="glib_hook_functions" long-name="Glib Hook Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hook_functions/group"/>
-</component>
-<component name="glib_internationalization" long-name="Glib Internationalization API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_internationalization/group"/>
-</component>
-<component name="glib_io_channels" long-name="Glib I/O Channels API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_io_channels/group"/>
-</component>
-<component name="glib_keyvalue_file_parser" long-name="Glib Key-Value File Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_keyvalue_file_parser/group"/>
-</component>
-<component name="glib_lexical_scanner" long-name="Glib Lexical Scanner API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_lexical_scanner/group"/>
-</component>
-<component name="glib_main_event_loop" long-name="Glib Main Event Loop API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_main_event_loop/group"/>
-</component>
-<component name="glib_memory_allocation" long-name="Glib Memory Allocation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_allocation/group"/>
-</component>
-<component name="glib_memory_slices" long-name="Glib Memory Slices API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_slices/group"/>
-</component>
-<component name="glib_message_logging" long-name="Glib Message Logging API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_message_logging/group"/>
-</component>
-<component name="glib_miscellaneous_utility_functions" long-name="Glib Miscellaneous Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_miscellaneous_utility_functions/group"/>
-</component>
-<component name="glib_nary_trees" long-name="Glib N-ary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_nary_trees/group"/>
-</component>
-<component name="glib_parameters_and_values" long-name="Glib Parameters and Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_parameters_and_values/group"/>
-</component>
-<component name="glib_quarks" long-name="Glib Quarks API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_quarks/group"/>
-</component>
-<component name="glib_random_numbers" long-name="Glib Random Numbers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_random_numbers/group"/>
-</component>
-<component name="glib_relations_and_tuples" long-name="Glib Relations and Tuples API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_relations_and_tuples/group"/>
-</component>
-<component name="glib_shellrelated_utilities" long-name="Glib Shell-related Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_shellrelated_utilities/group"/>
-</component>
-<component name="glib_signals" long-name="Glib Signals API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_signals/group"/>
-</component>
-<component name="glib_simple_xml_subset_parser" long-name="Glib Simple XML Subset Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_simple_xml_subset_parser/group"/>
-</component>
-<component name="glib_singlylinked_lists" long-name="Glib Singly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_singlylinked_lists/group"/>
-</component>
-<component name="glib_spawning_processes" long-name="Glib Spawning Processes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_spawning_processes/group"/>
-</component>
-<component name="glib_standard_macros" long-name="Glib Standard Macros API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_standard_macros/group"/>
-</component>
-<component name="glib_string_utility_functions" long-name="Glib String Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_string_utility_functions/group"/>
-</component>
-<component name="glib_strings" long-name="Glib Strings API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_strings/group"/>
-</component>
-<component name="glib_thread_pools" long-name="Glib Thread Pools API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_thread_pools/group"/>
-</component>
-<component name="glib_threads" long-name="Glib Threads API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_threads/group"/>
-</component>
-<component name="glib_timers" long-name="Glib Timers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_timers/group"/>
-</component>
-<component name="glib_unicode_manipulation" long-name="Glib Unicode Manipulation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_unicode_manipulation/group"/>
-</component>
-<component name="glib_value_arrays" long-name="Glib Value Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_value_arrays/group"/>
-</component>
-<component name="glib_varargs_value_collection" long-name="Glib Varargs Value Collection API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_varargs_value_collection/group"/>
-</component>
-<component name="gobject" long-name="GObject API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gobject/group"/>
-</component>
-<component name="gparamspec" long-name="GParamSpec API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gparamspec/group"/>
-</component>
-<component name="gtype" long-name="GType API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtype/group"/>
-</component>
-<component name="gtypemodule" long-name="GTypeModule API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypemodule/group"/>
-</component>
-<component name="gtypeplugin" long-name="GTypePlugin API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypeplugin/group"/>
-</component>
-<component name="io_stream_api" long-name="I/O stream API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/io_stream_api/group"/>
-</component>
-<component name="localization_function_api" long-name="Localization Function API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/localization_function_api/group"/>
-</component>
-<component name="math_operations_api" long-name="Math Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/math_operations_api/group"/>
-</component>
-<component name="ossrv_memory_api" long-name="Generic OS Services Memory API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/memory/group"/>
-</component>
-<component name="no_namespace_headers" long-name="No Namespace Headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/no_namespace_headers/group"/>
-</component>
-<component name="openc_headers" long-name="OpenC headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_headers/group"/>
-</component>
-<component name="openc_wrappers" long-name="OpenC wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_wrappers/group"/>
-</component>
-<component name="ssl_general_api" long-name="SSL General API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_general_api/group"/>
-</component>
-<component name="ssl_protocol_methods_api" long-name="SSL Protocol Methods API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_protocol_methods_api/group"/>
-</component>
-<component name="standard_compressiondecompression_api" long-name="Standard Compression/Decompression API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/standard_compressiondecompression_api/group"/>
-</component>
-<component name="stl" long-name="STL API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/stl/group"/>
-</component>
-<component name="thread_api" long-name="Thread API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/thread_api/group"/>
-</component>
-<component name="type_attributes" long-name="Type Attributes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/type_attributes/group"/>
-</component>
-<component name="typeinfo" long-name="Type Info API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/typeinfo/group"/>
-</component>
-<component name="utility_apis" long-name="Utility APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/utility_apis/group"/>
-</component>
-<component name="wide_character_classapis" long-name="Wide character class/apis" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/wide_character_classapis/group"/>
-</component>
-<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">
-<unit bldFile="os/ossrv/ossrv_pub/dbus-glib/group"/>
-</component>
-</collection>
-<collection name="ossrv_plat" long-name="Generic OS Services Platform Interfaces" level="utilities">
-<component name="libutils_apis" long-name="Utility Library APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_plat/libutils/group"/>
-</component>
-</collection>
-<collection name="stdlibs" long-name="Standard Libraries" level="translation">
-<component name="libz" filter="s60" long-name="Z Compression Library">
-<unit bldFile="os/ossrv/stdlibs/libz/group"/>
-</component>
-<component name="libcrypt" filter="s60" long-name="Crypt Library">
-<unit bldFile="os/ossrv/stdlibs/libcrypt/group"/>
-</component>
-</collection>
-<collection name="ssl" long-name="SSL" level="data-services">
-<component name="libcrypto" filter="s60" long-name="Crypto Library">
-<unit bldFile="os/ossrv/ssl/libcrypto/group"/>
-</component>
-<component name="libssl" filter="s60" purpose="development" long-name="SSL Library">
-<unit bldFile="os/ossrv/ssl/libssl/group"/>
-</component>
-</collection>
-<collection name="glib" long-name="GLib" level="utilities">
-<component name="glibbackend" filter="s60" long-name="GLib Backend">
-<unit bldFile="os/ossrv/glib/glibbackend/group"/>
-</component>
-<component name="libglib" filter="s60" long-name="GLib Library">
-<unit bldFile="os/ossrv/glib/libglib/group"/>
-</component>
-<component name="libgthread" filter="s60" long-name="Libg Thread">
-<unit bldFile="os/ossrv/glib/libgthread/group"/>
-</component>
-<component name="libgmodule" filter="s60" long-name="Libg Module">
-<unit bldFile="os/ossrv/glib/libgmodule/group"/>
-</component>
-<component name="libgobject" filter="s60" long-name="Libg Object">
-<unit bldFile="os/ossrv/glib/libgobject/group"/>
-</component>
-</collection>
-<collection name="stdcpp" long-name="C++ Standard Library" level="translation">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="stdcpp_build" filter="s60" long-name="Stdcpp">
-<unit bldFile="os/ossrv/stdcpp/group"/>
-</component>
-</collection>
-<collection name="ofdbus" long-name="Open Foundation D-Bus" level="utilities">
-<component name="dbus" filter="s60" long-name="D-Bus">
-<unit bldFile="os/ossrv/ofdbus/dbus/group"/>
-</component>
-<component name="dbus-glib" filter="s60" long-name="D-Bus GLib">
-<unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
-</component>
-<component name="ofdbus_rom" filter="s60" long-name="D-Bus ROM">
-<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory
- Consider moving IBY file to one of the above as well and removing this component entirely -->
-<unit bldFile="os/ossrv/ofdbus/group"/>
-</component>
-</collection>
-<collection name="utilitylibraries" long-name="Utility Libraries" level="encoding">
-<component name="libutils" filter="s60" long-name="Utility Library">
-<unit bldFile="os/ossrv/utilitylibraries/libutils/group"/>
-</component>
-</collection>
-<collection name="genericservices" long-name="Generic Services" level="utilities">
-<component name="s60compatibilityheaders" long-name="S60 Compatibility Headers" filter="gt" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp" version="tb101sf"/>
-</component>
-<component name="mimerecognitionfw" long-name="MIME Recognition Framework" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/mimerecognitionfw/group" mrp="os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
-</component>
-<component name="systemagent" long-name="System Agent" introduced="9.0" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/systemagent/group" mrp="os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
-</component>
-<component name="taskscheduler" long-name="Task Scheduler" introduced="6.0" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/taskscheduler/group" mrp="os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
-</component>
-<component name="activebackupclient" long-name="Active Backup Client" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/activebackupclient/group" mrp="os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
-</component>
-<component name="syslibsdocs" long-name="Syslibs Documentation" purpose="development" class="doc">
-<unit mrp="os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
-</component>
-<component name="httputils" long-name="HTTP Utilities Library" introduced="6.2" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/httputils/group" mrp="os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
-</component>
-</collection>
-<collection name="syslibsapitest" long-name="SysLibs API Tests" level="utilities"/>
-<collection name="compressionlibs" long-name="Compression Libraries" level="data-services">
-<component name="ziplib" long-name="Zip Compression Library" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/ossrv/compressionlibs/ziplib/group" mrp="os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
-</component>
-</collection>
-<collection name="genericopenlibs" long-name="Generic Open Libraries" level="translation">
-<component name="cstdlib" long-name="C Standard Library" introduced="ER5" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/cstdlib/group" mrp="os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
-</component>
-<component name="cppstdlib" long-name="C++ Standard Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/cppstdlib/group" mrp="os/ossrv/genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
-</component>
-<component name="openenvcore" long-name="Open Environment Core" introduced="^2" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/openenvcore/group" mrp="os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
-</component>
-<component name="posixrealtimeextensions" long-name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/posixrealtimeextensions/group" mrp="os/ossrv/genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
-</component>
-</collection>
-<collection name="lowlevellibsandfws" long-name="Low Level Libraries and Frameworks" level="app-libs">
-<component name="pluginfw" long-name="Plugin Framework" introduced="6.2" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp" version="3"/>
-</component>
-<component name="apputils" long-name="Application Utilities" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/apputils/group" mrp="os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
-</component>
-<component name="genericusabilitylib" long-name="Generic Usability Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/genericusabilitylib/group" mrp="os/ossrv/lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
-</component>
-</collection>
-<collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
-<component name="ossrv_build" filter="s60" long-name="Generic OS Services Build">
-<!-- exports should be moved to individual components -->
-<unit bldFile="os/ossrv/group"/>
-</component>
-<component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="featuremgmt" long-name="Feature Management" level="framework">
-<component name="featuremgr" long-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 name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/persistentdata/featuremgmt/featureregistry/group" mrp="os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
-</component>
-</collection>
-<collection name="loggingservices" long-name="Logging Services" level="server">
-<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">
-<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">
-<unit bldFile="os/persistentdata/loggingservices/rfilelogger/group" mrp="os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
-</component>
-</collection>
-<collection name="traceservices" long-name="Trace Services" level="server">
-<component name="commsdebugutility" long-name="Comms Debug Utility" introduced="7.0s" purpose="optional">
-<unit bldFile="os/persistentdata/traceservices/commsdebugutility/group" mrp="os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
-</component>
-<component name="tracefw" long-name="Trace Framework" introduced="9.2" purpose="development">
-<unit bldFile="os/persistentdata/traceservices/tracefw/ulogger/group" mrp="os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
-</component>
-</collection>
-<collection name="persistentstorage" long-name="Persistent Storage" level="framework">
-<component name="store" long-name="Store" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/store/group" mrp="os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
-</component>
-<component name="dbms" long-name="DBMS" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/dbms/group" mrp="os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
-</component>
-<component name="centralrepository" long-name="Central Repository" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/persistentdata/persistentstorage/centralrepository/group" mrp="os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
-</component>
-<component name="sql" long-name="SQL" introduced="9.3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sql/GROUP" mrp="os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
-</component>
-<component name="sqlite3api" long-name="SQLite 3 API" introduced="^3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sqlite3api/GROUP" mrp="os/persistentdata/persistentstorage/sqlite3api/GROUP/syslibs_sqlite3.mrp"/>
-</component>
-</collection>
-<collection name="persistentdata_info" long-name="Persistent Data Services Info" level="app-if">
-<component name="persistentdata_metadata" long-name="Persistent Data Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/persistentdata/persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
-<component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
-</component>
-<component name="common_platform_security_definitions_api" long-name="Common Platform Security Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group"/>
-</component>
-<component name="feature_discovery_api" long-name="Feature Discovery API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/group"/>
-</component>
-<component name="platform_environment_api" long-name="Platform Environment API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_environment_api/group"/>
-</component>
-<component name="sensor_channel_api" long-name="Sensor Channel API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_channel_api/group"/>
-</component>
-<component name="sensor_definitions_api" long-name="Sensor Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_definitions_api/group"/>
-</component>
-<component name="version_info_api" long-name="Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/group"/>
-</component>
-<component name="accessory_monitoring_api" long-name="Accessory Monitoring API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/group"/>
-</component>
-<component name="haptics_api" long-name="Haptics API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/haptics_api/group"/>
-</component>
-<component name="sensor_data_compensator_api" long-name="Sensor Data Compensator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
-</component>
-</collection>
-<collection name="devicesrv_plat" long-name="Device Services Platform Interfaces" level="app-if">
-<component name="configuration_file_parser_api" long-name="Configuration File Parser API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/configuration_file_parser_api/group"/>
-</component>
-<component name="dos_extension_plugin_api" long-name="DOS Extension Plug-In API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_plugin_api/group"/>
-</component>
-<component name="mediator_command_initiator_api" long-name="Mediator Command Initiator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_initiator_api/group"/>
-</component>
-<component name="syslangutil_api" long-name="SysLangUtil API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/syslangutil_api/group"/>
-</component>
-<component name="wakeup_alarm_api" long-name="Wakeup Alarm API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/wakeup_alarm_api/group"/>
-</component>
-<component name="disk_and_memory_level_keys_api" long-name="Disk and Memory Level Keys API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_and_memory_level_keys_api/group"/>
-</component>
-<component name="mediator_plugin_api" long-name="Mediator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_plugin_api/group"/>
-</component>
-<component name="headset_status_api" long-name="Headset Status API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/headset_status_api/group"/>
-</component>
-<component name="system_startup_extension_plugin_api" long-name="System Startup Extension Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/system_startup_extension_plugin_api/group"/>
-</component>
-<component name="sensor_plugin_api" long-name="Sensor Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_plugin_api/group"/>
-</component>
-<component name="accessory_api" long-name="Accessory API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_api/group"/>
-</component>
-<component name="display_language_definition_api" long-name="Display Language Definition API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/display_language_definition_api/group"/>
-</component>
-<component name="mediator_command_responder_api" long-name="Mediator Command Responder API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_responder_api/group"/>
-</component>
-<component name="accessory_policy_definitions_api" long-name="Accessory Policy Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_definitions_api/group"/>
-</component>
-<component name="hw_settings_api" long-name="Hardware Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/hw_settings_api/group"/>
-</component>
-<component name="mediator_domain_definitions_api" long-name="Mediator Domain Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_domain_definitions_api/group"/>
-</component>
-<component name="sensor_extension_api" long-name="Sensor Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_extension_api/group"/>
-</component>
-<component name="accessory_plugin_api" long-name="Accessory Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_plugin_api/group"/>
-</component>
-<component name="sae_api" long-name="SAE API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sae_api/group"/>
-</component>
-<component name="accessory_control_api" long-name="Accessory Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_control_api/group"/>
-</component>
-<component name="mediator_static_registration_api" long-name="Mediator Static Registration API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_static_registration_api/group"/>
-</component>
-<component name="accessory_key_event_handling_api" long-name="Accessory Key Event Handling API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_key_event_handling_api/group"/>
-</component>
-<component name="mediator_notification_api" long-name="Mediator Notification API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_notification_api/group"/>
-</component>
-<component name="accessory_policy_utility_api" long-name="Accessory Policy Utility API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_utility_api/group"/>
-</component>
-<component name="common_dsy_plugin_api" long-name="Common DSY Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/common_dsy_plugin_api/group"/>
-</component>
-<component name="remote_control_extension_api" long-name="Remote Control Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/remote_control_extension_api/group"/>
-</component>
-<component name="sensor_channel_filter_api" long-name="Sensor Channel Filter API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_channel_filter_api/group"/>
-</component>
-<component name="dos_extension_api" long-name="DOS Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_api/group"/>
-</component>
-<component name="accessory_audio_control_api" long-name="Accessory Audio Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_audio_control_api/group"/>
-</component>
-<component name="mediator_event_consumer_api" long-name="Mediator Event Consumer API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_consumer_api/group"/>
-</component>
-<component name="shared_data_api" long-name="Shared Data API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/shared_data_api/group"/>
-</component>
-<component name="accessory_settings_api" long-name="Accessory Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_settings_api/group"/>
-</component>
-<component name="accessory_bluetooth_control_api" long-name="Accessory Bluetooth Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_bluetooth_control_api/group"/>
-</component>
-<component name="extended_version_info_api" long-name="Extended Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_api/group"/>
-</component>
-<component name="mediator_event_provider_api" long-name="Mediator Event Provider API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_provider_api/group"/>
-</component>
-<component name="tv_out_config_api" long-name="TV Out Config API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_config_api/group"/>
-</component>
-<component name="tspclientmapper_api" long-name="TSP Client Mapper API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tspclientmapper_api/group"/>
-</component>
-<component name="powersave_api" long-name="Power Save API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_api/group"/>
-</component>
-<component name="powersave_definitions_api" long-name="Power Save Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_definitions_api/group"/>
-</component>
-<component name="powersave_plugin_api" long-name="Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_plugin_api/group"/>
-</component>
-<component name="extended_version_info_plugin_api" long-name="Extended Version Info Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_plugin_api/group"/>
-</component>
-<component name="haptics_plugin_api" long-name="Haptics Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_plugin_api/group"/>
-</component>
-<component name="haptics_effect_data_getter_plugin_api" long-name="Haptics Effect Data Getter Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
-</component>
-<component name="haptics_packetizer_plugin_api" long-name="Haptics Packetizer Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_packetizer_plugin_api/group"/>
-</component>
-<component name="tiltcompensation_api" long-name="Tilt Compensation API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tiltcompensation_api/group"/>
-</component>
-<component name="disk_notification_handler_api" long-name="Disk Notification Handler API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_notification_handler_api/group"/>
-</component>
-<component name="accessory_policy_usb_audio_api" long-name="Accessory Policy USB Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_usb_audio_api/group"/>
-</component>
-<component name="accessory_policy_hdmi_audio_api" long-name="Accessory Policy HDMI Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_hdmi_audio_api/group"/>
-</component>
-<component name="sensor_data_compensator_plugin_api" long-name="Sensor Data Compensator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
-</component>
-<component name="ddc_access_api" long-name="DDC Access API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/ddc_access_api/group"/>
-</component>
-<component name="tv_out_behaviour_api" long-name="TV Out Behaviour API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_behaviour_api/group"/>
-</component>
-</collection>
-<collection name="accessoryservices" long-name="Accessory Services" level="framework">
-<component name="accessorymonitor" filter="s60" long-name="Accessory Monitor">
-<unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/group"/>
-</component>
-<component name="accessoryremotecontrol" filter="s60" long-name="Accessory Remote Control">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
-</component>
-<component name="accessoryserver" filter="s60" long-name="Accessory Server">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryserver/group"/>
-</component>
-<component name="pluggeddisplay" filter="s60" long-name="Plugged Display" introduced="^3">
-<unit bldFile="os/devicesrv/accessoryservices/pluggeddisplay/group"/>
-</component>
-<component name="headsetstatusapi" filter="s60" long-name="Headset Status API">
-<unit bldFile="os/devicesrv/accessoryservices/headsetstatusapi/group"/>
-</component>
-<component name="tspclientmapper" filter="s60" long-name="TSP Client Mapper">
-<unit bldFile="os/devicesrv/accessoryservices/tspclientmapper/group"/>
-</component>
-<component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional">
-<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
-</component>
-<component name="gid_pc_tool" filter="s60" long-name="Generic ID PC Tool" class="tool PC">
-<unit bldFile="os/devicesrv/accessoryservices/gid_pc_tool/group"/>
-</component>
-</collection>
-<collection name="commonservices" long-name="Common Services" level="app-if">
-<component name="commonengine" filter="s60" long-name="Common Engine">
-<unit bldFile="os/devicesrv/commonservices/commonengine/group"/>
-</component>
-<component name="commonengineresources" filter="s60" long-name="Common Engine Resources" class="config">
-<unit bldFile="os/devicesrv/commonservices/commonengineresources/group"/>
-</component>
-<component name="platformenv" filter="s60" long-name="Platform Environment">
-<unit bldFile="os/devicesrv/commonservices/platformenv/group"/>
-</component>
-<component name="sysutil" long-name="System Utilities" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/sysutil/group" mrp="os/devicesrv/commonservices/sysutil/group/sysutil.mrp"/>
-</component>
-<component name="activitymanager" long-name="Activity Manager" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/activitymanager/group" mrp="os/devicesrv/commonservices/activitymanager/group/activitymanager.mrp"/>
-</component>
-</collection>
-<collection name="dosservices" long-name="Domestic Operating System Services" level="hw-if">
-<component name="commondsy" filter="s60" long-name="Common DSY" plugin="Y">
-<unit bldFile="os/devicesrv/dosservices/commondsy/group"/>
-</component>
-<component name="dosserver" filter="s60" long-name="Domestic OS Server">
-<unit bldFile="os/devicesrv/dosservices/dosserver/group"/>
-</component>
-</collection>
-<collection name="sensorservices" long-name="Sensor Services" level="framework">
-<component name="sensorserver" filter="s60" long-name="Sensor Server">
-<unit bldFile="os/devicesrv/sensorservices/sensorserver/group"/>
-</component>
-<component name="orientationssy" filter="s60" long-name="Orientation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/orientationssy/group"/>
-</component>
-<component name="tiltcompensationssy" filter="s60" long-name="Tilt Compensation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/tiltcompensationssy/group"/>
-</component>
-<component name="sensordatacompensator" filter="s60" long-name="Sensor Data Compensator">
-<unit bldFile="os/devicesrv/sensorservices/sensordatacompensator/group"/>
-</component>
-</collection>
-<collection name="hwrmhaptics" long-name="HWRM Haptics" level="plugin">
-<component name="hapticseffectdatagetterfw" filter="s60" long-name="Haptics Effect Data Getter Framework">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
-</component>
-<component name="hapticspluginservice" filter="s60" long-name="Haptics Plugin Service">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
-</component>
-<component name="hapticspacketizer" filter="s60" long-name="Haptics Packetizer">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
-</component>
-<component name="hapticspluginmanager" filter="s60" long-name="Haptics Plugin Manager">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
-</component>
-<component name="hapticsserver" filter="s60" long-name="Haptics Server">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsserver/group"/>
-</component>
-<component name="hapticsclient" filter="s60" long-name="Haptics Client">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsclient/group"/>
-</component>
-<component name="hwrmhaptics_build" filter="s60" long-name="HWRM Haptics Build">
-<!-- move these exports into the appropriate above components and delete this component-->
-<unit bldFile="os/devicesrv/hwrmhaptics/group"/>
-</component>
-</collection>
-<collection name="mediator" long-name="Mediator" level="app-if">
-<!--collection is really a component. Move it down a directory -->
-<component name="mediator_build" filter="s60" long-name="Mediator Build">
-<unit bldFile="os/devicesrv/mediator/group"/>
-</component>
-</collection>
-<collection name="psmservices" long-name="Power Save Mode Services" level="app-if">
-<component name="psmserver" filter="s60" long-name="PSM Server">
-<unit bldFile="os/devicesrv/psmservices/psmserver/group"/>
-</component>
-</collection>
-<collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
-<component name="hwrmfmtxwatcherplugin" filter="s60" long-name="HWRM FM Transmitter Watcher Plugin" plugin="Y">
-<unit bldFile="os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
-</component>
-<component name="hwrmtargetmodifierplugin" filter="s60" long-name="HWRM Target Modifier Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build,
- may need to -->
-<!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
-</component>
-<component name="vibractrl" filter="s60" long-name="Vibra Control" deprecated="9.1">
-<unit bldFile="os/devicesrv/resourcemgmt/vibractrl/group"/>
-</component>
-<component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="^2" purpose="optional">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
-</component>
-<component name="hwresourcesmgrconfig" long-name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
-</component>
-<component name="resourcemgmt_build" filter="s60" long-name="Resource Management Build">
-<!-- Move exports to a self-contained component.
- This needs to be kept around until configuration is in place -->
-<unit bldFile="os/devicesrv/resourcemgmt/group"/>
-</component>
-<component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
-</component>
-</collection>
-<collection name="sysstatemgmt" long-name="System State Management" level="server">
-<component name="ssmmapperutility" filter="s60" long-name="SSM Mapper Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmmapperutility/group"/>
-</component>
-<component name="ssmpolicyplugins" filter="s60" long-name="SSM Policy Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmpolicyplugins/group"/>
-</component>
-<component name="ssmutilityplugins" filter="s60" long-name="SSM Utility Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmutilityplugins/group"/>
-</component>
-<component name="ssmcmdlists" filter="s60" long-name="SSM Command Lists" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcmdlists/group"/>
-</component>
-<component name="ssmcustcmds" filter="s60" long-name="SSM Custom Commands" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcustcmds/group"/>
-</component>
-<component name="syslangutil" filter="s60" long-name="System Language Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/syslangutil/group"/>
-</component>
-<component name="sysrestart" filter="s60" long-name="System Restart" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysrestart/group"/>
-</component>
-<component name="sysuiprovider" filter="s60" long-name="System UI Provider" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysuiprovider/group"/>
-</component>
-<component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/group" mrp="os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
-</component>
-<component name="systemstatemgr" long-name="System State Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
-</component>
-<component name="systemstateplugins" long-name="System State Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
-</component>
-<component name="systemstatereferenceplugins" long-name="System State Reference Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
-</component>
-</collection>
-<collection name="resourceinterfaces" long-name="Resource Interfaces" level="hw-if">
-<component name="fmtransmittercontrol" long-name="FM Transmitter Control" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group" mrp="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
-</component>
-</collection>
-<collection name="systemhealthmanagement" long-name="System Health Management" level="server">
-<component name="systemhealthmgr" long-name="System Health Manager" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
-</component>
-</collection>
-<collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if"/>
-<collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
-<component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
-<collection name="authenticationservices" long-name="Authentication Services" level="utilities">
-<component name="authenticationserver" long-name="Authentication Server" introduced="^3" purpose="optional">
-<unit bldFile="os/security/authenticationservices/authenticationserver/group" mrp="os/security/authenticationservices/authenticationserver/group/security_authserver.mrp"/>
-</component>
-</collection>
-<collection name="authorisation" long-name="Authorisation" level="utilities">
-<component name="userpromptservice" long-name="User Prompt Service" introduced="^3" purpose="mandatory">
-<unit bldFile="os/security/authorisation/userpromptservice/group" mrp="os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
-</component>
-<component name="userpromptutils" long-name="User Prompt Utils" introduced="^3" purpose="optional">
-<unit bldFile="os/security/authorisation/userpromptutils/group" mrp="os/security/authorisation/userpromptutils/group/security_ups_utils.mrp"/>
-</component>
-</collection>
-<collection name="contentmgmt" long-name="Content Management" level="utilities">
-<component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
-<unit bldFile="os/security/contentmgmt/contentaccessfwfordrm/group" mrp="os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
-</component>
-<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>
-</collection>
-<collection name="crypto" long-name="Crypto Libraries" level="libraries">
-<component name="weakcryptospi" long-name="Weak Crypto SPI" filter="gt" introduced="^3" purpose="optional">
-<unit bldFile="os/security/crypto/weakcryptospi/group" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
-</component>
-<component name="strongcryptospi" long-name="Strong Crypto SPI" filter="gt" introduced="^3" purpose="optional">
-<unit bldFile="os/security/crypto/weakcryptospi/strong" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
-</component>
-</collection>
-<collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
-<component name="securityutils" long-name="Security Utils" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/securityutils/group" mrp="os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
-</component>
-<component name="securitydocs" long-name="Security Documentation" purpose="development" class="doc">
-<unit mrp="os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
-</component>
-<component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
-</component>
-<component name="securitycommonutils" long-name="Security Common Utils" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/security/cryptomgmtlibs/securitycommonutils/group" mrp="os/security/cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
-</component>
-</collection>
-<collection name="securityanddataprivacytools" long-name="Security and Data Privacy Tools" level="services">
-<component name="securityconfig" long-name="Security Config" introduced="9.1" purpose="optional">
-<unit bldFile="os/security/securityanddataprivacytools/securityconfig/group" mrp="os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
-</component>
-<component name="securitytools" long-name="Security Tools" introduced="^3" purpose="optional" class="PC">
-<unit bldFile="os/security/securityanddataprivacytools/securitytools/group" mrp="os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
-</component>
-</collection>
-<collection name="cryptoplugins" long-name="Crypto Plugins" level="plugins">
-<component name="cryptospiplugins" long-name="Crypto SPI Plugins" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/security/cryptoplugins/cryptospiplugins/group" mrp="os/security/cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
-</component>
-</collection>
-<collection name="cryptoservices" long-name="Crypto Services" level="plugins">
-<component name="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/certificateandkeymgmt/group" mrp="os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
-</component>
-<component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
-</component>
-<component name="browserrootcertificates" long-name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
-<unit mrp="os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
-</component>
-<component name="rootcertificates" filter="sf_build" long-name="Root Certificates" introduced="7.0s" purpose="optional">
-<!-- not in S60 codebase -->
-<unit bldFile="os/security/cryptoservices/rootcertificates/group" mrp="os/security/cryptoservices/rootcertificates/group/rootcerts.mrp"/>
-</component>
-<component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/asnpkcs/group" mrp="os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
-</component>
-</collection>
-<collection name="security_info" long-name="OS Security Info" level="utilities">
-<component name="security_metadata" long-name="OS Security Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/security/security_info/security_metadata/security_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
-<collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
-<component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
-</component>
-<component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
-</component>
-<component name="simulationpositioningmodule" long-name="Simulation Positioning Module" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
-</component>
-<component name="gpspositioningmodule" long-name="GPS/A-GPS Positioning Module" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/gpspositioningmodule/group" mrp="os/lbs/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
-</component>
-<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>
-</collection>
-<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
-<component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
-</component>
-</collection>
-<collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
-<component name="locationserver" long-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 name="networkrequesthandler" long-name="Network Request Handler" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
-</component>
-</collection>
-<collection name="lbstest" long-name="Locating Services Tests" level="application-interface">
-<component name="locationprotocoltest" long-name="Location Protocol Tests" introduced="9.2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/lbstest/locationprotocoltest/group" mrp="os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
-</component>
-</collection>
-<collection name="locationmgmt" long-name="Location Management" level="management">
-<component name="locmonitor" long-name="Location Monitor" introduced="^3" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
-</component>
-<component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/agpslocationmgr/group" mrp="os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
-</component>
-<component name="networklocationmgr" long-name="Network Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/networklocationmgr/group" mrp="os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
-</component>
-<component name="locationcore" long-name="Location Core" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locationcore/group" mrp="os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
-</component>
-<component name="networkgateway" long-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 name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
-<component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
-</component>
-<component name="suplrrlpasn1" filter="sf_build" long-name="SUPL RRLP ASN1 Parser">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
-</component>
-</collection>
-<collection name="lbsapitest" long-name="Location API Tests" level="application-interface"/>
-<collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
-<component name="lbs_metadata" long-name="Locating Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commsfw" level="services" long-name="Communications Framework" levels="server support framework process app-if">
-<collection name="commsprocess" long-name="Comms Process" level="process">
-<component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/commsfw/commsprocess/commsrootserverconfig/group" mrp="os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
-</component>
-</collection>
-<collection name="commsconfig" long-name="Comms Config" level="process">
-<component name="commsdatabase" long-name="Comms Database" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
-</component>
-<component name="commsdatabaseshim" long-name="Comms Database Shim" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/commsfw/commsconfig/commsdatabaseshim/group" mrp="os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
-</component>
-</collection>
-<collection name="datacommsserver" long-name="Data Comms Server" level="framework">
-<component name="esockserver" long-name="ESock Server" purpose="mandatory">
-<unit bldFile="os/commsfw/datacommsserver/esockserver/group" mrp="os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp" version="3"/>
-</component>
-<component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/group" mrp="os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
-</component>
-<component name="networkingdialogstub" long-name="Networking Dialog Stub" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/default" mrp="os/commsfw/datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
-</component>
-<component name="networkcontroller" long-name="Network Controller" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/datacommsserver/networkcontroller/group" mrp="os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
-</component>
-</collection>
-<collection name="serialserver" long-name="Serial Server" level="server">
-<component name="serialportcsy" long-name="Serial Port CSY" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/serialserver/serialportcsy" mrp="os/commsfw/serialserver/serialportcsy/ser-comms_serialportcsy.mrp"/>
-</component>
-<component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" purpose="development">
-<unit bldFile="os/commsfw/serialserver/packetloopbackcsy/group" mrp="os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
-</component>
-<component name="c32serialserver" long-name="C32 Serial Server" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/commsfw/serialserver/c32serialserver/group" mrp="os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
-</component>
-<component name="c32serialserverconfig" long-name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config">
-<unit bldFile="os/commsfw/serialserver/c32serialserverconfig" mrp="os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
-</component>
-<component name="c32serialserverdocs" long-name="C32 Serial Server Documentation" purpose="development" class="doc">
-<unit mrp="os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
-</component>
-</collection>
-<collection name="commsfwutils" long-name="Comms Framework Utilities" level="framework">
-<component name="commsbufs" long-name="Comms Buffers" introduced="^3" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwutils/commsbufs/group" mrp="os/commsfw/commsfwutils/commsbufs/group/comms-infras_commsbufs.mrp"/>
-</component>
-</collection>
-<collection name="commsfw_info" long-name="Comms Framework Info" level="app-if">
-<component name="commsinfrastructuredocs" long-name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
-<unit mrp="os/commsfw/commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
-</component>
-<component name="commsfw_metadata" long-name="Communications Framework Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/commsfw/commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
-</component>
-</collection>
-<collection name="commsfwsupport" long-name="Comms Framework Support" level="support">
-<component name="commselements" long-name="Comms Elements" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwsupport/commselements/group" mrp="os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
-</component>
-</collection>
-<collection name="commsinfrastructureapitest" long-name="Comms-Infras API Tests" level="app-if">
-<component name="commsinfrastructuresvs" long-name="Comms Infrastructure Verification Suite" introduced="^3" purpose="development">
-<unit mrp="os/commsfw/commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
-</component>
-</collection>
-<collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
-<component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
-</component>
-<component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" purpose="mandatory" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
-</component>
-<component name="commstools" long-name="Comms Tools" introduced="^3" purpose="development" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/commstools/group" mrp="os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
-</component>
-</collection>
-</block>
-<block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
-<component name="internetsockets" long-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>
-<collection name="tcpiputils" long-name="TCP/IP Utilities" level="plugin">
-<component name="dnd" long-name="DND" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/dnd/group" mrp="os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
-</component>
-<component name="dhcp" long-name="DHCP" introduced="8.0" purpose="optional">
-<unit bldFile="os/networkingsrv/tcpiputils/dhcp/group" mrp="os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
-</component>
-<component name="networkaddressandporttranslation" long-name="Network Address and Port Translation" introduced="^2" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
-</component>
-<component name="punycodeconv" long-name="Punycode Converter" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/punycodeconv/group" mrp="os/networkingsrv/tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
-</component>
-</collection>
-<collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
-<component name="nullagt" long-name="NULL AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/nullagt/group" mrp="os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
-</component>
-<component name="genericscprparameters" long-name="Generic SCPR Parameters" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/linklayercontrol/genericscprparameters/group" mrp="os/networkingsrv/linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
-</component>
-<component name="mbmsparameters" long-name="MBMS Parameters" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/mbmsparameters/group" mrp="os/networkingsrv/linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
-</component>
-<component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
-<unit bldFile="os/networkingsrv/linklayercontrol/networkinterfacemgr/group" mrp="os/networkingsrv/linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp" version="2"/>
-</component>
-</collection>
-<collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
-<component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
-</component>
-<component name="pppnif" long-name="PPP NIF" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/pppnif/group" mrp="os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp" version="2"/>
-</component>
-<component name="slipnif" long-name="SLIP NIF" purpose="development" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/slipnif/group" mrp="os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
-</component>
-<component name="tunnelnif" long-name="Tunnel NIF" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
-</component>
-</collection>
-<collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
-<component name="packetlogger" long-name="Packet Logger" introduced="8.1" purpose="development">
-<unit bldFile="os/networkingsrv/linklayerutils/packetlogger/group" mrp="os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
-</component>
-</collection>
-<collection name="networkcontrol" long-name="Network Control" level="plugin">
-<component name="qoslib" long-name="QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/qoslib/group" mrp="os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
-</component>
-<component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/pfqoslib/group" mrp="os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
-</component>
-<component name="qosfwprt" long-name="QoS Framework PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
-</component>
-<component name="qosipscpr" long-name="QoS IP SCPR" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosipscpr/group" mrp="os/networkingsrv/networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
-</component>
-<component name="ipnetworklayer" long-name="IP Network Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/ipnetworklayer/group" mrp="os/networkingsrv/networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
-</component>
-<component name="iptransportlayer" long-name="IP Transport Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/iptransportlayer/group" mrp="os/networkingsrv/networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
-</component>
-<component name="commsuserpromptmgr" long-name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkcontrol/commsuserpromptmgr/group" mrp="os/networkingsrv/networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
-</component>
-</collection>
-<collection name="networkprotocols" long-name="Network Protocols" level="plugin">
-<component name="ipeventnotifier" long-name="IP Event Notifier" introduced="8.1" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
-</component>
-<component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
-</component>
-<component name="iphook" long-name="IP Hook" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
-</component>
-<component name="mobileip" long-name="Mobile IP" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/mobileip/group" mrp="os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
-</component>
-<component name="dnsproxy" long-name="DNS Proxy" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/networkprotocols/dnsproxy/group" mrp="os/networkingsrv/networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
-</component>
-</collection>
-<collection name="networksecurity" long-name="Network Security" level="framework">
-<component name="tls" long-name="TLS" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tls/group" mrp="os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
-</component>
-<component name="tlsprovider" long-name="TLS Provider" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tlsprovider/group" mrp="os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
-</component>
-<component name="ipsec" long-name="IPsec" introduced="7.0" purpose="optional">
-<unit bldFile="os/networkingsrv/networksecurity/ipsec/group" mrp="os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
-</component>
-</collection>
-<collection name="networkingtestandutils" long-name="Networking Test and Utils" level="app-if">
-<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">
-<!-- production component: contains the IBY files -->
-<unit bldFile="os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
-</component>
-<component name="networkingdocs" long-name="Networking Documentation" purpose="development" class="doc">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
-</component>
-<component name="networkingsrv_metadata" long-name="Networking Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
-<component name="predictorcompression" long-name="Predictor Compression" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wlan" level="services" long-name="WLAN" levels="hw low mid high tools test">
-<collection name="wlan_plat" long-name="WLAN Platform Interfaces" level="test">
-<component name="wlan_dbif_api" long-name="WLAN DBIF API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_dbif_api/group"/>
-</component>
-<component name="wlan_hal_api" long-name="WLAN HAL API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hal_api/group"/>
-</component>
-<component name="wlan_management_api" long-name="WLAN Management API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_management_api/group"/>
-</component>
-<component name="wlan_device_settings_api" long-name="WLAN Device Settings API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_device_settings_api/group"/>
-</component>
-<component name="wlan_control_api" long-name="WLAN Control API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_control_api/group"/>
-</component>
-<component name="wlan_hw_initialization_data_api" long-name="WLAN Hardware Initialization Data API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hw_initialization_data_api/group"/>
-</component>
-<component name="wlan_power_save_plugin_api" long-name="WLAN Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_power_save_plugin_api/group"/>
-</component>
-<component name="wlan_info_api" long-name="WLAN Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_info_api/group"/>
-</component>
-<component name="wlan_agent_hotspot_plugin_api" long-name="WLAN Agent Hotspot Plug-in API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
-</component>
-<component name="wlan_osa_api" long-name="WLAN OSA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_osa_api/group"/>
-</component>
-<component name="wlan_spia_api" long-name="WLAN SPIA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_spia_api/group"/>
-</component>
-<component name="wlan_hpa_api" long-name="WLAN HPA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hpa_api/group"/>
-</component>
-<component name="wlan_eapol_plugin_api" long-name="WLAN EAPOL Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_eapol_plugin_api/group"/>
-</component>
-<component name="wlan_generic_plugin_api" long-name="WLAN Generic Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_generic_plugin_api/group"/>
-</component>
-<component name="wlan_aws_plugin_api" long-name="WLAN AWS Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_aws_plugin_api/group"/>
-</component>
-</collection>
-<collection name="wlan_pub" long-name="WLAN Public Interfaces" level="test">
-<component name="wlan_sdk_info_api" long-name="WLAN SDK Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_pub/wlan_sdk_info_api/group"/>
-</component>
-</collection>
-<collection name="wlan_bearer" long-name="WLAN Bearer" level="hw">
-<component name="wlanpsmplugin" filter="s60" long-name="WLAN PSM Plugin" plugin="Y">
-<unit bldFile="os/wlan/wlan_bearer/wlanpsmplugin/group"/>
-</component>
-<component name="wlanagent" filter="s60" long-name="WLAN Agent">
-<unit bldFile="os/wlan/wlan_bearer/wlanagent/group"/>
-</component>
-<component name="wlandbif_cd" filter="s60" long-name="WLAN CommsDat interface">
-<unit bldFile="os/wlan/wlan_bearer/wlandbif_cd/group"/>
-</component>
-<!-- should follow component directory rules for stuff in wlan_symbian/ and put in a single component or split up properly -->
-<component name="wlanengine" filter="s60" long-name="WLAN Engine">
-<unit bldFile="os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
-</component>
-<component name="wlanldd" filter="s60" long-name="WLAN LDD">
-<unit bldFile="os/wlan/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
-</component>
-<component name="wlannwif" filter="s60" long-name="WLAN Network Interface">
-<unit bldFile="os/wlan/wlan_bearer/wlannwif/group"/>
-</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="adaptation hw-if plugin framework server app-if">
-<collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
-<component name="basebandchanneladaptor" long-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 name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
-<component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
-</component>
-</collection>
-<collection name="fax" long-name="Fax" level="server">
-<component name="faxclientandserver" long-name="Fax Client and Server" purpose="optional">
-<unit bldFile="os/cellularsrv/fax/faxclientandserver/Group" mrp="os/cellularsrv/fax/faxclientandserver/Group/telephony_fax.mrp"/>
-</component>
-</collection>
-<collection name="smsprotocols" long-name="SMS Protocols" level="framework">
-<component name="smsstack" long-name="SMS Stack" introduced="6.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/cellularsrv/smsprotocols/smsstack/group" mrp="os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
-</component>
-</collection>
-<collection name="telephonyprotocols" long-name="Telephony Protocols" level="framework">
-<component name="csdagt" long-name="CSD AGT" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/csdagt/group" mrp="os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
-</component>
-<component name="psdagt" long-name="PSD AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/psdagt/group" mrp="os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
-</component>
-<component name="gprsumtsqosprt" long-name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
-</component>
-<component name="gprsumtsqosinterface" long-name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
-</component>
-<component name="qosextnapi" long-name="QoS Extn API" introduced="9.2" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
-</component>
-<component name="secondarypdpcontextumtsdriver" long-name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
-</component>
-<component name="qos3gppcpr" long-name="QoS 3GPP CPR" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
-</component>
-<component name="pdplayer" long-name="PDP Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/pdplayer/group" mrp="os/cellularsrv/telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
-</component>
-<component name="rawipnif" long-name="Raw IP NIF" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserver" long-name="Telephony Server" level="server">
-<component name="etelserverandcore" long-name="ETel Server and Core" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
-</component>
-<component name="etelmultimode" long-name="ETel Multimode" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelmultimode/group" mrp="os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
-</component>
-<component name="etelpacketdata" long-name="ETel Packet Data" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
-</component>
-<component name="etelsimtoolkit" long-name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
-<component name="common_tsy" long-name="Common TSY" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
-</component>
-<component name="licenseetsystub" long-name="Licensee TSY Stub" introduced="^2" purpose="development" filter="sf_build" plugin="Y">
-<unit mrp="os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="os/cellularsrv/telephonyserverplugins/licenseetsystub/group"/>
-</component>
-<component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
-</component>
-<component name="simtsy" long-name="SIM TSY" introduced="7.0" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
-</component>
-<component name="ctsydispatchlayer" long-name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
-</component>
-<component name="simatktsy" long-name="SIMATK TSY" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simatktsy/group" mrp="os/cellularsrv/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
-</component>
-</collection>
-<collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
-<component name="dial" long-name="Dial" deprecated="9.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyutils/dial/group" mrp="os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
-</component>
-<component name="telephonywatchers" long-name="Telephony Watchers" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
-</component>
-<component name="etel3rdpartyapi" long-name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrv_info" long-name="Cellular Baseband Services Info" level="app-if">
-<component name="telephonyconfidentialdocs" long-name="Telephony Confidential Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
-</component>
-<component name="telephonydocs" long-name="Telephony Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
-</component>
-<component name="cellularsrv_metadata" long-name="Cellular Baseband Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
-<component name="mocksy" long-name="MockSY" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if"/>
-<collection name="wapstack" long-name="WAP Stack" level="app-if">
-<component name="wapmessageapi" long-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>
-</block>
-<block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
-<collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
-<component name="bluetooth_audio_adaptation_api" long-name="Bluetooth Audio Adaptation API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
-</component>
-<component name="bluetooth_power_management_api" long-name="Bluetooth Power Management API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_power_management_api/group"/>
-</component>
-<component name="at_command_handler_plugin_api" long-name="AT Command Handler Plugin API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/at_command_handler_plugin_api/group"/>
-</component>
-</collection>
-<collection name="bluetooth" long-name="Bluetooth Core" level="framework">
-<component name="btstack" long-name="Bluetooth Stack" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btstack" mrp="os/bt/bluetooth/btstack/bluetooth_stack.mrp"/>
-</component>
-<component name="btcomm" long-name="Bluetooth CSY" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetooth/btcomm" mrp="os/bt/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
-</component>
-<component name="btsdp" long-name="Bluetooth SDP" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btsdp" mrp="os/bt/bluetooth/btsdp/bluetooth_sdp.mrp"/>
-</component>
-<component name="btextnotifiers" long-name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btextnotifiers" mrp="os/bt/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
-</component>
-<component name="gavdp" long-name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/gavdp/group" mrp="os/bt/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
-</component>
-<component name="btlogger" long-name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btlogger/group" mrp="os/bt/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
-</component>
-<component name="btdocs" long-name="Bluetooth Documentation" purpose="development" class="doc">
-<unit mrp="os/bt/bluetooth/btdocs/bluetooth_documentation.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothmgmt" long-name="Bluetooth Management" level="plugin">
-<component name="btmgr" long-name="Bluetooth Manager" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btmgr" mrp="os/bt/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
-</component>
-<component name="btconfig" long-name="Bluetooth Config" purpose="optional" class="config">
-<unit bldFile="os/bt/bluetoothmgmt/btconfig" mrp="os/bt/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
-</component>
-<component name="btrom" long-name="Bluetooth ROM" introduced="9.1" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btrom" mrp="os/bt/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
-</component>
-<component name="bluetoothclientlib" long-name="Bluetooth Client Library" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/bluetoothclientlib" mrp="os/bt/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothcommsprofiles" long-name="Bluetooth Comms Profiles" level="app-if">
-<component name="btpan" long-name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetoothcommsprofiles/btpan/group" mrp="os/bt/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
-</component>
-</collection>
-<collection name="bthci" long-name="Host Controller Interface" level="server">
-<component name="bthci2" long-name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bthci/bthci2/group" mrp="os/bt/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
-</component>
-<component name="hciextensioninterface" long-name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bthci/hciextensioninterface" mrp="os/bt/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
-</component>
-<component name="hci2implementations" long-name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bthci/hci2implementations/group" mrp="os/bt/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
-</component>
-</collection>
-<collection name="irda" long-name="IrDA" level="plugin">
-<component name="irdastack" long-name="IrDA Stack" purpose="optional">
-<unit bldFile="os/bt/irda/irdastack/group" mrp="os/bt/irda/irdastack/group/infra-red_irda.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if"/>
-<collection name="atext" long-name="AT Extensions" level="server">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="atext_build" long-name="AT Extension Build" introduced="^3" purpose="optional" filter="s60">
-<unit bldFile="os/bt/atext/group"/>
-</component>
-</collection>
-<collection name="bt_info" long-name="Bluetooth Info" level="app-if">
-<component name="bt_metadata" long-name="Bluetooth Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/bt/bt_info/bt_metadata/bt_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
-<collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
-<!-- usbclientdrivers to be moved here from kernelhwsrv-->
-</collection>
-<collection name="usbmgmt" long-name="USB Management" level="server">
-<component name="usbmgr" long-name="USB Manager" purpose="optional">
-<unit bldFile="os/usb/usbmgmt/usbmgr/group" mrp="os/usb/usbmgmt/usbmgr/group/usb_manager.mrp" version="2"/>
-</component>
-<component name="usbclassandmgrdocs" long-name="USB Class and Manager Documentation" purpose="development" class="doc">
-<unit mrp="os/usb/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
-</component>
-</collection>
-<collection name="usb_info" long-name="USB Info" level="app-if">
-<component name="usb_metadata" long-name="USB Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/usb/usb_info/usb_metadata/usb_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="mm" level="services" long-name="Multimedia" levels="adaptation 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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-</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"/>
-</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"/>
-</component>
-<component name="aac_decoder_config_proxy_api" long-name="AAC Decoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/aac_decoder_config_proxy_api/group"/>
-</component>
-<component name="added_devsound_control_api" long-name="Added DevSound Control API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_api/group"/>
-</component>
-<component name="added_devsound_control_msg_hdlr_api" long-name="Added DevSound Control Msg Hdlr API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_msg_hdlr_api/group"/>
-</component>
-<component name="added_devsound_control_proxy_api" long-name="Added DevSound Control Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_proxy_api/group"/>
-</component>
-<component name="audio_effects_msg_hdlr_api" long-name="Audio Effects Message Handler API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_msg_hdlr_api/group"/>
-</component>
-<component name="audio_effects_proxy_api" long-name="Audio Effects Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_proxy_api/group"/>
-</component>
-<component name="audio_policy_header_api" long-name="Audio Policy Header API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="audio_routing_proxy_api" long-name="Audio Routing Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_routing_proxy_api/group"/>
-</component>
-<component name="custom_interface_builder_api" long-name="Custom Interface Builder API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_builder_api/group"/>
-</component>
-<component name="custom_interface_message_handler_factory_api" long-name="Custom Interface Message Handler Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_message_handler_factory_api/group"/>
-</component>
-<component name="custom_interface_proxy_factory_api" long-name="Custom Interface Proxy Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_proxy_factory_api/group"/>
-</component>
-<component name="custom_interface_utility_api" long-name="Custom Interface Utility API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_utility_api/group"/>
-</component>
-<component name="devsound_adaptation_api" long-name="DevSound Adaptation API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/devsound_adaptation_api/group"/>
-</component>
-<component name="display_posting_api" long-name="Display Posting API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="eaac_plus_decoder_interface_proxy_api" long-name="eAAC Plus Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="error_concealment_interface_proxy_api" long-name="Error Concealment Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
-</component>
-<component name="fm_radio_adaptation_api" long-name="FM Radio Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_decoder_interface_proxy_api" long-name="G711 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_encoder_interface_proxy_api" long-name="G711 Encoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_decoder_interface_proxy_api" long-name="G729 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_encoder_interface_msg_hdlr_api" long-name="G729 Encoder Interface Message Handler API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</component>
-<component name="ilbc_decoder_interface_proxy_api" long-name="Ilbc Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ilbc_encoder_interface_proxy_api" long-name="Ilbc Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="mdf_plugin_uids" long-name="MDF Plug-in UIDs" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/mdf_plugin_uids/group"/>
-</component>
-<component name="multimedia_fourcc_definitions_api" long-name="Multimedia FourCC Definitions API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/multimedia_fourcc_definitions_api/group"/>
-</component>
-<component name="nokia_audio_policy_header_api" long-name="Nokia Audio Policy Header API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/nokia_audio_policy_header_api/group"/>
-</component>
-<component name="nokia_multimedia_fourcc_definitions_api" long-name="Nokia Multimedia Fourcc Definitions API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ra8_decoder_interface_proxy_api" long-name="RA8 Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
-</component>
-<component name="rds_adaptation_api" long-name="RDS Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="restricted_audio_output_proxy_api" long-name="Restricted Audio Output Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="sbc_encoder_interface_proxy_api" long-name="SBC Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/sbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="secure_output_mdf_custom_interface" long-name="Secure Output MDF Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="speech_encoder_config_proxy_api" long-name="Speech Encoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/speech_encoder_config_proxy_api/group"/>
-</component>
-<component name="telephony_audio_routing_client_api" long-name="Telephony Audio Routing Client API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_client_api/group"/>
-</component>
-<component name="telephony_audio_routing_manager_api" long-name="Telephony Audio Routing Manager API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_manager_api/group"/>
-</component>
-<component name="video_buffer_management_mdf_custom_interface" long-name="Video Buffer Management MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_buffer_management_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_rotation_mdf_custom_interface" long-name="Video Decoder Rotation MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_scaling_mdf_custom_interface" long-name="Video Decoder Scaling MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
-</component>
-<component name="video_reclaim_extbuffers_ci" long-name="Video Reclaim Extbuffers Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_reclaim_extbuffers_ci/group"/>
-</component>
-<component name="video_window_control_custom_interface" long-name="Video Window Control Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="wma_decoder_interface_proxy_api" long-name="WMA Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/wma_decoder_interface_proxy_api/group"/>
-</component>
-<component name="eaacplusutil_api" long-name="EAac Plus Util API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/eaacplusutil_api/group"/>
-</component>
-<component name="frametable_api" long-name="Frametable API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/frametable_api/group"/>
-</component>
-</collection>
-<collection name="devsoundextensions" long-name="Devsound Extensions" level="device-fw">
-<component name="drmaudioplayer" filter="s60" long-name="DRM Audio Player">
-<unit bldFile="os/mm/devsoundextensions/drmaudioplayer/group"/>
-</component>
-<component name="mmextfw" filter="s60" long-name="Multimedia Extension Framework">
-<unit bldFile="os/mm/devsoundextensions/mmextfw/group"/>
-</component>
-<component name="audiorouting" filter="s60" long-name="Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/audiorouting/group"/>
-</component>
-<component name="effects" filter="s60" long-name="Effects">
-<unit bldFile="os/mm/devsoundextensions/effects/group"/>
-</component>
-<component name="effectspresets" filter="s60" long-name="Effects Presets">
-<unit bldFile="os/mm/devsoundextensions/effectspresets/group"/>
-</component>
-<component name="effectspresets_utils" filter="s60" long-name="Effects Presets Utils">
-<!-- need to #include the lot from a single bld.inf
- Also move to a standard component location, not under effectspresets -->
-<unit bldFile="os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
-<unit bldFile="os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
-</component>
-<component name="telephonyaudiorouting" filter="s60" long-name="Telephony Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/group"/>
-</component>
-<component name="mmfcustominterfaces" filter="s60" long-name="MMF Custom Interfaces">
-<unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/group"/>
-</component>
-<component name="addeddevsoundcontrol" filter="s60" long-name="Added DevSound Control">
-<unit bldFile="os/mm/devsoundextensions/addeddevsoundcontrol/group"/>
-</component>
-<component name="globalaudiosettings" filter="s60" long-name="Global Audio Settings">
-<unit bldFile="os/mm/devsoundextensions/globalaudiosettings/group"/>
-</component>
-<component name="restrictedaudiooutput" filter="s60" long-name="Restricted Audio Output">
-<unit bldFile="os/mm/devsoundextensions/restrictedaudiooutput/group"/>
-</component>
-<component name="ciextnfactoryplugins" filter="s60" long-name="Custom Interface Extension Factory Plugins" plugin="Y">
-<unit bldFile="os/mm/devsoundextensions/ciextnfactoryplugins/group"/>
-</component>
-</collection>
-<collection name="mdfdevvideoextensions" long-name="MDF Dev Video Extensions" level="device-fw">
-<component name="nga_mdf_postprocessor" long-name="NGA MDF Postprocessor" filter="s60">
-<unit bldFile="os/mm/mdfdevvideoextensions/nga_mdf_postprocessor/group"/>
-</component>
-</collection>
-<collection name="audio" long-name="Audio Codecs" level="middleware">
-<component name="arm_cmmf_codecs" filter="s60" long-name="ARM CMMF Codecs" plugin="Y">
-<unit bldFile="os/mm/audio/arm_cmmf_codecs/group"/>
-</component>
-</collection>
-<collection name="video" long-name="Video Codecs" level="middleware">
-<!-- empty -->
-</collection>
-<collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
-<component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/imagingandcamerafws/imagingfws/group" mrp="os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
-</component>
-<component name="camerafw" long-name="Camera Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/imagingandcamerafws/camerafw/group" mrp="os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
-</component>
-</collection>
-<collection name="mmlibs" long-name="Multimedia Libraries" level="middleware">
-<component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmutilitylib/group" mrp="os/mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
-</component>
-<component name="mmfw" long-name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmfw/group" mrp="os/mm/mmlibs/mmfw/group/multimedia_mmf.mrp"/>
-</component>
-</collection>
-<collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
-<component name="imagingplugins" long-name="Imaging Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/imagingplugins/group" mrp="os/mm/mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
-</component>
-<component name="cameraplugins" long-name="Camera Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/cameraplugins/group" mrp="os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
-</component>
-<component name="lib3gp" long-name="3GP Library" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/mmplugins/lib3gp/group" mrp="os/mm/mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
-</component>
-<component name="mmfwplugins" long-name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/mmfwplugins/group" mrp="os/mm/mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
-</component>
-</collection>
-<collection name="mm_info" long-name="Multimedia Info" level="app-if">
-<component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc">
-<unit mrp="os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
-</component>
-<component name="mm_metadata" long-name="Multimedia Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
-<component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="^2" purpose="development">
-<unit bldFile="os/mm/mmresourcemgmt/mmresctrl/group" mrp="os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
-</component>
-</collection>
-<collection name="mmdevicefw" long-name="Multimedia Device Framework" level="device-fw">
-<component name="mdf" long-name="Media Device Framework" introduced="9.2" purpose="mandatory">
-<unit bldFile="os/mm/mmdevicefw/mdf/group" mrp="os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
-</component>
-<component name="speechrecogsupport" long-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 name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
-<component name="videorenderer" long-name="Video Renderer" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/mmswadaptation/videorenderer/group" mrp="os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
-</component>
-</collection>
-<collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw"/>
-<collection name="omxil" long-name="OpenMAX IL" level="hw-if">
-<component name="omxilapi" long-name="OpenMAX IL API" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilapi/group" mrp="os/mm/omxil/omxilapi/group/multimedia_omx_il_api.mrp" version="1"/>
-</component>
-<component name="omxilcore" long-name="OpenMAX IL Core" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcore/group" mrp="os/mm/omxil/omxilcore/group/multimedia_omx_il_core.mrp" version="1"/>
-</component>
-<component name="omxilcomponentcommon" long-name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcomponentcommon/group" mrp="os/mm/omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp" version="1"/>
-</component>
-<component name="omxilrefcomps" long-name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilrefcomps/ref_components/group" mrp="os/mm/omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp" version="1"/>
-</component>
-<component name="mmilapi" long-name="Multimedia Integration Layer API" introduced="^3" purpose="development">
-<unit bldFile="os/mm/omxil/mmilapi/group" mrp="os/mm/omxil/mmilapi/group/multimedia_il_api.mrp"/>
-</component>
-</collection>
-<collection name="devsound" long-name="Sound Device" level="devices">
-<component name="devsoundapi" long-name="DevSound API" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/devsound/devsoundapi/group" mrp="os/mm/devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
-</component>
-<component name="a3fdevsound" long-name="A3F DevSound" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3fdevsound/group" mrp="os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
-</component>
-<component name="a3facf" long-name="A3F Audio Component Framework" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3facf/group" mrp="os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
-</component>
-<component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/devsound/devsoundpluginsupport/group" mrp="os/mm/devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
-</component>
-<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">
-<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">
-<unit bldFile="os/mm/devsound/a3ftrace/group" mrp="os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
-</component>
-<component name="a3fsrvstart" long-name="A3F Server Start" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
-</component>
-</collection>
-<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
-<component name="devsoundhwdeviceapi" long-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 name="a3facl" long-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 name="a3fdevsoundcustomisation" long-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"/>
-</component>
-<component name="refacladapt" long-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"/>
-</component>
-<component name="videohai" long-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 name="dvbhreceiverhai" long-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>
-</block>
-<block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
-<collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
-<component name="exif_api" long-name="Exif API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagingext_plat" long-name="Imaging Extensions Platform Interfaces" level="app-if">
-<component name="jpeg2000_icl_plugin_api" long-name="JPEG2000 ICL plugin API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/jpeg2000_icl_plugin_api/group"/>
-</component>
-<component name="extended_icl_jpeg_api" long-name="Extended ICL Jpeg API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
-</component>
-<component name="h324_annex_k_custom_api" long-name="H324 Annex K Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/h324_annex_k_custom_api/group"/>
-</component>
-<component name="ecam_orientation_custom_api" long-name="ECam Orientation Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_orientation_custom_api/group"/>
-</component>
-<component name="ecam_ui_orientation_override_custom_api" long-name="ECam UI Orientation Override Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
-</component>
-<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>
-</collection>
-<collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
-<component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
-<unit bldFile="os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
-</component>
-<component name="imageadaptationextensions_build" filter="s60" long-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"/>
-</component>
-</collection>
-<collection name="imagingmodules" long-name="Imaging Modules" level="hw-if">
-<component name="exiflib" filter="s60" long-name="Exif Library">
-<unit bldFile="os/imagingext/imagingmodules/exiflib/group"/>
-</component>
-<component name="jp2kcodec" filter="s60" long-name="JPEG2000 Decoder Plugin" plugin="Y">
-<unit bldFile="os/imagingext/imagingmodules/jp2kcodec/group"/>
-</component>
-</collection>
-</block>
-<block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
-<component name="vgi" filter="s60" long-name="VGI">
-<unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
-</component>
-</collection>
-<collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adaptations">
-<component name="m3gcore11" filter="s60" long-name="M3G Core 1.1">
-<unit bldFile="os/graphics/m3g/m3gcore11/group"/>
-</component>
-</collection>
-<collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines">
-<component name="graphicsresource" long-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 name="graphicsresourceadaptation" long-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"/>
-</component>
-</collection>
-<collection name="graphicsutils" long-name="Graphics Utils" level="engines">
-<component name="commongraphicsheaders" long-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 name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
-<!-- displayldd to be moved here -->
-<component name="surfacemgr" long-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 name="graphicscomposition" long-name="Graphics Composition" level="engines">
-<component name="openwfcinterface" long-name="OpenWF Composition Interface" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfcinterface/group" mrp="os/graphics/graphicscomposition/openwfcinterface/group/graphics_openwfcinterface.mrp"/>
-</component>
-<component name="openwfcompositionengine" long-name="OpenWF Composition Engine" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/graphicscomposition/openwfcompositionengine/group" mrp="os/graphics/graphicscomposition/openwfcompositionengine/group/graphics_openwfcompositionengine.mrp"/>
-</component>
-<component name="openwfsupport" long-name="OpenWF Support" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfsupport/group" mrp="os/graphics/graphicscomposition/openwfsupport/group/graphics_openwfsupport.mrp"/>
-</component>
-<component name="surfaceupdate" long-name="Surface Update" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/surfaceupdate/group" mrp="os/graphics/graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
-</component>
-</collection>
-<collection name="graphicstest" long-name="Graphics Test" level="app-if">
-<component name="uibench" long-name="UI Bench" introduced="9.2" purpose="development">
-<unit bldFile="os/graphics/graphicstest/uibench/group" mrp="os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
-</component>
-</collection>
-<collection name="graphics_plat" long-name="Graphics Platform Interfaces" level="app-if">
-<component name="m3g_core_api" filter="sf_build" long-name="M3G Core API" class="api">
-<unit bldFile="os/graphics/graphics_plat/m3g_core_api/group"/>
-</component>
-</collection>
-<collection name="graphics_info" long-name="Graphics Info" level="app-if">
-<component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc">
-<unit mrp="os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
-</component>
-<component name="graphics_metadata" long-name="Graphics Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
-</component>
-</collection>
-<collection name="windowing" long-name="Windowing" level="app-if">
-<component name="windowserver" long-name="Window Server" purpose="mandatory">
-<unit bldFile="os/graphics/windowing/windowserver/group" mrp="os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
-</component>
-<component name="windowserverplugins" long-name="Window Server Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/windowing/windowserverplugins/group" mrp="os/graphics/windowing/windowserverplugins/group/graphics_wserv_std_plugins.mrp"/>
-</component>
-</collection>
-<collection name="printingservices" long-name="Printing Services" level="app-if">
-<component name="printerdriversupport" long-name="Printer Driver Support" purpose="optional">
-<unit bldFile="os/graphics/printingservices/printerdriversupport/group" mrp="os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
-</component>
-<component name="printerdrivers" long-name="Printer Drivers" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/printingservices/printerdrivers/group" mrp="os/graphics/printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
-</component>
-</collection>
-<collection name="fbs" long-name="Font and Bitmap Server" level="device-interface">
-<component name="fontandbitmapserver" long-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 name="opengles" long-name="OpenGLES" level="internal-adaptations">
-<component name="openglesinterface" long-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 name="opengles_stub" filter="sf_build" long-name="OpenGL ES Stub" purpose="optional" introduced="^2">
-<unit bldFile="os/graphics/opengles/openglesinterface/group/opengles_stub"/>
-</component>
-</collection>
-<collection name="openvg" long-name="OpenVG" level="internal-adaptations">
-<component name="openvginterface" long-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 name="openvg11" filter="s60" long-name="OpenVG 1.1">
-<!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
-<unit bldFile="os/graphics/openvg/openvginterface/group/openvg11"/>
-</component>
-<component name="sfopenvg" filter="sf_build" long-name="Khronos OpenVG Reference Implementation" introduced="^2" purpose="optional">
-<unit bldFile="os/graphics/openvg/openvgrefimplementation/sfopenvg/group"/>
-</component>
-</collection>
-<collection name="egl" long-name="EGL" level="internal-adaptations">
-<component name="eglinterface" long-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 name="eglswitch" long-name="EGL Switch" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglswitch/group" mrp="os/graphics/egl/eglswitch/group/graphics_eglswitch.mrp"/>
-</component>
-<component name="eglrefimpl" long-name="EGL Reference Implementation" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglrefimpl/group" mrp="os/graphics/egl/eglrefimpl/group/graphics_eglrefimpl.mrp"/>
-</component>
-<component name="egltest" long-name="EGL Tests" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/egl/egltest/group" mrp="os/graphics/egl/egltest/group/graphics_egltest.mrp"/>
-</component>
-</collection>
-<collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
-<component name="gdi" long-name="GDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/gdi/group" mrp="os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
-</component>
-<component name="bitgdi" long-name="BitGDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
-</component>
-<component name="colourpalette" long-name="Colour Palette" introduced="7.0s" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
-</component>
-<component name="screendriver" long-name="Screen Driver" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/graphicsdeviceinterface/screendriver/group" mrp="os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
-</component>
-<component name="directgdi" long-name="DirectGDI" introduced="^3" deprecated="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/directgdi/group" mrp="os/graphics/graphicsdeviceinterface/directgdi/group/graphics_directgdi.mrp"/>
-</component>
-<component name="directgdiinterface" long-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 name="directgdiadaptation" long-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"/>
-</component>
-</collection>
-<collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
-<component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/gdi_tools/group" mrp="os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
-</component>
-</collection>
-<collection name="graphicsapitest" long-name="Graphics API Tests" level="app-if"/>
-</block>
-<block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
-<collection name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" level="text">
-<component name="findutil_api" long-name="Find Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/findutil_api/group"/>
-</component>
-<component name="japanese_language_utilities_api" long-name="Japanese Language Utilities API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
-</component>
-<component name="sortutil_api" long-name="Sorting Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/sortutil_api/group"/>
-</component>
-</collection>
-<collection name="textandloc_pub" long-name="Text and Localisation Public Interfaces" level="text">
-<component name="directory_localizer_api" long-name="Directory Localizer API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_pub/directory_localizer_api/group"/>
-</component>
-</collection>
-<collection name="charconvfw" long-name="Character Conversion" level="encoding">
-<component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional">
-<unit bldFile="os/textandloc/charconvfw/charconv_fw/group" mrp="os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
-</component>
-<component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/charconvplugins/group" mrp="os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
-</component>
-<component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/fatfilenameconversionplugins/group" mrp="os/textandloc/charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
-</component>
-</collection>
-<collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
-<component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/textshaperplugin/group" mrp="os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
-</component>
-<component name="fontstore" long-name="Font Store" purpose="mandatory">
-<unit bldFile="os/textandloc/fontservices/fontstore/group" mrp="os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
-</component>
-<component name="textrendering" long-name="Text Rendering" purpose="mandatory" class="placeholder">
-<!-- placeholder for text code from GDI -->
-</component>
-<component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/freetypefontrasteriser/group" mrp="os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
-</component>
-<component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional">
-<unit bldFile="os/textandloc/fontservices/referencefonts/group" mrp="os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
-</component>
-</collection>
-<collection name="textlayout" long-name="Text Layout" level="text">
-<component name="texthandling" long-name="Text Handling" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/texthandling/group" mrp="os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
-</component>
-<component name="textformatting" long-name="Text Formatting" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/textformatting/group" mrp="os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
-</component>
-</collection>
-<collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
-<!-- components in this collection need to be moved to the right collection.
- Either move into the units' directories, or create a new textandlocutils directory -->
-<component name="numbergrouping" filter="s60" long-name="Number Grouping">
-<unit bldFile="os/textandloc/charconvfw/numbergrouping/group"/>
-</component>
-<component name="jplangutil" filter="s60" long-name="Japanese Language Utilities">
-<unit bldFile="os/textandloc/charconvfw/jplangutil/group"/>
-</component>
-<component name="sortutil" filter="s60" long-name="Sorting Utility">
-<unit bldFile="os/textandloc/charconvfw/sortutil/group"/>
-</component>
-<component name="inlinetext" filter="s60" long-name="Inline Text">
-<unit bldFile="os/textandloc/charconvfw/inlinetext/group"/>
-</component>
-<component name="nearestlangutil" long-name="Nearest Language Util" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-<component name="numberformatting" long-name="Number Formatting" introduced="7.0s" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/numberformatting/group" mrp="os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
-</component>
-</collection>
-<collection name="localesupport" long-name="Locale Support" level="util">
-<component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/localisation/localesupport" mrp="os/textandloc/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
-</component>
-<component name="initlocale" long-name="Initialise Locale" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-</collection>
-<collection name="textandloctools" long-name="Text and Localisation Tools" level="tools">
-<component name="fontcompiler" long-name="Font Compiler" purpose="development" class="placeholder PC">
-<!-- placeholder for split from GDI Tools -->
-</component>
-<component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/bitmapfonttools/group" mrp="os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
-</component>
-</collection>
-<collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
-<component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
-<collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
-<component name="xmlsrv_plat_build" long-name="XML Services Platform Interface Build" filter="s60" class="api">
-<!-- need to fix the configuration used here.
- Either destribute to other components or use the new feature flags confguration mechanisms.
- Remove this component and uncomment the other units when fixed-->
-<unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
-</component>
-<component name="xml_encryption_api" long-name="XML Encryption API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/> -->
-</component>
-<component name="xml_signature_api" long-name="XML Signature API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_signature_api/group"/> -->
-</component>
-<component name="xml_security_engine_utils_api" long-name="XML Security Engine Utils API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/> -->
-</component>
-</collection>
-<collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
-<component name="xmlseccertman" filter="s60" long-name="XML Security Certificate Manager">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
-</component>
-<component name="xmlsec" filter="s60" long-name="XML Security">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsec/group"/>
-</component>
-<component name="xmlseccrypto" filter="s60" long-name="XML Security Crypto">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccrypto/group"/>
-</component>
-<component name="xmlsecwrapper" filter="s60" long-name="XML Security Wrapper">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsecwrapper/group"/>
-</component>
-</collection>
-<collection name="xml" long-name="XML" level="generic">
-<component name="xmlfw" long-name="XML Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmlfw/group" mrp="os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
-</component>
-<component name="libxml2libs" long-name="Libxml2 Libraries" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/libxml2libs/group" mrp="os/xmlsrv/xml/libxml2libs/group/syslibs_libxml2.mrp"/>
-</component>
-<component name="legacyminidomparser" long-name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/legacyminidomparser/GROUP" mrp="os/xmlsrv/xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp"/>
-</component>
-<component name="xmldomandxpath" long-name="XML DOM and XPath" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmldomandxpath/group" mrp="os/xmlsrv/xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
-</component>
-<component name="xmlexpatparser" long-name="XML Expat Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmlexpatparser/group" mrp="os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
-</component>
-<component name="xmllibxml2parser" long-name="XML Libxml2 Parser" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmllibxml2parser/group" mrp="os/xmlsrv/xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
-</component>
-<component name="wbxmlparser" long-name="WBXML Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/wbxmlparser/group" mrp="os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
-</component>
-</collection>
-<collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
-<component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="deviceplatformrelease" level="services" long-name="Device Platform Release" levels="bld mid top">
-<collection name="s60extras" long-name="S60 Extras" level="mid">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="s60extras_build" filter="s60" long-name="S60 Extras Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/S60Extras/group"/>
-</component>
-</collection>
-<collection name="locfiles" long-name="Locale Files" level="mid">
-<component name="locfiles_build" filter="s60" long-name="S60 Locale Files Build" purpose="development" class="config">
-<!-- need to move component down a directory -->
-<unit bldFile="os/deviceplatformrelease/locfiles/group"/>
-</component>
-<component name="locfiles_set1" long-name="Locale Files Set 1" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set1"/>
-</component>
-<component name="locfiles_set2" long-name="Locale Files Set 2" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set2"/>
-</component>
-<component name="locfiles_set3" long-name="Locale Files Set 3" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set3"/>
-</component>
-<component name="locfiles_set4" long-name="Locale Files Set 4" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set4"/>
-</component>
-<component name="locfiles_set5" long-name="Locale Files Set 5" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set5"/>
-</component>
-<component name="locfiles_set6" long-name="Locale Files Set 6" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set6"/>
-</component>
-<!-- is the a problem with SF builds with the following? -->
-<component name="locfiles_set7" long-name="Locale Files Set 7" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set7"/>
-</component>
-<component name="locfiles_set8" long-name="Locale Files Set 8" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set8"/>
-</component>
-<component name="locfiles_set9" long-name="Locale Files Set 9" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set9"/>
-</component>
-<component name="locfiles_set10" long-name="Locale Files Set 10" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set10"/>
-</component>
-<component name="locfiles_set11" long-name="Locale Files Set 11" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set11"/>
-</component>
-<component name="locfiles_set12" long-name="Locale Files Set 12" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set12"/>
-</component>
-<component name="locfiles_set13" long-name="Locale Files Set 13" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set13"/>
-</component>
-<component name="locfiles_set14" long-name="Locale Files Set 14" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set14"/>
-</component>
-<component name="locfiles_set15" long-name="Locale Files Set 15" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set15"/>
-</component>
-<component name="locfiles_set16" long-name="Locale Files Set 16" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set16"/>
-</component>
-</collection>
-<collection name="version" long-name="Version" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="version_build" filter="s60" long-name="Version Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/Version/group"/>
-</component>
-</collection>
-<collection name="helps_loc2" long-name="Helps Locale 2" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helps_loc2_build" long-name="Helps Locale 2 Build" filter="s60">
-<unit bldFile="os/deviceplatformrelease/helps_loc2/group"/>
-</component>
-</collection>
-<collection name="sf_config" long-name="SF Config" level="mid">
-<component name="config" filter="s60" long-name="Config" purpose="development" class="config"/>
-<component name="cenrep" filter="sf_build" long-name="ConE Central Repository Config" purpose="development" class="config">
-<!-- will shoudl give the id/path something more unique than cenrep -->
-<unit bldFile="os/deviceplatformrelease/sf_config/cenrep/group"/>
-</component>
-<component name="rombuild_syborg" filter="sf_build" long-name="Syborg iMaker Config" purpose="development" introduced="^3" class="config">
-<unit bldFile="os/deviceplatformrelease/sf_config/rombuild/syborg/group"/>
-</component>
-<component name="rombuild_zoom2" filter="sf_build" long-name="Zoom2 iMaker Config" purpose="development" introduced="^3" class="config">
-<unit bldFile="os/deviceplatformrelease/sf_config/rombuild/zoom2/group"/>
-</component>
-</collection>
-<!-- should be located locally in buildplatforms/group. NB. This is a different package! -->
-<collection name="s60bld" long-name="S60 Build">
-<component name="buildplatforms" filter="s60" long-name="Build Platforms">
-<unit bldFile="tools/buildplatforms/group"/>
-</component>
-</collection>
-<collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
-<component name="cedarutils" long-name="Cedar Utils" purpose="development">
-<unit mrp="os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
-</component>
-<component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt" purpose="development" class="config">
-<unit mrp="os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
-</component>
-<component name="foundation_s60_packages" long-name="Foundation S60 Packages" introduced="^3" deprecated="^3" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/symbianosbld/foundation_s60_packages/foundation_s60_packages.mrp"/>
-</component>
-</collection>
-<collection name="foundation_system" long-name="Foundation System" level="top">
-<component name="system_model" long-name="System Model" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
-</component>
-</collection>
-<collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
-<component name="deviceplatformrelease_metadata" long-name="Device Platform Release Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="osrndtools" level="services" long-name="OS R&D tools" levels="fw trace">
-<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"/>
-</component>
-<component name="testinterface" filter="s60" long-name="Test Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/testinterface/group"/>
-</component>
-<component name="testserver" filter="s60" long-name="Test Server" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserver/group"/>
-</component>
-<component name="testengine" filter="s60" long-name="Test Engine" purpose="development">
-<unit bldFile="os/osrndtools/stif/testengine/group"/>
-</component>
-<component name="testserverstarter" filter="s60" long-name="Test Server Starter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserverstarter/group"/>
-</component>
-<component name="stiftfwif" filter="s60" long-name="STIF Test Framework Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/stiftfwif/group"/>
-</component>
-<component name="consoleui" filter="s60" long-name="Console UI" purpose="development">
-<unit bldFile="os/osrndtools/stif/consoleui/group"/>
-</component>
-<component name="testcombiner" filter="s60" long-name="Test Combiner" purpose="development">
-<unit bldFile="os/osrndtools/stif/testcombiner/group"/>
-</component>
-<component name="demomodule" filter="s60" long-name="Demo Module" purpose="development">
-<unit bldFile="os/osrndtools/stif/demomodule/group"/>
-</component>
-<component name="atslogger" filter="s60" long-name="ATS Logger" purpose="development">
-<unit bldFile="os/osrndtools/stif/atslogger/group"/>
-</component>
-<component name="atsinterface" filter="s60" long-name="ATS Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/atsinterface/group"/>
-</component>
-<component name="testscripter" filter="s60" long-name="Test Scripter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testscripter/group"/>
-</component>
-<component name="suevent" filter="s60" long-name="SU Event" purpose="development">
-<unit bldFile="os/osrndtools/stif/suevent/group"/>
-</component>
-<component name="stifkerneltestclassbase" filter="s60" long-name="STIF Kernel Test Class Base" purpose="development">
-<!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
-<!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
-</component>
-<component name="stif_build" filter="s60" long-name="STIF Build" purpose="development">
-<!-- move exports into self-contained component. Remove this when configuration is in place-->
-<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">
-<unit bldFile="os/osrndtools/memspy/memspy_plat/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/engine/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/console/group"/>
-</component>
-<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>
-</collection>
-<collection name="hti" long-name="Harmonized Test Interface" level="trace">
-<component name="hti_plat" filter="s60" long-name="HTI Platform Interfaces" purpose="development" class="api">
-<unit bldFile="os/osrndtools/hti/hti_plat/group"/>
-</component>
-<component name="hticfg" filter="s60" long-name="HTI Config" purpose="development">
-<unit bldFile="os/osrndtools/hti/hticfg/group"/>
-</component>
-<component name="htiautostart" filter="s60" long-name="HTI Autostart" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiautostart/group"/>
-</component>
-<component name="htiframework" filter="s60" long-name="HTI Framework" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiframework/group"/>
-</component>
-<component name="hticommplugins" filter="s60" long-name="HTI Communication Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
-</component>
-<component name="htiserviceplugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
-</component>
-<component name="htifilehlp" filter="s60" long-name="HTI File Help" purpose="development">
-<unit bldFile="os/osrndtools/hti/htifilehlp/group"/>
-</component>
-<component name="htiwatchdog" filter="s60" long-name="HTI Watchdog" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiwatchdog/group"/>
-</component>
-<component name="hti_build" filter="s60" long-name="HTI Build" purpose="development">
-<!-- move exports into self-contained component.-->
-<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">
-<block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
-<collection name="appsupport_pub" long-name="Generic Application Support Public Interfaces" level="specific">
-<component name="flash_viewer_framework_api" long-name="Flash Viewer Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
-</component>
-<component name="network_status_api" long-name="Network Status API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/network_status_api/group"/>
-</component>
-</collection>
-<collection name="appsupport_plat" long-name="Generic Application Support Platform Interfaces" level="specific">
-<component name="action_plugin_api" long-name="Action Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/action_plugin_api/group"/>
-</component>
-<component name="application_orientation_api" long-name="Application Orientation API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/application_orientation_api/group"/>
-</component>
-<component name="context_access_api" long-name="Context Access API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_access_api/group"/>
-</component>
-<component name="context_framework_services_api" long-name="Context Framework Services API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_services_api/group"/>
-</component>
-<component name="context_framework_client_api" long-name="Context Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_client_api/group"/>
-</component>
-<component name="context_framework_listener_api" long-name="Context Framework Listener API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_listener_api/group"/>
-</component>
-<component name="context_framework_version_api" long-name="Context Framework Version API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_version_api/group"/>
-</component>
-<component name="context_source_plugin_api" long-name="Context Source Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_plugin_api/group"/>
-</component>
-<component name="context_source_settings_manager_api" long-name="Context Source Settings Manager API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_settings_manager_api/group"/>
-</component>
-<component name="context_subscription_api" long-name="Context Subscription API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_subscription_api/group"/>
-</component>
-<component name="key_event_framework_api" long-name="Key Event Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_api/group"/>
-</component>
-<component name="key_event_framework_mapper_api" long-name="Key Event Framework Mapper API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_mapper_api/group"/>
-</component>
-<component name="media_keys_definition_api" long-name="Media Keys Definition API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/media_keys_definition_api/group"/>
-</component>
-<component name="ood_threshold_api" long-name="OOD Threshold API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/ood_threshold_api/group"/>
-</component>
-<component name="oom_monitor_api" long-name="OOM Monitor API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_api/group"/>
-</component>
-<component name="oom_monitor_plugin_api" long-name="OOM Monitor Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_plugin_api/group"/>
-</component>
-<component name="operation_provider_api" long-name="Operation Provider API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/operation_provider_api/group"/>
-</component>
-<component name="phonecmdhandler_api" long-name="Phone Command Handler API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/phonecmdhandler_api/group"/>
-</component>
-<component name="restore_factory_settings_api" long-name="Restore Factory Settings API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_api/group"/>
-</component>
-<component name="restore_factory_settings_plugin_api" long-name="Restore Factory Settings Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_plugin_api/group"/>
-</component>
-<component name="secondary_display_accfw_api" long-name="Secondary Display Accessory Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_accfw_api/group"/>
-</component>
-<component name="secondary_display_startup_api" long-name="Secondary Display Startup API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_startup_api/group"/>
-</component>
-<component name="secondary_display_sysap_api" long-name="Secondary Display System Application API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_sysap_api/group"/>
-</component>
-<component name="secondary_display_system_state_api" long-name="Secondary Display System State API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_system_state_api/group"/>
-</component>
-<component name="sensor_user_setting_api" long-name="Sensor User Setting API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/sensor_user_setting_api/group"/>
-</component>
-<component name="startup_configuration_api" long-name="Startup Configuration API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/startup_configuration_api/group"/>
-</component>
-<component name="system_application_key_handler_plugin_api" long-name="System Application Key Handler Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_key_handler_plugin_api/group"/>
-</component>
-<component name="system_application_light_control_plugin_api" long-name="System Application Light Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_light_control_plugin_api/group"/>
-</component>
-<component name="system_application_notification_api" long-name="System Application Notification API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_notification_api/group"/>
-</component>
-<component name="system_application_plugin_callback_api" long-name="System Application Plug-in Callback API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
-</component>
-</collection>
-<collection name="contextframework" long-name="Context Framework" level="framework">
-<!-- the units that are commented out need to be put back when configuration is in place.
- They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
-<component name="cfw" filter="s60" long-name="Context Framework">
-<!--<unit bldFile="contextframework/cfw/group"/> -->
-</component>
-<component name="cfwplugins" filter="s60" long-name="Context Framework Plugins" plugin="Y">
-<!--<unit bldFile="contextframework/cfwplugins/group"/>-->
-</component>
-<component name="contextframework_build" filter="s60" long-name="Context Framework Build">
-<unit bldFile="mw/appsupport/contextframework/group"/>
-</component>
-</collection>
-<collection name="coreapplicationuis" long-name="Core Application UIs" level="server">
-<component name="dbrecovery" filter="s60" long-name="Database Recovery">
-<unit bldFile="mw/appsupport/coreapplicationuis/dbrecovery/group"/>
-</component>
-<component name="nspswsplugin" filter="s60" long-name="NSPS WS Plugin" plugin="Y">
-<!-- No Service Power Save? Window Server? Please elaborate-->
-<unit bldFile="mw/appsupport/coreapplicationuis/nspswsplugin/group"/>
-</component>
-<component name="rfs" filter="s60" long-name="Restore Factory Settings">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfs/group"/>
-</component>
-<component name="rfsplugins" filter="s60" long-name="Restore Factory Settings Plugins" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/group"/>
-</component>
-<component name="sysap" filter="s60" long-name="System Application">
-<unit bldFile="mw/appsupport/coreapplicationuis/sysap/group"/>
-</component>
-<component name="variatedsettings" filter="s60" long-name="Variated Settings" class="config">
-<unit bldFile="mw/appsupport/coreapplicationuis/variatedsettings/group"/>
-</component>
-<component name="accfwuinotifier" filter="s60" long-name="Accessory Framework UI Notifier" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/accfwuinotifier/group"/>
-</component>
-<component name="kefmapper" filter="s60" long-name="Key Event Framework">
-<unit bldFile="mw/appsupport/coreapplicationuis/kefmapper/group"/>
-</component>
-<component name="advancedtspcontroller" filter="s60" long-name="Advanced TSP Controller">
-<unit bldFile="mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
-</component>
-<component name="powersaveutilities" filter="s60" long-name="Power Save Utilities">
-<unit bldFile="mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
-</component>
-<component name="gsserverenginestub" filter="s60" long-name="GS Server Engine Stub">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
-</component>
-<component name="gsserverengine" filter="s60" long-name="GS Server Engine">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverengine/group"/>
-</component>
-<component name="sensordatacompensatorplugin" filter="s60" long-name="Sensor Data Compensator Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/group"/>
-</component>
-</collection>
-<collection name="flashliteapi_3_1" long-name="Flash Lite API 3.1" level="specific">
-<!-- collection is really a component. Move down a directory -->
-<component name="flashliteapi_3_1_build" long-name="Flash Lite API Build" filter="s60" introduced="^2"/>
-</collection>
-<collection name="mediakeys" long-name="Media Keys" level="plugin">
-<!-- collection is really a component. Move down a directory -->
-<component name="mediakeys_build" filter="s60" long-name="Media Keys Build">
-<unit bldFile="mw/appsupport/mediakeys/group"/>
-</component>
-</collection>
-<collection name="startupservices" long-name="Startup Services" level="system">
-<component name="splashscreen" filter="s60" long-name="Splash Screen">
-<unit bldFile="mw/appsupport/startupservices/splashscreen/group"/>
-</component>
-<component name="startupanimation" filter="s60" long-name="Startup Animation">
-<unit bldFile="mw/appsupport/startupservices/startupanimation/group"/>
-</component>
-<component name="startup" long-name="Startup Application" filter="s60">
-<unit bldFile="mw/appsupport/startupservices/startup/group"/>
-</component>
-</collection>
-<collection name="sysresmonitoring" long-name="System Resource Monitoring" level="system">
-<component name="oodmonitor" filter="s60" long-name="OOD Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oodmonitor/group"/>
-</component>
-<component name="oommonitor" filter="s60" long-name="OOM Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oommonitor/group"/>
-</component>
-</collection>
-<collection name="systemsettings" long-name="System Settings" level="system">
-<component name="gssensorplugin" filter="s60" long-name="GS Sensor Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gssensorplugin/group"/>
-</component>
-<component name="gsaccessoryplugin" filter="s60" long-name="GS Accessory Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gsaccessoryplugin/group"/>
-</component>
-</collection>
-<collection name="filehandling" long-name="File Handling" level="server">
-<component name="fileconverterfw" long-name="File Converter Framework" purpose="optional">
-<unit bldFile="mw/appsupport/filehandling/fileconverterfw/group" mrp="mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
-</component>
-<component name="htmltorichtextconverter" long-name="HTML to RichText Converter" introduced="7.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/htmltorichtextconverter/group" mrp="mw/appsupport/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
-</component>
-<component name="richtexttohtmlconverter" long-name="RichText to HTML Converter" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
-</component>
-</collection>
-<collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
-<component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
-</component>
-</collection>
-<collection name="commonappservices" long-name="Common Application Services" level="framework">
-<component name="alarmserver" long-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"/>
-</component>
-<component name="alarmservertest" long-name="Alarm Server Test" deprecated="^3" introduced="8.1" purpose="development">
-<unit bldFile="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
-</component>
-<component name="appservicesdocs" long-name="Application Services Documentation" purpose="development" class="doc">
-<unit mrp="mw/appsupport/commonappservices/appservicesdocs/app-services_documentation.mrp"/>
-</component>
-<component name="backuprestorenotification" long-name="Backup Restore Notification" introduced="8.1" purpose="optional">
-<unit bldFile="mw/appsupport/commonappservices/backuprestorenotification/group" mrp="mw/appsupport/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
-</component>
-</collection>
-<collection name="tzservices" long-name="Time Zone Services" level="plugin">
-<component name="tzserver" long-name="Time Zone Server" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzserver/group" mrp="mw/appsupport/tzservices/tzserver/group/app-services_tz.mrp"/>
-</component>
-<component name="tzloc" long-name="Time Zone Localization" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzloc/group" mrp="mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
-</component>
-<component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzlocrscfactory/group" mrp="mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
-</component>
-<component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzdatabase/group" mrp="mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
-</component>
-</collection>
-<collection name="contenthandling" long-name="Content Handling" level="plugin">
-<component name="webrecognisers" long-name="Web Recognisers" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/contenthandling/webrecognisers/group" mrp="mw/appsupport/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
-</component>
-</collection>
-<collection name="openenvutils" long-name="Open Environment Utilities" level="specific">
-<component name="commandshell" long-name="Command Shell" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/commandshell/group" mrp="mw/appsupport/openenvutils/commandshell/group/oetools_zsh.mrp"/>
-</component>
-<component name="telnetserver" long-name="Telnet Server" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/telnetserver/group" mrp="mw/appsupport/openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
-</component>
-</collection>
-<collection name="printingsupport" long-name="Printing Support" level="generic">
-<component name="printinguisupport" long-name="Printing UI Support" purpose="optional" introduced="^2" deprecated="^3">
-<unit bldFile="mw/appsupport/printingsupport/printinguisupport/group" mrp="mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
-</component>
-</collection>
-<collection name="appfw" long-name="Application Framework" level="framework">
-<component name="apparchitecture" long-name="Application Architecture" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/apparchitecture/group" mrp="mw/appsupport/appfw/apparchitecture/group/app-framework_apparc.mrp"/>
-</component>
-<component name="viewserver" long-name="View Server" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/viewserver/group" mrp="mw/appsupport/appfw/viewserver/group/app-framework_viewsrv.mrp"/>
-</component>
-</collection>
-<collection name="applaunchservices" long-name="Application Launch Services" level="generic">
-<component name="aftermarketappstarter" long-name="After Market Application Starter" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/aftermarketappstarter/group" mrp="mw/appsupport/applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
-</component>
-<component name="applaunchplugins" long-name="Application Launch Plugins" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/applaunchplugins/group" mrp="mw/appsupport/applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
-</component>
-</collection>
-<collection name="tzpcside" long-name="Time Zone PC Side" level="plugin">
-<component name="tzcompiler" long-name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config PC">
-<unit bldFile="mw/appsupport/tzpcside/tzcompiler/group" mrp="mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
-</component>
-</collection>
-<collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
-<component name="appsupport_metadata" long-name="Generic Application Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="securitysrv" level="generic" long-name="Security Services" levels="plugin framework server generic specific">
-<collection name="secsrv_plat" long-name="Security Services Platform Interfaces" level="specific">
-<component name="cms_api" long-name="CMS API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/cms_api/group"/>
-</component>
-<component name="pkcs12_parser_api" long-name="PKCS12 Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkcs12_parser_api/group"/>
-</component>
-<component name="java_utils_api" long-name="Java Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/java_utils_api/group"/>
-</component>
-<component name="wim_cert_api" long-name="WIM Cert API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/wim_cert_api/group"/>
-</component>
-<component name="device_key_store_encryption_plugin_api" long-name="Device Key Store Encryption Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/device_key_store_encryption_plugin_api/group"/>
-</component>
-<component name="x509certnameparser_api" long-name="X.509 Certificate Name Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
-</component>
-<component name="remote_lock_api" long-name="Remote Lock API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
-</component>
-<component name="pkidialog_api" long-name="PKI Dialog API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
-</component>
-<component name="provisioning_api" long-name="Provisioning API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/provisioning_api/group"/>
-</component>
-<component name="keyguard_configuration_api" long-name="Keyguard Configuration API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_configuration_api/group"/>
-</component>
-<component name="keylock_policy_api" long-name="Keylock Policy API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keylock_policy_api/group"/>
-</component>
-<component name="security_code_ui_api" long-name="Security Code UI API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
-</component>
-<component name="gba_api" long-name="GBA API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/gba_api/group"/>
-</component>
-<component name="keyguard_access_api" long-name="Keyguard Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_access_api/group"/>
-</component>
-<component name="devicelock_access_api" long-name="Device Lock Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devicelock_access_api/group"/>
-</component>
-<component name="lockapp_server_api" long-name="Lock Application Server API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
-</component>
-<component name="devencadaptation_api" long-name="Device Encryption Adaptation API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
-</component>
-<component name="devenccommonutils_api" long-name="Device Encryption Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
-</component>
-</collection>
-<collection name="cms" long-name="Certificate Management Service" level="server">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="cms_build" filter="s60" long-name="CMS" introduced="^3">
-<unit bldFile="mw/securitysrv/cms/group"/>
-</component>
-</collection>
-<collection name="pkiutilities" long-name="PKI Utilities" level="plugin">
-<component name="x509certnameparser" filter="s60" long-name="X.509 Certificate Name Parser">
-<unit bldFile="mw/securitysrv/pkiutilities/x509certnameparser/group"/>
-</component>
-<component name="pkcs12" filter="s60" long-name="PKCS #12">
-<unit bldFile="mw/securitysrv/pkiutilities/pkcs12/group"/>
-</component>
-<component name="certmanui" filter="s60" long-name="Certificate Management UI">
-<unit bldFile="mw/securitysrv/pkiutilities/certmanui/group"/>
-</component>
-<component name="ctsecuritydialogs" filter="s60" long-name="Crypto Token Security Dialogs">
-<unit bldFile="mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
-</component>
-<component name="certsaver" filter="s60" long-name="Certificate Saver">
-<unit bldFile="mw/securitysrv/pkiutilities/certsaver/group"/>
-</component>
-<component name="secmodui" filter="s60" long-name="Security Module UI">
-<unit bldFile="mw/securitysrv/pkiutilities/secmodui/group"/>
-</component>
-<component name="devicetoken" filter="s60" long-name="Device Token">
-<unit bldFile="mw/securitysrv/pkiutilities/devicetoken/group"/>
-</component>
-<component name="certificates" filter="s60" long-name="Certificates">
-<unit bldFile="mw/securitysrv/pkiutilities/Certificates/group" filter="sf_build"/>
-</component>
-<component name="pkiutilities_build" filter="s60" long-name="PKI Utilities Build">
-<!-- need to split this into the above components -->
-<unit bldFile="mw/securitysrv/pkiutilities/group"/>
-</component>
-<component name="ocsp" long-name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
-<unit bldFile="mw/securitysrv/pkiutilities/ocsp/group" mrp="mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
-</component>
-</collection>
-<collection name="wim" long-name="Wireless Identity Module " level="framework">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="wim_build" filter="s60" long-name="WIM Build">
-<unit bldFile="mw/securitysrv/wim/group"/>
-</component>
-</collection>
-<collection name="remotelock" long-name="Remote Lock" level="generic">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="remotelock_build" filter="s60" long-name="Remote Lock Build">
-<unit bldFile="mw/securitysrv/remotelock/group"/>
-</component>
-</collection>
-<collection name="securitydialogs" long-name="Security Dialogs" level="specific">
-<component name="keylockpolicyapi" filter="s60" long-name="Keylock Policy API">
-<unit bldFile="mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
-</component>
-<component name="autolock" long-name="Autolock" filter="s60">
-<unit bldFile="mw/securitysrv/securitydialogs/autolock/group"/>
-</component>
-<component name="secui" filter="s60" long-name="Security UI">
-<unit bldFile="mw/securitysrv/securitydialogs/secui/group"/>
-</component>
-<component name="securitynotifier" filter="s60" long-name="Security Notifier">
-<unit bldFile="mw/securitysrv/securitydialogs/securitynotifier/group"/>
-</component>
-<component name="lockclient" filter="s60" long-name="Lock Client" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockclient/group"/>
-</component>
-<component name="lockapp" filter="s60" long-name="Lock Application" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockapp/group"/>
-</component>
-<component name="simlockui" filter="s60" long-name="SIM Lock UI" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/simlockui/group"/>
-</component>
-</collection>
-<collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="boottimeintegritycheck_build" filter="s60" long-name="Boot Time Integrity Check Build">
-<unit bldFile="mw/securitysrv/boottimeintegritycheck/group"/>
-</component>
-</collection>
-<collection name="gba" long-name="Generic Bootstrapping Architecture" level="server">
-<component name="uicc" filter="s60" long-name="UICC" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/uicc/group"/>
-</component>
-<component name="gbaserver" filter="s60" long-name="GBA Server" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaserver/group"/>
-</component>
-<component name="gbaapi" filter="s60" long-name="GBA API" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaapi/group"/>
-</component>
-<component name="gbafilter" filter="s60" long-name="GBA HTTP Filter" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/gbafilter/group"/>
-</component>
-<component name="gba_build" filter="s60" long-name="Generic Boot Architecture Build" introduced="^2">
-<!-- need to split this into the above components, or remove #includes and make this GBA ROM -->
-<unit bldFile="mw/securitysrv/gba/group"/>
-</component>
-</collection>
-<collection name="devencdiskutils" long-name="Device Encryption Disk Utils" level="server">
-<component name="devenccommonutils" filter="s60" long-name="Device Encryption Common Utils" introduced="^3">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncCommonUtils/group"/>
-</component>
-<component name="devencrfsplugin" filter="s60" long-name="Device Encryption RFS Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncRfsPlugin/group"/>
-</component>
-<component name="pk5recognizer" filter="s60" long-name="Device Encryption Pk5 Recognizer" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/Pk5Recognizer/group"/>
-</component>
-<component name="devencstarter" filter="s60" long-name="Device Encryption Starter" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncStarter/group"/>
-</component>
-<component name="devencdiskutils" filter="s60" long-name="Device Encryption Disk Utils Build" introduced="^3">
-<!-- need to split this into the above components, or remove #includes and make this a ROM component-->
-<unit bldFile="mw/securitysrv/devencdiskutils/group"/>
-</component>
-</collection>
-<collection name="securitysrv_info" long-name="Security Services Info" level="specific">
-<component name="securitysrv_metadata" long-name="Security Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="drm" level="generic" long-name="DRM" levels="plugin framework server generic specific">
-<collection name="drm_plat" long-name="DRM Platform Interfaces" level="specific">
-<component name="roap_api" long-name="ROAP API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/roap_api/group"/>
-</component>
-<component name="drm_common_api" long-name="DRM Common API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_common_api/group"/>
-</component>
-<component name="drm_rights_api" long-name="DRM Rights API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_rights_api/group"/>
-</component>
-<component name="drm_legacy_api" long-name="DRM Legacy API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_legacy_api/group"/>
-</component>
-<component name="dcf_repository_api" long-name="DCF Repository API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/dcf_repository_api/group"/>
-</component>
-<component name="drm_service_api" long-name="DRM Service API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_service_api/group"/>
-</component>
-<component name="drm_secondary_display_api" long-name="DRM Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_secondary_display_api/group"/>
-</component>
-<component name="drm_license_manager_api" long-name="DRM License Manager API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_license_manager_api/group"/>
-</component>
-<component name="drm_utility_api" long-name="DRM Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_utility_api/group"/>
-</component>
-<component name="drm_agents_api" long-name="DRM Agents API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_agents_api/group"/>
-</component>
-<component name="wmdrm_core_api" long-name="WM DRM Core API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_core_api/group"/>
-</component>
-<component name="wmdrm_access_api" long-name="WMDRM Access API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_access_api/group"/>
-</component>
-<component name="camese_utility_api" long-name="Camese Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_utility_api/group"/>
-</component>
-<component name="camese_framework_api" long-name="Camese Framework API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_framework_api/group"/>
-</component>
-</collection>
-<collection name="drm_pub" long-name="DRM Public Interfaces" level="specific">
-<component name="drm_helper_api" long-name="DRM Helper API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_helper_api/group"/>
-</component>
-<component name="oma_drm_caf_agent_api" long-name="OMA DRM CAF Agent API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/group"/>
-</component>
-<component name="drm_license_checker_api" long-name="DRM License Checker API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_license_checker_api/group"/>
-</component>
-</collection>
-<collection name="commondrm" long-name="Common DRM" level="generic">
-<!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
-<component name="drmencryptor" filter="s60" long-name="DRM Encryptor" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmsettingsplugin" filter="s60" long-name="DRM Settings Plugin" plugin="Y" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmrightsmanagerui" filter="s60" long-name="DRM Rights Manager UI">
-<unit bldFile="mw/drm/commondrm/drmrightsmanagerui/help/group"/>
-</component>
-<component name="drmutility" filter="s60" long-name="DRM Utility">
-<!-- Uncomment unit when configuration is in place. Currently #included from commondrm_build -->
-<!--<unit bldFile="commondrm/drmutility/group"/>-->
-</component>
-<component name="drmserviceapiwrapper" filter="s60" long-name="DRM Service API Wrapper">
-<unit bldFile="mw/drm/commondrm/drmserviceapiwrapper/group"/>
-</component>
-<component name="drmrightsstoringlocation" filter="s60" long-name="DRM Rights Storing Location">
-<unit bldFile="mw/drm/commondrm/drmrightsstoringlocation/group"/>
-</component>
-<component name="commondrm_build" filter="s60" long-name="Common DRM Build">
-<!-- should be split into the above files, or them collapsed into a single component -->
-<unit bldFile="mw/drm/commondrm/group"/>
-</component>
-</collection>
-<collection name="omadrm" long-name="OMA DRM" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="omadrm_build" filter="s60" long-name="OMA DRM Build">
-<unit bldFile="mw/drm/omadrm/group"/>
-</component>
-<component name="foundationcerts" filter="sf_build" long-name="Foundation Certificates">
-<unit bldFile="mw/drm/omadrm/foundationcerts/group"/>
-</component>
-</collection>
-<collection name="wmdrm" long-name="Windows Media DRM" level="framework">
-<!-- collection is really a component. Move down a directory -->
-<component name="wmdrm_build" filter="s60" long-name="WM DRM Build">
-<unit bldFile="mw/drm/wmdrm/group"/>
-</component>
-</collection>
-<collection name="drm_info" long-name="DRM Info" level="specific"/>
-</block>
-<block name="locationsrv" level="specific" long-name="Location Services" levels="plugin fw server if">
-<collection name="locsrv_pub" long-name="Location Services Public Interfaces" level="if">
-<component name="landmarks_search_api" long-name="Landmarks Search API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
-</component>
-<component name="landmarks_api" long-name="Landmarks API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/group"/>
-</component>
-<component name="landmarks_database_management_api" long-name="Landmarks Database Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/group"/>
-</component>
-<component name="location_triggering_api" long-name="Location Triggering API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/location_triggering_api/group"/>
-</component>
-<component name="blid_application_satellite_info_api" long-name="BLID Application Satellite Info API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/group"/>
-</component>
-</collection>
-<collection name="locsrv_plat" long-name="Location Services Platform Interfaces" level="if">
-<component name="map_and_navigation_api" long-name="Map and Navigation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/group"/>
-</component>
-<component name="map_and_navigation_provider_discovery_api" long-name="Map and Navigation Provider Discovery API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/group"/>
-</component>
-<component name="geocoding_api" long-name="Geocoding API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
-</component>
-<component name="map_image_api" long-name="Map Image API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/group"/>
-</component>
-<component name="map_and_navigation_aiw_api" long-name="Map and Navigation AIW API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_aiw_api/group"/>
-</component>
-<component name="map_and_navigation_provider_api" long-name="Map and Navigation Provider API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_api/group"/>
-</component>
-<component name="landmarks_category_definition_api" long-name="Landmarks Category Definition API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
-</component>
-<component name="supl_settings_api" long-name="SUPL Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
-</component>
-<component name="location_settings_launch_api" long-name="Location Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/group"/>
-</component>
-<component name="map_image_conversion_plugin_api" long-name="Map Image Conversion Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/group"/>
-</component>
-<component name="psy_configuration_ui_plugin_api" long-name="PSY Configuration UI Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/psy_configuration_ui_plugin_api/group"/>
-</component>
-<component name="np_proxy_configuration_api" long-name="NP Proxy Configuration API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/np_proxy_configuration_api/group"/>
-</component>
-<component name="supl_terminal_initiation_api" long-name="SUPL Terminal Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/group"/>
-</component>
-<component name="location_notation_preferences_settings_api" long-name="Location Notation Preferences Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_notation_preferences_settings_api/group"/>
-</component>
-<component name="supl_settings_notifier_secondary_display_api" long-name="SUPL Settings Notifier Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_notifier_secondary_display_api/group"/>
-</component>
-<component name="supl_network_initiation_api" long-name="SUPL Network Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/group"/>
-</component>
-<component name="privacy_notifiers_secondary_display_api" long-name="Privacy Notifiers Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/privacy_notifiers_secondary_display_api/group"/>
-</component>
-<component name="oma_supl_configuration_parameter_api" long-name="OMA SUPL Configuration Parameter API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_configuration_parameter_api/group"/>
-</component>
-<component name="supl_query_secondary_display_api" long-name="SUPL Query Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_query_secondary_display_api/group"/>
-</component>
-<component name="location_triggering_management_api" long-name="Location Triggering Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_management_api/group"/>
-</component>
-<component name="location_triggering_status_information_api" long-name="Location Triggering Status Information API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_status_information_api/group"/>
-</component>
-<component name="oma_supl_asn_codec_plugin_api" long-name="OMA SUPL ASN Codec Plugin API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
-</component>
-<component name="query_and_notification_api" long-name="Query and Notification API" filter="s60" introduced="^3" class="api">
-<!-- needs metadata file: <meta rel="Api" href="locsrv_plat/query_and_notification_api/query_and_notification_api.metaxml"/> -->
-<unit bldFile="mw/locationsrv/locsrv_plat/query_and_notification_api/group"/>
-</component>
-<component name="location_local_variation_api" long-name="Location Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_local_variation_api/group"/>
-</component>
-</collection>
-<collection name="genericpositioningplugins" long-name="Generic Positioning Plugins" level="plugin">
-<component name="locationnpppsy" filter="s60" long-name="Location Positioning Proxy PSY" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
-</component>
-<component name="locationsuplpsy" filter="s60" long-name="Location SUPL PSY" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationsuplpsy/group"/>
-</component>
-<component name="genericpositioningplugins_build" filter="s60" long-name="Generic Positioning Plugins Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/genericpositioningplugins/group"/>
-</component>
-</collection>
-<collection name="landmarks" long-name="Landmarks" level="server">
-<component name="locationlandmarks" filter="s60" long-name="Location Landmarks">
-<unit bldFile="mw/locationsrv/landmarks/locationlandmarks/group"/>
-</component>
-</collection>
-<collection name="locationmapnavfw" long-name="Location Map and Navigation Framework" level="fw">
-<component name="mnlibrary" filter="s60" long-name="Map and Navigation Library">
-<unit bldFile="mw/locationsrv/locationmapnavfw/library/group"/>
-</component>
-<component name="mnaiwprovider" filter="s60" long-name="Map and Navigation AIW Provider" plugin="Y">
-<unit bldFile="mw/locationsrv/locationmapnavfw/aiwprovider/group"/>
-</component>
-<component name="locationmapnavfw_build" filter="s60" long-name="Location Map and Navigation Framework Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/locationmapnavfw/group"/>
-</component>
-</collection>
-<collection name="locationsystemui" long-name="Location System UI" level="if">
-<component name="locationsysui" filter="s60" long-name="Location System UI">
-<unit bldFile="mw/locationsrv/locationsystemui/locationsysui/group"/>
-</component>
-</collection>
-<collection name="supl" long-name="SUPL" level="fw">
-<component name="locationsuplfw" filter="s60" long-name="Location SUPL Framework">
-<unit bldFile="mw/locationsrv/supl/locationsuplfw/group"/>
-</component>
-<component name="locationomasuplprotocolhandler" filter="s60" long-name="OMA SUPL Protocol Handler">
-<unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/group"/>
-</component>
-<component name="supltiapiimplementation" filter="s60" long-name="SUPL TI API Implementation" introduced="^3">
-<unit bldFile="mw/locationsrv/supl/supltiapiimplementation/group"/>
-</component>
-</collection>
-<collection name="locationtriggering" long-name="Location Triggering" level="server">
-<component name="ltlogger" filter="s60" long-name="LT Logger">
-<unit bldFile="mw/locationsrv/locationtriggering/ltlogger/group"/>
-</component>
-<component name="ltclientlib" filter="s60" long-name="LT Client Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltclientlib/group"/>
-</component>
-<component name="ltmanagementlib" filter="s60" long-name="LT Management Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmanagementlib/group"/>
-</component>
-<component name="ltcontainer" filter="s60" long-name="LT Container">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontainer/group"/>
-</component>
-<component name="ltserver" filter="s60" long-name="LT Server">
-<unit bldFile="mw/locationsrv/locationtriggering/ltserver/group"/>
-</component>
-<component name="ltstrategypluginapi" filter="s60" long-name="LT Strategy Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategypluginapi/group"/>
-</component>
-<component name="ltstrategyengine" filter="s60" long-name="LT Strategy Engine">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategyengine/group"/>
-</component>
-<component name="ltmovementdetectionpluginapi" filter="s60" long-name="Movement Detection Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmovementdetectionpluginapi/group"/>
-</component>
-<component name="ltcellidmovementdetector" filter="s60" long-name="Cell ID Movement Detector">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/>
-</component>
-<component name="lbtmgmtui" filter="s60" long-name="LBT Management UI" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/lbtmgmtui/group"/>
-</component>
-<component name="ltcontextsourceplugin" filter="s60" long-name="LT Context Source Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontextsourceplugin/group"/>
-</component>
-<component name="locationtriggering_build" filter="s60" long-name="Location Triggering Build">
-<!-- should remove #include from this and maybe put exports in the above components -->
-<unit bldFile="mw/locationsrv/locationtriggering/group"/>
-</component>
-</collection>
-</block>
-<block name="accesssec" level="generic" long-name="Access Security" levels="plugin framework server generic specific">
-<collection name="accesssec_plat" long-name="Access Security Platform Interfaces" level="specific">
-<component name="wapi_security_settings_ui_api" long-name="WAPI Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_security_settings_ui_api/group"/>
-</component>
-<component name="wep_security_settings_ui_api" long-name="WEP Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wep_security_settings_ui_api/group"/>
-</component>
-<component name="wi-fi_protected_setup_ui_api" long-name="Wi-Fi Protected Setup UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
-</component>
-<component name="wlan_eap_settings_ui_api" long-name="WLAN EAP Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wlan_eap_settings_ui_api/group"/>
-</component>
-<component name="wpa_security_settings_ui_api" long-name="WPA Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wpa_security_settings_ui_api/group"/>
-</component>
-<component name="eap_vpn_api" long-name="EAP VPN API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
-</component>
-<component name="eapsim_db_api" long-name="EAP-SIM DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapsim_db_api/group"/>
-</component>
-<component name="eap_type_api" long-name="EAP Type API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_type_api/group"/>
-</component>
-<component name="eaptlspeap_db_api" long-name="EAP-TLS-PEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eaptlspeap_db_api/group"/>
-</component>
-<component name="eapleap_db_api" long-name="LEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapleap_db_api/group"/>
-</component>
-<component name="eapgtc_db_api" long-name="EAP-GTC DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapgtc_db_api/group"/>
-</component>
-<component name="eapmschapv2_db_api" long-name="EAP-MSCHAPV2 DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapmschapv2_db_api/group"/>
-</component>
-<component name="eapaka_db_api" long-name="EAP-AKA DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapaka_db_api/group"/>
-</component>
-<component name="wapi_db_api" long-name="WAPI DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_db_api/group"/>
-</component>
-</collection>
-<collection name="wlansecuritysettings" long-name="WLAN Security Settings" level="specific">
-<component name="wapisecuritysettingsui" filter="s60" long-name="WAPI Security Settings UI" introduced="9.1">
-<!-- the directory for this needs to be moved up to the right level -->
-<unit bldFile="mw/accesssec/wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
-</component>
-<component name="wepsecuritysettingsui" filter="s60" long-name="WEP Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wepsecuritysettingsui/group"/>
-</component>
-<component name="wifiprotectedsetup" filter="s60" long-name="WIFI Protected Setup" introduced="^1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wifiprotectedsetup/group"/>
-</component>
-<component name="wlaneapsettingsui" filter="s60" long-name="WLAN EAP Settings UI" introduced="9.3">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wlaneapsettingsui/group"/>
-</component>
-<component name="wpasecuritysettingsui" filter="s60" long-name="WPA Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wpasecuritysettingsui/group"/>
-</component>
-</collection>
-<collection name="eapol" long-name="EAPOL" level="framework">
-<component name="eapol_framework" filter="s60" long-name="EAPOL Framework" introduced="9.2">
-<unit bldFile="mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
-</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">
-<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>
-<component name="bearer_settings_plugin_api" long-name="Bearer Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/bearer_settings_plugin_api/group"/>
-</component>
-<component name="commsdat_wlan_api" long-name="CommsDat WLAN API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/commsdat_wlan_api/group"/>
-</component>
-<component name="connection_monitor_extension_api" long-name="Connection Monitor Extension API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_monitor_extension_api/group"/>
-</component>
-<component name="connection_ui_utilities_api" long-name="Connection UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_ui_utilities_api/group"/>
-</component>
-<component name="disconnect_dialog_api" long-name="Disconnect Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_api/group"/>
-</component>
-<component name="disconnect_dialog_disable_api" long-name="Disconnect Dialog Disable API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_disable_api/group"/>
-</component>
-<component name="extended_connection_settings_api" long-name="Extended Connection Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/extended_connection_settings_api/group"/>
-</component>
-<component name="mpm_default_connection_api" long-name="MPM Default Connection API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_default_connection_api/group"/>
-</component>
-<component name="pdpcontextmanager2_reset_factory_settings_api" long-name="PDP Context Manager 2 Reset Factory Settings API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_settings_api/group"/>
-</component>
-<component name="mpm_connect_screen_api" long-name="MPM Connect Screen API" filter="s60" class="api">
-<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">
-<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>
-<component name="access_point_engine_api" long-name="Access Point Engine API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_monitor_server_api/group"/>
-</component>
-<component name="connection_settings_ui_api" long-name="Connection Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_ui_api/group"/>
-</component>
-<component name="agent_dialog_api" long-name="Agent Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/agent_dialog_api/group"/>
-</component>
-<component name="extendedconnpref_api" long-name="Extended Connection Preferences API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/extendedconnpref_api/group"/>
-</component>
-</collection>
-<collection name="accesspointcontrol" long-name="Access Point Control" level="plugin">
-<component name="apcontrollistplugin" filter="s60" long-name="Access Point Control List Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
-</component>
-</collection>
-<collection name="alwayson_net_plugin" long-name="Always Online Net Plugin" level="server">
-<component name="pdpcontextmanager2" filter="s60" long-name="PDP Context Manager 2">
-<unit bldFile="mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
-</component>
-</collection>
-<collection name="apengine" long-name="Access Point Engine" level="framework">
-<component name="apeng" filter="s60" long-name="Access Point Engine">
-<unit bldFile="mw/ipconnmgmt/apengine/apeng/group"/>
-</component>
-<component name="apsettingshandlerui" filter="s60" long-name="Access Point Settings Handler UI">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingshandlerui/group"/>
-</component>
-<component name="apsettingsplugin" filter="s60" long-name="Access Point Settings Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="bearermanagement" long-name="Bearer Management" level="framework">
-<component name="mpm" filter="s60" long-name="Mobility Policy Manager">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/mpm/group"/>
-</component>
-<component name="extendedconnpref" filter="s60" long-name="Extended Connection Preferences">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/extendedconnpref/group"/>
-</component>
-<component name="s60mcpr" filter="s60" long-name="S60 Meta-Connection Provider" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/S60MCPR/group"/>
-</component>
-</collection>
-<collection name="cmmanager" long-name="Connection Method Manager" level="framework">
-<component name="cmmgr" filter="s60" long-name="CM Manager">
-<unit bldFile="mw/ipconnmgmt/cmmanager/cmmgr/group"/>
-</component>
-<component name="gsconnsettingsplugin" filter="s60" long-name="GS Connection Settings Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/cmmanager/gsconnsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="connectionmonitoring" long-name="Connection Monitoring" level="server">
-<component name="connectionmonitorplugin" filter="s60" long-name="Connection Monitor Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorplugin/group"/>
-</component>
-<component name="connectionmonitorui" filter="s60" long-name="Connection Monitor UI">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorui/group"/>
-</component>
-<component name="connmon" filter="s60" long-name="Connection Monitor">
-<!-- either split into two components, or #include from a common bld.inf -->
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/connectionmonitor/group"/>
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/dataconnectionlogger/group"/>
-</component>
-<component name="connmonext" filter="s60" long-name="Connection Monitor Extension API">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmonext/group"/>
-</component>
-</collection>
-<collection name="connectionutilities" long-name="Connection Utilities" level="utils">
-<component name="connectiondialogs" filter="s60" long-name="Connection Dialogs">
-<unit bldFile="mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/>
-</component>
-</collection>
-<collection name="dbcreator" long-name="DB Creator" level="utils">
-<component name="commsdatcreator" filter="s60" long-name="Comms Database Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
-</component>
-<component name="commsdatcreatorrfsplugin" filter="s60" long-name="Comms Database Creator RFS Plugin" introduced="9.3" plugin="Y">
-<!-- uncomment when config is turned on -->
-<!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
-</component>
-<component name="commsdatstartup" filter="s60" long-name="Comms Database Startup" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
-</component>
-<component name="dbcreatorexe" filter="s60" long-name="DB Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
-</component>
-<component name="dbcreator_build" filter="s60" long-name="DB Creator Build" introduced="9.3">
-<!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
-<unit bldFile="mw/ipconnmgmt/dbcreator/group"/>
-</component>
-</collection>
-<collection name="ipconnmgmt_info" long-name="IP Connectivity Management Info" level="utils">
-<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"/>
-</component>
-</collection>
-</block>
-<block name="netprotocols" level="generic" long-name="High-level Internet Protocols" levels="plugin framework server generic specific">
-<collection name="netprotocols_plat" long-name="High-level Internet Protocols Platform Interfaces" level="specific">
-<component name="cookie_manager_api" long-name="Cookie Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/cookie_manager_api/group"/>
-</component>
-<component name="http_cache_mgr_api" long-name="HTTP Cache Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_cache_mgr_api/group"/>
-</component>
-<component name="http_filters_api" long-name="HTTP Filters API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_filters_api/group"/>
-</component>
-</collection>
-<collection name="httpfilters" long-name="HTTP Filters" level="plugin">
-<component name="httpfiltercommon" filter="s60" long-name="HTTP Filter Common">
-<unit bldFile="mw/netprotocols/httpfilters/httpfiltercommon/group"/>
-</component>
-<component name="cookie" filter="s60" long-name="Cookie Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/cookie/group"/>
-</component>
-<component name="deflatefilter" filter="s60" long-name="Deflate Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/deflatefilter/group"/>
-</component>
-<component name="httpfilteracceptheader" filter="s60" long-name="Accept Header Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteracceptheader/group"/>
-</component>
-<component name="httpfilterauthentication" filter="s60" long-name="Authentication Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterauthentication/group"/>
-</component>
-<component name="httpfilterconnhandler" filter="s60" long-name="Connection Handler Fitler" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterconnhandler/group"/>
-</component>
-<component name="httpfilteriop" filter="s60" long-name="HTTP IOP Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteriop/group"/>
-</component>
-<component name="httpfilterproxy" filter="s60" long-name="HTTP Proxy Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterproxy/group"/>
-</component>
-<component name="uaproffilter" filter="s60" long-name="UAProf Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/uaproffilter/group"/>
-</component>
-</collection>
-<collection name="applayerprotocols" long-name="Application Layer Protocols" level="server">
-<component name="httptransportfw" long-name="HTTP Transport Framework" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
-</component>
-<component name="httpexamples" long-name="HTTP Examples" introduced="6.2" purpose="development">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpexamples/group" mrp="mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
-</component>
-<component name="wappushsupport" long-name="WAP Push Support" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
-</component>
-<component name="wapbase" long-name="WAP Base" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wapbase/Group" mrp="mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
-</component>
-<component name="ftpengine" long-name="FTP Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/ftpengine/group" mrp="mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
-</component>
-<component name="telnetengine" long-name="Telnet Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/telnetengine/group" mrp="mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
-</component>
-<component name="httpserviceapi" long-name="HTTP Service API" introduced="TB9.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpservice/group" mrp="mw/netprotocols/applayerprotocols/httpservice/group/http_service.mrp"/>
-</component>
-</collection>
-<collection name="applayerpluginsandutils" long-name="Application Layer Plugins and Utils" level="framework">
-<component name="uripermissionservices" long-name="URI Permission Services" introduced="^2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
-</component>
-<component name="bookmarksupport" long-name="Bookmark Support" introduced="9.1" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
-</component>
-<component name="httpprotocolplugins" long-name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
-</component>
-<component name="httptransportplugins" long-name="HTTP Transport Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
-</component>
-</collection>
-<collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
-<component name="netprotocols_metadata" long-name="High-level Internet Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ipappprotocols" level="generic" long-name="IP App Protocols" levels="plugin conn server if">
-<collection name="ipappprotocols_plat" long-name="IP App Protocols Platform Interfaces" level="if">
-<component name="srtp_api" long-name="SRTP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/srtp_api/group"/>
-</component>
-<component name="rtprtcp_api" long-name="RTP/RTCP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/rtprtcp_api/group"/>
-</component>
-</collection>
-<collection name="rtp" long-name="RTP" level="server">
-<component name="srtpstack" filter="s60" long-name="SRTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/srtpstack/group"/>
-</component>
-<component name="rtpstack" filter="s60" long-name="RTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/rtpstack/group"/>
-</component>
-</collection>
-<collection name="realtimenetprots" long-name="Real Time Net Protocols" level="server">
-<component name="symrtp" long-name="RTP" introduced="9.0" purpose="optional">
-<!-- Real Time Data Protocol -->
-<unit bldFile="mw/ipappprotocols/realtimenetprots/rtp/group" mrp="mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
-</component>
-<component name="sipfw" long-name="SIP Framework" introduced="9.2" purpose="optional">
-<unit bldFile="mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp" version="2"/>
-</component>
-</collection>
-<collection name="sipplugins" long-name="SIP Plugins" level="plugin">
-<component name="sippwlanplugin" filter="s60" long-name="SIP WLAN Plugin" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
-</component>
-<component name="sippsipsettingsui" filter="s60" long-name="SIP Settings UI" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
-</component>
-<component name="sippdevmgmtsipadapter" filter="s60" long-name="Device Management SIP Settings Adapter" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
-</component>
-<component name="sippsystemstatemonitor" filter="s60" long-name="SIP System State Monitor" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsystemstatemonitor/group"/>
-</component>
-<component name="sippsipadapter" filter="s60" long-name="SIP Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipadapter/group"/>
-</component>
-</collection>
-<collection name="sipproviderplugins" long-name="SIP Provider Plugins" level="conn">
-<component name="sipprovider" long-name="SIP Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipproviderplugins/sipprovider/group" mrp="mw/ipappprotocols/sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
-</component>
-</collection>
-<collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="if">
-<component name="ipappprotocols_metadata" long-name="IP App Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wirelessacc" level="specific" long-name="Wireless Access" levels="framework generic ui">
-<collection name="hsfw_plat" long-name="HotSpot Framework Platform Interfaces" level="ui">
-<component name="hotspot_framework_client_api" long-name="HotSpot Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_api" long-name="Internet Connectivity Test Service API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_settings_api" long-name="Internet Connectivity Test Service Settings API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
-</component>
-<component name="hotspot_framework_client_plugin_api" long-name="HotSpot Framework Client Plugin API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
-</component>
-</collection>
-<collection name="hotspotfw" long-name="HotSpot Framework" level="framework">
-<component name="hsserver" filter="s60" long-name="HotSpot Server" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="hsclient" filter="s60" long-name="HotSpot Client" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="internetconnectivitytestservice" filter="s60" long-name="Internet Connectivity Test Service" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
-</component>
-<component name="ictsdialogs" filter="s60" long-name="Internet Connectivity Test Service Dialogs" deprecated="^3" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
-</component>
-<component name="hspluginforagent" filter="s60" long-name="HotSpot Plugin for Agent" plugin="Y" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
-</component>
-<component name="hsbrowser" filter="s60" long-name="HotSpot Browser" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
-</component>
-<component name="hotspotfw_build" filter="s60" long-name="Hotspot Framework Build">
-<!-- should break up this bld.inf into the above components, or collapse them all into a single component -->
-<unit bldFile="mw/wirelessacc/hotspotfw/group"/>
-</component>
-</collection>
-<collection name="wlanutilities" long-name="WLAN Utilities" level="generic">
-<component name="wlanplugin" filter="s60" long-name="WLAN Plugin" plugin="Y">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlanplugin/group"/>
-</component>
-<component name="wlansettingsui" filter="s60" long-name="WLAN Settings UI">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlansettingsui/group"/>
-</component>
-<component name="wlansniffer" filter="s60" long-name="WLAN Sniffer">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlansniffer/group"/>
-</component>
-<component name="wlanindicatorplugin" filter="s60" long-name="WLAN Indicator Plugin" plugin="Y">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlanindicatorplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="vpnclient" level="specific" long-name="VPN Client" levels="engine ui api">
-<!-- is the !oem_build filter needed? -->
-<collection name="vpnc_plat" long-name="VPN Client Platform Interfaces" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API" class="api">
-<unit bldFile="mw/vpnclient/vpnc_plat/vpnapi/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API">
-<unit bldFile="mw/vpnclient/vpnapiimpl/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnengine" long-name="VPN Engine" level="engine">
-<!-- too many components in this collection.
- Probably best to group the binaries together into larger components
- or maybe split the collection into more reasonable groups -->
-<component name="eventmediatorapi" filter="s60" long-name="Event Mediator API">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediatorapi/group" filter="!oem_build"/>
-</component>
-<component name="eventviewer" filter="s60" long-name="Event Viewer">
-<unit bldFile="mw/vpnclient/vpnengine/eventviewer/group" filter="!oem_build"/>
-</component>
-<component name="vpnins" filter="s60" long-name="VPN Installer">
-<unit bldFile="mw/vpnclient/vpnengine/vpnins/group" filter="!oem_build"/>
-</component>
-<component name="ikepolparser" filter="s60" long-name="IKE Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/ikepolparser/group" filter="!oem_build"/>
-</component>
-<component name="utlbase64" filter="s60" long-name="Base64 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlbase64/group" filter="!oem_build"/>
-</component>
-<component name="utlcrypto" filter="s60" long-name="Crypto Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlcrypto/group" filter="!oem_build"/>
-</component>
-<component name="utlxml" filter="s60" long-name="XML Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlxml/group" filter="!oem_build"/>
-</component>
-<component name="utlpkcs10" filter="s60" long-name="PKCS#10 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs10/group" filter="!oem_build"/>
-</component>
-<component name="pkiserviceapi" filter="s60" long-name="PKI Service API">
-<unit bldFile="mw/vpnclient/vpnengine/pkiserviceapi/group" filter="!oem_build"/>
-</component>
-<component name="ikecert" filter="s60" long-name="IKE Certificate Management">
-<unit bldFile="mw/vpnclient/vpnengine/ikecert/group" filter="!oem_build"/>
-</component>
-<component name="kmdapi" filter="s60" long-name="Key Management Daemon API">
-<unit bldFile="mw/vpnclient/vpnengine/kmdapi/group" filter="!oem_build"/>
-</component>
-<component name="kmdserver" filter="s60" long-name="Key Management Daemon Server">
-<unit bldFile="mw/vpnclient/vpnengine/kmdserver/group" filter="!oem_build"/>
-</component>
-<component name="ikeutils" filter="s60" long-name="Internet Key Exchange Utils">
-<unit bldFile="mw/vpnclient/vpnengine/ikeutils/group" filter="!oem_build"/>
-</component>
-<component name="ikev1lib" filter="s60" long-name="IKEv1 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev1lib/group" filter="!oem_build"/>
-</component>
-<component name="ikev2lib" filter="s60" long-name="IKEv2 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev2lib/group" filter="!oem_build"/>
-</component>
-<component name="vpnipsecpolparser" filter="s60" long-name="VPN IPsec Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/vpnipsecpolparser/group" filter="!oem_build"/>
-</component>
-<component name="sit" filter="s60" long-name="Socket Interaction Thread">
-<unit bldFile="mw/vpnclient/vpnengine/sit/group" filter="!oem_build"/>
-</component>
-<component name="vpntcwrapper" filter="s60" long-name="VPN Terminal Control Wrapper">
-<unit bldFile="mw/vpnclient/vpnengine/vpntcwrapper/group" filter="!oem_build"/>
-</component>
-<component name="eventmediator" filter="s60" long-name="Event Mediator">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediator/group" filter="!oem_build"/>
-</component>
-<component name="pkiservice" filter="s60" long-name="PKI Service">
-<unit bldFile="mw/vpnclient/vpnengine/pkiservice/group" filter="!oem_build"/>
-</component>
-<component name="vpnconnagt" filter="s60" long-name="VPN Connection Agent">
-<unit bldFile="mw/vpnclient/vpnengine/vpnconnagt/group" filter="!oem_build"/>
-</component>
-<component name="vpnmanager" filter="s60" long-name="VPN Manager">
-<unit bldFile="mw/vpnclient/vpnengine/vpnmanager/group" filter="!oem_build"/>
-</component>
-<component name="vpncleaner" filter="s60" long-name="VPN Cleaner">
-<unit bldFile="mw/vpnclient/vpnengine/vpncleaner/group" filter="!oem_build"/>
-</component>
-<component name="utlpkcs12" filter="s60" long-name="PKCS#12 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs12/group" filter="!oem_build"/>
-</component>
-<component name="dmadengine" filter="s60" long-name="DM Adapter Engine">
-<unit bldFile="mw/vpnclient/vpnengine/dmadengine/group" filter="!oem_build"/>
-</component>
-<component name="dmadipsecvpn" filter="s60" long-name="IPsec VPN DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadipsecvpn/group" filter="!oem_build"/>
-</component>
-<component name="dmadpki" filter="s60" long-name="PKI DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadpki/group" filter="!oem_build"/>
-</component>
-<component name="ikesocket" filter="s60" long-name="IKE Socket" introduced="^3">
-<unit bldFile="mw/vpnclient/vpnengine/ikesocket/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnui" long-name="VPN UI" level="ui">
-<component name="vpnecomnotifier" filter="s60" long-name="VPN ECOM Notifier" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnecomnotifier/group" filter="!oem_build"/>
-</component>
-<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">
-<unit bldFile="mw/vpnclient/vpnui/vpnmanagementui/group" filter="!oem_build"/>
-</component>
-<component name="vpnpolins" filter="s60" long-name="VPN Policy Installer">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolins/group" filter="!oem_build"/>
-</component>
-<component name="vpnpolicyrecognizer" filter="s60" long-name="VPN Policy Recognizer" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolicyrecognizer/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnclient_info" long-name="VPN Client Info" level="api">
-<component name="vpnclient_help" filter="s60" long-name="VPN Client Help">
-<unit bldFile="mw/vpnclient/help/group" filter="!oem_build"/>
-</component>
-<component name="vpnclient_build" filter="s60" long-name="VPN Client Build">
-<!-- should split this up into the other components and remove this-->
-<unit bldFile="mw/vpnclient/group" filter="!oem_build"/>
-</component>
-</collection>
-</block>
-<block name="ipappsrv" level="specific" long-name="IP App Services" levels="framework generic server conn plugin">
-<collection name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" level="plugin">
-<component name="transcoder_api" long-name="Transcoder API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
-</component>
-<component name="comms_event_api" long-name="Comms Event API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/comms_event_api/group"/>
-</component>
-<component name="floor_control_api" long-name="Floor Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/floor_control_api/group"/>
-</component>
-<component name="media_control_api" long-name="Media Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/media_control_api/group"/>
-</component>
-<component name="multimedia_comms_api" long-name="Multimedia Comms API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/multimedia_comms_api/group"/>
-</component>
-<component name="nat_settings_api" long-name="NAT Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/nat_settings_api/group"/>
-</component>
-</collection>
-<collection name="natfw" long-name="NAT Framework" level="framework">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="natfw_build" filter="s60" long-name="NAT Framework Build" introduced="^2">
-<unit bldFile="mw/ipappsrv/natfw/group"/>
-</component>
-</collection>
-<collection name="multimediacommscontroller" long-name="Multimedia Comms Controller" level="conn">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommscontroller_build" filter="s60" long-name="Multimedia Comms Controller Build">
-<unit bldFile="mw/ipappsrv/multimediacommscontroller/group"/>
-</component>
-</collection>
-<collection name="multimediacommsengine" long-name="Multimedia Comms Engine" level="generic">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommsengine_build" filter="s60" long-name="Multimedia Comms Engine Build">
-<unit bldFile="mw/ipappsrv/multimediacommsengine/group"/>
-</component>
-</collection>
-<collection name="natplugins" long-name="NAT Plugins" level="plugin">
-<component name="natpcliprovisioningnatfwadapter" filter="s60" long-name="Client Provisioning NAT Framework Traversal Adapter" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/group"/>
-</component>
-<component name="natpdevmgmtnatfwadapter" filter="s60" long-name="Device Management NAT Framework Traversal Adapter" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/group"/>
-</component>
-<component name="natptraversalcontroller" filter="s60" long-name="NAT Traversal Controller" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natptraversalcontroller/group"/>
-</component>
-<component name="natpnatfwsdpprovider" filter="s60" long-name="NAT Framework SDP Provider" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpnatfwsdpprovider/group"/>
-</component>
-</collection>
-<collection name="ipappsrv_info" long-name="IP App Services Info" level="plugin">
-<component name="ipappsrv_build" long-name="IP App Services Build" filter="s60">
-<!-- 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">
-<collection name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" level="specific">
-<component name="string_parser_api" long-name="String Parser API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/string_parser_api/group"/>
-</component>
-<component name="cbs_mcn_client_api" long-name="CBS MCN Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cbs_mcn_client_api/group"/>
-</component>
-<component name="converged_call_engine_api" long-name="Converged Call Engine API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_engine_api/group"/>
-</component>
-<component name="aiw_dial_data_consumer_api" long-name="AIW Dial Data Consumer API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/aiw_dial_data_consumer_api/group"/>
-</component>
-<component name="phone_client_ussd_api" long-name="Phone Client USSD API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_api/group"/>
-</component>
-<component name="sat_refresh_api" long-name="SAT Refresh API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_refresh_api/group" filter="!test"/>
-</component>
-<component name="network_handling_engine_api" long-name="Network Handling Engine API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/network_handling_engine_api/group"/>
-</component>
-<component name="phone_client_emergency_call_api" long-name="Phone Client Emergency Call API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/group"/>
-</component>
-<component name="sat_configuration_api" long-name="SAT Configuration API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_configuration_api/group"/>
-</component>
-<component name="dial_utils_api" long-name="Dial Utils API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/dial_utils_api/group"/>
-</component>
-<component name="phone_client_image_handler_api" long-name="Phone Client Image Handler API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_image_handler_api/group"/>
-</component>
-<component name="phone_client_messenger_api" long-name="Phone Client Messenger API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_messenger_api/group"/>
-</component>
-<component name="sat_client_api" long-name="SAT Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_client_api/group" filter="!test"/>
-</component>
-<component name="phone_client_api" long-name="Phone Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_api/group"/>
-</component>
-<component name="sat_service_api" long-name="SAT Service API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_service_api/group" filter="!test"/>
-</component>
-<component name="cbs_message_api" long-name="CBS Message API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cbs_message_api/group"/>
-</component>
-<component name="phone_client_server_information_api" long-name="Phone Client Server Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_server_information_api/group"/>
-</component>
-<component name="phone_client_ussd_internal_api" long-name="Phone Client USSD Internal API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_internal_api/group"/>
-</component>
-<component name="phone_client_command_handler_api" long-name="Phone Client Command Handler API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_command_handler_api/group"/>
-</component>
-<component name="phone_client_notify_api" long-name="Phone Client Notify API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_notify_api/group"/>
-</component>
-<component name="phone_client_utility_api" long-name="Phone Client Utility API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_utility_api/group"/>
-</component>
-<component name="telephony_network_information_api" long-name="Telephony Network Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_network_information_api/group"/>
-</component>
-<component name="secondary_display_sat_api" long-name="Secondary Display SAT API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/secondary_display_sat_api/group"/>
-</component>
-<component name="callui_reconnect_query_api" long-name="CallUI Reconnect Query API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/callui_reconnect_query_api/group"/>
-</component>
-<component name="service_provider_settings_api" long-name="Service Provider Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/service_provider_settings_api/group"/>
-</component>
-<component name="converged_call_provider_api" long-name="Converged Call Provider API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_provider_api/group"/>
-</component>
-<component name="incoming_call_monitor_api" long-name="Incoming Call Monitor API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/incoming_call_monitor_api/group"/>
-</component>
-<component name="default_emergency_numbers_api" long-name="Default Emergency Numbers API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/default_emergency_numbers_api/group"/>
-</component>
-<component name="cenrep_database_api" long-name="Central Repository Database API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cenrep_database_api/group"/>
-</component>
-<component name="ss_settings_api" long-name="SS Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/ss_settings_api/group"/>
-</component>
-<component name="phone_settings_observer_api" long-name="Phone Settings Observer API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_observer_api/group"/>
-</component>
-<component name="phone_settings_notes_ui_api" long-name="Phone Settings Notes UI API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_notes_ui_api/group"/>
-</component>
-<component name="phone_settings_api" long-name="Phone Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_api/group"/>
-</component>
-<component name="voice_mailbox_number_api" long-name="Voice Mailbox Number API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_number_api/group"/>
-</component>
-<component name="voice_mailbox_settings_api" long-name="Voice Mailbox Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_settings_api/group"/>
-</component>
-<component name="call_information_api" long-name="Call Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/call_information_api/group" filter="!test"/>
-</component>
-<component name="call_remote_party_information_api" long-name="Call Remote Party Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/call_remote_party_information_api/group" filter="!test"/>
-</component>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_mediator_api/group"/>
-</component>
-</collection>
-<collection name="telutils" long-name="Telephony Utils" level="generic">
-<component name="phoneparser" filter="s60" long-name="Phone Parser">
-<unit bldFile="mw/phonesrv/telutils/phoneparser/group"/>
-</component>
-<component name="telephonyservice" filter="s60" long-name="Telephony Service">
-<unit bldFile="mw/phonesrv/telutils/telephonyservice/group"/>
-</component>
-</collection>
-<collection name="cbs" long-name="Cellular Baseband Services" level="plugin">
-<component name="cbsserver" filter="s60" long-name="CBS Server">
-<unit bldFile="mw/phonesrv/cbs/cbsserver/group"/>
-</component>
-<component name="cbsui" filter="s60" long-name="CBS UI">
-<unit bldFile="mw/phonesrv/cbs/cbsui/group"/>
-</component>
-</collection>
-<collection name="cellular" long-name="Cellular" level="server">
-<component name="telephonysettings" filter="s60" long-name="Telephony Settings">
-<unit bldFile="mw/phonesrv/cellular/telephonysettings/group"/>
-</component>
-<component name="sssettings" filter="s60" long-name="Supplementary Service Settings">
-<unit bldFile="mw/phonesrv/cellular/sssettings/group"/>
-</component>
-<component name="psetnotesui" filter="s60" long-name="Phone Settings Notes UI">
-<unit bldFile="mw/phonesrv/cellular/psetnotesui/group"/>
-</component>
-<component name="servicerequest" filter="s60" long-name="Service Request">
-<unit bldFile="mw/phonesrv/cellular/servicerequest/group"/>
-</component>
-</collection>
-<collection name="convergedcallengine" long-name="Converged Call Engine" level="framework">
-<component name="callprovider" filter="s60" long-name="Call Provider">
-<unit bldFile="mw/phonesrv/convergedcallengine/callprovider/group"/>
-</component>
-<component name="cce" filter="s60" long-name="CCE">
-<unit bldFile="mw/phonesrv/convergedcallengine/cce/group"/>
-</component>
-<component name="spsettings" filter="s60" long-name="Service Provider Settings">
-<unit bldFile="mw/phonesrv/convergedcallengine/spsettings/group"/>
-</component>
-<component name="cenrepdatabase" filter="s60" long-name="CCE Cenrep Database">
-<unit bldFile="mw/phonesrv/convergedcallengine/cenrepdatabase/group"/>
-</component>
-<component name="serviceselector" filter="s60" long-name="Service Selector">
-<unit bldFile="mw/phonesrv/convergedcallengine/serviceselector/group"/>
-</component>
-<component name="csplugin" filter="s60" long-name="CS Plugin" plugin="Y">
-<!-- should spell out CS in name -->
-<unit bldFile="mw/phonesrv/convergedcallengine/csplugin/group"/>
-</component>
-</collection>
-<collection name="engines" long-name="Telephony Engines" level="specific">
-<component name="vmbxengine" filter="s60" long-name="Voice Mailbox Engine">
-<unit bldFile="mw/phonesrv/engines/vmbxengine/group"/>
-</component>
-</collection>
-<collection name="networkhandling" long-name="Network Handling" level="plugin">
-<component name="networkhandlingengine" filter="s60" long-name="Network Handling Engine">
-<unit bldFile="mw/phonesrv/networkhandling/networkhandlingengine/group"/>
-</component>
-</collection>
-<collection name="phoneclientserver" long-name="Phone Client/Server" level="server">
-<component name="enpolicy" filter="s60" long-name="Emergency Number Policy">
-<unit bldFile="mw/phonesrv/phoneclientserver/enpolicy/group"/>
-</component>
-<component name="aiwdialdata" filter="s60" long-name="AIW Dial Data">
-<unit bldFile="mw/phonesrv/phoneclientserver/aiwdialdata/group"/>
-</component>
-<component name="dialutils" filter="s60" long-name="Dial Utils">
-<unit bldFile="mw/phonesrv/phoneclientserver/dialutils/group"/>
-</component>
-<component name="phoneclient" filter="s60" long-name="Phone Client">
-<unit bldFile="mw/phonesrv/phoneclientserver/phoneclient/group"/>
-</component>
-<component name="phoneserver" filter="s60" long-name="Phone Server">
-<unit bldFile="mw/phonesrv/phoneclientserver/phoneserver/group"/>
-</component>
-<component name="callui" filter="s60" long-name="Call UI">
-<unit bldFile="mw/phonesrv/phoneclientserver/callui/group"/>
-</component>
-</collection>
-<collection name="satengine" long-name="SIM Application Toolkit Engine" level="generic">
-<component name="satserver" filter="s60" long-name="SAT Server">
-<unit bldFile="mw/phonesrv/satengine/satserver/group"/>
-</component>
-</collection>
-<collection name="satui" long-name="SIM Application Toolkit UI" level="specific">
-<component name="satapp" filter="s60" long-name="SAT Application">
-<unit bldFile="mw/phonesrv/satui/satapp/group"/>
-</component>
-<component name="satplugin" filter="s60" long-name="SAT Plugin" plugin="Y">
-<unit bldFile="mw/phonesrv/satui/satplugin/group"/>
-</component>
-</collection>
-<collection name="phonecmdhandler" long-name="Phone Command Handler" level="generic">
-<component name="phonecmdhnlr" filter="s60" long-name="Phone Command Handler">
-<unit bldFile="mw/phonesrv/phonecmdhandler/phonecmdhnlr/group"/>
-</component>
-</collection>
-<collection name="phonesrv_info" long-name="Telephony and SIM Services Info" level="specific"/>
-</block>
-<block name="messagingmw" level="specific" long-name="Messaging Middleware" levels="stack fw api">
-<collection name="msgfw_pub" long-name="Messaging Middleware Public Interfaces" level="api">
-<component name="send_ui_api" long-name="Send UI API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_pub/send_ui_api/group"/>
-</component>
-</collection>
-<collection name="msgfw_plat" long-name="Messaging Middleware Platform Interfaces" level="api">
-<component name="always_online_plugin_api" long-name="Always Online Plugin API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_plugin_api/group"/>
-</component>
-<component name="always_online_client_api" long-name="Always Online Client API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_client_api/group"/>
-</component>
-<component name="msg_common_utils_api" long-name="Messaging Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/msg_common_utils_api/group"/>
-</component>
-<component name="send_ui_plugin_api" long-name="Send UI Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/send_ui_plugin_api/group"/>
-</component>
-<component name="send_ui_datautils_api" long-name="Send UI Data Utils API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/send_ui_datautils_api/group"/>
-</component>
-</collection>
-<collection name="msgbranched" long-name="Messaging Branched" level="fw">
-<!-- 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"/>
-</component>
-</collection>
-<collection name="messagingfw" long-name="Messaging Framework" level="fw">
-<!-- should break this collection up into smaller related collections -->
-<component name="alwaysonline" filter="s60" long-name="Always Online Server" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/alwaysonline/group"/>
-</component>
-<component name="msgcommonutils" filter="s60" long-name="Messaging Common Utils" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/msgcommonutils/group"/>
-</component>
-<component name="senduiservices" filter="s60" long-name="Send UI Services" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/senduiservices/group"/>
-</component>
-<component name="scheduledsendmtm" long-name="Scheduled Send MTM" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/group" mrp="mw/messagingmw/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
-</component>
-<component name="msgsrvnstore" long-name="Message Server and Store" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/group" mrp="mw/messagingmw/messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
-</component>
-<component name="biomsgfw" long-name="BIO Messaging Framework" introduced="6.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/group" mrp="mw/messagingmw/messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
-</component>
-<component name="msgconf" long-name="Messaging Config" introduced="^2" purpose="optional" class="config">
-<unit bldFile="mw/messagingmw/messagingfw/msgconf/group" mrp="mw/messagingmw/messagingfw/msgconf/group/messaging_config.mrp"/>
-</component>
-<component name="watcherfw" long-name="Watcher Framework" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/watcherfw/group" mrp="mw/messagingmw/messagingfw/watcherfw/group/messaging_watcher.mrp"/>
-</component>
-<component name="msgtest" long-name="Messaging Test" purpose="development">
-<unit bldFile="mw/messagingmw/messagingfw/msgtest/group" mrp="mw/messagingmw/messagingfw/msgtest/group/messaging_test.mrp"/>
-</component>
-<component name="sendas" long-name="Send As" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/sendas/group" mrp="mw/messagingmw/messagingfw/sendas/group/messaging_sendas2.mrp"/>
-</component>
-<component name="msgurlhandler" long-name="Message URL Handler" introduced="7.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/group" mrp="mw/messagingmw/messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
-</component>
-<component name="wappushfw" long-name="WAP Push Framework" introduced="6.1" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/wappushfw/group" mrp="mw/messagingmw/messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
-</component>
-<component name="suplsmshandler" long-name="SUPL SMS Handler" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplsmshandler/group" mrp="mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/>
-</component>
-<component name="suplwappushhandler" long-name="SUPL WAP Push Handler" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
-</component>
-</collection>
-<collection name="messagingmw_info" long-name="Messaging Middleware Info" level="api">
-<component name="messagingmw_metadata" long-name="Messaging Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="imsrv" level="specific" long-name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
-<collection name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" level="specific">
-<component name="ximp_core_data_model_api" long-name="XIMP Core Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_host_api" long-name="XIMP Presence Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_presence_data_model_api" long-name="XIMP Presence Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_api" long-name="XIMP Presence Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_presence_management_api" long-name="XIMP Presence Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_management_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_host_api" long-name="XIMP Core Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_core_management_api" long-name="XIMP Core Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_management_api/group"/>
-</component>
-<component name="ximp_presence_base_api" long-name="XIMP Presence Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_base_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_api" long-name="XIMP Core Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_core_base_api" long-name="XIMP Core Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_base_api/group"/>
-</component>
-<component name="ximp_presence_cache_api" long-name="XIMP Presence Cache API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_cache_api/group"/>
-</component>
-<component name="ximp_core_feature_plugin_api" long-name="XIMP Core Feature Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_host_api" long-name="XIMP IM Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_im_data_model_api" long-name="XIMP IM Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_data_model_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_api" long-name="XIMP IM Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_im_management_api" long-name="XIMP IM Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_management_api/group"/>
-</component>
-<component name="ximp_im_base_api" long-name="XIMP IM Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_base_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_host_api" long-name="XIMP Search Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_search_data_model_api" long-name="XIMP Search Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_data_model_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_api" long-name="XIMP search Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_search_management_api" long-name="XIMP Search Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_management_api/group"/>
-</component>
-<component name="ximp_search_base_api" long-name="XIMP Search Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_base_api/group"/>
-</component>
-<component name="xmpp_settings_api" long-name="XMPP Settings API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/group"/>
-</component>
-<component name="im_cache_client_api" long-name="IM Cache Client API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/im_cache_client_api/group"/>
-</component>
-<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 Avability Text" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
-</component>
-</collection>
-<collection name="ximpfw" long-name="XIMP Framework" level="framework">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="ximpfw_build" filter="s60" long-name="XIMP Framework Build">
-<unit bldFile="mw/imsrv/ximpfw/group"/>
-</component>
-</collection>
-<collection name="imservices" long-name="IM Services" level="generic">
-<component name="imfeatureplugin" filter="s60" long-name="IM Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/imfeatureplugin/group"/>
-</component>
-<component name="searchfeatureplugin" filter="s60" long-name="Search Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/searchfeatureplugin/group"/>
-</component>
-<component name="xmppsettingsapi" filter="s60" long-name="XMPP Settings API" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsapi/group"/>
-</component>
-<component name="xmppsettingsfetcher" filter="s60" long-name="XMPP Settings Fetcher" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/group"/>
-</component>
-<component name="ossprotocoladaptation" filter="s60" long-name="OSS Protocol Adaptation" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/ossprotocoladaptation/group"/>
-</component>
-<component name="instantmessagingcache" filter="s60" long-name="Instant Messaging Cache" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/instantmessagingcache/group"/>
-</component>
-</collection>
-<collection name="brandingserver" long-name="Branding Server" level="specific">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="brandingserver_build" filter="s60" long-name="Branding Server Build">
-<unit bldFile="mw/imsrv/brandingserver/group"/>
-</component>
-</collection>
-</block>
-<block name="legacypresence" level="specific" long-name="Legacy Presence Services" levels="engine fw ui">
-<collection name="pressrv_plat" long-name="Legacy Presence Services Platform Interfaces" level="ui">
-<component name="presence_list_api" long-name="Presence List API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/presence_list_api/group"/>
-</component>
-<component name="watcher_info_api" long-name="Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_info_api/group"/>
-</component>
-<component name="simple_documents_api" long-name="SIMPLE Documents API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_documents_api/group"/>
-</component>
-<component name="authorization_api" long-name="Authorization API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/authorization_api/group"/>
-</component>
-<component name="xdm_protocol_plugin_api" long-name="XDM Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_protocol_plugin_api/group"/>
-</component>
-<component name="watcher_api" long-name="Watcher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_api/group"/>
-</component>
-<component name="xdm_api" long-name="XDM API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_api/group"/>
-</component>
-<component name="registration_api" long-name="Registration API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/registration_api/group"/>
-</component>
-<component name="publisher_api" long-name="Publisher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/publisher_api/group"/>
-</component>
-<component name="messaging_connection_manager_api" long-name="Messaging Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/messaging_connection_manager_api/group"/>
-</component>
-<component name="xdm_settings_api" long-name="XDM Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_settings_api/group"/>
-</component>
-<component name="simple_settings_api" long-name="SIMPLE Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_settings_api/group"/>
-</component>
-<component name="simple_instant_msg_api" long-name="Simple Instant Msg API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_instant_msg_api/group"/>
-</component>
-</collection>
-<collection name="xdmengine" long-name="XDM Engine" level="engine">
-<!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
-<component name="xdmengine_build" filter="s60" long-name="XDM Engine Build">
-<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">
-<unit bldFile="mw/legacypresence/xdmprotocols/group"/>
-</component>
-</collection>
-<collection name="msgconnmanager" long-name="Messaging Connection Manager" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="msgconnmanager_build" filter="s60" long-name="Messaging Connection Manager Build">
-<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">
-<unit bldFile="mw/legacypresence/simpleengine/group"/>
-</component>
-</collection>
-<collection name="presencefwsimpleadpt" long-name="Presence Framework SIMPLE Adaptation" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="simpleplugin" filter="s60" long-name="SIMPLE Plugin" plugin="Y">
-<unit bldFile="mw/legacypresence/presencefwsimpleadpt/group"/>
-</component>
-</collection>
-<collection name="simpledatamodeladapter" long-name="SIMPLE Data Model Adapter" level="fw">
-<component name="presenceplugin" filter="s60" long-name="Presence Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/legacypresence/simpledatamodeladapter/group"/>
-</component>
-</collection>
-</block>
-<block name="opensrv" level="specific" long-name="Open Services" levels="prt lib server eng">
-<collection name="opensrv_plat" long-name="Open Services Platform Interfaces" level="eng">
-<component name="messagequeue_api" long-name="Message Queue API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/opensrv/opensrv_plat/messagequeue_api/group"/>
-</component>
-</collection>
-<collection name="loudmouth" long-name="Loudmouth" level="prt">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="loudmouth_build" filter="s60" long-name="Loudmouth Build" introduced="^2">
-<unit bldFile="mw/opensrv/loudmouth/group"/>
-</component>
-</collection>
-<collection name="libtelepathy" long-name="Telepathy Library" level="lib">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="libtelepathy_build" filter="s60" long-name="Telepathy Library Build" introduced="^2">
-<unit bldFile="mw/opensrv/libtelepathy/group"/>
-</component>
-</collection>
-<collection name="telepathygabble" long-name="Telepathy Gabble" level="eng">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="telepathygabble_build" filter="s60" long-name="Telepathy Gabble Build" introduced="^2">
-<unit bldFile="mw/opensrv/telepathygabble/group"/>
-</component>
-</collection>
-<collection name="isolationserver" long-name="Isolation Server" level="server">
-<component name="messagequeue" filter="s60" long-name="Message Queue" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/messagequeue/group"/>
-</component>
-<component name="isoserver" filter="s60" long-name="ISO Server" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/isoserver/group"/>
-</component>
-<component name="isolationserver_build" filter="s60" long-name="Isloation Server Build" introduced="^2">
-<!-- needs #includes removed. either move the exports to another component or make this a ROM component -->
-<unit bldFile="mw/opensrv/isolationserver/group"/>
-</component>
-</collection>
-</block>
-<block name="remotemgmt" level="specific" long-name="Remote Management" levels="plugin framework server generic specific">
-<collection name="remotemgmt_pub" long-name="Remote Management Public Interfaces" level="specific">
-<component name="synchronization_capability_api" long-name="Synchronization Capability API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
-</component>
-</collection>
-<collection name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" level="specific">
-<component name="common_agent_util_and_definitions_api" long-name="Common Agent util and definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
-</component>
-<component name="policy_management_certificate_api" long-name="Policy Management Certificate API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/group"/>
-</component>
-<component name="oma_provisioning_adapter_api" long-name="OMA Provisioning Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_adapter_api/group"/>
-</component>
-<component name="device_management_parameter_api" long-name="Device Management Parameter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_parameter_api/group"/>
-</component>
-<component name="data_synchronization_plugin_api" long-name="Data Synchronization Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/group"/>
-</component>
-<component name="sync_alert_handler_api" long-name="Sync Alert Handler API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
-</component>
-<component name="syncml_notifier_api" long-name="SyncML Notifier API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
-</component>
-<component name="syncml_client_api" long-name="SyncML Client API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
-</component>
-<component name="device_management_plugin_api" long-name="Device Management plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_plugin_api/group"/>
-</component>
-<component name="dm_tree_apis" long-name="DM Tree APIs" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
-</component>
-<component name="terminal_security_device_lock_api" long-name="Terminal Security Device Lock API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/group"/>
-</component>
-<component name="policy_management_request_api" long-name="Policy Management Request API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/group"/>
-</component>
-<component name="ds_constant_definitions_api" long-name="DS Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_constant_definitions_api/group"/>
-</component>
-<component name="scp_server_api" long-name="SCP Server API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/group"/>
-</component>
-<component name="data_synchronization_notification_api" long-name="Data Synchronization Notification API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_notification_api/group"/>
-</component>
-<component name="oma_provisioning_engine_api" long-name="OMA Provisioning Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/group"/>
-</component>
-<component name="dm_utils_api" long-name="DM Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/group"/>
-</component>
-<component name="syncml_alert_api" long-name="SyncML Alert API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/group"/>
-</component>
-<component name="obex_client_session_api" long-name="OBEX Client session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/obex_client_session_api/group"/>
-</component>
-<component name="setting_enforcement_info_api" long-name="Setting Enforcement Info API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/group"/>
-</component>
-<component name="dm_constant_definitions_api" long-name="DM Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
-</component>
-<component name="oma_ds_extensions_api" long-name="OMA DS Extensions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
-</component>
-<component name="pnpms_utils_api" long-name="PNPMS Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
-</component>
-<component name="diagnostics_plugin_utility_api" long-name="Diagnostics Plugin Utility API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
-</component>
-<component name="diagnostics_plugin_api" long-name="Diagnostics Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
-</component>
-<component name="diagnostics_framework_api" long-name="Diagnostics Framework API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
-</component>
-<component name="diagnostics_results_api" long-name="Diagnostics Results API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
-</component>
-<component name="diagnostics_plugin_pool_api" long-name="Diagnostics Plugin Pool API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
-</component>
-<component name="adaptive_history_list_api" long-name="Adaptive History List API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
-</component>
-<component name="adaptive_history_list_session_api" long-name="Adaptive History List Session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
-</component>
-<component name="fota_engine_api" long-name="FOTA Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
-</component>
-<component name="update_package_storage_plugin_api" long-name="Update Package Storage Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
-</component>
-<component name="syncml_notifier_roaming_api" long-name="SyncML Notifier Roaming API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
-</component>
-<component name="sync_service_api" long-name="Sync Service API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_service_api/group"/>
-</component>
-<component name="dcmo_adapter_api" long-name="DCMO Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_adapter_api/group"/>
-</component>
-<component name="dcmo_control_api" long-name="DCMO Control API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_control_api/group"/>
-</component>
-<component name="ds_capability_mgmt_plugin_api" long-name="DS Capability Management Plugin API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
-</component>
-<component name="dm_native_notifier_api" long-name="DM Native Notifier API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_native_notifier_api/group"/>
-</component>
-<component name="syncml_ds_error_reporting_api" long-name="SyncML DS Error Reporting API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_ds_error_reporting_api/group"/>
-</component>
-<component name="syncml_ds_customization_api" long-name="SyncML DS Customization API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_ds_customization_api/group"/>
-</component>
-</collection>
-<collection name="policymanagement" long-name="Policy Management" level="generic">
-<component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">
-<unit bldFile="mw/remotemgmt/policymanagement/pmdmadapter/group"/>
-</component>
-<component name="dmutilserver" filter="s60" long-name="DM Util Server">
-<unit bldFile="mw/remotemgmt/policymanagement/dmutilserver/group"/>
-</component>
-<component name="policyengine" filter="s60" long-name="Policy Engine">
-<unit bldFile="mw/remotemgmt/policymanagement/policyengine/group"/>
-</component>
-<component name="policymanagement_build" filter="s60" long-name="Policy Management Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/policymanagement/group"/>
-</component>
-</collection>
-<collection name="syncmlfw" long-name="SyncML Framework" level="server">
-<component name="syncmlfw_build" filter="s60" long-name="SyncML Framework Build">
-<!-- need to break this up into components. Too convoluted a structure to be in a single bld.inf-->
-<unit bldFile="mw/remotemgmt/syncmlfw/group"/>
-</component>
-</collection>
-<collection name="terminalsecurity" long-name="Terminal Security" level="specific">
-<component name="scp" filter="s60" long-name="Security Code Proxy">
-<!-- can only have one unit, need to have these #included from a single bld.inf -->
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpdatabase/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpserver/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scppatternplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scphistoryplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scptimestampplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpeventhandler/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/dmeventnotifier/group"/>
-</component>
-<component name="terminalsecurity_client" filter="s60" long-name="Terminal Control Client">
-<unit bldFile="mw/remotemgmt/terminalsecurity/client/group"/>
-</component>
-<component name="terminalsecurity_server" filter="s60" long-name="Terminal Control Server">
-<unit bldFile="mw/remotemgmt/terminalsecurity/server/group"/>
-</component>
-<component name="tcadapter" filter="s60" long-name="Terminal Control Adapter">
-<unit bldFile="mw/remotemgmt/terminalsecurity/tcadapter/bld"/>
-</component>
-<component name="terminalsecurity_build" filter="s60" long-name="Terminal Security Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/terminalsecurity/group"/>
-</component>
-</collection>
-<collection name="omaprovisioning" long-name="OMA Provisioning" level="specific">
-<component name="pnputil" filter="s60" long-name="PnP Util">
-<unit bldFile="mw/remotemgmt/omaprovisioning/pnputil/group"/>
-</component>
-<component name="provisioning" filter="s60" long-name="Provisioning">
-<unit bldFile="mw/remotemgmt/omaprovisioning/provisioning/group"/>
-</component>
-</collection>
-<collection name="devicediagnosticsfw" long-name="Device Diagnostics Framework" level="framework">
-<component name="diagframework" filter="s60" long-name="Diagnostics Framework">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
-</component>
-<component name="diagpluginbase" filter="s60" long-name="Diagnostics Plugin Base">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
-</component>
-<component name="diagresultsdb" filter="s60" long-name="Diagnostics Results Database">
-<!-- can only have one unit, merge or split into two components -->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
-</component>
-<component name="devicediagnosticsfw_build" filter="s60" long-name="Device Diagnostics Framework Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/group"/>
-</component>
-</collection>
-<collection name="dcmofw" long-name="Device Capability Management Object Framework" level="framework">
-<component name="dcmoclient" filter="s60" long-name="DCMO Client">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoclient/group"/>
-</component>
-<component name="dcmoserver" filter="s60" long-name="DCMO Server">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoserver/group"/>
-</component>
-<component name="dcmocustcmd" filter="s60" long-name="DCMO Custom Commands">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmocustcmd/group"/>
-</component>
-<component name="dcmofw_build" filter="s60" long-name="DCMO Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/dcmofw/group"/>
-</component>
-</collection>
-<collection name="fotaapplication" long-name="FOTA Application" level="generic">
-<component name="fotaapplication_build" filter="s60" long-name="FOTA Application Build">
-<!-- remove this component when configuration is in place and the #ifdefs have been worked out -->
-<unit bldFile="mw/remotemgmt/fotaapplication/group"/>
-</component>
-<component name="fotaserver" filter="s60" long-name="FOTA Server">
-<!-- uncomment when #ifdefs are resolved -->
-<!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
-</component>
-<component name="fotacustcmds" filter="s60" long-name="FOTA Custom Commands" class="placeholder">
-<!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
-<!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
-</component>
-</collection>
-</block>
-<block name="remotestorage" level="generic" long-name="Remote Storage" levels="framework if">
-<collection name="rsfw_plat" long-name="Remote Storage Platform Interfaces" level="if">
-<component name="rsfw_access_protocol_plugin_api" filter="s60" long-name="Remote Storage Framework Access Protocol Plugin API" class="api">
-<unit bldFile="mw/remotestorage/rsfw_plat/rsfw_access_protocol_plugin_api/group"/>
-</component>
-</collection>
-<collection name="remotestoragefw" long-name="Remote Storage Framework" level="framework">
-<component name="mountstore" filter="s60" long-name="RSFW Mount Store">
-<unit bldFile="mw/remotestorage/remotestoragefw/mountstore/group"/>
-</component>
-<component name="rsfwnotifierplugins" filter="s60" long-name="RSFW Notifier Plugins" plugin="Y">
-<unit bldFile="mw/remotestorage/remotestoragefw/rsfwnotifierplugins/group"/>
-</component>
-<component name="remotefileengine" filter="s60" long-name="Remote File Engine">
-<unit bldFile="mw/remotestorage/remotestoragefw/remotefileengine/group"/>
-</component>
-<component name="mountmanager" filter="s60" long-name="RSFW Mount Manager">
-<unit bldFile="mw/remotestorage/remotestoragefw/mountmanager/group"/>
-</component>
-<component name="webdavaccessplugin" filter="s60" long-name="WebDAV Access Plugin" plugin="Y">
-<unit bldFile="mw/remotestorage/remotestoragefw/webdavaccessplugin/group"/>
-</component>
-<component name="remotefilesystemplugin" filter="s60" long-name="Remote Filesystem Plugin" plugin="Y">
-<unit bldFile="mw/remotestorage/remotestoragefw/remotefilesystemplugin/group"/>
-</component>
-<component name="remotestoragegsplugin" filter="s60" long-name="RS GS Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
-<!-- <unit bldFile="remotestoragefw/gsplugin/group"/>-->
-</component>
-<component name="remotedriveconfigurationbiocontrol" filter="s60" long-name="Remote Drive Configuration BIO Control">
-<!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
-<!-- <unit bldFile="remotestoragefw/remotedriveconfigurationbiocontrol/group"/>-->
-</component>
-<component name="remotestoragefw_build" filter="s60" long-name="Remote Storage Framework Build">
-<!-- move exports to other components.
- This is needed for #includes of configured component until congigiration is in place -->
-<unit bldFile="mw/remotestorage/remotestoragefw/group"/>
-</component>
-</collection>
-</block>
-<block name="remoteconn" level="generic" long-name="Remote Connectivity" levels="plugin framework server generic specific">
-<collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
-<component name="secon" filter="s60" long-name="Service Controllers">
-<unit bldFile="mw/remoteconn/connectivitymodules/secon/group"/>
-</component>
-</collection>
-<collection name="remoteconn_info" long-name="Remote Connectivity Info" level="specific">
-<component name="remoteconn_metadata" long-name="Remote Connectivity Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mtptransports" long-name="MTP Transports" level="plugin">
-<component name="mtpusbtransport" long-name="MTP USB Transport" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpusbtransport/group" mrp="mw/remoteconn/mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
-</component>
-<component name="mtpptpiptransport" long-name="MTP PTP-IP Transport" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpptpiptransport/group" mrp="mw/remoteconn/mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
-</component>
-<component name="mtpcontroller" long-name="MTP Controller" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpcontroller/group" mrp="mw/remoteconn/mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
-</component>
-</collection>
-<collection name="mtpfws" long-name="MTP Frameworks" level="framework">
-<component name="mtpfw" long-name="MTP Framework" introduced="^2" purpose="optional">
-<unit bldFile="mw/remoteconn/mtpfws/mtpfw/group" mrp="mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/>
-</component>
-</collection>
-<collection name="mtpdataproviders" long-name="MTP Data Providers" level="generic">
-<component name="mtpfileandfolderdp" long-name="MTP File and Folder Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group" mrp="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
-</component>
-<component name="mtpimagedp" long-name="MTP Image Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpimagedp/group" mrp="mw/remoteconn/mtpdataproviders/mtpimagedp/group/mtp_imagedp.mrp"/>
-</component>
-<component name="mtppictbridgedp" long-name="MTP PictBridge Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group" mrp="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group/mtp_pictbridgedp.mrp"/>
-</component>
-</collection>
-<collection name="backupandrestore" long-name="Backup and Restore" level="specific">
-<component name="backupengine" long-name="Backup Engine" introduced="9.0" purpose="optional">
-<unit bldFile="mw/remoteconn/backupandrestore/backupengine/group" mrp="mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
-</component>
-<component name="backuptest" long-name="Backup Test" introduced="^2" purpose="development">
-<unit bldFile="mw/remoteconn/backupandrestore/backuptest/group" mrp="mw/remoteconn/backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
-</component>
-</collection>
-<collection name="obex" long-name="OBEX" level="generic">
-<component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexprotocol/group" mrp="mw/remoteconn/obex/obexprotocol/group/obex.mrp"/>
-</component>
-<component name="obexextensionapi" long-name="OBEX Extension API" introduced="9.2" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexextensionapi/group" mrp="mw/remoteconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
-</component>
-</collection>
-</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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<unit mrp="mw/srvdiscovery/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="dlnasrv" level="specific" long-name="DLNA Services" levels="stack server ctrl framework plugin">
-<!-- uncomment all the units when configuration is in place, they're currently #included from other xxx_build components -->
-<collection name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" level="plugin">
-<component name="upnp_media_server_settings_api" long-name="UPnP Media Server Settings API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_settings_api/group"/>
-</component>
-<component name="upnp_av_objects_api" long-name="UPnP A/V Objects API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_av_objects_api/group"/>
-</component>
-<component name="upnp_media_server_api" long-name="UPnP Media Server API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_api/group"/>
-</component>
-<component name="upnp_security_plugin_api" long-name="UPnP Security Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_security_plugin_api/group"/>
-</component>
-<component name="upnp_avcp_api" long-name="UPnP AVCP API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_avcp_api/group"/>
-</component>
-<component name="upnp_media_server_metadata_api" long-name="UPnP Media Server Metadata API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_metadata_api/group"/>
-</component>
-<component name="upnp_command_api" long-name="UPnP Command API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_command_api/group"/>
-</component>
-<component name="upnp_plugin_api" long-name="UPnP Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_plugin_api/group"/>
-</component>
-</collection>
-<collection name="upnpavcontrolpoint" long-name="UPnP A/V Control Point" level="plugin">
-<component name="avcontrolframework" filter="s60" long-name="A/V Control Famework" introduced="9.1" deprecated="^3">
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
-</component>
-<component name="upnpavcontrolpoint_build" filter="s60" long-name="UPnP A/V Control Point Build" introduced="9.1" deprecated="^3">
-<!-- put exports in other component instead -->
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/group"/>
-</component>
-</collection>
-<collection name="upnpmediaserver" long-name="UPnP Media Server" level="server">
-<component name="avobjects" filter="s60" long-name="A/V Objects">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/avobjects/group"/>
-</component>
-<component name="mediaserverclient" filter="s60" long-name="Media Server Client">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverclient/group"/>
-</component>
-<component name="connectionmanagerservice" filter="s60" long-name="Connection Manager Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/connectionmanagerservice/group"/>
-</component>
-<component name="contentdirectoryservice" filter="s60" long-name="Content Directory Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/contentdirectoryservice/group"/>
-</component>
-<component name="mediaserverengine" filter="s60" long-name="Media Server Engine">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverengine/group"/>
-</component>
-<component name="upnpmediaserver_build" filter="s60" long-name="UPnP Media Server Build">
-<!-- move exports into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpmediaserver/group"/>
-</component>
-</collection>
-<collection name="upnpavcontroller" long-name="UPnP A/V Controller" level="ctrl">
-<component name="upnpxmlparser" filter="s60" long-name="UPnP XML Parser" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpxmlparser/group"/>
-</component>
-<component name="upnpavcontrollerserver" filter="s60" long-name="UPnP A/V Controller Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerserver/group"/>
-</component>
-<component name="upnpavcontrollerclient" filter="s60" long-name="UPnP A/V Ccontroller Client" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerclient/group"/>
-</component>
-<component name="upnpavcontrollerhelper" filter="s60" long-name="UPnP A/V Controller Helper" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerhelper/group"/>
-</component>
-<component name="upnpavcontroller_build" filter="s60" long-name="UPnP A/V Controller Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpavcontroller/group"/>
-</component>
-</collection>
-<collection name="upnpframework" long-name="UPnP Framework" level="framework">
-<component name="upnputilities" filter="s60" long-name="UPnP Utilities" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnputilities/group"/>
-</component>
-<component name="upnpextensionpluginif" filter="s60" long-name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpextensionpluginif/group"/> -->
-</component>
-<component name="upnpfiletransferengine" filter="s60" long-name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>-->
-</component>
-<component name="upnpcommonui" filter="s60" long-name="UPnP Common UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpcommonui/group"/>-->
-</component>
-<component name="upnpaiwengine" filter="s60" long-name="UPnP AIW Engine" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpaiwengine/group"/> -->
-</component>
-<component name="upnpaiwprovider" filter="s60" long-name="UPnP AIW Provider" introduced="^2" deprecated="^3" plugin="Y">
-<!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
-</component>
-<component name="upnpmusicadapter" filter="s60" long-name="UPnP Music Adapter" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
-</component>
-<component name="upnpcommand" filter="s60" long-name="UPnP Command" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpcommand/group"/>
-</component>
-<component name="upnpframework_build" filter="s60" long-name="UPnP Framework Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpframework/group"/>
-</component>
-</collection>
-<collection name="upnpsettings" long-name="UPnP Settings" level="framework">
-<component name="upnpsettingsengine" filter="s60" long-name="UPnP Settings Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
-</component>
-<component name="multiselectionui" filter="s60" long-name="Multi-Selection UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/multiselectionui/group"/>-->
-</component>
-<component name="appwizard" filter="s60" long-name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/appwizard/group"/>-->
-</component>
-<component name="upnpsharingui" filter="s60" long-name="UPnP Sharing UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
-</component>
-<component name="upnpgsplugin" filter="s60" long-name="UPnP GS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
-</component>
-<component name="upnpsettings_build" filter="s60" long-name="UPnP Settings Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsettings/group"/>
-</component>
-</collection>
-<collection name="upnpsharing" long-name="UPnP Sharing" level="server">
-<component name="upnpdlnaprofiler" filter="s60" long-name="UPnP DLNA Profiler" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpdlnaprofiler/group"/>
-</component>
-<component name="upnpsecurity" filter="s60" long-name="UPnP Security" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpsecurity/group"/>
-</component>
-<component name="upnpcontentserver" filter="s60" long-name="UPnP Content Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpcontentserver/group"/>
-</component>
-<component name="applicationengine" filter="s60" long-name="UPnP Application Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/applicationengine/group"/>
-</component>
-<component name="upnpsharing_build" filter="s60" long-name="UPnP Sharing Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsharing/group"/>
-</component>
-</collection>
-<collection name="upnpmpxplugins" long-name="UPnP MPX Plugins" level="plugin">
-<component name="upnpplaybackplugins" filter="s60" long-name="UPnP Playback Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/upnpplaybackplugins/group"/>
-</component>
-<component name="upnpmpxplugins_build" filter="s60" long-name="UPnP MPX Plugins Build" introduced="^2">
-<!-- move exports content into other component? -->
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/group"/>
-</component>
-</collection>
-<collection name="upnpharvester" long-name="UPnP Harvester" level="ctrl">
-<component name="upnpharvester_common" filter="s60" long-name="UPnP Harvester Common" introduced="^2" deprecated="^3" class="placeholder">
-<!-- need to merge or #include these to a single bld.inf -->
-<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
- <unit bldFile="upnpharvester/common/cmsettings/group"/>
- <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
- <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
-</component>
-<component name="cdssync" filter="s60" long-name="CDS Sync" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
-</component>
-<component name="mdhserver" filter="s60" long-name="Metadata Harvester Server" introduced="^2" deprecated="^3" class="placeholder">
-<!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
-</component>
-<component name="upnpharvester_build" filter="s60" long-name="UPnP Harvester Build" introduced="^2" deprecated="^3" class="placeholder">
-<!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
-<!--<unit bldFile="upnpharvester/group"/>-->
-</component>
-</collection>
-<collection name="homesync" long-name="Home Sync" level="plugin">
-<component name="contentmanager" filter="s60" long-name="Content Manager" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homesync/group"/>-->
-<!-- move bld.inf into contentmanager dir -->
-</component>
-</collection>
-<collection name="homemedia" long-name="Home Media" level="framework">
-<!-- collection is really just a component. Move down a directory -->
-<component name="homemedia_build" filter="s60" long-name="Home Media" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homemedia/group"/> -->
-</component>
-</collection>
-<collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin">
-<component name="dlnasrv_build" filter="s60" long-name="DLNA Services Build">
-<!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed -->
-<unit bldFile="mw/dlnasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="btservices" level="generic" long-name="Bluetooth Services" levels="framework server generic specific plugin">
-<collection name="btservices_pub" long-name="BT Services Public Interfaces" level="plugin">
-<component name="bluetooth_power_state_api" long-name="Bluetooth Power State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_power_state_api/group"/>
-</component>
-<component name="bluetooth_notifier_api" long-name="Bluetooth Notifier API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_notifier_api/group"/>
-</component>
-</collection>
-<collection name="btservices_plat" long-name="BT Services Platform Interfaces" level="plugin">
-<component name="bluetooth_dosserver_audio_api" long-name="Bluetooth DOS Server Audio API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dosserver_audio_api/group"/>
-</component>
-<component name="bluetooth_dut_mode_api" long-name="Bluetooth DUT Mode API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dut_mode_api/group"/>
-</component>
-<component name="bluetooth_engine_api" long-name="Bluetooth Engine API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-<component name="bluetooth_local_variation_api" long-name="Bluetooth Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_local_variation_api/group"/>
-</component>
-<component name="bluetooth_notifier_internal_api" long-name="Bluetooth Notifier internal API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_notifier_internal_api/group"/>
-</component>
-<component name="bluetooth_sap_connection_state_api" long-name="Bluetooth SAP Connection State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_sap_connection_state_api/group"/>
-</component>
-<component name="bluetooth_secondary_display_notification_api" long-name="Bluetooth Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_secondary_display_notification_api/group"/>
-</component>
-</collection>
-<collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
-<component name="bteng" filter="s60" long-name="Bluetooth Engine">
-<unit bldFile="mw/btservices/bluetoothengine/bteng/group"/>
-</component>
-<component name="btnotif" filter="s60" long-name="Bluetooth Notifier">
-<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"/>
-</component>
-<component name="btmac" filter="s60" long-name="Bluetooth Mono Audio Controller" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btmac/group"/>
-</component>
-<component name="btsac" filter="s60" long-name="Bluetooth Stereo Audio Controller" plugin="Y">
-<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"/>
-</component>
-<component name="btsap" filter="s60" long-name="Bluetooth SIM Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btsap/group"/>
-</component>
-<component name="btui" filter="s60" long-name="Bluetooth UI">
-<unit bldFile="mw/btservices/bluetoothengine/btui/group"/>
-</component>
-<component name="btpbap" filter="s60" long-name="Bluetooth Phonebook Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btpbap/group"/>
-</component>
-<component name="bthid" filter="s60" long-name="Bluetooth HID">
-<unit bldFile="mw/btservices/bluetoothengine/bthid/group"/>
-</component>
-<component name="btctrldcmoadapter" filter="s60" long-name="Bluetooth Control DCMO Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btctrldcmoadapter/group"/>
-</component>
-</collection>
-<collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
-<component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
-<unit bldFile="mw/btservices/bluetoothappprofiles/avrcp" mrp="mw/btservices/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
-</component>
-</collection>
-<collection name="atcommands" long-name="AT Commands" level="generic">
-<component name="modematplugin" long-name="Modem AT Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/modematplugin/group"/>
-</component>
-<component name="lccustomplugin" long-name="LC Custom Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/lccustomplugin/group"/>
-</component>
-</collection>
-<collection name="btservices_info" long-name="BT Services Info" level="plugin">
-<component name="btservices_metadata" long-name="BT Services Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usbservices" level="generic" long-name="USB Services" levels="framework server generic specific plugin">
-<collection name="usbservices_plat" long-name="USB Services Platform Interfaces" level="plugin">
-<component name="pictbridge_api" long-name="PictBridge API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/pictbridge_api/group"/>
-</component>
-<component name="ptp_responder_api" long-name="PTP Responder API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_responder_api/group"/>
-</component>
-<component name="ptp_transport_api" long-name="PTP Transport API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_transport_api/group"/>
-</component>
-<component name="usb_device_control_plugin_api" long-name="USB Device Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_device_control_plugin_api/group"/>
-</component>
-<component name="usb_notifier_api" long-name="USB Notifier API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_notifier_api/group"/>
-</component>
-<component name="usb_personality_api_header" long-name="USB Personality API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_api_header/group"/>
-</component>
-<component name="usb_personality_plugin_api" long-name="USB Personality Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_plugin_api/group"/>
-</component>
-<component name="usb_secondary_display_api" long-name="USB Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_secondary_display_api/group"/>
-</component>
-<component name="usb_watcher_api" long-name="USB Watcher API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_api/group"/>
-</component>
-<component name="usb_watcher_info_api_header" long-name="USB Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_info_api_header/group"/>
-</component>
-</collection>
-<collection name="usbservices_info" long-name="USB Services Info" level="plugin"/>
-<collection name="usbengines" long-name="USB Engines" level="generic">
-<component name="usbotgwatcher" filter="s60" long-name="USB OTG Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbotgwatcher/group"/>
-</component>
-<component name="usbwatcher" filter="s60" long-name="USB Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbwatcher/group"/>
-</component>
-<component name="usblocodplugin" filter="s60" long-name="USB Local Connectivity Domain Plugin" plugin="Y">
-<unit bldFile="mw/usbservices/usbengines/usblocodplugin/group"/>
-</component>
-<component name="usbdevcon" filter="s60" long-name="USB Device Control">
-<unit bldFile="mw/usbservices/usbengines/usbdevcon/group"/>
-</component>
-<component name="usbremotepersonality" filter="s60" long-name="USB Remote Personality">
-<unit bldFile="mw/usbservices/usbengines/usbremotepersonality/group"/>
-</component>
-</collection>
-<collection name="usbclasses" long-name="USB Classes" level="framework">
-<component name="usbobexclasscontroller" filter="s60" long-name="USB OBEX Class Controller" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbobexclasscontroller/group"/>
-</component>
-<component name="usbbasicpersonality" filter="s60" long-name="USB Basic Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbbasicpersonality/group"/>
-</component>
-<component name="usbmscpersonality" filter="s60" long-name="USB MSC Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbmscpersonality/group"/>
-</component>
-<!-- commented out in bld.inf. Should this be deleted?
- <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
- <unit bldFile="usbclasses/ptpstack/group"/>
- </component>
- <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
- <unit bldFile="usbclasses/sicdusbplugin/group"/>
- </component>
- <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
- <unit bldFile="usbclasses/ptpserver/group"/>
- </component>-->
-<component name="pictbridgeengine" filter="s60" long-name="PictBridge Engine">
-<unit bldFile="mw/usbservices/usbclasses/pictbridgeengine/group"/>
-</component>
-<component name="usbphoneasmodem" filter="s60" long-name="USB Phone as Modem" introduced="^3">
-<unit bldFile="mw/usbservices/usbclasses/usbphoneasmodem/group"/>
-</component>
-</collection>
-<collection name="usbuis" long-name="USB UIs" level="specific">
-<component name="usbui" filter="s60" long-name="USB UI">
-<unit bldFile="mw/usbservices/usbuis/usbui/group"/>
-</component>
-<component name="usbuinotif" filter="s60" long-name="USB UI Notifiers">
-<unit bldFile="mw/usbservices/usbuis/usbuinotif/group"/>
-</component>
-<component name="imageprintuiprovider" filter="s60" long-name="ImagePrint UI Provider" plugin="Y">
-<unit bldFile="mw/usbservices/usbuis/imageprintuiprovider/group"/>
-</component>
-<component name="usbimageprintui" filter="s60" long-name="ImagePrint UI">
-<unit bldFile="mw/usbservices/usbuis/imageprintui/group"/>
-</component>
-</collection>
-</block>
-<block name="shortlinkconn" level="generic" long-name="Shortlink Connectivity" levels="framework server generic specific plugin">
-<!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
-<collection name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" level="plugin">
-<component name="obex_service_utils_api" long-name="OBEX Service Utils API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_utils_api/group"/>
-</component>
-<component name="obex_service_plugin_api" long-name="OBEX Service Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_plugin_api/group"/>
-</component>
-<component name="dialup_connection_status_api" long-name="Dial-up Connection Status API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dialup_connection_status_api/group"/>
-</component>
-<component name="dun_secondary_display_notification_api" long-name="DUN Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
-</component>
-<component name="obex_secondary_display_notification_api" long-name="OBEX Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
-</component>
-<component name="generic_hid_api" long-name="Generic HID API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/generic_hid_api/group"/>
-</component>
-<component name="locod_bearer_plugin_api" long-name="Locod Bearer Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/locod_bearer_plugin_api/group"/>
-</component>
-<component name="usb_obexservicemanager_client_api" long-name="USB OBEX Service Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_obexservicemanager_client_api/group"/>
-</component>
-</collection>
-<collection name="localconnectivityservice" long-name="Local Connectivity Service" level="server">
-<component name="locod" long-name="Local Connectivity Daemon">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/locod/group"/>
-</component>
-<component name="obexserviceman" long-name="OBEX Service Managar">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
-</component>
-<component name="obexsendservices" long-name="OBEX Send Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
-</component>
-<component name="obexreceiveservices" long-name="OBEX Receive Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
-</component>
-<component name="dun" long-name="Dial Up Networking">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/dun/group"/>
-</component>
-<component name="lcstylustap" long-name="LC Stylus Tap Plugins" plugin="Y">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/lcstylustap/group"/>
-</component>
-<component name="generichid" long-name="Generic HID">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/generichid/group"/>
-</component>
-<component name="headset" long-name="Headset">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/headset/group"/>
-</component>
-</collection>
-</block>
-<block name="imghandling" level="specific" long-name="Image Handling" levels="lib util if">
-<collection name="imagehandling_plat" long-name="Image Handling Platform Interfaces" level="if">
-<component name="image_handling_library_api" long-name="Image Handling Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
-</component>
-<component name="3gp_library_api" long-name="3GP Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
-</component>
-<component name="thumbnailmanager_api" long-name="Thumbnail Manager API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagehandlinglib" long-name="Image Handling Library" level="lib">
-<!-- collection is really a component, need to move down a directory -->
-<component name="ihl" filter="s60" long-name="IHL">
-<unit bldFile="mw/imghandling/imagehandlinglib/group"/>
-</component>
-</collection>
-<collection name="imagehandlingutilities" long-name="Image Handling Utilities" level="util">
-<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager">
-<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
-</component>
-</collection>
-</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">
-<unit bldFile="mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
-</component>
-</collection>
-</block>
-<block name="mds" level="specific" long-name="Metadata Services" levels="mgr eng server int">
-<collection name="mds_plat" long-name="Metadata Services Platform Interfaces" level="int">
-<component name="context_engine_plugin_api" long-name="Context Engine Plugin API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/group" filter="!test"/>
-</component>
-<component name="harvester_framework_api" long-name="Harvester Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/harvester_framework_api/group" filter="!test"/>
-<!-- can only have one unit with the same filter, #include the following from the previous unit -->
-</component>
-<component name="location_manager_api" long-name="Location Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/location_manager_api/group" filter="!test"/>
-</component>
-<component name="metadata_engine_api" long-name="Metadata Engine API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/metadata_engine_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_collection_manager_api" long-name="Content Listing Framework Collection Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_extended_api" long-name="Content Listing Framework Extended API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_extended_api/group"/>
-</component>
-</collection>
-<collection name="mds_pub" long-name="Metadata Services Public Interfaces" level="int">
-<component name="content_listing_framework_api" long-name="Content Listing Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_pub/content_listing_framework_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="metadataengine" long-name="Metadata Engine" level="eng">
-<component name="metadataengine_common" filter="s60" long-name="Metadata Engine Common" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/common/group"/>
-</component>
-<component name="metadataengine_server" filter="s60" long-name="Metadata Engine Server" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/server/group"/>
-</component>
-<component name="metadataengine_client" filter="s60" long-name="Metadata Engine Client" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/client/group"/>
-</component>
-<component name="metadataengine_build" filter="s60" long-name="Metadata Engine Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/metadataengine/group"/>
-</component>
-</collection>
-<collection name="locationmanager" long-name="Location Manager" level="mgr">
-<component name="locationtrail" filter="s60" long-name="Location Trail" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/locationtrail/group"/>
-</component>
-<component name="locationmanager_server" filter="s60" long-name="Location Manager Server" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/server/group"/>
-</component>
-<component name="locationmanager_client" filter="s60" long-name="Location Manager Client" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/client/group"/>
-</component>
-<component name="locationmanager_build" filter="s60" long-name="Location Manager Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/locationmanager/group"/>
-</component>
-</collection>
-<collection name="contextengine" long-name="Context Engine" level="eng">
-<component name="contextengine_plugins" filter="s60" long-name="Context Engine Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/contextengine/plugins/group"/>
-</component>
-<component name="contextengine_build" filter="s60" long-name="Context Engine Build" introduced="^2">
-<!--make this collection a single component, or make this unit self-contained -->
-<unit bldFile="mw/mds/contextengine/group"/>
-</component>
-</collection>
-<collection name="harvester" long-name="Harvester" level="eng">
-<component name="blacklistclient" filter="s60" long-name="Blacklist Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistclient/group"/>
-</component>
-<component name="blacklistserver" filter="s60" long-name="Blacklist Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistserver/group"/>
-</component>
-<component name="harvester_common" filter="s60" long-name="Harvester Common" introduced="^2">
-<unit bldFile="mw/mds/harvester/common/group"/>
-</component>
-<component name="composerplugins" filter="s60" long-name="Composer Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/composerplugins/group"/>
-</component>
-<component name="harvesterplugins" filter="s60" long-name="Harvester Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/harvesterplugins/group"/>
-</component>
-<component name="monitorplugins" filter="s60" long-name="Monitor Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/monitorplugins/group"/>
-</component>
-<component name="harvester_server" filter="s60" long-name="Harvester Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/server/group"/>
-</component>
-<component name="harvester_client" filter="s60" long-name="Harvester Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/client/group"/>
-</component>
-<component name="harvester_build" filter="s60" long-name="Harvester Build" introduced="^2">
-<!-- split these exports into the other components -->
-<unit bldFile="mw/mds/harvester/group"/>
-</component>
-</collection>
-<collection name="watchdog" long-name="Watchdog" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="mdswatchdog" filter="s60" long-name="Metadata Watchdog" introduced="^2">
-<unit bldFile="mw/mds/watchdog/group"/>
-</component>
-</collection>
-<collection name="clfwrapper" long-name="Content Listing Framework Wrapper" level="int">
-<!-- collection is really a component. Move down a directory -->
-<component name="clfwrapper_build" filter="s60" long-name="CLF Wrapper Build" introduced="^2" class="placeholder">
-<!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
-<!--<unit bldFile="clfwrapper/group"/>-->
-</component>
-</collection>
-<collection name="mds_info" long-name="Metadata Services Info" level="int">
-<component name="mds_build" filter="s60" long-name="Metadata Services Build" introduced="^2">
-<!-- consider distributiing this into the rest of the components in the package -->
-<unit bldFile="mw/mds/group"/>
-</component>
-</collection>
-</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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<unit bldFile="mw/mmuifw/mmuifw_plat/alf_customlayoutmanagers_api/group"/>
-</component>
-<component name="gesturehelper_api" long-name="Gesture Helper API" filter="s60" 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">
-<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">
-<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">
-<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">
-<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">
-<!-- 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">
-<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">
-<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">
-<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">
-<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">
-<unit bldFile="mw/mmuifw/mulwidgets/mullogging/group"/>
-</component>
-<component name="muldatamodel" filter="s60" long-name="MUL Data Model">
-<unit bldFile="mw/mmuifw/mulwidgets/muldatamodel/group"/>
-</component>
-<component name="mulwidgets_common" filter="s60" long-name="MUL Common Utils">
-<unit bldFile="mw/mmuifw/mulwidgets/common/group"/>
-</component>
-<component name="gesturehelper" filter="s60" long-name="Gesture Helper">
-<unit bldFile="mw/mmuifw/mulwidgets/gesturehelper/group"/>
-</component>
-<component name="mulcoverflowwidget" filter="s60" long-name="MUL CoverFlow Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/mulcoverflowwidget/group"/>
-</component>
-<component name="mulsliderwidget" filter="s60" long-name="MUL Slider Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/mulsliderwidget/group"/>
-</component>
-<component name="alfviewwidget" filter="s60" long-name="ALF View Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/alfviewwidget/group"/>
-</component>
-<component name="alfcontainerwidget" filter="s60" long-name="ALF Container Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/alfcontainerwidget/group"/>
-</component>
-<component name="alfscrollbarwidget" filter="s60" long-name="ALF Scrollbar Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/alfscrollbarwidget/group"/>
-</component>
-</collection>
-</block>
-<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"/>
-</component>
-<component name="videoconnutility_api" long-name="Video Connection Utility API" filter="s60" class="api">
-<unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/group"/>
-</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"/>
-</component>
-</collection>
-<collection name="videoscheduler" long-name="Video Scheduler" level="util">
-<component name="schedulerclient" filter="s60" long-name="Video Scheduler Client">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerclient/group"/>
-</component>
-<component name="schedulerserver" filter="s60" long-name="Video Scheduler Server">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerserver/group"/>
-</component>
-</collection>
-<collection name="videoconnutility" long-name="Video Connection Utility" level="util">
-<component name="connutilpsworker" filter="s60" long-name="Connection Utility Publish and Subscribe Worker">
-<unit bldFile="mw/videoutils/videoconnutility/connutilpsworker/group"/>
-</component>
-<component name="video_connutility" filter="s60" long-name="Video Connection Utility">
-<unit bldFile="mw/videoutils/videoconnutility/connutility/group"/>
-</component>
-</collection>
-<collection name="videoutils_info" long-name="Video Utils Info" level="if"/>
-</block>
-<block name="mmmw" level="generic" long-name="Multimedia Middleware" levels="plugin framework server generic specific">
-<collection name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" level="specific">
-<component name="multimedia_data_source_api" long-name="Multimedia Data Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
-</component>
-<component name="progressive_download_api" long-name="Progressive Download API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/progressive_download_api/group"/>
-</component>
-<component name="equalizer_ui_api" long-name="Equalizer UI API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
-</component>
-<component name="enhanced_media_client_api" long-name="Enhanced Media Client API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
-</component>
-<component name="stream_control_custom_command_api" long-name="Stream Control Custom Command API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
-</component>
-<component name="emc_buffer_source_api" long-name="EMC Buffer Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_buffer_source_api/group"/>
-</component>
-<component name="emc_file_source_api" long-name="EMC File Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
-</component>
-<component name="audio_metadata_reader_api" long-name="Audio MetaData Reader API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
-</component>
-<component name="emc_progressive_download_source_api" long-name="EMC Progressive Download Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
-</component>
-<component name="emc_volume_effect_api" long-name="EMC Volume Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
-</component>
-<component name="emc_balance_effect_api" long-name="EMC Balance Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_balance_effect_api/group"/>
-</component>
-<component name="emc_descriptor_source_api" long-name="EMC Descriptor Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_descriptor_source_api/group"/>
-</component>
-<component name="emc_drm_config_intfc_api" long-name="EMC DRM Config Intfc API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
-</component>
-<component name="voip_audio_services_api" long-name="VoIP Audio Services" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/group"/>
-</component>
-<component name="configuration_components_factory_api" long-name="Configuration Components Factory API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
-</component>
-<component name="audio_output_control_utility_api" long-name="Audio Output Control Utility API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/group"/>
-</component>
-<component name="audio_output_control_utility_proxy_api" long-name="Audio Output Control Utility Proxy API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
-</component>
-<component name="emc_audio_effects_api" long-name="EMC Audio Effects API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
-</component>
-<component name="call_audio_control_api" long-name="Call AudioControl API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/group"/>
-</component>
-<component name="radio_utilities_api" long-name="Radio Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/group"/>
-</component>
-<component name="radio_preset_utilities_api" long-name="Radio Preset Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
-</component>
-<component name="radio_monitor_api" long-name="Radio Monitor API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
-</component>
-<component name="thumbnail_engine_api" long-name="Thumbnail Engine API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/thumbnail_engine_api/group"/>
-</component>
-<component name="telephony_multimedia_service_api" long-name="Telephony Multimedia Service API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="mmfenh" long-name="MMF Enhancements" level="generic">
-<component name="advancedaudiocontroller" filter="s60" long-name="Advanced Audio Controllers" plugin="Y">
-<unit bldFile="mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
-</component>
-<component name="audiooutputcontrolutility" filter="s60" long-name="Audio Output Control Utility">
-<unit bldFile="mw/mmmw/mmfenh/audiooutputcontrolutility/group"/>
-</component>
-<component name="configurationcomponentsfactory" filter="s60" long-name="Configuration Components Factory">
-<unit bldFile="mw/mmmw/mmfenh/configurationcomponentsfactory/group"/>
-</component>
-<component name="enhancedaudioplayerutility" filter="s60" long-name="Enhanced Audio Player Utility">
-<unit bldFile="mw/mmmw/mmfenh/enhancedaudioplayerutility/group"/>
-</component>
-<component name="enhancedmediaclient" filter="s60" long-name="Enhanced Media Client">
-<unit bldFile="mw/mmmw/mmfenh/enhancedmediaclient/group"/>
-</component>
-<component name="profilesettingsmonitor" filter="s60" long-name="Profile Settings Monitor">
-<unit bldFile="mw/mmmw/mmfenh/profilesettingsmonitor/group"/>
-</component>
-<component name="progressivedownload" filter="s60" long-name="Progressive Download">
-<unit bldFile="mw/mmmw/mmfenh/progressivedownload/group"/>
-</component>
-</collection>
-<collection name="mm_fw" long-name="Multimedia Frameworks" level="framework">
-<!-- Id needs to be unique, mmfw already in use -->
-<!-- Placeholder for OpenAX AL and other stuff -->
-</collection>
-<collection name="mmserv" long-name="Multimedia Services" level="specific">
-<component name="audioeffectsui" filter="s60" long-name="Audio Effects UI">
-<unit bldFile="mw/mmmw/mmserv/audioeffectsui/group"/>
-</component>
-<component name="callaudiocontrol" filter="s60" long-name="Call Audio Control">
-<unit bldFile="mw/mmmw/mmserv/callaudiocontrol/group"/>
-</component>
-<component name="metadatautility" filter="s60" long-name="Metadata Utility">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/group"/>
-</component>
-<component name="radioutility" filter="s60" long-name="Radio Utility">
-<unit bldFile="mw/mmmw/mmserv/radioutility/group"/>
-</component>
-<component name="thumbnailengine" filter="s60" long-name="Thumbnail Engine" introduced="^2">
-<unit bldFile="mw/mmmw/mmserv/thumbnailengine/group"/>
-</component>
-<component name="tms" filter="s60" long-name="Telephony Multimedia Service" introduced="^3">
-<unit bldFile="mw/mmmw/mmserv/tms/group"/>
-</component>
-<component name="voipaudioservices" filter="s60" long-name="VoIP Audio Services">
-<unit bldFile="mw/mmmw/mmserv/voipaudioservices/group"/>
-</component>
-<component name="lib3gpextparser" filter="s60" long-name="3GP Extension Metadata Parser Library">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group" filter="sf_build"/>
-</component>
-</collection>
-<collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
-<component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="helix" level="generic" long-name="Helix" levels="plugin framework server generic specific">
-<collection name="helix_ren" long-name="Helix Engine" level="framework">
-<!-- what does "ren" stand for? -->
-<component name="helix_stub" filter="s60" long-name="Helix Stub" introduced="^2" class="api">
-<unit bldFile="mw/helix/helix_ren/helix_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="camerasrv" level="specific" long-name="Camera Services" levels="plugin fw api">
-<collection name="camerasrv_plat" long-name="Camera Services Platform Interfaces" level="api">
-<component name="media_recorder_sink_api" long-name="Media Recorder Sink API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
-</component>
-<component name="cae_extentension_api" long-name="CAE Extension API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/cae_extentension_api/group"/>
-</component>
-<component name="camera_application_engine_api" long-name="Camera Application Engine API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/camera_application_engine_api/group" filter="!test"/>
-</component>
-<component name="custom_onboard_camera_api" long-name="Custom Onboard Camera API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
-</component>
-<component name="imaging_configuration_manager_api" long-name="Imaging Configuration Manager API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
-</component>
-<component name="media_recorder_api" long-name="Media Recorder API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_api/group" filter="!test"/>
-</component>
-<component name="3gp_file_composer_api" long-name="3GP File Composer API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
-</component>
-<component name="asynchronous_file_saving_queue_api" long-name="Asynchronous File Saving Queue API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="camappengine" long-name="Camera App Engine" level="fw">
-<!-- is this collection really a component? If so, move down a directory -->
-<component name="stillconverter" filter="s60" long-name="Still Image Converter" class="placeholder">
-<!-- should separate this from parent engine's bld.inf -->
-<!-- <unit bldFile="camappengine/stillconverter/group"/> -->
-</component>
-<component name="camappengine_engine" filter="s60" long-name="Camera App Engine" class="placeholder">
-<!-- should separate this from parent engine's bld.inf -->
-<!-- <unit bldFile="camappengine/engine/group"/> -->
-</component>
-<component name="asynchfilesavequeue" filter="s60" long-name="Asynch File Save Queue">
-<unit bldFile="mw/camerasrv/camappengine/asynchfilesavequeue/group"/>
-</component>
-<component name="camappengine_build" filter="s60" long-name="Camera App Engine Build">
-<unit bldFile="mw/camerasrv/camappengine/build"/>
-</component>
-</collection>
-<collection name="camcordermmfplugin" long-name="Camcorder MMF Plugin" level="plugin">
-<!-- collection is really a component. Should move down a directory -->
-<component name="camcordermmfplugin_build" filter="s60" long-name="Camcorder MMF Plugin Build" plugin="Y">
-<unit bldFile="mw/camerasrv/camcordermmfplugin/build"/>
-</component>
-</collection>
-<collection name="configmanagers" long-name="Config Managers" level="api">
-<component name="imagingconfigmanager" filter="s60" long-name="Imaging Config Manager">
-<unit bldFile="mw/camerasrv/configmanagers/imagingconfigmanager/group"/>
-</component>
-</collection>
-<collection name="camerasrv_info" long-name="Camera Services Info" level="api">
-<component name="camerasrv_build" filter="s60" long-name="Camera Services Build">
-<!-- should split into individual bld.infs -->
-<unit bldFile="mw/camerasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="mmappfw" level="specific" long-name="Multimedia App Framework" levels="fw utils if">
-<collection name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" level="if">
-<component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interfaces Build" introduced="^1" filter="s60">
-<!-- this is no longer necessary when confguration is put in place -->
-<unit bldFile="mw/mmappfw/mmappfw_plat"/>
-</component>
-<component name="collection_helper_api" long-name="Collection Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
-</component>
-<component name="harvester_collection_mediator_api" long-name="Harvester Collection Mediator API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/group"/>
-</component>
-<component name="harvester_metadata_extractor_api" long-name="Harvester Metadata Extractor API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/group"/>
-</component>
-<component name="harvester_server_api" long-name="Harvester Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_server_api/group"/>
-</component>
-<component name="harvester_utility_api" long-name="Harvester Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_utility_api/group"/>
-</component>
-<component name="playlist_engine_api" long-name="Playlist Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playlist_engine_api/group"/>
-</component>
-<component name="mtp_keys_api" long-name="MTP Keys API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mtp_keys_api/group"/>
-</component>
-<component name="mpx_collection_common_definition_api" long-name="MPX Collection Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_common_definition_api/group"/>
-</component>
-<component name="mpx_collection_utility_api" long-name="MPX Collection Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/group"/>
-</component>
-<component name="mpx_common_api" long-name="MPX Common API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_api/group"/>
-</component>
-<component name="mpx_common_definition_api" long-name="MPX Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_common_definition_api" long-name="MPX Playback Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_utility_api" long-name="MPX Playback Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/group"/>
-</component>
-<component name="mpx_base_view_plugins_api" long-name="MPX Base View Plugins API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/group"/>
-</component>
-<component name="mpx_view_utility_api" long-name="MPX View Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_view_utility_api/group"/>
-</component>
-<component name="mpx_albumart_utility_api" long-name="MPX Album Art Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/group"/>
-</component>
-<component name="media_player_settings_engine_api" long-name="Media Player Settings Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
-</component>
-<component name="mpx_backstepping_utility_api" long-name="MPX Backstepping Utility API" introduced="^1" filter="s60" class="api">
-<!-- uncomment when configuration is put in place
- <unit bldFile="mmappfw_plat/mpx_backstepping_utility_api/group"/> -->
-</component>
-<component name="asx_parser_api" long-name="ASX Parser API" introduced="^1" filter="s60" class="api">
-<!-- uncomment when configuration is put in place
- <unit bldFile="mmappfw_plat/asx_parser_api/group"/> -->
-</component>
-<component name="playback_helper_api" long-name="Playback Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playback_helper_api/group"/>
-</component>
-<component name="videoplaylist_utility_api" long-name="Video Playlist Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/videoplaylist_utility_api/group"/>
-</component>
-<component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interface Build" introduced="^1" filter="s60" class="api">
-<!-- needed only for #ifdefs. Remove anmd uncomment above units when configuration is in place -->
-<unit bldFile="mw/mmappfw/mmappfw_plat/group"/>
-</component>
-</collection>
-<collection name="mpx" long-name="Multimedia Player" level="fw">
-<component name="commonframework" filter="s60" long-name="MPX Common Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/commonframework/group"/>
-</component>
-<component name="playbackframework" filter="s60" long-name="MPX Playback Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/playbackframework/group"/>
-</component>
-<component name="mpxcollectionfw" filter="s60" long-name="MPX Collection Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/collectionframework/group"/>
-</component>
-<component name="mpxviewfw" filter="s60" long-name="MPX View Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/viewframework/group"/>
-</component>
-<component name="mpx_build" filter="s60" long-name="MPX Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/mpx/group"/>
-</component>
-</collection>
-<collection name="mmappcomponents" long-name="Multimedia App Components" level="utils">
-<component name="mmappcomponents_build" filter="s60" long-name="Multimedia App Components Build" introduced="^1">
-<!-- needed for #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
- Can remove this once configuration is in place-->
-<unit bldFile="mw/mmappfw/mmappcomponents/group"/>
-</component>
-<component name="collectionhelper" filter="s60" long-name="Media Player Collection Helper" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/collectionhelper/group"/>
-</component>
-<component name="playlistengine" filter="s60" long-name="Playlist Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/playlistengine/group"/>
-</component>
-<component name="mpxharvester" filter="s60" long-name="Media Player Harvester" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/harvester/group"/>
-</component>
-<component name="mmappcommonui" filter="s60" long-name="Multimedia App Common UI" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmappcommonui/group"/>
-</component>
-<component name="mediaplayersettingsengine" filter="s60" long-name="Media Player Settings Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
-</component>
-<component name="audiofetcher" filter="s60" long-name="Audio Fetcher" introduced="^1" plugin="Y">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
-</component>
-<component name="asxparser" filter="s60" long-name="ASX Parser" introduced="^1">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
-</component>
-<component name="playbackhelper" filter="s60" long-name="Playback Helper" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/playbackhelper/group"/>
-</component>
-<component name="videoplaylistutility" filter="s60" long-name="Video Playlist Utility" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/videoplaylistutility/group"/>
-</component>
-<component name="mmmtpdataprovider" filter="s60" long-name="Multimedia MTP Data Provider" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmmtpdataprovider/group"/>
-</component>
-</collection>
-<collection name="mmappfw_info" long-name="Multimedia App Framework Info" level="if">
-<component name="mmappfw_build" filter="s60" long-name="Multimedia App Framework Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/group"/>
-</component>
-<component name="mmappfw_test" filter="s60,test,api_test,pref_test" long-name="Multimedia App Framework Test" purpose="development" introduced="^1"/>
-</collection>
-</block>
-<block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework api">
-<collection name="inputmethods_pub" long-name="Input Methods Public Interfaces" level="api">
-<component name="ptiengine_iti_api" long-name="PTI Engine API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
-</component>
-<component name="optical_character_recognition_api" long-name="Optical Character Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
-</component>
-<component name="input_language_info_api" long-name="Input Language Info API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
-</component>
-</collection>
-<collection name="inputmethods_plat" long-name="Input Methods Platform Interfaces" level="api">
-<component name="pen_input_server_api" long-name="Pen Input Server API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/group" filter="!test"/>
-</component>
-<component name="ptiengine_hwr_api" long-name="PTI Engine Handwriting Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group" filter="!test"/>
-</component>
-<component name="aknfep_settings_api" long-name="Avkon FEP Settings API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
-</component>
-<component name="aknfep_status_api" long-name="Avkon FEP Status API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
-</component>
-<component name="ptiengine_key_definations_api" long-name="PTI Engine Key Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
-</component>
-<component name="aknfep_definitions_api" long-name="Avkon FEP Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
-</component>
-<component name="aknfep_pen_support_api" long-name="Avkon FEP Pen Support API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
-</component>
-<component name="ptiengine_indic_definitions_api" long-name="PTI Engine Indic Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
-</component>
-<component name="aknfep_uiinterface_api" long-name="Avkon FEP UI Interface API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="textinput" long-name="Text Input" level="framework">
-<component name="ptienginev2" filter="s60" long-name="Predictive Text Input Engine">
-<!--uncomment when configuration is turned on and textinput_build is removed-->
-<!-- <unit bldFile="textinput/ptienginev2/group"/>-->
-</component>
-<component name="akninputlanguage" filter="s60" long-name="Avkon Input Language">
-<unit bldFile="mw/inputmethods/textinput/akninputlanguage/group"/>
-</component>
-<component name="peninputarc" filter="s60" long-name="Pen Input Arc">
-<unit bldFile="mw/inputmethods/textinput/peninputarc/group"/>
-</component>
-<component name="peninputcommonctrls" filter="s60" long-name="Pen Input Common Controls">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonctrls/group"/>
-</component>
-<component name="peninputhwrboxcn" filter="s60" long-name="Chinese Handwriting Recognition Box" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrboxcn/group"/>
-</component>
-<component name="peninputvkbcn" filter="s60" long-name="Chinese Virtual Keyboard" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputvkbcn/group"/>
-</component>
-<component name="peninputcommonlayout" filter="s60" long-name="Pen Input Common Layout">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonlayout/group"/>
-</component>
-<component name="peninputgenerichwr" filter="s60" long-name="Pen Input Generic Handwriting Recognition" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputgenerichwr/group"/>
-</component>
-<component name="peninputgenericvkb" filter="s60" long-name="Pen Input Generic Virtual Keyboard" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputgenericvkb/group"/>
-</component>
-<component name="peninputcommonctrlsjp" filter="s60" long-name="Pen Input Common Controls Japanese">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonctrlsjp/group"/>
-</component>
-<component name="peninputhwrboxjp" filter="s60" long-name="Japanese Handwriting Recognition Box" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrboxjp/group"/>
-</component>
-<component name="peninputvkbjp" filter="s60" long-name="Japanese Virtual Keyboard" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputvkbjp/group"/>
-</component>
-<component name="gslangplugin" filter="s60" long-name="GS Language Plugin" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/GSLangPlugin"/>
-</component>
-<component name="peninputgenericitut" filter="s60" long-name="Pen Input Generic ITU-T" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputgenericitut/group"/>
-</component>
-<component name="peninputhwrtrui" filter="s60" long-name="Pen Input Handwriting Recognition Training UI" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrtrui/group"/>
-</component>
-<component name="peninputhwrfscn" filter="s60" long-name="Pen Input Chinese Full Screen Handwriting Recognition" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrfscn/group"/>
-</component>
-<component name="peninputvkbkr" filter="s60" long-name="Pen Input Korean Virtual Keyboard" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputvkbkr/group"/>
-</component>
-<component name="peninputfingerhwr" filter="s60" long-name="Pen Input Finger Handwriting Recognition" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputfingerhwr/group"/>
-</component>
-<component name="peninputsplititut" filter="s60" long-name="Pen Input Split ITU-T" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputsplititut/group"/>
-</component>
-<component name="peninputsplitqwerty" filter="s60" long-name="Pen Input Split QWERTY" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputsplitqwerty/group"/>
-</component>
-<component name="textinput_build" filter="s60" long-name="Text Input Build">
-<!--needed for #ifdef, can be removed when configuration is implemented -->
-<unit bldFile="mw/inputmethods/textinput/group"/>
-</component>
-</collection>
-<collection name="fep" long-name="FEP" level="engine">
-<component name="aknfep" filter="s60" long-name="Avkon FEP" plugin="Y">
-<unit bldFile="mw/inputmethods/fep/aknfep/group"/>
-</component>
-<component name="frontendprocessor" long-name="Front End Processor" purpose="mandatory">
-<unit bldFile="mw/inputmethods/fep/frontendprocessor/group" mrp="mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
-</component>
-</collection>
-<collection name="inputmethods_info" long-name="Input Methods Info" level="api">
-<component name="inputmethods_metadata" long-name="Input Methods Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="qt" level="generic" long-name="Qt" levels="tool mw app">
-<collection name="qtconf" long-name="Qt Config" level="tool">
-<component name="qt_deviceconfiguration" long-name="Qt Device Configuration" introduced="^2" class="config tool">
-<unit bldFile="mw/qt/src/s60installs/deviceconfiguration"/>
-</component>
-</collection>
-<collection name="qt_info" long-name="Qt Info" level="mw">
-<component name="qt_build" long-name="Qt Build" introduced="^2">
-<unit bldFile="mw/qt" proFile="projects.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-<collection name="qtdemos" long-name="Qt Demos" level="app">
-<component name="qtdemos_build" long-name="Qt Demos Build" introduced="^2" filter="qtdemos">
-<unit bldFile="mw/qt/demos" proFile="demos.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qtexamples" long-name="Qt Examples" level="app">
-<component name="qtexamples_build" long-name="Qt Examples Build" introduced="^2" filter="qtexamples">
-<unit bldFile="mw/qt/examples" proFile="examples.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qt_tests" long-name="Qt Tests" level="app">
-<component name="qttestsauto" long-name="Qt Automated Tests" introduced="^2" filter="qttestsauto">
-<unit bldFile="mw/qt/tests/auto" proFile="qtpauto.pro"/>
-</component>
-<component name="qttestsbenchmarks" long-name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks">
-<unit bldFile="mw/qt/tests/benchmarks" proFile="benchmarks.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</block>
-<block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
-<collection name="classicui_plat" long-name="Classic UI Platform Interfaces" level="specific">
-<component name="personalisation_framework_api" long-name="Personalisation Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_framework_api/group" filter="!test"/>
-</component>
-<component name="signal_pane_api" long-name="Signal Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
-</component>
-<component name="japanese_reading_api" long-name="Japanese Reading API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/japanese_reading_api/group" filter="!test"/>
-</component>
-<component name="global_popup_priority_controller_api" long-name="Global Popup Priority Controller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
-</component>
-<component name="item_finder_api" long-name="Item Finder API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/item_finder_api/group" filter="!test"/>
-</component>
-<component name="avkon_fonts_api" long-name="Avkon Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_fonts_api/group" filter="!test"/>
-</component>
-<component name="extended_utilities_api" long-name="Extended Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
-</component>
-<component name="personalisation_plugin_api" long-name="Personalisation Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
-</component>
-<component name="extended_aiw_criteria_api" long-name="Extended AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="personalisation_application_api" long-name="Personalisation Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_application_api/group"/>
-</component>
-<component name="volume_popup_api" long-name="Volume Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
-</component>
-<component name="avkon_secondary_display_support_api" long-name="AVKON Secondary Display Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_support_api/group" filter="!test"/>
-</component>
-<component name="extended_setting_pages_api" long-name="Extended Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_setting_pages_api/group" filter="!test"/>
-</component>
-<component name="extended_lists_api" long-name="Extended Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_lists_api/group" filter="!test"/>
-</component>
-<component name="input_block_api" long-name="Input Block API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/input_block_api/group" filter="!test"/>
-</component>
-<component name="avkon_ui_server_api" long-name="AVKON UI Server API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_ui_server_api/group" filter="!test"/>
-</component>
-<component name="number_grouping_api" long-name="Number Grouping API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/number_grouping_api/group" filter="!test"/>
-</component>
-<component name="extended_status_pane_api" long-name="Extended Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_status_pane_api/group" filter="!test"/>
-</component>
-<component name="extended_notifiers_api" long-name="Extended Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notifiers_api/group" filter="!test"/>
-</component>
-<component name="task_list_api" long-name="Task List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
-</component>
-<component name="personalisation_slide_show_dialog_api" long-name="Personalisation Slide Show Dialog API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
-</component>
-<component name="key_event_utilities_api" long-name="Key Event Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_event_utilities_api/group"/>
-</component>
-<component name="emergency_call_support_api" long-name="Emergency Call Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/emergency_call_support_api/group" filter="!test"/>
-</component>
-<component name="extended_dialogs_api" long-name="Extended Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_dialogs_api/group"/>
-</component>
-<component name="legacy_ui_framework_headers_api" long-name="Legacy UI Framework Headers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/legacy_ui_framework_headers_api/group"/>
-</component>
-<component name="extended_editors_api" long-name="Extended Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_editors_api/group" filter="!test"/>
-</component>
-<component name="alarm_api" long-name="Alarm API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alarm_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_interface_base_api" long-name="AIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_base_api/group" filter="!test"/>
-</component>
-<component name="list_effects_api" long-name="List Effects API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/list_effects_api/group" filter="!test"/>
-</component>
-<component name="find_item_ui_api" long-name="Find Item UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/find_item_ui_api/group" filter="!test"/>
-</component>
-<component name="server_application_services_api" long-name="Server Application Services API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/server_application_services_api/group" filter="!test"/>
-</component>
-<component name="common_ui_settings_api" long-name="Common UI Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_ui_settings_api/group"/>
-</component>
-<component name="aiw_service_interface_menu_api" long-name="AIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_menu_api/group" filter="!test"/>
-</component>
-<component name="eikon_server_extension_client_api" long-name="EIKON Server Extension Client API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/eikon_server_extension_client_api/group" filter="!test"/>
-</component>
-<component name="skinnable_clock_api" long-name="Skinnable Clock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/skinnable_clock_api/group" filter="!test"/>
-</component>
-<component name="battery_pane_api" long-name="Battery Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/battery_pane_api/group" filter="!test"/>
-</component>
-<component name="fep_document_navigation_api" long-name="FEP Document Navigation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
-</component>
-<component name="personalisation_localised_texts_api" long-name="Personalisation Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
-</component>
-<component name="memory_card_ui_api" long-name="Memory Card UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
-</component>
-<component name="avkon_status_api" long-name="AVKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_status_api/group"/>
-</component>
-<component name="application_switching_api" long-name="Application Switching API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/application_switching_api/group" filter="!test"/>
-</component>
-<component name="avkon_localised_texts_api" long-name="AVKON Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_localised_texts_api/group"/>
-</component>
-<component name="avkon_secondary_display_api" long-name="AVKON Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_api/group"/>
-</component>
-<component name="extended_animation_api" long-name="Extended Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_notes_api" long-name="Extended Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notes_api/group" filter="!test"/>
-</component>
-<component name="screensaver_animation_plugin_definitions_api" long-name="Screensaver Animation Plugin Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/screensaver_animation_plugin_definitions_api/group"/>
-</component>
-<component name="text_scroller_api" long-name="Text Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/text_scroller_api/group" filter="!test"/>
-</component>
-<component name="custom_cursors_api" long-name="Custom Cursors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/custom_cursors_api/group" filter="!test"/>
-</component>
-<component name="screensaver_settings_api" long-name="Screensaver Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/screensaver_settings_api/group"/>
-</component>
-<component name="global_window_priorities_api" long-name="Global Window Priorities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_window_priorities_api/group"/>
-</component>
-<component name="extended_indicators_api" long-name="Extended Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_indicators_api/group" filter="!test"/>
-</component>
-<component name="special_character_table_api" long-name="Special Character Table API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/special_character_table_api/group" filter="!test"/>
-</component>
-<component name="avkon_settings_api" long-name="AVKON Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_settings_api/group"/>
-</component>
-<component name="extended_sounds_api" long-name="Extended Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_sounds_api/group"/>
-</component>
-<component name="themes_settings_api" long-name="Themes Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/themes_settings_api/group"/>
-</component>
-<component name="media_shared_document_api" long-name="Media Shared Document API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/media_shared_document_api/group" filter="!test"/>
-</component>
-<component name="extended_queries_api" long-name="Extended Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_queries_api/group"/>
-</component>
-<component name="phone_number_text_utilities_api" long-name="Phone Number Text Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
-</component>
-<component name="screensaver_runtime_api" long-name="Screensaver Runtime API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/screensaver_runtime_api/group"/>
-</component>
-<component name="extended_scroller_api" long-name="Extended Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_scroller_api/group"/>
-</component>
-<component name="key_rotator_api" long-name="Key Rotator API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_rotator_api/group" filter="!test"/>
-</component>
-<component name="extended_grids_api" long-name="Extended Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_grids_api/group" filter="!test"/>
-</component>
-<component name="generic_parameter_api" long-name="Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="indicator_touch_observer_api" long-name="Indicator Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_touch_observer_api/group"/>
-</component>
-<component name="popup_form_api" long-name="Popup Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/popup_form_api/group" filter="!test"/>
-</component>
-<component name="stylus_activated_popup_api" long-name="Stylus Activated Pop-up API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/stylus_activated_popup_api/group" filter="!test"/>
-</component>
-<component name="indicator_plugin_api" long-name="Indicator Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_plugin_api/group" filter="!test"/>
-</component>
-<component name="layout_configuration_api" long-name="Layout Configuration API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/layout_configuration_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_filter_factory_api" long-name="Common File Dialogs Filter Factory API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group" filter="!test"/>
-</component>
-<component name="avkon_anim_dll_api" long-name="AVKON Anim DLL API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_anim_dll_api/group"/>
-</component>
-<component name="extended_initialization_api" long-name="Extended Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_initialization_api/group" filter="!test"/>
-</component>
-<component name="long_tap_animation_api" long-name="Long Tap Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/long_tap_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_ui_framework_definitions_api" long-name="Extended UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_ui_framework_definitions_api/group"/>
-</component>
-<component name="extended_buttons_api" long-name="Extended Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_buttons_api/group" filter="!test"/>
-</component>
-<component name="aiw_provider_utility_api" long-name="AIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_provider_utility_api/group" filter="!test"/>
-</component>
-<component name="transition_effect_parameters_api" long-name="Transition Effect Parameters API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_parameters_api/group" filter="!test"/>
-</component>
-<component name="extended_input_capabilities_api" long-name="Extended Input Capabilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_input_capabilities_api/group" filter="!test"/>
-</component>
-<component name="uikon_status_api" long-name="UIKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/uikon_status_api/group"/>
-</component>
-<component name="transition_effect_utilities_api" long-name="Transition Effect Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_utilities_api/group" filter="!test"/>
-</component>
-<component name="pointer_event_modifier_api" long-name="Pointer Event Modifier API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/pointer_event_modifier_api/group" filter="!test"/>
-</component>
-<component name="avkon_testability_api" long-name="AVKON Testability API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_testability_api/group"/>
-</component>
-<component name="ganes_api" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ganes_api/group"/>
-</component>
-<component name="ode_api" long-name="Ode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ode_api/group"/>
-</component>
-<component name="physics_api" long-name="Physics API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/physics_api/group"/>
-</component>
-<component name="touch_pane_api" long-name="Touch Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_api/group" filter="!test"/>
-</component>
-<component name="touch_pane_observer_api" long-name="Touch Pane Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_observer_api/group"/>
-</component>
-<component name="alternate_fs_api" long-name="Alternate FS API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alternate_fs_api/group"/>
-</component>
-<component name="discreet_popup_api" long-name="Discreet Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/discreet_popup_api/group"/>
-</component>
-<component name="touch_gesture_framework_api" long-name="Touch Gesture Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_gesture_framework_api/group"/>
-<!-- should this be commented out? -->
-<!--<unit bldFile="classicui_plat/touch_gesture_framework_api/tsrc/group" filter="test,api_test"/> -->
-</component>
-<component name="extended_options_menu_api" long-name="Extended Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="classicui_pub" long-name="Classic UI Public Interfaces" level="specific">
-<component name="input_frame_api" long-name="Input Frame API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/input_frame_api/group" filter="!test"/>
-</component>
-<component name="window_server_event_observer_api" long-name="Window Server Event Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/window_server_event_observer_api/group" filter="!test"/>
-</component>
-<component name="application_framework_api" long-name="Application Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/application_framework_api/group" filter="!test"/>
-</component>
-<component name="scroller_api" long-name="Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/scroller_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_utilities_api" long-name="UI Framework Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_utilities_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_definitions_api" long-name="UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_definitions_api/group" filter="!test"/>
-</component>
-<component name="buttons_api" long-name="Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/buttons_api/group" filter="!test"/>
-</component>
-<component name="queries_api" long-name="Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/queries_api/group" filter="!test"/>
-</component>
-<component name="aiw_generic_parameter_api" long-name="AIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="editors_api" long-name="Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/editors_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_api" long-name="Common File Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/common_file_dialogs_api/group" filter="!test"/>
-</component>
-<component name="dialog_shutter_api" long-name="Dialog Shutter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialog_shutter_api/group" filter="!test"/>
-</component>
-<component name="fonts_api" long-name="Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/fonts_api/group" filter="!test"/>
-</component>
-<component name="screen_clearer_api" long-name="Screen Clearer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_clearer_api/group" filter="!test"/>
-</component>
-<component name="notifiers_api" long-name="Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notifiers_api/group" filter="!test"/>
-</component>
-<component name="notes_api" long-name="Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notes_api/group" filter="!test"/>
-</component>
-<component name="screen_saver_api" long-name="Screen Saver API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_saver_api/group" filter="!test"/>
-</component>
-<component name="status_pane_api" long-name="Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/status_pane_api/group" filter="!test"/>
-</component>
-<component name="base_controls_api" long-name="Base Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/base_controls_api/group" filter="!test"/>
-</component>
-<component name="grids_api" long-name="Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/grids_api/group" filter="!test"/>
-</component>
-<component name="context_pane_api" long-name="Context Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/context_pane_api/group" filter="!test"/>
-</component>
-<component name="lists_api" long-name="Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/lists_api/group" filter="!test"/>
-</component>
-<component name="popups_api" long-name="Popups API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/popups_api/group" filter="!test"/>
-</component>
-<component name="misc_controls_api" long-name="Misc Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/misc_controls_api/group" filter="!test"/>
-</component>
-<component name="keylock_api" long-name="Keylock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/keylock_api/group" filter="!test"/>
-</component>
-<component name="options_menu_api" long-name="Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/options_menu_api/group" filter="!test"/>
-</component>
-<component name="hierarchical_lists_api" long-name="Hierarchical Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hierarchical_lists_api/group" filter="!test"/>
-</component>
-<component name="navigation_pane_api" long-name="Navigation Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/navigation_pane_api/group" filter="!test"/>
-</component>
-<component name="tabs_api" long-name="Tabs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/tabs_api/group" filter="!test"/>
-</component>
-<component name="title_pane_touch_observer_api" long-name="Title Pane Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_touch_observer_api/group"/>
-</component>
-<component name="choice_list_api" long-name="Choice List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/choice_list_api/group" filter="!test"/>
-</component>
-<component name="info_popup_note_api" long-name="Info Popup Note API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/info_popup_note_api/group" filter="!test"/>
-</component>
-<component name="setting_pages_api" long-name="Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/setting_pages_api/group" filter="!test"/>
-</component>
-<component name="screen_mode_api" long-name="Screen Mode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_mode_api/group" filter="!test"/>
-</component>
-<component name="indicators_api" long-name="Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/indicators_api/group" filter="!test"/>
-</component>
-<component name="error_ui_api" long-name="Error UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/error_ui_api/group" filter="!test"/>
-</component>
-<component name="animation_api" long-name="Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/animation_api/group" filter="!test"/>
-</component>
-<component name="searchfield_api" long-name="Searchfield API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/searchfield_api/group" filter="!test"/>
-</component>
-<component name="labels_api" long-name="Labels API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/labels_api/group" filter="!test"/>
-</component>
-<component name="hotkeys_api" long-name="Hotkeys API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hotkeys_api/group" filter="!test"/>
-</component>
-<component name="initialization_api" long-name="Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/initialization_api/group" filter="!test"/>
-</component>
-<component name="volume_control_api" long-name="Volume Control API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/volume_control_api/group" filter="!test"/>
-</component>
-<component name="title_pane_api" long-name="Title Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_api/group" filter="!test"/>
-</component>
-<component name="sounds_api" long-name="Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/sounds_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_handler_api" long-name="AIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_service_handler_api/group" filter="!test"/>
-</component>
-<component name="aiw_criteria_api" long-name="AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="touch_ui_utilities_api" long-name="Touch UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/touch_ui_utilities_api/group" filter="!test"/>
-</component>
-<component name="generic_button_api" long-name="Generic Button API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/generic_button_api/group" filter="!test"/>
-</component>
-<component name="form_api" long-name="Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/form_api/group" filter="!test"/>
-</component>
-<component name="uikon_core_controls" long-name="Uikon Core Controls" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/uikon_core_controls/group" filter="!test"/>
-</component>
-<component name="calendar_api" long-name="Calendar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/calendar_api/group"/>
-</component>
-<component name="toolbar_api" long-name="Toolbar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/toolbar_api/group" filter="!test"/>
-</component>
-<component name="server_application_api" long-name="Server Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/server_application_api/group"/>
-</component>
-<component name="slider_api" long-name="Slider API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/slider_api/group" filter="!test"/>
-</component>
-<component name="private_ui_framework_api" long-name="Private UI Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/private_ui_framework_api/group" filter="!test"/>
-</component>
-<component name="dialogs_api" long-name="Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialogs_api/group" filter="!test"/>
-</component>
-<component name="document_handler_api" long-name="Document handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/document_handler_api/group"/>
-</component>
-<component name="images_api" long-name="Images API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/images_api/group" filter="!test"/>
-</component>
-<component name="stylus_popup_menu_api" long-name="Stylus Pop-up Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/stylus_popup_menu_api/group" filter="!test"/>
-</component>
-<component name="information_preview_popup_api" long-name="Information Preview Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/information_preview_popup_api/group" filter="!test"/>
-</component>
-<component name="intermediate_state_api" long-name="Intermediate State API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/intermediate_state_api/group"/>
-</component>
-<component name="help_launcher_api" long-name="Help Launcher API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/help_launcher_api/group"/>
-</component>
-</collection>
-<collection name="ode" long-name="Open Dynamics Engine" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="ode_build" filter="s60" long-name="ODE">
-<unit bldFile="mw/classicui/ode/group"/>
-</component>
-</collection>
-<collection name="uifw" long-name="UI Framework" level="server">
-<component name="uiklaf" filter="s60" long-name="Uikon Look-and-Feel">
-<unit bldFile="mw/classicui/uifw/uiklaf/group"/>
-</component>
-<component name="eikctl" filter="s60" long-name="Eikon Controls">
-<unit bldFile="mw/classicui/uifw/eikctl/group"/>
-</component>
-<component name="avkon" filter="s60" long-name="Avkon">
-<!-- can only have one unit. Split into 3 components, or #include all from same bld.inf -->
-<unit bldFile="mw/classicui/uifw/avkon/aknphysics/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/aknconf/group"/>
-</component>
-<component name="eikstd" filter="s60" long-name="Eikon Standard">
-<unit bldFile="mw/classicui/uifw/eikstd/group"/>
-</component>
-<component name="aknglobalui" filter="s60" long-name="Avkon Global UI">
-<unit bldFile="mw/classicui/uifw/aknglobalui/group"/>
-</component>
-<component name="ganes" filter="s60" long-name="Ganes">
-<unit bldFile="mw/classicui/uifw/ganes/group"/>
-</component>
-</collection>
-<collection name="commonuis" long-name="Common UIs" level="specific">
-<component name="commonui" filter="s60" long-name="Common UI">
-<unit bldFile="mw/classicui/commonuis/commonui/group"/>
-</component>
-<component name="commondialogs" filter="s60" long-name="Common Dialogs">
-<unit bldFile="mw/classicui/commonuis/commondialogs/group"/>
-</component>
-</collection>
-<collection name="applicationinterworkingfw" long-name="Application Interworking Framework" level="generic">
-<component name="aifwservicehandler" filter="s60" long-name="Application Interworking Service Handler">
-<unit bldFile="mw/classicui/applicationinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-<collection name="psln" long-name="Personalization" level="specific">
-<!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
-<component name="psln_build" filter="s60" long-name="Personalization Build">
-<unit bldFile="mw/classicui/psln/group"/>
-</component>
-</collection>
-<collection name="commonadapter" long-name="Common Adapter" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="commonadapter_build" filter="s60" long-name="Common Adapter Build">
-<unit bldFile="mw/classicui/commonadapter/group"/>
-</component>
-</collection>
-<collection name="akntouchgesturefw" long-name="Avkon Touch Gesture Framework" level="generic">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="akntouchgesturefw_build" filter="s60" long-name="Avkon Touch Gesture Framework Build" introduced="^3">
-<unit bldFile="mw/classicui/akntouchgesturefw/group"/>
-</component>
-</collection>
-<collection name="uiutils" long-name="UI Utils" level="specific">
-<component name="localizer" filter="s60" long-name="Directory Localizer">
-<unit bldFile="mw/classicui/uiutils/localizer/group"/>
-</component>
-<component name="findutil" filter="s60" long-name="Find Utility">
-<unit bldFile="mw/classicui/uiutils/findutil/group"/>
-</component>
-<component name="gamerecognizer" filter="s60" long-name="Game Recognizer" plugin="Y">
-<unit bldFile="mw/classicui/uiutils/gamerecognizer/group"/>
-</component>
-<component name="aknjapanesereading" filter="s60" long-name="Avkon Japanese Reading">
-<unit bldFile="mw/classicui/uiutils/aknjapanesereading/group"/>
-</component>
-</collection>
-<collection name="commonuisupport" long-name="Common UI Support" level="support">
-<component name="uikon" long-name="Uikon" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uikon/group" mrp="mw/classicui/commonuisupport/uikon/group/app-framework_uikon.mrp"/>
-</component>
-<component name="errorresolverdata" long-name="Error Resolver Data" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/errorresolverdata/group" mrp="mw/classicui/commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
-</component>
-<component name="uilaf" long-name="UI Look and Feel" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uilaf/GROUP" mrp="mw/classicui/commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
-</component>
-<component name="grid" long-name="Grid" purpose="optional">
-<unit bldFile="mw/classicui/commonuisupport/grid/group" mrp="mw/classicui/commonuisupport/grid/group/app-framework_grid.mrp"/>
-</component>
-<component name="uifwsdocs" long-name="UI Frameworks Documentation" purpose="development" class="doc">
-<unit mrp="mw/classicui/commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
-</component>
-</collection>
-<collection name="lafagnosticuifoundation" long-name="Look-and-Feel Agnostic UI Foundation" level="base">
-<component name="cone" long-name="Control Environment" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/cone/group" mrp="mw/classicui/lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
-</component>
-<component name="graphicseffects" long-name="Graphics Effects" introduced="9.2" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/graphicseffects/group" mrp="mw/classicui/lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
-</component>
-<component name="uigraphicsutils" long-name="UI Graphics Utilities" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group" mrp="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
-</component>
-<component name="clockanim" long-name="Clock" purpose="optional" plugin="Y">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/clockanim/group" mrp="mw/classicui/lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
-</component>
-<component name="bmpanimation" long-name="BMP Animation" introduced="6.0" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/bmpanimation/group" mrp="mw/classicui/lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
-</component>
-<component name="animation" long-name="Animation" introduced="9.1" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/animation/group" mrp="mw/classicui/lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
-</component>
-</collection>
-<collection name="classicui_info" long-name="Classic UI Info" level="specific">
-<!-- the multiple units in the API test components need to be resolved -->
-<component name="classicui_metadata" long-name="Classic UI Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/classicui/classicui_info/classicui_metadata/classicui_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="svgt" level="generic" long-name="SVG Tiny" levels="util ui">
-<collection name="svgt_plat" long-name="SVG Tiny Platform Interfaces" level="ui">
-<component name="svgt_api" long-name="SVGT API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/svgt_api/group"/>
-</component>
-<component name="nvg_api" long-name="NVG API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/nvg_api/group"/>
-</component>
-</collection>
-<collection name="svgtopt" long-name="SVG-T Engine" level="util">
-<component name="svgtopt_build" filter="s60" long-name="SVG Engine" introduced="9.2">
-<!-- component is at collection level. Needs to be moved down a directory -->
-<unit bldFile="mw/svgt/svgtopt/group"/>
-</component>
-<component name="svgtplugin" filter="s60" long-name="SVG Plugin" introduced="9.2" plugin="Y">
-<unit bldFile="mw/svgt/svgtopt/svgtplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="uiaccelerator" level="generic" long-name="UI Accelerator" levels="plugin framework server ex if">
-<collection name="uiaccelerator_plat" long-name="UI Accelerator Platform Interfaces" level="if">
-<component name="alf_core_toolkit_api" long-name="ALF Core Toolkit API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/group"/>
-</component>
-<component name="alf_visual_api" long-name="ALF Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/group"/>
-</component>
-<component name="alf_extended_visual_api" long-name="ALF Extended Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/group"/>
-</component>
-<component name="alf_extension_api" long-name="ALF Extension API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/group"/>
-</component>
-<component name="alf_tracing_api" long-name="ALF Tracing API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/group"/>
-</component>
-<component name="alf_client_server_api" long-name="ALF Client Server API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/group"/>
-</component>
-</collection>
-<collection name="uiacceltk" long-name="UI Accelerator Toolkit" level="framework">
-<component name="hitchcock" filter="s60" long-name="Hitchcock">
-<unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/group"/>
-</component>
-<component name="uiacceltk_build" filter="s60" long-name="UI Accelerator Toolkit Build">
-<!-- move into the other component, or remove the #include and make this UI Accelerator Toolkit ROM-->
-<unit bldFile="mw/uiaccelerator/uiacceltk/group"/>
-</component>
-</collection>
-</block>
-<block name="uiresources" level="generic" long-name="UI Resources" levels="compile plugin framework server generic data">
-<!-- are the custom filters below needed? -->
-<collection name="uiresources_pub" long-name="UI Resources Public Interfaces" level="data">
-<component name="pictograph_api" long-name="Pictograph API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/pictograph_api/group" filter="!test"/>
-</component>
-<component name="skins_api" long-name="Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/skins_api/group" filter="!test"/>
-</component>
-<component name="font_definition_api" long-name="Font Definition API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/font_definition_api/group" filter="!test"/>
-</component>
-<component name="graphics_api" long-name="Graphics API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/graphics_api/group" filter="!test"/>
-</component>
-<component name="scalable_icons_api" long-name="Scalable Icons API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/scalable_icons_api/group"/>
-</component>
-<component name="layout_id_definitions_api" long-name="Layout ID Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/layout_id_definitions_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_plat" long-name="UI Resources Platform Interfaces" level="data">
-<component name="layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_system_private_api/group" filter="!test"/>
-</component>
-<component name="layout_data_api" long-name="Layout Data API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_data_api/group" filter="!test"/>
-</component>
-<component name="cdl_api" long-name="CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/cdl_api/group" filter="!test"/>
-</component>
-<component name="extended_skins_api" long-name="Extended Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_skins_api/group" filter="!test"/>
-</component>
-<component name="tfx_server_controller_plugin_api" long-name="TFX Server Controller Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_controller_plugin_api/group"/>
-</component>
-<component name="extended_fonts_api" long-name="Extended Fonts API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_fonts_api/group" filter="!test"/>
-</component>
-<component name="graphic_configuration_api" long-name="Graphic Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/graphic_configuration_api/group" filter="!test"/>
-</component>
-<component name="mif_header_cdl_api" long-name="MIF Header CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mif_header_cdl_api/group"/>
-</component>
-<component name="personalisation_and_skins_settings_api" long-name="Personalisation and Skins Settings API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/personalisation_and_skins_settings_api/group"/>
-</component>
-<component name="tfx_effect_setup_plugin_api" long-name="TFX Effect Setup Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_effect_setup_plugin_api/group"/>
-</component>
-<component name="mifconv_definitions_api" long-name="Mifconv Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mifconv_definitions_api/group"/>
-</component>
-<component name="wallpaper_configuration_api" long-name="Wallpaper Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/wallpaper_configuration_api/group"/>
-</component>
-<component name="language_code_definitions_api" long-name="Language Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/language_code_definitions_api/group"/>
-</component>
-<component name="skins_image_attributes_api" long-name="Skins Image Attributes API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
-</component>
-<component name="private_user_area_code_definitions_api" long-name="Private User Area Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/private_user_area_code_definitions_api/group"/>
-</component>
-<component name="tfx_server_plugin_ids_api" long-name="TFX Server Plug-in IDs API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_plugin_ids_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_info" long-name="UI Resources Info" level="data">
-<component name="uiresources_test" filter="s60,test,api_test" long-name="UI Resources Tests" purpose="development"/>
-</collection>
-<collection name="uigraphics" long-name="UI Graphics" level="generic">
-<component name="bitmaps2" filter="s60" long-name="Bitmaps 2" class="config">
-<unit bldFile="mw/uiresources/uigraphics/bitmaps2/group"/>
-</component>
-<component name="icons" filter="s60" long-name="Icons" class="config">
-<unit bldFile="mw/uiresources/uigraphics/icons/group"/>
-</component>
-<component name="variatedbitmaps" filter="s60" long-name="Variated Bitmaps" class="config">
-<unit bldFile="mw/uiresources/uigraphics/variatedbitmaps/group"/>
-</component>
-<component name="aknicon" filter="s60" long-name="Avkon Icon Framework">
-<unit bldFile="mw/uiresources/uigraphics/aknicon/group"/>
-</component>
-<component name="nvgrenderstage" filter="sf_build" long-name="NVG Render Stage">
-<unit bldFile="mw/uiresources/uigraphics/nvgrenderstage/group"/>
-</component>
-</collection>
-<collection name="layouts" long-name="Layouts" level="plugin">
-<component name="cdl" filter="s60" long-name="Customization Definition Language">
-<!-- can only have one unit. Need to #include them or split into multiple components -->
-<unit bldFile="mw/uiresources/layouts/cdl/cdlengine/group"/>
-<unit bldFile="mw/uiresources/layouts/cdl/cdlserver/group"/>
-</component>
-<component name="aknlayout2" filter="s60" long-name="Avkon Layout 2">
-<unit bldFile="mw/uiresources/layouts/aknlayout2/group"/>
-</component>
-</collection>
-<collection name="skins" long-name="Skins" level="data">
-<component name="aknskincontent" filter="s60" long-name="Avkon Skin Content" class="config">
-<unit bldFile="mw/uiresources/skins/aknskincontent/group"/>
-</component>
-<component name="aknskins" filter="s60" long-name="Avkon Skin Compiler">
-<unit bldFile="mw/uiresources/skins/aknskins/group"/>
-</component>
-</collection>
-<collection name="pictographs" long-name="Pictographs" level="data">
-<component name="aknpictograph" filter="s60" long-name="Avkon Pictograph">
-<unit bldFile="mw/uiresources/pictographs/aknpictograph/group"/>
-</component>
-</collection>
-<collection name="locales" long-name="Locales" level="framework">
-<component name="locales_build" filter="s60" long-name="Locales Build">
-<unit bldFile="mw/uiresources/locales/loce32"/>
-</component>
-</collection>
-<collection name="uiconfig" long-name="UI Config" level="server">
-<component name="s60config" filter="s60" long-name="S60 UI Config">
-<unit bldFile="mw/uiresources/uiconfig/s60config/group"/>
-</component>
-</collection>
-<collection name="fontsupport" long-name="Font Support" level="generic">
-<component name="fontprovider" filter="s60" long-name="Font Provider">
-<unit bldFile="mw/uiresources/fontsupport/fontprovider/group"/>
-</component>
-<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
- <component id="s60_fonts" filter="s60" name="S60 Fonts">
- <unit bldFile="fontsupport/fontutils/group"/>
- </component>
--->
-<component name="fontutils" filter="sf_build" long-name="Font Utils">
-<unit bldFile="mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
-</component>
-</collection>
-<collection name="helpthemes" long-name="Help Themes" level="data">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helpthemes_build" filter="s60" long-name="Help Themes Build" class="config">
-<unit bldFile="mw/uiresources/helpthemes/group"/>
-</component>
-</collection>
-</block>
-<block name="hapticsservices" level="generic" long-name="Haptics Services" levels="fw server api">
-<collection name="hapticsservices_plat" long-name="Haptics Services Platform Interfaces" level="api">
-<component name="tacticon_api" long-name="Tacticon API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tacticon_api/group"/>
-</component>
-<component name="tactile_feedback_core_api" long-name="Tactile Feedback Core API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_core_api/group"/>
-</component>
-<component name="tactile_feedback_server_api" long-name="Tactile Feedback Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_server_api/group"/>
-</component>
-</collection>
-<collection name="hapticsservices_pub" long-name="Haptics Services Public Interfaces" level="api">
-<component name="tactile_feedback_client_api" long-name="Tactile Feedback Client API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_pub/tactile_feedback_client_api/group"/>
-</component>
-</collection>
-<collection name="tacticonserver" long-name="Tacticon Server" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="tacticonserver_build" filter="s60" long-name="Tacticon Server Build" introduced="^3">
-<unit bldFile="mw/hapticsservices/tacticonserver/group"/>
-<!-- clients and servers are suauly the same component. Consider moving pluign to a separate component if needed -->
-</component>
-</collection>
-<collection name="tactilefeedback" long-name="Tactile Feedback" level="fw">
-<component name="tactilearearegistry" filter="s60" long-name="Tactile Area Registry" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilearearegistry/group"/>
-</component>
-<component name="tactilefeedbackresolver" filter="s60" long-name="Tactile Feedback Resolver" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackresolver/group"/>
-</component>
-<component name="tactileclickplugin" filter="s60" long-name="Tactile Click Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileclickplugin/group"/>
-</component>
-<component name="tactilefeedbackclient" filter="s60" long-name="Tactile Feedback Client" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackclient/group"/>
-</component>
-<component name="tactileactionplugin" filter="s60" long-name="Tactile Action Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileactionplugin/group"/>
-</component>
-<component name="tactilefeedback_build" filter="s60" long-name="Tactile Feedback Build" introduced="^1">
-<!-- consider moving IBY to one fo the above components -->
-<unit bldFile="mw/hapticsservices/tactilefeedback/group"/>
-</component>
-</collection>
-</block>
-<block name="gsprofilesrv" level="generic" long-name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
-<collection name="gsprofilesrv_pub" long-name="GS and Profiles Services Public Interfaces" level="specific">
-<component name="profiles_engine_active_profile_settings_api" long-name="Profiles Engine Active Profile Settings API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_active_profile_settings_api/group"/>
-</component>
-<component name="profiles_engine_wrapper_api" long-name="Profiles Engine Wrapper API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_wrapper_api/group"/>
-</component>
-</collection>
-<collection name="gsprofilesrv_plat" long-name="GS and Profiles Services Platform Interfaces" level="specific">
-<component name="profiles_engine_api" long-name="Profiles Engine API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_engine_api/group"/>
-</component>
-<component name="profiles_mediafilelist_api" long-name="Media File List API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_mediafilelist_api/group"/>
-</component>
-<component name="filelist_api" long-name="File List API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/filelist_api/group"/>
-</component>
-<component name="settings_backgroundimage_api" long-name="Settings Background Image API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_backgroundimage_api/group"/>
-</component>
-<component name="settings_framework_api" long-name="Settings Framework API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_framework_api/group"/>
-</component>
-<component name="settings_launch_api" long-name="Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_launch_api/group"/>
-</component>
-<component name="settings_listbox_api" long-name="Settings List Box API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_listbox_api/group"/>
-</component>
-<component name="settings_plugin_api" long-name="Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_plugin_api/group"/>
-</component>
-<component name="settings_uis_cenrep_collection_api" long-name="Settings UIs CenRep Collection API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
-</component>
-</collection>
-<collection name="gssettingsuis" long-name="General Settings UIs" level="framework">
-<component name="gs" filter="s60" long-name="General Settings" introduced="9.2">
-<unit bldFile="mw/gsprofilesrv/gssettingsuis/gs/group"/>
-</component>
-</collection>
-<collection name="profilesservices" long-name="Profiles Services" level="server">
-<component name="filelist" filter="s60" long-name="File List" introduced="9.1">
-<unit bldFile="mw/gsprofilesrv/profilesservices/filelist/group"/>
-</component>
-<component name="mediafilelist" filter="s60" long-name="Media File List" introduced="^2">
-<unit bldFile="mw/gsprofilesrv/profilesservices/mediafilelist/group"/>
-</component>
-<component name="profileengine" filter="s60" long-name="Profile Engine" introduced="9.1">
-<unit bldFile="mw/gsprofilesrv/profilesservices/profileengine/group"/>
-</component>
-<component name="ringingtone3dplugin" filter="s60" long-name="Ringing Tone 3D Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/gsprofilesrv/profilesservices/ringingtone3dplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreensrv" level="specific" long-name="Home Screen Services" levels="plugin framework server generic specific">
-<collection name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" level="specific">
-<component name="ai_content_model_api" long-name="AI Content Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_content_model_api/group"/>
-</component>
-<component name="ai_utilities_api" long-name="AI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_utilities_api/group" filter="!test"/>
-</component>
-<component name="ai_plugin_management_api" long-name="AI Plug-in Management API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_management_api/group"/>
-</component>
-<component name="ai_plugin_information_api" long-name="AI Plug-in Information API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_information_api/group"/>
-</component>
-<component name="ai_variation_api" long-name="AI Variation API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_variation_api/group"/>
-</component>
-<component name="action_handler_plugin_api" long-name="Action Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/group" filter="!test"/>
-</component>
-<component name="content_harvester_plugin_api" long-name="Content Harvester Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/group" filter="!test"/>
-</component>
-<component name="menu_model_api" long-name="Menu Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_model_api/group"/>
-</component>
-<component name="menu_sat_interface_api" long-name="Menu SAT Interface API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/group" filter="!test"/>
-</component>
-<component name="external_home_screen_api" long-name="External Home Screen API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/external_home_screen_api/group"/>
-</component>
-<component name="menu_content_service_api" long-name="Menu Content Service API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_content_service_api/group" filter="!test"/>
-</component>
-<component name="sapi_contentpublishing" long-name="SAPI Content Publishing" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing/group"/>
-</component>
-<component name="sapi_backstepping" long-name="SAPI Backstepping" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_backstepping/group"/>
-</component>
-<component name="sapi_actionhandler" long-name="SAPI Action Handler" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_actionhandler/group"/>
-</component>
-<component name="sapi_homescreenplugin" long-name="SAPI Homescreen Plugin" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_homescreenplugin/group" filter="!test"/>
-</component>
-<component name="sapi_menucontent" long-name="SAPI Menu Content" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_menucontent/group"/>
-</component>
-<component name="xcfw_api" long-name="XCFW API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/xcfw_api/group"/>
-</component>
-<component name="idlefw_api" long-name="Idle Framework API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/idlefw_api/group"/>
-</component>
-<component name="hs_widget_publisher_api" long-name="Home Screen Publishing API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_widget_publisher_api/group"/>
-</component>
-<component name="hs_settings_api" long-name="HS Settings API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_settings_api/group"/>
-</component>
-<component name="hs_content_control_api" long-name="HS Content Control API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_content_control_api/group"/>
-</component>
-</collection>
-<collection name="xcfw" long-name="XML Content Framework" level="framework">
-<!-- collection is really a component, needs to be moved down a directory -->
-<component name="xcfw_build" filter="s60" long-name="XML Content Framework Build">
-<unit bldFile="mw/homescreensrv/xcfw/group"/>
-</component>
-</collection>
-<collection name="homescreenpluginsrv" long-name="Home Screen Plugin Service" level="plugin">
-<component name="hspsdefinitionengine" filter="s60" long-name="HS Plugin Service Definition Engine" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsdefinitionengine/group"/> -->
-</component>
-<component name="hspsdom" filter="s60" long-name="HS Plugin Service DOM" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsdom/group"/> -->
-</component>
-<component name="hspstools" filter="s60" long-name="HS Server Tools">
-<!-- <unit bldFile="homescreenpluginsrv/hspstools/group"/> -->
-</component>
-<component name="hspspluginregistry" filter="s60" long-name="HS Plugin Registry" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspspluginregistry/group"/>-->
-</component>
-<component name="hspsmanager" filter="s60" long-name="HSPS Manager" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsmanager/group"/>-->
-</component>
-<component name="hspsodt" filter="s60" long-name="HSPS Object Description Tree" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsodt/group"/>-->
-</component>
-<component name="hspsresource" filter="s60" long-name="HS Plugin Server Resource" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresource/group"/>-->
-</component>
-<component name="hspsresult" filter="s60" long-name="HS Plugin Server Result" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
-</component>
-<component name="homescreen_settings_api" filter="s60" long-name="HS Settings API" class="api placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
-</component>
-<component name="homescreenpluginsrv_build" filter="s60" long-name="HSPS Build">
-<!-- need to break this up into the self-contained components above and uncomment them -->
-<unit bldFile="mw/homescreensrv/homescreenpluginsrv/group"/>
-</component>
-</collection>
-<collection name="idlefw" long-name="Idle Framework" level="framework">
-<!-- Uncomment all units when configuration is in place. All currently #included from idlefw_build -->
-<component name="idlefw_plugins" filter="s60" long-name="Idle Framework Plugins" plugin="Y" class="placeholder">
-<!--<unit bldFile="idlefw/plugins/group"/>-->
-</component>
-<component name="hslaunch" filter="s60" long-name="Home Screen Launch" class="placeholder">
-<!--<unit bldFile="idlefw/plugins/group"/>-->
-</component>
-<component name="idlefw_build" filter="s60" long-name="Idle Framework Build">
-<!--split this into components, or separate from the above components and move this down a directory -->
-<unit bldFile="mw/homescreensrv/idlefw/group"/>
-</component>
-</collection>
-<collection name="menucontentsrv" long-name="Menu Content Service" level="generic">
-<component name="menusatinterface" filter="s60" long-name="Menu SAT Interface">
-<unit bldFile="mw/homescreensrv/menucontentsrv/menusatinterface/group"/>
-</component>
-<component name="menucontentsrv_build" filter="s60" long-name="Menu Content Service Build">
-<!--split this into components, or separate from the above component and move this down a directory -->
-<unit bldFile="mw/homescreensrv/menucontentsrv/group"/>
-</component>
-</collection>
-<collection name="backsteppingsrv" long-name="Back Stepping Service" level="server">
-<!-- collection is really a component, needs to be moved down a directory -->
-<component name="bsengine" long-name="Back Stepping Engine" filter="s60">
-<unit bldFile="mw/homescreensrv/backsteppingsrv/group"/>
-</component>
-</collection>
-<collection name="contentpublishingsrv" long-name="Content Publishing Service" level="server">
-<component name="contentpublishingdebug" filter="s60" long-name="Content Publishing Debug">
-<!-- need to move this component outside of contentpublishingutils and into separate component directory -->
-<!-- <unit bldFile="contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/> -->
-</component>
-<component name="contentpublishingutils" filter="s60" long-name="Content Publishing Utils">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingutils/group"/>
-</component>
-<component name="contentpublishingserver" filter="s60" long-name="Content Publishing Server">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingserver/group"/>
-</component>
-<component name="contentharvester" filter="s60" long-name="Content Harvester">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
-</component>
-<component name="contentpublishingsrv_build" filter="s60" long-name="Content Publishing Service Build">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/group"/>
-</component>
-</collection>
-<collection name="contentcontrolsrv" long-name="Content Control Service" level="server">
-<component name="ccsrv" long-name="Content Control Service" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccsrv/group"/>
-</component>
-<component name="ccsrvapi" long-name="Content Control Service API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccsrvapi/group"/>
-</component>
-<component name="ccclientsession" long-name="Content Control Client Session" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccclientsession/group"/>
-</component>
-<component name="hsccclient" long-name="HS Content Control Client" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/hsccclient/group"/>
-</component>
-<component name="hscontentinfo" long-name="Home Screen Content Info" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/hscontentinfo/group"/>
-</component>
-<component name="contentcontrolsrv_build" long-name="Content Control Service Build" filter="s60" introduced="^3">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/group"/>
-</component>
-</collection>
-</block>
-<block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
-<collection name="appinstall_plat" long-name="Application Installation Platform Interfaces" level="api">
-<component name="iaupdate_api" long-name="IA Update API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/iaupdate_api/group"/>
-</component>
-<component name="task_plugin_api" long-name="Task Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_plugin_api/group"/>
-</component>
-<component name="sw_installer_common_ui_api" long-name="SW Installer Common UI API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_common_ui_api/group"/>
-</component>
-<component name="sw_installer_launcher_api" long-name="SW Installer Launcher API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_launcher_api/group"/>
-</component>
-<component name="task_management_api" long-name="Task Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_management_api/group"/>
-</component>
-<component name="sw_installer_ui_plugin_api" long-name="SW Installer UI Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ui_plugin_api/group"/>
-</component>
-<component name="sw_installer_cr_keys" long-name="SW Installer CR Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_cr_keys/group"/>
-</component>
-<component name="sw_installer_ps_keys" long-name="SW Installer PS Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
-</component>
-<component name="appmngr2runtimeapi" long-name="Application Manager 2 Runtime Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
-</component>
-</collection>
-<collection name="appinstall_pub" long-name="Application Installation Public Interfaces" level="api">
-<component name="startup_list_management_api" long-name="Startup List Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
-</component>
-</collection>
-<collection name="ncdengine" long-name="Nokia Content Discover" level="framework">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="ncdengine_engine" filter="s60" long-name="NCD Engine" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/engine/group"/>
-</component>
-<component name="debuglogger" filter="s60" long-name="NCD Debug Logger" introduced="^1" class="placeholder">
-<!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
-</component>
-<component name="ncdengine_build" filter="s60" long-name="NCD Build" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/group"/>
-</component>
-</collection>
-<collection name="appinstaller" long-name="Application Installer" level="generic">
-<component name="appmngr2" filter="s60" long-name="Application Manager 2" introduced="^2">
-<unit bldFile="mw/appinstall/appinstaller/appmngr2/group"/>
-</component>
-<component name="appinstui" filter="s60" long-name="Application Installer UI" introduced="^2">
-<unit bldFile="mw/appinstall/appinstaller/appinstui/group"/>
-</component>
-</collection>
-<collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="api">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="iaupdateapi_stub_build" long-name="IA Update API Stub Build" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdateapi_stub/group"/>
-</component>
-</collection>
-<collection name="iaupdate" long-name="Independent Apps Update" level="api">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="iad" long-name="Software Update" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/iad/group"/>
-</component>
-<component name="iaupdate_help" filter="s60" long-name="IA Update Help" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/help/group"/>
-</component>
-<component name="iaupdate_build" filter="s60" long-name="IA Update Build" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/group"/>
-</component>
-</collection>
-<collection name="installationservices" long-name="Installation Services" level="generic">
-<component name="swi" long-name="Secure Software Install" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swi/group" mrp="mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
-</component>
-<component name="swidevicetools" long-name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
-<unit bldFile="mw/appinstall/installationservices/swidevicetools/group" mrp="mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
-</component>
-<component name="swiconfig" long-name="Software Install Config" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appinstall/installationservices/swiconfig/group" mrp="mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
-</component>
-</collection>
-<collection name="secureswitools" long-name="Secure Software Install Tools" level="tool">
-<component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/makekeys/group" mrp="mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
-</component>
-<component name="swianalysistoolkit" long-name="SWI Analysis Toolkit" purpose="development" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
-</component>
-<component name="openssllib" long-name="OpenSSL Library" purpose="optional" class="PC">
-<unit mrp="mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
-</component>
-<component name="swisistools" long-name="Secure Software Install SIS Tools" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swisistools/group" mrp="mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
-</component>
-</collection>
-<collection name="appinstall_info" long-name="Application Installation Info" level="api">
-<component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="serviceapifw" level="specific" long-name="Service API Framework" levels="plugin framework server generic specific">
-<collection name="serviceapifw_pub" long-name="Service API Framework Public Interfaces" level="specific"/>
-<collection name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" level="specific">
-<component name="rtsecuritymanager_common_api" long-name="Runtime Security Manager Common API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/group"/>
-</component>
-<component name="rtsecuritymanager_utility_api" long-name="Runtime Security Manager Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
-</component>
-<component name="rtsecuritymanager_client_api" long-name="Runtime Security Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/group"/>
-</component>
-<component name="liw_provider_utility_api" long-name="LIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_provider_utility_api/group"/>
-</component>
-<component name="liw_service_interface_base_api" long-name="LIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_base_api/group"/>
-</component>
-<component name="liw_service_interface_menu_api" long-name="LIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_menu_api/group"/>
-</component>
-<component name="liw_criteria_api" long-name="LIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_criteria_api/group"/>
-</component>
-<component name="liw_generic_parameter_api" long-name="LIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_generic_parameter_api/group"/>
-</component>
-<component name="liw_service_handler_api" long-name="LIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_handler_api/group"/>
-</component>
-</collection>
-<collection name="rtsecuritymanager" long-name="Runtime Security Manager" level="server">
-<component name="rtsecuritymanagerutil" filter="s60" long-name="Runtime Security Manager Util">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
-</component>
-<component name="rtsecuritymanagerserver" filter="s60" long-name="Runtime Security Manager Server">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/>
-</component>
-<component name="rtsecuritymanagerclient" filter="s60" long-name="Runtime Security Manager Client">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/>
-</component>
-<component name="rtsecuritymanager_build" filter="s60" long-name="Runtime Security Manager Build">
-<!-- Move the export to the appropriate components, or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/group"/>
-</component>
-</collection>
-<collection name="languageinterworkingfw" long-name="Language Interworking Framework" level="framework">
-<component name="lifwservicehandler" filter="s60" long-name="Service Handler">
-<unit bldFile="mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-</block>
-<block name="serviceapi" level="specific" long-name="Service API" levels="os mw1 mw2 app">
-<!-- should break up this collection into something meaningful -->
-<collection name="serviceproviders" long-name="Service Providers" level="mw1">
-<component name="sapi_contacts_vpbk" long-name="Contacts Phonebook SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
-</component>
-<component name="sapi_location" long-name="Location SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_location/group"/>
-</component>
-<component name="sapi_mediamanagement" long-name="Media Management SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/group"/>
-</component>
-<component name="sapi_landmarks" long-name="Landmarks SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
-</component>
-<component name="sapi_messaging" long-name="Messaging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/group"/>
-</component>
-<component name="sapi_applicationmanager" long-name="Application Manager SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
-</component>
-<component name="sapi_calendar" long-name="Calendar SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_calendar/group"/>
-</component>
-<component name="sapi_logging" long-name="Logging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_logging/group"/>
-</component>
-<component name="sapi_sensor" long-name="Sensor SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sensor/group"/>
-</component>
-<component name="sapi_sysinfo" long-name="Sysinfo SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sysinfo/group"/>
-</component>
-<component name="sapi_serviceregistry" long-name="Service Registry SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
-</component>
-<component name="jsapi" long-name="Javascript API" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/jsapi/group"/>
-</component>
-<component name="serviceproviders_build" filter="s60" long-name="Service API Build">
-<!-- distribute the exports or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapi/serviceproviders/group"/>
-</component>
-</collection>
-</block>
-<block name="web" level="specific" long-name="Web" levels="plugin utils server generic specific">
-<collection name="web_pub" long-name="Web Public Interfaces" level="specific">
-<component name="browser_control_api" long-name="Browser Control API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_control_api/group"/>
-</component>
-<component name="download_mgr_client_api" long-name="Download Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_client_api/group"/>
-</component>
-<component name="download_mgr_ui_api" long-name="Download Manager UI Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_ui_api/group"/>
-</component>
-<component name="favourites_engine_api" long-name="Favourites Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/favourites_engine_api/group"/>
-</component>
-<component name="browser_plugin_api" long-name="Browser Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_plugin_api/group"/>
-</component>
-<component name="settings_api" long-name="Settings API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/settings_api/group"/>
-</component>
-</collection>
-<collection name="web_plat" long-name="Web Platform Interfaces" level="specific">
-<component name="aiw_browser_provider_api" long-name="AIW Browser Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/aiw_browser_provider_api/group"/>
-</component>
-<component name="browser_dialogs_provider_api" long-name="Browser Dialogs Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_dialogs_provider_api/group"/>
-</component>
-<component name="browser_platform_api" long-name="Browser Platform API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_platform_api/group"/>
-</component>
-<component name="cod_handler_api" long-name="COD Handler API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cod_handler_api/group"/>
-</component>
-<component name="connection_manager_api" long-name="Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/connection_manager_api/group"/>
-</component>
-<component name="cxml_library_api" long-name="cXml Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cxml_library_api/group"/>
-</component>
-<component name="download_mgr_client_api_extn" long-name="Download Manager Client API Extension" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/download_mgr_client_api_extn/group"/>
-</component>
-<component name="download_path_plugin_api" long-name="Download Path Plugin API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/web/web_plat/download_path_plugin_api/group"/>
-</component>
-<component name="feeds_engine_api" long-name="Feeds Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/feeds_engine_api/group"/>
-</component>
-<component name="launcher_api" long-name="Launcher API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/launcher_api/group"/>
-</component>
-<component name="multipart_parser_api" long-name="Multipart Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/multipart_parser_api/group"/>
-</component>
-<component name="recent_url_store_api" long-name="Recent URL Store API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/recent_url_store_api/group"/>
-</component>
-<component name="scheme_handler_plugin_api" long-name="Scheme Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scheme_handler_plugin_api/group"/>
-</component>
-<component name="scriptable_plugin_api" long-name="Scriptable Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scriptable_plugin_api/group"/>
-</component>
-<component name="webutils_api" long-name="Web Utils API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/webutils_api/group"/>
-</component>
-<component name="widget_registry_api" long-name="Widget Registry API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/widget_registry_api/group"/>
-</component>
-<component name="xml_parser_api" long-name="XML Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/xml_parser_api/group"/>
-</component>
-<component name="stmgesturefw_api" long-name="State Machine Gesture Framework API " filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/stmgesturefw_api/group"/>
-</component>
-</collection>
-<collection name="web_info" long-name="Web Info" level="specific">
-<component name="web_build" filter="s60" long-name="Web Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/group"/>
-</component>
-</collection>
-<collection name="browserutilities" long-name="Browser Utilities" level="utils">
-<component name="browserdialogsprovider" filter="s60" long-name="Browser Dialogs Provider">
-<unit bldFile="mw/web/browserutilities/browserdialogsprovider/group"/>
-</component>
-<component name="recenturlstore" filter="s60" long-name="Recent URL Store">
-<unit bldFile="mw/web/browserutilities/recenturlstore/group"/>
-</component>
-<component name="xmlparser" filter="s60" long-name="XML Interface">
-<unit bldFile="mw/web/browserutilities/xmlparser/group"/>
-</component>
-<component name="cxmllibrary" filter="s60" long-name="XML Parser Implementation">
-<unit bldFile="mw/web/browserutilities/cxmllibrary/group"/>
-</component>
-<component name="downloadmgr" filter="s60" long-name="Download Manager">
-<unit bldFile="mw/web/browserutilities/downloadmgr/group"/>
-</component>
-<component name="connectionmanager" filter="s60" long-name="Connection Manager">
-<unit bldFile="mw/web/browserutilities/connectionmanager/group"/>
-</component>
-<component name="browsertelservice" filter="s60" long-name="Browser Telephony Service">
-<unit bldFile="mw/web/browserutilities/browsertelservice/group"/>
-</component>
-<component name="favouritesengine" filter="s60" long-name="Favourites Engine">
-<unit bldFile="mw/web/browserutilities/favouritesengine/group"/>
-</component>
-<component name="feedsengine" filter="s60" long-name="Feeds Engine">
-<unit bldFile="mw/web/browserutilities/feedsengine/group"/>
-</component>
-<component name="multipartparser" filter="s60" long-name="Multipart Parser">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
-<!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
-</component>
-<component name="schemehandler" filter="s60" long-name="Scheme Handler">
-<unit bldFile="mw/web/browserutilities/schemehandler/group"/>
-</component>
-<component name="webutils" filter="s60" long-name="Web Utils">
-<unit bldFile="mw/web/browserutilities/webutils/group"/>
-</component>
-<component name="aiwbrowserprovider" filter="s60" long-name="AIW Browser Provider" plugin="Y">
-<unit bldFile="mw/web/browserutilities/aiwbrowserprovider/group"/>
-</component>
-<component name="browserutilities_build" filter="s60" long-name="Browser Utilities Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/browserutilities/group"/>
-</component>
-</collection>
-<collection name="webengine" long-name="Web Engine" level="server">
-<component name="osswebengine" filter="s60" long-name="OSS Web Engine">
-<!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
-<unit bldFile="mw/web/webengine/osswebengine/cache/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/memorymanager/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/npscript/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group/javascriptcore"/>
-</component>
-<component name="webkitutils" filter="s60" long-name="WebKit Utils">
-<unit bldFile="mw/web/webengine/webkitutils/group"/>
-</component>
-<component name="pagescaler" filter="s60" long-name="Page Scaler">
-<unit bldFile="mw/web/webengine/pagescaler/group"/>
-</component>
-<component name="webwidgetinstaller" filter="s60" long-name="Widget Installer">
-<unit bldFile="mw/web/webengine/widgetinstaller/group"/>
-</component>
-<component name="widgetregistry" filter="s60" long-name="Widget Registry">
-<unit bldFile="mw/web/webengine/widgetregistry/group"/>
-</component>
-<component name="wmlengine" filter="s60" long-name="WML Engine">
-<unit bldFile="mw/web/webengine/wmlengine/group"/>
-</component>
-<component name="device" filter="s60" long-name="Device">
-<!-- this needs a more meaningful name -->
-<unit bldFile="mw/web/webengine/device/group"/>
-</component>
-<component name="widgetengine" filter="s60" long-name="Widget Engine">
-<unit bldFile="mw/web/webengine/widgetengine/group"/>
-</component>
-<component name="web_memoryplugin" long-name="Memory Plugin" filter="s60" plugin="Y">
-<unit bldFile="mw/web/webengine/memoryplugin/group"/>
-</component>
-<component name="widgetmemoryplugin" filter="s60" long-name="Widget Memory Plugin" plugin="Y">
-<unit bldFile="mw/web/webengine/widgetmemoryplugin/group"/>
-</component>
-<component name="widgetbackuprestore" filter="s60" long-name="Widget Backup and Restore">
-<unit bldFile="mw/web/webengine/widgetbackuprestore/group"/>
-</component>
-<component name="browserrecognizers" filter="s60" long-name="Browser Recognizers" plugin="Y">
-<unit bldFile="mw/web/webengine/browserrecognizers/group"/>
-</component>
-<component name="wrtharvester" filter="s60" long-name="Web Runtime Harvester" plugin="Y">
-<unit bldFile="mw/web/webengine/wrtharvester/group"/>
-</component>
-</collection>
-<collection name="codhandler" long-name="Content Object Descriptor Handler" level="specific">
-<component name="codeng" filter="s60" long-name="COD Engine">
-<unit bldFile="mw/web/codhandler/codeng/group"/>
-</component>
-<component name="codui" filter="s60" long-name="COD UI">
-<unit bldFile="mw/web/codhandler/codui/group"/>
-</component>
-<component name="codrecog" filter="s60" long-name="COD Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/codrecog/group"/>
-</component>
-<component name="codviewer" filter="s60" long-name="COD Viewer">
-<unit bldFile="mw/web/codhandler/codviewer/group"/>
-</component>
-<component name="ddrecog" filter="s60" long-name="Download Descriptor Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/ddrecog/group"/>
-</component>
-<component name="ddviewer" filter="s60" long-name="Download Descriptor Viewer">
-<unit bldFile="mw/web/codhandler/ddviewer/group"/>
-</component>
-<component name="coddownload" filter="s60" long-name="COD Download">
-<unit bldFile="mw/web/codhandler/coddownload/group"/>
-</component>
-<component name="roapapp" filter="s60" long-name="ROAP Application">
-<unit bldFile="mw/web/codhandler/roapapp/group"/>
-</component>
-<component name="codhandler_build" filter="s60" long-name="COD Handler Build">
-<!-- Exports need to go into another component or make this self-contained.
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/codhandler/group"/>
-</component>
-</collection>
-<collection name="widgets" long-name="Web Widget Framework" level="generic">
-<!-- the following units can be uncommented when configuration is put in place -->
-<component name="widgetrecognizer" filter="s60" long-name="Widget Recognizer" plugin="Y">
-<!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
-</component>
-<component name="widgetinstaller" filter="s60" long-name="Widget Installer UI" plugin="Y">
-<!--<unit bldFile="widgets/widgetinstaller/group"/>-->
-</component>
-<component name="widgetlauncher" filter="s60" long-name="Widget Launcher">
-<!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
-</component>
-<component name="widgetapp" filter="s60" long-name="Widget UI">
-<!--<unit bldFile="widgets/widgetapp/group"/>-->
-</component>
-<component name="widgetsidchecker" filter="s60" long-name="Widget SID Checker" introduced="^3">
-<!--<unit bldFile="widgets/widgetsidchecker/group"/>-->
-</component>
-<component name="widgetpreinstaller" filter="s60" long-name="Widget Pre-Installer">
-<!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
-</component>
-<component name="widgetstartup" filter="s60" long-name="Widget Startup">
-<!--<unit bldFile="widgets/widgetstartup/group"/>-->
-</component>
-<component name="widgets_build" filter="s60" long-name="Widgets Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/widgets/group"/>
-</component>
-</collection>
-</block>
-<block name="websrv" level="generic" long-name="Web Services" levels="plugin framework server generic specific">
-<collection name="websrv_pub" long-name="Web Services Public Interfaces" level="specific">
-<component name="web_service_description_api" long-name="Web Service Description API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_description_api/group"/>
-</component>
-<component name="web_service_connection_api" long-name="Web Service Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/group"/>
-</component>
-<component name="web_service_manager_api" long-name="Web Service Manager API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/group"/>
-</component>
-<component name="hostlet_connection_api" long-name="Hostlet Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/group"/>
-</component>
-<component name="web_service_messaging_api" long-name="Web Service Messaging API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/group"/>
-</component>
-<component name="xml_extensions_api" long-name="XML Extensions API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/group"/>
-</component>
-<component name="xml_fragment_api" long-name="XML Fragment API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/group"/>
-</component>
-</collection>
-<collection name="webservices" long-name="Web Services Framework" level="generic">
-<!-- consider breaking this collection into more meaningful subsets -->
-<component name="wsnotifierplugins" filter="s60" long-name="WS Notifier Plugins" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsnotifierplugins/group"/>
-</component>
-<component name="wslogger" filter="s60" long-name="WS Logger">
-<unit bldFile="mw/websrv/webservices/wslogger/group"/>
-</component>
-<component name="wsxml" filter="s60" long-name="WS XML Extensions">
-<unit bldFile="mw/websrv/webservices/wsxml/group"/>
-</component>
-<component name="wsutils" filter="s60" long-name="WS Utils">
-<unit bldFile="mw/websrv/webservices/wsutils/group"/>
-</component>
-<component name="wsfragment" filter="s60" long-name="WS Fragment">
-<unit bldFile="mw/websrv/webservices/wsfragment/group"/>
-</component>
-<component name="wsdescription" filter="s60" long-name="WS Service Description">
-<unit bldFile="mw/websrv/webservices/wsdescription/group"/>
-</component>
-<component name="wsconnection" filter="s60" long-name="WS Service Connection">
-<unit bldFile="mw/websrv/webservices/wsconnection/group"/>
-</component>
-<component name="wsmessages" filter="s60" long-name="WS Messages">
-<unit bldFile="mw/websrv/webservices/wsmessages/group"/>
-</component>
-<component name="wscredentialmanager" filter="s60" long-name="WS Credential Manager">
-<unit bldFile="mw/websrv/webservices/wscredentialmanager/group"/>
-</component>
-<component name="wsframework" filter="s60" long-name="WS Framework">
-<unit bldFile="mw/websrv/webservices/wsframework/group"/>
-</component>
-<component name="wshttpchanneltransportplugin" filter="s60" long-name="WS HTTP Channel Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshttpchanneltransportplugin/group"/>
-</component>
-<component name="wsconnectionagent" filter="s60" long-name="WS Connection Agent">
-<unit bldFile="mw/websrv/webservices/wsconnectionagent/group"/>
-</component>
-<component name="wsprovider" filter="s60" long-name="WS Provider">
-<unit bldFile="mw/websrv/webservices/wsprovider/group"/>
-</component>
-<component name="wshostletconnection" filter="s60" long-name="WS Hostlet Connection">
-<unit bldFile="mw/websrv/webservices/wshostletconnection/group"/>
-</component>
-<component name="wsmanager" filter="s60" long-name="WS Service Manager">
-<unit bldFile="mw/websrv/webservices/wsmanager/group"/>
-</component>
-<component name="wsidentitymanager" filter="s60" long-name="WS Identity Manager">
-<unit bldFile="mw/websrv/webservices/wsidentitymanager/group"/>
-</component>
-<component name="idwsfplugin" filter="s60" long-name="ID-WSF Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/idwsfplugin/group"/>
-</component>
-<component name="wsibasicplugin" filter="s60" long-name="WS-I Basic Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsibasicplugin/group"/>
-</component>
-<component name="wsrestplugin" filter="s60" long-name="WS REST Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsrestplugin/group"/>
-</component>
-<component name="idwsfsecuritymechanism" filter="s60" long-name="ID-WSF Security Mechanism">
-<unit bldFile="mw/websrv/webservices/idwsfsecuritymechanism/group"/>
-</component>
-<component name="wspasswordtransforms" filter="s60" long-name="WS Password Transforms">
-<unit bldFile="mw/websrv/webservices/wspasswordtransforms/group"/>
-</component>
-<component name="wscore" filter="s60" long-name="WS Core Service Manager">
-<unit bldFile="mw/websrv/webservices/wscore/group"/>
-</component>
-<component name="wslocaltransportplugin" filter="s60" long-name="WS Local Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wslocaltransportplugin/group"/>
-</component>
-<component name="wshostlettransportplugin" filter="s60" long-name="WS Hostlet Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshostlettransportplugin/group"/>
-</component>
-<component name="wsstar" filter="s60" long-name="WS Star">
-<!-- can only have one unit. Need to split into separate components or #include from a single bld.inf -->
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarpolicy/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarplugin/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarmessagehandlers/group"/>
-</component>
-<component name="wsoviplugin" filter="s60" long-name="WS Ovi Plugin">
-<unit bldFile="mw/websrv/webservices/wsoviplugin/group"/>
-</component>
-<component name="webservices_build" filter="s60" long-name="Web Services Build">
-<!-- need to split into self-contained components -->
-<unit bldFile="mw/websrv/webservices/group"/>
-</component>
-</collection>
-<collection name="websrv_info" long-name="Web Services Info" level="specific">
-<component name="websrv_bld" filter="s60" long-name="Web Services Build">
-<!-- need to include common .hrh in each unit -->
-<unit bldFile="mw/websrv/group"/>
-</component>
-</collection>
-</block>
-<block name="platformtools" level="generic" long-name="Platform Tools">
-<collection name="gfxconversion" long-name="Graphics Conversion">
-<component name="bmconv_s60" filter="s60" long-name="S60 Bitmap Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/bmconv_s60/group"/>
-</component>
-<component name="mifconv" filter="s60" long-name="Multi Icon File Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/mifconv/group"/>
-</component>
-</collection>
-</block>
-<block name="uitools" level="specific" long-name="UI Tools" levels="compile encode tool if">
-<collection name="uitools_pub" long-name="UI Tools Public Interfaces" level="if">
-<component name="third_party_bitmap_palette_api" long-name="Third Party Bitmap Palette API" filter="s60" class="api">
-<unit bldFile="mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
-</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">
-<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">
-<unit bldFile="mw/uitools/uitools_plat/layout_system_private_api/group"/>
-</component>
-</collection>
-<collection name="cdlcompilertoolkit" long-name="CDL Compiler Toolkit" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompilertoolkit_build" filter="s60" long-name="CDL Compiler Toolkit Build">
-<unit bldFile="mw/uitools/cdlcompilertoolkit/group"/>
-</component>
-</collection>
-<collection name="cdlcompiler" long-name="CDL Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompiler_build" filter="s60" long-name="CDL Compiler Build">
-<unit bldFile="mw/uitools/cdlcompiler/group"/>
-</component>
-</collection>
-<collection name="gfxtools" long-name="Graphics Tools" level="tool">
-<component name="gditools" filter="s60" long-name="GDI Tools" class="PC">
-<unit bldFile="mw/uitools/gfxtools/gditools/group"/>
-</component>
-<component name="color" filter="s60" long-name="Bitmap Colour Palette" class="PC">
-<unit bldFile="mw/uitools/gfxtools/color/group"/>
-</component>
-</collection>
-<collection name="aknlayoutcompiler" long-name="Avkon Layout Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="aknlayoutcompiler_build" filter="s60" long-name="Avkon Layout Compiler Build">
-<unit bldFile="mw/uitools/aknlayoutcompiler/group"/>
-</component>
-</collection>
-<collection name="skincompiler" long-name="Skin Compiler" level="compile">
-<component name="aknskindesccompiler" filter="s60" long-name="Avkon Skin Descriptor Compiler">
-<unit bldFile="mw/uitools/skincompiler/AknSkinDescCompiler/group"/>
-</component>
-</collection>
-<collection name="reszip" long-name="Resource Zip" level="encode">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="reszip_build" filter="s60" long-name="Resource Zip Build">
-<unit bldFile="mw/uitools/reszip/group"/>
-</component>
-</collection>
-<collection name="toollibraries" long-name="Tool Libraries" level="tool"/>
-<collection name="svgtencoder" long-name="SVGT Encoder" level="encode">
-<component name="svgtenc" filter="s60" long-name="Standalone SVGT Encoder" class="PC">
-<unit bldFile="mw/uitools/svgtencoder/svgtenc/standalone/group"/>
-</component>
-</collection>
-</block>
-</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">
-<component name="location_centre_api" long-name="Location Centre API" introduced="^3" filter="s60" class="api">
-<unit bldFile="app/location/loc_plat/location_centre_api/group"/>
-</component>
-</collection>
-<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"/>
-</component>
-<component name="landmarks_ui_addedit_api" long-name="Landmarks UI Add/Edit API" filter="s60" class="api">
-<unit bldFile="app/location/loc_pub/landmarks_ui_addedit_api/group"/>
-</component>
-</collection>
-<collection name="basiclocationinfodisplay" long-name="Basic Location Info Display" level="ui">
-<component name="blid" filter="s60" long-name="Basic Location Info Display Build">
-<unit bldFile="app/location/basiclocationinfodisplay/blid/group"/>
-</component>
-</collection>
-<collection name="landmarksui" long-name="Landmarks UI" level="loc">
-<component name="landmarksui_help" filter="s60" long-name="Landmarks UI Help">
-<unit bldFile="app/location/landmarksui/help/group"/>
-</component>
-<component name="landmarksui_engine" filter="s60" long-name="Landmarks UI Engine">
-<unit bldFile="app/location/landmarksui/engine/group"/>
-</component>
-<component name="uicontrols" filter="s60" long-name="Landmarks UI Controls">
-<unit bldFile="app/location/landmarksui/uicontrols/group"/>
-</component>
-<component name="landmarksui_commonui" filter="s60" long-name="Landmarks Common UI">
-<unit bldFile="app/location/landmarksui/commonui/group"/>
-</component>
-<component name="landmarksui_app" filter="s60" long-name="Landmarks Application">
-<unit bldFile="app/location/landmarksui/app/group"/>
-</component>
-<component name="msgviewer" filter="s60" long-name="Landmarks Message Viewer">
-<unit bldFile="app/location/landmarksui/msgviewer/group"/>
-</component>
-<component name="landmarksui_build" filter="s60" long-name="Landmarks UI Build">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="app/location/landmarksui/group"/>
-</component>
-</collection>
-<collection name="eventsui" long-name="Location Events UI" level="events">
-<component name="eventsui_help" filter="s60" long-name="Events Help">
-<unit bldFile="app/location/eventsui/help/group"/>
-</component>
-<component name="eventsutils" filter="s60" long-name="Events Utils">
-<unit bldFile="app/location/eventsui/eventsutils/group"/>
-</component>
-<component name="eventsengine" filter="s60" long-name="Events Engine">
-<unit bldFile="app/location/eventsui/eventsengine/group"/>
-</component>
-<component name="eventshandlerui" filter="s60" long-name="Events Handler UI">
-<unit bldFile="app/location/eventsui/eventshandlerui/group"/>
-</component>
-<component name="eventseditor" filter="s60" long-name="Events Editor">
-<unit bldFile="app/location/eventsui/eventseditor/group"/>
-</component>
-<component name="eventsmgmtui" filter="s60" long-name="Events Management UI">
-<unit bldFile="app/location/eventsui/eventsmgmtui/group"/>
-</component>
-<component name="eventsui_build" filter="s60" long-name="Events UI Build">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="app/location/eventsui/group"/>
-</component>
-</collection>
-<collection name="locationlandmarksrefappfors60" long-name="Location Landmarks Reference App for S60" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="lmrefapp" filter="s60" long-name="Landmarks Reference Application">
-<unit bldFile="app/location/locationlandmarksrefappfors60/group"/>
-</component>
-</collection>
-<collection name="locationlandmarksuirefapp" long-name="Location Landmarks UI Reference App" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="lmuirefapp" filter="s60" long-name="Landmarks UI Reference Application">
-<unit bldFile="app/location/locationlandmarksuirefapp/group"/>
-</component>
-</collection>
-<collection name="locationsatviewrefapp" long-name="Location Satellite View Reference App" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="satellitereference" filter="s60" long-name="Satellite Info UI Reference Application">
-<unit bldFile="app/location/locationsatviewrefapp/group"/>
-</component>
-</collection>
-<collection name="simpsyconfigurator" long-name="Simulation PSY Configurator" level="ui">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="simpsyui" filter="s60" long-name="Simulation PSY UI">
-<unit bldFile="app/location/simpsyconfigurator/group"/>
-</component>
-</collection>
-<collection name="mapnavproviderrefapp" long-name="Map and Navigation Provider Reference App" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="mapnavproviderrefapp_build" filter="s60" long-name="Map and Navigation Provider Reference Application">
-<unit bldFile="app/location/mapnavproviderrefapp/group"/>
-</component>
-</collection>
-<collection name="locationcentre" long-name="Location Centre" level="loc">
-<component name="lcutils" long-name="Location Centre Utilities" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcutils/group"/>
-</component>
-<component name="lcservice" long-name="Location Centre Service Project" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcservice/group"/>
-</component>
-<component name="lcserver" long-name="Location Centre Server Project" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcserver/group"/>
-</component>
-<component name="lcapp" long-name="Location Centre Application" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcapp/group"/>
-</component>
-<component name="locationcentre_build" filter="s60" long-name="Location Centre Build" introduced="^3">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="app/location/locationcentre/group"/>
-</component>
-</collection>
-</block>
-<block name="mmsharinguis" level="services" long-name="Multimedia Sharing UIs" levels="base plugin if">
-<collection name="mmsharinguis_plat" long-name="Multimedia Sharing UIs Platform Interfaces" level="if">
-<component name="multimedia_sharing_settings_api" long-name="Multimedia Sharing Settings API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_settings_api/group"/>
-</component>
-<component name="multimedia_sharing_resource_api" long-name="Multimedia Sharing Resource API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_resource_api/group"/>
-</component>
-<component name="multimedia_sharing_manager_api" long-name="Multimedia Sharing Manager API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/group"/>
-</component>
-</collection>
-<collection name="mmsharing" long-name="Multimedia Sharing" level="base">
-<component name="mmshavailability" filter="s60" long-name="Multimedia Sharing Availability">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshavailability/group"/>
-</component>
-<component name="mmshindicator" filter="s60" long-name="Multimedia Sharing Indicator">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshindicator/group"/>
-</component>
-<!-- consider putting client and server in the same component -->
-<component name="mmshmanagercli" filter="s60" long-name="Multimedia Sharing Manager Client">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshmanagercli/group" filter="!test"/>
-</component>
-<component name="mmshmanagersrv" filter="s60" long-name="Multimedia Sharing Manager Server">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshmanagersrv/group"/>
-</component>
-<component name="mmshengine" filter="s60" long-name="Multimedia Sharing Engine">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshengine/group"/>
-</component>
-<component name="mmshui" filter="s60" long-name="Multimedia Sharing UI">
-<!-- can only have one unit: need to #include one from the other if it's needed -->
-<unit bldFile="app/mmsharinguis/mmsharing/mmshui/group"/>
-<unit bldFile="app/mmsharinguis/mmsharing/mmshui/help/group"/>
-</component>
-<component name="mmsharing_build" filter="s60" long-name="MM Sharing Build">
-<unit bldFile="app/mmsharinguis/mmsharing/group"/>
-</component>
-</collection>
-<collection name="mmshplugins" long-name="Multimedia Sharing Plugins" level="plugin">
-<component name="mmshaoplugin" filter="s60" long-name="Multimedia Sharing Always Online Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshaoplugin/group"/>
-</component>
-<component name="mmshaiwplugin" filter="s60" long-name="Multimedia Sharing AIW Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshaiwplugin/group"/>
-</component>
-<component name="mmshsipcrplugin" filter="s60" long-name="Multimedia Sharing SIP Client Resolver Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshsipcrplugin/group"/>
-</component>
-<component name="mmshsettingsuiplugin" filter="s60" long-name="Multimedia Sharing Settings UI Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshsettingsuiplugin/group"/>
-</component>
-<component name="mmshwpadapterplugin" filter="s60" long-name="Multimedia Sharing WAP Provisioning Adapter" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshwpadapterplugin/group"/>
-</component>
-</collection>
-<collection name="mmsharinguis_info" long-name="Multimedia Sharing UIs Info" level="if">
-<component name="mmsharinguis_build" filter="s60" long-name="Multimedia Sharing UIs Build">
-<!-- consider distributing to other components -->
-<unit bldFile="app/mmsharinguis/group"/>
-</component>
-</collection>
-</block>
-<block name="phone" level="apps" span="2" long-name="Phone Apps" levels="engine plugin ui app">
-<collection name="phone_plat" long-name="Phone Apps Platform Interfaces" level="app">
-<component name="3d_ringing_tone_enabler_api" long-name="3D Ringing Tone Enabler API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
-</component>
-<component name="telephony_comms_information_api" long-name="Telephony Comms Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_comms_information_api/group"/>
-</component>
-<component name="telephony_information_api" long-name="Telephony Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_information_api/group"/>
-</component>
-<component name="telephony_device_mode_api" long-name="Telephony Device Mode API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_device_mode_api/group"/>
-</component>
-<component name="telephony_remote_party_information_api" long-name="Telephony Remote Party Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_remote_party_information_api/group"/>
-</component>
-<component name="telephony_video_mailbox_settings_api" long-name="Telephony Video Mailbox Settings API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_video_mailbox_settings_api/group"/>
-</component>
-<component name="telephony_configuration_api" long-name="Telephony Configuration API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_configuration_api/group"/>
-</component>
-<component name="telephony_microphone_mute_status_api" long-name="Telephony Microphone Mute Status API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_microphone_mute_status_api/group"/>
-</component>
-<component name="dialer_keypad_api" long-name="Dialer Keypad API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/dialer_keypad_api/group"/>
-</component>
-<component name="telephony_logging_extension_api" long-name="Telephony Logging Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_logging_extension_api/group"/>
-</component>
-<component name="telephony_matching_extension_api" long-name="Telephony Matching Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_matching_extension_api/group"/>
-</component>
-<component name="telephony_bubble_extension_api" long-name="Telephony Bubble Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_bubble_extension_api/group"/>
-</component>
-<component name="telephony_menu_extension_api" long-name="Telephony Menu Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_menu_extension_api/group"/>
-</component>
-<component name="phone_application_commands_api" long-name="Phone Application Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_commands_api/group"/>
-</component>
-<component name="phone_application_voip_commands_api" long-name="Phone Application VOIP Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_voip_commands_api/group"/>
-</component>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_mediator_api/group"/>
-</component>
-<component name="video_telephony_mediator_api" long-name="Video Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/video_telephony_mediator_api/group"/>
-</component>
-</collection>
-<collection name="phoneapp" long-name="Phone Application" level="app">
-<component name="blacklist" filter="s60" long-name="Phone Blacklist Clearing" plugin="Y">
-<unit bldFile="app/phone/phoneapp/blacklist/group"/>
-</component>
-<component name="phoneui" filter="s60" long-name="Phone UI">
-<unit bldFile="app/phone/phoneapp/phoneui/group" filter="!test"/>
-</component>
-<component name="phoneuicontrol" filter="s60" long-name="Phone UI Control">
-<unit bldFile="app/phone/phoneapp/phoneuicontrol/group"/>
-</component>
-<component name="phoneuistates" filter="s60" long-name="Phone UI States">
-<unit bldFile="app/phone/phoneapp/phoneuistates/group"/>
-</component>
-<component name="phoneuiutils" filter="s60" long-name="Phone UI Utils">
-<unit bldFile="app/phone/phoneapp/phoneuiutils/group"/>
-</component>
-<component name="phoneuiview" filter="s60" long-name="Phone UI View">
-<unit bldFile="app/phone/phoneapp/phoneuiview/group"/>
-</component>
-<component name="phoneuivoipextension" filter="s60" long-name="Phone UI VOIP Extension">
-<unit bldFile="app/phone/phoneapp/phoneuivoipextension/group"/>
-</component>
-<component name="silenceactionplugin" filter="s60" long-name="Silence Action Plugin" plugin="Y">
-<unit bldFile="app/phone/phoneapp/silenceactionplugin/group"/>
-</component>
-<component name="phonemediatorcenter" filter="s60" long-name="Phone Mediator Center">
-<unit bldFile="app/phone/phoneapp/phonemediatorcenter/group"/>
-</component>
-</collection>
-<collection name="phoneengine" long-name="Phone Engine" level="engine">
-<component name="phonecntfinder" filter="s60" long-name="Phone Contact Finder">
-<unit bldFile="app/phone/phoneengine/phonecntfinder/group"/>
-</component>
-<component name="audiohandling" filter="s60" long-name="Phone Audio Handling">
-<unit bldFile="app/phone/phoneengine/audiohandling/group"/>
-</component>
-<component name="callhandling" filter="s60" long-name="Call Handling">
-<unit bldFile="app/phone/phoneengine/callhandling/group"/>
-</component>
-<component name="contacthandling" filter="s60" long-name="Phone Contact Handling">
-<unit bldFile="app/phone/phoneengine/contacthandling/group"/>
-</component>
-<component name="loghandling" filter="s60" long-name="Phone Log Handling">
-<unit bldFile="app/phone/phoneengine/loghandling/group"/>
-</component>
-<component name="engineinfo" filter="s60" long-name="Phone Engine Info">
-<unit bldFile="app/phone/phoneengine/engineinfo/group"/>
-</component>
-<component name="phonemodel" filter="s60" long-name="Phone Model">
-<unit bldFile="app/phone/phoneengine/phonemodel/group"/>
-</component>
-<component name="servicehandling" filter="s60" long-name="Phone Service Handling">
-<unit bldFile="app/phone/phoneengine/servicehandling/group"/>
-</component>
-</collection>
-<collection name="phonesettings" long-name="Phone Settings" level="plugin">
-<component name="aiwcallimageplugin" filter="s60" long-name="Call Image AIW Plugin" plugin="Y">
-<unit bldFile="app/phone/phonesettings/aiwcallimageplugin/group"/>
-</component>
-<component name="pslncallimageplugin" filter="s60" long-name="Call Image Personalization Plugin" plugin="Y">
-<unit bldFile="app/phone/phonesettings/pslncallimageplugin/group"/>
-</component>
-</collection>
-<collection name="phoneuis" long-name="Phone UIs" level="ui">
-<component name="dialer" filter="s60" long-name="Dialer">
-<unit bldFile="app/phone/phoneuis/dialer/group" filter="!test"/>
-</component>
-<component name="easydialing" filter="s60" long-name="Easy Dialing Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/phone/phoneuis/easydialing/group"/>
-</component>
-<component name="bubblemanager" filter="s60" long-name="Phone Bubble Manager">
-<unit bldFile="app/phone/phoneuis/bubblemanager/group"/>
-</component>
-<component name="connectutil" filter="s60" long-name="Connection Utility" plugin="Y">
-<unit bldFile="app/phone/phoneuis/connectutil/group"/>
-</component>
-<component name="ussd" filter="s60" long-name="Unstructured Supplementary Services Data">
-<unit bldFile="app/phone/phoneuis/ussd/group"/>
-</component>
-<component name="vmbx" filter="s60" long-name="Voice Mailbox">
-<unit bldFile="app/phone/phoneuis/vmbx/group"/>
-</component>
-<component name="telephonydevicemode" filter="s60" long-name="Telephony Device Mode">
-<unit bldFile="app/phone/phoneuis/telephonydevicemode/group"/>
-</component>
-</collection>
-<collection name="phoneplugins" long-name="Phone Plugins" level="plugin">
-<component name="telbranding" filter="s60" long-name="Tel Branding" introduced="^2" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/telbranding/group"/>
-</component>
-</collection>
-</block>
-<block name="videotelephony" level="apps" long-name="Video Telephony Apps" levels="engine plugin prot ui">
-<collection name="videotelephony_plat" long-name="VT Apps Platform Interfaces" level="ui">
-<component name="video_telephony_control_mediator_api" long-name="Video Telephony Control Mediator API" filter="s60" class="api">
-<unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_control_mediator_api/group"/>
-</component>
-<component name="video_telephony_media_configuration_api" long-name="Video Telephony Media Configuration API" filter="s60" class="api">
-<unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_media_configuration_api/group"/>
-</component>
-</collection>
-<collection name="vtengines" long-name="Video Telephony Engines" level="engine">
-<component name="videoteleng" filter="s60" long-name="Video Telephony Engine">
-<unit bldFile="app/videotelephony/vtengines/videoteleng/Group"/>
-</component>
-<component name="vtmediatorplugin" filter="s60" long-name="VT Mediator Plugin" plugin="Y">
-<unit bldFile="app/videotelephony/vtengines/vtmediatorplugin/group"/>
-</component>
-</collection>
-<collection name="vtuis" long-name="Video Telephony UIs" level="ui">
-<component name="videotelui" filter="s60" long-name="Video Telephony UI">
-<unit bldFile="app/videotelephony/vtuis/videotelui/group"/>
-</component>
-</collection>
-<collection name="vtprotocolplugins" long-name="VT Protocol Plugins" level="plugin">
-<component name="displaysink" filter="s60" long-name="Display Sink" introduced="^2">
-<unit bldFile="app/videotelephony/vtprotocolplugins/DisplaySink/group"/>
-</component>
-<component name="videosource" filter="s60" long-name="Video Source" introduced="^2">
-<unit bldFile="app/videotelephony/vtprotocolplugins/VideoSource/group"/>
-</component>
-</collection>
-<collection name="vtprotocolsstub" long-name="VT Protocols Stub" level="prot">
-<!-- this collection is really a component, move down a directory -->
-<component name="videotelproto" filter="s60" long-name="Video Telephony Protocol">
-<unit bldFile="app/videotelephony/vtprotocolsstub/group" filter="sf_build"/>
-</component>
-</collection>
-</block>
-<block name="iptelephony" level="apps" long-name="IP Telephony" levels="eng plugin util ui">
-<collection name="iptel_plat" long-name="IP Telephony Platform Interfaces" level="ui">
-<component name="richcallsettingsengine_api" long-name="Rich Call Settings Engine API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/richcallsettingsengine_api/group"/>
-</component>
-<component name="cch_client_api" long-name="CCH Client API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/cch_client_api/group"/>
-</component>
-<component name="cch_server_api" long-name="CCH Server API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/cch_server_api/group"/>
-</component>
-<component name="csc_settingsui_api" long-name="CSC Settings UI API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/csc_settingsui_api/group"/>
-</component>
-<component name="vccpropertyhandler_api" long-name="VCC Property Handler API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/vccpropertyhandler_api/group"/>
-</component>
-<component name="vcc_api" long-name="VCC API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/vcc_api/group"/>
-</component>
-</collection>
-<collection name="iptelcommsconfig" long-name="IP Telephony Comms Config" level="ui">
-<component name="cscgsplugin" filter="s60" long-name="CSC GS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/commsconfig/cscgsplugin/group"/>
-</component>
-<component name="cscsipvoipcleanupplugin" filter="s60" long-name="CSC SIP VoIP Cleanup Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/commsconfig/cscsipvoipcleanupplugin/group"/>
-</component>
-<component name="cscengine" filter="s60" long-name="Connection Service Configurator Engine" introduced="^2">
-<unit bldFile="app/iptelephony/commsconfig/cscengine/group"/>
-</component>
-<component name="cscsettingsui" filter="s60" long-name="CSC Settings UI" introduced="^2">
-<unit bldFile="app/iptelephony/commsconfig/cscsettingsui/group"/>
-</component>
-<component name="cscapplicationui" filter="s60" long-name="CSC Application UI" introduced="^2">
-<unit bldFile="app/iptelephony/commsconfig/cscapplicationui/group"/>
-</component>
-<component name="commsconfig_build" filter="s60" long-name="Comms Config Build" introduced="^2">
-<!-- consider distributing this into the above components -->
-<unit bldFile="app/iptelephony/commsconfig/group"/>
-</component>
-</collection>
-<collection name="convergedconnectionhandler" long-name="Converged Connection Handler" level="eng">
-<component name="cchserver" filter="s60" long-name="CCH Server" introduced="^2">
-<unit bldFile="app/iptelephony/convergedconnectionhandler/cchserver/group"/>
-</component>
-<component name="cchclient" filter="s60" long-name="CCH Client" introduced="^2">
-<unit bldFile="app/iptelephony/convergedconnectionhandler/cchclient/group"/>
-</component>
-<component name="cchclientapi" filter="s60" long-name="CCH Client API" introduced="^2">
-<unit bldFile="app/iptelephony/convergedconnectionhandler/cchclientapi/group"/>
-</component>
-<component name="convergedconnectionhandler_build" filter="s60" long-name="CCH Build" introduced="^2">
-<!-- consider distributing this into the above components, or collapse the collection into a single component.
- The latter is a better option since clients and sevrers are rarely separate components -->
-<unit bldFile="app/iptelephony/convergedconnectionhandler/group"/>
-</component>
-</collection>
-<collection name="richcallsettingsengine" long-name="Rich Call Settings Engine" level="eng">
-<component name="rcse2" filter="s60" long-name="Rich Call Settings Engine Build" introduced="^2">
-<unit bldFile="app/iptelephony/richcallsettingsengine/rcse2/group"/>
-</component>
-</collection>
-<collection name="sipvoipprovider" long-name="SIP VoIP Provider" level="plugin">
-<!-- collection is really a component. Should move down a directory -->
-<component name="svp" filter="s60" long-name="SIP VoIP Provider Build" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/sipvoipprovider/group"/>
-</component>
-</collection>
-<collection name="voipplugins" long-name="VoIP Plugins" level="plugin">
-<component name="sipmxresolver" filter="s60" long-name="SIP MX Resolver" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/sipmxresolver/group"/>
-</component>
-<component name="sipconnectionprovider" filter="s60" long-name="SIP Connection Provider" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/sipconnectionprovider/group"/>
-<!-- can only have one unit, can the next be #'included from the above? -->
-<unit bldFile="app/iptelephony/voipplugins/sipconnectionprovider/ipvoicemailengine/group"/>
-</component>
-<component name="ipapputils" filter="s60" long-name="IP App Utils" introduced="^2">
-<unit bldFile="app/iptelephony/voipplugins/ipapputils/group"/>
-</component>
-<component name="voipadapters" filter="s60" long-name="VoIP Adapters" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/voipadapters/group"/>
-</component>
-<component name="accountcreationplugin" filter="s60" long-name="Account Creation Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/accountcreationplugin/group"/>
-</component>
-<component name="dhcppositionprovider" filter="s60" long-name="DHCP Position Provider" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/dhcppositionprovider/group"/>
-</component>
-<component name="svtmatching" filter="s60" long-name="SIP VoIP Telephony Matching" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/svtmatching/group"/>
-</component>
-<component name="svtlogging" filter="s60" long-name="SVT Logging" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/svtlogging/group"/>
-</component>
-<component name="svtcallmenu" filter="s60" long-name="SVT Call Menu" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/svtcallmenu/group"/>
-</component>
-<component name="sipimresolver" filter="s60" long-name="SIP IM Resolver" introduced="^3" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/sipimresolver/group"/>
-</component>
-</collection>
-<collection name="callcontinuity" long-name="Call Continuity" level="util">
-<component name="vccutils" filter="s60" long-name="VCC Utils" introduced="^2">
-<unit bldFile="app/iptelephony/callcontinuity/vccutils/group"/>
-</component>
-<component name="nsmldmvccadapter" filter="s60" long-name="SyncML DM VCC Adapter" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/callcontinuity/nsmldmvccadapter/group"/>
-</component>
-<component name="vccclientprovisioningadapter" filter="s60" long-name="VCC Client Provisioning Adapter" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/callcontinuity/vccclientprovisioningadapter/group"/>
-</component>
-<component name="vccpropertyhandler" filter="s60" long-name="VCC Property Handler" introduced="^2">
-<unit bldFile="app/iptelephony/callcontinuity/vccpropertyhandler/group"/>
-</component>
-<component name="vcchotrigger" filter="s60" long-name="VCC HO Trigger" introduced="^2">
-<unit bldFile="app/iptelephony/callcontinuity/vcchotrigger/group"/>
-</component>
-<component name="vcc" filter="s60" long-name="VoIP Call Continuity" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/callcontinuity/vcc/group"/>
-</component>
-<component name="callcontinuity_build" filter="s60" long-name="Call Continuity Build" introduced="^2">
-<!-- consider distributing this into the above components -->
-<unit bldFile="app/iptelephony/callcontinuity/group"/>
-</component>
-</collection>
-</block>
-<block name="settingsuis" level="services" long-name="Settings UIs" levels="rsc ui">
-<collection name="devmngt_plat" long-name="Settings UIs Platform Interfaces" level="ui">
-<component name="default_app_client_api" long-name="Default App Client API" introduced="^1" filter="s60" class="api">
-<unit bldFile="app/settingsuis/devmngt_plat/default_app_client_api/group"/>
-</component>
-<component name="services_db_api" long-name="Services DB API" introduced="^1" filter="s60" class="api">
-<unit bldFile="app/settingsuis/devmngt_plat/services_db_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="defaultapplicationsettings" long-name="Default Application Settings" level="rsc">
-<component name="services_db" filter="s60" long-name="Services Database" introduced="^1">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/services_db/group"/>
-</component>
-<component name="defaultapplicationsettings_server" filter="s60" long-name="Default Application Server" introduced="^1">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/server/group"/>
-</component>
-<component name="service" filter="s60" long-name="Default Application Service" introduced="^1">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/service/group"/>
-</component>
-<component name="dasgsplugin" filter="s60" long-name="Default Application Settings GS Plugin" introduced="^1" plugin="Y">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/gsplugin/group"/>
-</component>
-<component name="defaultapplicationsettings_build" filter="s60" long-name="Default Application Settings Build" introduced="^1">
-<!-- split the IBYs up into the appropriate components? Make this a ROM component? -->
-<unit bldFile="app/settingsuis/defaultapplicationsettings/group"/>
-</component>
-</collection>
-<collection name="systemswuis" long-name="System SW UIs" level="ui">
-<component name="touchscreencalib" filter="s60" long-name="Touchscreen Calibration" introduced="^1">
-<unit bldFile="app/settingsuis/systemswuis/touchscreencalib/group"/>
-</component>
-</collection>
-</block>
-<block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin app">
-<collection name="contentctrl_plat" long-name="Content Control Daemons Platforn Interfaces" level="app">
-<component name="oma_ds_presync_plugin_api" long-name="OMA DS PreSync Plugin API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/oma_ds_presync_plugin_api/group"/>
-</component>
-<component name="ds_agenda_handler_plugin_api" long-name="DS Agenda Handler Plugin API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_agenda_handler_plugin_api/group"/>
-</component>
-<component name="ds_folder_util_api" long-name="DS Folder Util API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_folder_util_api/group"/>
-</component>
-</collection>
-<collection name="dsdcmoadapter" long-name="Data Sync DCMO Adapter" level="plugin">
-<!-- Component at wrong rank, should move down a directory -->
-<component name="dsdcmoadapter_build" filter="s60" long-name="Data Sync Control DCMO Adapter">
-<unit bldFile="app/contentcontrol/dsdcmoadapter/group"/>
-</component>
-</collection>
-<collection name="omads" long-name="OMA Data Sync" level="app">
-<component name="omadsappui" filter="s60" long-name="OMA DS Application UI">
-<unit bldFile="app/contentcontrol/omads/omadsappui/group"/>
-</component>
-<component name="omadsextensions" filter="s60" long-name="OMA DS Extensions" plugin="Y">
-<unit bldFile="app/contentcontrol/omads/omadsextensions/group"/>
-</component>
-</collection>
-</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">
-<unit bldFile="app/devicecontrol/devicediagnostics/devdiagapp/group"/>
-</component>
-<component name="devdiaggsplugin" filter="s60" long-name="Device Diagnostics GS Plugin" plugin="Y">
-<unit bldFile="app/devicecontrol/devicediagnostics/devdiaggsplugin/group"/>
-</component>
-<component name="diagplugins" filter="s60" long-name="Diagnostics Plugins" plugin="Y">
-<unit bldFile="app/devicecontrol/devicediagnostics/diagplugins/group"/>
-</component>
-<component name="diagsuites" filter="s60" long-name="Diagnostics Suites" plugin="Y">
-<unit bldFile="app/devicecontrol/devicediagnostics/diagsuites/group"/>
-</component>
-<component name="devicediagnostics_build" filter="s60" long-name="Device Diagnostics Build">
-<!-- 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">
-<unit bldFile="app/devicecontrol/omadm/omadmappui/group"/>
-</component>
-<component name="omadmextensions" filter="s60" long-name="OMA DM Extensions" 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">
-<unit bldFile="app/devicecontrol/omadm/dcmo/group"/>
-</component>
-</collection>
-<collection name="pnpmobileservices" long-name="PnP Mobile Services" level="mid">
-<component name="pnpms" filter="s60" long-name="PnP MS">
-<unit bldFile="app/devicecontrol/pnpmobileservices/pnpms/group"/>
-</component>
-</collection>
-<collection name="applicationmanagement" long-name="Application Management" level="app">
-<!-- could this collection be collapsed into a single component and moved down a dir? Do all these need to be noted separately? -->
-<component name="applicationmanagement_options" filter="s60" long-name="AM Install Options">
-<unit bldFile="app/devicecontrol/applicationmanagement/options/group"/>
-</component>
-<component name="applicationmanagement_client" filter="s60" long-name="AM Client">
-<unit bldFile="app/devicecontrol/applicationmanagement/client/group"/>
-</component>
-<component name="applicationmanagement_server" filter="s60" long-name="AM Server">
-<unit bldFile="app/devicecontrol/applicationmanagement/server/group"/>
-</component>
-<component name="rfsplugin" filter="s60" long-name="AM RFS Plugin" plugin="Y">
-<unit bldFile="app/devicecontrol/applicationmanagement/rfsplugin/group"/>
-</component>
-<component name="amadapter2" filter="s60" long-name="AM Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/applicationmanagement/amadapter2/group"/>
-</component>
-<component name="omascomoadapter" filter="s60" long-name="OMA SCOMO Adapter" introduced="^3" plugin="Y">
-<unit bldFile="app/devicecontrol/applicationmanagement/omascomoadapter/group"/>
-</component>
-<component name="applicationmanagement_build" filter="s60" long-name="AM Build">
-<!-- If thes aren't collapsed into one cmp, can all #includes removed from here, and it renamed AM ROM? -->
-<unit bldFile="app/devicecontrol/applicationmanagement/group"/>
-</component>
-</collection>
-<collection name="customization" long-name="DM Customization Adapters" level="mid">
-<component name="dmutils" long-name="DM Utils" filter="s60">
-<unit bldFile="app/devicecontrol/customization/dmutils/bld"/>
-</component>
-<component name="uisettingssrv" filter="s60" long-name="UI Settings Server">
-<unit bldFile="app/devicecontrol/customization/uisettingssrv/bld"/>
-</component>
-<component name="isadapter" filter="s60" long-name="Idle State Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/isadapter/bld"/>
-</component>
-<component name="supadapter" filter="s60" long-name="Startup Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/supadapter/bld"/>
-</component>
-<component name="wallpaperadapter" filter="s60" long-name="Wallpaper Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/wallpaperadapter/bld"/>
-</component>
-<component name="operatorlogoadapter" filter="s60" long-name="Operator Logo Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/operatorlogoadapter/bld"/>
-</component>
-<component name="screensaveradapter" filter="s60" long-name="Screen Saver Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/screensaveradapter/bld"/>
-</component>
-<component name="themesadapter" filter="s60" long-name="Themes Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/themesadapter/bld"/>
-</component>
-<component name="embeddedlinkadapter" filter="s60" long-name="Embedded Link Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/embeddedlinkadapter/bld"/>
-</component>
-<component name="customization_build" filter="s60" long-name="DM Customization Build">
-<!-- If thes aren't collapsed into one cmp, can all #includes removed from here, and it renamed DM Customization ROM? -->
-<unit bldFile="app/devicecontrol/customization/group"/>
-</component>
-</collection>
-<collection name="omacp" long-name="OMA Content Provisioning" level="oma">
-<component name="omacpadapters" filter="s60" long-name="OMA CP Adapters" plugin="Y">
-<unit bldFile="app/devicecontrol/omacp/omacpadapters/group"/>
-</component>
-</collection>
-</block>
-<block name="printing" level="services" long-name="Printing" levels="app">
-<collection name="imageprint" long-name="ImagePrint" level="app">
-<component name="clog" filter="s60" long-name="ImagePrint Logging" introduced="^2">
-<unit bldFile="app/printing/imageprint/clog/group"/>
-</component>
-<component name="imageprintengine" filter="s60" long-name="ImagePrint Engine" introduced="^2">
-<unit bldFile="app/printing/imageprint/imageprintengine/group"/>
-</component>
-<component name="imageprintui" filter="s60" long-name="ImagePrint UI" introduced="^2">
-<unit bldFile="app/printing/imageprint/imageprintui/group"/>
-</component>
-<component name="imageprint_build" filter="s60" long-name="ImagePrint Build" introduced="^2">
-<!-- Need to break the IBY includes into the other components, or remove #includes and make this a ROM component -->
-<unit bldFile="app/printing/imageprint/group"/>
-</component>
-</collection>
-</block>
-<block name="files" level="apps" long-name="File Manager Apps" levels="support apps">
-<collection name="files_plat" long-name="File Manager Apps Platform Interfaces" level="apps">
-<component name="memory_scan_popup_ui_api" long-name="Memory Scan Popup UI API" filter="s60" class="api">
-<unit bldFile="app/files/files_plat/memory_scan_popup_ui_api/group"/>
-</component>
-</collection>
-<collection name="deviceencryption" long-name="Device Encryption" level="support">
-<!-- this is either needs to be broken up into idependent bld.infs, or it's really a component and should move down a directory -->
-<component name="devencnotifplugin" filter="s60" long-name="Device Encryption Notifier Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/files/deviceencryption/devencnotifplugin/group"/>
-</component>
-<component name="devencui" filter="s60" long-name="Device Encryption UI" introduced="^3">
-<unit bldFile="app/files/deviceencryption/devencui/group"/>
-</component>
-<component name="devencdmadapter" filter="s60" long-name="Device Encryption DM Adapter" introduced="^3" plugin="Y">
-<unit bldFile="app/files/deviceencryption/devencdmadapter/group"/>
-</component>
-<component name="devencgsplugin" filter="s60" long-name="Device Encryption GS Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/files/deviceencryption/devencgsplugin/group"/>
-</component>
-<component name="deviceencryption_help" filter="s60" long-name="Device Encryption Help" introduced="^3">
-<unit bldFile="app/files/deviceencryption/help/group"/>
-</component>
-<component name="deviceencryption_build" filter="s60" long-name="Device Encryption Build" introduced="^3">
-<unit bldFile="app/files/deviceencryption/group"/>
-</component>
-</collection>
-<collection name="filemanager" long-name="File Manager" level="apps">
-<!-- this is really a component, should move down a directory -->
-<component name="filemanager_build" filter="s60" long-name="File Manager Build">
-<unit bldFile="app/files/filemanager/group"/>
-</component>
-</collection>
-<collection name="filesystemuis" long-name="File System UIs" level="support">
-<component name="memscaneng" filter="s60" long-name="Memory Scan Server">
-<unit bldFile="app/files/filesystemuis/memscaneng/group"/>
-</component>
-<component name="memstatepopup" filter="s60" long-name="Memory State Popup">
-<unit bldFile="app/files/filesystemuis/memstatepopup/group"/>
-</component>
-</collection>
-</block>
-<block name="utils" level="apps" long-name="Utility Apps" levels="app">
-<collection name="extras" long-name="Extras" level="app">
-<component name="about" filter="s60" long-name="About Application">
-<unit bldFile="app/utils/extras/about/group"/>
-</component>
-<component name="calcsoft" filter="s60" long-name="Calculator Application">
-<unit bldFile="app/utils/extras/calcsoft/group"/>
-</component>
-<component name="converter" filter="s60" long-name="Unit Converter">
-<unit bldFile="app/utils/extras/converter/group"/>
-</component>
-</collection>
-</block>
-<block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
-<collection name="contacts_pub" long-name="Contacts Apps Public Interfaces" level="ui">
-<component name="phonebook_fetch_ui_api" long-name="Phonebook Fetch UI API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_fetch_ui_api/group"/>
-</component>
-<component name="phonebook_data_management_api" long-name="Phonebook Data Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_data_management_api/group"/>
-</component>
-<component name="phonebook_vcard_importexport_api" long-name="Phonebook vCard Import/Export API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_vcard_importexport_api/group"/>
-</component>
-<component name="phonebook_data_addedit_ui_api" long-name="Phonebook Data Add/Edit UI API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_data_addedit_ui_api/group"/>
-</component>
-<component name="phonebook_ui_utilities_api" long-name="Phonebook UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_ui_utilities_api/group"/>
-</component>
-<component name="phonebook_thumbnail_operation_api" long-name="Phonebook Thumbnail Operation API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_thumbnail_operation_api/group"/>
-</component>
-<component name="speed_dial_utility_control_api" long-name="Speed Dial Utility Control API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/speed_dial_utility_control_api/group"/>
-</component>
-</collection>
-<collection name="contacts_plat" long-name="Contacts Apps Platform Interfaces" level="ui">
-<component name="virtual_phonebook_store_api" long-name="Virtual Phonebook Store API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_store_api/group"/>
-</component>
-<component name="virtual_phonebook_sim_services_api" long-name="Virtual Phonebook SIM Services API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_sim_services_api/group"/>
-</component>
-<component name="virtual_phonebook_configuration_api" long-name="Virtual Phonebook Configuration API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_configuration_api/group"/>
-</component>
-<component name="virtual_phonebook_copy_policy_api" long-name="Virtual Phonebook Copy Policy API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_copy_policy_api/group"/>
-</component>
-<component name="virtual_phonebook_policy_api" long-name="Virtual Phonebook Policy API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_policy_api/group"/>
-</component>
-<component name="virtual_phonebook_engine_api" long-name="Virtual Phonebook Engine API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_engine_api/group"/>
-</component>
-<component name="virtual_phonebook_migration_support_api" long-name="Virtual Phonebook Migration Support API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_migration_support_api/group"/>
-</component>
-<component name="virtual_phonebook_view_definition_api" long-name="Virtual Phonebook View Definition API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_view_definition_api/group"/>
-</component>
-<component name="virtual_phonebook_vcard_api" long-name="Virtual Phonebook vCard API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_vcard_api/group"/>
-</component>
-<component name="cms_contactor_api" long-name="CMS Contactor API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/cms_contactor_api/group"/>
-</component>
-<component name="contactpresence_api" long-name="Contact Presence API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/contactpresence_api/group"/>
-</component>
-<component name="presence_cache_api" long-name="Presence Cache API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/presence_cache_api/group"/>
-</component>
-<component name="phonebook_internal_common_api" long-name="Phonebook Internal Common API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_common_api/group"/>
-</component>
-<component name="phonebook_internal_appfw_api" long-name="Phonebook Internal App Framework API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_appfw_api/group"/>
-</component>
-<component name="phonebook_internal_data_management_api" long-name="Phonebook Internal Data Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_data_management_api/group"/>
-</component>
-<component name="phonebook_2_xsp_extension_manager_api" long-name="Phonebook 2 xSP Extension Manager API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_xsp_extension_manager_api/group"/>
-</component>
-<component name="phonebook_ui_controls_api" long-name="Phonebook UI Controls API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_ui_controls_api/group"/>
-</component>
-<component name="phonebook_2_image_management_api" long-name="Phonebook 2 Image Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_image_management_api/group"/>
-</component>
-<component name="phonebook_extension_api" long-name="Phonebook Extension API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_extension_api/group"/>
-</component>
-<component name="phonebook_public_constants_api" long-name="Phonebook Public Constants API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_public_constants_api/group"/>
-</component>
-<component name="phonebook_internal_ui_utilities_api" long-name="Phonebook Internal UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_ui_utilities_api/group"/>
-</component>
-<component name="logs_engine_api_extensions" long-name="Logs Engine API Extensions" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/logs_engine_api_extensions/group"/>
-</component>
-<component name="phonebook_thumbnails_api" long-name="Phonebook Thumbnails API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_thumbnails_api/group"/>
-</component>
-<component name="phonebook_2_icon_api" long-name="Phonebook 2 Icon API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_icon_api/group"/>
-</component>
-<component name="phonebook_engine_extension_api" long-name="Phonebook Engine Extension API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_engine_extension_api/group"/>
-</component>
-<component name="phonebook_2_store_configuration_management_api" long-name="Phonebook 2 Store Configuration Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_store_configuration_management_api/group"/>
-</component>
-<component name="logs_ui_command_line_api" long-name="Logs UI Command Line API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/logs_ui_command_line_api/group"/>
-</component>
-<component name="speed_dial_dialogs_api" long-name="Speed Dial Dialogs API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/speed_dial_dialogs_api/group"/>
-</component>
-<component name="phonebook_2_xsp_view_activation_api" long-name="Phonebook 2 xSP View Activation API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_xsp_view_activation_api/group"/>
-</component>
-<component name="logs_timers_api" long-name="Logs Timers API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/logs_timers_api/group"/>
-</component>
-<component name="phonebook_2_ui_extension_definition_api" long-name="Phonebook 2 UI Extension Definition API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_definition_api/group"/>
-</component>
-<component name="phonebook_2_common_ui_api" long-name="Phonebook 2 Common UI API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_common_ui_api/group"/>
-</component>
-<component name="phonebook_2_ui_extension_api" long-name="Phonebook 2 UI Extension API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_api/group"/>
-</component>
-<component name="phonebook_2_store_property_api" long-name="Phonebook 2 Store Property API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_store_property_api/group"/>
-</component>
-<component name="phonebook_2_ui_extension_plugin_api" long-name="Phonebook 2 UI Extension Plug-In API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_plugin_api/group"/>
-</component>
-<component name="phonebook_2_ui_controls_api" long-name="Phonebook 2 UI Controls API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_controls_api/group"/>
-</component>
-<component name="phonebook_2_thin_ui_extension_plugin_api" long-name="Phonebook 2 Thin UI Extension Plugin API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_thin_ui_extension_plugin_api/group"/>
-</component>
-<component name="phonebook_2_commands_api" long-name="Phonebook 2 Commands API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_commands_api/group"/>
-</component>
-<component name="phonebook_2_presentation_api" long-name="Phonebook 2 Presentation API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_presentation_api/group"/>
-</component>
-<component name="phonebook_2_ui_utilities_api" long-name="Phonebook 2 UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_utilities_api/group"/>
-</component>
-<component name="cca_launch_api" long-name="CCA Launch API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/cca_launch_api/group"/>
-</component>
-<component name="cca_view_plugin_api" long-name="CCA View Plugin API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/cca_view_plugin_api/group"/>
-</component>
-<component name="predictivesearch_client_api" long-name="Predictive Search Client API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_client_api/group"/>
-</component>
-<component name="predictivesearch_utils_api" long-name="Predictive Search Utils API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_utils_api/group"/>
-</component>
-<component name="predictivesearch_adapters_api" long-name="Predictive Search Adapters API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_adapters_api/group"/>
-</component>
-<component name="predictivesearch_algorithm_api" long-name="Predictive Search Algorithm API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_algorithm_api/group"/>
-</component>
-<component name="phonebook_2_rcl_api" long-name="Phonebook 2 RCL API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_rcl_api/group"/>
-</component>
-</collection>
-<collection name="contactextensions" long-name="Contacts Extensions" level="services">
-<component name="predefinedcontacts" filter="s60" long-name="Predefined Contacts">
-<unit bldFile="app/contacts/contactextensions/predefinedcontacts/group"/>
-</component>
-</collection>
-<collection name="logsui" long-name="Logs UI" level="ui">
-<component name="logsui_build" filter="s60" long-name="Logs UI Build">
-<!-- component at too high a rank, should move down one directory -->
-<unit bldFile="app/contacts/logsui/group"/>
-</component>
-</collection>
-<collection name="phonebookui" long-name="Phonebook UI" level="ui">
-<component name="phonebook" filter="s60" long-name="Phonebook">
-<unit bldFile="app/contacts/phonebookui/phonebook/group"/>
-</component>
-<component name="speeddial" filter="s60" long-name="Speed Dial">
-<unit bldFile="app/contacts/phonebookui/speeddial/group"/>
-</component>
-<component name="phonebook2" filter="s60" long-name="Phone Book 2">
-<unit bldFile="app/contacts/phonebookui/phonebook2/group"/>
-</component>
-</collection>
-<collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
-<component name="cntfindplugin" filter="s60" long-name="Contacts Find Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntfindplugin/group"/>
-</component>
-<component name="cntsortplugin" filter="s60" long-name="Contacts Sort Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntsortplugin/group"/>
-</component>
-<component name="virtualphonebook" filter="s60" long-name="Virtual Phonebook" introduced="^2">
-<unit bldFile="app/contacts/phonebookengines/virtualphonebook/group"/>
-</component>
-<component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
-<unit bldFile="app/contacts/phonebookengines/contactsmodel/groupsql" mrp="app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
-</component>
-</collection>
-<collection name="pimprotocols" long-name="PIM Protocols" level="services">
-<component name="phonebooksync" long-name="Phonebook Sync" purpose="optional" plugin="Y">
-<unit bldFile="app/contacts/pimprotocols/phonebooksync/group" mrp="app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
-</component>
-<component name="pbap" long-name="Bluetooth PBAP" introduced="9.2" purpose="optional">
-<unit bldFile="app/contacts/pimprotocols/pbap/group" mrp="app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
-</component>
-</collection>
-<collection name="ccservices" long-name="Contacts Centric Services" level="services">
-<component name="cmsservices" filter="s60" long-name="Contact Method Selector Services" introduced="^2">
-<unit bldFile="app/contacts/ccservices/cmsservices/group"/>
-</component>
-</collection>
-<collection name="presencecache" long-name="Presence Cache" level="support">
-<component name="presencecacheutils" filter="s60" long-name="Presence Cache Utils" introduced="^2" class="placeholder">
-<!-- <unit bldFile="presencecache/presencecacheutils/group"/> -->
-</component>
-<component name="presencecacheserver2" filter="s60" long-name="Presence Cache Server" introduced="^2" class="placeholder">
-<!-- <unit bldFile="presencecache/presencecacheserver2/group"/> -->
-</component>
-<component name="presencecacheclient2" filter="s60" long-name="Presence Cache Client" introduced="^2" class="placeholder">
-<!-- <unit bldFile="presencecache/presencecacheclient2/group"/> -->
-</component>
-<component name="presencecache_build" filter="s60" long-name="Presence Cache Build" introduced="^2">
-<!-- should divide this bld.inf into the other components, or collapse them into a single component -->
-<unit bldFile="app/contacts/presencecache/group"/>
-</component>
-</collection>
-<collection name="predictivesearch" long-name="Predictive Search" level="support">
-<component name="pcsutils" filter="s60" long-name="PCS Utils" introduced="^2">
-<unit bldFile="app/contacts/predictivesearch/pcsutils/group"/>
-</component>
-<component name="pcsserverclientapi" filter="s60" long-name="PCS Server Client API" introduced="^2">
-<unit bldFile="app/contacts/predictivesearch/pcsserverclientapi/group"/>
-</component>
-<component name="pcsserver" filter="s60" long-name="PCS Server" introduced="^2">
-<unit bldFile="app/contacts/predictivesearch/pcsserver/group"/>
-</component>
-<component name="pcsadapters" filter="s60" long-name="PCS Adapters" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/predictivesearch/adapters/contacts/group"/>
-</component>
-<component name="pcsalgorithm" filter="s60" long-name="PCS Algorithm" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/predictivesearch/pcsalgorithm/group"/>
-</component>
-<component name="predictivesearch_build" filter="s60" long-name="Predictive Search Build" introduced="^2">
-<!-- need to remove #includes from bld.inf and rename as Predictive Search ROM -->
-<unit bldFile="app/contacts/predictivesearch/group"/>
-</component>
-</collection>
-<collection name="contacts_info" long-name="Contacts Apps Info" level="ui">
-<component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="organizer" level="apps" span="2" long-name="Organizer Application Suite" levels="support services engine ui app">
-<collection name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" level="app">
-<component name="meeting_request_mailbox_utilities_api" long-name="Meeting Request Mailbox Utilities API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_mailbox_utilities_api/group"/>
-</component>
-<component name="meeting_request_uids_api" long-name="Meeting Request UIDs API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_uids_api/group"/>
-</component>
-<component name="calendar_exporter_api" long-name="Calendar Exporter API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_exporter_api/group"/>
-</component>
-<component name="agenda_versit_2_api" long-name="Agenda Versit 2 API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/agenda_versit_2_api/group"/>
-</component>
-<component name="calendar_importer_api" long-name="Calendar Importer API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_importer_api/group"/>
-</component>
-<component name="calendar_launcher_api" long-name="Calendar Launcher API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_launcher_api/group"/>
-</component>
-<component name="calendar_common_utils_api" long-name="Calendar Common Utils API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_common_utils_api/group"/>
-</component>
-<component name="searchfw_launcher_api" long-name="Search Framework Launcher API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/searchfw_launcher_api/group"/>
-</component>
-<component name="alarm_const_api" long-name="Alarm Const API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/alarm_const_api/group"/>
-</component>
-<component name="alarm_ui_external_control_api" long-name="Alarm UI External Control API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/alarm_ui_external_control_api/group"/>
-</component>
-<component name="calendar_settings_keys_api" long-name="Calendar Settings Keys API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_settings_keys_api/group"/>
-</component>
-<component name="calendar_tones_settings_keys_api" long-name="Calendar Tones Settings Keys API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_tones_settings_keys_api/group"/>
-</component>
-<component name="clock_settings_api" long-name="Clock Settings API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/clock_settings_api/group"/>
-</component>
-<component name="common_alarm_editor_api" long-name="Common Alarm Editor API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/common_alarm_editor_api/group"/>
-</component>
-<component name="alarm_ui_secondary_display_api" long-name="Alarm UI Secondary Display API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/alarm_ui_secondary_display_api/group"/>
-</component>
-<component name="searchui_launcher_api" long-name="Search UI Launcher API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/searchui_launcher_api/group"/>
-</component>
-<component name="agenda_entry_ui_api" long-name="Agenda Entry UI API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/agenda_entry_ui_api/group"/>
-</component>
-<component name="meeting_request_utillities_api" long-name="Meeting Request Utillities API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_utillities_api/group"/>
-</component>
-<component name="meeting_request_viewer_api" long-name="Meeting Request Viewer API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_viewer_api/group"/>
-</component>
-<component name="calendar_custamization_api" long-name="Calendar Customization API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_custamization_api/group"/>
-</component>
-</collection>
-<collection name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" level="app">
-<component name="calendar_interim_utils2_api" long-name="Calendar Interim Utils 2 API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_pub/calendar_interim_utils2_api/group"/>
-</component>
-<component name="notepad_library_api" long-name="Notepad Library API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_pub/notepad_library_api/group"/>
-</component>
-</collection>
-<collection name="alarmengines" long-name="Alarm Engines" level="engine">
-<component name="missedalarmstore" filter="s60" long-name="Missed Alarm Store">
-<unit bldFile="app/organizer/alarmengines/missedalarmstore/group"/>
-</component>
-</collection>
-<collection name="calendarengines" long-name="Calendar Engines" level="engine">
-<component name="versit2" filter="s60" long-name="Versit 2 iCal Parser" introduced="9.2">
-<unit bldFile="app/organizer/calendarengines/versit2/group"/>
-</component>
-<component name="agnversit2" filter="s60" long-name="Versit 2 Agenda Interface" introduced="9.2" plugin="Y">
-<unit bldFile="app/organizer/calendarengines/agnversit2/group"/>
-</component>
-<component name="caleninterimutils" filter="s60" long-name="Calendar Interim Utils" introduced="9.1">
-<unit bldFile="app/organizer/calendarengines/caleninterimutils/group"/>
-</component>
-<component name="calenimp" filter="s60" long-name="Calendar Import Wrapper" introduced="7.0s">
-<unit bldFile="app/organizer/calendarengines/calenimp/group"/>
-</component>
-<component name="calenlauncher" filter="s60" long-name="Calendar Launcher">
-<unit bldFile="app/organizer/calendarengines/calenlauncher/group"/>
-</component>
-<component name="caldavsrv" filter="sf_build" long-name="CalDAV Server" introduced="^3">
-<unit bldFile="app/organizer/calendarengines/caldav/group"/>
-</component>
-</collection>
-<collection name="meetingrequestengines" long-name="Meeting Request Engines" level="engine">
-<component name="mrmailbox" filter="s60" long-name="Meeting Request Mailbox">
-<unit bldFile="app/organizer/meetingrequestengines/mrmailbox/group"/>
-</component>
-<component name="mrmailboxutils" filter="s60" long-name="Meeting Request Mailbox Utils" plugin="Y">
-<unit bldFile="app/organizer/meetingrequestengines/mrmailboxutils/group"/>
-</component>
-</collection>
-<collection name="searchfw" long-name="Search Framework" level="services">
-<!-- Uncomment all units when configuration is in place. All currently #included from searchfw_build, which should be removed at the same time. -->
-<component name="coresearchfw" filter="s60" long-name="Core Search Framework" introduced="^1" class="placeholder">
-<!--<unit bldFile="searchfw/coresearchfw/group"/>-->
-</component>
-<component name="searchfw_plugins" filter="s60" long-name="Search Plugins" introduced="^1" plugin="Y" class="placeholder">
-<!--<unit bldFile="searchfw/plugins/group"/>-->
-</component>
-<component name="searchfw_build" filter="s60" long-name="Search Framework Build" introduced="^1">
-<unit bldFile="app/organizer/searchfw/group"/>
-</component>
-</collection>
-<collection name="alarmui" long-name="Alarm UI" level="app">
-<!-- collection is really a component, should move down a directory -->
-<component name="alarmui_build" filter="s60" long-name="Alarm UI Build">
-<unit bldFile="app/organizer/alarmui/group"/>
-</component>
-</collection>
-<collection name="calendarui" long-name="Calendar UI" level="ui">
-<component name="calendarui_help" filter="s60" long-name="Calendar UI Help">
-<unit bldFile="app/organizer/calendarui/help/group"/>
-</component>
-<component name="commonutils" filter="s60" long-name="Calendar Common Utils">
-<unit bldFile="app/organizer/calendarui/commonutils/group"/>
-</component>
-<component name="globaldata" filter="s60" long-name="Calendar Global Data">
-<unit bldFile="app/organizer/calendarui/globaldata/group"/>
-</component>
-<component name="settings" filter="s60" long-name="Calendar Settings">
-<!-- these should be merged into a single bld.inf or split into two components -->
-<unit bldFile="app/organizer/calendarui/settings/gsplugin/group"/>
-<unit bldFile="app/organizer/calendarui/settings/settingsui/group"/>
-</component>
-<component name="customisation" filter="s60" long-name="Calendar Customisation">
-<unit bldFile="app/organizer/calendarui/customisation/group"/>
-</component>
-<component name="customisationmanager" filter="s60" long-name="Calendar Customisation Manager">
-<unit bldFile="app/organizer/calendarui/customisationmanager/group"/>
-</component>
-<component name="multicaluidialog" filter="s60" long-name="Multi-Calendar UI Dialog" introduced="^3">
-<unit bldFile="app/organizer/calendarui/multicaluidialog/group"/>
-</component>
-<component name="views" filter="s60" long-name="Calendar Views">
-<unit bldFile="app/organizer/calendarui/views/group"/>
-</component>
-<component name="calendarui_controller" filter="s60" long-name="Calendar Controller">
-<unit bldFile="app/organizer/calendarui/controller/group"/>
-</component>
-<component name="calendarui_editors" filter="s60" long-name="Calendar Editors">
-<unit bldFile="app/organizer/calendarui/editors/group"/>
-</component>
-<component name="calendarui_application" filter="s60" long-name="Calendar Application">
-<unit bldFile="app/organizer/calendarui/application/group"/>
-</component>
-<component name="missedalarmindicatorplugin" filter="s60" long-name="Missed Alarm Indicator Plugin" plugin="Y">
-<unit bldFile="app/organizer/calendarui/missedalarmindicatorplugin/group"/>
-</component>
-<component name="calendarui_server" filter="s60" long-name="Calendar Server">
-<!-- these should be merged into a single bld.inf or split into two components -->
-<unit bldFile="app/organizer/calendarui/server/calensvr/group"/>
-<unit bldFile="app/organizer/calendarui/server/calensvrclient/group"/>
-</component>
-<component name="regionalplugins" filter="s60" long-name="Calendar Regional Plugins" plugin="Y">
-<!-- these should be merged into a single bld.inf or split into four components -->
-<unit bldFile="app/organizer/calendarui/regionalplugins/calenregionalutil/group"/>
-<unit bldFile="app/organizer/calendarui/regionalplugins/lunarchinese/group"/>
-<unit bldFile="app/organizer/calendarui/regionalplugins/lunarvietnamese/group"/>
-<unit bldFile="app/organizer/calendarui/regionalplugins/thai/group"/>
-</component>
-<component name="calenaiwprovider" filter="s60" long-name="Calendar AIW Proivder" introduced="^3" plugin="Y">
-<unit bldFile="app/organizer/calendarui/calenaiwprovider/group"/>
-</component>
-<component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y">
-<unit bldFile="app/organizer/calendarui/caldav/group"/>
-</component>
-<component name="calendarui_build" filter="s60" long-name="Calendar UI Build">
-<!-- split contents into separate components -->
-<unit bldFile="app/organizer/calendarui/group"/>
-</component>
-</collection>
-<collection name="meetingui" long-name="Meeting UI" level="ui">
-<component name="attendeeview" filter="s60" long-name="Attendee View">
-<unit bldFile="app/organizer/meetingui/attendeeview/group"/>
-</component>
-<component name="agnentryui" filter="s60" long-name="Agenda Entry UI" plugin="Y">
-<unit bldFile="app/organizer/meetingui/agnentryui/group"/>
-</component>
-<component name="meetingrequestutils" filter="s60" long-name="Meeting Request Utils">
-<unit bldFile="app/organizer/meetingui/meetingrequestutils/group"/>
-</component>
-<component name="meetingrequestviewers" filter="s60" long-name="Meeting Request Viewers" plugin="Y">
-<unit bldFile="app/organizer/meetingui/meetingrequestviewers/group"/>
-</component>
-<component name="meetingui_build" filter="s60" long-name="Meeting UI Build">
-<!-- split contents into separate components -->
-<unit bldFile="app/organizer/meetingui/group"/>
-</component>
-</collection>
-<collection name="clock2" long-name="Clock" level="app">
-<component name="clockengines" filter="s60" long-name="Clock Engines">
-<unit bldFile="app/organizer/clock2/clockengines/group"/>
-</component>
-<component name="clockui" filter="s60" long-name="Clock UI">
-<unit bldFile="app/organizer/clock2/clockui/group"/>
-</component>
-<component name="clock2_help" filter="s60" long-name="Clock Help">
-<unit bldFile="app/organizer/clock2/help/group"/>
-</component>
-<component name="clock2_build" filter="s60" long-name="Clock Build">
-<!-- split contents into separate components, or just make this one component -->
-<unit bldFile="app/organizer/clock2/group"/>
-</component>
-</collection>
-<collection name="notepad" long-name="Notepad" level="ui">
-<component name="notepad_help" filter="s60" long-name="Notepad Help">
-<unit bldFile="app/organizer/notepad/help/group"/>
-</component>
-<component name="notepad1" filter="s60" long-name="Notepad Application 1">
-<unit bldFile="app/organizer/notepad/notepad1/group"/>
-</component>
-<component name="txtrecog" filter="s60" long-name="Text Recognizer" plugin="Y">
-<unit bldFile="app/organizer/notepad/txtrecog/group"/>
-</component>
-</collection>
-<collection name="searchui" long-name="Search UI" level="app">
-<!-- consider making this a single component -->
-<!-- Uncomment all units when configuration is in place. All currently #included from searchui_build, which should be removed at the same time. -->
-<component name="searchui_help" filter="s60" long-name="Search UI Help" class="placeholder">
-<!--<unit bldFile="searchui/help/group"/>-->
-</component>
-<component name="searchapp" filter="s60" long-name="Search Application" class="placeholder">
-<!--<unit bldFile="searchui/searchapp/group"/>-->
-</component>
-<component name="searchui_build" filter="s60" long-name="Search UI Build">
-<unit bldFile="app/organizer/searchui/group"/>
-</component>
-</collection>
-<collection name="pimappservices" long-name="PIM Application Services" level="services">
-<component name="calendar" long-name="Calendar" introduced="9.2" purpose="optional">
-<unit bldFile="app/organizer/pimappservices/calendar/group" mrp="app/organizer/pimappservices/calendar/group/app-engines_calendar.mrp" version="2"/>
-</component>
-<component name="calendarvcalplugin" long-name="Calendar vCal Plugin" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="app/organizer/pimappservices/calendarvcalplugin/group" mrp="app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp" version="2"/>
-</component>
-<component name="appenginesdocs" long-name="Application Engines Documentation" purpose="development" class="doc">
-<unit mrp="app/organizer/pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
-</component>
-</collection>
-<collection name="pimappsupport" long-name="PIM Application Support" level="support">
-<component name="vcardandvcal" long-name="vCard and vCal" introduced="ER5" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/vcardandvcal/group" mrp="app/organizer/pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
-</component>
-<component name="chinesecalendarconverter" long-name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
-</component>
-<component name="chinesecalendaralg" long-name="Chinese Calendar Algorithm" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendaralg/group" mrp="app/organizer/pimappsupport/chinesecalendaralg/group/app-services_chinesecalendaralgorithm.mrp"/>
-</component>
-</collection>
-<collection name="organizer_info" long-name="Organizer Application Suite Info" level="app">
-<component name="organizer_metadata" long-name="Organizer Application Suite Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="mail eng base ui">
-<collection name="msg_pub" long-name="Messaging Apps Public APIs" level="ui">
-<component name="messaging_integration_api" long-name="Messaging Integration API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/messaging_integration_api/group"/>
-</component>
-<component name="plugin_bio_control_api" long-name="Plug-in Bio Control API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/plugin_bio_control_api/group"/>
-</component>
-<component name="mms_client_mtm_api" long-name="MMS Client MTM API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/mms_client_mtm_api/group"/>
-</component>
-<component name="open_new_message_notification_api" long-name="Open New Message Notification API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/open_new_message_notification_api/group"/>
-</component>
-<component name="messaging_editor_constants_api" long-name="Messaging Editor Constants API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/messaging_editor_constants_api/group"/>
-</component>
-</collection>
-<collection name="msg_plat" long-name="Messaging Apps Platform APIs" level="ui">
-<component name="smil_player_launch_api" long-name="SMIL Player Launch API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/smil_player_launch_api/group"/>
-</component>
-<component name="messaging_media_resolver_api" long-name="Messaging Media Resolver API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/messaging_media_resolver_api/group"/>
-</component>
-<component name="smil_engine_api" long-name="SMIL Engine API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/smil_engine_api/group"/>
-</component>
-<component name="mms_server_settings_api" long-name="MMS Server Settings API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_server_settings_api/group"/>
-</component>
-<component name="new_contacts_note_secondary_display_api" long-name="New Contacts Note Secondary Display API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contacts_note_secondary_display_api/group"/>
-</component>
-<component name="messaging_center_ui_utilities_api" long-name="Messaging Center UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/messaging_center_ui_utilities_api/group"/>
-</component>
-<component name="internet_mail_mtm_ui_api" long-name="Internet Mail MTM UI API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/internet_mail_mtm_ui_api/group"/>
-</component>
-<component name="messaging_editor_api" long-name="Messaging Editor API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/messaging_editor_api/group"/>
-</component>
-<component name="email_domain_utilities_api" long-name="Email Domain Utilities API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/email_domain_utilities_api/group"/>
-</component>
-<component name="smil_transition_api" long-name="SMIL Transition API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/smil_transition_api/group"/>
-</component>
-<component name="new_contacts_note_status_api" long-name="New Contacts Note Status API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contacts_note_status_api/group"/>
-</component>
-<component name="unified_editor_video_conversion_api" long-name="Unified Editor Video Conversion API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/unified_editor_video_conversion_api/group"/>
-</component>
-<component name="mms_conformance_api" long-name="MMS Conformance API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_conformance_api/group"/>
-</component>
-<component name="new_contacts_note_variables_api" long-name="New Contacts Note Variables API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contacts_note_variables_api/group"/>
-</component>
-<component name="new_message_notification_api" long-name="New Message Notification API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_message_notification_api/group"/>
-</component>
-<component name="mms_application_api" long-name="MMS Application API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_application_api/group"/>
-</component>
-<component name="mms_engine_settings_api" long-name="MMS Engine Settings API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_engine_settings_api/group"/>
-</component>
-<component name="mms_codec_client_api" long-name="MMS Codec Client API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_codec_client_api/group"/>
-</component>
-<component name="send_ui_meeting_request_api" long-name="Send UI Meeting Request API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/send_ui_meeting_request_api/group"/>
-</component>
-<component name="new_contact_notes_extended_api" long-name="New Contact Notes Extended API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contact_notes_extended_api/group"/>
-</component>
-<component name="mail_ui_constants_api" long-name="Mail UI Constants API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mail_ui_constants_api/group"/>
-</component>
-<component name="sim_dialog_launch_api" long-name="SIM Dialog Launch API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/sim_dialog_launch_api/group"/>
-</component>
-</collection>
-<collection name="mobilemessaging" long-name="Mobile Messaging" level="ui">
-<component name="audiomsg" filter="s60" long-name="Audio Message">
-<unit bldFile="app/messaging/mobilemessaging/audiomsg/group"/>
-</component>
-<component name="msgmedia" filter="s60" long-name="Message Media">
-<unit bldFile="app/messaging/mobilemessaging/msgmedia/group"/>
-</component>
-<component name="unieditor" filter="s60" long-name="Unified Editor">
-<unit bldFile="app/messaging/mobilemessaging/unieditor/group"/>
-</component>
-<component name="mmsui" filter="s60" long-name="MMS UI">
-<unit bldFile="app/messaging/mobilemessaging/mmsui/group"/>
-</component>
-<component name="postcard" filter="s60" long-name="Postcard">
-<unit bldFile="app/messaging/mobilemessaging/postcard/group"/>
-</component>
-<component name="smilui" filter="s60" long-name="SMIL UI">
-<unit bldFile="app/messaging/mobilemessaging/smilui/group"/>
-</component>
-<component name="smum" filter="s60" long-name="SMS UI MTM and UI Data MTM" plugin="Y">
-<unit bldFile="app/messaging/mobilemessaging/smum/group"/>
-</component>
-<component name="smsui" filter="s60" long-name="SMS UI">
-<unit bldFile="app/messaging/mobilemessaging/smsui/group"/>
-</component>
-<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/mobilemessaging/smsmtm/group" mrp="app/messaging/mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
-</component>
-</collection>
-<collection name="mmsengine" long-name="MMS Engine" level="eng">
-<component name="mmsconninit" filter="s60" long-name="MMS Connection Initiator" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsconninit/bld"/> -->
-</component>
-<component name="genutils" filter="s60" long-name="General Utils" class="placeholder">
-<!-- <unit bldFile="mmsengine/genutils/bld"/> -->
-</component>
-<component name="mmsserversettings" filter="s60" long-name="MMS Server Settings" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserversettings/bld"/> -->
-</component>
-<component name="mmsmessage" filter="s60" long-name="MMS Message" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsmessage/bld"/> -->
-</component>
-<component name="mmshttptransport" filter="s60" long-name="MMS HTTP Transport" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmshttptransport/bld"/> -->
-</component>
-<component name="mmscodec" filter="s60" long-name="MMS Codec" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodec/bld"/> -->
-</component>
-<component name="mmsserver" filter="s60" long-name="MMS Server" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserver/bld"/> -->
-</component>
-<component name="clientmtm" filter="s60" long-name="MMS Client MTM" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/clientmtm/bld"/> -->
-</component>
-<component name="mmswatcher" filter="s60" long-name="MMS Watcher" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmswatcher/bld"/> -->
-</component>
-<component name="mmspushhandler" filter="s60" long-name="MMS Push Handler" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmspushhandler/bld"/> -->
-</component>
-<component name="applicationadapter" filter="s60" long-name="MMS Application Adapter" class="placeholder">
-<!-- <unit bldFile="mmsengine/applicationadapter/bld"/> -->
-</component>
-<component name="mmscodecclient" filter="s60" long-name="MMS Codec Client" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodecclient/bld"/> -->
-</component>
-<component name="mmssettings" long-name="MMS Settings" introduced="9.2" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmssettings/group" mrp="app/messaging/mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
-</component>
-<component name="mmsconf" long-name="MMS Configuration" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmsconf" mrp="app/messaging/mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
-</component>
-<component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
-<!-- this bld.inf should be broken up into the individual other components -->
-<unit bldFile="app/messaging/mmsengine/group"/>
-</component>
-</collection>
-<collection name="messagingappbase" long-name="Messaging App Base" level="base">
-<component name="msgavkon" filter="s60" long-name="Messaging Avkon UI">
-<unit bldFile="app/messaging/messagingappbase/msgavkon/group"/>
-</component>
-<component name="mce" filter="s60" long-name="Message Center Application">
-<unit bldFile="app/messaging/messagingappbase/mce/group"/>
-</component>
-<component name="mceextraitems" filter="s60" long-name="Message Center Extra Items">
-<unit bldFile="app/messaging/messagingappbase/mceextraitems/group"/>
-</component>
-<component name="mcesettings" filter="s60" long-name="Message Center Settings">
-<unit bldFile="app/messaging/messagingappbase/mcesettings/group"/>
-</component>
-<component name="msgerrorwatcher" filter="s60" long-name="Messaging Error Watcher" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/msgerrorwatcher/group"/>
-</component>
-<component name="ncnlist" filter="s60" long-name="New Contacts Note List">
-<unit bldFile="app/messaging/messagingappbase/ncnlist/group"/>
-</component>
-<component name="schemeplugin" filter="s60" long-name="Scheme Handler Plugin" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/schemeplugin/group"/>
-</component>
-<component name="sendui" filter="s60" long-name="Send UI" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/sendui/group"/>
-</component>
-<component name="smilengine" filter="s60" long-name="SMIL Engine">
-<unit bldFile="app/messaging/messagingappbase/smilengine/group"/>
-</component>
-<component name="bium" filter="s60" long-name="BIO UI MTM" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/bium/group"/>
-</component>
-<component name="smartmessaging" filter="s60" long-name="Smart Messaging">
-<unit bldFile="app/messaging/messagingappbase/smartmessaging/group"/>
-</component>
-<component name="msgeditor" filter="s60" long-name="Messaging Editor">
-<unit bldFile="app/messaging/messagingappbase/msgeditor/group"/>
-</component>
-<component name="smilparser" long-name="SMIL Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="app/messaging/messagingappbase/smilparser/GROUP" mrp="app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
-</component>
-<component name="obexmtms" long-name="OBEX MTMs" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/obexmtms/Group" mrp="app/messaging/messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
-</component>
-</collection>
-<collection name="email" long-name="Email" level="mail">
-<!-- use commonemail instead -->
-<component name="alwaysonlineemailplugin" filter="s60" long-name="Always Online Mail Plugin" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/alwaysonlineemailplugin/group"/>
-</component>
-<component name="emailnotificationhandler" filter="s60" long-name="Email Notification Handler" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/emailnotificationhandler/group"/>
-</component>
-<component name="imum" filter="s60" long-name="Internet Mail UI MTM" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/imum/group"/>
-</component>
-<component name="mail" filter="s60" long-name="Mail Application" deprecated="^3">
-<unit bldFile="app/messaging/email/mail/group"/>
-</component>
-<component name="pop3andsmtpmtm" long-name="POP3 and SMTP MTM" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/pop3andsmtpmtm/group" mrp="app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
-</component>
-<component name="imap4mtm" long-name="IMAP4 MTM" introduced="9.2" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/imap4mtm/group" mrp="app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
-</component>
-</collection>
-<collection name="messaging_info" long-name="Messaging Apps Info" level="ui">
-<component name="messaging_metadata" long-name="Messaging Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commonemail" level="apps" span="2" long-name="Email Apps" levels="service support ui app">
-<collection name="email_pub" long-name="Email Apps Public Interfaces" level="app">
-<component name="email_widget_api" long-name="Email Widget API" filter="s60" class="api">
-<unit bldFile="app/commonemail/email_pub/email_widget_api/group"/>
-</component>
-</collection>
-<collection name="email_plat" long-name="Email Apps Platform Interfaces" level="app">
-<component name="email_client_api" long-name="Email Client API" filter="s60" class="api">
-<unit bldFile="app/commonemail/email_plat/email_client_api/group"/>
-</component>
-<component name="email_setup_plugin_api" long-name="Email Setup Plugin API" filter="s60" class="api">
-<unit bldFile="app/commonemail/email_plat/email_setup_plugin_api/group"/>
-</component>
-</collection>
-<collection name="emailservices" long-name="Email Services" level="service">
-<component name="emailframework" filter="s60" long-name="Email Framework" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailframework/group"/>
-</component>
-<component name="emailclientapi" filter="s60" long-name="Email Client API" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailclientapi/group"/>
-</component>
-<component name="emailserver" filter="s60" long-name="Email Server" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailserver/group"/>
-</component>
-<component name="emailservermonitor" filter="s60" long-name="Email Server Monitor" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailservermonitor/group"/>
-</component>
-<component name="psmruadapter" filter="s60" long-name="Predictive Search Most Recent Used Adapter" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailservices/psmruadapter/group"/>
-</component>
-<component name="emailstore" filter="s60" long-name="Email Store" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailstore/group"/>
-</component>
-<component name="emaildebug" filter="s60" long-name="Email Debug" introduced="^2" class="api">
-<unit bldFile="app/commonemail/emailservices/emaildebug/group"/>
-</component>
-<component name="emailinstallationinitiator" filter="s60" long-name="Email Installation Initiator" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailinstallationinitiator/group"/>
-</component>
-</collection>
-<collection name="ipsservices" long-name="IMAP/POP/SMTP Services" level="service">
-<component name="ipssossettings" filter="s60" long-name="IPS SOS Settings" introduced="^2">
-<!-- SOS? Consider spelling it out since the abbreviation is ambiguous -->
-<unit bldFile="app/commonemail/ipsservices/ipssossettings/group"/>
-</component>
-<component name="ipssosplugin" filter="s60" long-name="IPS SOS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/ipsservices/ipssosplugin/group"/>
-</component>
-<component name="ipssosaoplugin" filter="s60" long-name="IPS SOS Always Online Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/ipsservices/ipssosaoplugin/group"/>
-</component>
-<component name="ipsservices_build" filter="s60" long-name="IPS Services Build" introduced="^2">
-<unit bldFile="app/commonemail/ipsservices/group"/>
-<!-- can the exports be broken up into the other components or made a config component?-->
-</component>
-</collection>
-<collection name="emailcontacts" long-name="Email Contacts" level="support">
-<component name="contactactionservice" filter="s60" long-name="Contact Action Service" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailcontacts/contactactionservice/group"/>
-</component>
-<component name="contactactionmenu" filter="s60" long-name="Contact Action Menu" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailcontacts/contactactionmenu/group"/>
-</component>
-</collection>
-<collection name="meetingrequest" long-name="Meeting Request" level="ui">
-<component name="mrcommon" filter="s60" long-name="MR Common" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrcommon/group"/>
-</component>
-<component name="mrdb" filter="s60" long-name="MR Database" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrdb/group"/>
-</component>
-<component name="mrpolicy" filter="s60" long-name="MR Policy" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrpolicy/group"/>
-</component>
-<component name="mrservices" filter="s60" long-name="MR Services" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrservices/group"/>
-</component>
-<component name="mrgui" filter="s60" long-name="MR GUI" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrgui/group"/>
-</component>
-<component name="mrentry" filter="s60" long-name="MR Entry" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrentry/group"/>
-</component>
-<component name="mrtasks" filter="s60" long-name="MR Tasks" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrtasks/group"/>
-</component>
-<component name="mrutils" filter="s60" long-name="MR Utils" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrutils/group"/>
-</component>
-<component name="mrutilscalplugin" filter="s60" long-name="MR Utils Calendar Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mrutilscalplugin/group"/>
-</component>
-<component name="mrviewer" filter="s60" long-name="MR Viewer" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrviewer/group"/>
-</component>
-<component name="mrviewercalplugin" filter="s60" long-name="MR Viewer Calendar Plugin" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrviewercalplugin/group"/>
-</component>
-<component name="mricalviewer" filter="s60" long-name="MR iCal Viewer" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mricalviewer/group"/>
-</component>
-<component name="mrversit2" filter="s60" long-name="MR Versit2" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrversit2/group"/>
-</component>
-<component name="mragnversit2" filter="s60" long-name="MR Agenda Versit2" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mragnversit2/group"/>
-</component>
-<component name="mrcasplugin" filter="s60" long-name="MR Contact Action Service Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mrcasplugin/group"/>
-</component>
-<component name="mrurlparserplugin" filter="s60" long-name="MR URL Parser Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mrurlparserplugin/group"/>
-</component>
-<component name="meetingrequest_build" filter="s60" long-name="MR Build" introduced="^2">
-<!-- can the exports be broken up into the other components ?
- alternatively, move the exports into a RM Config component-->
-<unit bldFile="app/commonemail/meetingrequest/group"/>
-</component>
-</collection>
-<collection name="emailuis" long-name="Email UIs" level="app">
-<component name="emailui" filter="s60" long-name="Email UI" introduced="^2">
-<unit bldFile="app/commonemail/emailuis/emailui/group"/>
-</component>
-<component name="gsemailsettings" filter="s60" long-name="Email GS Settings" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailuis/gsemailsettings/group"/>
-</component>
-<component name="uicomponents" filter="s60" long-name="Email UI Components" introduced="^2">
-<unit bldFile="app/commonemail/emailuis/uicomponents/group"/>
-</component>
-<component name="widget" filter="s60" long-name="Email Widget" introduced="^2">
-<!-- Uncomment unit when configuration is in place. Currently #included from emailuis_build, which should be removed at the same time. -->
-<!--<unit bldFile="emailuis/widget/group"/>-->
-</component>
-<component name="emailuis_build" filter="s60" long-name="Email UIs Build" introduced="^2">
-<unit bldFile="app/commonemail/emailuis/group"/>
-</component>
-</collection>
-<collection name="commonemail_info" long-name="Email Apps Info" level="app">
-<component name="emailhelp" filter="s60" long-name="Email Help" class="placeholder">
-<!-- should this be commented out or not? -->
-<!-- <unit bldFile="emailhelp/group"/> -->
-</component>
-<component name="commonemail_help" filter="s60" long-name="Email Help" introduced="^2" class="placeholder">
-<!-- should this be commented out or not? -->
-<!-- <unit bldFile="help/group"/> -->
-</component>
-</collection>
-</block>
-<block name="conversations" level="apps" long-name="Conversation Apps" levels="settings utils plugin ui">
-<collection name="conversations_plat" long-name="Conversation Apps Platform Interfaces" level="ui">
-<component name="im_cv_launcher_api" long-name="IM CV Launcher API" filter="s60" class="api">
-<unit bldFile="app/conversations/conversations_plat/im_cv_launcher_api/group"/>
-</component>
-<component name="im_connection_api" long-name="IM Connection API" filter="s60" class="api">
-<unit bldFile="app/conversations/conversations_plat/im_connection_api/group"/>
-</component>
-<component name="im_cv_appui_api" long-name="IM CV App UI API" filter="s60" class="api">
-<unit bldFile="app/conversations/conversations_plat/im_cv_appui_api/group"/>
-</component>
-</collection>
-<collection name="uiservicetabsettings" long-name="UI Service Tab Settings" level="settings">
-<!-- this is really at the wrong rank. should move down a directory -->
-<component name="vimpstsettings" filter="s60" long-name="VIMP Service Tab Settings">
-<unit bldFile="app/conversations/uiservicetabsettings/group"/>
-</component>
-</collection>
-<collection name="instantmessagesalert" long-name="Instant Messages Alert" level="utils">
-<!-- this is really at the wrong rank. should move down a directory -->
-<component name="instantmessagesalert_build" filter="s60" long-name="Instant Messages Alert build" introduced="^3">
-<unit bldFile="app/conversations/instantmessagesalert/group"/>
-</component>
-</collection>
-<collection name="imstutils" long-name="IM Service Tab Utils" level="utils">
-<component name="imstutils_help" filter="s60" long-name="IM Service Tab Help">
-<unit bldFile="app/conversations/imstutils/help/group"/>
-</component>
-<component name="imconnectionprovider" filter="s60" long-name="IM Connection Provider" plugin="Y">
-<unit bldFile="app/conversations/imstutils/imconnectionprovider/group"/>
-</component>
-<component name="xmppadapter" filter="s60" long-name="XMPP Settings Adapter" plugin="Y">
-<unit bldFile="app/conversations/imstutils/xmppadapter/group"/>
-</component>
-<component name="imconversationview" filter="s60" long-name="IM Conversation View">
-<unit bldFile="app/conversations/imstutils/imconversationview/group"/>
-</component>
-<component name="imstutils_config" filter="s60" long-name="IM Service Tab Utils config" class="config">
-<!-- remove the #includes and or moved ithe loc file into one the above components -->
-<unit bldFile="app/conversations/imstutils/group"/>
-</component>
-</collection>
-<collection name="uiservicetab" long-name="UI Service Tab" level="ui">
-<component name="vimpstutils" filter="s60" long-name="VIMP Service Tab Utilities">
-<!-- need to spell out VIMP at least once -->
-<unit bldFile="app/conversations/uiservicetab/vimpstutils/group"/>
-</component>
-<component name="vimpststorage" filter="s60" long-name="VIMP Service Tab Storage">
-<unit bldFile="app/conversations/uiservicetab/vimpststorage/group"/>
-</component>
-<component name="vimpstengine" filter="s60" long-name="VIMP Service Tab Engine">
-<unit bldFile="app/conversations/uiservicetab/vimpstengine/group"/>
-</component>
-<component name="vimpstcmdprocess" filter="s60" long-name="VIMP Service Tab Command Process">
-<unit bldFile="app/conversations/uiservicetab/vimpstcmdprocess/group"/>
-</component>
-<component name="vimpstui" filter="s60" long-name="VIMP Service Tab UI">
-<unit bldFile="app/conversations/uiservicetab/vimpstui/group"/>
-</component>
-<component name="vimpstdetailsviewplugin" filter="s60" long-name="VIMP ST Details View Plugin" plugin="Y">
-<unit bldFile="app/conversations/uiservicetab/vimpstdetailsviewplugin/group"/>
-</component>
-<component name="uiservicetab_build" filter="s60" long-name="UI Service Tab Build">
-<!-- can this be distributed into the above bld.infs? -->
-<unit bldFile="app/conversations/uiservicetab/group"/>
-</component>
-</collection>
-<collection name="servicewidget" long-name="Service Widget" level="ui">
-<component name="servicewidgetdatapublisher" filter="s60" long-name="Service Widget Data Publisher" plugin="Y">
-<unit bldFile="app/conversations/servicewidget/servicewidgetdatapublisher/group"/>
-</component>
-<component name="themes" filter="s60" long-name="Service Widget Themes" class="config">
-<!-- does this really need to have that number in the directory name? -->
-<unit bldFile="app/conversations/servicewidget/themes/install-themes/install/servicewidget_20021383/group"/>
-</component>
-<component name="servicewidget_build" filter="s60" long-name="Service Widget Build">
-<!-- Either move the whole collection down one directory into a single component, or move the ROM and SIS parts into a Service Widget ROM component -->
-<unit bldFile="app/conversations/servicewidget/group"/>
-</component>
-</collection>
-<collection name="instantmsgindicatorplugin" long-name="Instant Message Indicator Plugin" level="plugin">
-<!-- collection is really a component. should move down a directory -->
-<component name="instantmsgindicatorplugin_build" filter="s60" long-name="Instant Message Indicator Plugin Build" introduced="^3" plugin="Y">
-<unit bldFile="app/conversations/instantmsgindicatorplugin/group"/>
-</component>
-</collection>
-<collection name="imstatuspaneindicatorplugin" long-name="IM Status Pane Indicator Plugin" level="plugin">
-<!-- collection is really a component. should move down a directory -->
-<component name="imstatuspaneindicatorplugin_build" filter="s60" long-name="IM Status Pane Indicator Plugin Build" introduced="^3" plugin="Y">
-<unit bldFile="app/conversations/imstatuspaneindicatorplugin/group"/>
-</component>
-</collection>
-<collection name="conversations_info" long-name="Conversation Apps Info" level="ui">
-<component name="conversations_build" filter="s60" long-name="Conversation Apps Build">
-<!-- can the exports be moved to other components? or this remade into a configuration component?-->
-<unit bldFile="app/conversations/group"/>
-</component>
-</collection>
-</block>
-<block name="im" level="apps" long-name="Instant Messaging Apps" levels="support prot engine apps">
-<collection name="im_plat" long-name="Instant Messaging Apps Platform Interfaces" level="apps">
-<component name="wv_sap_settings_api" long-name="WV SAP Settings API" filter="s60" class="api">
-<unit bldFile="app/im/im_plat/wv_sap_settings_api/group"/>
-</component>
-</collection>
-<collection name="wvsettings20" long-name="Wireless Village Settings Engine" level="support">
-<!-- this is really a component. should move down a directory -->
-<component name="wvsapsettingsstore" long-name="WV SAP Settings Store" filter="s60" introduced="9.3">
-<unit bldFile="app/im/wvsettings20/group"/>
-</component>
-</collection>
-</block>
-<block name="dictionary" level="services" long-name="Dictionary" levels="utils ui">
-<collection name="dictionary_plat" long-name="Dictionary Platform Interfaces" level="ui">
-<component name="menu_suites_macros_api" long-name="Menu Suites Macros API" filter="s60" class="api">
-<unit bldFile="app/dictionary/dictionary_plat/menu_suites_macros_api/group"/>
-</component>
-</collection>
-<collection name="userdict" long-name="User Dictionary" level="ui">
-<!-- collection is really a component, move down a dir -->
-<component name="userdict_build" filter="s60" long-name="Japanese User Dictionary">
-<unit bldFile="app/dictionary/userdict/group"/>
-</component>
-</collection>
-</block>
-<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"/>
-</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"/>
-</component>
-</collection>
-<collection name="camerauis" long-name="Camera UIs">
-<component name="activepalette" filter="s60" long-name="Active Palette">
-<unit bldFile="app/camera/camerauis/activepalette/group"/>
-</component>
-<component name="cameraapp" filter="s60" long-name="Camera Application">
-<unit bldFile="app/camera/camerauis/cameraapp/group"/>
-<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">
-<component name="image_editor_debug_utilities_api" long-name="Image Editor Debug Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
-</component>
-<component name="image_editor_utilities_api" long-name="Image Editor Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_utilities_api/group"/>
-</component>
-<component name="image_editor_definitions_api" long-name="Image Editor Definitions API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_definitions_api/group"/>
-</component>
-<component name="image_editor_system_parameters_api" long-name="Image Editor System Parameters API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_system_parameters_api/group"/>
-</component>
-<component name="image_processing_engine_api" long-name="Image Processing Engine API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_processing_engine_api/group"/>
-</component>
-</collection>
-<collection name="imageeditor" long-name="Image Editor UI" level="ui">
-<component name="pb" filter="s60" long-name="Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/pb/group"/>
-</component>
-<component name="iepb" filter="s60" long-name="Image Editor Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/iepb/group"/>
-</component>
-<component name="imageeditorui" filter="s60" long-name="Image Editor UI">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorui/group"/>
-</component>
-<component name="imageeditormanager" filter="s60" long-name="Image Editor Manager">
-<unit bldFile="app/imgeditor/imageeditor/imageeditormanager/group"/>
-</component>
-<component name="imageeditorapp" filter="s60" long-name="Image Editor Application">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorapp/group"/>
-</component>
-<component name="imageeditor_plugins" filter="s60" long-name="Image Editor Plugins" plugin="Y">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditor/plugins/blackwhiteplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/brightnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/bubbleplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cartoonizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/clipartplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/contrastplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cropplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/drawplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/frameplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/negativeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/redeyeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/resizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotatelplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotaterplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/textplugin/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditor/plugins/drawplugin/group"/>
- -->
-</component>
-<component name="editorprovider" filter="s60" long-name="Image Editor Provider">
-<unit bldFile="app/imgeditor/imageeditor/editorprovider/group"/>
-</component>
-<component name="imageeditor_build" filter="s60" long-name="Image Editor Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditor/group"/>
-</component>
-</collection>
-<collection name="imageeditorengine" long-name="Image Editor Engine" level="engine">
-<component name="filters" filter="s60" long-name="Image Editor Filters">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbrightness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbubble/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbuffer/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercartoon/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterclipart/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercontrast/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercrop/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterdraw/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterframe/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtergrayscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtericlsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegtarget/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filternegate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterredeye/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterrotate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtertext/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
- -->
-</component>
-<component name="imageeditorutils" filter="s60" long-name="Image Editor Utilities">
-<unit bldFile="app/imgeditor/imageeditorengine/imageeditorutils/group"/>
-</component>
-<component name="systemparameters" filter="s60" long-name="System Parameters">
-<unit bldFile="app/imgeditor/imageeditorengine/systemparameters/group"/>
-</component>
-<component name="enginewrapper" filter="s60" long-name="Image Editor Engine Wrapper">
-<unit bldFile="app/imgeditor/imageeditorengine/enginewrapper/group"/>
-</component>
-<component name="imageeditorengine_build" filter="s60" long-name="Image Editor Engine Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoeditor" level="apps" long-name="Video Editor Apps" levels="engine ui">
-<collection name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" level="ui">
-<component name="video_editor_engine_api" long-name="Video Editor Engine API" introduced="^2" class="api">
-<unit bldFile="app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
-</component>
-</collection>
-<collection name="videditor" long-name="Video Editor" level="ui">
-<component name="videoeditorcommon" filter="s60" long-name="Video Editor Common" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditorcommon/group"/>
-</component>
-<component name="videoeditoruicomponents" filter="s60" long-name="Video Editor UI Components" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditoruicomponents/group"/>
-</component>
-<component name="simplevideoeditor" filter="s60" long-name="Simple Video Editor" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplevideoeditor/group"/>
-</component>
-<component name="simplecutvideo" filter="s60" long-name="Simple Cut Video" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplecutvideo/group"/>
-</component>
-<component name="videoprovider" filter="s60" long-name="Video Provider" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoprovider/group"/>
-</component>
-<component name="manualvideoeditor" filter="s60" long-name="Manual Video Editor" introduced="^2" class="placeholder">
-<!-- uncomment when supported
- <meta rel="config">
- <defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
- </meta>
- <unit bldFile="videditor/manualvideoeditor/group"/> -->
-</component>
-<component name="videditor_build" filter="s60" long-name="Video Editor Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videditor/group"/>
-</component>
-</collection>
-<collection name="videoeditorengine" long-name="Video Editor Engine" level="engine">
-<component name="audioeditorengine" filter="s60" long-name="Audio Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/audioeditorengine/group"/>
-</component>
-<component name="avcedit" filter="s60" long-name="AVC Editing" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/avcedit/group"/>
-</component>
-<component name="h263decoder" filter="s60" long-name="H.263 Decoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/h263decoder/group"/>
-</component>
-<component name="mp3aacmaniplib" filter="s60" long-name="MP3 and AAC Manipulation Library" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
-</component>
-<component name="vedtranscoder" filter="s60" long-name="Video Editor Transcoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedtranscoder/group"/>
-</component>
-<component name="vedengine" filter="s60" long-name="Video Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedengine/group"/>
-</component>
-<component name="videoeditorengine_build" filter="s60" long-name="Video Editor Engine Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videoeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
-<collection name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" level="apps">
-<component name="videoplayer_startup_api" long-name="Video Player Startup API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videoplayer_startup_api/group" filter="!test"/>
-</component>
-<component name="video_player_file_details_dialog_api" long-name="Media Player File Details Dialog API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/video_player_file_details_dialog_api/group" filter="!test"/>
-</component>
-<component name="videocollection_api" long-name="Video Collection API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videocollection_api/group"/>
-</component>
-</collection>
-<collection name="videofeeds" long-name="Video Feeds" level="util">
-<component name="iptv_utils" filter="s60" long-name="IPTV Util" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/utils/group"/>
-</component>
-<component name="viewmessageutility" filter="s60" long-name="View Message Utility" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/viewmessageutility/group"/>
-</component>
-<component name="vcxnotifier" filter="s60" long-name="Video Connection Notifier" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/vcxnotifier/group"/>
-</component>
-<component name="vccommon" filter="s60" long-name="Video Connection Common" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/vccommon/group"/>
-</component>
-<component name="clientapi" long-name="Server Client" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/clientapi/group"/>
-</component>
-<component name="provisioningprocessor" long-name="Provisioning Processor" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/provisioningprocessor/group"/>
-</component>
-<component name="mrssplugin" long-name="RSS plugin" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/mrssplugin/group"/>
-</component>
-<component name="videofeeds_server" long-name="Server" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/server/group"/>
-</component>
-<component name="livetvutils" long-name="LiveTV Utils" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/livetvutils/group"/>
-</component>
-<component name="iptvprovisioningrecognizer" long-name="IP TV Provisioning Recognizer" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/provisioningrecognizer/group"/>
-</component>
-<component name="iptvprovisioningappui" long-name="IP TV Provisioning App UI" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/provisioningappui/group"/>
-</component>
-<component name="iptvomaprovisioning" long-name="IP TV OMA Provisioning" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/omaprovisioning/group"/>
-</component>
-<component name="vcnsuiengine" long-name="VoD UI Engine" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/vcnsuiengine/group"/>
-</component>
-<component name="hgvodui" long-name="Ganes UX2.0 VoD UI" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/hgvodui/group"/>
-</component>
-<component name="hgvodplugin" long-name="Ganes UX2.0 VoD UI Plugin" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/hgvodplugin/group"/>
-</component>
-<component name="vcnsscheduleview" long-name="Scheduled Download Settings View" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/vcnsscheduleview/group"/>
-</component>
-<component name="vcnsscheduleplugin" long-name="Scheduled Download Settings Plugin" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/vcnsscheduleplugin/group"/>
-</component>
-<component name="scheduleddlplugin" long-name="Scheduled download plugin" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/scheduleddlplugin/group"/>
-</component>
-</collection>
-<collection name="videocollection" long-name="Video Collection" level="util">
-<component name="mpxmyvideoscollection" filter="s60" long-name="MPX My Videos Collection" introduced="^3">
-<unit bldFile="app/videoplayer/videocollection/mpxmyvideoscollection/group"/>
-</component>
-<component name="myvideosindicatorplugin" filter="s60" long-name="My Videos Indicator Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videocollection/myvideosindicatorplugin/group"/>
-</component>
-<component name="hgmyvideos" filter="s60" long-name="Huriganes My Videos" introduced="^3">
-<unit bldFile="app/videoplayer/videocollection/hgmyvideos/group"/>
-</component>
-<component name="hgmyvideosplugin" filter="s60" long-name="Huriganes My VideosPlugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videocollection/hgmyvideosplugin/group"/>
-</component>
-</collection>
-<collection name="mediasettings" long-name="Media Settings" level="support">
-<!-- this is really a component. Should be moved down a directory -->
-<component name="mediasettings_build" filter="s60" long-name="Media Settings Build">
-<unit bldFile="app/videoplayer/mediasettings/group"/>
-</component>
-<component name="videoplayer_test" filter="s60" purpose="development" long-name="Video Player Apps Test">
-<!-- can only have one unit. Can thes be #included from the above or another bld.inf?-->
-<unit bldFile="app/videoplayer/tsrc/VCXTestCommon/group"/>
-<unit bldFile="app/videoplayer/tsrc/VCXTestUtilModule/group"/>
-<unit bldFile="app/videoplayer/tsrc/VCXTestMyVideosCollectionClient/group"/>
-<unit bldFile="app/videoplayer/mediasettings/mediasettingsengine/tsrc/mediasettingsenginetest/group"/>
-<unit bldFile="app/videoplayer/mediasettings/videoplayersettingsengine/tsrc/vpsettingsenginetest/group"/>
-</component>
-</collection>
-<collection name="filedetails" long-name="File Details" level="support">
-<component name="filedetailsplugin" filter="s60" long-name="File Details Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/filedetails/filedetailsplugin/group"/>
-</component>
-<component name="filedetailsdialog" filter="s60" long-name="File Details Dialog" introduced="^3">
-<unit bldFile="app/videoplayer/filedetails/filedetailsdialog/group"/>
-</component>
-</collection>
-<collection name="videoplayerapp" long-name="Video Player App" level="apps">
-<component name="lwplayer" long-name="Lightweight Player" filter="s60">
-<unit bldFile="app/videoplayer/videoplayerapp/lwplayer/group"/>
-</component>
-<component name="mpxvideoplayer" filter="s60" long-name="MPX Video Player" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayerapp/mpxvideoplayer/group" filter="!test"/>
-</component>
-</collection>
-<collection name="videoplayback" long-name="Video Playback Plugins" level="plugin">
-<component name="videohelix" long-name="Video Helix" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videohelix/group" filter="!test"/>
-</component>
-<component name="videopdlplaybackviewplugin" filter="s60" long-name="Video PDL Playback View Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videopdlplaybackviewplugin/group" filter="!test"/>
-</component>
-<component name="videoplaybackcontrols" filter="s60" long-name="Video Playback Controls" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videoplaybackcontrols/group" filter="!test"/>
-</component>
-<component name="videoplaybackviewplugin" filter="s60" long-name="Video Playback View Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videoplaybackviewplugin/group"/>
-</component>
-<component name="videoplaybackviews" filter="s60" long-name="Video Playback Views" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videoplaybackviews/group" filter="!test"/>
-</component>
-</collection>
-</block>
-<block name="photos" level="apps" long-name="Photos" levels="support fw ui app">
-<collection name="photos_plat" long-name="Photos Platform Interfaces" level="app">
-<component name="collection_plugins_api" long-name="Collection Plugins API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/collection_plugins_api/group"/>
-</component>
-<component name="controllers_collection_api" long-name="Controllers Collection API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/controllers_collection_api/group"/>
-</component>
-<component name="gallery_utilities_api" long-name="Gallery Utilities API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/gallery_utilities_api/group"/>
-</component>
-<component name="slideshow_ui_constants_api" long-name="Slideshow Ui Constants API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/slideshow_ui_constants_api/group"/>
-</component>
-<component name="views_metadatadialog_api" long-name="Views Metadata Dialog API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/views_metadatadialog_api/group"/>
-</component>
-</collection>
-<collection name="photosgallery" long-name="Photos Gallery" level="app">
-<!-- consider splitting this collection into the application itself, and the frameworks behind it -->
-<component name="photosgallery_help" filter="s60" long-name="Photos Help" introduced="^2">
-<unit bldFile="app/photos/photosgallery/help/group"/>
-</component>
-<component name="logging" filter="s60" long-name="Photos Logging" introduced="^2">
-<unit bldFile="app/photos/photosgallery/logging/group"/>
-</component>
-<component name="photosgallery_common" filter="s60" long-name="Photos Common" introduced="^2">
-<unit bldFile="app/photos/photosgallery/common/group"/>
-</component>
-<component name="photosgallery_commonui" filter="s60" long-name="Photos Common UI" introduced="^2">
-<unit bldFile="app/photos/photosgallery/commonui/group"/>
-</component>
-<component name="photosgalleryollectionfw" filter="s60" long-name="Photos Collection Framework" introduced="^2">
-<unit bldFile="app/photos/photosgallery/collectionframework/group"/>
-</component>
-<component name="galleryicons" filter="s60" long-name="Photos Icons" introduced="^2" class="config">
-<unit bldFile="app/photos/photosgallery/icons"/>
-</component>
-<component name="imageviewer" filter="s60" long-name="Image Viewer" introduced="^3">
-<!-- this is really a part of controllers component, #include from there instead -->
-<unit bldFile="app/photos/photosgallery/controllers/imageviewer/group"/>
-</component>
-<component name="photosgalleryviewfw" filter="s60" long-name="View Framework" introduced="^2">
-<unit bldFile="app/photos/photosgallery/viewframework/group"/>
-</component>
-<component name="controllers" filter="s60" long-name="Photos Controllers" introduced="^2">
-<unit bldFile="app/photos/photosgallery/controllers/group"/>
-</component>
-<component name="photogallery" filter="s60" long-name="Media Gallery" introduced="^2">
-<unit bldFile="app/photos/photosgallery/gallery/group"/>
-</component>
-<component name="slideshow" filter="s60" long-name="Slideshow" introduced="^2">
-<unit bldFile="app/photos/photosgallery/slideshow/group"/>
-</component>
-<component name="memoryplugin" long-name="Memory Plugin" filter="s60" introduced="^2" plugin="Y">
-<unit bldFile="app/photos/photosgallery/memoryplugin/group"/>
-</component>
-<component name="imgvwr" filter="s60" long-name="Photos Image Viewer" introduced="^3">
-<unit bldFile="app/photos/photosgallery/imgvwr/group"/>
-</component>
-<component name="photosgallery_build" filter="s60" long-name="Photos Gallery Build" introduced="^2">
-<!-- need to remove the #included above bld.infs from this -->
-<unit bldFile="app/photos/photosgallery/group"/>
-</component>
-</collection>
-</block>
-<block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support hs app">
-<collection name="musicplayer_plat" long-name="Music Player Apps Platform Interfaces" level="app">
-<component name="mpx_music_player_app_api" long-name="MPX Music Player App API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_app_api/group"/>
-</component>
-<component name="mpx_music_player_commonui_api" long-name="MPX Music Player Common UI API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_commonui_api/group"/>
-</component>
-<component name="mpx_music_player_media_key_handler_api" long-name="MPX Music Player Media Key Handler API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_media_key_handler_api/group"/>
-</component>
-<component name="mpx_music_player_remote_control_api" long-name="MPX Music Player Remote Control API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_remote_control_api/group"/>
-</component>
-<component name="mpx_music_shop_ui_api" long-name="MPX Music Shop UI API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_shop_ui_api/group"/>
-</component>
-<component name="mpx_music_wap_adapter_cenrep_api" long-name="MPX Music Wap Adapter CenRep API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_wap_adapter_cenrep_api/group"/>
-</component>
-<component name="mpx_music_store_api" long-name="MPX Music Store Find API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_store_api/group"/>
-</component>
-<component name="audio_application_features_api" long-name="Audio Application Features API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/audio_application_features_api/group"/>
-</component>
-<component name="music_content_publisher_plugin_api" long-name="Music Content Publisher Plugin API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/music_content_publisher_plugin_api/group"/>
-</component>
-</collection>
-<collection name="mpxmusicplayer" long-name="MPX Music Player" level="app">
-<component name="mpxmusicplayer_help" filter="s60" long-name="Help">
-<unit bldFile="app/musicplayer/mpxmusicplayer/help/group"/>
-</component>
-<component name="mpxmusicplayer_commonui" filter="s60" long-name="MPX Common UI">
-<unit bldFile="app/musicplayer/mpxmusicplayer/commonui/group"/>
-</component>
-<component name="mpx_metadatahandler" filter="s60" long-name="MPX Metadata Handler">
-<unit bldFile="app/musicplayer/mpxmusicplayer/metadatahandler/group"/>
-</component>
-<component name="mediakeyhandler" filter="s60" long-name="MPX Media Key Handler">
-<unit bldFile="app/musicplayer/mpxmusicplayer/mediakeyhandler/group"/>
-</component>
-<component name="mpxmusicplayer_app" filter="s60" long-name="MPX Application">
-<unit bldFile="app/musicplayer/mpxmusicplayer/app/group"/>
-</component>
-<component name="mpxmusicplayer_build" filter="s60" long-name="MPX Music Player Build">
-<!-- can the exports be distributed to the above components? -->
-<unit bldFile="app/musicplayer/mpxmusicplayer/group"/>
-</component>
-</collection>
-<collection name="musichomescreen_multiview" long-name="Music Home Screen Multiview" level="hs">
-<!-- Uncomment all units when configuration is in place. All currently #included from musichomescreen_build -->
-<component name="mpxcollectionpublisher" filter="s60" long-name="MPX Collection Publisher" introduced="^2" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/mpxcollectionpublisher/group"/>-->
-</component>
-<component name="musiccontentpublisher" filter="s60" long-name="Music Content Publisher" introduced="^2" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/musiccontentpublisher/group"/>-->
-</component>
-<component name="mcpmusicplayer" filter="s60" long-name="Music Player MCP Plugin" introduced="^2" plugin="Y" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/mcpmusicplayer/group"/>-->
-</component>
-<component name="musicplayeractionhandlerplugin" filter="s60" long-name="Music Player Action Handler Plugin" introduced="^2" plugin="Y" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/musicplayeractionhandlerplugin/group"/>-->
-</component>
-<component name="mpx_data" filter="s60" long-name="MPX Data" introduced="^2" class="placeholder">
-<!-- does this make sense to be a component? should it just be #include from musichomescreen_multiview/group? -->
-<!--<unit bldFile="musichomescreen_multiview/data/themes/default/group"/>-->
-</component>
-<component name="musichomescreen_build" filter="s60" long-name="Music Homescreen Multiview Build" introduced="^2">
-<unit bldFile="app/musicplayer/musichomescreen_multiview/group"/>
-</component>
-</collection>
-<collection name="mpxplugins" long-name="MPX Plugins" level="plugins">
-<component name="serviceplugins" filter="s60" long-name="MPX Service Plugins" plugin="Y">
-<unit bldFile="app/musicplayer/mpxplugins/serviceplugins/group"/>
-</component>
-<component name="viewplugins" filter="s60" long-name="MPX View Plugins" plugin="Y">
-<unit bldFile="app/musicplayer/mpxplugins/viewplugins/group"/>
-</component>
-<component name="mpxplugins_build" filter="s60" long-name="MPX Plugins Build">
-<!-- can the exports be distributed to the above components? -->
-<unit bldFile="app/musicplayer/mpxplugins/group"/>
-</component>
-</collection>
-<collection name="musicplayer_info" long-name="Music Player Apps Info" level="app">
-<component name="musicplayer_build" filter="s60" long-name="Music Player Build">
-<!-- should explicitly #inlcude musicplayerbldvariant.hrh in each component -->
-<unit bldFile="app/musicplayer/group"/>
-</component>
-</collection>
-</block>
-<block name="radio" level="apps" long-name="Radio Apps" levels="engine ui">
-<collection name="fmradio" long-name="FM Radio" level="ui">
-<component name="activeidleengine" filter="s60" long-name="FM Radio Active Idle Engine">
-<unit bldFile="app/radio/fmradio/activeidleengine/group"/>
-</component>
-<component name="fmradioengine" filter="s60" long-name="FM Radio Engine">
-<unit bldFile="app/radio/fmradio/fmradioengine/group"/>
-</component>
-<component name="fmradioactionhandler" filter="s60" long-name="FM Radio Action Handler" plugin="Y">
-<unit bldFile="app/radio/fmradio/fmradioactionhandler/group"/>
-</component>
-<component name="fmradiomcpplugin" filter="s60" long-name="FM Radio Content Publisher Plugin" plugin="Y">
-<unit bldFile="app/radio/fmradio/fmradiomcpplugin/group"/>
-</component>
-<component name="fmradio_build" filter="s60" long-name="FM Radio Build">
-<unit bldFile="app/radio/fmradio/fmradio/group"/>
-</component>
-<component name="fmradio_help" filter="s60" long-name="FM Radio Help">
-<unit bldFile="app/radio/fmradio/help/group"/>
-</component>
-<component name="fmradio_build" filter="s60" long-name="FM Radio ROM">
-<!-- remove above #included bld.infs -->
-<unit bldFile="app/radio/fmradio/group"/>
-</component>
-</collection>
-</block>
-<block name="internetradio" level="apps" long-name="Internet Radio Apps"/>
-<block name="tv" level="services" long-name="TV Apps"/>
-<block name="voicerec" level="apps" long-name="Voice Recorder Apps">
-<!-- custom filter pref_test-->
-<collection name="voicerec_plat" long-name="Voice Recorder Apps Platform Interfaces">
-<component name="new_file_service_api" long-name="New File Service API" filter="s60" class="api">
-<unit bldFile="app/voicerec/voicerec_plat/new_file_service_api/group"/>
-</component>
-<component name="voicerecorder_public_constants_api" long-name="Voice Recorder Public Constants API" filter="s60" class="api">
-<unit bldFile="app/voicerec/voicerec_plat/voicerecorder_public_constants_api/group"/>
-</component>
-</collection>
-<collection name="voicerecorder" long-name="Voice Recorder">
-<!--this is really a component, move down a directory -->
-<component name="voicerecorder_build" filter="s60" long-name="Voice Recorder Build">
-<unit bldFile="app/voicerec/voicerecorder/group"/>
-</component>
-</collection>
-<collection name="voicerec_info" long-name="Voice Recorder Apps Info"/>
-</block>
-<block name="screensaver" level="apps" long-name="Screen Saver Apps" levels="plugin ui">
-<!-- is this a user-facing application or a daemon? -->
-<!-- units need to be commented out until configuration is in place. They are currently #included from screensaver_build-->
-<collection name="scrsaver" long-name="Screen Saver" level="plugin">
-<component name="scrsaverplugins" filter="s60" long-name="Screen Saver Plugins" plugin="Y">
-<!-- must have only one component. #include from a common bld.inf, or move up a directory and make scrsaverplugins a collection -->
-<!--<unit bldFile="scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/"/>
- <unit bldFile="scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/group/"/>-->
-</component>
-<component name="scrsaver_slideshowplugin" filter="s60" long-name="Screen Saver Slideshow Plugin" plugin="Y">
-<!--<unit bldFile="scrsaver/scrsaverplugins/SlideshowPlugin/group"/> -->
-</component>
-<component name="screensaveraiwplugin" filter="s60" long-name="Screen Saver AIW Plugin" plugin="Y">
-<!-- <unit bldFile="scrsaver/screensaveraiwplugin/group"/>-->
-</component>
-</collection>
-<collection name="screensaver_info" long-name="Screen Saver Apps Info" level="ui">
-<component name="screensaver_build" filter="s60" long-name="Screen Saver Application">
-<!--the app should be a separate component -->
-<unit bldFile="app/screensaver/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreen" level="apps" long-name="Home Screen Apps" levels="fw support apps">
-<collection name="homescreen_plat" long-name="Home Screen Apps Platform Interfaces" level="apps">
-<component name="menu_settings_api" long-name="Menu Settings API" filter="s60" class="api">
-<unit bldFile="app/homescreen/homescreen_plat/menu_settings_api/group"/>
-</component>
-<component name="hs_content_control_ui" long-name="HS Content Control Ui" filter="s60" class="api">
-<unit bldFile="app/homescreen/homescreen_plat/hs_content_control_ui/group"/>
-</component>
-<component name="hs_renderingplugin_api" long-name="HS Rendering Plugin API" filter="s60" class="api">
-<unit bldFile="app/homescreen/homescreen_plat/hs_renderingplugin_api/group"/>
-</component>
-</collection>
-<collection name="idlehomescreen" long-name="Idle Home Screen" level="apps">
-<component name="nativeuicontroller" filter="s60" long-name="Native UI Controller">
-<unit bldFile="app/homescreen/idlehomescreen/nativeuicontroller/group"/>
-</component>
-<component name="exths" filter="s60" long-name="Active Idle Container" plugin="Y">
-<!-- why is the ID so different from the name? Is one wrong? -->
-<unit bldFile="app/homescreen/idlehomescreen/exths/group"/>
-</component>
-<component name="hscontentcontrol" filter="s60" long-name="Home Screen Content Control" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/hscontentcontrol/group"/>
-</component>
-<component name="hssapiwrapper" filter="s60" long-name="HS SAPI Wrapper" introduced="^3">
-<!-- can only have one unit. #include from a common bld.inf, or split into two components -->
-<unit bldFile="app/homescreen/idlehomescreen/sapiwrapper/cpswrapper/group"/>
-<unit bldFile="app/homescreen/idlehomescreen/sapiwrapper/hspswrapper/group"/>
-</component>
-<component name="xmluirendering" filter="s60" long-name="XML UI Rendering" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/xmluirendering/group"/>
-</component>
-<component name="xmluicontroller" filter="s60" long-name="XML UI Controller" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/xmluicontroller/group"/>
-</component>
-<component name="widgetmanager" filter="s60" long-name="Widget Manager" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/widgetmanager/group"/>
-</component>
-<component name="idlehomescreen_help" filter="s60" long-name="Idle Home Screen Help">
-<unit bldFile="app/homescreen/idlehomescreen/help/group"/>
-</component>
-<component name="idlehomescreen_data" filter="s60" long-name="Idle Home Screen Data">
-<unit bldFile="app/homescreen/idlehomescreen/data/group"/>
-</component>
-<component name="idlehomescreen_build" filter="s60" long-name="Idle Home Screen Build">
-<!-- can the loc file be moved to another comopnent and this one removed? -->
-<unit bldFile="app/homescreen/idlehomescreen/group"/>
-</component>
-</collection>
-<collection name="menufw" long-name="Menu Framework" level="fw">
-<component name="hierarchynavigator" filter="s60" long-name="Hierarchy Navigator">
-<unit bldFile="app/homescreen/menufw/hierarchynavigator/group"/>
-</component>
-<component name="menufwui" filter="s60" long-name="Menu Framework UI">
-<unit bldFile="app/homescreen/menufw/menufwui/group"/>
-</component>
-<component name="menusuites" filter="s60" long-name="Menu Suites">
-<unit bldFile="app/homescreen/menufw/menusuites/group"/>
-</component>
-<component name="menufw_build" filter="s60" long-name="Menu Framework Build">
-<!-- can the exports be exported by the other components? -->
-<unit bldFile="app/homescreen/menufw/group"/>
-</component>
-</collection>
-<collection name="taskswitcher" long-name="Task Switcher" level="support">
-<component name="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">
-<unit bldFile="app/homescreen/taskswitcher/taskswitcherui/group"/>
-</component>
-</collection>
-</block>
-<block name="graphicsuis" level="services" long-name="Graphics UIs" levels="util ui">
-<collection name="graphicsuis_plat" long-name="Graphics UIs Platform Interfaces" level="ui">
-<component name="svgt_viewer_ui_api" long-name="SVG-T Viewer UI API" filter="s60" class="api">
-<unit bldFile="app/graphicsuis/graphicsuis_plat/svgt_viewer_ui_api/group"/>
-</component>
-<component name="svg_application_observer_utility_api" long-name="SVG Application Observer Utility API" filter="s60" class="api">
-<unit bldFile="app/graphicsuis/graphicsuis_plat/svg_application_observer_utility_api/group"/>
-</component>
-<component name="svgt_file_view_details_dialog_api" long-name="SVG-T File View Details Dialog API" filter="s60" class="api">
-<unit bldFile="app/graphicsuis/graphicsuis_plat/svgt_file_view_details_dialog_api/group"/>
-</component>
-</collection>
-<collection name="svgtviewer" long-name="SVG-T Viewer" level="ui">
-<component name="svgtviewerplugin" filter="s60" long-name="SVG-T Viewer Plugin">
-<unit bldFile="app/graphicsuis/svgtviewer/svgtviewerplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="profile" level="apps" long-name="Profiles" levels="app">
-<collection name="profile_plat" long-name="Profiles Platform Interfaces" level="app">
-<component name="profiles_settings_view_api" long-name="Profiles Settings View API" filter="s60" class="api">
-<unit bldFile="app/profile/profile_plat/profiles_settings_view_api/group"/>
-</component>
-</collection>
-<collection name="profilesapplication" long-name="Profiles Application" level="app">
-<component name="profiles" filter="s60" long-name="Profiles">
-<unit bldFile="app/profile/profilesapplication/profiles/group"/>
-</component>
-</collection>
-<collection name="profile_info" long-name="Profiles Info" level="app">
-<component name="profile_help" filter="s60" long-name="Profiles Help">
-<unit bldFile="app/profile/help/group"/>
-</component>
-</collection>
-</block>
-<block name="speechsrv" level="services" long-name="Speech Recognition UIs" levels="engine framework ui">
-<collection name="speechsrv_plat" long-name="Speech Recognition UIs Platform Interfaces" level="ui">
-<component name="vas_api" long-name="VAS API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vas_api/group"/>
-</component>
-<component name="nss_devasr_api" long-name="NSS DevASR API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_devasr_api/group"/>
-</component>
-<component name="tts_hw_device_api" long-name="TTS HW Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/tts_hw_device_api/group"/>
-</component>
-<component name="voice_commands_resource_header_api" long-name="Voice Commands Resource Header API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/voice_commands_resource_header_api/group"/>
-</component>
-<component name="nss_mmf_tts_custom_commands_api" long-name="NSS MMF TTS Custom Commands API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_mmf_tts_custom_commands_api/group"/>
-</component>
-<component name="srsf_cenrep_settings_api" long-name="SRSF CenRep Settings API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/srsf_cenrep_settings_api/group"/>
-</component>
-<component name="voice_ui_plugin_api" long-name="Voice UI Plug-in API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/voice_ui_plugin_api/group"/>
-</component>
-<component name="nss_tts_utility_api" long-name="NSS TTS Utility API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_tts_utility_api/group"/>
-</component>
-<component name="nss_srs_custom_commands_api" long-name="NSS SRS Custom Commands API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_srs_custom_commands_api/group"/>
-</component>
-<component name="srsf_secondarydisplay_api" long-name="SRSF Secondary Display API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/srsf_secondarydisplay_api/group"/>
-</component>
-<component name="asrs_hw_device_api" long-name="ASRS Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/asrs_hw_device_api/group"/>
-</component>
-<component name="vas_vcommand_api" long-name="VAS Voice Command API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vas_vcommand_api/group"/>
-</component>
-<component name="adaptation_hw_device_api" long-name="Adaptation Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/adaptation_hw_device_api/group"/>
-</component>
-<component name="nss_devtts_api" long-name="NSS DevTTS API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_devtts_api/group"/>
-</component>
-<component name="nss_srs_utility_api" long-name="NSS SRS Utility API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_srs_utility_api/group"/>
-</component>
-<component name="recognition_hw_device_api" long-name="Recognition Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/recognition_hw_device_api/group"/>
-</component>
-<component name="vas_contact_handler_api" long-name="VAS Contact Handler API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vas_contact_handler_api/group"/>
-</component>
-<component name="nlp_hw_device" long-name="NLP Hardware Device" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nlp_hw_device/group"/>
-</component>
-<component name="nss_si_speech_recognition_data_api" long-name="NSS SI Speech Recognition Data API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_si_speech_recognition_data_api/group"/>
-</component>
-<component name="nss_tts_common_api" long-name="NSS TTS Common API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_tts_common_api/group"/>
-</component>
-<component name="grcompiler_hw_device_api" long-name="Grammar Compiler Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/grcompiler_hw_device_api/group"/>
-</component>
-<component name="ttp_hw_device_api" long-name="TTP Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/ttp_hw_device_api/group"/>
-</component>
-<component name="vocman_hw_device_api" long-name="VocMan Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vocman_hw_device_api/group"/>
-</component>
-<component name="speech_synthesis_clientserver_api" long-name="Speech Synthesis Client-Server API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/speech_synthesis_clientserver_api/group"/>
-</component>
-<component name="voice_ui_accessory_button_handling_api" long-name="Voice UI Accessory Button Handling API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/voice_ui_accessory_button_handling_api/group"/>
-</component>
-<component name="ui_voice_recognition_api" long-name="UI Voice Recognition API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/ui_voice_recognition_api/group"/>
-</component>
-<component name="vcommand_settings_cenrep_api" long-name="Voice Command Settings CenRep API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vcommand_settings_cenrep_api/group"/>
-</component>
-</collection>
-<collection name="voiceui" long-name="Voice UI" level="ui">
-<component name="vcommand" filter="s60" long-name="Voice Commands UI" introduced="^1">
-<unit bldFile="app/speechsrv/voiceui/vcommand/group"/>
-</component>
-<component name="voiceuivoicerecognition" filter="s60" long-name="Voice UI Recognition" introduced="^1">
-<unit bldFile="app/speechsrv/voiceui/voiceuivoicerecognition/group"/>
-</component>
-<component name="pbkinfoviewimpl" filter="s60" long-name="Phonebook Info View Implementation" introduced="^1">
-<unit bldFile="app/speechsrv/voiceui/pbkinfoviewimpl/group"/>
-</component>
-<component name="aiwpbkinfoviewprovider" filter="s60" long-name="AIW Phonebook Info View Provider" introduced="^1" plugin="Y">
-<unit bldFile="app/speechsrv/voiceui/aiwpbkinfoviewprovider/group"/>
-</component>
-<component name="vccontrolpanelplugin" filter="s60" long-name="Voice Commands Control Panel Plugin" introduced="^1" plugin="Y">
-<!-- component is commented out until configuration is in place. Currently #included from voiceui_build -->
-<!--<unit bldFile="voiceui/vccontrolpanelplugin/group"/>-->
-</component>
-<component name="voiceui_build" filter="s60" long-name="Voice UI Build" introduced="^1">
-<!-- can this be put into the other components? -->
-<unit bldFile="app/speechsrv/voiceui/group"/>
-</component>
-</collection>
-<collection name="srsf" long-name="Speech Recognition and Synthesis Framework" level="framework">
-<component name="sispeechrecognitiondata" filter="s60" long-name="SI Speech Recognition Data">
-<unit bldFile="app/speechsrv/srsf/sispeechrecognitiondata/group"/>
-</component>
-<component name="ttscommon" filter="s60" long-name="TTS Common">
-<unit bldFile="app/speechsrv/srsf/ttscommon/group"/>
-</component>
-<component name="devtts" filter="s60" long-name="Text to Speech">
-<unit bldFile="app/speechsrv/srsf/devtts/group"/>
-</component>
-<component name="ttscustomcommands" filter="s60" long-name="TTS Custom Commands">
-<unit bldFile="app/speechsrv/srsf/ttscustomcommands/group"/>
-</component>
-<component name="ttscontrollerplugin" filter="s60" long-name="TTS Controller Plugin" plugin="Y">
-<unit bldFile="app/speechsrv/srsf/ttscontrollerplugin/group"/>
-</component>
-<component name="ttsutility" filter="s60" long-name="TTS Utility">
-<unit bldFile="app/speechsrv/srsf/ttsutility/group"/>
-</component>
-<component name="speechsynthesis" filter="s60" long-name="Speech Synthesis">
-<!-- can only have one unit. #include these from a common bld.inf -->
-<unit bldFile="app/speechsrv/srsf/speechsynthesis/client/group"/>
-<unit bldFile="app/speechsrv/srsf/speechsynthesis/server/group"/>
-</component>
-<component name="devasr" filter="s60" long-name="Audio Recording and Speech Recognition">
-<unit bldFile="app/speechsrv/srsf/devasr/group"/>
-</component>
-<component name="sicc" filter="s60" long-name="Speaker Independent Custom Commands">
-<unit bldFile="app/speechsrv/srsf/sicc/group"/>
-</component>
-<component name="sisrscontrollerplugin" filter="s60" long-name="SI SRS Controller Plugin" plugin="Y">
-<unit bldFile="app/speechsrv/srsf/sisrscontrollerplugin/group"/>
-</component>
-<component name="siutility" filter="s60" long-name="Speaker Independent Utility">
-<unit bldFile="app/speechsrv/srsf/siutility/group"/>
-</component>
-<component name="nssvasapi" filter="s60" long-name="NSS VAS API">
-<unit bldFile="app/speechsrv/srsf/nssvasapi/group"/>
-</component>
-<component name="nssvascontacthdlr" filter="s60" long-name="NSS VAS Contact Handler">
-<unit bldFile="app/speechsrv/srsf/nssvascontacthdlr/group"/>
-</component>
-<component name="vcommandhandler" filter="s60" long-name="Voice Command Handler">
-<unit bldFile="app/speechsrv/srsf/vcommandhandler/group"/>
-</component>
-<component name="vuiphandler" filter="s60" long-name="Voice UI Plugin Handler">
-<unit bldFile="app/speechsrv/srsf/vuiphandler/group"/>
-</component>
-<component name="vcommandexecutor" filter="s60" long-name="Voice Command Executor">
-<unit bldFile="app/speechsrv/srsf/vcommandexecutor/group"/>
-</component>
-<component name="vcommandexecutorbearer" filter="s60" long-name="Voice Command Executor Bearer">
-<unit bldFile="app/speechsrv/srsf/vcommandexecutorbearer/group"/>
-</component>
-<component name="vcommandmanager" filter="s60" long-name="Voice Command Manager">
-<unit bldFile="app/speechsrv/srsf/vcommandmanager/group"/>
-</component>
-<component name="vcexecutorapp" filter="s60" long-name="Voice Command Executor Application">
-<unit bldFile="app/speechsrv/srsf/vcexecutorapp/group"/>
-</component>
-<component name="profileobserverplugin" filter="s60" long-name="Profile Observer Plugin" plugin="Y">
-<unit bldFile="app/speechsrv/srsf/profileobserverplugin/group"/>
-</component>
-<component name="srsf_build" filter="s60" long-name="Speech Recognition and Synthesis Framework Build">
-<!-- should distribute this into the above components -->
-<unit bldFile="app/speechsrv/srsf/group"/>
-</component>
-</collection>
-<collection name="speechsrv_info" long-name="Speech Recognition UIs Info" level="ui"/>
-</block>
-<block name="homescreentools" level="services" long-name="Home Screen Tools" levels="tool install">
-<collection name="dtdinstaller" long-name="DTD Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<!-- this needs to be built first, does build order need to be forced with filters? -->
-<component name="dtdinstaller_build" filter="s60" long-name="DTD Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/dtdinstaller/group"/>
-</component>
-</collection>
-<collection name="themeinstaller" long-name="Theme Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="themeinstaller_build" filter="s60" long-name="Theme Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/themeinstaller/group"/>
-</component>
-</collection>
-<collection name="widgettools" long-name="Widget Tools" level="install">
-<component name="hspluginpreinstaller" filter="s60" long-name="HS Plugin Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/hspluginspreinstaller/group"/>
-</component>
-<component name="wrtwidgetpreinstaller" filter="s60" long-name="WRT Widget Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
-</component>
-</collection>
-</block>
-<block name="webuis" level="services" long-name="Web UIs" levels="plugin app">
-<collection name="browserui" long-name="Browser UI" level="app">
-<component name="browser" filter="s60" long-name="Browser">
-<unit bldFile="app/webuis/browserui/browser/group"/>
-</component>
-<component name="operatormenu" filter="s60" long-name="Browser Operator Menu">
-<unit bldFile="app/webuis/browserui/operatormenu/group"/>
-</component>
-<component name="videoservices" filter="s60" long-name="Browser Video Services">
-<unit bldFile="app/webuis/browserui/videoservices/group"/>
-</component>
-</collection>
-<collection name="browserplugins" long-name="Browser Plugins" level="plugin">
-<component name="browsersysteminfoplugin" filter="s60" long-name="Browser System Info Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsersysteminfoplugin/group"/>-->
-</component>
-<component name="browsergpsplugin" filter="s60" long-name="Browser GPS Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsergpsplugin/group"/>-->
-</component>
-<component name="browseraudiovideoplugin" filter="s60" long-name="Browser Audio Video Plugin" plugin="Y">
-<unit bldFile="app/webuis/browserplugins/browseraudiovideoplugin/group"/>
-</component>
-<component name="browserplugins_build" filter="s60" long-name="Browser Plugins Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="app/webuis/browserplugins/group"/>
-</component>
-</collection>
-<collection name="pushmtm" long-name="Push MTM" level="plugin">
-<component name="pushmtm_help" filter="s60" long-name="Push MTM Help">
-<unit bldFile="app/webuis/pushmtm/help/group"/>
-</component>
-<component name="plugins" filter="s60" long-name="Push MTM Plugins" plugin="Y">
-<unit bldFile="app/webuis/pushmtm/plugins/group"/>
-</component>
-<component name="pushmtm_build" filter="s60" long-name="Push MTM Build">
-<!-- Some content is at collection level and some is at comopnent level. Either make this a single
- component and move it down a diretcory, or make separate independent components in this collection -->
-<unit bldFile="app/webuis/pushmtm/group"/>
-</component>
-</collection>
-</block>
-<block name="jrt" level="services" long-name="Java Runtime" levels="util generic rt ui">
-<collection name="jrt_plat" long-name="JRT Platform Interfaces" level="ui">
-<component name="java_registry_api" long-name="Java Registry API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_registry_api/build"/>
-</component>
-<component name="java_env_info_api" long-name="Java Environment Info API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_env_info_api/build"/>
-</component>
-<component name="java_debug_api" long-name="Java Debug API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_debug_api/build"/>
-</component>
-</collection>
-<collection name="java_stubs" long-name="Java Stubs" level="util">
-<!-- uncomment all components when configuration is in place. Currently #included from jrt_build -->
-<component name="javadrmutils" long-name="Java DRM Utils" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtdrmutils/group"/>-->
-</component>
-<component name="javaenvinfo" long-name="Java Environment Info" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtenvinfo/group"/>-->
-</component>
-<component name="javaregistry" filter="s60,sf_build" long-name="Java Registry" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtregistry/clientserver/client/group"/>-->
-</component>
-<component name="java_stubs_build" filter="s60,sf_build" long-name="Java Stubs ROM" class="placeholder">
-<!-- Remove the #includes and rename JRT ROM-->
-<!--<unit bldFile="java_stubs/group"/>-->
-</component>
-</collection>
-<collection name="jrt_info" long-name="JRT Info" level="rt">
-<component name="jrt_build" filter="s60" long-name="JRT Build">
-<!-- needed for __JAVA_STUBS condition -->
-<unit bldFile="app/jrt/group"/>
-</component>
-</collection>
-</block>
-<block name="conntools" level="services" long-name="Connectivity Tools" levels="config app">
-<collection name="nettools" long-name="Net Tools" level="app">
-<component name="conntest" filter="s60" long-name="Connection Test" purpose="development">
-<unit bldFile="app/conntools/nettools/conntest/group"/>
-</component>
-</collection>
-<collection name="emulatorlan" long-name="Emulator LAN" level="config">
-<!-- component is actually a colleciton, should be moved down a directory -->
-<component name="emulatorlan_build" filter="s60" long-name="Emulator LAN Build" purpose="development" class="config">
-<unit bldFile="app/conntools/emulatorlan/group"/>
-</component>
-</collection>
-</block>
-<block name="rndtools" level="services" long-name="R&D tools" levels="support generic test util">
-<collection name="creator" long-name="Creator" level="support">
-<!-- collection is really a component. Should move down a directory -->
-<component name="creator_build" filter="s60" long-name="Creator Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/creator/group"/>
-</component>
-</collection>
-<collection name="filebrowser" long-name="File Browser" level="util">
-<!-- consider collapsing into a single component -->
-<component name="fileopserver" filter="s60" long-name="File Operations Server" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
-</component>
-<component name="fileopclient" filter="s60" long-name="File Operations Client" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!--<unit bldFile="filebrowser/fileopclient/group"/>-->
-</component>
-<component name="filebrowser_build" filter="s60" long-name="File Browser Application" purpose="development" class="tool">
-<!-- Need to make this a self-contained component by removing #includes. Can only do when configuration is in place-->
-<unit bldFile="app/rndtools/filebrowser/group"/>
-</component>
-</collection>
-<collection name="launcher" long-name="Launcher" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="launcher_build" filter="s60" long-name="Launcher Utility" purpose="development" class="tool">
-<unit bldFile="app/rndtools/launcher/group"/>
-</component>
-</collection>
-<collection name="loadgen" long-name="Load Generator" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="loadgen_build" filter="s60" long-name="Load Generator Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/loadgen/group"/>
-</component>
-</collection>
-<collection name="perfmon" long-name="Performance Monitor" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="perfmon_build" filter="s60" long-name="Performance Monitor Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/perfmon/group"/>
-</component>
-</collection>
-<collection name="screengrabber" long-name="Screen Grabber" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="screengrabber_build" filter="s60" long-name="ScreenGrabber" purpose="development" class="tool">
-<unit bldFile="app/rndtools/screengrabber/group"/>
-</component>
-</collection>
-<collection name="stifui" long-name="STIF UI" level="generic">
-<component name="stifui_stifui" filter="s60" long-name="STIF UI" purpose="development">
-<unit bldFile="app/rndtools/stifui/stifui/group"/>
-</component>
-<component name="uitestserverstarter" filter="s60" long-name="UI Test Server Starter" purpose="development">
-<unit bldFile="app/rndtools/stifui/uitestserverstarter/group"/>
-</component>
-<component name="stifui_build" filter="s60" long-name="STIF UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/stifui/group"/>
-</component>
-</collection>
-<collection name="memspyui" long-name="Memspy UI" level="generic">
-<!-- collection is really a component. Should move down a directory -->
-<component name="memspyui_build" filter="s60" long-name="Memspy UI Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/memspyui/group"/>
-</component>
-</collection>
-<collection name="htiui" long-name="Harmonized Test Interface UI" level="generic">
-<component name="HtiCommPlugins" filter="s60" long-name="HTI Comm Plugins" purpose="development" plugin="Y">
-<unit bldFile="app/rndtools/htiui/HtiCommPlugins/HtiBtCommPlugin/group"/>
-</component>
-<component name="HtiServicePlugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- can only have a single unit. Should #include from a common bld.inf file -->
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiFtpBackupFake/group"/>
-</component>
-<component name="htidevicereboot" filter="s60" long-name="HTI Device Reboot" purpose="development">
-<unit bldFile="app/rndtools/htiui/htidevicereboot/group"/>
-</component>
-<component name="htistartupwait" filter="s60" long-name="HTI Startup Wait" purpose="development">
-<unit bldFile="app/rndtools/htiui/htistartupwait/group"/>
-</component>
-<component name="htiadmin" filter="s60" long-name="HTI Admin" purpose="development">
-<unit bldFile="app/rndtools/htiui/htiadmin/group"/>
-</component>
-<component name="htiui_build" filter="s60" long-name="HTI UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/htiui/group"/>
-</component>
-</collection>
-</block>
-<block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools if ui">
-<collection name="csxhelp" long-name="Context Sensitive Extended Help" level="if">
-<!-- this is really a component. Should move it down a directory -->
-<component name="csxhelp_build" filter="s60" long-name="Context Sensitive Extended Help Build">
-<unit bldFile="app/helps/csxhelp/group"/>
-</component>
-</collection>
-<collection name="symhelp" long-name="Symbian Help" level="eng">
-<component name="helpmodel" long-name="Help" introduced="6.0" purpose="optional">
-<unit bldFile="app/helps/symhelp/helpmodel/group" mrp="app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
-</component>
-</collection>
-<collection name="helps_info" long-name="Help Apps Info" level="ui">
-<component name="helps_metadata" long-name="Help Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/helps/helps_info/helps_metadata/helps_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
-<collection name="buildverification" long-name="Build Verification" level="services">
-<component name="autosmoketest" long-name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
-<unit bldFile="app/techview/buildverification/autosmoketest/Group" mrp="app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
-</component>
-<component name="smoketest" long-name="Smoke Test" filter="gt" purpose="development">
-<unit bldFile="app/techview/buildverification/smoketest/Group" mrp="app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
-</component>
-</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="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"/>
-<collection name="installationapps" long-name="Installation Apps" level="apps2"/>
-<collection name="messagingapps" long-name="Messaging Apps" level="apps2"/>
-<collection name="telephonyapps" long-name="Telephony Apps" level="apps1"/>
-<collection name="networkingapps" long-name="Networking Apps" level="apps1"/>
-<collection name="networkingutils" long-name="Networking Utils" level="utils"/>
-<collection name="shortlinkapps" long-name="Shortlink Apps" level="apps1"/>
-<collection name="testapps" long-name="Test Apps" level="utils"/>
-<collection name="avapps" long-name="A/V Apps" level="apps3"/>
-<collection name="toolkit" long-name="Toolkit" level="utils"/>
-<collection name="techview_info" long-name="Techview Info" level="apps3">
-<component name="techview_metadata" long-name="Techview Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/techview/techview_info/techview_metadata/techview_metadata.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
--- a/symbian3/single/sysdefs/auto/model_20100429125314_ca5a2c685f32.xml Wed May 05 12:21:47 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10837 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a package or prebuilt -->
-<!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) "N"
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile may someday be removed in favour of mrp -->
-<!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
-<systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="low mw high">
-<block name="stubs" level="high" long-name="Stubs" levels="stub">
-<collection name="s60_stubs" level="stub">
-<component name="audiostubs" long-name="Audio Stubs">
-<unit bldFile="adaptation/stubs/audiostubs/group"/>
-</component>
-<component name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaptation Stub">
-<unit bldFile="adaptation/stubs/btaudioadaptation_stub/group"/>
-</component>
-<component name="drm_stubs" long-name="DRM Stubs">
-<unit bldFile="adaptation/stubs/drm_stubs/group"/>
-</component>
-<component name="ocrsrv_stub" long-name="OCR Services Stub">
-<unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
-</component>
-<component name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation">
-<unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
-</component>
-<component name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" plugin="Y">
-<unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
-</component>
-<component name="srsfenginestub" long-name="SRSF Engine Stub">
-<unit bldFile="adaptation/stubs/srsfenginestub/group"/>
-</component>
-<component name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub">
-<unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
-</component>
-<component name="systemswstubs" long-name="System Software Stubs">
-<unit bldFile="adaptation/stubs/systemswstubs/group"/>
-</component>
-<component name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" plugin="Y">
-<unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
-</component>
-<component name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub">
-<unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
-<collection name="omap3530" long-name="OMAP 3530" level="hw-if">
-<component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530" mrp="adaptation/beagleboard/omap3530/base_beagle.mrp"/>
-</component>
-<component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/kernel"/>
-</component>
-<component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/beagleboard"/>
-</component>
-</collection>
-</block>
-<block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
-<collection name="qemu_baseport" long-name="Baseport" level="hw-if">
-<component name="syborg" long-name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/qemu/baseport/syborg" mrp="adaptation/qemu/baseport/syborg/syborg.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
-<collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
-<component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
-<unit mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
-</component>
-</collection>
-<collection name="bsptemplate" long-name="Board Support Package Template" level="hw-if">
-<component name="asspandvariant" long-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 name="kernel" long-name="Kernel Architecture" level="adaptation">
-<component name="eka" long-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 name="kerneltest" long-name="Kernel Test" level="hw-if">
-<component name="e32utils" long-name="E32 Utilities" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32utils/group" mrp="os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/>
-</component>
-<component name="e32test" long-name="E32 Tests" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32test/group" mrp="os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
-</component>
-<component name="f32test" long-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 name="ldds" long-name="Logical Device Drivers" level="adaptation">
-<component name="ethernetldd" long-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 name="audioldd" long-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>
-<component name="serialldd" long-name="Serial Port Drivers" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
-</component>
-<component name="legacydrivers" long-name="Legacy Drivers" purpose="optional">
-<unit mrp="os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
-</component>
-<component name="locmedia" long-name="Local Media Subsystem" introduced="8.1b" purpose="mandatory">
-<!-- these are LDDs for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
-</component>
-<component name="runmodedebugger" long-name="Run Mode Debugger" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/debug/group" mrp="os/kernelhwsrv/kernel/eka/drivers/debug/group/base_e32_drivers_debug.mrp"/>
-</component>
-<component name="btrace" long-name="Kernel Trace Tool" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/trace" mrp="os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
-</component>
-<component name="cameraldd" long-name="Camera Drivers" introduced="^3" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/camerasc" mrp="os/kernelhwsrv/kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
-</component>
-<component name="displayldd" long-name="Display Drivers" introduced="^3" purpose="optional">
-<!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/display" mrp="os/kernelhwsrv/kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
-</component>
-<component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
-</component>
-</collection>
-<collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
-<component name="mediadrivers" long-name="Media Drivers" purpose="optional">
-<!-- these are for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/media" mrp="os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
-</component>
-<component name="genericboardsupport" long-name="Generic Board Support" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
-</component>
-</collection>
-<collection name="userlibandfileserver" long-name="User Library and File Server" level="framework">
-<component name="euser" long-name="User Library" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/euser" mrp="os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
-</component>
-<component name="compsupp" long-name="Compiler Runtime Support" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/compsupp" mrp="os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
-</component>
-<component name="fileserver" long-name="File Server" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
-</component>
-<component name="estart" long-name="Base Starter" filter="gt" purpose="optional">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
-</component>
-<component name="domainmgr" long-name="Domain Manager" introduced="8.1b" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
-</component>
-</collection>
-<collection name="filesystems" long-name="File Systems" level="framework">
-<component name="romfs" long-name="ROM File System" filter="gt" purpose="optional" plugin="Y">
-<unit mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
-</component>
-<component name="rofs" long-name="ROFS" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
-</component>
-<component name="usbmsfs" long-name="USB Mass Storage File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
-</component>
-<component name="usbhostmssrv" long-name="USB Host Mass Storage Server" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage/base_f32_shostmassstorage.mrp"/>
-</component>
-<component name="fat32fs" long-name="FAT32 File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
-</component>
-<component name="fatfs" long-name="FAT File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
-</component>
-<component name="compfs" long-name="Composite File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
-</component>
-</collection>
-<collection name="halservices" long-name="HAL Services" level="framework">
-<component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
-<unit bldFile="os/kernelhwsrv/halservices/hal" mrp="os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
-</component>
-</collection>
-<collection name="textmodeshell" long-name="Text Mode Shell" level="test">
-<component name="e32wsrv" long-name="Text Window Server" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/ewsrv" mrp="os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
-</component>
-<component name="textshell" long-name="Text Shell" filter="gt" purpose="development">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
-</component>
-</collection>
-<collection name="baseapitest" long-name="Base API Tests" level="test"/>
-<collection name="kernelhwsrv_info" long-name="Kernel and Hardware Services Info" level="test">
-<component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 config">
-<collection name="emulator" long-name="Emulator" level="bsp">
-<component name="emulatorbsp" long-name="Emulator BSP" purpose="optional">
-<unit bldFile="os/boardsupport/emulator/emulatorbsp" mrp="os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
-</component>
-</collection>
-<collection name="haitest" long-name="HAI Test Suites" level="test">
-<component name="bspsvs" long-name="BSP Verification Suite" introduced="^2" purpose="development">
-<unit mrp="os/boardsupport/haitest/bspsvs/group/bspsvs.mrp"/>
-</component>
-</collection>
-<collection name="boardsupport_info" long-name="Board Support Info" level="config">
-<component name="boardsupport_metadata" long-name="Board Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/boardsupport/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
-<collection name="bldsystemtools" long-name="Build System Tools" level="bld">
-<component name="sysdeftools" long-name="System Definition Tools" purpose="development" introduced="^2">
-<unit mrp="os/buildtools/bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
-</component>
-<component name="commonbldutils" long-name="Common Utils" purpose="development">
-<unit mrp="os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
-</component>
-</collection>
-<collection name="toolsandutils" long-name="Tools and Utils" level="mw">
-<component name="productionbldtools" long-name="Production Build Tools" filter="gt" purpose="development">
-<unit mrp="os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
-</component>
-<component name="e32tools" long-name="E32 Tools" deprecated="^2" purpose="development" class="PC">
-<unit bldFile="os/buildtools/toolsandutils/e32tools/group" mrp="os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
-</component>
-<component name="autotest" long-name="Autotest" purpose="development">
-<unit bldFile="os/buildtools/toolsandutils/autotest/group" mrp="os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
-</component>
-</collection>
-<collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
-<component name="e32toolp" long-name="E32 Perl Tools" purpose="development" filter="sf_build" class="PC">
-<unit mrp="os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="os/buildtools/sbsv1_os/e32toolp/group"/>
-</component>
-</collection>
-<collection name="imgtools_os" long-name="Image Tools" level="fw">
-<component name="romkiteka2" long-name="ROMKIT EKA2" deprecated="^2" purpose="development">
-<unit bldFile="os/buildtools/imgtools_os/romkiteka2/group" mrp="os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
-</component>
-</collection>
-<collection name="misccomponents" long-name="Misc Components" level="mw">
-<component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt" purpose="development">
-<unit bldFile="os/buildtools/misccomponents/emulatorlauncher/group" mrp="os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
-</component>
-</collection>
-<collection name="buildtools_info" long-name="Build Tools Info" level="ui">
-<component name="buildtools_metadata" long-name="Build Tools Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/buildtools/buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
-<collection name="ossrv_pub" long-name="Generic OS Services Public Interfaces" level="utilities">
-<component name="boost_apis" long-name="Boost APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/boost_apis/group"/>
-</component>
-<component name="cpp_wrappers" long-name="Cpp wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cpp_wrappers/group"/>
-</component>
-<component name="character_type_apis" long-name="Character Type APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/character_type_apis/group"/>
-</component>
-<component name="compiler_specific_runtime_support" long-name="Compiler Specific Runtime Support" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/compiler_specific_runtime_support/group"/>
-</component>
-<component name="ossrv_configuration_api" long-name="Generic OS Services Configuration API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/configuration/group"/>
-</component>
-<component name="crypto_authentication_codes_and_hash_functions_api" long-name="Crypto Authentication Codes and Hash Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
-</component>
-<component name="crypto_auxillary_functions_api" long-name="Crypto Auxillary Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_auxillary_functions_api/group"/>
-</component>
-<component name="crypto_certificates_api" long-name="Crypto Certificates API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_certificates_api/group"/>
-</component>
-<component name="crypto_inputoutput_and_data_encoding_api" long-name="Crypto Input/Output and Data Encoding API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
-</component>
-<component name="crypto_public_key_cryptography_and_key_agreement_api" long-name="Crypto Public Key Cryptography and Key Agreement API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
-</component>
-<component name="crypto_symmetric_ciphers_api" long-name="Crypto Symmetric Ciphers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_symmetric_ciphers_api/group"/>
-</component>
-<component name="crypto_utility_functions_api" long-name="Crypto Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_utility_functions_api/group"/>
-</component>
-<component name="cryptogaphy_related_api" long-name="Cryptogaphy Related API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cryptogaphy_related_api/group"/>
-</component>
-<component name="ossrv_debug_api" long-name="Generic OS Services Debug API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/debug/group"/>
-</component>
-<component name="ossrv_exceptions_api" long-name="Generic OS Services Exceptions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/exceptions/group"/>
-</component>
-<component name="gboxed" long-name="GBoxed API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gboxed/group"/>
-</component>
-<component name="glib_arrays" long-name="Glib Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_arrays/group"/>
-</component>
-<component name="glib_asynchronous_queues" long-name="Glib Asynchronous Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_asynchronous_queues/group"/>
-</component>
-<component name="glib_atomic_operations" long-name="Glib Atomic Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_atomic_operations/group"/>
-</component>
-<component name="glib_automatic_string_completion" long-name="Glib Automatic String Completion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_automatic_string_completion/group"/>
-</component>
-<component name="glib_balanced_binary_trees" long-name="Glib Balanced Binary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_balanced_binary_trees/group"/>
-</component>
-<component name="glib_basic_types" long-name="Glib Basic Types API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_basic_types/group"/>
-</component>
-<component name="glib_caches" long-name="Glib Caches API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_caches/group"/>
-</component>
-<component name="glib_character_set_conversion" long-name="Glib Character Set Conversion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_character_set_conversion/group"/>
-</component>
-<component name="glib_closures" long-name="Glib Closures API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_closures/group"/>
-</component>
-<component name="glib_commandline_option_parser" long-name="Glib Command Line Option Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_commandline_option_parser/group"/>
-</component>
-<component name="glib_datasets" long-name="Glib Datasets API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_datasets/group"/>
-</component>
-<component name="glib_date_and_time_functions" long-name="Glib Date and Time Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_date_and_time_functions/group"/>
-</component>
-<component name="glib_doubleended_queues" long-name="Glib Double-ended Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doubleended_queues/group"/>
-</component>
-<component name="glib_doublylinked_lists" long-name="Glib Doubly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doublylinked_lists/group"/>
-</component>
-<component name="glib_dynamic_loading_of_modules" long-name="Glib Dynamic Loading of Modules API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_dynamic_loading_of_modules/group"/>
-</component>
-<component name="glib_enums_and_flags" long-name="Glib Enums and Flags API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_enums_and_flags/group"/>
-</component>
-<component name="glib_error_reporting" long-name="Glib Error Reporting API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_error_reporting/group"/>
-</component>
-<component name="glib_file_utilities" long-name="Glib File Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_file_utilities/group"/>
-</component>
-<component name="glib_generic_values" long-name="Glib Generic Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_generic_values/group"/>
-</component>
-<component name="glib_globstyle_pattern_matching" long-name="Glib Glob-Style Pattern Matching API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_globstyle_pattern_matching/group"/>
-</component>
-<component name="glib_hash_tables" long-name="Glib Hash Tables API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hash_tables/group"/>
-</component>
-<component name="glib_hook_functions" long-name="Glib Hook Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hook_functions/group"/>
-</component>
-<component name="glib_internationalization" long-name="Glib Internationalization API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_internationalization/group"/>
-</component>
-<component name="glib_io_channels" long-name="Glib I/O Channels API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_io_channels/group"/>
-</component>
-<component name="glib_keyvalue_file_parser" long-name="Glib Key-Value File Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_keyvalue_file_parser/group"/>
-</component>
-<component name="glib_lexical_scanner" long-name="Glib Lexical Scanner API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_lexical_scanner/group"/>
-</component>
-<component name="glib_main_event_loop" long-name="Glib Main Event Loop API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_main_event_loop/group"/>
-</component>
-<component name="glib_memory_allocation" long-name="Glib Memory Allocation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_allocation/group"/>
-</component>
-<component name="glib_memory_slices" long-name="Glib Memory Slices API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_slices/group"/>
-</component>
-<component name="glib_message_logging" long-name="Glib Message Logging API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_message_logging/group"/>
-</component>
-<component name="glib_miscellaneous_utility_functions" long-name="Glib Miscellaneous Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_miscellaneous_utility_functions/group"/>
-</component>
-<component name="glib_nary_trees" long-name="Glib N-ary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_nary_trees/group"/>
-</component>
-<component name="glib_parameters_and_values" long-name="Glib Parameters and Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_parameters_and_values/group"/>
-</component>
-<component name="glib_quarks" long-name="Glib Quarks API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_quarks/group"/>
-</component>
-<component name="glib_random_numbers" long-name="Glib Random Numbers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_random_numbers/group"/>
-</component>
-<component name="glib_relations_and_tuples" long-name="Glib Relations and Tuples API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_relations_and_tuples/group"/>
-</component>
-<component name="glib_shellrelated_utilities" long-name="Glib Shell-related Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_shellrelated_utilities/group"/>
-</component>
-<component name="glib_signals" long-name="Glib Signals API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_signals/group"/>
-</component>
-<component name="glib_simple_xml_subset_parser" long-name="Glib Simple XML Subset Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_simple_xml_subset_parser/group"/>
-</component>
-<component name="glib_singlylinked_lists" long-name="Glib Singly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_singlylinked_lists/group"/>
-</component>
-<component name="glib_spawning_processes" long-name="Glib Spawning Processes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_spawning_processes/group"/>
-</component>
-<component name="glib_standard_macros" long-name="Glib Standard Macros API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_standard_macros/group"/>
-</component>
-<component name="glib_string_utility_functions" long-name="Glib String Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_string_utility_functions/group"/>
-</component>
-<component name="glib_strings" long-name="Glib Strings API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_strings/group"/>
-</component>
-<component name="glib_thread_pools" long-name="Glib Thread Pools API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_thread_pools/group"/>
-</component>
-<component name="glib_threads" long-name="Glib Threads API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_threads/group"/>
-</component>
-<component name="glib_timers" long-name="Glib Timers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_timers/group"/>
-</component>
-<component name="glib_unicode_manipulation" long-name="Glib Unicode Manipulation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_unicode_manipulation/group"/>
-</component>
-<component name="glib_value_arrays" long-name="Glib Value Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_value_arrays/group"/>
-</component>
-<component name="glib_varargs_value_collection" long-name="Glib Varargs Value Collection API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_varargs_value_collection/group"/>
-</component>
-<component name="gobject" long-name="GObject API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gobject/group"/>
-</component>
-<component name="gparamspec" long-name="GParamSpec API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gparamspec/group"/>
-</component>
-<component name="gtype" long-name="GType API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtype/group"/>
-</component>
-<component name="gtypemodule" long-name="GTypeModule API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypemodule/group"/>
-</component>
-<component name="gtypeplugin" long-name="GTypePlugin API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypeplugin/group"/>
-</component>
-<component name="io_stream_api" long-name="I/O stream API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/io_stream_api/group"/>
-</component>
-<component name="localization_function_api" long-name="Localization Function API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/localization_function_api/group"/>
-</component>
-<component name="math_operations_api" long-name="Math Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/math_operations_api/group"/>
-</component>
-<component name="ossrv_memory_api" long-name="Generic OS Services Memory API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/memory/group"/>
-</component>
-<component name="no_namespace_headers" long-name="No Namespace Headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/no_namespace_headers/group"/>
-</component>
-<component name="openc_headers" long-name="OpenC headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_headers/group"/>
-</component>
-<component name="openc_wrappers" long-name="OpenC wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_wrappers/group"/>
-</component>
-<component name="ssl_general_api" long-name="SSL General API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_general_api/group"/>
-</component>
-<component name="ssl_protocol_methods_api" long-name="SSL Protocol Methods API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_protocol_methods_api/group"/>
-</component>
-<component name="standard_compressiondecompression_api" long-name="Standard Compression/Decompression API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/standard_compressiondecompression_api/group"/>
-</component>
-<component name="stl" long-name="STL API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/stl/group"/>
-</component>
-<component name="thread_api" long-name="Thread API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/thread_api/group"/>
-</component>
-<component name="type_attributes" long-name="Type Attributes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/type_attributes/group"/>
-</component>
-<component name="typeinfo" long-name="Type Info API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/typeinfo/group"/>
-</component>
-<component name="utility_apis" long-name="Utility APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/utility_apis/group"/>
-</component>
-<component name="wide_character_classapis" long-name="Wide character class/apis" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/wide_character_classapis/group"/>
-</component>
-<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">
-<unit bldFile="os/ossrv/ossrv_pub/dbus-glib/group"/>
-</component>
-</collection>
-<collection name="ossrv_plat" long-name="Generic OS Services Platform Interfaces" level="utilities">
-<component name="libutils_apis" long-name="Utility Library APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_plat/libutils/group"/>
-</component>
-</collection>
-<collection name="stdlibs" long-name="Standard Libraries" level="translation">
-<component name="libz" filter="s60" long-name="Z Compression Library">
-<unit bldFile="os/ossrv/stdlibs/libz/group"/>
-</component>
-<component name="libcrypt" filter="s60" long-name="Crypt Library">
-<unit bldFile="os/ossrv/stdlibs/libcrypt/group"/>
-</component>
-</collection>
-<collection name="ssl" long-name="SSL" level="data-services">
-<component name="libcrypto" filter="s60" long-name="Crypto Library">
-<unit bldFile="os/ossrv/ssl/libcrypto/group"/>
-</component>
-<component name="libssl" filter="s60" purpose="development" long-name="SSL Library">
-<unit bldFile="os/ossrv/ssl/libssl/group"/>
-</component>
-</collection>
-<collection name="glib" long-name="GLib" level="utilities">
-<component name="glibbackend" filter="s60" long-name="GLib Backend">
-<unit bldFile="os/ossrv/glib/glibbackend/group"/>
-</component>
-<component name="libglib" filter="s60" long-name="GLib Library">
-<unit bldFile="os/ossrv/glib/libglib/group"/>
-</component>
-<component name="libgthread" filter="s60" long-name="Libg Thread">
-<unit bldFile="os/ossrv/glib/libgthread/group"/>
-</component>
-<component name="libgmodule" filter="s60" long-name="Libg Module">
-<unit bldFile="os/ossrv/glib/libgmodule/group"/>
-</component>
-<component name="libgobject" filter="s60" long-name="Libg Object">
-<unit bldFile="os/ossrv/glib/libgobject/group"/>
-</component>
-</collection>
-<collection name="stdcpp" long-name="C++ Standard Library" level="translation">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="stdcpp_build" filter="s60" long-name="Stdcpp">
-<unit bldFile="os/ossrv/stdcpp/group"/>
-</component>
-</collection>
-<collection name="ofdbus" long-name="Open Foundation D-Bus" level="utilities">
-<component name="dbus" filter="s60" long-name="D-Bus">
-<unit bldFile="os/ossrv/ofdbus/dbus/group"/>
-</component>
-<component name="dbus-glib" filter="s60" long-name="D-Bus GLib">
-<unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
-</component>
-<component name="ofdbus_rom" filter="s60" long-name="D-Bus ROM">
-<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory
- Consider moving IBY file to one of the above as well and removing this component entirely -->
-<unit bldFile="os/ossrv/ofdbus/group"/>
-</component>
-</collection>
-<collection name="utilitylibraries" long-name="Utility Libraries" level="encoding">
-<component name="libutils" filter="s60" long-name="Utility Library">
-<unit bldFile="os/ossrv/utilitylibraries/libutils/group"/>
-</component>
-</collection>
-<collection name="genericservices" long-name="Generic Services" level="utilities">
-<component name="s60compatibilityheaders" long-name="S60 Compatibility Headers" filter="gt" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp" version="tb101sf"/>
-</component>
-<component name="mimerecognitionfw" long-name="MIME Recognition Framework" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/mimerecognitionfw/group" mrp="os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
-</component>
-<component name="systemagent" long-name="System Agent" introduced="9.0" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/systemagent/group" mrp="os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
-</component>
-<component name="taskscheduler" long-name="Task Scheduler" introduced="6.0" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/taskscheduler/group" mrp="os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
-</component>
-<component name="activebackupclient" long-name="Active Backup Client" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/activebackupclient/group" mrp="os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
-</component>
-<component name="syslibsdocs" long-name="Syslibs Documentation" purpose="development" class="doc">
-<unit mrp="os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
-</component>
-<component name="httputils" long-name="HTTP Utilities Library" introduced="6.2" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/httputils/group" mrp="os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
-</component>
-</collection>
-<collection name="syslibsapitest" long-name="SysLibs API Tests" level="utilities"/>
-<collection name="compressionlibs" long-name="Compression Libraries" level="data-services">
-<component name="ziplib" long-name="Zip Compression Library" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/ossrv/compressionlibs/ziplib/group" mrp="os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
-</component>
-</collection>
-<collection name="genericopenlibs" long-name="Generic Open Libraries" level="translation">
-<component name="cstdlib" long-name="C Standard Library" introduced="ER5" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/cstdlib/group" mrp="os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
-</component>
-<component name="cppstdlib" long-name="C++ Standard Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/cppstdlib/group" mrp="os/ossrv/genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
-</component>
-<component name="openenvcore" long-name="Open Environment Core" introduced="^2" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/openenvcore/group" mrp="os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
-</component>
-<component name="posixrealtimeextensions" long-name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/posixrealtimeextensions/group" mrp="os/ossrv/genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
-</component>
-</collection>
-<collection name="lowlevellibsandfws" long-name="Low Level Libraries and Frameworks" level="app-libs">
-<component name="pluginfw" long-name="Plugin Framework" introduced="6.2" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp" version="3"/>
-</component>
-<component name="apputils" long-name="Application Utilities" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/apputils/group" mrp="os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
-</component>
-<component name="genericusabilitylib" long-name="Generic Usability Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/genericusabilitylib/group" mrp="os/ossrv/lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
-</component>
-</collection>
-<collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
-<component name="ossrv_build" filter="s60" long-name="Generic OS Services Build">
-<!-- exports should be moved to individual components -->
-<unit bldFile="os/ossrv/group"/>
-</component>
-<component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="featuremgmt" long-name="Feature Management" level="framework">
-<component name="featuremgr" long-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 name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/persistentdata/featuremgmt/featureregistry/group" mrp="os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
-</component>
-</collection>
-<collection name="loggingservices" long-name="Logging Services" level="server">
-<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">
-<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">
-<unit bldFile="os/persistentdata/loggingservices/rfilelogger/group" mrp="os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
-</component>
-</collection>
-<collection name="traceservices" long-name="Trace Services" level="server">
-<component name="commsdebugutility" long-name="Comms Debug Utility" introduced="7.0s" purpose="optional">
-<unit bldFile="os/persistentdata/traceservices/commsdebugutility/group" mrp="os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
-</component>
-<component name="tracefw" long-name="Trace Framework" introduced="9.2" purpose="development">
-<unit bldFile="os/persistentdata/traceservices/tracefw/ulogger/group" mrp="os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
-</component>
-</collection>
-<collection name="persistentstorage" long-name="Persistent Storage" level="framework">
-<component name="store" long-name="Store" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/store/group" mrp="os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
-</component>
-<component name="dbms" long-name="DBMS" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/dbms/group" mrp="os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
-</component>
-<component name="centralrepository" long-name="Central Repository" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/persistentdata/persistentstorage/centralrepository/group" mrp="os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
-</component>
-<component name="sql" long-name="SQL" introduced="9.3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sql/GROUP" mrp="os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
-</component>
-<component name="sqlite3api" long-name="SQLite 3 API" introduced="^3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sqlite3api/GROUP" mrp="os/persistentdata/persistentstorage/sqlite3api/GROUP/syslibs_sqlite3.mrp"/>
-</component>
-</collection>
-<collection name="persistentdata_info" long-name="Persistent Data Services Info" level="app-if">
-<component name="persistentdata_metadata" long-name="Persistent Data Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/persistentdata/persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
-<component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
-</component>
-<component name="common_platform_security_definitions_api" long-name="Common Platform Security Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group"/>
-</component>
-<component name="feature_discovery_api" long-name="Feature Discovery API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/group"/>
-</component>
-<component name="platform_environment_api" long-name="Platform Environment API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_environment_api/group"/>
-</component>
-<component name="sensor_channel_api" long-name="Sensor Channel API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_channel_api/group"/>
-</component>
-<component name="sensor_definitions_api" long-name="Sensor Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_definitions_api/group"/>
-</component>
-<component name="version_info_api" long-name="Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/group"/>
-</component>
-<component name="accessory_monitoring_api" long-name="Accessory Monitoring API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/group"/>
-</component>
-<component name="haptics_api" long-name="Haptics API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/haptics_api/group"/>
-</component>
-<component name="sensor_data_compensator_api" long-name="Sensor Data Compensator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
-</component>
-</collection>
-<collection name="devicesrv_plat" long-name="Device Services Platform Interfaces" level="app-if">
-<component name="configuration_file_parser_api" long-name="Configuration File Parser API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/configuration_file_parser_api/group"/>
-</component>
-<component name="dos_extension_plugin_api" long-name="DOS Extension Plug-In API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_plugin_api/group"/>
-</component>
-<component name="mediator_command_initiator_api" long-name="Mediator Command Initiator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_initiator_api/group"/>
-</component>
-<component name="syslangutil_api" long-name="SysLangUtil API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/syslangutil_api/group"/>
-</component>
-<component name="wakeup_alarm_api" long-name="Wakeup Alarm API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/wakeup_alarm_api/group"/>
-</component>
-<component name="disk_and_memory_level_keys_api" long-name="Disk and Memory Level Keys API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_and_memory_level_keys_api/group"/>
-</component>
-<component name="mediator_plugin_api" long-name="Mediator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_plugin_api/group"/>
-</component>
-<component name="headset_status_api" long-name="Headset Status API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/headset_status_api/group"/>
-</component>
-<component name="system_startup_extension_plugin_api" long-name="System Startup Extension Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/system_startup_extension_plugin_api/group"/>
-</component>
-<component name="sensor_plugin_api" long-name="Sensor Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_plugin_api/group"/>
-</component>
-<component name="accessory_api" long-name="Accessory API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_api/group"/>
-</component>
-<component name="display_language_definition_api" long-name="Display Language Definition API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/display_language_definition_api/group"/>
-</component>
-<component name="mediator_command_responder_api" long-name="Mediator Command Responder API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_responder_api/group"/>
-</component>
-<component name="accessory_policy_definitions_api" long-name="Accessory Policy Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_definitions_api/group"/>
-</component>
-<component name="hw_settings_api" long-name="Hardware Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/hw_settings_api/group"/>
-</component>
-<component name="mediator_domain_definitions_api" long-name="Mediator Domain Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_domain_definitions_api/group"/>
-</component>
-<component name="sensor_extension_api" long-name="Sensor Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_extension_api/group"/>
-</component>
-<component name="accessory_plugin_api" long-name="Accessory Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_plugin_api/group"/>
-</component>
-<component name="sae_api" long-name="SAE API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sae_api/group"/>
-</component>
-<component name="accessory_control_api" long-name="Accessory Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_control_api/group"/>
-</component>
-<component name="mediator_static_registration_api" long-name="Mediator Static Registration API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_static_registration_api/group"/>
-</component>
-<component name="accessory_key_event_handling_api" long-name="Accessory Key Event Handling API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_key_event_handling_api/group"/>
-</component>
-<component name="mediator_notification_api" long-name="Mediator Notification API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_notification_api/group"/>
-</component>
-<component name="accessory_policy_utility_api" long-name="Accessory Policy Utility API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_utility_api/group"/>
-</component>
-<component name="common_dsy_plugin_api" long-name="Common DSY Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/common_dsy_plugin_api/group"/>
-</component>
-<component name="remote_control_extension_api" long-name="Remote Control Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/remote_control_extension_api/group"/>
-</component>
-<component name="sensor_channel_filter_api" long-name="Sensor Channel Filter API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_channel_filter_api/group"/>
-</component>
-<component name="dos_extension_api" long-name="DOS Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_api/group"/>
-</component>
-<component name="accessory_audio_control_api" long-name="Accessory Audio Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_audio_control_api/group"/>
-</component>
-<component name="mediator_event_consumer_api" long-name="Mediator Event Consumer API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_consumer_api/group"/>
-</component>
-<component name="shared_data_api" long-name="Shared Data API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/shared_data_api/group"/>
-</component>
-<component name="accessory_settings_api" long-name="Accessory Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_settings_api/group"/>
-</component>
-<component name="accessory_bluetooth_control_api" long-name="Accessory Bluetooth Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_bluetooth_control_api/group"/>
-</component>
-<component name="extended_version_info_api" long-name="Extended Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_api/group"/>
-</component>
-<component name="mediator_event_provider_api" long-name="Mediator Event Provider API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_provider_api/group"/>
-</component>
-<component name="tv_out_config_api" long-name="TV Out Config API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_config_api/group"/>
-</component>
-<component name="tspclientmapper_api" long-name="TSP Client Mapper API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tspclientmapper_api/group"/>
-</component>
-<component name="powersave_api" long-name="Power Save API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_api/group"/>
-</component>
-<component name="powersave_definitions_api" long-name="Power Save Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_definitions_api/group"/>
-</component>
-<component name="powersave_plugin_api" long-name="Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_plugin_api/group"/>
-</component>
-<component name="extended_version_info_plugin_api" long-name="Extended Version Info Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_plugin_api/group"/>
-</component>
-<component name="haptics_plugin_api" long-name="Haptics Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_plugin_api/group"/>
-</component>
-<component name="haptics_effect_data_getter_plugin_api" long-name="Haptics Effect Data Getter Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
-</component>
-<component name="haptics_packetizer_plugin_api" long-name="Haptics Packetizer Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_packetizer_plugin_api/group"/>
-</component>
-<component name="tiltcompensation_api" long-name="Tilt Compensation API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tiltcompensation_api/group"/>
-</component>
-<component name="disk_notification_handler_api" long-name="Disk Notification Handler API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_notification_handler_api/group"/>
-</component>
-<component name="accessory_policy_usb_audio_api" long-name="Accessory Policy USB Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_usb_audio_api/group"/>
-</component>
-<component name="accessory_policy_hdmi_audio_api" long-name="Accessory Policy HDMI Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_hdmi_audio_api/group"/>
-</component>
-<component name="sensor_data_compensator_plugin_api" long-name="Sensor Data Compensator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
-</component>
-<component name="ddc_access_api" long-name="DDC Access API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/ddc_access_api/group"/>
-</component>
-<component name="tv_out_behaviour_api" long-name="TV Out Behaviour API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_behaviour_api/group"/>
-</component>
-</collection>
-<collection name="accessoryservices" long-name="Accessory Services" level="framework">
-<component name="accessorymonitor" filter="s60" long-name="Accessory Monitor">
-<unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/group"/>
-</component>
-<component name="accessoryremotecontrol" filter="s60" long-name="Accessory Remote Control">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
-</component>
-<component name="accessoryserver" filter="s60" long-name="Accessory Server">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryserver/group"/>
-</component>
-<component name="pluggeddisplay" filter="s60" long-name="Plugged Display" introduced="^3">
-<unit bldFile="os/devicesrv/accessoryservices/pluggeddisplay/group"/>
-</component>
-<component name="headsetstatusapi" filter="s60" long-name="Headset Status API">
-<unit bldFile="os/devicesrv/accessoryservices/headsetstatusapi/group"/>
-</component>
-<component name="tspclientmapper" filter="s60" long-name="TSP Client Mapper">
-<unit bldFile="os/devicesrv/accessoryservices/tspclientmapper/group"/>
-</component>
-<component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional">
-<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
-</component>
-<component name="gid_pc_tool" filter="s60" long-name="Generic ID PC Tool" class="tool PC">
-<unit bldFile="os/devicesrv/accessoryservices/gid_pc_tool/group"/>
-</component>
-</collection>
-<collection name="commonservices" long-name="Common Services" level="app-if">
-<component name="commonengine" filter="s60" long-name="Common Engine">
-<unit bldFile="os/devicesrv/commonservices/commonengine/group"/>
-</component>
-<component name="commonengineresources" filter="s60" long-name="Common Engine Resources" class="config">
-<unit bldFile="os/devicesrv/commonservices/commonengineresources/group"/>
-</component>
-<component name="platformenv" filter="s60" long-name="Platform Environment">
-<unit bldFile="os/devicesrv/commonservices/platformenv/group"/>
-</component>
-<component name="sysutil" long-name="System Utilities" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/sysutil/group" mrp="os/devicesrv/commonservices/sysutil/group/sysutil.mrp"/>
-</component>
-<component name="activitymanager" long-name="Activity Manager" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/activitymanager/group" mrp="os/devicesrv/commonservices/activitymanager/group/activitymanager.mrp"/>
-</component>
-</collection>
-<collection name="dosservices" long-name="Domestic Operating System Services" level="hw-if">
-<component name="commondsy" filter="s60" long-name="Common DSY" plugin="Y">
-<unit bldFile="os/devicesrv/dosservices/commondsy/group"/>
-</component>
-<component name="dosserver" filter="s60" long-name="Domestic OS Server">
-<unit bldFile="os/devicesrv/dosservices/dosserver/group"/>
-</component>
-</collection>
-<collection name="sensorservices" long-name="Sensor Services" level="framework">
-<component name="sensorserver" filter="s60" long-name="Sensor Server">
-<unit bldFile="os/devicesrv/sensorservices/sensorserver/group"/>
-</component>
-<component name="orientationssy" filter="s60" long-name="Orientation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/orientationssy/group"/>
-</component>
-<component name="tiltcompensationssy" filter="s60" long-name="Tilt Compensation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/tiltcompensationssy/group"/>
-</component>
-<component name="sensordatacompensator" filter="s60" long-name="Sensor Data Compensator">
-<unit bldFile="os/devicesrv/sensorservices/sensordatacompensator/group"/>
-</component>
-</collection>
-<collection name="hwrmhaptics" long-name="HWRM Haptics" level="plugin">
-<component name="hapticseffectdatagetterfw" filter="s60" long-name="Haptics Effect Data Getter Framework">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
-</component>
-<component name="hapticspluginservice" filter="s60" long-name="Haptics Plugin Service">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
-</component>
-<component name="hapticspacketizer" filter="s60" long-name="Haptics Packetizer">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
-</component>
-<component name="hapticspluginmanager" filter="s60" long-name="Haptics Plugin Manager">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
-</component>
-<component name="hapticsserver" filter="s60" long-name="Haptics Server">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsserver/group"/>
-</component>
-<component name="hapticsclient" filter="s60" long-name="Haptics Client">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsclient/group"/>
-</component>
-<component name="hwrmhaptics_build" filter="s60" long-name="HWRM Haptics Build">
-<!-- move these exports into the appropriate above components and delete this component-->
-<unit bldFile="os/devicesrv/hwrmhaptics/group"/>
-</component>
-</collection>
-<collection name="mediator" long-name="Mediator" level="app-if">
-<!--collection is really a component. Move it down a directory -->
-<component name="mediator_build" filter="s60" long-name="Mediator Build">
-<unit bldFile="os/devicesrv/mediator/group"/>
-</component>
-</collection>
-<collection name="psmservices" long-name="Power Save Mode Services" level="app-if">
-<component name="psmserver" filter="s60" long-name="PSM Server">
-<unit bldFile="os/devicesrv/psmservices/psmserver/group"/>
-</component>
-</collection>
-<collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
-<component name="hwrmfmtxwatcherplugin" filter="s60" long-name="HWRM FM Transmitter Watcher Plugin" plugin="Y">
-<unit bldFile="os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
-</component>
-<component name="hwrmtargetmodifierplugin" filter="s60" long-name="HWRM Target Modifier Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build,
- may need to -->
-<!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
-</component>
-<component name="vibractrl" filter="s60" long-name="Vibra Control" deprecated="9.1">
-<unit bldFile="os/devicesrv/resourcemgmt/vibractrl/group"/>
-</component>
-<component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="^2" purpose="optional">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
-</component>
-<component name="hwresourcesmgrconfig" long-name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
-</component>
-<component name="resourcemgmt_build" filter="s60" long-name="Resource Management Build">
-<!-- Move exports to a self-contained component.
- This needs to be kept around until configuration is in place -->
-<unit bldFile="os/devicesrv/resourcemgmt/group"/>
-</component>
-<component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
-</component>
-</collection>
-<collection name="sysstatemgmt" long-name="System State Management" level="server">
-<component name="ssmmapperutility" filter="s60" long-name="SSM Mapper Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmmapperutility/group"/>
-</component>
-<component name="ssmpolicyplugins" filter="s60" long-name="SSM Policy Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmpolicyplugins/group"/>
-</component>
-<component name="ssmutilityplugins" filter="s60" long-name="SSM Utility Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmutilityplugins/group"/>
-</component>
-<component name="ssmcmdlists" filter="s60" long-name="SSM Command Lists" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcmdlists/group"/>
-</component>
-<component name="ssmcustcmds" filter="s60" long-name="SSM Custom Commands" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcustcmds/group"/>
-</component>
-<component name="syslangutil" filter="s60" long-name="System Language Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/syslangutil/group"/>
-</component>
-<component name="sysrestart" filter="s60" long-name="System Restart" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysrestart/group"/>
-</component>
-<component name="sysuiprovider" filter="s60" long-name="System UI Provider" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysuiprovider/group"/>
-</component>
-<component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/group" mrp="os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
-</component>
-<component name="systemstatemgr" long-name="System State Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
-</component>
-<component name="systemstateplugins" long-name="System State Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
-</component>
-<component name="systemstatereferenceplugins" long-name="System State Reference Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
-</component>
-</collection>
-<collection name="resourceinterfaces" long-name="Resource Interfaces" level="hw-if">
-<component name="fmtransmittercontrol" long-name="FM Transmitter Control" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group" mrp="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
-</component>
-</collection>
-<collection name="systemhealthmanagement" long-name="System Health Management" level="server">
-<component name="systemhealthmgr" long-name="System Health Manager" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
-</component>
-</collection>
-<collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if"/>
-<collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
-<component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
-<collection name="authenticationservices" long-name="Authentication Services" level="utilities">
-<component name="authenticationserver" long-name="Authentication Server" introduced="^3" purpose="optional">
-<unit bldFile="os/security/authenticationservices/authenticationserver/group" mrp="os/security/authenticationservices/authenticationserver/group/security_authserver.mrp"/>
-</component>
-</collection>
-<collection name="authorisation" long-name="Authorisation" level="utilities">
-<component name="userpromptservice" long-name="User Prompt Service" introduced="^3" purpose="mandatory">
-<unit bldFile="os/security/authorisation/userpromptservice/group" mrp="os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
-</component>
-<component name="userpromptutils" long-name="User Prompt Utils" introduced="^3" purpose="optional">
-<unit bldFile="os/security/authorisation/userpromptutils/group" mrp="os/security/authorisation/userpromptutils/group/security_ups_utils.mrp"/>
-</component>
-</collection>
-<collection name="contentmgmt" long-name="Content Management" level="utilities">
-<component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
-<unit bldFile="os/security/contentmgmt/contentaccessfwfordrm/group" mrp="os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
-</component>
-<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>
-</collection>
-<collection name="crypto" long-name="Crypto Libraries" level="libraries">
-<component name="weakcryptospi" long-name="Weak Crypto SPI" filter="gt" introduced="^3" purpose="optional">
-<unit bldFile="os/security/crypto/weakcryptospi/group" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
-</component>
-<component name="strongcryptospi" long-name="Strong Crypto SPI" filter="gt" introduced="^3" purpose="optional">
-<unit bldFile="os/security/crypto/weakcryptospi/strong" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
-</component>
-</collection>
-<collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
-<component name="securityutils" long-name="Security Utils" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/securityutils/group" mrp="os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
-</component>
-<component name="securitydocs" long-name="Security Documentation" purpose="development" class="doc">
-<unit mrp="os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
-</component>
-<component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
-</component>
-<component name="securitycommonutils" long-name="Security Common Utils" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/security/cryptomgmtlibs/securitycommonutils/group" mrp="os/security/cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
-</component>
-</collection>
-<collection name="securityanddataprivacytools" long-name="Security and Data Privacy Tools" level="services">
-<component name="securityconfig" long-name="Security Config" introduced="9.1" purpose="optional">
-<unit bldFile="os/security/securityanddataprivacytools/securityconfig/group" mrp="os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
-</component>
-<component name="securitytools" long-name="Security Tools" introduced="^3" purpose="optional" class="PC">
-<unit bldFile="os/security/securityanddataprivacytools/securitytools/group" mrp="os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
-</component>
-</collection>
-<collection name="cryptoplugins" long-name="Crypto Plugins" level="plugins">
-<component name="cryptospiplugins" long-name="Crypto SPI Plugins" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/security/cryptoplugins/cryptospiplugins/group" mrp="os/security/cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
-</component>
-</collection>
-<collection name="cryptoservices" long-name="Crypto Services" level="plugins">
-<component name="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/certificateandkeymgmt/group" mrp="os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
-</component>
-<component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
-</component>
-<component name="browserrootcertificates" long-name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
-<unit mrp="os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
-</component>
-<component name="rootcertificates" filter="sf_build" long-name="Root Certificates" introduced="7.0s" purpose="optional">
-<!-- not in S60 codebase -->
-<unit bldFile="os/security/cryptoservices/rootcertificates/group" mrp="os/security/cryptoservices/rootcertificates/group/rootcerts.mrp"/>
-</component>
-<component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/asnpkcs/group" mrp="os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
-</component>
-</collection>
-<collection name="security_info" long-name="OS Security Info" level="utilities">
-<component name="security_metadata" long-name="OS Security Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/security/security_info/security_metadata/security_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
-<collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
-<component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
-</component>
-<component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
-</component>
-<component name="simulationpositioningmodule" long-name="Simulation Positioning Module" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
-</component>
-<component name="gpspositioningmodule" long-name="GPS/A-GPS Positioning Module" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/gpspositioningmodule/group" mrp="os/lbs/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
-</component>
-<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>
-</collection>
-<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
-<component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
-</component>
-</collection>
-<collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
-<component name="locationserver" long-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 name="networkrequesthandler" long-name="Network Request Handler" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
-</component>
-</collection>
-<collection name="lbstest" long-name="Locating Services Tests" level="application-interface">
-<component name="locationprotocoltest" long-name="Location Protocol Tests" introduced="9.2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/lbstest/locationprotocoltest/group" mrp="os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
-</component>
-</collection>
-<collection name="locationmgmt" long-name="Location Management" level="management">
-<component name="locmonitor" long-name="Location Monitor" introduced="^3" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
-</component>
-<component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/agpslocationmgr/group" mrp="os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
-</component>
-<component name="networklocationmgr" long-name="Network Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/networklocationmgr/group" mrp="os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
-</component>
-<component name="locationcore" long-name="Location Core" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locationcore/group" mrp="os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
-</component>
-<component name="networkgateway" long-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 name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
-<component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
-</component>
-<component name="suplrrlpasn1" filter="sf_build" long-name="SUPL RRLP ASN1 Parser">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
-</component>
-</collection>
-<collection name="lbsapitest" long-name="Location API Tests" level="application-interface"/>
-<collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
-<component name="lbs_metadata" long-name="Locating Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commsfw" level="services" long-name="Communications Framework" levels="server support framework process app-if">
-<collection name="commsprocess" long-name="Comms Process" level="process">
-<component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/commsfw/commsprocess/commsrootserverconfig/group" mrp="os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
-</component>
-</collection>
-<collection name="commsconfig" long-name="Comms Config" level="process">
-<component name="commsdatabase" long-name="Comms Database" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
-</component>
-<component name="commsdatabaseshim" long-name="Comms Database Shim" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/commsfw/commsconfig/commsdatabaseshim/group" mrp="os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
-</component>
-</collection>
-<collection name="datacommsserver" long-name="Data Comms Server" level="framework">
-<component name="esockserver" long-name="ESock Server" purpose="mandatory">
-<unit bldFile="os/commsfw/datacommsserver/esockserver/group" mrp="os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp" version="3"/>
-</component>
-<component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/group" mrp="os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
-</component>
-<component name="networkingdialogstub" long-name="Networking Dialog Stub" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/default" mrp="os/commsfw/datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
-</component>
-<component name="networkcontroller" long-name="Network Controller" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/datacommsserver/networkcontroller/group" mrp="os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
-</component>
-</collection>
-<collection name="serialserver" long-name="Serial Server" level="server">
-<component name="serialportcsy" long-name="Serial Port CSY" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/serialserver/serialportcsy" mrp="os/commsfw/serialserver/serialportcsy/ser-comms_serialportcsy.mrp"/>
-</component>
-<component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" purpose="development">
-<unit bldFile="os/commsfw/serialserver/packetloopbackcsy/group" mrp="os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
-</component>
-<component name="c32serialserver" long-name="C32 Serial Server" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/commsfw/serialserver/c32serialserver/group" mrp="os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
-</component>
-<component name="c32serialserverconfig" long-name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config">
-<unit bldFile="os/commsfw/serialserver/c32serialserverconfig" mrp="os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
-</component>
-<component name="c32serialserverdocs" long-name="C32 Serial Server Documentation" purpose="development" class="doc">
-<unit mrp="os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
-</component>
-</collection>
-<collection name="commsfwutils" long-name="Comms Framework Utilities" level="framework">
-<component name="commsbufs" long-name="Comms Buffers" introduced="^3" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwutils/commsbufs/group" mrp="os/commsfw/commsfwutils/commsbufs/group/comms-infras_commsbufs.mrp"/>
-</component>
-</collection>
-<collection name="commsfw_info" long-name="Comms Framework Info" level="app-if">
-<component name="commsinfrastructuredocs" long-name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
-<unit mrp="os/commsfw/commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
-</component>
-<component name="commsfw_metadata" long-name="Communications Framework Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/commsfw/commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
-</component>
-</collection>
-<collection name="commsfwsupport" long-name="Comms Framework Support" level="support">
-<component name="commselements" long-name="Comms Elements" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwsupport/commselements/group" mrp="os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
-</component>
-</collection>
-<collection name="commsinfrastructureapitest" long-name="Comms-Infras API Tests" level="app-if">
-<component name="commsinfrastructuresvs" long-name="Comms Infrastructure Verification Suite" introduced="^3" purpose="development">
-<unit mrp="os/commsfw/commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
-</component>
-</collection>
-<collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
-<component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
-</component>
-<component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" purpose="mandatory" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
-</component>
-<component name="commstools" long-name="Comms Tools" introduced="^3" purpose="development" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/commstools/group" mrp="os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
-</component>
-</collection>
-</block>
-<block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
-<component name="internetsockets" long-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>
-<collection name="tcpiputils" long-name="TCP/IP Utilities" level="plugin">
-<component name="dnd" long-name="DND" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/dnd/group" mrp="os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
-</component>
-<component name="dhcp" long-name="DHCP" introduced="8.0" purpose="optional">
-<unit bldFile="os/networkingsrv/tcpiputils/dhcp/group" mrp="os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
-</component>
-<component name="networkaddressandporttranslation" long-name="Network Address and Port Translation" introduced="^2" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
-</component>
-<component name="punycodeconv" long-name="Punycode Converter" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/punycodeconv/group" mrp="os/networkingsrv/tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
-</component>
-</collection>
-<collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
-<component name="nullagt" long-name="NULL AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/nullagt/group" mrp="os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
-</component>
-<component name="genericscprparameters" long-name="Generic SCPR Parameters" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/linklayercontrol/genericscprparameters/group" mrp="os/networkingsrv/linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
-</component>
-<component name="mbmsparameters" long-name="MBMS Parameters" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/mbmsparameters/group" mrp="os/networkingsrv/linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
-</component>
-<component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
-<unit bldFile="os/networkingsrv/linklayercontrol/networkinterfacemgr/group" mrp="os/networkingsrv/linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp" version="2"/>
-</component>
-</collection>
-<collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
-<component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
-</component>
-<component name="pppnif" long-name="PPP NIF" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/pppnif/group" mrp="os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp" version="2"/>
-</component>
-<component name="slipnif" long-name="SLIP NIF" purpose="development" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/slipnif/group" mrp="os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
-</component>
-<component name="tunnelnif" long-name="Tunnel NIF" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
-</component>
-</collection>
-<collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
-<component name="packetlogger" long-name="Packet Logger" introduced="8.1" purpose="development">
-<unit bldFile="os/networkingsrv/linklayerutils/packetlogger/group" mrp="os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
-</component>
-</collection>
-<collection name="networkcontrol" long-name="Network Control" level="plugin">
-<component name="qoslib" long-name="QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/qoslib/group" mrp="os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
-</component>
-<component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/pfqoslib/group" mrp="os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
-</component>
-<component name="qosfwprt" long-name="QoS Framework PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
-</component>
-<component name="qosipscpr" long-name="QoS IP SCPR" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosipscpr/group" mrp="os/networkingsrv/networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
-</component>
-<component name="ipnetworklayer" long-name="IP Network Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/ipnetworklayer/group" mrp="os/networkingsrv/networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
-</component>
-<component name="iptransportlayer" long-name="IP Transport Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/iptransportlayer/group" mrp="os/networkingsrv/networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
-</component>
-<component name="commsuserpromptmgr" long-name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkcontrol/commsuserpromptmgr/group" mrp="os/networkingsrv/networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
-</component>
-</collection>
-<collection name="networkprotocols" long-name="Network Protocols" level="plugin">
-<component name="ipeventnotifier" long-name="IP Event Notifier" introduced="8.1" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
-</component>
-<component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
-</component>
-<component name="iphook" long-name="IP Hook" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
-</component>
-<component name="mobileip" long-name="Mobile IP" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/mobileip/group" mrp="os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
-</component>
-<component name="dnsproxy" long-name="DNS Proxy" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/networkprotocols/dnsproxy/group" mrp="os/networkingsrv/networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
-</component>
-</collection>
-<collection name="networksecurity" long-name="Network Security" level="framework">
-<component name="tls" long-name="TLS" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tls/group" mrp="os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
-</component>
-<component name="tlsprovider" long-name="TLS Provider" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tlsprovider/group" mrp="os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
-</component>
-<component name="ipsec" long-name="IPsec" introduced="7.0" purpose="optional">
-<unit bldFile="os/networkingsrv/networksecurity/ipsec/group" mrp="os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
-</component>
-</collection>
-<collection name="networkingtestandutils" long-name="Networking Test and Utils" level="app-if">
-<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">
-<!-- production component: contains the IBY files -->
-<unit bldFile="os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
-</component>
-<component name="networkingdocs" long-name="Networking Documentation" purpose="development" class="doc">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
-</component>
-<component name="networkingsrv_metadata" long-name="Networking Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
-<component name="predictorcompression" long-name="Predictor Compression" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wlan" level="services" long-name="WLAN" levels="hw low mid high tools test">
-<collection name="wlan_plat" long-name="WLAN Platform Interfaces" level="test">
-<component name="wlan_dbif_api" long-name="WLAN DBIF API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_dbif_api/group"/>
-</component>
-<component name="wlan_hal_api" long-name="WLAN HAL API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hal_api/group"/>
-</component>
-<component name="wlan_management_api" long-name="WLAN Management API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_management_api/group"/>
-</component>
-<component name="wlan_device_settings_api" long-name="WLAN Device Settings API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_device_settings_api/group"/>
-</component>
-<component name="wlan_control_api" long-name="WLAN Control API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_control_api/group"/>
-</component>
-<component name="wlan_hw_initialization_data_api" long-name="WLAN Hardware Initialization Data API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hw_initialization_data_api/group"/>
-</component>
-<component name="wlan_power_save_plugin_api" long-name="WLAN Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_power_save_plugin_api/group"/>
-</component>
-<component name="wlan_info_api" long-name="WLAN Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_info_api/group"/>
-</component>
-<component name="wlan_agent_hotspot_plugin_api" long-name="WLAN Agent Hotspot Plug-in API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
-</component>
-<component name="wlan_osa_api" long-name="WLAN OSA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_osa_api/group"/>
-</component>
-<component name="wlan_spia_api" long-name="WLAN SPIA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_spia_api/group"/>
-</component>
-<component name="wlan_hpa_api" long-name="WLAN HPA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hpa_api/group"/>
-</component>
-<component name="wlan_eapol_plugin_api" long-name="WLAN EAPOL Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_eapol_plugin_api/group"/>
-</component>
-<component name="wlan_generic_plugin_api" long-name="WLAN Generic Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_generic_plugin_api/group"/>
-</component>
-<component name="wlan_aws_plugin_api" long-name="WLAN AWS Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_aws_plugin_api/group"/>
-</component>
-</collection>
-<collection name="wlan_pub" long-name="WLAN Public Interfaces" level="test">
-<component name="wlan_sdk_info_api" long-name="WLAN SDK Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_pub/wlan_sdk_info_api/group"/>
-</component>
-</collection>
-<collection name="wlan_bearer" long-name="WLAN Bearer" level="hw">
-<component name="wlanpsmplugin" filter="s60" long-name="WLAN PSM Plugin" plugin="Y">
-<unit bldFile="os/wlan/wlan_bearer/wlanpsmplugin/group"/>
-</component>
-<component name="wlanagent" filter="s60" long-name="WLAN Agent">
-<unit bldFile="os/wlan/wlan_bearer/wlanagent/group"/>
-</component>
-<component name="wlandbif_cd" filter="s60" long-name="WLAN CommsDat interface">
-<unit bldFile="os/wlan/wlan_bearer/wlandbif_cd/group"/>
-</component>
-<!-- should follow component directory rules for stuff in wlan_symbian/ and put in a single component or split up properly -->
-<component name="wlanengine" filter="s60" long-name="WLAN Engine">
-<unit bldFile="os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
-</component>
-<component name="wlanldd" filter="s60" long-name="WLAN LDD">
-<unit bldFile="os/wlan/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
-</component>
-<component name="wlannwif" filter="s60" long-name="WLAN Network Interface">
-<unit bldFile="os/wlan/wlan_bearer/wlannwif/group"/>
-</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="adaptation hw-if plugin framework server app-if">
-<collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
-<component name="basebandchanneladaptor" long-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 name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
-<component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
-</component>
-</collection>
-<collection name="fax" long-name="Fax" level="server">
-<component name="faxclientandserver" long-name="Fax Client and Server" purpose="optional">
-<unit bldFile="os/cellularsrv/fax/faxclientandserver/Group" mrp="os/cellularsrv/fax/faxclientandserver/Group/telephony_fax.mrp"/>
-</component>
-</collection>
-<collection name="smsprotocols" long-name="SMS Protocols" level="framework">
-<component name="smsstack" long-name="SMS Stack" introduced="6.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/cellularsrv/smsprotocols/smsstack/group" mrp="os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
-</component>
-</collection>
-<collection name="telephonyprotocols" long-name="Telephony Protocols" level="framework">
-<component name="csdagt" long-name="CSD AGT" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/csdagt/group" mrp="os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
-</component>
-<component name="psdagt" long-name="PSD AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/psdagt/group" mrp="os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
-</component>
-<component name="gprsumtsqosprt" long-name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
-</component>
-<component name="gprsumtsqosinterface" long-name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
-</component>
-<component name="qosextnapi" long-name="QoS Extn API" introduced="9.2" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
-</component>
-<component name="secondarypdpcontextumtsdriver" long-name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
-</component>
-<component name="qos3gppcpr" long-name="QoS 3GPP CPR" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
-</component>
-<component name="pdplayer" long-name="PDP Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/pdplayer/group" mrp="os/cellularsrv/telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
-</component>
-<component name="rawipnif" long-name="Raw IP NIF" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserver" long-name="Telephony Server" level="server">
-<component name="etelserverandcore" long-name="ETel Server and Core" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
-</component>
-<component name="etelmultimode" long-name="ETel Multimode" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelmultimode/group" mrp="os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
-</component>
-<component name="etelpacketdata" long-name="ETel Packet Data" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
-</component>
-<component name="etelsimtoolkit" long-name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
-<component name="common_tsy" long-name="Common TSY" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
-</component>
-<component name="licenseetsystub" long-name="Licensee TSY Stub" introduced="^2" purpose="development" filter="sf_build" plugin="Y">
-<unit mrp="os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="os/cellularsrv/telephonyserverplugins/licenseetsystub/group"/>
-</component>
-<component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
-</component>
-<component name="simtsy" long-name="SIM TSY" introduced="7.0" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
-</component>
-<component name="ctsydispatchlayer" long-name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
-</component>
-<component name="simatktsy" long-name="SIMATK TSY" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simatktsy/group" mrp="os/cellularsrv/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
-</component>
-</collection>
-<collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
-<component name="dial" long-name="Dial" deprecated="9.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyutils/dial/group" mrp="os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
-</component>
-<component name="telephonywatchers" long-name="Telephony Watchers" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
-</component>
-<component name="etel3rdpartyapi" long-name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrv_info" long-name="Cellular Baseband Services Info" level="app-if">
-<component name="telephonyconfidentialdocs" long-name="Telephony Confidential Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
-</component>
-<component name="telephonydocs" long-name="Telephony Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
-</component>
-<component name="cellularsrv_metadata" long-name="Cellular Baseband Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
-<component name="mocksy" long-name="MockSY" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if"/>
-<collection name="wapstack" long-name="WAP Stack" level="app-if">
-<component name="wapmessageapi" long-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>
-</block>
-<block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
-<collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
-<component name="bluetooth_audio_adaptation_api" long-name="Bluetooth Audio Adaptation API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
-</component>
-<component name="bluetooth_power_management_api" long-name="Bluetooth Power Management API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_power_management_api/group"/>
-</component>
-<component name="at_command_handler_plugin_api" long-name="AT Command Handler Plugin API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/at_command_handler_plugin_api/group"/>
-</component>
-</collection>
-<collection name="bluetooth" long-name="Bluetooth Core" level="framework">
-<component name="btstack" long-name="Bluetooth Stack" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btstack" mrp="os/bt/bluetooth/btstack/bluetooth_stack.mrp"/>
-</component>
-<component name="btcomm" long-name="Bluetooth CSY" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetooth/btcomm" mrp="os/bt/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
-</component>
-<component name="btsdp" long-name="Bluetooth SDP" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btsdp" mrp="os/bt/bluetooth/btsdp/bluetooth_sdp.mrp"/>
-</component>
-<component name="btextnotifiers" long-name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btextnotifiers" mrp="os/bt/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
-</component>
-<component name="gavdp" long-name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/gavdp/group" mrp="os/bt/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
-</component>
-<component name="btlogger" long-name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btlogger/group" mrp="os/bt/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
-</component>
-<component name="btdocs" long-name="Bluetooth Documentation" purpose="development" class="doc">
-<unit mrp="os/bt/bluetooth/btdocs/bluetooth_documentation.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothmgmt" long-name="Bluetooth Management" level="plugin">
-<component name="btmgr" long-name="Bluetooth Manager" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btmgr" mrp="os/bt/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
-</component>
-<component name="btconfig" long-name="Bluetooth Config" purpose="optional" class="config">
-<unit bldFile="os/bt/bluetoothmgmt/btconfig" mrp="os/bt/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
-</component>
-<component name="btrom" long-name="Bluetooth ROM" introduced="9.1" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btrom" mrp="os/bt/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
-</component>
-<component name="bluetoothclientlib" long-name="Bluetooth Client Library" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/bluetoothclientlib" mrp="os/bt/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothcommsprofiles" long-name="Bluetooth Comms Profiles" level="app-if">
-<component name="btpan" long-name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetoothcommsprofiles/btpan/group" mrp="os/bt/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
-</component>
-</collection>
-<collection name="bthci" long-name="Host Controller Interface" level="server">
-<component name="bthci2" long-name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bthci/bthci2/group" mrp="os/bt/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
-</component>
-<component name="hciextensioninterface" long-name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bthci/hciextensioninterface" mrp="os/bt/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
-</component>
-<component name="hci2implementations" long-name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bthci/hci2implementations/group" mrp="os/bt/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
-</component>
-</collection>
-<collection name="irda" long-name="IrDA" level="plugin">
-<component name="irdastack" long-name="IrDA Stack" purpose="optional">
-<unit bldFile="os/bt/irda/irdastack/group" mrp="os/bt/irda/irdastack/group/infra-red_irda.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if"/>
-<collection name="atext" long-name="AT Extensions" level="server">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="atext_build" long-name="AT Extension Build" introduced="^3" purpose="optional" filter="s60">
-<unit bldFile="os/bt/atext/group"/>
-</component>
-</collection>
-<collection name="bt_info" long-name="Bluetooth Info" level="app-if">
-<component name="bt_metadata" long-name="Bluetooth Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/bt/bt_info/bt_metadata/bt_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
-<collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
-<!-- usbclientdrivers to be moved here from kernelhwsrv-->
-</collection>
-<collection name="usbmgmt" long-name="USB Management" level="server">
-<component name="usbmgr" long-name="USB Manager" purpose="optional">
-<unit bldFile="os/usb/usbmgmt/usbmgr/group" mrp="os/usb/usbmgmt/usbmgr/group/usb_manager.mrp" version="2"/>
-</component>
-<component name="usbclassandmgrdocs" long-name="USB Class and Manager Documentation" purpose="development" class="doc">
-<unit mrp="os/usb/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
-</component>
-</collection>
-<collection name="usb_info" long-name="USB Info" level="app-if">
-<component name="usb_metadata" long-name="USB Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/usb/usb_info/usb_metadata/usb_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="mm" level="services" long-name="Multimedia" levels="adaptation 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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-</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"/>
-</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"/>
-</component>
-<component name="aac_decoder_config_proxy_api" long-name="AAC Decoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/aac_decoder_config_proxy_api/group"/>
-</component>
-<component name="added_devsound_control_api" long-name="Added DevSound Control API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_api/group"/>
-</component>
-<component name="added_devsound_control_msg_hdlr_api" long-name="Added DevSound Control Msg Hdlr API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_msg_hdlr_api/group"/>
-</component>
-<component name="added_devsound_control_proxy_api" long-name="Added DevSound Control Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_proxy_api/group"/>
-</component>
-<component name="audio_effects_msg_hdlr_api" long-name="Audio Effects Message Handler API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_msg_hdlr_api/group"/>
-</component>
-<component name="audio_effects_proxy_api" long-name="Audio Effects Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_proxy_api/group"/>
-</component>
-<component name="audio_policy_header_api" long-name="Audio Policy Header API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="audio_routing_proxy_api" long-name="Audio Routing Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_routing_proxy_api/group"/>
-</component>
-<component name="custom_interface_builder_api" long-name="Custom Interface Builder API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_builder_api/group"/>
-</component>
-<component name="custom_interface_message_handler_factory_api" long-name="Custom Interface Message Handler Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_message_handler_factory_api/group"/>
-</component>
-<component name="custom_interface_proxy_factory_api" long-name="Custom Interface Proxy Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_proxy_factory_api/group"/>
-</component>
-<component name="custom_interface_utility_api" long-name="Custom Interface Utility API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_utility_api/group"/>
-</component>
-<component name="devsound_adaptation_api" long-name="DevSound Adaptation API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/devsound_adaptation_api/group"/>
-</component>
-<component name="display_posting_api" long-name="Display Posting API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="eaac_plus_decoder_interface_proxy_api" long-name="eAAC Plus Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="error_concealment_interface_proxy_api" long-name="Error Concealment Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
-</component>
-<component name="fm_radio_adaptation_api" long-name="FM Radio Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_decoder_interface_proxy_api" long-name="G711 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_encoder_interface_proxy_api" long-name="G711 Encoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_decoder_interface_proxy_api" long-name="G729 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_encoder_interface_msg_hdlr_api" long-name="G729 Encoder Interface Message Handler API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</component>
-<component name="ilbc_decoder_interface_proxy_api" long-name="Ilbc Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ilbc_encoder_interface_proxy_api" long-name="Ilbc Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="mdf_plugin_uids" long-name="MDF Plug-in UIDs" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/mdf_plugin_uids/group"/>
-</component>
-<component name="multimedia_fourcc_definitions_api" long-name="Multimedia FourCC Definitions API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/multimedia_fourcc_definitions_api/group"/>
-</component>
-<component name="nokia_audio_policy_header_api" long-name="Nokia Audio Policy Header API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/nokia_audio_policy_header_api/group"/>
-</component>
-<component name="nokia_multimedia_fourcc_definitions_api" long-name="Nokia Multimedia Fourcc Definitions API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ra8_decoder_interface_proxy_api" long-name="RA8 Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
-</component>
-<component name="rds_adaptation_api" long-name="RDS Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="restricted_audio_output_proxy_api" long-name="Restricted Audio Output Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="sbc_encoder_interface_proxy_api" long-name="SBC Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/sbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="secure_output_mdf_custom_interface" long-name="Secure Output MDF Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="speech_encoder_config_proxy_api" long-name="Speech Encoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/speech_encoder_config_proxy_api/group"/>
-</component>
-<component name="telephony_audio_routing_client_api" long-name="Telephony Audio Routing Client API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_client_api/group"/>
-</component>
-<component name="telephony_audio_routing_manager_api" long-name="Telephony Audio Routing Manager API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_manager_api/group"/>
-</component>
-<component name="video_buffer_management_mdf_custom_interface" long-name="Video Buffer Management MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_buffer_management_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_rotation_mdf_custom_interface" long-name="Video Decoder Rotation MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_scaling_mdf_custom_interface" long-name="Video Decoder Scaling MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
-</component>
-<component name="video_reclaim_extbuffers_ci" long-name="Video Reclaim Extbuffers Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_reclaim_extbuffers_ci/group"/>
-</component>
-<component name="video_window_control_custom_interface" long-name="Video Window Control Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="wma_decoder_interface_proxy_api" long-name="WMA Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/wma_decoder_interface_proxy_api/group"/>
-</component>
-<component name="eaacplusutil_api" long-name="EAac Plus Util API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/eaacplusutil_api/group"/>
-</component>
-<component name="frametable_api" long-name="Frametable API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/frametable_api/group"/>
-</component>
-</collection>
-<collection name="devsoundextensions" long-name="Devsound Extensions" level="device-fw">
-<component name="drmaudioplayer" filter="s60" long-name="DRM Audio Player">
-<unit bldFile="os/mm/devsoundextensions/drmaudioplayer/group"/>
-</component>
-<component name="mmextfw" filter="s60" long-name="Multimedia Extension Framework">
-<unit bldFile="os/mm/devsoundextensions/mmextfw/group"/>
-</component>
-<component name="audiorouting" filter="s60" long-name="Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/audiorouting/group"/>
-</component>
-<component name="effects" filter="s60" long-name="Effects">
-<unit bldFile="os/mm/devsoundextensions/effects/group"/>
-</component>
-<component name="effectspresets" filter="s60" long-name="Effects Presets">
-<unit bldFile="os/mm/devsoundextensions/effectspresets/group"/>
-</component>
-<component name="effectspresets_utils" filter="s60" long-name="Effects Presets Utils">
-<!-- need to #include the lot from a single bld.inf
- Also move to a standard component location, not under effectspresets -->
-<unit bldFile="os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
-<unit bldFile="os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
-</component>
-<component name="telephonyaudiorouting" filter="s60" long-name="Telephony Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/group"/>
-</component>
-<component name="mmfcustominterfaces" filter="s60" long-name="MMF Custom Interfaces">
-<unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/group"/>
-</component>
-<component name="addeddevsoundcontrol" filter="s60" long-name="Added DevSound Control">
-<unit bldFile="os/mm/devsoundextensions/addeddevsoundcontrol/group"/>
-</component>
-<component name="globalaudiosettings" filter="s60" long-name="Global Audio Settings">
-<unit bldFile="os/mm/devsoundextensions/globalaudiosettings/group"/>
-</component>
-<component name="restrictedaudiooutput" filter="s60" long-name="Restricted Audio Output">
-<unit bldFile="os/mm/devsoundextensions/restrictedaudiooutput/group"/>
-</component>
-<component name="ciextnfactoryplugins" filter="s60" long-name="Custom Interface Extension Factory Plugins" plugin="Y">
-<unit bldFile="os/mm/devsoundextensions/ciextnfactoryplugins/group"/>
-</component>
-</collection>
-<collection name="mdfdevvideoextensions" long-name="MDF Dev Video Extensions" level="device-fw">
-<component name="nga_mdf_postprocessor" long-name="NGA MDF Postprocessor" filter="s60">
-<unit bldFile="os/mm/mdfdevvideoextensions/nga_mdf_postprocessor/group"/>
-</component>
-</collection>
-<collection name="audio" long-name="Audio Codecs" level="middleware">
-<component name="arm_cmmf_codecs" filter="s60" long-name="ARM CMMF Codecs" plugin="Y">
-<unit bldFile="os/mm/audio/arm_cmmf_codecs/group"/>
-</component>
-</collection>
-<collection name="video" long-name="Video Codecs" level="middleware">
-<!-- empty -->
-</collection>
-<collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
-<component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/imagingandcamerafws/imagingfws/group" mrp="os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
-</component>
-<component name="camerafw" long-name="Camera Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/imagingandcamerafws/camerafw/group" mrp="os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
-</component>
-</collection>
-<collection name="mmlibs" long-name="Multimedia Libraries" level="middleware">
-<component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmutilitylib/group" mrp="os/mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
-</component>
-<component name="mmfw" long-name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmfw/group" mrp="os/mm/mmlibs/mmfw/group/multimedia_mmf.mrp"/>
-</component>
-</collection>
-<collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
-<component name="imagingplugins" long-name="Imaging Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/imagingplugins/group" mrp="os/mm/mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
-</component>
-<component name="cameraplugins" long-name="Camera Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/cameraplugins/group" mrp="os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
-</component>
-<component name="lib3gp" long-name="3GP Library" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/mmplugins/lib3gp/group" mrp="os/mm/mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
-</component>
-<component name="mmfwplugins" long-name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/mmfwplugins/group" mrp="os/mm/mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
-</component>
-</collection>
-<collection name="mm_info" long-name="Multimedia Info" level="app-if">
-<component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc">
-<unit mrp="os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
-</component>
-<component name="mm_metadata" long-name="Multimedia Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
-<component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="^2" purpose="development">
-<unit bldFile="os/mm/mmresourcemgmt/mmresctrl/group" mrp="os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
-</component>
-</collection>
-<collection name="mmdevicefw" long-name="Multimedia Device Framework" level="device-fw">
-<component name="mdf" long-name="Media Device Framework" introduced="9.2" purpose="mandatory">
-<unit bldFile="os/mm/mmdevicefw/mdf/group" mrp="os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
-</component>
-<component name="speechrecogsupport" long-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 name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
-<component name="videorenderer" long-name="Video Renderer" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/mmswadaptation/videorenderer/group" mrp="os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
-</component>
-</collection>
-<collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw"/>
-<collection name="omxil" long-name="OpenMAX IL" level="hw-if">
-<component name="omxilapi" long-name="OpenMAX IL API" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilapi/group" mrp="os/mm/omxil/omxilapi/group/multimedia_omx_il_api.mrp" version="1"/>
-</component>
-<component name="omxilcore" long-name="OpenMAX IL Core" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcore/group" mrp="os/mm/omxil/omxilcore/group/multimedia_omx_il_core.mrp" version="1"/>
-</component>
-<component name="omxilcomponentcommon" long-name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcomponentcommon/group" mrp="os/mm/omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp" version="1"/>
-</component>
-<component name="omxilrefcomps" long-name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilrefcomps/ref_components/group" mrp="os/mm/omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp" version="1"/>
-</component>
-<component name="mmilapi" long-name="Multimedia Integration Layer API" introduced="^3" purpose="development">
-<unit bldFile="os/mm/omxil/mmilapi/group" mrp="os/mm/omxil/mmilapi/group/multimedia_il_api.mrp"/>
-</component>
-</collection>
-<collection name="devsound" long-name="Sound Device" level="devices">
-<component name="devsoundapi" long-name="DevSound API" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/devsound/devsoundapi/group" mrp="os/mm/devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
-</component>
-<component name="a3fdevsound" long-name="A3F DevSound" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3fdevsound/group" mrp="os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
-</component>
-<component name="a3facf" long-name="A3F Audio Component Framework" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3facf/group" mrp="os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
-</component>
-<component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/devsound/devsoundpluginsupport/group" mrp="os/mm/devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
-</component>
-<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">
-<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">
-<unit bldFile="os/mm/devsound/a3ftrace/group" mrp="os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
-</component>
-<component name="a3fsrvstart" long-name="A3F Server Start" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
-</component>
-</collection>
-<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
-<component name="devsoundhwdeviceapi" long-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 name="a3facl" long-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 name="a3fdevsoundcustomisation" long-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"/>
-</component>
-<component name="refacladapt" long-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"/>
-</component>
-<component name="videohai" long-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 name="dvbhreceiverhai" long-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>
-</block>
-<block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
-<collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
-<component name="exif_api" long-name="Exif API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagingext_plat" long-name="Imaging Extensions Platform Interfaces" level="app-if">
-<component name="jpeg2000_icl_plugin_api" long-name="JPEG2000 ICL plugin API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/jpeg2000_icl_plugin_api/group"/>
-</component>
-<component name="extended_icl_jpeg_api" long-name="Extended ICL Jpeg API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
-</component>
-<component name="h324_annex_k_custom_api" long-name="H324 Annex K Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/h324_annex_k_custom_api/group"/>
-</component>
-<component name="ecam_orientation_custom_api" long-name="ECam Orientation Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_orientation_custom_api/group"/>
-</component>
-<component name="ecam_ui_orientation_override_custom_api" long-name="ECam UI Orientation Override Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
-</component>
-<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>
-</collection>
-<collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
-<component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
-<unit bldFile="os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
-</component>
-<component name="imageadaptationextensions_build" filter="s60" long-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"/>
-</component>
-</collection>
-<collection name="imagingmodules" long-name="Imaging Modules" level="hw-if">
-<component name="exiflib" filter="s60" long-name="Exif Library">
-<unit bldFile="os/imagingext/imagingmodules/exiflib/group"/>
-</component>
-<component name="jp2kcodec" filter="s60" long-name="JPEG2000 Decoder Plugin" plugin="Y">
-<unit bldFile="os/imagingext/imagingmodules/jp2kcodec/group"/>
-</component>
-</collection>
-</block>
-<block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
-<component name="vgi" filter="s60" long-name="VGI">
-<unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
-</component>
-</collection>
-<collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adaptations">
-<component name="m3gcore11" filter="s60" long-name="M3G Core 1.1">
-<unit bldFile="os/graphics/m3g/m3gcore11/group"/>
-</component>
-</collection>
-<collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines">
-<component name="graphicsresource" long-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 name="graphicsresourceadaptation" long-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"/>
-</component>
-</collection>
-<collection name="graphicsutils" long-name="Graphics Utils" level="engines">
-<component name="commongraphicsheaders" long-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 name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
-<!-- displayldd to be moved here -->
-<component name="surfacemgr" long-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 name="graphicscomposition" long-name="Graphics Composition" level="engines">
-<component name="openwfcinterface" long-name="OpenWF Composition Interface" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfcinterface/group" mrp="os/graphics/graphicscomposition/openwfcinterface/group/graphics_openwfcinterface.mrp"/>
-</component>
-<component name="openwfcompositionengine" long-name="OpenWF Composition Engine" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/graphicscomposition/openwfcompositionengine/group" mrp="os/graphics/graphicscomposition/openwfcompositionengine/group/graphics_openwfcompositionengine.mrp"/>
-</component>
-<component name="openwfsupport" long-name="OpenWF Support" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfsupport/group" mrp="os/graphics/graphicscomposition/openwfsupport/group/graphics_openwfsupport.mrp"/>
-</component>
-<component name="surfaceupdate" long-name="Surface Update" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/surfaceupdate/group" mrp="os/graphics/graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
-</component>
-</collection>
-<collection name="graphicstest" long-name="Graphics Test" level="app-if">
-<component name="uibench" long-name="UI Bench" introduced="9.2" purpose="development">
-<unit bldFile="os/graphics/graphicstest/uibench/group" mrp="os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
-</component>
-</collection>
-<collection name="graphics_plat" long-name="Graphics Platform Interfaces" level="app-if">
-<component name="m3g_core_api" filter="sf_build" long-name="M3G Core API" class="api">
-<unit bldFile="os/graphics/graphics_plat/m3g_core_api/group"/>
-</component>
-</collection>
-<collection name="graphics_info" long-name="Graphics Info" level="app-if">
-<component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc">
-<unit mrp="os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
-</component>
-<component name="graphics_metadata" long-name="Graphics Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
-</component>
-</collection>
-<collection name="windowing" long-name="Windowing" level="app-if">
-<component name="windowserver" long-name="Window Server" purpose="mandatory">
-<unit bldFile="os/graphics/windowing/windowserver/group" mrp="os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
-</component>
-<component name="windowserverplugins" long-name="Window Server Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/windowing/windowserverplugins/group" mrp="os/graphics/windowing/windowserverplugins/group/graphics_wserv_std_plugins.mrp"/>
-</component>
-</collection>
-<collection name="printingservices" long-name="Printing Services" level="app-if">
-<component name="printerdriversupport" long-name="Printer Driver Support" purpose="optional">
-<unit bldFile="os/graphics/printingservices/printerdriversupport/group" mrp="os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
-</component>
-<component name="printerdrivers" long-name="Printer Drivers" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/printingservices/printerdrivers/group" mrp="os/graphics/printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
-</component>
-</collection>
-<collection name="fbs" long-name="Font and Bitmap Server" level="device-interface">
-<component name="fontandbitmapserver" long-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 name="opengles" long-name="OpenGLES" level="internal-adaptations">
-<component name="openglesinterface" long-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 name="opengles_stub" filter="sf_build" long-name="OpenGL ES Stub" purpose="optional" introduced="^2">
-<unit bldFile="os/graphics/opengles/openglesinterface/group/opengles_stub"/>
-</component>
-</collection>
-<collection name="openvg" long-name="OpenVG" level="internal-adaptations">
-<component name="openvginterface" long-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 name="openvg11" filter="s60" long-name="OpenVG 1.1">
-<!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
-<unit bldFile="os/graphics/openvg/openvginterface/group/openvg11"/>
-</component>
-<component name="sfopenvg" filter="sf_build" long-name="Khronos OpenVG Reference Implementation" introduced="^2" purpose="optional">
-<unit bldFile="os/graphics/openvg/openvgrefimplementation/sfopenvg/group"/>
-</component>
-</collection>
-<collection name="egl" long-name="EGL" level="internal-adaptations">
-<component name="eglinterface" long-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 name="eglswitch" long-name="EGL Switch" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglswitch/group" mrp="os/graphics/egl/eglswitch/group/graphics_eglswitch.mrp"/>
-</component>
-<component name="eglrefimpl" long-name="EGL Reference Implementation" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglrefimpl/group" mrp="os/graphics/egl/eglrefimpl/group/graphics_eglrefimpl.mrp"/>
-</component>
-<component name="egltest" long-name="EGL Tests" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/egl/egltest/group" mrp="os/graphics/egl/egltest/group/graphics_egltest.mrp"/>
-</component>
-</collection>
-<collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
-<component name="gdi" long-name="GDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/gdi/group" mrp="os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
-</component>
-<component name="bitgdi" long-name="BitGDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
-</component>
-<component name="colourpalette" long-name="Colour Palette" introduced="7.0s" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
-</component>
-<component name="screendriver" long-name="Screen Driver" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/graphicsdeviceinterface/screendriver/group" mrp="os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
-</component>
-<component name="directgdi" long-name="DirectGDI" introduced="^3" deprecated="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/directgdi/group" mrp="os/graphics/graphicsdeviceinterface/directgdi/group/graphics_directgdi.mrp"/>
-</component>
-<component name="directgdiinterface" long-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 name="directgdiadaptation" long-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"/>
-</component>
-</collection>
-<collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
-<component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/gdi_tools/group" mrp="os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
-</component>
-</collection>
-<collection name="graphicsapitest" long-name="Graphics API Tests" level="app-if"/>
-</block>
-<block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
-<collection name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" level="text">
-<component name="findutil_api" long-name="Find Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/findutil_api/group"/>
-</component>
-<component name="japanese_language_utilities_api" long-name="Japanese Language Utilities API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
-</component>
-<component name="sortutil_api" long-name="Sorting Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/sortutil_api/group"/>
-</component>
-</collection>
-<collection name="textandloc_pub" long-name="Text and Localisation Public Interfaces" level="text">
-<component name="directory_localizer_api" long-name="Directory Localizer API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_pub/directory_localizer_api/group"/>
-</component>
-</collection>
-<collection name="charconvfw" long-name="Character Conversion" level="encoding">
-<component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional">
-<unit bldFile="os/textandloc/charconvfw/charconv_fw/group" mrp="os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
-</component>
-<component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/charconvplugins/group" mrp="os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
-</component>
-<component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/fatfilenameconversionplugins/group" mrp="os/textandloc/charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
-</component>
-</collection>
-<collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
-<component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/textshaperplugin/group" mrp="os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
-</component>
-<component name="fontstore" long-name="Font Store" purpose="mandatory">
-<unit bldFile="os/textandloc/fontservices/fontstore/group" mrp="os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
-</component>
-<component name="textrendering" long-name="Text Rendering" purpose="mandatory" class="placeholder">
-<!-- placeholder for text code from GDI -->
-</component>
-<component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/freetypefontrasteriser/group" mrp="os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
-</component>
-<component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional">
-<unit bldFile="os/textandloc/fontservices/referencefonts/group" mrp="os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
-</component>
-</collection>
-<collection name="textlayout" long-name="Text Layout" level="text">
-<component name="texthandling" long-name="Text Handling" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/texthandling/group" mrp="os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
-</component>
-<component name="textformatting" long-name="Text Formatting" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/textformatting/group" mrp="os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
-</component>
-</collection>
-<collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
-<!-- components in this collection need to be moved to the right collection.
- Either move into the units' directories, or create a new textandlocutils directory -->
-<component name="numbergrouping" filter="s60" long-name="Number Grouping">
-<unit bldFile="os/textandloc/charconvfw/numbergrouping/group"/>
-</component>
-<component name="jplangutil" filter="s60" long-name="Japanese Language Utilities">
-<unit bldFile="os/textandloc/charconvfw/jplangutil/group"/>
-</component>
-<component name="sortutil" filter="s60" long-name="Sorting Utility">
-<unit bldFile="os/textandloc/charconvfw/sortutil/group"/>
-</component>
-<component name="inlinetext" filter="s60" long-name="Inline Text">
-<unit bldFile="os/textandloc/charconvfw/inlinetext/group"/>
-</component>
-<component name="nearestlangutil" long-name="Nearest Language Util" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-<component name="numberformatting" long-name="Number Formatting" introduced="7.0s" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/numberformatting/group" mrp="os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
-</component>
-</collection>
-<collection name="localesupport" long-name="Locale Support" level="util">
-<component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/localisation/localesupport" mrp="os/textandloc/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
-</component>
-<component name="initlocale" long-name="Initialise Locale" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-</collection>
-<collection name="textandloctools" long-name="Text and Localisation Tools" level="tools">
-<component name="fontcompiler" long-name="Font Compiler" purpose="development" class="placeholder PC">
-<!-- placeholder for split from GDI Tools -->
-</component>
-<component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/bitmapfonttools/group" mrp="os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
-</component>
-</collection>
-<collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
-<component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
-<collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
-<component name="xmlsrv_plat_build" long-name="XML Services Platform Interface Build" filter="s60" class="api">
-<!-- need to fix the configuration used here.
- Either destribute to other components or use the new feature flags confguration mechanisms.
- Remove this component and uncomment the other units when fixed-->
-<unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
-</component>
-<component name="xml_encryption_api" long-name="XML Encryption API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/> -->
-</component>
-<component name="xml_signature_api" long-name="XML Signature API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_signature_api/group"/> -->
-</component>
-<component name="xml_security_engine_utils_api" long-name="XML Security Engine Utils API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/> -->
-</component>
-</collection>
-<collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
-<component name="xmlseccertman" filter="s60" long-name="XML Security Certificate Manager">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
-</component>
-<component name="xmlsec" filter="s60" long-name="XML Security">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsec/group"/>
-</component>
-<component name="xmlseccrypto" filter="s60" long-name="XML Security Crypto">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccrypto/group"/>
-</component>
-<component name="xmlsecwrapper" filter="s60" long-name="XML Security Wrapper">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsecwrapper/group"/>
-</component>
-</collection>
-<collection name="xml" long-name="XML" level="generic">
-<component name="xmlfw" long-name="XML Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmlfw/group" mrp="os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
-</component>
-<component name="libxml2libs" long-name="Libxml2 Libraries" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/libxml2libs/group" mrp="os/xmlsrv/xml/libxml2libs/group/syslibs_libxml2.mrp"/>
-</component>
-<component name="legacyminidomparser" long-name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/legacyminidomparser/GROUP" mrp="os/xmlsrv/xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp"/>
-</component>
-<component name="xmldomandxpath" long-name="XML DOM and XPath" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmldomandxpath/group" mrp="os/xmlsrv/xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
-</component>
-<component name="xmlexpatparser" long-name="XML Expat Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmlexpatparser/group" mrp="os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
-</component>
-<component name="xmllibxml2parser" long-name="XML Libxml2 Parser" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmllibxml2parser/group" mrp="os/xmlsrv/xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
-</component>
-<component name="wbxmlparser" long-name="WBXML Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/wbxmlparser/group" mrp="os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
-</component>
-</collection>
-<collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
-<component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="deviceplatformrelease" level="services" long-name="Device Platform Release" levels="bld mid top">
-<collection name="s60extras" long-name="S60 Extras" level="mid">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="s60extras_build" filter="s60" long-name="S60 Extras Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/S60Extras/group"/>
-</component>
-</collection>
-<collection name="locfiles" long-name="Locale Files" level="mid">
-<component name="locfiles_build" filter="s60" long-name="S60 Locale Files Build" purpose="development" class="config">
-<!-- need to move component down a directory -->
-<unit bldFile="os/deviceplatformrelease/locfiles/group"/>
-</component>
-<component name="locfiles_set1" long-name="Locale Files Set 1" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set1"/>
-</component>
-<component name="locfiles_set2" long-name="Locale Files Set 2" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set2"/>
-</component>
-<component name="locfiles_set3" long-name="Locale Files Set 3" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set3"/>
-</component>
-<component name="locfiles_set4" long-name="Locale Files Set 4" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set4"/>
-</component>
-<component name="locfiles_set5" long-name="Locale Files Set 5" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set5"/>
-</component>
-<component name="locfiles_set6" long-name="Locale Files Set 6" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set6"/>
-</component>
-<!-- is the a problem with SF builds with the following? -->
-<component name="locfiles_set7" long-name="Locale Files Set 7" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set7"/>
-</component>
-<component name="locfiles_set8" long-name="Locale Files Set 8" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set8"/>
-</component>
-<component name="locfiles_set9" long-name="Locale Files Set 9" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set9"/>
-</component>
-<component name="locfiles_set10" long-name="Locale Files Set 10" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set10"/>
-</component>
-<component name="locfiles_set11" long-name="Locale Files Set 11" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set11"/>
-</component>
-<component name="locfiles_set12" long-name="Locale Files Set 12" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set12"/>
-</component>
-<component name="locfiles_set13" long-name="Locale Files Set 13" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set13"/>
-</component>
-<component name="locfiles_set14" long-name="Locale Files Set 14" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set14"/>
-</component>
-<component name="locfiles_set15" long-name="Locale Files Set 15" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set15"/>
-</component>
-<component name="locfiles_set16" long-name="Locale Files Set 16" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set16"/>
-</component>
-</collection>
-<collection name="version" long-name="Version" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="version_build" filter="s60" long-name="Version Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/Version/group"/>
-</component>
-</collection>
-<collection name="helps_loc2" long-name="Helps Locale 2" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helps_loc2_build" long-name="Helps Locale 2 Build" filter="s60">
-<unit bldFile="os/deviceplatformrelease/helps_loc2/group"/>
-</component>
-</collection>
-<collection name="sf_config" long-name="SF Config" level="mid">
-<component name="config" filter="s60" long-name="Config" purpose="development" class="config"/>
-<component name="cenrep" filter="sf_build" long-name="ConE Central Repository Config" purpose="development" class="config">
-<!-- will shoudl give the id/path something more unique than cenrep -->
-<unit bldFile="os/deviceplatformrelease/sf_config/cenrep/group"/>
-</component>
-<component name="rombuild_syborg" filter="sf_build" long-name="Syborg iMaker Config" purpose="development" introduced="^3" class="config">
-<unit bldFile="os/deviceplatformrelease/sf_config/rombuild/syborg/group"/>
-</component>
-<component name="rombuild_zoom2" filter="sf_build" long-name="Zoom2 iMaker Config" purpose="development" introduced="^3" class="config">
-<unit bldFile="os/deviceplatformrelease/sf_config/rombuild/zoom2/group"/>
-</component>
-</collection>
-<!-- should be located locally in buildplatforms/group. NB. This is a different package! -->
-<collection name="s60bld" long-name="S60 Build">
-<component name="buildplatforms" filter="s60" long-name="Build Platforms">
-<unit bldFile="tools/buildplatforms/group"/>
-</component>
-</collection>
-<collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
-<component name="cedarutils" long-name="Cedar Utils" purpose="development">
-<unit mrp="os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
-</component>
-<component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt" purpose="development" class="config">
-<unit mrp="os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
-</component>
-<component name="foundation_s60_packages" long-name="Foundation S60 Packages" introduced="^3" deprecated="^3" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/symbianosbld/foundation_s60_packages/foundation_s60_packages.mrp"/>
-</component>
-</collection>
-<collection name="foundation_system" long-name="Foundation System" level="top">
-<component name="system_model" long-name="System Model" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
-</component>
-</collection>
-<collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
-<component name="deviceplatformrelease_metadata" long-name="Device Platform Release Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="osrndtools" level="services" long-name="OS R&D tools" levels="fw trace">
-<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"/>
-</component>
-<component name="testinterface" filter="s60" long-name="Test Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/testinterface/group"/>
-</component>
-<component name="testserver" filter="s60" long-name="Test Server" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserver/group"/>
-</component>
-<component name="testengine" filter="s60" long-name="Test Engine" purpose="development">
-<unit bldFile="os/osrndtools/stif/testengine/group"/>
-</component>
-<component name="testserverstarter" filter="s60" long-name="Test Server Starter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserverstarter/group"/>
-</component>
-<component name="stiftfwif" filter="s60" long-name="STIF Test Framework Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/stiftfwif/group"/>
-</component>
-<component name="consoleui" filter="s60" long-name="Console UI" purpose="development">
-<unit bldFile="os/osrndtools/stif/consoleui/group"/>
-</component>
-<component name="testcombiner" filter="s60" long-name="Test Combiner" purpose="development">
-<unit bldFile="os/osrndtools/stif/testcombiner/group"/>
-</component>
-<component name="demomodule" filter="s60" long-name="Demo Module" purpose="development">
-<unit bldFile="os/osrndtools/stif/demomodule/group"/>
-</component>
-<component name="atslogger" filter="s60" long-name="ATS Logger" purpose="development">
-<unit bldFile="os/osrndtools/stif/atslogger/group"/>
-</component>
-<component name="atsinterface" filter="s60" long-name="ATS Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/atsinterface/group"/>
-</component>
-<component name="testscripter" filter="s60" long-name="Test Scripter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testscripter/group"/>
-</component>
-<component name="suevent" filter="s60" long-name="SU Event" purpose="development">
-<unit bldFile="os/osrndtools/stif/suevent/group"/>
-</component>
-<component name="stifkerneltestclassbase" filter="s60" long-name="STIF Kernel Test Class Base" purpose="development">
-<!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
-<!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
-</component>
-<component name="stif_build" filter="s60" long-name="STIF Build" purpose="development">
-<!-- move exports into self-contained component. Remove this when configuration is in place-->
-<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">
-<unit bldFile="os/osrndtools/memspy/memspy_plat/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/engine/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/console/group"/>
-</component>
-<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>
-</collection>
-<collection name="hti" long-name="Harmonized Test Interface" level="trace">
-<component name="hti_plat" filter="s60" long-name="HTI Platform Interfaces" purpose="development" class="api">
-<unit bldFile="os/osrndtools/hti/hti_plat/group"/>
-</component>
-<component name="hticfg" filter="s60" long-name="HTI Config" purpose="development">
-<unit bldFile="os/osrndtools/hti/hticfg/group"/>
-</component>
-<component name="htiautostart" filter="s60" long-name="HTI Autostart" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiautostart/group"/>
-</component>
-<component name="htiframework" filter="s60" long-name="HTI Framework" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiframework/group"/>
-</component>
-<component name="hticommplugins" filter="s60" long-name="HTI Communication Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
-</component>
-<component name="htiserviceplugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
-</component>
-<component name="htifilehlp" filter="s60" long-name="HTI File Help" purpose="development">
-<unit bldFile="os/osrndtools/hti/htifilehlp/group"/>
-</component>
-<component name="htiwatchdog" filter="s60" long-name="HTI Watchdog" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiwatchdog/group"/>
-</component>
-<component name="hti_build" filter="s60" long-name="HTI Build" purpose="development">
-<!-- move exports into self-contained component.-->
-<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">
-<block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
-<collection name="appsupport_pub" long-name="Generic Application Support Public Interfaces" level="specific">
-<component name="flash_viewer_framework_api" long-name="Flash Viewer Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
-</component>
-<component name="network_status_api" long-name="Network Status API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/network_status_api/group"/>
-</component>
-</collection>
-<collection name="appsupport_plat" long-name="Generic Application Support Platform Interfaces" level="specific">
-<component name="action_plugin_api" long-name="Action Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/action_plugin_api/group"/>
-</component>
-<component name="application_orientation_api" long-name="Application Orientation API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/application_orientation_api/group"/>
-</component>
-<component name="context_access_api" long-name="Context Access API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_access_api/group"/>
-</component>
-<component name="context_framework_services_api" long-name="Context Framework Services API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_services_api/group"/>
-</component>
-<component name="context_framework_client_api" long-name="Context Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_client_api/group"/>
-</component>
-<component name="context_framework_listener_api" long-name="Context Framework Listener API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_listener_api/group"/>
-</component>
-<component name="context_framework_version_api" long-name="Context Framework Version API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_version_api/group"/>
-</component>
-<component name="context_source_plugin_api" long-name="Context Source Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_plugin_api/group"/>
-</component>
-<component name="context_source_settings_manager_api" long-name="Context Source Settings Manager API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_settings_manager_api/group"/>
-</component>
-<component name="context_subscription_api" long-name="Context Subscription API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_subscription_api/group"/>
-</component>
-<component name="key_event_framework_api" long-name="Key Event Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_api/group"/>
-</component>
-<component name="key_event_framework_mapper_api" long-name="Key Event Framework Mapper API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_mapper_api/group"/>
-</component>
-<component name="media_keys_definition_api" long-name="Media Keys Definition API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/media_keys_definition_api/group"/>
-</component>
-<component name="ood_threshold_api" long-name="OOD Threshold API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/ood_threshold_api/group"/>
-</component>
-<component name="oom_monitor_api" long-name="OOM Monitor API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_api/group"/>
-</component>
-<component name="oom_monitor_plugin_api" long-name="OOM Monitor Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_plugin_api/group"/>
-</component>
-<component name="operation_provider_api" long-name="Operation Provider API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/operation_provider_api/group"/>
-</component>
-<component name="phonecmdhandler_api" long-name="Phone Command Handler API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/phonecmdhandler_api/group"/>
-</component>
-<component name="restore_factory_settings_api" long-name="Restore Factory Settings API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_api/group"/>
-</component>
-<component name="restore_factory_settings_plugin_api" long-name="Restore Factory Settings Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_plugin_api/group"/>
-</component>
-<component name="secondary_display_accfw_api" long-name="Secondary Display Accessory Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_accfw_api/group"/>
-</component>
-<component name="secondary_display_startup_api" long-name="Secondary Display Startup API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_startup_api/group"/>
-</component>
-<component name="secondary_display_sysap_api" long-name="Secondary Display System Application API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_sysap_api/group"/>
-</component>
-<component name="secondary_display_system_state_api" long-name="Secondary Display System State API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_system_state_api/group"/>
-</component>
-<component name="sensor_user_setting_api" long-name="Sensor User Setting API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/sensor_user_setting_api/group"/>
-</component>
-<component name="startup_configuration_api" long-name="Startup Configuration API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/startup_configuration_api/group"/>
-</component>
-<component name="system_application_key_handler_plugin_api" long-name="System Application Key Handler Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_key_handler_plugin_api/group"/>
-</component>
-<component name="system_application_light_control_plugin_api" long-name="System Application Light Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_light_control_plugin_api/group"/>
-</component>
-<component name="system_application_notification_api" long-name="System Application Notification API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_notification_api/group"/>
-</component>
-<component name="system_application_plugin_callback_api" long-name="System Application Plug-in Callback API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
-</component>
-</collection>
-<collection name="contextframework" long-name="Context Framework" level="framework">
-<!-- the units that are commented out need to be put back when configuration is in place.
- They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
-<component name="cfw" filter="s60" long-name="Context Framework">
-<!--<unit bldFile="contextframework/cfw/group"/> -->
-</component>
-<component name="cfwplugins" filter="s60" long-name="Context Framework Plugins" plugin="Y">
-<!--<unit bldFile="contextframework/cfwplugins/group"/>-->
-</component>
-<component name="contextframework_build" filter="s60" long-name="Context Framework Build">
-<unit bldFile="mw/appsupport/contextframework/group"/>
-</component>
-</collection>
-<collection name="coreapplicationuis" long-name="Core Application UIs" level="server">
-<component name="dbrecovery" filter="s60" long-name="Database Recovery">
-<unit bldFile="mw/appsupport/coreapplicationuis/dbrecovery/group"/>
-</component>
-<component name="nspswsplugin" filter="s60" long-name="NSPS WS Plugin" plugin="Y">
-<!-- No Service Power Save? Window Server? Please elaborate-->
-<unit bldFile="mw/appsupport/coreapplicationuis/nspswsplugin/group"/>
-</component>
-<component name="rfs" filter="s60" long-name="Restore Factory Settings">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfs/group"/>
-</component>
-<component name="rfsplugins" filter="s60" long-name="Restore Factory Settings Plugins" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/group"/>
-</component>
-<component name="sysap" filter="s60" long-name="System Application">
-<unit bldFile="mw/appsupport/coreapplicationuis/sysap/group"/>
-</component>
-<component name="variatedsettings" filter="s60" long-name="Variated Settings" class="config">
-<unit bldFile="mw/appsupport/coreapplicationuis/variatedsettings/group"/>
-</component>
-<component name="accfwuinotifier" filter="s60" long-name="Accessory Framework UI Notifier" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/accfwuinotifier/group"/>
-</component>
-<component name="kefmapper" filter="s60" long-name="Key Event Framework">
-<unit bldFile="mw/appsupport/coreapplicationuis/kefmapper/group"/>
-</component>
-<component name="advancedtspcontroller" filter="s60" long-name="Advanced TSP Controller">
-<unit bldFile="mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
-</component>
-<component name="powersaveutilities" filter="s60" long-name="Power Save Utilities">
-<unit bldFile="mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
-</component>
-<component name="gsserverenginestub" filter="s60" long-name="GS Server Engine Stub">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
-</component>
-<component name="gsserverengine" filter="s60" long-name="GS Server Engine">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverengine/group"/>
-</component>
-<component name="sensordatacompensatorplugin" filter="s60" long-name="Sensor Data Compensator Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/group"/>
-</component>
-</collection>
-<collection name="flashliteapi_3_1" long-name="Flash Lite API 3.1" level="specific">
-<!-- collection is really a component. Move down a directory -->
-<component name="flashliteapi_3_1_build" long-name="Flash Lite API Build" filter="s60" introduced="^2"/>
-</collection>
-<collection name="mediakeys" long-name="Media Keys" level="plugin">
-<!-- collection is really a component. Move down a directory -->
-<component name="mediakeys_build" filter="s60" long-name="Media Keys Build">
-<unit bldFile="mw/appsupport/mediakeys/group"/>
-</component>
-</collection>
-<collection name="startupservices" long-name="Startup Services" level="system">
-<component name="splashscreen" filter="s60" long-name="Splash Screen">
-<unit bldFile="mw/appsupport/startupservices/splashscreen/group"/>
-</component>
-<component name="startupanimation" filter="s60" long-name="Startup Animation">
-<unit bldFile="mw/appsupport/startupservices/startupanimation/group"/>
-</component>
-<component name="startup" long-name="Startup Application" filter="s60">
-<unit bldFile="mw/appsupport/startupservices/startup/group"/>
-</component>
-</collection>
-<collection name="sysresmonitoring" long-name="System Resource Monitoring" level="system">
-<component name="oodmonitor" filter="s60" long-name="OOD Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oodmonitor/group"/>
-</component>
-<component name="oommonitor" filter="s60" long-name="OOM Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oommonitor/group"/>
-</component>
-</collection>
-<collection name="systemsettings" long-name="System Settings" level="system">
-<component name="gssensorplugin" filter="s60" long-name="GS Sensor Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gssensorplugin/group"/>
-</component>
-<component name="gsaccessoryplugin" filter="s60" long-name="GS Accessory Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gsaccessoryplugin/group"/>
-</component>
-</collection>
-<collection name="filehandling" long-name="File Handling" level="server">
-<component name="fileconverterfw" long-name="File Converter Framework" purpose="optional">
-<unit bldFile="mw/appsupport/filehandling/fileconverterfw/group" mrp="mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
-</component>
-<component name="htmltorichtextconverter" long-name="HTML to RichText Converter" introduced="7.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/htmltorichtextconverter/group" mrp="mw/appsupport/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
-</component>
-<component name="richtexttohtmlconverter" long-name="RichText to HTML Converter" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
-</component>
-</collection>
-<collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
-<component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
-</component>
-</collection>
-<collection name="commonappservices" long-name="Common Application Services" level="framework">
-<component name="alarmserver" long-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"/>
-</component>
-<component name="alarmservertest" long-name="Alarm Server Test" deprecated="^3" introduced="8.1" purpose="development">
-<unit bldFile="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
-</component>
-<component name="appservicesdocs" long-name="Application Services Documentation" purpose="development" class="doc">
-<unit mrp="mw/appsupport/commonappservices/appservicesdocs/app-services_documentation.mrp"/>
-</component>
-<component name="backuprestorenotification" long-name="Backup Restore Notification" introduced="8.1" purpose="optional">
-<unit bldFile="mw/appsupport/commonappservices/backuprestorenotification/group" mrp="mw/appsupport/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
-</component>
-</collection>
-<collection name="tzservices" long-name="Time Zone Services" level="plugin">
-<component name="tzserver" long-name="Time Zone Server" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzserver/group" mrp="mw/appsupport/tzservices/tzserver/group/app-services_tz.mrp"/>
-</component>
-<component name="tzloc" long-name="Time Zone Localization" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzloc/group" mrp="mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
-</component>
-<component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzlocrscfactory/group" mrp="mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
-</component>
-<component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzdatabase/group" mrp="mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
-</component>
-</collection>
-<collection name="contenthandling" long-name="Content Handling" level="plugin">
-<component name="webrecognisers" long-name="Web Recognisers" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/contenthandling/webrecognisers/group" mrp="mw/appsupport/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
-</component>
-</collection>
-<collection name="openenvutils" long-name="Open Environment Utilities" level="specific">
-<component name="commandshell" long-name="Command Shell" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/commandshell/group" mrp="mw/appsupport/openenvutils/commandshell/group/oetools_zsh.mrp"/>
-</component>
-<component name="telnetserver" long-name="Telnet Server" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/telnetserver/group" mrp="mw/appsupport/openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
-</component>
-</collection>
-<collection name="printingsupport" long-name="Printing Support" level="generic">
-<component name="printinguisupport" long-name="Printing UI Support" purpose="optional" introduced="^2" deprecated="^3">
-<unit bldFile="mw/appsupport/printingsupport/printinguisupport/group" mrp="mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
-</component>
-</collection>
-<collection name="appfw" long-name="Application Framework" level="framework">
-<component name="apparchitecture" long-name="Application Architecture" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/apparchitecture/group" mrp="mw/appsupport/appfw/apparchitecture/group/app-framework_apparc.mrp"/>
-</component>
-<component name="viewserver" long-name="View Server" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/viewserver/group" mrp="mw/appsupport/appfw/viewserver/group/app-framework_viewsrv.mrp"/>
-</component>
-</collection>
-<collection name="applaunchservices" long-name="Application Launch Services" level="generic">
-<component name="aftermarketappstarter" long-name="After Market Application Starter" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/aftermarketappstarter/group" mrp="mw/appsupport/applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
-</component>
-<component name="applaunchplugins" long-name="Application Launch Plugins" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/applaunchplugins/group" mrp="mw/appsupport/applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
-</component>
-</collection>
-<collection name="tzpcside" long-name="Time Zone PC Side" level="plugin">
-<component name="tzcompiler" long-name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config PC">
-<unit bldFile="mw/appsupport/tzpcside/tzcompiler/group" mrp="mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
-</component>
-</collection>
-<collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
-<component name="appsupport_metadata" long-name="Generic Application Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="securitysrv" level="generic" long-name="Security Services" levels="plugin framework server generic specific">
-<collection name="secsrv_plat" long-name="Security Services Platform Interfaces" level="specific">
-<component name="cms_api" long-name="CMS API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/cms_api/group"/>
-</component>
-<component name="pkcs12_parser_api" long-name="PKCS12 Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkcs12_parser_api/group"/>
-</component>
-<component name="java_utils_api" long-name="Java Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/java_utils_api/group"/>
-</component>
-<component name="wim_cert_api" long-name="WIM Cert API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/wim_cert_api/group"/>
-</component>
-<component name="device_key_store_encryption_plugin_api" long-name="Device Key Store Encryption Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/device_key_store_encryption_plugin_api/group"/>
-</component>
-<component name="x509certnameparser_api" long-name="X.509 Certificate Name Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
-</component>
-<component name="remote_lock_api" long-name="Remote Lock API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
-</component>
-<component name="pkidialog_api" long-name="PKI Dialog API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
-</component>
-<component name="provisioning_api" long-name="Provisioning API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/provisioning_api/group"/>
-</component>
-<component name="keyguard_configuration_api" long-name="Keyguard Configuration API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_configuration_api/group"/>
-</component>
-<component name="keylock_policy_api" long-name="Keylock Policy API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keylock_policy_api/group"/>
-</component>
-<component name="security_code_ui_api" long-name="Security Code UI API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
-</component>
-<component name="gba_api" long-name="GBA API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/gba_api/group"/>
-</component>
-<component name="keyguard_access_api" long-name="Keyguard Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_access_api/group"/>
-</component>
-<component name="devicelock_access_api" long-name="Device Lock Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devicelock_access_api/group"/>
-</component>
-<component name="lockapp_server_api" long-name="Lock Application Server API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
-</component>
-<component name="devencadaptation_api" long-name="Device Encryption Adaptation API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
-</component>
-<component name="devenccommonutils_api" long-name="Device Encryption Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
-</component>
-</collection>
-<collection name="cms" long-name="Certificate Management Service" level="server">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="cms_build" filter="s60" long-name="CMS" introduced="^3">
-<unit bldFile="mw/securitysrv/cms/group"/>
-</component>
-</collection>
-<collection name="pkiutilities" long-name="PKI Utilities" level="plugin">
-<component name="x509certnameparser" filter="s60" long-name="X.509 Certificate Name Parser">
-<unit bldFile="mw/securitysrv/pkiutilities/x509certnameparser/group"/>
-</component>
-<component name="pkcs12" filter="s60" long-name="PKCS #12">
-<unit bldFile="mw/securitysrv/pkiutilities/pkcs12/group"/>
-</component>
-<component name="certmanui" filter="s60" long-name="Certificate Management UI">
-<unit bldFile="mw/securitysrv/pkiutilities/certmanui/group"/>
-</component>
-<component name="ctsecuritydialogs" filter="s60" long-name="Crypto Token Security Dialogs">
-<unit bldFile="mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
-</component>
-<component name="certsaver" filter="s60" long-name="Certificate Saver">
-<unit bldFile="mw/securitysrv/pkiutilities/certsaver/group"/>
-</component>
-<component name="secmodui" filter="s60" long-name="Security Module UI">
-<unit bldFile="mw/securitysrv/pkiutilities/secmodui/group"/>
-</component>
-<component name="devicetoken" filter="s60" long-name="Device Token">
-<unit bldFile="mw/securitysrv/pkiutilities/devicetoken/group"/>
-</component>
-<component name="certificates" filter="s60" long-name="Certificates">
-<unit bldFile="mw/securitysrv/pkiutilities/Certificates/group" filter="sf_build"/>
-</component>
-<component name="pkiutilities_build" filter="s60" long-name="PKI Utilities Build">
-<!-- need to split this into the above components -->
-<unit bldFile="mw/securitysrv/pkiutilities/group"/>
-</component>
-<component name="ocsp" long-name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
-<unit bldFile="mw/securitysrv/pkiutilities/ocsp/group" mrp="mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
-</component>
-</collection>
-<collection name="wim" long-name="Wireless Identity Module " level="framework">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="wim_build" filter="s60" long-name="WIM Build">
-<unit bldFile="mw/securitysrv/wim/group"/>
-</component>
-</collection>
-<collection name="remotelock" long-name="Remote Lock" level="generic">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="remotelock_build" filter="s60" long-name="Remote Lock Build">
-<unit bldFile="mw/securitysrv/remotelock/group"/>
-</component>
-</collection>
-<collection name="securitydialogs" long-name="Security Dialogs" level="specific">
-<component name="keylockpolicyapi" filter="s60" long-name="Keylock Policy API">
-<unit bldFile="mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
-</component>
-<component name="autolock" long-name="Autolock" filter="s60">
-<unit bldFile="mw/securitysrv/securitydialogs/autolock/group"/>
-</component>
-<component name="secui" filter="s60" long-name="Security UI">
-<unit bldFile="mw/securitysrv/securitydialogs/secui/group"/>
-</component>
-<component name="securitynotifier" filter="s60" long-name="Security Notifier">
-<unit bldFile="mw/securitysrv/securitydialogs/securitynotifier/group"/>
-</component>
-<component name="lockclient" filter="s60" long-name="Lock Client" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockclient/group"/>
-</component>
-<component name="lockapp" filter="s60" long-name="Lock Application" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockapp/group"/>
-</component>
-<component name="simlockui" filter="s60" long-name="SIM Lock UI" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/simlockui/group"/>
-</component>
-</collection>
-<collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="boottimeintegritycheck_build" filter="s60" long-name="Boot Time Integrity Check Build">
-<unit bldFile="mw/securitysrv/boottimeintegritycheck/group"/>
-</component>
-</collection>
-<collection name="gba" long-name="Generic Bootstrapping Architecture" level="server">
-<component name="uicc" filter="s60" long-name="UICC" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/uicc/group"/>
-</component>
-<component name="gbaserver" filter="s60" long-name="GBA Server" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaserver/group"/>
-</component>
-<component name="gbaapi" filter="s60" long-name="GBA API" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaapi/group"/>
-</component>
-<component name="gbafilter" filter="s60" long-name="GBA HTTP Filter" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/gbafilter/group"/>
-</component>
-<component name="gba_build" filter="s60" long-name="Generic Boot Architecture Build" introduced="^2">
-<!-- need to split this into the above components, or remove #includes and make this GBA ROM -->
-<unit bldFile="mw/securitysrv/gba/group"/>
-</component>
-</collection>
-<collection name="devencdiskutils" long-name="Device Encryption Disk Utils" level="server">
-<component name="devenccommonutils" filter="s60" long-name="Device Encryption Common Utils" introduced="^3">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncCommonUtils/group"/>
-</component>
-<component name="devencrfsplugin" filter="s60" long-name="Device Encryption RFS Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncRfsPlugin/group"/>
-</component>
-<component name="pk5recognizer" filter="s60" long-name="Device Encryption Pk5 Recognizer" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/Pk5Recognizer/group"/>
-</component>
-<component name="devencstarter" filter="s60" long-name="Device Encryption Starter" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncStarter/group"/>
-</component>
-<component name="devencdiskutils" filter="s60" long-name="Device Encryption Disk Utils Build" introduced="^3">
-<!-- need to split this into the above components, or remove #includes and make this a ROM component-->
-<unit bldFile="mw/securitysrv/devencdiskutils/group"/>
-</component>
-</collection>
-<collection name="securitysrv_info" long-name="Security Services Info" level="specific">
-<component name="securitysrv_metadata" long-name="Security Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="drm" level="generic" long-name="DRM" levels="plugin framework server generic specific">
-<collection name="drm_plat" long-name="DRM Platform Interfaces" level="specific">
-<component name="roap_api" long-name="ROAP API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/roap_api/group"/>
-</component>
-<component name="drm_common_api" long-name="DRM Common API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_common_api/group"/>
-</component>
-<component name="drm_rights_api" long-name="DRM Rights API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_rights_api/group"/>
-</component>
-<component name="drm_legacy_api" long-name="DRM Legacy API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_legacy_api/group"/>
-</component>
-<component name="dcf_repository_api" long-name="DCF Repository API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/dcf_repository_api/group"/>
-</component>
-<component name="drm_service_api" long-name="DRM Service API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_service_api/group"/>
-</component>
-<component name="drm_secondary_display_api" long-name="DRM Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_secondary_display_api/group"/>
-</component>
-<component name="drm_license_manager_api" long-name="DRM License Manager API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_license_manager_api/group"/>
-</component>
-<component name="drm_utility_api" long-name="DRM Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_utility_api/group"/>
-</component>
-<component name="drm_agents_api" long-name="DRM Agents API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_agents_api/group"/>
-</component>
-<component name="wmdrm_core_api" long-name="WM DRM Core API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_core_api/group"/>
-</component>
-<component name="wmdrm_access_api" long-name="WMDRM Access API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_access_api/group"/>
-</component>
-<component name="camese_utility_api" long-name="Camese Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_utility_api/group"/>
-</component>
-<component name="camese_framework_api" long-name="Camese Framework API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_framework_api/group"/>
-</component>
-</collection>
-<collection name="drm_pub" long-name="DRM Public Interfaces" level="specific">
-<component name="drm_helper_api" long-name="DRM Helper API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_helper_api/group"/>
-</component>
-<component name="oma_drm_caf_agent_api" long-name="OMA DRM CAF Agent API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/group"/>
-</component>
-<component name="drm_license_checker_api" long-name="DRM License Checker API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_license_checker_api/group"/>
-</component>
-</collection>
-<collection name="commondrm" long-name="Common DRM" level="generic">
-<!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
-<component name="drmencryptor" filter="s60" long-name="DRM Encryptor" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmsettingsplugin" filter="s60" long-name="DRM Settings Plugin" plugin="Y" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmrightsmanagerui" filter="s60" long-name="DRM Rights Manager UI">
-<unit bldFile="mw/drm/commondrm/drmrightsmanagerui/help/group"/>
-</component>
-<component name="drmutility" filter="s60" long-name="DRM Utility">
-<!-- Uncomment unit when configuration is in place. Currently #included from commondrm_build -->
-<!--<unit bldFile="commondrm/drmutility/group"/>-->
-</component>
-<component name="drmserviceapiwrapper" filter="s60" long-name="DRM Service API Wrapper">
-<unit bldFile="mw/drm/commondrm/drmserviceapiwrapper/group"/>
-</component>
-<component name="drmrightsstoringlocation" filter="s60" long-name="DRM Rights Storing Location">
-<unit bldFile="mw/drm/commondrm/drmrightsstoringlocation/group"/>
-</component>
-<component name="commondrm_build" filter="s60" long-name="Common DRM Build">
-<!-- should be split into the above files, or them collapsed into a single component -->
-<unit bldFile="mw/drm/commondrm/group"/>
-</component>
-</collection>
-<collection name="omadrm" long-name="OMA DRM" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="omadrm_build" filter="s60" long-name="OMA DRM Build">
-<unit bldFile="mw/drm/omadrm/group"/>
-</component>
-<component name="foundationcerts" filter="sf_build" long-name="Foundation Certificates">
-<unit bldFile="mw/drm/omadrm/foundationcerts/group"/>
-</component>
-</collection>
-<collection name="wmdrm" long-name="Windows Media DRM" level="framework">
-<!-- collection is really a component. Move down a directory -->
-<component name="wmdrm_build" filter="s60" long-name="WM DRM Build">
-<unit bldFile="mw/drm/wmdrm/group"/>
-</component>
-</collection>
-<collection name="drm_info" long-name="DRM Info" level="specific"/>
-</block>
-<block name="locationsrv" level="specific" long-name="Location Services" levels="plugin fw server if">
-<collection name="locsrv_pub" long-name="Location Services Public Interfaces" level="if">
-<component name="landmarks_search_api" long-name="Landmarks Search API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
-</component>
-<component name="landmarks_api" long-name="Landmarks API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/group"/>
-</component>
-<component name="landmarks_database_management_api" long-name="Landmarks Database Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/group"/>
-</component>
-<component name="location_triggering_api" long-name="Location Triggering API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/location_triggering_api/group"/>
-</component>
-<component name="blid_application_satellite_info_api" long-name="BLID Application Satellite Info API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/group"/>
-</component>
-</collection>
-<collection name="locsrv_plat" long-name="Location Services Platform Interfaces" level="if">
-<component name="map_and_navigation_api" long-name="Map and Navigation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/group"/>
-</component>
-<component name="map_and_navigation_provider_discovery_api" long-name="Map and Navigation Provider Discovery API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/group"/>
-</component>
-<component name="geocoding_api" long-name="Geocoding API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
-</component>
-<component name="map_image_api" long-name="Map Image API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/group"/>
-</component>
-<component name="map_and_navigation_aiw_api" long-name="Map and Navigation AIW API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_aiw_api/group"/>
-</component>
-<component name="map_and_navigation_provider_api" long-name="Map and Navigation Provider API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_api/group"/>
-</component>
-<component name="landmarks_category_definition_api" long-name="Landmarks Category Definition API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
-</component>
-<component name="supl_settings_api" long-name="SUPL Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
-</component>
-<component name="location_settings_launch_api" long-name="Location Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/group"/>
-</component>
-<component name="map_image_conversion_plugin_api" long-name="Map Image Conversion Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/group"/>
-</component>
-<component name="psy_configuration_ui_plugin_api" long-name="PSY Configuration UI Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/psy_configuration_ui_plugin_api/group"/>
-</component>
-<component name="np_proxy_configuration_api" long-name="NP Proxy Configuration API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/np_proxy_configuration_api/group"/>
-</component>
-<component name="supl_terminal_initiation_api" long-name="SUPL Terminal Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/group"/>
-</component>
-<component name="location_notation_preferences_settings_api" long-name="Location Notation Preferences Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_notation_preferences_settings_api/group"/>
-</component>
-<component name="supl_settings_notifier_secondary_display_api" long-name="SUPL Settings Notifier Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_notifier_secondary_display_api/group"/>
-</component>
-<component name="supl_network_initiation_api" long-name="SUPL Network Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/group"/>
-</component>
-<component name="privacy_notifiers_secondary_display_api" long-name="Privacy Notifiers Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/privacy_notifiers_secondary_display_api/group"/>
-</component>
-<component name="oma_supl_configuration_parameter_api" long-name="OMA SUPL Configuration Parameter API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_configuration_parameter_api/group"/>
-</component>
-<component name="supl_query_secondary_display_api" long-name="SUPL Query Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_query_secondary_display_api/group"/>
-</component>
-<component name="location_triggering_management_api" long-name="Location Triggering Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_management_api/group"/>
-</component>
-<component name="location_triggering_status_information_api" long-name="Location Triggering Status Information API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_status_information_api/group"/>
-</component>
-<component name="oma_supl_asn_codec_plugin_api" long-name="OMA SUPL ASN Codec Plugin API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
-</component>
-<component name="query_and_notification_api" long-name="Query and Notification API" filter="s60" introduced="^3" class="api">
-<!-- needs metadata file: <meta rel="Api" href="locsrv_plat/query_and_notification_api/query_and_notification_api.metaxml"/> -->
-<unit bldFile="mw/locationsrv/locsrv_plat/query_and_notification_api/group"/>
-</component>
-<component name="location_local_variation_api" long-name="Location Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_local_variation_api/group"/>
-</component>
-</collection>
-<collection name="genericpositioningplugins" long-name="Generic Positioning Plugins" level="plugin">
-<component name="locationnpppsy" filter="s60" long-name="Location Positioning Proxy PSY" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
-</component>
-<component name="locationsuplpsy" filter="s60" long-name="Location SUPL PSY" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationsuplpsy/group"/>
-</component>
-<component name="genericpositioningplugins_build" filter="s60" long-name="Generic Positioning Plugins Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/genericpositioningplugins/group"/>
-</component>
-</collection>
-<collection name="landmarks" long-name="Landmarks" level="server">
-<component name="locationlandmarks" filter="s60" long-name="Location Landmarks">
-<unit bldFile="mw/locationsrv/landmarks/locationlandmarks/group"/>
-</component>
-</collection>
-<collection name="locationmapnavfw" long-name="Location Map and Navigation Framework" level="fw">
-<component name="mnlibrary" filter="s60" long-name="Map and Navigation Library">
-<unit bldFile="mw/locationsrv/locationmapnavfw/library/group"/>
-</component>
-<component name="mnaiwprovider" filter="s60" long-name="Map and Navigation AIW Provider" plugin="Y">
-<unit bldFile="mw/locationsrv/locationmapnavfw/aiwprovider/group"/>
-</component>
-<component name="locationmapnavfw_build" filter="s60" long-name="Location Map and Navigation Framework Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/locationmapnavfw/group"/>
-</component>
-</collection>
-<collection name="locationsystemui" long-name="Location System UI" level="if">
-<component name="locationsysui" filter="s60" long-name="Location System UI">
-<unit bldFile="mw/locationsrv/locationsystemui/locationsysui/group"/>
-</component>
-</collection>
-<collection name="supl" long-name="SUPL" level="fw">
-<component name="locationsuplfw" filter="s60" long-name="Location SUPL Framework">
-<unit bldFile="mw/locationsrv/supl/locationsuplfw/group"/>
-</component>
-<component name="locationomasuplprotocolhandler" filter="s60" long-name="OMA SUPL Protocol Handler">
-<unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/group"/>
-</component>
-<component name="supltiapiimplementation" filter="s60" long-name="SUPL TI API Implementation" introduced="^3">
-<unit bldFile="mw/locationsrv/supl/supltiapiimplementation/group"/>
-</component>
-</collection>
-<collection name="locationtriggering" long-name="Location Triggering" level="server">
-<component name="ltlogger" filter="s60" long-name="LT Logger">
-<unit bldFile="mw/locationsrv/locationtriggering/ltlogger/group"/>
-</component>
-<component name="ltclientlib" filter="s60" long-name="LT Client Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltclientlib/group"/>
-</component>
-<component name="ltmanagementlib" filter="s60" long-name="LT Management Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmanagementlib/group"/>
-</component>
-<component name="ltcontainer" filter="s60" long-name="LT Container">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontainer/group"/>
-</component>
-<component name="ltserver" filter="s60" long-name="LT Server">
-<unit bldFile="mw/locationsrv/locationtriggering/ltserver/group"/>
-</component>
-<component name="ltstrategypluginapi" filter="s60" long-name="LT Strategy Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategypluginapi/group"/>
-</component>
-<component name="ltstrategyengine" filter="s60" long-name="LT Strategy Engine">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategyengine/group"/>
-</component>
-<component name="ltmovementdetectionpluginapi" filter="s60" long-name="Movement Detection Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmovementdetectionpluginapi/group"/>
-</component>
-<component name="ltcellidmovementdetector" filter="s60" long-name="Cell ID Movement Detector">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/>
-</component>
-<component name="lbtmgmtui" filter="s60" long-name="LBT Management UI" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/lbtmgmtui/group"/>
-</component>
-<component name="ltcontextsourceplugin" filter="s60" long-name="LT Context Source Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontextsourceplugin/group"/>
-</component>
-<component name="locationtriggering_build" filter="s60" long-name="Location Triggering Build">
-<!-- should remove #include from this and maybe put exports in the above components -->
-<unit bldFile="mw/locationsrv/locationtriggering/group"/>
-</component>
-</collection>
-</block>
-<block name="accesssec" level="generic" long-name="Access Security" levels="plugin framework server generic specific">
-<collection name="accesssec_plat" long-name="Access Security Platform Interfaces" level="specific">
-<component name="wapi_security_settings_ui_api" long-name="WAPI Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_security_settings_ui_api/group"/>
-</component>
-<component name="wep_security_settings_ui_api" long-name="WEP Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wep_security_settings_ui_api/group"/>
-</component>
-<component name="wi-fi_protected_setup_ui_api" long-name="Wi-Fi Protected Setup UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
-</component>
-<component name="wlan_eap_settings_ui_api" long-name="WLAN EAP Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wlan_eap_settings_ui_api/group"/>
-</component>
-<component name="wpa_security_settings_ui_api" long-name="WPA Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wpa_security_settings_ui_api/group"/>
-</component>
-<component name="eap_vpn_api" long-name="EAP VPN API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
-</component>
-<component name="eapsim_db_api" long-name="EAP-SIM DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapsim_db_api/group"/>
-</component>
-<component name="eap_type_api" long-name="EAP Type API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_type_api/group"/>
-</component>
-<component name="eaptlspeap_db_api" long-name="EAP-TLS-PEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eaptlspeap_db_api/group"/>
-</component>
-<component name="eapleap_db_api" long-name="LEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapleap_db_api/group"/>
-</component>
-<component name="eapgtc_db_api" long-name="EAP-GTC DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapgtc_db_api/group"/>
-</component>
-<component name="eapmschapv2_db_api" long-name="EAP-MSCHAPV2 DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapmschapv2_db_api/group"/>
-</component>
-<component name="eapaka_db_api" long-name="EAP-AKA DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapaka_db_api/group"/>
-</component>
-<component name="wapi_db_api" long-name="WAPI DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_db_api/group"/>
-</component>
-</collection>
-<collection name="wlansecuritysettings" long-name="WLAN Security Settings" level="specific">
-<component name="wapisecuritysettingsui" filter="s60" long-name="WAPI Security Settings UI" introduced="9.1">
-<!-- the directory for this needs to be moved up to the right level -->
-<unit bldFile="mw/accesssec/wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
-</component>
-<component name="wepsecuritysettingsui" filter="s60" long-name="WEP Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wepsecuritysettingsui/group"/>
-</component>
-<component name="wifiprotectedsetup" filter="s60" long-name="WIFI Protected Setup" introduced="^1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wifiprotectedsetup/group"/>
-</component>
-<component name="wlaneapsettingsui" filter="s60" long-name="WLAN EAP Settings UI" introduced="9.3">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wlaneapsettingsui/group"/>
-</component>
-<component name="wpasecuritysettingsui" filter="s60" long-name="WPA Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wpasecuritysettingsui/group"/>
-</component>
-</collection>
-<collection name="eapol" long-name="EAPOL" level="framework">
-<component name="eapol_framework" filter="s60" long-name="EAPOL Framework" introduced="9.2">
-<unit bldFile="mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
-</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">
-<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>
-<component name="bearer_settings_plugin_api" long-name="Bearer Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/bearer_settings_plugin_api/group"/>
-</component>
-<component name="commsdat_wlan_api" long-name="CommsDat WLAN API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/commsdat_wlan_api/group"/>
-</component>
-<component name="connection_monitor_extension_api" long-name="Connection Monitor Extension API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_monitor_extension_api/group"/>
-</component>
-<component name="connection_ui_utilities_api" long-name="Connection UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_ui_utilities_api/group"/>
-</component>
-<component name="disconnect_dialog_api" long-name="Disconnect Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_api/group"/>
-</component>
-<component name="disconnect_dialog_disable_api" long-name="Disconnect Dialog Disable API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_disable_api/group"/>
-</component>
-<component name="extended_connection_settings_api" long-name="Extended Connection Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/extended_connection_settings_api/group"/>
-</component>
-<component name="mpm_default_connection_api" long-name="MPM Default Connection API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_default_connection_api/group"/>
-</component>
-<component name="pdpcontextmanager2_reset_factory_settings_api" long-name="PDP Context Manager 2 Reset Factory Settings API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_settings_api/group"/>
-</component>
-<component name="mpm_connect_screen_api" long-name="MPM Connect Screen API" filter="s60" class="api">
-<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">
-<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>
-<component name="access_point_engine_api" long-name="Access Point Engine API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_monitor_server_api/group"/>
-</component>
-<component name="connection_settings_ui_api" long-name="Connection Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_ui_api/group"/>
-</component>
-<component name="agent_dialog_api" long-name="Agent Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/agent_dialog_api/group"/>
-</component>
-<component name="extendedconnpref_api" long-name="Extended Connection Preferences API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/extendedconnpref_api/group"/>
-</component>
-</collection>
-<collection name="accesspointcontrol" long-name="Access Point Control" level="plugin">
-<component name="apcontrollistplugin" filter="s60" long-name="Access Point Control List Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
-</component>
-</collection>
-<collection name="alwayson_net_plugin" long-name="Always Online Net Plugin" level="server">
-<component name="pdpcontextmanager2" filter="s60" long-name="PDP Context Manager 2">
-<unit bldFile="mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
-</component>
-</collection>
-<collection name="apengine" long-name="Access Point Engine" level="framework">
-<component name="apeng" filter="s60" long-name="Access Point Engine">
-<unit bldFile="mw/ipconnmgmt/apengine/apeng/group"/>
-</component>
-<component name="apsettingshandlerui" filter="s60" long-name="Access Point Settings Handler UI">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingshandlerui/group"/>
-</component>
-<component name="apsettingsplugin" filter="s60" long-name="Access Point Settings Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="bearermanagement" long-name="Bearer Management" level="framework">
-<component name="mpm" filter="s60" long-name="Mobility Policy Manager">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/mpm/group"/>
-</component>
-<component name="extendedconnpref" filter="s60" long-name="Extended Connection Preferences">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/extendedconnpref/group"/>
-</component>
-<component name="s60mcpr" filter="s60" long-name="S60 Meta-Connection Provider" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/S60MCPR/group"/>
-</component>
-</collection>
-<collection name="cmmanager" long-name="Connection Method Manager" level="framework">
-<component name="cmmgr" filter="s60" long-name="CM Manager">
-<unit bldFile="mw/ipconnmgmt/cmmanager/cmmgr/group"/>
-</component>
-<component name="gsconnsettingsplugin" filter="s60" long-name="GS Connection Settings Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/cmmanager/gsconnsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="connectionmonitoring" long-name="Connection Monitoring" level="server">
-<component name="connectionmonitorplugin" filter="s60" long-name="Connection Monitor Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorplugin/group"/>
-</component>
-<component name="connectionmonitorui" filter="s60" long-name="Connection Monitor UI">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorui/group"/>
-</component>
-<component name="connmon" filter="s60" long-name="Connection Monitor">
-<!-- either split into two components, or #include from a common bld.inf -->
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/connectionmonitor/group"/>
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/dataconnectionlogger/group"/>
-</component>
-<component name="connmonext" filter="s60" long-name="Connection Monitor Extension API">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmonext/group"/>
-</component>
-</collection>
-<collection name="connectionutilities" long-name="Connection Utilities" level="utils">
-<component name="connectiondialogs" filter="s60" long-name="Connection Dialogs">
-<unit bldFile="mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/>
-</component>
-</collection>
-<collection name="dbcreator" long-name="DB Creator" level="utils">
-<component name="commsdatcreator" filter="s60" long-name="Comms Database Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
-</component>
-<component name="commsdatcreatorrfsplugin" filter="s60" long-name="Comms Database Creator RFS Plugin" introduced="9.3" plugin="Y">
-<!-- uncomment when config is turned on -->
-<!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
-</component>
-<component name="commsdatstartup" filter="s60" long-name="Comms Database Startup" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
-</component>
-<component name="dbcreatorexe" filter="s60" long-name="DB Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
-</component>
-<component name="dbcreator_build" filter="s60" long-name="DB Creator Build" introduced="9.3">
-<!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
-<unit bldFile="mw/ipconnmgmt/dbcreator/group"/>
-</component>
-</collection>
-<collection name="ipconnmgmt_info" long-name="IP Connectivity Management Info" level="utils">
-<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"/>
-</component>
-</collection>
-</block>
-<block name="netprotocols" level="generic" long-name="High-level Internet Protocols" levels="plugin framework server generic specific">
-<collection name="netprotocols_plat" long-name="High-level Internet Protocols Platform Interfaces" level="specific">
-<component name="cookie_manager_api" long-name="Cookie Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/cookie_manager_api/group"/>
-</component>
-<component name="http_cache_mgr_api" long-name="HTTP Cache Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_cache_mgr_api/group"/>
-</component>
-<component name="http_filters_api" long-name="HTTP Filters API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_filters_api/group"/>
-</component>
-</collection>
-<collection name="httpfilters" long-name="HTTP Filters" level="plugin">
-<component name="httpfiltercommon" filter="s60" long-name="HTTP Filter Common">
-<unit bldFile="mw/netprotocols/httpfilters/httpfiltercommon/group"/>
-</component>
-<component name="cookie" filter="s60" long-name="Cookie Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/cookie/group"/>
-</component>
-<component name="deflatefilter" filter="s60" long-name="Deflate Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/deflatefilter/group"/>
-</component>
-<component name="httpfilteracceptheader" filter="s60" long-name="Accept Header Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteracceptheader/group"/>
-</component>
-<component name="httpfilterauthentication" filter="s60" long-name="Authentication Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterauthentication/group"/>
-</component>
-<component name="httpfilterconnhandler" filter="s60" long-name="Connection Handler Fitler" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterconnhandler/group"/>
-</component>
-<component name="httpfilteriop" filter="s60" long-name="HTTP IOP Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteriop/group"/>
-</component>
-<component name="httpfilterproxy" filter="s60" long-name="HTTP Proxy Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterproxy/group"/>
-</component>
-<component name="uaproffilter" filter="s60" long-name="UAProf Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/uaproffilter/group"/>
-</component>
-</collection>
-<collection name="applayerprotocols" long-name="Application Layer Protocols" level="server">
-<component name="httptransportfw" long-name="HTTP Transport Framework" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
-</component>
-<component name="httpexamples" long-name="HTTP Examples" introduced="6.2" purpose="development">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpexamples/group" mrp="mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
-</component>
-<component name="wappushsupport" long-name="WAP Push Support" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
-</component>
-<component name="wapbase" long-name="WAP Base" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wapbase/Group" mrp="mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
-</component>
-<component name="ftpengine" long-name="FTP Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/ftpengine/group" mrp="mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
-</component>
-<component name="telnetengine" long-name="Telnet Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/telnetengine/group" mrp="mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
-</component>
-<component name="httpserviceapi" long-name="HTTP Service API" introduced="TB9.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpservice/group" mrp="mw/netprotocols/applayerprotocols/httpservice/group/http_service.mrp"/>
-</component>
-</collection>
-<collection name="applayerpluginsandutils" long-name="Application Layer Plugins and Utils" level="framework">
-<component name="uripermissionservices" long-name="URI Permission Services" introduced="^2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
-</component>
-<component name="bookmarksupport" long-name="Bookmark Support" introduced="9.1" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
-</component>
-<component name="httpprotocolplugins" long-name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
-</component>
-<component name="httptransportplugins" long-name="HTTP Transport Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
-</component>
-</collection>
-<collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
-<component name="netprotocols_metadata" long-name="High-level Internet Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ipappprotocols" level="generic" long-name="IP App Protocols" levels="plugin conn server if">
-<collection name="ipappprotocols_plat" long-name="IP App Protocols Platform Interfaces" level="if">
-<component name="srtp_api" long-name="SRTP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/srtp_api/group"/>
-</component>
-<component name="rtprtcp_api" long-name="RTP/RTCP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/rtprtcp_api/group"/>
-</component>
-</collection>
-<collection name="rtp" long-name="RTP" level="server">
-<component name="srtpstack" filter="s60" long-name="SRTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/srtpstack/group"/>
-</component>
-<component name="rtpstack" filter="s60" long-name="RTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/rtpstack/group"/>
-</component>
-</collection>
-<collection name="realtimenetprots" long-name="Real Time Net Protocols" level="server">
-<component name="symrtp" long-name="RTP" introduced="9.0" purpose="optional">
-<!-- Real Time Data Protocol -->
-<unit bldFile="mw/ipappprotocols/realtimenetprots/rtp/group" mrp="mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
-</component>
-<component name="sipfw" long-name="SIP Framework" introduced="9.2" purpose="optional">
-<unit bldFile="mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp" version="2"/>
-</component>
-</collection>
-<collection name="sipplugins" long-name="SIP Plugins" level="plugin">
-<component name="sippwlanplugin" filter="s60" long-name="SIP WLAN Plugin" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
-</component>
-<component name="sippsipsettingsui" filter="s60" long-name="SIP Settings UI" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
-</component>
-<component name="sippdevmgmtsipadapter" filter="s60" long-name="Device Management SIP Settings Adapter" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
-</component>
-<component name="sippsystemstatemonitor" filter="s60" long-name="SIP System State Monitor" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsystemstatemonitor/group"/>
-</component>
-<component name="sippsipadapter" filter="s60" long-name="SIP Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipadapter/group"/>
-</component>
-</collection>
-<collection name="sipproviderplugins" long-name="SIP Provider Plugins" level="conn">
-<component name="sipprovider" long-name="SIP Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipproviderplugins/sipprovider/group" mrp="mw/ipappprotocols/sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
-</component>
-</collection>
-<collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="if">
-<component name="ipappprotocols_metadata" long-name="IP App Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wirelessacc" level="specific" long-name="Wireless Access" levels="framework generic ui">
-<collection name="hsfw_plat" long-name="HotSpot Framework Platform Interfaces" level="ui">
-<component name="hotspot_framework_client_api" long-name="HotSpot Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_api" long-name="Internet Connectivity Test Service API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_settings_api" long-name="Internet Connectivity Test Service Settings API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
-</component>
-<component name="hotspot_framework_client_plugin_api" long-name="HotSpot Framework Client Plugin API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
-</component>
-</collection>
-<collection name="hotspotfw" long-name="HotSpot Framework" level="framework">
-<component name="hsserver" filter="s60" long-name="HotSpot Server" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="hsclient" filter="s60" long-name="HotSpot Client" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="internetconnectivitytestservice" filter="s60" long-name="Internet Connectivity Test Service" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
-</component>
-<component name="ictsdialogs" filter="s60" long-name="Internet Connectivity Test Service Dialogs" deprecated="^3" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
-</component>
-<component name="hspluginforagent" filter="s60" long-name="HotSpot Plugin for Agent" plugin="Y" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
-</component>
-<component name="hsbrowser" filter="s60" long-name="HotSpot Browser" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
-</component>
-<component name="hotspotfw_build" filter="s60" long-name="Hotspot Framework Build">
-<!-- should break up this bld.inf into the above components, or collapse them all into a single component -->
-<unit bldFile="mw/wirelessacc/hotspotfw/group"/>
-</component>
-</collection>
-<collection name="wlanutilities" long-name="WLAN Utilities" level="generic">
-<component name="wlanplugin" filter="s60" long-name="WLAN Plugin" plugin="Y">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlanplugin/group"/>
-</component>
-<component name="wlansettingsui" filter="s60" long-name="WLAN Settings UI">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlansettingsui/group"/>
-</component>
-<component name="wlansniffer" filter="s60" long-name="WLAN Sniffer">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlansniffer/group"/>
-</component>
-<component name="wlanindicatorplugin" filter="s60" long-name="WLAN Indicator Plugin" plugin="Y">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlanindicatorplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="vpnclient" level="specific" long-name="VPN Client" levels="engine ui api">
-<!-- is the !oem_build filter needed? -->
-<collection name="vpnc_plat" long-name="VPN Client Platform Interfaces" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API" class="api">
-<unit bldFile="mw/vpnclient/vpnc_plat/vpnapi/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API">
-<unit bldFile="mw/vpnclient/vpnapiimpl/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnengine" long-name="VPN Engine" level="engine">
-<!-- too many components in this collection.
- Probably best to group the binaries together into larger components
- or maybe split the collection into more reasonable groups -->
-<component name="eventmediatorapi" filter="s60" long-name="Event Mediator API">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediatorapi/group" filter="!oem_build"/>
-</component>
-<component name="eventviewer" filter="s60" long-name="Event Viewer">
-<unit bldFile="mw/vpnclient/vpnengine/eventviewer/group" filter="!oem_build"/>
-</component>
-<component name="vpnins" filter="s60" long-name="VPN Installer">
-<unit bldFile="mw/vpnclient/vpnengine/vpnins/group" filter="!oem_build"/>
-</component>
-<component name="ikepolparser" filter="s60" long-name="IKE Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/ikepolparser/group" filter="!oem_build"/>
-</component>
-<component name="utlbase64" filter="s60" long-name="Base64 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlbase64/group" filter="!oem_build"/>
-</component>
-<component name="utlcrypto" filter="s60" long-name="Crypto Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlcrypto/group" filter="!oem_build"/>
-</component>
-<component name="utlxml" filter="s60" long-name="XML Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlxml/group" filter="!oem_build"/>
-</component>
-<component name="utlpkcs10" filter="s60" long-name="PKCS#10 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs10/group" filter="!oem_build"/>
-</component>
-<component name="pkiserviceapi" filter="s60" long-name="PKI Service API">
-<unit bldFile="mw/vpnclient/vpnengine/pkiserviceapi/group" filter="!oem_build"/>
-</component>
-<component name="ikecert" filter="s60" long-name="IKE Certificate Management">
-<unit bldFile="mw/vpnclient/vpnengine/ikecert/group" filter="!oem_build"/>
-</component>
-<component name="kmdapi" filter="s60" long-name="Key Management Daemon API">
-<unit bldFile="mw/vpnclient/vpnengine/kmdapi/group" filter="!oem_build"/>
-</component>
-<component name="kmdserver" filter="s60" long-name="Key Management Daemon Server">
-<unit bldFile="mw/vpnclient/vpnengine/kmdserver/group" filter="!oem_build"/>
-</component>
-<component name="ikeutils" filter="s60" long-name="Internet Key Exchange Utils">
-<unit bldFile="mw/vpnclient/vpnengine/ikeutils/group" filter="!oem_build"/>
-</component>
-<component name="ikev1lib" filter="s60" long-name="IKEv1 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev1lib/group" filter="!oem_build"/>
-</component>
-<component name="ikev2lib" filter="s60" long-name="IKEv2 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev2lib/group" filter="!oem_build"/>
-</component>
-<component name="vpnipsecpolparser" filter="s60" long-name="VPN IPsec Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/vpnipsecpolparser/group" filter="!oem_build"/>
-</component>
-<component name="sit" filter="s60" long-name="Socket Interaction Thread">
-<unit bldFile="mw/vpnclient/vpnengine/sit/group" filter="!oem_build"/>
-</component>
-<component name="vpntcwrapper" filter="s60" long-name="VPN Terminal Control Wrapper">
-<unit bldFile="mw/vpnclient/vpnengine/vpntcwrapper/group" filter="!oem_build"/>
-</component>
-<component name="eventmediator" filter="s60" long-name="Event Mediator">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediator/group" filter="!oem_build"/>
-</component>
-<component name="pkiservice" filter="s60" long-name="PKI Service">
-<unit bldFile="mw/vpnclient/vpnengine/pkiservice/group" filter="!oem_build"/>
-</component>
-<component name="vpnconnagt" filter="s60" long-name="VPN Connection Agent">
-<unit bldFile="mw/vpnclient/vpnengine/vpnconnagt/group" filter="!oem_build"/>
-</component>
-<component name="vpnmanager" filter="s60" long-name="VPN Manager">
-<unit bldFile="mw/vpnclient/vpnengine/vpnmanager/group" filter="!oem_build"/>
-</component>
-<component name="vpncleaner" filter="s60" long-name="VPN Cleaner">
-<unit bldFile="mw/vpnclient/vpnengine/vpncleaner/group" filter="!oem_build"/>
-</component>
-<component name="utlpkcs12" filter="s60" long-name="PKCS#12 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs12/group" filter="!oem_build"/>
-</component>
-<component name="dmadengine" filter="s60" long-name="DM Adapter Engine">
-<unit bldFile="mw/vpnclient/vpnengine/dmadengine/group" filter="!oem_build"/>
-</component>
-<component name="dmadipsecvpn" filter="s60" long-name="IPsec VPN DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadipsecvpn/group" filter="!oem_build"/>
-</component>
-<component name="dmadpki" filter="s60" long-name="PKI DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadpki/group" filter="!oem_build"/>
-</component>
-<component name="ikesocket" filter="s60" long-name="IKE Socket" introduced="^3">
-<unit bldFile="mw/vpnclient/vpnengine/ikesocket/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnui" long-name="VPN UI" level="ui">
-<component name="vpnecomnotifier" filter="s60" long-name="VPN ECOM Notifier" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnecomnotifier/group" filter="!oem_build"/>
-</component>
-<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">
-<unit bldFile="mw/vpnclient/vpnui/vpnmanagementui/group" filter="!oem_build"/>
-</component>
-<component name="vpnpolins" filter="s60" long-name="VPN Policy Installer">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolins/group" filter="!oem_build"/>
-</component>
-<component name="vpnpolicyrecognizer" filter="s60" long-name="VPN Policy Recognizer" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolicyrecognizer/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnclient_info" long-name="VPN Client Info" level="api">
-<component name="vpnclient_help" filter="s60" long-name="VPN Client Help">
-<unit bldFile="mw/vpnclient/help/group" filter="!oem_build"/>
-</component>
-<component name="vpnclient_build" filter="s60" long-name="VPN Client Build">
-<!-- should split this up into the other components and remove this-->
-<unit bldFile="mw/vpnclient/group" filter="!oem_build"/>
-</component>
-</collection>
-</block>
-<block name="ipappsrv" level="specific" long-name="IP App Services" levels="framework generic server conn plugin">
-<collection name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" level="plugin">
-<component name="transcoder_api" long-name="Transcoder API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
-</component>
-<component name="comms_event_api" long-name="Comms Event API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/comms_event_api/group"/>
-</component>
-<component name="floor_control_api" long-name="Floor Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/floor_control_api/group"/>
-</component>
-<component name="media_control_api" long-name="Media Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/media_control_api/group"/>
-</component>
-<component name="multimedia_comms_api" long-name="Multimedia Comms API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/multimedia_comms_api/group"/>
-</component>
-<component name="nat_settings_api" long-name="NAT Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/nat_settings_api/group"/>
-</component>
-</collection>
-<collection name="natfw" long-name="NAT Framework" level="framework">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="natfw_build" filter="s60" long-name="NAT Framework Build" introduced="^2">
-<unit bldFile="mw/ipappsrv/natfw/group"/>
-</component>
-</collection>
-<collection name="multimediacommscontroller" long-name="Multimedia Comms Controller" level="conn">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommscontroller_build" filter="s60" long-name="Multimedia Comms Controller Build">
-<unit bldFile="mw/ipappsrv/multimediacommscontroller/group"/>
-</component>
-</collection>
-<collection name="multimediacommsengine" long-name="Multimedia Comms Engine" level="generic">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommsengine_build" filter="s60" long-name="Multimedia Comms Engine Build">
-<unit bldFile="mw/ipappsrv/multimediacommsengine/group"/>
-</component>
-</collection>
-<collection name="natplugins" long-name="NAT Plugins" level="plugin">
-<component name="natpcliprovisioningnatfwadapter" filter="s60" long-name="Client Provisioning NAT Framework Traversal Adapter" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/group"/>
-</component>
-<component name="natpdevmgmtnatfwadapter" filter="s60" long-name="Device Management NAT Framework Traversal Adapter" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/group"/>
-</component>
-<component name="natptraversalcontroller" filter="s60" long-name="NAT Traversal Controller" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natptraversalcontroller/group"/>
-</component>
-<component name="natpnatfwsdpprovider" filter="s60" long-name="NAT Framework SDP Provider" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpnatfwsdpprovider/group"/>
-</component>
-</collection>
-<collection name="ipappsrv_info" long-name="IP App Services Info" level="plugin">
-<component name="ipappsrv_build" long-name="IP App Services Build" filter="s60">
-<!-- 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">
-<collection name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" level="specific">
-<component name="string_parser_api" long-name="String Parser API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/string_parser_api/group"/>
-</component>
-<component name="cbs_mcn_client_api" long-name="CBS MCN Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cbs_mcn_client_api/group"/>
-</component>
-<component name="converged_call_engine_api" long-name="Converged Call Engine API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_engine_api/group"/>
-</component>
-<component name="aiw_dial_data_consumer_api" long-name="AIW Dial Data Consumer API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/aiw_dial_data_consumer_api/group"/>
-</component>
-<component name="phone_client_ussd_api" long-name="Phone Client USSD API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_api/group"/>
-</component>
-<component name="sat_refresh_api" long-name="SAT Refresh API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_refresh_api/group" filter="!test"/>
-</component>
-<component name="network_handling_engine_api" long-name="Network Handling Engine API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/network_handling_engine_api/group"/>
-</component>
-<component name="phone_client_emergency_call_api" long-name="Phone Client Emergency Call API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/group"/>
-</component>
-<component name="sat_configuration_api" long-name="SAT Configuration API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_configuration_api/group"/>
-</component>
-<component name="dial_utils_api" long-name="Dial Utils API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/dial_utils_api/group"/>
-</component>
-<component name="phone_client_image_handler_api" long-name="Phone Client Image Handler API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_image_handler_api/group"/>
-</component>
-<component name="phone_client_messenger_api" long-name="Phone Client Messenger API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_messenger_api/group"/>
-</component>
-<component name="sat_client_api" long-name="SAT Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_client_api/group" filter="!test"/>
-</component>
-<component name="phone_client_api" long-name="Phone Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_api/group"/>
-</component>
-<component name="sat_service_api" long-name="SAT Service API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_service_api/group" filter="!test"/>
-</component>
-<component name="cbs_message_api" long-name="CBS Message API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cbs_message_api/group"/>
-</component>
-<component name="phone_client_server_information_api" long-name="Phone Client Server Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_server_information_api/group"/>
-</component>
-<component name="phone_client_ussd_internal_api" long-name="Phone Client USSD Internal API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_internal_api/group"/>
-</component>
-<component name="phone_client_command_handler_api" long-name="Phone Client Command Handler API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_command_handler_api/group"/>
-</component>
-<component name="phone_client_notify_api" long-name="Phone Client Notify API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_notify_api/group"/>
-</component>
-<component name="phone_client_utility_api" long-name="Phone Client Utility API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_utility_api/group"/>
-</component>
-<component name="telephony_network_information_api" long-name="Telephony Network Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_network_information_api/group"/>
-</component>
-<component name="secondary_display_sat_api" long-name="Secondary Display SAT API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/secondary_display_sat_api/group"/>
-</component>
-<component name="callui_reconnect_query_api" long-name="CallUI Reconnect Query API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/callui_reconnect_query_api/group"/>
-</component>
-<component name="service_provider_settings_api" long-name="Service Provider Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/service_provider_settings_api/group"/>
-</component>
-<component name="converged_call_provider_api" long-name="Converged Call Provider API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_provider_api/group"/>
-</component>
-<component name="incoming_call_monitor_api" long-name="Incoming Call Monitor API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/incoming_call_monitor_api/group"/>
-</component>
-<component name="default_emergency_numbers_api" long-name="Default Emergency Numbers API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/default_emergency_numbers_api/group"/>
-</component>
-<component name="cenrep_database_api" long-name="Central Repository Database API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cenrep_database_api/group"/>
-</component>
-<component name="ss_settings_api" long-name="SS Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/ss_settings_api/group"/>
-</component>
-<component name="phone_settings_observer_api" long-name="Phone Settings Observer API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_observer_api/group"/>
-</component>
-<component name="phone_settings_notes_ui_api" long-name="Phone Settings Notes UI API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_notes_ui_api/group"/>
-</component>
-<component name="phone_settings_api" long-name="Phone Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_api/group"/>
-</component>
-<component name="voice_mailbox_number_api" long-name="Voice Mailbox Number API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_number_api/group"/>
-</component>
-<component name="voice_mailbox_settings_api" long-name="Voice Mailbox Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_settings_api/group"/>
-</component>
-<component name="call_information_api" long-name="Call Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/call_information_api/group" filter="!test"/>
-</component>
-<component name="call_remote_party_information_api" long-name="Call Remote Party Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/call_remote_party_information_api/group" filter="!test"/>
-</component>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_mediator_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="telutils" long-name="Telephony Utils" level="generic">
-<component name="phoneparser" filter="s60" long-name="Phone Parser">
-<unit bldFile="mw/phonesrv/telutils/phoneparser/group"/>
-</component>
-<component name="telephonyservice" filter="s60" long-name="Telephony Service">
-<unit bldFile="mw/phonesrv/telutils/telephonyservice/group"/>
-</component>
-</collection>
-<collection name="cbs" long-name="Cellular Baseband Services" level="plugin">
-<component name="cbsserver" filter="s60" long-name="CBS Server">
-<unit bldFile="mw/phonesrv/cbs/cbsserver/group"/>
-</component>
-<component name="cbsui" filter="s60" long-name="CBS UI">
-<unit bldFile="mw/phonesrv/cbs/cbsui/group"/>
-</component>
-</collection>
-<collection name="cellular" long-name="Cellular" level="server">
-<component name="telephonysettings" filter="s60" long-name="Telephony Settings">
-<unit bldFile="mw/phonesrv/cellular/telephonysettings/group" filter="!test"/>
-</component>
-<component name="sssettings" filter="s60" long-name="Supplementary Service Settings">
-<unit bldFile="mw/phonesrv/cellular/sssettings/group" filter="!test"/>
-</component>
-<component name="psetnotesui" filter="s60" long-name="Phone Settings Notes UI">
-<unit bldFile="mw/phonesrv/cellular/psetnotesui/group" filter="!test"/>
-</component>
-<component name="servicerequest" filter="s60" long-name="Service Request">
-<unit bldFile="mw/phonesrv/cellular/servicerequest/group"/>
-</component>
-</collection>
-<collection name="convergedcallengine" long-name="Converged Call Engine" level="framework">
-<component name="callprovider" filter="s60" long-name="Call Provider">
-<unit bldFile="mw/phonesrv/convergedcallengine/callprovider/group"/>
-</component>
-<component name="cce" filter="s60" long-name="CCE">
-<unit bldFile="mw/phonesrv/convergedcallengine/cce/group" filter="!test"/>
-</component>
-<component name="spsettings" filter="s60" long-name="Service Provider Settings">
-<unit bldFile="mw/phonesrv/convergedcallengine/spsettings/group" filter="!test"/>
-</component>
-<component name="cenrepdatabase" filter="s60" long-name="CCE Cenrep Database">
-<unit bldFile="mw/phonesrv/convergedcallengine/cenrepdatabase/group"/>
-</component>
-<component name="serviceselector" filter="s60" long-name="Service Selector">
-<unit bldFile="mw/phonesrv/convergedcallengine/serviceselector/group"/>
-</component>
-<component name="csplugin" filter="s60" long-name="CS Plugin" plugin="Y">
-<!-- should spell out CS in name -->
-<unit bldFile="mw/phonesrv/convergedcallengine/csplugin/group"/>
-</component>
-</collection>
-<collection name="engines" long-name="Telephony Engines" level="specific">
-<component name="vmbxengine" filter="s60" long-name="Voice Mailbox Engine">
-<unit bldFile="mw/phonesrv/engines/vmbxengine/group"/>
-</component>
-</collection>
-<collection name="networkhandling" long-name="Network Handling" level="plugin">
-<component name="networkhandlingengine" filter="s60" long-name="Network Handling Engine">
-<unit bldFile="mw/phonesrv/networkhandling/networkhandlingengine/group"/>
-</component>
-</collection>
-<collection name="phoneclientserver" long-name="Phone Client/Server" level="server">
-<component name="enpolicy" filter="s60" long-name="Emergency Number Policy">
-<unit bldFile="mw/phonesrv/phoneclientserver/enpolicy/group"/>
-</component>
-<component name="aiwdialdata" filter="s60" long-name="AIW Dial Data">
-<unit bldFile="mw/phonesrv/phoneclientserver/aiwdialdata/group" filter="!test"/>
-</component>
-<component name="dialutils" filter="s60" long-name="Dial Utils">
-<unit bldFile="mw/phonesrv/phoneclientserver/dialutils/group" filter="!test"/>
-</component>
-<component name="phoneclient" filter="s60" long-name="Phone Client">
-<unit bldFile="mw/phonesrv/phoneclientserver/phoneclient/group" filter="!test"/>
-</component>
-<component name="phoneserver" filter="s60" long-name="Phone Server">
-<unit bldFile="mw/phonesrv/phoneclientserver/phoneserver/group"/>
-</component>
-<component name="callui" filter="s60" long-name="Call UI">
-<unit bldFile="mw/phonesrv/phoneclientserver/callui/group"/>
-</component>
-</collection>
-<collection name="satengine" long-name="SIM Application Toolkit Engine" level="generic">
-<component name="satserver" filter="s60" long-name="SAT Server">
-<unit bldFile="mw/phonesrv/satengine/satserver/group"/>
-</component>
-</collection>
-<collection name="satui" long-name="SIM Application Toolkit UI" level="specific">
-<component name="satapp" filter="s60" long-name="SAT Application">
-<unit bldFile="mw/phonesrv/satui/satapp/group"/>
-</component>
-<component name="satplugin" filter="s60" long-name="SAT Plugin" plugin="Y">
-<unit bldFile="mw/phonesrv/satui/satplugin/group"/>
-</component>
-</collection>
-<collection name="phonecmdhandler" long-name="Phone Command Handler" level="generic">
-<component name="phonecmdhnlr" filter="s60" long-name="Phone Command Handler">
-<unit bldFile="mw/phonesrv/phonecmdhandler/phonecmdhnlr/group"/>
-</component>
-</collection>
-</block>
-<block name="messagingmw" level="specific" long-name="Messaging Middleware" levels="stack fw api">
-<collection name="msgfw_pub" long-name="Messaging Middleware Public Interfaces" level="api">
-<component name="send_ui_api" long-name="Send UI API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_pub/send_ui_api/group"/>
-</component>
-</collection>
-<collection name="msgfw_plat" long-name="Messaging Middleware Platform Interfaces" level="api">
-<component name="always_online_plugin_api" long-name="Always Online Plugin API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_plugin_api/group"/>
-</component>
-<component name="always_online_client_api" long-name="Always Online Client API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_client_api/group"/>
-</component>
-<component name="msg_common_utils_api" long-name="Messaging Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/msg_common_utils_api/group"/>
-</component>
-<component name="send_ui_plugin_api" long-name="Send UI Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/send_ui_plugin_api/group"/>
-</component>
-<component name="send_ui_datautils_api" long-name="Send UI Data Utils API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/send_ui_datautils_api/group"/>
-</component>
-</collection>
-<collection name="msgbranched" long-name="Messaging Branched" level="fw">
-<!-- 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"/>
-</component>
-</collection>
-<collection name="messagingfw" long-name="Messaging Framework" level="fw">
-<!-- should break this collection up into smaller related collections -->
-<component name="alwaysonline" filter="s60" long-name="Always Online Server" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/alwaysonline/group"/>
-</component>
-<component name="msgcommonutils" filter="s60" long-name="Messaging Common Utils" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/msgcommonutils/group"/>
-</component>
-<component name="senduiservices" filter="s60" long-name="Send UI Services" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/senduiservices/group"/>
-</component>
-<component name="scheduledsendmtm" long-name="Scheduled Send MTM" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/group" mrp="mw/messagingmw/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
-</component>
-<component name="msgsrvnstore" long-name="Message Server and Store" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/group" mrp="mw/messagingmw/messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
-</component>
-<component name="biomsgfw" long-name="BIO Messaging Framework" introduced="6.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/group" mrp="mw/messagingmw/messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
-</component>
-<component name="msgconf" long-name="Messaging Config" introduced="^2" purpose="optional" class="config">
-<unit bldFile="mw/messagingmw/messagingfw/msgconf/group" mrp="mw/messagingmw/messagingfw/msgconf/group/messaging_config.mrp"/>
-</component>
-<component name="watcherfw" long-name="Watcher Framework" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/watcherfw/group" mrp="mw/messagingmw/messagingfw/watcherfw/group/messaging_watcher.mrp"/>
-</component>
-<component name="msgtest" long-name="Messaging Test" purpose="development">
-<unit bldFile="mw/messagingmw/messagingfw/msgtest/group" mrp="mw/messagingmw/messagingfw/msgtest/group/messaging_test.mrp"/>
-</component>
-<component name="sendas" long-name="Send As" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/sendas/group" mrp="mw/messagingmw/messagingfw/sendas/group/messaging_sendas2.mrp"/>
-</component>
-<component name="msgurlhandler" long-name="Message URL Handler" introduced="7.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/group" mrp="mw/messagingmw/messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
-</component>
-<component name="wappushfw" long-name="WAP Push Framework" introduced="6.1" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/wappushfw/group" mrp="mw/messagingmw/messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
-</component>
-<component name="suplsmshandler" long-name="SUPL SMS Handler" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplsmshandler/group" mrp="mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/>
-</component>
-<component name="suplwappushhandler" long-name="SUPL WAP Push Handler" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
-</component>
-</collection>
-<collection name="messagingmw_info" long-name="Messaging Middleware Info" level="api">
-<component name="messagingmw_metadata" long-name="Messaging Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="imsrv" level="specific" long-name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
-<collection name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" level="specific">
-<component name="ximp_core_data_model_api" long-name="XIMP Core Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_host_api" long-name="XIMP Presence Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_presence_data_model_api" long-name="XIMP Presence Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_api" long-name="XIMP Presence Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_presence_management_api" long-name="XIMP Presence Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_management_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_host_api" long-name="XIMP Core Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_core_management_api" long-name="XIMP Core Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_management_api/group"/>
-</component>
-<component name="ximp_presence_base_api" long-name="XIMP Presence Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_base_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_api" long-name="XIMP Core Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_core_base_api" long-name="XIMP Core Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_base_api/group"/>
-</component>
-<component name="ximp_presence_cache_api" long-name="XIMP Presence Cache API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_cache_api/group"/>
-</component>
-<component name="ximp_core_feature_plugin_api" long-name="XIMP Core Feature Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_host_api" long-name="XIMP IM Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_im_data_model_api" long-name="XIMP IM Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_data_model_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_api" long-name="XIMP IM Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_im_management_api" long-name="XIMP IM Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_management_api/group"/>
-</component>
-<component name="ximp_im_base_api" long-name="XIMP IM Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_base_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_host_api" long-name="XIMP Search Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_search_data_model_api" long-name="XIMP Search Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_data_model_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_api" long-name="XIMP search Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_search_management_api" long-name="XIMP Search Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_management_api/group"/>
-</component>
-<component name="ximp_search_base_api" long-name="XIMP Search Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_base_api/group"/>
-</component>
-<component name="xmpp_settings_api" long-name="XMPP Settings API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/group"/>
-</component>
-<component name="im_cache_client_api" long-name="IM Cache Client API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/im_cache_client_api/group"/>
-</component>
-<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 Avability Text" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
-</component>
-</collection>
-<collection name="ximpfw" long-name="XIMP Framework" level="framework">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="ximpfw_build" filter="s60" long-name="XIMP Framework Build">
-<unit bldFile="mw/imsrv/ximpfw/group"/>
-</component>
-</collection>
-<collection name="imservices" long-name="IM Services" level="generic">
-<component name="imfeatureplugin" filter="s60" long-name="IM Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/imfeatureplugin/group"/>
-</component>
-<component name="searchfeatureplugin" filter="s60" long-name="Search Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/searchfeatureplugin/group"/>
-</component>
-<component name="xmppsettingsapi" filter="s60" long-name="XMPP Settings API" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsapi/group"/>
-</component>
-<component name="xmppsettingsfetcher" filter="s60" long-name="XMPP Settings Fetcher" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/group"/>
-</component>
-<component name="ossprotocoladaptation" filter="s60" long-name="OSS Protocol Adaptation" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/ossprotocoladaptation/group"/>
-</component>
-<component name="instantmessagingcache" filter="s60" long-name="Instant Messaging Cache" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/instantmessagingcache/group"/>
-</component>
-</collection>
-<collection name="brandingserver" long-name="Branding Server" level="specific">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="brandingserver_build" filter="s60" long-name="Branding Server Build">
-<unit bldFile="mw/imsrv/brandingserver/group"/>
-</component>
-</collection>
-</block>
-<block name="legacypresence" level="specific" long-name="Legacy Presence Services" levels="engine fw ui">
-<collection name="pressrv_plat" long-name="Legacy Presence Services Platform Interfaces" level="ui">
-<component name="presence_list_api" long-name="Presence List API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/presence_list_api/group"/>
-</component>
-<component name="watcher_info_api" long-name="Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_info_api/group"/>
-</component>
-<component name="simple_documents_api" long-name="SIMPLE Documents API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_documents_api/group"/>
-</component>
-<component name="authorization_api" long-name="Authorization API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/authorization_api/group"/>
-</component>
-<component name="xdm_protocol_plugin_api" long-name="XDM Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_protocol_plugin_api/group"/>
-</component>
-<component name="watcher_api" long-name="Watcher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_api/group"/>
-</component>
-<component name="xdm_api" long-name="XDM API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_api/group"/>
-</component>
-<component name="registration_api" long-name="Registration API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/registration_api/group"/>
-</component>
-<component name="publisher_api" long-name="Publisher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/publisher_api/group"/>
-</component>
-<component name="messaging_connection_manager_api" long-name="Messaging Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/messaging_connection_manager_api/group"/>
-</component>
-<component name="xdm_settings_api" long-name="XDM Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_settings_api/group"/>
-</component>
-<component name="simple_settings_api" long-name="SIMPLE Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_settings_api/group"/>
-</component>
-<component name="simple_instant_msg_api" long-name="Simple Instant Msg API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_instant_msg_api/group"/>
-</component>
-</collection>
-<collection name="xdmengine" long-name="XDM Engine" level="engine">
-<!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
-<component name="xdmengine_build" filter="s60" long-name="XDM Engine Build">
-<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">
-<unit bldFile="mw/legacypresence/xdmprotocols/group"/>
-</component>
-</collection>
-<collection name="msgconnmanager" long-name="Messaging Connection Manager" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="msgconnmanager_build" filter="s60" long-name="Messaging Connection Manager Build">
-<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">
-<unit bldFile="mw/legacypresence/simpleengine/group"/>
-</component>
-</collection>
-<collection name="presencefwsimpleadpt" long-name="Presence Framework SIMPLE Adaptation" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="simpleplugin" filter="s60" long-name="SIMPLE Plugin" plugin="Y">
-<unit bldFile="mw/legacypresence/presencefwsimpleadpt/group"/>
-</component>
-</collection>
-<collection name="simpledatamodeladapter" long-name="SIMPLE Data Model Adapter" level="fw">
-<component name="presenceplugin" filter="s60" long-name="Presence Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/legacypresence/simpledatamodeladapter/group"/>
-</component>
-</collection>
-</block>
-<block name="opensrv" level="specific" long-name="Open Services" levels="prt lib server eng">
-<collection name="opensrv_plat" long-name="Open Services Platform Interfaces" level="eng">
-<component name="messagequeue_api" long-name="Message Queue API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/opensrv/opensrv_plat/messagequeue_api/group"/>
-</component>
-</collection>
-<collection name="loudmouth" long-name="Loudmouth" level="prt">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="loudmouth_build" filter="s60" long-name="Loudmouth Build" introduced="^2">
-<unit bldFile="mw/opensrv/loudmouth/group"/>
-</component>
-</collection>
-<collection name="libtelepathy" long-name="Telepathy Library" level="lib">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="libtelepathy_build" filter="s60" long-name="Telepathy Library Build" introduced="^2">
-<unit bldFile="mw/opensrv/libtelepathy/group"/>
-</component>
-</collection>
-<collection name="telepathygabble" long-name="Telepathy Gabble" level="eng">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="telepathygabble_build" filter="s60" long-name="Telepathy Gabble Build" introduced="^2">
-<unit bldFile="mw/opensrv/telepathygabble/group"/>
-</component>
-</collection>
-<collection name="isolationserver" long-name="Isolation Server" level="server">
-<component name="messagequeue" filter="s60" long-name="Message Queue" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/messagequeue/group"/>
-</component>
-<component name="isoserver" filter="s60" long-name="ISO Server" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/isoserver/group"/>
-</component>
-<component name="isolationserver_build" filter="s60" long-name="Isloation Server Build" introduced="^2">
-<!-- needs #includes removed. either move the exports to another component or make this a ROM component -->
-<unit bldFile="mw/opensrv/isolationserver/group"/>
-</component>
-</collection>
-</block>
-<block name="remotemgmt" level="specific" long-name="Remote Management" levels="plugin framework server generic specific">
-<collection name="remotemgmt_pub" long-name="Remote Management Public Interfaces" level="specific">
-<component name="synchronization_capability_api" long-name="Synchronization Capability API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
-</component>
-</collection>
-<collection name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" level="specific">
-<component name="common_agent_util_and_definitions_api" long-name="Common Agent util and definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
-</component>
-<component name="policy_management_certificate_api" long-name="Policy Management Certificate API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/group"/>
-</component>
-<component name="oma_provisioning_adapter_api" long-name="OMA Provisioning Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_adapter_api/group"/>
-</component>
-<component name="device_management_parameter_api" long-name="Device Management Parameter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_parameter_api/group"/>
-</component>
-<component name="data_synchronization_plugin_api" long-name="Data Synchronization Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/group"/>
-</component>
-<component name="sync_alert_handler_api" long-name="Sync Alert Handler API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
-</component>
-<component name="syncml_notifier_api" long-name="SyncML Notifier API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
-</component>
-<component name="syncml_client_api" long-name="SyncML Client API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
-</component>
-<component name="device_management_plugin_api" long-name="Device Management plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_plugin_api/group"/>
-</component>
-<component name="dm_tree_apis" long-name="DM Tree APIs" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
-</component>
-<component name="terminal_security_device_lock_api" long-name="Terminal Security Device Lock API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/group"/>
-</component>
-<component name="policy_management_request_api" long-name="Policy Management Request API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/group"/>
-</component>
-<component name="ds_constant_definitions_api" long-name="DS Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_constant_definitions_api/group"/>
-</component>
-<component name="scp_server_api" long-name="SCP Server API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/group"/>
-</component>
-<component name="data_synchronization_notification_api" long-name="Data Synchronization Notification API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_notification_api/group"/>
-</component>
-<component name="oma_provisioning_engine_api" long-name="OMA Provisioning Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/group"/>
-</component>
-<component name="dm_utils_api" long-name="DM Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/group"/>
-</component>
-<component name="syncml_alert_api" long-name="SyncML Alert API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/group"/>
-</component>
-<component name="obex_client_session_api" long-name="OBEX Client session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/obex_client_session_api/group"/>
-</component>
-<component name="setting_enforcement_info_api" long-name="Setting Enforcement Info API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/group"/>
-</component>
-<component name="dm_constant_definitions_api" long-name="DM Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
-</component>
-<component name="oma_ds_extensions_api" long-name="OMA DS Extensions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
-</component>
-<component name="pnpms_utils_api" long-name="PNPMS Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
-</component>
-<component name="diagnostics_plugin_utility_api" long-name="Diagnostics Plugin Utility API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
-</component>
-<component name="diagnostics_plugin_api" long-name="Diagnostics Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
-</component>
-<component name="diagnostics_framework_api" long-name="Diagnostics Framework API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
-</component>
-<component name="diagnostics_results_api" long-name="Diagnostics Results API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
-</component>
-<component name="diagnostics_plugin_pool_api" long-name="Diagnostics Plugin Pool API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
-</component>
-<component name="adaptive_history_list_api" long-name="Adaptive History List API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
-</component>
-<component name="adaptive_history_list_session_api" long-name="Adaptive History List Session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
-</component>
-<component name="fota_engine_api" long-name="FOTA Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
-</component>
-<component name="update_package_storage_plugin_api" long-name="Update Package Storage Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
-</component>
-<component name="syncml_notifier_roaming_api" long-name="SyncML Notifier Roaming API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
-</component>
-<component name="sync_service_api" long-name="Sync Service API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_service_api/group"/>
-</component>
-<component name="dcmo_adapter_api" long-name="DCMO Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_adapter_api/group"/>
-</component>
-<component name="dcmo_control_api" long-name="DCMO Control API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_control_api/group"/>
-</component>
-<component name="ds_capability_mgmt_plugin_api" long-name="DS Capability Management Plugin API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
-</component>
-<component name="dm_native_notifier_api" long-name="DM Native Notifier API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_native_notifier_api/group"/>
-</component>
-<component name="syncml_ds_error_reporting_api" long-name="SyncML DS Error Reporting API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_ds_error_reporting_api/group"/>
-</component>
-<component name="syncml_ds_customization_api" long-name="SyncML DS Customization API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_ds_customization_api/group"/>
-</component>
-</collection>
-<collection name="policymanagement" long-name="Policy Management" level="generic">
-<component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">
-<unit bldFile="mw/remotemgmt/policymanagement/pmdmadapter/group"/>
-</component>
-<component name="dmutilserver" filter="s60" long-name="DM Util Server">
-<unit bldFile="mw/remotemgmt/policymanagement/dmutilserver/group"/>
-</component>
-<component name="policyengine" filter="s60" long-name="Policy Engine">
-<unit bldFile="mw/remotemgmt/policymanagement/policyengine/group"/>
-</component>
-<component name="policymanagement_build" filter="s60" long-name="Policy Management Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/policymanagement/group"/>
-</component>
-</collection>
-<collection name="syncmlfw" long-name="SyncML Framework" level="server">
-<component name="syncmlfw_build" filter="s60" long-name="SyncML Framework Build">
-<!-- need to break this up into components. Too convoluted a structure to be in a single bld.inf-->
-<unit bldFile="mw/remotemgmt/syncmlfw/group"/>
-</component>
-</collection>
-<collection name="terminalsecurity" long-name="Terminal Security" level="specific">
-<component name="scp" filter="s60" long-name="Security Code Proxy">
-<!-- can only have one unit, need to have these #included from a single bld.inf -->
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpdatabase/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpserver/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scppatternplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scphistoryplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scptimestampplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpeventhandler/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/dmeventnotifier/group"/>
-</component>
-<component name="terminalsecurity_client" filter="s60" long-name="Terminal Control Client">
-<unit bldFile="mw/remotemgmt/terminalsecurity/client/group"/>
-</component>
-<component name="terminalsecurity_server" filter="s60" long-name="Terminal Control Server">
-<unit bldFile="mw/remotemgmt/terminalsecurity/server/group"/>
-</component>
-<component name="tcadapter" filter="s60" long-name="Terminal Control Adapter">
-<unit bldFile="mw/remotemgmt/terminalsecurity/tcadapter/bld"/>
-</component>
-<component name="terminalsecurity_build" filter="s60" long-name="Terminal Security Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/terminalsecurity/group"/>
-</component>
-</collection>
-<collection name="omaprovisioning" long-name="OMA Provisioning" level="specific">
-<component name="pnputil" filter="s60" long-name="PnP Util">
-<unit bldFile="mw/remotemgmt/omaprovisioning/pnputil/group"/>
-</component>
-<component name="provisioning" filter="s60" long-name="Provisioning">
-<unit bldFile="mw/remotemgmt/omaprovisioning/provisioning/group"/>
-</component>
-</collection>
-<collection name="devicediagnosticsfw" long-name="Device Diagnostics Framework" level="framework">
-<component name="diagframework" filter="s60" long-name="Diagnostics Framework">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
-</component>
-<component name="diagpluginbase" filter="s60" long-name="Diagnostics Plugin Base">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
-</component>
-<component name="diagresultsdb" filter="s60" long-name="Diagnostics Results Database">
-<!-- can only have one unit, merge or split into two components -->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
-</component>
-<component name="devicediagnosticsfw_build" filter="s60" long-name="Device Diagnostics Framework Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/group"/>
-</component>
-</collection>
-<collection name="dcmofw" long-name="Device Capability Management Object Framework" level="framework">
-<component name="dcmoclient" filter="s60" long-name="DCMO Client">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoclient/group"/>
-</component>
-<component name="dcmoserver" filter="s60" long-name="DCMO Server">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoserver/group"/>
-</component>
-<component name="dcmocustcmd" filter="s60" long-name="DCMO Custom Commands">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmocustcmd/group"/>
-</component>
-<component name="dcmofw_build" filter="s60" long-name="DCMO Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/dcmofw/group"/>
-</component>
-</collection>
-<collection name="fotaapplication" long-name="FOTA Application" level="generic">
-<component name="fotaapplication_build" filter="s60" long-name="FOTA Application Build">
-<!-- remove this component when configuration is in place and the #ifdefs have been worked out -->
-<unit bldFile="mw/remotemgmt/fotaapplication/group"/>
-</component>
-<component name="fotaserver" filter="s60" long-name="FOTA Server">
-<!-- uncomment when #ifdefs are resolved -->
-<!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
-</component>
-<component name="fotacustcmds" filter="s60" long-name="FOTA Custom Commands" class="placeholder">
-<!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
-<!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
-</component>
-</collection>
-</block>
-<block name="remotestorage" level="generic" long-name="Remote Storage" levels="framework if">
-<collection name="rsfw_plat" long-name="Remote Storage Platform Interfaces" level="if">
-<component name="rsfw_access_protocol_plugin_api" filter="s60" long-name="Remote Storage Framework Access Protocol Plugin API" class="api">
-<unit bldFile="mw/remotestorage/rsfw_plat/rsfw_access_protocol_plugin_api/group"/>
-</component>
-</collection>
-<collection name="remotestoragefw" long-name="Remote Storage Framework" level="framework">
-<component name="mountstore" filter="s60" long-name="RSFW Mount Store">
-<unit bldFile="mw/remotestorage/remotestoragefw/mountstore/group"/>
-</component>
-<component name="rsfwnotifierplugins" filter="s60" long-name="RSFW Notifier Plugins" plugin="Y">
-<unit bldFile="mw/remotestorage/remotestoragefw/rsfwnotifierplugins/group"/>
-</component>
-<component name="remotefileengine" filter="s60" long-name="Remote File Engine">
-<unit bldFile="mw/remotestorage/remotestoragefw/remotefileengine/group"/>
-</component>
-<component name="mountmanager" filter="s60" long-name="RSFW Mount Manager">
-<unit bldFile="mw/remotestorage/remotestoragefw/mountmanager/group"/>
-</component>
-<component name="webdavaccessplugin" filter="s60" long-name="WebDAV Access Plugin" plugin="Y">
-<unit bldFile="mw/remotestorage/remotestoragefw/webdavaccessplugin/group"/>
-</component>
-<component name="remotefilesystemplugin" filter="s60" long-name="Remote Filesystem Plugin" plugin="Y">
-<unit bldFile="mw/remotestorage/remotestoragefw/remotefilesystemplugin/group"/>
-</component>
-<component name="remotestoragegsplugin" filter="s60" long-name="RS GS Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
-<!-- <unit bldFile="remotestoragefw/gsplugin/group"/>-->
-</component>
-<component name="remotedriveconfigurationbiocontrol" filter="s60" long-name="Remote Drive Configuration BIO Control">
-<!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
-<!-- <unit bldFile="remotestoragefw/remotedriveconfigurationbiocontrol/group"/>-->
-</component>
-<component name="remotestoragefw_build" filter="s60" long-name="Remote Storage Framework Build">
-<!-- move exports to other components.
- This is needed for #includes of configured component until congigiration is in place -->
-<unit bldFile="mw/remotestorage/remotestoragefw/group"/>
-</component>
-</collection>
-</block>
-<block name="remoteconn" level="generic" long-name="Remote Connectivity" levels="plugin framework server generic specific">
-<collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
-<component name="secon" filter="s60" long-name="Service Controllers">
-<unit bldFile="mw/remoteconn/connectivitymodules/secon/group"/>
-</component>
-</collection>
-<collection name="remoteconn_info" long-name="Remote Connectivity Info" level="specific">
-<component name="remoteconn_metadata" long-name="Remote Connectivity Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mtptransports" long-name="MTP Transports" level="plugin">
-<component name="mtpusbtransport" long-name="MTP USB Transport" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpusbtransport/group" mrp="mw/remoteconn/mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
-</component>
-<component name="mtpptpiptransport" long-name="MTP PTP-IP Transport" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpptpiptransport/group" mrp="mw/remoteconn/mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
-</component>
-<component name="mtpcontroller" long-name="MTP Controller" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpcontroller/group" mrp="mw/remoteconn/mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
-</component>
-</collection>
-<collection name="mtpfws" long-name="MTP Frameworks" level="framework">
-<component name="mtpfw" long-name="MTP Framework" introduced="^2" purpose="optional">
-<unit bldFile="mw/remoteconn/mtpfws/mtpfw/group" mrp="mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/>
-</component>
-</collection>
-<collection name="mtpdataproviders" long-name="MTP Data Providers" level="generic">
-<component name="mtpfileandfolderdp" long-name="MTP File and Folder Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group" mrp="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
-</component>
-<component name="mtpimagedp" long-name="MTP Image Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpimagedp/group" mrp="mw/remoteconn/mtpdataproviders/mtpimagedp/group/mtp_imagedp.mrp"/>
-</component>
-<component name="mtppictbridgedp" long-name="MTP PictBridge Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group" mrp="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group/mtp_pictbridgedp.mrp"/>
-</component>
-</collection>
-<collection name="backupandrestore" long-name="Backup and Restore" level="specific">
-<component name="backupengine" long-name="Backup Engine" introduced="9.0" purpose="optional">
-<unit bldFile="mw/remoteconn/backupandrestore/backupengine/group" mrp="mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
-</component>
-<component name="backuptest" long-name="Backup Test" introduced="^2" purpose="development">
-<unit bldFile="mw/remoteconn/backupandrestore/backuptest/group" mrp="mw/remoteconn/backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
-</component>
-</collection>
-<collection name="obex" long-name="OBEX" level="generic">
-<component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexprotocol/group" mrp="mw/remoteconn/obex/obexprotocol/group/obex.mrp"/>
-</component>
-<component name="obexextensionapi" long-name="OBEX Extension API" introduced="9.2" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexextensionapi/group" mrp="mw/remoteconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
-</component>
-</collection>
-</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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<unit mrp="mw/srvdiscovery/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="dlnasrv" level="specific" long-name="DLNA Services" levels="stack server ctrl framework plugin">
-<!-- uncomment all the units when configuration is in place, they're currently #included from other xxx_build components -->
-<collection name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" level="plugin">
-<component name="upnp_media_server_settings_api" long-name="UPnP Media Server Settings API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_settings_api/group"/>
-</component>
-<component name="upnp_av_objects_api" long-name="UPnP A/V Objects API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_av_objects_api/group"/>
-</component>
-<component name="upnp_media_server_api" long-name="UPnP Media Server API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_api/group"/>
-</component>
-<component name="upnp_security_plugin_api" long-name="UPnP Security Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_security_plugin_api/group"/>
-</component>
-<component name="upnp_avcp_api" long-name="UPnP AVCP API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_avcp_api/group"/>
-</component>
-<component name="upnp_media_server_metadata_api" long-name="UPnP Media Server Metadata API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_metadata_api/group"/>
-</component>
-<component name="upnp_command_api" long-name="UPnP Command API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_command_api/group"/>
-</component>
-<component name="upnp_plugin_api" long-name="UPnP Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_plugin_api/group"/>
-</component>
-</collection>
-<collection name="upnpavcontrolpoint" long-name="UPnP A/V Control Point" level="plugin">
-<component name="avcontrolframework" filter="s60" long-name="A/V Control Famework" introduced="9.1" deprecated="^3">
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
-</component>
-<component name="upnpavcontrolpoint_build" filter="s60" long-name="UPnP A/V Control Point Build" introduced="9.1" deprecated="^3">
-<!-- put exports in other component instead -->
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/group"/>
-</component>
-</collection>
-<collection name="upnpmediaserver" long-name="UPnP Media Server" level="server">
-<component name="avobjects" filter="s60" long-name="A/V Objects">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/avobjects/group"/>
-</component>
-<component name="mediaserverclient" filter="s60" long-name="Media Server Client">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverclient/group"/>
-</component>
-<component name="connectionmanagerservice" filter="s60" long-name="Connection Manager Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/connectionmanagerservice/group"/>
-</component>
-<component name="contentdirectoryservice" filter="s60" long-name="Content Directory Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/contentdirectoryservice/group"/>
-</component>
-<component name="mediaserverengine" filter="s60" long-name="Media Server Engine">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverengine/group"/>
-</component>
-<component name="upnpmediaserver_build" filter="s60" long-name="UPnP Media Server Build">
-<!-- move exports into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpmediaserver/group"/>
-</component>
-</collection>
-<collection name="upnpavcontroller" long-name="UPnP A/V Controller" level="ctrl">
-<component name="upnpxmlparser" filter="s60" long-name="UPnP XML Parser" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpxmlparser/group"/>
-</component>
-<component name="upnpavcontrollerserver" filter="s60" long-name="UPnP A/V Controller Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerserver/group"/>
-</component>
-<component name="upnpavcontrollerclient" filter="s60" long-name="UPnP A/V Ccontroller Client" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerclient/group"/>
-</component>
-<component name="upnpavcontrollerhelper" filter="s60" long-name="UPnP A/V Controller Helper" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerhelper/group"/>
-</component>
-<component name="upnpavcontroller_build" filter="s60" long-name="UPnP A/V Controller Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpavcontroller/group"/>
-</component>
-</collection>
-<collection name="upnpframework" long-name="UPnP Framework" level="framework">
-<component name="upnputilities" filter="s60" long-name="UPnP Utilities" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnputilities/group"/>
-</component>
-<component name="upnpextensionpluginif" filter="s60" long-name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpextensionpluginif/group"/> -->
-</component>
-<component name="upnpfiletransferengine" filter="s60" long-name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>-->
-</component>
-<component name="upnpcommonui" filter="s60" long-name="UPnP Common UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpcommonui/group"/>-->
-</component>
-<component name="upnpaiwengine" filter="s60" long-name="UPnP AIW Engine" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpaiwengine/group"/> -->
-</component>
-<component name="upnpaiwprovider" filter="s60" long-name="UPnP AIW Provider" introduced="^2" deprecated="^3" plugin="Y">
-<!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
-</component>
-<component name="upnpmusicadapter" filter="s60" long-name="UPnP Music Adapter" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
-</component>
-<component name="upnpcommand" filter="s60" long-name="UPnP Command" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpcommand/group"/>
-</component>
-<component name="upnpframework_build" filter="s60" long-name="UPnP Framework Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpframework/group"/>
-</component>
-</collection>
-<collection name="upnpsettings" long-name="UPnP Settings" level="framework">
-<component name="upnpsettingsengine" filter="s60" long-name="UPnP Settings Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
-</component>
-<component name="multiselectionui" filter="s60" long-name="Multi-Selection UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/multiselectionui/group"/>-->
-</component>
-<component name="appwizard" filter="s60" long-name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/appwizard/group"/>-->
-</component>
-<component name="upnpsharingui" filter="s60" long-name="UPnP Sharing UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
-</component>
-<component name="upnpgsplugin" filter="s60" long-name="UPnP GS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
-</component>
-<component name="upnpsettings_build" filter="s60" long-name="UPnP Settings Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsettings/group"/>
-</component>
-</collection>
-<collection name="upnpsharing" long-name="UPnP Sharing" level="server">
-<component name="upnpdlnaprofiler" filter="s60" long-name="UPnP DLNA Profiler" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpdlnaprofiler/group"/>
-</component>
-<component name="upnpsecurity" filter="s60" long-name="UPnP Security" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpsecurity/group"/>
-</component>
-<component name="upnpcontentserver" filter="s60" long-name="UPnP Content Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpcontentserver/group"/>
-</component>
-<component name="applicationengine" filter="s60" long-name="UPnP Application Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/applicationengine/group"/>
-</component>
-<component name="upnpsharing_build" filter="s60" long-name="UPnP Sharing Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsharing/group"/>
-</component>
-</collection>
-<collection name="upnpmpxplugins" long-name="UPnP MPX Plugins" level="plugin">
-<component name="upnpplaybackplugins" filter="s60" long-name="UPnP Playback Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/upnpplaybackplugins/group"/>
-</component>
-<component name="upnpmpxplugins_build" filter="s60" long-name="UPnP MPX Plugins Build" introduced="^2">
-<!-- move exports content into other component? -->
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/group"/>
-</component>
-</collection>
-<collection name="upnpharvester" long-name="UPnP Harvester" level="ctrl">
-<component name="upnpharvester_common" filter="s60" long-name="UPnP Harvester Common" introduced="^2" deprecated="^3" class="placeholder">
-<!-- need to merge or #include these to a single bld.inf -->
-<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
- <unit bldFile="upnpharvester/common/cmsettings/group"/>
- <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
- <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
-</component>
-<component name="cdssync" filter="s60" long-name="CDS Sync" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
-</component>
-<component name="mdhserver" filter="s60" long-name="Metadata Harvester Server" introduced="^2" deprecated="^3" class="placeholder">
-<!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
-</component>
-<component name="upnpharvester_build" filter="s60" long-name="UPnP Harvester Build" introduced="^2" deprecated="^3" class="placeholder">
-<!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
-<!--<unit bldFile="upnpharvester/group"/>-->
-</component>
-</collection>
-<collection name="homesync" long-name="Home Sync" level="plugin">
-<component name="contentmanager" filter="s60" long-name="Content Manager" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homesync/group"/>-->
-<!-- move bld.inf into contentmanager dir -->
-</component>
-</collection>
-<collection name="homemedia" long-name="Home Media" level="framework">
-<!-- collection is really just a component. Move down a directory -->
-<component name="homemedia_build" filter="s60" long-name="Home Media" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homemedia/group"/> -->
-</component>
-</collection>
-<collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin">
-<component name="dlnasrv_build" filter="s60" long-name="DLNA Services Build">
-<!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed -->
-<unit bldFile="mw/dlnasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="btservices" level="generic" long-name="Bluetooth Services" levels="framework server generic specific plugin">
-<collection name="btservices_pub" long-name="BT Services Public Interfaces" level="plugin">
-<component name="bluetooth_power_state_api" long-name="Bluetooth Power State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_power_state_api/group"/>
-</component>
-<component name="bluetooth_notifier_api" long-name="Bluetooth Notifier API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_notifier_api/group"/>
-</component>
-</collection>
-<collection name="btservices_plat" long-name="BT Services Platform Interfaces" level="plugin">
-<component name="bluetooth_dosserver_audio_api" long-name="Bluetooth DOS Server Audio API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dosserver_audio_api/group"/>
-</component>
-<component name="bluetooth_dut_mode_api" long-name="Bluetooth DUT Mode API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dut_mode_api/group"/>
-</component>
-<component name="bluetooth_engine_api" long-name="Bluetooth Engine API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-<component name="bluetooth_local_variation_api" long-name="Bluetooth Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_local_variation_api/group"/>
-</component>
-<component name="bluetooth_notifier_internal_api" long-name="Bluetooth Notifier internal API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_notifier_internal_api/group"/>
-</component>
-<component name="bluetooth_sap_connection_state_api" long-name="Bluetooth SAP Connection State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_sap_connection_state_api/group"/>
-</component>
-<component name="bluetooth_secondary_display_notification_api" long-name="Bluetooth Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_secondary_display_notification_api/group"/>
-</component>
-</collection>
-<collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
-<component name="bteng" filter="s60" long-name="Bluetooth Engine">
-<unit bldFile="mw/btservices/bluetoothengine/bteng/group"/>
-</component>
-<component name="btnotif" filter="s60" long-name="Bluetooth Notifier">
-<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"/>
-</component>
-<component name="btmac" filter="s60" long-name="Bluetooth Mono Audio Controller" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btmac/group"/>
-</component>
-<component name="btsac" filter="s60" long-name="Bluetooth Stereo Audio Controller" plugin="Y">
-<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"/>
-</component>
-<component name="btsap" filter="s60" long-name="Bluetooth SIM Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btsap/group"/>
-</component>
-<component name="btui" filter="s60" long-name="Bluetooth UI">
-<unit bldFile="mw/btservices/bluetoothengine/btui/group"/>
-</component>
-<component name="btpbap" filter="s60" long-name="Bluetooth Phonebook Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btpbap/group"/>
-</component>
-<component name="bthid" filter="s60" long-name="Bluetooth HID">
-<unit bldFile="mw/btservices/bluetoothengine/bthid/group"/>
-</component>
-<component name="btctrldcmoadapter" filter="s60" long-name="Bluetooth Control DCMO Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btctrldcmoadapter/group"/>
-</component>
-</collection>
-<collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
-<component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
-<unit bldFile="mw/btservices/bluetoothappprofiles/avrcp" mrp="mw/btservices/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
-</component>
-</collection>
-<collection name="atcommands" long-name="AT Commands" level="generic">
-<component name="modematplugin" long-name="Modem AT Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/modematplugin/group"/>
-</component>
-<component name="lccustomplugin" long-name="LC Custom Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/lccustomplugin/group"/>
-</component>
-</collection>
-<collection name="btservices_info" long-name="BT Services Info" level="plugin">
-<component name="btservices_metadata" long-name="BT Services Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usbservices" level="generic" long-name="USB Services" levels="framework server generic specific plugin">
-<collection name="usbservices_plat" long-name="USB Services Platform Interfaces" level="plugin">
-<component name="pictbridge_api" long-name="PictBridge API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/pictbridge_api/group"/>
-</component>
-<component name="ptp_responder_api" long-name="PTP Responder API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_responder_api/group"/>
-</component>
-<component name="ptp_transport_api" long-name="PTP Transport API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_transport_api/group"/>
-</component>
-<component name="usb_device_control_plugin_api" long-name="USB Device Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_device_control_plugin_api/group"/>
-</component>
-<component name="usb_notifier_api" long-name="USB Notifier API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_notifier_api/group"/>
-</component>
-<component name="usb_personality_api_header" long-name="USB Personality API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_api_header/group"/>
-</component>
-<component name="usb_personality_plugin_api" long-name="USB Personality Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_plugin_api/group"/>
-</component>
-<component name="usb_secondary_display_api" long-name="USB Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_secondary_display_api/group"/>
-</component>
-<component name="usb_watcher_api" long-name="USB Watcher API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_api/group"/>
-</component>
-<component name="usb_watcher_info_api_header" long-name="USB Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_info_api_header/group"/>
-</component>
-</collection>
-<collection name="usbservices_info" long-name="USB Services Info" level="plugin"/>
-<collection name="usbengines" long-name="USB Engines" level="generic">
-<component name="usbotgwatcher" filter="s60" long-name="USB OTG Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbotgwatcher/group"/>
-</component>
-<component name="usbwatcher" filter="s60" long-name="USB Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbwatcher/group"/>
-</component>
-<component name="usblocodplugin" filter="s60" long-name="USB Local Connectivity Domain Plugin" plugin="Y">
-<unit bldFile="mw/usbservices/usbengines/usblocodplugin/group"/>
-</component>
-<component name="usbdevcon" filter="s60" long-name="USB Device Control">
-<unit bldFile="mw/usbservices/usbengines/usbdevcon/group"/>
-</component>
-<component name="usbremotepersonality" filter="s60" long-name="USB Remote Personality">
-<unit bldFile="mw/usbservices/usbengines/usbremotepersonality/group"/>
-</component>
-</collection>
-<collection name="usbclasses" long-name="USB Classes" level="framework">
-<component name="usbobexclasscontroller" filter="s60" long-name="USB OBEX Class Controller" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbobexclasscontroller/group"/>
-</component>
-<component name="usbbasicpersonality" filter="s60" long-name="USB Basic Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbbasicpersonality/group"/>
-</component>
-<component name="usbmscpersonality" filter="s60" long-name="USB MSC Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbmscpersonality/group"/>
-</component>
-<!-- commented out in bld.inf. Should this be deleted?
- <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
- <unit bldFile="usbclasses/ptpstack/group"/>
- </component>
- <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
- <unit bldFile="usbclasses/sicdusbplugin/group"/>
- </component>
- <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
- <unit bldFile="usbclasses/ptpserver/group"/>
- </component>-->
-<component name="pictbridgeengine" filter="s60" long-name="PictBridge Engine">
-<unit bldFile="mw/usbservices/usbclasses/pictbridgeengine/group"/>
-</component>
-<component name="usbphoneasmodem" filter="s60" long-name="USB Phone as Modem" introduced="^3">
-<unit bldFile="mw/usbservices/usbclasses/usbphoneasmodem/group"/>
-</component>
-</collection>
-<collection name="usbuis" long-name="USB UIs" level="specific">
-<component name="usbui" filter="s60" long-name="USB UI">
-<unit bldFile="mw/usbservices/usbuis/usbui/group"/>
-</component>
-<component name="usbuinotif" filter="s60" long-name="USB UI Notifiers">
-<unit bldFile="mw/usbservices/usbuis/usbuinotif/group"/>
-</component>
-<component name="imageprintuiprovider" filter="s60" long-name="ImagePrint UI Provider" plugin="Y">
-<unit bldFile="mw/usbservices/usbuis/imageprintuiprovider/group"/>
-</component>
-<component name="usbimageprintui" filter="s60" long-name="ImagePrint UI">
-<unit bldFile="mw/usbservices/usbuis/imageprintui/group"/>
-</component>
-</collection>
-</block>
-<block name="shortlinkconn" level="generic" long-name="Shortlink Connectivity" levels="framework server generic specific plugin">
-<!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
-<collection name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" level="plugin">
-<component name="obex_service_utils_api" long-name="OBEX Service Utils API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_utils_api/group"/>
-</component>
-<component name="obex_service_plugin_api" long-name="OBEX Service Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_plugin_api/group"/>
-</component>
-<component name="dialup_connection_status_api" long-name="Dial-up Connection Status API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dialup_connection_status_api/group"/>
-</component>
-<component name="dun_secondary_display_notification_api" long-name="DUN Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
-</component>
-<component name="obex_secondary_display_notification_api" long-name="OBEX Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
-</component>
-<component name="generic_hid_api" long-name="Generic HID API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/generic_hid_api/group"/>
-</component>
-<component name="locod_bearer_plugin_api" long-name="Locod Bearer Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/locod_bearer_plugin_api/group"/>
-</component>
-<component name="usb_obexservicemanager_client_api" long-name="USB OBEX Service Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_obexservicemanager_client_api/group"/>
-</component>
-</collection>
-<collection name="localconnectivityservice" long-name="Local Connectivity Service" level="server">
-<component name="locod" long-name="Local Connectivity Daemon">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/locod/group"/>
-</component>
-<component name="obexserviceman" long-name="OBEX Service Managar">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
-</component>
-<component name="obexsendservices" long-name="OBEX Send Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
-</component>
-<component name="obexreceiveservices" long-name="OBEX Receive Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
-</component>
-<component name="dun" long-name="Dial Up Networking">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/dun/group"/>
-</component>
-<component name="lcstylustap" long-name="LC Stylus Tap Plugins" plugin="Y">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/lcstylustap/group"/>
-</component>
-<component name="generichid" long-name="Generic HID">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/generichid/group"/>
-</component>
-<component name="headset" long-name="Headset">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/headset/group"/>
-</component>
-</collection>
-</block>
-<block name="imghandling" level="specific" long-name="Image Handling" levels="lib util if">
-<collection name="imagehandling_plat" long-name="Image Handling Platform Interfaces" level="if">
-<component name="image_handling_library_api" long-name="Image Handling Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
-</component>
-<component name="3gp_library_api" long-name="3GP Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
-</component>
-<component name="thumbnailmanager_api" long-name="Thumbnail Manager API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagehandlinglib" long-name="Image Handling Library" level="lib">
-<!-- collection is really a component, need to move down a directory -->
-<component name="ihl" filter="s60" long-name="IHL">
-<unit bldFile="mw/imghandling/imagehandlinglib/group"/>
-</component>
-</collection>
-<collection name="imagehandlingutilities" long-name="Image Handling Utilities" level="util">
-<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager">
-<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
-</component>
-</collection>
-</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">
-<unit bldFile="mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
-</component>
-</collection>
-</block>
-<block name="mds" level="specific" long-name="Metadata Services" levels="mgr eng server int">
-<collection name="mds_plat" long-name="Metadata Services Platform Interfaces" level="int">
-<component name="context_engine_plugin_api" long-name="Context Engine Plugin API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/group" filter="!test"/>
-</component>
-<component name="harvester_framework_api" long-name="Harvester Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/harvester_framework_api/group" filter="!test"/>
-<!-- can only have one unit with the same filter, #include the following from the previous unit -->
-</component>
-<component name="location_manager_api" long-name="Location Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/location_manager_api/group" filter="!test"/>
-</component>
-<component name="metadata_engine_api" long-name="Metadata Engine API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/metadata_engine_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_collection_manager_api" long-name="Content Listing Framework Collection Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_extended_api" long-name="Content Listing Framework Extended API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_extended_api/group"/>
-</component>
-</collection>
-<collection name="mds_pub" long-name="Metadata Services Public Interfaces" level="int">
-<component name="content_listing_framework_api" long-name="Content Listing Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_pub/content_listing_framework_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="metadataengine" long-name="Metadata Engine" level="eng">
-<component name="metadataengine_common" filter="s60" long-name="Metadata Engine Common" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/common/group"/>
-</component>
-<component name="metadataengine_server" filter="s60" long-name="Metadata Engine Server" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/server/group"/>
-</component>
-<component name="metadataengine_client" filter="s60" long-name="Metadata Engine Client" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/client/group"/>
-</component>
-<component name="metadataengine_build" filter="s60" long-name="Metadata Engine Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/metadataengine/group"/>
-</component>
-</collection>
-<collection name="locationmanager" long-name="Location Manager" level="mgr">
-<component name="locationtrail" filter="s60" long-name="Location Trail" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/locationtrail/group"/>
-</component>
-<component name="locationmanager_server" filter="s60" long-name="Location Manager Server" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/server/group"/>
-</component>
-<component name="locationmanager_client" filter="s60" long-name="Location Manager Client" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/client/group"/>
-</component>
-<component name="locationmanager_build" filter="s60" long-name="Location Manager Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/locationmanager/group"/>
-</component>
-</collection>
-<collection name="contextengine" long-name="Context Engine" level="eng">
-<component name="contextengine_plugins" filter="s60" long-name="Context Engine Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/contextengine/plugins/group"/>
-</component>
-<component name="contextengine_build" filter="s60" long-name="Context Engine Build" introduced="^2">
-<!--make this collection a single component, or make this unit self-contained -->
-<unit bldFile="mw/mds/contextengine/group"/>
-</component>
-</collection>
-<collection name="harvester" long-name="Harvester" level="eng">
-<component name="blacklistclient" filter="s60" long-name="Blacklist Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistclient/group"/>
-</component>
-<component name="blacklistserver" filter="s60" long-name="Blacklist Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistserver/group"/>
-</component>
-<component name="harvester_common" filter="s60" long-name="Harvester Common" introduced="^2">
-<unit bldFile="mw/mds/harvester/common/group"/>
-</component>
-<component name="composerplugins" filter="s60" long-name="Composer Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/composerplugins/group"/>
-</component>
-<component name="harvesterplugins" filter="s60" long-name="Harvester Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/harvesterplugins/group"/>
-</component>
-<component name="monitorplugins" filter="s60" long-name="Monitor Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/monitorplugins/group"/>
-</component>
-<component name="harvester_server" filter="s60" long-name="Harvester Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/server/group"/>
-</component>
-<component name="harvester_client" filter="s60" long-name="Harvester Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/client/group"/>
-</component>
-<component name="harvester_build" filter="s60" long-name="Harvester Build" introduced="^2">
-<!-- split these exports into the other components -->
-<unit bldFile="mw/mds/harvester/group"/>
-</component>
-</collection>
-<collection name="watchdog" long-name="Watchdog" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="mdswatchdog" filter="s60" long-name="Metadata Watchdog" introduced="^2">
-<unit bldFile="mw/mds/watchdog/group"/>
-</component>
-</collection>
-<collection name="clfwrapper" long-name="Content Listing Framework Wrapper" level="int">
-<!-- collection is really a component. Move down a directory -->
-<component name="clfwrapper_build" filter="s60" long-name="CLF Wrapper Build" introduced="^2" class="placeholder">
-<!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
-<!--<unit bldFile="clfwrapper/group"/>-->
-</component>
-</collection>
-<collection name="mds_info" long-name="Metadata Services Info" level="int">
-<component name="mds_build" filter="s60" long-name="Metadata Services Build" introduced="^2">
-<!-- consider distributiing this into the rest of the components in the package -->
-<unit bldFile="mw/mds/group"/>
-</component>
-</collection>
-</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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<unit bldFile="mw/mmuifw/mmuifw_plat/alf_customlayoutmanagers_api/group"/>
-</component>
-<component name="gesturehelper_api" long-name="Gesture Helper API" filter="s60" 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">
-<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">
-<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">
-<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">
-<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">
-<!-- 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">
-<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">
-<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">
-<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">
-<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">
-<unit bldFile="mw/mmuifw/mulwidgets/mullogging/group"/>
-</component>
-<component name="muldatamodel" filter="s60" long-name="MUL Data Model">
-<unit bldFile="mw/mmuifw/mulwidgets/muldatamodel/group"/>
-</component>
-<component name="mulwidgets_common" filter="s60" long-name="MUL Common Utils">
-<unit bldFile="mw/mmuifw/mulwidgets/common/group"/>
-</component>
-<component name="gesturehelper" filter="s60" long-name="Gesture Helper">
-<unit bldFile="mw/mmuifw/mulwidgets/gesturehelper/group"/>
-</component>
-<component name="mulcoverflowwidget" filter="s60" long-name="MUL CoverFlow Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/mulcoverflowwidget/group"/>
-</component>
-<component name="mulsliderwidget" filter="s60" long-name="MUL Slider Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/mulsliderwidget/group"/>
-</component>
-<component name="alfviewwidget" filter="s60" long-name="ALF View Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/alfviewwidget/group"/>
-</component>
-<component name="alfcontainerwidget" filter="s60" long-name="ALF Container Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/alfcontainerwidget/group"/>
-</component>
-<component name="alfscrollbarwidget" filter="s60" long-name="ALF Scrollbar Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/alfscrollbarwidget/group"/>
-</component>
-</collection>
-</block>
-<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"/>
-</component>
-<component name="videoconnutility_api" long-name="Video Connection Utility API" filter="s60" class="api">
-<unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/group"/>
-</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"/>
-</component>
-</collection>
-<collection name="videoscheduler" long-name="Video Scheduler" level="util">
-<component name="schedulerclient" filter="s60" long-name="Video Scheduler Client">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerclient/group"/>
-</component>
-<component name="schedulerserver" filter="s60" long-name="Video Scheduler Server">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerserver/group"/>
-</component>
-</collection>
-<collection name="videoconnutility" long-name="Video Connection Utility" level="util">
-<component name="connutilpsworker" filter="s60" long-name="Connection Utility Publish and Subscribe Worker">
-<unit bldFile="mw/videoutils/videoconnutility/connutilpsworker/group"/>
-</component>
-<component name="video_connutility" filter="s60" long-name="Video Connection Utility">
-<unit bldFile="mw/videoutils/videoconnutility/connutility/group"/>
-</component>
-</collection>
-<collection name="videoutils_info" long-name="Video Utils Info" level="if"/>
-</block>
-<block name="mmmw" level="generic" long-name="Multimedia Middleware" levels="plugin framework server generic specific">
-<collection name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" level="specific">
-<component name="multimedia_data_source_api" long-name="Multimedia Data Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
-</component>
-<component name="progressive_download_api" long-name="Progressive Download API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/progressive_download_api/group"/>
-</component>
-<component name="equalizer_ui_api" long-name="Equalizer UI API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
-</component>
-<component name="enhanced_media_client_api" long-name="Enhanced Media Client API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
-</component>
-<component name="stream_control_custom_command_api" long-name="Stream Control Custom Command API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
-</component>
-<component name="emc_buffer_source_api" long-name="EMC Buffer Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_buffer_source_api/group"/>
-</component>
-<component name="emc_file_source_api" long-name="EMC File Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
-</component>
-<component name="audio_metadata_reader_api" long-name="Audio MetaData Reader API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
-</component>
-<component name="emc_progressive_download_source_api" long-name="EMC Progressive Download Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
-</component>
-<component name="emc_volume_effect_api" long-name="EMC Volume Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
-</component>
-<component name="emc_balance_effect_api" long-name="EMC Balance Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_balance_effect_api/group"/>
-</component>
-<component name="emc_descriptor_source_api" long-name="EMC Descriptor Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_descriptor_source_api/group"/>
-</component>
-<component name="emc_drm_config_intfc_api" long-name="EMC DRM Config Intfc API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
-</component>
-<component name="voip_audio_services_api" long-name="VoIP Audio Services" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/group"/>
-</component>
-<component name="configuration_components_factory_api" long-name="Configuration Components Factory API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
-</component>
-<component name="audio_output_control_utility_api" long-name="Audio Output Control Utility API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/group"/>
-</component>
-<component name="audio_output_control_utility_proxy_api" long-name="Audio Output Control Utility Proxy API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
-</component>
-<component name="emc_audio_effects_api" long-name="EMC Audio Effects API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
-</component>
-<component name="call_audio_control_api" long-name="Call AudioControl API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/group"/>
-</component>
-<component name="radio_utilities_api" long-name="Radio Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/group"/>
-</component>
-<component name="radio_preset_utilities_api" long-name="Radio Preset Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
-</component>
-<component name="radio_monitor_api" long-name="Radio Monitor API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
-</component>
-<component name="thumbnail_engine_api" long-name="Thumbnail Engine API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/thumbnail_engine_api/group"/>
-</component>
-<component name="telephony_multimedia_service_api" long-name="Telephony Multimedia Service API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="mmfenh" long-name="MMF Enhancements" level="generic">
-<component name="advancedaudiocontroller" filter="s60" long-name="Advanced Audio Controllers" plugin="Y">
-<unit bldFile="mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
-</component>
-<component name="audiooutputcontrolutility" filter="s60" long-name="Audio Output Control Utility">
-<unit bldFile="mw/mmmw/mmfenh/audiooutputcontrolutility/group"/>
-</component>
-<component name="configurationcomponentsfactory" filter="s60" long-name="Configuration Components Factory">
-<unit bldFile="mw/mmmw/mmfenh/configurationcomponentsfactory/group"/>
-</component>
-<component name="enhancedaudioplayerutility" filter="s60" long-name="Enhanced Audio Player Utility">
-<unit bldFile="mw/mmmw/mmfenh/enhancedaudioplayerutility/group"/>
-</component>
-<component name="enhancedmediaclient" filter="s60" long-name="Enhanced Media Client">
-<unit bldFile="mw/mmmw/mmfenh/enhancedmediaclient/group"/>
-</component>
-<component name="profilesettingsmonitor" filter="s60" long-name="Profile Settings Monitor">
-<unit bldFile="mw/mmmw/mmfenh/profilesettingsmonitor/group"/>
-</component>
-<component name="progressivedownload" filter="s60" long-name="Progressive Download">
-<unit bldFile="mw/mmmw/mmfenh/progressivedownload/group"/>
-</component>
-</collection>
-<collection name="mm_fw" long-name="Multimedia Frameworks" level="framework">
-<!-- Id needs to be unique, mmfw already in use -->
-<!-- Placeholder for OpenAX AL and other stuff -->
-</collection>
-<collection name="mmserv" long-name="Multimedia Services" level="specific">
-<component name="audioeffectsui" filter="s60" long-name="Audio Effects UI">
-<unit bldFile="mw/mmmw/mmserv/audioeffectsui/group"/>
-</component>
-<component name="callaudiocontrol" filter="s60" long-name="Call Audio Control">
-<unit bldFile="mw/mmmw/mmserv/callaudiocontrol/group"/>
-</component>
-<component name="metadatautility" filter="s60" long-name="Metadata Utility">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/group"/>
-</component>
-<component name="radioutility" filter="s60" long-name="Radio Utility">
-<unit bldFile="mw/mmmw/mmserv/radioutility/group"/>
-</component>
-<component name="thumbnailengine" filter="s60" long-name="Thumbnail Engine" introduced="^2">
-<unit bldFile="mw/mmmw/mmserv/thumbnailengine/group"/>
-</component>
-<component name="tms" filter="s60" long-name="Telephony Multimedia Service" introduced="^3">
-<unit bldFile="mw/mmmw/mmserv/tms/group"/>
-</component>
-<component name="voipaudioservices" filter="s60" long-name="VoIP Audio Services">
-<unit bldFile="mw/mmmw/mmserv/voipaudioservices/group"/>
-</component>
-<component name="lib3gpextparser" filter="s60" long-name="3GP Extension Metadata Parser Library">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group" filter="sf_build"/>
-</component>
-</collection>
-<collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
-<component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="helix" level="generic" long-name="Helix" levels="plugin framework server generic specific">
-<collection name="helix_ren" long-name="Helix Engine" level="framework">
-<!-- what does "ren" stand for? -->
-<component name="helix_stub" filter="s60" long-name="Helix Stub" introduced="^2" class="api">
-<unit bldFile="mw/helix/helix_ren/helix_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="camerasrv" level="specific" long-name="Camera Services" levels="plugin fw api">
-<collection name="camerasrv_plat" long-name="Camera Services Platform Interfaces" level="api">
-<component name="media_recorder_sink_api" long-name="Media Recorder Sink API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
-</component>
-<component name="cae_extentension_api" long-name="CAE Extension API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/cae_extentension_api/group"/>
-</component>
-<component name="camera_application_engine_api" long-name="Camera Application Engine API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/camera_application_engine_api/group" filter="!test"/>
-</component>
-<component name="custom_onboard_camera_api" long-name="Custom Onboard Camera API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
-</component>
-<component name="imaging_configuration_manager_api" long-name="Imaging Configuration Manager API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
-</component>
-<component name="media_recorder_api" long-name="Media Recorder API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_api/group" filter="!test"/>
-</component>
-<component name="3gp_file_composer_api" long-name="3GP File Composer API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
-</component>
-<component name="asynchronous_file_saving_queue_api" long-name="Asynchronous File Saving Queue API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="camappengine" long-name="Camera App Engine" level="fw">
-<!-- is this collection really a component? If so, move down a directory -->
-<component name="stillconverter" filter="s60" long-name="Still Image Converter" class="placeholder">
-<!-- should separate this from parent engine's bld.inf -->
-<!-- <unit bldFile="camappengine/stillconverter/group"/> -->
-</component>
-<component name="camappengine_engine" filter="s60" long-name="Camera App Engine" class="placeholder">
-<!-- should separate this from parent engine's bld.inf -->
-<!-- <unit bldFile="camappengine/engine/group"/> -->
-</component>
-<component name="asynchfilesavequeue" filter="s60" long-name="Asynch File Save Queue">
-<unit bldFile="mw/camerasrv/camappengine/asynchfilesavequeue/group"/>
-</component>
-<component name="camappengine_build" filter="s60" long-name="Camera App Engine Build">
-<unit bldFile="mw/camerasrv/camappengine/build"/>
-</component>
-</collection>
-<collection name="camcordermmfplugin" long-name="Camcorder MMF Plugin" level="plugin">
-<!-- collection is really a component. Should move down a directory -->
-<component name="camcordermmfplugin_build" filter="s60" long-name="Camcorder MMF Plugin Build" plugin="Y">
-<unit bldFile="mw/camerasrv/camcordermmfplugin/build"/>
-</component>
-</collection>
-<collection name="configmanagers" long-name="Config Managers" level="api">
-<component name="imagingconfigmanager" filter="s60" long-name="Imaging Config Manager">
-<unit bldFile="mw/camerasrv/configmanagers/imagingconfigmanager/group"/>
-</component>
-</collection>
-<collection name="camerasrv_info" long-name="Camera Services Info" level="api">
-<component name="camerasrv_build" filter="s60" long-name="Camera Services Build">
-<!-- should split into individual bld.infs -->
-<unit bldFile="mw/camerasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="mmappfw" level="specific" long-name="Multimedia App Framework" levels="fw utils if">
-<collection name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" level="if">
-<component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interfaces Build" introduced="^1" filter="s60">
-<!-- this is no longer necessary when confguration is put in place -->
-<unit bldFile="mw/mmappfw/mmappfw_plat"/>
-</component>
-<component name="collection_helper_api" long-name="Collection Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
-</component>
-<component name="harvester_collection_mediator_api" long-name="Harvester Collection Mediator API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/group"/>
-</component>
-<component name="harvester_metadata_extractor_api" long-name="Harvester Metadata Extractor API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/group"/>
-</component>
-<component name="harvester_server_api" long-name="Harvester Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_server_api/group"/>
-</component>
-<component name="harvester_utility_api" long-name="Harvester Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_utility_api/group"/>
-</component>
-<component name="playlist_engine_api" long-name="Playlist Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playlist_engine_api/group"/>
-</component>
-<component name="mtp_keys_api" long-name="MTP Keys API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mtp_keys_api/group"/>
-</component>
-<component name="mpx_collection_common_definition_api" long-name="MPX Collection Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_common_definition_api/group"/>
-</component>
-<component name="mpx_collection_utility_api" long-name="MPX Collection Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/group"/>
-</component>
-<component name="mpx_common_api" long-name="MPX Common API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_api/group"/>
-</component>
-<component name="mpx_common_definition_api" long-name="MPX Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_common_definition_api" long-name="MPX Playback Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_utility_api" long-name="MPX Playback Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/group"/>
-</component>
-<component name="mpx_base_view_plugins_api" long-name="MPX Base View Plugins API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/group"/>
-</component>
-<component name="mpx_view_utility_api" long-name="MPX View Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_view_utility_api/group"/>
-</component>
-<component name="mpx_albumart_utility_api" long-name="MPX Album Art Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/group"/>
-</component>
-<component name="media_player_settings_engine_api" long-name="Media Player Settings Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
-</component>
-<component name="mpx_backstepping_utility_api" long-name="MPX Backstepping Utility API" introduced="^1" filter="s60" class="api">
-<!-- uncomment when configuration is put in place
- <unit bldFile="mmappfw_plat/mpx_backstepping_utility_api/group"/> -->
-</component>
-<component name="asx_parser_api" long-name="ASX Parser API" introduced="^1" filter="s60" class="api">
-<!-- uncomment when configuration is put in place
- <unit bldFile="mmappfw_plat/asx_parser_api/group"/> -->
-</component>
-<component name="playback_helper_api" long-name="Playback Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playback_helper_api/group"/>
-</component>
-<component name="videoplaylist_utility_api" long-name="Video Playlist Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/videoplaylist_utility_api/group"/>
-</component>
-<component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interface Build" introduced="^1" filter="s60" class="api">
-<!-- needed only for #ifdefs. Remove anmd uncomment above units when configuration is in place -->
-<unit bldFile="mw/mmappfw/mmappfw_plat/group"/>
-</component>
-</collection>
-<collection name="mpx" long-name="Multimedia Player" level="fw">
-<component name="commonframework" filter="s60" long-name="MPX Common Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/commonframework/group"/>
-</component>
-<component name="playbackframework" filter="s60" long-name="MPX Playback Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/playbackframework/group"/>
-</component>
-<component name="mpxcollectionfw" filter="s60" long-name="MPX Collection Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/collectionframework/group"/>
-</component>
-<component name="mpxviewfw" filter="s60" long-name="MPX View Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/viewframework/group"/>
-</component>
-<component name="mpx_build" filter="s60" long-name="MPX Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/mpx/group"/>
-</component>
-</collection>
-<collection name="mmappcomponents" long-name="Multimedia App Components" level="utils">
-<component name="mmappcomponents_build" filter="s60" long-name="Multimedia App Components Build" introduced="^1">
-<!-- needed for #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
- Can remove this once configuration is in place-->
-<unit bldFile="mw/mmappfw/mmappcomponents/group"/>
-</component>
-<component name="collectionhelper" filter="s60" long-name="Media Player Collection Helper" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/collectionhelper/group"/>
-</component>
-<component name="playlistengine" filter="s60" long-name="Playlist Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/playlistengine/group"/>
-</component>
-<component name="mpxharvester" filter="s60" long-name="Media Player Harvester" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/harvester/group"/>
-</component>
-<component name="mmappcommonui" filter="s60" long-name="Multimedia App Common UI" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmappcommonui/group"/>
-</component>
-<component name="mediaplayersettingsengine" filter="s60" long-name="Media Player Settings Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
-</component>
-<component name="audiofetcher" filter="s60" long-name="Audio Fetcher" introduced="^1" plugin="Y">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
-</component>
-<component name="asxparser" filter="s60" long-name="ASX Parser" introduced="^1">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
-</component>
-<component name="playbackhelper" filter="s60" long-name="Playback Helper" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/playbackhelper/group"/>
-</component>
-<component name="videoplaylistutility" filter="s60" long-name="Video Playlist Utility" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/videoplaylistutility/group"/>
-</component>
-<component name="mmmtpdataprovider" filter="s60" long-name="Multimedia MTP Data Provider" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmmtpdataprovider/group"/>
-</component>
-</collection>
-<collection name="mmappfw_info" long-name="Multimedia App Framework Info" level="if">
-<component name="mmappfw_build" filter="s60" long-name="Multimedia App Framework Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/group"/>
-</component>
-<component name="mmappfw_test" filter="s60,test,api_test,pref_test" long-name="Multimedia App Framework Test" purpose="development" introduced="^1"/>
-</collection>
-</block>
-<block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework api">
-<collection name="inputmethods_pub" long-name="Input Methods Public Interfaces" level="api">
-<component name="ptiengine_iti_api" long-name="PTI Engine API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
-</component>
-<component name="optical_character_recognition_api" long-name="Optical Character Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
-</component>
-<component name="input_language_info_api" long-name="Input Language Info API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
-</component>
-</collection>
-<collection name="inputmethods_plat" long-name="Input Methods Platform Interfaces" level="api">
-<component name="pen_input_server_api" long-name="Pen Input Server API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/group" filter="!test"/>
-</component>
-<component name="ptiengine_hwr_api" long-name="PTI Engine Handwriting Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group" filter="!test"/>
-</component>
-<component name="aknfep_settings_api" long-name="Avkon FEP Settings API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
-</component>
-<component name="aknfep_status_api" long-name="Avkon FEP Status API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
-</component>
-<component name="ptiengine_key_definations_api" long-name="PTI Engine Key Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
-</component>
-<component name="aknfep_definitions_api" long-name="Avkon FEP Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
-</component>
-<component name="aknfep_pen_support_api" long-name="Avkon FEP Pen Support API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
-</component>
-<component name="ptiengine_indic_definitions_api" long-name="PTI Engine Indic Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
-</component>
-<component name="aknfep_uiinterface_api" long-name="Avkon FEP UI Interface API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="textinput" long-name="Text Input" level="framework">
-<component name="ptienginev2" filter="s60" long-name="Predictive Text Input Engine">
-<!--uncomment when configuration is turned on and textinput_build is removed-->
-<!-- <unit bldFile="textinput/ptienginev2/group"/>-->
-</component>
-<component name="akninputlanguage" filter="s60" long-name="Avkon Input Language">
-<unit bldFile="mw/inputmethods/textinput/akninputlanguage/group"/>
-</component>
-<component name="peninputarc" filter="s60" long-name="Pen Input Arc">
-<unit bldFile="mw/inputmethods/textinput/peninputarc/group"/>
-</component>
-<component name="peninputcommonctrls" filter="s60" long-name="Pen Input Common Controls">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonctrls/group"/>
-</component>
-<component name="peninputhwrboxcn" filter="s60" long-name="Chinese Handwriting Recognition Box" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrboxcn/group"/>
-</component>
-<component name="peninputvkbcn" filter="s60" long-name="Chinese Virtual Keyboard" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputvkbcn/group"/>
-</component>
-<component name="peninputcommonlayout" filter="s60" long-name="Pen Input Common Layout">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonlayout/group"/>
-</component>
-<component name="peninputgenerichwr" filter="s60" long-name="Pen Input Generic Handwriting Recognition" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputgenerichwr/group"/>
-</component>
-<component name="peninputgenericvkb" filter="s60" long-name="Pen Input Generic Virtual Keyboard" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputgenericvkb/group"/>
-</component>
-<component name="peninputcommonctrlsjp" filter="s60" long-name="Pen Input Common Controls Japanese">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonctrlsjp/group"/>
-</component>
-<component name="peninputhwrboxjp" filter="s60" long-name="Japanese Handwriting Recognition Box" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrboxjp/group"/>
-</component>
-<component name="peninputvkbjp" filter="s60" long-name="Japanese Virtual Keyboard" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputvkbjp/group"/>
-</component>
-<component name="gslangplugin" filter="s60" long-name="GS Language Plugin" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/GSLangPlugin"/>
-</component>
-<component name="peninputgenericitut" filter="s60" long-name="Pen Input Generic ITU-T" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputgenericitut/group"/>
-</component>
-<component name="peninputhwrtrui" filter="s60" long-name="Pen Input Handwriting Recognition Training UI" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrtrui/group"/>
-</component>
-<component name="peninputhwrfscn" filter="s60" long-name="Pen Input Chinese Full Screen Handwriting Recognition" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrfscn/group"/>
-</component>
-<component name="peninputvkbkr" filter="s60" long-name="Pen Input Korean Virtual Keyboard" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputvkbkr/group"/>
-</component>
-<component name="peninputfingerhwr" filter="s60" long-name="Pen Input Finger Handwriting Recognition" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputfingerhwr/group"/>
-</component>
-<component name="peninputsplititut" filter="s60" long-name="Pen Input Split ITU-T" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputsplititut/group"/>
-</component>
-<component name="peninputsplitqwerty" filter="s60" long-name="Pen Input Split QWERTY" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputsplitqwerty/group"/>
-</component>
-<component name="textinput_build" filter="s60" long-name="Text Input Build">
-<!--needed for #ifdef, can be removed when configuration is implemented -->
-<unit bldFile="mw/inputmethods/textinput/group"/>
-</component>
-</collection>
-<collection name="fep" long-name="FEP" level="engine">
-<component name="aknfep" filter="s60" long-name="Avkon FEP" plugin="Y">
-<unit bldFile="mw/inputmethods/fep/aknfep/group"/>
-</component>
-<component name="frontendprocessor" long-name="Front End Processor" purpose="mandatory">
-<unit bldFile="mw/inputmethods/fep/frontendprocessor/group" mrp="mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
-</component>
-</collection>
-<collection name="inputmethods_info" long-name="Input Methods Info" level="api">
-<component name="inputmethods_metadata" long-name="Input Methods Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="qt" level="generic" long-name="Qt" levels="tool mw app">
-<collection name="qtconf" long-name="Qt Config" level="tool">
-<component name="qt_deviceconfiguration" long-name="Qt Device Configuration" introduced="^2" class="config tool">
-<unit bldFile="mw/qt/src/s60installs/deviceconfiguration"/>
-</component>
-</collection>
-<collection name="qt_info" long-name="Qt Info" level="mw">
-<component name="qt_build" long-name="Qt Build" introduced="^2">
-<unit bldFile="mw/qt" proFile="projects.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-<collection name="qtdemos" long-name="Qt Demos" level="app">
-<component name="qtdemos_build" long-name="Qt Demos Build" introduced="^2" filter="qtdemos">
-<unit bldFile="mw/qt/demos" proFile="demos.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qtexamples" long-name="Qt Examples" level="app">
-<component name="qtexamples_build" long-name="Qt Examples Build" introduced="^2" filter="qtexamples">
-<unit bldFile="mw/qt/examples" proFile="examples.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qt_tests" long-name="Qt Tests" level="app">
-<component name="qttestsauto" long-name="Qt Automated Tests" introduced="^2" filter="qttestsauto">
-<unit bldFile="mw/qt/tests/auto" proFile="qtpauto.pro"/>
-</component>
-<component name="qttestsbenchmarks" long-name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks">
-<unit bldFile="mw/qt/tests/benchmarks" proFile="benchmarks.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</block>
-<block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
-<collection name="classicui_plat" long-name="Classic UI Platform Interfaces" level="specific">
-<component name="personalisation_framework_api" long-name="Personalisation Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_framework_api/group" filter="!test"/>
-</component>
-<component name="signal_pane_api" long-name="Signal Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
-</component>
-<component name="japanese_reading_api" long-name="Japanese Reading API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/japanese_reading_api/group" filter="!test"/>
-</component>
-<component name="global_popup_priority_controller_api" long-name="Global Popup Priority Controller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
-</component>
-<component name="item_finder_api" long-name="Item Finder API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/item_finder_api/group" filter="!test"/>
-</component>
-<component name="avkon_fonts_api" long-name="Avkon Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_fonts_api/group" filter="!test"/>
-</component>
-<component name="extended_utilities_api" long-name="Extended Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
-</component>
-<component name="personalisation_plugin_api" long-name="Personalisation Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
-</component>
-<component name="extended_aiw_criteria_api" long-name="Extended AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="personalisation_application_api" long-name="Personalisation Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_application_api/group"/>
-</component>
-<component name="volume_popup_api" long-name="Volume Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
-</component>
-<component name="avkon_secondary_display_support_api" long-name="AVKON Secondary Display Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_support_api/group" filter="!test"/>
-</component>
-<component name="extended_setting_pages_api" long-name="Extended Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_setting_pages_api/group" filter="!test"/>
-</component>
-<component name="extended_lists_api" long-name="Extended Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_lists_api/group" filter="!test"/>
-</component>
-<component name="input_block_api" long-name="Input Block API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/input_block_api/group" filter="!test"/>
-</component>
-<component name="avkon_ui_server_api" long-name="AVKON UI Server API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_ui_server_api/group" filter="!test"/>
-</component>
-<component name="number_grouping_api" long-name="Number Grouping API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/number_grouping_api/group" filter="!test"/>
-</component>
-<component name="extended_status_pane_api" long-name="Extended Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_status_pane_api/group" filter="!test"/>
-</component>
-<component name="extended_notifiers_api" long-name="Extended Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notifiers_api/group" filter="!test"/>
-</component>
-<component name="task_list_api" long-name="Task List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
-</component>
-<component name="personalisation_slide_show_dialog_api" long-name="Personalisation Slide Show Dialog API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
-</component>
-<component name="key_event_utilities_api" long-name="Key Event Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_event_utilities_api/group"/>
-</component>
-<component name="emergency_call_support_api" long-name="Emergency Call Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/emergency_call_support_api/group" filter="!test"/>
-</component>
-<component name="extended_dialogs_api" long-name="Extended Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_dialogs_api/group"/>
-</component>
-<component name="legacy_ui_framework_headers_api" long-name="Legacy UI Framework Headers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/legacy_ui_framework_headers_api/group"/>
-</component>
-<component name="extended_editors_api" long-name="Extended Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_editors_api/group" filter="!test"/>
-</component>
-<component name="alarm_api" long-name="Alarm API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alarm_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_interface_base_api" long-name="AIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_base_api/group" filter="!test"/>
-</component>
-<component name="list_effects_api" long-name="List Effects API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/list_effects_api/group" filter="!test"/>
-</component>
-<component name="find_item_ui_api" long-name="Find Item UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/find_item_ui_api/group" filter="!test"/>
-</component>
-<component name="server_application_services_api" long-name="Server Application Services API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/server_application_services_api/group" filter="!test"/>
-</component>
-<component name="common_ui_settings_api" long-name="Common UI Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_ui_settings_api/group"/>
-</component>
-<component name="aiw_service_interface_menu_api" long-name="AIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_menu_api/group" filter="!test"/>
-</component>
-<component name="eikon_server_extension_client_api" long-name="EIKON Server Extension Client API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/eikon_server_extension_client_api/group" filter="!test"/>
-</component>
-<component name="skinnable_clock_api" long-name="Skinnable Clock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/skinnable_clock_api/group" filter="!test"/>
-</component>
-<component name="battery_pane_api" long-name="Battery Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/battery_pane_api/group" filter="!test"/>
-</component>
-<component name="fep_document_navigation_api" long-name="FEP Document Navigation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
-</component>
-<component name="personalisation_localised_texts_api" long-name="Personalisation Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
-</component>
-<component name="memory_card_ui_api" long-name="Memory Card UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
-</component>
-<component name="avkon_status_api" long-name="AVKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_status_api/group"/>
-</component>
-<component name="application_switching_api" long-name="Application Switching API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/application_switching_api/group" filter="!test"/>
-</component>
-<component name="avkon_localised_texts_api" long-name="AVKON Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_localised_texts_api/group"/>
-</component>
-<component name="avkon_secondary_display_api" long-name="AVKON Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_api/group"/>
-</component>
-<component name="extended_animation_api" long-name="Extended Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_notes_api" long-name="Extended Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notes_api/group" filter="!test"/>
-</component>
-<component name="screensaver_animation_plugin_definitions_api" long-name="Screensaver Animation Plugin Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/screensaver_animation_plugin_definitions_api/group"/>
-</component>
-<component name="text_scroller_api" long-name="Text Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/text_scroller_api/group" filter="!test"/>
-</component>
-<component name="custom_cursors_api" long-name="Custom Cursors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/custom_cursors_api/group" filter="!test"/>
-</component>
-<component name="screensaver_settings_api" long-name="Screensaver Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/screensaver_settings_api/group"/>
-</component>
-<component name="global_window_priorities_api" long-name="Global Window Priorities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_window_priorities_api/group"/>
-</component>
-<component name="extended_indicators_api" long-name="Extended Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_indicators_api/group" filter="!test"/>
-</component>
-<component name="special_character_table_api" long-name="Special Character Table API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/special_character_table_api/group" filter="!test"/>
-</component>
-<component name="avkon_settings_api" long-name="AVKON Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_settings_api/group"/>
-</component>
-<component name="extended_sounds_api" long-name="Extended Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_sounds_api/group"/>
-</component>
-<component name="themes_settings_api" long-name="Themes Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/themes_settings_api/group"/>
-</component>
-<component name="media_shared_document_api" long-name="Media Shared Document API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/media_shared_document_api/group" filter="!test"/>
-</component>
-<component name="extended_queries_api" long-name="Extended Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_queries_api/group"/>
-</component>
-<component name="phone_number_text_utilities_api" long-name="Phone Number Text Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
-</component>
-<component name="screensaver_runtime_api" long-name="Screensaver Runtime API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/screensaver_runtime_api/group"/>
-</component>
-<component name="extended_scroller_api" long-name="Extended Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_scroller_api/group"/>
-</component>
-<component name="key_rotator_api" long-name="Key Rotator API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_rotator_api/group" filter="!test"/>
-</component>
-<component name="extended_grids_api" long-name="Extended Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_grids_api/group" filter="!test"/>
-</component>
-<component name="generic_parameter_api" long-name="Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="indicator_touch_observer_api" long-name="Indicator Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_touch_observer_api/group"/>
-</component>
-<component name="popup_form_api" long-name="Popup Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/popup_form_api/group" filter="!test"/>
-</component>
-<component name="stylus_activated_popup_api" long-name="Stylus Activated Pop-up API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/stylus_activated_popup_api/group" filter="!test"/>
-</component>
-<component name="indicator_plugin_api" long-name="Indicator Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_plugin_api/group" filter="!test"/>
-</component>
-<component name="layout_configuration_api" long-name="Layout Configuration API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/layout_configuration_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_filter_factory_api" long-name="Common File Dialogs Filter Factory API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group" filter="!test"/>
-</component>
-<component name="avkon_anim_dll_api" long-name="AVKON Anim DLL API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_anim_dll_api/group"/>
-</component>
-<component name="extended_initialization_api" long-name="Extended Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_initialization_api/group" filter="!test"/>
-</component>
-<component name="long_tap_animation_api" long-name="Long Tap Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/long_tap_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_ui_framework_definitions_api" long-name="Extended UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_ui_framework_definitions_api/group"/>
-</component>
-<component name="extended_buttons_api" long-name="Extended Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_buttons_api/group" filter="!test"/>
-</component>
-<component name="aiw_provider_utility_api" long-name="AIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_provider_utility_api/group" filter="!test"/>
-</component>
-<component name="transition_effect_parameters_api" long-name="Transition Effect Parameters API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_parameters_api/group" filter="!test"/>
-</component>
-<component name="extended_input_capabilities_api" long-name="Extended Input Capabilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_input_capabilities_api/group" filter="!test"/>
-</component>
-<component name="uikon_status_api" long-name="UIKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/uikon_status_api/group"/>
-</component>
-<component name="transition_effect_utilities_api" long-name="Transition Effect Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_utilities_api/group" filter="!test"/>
-</component>
-<component name="pointer_event_modifier_api" long-name="Pointer Event Modifier API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/pointer_event_modifier_api/group" filter="!test"/>
-</component>
-<component name="avkon_testability_api" long-name="AVKON Testability API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_testability_api/group"/>
-</component>
-<component name="ganes_api" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ganes_api/group"/>
-</component>
-<component name="ode_api" long-name="Ode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ode_api/group"/>
-</component>
-<component name="physics_api" long-name="Physics API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/physics_api/group"/>
-</component>
-<component name="touch_pane_api" long-name="Touch Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_api/group" filter="!test"/>
-</component>
-<component name="touch_pane_observer_api" long-name="Touch Pane Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_observer_api/group"/>
-</component>
-<component name="alternate_fs_api" long-name="Alternate FS API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alternate_fs_api/group"/>
-</component>
-<component name="discreet_popup_api" long-name="Discreet Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/discreet_popup_api/group"/>
-</component>
-<component name="touch_gesture_framework_api" long-name="Touch Gesture Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_gesture_framework_api/group"/>
-<!-- should this be commented out? -->
-<!--<unit bldFile="classicui_plat/touch_gesture_framework_api/tsrc/group" filter="test,api_test"/> -->
-</component>
-<component name="extended_options_menu_api" long-name="Extended Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="classicui_pub" long-name="Classic UI Public Interfaces" level="specific">
-<component name="input_frame_api" long-name="Input Frame API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/input_frame_api/group" filter="!test"/>
-</component>
-<component name="window_server_event_observer_api" long-name="Window Server Event Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/window_server_event_observer_api/group" filter="!test"/>
-</component>
-<component name="application_framework_api" long-name="Application Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/application_framework_api/group" filter="!test"/>
-</component>
-<component name="scroller_api" long-name="Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/scroller_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_utilities_api" long-name="UI Framework Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_utilities_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_definitions_api" long-name="UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_definitions_api/group" filter="!test"/>
-</component>
-<component name="buttons_api" long-name="Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/buttons_api/group" filter="!test"/>
-</component>
-<component name="queries_api" long-name="Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/queries_api/group" filter="!test"/>
-</component>
-<component name="aiw_generic_parameter_api" long-name="AIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="editors_api" long-name="Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/editors_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_api" long-name="Common File Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/common_file_dialogs_api/group" filter="!test"/>
-</component>
-<component name="dialog_shutter_api" long-name="Dialog Shutter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialog_shutter_api/group" filter="!test"/>
-</component>
-<component name="fonts_api" long-name="Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/fonts_api/group" filter="!test"/>
-</component>
-<component name="screen_clearer_api" long-name="Screen Clearer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_clearer_api/group" filter="!test"/>
-</component>
-<component name="notifiers_api" long-name="Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notifiers_api/group" filter="!test"/>
-</component>
-<component name="notes_api" long-name="Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notes_api/group" filter="!test"/>
-</component>
-<component name="screen_saver_api" long-name="Screen Saver API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_saver_api/group" filter="!test"/>
-</component>
-<component name="status_pane_api" long-name="Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/status_pane_api/group" filter="!test"/>
-</component>
-<component name="base_controls_api" long-name="Base Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/base_controls_api/group" filter="!test"/>
-</component>
-<component name="grids_api" long-name="Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/grids_api/group" filter="!test"/>
-</component>
-<component name="context_pane_api" long-name="Context Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/context_pane_api/group" filter="!test"/>
-</component>
-<component name="lists_api" long-name="Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/lists_api/group" filter="!test"/>
-</component>
-<component name="popups_api" long-name="Popups API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/popups_api/group" filter="!test"/>
-</component>
-<component name="misc_controls_api" long-name="Misc Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/misc_controls_api/group" filter="!test"/>
-</component>
-<component name="keylock_api" long-name="Keylock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/keylock_api/group" filter="!test"/>
-</component>
-<component name="options_menu_api" long-name="Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/options_menu_api/group" filter="!test"/>
-</component>
-<component name="hierarchical_lists_api" long-name="Hierarchical Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hierarchical_lists_api/group" filter="!test"/>
-</component>
-<component name="navigation_pane_api" long-name="Navigation Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/navigation_pane_api/group" filter="!test"/>
-</component>
-<component name="tabs_api" long-name="Tabs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/tabs_api/group" filter="!test"/>
-</component>
-<component name="title_pane_touch_observer_api" long-name="Title Pane Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_touch_observer_api/group"/>
-</component>
-<component name="choice_list_api" long-name="Choice List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/choice_list_api/group" filter="!test"/>
-</component>
-<component name="info_popup_note_api" long-name="Info Popup Note API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/info_popup_note_api/group" filter="!test"/>
-</component>
-<component name="setting_pages_api" long-name="Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/setting_pages_api/group" filter="!test"/>
-</component>
-<component name="screen_mode_api" long-name="Screen Mode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_mode_api/group" filter="!test"/>
-</component>
-<component name="indicators_api" long-name="Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/indicators_api/group" filter="!test"/>
-</component>
-<component name="error_ui_api" long-name="Error UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/error_ui_api/group" filter="!test"/>
-</component>
-<component name="animation_api" long-name="Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/animation_api/group" filter="!test"/>
-</component>
-<component name="searchfield_api" long-name="Searchfield API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/searchfield_api/group" filter="!test"/>
-</component>
-<component name="labels_api" long-name="Labels API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/labels_api/group" filter="!test"/>
-</component>
-<component name="hotkeys_api" long-name="Hotkeys API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hotkeys_api/group" filter="!test"/>
-</component>
-<component name="initialization_api" long-name="Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/initialization_api/group" filter="!test"/>
-</component>
-<component name="volume_control_api" long-name="Volume Control API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/volume_control_api/group" filter="!test"/>
-</component>
-<component name="title_pane_api" long-name="Title Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_api/group" filter="!test"/>
-</component>
-<component name="sounds_api" long-name="Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/sounds_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_handler_api" long-name="AIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_service_handler_api/group" filter="!test"/>
-</component>
-<component name="aiw_criteria_api" long-name="AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="touch_ui_utilities_api" long-name="Touch UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/touch_ui_utilities_api/group" filter="!test"/>
-</component>
-<component name="generic_button_api" long-name="Generic Button API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/generic_button_api/group" filter="!test"/>
-</component>
-<component name="form_api" long-name="Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/form_api/group" filter="!test"/>
-</component>
-<component name="uikon_core_controls" long-name="Uikon Core Controls" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/uikon_core_controls/group" filter="!test"/>
-</component>
-<component name="calendar_api" long-name="Calendar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/calendar_api/group"/>
-</component>
-<component name="toolbar_api" long-name="Toolbar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/toolbar_api/group" filter="!test"/>
-</component>
-<component name="server_application_api" long-name="Server Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/server_application_api/group"/>
-</component>
-<component name="slider_api" long-name="Slider API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/slider_api/group" filter="!test"/>
-</component>
-<component name="private_ui_framework_api" long-name="Private UI Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/private_ui_framework_api/group" filter="!test"/>
-</component>
-<component name="dialogs_api" long-name="Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialogs_api/group" filter="!test"/>
-</component>
-<component name="document_handler_api" long-name="Document handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/document_handler_api/group"/>
-</component>
-<component name="images_api" long-name="Images API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/images_api/group" filter="!test"/>
-</component>
-<component name="stylus_popup_menu_api" long-name="Stylus Pop-up Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/stylus_popup_menu_api/group" filter="!test"/>
-</component>
-<component name="information_preview_popup_api" long-name="Information Preview Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/information_preview_popup_api/group" filter="!test"/>
-</component>
-<component name="intermediate_state_api" long-name="Intermediate State API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/intermediate_state_api/group"/>
-</component>
-<component name="help_launcher_api" long-name="Help Launcher API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/help_launcher_api/group"/>
-</component>
-</collection>
-<collection name="ode" long-name="Open Dynamics Engine" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="ode_build" filter="s60" long-name="ODE">
-<unit bldFile="mw/classicui/ode/group"/>
-</component>
-</collection>
-<collection name="uifw" long-name="UI Framework" level="server">
-<component name="uiklaf" filter="s60" long-name="Uikon Look-and-Feel">
-<unit bldFile="mw/classicui/uifw/uiklaf/group"/>
-</component>
-<component name="eikctl" filter="s60" long-name="Eikon Controls">
-<unit bldFile="mw/classicui/uifw/eikctl/group"/>
-</component>
-<component name="avkon" filter="s60" long-name="Avkon">
-<!-- can only have one unit. Split into 3 components, or #include all from same bld.inf -->
-<unit bldFile="mw/classicui/uifw/avkon/aknphysics/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/aknconf/group"/>
-</component>
-<component name="eikstd" filter="s60" long-name="Eikon Standard">
-<unit bldFile="mw/classicui/uifw/eikstd/group"/>
-</component>
-<component name="aknglobalui" filter="s60" long-name="Avkon Global UI">
-<unit bldFile="mw/classicui/uifw/aknglobalui/group"/>
-</component>
-<component name="ganes" filter="s60" long-name="Ganes">
-<unit bldFile="mw/classicui/uifw/ganes/group"/>
-</component>
-</collection>
-<collection name="commonuis" long-name="Common UIs" level="specific">
-<component name="commonui" filter="s60" long-name="Common UI">
-<unit bldFile="mw/classicui/commonuis/commonui/group"/>
-</component>
-<component name="commondialogs" filter="s60" long-name="Common Dialogs">
-<unit bldFile="mw/classicui/commonuis/commondialogs/group"/>
-</component>
-</collection>
-<collection name="applicationinterworkingfw" long-name="Application Interworking Framework" level="generic">
-<component name="aifwservicehandler" filter="s60" long-name="Application Interworking Service Handler">
-<unit bldFile="mw/classicui/applicationinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-<collection name="psln" long-name="Personalization" level="specific">
-<!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
-<component name="psln_build" filter="s60" long-name="Personalization Build">
-<unit bldFile="mw/classicui/psln/group"/>
-</component>
-</collection>
-<collection name="commonadapter" long-name="Common Adapter" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="commonadapter_build" filter="s60" long-name="Common Adapter Build">
-<unit bldFile="mw/classicui/commonadapter/group"/>
-</component>
-</collection>
-<collection name="akntouchgesturefw" long-name="Avkon Touch Gesture Framework" level="generic">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="akntouchgesturefw_build" filter="s60" long-name="Avkon Touch Gesture Framework Build" introduced="^3">
-<unit bldFile="mw/classicui/akntouchgesturefw/group"/>
-</component>
-</collection>
-<collection name="uiutils" long-name="UI Utils" level="specific">
-<component name="localizer" filter="s60" long-name="Directory Localizer">
-<unit bldFile="mw/classicui/uiutils/localizer/group"/>
-</component>
-<component name="findutil" filter="s60" long-name="Find Utility">
-<unit bldFile="mw/classicui/uiutils/findutil/group"/>
-</component>
-<component name="gamerecognizer" filter="s60" long-name="Game Recognizer" plugin="Y">
-<unit bldFile="mw/classicui/uiutils/gamerecognizer/group"/>
-</component>
-<component name="aknjapanesereading" filter="s60" long-name="Avkon Japanese Reading">
-<unit bldFile="mw/classicui/uiutils/aknjapanesereading/group"/>
-</component>
-</collection>
-<collection name="commonuisupport" long-name="Common UI Support" level="support">
-<component name="uikon" long-name="Uikon" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uikon/group" mrp="mw/classicui/commonuisupport/uikon/group/app-framework_uikon.mrp"/>
-</component>
-<component name="errorresolverdata" long-name="Error Resolver Data" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/errorresolverdata/group" mrp="mw/classicui/commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
-</component>
-<component name="uilaf" long-name="UI Look and Feel" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uilaf/GROUP" mrp="mw/classicui/commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
-</component>
-<component name="grid" long-name="Grid" purpose="optional">
-<unit bldFile="mw/classicui/commonuisupport/grid/group" mrp="mw/classicui/commonuisupport/grid/group/app-framework_grid.mrp"/>
-</component>
-<component name="uifwsdocs" long-name="UI Frameworks Documentation" purpose="development" class="doc">
-<unit mrp="mw/classicui/commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
-</component>
-</collection>
-<collection name="lafagnosticuifoundation" long-name="Look-and-Feel Agnostic UI Foundation" level="base">
-<component name="cone" long-name="Control Environment" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/cone/group" mrp="mw/classicui/lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
-</component>
-<component name="graphicseffects" long-name="Graphics Effects" introduced="9.2" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/graphicseffects/group" mrp="mw/classicui/lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
-</component>
-<component name="uigraphicsutils" long-name="UI Graphics Utilities" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group" mrp="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
-</component>
-<component name="clockanim" long-name="Clock" purpose="optional" plugin="Y">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/clockanim/group" mrp="mw/classicui/lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
-</component>
-<component name="bmpanimation" long-name="BMP Animation" introduced="6.0" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/bmpanimation/group" mrp="mw/classicui/lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
-</component>
-<component name="animation" long-name="Animation" introduced="9.1" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/animation/group" mrp="mw/classicui/lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
-</component>
-</collection>
-<collection name="classicui_info" long-name="Classic UI Info" level="specific">
-<!-- the multiple units in the API test components need to be resolved -->
-<component name="classicui_metadata" long-name="Classic UI Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/classicui/classicui_info/classicui_metadata/classicui_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="svgt" level="generic" long-name="SVG Tiny" levels="util ui">
-<collection name="svgt_plat" long-name="SVG Tiny Platform Interfaces" level="ui">
-<component name="svgt_api" long-name="SVGT API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/svgt_api/group"/>
-</component>
-<component name="nvg_api" long-name="NVG API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/nvg_api/group"/>
-</component>
-</collection>
-<collection name="svgtopt" long-name="SVG-T Engine" level="util">
-<component name="svgtopt_build" filter="s60" long-name="SVG Engine" introduced="9.2">
-<!-- component is at collection level. Needs to be moved down a directory -->
-<unit bldFile="mw/svgt/svgtopt/group"/>
-</component>
-<component name="svgtplugin" filter="s60" long-name="SVG Plugin" introduced="9.2" plugin="Y">
-<unit bldFile="mw/svgt/svgtopt/svgtplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="uiaccelerator" level="generic" long-name="UI Accelerator" levels="plugin framework server ex if">
-<collection name="uiaccelerator_plat" long-name="UI Accelerator Platform Interfaces" level="if">
-<component name="alf_core_toolkit_api" long-name="ALF Core Toolkit API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/group"/>
-</component>
-<component name="alf_visual_api" long-name="ALF Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/group"/>
-</component>
-<component name="alf_extended_visual_api" long-name="ALF Extended Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/group"/>
-</component>
-<component name="alf_extension_api" long-name="ALF Extension API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/group"/>
-</component>
-<component name="alf_tracing_api" long-name="ALF Tracing API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/group"/>
-</component>
-<component name="alf_client_server_api" long-name="ALF Client Server API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/group"/>
-</component>
-</collection>
-<collection name="uiacceltk" long-name="UI Accelerator Toolkit" level="framework">
-<component name="hitchcock" filter="s60" long-name="Hitchcock">
-<unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/group"/>
-</component>
-<component name="uiacceltk_build" filter="s60" long-name="UI Accelerator Toolkit Build">
-<!-- move into the other component, or remove the #include and make this UI Accelerator Toolkit ROM-->
-<unit bldFile="mw/uiaccelerator/uiacceltk/group"/>
-</component>
-</collection>
-</block>
-<block name="uiresources" level="generic" long-name="UI Resources" levels="compile plugin framework server generic data">
-<!-- are the custom filters below needed? -->
-<collection name="uiresources_pub" long-name="UI Resources Public Interfaces" level="data">
-<component name="pictograph_api" long-name="Pictograph API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/pictograph_api/group" filter="!test"/>
-</component>
-<component name="skins_api" long-name="Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/skins_api/group" filter="!test"/>
-</component>
-<component name="font_definition_api" long-name="Font Definition API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/font_definition_api/group" filter="!test"/>
-</component>
-<component name="graphics_api" long-name="Graphics API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/graphics_api/group" filter="!test"/>
-</component>
-<component name="scalable_icons_api" long-name="Scalable Icons API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/scalable_icons_api/group"/>
-</component>
-<component name="layout_id_definitions_api" long-name="Layout ID Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/layout_id_definitions_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_plat" long-name="UI Resources Platform Interfaces" level="data">
-<component name="layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_system_private_api/group" filter="!test"/>
-</component>
-<component name="layout_data_api" long-name="Layout Data API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_data_api/group" filter="!test"/>
-</component>
-<component name="cdl_api" long-name="CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/cdl_api/group" filter="!test"/>
-</component>
-<component name="extended_skins_api" long-name="Extended Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_skins_api/group" filter="!test"/>
-</component>
-<component name="tfx_server_controller_plugin_api" long-name="TFX Server Controller Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_controller_plugin_api/group"/>
-</component>
-<component name="extended_fonts_api" long-name="Extended Fonts API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_fonts_api/group" filter="!test"/>
-</component>
-<component name="graphic_configuration_api" long-name="Graphic Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/graphic_configuration_api/group" filter="!test"/>
-</component>
-<component name="mif_header_cdl_api" long-name="MIF Header CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mif_header_cdl_api/group"/>
-</component>
-<component name="personalisation_and_skins_settings_api" long-name="Personalisation and Skins Settings API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/personalisation_and_skins_settings_api/group"/>
-</component>
-<component name="tfx_effect_setup_plugin_api" long-name="TFX Effect Setup Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_effect_setup_plugin_api/group"/>
-</component>
-<component name="mifconv_definitions_api" long-name="Mifconv Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mifconv_definitions_api/group"/>
-</component>
-<component name="wallpaper_configuration_api" long-name="Wallpaper Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/wallpaper_configuration_api/group"/>
-</component>
-<component name="language_code_definitions_api" long-name="Language Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/language_code_definitions_api/group"/>
-</component>
-<component name="skins_image_attributes_api" long-name="Skins Image Attributes API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
-</component>
-<component name="private_user_area_code_definitions_api" long-name="Private User Area Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/private_user_area_code_definitions_api/group"/>
-</component>
-<component name="tfx_server_plugin_ids_api" long-name="TFX Server Plug-in IDs API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_plugin_ids_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_info" long-name="UI Resources Info" level="data">
-<component name="uiresources_test" filter="s60,test,api_test" long-name="UI Resources Tests" purpose="development"/>
-</collection>
-<collection name="uigraphics" long-name="UI Graphics" level="generic">
-<component name="bitmaps2" filter="s60" long-name="Bitmaps 2" class="config">
-<unit bldFile="mw/uiresources/uigraphics/bitmaps2/group"/>
-</component>
-<component name="icons" filter="s60" long-name="Icons" class="config">
-<unit bldFile="mw/uiresources/uigraphics/icons/group"/>
-</component>
-<component name="variatedbitmaps" filter="s60" long-name="Variated Bitmaps" class="config">
-<unit bldFile="mw/uiresources/uigraphics/variatedbitmaps/group"/>
-</component>
-<component name="aknicon" filter="s60" long-name="Avkon Icon Framework">
-<unit bldFile="mw/uiresources/uigraphics/aknicon/group"/>
-</component>
-<component name="nvgrenderstage" filter="sf_build" long-name="NVG Render Stage">
-<unit bldFile="mw/uiresources/uigraphics/nvgrenderstage/group"/>
-</component>
-</collection>
-<collection name="layouts" long-name="Layouts" level="plugin">
-<component name="cdl" filter="s60" long-name="Customization Definition Language">
-<!-- can only have one unit. Need to #include them or split into multiple components -->
-<unit bldFile="mw/uiresources/layouts/cdl/cdlengine/group"/>
-<unit bldFile="mw/uiresources/layouts/cdl/cdlserver/group"/>
-</component>
-<component name="aknlayout2" filter="s60" long-name="Avkon Layout 2">
-<unit bldFile="mw/uiresources/layouts/aknlayout2/group"/>
-</component>
-</collection>
-<collection name="skins" long-name="Skins" level="data">
-<component name="aknskincontent" filter="s60" long-name="Avkon Skin Content" class="config">
-<unit bldFile="mw/uiresources/skins/aknskincontent/group"/>
-</component>
-<component name="aknskins" filter="s60" long-name="Avkon Skin Compiler">
-<unit bldFile="mw/uiresources/skins/aknskins/group"/>
-</component>
-</collection>
-<collection name="pictographs" long-name="Pictographs" level="data">
-<component name="aknpictograph" filter="s60" long-name="Avkon Pictograph">
-<unit bldFile="mw/uiresources/pictographs/aknpictograph/group"/>
-</component>
-</collection>
-<collection name="locales" long-name="Locales" level="framework">
-<component name="locales_build" filter="s60" long-name="Locales Build">
-<unit bldFile="mw/uiresources/locales/loce32"/>
-</component>
-</collection>
-<collection name="uiconfig" long-name="UI Config" level="server">
-<component name="s60config" filter="s60" long-name="S60 UI Config">
-<unit bldFile="mw/uiresources/uiconfig/s60config/group"/>
-</component>
-</collection>
-<collection name="fontsupport" long-name="Font Support" level="generic">
-<component name="fontprovider" filter="s60" long-name="Font Provider">
-<unit bldFile="mw/uiresources/fontsupport/fontprovider/group"/>
-</component>
-<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
- <component id="s60_fonts" filter="s60" name="S60 Fonts">
- <unit bldFile="fontsupport/fontutils/group"/>
- </component>
--->
-<component name="fontutils" filter="sf_build" long-name="Font Utils">
-<unit bldFile="mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
-</component>
-</collection>
-<collection name="helpthemes" long-name="Help Themes" level="data">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helpthemes_build" filter="s60" long-name="Help Themes Build" class="config">
-<unit bldFile="mw/uiresources/helpthemes/group"/>
-</component>
-</collection>
-</block>
-<block name="hapticsservices" level="generic" long-name="Haptics Services" levels="fw server api">
-<collection name="hapticsservices_plat" long-name="Haptics Services Platform Interfaces" level="api">
-<component name="tacticon_api" long-name="Tacticon API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tacticon_api/group"/>
-</component>
-<component name="tactile_feedback_core_api" long-name="Tactile Feedback Core API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_core_api/group"/>
-</component>
-<component name="tactile_feedback_server_api" long-name="Tactile Feedback Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_server_api/group"/>
-</component>
-</collection>
-<collection name="hapticsservices_pub" long-name="Haptics Services Public Interfaces" level="api">
-<component name="tactile_feedback_client_api" long-name="Tactile Feedback Client API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_pub/tactile_feedback_client_api/group"/>
-</component>
-</collection>
-<collection name="tacticonserver" long-name="Tacticon Server" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="tacticonserver_build" filter="s60" long-name="Tacticon Server Build" introduced="^3">
-<unit bldFile="mw/hapticsservices/tacticonserver/group"/>
-<!-- clients and servers are suauly the same component. Consider moving pluign to a separate component if needed -->
-</component>
-</collection>
-<collection name="tactilefeedback" long-name="Tactile Feedback" level="fw">
-<component name="tactilearearegistry" filter="s60" long-name="Tactile Area Registry" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilearearegistry/group"/>
-</component>
-<component name="tactilefeedbackresolver" filter="s60" long-name="Tactile Feedback Resolver" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackresolver/group"/>
-</component>
-<component name="tactileclickplugin" filter="s60" long-name="Tactile Click Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileclickplugin/group"/>
-</component>
-<component name="tactilefeedbackclient" filter="s60" long-name="Tactile Feedback Client" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackclient/group"/>
-</component>
-<component name="tactileactionplugin" filter="s60" long-name="Tactile Action Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileactionplugin/group"/>
-</component>
-<component name="tactilefeedback_build" filter="s60" long-name="Tactile Feedback Build" introduced="^1">
-<!-- consider moving IBY to one fo the above components -->
-<unit bldFile="mw/hapticsservices/tactilefeedback/group"/>
-</component>
-</collection>
-</block>
-<block name="gsprofilesrv" level="generic" long-name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
-<collection name="gsprofilesrv_pub" long-name="GS and Profiles Services Public Interfaces" level="specific">
-<component name="profiles_engine_active_profile_settings_api" long-name="Profiles Engine Active Profile Settings API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_active_profile_settings_api/group"/>
-</component>
-<component name="profiles_engine_wrapper_api" long-name="Profiles Engine Wrapper API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_wrapper_api/group"/>
-</component>
-</collection>
-<collection name="gsprofilesrv_plat" long-name="GS and Profiles Services Platform Interfaces" level="specific">
-<component name="profiles_engine_api" long-name="Profiles Engine API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_engine_api/group"/>
-</component>
-<component name="profiles_mediafilelist_api" long-name="Media File List API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_mediafilelist_api/group"/>
-</component>
-<component name="filelist_api" long-name="File List API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/filelist_api/group"/>
-</component>
-<component name="settings_backgroundimage_api" long-name="Settings Background Image API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_backgroundimage_api/group"/>
-</component>
-<component name="settings_framework_api" long-name="Settings Framework API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_framework_api/group"/>
-</component>
-<component name="settings_launch_api" long-name="Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_launch_api/group"/>
-</component>
-<component name="settings_listbox_api" long-name="Settings List Box API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_listbox_api/group"/>
-</component>
-<component name="settings_plugin_api" long-name="Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_plugin_api/group"/>
-</component>
-<component name="settings_uis_cenrep_collection_api" long-name="Settings UIs CenRep Collection API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
-</component>
-</collection>
-<collection name="gssettingsuis" long-name="General Settings UIs" level="framework">
-<component name="gs" filter="s60" long-name="General Settings" introduced="9.2">
-<unit bldFile="mw/gsprofilesrv/gssettingsuis/gs/group"/>
-</component>
-</collection>
-<collection name="profilesservices" long-name="Profiles Services" level="server">
-<component name="filelist" filter="s60" long-name="File List" introduced="9.1">
-<unit bldFile="mw/gsprofilesrv/profilesservices/filelist/group"/>
-</component>
-<component name="mediafilelist" filter="s60" long-name="Media File List" introduced="^2">
-<unit bldFile="mw/gsprofilesrv/profilesservices/mediafilelist/group"/>
-</component>
-<component name="profileengine" filter="s60" long-name="Profile Engine" introduced="9.1">
-<unit bldFile="mw/gsprofilesrv/profilesservices/profileengine/group"/>
-</component>
-<component name="ringingtone3dplugin" filter="s60" long-name="Ringing Tone 3D Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/gsprofilesrv/profilesservices/ringingtone3dplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreensrv" level="specific" long-name="Home Screen Services" levels="plugin framework server generic specific">
-<collection name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" level="specific">
-<component name="ai_content_model_api" long-name="AI Content Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_content_model_api/group"/>
-</component>
-<component name="ai_utilities_api" long-name="AI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_utilities_api/group" filter="!test"/>
-</component>
-<component name="ai_plugin_management_api" long-name="AI Plug-in Management API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_management_api/group"/>
-</component>
-<component name="ai_plugin_information_api" long-name="AI Plug-in Information API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_information_api/group"/>
-</component>
-<component name="ai_variation_api" long-name="AI Variation API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_variation_api/group"/>
-</component>
-<component name="action_handler_plugin_api" long-name="Action Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/group" filter="!test"/>
-</component>
-<component name="content_harvester_plugin_api" long-name="Content Harvester Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/group" filter="!test"/>
-</component>
-<component name="menu_model_api" long-name="Menu Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_model_api/group"/>
-</component>
-<component name="menu_sat_interface_api" long-name="Menu SAT Interface API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/group" filter="!test"/>
-</component>
-<component name="external_home_screen_api" long-name="External Home Screen API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/external_home_screen_api/group"/>
-</component>
-<component name="menu_content_service_api" long-name="Menu Content Service API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_content_service_api/group" filter="!test"/>
-</component>
-<component name="sapi_contentpublishing" long-name="SAPI Content Publishing" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing/group"/>
-</component>
-<component name="sapi_backstepping" long-name="SAPI Backstepping" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_backstepping/group"/>
-</component>
-<component name="sapi_actionhandler" long-name="SAPI Action Handler" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_actionhandler/group"/>
-</component>
-<component name="sapi_homescreenplugin" long-name="SAPI Homescreen Plugin" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_homescreenplugin/group" filter="!test"/>
-</component>
-<component name="sapi_menucontent" long-name="SAPI Menu Content" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_menucontent/group"/>
-</component>
-<component name="xcfw_api" long-name="XCFW API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/xcfw_api/group"/>
-</component>
-<component name="idlefw_api" long-name="Idle Framework API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/idlefw_api/group"/>
-</component>
-<component name="hs_widget_publisher_api" long-name="Home Screen Publishing API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_widget_publisher_api/group"/>
-</component>
-<component name="hs_settings_api" long-name="HS Settings API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_settings_api/group"/>
-</component>
-<component name="hs_content_control_api" long-name="HS Content Control API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_content_control_api/group"/>
-</component>
-</collection>
-<collection name="xcfw" long-name="XML Content Framework" level="framework">
-<!-- collection is really a component, needs to be moved down a directory -->
-<component name="xcfw_build" filter="s60" long-name="XML Content Framework Build">
-<unit bldFile="mw/homescreensrv/xcfw/group"/>
-</component>
-</collection>
-<collection name="homescreenpluginsrv" long-name="Home Screen Plugin Service" level="plugin">
-<component name="hspsdefinitionengine" filter="s60" long-name="HS Plugin Service Definition Engine" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsdefinitionengine/group"/> -->
-</component>
-<component name="hspsdom" filter="s60" long-name="HS Plugin Service DOM" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsdom/group"/> -->
-</component>
-<component name="hspstools" filter="s60" long-name="HS Server Tools">
-<!-- <unit bldFile="homescreenpluginsrv/hspstools/group"/> -->
-</component>
-<component name="hspspluginregistry" filter="s60" long-name="HS Plugin Registry" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspspluginregistry/group"/>-->
-</component>
-<component name="hspsmanager" filter="s60" long-name="HSPS Manager" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsmanager/group"/>-->
-</component>
-<component name="hspsodt" filter="s60" long-name="HSPS Object Description Tree" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsodt/group"/>-->
-</component>
-<component name="hspsresource" filter="s60" long-name="HS Plugin Server Resource" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresource/group"/>-->
-</component>
-<component name="hspsresult" filter="s60" long-name="HS Plugin Server Result" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
-</component>
-<component name="homescreen_settings_api" filter="s60" long-name="HS Settings API" class="api placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
-</component>
-<component name="homescreenpluginsrv_build" filter="s60" long-name="HSPS Build">
-<!-- need to break this up into the self-contained components above and uncomment them -->
-<unit bldFile="mw/homescreensrv/homescreenpluginsrv/group"/>
-</component>
-</collection>
-<collection name="idlefw" long-name="Idle Framework" level="framework">
-<!-- Uncomment all units when configuration is in place. All currently #included from idlefw_build -->
-<component name="idlefw_plugins" filter="s60" long-name="Idle Framework Plugins" plugin="Y" class="placeholder">
-<!--<unit bldFile="idlefw/plugins/group"/>-->
-</component>
-<component name="hslaunch" filter="s60" long-name="Home Screen Launch" class="placeholder">
-<!--<unit bldFile="idlefw/plugins/group"/>-->
-</component>
-<component name="idlefw_build" filter="s60" long-name="Idle Framework Build">
-<!--split this into components, or separate from the above components and move this down a directory -->
-<unit bldFile="mw/homescreensrv/idlefw/group"/>
-</component>
-</collection>
-<collection name="menucontentsrv" long-name="Menu Content Service" level="generic">
-<component name="menusatinterface" filter="s60" long-name="Menu SAT Interface">
-<unit bldFile="mw/homescreensrv/menucontentsrv/menusatinterface/group"/>
-</component>
-<component name="menucontentsrv_build" filter="s60" long-name="Menu Content Service Build">
-<!--split this into components, or separate from the above component and move this down a directory -->
-<unit bldFile="mw/homescreensrv/menucontentsrv/group"/>
-</component>
-</collection>
-<collection name="backsteppingsrv" long-name="Back Stepping Service" level="server">
-<!-- collection is really a component, needs to be moved down a directory -->
-<component name="bsengine" long-name="Back Stepping Engine" filter="s60">
-<unit bldFile="mw/homescreensrv/backsteppingsrv/group"/>
-</component>
-</collection>
-<collection name="contentpublishingsrv" long-name="Content Publishing Service" level="server">
-<component name="contentpublishingdebug" filter="s60" long-name="Content Publishing Debug">
-<!-- need to move this component outside of contentpublishingutils and into separate component directory -->
-<!-- <unit bldFile="contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/> -->
-</component>
-<component name="contentpublishingutils" filter="s60" long-name="Content Publishing Utils">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingutils/group"/>
-</component>
-<component name="contentpublishingserver" filter="s60" long-name="Content Publishing Server">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingserver/group"/>
-</component>
-<component name="contentharvester" filter="s60" long-name="Content Harvester">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
-</component>
-<component name="contentpublishingsrv_build" filter="s60" long-name="Content Publishing Service Build">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/group"/>
-</component>
-</collection>
-<collection name="contentcontrolsrv" long-name="Content Control Service" level="server">
-<component name="ccsrv" long-name="Content Control Service" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccsrv/group"/>
-</component>
-<component name="ccsrvapi" long-name="Content Control Service API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccsrvapi/group"/>
-</component>
-<component name="ccclientsession" long-name="Content Control Client Session" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccclientsession/group"/>
-</component>
-<component name="hsccclient" long-name="HS Content Control Client" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/hsccclient/group"/>
-</component>
-<component name="hscontentinfo" long-name="Home Screen Content Info" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/hscontentinfo/group"/>
-</component>
-<component name="contentcontrolsrv_build" long-name="Content Control Service Build" filter="s60" introduced="^3">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/group"/>
-</component>
-</collection>
-</block>
-<block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
-<collection name="appinstall_plat" long-name="Application Installation Platform Interfaces" level="api">
-<component name="iaupdate_api" long-name="IA Update API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/iaupdate_api/group"/>
-</component>
-<component name="task_plugin_api" long-name="Task Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_plugin_api/group"/>
-</component>
-<component name="sw_installer_common_ui_api" long-name="SW Installer Common UI API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_common_ui_api/group"/>
-</component>
-<component name="sw_installer_launcher_api" long-name="SW Installer Launcher API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_launcher_api/group"/>
-</component>
-<component name="task_management_api" long-name="Task Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_management_api/group"/>
-</component>
-<component name="sw_installer_ui_plugin_api" long-name="SW Installer UI Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ui_plugin_api/group"/>
-</component>
-<component name="sw_installer_cr_keys" long-name="SW Installer CR Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_cr_keys/group"/>
-</component>
-<component name="sw_installer_ps_keys" long-name="SW Installer PS Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
-</component>
-<component name="appmngr2runtimeapi" long-name="Application Manager 2 Runtime Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
-</component>
-</collection>
-<collection name="appinstall_pub" long-name="Application Installation Public Interfaces" level="api">
-<component name="startup_list_management_api" long-name="Startup List Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
-</component>
-</collection>
-<collection name="ncdengine" long-name="Nokia Content Discover" level="framework">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="ncdengine_engine" filter="s60" long-name="NCD Engine" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/engine/group"/>
-</component>
-<component name="debuglogger" filter="s60" long-name="NCD Debug Logger" introduced="^1" class="placeholder">
-<!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
-</component>
-<component name="ncdengine_build" filter="s60" long-name="NCD Build" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/group"/>
-</component>
-</collection>
-<collection name="appinstaller" long-name="Application Installer" level="generic">
-<component name="appmngr2" filter="s60" long-name="Application Manager 2" introduced="^2">
-<unit bldFile="mw/appinstall/appinstaller/appmngr2/group"/>
-</component>
-<component name="appinstui" filter="s60" long-name="Application Installer UI" introduced="^2">
-<unit bldFile="mw/appinstall/appinstaller/appinstui/group"/>
-</component>
-</collection>
-<collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="api">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="iaupdateapi_stub_build" long-name="IA Update API Stub Build" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdateapi_stub/group"/>
-</component>
-</collection>
-<collection name="iaupdate" long-name="Independent Apps Update" level="api">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="iad" long-name="Software Update" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/iad/group"/>
-</component>
-<component name="iaupdate_help" filter="s60" long-name="IA Update Help" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/help/group"/>
-</component>
-<component name="iaupdate_build" filter="s60" long-name="IA Update Build" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/group"/>
-</component>
-</collection>
-<collection name="installationservices" long-name="Installation Services" level="generic">
-<component name="swi" long-name="Secure Software Install" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swi/group" mrp="mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
-</component>
-<component name="swidevicetools" long-name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
-<unit bldFile="mw/appinstall/installationservices/swidevicetools/group" mrp="mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
-</component>
-<component name="swiconfig" long-name="Software Install Config" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appinstall/installationservices/swiconfig/group" mrp="mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
-</component>
-</collection>
-<collection name="secureswitools" long-name="Secure Software Install Tools" level="tool">
-<component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/makekeys/group" mrp="mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
-</component>
-<component name="swianalysistoolkit" long-name="SWI Analysis Toolkit" purpose="development" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
-</component>
-<component name="openssllib" long-name="OpenSSL Library" purpose="optional" class="PC">
-<unit mrp="mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
-</component>
-<component name="swisistools" long-name="Secure Software Install SIS Tools" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swisistools/group" mrp="mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
-</component>
-</collection>
-<collection name="appinstall_info" long-name="Application Installation Info" level="api">
-<component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="serviceapifw" level="specific" long-name="Service API Framework" levels="plugin framework server generic specific">
-<collection name="serviceapifw_pub" long-name="Service API Framework Public Interfaces" level="specific"/>
-<collection name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" level="specific">
-<component name="rtsecuritymanager_common_api" long-name="Runtime Security Manager Common API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/group"/>
-</component>
-<component name="rtsecuritymanager_utility_api" long-name="Runtime Security Manager Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
-</component>
-<component name="rtsecuritymanager_client_api" long-name="Runtime Security Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/group"/>
-</component>
-<component name="liw_provider_utility_api" long-name="LIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_provider_utility_api/group"/>
-</component>
-<component name="liw_service_interface_base_api" long-name="LIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_base_api/group"/>
-</component>
-<component name="liw_service_interface_menu_api" long-name="LIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_menu_api/group"/>
-</component>
-<component name="liw_criteria_api" long-name="LIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_criteria_api/group"/>
-</component>
-<component name="liw_generic_parameter_api" long-name="LIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_generic_parameter_api/group"/>
-</component>
-<component name="liw_service_handler_api" long-name="LIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_handler_api/group"/>
-</component>
-</collection>
-<collection name="rtsecuritymanager" long-name="Runtime Security Manager" level="server">
-<component name="rtsecuritymanagerutil" filter="s60" long-name="Runtime Security Manager Util">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
-</component>
-<component name="rtsecuritymanagerserver" filter="s60" long-name="Runtime Security Manager Server">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/>
-</component>
-<component name="rtsecuritymanagerclient" filter="s60" long-name="Runtime Security Manager Client">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/>
-</component>
-<component name="rtsecuritymanager_build" filter="s60" long-name="Runtime Security Manager Build">
-<!-- Move the export to the appropriate components, or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/group"/>
-</component>
-</collection>
-<collection name="languageinterworkingfw" long-name="Language Interworking Framework" level="framework">
-<component name="lifwservicehandler" filter="s60" long-name="Service Handler">
-<unit bldFile="mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-</block>
-<block name="serviceapi" level="specific" long-name="Service API" levels="os mw1 mw2 app">
-<!-- should break up this collection into something meaningful -->
-<collection name="serviceproviders" long-name="Service Providers" level="mw1">
-<component name="sapi_contacts_vpbk" long-name="Contacts Phonebook SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
-</component>
-<component name="sapi_location" long-name="Location SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_location/group"/>
-</component>
-<component name="sapi_mediamanagement" long-name="Media Management SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/group"/>
-</component>
-<component name="sapi_landmarks" long-name="Landmarks SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
-</component>
-<component name="sapi_messaging" long-name="Messaging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/group"/>
-</component>
-<component name="sapi_applicationmanager" long-name="Application Manager SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
-</component>
-<component name="sapi_calendar" long-name="Calendar SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_calendar/group"/>
-</component>
-<component name="sapi_logging" long-name="Logging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_logging/group"/>
-</component>
-<component name="sapi_sensor" long-name="Sensor SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sensor/group"/>
-</component>
-<component name="sapi_sysinfo" long-name="Sysinfo SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sysinfo/group"/>
-</component>
-<component name="sapi_serviceregistry" long-name="Service Registry SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
-</component>
-<component name="jsapi" long-name="Javascript API" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/jsapi/group"/>
-</component>
-<component name="serviceproviders_build" filter="s60" long-name="Service API Build">
-<!-- distribute the exports or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapi/serviceproviders/group"/>
-</component>
-</collection>
-</block>
-<block name="web" level="specific" long-name="Web" levels="plugin utils server generic specific">
-<collection name="web_pub" long-name="Web Public Interfaces" level="specific">
-<component name="browser_control_api" long-name="Browser Control API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_control_api/group"/>
-</component>
-<component name="download_mgr_client_api" long-name="Download Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_client_api/group"/>
-</component>
-<component name="download_mgr_ui_api" long-name="Download Manager UI Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_ui_api/group"/>
-</component>
-<component name="favourites_engine_api" long-name="Favourites Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/favourites_engine_api/group"/>
-</component>
-<component name="browser_plugin_api" long-name="Browser Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_plugin_api/group"/>
-</component>
-<component name="settings_api" long-name="Settings API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/settings_api/group"/>
-</component>
-</collection>
-<collection name="web_plat" long-name="Web Platform Interfaces" level="specific">
-<component name="aiw_browser_provider_api" long-name="AIW Browser Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/aiw_browser_provider_api/group"/>
-</component>
-<component name="browser_dialogs_provider_api" long-name="Browser Dialogs Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_dialogs_provider_api/group"/>
-</component>
-<component name="browser_platform_api" long-name="Browser Platform API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_platform_api/group"/>
-</component>
-<component name="cod_handler_api" long-name="COD Handler API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cod_handler_api/group"/>
-</component>
-<component name="connection_manager_api" long-name="Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/connection_manager_api/group"/>
-</component>
-<component name="cxml_library_api" long-name="cXml Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cxml_library_api/group"/>
-</component>
-<component name="download_mgr_client_api_extn" long-name="Download Manager Client API Extension" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/download_mgr_client_api_extn/group"/>
-</component>
-<component name="download_path_plugin_api" long-name="Download Path Plugin API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/web/web_plat/download_path_plugin_api/group"/>
-</component>
-<component name="feeds_engine_api" long-name="Feeds Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/feeds_engine_api/group"/>
-</component>
-<component name="launcher_api" long-name="Launcher API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/launcher_api/group"/>
-</component>
-<component name="multipart_parser_api" long-name="Multipart Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/multipart_parser_api/group"/>
-</component>
-<component name="recent_url_store_api" long-name="Recent URL Store API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/recent_url_store_api/group"/>
-</component>
-<component name="scheme_handler_plugin_api" long-name="Scheme Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scheme_handler_plugin_api/group"/>
-</component>
-<component name="scriptable_plugin_api" long-name="Scriptable Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scriptable_plugin_api/group"/>
-</component>
-<component name="webutils_api" long-name="Web Utils API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/webutils_api/group"/>
-</component>
-<component name="widget_registry_api" long-name="Widget Registry API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/widget_registry_api/group"/>
-</component>
-<component name="xml_parser_api" long-name="XML Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/xml_parser_api/group"/>
-</component>
-<component name="stmgesturefw_api" long-name="State Machine Gesture Framework API " filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/stmgesturefw_api/group"/>
-</component>
-</collection>
-<collection name="web_info" long-name="Web Info" level="specific">
-<component name="web_build" filter="s60" long-name="Web Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/group"/>
-</component>
-</collection>
-<collection name="browserutilities" long-name="Browser Utilities" level="utils">
-<component name="browserdialogsprovider" filter="s60" long-name="Browser Dialogs Provider">
-<unit bldFile="mw/web/browserutilities/browserdialogsprovider/group"/>
-</component>
-<component name="recenturlstore" filter="s60" long-name="Recent URL Store">
-<unit bldFile="mw/web/browserutilities/recenturlstore/group"/>
-</component>
-<component name="xmlparser" filter="s60" long-name="XML Interface">
-<unit bldFile="mw/web/browserutilities/xmlparser/group"/>
-</component>
-<component name="cxmllibrary" filter="s60" long-name="XML Parser Implementation">
-<unit bldFile="mw/web/browserutilities/cxmllibrary/group"/>
-</component>
-<component name="downloadmgr" filter="s60" long-name="Download Manager">
-<unit bldFile="mw/web/browserutilities/downloadmgr/group"/>
-</component>
-<component name="connectionmanager" filter="s60" long-name="Connection Manager">
-<unit bldFile="mw/web/browserutilities/connectionmanager/group"/>
-</component>
-<component name="browsertelservice" filter="s60" long-name="Browser Telephony Service">
-<unit bldFile="mw/web/browserutilities/browsertelservice/group"/>
-</component>
-<component name="favouritesengine" filter="s60" long-name="Favourites Engine">
-<unit bldFile="mw/web/browserutilities/favouritesengine/group"/>
-</component>
-<component name="feedsengine" filter="s60" long-name="Feeds Engine">
-<unit bldFile="mw/web/browserutilities/feedsengine/group"/>
-</component>
-<component name="multipartparser" filter="s60" long-name="Multipart Parser">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
-<!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
-</component>
-<component name="schemehandler" filter="s60" long-name="Scheme Handler">
-<unit bldFile="mw/web/browserutilities/schemehandler/group"/>
-</component>
-<component name="webutils" filter="s60" long-name="Web Utils">
-<unit bldFile="mw/web/browserutilities/webutils/group"/>
-</component>
-<component name="aiwbrowserprovider" filter="s60" long-name="AIW Browser Provider" plugin="Y">
-<unit bldFile="mw/web/browserutilities/aiwbrowserprovider/group"/>
-</component>
-<component name="browserutilities_build" filter="s60" long-name="Browser Utilities Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/browserutilities/group"/>
-</component>
-</collection>
-<collection name="webengine" long-name="Web Engine" level="server">
-<component name="osswebengine" filter="s60" long-name="OSS Web Engine">
-<!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
-<unit bldFile="mw/web/webengine/osswebengine/cache/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/memorymanager/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/npscript/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group/javascriptcore"/>
-</component>
-<component name="webkitutils" filter="s60" long-name="WebKit Utils">
-<unit bldFile="mw/web/webengine/webkitutils/group"/>
-</component>
-<component name="pagescaler" filter="s60" long-name="Page Scaler">
-<unit bldFile="mw/web/webengine/pagescaler/group"/>
-</component>
-<component name="webwidgetinstaller" filter="s60" long-name="Widget Installer">
-<unit bldFile="mw/web/webengine/widgetinstaller/group"/>
-</component>
-<component name="widgetregistry" filter="s60" long-name="Widget Registry">
-<unit bldFile="mw/web/webengine/widgetregistry/group"/>
-</component>
-<component name="wmlengine" filter="s60" long-name="WML Engine">
-<unit bldFile="mw/web/webengine/wmlengine/group"/>
-</component>
-<component name="device" filter="s60" long-name="Device">
-<!-- this needs a more meaningful name -->
-<unit bldFile="mw/web/webengine/device/group"/>
-</component>
-<component name="widgetengine" filter="s60" long-name="Widget Engine">
-<unit bldFile="mw/web/webengine/widgetengine/group"/>
-</component>
-<component name="web_memoryplugin" long-name="Memory Plugin" filter="s60" plugin="Y">
-<unit bldFile="mw/web/webengine/memoryplugin/group"/>
-</component>
-<component name="widgetmemoryplugin" filter="s60" long-name="Widget Memory Plugin" plugin="Y">
-<unit bldFile="mw/web/webengine/widgetmemoryplugin/group"/>
-</component>
-<component name="widgetbackuprestore" filter="s60" long-name="Widget Backup and Restore">
-<unit bldFile="mw/web/webengine/widgetbackuprestore/group"/>
-</component>
-<component name="browserrecognizers" filter="s60" long-name="Browser Recognizers" plugin="Y">
-<unit bldFile="mw/web/webengine/browserrecognizers/group"/>
-</component>
-<component name="wrtharvester" filter="s60" long-name="Web Runtime Harvester" plugin="Y">
-<unit bldFile="mw/web/webengine/wrtharvester/group"/>
-</component>
-</collection>
-<collection name="codhandler" long-name="Content Object Descriptor Handler" level="specific">
-<component name="codeng" filter="s60" long-name="COD Engine">
-<unit bldFile="mw/web/codhandler/codeng/group"/>
-</component>
-<component name="codui" filter="s60" long-name="COD UI">
-<unit bldFile="mw/web/codhandler/codui/group"/>
-</component>
-<component name="codrecog" filter="s60" long-name="COD Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/codrecog/group"/>
-</component>
-<component name="codviewer" filter="s60" long-name="COD Viewer">
-<unit bldFile="mw/web/codhandler/codviewer/group"/>
-</component>
-<component name="ddrecog" filter="s60" long-name="Download Descriptor Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/ddrecog/group"/>
-</component>
-<component name="ddviewer" filter="s60" long-name="Download Descriptor Viewer">
-<unit bldFile="mw/web/codhandler/ddviewer/group"/>
-</component>
-<component name="coddownload" filter="s60" long-name="COD Download">
-<unit bldFile="mw/web/codhandler/coddownload/group"/>
-</component>
-<component name="roapapp" filter="s60" long-name="ROAP Application">
-<unit bldFile="mw/web/codhandler/roapapp/group"/>
-</component>
-<component name="codhandler_build" filter="s60" long-name="COD Handler Build">
-<!-- Exports need to go into another component or make this self-contained.
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/codhandler/group"/>
-</component>
-</collection>
-<collection name="widgets" long-name="Web Widget Framework" level="generic">
-<!-- the following units can be uncommented when configuration is put in place -->
-<component name="widgetrecognizer" filter="s60" long-name="Widget Recognizer" plugin="Y">
-<!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
-</component>
-<component name="widgetinstaller" filter="s60" long-name="Widget Installer UI" plugin="Y">
-<!--<unit bldFile="widgets/widgetinstaller/group"/>-->
-</component>
-<component name="widgetlauncher" filter="s60" long-name="Widget Launcher">
-<!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
-</component>
-<component name="widgetapp" filter="s60" long-name="Widget UI">
-<!--<unit bldFile="widgets/widgetapp/group"/>-->
-</component>
-<component name="widgetsidchecker" filter="s60" long-name="Widget SID Checker" introduced="^3">
-<!--<unit bldFile="widgets/widgetsidchecker/group"/>-->
-</component>
-<component name="widgetpreinstaller" filter="s60" long-name="Widget Pre-Installer">
-<!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
-</component>
-<component name="widgetstartup" filter="s60" long-name="Widget Startup">
-<!--<unit bldFile="widgets/widgetstartup/group"/>-->
-</component>
-<component name="widgets_build" filter="s60" long-name="Widgets Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/widgets/group"/>
-</component>
-</collection>
-</block>
-<block name="websrv" level="generic" long-name="Web Services" levels="plugin framework server generic specific">
-<collection name="websrv_pub" long-name="Web Services Public Interfaces" level="specific">
-<component name="web_service_description_api" long-name="Web Service Description API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_description_api/group"/>
-</component>
-<component name="web_service_connection_api" long-name="Web Service Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/group"/>
-</component>
-<component name="web_service_manager_api" long-name="Web Service Manager API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/group"/>
-</component>
-<component name="hostlet_connection_api" long-name="Hostlet Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/group"/>
-</component>
-<component name="web_service_messaging_api" long-name="Web Service Messaging API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/group"/>
-</component>
-<component name="xml_extensions_api" long-name="XML Extensions API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/group"/>
-</component>
-<component name="xml_fragment_api" long-name="XML Fragment API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/group"/>
-</component>
-</collection>
-<collection name="webservices" long-name="Web Services Framework" level="generic">
-<!-- consider breaking this collection into more meaningful subsets -->
-<component name="wsnotifierplugins" filter="s60" long-name="WS Notifier Plugins" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsnotifierplugins/group"/>
-</component>
-<component name="wslogger" filter="s60" long-name="WS Logger">
-<unit bldFile="mw/websrv/webservices/wslogger/group"/>
-</component>
-<component name="wsxml" filter="s60" long-name="WS XML Extensions">
-<unit bldFile="mw/websrv/webservices/wsxml/group"/>
-</component>
-<component name="wsutils" filter="s60" long-name="WS Utils">
-<unit bldFile="mw/websrv/webservices/wsutils/group"/>
-</component>
-<component name="wsfragment" filter="s60" long-name="WS Fragment">
-<unit bldFile="mw/websrv/webservices/wsfragment/group"/>
-</component>
-<component name="wsdescription" filter="s60" long-name="WS Service Description">
-<unit bldFile="mw/websrv/webservices/wsdescription/group"/>
-</component>
-<component name="wsconnection" filter="s60" long-name="WS Service Connection">
-<unit bldFile="mw/websrv/webservices/wsconnection/group"/>
-</component>
-<component name="wsmessages" filter="s60" long-name="WS Messages">
-<unit bldFile="mw/websrv/webservices/wsmessages/group"/>
-</component>
-<component name="wscredentialmanager" filter="s60" long-name="WS Credential Manager">
-<unit bldFile="mw/websrv/webservices/wscredentialmanager/group"/>
-</component>
-<component name="wsframework" filter="s60" long-name="WS Framework">
-<unit bldFile="mw/websrv/webservices/wsframework/group"/>
-</component>
-<component name="wshttpchanneltransportplugin" filter="s60" long-name="WS HTTP Channel Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshttpchanneltransportplugin/group"/>
-</component>
-<component name="wsconnectionagent" filter="s60" long-name="WS Connection Agent">
-<unit bldFile="mw/websrv/webservices/wsconnectionagent/group"/>
-</component>
-<component name="wsprovider" filter="s60" long-name="WS Provider">
-<unit bldFile="mw/websrv/webservices/wsprovider/group"/>
-</component>
-<component name="wshostletconnection" filter="s60" long-name="WS Hostlet Connection">
-<unit bldFile="mw/websrv/webservices/wshostletconnection/group"/>
-</component>
-<component name="wsmanager" filter="s60" long-name="WS Service Manager">
-<unit bldFile="mw/websrv/webservices/wsmanager/group"/>
-</component>
-<component name="wsidentitymanager" filter="s60" long-name="WS Identity Manager">
-<unit bldFile="mw/websrv/webservices/wsidentitymanager/group"/>
-</component>
-<component name="idwsfplugin" filter="s60" long-name="ID-WSF Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/idwsfplugin/group"/>
-</component>
-<component name="wsibasicplugin" filter="s60" long-name="WS-I Basic Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsibasicplugin/group"/>
-</component>
-<component name="wsrestplugin" filter="s60" long-name="WS REST Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsrestplugin/group"/>
-</component>
-<component name="idwsfsecuritymechanism" filter="s60" long-name="ID-WSF Security Mechanism">
-<unit bldFile="mw/websrv/webservices/idwsfsecuritymechanism/group"/>
-</component>
-<component name="wspasswordtransforms" filter="s60" long-name="WS Password Transforms">
-<unit bldFile="mw/websrv/webservices/wspasswordtransforms/group"/>
-</component>
-<component name="wscore" filter="s60" long-name="WS Core Service Manager">
-<unit bldFile="mw/websrv/webservices/wscore/group"/>
-</component>
-<component name="wslocaltransportplugin" filter="s60" long-name="WS Local Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wslocaltransportplugin/group"/>
-</component>
-<component name="wshostlettransportplugin" filter="s60" long-name="WS Hostlet Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshostlettransportplugin/group"/>
-</component>
-<component name="wsstar" filter="s60" long-name="WS Star">
-<!-- can only have one unit. Need to split into separate components or #include from a single bld.inf -->
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarpolicy/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarplugin/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarmessagehandlers/group"/>
-</component>
-<component name="wsoviplugin" filter="s60" long-name="WS Ovi Plugin">
-<unit bldFile="mw/websrv/webservices/wsoviplugin/group"/>
-</component>
-<component name="webservices_build" filter="s60" long-name="Web Services Build">
-<!-- need to split into self-contained components -->
-<unit bldFile="mw/websrv/webservices/group"/>
-</component>
-</collection>
-<collection name="websrv_info" long-name="Web Services Info" level="specific">
-<component name="websrv_bld" filter="s60" long-name="Web Services Build">
-<!-- need to include common .hrh in each unit -->
-<unit bldFile="mw/websrv/group"/>
-</component>
-</collection>
-</block>
-<block name="platformtools" level="generic" long-name="Platform Tools">
-<collection name="gfxconversion" long-name="Graphics Conversion">
-<component name="bmconv_s60" filter="s60" long-name="S60 Bitmap Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/bmconv_s60/group"/>
-</component>
-<component name="mifconv" filter="s60" long-name="Multi Icon File Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/mifconv/group"/>
-</component>
-</collection>
-</block>
-<block name="uitools" level="specific" long-name="UI Tools" levels="compile encode tool if">
-<collection name="uitools_pub" long-name="UI Tools Public Interfaces" level="if">
-<component name="third_party_bitmap_palette_api" long-name="Third Party Bitmap Palette API" filter="s60" class="api">
-<unit bldFile="mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
-</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">
-<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">
-<unit bldFile="mw/uitools/uitools_plat/layout_system_private_api/group"/>
-</component>
-</collection>
-<collection name="cdlcompilertoolkit" long-name="CDL Compiler Toolkit" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompilertoolkit_build" filter="s60" long-name="CDL Compiler Toolkit Build">
-<unit bldFile="mw/uitools/cdlcompilertoolkit/group"/>
-</component>
-</collection>
-<collection name="cdlcompiler" long-name="CDL Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompiler_build" filter="s60" long-name="CDL Compiler Build">
-<unit bldFile="mw/uitools/cdlcompiler/group"/>
-</component>
-</collection>
-<collection name="gfxtools" long-name="Graphics Tools" level="tool">
-<component name="gditools" filter="s60" long-name="GDI Tools" class="PC">
-<unit bldFile="mw/uitools/gfxtools/gditools/group"/>
-</component>
-<component name="color" filter="s60" long-name="Bitmap Colour Palette" class="PC">
-<unit bldFile="mw/uitools/gfxtools/color/group"/>
-</component>
-</collection>
-<collection name="aknlayoutcompiler" long-name="Avkon Layout Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="aknlayoutcompiler_build" filter="s60" long-name="Avkon Layout Compiler Build">
-<unit bldFile="mw/uitools/aknlayoutcompiler/group"/>
-</component>
-</collection>
-<collection name="skincompiler" long-name="Skin Compiler" level="compile">
-<component name="aknskindesccompiler" filter="s60" long-name="Avkon Skin Descriptor Compiler">
-<unit bldFile="mw/uitools/skincompiler/AknSkinDescCompiler/group"/>
-</component>
-</collection>
-<collection name="reszip" long-name="Resource Zip" level="encode">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="reszip_build" filter="s60" long-name="Resource Zip Build">
-<unit bldFile="mw/uitools/reszip/group"/>
-</component>
-</collection>
-<collection name="toollibraries" long-name="Tool Libraries" level="tool"/>
-<collection name="svgtencoder" long-name="SVGT Encoder" level="encode">
-<component name="svgtenc" filter="s60" long-name="Standalone SVGT Encoder" class="PC">
-<unit bldFile="mw/uitools/svgtencoder/svgtenc/standalone/group"/>
-</component>
-</collection>
-</block>
-</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">
-<component name="location_centre_api" long-name="Location Centre API" introduced="^3" filter="s60" class="api">
-<unit bldFile="app/location/loc_plat/location_centre_api/group"/>
-</component>
-</collection>
-<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"/>
-</component>
-<component name="landmarks_ui_addedit_api" long-name="Landmarks UI Add/Edit API" filter="s60" class="api">
-<unit bldFile="app/location/loc_pub/landmarks_ui_addedit_api/group"/>
-</component>
-</collection>
-<collection name="basiclocationinfodisplay" long-name="Basic Location Info Display" level="ui">
-<component name="blid" filter="s60" long-name="Basic Location Info Display Build">
-<unit bldFile="app/location/basiclocationinfodisplay/blid/group"/>
-</component>
-</collection>
-<collection name="landmarksui" long-name="Landmarks UI" level="loc">
-<component name="landmarksui_help" filter="s60" long-name="Landmarks UI Help">
-<unit bldFile="app/location/landmarksui/help/group"/>
-</component>
-<component name="landmarksui_engine" filter="s60" long-name="Landmarks UI Engine">
-<unit bldFile="app/location/landmarksui/engine/group"/>
-</component>
-<component name="uicontrols" filter="s60" long-name="Landmarks UI Controls">
-<unit bldFile="app/location/landmarksui/uicontrols/group"/>
-</component>
-<component name="landmarksui_commonui" filter="s60" long-name="Landmarks Common UI">
-<unit bldFile="app/location/landmarksui/commonui/group"/>
-</component>
-<component name="landmarksui_app" filter="s60" long-name="Landmarks Application">
-<unit bldFile="app/location/landmarksui/app/group"/>
-</component>
-<component name="msgviewer" filter="s60" long-name="Landmarks Message Viewer">
-<unit bldFile="app/location/landmarksui/msgviewer/group"/>
-</component>
-<component name="landmarksui_build" filter="s60" long-name="Landmarks UI Build">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="app/location/landmarksui/group"/>
-</component>
-</collection>
-<collection name="eventsui" long-name="Location Events UI" level="events">
-<component name="eventsui_help" filter="s60" long-name="Events Help">
-<unit bldFile="app/location/eventsui/help/group"/>
-</component>
-<component name="eventsutils" filter="s60" long-name="Events Utils">
-<unit bldFile="app/location/eventsui/eventsutils/group"/>
-</component>
-<component name="eventsengine" filter="s60" long-name="Events Engine">
-<unit bldFile="app/location/eventsui/eventsengine/group"/>
-</component>
-<component name="eventshandlerui" filter="s60" long-name="Events Handler UI">
-<unit bldFile="app/location/eventsui/eventshandlerui/group"/>
-</component>
-<component name="eventseditor" filter="s60" long-name="Events Editor">
-<unit bldFile="app/location/eventsui/eventseditor/group"/>
-</component>
-<component name="eventsmgmtui" filter="s60" long-name="Events Management UI">
-<unit bldFile="app/location/eventsui/eventsmgmtui/group"/>
-</component>
-<component name="eventsui_build" filter="s60" long-name="Events UI Build">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="app/location/eventsui/group"/>
-</component>
-</collection>
-<collection name="locationlandmarksrefappfors60" long-name="Location Landmarks Reference App for S60" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="lmrefapp" filter="s60" long-name="Landmarks Reference Application">
-<unit bldFile="app/location/locationlandmarksrefappfors60/group"/>
-</component>
-</collection>
-<collection name="locationlandmarksuirefapp" long-name="Location Landmarks UI Reference App" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="lmuirefapp" filter="s60" long-name="Landmarks UI Reference Application">
-<unit bldFile="app/location/locationlandmarksuirefapp/group"/>
-</component>
-</collection>
-<collection name="locationsatviewrefapp" long-name="Location Satellite View Reference App" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="satellitereference" filter="s60" long-name="Satellite Info UI Reference Application">
-<unit bldFile="app/location/locationsatviewrefapp/group"/>
-</component>
-</collection>
-<collection name="simpsyconfigurator" long-name="Simulation PSY Configurator" level="ui">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="simpsyui" filter="s60" long-name="Simulation PSY UI">
-<unit bldFile="app/location/simpsyconfigurator/group"/>
-</component>
-</collection>
-<collection name="mapnavproviderrefapp" long-name="Map and Navigation Provider Reference App" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="mapnavproviderrefapp_build" filter="s60" long-name="Map and Navigation Provider Reference Application">
-<unit bldFile="app/location/mapnavproviderrefapp/group"/>
-</component>
-</collection>
-<collection name="locationcentre" long-name="Location Centre" level="loc">
-<component name="lcutils" long-name="Location Centre Utilities" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcutils/group"/>
-</component>
-<component name="lcservice" long-name="Location Centre Service Project" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcservice/group"/>
-</component>
-<component name="lcserver" long-name="Location Centre Server Project" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcserver/group"/>
-</component>
-<component name="lcapp" long-name="Location Centre Application" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcapp/group"/>
-</component>
-<component name="locationcentre_build" filter="s60" long-name="Location Centre Build" introduced="^3">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="app/location/locationcentre/group"/>
-</component>
-</collection>
-</block>
-<block name="mmsharinguis" level="services" long-name="Multimedia Sharing UIs" levels="base plugin if">
-<collection name="mmsharinguis_plat" long-name="Multimedia Sharing UIs Platform Interfaces" level="if">
-<component name="multimedia_sharing_settings_api" long-name="Multimedia Sharing Settings API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_settings_api/group"/>
-</component>
-<component name="multimedia_sharing_resource_api" long-name="Multimedia Sharing Resource API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_resource_api/group"/>
-</component>
-<component name="multimedia_sharing_manager_api" long-name="Multimedia Sharing Manager API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/group"/>
-</component>
-</collection>
-<collection name="mmsharing" long-name="Multimedia Sharing" level="base">
-<component name="mmshavailability" filter="s60" long-name="Multimedia Sharing Availability">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshavailability/group"/>
-</component>
-<component name="mmshindicator" filter="s60" long-name="Multimedia Sharing Indicator">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshindicator/group"/>
-</component>
-<!-- consider putting client and server in the same component -->
-<component name="mmshmanagercli" filter="s60" long-name="Multimedia Sharing Manager Client">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshmanagercli/group" filter="!test"/>
-</component>
-<component name="mmshmanagersrv" filter="s60" long-name="Multimedia Sharing Manager Server">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshmanagersrv/group"/>
-</component>
-<component name="mmshengine" filter="s60" long-name="Multimedia Sharing Engine">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshengine/group"/>
-</component>
-<component name="mmshui" filter="s60" long-name="Multimedia Sharing UI">
-<!-- can only have one unit: need to #include one from the other if it's needed -->
-<unit bldFile="app/mmsharinguis/mmsharing/mmshui/group"/>
-<unit bldFile="app/mmsharinguis/mmsharing/mmshui/help/group"/>
-</component>
-<component name="mmsharing_build" filter="s60" long-name="MM Sharing Build">
-<unit bldFile="app/mmsharinguis/mmsharing/group"/>
-</component>
-</collection>
-<collection name="mmshplugins" long-name="Multimedia Sharing Plugins" level="plugin">
-<component name="mmshaoplugin" filter="s60" long-name="Multimedia Sharing Always Online Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshaoplugin/group"/>
-</component>
-<component name="mmshaiwplugin" filter="s60" long-name="Multimedia Sharing AIW Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshaiwplugin/group"/>
-</component>
-<component name="mmshsipcrplugin" filter="s60" long-name="Multimedia Sharing SIP Client Resolver Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshsipcrplugin/group"/>
-</component>
-<component name="mmshsettingsuiplugin" filter="s60" long-name="Multimedia Sharing Settings UI Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshsettingsuiplugin/group"/>
-</component>
-<component name="mmshwpadapterplugin" filter="s60" long-name="Multimedia Sharing WAP Provisioning Adapter" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshwpadapterplugin/group"/>
-</component>
-</collection>
-<collection name="mmsharinguis_info" long-name="Multimedia Sharing UIs Info" level="if">
-<component name="mmsharinguis_build" filter="s60" long-name="Multimedia Sharing UIs Build">
-<!-- consider distributing to other components -->
-<unit bldFile="app/mmsharinguis/group"/>
-</component>
-</collection>
-</block>
-<block name="phone" level="apps" span="2" long-name="Phone Apps" levels="engine plugin ui app">
-<collection name="phone_plat" long-name="Phone Apps Platform Interfaces" level="app">
-<component name="3d_ringing_tone_enabler_api" long-name="3D Ringing Tone Enabler API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
-</component>
-<component name="telephony_comms_information_api" long-name="Telephony Comms Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_comms_information_api/group"/>
-</component>
-<component name="telephony_information_api" long-name="Telephony Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_information_api/group"/>
-</component>
-<component name="telephony_device_mode_api" long-name="Telephony Device Mode API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_device_mode_api/group"/>
-</component>
-<component name="telephony_remote_party_information_api" long-name="Telephony Remote Party Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_remote_party_information_api/group"/>
-</component>
-<component name="telephony_video_mailbox_settings_api" long-name="Telephony Video Mailbox Settings API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_video_mailbox_settings_api/group"/>
-</component>
-<component name="telephony_configuration_api" long-name="Telephony Configuration API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_configuration_api/group"/>
-</component>
-<component name="telephony_microphone_mute_status_api" long-name="Telephony Microphone Mute Status API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_microphone_mute_status_api/group"/>
-</component>
-<component name="dialer_keypad_api" long-name="Dialer Keypad API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/dialer_keypad_api/group"/>
-</component>
-<component name="telephony_logging_extension_api" long-name="Telephony Logging Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_logging_extension_api/group"/>
-</component>
-<component name="telephony_matching_extension_api" long-name="Telephony Matching Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_matching_extension_api/group"/>
-</component>
-<component name="telephony_bubble_extension_api" long-name="Telephony Bubble Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_bubble_extension_api/group"/>
-</component>
-<component name="telephony_menu_extension_api" long-name="Telephony Menu Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_menu_extension_api/group"/>
-</component>
-<component name="phone_application_commands_api" long-name="Phone Application Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_commands_api/group"/>
-</component>
-<component name="phone_application_voip_commands_api" long-name="Phone Application VOIP Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_voip_commands_api/group"/>
-</component>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_mediator_api/group"/>
-</component>
-<component name="video_telephony_mediator_api" long-name="Video Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/video_telephony_mediator_api/group"/>
-</component>
-</collection>
-<collection name="phoneapp" long-name="Phone Application" level="app">
-<component name="blacklist" filter="s60" long-name="Phone Blacklist Clearing" plugin="Y">
-<unit bldFile="app/phone/phoneapp/blacklist/group"/>
-</component>
-<component name="phoneui" filter="s60" long-name="Phone UI">
-<unit bldFile="app/phone/phoneapp/phoneui/group" filter="!test"/>
-</component>
-<component name="phoneuicontrol" filter="s60" long-name="Phone UI Control">
-<unit bldFile="app/phone/phoneapp/phoneuicontrol/group"/>
-</component>
-<component name="phoneuistates" filter="s60" long-name="Phone UI States">
-<unit bldFile="app/phone/phoneapp/phoneuistates/group"/>
-</component>
-<component name="phoneuiutils" filter="s60" long-name="Phone UI Utils">
-<unit bldFile="app/phone/phoneapp/phoneuiutils/group"/>
-</component>
-<component name="phoneuiview" filter="s60" long-name="Phone UI View">
-<unit bldFile="app/phone/phoneapp/phoneuiview/group"/>
-</component>
-<component name="phoneuivoipextension" filter="s60" long-name="Phone UI VOIP Extension">
-<unit bldFile="app/phone/phoneapp/phoneuivoipextension/group"/>
-</component>
-<component name="silenceactionplugin" filter="s60" long-name="Silence Action Plugin" plugin="Y">
-<unit bldFile="app/phone/phoneapp/silenceactionplugin/group"/>
-</component>
-<component name="phonemediatorcenter" filter="s60" long-name="Phone Mediator Center">
-<unit bldFile="app/phone/phoneapp/phonemediatorcenter/group"/>
-</component>
-</collection>
-<collection name="phoneengine" long-name="Phone Engine" level="engine">
-<component name="phonecntfinder" filter="s60" long-name="Phone Contact Finder">
-<unit bldFile="app/phone/phoneengine/phonecntfinder/group"/>
-</component>
-<component name="audiohandling" filter="s60" long-name="Phone Audio Handling">
-<unit bldFile="app/phone/phoneengine/audiohandling/group"/>
-</component>
-<component name="callhandling" filter="s60" long-name="Call Handling">
-<unit bldFile="app/phone/phoneengine/callhandling/group"/>
-</component>
-<component name="contacthandling" filter="s60" long-name="Phone Contact Handling">
-<unit bldFile="app/phone/phoneengine/contacthandling/group"/>
-</component>
-<component name="loghandling" filter="s60" long-name="Phone Log Handling">
-<unit bldFile="app/phone/phoneengine/loghandling/group"/>
-</component>
-<component name="engineinfo" filter="s60" long-name="Phone Engine Info">
-<unit bldFile="app/phone/phoneengine/engineinfo/group"/>
-</component>
-<component name="phonemodel" filter="s60" long-name="Phone Model">
-<unit bldFile="app/phone/phoneengine/phonemodel/group"/>
-</component>
-<component name="servicehandling" filter="s60" long-name="Phone Service Handling">
-<unit bldFile="app/phone/phoneengine/servicehandling/group"/>
-</component>
-</collection>
-<collection name="phonesettings" long-name="Phone Settings" level="plugin">
-<component name="aiwcallimageplugin" filter="s60" long-name="Call Image AIW Plugin" plugin="Y">
-<unit bldFile="app/phone/phonesettings/aiwcallimageplugin/group"/>
-</component>
-<component name="pslncallimageplugin" filter="s60" long-name="Call Image Personalization Plugin" plugin="Y">
-<unit bldFile="app/phone/phonesettings/pslncallimageplugin/group"/>
-</component>
-</collection>
-<collection name="phoneuis" long-name="Phone UIs" level="ui">
-<component name="dialer" filter="s60" long-name="Dialer">
-<unit bldFile="app/phone/phoneuis/dialer/group" filter="!test"/>
-</component>
-<component name="easydialing" filter="s60" long-name="Easy Dialing Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/phone/phoneuis/easydialing/group"/>
-</component>
-<component name="bubblemanager" filter="s60" long-name="Phone Bubble Manager">
-<unit bldFile="app/phone/phoneuis/bubblemanager/group"/>
-</component>
-<component name="connectutil" filter="s60" long-name="Connection Utility" plugin="Y">
-<unit bldFile="app/phone/phoneuis/connectutil/group"/>
-</component>
-<component name="ussd" filter="s60" long-name="Unstructured Supplementary Services Data">
-<unit bldFile="app/phone/phoneuis/ussd/group"/>
-</component>
-<component name="vmbx" filter="s60" long-name="Voice Mailbox">
-<unit bldFile="app/phone/phoneuis/vmbx/group"/>
-</component>
-<component name="telephonydevicemode" filter="s60" long-name="Telephony Device Mode">
-<unit bldFile="app/phone/phoneuis/telephonydevicemode/group"/>
-</component>
-</collection>
-<collection name="phoneplugins" long-name="Phone Plugins" level="plugin">
-<component name="telbranding" filter="s60" long-name="Tel Branding" introduced="^2" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/telbranding/group"/>
-</component>
-</collection>
-</block>
-<block name="videotelephony" level="apps" long-name="Video Telephony Apps" levels="engine plugin prot ui">
-<collection name="videotelephony_plat" long-name="VT Apps Platform Interfaces" level="ui">
-<component name="video_telephony_control_mediator_api" long-name="Video Telephony Control Mediator API" filter="s60" class="api">
-<unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_control_mediator_api/group"/>
-</component>
-<component name="video_telephony_media_configuration_api" long-name="Video Telephony Media Configuration API" filter="s60" class="api">
-<unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_media_configuration_api/group"/>
-</component>
-</collection>
-<collection name="vtengines" long-name="Video Telephony Engines" level="engine">
-<component name="videoteleng" filter="s60" long-name="Video Telephony Engine">
-<unit bldFile="app/videotelephony/vtengines/videoteleng/Group"/>
-</component>
-<component name="vtmediatorplugin" filter="s60" long-name="VT Mediator Plugin" plugin="Y">
-<unit bldFile="app/videotelephony/vtengines/vtmediatorplugin/group"/>
-</component>
-</collection>
-<collection name="vtuis" long-name="Video Telephony UIs" level="ui">
-<component name="videotelui" filter="s60" long-name="Video Telephony UI">
-<unit bldFile="app/videotelephony/vtuis/videotelui/group"/>
-</component>
-</collection>
-<collection name="vtprotocolplugins" long-name="VT Protocol Plugins" level="plugin">
-<component name="displaysink" filter="s60" long-name="Display Sink" introduced="^2">
-<unit bldFile="app/videotelephony/vtprotocolplugins/DisplaySink/group"/>
-</component>
-<component name="videosource" filter="s60" long-name="Video Source" introduced="^2">
-<unit bldFile="app/videotelephony/vtprotocolplugins/VideoSource/group"/>
-</component>
-</collection>
-<collection name="vtprotocolsstub" long-name="VT Protocols Stub" level="prot">
-<!-- this collection is really a component, move down a directory -->
-<component name="videotelproto" filter="s60" long-name="Video Telephony Protocol">
-<unit bldFile="app/videotelephony/vtprotocolsstub/group" filter="sf_build"/>
-</component>
-</collection>
-</block>
-<block name="iptelephony" level="apps" long-name="IP Telephony" levels="eng plugin util ui">
-<collection name="iptel_plat" long-name="IP Telephony Platform Interfaces" level="ui">
-<component name="richcallsettingsengine_api" long-name="Rich Call Settings Engine API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/richcallsettingsengine_api/group"/>
-</component>
-<component name="cch_client_api" long-name="CCH Client API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/cch_client_api/group"/>
-</component>
-<component name="cch_server_api" long-name="CCH Server API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/cch_server_api/group"/>
-</component>
-<component name="csc_settingsui_api" long-name="CSC Settings UI API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/csc_settingsui_api/group"/>
-</component>
-<component name="vccpropertyhandler_api" long-name="VCC Property Handler API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/vccpropertyhandler_api/group"/>
-</component>
-<component name="vcc_api" long-name="VCC API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/vcc_api/group"/>
-</component>
-</collection>
-<collection name="iptelcommsconfig" long-name="IP Telephony Comms Config" level="ui">
-<component name="cscgsplugin" filter="s60" long-name="CSC GS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/commsconfig/cscgsplugin/group"/>
-</component>
-<component name="cscsipvoipcleanupplugin" filter="s60" long-name="CSC SIP VoIP Cleanup Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/commsconfig/cscsipvoipcleanupplugin/group"/>
-</component>
-<component name="cscengine" filter="s60" long-name="Connection Service Configurator Engine" introduced="^2">
-<unit bldFile="app/iptelephony/commsconfig/cscengine/group"/>
-</component>
-<component name="cscsettingsui" filter="s60" long-name="CSC Settings UI" introduced="^2">
-<unit bldFile="app/iptelephony/commsconfig/cscsettingsui/group"/>
-</component>
-<component name="cscapplicationui" filter="s60" long-name="CSC Application UI" introduced="^2">
-<unit bldFile="app/iptelephony/commsconfig/cscapplicationui/group"/>
-</component>
-<component name="commsconfig_build" filter="s60" long-name="Comms Config Build" introduced="^2">
-<!-- consider distributing this into the above components -->
-<unit bldFile="app/iptelephony/commsconfig/group"/>
-</component>
-</collection>
-<collection name="convergedconnectionhandler" long-name="Converged Connection Handler" level="eng">
-<component name="cchserver" filter="s60" long-name="CCH Server" introduced="^2">
-<unit bldFile="app/iptelephony/convergedconnectionhandler/cchserver/group"/>
-</component>
-<component name="cchclient" filter="s60" long-name="CCH Client" introduced="^2">
-<unit bldFile="app/iptelephony/convergedconnectionhandler/cchclient/group"/>
-</component>
-<component name="cchclientapi" filter="s60" long-name="CCH Client API" introduced="^2">
-<unit bldFile="app/iptelephony/convergedconnectionhandler/cchclientapi/group"/>
-</component>
-<component name="convergedconnectionhandler_build" filter="s60" long-name="CCH Build" introduced="^2">
-<!-- consider distributing this into the above components, or collapse the collection into a single component.
- The latter is a better option since clients and sevrers are rarely separate components -->
-<unit bldFile="app/iptelephony/convergedconnectionhandler/group"/>
-</component>
-</collection>
-<collection name="richcallsettingsengine" long-name="Rich Call Settings Engine" level="eng">
-<component name="rcse2" filter="s60" long-name="Rich Call Settings Engine Build" introduced="^2">
-<unit bldFile="app/iptelephony/richcallsettingsengine/rcse2/group"/>
-</component>
-</collection>
-<collection name="sipvoipprovider" long-name="SIP VoIP Provider" level="plugin">
-<!-- collection is really a component. Should move down a directory -->
-<component name="svp" filter="s60" long-name="SIP VoIP Provider Build" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/sipvoipprovider/group"/>
-</component>
-</collection>
-<collection name="voipplugins" long-name="VoIP Plugins" level="plugin">
-<component name="sipmxresolver" filter="s60" long-name="SIP MX Resolver" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/sipmxresolver/group"/>
-</component>
-<component name="sipconnectionprovider" filter="s60" long-name="SIP Connection Provider" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/sipconnectionprovider/group"/>
-<!-- can only have one unit, can the next be #'included from the above? -->
-<unit bldFile="app/iptelephony/voipplugins/sipconnectionprovider/ipvoicemailengine/group"/>
-</component>
-<component name="ipapputils" filter="s60" long-name="IP App Utils" introduced="^2">
-<unit bldFile="app/iptelephony/voipplugins/ipapputils/group"/>
-</component>
-<component name="voipadapters" filter="s60" long-name="VoIP Adapters" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/voipadapters/group"/>
-</component>
-<component name="accountcreationplugin" filter="s60" long-name="Account Creation Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/accountcreationplugin/group"/>
-</component>
-<component name="dhcppositionprovider" filter="s60" long-name="DHCP Position Provider" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/dhcppositionprovider/group"/>
-</component>
-<component name="svtmatching" filter="s60" long-name="SIP VoIP Telephony Matching" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/svtmatching/group"/>
-</component>
-<component name="svtlogging" filter="s60" long-name="SVT Logging" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/svtlogging/group"/>
-</component>
-<component name="svtcallmenu" filter="s60" long-name="SVT Call Menu" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/svtcallmenu/group"/>
-</component>
-<component name="sipimresolver" filter="s60" long-name="SIP IM Resolver" introduced="^3" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/sipimresolver/group"/>
-</component>
-</collection>
-<collection name="callcontinuity" long-name="Call Continuity" level="util">
-<component name="vccutils" filter="s60" long-name="VCC Utils" introduced="^2">
-<unit bldFile="app/iptelephony/callcontinuity/vccutils/group"/>
-</component>
-<component name="nsmldmvccadapter" filter="s60" long-name="SyncML DM VCC Adapter" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/callcontinuity/nsmldmvccadapter/group"/>
-</component>
-<component name="vccclientprovisioningadapter" filter="s60" long-name="VCC Client Provisioning Adapter" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/callcontinuity/vccclientprovisioningadapter/group"/>
-</component>
-<component name="vccpropertyhandler" filter="s60" long-name="VCC Property Handler" introduced="^2">
-<unit bldFile="app/iptelephony/callcontinuity/vccpropertyhandler/group"/>
-</component>
-<component name="vcchotrigger" filter="s60" long-name="VCC HO Trigger" introduced="^2">
-<unit bldFile="app/iptelephony/callcontinuity/vcchotrigger/group"/>
-</component>
-<component name="vcc" filter="s60" long-name="VoIP Call Continuity" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/callcontinuity/vcc/group"/>
-</component>
-<component name="callcontinuity_build" filter="s60" long-name="Call Continuity Build" introduced="^2">
-<!-- consider distributing this into the above components -->
-<unit bldFile="app/iptelephony/callcontinuity/group"/>
-</component>
-</collection>
-</block>
-<block name="settingsuis" level="services" long-name="Settings UIs" levels="rsc ui">
-<collection name="devmngt_plat" long-name="Settings UIs Platform Interfaces" level="ui">
-<component name="default_app_client_api" long-name="Default App Client API" introduced="^1" filter="s60" class="api">
-<unit bldFile="app/settingsuis/devmngt_plat/default_app_client_api/group"/>
-</component>
-<component name="services_db_api" long-name="Services DB API" introduced="^1" filter="s60" class="api">
-<unit bldFile="app/settingsuis/devmngt_plat/services_db_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="defaultapplicationsettings" long-name="Default Application Settings" level="rsc">
-<component name="services_db" filter="s60" long-name="Services Database" introduced="^1">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/services_db/group"/>
-</component>
-<component name="defaultapplicationsettings_server" filter="s60" long-name="Default Application Server" introduced="^1">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/server/group"/>
-</component>
-<component name="service" filter="s60" long-name="Default Application Service" introduced="^1">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/service/group"/>
-</component>
-<component name="dasgsplugin" filter="s60" long-name="Default Application Settings GS Plugin" introduced="^1" plugin="Y">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/gsplugin/group"/>
-</component>
-<component name="defaultapplicationsettings_build" filter="s60" long-name="Default Application Settings Build" introduced="^1">
-<!-- split the IBYs up into the appropriate components? Make this a ROM component? -->
-<unit bldFile="app/settingsuis/defaultapplicationsettings/group"/>
-</component>
-</collection>
-<collection name="systemswuis" long-name="System SW UIs" level="ui">
-<component name="touchscreencalib" filter="s60" long-name="Touchscreen Calibration" introduced="^1">
-<unit bldFile="app/settingsuis/systemswuis/touchscreencalib/group"/>
-</component>
-</collection>
-</block>
-<block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin app">
-<collection name="contentctrl_plat" long-name="Content Control Daemons Platforn Interfaces" level="app">
-<component name="oma_ds_presync_plugin_api" long-name="OMA DS PreSync Plugin API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/oma_ds_presync_plugin_api/group"/>
-</component>
-<component name="ds_agenda_handler_plugin_api" long-name="DS Agenda Handler Plugin API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_agenda_handler_plugin_api/group"/>
-</component>
-<component name="ds_folder_util_api" long-name="DS Folder Util API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_folder_util_api/group"/>
-</component>
-</collection>
-<collection name="dsdcmoadapter" long-name="Data Sync DCMO Adapter" level="plugin">
-<!-- Component at wrong rank, should move down a directory -->
-<component name="dsdcmoadapter_build" filter="s60" long-name="Data Sync Control DCMO Adapter">
-<unit bldFile="app/contentcontrol/dsdcmoadapter/group"/>
-</component>
-</collection>
-<collection name="omads" long-name="OMA Data Sync" level="app">
-<component name="omadsappui" filter="s60" long-name="OMA DS Application UI">
-<unit bldFile="app/contentcontrol/omads/omadsappui/group"/>
-</component>
-<component name="omadsextensions" filter="s60" long-name="OMA DS Extensions" plugin="Y">
-<unit bldFile="app/contentcontrol/omads/omadsextensions/group"/>
-</component>
-</collection>
-</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">
-<unit bldFile="app/devicecontrol/devicediagnostics/devdiagapp/group"/>
-</component>
-<component name="devdiaggsplugin" filter="s60" long-name="Device Diagnostics GS Plugin" plugin="Y">
-<unit bldFile="app/devicecontrol/devicediagnostics/devdiaggsplugin/group"/>
-</component>
-<component name="diagplugins" filter="s60" long-name="Diagnostics Plugins" plugin="Y">
-<unit bldFile="app/devicecontrol/devicediagnostics/diagplugins/group"/>
-</component>
-<component name="diagsuites" filter="s60" long-name="Diagnostics Suites" plugin="Y">
-<unit bldFile="app/devicecontrol/devicediagnostics/diagsuites/group"/>
-</component>
-<component name="devicediagnostics_build" filter="s60" long-name="Device Diagnostics Build">
-<!-- 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">
-<unit bldFile="app/devicecontrol/omadm/omadmappui/group"/>
-</component>
-<component name="omadmextensions" filter="s60" long-name="OMA DM Extensions" 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">
-<unit bldFile="app/devicecontrol/omadm/dcmo/group"/>
-</component>
-</collection>
-<collection name="pnpmobileservices" long-name="PnP Mobile Services" level="mid">
-<component name="pnpms" filter="s60" long-name="PnP MS">
-<unit bldFile="app/devicecontrol/pnpmobileservices/pnpms/group"/>
-</component>
-</collection>
-<collection name="applicationmanagement" long-name="Application Management" level="app">
-<!-- could this collection be collapsed into a single component and moved down a dir? Do all these need to be noted separately? -->
-<component name="applicationmanagement_options" filter="s60" long-name="AM Install Options">
-<unit bldFile="app/devicecontrol/applicationmanagement/options/group"/>
-</component>
-<component name="applicationmanagement_client" filter="s60" long-name="AM Client">
-<unit bldFile="app/devicecontrol/applicationmanagement/client/group"/>
-</component>
-<component name="applicationmanagement_server" filter="s60" long-name="AM Server">
-<unit bldFile="app/devicecontrol/applicationmanagement/server/group"/>
-</component>
-<component name="rfsplugin" filter="s60" long-name="AM RFS Plugin" plugin="Y">
-<unit bldFile="app/devicecontrol/applicationmanagement/rfsplugin/group"/>
-</component>
-<component name="amadapter2" filter="s60" long-name="AM Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/applicationmanagement/amadapter2/group"/>
-</component>
-<component name="omascomoadapter" filter="s60" long-name="OMA SCOMO Adapter" introduced="^3" plugin="Y">
-<unit bldFile="app/devicecontrol/applicationmanagement/omascomoadapter/group"/>
-</component>
-<component name="applicationmanagement_build" filter="s60" long-name="AM Build">
-<!-- If thes aren't collapsed into one cmp, can all #includes removed from here, and it renamed AM ROM? -->
-<unit bldFile="app/devicecontrol/applicationmanagement/group"/>
-</component>
-</collection>
-<collection name="customization" long-name="DM Customization Adapters" level="mid">
-<component name="dmutils" long-name="DM Utils" filter="s60">
-<unit bldFile="app/devicecontrol/customization/dmutils/bld"/>
-</component>
-<component name="uisettingssrv" filter="s60" long-name="UI Settings Server">
-<unit bldFile="app/devicecontrol/customization/uisettingssrv/bld"/>
-</component>
-<component name="isadapter" filter="s60" long-name="Idle State Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/isadapter/bld"/>
-</component>
-<component name="supadapter" filter="s60" long-name="Startup Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/supadapter/bld"/>
-</component>
-<component name="wallpaperadapter" filter="s60" long-name="Wallpaper Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/wallpaperadapter/bld"/>
-</component>
-<component name="operatorlogoadapter" filter="s60" long-name="Operator Logo Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/operatorlogoadapter/bld"/>
-</component>
-<component name="screensaveradapter" filter="s60" long-name="Screen Saver Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/screensaveradapter/bld"/>
-</component>
-<component name="themesadapter" filter="s60" long-name="Themes Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/themesadapter/bld"/>
-</component>
-<component name="embeddedlinkadapter" filter="s60" long-name="Embedded Link Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/embeddedlinkadapter/bld"/>
-</component>
-<component name="customization_build" filter="s60" long-name="DM Customization Build">
-<!-- If thes aren't collapsed into one cmp, can all #includes removed from here, and it renamed DM Customization ROM? -->
-<unit bldFile="app/devicecontrol/customization/group"/>
-</component>
-</collection>
-<collection name="omacp" long-name="OMA Content Provisioning" level="oma">
-<component name="omacpadapters" filter="s60" long-name="OMA CP Adapters" plugin="Y">
-<unit bldFile="app/devicecontrol/omacp/omacpadapters/group"/>
-</component>
-</collection>
-</block>
-<block name="printing" level="services" long-name="Printing" levels="app">
-<collection name="imageprint" long-name="ImagePrint" level="app">
-<component name="clog" filter="s60" long-name="ImagePrint Logging" introduced="^2">
-<unit bldFile="app/printing/imageprint/clog/group"/>
-</component>
-<component name="imageprintengine" filter="s60" long-name="ImagePrint Engine" introduced="^2">
-<unit bldFile="app/printing/imageprint/imageprintengine/group"/>
-</component>
-<component name="imageprintui" filter="s60" long-name="ImagePrint UI" introduced="^2">
-<unit bldFile="app/printing/imageprint/imageprintui/group"/>
-</component>
-<component name="imageprint_build" filter="s60" long-name="ImagePrint Build" introduced="^2">
-<!-- Need to break the IBY includes into the other components, or remove #includes and make this a ROM component -->
-<unit bldFile="app/printing/imageprint/group"/>
-</component>
-</collection>
-</block>
-<block name="files" level="apps" long-name="File Manager Apps" levels="support apps">
-<collection name="files_plat" long-name="File Manager Apps Platform Interfaces" level="apps">
-<component name="memory_scan_popup_ui_api" long-name="Memory Scan Popup UI API" filter="s60" class="api">
-<unit bldFile="app/files/files_plat/memory_scan_popup_ui_api/group"/>
-</component>
-</collection>
-<collection name="deviceencryption" long-name="Device Encryption" level="support">
-<!-- this is either needs to be broken up into idependent bld.infs, or it's really a component and should move down a directory -->
-<component name="devencnotifplugin" filter="s60" long-name="Device Encryption Notifier Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/files/deviceencryption/devencnotifplugin/group"/>
-</component>
-<component name="devencui" filter="s60" long-name="Device Encryption UI" introduced="^3">
-<unit bldFile="app/files/deviceencryption/devencui/group"/>
-</component>
-<component name="devencdmadapter" filter="s60" long-name="Device Encryption DM Adapter" introduced="^3" plugin="Y">
-<unit bldFile="app/files/deviceencryption/devencdmadapter/group"/>
-</component>
-<component name="devencgsplugin" filter="s60" long-name="Device Encryption GS Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/files/deviceencryption/devencgsplugin/group"/>
-</component>
-<component name="deviceencryption_help" filter="s60" long-name="Device Encryption Help" introduced="^3">
-<unit bldFile="app/files/deviceencryption/help/group"/>
-</component>
-<component name="deviceencryption_build" filter="s60" long-name="Device Encryption Build" introduced="^3">
-<unit bldFile="app/files/deviceencryption/group"/>
-</component>
-</collection>
-<collection name="filemanager" long-name="File Manager" level="apps">
-<!-- this is really a component, should move down a directory -->
-<component name="filemanager_build" filter="s60" long-name="File Manager Build">
-<unit bldFile="app/files/filemanager/group"/>
-</component>
-</collection>
-<collection name="filesystemuis" long-name="File System UIs" level="support">
-<component name="memscaneng" filter="s60" long-name="Memory Scan Server">
-<unit bldFile="app/files/filesystemuis/memscaneng/group"/>
-</component>
-<component name="memstatepopup" filter="s60" long-name="Memory State Popup">
-<unit bldFile="app/files/filesystemuis/memstatepopup/group"/>
-</component>
-</collection>
-</block>
-<block name="utils" level="apps" long-name="Utility Apps" levels="app">
-<collection name="extras" long-name="Extras" level="app">
-<component name="about" filter="s60" long-name="About Application">
-<unit bldFile="app/utils/extras/about/group"/>
-</component>
-<component name="calcsoft" filter="s60" long-name="Calculator Application">
-<unit bldFile="app/utils/extras/calcsoft/group"/>
-</component>
-<component name="converter" filter="s60" long-name="Unit Converter">
-<unit bldFile="app/utils/extras/converter/group"/>
-</component>
-</collection>
-</block>
-<block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
-<collection name="contacts_pub" long-name="Contacts Apps Public Interfaces" level="ui">
-<component name="phonebook_fetch_ui_api" long-name="Phonebook Fetch UI API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_fetch_ui_api/group"/>
-</component>
-<component name="phonebook_data_management_api" long-name="Phonebook Data Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_data_management_api/group"/>
-</component>
-<component name="phonebook_vcard_importexport_api" long-name="Phonebook vCard Import/Export API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_vcard_importexport_api/group"/>
-</component>
-<component name="phonebook_data_addedit_ui_api" long-name="Phonebook Data Add/Edit UI API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_data_addedit_ui_api/group"/>
-</component>
-<component name="phonebook_ui_utilities_api" long-name="Phonebook UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_ui_utilities_api/group"/>
-</component>
-<component name="phonebook_thumbnail_operation_api" long-name="Phonebook Thumbnail Operation API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_thumbnail_operation_api/group"/>
-</component>
-<component name="speed_dial_utility_control_api" long-name="Speed Dial Utility Control API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/speed_dial_utility_control_api/group"/>
-</component>
-</collection>
-<collection name="contacts_plat" long-name="Contacts Apps Platform Interfaces" level="ui">
-<component name="virtual_phonebook_store_api" long-name="Virtual Phonebook Store API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_store_api/group"/>
-</component>
-<component name="virtual_phonebook_sim_services_api" long-name="Virtual Phonebook SIM Services API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_sim_services_api/group"/>
-</component>
-<component name="virtual_phonebook_configuration_api" long-name="Virtual Phonebook Configuration API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_configuration_api/group"/>
-</component>
-<component name="virtual_phonebook_copy_policy_api" long-name="Virtual Phonebook Copy Policy API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_copy_policy_api/group"/>
-</component>
-<component name="virtual_phonebook_policy_api" long-name="Virtual Phonebook Policy API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_policy_api/group"/>
-</component>
-<component name="virtual_phonebook_engine_api" long-name="Virtual Phonebook Engine API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_engine_api/group"/>
-</component>
-<component name="virtual_phonebook_migration_support_api" long-name="Virtual Phonebook Migration Support API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_migration_support_api/group"/>
-</component>
-<component name="virtual_phonebook_view_definition_api" long-name="Virtual Phonebook View Definition API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_view_definition_api/group"/>
-</component>
-<component name="virtual_phonebook_vcard_api" long-name="Virtual Phonebook vCard API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_vcard_api/group"/>
-</component>
-<component name="cms_contactor_api" long-name="CMS Contactor API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/cms_contactor_api/group"/>
-</component>
-<component name="contactpresence_api" long-name="Contact Presence API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/contactpresence_api/group"/>
-</component>
-<component name="presence_cache_api" long-name="Presence Cache API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/presence_cache_api/group"/>
-</component>
-<component name="phonebook_internal_common_api" long-name="Phonebook Internal Common API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_common_api/group"/>
-</component>
-<component name="phonebook_internal_appfw_api" long-name="Phonebook Internal App Framework API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_appfw_api/group"/>
-</component>
-<component name="phonebook_internal_data_management_api" long-name="Phonebook Internal Data Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_data_management_api/group"/>
-</component>
-<component name="phonebook_2_xsp_extension_manager_api" long-name="Phonebook 2 xSP Extension Manager API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_xsp_extension_manager_api/group"/>
-</component>
-<component name="phonebook_ui_controls_api" long-name="Phonebook UI Controls API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_ui_controls_api/group"/>
-</component>
-<component name="phonebook_2_image_management_api" long-name="Phonebook 2 Image Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_image_management_api/group"/>
-</component>
-<component name="phonebook_extension_api" long-name="Phonebook Extension API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_extension_api/group"/>
-</component>
-<component name="phonebook_public_constants_api" long-name="Phonebook Public Constants API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_public_constants_api/group"/>
-</component>
-<component name="phonebook_internal_ui_utilities_api" long-name="Phonebook Internal UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_ui_utilities_api/group"/>
-</component>
-<component name="logs_engine_api_extensions" long-name="Logs Engine API Extensions" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/logs_engine_api_extensions/group"/>
-</component>
-<component name="phonebook_thumbnails_api" long-name="Phonebook Thumbnails API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_thumbnails_api/group"/>
-</component>
-<component name="phonebook_2_icon_api" long-name="Phonebook 2 Icon API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_icon_api/group"/>
-</component>
-<component name="phonebook_engine_extension_api" long-name="Phonebook Engine Extension API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_engine_extension_api/group"/>
-</component>
-<component name="phonebook_2_store_configuration_management_api" long-name="Phonebook 2 Store Configuration Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_store_configuration_management_api/group"/>
-</component>
-<component name="logs_ui_command_line_api" long-name="Logs UI Command Line API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/logs_ui_command_line_api/group"/>
-</component>
-<component name="speed_dial_dialogs_api" long-name="Speed Dial Dialogs API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/speed_dial_dialogs_api/group"/>
-</component>
-<component name="phonebook_2_xsp_view_activation_api" long-name="Phonebook 2 xSP View Activation API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_xsp_view_activation_api/group"/>
-</component>
-<component name="logs_timers_api" long-name="Logs Timers API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/logs_timers_api/group"/>
-</component>
-<component name="phonebook_2_ui_extension_definition_api" long-name="Phonebook 2 UI Extension Definition API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_definition_api/group"/>
-</component>
-<component name="phonebook_2_common_ui_api" long-name="Phonebook 2 Common UI API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_common_ui_api/group"/>
-</component>
-<component name="phonebook_2_ui_extension_api" long-name="Phonebook 2 UI Extension API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_api/group"/>
-</component>
-<component name="phonebook_2_store_property_api" long-name="Phonebook 2 Store Property API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_store_property_api/group"/>
-</component>
-<component name="phonebook_2_ui_extension_plugin_api" long-name="Phonebook 2 UI Extension Plug-In API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_plugin_api/group"/>
-</component>
-<component name="phonebook_2_ui_controls_api" long-name="Phonebook 2 UI Controls API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_controls_api/group"/>
-</component>
-<component name="phonebook_2_thin_ui_extension_plugin_api" long-name="Phonebook 2 Thin UI Extension Plugin API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_thin_ui_extension_plugin_api/group"/>
-</component>
-<component name="phonebook_2_commands_api" long-name="Phonebook 2 Commands API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_commands_api/group"/>
-</component>
-<component name="phonebook_2_presentation_api" long-name="Phonebook 2 Presentation API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_presentation_api/group"/>
-</component>
-<component name="phonebook_2_ui_utilities_api" long-name="Phonebook 2 UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_utilities_api/group"/>
-</component>
-<component name="cca_launch_api" long-name="CCA Launch API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/cca_launch_api/group"/>
-</component>
-<component name="cca_view_plugin_api" long-name="CCA View Plugin API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/cca_view_plugin_api/group"/>
-</component>
-<component name="predictivesearch_client_api" long-name="Predictive Search Client API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_client_api/group"/>
-</component>
-<component name="predictivesearch_utils_api" long-name="Predictive Search Utils API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_utils_api/group"/>
-</component>
-<component name="predictivesearch_adapters_api" long-name="Predictive Search Adapters API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_adapters_api/group"/>
-</component>
-<component name="predictivesearch_algorithm_api" long-name="Predictive Search Algorithm API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_algorithm_api/group"/>
-</component>
-<component name="phonebook_2_rcl_api" long-name="Phonebook 2 RCL API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_rcl_api/group"/>
-</component>
-</collection>
-<collection name="contactextensions" long-name="Contacts Extensions" level="services">
-<component name="predefinedcontacts" filter="s60" long-name="Predefined Contacts">
-<unit bldFile="app/contacts/contactextensions/predefinedcontacts/group"/>
-</component>
-</collection>
-<collection name="logsui" long-name="Logs UI" level="ui">
-<component name="logsui_build" filter="s60" long-name="Logs UI Build">
-<!-- component at too high a rank, should move down one directory -->
-<unit bldFile="app/contacts/logsui/group"/>
-</component>
-</collection>
-<collection name="phonebookui" long-name="Phonebook UI" level="ui">
-<component name="phonebook" filter="s60" long-name="Phonebook">
-<unit bldFile="app/contacts/phonebookui/phonebook/group"/>
-</component>
-<component name="speeddial" filter="s60" long-name="Speed Dial">
-<unit bldFile="app/contacts/phonebookui/speeddial/group"/>
-</component>
-<component name="phonebook2" filter="s60" long-name="Phone Book 2">
-<unit bldFile="app/contacts/phonebookui/phonebook2/group"/>
-</component>
-</collection>
-<collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
-<component name="cntfindplugin" filter="s60" long-name="Contacts Find Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntfindplugin/group"/>
-</component>
-<component name="cntsortplugin" filter="s60" long-name="Contacts Sort Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntsortplugin/group"/>
-</component>
-<component name="virtualphonebook" filter="s60" long-name="Virtual Phonebook" introduced="^2">
-<unit bldFile="app/contacts/phonebookengines/virtualphonebook/group"/>
-</component>
-<component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
-<unit bldFile="app/contacts/phonebookengines/contactsmodel/groupsql" mrp="app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
-</component>
-</collection>
-<collection name="pimprotocols" long-name="PIM Protocols" level="services">
-<component name="phonebooksync" long-name="Phonebook Sync" purpose="optional" plugin="Y">
-<unit bldFile="app/contacts/pimprotocols/phonebooksync/group" mrp="app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
-</component>
-<component name="pbap" long-name="Bluetooth PBAP" introduced="9.2" purpose="optional">
-<unit bldFile="app/contacts/pimprotocols/pbap/group" mrp="app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
-</component>
-</collection>
-<collection name="ccservices" long-name="Contacts Centric Services" level="services">
-<component name="cmsservices" filter="s60" long-name="Contact Method Selector Services" introduced="^2">
-<unit bldFile="app/contacts/ccservices/cmsservices/group"/>
-</component>
-</collection>
-<collection name="presencecache" long-name="Presence Cache" level="support">
-<component name="presencecacheutils" filter="s60" long-name="Presence Cache Utils" introduced="^2" class="placeholder">
-<!-- <unit bldFile="presencecache/presencecacheutils/group"/> -->
-</component>
-<component name="presencecacheserver2" filter="s60" long-name="Presence Cache Server" introduced="^2" class="placeholder">
-<!-- <unit bldFile="presencecache/presencecacheserver2/group"/> -->
-</component>
-<component name="presencecacheclient2" filter="s60" long-name="Presence Cache Client" introduced="^2" class="placeholder">
-<!-- <unit bldFile="presencecache/presencecacheclient2/group"/> -->
-</component>
-<component name="presencecache_build" filter="s60" long-name="Presence Cache Build" introduced="^2">
-<!-- should divide this bld.inf into the other components, or collapse them into a single component -->
-<unit bldFile="app/contacts/presencecache/group"/>
-</component>
-</collection>
-<collection name="predictivesearch" long-name="Predictive Search" level="support">
-<component name="pcsutils" filter="s60" long-name="PCS Utils" introduced="^2">
-<unit bldFile="app/contacts/predictivesearch/pcsutils/group"/>
-</component>
-<component name="pcsserverclientapi" filter="s60" long-name="PCS Server Client API" introduced="^2">
-<unit bldFile="app/contacts/predictivesearch/pcsserverclientapi/group"/>
-</component>
-<component name="pcsserver" filter="s60" long-name="PCS Server" introduced="^2">
-<unit bldFile="app/contacts/predictivesearch/pcsserver/group"/>
-</component>
-<component name="pcsadapters" filter="s60" long-name="PCS Adapters" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/predictivesearch/adapters/contacts/group"/>
-</component>
-<component name="pcsalgorithm" filter="s60" long-name="PCS Algorithm" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/predictivesearch/pcsalgorithm/group"/>
-</component>
-<component name="predictivesearch_build" filter="s60" long-name="Predictive Search Build" introduced="^2">
-<!-- need to remove #includes from bld.inf and rename as Predictive Search ROM -->
-<unit bldFile="app/contacts/predictivesearch/group"/>
-</component>
-</collection>
-<collection name="contacts_info" long-name="Contacts Apps Info" level="ui">
-<component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="organizer" level="apps" span="2" long-name="Organizer Application Suite" levels="support services engine ui app">
-<collection name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" level="app">
-<component name="meeting_request_mailbox_utilities_api" long-name="Meeting Request Mailbox Utilities API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_mailbox_utilities_api/group"/>
-</component>
-<component name="meeting_request_uids_api" long-name="Meeting Request UIDs API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_uids_api/group"/>
-</component>
-<component name="calendar_exporter_api" long-name="Calendar Exporter API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_exporter_api/group"/>
-</component>
-<component name="agenda_versit_2_api" long-name="Agenda Versit 2 API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/agenda_versit_2_api/group"/>
-</component>
-<component name="calendar_importer_api" long-name="Calendar Importer API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_importer_api/group"/>
-</component>
-<component name="calendar_launcher_api" long-name="Calendar Launcher API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_launcher_api/group"/>
-</component>
-<component name="calendar_common_utils_api" long-name="Calendar Common Utils API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_common_utils_api/group"/>
-</component>
-<component name="searchfw_launcher_api" long-name="Search Framework Launcher API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/searchfw_launcher_api/group"/>
-</component>
-<component name="alarm_const_api" long-name="Alarm Const API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/alarm_const_api/group"/>
-</component>
-<component name="alarm_ui_external_control_api" long-name="Alarm UI External Control API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/alarm_ui_external_control_api/group"/>
-</component>
-<component name="calendar_settings_keys_api" long-name="Calendar Settings Keys API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_settings_keys_api/group"/>
-</component>
-<component name="calendar_tones_settings_keys_api" long-name="Calendar Tones Settings Keys API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_tones_settings_keys_api/group"/>
-</component>
-<component name="clock_settings_api" long-name="Clock Settings API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/clock_settings_api/group"/>
-</component>
-<component name="common_alarm_editor_api" long-name="Common Alarm Editor API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/common_alarm_editor_api/group"/>
-</component>
-<component name="alarm_ui_secondary_display_api" long-name="Alarm UI Secondary Display API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/alarm_ui_secondary_display_api/group"/>
-</component>
-<component name="searchui_launcher_api" long-name="Search UI Launcher API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/searchui_launcher_api/group"/>
-</component>
-<component name="agenda_entry_ui_api" long-name="Agenda Entry UI API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/agenda_entry_ui_api/group"/>
-</component>
-<component name="meeting_request_utillities_api" long-name="Meeting Request Utillities API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_utillities_api/group"/>
-</component>
-<component name="meeting_request_viewer_api" long-name="Meeting Request Viewer API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_viewer_api/group"/>
-</component>
-<component name="calendar_custamization_api" long-name="Calendar Customization API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_custamization_api/group"/>
-</component>
-</collection>
-<collection name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" level="app">
-<component name="calendar_interim_utils2_api" long-name="Calendar Interim Utils 2 API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_pub/calendar_interim_utils2_api/group"/>
-</component>
-<component name="notepad_library_api" long-name="Notepad Library API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_pub/notepad_library_api/group"/>
-</component>
-</collection>
-<collection name="alarmengines" long-name="Alarm Engines" level="engine">
-<component name="missedalarmstore" filter="s60" long-name="Missed Alarm Store">
-<unit bldFile="app/organizer/alarmengines/missedalarmstore/group"/>
-</component>
-</collection>
-<collection name="calendarengines" long-name="Calendar Engines" level="engine">
-<component name="versit2" filter="s60" long-name="Versit 2 iCal Parser" introduced="9.2">
-<unit bldFile="app/organizer/calendarengines/versit2/group"/>
-</component>
-<component name="agnversit2" filter="s60" long-name="Versit 2 Agenda Interface" introduced="9.2" plugin="Y">
-<unit bldFile="app/organizer/calendarengines/agnversit2/group"/>
-</component>
-<component name="caleninterimutils" filter="s60" long-name="Calendar Interim Utils" introduced="9.1">
-<unit bldFile="app/organizer/calendarengines/caleninterimutils/group"/>
-</component>
-<component name="calenimp" filter="s60" long-name="Calendar Import Wrapper" introduced="7.0s">
-<unit bldFile="app/organizer/calendarengines/calenimp/group"/>
-</component>
-<component name="calenlauncher" filter="s60" long-name="Calendar Launcher">
-<unit bldFile="app/organizer/calendarengines/calenlauncher/group"/>
-</component>
-<component name="caldavsrv" filter="sf_build" long-name="CalDAV Server" introduced="^3">
-<unit bldFile="app/organizer/calendarengines/caldav/group"/>
-</component>
-</collection>
-<collection name="meetingrequestengines" long-name="Meeting Request Engines" level="engine">
-<component name="mrmailbox" filter="s60" long-name="Meeting Request Mailbox">
-<unit bldFile="app/organizer/meetingrequestengines/mrmailbox/group"/>
-</component>
-<component name="mrmailboxutils" filter="s60" long-name="Meeting Request Mailbox Utils" plugin="Y">
-<unit bldFile="app/organizer/meetingrequestengines/mrmailboxutils/group"/>
-</component>
-</collection>
-<collection name="searchfw" long-name="Search Framework" level="services">
-<!-- Uncomment all units when configuration is in place. All currently #included from searchfw_build, which should be removed at the same time. -->
-<component name="coresearchfw" filter="s60" long-name="Core Search Framework" introduced="^1" class="placeholder">
-<!--<unit bldFile="searchfw/coresearchfw/group"/>-->
-</component>
-<component name="searchfw_plugins" filter="s60" long-name="Search Plugins" introduced="^1" plugin="Y" class="placeholder">
-<!--<unit bldFile="searchfw/plugins/group"/>-->
-</component>
-<component name="searchfw_build" filter="s60" long-name="Search Framework Build" introduced="^1">
-<unit bldFile="app/organizer/searchfw/group"/>
-</component>
-</collection>
-<collection name="alarmui" long-name="Alarm UI" level="app">
-<!-- collection is really a component, should move down a directory -->
-<component name="alarmui_build" filter="s60" long-name="Alarm UI Build">
-<unit bldFile="app/organizer/alarmui/group"/>
-</component>
-</collection>
-<collection name="calendarui" long-name="Calendar UI" level="ui">
-<component name="calendarui_help" filter="s60" long-name="Calendar UI Help">
-<unit bldFile="app/organizer/calendarui/help/group"/>
-</component>
-<component name="commonutils" filter="s60" long-name="Calendar Common Utils">
-<unit bldFile="app/organizer/calendarui/commonutils/group"/>
-</component>
-<component name="globaldata" filter="s60" long-name="Calendar Global Data">
-<unit bldFile="app/organizer/calendarui/globaldata/group"/>
-</component>
-<component name="settings" filter="s60" long-name="Calendar Settings">
-<!-- these should be merged into a single bld.inf or split into two components -->
-<unit bldFile="app/organizer/calendarui/settings/gsplugin/group"/>
-<unit bldFile="app/organizer/calendarui/settings/settingsui/group"/>
-</component>
-<component name="customisation" filter="s60" long-name="Calendar Customisation">
-<unit bldFile="app/organizer/calendarui/customisation/group"/>
-</component>
-<component name="customisationmanager" filter="s60" long-name="Calendar Customisation Manager">
-<unit bldFile="app/organizer/calendarui/customisationmanager/group"/>
-</component>
-<component name="multicaluidialog" filter="s60" long-name="Multi-Calendar UI Dialog" introduced="^3">
-<unit bldFile="app/organizer/calendarui/multicaluidialog/group"/>
-</component>
-<component name="views" filter="s60" long-name="Calendar Views">
-<unit bldFile="app/organizer/calendarui/views/group"/>
-</component>
-<component name="calendarui_controller" filter="s60" long-name="Calendar Controller">
-<unit bldFile="app/organizer/calendarui/controller/group"/>
-</component>
-<component name="calendarui_editors" filter="s60" long-name="Calendar Editors">
-<unit bldFile="app/organizer/calendarui/editors/group"/>
-</component>
-<component name="calendarui_application" filter="s60" long-name="Calendar Application">
-<unit bldFile="app/organizer/calendarui/application/group"/>
-</component>
-<component name="missedalarmindicatorplugin" filter="s60" long-name="Missed Alarm Indicator Plugin" plugin="Y">
-<unit bldFile="app/organizer/calendarui/missedalarmindicatorplugin/group"/>
-</component>
-<component name="calendarui_server" filter="s60" long-name="Calendar Server">
-<!-- these should be merged into a single bld.inf or split into two components -->
-<unit bldFile="app/organizer/calendarui/server/calensvr/group"/>
-<unit bldFile="app/organizer/calendarui/server/calensvrclient/group"/>
-</component>
-<component name="regionalplugins" filter="s60" long-name="Calendar Regional Plugins" plugin="Y">
-<!-- these should be merged into a single bld.inf or split into four components -->
-<unit bldFile="app/organizer/calendarui/regionalplugins/calenregionalutil/group"/>
-<unit bldFile="app/organizer/calendarui/regionalplugins/lunarchinese/group"/>
-<unit bldFile="app/organizer/calendarui/regionalplugins/lunarvietnamese/group"/>
-<unit bldFile="app/organizer/calendarui/regionalplugins/thai/group"/>
-</component>
-<component name="calenaiwprovider" filter="s60" long-name="Calendar AIW Proivder" introduced="^3" plugin="Y">
-<unit bldFile="app/organizer/calendarui/calenaiwprovider/group"/>
-</component>
-<component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y">
-<unit bldFile="app/organizer/calendarui/caldav/group"/>
-</component>
-<component name="calendarui_build" filter="s60" long-name="Calendar UI Build">
-<!-- split contents into separate components -->
-<unit bldFile="app/organizer/calendarui/group"/>
-</component>
-</collection>
-<collection name="meetingui" long-name="Meeting UI" level="ui">
-<component name="attendeeview" filter="s60" long-name="Attendee View">
-<unit bldFile="app/organizer/meetingui/attendeeview/group"/>
-</component>
-<component name="agnentryui" filter="s60" long-name="Agenda Entry UI" plugin="Y">
-<unit bldFile="app/organizer/meetingui/agnentryui/group"/>
-</component>
-<component name="meetingrequestutils" filter="s60" long-name="Meeting Request Utils">
-<unit bldFile="app/organizer/meetingui/meetingrequestutils/group"/>
-</component>
-<component name="meetingrequestviewers" filter="s60" long-name="Meeting Request Viewers" plugin="Y">
-<unit bldFile="app/organizer/meetingui/meetingrequestviewers/group"/>
-</component>
-<component name="meetingui_build" filter="s60" long-name="Meeting UI Build">
-<!-- split contents into separate components -->
-<unit bldFile="app/organizer/meetingui/group"/>
-</component>
-</collection>
-<collection name="clock2" long-name="Clock" level="app">
-<component name="clockengines" filter="s60" long-name="Clock Engines">
-<unit bldFile="app/organizer/clock2/clockengines/group"/>
-</component>
-<component name="clockui" filter="s60" long-name="Clock UI">
-<unit bldFile="app/organizer/clock2/clockui/group"/>
-</component>
-<component name="clock2_help" filter="s60" long-name="Clock Help">
-<unit bldFile="app/organizer/clock2/help/group"/>
-</component>
-<component name="clock2_build" filter="s60" long-name="Clock Build">
-<!-- split contents into separate components, or just make this one component -->
-<unit bldFile="app/organizer/clock2/group"/>
-</component>
-</collection>
-<collection name="notepad" long-name="Notepad" level="ui">
-<component name="notepad_help" filter="s60" long-name="Notepad Help">
-<unit bldFile="app/organizer/notepad/help/group"/>
-</component>
-<component name="notepad1" filter="s60" long-name="Notepad Application 1">
-<unit bldFile="app/organizer/notepad/notepad1/group"/>
-</component>
-<component name="txtrecog" filter="s60" long-name="Text Recognizer" plugin="Y">
-<unit bldFile="app/organizer/notepad/txtrecog/group"/>
-</component>
-</collection>
-<collection name="searchui" long-name="Search UI" level="app">
-<!-- consider making this a single component -->
-<!-- Uncomment all units when configuration is in place. All currently #included from searchui_build, which should be removed at the same time. -->
-<component name="searchui_help" filter="s60" long-name="Search UI Help" class="placeholder">
-<!--<unit bldFile="searchui/help/group"/>-->
-</component>
-<component name="searchapp" filter="s60" long-name="Search Application" class="placeholder">
-<!--<unit bldFile="searchui/searchapp/group"/>-->
-</component>
-<component name="searchui_build" filter="s60" long-name="Search UI Build">
-<unit bldFile="app/organizer/searchui/group"/>
-</component>
-</collection>
-<collection name="pimappservices" long-name="PIM Application Services" level="services">
-<component name="calendar" long-name="Calendar" introduced="9.2" purpose="optional">
-<unit bldFile="app/organizer/pimappservices/calendar/group" mrp="app/organizer/pimappservices/calendar/group/app-engines_calendar.mrp" version="2"/>
-</component>
-<component name="calendarvcalplugin" long-name="Calendar vCal Plugin" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="app/organizer/pimappservices/calendarvcalplugin/group" mrp="app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp" version="2"/>
-</component>
-<component name="appenginesdocs" long-name="Application Engines Documentation" purpose="development" class="doc">
-<unit mrp="app/organizer/pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
-</component>
-</collection>
-<collection name="pimappsupport" long-name="PIM Application Support" level="support">
-<component name="vcardandvcal" long-name="vCard and vCal" introduced="ER5" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/vcardandvcal/group" mrp="app/organizer/pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
-</component>
-<component name="chinesecalendarconverter" long-name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
-</component>
-<component name="chinesecalendaralg" long-name="Chinese Calendar Algorithm" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendaralg/group" mrp="app/organizer/pimappsupport/chinesecalendaralg/group/app-services_chinesecalendaralgorithm.mrp"/>
-</component>
-</collection>
-<collection name="organizer_info" long-name="Organizer Application Suite Info" level="app">
-<component name="organizer_metadata" long-name="Organizer Application Suite Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="mail eng base ui">
-<collection name="msg_pub" long-name="Messaging Apps Public APIs" level="ui">
-<component name="messaging_integration_api" long-name="Messaging Integration API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/messaging_integration_api/group"/>
-</component>
-<component name="plugin_bio_control_api" long-name="Plug-in Bio Control API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/plugin_bio_control_api/group"/>
-</component>
-<component name="mms_client_mtm_api" long-name="MMS Client MTM API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/mms_client_mtm_api/group"/>
-</component>
-<component name="open_new_message_notification_api" long-name="Open New Message Notification API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/open_new_message_notification_api/group"/>
-</component>
-<component name="messaging_editor_constants_api" long-name="Messaging Editor Constants API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/messaging_editor_constants_api/group"/>
-</component>
-</collection>
-<collection name="msg_plat" long-name="Messaging Apps Platform APIs" level="ui">
-<component name="smil_player_launch_api" long-name="SMIL Player Launch API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/smil_player_launch_api/group"/>
-</component>
-<component name="messaging_media_resolver_api" long-name="Messaging Media Resolver API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/messaging_media_resolver_api/group"/>
-</component>
-<component name="smil_engine_api" long-name="SMIL Engine API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/smil_engine_api/group"/>
-</component>
-<component name="mms_server_settings_api" long-name="MMS Server Settings API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_server_settings_api/group"/>
-</component>
-<component name="new_contacts_note_secondary_display_api" long-name="New Contacts Note Secondary Display API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contacts_note_secondary_display_api/group"/>
-</component>
-<component name="messaging_center_ui_utilities_api" long-name="Messaging Center UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/messaging_center_ui_utilities_api/group"/>
-</component>
-<component name="internet_mail_mtm_ui_api" long-name="Internet Mail MTM UI API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/internet_mail_mtm_ui_api/group"/>
-</component>
-<component name="messaging_editor_api" long-name="Messaging Editor API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/messaging_editor_api/group"/>
-</component>
-<component name="email_domain_utilities_api" long-name="Email Domain Utilities API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/email_domain_utilities_api/group"/>
-</component>
-<component name="smil_transition_api" long-name="SMIL Transition API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/smil_transition_api/group"/>
-</component>
-<component name="new_contacts_note_status_api" long-name="New Contacts Note Status API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contacts_note_status_api/group"/>
-</component>
-<component name="unified_editor_video_conversion_api" long-name="Unified Editor Video Conversion API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/unified_editor_video_conversion_api/group"/>
-</component>
-<component name="mms_conformance_api" long-name="MMS Conformance API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_conformance_api/group"/>
-</component>
-<component name="new_contacts_note_variables_api" long-name="New Contacts Note Variables API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contacts_note_variables_api/group"/>
-</component>
-<component name="new_message_notification_api" long-name="New Message Notification API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_message_notification_api/group"/>
-</component>
-<component name="mms_application_api" long-name="MMS Application API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_application_api/group"/>
-</component>
-<component name="mms_engine_settings_api" long-name="MMS Engine Settings API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_engine_settings_api/group"/>
-</component>
-<component name="mms_codec_client_api" long-name="MMS Codec Client API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_codec_client_api/group"/>
-</component>
-<component name="send_ui_meeting_request_api" long-name="Send UI Meeting Request API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/send_ui_meeting_request_api/group"/>
-</component>
-<component name="new_contact_notes_extended_api" long-name="New Contact Notes Extended API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contact_notes_extended_api/group"/>
-</component>
-<component name="mail_ui_constants_api" long-name="Mail UI Constants API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mail_ui_constants_api/group"/>
-</component>
-<component name="sim_dialog_launch_api" long-name="SIM Dialog Launch API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/sim_dialog_launch_api/group"/>
-</component>
-</collection>
-<collection name="mobilemessaging" long-name="Mobile Messaging" level="ui">
-<component name="audiomsg" filter="s60" long-name="Audio Message">
-<unit bldFile="app/messaging/mobilemessaging/audiomsg/group"/>
-</component>
-<component name="msgmedia" filter="s60" long-name="Message Media">
-<unit bldFile="app/messaging/mobilemessaging/msgmedia/group"/>
-</component>
-<component name="unieditor" filter="s60" long-name="Unified Editor">
-<unit bldFile="app/messaging/mobilemessaging/unieditor/group"/>
-</component>
-<component name="mmsui" filter="s60" long-name="MMS UI">
-<unit bldFile="app/messaging/mobilemessaging/mmsui/group"/>
-</component>
-<component name="postcard" filter="s60" long-name="Postcard">
-<unit bldFile="app/messaging/mobilemessaging/postcard/group"/>
-</component>
-<component name="smilui" filter="s60" long-name="SMIL UI">
-<unit bldFile="app/messaging/mobilemessaging/smilui/group"/>
-</component>
-<component name="smum" filter="s60" long-name="SMS UI MTM and UI Data MTM" plugin="Y">
-<unit bldFile="app/messaging/mobilemessaging/smum/group"/>
-</component>
-<component name="smsui" filter="s60" long-name="SMS UI">
-<unit bldFile="app/messaging/mobilemessaging/smsui/group"/>
-</component>
-<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/mobilemessaging/smsmtm/group" mrp="app/messaging/mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
-</component>
-</collection>
-<collection name="mmsengine" long-name="MMS Engine" level="eng">
-<component name="mmsconninit" filter="s60" long-name="MMS Connection Initiator" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsconninit/bld"/> -->
-</component>
-<component name="genutils" filter="s60" long-name="General Utils" class="placeholder">
-<!-- <unit bldFile="mmsengine/genutils/bld"/> -->
-</component>
-<component name="mmsserversettings" filter="s60" long-name="MMS Server Settings" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserversettings/bld"/> -->
-</component>
-<component name="mmsmessage" filter="s60" long-name="MMS Message" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsmessage/bld"/> -->
-</component>
-<component name="mmshttptransport" filter="s60" long-name="MMS HTTP Transport" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmshttptransport/bld"/> -->
-</component>
-<component name="mmscodec" filter="s60" long-name="MMS Codec" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodec/bld"/> -->
-</component>
-<component name="mmsserver" filter="s60" long-name="MMS Server" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserver/bld"/> -->
-</component>
-<component name="clientmtm" filter="s60" long-name="MMS Client MTM" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/clientmtm/bld"/> -->
-</component>
-<component name="mmswatcher" filter="s60" long-name="MMS Watcher" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmswatcher/bld"/> -->
-</component>
-<component name="mmspushhandler" filter="s60" long-name="MMS Push Handler" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmspushhandler/bld"/> -->
-</component>
-<component name="applicationadapter" filter="s60" long-name="MMS Application Adapter" class="placeholder">
-<!-- <unit bldFile="mmsengine/applicationadapter/bld"/> -->
-</component>
-<component name="mmscodecclient" filter="s60" long-name="MMS Codec Client" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodecclient/bld"/> -->
-</component>
-<component name="mmssettings" long-name="MMS Settings" introduced="9.2" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmssettings/group" mrp="app/messaging/mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
-</component>
-<component name="mmsconf" long-name="MMS Configuration" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmsconf" mrp="app/messaging/mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
-</component>
-<component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
-<!-- this bld.inf should be broken up into the individual other components -->
-<unit bldFile="app/messaging/mmsengine/group"/>
-</component>
-</collection>
-<collection name="messagingappbase" long-name="Messaging App Base" level="base">
-<component name="msgavkon" filter="s60" long-name="Messaging Avkon UI">
-<unit bldFile="app/messaging/messagingappbase/msgavkon/group"/>
-</component>
-<component name="mce" filter="s60" long-name="Message Center Application">
-<unit bldFile="app/messaging/messagingappbase/mce/group"/>
-</component>
-<component name="mceextraitems" filter="s60" long-name="Message Center Extra Items">
-<unit bldFile="app/messaging/messagingappbase/mceextraitems/group"/>
-</component>
-<component name="mcesettings" filter="s60" long-name="Message Center Settings">
-<unit bldFile="app/messaging/messagingappbase/mcesettings/group"/>
-</component>
-<component name="msgerrorwatcher" filter="s60" long-name="Messaging Error Watcher" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/msgerrorwatcher/group"/>
-</component>
-<component name="ncnlist" filter="s60" long-name="New Contacts Note List">
-<unit bldFile="app/messaging/messagingappbase/ncnlist/group"/>
-</component>
-<component name="schemeplugin" filter="s60" long-name="Scheme Handler Plugin" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/schemeplugin/group"/>
-</component>
-<component name="sendui" filter="s60" long-name="Send UI" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/sendui/group"/>
-</component>
-<component name="smilengine" filter="s60" long-name="SMIL Engine">
-<unit bldFile="app/messaging/messagingappbase/smilengine/group"/>
-</component>
-<component name="bium" filter="s60" long-name="BIO UI MTM" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/bium/group"/>
-</component>
-<component name="smartmessaging" filter="s60" long-name="Smart Messaging">
-<unit bldFile="app/messaging/messagingappbase/smartmessaging/group"/>
-</component>
-<component name="msgeditor" filter="s60" long-name="Messaging Editor">
-<unit bldFile="app/messaging/messagingappbase/msgeditor/group"/>
-</component>
-<component name="smilparser" long-name="SMIL Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="app/messaging/messagingappbase/smilparser/GROUP" mrp="app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
-</component>
-<component name="obexmtms" long-name="OBEX MTMs" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/obexmtms/Group" mrp="app/messaging/messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
-</component>
-</collection>
-<collection name="email" long-name="Email" level="mail">
-<!-- use commonemail instead -->
-<component name="alwaysonlineemailplugin" filter="s60" long-name="Always Online Mail Plugin" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/alwaysonlineemailplugin/group"/>
-</component>
-<component name="emailnotificationhandler" filter="s60" long-name="Email Notification Handler" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/emailnotificationhandler/group"/>
-</component>
-<component name="imum" filter="s60" long-name="Internet Mail UI MTM" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/imum/group"/>
-</component>
-<component name="mail" filter="s60" long-name="Mail Application" deprecated="^3">
-<unit bldFile="app/messaging/email/mail/group"/>
-</component>
-<component name="pop3andsmtpmtm" long-name="POP3 and SMTP MTM" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/pop3andsmtpmtm/group" mrp="app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
-</component>
-<component name="imap4mtm" long-name="IMAP4 MTM" introduced="9.2" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/imap4mtm/group" mrp="app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
-</component>
-</collection>
-<collection name="messaging_info" long-name="Messaging Apps Info" level="ui">
-<component name="messaging_metadata" long-name="Messaging Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commonemail" level="apps" span="2" long-name="Email Apps" levels="service support ui app">
-<collection name="email_pub" long-name="Email Apps Public Interfaces" level="app">
-<component name="email_widget_api" long-name="Email Widget API" filter="s60" class="api">
-<unit bldFile="app/commonemail/email_pub/email_widget_api/group"/>
-</component>
-</collection>
-<collection name="email_plat" long-name="Email Apps Platform Interfaces" level="app">
-<component name="email_client_api" long-name="Email Client API" filter="s60" class="api">
-<unit bldFile="app/commonemail/email_plat/email_client_api/group"/>
-</component>
-<component name="email_setup_plugin_api" long-name="Email Setup Plugin API" filter="s60" class="api">
-<unit bldFile="app/commonemail/email_plat/email_setup_plugin_api/group"/>
-</component>
-</collection>
-<collection name="emailservices" long-name="Email Services" level="service">
-<component name="emailframework" filter="s60" long-name="Email Framework" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailframework/group"/>
-</component>
-<component name="emailclientapi" filter="s60" long-name="Email Client API" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailclientapi/group"/>
-</component>
-<component name="emailserver" filter="s60" long-name="Email Server" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailserver/group"/>
-</component>
-<component name="emailservermonitor" filter="s60" long-name="Email Server Monitor" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailservermonitor/group"/>
-</component>
-<component name="psmruadapter" filter="s60" long-name="Predictive Search Most Recent Used Adapter" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailservices/psmruadapter/group"/>
-</component>
-<component name="emailstore" filter="s60" long-name="Email Store" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailstore/group"/>
-</component>
-<component name="emaildebug" filter="s60" long-name="Email Debug" introduced="^2" class="api">
-<unit bldFile="app/commonemail/emailservices/emaildebug/group"/>
-</component>
-<component name="emailinstallationinitiator" filter="s60" long-name="Email Installation Initiator" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailinstallationinitiator/group"/>
-</component>
-</collection>
-<collection name="ipsservices" long-name="IMAP/POP/SMTP Services" level="service">
-<component name="ipssossettings" filter="s60" long-name="IPS SOS Settings" introduced="^2">
-<!-- SOS? Consider spelling it out since the abbreviation is ambiguous -->
-<unit bldFile="app/commonemail/ipsservices/ipssossettings/group"/>
-</component>
-<component name="ipssosplugin" filter="s60" long-name="IPS SOS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/ipsservices/ipssosplugin/group"/>
-</component>
-<component name="ipssosaoplugin" filter="s60" long-name="IPS SOS Always Online Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/ipsservices/ipssosaoplugin/group"/>
-</component>
-<component name="ipsservices_build" filter="s60" long-name="IPS Services Build" introduced="^2">
-<unit bldFile="app/commonemail/ipsservices/group"/>
-<!-- can the exports be broken up into the other components or made a config component?-->
-</component>
-</collection>
-<collection name="emailcontacts" long-name="Email Contacts" level="support">
-<component name="contactactionservice" filter="s60" long-name="Contact Action Service" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailcontacts/contactactionservice/group"/>
-</component>
-<component name="contactactionmenu" filter="s60" long-name="Contact Action Menu" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailcontacts/contactactionmenu/group"/>
-</component>
-</collection>
-<collection name="meetingrequest" long-name="Meeting Request" level="ui">
-<component name="mrcommon" filter="s60" long-name="MR Common" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrcommon/group"/>
-</component>
-<component name="mrdb" filter="s60" long-name="MR Database" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrdb/group"/>
-</component>
-<component name="mrpolicy" filter="s60" long-name="MR Policy" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrpolicy/group"/>
-</component>
-<component name="mrservices" filter="s60" long-name="MR Services" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrservices/group"/>
-</component>
-<component name="mrgui" filter="s60" long-name="MR GUI" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrgui/group"/>
-</component>
-<component name="mrentry" filter="s60" long-name="MR Entry" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrentry/group"/>
-</component>
-<component name="mrtasks" filter="s60" long-name="MR Tasks" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrtasks/group"/>
-</component>
-<component name="mrutils" filter="s60" long-name="MR Utils" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrutils/group"/>
-</component>
-<component name="mrutilscalplugin" filter="s60" long-name="MR Utils Calendar Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mrutilscalplugin/group"/>
-</component>
-<component name="mrviewer" filter="s60" long-name="MR Viewer" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrviewer/group"/>
-</component>
-<component name="mrviewercalplugin" filter="s60" long-name="MR Viewer Calendar Plugin" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrviewercalplugin/group"/>
-</component>
-<component name="mricalviewer" filter="s60" long-name="MR iCal Viewer" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mricalviewer/group"/>
-</component>
-<component name="mrversit2" filter="s60" long-name="MR Versit2" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrversit2/group"/>
-</component>
-<component name="mragnversit2" filter="s60" long-name="MR Agenda Versit2" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mragnversit2/group"/>
-</component>
-<component name="mrcasplugin" filter="s60" long-name="MR Contact Action Service Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mrcasplugin/group"/>
-</component>
-<component name="mrurlparserplugin" filter="s60" long-name="MR URL Parser Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mrurlparserplugin/group"/>
-</component>
-<component name="meetingrequest_build" filter="s60" long-name="MR Build" introduced="^2">
-<!-- can the exports be broken up into the other components ?
- alternatively, move the exports into a RM Config component-->
-<unit bldFile="app/commonemail/meetingrequest/group"/>
-</component>
-</collection>
-<collection name="emailuis" long-name="Email UIs" level="app">
-<component name="emailui" filter="s60" long-name="Email UI" introduced="^2">
-<unit bldFile="app/commonemail/emailuis/emailui/group"/>
-</component>
-<component name="gsemailsettings" filter="s60" long-name="Email GS Settings" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailuis/gsemailsettings/group"/>
-</component>
-<component name="uicomponents" filter="s60" long-name="Email UI Components" introduced="^2">
-<unit bldFile="app/commonemail/emailuis/uicomponents/group"/>
-</component>
-<component name="widget" filter="s60" long-name="Email Widget" introduced="^2">
-<!-- Uncomment unit when configuration is in place. Currently #included from emailuis_build, which should be removed at the same time. -->
-<!--<unit bldFile="emailuis/widget/group"/>-->
-</component>
-<component name="emailuis_build" filter="s60" long-name="Email UIs Build" introduced="^2">
-<unit bldFile="app/commonemail/emailuis/group"/>
-</component>
-</collection>
-<collection name="commonemail_info" long-name="Email Apps Info" level="app">
-<component name="emailhelp" filter="s60" long-name="Email Help" class="placeholder">
-<!-- should this be commented out or not? -->
-<!-- <unit bldFile="emailhelp/group"/> -->
-</component>
-<component name="commonemail_help" filter="s60" long-name="Email Help" introduced="^2" class="placeholder">
-<!-- should this be commented out or not? -->
-<!-- <unit bldFile="help/group"/> -->
-</component>
-</collection>
-</block>
-<block name="conversations" level="apps" long-name="Conversation Apps" levels="settings utils plugin ui">
-<collection name="conversations_plat" long-name="Conversation Apps Platform Interfaces" level="ui">
-<component name="im_cv_launcher_api" long-name="IM CV Launcher API" filter="s60" class="api">
-<unit bldFile="app/conversations/conversations_plat/im_cv_launcher_api/group"/>
-</component>
-<component name="im_connection_api" long-name="IM Connection API" filter="s60" class="api">
-<unit bldFile="app/conversations/conversations_plat/im_connection_api/group"/>
-</component>
-<component name="im_cv_appui_api" long-name="IM CV App UI API" filter="s60" class="api">
-<unit bldFile="app/conversations/conversations_plat/im_cv_appui_api/group"/>
-</component>
-</collection>
-<collection name="uiservicetabsettings" long-name="UI Service Tab Settings" level="settings">
-<!-- this is really at the wrong rank. should move down a directory -->
-<component name="vimpstsettings" filter="s60" long-name="VIMP Service Tab Settings">
-<unit bldFile="app/conversations/uiservicetabsettings/group"/>
-</component>
-</collection>
-<collection name="instantmessagesalert" long-name="Instant Messages Alert" level="utils">
-<!-- this is really at the wrong rank. should move down a directory -->
-<component name="instantmessagesalert_build" filter="s60" long-name="Instant Messages Alert build" introduced="^3">
-<unit bldFile="app/conversations/instantmessagesalert/group"/>
-</component>
-</collection>
-<collection name="imstutils" long-name="IM Service Tab Utils" level="utils">
-<component name="imstutils_help" filter="s60" long-name="IM Service Tab Help">
-<unit bldFile="app/conversations/imstutils/help/group"/>
-</component>
-<component name="imconnectionprovider" filter="s60" long-name="IM Connection Provider" plugin="Y">
-<unit bldFile="app/conversations/imstutils/imconnectionprovider/group"/>
-</component>
-<component name="xmppadapter" filter="s60" long-name="XMPP Settings Adapter" plugin="Y">
-<unit bldFile="app/conversations/imstutils/xmppadapter/group"/>
-</component>
-<component name="imconversationview" filter="s60" long-name="IM Conversation View">
-<unit bldFile="app/conversations/imstutils/imconversationview/group"/>
-</component>
-<component name="imstutils_config" filter="s60" long-name="IM Service Tab Utils config" class="config">
-<!-- remove the #includes and or moved ithe loc file into one the above components -->
-<unit bldFile="app/conversations/imstutils/group"/>
-</component>
-</collection>
-<collection name="uiservicetab" long-name="UI Service Tab" level="ui">
-<component name="vimpstutils" filter="s60" long-name="VIMP Service Tab Utilities">
-<!-- need to spell out VIMP at least once -->
-<unit bldFile="app/conversations/uiservicetab/vimpstutils/group"/>
-</component>
-<component name="vimpststorage" filter="s60" long-name="VIMP Service Tab Storage">
-<unit bldFile="app/conversations/uiservicetab/vimpststorage/group"/>
-</component>
-<component name="vimpstengine" filter="s60" long-name="VIMP Service Tab Engine">
-<unit bldFile="app/conversations/uiservicetab/vimpstengine/group"/>
-</component>
-<component name="vimpstcmdprocess" filter="s60" long-name="VIMP Service Tab Command Process">
-<unit bldFile="app/conversations/uiservicetab/vimpstcmdprocess/group"/>
-</component>
-<component name="vimpstui" filter="s60" long-name="VIMP Service Tab UI">
-<unit bldFile="app/conversations/uiservicetab/vimpstui/group"/>
-</component>
-<component name="vimpstdetailsviewplugin" filter="s60" long-name="VIMP ST Details View Plugin" plugin="Y">
-<unit bldFile="app/conversations/uiservicetab/vimpstdetailsviewplugin/group"/>
-</component>
-<component name="uiservicetab_build" filter="s60" long-name="UI Service Tab Build">
-<!-- can this be distributed into the above bld.infs? -->
-<unit bldFile="app/conversations/uiservicetab/group"/>
-</component>
-</collection>
-<collection name="servicewidget" long-name="Service Widget" level="ui">
-<component name="servicewidgetdatapublisher" filter="s60" long-name="Service Widget Data Publisher" plugin="Y">
-<unit bldFile="app/conversations/servicewidget/servicewidgetdatapublisher/group"/>
-</component>
-<component name="themes" filter="s60" long-name="Service Widget Themes" class="config">
-<!-- does this really need to have that number in the directory name? -->
-<unit bldFile="app/conversations/servicewidget/themes/install-themes/install/servicewidget_20021383/group"/>
-</component>
-<component name="servicewidget_build" filter="s60" long-name="Service Widget Build">
-<!-- Either move the whole collection down one directory into a single component, or move the ROM and SIS parts into a Service Widget ROM component -->
-<unit bldFile="app/conversations/servicewidget/group"/>
-</component>
-</collection>
-<collection name="instantmsgindicatorplugin" long-name="Instant Message Indicator Plugin" level="plugin">
-<!-- collection is really a component. should move down a directory -->
-<component name="instantmsgindicatorplugin_build" filter="s60" long-name="Instant Message Indicator Plugin Build" introduced="^3" plugin="Y">
-<unit bldFile="app/conversations/instantmsgindicatorplugin/group"/>
-</component>
-</collection>
-<collection name="imstatuspaneindicatorplugin" long-name="IM Status Pane Indicator Plugin" level="plugin">
-<!-- collection is really a component. should move down a directory -->
-<component name="imstatuspaneindicatorplugin_build" filter="s60" long-name="IM Status Pane Indicator Plugin Build" introduced="^3" plugin="Y">
-<unit bldFile="app/conversations/imstatuspaneindicatorplugin/group"/>
-</component>
-</collection>
-<collection name="conversations_info" long-name="Conversation Apps Info" level="ui">
-<component name="conversations_build" filter="s60" long-name="Conversation Apps Build">
-<!-- can the exports be moved to other components? or this remade into a configuration component?-->
-<unit bldFile="app/conversations/group"/>
-</component>
-</collection>
-</block>
-<block name="im" level="apps" long-name="Instant Messaging Apps" levels="support prot engine apps">
-<collection name="im_plat" long-name="Instant Messaging Apps Platform Interfaces" level="apps">
-<component name="wv_sap_settings_api" long-name="WV SAP Settings API" filter="s60" class="api">
-<unit bldFile="app/im/im_plat/wv_sap_settings_api/group"/>
-</component>
-</collection>
-<collection name="wvsettings20" long-name="Wireless Village Settings Engine" level="support">
-<!-- this is really a component. should move down a directory -->
-<component name="wvsapsettingsstore" long-name="WV SAP Settings Store" filter="s60" introduced="9.3">
-<unit bldFile="app/im/wvsettings20/group"/>
-</component>
-</collection>
-</block>
-<block name="dictionary" level="services" long-name="Dictionary" levels="utils ui">
-<collection name="dictionary_plat" long-name="Dictionary Platform Interfaces" level="ui">
-<component name="menu_suites_macros_api" long-name="Menu Suites Macros API" filter="s60" class="api">
-<unit bldFile="app/dictionary/dictionary_plat/menu_suites_macros_api/group"/>
-</component>
-</collection>
-<collection name="userdict" long-name="User Dictionary" level="ui">
-<!-- collection is really a component, move down a dir -->
-<component name="userdict_build" filter="s60" long-name="Japanese User Dictionary">
-<unit bldFile="app/dictionary/userdict/group"/>
-</component>
-</collection>
-</block>
-<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"/>
-</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"/>
-</component>
-</collection>
-<collection name="camerauis" long-name="Camera UIs">
-<component name="activepalette" filter="s60" long-name="Active Palette">
-<unit bldFile="app/camera/camerauis/activepalette/group"/>
-</component>
-<component name="cameraapp" filter="s60" long-name="Camera Application">
-<unit bldFile="app/camera/camerauis/cameraapp/group"/>
-<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">
-<component name="image_editor_debug_utilities_api" long-name="Image Editor Debug Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
-</component>
-<component name="image_editor_utilities_api" long-name="Image Editor Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_utilities_api/group"/>
-</component>
-<component name="image_editor_definitions_api" long-name="Image Editor Definitions API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_definitions_api/group"/>
-</component>
-<component name="image_editor_system_parameters_api" long-name="Image Editor System Parameters API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_system_parameters_api/group"/>
-</component>
-<component name="image_processing_engine_api" long-name="Image Processing Engine API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_processing_engine_api/group"/>
-</component>
-</collection>
-<collection name="imageeditor" long-name="Image Editor UI" level="ui">
-<component name="pb" filter="s60" long-name="Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/pb/group"/>
-</component>
-<component name="iepb" filter="s60" long-name="Image Editor Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/iepb/group"/>
-</component>
-<component name="imageeditorui" filter="s60" long-name="Image Editor UI">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorui/group"/>
-</component>
-<component name="imageeditormanager" filter="s60" long-name="Image Editor Manager">
-<unit bldFile="app/imgeditor/imageeditor/imageeditormanager/group"/>
-</component>
-<component name="imageeditorapp" filter="s60" long-name="Image Editor Application">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorapp/group"/>
-</component>
-<component name="imageeditor_plugins" filter="s60" long-name="Image Editor Plugins" plugin="Y">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditor/plugins/blackwhiteplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/brightnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/bubbleplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cartoonizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/clipartplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/contrastplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cropplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/drawplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/frameplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/negativeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/redeyeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/resizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotatelplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotaterplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/textplugin/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditor/plugins/drawplugin/group"/>
- -->
-</component>
-<component name="editorprovider" filter="s60" long-name="Image Editor Provider">
-<unit bldFile="app/imgeditor/imageeditor/editorprovider/group"/>
-</component>
-<component name="imageeditor_build" filter="s60" long-name="Image Editor Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditor/group"/>
-</component>
-</collection>
-<collection name="imageeditorengine" long-name="Image Editor Engine" level="engine">
-<component name="filters" filter="s60" long-name="Image Editor Filters">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbrightness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbubble/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbuffer/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercartoon/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterclipart/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercontrast/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercrop/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterdraw/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterframe/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtergrayscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtericlsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegtarget/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filternegate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterredeye/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterrotate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtertext/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
- -->
-</component>
-<component name="imageeditorutils" filter="s60" long-name="Image Editor Utilities">
-<unit bldFile="app/imgeditor/imageeditorengine/imageeditorutils/group"/>
-</component>
-<component name="systemparameters" filter="s60" long-name="System Parameters">
-<unit bldFile="app/imgeditor/imageeditorengine/systemparameters/group"/>
-</component>
-<component name="enginewrapper" filter="s60" long-name="Image Editor Engine Wrapper">
-<unit bldFile="app/imgeditor/imageeditorengine/enginewrapper/group"/>
-</component>
-<component name="imageeditorengine_build" filter="s60" long-name="Image Editor Engine Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoeditor" level="apps" long-name="Video Editor Apps" levels="engine ui">
-<collection name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" level="ui">
-<component name="video_editor_engine_api" long-name="Video Editor Engine API" introduced="^2" class="api">
-<unit bldFile="app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
-</component>
-</collection>
-<collection name="videditor" long-name="Video Editor" level="ui">
-<component name="videoeditorcommon" filter="s60" long-name="Video Editor Common" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditorcommon/group"/>
-</component>
-<component name="videoeditoruicomponents" filter="s60" long-name="Video Editor UI Components" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditoruicomponents/group"/>
-</component>
-<component name="simplevideoeditor" filter="s60" long-name="Simple Video Editor" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplevideoeditor/group"/>
-</component>
-<component name="simplecutvideo" filter="s60" long-name="Simple Cut Video" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplecutvideo/group"/>
-</component>
-<component name="videoprovider" filter="s60" long-name="Video Provider" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoprovider/group"/>
-</component>
-<component name="manualvideoeditor" filter="s60" long-name="Manual Video Editor" introduced="^2" class="placeholder">
-<!-- uncomment when supported
- <meta rel="config">
- <defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
- </meta>
- <unit bldFile="videditor/manualvideoeditor/group"/> -->
-</component>
-<component name="videditor_build" filter="s60" long-name="Video Editor Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videditor/group"/>
-</component>
-</collection>
-<collection name="videoeditorengine" long-name="Video Editor Engine" level="engine">
-<component name="audioeditorengine" filter="s60" long-name="Audio Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/audioeditorengine/group"/>
-</component>
-<component name="avcedit" filter="s60" long-name="AVC Editing" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/avcedit/group"/>
-</component>
-<component name="h263decoder" filter="s60" long-name="H.263 Decoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/h263decoder/group"/>
-</component>
-<component name="mp3aacmaniplib" filter="s60" long-name="MP3 and AAC Manipulation Library" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
-</component>
-<component name="vedtranscoder" filter="s60" long-name="Video Editor Transcoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedtranscoder/group"/>
-</component>
-<component name="vedengine" filter="s60" long-name="Video Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedengine/group"/>
-</component>
-<component name="videoeditorengine_build" filter="s60" long-name="Video Editor Engine Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videoeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
-<collection name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" level="apps">
-<component name="videoplayer_startup_api" long-name="Video Player Startup API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videoplayer_startup_api/group" filter="!test"/>
-</component>
-<component name="video_player_file_details_dialog_api" long-name="Media Player File Details Dialog API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/video_player_file_details_dialog_api/group" filter="!test"/>
-</component>
-<component name="videocollection_api" long-name="Video Collection API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videocollection_api/group"/>
-</component>
-</collection>
-<collection name="videofeeds" long-name="Video Feeds" level="util">
-<component name="iptv_utils" filter="s60" long-name="IPTV Util" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/utils/group"/>
-</component>
-<component name="viewmessageutility" filter="s60" long-name="View Message Utility" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/viewmessageutility/group"/>
-</component>
-<component name="vcxnotifier" filter="s60" long-name="Video Connection Notifier" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/vcxnotifier/group"/>
-</component>
-<component name="vccommon" filter="s60" long-name="Video Connection Common" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/vccommon/group"/>
-</component>
-<component name="clientapi" long-name="Server Client" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/clientapi/group"/>
-</component>
-<component name="provisioningprocessor" long-name="Provisioning Processor" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/provisioningprocessor/group"/>
-</component>
-<component name="mrssplugin" long-name="RSS plugin" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/mrssplugin/group"/>
-</component>
-<component name="videofeeds_server" long-name="Server" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/server/group"/>
-</component>
-<component name="livetvutils" long-name="LiveTV Utils" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/livetvutils/group"/>
-</component>
-<component name="iptvprovisioningrecognizer" long-name="IP TV Provisioning Recognizer" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/provisioningrecognizer/group"/>
-</component>
-<component name="iptvprovisioningappui" long-name="IP TV Provisioning App UI" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/provisioningappui/group"/>
-</component>
-<component name="iptvomaprovisioning" long-name="IP TV OMA Provisioning" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/omaprovisioning/group"/>
-</component>
-<component name="vcnsuiengine" long-name="VoD UI Engine" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/vcnsuiengine/group"/>
-</component>
-<component name="hgvodui" long-name="Ganes UX2.0 VoD UI" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/hgvodui/group"/>
-</component>
-<component name="hgvodplugin" long-name="Ganes UX2.0 VoD UI Plugin" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/hgvodplugin/group"/>
-</component>
-<component name="vcnsscheduleview" long-name="Scheduled Download Settings View" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/vcnsscheduleview/group"/>
-</component>
-<component name="vcnsscheduleplugin" long-name="Scheduled Download Settings Plugin" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/vcnsscheduleplugin/group"/>
-</component>
-<component name="scheduleddlplugin" long-name="Scheduled download plugin" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/scheduleddlplugin/group"/>
-</component>
-</collection>
-<collection name="videocollection" long-name="Video Collection" level="util">
-<component name="mpxmyvideoscollection" filter="s60" long-name="MPX My Videos Collection" introduced="^3">
-<unit bldFile="app/videoplayer/videocollection/mpxmyvideoscollection/group"/>
-</component>
-<component name="myvideosindicatorplugin" filter="s60" long-name="My Videos Indicator Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videocollection/myvideosindicatorplugin/group"/>
-</component>
-<component name="hgmyvideos" filter="s60" long-name="Huriganes My Videos" introduced="^3">
-<unit bldFile="app/videoplayer/videocollection/hgmyvideos/group"/>
-</component>
-<component name="hgmyvideosplugin" filter="s60" long-name="Huriganes My VideosPlugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videocollection/hgmyvideosplugin/group"/>
-</component>
-</collection>
-<collection name="mediasettings" long-name="Media Settings" level="support">
-<!-- this is really a component. Should be moved down a directory -->
-<component name="mediasettings_build" filter="s60" long-name="Media Settings Build">
-<unit bldFile="app/videoplayer/mediasettings/group"/>
-</component>
-<component name="videoplayer_test" filter="s60" purpose="development" long-name="Video Player Apps Test">
-<!-- can only have one unit. Can thes be #included from the above or another bld.inf?-->
-<unit bldFile="app/videoplayer/tsrc/VCXTestCommon/group"/>
-<unit bldFile="app/videoplayer/tsrc/VCXTestUtilModule/group"/>
-<unit bldFile="app/videoplayer/tsrc/VCXTestMyVideosCollectionClient/group"/>
-<unit bldFile="app/videoplayer/mediasettings/mediasettingsengine/tsrc/mediasettingsenginetest/group"/>
-<unit bldFile="app/videoplayer/mediasettings/videoplayersettingsengine/tsrc/vpsettingsenginetest/group"/>
-</component>
-</collection>
-<collection name="filedetails" long-name="File Details" level="support">
-<component name="filedetailsplugin" filter="s60" long-name="File Details Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/filedetails/filedetailsplugin/group"/>
-</component>
-<component name="filedetailsdialog" filter="s60" long-name="File Details Dialog" introduced="^3">
-<unit bldFile="app/videoplayer/filedetails/filedetailsdialog/group"/>
-</component>
-</collection>
-<collection name="videoplayerapp" long-name="Video Player App" level="apps">
-<component name="lwplayer" long-name="Lightweight Player" filter="s60">
-<unit bldFile="app/videoplayer/videoplayerapp/lwplayer/group"/>
-</component>
-<component name="mpxvideoplayer" filter="s60" long-name="MPX Video Player" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayerapp/mpxvideoplayer/group" filter="!test"/>
-</component>
-</collection>
-<collection name="videoplayback" long-name="Video Playback Plugins" level="plugin">
-<component name="videohelix" long-name="Video Helix" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videohelix/group" filter="!test"/>
-</component>
-<component name="videopdlplaybackviewplugin" filter="s60" long-name="Video PDL Playback View Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videopdlplaybackviewplugin/group" filter="!test"/>
-</component>
-<component name="videoplaybackcontrols" filter="s60" long-name="Video Playback Controls" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videoplaybackcontrols/group" filter="!test"/>
-</component>
-<component name="videoplaybackviewplugin" filter="s60" long-name="Video Playback View Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videoplaybackviewplugin/group"/>
-</component>
-<component name="videoplaybackviews" filter="s60" long-name="Video Playback Views" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videoplaybackviews/group" filter="!test"/>
-</component>
-</collection>
-</block>
-<block name="photos" level="apps" long-name="Photos" levels="support fw ui app">
-<collection name="photos_plat" long-name="Photos Platform Interfaces" level="app">
-<component name="collection_plugins_api" long-name="Collection Plugins API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/collection_plugins_api/group"/>
-</component>
-<component name="controllers_collection_api" long-name="Controllers Collection API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/controllers_collection_api/group"/>
-</component>
-<component name="gallery_utilities_api" long-name="Gallery Utilities API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/gallery_utilities_api/group"/>
-</component>
-<component name="slideshow_ui_constants_api" long-name="Slideshow Ui Constants API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/slideshow_ui_constants_api/group"/>
-</component>
-<component name="views_metadatadialog_api" long-name="Views Metadata Dialog API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/views_metadatadialog_api/group"/>
-</component>
-</collection>
-<collection name="photosgallery" long-name="Photos Gallery" level="app">
-<!-- consider splitting this collection into the application itself, and the frameworks behind it -->
-<component name="photosgallery_help" filter="s60" long-name="Photos Help" introduced="^2">
-<unit bldFile="app/photos/photosgallery/help/group"/>
-</component>
-<component name="logging" filter="s60" long-name="Photos Logging" introduced="^2">
-<unit bldFile="app/photos/photosgallery/logging/group"/>
-</component>
-<component name="photosgallery_common" filter="s60" long-name="Photos Common" introduced="^2">
-<unit bldFile="app/photos/photosgallery/common/group"/>
-</component>
-<component name="photosgallery_commonui" filter="s60" long-name="Photos Common UI" introduced="^2">
-<unit bldFile="app/photos/photosgallery/commonui/group"/>
-</component>
-<component name="photosgalleryollectionfw" filter="s60" long-name="Photos Collection Framework" introduced="^2">
-<unit bldFile="app/photos/photosgallery/collectionframework/group"/>
-</component>
-<component name="galleryicons" filter="s60" long-name="Photos Icons" introduced="^2" class="config">
-<unit bldFile="app/photos/photosgallery/icons"/>
-</component>
-<component name="imageviewer" filter="s60" long-name="Image Viewer" introduced="^3">
-<!-- this is really a part of controllers component, #include from there instead -->
-<unit bldFile="app/photos/photosgallery/controllers/imageviewer/group"/>
-</component>
-<component name="photosgalleryviewfw" filter="s60" long-name="View Framework" introduced="^2">
-<unit bldFile="app/photos/photosgallery/viewframework/group"/>
-</component>
-<component name="controllers" filter="s60" long-name="Photos Controllers" introduced="^2">
-<unit bldFile="app/photos/photosgallery/controllers/group"/>
-</component>
-<component name="photogallery" filter="s60" long-name="Media Gallery" introduced="^2">
-<unit bldFile="app/photos/photosgallery/gallery/group"/>
-</component>
-<component name="slideshow" filter="s60" long-name="Slideshow" introduced="^2">
-<unit bldFile="app/photos/photosgallery/slideshow/group"/>
-</component>
-<component name="memoryplugin" long-name="Memory Plugin" filter="s60" introduced="^2" plugin="Y">
-<unit bldFile="app/photos/photosgallery/memoryplugin/group"/>
-</component>
-<component name="imgvwr" filter="s60" long-name="Photos Image Viewer" introduced="^3">
-<unit bldFile="app/photos/photosgallery/imgvwr/group"/>
-</component>
-<component name="photosgallery_build" filter="s60" long-name="Photos Gallery Build" introduced="^2">
-<!-- need to remove the #included above bld.infs from this -->
-<unit bldFile="app/photos/photosgallery/group"/>
-</component>
-</collection>
-</block>
-<block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support hs app">
-<collection name="musicplayer_plat" long-name="Music Player Apps Platform Interfaces" level="app">
-<component name="mpx_music_player_app_api" long-name="MPX Music Player App API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_app_api/group"/>
-</component>
-<component name="mpx_music_player_commonui_api" long-name="MPX Music Player Common UI API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_commonui_api/group"/>
-</component>
-<component name="mpx_music_player_media_key_handler_api" long-name="MPX Music Player Media Key Handler API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_media_key_handler_api/group"/>
-</component>
-<component name="mpx_music_player_remote_control_api" long-name="MPX Music Player Remote Control API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_remote_control_api/group"/>
-</component>
-<component name="mpx_music_shop_ui_api" long-name="MPX Music Shop UI API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_shop_ui_api/group"/>
-</component>
-<component name="mpx_music_wap_adapter_cenrep_api" long-name="MPX Music Wap Adapter CenRep API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_wap_adapter_cenrep_api/group"/>
-</component>
-<component name="mpx_music_store_api" long-name="MPX Music Store Find API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_store_api/group"/>
-</component>
-<component name="audio_application_features_api" long-name="Audio Application Features API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/audio_application_features_api/group"/>
-</component>
-<component name="music_content_publisher_plugin_api" long-name="Music Content Publisher Plugin API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/music_content_publisher_plugin_api/group"/>
-</component>
-</collection>
-<collection name="mpxmusicplayer" long-name="MPX Music Player" level="app">
-<component name="mpxmusicplayer_help" filter="s60" long-name="Help">
-<unit bldFile="app/musicplayer/mpxmusicplayer/help/group"/>
-</component>
-<component name="mpxmusicplayer_commonui" filter="s60" long-name="MPX Common UI">
-<unit bldFile="app/musicplayer/mpxmusicplayer/commonui/group"/>
-</component>
-<component name="mpx_metadatahandler" filter="s60" long-name="MPX Metadata Handler">
-<unit bldFile="app/musicplayer/mpxmusicplayer/metadatahandler/group"/>
-</component>
-<component name="mediakeyhandler" filter="s60" long-name="MPX Media Key Handler">
-<unit bldFile="app/musicplayer/mpxmusicplayer/mediakeyhandler/group"/>
-</component>
-<component name="mpxmusicplayer_app" filter="s60" long-name="MPX Application">
-<unit bldFile="app/musicplayer/mpxmusicplayer/app/group"/>
-</component>
-<component name="mpxmusicplayer_build" filter="s60" long-name="MPX Music Player Build">
-<!-- can the exports be distributed to the above components? -->
-<unit bldFile="app/musicplayer/mpxmusicplayer/group"/>
-</component>
-</collection>
-<collection name="musichomescreen_multiview" long-name="Music Home Screen Multiview" level="hs">
-<!-- Uncomment all units when configuration is in place. All currently #included from musichomescreen_build -->
-<component name="mpxcollectionpublisher" filter="s60" long-name="MPX Collection Publisher" introduced="^2" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/mpxcollectionpublisher/group"/>-->
-</component>
-<component name="musiccontentpublisher" filter="s60" long-name="Music Content Publisher" introduced="^2" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/musiccontentpublisher/group"/>-->
-</component>
-<component name="mcpmusicplayer" filter="s60" long-name="Music Player MCP Plugin" introduced="^2" plugin="Y" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/mcpmusicplayer/group"/>-->
-</component>
-<component name="musicplayeractionhandlerplugin" filter="s60" long-name="Music Player Action Handler Plugin" introduced="^2" plugin="Y" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/musicplayeractionhandlerplugin/group"/>-->
-</component>
-<component name="mpx_data" filter="s60" long-name="MPX Data" introduced="^2" class="placeholder">
-<!-- does this make sense to be a component? should it just be #include from musichomescreen_multiview/group? -->
-<!--<unit bldFile="musichomescreen_multiview/data/themes/default/group"/>-->
-</component>
-<component name="musichomescreen_build" filter="s60" long-name="Music Homescreen Multiview Build" introduced="^2">
-<unit bldFile="app/musicplayer/musichomescreen_multiview/group"/>
-</component>
-</collection>
-<collection name="mpxplugins" long-name="MPX Plugins" level="plugins">
-<component name="serviceplugins" filter="s60" long-name="MPX Service Plugins" plugin="Y">
-<unit bldFile="app/musicplayer/mpxplugins/serviceplugins/group"/>
-</component>
-<component name="viewplugins" filter="s60" long-name="MPX View Plugins" plugin="Y">
-<unit bldFile="app/musicplayer/mpxplugins/viewplugins/group"/>
-</component>
-<component name="mpxplugins_build" filter="s60" long-name="MPX Plugins Build">
-<!-- can the exports be distributed to the above components? -->
-<unit bldFile="app/musicplayer/mpxplugins/group"/>
-</component>
-</collection>
-<collection name="musicplayer_info" long-name="Music Player Apps Info" level="app">
-<component name="musicplayer_build" filter="s60" long-name="Music Player Build">
-<!-- should explicitly #inlcude musicplayerbldvariant.hrh in each component -->
-<unit bldFile="app/musicplayer/group"/>
-</component>
-</collection>
-</block>
-<block name="radio" level="apps" long-name="Radio Apps" levels="engine ui">
-<collection name="fmradio" long-name="FM Radio" level="ui">
-<component name="activeidleengine" filter="s60" long-name="FM Radio Active Idle Engine">
-<unit bldFile="app/radio/fmradio/activeidleengine/group"/>
-</component>
-<component name="fmradioengine" filter="s60" long-name="FM Radio Engine">
-<unit bldFile="app/radio/fmradio/fmradioengine/group"/>
-</component>
-<component name="fmradioactionhandler" filter="s60" long-name="FM Radio Action Handler" plugin="Y">
-<unit bldFile="app/radio/fmradio/fmradioactionhandler/group"/>
-</component>
-<component name="fmradiomcpplugin" filter="s60" long-name="FM Radio Content Publisher Plugin" plugin="Y">
-<unit bldFile="app/radio/fmradio/fmradiomcpplugin/group"/>
-</component>
-<component name="fmradio_build" filter="s60" long-name="FM Radio Build">
-<unit bldFile="app/radio/fmradio/fmradio/group"/>
-</component>
-<component name="fmradio_help" filter="s60" long-name="FM Radio Help">
-<unit bldFile="app/radio/fmradio/help/group"/>
-</component>
-<component name="fmradio_build" filter="s60" long-name="FM Radio ROM">
-<!-- remove above #included bld.infs -->
-<unit bldFile="app/radio/fmradio/group"/>
-</component>
-</collection>
-</block>
-<block name="internetradio" level="apps" long-name="Internet Radio Apps"/>
-<block name="tv" level="services" long-name="TV Apps"/>
-<block name="voicerec" level="apps" long-name="Voice Recorder Apps">
-<!-- custom filter pref_test-->
-<collection name="voicerec_plat" long-name="Voice Recorder Apps Platform Interfaces">
-<component name="new_file_service_api" long-name="New File Service API" filter="s60" class="api">
-<unit bldFile="app/voicerec/voicerec_plat/new_file_service_api/group"/>
-</component>
-<component name="voicerecorder_public_constants_api" long-name="Voice Recorder Public Constants API" filter="s60" class="api">
-<unit bldFile="app/voicerec/voicerec_plat/voicerecorder_public_constants_api/group"/>
-</component>
-</collection>
-<collection name="voicerecorder" long-name="Voice Recorder">
-<!--this is really a component, move down a directory -->
-<component name="voicerecorder_build" filter="s60" long-name="Voice Recorder Build">
-<unit bldFile="app/voicerec/voicerecorder/group"/>
-</component>
-</collection>
-<collection name="voicerec_info" long-name="Voice Recorder Apps Info"/>
-</block>
-<block name="screensaver" level="apps" long-name="Screen Saver Apps" levels="plugin ui">
-<!-- is this a user-facing application or a daemon? -->
-<!-- units need to be commented out until configuration is in place. They are currently #included from screensaver_build-->
-<collection name="scrsaver" long-name="Screen Saver" level="plugin">
-<component name="scrsaverplugins" filter="s60" long-name="Screen Saver Plugins" plugin="Y">
-<!-- must have only one component. #include from a common bld.inf, or move up a directory and make scrsaverplugins a collection -->
-<!--<unit bldFile="scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/"/>
- <unit bldFile="scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/group/"/>-->
-</component>
-<component name="scrsaver_slideshowplugin" filter="s60" long-name="Screen Saver Slideshow Plugin" plugin="Y">
-<!--<unit bldFile="scrsaver/scrsaverplugins/SlideshowPlugin/group"/> -->
-</component>
-<component name="screensaveraiwplugin" filter="s60" long-name="Screen Saver AIW Plugin" plugin="Y">
-<!-- <unit bldFile="scrsaver/screensaveraiwplugin/group"/>-->
-</component>
-</collection>
-<collection name="screensaver_info" long-name="Screen Saver Apps Info" level="ui">
-<component name="screensaver_build" filter="s60" long-name="Screen Saver Application">
-<!--the app should be a separate component -->
-<unit bldFile="app/screensaver/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreen" level="apps" long-name="Home Screen Apps" levels="fw support apps">
-<collection name="homescreen_plat" long-name="Home Screen Apps Platform Interfaces" level="apps">
-<component name="menu_settings_api" long-name="Menu Settings API" filter="s60" class="api">
-<unit bldFile="app/homescreen/homescreen_plat/menu_settings_api/group"/>
-</component>
-<component name="hs_content_control_ui" long-name="HS Content Control Ui" filter="s60" class="api">
-<unit bldFile="app/homescreen/homescreen_plat/hs_content_control_ui/group"/>
-</component>
-<component name="hs_renderingplugin_api" long-name="HS Rendering Plugin API" filter="s60" class="api">
-<unit bldFile="app/homescreen/homescreen_plat/hs_renderingplugin_api/group"/>
-</component>
-</collection>
-<collection name="idlehomescreen" long-name="Idle Home Screen" level="apps">
-<component name="nativeuicontroller" filter="s60" long-name="Native UI Controller">
-<unit bldFile="app/homescreen/idlehomescreen/nativeuicontroller/group"/>
-</component>
-<component name="exths" filter="s60" long-name="Active Idle Container" plugin="Y">
-<!-- why is the ID so different from the name? Is one wrong? -->
-<unit bldFile="app/homescreen/idlehomescreen/exths/group"/>
-</component>
-<component name="hscontentcontrol" filter="s60" long-name="Home Screen Content Control" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/hscontentcontrol/group"/>
-</component>
-<component name="hssapiwrapper" filter="s60" long-name="HS SAPI Wrapper" introduced="^3">
-<!-- can only have one unit. #include from a common bld.inf, or split into two components -->
-<unit bldFile="app/homescreen/idlehomescreen/sapiwrapper/cpswrapper/group"/>
-<unit bldFile="app/homescreen/idlehomescreen/sapiwrapper/hspswrapper/group"/>
-</component>
-<component name="xmluirendering" filter="s60" long-name="XML UI Rendering" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/xmluirendering/group"/>
-</component>
-<component name="xmluicontroller" filter="s60" long-name="XML UI Controller" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/xmluicontroller/group"/>
-</component>
-<component name="widgetmanager" filter="s60" long-name="Widget Manager" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/widgetmanager/group"/>
-</component>
-<component name="idlehomescreen_help" filter="s60" long-name="Idle Home Screen Help">
-<unit bldFile="app/homescreen/idlehomescreen/help/group"/>
-</component>
-<component name="idlehomescreen_data" filter="s60" long-name="Idle Home Screen Data">
-<unit bldFile="app/homescreen/idlehomescreen/data/group"/>
-</component>
-<component name="idlehomescreen_build" filter="s60" long-name="Idle Home Screen Build">
-<!-- can the loc file be moved to another comopnent and this one removed? -->
-<unit bldFile="app/homescreen/idlehomescreen/group"/>
-</component>
-</collection>
-<collection name="menufw" long-name="Menu Framework" level="fw">
-<component name="hierarchynavigator" filter="s60" long-name="Hierarchy Navigator">
-<unit bldFile="app/homescreen/menufw/hierarchynavigator/group"/>
-</component>
-<component name="menufwui" filter="s60" long-name="Menu Framework UI">
-<unit bldFile="app/homescreen/menufw/menufwui/group"/>
-</component>
-<component name="menusuites" filter="s60" long-name="Menu Suites">
-<unit bldFile="app/homescreen/menufw/menusuites/group"/>
-</component>
-<component name="menufw_build" filter="s60" long-name="Menu Framework Build">
-<!-- can the exports be exported by the other components? -->
-<unit bldFile="app/homescreen/menufw/group"/>
-</component>
-</collection>
-<collection name="taskswitcher" long-name="Task Switcher" level="support">
-<component name="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">
-<unit bldFile="app/homescreen/taskswitcher/taskswitcherui/group"/>
-</component>
-</collection>
-</block>
-<block name="graphicsuis" level="services" long-name="Graphics UIs" levels="util ui">
-<collection name="graphicsuis_plat" long-name="Graphics UIs Platform Interfaces" level="ui">
-<component name="svgt_viewer_ui_api" long-name="SVG-T Viewer UI API" filter="s60" class="api">
-<unit bldFile="app/graphicsuis/graphicsuis_plat/svgt_viewer_ui_api/group"/>
-</component>
-<component name="svg_application_observer_utility_api" long-name="SVG Application Observer Utility API" filter="s60" class="api">
-<unit bldFile="app/graphicsuis/graphicsuis_plat/svg_application_observer_utility_api/group"/>
-</component>
-<component name="svgt_file_view_details_dialog_api" long-name="SVG-T File View Details Dialog API" filter="s60" class="api">
-<unit bldFile="app/graphicsuis/graphicsuis_plat/svgt_file_view_details_dialog_api/group"/>
-</component>
-</collection>
-<collection name="svgtviewer" long-name="SVG-T Viewer" level="ui">
-<component name="svgtviewerplugin" filter="s60" long-name="SVG-T Viewer Plugin">
-<unit bldFile="app/graphicsuis/svgtviewer/svgtviewerplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="profile" level="apps" long-name="Profiles" levels="app">
-<collection name="profile_plat" long-name="Profiles Platform Interfaces" level="app">
-<component name="profiles_settings_view_api" long-name="Profiles Settings View API" filter="s60" class="api">
-<unit bldFile="app/profile/profile_plat/profiles_settings_view_api/group"/>
-</component>
-</collection>
-<collection name="profilesapplication" long-name="Profiles Application" level="app">
-<component name="profiles" filter="s60" long-name="Profiles">
-<unit bldFile="app/profile/profilesapplication/profiles/group"/>
-</component>
-</collection>
-<collection name="profile_info" long-name="Profiles Info" level="app">
-<component name="profile_help" filter="s60" long-name="Profiles Help">
-<unit bldFile="app/profile/help/group"/>
-</component>
-</collection>
-</block>
-<block name="speechsrv" level="services" long-name="Speech Recognition UIs" levels="engine framework ui">
-<collection name="speechsrv_plat" long-name="Speech Recognition UIs Platform Interfaces" level="ui">
-<component name="vas_api" long-name="VAS API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vas_api/group"/>
-</component>
-<component name="nss_devasr_api" long-name="NSS DevASR API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_devasr_api/group"/>
-</component>
-<component name="tts_hw_device_api" long-name="TTS HW Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/tts_hw_device_api/group"/>
-</component>
-<component name="voice_commands_resource_header_api" long-name="Voice Commands Resource Header API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/voice_commands_resource_header_api/group"/>
-</component>
-<component name="nss_mmf_tts_custom_commands_api" long-name="NSS MMF TTS Custom Commands API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_mmf_tts_custom_commands_api/group"/>
-</component>
-<component name="srsf_cenrep_settings_api" long-name="SRSF CenRep Settings API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/srsf_cenrep_settings_api/group"/>
-</component>
-<component name="voice_ui_plugin_api" long-name="Voice UI Plug-in API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/voice_ui_plugin_api/group"/>
-</component>
-<component name="nss_tts_utility_api" long-name="NSS TTS Utility API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_tts_utility_api/group"/>
-</component>
-<component name="nss_srs_custom_commands_api" long-name="NSS SRS Custom Commands API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_srs_custom_commands_api/group"/>
-</component>
-<component name="srsf_secondarydisplay_api" long-name="SRSF Secondary Display API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/srsf_secondarydisplay_api/group"/>
-</component>
-<component name="asrs_hw_device_api" long-name="ASRS Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/asrs_hw_device_api/group"/>
-</component>
-<component name="vas_vcommand_api" long-name="VAS Voice Command API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vas_vcommand_api/group"/>
-</component>
-<component name="adaptation_hw_device_api" long-name="Adaptation Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/adaptation_hw_device_api/group"/>
-</component>
-<component name="nss_devtts_api" long-name="NSS DevTTS API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_devtts_api/group"/>
-</component>
-<component name="nss_srs_utility_api" long-name="NSS SRS Utility API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_srs_utility_api/group"/>
-</component>
-<component name="recognition_hw_device_api" long-name="Recognition Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/recognition_hw_device_api/group"/>
-</component>
-<component name="vas_contact_handler_api" long-name="VAS Contact Handler API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vas_contact_handler_api/group"/>
-</component>
-<component name="nlp_hw_device" long-name="NLP Hardware Device" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nlp_hw_device/group"/>
-</component>
-<component name="nss_si_speech_recognition_data_api" long-name="NSS SI Speech Recognition Data API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_si_speech_recognition_data_api/group"/>
-</component>
-<component name="nss_tts_common_api" long-name="NSS TTS Common API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_tts_common_api/group"/>
-</component>
-<component name="grcompiler_hw_device_api" long-name="Grammar Compiler Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/grcompiler_hw_device_api/group"/>
-</component>
-<component name="ttp_hw_device_api" long-name="TTP Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/ttp_hw_device_api/group"/>
-</component>
-<component name="vocman_hw_device_api" long-name="VocMan Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vocman_hw_device_api/group"/>
-</component>
-<component name="speech_synthesis_clientserver_api" long-name="Speech Synthesis Client-Server API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/speech_synthesis_clientserver_api/group"/>
-</component>
-<component name="voice_ui_accessory_button_handling_api" long-name="Voice UI Accessory Button Handling API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/voice_ui_accessory_button_handling_api/group"/>
-</component>
-<component name="ui_voice_recognition_api" long-name="UI Voice Recognition API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/ui_voice_recognition_api/group"/>
-</component>
-<component name="vcommand_settings_cenrep_api" long-name="Voice Command Settings CenRep API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vcommand_settings_cenrep_api/group"/>
-</component>
-</collection>
-<collection name="voiceui" long-name="Voice UI" level="ui">
-<component name="vcommand" filter="s60" long-name="Voice Commands UI" introduced="^1">
-<unit bldFile="app/speechsrv/voiceui/vcommand/group"/>
-</component>
-<component name="voiceuivoicerecognition" filter="s60" long-name="Voice UI Recognition" introduced="^1">
-<unit bldFile="app/speechsrv/voiceui/voiceuivoicerecognition/group"/>
-</component>
-<component name="pbkinfoviewimpl" filter="s60" long-name="Phonebook Info View Implementation" introduced="^1">
-<unit bldFile="app/speechsrv/voiceui/pbkinfoviewimpl/group"/>
-</component>
-<component name="aiwpbkinfoviewprovider" filter="s60" long-name="AIW Phonebook Info View Provider" introduced="^1" plugin="Y">
-<unit bldFile="app/speechsrv/voiceui/aiwpbkinfoviewprovider/group"/>
-</component>
-<component name="vccontrolpanelplugin" filter="s60" long-name="Voice Commands Control Panel Plugin" introduced="^1" plugin="Y">
-<!-- component is commented out until configuration is in place. Currently #included from voiceui_build -->
-<!--<unit bldFile="voiceui/vccontrolpanelplugin/group"/>-->
-</component>
-<component name="voiceui_build" filter="s60" long-name="Voice UI Build" introduced="^1">
-<!-- can this be put into the other components? -->
-<unit bldFile="app/speechsrv/voiceui/group"/>
-</component>
-</collection>
-<collection name="srsf" long-name="Speech Recognition and Synthesis Framework" level="framework">
-<component name="sispeechrecognitiondata" filter="s60" long-name="SI Speech Recognition Data">
-<unit bldFile="app/speechsrv/srsf/sispeechrecognitiondata/group"/>
-</component>
-<component name="ttscommon" filter="s60" long-name="TTS Common">
-<unit bldFile="app/speechsrv/srsf/ttscommon/group"/>
-</component>
-<component name="devtts" filter="s60" long-name="Text to Speech">
-<unit bldFile="app/speechsrv/srsf/devtts/group"/>
-</component>
-<component name="ttscustomcommands" filter="s60" long-name="TTS Custom Commands">
-<unit bldFile="app/speechsrv/srsf/ttscustomcommands/group"/>
-</component>
-<component name="ttscontrollerplugin" filter="s60" long-name="TTS Controller Plugin" plugin="Y">
-<unit bldFile="app/speechsrv/srsf/ttscontrollerplugin/group"/>
-</component>
-<component name="ttsutility" filter="s60" long-name="TTS Utility">
-<unit bldFile="app/speechsrv/srsf/ttsutility/group"/>
-</component>
-<component name="speechsynthesis" filter="s60" long-name="Speech Synthesis">
-<!-- can only have one unit. #include these from a common bld.inf -->
-<unit bldFile="app/speechsrv/srsf/speechsynthesis/client/group"/>
-<unit bldFile="app/speechsrv/srsf/speechsynthesis/server/group"/>
-</component>
-<component name="devasr" filter="s60" long-name="Audio Recording and Speech Recognition">
-<unit bldFile="app/speechsrv/srsf/devasr/group"/>
-</component>
-<component name="sicc" filter="s60" long-name="Speaker Independent Custom Commands">
-<unit bldFile="app/speechsrv/srsf/sicc/group"/>
-</component>
-<component name="sisrscontrollerplugin" filter="s60" long-name="SI SRS Controller Plugin" plugin="Y">
-<unit bldFile="app/speechsrv/srsf/sisrscontrollerplugin/group"/>
-</component>
-<component name="siutility" filter="s60" long-name="Speaker Independent Utility">
-<unit bldFile="app/speechsrv/srsf/siutility/group"/>
-</component>
-<component name="nssvasapi" filter="s60" long-name="NSS VAS API">
-<unit bldFile="app/speechsrv/srsf/nssvasapi/group"/>
-</component>
-<component name="nssvascontacthdlr" filter="s60" long-name="NSS VAS Contact Handler">
-<unit bldFile="app/speechsrv/srsf/nssvascontacthdlr/group"/>
-</component>
-<component name="vcommandhandler" filter="s60" long-name="Voice Command Handler">
-<unit bldFile="app/speechsrv/srsf/vcommandhandler/group"/>
-</component>
-<component name="vuiphandler" filter="s60" long-name="Voice UI Plugin Handler">
-<unit bldFile="app/speechsrv/srsf/vuiphandler/group"/>
-</component>
-<component name="vcommandexecutor" filter="s60" long-name="Voice Command Executor">
-<unit bldFile="app/speechsrv/srsf/vcommandexecutor/group"/>
-</component>
-<component name="vcommandexecutorbearer" filter="s60" long-name="Voice Command Executor Bearer">
-<unit bldFile="app/speechsrv/srsf/vcommandexecutorbearer/group"/>
-</component>
-<component name="vcommandmanager" filter="s60" long-name="Voice Command Manager">
-<unit bldFile="app/speechsrv/srsf/vcommandmanager/group"/>
-</component>
-<component name="vcexecutorapp" filter="s60" long-name="Voice Command Executor Application">
-<unit bldFile="app/speechsrv/srsf/vcexecutorapp/group"/>
-</component>
-<component name="profileobserverplugin" filter="s60" long-name="Profile Observer Plugin" plugin="Y">
-<unit bldFile="app/speechsrv/srsf/profileobserverplugin/group"/>
-</component>
-<component name="srsf_build" filter="s60" long-name="Speech Recognition and Synthesis Framework Build">
-<!-- should distribute this into the above components -->
-<unit bldFile="app/speechsrv/srsf/group"/>
-</component>
-</collection>
-<collection name="speechsrv_info" long-name="Speech Recognition UIs Info" level="ui"/>
-</block>
-<block name="homescreentools" level="services" long-name="Home Screen Tools" levels="tool install">
-<collection name="dtdinstaller" long-name="DTD Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<!-- this needs to be built first, does build order need to be forced with filters? -->
-<component name="dtdinstaller_build" filter="s60" long-name="DTD Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/dtdinstaller/group"/>
-</component>
-</collection>
-<collection name="themeinstaller" long-name="Theme Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="themeinstaller_build" filter="s60" long-name="Theme Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/themeinstaller/group"/>
-</component>
-</collection>
-<collection name="widgettools" long-name="Widget Tools" level="install">
-<component name="hspluginpreinstaller" filter="s60" long-name="HS Plugin Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/hspluginspreinstaller/group"/>
-</component>
-<component name="wrtwidgetpreinstaller" filter="s60" long-name="WRT Widget Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
-</component>
-</collection>
-</block>
-<block name="webuis" level="services" long-name="Web UIs" levels="plugin app">
-<collection name="browserui" long-name="Browser UI" level="app">
-<component name="browser" filter="s60" long-name="Browser">
-<unit bldFile="app/webuis/browserui/browser/group"/>
-</component>
-<component name="operatormenu" filter="s60" long-name="Browser Operator Menu">
-<unit bldFile="app/webuis/browserui/operatormenu/group"/>
-</component>
-<component name="videoservices" filter="s60" long-name="Browser Video Services">
-<unit bldFile="app/webuis/browserui/videoservices/group"/>
-</component>
-</collection>
-<collection name="browserplugins" long-name="Browser Plugins" level="plugin">
-<component name="browsersysteminfoplugin" filter="s60" long-name="Browser System Info Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsersysteminfoplugin/group"/>-->
-</component>
-<component name="browsergpsplugin" filter="s60" long-name="Browser GPS Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsergpsplugin/group"/>-->
-</component>
-<component name="browseraudiovideoplugin" filter="s60" long-name="Browser Audio Video Plugin" plugin="Y">
-<unit bldFile="app/webuis/browserplugins/browseraudiovideoplugin/group"/>
-</component>
-<component name="browserplugins_build" filter="s60" long-name="Browser Plugins Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="app/webuis/browserplugins/group"/>
-</component>
-</collection>
-<collection name="pushmtm" long-name="Push MTM" level="plugin">
-<component name="pushmtm_help" filter="s60" long-name="Push MTM Help">
-<unit bldFile="app/webuis/pushmtm/help/group"/>
-</component>
-<component name="plugins" filter="s60" long-name="Push MTM Plugins" plugin="Y">
-<unit bldFile="app/webuis/pushmtm/plugins/group"/>
-</component>
-<component name="pushmtm_build" filter="s60" long-name="Push MTM Build">
-<!-- Some content is at collection level and some is at comopnent level. Either make this a single
- component and move it down a diretcory, or make separate independent components in this collection -->
-<unit bldFile="app/webuis/pushmtm/group"/>
-</component>
-</collection>
-</block>
-<block name="jrt" level="services" long-name="Java Runtime" levels="util generic rt ui">
-<collection name="jrt_plat" long-name="JRT Platform Interfaces" level="ui">
-<component name="java_registry_api" long-name="Java Registry API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_registry_api/build"/>
-</component>
-<component name="java_env_info_api" long-name="Java Environment Info API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_env_info_api/build"/>
-</component>
-<component name="java_debug_api" long-name="Java Debug API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_debug_api/build"/>
-</component>
-</collection>
-<collection name="java_stubs" long-name="Java Stubs" level="util">
-<!-- uncomment all components when configuration is in place. Currently #included from jrt_build -->
-<component name="javadrmutils" long-name="Java DRM Utils" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtdrmutils/group"/>-->
-</component>
-<component name="javaenvinfo" long-name="Java Environment Info" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtenvinfo/group"/>-->
-</component>
-<component name="javaregistry" filter="s60,sf_build" long-name="Java Registry" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtregistry/clientserver/client/group"/>-->
-</component>
-<component name="java_stubs_build" filter="s60,sf_build" long-name="Java Stubs ROM" class="placeholder">
-<!-- Remove the #includes and rename JRT ROM-->
-<!--<unit bldFile="java_stubs/group"/>-->
-</component>
-</collection>
-<collection name="jrt_info" long-name="JRT Info" level="rt">
-<component name="jrt_build" filter="s60" long-name="JRT Build">
-<!-- needed for __JAVA_STUBS condition -->
-<unit bldFile="app/jrt/group"/>
-</component>
-</collection>
-</block>
-<block name="conntools" level="services" long-name="Connectivity Tools" levels="config app">
-<collection name="nettools" long-name="Net Tools" level="app">
-<component name="conntest" filter="s60" long-name="Connection Test" purpose="development">
-<unit bldFile="app/conntools/nettools/conntest/group"/>
-</component>
-</collection>
-<collection name="emulatorlan" long-name="Emulator LAN" level="config">
-<!-- component is actually a colleciton, should be moved down a directory -->
-<component name="emulatorlan_build" filter="s60" long-name="Emulator LAN Build" purpose="development" class="config">
-<unit bldFile="app/conntools/emulatorlan/group"/>
-</component>
-</collection>
-</block>
-<block name="rndtools" level="services" long-name="R&D tools" levels="support generic test util">
-<collection name="creator" long-name="Creator" level="support">
-<!-- collection is really a component. Should move down a directory -->
-<component name="creator_build" filter="s60" long-name="Creator Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/creator/group"/>
-</component>
-</collection>
-<collection name="filebrowser" long-name="File Browser" level="util">
-<!-- consider collapsing into a single component -->
-<component name="fileopserver" filter="s60" long-name="File Operations Server" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
-</component>
-<component name="fileopclient" filter="s60" long-name="File Operations Client" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!--<unit bldFile="filebrowser/fileopclient/group"/>-->
-</component>
-<component name="filebrowser_build" filter="s60" long-name="File Browser Application" purpose="development" class="tool">
-<!-- Need to make this a self-contained component by removing #includes. Can only do when configuration is in place-->
-<unit bldFile="app/rndtools/filebrowser/group"/>
-</component>
-</collection>
-<collection name="launcher" long-name="Launcher" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="launcher_build" filter="s60" long-name="Launcher Utility" purpose="development" class="tool">
-<unit bldFile="app/rndtools/launcher/group"/>
-</component>
-</collection>
-<collection name="loadgen" long-name="Load Generator" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="loadgen_build" filter="s60" long-name="Load Generator Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/loadgen/group"/>
-</component>
-</collection>
-<collection name="perfmon" long-name="Performance Monitor" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="perfmon_build" filter="s60" long-name="Performance Monitor Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/perfmon/group"/>
-</component>
-</collection>
-<collection name="screengrabber" long-name="Screen Grabber" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="screengrabber_build" filter="s60" long-name="ScreenGrabber" purpose="development" class="tool">
-<unit bldFile="app/rndtools/screengrabber/group"/>
-</component>
-</collection>
-<collection name="stifui" long-name="STIF UI" level="generic">
-<component name="stifui_stifui" filter="s60" long-name="STIF UI" purpose="development">
-<unit bldFile="app/rndtools/stifui/stifui/group"/>
-</component>
-<component name="uitestserverstarter" filter="s60" long-name="UI Test Server Starter" purpose="development">
-<unit bldFile="app/rndtools/stifui/uitestserverstarter/group"/>
-</component>
-<component name="stifui_build" filter="s60" long-name="STIF UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/stifui/group"/>
-</component>
-</collection>
-<collection name="memspyui" long-name="Memspy UI" level="generic">
-<!-- collection is really a component. Should move down a directory -->
-<component name="memspyui_build" filter="s60" long-name="Memspy UI Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/memspyui/group"/>
-</component>
-</collection>
-<collection name="htiui" long-name="Harmonized Test Interface UI" level="generic">
-<component name="HtiCommPlugins" filter="s60" long-name="HTI Comm Plugins" purpose="development" plugin="Y">
-<unit bldFile="app/rndtools/htiui/HtiCommPlugins/HtiBtCommPlugin/group"/>
-</component>
-<component name="HtiServicePlugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- can only have a single unit. Should #include from a common bld.inf file -->
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiFtpBackupFake/group"/>
-</component>
-<component name="htidevicereboot" filter="s60" long-name="HTI Device Reboot" purpose="development">
-<unit bldFile="app/rndtools/htiui/htidevicereboot/group"/>
-</component>
-<component name="htistartupwait" filter="s60" long-name="HTI Startup Wait" purpose="development">
-<unit bldFile="app/rndtools/htiui/htistartupwait/group"/>
-</component>
-<component name="htiadmin" filter="s60" long-name="HTI Admin" purpose="development">
-<unit bldFile="app/rndtools/htiui/htiadmin/group"/>
-</component>
-<component name="htiui_build" filter="s60" long-name="HTI UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/htiui/group"/>
-</component>
-</collection>
-</block>
-<block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools if ui">
-<collection name="csxhelp" long-name="Context Sensitive Extended Help" level="if">
-<!-- this is really a component. Should move it down a directory -->
-<component name="csxhelp_build" filter="s60" long-name="Context Sensitive Extended Help Build">
-<unit bldFile="app/helps/csxhelp/group"/>
-</component>
-</collection>
-<collection name="symhelp" long-name="Symbian Help" level="eng">
-<component name="helpmodel" long-name="Help" introduced="6.0" purpose="optional">
-<unit bldFile="app/helps/symhelp/helpmodel/group" mrp="app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
-</component>
-</collection>
-<collection name="helps_info" long-name="Help Apps Info" level="ui">
-<component name="helps_metadata" long-name="Help Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/helps/helps_info/helps_metadata/helps_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
-<collection name="buildverification" long-name="Build Verification" level="services">
-<component name="autosmoketest" long-name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
-<unit bldFile="app/techview/buildverification/autosmoketest/Group" mrp="app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
-</component>
-<component name="smoketest" long-name="Smoke Test" filter="gt" purpose="development">
-<unit bldFile="app/techview/buildverification/smoketest/Group" mrp="app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
-</component>
-</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="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"/>
-<collection name="installationapps" long-name="Installation Apps" level="apps2"/>
-<collection name="messagingapps" long-name="Messaging Apps" level="apps2"/>
-<collection name="telephonyapps" long-name="Telephony Apps" level="apps1"/>
-<collection name="networkingapps" long-name="Networking Apps" level="apps1"/>
-<collection name="networkingutils" long-name="Networking Utils" level="utils"/>
-<collection name="shortlinkapps" long-name="Shortlink Apps" level="apps1"/>
-<collection name="testapps" long-name="Test Apps" level="utils"/>
-<collection name="avapps" long-name="A/V Apps" level="apps3"/>
-<collection name="toolkit" long-name="Toolkit" level="utils"/>
-<collection name="techview_info" long-name="Techview Info" level="apps3">
-<component name="techview_metadata" long-name="Techview Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/techview/techview_info/techview_metadata/techview_metadata.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
--- a/symbian3/single/sysdefs/auto/model_20100430172610_4f9b808eb677.xml Wed May 05 12:21:47 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10846 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a package or prebuilt -->
-<!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) "N"
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile may someday be removed in favour of mrp -->
-<!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
-<systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="low mw high">
-<block name="stubs" level="high" long-name="Stubs" levels="stub">
-<collection name="s60_stubs" level="stub">
-<component name="audiostubs" long-name="Audio Stubs">
-<unit bldFile="adaptation/stubs/audiostubs/group"/>
-</component>
-<component name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaptation Stub">
-<unit bldFile="adaptation/stubs/btaudioadaptation_stub/group"/>
-</component>
-<component name="drm_stubs" long-name="DRM Stubs">
-<unit bldFile="adaptation/stubs/drm_stubs/group"/>
-</component>
-<component name="ocrsrv_stub" long-name="OCR Services Stub">
-<unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
-</component>
-<component name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation">
-<unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
-</component>
-<component name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" plugin="Y">
-<unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
-</component>
-<component name="srsfenginestub" long-name="SRSF Engine Stub">
-<unit bldFile="adaptation/stubs/srsfenginestub/group"/>
-</component>
-<component name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub">
-<unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
-</component>
-<component name="systemswstubs" long-name="System Software Stubs">
-<unit bldFile="adaptation/stubs/systemswstubs/group"/>
-</component>
-<component name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" plugin="Y">
-<unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
-</component>
-<component name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub">
-<unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
-<collection name="omap3530" long-name="OMAP 3530" level="hw-if">
-<component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530" mrp="adaptation/beagleboard/omap3530/base_beagle.mrp"/>
-</component>
-<component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/kernel"/>
-</component>
-<component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/beagleboard"/>
-</component>
-</collection>
-</block>
-<block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
-<collection name="qemu_baseport" long-name="Baseport" level="hw-if">
-<component name="syborg" long-name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/qemu/baseport/syborg" mrp="adaptation/qemu/baseport/syborg/syborg.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
-<collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
-<component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
-<unit mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
-</component>
-</collection>
-<collection name="bsptemplate" long-name="Board Support Package Template" level="hw-if">
-<component name="asspandvariant" long-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 name="kernel" long-name="Kernel Architecture" level="adaptation">
-<component name="eka" long-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 name="kerneltest" long-name="Kernel Test" level="hw-if">
-<component name="e32utils" long-name="E32 Utilities" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32utils/group" mrp="os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/>
-</component>
-<component name="e32test" long-name="E32 Tests" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32test/group" mrp="os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
-</component>
-<component name="f32test" long-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 name="ldds" long-name="Logical Device Drivers" level="adaptation">
-<component name="ethernetldd" long-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 name="audioldd" long-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>
-<component name="serialldd" long-name="Serial Port Drivers" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
-</component>
-<component name="legacydrivers" long-name="Legacy Drivers" purpose="optional">
-<unit mrp="os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
-</component>
-<component name="locmedia" long-name="Local Media Subsystem" introduced="8.1b" purpose="mandatory">
-<!-- these are LDDs for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
-</component>
-<component name="runmodedebugger" long-name="Run Mode Debugger" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/debug/group" mrp="os/kernelhwsrv/kernel/eka/drivers/debug/group/base_e32_drivers_debug.mrp"/>
-</component>
-<component name="btrace" long-name="Kernel Trace Tool" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/trace" mrp="os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
-</component>
-<component name="cameraldd" long-name="Camera Drivers" introduced="^3" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/camerasc" mrp="os/kernelhwsrv/kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
-</component>
-<component name="displayldd" long-name="Display Drivers" introduced="^3" purpose="optional">
-<!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/display" mrp="os/kernelhwsrv/kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
-</component>
-<component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
-</component>
-</collection>
-<collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
-<component name="mediadrivers" long-name="Media Drivers" purpose="optional">
-<!-- these are for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/media" mrp="os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
-</component>
-<component name="genericboardsupport" long-name="Generic Board Support" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
-</component>
-</collection>
-<collection name="userlibandfileserver" long-name="User Library and File Server" level="framework">
-<component name="euser" long-name="User Library" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/euser" mrp="os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
-</component>
-<component name="compsupp" long-name="Compiler Runtime Support" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/compsupp" mrp="os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
-</component>
-<component name="fileserver" long-name="File Server" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
-</component>
-<component name="estart" long-name="Base Starter" filter="gt" purpose="optional">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
-</component>
-<component name="domainmgr" long-name="Domain Manager" introduced="8.1b" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
-</component>
-</collection>
-<collection name="filesystems" long-name="File Systems" level="framework">
-<component name="romfs" long-name="ROM File System" filter="gt" purpose="optional" plugin="Y">
-<unit mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
-</component>
-<component name="rofs" long-name="ROFS" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
-</component>
-<component name="usbmsfs" long-name="USB Mass Storage File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
-</component>
-<component name="usbhostmssrv" long-name="USB Host Mass Storage Server" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage/base_f32_shostmassstorage.mrp"/>
-</component>
-<component name="fat32fs" long-name="FAT32 File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
-</component>
-<component name="fatfs" long-name="FAT File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
-</component>
-<component name="compfs" long-name="Composite File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
-</component>
-</collection>
-<collection name="halservices" long-name="HAL Services" level="framework">
-<component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
-<unit bldFile="os/kernelhwsrv/halservices/hal" mrp="os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
-</component>
-</collection>
-<collection name="textmodeshell" long-name="Text Mode Shell" level="test">
-<component name="e32wsrv" long-name="Text Window Server" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/ewsrv" mrp="os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
-</component>
-<component name="textshell" long-name="Text Shell" filter="gt" purpose="development">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
-</component>
-</collection>
-<collection name="baseapitest" long-name="Base API Tests" level="test"/>
-<collection name="kernelhwsrv_info" long-name="Kernel and Hardware Services Info" level="test">
-<component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 config">
-<collection name="emulator" long-name="Emulator" level="bsp">
-<component name="emulatorbsp" long-name="Emulator BSP" purpose="optional">
-<unit bldFile="os/boardsupport/emulator/emulatorbsp" mrp="os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
-</component>
-</collection>
-<collection name="haitest" long-name="HAI Test Suites" level="test">
-<component name="bspsvs" long-name="BSP Verification Suite" introduced="^2" purpose="development">
-<unit mrp="os/boardsupport/haitest/bspsvs/group/bspsvs.mrp"/>
-</component>
-</collection>
-<collection name="boardsupport_info" long-name="Board Support Info" level="config">
-<component name="boardsupport_metadata" long-name="Board Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/boardsupport/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
-<collection name="bldsystemtools" long-name="Build System Tools" level="bld">
-<component name="sysdeftools" long-name="System Definition Tools" purpose="development" introduced="^2">
-<unit mrp="os/buildtools/bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
-</component>
-<component name="commonbldutils" long-name="Common Utils" purpose="development">
-<unit mrp="os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
-</component>
-</collection>
-<collection name="toolsandutils" long-name="Tools and Utils" level="mw">
-<component name="productionbldtools" long-name="Production Build Tools" filter="gt" purpose="development">
-<unit mrp="os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
-</component>
-<component name="e32tools" long-name="E32 Tools" deprecated="^2" purpose="development" class="PC">
-<unit bldFile="os/buildtools/toolsandutils/e32tools/group" mrp="os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
-</component>
-<component name="autotest" long-name="Autotest" purpose="development">
-<unit bldFile="os/buildtools/toolsandutils/autotest/group" mrp="os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
-</component>
-</collection>
-<collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
-<component name="e32toolp" long-name="E32 Perl Tools" purpose="development" filter="sf_build" class="PC">
-<unit mrp="os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="os/buildtools/sbsv1_os/e32toolp/group"/>
-</component>
-</collection>
-<collection name="imgtools_os" long-name="Image Tools" level="fw">
-<component name="romkiteka2" long-name="ROMKIT EKA2" deprecated="^2" purpose="development">
-<unit bldFile="os/buildtools/imgtools_os/romkiteka2/group" mrp="os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
-</component>
-</collection>
-<collection name="misccomponents" long-name="Misc Components" level="mw">
-<component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt" purpose="development">
-<unit bldFile="os/buildtools/misccomponents/emulatorlauncher/group" mrp="os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
-</component>
-</collection>
-<collection name="buildtools_info" long-name="Build Tools Info" level="ui">
-<component name="buildtools_metadata" long-name="Build Tools Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/buildtools/buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
-<collection name="ossrv_pub" long-name="Generic OS Services Public Interfaces" level="utilities">
-<component name="boost_apis" long-name="Boost APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/boost_apis/group"/>
-</component>
-<component name="cpp_wrappers" long-name="Cpp wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cpp_wrappers/group"/>
-</component>
-<component name="character_type_apis" long-name="Character Type APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/character_type_apis/group"/>
-</component>
-<component name="compiler_specific_runtime_support" long-name="Compiler Specific Runtime Support" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/compiler_specific_runtime_support/group"/>
-</component>
-<component name="ossrv_configuration_api" long-name="Generic OS Services Configuration API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/configuration/group"/>
-</component>
-<component name="crypto_authentication_codes_and_hash_functions_api" long-name="Crypto Authentication Codes and Hash Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
-</component>
-<component name="crypto_auxillary_functions_api" long-name="Crypto Auxillary Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_auxillary_functions_api/group"/>
-</component>
-<component name="crypto_certificates_api" long-name="Crypto Certificates API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_certificates_api/group"/>
-</component>
-<component name="crypto_inputoutput_and_data_encoding_api" long-name="Crypto Input/Output and Data Encoding API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
-</component>
-<component name="crypto_public_key_cryptography_and_key_agreement_api" long-name="Crypto Public Key Cryptography and Key Agreement API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
-</component>
-<component name="crypto_symmetric_ciphers_api" long-name="Crypto Symmetric Ciphers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_symmetric_ciphers_api/group"/>
-</component>
-<component name="crypto_utility_functions_api" long-name="Crypto Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_utility_functions_api/group"/>
-</component>
-<component name="cryptogaphy_related_api" long-name="Cryptogaphy Related API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cryptogaphy_related_api/group"/>
-</component>
-<component name="ossrv_debug_api" long-name="Generic OS Services Debug API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/debug/group"/>
-</component>
-<component name="ossrv_exceptions_api" long-name="Generic OS Services Exceptions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/exceptions/group"/>
-</component>
-<component name="gboxed" long-name="GBoxed API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gboxed/group"/>
-</component>
-<component name="glib_arrays" long-name="Glib Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_arrays/group"/>
-</component>
-<component name="glib_asynchronous_queues" long-name="Glib Asynchronous Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_asynchronous_queues/group"/>
-</component>
-<component name="glib_atomic_operations" long-name="Glib Atomic Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_atomic_operations/group"/>
-</component>
-<component name="glib_automatic_string_completion" long-name="Glib Automatic String Completion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_automatic_string_completion/group"/>
-</component>
-<component name="glib_balanced_binary_trees" long-name="Glib Balanced Binary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_balanced_binary_trees/group"/>
-</component>
-<component name="glib_basic_types" long-name="Glib Basic Types API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_basic_types/group"/>
-</component>
-<component name="glib_caches" long-name="Glib Caches API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_caches/group"/>
-</component>
-<component name="glib_character_set_conversion" long-name="Glib Character Set Conversion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_character_set_conversion/group"/>
-</component>
-<component name="glib_closures" long-name="Glib Closures API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_closures/group"/>
-</component>
-<component name="glib_commandline_option_parser" long-name="Glib Command Line Option Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_commandline_option_parser/group"/>
-</component>
-<component name="glib_datasets" long-name="Glib Datasets API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_datasets/group"/>
-</component>
-<component name="glib_date_and_time_functions" long-name="Glib Date and Time Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_date_and_time_functions/group"/>
-</component>
-<component name="glib_doubleended_queues" long-name="Glib Double-ended Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doubleended_queues/group"/>
-</component>
-<component name="glib_doublylinked_lists" long-name="Glib Doubly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doublylinked_lists/group"/>
-</component>
-<component name="glib_dynamic_loading_of_modules" long-name="Glib Dynamic Loading of Modules API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_dynamic_loading_of_modules/group"/>
-</component>
-<component name="glib_enums_and_flags" long-name="Glib Enums and Flags API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_enums_and_flags/group"/>
-</component>
-<component name="glib_error_reporting" long-name="Glib Error Reporting API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_error_reporting/group"/>
-</component>
-<component name="glib_file_utilities" long-name="Glib File Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_file_utilities/group"/>
-</component>
-<component name="glib_generic_values" long-name="Glib Generic Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_generic_values/group"/>
-</component>
-<component name="glib_globstyle_pattern_matching" long-name="Glib Glob-Style Pattern Matching API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_globstyle_pattern_matching/group"/>
-</component>
-<component name="glib_hash_tables" long-name="Glib Hash Tables API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hash_tables/group"/>
-</component>
-<component name="glib_hook_functions" long-name="Glib Hook Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hook_functions/group"/>
-</component>
-<component name="glib_internationalization" long-name="Glib Internationalization API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_internationalization/group"/>
-</component>
-<component name="glib_io_channels" long-name="Glib I/O Channels API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_io_channels/group"/>
-</component>
-<component name="glib_keyvalue_file_parser" long-name="Glib Key-Value File Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_keyvalue_file_parser/group"/>
-</component>
-<component name="glib_lexical_scanner" long-name="Glib Lexical Scanner API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_lexical_scanner/group"/>
-</component>
-<component name="glib_main_event_loop" long-name="Glib Main Event Loop API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_main_event_loop/group"/>
-</component>
-<component name="glib_memory_allocation" long-name="Glib Memory Allocation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_allocation/group"/>
-</component>
-<component name="glib_memory_slices" long-name="Glib Memory Slices API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_slices/group"/>
-</component>
-<component name="glib_message_logging" long-name="Glib Message Logging API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_message_logging/group"/>
-</component>
-<component name="glib_miscellaneous_utility_functions" long-name="Glib Miscellaneous Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_miscellaneous_utility_functions/group"/>
-</component>
-<component name="glib_nary_trees" long-name="Glib N-ary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_nary_trees/group"/>
-</component>
-<component name="glib_parameters_and_values" long-name="Glib Parameters and Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_parameters_and_values/group"/>
-</component>
-<component name="glib_quarks" long-name="Glib Quarks API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_quarks/group"/>
-</component>
-<component name="glib_random_numbers" long-name="Glib Random Numbers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_random_numbers/group"/>
-</component>
-<component name="glib_relations_and_tuples" long-name="Glib Relations and Tuples API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_relations_and_tuples/group"/>
-</component>
-<component name="glib_shellrelated_utilities" long-name="Glib Shell-related Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_shellrelated_utilities/group"/>
-</component>
-<component name="glib_signals" long-name="Glib Signals API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_signals/group"/>
-</component>
-<component name="glib_simple_xml_subset_parser" long-name="Glib Simple XML Subset Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_simple_xml_subset_parser/group"/>
-</component>
-<component name="glib_singlylinked_lists" long-name="Glib Singly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_singlylinked_lists/group"/>
-</component>
-<component name="glib_spawning_processes" long-name="Glib Spawning Processes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_spawning_processes/group"/>
-</component>
-<component name="glib_standard_macros" long-name="Glib Standard Macros API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_standard_macros/group"/>
-</component>
-<component name="glib_string_utility_functions" long-name="Glib String Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_string_utility_functions/group"/>
-</component>
-<component name="glib_strings" long-name="Glib Strings API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_strings/group"/>
-</component>
-<component name="glib_thread_pools" long-name="Glib Thread Pools API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_thread_pools/group"/>
-</component>
-<component name="glib_threads" long-name="Glib Threads API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_threads/group"/>
-</component>
-<component name="glib_timers" long-name="Glib Timers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_timers/group"/>
-</component>
-<component name="glib_unicode_manipulation" long-name="Glib Unicode Manipulation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_unicode_manipulation/group"/>
-</component>
-<component name="glib_value_arrays" long-name="Glib Value Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_value_arrays/group"/>
-</component>
-<component name="glib_varargs_value_collection" long-name="Glib Varargs Value Collection API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_varargs_value_collection/group"/>
-</component>
-<component name="gobject" long-name="GObject API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gobject/group"/>
-</component>
-<component name="gparamspec" long-name="GParamSpec API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gparamspec/group"/>
-</component>
-<component name="gtype" long-name="GType API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtype/group"/>
-</component>
-<component name="gtypemodule" long-name="GTypeModule API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypemodule/group"/>
-</component>
-<component name="gtypeplugin" long-name="GTypePlugin API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypeplugin/group"/>
-</component>
-<component name="io_stream_api" long-name="I/O stream API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/io_stream_api/group"/>
-</component>
-<component name="localization_function_api" long-name="Localization Function API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/localization_function_api/group"/>
-</component>
-<component name="math_operations_api" long-name="Math Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/math_operations_api/group"/>
-</component>
-<component name="ossrv_memory_api" long-name="Generic OS Services Memory API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/memory/group"/>
-</component>
-<component name="no_namespace_headers" long-name="No Namespace Headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/no_namespace_headers/group"/>
-</component>
-<component name="openc_headers" long-name="OpenC headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_headers/group"/>
-</component>
-<component name="openc_wrappers" long-name="OpenC wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_wrappers/group"/>
-</component>
-<component name="ssl_general_api" long-name="SSL General API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_general_api/group"/>
-</component>
-<component name="ssl_protocol_methods_api" long-name="SSL Protocol Methods API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_protocol_methods_api/group"/>
-</component>
-<component name="standard_compressiondecompression_api" long-name="Standard Compression/Decompression API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/standard_compressiondecompression_api/group"/>
-</component>
-<component name="stl" long-name="STL API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/stl/group"/>
-</component>
-<component name="thread_api" long-name="Thread API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/thread_api/group"/>
-</component>
-<component name="type_attributes" long-name="Type Attributes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/type_attributes/group"/>
-</component>
-<component name="typeinfo" long-name="Type Info API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/typeinfo/group"/>
-</component>
-<component name="utility_apis" long-name="Utility APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/utility_apis/group"/>
-</component>
-<component name="wide_character_classapis" long-name="Wide character class/apis" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/wide_character_classapis/group"/>
-</component>
-<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">
-<unit bldFile="os/ossrv/ossrv_pub/dbus-glib/group"/>
-</component>
-</collection>
-<collection name="ossrv_plat" long-name="Generic OS Services Platform Interfaces" level="utilities">
-<component name="libutils_apis" long-name="Utility Library APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_plat/libutils/group"/>
-</component>
-</collection>
-<collection name="stdlibs" long-name="Standard Libraries" level="translation">
-<component name="libz" filter="s60" long-name="Z Compression Library">
-<unit bldFile="os/ossrv/stdlibs/libz/group"/>
-</component>
-<component name="libcrypt" filter="s60" long-name="Crypt Library">
-<unit bldFile="os/ossrv/stdlibs/libcrypt/group"/>
-</component>
-</collection>
-<collection name="ssl" long-name="SSL" level="data-services">
-<component name="libcrypto" filter="s60" long-name="Crypto Library">
-<unit bldFile="os/ossrv/ssl/libcrypto/group"/>
-</component>
-<component name="libssl" filter="s60" purpose="development" long-name="SSL Library">
-<unit bldFile="os/ossrv/ssl/libssl/group"/>
-</component>
-</collection>
-<collection name="glib" long-name="GLib" level="utilities">
-<component name="glibbackend" filter="s60" long-name="GLib Backend">
-<unit bldFile="os/ossrv/glib/glibbackend/group"/>
-</component>
-<component name="libglib" filter="s60" long-name="GLib Library">
-<unit bldFile="os/ossrv/glib/libglib/group"/>
-</component>
-<component name="libgthread" filter="s60" long-name="Libg Thread">
-<unit bldFile="os/ossrv/glib/libgthread/group"/>
-</component>
-<component name="libgmodule" filter="s60" long-name="Libg Module">
-<unit bldFile="os/ossrv/glib/libgmodule/group"/>
-</component>
-<component name="libgobject" filter="s60" long-name="Libg Object">
-<unit bldFile="os/ossrv/glib/libgobject/group"/>
-</component>
-</collection>
-<collection name="stdcpp" long-name="C++ Standard Library" level="translation">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="stdcpp_build" filter="s60" long-name="Stdcpp">
-<unit bldFile="os/ossrv/stdcpp/group"/>
-</component>
-</collection>
-<collection name="ofdbus" long-name="Open Foundation D-Bus" level="utilities">
-<component name="dbus" filter="s60" long-name="D-Bus">
-<unit bldFile="os/ossrv/ofdbus/dbus/group"/>
-</component>
-<component name="dbus-glib" filter="s60" long-name="D-Bus GLib">
-<unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
-</component>
-<component name="ofdbus_rom" filter="s60" long-name="D-Bus ROM">
-<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory
- Consider moving IBY file to one of the above as well and removing this component entirely -->
-<unit bldFile="os/ossrv/ofdbus/group"/>
-</component>
-</collection>
-<collection name="utilitylibraries" long-name="Utility Libraries" level="encoding">
-<component name="libutils" filter="s60" long-name="Utility Library">
-<unit bldFile="os/ossrv/utilitylibraries/libutils/group"/>
-</component>
-</collection>
-<collection name="genericservices" long-name="Generic Services" level="utilities">
-<component name="s60compatibilityheaders" long-name="S60 Compatibility Headers" filter="gt" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp" version="tb101sf"/>
-</component>
-<component name="mimerecognitionfw" long-name="MIME Recognition Framework" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/mimerecognitionfw/group" mrp="os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
-</component>
-<component name="systemagent" long-name="System Agent" introduced="9.0" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/systemagent/group" mrp="os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
-</component>
-<component name="taskscheduler" long-name="Task Scheduler" introduced="6.0" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/taskscheduler/group" mrp="os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
-</component>
-<component name="activebackupclient" long-name="Active Backup Client" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/activebackupclient/group" mrp="os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
-</component>
-<component name="syslibsdocs" long-name="Syslibs Documentation" purpose="development" class="doc">
-<unit mrp="os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
-</component>
-<component name="httputils" long-name="HTTP Utilities Library" introduced="6.2" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/httputils/group" mrp="os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
-</component>
-</collection>
-<collection name="syslibsapitest" long-name="SysLibs API Tests" level="utilities"/>
-<collection name="compressionlibs" long-name="Compression Libraries" level="data-services">
-<component name="ziplib" long-name="Zip Compression Library" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/ossrv/compressionlibs/ziplib/group" mrp="os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
-</component>
-</collection>
-<collection name="genericopenlibs" long-name="Generic Open Libraries" level="translation">
-<component name="cstdlib" long-name="C Standard Library" introduced="ER5" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/cstdlib/group" mrp="os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
-</component>
-<component name="cppstdlib" long-name="C++ Standard Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/cppstdlib/group" mrp="os/ossrv/genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
-</component>
-<component name="openenvcore" long-name="Open Environment Core" introduced="^2" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/openenvcore/group" mrp="os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
-</component>
-<component name="posixrealtimeextensions" long-name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/posixrealtimeextensions/group" mrp="os/ossrv/genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
-</component>
-</collection>
-<collection name="lowlevellibsandfws" long-name="Low Level Libraries and Frameworks" level="app-libs">
-<component name="pluginfw" long-name="Plugin Framework" introduced="6.2" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp" version="3"/>
-</component>
-<component name="apputils" long-name="Application Utilities" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/apputils/group" mrp="os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
-</component>
-<component name="genericusabilitylib" long-name="Generic Usability Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/genericusabilitylib/group" mrp="os/ossrv/lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
-</component>
-</collection>
-<collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
-<component name="ossrv_build" filter="s60" long-name="Generic OS Services Build">
-<!-- exports should be moved to individual components -->
-<unit bldFile="os/ossrv/group"/>
-</component>
-<component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="featuremgmt" long-name="Feature Management" level="framework">
-<component name="featuremgr" long-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 name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/persistentdata/featuremgmt/featureregistry/group" mrp="os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
-</component>
-</collection>
-<collection name="loggingservices" long-name="Logging Services" level="server">
-<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">
-<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">
-<unit bldFile="os/persistentdata/loggingservices/rfilelogger/group" mrp="os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
-</component>
-</collection>
-<collection name="traceservices" long-name="Trace Services" level="server">
-<component name="commsdebugutility" long-name="Comms Debug Utility" introduced="7.0s" purpose="optional">
-<unit bldFile="os/persistentdata/traceservices/commsdebugutility/group" mrp="os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
-</component>
-<component name="tracefw" long-name="Trace Framework" introduced="9.2" purpose="development">
-<unit bldFile="os/persistentdata/traceservices/tracefw/ulogger/group" mrp="os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
-</component>
-</collection>
-<collection name="persistentstorage" long-name="Persistent Storage" level="framework">
-<component name="store" long-name="Store" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/store/group" mrp="os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
-</component>
-<component name="dbms" long-name="DBMS" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/dbms/group" mrp="os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
-</component>
-<component name="centralrepository" long-name="Central Repository" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/persistentdata/persistentstorage/centralrepository/group" mrp="os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
-</component>
-<component name="sql" long-name="SQL" introduced="9.3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sql/GROUP" mrp="os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
-</component>
-<component name="sqlite3api" long-name="SQLite 3 API" introduced="^3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sqlite3api/GROUP" mrp="os/persistentdata/persistentstorage/sqlite3api/GROUP/syslibs_sqlite3.mrp"/>
-</component>
-</collection>
-<collection name="persistentdata_info" long-name="Persistent Data Services Info" level="app-if">
-<component name="persistentdata_metadata" long-name="Persistent Data Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/persistentdata/persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
-<component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
-</component>
-<component name="common_platform_security_definitions_api" long-name="Common Platform Security Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group"/>
-</component>
-<component name="feature_discovery_api" long-name="Feature Discovery API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/group"/>
-</component>
-<component name="platform_environment_api" long-name="Platform Environment API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_environment_api/group"/>
-</component>
-<component name="sensor_channel_api" long-name="Sensor Channel API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_channel_api/group"/>
-</component>
-<component name="sensor_definitions_api" long-name="Sensor Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_definitions_api/group"/>
-</component>
-<component name="version_info_api" long-name="Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/group"/>
-</component>
-<component name="accessory_monitoring_api" long-name="Accessory Monitoring API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/group"/>
-</component>
-<component name="haptics_api" long-name="Haptics API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/haptics_api/group"/>
-</component>
-<component name="sensor_data_compensator_api" long-name="Sensor Data Compensator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
-</component>
-</collection>
-<collection name="devicesrv_plat" long-name="Device Services Platform Interfaces" level="app-if">
-<component name="configuration_file_parser_api" long-name="Configuration File Parser API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/configuration_file_parser_api/group"/>
-</component>
-<component name="dos_extension_plugin_api" long-name="DOS Extension Plug-In API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_plugin_api/group"/>
-</component>
-<component name="mediator_command_initiator_api" long-name="Mediator Command Initiator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_initiator_api/group"/>
-</component>
-<component name="syslangutil_api" long-name="SysLangUtil API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/syslangutil_api/group"/>
-</component>
-<component name="wakeup_alarm_api" long-name="Wakeup Alarm API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/wakeup_alarm_api/group"/>
-</component>
-<component name="disk_and_memory_level_keys_api" long-name="Disk and Memory Level Keys API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_and_memory_level_keys_api/group"/>
-</component>
-<component name="mediator_plugin_api" long-name="Mediator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_plugin_api/group"/>
-</component>
-<component name="headset_status_api" long-name="Headset Status API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/headset_status_api/group"/>
-</component>
-<component name="system_startup_extension_plugin_api" long-name="System Startup Extension Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/system_startup_extension_plugin_api/group"/>
-</component>
-<component name="sensor_plugin_api" long-name="Sensor Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_plugin_api/group"/>
-</component>
-<component name="accessory_api" long-name="Accessory API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_api/group"/>
-</component>
-<component name="display_language_definition_api" long-name="Display Language Definition API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/display_language_definition_api/group"/>
-</component>
-<component name="mediator_command_responder_api" long-name="Mediator Command Responder API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_responder_api/group"/>
-</component>
-<component name="accessory_policy_definitions_api" long-name="Accessory Policy Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_definitions_api/group"/>
-</component>
-<component name="hw_settings_api" long-name="Hardware Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/hw_settings_api/group"/>
-</component>
-<component name="mediator_domain_definitions_api" long-name="Mediator Domain Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_domain_definitions_api/group"/>
-</component>
-<component name="sensor_extension_api" long-name="Sensor Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_extension_api/group"/>
-</component>
-<component name="accessory_plugin_api" long-name="Accessory Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_plugin_api/group"/>
-</component>
-<component name="sae_api" long-name="SAE API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sae_api/group"/>
-</component>
-<component name="accessory_control_api" long-name="Accessory Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_control_api/group"/>
-</component>
-<component name="mediator_static_registration_api" long-name="Mediator Static Registration API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_static_registration_api/group"/>
-</component>
-<component name="accessory_key_event_handling_api" long-name="Accessory Key Event Handling API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_key_event_handling_api/group"/>
-</component>
-<component name="mediator_notification_api" long-name="Mediator Notification API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_notification_api/group"/>
-</component>
-<component name="accessory_policy_utility_api" long-name="Accessory Policy Utility API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_utility_api/group"/>
-</component>
-<component name="common_dsy_plugin_api" long-name="Common DSY Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/common_dsy_plugin_api/group"/>
-</component>
-<component name="remote_control_extension_api" long-name="Remote Control Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/remote_control_extension_api/group"/>
-</component>
-<component name="sensor_channel_filter_api" long-name="Sensor Channel Filter API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_channel_filter_api/group"/>
-</component>
-<component name="dos_extension_api" long-name="DOS Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_api/group"/>
-</component>
-<component name="accessory_audio_control_api" long-name="Accessory Audio Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_audio_control_api/group"/>
-</component>
-<component name="mediator_event_consumer_api" long-name="Mediator Event Consumer API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_consumer_api/group"/>
-</component>
-<component name="shared_data_api" long-name="Shared Data API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/shared_data_api/group"/>
-</component>
-<component name="accessory_settings_api" long-name="Accessory Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_settings_api/group"/>
-</component>
-<component name="accessory_bluetooth_control_api" long-name="Accessory Bluetooth Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_bluetooth_control_api/group"/>
-</component>
-<component name="extended_version_info_api" long-name="Extended Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_api/group"/>
-</component>
-<component name="mediator_event_provider_api" long-name="Mediator Event Provider API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_provider_api/group"/>
-</component>
-<component name="tv_out_config_api" long-name="TV Out Config API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_config_api/group"/>
-</component>
-<component name="tspclientmapper_api" long-name="TSP Client Mapper API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tspclientmapper_api/group"/>
-</component>
-<component name="powersave_api" long-name="Power Save API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_api/group"/>
-</component>
-<component name="powersave_definitions_api" long-name="Power Save Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_definitions_api/group"/>
-</component>
-<component name="powersave_plugin_api" long-name="Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_plugin_api/group"/>
-</component>
-<component name="extended_version_info_plugin_api" long-name="Extended Version Info Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_plugin_api/group"/>
-</component>
-<component name="haptics_plugin_api" long-name="Haptics Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_plugin_api/group"/>
-</component>
-<component name="haptics_effect_data_getter_plugin_api" long-name="Haptics Effect Data Getter Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
-</component>
-<component name="haptics_packetizer_plugin_api" long-name="Haptics Packetizer Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_packetizer_plugin_api/group"/>
-</component>
-<component name="tiltcompensation_api" long-name="Tilt Compensation API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tiltcompensation_api/group"/>
-</component>
-<component name="disk_notification_handler_api" long-name="Disk Notification Handler API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_notification_handler_api/group"/>
-</component>
-<component name="accessory_policy_usb_audio_api" long-name="Accessory Policy USB Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_usb_audio_api/group"/>
-</component>
-<component name="accessory_policy_hdmi_audio_api" long-name="Accessory Policy HDMI Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_hdmi_audio_api/group"/>
-</component>
-<component name="sensor_data_compensator_plugin_api" long-name="Sensor Data Compensator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
-</component>
-<component name="ddc_access_api" long-name="DDC Access API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/ddc_access_api/group"/>
-</component>
-<component name="tv_out_behaviour_api" long-name="TV Out Behaviour API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_behaviour_api/group"/>
-</component>
-</collection>
-<collection name="accessoryservices" long-name="Accessory Services" level="framework">
-<component name="accessorymonitor" filter="s60" long-name="Accessory Monitor">
-<unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/group"/>
-</component>
-<component name="accessoryremotecontrol" filter="s60" long-name="Accessory Remote Control">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
-</component>
-<component name="accessoryserver" filter="s60" long-name="Accessory Server">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryserver/group"/>
-</component>
-<component name="pluggeddisplay" filter="s60" long-name="Plugged Display" introduced="^3">
-<unit bldFile="os/devicesrv/accessoryservices/pluggeddisplay/group"/>
-</component>
-<component name="headsetstatusapi" filter="s60" long-name="Headset Status API">
-<unit bldFile="os/devicesrv/accessoryservices/headsetstatusapi/group"/>
-</component>
-<component name="tspclientmapper" filter="s60" long-name="TSP Client Mapper">
-<unit bldFile="os/devicesrv/accessoryservices/tspclientmapper/group"/>
-</component>
-<component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional">
-<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
-</component>
-<component name="gid_pc_tool" filter="s60" long-name="Generic ID PC Tool" class="tool PC">
-<unit bldFile="os/devicesrv/accessoryservices/gid_pc_tool/group"/>
-</component>
-</collection>
-<collection name="commonservices" long-name="Common Services" level="app-if">
-<component name="commonengine" filter="s60" long-name="Common Engine">
-<unit bldFile="os/devicesrv/commonservices/commonengine/group"/>
-</component>
-<component name="commonengineresources" filter="s60" long-name="Common Engine Resources" class="config">
-<unit bldFile="os/devicesrv/commonservices/commonengineresources/group"/>
-</component>
-<component name="platformenv" filter="s60" long-name="Platform Environment">
-<unit bldFile="os/devicesrv/commonservices/platformenv/group"/>
-</component>
-<component name="sysutil" long-name="System Utilities" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/sysutil/group" mrp="os/devicesrv/commonservices/sysutil/group/sysutil.mrp"/>
-</component>
-<component name="activitymanager" long-name="Activity Manager" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/activitymanager/group" mrp="os/devicesrv/commonservices/activitymanager/group/activitymanager.mrp"/>
-</component>
-</collection>
-<collection name="dosservices" long-name="Domestic Operating System Services" level="hw-if">
-<component name="commondsy" filter="s60" long-name="Common DSY" plugin="Y">
-<unit bldFile="os/devicesrv/dosservices/commondsy/group"/>
-</component>
-<component name="dosserver" filter="s60" long-name="Domestic OS Server">
-<unit bldFile="os/devicesrv/dosservices/dosserver/group"/>
-</component>
-</collection>
-<collection name="sensorservices" long-name="Sensor Services" level="framework">
-<component name="sensorserver" filter="s60" long-name="Sensor Server">
-<unit bldFile="os/devicesrv/sensorservices/sensorserver/group"/>
-</component>
-<component name="orientationssy" filter="s60" long-name="Orientation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/orientationssy/group"/>
-</component>
-<component name="tiltcompensationssy" filter="s60" long-name="Tilt Compensation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/tiltcompensationssy/group"/>
-</component>
-<component name="sensordatacompensator" filter="s60" long-name="Sensor Data Compensator">
-<unit bldFile="os/devicesrv/sensorservices/sensordatacompensator/group"/>
-</component>
-</collection>
-<collection name="hwrmhaptics" long-name="HWRM Haptics" level="plugin">
-<component name="hapticseffectdatagetterfw" filter="s60" long-name="Haptics Effect Data Getter Framework">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
-</component>
-<component name="hapticspluginservice" filter="s60" long-name="Haptics Plugin Service">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
-</component>
-<component name="hapticspacketizer" filter="s60" long-name="Haptics Packetizer">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
-</component>
-<component name="hapticspluginmanager" filter="s60" long-name="Haptics Plugin Manager">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
-</component>
-<component name="hapticsserver" filter="s60" long-name="Haptics Server">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsserver/group"/>
-</component>
-<component name="hapticsclient" filter="s60" long-name="Haptics Client">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsclient/group"/>
-</component>
-<component name="hwrmhaptics_build" filter="s60" long-name="HWRM Haptics Build">
-<!-- move these exports into the appropriate above components and delete this component-->
-<unit bldFile="os/devicesrv/hwrmhaptics/group"/>
-</component>
-</collection>
-<collection name="mediator" long-name="Mediator" level="app-if">
-<!--collection is really a component. Move it down a directory -->
-<component name="mediator_build" filter="s60" long-name="Mediator Build">
-<unit bldFile="os/devicesrv/mediator/group"/>
-</component>
-</collection>
-<collection name="psmservices" long-name="Power Save Mode Services" level="app-if">
-<component name="psmserver" filter="s60" long-name="PSM Server">
-<unit bldFile="os/devicesrv/psmservices/psmserver/group"/>
-</component>
-</collection>
-<collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
-<component name="hwrmfmtxwatcherplugin" filter="s60" long-name="HWRM FM Transmitter Watcher Plugin" plugin="Y">
-<unit bldFile="os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
-</component>
-<component name="hwrmtargetmodifierplugin" filter="s60" long-name="HWRM Target Modifier Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build,
- may need to -->
-<!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
-</component>
-<component name="vibractrl" filter="s60" long-name="Vibra Control" deprecated="9.1">
-<unit bldFile="os/devicesrv/resourcemgmt/vibractrl/group"/>
-</component>
-<component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="^2" purpose="optional">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
-</component>
-<component name="hwresourcesmgrconfig" long-name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
-</component>
-<component name="resourcemgmt_build" filter="s60" long-name="Resource Management Build">
-<!-- Move exports to a self-contained component.
- This needs to be kept around until configuration is in place -->
-<unit bldFile="os/devicesrv/resourcemgmt/group"/>
-</component>
-<component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
-</component>
-</collection>
-<collection name="sysstatemgmt" long-name="System State Management" level="server">
-<component name="ssmmapperutility" filter="s60" long-name="SSM Mapper Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmmapperutility/group"/>
-</component>
-<component name="ssmpolicyplugins" filter="s60" long-name="SSM Policy Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmpolicyplugins/group"/>
-</component>
-<component name="ssmutilityplugins" filter="s60" long-name="SSM Utility Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmutilityplugins/group"/>
-</component>
-<component name="ssmcmdlists" filter="s60" long-name="SSM Command Lists" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcmdlists/group"/>
-</component>
-<component name="ssmcustcmds" filter="s60" long-name="SSM Custom Commands" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcustcmds/group"/>
-</component>
-<component name="syslangutil" filter="s60" long-name="System Language Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/syslangutil/group"/>
-</component>
-<component name="sysrestart" filter="s60" long-name="System Restart" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysrestart/group"/>
-</component>
-<component name="sysuiprovider" filter="s60" long-name="System UI Provider" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysuiprovider/group"/>
-</component>
-<component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/group" mrp="os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
-</component>
-<component name="systemstatemgr" long-name="System State Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
-</component>
-<component name="systemstateplugins" long-name="System State Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
-</component>
-<component name="systemstatereferenceplugins" long-name="System State Reference Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
-</component>
-</collection>
-<collection name="resourceinterfaces" long-name="Resource Interfaces" level="hw-if">
-<component name="fmtransmittercontrol" long-name="FM Transmitter Control" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group" mrp="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
-</component>
-</collection>
-<collection name="systemhealthmanagement" long-name="System Health Management" level="server">
-<component name="systemhealthmgr" long-name="System Health Manager" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
-</component>
-</collection>
-<collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if"/>
-<collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
-<component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
-<collection name="authorisation" long-name="Authorisation" level="utilities">
-<component name="userpromptservice" long-name="User Prompt Service" introduced="^3" purpose="mandatory">
-<unit bldFile="os/security/authorisation/userpromptservice/group" mrp="os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
-</component>
-<component name="userpromptutils" long-name="User Prompt Utils" introduced="^3" purpose="optional">
-<unit bldFile="os/security/authorisation/userpromptutils/group" mrp="os/security/authorisation/userpromptutils/group/security_ups_utils.mrp"/>
-</component>
-</collection>
-<collection name="contentmgmt" long-name="Content Management" level="utilities">
-<component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
-<unit bldFile="os/security/contentmgmt/contentaccessfwfordrm/group" mrp="os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
-</component>
-<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>
-</collection>
-<collection name="crypto" long-name="Crypto Libraries" level="libraries">
-<component name="weakcryptospi" long-name="Weak Crypto SPI" filter="gt" introduced="^3" purpose="optional">
-<unit bldFile="os/security/crypto/weakcryptospi/group" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
-</component>
-<component name="strongcryptospi" long-name="Strong Crypto SPI" filter="gt" introduced="^3" purpose="optional">
-<unit bldFile="os/security/crypto/weakcryptospi/strong" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
-</component>
-</collection>
-<collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
-<component name="securityutils" long-name="Security Utils" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/securityutils/group" mrp="os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
-</component>
-<component name="securitydocs" long-name="Security Documentation" purpose="development" class="doc">
-<unit mrp="os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
-</component>
-<component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
-</component>
-<component name="securitycommonutils" long-name="Security Common Utils" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/security/cryptomgmtlibs/securitycommonutils/group" mrp="os/security/cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
-</component>
-</collection>
-<collection name="securityanddataprivacytools" long-name="Security and Data Privacy Tools" level="services">
-<component name="securityconfig" long-name="Security Config" introduced="9.1" purpose="optional">
-<unit bldFile="os/security/securityanddataprivacytools/securityconfig/group" mrp="os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
-</component>
-<component name="securitytools" long-name="Security Tools" introduced="^3" purpose="optional" class="PC">
-<unit bldFile="os/security/securityanddataprivacytools/securitytools/group" mrp="os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
-</component>
-</collection>
-<collection name="cryptoplugins" long-name="Crypto Plugins" level="plugins">
-<component name="cryptospiplugins" long-name="Crypto SPI Plugins" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/security/cryptoplugins/cryptospiplugins/group" mrp="os/security/cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
-</component>
-</collection>
-<collection name="cryptoservices" long-name="Crypto Services" level="plugins">
-<component name="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/certificateandkeymgmt/group" mrp="os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
-</component>
-<component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
-</component>
-<component name="browserrootcertificates" long-name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
-<unit mrp="os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
-</component>
-<component name="rootcertificates" filter="sf_build" long-name="Root Certificates" introduced="7.0s" purpose="optional">
-<!-- not in S60 codebase -->
-<unit bldFile="os/security/cryptoservices/rootcertificates/group" mrp="os/security/cryptoservices/rootcertificates/group/rootcerts.mrp"/>
-</component>
-<component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/asnpkcs/group" mrp="os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
-</component>
-</collection>
-<collection name="security_info" long-name="OS Security Info" level="utilities">
-<component name="security_metadata" long-name="OS Security Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/security/security_info/security_metadata/security_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
-<collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
-<component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
-</component>
-<component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
-</component>
-<component name="simulationpositioningmodule" long-name="Simulation Positioning Module" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
-</component>
-<component name="gpspositioningmodule" long-name="GPS/A-GPS Positioning Module" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/gpspositioningmodule/group" mrp="os/lbs/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
-</component>
-<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>
-</collection>
-<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
-<component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
-</component>
-</collection>
-<collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
-<component name="locationserver" long-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 name="networkrequesthandler" long-name="Network Request Handler" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
-</component>
-</collection>
-<collection name="lbstest" long-name="Locating Services Tests" level="application-interface">
-<component name="locationprotocoltest" long-name="Location Protocol Tests" introduced="9.2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/lbstest/locationprotocoltest/group" mrp="os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
-</component>
-</collection>
-<collection name="locationmgmt" long-name="Location Management" level="management">
-<component name="locmonitor" long-name="Location Monitor" introduced="^3" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
-</component>
-<component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/agpslocationmgr/group" mrp="os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
-</component>
-<component name="networklocationmgr" long-name="Network Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/networklocationmgr/group" mrp="os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
-</component>
-<component name="locationcore" long-name="Location Core" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locationcore/group" mrp="os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
-</component>
-<component name="networkgateway" long-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 name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
-<component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
-</component>
-<component name="suplrrlpasn1" filter="sf_build" long-name="SUPL RRLP ASN1 Parser">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
-</component>
-</collection>
-<collection name="lbsapitest" long-name="Location API Tests" level="application-interface"/>
-<collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
-<component name="lbs_metadata" long-name="Locating Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commsfw" level="services" long-name="Communications Framework" levels="server support framework process app-if">
-<collection name="commsprocess" long-name="Comms Process" level="process">
-<component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/commsfw/commsprocess/commsrootserverconfig/group" mrp="os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
-</component>
-</collection>
-<collection name="commsconfig" long-name="Comms Config" level="process">
-<component name="commsdatabase" long-name="Comms Database" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
-</component>
-<component name="commsdatabaseshim" long-name="Comms Database Shim" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/commsfw/commsconfig/commsdatabaseshim/group" mrp="os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
-</component>
-</collection>
-<collection name="datacommsserver" long-name="Data Comms Server" level="framework">
-<component name="esockserver" long-name="ESock Server" purpose="mandatory">
-<unit bldFile="os/commsfw/datacommsserver/esockserver/group" mrp="os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp" version="3"/>
-</component>
-<component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/group" mrp="os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
-</component>
-<component name="networkingdialogstub" long-name="Networking Dialog Stub" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/default" mrp="os/commsfw/datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
-</component>
-<component name="networkcontroller" long-name="Network Controller" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/datacommsserver/networkcontroller/group" mrp="os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
-</component>
-</collection>
-<collection name="serialserver" long-name="Serial Server" level="server">
-<component name="serialportcsy" long-name="Serial Port CSY" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/serialserver/serialportcsy" mrp="os/commsfw/serialserver/serialportcsy/ser-comms_serialportcsy.mrp"/>
-</component>
-<component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" purpose="development">
-<unit bldFile="os/commsfw/serialserver/packetloopbackcsy/group" mrp="os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
-</component>
-<component name="c32serialserver" long-name="C32 Serial Server" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/commsfw/serialserver/c32serialserver/group" mrp="os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
-</component>
-<component name="c32serialserverconfig" long-name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config">
-<unit bldFile="os/commsfw/serialserver/c32serialserverconfig" mrp="os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
-</component>
-<component name="c32serialserverdocs" long-name="C32 Serial Server Documentation" purpose="development" class="doc">
-<unit mrp="os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
-</component>
-</collection>
-<collection name="commsfwutils" long-name="Comms Framework Utilities" level="framework">
-<component name="commsbufs" long-name="Comms Buffers" introduced="^3" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwutils/commsbufs/group" mrp="os/commsfw/commsfwutils/commsbufs/group/comms-infras_commsbufs.mrp"/>
-</component>
-</collection>
-<collection name="commsfw_info" long-name="Comms Framework Info" level="app-if">
-<component name="commsinfrastructuredocs" long-name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
-<unit mrp="os/commsfw/commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
-</component>
-<component name="commsfw_metadata" long-name="Communications Framework Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/commsfw/commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
-</component>
-</collection>
-<collection name="commsfwsupport" long-name="Comms Framework Support" level="support">
-<component name="commselements" long-name="Comms Elements" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwsupport/commselements/group" mrp="os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
-</component>
-</collection>
-<collection name="commsinfrastructureapitest" long-name="Comms-Infras API Tests" level="app-if">
-<component name="commsinfrastructuresvs" long-name="Comms Infrastructure Verification Suite" introduced="^3" purpose="development">
-<unit mrp="os/commsfw/commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
-</component>
-</collection>
-<collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
-<component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
-</component>
-<component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" purpose="mandatory" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
-</component>
-<component name="commstools" long-name="Comms Tools" introduced="^3" purpose="development" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/commstools/group" mrp="os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
-</component>
-</collection>
-</block>
-<block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
-<component name="internetsockets" long-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>
-<collection name="tcpiputils" long-name="TCP/IP Utilities" level="plugin">
-<component name="dnd" long-name="DND" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/dnd/group" mrp="os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
-</component>
-<component name="dhcp" long-name="DHCP" introduced="8.0" purpose="optional">
-<unit bldFile="os/networkingsrv/tcpiputils/dhcp/group" mrp="os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
-</component>
-<component name="networkaddressandporttranslation" long-name="Network Address and Port Translation" introduced="^2" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
-</component>
-<component name="punycodeconv" long-name="Punycode Converter" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/punycodeconv/group" mrp="os/networkingsrv/tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
-</component>
-</collection>
-<collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
-<component name="nullagt" long-name="NULL AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/nullagt/group" mrp="os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
-</component>
-<component name="genericscprparameters" long-name="Generic SCPR Parameters" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/linklayercontrol/genericscprparameters/group" mrp="os/networkingsrv/linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
-</component>
-<component name="mbmsparameters" long-name="MBMS Parameters" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/mbmsparameters/group" mrp="os/networkingsrv/linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
-</component>
-<component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
-<unit bldFile="os/networkingsrv/linklayercontrol/networkinterfacemgr/group" mrp="os/networkingsrv/linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp" version="2"/>
-</component>
-</collection>
-<collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
-<component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
-</component>
-<component name="pppnif" long-name="PPP NIF" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/pppnif/group" mrp="os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp" version="2"/>
-</component>
-<component name="slipnif" long-name="SLIP NIF" purpose="development" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/slipnif/group" mrp="os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
-</component>
-<component name="tunnelnif" long-name="Tunnel NIF" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
-</component>
-</collection>
-<collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
-<component name="packetlogger" long-name="Packet Logger" introduced="8.1" purpose="development">
-<unit bldFile="os/networkingsrv/linklayerutils/packetlogger/group" mrp="os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
-</component>
-</collection>
-<collection name="networkcontrol" long-name="Network Control" level="plugin">
-<component name="qoslib" long-name="QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/qoslib/group" mrp="os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
-</component>
-<component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/pfqoslib/group" mrp="os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
-</component>
-<component name="qosfwprt" long-name="QoS Framework PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
-</component>
-<component name="qosipscpr" long-name="QoS IP SCPR" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosipscpr/group" mrp="os/networkingsrv/networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
-</component>
-<component name="ipnetworklayer" long-name="IP Network Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/ipnetworklayer/group" mrp="os/networkingsrv/networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
-</component>
-<component name="iptransportlayer" long-name="IP Transport Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/iptransportlayer/group" mrp="os/networkingsrv/networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
-</component>
-<component name="commsuserpromptmgr" long-name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkcontrol/commsuserpromptmgr/group" mrp="os/networkingsrv/networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
-</component>
-</collection>
-<collection name="networkprotocols" long-name="Network Protocols" level="plugin">
-<component name="ipeventnotifier" long-name="IP Event Notifier" introduced="8.1" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
-</component>
-<component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
-</component>
-<component name="iphook" long-name="IP Hook" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
-</component>
-<component name="mobileip" long-name="Mobile IP" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/mobileip/group" mrp="os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
-</component>
-<component name="dnsproxy" long-name="DNS Proxy" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/networkprotocols/dnsproxy/group" mrp="os/networkingsrv/networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
-</component>
-</collection>
-<collection name="networksecurity" long-name="Network Security" level="framework">
-<component name="tls" long-name="TLS" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tls/group" mrp="os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
-</component>
-<component name="tlsprovider" long-name="TLS Provider" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tlsprovider/group" mrp="os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
-</component>
-<component name="ipsec" long-name="IPsec" introduced="7.0" purpose="optional">
-<unit bldFile="os/networkingsrv/networksecurity/ipsec/group" mrp="os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
-</component>
-</collection>
-<collection name="networkingtestandutils" long-name="Networking Test and Utils" level="app-if">
-<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">
-<!-- production component: contains the IBY files -->
-<unit bldFile="os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
-</component>
-<component name="networkingdocs" long-name="Networking Documentation" purpose="development" class="doc">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
-</component>
-<component name="networkingsrv_metadata" long-name="Networking Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
-<component name="predictorcompression" long-name="Predictor Compression" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wlan" level="services" long-name="WLAN" levels="hw low mid high tools test">
-<collection name="wlan_plat" long-name="WLAN Platform Interfaces" level="test">
-<component name="wlan_dbif_api" long-name="WLAN DBIF API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_dbif_api/group"/>
-</component>
-<component name="wlan_hal_api" long-name="WLAN HAL API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hal_api/group"/>
-</component>
-<component name="wlan_management_api" long-name="WLAN Management API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_management_api/group"/>
-</component>
-<component name="wlan_device_settings_api" long-name="WLAN Device Settings API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_device_settings_api/group"/>
-</component>
-<component name="wlan_control_api" long-name="WLAN Control API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_control_api/group"/>
-</component>
-<component name="wlan_hw_initialization_data_api" long-name="WLAN Hardware Initialization Data API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hw_initialization_data_api/group"/>
-</component>
-<component name="wlan_power_save_plugin_api" long-name="WLAN Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_power_save_plugin_api/group"/>
-</component>
-<component name="wlan_info_api" long-name="WLAN Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_info_api/group"/>
-</component>
-<component name="wlan_agent_hotspot_plugin_api" long-name="WLAN Agent Hotspot Plug-in API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
-</component>
-<component name="wlan_osa_api" long-name="WLAN OSA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_osa_api/group"/>
-</component>
-<component name="wlan_spia_api" long-name="WLAN SPIA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_spia_api/group"/>
-</component>
-<component name="wlan_hpa_api" long-name="WLAN HPA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hpa_api/group"/>
-</component>
-<component name="wlan_eapol_plugin_api" long-name="WLAN EAPOL Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_eapol_plugin_api/group"/>
-</component>
-<component name="wlan_generic_plugin_api" long-name="WLAN Generic Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_generic_plugin_api/group"/>
-</component>
-<component name="wlan_aws_plugin_api" long-name="WLAN AWS Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_aws_plugin_api/group"/>
-</component>
-</collection>
-<collection name="wlan_pub" long-name="WLAN Public Interfaces" level="test">
-<component name="wlan_sdk_info_api" long-name="WLAN SDK Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_pub/wlan_sdk_info_api/group"/>
-</component>
-</collection>
-<collection name="wlan_bearer" long-name="WLAN Bearer" level="hw">
-<component name="wlanpsmplugin" filter="s60" long-name="WLAN PSM Plugin" plugin="Y">
-<unit bldFile="os/wlan/wlan_bearer/wlanpsmplugin/group"/>
-</component>
-<component name="wlanagent" filter="s60" long-name="WLAN Agent">
-<unit bldFile="os/wlan/wlan_bearer/wlanagent/group"/>
-</component>
-<component name="wlandbif_cd" filter="s60" long-name="WLAN CommsDat interface">
-<unit bldFile="os/wlan/wlan_bearer/wlandbif_cd/group"/>
-</component>
-<!-- should follow component directory rules for stuff in wlan_symbian/ and put in a single component or split up properly -->
-<component name="wlanengine" filter="s60" long-name="WLAN Engine">
-<unit bldFile="os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
-</component>
-<component name="wlanldd" filter="s60" long-name="WLAN LDD">
-<unit bldFile="os/wlan/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
-</component>
-<component name="wlannwif" filter="s60" long-name="WLAN Network Interface">
-<unit bldFile="os/wlan/wlan_bearer/wlannwif/group"/>
-</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="adaptation hw-if plugin framework server app-if">
-<collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
-<component name="basebandchanneladaptor" long-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 name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
-<component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
-</component>
-</collection>
-<collection name="fax" long-name="Fax" level="server">
-<component name="faxclientandserver" long-name="Fax Client and Server" purpose="optional">
-<unit bldFile="os/cellularsrv/fax/faxclientandserver/Group" mrp="os/cellularsrv/fax/faxclientandserver/Group/telephony_fax.mrp"/>
-</component>
-</collection>
-<collection name="smsprotocols" long-name="SMS Protocols" level="framework">
-<component name="smsstack" long-name="SMS Stack" introduced="6.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/cellularsrv/smsprotocols/smsstack/group" mrp="os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
-</component>
-</collection>
-<collection name="telephonyprotocols" long-name="Telephony Protocols" level="framework">
-<component name="csdagt" long-name="CSD AGT" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/csdagt/group" mrp="os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
-</component>
-<component name="psdagt" long-name="PSD AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/psdagt/group" mrp="os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
-</component>
-<component name="gprsumtsqosprt" long-name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
-</component>
-<component name="gprsumtsqosinterface" long-name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
-</component>
-<component name="qosextnapi" long-name="QoS Extn API" introduced="9.2" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
-</component>
-<component name="secondarypdpcontextumtsdriver" long-name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
-</component>
-<component name="qos3gppcpr" long-name="QoS 3GPP CPR" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
-</component>
-<component name="pdplayer" long-name="PDP Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/pdplayer/group" mrp="os/cellularsrv/telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
-</component>
-<component name="rawipnif" long-name="Raw IP NIF" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserver" long-name="Telephony Server" level="server">
-<component name="etelserverandcore" long-name="ETel Server and Core" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
-</component>
-<component name="etelmultimode" long-name="ETel Multimode" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelmultimode/group" mrp="os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
-</component>
-<component name="etelpacketdata" long-name="ETel Packet Data" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
-</component>
-<component name="etelsimtoolkit" long-name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
-<component name="common_tsy" long-name="Common TSY" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
-</component>
-<component name="licenseetsystub" long-name="Licensee TSY Stub" introduced="^2" purpose="development" filter="sf_build" plugin="Y">
-<unit mrp="os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="os/cellularsrv/telephonyserverplugins/licenseetsystub/group"/>
-</component>
-<component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
-</component>
-<component name="simtsy" long-name="SIM TSY" introduced="7.0" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
-</component>
-<component name="ctsydispatchlayer" long-name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
-</component>
-<component name="simatktsy" long-name="SIMATK TSY" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simatktsy/group" mrp="os/cellularsrv/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
-</component>
-</collection>
-<collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
-<component name="dial" long-name="Dial" deprecated="9.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyutils/dial/group" mrp="os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
-</component>
-<component name="telephonywatchers" long-name="Telephony Watchers" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
-</component>
-<component name="etel3rdpartyapi" long-name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrv_info" long-name="Cellular Baseband Services Info" level="app-if">
-<component name="telephonyconfidentialdocs" long-name="Telephony Confidential Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
-</component>
-<component name="telephonydocs" long-name="Telephony Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
-</component>
-<component name="cellularsrv_metadata" long-name="Cellular Baseband Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
-<component name="mocksy" long-name="MockSY" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if"/>
-<collection name="wapstack" long-name="WAP Stack" level="app-if">
-<component name="wapmessageapi" long-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>
-</block>
-<block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
-<collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
-<component name="bluetooth_audio_adaptation_api" long-name="Bluetooth Audio Adaptation API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
-</component>
-<component name="bluetooth_power_management_api" long-name="Bluetooth Power Management API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_power_management_api/group"/>
-</component>
-<component name="at_command_handler_plugin_api" long-name="AT Command Handler Plugin API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/at_command_handler_plugin_api/group"/>
-</component>
-</collection>
-<collection name="bluetooth" long-name="Bluetooth Core" level="framework">
-<component name="btstack" long-name="Bluetooth Stack" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btstack" mrp="os/bt/bluetooth/btstack/bluetooth_stack.mrp"/>
-</component>
-<component name="btcomm" long-name="Bluetooth CSY" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetooth/btcomm" mrp="os/bt/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
-</component>
-<component name="btsdp" long-name="Bluetooth SDP" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btsdp" mrp="os/bt/bluetooth/btsdp/bluetooth_sdp.mrp"/>
-</component>
-<component name="btextnotifiers" long-name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btextnotifiers" mrp="os/bt/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
-</component>
-<component name="gavdp" long-name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/gavdp/group" mrp="os/bt/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
-</component>
-<component name="btlogger" long-name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btlogger/group" mrp="os/bt/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
-</component>
-<component name="btdocs" long-name="Bluetooth Documentation" purpose="development" class="doc">
-<unit mrp="os/bt/bluetooth/btdocs/bluetooth_documentation.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothmgmt" long-name="Bluetooth Management" level="plugin">
-<component name="btmgr" long-name="Bluetooth Manager" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btmgr" mrp="os/bt/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
-</component>
-<component name="btconfig" long-name="Bluetooth Config" purpose="optional" class="config">
-<unit bldFile="os/bt/bluetoothmgmt/btconfig" mrp="os/bt/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
-</component>
-<component name="btrom" long-name="Bluetooth ROM" introduced="9.1" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btrom" mrp="os/bt/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
-</component>
-<component name="bluetoothclientlib" long-name="Bluetooth Client Library" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/bluetoothclientlib" mrp="os/bt/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothcommsprofiles" long-name="Bluetooth Comms Profiles" level="app-if">
-<component name="btpan" long-name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetoothcommsprofiles/btpan/group" mrp="os/bt/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
-</component>
-</collection>
-<collection name="bthci" long-name="Host Controller Interface" level="server">
-<component name="bthci2" long-name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bthci/bthci2/group" mrp="os/bt/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
-</component>
-<component name="hciextensioninterface" long-name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bthci/hciextensioninterface" mrp="os/bt/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
-</component>
-<component name="hci2implementations" long-name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bthci/hci2implementations/group" mrp="os/bt/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
-</component>
-</collection>
-<collection name="irda" long-name="IrDA" level="plugin">
-<component name="irdastack" long-name="IrDA Stack" purpose="optional">
-<unit bldFile="os/bt/irda/irdastack/group" mrp="os/bt/irda/irdastack/group/infra-red_irda.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if"/>
-<collection name="atext" long-name="AT Extensions" level="server">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="atext_build" long-name="AT Extension Build" introduced="^3" purpose="optional" filter="s60">
-<unit bldFile="os/bt/atext/group"/>
-</component>
-</collection>
-<collection name="bt_info" long-name="Bluetooth Info" level="app-if">
-<component name="bt_metadata" long-name="Bluetooth Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/bt/bt_info/bt_metadata/bt_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
-<collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
-<!-- usbclientdrivers to be moved here from kernelhwsrv-->
-</collection>
-<collection name="usbmgmt" long-name="USB Management" level="server">
-<component name="usbmgr" long-name="USB Manager" purpose="optional">
-<unit bldFile="os/usb/usbmgmt/usbmgr/group" mrp="os/usb/usbmgmt/usbmgr/group/usb_manager.mrp" version="2"/>
-</component>
-<component name="usbclassandmgrdocs" long-name="USB Class and Manager Documentation" purpose="development" class="doc">
-<unit mrp="os/usb/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
-</component>
-</collection>
-<collection name="usb_info" long-name="USB Info" level="app-if">
-<component name="usb_metadata" long-name="USB Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/usb/usb_info/usb_metadata/usb_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="mm" level="services" long-name="Multimedia" levels="adaptation 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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-</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"/>
-</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"/>
-</component>
-<component name="aac_decoder_config_proxy_api" long-name="AAC Decoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/aac_decoder_config_proxy_api/group"/>
-</component>
-<component name="added_devsound_control_api" long-name="Added DevSound Control API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_api/group"/>
-</component>
-<component name="added_devsound_control_msg_hdlr_api" long-name="Added DevSound Control Msg Hdlr API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_msg_hdlr_api/group"/>
-</component>
-<component name="added_devsound_control_proxy_api" long-name="Added DevSound Control Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_proxy_api/group"/>
-</component>
-<component name="audio_effects_msg_hdlr_api" long-name="Audio Effects Message Handler API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_msg_hdlr_api/group"/>
-</component>
-<component name="audio_effects_proxy_api" long-name="Audio Effects Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_proxy_api/group"/>
-</component>
-<component name="audio_policy_header_api" long-name="Audio Policy Header API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="audio_routing_proxy_api" long-name="Audio Routing Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_routing_proxy_api/group"/>
-</component>
-<component name="custom_interface_builder_api" long-name="Custom Interface Builder API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_builder_api/group"/>
-</component>
-<component name="custom_interface_message_handler_factory_api" long-name="Custom Interface Message Handler Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_message_handler_factory_api/group"/>
-</component>
-<component name="custom_interface_proxy_factory_api" long-name="Custom Interface Proxy Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_proxy_factory_api/group"/>
-</component>
-<component name="custom_interface_utility_api" long-name="Custom Interface Utility API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_utility_api/group"/>
-</component>
-<component name="devsound_adaptation_api" long-name="DevSound Adaptation API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/devsound_adaptation_api/group"/>
-</component>
-<component name="display_posting_api" long-name="Display Posting API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="eaac_plus_decoder_interface_proxy_api" long-name="eAAC Plus Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="error_concealment_interface_proxy_api" long-name="Error Concealment Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
-</component>
-<component name="fm_radio_adaptation_api" long-name="FM Radio Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_decoder_interface_proxy_api" long-name="G711 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_encoder_interface_proxy_api" long-name="G711 Encoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_decoder_interface_proxy_api" long-name="G729 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_encoder_interface_msg_hdlr_api" long-name="G729 Encoder Interface Message Handler API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</component>
-<component name="ilbc_decoder_interface_proxy_api" long-name="Ilbc Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ilbc_encoder_interface_proxy_api" long-name="Ilbc Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="mdf_plugin_uids" long-name="MDF Plug-in UIDs" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/mdf_plugin_uids/group"/>
-</component>
-<component name="multimedia_fourcc_definitions_api" long-name="Multimedia FourCC Definitions API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/multimedia_fourcc_definitions_api/group"/>
-</component>
-<component name="nokia_audio_policy_header_api" long-name="Nokia Audio Policy Header API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/nokia_audio_policy_header_api/group"/>
-</component>
-<component name="nokia_multimedia_fourcc_definitions_api" long-name="Nokia Multimedia Fourcc Definitions API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ra8_decoder_interface_proxy_api" long-name="RA8 Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
-</component>
-<component name="rds_adaptation_api" long-name="RDS Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="restricted_audio_output_proxy_api" long-name="Restricted Audio Output Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="sbc_encoder_interface_proxy_api" long-name="SBC Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/sbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="secure_output_mdf_custom_interface" long-name="Secure Output MDF Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="speech_encoder_config_proxy_api" long-name="Speech Encoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/speech_encoder_config_proxy_api/group"/>
-</component>
-<component name="telephony_audio_routing_client_api" long-name="Telephony Audio Routing Client API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_client_api/group"/>
-</component>
-<component name="telephony_audio_routing_manager_api" long-name="Telephony Audio Routing Manager API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_manager_api/group"/>
-</component>
-<component name="video_buffer_management_mdf_custom_interface" long-name="Video Buffer Management MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_buffer_management_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_rotation_mdf_custom_interface" long-name="Video Decoder Rotation MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_scaling_mdf_custom_interface" long-name="Video Decoder Scaling MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
-</component>
-<component name="video_reclaim_extbuffers_ci" long-name="Video Reclaim Extbuffers Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_reclaim_extbuffers_ci/group"/>
-</component>
-<component name="video_window_control_custom_interface" long-name="Video Window Control Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="wma_decoder_interface_proxy_api" long-name="WMA Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/wma_decoder_interface_proxy_api/group"/>
-</component>
-<component name="eaacplusutil_api" long-name="EAac Plus Util API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/eaacplusutil_api/group"/>
-</component>
-<component name="frametable_api" long-name="Frametable API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/frametable_api/group"/>
-</component>
-</collection>
-<collection name="devsoundextensions" long-name="Devsound Extensions" level="device-fw">
-<component name="drmaudioplayer" filter="s60" long-name="DRM Audio Player">
-<unit bldFile="os/mm/devsoundextensions/drmaudioplayer/group"/>
-</component>
-<component name="mmextfw" filter="s60" long-name="Multimedia Extension Framework">
-<unit bldFile="os/mm/devsoundextensions/mmextfw/group"/>
-</component>
-<component name="audiorouting" filter="s60" long-name="Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/audiorouting/group"/>
-</component>
-<component name="effects" filter="s60" long-name="Effects">
-<unit bldFile="os/mm/devsoundextensions/effects/group"/>
-</component>
-<component name="effectspresets" filter="s60" long-name="Effects Presets">
-<unit bldFile="os/mm/devsoundextensions/effectspresets/group"/>
-</component>
-<component name="effectspresets_utils" filter="s60" long-name="Effects Presets Utils">
-<!-- need to #include the lot from a single bld.inf
- Also move to a standard component location, not under effectspresets -->
-<unit bldFile="os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
-<unit bldFile="os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
-</component>
-<component name="telephonyaudiorouting" filter="s60" long-name="Telephony Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/group"/>
-</component>
-<component name="mmfcustominterfaces" filter="s60" long-name="MMF Custom Interfaces">
-<unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/group"/>
-</component>
-<component name="addeddevsoundcontrol" filter="s60" long-name="Added DevSound Control">
-<unit bldFile="os/mm/devsoundextensions/addeddevsoundcontrol/group"/>
-</component>
-<component name="globalaudiosettings" filter="s60" long-name="Global Audio Settings">
-<unit bldFile="os/mm/devsoundextensions/globalaudiosettings/group"/>
-</component>
-<component name="restrictedaudiooutput" filter="s60" long-name="Restricted Audio Output">
-<unit bldFile="os/mm/devsoundextensions/restrictedaudiooutput/group"/>
-</component>
-<component name="ciextnfactoryplugins" filter="s60" long-name="Custom Interface Extension Factory Plugins" plugin="Y">
-<unit bldFile="os/mm/devsoundextensions/ciextnfactoryplugins/group"/>
-</component>
-</collection>
-<collection name="mdfdevvideoextensions" long-name="MDF Dev Video Extensions" level="device-fw">
-<component name="nga_mdf_postprocessor" long-name="NGA MDF Postprocessor" filter="s60">
-<unit bldFile="os/mm/mdfdevvideoextensions/nga_mdf_postprocessor/group"/>
-</component>
-</collection>
-<collection name="audio" long-name="Audio Codecs" level="middleware">
-<component name="arm_cmmf_codecs" filter="s60" long-name="ARM CMMF Codecs" plugin="Y">
-<unit bldFile="os/mm/audio/arm_cmmf_codecs/group"/>
-</component>
-</collection>
-<collection name="video" long-name="Video Codecs" level="middleware">
-<!-- empty -->
-</collection>
-<collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
-<component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/imagingandcamerafws/imagingfws/group" mrp="os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
-</component>
-<component name="camerafw" long-name="Camera Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/imagingandcamerafws/camerafw/group" mrp="os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
-</component>
-</collection>
-<collection name="mmlibs" long-name="Multimedia Libraries" level="middleware">
-<component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmutilitylib/group" mrp="os/mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
-</component>
-<component name="mmfw" long-name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmfw/group" mrp="os/mm/mmlibs/mmfw/group/multimedia_mmf.mrp"/>
-</component>
-</collection>
-<collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
-<component name="imagingplugins" long-name="Imaging Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/imagingplugins/group" mrp="os/mm/mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
-</component>
-<component name="cameraplugins" long-name="Camera Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/cameraplugins/group" mrp="os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
-</component>
-<component name="lib3gp" long-name="3GP Library" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/mmplugins/lib3gp/group" mrp="os/mm/mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
-</component>
-<component name="mmfwplugins" long-name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/mmfwplugins/group" mrp="os/mm/mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
-</component>
-</collection>
-<collection name="mm_info" long-name="Multimedia Info" level="app-if">
-<component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc">
-<unit mrp="os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
-</component>
-<component name="mm_metadata" long-name="Multimedia Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
-<component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="^2" purpose="development">
-<unit bldFile="os/mm/mmresourcemgmt/mmresctrl/group" mrp="os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
-</component>
-</collection>
-<collection name="mmdevicefw" long-name="Multimedia Device Framework" level="device-fw">
-<component name="mdf" long-name="Media Device Framework" introduced="9.2" purpose="mandatory">
-<unit bldFile="os/mm/mmdevicefw/mdf/group" mrp="os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
-</component>
-<component name="speechrecogsupport" long-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 name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
-<component name="videorenderer" long-name="Video Renderer" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/mmswadaptation/videorenderer/group" mrp="os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
-</component>
-</collection>
-<collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw"/>
-<collection name="omxil" long-name="OpenMAX IL" level="hw-if">
-<component name="omxilapi" long-name="OpenMAX IL API" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilapi/group" mrp="os/mm/omxil/omxilapi/group/multimedia_omx_il_api.mrp" version="1"/>
-</component>
-<component name="omxilcore" long-name="OpenMAX IL Core" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcore/group" mrp="os/mm/omxil/omxilcore/group/multimedia_omx_il_core.mrp" version="1"/>
-</component>
-<component name="omxilcomponentcommon" long-name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcomponentcommon/group" mrp="os/mm/omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp" version="1"/>
-</component>
-<component name="omxilrefcomps" long-name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilrefcomps/ref_components/group" mrp="os/mm/omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp" version="1"/>
-</component>
-<component name="mmilapi" long-name="Multimedia Integration Layer API" introduced="^3" purpose="development">
-<unit bldFile="os/mm/omxil/mmilapi/group" mrp="os/mm/omxil/mmilapi/group/multimedia_il_api.mrp"/>
-</component>
-</collection>
-<collection name="devsound" long-name="Sound Device" level="devices">
-<component name="devsoundapi" long-name="DevSound API" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/devsound/devsoundapi/group" mrp="os/mm/devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
-</component>
-<component name="a3fdevsound" long-name="A3F DevSound" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3fdevsound/group" mrp="os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
-</component>
-<component name="a3facf" long-name="A3F Audio Component Framework" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3facf/group" mrp="os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
-</component>
-<component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/devsound/devsoundpluginsupport/group" mrp="os/mm/devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
-</component>
-<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">
-<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">
-<unit bldFile="os/mm/devsound/a3ftrace/group" mrp="os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
-</component>
-<component name="a3fsrvstart" long-name="A3F Server Start" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
-</component>
-</collection>
-<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
-<component name="devsoundhwdeviceapi" long-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 name="a3facl" long-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 name="a3fdevsoundcustomisation" long-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"/>
-</component>
-<component name="refacladapt" long-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"/>
-</component>
-<component name="videohai" long-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 name="dvbhreceiverhai" long-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>
-</block>
-<block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
-<collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
-<component name="exif_api" long-name="Exif API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagingext_plat" long-name="Imaging Extensions Platform Interfaces" level="app-if">
-<component name="jpeg2000_icl_plugin_api" long-name="JPEG2000 ICL plugin API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/jpeg2000_icl_plugin_api/group"/>
-</component>
-<component name="extended_icl_jpeg_api" long-name="Extended ICL Jpeg API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
-</component>
-<component name="h324_annex_k_custom_api" long-name="H324 Annex K Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/h324_annex_k_custom_api/group"/>
-</component>
-<component name="ecam_orientation_custom_api" long-name="ECam Orientation Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_orientation_custom_api/group"/>
-</component>
-<component name="ecam_ui_orientation_override_custom_api" long-name="ECam UI Orientation Override Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
-</component>
-<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>
-</collection>
-<collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
-<component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
-<unit bldFile="os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
-</component>
-<component name="imageadaptationextensions_build" filter="s60" long-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"/>
-</component>
-</collection>
-<collection name="imagingmodules" long-name="Imaging Modules" level="hw-if">
-<component name="exiflib" filter="s60" long-name="Exif Library">
-<unit bldFile="os/imagingext/imagingmodules/exiflib/group"/>
-</component>
-<component name="jp2kcodec" filter="s60" long-name="JPEG2000 Decoder Plugin" plugin="Y">
-<unit bldFile="os/imagingext/imagingmodules/jp2kcodec/group"/>
-</component>
-</collection>
-</block>
-<block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
-<component name="vgi" filter="s60" long-name="VGI">
-<unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
-</component>
-</collection>
-<collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adaptations">
-<component name="m3gcore11" filter="s60" long-name="M3G Core 1.1">
-<unit bldFile="os/graphics/m3g/m3gcore11/group"/>
-</component>
-</collection>
-<collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines">
-<component name="graphicsresource" long-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 name="graphicsresourceadaptation" long-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"/>
-</component>
-</collection>
-<collection name="graphicsutils" long-name="Graphics Utils" level="engines">
-<component name="commongraphicsheaders" long-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 name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
-<!-- displayldd to be moved here -->
-<component name="surfacemgr" long-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 name="graphicscomposition" long-name="Graphics Composition" level="engines">
-<component name="openwfcinterface" long-name="OpenWF Composition Interface" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfcinterface/group" mrp="os/graphics/graphicscomposition/openwfcinterface/group/graphics_openwfcinterface.mrp"/>
-</component>
-<component name="openwfcompositionengine" long-name="OpenWF Composition Engine" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/graphicscomposition/openwfcompositionengine/group" mrp="os/graphics/graphicscomposition/openwfcompositionengine/group/graphics_openwfcompositionengine.mrp"/>
-</component>
-<component name="openwfsupport" long-name="OpenWF Support" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfsupport/group" mrp="os/graphics/graphicscomposition/openwfsupport/group/graphics_openwfsupport.mrp"/>
-</component>
-<component name="surfaceupdate" long-name="Surface Update" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/surfaceupdate/group" mrp="os/graphics/graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
-</component>
-</collection>
-<collection name="graphicstest" long-name="Graphics Test" level="app-if">
-<component name="uibench" long-name="UI Bench" introduced="9.2" purpose="development">
-<unit bldFile="os/graphics/graphicstest/uibench/group" mrp="os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
-</component>
-</collection>
-<collection name="graphics_plat" long-name="Graphics Platform Interfaces" level="app-if">
-<component name="m3g_core_api" filter="sf_build" long-name="M3G Core API" class="api">
-<unit bldFile="os/graphics/graphics_plat/m3g_core_api/group"/>
-</component>
-</collection>
-<collection name="graphics_info" long-name="Graphics Info" level="app-if">
-<component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc">
-<unit mrp="os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
-</component>
-<component name="graphics_metadata" long-name="Graphics Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
-</component>
-</collection>
-<collection name="windowing" long-name="Windowing" level="app-if">
-<component name="windowserver" long-name="Window Server" purpose="mandatory">
-<unit bldFile="os/graphics/windowing/windowserver/group" mrp="os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
-</component>
-<component name="windowserverplugins" long-name="Window Server Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/windowing/windowserverplugins/group" mrp="os/graphics/windowing/windowserverplugins/group/graphics_wserv_std_plugins.mrp"/>
-</component>
-</collection>
-<collection name="printingservices" long-name="Printing Services" level="app-if">
-<component name="printerdriversupport" long-name="Printer Driver Support" purpose="optional">
-<unit bldFile="os/graphics/printingservices/printerdriversupport/group" mrp="os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
-</component>
-<component name="printerdrivers" long-name="Printer Drivers" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/printingservices/printerdrivers/group" mrp="os/graphics/printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
-</component>
-</collection>
-<collection name="fbs" long-name="Font and Bitmap Server" level="device-interface">
-<component name="fontandbitmapserver" long-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 name="opengles" long-name="OpenGLES" level="internal-adaptations">
-<component name="openglesinterface" long-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 name="opengles_stub" filter="sf_build" long-name="OpenGL ES Stub" purpose="optional" introduced="^2">
-<unit bldFile="os/graphics/opengles/openglesinterface/group/opengles_stub"/>
-</component>
-</collection>
-<collection name="openvg" long-name="OpenVG" level="internal-adaptations">
-<component name="openvginterface" long-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 name="openvg11" filter="s60" long-name="OpenVG 1.1">
-<!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
-<unit bldFile="os/graphics/openvg/openvginterface/group/openvg11"/>
-</component>
-<component name="sfopenvg" filter="sf_build" long-name="Khronos OpenVG Reference Implementation" introduced="^2" purpose="optional">
-<unit bldFile="os/graphics/openvg/openvgrefimplementation/sfopenvg/group"/>
-</component>
-</collection>
-<collection name="egl" long-name="EGL" level="internal-adaptations">
-<component name="eglinterface" long-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 name="eglswitch" long-name="EGL Switch" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglswitch/group" mrp="os/graphics/egl/eglswitch/group/graphics_eglswitch.mrp"/>
-</component>
-<component name="eglrefimpl" long-name="EGL Reference Implementation" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglrefimpl/group" mrp="os/graphics/egl/eglrefimpl/group/graphics_eglrefimpl.mrp"/>
-</component>
-<component name="egltest" long-name="EGL Tests" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/egl/egltest/group" mrp="os/graphics/egl/egltest/group/graphics_egltest.mrp"/>
-</component>
-</collection>
-<collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
-<component name="gdi" long-name="GDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/gdi/group" mrp="os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
-</component>
-<component name="bitgdi" long-name="BitGDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
-</component>
-<component name="colourpalette" long-name="Colour Palette" introduced="7.0s" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
-</component>
-<component name="screendriver" long-name="Screen Driver" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/graphicsdeviceinterface/screendriver/group" mrp="os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
-</component>
-<component name="directgdi" long-name="DirectGDI" introduced="^3" deprecated="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/directgdi/group" mrp="os/graphics/graphicsdeviceinterface/directgdi/group/graphics_directgdi.mrp"/>
-</component>
-<component name="directgdiinterface" long-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 name="directgdiadaptation" long-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"/>
-</component>
-</collection>
-<collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
-<component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/gdi_tools/group" mrp="os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
-</component>
-</collection>
-<collection name="graphicsapitest" long-name="Graphics API Tests" level="app-if"/>
-</block>
-<block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
-<collection name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" level="text">
-<component name="findutil_api" long-name="Find Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/findutil_api/group"/>
-</component>
-<component name="japanese_language_utilities_api" long-name="Japanese Language Utilities API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
-</component>
-<component name="sortutil_api" long-name="Sorting Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/sortutil_api/group"/>
-</component>
-</collection>
-<collection name="textandloc_pub" long-name="Text and Localisation Public Interfaces" level="text">
-<component name="directory_localizer_api" long-name="Directory Localizer API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_pub/directory_localizer_api/group"/>
-</component>
-</collection>
-<collection name="charconvfw" long-name="Character Conversion" level="encoding">
-<component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional">
-<unit bldFile="os/textandloc/charconvfw/charconv_fw/group" mrp="os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
-</component>
-<component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/charconvplugins/group" mrp="os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
-</component>
-<component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/fatfilenameconversionplugins/group" mrp="os/textandloc/charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
-</component>
-</collection>
-<collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
-<component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/textshaperplugin/group" mrp="os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
-</component>
-<component name="fontstore" long-name="Font Store" purpose="mandatory">
-<unit bldFile="os/textandloc/fontservices/fontstore/group" mrp="os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
-</component>
-<component name="textrendering" long-name="Text Rendering" purpose="mandatory" class="placeholder">
-<!-- placeholder for text code from GDI -->
-</component>
-<component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/freetypefontrasteriser/group" mrp="os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
-</component>
-<component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional">
-<unit bldFile="os/textandloc/fontservices/referencefonts/group" mrp="os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
-</component>
-</collection>
-<collection name="textlayout" long-name="Text Layout" level="text">
-<component name="texthandling" long-name="Text Handling" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/texthandling/group" mrp="os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
-</component>
-<component name="textformatting" long-name="Text Formatting" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/textformatting/group" mrp="os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
-</component>
-</collection>
-<collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
-<!-- components in this collection need to be moved to the right collection.
- Either move into the units' directories, or create a new textandlocutils directory -->
-<component name="numbergrouping" filter="s60" long-name="Number Grouping">
-<unit bldFile="os/textandloc/charconvfw/numbergrouping/group"/>
-</component>
-<component name="jplangutil" filter="s60" long-name="Japanese Language Utilities">
-<unit bldFile="os/textandloc/charconvfw/jplangutil/group"/>
-</component>
-<component name="sortutil" filter="s60" long-name="Sorting Utility">
-<unit bldFile="os/textandloc/charconvfw/sortutil/group"/>
-</component>
-<component name="inlinetext" filter="s60" long-name="Inline Text">
-<unit bldFile="os/textandloc/charconvfw/inlinetext/group"/>
-</component>
-<component name="nearestlangutil" long-name="Nearest Language Util" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-<component name="numberformatting" long-name="Number Formatting" introduced="7.0s" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/numberformatting/group" mrp="os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
-</component>
-</collection>
-<collection name="localesupport" long-name="Locale Support" level="util">
-<component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/localisation/localesupport" mrp="os/textandloc/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
-</component>
-<component name="initlocale" long-name="Initialise Locale" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-</collection>
-<collection name="textandloctools" long-name="Text and Localisation Tools" level="tools">
-<component name="fontcompiler" long-name="Font Compiler" purpose="development" class="placeholder PC">
-<!-- placeholder for split from GDI Tools -->
-</component>
-<component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/bitmapfonttools/group" mrp="os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
-</component>
-</collection>
-<collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
-<component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
-<collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
-<component name="xmlsrv_plat_build" long-name="XML Services Platform Interface Build" filter="s60" class="api">
-<!-- need to fix the configuration used here.
- Either destribute to other components or use the new feature flags confguration mechanisms.
- Remove this component and uncomment the other units when fixed-->
-<unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
-</component>
-<component name="xml_encryption_api" long-name="XML Encryption API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/> -->
-</component>
-<component name="xml_signature_api" long-name="XML Signature API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_signature_api/group"/> -->
-</component>
-<component name="xml_security_engine_utils_api" long-name="XML Security Engine Utils API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/> -->
-</component>
-</collection>
-<collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
-<component name="xmlseccertman" filter="s60" long-name="XML Security Certificate Manager">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
-</component>
-<component name="xmlsec" filter="s60" long-name="XML Security">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsec/group"/>
-</component>
-<component name="xmlseccrypto" filter="s60" long-name="XML Security Crypto">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccrypto/group"/>
-</component>
-<component name="xmlsecwrapper" filter="s60" long-name="XML Security Wrapper">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsecwrapper/group"/>
-</component>
-</collection>
-<collection name="xml" long-name="XML" level="generic">
-<component name="xmlfw" long-name="XML Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmlfw/group" mrp="os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
-</component>
-<component name="libxml2libs" long-name="Libxml2 Libraries" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/libxml2libs/group" mrp="os/xmlsrv/xml/libxml2libs/group/syslibs_libxml2.mrp"/>
-</component>
-<component name="legacyminidomparser" long-name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/legacyminidomparser/GROUP" mrp="os/xmlsrv/xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp"/>
-</component>
-<component name="xmldomandxpath" long-name="XML DOM and XPath" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmldomandxpath/group" mrp="os/xmlsrv/xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
-</component>
-<component name="xmlexpatparser" long-name="XML Expat Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmlexpatparser/group" mrp="os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
-</component>
-<component name="xmllibxml2parser" long-name="XML Libxml2 Parser" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmllibxml2parser/group" mrp="os/xmlsrv/xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
-</component>
-<component name="wbxmlparser" long-name="WBXML Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/wbxmlparser/group" mrp="os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
-</component>
-</collection>
-<collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
-<component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="deviceplatformrelease" level="services" long-name="Device Platform Release" levels="bld mid top">
-<collection name="s60extras" long-name="S60 Extras" level="mid">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="s60extras_build" filter="s60" long-name="S60 Extras Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/S60Extras/group"/>
-</component>
-</collection>
-<collection name="locfiles" long-name="Locale Files" level="mid">
-<component name="locfiles_build" filter="s60" long-name="S60 Locale Files Build" purpose="development" class="config">
-<!-- need to move component down a directory -->
-<unit bldFile="os/deviceplatformrelease/locfiles/group"/>
-</component>
-<component name="locfiles_set1" long-name="Locale Files Set 1" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set1"/>
-</component>
-<component name="locfiles_set2" long-name="Locale Files Set 2" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set2"/>
-</component>
-<component name="locfiles_set3" long-name="Locale Files Set 3" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set3"/>
-</component>
-<component name="locfiles_set4" long-name="Locale Files Set 4" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set4"/>
-</component>
-<component name="locfiles_set5" long-name="Locale Files Set 5" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set5"/>
-</component>
-<component name="locfiles_set6" long-name="Locale Files Set 6" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set6"/>
-</component>
-<!-- is the a problem with SF builds with the following? -->
-<component name="locfiles_set7" long-name="Locale Files Set 7" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set7"/>
-</component>
-<component name="locfiles_set8" long-name="Locale Files Set 8" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set8"/>
-</component>
-<component name="locfiles_set9" long-name="Locale Files Set 9" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set9"/>
-</component>
-<component name="locfiles_set10" long-name="Locale Files Set 10" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set10"/>
-</component>
-<component name="locfiles_set11" long-name="Locale Files Set 11" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set11"/>
-</component>
-<component name="locfiles_set12" long-name="Locale Files Set 12" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set12"/>
-</component>
-<component name="locfiles_set13" long-name="Locale Files Set 13" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set13"/>
-</component>
-<component name="locfiles_set14" long-name="Locale Files Set 14" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set14"/>
-</component>
-<component name="locfiles_set15" long-name="Locale Files Set 15" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set15"/>
-</component>
-<component name="locfiles_set16" long-name="Locale Files Set 16" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set16"/>
-</component>
-</collection>
-<collection name="version" long-name="Version" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="version_build" filter="s60" long-name="Version Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/Version/group"/>
-</component>
-</collection>
-<collection name="helps_loc2" long-name="Helps Locale 2" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helps_loc2_build" long-name="Helps Locale 2 Build" filter="s60">
-<unit bldFile="os/deviceplatformrelease/helps_loc2/group"/>
-</component>
-</collection>
-<collection name="sf_config" long-name="SF Config" level="mid">
-<component name="config" filter="s60" long-name="Config" purpose="development" class="config"/>
-<component name="cenrep" filter="sf_build" long-name="ConE Central Repository Config" purpose="development" class="config">
-<!-- will shoudl give the id/path something more unique than cenrep -->
-<unit bldFile="os/deviceplatformrelease/sf_config/cenrep/group"/>
-</component>
-<component name="rombuild_syborg" filter="sf_build" long-name="Syborg iMaker Config" purpose="development" introduced="^3" class="config">
-<unit bldFile="os/deviceplatformrelease/sf_config/rombuild/syborg/group"/>
-</component>
-<component name="rombuild_zoom2" filter="sf_build" long-name="Zoom2 iMaker Config" purpose="development" introduced="^3" class="config">
-<unit bldFile="os/deviceplatformrelease/sf_config/rombuild/zoom2/group"/>
-</component>
-</collection>
-<!-- should be located locally in buildplatforms/group. NB. This is a different package! -->
-<collection name="s60bld" long-name="S60 Build">
-<component name="buildplatforms" filter="s60" long-name="Build Platforms">
-<unit bldFile="tools/buildplatforms/group"/>
-</component>
-</collection>
-<collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
-<component name="cedarutils" long-name="Cedar Utils" purpose="development">
-<unit mrp="os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
-</component>
-<component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt" purpose="development" class="config">
-<unit mrp="os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
-</component>
-<component name="foundation_s60_packages" long-name="Foundation S60 Packages" introduced="^3" deprecated="^3" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/symbianosbld/foundation_s60_packages/foundation_s60_packages.mrp"/>
-</component>
-</collection>
-<collection name="foundation_system" long-name="Foundation System" level="top">
-<component name="system_model" long-name="System Model" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
-</component>
-</collection>
-<collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
-<component name="deviceplatformrelease_metadata" long-name="Device Platform Release Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="osrndtools" level="services" long-name="OS R&D tools" levels="fw trace">
-<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"/>
-</component>
-<component name="testinterface" filter="s60" long-name="Test Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/testinterface/group"/>
-</component>
-<component name="testserver" filter="s60" long-name="Test Server" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserver/group"/>
-</component>
-<component name="testengine" filter="s60" long-name="Test Engine" purpose="development">
-<unit bldFile="os/osrndtools/stif/testengine/group"/>
-</component>
-<component name="testserverstarter" filter="s60" long-name="Test Server Starter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserverstarter/group"/>
-</component>
-<component name="stiftfwif" filter="s60" long-name="STIF Test Framework Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/stiftfwif/group"/>
-</component>
-<component name="consoleui" filter="s60" long-name="Console UI" purpose="development">
-<unit bldFile="os/osrndtools/stif/consoleui/group"/>
-</component>
-<component name="testcombiner" filter="s60" long-name="Test Combiner" purpose="development">
-<unit bldFile="os/osrndtools/stif/testcombiner/group"/>
-</component>
-<component name="demomodule" filter="s60" long-name="Demo Module" purpose="development">
-<unit bldFile="os/osrndtools/stif/demomodule/group"/>
-</component>
-<component name="atslogger" filter="s60" long-name="ATS Logger" purpose="development">
-<unit bldFile="os/osrndtools/stif/atslogger/group"/>
-</component>
-<component name="atsinterface" filter="s60" long-name="ATS Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/atsinterface/group"/>
-</component>
-<component name="testscripter" filter="s60" long-name="Test Scripter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testscripter/group"/>
-</component>
-<component name="suevent" filter="s60" long-name="SU Event" purpose="development">
-<unit bldFile="os/osrndtools/stif/suevent/group"/>
-</component>
-<component name="stifkerneltestclassbase" filter="s60" long-name="STIF Kernel Test Class Base" purpose="development">
-<!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
-<!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
-</component>
-<component name="stif_build" filter="s60" long-name="STIF Build" purpose="development">
-<!-- move exports into self-contained component. Remove this when configuration is in place-->
-<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">
-<unit bldFile="os/osrndtools/memspy/memspy_plat/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/engine/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/console/group"/>
-</component>
-<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>
-</collection>
-<collection name="hti" long-name="Harmonized Test Interface" level="trace">
-<component name="hti_plat" filter="s60" long-name="HTI Platform Interfaces" purpose="development" class="api">
-<unit bldFile="os/osrndtools/hti/hti_plat/group"/>
-</component>
-<component name="hticfg" filter="s60" long-name="HTI Config" purpose="development">
-<unit bldFile="os/osrndtools/hti/hticfg/group"/>
-</component>
-<component name="htiautostart" filter="s60" long-name="HTI Autostart" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiautostart/group"/>
-</component>
-<component name="htiframework" filter="s60" long-name="HTI Framework" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiframework/group"/>
-</component>
-<component name="hticommplugins" filter="s60" long-name="HTI Communication Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
-</component>
-<component name="htiserviceplugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
-</component>
-<component name="htifilehlp" filter="s60" long-name="HTI File Help" purpose="development">
-<unit bldFile="os/osrndtools/hti/htifilehlp/group"/>
-</component>
-<component name="htiwatchdog" filter="s60" long-name="HTI Watchdog" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiwatchdog/group"/>
-</component>
-<component name="hti_build" filter="s60" long-name="HTI Build" purpose="development">
-<!-- move exports into self-contained component.-->
-<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">
-<block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
-<collection name="appsupport_pub" long-name="Generic Application Support Public Interfaces" level="specific">
-<component name="flash_viewer_framework_api" long-name="Flash Viewer Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
-</component>
-<component name="network_status_api" long-name="Network Status API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/network_status_api/group"/>
-</component>
-</collection>
-<collection name="appsupport_plat" long-name="Generic Application Support Platform Interfaces" level="specific">
-<component name="action_plugin_api" long-name="Action Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/action_plugin_api/group"/>
-</component>
-<component name="application_orientation_api" long-name="Application Orientation API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/application_orientation_api/group"/>
-</component>
-<component name="context_access_api" long-name="Context Access API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_access_api/group"/>
-</component>
-<component name="context_framework_services_api" long-name="Context Framework Services API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_services_api/group"/>
-</component>
-<component name="context_framework_client_api" long-name="Context Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_client_api/group"/>
-</component>
-<component name="context_framework_listener_api" long-name="Context Framework Listener API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_listener_api/group"/>
-</component>
-<component name="context_framework_version_api" long-name="Context Framework Version API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_version_api/group"/>
-</component>
-<component name="context_source_plugin_api" long-name="Context Source Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_plugin_api/group"/>
-</component>
-<component name="context_source_settings_manager_api" long-name="Context Source Settings Manager API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_settings_manager_api/group"/>
-</component>
-<component name="context_subscription_api" long-name="Context Subscription API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_subscription_api/group"/>
-</component>
-<component name="key_event_framework_api" long-name="Key Event Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_api/group"/>
-</component>
-<component name="key_event_framework_mapper_api" long-name="Key Event Framework Mapper API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_mapper_api/group"/>
-</component>
-<component name="media_keys_definition_api" long-name="Media Keys Definition API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/media_keys_definition_api/group"/>
-</component>
-<component name="ood_threshold_api" long-name="OOD Threshold API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/ood_threshold_api/group"/>
-</component>
-<component name="oom_monitor_api" long-name="OOM Monitor API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_api/group"/>
-</component>
-<component name="oom_monitor_plugin_api" long-name="OOM Monitor Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_plugin_api/group"/>
-</component>
-<component name="operation_provider_api" long-name="Operation Provider API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/operation_provider_api/group"/>
-</component>
-<component name="phonecmdhandler_api" long-name="Phone Command Handler API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/phonecmdhandler_api/group"/>
-</component>
-<component name="restore_factory_settings_api" long-name="Restore Factory Settings API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_api/group"/>
-</component>
-<component name="restore_factory_settings_plugin_api" long-name="Restore Factory Settings Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_plugin_api/group"/>
-</component>
-<component name="secondary_display_accfw_api" long-name="Secondary Display Accessory Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_accfw_api/group"/>
-</component>
-<component name="secondary_display_startup_api" long-name="Secondary Display Startup API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_startup_api/group"/>
-</component>
-<component name="secondary_display_sysap_api" long-name="Secondary Display System Application API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_sysap_api/group"/>
-</component>
-<component name="secondary_display_system_state_api" long-name="Secondary Display System State API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_system_state_api/group"/>
-</component>
-<component name="sensor_user_setting_api" long-name="Sensor User Setting API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/sensor_user_setting_api/group"/>
-</component>
-<component name="startup_configuration_api" long-name="Startup Configuration API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/startup_configuration_api/group"/>
-</component>
-<component name="system_application_key_handler_plugin_api" long-name="System Application Key Handler Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_key_handler_plugin_api/group"/>
-</component>
-<component name="system_application_light_control_plugin_api" long-name="System Application Light Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_light_control_plugin_api/group"/>
-</component>
-<component name="system_application_notification_api" long-name="System Application Notification API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_notification_api/group"/>
-</component>
-<component name="system_application_plugin_callback_api" long-name="System Application Plug-in Callback API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
-</component>
-</collection>
-<collection name="contextframework" long-name="Context Framework" level="framework">
-<!-- the units that are commented out need to be put back when configuration is in place.
- They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
-<component name="cfw" filter="s60" long-name="Context Framework">
-<!--<unit bldFile="contextframework/cfw/group"/> -->
-</component>
-<component name="cfwplugins" filter="s60" long-name="Context Framework Plugins" plugin="Y">
-<!--<unit bldFile="contextframework/cfwplugins/group"/>-->
-</component>
-<component name="contextframework_build" filter="s60" long-name="Context Framework Build">
-<unit bldFile="mw/appsupport/contextframework/group"/>
-</component>
-</collection>
-<collection name="coreapplicationuis" long-name="Core Application UIs" level="server">
-<component name="dbrecovery" filter="s60" long-name="Database Recovery">
-<unit bldFile="mw/appsupport/coreapplicationuis/dbrecovery/group"/>
-</component>
-<component name="nspswsplugin" filter="s60" long-name="NSPS WS Plugin" plugin="Y">
-<!-- No Service Power Save? Window Server? Please elaborate-->
-<unit bldFile="mw/appsupport/coreapplicationuis/nspswsplugin/group"/>
-</component>
-<component name="rfs" filter="s60" long-name="Restore Factory Settings">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfs/group"/>
-</component>
-<component name="rfsplugins" filter="s60" long-name="Restore Factory Settings Plugins" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/group"/>
-</component>
-<component name="sysap" filter="s60" long-name="System Application">
-<unit bldFile="mw/appsupport/coreapplicationuis/sysap/group"/>
-</component>
-<component name="variatedsettings" filter="s60" long-name="Variated Settings" class="config">
-<unit bldFile="mw/appsupport/coreapplicationuis/variatedsettings/group"/>
-</component>
-<component name="accfwuinotifier" filter="s60" long-name="Accessory Framework UI Notifier" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/accfwuinotifier/group"/>
-</component>
-<component name="kefmapper" filter="s60" long-name="Key Event Framework">
-<unit bldFile="mw/appsupport/coreapplicationuis/kefmapper/group"/>
-</component>
-<component name="advancedtspcontroller" filter="s60" long-name="Advanced TSP Controller">
-<unit bldFile="mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
-</component>
-<component name="powersaveutilities" filter="s60" long-name="Power Save Utilities">
-<unit bldFile="mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
-</component>
-<component name="gsserverenginestub" filter="s60" long-name="GS Server Engine Stub">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
-</component>
-<component name="gsserverengine" filter="s60" long-name="GS Server Engine">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverengine/group"/>
-</component>
-<component name="sensordatacompensatorplugin" filter="s60" long-name="Sensor Data Compensator Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/group"/>
-</component>
-</collection>
-<collection name="flashliteapi_3_1" long-name="Flash Lite API 3.1" level="specific">
-<!-- collection is really a component. Move down a directory -->
-<component name="flashliteapi_3_1_build" long-name="Flash Lite API Build" filter="s60" introduced="^2"/>
-</collection>
-<collection name="mediakeys" long-name="Media Keys" level="plugin">
-<!-- collection is really a component. Move down a directory -->
-<component name="mediakeys_build" filter="s60" long-name="Media Keys Build">
-<unit bldFile="mw/appsupport/mediakeys/group"/>
-</component>
-</collection>
-<collection name="startupservices" long-name="Startup Services" level="system">
-<component name="splashscreen" filter="s60" long-name="Splash Screen">
-<unit bldFile="mw/appsupport/startupservices/splashscreen/group"/>
-</component>
-<component name="startupanimation" filter="s60" long-name="Startup Animation">
-<unit bldFile="mw/appsupport/startupservices/startupanimation/group"/>
-</component>
-<component name="startup" long-name="Startup Application" filter="s60">
-<unit bldFile="mw/appsupport/startupservices/startup/group"/>
-</component>
-</collection>
-<collection name="sysresmonitoring" long-name="System Resource Monitoring" level="system">
-<component name="oodmonitor" filter="s60" long-name="OOD Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oodmonitor/group"/>
-</component>
-<component name="oommonitor" filter="s60" long-name="OOM Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oommonitor/group"/>
-</component>
-</collection>
-<collection name="systemsettings" long-name="System Settings" level="system">
-<component name="gssensorplugin" filter="s60" long-name="GS Sensor Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gssensorplugin/group"/>
-</component>
-<component name="gsaccessoryplugin" filter="s60" long-name="GS Accessory Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gsaccessoryplugin/group"/>
-</component>
-</collection>
-<collection name="filehandling" long-name="File Handling" level="server">
-<component name="fileconverterfw" long-name="File Converter Framework" purpose="optional">
-<unit bldFile="mw/appsupport/filehandling/fileconverterfw/group" mrp="mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
-</component>
-<component name="htmltorichtextconverter" long-name="HTML to RichText Converter" introduced="7.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/htmltorichtextconverter/group" mrp="mw/appsupport/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
-</component>
-<component name="richtexttohtmlconverter" long-name="RichText to HTML Converter" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
-</component>
-</collection>
-<collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
-<component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
-</component>
-</collection>
-<collection name="commonappservices" long-name="Common Application Services" level="framework">
-<component name="alarmserver" long-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"/>
-</component>
-<component name="alarmservertest" long-name="Alarm Server Test" deprecated="^3" introduced="8.1" purpose="development">
-<unit bldFile="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
-</component>
-<component name="appservicesdocs" long-name="Application Services Documentation" purpose="development" class="doc">
-<unit mrp="mw/appsupport/commonappservices/appservicesdocs/app-services_documentation.mrp"/>
-</component>
-<component name="backuprestorenotification" long-name="Backup Restore Notification" introduced="8.1" purpose="optional">
-<unit bldFile="mw/appsupport/commonappservices/backuprestorenotification/group" mrp="mw/appsupport/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
-</component>
-</collection>
-<collection name="tzservices" long-name="Time Zone Services" level="plugin">
-<component name="tzserver" long-name="Time Zone Server" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzserver/group" mrp="mw/appsupport/tzservices/tzserver/group/app-services_tz.mrp"/>
-</component>
-<component name="tzloc" long-name="Time Zone Localization" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzloc/group" mrp="mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
-</component>
-<component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzlocrscfactory/group" mrp="mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
-</component>
-<component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzdatabase/group" mrp="mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
-</component>
-</collection>
-<collection name="contenthandling" long-name="Content Handling" level="plugin">
-<component name="webrecognisers" long-name="Web Recognisers" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/contenthandling/webrecognisers/group" mrp="mw/appsupport/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
-</component>
-</collection>
-<collection name="openenvutils" long-name="Open Environment Utilities" level="specific">
-<component name="commandshell" long-name="Command Shell" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/commandshell/group" mrp="mw/appsupport/openenvutils/commandshell/group/oetools_zsh.mrp"/>
-</component>
-<component name="telnetserver" long-name="Telnet Server" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/telnetserver/group" mrp="mw/appsupport/openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
-</component>
-</collection>
-<collection name="printingsupport" long-name="Printing Support" level="generic">
-<component name="printinguisupport" long-name="Printing UI Support" purpose="optional" introduced="^2" deprecated="^3">
-<unit bldFile="mw/appsupport/printingsupport/printinguisupport/group" mrp="mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
-</component>
-</collection>
-<collection name="appfw" long-name="Application Framework" level="framework">
-<component name="apparchitecture" long-name="Application Architecture" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/apparchitecture/group" mrp="mw/appsupport/appfw/apparchitecture/group/app-framework_apparc.mrp"/>
-</component>
-<component name="viewserver" long-name="View Server" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/viewserver/group" mrp="mw/appsupport/appfw/viewserver/group/app-framework_viewsrv.mrp"/>
-</component>
-</collection>
-<collection name="applaunchservices" long-name="Application Launch Services" level="generic">
-<component name="aftermarketappstarter" long-name="After Market Application Starter" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/aftermarketappstarter/group" mrp="mw/appsupport/applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
-</component>
-<component name="applaunchplugins" long-name="Application Launch Plugins" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/applaunchplugins/group" mrp="mw/appsupport/applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
-</component>
-</collection>
-<collection name="tzpcside" long-name="Time Zone PC Side" level="plugin">
-<component name="tzcompiler" long-name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config PC">
-<unit bldFile="mw/appsupport/tzpcside/tzcompiler/group" mrp="mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
-</component>
-</collection>
-<collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
-<component name="appsupport_metadata" long-name="Generic Application Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="securitysrv" level="generic" long-name="Security Services" levels="plugin framework server generic specific">
-<collection name="secsrv_plat" long-name="Security Services Platform Interfaces" level="specific">
-<component name="cms_api" long-name="CMS API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/cms_api/group"/>
-</component>
-<component name="pkcs12_parser_api" long-name="PKCS12 Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkcs12_parser_api/group"/>
-</component>
-<component name="java_utils_api" long-name="Java Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/java_utils_api/group"/>
-</component>
-<component name="wim_cert_api" long-name="WIM Cert API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/wim_cert_api/group"/>
-</component>
-<component name="device_key_store_encryption_plugin_api" long-name="Device Key Store Encryption Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/device_key_store_encryption_plugin_api/group"/>
-</component>
-<component name="x509certnameparser_api" long-name="X.509 Certificate Name Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
-</component>
-<component name="remote_lock_api" long-name="Remote Lock API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
-</component>
-<component name="pkidialog_api" long-name="PKI Dialog API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
-</component>
-<component name="provisioning_api" long-name="Provisioning API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/provisioning_api/group"/>
-</component>
-<component name="keyguard_configuration_api" long-name="Keyguard Configuration API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_configuration_api/group"/>
-</component>
-<component name="keylock_policy_api" long-name="Keylock Policy API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keylock_policy_api/group"/>
-</component>
-<component name="security_code_ui_api" long-name="Security Code UI API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
-</component>
-<component name="gba_api" long-name="GBA API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/gba_api/group"/>
-</component>
-<component name="keyguard_access_api" long-name="Keyguard Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_access_api/group"/>
-</component>
-<component name="devicelock_access_api" long-name="Device Lock Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devicelock_access_api/group"/>
-</component>
-<component name="lockapp_server_api" long-name="Lock Application Server API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
-</component>
-<component name="devencadaptation_api" long-name="Device Encryption Adaptation API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
-</component>
-<component name="devenccommonutils_api" long-name="Device Encryption Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
-</component>
-</collection>
-<collection name="cms" long-name="Certificate Management Service" level="server">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="cms_build" filter="s60" long-name="CMS" introduced="^3">
-<unit bldFile="mw/securitysrv/cms/group"/>
-</component>
-</collection>
-<collection name="pkiutilities" long-name="PKI Utilities" level="plugin">
-<component name="x509certnameparser" filter="s60" long-name="X.509 Certificate Name Parser">
-<unit bldFile="mw/securitysrv/pkiutilities/x509certnameparser/group"/>
-</component>
-<component name="pkcs12" filter="s60" long-name="PKCS #12">
-<unit bldFile="mw/securitysrv/pkiutilities/pkcs12/group"/>
-</component>
-<component name="certmanui" filter="s60" long-name="Certificate Management UI">
-<unit bldFile="mw/securitysrv/pkiutilities/certmanui/group"/>
-</component>
-<component name="ctsecuritydialogs" filter="s60" long-name="Crypto Token Security Dialogs">
-<unit bldFile="mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
-</component>
-<component name="certsaver" filter="s60" long-name="Certificate Saver">
-<unit bldFile="mw/securitysrv/pkiutilities/certsaver/group"/>
-</component>
-<component name="secmodui" filter="s60" long-name="Security Module UI">
-<unit bldFile="mw/securitysrv/pkiutilities/secmodui/group"/>
-</component>
-<component name="devicetoken" filter="s60" long-name="Device Token">
-<unit bldFile="mw/securitysrv/pkiutilities/devicetoken/group"/>
-</component>
-<component name="certificates" filter="s60" long-name="Certificates">
-<unit bldFile="mw/securitysrv/pkiutilities/Certificates/group" filter="sf_build"/>
-</component>
-<component name="pkiutilities_build" filter="s60" long-name="PKI Utilities Build">
-<!-- need to split this into the above components -->
-<unit bldFile="mw/securitysrv/pkiutilities/group"/>
-</component>
-<component name="ocsp" long-name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
-<unit bldFile="mw/securitysrv/pkiutilities/ocsp/group" mrp="mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
-</component>
-</collection>
-<collection name="wim" long-name="Wireless Identity Module " level="framework">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="wim_build" filter="s60" long-name="WIM Build">
-<unit bldFile="mw/securitysrv/wim/group"/>
-</component>
-</collection>
-<collection name="remotelock" long-name="Remote Lock" level="generic">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="remotelock_build" filter="s60" long-name="Remote Lock Build">
-<unit bldFile="mw/securitysrv/remotelock/group"/>
-</component>
-</collection>
-<collection name="securitydialogs" long-name="Security Dialogs" level="specific">
-<component name="keylockpolicyapi" filter="s60" long-name="Keylock Policy API">
-<unit bldFile="mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
-</component>
-<component name="autolock" long-name="Autolock" filter="s60">
-<unit bldFile="mw/securitysrv/securitydialogs/autolock/group"/>
-</component>
-<component name="secui" filter="s60" long-name="Security UI">
-<unit bldFile="mw/securitysrv/securitydialogs/secui/group"/>
-</component>
-<component name="securitynotifier" filter="s60" long-name="Security Notifier">
-<unit bldFile="mw/securitysrv/securitydialogs/securitynotifier/group"/>
-</component>
-<component name="lockclient" filter="s60" long-name="Lock Client" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockclient/group"/>
-</component>
-<component name="lockapp" filter="s60" long-name="Lock Application" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockapp/group"/>
-</component>
-<component name="simlockui" filter="s60" long-name="SIM Lock UI" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/simlockui/group"/>
-</component>
-</collection>
-<collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="boottimeintegritycheck_build" filter="s60" long-name="Boot Time Integrity Check Build">
-<unit bldFile="mw/securitysrv/boottimeintegritycheck/group"/>
-</component>
-</collection>
-<collection name="gba" long-name="Generic Bootstrapping Architecture" level="server">
-<component name="uicc" filter="s60" long-name="UICC" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/uicc/group"/>
-</component>
-<component name="gbaserver" filter="s60" long-name="GBA Server" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaserver/group"/>
-</component>
-<component name="gbaapi" filter="s60" long-name="GBA API" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaapi/group"/>
-</component>
-<component name="gbafilter" filter="s60" long-name="GBA HTTP Filter" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/gbafilter/group"/>
-</component>
-<component name="gba_build" filter="s60" long-name="Generic Boot Architecture Build" introduced="^2">
-<!-- need to split this into the above components, or remove #includes and make this GBA ROM -->
-<unit bldFile="mw/securitysrv/gba/group"/>
-</component>
-</collection>
-<collection name="devencdiskutils" long-name="Device Encryption Disk Utils" level="server">
-<component name="devenccommonutils" filter="s60" long-name="Device Encryption Common Utils" introduced="^3">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncCommonUtils/group"/>
-</component>
-<component name="devencrfsplugin" filter="s60" long-name="Device Encryption RFS Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncRfsPlugin/group"/>
-</component>
-<component name="pk5recognizer" filter="s60" long-name="Device Encryption Pk5 Recognizer" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/Pk5Recognizer/group"/>
-</component>
-<component name="devencstarter" filter="s60" long-name="Device Encryption Starter" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncStarter/group"/>
-</component>
-<component name="devencdiskutils" filter="s60" long-name="Device Encryption Disk Utils Build" introduced="^3">
-<!-- need to split this into the above components, or remove #includes and make this a ROM component-->
-<unit bldFile="mw/securitysrv/devencdiskutils/group"/>
-</component>
-</collection>
-<collection name="securitysrv_info" long-name="Security Services Info" level="specific">
-<component name="securitysrv_metadata" long-name="Security Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="drm" level="generic" long-name="DRM" levels="plugin framework server generic specific">
-<collection name="drm_plat" long-name="DRM Platform Interfaces" level="specific">
-<component name="roap_api" long-name="ROAP API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/roap_api/group"/>
-</component>
-<component name="drm_common_api" long-name="DRM Common API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_common_api/group"/>
-</component>
-<component name="drm_rights_api" long-name="DRM Rights API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_rights_api/group"/>
-</component>
-<component name="drm_legacy_api" long-name="DRM Legacy API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_legacy_api/group"/>
-</component>
-<component name="dcf_repository_api" long-name="DCF Repository API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/dcf_repository_api/group"/>
-</component>
-<component name="drm_service_api" long-name="DRM Service API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_service_api/group"/>
-</component>
-<component name="drm_secondary_display_api" long-name="DRM Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_secondary_display_api/group"/>
-</component>
-<component name="drm_license_manager_api" long-name="DRM License Manager API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_license_manager_api/group"/>
-</component>
-<component name="drm_utility_api" long-name="DRM Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_utility_api/group"/>
-</component>
-<component name="drm_agents_api" long-name="DRM Agents API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_agents_api/group"/>
-</component>
-<component name="wmdrm_core_api" long-name="WM DRM Core API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_core_api/group"/>
-</component>
-<component name="wmdrm_access_api" long-name="WMDRM Access API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_access_api/group"/>
-</component>
-<component name="wmdrm_ota_access_api" long-name="WMDRM OTA Access API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_ota_access_api/group"/>
-</component>
-<component name="camese_utility_api" long-name="Camese Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_utility_api/group"/>
-</component>
-<component name="camese_framework_api" long-name="Camese Framework API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_framework_api/group"/>
-</component>
-</collection>
-<collection name="drm_pub" long-name="DRM Public Interfaces" level="specific">
-<component name="drm_helper_api" long-name="DRM Helper API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_helper_api/group"/>
-</component>
-<component name="oma_drm_caf_agent_api" long-name="OMA DRM CAF Agent API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/group"/>
-</component>
-<component name="drm_license_checker_api" long-name="DRM License Checker API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_license_checker_api/group"/>
-</component>
-</collection>
-<collection name="commondrm" long-name="Common DRM" level="generic">
-<!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
-<component name="drmencryptor" filter="s60" long-name="DRM Encryptor" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmsettingsplugin" filter="s60" long-name="DRM Settings Plugin" plugin="Y" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmrightsmanagerui" filter="s60" long-name="DRM Rights Manager UI">
-<unit bldFile="mw/drm/commondrm/drmrightsmanagerui/help/group"/>
-</component>
-<component name="drmutility" filter="s60" long-name="DRM Utility">
-<!-- Uncomment unit when configuration is in place. Currently #included from commondrm_build -->
-<!--<unit bldFile="commondrm/drmutility/group"/>-->
-</component>
-<component name="drmserviceapiwrapper" filter="s60" long-name="DRM Service API Wrapper">
-<unit bldFile="mw/drm/commondrm/drmserviceapiwrapper/group"/>
-</component>
-<component name="drmrightsstoringlocation" filter="s60" long-name="DRM Rights Storing Location">
-<unit bldFile="mw/drm/commondrm/drmrightsstoringlocation/group"/>
-</component>
-<component name="commondrm_build" filter="s60" long-name="Common DRM Build">
-<!-- should be split into the above files, or them collapsed into a single component -->
-<unit bldFile="mw/drm/commondrm/group"/>
-</component>
-</collection>
-<collection name="omadrm" long-name="OMA DRM" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="omadrm_build" filter="s60" long-name="OMA DRM Build">
-<unit bldFile="mw/drm/omadrm/group"/>
-</component>
-<component name="foundationcerts" filter="sf_build" long-name="Foundation Certificates">
-<unit bldFile="mw/drm/omadrm/foundationcerts/group"/>
-</component>
-</collection>
-<collection name="wmdrm" long-name="Windows Media DRM" level="framework">
-<!-- collection is really a component. Move down a directory -->
-<component name="wmdrm_build" filter="s60" long-name="WM DRM Build">
-<unit bldFile="mw/drm/wmdrm/group"/>
-</component>
-</collection>
-<collection name="drm_info" long-name="DRM Info" level="specific"/>
-</block>
-<block name="locationsrv" level="specific" long-name="Location Services" levels="plugin fw server if">
-<collection name="locsrv_pub" long-name="Location Services Public Interfaces" level="if">
-<component name="landmarks_search_api" long-name="Landmarks Search API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
-</component>
-<component name="landmarks_api" long-name="Landmarks API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/group"/>
-</component>
-<component name="landmarks_database_management_api" long-name="Landmarks Database Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/group"/>
-</component>
-<component name="location_triggering_api" long-name="Location Triggering API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/location_triggering_api/group"/>
-</component>
-<component name="blid_application_satellite_info_api" long-name="BLID Application Satellite Info API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/group"/>
-</component>
-</collection>
-<collection name="locsrv_plat" long-name="Location Services Platform Interfaces" level="if">
-<component name="map_and_navigation_api" long-name="Map and Navigation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/group"/>
-</component>
-<component name="map_and_navigation_provider_discovery_api" long-name="Map and Navigation Provider Discovery API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/group"/>
-</component>
-<component name="geocoding_api" long-name="Geocoding API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
-</component>
-<component name="map_image_api" long-name="Map Image API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/group"/>
-</component>
-<component name="map_and_navigation_aiw_api" long-name="Map and Navigation AIW API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_aiw_api/group"/>
-</component>
-<component name="map_and_navigation_provider_api" long-name="Map and Navigation Provider API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_api/group"/>
-</component>
-<component name="landmarks_category_definition_api" long-name="Landmarks Category Definition API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
-</component>
-<component name="supl_settings_api" long-name="SUPL Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
-</component>
-<component name="location_settings_launch_api" long-name="Location Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/group"/>
-</component>
-<component name="map_image_conversion_plugin_api" long-name="Map Image Conversion Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/group"/>
-</component>
-<component name="psy_configuration_ui_plugin_api" long-name="PSY Configuration UI Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/psy_configuration_ui_plugin_api/group"/>
-</component>
-<component name="np_proxy_configuration_api" long-name="NP Proxy Configuration API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/np_proxy_configuration_api/group"/>
-</component>
-<component name="supl_terminal_initiation_api" long-name="SUPL Terminal Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/group"/>
-</component>
-<component name="location_notation_preferences_settings_api" long-name="Location Notation Preferences Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_notation_preferences_settings_api/group"/>
-</component>
-<component name="supl_settings_notifier_secondary_display_api" long-name="SUPL Settings Notifier Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_notifier_secondary_display_api/group"/>
-</component>
-<component name="supl_network_initiation_api" long-name="SUPL Network Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/group"/>
-</component>
-<component name="privacy_notifiers_secondary_display_api" long-name="Privacy Notifiers Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/privacy_notifiers_secondary_display_api/group"/>
-</component>
-<component name="oma_supl_configuration_parameter_api" long-name="OMA SUPL Configuration Parameter API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_configuration_parameter_api/group"/>
-</component>
-<component name="supl_query_secondary_display_api" long-name="SUPL Query Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_query_secondary_display_api/group"/>
-</component>
-<component name="location_triggering_management_api" long-name="Location Triggering Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_management_api/group"/>
-</component>
-<component name="location_triggering_status_information_api" long-name="Location Triggering Status Information API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_status_information_api/group"/>
-</component>
-<component name="oma_supl_asn_codec_plugin_api" long-name="OMA SUPL ASN Codec Plugin API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
-</component>
-<component name="query_and_notification_api" long-name="Query and Notification API" filter="s60" introduced="^3" class="api">
-<!-- needs metadata file: <meta rel="Api" href="locsrv_plat/query_and_notification_api/query_and_notification_api.metaxml"/> -->
-<unit bldFile="mw/locationsrv/locsrv_plat/query_and_notification_api/group"/>
-</component>
-<component name="location_local_variation_api" long-name="Location Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_local_variation_api/group"/>
-</component>
-</collection>
-<collection name="genericpositioningplugins" long-name="Generic Positioning Plugins" level="plugin">
-<component name="locationnpppsy" filter="s60" long-name="Location Positioning Proxy PSY" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
-</component>
-<component name="locationsuplpsy" filter="s60" long-name="Location SUPL PSY" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationsuplpsy/group"/>
-</component>
-<component name="genericpositioningplugins_build" filter="s60" long-name="Generic Positioning Plugins Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/genericpositioningplugins/group"/>
-</component>
-</collection>
-<collection name="landmarks" long-name="Landmarks" level="server">
-<component name="locationlandmarks" filter="s60" long-name="Location Landmarks">
-<unit bldFile="mw/locationsrv/landmarks/locationlandmarks/group"/>
-</component>
-</collection>
-<collection name="locationmapnavfw" long-name="Location Map and Navigation Framework" level="fw">
-<component name="mnlibrary" filter="s60" long-name="Map and Navigation Library">
-<unit bldFile="mw/locationsrv/locationmapnavfw/library/group"/>
-</component>
-<component name="mnaiwprovider" filter="s60" long-name="Map and Navigation AIW Provider" plugin="Y">
-<unit bldFile="mw/locationsrv/locationmapnavfw/aiwprovider/group"/>
-</component>
-<component name="locationmapnavfw_build" filter="s60" long-name="Location Map and Navigation Framework Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/locationmapnavfw/group"/>
-</component>
-</collection>
-<collection name="locationsystemui" long-name="Location System UI" level="if">
-<component name="locationsysui" filter="s60" long-name="Location System UI">
-<unit bldFile="mw/locationsrv/locationsystemui/locationsysui/group"/>
-</component>
-</collection>
-<collection name="supl" long-name="SUPL" level="fw">
-<component name="locationsuplfw" filter="s60" long-name="Location SUPL Framework">
-<unit bldFile="mw/locationsrv/supl/locationsuplfw/group"/>
-</component>
-<component name="locationomasuplprotocolhandler" filter="s60" long-name="OMA SUPL Protocol Handler">
-<unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/group"/>
-</component>
-<component name="supltiapiimplementation" filter="s60" long-name="SUPL TI API Implementation" introduced="^3">
-<unit bldFile="mw/locationsrv/supl/supltiapiimplementation/group"/>
-</component>
-</collection>
-<collection name="locationtriggering" long-name="Location Triggering" level="server">
-<component name="ltlogger" filter="s60" long-name="LT Logger">
-<unit bldFile="mw/locationsrv/locationtriggering/ltlogger/group"/>
-</component>
-<component name="ltclientlib" filter="s60" long-name="LT Client Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltclientlib/group"/>
-</component>
-<component name="ltmanagementlib" filter="s60" long-name="LT Management Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmanagementlib/group"/>
-</component>
-<component name="ltcontainer" filter="s60" long-name="LT Container">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontainer/group"/>
-</component>
-<component name="ltserver" filter="s60" long-name="LT Server">
-<unit bldFile="mw/locationsrv/locationtriggering/ltserver/group"/>
-</component>
-<component name="ltstrategypluginapi" filter="s60" long-name="LT Strategy Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategypluginapi/group"/>
-</component>
-<component name="ltstrategyengine" filter="s60" long-name="LT Strategy Engine">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategyengine/group"/>
-</component>
-<component name="ltmovementdetectionpluginapi" filter="s60" long-name="Movement Detection Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmovementdetectionpluginapi/group"/>
-</component>
-<component name="ltcellidmovementdetector" filter="s60" long-name="Cell ID Movement Detector">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/>
-</component>
-<component name="lbtmgmtui" filter="s60" long-name="LBT Management UI" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/lbtmgmtui/group"/>
-</component>
-<component name="ltcontextsourceplugin" filter="s60" long-name="LT Context Source Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontextsourceplugin/group"/>
-</component>
-<component name="locationtriggering_build" filter="s60" long-name="Location Triggering Build">
-<!-- should remove #include from this and maybe put exports in the above components -->
-<unit bldFile="mw/locationsrv/locationtriggering/group"/>
-</component>
-</collection>
-</block>
-<block name="accesssec" level="generic" long-name="Access Security" levels="plugin framework server generic specific">
-<collection name="accesssec_plat" long-name="Access Security Platform Interfaces" level="specific">
-<component name="wapi_security_settings_ui_api" long-name="WAPI Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_security_settings_ui_api/group"/>
-</component>
-<component name="wep_security_settings_ui_api" long-name="WEP Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wep_security_settings_ui_api/group"/>
-</component>
-<component name="wi-fi_protected_setup_ui_api" long-name="Wi-Fi Protected Setup UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
-</component>
-<component name="wlan_eap_settings_ui_api" long-name="WLAN EAP Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wlan_eap_settings_ui_api/group"/>
-</component>
-<component name="wpa_security_settings_ui_api" long-name="WPA Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wpa_security_settings_ui_api/group"/>
-</component>
-<component name="eap_vpn_api" long-name="EAP VPN API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
-</component>
-<component name="eapsim_db_api" long-name="EAP-SIM DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapsim_db_api/group"/>
-</component>
-<component name="eap_type_api" long-name="EAP Type API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_type_api/group"/>
-</component>
-<component name="eaptlspeap_db_api" long-name="EAP-TLS-PEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eaptlspeap_db_api/group"/>
-</component>
-<component name="eapleap_db_api" long-name="LEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapleap_db_api/group"/>
-</component>
-<component name="eapgtc_db_api" long-name="EAP-GTC DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapgtc_db_api/group"/>
-</component>
-<component name="eapmschapv2_db_api" long-name="EAP-MSCHAPV2 DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapmschapv2_db_api/group"/>
-</component>
-<component name="eapaka_db_api" long-name="EAP-AKA DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapaka_db_api/group"/>
-</component>
-<component name="wapi_db_api" long-name="WAPI DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_db_api/group"/>
-</component>
-</collection>
-<collection name="wlansecuritysettings" long-name="WLAN Security Settings" level="specific">
-<component name="wapisecuritysettingsui" filter="s60" long-name="WAPI Security Settings UI" introduced="9.1">
-<!-- the directory for this needs to be moved up to the right level -->
-<unit bldFile="mw/accesssec/wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
-</component>
-<component name="wepsecuritysettingsui" filter="s60" long-name="WEP Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wepsecuritysettingsui/group"/>
-</component>
-<component name="wifiprotectedsetup" filter="s60" long-name="WIFI Protected Setup" introduced="^1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wifiprotectedsetup/group"/>
-</component>
-<component name="wlaneapsettingsui" filter="s60" long-name="WLAN EAP Settings UI" introduced="9.3">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wlaneapsettingsui/group"/>
-</component>
-<component name="wpasecuritysettingsui" filter="s60" long-name="WPA Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wpasecuritysettingsui/group"/>
-</component>
-</collection>
-<collection name="eapol" long-name="EAPOL" level="framework">
-<component name="eapol_framework" filter="s60" long-name="EAPOL Framework" introduced="9.2">
-<unit bldFile="mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
-</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">
-<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>
-<component name="bearer_settings_plugin_api" long-name="Bearer Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/bearer_settings_plugin_api/group"/>
-</component>
-<component name="commsdat_wlan_api" long-name="CommsDat WLAN API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/commsdat_wlan_api/group"/>
-</component>
-<component name="connection_monitor_extension_api" long-name="Connection Monitor Extension API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_monitor_extension_api/group"/>
-</component>
-<component name="connection_ui_utilities_api" long-name="Connection UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_ui_utilities_api/group"/>
-</component>
-<component name="disconnect_dialog_api" long-name="Disconnect Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_api/group"/>
-</component>
-<component name="disconnect_dialog_disable_api" long-name="Disconnect Dialog Disable API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_disable_api/group"/>
-</component>
-<component name="extended_connection_settings_api" long-name="Extended Connection Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/extended_connection_settings_api/group"/>
-</component>
-<component name="mpm_default_connection_api" long-name="MPM Default Connection API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_default_connection_api/group"/>
-</component>
-<component name="pdpcontextmanager2_reset_factory_settings_api" long-name="PDP Context Manager 2 Reset Factory Settings API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_settings_api/group"/>
-</component>
-<component name="mpm_connect_screen_api" long-name="MPM Connect Screen API" filter="s60" class="api">
-<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">
-<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>
-<component name="access_point_engine_api" long-name="Access Point Engine API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_monitor_server_api/group"/>
-</component>
-<component name="connection_settings_ui_api" long-name="Connection Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_ui_api/group"/>
-</component>
-<component name="agent_dialog_api" long-name="Agent Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/agent_dialog_api/group"/>
-</component>
-<component name="extendedconnpref_api" long-name="Extended Connection Preferences API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/extendedconnpref_api/group"/>
-</component>
-</collection>
-<collection name="accesspointcontrol" long-name="Access Point Control" level="plugin">
-<component name="apcontrollistplugin" filter="s60" long-name="Access Point Control List Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
-</component>
-</collection>
-<collection name="alwayson_net_plugin" long-name="Always Online Net Plugin" level="server">
-<component name="pdpcontextmanager2" filter="s60" long-name="PDP Context Manager 2">
-<unit bldFile="mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
-</component>
-</collection>
-<collection name="apengine" long-name="Access Point Engine" level="framework">
-<component name="apeng" filter="s60" long-name="Access Point Engine">
-<unit bldFile="mw/ipconnmgmt/apengine/apeng/group"/>
-</component>
-<component name="apsettingshandlerui" filter="s60" long-name="Access Point Settings Handler UI">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingshandlerui/group"/>
-</component>
-<component name="apsettingsplugin" filter="s60" long-name="Access Point Settings Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="bearermanagement" long-name="Bearer Management" level="framework">
-<component name="mpm" filter="s60" long-name="Mobility Policy Manager">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/mpm/group"/>
-</component>
-<component name="extendedconnpref" filter="s60" long-name="Extended Connection Preferences">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/extendedconnpref/group"/>
-</component>
-<component name="s60mcpr" filter="s60" long-name="S60 Meta-Connection Provider" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/S60MCPR/group"/>
-</component>
-</collection>
-<collection name="cmmanager" long-name="Connection Method Manager" level="framework">
-<component name="cmmgr" filter="s60" long-name="CM Manager">
-<unit bldFile="mw/ipconnmgmt/cmmanager/cmmgr/group"/>
-</component>
-<component name="gsconnsettingsplugin" filter="s60" long-name="GS Connection Settings Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/cmmanager/gsconnsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="connectionmonitoring" long-name="Connection Monitoring" level="server">
-<component name="connectionmonitorplugin" filter="s60" long-name="Connection Monitor Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorplugin/group"/>
-</component>
-<component name="connectionmonitorui" filter="s60" long-name="Connection Monitor UI">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorui/group"/>
-</component>
-<component name="connmon" filter="s60" long-name="Connection Monitor">
-<!-- either split into two components, or #include from a common bld.inf -->
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/connectionmonitor/group"/>
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/dataconnectionlogger/group"/>
-</component>
-<component name="connmonext" filter="s60" long-name="Connection Monitor Extension API">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmonext/group"/>
-</component>
-</collection>
-<collection name="connectionutilities" long-name="Connection Utilities" level="utils">
-<component name="connectiondialogs" filter="s60" long-name="Connection Dialogs">
-<unit bldFile="mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/>
-</component>
-</collection>
-<collection name="dbcreator" long-name="DB Creator" level="utils">
-<component name="commsdatcreator" filter="s60" long-name="Comms Database Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
-</component>
-<component name="commsdatcreatorrfsplugin" filter="s60" long-name="Comms Database Creator RFS Plugin" introduced="9.3" plugin="Y">
-<!-- uncomment when config is turned on -->
-<!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
-</component>
-<component name="commsdatstartup" filter="s60" long-name="Comms Database Startup" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
-</component>
-<component name="dbcreatorexe" filter="s60" long-name="DB Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
-</component>
-<component name="dbcreator_build" filter="s60" long-name="DB Creator Build" introduced="9.3">
-<!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
-<unit bldFile="mw/ipconnmgmt/dbcreator/group"/>
-</component>
-</collection>
-<collection name="ipconnmgmt_info" long-name="IP Connectivity Management Info" level="utils">
-<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"/>
-</component>
-</collection>
-</block>
-<block name="netprotocols" level="generic" long-name="High-level Internet Protocols" levels="plugin framework server generic specific">
-<collection name="netprotocols_plat" long-name="High-level Internet Protocols Platform Interfaces" level="specific">
-<component name="cookie_manager_api" long-name="Cookie Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/cookie_manager_api/group"/>
-</component>
-<component name="http_cache_mgr_api" long-name="HTTP Cache Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_cache_mgr_api/group"/>
-</component>
-<component name="http_filters_api" long-name="HTTP Filters API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_filters_api/group"/>
-</component>
-</collection>
-<collection name="httpfilters" long-name="HTTP Filters" level="plugin">
-<component name="httpfiltercommon" filter="s60" long-name="HTTP Filter Common">
-<unit bldFile="mw/netprotocols/httpfilters/httpfiltercommon/group"/>
-</component>
-<component name="cookie" filter="s60" long-name="Cookie Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/cookie/group"/>
-</component>
-<component name="deflatefilter" filter="s60" long-name="Deflate Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/deflatefilter/group"/>
-</component>
-<component name="httpfilteracceptheader" filter="s60" long-name="Accept Header Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteracceptheader/group"/>
-</component>
-<component name="httpfilterauthentication" filter="s60" long-name="Authentication Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterauthentication/group"/>
-</component>
-<component name="httpfilterconnhandler" filter="s60" long-name="Connection Handler Fitler" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterconnhandler/group"/>
-</component>
-<component name="httpfilteriop" filter="s60" long-name="HTTP IOP Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteriop/group"/>
-</component>
-<component name="httpfilterproxy" filter="s60" long-name="HTTP Proxy Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterproxy/group"/>
-</component>
-<component name="uaproffilter" filter="s60" long-name="UAProf Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/uaproffilter/group"/>
-</component>
-</collection>
-<collection name="applayerprotocols" long-name="Application Layer Protocols" level="server">
-<component name="httptransportfw" long-name="HTTP Transport Framework" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
-</component>
-<component name="httpexamples" long-name="HTTP Examples" introduced="6.2" purpose="development">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpexamples/group" mrp="mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
-</component>
-<component name="wappushsupport" long-name="WAP Push Support" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
-</component>
-<component name="wapbase" long-name="WAP Base" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wapbase/Group" mrp="mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
-</component>
-<component name="ftpengine" long-name="FTP Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/ftpengine/group" mrp="mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
-</component>
-<component name="telnetengine" long-name="Telnet Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/telnetengine/group" mrp="mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
-</component>
-<component name="httpserviceapi" long-name="HTTP Service API" introduced="TB9.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpservice/group" mrp="mw/netprotocols/applayerprotocols/httpservice/group/http_service.mrp"/>
-</component>
-</collection>
-<collection name="applayerpluginsandutils" long-name="Application Layer Plugins and Utils" level="framework">
-<component name="uripermissionservices" long-name="URI Permission Services" introduced="^2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
-</component>
-<component name="bookmarksupport" long-name="Bookmark Support" introduced="9.1" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
-</component>
-<component name="httpprotocolplugins" long-name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
-</component>
-<component name="httptransportplugins" long-name="HTTP Transport Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
-</component>
-</collection>
-<collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
-<component name="netprotocols_metadata" long-name="High-level Internet Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ipappprotocols" level="generic" long-name="IP App Protocols" levels="plugin conn server if">
-<collection name="ipappprotocols_plat" long-name="IP App Protocols Platform Interfaces" level="if">
-<component name="srtp_api" long-name="SRTP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/srtp_api/group"/>
-</component>
-<component name="rtprtcp_api" long-name="RTP/RTCP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/rtprtcp_api/group"/>
-</component>
-</collection>
-<collection name="rtp" long-name="RTP" level="server">
-<component name="srtpstack" filter="s60" long-name="SRTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/srtpstack/group"/>
-</component>
-<component name="rtpstack" filter="s60" long-name="RTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/rtpstack/group"/>
-</component>
-</collection>
-<collection name="realtimenetprots" long-name="Real Time Net Protocols" level="server">
-<component name="symrtp" long-name="RTP" introduced="9.0" purpose="optional">
-<!-- Real Time Data Protocol -->
-<unit bldFile="mw/ipappprotocols/realtimenetprots/rtp/group" mrp="mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
-</component>
-<component name="sipfw" long-name="SIP Framework" introduced="9.2" purpose="optional">
-<unit bldFile="mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp" version="2"/>
-</component>
-</collection>
-<collection name="sipplugins" long-name="SIP Plugins" level="plugin">
-<component name="sippwlanplugin" filter="s60" long-name="SIP WLAN Plugin" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
-</component>
-<component name="sippsipsettingsui" filter="s60" long-name="SIP Settings UI" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
-</component>
-<component name="sippdevmgmtsipadapter" filter="s60" long-name="Device Management SIP Settings Adapter" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
-</component>
-<component name="sippsystemstatemonitor" filter="s60" long-name="SIP System State Monitor" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsystemstatemonitor/group"/>
-</component>
-<component name="sippsipadapter" filter="s60" long-name="SIP Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipadapter/group"/>
-</component>
-</collection>
-<collection name="sipproviderplugins" long-name="SIP Provider Plugins" level="conn">
-<component name="sipprovider" long-name="SIP Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipproviderplugins/sipprovider/group" mrp="mw/ipappprotocols/sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
-</component>
-</collection>
-<collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="if">
-<component name="ipappprotocols_metadata" long-name="IP App Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wirelessacc" level="specific" long-name="Wireless Access" levels="framework generic ui">
-<collection name="hsfw_plat" long-name="HotSpot Framework Platform Interfaces" level="ui">
-<component name="hotspot_framework_client_api" long-name="HotSpot Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_api" long-name="Internet Connectivity Test Service API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_settings_api" long-name="Internet Connectivity Test Service Settings API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
-</component>
-<component name="hotspot_framework_client_plugin_api" long-name="HotSpot Framework Client Plugin API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
-</component>
-</collection>
-<collection name="hotspotfw" long-name="HotSpot Framework" level="framework">
-<component name="hsserver" filter="s60" long-name="HotSpot Server" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="hsclient" filter="s60" long-name="HotSpot Client" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="internetconnectivitytestservice" filter="s60" long-name="Internet Connectivity Test Service" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
-</component>
-<component name="ictsdialogs" filter="s60" long-name="Internet Connectivity Test Service Dialogs" deprecated="^3" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
-</component>
-<component name="hspluginforagent" filter="s60" long-name="HotSpot Plugin for Agent" plugin="Y" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
-</component>
-<component name="hsbrowser" filter="s60" long-name="HotSpot Browser" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
-</component>
-<component name="hotspotfw_build" filter="s60" long-name="Hotspot Framework Build">
-<!-- should break up this bld.inf into the above components, or collapse them all into a single component -->
-<unit bldFile="mw/wirelessacc/hotspotfw/group"/>
-</component>
-</collection>
-<collection name="wlanutilities" long-name="WLAN Utilities" level="generic">
-<component name="wlanplugin" filter="s60" long-name="WLAN Plugin" plugin="Y">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlanplugin/group"/>
-</component>
-<component name="wlansettingsui" filter="s60" long-name="WLAN Settings UI">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlansettingsui/group"/>
-</component>
-<component name="wlansniffer" filter="s60" long-name="WLAN Sniffer">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlansniffer/group"/>
-</component>
-<component name="wlanindicatorplugin" filter="s60" long-name="WLAN Indicator Plugin" plugin="Y">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlanindicatorplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="vpnclient" level="specific" long-name="VPN Client" levels="engine ui api">
-<!-- is the !oem_build filter needed? -->
-<collection name="vpnc_plat" long-name="VPN Client Platform Interfaces" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API" class="api">
-<unit bldFile="mw/vpnclient/vpnc_plat/vpnapi/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API">
-<unit bldFile="mw/vpnclient/vpnapiimpl/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnengine" long-name="VPN Engine" level="engine">
-<!-- too many components in this collection.
- Probably best to group the binaries together into larger components
- or maybe split the collection into more reasonable groups -->
-<component name="eventmediatorapi" filter="s60" long-name="Event Mediator API">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediatorapi/group" filter="!oem_build"/>
-</component>
-<component name="eventviewer" filter="s60" long-name="Event Viewer">
-<unit bldFile="mw/vpnclient/vpnengine/eventviewer/group" filter="!oem_build"/>
-</component>
-<component name="vpnins" filter="s60" long-name="VPN Installer">
-<unit bldFile="mw/vpnclient/vpnengine/vpnins/group" filter="!oem_build"/>
-</component>
-<component name="ikepolparser" filter="s60" long-name="IKE Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/ikepolparser/group" filter="!oem_build"/>
-</component>
-<component name="utlbase64" filter="s60" long-name="Base64 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlbase64/group" filter="!oem_build"/>
-</component>
-<component name="utlcrypto" filter="s60" long-name="Crypto Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlcrypto/group" filter="!oem_build"/>
-</component>
-<component name="utlxml" filter="s60" long-name="XML Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlxml/group" filter="!oem_build"/>
-</component>
-<component name="utlpkcs10" filter="s60" long-name="PKCS#10 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs10/group" filter="!oem_build"/>
-</component>
-<component name="pkiserviceapi" filter="s60" long-name="PKI Service API">
-<unit bldFile="mw/vpnclient/vpnengine/pkiserviceapi/group" filter="!oem_build"/>
-</component>
-<component name="ikecert" filter="s60" long-name="IKE Certificate Management">
-<unit bldFile="mw/vpnclient/vpnengine/ikecert/group" filter="!oem_build"/>
-</component>
-<component name="kmdapi" filter="s60" long-name="Key Management Daemon API">
-<unit bldFile="mw/vpnclient/vpnengine/kmdapi/group" filter="!oem_build"/>
-</component>
-<component name="kmdserver" filter="s60" long-name="Key Management Daemon Server">
-<unit bldFile="mw/vpnclient/vpnengine/kmdserver/group" filter="!oem_build"/>
-</component>
-<component name="ikeutils" filter="s60" long-name="Internet Key Exchange Utils">
-<unit bldFile="mw/vpnclient/vpnengine/ikeutils/group" filter="!oem_build"/>
-</component>
-<component name="ikev1lib" filter="s60" long-name="IKEv1 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev1lib/group" filter="!oem_build"/>
-</component>
-<component name="ikev2lib" filter="s60" long-name="IKEv2 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev2lib/group" filter="!oem_build"/>
-</component>
-<component name="vpnipsecpolparser" filter="s60" long-name="VPN IPsec Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/vpnipsecpolparser/group" filter="!oem_build"/>
-</component>
-<component name="sit" filter="s60" long-name="Socket Interaction Thread">
-<unit bldFile="mw/vpnclient/vpnengine/sit/group" filter="!oem_build"/>
-</component>
-<component name="vpntcwrapper" filter="s60" long-name="VPN Terminal Control Wrapper">
-<unit bldFile="mw/vpnclient/vpnengine/vpntcwrapper/group" filter="!oem_build"/>
-</component>
-<component name="eventmediator" filter="s60" long-name="Event Mediator">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediator/group" filter="!oem_build"/>
-</component>
-<component name="pkiservice" filter="s60" long-name="PKI Service">
-<unit bldFile="mw/vpnclient/vpnengine/pkiservice/group" filter="!oem_build"/>
-</component>
-<component name="vpnconnagt" filter="s60" long-name="VPN Connection Agent">
-<unit bldFile="mw/vpnclient/vpnengine/vpnconnagt/group" filter="!oem_build"/>
-</component>
-<component name="vpnmanager" filter="s60" long-name="VPN Manager">
-<unit bldFile="mw/vpnclient/vpnengine/vpnmanager/group" filter="!oem_build"/>
-</component>
-<component name="vpncleaner" filter="s60" long-name="VPN Cleaner">
-<unit bldFile="mw/vpnclient/vpnengine/vpncleaner/group" filter="!oem_build"/>
-</component>
-<component name="utlpkcs12" filter="s60" long-name="PKCS#12 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs12/group" filter="!oem_build"/>
-</component>
-<component name="dmadengine" filter="s60" long-name="DM Adapter Engine">
-<unit bldFile="mw/vpnclient/vpnengine/dmadengine/group" filter="!oem_build"/>
-</component>
-<component name="dmadipsecvpn" filter="s60" long-name="IPsec VPN DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadipsecvpn/group" filter="!oem_build"/>
-</component>
-<component name="dmadpki" filter="s60" long-name="PKI DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadpki/group" filter="!oem_build"/>
-</component>
-<component name="ikesocket" filter="s60" long-name="IKE Socket" introduced="^3">
-<unit bldFile="mw/vpnclient/vpnengine/ikesocket/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnui" long-name="VPN UI" level="ui">
-<component name="vpnecomnotifier" filter="s60" long-name="VPN ECOM Notifier" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnecomnotifier/group" filter="!oem_build"/>
-</component>
-<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">
-<unit bldFile="mw/vpnclient/vpnui/vpnmanagementui/group" filter="!oem_build"/>
-</component>
-<component name="vpnpolins" filter="s60" long-name="VPN Policy Installer">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolins/group" filter="!oem_build"/>
-</component>
-<component name="vpnpolicyrecognizer" filter="s60" long-name="VPN Policy Recognizer" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolicyrecognizer/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnclient_info" long-name="VPN Client Info" level="api">
-<component name="vpnclient_help" filter="s60" long-name="VPN Client Help">
-<unit bldFile="mw/vpnclient/help/group" filter="!oem_build"/>
-</component>
-<component name="vpnclient_build" filter="s60" long-name="VPN Client Build">
-<!-- should split this up into the other components and remove this-->
-<unit bldFile="mw/vpnclient/group" filter="!oem_build"/>
-</component>
-</collection>
-</block>
-<block name="ipappsrv" level="specific" long-name="IP App Services" levels="framework generic server conn plugin">
-<collection name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" level="plugin">
-<component name="transcoder_api" long-name="Transcoder API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
-</component>
-<component name="comms_event_api" long-name="Comms Event API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/comms_event_api/group"/>
-</component>
-<component name="floor_control_api" long-name="Floor Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/floor_control_api/group"/>
-</component>
-<component name="media_control_api" long-name="Media Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/media_control_api/group"/>
-</component>
-<component name="multimedia_comms_api" long-name="Multimedia Comms API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/multimedia_comms_api/group"/>
-</component>
-<component name="nat_settings_api" long-name="NAT Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/nat_settings_api/group"/>
-</component>
-</collection>
-<collection name="natfw" long-name="NAT Framework" level="framework">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="natfw_build" filter="s60" long-name="NAT Framework Build" introduced="^2">
-<unit bldFile="mw/ipappsrv/natfw/group"/>
-</component>
-</collection>
-<collection name="multimediacommscontroller" long-name="Multimedia Comms Controller" level="conn">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommscontroller_build" filter="s60" long-name="Multimedia Comms Controller Build">
-<unit bldFile="mw/ipappsrv/multimediacommscontroller/group"/>
-</component>
-</collection>
-<collection name="multimediacommsengine" long-name="Multimedia Comms Engine" level="generic">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommsengine_build" filter="s60" long-name="Multimedia Comms Engine Build">
-<unit bldFile="mw/ipappsrv/multimediacommsengine/group"/>
-</component>
-</collection>
-<collection name="natplugins" long-name="NAT Plugins" level="plugin">
-<component name="natpcliprovisioningnatfwadapter" filter="s60" long-name="Client Provisioning NAT Framework Traversal Adapter" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/group"/>
-</component>
-<component name="natpdevmgmtnatfwadapter" filter="s60" long-name="Device Management NAT Framework Traversal Adapter" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/group"/>
-</component>
-<component name="natptraversalcontroller" filter="s60" long-name="NAT Traversal Controller" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natptraversalcontroller/group"/>
-</component>
-<component name="natpnatfwsdpprovider" filter="s60" long-name="NAT Framework SDP Provider" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpnatfwsdpprovider/group"/>
-</component>
-</collection>
-<collection name="ipappsrv_info" long-name="IP App Services Info" level="plugin">
-<component name="ipappsrv_build" long-name="IP App Services Build" filter="s60">
-<!-- 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">
-<collection name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" level="specific">
-<component name="string_parser_api" long-name="String Parser API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/string_parser_api/group"/>
-</component>
-<component name="cbs_mcn_client_api" long-name="CBS MCN Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cbs_mcn_client_api/group"/>
-</component>
-<component name="converged_call_engine_api" long-name="Converged Call Engine API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_engine_api/group"/>
-</component>
-<component name="aiw_dial_data_consumer_api" long-name="AIW Dial Data Consumer API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/aiw_dial_data_consumer_api/group"/>
-</component>
-<component name="phone_client_ussd_api" long-name="Phone Client USSD API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_api/group"/>
-</component>
-<component name="sat_refresh_api" long-name="SAT Refresh API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_refresh_api/group" filter="!test"/>
-</component>
-<component name="network_handling_engine_api" long-name="Network Handling Engine API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/network_handling_engine_api/group"/>
-</component>
-<component name="phone_client_emergency_call_api" long-name="Phone Client Emergency Call API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/group"/>
-</component>
-<component name="sat_configuration_api" long-name="SAT Configuration API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_configuration_api/group"/>
-</component>
-<component name="dial_utils_api" long-name="Dial Utils API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/dial_utils_api/group"/>
-</component>
-<component name="phone_client_image_handler_api" long-name="Phone Client Image Handler API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_image_handler_api/group"/>
-</component>
-<component name="phone_client_messenger_api" long-name="Phone Client Messenger API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_messenger_api/group"/>
-</component>
-<component name="sat_client_api" long-name="SAT Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_client_api/group" filter="!test"/>
-</component>
-<component name="phone_client_api" long-name="Phone Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_api/group"/>
-</component>
-<component name="sat_service_api" long-name="SAT Service API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_service_api/group" filter="!test"/>
-</component>
-<component name="cbs_message_api" long-name="CBS Message API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cbs_message_api/group"/>
-</component>
-<component name="phone_client_server_information_api" long-name="Phone Client Server Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_server_information_api/group"/>
-</component>
-<component name="phone_client_ussd_internal_api" long-name="Phone Client USSD Internal API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_internal_api/group"/>
-</component>
-<component name="phone_client_command_handler_api" long-name="Phone Client Command Handler API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_command_handler_api/group"/>
-</component>
-<component name="phone_client_notify_api" long-name="Phone Client Notify API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_notify_api/group"/>
-</component>
-<component name="phone_client_utility_api" long-name="Phone Client Utility API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_utility_api/group"/>
-</component>
-<component name="telephony_network_information_api" long-name="Telephony Network Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_network_information_api/group"/>
-</component>
-<component name="secondary_display_sat_api" long-name="Secondary Display SAT API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/secondary_display_sat_api/group"/>
-</component>
-<component name="callui_reconnect_query_api" long-name="CallUI Reconnect Query API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/callui_reconnect_query_api/group"/>
-</component>
-<component name="service_provider_settings_api" long-name="Service Provider Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/service_provider_settings_api/group"/>
-</component>
-<component name="converged_call_provider_api" long-name="Converged Call Provider API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_provider_api/group"/>
-</component>
-<component name="incoming_call_monitor_api" long-name="Incoming Call Monitor API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/incoming_call_monitor_api/group"/>
-</component>
-<component name="default_emergency_numbers_api" long-name="Default Emergency Numbers API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/default_emergency_numbers_api/group"/>
-</component>
-<component name="cenrep_database_api" long-name="Central Repository Database API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cenrep_database_api/group"/>
-</component>
-<component name="ss_settings_api" long-name="SS Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/ss_settings_api/group"/>
-</component>
-<component name="phone_settings_observer_api" long-name="Phone Settings Observer API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_observer_api/group"/>
-</component>
-<component name="phone_settings_notes_ui_api" long-name="Phone Settings Notes UI API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_notes_ui_api/group"/>
-</component>
-<component name="phone_settings_api" long-name="Phone Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_api/group"/>
-</component>
-<component name="voice_mailbox_number_api" long-name="Voice Mailbox Number API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_number_api/group"/>
-</component>
-<component name="voice_mailbox_settings_api" long-name="Voice Mailbox Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_settings_api/group"/>
-</component>
-<component name="call_information_api" long-name="Call Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/call_information_api/group" filter="!test"/>
-</component>
-<component name="call_remote_party_information_api" long-name="Call Remote Party Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/call_remote_party_information_api/group" filter="!test"/>
-</component>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_mediator_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="telutils" long-name="Telephony Utils" level="generic">
-<component name="phoneparser" filter="s60" long-name="Phone Parser">
-<unit bldFile="mw/phonesrv/telutils/phoneparser/group"/>
-</component>
-<component name="telephonyservice" filter="s60" long-name="Telephony Service">
-<unit bldFile="mw/phonesrv/telutils/telephonyservice/group"/>
-</component>
-</collection>
-<collection name="cbs" long-name="Cellular Baseband Services" level="plugin">
-<component name="cbsserver" filter="s60" long-name="CBS Server">
-<unit bldFile="mw/phonesrv/cbs/cbsserver/group"/>
-</component>
-<component name="cbsui" filter="s60" long-name="CBS UI">
-<unit bldFile="mw/phonesrv/cbs/cbsui/group"/>
-</component>
-</collection>
-<collection name="cellular" long-name="Cellular" level="server">
-<component name="telephonysettings" filter="s60" long-name="Telephony Settings">
-<unit bldFile="mw/phonesrv/cellular/telephonysettings/group" filter="!test"/>
-</component>
-<component name="sssettings" filter="s60" long-name="Supplementary Service Settings">
-<unit bldFile="mw/phonesrv/cellular/sssettings/group" filter="!test"/>
-</component>
-<component name="psetnotesui" filter="s60" long-name="Phone Settings Notes UI">
-<unit bldFile="mw/phonesrv/cellular/psetnotesui/group" filter="!test"/>
-</component>
-<component name="servicerequest" filter="s60" long-name="Service Request">
-<unit bldFile="mw/phonesrv/cellular/servicerequest/group"/>
-</component>
-</collection>
-<collection name="convergedcallengine" long-name="Converged Call Engine" level="framework">
-<component name="callprovider" filter="s60" long-name="Call Provider">
-<unit bldFile="mw/phonesrv/convergedcallengine/callprovider/group"/>
-</component>
-<component name="cce" filter="s60" long-name="CCE">
-<unit bldFile="mw/phonesrv/convergedcallengine/cce/group" filter="!test"/>
-</component>
-<component name="spsettings" filter="s60" long-name="Service Provider Settings">
-<unit bldFile="mw/phonesrv/convergedcallengine/spsettings/group" filter="!test"/>
-</component>
-<component name="cenrepdatabase" filter="s60" long-name="CCE Cenrep Database">
-<unit bldFile="mw/phonesrv/convergedcallengine/cenrepdatabase/group"/>
-</component>
-<component name="serviceselector" filter="s60" long-name="Service Selector">
-<unit bldFile="mw/phonesrv/convergedcallengine/serviceselector/group"/>
-</component>
-<component name="csplugin" filter="s60" long-name="CS Plugin" plugin="Y">
-<!-- should spell out CS in name -->
-<unit bldFile="mw/phonesrv/convergedcallengine/csplugin/group"/>
-</component>
-</collection>
-<collection name="engines" long-name="Telephony Engines" level="specific">
-<component name="vmbxengine" filter="s60" long-name="Voice Mailbox Engine">
-<unit bldFile="mw/phonesrv/engines/vmbxengine/group"/>
-</component>
-</collection>
-<collection name="networkhandling" long-name="Network Handling" level="plugin">
-<component name="networkhandlingengine" filter="s60" long-name="Network Handling Engine">
-<unit bldFile="mw/phonesrv/networkhandling/networkhandlingengine/group"/>
-</component>
-</collection>
-<collection name="phoneclientserver" long-name="Phone Client/Server" level="server">
-<component name="enpolicy" filter="s60" long-name="Emergency Number Policy">
-<unit bldFile="mw/phonesrv/phoneclientserver/enpolicy/group"/>
-</component>
-<component name="aiwdialdata" filter="s60" long-name="AIW Dial Data">
-<unit bldFile="mw/phonesrv/phoneclientserver/aiwdialdata/group" filter="!test"/>
-</component>
-<component name="dialutils" filter="s60" long-name="Dial Utils">
-<unit bldFile="mw/phonesrv/phoneclientserver/dialutils/group" filter="!test"/>
-</component>
-<component name="phoneclient" filter="s60" long-name="Phone Client">
-<unit bldFile="mw/phonesrv/phoneclientserver/phoneclient/group" filter="!test"/>
-</component>
-<component name="phoneserver" filter="s60" long-name="Phone Server">
-<unit bldFile="mw/phonesrv/phoneclientserver/phoneserver/group"/>
-</component>
-<component name="callui" filter="s60" long-name="Call UI">
-<unit bldFile="mw/phonesrv/phoneclientserver/callui/group"/>
-</component>
-</collection>
-<collection name="satengine" long-name="SIM Application Toolkit Engine" level="generic">
-<component name="satserver" filter="s60" long-name="SAT Server">
-<unit bldFile="mw/phonesrv/satengine/satserver/group"/>
-</component>
-</collection>
-<collection name="satui" long-name="SIM Application Toolkit UI" level="specific">
-<component name="satapp" filter="s60" long-name="SAT Application">
-<unit bldFile="mw/phonesrv/satui/satapp/group"/>
-</component>
-<component name="satplugin" filter="s60" long-name="SAT Plugin" plugin="Y">
-<unit bldFile="mw/phonesrv/satui/satplugin/group"/>
-</component>
-</collection>
-<collection name="phonecmdhandler" long-name="Phone Command Handler" level="generic">
-<component name="phonecmdhnlr" filter="s60" long-name="Phone Command Handler">
-<unit bldFile="mw/phonesrv/phonecmdhandler/phonecmdhnlr/group"/>
-</component>
-</collection>
-</block>
-<block name="messagingmw" level="specific" long-name="Messaging Middleware" levels="stack fw api">
-<collection name="msgfw_pub" long-name="Messaging Middleware Public Interfaces" level="api">
-<component name="send_ui_api" long-name="Send UI API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_pub/send_ui_api/group"/>
-</component>
-</collection>
-<collection name="msgfw_plat" long-name="Messaging Middleware Platform Interfaces" level="api">
-<component name="always_online_plugin_api" long-name="Always Online Plugin API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_plugin_api/group"/>
-</component>
-<component name="always_online_client_api" long-name="Always Online Client API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_client_api/group"/>
-</component>
-<component name="msg_common_utils_api" long-name="Messaging Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/msg_common_utils_api/group"/>
-</component>
-<component name="send_ui_plugin_api" long-name="Send UI Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/send_ui_plugin_api/group"/>
-</component>
-<component name="send_ui_datautils_api" long-name="Send UI Data Utils API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/send_ui_datautils_api/group"/>
-</component>
-</collection>
-<collection name="msgbranched" long-name="Messaging Branched" level="fw">
-<!-- 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"/>
-</component>
-</collection>
-<collection name="messagingfw" long-name="Messaging Framework" level="fw">
-<!-- should break this collection up into smaller related collections -->
-<component name="alwaysonline" filter="s60" long-name="Always Online Server" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/alwaysonline/group"/>
-</component>
-<component name="msgcommonutils" filter="s60" long-name="Messaging Common Utils" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/msgcommonutils/group"/>
-</component>
-<component name="senduiservices" filter="s60" long-name="Send UI Services" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/senduiservices/group"/>
-</component>
-<component name="scheduledsendmtm" long-name="Scheduled Send MTM" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/group" mrp="mw/messagingmw/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
-</component>
-<component name="msgsrvnstore" long-name="Message Server and Store" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/group" mrp="mw/messagingmw/messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
-</component>
-<component name="biomsgfw" long-name="BIO Messaging Framework" introduced="6.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/group" mrp="mw/messagingmw/messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
-</component>
-<component name="msgconf" long-name="Messaging Config" introduced="^2" purpose="optional" class="config">
-<unit bldFile="mw/messagingmw/messagingfw/msgconf/group" mrp="mw/messagingmw/messagingfw/msgconf/group/messaging_config.mrp"/>
-</component>
-<component name="watcherfw" long-name="Watcher Framework" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/watcherfw/group" mrp="mw/messagingmw/messagingfw/watcherfw/group/messaging_watcher.mrp"/>
-</component>
-<component name="msgtest" long-name="Messaging Test" purpose="development">
-<unit bldFile="mw/messagingmw/messagingfw/msgtest/group" mrp="mw/messagingmw/messagingfw/msgtest/group/messaging_test.mrp"/>
-</component>
-<component name="sendas" long-name="Send As" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/sendas/group" mrp="mw/messagingmw/messagingfw/sendas/group/messaging_sendas2.mrp"/>
-</component>
-<component name="msgurlhandler" long-name="Message URL Handler" introduced="7.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/group" mrp="mw/messagingmw/messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
-</component>
-<component name="wappushfw" long-name="WAP Push Framework" introduced="6.1" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/wappushfw/group" mrp="mw/messagingmw/messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
-</component>
-<component name="suplsmshandler" long-name="SUPL SMS Handler" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplsmshandler/group" mrp="mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/>
-</component>
-<component name="suplwappushhandler" long-name="SUPL WAP Push Handler" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
-</component>
-</collection>
-<collection name="messagingmw_info" long-name="Messaging Middleware Info" level="api">
-<component name="messagingmw_metadata" long-name="Messaging Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="imsrv" level="specific" long-name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
-<collection name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" level="specific">
-<component name="ximp_core_data_model_api" long-name="XIMP Core Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_host_api" long-name="XIMP Presence Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_presence_data_model_api" long-name="XIMP Presence Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_api" long-name="XIMP Presence Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_presence_management_api" long-name="XIMP Presence Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_management_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_host_api" long-name="XIMP Core Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_core_management_api" long-name="XIMP Core Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_management_api/group"/>
-</component>
-<component name="ximp_presence_base_api" long-name="XIMP Presence Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_base_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_api" long-name="XIMP Core Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_core_base_api" long-name="XIMP Core Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_base_api/group"/>
-</component>
-<component name="ximp_presence_cache_api" long-name="XIMP Presence Cache API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_cache_api/group"/>
-</component>
-<component name="ximp_core_feature_plugin_api" long-name="XIMP Core Feature Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_host_api" long-name="XIMP IM Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_im_data_model_api" long-name="XIMP IM Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_data_model_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_api" long-name="XIMP IM Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_im_management_api" long-name="XIMP IM Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_management_api/group"/>
-</component>
-<component name="ximp_im_base_api" long-name="XIMP IM Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_base_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_host_api" long-name="XIMP Search Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_search_data_model_api" long-name="XIMP Search Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_data_model_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_api" long-name="XIMP search Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_search_management_api" long-name="XIMP Search Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_management_api/group"/>
-</component>
-<component name="ximp_search_base_api" long-name="XIMP Search Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_base_api/group"/>
-</component>
-<component name="xmpp_settings_api" long-name="XMPP Settings API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/group"/>
-</component>
-<component name="im_cache_client_api" long-name="IM Cache Client API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/im_cache_client_api/group"/>
-</component>
-<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 Avability Text" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
-</component>
-</collection>
-<collection name="ximpfw" long-name="XIMP Framework" level="framework">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="ximpfw_build" filter="s60" long-name="XIMP Framework Build">
-<unit bldFile="mw/imsrv/ximpfw/group"/>
-</component>
-</collection>
-<collection name="imservices" long-name="IM Services" level="generic">
-<component name="imfeatureplugin" filter="s60" long-name="IM Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/imfeatureplugin/group"/>
-</component>
-<component name="searchfeatureplugin" filter="s60" long-name="Search Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/searchfeatureplugin/group"/>
-</component>
-<component name="xmppsettingsapi" filter="s60" long-name="XMPP Settings API" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsapi/group"/>
-</component>
-<component name="xmppsettingsfetcher" filter="s60" long-name="XMPP Settings Fetcher" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/group"/>
-</component>
-<component name="ossprotocoladaptation" filter="s60" long-name="OSS Protocol Adaptation" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/ossprotocoladaptation/group"/>
-</component>
-<component name="instantmessagingcache" filter="s60" long-name="Instant Messaging Cache" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/instantmessagingcache/group"/>
-</component>
-</collection>
-<collection name="brandingserver" long-name="Branding Server" level="specific">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="brandingserver_build" filter="s60" long-name="Branding Server Build">
-<unit bldFile="mw/imsrv/brandingserver/group"/>
-</component>
-</collection>
-</block>
-<block name="legacypresence" level="specific" long-name="Legacy Presence Services" levels="engine fw ui">
-<collection name="pressrv_plat" long-name="Legacy Presence Services Platform Interfaces" level="ui">
-<component name="presence_list_api" long-name="Presence List API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/presence_list_api/group"/>
-</component>
-<component name="watcher_info_api" long-name="Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_info_api/group"/>
-</component>
-<component name="simple_documents_api" long-name="SIMPLE Documents API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_documents_api/group"/>
-</component>
-<component name="authorization_api" long-name="Authorization API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/authorization_api/group"/>
-</component>
-<component name="xdm_protocol_plugin_api" long-name="XDM Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_protocol_plugin_api/group"/>
-</component>
-<component name="watcher_api" long-name="Watcher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_api/group"/>
-</component>
-<component name="xdm_api" long-name="XDM API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_api/group"/>
-</component>
-<component name="registration_api" long-name="Registration API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/registration_api/group"/>
-</component>
-<component name="publisher_api" long-name="Publisher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/publisher_api/group"/>
-</component>
-<component name="messaging_connection_manager_api" long-name="Messaging Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/messaging_connection_manager_api/group"/>
-</component>
-<component name="xdm_settings_api" long-name="XDM Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_settings_api/group"/>
-</component>
-<component name="simple_settings_api" long-name="SIMPLE Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_settings_api/group"/>
-</component>
-<component name="simple_instant_msg_api" long-name="Simple Instant Msg API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_instant_msg_api/group"/>
-</component>
-</collection>
-<collection name="xdmengine" long-name="XDM Engine" level="engine">
-<!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
-<component name="xdmengine_build" filter="s60" long-name="XDM Engine Build">
-<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">
-<unit bldFile="mw/legacypresence/xdmprotocols/group"/>
-</component>
-</collection>
-<collection name="msgconnmanager" long-name="Messaging Connection Manager" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="msgconnmanager_build" filter="s60" long-name="Messaging Connection Manager Build">
-<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">
-<unit bldFile="mw/legacypresence/simpleengine/group"/>
-</component>
-</collection>
-<collection name="presencefwsimpleadpt" long-name="Presence Framework SIMPLE Adaptation" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="simpleplugin" filter="s60" long-name="SIMPLE Plugin" plugin="Y">
-<unit bldFile="mw/legacypresence/presencefwsimpleadpt/group"/>
-</component>
-</collection>
-<collection name="simpledatamodeladapter" long-name="SIMPLE Data Model Adapter" level="fw">
-<component name="presenceplugin" filter="s60" long-name="Presence Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/legacypresence/simpledatamodeladapter/group"/>
-</component>
-</collection>
-</block>
-<block name="opensrv" level="specific" long-name="Open Services" levels="prt lib server eng">
-<collection name="opensrv_plat" long-name="Open Services Platform Interfaces" level="eng">
-<component name="messagequeue_api" long-name="Message Queue API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/opensrv/opensrv_plat/messagequeue_api/group"/>
-</component>
-</collection>
-<collection name="loudmouth" long-name="Loudmouth" level="prt">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="loudmouth_build" filter="s60" long-name="Loudmouth Build" introduced="^2">
-<unit bldFile="mw/opensrv/loudmouth/group"/>
-</component>
-</collection>
-<collection name="libtelepathy" long-name="Telepathy Library" level="lib">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="libtelepathy_build" filter="s60" long-name="Telepathy Library Build" introduced="^2">
-<unit bldFile="mw/opensrv/libtelepathy/group"/>
-</component>
-</collection>
-<collection name="telepathygabble" long-name="Telepathy Gabble" level="eng">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="telepathygabble_build" filter="s60" long-name="Telepathy Gabble Build" introduced="^2">
-<unit bldFile="mw/opensrv/telepathygabble/group"/>
-</component>
-</collection>
-<collection name="isolationserver" long-name="Isolation Server" level="server">
-<component name="messagequeue" filter="s60" long-name="Message Queue" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/messagequeue/group"/>
-</component>
-<component name="isoserver" filter="s60" long-name="ISO Server" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/isoserver/group"/>
-</component>
-<component name="isolationserver_build" filter="s60" long-name="Isloation Server Build" introduced="^2">
-<!-- needs #includes removed. either move the exports to another component or make this a ROM component -->
-<unit bldFile="mw/opensrv/isolationserver/group"/>
-</component>
-</collection>
-</block>
-<block name="remotemgmt" level="specific" long-name="Remote Management" levels="plugin framework server generic specific">
-<collection name="remotemgmt_pub" long-name="Remote Management Public Interfaces" level="specific">
-<component name="synchronization_capability_api" long-name="Synchronization Capability API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
-</component>
-</collection>
-<collection name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" level="specific">
-<component name="common_agent_util_and_definitions_api" long-name="Common Agent util and definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
-</component>
-<component name="policy_management_certificate_api" long-name="Policy Management Certificate API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/group"/>
-</component>
-<component name="oma_provisioning_adapter_api" long-name="OMA Provisioning Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_adapter_api/group"/>
-</component>
-<component name="device_management_parameter_api" long-name="Device Management Parameter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_parameter_api/group"/>
-</component>
-<component name="data_synchronization_plugin_api" long-name="Data Synchronization Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/group"/>
-</component>
-<component name="sync_alert_handler_api" long-name="Sync Alert Handler API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
-</component>
-<component name="syncml_notifier_api" long-name="SyncML Notifier API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
-</component>
-<component name="syncml_client_api" long-name="SyncML Client API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
-</component>
-<component name="device_management_plugin_api" long-name="Device Management plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_plugin_api/group"/>
-</component>
-<component name="dm_tree_apis" long-name="DM Tree APIs" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
-</component>
-<component name="terminal_security_device_lock_api" long-name="Terminal Security Device Lock API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/group"/>
-</component>
-<component name="policy_management_request_api" long-name="Policy Management Request API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/group"/>
-</component>
-<component name="ds_constant_definitions_api" long-name="DS Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_constant_definitions_api/group"/>
-</component>
-<component name="scp_server_api" long-name="SCP Server API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/group"/>
-</component>
-<component name="data_synchronization_notification_api" long-name="Data Synchronization Notification API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_notification_api/group"/>
-</component>
-<component name="oma_provisioning_engine_api" long-name="OMA Provisioning Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/group"/>
-</component>
-<component name="dm_utils_api" long-name="DM Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/group"/>
-</component>
-<component name="syncml_alert_api" long-name="SyncML Alert API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/group"/>
-</component>
-<component name="obex_client_session_api" long-name="OBEX Client session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/obex_client_session_api/group"/>
-</component>
-<component name="setting_enforcement_info_api" long-name="Setting Enforcement Info API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/group"/>
-</component>
-<component name="dm_constant_definitions_api" long-name="DM Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
-</component>
-<component name="oma_ds_extensions_api" long-name="OMA DS Extensions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
-</component>
-<component name="pnpms_utils_api" long-name="PNPMS Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
-</component>
-<component name="diagnostics_plugin_utility_api" long-name="Diagnostics Plugin Utility API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
-</component>
-<component name="diagnostics_plugin_api" long-name="Diagnostics Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
-</component>
-<component name="diagnostics_framework_api" long-name="Diagnostics Framework API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
-</component>
-<component name="diagnostics_results_api" long-name="Diagnostics Results API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
-</component>
-<component name="diagnostics_plugin_pool_api" long-name="Diagnostics Plugin Pool API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
-</component>
-<component name="adaptive_history_list_api" long-name="Adaptive History List API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
-</component>
-<component name="adaptive_history_list_session_api" long-name="Adaptive History List Session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
-</component>
-<component name="fota_engine_api" long-name="FOTA Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
-</component>
-<component name="update_package_storage_plugin_api" long-name="Update Package Storage Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
-</component>
-<component name="syncml_notifier_roaming_api" long-name="SyncML Notifier Roaming API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
-</component>
-<component name="sync_service_api" long-name="Sync Service API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_service_api/group"/>
-</component>
-<component name="dcmo_adapter_api" long-name="DCMO Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_adapter_api/group"/>
-</component>
-<component name="dcmo_control_api" long-name="DCMO Control API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_control_api/group"/>
-</component>
-<component name="ds_capability_mgmt_plugin_api" long-name="DS Capability Management Plugin API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
-</component>
-<component name="dm_native_notifier_api" long-name="DM Native Notifier API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_native_notifier_api/group"/>
-</component>
-<component name="syncml_ds_error_reporting_api" long-name="SyncML DS Error Reporting API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_ds_error_reporting_api/group"/>
-</component>
-<component name="syncml_ds_customization_api" long-name="SyncML DS Customization API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_ds_customization_api/group"/>
-</component>
-</collection>
-<collection name="policymanagement" long-name="Policy Management" level="generic">
-<component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">
-<unit bldFile="mw/remotemgmt/policymanagement/pmdmadapter/group"/>
-</component>
-<component name="dmutilserver" filter="s60" long-name="DM Util Server">
-<unit bldFile="mw/remotemgmt/policymanagement/dmutilserver/group"/>
-</component>
-<component name="policyengine" filter="s60" long-name="Policy Engine">
-<unit bldFile="mw/remotemgmt/policymanagement/policyengine/group"/>
-</component>
-<component name="policymanagement_build" filter="s60" long-name="Policy Management Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/policymanagement/group"/>
-</component>
-</collection>
-<collection name="syncmlfw" long-name="SyncML Framework" level="server">
-<component name="syncmlfw_build" filter="s60" long-name="SyncML Framework Build">
-<!-- need to break this up into components. Too convoluted a structure to be in a single bld.inf-->
-<unit bldFile="mw/remotemgmt/syncmlfw/group"/>
-</component>
-</collection>
-<collection name="terminalsecurity" long-name="Terminal Security" level="specific">
-<component name="scp" filter="s60" long-name="Security Code Proxy">
-<!-- can only have one unit, need to have these #included from a single bld.inf -->
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpdatabase/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpserver/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scppatternplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scphistoryplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scptimestampplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpeventhandler/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/dmeventnotifier/group"/>
-</component>
-<component name="terminalsecurity_client" filter="s60" long-name="Terminal Control Client">
-<unit bldFile="mw/remotemgmt/terminalsecurity/client/group"/>
-</component>
-<component name="terminalsecurity_server" filter="s60" long-name="Terminal Control Server">
-<unit bldFile="mw/remotemgmt/terminalsecurity/server/group"/>
-</component>
-<component name="tcadapter" filter="s60" long-name="Terminal Control Adapter">
-<unit bldFile="mw/remotemgmt/terminalsecurity/tcadapter/bld"/>
-</component>
-<component name="terminalsecurity_build" filter="s60" long-name="Terminal Security Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/terminalsecurity/group"/>
-</component>
-</collection>
-<collection name="omaprovisioning" long-name="OMA Provisioning" level="specific">
-<component name="pnputil" filter="s60" long-name="PnP Util">
-<unit bldFile="mw/remotemgmt/omaprovisioning/pnputil/group"/>
-</component>
-<component name="provisioning" filter="s60" long-name="Provisioning">
-<unit bldFile="mw/remotemgmt/omaprovisioning/provisioning/group"/>
-</component>
-</collection>
-<collection name="devicediagnosticsfw" long-name="Device Diagnostics Framework" level="framework">
-<component name="diagframework" filter="s60" long-name="Diagnostics Framework">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
-</component>
-<component name="diagpluginbase" filter="s60" long-name="Diagnostics Plugin Base">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
-</component>
-<component name="diagresultsdb" filter="s60" long-name="Diagnostics Results Database">
-<!-- can only have one unit, merge or split into two components -->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
-</component>
-<component name="devicediagnosticsfw_build" filter="s60" long-name="Device Diagnostics Framework Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/group"/>
-</component>
-</collection>
-<collection name="dcmofw" long-name="Device Capability Management Object Framework" level="framework">
-<component name="dcmoclient" filter="s60" long-name="DCMO Client">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoclient/group"/>
-</component>
-<component name="dcmoserver" filter="s60" long-name="DCMO Server">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoserver/group"/>
-</component>
-<component name="dcmocustcmd" filter="s60" long-name="DCMO Custom Commands">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmocustcmd/group"/>
-</component>
-<component name="dcmofw_build" filter="s60" long-name="DCMO Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/dcmofw/group"/>
-</component>
-</collection>
-<collection name="fotaapplication" long-name="FOTA Application" level="generic">
-<component name="fotaapplication_build" filter="s60" long-name="FOTA Application Build">
-<!-- remove this component when configuration is in place and the #ifdefs have been worked out -->
-<unit bldFile="mw/remotemgmt/fotaapplication/group"/>
-</component>
-<component name="fotaserver" filter="s60" long-name="FOTA Server">
-<!-- uncomment when #ifdefs are resolved -->
-<!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
-</component>
-<component name="fotacustcmds" filter="s60" long-name="FOTA Custom Commands" class="placeholder">
-<!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
-<!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
-</component>
-</collection>
-</block>
-<block name="remotestorage" level="generic" long-name="Remote Storage" levels="framework if">
-<collection name="rsfw_plat" long-name="Remote Storage Platform Interfaces" level="if">
-<component name="rsfw_access_protocol_plugin_api" filter="s60" long-name="Remote Storage Framework Access Protocol Plugin API" class="api">
-<unit bldFile="mw/remotestorage/rsfw_plat/rsfw_access_protocol_plugin_api/group"/>
-</component>
-</collection>
-<collection name="remotestoragefw" long-name="Remote Storage Framework" level="framework">
-<component name="mountstore" filter="s60" long-name="RSFW Mount Store">
-<unit bldFile="mw/remotestorage/remotestoragefw/mountstore/group"/>
-</component>
-<component name="rsfwnotifierplugins" filter="s60" long-name="RSFW Notifier Plugins" plugin="Y">
-<unit bldFile="mw/remotestorage/remotestoragefw/rsfwnotifierplugins/group"/>
-</component>
-<component name="remotefileengine" filter="s60" long-name="Remote File Engine">
-<unit bldFile="mw/remotestorage/remotestoragefw/remotefileengine/group"/>
-</component>
-<component name="mountmanager" filter="s60" long-name="RSFW Mount Manager">
-<unit bldFile="mw/remotestorage/remotestoragefw/mountmanager/group"/>
-</component>
-<component name="webdavaccessplugin" filter="s60" long-name="WebDAV Access Plugin" plugin="Y">
-<unit bldFile="mw/remotestorage/remotestoragefw/webdavaccessplugin/group"/>
-</component>
-<component name="remotefilesystemplugin" filter="s60" long-name="Remote Filesystem Plugin" plugin="Y">
-<unit bldFile="mw/remotestorage/remotestoragefw/remotefilesystemplugin/group"/>
-</component>
-<component name="remotestoragegsplugin" filter="s60" long-name="RS GS Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
-<!-- <unit bldFile="remotestoragefw/gsplugin/group"/>-->
-</component>
-<component name="remotedriveconfigurationbiocontrol" filter="s60" long-name="Remote Drive Configuration BIO Control">
-<!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
-<!-- <unit bldFile="remotestoragefw/remotedriveconfigurationbiocontrol/group"/>-->
-</component>
-<component name="remotestoragefw_build" filter="s60" long-name="Remote Storage Framework Build">
-<!-- move exports to other components.
- This is needed for #includes of configured component until congigiration is in place -->
-<unit bldFile="mw/remotestorage/remotestoragefw/group"/>
-</component>
-</collection>
-</block>
-<block name="remoteconn" level="generic" long-name="Remote Connectivity" levels="plugin framework server generic specific">
-<collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
-<component name="secon" filter="s60" long-name="Service Controllers">
-<unit bldFile="mw/remoteconn/connectivitymodules/secon/group"/>
-</component>
-</collection>
-<collection name="remoteconn_info" long-name="Remote Connectivity Info" level="specific">
-<component name="remoteconn_metadata" long-name="Remote Connectivity Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mtptransports" long-name="MTP Transports" level="plugin">
-<component name="mtpusbtransport" long-name="MTP USB Transport" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpusbtransport/group" mrp="mw/remoteconn/mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
-</component>
-<component name="mtpptpiptransport" long-name="MTP PTP-IP Transport" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpptpiptransport/group" mrp="mw/remoteconn/mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
-</component>
-<component name="mtpcontroller" long-name="MTP Controller" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpcontroller/group" mrp="mw/remoteconn/mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
-</component>
-</collection>
-<collection name="mtpfws" long-name="MTP Frameworks" level="framework">
-<component name="mtpfw" long-name="MTP Framework" introduced="^2" purpose="optional">
-<unit bldFile="mw/remoteconn/mtpfws/mtpfw/group" mrp="mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/>
-</component>
-</collection>
-<collection name="mtpdataproviders" long-name="MTP Data Providers" level="generic">
-<component name="mtpfileandfolderdp" long-name="MTP File and Folder Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group" mrp="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
-</component>
-<component name="mtpimagedp" long-name="MTP Image Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpimagedp/group" mrp="mw/remoteconn/mtpdataproviders/mtpimagedp/group/mtp_imagedp.mrp"/>
-</component>
-<component name="mtppictbridgedp" long-name="MTP PictBridge Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group" mrp="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group/mtp_pictbridgedp.mrp"/>
-</component>
-</collection>
-<collection name="backupandrestore" long-name="Backup and Restore" level="specific">
-<component name="backupengine" long-name="Backup Engine" introduced="9.0" purpose="optional">
-<unit bldFile="mw/remoteconn/backupandrestore/backupengine/group" mrp="mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
-</component>
-<component name="backuptest" long-name="Backup Test" introduced="^2" purpose="development">
-<unit bldFile="mw/remoteconn/backupandrestore/backuptest/group" mrp="mw/remoteconn/backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
-</component>
-</collection>
-<collection name="obex" long-name="OBEX" level="generic">
-<component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexprotocol/group" mrp="mw/remoteconn/obex/obexprotocol/group/obex.mrp"/>
-</component>
-<component name="obexextensionapi" long-name="OBEX Extension API" introduced="9.2" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexextensionapi/group" mrp="mw/remoteconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
-</component>
-</collection>
-</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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<unit mrp="mw/srvdiscovery/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="dlnasrv" level="specific" long-name="DLNA Services" levels="stack server ctrl framework plugin">
-<!-- uncomment all the units when configuration is in place, they're currently #included from other xxx_build components -->
-<collection name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" level="plugin">
-<component name="upnp_media_server_settings_api" long-name="UPnP Media Server Settings API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_settings_api/group"/>
-</component>
-<component name="upnp_av_objects_api" long-name="UPnP A/V Objects API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_av_objects_api/group"/>
-</component>
-<component name="upnp_media_server_api" long-name="UPnP Media Server API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_api/group"/>
-</component>
-<component name="upnp_security_plugin_api" long-name="UPnP Security Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_security_plugin_api/group"/>
-</component>
-<component name="upnp_avcp_api" long-name="UPnP AVCP API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_avcp_api/group"/>
-</component>
-<component name="upnp_media_server_metadata_api" long-name="UPnP Media Server Metadata API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_metadata_api/group"/>
-</component>
-<component name="upnp_command_api" long-name="UPnP Command API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_command_api/group"/>
-</component>
-<component name="upnp_plugin_api" long-name="UPnP Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_plugin_api/group"/>
-</component>
-</collection>
-<collection name="upnpavcontrolpoint" long-name="UPnP A/V Control Point" level="plugin">
-<component name="avcontrolframework" filter="s60" long-name="A/V Control Famework" introduced="9.1" deprecated="^3">
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
-</component>
-<component name="upnpavcontrolpoint_build" filter="s60" long-name="UPnP A/V Control Point Build" introduced="9.1" deprecated="^3">
-<!-- put exports in other component instead -->
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/group"/>
-</component>
-</collection>
-<collection name="upnpmediaserver" long-name="UPnP Media Server" level="server">
-<component name="avobjects" filter="s60" long-name="A/V Objects">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/avobjects/group"/>
-</component>
-<component name="mediaserverclient" filter="s60" long-name="Media Server Client">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverclient/group"/>
-</component>
-<component name="connectionmanagerservice" filter="s60" long-name="Connection Manager Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/connectionmanagerservice/group"/>
-</component>
-<component name="contentdirectoryservice" filter="s60" long-name="Content Directory Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/contentdirectoryservice/group"/>
-</component>
-<component name="mediaserverengine" filter="s60" long-name="Media Server Engine">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverengine/group"/>
-</component>
-<component name="upnpmediaserver_build" filter="s60" long-name="UPnP Media Server Build">
-<!-- move exports into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpmediaserver/group"/>
-</component>
-</collection>
-<collection name="upnpavcontroller" long-name="UPnP A/V Controller" level="ctrl">
-<component name="upnpxmlparser" filter="s60" long-name="UPnP XML Parser" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpxmlparser/group"/>
-</component>
-<component name="upnpavcontrollerserver" filter="s60" long-name="UPnP A/V Controller Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerserver/group"/>
-</component>
-<component name="upnpavcontrollerclient" filter="s60" long-name="UPnP A/V Ccontroller Client" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerclient/group"/>
-</component>
-<component name="upnpavcontrollerhelper" filter="s60" long-name="UPnP A/V Controller Helper" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerhelper/group"/>
-</component>
-<component name="upnpavcontroller_build" filter="s60" long-name="UPnP A/V Controller Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpavcontroller/group"/>
-</component>
-</collection>
-<collection name="upnpframework" long-name="UPnP Framework" level="framework">
-<component name="upnputilities" filter="s60" long-name="UPnP Utilities" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnputilities/group"/>
-</component>
-<component name="upnpextensionpluginif" filter="s60" long-name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpextensionpluginif/group"/> -->
-</component>
-<component name="upnpfiletransferengine" filter="s60" long-name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>-->
-</component>
-<component name="upnpcommonui" filter="s60" long-name="UPnP Common UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpcommonui/group"/>-->
-</component>
-<component name="upnpaiwengine" filter="s60" long-name="UPnP AIW Engine" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpaiwengine/group"/> -->
-</component>
-<component name="upnpaiwprovider" filter="s60" long-name="UPnP AIW Provider" introduced="^2" deprecated="^3" plugin="Y">
-<!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
-</component>
-<component name="upnpmusicadapter" filter="s60" long-name="UPnP Music Adapter" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
-</component>
-<component name="upnpcommand" filter="s60" long-name="UPnP Command" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpcommand/group"/>
-</component>
-<component name="upnpframework_build" filter="s60" long-name="UPnP Framework Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpframework/group"/>
-</component>
-</collection>
-<collection name="upnpsettings" long-name="UPnP Settings" level="framework">
-<component name="upnpsettingsengine" filter="s60" long-name="UPnP Settings Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
-</component>
-<component name="multiselectionui" filter="s60" long-name="Multi-Selection UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/multiselectionui/group"/>-->
-</component>
-<component name="appwizard" filter="s60" long-name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/appwizard/group"/>-->
-</component>
-<component name="upnpsharingui" filter="s60" long-name="UPnP Sharing UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
-</component>
-<component name="upnpgsplugin" filter="s60" long-name="UPnP GS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
-</component>
-<component name="upnpsettings_build" filter="s60" long-name="UPnP Settings Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsettings/group"/>
-</component>
-</collection>
-<collection name="upnpsharing" long-name="UPnP Sharing" level="server">
-<component name="upnpdlnaprofiler" filter="s60" long-name="UPnP DLNA Profiler" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpdlnaprofiler/group"/>
-</component>
-<component name="upnpsecurity" filter="s60" long-name="UPnP Security" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpsecurity/group"/>
-</component>
-<component name="upnpcontentserver" filter="s60" long-name="UPnP Content Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpcontentserver/group"/>
-</component>
-<component name="applicationengine" filter="s60" long-name="UPnP Application Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/applicationengine/group"/>
-</component>
-<component name="upnpsharing_build" filter="s60" long-name="UPnP Sharing Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsharing/group"/>
-</component>
-</collection>
-<collection name="upnpmpxplugins" long-name="UPnP MPX Plugins" level="plugin">
-<component name="upnpplaybackplugins" filter="s60" long-name="UPnP Playback Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/upnpplaybackplugins/group"/>
-</component>
-<component name="upnpmpxplugins_build" filter="s60" long-name="UPnP MPX Plugins Build" introduced="^2">
-<!-- move exports content into other component? -->
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/group"/>
-</component>
-</collection>
-<collection name="upnpharvester" long-name="UPnP Harvester" level="ctrl">
-<component name="upnpharvester_common" filter="s60" long-name="UPnP Harvester Common" introduced="^2" deprecated="^3" class="placeholder">
-<!-- need to merge or #include these to a single bld.inf -->
-<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
- <unit bldFile="upnpharvester/common/cmsettings/group"/>
- <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
- <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
-</component>
-<component name="cdssync" filter="s60" long-name="CDS Sync" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
-</component>
-<component name="mdhserver" filter="s60" long-name="Metadata Harvester Server" introduced="^2" deprecated="^3" class="placeholder">
-<!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
-</component>
-<component name="upnpharvester_build" filter="s60" long-name="UPnP Harvester Build" introduced="^2" deprecated="^3" class="placeholder">
-<!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
-<!--<unit bldFile="upnpharvester/group"/>-->
-</component>
-</collection>
-<collection name="homesync" long-name="Home Sync" level="plugin">
-<component name="contentmanager" filter="s60" long-name="Content Manager" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homesync/group"/>-->
-<!-- move bld.inf into contentmanager dir -->
-</component>
-</collection>
-<collection name="homemedia" long-name="Home Media" level="framework">
-<!-- collection is really just a component. Move down a directory -->
-<component name="homemedia_build" filter="s60" long-name="Home Media" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homemedia/group"/> -->
-</component>
-</collection>
-<collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin">
-<component name="dlnasrv_build" filter="s60" long-name="DLNA Services Build">
-<!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed -->
-<unit bldFile="mw/dlnasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="btservices" level="generic" long-name="Bluetooth Services" levels="framework server generic specific plugin">
-<collection name="btservices_pub" long-name="BT Services Public Interfaces" level="plugin">
-<component name="bluetooth_power_state_api" long-name="Bluetooth Power State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_power_state_api/group"/>
-</component>
-<component name="bluetooth_notifier_api" long-name="Bluetooth Notifier API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_notifier_api/group"/>
-</component>
-</collection>
-<collection name="btservices_plat" long-name="BT Services Platform Interfaces" level="plugin">
-<component name="bluetooth_dosserver_audio_api" long-name="Bluetooth DOS Server Audio API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dosserver_audio_api/group"/>
-</component>
-<component name="bluetooth_dut_mode_api" long-name="Bluetooth DUT Mode API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dut_mode_api/group"/>
-</component>
-<component name="bluetooth_engine_api" long-name="Bluetooth Engine API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-<component name="bluetooth_local_variation_api" long-name="Bluetooth Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_local_variation_api/group"/>
-</component>
-<component name="bluetooth_notifier_internal_api" long-name="Bluetooth Notifier internal API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_notifier_internal_api/group"/>
-</component>
-<component name="bluetooth_sap_connection_state_api" long-name="Bluetooth SAP Connection State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_sap_connection_state_api/group"/>
-</component>
-<component name="bluetooth_secondary_display_notification_api" long-name="Bluetooth Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_secondary_display_notification_api/group"/>
-</component>
-</collection>
-<collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
-<component name="bteng" filter="s60" long-name="Bluetooth Engine">
-<unit bldFile="mw/btservices/bluetoothengine/bteng/group"/>
-</component>
-<component name="btnotif" filter="s60" long-name="Bluetooth Notifier">
-<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"/>
-</component>
-<component name="btmac" filter="s60" long-name="Bluetooth Mono Audio Controller" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btmac/group"/>
-</component>
-<component name="btsac" filter="s60" long-name="Bluetooth Stereo Audio Controller" plugin="Y">
-<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"/>
-</component>
-<component name="btsap" filter="s60" long-name="Bluetooth SIM Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btsap/group"/>
-</component>
-<component name="btui" filter="s60" long-name="Bluetooth UI">
-<unit bldFile="mw/btservices/bluetoothengine/btui/group"/>
-</component>
-<component name="btpbap" filter="s60" long-name="Bluetooth Phonebook Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btpbap/group"/>
-</component>
-<component name="bthid" filter="s60" long-name="Bluetooth HID">
-<unit bldFile="mw/btservices/bluetoothengine/bthid/group"/>
-</component>
-<component name="btctrldcmoadapter" filter="s60" long-name="Bluetooth Control DCMO Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btctrldcmoadapter/group"/>
-</component>
-</collection>
-<collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
-<component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
-<unit bldFile="mw/btservices/bluetoothappprofiles/avrcp" mrp="mw/btservices/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
-</component>
-</collection>
-<collection name="atcommands" long-name="AT Commands" level="generic">
-<component name="modematplugin" long-name="Modem AT Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/modematplugin/group"/>
-</component>
-<component name="lccustomplugin" long-name="LC Custom Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/lccustomplugin/group"/>
-</component>
-</collection>
-<collection name="btservices_info" long-name="BT Services Info" level="plugin">
-<component name="btservices_metadata" long-name="BT Services Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usbservices" level="generic" long-name="USB Services" levels="framework server generic specific plugin">
-<collection name="usbservices_plat" long-name="USB Services Platform Interfaces" level="plugin">
-<component name="pictbridge_api" long-name="PictBridge API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/pictbridge_api/group"/>
-</component>
-<component name="ptp_responder_api" long-name="PTP Responder API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_responder_api/group"/>
-</component>
-<component name="ptp_transport_api" long-name="PTP Transport API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_transport_api/group"/>
-</component>
-<component name="usb_device_control_plugin_api" long-name="USB Device Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_device_control_plugin_api/group"/>
-</component>
-<component name="usb_notifier_api" long-name="USB Notifier API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_notifier_api/group"/>
-</component>
-<component name="usb_personality_api_header" long-name="USB Personality API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_api_header/group"/>
-</component>
-<component name="usb_personality_plugin_api" long-name="USB Personality Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_plugin_api/group"/>
-</component>
-<component name="usb_secondary_display_api" long-name="USB Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_secondary_display_api/group"/>
-</component>
-<component name="usb_watcher_api" long-name="USB Watcher API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_api/group"/>
-</component>
-<component name="usb_watcher_info_api_header" long-name="USB Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_info_api_header/group"/>
-</component>
-</collection>
-<collection name="usbservices_info" long-name="USB Services Info" level="plugin"/>
-<collection name="usbengines" long-name="USB Engines" level="generic">
-<component name="usbotgwatcher" filter="s60" long-name="USB OTG Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbotgwatcher/group"/>
-</component>
-<component name="usbwatcher" filter="s60" long-name="USB Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbwatcher/group"/>
-</component>
-<component name="usblocodplugin" filter="s60" long-name="USB Local Connectivity Domain Plugin" plugin="Y">
-<unit bldFile="mw/usbservices/usbengines/usblocodplugin/group"/>
-</component>
-<component name="usbdevcon" filter="s60" long-name="USB Device Control">
-<unit bldFile="mw/usbservices/usbengines/usbdevcon/group"/>
-</component>
-<component name="usbremotepersonality" filter="s60" long-name="USB Remote Personality">
-<unit bldFile="mw/usbservices/usbengines/usbremotepersonality/group"/>
-</component>
-</collection>
-<collection name="usbclasses" long-name="USB Classes" level="framework">
-<component name="usbobexclasscontroller" filter="s60" long-name="USB OBEX Class Controller" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbobexclasscontroller/group"/>
-</component>
-<component name="usbbasicpersonality" filter="s60" long-name="USB Basic Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbbasicpersonality/group"/>
-</component>
-<component name="usbmscpersonality" filter="s60" long-name="USB MSC Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbmscpersonality/group"/>
-</component>
-<!-- commented out in bld.inf. Should this be deleted?
- <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
- <unit bldFile="usbclasses/ptpstack/group"/>
- </component>
- <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
- <unit bldFile="usbclasses/sicdusbplugin/group"/>
- </component>
- <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
- <unit bldFile="usbclasses/ptpserver/group"/>
- </component>-->
-<component name="pictbridgeengine" filter="s60" long-name="PictBridge Engine">
-<unit bldFile="mw/usbservices/usbclasses/pictbridgeengine/group"/>
-</component>
-<component name="usbphoneasmodem" filter="s60" long-name="USB Phone as Modem" introduced="^3">
-<unit bldFile="mw/usbservices/usbclasses/usbphoneasmodem/group"/>
-</component>
-</collection>
-<collection name="usbuis" long-name="USB UIs" level="specific">
-<component name="usbui" filter="s60" long-name="USB UI">
-<unit bldFile="mw/usbservices/usbuis/usbui/group"/>
-</component>
-<component name="usbuinotif" filter="s60" long-name="USB UI Notifiers">
-<unit bldFile="mw/usbservices/usbuis/usbuinotif/group"/>
-</component>
-<component name="imageprintuiprovider" filter="s60" long-name="ImagePrint UI Provider" plugin="Y">
-<unit bldFile="mw/usbservices/usbuis/imageprintuiprovider/group"/>
-</component>
-<component name="usbimageprintui" filter="s60" long-name="ImagePrint UI">
-<unit bldFile="mw/usbservices/usbuis/imageprintui/group"/>
-</component>
-</collection>
-</block>
-<block name="shortlinkconn" level="generic" long-name="Shortlink Connectivity" levels="framework server generic specific plugin">
-<!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
-<collection name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" level="plugin">
-<component name="obex_service_utils_api" long-name="OBEX Service Utils API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_utils_api/group"/>
-</component>
-<component name="obex_service_plugin_api" long-name="OBEX Service Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_plugin_api/group"/>
-</component>
-<component name="dialup_connection_status_api" long-name="Dial-up Connection Status API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dialup_connection_status_api/group"/>
-</component>
-<component name="dun_secondary_display_notification_api" long-name="DUN Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
-</component>
-<component name="obex_secondary_display_notification_api" long-name="OBEX Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
-</component>
-<component name="generic_hid_api" long-name="Generic HID API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/generic_hid_api/group"/>
-</component>
-<component name="locod_bearer_plugin_api" long-name="Locod Bearer Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/locod_bearer_plugin_api/group"/>
-</component>
-<component name="usb_obexservicemanager_client_api" long-name="USB OBEX Service Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_obexservicemanager_client_api/group"/>
-</component>
-</collection>
-<collection name="localconnectivityservice" long-name="Local Connectivity Service" level="server">
-<component name="locod" long-name="Local Connectivity Daemon">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/locod/group"/>
-</component>
-<component name="obexserviceman" long-name="OBEX Service Managar">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
-</component>
-<component name="obexsendservices" long-name="OBEX Send Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
-</component>
-<component name="obexreceiveservices" long-name="OBEX Receive Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
-</component>
-<component name="dun" long-name="Dial Up Networking">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/dun/group"/>
-</component>
-<component name="lcstylustap" long-name="LC Stylus Tap Plugins" plugin="Y">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/lcstylustap/group"/>
-</component>
-<component name="generichid" long-name="Generic HID">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/generichid/group"/>
-</component>
-<component name="headset" long-name="Headset">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/headset/group"/>
-</component>
-</collection>
-</block>
-<block name="imghandling" level="specific" long-name="Image Handling" levels="lib util if">
-<collection name="imagehandling_plat" long-name="Image Handling Platform Interfaces" level="if">
-<component name="image_handling_library_api" long-name="Image Handling Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
-</component>
-<component name="3gp_library_api" long-name="3GP Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
-</component>
-<component name="thumbnailmanager_api" long-name="Thumbnail Manager API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagehandlinglib" long-name="Image Handling Library" level="lib">
-<!-- collection is really a component, need to move down a directory -->
-<component name="ihl" filter="s60" long-name="IHL">
-<unit bldFile="mw/imghandling/imagehandlinglib/group"/>
-</component>
-</collection>
-<collection name="imagehandlingutilities" long-name="Image Handling Utilities" level="util">
-<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager">
-<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
-</component>
-</collection>
-</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">
-<unit bldFile="mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
-</component>
-</collection>
-</block>
-<block name="mds" level="specific" long-name="Metadata Services" levels="mgr eng server int">
-<collection name="mds_plat" long-name="Metadata Services Platform Interfaces" level="int">
-<component name="context_engine_plugin_api" long-name="Context Engine Plugin API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/group" filter="!test"/>
-</component>
-<component name="harvester_framework_api" long-name="Harvester Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/harvester_framework_api/group" filter="!test"/>
-<!-- can only have one unit with the same filter, #include the following from the previous unit -->
-</component>
-<component name="location_manager_api" long-name="Location Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/location_manager_api/group" filter="!test"/>
-</component>
-<component name="metadata_engine_api" long-name="Metadata Engine API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/metadata_engine_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_collection_manager_api" long-name="Content Listing Framework Collection Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_extended_api" long-name="Content Listing Framework Extended API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_extended_api/group"/>
-</component>
-</collection>
-<collection name="mds_pub" long-name="Metadata Services Public Interfaces" level="int">
-<component name="content_listing_framework_api" long-name="Content Listing Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_pub/content_listing_framework_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="metadataengine" long-name="Metadata Engine" level="eng">
-<component name="metadataengine_common" filter="s60" long-name="Metadata Engine Common" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/common/group"/>
-</component>
-<component name="metadataengine_server" filter="s60" long-name="Metadata Engine Server" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/server/group"/>
-</component>
-<component name="metadataengine_client" filter="s60" long-name="Metadata Engine Client" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/client/group"/>
-</component>
-<component name="metadataengine_build" filter="s60" long-name="Metadata Engine Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/metadataengine/group"/>
-</component>
-</collection>
-<collection name="locationmanager" long-name="Location Manager" level="mgr">
-<component name="locationtrail" filter="s60" long-name="Location Trail" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/locationtrail/group"/>
-</component>
-<component name="locationmanager_server" filter="s60" long-name="Location Manager Server" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/server/group"/>
-</component>
-<component name="locationmanager_client" filter="s60" long-name="Location Manager Client" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/client/group"/>
-</component>
-<component name="locationmanager_build" filter="s60" long-name="Location Manager Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/locationmanager/group"/>
-</component>
-</collection>
-<collection name="contextengine" long-name="Context Engine" level="eng">
-<component name="contextengine_plugins" filter="s60" long-name="Context Engine Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/contextengine/plugins/group"/>
-</component>
-<component name="contextengine_build" filter="s60" long-name="Context Engine Build" introduced="^2">
-<!--make this collection a single component, or make this unit self-contained -->
-<unit bldFile="mw/mds/contextengine/group"/>
-</component>
-</collection>
-<collection name="harvester" long-name="Harvester" level="eng">
-<component name="blacklistclient" filter="s60" long-name="Blacklist Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistclient/group"/>
-</component>
-<component name="blacklistserver" filter="s60" long-name="Blacklist Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistserver/group"/>
-</component>
-<component name="harvester_common" filter="s60" long-name="Harvester Common" introduced="^2">
-<unit bldFile="mw/mds/harvester/common/group"/>
-</component>
-<component name="composerplugins" filter="s60" long-name="Composer Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/composerplugins/group"/>
-</component>
-<component name="harvesterplugins" filter="s60" long-name="Harvester Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/harvesterplugins/group"/>
-</component>
-<component name="monitorplugins" filter="s60" long-name="Monitor Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/monitorplugins/group"/>
-</component>
-<component name="harvester_server" filter="s60" long-name="Harvester Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/server/group"/>
-</component>
-<component name="harvester_client" filter="s60" long-name="Harvester Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/client/group"/>
-</component>
-<component name="harvester_build" filter="s60" long-name="Harvester Build" introduced="^2">
-<!-- split these exports into the other components -->
-<unit bldFile="mw/mds/harvester/group"/>
-</component>
-</collection>
-<collection name="watchdog" long-name="Watchdog" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="mdswatchdog" filter="s60" long-name="Metadata Watchdog" introduced="^2">
-<unit bldFile="mw/mds/watchdog/group"/>
-</component>
-</collection>
-<collection name="clfwrapper" long-name="Content Listing Framework Wrapper" level="int">
-<!-- collection is really a component. Move down a directory -->
-<component name="clfwrapper_build" filter="s60" long-name="CLF Wrapper Build" introduced="^2" class="placeholder">
-<!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
-<!--<unit bldFile="clfwrapper/group"/>-->
-</component>
-</collection>
-<collection name="mds_info" long-name="Metadata Services Info" level="int">
-<component name="mds_build" filter="s60" long-name="Metadata Services Build" introduced="^2">
-<!-- consider distributiing this into the rest of the components in the package -->
-<unit bldFile="mw/mds/group"/>
-</component>
-</collection>
-</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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<unit bldFile="mw/mmuifw/mmuifw_plat/alf_customlayoutmanagers_api/group"/>
-</component>
-<component name="gesturehelper_api" long-name="Gesture Helper API" filter="s60" 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">
-<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">
-<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">
-<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">
-<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">
-<!-- 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">
-<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">
-<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">
-<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">
-<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">
-<unit bldFile="mw/mmuifw/mulwidgets/mullogging/group"/>
-</component>
-<component name="muldatamodel" filter="s60" long-name="MUL Data Model">
-<unit bldFile="mw/mmuifw/mulwidgets/muldatamodel/group"/>
-</component>
-<component name="mulwidgets_common" filter="s60" long-name="MUL Common Utils">
-<unit bldFile="mw/mmuifw/mulwidgets/common/group"/>
-</component>
-<component name="gesturehelper" filter="s60" long-name="Gesture Helper">
-<unit bldFile="mw/mmuifw/mulwidgets/gesturehelper/group"/>
-</component>
-<component name="mulcoverflowwidget" filter="s60" long-name="MUL CoverFlow Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/mulcoverflowwidget/group"/>
-</component>
-<component name="mulsliderwidget" filter="s60" long-name="MUL Slider Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/mulsliderwidget/group"/>
-</component>
-<component name="alfviewwidget" filter="s60" long-name="ALF View Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/alfviewwidget/group"/>
-</component>
-<component name="alfcontainerwidget" filter="s60" long-name="ALF Container Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/alfcontainerwidget/group"/>
-</component>
-<component name="alfscrollbarwidget" filter="s60" long-name="ALF Scrollbar Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/alfscrollbarwidget/group"/>
-</component>
-</collection>
-</block>
-<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"/>
-</component>
-<component name="videoconnutility_api" long-name="Video Connection Utility API" filter="s60" class="api">
-<unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/group"/>
-</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"/>
-</component>
-</collection>
-<collection name="videoscheduler" long-name="Video Scheduler" level="util">
-<component name="schedulerclient" filter="s60" long-name="Video Scheduler Client">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerclient/group"/>
-</component>
-<component name="schedulerserver" filter="s60" long-name="Video Scheduler Server">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerserver/group"/>
-</component>
-</collection>
-<collection name="videoconnutility" long-name="Video Connection Utility" level="util">
-<component name="connutilpsworker" filter="s60" long-name="Connection Utility Publish and Subscribe Worker">
-<unit bldFile="mw/videoutils/videoconnutility/connutilpsworker/group"/>
-</component>
-<component name="video_connutility" filter="s60" long-name="Video Connection Utility">
-<unit bldFile="mw/videoutils/videoconnutility/connutility/group"/>
-</component>
-</collection>
-<collection name="videoutils_info" long-name="Video Utils Info" level="if"/>
-</block>
-<block name="mmmw" level="generic" long-name="Multimedia Middleware" levels="plugin framework server generic specific">
-<collection name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" level="specific">
-<component name="multimedia_data_source_api" long-name="Multimedia Data Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
-</component>
-<component name="progressive_download_api" long-name="Progressive Download API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/progressive_download_api/group"/>
-</component>
-<component name="equalizer_ui_api" long-name="Equalizer UI API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
-</component>
-<component name="enhanced_media_client_api" long-name="Enhanced Media Client API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
-</component>
-<component name="stream_control_custom_command_api" long-name="Stream Control Custom Command API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
-</component>
-<component name="emc_buffer_source_api" long-name="EMC Buffer Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_buffer_source_api/group"/>
-</component>
-<component name="emc_file_source_api" long-name="EMC File Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
-</component>
-<component name="audio_metadata_reader_api" long-name="Audio MetaData Reader API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
-</component>
-<component name="emc_progressive_download_source_api" long-name="EMC Progressive Download Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
-</component>
-<component name="emc_volume_effect_api" long-name="EMC Volume Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
-</component>
-<component name="emc_balance_effect_api" long-name="EMC Balance Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_balance_effect_api/group"/>
-</component>
-<component name="emc_descriptor_source_api" long-name="EMC Descriptor Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_descriptor_source_api/group"/>
-</component>
-<component name="emc_drm_config_intfc_api" long-name="EMC DRM Config Intfc API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
-</component>
-<component name="voip_audio_services_api" long-name="VoIP Audio Services" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/group"/>
-</component>
-<component name="configuration_components_factory_api" long-name="Configuration Components Factory API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
-</component>
-<component name="audio_output_control_utility_api" long-name="Audio Output Control Utility API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/group"/>
-</component>
-<component name="audio_output_control_utility_proxy_api" long-name="Audio Output Control Utility Proxy API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
-</component>
-<component name="emc_audio_effects_api" long-name="EMC Audio Effects API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
-</component>
-<component name="call_audio_control_api" long-name="Call AudioControl API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/group"/>
-</component>
-<component name="radio_utilities_api" long-name="Radio Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/group"/>
-</component>
-<component name="radio_preset_utilities_api" long-name="Radio Preset Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
-</component>
-<component name="radio_monitor_api" long-name="Radio Monitor API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
-</component>
-<component name="thumbnail_engine_api" long-name="Thumbnail Engine API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/thumbnail_engine_api/group"/>
-</component>
-<component name="telephony_multimedia_service_api" long-name="Telephony Multimedia Service API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="mmfenh" long-name="MMF Enhancements" level="generic">
-<component name="advancedaudiocontroller" filter="s60" long-name="Advanced Audio Controllers" plugin="Y">
-<unit bldFile="mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
-</component>
-<component name="audiooutputcontrolutility" filter="s60" long-name="Audio Output Control Utility">
-<unit bldFile="mw/mmmw/mmfenh/audiooutputcontrolutility/group"/>
-</component>
-<component name="configurationcomponentsfactory" filter="s60" long-name="Configuration Components Factory">
-<unit bldFile="mw/mmmw/mmfenh/configurationcomponentsfactory/group"/>
-</component>
-<component name="enhancedaudioplayerutility" filter="s60" long-name="Enhanced Audio Player Utility">
-<unit bldFile="mw/mmmw/mmfenh/enhancedaudioplayerutility/group"/>
-</component>
-<component name="enhancedmediaclient" filter="s60" long-name="Enhanced Media Client">
-<unit bldFile="mw/mmmw/mmfenh/enhancedmediaclient/group"/>
-</component>
-<component name="profilesettingsmonitor" filter="s60" long-name="Profile Settings Monitor">
-<unit bldFile="mw/mmmw/mmfenh/profilesettingsmonitor/group"/>
-</component>
-<component name="progressivedownload" filter="s60" long-name="Progressive Download">
-<unit bldFile="mw/mmmw/mmfenh/progressivedownload/group"/>
-</component>
-</collection>
-<collection name="mm_fw" long-name="Multimedia Frameworks" level="framework">
-<!-- Id needs to be unique, mmfw already in use -->
-<!-- Placeholder for OpenAX AL and other stuff -->
-</collection>
-<collection name="mmserv" long-name="Multimedia Services" level="specific">
-<component name="audioeffectsui" filter="s60" long-name="Audio Effects UI">
-<unit bldFile="mw/mmmw/mmserv/audioeffectsui/group"/>
-</component>
-<component name="callaudiocontrol" filter="s60" long-name="Call Audio Control">
-<unit bldFile="mw/mmmw/mmserv/callaudiocontrol/group"/>
-</component>
-<component name="metadatautility" filter="s60" long-name="Metadata Utility">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/group"/>
-</component>
-<component name="radioutility" filter="s60" long-name="Radio Utility">
-<unit bldFile="mw/mmmw/mmserv/radioutility/group"/>
-</component>
-<component name="thumbnailengine" filter="s60" long-name="Thumbnail Engine" introduced="^2">
-<unit bldFile="mw/mmmw/mmserv/thumbnailengine/group"/>
-</component>
-<component name="tms" filter="s60" long-name="Telephony Multimedia Service" introduced="^3">
-<unit bldFile="mw/mmmw/mmserv/tms/group"/>
-</component>
-<component name="voipaudioservices" filter="s60" long-name="VoIP Audio Services">
-<unit bldFile="mw/mmmw/mmserv/voipaudioservices/group"/>
-</component>
-<component name="lib3gpextparser" filter="s60" long-name="3GP Extension Metadata Parser Library">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group" filter="sf_build"/>
-</component>
-</collection>
-<collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
-<component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="helix" level="generic" long-name="Helix" levels="plugin framework server generic specific">
-<collection name="helix_ren" long-name="Helix Engine" level="framework">
-<!-- what does "ren" stand for? -->
-<component name="helix_stub" filter="s60" long-name="Helix Stub" introduced="^2" class="api">
-<unit bldFile="mw/helix/helix_ren/helix_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="camerasrv" level="specific" long-name="Camera Services" levels="plugin fw api">
-<collection name="camerasrv_plat" long-name="Camera Services Platform Interfaces" level="api">
-<component name="media_recorder_sink_api" long-name="Media Recorder Sink API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
-</component>
-<component name="cae_extentension_api" long-name="CAE Extension API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/cae_extentension_api/group"/>
-</component>
-<component name="camera_application_engine_api" long-name="Camera Application Engine API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/camera_application_engine_api/group" filter="!test"/>
-</component>
-<component name="custom_onboard_camera_api" long-name="Custom Onboard Camera API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
-</component>
-<component name="imaging_configuration_manager_api" long-name="Imaging Configuration Manager API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
-</component>
-<component name="media_recorder_api" long-name="Media Recorder API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_api/group" filter="!test"/>
-</component>
-<component name="3gp_file_composer_api" long-name="3GP File Composer API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
-</component>
-<component name="asynchronous_file_saving_queue_api" long-name="Asynchronous File Saving Queue API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="camappengine" long-name="Camera App Engine" level="fw">
-<!-- is this collection really a component? If so, move down a directory -->
-<component name="stillconverter" filter="s60" long-name="Still Image Converter" class="placeholder">
-<!-- should separate this from parent engine's bld.inf -->
-<!-- <unit bldFile="camappengine/stillconverter/group"/> -->
-</component>
-<component name="camappengine_engine" filter="s60" long-name="Camera App Engine" class="placeholder">
-<!-- should separate this from parent engine's bld.inf -->
-<!-- <unit bldFile="camappengine/engine/group"/> -->
-</component>
-<component name="asynchfilesavequeue" filter="s60" long-name="Asynch File Save Queue">
-<unit bldFile="mw/camerasrv/camappengine/asynchfilesavequeue/group"/>
-</component>
-<component name="camappengine_build" filter="s60" long-name="Camera App Engine Build">
-<unit bldFile="mw/camerasrv/camappengine/build"/>
-</component>
-</collection>
-<collection name="camcordermmfplugin" long-name="Camcorder MMF Plugin" level="plugin">
-<!-- collection is really a component. Should move down a directory -->
-<component name="camcordermmfplugin_build" filter="s60" long-name="Camcorder MMF Plugin Build" plugin="Y">
-<unit bldFile="mw/camerasrv/camcordermmfplugin/build"/>
-</component>
-</collection>
-<collection name="configmanagers" long-name="Config Managers" level="api">
-<component name="imagingconfigmanager" filter="s60" long-name="Imaging Config Manager">
-<unit bldFile="mw/camerasrv/configmanagers/imagingconfigmanager/group"/>
-</component>
-</collection>
-<collection name="camerasrv_info" long-name="Camera Services Info" level="api">
-<component name="camerasrv_build" filter="s60" long-name="Camera Services Build">
-<!-- should split into individual bld.infs -->
-<unit bldFile="mw/camerasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="mmappfw" level="specific" long-name="Multimedia App Framework" levels="fw utils if">
-<collection name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" level="if">
-<component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interfaces Build" introduced="^1" filter="s60">
-<!-- this is no longer necessary when confguration is put in place -->
-<unit bldFile="mw/mmappfw/mmappfw_plat"/>
-</component>
-<component name="collection_helper_api" long-name="Collection Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
-</component>
-<component name="harvester_collection_mediator_api" long-name="Harvester Collection Mediator API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/group"/>
-</component>
-<component name="harvester_metadata_extractor_api" long-name="Harvester Metadata Extractor API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/group"/>
-</component>
-<component name="harvester_server_api" long-name="Harvester Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_server_api/group"/>
-</component>
-<component name="harvester_utility_api" long-name="Harvester Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_utility_api/group"/>
-</component>
-<component name="playlist_engine_api" long-name="Playlist Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playlist_engine_api/group"/>
-</component>
-<component name="mtp_keys_api" long-name="MTP Keys API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mtp_keys_api/group"/>
-</component>
-<component name="mpx_collection_common_definition_api" long-name="MPX Collection Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_common_definition_api/group"/>
-</component>
-<component name="mpx_collection_utility_api" long-name="MPX Collection Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/group"/>
-</component>
-<component name="mpx_common_api" long-name="MPX Common API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_api/group"/>
-</component>
-<component name="mpx_common_definition_api" long-name="MPX Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_common_definition_api" long-name="MPX Playback Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_utility_api" long-name="MPX Playback Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/group"/>
-</component>
-<component name="mpx_base_view_plugins_api" long-name="MPX Base View Plugins API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/group"/>
-</component>
-<component name="mpx_view_utility_api" long-name="MPX View Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_view_utility_api/group"/>
-</component>
-<component name="mpx_albumart_utility_api" long-name="MPX Album Art Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/group"/>
-</component>
-<component name="media_player_settings_engine_api" long-name="Media Player Settings Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
-</component>
-<component name="mpx_backstepping_utility_api" long-name="MPX Backstepping Utility API" introduced="^1" filter="s60" class="api">
-<!-- uncomment when configuration is put in place
- <unit bldFile="mmappfw_plat/mpx_backstepping_utility_api/group"/> -->
-</component>
-<component name="asx_parser_api" long-name="ASX Parser API" introduced="^1" filter="s60" class="api">
-<!-- uncomment when configuration is put in place
- <unit bldFile="mmappfw_plat/asx_parser_api/group"/> -->
-</component>
-<component name="playback_helper_api" long-name="Playback Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playback_helper_api/group"/>
-</component>
-<component name="videoplaylist_utility_api" long-name="Video Playlist Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/videoplaylist_utility_api/group"/>
-</component>
-<component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interface Build" introduced="^1" filter="s60" class="api">
-<!-- needed only for #ifdefs. Remove anmd uncomment above units when configuration is in place -->
-<unit bldFile="mw/mmappfw/mmappfw_plat/group"/>
-</component>
-</collection>
-<collection name="mpx" long-name="Multimedia Player" level="fw">
-<component name="commonframework" filter="s60" long-name="MPX Common Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/commonframework/group"/>
-</component>
-<component name="playbackframework" filter="s60" long-name="MPX Playback Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/playbackframework/group"/>
-</component>
-<component name="mpxcollectionfw" filter="s60" long-name="MPX Collection Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/collectionframework/group"/>
-</component>
-<component name="mpxviewfw" filter="s60" long-name="MPX View Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/viewframework/group"/>
-</component>
-<component name="mpx_build" filter="s60" long-name="MPX Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/mpx/group"/>
-</component>
-</collection>
-<collection name="mmappcomponents" long-name="Multimedia App Components" level="utils">
-<component name="mmappcomponents_build" filter="s60" long-name="Multimedia App Components Build" introduced="^1">
-<!-- needed for #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
- Can remove this once configuration is in place-->
-<unit bldFile="mw/mmappfw/mmappcomponents/group"/>
-</component>
-<component name="collectionhelper" filter="s60" long-name="Media Player Collection Helper" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/collectionhelper/group"/>
-</component>
-<component name="playlistengine" filter="s60" long-name="Playlist Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/playlistengine/group"/>
-</component>
-<component name="mpxharvester" filter="s60" long-name="Media Player Harvester" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/harvester/group"/>
-</component>
-<component name="mmappcommonui" filter="s60" long-name="Multimedia App Common UI" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmappcommonui/group"/>
-</component>
-<component name="mediaplayersettingsengine" filter="s60" long-name="Media Player Settings Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
-</component>
-<component name="audiofetcher" filter="s60" long-name="Audio Fetcher" introduced="^1" plugin="Y">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
-</component>
-<component name="asxparser" filter="s60" long-name="ASX Parser" introduced="^1">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
-</component>
-<component name="playbackhelper" filter="s60" long-name="Playback Helper" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/playbackhelper/group"/>
-</component>
-<component name="videoplaylistutility" filter="s60" long-name="Video Playlist Utility" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/videoplaylistutility/group"/>
-</component>
-<component name="mmmtpdataprovider" filter="s60" long-name="Multimedia MTP Data Provider" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmmtpdataprovider/group"/>
-</component>
-</collection>
-<collection name="mmappfw_info" long-name="Multimedia App Framework Info" level="if">
-<component name="mmappfw_build" filter="s60" long-name="Multimedia App Framework Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/group"/>
-</component>
-<component name="mmappfw_test" filter="s60,test,api_test,pref_test" long-name="Multimedia App Framework Test" purpose="development" introduced="^1"/>
-</collection>
-</block>
-<block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework api">
-<collection name="inputmethods_pub" long-name="Input Methods Public Interfaces" level="api">
-<component name="ptiengine_iti_api" long-name="PTI Engine API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
-</component>
-<component name="optical_character_recognition_api" long-name="Optical Character Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
-</component>
-<component name="input_language_info_api" long-name="Input Language Info API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
-</component>
-</collection>
-<collection name="inputmethods_plat" long-name="Input Methods Platform Interfaces" level="api">
-<component name="pen_input_server_api" long-name="Pen Input Server API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/group" filter="!test"/>
-</component>
-<component name="ptiengine_hwr_api" long-name="PTI Engine Handwriting Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group" filter="!test"/>
-</component>
-<component name="aknfep_settings_api" long-name="Avkon FEP Settings API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
-</component>
-<component name="aknfep_status_api" long-name="Avkon FEP Status API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
-</component>
-<component name="ptiengine_key_definations_api" long-name="PTI Engine Key Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
-</component>
-<component name="aknfep_definitions_api" long-name="Avkon FEP Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
-</component>
-<component name="aknfep_pen_support_api" long-name="Avkon FEP Pen Support API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
-</component>
-<component name="ptiengine_indic_definitions_api" long-name="PTI Engine Indic Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
-</component>
-<component name="aknfep_uiinterface_api" long-name="Avkon FEP UI Interface API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="textinput" long-name="Text Input" level="framework">
-<component name="ptienginev2" filter="s60" long-name="Predictive Text Input Engine">
-<!--uncomment when configuration is turned on and textinput_build is removed-->
-<!-- <unit bldFile="textinput/ptienginev2/group"/>-->
-</component>
-<component name="akninputlanguage" filter="s60" long-name="Avkon Input Language">
-<unit bldFile="mw/inputmethods/textinput/akninputlanguage/group"/>
-</component>
-<component name="peninputarc" filter="s60" long-name="Pen Input Arc">
-<unit bldFile="mw/inputmethods/textinput/peninputarc/group"/>
-</component>
-<component name="peninputcommonctrls" filter="s60" long-name="Pen Input Common Controls">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonctrls/group"/>
-</component>
-<component name="peninputhwrboxcn" filter="s60" long-name="Chinese Handwriting Recognition Box" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrboxcn/group"/>
-</component>
-<component name="peninputvkbcn" filter="s60" long-name="Chinese Virtual Keyboard" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputvkbcn/group"/>
-</component>
-<component name="peninputcommonlayout" filter="s60" long-name="Pen Input Common Layout">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonlayout/group"/>
-</component>
-<component name="peninputgenerichwr" filter="s60" long-name="Pen Input Generic Handwriting Recognition" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputgenerichwr/group"/>
-</component>
-<component name="peninputgenericvkb" filter="s60" long-name="Pen Input Generic Virtual Keyboard" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputgenericvkb/group"/>
-</component>
-<component name="peninputcommonctrlsjp" filter="s60" long-name="Pen Input Common Controls Japanese">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonctrlsjp/group"/>
-</component>
-<component name="peninputhwrboxjp" filter="s60" long-name="Japanese Handwriting Recognition Box" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrboxjp/group"/>
-</component>
-<component name="peninputvkbjp" filter="s60" long-name="Japanese Virtual Keyboard" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputvkbjp/group"/>
-</component>
-<component name="gslangplugin" filter="s60" long-name="GS Language Plugin" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/GSLangPlugin"/>
-</component>
-<component name="peninputgenericitut" filter="s60" long-name="Pen Input Generic ITU-T" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputgenericitut/group"/>
-</component>
-<component name="peninputhwrtrui" filter="s60" long-name="Pen Input Handwriting Recognition Training UI" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrtrui/group"/>
-</component>
-<component name="peninputhwrfscn" filter="s60" long-name="Pen Input Chinese Full Screen Handwriting Recognition" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrfscn/group"/>
-</component>
-<component name="peninputvkbkr" filter="s60" long-name="Pen Input Korean Virtual Keyboard" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputvkbkr/group"/>
-</component>
-<component name="peninputfingerhwr" filter="s60" long-name="Pen Input Finger Handwriting Recognition" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputfingerhwr/group"/>
-</component>
-<component name="peninputsplititut" filter="s60" long-name="Pen Input Split ITU-T" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputsplititut/group"/>
-</component>
-<component name="peninputsplitqwerty" filter="s60" long-name="Pen Input Split QWERTY" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputsplitqwerty/group"/>
-</component>
-<component name="textinput_build" filter="s60" long-name="Text Input Build">
-<!--needed for #ifdef, can be removed when configuration is implemented -->
-<unit bldFile="mw/inputmethods/textinput/group"/>
-</component>
-</collection>
-<collection name="fep" long-name="FEP" level="engine">
-<component name="aknfep" filter="s60" long-name="Avkon FEP" plugin="Y">
-<unit bldFile="mw/inputmethods/fep/aknfep/group"/>
-</component>
-<component name="frontendprocessor" long-name="Front End Processor" purpose="mandatory">
-<unit bldFile="mw/inputmethods/fep/frontendprocessor/group" mrp="mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
-</component>
-</collection>
-<collection name="inputmethods_info" long-name="Input Methods Info" level="api">
-<component name="inputmethods_metadata" long-name="Input Methods Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="qt" level="generic" long-name="Qt" levels="tool mw app">
-<collection name="qtconf" long-name="Qt Config" level="tool">
-<component name="qt_deviceconfiguration" long-name="Qt Device Configuration" introduced="^2" class="config tool">
-<unit bldFile="mw/qt/src/s60installs/deviceconfiguration"/>
-</component>
-</collection>
-<collection name="qt_info" long-name="Qt Info" level="mw">
-<component name="qt_build" long-name="Qt Build" introduced="^2">
-<unit bldFile="mw/qt" proFile="projects.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-<collection name="qtdemos" long-name="Qt Demos" level="app">
-<component name="qtdemos_build" long-name="Qt Demos Build" introduced="^2" filter="qtdemos">
-<unit bldFile="mw/qt/demos" proFile="demos.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qtexamples" long-name="Qt Examples" level="app">
-<component name="qtexamples_build" long-name="Qt Examples Build" introduced="^2" filter="qtexamples">
-<unit bldFile="mw/qt/examples" proFile="examples.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qt_tests" long-name="Qt Tests" level="app">
-<component name="qttestsauto" long-name="Qt Automated Tests" introduced="^2" filter="qttestsauto">
-<unit bldFile="mw/qt/tests/auto" proFile="qtpauto.pro"/>
-</component>
-<component name="qttestsbenchmarks" long-name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks">
-<unit bldFile="mw/qt/tests/benchmarks" proFile="benchmarks.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</block>
-<block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
-<collection name="classicui_plat" long-name="Classic UI Platform Interfaces" level="specific">
-<component name="personalisation_framework_api" long-name="Personalisation Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_framework_api/group" filter="!test"/>
-</component>
-<component name="signal_pane_api" long-name="Signal Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
-</component>
-<component name="japanese_reading_api" long-name="Japanese Reading API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/japanese_reading_api/group" filter="!test"/>
-</component>
-<component name="global_popup_priority_controller_api" long-name="Global Popup Priority Controller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
-</component>
-<component name="item_finder_api" long-name="Item Finder API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/item_finder_api/group" filter="!test"/>
-</component>
-<component name="avkon_fonts_api" long-name="Avkon Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_fonts_api/group" filter="!test"/>
-</component>
-<component name="extended_utilities_api" long-name="Extended Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
-</component>
-<component name="personalisation_plugin_api" long-name="Personalisation Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
-</component>
-<component name="extended_aiw_criteria_api" long-name="Extended AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="personalisation_application_api" long-name="Personalisation Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_application_api/group"/>
-</component>
-<component name="volume_popup_api" long-name="Volume Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
-</component>
-<component name="avkon_secondary_display_support_api" long-name="AVKON Secondary Display Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_support_api/group" filter="!test"/>
-</component>
-<component name="extended_setting_pages_api" long-name="Extended Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_setting_pages_api/group" filter="!test"/>
-</component>
-<component name="extended_lists_api" long-name="Extended Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_lists_api/group" filter="!test"/>
-</component>
-<component name="input_block_api" long-name="Input Block API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/input_block_api/group" filter="!test"/>
-</component>
-<component name="avkon_ui_server_api" long-name="AVKON UI Server API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_ui_server_api/group" filter="!test"/>
-</component>
-<component name="number_grouping_api" long-name="Number Grouping API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/number_grouping_api/group" filter="!test"/>
-</component>
-<component name="extended_status_pane_api" long-name="Extended Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_status_pane_api/group" filter="!test"/>
-</component>
-<component name="extended_notifiers_api" long-name="Extended Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notifiers_api/group" filter="!test"/>
-</component>
-<component name="task_list_api" long-name="Task List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
-</component>
-<component name="personalisation_slide_show_dialog_api" long-name="Personalisation Slide Show Dialog API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
-</component>
-<component name="key_event_utilities_api" long-name="Key Event Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_event_utilities_api/group"/>
-</component>
-<component name="emergency_call_support_api" long-name="Emergency Call Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/emergency_call_support_api/group" filter="!test"/>
-</component>
-<component name="extended_dialogs_api" long-name="Extended Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_dialogs_api/group"/>
-</component>
-<component name="legacy_ui_framework_headers_api" long-name="Legacy UI Framework Headers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/legacy_ui_framework_headers_api/group"/>
-</component>
-<component name="extended_editors_api" long-name="Extended Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_editors_api/group" filter="!test"/>
-</component>
-<component name="alarm_api" long-name="Alarm API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alarm_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_interface_base_api" long-name="AIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_base_api/group" filter="!test"/>
-</component>
-<component name="list_effects_api" long-name="List Effects API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/list_effects_api/group" filter="!test"/>
-</component>
-<component name="find_item_ui_api" long-name="Find Item UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/find_item_ui_api/group" filter="!test"/>
-</component>
-<component name="server_application_services_api" long-name="Server Application Services API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/server_application_services_api/group" filter="!test"/>
-</component>
-<component name="common_ui_settings_api" long-name="Common UI Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_ui_settings_api/group"/>
-</component>
-<component name="aiw_service_interface_menu_api" long-name="AIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_menu_api/group" filter="!test"/>
-</component>
-<component name="eikon_server_extension_client_api" long-name="EIKON Server Extension Client API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/eikon_server_extension_client_api/group" filter="!test"/>
-</component>
-<component name="skinnable_clock_api" long-name="Skinnable Clock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/skinnable_clock_api/group" filter="!test"/>
-</component>
-<component name="battery_pane_api" long-name="Battery Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/battery_pane_api/group" filter="!test"/>
-</component>
-<component name="fep_document_navigation_api" long-name="FEP Document Navigation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
-</component>
-<component name="personalisation_localised_texts_api" long-name="Personalisation Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
-</component>
-<component name="memory_card_ui_api" long-name="Memory Card UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
-</component>
-<component name="avkon_status_api" long-name="AVKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_status_api/group"/>
-</component>
-<component name="application_switching_api" long-name="Application Switching API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/application_switching_api/group" filter="!test"/>
-</component>
-<component name="avkon_localised_texts_api" long-name="AVKON Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_localised_texts_api/group"/>
-</component>
-<component name="avkon_secondary_display_api" long-name="AVKON Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_api/group"/>
-</component>
-<component name="extended_animation_api" long-name="Extended Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_notes_api" long-name="Extended Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notes_api/group" filter="!test"/>
-</component>
-<component name="screensaver_animation_plugin_definitions_api" long-name="Screensaver Animation Plugin Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/screensaver_animation_plugin_definitions_api/group"/>
-</component>
-<component name="text_scroller_api" long-name="Text Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/text_scroller_api/group" filter="!test"/>
-</component>
-<component name="custom_cursors_api" long-name="Custom Cursors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/custom_cursors_api/group" filter="!test"/>
-</component>
-<component name="screensaver_settings_api" long-name="Screensaver Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/screensaver_settings_api/group"/>
-</component>
-<component name="global_window_priorities_api" long-name="Global Window Priorities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_window_priorities_api/group"/>
-</component>
-<component name="extended_indicators_api" long-name="Extended Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_indicators_api/group" filter="!test"/>
-</component>
-<component name="special_character_table_api" long-name="Special Character Table API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/special_character_table_api/group" filter="!test"/>
-</component>
-<component name="avkon_settings_api" long-name="AVKON Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_settings_api/group"/>
-</component>
-<component name="extended_sounds_api" long-name="Extended Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_sounds_api/group"/>
-</component>
-<component name="themes_settings_api" long-name="Themes Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/themes_settings_api/group"/>
-</component>
-<component name="media_shared_document_api" long-name="Media Shared Document API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/media_shared_document_api/group" filter="!test"/>
-</component>
-<component name="extended_queries_api" long-name="Extended Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_queries_api/group"/>
-</component>
-<component name="phone_number_text_utilities_api" long-name="Phone Number Text Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
-</component>
-<component name="screensaver_runtime_api" long-name="Screensaver Runtime API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/screensaver_runtime_api/group"/>
-</component>
-<component name="extended_scroller_api" long-name="Extended Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_scroller_api/group"/>
-</component>
-<component name="key_rotator_api" long-name="Key Rotator API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_rotator_api/group" filter="!test"/>
-</component>
-<component name="extended_grids_api" long-name="Extended Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_grids_api/group" filter="!test"/>
-</component>
-<component name="generic_parameter_api" long-name="Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="indicator_touch_observer_api" long-name="Indicator Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_touch_observer_api/group"/>
-</component>
-<component name="popup_form_api" long-name="Popup Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/popup_form_api/group" filter="!test"/>
-</component>
-<component name="stylus_activated_popup_api" long-name="Stylus Activated Pop-up API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/stylus_activated_popup_api/group" filter="!test"/>
-</component>
-<component name="indicator_plugin_api" long-name="Indicator Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_plugin_api/group" filter="!test"/>
-</component>
-<component name="layout_configuration_api" long-name="Layout Configuration API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/layout_configuration_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_filter_factory_api" long-name="Common File Dialogs Filter Factory API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group" filter="!test"/>
-</component>
-<component name="avkon_anim_dll_api" long-name="AVKON Anim DLL API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_anim_dll_api/group"/>
-</component>
-<component name="extended_initialization_api" long-name="Extended Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_initialization_api/group" filter="!test"/>
-</component>
-<component name="long_tap_animation_api" long-name="Long Tap Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/long_tap_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_ui_framework_definitions_api" long-name="Extended UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_ui_framework_definitions_api/group"/>
-</component>
-<component name="extended_buttons_api" long-name="Extended Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_buttons_api/group" filter="!test"/>
-</component>
-<component name="aiw_provider_utility_api" long-name="AIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_provider_utility_api/group" filter="!test"/>
-</component>
-<component name="transition_effect_parameters_api" long-name="Transition Effect Parameters API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_parameters_api/group" filter="!test"/>
-</component>
-<component name="extended_input_capabilities_api" long-name="Extended Input Capabilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_input_capabilities_api/group" filter="!test"/>
-</component>
-<component name="uikon_status_api" long-name="UIKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/uikon_status_api/group"/>
-</component>
-<component name="transition_effect_utilities_api" long-name="Transition Effect Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_utilities_api/group" filter="!test"/>
-</component>
-<component name="pointer_event_modifier_api" long-name="Pointer Event Modifier API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/pointer_event_modifier_api/group" filter="!test"/>
-</component>
-<component name="avkon_testability_api" long-name="AVKON Testability API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_testability_api/group"/>
-</component>
-<component name="ganes_api" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ganes_api/group"/>
-</component>
-<component name="ode_api" long-name="Ode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ode_api/group"/>
-</component>
-<component name="physics_api" long-name="Physics API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/physics_api/group"/>
-</component>
-<component name="touch_pane_api" long-name="Touch Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_api/group" filter="!test"/>
-</component>
-<component name="touch_pane_observer_api" long-name="Touch Pane Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_observer_api/group"/>
-</component>
-<component name="alternate_fs_api" long-name="Alternate FS API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alternate_fs_api/group"/>
-</component>
-<component name="discreet_popup_api" long-name="Discreet Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/discreet_popup_api/group"/>
-</component>
-<component name="touch_gesture_framework_api" long-name="Touch Gesture Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_gesture_framework_api/group"/>
-<!-- should this be commented out? -->
-<!--<unit bldFile="classicui_plat/touch_gesture_framework_api/tsrc/group" filter="test,api_test"/> -->
-</component>
-<component name="extended_options_menu_api" long-name="Extended Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="classicui_pub" long-name="Classic UI Public Interfaces" level="specific">
-<component name="input_frame_api" long-name="Input Frame API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/input_frame_api/group" filter="!test"/>
-</component>
-<component name="window_server_event_observer_api" long-name="Window Server Event Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/window_server_event_observer_api/group" filter="!test"/>
-</component>
-<component name="application_framework_api" long-name="Application Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/application_framework_api/group" filter="!test"/>
-</component>
-<component name="scroller_api" long-name="Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/scroller_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_utilities_api" long-name="UI Framework Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_utilities_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_definitions_api" long-name="UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_definitions_api/group" filter="!test"/>
-</component>
-<component name="buttons_api" long-name="Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/buttons_api/group" filter="!test"/>
-</component>
-<component name="queries_api" long-name="Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/queries_api/group" filter="!test"/>
-</component>
-<component name="aiw_generic_parameter_api" long-name="AIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="editors_api" long-name="Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/editors_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_api" long-name="Common File Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/common_file_dialogs_api/group" filter="!test"/>
-</component>
-<component name="dialog_shutter_api" long-name="Dialog Shutter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialog_shutter_api/group" filter="!test"/>
-</component>
-<component name="fonts_api" long-name="Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/fonts_api/group" filter="!test"/>
-</component>
-<component name="screen_clearer_api" long-name="Screen Clearer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_clearer_api/group" filter="!test"/>
-</component>
-<component name="notifiers_api" long-name="Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notifiers_api/group" filter="!test"/>
-</component>
-<component name="notes_api" long-name="Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notes_api/group" filter="!test"/>
-</component>
-<component name="screen_saver_api" long-name="Screen Saver API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_saver_api/group" filter="!test"/>
-</component>
-<component name="status_pane_api" long-name="Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/status_pane_api/group" filter="!test"/>
-</component>
-<component name="base_controls_api" long-name="Base Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/base_controls_api/group" filter="!test"/>
-</component>
-<component name="grids_api" long-name="Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/grids_api/group" filter="!test"/>
-</component>
-<component name="context_pane_api" long-name="Context Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/context_pane_api/group" filter="!test"/>
-</component>
-<component name="lists_api" long-name="Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/lists_api/group" filter="!test"/>
-</component>
-<component name="popups_api" long-name="Popups API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/popups_api/group" filter="!test"/>
-</component>
-<component name="misc_controls_api" long-name="Misc Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/misc_controls_api/group" filter="!test"/>
-</component>
-<component name="keylock_api" long-name="Keylock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/keylock_api/group" filter="!test"/>
-</component>
-<component name="options_menu_api" long-name="Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/options_menu_api/group" filter="!test"/>
-</component>
-<component name="hierarchical_lists_api" long-name="Hierarchical Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hierarchical_lists_api/group" filter="!test"/>
-</component>
-<component name="navigation_pane_api" long-name="Navigation Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/navigation_pane_api/group" filter="!test"/>
-</component>
-<component name="tabs_api" long-name="Tabs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/tabs_api/group" filter="!test"/>
-</component>
-<component name="title_pane_touch_observer_api" long-name="Title Pane Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_touch_observer_api/group"/>
-</component>
-<component name="choice_list_api" long-name="Choice List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/choice_list_api/group" filter="!test"/>
-</component>
-<component name="info_popup_note_api" long-name="Info Popup Note API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/info_popup_note_api/group" filter="!test"/>
-</component>
-<component name="setting_pages_api" long-name="Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/setting_pages_api/group" filter="!test"/>
-</component>
-<component name="screen_mode_api" long-name="Screen Mode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_mode_api/group" filter="!test"/>
-</component>
-<component name="indicators_api" long-name="Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/indicators_api/group" filter="!test"/>
-</component>
-<component name="error_ui_api" long-name="Error UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/error_ui_api/group" filter="!test"/>
-</component>
-<component name="animation_api" long-name="Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/animation_api/group" filter="!test"/>
-</component>
-<component name="searchfield_api" long-name="Searchfield API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/searchfield_api/group" filter="!test"/>
-</component>
-<component name="labels_api" long-name="Labels API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/labels_api/group" filter="!test"/>
-</component>
-<component name="hotkeys_api" long-name="Hotkeys API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hotkeys_api/group" filter="!test"/>
-</component>
-<component name="initialization_api" long-name="Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/initialization_api/group" filter="!test"/>
-</component>
-<component name="volume_control_api" long-name="Volume Control API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/volume_control_api/group" filter="!test"/>
-</component>
-<component name="title_pane_api" long-name="Title Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_api/group" filter="!test"/>
-</component>
-<component name="sounds_api" long-name="Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/sounds_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_handler_api" long-name="AIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_service_handler_api/group" filter="!test"/>
-</component>
-<component name="aiw_criteria_api" long-name="AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="touch_ui_utilities_api" long-name="Touch UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/touch_ui_utilities_api/group" filter="!test"/>
-</component>
-<component name="generic_button_api" long-name="Generic Button API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/generic_button_api/group" filter="!test"/>
-</component>
-<component name="form_api" long-name="Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/form_api/group" filter="!test"/>
-</component>
-<component name="uikon_core_controls" long-name="Uikon Core Controls" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/uikon_core_controls/group" filter="!test"/>
-</component>
-<component name="calendar_api" long-name="Calendar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/calendar_api/group"/>
-</component>
-<component name="toolbar_api" long-name="Toolbar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/toolbar_api/group" filter="!test"/>
-</component>
-<component name="server_application_api" long-name="Server Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/server_application_api/group"/>
-</component>
-<component name="slider_api" long-name="Slider API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/slider_api/group" filter="!test"/>
-</component>
-<component name="private_ui_framework_api" long-name="Private UI Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/private_ui_framework_api/group" filter="!test"/>
-</component>
-<component name="dialogs_api" long-name="Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialogs_api/group" filter="!test"/>
-</component>
-<component name="document_handler_api" long-name="Document handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/document_handler_api/group"/>
-</component>
-<component name="images_api" long-name="Images API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/images_api/group" filter="!test"/>
-</component>
-<component name="stylus_popup_menu_api" long-name="Stylus Pop-up Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/stylus_popup_menu_api/group" filter="!test"/>
-</component>
-<component name="information_preview_popup_api" long-name="Information Preview Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/information_preview_popup_api/group" filter="!test"/>
-</component>
-<component name="intermediate_state_api" long-name="Intermediate State API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/intermediate_state_api/group"/>
-</component>
-<component name="help_launcher_api" long-name="Help Launcher API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/help_launcher_api/group"/>
-</component>
-</collection>
-<collection name="ode" long-name="Open Dynamics Engine" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="ode_build" filter="s60" long-name="ODE">
-<unit bldFile="mw/classicui/ode/group"/>
-</component>
-</collection>
-<collection name="uifw" long-name="UI Framework" level="server">
-<component name="uiklaf" filter="s60" long-name="Uikon Look-and-Feel">
-<unit bldFile="mw/classicui/uifw/uiklaf/group"/>
-</component>
-<component name="eikctl" filter="s60" long-name="Eikon Controls">
-<unit bldFile="mw/classicui/uifw/eikctl/group"/>
-</component>
-<component name="avkon" filter="s60" long-name="Avkon">
-<!-- can only have one unit. Split into 3 components, or #include all from same bld.inf -->
-<unit bldFile="mw/classicui/uifw/avkon/aknphysics/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/aknconf/group"/>
-</component>
-<component name="eikstd" filter="s60" long-name="Eikon Standard">
-<unit bldFile="mw/classicui/uifw/eikstd/group"/>
-</component>
-<component name="aknglobalui" filter="s60" long-name="Avkon Global UI">
-<unit bldFile="mw/classicui/uifw/aknglobalui/group"/>
-</component>
-<component name="ganes" filter="s60" long-name="Ganes">
-<unit bldFile="mw/classicui/uifw/ganes/group"/>
-</component>
-</collection>
-<collection name="commonuis" long-name="Common UIs" level="specific">
-<component name="commonui" filter="s60" long-name="Common UI">
-<unit bldFile="mw/classicui/commonuis/commonui/group"/>
-</component>
-<component name="commondialogs" filter="s60" long-name="Common Dialogs">
-<unit bldFile="mw/classicui/commonuis/commondialogs/group"/>
-</component>
-</collection>
-<collection name="applicationinterworkingfw" long-name="Application Interworking Framework" level="generic">
-<component name="aifwservicehandler" filter="s60" long-name="Application Interworking Service Handler">
-<unit bldFile="mw/classicui/applicationinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-<collection name="psln" long-name="Personalization" level="specific">
-<!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
-<component name="psln_build" filter="s60" long-name="Personalization Build">
-<unit bldFile="mw/classicui/psln/group"/>
-</component>
-</collection>
-<collection name="commonadapter" long-name="Common Adapter" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="commonadapter_build" filter="s60" long-name="Common Adapter Build">
-<unit bldFile="mw/classicui/commonadapter/group"/>
-</component>
-</collection>
-<collection name="akntouchgesturefw" long-name="Avkon Touch Gesture Framework" level="generic">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="akntouchgesturefw_build" filter="s60" long-name="Avkon Touch Gesture Framework Build" introduced="^3">
-<unit bldFile="mw/classicui/akntouchgesturefw/group"/>
-</component>
-</collection>
-<collection name="uiutils" long-name="UI Utils" level="specific">
-<component name="localizer" filter="s60" long-name="Directory Localizer">
-<unit bldFile="mw/classicui/uiutils/localizer/group"/>
-</component>
-<component name="findutil" filter="s60" long-name="Find Utility">
-<unit bldFile="mw/classicui/uiutils/findutil/group"/>
-</component>
-<component name="gamerecognizer" filter="s60" long-name="Game Recognizer" plugin="Y">
-<unit bldFile="mw/classicui/uiutils/gamerecognizer/group"/>
-</component>
-<component name="aknjapanesereading" filter="s60" long-name="Avkon Japanese Reading">
-<unit bldFile="mw/classicui/uiutils/aknjapanesereading/group"/>
-</component>
-</collection>
-<collection name="commonuisupport" long-name="Common UI Support" level="support">
-<component name="uikon" long-name="Uikon" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uikon/group" mrp="mw/classicui/commonuisupport/uikon/group/app-framework_uikon.mrp"/>
-</component>
-<component name="errorresolverdata" long-name="Error Resolver Data" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/errorresolverdata/group" mrp="mw/classicui/commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
-</component>
-<component name="uilaf" long-name="UI Look and Feel" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uilaf/GROUP" mrp="mw/classicui/commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
-</component>
-<component name="grid" long-name="Grid" purpose="optional">
-<unit bldFile="mw/classicui/commonuisupport/grid/group" mrp="mw/classicui/commonuisupport/grid/group/app-framework_grid.mrp"/>
-</component>
-<component name="uifwsdocs" long-name="UI Frameworks Documentation" purpose="development" class="doc">
-<unit mrp="mw/classicui/commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
-</component>
-</collection>
-<collection name="lafagnosticuifoundation" long-name="Look-and-Feel Agnostic UI Foundation" level="base">
-<component name="cone" long-name="Control Environment" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/cone/group" mrp="mw/classicui/lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
-</component>
-<component name="graphicseffects" long-name="Graphics Effects" introduced="9.2" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/graphicseffects/group" mrp="mw/classicui/lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
-</component>
-<component name="uigraphicsutils" long-name="UI Graphics Utilities" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group" mrp="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
-</component>
-<component name="clockanim" long-name="Clock" purpose="optional" plugin="Y">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/clockanim/group" mrp="mw/classicui/lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
-</component>
-<component name="bmpanimation" long-name="BMP Animation" introduced="6.0" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/bmpanimation/group" mrp="mw/classicui/lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
-</component>
-<component name="animation" long-name="Animation" introduced="9.1" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/animation/group" mrp="mw/classicui/lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
-</component>
-</collection>
-<collection name="classicui_info" long-name="Classic UI Info" level="specific">
-<!-- the multiple units in the API test components need to be resolved -->
-<component name="classicui_metadata" long-name="Classic UI Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/classicui/classicui_info/classicui_metadata/classicui_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="svgt" level="generic" long-name="SVG Tiny" levels="util ui">
-<collection name="svgt_plat" long-name="SVG Tiny Platform Interfaces" level="ui">
-<component name="svgt_api" long-name="SVGT API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/svgt_api/group"/>
-</component>
-<component name="nvg_api" long-name="NVG API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/nvg_api/group"/>
-</component>
-</collection>
-<collection name="svgtopt" long-name="SVG-T Engine" level="util">
-<component name="svgtopt_build" filter="s60" long-name="SVG Engine" introduced="9.2">
-<!-- component is at collection level. Needs to be moved down a directory -->
-<unit bldFile="mw/svgt/svgtopt/group"/>
-</component>
-<component name="svgtplugin" filter="s60" long-name="SVG Plugin" introduced="9.2" plugin="Y">
-<unit bldFile="mw/svgt/svgtopt/svgtplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="uiaccelerator" level="generic" long-name="UI Accelerator" levels="plugin framework server ex if">
-<collection name="uiaccelerator_plat" long-name="UI Accelerator Platform Interfaces" level="if">
-<component name="alf_core_toolkit_api" long-name="ALF Core Toolkit API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/group"/>
-</component>
-<component name="alf_visual_api" long-name="ALF Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/group"/>
-</component>
-<component name="alf_extended_visual_api" long-name="ALF Extended Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/group"/>
-</component>
-<component name="alf_extension_api" long-name="ALF Extension API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/group"/>
-</component>
-<component name="alf_tracing_api" long-name="ALF Tracing API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/group"/>
-</component>
-<component name="alf_client_server_api" long-name="ALF Client Server API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/group"/>
-</component>
-</collection>
-<collection name="uiacceltk" long-name="UI Accelerator Toolkit" level="framework">
-<component name="hitchcock" filter="s60" long-name="Hitchcock">
-<unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/group"/>
-</component>
-<component name="uiacceltk_build" filter="s60" long-name="UI Accelerator Toolkit Build">
-<!-- move into the other component, or remove the #include and make this UI Accelerator Toolkit ROM-->
-<unit bldFile="mw/uiaccelerator/uiacceltk/group"/>
-</component>
-</collection>
-</block>
-<block name="uiresources" level="generic" long-name="UI Resources" levels="compile plugin framework server generic data">
-<!-- are the custom filters below needed? -->
-<collection name="uiresources_pub" long-name="UI Resources Public Interfaces" level="data">
-<component name="pictograph_api" long-name="Pictograph API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/pictograph_api/group" filter="!test"/>
-</component>
-<component name="skins_api" long-name="Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/skins_api/group" filter="!test"/>
-</component>
-<component name="font_definition_api" long-name="Font Definition API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/font_definition_api/group" filter="!test"/>
-</component>
-<component name="graphics_api" long-name="Graphics API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/graphics_api/group" filter="!test"/>
-</component>
-<component name="scalable_icons_api" long-name="Scalable Icons API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/scalable_icons_api/group"/>
-</component>
-<component name="layout_id_definitions_api" long-name="Layout ID Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/layout_id_definitions_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_plat" long-name="UI Resources Platform Interfaces" level="data">
-<component name="layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_system_private_api/group" filter="!test"/>
-</component>
-<component name="layout_data_api" long-name="Layout Data API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_data_api/group" filter="!test"/>
-</component>
-<component name="cdl_api" long-name="CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/cdl_api/group" filter="!test"/>
-</component>
-<component name="extended_skins_api" long-name="Extended Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_skins_api/group" filter="!test"/>
-</component>
-<component name="tfx_server_controller_plugin_api" long-name="TFX Server Controller Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_controller_plugin_api/group"/>
-</component>
-<component name="extended_fonts_api" long-name="Extended Fonts API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_fonts_api/group" filter="!test"/>
-</component>
-<component name="graphic_configuration_api" long-name="Graphic Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/graphic_configuration_api/group" filter="!test"/>
-</component>
-<component name="mif_header_cdl_api" long-name="MIF Header CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mif_header_cdl_api/group"/>
-</component>
-<component name="personalisation_and_skins_settings_api" long-name="Personalisation and Skins Settings API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/personalisation_and_skins_settings_api/group"/>
-</component>
-<component name="tfx_effect_setup_plugin_api" long-name="TFX Effect Setup Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_effect_setup_plugin_api/group"/>
-</component>
-<component name="mifconv_definitions_api" long-name="Mifconv Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mifconv_definitions_api/group"/>
-</component>
-<component name="wallpaper_configuration_api" long-name="Wallpaper Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/wallpaper_configuration_api/group"/>
-</component>
-<component name="language_code_definitions_api" long-name="Language Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/language_code_definitions_api/group"/>
-</component>
-<component name="skins_image_attributes_api" long-name="Skins Image Attributes API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
-</component>
-<component name="private_user_area_code_definitions_api" long-name="Private User Area Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/private_user_area_code_definitions_api/group"/>
-</component>
-<component name="tfx_server_plugin_ids_api" long-name="TFX Server Plug-in IDs API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_plugin_ids_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_info" long-name="UI Resources Info" level="data">
-<component name="uiresources_test" filter="s60,test,api_test" long-name="UI Resources Tests" purpose="development"/>
-</collection>
-<collection name="uigraphics" long-name="UI Graphics" level="generic">
-<component name="bitmaps2" filter="s60" long-name="Bitmaps 2" class="config">
-<unit bldFile="mw/uiresources/uigraphics/bitmaps2/group"/>
-</component>
-<component name="icons" filter="s60" long-name="Icons" class="config">
-<unit bldFile="mw/uiresources/uigraphics/icons/group"/>
-</component>
-<component name="variatedbitmaps" filter="s60" long-name="Variated Bitmaps" class="config">
-<unit bldFile="mw/uiresources/uigraphics/variatedbitmaps/group"/>
-</component>
-<component name="aknicon" filter="s60" long-name="Avkon Icon Framework">
-<unit bldFile="mw/uiresources/uigraphics/aknicon/group"/>
-</component>
-<component name="nvgrenderstage" filter="sf_build" long-name="NVG Render Stage">
-<unit bldFile="mw/uiresources/uigraphics/nvgrenderstage/group"/>
-</component>
-</collection>
-<collection name="layouts" long-name="Layouts" level="plugin">
-<component name="cdl" filter="s60" long-name="Customization Definition Language">
-<!-- can only have one unit. Need to #include them or split into multiple components -->
-<unit bldFile="mw/uiresources/layouts/cdl/cdlengine/group"/>
-<unit bldFile="mw/uiresources/layouts/cdl/cdlserver/group"/>
-</component>
-<component name="aknlayout2" filter="s60" long-name="Avkon Layout 2">
-<unit bldFile="mw/uiresources/layouts/aknlayout2/group"/>
-</component>
-</collection>
-<collection name="skins" long-name="Skins" level="data">
-<component name="aknskincontent" filter="s60" long-name="Avkon Skin Content" class="config">
-<unit bldFile="mw/uiresources/skins/aknskincontent/group"/>
-</component>
-<component name="aknskins" filter="s60" long-name="Avkon Skin Compiler">
-<unit bldFile="mw/uiresources/skins/aknskins/group"/>
-</component>
-</collection>
-<collection name="pictographs" long-name="Pictographs" level="data">
-<component name="aknpictograph" filter="s60" long-name="Avkon Pictograph">
-<unit bldFile="mw/uiresources/pictographs/aknpictograph/group"/>
-</component>
-</collection>
-<collection name="locales" long-name="Locales" level="framework">
-<component name="locales_build" filter="s60" long-name="Locales Build">
-<unit bldFile="mw/uiresources/locales/loce32"/>
-</component>
-</collection>
-<collection name="uiconfig" long-name="UI Config" level="server">
-<component name="s60config" filter="s60" long-name="S60 UI Config">
-<unit bldFile="mw/uiresources/uiconfig/s60config/group"/>
-</component>
-</collection>
-<collection name="fontsupport" long-name="Font Support" level="generic">
-<component name="fontprovider" filter="s60" long-name="Font Provider">
-<unit bldFile="mw/uiresources/fontsupport/fontprovider/group"/>
-</component>
-<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
- <component id="s60_fonts" filter="s60" name="S60 Fonts">
- <unit bldFile="fontsupport/fontutils/group"/>
- </component>
--->
-<component name="fontutils" filter="sf_build" long-name="Font Utils">
-<unit bldFile="mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
-</component>
-</collection>
-<collection name="helpthemes" long-name="Help Themes" level="data">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helpthemes_build" filter="s60" long-name="Help Themes Build" class="config">
-<unit bldFile="mw/uiresources/helpthemes/group"/>
-</component>
-</collection>
-</block>
-<block name="hapticsservices" level="generic" long-name="Haptics Services" levels="fw server api">
-<collection name="hapticsservices_plat" long-name="Haptics Services Platform Interfaces" level="api">
-<component name="tacticon_api" long-name="Tacticon API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tacticon_api/group"/>
-</component>
-<component name="tactile_feedback_core_api" long-name="Tactile Feedback Core API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_core_api/group"/>
-</component>
-<component name="tactile_feedback_server_api" long-name="Tactile Feedback Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_server_api/group"/>
-</component>
-</collection>
-<collection name="hapticsservices_pub" long-name="Haptics Services Public Interfaces" level="api">
-<component name="tactile_feedback_client_api" long-name="Tactile Feedback Client API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_pub/tactile_feedback_client_api/group"/>
-</component>
-</collection>
-<collection name="tacticonserver" long-name="Tacticon Server" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="tacticonserver_build" filter="s60" long-name="Tacticon Server Build" introduced="^3">
-<unit bldFile="mw/hapticsservices/tacticonserver/group"/>
-<!-- clients and servers are suauly the same component. Consider moving pluign to a separate component if needed -->
-</component>
-</collection>
-<collection name="tactilefeedback" long-name="Tactile Feedback" level="fw">
-<component name="tactilearearegistry" filter="s60" long-name="Tactile Area Registry" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilearearegistry/group"/>
-</component>
-<component name="tactilefeedbackresolver" filter="s60" long-name="Tactile Feedback Resolver" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackresolver/group"/>
-</component>
-<component name="tactileclickplugin" filter="s60" long-name="Tactile Click Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileclickplugin/group"/>
-</component>
-<component name="tactilefeedbackclient" filter="s60" long-name="Tactile Feedback Client" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackclient/group"/>
-</component>
-<component name="tactileactionplugin" filter="s60" long-name="Tactile Action Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileactionplugin/group"/>
-</component>
-<component name="tactilefeedback_build" filter="s60" long-name="Tactile Feedback Build" introduced="^1">
-<!-- consider moving IBY to one fo the above components -->
-<unit bldFile="mw/hapticsservices/tactilefeedback/group"/>
-</component>
-</collection>
-</block>
-<block name="gsprofilesrv" level="generic" long-name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
-<collection name="gsprofilesrv_pub" long-name="GS and Profiles Services Public Interfaces" level="specific">
-<component name="profiles_engine_active_profile_settings_api" long-name="Profiles Engine Active Profile Settings API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_active_profile_settings_api/group"/>
-</component>
-<component name="profiles_engine_wrapper_api" long-name="Profiles Engine Wrapper API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_wrapper_api/group"/>
-</component>
-</collection>
-<collection name="gsprofilesrv_plat" long-name="GS and Profiles Services Platform Interfaces" level="specific">
-<component name="profiles_engine_api" long-name="Profiles Engine API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_engine_api/group"/>
-</component>
-<component name="profiles_mediafilelist_api" long-name="Media File List API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_mediafilelist_api/group"/>
-</component>
-<component name="filelist_api" long-name="File List API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/filelist_api/group"/>
-</component>
-<component name="settings_backgroundimage_api" long-name="Settings Background Image API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_backgroundimage_api/group"/>
-</component>
-<component name="settings_framework_api" long-name="Settings Framework API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_framework_api/group"/>
-</component>
-<component name="settings_launch_api" long-name="Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_launch_api/group"/>
-</component>
-<component name="settings_listbox_api" long-name="Settings List Box API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_listbox_api/group"/>
-</component>
-<component name="settings_plugin_api" long-name="Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_plugin_api/group"/>
-</component>
-<component name="settings_uis_cenrep_collection_api" long-name="Settings UIs CenRep Collection API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
-</component>
-</collection>
-<collection name="gssettingsuis" long-name="General Settings UIs" level="framework">
-<component name="gs" filter="s60" long-name="General Settings" introduced="9.2">
-<unit bldFile="mw/gsprofilesrv/gssettingsuis/gs/group"/>
-</component>
-</collection>
-<collection name="profilesservices" long-name="Profiles Services" level="server">
-<component name="filelist" filter="s60" long-name="File List" introduced="9.1">
-<unit bldFile="mw/gsprofilesrv/profilesservices/filelist/group"/>
-</component>
-<component name="mediafilelist" filter="s60" long-name="Media File List" introduced="^2">
-<unit bldFile="mw/gsprofilesrv/profilesservices/mediafilelist/group"/>
-</component>
-<component name="profileengine" filter="s60" long-name="Profile Engine" introduced="9.1">
-<unit bldFile="mw/gsprofilesrv/profilesservices/profileengine/group"/>
-</component>
-<component name="ringingtone3dplugin" filter="s60" long-name="Ringing Tone 3D Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/gsprofilesrv/profilesservices/ringingtone3dplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreensrv" level="specific" long-name="Home Screen Services" levels="plugin framework server generic specific">
-<collection name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" level="specific">
-<component name="ai_content_model_api" long-name="AI Content Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_content_model_api/group"/>
-</component>
-<component name="ai_utilities_api" long-name="AI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_utilities_api/group" filter="!test"/>
-</component>
-<component name="ai_plugin_management_api" long-name="AI Plug-in Management API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_management_api/group"/>
-</component>
-<component name="ai_plugin_information_api" long-name="AI Plug-in Information API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_information_api/group"/>
-</component>
-<component name="ai_variation_api" long-name="AI Variation API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_variation_api/group"/>
-</component>
-<component name="action_handler_plugin_api" long-name="Action Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/group" filter="!test"/>
-</component>
-<component name="content_harvester_plugin_api" long-name="Content Harvester Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/group" filter="!test"/>
-</component>
-<component name="menu_model_api" long-name="Menu Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_model_api/group"/>
-</component>
-<component name="menu_sat_interface_api" long-name="Menu SAT Interface API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/group" filter="!test"/>
-</component>
-<component name="external_home_screen_api" long-name="External Home Screen API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/external_home_screen_api/group"/>
-</component>
-<component name="menu_content_service_api" long-name="Menu Content Service API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_content_service_api/group" filter="!test"/>
-</component>
-<component name="sapi_contentpublishing" long-name="SAPI Content Publishing" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing/group"/>
-</component>
-<component name="sapi_backstepping" long-name="SAPI Backstepping" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_backstepping/group"/>
-</component>
-<component name="sapi_actionhandler" long-name="SAPI Action Handler" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_actionhandler/group"/>
-</component>
-<component name="sapi_homescreenplugin" long-name="SAPI Homescreen Plugin" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_homescreenplugin/group" filter="!test"/>
-</component>
-<component name="sapi_menucontent" long-name="SAPI Menu Content" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_menucontent/group"/>
-</component>
-<component name="xcfw_api" long-name="XCFW API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/xcfw_api/group"/>
-</component>
-<component name="idlefw_api" long-name="Idle Framework API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/idlefw_api/group"/>
-</component>
-<component name="hs_widget_publisher_api" long-name="Home Screen Publishing API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_widget_publisher_api/group"/>
-</component>
-<component name="hs_settings_api" long-name="HS Settings API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_settings_api/group"/>
-</component>
-<component name="hs_content_control_api" long-name="HS Content Control API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_content_control_api/group"/>
-</component>
-</collection>
-<collection name="xcfw" long-name="XML Content Framework" level="framework">
-<!-- collection is really a component, needs to be moved down a directory -->
-<component name="xcfw_build" filter="s60" long-name="XML Content Framework Build">
-<unit bldFile="mw/homescreensrv/xcfw/group"/>
-</component>
-</collection>
-<collection name="homescreenpluginsrv" long-name="Home Screen Plugin Service" level="plugin">
-<component name="hspsdefinitionengine" filter="s60" long-name="HS Plugin Service Definition Engine" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsdefinitionengine/group"/> -->
-</component>
-<component name="hspsdom" filter="s60" long-name="HS Plugin Service DOM" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsdom/group"/> -->
-</component>
-<component name="hspstools" filter="s60" long-name="HS Server Tools">
-<!-- <unit bldFile="homescreenpluginsrv/hspstools/group"/> -->
-</component>
-<component name="hspspluginregistry" filter="s60" long-name="HS Plugin Registry" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspspluginregistry/group"/>-->
-</component>
-<component name="hspsmanager" filter="s60" long-name="HSPS Manager" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsmanager/group"/>-->
-</component>
-<component name="hspsodt" filter="s60" long-name="HSPS Object Description Tree" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsodt/group"/>-->
-</component>
-<component name="hspsresource" filter="s60" long-name="HS Plugin Server Resource" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresource/group"/>-->
-</component>
-<component name="hspsresult" filter="s60" long-name="HS Plugin Server Result" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
-</component>
-<component name="homescreen_settings_api" filter="s60" long-name="HS Settings API" class="api placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
-</component>
-<component name="homescreenpluginsrv_build" filter="s60" long-name="HSPS Build">
-<!-- need to break this up into the self-contained components above and uncomment them -->
-<unit bldFile="mw/homescreensrv/homescreenpluginsrv/group"/>
-</component>
-</collection>
-<collection name="idlefw" long-name="Idle Framework" level="framework">
-<!-- Uncomment all units when configuration is in place. All currently #included from idlefw_build -->
-<component name="idlefw_plugins" filter="s60" long-name="Idle Framework Plugins" plugin="Y" class="placeholder">
-<!--<unit bldFile="idlefw/plugins/group"/>-->
-</component>
-<component name="hslaunch" filter="s60" long-name="Home Screen Launch" class="placeholder">
-<!--<unit bldFile="idlefw/plugins/group"/>-->
-</component>
-<component name="idlefw_build" filter="s60" long-name="Idle Framework Build">
-<!--split this into components, or separate from the above components and move this down a directory -->
-<unit bldFile="mw/homescreensrv/idlefw/group"/>
-</component>
-</collection>
-<collection name="menucontentsrv" long-name="Menu Content Service" level="generic">
-<component name="menusatinterface" filter="s60" long-name="Menu SAT Interface">
-<unit bldFile="mw/homescreensrv/menucontentsrv/menusatinterface/group"/>
-</component>
-<component name="menucontentsrv_build" filter="s60" long-name="Menu Content Service Build">
-<!--split this into components, or separate from the above component and move this down a directory -->
-<unit bldFile="mw/homescreensrv/menucontentsrv/group"/>
-</component>
-</collection>
-<collection name="backsteppingsrv" long-name="Back Stepping Service" level="server">
-<!-- collection is really a component, needs to be moved down a directory -->
-<component name="bsengine" long-name="Back Stepping Engine" filter="s60">
-<unit bldFile="mw/homescreensrv/backsteppingsrv/group"/>
-</component>
-</collection>
-<collection name="contentpublishingsrv" long-name="Content Publishing Service" level="server">
-<component name="contentpublishingdebug" filter="s60" long-name="Content Publishing Debug">
-<!-- need to move this component outside of contentpublishingutils and into separate component directory -->
-<!-- <unit bldFile="contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/> -->
-</component>
-<component name="contentpublishingutils" filter="s60" long-name="Content Publishing Utils">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingutils/group"/>
-</component>
-<component name="contentpublishingserver" filter="s60" long-name="Content Publishing Server">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingserver/group"/>
-</component>
-<component name="contentharvester" filter="s60" long-name="Content Harvester">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
-</component>
-<component name="contentpublishingsrv_build" filter="s60" long-name="Content Publishing Service Build">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/group"/>
-</component>
-</collection>
-<collection name="contentcontrolsrv" long-name="Content Control Service" level="server">
-<component name="ccsrv" long-name="Content Control Service" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccsrv/group"/>
-</component>
-<component name="ccsrvapi" long-name="Content Control Service API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccsrvapi/group"/>
-</component>
-<component name="ccclientsession" long-name="Content Control Client Session" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccclientsession/group"/>
-</component>
-<component name="hsccclient" long-name="HS Content Control Client" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/hsccclient/group"/>
-</component>
-<component name="hscontentinfo" long-name="Home Screen Content Info" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/hscontentinfo/group"/>
-</component>
-<component name="contentcontrolsrv_build" long-name="Content Control Service Build" filter="s60" introduced="^3">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/group"/>
-</component>
-</collection>
-</block>
-<block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
-<collection name="appinstall_plat" long-name="Application Installation Platform Interfaces" level="api">
-<component name="iaupdate_api" long-name="IA Update API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/iaupdate_api/group"/>
-</component>
-<component name="task_plugin_api" long-name="Task Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_plugin_api/group"/>
-</component>
-<component name="sw_installer_common_ui_api" long-name="SW Installer Common UI API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_common_ui_api/group"/>
-</component>
-<component name="sw_installer_launcher_api" long-name="SW Installer Launcher API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_launcher_api/group"/>
-</component>
-<component name="task_management_api" long-name="Task Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_management_api/group"/>
-</component>
-<component name="sw_installer_ui_plugin_api" long-name="SW Installer UI Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ui_plugin_api/group"/>
-</component>
-<component name="sw_installer_cr_keys" long-name="SW Installer CR Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_cr_keys/group"/>
-</component>
-<component name="sw_installer_ps_keys" long-name="SW Installer PS Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
-</component>
-<component name="appmngr2runtimeapi" long-name="Application Manager 2 Runtime Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
-</component>
-</collection>
-<collection name="appinstall_pub" long-name="Application Installation Public Interfaces" level="api">
-<component name="startup_list_management_api" long-name="Startup List Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
-</component>
-</collection>
-<collection name="ncdengine" long-name="Nokia Content Discover" level="framework">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="ncdengine_engine" filter="s60" long-name="NCD Engine" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/engine/group"/>
-</component>
-<component name="debuglogger" filter="s60" long-name="NCD Debug Logger" introduced="^1" class="placeholder">
-<!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
-</component>
-<component name="ncdengine_build" filter="s60" long-name="NCD Build" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/group"/>
-</component>
-</collection>
-<collection name="appinstaller" long-name="Application Installer" level="generic">
-<component name="appmngr2" filter="s60" long-name="Application Manager 2" introduced="^2">
-<unit bldFile="mw/appinstall/appinstaller/appmngr2/group"/>
-</component>
-<component name="appinstui" filter="s60" long-name="Application Installer UI" introduced="^2">
-<unit bldFile="mw/appinstall/appinstaller/appinstui/group"/>
-</component>
-</collection>
-<collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="api">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="iaupdateapi_stub_build" long-name="IA Update API Stub Build" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdateapi_stub/group"/>
-</component>
-</collection>
-<collection name="iaupdate" long-name="Independent Apps Update" level="api">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="iad" long-name="Software Update" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/iad/group"/>
-</component>
-<component name="iaupdate_help" filter="s60" long-name="IA Update Help" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/help/group"/>
-</component>
-<component name="iaupdate_build" filter="s60" long-name="IA Update Build" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/group"/>
-</component>
-</collection>
-<collection name="installationservices" long-name="Installation Services" level="generic">
-<component name="swi" long-name="Secure Software Install" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swi/group" mrp="mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
-</component>
-<component name="swidevicetools" long-name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
-<unit bldFile="mw/appinstall/installationservices/swidevicetools/group" mrp="mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
-</component>
-<component name="swiconfig" long-name="Software Install Config" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appinstall/installationservices/swiconfig/group" mrp="mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
-</component>
-</collection>
-<collection name="secureswitools" long-name="Secure Software Install Tools" level="tool">
-<component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/makekeys/group" mrp="mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
-</component>
-<component name="swianalysistoolkit" long-name="SWI Analysis Toolkit" purpose="development" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
-</component>
-<component name="openssllib" long-name="OpenSSL Library" purpose="optional" class="PC">
-<unit mrp="mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
-</component>
-<component name="swisistools" long-name="Secure Software Install SIS Tools" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swisistools/group" mrp="mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
-</component>
-</collection>
-<collection name="appinstall_info" long-name="Application Installation Info" level="api">
-<component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="serviceapifw" level="specific" long-name="Service API Framework" levels="plugin framework server generic specific">
-<collection name="serviceapifw_pub" long-name="Service API Framework Public Interfaces" level="specific"/>
-<collection name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" level="specific">
-<component name="rtsecuritymanager_common_api" long-name="Runtime Security Manager Common API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/group"/>
-</component>
-<component name="rtsecuritymanager_utility_api" long-name="Runtime Security Manager Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
-</component>
-<component name="rtsecuritymanager_client_api" long-name="Runtime Security Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/group"/>
-</component>
-<component name="liw_provider_utility_api" long-name="LIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_provider_utility_api/group"/>
-</component>
-<component name="liw_service_interface_base_api" long-name="LIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_base_api/group"/>
-</component>
-<component name="liw_service_interface_menu_api" long-name="LIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_menu_api/group"/>
-</component>
-<component name="liw_criteria_api" long-name="LIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_criteria_api/group"/>
-</component>
-<component name="liw_generic_parameter_api" long-name="LIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_generic_parameter_api/group"/>
-</component>
-<component name="liw_service_handler_api" long-name="LIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_handler_api/group"/>
-</component>
-</collection>
-<collection name="rtsecuritymanager" long-name="Runtime Security Manager" level="server">
-<component name="rtsecuritymanagerutil" filter="s60" long-name="Runtime Security Manager Util">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
-</component>
-<component name="rtsecuritymanagerserver" filter="s60" long-name="Runtime Security Manager Server">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/>
-</component>
-<component name="rtsecuritymanagerclient" filter="s60" long-name="Runtime Security Manager Client">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/>
-</component>
-<component name="rtsecuritymanager_build" filter="s60" long-name="Runtime Security Manager Build">
-<!-- Move the export to the appropriate components, or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/group"/>
-</component>
-</collection>
-<collection name="languageinterworkingfw" long-name="Language Interworking Framework" level="framework">
-<component name="lifwservicehandler" filter="s60" long-name="Service Handler">
-<unit bldFile="mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-</block>
-<block name="serviceapi" level="specific" long-name="Service API" levels="os mw1 mw2 app">
-<!-- should break up this collection into something meaningful -->
-<collection name="serviceproviders" long-name="Service Providers" level="mw1">
-<component name="sapi_contacts_vpbk" long-name="Contacts Phonebook SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
-</component>
-<component name="sapi_location" long-name="Location SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_location/group"/>
-</component>
-<component name="sapi_mediamanagement" long-name="Media Management SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/group"/>
-</component>
-<component name="sapi_landmarks" long-name="Landmarks SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
-</component>
-<component name="sapi_messaging" long-name="Messaging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/group"/>
-</component>
-<component name="sapi_applicationmanager" long-name="Application Manager SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
-</component>
-<component name="sapi_calendar" long-name="Calendar SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_calendar/group"/>
-</component>
-<component name="sapi_logging" long-name="Logging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_logging/group"/>
-</component>
-<component name="sapi_sensor" long-name="Sensor SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sensor/group"/>
-</component>
-<component name="sapi_sysinfo" long-name="Sysinfo SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sysinfo/group"/>
-</component>
-<component name="sapi_serviceregistry" long-name="Service Registry SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
-</component>
-<component name="jsapi" long-name="Javascript API" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/jsapi/group"/>
-</component>
-<component name="serviceproviders_build" filter="s60" long-name="Service API Build">
-<!-- distribute the exports or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapi/serviceproviders/group"/>
-</component>
-</collection>
-</block>
-<block name="web" level="specific" long-name="Web" levels="plugin utils server generic specific">
-<collection name="web_pub" long-name="Web Public Interfaces" level="specific">
-<component name="browser_control_api" long-name="Browser Control API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_control_api/group"/>
-</component>
-<component name="download_mgr_client_api" long-name="Download Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_client_api/group"/>
-</component>
-<component name="download_mgr_ui_api" long-name="Download Manager UI Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_ui_api/group"/>
-</component>
-<component name="favourites_engine_api" long-name="Favourites Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/favourites_engine_api/group"/>
-</component>
-<component name="browser_plugin_api" long-name="Browser Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_plugin_api/group"/>
-</component>
-<component name="settings_api" long-name="Settings API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/settings_api/group"/>
-</component>
-</collection>
-<collection name="web_plat" long-name="Web Platform Interfaces" level="specific">
-<component name="aiw_browser_provider_api" long-name="AIW Browser Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/aiw_browser_provider_api/group"/>
-</component>
-<component name="browser_dialogs_provider_api" long-name="Browser Dialogs Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_dialogs_provider_api/group"/>
-</component>
-<component name="browser_platform_api" long-name="Browser Platform API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_platform_api/group"/>
-</component>
-<component name="cod_handler_api" long-name="COD Handler API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cod_handler_api/group"/>
-</component>
-<component name="connection_manager_api" long-name="Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/connection_manager_api/group"/>
-</component>
-<component name="cxml_library_api" long-name="cXml Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cxml_library_api/group"/>
-</component>
-<component name="download_mgr_client_api_extn" long-name="Download Manager Client API Extension" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/download_mgr_client_api_extn/group"/>
-</component>
-<component name="download_path_plugin_api" long-name="Download Path Plugin API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/web/web_plat/download_path_plugin_api/group"/>
-</component>
-<component name="feeds_engine_api" long-name="Feeds Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/feeds_engine_api/group"/>
-</component>
-<component name="launcher_api" long-name="Launcher API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/launcher_api/group"/>
-</component>
-<component name="multipart_parser_api" long-name="Multipart Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/multipart_parser_api/group"/>
-</component>
-<component name="recent_url_store_api" long-name="Recent URL Store API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/recent_url_store_api/group"/>
-</component>
-<component name="scheme_handler_plugin_api" long-name="Scheme Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scheme_handler_plugin_api/group"/>
-</component>
-<component name="scriptable_plugin_api" long-name="Scriptable Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scriptable_plugin_api/group"/>
-</component>
-<component name="webutils_api" long-name="Web Utils API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/webutils_api/group"/>
-</component>
-<component name="widget_registry_api" long-name="Widget Registry API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/widget_registry_api/group"/>
-</component>
-<component name="xml_parser_api" long-name="XML Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/xml_parser_api/group"/>
-</component>
-<component name="stmgesturefw_api" long-name="State Machine Gesture Framework API " filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/stmgesturefw_api/group"/>
-</component>
-</collection>
-<collection name="web_info" long-name="Web Info" level="specific">
-<component name="web_build" filter="s60" long-name="Web Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/group"/>
-</component>
-</collection>
-<collection name="browserutilities" long-name="Browser Utilities" level="utils">
-<component name="browserdialogsprovider" filter="s60" long-name="Browser Dialogs Provider">
-<unit bldFile="mw/web/browserutilities/browserdialogsprovider/group"/>
-</component>
-<component name="recenturlstore" filter="s60" long-name="Recent URL Store">
-<unit bldFile="mw/web/browserutilities/recenturlstore/group"/>
-</component>
-<component name="xmlparser" filter="s60" long-name="XML Interface">
-<unit bldFile="mw/web/browserutilities/xmlparser/group"/>
-</component>
-<component name="cxmllibrary" filter="s60" long-name="XML Parser Implementation">
-<unit bldFile="mw/web/browserutilities/cxmllibrary/group"/>
-</component>
-<component name="downloadmgr" filter="s60" long-name="Download Manager">
-<unit bldFile="mw/web/browserutilities/downloadmgr/group"/>
-</component>
-<component name="connectionmanager" filter="s60" long-name="Connection Manager">
-<unit bldFile="mw/web/browserutilities/connectionmanager/group"/>
-</component>
-<component name="browsertelservice" filter="s60" long-name="Browser Telephony Service">
-<unit bldFile="mw/web/browserutilities/browsertelservice/group"/>
-</component>
-<component name="favouritesengine" filter="s60" long-name="Favourites Engine">
-<unit bldFile="mw/web/browserutilities/favouritesengine/group"/>
-</component>
-<component name="feedsengine" filter="s60" long-name="Feeds Engine">
-<unit bldFile="mw/web/browserutilities/feedsengine/group"/>
-</component>
-<component name="multipartparser" filter="s60" long-name="Multipart Parser">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
-<!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
-</component>
-<component name="schemehandler" filter="s60" long-name="Scheme Handler">
-<unit bldFile="mw/web/browserutilities/schemehandler/group"/>
-</component>
-<component name="webutils" filter="s60" long-name="Web Utils">
-<unit bldFile="mw/web/browserutilities/webutils/group"/>
-</component>
-<component name="aiwbrowserprovider" filter="s60" long-name="AIW Browser Provider" plugin="Y">
-<unit bldFile="mw/web/browserutilities/aiwbrowserprovider/group"/>
-</component>
-<component name="browserutilities_build" filter="s60" long-name="Browser Utilities Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/browserutilities/group"/>
-</component>
-</collection>
-<collection name="webengine" long-name="Web Engine" level="server">
-<component name="osswebengine" filter="s60" long-name="OSS Web Engine">
-<!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
-<unit bldFile="mw/web/webengine/osswebengine/cache/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/memorymanager/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/npscript/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group/javascriptcore"/>
-</component>
-<component name="webkitutils" filter="s60" long-name="WebKit Utils">
-<unit bldFile="mw/web/webengine/webkitutils/group"/>
-</component>
-<component name="pagescaler" filter="s60" long-name="Page Scaler">
-<unit bldFile="mw/web/webengine/pagescaler/group"/>
-</component>
-<component name="webwidgetinstaller" filter="s60" long-name="Widget Installer">
-<unit bldFile="mw/web/webengine/widgetinstaller/group"/>
-</component>
-<component name="widgetregistry" filter="s60" long-name="Widget Registry">
-<unit bldFile="mw/web/webengine/widgetregistry/group"/>
-</component>
-<component name="wmlengine" filter="s60" long-name="WML Engine">
-<unit bldFile="mw/web/webengine/wmlengine/group"/>
-</component>
-<component name="device" filter="s60" long-name="Device">
-<!-- this needs a more meaningful name -->
-<unit bldFile="mw/web/webengine/device/group"/>
-</component>
-<component name="widgetengine" filter="s60" long-name="Widget Engine">
-<unit bldFile="mw/web/webengine/widgetengine/group"/>
-</component>
-<component name="web_memoryplugin" long-name="Memory Plugin" filter="s60" plugin="Y">
-<unit bldFile="mw/web/webengine/memoryplugin/group"/>
-</component>
-<component name="widgetmemoryplugin" filter="s60" long-name="Widget Memory Plugin" plugin="Y">
-<unit bldFile="mw/web/webengine/widgetmemoryplugin/group"/>
-</component>
-<component name="widgetbackuprestore" filter="s60" long-name="Widget Backup and Restore">
-<unit bldFile="mw/web/webengine/widgetbackuprestore/group"/>
-</component>
-<component name="browserrecognizers" filter="s60" long-name="Browser Recognizers" plugin="Y">
-<unit bldFile="mw/web/webengine/browserrecognizers/group"/>
-</component>
-<component name="wrtharvester" filter="s60" long-name="Web Runtime Harvester" plugin="Y">
-<unit bldFile="mw/web/webengine/wrtharvester/group"/>
-</component>
-</collection>
-<collection name="codhandler" long-name="Content Object Descriptor Handler" level="specific">
-<component name="codeng" filter="s60" long-name="COD Engine">
-<unit bldFile="mw/web/codhandler/codeng/group"/>
-</component>
-<component name="codui" filter="s60" long-name="COD UI">
-<unit bldFile="mw/web/codhandler/codui/group"/>
-</component>
-<component name="codrecog" filter="s60" long-name="COD Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/codrecog/group"/>
-</component>
-<component name="codviewer" filter="s60" long-name="COD Viewer">
-<unit bldFile="mw/web/codhandler/codviewer/group"/>
-</component>
-<component name="ddrecog" filter="s60" long-name="Download Descriptor Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/ddrecog/group"/>
-</component>
-<component name="ddviewer" filter="s60" long-name="Download Descriptor Viewer">
-<unit bldFile="mw/web/codhandler/ddviewer/group"/>
-</component>
-<component name="coddownload" filter="s60" long-name="COD Download">
-<unit bldFile="mw/web/codhandler/coddownload/group"/>
-</component>
-<component name="roapapp" filter="s60" long-name="ROAP Application">
-<unit bldFile="mw/web/codhandler/roapapp/group"/>
-</component>
-<component name="codhandler_build" filter="s60" long-name="COD Handler Build">
-<!-- Exports need to go into another component or make this self-contained.
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/codhandler/group"/>
-</component>
-</collection>
-<collection name="widgets" long-name="Web Widget Framework" level="generic">
-<!-- the following units can be uncommented when configuration is put in place -->
-<component name="widgetrecognizer" filter="s60" long-name="Widget Recognizer" plugin="Y">
-<!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
-</component>
-<component name="widgetinstaller" filter="s60" long-name="Widget Installer UI" plugin="Y">
-<!--<unit bldFile="widgets/widgetinstaller/group"/>-->
-</component>
-<component name="widgetlauncher" filter="s60" long-name="Widget Launcher">
-<!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
-</component>
-<component name="widgetapp" filter="s60" long-name="Widget UI">
-<!--<unit bldFile="widgets/widgetapp/group"/>-->
-</component>
-<component name="widgetsidchecker" filter="s60" long-name="Widget SID Checker" introduced="^3">
-<!--<unit bldFile="widgets/widgetsidchecker/group"/>-->
-</component>
-<component name="widgetpreinstaller" filter="s60" long-name="Widget Pre-Installer">
-<!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
-</component>
-<component name="widgetstartup" filter="s60" long-name="Widget Startup">
-<!--<unit bldFile="widgets/widgetstartup/group"/>-->
-</component>
-<component name="widgets_build" filter="s60" long-name="Widgets Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/widgets/group"/>
-</component>
-</collection>
-</block>
-<block name="websrv" level="generic" long-name="Web Services" levels="plugin framework server generic specific">
-<collection name="websrv_pub" long-name="Web Services Public Interfaces" level="specific">
-<component name="web_service_description_api" long-name="Web Service Description API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_description_api/group"/>
-</component>
-<component name="web_service_connection_api" long-name="Web Service Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/group"/>
-</component>
-<component name="web_service_manager_api" long-name="Web Service Manager API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/group"/>
-</component>
-<component name="hostlet_connection_api" long-name="Hostlet Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/group"/>
-</component>
-<component name="web_service_messaging_api" long-name="Web Service Messaging API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/group"/>
-</component>
-<component name="xml_extensions_api" long-name="XML Extensions API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/group"/>
-</component>
-<component name="xml_fragment_api" long-name="XML Fragment API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/group"/>
-</component>
-</collection>
-<collection name="webservices" long-name="Web Services Framework" level="generic">
-<!-- consider breaking this collection into more meaningful subsets -->
-<component name="wsnotifierplugins" filter="s60" long-name="WS Notifier Plugins" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsnotifierplugins/group"/>
-</component>
-<component name="wslogger" filter="s60" long-name="WS Logger">
-<unit bldFile="mw/websrv/webservices/wslogger/group"/>
-</component>
-<component name="wsxml" filter="s60" long-name="WS XML Extensions">
-<unit bldFile="mw/websrv/webservices/wsxml/group"/>
-</component>
-<component name="wsutils" filter="s60" long-name="WS Utils">
-<unit bldFile="mw/websrv/webservices/wsutils/group"/>
-</component>
-<component name="wsfragment" filter="s60" long-name="WS Fragment">
-<unit bldFile="mw/websrv/webservices/wsfragment/group"/>
-</component>
-<component name="wsdescription" filter="s60" long-name="WS Service Description">
-<unit bldFile="mw/websrv/webservices/wsdescription/group"/>
-</component>
-<component name="wsconnection" filter="s60" long-name="WS Service Connection">
-<unit bldFile="mw/websrv/webservices/wsconnection/group"/>
-</component>
-<component name="wsmessages" filter="s60" long-name="WS Messages">
-<unit bldFile="mw/websrv/webservices/wsmessages/group"/>
-</component>
-<component name="wscredentialmanager" filter="s60" long-name="WS Credential Manager">
-<unit bldFile="mw/websrv/webservices/wscredentialmanager/group"/>
-</component>
-<component name="wsframework" filter="s60" long-name="WS Framework">
-<unit bldFile="mw/websrv/webservices/wsframework/group"/>
-</component>
-<component name="wshttpchanneltransportplugin" filter="s60" long-name="WS HTTP Channel Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshttpchanneltransportplugin/group"/>
-</component>
-<component name="wsconnectionagent" filter="s60" long-name="WS Connection Agent">
-<unit bldFile="mw/websrv/webservices/wsconnectionagent/group"/>
-</component>
-<component name="wsprovider" filter="s60" long-name="WS Provider">
-<unit bldFile="mw/websrv/webservices/wsprovider/group"/>
-</component>
-<component name="wshostletconnection" filter="s60" long-name="WS Hostlet Connection">
-<unit bldFile="mw/websrv/webservices/wshostletconnection/group"/>
-</component>
-<component name="wsmanager" filter="s60" long-name="WS Service Manager">
-<unit bldFile="mw/websrv/webservices/wsmanager/group"/>
-</component>
-<component name="wsidentitymanager" filter="s60" long-name="WS Identity Manager">
-<unit bldFile="mw/websrv/webservices/wsidentitymanager/group"/>
-</component>
-<component name="idwsfplugin" filter="s60" long-name="ID-WSF Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/idwsfplugin/group"/>
-</component>
-<component name="wsibasicplugin" filter="s60" long-name="WS-I Basic Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsibasicplugin/group"/>
-</component>
-<component name="wsrestplugin" filter="s60" long-name="WS REST Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsrestplugin/group"/>
-</component>
-<component name="idwsfsecuritymechanism" filter="s60" long-name="ID-WSF Security Mechanism">
-<unit bldFile="mw/websrv/webservices/idwsfsecuritymechanism/group"/>
-</component>
-<component name="wspasswordtransforms" filter="s60" long-name="WS Password Transforms">
-<unit bldFile="mw/websrv/webservices/wspasswordtransforms/group"/>
-</component>
-<component name="wscore" filter="s60" long-name="WS Core Service Manager">
-<unit bldFile="mw/websrv/webservices/wscore/group"/>
-</component>
-<component name="wslocaltransportplugin" filter="s60" long-name="WS Local Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wslocaltransportplugin/group"/>
-</component>
-<component name="wshostlettransportplugin" filter="s60" long-name="WS Hostlet Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshostlettransportplugin/group"/>
-</component>
-<component name="wsstar" filter="s60" long-name="WS Star">
-<!-- can only have one unit. Need to split into separate components or #include from a single bld.inf -->
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarpolicy/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarplugin/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarmessagehandlers/group"/>
-</component>
-<component name="wsoviplugin" filter="s60" long-name="WS Ovi Plugin">
-<unit bldFile="mw/websrv/webservices/wsoviplugin/group"/>
-</component>
-<component name="webservices_build" filter="s60" long-name="Web Services Build">
-<!-- need to split into self-contained components -->
-<unit bldFile="mw/websrv/webservices/group"/>
-</component>
-</collection>
-<collection name="websrv_info" long-name="Web Services Info" level="specific">
-<component name="websrv_bld" filter="s60" long-name="Web Services Build">
-<!-- need to include common .hrh in each unit -->
-<unit bldFile="mw/websrv/group"/>
-</component>
-</collection>
-</block>
-<block name="platformtools" level="generic" long-name="Platform Tools">
-<collection name="gfxconversion" long-name="Graphics Conversion">
-<component name="bmconv_s60" filter="s60" long-name="S60 Bitmap Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/bmconv_s60/group"/>
-</component>
-<component name="mifconv" filter="s60" long-name="Multi Icon File Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/mifconv/group"/>
-</component>
-</collection>
-</block>
-<block name="uitools" level="specific" long-name="UI Tools" levels="compile encode tool if">
-<collection name="uitools_pub" long-name="UI Tools Public Interfaces" level="if">
-<component name="third_party_bitmap_palette_api" long-name="Third Party Bitmap Palette API" filter="s60" class="api">
-<unit bldFile="mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
-</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">
-<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">
-<unit bldFile="mw/uitools/uitools_plat/layout_system_private_api/group"/>
-</component>
-</collection>
-<collection name="cdlcompilertoolkit" long-name="CDL Compiler Toolkit" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompilertoolkit_build" filter="s60" long-name="CDL Compiler Toolkit Build">
-<unit bldFile="mw/uitools/cdlcompilertoolkit/group"/>
-</component>
-</collection>
-<collection name="cdlcompiler" long-name="CDL Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompiler_build" filter="s60" long-name="CDL Compiler Build">
-<unit bldFile="mw/uitools/cdlcompiler/group"/>
-</component>
-</collection>
-<collection name="gfxtools" long-name="Graphics Tools" level="tool">
-<component name="gditools" filter="s60" long-name="GDI Tools" class="PC">
-<unit bldFile="mw/uitools/gfxtools/gditools/group"/>
-</component>
-<component name="color" filter="s60" long-name="Bitmap Colour Palette" class="PC">
-<unit bldFile="mw/uitools/gfxtools/color/group"/>
-</component>
-</collection>
-<collection name="aknlayoutcompiler" long-name="Avkon Layout Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="aknlayoutcompiler_build" filter="s60" long-name="Avkon Layout Compiler Build">
-<unit bldFile="mw/uitools/aknlayoutcompiler/group"/>
-</component>
-</collection>
-<collection name="skincompiler" long-name="Skin Compiler" level="compile">
-<component name="aknskindesccompiler" filter="s60" long-name="Avkon Skin Descriptor Compiler">
-<unit bldFile="mw/uitools/skincompiler/AknSkinDescCompiler/group"/>
-</component>
-</collection>
-<collection name="reszip" long-name="Resource Zip" level="encode">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="reszip_build" filter="s60" long-name="Resource Zip Build">
-<unit bldFile="mw/uitools/reszip/group"/>
-</component>
-</collection>
-<collection name="toollibraries" long-name="Tool Libraries" level="tool"/>
-<collection name="svgtencoder" long-name="SVGT Encoder" level="encode">
-<component name="svgtenc" filter="s60" long-name="Standalone SVGT Encoder" class="PC">
-<unit bldFile="mw/uitools/svgtencoder/svgtenc/standalone/group"/>
-</component>
-</collection>
-</block>
-</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">
-<component name="location_centre_api" long-name="Location Centre API" introduced="^3" filter="s60" class="api">
-<unit bldFile="app/location/loc_plat/location_centre_api/group"/>
-</component>
-</collection>
-<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"/>
-</component>
-<component name="landmarks_ui_addedit_api" long-name="Landmarks UI Add/Edit API" filter="s60" class="api">
-<unit bldFile="app/location/loc_pub/landmarks_ui_addedit_api/group"/>
-</component>
-</collection>
-<collection name="basiclocationinfodisplay" long-name="Basic Location Info Display" level="ui">
-<component name="blid" filter="s60" long-name="Basic Location Info Display Build">
-<unit bldFile="app/location/basiclocationinfodisplay/blid/group"/>
-</component>
-</collection>
-<collection name="landmarksui" long-name="Landmarks UI" level="loc">
-<component name="landmarksui_help" filter="s60" long-name="Landmarks UI Help">
-<unit bldFile="app/location/landmarksui/help/group"/>
-</component>
-<component name="landmarksui_engine" filter="s60" long-name="Landmarks UI Engine">
-<unit bldFile="app/location/landmarksui/engine/group"/>
-</component>
-<component name="uicontrols" filter="s60" long-name="Landmarks UI Controls">
-<unit bldFile="app/location/landmarksui/uicontrols/group"/>
-</component>
-<component name="landmarksui_commonui" filter="s60" long-name="Landmarks Common UI">
-<unit bldFile="app/location/landmarksui/commonui/group"/>
-</component>
-<component name="landmarksui_app" filter="s60" long-name="Landmarks Application">
-<unit bldFile="app/location/landmarksui/app/group"/>
-</component>
-<component name="msgviewer" filter="s60" long-name="Landmarks Message Viewer">
-<unit bldFile="app/location/landmarksui/msgviewer/group"/>
-</component>
-<component name="landmarksui_build" filter="s60" long-name="Landmarks UI Build">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="app/location/landmarksui/group"/>
-</component>
-</collection>
-<collection name="eventsui" long-name="Location Events UI" level="events">
-<component name="eventsui_help" filter="s60" long-name="Events Help">
-<unit bldFile="app/location/eventsui/help/group"/>
-</component>
-<component name="eventsutils" filter="s60" long-name="Events Utils">
-<unit bldFile="app/location/eventsui/eventsutils/group"/>
-</component>
-<component name="eventsengine" filter="s60" long-name="Events Engine">
-<unit bldFile="app/location/eventsui/eventsengine/group"/>
-</component>
-<component name="eventshandlerui" filter="s60" long-name="Events Handler UI">
-<unit bldFile="app/location/eventsui/eventshandlerui/group"/>
-</component>
-<component name="eventseditor" filter="s60" long-name="Events Editor">
-<unit bldFile="app/location/eventsui/eventseditor/group"/>
-</component>
-<component name="eventsmgmtui" filter="s60" long-name="Events Management UI">
-<unit bldFile="app/location/eventsui/eventsmgmtui/group"/>
-</component>
-<component name="eventsui_build" filter="s60" long-name="Events UI Build">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="app/location/eventsui/group"/>
-</component>
-</collection>
-<collection name="locationlandmarksrefappfors60" long-name="Location Landmarks Reference App for S60" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="lmrefapp" filter="s60" long-name="Landmarks Reference Application">
-<unit bldFile="app/location/locationlandmarksrefappfors60/group"/>
-</component>
-</collection>
-<collection name="locationlandmarksuirefapp" long-name="Location Landmarks UI Reference App" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="lmuirefapp" filter="s60" long-name="Landmarks UI Reference Application">
-<unit bldFile="app/location/locationlandmarksuirefapp/group"/>
-</component>
-</collection>
-<collection name="locationsatviewrefapp" long-name="Location Satellite View Reference App" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="satellitereference" filter="s60" long-name="Satellite Info UI Reference Application">
-<unit bldFile="app/location/locationsatviewrefapp/group"/>
-</component>
-</collection>
-<collection name="simpsyconfigurator" long-name="Simulation PSY Configurator" level="ui">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="simpsyui" filter="s60" long-name="Simulation PSY UI">
-<unit bldFile="app/location/simpsyconfigurator/group"/>
-</component>
-</collection>
-<collection name="mapnavproviderrefapp" long-name="Map and Navigation Provider Reference App" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="mapnavproviderrefapp_build" filter="s60" long-name="Map and Navigation Provider Reference Application">
-<unit bldFile="app/location/mapnavproviderrefapp/group"/>
-</component>
-</collection>
-<collection name="locationcentre" long-name="Location Centre" level="loc">
-<component name="lcutils" long-name="Location Centre Utilities" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcutils/group"/>
-</component>
-<component name="lcservice" long-name="Location Centre Service Project" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcservice/group"/>
-</component>
-<component name="lcserver" long-name="Location Centre Server Project" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcserver/group"/>
-</component>
-<component name="lcapp" long-name="Location Centre Application" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcapp/group"/>
-</component>
-<component name="locationcentre_build" filter="s60" long-name="Location Centre Build" introduced="^3">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="app/location/locationcentre/group"/>
-</component>
-</collection>
-</block>
-<block name="mmsharinguis" level="services" long-name="Multimedia Sharing UIs" levels="base plugin if">
-<collection name="mmsharinguis_plat" long-name="Multimedia Sharing UIs Platform Interfaces" level="if">
-<component name="multimedia_sharing_settings_api" long-name="Multimedia Sharing Settings API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_settings_api/group"/>
-</component>
-<component name="multimedia_sharing_resource_api" long-name="Multimedia Sharing Resource API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_resource_api/group"/>
-</component>
-<component name="multimedia_sharing_manager_api" long-name="Multimedia Sharing Manager API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/group"/>
-</component>
-</collection>
-<collection name="mmsharing" long-name="Multimedia Sharing" level="base">
-<component name="mmshavailability" filter="s60" long-name="Multimedia Sharing Availability">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshavailability/group"/>
-</component>
-<component name="mmshindicator" filter="s60" long-name="Multimedia Sharing Indicator">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshindicator/group"/>
-</component>
-<!-- consider putting client and server in the same component -->
-<component name="mmshmanagercli" filter="s60" long-name="Multimedia Sharing Manager Client">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshmanagercli/group" filter="!test"/>
-</component>
-<component name="mmshmanagersrv" filter="s60" long-name="Multimedia Sharing Manager Server">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshmanagersrv/group"/>
-</component>
-<component name="mmshengine" filter="s60" long-name="Multimedia Sharing Engine">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshengine/group"/>
-</component>
-<component name="mmshui" filter="s60" long-name="Multimedia Sharing UI">
-<!-- can only have one unit: need to #include one from the other if it's needed -->
-<unit bldFile="app/mmsharinguis/mmsharing/mmshui/group"/>
-<unit bldFile="app/mmsharinguis/mmsharing/mmshui/help/group"/>
-</component>
-<component name="mmsharing_build" filter="s60" long-name="MM Sharing Build">
-<unit bldFile="app/mmsharinguis/mmsharing/group"/>
-</component>
-</collection>
-<collection name="mmshplugins" long-name="Multimedia Sharing Plugins" level="plugin">
-<component name="mmshaoplugin" filter="s60" long-name="Multimedia Sharing Always Online Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshaoplugin/group"/>
-</component>
-<component name="mmshaiwplugin" filter="s60" long-name="Multimedia Sharing AIW Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshaiwplugin/group"/>
-</component>
-<component name="mmshsipcrplugin" filter="s60" long-name="Multimedia Sharing SIP Client Resolver Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshsipcrplugin/group"/>
-</component>
-<component name="mmshsettingsuiplugin" filter="s60" long-name="Multimedia Sharing Settings UI Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshsettingsuiplugin/group"/>
-</component>
-<component name="mmshwpadapterplugin" filter="s60" long-name="Multimedia Sharing WAP Provisioning Adapter" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshwpadapterplugin/group"/>
-</component>
-</collection>
-<collection name="mmsharinguis_info" long-name="Multimedia Sharing UIs Info" level="if">
-<component name="mmsharinguis_build" filter="s60" long-name="Multimedia Sharing UIs Build">
-<!-- consider distributing to other components -->
-<unit bldFile="app/mmsharinguis/group"/>
-</component>
-</collection>
-</block>
-<block name="phone" level="apps" span="2" long-name="Phone Apps" levels="engine plugin ui app">
-<collection name="phone_plat" long-name="Phone Apps Platform Interfaces" level="app">
-<component name="3d_ringing_tone_enabler_api" long-name="3D Ringing Tone Enabler API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
-</component>
-<component name="telephony_comms_information_api" long-name="Telephony Comms Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_comms_information_api/group"/>
-</component>
-<component name="telephony_information_api" long-name="Telephony Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_information_api/group"/>
-</component>
-<component name="telephony_device_mode_api" long-name="Telephony Device Mode API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_device_mode_api/group"/>
-</component>
-<component name="telephony_remote_party_information_api" long-name="Telephony Remote Party Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_remote_party_information_api/group"/>
-</component>
-<component name="telephony_video_mailbox_settings_api" long-name="Telephony Video Mailbox Settings API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_video_mailbox_settings_api/group"/>
-</component>
-<component name="telephony_configuration_api" long-name="Telephony Configuration API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_configuration_api/group"/>
-</component>
-<component name="telephony_microphone_mute_status_api" long-name="Telephony Microphone Mute Status API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_microphone_mute_status_api/group"/>
-</component>
-<component name="dialer_keypad_api" long-name="Dialer Keypad API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/dialer_keypad_api/group"/>
-</component>
-<component name="telephony_logging_extension_api" long-name="Telephony Logging Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_logging_extension_api/group"/>
-</component>
-<component name="telephony_matching_extension_api" long-name="Telephony Matching Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_matching_extension_api/group"/>
-</component>
-<component name="telephony_bubble_extension_api" long-name="Telephony Bubble Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_bubble_extension_api/group"/>
-</component>
-<component name="telephony_menu_extension_api" long-name="Telephony Menu Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_menu_extension_api/group"/>
-</component>
-<component name="phone_application_commands_api" long-name="Phone Application Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_commands_api/group"/>
-</component>
-<component name="phone_application_voip_commands_api" long-name="Phone Application VOIP Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_voip_commands_api/group"/>
-</component>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_mediator_api/group"/>
-</component>
-<component name="video_telephony_mediator_api" long-name="Video Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/video_telephony_mediator_api/group"/>
-</component>
-</collection>
-<collection name="phoneapp" long-name="Phone Application" level="app">
-<component name="blacklist" filter="s60" long-name="Phone Blacklist Clearing" plugin="Y">
-<unit bldFile="app/phone/phoneapp/blacklist/group"/>
-</component>
-<component name="phoneui" filter="s60" long-name="Phone UI">
-<unit bldFile="app/phone/phoneapp/phoneui/group" filter="!test"/>
-</component>
-<component name="phoneuicontrol" filter="s60" long-name="Phone UI Control">
-<unit bldFile="app/phone/phoneapp/phoneuicontrol/group"/>
-</component>
-<component name="phoneuistates" filter="s60" long-name="Phone UI States">
-<unit bldFile="app/phone/phoneapp/phoneuistates/group"/>
-</component>
-<component name="phoneuiutils" filter="s60" long-name="Phone UI Utils">
-<unit bldFile="app/phone/phoneapp/phoneuiutils/group"/>
-</component>
-<component name="phoneuiview" filter="s60" long-name="Phone UI View">
-<unit bldFile="app/phone/phoneapp/phoneuiview/group"/>
-</component>
-<component name="phoneuivoipextension" filter="s60" long-name="Phone UI VOIP Extension">
-<unit bldFile="app/phone/phoneapp/phoneuivoipextension/group"/>
-</component>
-<component name="silenceactionplugin" filter="s60" long-name="Silence Action Plugin" plugin="Y">
-<unit bldFile="app/phone/phoneapp/silenceactionplugin/group"/>
-</component>
-<component name="phonemediatorcenter" filter="s60" long-name="Phone Mediator Center">
-<unit bldFile="app/phone/phoneapp/phonemediatorcenter/group"/>
-</component>
-</collection>
-<collection name="phoneengine" long-name="Phone Engine" level="engine">
-<component name="phonecntfinder" filter="s60" long-name="Phone Contact Finder">
-<unit bldFile="app/phone/phoneengine/phonecntfinder/group"/>
-</component>
-<component name="audiohandling" filter="s60" long-name="Phone Audio Handling">
-<unit bldFile="app/phone/phoneengine/audiohandling/group"/>
-</component>
-<component name="callhandling" filter="s60" long-name="Call Handling">
-<unit bldFile="app/phone/phoneengine/callhandling/group"/>
-</component>
-<component name="contacthandling" filter="s60" long-name="Phone Contact Handling">
-<unit bldFile="app/phone/phoneengine/contacthandling/group"/>
-</component>
-<component name="loghandling" filter="s60" long-name="Phone Log Handling">
-<unit bldFile="app/phone/phoneengine/loghandling/group"/>
-</component>
-<component name="engineinfo" filter="s60" long-name="Phone Engine Info">
-<unit bldFile="app/phone/phoneengine/engineinfo/group"/>
-</component>
-<component name="phonemodel" filter="s60" long-name="Phone Model">
-<unit bldFile="app/phone/phoneengine/phonemodel/group"/>
-</component>
-<component name="servicehandling" filter="s60" long-name="Phone Service Handling">
-<unit bldFile="app/phone/phoneengine/servicehandling/group"/>
-</component>
-</collection>
-<collection name="phonesettings" long-name="Phone Settings" level="plugin">
-<component name="aiwcallimageplugin" filter="s60" long-name="Call Image AIW Plugin" plugin="Y">
-<unit bldFile="app/phone/phonesettings/aiwcallimageplugin/group"/>
-</component>
-<component name="pslncallimageplugin" filter="s60" long-name="Call Image Personalization Plugin" plugin="Y">
-<unit bldFile="app/phone/phonesettings/pslncallimageplugin/group"/>
-</component>
-</collection>
-<collection name="phoneuis" long-name="Phone UIs" level="ui">
-<component name="dialer" filter="s60" long-name="Dialer">
-<unit bldFile="app/phone/phoneuis/dialer/group" filter="!test"/>
-</component>
-<component name="easydialing" filter="s60" long-name="Easy Dialing Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/phone/phoneuis/easydialing/group"/>
-</component>
-<component name="bubblemanager" filter="s60" long-name="Phone Bubble Manager">
-<unit bldFile="app/phone/phoneuis/bubblemanager/group"/>
-</component>
-<component name="connectutil" filter="s60" long-name="Connection Utility" plugin="Y">
-<unit bldFile="app/phone/phoneuis/connectutil/group"/>
-</component>
-<component name="ussd" filter="s60" long-name="Unstructured Supplementary Services Data">
-<unit bldFile="app/phone/phoneuis/ussd/group"/>
-</component>
-<component name="vmbx" filter="s60" long-name="Voice Mailbox">
-<unit bldFile="app/phone/phoneuis/vmbx/group"/>
-</component>
-<component name="telephonydevicemode" filter="s60" long-name="Telephony Device Mode">
-<unit bldFile="app/phone/phoneuis/telephonydevicemode/group"/>
-</component>
-</collection>
-<collection name="phoneplugins" long-name="Phone Plugins" level="plugin">
-<component name="telbranding" filter="s60" long-name="Tel Branding" introduced="^2" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/telbranding/group"/>
-</component>
-</collection>
-</block>
-<block name="videotelephony" level="apps" long-name="Video Telephony Apps" levels="engine plugin prot ui">
-<collection name="videotelephony_plat" long-name="VT Apps Platform Interfaces" level="ui">
-<component name="video_telephony_control_mediator_api" long-name="Video Telephony Control Mediator API" filter="s60" class="api">
-<unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_control_mediator_api/group"/>
-</component>
-<component name="video_telephony_media_configuration_api" long-name="Video Telephony Media Configuration API" filter="s60" class="api">
-<unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_media_configuration_api/group"/>
-</component>
-</collection>
-<collection name="vtengines" long-name="Video Telephony Engines" level="engine">
-<component name="videoteleng" filter="s60" long-name="Video Telephony Engine">
-<unit bldFile="app/videotelephony/vtengines/videoteleng/Group"/>
-</component>
-<component name="vtmediatorplugin" filter="s60" long-name="VT Mediator Plugin" plugin="Y">
-<unit bldFile="app/videotelephony/vtengines/vtmediatorplugin/group"/>
-</component>
-</collection>
-<collection name="vtuis" long-name="Video Telephony UIs" level="ui">
-<component name="videotelui" filter="s60" long-name="Video Telephony UI">
-<unit bldFile="app/videotelephony/vtuis/videotelui/group"/>
-</component>
-</collection>
-<collection name="vtprotocolplugins" long-name="VT Protocol Plugins" level="plugin">
-<component name="displaysink" filter="s60" long-name="Display Sink" introduced="^2">
-<unit bldFile="app/videotelephony/vtprotocolplugins/DisplaySink/group"/>
-</component>
-<component name="videosource" filter="s60" long-name="Video Source" introduced="^2">
-<unit bldFile="app/videotelephony/vtprotocolplugins/VideoSource/group"/>
-</component>
-</collection>
-<collection name="vtprotocolsstub" long-name="VT Protocols Stub" level="prot">
-<!-- this collection is really a component, move down a directory -->
-<component name="videotelproto" filter="s60" long-name="Video Telephony Protocol">
-<unit bldFile="app/videotelephony/vtprotocolsstub/group" filter="sf_build"/>
-</component>
-</collection>
-</block>
-<block name="iptelephony" level="apps" long-name="IP Telephony" levels="eng plugin util ui">
-<collection name="iptel_plat" long-name="IP Telephony Platform Interfaces" level="ui">
-<component name="richcallsettingsengine_api" long-name="Rich Call Settings Engine API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/richcallsettingsengine_api/group"/>
-</component>
-<component name="cch_client_api" long-name="CCH Client API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/cch_client_api/group"/>
-</component>
-<component name="cch_server_api" long-name="CCH Server API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/cch_server_api/group"/>
-</component>
-<component name="csc_settingsui_api" long-name="CSC Settings UI API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/csc_settingsui_api/group"/>
-</component>
-<component name="vccpropertyhandler_api" long-name="VCC Property Handler API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/vccpropertyhandler_api/group"/>
-</component>
-<component name="vcc_api" long-name="VCC API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/vcc_api/group"/>
-</component>
-</collection>
-<collection name="iptelcommsconfig" long-name="IP Telephony Comms Config" level="ui">
-<component name="cscgsplugin" filter="s60" long-name="CSC GS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/commsconfig/cscgsplugin/group"/>
-</component>
-<component name="cscsipvoipcleanupplugin" filter="s60" long-name="CSC SIP VoIP Cleanup Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/commsconfig/cscsipvoipcleanupplugin/group"/>
-</component>
-<component name="cscengine" filter="s60" long-name="Connection Service Configurator Engine" introduced="^2">
-<unit bldFile="app/iptelephony/commsconfig/cscengine/group"/>
-</component>
-<component name="cscsettingsui" filter="s60" long-name="CSC Settings UI" introduced="^2">
-<unit bldFile="app/iptelephony/commsconfig/cscsettingsui/group"/>
-</component>
-<component name="cscapplicationui" filter="s60" long-name="CSC Application UI" introduced="^2">
-<unit bldFile="app/iptelephony/commsconfig/cscapplicationui/group"/>
-</component>
-<component name="commsconfig_build" filter="s60" long-name="Comms Config Build" introduced="^2">
-<!-- consider distributing this into the above components -->
-<unit bldFile="app/iptelephony/commsconfig/group"/>
-</component>
-</collection>
-<collection name="convergedconnectionhandler" long-name="Converged Connection Handler" level="eng">
-<component name="cchserver" filter="s60" long-name="CCH Server" introduced="^2">
-<unit bldFile="app/iptelephony/convergedconnectionhandler/cchserver/group"/>
-</component>
-<component name="cchclient" filter="s60" long-name="CCH Client" introduced="^2">
-<unit bldFile="app/iptelephony/convergedconnectionhandler/cchclient/group"/>
-</component>
-<component name="cchclientapi" filter="s60" long-name="CCH Client API" introduced="^2">
-<unit bldFile="app/iptelephony/convergedconnectionhandler/cchclientapi/group"/>
-</component>
-<component name="convergedconnectionhandler_build" filter="s60" long-name="CCH Build" introduced="^2">
-<!-- consider distributing this into the above components, or collapse the collection into a single component.
- The latter is a better option since clients and sevrers are rarely separate components -->
-<unit bldFile="app/iptelephony/convergedconnectionhandler/group"/>
-</component>
-</collection>
-<collection name="richcallsettingsengine" long-name="Rich Call Settings Engine" level="eng">
-<component name="rcse2" filter="s60" long-name="Rich Call Settings Engine Build" introduced="^2">
-<unit bldFile="app/iptelephony/richcallsettingsengine/rcse2/group"/>
-</component>
-</collection>
-<collection name="sipvoipprovider" long-name="SIP VoIP Provider" level="plugin">
-<!-- collection is really a component. Should move down a directory -->
-<component name="svp" filter="s60" long-name="SIP VoIP Provider Build" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/sipvoipprovider/group"/>
-</component>
-</collection>
-<collection name="voipplugins" long-name="VoIP Plugins" level="plugin">
-<component name="sipmxresolver" filter="s60" long-name="SIP MX Resolver" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/sipmxresolver/group"/>
-</component>
-<component name="sipconnectionprovider" filter="s60" long-name="SIP Connection Provider" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/sipconnectionprovider/group"/>
-<!-- can only have one unit, can the next be #'included from the above? -->
-<unit bldFile="app/iptelephony/voipplugins/sipconnectionprovider/ipvoicemailengine/group"/>
-</component>
-<component name="ipapputils" filter="s60" long-name="IP App Utils" introduced="^2">
-<unit bldFile="app/iptelephony/voipplugins/ipapputils/group"/>
-</component>
-<component name="voipadapters" filter="s60" long-name="VoIP Adapters" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/voipadapters/group"/>
-</component>
-<component name="accountcreationplugin" filter="s60" long-name="Account Creation Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/accountcreationplugin/group"/>
-</component>
-<component name="dhcppositionprovider" filter="s60" long-name="DHCP Position Provider" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/dhcppositionprovider/group"/>
-</component>
-<component name="svtmatching" filter="s60" long-name="SIP VoIP Telephony Matching" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/svtmatching/group"/>
-</component>
-<component name="svtlogging" filter="s60" long-name="SVT Logging" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/svtlogging/group"/>
-</component>
-<component name="svtcallmenu" filter="s60" long-name="SVT Call Menu" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/svtcallmenu/group"/>
-</component>
-<component name="sipimresolver" filter="s60" long-name="SIP IM Resolver" introduced="^3" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/sipimresolver/group"/>
-</component>
-</collection>
-<collection name="callcontinuity" long-name="Call Continuity" level="util">
-<component name="vccutils" filter="s60" long-name="VCC Utils" introduced="^2">
-<unit bldFile="app/iptelephony/callcontinuity/vccutils/group"/>
-</component>
-<component name="nsmldmvccadapter" filter="s60" long-name="SyncML DM VCC Adapter" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/callcontinuity/nsmldmvccadapter/group"/>
-</component>
-<component name="vccclientprovisioningadapter" filter="s60" long-name="VCC Client Provisioning Adapter" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/callcontinuity/vccclientprovisioningadapter/group"/>
-</component>
-<component name="vccpropertyhandler" filter="s60" long-name="VCC Property Handler" introduced="^2">
-<unit bldFile="app/iptelephony/callcontinuity/vccpropertyhandler/group"/>
-</component>
-<component name="vcchotrigger" filter="s60" long-name="VCC HO Trigger" introduced="^2">
-<unit bldFile="app/iptelephony/callcontinuity/vcchotrigger/group"/>
-</component>
-<component name="vcc" filter="s60" long-name="VoIP Call Continuity" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/callcontinuity/vcc/group"/>
-</component>
-<component name="callcontinuity_build" filter="s60" long-name="Call Continuity Build" introduced="^2">
-<!-- consider distributing this into the above components -->
-<unit bldFile="app/iptelephony/callcontinuity/group"/>
-</component>
-</collection>
-</block>
-<block name="settingsuis" level="services" long-name="Settings UIs" levels="rsc ui">
-<collection name="devmngt_plat" long-name="Settings UIs Platform Interfaces" level="ui">
-<component name="default_app_client_api" long-name="Default App Client API" introduced="^1" filter="s60" class="api">
-<unit bldFile="app/settingsuis/devmngt_plat/default_app_client_api/group"/>
-</component>
-<component name="services_db_api" long-name="Services DB API" introduced="^1" filter="s60" class="api">
-<unit bldFile="app/settingsuis/devmngt_plat/services_db_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="defaultapplicationsettings" long-name="Default Application Settings" level="rsc">
-<component name="services_db" filter="s60" long-name="Services Database" introduced="^1">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/services_db/group"/>
-</component>
-<component name="defaultapplicationsettings_server" filter="s60" long-name="Default Application Server" introduced="^1">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/server/group"/>
-</component>
-<component name="service" filter="s60" long-name="Default Application Service" introduced="^1">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/service/group"/>
-</component>
-<component name="dasgsplugin" filter="s60" long-name="Default Application Settings GS Plugin" introduced="^1" plugin="Y">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/gsplugin/group"/>
-</component>
-<component name="defaultapplicationsettings_build" filter="s60" long-name="Default Application Settings Build" introduced="^1">
-<!-- split the IBYs up into the appropriate components? Make this a ROM component? -->
-<unit bldFile="app/settingsuis/defaultapplicationsettings/group"/>
-</component>
-</collection>
-<collection name="systemswuis" long-name="System SW UIs" level="ui">
-<component name="touchscreencalib" filter="s60" long-name="Touchscreen Calibration" introduced="^1">
-<unit bldFile="app/settingsuis/systemswuis/touchscreencalib/group"/>
-</component>
-</collection>
-</block>
-<block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin app">
-<collection name="contentctrl_plat" long-name="Content Control Daemons Platforn Interfaces" level="app">
-<component name="oma_ds_presync_plugin_api" long-name="OMA DS PreSync Plugin API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/oma_ds_presync_plugin_api/group"/>
-</component>
-<component name="ds_agenda_handler_plugin_api" long-name="DS Agenda Handler Plugin API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_agenda_handler_plugin_api/group"/>
-</component>
-<component name="ds_folder_util_api" long-name="DS Folder Util API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_folder_util_api/group"/>
-</component>
-</collection>
-<collection name="dsdcmoadapter" long-name="Data Sync DCMO Adapter" level="plugin">
-<!-- Component at wrong rank, should move down a directory -->
-<component name="dsdcmoadapter_build" filter="s60" long-name="Data Sync Control DCMO Adapter">
-<unit bldFile="app/contentcontrol/dsdcmoadapter/group"/>
-</component>
-</collection>
-<collection name="omads" long-name="OMA Data Sync" level="app">
-<component name="omadsappui" filter="s60" long-name="OMA DS Application UI">
-<unit bldFile="app/contentcontrol/omads/omadsappui/group"/>
-</component>
-<component name="omadsextensions" filter="s60" long-name="OMA DS Extensions" plugin="Y">
-<unit bldFile="app/contentcontrol/omads/omadsextensions/group"/>
-</component>
-</collection>
-</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">
-<unit bldFile="app/devicecontrol/devicediagnostics/devdiagapp/group"/>
-</component>
-<component name="devdiaggsplugin" filter="s60" long-name="Device Diagnostics GS Plugin" plugin="Y">
-<unit bldFile="app/devicecontrol/devicediagnostics/devdiaggsplugin/group"/>
-</component>
-<component name="diagplugins" filter="s60" long-name="Diagnostics Plugins" plugin="Y">
-<unit bldFile="app/devicecontrol/devicediagnostics/diagplugins/group"/>
-</component>
-<component name="diagsuites" filter="s60" long-name="Diagnostics Suites" plugin="Y">
-<unit bldFile="app/devicecontrol/devicediagnostics/diagsuites/group"/>
-</component>
-<component name="devicediagnostics_build" filter="s60" long-name="Device Diagnostics Build">
-<!-- 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">
-<unit bldFile="app/devicecontrol/omadm/omadmappui/group"/>
-</component>
-<component name="omadmextensions" filter="s60" long-name="OMA DM Extensions" 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">
-<unit bldFile="app/devicecontrol/omadm/dcmo/group"/>
-</component>
-</collection>
-<collection name="pnpmobileservices" long-name="PnP Mobile Services" level="mid">
-<component name="pnpms" filter="s60" long-name="PnP MS">
-<unit bldFile="app/devicecontrol/pnpmobileservices/pnpms/group"/>
-</component>
-</collection>
-<collection name="applicationmanagement" long-name="Application Management" level="app">
-<!-- could this collection be collapsed into a single component and moved down a dir? Do all these need to be noted separately? -->
-<component name="applicationmanagement_options" filter="s60" long-name="AM Install Options">
-<unit bldFile="app/devicecontrol/applicationmanagement/options/group"/>
-</component>
-<component name="applicationmanagement_client" filter="s60" long-name="AM Client">
-<unit bldFile="app/devicecontrol/applicationmanagement/client/group"/>
-</component>
-<component name="applicationmanagement_server" filter="s60" long-name="AM Server">
-<unit bldFile="app/devicecontrol/applicationmanagement/server/group"/>
-</component>
-<component name="rfsplugin" filter="s60" long-name="AM RFS Plugin" plugin="Y">
-<unit bldFile="app/devicecontrol/applicationmanagement/rfsplugin/group"/>
-</component>
-<component name="amadapter2" filter="s60" long-name="AM Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/applicationmanagement/amadapter2/group"/>
-</component>
-<component name="omascomoadapter" filter="s60" long-name="OMA SCOMO Adapter" introduced="^3" plugin="Y">
-<unit bldFile="app/devicecontrol/applicationmanagement/omascomoadapter/group"/>
-</component>
-<component name="applicationmanagement_build" filter="s60" long-name="AM Build">
-<!-- If thes aren't collapsed into one cmp, can all #includes removed from here, and it renamed AM ROM? -->
-<unit bldFile="app/devicecontrol/applicationmanagement/group"/>
-</component>
-</collection>
-<collection name="customization" long-name="DM Customization Adapters" level="mid">
-<component name="dmutils" long-name="DM Utils" filter="s60">
-<unit bldFile="app/devicecontrol/customization/dmutils/bld"/>
-</component>
-<component name="uisettingssrv" filter="s60" long-name="UI Settings Server">
-<unit bldFile="app/devicecontrol/customization/uisettingssrv/bld"/>
-</component>
-<component name="isadapter" filter="s60" long-name="Idle State Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/isadapter/bld"/>
-</component>
-<component name="supadapter" filter="s60" long-name="Startup Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/supadapter/bld"/>
-</component>
-<component name="wallpaperadapter" filter="s60" long-name="Wallpaper Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/wallpaperadapter/bld"/>
-</component>
-<component name="operatorlogoadapter" filter="s60" long-name="Operator Logo Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/operatorlogoadapter/bld"/>
-</component>
-<component name="screensaveradapter" filter="s60" long-name="Screen Saver Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/screensaveradapter/bld"/>
-</component>
-<component name="themesadapter" filter="s60" long-name="Themes Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/themesadapter/bld"/>
-</component>
-<component name="embeddedlinkadapter" filter="s60" long-name="Embedded Link Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/embeddedlinkadapter/bld"/>
-</component>
-<component name="customization_build" filter="s60" long-name="DM Customization Build">
-<!-- If thes aren't collapsed into one cmp, can all #includes removed from here, and it renamed DM Customization ROM? -->
-<unit bldFile="app/devicecontrol/customization/group"/>
-</component>
-</collection>
-<collection name="omacp" long-name="OMA Content Provisioning" level="oma">
-<component name="omacpadapters" filter="s60" long-name="OMA CP Adapters" plugin="Y">
-<unit bldFile="app/devicecontrol/omacp/omacpadapters/group"/>
-</component>
-</collection>
-</block>
-<block name="printing" level="services" long-name="Printing" levels="app">
-<collection name="DirectPrint" level="app">
-<component name="DirectPrintApp" filter="sf_build" long-name="DirectPrint App" introduced="^3">
-<unit bldFile="app/printing/DirectPrint/DirectPrintApp/group"/>
-</component>
-<component name="DirectPrintServer" filter="sf_build" long-name="DirectPrint Server" introduced="^3">
-<unit bldFile="app/printing/DirectPrint/DirectPrintServer/group"/>
-</component>
-<component name="DirectPrintClient" filter="sf_build" long-name="DirectPrint Client" introduced="^3">
-<unit bldFile="app/printing/DirectPrint/DirectPrintClient/group"/>
-</component>
-</collection>
-<collection name="imageprint" long-name="ImagePrint" level="app">
-<component name="clog" filter="s60" long-name="ImagePrint Logging" introduced="^2">
-<unit bldFile="app/printing/imageprint/clog/group"/>
-</component>
-<component name="imageprintengine" filter="s60" long-name="ImagePrint Engine" introduced="^2">
-<unit bldFile="app/printing/imageprint/imageprintengine/group"/>
-</component>
-<component name="imageprintui" filter="s60" long-name="ImagePrint UI" introduced="^2">
-<unit bldFile="app/printing/imageprint/imageprintui/group"/>
-</component>
-<component name="imageprint_build" filter="s60" long-name="ImagePrint Build" introduced="^2">
-<!-- Need to break the IBY includes into the other components, or remove #includes and make this a ROM component -->
-<unit bldFile="app/printing/imageprint/group"/>
-</component>
-</collection>
-</block>
-<block name="files" level="apps" long-name="File Manager Apps" levels="support apps">
-<collection name="files_plat" long-name="File Manager Apps Platform Interfaces" level="apps">
-<component name="memory_scan_popup_ui_api" long-name="Memory Scan Popup UI API" filter="s60" class="api">
-<unit bldFile="app/files/files_plat/memory_scan_popup_ui_api/group"/>
-</component>
-</collection>
-<collection name="deviceencryption" long-name="Device Encryption" level="support">
-<!-- this is either needs to be broken up into idependent bld.infs, or it's really a component and should move down a directory -->
-<component name="devencnotifplugin" filter="s60" long-name="Device Encryption Notifier Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/files/deviceencryption/devencnotifplugin/group"/>
-</component>
-<component name="devencui" filter="s60" long-name="Device Encryption UI" introduced="^3">
-<unit bldFile="app/files/deviceencryption/devencui/group"/>
-</component>
-<component name="devencdmadapter" filter="s60" long-name="Device Encryption DM Adapter" introduced="^3" plugin="Y">
-<unit bldFile="app/files/deviceencryption/devencdmadapter/group"/>
-</component>
-<component name="devencgsplugin" filter="s60" long-name="Device Encryption GS Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/files/deviceencryption/devencgsplugin/group"/>
-</component>
-<component name="deviceencryption_help" filter="s60" long-name="Device Encryption Help" introduced="^3">
-<unit bldFile="app/files/deviceencryption/help/group"/>
-</component>
-<component name="deviceencryption_build" filter="s60" long-name="Device Encryption Build" introduced="^3">
-<unit bldFile="app/files/deviceencryption/group"/>
-</component>
-</collection>
-<collection name="filemanager" long-name="File Manager" level="apps">
-<!-- this is really a component, should move down a directory -->
-<component name="filemanager_build" filter="s60" long-name="File Manager Build">
-<unit bldFile="app/files/filemanager/group"/>
-</component>
-</collection>
-<collection name="filesystemuis" long-name="File System UIs" level="support">
-<component name="memscaneng" filter="s60" long-name="Memory Scan Server">
-<unit bldFile="app/files/filesystemuis/memscaneng/group"/>
-</component>
-<component name="memstatepopup" filter="s60" long-name="Memory State Popup">
-<unit bldFile="app/files/filesystemuis/memstatepopup/group"/>
-</component>
-</collection>
-</block>
-<block name="utils" level="apps" long-name="Utility Apps" levels="app">
-<collection name="extras" long-name="Extras" level="app">
-<component name="about" filter="s60" long-name="About Application">
-<unit bldFile="app/utils/extras/about/group"/>
-</component>
-<component name="calcsoft" filter="s60" long-name="Calculator Application">
-<unit bldFile="app/utils/extras/calcsoft/group"/>
-</component>
-<component name="converter" filter="s60" long-name="Unit Converter">
-<unit bldFile="app/utils/extras/converter/group"/>
-</component>
-</collection>
-</block>
-<block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
-<collection name="contacts_pub" long-name="Contacts Apps Public Interfaces" level="ui">
-<component name="phonebook_fetch_ui_api" long-name="Phonebook Fetch UI API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_fetch_ui_api/group"/>
-</component>
-<component name="phonebook_data_management_api" long-name="Phonebook Data Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_data_management_api/group"/>
-</component>
-<component name="phonebook_vcard_importexport_api" long-name="Phonebook vCard Import/Export API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_vcard_importexport_api/group"/>
-</component>
-<component name="phonebook_data_addedit_ui_api" long-name="Phonebook Data Add/Edit UI API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_data_addedit_ui_api/group"/>
-</component>
-<component name="phonebook_ui_utilities_api" long-name="Phonebook UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_ui_utilities_api/group"/>
-</component>
-<component name="phonebook_thumbnail_operation_api" long-name="Phonebook Thumbnail Operation API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_thumbnail_operation_api/group"/>
-</component>
-<component name="speed_dial_utility_control_api" long-name="Speed Dial Utility Control API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/speed_dial_utility_control_api/group"/>
-</component>
-</collection>
-<collection name="contacts_plat" long-name="Contacts Apps Platform Interfaces" level="ui">
-<component name="virtual_phonebook_store_api" long-name="Virtual Phonebook Store API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_store_api/group"/>
-</component>
-<component name="virtual_phonebook_sim_services_api" long-name="Virtual Phonebook SIM Services API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_sim_services_api/group"/>
-</component>
-<component name="virtual_phonebook_configuration_api" long-name="Virtual Phonebook Configuration API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_configuration_api/group"/>
-</component>
-<component name="virtual_phonebook_copy_policy_api" long-name="Virtual Phonebook Copy Policy API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_copy_policy_api/group"/>
-</component>
-<component name="virtual_phonebook_policy_api" long-name="Virtual Phonebook Policy API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_policy_api/group"/>
-</component>
-<component name="virtual_phonebook_engine_api" long-name="Virtual Phonebook Engine API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_engine_api/group"/>
-</component>
-<component name="virtual_phonebook_migration_support_api" long-name="Virtual Phonebook Migration Support API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_migration_support_api/group"/>
-</component>
-<component name="virtual_phonebook_view_definition_api" long-name="Virtual Phonebook View Definition API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_view_definition_api/group"/>
-</component>
-<component name="virtual_phonebook_vcard_api" long-name="Virtual Phonebook vCard API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_vcard_api/group"/>
-</component>
-<component name="cms_contactor_api" long-name="CMS Contactor API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/cms_contactor_api/group"/>
-</component>
-<component name="contactpresence_api" long-name="Contact Presence API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/contactpresence_api/group"/>
-</component>
-<component name="presence_cache_api" long-name="Presence Cache API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/presence_cache_api/group"/>
-</component>
-<component name="phonebook_internal_common_api" long-name="Phonebook Internal Common API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_common_api/group"/>
-</component>
-<component name="phonebook_internal_appfw_api" long-name="Phonebook Internal App Framework API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_appfw_api/group"/>
-</component>
-<component name="phonebook_internal_data_management_api" long-name="Phonebook Internal Data Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_data_management_api/group"/>
-</component>
-<component name="phonebook_2_xsp_extension_manager_api" long-name="Phonebook 2 xSP Extension Manager API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_xsp_extension_manager_api/group"/>
-</component>
-<component name="phonebook_ui_controls_api" long-name="Phonebook UI Controls API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_ui_controls_api/group"/>
-</component>
-<component name="phonebook_2_image_management_api" long-name="Phonebook 2 Image Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_image_management_api/group"/>
-</component>
-<component name="phonebook_extension_api" long-name="Phonebook Extension API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_extension_api/group"/>
-</component>
-<component name="phonebook_public_constants_api" long-name="Phonebook Public Constants API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_public_constants_api/group"/>
-</component>
-<component name="phonebook_internal_ui_utilities_api" long-name="Phonebook Internal UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_ui_utilities_api/group"/>
-</component>
-<component name="logs_engine_api_extensions" long-name="Logs Engine API Extensions" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/logs_engine_api_extensions/group"/>
-</component>
-<component name="phonebook_thumbnails_api" long-name="Phonebook Thumbnails API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_thumbnails_api/group"/>
-</component>
-<component name="phonebook_2_icon_api" long-name="Phonebook 2 Icon API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_icon_api/group"/>
-</component>
-<component name="phonebook_engine_extension_api" long-name="Phonebook Engine Extension API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_engine_extension_api/group"/>
-</component>
-<component name="phonebook_2_store_configuration_management_api" long-name="Phonebook 2 Store Configuration Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_store_configuration_management_api/group"/>
-</component>
-<component name="logs_ui_command_line_api" long-name="Logs UI Command Line API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/logs_ui_command_line_api/group"/>
-</component>
-<component name="speed_dial_dialogs_api" long-name="Speed Dial Dialogs API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/speed_dial_dialogs_api/group"/>
-</component>
-<component name="phonebook_2_xsp_view_activation_api" long-name="Phonebook 2 xSP View Activation API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_xsp_view_activation_api/group"/>
-</component>
-<component name="logs_timers_api" long-name="Logs Timers API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/logs_timers_api/group"/>
-</component>
-<component name="phonebook_2_ui_extension_definition_api" long-name="Phonebook 2 UI Extension Definition API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_definition_api/group"/>
-</component>
-<component name="phonebook_2_common_ui_api" long-name="Phonebook 2 Common UI API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_common_ui_api/group"/>
-</component>
-<component name="phonebook_2_ui_extension_api" long-name="Phonebook 2 UI Extension API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_api/group"/>
-</component>
-<component name="phonebook_2_store_property_api" long-name="Phonebook 2 Store Property API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_store_property_api/group"/>
-</component>
-<component name="phonebook_2_ui_extension_plugin_api" long-name="Phonebook 2 UI Extension Plug-In API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_plugin_api/group"/>
-</component>
-<component name="phonebook_2_ui_controls_api" long-name="Phonebook 2 UI Controls API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_controls_api/group"/>
-</component>
-<component name="phonebook_2_thin_ui_extension_plugin_api" long-name="Phonebook 2 Thin UI Extension Plugin API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_thin_ui_extension_plugin_api/group"/>
-</component>
-<component name="phonebook_2_commands_api" long-name="Phonebook 2 Commands API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_commands_api/group"/>
-</component>
-<component name="phonebook_2_presentation_api" long-name="Phonebook 2 Presentation API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_presentation_api/group"/>
-</component>
-<component name="phonebook_2_ui_utilities_api" long-name="Phonebook 2 UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_utilities_api/group"/>
-</component>
-<component name="cca_launch_api" long-name="CCA Launch API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/cca_launch_api/group"/>
-</component>
-<component name="cca_view_plugin_api" long-name="CCA View Plugin API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/cca_view_plugin_api/group"/>
-</component>
-<component name="predictivesearch_client_api" long-name="Predictive Search Client API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_client_api/group"/>
-</component>
-<component name="predictivesearch_utils_api" long-name="Predictive Search Utils API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_utils_api/group"/>
-</component>
-<component name="predictivesearch_adapters_api" long-name="Predictive Search Adapters API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_adapters_api/group"/>
-</component>
-<component name="predictivesearch_algorithm_api" long-name="Predictive Search Algorithm API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_algorithm_api/group"/>
-</component>
-<component name="phonebook_2_rcl_api" long-name="Phonebook 2 RCL API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_rcl_api/group"/>
-</component>
-</collection>
-<collection name="contactextensions" long-name="Contacts Extensions" level="services">
-<component name="predefinedcontacts" filter="s60" long-name="Predefined Contacts">
-<unit bldFile="app/contacts/contactextensions/predefinedcontacts/group"/>
-</component>
-</collection>
-<collection name="logsui" long-name="Logs UI" level="ui">
-<component name="logsui_build" filter="s60" long-name="Logs UI Build">
-<!-- component at too high a rank, should move down one directory -->
-<unit bldFile="app/contacts/logsui/group"/>
-</component>
-</collection>
-<collection name="phonebookui" long-name="Phonebook UI" level="ui">
-<component name="phonebook" filter="s60" long-name="Phonebook">
-<unit bldFile="app/contacts/phonebookui/phonebook/group"/>
-</component>
-<component name="speeddial" filter="s60" long-name="Speed Dial">
-<unit bldFile="app/contacts/phonebookui/speeddial/group"/>
-</component>
-<component name="phonebook2" filter="s60" long-name="Phone Book 2">
-<unit bldFile="app/contacts/phonebookui/phonebook2/group"/>
-</component>
-</collection>
-<collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
-<component name="cntfindplugin" filter="s60" long-name="Contacts Find Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntfindplugin/group"/>
-</component>
-<component name="cntsortplugin" filter="s60" long-name="Contacts Sort Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntsortplugin/group"/>
-</component>
-<component name="virtualphonebook" filter="s60" long-name="Virtual Phonebook" introduced="^2">
-<unit bldFile="app/contacts/phonebookengines/virtualphonebook/group"/>
-</component>
-<component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
-<unit bldFile="app/contacts/phonebookengines/contactsmodel/groupsql" mrp="app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
-</component>
-</collection>
-<collection name="pimprotocols" long-name="PIM Protocols" level="services">
-<component name="phonebooksync" long-name="Phonebook Sync" purpose="optional" plugin="Y">
-<unit bldFile="app/contacts/pimprotocols/phonebooksync/group" mrp="app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
-</component>
-<component name="pbap" long-name="Bluetooth PBAP" introduced="9.2" purpose="optional">
-<unit bldFile="app/contacts/pimprotocols/pbap/group" mrp="app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
-</component>
-</collection>
-<collection name="ccservices" long-name="Contacts Centric Services" level="services">
-<component name="cmsservices" filter="s60" long-name="Contact Method Selector Services" introduced="^2">
-<unit bldFile="app/contacts/ccservices/cmsservices/group"/>
-</component>
-</collection>
-<collection name="presencecache" long-name="Presence Cache" level="support">
-<component name="presencecacheutils" filter="s60" long-name="Presence Cache Utils" introduced="^2" class="placeholder">
-<!-- <unit bldFile="presencecache/presencecacheutils/group"/> -->
-</component>
-<component name="presencecacheserver2" filter="s60" long-name="Presence Cache Server" introduced="^2" class="placeholder">
-<!-- <unit bldFile="presencecache/presencecacheserver2/group"/> -->
-</component>
-<component name="presencecacheclient2" filter="s60" long-name="Presence Cache Client" introduced="^2" class="placeholder">
-<!-- <unit bldFile="presencecache/presencecacheclient2/group"/> -->
-</component>
-<component name="presencecache_build" filter="s60" long-name="Presence Cache Build" introduced="^2">
-<!-- should divide this bld.inf into the other components, or collapse them into a single component -->
-<unit bldFile="app/contacts/presencecache/group"/>
-</component>
-</collection>
-<collection name="predictivesearch" long-name="Predictive Search" level="support">
-<component name="pcsutils" filter="s60" long-name="PCS Utils" introduced="^2">
-<unit bldFile="app/contacts/predictivesearch/pcsutils/group"/>
-</component>
-<component name="pcsserverclientapi" filter="s60" long-name="PCS Server Client API" introduced="^2">
-<unit bldFile="app/contacts/predictivesearch/pcsserverclientapi/group"/>
-</component>
-<component name="pcsserver" filter="s60" long-name="PCS Server" introduced="^2">
-<unit bldFile="app/contacts/predictivesearch/pcsserver/group"/>
-</component>
-<component name="pcsadapters" filter="s60" long-name="PCS Adapters" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/predictivesearch/adapters/contacts/group"/>
-</component>
-<component name="pcsalgorithm" filter="s60" long-name="PCS Algorithm" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/predictivesearch/pcsalgorithm/group"/>
-</component>
-<component name="predictivesearch_build" filter="s60" long-name="Predictive Search Build" introduced="^2">
-<!-- need to remove #includes from bld.inf and rename as Predictive Search ROM -->
-<unit bldFile="app/contacts/predictivesearch/group"/>
-</component>
-</collection>
-<collection name="contacts_info" long-name="Contacts Apps Info" level="ui">
-<component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="organizer" level="apps" span="2" long-name="Organizer Application Suite" levels="support services engine ui app">
-<collection name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" level="app">
-<component name="meeting_request_mailbox_utilities_api" long-name="Meeting Request Mailbox Utilities API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_mailbox_utilities_api/group"/>
-</component>
-<component name="meeting_request_uids_api" long-name="Meeting Request UIDs API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_uids_api/group"/>
-</component>
-<component name="calendar_exporter_api" long-name="Calendar Exporter API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_exporter_api/group"/>
-</component>
-<component name="agenda_versit_2_api" long-name="Agenda Versit 2 API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/agenda_versit_2_api/group"/>
-</component>
-<component name="calendar_importer_api" long-name="Calendar Importer API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_importer_api/group"/>
-</component>
-<component name="calendar_launcher_api" long-name="Calendar Launcher API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_launcher_api/group"/>
-</component>
-<component name="calendar_common_utils_api" long-name="Calendar Common Utils API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_common_utils_api/group"/>
-</component>
-<component name="searchfw_launcher_api" long-name="Search Framework Launcher API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/searchfw_launcher_api/group"/>
-</component>
-<component name="alarm_const_api" long-name="Alarm Const API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/alarm_const_api/group"/>
-</component>
-<component name="alarm_ui_external_control_api" long-name="Alarm UI External Control API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/alarm_ui_external_control_api/group"/>
-</component>
-<component name="calendar_settings_keys_api" long-name="Calendar Settings Keys API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_settings_keys_api/group"/>
-</component>
-<component name="calendar_tones_settings_keys_api" long-name="Calendar Tones Settings Keys API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_tones_settings_keys_api/group"/>
-</component>
-<component name="clock_settings_api" long-name="Clock Settings API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/clock_settings_api/group"/>
-</component>
-<component name="common_alarm_editor_api" long-name="Common Alarm Editor API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/common_alarm_editor_api/group"/>
-</component>
-<component name="alarm_ui_secondary_display_api" long-name="Alarm UI Secondary Display API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/alarm_ui_secondary_display_api/group"/>
-</component>
-<component name="searchui_launcher_api" long-name="Search UI Launcher API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/searchui_launcher_api/group"/>
-</component>
-<component name="agenda_entry_ui_api" long-name="Agenda Entry UI API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/agenda_entry_ui_api/group"/>
-</component>
-<component name="meeting_request_utillities_api" long-name="Meeting Request Utillities API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_utillities_api/group"/>
-</component>
-<component name="meeting_request_viewer_api" long-name="Meeting Request Viewer API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_viewer_api/group"/>
-</component>
-<component name="calendar_custamization_api" long-name="Calendar Customization API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_custamization_api/group"/>
-</component>
-</collection>
-<collection name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" level="app">
-<component name="calendar_interim_utils2_api" long-name="Calendar Interim Utils 2 API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_pub/calendar_interim_utils2_api/group"/>
-</component>
-<component name="notepad_library_api" long-name="Notepad Library API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_pub/notepad_library_api/group"/>
-</component>
-</collection>
-<collection name="alarmengines" long-name="Alarm Engines" level="engine">
-<component name="missedalarmstore" filter="s60" long-name="Missed Alarm Store">
-<unit bldFile="app/organizer/alarmengines/missedalarmstore/group"/>
-</component>
-</collection>
-<collection name="calendarengines" long-name="Calendar Engines" level="engine">
-<component name="versit2" filter="s60" long-name="Versit 2 iCal Parser" introduced="9.2">
-<unit bldFile="app/organizer/calendarengines/versit2/group"/>
-</component>
-<component name="agnversit2" filter="s60" long-name="Versit 2 Agenda Interface" introduced="9.2" plugin="Y">
-<unit bldFile="app/organizer/calendarengines/agnversit2/group"/>
-</component>
-<component name="caleninterimutils" filter="s60" long-name="Calendar Interim Utils" introduced="9.1">
-<unit bldFile="app/organizer/calendarengines/caleninterimutils/group"/>
-</component>
-<component name="calenimp" filter="s60" long-name="Calendar Import Wrapper" introduced="7.0s">
-<unit bldFile="app/organizer/calendarengines/calenimp/group"/>
-</component>
-<component name="calenlauncher" filter="s60" long-name="Calendar Launcher">
-<unit bldFile="app/organizer/calendarengines/calenlauncher/group"/>
-</component>
-<component name="caldavsrv" filter="sf_build" long-name="CalDAV Server" introduced="^3">
-<unit bldFile="app/organizer/calendarengines/caldav/group"/>
-</component>
-</collection>
-<collection name="meetingrequestengines" long-name="Meeting Request Engines" level="engine">
-<component name="mrmailbox" filter="s60" long-name="Meeting Request Mailbox">
-<unit bldFile="app/organizer/meetingrequestengines/mrmailbox/group"/>
-</component>
-<component name="mrmailboxutils" filter="s60" long-name="Meeting Request Mailbox Utils" plugin="Y">
-<unit bldFile="app/organizer/meetingrequestengines/mrmailboxutils/group"/>
-</component>
-</collection>
-<collection name="searchfw" long-name="Search Framework" level="services">
-<!-- Uncomment all units when configuration is in place. All currently #included from searchfw_build, which should be removed at the same time. -->
-<component name="coresearchfw" filter="s60" long-name="Core Search Framework" introduced="^1" class="placeholder">
-<!--<unit bldFile="searchfw/coresearchfw/group"/>-->
-</component>
-<component name="searchfw_plugins" filter="s60" long-name="Search Plugins" introduced="^1" plugin="Y" class="placeholder">
-<!--<unit bldFile="searchfw/plugins/group"/>-->
-</component>
-<component name="searchfw_build" filter="s60" long-name="Search Framework Build" introduced="^1">
-<unit bldFile="app/organizer/searchfw/group"/>
-</component>
-</collection>
-<collection name="alarmui" long-name="Alarm UI" level="app">
-<!-- collection is really a component, should move down a directory -->
-<component name="alarmui_build" filter="s60" long-name="Alarm UI Build">
-<unit bldFile="app/organizer/alarmui/group"/>
-</component>
-</collection>
-<collection name="calendarui" long-name="Calendar UI" level="ui">
-<component name="calendarui_help" filter="s60" long-name="Calendar UI Help">
-<unit bldFile="app/organizer/calendarui/help/group"/>
-</component>
-<component name="commonutils" filter="s60" long-name="Calendar Common Utils">
-<unit bldFile="app/organizer/calendarui/commonutils/group"/>
-</component>
-<component name="globaldata" filter="s60" long-name="Calendar Global Data">
-<unit bldFile="app/organizer/calendarui/globaldata/group"/>
-</component>
-<component name="settings" filter="s60" long-name="Calendar Settings">
-<!-- these should be merged into a single bld.inf or split into two components -->
-<unit bldFile="app/organizer/calendarui/settings/gsplugin/group"/>
-<unit bldFile="app/organizer/calendarui/settings/settingsui/group"/>
-</component>
-<component name="customisation" filter="s60" long-name="Calendar Customisation">
-<unit bldFile="app/organizer/calendarui/customisation/group"/>
-</component>
-<component name="customisationmanager" filter="s60" long-name="Calendar Customisation Manager">
-<unit bldFile="app/organizer/calendarui/customisationmanager/group"/>
-</component>
-<component name="multicaluidialog" filter="s60" long-name="Multi-Calendar UI Dialog" introduced="^3">
-<unit bldFile="app/organizer/calendarui/multicaluidialog/group"/>
-</component>
-<component name="views" filter="s60" long-name="Calendar Views">
-<unit bldFile="app/organizer/calendarui/views/group"/>
-</component>
-<component name="calendarui_controller" filter="s60" long-name="Calendar Controller">
-<unit bldFile="app/organizer/calendarui/controller/group"/>
-</component>
-<component name="calendarui_editors" filter="s60" long-name="Calendar Editors">
-<unit bldFile="app/organizer/calendarui/editors/group"/>
-</component>
-<component name="calendarui_application" filter="s60" long-name="Calendar Application">
-<unit bldFile="app/organizer/calendarui/application/group"/>
-</component>
-<component name="missedalarmindicatorplugin" filter="s60" long-name="Missed Alarm Indicator Plugin" plugin="Y">
-<unit bldFile="app/organizer/calendarui/missedalarmindicatorplugin/group"/>
-</component>
-<component name="calendarui_server" filter="s60" long-name="Calendar Server">
-<!-- these should be merged into a single bld.inf or split into two components -->
-<unit bldFile="app/organizer/calendarui/server/calensvr/group"/>
-<unit bldFile="app/organizer/calendarui/server/calensvrclient/group"/>
-</component>
-<component name="regionalplugins" filter="s60" long-name="Calendar Regional Plugins" plugin="Y">
-<!-- these should be merged into a single bld.inf or split into four components -->
-<unit bldFile="app/organizer/calendarui/regionalplugins/calenregionalutil/group"/>
-<unit bldFile="app/organizer/calendarui/regionalplugins/lunarchinese/group"/>
-<unit bldFile="app/organizer/calendarui/regionalplugins/lunarvietnamese/group"/>
-<unit bldFile="app/organizer/calendarui/regionalplugins/thai/group"/>
-</component>
-<component name="calenaiwprovider" filter="s60" long-name="Calendar AIW Proivder" introduced="^3" plugin="Y">
-<unit bldFile="app/organizer/calendarui/calenaiwprovider/group"/>
-</component>
-<component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y">
-<unit bldFile="app/organizer/calendarui/caldav/group"/>
-</component>
-<component name="calendarui_build" filter="s60" long-name="Calendar UI Build">
-<!-- split contents into separate components -->
-<unit bldFile="app/organizer/calendarui/group"/>
-</component>
-</collection>
-<collection name="meetingui" long-name="Meeting UI" level="ui">
-<component name="attendeeview" filter="s60" long-name="Attendee View">
-<unit bldFile="app/organizer/meetingui/attendeeview/group"/>
-</component>
-<component name="agnentryui" filter="s60" long-name="Agenda Entry UI" plugin="Y">
-<unit bldFile="app/organizer/meetingui/agnentryui/group"/>
-</component>
-<component name="meetingrequestutils" filter="s60" long-name="Meeting Request Utils">
-<unit bldFile="app/organizer/meetingui/meetingrequestutils/group"/>
-</component>
-<component name="meetingrequestviewers" filter="s60" long-name="Meeting Request Viewers" plugin="Y">
-<unit bldFile="app/organizer/meetingui/meetingrequestviewers/group"/>
-</component>
-<component name="meetingui_build" filter="s60" long-name="Meeting UI Build">
-<!-- split contents into separate components -->
-<unit bldFile="app/organizer/meetingui/group"/>
-</component>
-</collection>
-<collection name="clock2" long-name="Clock" level="app">
-<component name="clockengines" filter="s60" long-name="Clock Engines">
-<unit bldFile="app/organizer/clock2/clockengines/group"/>
-</component>
-<component name="clockui" filter="s60" long-name="Clock UI">
-<unit bldFile="app/organizer/clock2/clockui/group"/>
-</component>
-<component name="clock2_help" filter="s60" long-name="Clock Help">
-<unit bldFile="app/organizer/clock2/help/group"/>
-</component>
-<component name="clock2_build" filter="s60" long-name="Clock Build">
-<!-- split contents into separate components, or just make this one component -->
-<unit bldFile="app/organizer/clock2/group"/>
-</component>
-</collection>
-<collection name="notepad" long-name="Notepad" level="ui">
-<component name="notepad_help" filter="s60" long-name="Notepad Help">
-<unit bldFile="app/organizer/notepad/help/group"/>
-</component>
-<component name="notepad1" filter="s60" long-name="Notepad Application 1">
-<unit bldFile="app/organizer/notepad/notepad1/group"/>
-</component>
-<component name="txtrecog" filter="s60" long-name="Text Recognizer" plugin="Y">
-<unit bldFile="app/organizer/notepad/txtrecog/group"/>
-</component>
-</collection>
-<collection name="searchui" long-name="Search UI" level="app">
-<!-- consider making this a single component -->
-<!-- Uncomment all units when configuration is in place. All currently #included from searchui_build, which should be removed at the same time. -->
-<component name="searchui_help" filter="s60" long-name="Search UI Help" class="placeholder">
-<!--<unit bldFile="searchui/help/group"/>-->
-</component>
-<component name="searchapp" filter="s60" long-name="Search Application" class="placeholder">
-<!--<unit bldFile="searchui/searchapp/group"/>-->
-</component>
-<component name="searchui_build" filter="s60" long-name="Search UI Build">
-<unit bldFile="app/organizer/searchui/group"/>
-</component>
-</collection>
-<collection name="pimappservices" long-name="PIM Application Services" level="services">
-<component name="calendar" long-name="Calendar" introduced="9.2" purpose="optional">
-<unit bldFile="app/organizer/pimappservices/calendar/group" mrp="app/organizer/pimappservices/calendar/group/app-engines_calendar.mrp" version="2"/>
-</component>
-<component name="calendarvcalplugin" long-name="Calendar vCal Plugin" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="app/organizer/pimappservices/calendarvcalplugin/group" mrp="app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp" version="2"/>
-</component>
-<component name="appenginesdocs" long-name="Application Engines Documentation" purpose="development" class="doc">
-<unit mrp="app/organizer/pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
-</component>
-</collection>
-<collection name="pimappsupport" long-name="PIM Application Support" level="support">
-<component name="vcardandvcal" long-name="vCard and vCal" introduced="ER5" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/vcardandvcal/group" mrp="app/organizer/pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
-</component>
-<component name="chinesecalendarconverter" long-name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
-</component>
-<component name="chinesecalendaralg" long-name="Chinese Calendar Algorithm" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendaralg/group" mrp="app/organizer/pimappsupport/chinesecalendaralg/group/app-services_chinesecalendaralgorithm.mrp"/>
-</component>
-</collection>
-<collection name="organizer_info" long-name="Organizer Application Suite Info" level="app">
-<component name="organizer_metadata" long-name="Organizer Application Suite Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="mail eng base ui">
-<collection name="msg_pub" long-name="Messaging Apps Public APIs" level="ui">
-<component name="messaging_integration_api" long-name="Messaging Integration API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/messaging_integration_api/group"/>
-</component>
-<component name="plugin_bio_control_api" long-name="Plug-in Bio Control API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/plugin_bio_control_api/group"/>
-</component>
-<component name="mms_client_mtm_api" long-name="MMS Client MTM API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/mms_client_mtm_api/group"/>
-</component>
-<component name="open_new_message_notification_api" long-name="Open New Message Notification API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/open_new_message_notification_api/group"/>
-</component>
-<component name="messaging_editor_constants_api" long-name="Messaging Editor Constants API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/messaging_editor_constants_api/group"/>
-</component>
-</collection>
-<collection name="msg_plat" long-name="Messaging Apps Platform APIs" level="ui">
-<component name="smil_player_launch_api" long-name="SMIL Player Launch API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/smil_player_launch_api/group"/>
-</component>
-<component name="messaging_media_resolver_api" long-name="Messaging Media Resolver API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/messaging_media_resolver_api/group"/>
-</component>
-<component name="smil_engine_api" long-name="SMIL Engine API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/smil_engine_api/group"/>
-</component>
-<component name="mms_server_settings_api" long-name="MMS Server Settings API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_server_settings_api/group"/>
-</component>
-<component name="new_contacts_note_secondary_display_api" long-name="New Contacts Note Secondary Display API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contacts_note_secondary_display_api/group"/>
-</component>
-<component name="messaging_center_ui_utilities_api" long-name="Messaging Center UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/messaging_center_ui_utilities_api/group"/>
-</component>
-<component name="internet_mail_mtm_ui_api" long-name="Internet Mail MTM UI API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/internet_mail_mtm_ui_api/group"/>
-</component>
-<component name="messaging_editor_api" long-name="Messaging Editor API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/messaging_editor_api/group"/>
-</component>
-<component name="email_domain_utilities_api" long-name="Email Domain Utilities API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/email_domain_utilities_api/group"/>
-</component>
-<component name="smil_transition_api" long-name="SMIL Transition API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/smil_transition_api/group"/>
-</component>
-<component name="new_contacts_note_status_api" long-name="New Contacts Note Status API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contacts_note_status_api/group"/>
-</component>
-<component name="unified_editor_video_conversion_api" long-name="Unified Editor Video Conversion API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/unified_editor_video_conversion_api/group"/>
-</component>
-<component name="mms_conformance_api" long-name="MMS Conformance API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_conformance_api/group"/>
-</component>
-<component name="new_contacts_note_variables_api" long-name="New Contacts Note Variables API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contacts_note_variables_api/group"/>
-</component>
-<component name="new_message_notification_api" long-name="New Message Notification API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_message_notification_api/group"/>
-</component>
-<component name="mms_application_api" long-name="MMS Application API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_application_api/group"/>
-</component>
-<component name="mms_engine_settings_api" long-name="MMS Engine Settings API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_engine_settings_api/group"/>
-</component>
-<component name="mms_codec_client_api" long-name="MMS Codec Client API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_codec_client_api/group"/>
-</component>
-<component name="send_ui_meeting_request_api" long-name="Send UI Meeting Request API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/send_ui_meeting_request_api/group"/>
-</component>
-<component name="new_contact_notes_extended_api" long-name="New Contact Notes Extended API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contact_notes_extended_api/group"/>
-</component>
-<component name="mail_ui_constants_api" long-name="Mail UI Constants API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mail_ui_constants_api/group"/>
-</component>
-<component name="sim_dialog_launch_api" long-name="SIM Dialog Launch API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/sim_dialog_launch_api/group"/>
-</component>
-</collection>
-<collection name="mobilemessaging" long-name="Mobile Messaging" level="ui">
-<component name="audiomsg" filter="s60" long-name="Audio Message">
-<unit bldFile="app/messaging/mobilemessaging/audiomsg/group"/>
-</component>
-<component name="msgmedia" filter="s60" long-name="Message Media">
-<unit bldFile="app/messaging/mobilemessaging/msgmedia/group"/>
-</component>
-<component name="unieditor" filter="s60" long-name="Unified Editor">
-<unit bldFile="app/messaging/mobilemessaging/unieditor/group"/>
-</component>
-<component name="mmsui" filter="s60" long-name="MMS UI">
-<unit bldFile="app/messaging/mobilemessaging/mmsui/group"/>
-</component>
-<component name="postcard" filter="s60" long-name="Postcard">
-<unit bldFile="app/messaging/mobilemessaging/postcard/group"/>
-</component>
-<component name="smilui" filter="s60" long-name="SMIL UI">
-<unit bldFile="app/messaging/mobilemessaging/smilui/group"/>
-</component>
-<component name="smum" filter="s60" long-name="SMS UI MTM and UI Data MTM" plugin="Y">
-<unit bldFile="app/messaging/mobilemessaging/smum/group"/>
-</component>
-<component name="smsui" filter="s60" long-name="SMS UI">
-<unit bldFile="app/messaging/mobilemessaging/smsui/group"/>
-</component>
-<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/mobilemessaging/smsmtm/group" mrp="app/messaging/mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
-</component>
-</collection>
-<collection name="mmsengine" long-name="MMS Engine" level="eng">
-<component name="mmsconninit" filter="s60" long-name="MMS Connection Initiator" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsconninit/bld"/> -->
-</component>
-<component name="genutils" filter="s60" long-name="General Utils" class="placeholder">
-<!-- <unit bldFile="mmsengine/genutils/bld"/> -->
-</component>
-<component name="mmsserversettings" filter="s60" long-name="MMS Server Settings" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserversettings/bld"/> -->
-</component>
-<component name="mmsmessage" filter="s60" long-name="MMS Message" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsmessage/bld"/> -->
-</component>
-<component name="mmshttptransport" filter="s60" long-name="MMS HTTP Transport" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmshttptransport/bld"/> -->
-</component>
-<component name="mmscodec" filter="s60" long-name="MMS Codec" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodec/bld"/> -->
-</component>
-<component name="mmsserver" filter="s60" long-name="MMS Server" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserver/bld"/> -->
-</component>
-<component name="clientmtm" filter="s60" long-name="MMS Client MTM" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/clientmtm/bld"/> -->
-</component>
-<component name="mmswatcher" filter="s60" long-name="MMS Watcher" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmswatcher/bld"/> -->
-</component>
-<component name="mmspushhandler" filter="s60" long-name="MMS Push Handler" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmspushhandler/bld"/> -->
-</component>
-<component name="applicationadapter" filter="s60" long-name="MMS Application Adapter" class="placeholder">
-<!-- <unit bldFile="mmsengine/applicationadapter/bld"/> -->
-</component>
-<component name="mmscodecclient" filter="s60" long-name="MMS Codec Client" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodecclient/bld"/> -->
-</component>
-<component name="mmssettings" long-name="MMS Settings" introduced="9.2" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmssettings/group" mrp="app/messaging/mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
-</component>
-<component name="mmsconf" long-name="MMS Configuration" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmsconf" mrp="app/messaging/mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
-</component>
-<component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
-<!-- this bld.inf should be broken up into the individual other components -->
-<unit bldFile="app/messaging/mmsengine/group"/>
-</component>
-</collection>
-<collection name="messagingappbase" long-name="Messaging App Base" level="base">
-<component name="msgavkon" filter="s60" long-name="Messaging Avkon UI">
-<unit bldFile="app/messaging/messagingappbase/msgavkon/group"/>
-</component>
-<component name="mce" filter="s60" long-name="Message Center Application">
-<unit bldFile="app/messaging/messagingappbase/mce/group"/>
-</component>
-<component name="mceextraitems" filter="s60" long-name="Message Center Extra Items">
-<unit bldFile="app/messaging/messagingappbase/mceextraitems/group"/>
-</component>
-<component name="mcesettings" filter="s60" long-name="Message Center Settings">
-<unit bldFile="app/messaging/messagingappbase/mcesettings/group"/>
-</component>
-<component name="msgerrorwatcher" filter="s60" long-name="Messaging Error Watcher" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/msgerrorwatcher/group"/>
-</component>
-<component name="ncnlist" filter="s60" long-name="New Contacts Note List">
-<unit bldFile="app/messaging/messagingappbase/ncnlist/group"/>
-</component>
-<component name="schemeplugin" filter="s60" long-name="Scheme Handler Plugin" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/schemeplugin/group"/>
-</component>
-<component name="sendui" filter="s60" long-name="Send UI" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/sendui/group"/>
-</component>
-<component name="smilengine" filter="s60" long-name="SMIL Engine">
-<unit bldFile="app/messaging/messagingappbase/smilengine/group"/>
-</component>
-<component name="bium" filter="s60" long-name="BIO UI MTM" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/bium/group"/>
-</component>
-<component name="smartmessaging" filter="s60" long-name="Smart Messaging">
-<unit bldFile="app/messaging/messagingappbase/smartmessaging/group"/>
-</component>
-<component name="msgeditor" filter="s60" long-name="Messaging Editor">
-<unit bldFile="app/messaging/messagingappbase/msgeditor/group"/>
-</component>
-<component name="smilparser" long-name="SMIL Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="app/messaging/messagingappbase/smilparser/GROUP" mrp="app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
-</component>
-<component name="obexmtms" long-name="OBEX MTMs" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/obexmtms/Group" mrp="app/messaging/messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
-</component>
-</collection>
-<collection name="email" long-name="Email" level="mail">
-<!-- use commonemail instead -->
-<component name="alwaysonlineemailplugin" filter="s60" long-name="Always Online Mail Plugin" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/alwaysonlineemailplugin/group"/>
-</component>
-<component name="emailnotificationhandler" filter="s60" long-name="Email Notification Handler" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/emailnotificationhandler/group"/>
-</component>
-<component name="imum" filter="s60" long-name="Internet Mail UI MTM" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/imum/group"/>
-</component>
-<component name="mail" filter="s60" long-name="Mail Application" deprecated="^3">
-<unit bldFile="app/messaging/email/mail/group"/>
-</component>
-<component name="pop3andsmtpmtm" long-name="POP3 and SMTP MTM" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/pop3andsmtpmtm/group" mrp="app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
-</component>
-<component name="imap4mtm" long-name="IMAP4 MTM" introduced="9.2" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/imap4mtm/group" mrp="app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
-</component>
-</collection>
-<collection name="messaging_info" long-name="Messaging Apps Info" level="ui">
-<component name="messaging_metadata" long-name="Messaging Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commonemail" level="apps" span="2" long-name="Email Apps" levels="service support ui app">
-<collection name="email_pub" long-name="Email Apps Public Interfaces" level="app">
-<component name="email_widget_api" long-name="Email Widget API" filter="s60" class="api">
-<unit bldFile="app/commonemail/email_pub/email_widget_api/group"/>
-</component>
-</collection>
-<collection name="email_plat" long-name="Email Apps Platform Interfaces" level="app">
-<component name="email_client_api" long-name="Email Client API" filter="s60" class="api">
-<unit bldFile="app/commonemail/email_plat/email_client_api/group"/>
-</component>
-<component name="email_setup_plugin_api" long-name="Email Setup Plugin API" filter="s60" class="api">
-<unit bldFile="app/commonemail/email_plat/email_setup_plugin_api/group"/>
-</component>
-</collection>
-<collection name="emailservices" long-name="Email Services" level="service">
-<component name="emailframework" filter="s60" long-name="Email Framework" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailframework/group"/>
-</component>
-<component name="emailclientapi" filter="s60" long-name="Email Client API" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailclientapi/group"/>
-</component>
-<component name="emailserver" filter="s60" long-name="Email Server" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailserver/group"/>
-</component>
-<component name="emailservermonitor" filter="s60" long-name="Email Server Monitor" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailservermonitor/group"/>
-</component>
-<component name="psmruadapter" filter="s60" long-name="Predictive Search Most Recent Used Adapter" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailservices/psmruadapter/group"/>
-</component>
-<component name="emailstore" filter="s60" long-name="Email Store" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailstore/group"/>
-</component>
-<component name="emaildebug" filter="s60" long-name="Email Debug" introduced="^2" class="api">
-<unit bldFile="app/commonemail/emailservices/emaildebug/group"/>
-</component>
-<component name="emailinstallationinitiator" filter="s60" long-name="Email Installation Initiator" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailinstallationinitiator/group"/>
-</component>
-</collection>
-<collection name="ipsservices" long-name="IMAP/POP/SMTP Services" level="service">
-<component name="ipssossettings" filter="s60" long-name="IPS SOS Settings" introduced="^2">
-<!-- SOS? Consider spelling it out since the abbreviation is ambiguous -->
-<unit bldFile="app/commonemail/ipsservices/ipssossettings/group"/>
-</component>
-<component name="ipssosplugin" filter="s60" long-name="IPS SOS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/ipsservices/ipssosplugin/group"/>
-</component>
-<component name="ipssosaoplugin" filter="s60" long-name="IPS SOS Always Online Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/ipsservices/ipssosaoplugin/group"/>
-</component>
-<component name="ipsservices_build" filter="s60" long-name="IPS Services Build" introduced="^2">
-<unit bldFile="app/commonemail/ipsservices/group"/>
-<!-- can the exports be broken up into the other components or made a config component?-->
-</component>
-</collection>
-<collection name="emailcontacts" long-name="Email Contacts" level="support">
-<component name="contactactionservice" filter="s60" long-name="Contact Action Service" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailcontacts/contactactionservice/group"/>
-</component>
-<component name="contactactionmenu" filter="s60" long-name="Contact Action Menu" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailcontacts/contactactionmenu/group"/>
-</component>
-</collection>
-<collection name="meetingrequest" long-name="Meeting Request" level="ui">
-<component name="mrcommon" filter="s60" long-name="MR Common" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrcommon/group"/>
-</component>
-<component name="mrdb" filter="s60" long-name="MR Database" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrdb/group"/>
-</component>
-<component name="mrpolicy" filter="s60" long-name="MR Policy" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrpolicy/group"/>
-</component>
-<component name="mrservices" filter="s60" long-name="MR Services" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrservices/group"/>
-</component>
-<component name="mrgui" filter="s60" long-name="MR GUI" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrgui/group"/>
-</component>
-<component name="mrentry" filter="s60" long-name="MR Entry" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrentry/group"/>
-</component>
-<component name="mrtasks" filter="s60" long-name="MR Tasks" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrtasks/group"/>
-</component>
-<component name="mrutils" filter="s60" long-name="MR Utils" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrutils/group"/>
-</component>
-<component name="mrutilscalplugin" filter="s60" long-name="MR Utils Calendar Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mrutilscalplugin/group"/>
-</component>
-<component name="mrviewer" filter="s60" long-name="MR Viewer" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrviewer/group"/>
-</component>
-<component name="mrviewercalplugin" filter="s60" long-name="MR Viewer Calendar Plugin" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrviewercalplugin/group"/>
-</component>
-<component name="mricalviewer" filter="s60" long-name="MR iCal Viewer" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mricalviewer/group"/>
-</component>
-<component name="mrversit2" filter="s60" long-name="MR Versit2" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrversit2/group"/>
-</component>
-<component name="mragnversit2" filter="s60" long-name="MR Agenda Versit2" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mragnversit2/group"/>
-</component>
-<component name="mrcasplugin" filter="s60" long-name="MR Contact Action Service Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mrcasplugin/group"/>
-</component>
-<component name="mrurlparserplugin" filter="s60" long-name="MR URL Parser Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mrurlparserplugin/group"/>
-</component>
-<component name="meetingrequest_build" filter="s60" long-name="MR Build" introduced="^2">
-<!-- can the exports be broken up into the other components ?
- alternatively, move the exports into a RM Config component-->
-<unit bldFile="app/commonemail/meetingrequest/group"/>
-</component>
-</collection>
-<collection name="emailuis" long-name="Email UIs" level="app">
-<component name="emailui" filter="s60" long-name="Email UI" introduced="^2">
-<unit bldFile="app/commonemail/emailuis/emailui/group"/>
-</component>
-<component name="gsemailsettings" filter="s60" long-name="Email GS Settings" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailuis/gsemailsettings/group"/>
-</component>
-<component name="uicomponents" filter="s60" long-name="Email UI Components" introduced="^2">
-<unit bldFile="app/commonemail/emailuis/uicomponents/group"/>
-</component>
-<component name="widget" filter="s60" long-name="Email Widget" introduced="^2">
-<!-- Uncomment unit when configuration is in place. Currently #included from emailuis_build, which should be removed at the same time. -->
-<!--<unit bldFile="emailuis/widget/group"/>-->
-</component>
-<component name="emailuis_build" filter="s60" long-name="Email UIs Build" introduced="^2">
-<unit bldFile="app/commonemail/emailuis/group"/>
-</component>
-</collection>
-<collection name="commonemail_info" long-name="Email Apps Info" level="app">
-<component name="emailhelp" filter="s60" long-name="Email Help" class="placeholder">
-<!-- should this be commented out or not? -->
-<!-- <unit bldFile="emailhelp/group"/> -->
-</component>
-<component name="commonemail_help" filter="s60" long-name="Email Help" introduced="^2" class="placeholder">
-<!-- should this be commented out or not? -->
-<!-- <unit bldFile="help/group"/> -->
-</component>
-</collection>
-</block>
-<block name="conversations" level="apps" long-name="Conversation Apps" levels="settings utils plugin ui">
-<collection name="conversations_plat" long-name="Conversation Apps Platform Interfaces" level="ui">
-<component name="im_cv_launcher_api" long-name="IM CV Launcher API" filter="s60" class="api">
-<unit bldFile="app/conversations/conversations_plat/im_cv_launcher_api/group"/>
-</component>
-<component name="im_connection_api" long-name="IM Connection API" filter="s60" class="api">
-<unit bldFile="app/conversations/conversations_plat/im_connection_api/group"/>
-</component>
-<component name="im_cv_appui_api" long-name="IM CV App UI API" filter="s60" class="api">
-<unit bldFile="app/conversations/conversations_plat/im_cv_appui_api/group"/>
-</component>
-</collection>
-<collection name="uiservicetabsettings" long-name="UI Service Tab Settings" level="settings">
-<!-- this is really at the wrong rank. should move down a directory -->
-<component name="vimpstsettings" filter="s60" long-name="VIMP Service Tab Settings">
-<unit bldFile="app/conversations/uiservicetabsettings/group"/>
-</component>
-</collection>
-<collection name="instantmessagesalert" long-name="Instant Messages Alert" level="utils">
-<!-- this is really at the wrong rank. should move down a directory -->
-<component name="instantmessagesalert_build" filter="s60" long-name="Instant Messages Alert build" introduced="^3">
-<unit bldFile="app/conversations/instantmessagesalert/group"/>
-</component>
-</collection>
-<collection name="imstutils" long-name="IM Service Tab Utils" level="utils">
-<component name="imstutils_help" filter="s60" long-name="IM Service Tab Help">
-<unit bldFile="app/conversations/imstutils/help/group"/>
-</component>
-<component name="imconnectionprovider" filter="s60" long-name="IM Connection Provider" plugin="Y">
-<unit bldFile="app/conversations/imstutils/imconnectionprovider/group"/>
-</component>
-<component name="xmppadapter" filter="s60" long-name="XMPP Settings Adapter" plugin="Y">
-<unit bldFile="app/conversations/imstutils/xmppadapter/group"/>
-</component>
-<component name="imconversationview" filter="s60" long-name="IM Conversation View">
-<unit bldFile="app/conversations/imstutils/imconversationview/group"/>
-</component>
-<component name="imstutils_config" filter="s60" long-name="IM Service Tab Utils config" class="config">
-<!-- remove the #includes and or moved ithe loc file into one the above components -->
-<unit bldFile="app/conversations/imstutils/group"/>
-</component>
-</collection>
-<collection name="uiservicetab" long-name="UI Service Tab" level="ui">
-<component name="vimpstutils" filter="s60" long-name="VIMP Service Tab Utilities">
-<!-- need to spell out VIMP at least once -->
-<unit bldFile="app/conversations/uiservicetab/vimpstutils/group"/>
-</component>
-<component name="vimpststorage" filter="s60" long-name="VIMP Service Tab Storage">
-<unit bldFile="app/conversations/uiservicetab/vimpststorage/group"/>
-</component>
-<component name="vimpstengine" filter="s60" long-name="VIMP Service Tab Engine">
-<unit bldFile="app/conversations/uiservicetab/vimpstengine/group"/>
-</component>
-<component name="vimpstcmdprocess" filter="s60" long-name="VIMP Service Tab Command Process">
-<unit bldFile="app/conversations/uiservicetab/vimpstcmdprocess/group"/>
-</component>
-<component name="vimpstui" filter="s60" long-name="VIMP Service Tab UI">
-<unit bldFile="app/conversations/uiservicetab/vimpstui/group"/>
-</component>
-<component name="vimpstdetailsviewplugin" filter="s60" long-name="VIMP ST Details View Plugin" plugin="Y">
-<unit bldFile="app/conversations/uiservicetab/vimpstdetailsviewplugin/group"/>
-</component>
-<component name="uiservicetab_build" filter="s60" long-name="UI Service Tab Build">
-<!-- can this be distributed into the above bld.infs? -->
-<unit bldFile="app/conversations/uiservicetab/group"/>
-</component>
-</collection>
-<collection name="servicewidget" long-name="Service Widget" level="ui">
-<component name="servicewidgetdatapublisher" filter="s60" long-name="Service Widget Data Publisher" plugin="Y">
-<unit bldFile="app/conversations/servicewidget/servicewidgetdatapublisher/group"/>
-</component>
-<component name="themes" filter="s60" long-name="Service Widget Themes" class="config">
-<!-- does this really need to have that number in the directory name? -->
-<unit bldFile="app/conversations/servicewidget/themes/install-themes/install/servicewidget_20021383/group"/>
-</component>
-<component name="servicewidget_build" filter="s60" long-name="Service Widget Build">
-<!-- Either move the whole collection down one directory into a single component, or move the ROM and SIS parts into a Service Widget ROM component -->
-<unit bldFile="app/conversations/servicewidget/group"/>
-</component>
-</collection>
-<collection name="instantmsgindicatorplugin" long-name="Instant Message Indicator Plugin" level="plugin">
-<!-- collection is really a component. should move down a directory -->
-<component name="instantmsgindicatorplugin_build" filter="s60" long-name="Instant Message Indicator Plugin Build" introduced="^3" plugin="Y">
-<unit bldFile="app/conversations/instantmsgindicatorplugin/group"/>
-</component>
-</collection>
-<collection name="imstatuspaneindicatorplugin" long-name="IM Status Pane Indicator Plugin" level="plugin">
-<!-- collection is really a component. should move down a directory -->
-<component name="imstatuspaneindicatorplugin_build" filter="s60" long-name="IM Status Pane Indicator Plugin Build" introduced="^3" plugin="Y">
-<unit bldFile="app/conversations/imstatuspaneindicatorplugin/group"/>
-</component>
-</collection>
-<collection name="conversations_info" long-name="Conversation Apps Info" level="ui">
-<component name="conversations_build" filter="s60" long-name="Conversation Apps Build">
-<!-- can the exports be moved to other components? or this remade into a configuration component?-->
-<unit bldFile="app/conversations/group"/>
-</component>
-</collection>
-</block>
-<block name="im" level="apps" long-name="Instant Messaging Apps" levels="support prot engine apps">
-<collection name="im_plat" long-name="Instant Messaging Apps Platform Interfaces" level="apps">
-<component name="wv_sap_settings_api" long-name="WV SAP Settings API" filter="s60" class="api">
-<unit bldFile="app/im/im_plat/wv_sap_settings_api/group"/>
-</component>
-</collection>
-<collection name="wvsettings20" long-name="Wireless Village Settings Engine" level="support">
-<!-- this is really a component. should move down a directory -->
-<component name="wvsapsettingsstore" long-name="WV SAP Settings Store" filter="s60" introduced="9.3">
-<unit bldFile="app/im/wvsettings20/group"/>
-</component>
-</collection>
-</block>
-<block name="dictionary" level="services" long-name="Dictionary" levels="utils ui">
-<collection name="dictionary_plat" long-name="Dictionary Platform Interfaces" level="ui">
-<component name="menu_suites_macros_api" long-name="Menu Suites Macros API" filter="s60" class="api">
-<unit bldFile="app/dictionary/dictionary_plat/menu_suites_macros_api/group"/>
-</component>
-</collection>
-<collection name="userdict" long-name="User Dictionary" level="ui">
-<!-- collection is really a component, move down a dir -->
-<component name="userdict_build" filter="s60" long-name="Japanese User Dictionary">
-<unit bldFile="app/dictionary/userdict/group"/>
-</component>
-</collection>
-</block>
-<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"/>
-</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"/>
-</component>
-</collection>
-<collection name="camerauis" long-name="Camera UIs">
-<component name="activepalette" filter="s60" long-name="Active Palette">
-<unit bldFile="app/camera/camerauis/activepalette/group"/>
-</component>
-<component name="cameraapp" filter="s60" long-name="Camera Application">
-<unit bldFile="app/camera/camerauis/cameraapp/group"/>
-<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">
-<component name="image_editor_debug_utilities_api" long-name="Image Editor Debug Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
-</component>
-<component name="image_editor_utilities_api" long-name="Image Editor Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_utilities_api/group"/>
-</component>
-<component name="image_editor_definitions_api" long-name="Image Editor Definitions API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_definitions_api/group"/>
-</component>
-<component name="image_editor_system_parameters_api" long-name="Image Editor System Parameters API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_system_parameters_api/group"/>
-</component>
-<component name="image_processing_engine_api" long-name="Image Processing Engine API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_processing_engine_api/group"/>
-</component>
-</collection>
-<collection name="imageeditor" long-name="Image Editor UI" level="ui">
-<component name="pb" filter="s60" long-name="Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/pb/group"/>
-</component>
-<component name="iepb" filter="s60" long-name="Image Editor Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/iepb/group"/>
-</component>
-<component name="imageeditorui" filter="s60" long-name="Image Editor UI">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorui/group"/>
-</component>
-<component name="imageeditormanager" filter="s60" long-name="Image Editor Manager">
-<unit bldFile="app/imgeditor/imageeditor/imageeditormanager/group"/>
-</component>
-<component name="imageeditorapp" filter="s60" long-name="Image Editor Application">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorapp/group"/>
-</component>
-<component name="imageeditor_plugins" filter="s60" long-name="Image Editor Plugins" plugin="Y">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditor/plugins/blackwhiteplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/brightnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/bubbleplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cartoonizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/clipartplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/contrastplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cropplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/drawplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/frameplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/negativeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/redeyeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/resizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotatelplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotaterplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/textplugin/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditor/plugins/drawplugin/group"/>
- -->
-</component>
-<component name="editorprovider" filter="s60" long-name="Image Editor Provider">
-<unit bldFile="app/imgeditor/imageeditor/editorprovider/group"/>
-</component>
-<component name="imageeditor_build" filter="s60" long-name="Image Editor Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditor/group"/>
-</component>
-</collection>
-<collection name="imageeditorengine" long-name="Image Editor Engine" level="engine">
-<component name="filters" filter="s60" long-name="Image Editor Filters">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbrightness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbubble/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbuffer/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercartoon/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterclipart/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercontrast/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercrop/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterdraw/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterframe/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtergrayscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtericlsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegtarget/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filternegate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterredeye/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterrotate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtertext/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
- -->
-</component>
-<component name="imageeditorutils" filter="s60" long-name="Image Editor Utilities">
-<unit bldFile="app/imgeditor/imageeditorengine/imageeditorutils/group"/>
-</component>
-<component name="systemparameters" filter="s60" long-name="System Parameters">
-<unit bldFile="app/imgeditor/imageeditorengine/systemparameters/group"/>
-</component>
-<component name="enginewrapper" filter="s60" long-name="Image Editor Engine Wrapper">
-<unit bldFile="app/imgeditor/imageeditorengine/enginewrapper/group"/>
-</component>
-<component name="imageeditorengine_build" filter="s60" long-name="Image Editor Engine Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoeditor" level="apps" long-name="Video Editor Apps" levels="engine ui">
-<collection name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" level="ui">
-<component name="video_editor_engine_api" long-name="Video Editor Engine API" introduced="^2" class="api">
-<unit bldFile="app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
-</component>
-</collection>
-<collection name="videditor" long-name="Video Editor" level="ui">
-<component name="videoeditorcommon" filter="s60" long-name="Video Editor Common" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditorcommon/group"/>
-</component>
-<component name="videoeditoruicomponents" filter="s60" long-name="Video Editor UI Components" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditoruicomponents/group"/>
-</component>
-<component name="simplevideoeditor" filter="s60" long-name="Simple Video Editor" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplevideoeditor/group"/>
-</component>
-<component name="simplecutvideo" filter="s60" long-name="Simple Cut Video" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplecutvideo/group"/>
-</component>
-<component name="videoprovider" filter="s60" long-name="Video Provider" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoprovider/group"/>
-</component>
-<component name="manualvideoeditor" filter="s60" long-name="Manual Video Editor" introduced="^2" class="placeholder">
-<!-- uncomment when supported
- <meta rel="config">
- <defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
- </meta>
- <unit bldFile="videditor/manualvideoeditor/group"/> -->
-</component>
-<component name="videditor_build" filter="s60" long-name="Video Editor Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videditor/group"/>
-</component>
-</collection>
-<collection name="videoeditorengine" long-name="Video Editor Engine" level="engine">
-<component name="audioeditorengine" filter="s60" long-name="Audio Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/audioeditorengine/group"/>
-</component>
-<component name="avcedit" filter="s60" long-name="AVC Editing" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/avcedit/group"/>
-</component>
-<component name="h263decoder" filter="s60" long-name="H.263 Decoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/h263decoder/group"/>
-</component>
-<component name="mp3aacmaniplib" filter="s60" long-name="MP3 and AAC Manipulation Library" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
-</component>
-<component name="vedtranscoder" filter="s60" long-name="Video Editor Transcoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedtranscoder/group"/>
-</component>
-<component name="vedengine" filter="s60" long-name="Video Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedengine/group"/>
-</component>
-<component name="videoeditorengine_build" filter="s60" long-name="Video Editor Engine Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videoeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
-<collection name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" level="apps">
-<component name="videoplayer_startup_api" long-name="Video Player Startup API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videoplayer_startup_api/group" filter="!test"/>
-</component>
-<component name="video_player_file_details_dialog_api" long-name="Media Player File Details Dialog API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/video_player_file_details_dialog_api/group" filter="!test"/>
-</component>
-<component name="videocollection_api" long-name="Video Collection API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videocollection_api/group"/>
-</component>
-</collection>
-<collection name="videofeeds" long-name="Video Feeds" level="util">
-<component name="iptv_utils" filter="s60" long-name="IPTV Util" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/utils/group"/>
-</component>
-<component name="viewmessageutility" filter="s60" long-name="View Message Utility" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/viewmessageutility/group"/>
-</component>
-<component name="vcxnotifier" filter="s60" long-name="Video Connection Notifier" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/vcxnotifier/group"/>
-</component>
-<component name="vccommon" filter="s60" long-name="Video Connection Common" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/vccommon/group"/>
-</component>
-<component name="clientapi" long-name="Server Client" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/clientapi/group"/>
-</component>
-<component name="provisioningprocessor" long-name="Provisioning Processor" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/provisioningprocessor/group"/>
-</component>
-<component name="mrssplugin" long-name="RSS plugin" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/mrssplugin/group"/>
-</component>
-<component name="videofeeds_server" long-name="Server" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/server/group"/>
-</component>
-<component name="livetvutils" long-name="LiveTV Utils" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/livetvutils/group"/>
-</component>
-<component name="iptvprovisioningrecognizer" long-name="IP TV Provisioning Recognizer" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/provisioningrecognizer/group"/>
-</component>
-<component name="iptvprovisioningappui" long-name="IP TV Provisioning App UI" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/provisioningappui/group"/>
-</component>
-<component name="iptvomaprovisioning" long-name="IP TV OMA Provisioning" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/omaprovisioning/group"/>
-</component>
-<component name="vcnsuiengine" long-name="VoD UI Engine" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/vcnsuiengine/group"/>
-</component>
-<component name="hgvodui" long-name="Ganes UX2.0 VoD UI" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/hgvodui/group"/>
-</component>
-<component name="hgvodplugin" long-name="Ganes UX2.0 VoD UI Plugin" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/hgvodplugin/group"/>
-</component>
-<component name="vcnsscheduleview" long-name="Scheduled Download Settings View" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/vcnsscheduleview/group"/>
-</component>
-<component name="vcnsscheduleplugin" long-name="Scheduled Download Settings Plugin" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/vcnsscheduleplugin/group"/>
-</component>
-<component name="scheduleddlplugin" long-name="Scheduled download plugin" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/scheduleddlplugin/group"/>
-</component>
-</collection>
-<collection name="videocollection" long-name="Video Collection" level="util">
-<component name="mpxmyvideoscollection" filter="s60" long-name="MPX My Videos Collection" introduced="^3">
-<unit bldFile="app/videoplayer/videocollection/mpxmyvideoscollection/group"/>
-</component>
-<component name="myvideosindicatorplugin" filter="s60" long-name="My Videos Indicator Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videocollection/myvideosindicatorplugin/group"/>
-</component>
-<component name="hgmyvideos" filter="s60" long-name="Huriganes My Videos" introduced="^3">
-<unit bldFile="app/videoplayer/videocollection/hgmyvideos/group"/>
-</component>
-<component name="hgmyvideosplugin" filter="s60" long-name="Huriganes My VideosPlugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videocollection/hgmyvideosplugin/group"/>
-</component>
-</collection>
-<collection name="mediasettings" long-name="Media Settings" level="support">
-<!-- this is really a component. Should be moved down a directory -->
-<component name="mediasettings_build" filter="s60" long-name="Media Settings Build">
-<unit bldFile="app/videoplayer/mediasettings/group"/>
-</component>
-<component name="videoplayer_test" filter="s60" purpose="development" long-name="Video Player Apps Test">
-<!-- can only have one unit. Can thes be #included from the above or another bld.inf?-->
-<unit bldFile="app/videoplayer/tsrc/VCXTestCommon/group"/>
-<unit bldFile="app/videoplayer/tsrc/VCXTestUtilModule/group"/>
-<unit bldFile="app/videoplayer/tsrc/VCXTestMyVideosCollectionClient/group"/>
-<unit bldFile="app/videoplayer/mediasettings/mediasettingsengine/tsrc/mediasettingsenginetest/group"/>
-<unit bldFile="app/videoplayer/mediasettings/videoplayersettingsengine/tsrc/vpsettingsenginetest/group"/>
-</component>
-</collection>
-<collection name="filedetails" long-name="File Details" level="support">
-<component name="filedetailsplugin" filter="s60" long-name="File Details Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/filedetails/filedetailsplugin/group"/>
-</component>
-<component name="filedetailsdialog" filter="s60" long-name="File Details Dialog" introduced="^3">
-<unit bldFile="app/videoplayer/filedetails/filedetailsdialog/group"/>
-</component>
-</collection>
-<collection name="videoplayerapp" long-name="Video Player App" level="apps">
-<component name="lwplayer" long-name="Lightweight Player" filter="s60">
-<unit bldFile="app/videoplayer/videoplayerapp/lwplayer/group"/>
-</component>
-<component name="mpxvideoplayer" filter="s60" long-name="MPX Video Player" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayerapp/mpxvideoplayer/group" filter="!test"/>
-</component>
-</collection>
-<collection name="videoplayback" long-name="Video Playback Plugins" level="plugin">
-<component name="videohelix" long-name="Video Helix" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videohelix/group" filter="!test"/>
-</component>
-<component name="videopdlplaybackviewplugin" filter="s60" long-name="Video PDL Playback View Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videopdlplaybackviewplugin/group" filter="!test"/>
-</component>
-<component name="videoplaybackcontrols" filter="s60" long-name="Video Playback Controls" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videoplaybackcontrols/group" filter="!test"/>
-</component>
-<component name="videoplaybackviewplugin" filter="s60" long-name="Video Playback View Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videoplaybackviewplugin/group"/>
-</component>
-<component name="videoplaybackviews" filter="s60" long-name="Video Playback Views" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videoplaybackviews/group" filter="!test"/>
-</component>
-</collection>
-</block>
-<block name="photos" level="apps" long-name="Photos" levels="support fw ui app">
-<collection name="photos_plat" long-name="Photos Platform Interfaces" level="app">
-<component name="collection_plugins_api" long-name="Collection Plugins API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/collection_plugins_api/group"/>
-</component>
-<component name="controllers_collection_api" long-name="Controllers Collection API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/controllers_collection_api/group"/>
-</component>
-<component name="gallery_utilities_api" long-name="Gallery Utilities API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/gallery_utilities_api/group"/>
-</component>
-<component name="slideshow_ui_constants_api" long-name="Slideshow Ui Constants API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/slideshow_ui_constants_api/group"/>
-</component>
-<component name="views_metadatadialog_api" long-name="Views Metadata Dialog API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/views_metadatadialog_api/group"/>
-</component>
-</collection>
-<collection name="photosgallery" long-name="Photos Gallery" level="app">
-<!-- consider splitting this collection into the application itself, and the frameworks behind it -->
-<component name="photosgallery_help" filter="s60" long-name="Photos Help" introduced="^2">
-<unit bldFile="app/photos/photosgallery/help/group"/>
-</component>
-<component name="logging" filter="s60" long-name="Photos Logging" introduced="^2">
-<unit bldFile="app/photos/photosgallery/logging/group"/>
-</component>
-<component name="photosgallery_common" filter="s60" long-name="Photos Common" introduced="^2">
-<unit bldFile="app/photos/photosgallery/common/group"/>
-</component>
-<component name="photosgallery_commonui" filter="s60" long-name="Photos Common UI" introduced="^2">
-<unit bldFile="app/photos/photosgallery/commonui/group"/>
-</component>
-<component name="photosgalleryollectionfw" filter="s60" long-name="Photos Collection Framework" introduced="^2">
-<unit bldFile="app/photos/photosgallery/collectionframework/group"/>
-</component>
-<component name="galleryicons" filter="s60" long-name="Photos Icons" introduced="^2" class="config">
-<unit bldFile="app/photos/photosgallery/icons"/>
-</component>
-<component name="imageviewer" filter="s60" long-name="Image Viewer" introduced="^3">
-<!-- this is really a part of controllers component, #include from there instead -->
-<unit bldFile="app/photos/photosgallery/controllers/imageviewer/group"/>
-</component>
-<component name="photosgalleryviewfw" filter="s60" long-name="View Framework" introduced="^2">
-<unit bldFile="app/photos/photosgallery/viewframework/group"/>
-</component>
-<component name="controllers" filter="s60" long-name="Photos Controllers" introduced="^2">
-<unit bldFile="app/photos/photosgallery/controllers/group"/>
-</component>
-<component name="photogallery" filter="s60" long-name="Media Gallery" introduced="^2">
-<unit bldFile="app/photos/photosgallery/gallery/group"/>
-</component>
-<component name="slideshow" filter="s60" long-name="Slideshow" introduced="^2">
-<unit bldFile="app/photos/photosgallery/slideshow/group"/>
-</component>
-<component name="memoryplugin" long-name="Memory Plugin" filter="s60" introduced="^2" plugin="Y">
-<unit bldFile="app/photos/photosgallery/memoryplugin/group"/>
-</component>
-<component name="imgvwr" filter="s60" long-name="Photos Image Viewer" introduced="^3">
-<unit bldFile="app/photos/photosgallery/imgvwr/group"/>
-</component>
-<component name="photosgallery_build" filter="s60" long-name="Photos Gallery Build" introduced="^2">
-<!-- need to remove the #included above bld.infs from this -->
-<unit bldFile="app/photos/photosgallery/group"/>
-</component>
-</collection>
-</block>
-<block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support hs app">
-<collection name="musicplayer_plat" long-name="Music Player Apps Platform Interfaces" level="app">
-<component name="mpx_music_player_app_api" long-name="MPX Music Player App API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_app_api/group"/>
-</component>
-<component name="mpx_music_player_commonui_api" long-name="MPX Music Player Common UI API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_commonui_api/group"/>
-</component>
-<component name="mpx_music_player_media_key_handler_api" long-name="MPX Music Player Media Key Handler API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_media_key_handler_api/group"/>
-</component>
-<component name="mpx_music_player_remote_control_api" long-name="MPX Music Player Remote Control API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_remote_control_api/group"/>
-</component>
-<component name="mpx_music_shop_ui_api" long-name="MPX Music Shop UI API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_shop_ui_api/group"/>
-</component>
-<component name="mpx_music_wap_adapter_cenrep_api" long-name="MPX Music Wap Adapter CenRep API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_wap_adapter_cenrep_api/group"/>
-</component>
-<component name="mpx_music_store_api" long-name="MPX Music Store Find API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_store_api/group"/>
-</component>
-<component name="audio_application_features_api" long-name="Audio Application Features API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/audio_application_features_api/group"/>
-</component>
-<component name="music_content_publisher_plugin_api" long-name="Music Content Publisher Plugin API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/music_content_publisher_plugin_api/group"/>
-</component>
-</collection>
-<collection name="mpxmusicplayer" long-name="MPX Music Player" level="app">
-<component name="mpxmusicplayer_help" filter="s60" long-name="Help">
-<unit bldFile="app/musicplayer/mpxmusicplayer/help/group"/>
-</component>
-<component name="mpxmusicplayer_commonui" filter="s60" long-name="MPX Common UI">
-<unit bldFile="app/musicplayer/mpxmusicplayer/commonui/group"/>
-</component>
-<component name="mpx_metadatahandler" filter="s60" long-name="MPX Metadata Handler">
-<unit bldFile="app/musicplayer/mpxmusicplayer/metadatahandler/group"/>
-</component>
-<component name="mediakeyhandler" filter="s60" long-name="MPX Media Key Handler">
-<unit bldFile="app/musicplayer/mpxmusicplayer/mediakeyhandler/group"/>
-</component>
-<component name="mpxmusicplayer_app" filter="s60" long-name="MPX Application">
-<unit bldFile="app/musicplayer/mpxmusicplayer/app/group"/>
-</component>
-<component name="mpxmusicplayer_build" filter="s60" long-name="MPX Music Player Build">
-<!-- can the exports be distributed to the above components? -->
-<unit bldFile="app/musicplayer/mpxmusicplayer/group"/>
-</component>
-</collection>
-<collection name="musichomescreen_multiview" long-name="Music Home Screen Multiview" level="hs">
-<!-- Uncomment all units when configuration is in place. All currently #included from musichomescreen_build -->
-<component name="mpxcollectionpublisher" filter="s60" long-name="MPX Collection Publisher" introduced="^2" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/mpxcollectionpublisher/group"/>-->
-</component>
-<component name="musiccontentpublisher" filter="s60" long-name="Music Content Publisher" introduced="^2" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/musiccontentpublisher/group"/>-->
-</component>
-<component name="mcpmusicplayer" filter="s60" long-name="Music Player MCP Plugin" introduced="^2" plugin="Y" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/mcpmusicplayer/group"/>-->
-</component>
-<component name="musicplayeractionhandlerplugin" filter="s60" long-name="Music Player Action Handler Plugin" introduced="^2" plugin="Y" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/musicplayeractionhandlerplugin/group"/>-->
-</component>
-<component name="mpx_data" filter="s60" long-name="MPX Data" introduced="^2" class="placeholder">
-<!-- does this make sense to be a component? should it just be #include from musichomescreen_multiview/group? -->
-<!--<unit bldFile="musichomescreen_multiview/data/themes/default/group"/>-->
-</component>
-<component name="musichomescreen_build" filter="s60" long-name="Music Homescreen Multiview Build" introduced="^2">
-<unit bldFile="app/musicplayer/musichomescreen_multiview/group"/>
-</component>
-</collection>
-<collection name="mpxplugins" long-name="MPX Plugins" level="plugins">
-<component name="serviceplugins" filter="s60" long-name="MPX Service Plugins" plugin="Y">
-<unit bldFile="app/musicplayer/mpxplugins/serviceplugins/group"/>
-</component>
-<component name="viewplugins" filter="s60" long-name="MPX View Plugins" plugin="Y">
-<unit bldFile="app/musicplayer/mpxplugins/viewplugins/group"/>
-</component>
-<component name="mpxplugins_build" filter="s60" long-name="MPX Plugins Build">
-<!-- can the exports be distributed to the above components? -->
-<unit bldFile="app/musicplayer/mpxplugins/group"/>
-</component>
-</collection>
-<collection name="musicplayer_info" long-name="Music Player Apps Info" level="app">
-<component name="musicplayer_build" filter="s60" long-name="Music Player Build">
-<!-- should explicitly #inlcude musicplayerbldvariant.hrh in each component -->
-<unit bldFile="app/musicplayer/group"/>
-</component>
-</collection>
-</block>
-<block name="radio" level="apps" long-name="Radio Apps" levels="engine ui">
-<collection name="fmradio" long-name="FM Radio" level="ui">
-<component name="activeidleengine" filter="s60" long-name="FM Radio Active Idle Engine">
-<unit bldFile="app/radio/fmradio/activeidleengine/group"/>
-</component>
-<component name="fmradioengine" filter="s60" long-name="FM Radio Engine">
-<unit bldFile="app/radio/fmradio/fmradioengine/group"/>
-</component>
-<component name="fmradioactionhandler" filter="s60" long-name="FM Radio Action Handler" plugin="Y">
-<unit bldFile="app/radio/fmradio/fmradioactionhandler/group"/>
-</component>
-<component name="fmradiomcpplugin" filter="s60" long-name="FM Radio Content Publisher Plugin" plugin="Y">
-<unit bldFile="app/radio/fmradio/fmradiomcpplugin/group"/>
-</component>
-<component name="fmradio_build" filter="s60" long-name="FM Radio Build">
-<unit bldFile="app/radio/fmradio/fmradio/group"/>
-</component>
-<component name="fmradio_help" filter="s60" long-name="FM Radio Help">
-<unit bldFile="app/radio/fmradio/help/group"/>
-</component>
-<component name="fmradio_build" filter="s60" long-name="FM Radio ROM">
-<!-- remove above #included bld.infs -->
-<unit bldFile="app/radio/fmradio/group"/>
-</component>
-</collection>
-</block>
-<block name="internetradio" level="apps" long-name="Internet Radio Apps"/>
-<block name="tv" level="services" long-name="TV Apps"/>
-<block name="voicerec" level="apps" long-name="Voice Recorder Apps">
-<!-- custom filter pref_test-->
-<collection name="voicerec_plat" long-name="Voice Recorder Apps Platform Interfaces">
-<component name="new_file_service_api" long-name="New File Service API" filter="s60" class="api">
-<unit bldFile="app/voicerec/voicerec_plat/new_file_service_api/group"/>
-</component>
-<component name="voicerecorder_public_constants_api" long-name="Voice Recorder Public Constants API" filter="s60" class="api">
-<unit bldFile="app/voicerec/voicerec_plat/voicerecorder_public_constants_api/group"/>
-</component>
-</collection>
-<collection name="voicerecorder" long-name="Voice Recorder">
-<!--this is really a component, move down a directory -->
-<component name="voicerecorder_build" filter="s60" long-name="Voice Recorder Build">
-<unit bldFile="app/voicerec/voicerecorder/group"/>
-</component>
-</collection>
-<collection name="voicerec_info" long-name="Voice Recorder Apps Info"/>
-</block>
-<block name="screensaver" level="apps" long-name="Screen Saver Apps" levels="plugin ui">
-<!-- is this a user-facing application or a daemon? -->
-<!-- units need to be commented out until configuration is in place. They are currently #included from screensaver_build-->
-<collection name="scrsaver" long-name="Screen Saver" level="plugin">
-<component name="scrsaverplugins" filter="s60" long-name="Screen Saver Plugins" plugin="Y">
-<!-- must have only one component. #include from a common bld.inf, or move up a directory and make scrsaverplugins a collection -->
-<!--<unit bldFile="scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/"/>
- <unit bldFile="scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/group/"/>-->
-</component>
-<component name="scrsaver_slideshowplugin" filter="s60" long-name="Screen Saver Slideshow Plugin" plugin="Y">
-<!--<unit bldFile="scrsaver/scrsaverplugins/SlideshowPlugin/group"/> -->
-</component>
-<component name="screensaveraiwplugin" filter="s60" long-name="Screen Saver AIW Plugin" plugin="Y">
-<!-- <unit bldFile="scrsaver/screensaveraiwplugin/group"/>-->
-</component>
-</collection>
-<collection name="screensaver_info" long-name="Screen Saver Apps Info" level="ui">
-<component name="screensaver_build" filter="s60" long-name="Screen Saver Application">
-<!--the app should be a separate component -->
-<unit bldFile="app/screensaver/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreen" level="apps" long-name="Home Screen Apps" levels="fw support apps">
-<collection name="homescreen_plat" long-name="Home Screen Apps Platform Interfaces" level="apps">
-<component name="menu_settings_api" long-name="Menu Settings API" filter="s60" class="api">
-<unit bldFile="app/homescreen/homescreen_plat/menu_settings_api/group"/>
-</component>
-<component name="hs_content_control_ui" long-name="HS Content Control Ui" filter="s60" class="api">
-<unit bldFile="app/homescreen/homescreen_plat/hs_content_control_ui/group"/>
-</component>
-<component name="hs_renderingplugin_api" long-name="HS Rendering Plugin API" filter="s60" class="api">
-<unit bldFile="app/homescreen/homescreen_plat/hs_renderingplugin_api/group"/>
-</component>
-</collection>
-<collection name="idlehomescreen" long-name="Idle Home Screen" level="apps">
-<component name="nativeuicontroller" filter="s60" long-name="Native UI Controller">
-<unit bldFile="app/homescreen/idlehomescreen/nativeuicontroller/group"/>
-</component>
-<component name="exths" filter="s60" long-name="Active Idle Container" plugin="Y">
-<!-- why is the ID so different from the name? Is one wrong? -->
-<unit bldFile="app/homescreen/idlehomescreen/exths/group"/>
-</component>
-<component name="hscontentcontrol" filter="s60" long-name="Home Screen Content Control" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/hscontentcontrol/group"/>
-</component>
-<component name="hssapiwrapper" filter="s60" long-name="HS SAPI Wrapper" introduced="^3">
-<!-- can only have one unit. #include from a common bld.inf, or split into two components -->
-<unit bldFile="app/homescreen/idlehomescreen/sapiwrapper/cpswrapper/group"/>
-<unit bldFile="app/homescreen/idlehomescreen/sapiwrapper/hspswrapper/group"/>
-</component>
-<component name="xmluirendering" filter="s60" long-name="XML UI Rendering" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/xmluirendering/group"/>
-</component>
-<component name="xmluicontroller" filter="s60" long-name="XML UI Controller" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/xmluicontroller/group"/>
-</component>
-<component name="widgetmanager" filter="s60" long-name="Widget Manager" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/widgetmanager/group"/>
-</component>
-<component name="idlehomescreen_help" filter="s60" long-name="Idle Home Screen Help">
-<unit bldFile="app/homescreen/idlehomescreen/help/group"/>
-</component>
-<component name="idlehomescreen_data" filter="s60" long-name="Idle Home Screen Data">
-<unit bldFile="app/homescreen/idlehomescreen/data/group"/>
-</component>
-<component name="idlehomescreen_build" filter="s60" long-name="Idle Home Screen Build">
-<!-- can the loc file be moved to another comopnent and this one removed? -->
-<unit bldFile="app/homescreen/idlehomescreen/group"/>
-</component>
-</collection>
-<collection name="menufw" long-name="Menu Framework" level="fw">
-<component name="hierarchynavigator" filter="s60" long-name="Hierarchy Navigator">
-<unit bldFile="app/homescreen/menufw/hierarchynavigator/group"/>
-</component>
-<component name="menufwui" filter="s60" long-name="Menu Framework UI">
-<unit bldFile="app/homescreen/menufw/menufwui/group"/>
-</component>
-<component name="menusuites" filter="s60" long-name="Menu Suites">
-<unit bldFile="app/homescreen/menufw/menusuites/group"/>
-</component>
-<component name="menufw_build" filter="s60" long-name="Menu Framework Build">
-<!-- can the exports be exported by the other components? -->
-<unit bldFile="app/homescreen/menufw/group"/>
-</component>
-</collection>
-<collection name="taskswitcher" long-name="Task Switcher" level="support">
-<component name="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">
-<unit bldFile="app/homescreen/taskswitcher/taskswitcherui/group"/>
-</component>
-</collection>
-</block>
-<block name="graphicsuis" level="services" long-name="Graphics UIs" levels="util ui">
-<collection name="graphicsuis_plat" long-name="Graphics UIs Platform Interfaces" level="ui">
-<component name="svgt_viewer_ui_api" long-name="SVG-T Viewer UI API" filter="s60" class="api">
-<unit bldFile="app/graphicsuis/graphicsuis_plat/svgt_viewer_ui_api/group"/>
-</component>
-<component name="svg_application_observer_utility_api" long-name="SVG Application Observer Utility API" filter="s60" class="api">
-<unit bldFile="app/graphicsuis/graphicsuis_plat/svg_application_observer_utility_api/group"/>
-</component>
-<component name="svgt_file_view_details_dialog_api" long-name="SVG-T File View Details Dialog API" filter="s60" class="api">
-<unit bldFile="app/graphicsuis/graphicsuis_plat/svgt_file_view_details_dialog_api/group"/>
-</component>
-</collection>
-<collection name="svgtviewer" long-name="SVG-T Viewer" level="ui">
-<component name="svgtviewerplugin" filter="s60" long-name="SVG-T Viewer Plugin">
-<unit bldFile="app/graphicsuis/svgtviewer/svgtviewerplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="profile" level="apps" long-name="Profiles" levels="app">
-<collection name="profile_plat" long-name="Profiles Platform Interfaces" level="app">
-<component name="profiles_settings_view_api" long-name="Profiles Settings View API" filter="s60" class="api">
-<unit bldFile="app/profile/profile_plat/profiles_settings_view_api/group"/>
-</component>
-</collection>
-<collection name="profilesapplication" long-name="Profiles Application" level="app">
-<component name="profiles" filter="s60" long-name="Profiles">
-<unit bldFile="app/profile/profilesapplication/profiles/group"/>
-</component>
-</collection>
-<collection name="profile_info" long-name="Profiles Info" level="app">
-<component name="profile_help" filter="s60" long-name="Profiles Help">
-<unit bldFile="app/profile/help/group"/>
-</component>
-</collection>
-</block>
-<block name="speechsrv" level="services" long-name="Speech Recognition UIs" levels="engine framework ui">
-<collection name="speechsrv_plat" long-name="Speech Recognition UIs Platform Interfaces" level="ui">
-<component name="vas_api" long-name="VAS API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vas_api/group"/>
-</component>
-<component name="nss_devasr_api" long-name="NSS DevASR API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_devasr_api/group"/>
-</component>
-<component name="tts_hw_device_api" long-name="TTS HW Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/tts_hw_device_api/group"/>
-</component>
-<component name="voice_commands_resource_header_api" long-name="Voice Commands Resource Header API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/voice_commands_resource_header_api/group"/>
-</component>
-<component name="nss_mmf_tts_custom_commands_api" long-name="NSS MMF TTS Custom Commands API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_mmf_tts_custom_commands_api/group"/>
-</component>
-<component name="srsf_cenrep_settings_api" long-name="SRSF CenRep Settings API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/srsf_cenrep_settings_api/group"/>
-</component>
-<component name="voice_ui_plugin_api" long-name="Voice UI Plug-in API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/voice_ui_plugin_api/group"/>
-</component>
-<component name="nss_tts_utility_api" long-name="NSS TTS Utility API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_tts_utility_api/group"/>
-</component>
-<component name="nss_srs_custom_commands_api" long-name="NSS SRS Custom Commands API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_srs_custom_commands_api/group"/>
-</component>
-<component name="srsf_secondarydisplay_api" long-name="SRSF Secondary Display API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/srsf_secondarydisplay_api/group"/>
-</component>
-<component name="asrs_hw_device_api" long-name="ASRS Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/asrs_hw_device_api/group"/>
-</component>
-<component name="vas_vcommand_api" long-name="VAS Voice Command API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vas_vcommand_api/group"/>
-</component>
-<component name="adaptation_hw_device_api" long-name="Adaptation Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/adaptation_hw_device_api/group"/>
-</component>
-<component name="nss_devtts_api" long-name="NSS DevTTS API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_devtts_api/group"/>
-</component>
-<component name="nss_srs_utility_api" long-name="NSS SRS Utility API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_srs_utility_api/group"/>
-</component>
-<component name="recognition_hw_device_api" long-name="Recognition Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/recognition_hw_device_api/group"/>
-</component>
-<component name="vas_contact_handler_api" long-name="VAS Contact Handler API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vas_contact_handler_api/group"/>
-</component>
-<component name="nlp_hw_device" long-name="NLP Hardware Device" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nlp_hw_device/group"/>
-</component>
-<component name="nss_si_speech_recognition_data_api" long-name="NSS SI Speech Recognition Data API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_si_speech_recognition_data_api/group"/>
-</component>
-<component name="nss_tts_common_api" long-name="NSS TTS Common API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_tts_common_api/group"/>
-</component>
-<component name="grcompiler_hw_device_api" long-name="Grammar Compiler Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/grcompiler_hw_device_api/group"/>
-</component>
-<component name="ttp_hw_device_api" long-name="TTP Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/ttp_hw_device_api/group"/>
-</component>
-<component name="vocman_hw_device_api" long-name="VocMan Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vocman_hw_device_api/group"/>
-</component>
-<component name="speech_synthesis_clientserver_api" long-name="Speech Synthesis Client-Server API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/speech_synthesis_clientserver_api/group"/>
-</component>
-<component name="voice_ui_accessory_button_handling_api" long-name="Voice UI Accessory Button Handling API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/voice_ui_accessory_button_handling_api/group"/>
-</component>
-<component name="ui_voice_recognition_api" long-name="UI Voice Recognition API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/ui_voice_recognition_api/group"/>
-</component>
-<component name="vcommand_settings_cenrep_api" long-name="Voice Command Settings CenRep API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vcommand_settings_cenrep_api/group"/>
-</component>
-</collection>
-<collection name="voiceui" long-name="Voice UI" level="ui">
-<component name="vcommand" filter="s60" long-name="Voice Commands UI" introduced="^1">
-<unit bldFile="app/speechsrv/voiceui/vcommand/group"/>
-</component>
-<component name="voiceuivoicerecognition" filter="s60" long-name="Voice UI Recognition" introduced="^1">
-<unit bldFile="app/speechsrv/voiceui/voiceuivoicerecognition/group"/>
-</component>
-<component name="pbkinfoviewimpl" filter="s60" long-name="Phonebook Info View Implementation" introduced="^1">
-<unit bldFile="app/speechsrv/voiceui/pbkinfoviewimpl/group"/>
-</component>
-<component name="aiwpbkinfoviewprovider" filter="s60" long-name="AIW Phonebook Info View Provider" introduced="^1" plugin="Y">
-<unit bldFile="app/speechsrv/voiceui/aiwpbkinfoviewprovider/group"/>
-</component>
-<component name="vccontrolpanelplugin" filter="s60" long-name="Voice Commands Control Panel Plugin" introduced="^1" plugin="Y">
-<!-- component is commented out until configuration is in place. Currently #included from voiceui_build -->
-<!--<unit bldFile="voiceui/vccontrolpanelplugin/group"/>-->
-</component>
-<component name="voiceui_build" filter="s60" long-name="Voice UI Build" introduced="^1">
-<!-- can this be put into the other components? -->
-<unit bldFile="app/speechsrv/voiceui/group"/>
-</component>
-</collection>
-<collection name="srsf" long-name="Speech Recognition and Synthesis Framework" level="framework">
-<component name="sispeechrecognitiondata" filter="s60" long-name="SI Speech Recognition Data">
-<unit bldFile="app/speechsrv/srsf/sispeechrecognitiondata/group"/>
-</component>
-<component name="ttscommon" filter="s60" long-name="TTS Common">
-<unit bldFile="app/speechsrv/srsf/ttscommon/group"/>
-</component>
-<component name="devtts" filter="s60" long-name="Text to Speech">
-<unit bldFile="app/speechsrv/srsf/devtts/group"/>
-</component>
-<component name="ttscustomcommands" filter="s60" long-name="TTS Custom Commands">
-<unit bldFile="app/speechsrv/srsf/ttscustomcommands/group"/>
-</component>
-<component name="ttscontrollerplugin" filter="s60" long-name="TTS Controller Plugin" plugin="Y">
-<unit bldFile="app/speechsrv/srsf/ttscontrollerplugin/group"/>
-</component>
-<component name="ttsutility" filter="s60" long-name="TTS Utility">
-<unit bldFile="app/speechsrv/srsf/ttsutility/group"/>
-</component>
-<component name="speechsynthesis" filter="s60" long-name="Speech Synthesis">
-<!-- can only have one unit. #include these from a common bld.inf -->
-<unit bldFile="app/speechsrv/srsf/speechsynthesis/client/group"/>
-<unit bldFile="app/speechsrv/srsf/speechsynthesis/server/group"/>
-</component>
-<component name="devasr" filter="s60" long-name="Audio Recording and Speech Recognition">
-<unit bldFile="app/speechsrv/srsf/devasr/group"/>
-</component>
-<component name="sicc" filter="s60" long-name="Speaker Independent Custom Commands">
-<unit bldFile="app/speechsrv/srsf/sicc/group"/>
-</component>
-<component name="sisrscontrollerplugin" filter="s60" long-name="SI SRS Controller Plugin" plugin="Y">
-<unit bldFile="app/speechsrv/srsf/sisrscontrollerplugin/group"/>
-</component>
-<component name="siutility" filter="s60" long-name="Speaker Independent Utility">
-<unit bldFile="app/speechsrv/srsf/siutility/group"/>
-</component>
-<component name="nssvasapi" filter="s60" long-name="NSS VAS API">
-<unit bldFile="app/speechsrv/srsf/nssvasapi/group"/>
-</component>
-<component name="nssvascontacthdlr" filter="s60" long-name="NSS VAS Contact Handler">
-<unit bldFile="app/speechsrv/srsf/nssvascontacthdlr/group"/>
-</component>
-<component name="vcommandhandler" filter="s60" long-name="Voice Command Handler">
-<unit bldFile="app/speechsrv/srsf/vcommandhandler/group"/>
-</component>
-<component name="vuiphandler" filter="s60" long-name="Voice UI Plugin Handler">
-<unit bldFile="app/speechsrv/srsf/vuiphandler/group"/>
-</component>
-<component name="vcommandexecutor" filter="s60" long-name="Voice Command Executor">
-<unit bldFile="app/speechsrv/srsf/vcommandexecutor/group"/>
-</component>
-<component name="vcommandexecutorbearer" filter="s60" long-name="Voice Command Executor Bearer">
-<unit bldFile="app/speechsrv/srsf/vcommandexecutorbearer/group"/>
-</component>
-<component name="vcommandmanager" filter="s60" long-name="Voice Command Manager">
-<unit bldFile="app/speechsrv/srsf/vcommandmanager/group"/>
-</component>
-<component name="vcexecutorapp" filter="s60" long-name="Voice Command Executor Application">
-<unit bldFile="app/speechsrv/srsf/vcexecutorapp/group"/>
-</component>
-<component name="profileobserverplugin" filter="s60" long-name="Profile Observer Plugin" plugin="Y">
-<unit bldFile="app/speechsrv/srsf/profileobserverplugin/group"/>
-</component>
-<component name="srsf_build" filter="s60" long-name="Speech Recognition and Synthesis Framework Build">
-<!-- should distribute this into the above components -->
-<unit bldFile="app/speechsrv/srsf/group"/>
-</component>
-</collection>
-<collection name="speechsrv_info" long-name="Speech Recognition UIs Info" level="ui"/>
-</block>
-<block name="homescreentools" level="services" long-name="Home Screen Tools" levels="tool install">
-<collection name="dtdinstaller" long-name="DTD Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<!-- this needs to be built first, does build order need to be forced with filters? -->
-<component name="dtdinstaller_build" filter="s60" long-name="DTD Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/dtdinstaller/group"/>
-</component>
-</collection>
-<collection name="themeinstaller" long-name="Theme Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="themeinstaller_build" filter="s60" long-name="Theme Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/themeinstaller/group"/>
-</component>
-</collection>
-<collection name="widgettools" long-name="Widget Tools" level="install">
-<component name="hspluginpreinstaller" filter="s60" long-name="HS Plugin Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/hspluginspreinstaller/group"/>
-</component>
-<component name="wrtwidgetpreinstaller" filter="s60" long-name="WRT Widget Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
-</component>
-</collection>
-</block>
-<block name="webuis" level="services" long-name="Web UIs" levels="plugin app">
-<collection name="browserui" long-name="Browser UI" level="app">
-<component name="browser" filter="s60" long-name="Browser">
-<unit bldFile="app/webuis/browserui/browser/group"/>
-</component>
-<component name="operatormenu" filter="s60" long-name="Browser Operator Menu">
-<unit bldFile="app/webuis/browserui/operatormenu/group"/>
-</component>
-<component name="videoservices" filter="s60" long-name="Browser Video Services">
-<unit bldFile="app/webuis/browserui/videoservices/group"/>
-</component>
-</collection>
-<collection name="browserplugins" long-name="Browser Plugins" level="plugin">
-<component name="browsersysteminfoplugin" filter="s60" long-name="Browser System Info Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsersysteminfoplugin/group"/>-->
-</component>
-<component name="browsergpsplugin" filter="s60" long-name="Browser GPS Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsergpsplugin/group"/>-->
-</component>
-<component name="browseraudiovideoplugin" filter="s60" long-name="Browser Audio Video Plugin" plugin="Y">
-<unit bldFile="app/webuis/browserplugins/browseraudiovideoplugin/group"/>
-</component>
-<component name="browserplugins_build" filter="s60" long-name="Browser Plugins Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="app/webuis/browserplugins/group"/>
-</component>
-</collection>
-<collection name="pushmtm" long-name="Push MTM" level="plugin">
-<component name="pushmtm_help" filter="s60" long-name="Push MTM Help">
-<unit bldFile="app/webuis/pushmtm/help/group"/>
-</component>
-<component name="plugins" filter="s60" long-name="Push MTM Plugins" plugin="Y">
-<unit bldFile="app/webuis/pushmtm/plugins/group"/>
-</component>
-<component name="pushmtm_build" filter="s60" long-name="Push MTM Build">
-<!-- Some content is at collection level and some is at comopnent level. Either make this a single
- component and move it down a diretcory, or make separate independent components in this collection -->
-<unit bldFile="app/webuis/pushmtm/group"/>
-</component>
-</collection>
-</block>
-<block name="jrt" level="services" long-name="Java Runtime" levels="util generic rt ui">
-<collection name="jrt_plat" long-name="JRT Platform Interfaces" level="ui">
-<component name="java_registry_api" long-name="Java Registry API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_registry_api/build"/>
-</component>
-<component name="java_env_info_api" long-name="Java Environment Info API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_env_info_api/build"/>
-</component>
-<component name="java_debug_api" long-name="Java Debug API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_debug_api/build"/>
-</component>
-</collection>
-<collection name="java_stubs" long-name="Java Stubs" level="util">
-<!-- uncomment all components when configuration is in place. Currently #included from jrt_build -->
-<component name="javadrmutils" long-name="Java DRM Utils" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtdrmutils/group"/>-->
-</component>
-<component name="javaenvinfo" long-name="Java Environment Info" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtenvinfo/group"/>-->
-</component>
-<component name="javaregistry" filter="s60,sf_build" long-name="Java Registry" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtregistry/clientserver/client/group"/>-->
-</component>
-<component name="java_stubs_build" filter="s60,sf_build" long-name="Java Stubs ROM" class="placeholder">
-<!-- Remove the #includes and rename JRT ROM-->
-<!--<unit bldFile="java_stubs/group"/>-->
-</component>
-</collection>
-<collection name="jrt_info" long-name="JRT Info" level="rt">
-<component name="jrt_build" filter="s60" long-name="JRT Build">
-<!-- needed for __JAVA_STUBS condition -->
-<unit bldFile="app/jrt/group"/>
-</component>
-</collection>
-</block>
-<block name="conntools" level="services" long-name="Connectivity Tools" levels="config app">
-<collection name="nettools" long-name="Net Tools" level="app">
-<component name="conntest" filter="s60" long-name="Connection Test" purpose="development">
-<unit bldFile="app/conntools/nettools/conntest/group"/>
-</component>
-</collection>
-<collection name="emulatorlan" long-name="Emulator LAN" level="config">
-<!-- component is actually a colleciton, should be moved down a directory -->
-<component name="emulatorlan_build" filter="s60" long-name="Emulator LAN Build" purpose="development" class="config">
-<unit bldFile="app/conntools/emulatorlan/group"/>
-</component>
-</collection>
-</block>
-<block name="rndtools" level="services" long-name="R&D tools" levels="support generic test util">
-<collection name="creator" long-name="Creator" level="support">
-<!-- collection is really a component. Should move down a directory -->
-<component name="creator_build" filter="s60" long-name="Creator Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/creator/group"/>
-</component>
-</collection>
-<collection name="filebrowser" long-name="File Browser" level="util">
-<!-- consider collapsing into a single component -->
-<component name="fileopserver" filter="s60" long-name="File Operations Server" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
-</component>
-<component name="fileopclient" filter="s60" long-name="File Operations Client" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!--<unit bldFile="filebrowser/fileopclient/group"/>-->
-</component>
-<component name="filebrowser_build" filter="s60" long-name="File Browser Application" purpose="development" class="tool">
-<!-- Need to make this a self-contained component by removing #includes. Can only do when configuration is in place-->
-<unit bldFile="app/rndtools/filebrowser/group"/>
-</component>
-</collection>
-<collection name="launcher" long-name="Launcher" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="launcher_build" filter="s60" long-name="Launcher Utility" purpose="development" class="tool">
-<unit bldFile="app/rndtools/launcher/group"/>
-</component>
-</collection>
-<collection name="loadgen" long-name="Load Generator" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="loadgen_build" filter="s60" long-name="Load Generator Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/loadgen/group"/>
-</component>
-</collection>
-<collection name="perfmon" long-name="Performance Monitor" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="perfmon_build" filter="s60" long-name="Performance Monitor Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/perfmon/group"/>
-</component>
-</collection>
-<collection name="screengrabber" long-name="Screen Grabber" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="screengrabber_build" filter="s60" long-name="ScreenGrabber" purpose="development" class="tool">
-<unit bldFile="app/rndtools/screengrabber/group"/>
-</component>
-</collection>
-<collection name="stifui" long-name="STIF UI" level="generic">
-<component name="stifui_stifui" filter="s60" long-name="STIF UI" purpose="development">
-<unit bldFile="app/rndtools/stifui/stifui/group"/>
-</component>
-<component name="uitestserverstarter" filter="s60" long-name="UI Test Server Starter" purpose="development">
-<unit bldFile="app/rndtools/stifui/uitestserverstarter/group"/>
-</component>
-<component name="stifui_build" filter="s60" long-name="STIF UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/stifui/group"/>
-</component>
-</collection>
-<collection name="memspyui" long-name="Memspy UI" level="generic">
-<!-- collection is really a component. Should move down a directory -->
-<component name="memspyui_build" filter="s60" long-name="Memspy UI Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/memspyui/group"/>
-</component>
-</collection>
-<collection name="htiui" long-name="Harmonized Test Interface UI" level="generic">
-<component name="HtiCommPlugins" filter="s60" long-name="HTI Comm Plugins" purpose="development" plugin="Y">
-<unit bldFile="app/rndtools/htiui/HtiCommPlugins/HtiBtCommPlugin/group"/>
-</component>
-<component name="HtiServicePlugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- can only have a single unit. Should #include from a common bld.inf file -->
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiFtpBackupFake/group"/>
-</component>
-<component name="htidevicereboot" filter="s60" long-name="HTI Device Reboot" purpose="development">
-<unit bldFile="app/rndtools/htiui/htidevicereboot/group"/>
-</component>
-<component name="htistartupwait" filter="s60" long-name="HTI Startup Wait" purpose="development">
-<unit bldFile="app/rndtools/htiui/htistartupwait/group"/>
-</component>
-<component name="htiadmin" filter="s60" long-name="HTI Admin" purpose="development">
-<unit bldFile="app/rndtools/htiui/htiadmin/group"/>
-</component>
-<component name="htiui_build" filter="s60" long-name="HTI UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/htiui/group"/>
-</component>
-</collection>
-</block>
-<block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools if ui">
-<collection name="csxhelp" long-name="Context Sensitive Extended Help" level="if">
-<!-- this is really a component. Should move it down a directory -->
-<component name="csxhelp_build" filter="s60" long-name="Context Sensitive Extended Help Build">
-<unit bldFile="app/helps/csxhelp/group"/>
-</component>
-</collection>
-<collection name="symhelp" long-name="Symbian Help" level="eng">
-<component name="helpmodel" long-name="Help" introduced="6.0" purpose="optional">
-<unit bldFile="app/helps/symhelp/helpmodel/group" mrp="app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
-</component>
-</collection>
-<collection name="helps_info" long-name="Help Apps Info" level="ui">
-<component name="helps_metadata" long-name="Help Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/helps/helps_info/helps_metadata/helps_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
-<collection name="buildverification" long-name="Build Verification" level="services">
-<component name="autosmoketest" long-name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
-<unit bldFile="app/techview/buildverification/autosmoketest/Group" mrp="app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
-</component>
-<component name="smoketest" long-name="Smoke Test" filter="gt" purpose="development">
-<unit bldFile="app/techview/buildverification/smoketest/Group" mrp="app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
-</component>
-</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="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"/>
-<collection name="installationapps" long-name="Installation Apps" level="apps2"/>
-<collection name="messagingapps" long-name="Messaging Apps" level="apps2"/>
-<collection name="telephonyapps" long-name="Telephony Apps" level="apps1"/>
-<collection name="networkingapps" long-name="Networking Apps" level="apps1"/>
-<collection name="networkingutils" long-name="Networking Utils" level="utils"/>
-<collection name="shortlinkapps" long-name="Shortlink Apps" level="apps1"/>
-<collection name="testapps" long-name="Test Apps" level="utils"/>
-<collection name="avapps" long-name="A/V Apps" level="apps3"/>
-<collection name="toolkit" long-name="Toolkit" level="utils"/>
-<collection name="techview_info" long-name="Techview Info" level="apps3">
-<component name="techview_metadata" long-name="Techview Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/techview/techview_info/techview_metadata/techview_metadata.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
--- a/symbian3/single/sysdefs/auto/model_20100504114725_4d3b366e82ed.xml Wed May 05 12:21:47 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10829 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a package or prebuilt -->
-<!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) "N"
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile may someday be removed in favour of mrp -->
-<!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
-<systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="low mw high">
-<block name="stubs" level="high" long-name="Stubs" levels="stub">
-<collection name="s60_stubs" level="stub">
-<component name="audiostubs" long-name="Audio Stubs">
-<unit bldFile="adaptation/stubs/audiostubs/group"/>
-</component>
-<component name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaptation Stub">
-<unit bldFile="adaptation/stubs/btaudioadaptation_stub/group"/>
-</component>
-<component name="drm_stubs" long-name="DRM Stubs">
-<unit bldFile="adaptation/stubs/drm_stubs/group"/>
-</component>
-<component name="ocrsrv_stub" long-name="OCR Services Stub">
-<unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
-</component>
-<component name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation">
-<unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
-</component>
-<component name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" plugin="Y">
-<unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
-</component>
-<component name="srsfenginestub" long-name="SRSF Engine Stub">
-<unit bldFile="adaptation/stubs/srsfenginestub/group"/>
-</component>
-<component name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub">
-<unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
-</component>
-<component name="systemswstubs" long-name="System Software Stubs">
-<unit bldFile="adaptation/stubs/systemswstubs/group"/>
-</component>
-<component name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" plugin="Y">
-<unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
-</component>
-<component name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub">
-<unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
-<collection name="omap3530" long-name="OMAP 3530" level="hw-if">
-<component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530" mrp="adaptation/beagleboard/omap3530/base_beagle.mrp"/>
-</component>
-<component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/kernel"/>
-</component>
-<component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/beagleboard"/>
-</component>
-</collection>
-</block>
-<block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
-<collection name="qemu_baseport" long-name="Baseport" level="hw-if">
-<component name="syborg" long-name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/qemu/baseport/syborg" mrp="adaptation/qemu/baseport/syborg/syborg.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
-<collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
-<component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
-<unit mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
-</component>
-</collection>
-<collection name="bsptemplate" long-name="Board Support Package Template" level="hw-if">
-<component name="asspandvariant" long-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 name="kernel" long-name="Kernel Architecture" level="adaptation">
-<component name="eka" long-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 name="kerneltest" long-name="Kernel Test" level="hw-if">
-<component name="e32utils" long-name="E32 Utilities" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32utils/group" mrp="os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/>
-</component>
-<component name="e32test" long-name="E32 Tests" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32test/group" mrp="os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
-</component>
-<component name="f32test" long-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 name="ldds" long-name="Logical Device Drivers" level="adaptation">
-<component name="ethernetldd" long-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 name="audioldd" long-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>
-<component name="serialldd" long-name="Serial Port Drivers" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
-</component>
-<component name="legacydrivers" long-name="Legacy Drivers" purpose="optional">
-<unit mrp="os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
-</component>
-<component name="locmedia" long-name="Local Media Subsystem" introduced="8.1b" purpose="mandatory">
-<!-- these are LDDs for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
-</component>
-<component name="runmodedebugger" long-name="Run Mode Debugger" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/debug/group" mrp="os/kernelhwsrv/kernel/eka/drivers/debug/group/base_e32_drivers_debug.mrp"/>
-</component>
-<component name="btrace" long-name="Kernel Trace Tool" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/trace" mrp="os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
-</component>
-<component name="cameraldd" long-name="Camera Drivers" introduced="^3" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/camerasc" mrp="os/kernelhwsrv/kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
-</component>
-<component name="displayldd" long-name="Display Drivers" introduced="^3" purpose="optional">
-<!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/display" mrp="os/kernelhwsrv/kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
-</component>
-<component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
-</component>
-</collection>
-<collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
-<component name="mediadrivers" long-name="Media Drivers" purpose="optional">
-<!-- these are for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/media" mrp="os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
-</component>
-<component name="genericboardsupport" long-name="Generic Board Support" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
-</component>
-</collection>
-<collection name="userlibandfileserver" long-name="User Library and File Server" level="framework">
-<component name="euser" long-name="User Library" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/euser" mrp="os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
-</component>
-<component name="compsupp" long-name="Compiler Runtime Support" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/compsupp" mrp="os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
-</component>
-<component name="fileserver" long-name="File Server" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
-</component>
-<component name="estart" long-name="Base Starter" filter="gt" purpose="optional">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
-</component>
-<component name="domainmgr" long-name="Domain Manager" introduced="8.1b" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
-</component>
-</collection>
-<collection name="filesystems" long-name="File Systems" level="framework">
-<component name="romfs" long-name="ROM File System" filter="gt" purpose="optional" plugin="Y">
-<unit mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
-</component>
-<component name="rofs" long-name="ROFS" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
-</component>
-<component name="usbmsfs" long-name="USB Mass Storage File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
-</component>
-<component name="usbhostmssrv" long-name="USB Host Mass Storage Server" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage/base_f32_shostmassstorage.mrp"/>
-</component>
-<component name="fat32fs" long-name="FAT32 File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
-</component>
-<component name="fatfs" long-name="FAT File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
-</component>
-<component name="compfs" long-name="Composite File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
-</component>
-</collection>
-<collection name="halservices" long-name="HAL Services" level="framework">
-<component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
-<unit bldFile="os/kernelhwsrv/halservices/hal" mrp="os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
-</component>
-</collection>
-<collection name="textmodeshell" long-name="Text Mode Shell" level="test">
-<component name="e32wsrv" long-name="Text Window Server" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/ewsrv" mrp="os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
-</component>
-<component name="textshell" long-name="Text Shell" filter="gt" purpose="development">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
-</component>
-</collection>
-<collection name="baseapitest" long-name="Base API Tests" level="test"/>
-<collection name="kernelhwsrv_info" long-name="Kernel and Hardware Services Info" level="test">
-<component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 config">
-<collection name="emulator" long-name="Emulator" level="bsp">
-<component name="emulatorbsp" long-name="Emulator BSP" purpose="optional">
-<unit bldFile="os/boardsupport/emulator/emulatorbsp" mrp="os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
-</component>
-</collection>
-<collection name="haitest" long-name="HAI Test Suites" level="test">
-<component name="bspsvs" long-name="BSP Verification Suite" introduced="^2" purpose="development">
-<unit mrp="os/boardsupport/haitest/bspsvs/group/bspsvs.mrp"/>
-</component>
-</collection>
-<collection name="boardsupport_info" long-name="Board Support Info" level="config">
-<component name="boardsupport_metadata" long-name="Board Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/boardsupport/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
-<collection name="bldsystemtools" long-name="Build System Tools" level="bld">
-<component name="sysdeftools" long-name="System Definition Tools" purpose="development" introduced="^2">
-<unit mrp="os/buildtools/bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
-</component>
-<component name="commonbldutils" long-name="Common Utils" purpose="development">
-<unit mrp="os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
-</component>
-</collection>
-<collection name="toolsandutils" long-name="Tools and Utils" level="mw">
-<component name="productionbldtools" long-name="Production Build Tools" filter="gt" purpose="development">
-<unit mrp="os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
-</component>
-<component name="e32tools" long-name="E32 Tools" deprecated="^2" purpose="development" class="PC">
-<unit bldFile="os/buildtools/toolsandutils/e32tools/group" mrp="os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
-</component>
-<component name="autotest" long-name="Autotest" purpose="development">
-<unit bldFile="os/buildtools/toolsandutils/autotest/group" mrp="os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
-</component>
-</collection>
-<collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
-<component name="e32toolp" long-name="E32 Perl Tools" purpose="development" filter="sf_build" class="PC">
-<unit mrp="os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="os/buildtools/sbsv1_os/e32toolp/group"/>
-</component>
-</collection>
-<collection name="imgtools_os" long-name="Image Tools" level="fw">
-<component name="romkiteka2" long-name="ROMKIT EKA2" deprecated="^2" purpose="development">
-<unit bldFile="os/buildtools/imgtools_os/romkiteka2/group" mrp="os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
-</component>
-</collection>
-<collection name="misccomponents" long-name="Misc Components" level="mw">
-<component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt" purpose="development">
-<unit bldFile="os/buildtools/misccomponents/emulatorlauncher/group" mrp="os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
-</component>
-</collection>
-<collection name="buildtools_info" long-name="Build Tools Info" level="ui">
-<component name="buildtools_metadata" long-name="Build Tools Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/buildtools/buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
-<collection name="ossrv_pub" long-name="Generic OS Services Public Interfaces" level="utilities">
-<component name="boost_apis" long-name="Boost APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/boost_apis/group"/>
-</component>
-<component name="cpp_wrappers" long-name="Cpp wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cpp_wrappers/group"/>
-</component>
-<component name="character_type_apis" long-name="Character Type APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/character_type_apis/group"/>
-</component>
-<component name="compiler_specific_runtime_support" long-name="Compiler Specific Runtime Support" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/compiler_specific_runtime_support/group"/>
-</component>
-<component name="ossrv_configuration_api" long-name="Generic OS Services Configuration API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/configuration/group"/>
-</component>
-<component name="crypto_authentication_codes_and_hash_functions_api" long-name="Crypto Authentication Codes and Hash Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
-</component>
-<component name="crypto_auxillary_functions_api" long-name="Crypto Auxillary Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_auxillary_functions_api/group"/>
-</component>
-<component name="crypto_certificates_api" long-name="Crypto Certificates API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_certificates_api/group"/>
-</component>
-<component name="crypto_inputoutput_and_data_encoding_api" long-name="Crypto Input/Output and Data Encoding API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
-</component>
-<component name="crypto_public_key_cryptography_and_key_agreement_api" long-name="Crypto Public Key Cryptography and Key Agreement API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
-</component>
-<component name="crypto_symmetric_ciphers_api" long-name="Crypto Symmetric Ciphers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_symmetric_ciphers_api/group"/>
-</component>
-<component name="crypto_utility_functions_api" long-name="Crypto Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_utility_functions_api/group"/>
-</component>
-<component name="cryptogaphy_related_api" long-name="Cryptogaphy Related API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cryptogaphy_related_api/group"/>
-</component>
-<component name="ossrv_debug_api" long-name="Generic OS Services Debug API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/debug/group"/>
-</component>
-<component name="ossrv_exceptions_api" long-name="Generic OS Services Exceptions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/exceptions/group"/>
-</component>
-<component name="gboxed" long-name="GBoxed API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gboxed/group"/>
-</component>
-<component name="glib_arrays" long-name="Glib Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_arrays/group"/>
-</component>
-<component name="glib_asynchronous_queues" long-name="Glib Asynchronous Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_asynchronous_queues/group"/>
-</component>
-<component name="glib_atomic_operations" long-name="Glib Atomic Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_atomic_operations/group"/>
-</component>
-<component name="glib_automatic_string_completion" long-name="Glib Automatic String Completion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_automatic_string_completion/group"/>
-</component>
-<component name="glib_balanced_binary_trees" long-name="Glib Balanced Binary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_balanced_binary_trees/group"/>
-</component>
-<component name="glib_basic_types" long-name="Glib Basic Types API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_basic_types/group"/>
-</component>
-<component name="glib_caches" long-name="Glib Caches API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_caches/group"/>
-</component>
-<component name="glib_character_set_conversion" long-name="Glib Character Set Conversion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_character_set_conversion/group"/>
-</component>
-<component name="glib_closures" long-name="Glib Closures API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_closures/group"/>
-</component>
-<component name="glib_commandline_option_parser" long-name="Glib Command Line Option Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_commandline_option_parser/group"/>
-</component>
-<component name="glib_datasets" long-name="Glib Datasets API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_datasets/group"/>
-</component>
-<component name="glib_date_and_time_functions" long-name="Glib Date and Time Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_date_and_time_functions/group"/>
-</component>
-<component name="glib_doubleended_queues" long-name="Glib Double-ended Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doubleended_queues/group"/>
-</component>
-<component name="glib_doublylinked_lists" long-name="Glib Doubly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doublylinked_lists/group"/>
-</component>
-<component name="glib_dynamic_loading_of_modules" long-name="Glib Dynamic Loading of Modules API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_dynamic_loading_of_modules/group"/>
-</component>
-<component name="glib_enums_and_flags" long-name="Glib Enums and Flags API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_enums_and_flags/group"/>
-</component>
-<component name="glib_error_reporting" long-name="Glib Error Reporting API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_error_reporting/group"/>
-</component>
-<component name="glib_file_utilities" long-name="Glib File Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_file_utilities/group"/>
-</component>
-<component name="glib_generic_values" long-name="Glib Generic Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_generic_values/group"/>
-</component>
-<component name="glib_globstyle_pattern_matching" long-name="Glib Glob-Style Pattern Matching API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_globstyle_pattern_matching/group"/>
-</component>
-<component name="glib_hash_tables" long-name="Glib Hash Tables API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hash_tables/group"/>
-</component>
-<component name="glib_hook_functions" long-name="Glib Hook Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hook_functions/group"/>
-</component>
-<component name="glib_internationalization" long-name="Glib Internationalization API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_internationalization/group"/>
-</component>
-<component name="glib_io_channels" long-name="Glib I/O Channels API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_io_channels/group"/>
-</component>
-<component name="glib_keyvalue_file_parser" long-name="Glib Key-Value File Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_keyvalue_file_parser/group"/>
-</component>
-<component name="glib_lexical_scanner" long-name="Glib Lexical Scanner API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_lexical_scanner/group"/>
-</component>
-<component name="glib_main_event_loop" long-name="Glib Main Event Loop API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_main_event_loop/group"/>
-</component>
-<component name="glib_memory_allocation" long-name="Glib Memory Allocation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_allocation/group"/>
-</component>
-<component name="glib_memory_slices" long-name="Glib Memory Slices API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_slices/group"/>
-</component>
-<component name="glib_message_logging" long-name="Glib Message Logging API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_message_logging/group"/>
-</component>
-<component name="glib_miscellaneous_utility_functions" long-name="Glib Miscellaneous Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_miscellaneous_utility_functions/group"/>
-</component>
-<component name="glib_nary_trees" long-name="Glib N-ary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_nary_trees/group"/>
-</component>
-<component name="glib_parameters_and_values" long-name="Glib Parameters and Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_parameters_and_values/group"/>
-</component>
-<component name="glib_quarks" long-name="Glib Quarks API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_quarks/group"/>
-</component>
-<component name="glib_random_numbers" long-name="Glib Random Numbers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_random_numbers/group"/>
-</component>
-<component name="glib_relations_and_tuples" long-name="Glib Relations and Tuples API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_relations_and_tuples/group"/>
-</component>
-<component name="glib_shellrelated_utilities" long-name="Glib Shell-related Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_shellrelated_utilities/group"/>
-</component>
-<component name="glib_signals" long-name="Glib Signals API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_signals/group"/>
-</component>
-<component name="glib_simple_xml_subset_parser" long-name="Glib Simple XML Subset Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_simple_xml_subset_parser/group"/>
-</component>
-<component name="glib_singlylinked_lists" long-name="Glib Singly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_singlylinked_lists/group"/>
-</component>
-<component name="glib_spawning_processes" long-name="Glib Spawning Processes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_spawning_processes/group"/>
-</component>
-<component name="glib_standard_macros" long-name="Glib Standard Macros API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_standard_macros/group"/>
-</component>
-<component name="glib_string_utility_functions" long-name="Glib String Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_string_utility_functions/group"/>
-</component>
-<component name="glib_strings" long-name="Glib Strings API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_strings/group"/>
-</component>
-<component name="glib_thread_pools" long-name="Glib Thread Pools API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_thread_pools/group"/>
-</component>
-<component name="glib_threads" long-name="Glib Threads API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_threads/group"/>
-</component>
-<component name="glib_timers" long-name="Glib Timers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_timers/group"/>
-</component>
-<component name="glib_unicode_manipulation" long-name="Glib Unicode Manipulation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_unicode_manipulation/group"/>
-</component>
-<component name="glib_value_arrays" long-name="Glib Value Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_value_arrays/group"/>
-</component>
-<component name="glib_varargs_value_collection" long-name="Glib Varargs Value Collection API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_varargs_value_collection/group"/>
-</component>
-<component name="gobject" long-name="GObject API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gobject/group"/>
-</component>
-<component name="gparamspec" long-name="GParamSpec API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gparamspec/group"/>
-</component>
-<component name="gtype" long-name="GType API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtype/group"/>
-</component>
-<component name="gtypemodule" long-name="GTypeModule API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypemodule/group"/>
-</component>
-<component name="gtypeplugin" long-name="GTypePlugin API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypeplugin/group"/>
-</component>
-<component name="io_stream_api" long-name="I/O stream API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/io_stream_api/group"/>
-</component>
-<component name="localization_function_api" long-name="Localization Function API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/localization_function_api/group"/>
-</component>
-<component name="math_operations_api" long-name="Math Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/math_operations_api/group"/>
-</component>
-<component name="ossrv_memory_api" long-name="Generic OS Services Memory API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/memory/group"/>
-</component>
-<component name="no_namespace_headers" long-name="No Namespace Headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/no_namespace_headers/group"/>
-</component>
-<component name="openc_headers" long-name="OpenC headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_headers/group"/>
-</component>
-<component name="openc_wrappers" long-name="OpenC wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_wrappers/group"/>
-</component>
-<component name="ssl_general_api" long-name="SSL General API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_general_api/group"/>
-</component>
-<component name="ssl_protocol_methods_api" long-name="SSL Protocol Methods API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_protocol_methods_api/group"/>
-</component>
-<component name="standard_compressiondecompression_api" long-name="Standard Compression/Decompression API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/standard_compressiondecompression_api/group"/>
-</component>
-<component name="stl" long-name="STL API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/stl/group"/>
-</component>
-<component name="thread_api" long-name="Thread API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/thread_api/group"/>
-</component>
-<component name="type_attributes" long-name="Type Attributes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/type_attributes/group"/>
-</component>
-<component name="typeinfo" long-name="Type Info API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/typeinfo/group"/>
-</component>
-<component name="utility_apis" long-name="Utility APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/utility_apis/group"/>
-</component>
-<component name="wide_character_classapis" long-name="Wide character class/apis" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/wide_character_classapis/group"/>
-</component>
-<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">
-<unit bldFile="os/ossrv/ossrv_pub/dbus-glib/group"/>
-</component>
-</collection>
-<collection name="ossrv_plat" long-name="Generic OS Services Platform Interfaces" level="utilities">
-<component name="libutils_apis" long-name="Utility Library APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_plat/libutils/group"/>
-</component>
-</collection>
-<collection name="stdlibs" long-name="Standard Libraries" level="translation">
-<component name="libz" filter="s60" long-name="Z Compression Library">
-<unit bldFile="os/ossrv/stdlibs/libz/group"/>
-</component>
-<component name="libcrypt" filter="s60" long-name="Crypt Library">
-<unit bldFile="os/ossrv/stdlibs/libcrypt/group"/>
-</component>
-</collection>
-<collection name="ssl" long-name="SSL" level="data-services">
-<component name="libcrypto" filter="s60" long-name="Crypto Library">
-<unit bldFile="os/ossrv/ssl/libcrypto/group"/>
-</component>
-<component name="libssl" filter="s60" purpose="development" long-name="SSL Library">
-<unit bldFile="os/ossrv/ssl/libssl/group"/>
-</component>
-</collection>
-<collection name="glib" long-name="GLib" level="utilities">
-<component name="glibbackend" filter="s60" long-name="GLib Backend">
-<unit bldFile="os/ossrv/glib/glibbackend/group"/>
-</component>
-<component name="libglib" filter="s60" long-name="GLib Library">
-<unit bldFile="os/ossrv/glib/libglib/group"/>
-</component>
-<component name="libgthread" filter="s60" long-name="Libg Thread">
-<unit bldFile="os/ossrv/glib/libgthread/group"/>
-</component>
-<component name="libgmodule" filter="s60" long-name="Libg Module">
-<unit bldFile="os/ossrv/glib/libgmodule/group"/>
-</component>
-<component name="libgobject" filter="s60" long-name="Libg Object">
-<unit bldFile="os/ossrv/glib/libgobject/group"/>
-</component>
-</collection>
-<collection name="stdcpp" long-name="C++ Standard Library" level="translation">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="stdcpp_build" filter="s60" long-name="Stdcpp">
-<unit bldFile="os/ossrv/stdcpp/group"/>
-</component>
-</collection>
-<collection name="ofdbus" long-name="Open Foundation D-Bus" level="utilities">
-<component name="dbus" filter="s60" long-name="D-Bus">
-<unit bldFile="os/ossrv/ofdbus/dbus/group"/>
-</component>
-<component name="dbus-glib" filter="s60" long-name="D-Bus GLib">
-<unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
-</component>
-<component name="ofdbus_rom" filter="s60" long-name="D-Bus ROM">
-<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory
- Consider moving IBY file to one of the above as well and removing this component entirely -->
-<unit bldFile="os/ossrv/ofdbus/group"/>
-</component>
-</collection>
-<collection name="utilitylibraries" long-name="Utility Libraries" level="encoding">
-<component name="libutils" filter="s60" long-name="Utility Library">
-<unit bldFile="os/ossrv/utilitylibraries/libutils/group"/>
-</component>
-</collection>
-<collection name="genericservices" long-name="Generic Services" level="utilities">
-<component name="s60compatibilityheaders" long-name="S60 Compatibility Headers" filter="gt" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp" version="tb101sf"/>
-</component>
-<component name="mimerecognitionfw" long-name="MIME Recognition Framework" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/mimerecognitionfw/group" mrp="os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
-</component>
-<component name="systemagent" long-name="System Agent" introduced="9.0" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/systemagent/group" mrp="os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
-</component>
-<component name="taskscheduler" long-name="Task Scheduler" introduced="6.0" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/taskscheduler/group" mrp="os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
-</component>
-<component name="activebackupclient" long-name="Active Backup Client" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/activebackupclient/group" mrp="os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
-</component>
-<component name="syslibsdocs" long-name="Syslibs Documentation" purpose="development" class="doc">
-<unit mrp="os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
-</component>
-<component name="httputils" long-name="HTTP Utilities Library" introduced="6.2" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/httputils/group" mrp="os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
-</component>
-</collection>
-<collection name="syslibsapitest" long-name="SysLibs API Tests" level="utilities"/>
-<collection name="compressionlibs" long-name="Compression Libraries" level="data-services">
-<component name="ziplib" long-name="Zip Compression Library" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/ossrv/compressionlibs/ziplib/group" mrp="os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
-</component>
-</collection>
-<collection name="genericopenlibs" long-name="Generic Open Libraries" level="translation">
-<component name="cstdlib" long-name="C Standard Library" introduced="ER5" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/cstdlib/group" mrp="os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
-</component>
-<component name="cppstdlib" long-name="C++ Standard Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/cppstdlib/group" mrp="os/ossrv/genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
-</component>
-<component name="openenvcore" long-name="Open Environment Core" introduced="^2" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/openenvcore/group" mrp="os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
-</component>
-<component name="posixrealtimeextensions" long-name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/posixrealtimeextensions/group" mrp="os/ossrv/genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
-</component>
-</collection>
-<collection name="lowlevellibsandfws" long-name="Low Level Libraries and Frameworks" level="app-libs">
-<component name="pluginfw" long-name="Plugin Framework" introduced="6.2" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp" version="3"/>
-</component>
-<component name="apputils" long-name="Application Utilities" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/apputils/group" mrp="os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
-</component>
-<component name="genericusabilitylib" long-name="Generic Usability Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/genericusabilitylib/group" mrp="os/ossrv/lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
-</component>
-</collection>
-<collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
-<component name="ossrv_build" filter="s60" long-name="Generic OS Services Build">
-<!-- exports should be moved to individual components -->
-<unit bldFile="os/ossrv/group"/>
-</component>
-<component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="featuremgmt" long-name="Feature Management" level="framework">
-<component name="featuremgr" long-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 name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/persistentdata/featuremgmt/featureregistry/group" mrp="os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
-</component>
-</collection>
-<collection name="loggingservices" long-name="Logging Services" level="server">
-<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">
-<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">
-<unit bldFile="os/persistentdata/loggingservices/rfilelogger/group" mrp="os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
-</component>
-</collection>
-<collection name="traceservices" long-name="Trace Services" level="server">
-<component name="commsdebugutility" long-name="Comms Debug Utility" introduced="7.0s" purpose="optional">
-<unit bldFile="os/persistentdata/traceservices/commsdebugutility/group" mrp="os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
-</component>
-<component name="tracefw" long-name="Trace Framework" introduced="9.2" purpose="development">
-<unit bldFile="os/persistentdata/traceservices/tracefw/ulogger/group" mrp="os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
-</component>
-</collection>
-<collection name="persistentstorage" long-name="Persistent Storage" level="framework">
-<component name="store" long-name="Store" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/store/group" mrp="os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
-</component>
-<component name="dbms" long-name="DBMS" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/dbms/group" mrp="os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
-</component>
-<component name="centralrepository" long-name="Central Repository" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/persistentdata/persistentstorage/centralrepository/group" mrp="os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
-</component>
-<component name="sql" long-name="SQL" introduced="9.3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sql/GROUP" mrp="os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
-</component>
-<component name="sqlite3api" long-name="SQLite 3 API" introduced="^3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sqlite3api/GROUP" mrp="os/persistentdata/persistentstorage/sqlite3api/GROUP/syslibs_sqlite3.mrp"/>
-</component>
-</collection>
-<collection name="persistentdata_info" long-name="Persistent Data Services Info" level="app-if">
-<component name="persistentdata_metadata" long-name="Persistent Data Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/persistentdata/persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
-<component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
-</component>
-<component name="common_platform_security_definitions_api" long-name="Common Platform Security Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group"/>
-</component>
-<component name="feature_discovery_api" long-name="Feature Discovery API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/group"/>
-</component>
-<component name="platform_environment_api" long-name="Platform Environment API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_environment_api/group"/>
-</component>
-<component name="sensor_channel_api" long-name="Sensor Channel API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_channel_api/group"/>
-</component>
-<component name="sensor_definitions_api" long-name="Sensor Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_definitions_api/group"/>
-</component>
-<component name="version_info_api" long-name="Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/group"/>
-</component>
-<component name="accessory_monitoring_api" long-name="Accessory Monitoring API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/group"/>
-</component>
-<component name="haptics_api" long-name="Haptics API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/haptics_api/group"/>
-</component>
-<component name="sensor_data_compensator_api" long-name="Sensor Data Compensator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
-</component>
-</collection>
-<collection name="devicesrv_plat" long-name="Device Services Platform Interfaces" level="app-if">
-<component name="configuration_file_parser_api" long-name="Configuration File Parser API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/configuration_file_parser_api/group"/>
-</component>
-<component name="dos_extension_plugin_api" long-name="DOS Extension Plug-In API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_plugin_api/group"/>
-</component>
-<component name="mediator_command_initiator_api" long-name="Mediator Command Initiator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_initiator_api/group"/>
-</component>
-<component name="syslangutil_api" long-name="SysLangUtil API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/syslangutil_api/group"/>
-</component>
-<component name="wakeup_alarm_api" long-name="Wakeup Alarm API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/wakeup_alarm_api/group"/>
-</component>
-<component name="disk_and_memory_level_keys_api" long-name="Disk and Memory Level Keys API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_and_memory_level_keys_api/group"/>
-</component>
-<component name="mediator_plugin_api" long-name="Mediator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_plugin_api/group"/>
-</component>
-<component name="headset_status_api" long-name="Headset Status API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/headset_status_api/group"/>
-</component>
-<component name="system_startup_extension_plugin_api" long-name="System Startup Extension Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/system_startup_extension_plugin_api/group"/>
-</component>
-<component name="sensor_plugin_api" long-name="Sensor Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_plugin_api/group"/>
-</component>
-<component name="accessory_api" long-name="Accessory API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_api/group"/>
-</component>
-<component name="display_language_definition_api" long-name="Display Language Definition API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/display_language_definition_api/group"/>
-</component>
-<component name="mediator_command_responder_api" long-name="Mediator Command Responder API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_responder_api/group"/>
-</component>
-<component name="accessory_policy_definitions_api" long-name="Accessory Policy Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_definitions_api/group"/>
-</component>
-<component name="hw_settings_api" long-name="Hardware Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/hw_settings_api/group"/>
-</component>
-<component name="mediator_domain_definitions_api" long-name="Mediator Domain Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_domain_definitions_api/group"/>
-</component>
-<component name="sensor_extension_api" long-name="Sensor Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_extension_api/group"/>
-</component>
-<component name="accessory_plugin_api" long-name="Accessory Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_plugin_api/group"/>
-</component>
-<component name="sae_api" long-name="SAE API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sae_api/group"/>
-</component>
-<component name="accessory_control_api" long-name="Accessory Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_control_api/group"/>
-</component>
-<component name="mediator_static_registration_api" long-name="Mediator Static Registration API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_static_registration_api/group"/>
-</component>
-<component name="accessory_key_event_handling_api" long-name="Accessory Key Event Handling API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_key_event_handling_api/group"/>
-</component>
-<component name="mediator_notification_api" long-name="Mediator Notification API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_notification_api/group"/>
-</component>
-<component name="accessory_policy_utility_api" long-name="Accessory Policy Utility API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_utility_api/group"/>
-</component>
-<component name="common_dsy_plugin_api" long-name="Common DSY Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/common_dsy_plugin_api/group"/>
-</component>
-<component name="remote_control_extension_api" long-name="Remote Control Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/remote_control_extension_api/group"/>
-</component>
-<component name="sensor_channel_filter_api" long-name="Sensor Channel Filter API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_channel_filter_api/group"/>
-</component>
-<component name="dos_extension_api" long-name="DOS Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_api/group"/>
-</component>
-<component name="accessory_audio_control_api" long-name="Accessory Audio Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_audio_control_api/group"/>
-</component>
-<component name="mediator_event_consumer_api" long-name="Mediator Event Consumer API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_consumer_api/group"/>
-</component>
-<component name="shared_data_api" long-name="Shared Data API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/shared_data_api/group"/>
-</component>
-<component name="accessory_settings_api" long-name="Accessory Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_settings_api/group"/>
-</component>
-<component name="accessory_bluetooth_control_api" long-name="Accessory Bluetooth Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_bluetooth_control_api/group"/>
-</component>
-<component name="extended_version_info_api" long-name="Extended Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_api/group"/>
-</component>
-<component name="mediator_event_provider_api" long-name="Mediator Event Provider API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_provider_api/group"/>
-</component>
-<component name="tv_out_config_api" long-name="TV Out Config API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_config_api/group"/>
-</component>
-<component name="tspclientmapper_api" long-name="TSP Client Mapper API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tspclientmapper_api/group"/>
-</component>
-<component name="powersave_api" long-name="Power Save API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_api/group"/>
-</component>
-<component name="powersave_definitions_api" long-name="Power Save Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_definitions_api/group"/>
-</component>
-<component name="powersave_plugin_api" long-name="Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_plugin_api/group"/>
-</component>
-<component name="extended_version_info_plugin_api" long-name="Extended Version Info Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_plugin_api/group"/>
-</component>
-<component name="haptics_plugin_api" long-name="Haptics Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_plugin_api/group"/>
-</component>
-<component name="haptics_effect_data_getter_plugin_api" long-name="Haptics Effect Data Getter Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
-</component>
-<component name="haptics_packetizer_plugin_api" long-name="Haptics Packetizer Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_packetizer_plugin_api/group"/>
-</component>
-<component name="tiltcompensation_api" long-name="Tilt Compensation API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tiltcompensation_api/group"/>
-</component>
-<component name="disk_notification_handler_api" long-name="Disk Notification Handler API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_notification_handler_api/group"/>
-</component>
-<component name="accessory_policy_usb_audio_api" long-name="Accessory Policy USB Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_usb_audio_api/group"/>
-</component>
-<component name="accessory_policy_hdmi_audio_api" long-name="Accessory Policy HDMI Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_hdmi_audio_api/group"/>
-</component>
-<component name="sensor_data_compensator_plugin_api" long-name="Sensor Data Compensator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
-</component>
-<component name="ddc_access_api" long-name="DDC Access API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/ddc_access_api/group"/>
-</component>
-<component name="tv_out_behaviour_api" long-name="TV Out Behaviour API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_behaviour_api/group"/>
-</component>
-</collection>
-<collection name="accessoryservices" long-name="Accessory Services" level="framework">
-<component name="accessorymonitor" filter="s60" long-name="Accessory Monitor">
-<unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/group"/>
-</component>
-<component name="accessoryremotecontrol" filter="s60" long-name="Accessory Remote Control">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
-</component>
-<component name="accessoryserver" filter="s60" long-name="Accessory Server">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryserver/group"/>
-</component>
-<component name="pluggeddisplay" filter="s60" long-name="Plugged Display" introduced="^3">
-<unit bldFile="os/devicesrv/accessoryservices/pluggeddisplay/group"/>
-</component>
-<component name="headsetstatusapi" filter="s60" long-name="Headset Status API">
-<unit bldFile="os/devicesrv/accessoryservices/headsetstatusapi/group"/>
-</component>
-<component name="tspclientmapper" filter="s60" long-name="TSP Client Mapper">
-<unit bldFile="os/devicesrv/accessoryservices/tspclientmapper/group"/>
-</component>
-<component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional">
-<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
-</component>
-<component name="gid_pc_tool" filter="s60" long-name="Generic ID PC Tool" class="tool PC">
-<unit bldFile="os/devicesrv/accessoryservices/gid_pc_tool/group"/>
-</component>
-</collection>
-<collection name="commonservices" long-name="Common Services" level="app-if">
-<component name="commonengine" filter="s60" long-name="Common Engine">
-<unit bldFile="os/devicesrv/commonservices/commonengine/group"/>
-</component>
-<component name="commonengineresources" filter="s60" long-name="Common Engine Resources" class="config">
-<unit bldFile="os/devicesrv/commonservices/commonengineresources/group"/>
-</component>
-<component name="platformenv" filter="s60" long-name="Platform Environment">
-<unit bldFile="os/devicesrv/commonservices/platformenv/group"/>
-</component>
-<component name="sysutil" long-name="System Utilities" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/sysutil/group" mrp="os/devicesrv/commonservices/sysutil/group/sysutil.mrp"/>
-</component>
-<component name="activitymanager" long-name="Activity Manager" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/activitymanager/group" mrp="os/devicesrv/commonservices/activitymanager/group/activitymanager.mrp"/>
-</component>
-</collection>
-<collection name="dosservices" long-name="Domestic Operating System Services" level="hw-if">
-<component name="commondsy" filter="s60" long-name="Common DSY" plugin="Y">
-<unit bldFile="os/devicesrv/dosservices/commondsy/group"/>
-</component>
-<component name="dosserver" filter="s60" long-name="Domestic OS Server">
-<unit bldFile="os/devicesrv/dosservices/dosserver/group"/>
-</component>
-</collection>
-<collection name="sensorservices" long-name="Sensor Services" level="framework">
-<component name="sensorserver" filter="s60" long-name="Sensor Server">
-<unit bldFile="os/devicesrv/sensorservices/sensorserver/group"/>
-</component>
-<component name="orientationssy" filter="s60" long-name="Orientation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/orientationssy/group"/>
-</component>
-<component name="tiltcompensationssy" filter="s60" long-name="Tilt Compensation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/tiltcompensationssy/group"/>
-</component>
-<component name="sensordatacompensator" filter="s60" long-name="Sensor Data Compensator">
-<unit bldFile="os/devicesrv/sensorservices/sensordatacompensator/group"/>
-</component>
-</collection>
-<collection name="hwrmhaptics" long-name="HWRM Haptics" level="plugin">
-<component name="hapticseffectdatagetterfw" filter="s60" long-name="Haptics Effect Data Getter Framework">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
-</component>
-<component name="hapticspluginservice" filter="s60" long-name="Haptics Plugin Service">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
-</component>
-<component name="hapticspacketizer" filter="s60" long-name="Haptics Packetizer">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
-</component>
-<component name="hapticspluginmanager" filter="s60" long-name="Haptics Plugin Manager">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
-</component>
-<component name="hapticsserver" filter="s60" long-name="Haptics Server">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsserver/group"/>
-</component>
-<component name="hapticsclient" filter="s60" long-name="Haptics Client">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsclient/group"/>
-</component>
-<component name="hwrmhaptics_build" filter="s60" long-name="HWRM Haptics Build">
-<!-- move these exports into the appropriate above components and delete this component-->
-<unit bldFile="os/devicesrv/hwrmhaptics/group"/>
-</component>
-</collection>
-<collection name="mediator" long-name="Mediator" level="app-if">
-<!--collection is really a component. Move it down a directory -->
-<component name="mediator_build" filter="s60" long-name="Mediator Build">
-<unit bldFile="os/devicesrv/mediator/group"/>
-</component>
-</collection>
-<collection name="psmservices" long-name="Power Save Mode Services" level="app-if">
-<component name="psmserver" filter="s60" long-name="PSM Server">
-<unit bldFile="os/devicesrv/psmservices/psmserver/group"/>
-</component>
-</collection>
-<collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
-<component name="hwrmfmtxwatcherplugin" filter="s60" long-name="HWRM FM Transmitter Watcher Plugin" plugin="Y">
-<unit bldFile="os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
-</component>
-<component name="hwrmtargetmodifierplugin" filter="s60" long-name="HWRM Target Modifier Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build,
- may need to -->
-<!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
-</component>
-<component name="vibractrl" filter="s60" long-name="Vibra Control" deprecated="9.1">
-<unit bldFile="os/devicesrv/resourcemgmt/vibractrl/group"/>
-</component>
-<component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="^2" purpose="optional">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
-</component>
-<component name="hwresourcesmgrconfig" long-name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
-</component>
-<component name="resourcemgmt_build" filter="s60" long-name="Resource Management Build">
-<!-- Move exports to a self-contained component.
- This needs to be kept around until configuration is in place -->
-<unit bldFile="os/devicesrv/resourcemgmt/group"/>
-</component>
-<component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
-</component>
-</collection>
-<collection name="sysstatemgmt" long-name="System State Management" level="server">
-<component name="ssmmapperutility" filter="s60" long-name="SSM Mapper Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmmapperutility/group"/>
-</component>
-<component name="ssmpolicyplugins" filter="s60" long-name="SSM Policy Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmpolicyplugins/group"/>
-</component>
-<component name="ssmutilityplugins" filter="s60" long-name="SSM Utility Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmutilityplugins/group"/>
-</component>
-<component name="ssmcmdlists" filter="s60" long-name="SSM Command Lists" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcmdlists/group"/>
-</component>
-<component name="ssmcustcmds" filter="s60" long-name="SSM Custom Commands" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcustcmds/group"/>
-</component>
-<component name="syslangutil" filter="s60" long-name="System Language Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/syslangutil/group"/>
-</component>
-<component name="sysrestart" filter="s60" long-name="System Restart" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysrestart/group"/>
-</component>
-<component name="sysuiprovider" filter="s60" long-name="System UI Provider" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysuiprovider/group"/>
-</component>
-<component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/group" mrp="os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
-</component>
-<component name="systemstatemgr" long-name="System State Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
-</component>
-<component name="systemstateplugins" long-name="System State Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
-</component>
-<component name="systemstatereferenceplugins" long-name="System State Reference Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
-</component>
-</collection>
-<collection name="resourceinterfaces" long-name="Resource Interfaces" level="hw-if">
-<component name="fmtransmittercontrol" long-name="FM Transmitter Control" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group" mrp="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
-</component>
-</collection>
-<collection name="systemhealthmanagement" long-name="System Health Management" level="server">
-<component name="systemhealthmgr" long-name="System Health Manager" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
-</component>
-</collection>
-<collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if"/>
-<collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
-<component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
-<collection name="authorisation" long-name="Authorisation" level="utilities">
-<component name="userpromptservice" long-name="User Prompt Service" introduced="^3" purpose="mandatory">
-<unit bldFile="os/security/authorisation/userpromptservice/group" mrp="os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
-</component>
-<component name="userpromptutils" long-name="User Prompt Utils" introduced="^3" purpose="optional">
-<unit bldFile="os/security/authorisation/userpromptutils/group" mrp="os/security/authorisation/userpromptutils/group/security_ups_utils.mrp"/>
-</component>
-</collection>
-<collection name="contentmgmt" long-name="Content Management" level="utilities">
-<component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
-<unit bldFile="os/security/contentmgmt/contentaccessfwfordrm/group" mrp="os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
-</component>
-<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>
-</collection>
-<collection name="crypto" long-name="Crypto Libraries" level="libraries">
-<component name="weakcryptospi" long-name="Weak Crypto SPI" filter="gt" introduced="^3" purpose="optional">
-<unit bldFile="os/security/crypto/weakcryptospi/group" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
-</component>
-<component name="strongcryptospi" long-name="Strong Crypto SPI" filter="gt" introduced="^3" purpose="optional">
-<unit bldFile="os/security/crypto/weakcryptospi/strong" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
-</component>
-</collection>
-<collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
-<component name="securityutils" long-name="Security Utils" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/securityutils/group" mrp="os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
-</component>
-<component name="securitydocs" long-name="Security Documentation" purpose="development" class="doc">
-<unit mrp="os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
-</component>
-<component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
-</component>
-<component name="securitycommonutils" long-name="Security Common Utils" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/security/cryptomgmtlibs/securitycommonutils/group" mrp="os/security/cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
-</component>
-</collection>
-<collection name="securityanddataprivacytools" long-name="Security and Data Privacy Tools" level="services">
-<component name="securityconfig" long-name="Security Config" introduced="9.1" purpose="optional">
-<unit bldFile="os/security/securityanddataprivacytools/securityconfig/group" mrp="os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
-</component>
-<component name="securitytools" long-name="Security Tools" introduced="^3" purpose="optional" class="PC">
-<unit bldFile="os/security/securityanddataprivacytools/securitytools/group" mrp="os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
-</component>
-</collection>
-<collection name="cryptoplugins" long-name="Crypto Plugins" level="plugins">
-<component name="cryptospiplugins" long-name="Crypto SPI Plugins" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/security/cryptoplugins/cryptospiplugins/group" mrp="os/security/cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
-</component>
-</collection>
-<collection name="cryptoservices" long-name="Crypto Services" level="plugins">
-<component name="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/certificateandkeymgmt/group" mrp="os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
-</component>
-<component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
-</component>
-<component name="browserrootcertificates" long-name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
-<unit mrp="os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
-</component>
-<component name="rootcertificates" filter="sf_build" long-name="Root Certificates" introduced="7.0s" purpose="optional">
-<!-- not in S60 codebase -->
-<unit bldFile="os/security/cryptoservices/rootcertificates/group" mrp="os/security/cryptoservices/rootcertificates/group/rootcerts.mrp"/>
-</component>
-<component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/asnpkcs/group" mrp="os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
-</component>
-</collection>
-<collection name="security_info" long-name="OS Security Info" level="utilities">
-<component name="security_metadata" long-name="OS Security Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/security/security_info/security_metadata/security_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
-<collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
-<component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
-</component>
-<component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
-</component>
-<component name="simulationpositioningmodule" long-name="Simulation Positioning Module" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
-</component>
-<component name="gpspositioningmodule" long-name="GPS/A-GPS Positioning Module" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/gpspositioningmodule/group" mrp="os/lbs/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
-</component>
-<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>
-</collection>
-<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
-<component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
-</component>
-</collection>
-<collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
-<component name="locationserver" long-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 name="networkrequesthandler" long-name="Network Request Handler" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
-</component>
-</collection>
-<collection name="lbstest" long-name="Locating Services Tests" level="application-interface">
-<component name="locationprotocoltest" long-name="Location Protocol Tests" introduced="9.2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/lbstest/locationprotocoltest/group" mrp="os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
-</component>
-</collection>
-<collection name="locationmgmt" long-name="Location Management" level="management">
-<component name="locmonitor" long-name="Location Monitor" introduced="^3" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
-</component>
-<component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/agpslocationmgr/group" mrp="os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
-</component>
-<component name="networklocationmgr" long-name="Network Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/networklocationmgr/group" mrp="os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
-</component>
-<component name="locationcore" long-name="Location Core" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locationcore/group" mrp="os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
-</component>
-<component name="networkgateway" long-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 name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
-<component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
-</component>
-<component name="suplrrlpasn1" filter="sf_build" long-name="SUPL RRLP ASN1 Parser">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
-</component>
-</collection>
-<collection name="lbsapitest" long-name="Location API Tests" level="application-interface"/>
-<collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
-<component name="lbs_metadata" long-name="Locating Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commsfw" level="services" long-name="Communications Framework" levels="server support framework process app-if">
-<collection name="commsprocess" long-name="Comms Process" level="process">
-<component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/commsfw/commsprocess/commsrootserverconfig/group" mrp="os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
-</component>
-</collection>
-<collection name="commsconfig" long-name="Comms Config" level="process">
-<component name="commsdatabase" long-name="Comms Database" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
-</component>
-<component name="commsdatabaseshim" long-name="Comms Database Shim" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/commsfw/commsconfig/commsdatabaseshim/group" mrp="os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
-</component>
-</collection>
-<collection name="datacommsserver" long-name="Data Comms Server" level="framework">
-<component name="esockserver" long-name="ESock Server" purpose="mandatory">
-<unit bldFile="os/commsfw/datacommsserver/esockserver/group" mrp="os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp" version="3"/>
-</component>
-<component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/group" mrp="os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
-</component>
-<component name="networkingdialogstub" long-name="Networking Dialog Stub" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/default" mrp="os/commsfw/datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
-</component>
-<component name="networkcontroller" long-name="Network Controller" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/datacommsserver/networkcontroller/group" mrp="os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
-</component>
-</collection>
-<collection name="serialserver" long-name="Serial Server" level="server">
-<component name="serialportcsy" long-name="Serial Port CSY" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/serialserver/serialportcsy" mrp="os/commsfw/serialserver/serialportcsy/ser-comms_serialportcsy.mrp"/>
-</component>
-<component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" purpose="development">
-<unit bldFile="os/commsfw/serialserver/packetloopbackcsy/group" mrp="os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
-</component>
-<component name="c32serialserver" long-name="C32 Serial Server" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/commsfw/serialserver/c32serialserver/group" mrp="os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
-</component>
-<component name="c32serialserverconfig" long-name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config">
-<unit bldFile="os/commsfw/serialserver/c32serialserverconfig" mrp="os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
-</component>
-<component name="c32serialserverdocs" long-name="C32 Serial Server Documentation" purpose="development" class="doc">
-<unit mrp="os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
-</component>
-</collection>
-<collection name="commsfwutils" long-name="Comms Framework Utilities" level="framework">
-<component name="commsbufs" long-name="Comms Buffers" introduced="^3" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwutils/commsbufs/group" mrp="os/commsfw/commsfwutils/commsbufs/group/comms-infras_commsbufs.mrp"/>
-</component>
-</collection>
-<collection name="commsfw_info" long-name="Comms Framework Info" level="app-if">
-<component name="commsinfrastructuredocs" long-name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
-<unit mrp="os/commsfw/commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
-</component>
-<component name="commsfw_metadata" long-name="Communications Framework Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/commsfw/commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
-</component>
-</collection>
-<collection name="commsfwsupport" long-name="Comms Framework Support" level="support">
-<component name="commselements" long-name="Comms Elements" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwsupport/commselements/group" mrp="os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
-</component>
-</collection>
-<collection name="commsinfrastructureapitest" long-name="Comms-Infras API Tests" level="app-if">
-<component name="commsinfrastructuresvs" long-name="Comms Infrastructure Verification Suite" introduced="^3" purpose="development">
-<unit mrp="os/commsfw/commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
-</component>
-</collection>
-<collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
-<component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
-</component>
-<component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" purpose="mandatory" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
-</component>
-<component name="commstools" long-name="Comms Tools" introduced="^3" purpose="development" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/commstools/group" mrp="os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
-</component>
-</collection>
-</block>
-<block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
-<component name="internetsockets" long-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>
-<collection name="tcpiputils" long-name="TCP/IP Utilities" level="plugin">
-<component name="dnd" long-name="DND" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/dnd/group" mrp="os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
-</component>
-<component name="dhcp" long-name="DHCP" introduced="8.0" purpose="optional">
-<unit bldFile="os/networkingsrv/tcpiputils/dhcp/group" mrp="os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
-</component>
-<component name="networkaddressandporttranslation" long-name="Network Address and Port Translation" introduced="^2" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
-</component>
-<component name="punycodeconv" long-name="Punycode Converter" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/punycodeconv/group" mrp="os/networkingsrv/tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
-</component>
-</collection>
-<collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
-<component name="nullagt" long-name="NULL AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/nullagt/group" mrp="os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
-</component>
-<component name="genericscprparameters" long-name="Generic SCPR Parameters" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/linklayercontrol/genericscprparameters/group" mrp="os/networkingsrv/linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
-</component>
-<component name="mbmsparameters" long-name="MBMS Parameters" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/mbmsparameters/group" mrp="os/networkingsrv/linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
-</component>
-<component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
-<unit bldFile="os/networkingsrv/linklayercontrol/networkinterfacemgr/group" mrp="os/networkingsrv/linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp" version="2"/>
-</component>
-</collection>
-<collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
-<component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
-</component>
-<component name="pppnif" long-name="PPP NIF" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/pppnif/group" mrp="os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp" version="2"/>
-</component>
-<component name="slipnif" long-name="SLIP NIF" purpose="development" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/slipnif/group" mrp="os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
-</component>
-<component name="tunnelnif" long-name="Tunnel NIF" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
-</component>
-</collection>
-<collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
-<component name="packetlogger" long-name="Packet Logger" introduced="8.1" purpose="development">
-<unit bldFile="os/networkingsrv/linklayerutils/packetlogger/group" mrp="os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
-</component>
-</collection>
-<collection name="networkcontrol" long-name="Network Control" level="plugin">
-<component name="qoslib" long-name="QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/qoslib/group" mrp="os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
-</component>
-<component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/pfqoslib/group" mrp="os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
-</component>
-<component name="qosfwprt" long-name="QoS Framework PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
-</component>
-<component name="qosipscpr" long-name="QoS IP SCPR" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosipscpr/group" mrp="os/networkingsrv/networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
-</component>
-<component name="ipnetworklayer" long-name="IP Network Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/ipnetworklayer/group" mrp="os/networkingsrv/networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
-</component>
-<component name="iptransportlayer" long-name="IP Transport Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/iptransportlayer/group" mrp="os/networkingsrv/networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
-</component>
-<component name="commsuserpromptmgr" long-name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkcontrol/commsuserpromptmgr/group" mrp="os/networkingsrv/networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
-</component>
-</collection>
-<collection name="networkprotocols" long-name="Network Protocols" level="plugin">
-<component name="ipeventnotifier" long-name="IP Event Notifier" introduced="8.1" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
-</component>
-<component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
-</component>
-<component name="iphook" long-name="IP Hook" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
-</component>
-<component name="mobileip" long-name="Mobile IP" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/mobileip/group" mrp="os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
-</component>
-<component name="dnsproxy" long-name="DNS Proxy" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/networkprotocols/dnsproxy/group" mrp="os/networkingsrv/networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
-</component>
-</collection>
-<collection name="networksecurity" long-name="Network Security" level="framework">
-<component name="tls" long-name="TLS" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tls/group" mrp="os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
-</component>
-<component name="tlsprovider" long-name="TLS Provider" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tlsprovider/group" mrp="os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
-</component>
-<component name="ipsec" long-name="IPsec" introduced="7.0" purpose="optional">
-<unit bldFile="os/networkingsrv/networksecurity/ipsec/group" mrp="os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
-</component>
-</collection>
-<collection name="networkingtestandutils" long-name="Networking Test and Utils" level="app-if">
-<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">
-<!-- production component: contains the IBY files -->
-<unit bldFile="os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
-</component>
-<component name="networkingdocs" long-name="Networking Documentation" purpose="development" class="doc">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
-</component>
-<component name="networkingsrv_metadata" long-name="Networking Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
-<component name="predictorcompression" long-name="Predictor Compression" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wlan" level="services" long-name="WLAN" levels="hw low mid high tools test">
-<collection name="wlan_plat" long-name="WLAN Platform Interfaces" level="test">
-<component name="wlan_dbif_api" long-name="WLAN DBIF API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_dbif_api/group"/>
-</component>
-<component name="wlan_hal_api" long-name="WLAN HAL API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hal_api/group"/>
-</component>
-<component name="wlan_management_api" long-name="WLAN Management API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_management_api/group"/>
-</component>
-<component name="wlan_device_settings_api" long-name="WLAN Device Settings API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_device_settings_api/group"/>
-</component>
-<component name="wlan_control_api" long-name="WLAN Control API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_control_api/group"/>
-</component>
-<component name="wlan_hw_initialization_data_api" long-name="WLAN Hardware Initialization Data API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hw_initialization_data_api/group"/>
-</component>
-<component name="wlan_power_save_plugin_api" long-name="WLAN Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_power_save_plugin_api/group"/>
-</component>
-<component name="wlan_info_api" long-name="WLAN Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_info_api/group"/>
-</component>
-<component name="wlan_agent_hotspot_plugin_api" long-name="WLAN Agent Hotspot Plug-in API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
-</component>
-<component name="wlan_osa_api" long-name="WLAN OSA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_osa_api/group"/>
-</component>
-<component name="wlan_spia_api" long-name="WLAN SPIA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_spia_api/group"/>
-</component>
-<component name="wlan_hpa_api" long-name="WLAN HPA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hpa_api/group"/>
-</component>
-<component name="wlan_eapol_plugin_api" long-name="WLAN EAPOL Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_eapol_plugin_api/group"/>
-</component>
-<component name="wlan_generic_plugin_api" long-name="WLAN Generic Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_generic_plugin_api/group"/>
-</component>
-<component name="wlan_aws_plugin_api" long-name="WLAN AWS Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_aws_plugin_api/group"/>
-</component>
-</collection>
-<collection name="wlan_pub" long-name="WLAN Public Interfaces" level="test">
-<component name="wlan_sdk_info_api" long-name="WLAN SDK Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_pub/wlan_sdk_info_api/group"/>
-</component>
-</collection>
-<collection name="wlan_bearer" long-name="WLAN Bearer" level="hw">
-<component name="wlanpsmplugin" filter="s60" long-name="WLAN PSM Plugin" plugin="Y">
-<unit bldFile="os/wlan/wlan_bearer/wlanpsmplugin/group"/>
-</component>
-<component name="wlanagent" filter="s60" long-name="WLAN Agent">
-<unit bldFile="os/wlan/wlan_bearer/wlanagent/group"/>
-</component>
-<component name="wlandbif_cd" filter="s60" long-name="WLAN CommsDat interface">
-<unit bldFile="os/wlan/wlan_bearer/wlandbif_cd/group"/>
-</component>
-<!-- should follow component directory rules for stuff in wlan_symbian/ and put in a single component or split up properly -->
-<component name="wlanengine" filter="s60" long-name="WLAN Engine">
-<unit bldFile="os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
-</component>
-<component name="wlanldd" filter="s60" long-name="WLAN LDD">
-<unit bldFile="os/wlan/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
-</component>
-<component name="wlannwif" filter="s60" long-name="WLAN Network Interface">
-<unit bldFile="os/wlan/wlan_bearer/wlannwif/group"/>
-</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="adaptation hw-if plugin framework server app-if">
-<collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
-<component name="basebandchanneladaptor" long-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 name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
-<component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
-</component>
-</collection>
-<collection name="fax" long-name="Fax" level="server">
-<component name="faxclientandserver" long-name="Fax Client and Server" purpose="optional">
-<unit bldFile="os/cellularsrv/fax/faxclientandserver/Group" mrp="os/cellularsrv/fax/faxclientandserver/Group/telephony_fax.mrp"/>
-</component>
-</collection>
-<collection name="smsprotocols" long-name="SMS Protocols" level="framework">
-<component name="smsstack" long-name="SMS Stack" introduced="6.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/cellularsrv/smsprotocols/smsstack/group" mrp="os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
-</component>
-</collection>
-<collection name="telephonyprotocols" long-name="Telephony Protocols" level="framework">
-<component name="csdagt" long-name="CSD AGT" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/csdagt/group" mrp="os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
-</component>
-<component name="psdagt" long-name="PSD AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/psdagt/group" mrp="os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
-</component>
-<component name="gprsumtsqosprt" long-name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
-</component>
-<component name="gprsumtsqosinterface" long-name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
-</component>
-<component name="qosextnapi" long-name="QoS Extn API" introduced="9.2" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
-</component>
-<component name="secondarypdpcontextumtsdriver" long-name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
-</component>
-<component name="qos3gppcpr" long-name="QoS 3GPP CPR" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
-</component>
-<component name="pdplayer" long-name="PDP Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/pdplayer/group" mrp="os/cellularsrv/telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
-</component>
-<component name="rawipnif" long-name="Raw IP NIF" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserver" long-name="Telephony Server" level="server">
-<component name="etelserverandcore" long-name="ETel Server and Core" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
-</component>
-<component name="etelmultimode" long-name="ETel Multimode" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelmultimode/group" mrp="os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
-</component>
-<component name="etelpacketdata" long-name="ETel Packet Data" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
-</component>
-<component name="etelsimtoolkit" long-name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
-<component name="common_tsy" long-name="Common TSY" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
-</component>
-<component name="licenseetsystub" long-name="Licensee TSY Stub" introduced="^2" purpose="development" filter="sf_build" plugin="Y">
-<unit mrp="os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="os/cellularsrv/telephonyserverplugins/licenseetsystub/group"/>
-</component>
-<component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
-</component>
-<component name="simtsy" long-name="SIM TSY" introduced="7.0" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
-</component>
-<component name="ctsydispatchlayer" long-name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
-</component>
-<component name="simatktsy" long-name="SIMATK TSY" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simatktsy/group" mrp="os/cellularsrv/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
-</component>
-</collection>
-<collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
-<component name="dial" long-name="Dial" deprecated="9.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyutils/dial/group" mrp="os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
-</component>
-<component name="telephonywatchers" long-name="Telephony Watchers" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
-</component>
-<component name="etel3rdpartyapi" long-name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrv_info" long-name="Cellular Baseband Services Info" level="app-if">
-<component name="telephonyconfidentialdocs" long-name="Telephony Confidential Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
-</component>
-<component name="telephonydocs" long-name="Telephony Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
-</component>
-<component name="cellularsrv_metadata" long-name="Cellular Baseband Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
-<component name="mocksy" long-name="MockSY" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if"/>
-<collection name="wapstack" long-name="WAP Stack" level="app-if">
-<component name="wapmessageapi" long-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>
-</block>
-<block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
-<collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
-<component name="bluetooth_audio_adaptation_api" long-name="Bluetooth Audio Adaptation API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
-</component>
-<component name="bluetooth_power_management_api" long-name="Bluetooth Power Management API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_power_management_api/group"/>
-</component>
-<component name="at_command_handler_plugin_api" long-name="AT Command Handler Plugin API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/at_command_handler_plugin_api/group"/>
-</component>
-</collection>
-<collection name="bluetooth" long-name="Bluetooth Core" level="framework">
-<component name="btstack" long-name="Bluetooth Stack" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btstack" mrp="os/bt/bluetooth/btstack/bluetooth_stack.mrp"/>
-</component>
-<component name="btcomm" long-name="Bluetooth CSY" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetooth/btcomm" mrp="os/bt/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
-</component>
-<component name="btsdp" long-name="Bluetooth SDP" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btsdp" mrp="os/bt/bluetooth/btsdp/bluetooth_sdp.mrp"/>
-</component>
-<component name="btextnotifiers" long-name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btextnotifiers" mrp="os/bt/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
-</component>
-<component name="gavdp" long-name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/gavdp/group" mrp="os/bt/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
-</component>
-<component name="btlogger" long-name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btlogger/group" mrp="os/bt/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
-</component>
-<component name="btdocs" long-name="Bluetooth Documentation" purpose="development" class="doc">
-<unit mrp="os/bt/bluetooth/btdocs/bluetooth_documentation.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothmgmt" long-name="Bluetooth Management" level="plugin">
-<component name="btmgr" long-name="Bluetooth Manager" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btmgr" mrp="os/bt/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
-</component>
-<component name="btconfig" long-name="Bluetooth Config" purpose="optional" class="config">
-<unit bldFile="os/bt/bluetoothmgmt/btconfig" mrp="os/bt/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
-</component>
-<component name="btrom" long-name="Bluetooth ROM" introduced="9.1" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btrom" mrp="os/bt/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
-</component>
-<component name="bluetoothclientlib" long-name="Bluetooth Client Library" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/bluetoothclientlib" mrp="os/bt/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothcommsprofiles" long-name="Bluetooth Comms Profiles" level="app-if">
-<component name="btpan" long-name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetoothcommsprofiles/btpan/group" mrp="os/bt/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
-</component>
-</collection>
-<collection name="bthci" long-name="Host Controller Interface" level="server">
-<component name="bthci2" long-name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bthci/bthci2/group" mrp="os/bt/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
-</component>
-<component name="hciextensioninterface" long-name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bthci/hciextensioninterface" mrp="os/bt/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
-</component>
-<component name="hci2implementations" long-name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bthci/hci2implementations/group" mrp="os/bt/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
-</component>
-</collection>
-<collection name="irda" long-name="IrDA" level="plugin">
-<component name="irdastack" long-name="IrDA Stack" purpose="optional">
-<unit bldFile="os/bt/irda/irdastack/group" mrp="os/bt/irda/irdastack/group/infra-red_irda.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if"/>
-<collection name="atext" long-name="AT Extensions" level="server">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="atext_build" long-name="AT Extension Build" introduced="^3" purpose="optional" filter="s60">
-<unit bldFile="os/bt/atext/group"/>
-</component>
-</collection>
-<collection name="bt_info" long-name="Bluetooth Info" level="app-if">
-<component name="bt_metadata" long-name="Bluetooth Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/bt/bt_info/bt_metadata/bt_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
-<collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
-<!-- usbclientdrivers to be moved here from kernelhwsrv-->
-</collection>
-<collection name="usbmgmt" long-name="USB Management" level="server">
-<component name="usbmgr" long-name="USB Manager" purpose="optional">
-<unit bldFile="os/usb/usbmgmt/usbmgr/group" mrp="os/usb/usbmgmt/usbmgr/group/usb_manager.mrp" version="2"/>
-</component>
-<component name="usbclassandmgrdocs" long-name="USB Class and Manager Documentation" purpose="development" class="doc">
-<unit mrp="os/usb/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
-</component>
-</collection>
-<collection name="usb_info" long-name="USB Info" level="app-if">
-<component name="usb_metadata" long-name="USB Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/usb/usb_info/usb_metadata/usb_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="mm" level="services" long-name="Multimedia" levels="adaptation 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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-</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"/>
-</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"/>
-</component>
-<component name="aac_decoder_config_proxy_api" long-name="AAC Decoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/aac_decoder_config_proxy_api/group"/>
-</component>
-<component name="added_devsound_control_api" long-name="Added DevSound Control API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_api/group"/>
-</component>
-<component name="added_devsound_control_msg_hdlr_api" long-name="Added DevSound Control Msg Hdlr API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_msg_hdlr_api/group"/>
-</component>
-<component name="added_devsound_control_proxy_api" long-name="Added DevSound Control Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_proxy_api/group"/>
-</component>
-<component name="audio_effects_msg_hdlr_api" long-name="Audio Effects Message Handler API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_msg_hdlr_api/group"/>
-</component>
-<component name="audio_effects_proxy_api" long-name="Audio Effects Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_proxy_api/group"/>
-</component>
-<component name="audio_policy_header_api" long-name="Audio Policy Header API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="audio_routing_proxy_api" long-name="Audio Routing Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_routing_proxy_api/group"/>
-</component>
-<component name="custom_interface_builder_api" long-name="Custom Interface Builder API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_builder_api/group"/>
-</component>
-<component name="custom_interface_message_handler_factory_api" long-name="Custom Interface Message Handler Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_message_handler_factory_api/group"/>
-</component>
-<component name="custom_interface_proxy_factory_api" long-name="Custom Interface Proxy Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_proxy_factory_api/group"/>
-</component>
-<component name="custom_interface_utility_api" long-name="Custom Interface Utility API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_utility_api/group"/>
-</component>
-<component name="devsound_adaptation_api" long-name="DevSound Adaptation API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/devsound_adaptation_api/group"/>
-</component>
-<component name="display_posting_api" long-name="Display Posting API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="eaac_plus_decoder_interface_proxy_api" long-name="eAAC Plus Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="error_concealment_interface_proxy_api" long-name="Error Concealment Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
-</component>
-<component name="fm_radio_adaptation_api" long-name="FM Radio Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_decoder_interface_proxy_api" long-name="G711 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_encoder_interface_proxy_api" long-name="G711 Encoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_decoder_interface_proxy_api" long-name="G729 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_encoder_interface_msg_hdlr_api" long-name="G729 Encoder Interface Message Handler API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</component>
-<component name="ilbc_decoder_interface_proxy_api" long-name="Ilbc Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ilbc_encoder_interface_proxy_api" long-name="Ilbc Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="mdf_plugin_uids" long-name="MDF Plug-in UIDs" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/mdf_plugin_uids/group"/>
-</component>
-<component name="multimedia_fourcc_definitions_api" long-name="Multimedia FourCC Definitions API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/multimedia_fourcc_definitions_api/group"/>
-</component>
-<component name="nokia_audio_policy_header_api" long-name="Nokia Audio Policy Header API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/nokia_audio_policy_header_api/group"/>
-</component>
-<component name="nokia_multimedia_fourcc_definitions_api" long-name="Nokia Multimedia Fourcc Definitions API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ra8_decoder_interface_proxy_api" long-name="RA8 Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
-</component>
-<component name="rds_adaptation_api" long-name="RDS Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="restricted_audio_output_proxy_api" long-name="Restricted Audio Output Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="sbc_encoder_interface_proxy_api" long-name="SBC Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/sbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="secure_output_mdf_custom_interface" long-name="Secure Output MDF Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="speech_encoder_config_proxy_api" long-name="Speech Encoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/speech_encoder_config_proxy_api/group"/>
-</component>
-<component name="telephony_audio_routing_client_api" long-name="Telephony Audio Routing Client API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_client_api/group"/>
-</component>
-<component name="telephony_audio_routing_manager_api" long-name="Telephony Audio Routing Manager API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_manager_api/group"/>
-</component>
-<component name="video_buffer_management_mdf_custom_interface" long-name="Video Buffer Management MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_buffer_management_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_rotation_mdf_custom_interface" long-name="Video Decoder Rotation MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_scaling_mdf_custom_interface" long-name="Video Decoder Scaling MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
-</component>
-<component name="video_reclaim_extbuffers_ci" long-name="Video Reclaim Extbuffers Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_reclaim_extbuffers_ci/group"/>
-</component>
-<component name="video_window_control_custom_interface" long-name="Video Window Control Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="wma_decoder_interface_proxy_api" long-name="WMA Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/wma_decoder_interface_proxy_api/group"/>
-</component>
-<component name="eaacplusutil_api" long-name="EAac Plus Util API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/eaacplusutil_api/group"/>
-</component>
-<component name="frametable_api" long-name="Frametable API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/frametable_api/group"/>
-</component>
-</collection>
-<collection name="devsoundextensions" long-name="Devsound Extensions" level="device-fw">
-<component name="drmaudioplayer" filter="s60" long-name="DRM Audio Player">
-<unit bldFile="os/mm/devsoundextensions/drmaudioplayer/group"/>
-</component>
-<component name="mmextfw" filter="s60" long-name="Multimedia Extension Framework">
-<unit bldFile="os/mm/devsoundextensions/mmextfw/group"/>
-</component>
-<component name="audiorouting" filter="s60" long-name="Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/audiorouting/group"/>
-</component>
-<component name="effects" filter="s60" long-name="Effects">
-<unit bldFile="os/mm/devsoundextensions/effects/group"/>
-</component>
-<component name="effectspresets" filter="s60" long-name="Effects Presets">
-<unit bldFile="os/mm/devsoundextensions/effectspresets/group"/>
-</component>
-<component name="effectspresets_utils" filter="s60" long-name="Effects Presets Utils">
-<!-- need to #include the lot from a single bld.inf
- Also move to a standard component location, not under effectspresets -->
-<unit bldFile="os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
-<unit bldFile="os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
-</component>
-<component name="telephonyaudiorouting" filter="s60" long-name="Telephony Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/group"/>
-</component>
-<component name="mmfcustominterfaces" filter="s60" long-name="MMF Custom Interfaces">
-<unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/group"/>
-</component>
-<component name="addeddevsoundcontrol" filter="s60" long-name="Added DevSound Control">
-<unit bldFile="os/mm/devsoundextensions/addeddevsoundcontrol/group"/>
-</component>
-<component name="globalaudiosettings" filter="s60" long-name="Global Audio Settings">
-<unit bldFile="os/mm/devsoundextensions/globalaudiosettings/group"/>
-</component>
-<component name="restrictedaudiooutput" filter="s60" long-name="Restricted Audio Output">
-<unit bldFile="os/mm/devsoundextensions/restrictedaudiooutput/group"/>
-</component>
-<component name="ciextnfactoryplugins" filter="s60" long-name="Custom Interface Extension Factory Plugins" plugin="Y">
-<unit bldFile="os/mm/devsoundextensions/ciextnfactoryplugins/group"/>
-</component>
-</collection>
-<collection name="mdfdevvideoextensions" long-name="MDF Dev Video Extensions" level="device-fw">
-<component name="nga_mdf_postprocessor" long-name="NGA MDF Postprocessor" filter="s60">
-<unit bldFile="os/mm/mdfdevvideoextensions/nga_mdf_postprocessor/group"/>
-</component>
-</collection>
-<collection name="audio" long-name="Audio Codecs" level="middleware">
-<component name="arm_cmmf_codecs" filter="s60" long-name="ARM CMMF Codecs" plugin="Y">
-<unit bldFile="os/mm/audio/arm_cmmf_codecs/group"/>
-</component>
-</collection>
-<collection name="video" long-name="Video Codecs" level="middleware">
-<!-- empty -->
-</collection>
-<collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
-<component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/imagingandcamerafws/imagingfws/group" mrp="os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
-</component>
-<component name="camerafw" long-name="Camera Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/imagingandcamerafws/camerafw/group" mrp="os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
-</component>
-</collection>
-<collection name="mmlibs" long-name="Multimedia Libraries" level="middleware">
-<component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmutilitylib/group" mrp="os/mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
-</component>
-<component name="mmfw" long-name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmfw/group" mrp="os/mm/mmlibs/mmfw/group/multimedia_mmf.mrp"/>
-</component>
-</collection>
-<collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
-<component name="imagingplugins" long-name="Imaging Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/imagingplugins/group" mrp="os/mm/mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
-</component>
-<component name="cameraplugins" long-name="Camera Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/cameraplugins/group" mrp="os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
-</component>
-<component name="lib3gp" long-name="3GP Library" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/mmplugins/lib3gp/group" mrp="os/mm/mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
-</component>
-<component name="mmfwplugins" long-name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/mmfwplugins/group" mrp="os/mm/mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
-</component>
-</collection>
-<collection name="mm_info" long-name="Multimedia Info" level="app-if">
-<component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc">
-<unit mrp="os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
-</component>
-<component name="mm_metadata" long-name="Multimedia Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
-<component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="^2" purpose="development">
-<unit bldFile="os/mm/mmresourcemgmt/mmresctrl/group" mrp="os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
-</component>
-</collection>
-<collection name="mmdevicefw" long-name="Multimedia Device Framework" level="device-fw">
-<component name="mdf" long-name="Media Device Framework" introduced="9.2" purpose="mandatory">
-<unit bldFile="os/mm/mmdevicefw/mdf/group" mrp="os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
-</component>
-<component name="speechrecogsupport" long-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 name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
-<component name="videorenderer" long-name="Video Renderer" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/mmswadaptation/videorenderer/group" mrp="os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
-</component>
-</collection>
-<collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw"/>
-<collection name="omxil" long-name="OpenMAX IL" level="hw-if">
-<component name="omxilapi" long-name="OpenMAX IL API" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilapi/group" mrp="os/mm/omxil/omxilapi/group/multimedia_omx_il_api.mrp" version="1"/>
-</component>
-<component name="omxilcore" long-name="OpenMAX IL Core" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcore/group" mrp="os/mm/omxil/omxilcore/group/multimedia_omx_il_core.mrp" version="1"/>
-</component>
-<component name="omxilcomponentcommon" long-name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcomponentcommon/group" mrp="os/mm/omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp" version="1"/>
-</component>
-<component name="omxilrefcomps" long-name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilrefcomps/ref_components/group" mrp="os/mm/omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp" version="1"/>
-</component>
-<component name="mmilapi" long-name="Multimedia Integration Layer API" introduced="^3" purpose="development">
-<unit bldFile="os/mm/omxil/mmilapi/group" mrp="os/mm/omxil/mmilapi/group/multimedia_il_api.mrp"/>
-</component>
-</collection>
-<collection name="devsound" long-name="Sound Device" level="devices">
-<component name="devsoundapi" long-name="DevSound API" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/devsound/devsoundapi/group" mrp="os/mm/devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
-</component>
-<component name="a3fdevsound" long-name="A3F DevSound" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3fdevsound/group" mrp="os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
-</component>
-<component name="a3facf" long-name="A3F Audio Component Framework" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3facf/group" mrp="os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
-</component>
-<component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/devsound/devsoundpluginsupport/group" mrp="os/mm/devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
-</component>
-<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">
-<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">
-<unit bldFile="os/mm/devsound/a3ftrace/group" mrp="os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
-</component>
-<component name="a3fsrvstart" long-name="A3F Server Start" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
-</component>
-</collection>
-<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
-<component name="devsoundhwdeviceapi" long-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 name="a3facl" long-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 name="a3fdevsoundcustomisation" long-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"/>
-</component>
-<component name="refacladapt" long-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"/>
-</component>
-<component name="videohai" long-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 name="dvbhreceiverhai" long-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>
-</block>
-<block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
-<collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
-<component name="exif_api" long-name="Exif API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagingext_plat" long-name="Imaging Extensions Platform Interfaces" level="app-if">
-<component name="jpeg2000_icl_plugin_api" long-name="JPEG2000 ICL plugin API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/jpeg2000_icl_plugin_api/group"/>
-</component>
-<component name="extended_icl_jpeg_api" long-name="Extended ICL Jpeg API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
-</component>
-<component name="h324_annex_k_custom_api" long-name="H324 Annex K Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/h324_annex_k_custom_api/group"/>
-</component>
-<component name="ecam_orientation_custom_api" long-name="ECam Orientation Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_orientation_custom_api/group"/>
-</component>
-<component name="ecam_ui_orientation_override_custom_api" long-name="ECam UI Orientation Override Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
-</component>
-<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>
-</collection>
-<collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
-<component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
-<unit bldFile="os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
-</component>
-<component name="imageadaptationextensions_build" filter="s60" long-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"/>
-</component>
-</collection>
-<collection name="imagingmodules" long-name="Imaging Modules" level="hw-if">
-<component name="exiflib" filter="s60" long-name="Exif Library">
-<unit bldFile="os/imagingext/imagingmodules/exiflib/group"/>
-</component>
-<component name="jp2kcodec" filter="s60" long-name="JPEG2000 Decoder Plugin" plugin="Y">
-<unit bldFile="os/imagingext/imagingmodules/jp2kcodec/group"/>
-</component>
-</collection>
-</block>
-<block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
-<component name="vgi" filter="s60" long-name="VGI">
-<unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
-</component>
-</collection>
-<collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adaptations">
-<component name="m3gcore11" filter="s60" long-name="M3G Core 1.1">
-<unit bldFile="os/graphics/m3g/m3gcore11/group"/>
-</component>
-</collection>
-<collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines">
-<component name="graphicsresource" long-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 name="graphicsresourceadaptation" long-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"/>
-</component>
-</collection>
-<collection name="graphicsutils" long-name="Graphics Utils" level="engines">
-<component name="commongraphicsheaders" long-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 name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
-<!-- displayldd to be moved here -->
-<component name="surfacemgr" long-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 name="graphicscomposition" long-name="Graphics Composition" level="engines">
-<component name="openwfcinterface" long-name="OpenWF Composition Interface" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfcinterface/group" mrp="os/graphics/graphicscomposition/openwfcinterface/group/graphics_openwfcinterface.mrp"/>
-</component>
-<component name="openwfcompositionengine" long-name="OpenWF Composition Engine" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/graphicscomposition/openwfcompositionengine/group" mrp="os/graphics/graphicscomposition/openwfcompositionengine/group/graphics_openwfcompositionengine.mrp"/>
-</component>
-<component name="openwfsupport" long-name="OpenWF Support" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfsupport/group" mrp="os/graphics/graphicscomposition/openwfsupport/group/graphics_openwfsupport.mrp"/>
-</component>
-<component name="surfaceupdate" long-name="Surface Update" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/surfaceupdate/group" mrp="os/graphics/graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
-</component>
-</collection>
-<collection name="graphicstest" long-name="Graphics Test" level="app-if">
-<component name="uibench" long-name="UI Bench" introduced="9.2" purpose="development">
-<unit bldFile="os/graphics/graphicstest/uibench/group" mrp="os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
-</component>
-</collection>
-<collection name="graphics_plat" long-name="Graphics Platform Interfaces" level="app-if">
-<component name="m3g_core_api" filter="sf_build" long-name="M3G Core API" class="api">
-<unit bldFile="os/graphics/graphics_plat/m3g_core_api/group"/>
-</component>
-</collection>
-<collection name="graphics_info" long-name="Graphics Info" level="app-if">
-<component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc">
-<unit mrp="os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
-</component>
-<component name="graphics_metadata" long-name="Graphics Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
-</component>
-</collection>
-<collection name="windowing" long-name="Windowing" level="app-if">
-<component name="windowserver" long-name="Window Server" purpose="mandatory">
-<unit bldFile="os/graphics/windowing/windowserver/group" mrp="os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
-</component>
-<component name="windowserverplugins" long-name="Window Server Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/windowing/windowserverplugins/group" mrp="os/graphics/windowing/windowserverplugins/group/graphics_wserv_std_plugins.mrp"/>
-</component>
-</collection>
-<collection name="printingservices" long-name="Printing Services" level="app-if">
-<component name="printerdriversupport" long-name="Printer Driver Support" purpose="optional">
-<unit bldFile="os/graphics/printingservices/printerdriversupport/group" mrp="os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
-</component>
-<component name="printerdrivers" long-name="Printer Drivers" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/printingservices/printerdrivers/group" mrp="os/graphics/printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
-</component>
-</collection>
-<collection name="fbs" long-name="Font and Bitmap Server" level="device-interface">
-<component name="fontandbitmapserver" long-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 name="opengles" long-name="OpenGLES" level="internal-adaptations">
-<component name="openglesinterface" long-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 name="opengles_stub" filter="sf_build" long-name="OpenGL ES Stub" purpose="optional" introduced="^2">
-<unit bldFile="os/graphics/opengles/openglesinterface/group/opengles_stub"/>
-</component>
-</collection>
-<collection name="openvg" long-name="OpenVG" level="internal-adaptations">
-<component name="openvginterface" long-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 name="openvg11" filter="s60" long-name="OpenVG 1.1">
-<!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
-<unit bldFile="os/graphics/openvg/openvginterface/group/openvg11"/>
-</component>
-<component name="sfopenvg" filter="sf_build" long-name="Khronos OpenVG Reference Implementation" introduced="^2" purpose="optional">
-<unit bldFile="os/graphics/openvg/openvgrefimplementation/sfopenvg/group"/>
-</component>
-</collection>
-<collection name="egl" long-name="EGL" level="internal-adaptations">
-<component name="eglinterface" long-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 name="eglswitch" long-name="EGL Switch" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglswitch/group" mrp="os/graphics/egl/eglswitch/group/graphics_eglswitch.mrp"/>
-</component>
-<component name="eglrefimpl" long-name="EGL Reference Implementation" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglrefimpl/group" mrp="os/graphics/egl/eglrefimpl/group/graphics_eglrefimpl.mrp"/>
-</component>
-<component name="egltest" long-name="EGL Tests" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/egl/egltest/group" mrp="os/graphics/egl/egltest/group/graphics_egltest.mrp"/>
-</component>
-</collection>
-<collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
-<component name="gdi" long-name="GDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/gdi/group" mrp="os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
-</component>
-<component name="bitgdi" long-name="BitGDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
-</component>
-<component name="colourpalette" long-name="Colour Palette" introduced="7.0s" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
-</component>
-<component name="screendriver" long-name="Screen Driver" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/graphicsdeviceinterface/screendriver/group" mrp="os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
-</component>
-<component name="directgdi" long-name="DirectGDI" introduced="^3" deprecated="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/directgdi/group" mrp="os/graphics/graphicsdeviceinterface/directgdi/group/graphics_directgdi.mrp"/>
-</component>
-<component name="directgdiinterface" long-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 name="directgdiadaptation" long-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"/>
-</component>
-</collection>
-<collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
-<component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/gdi_tools/group" mrp="os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
-</component>
-</collection>
-<collection name="graphicsapitest" long-name="Graphics API Tests" level="app-if"/>
-</block>
-<block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
-<collection name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" level="text">
-<component name="findutil_api" long-name="Find Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/findutil_api/group"/>
-</component>
-<component name="japanese_language_utilities_api" long-name="Japanese Language Utilities API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
-</component>
-<component name="sortutil_api" long-name="Sorting Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/sortutil_api/group"/>
-</component>
-</collection>
-<collection name="textandloc_pub" long-name="Text and Localisation Public Interfaces" level="text">
-<component name="directory_localizer_api" long-name="Directory Localizer API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_pub/directory_localizer_api/group"/>
-</component>
-</collection>
-<collection name="charconvfw" long-name="Character Conversion" level="encoding">
-<component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional">
-<unit bldFile="os/textandloc/charconvfw/charconv_fw/group" mrp="os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
-</component>
-<component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/charconvplugins/group" mrp="os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
-</component>
-<component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/fatfilenameconversionplugins/group" mrp="os/textandloc/charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
-</component>
-</collection>
-<collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
-<component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/textshaperplugin/group" mrp="os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
-</component>
-<component name="fontstore" long-name="Font Store" purpose="mandatory">
-<unit bldFile="os/textandloc/fontservices/fontstore/group" mrp="os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
-</component>
-<component name="textrendering" long-name="Text Rendering" purpose="mandatory" class="placeholder">
-<!-- placeholder for text code from GDI -->
-</component>
-<component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/freetypefontrasteriser/group" mrp="os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
-</component>
-<component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional">
-<unit bldFile="os/textandloc/fontservices/referencefonts/group" mrp="os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
-</component>
-</collection>
-<collection name="textlayout" long-name="Text Layout" level="text">
-<component name="texthandling" long-name="Text Handling" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/texthandling/group" mrp="os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
-</component>
-<component name="textformatting" long-name="Text Formatting" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/textformatting/group" mrp="os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
-</component>
-</collection>
-<collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
-<!-- components in this collection need to be moved to the right collection.
- Either move into the units' directories, or create a new textandlocutils directory -->
-<component name="numbergrouping" filter="s60" long-name="Number Grouping">
-<unit bldFile="os/textandloc/charconvfw/numbergrouping/group"/>
-</component>
-<component name="jplangutil" filter="s60" long-name="Japanese Language Utilities">
-<unit bldFile="os/textandloc/charconvfw/jplangutil/group"/>
-</component>
-<component name="sortutil" filter="s60" long-name="Sorting Utility">
-<unit bldFile="os/textandloc/charconvfw/sortutil/group"/>
-</component>
-<component name="inlinetext" filter="s60" long-name="Inline Text">
-<unit bldFile="os/textandloc/charconvfw/inlinetext/group"/>
-</component>
-<component name="nearestlangutil" long-name="Nearest Language Util" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-<component name="numberformatting" long-name="Number Formatting" introduced="7.0s" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/numberformatting/group" mrp="os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
-</component>
-</collection>
-<collection name="localesupport" long-name="Locale Support" level="util">
-<component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/localisation/localesupport" mrp="os/textandloc/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
-</component>
-<component name="initlocale" long-name="Initialise Locale" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-</collection>
-<collection name="textandloctools" long-name="Text and Localisation Tools" level="tools">
-<component name="fontcompiler" long-name="Font Compiler" purpose="development" class="placeholder PC">
-<!-- placeholder for split from GDI Tools -->
-</component>
-<component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/bitmapfonttools/group" mrp="os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
-</component>
-</collection>
-<collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
-<component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
-<collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
-<component name="xmlsrv_plat_build" long-name="XML Services Platform Interface Build" filter="s60" class="api">
-<!-- need to fix the configuration used here.
- Either destribute to other components or use the new feature flags confguration mechanisms.
- Remove this component and uncomment the other units when fixed-->
-<unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
-</component>
-<component name="xml_encryption_api" long-name="XML Encryption API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/> -->
-</component>
-<component name="xml_signature_api" long-name="XML Signature API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_signature_api/group"/> -->
-</component>
-<component name="xml_security_engine_utils_api" long-name="XML Security Engine Utils API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/> -->
-</component>
-</collection>
-<collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
-<component name="xmlseccertman" filter="s60" long-name="XML Security Certificate Manager">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
-</component>
-<component name="xmlsec" filter="s60" long-name="XML Security">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsec/group"/>
-</component>
-<component name="xmlseccrypto" filter="s60" long-name="XML Security Crypto">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccrypto/group"/>
-</component>
-<component name="xmlsecwrapper" filter="s60" long-name="XML Security Wrapper">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsecwrapper/group"/>
-</component>
-</collection>
-<collection name="xml" long-name="XML" level="generic">
-<component name="xmlfw" long-name="XML Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmlfw/group" mrp="os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
-</component>
-<component name="libxml2libs" long-name="Libxml2 Libraries" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/libxml2libs/group" mrp="os/xmlsrv/xml/libxml2libs/group/syslibs_libxml2.mrp"/>
-</component>
-<component name="legacyminidomparser" long-name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/legacyminidomparser/GROUP" mrp="os/xmlsrv/xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp"/>
-</component>
-<component name="xmldomandxpath" long-name="XML DOM and XPath" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmldomandxpath/group" mrp="os/xmlsrv/xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
-</component>
-<component name="xmlexpatparser" long-name="XML Expat Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmlexpatparser/group" mrp="os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
-</component>
-<component name="xmllibxml2parser" long-name="XML Libxml2 Parser" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmllibxml2parser/group" mrp="os/xmlsrv/xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
-</component>
-<component name="wbxmlparser" long-name="WBXML Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/wbxmlparser/group" mrp="os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
-</component>
-</collection>
-<collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
-<component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="deviceplatformrelease" level="services" long-name="Device Platform Release" levels="bld mid top">
-<collection name="s60extras" long-name="S60 Extras" level="mid">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="s60extras_build" filter="s60" long-name="S60 Extras Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/S60Extras/group"/>
-</component>
-</collection>
-<collection name="locfiles" long-name="Locale Files" level="mid">
-<component name="locfiles_build" filter="s60" long-name="S60 Locale Files Build" purpose="development" class="config">
-<!-- need to move component down a directory -->
-<unit bldFile="os/deviceplatformrelease/locfiles/group"/>
-</component>
-<component name="locfiles_set1" long-name="Locale Files Set 1" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set1"/>
-</component>
-<component name="locfiles_set2" long-name="Locale Files Set 2" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set2"/>
-</component>
-<component name="locfiles_set3" long-name="Locale Files Set 3" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set3"/>
-</component>
-<component name="locfiles_set4" long-name="Locale Files Set 4" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set4"/>
-</component>
-<component name="locfiles_set5" long-name="Locale Files Set 5" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set5"/>
-</component>
-<component name="locfiles_set6" long-name="Locale Files Set 6" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set6"/>
-</component>
-<!-- is the a problem with SF builds with the following? -->
-<component name="locfiles_set7" long-name="Locale Files Set 7" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set7"/>
-</component>
-<component name="locfiles_set8" long-name="Locale Files Set 8" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set8"/>
-</component>
-<component name="locfiles_set9" long-name="Locale Files Set 9" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set9"/>
-</component>
-<component name="locfiles_set10" long-name="Locale Files Set 10" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set10"/>
-</component>
-<component name="locfiles_set11" long-name="Locale Files Set 11" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set11"/>
-</component>
-<component name="locfiles_set12" long-name="Locale Files Set 12" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set12"/>
-</component>
-<component name="locfiles_set13" long-name="Locale Files Set 13" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set13"/>
-</component>
-<component name="locfiles_set14" long-name="Locale Files Set 14" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set14"/>
-</component>
-<component name="locfiles_set15" long-name="Locale Files Set 15" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set15"/>
-</component>
-<component name="locfiles_set16" long-name="Locale Files Set 16" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set16"/>
-</component>
-</collection>
-<collection name="version" long-name="Version" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="version_build" filter="s60" long-name="Version Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/Version/group"/>
-</component>
-</collection>
-<collection name="helps_loc2" long-name="Helps Locale 2" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helps_loc2_build" long-name="Helps Locale 2 Build" filter="s60">
-<unit bldFile="os/deviceplatformrelease/helps_loc2/group"/>
-</component>
-</collection>
-<collection name="sf_config" long-name="SF Config" level="mid">
-<component name="config" filter="s60" long-name="Config" purpose="development" class="config"/>
-<component name="cenrep" filter="sf_build" long-name="ConE Central Repository Config" purpose="development" class="config">
-<!-- will shoudl give the id/path something more unique than cenrep -->
-<unit bldFile="os/deviceplatformrelease/sf_config/cenrep/group"/>
-</component>
-<component name="rombuild_syborg" filter="sf_build" long-name="Syborg iMaker Config" purpose="development" introduced="^3" class="config">
-<unit bldFile="os/deviceplatformrelease/sf_config/rombuild/syborg/group"/>
-</component>
-<component name="rombuild_zoom2" filter="sf_build" long-name="Zoom2 iMaker Config" purpose="development" introduced="^3" class="config">
-<unit bldFile="os/deviceplatformrelease/sf_config/rombuild/zoom2/group"/>
-</component>
-</collection>
-<!-- should be located locally in buildplatforms/group. NB. This is a different package! -->
-<collection name="s60bld" long-name="S60 Build">
-<component name="buildplatforms" filter="s60" long-name="Build Platforms">
-<unit bldFile="tools/buildplatforms/group"/>
-</component>
-</collection>
-<collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
-<component name="cedarutils" long-name="Cedar Utils" purpose="development">
-<unit mrp="os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
-</component>
-<component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt" purpose="development" class="config">
-<unit mrp="os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
-</component>
-<component name="foundation_s60_packages" long-name="Foundation S60 Packages" introduced="^3" deprecated="^3" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/symbianosbld/foundation_s60_packages/foundation_s60_packages.mrp"/>
-</component>
-</collection>
-<collection name="foundation_system" long-name="Foundation System" level="top">
-<component name="system_model" long-name="System Model" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
-</component>
-</collection>
-<collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
-<component name="deviceplatformrelease_metadata" long-name="Device Platform Release Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="osrndtools" level="services" long-name="OS R&D tools" levels="fw trace">
-<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"/>
-</component>
-<component name="testinterface" filter="s60" long-name="Test Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/testinterface/group"/>
-</component>
-<component name="testserver" filter="s60" long-name="Test Server" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserver/group"/>
-</component>
-<component name="testengine" filter="s60" long-name="Test Engine" purpose="development">
-<unit bldFile="os/osrndtools/stif/testengine/group"/>
-</component>
-<component name="testserverstarter" filter="s60" long-name="Test Server Starter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserverstarter/group"/>
-</component>
-<component name="stiftfwif" filter="s60" long-name="STIF Test Framework Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/stiftfwif/group"/>
-</component>
-<component name="consoleui" filter="s60" long-name="Console UI" purpose="development">
-<unit bldFile="os/osrndtools/stif/consoleui/group"/>
-</component>
-<component name="testcombiner" filter="s60" long-name="Test Combiner" purpose="development">
-<unit bldFile="os/osrndtools/stif/testcombiner/group"/>
-</component>
-<component name="demomodule" filter="s60" long-name="Demo Module" purpose="development">
-<unit bldFile="os/osrndtools/stif/demomodule/group"/>
-</component>
-<component name="atslogger" filter="s60" long-name="ATS Logger" purpose="development">
-<unit bldFile="os/osrndtools/stif/atslogger/group"/>
-</component>
-<component name="atsinterface" filter="s60" long-name="ATS Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/atsinterface/group"/>
-</component>
-<component name="testscripter" filter="s60" long-name="Test Scripter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testscripter/group"/>
-</component>
-<component name="suevent" filter="s60" long-name="SU Event" purpose="development">
-<unit bldFile="os/osrndtools/stif/suevent/group"/>
-</component>
-<component name="stifkerneltestclassbase" filter="s60" long-name="STIF Kernel Test Class Base" purpose="development">
-<!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
-<!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
-</component>
-<component name="stif_build" filter="s60" long-name="STIF Build" purpose="development">
-<!-- move exports into self-contained component. Remove this when configuration is in place-->
-<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">
-<unit bldFile="os/osrndtools/memspy/memspy_plat/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/engine/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/console/group"/>
-</component>
-<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>
-</collection>
-<collection name="hti" long-name="Harmonized Test Interface" level="trace">
-<component name="hti_plat" filter="s60" long-name="HTI Platform Interfaces" purpose="development" class="api">
-<unit bldFile="os/osrndtools/hti/hti_plat/group"/>
-</component>
-<component name="hticfg" filter="s60" long-name="HTI Config" purpose="development">
-<unit bldFile="os/osrndtools/hti/hticfg/group"/>
-</component>
-<component name="htiautostart" filter="s60" long-name="HTI Autostart" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiautostart/group"/>
-</component>
-<component name="htiframework" filter="s60" long-name="HTI Framework" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiframework/group"/>
-</component>
-<component name="hticommplugins" filter="s60" long-name="HTI Communication Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
-</component>
-<component name="htiserviceplugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
-</component>
-<component name="htifilehlp" filter="s60" long-name="HTI File Help" purpose="development">
-<unit bldFile="os/osrndtools/hti/htifilehlp/group"/>
-</component>
-<component name="htiwatchdog" filter="s60" long-name="HTI Watchdog" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiwatchdog/group"/>
-</component>
-<component name="hti_build" filter="s60" long-name="HTI Build" purpose="development">
-<!-- move exports into self-contained component.-->
-<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">
-<block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
-<collection name="appsupport_pub" long-name="Generic Application Support Public Interfaces" level="specific">
-<component name="flash_viewer_framework_api" long-name="Flash Viewer Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
-</component>
-<component name="network_status_api" long-name="Network Status API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/network_status_api/group"/>
-</component>
-</collection>
-<collection name="appsupport_plat" long-name="Generic Application Support Platform Interfaces" level="specific">
-<component name="action_plugin_api" long-name="Action Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/action_plugin_api/group"/>
-</component>
-<component name="application_orientation_api" long-name="Application Orientation API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/application_orientation_api/group"/>
-</component>
-<component name="context_access_api" long-name="Context Access API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_access_api/group"/>
-</component>
-<component name="context_framework_services_api" long-name="Context Framework Services API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_services_api/group"/>
-</component>
-<component name="context_framework_client_api" long-name="Context Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_client_api/group"/>
-</component>
-<component name="context_framework_listener_api" long-name="Context Framework Listener API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_listener_api/group"/>
-</component>
-<component name="context_framework_version_api" long-name="Context Framework Version API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_version_api/group"/>
-</component>
-<component name="context_source_plugin_api" long-name="Context Source Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_plugin_api/group"/>
-</component>
-<component name="context_source_settings_manager_api" long-name="Context Source Settings Manager API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_settings_manager_api/group"/>
-</component>
-<component name="context_subscription_api" long-name="Context Subscription API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_subscription_api/group"/>
-</component>
-<component name="key_event_framework_api" long-name="Key Event Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_api/group"/>
-</component>
-<component name="key_event_framework_mapper_api" long-name="Key Event Framework Mapper API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_mapper_api/group"/>
-</component>
-<component name="media_keys_definition_api" long-name="Media Keys Definition API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/media_keys_definition_api/group"/>
-</component>
-<component name="ood_threshold_api" long-name="OOD Threshold API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/ood_threshold_api/group"/>
-</component>
-<component name="oom_monitor_api" long-name="OOM Monitor API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_api/group"/>
-</component>
-<component name="oom_monitor_plugin_api" long-name="OOM Monitor Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_plugin_api/group"/>
-</component>
-<component name="operation_provider_api" long-name="Operation Provider API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/operation_provider_api/group"/>
-</component>
-<component name="phonecmdhandler_api" long-name="Phone Command Handler API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/phonecmdhandler_api/group"/>
-</component>
-<component name="restore_factory_settings_api" long-name="Restore Factory Settings API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_api/group"/>
-</component>
-<component name="restore_factory_settings_plugin_api" long-name="Restore Factory Settings Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_plugin_api/group"/>
-</component>
-<component name="secondary_display_accfw_api" long-name="Secondary Display Accessory Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_accfw_api/group"/>
-</component>
-<component name="secondary_display_startup_api" long-name="Secondary Display Startup API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_startup_api/group"/>
-</component>
-<component name="secondary_display_sysap_api" long-name="Secondary Display System Application API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_sysap_api/group"/>
-</component>
-<component name="secondary_display_system_state_api" long-name="Secondary Display System State API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_system_state_api/group"/>
-</component>
-<component name="sensor_user_setting_api" long-name="Sensor User Setting API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/sensor_user_setting_api/group"/>
-</component>
-<component name="startup_configuration_api" long-name="Startup Configuration API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/startup_configuration_api/group"/>
-</component>
-<component name="system_application_key_handler_plugin_api" long-name="System Application Key Handler Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_key_handler_plugin_api/group"/>
-</component>
-<component name="system_application_light_control_plugin_api" long-name="System Application Light Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_light_control_plugin_api/group"/>
-</component>
-<component name="system_application_notification_api" long-name="System Application Notification API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_notification_api/group"/>
-</component>
-<component name="system_application_plugin_callback_api" long-name="System Application Plug-in Callback API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
-</component>
-</collection>
-<collection name="contextframework" long-name="Context Framework" level="framework">
-<!-- the units that are commented out need to be put back when configuration is in place.
- They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
-<component name="cfw" filter="s60" long-name="Context Framework">
-<!--<unit bldFile="contextframework/cfw/group"/> -->
-</component>
-<component name="cfwplugins" filter="s60" long-name="Context Framework Plugins" plugin="Y">
-<!--<unit bldFile="contextframework/cfwplugins/group"/>-->
-</component>
-<component name="contextframework_build" filter="s60" long-name="Context Framework Build">
-<unit bldFile="mw/appsupport/contextframework/group"/>
-</component>
-</collection>
-<collection name="coreapplicationuis" long-name="Core Application UIs" level="server">
-<component name="dbrecovery" filter="s60" long-name="Database Recovery">
-<unit bldFile="mw/appsupport/coreapplicationuis/dbrecovery/group"/>
-</component>
-<component name="nspswsplugin" filter="s60" long-name="NSPS WS Plugin" plugin="Y">
-<!-- No Service Power Save? Window Server? Please elaborate-->
-<unit bldFile="mw/appsupport/coreapplicationuis/nspswsplugin/group"/>
-</component>
-<component name="rfs" filter="s60" long-name="Restore Factory Settings">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfs/group"/>
-</component>
-<component name="rfsplugins" filter="s60" long-name="Restore Factory Settings Plugins" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/group"/>
-</component>
-<component name="sysap" filter="s60" long-name="System Application">
-<unit bldFile="mw/appsupport/coreapplicationuis/sysap/group"/>
-</component>
-<component name="variatedsettings" filter="s60" long-name="Variated Settings" class="config">
-<unit bldFile="mw/appsupport/coreapplicationuis/variatedsettings/group"/>
-</component>
-<component name="accfwuinotifier" filter="s60" long-name="Accessory Framework UI Notifier" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/accfwuinotifier/group"/>
-</component>
-<component name="kefmapper" filter="s60" long-name="Key Event Framework">
-<unit bldFile="mw/appsupport/coreapplicationuis/kefmapper/group"/>
-</component>
-<component name="advancedtspcontroller" filter="s60" long-name="Advanced TSP Controller">
-<unit bldFile="mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
-</component>
-<component name="powersaveutilities" filter="s60" long-name="Power Save Utilities">
-<unit bldFile="mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
-</component>
-<component name="gsserverenginestub" filter="s60" long-name="GS Server Engine Stub">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
-</component>
-<component name="gsserverengine" filter="s60" long-name="GS Server Engine">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverengine/group"/>
-</component>
-<component name="sensordatacompensatorplugin" filter="s60" long-name="Sensor Data Compensator Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/group"/>
-</component>
-</collection>
-<collection name="flashliteapi_3_1" long-name="Flash Lite API 3.1" level="specific">
-<!-- collection is really a component. Move down a directory -->
-<component name="flashliteapi_3_1_build" long-name="Flash Lite API Build" filter="s60" introduced="^2"/>
-</collection>
-<collection name="mediakeys" long-name="Media Keys" level="plugin">
-<!-- collection is really a component. Move down a directory -->
-<component name="mediakeys_build" filter="s60" long-name="Media Keys Build">
-<unit bldFile="mw/appsupport/mediakeys/group"/>
-</component>
-</collection>
-<collection name="startupservices" long-name="Startup Services" level="system">
-<component name="splashscreen" filter="s60" long-name="Splash Screen">
-<unit bldFile="mw/appsupport/startupservices/splashscreen/group"/>
-</component>
-<component name="startupanimation" filter="s60" long-name="Startup Animation">
-<unit bldFile="mw/appsupport/startupservices/startupanimation/group"/>
-</component>
-<component name="startup" long-name="Startup Application" filter="s60">
-<unit bldFile="mw/appsupport/startupservices/startup/group"/>
-</component>
-</collection>
-<collection name="sysresmonitoring" long-name="System Resource Monitoring" level="system">
-<component name="oodmonitor" filter="s60" long-name="OOD Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oodmonitor/group"/>
-</component>
-<component name="oommonitor" filter="s60" long-name="OOM Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oommonitor/group"/>
-</component>
-</collection>
-<collection name="systemsettings" long-name="System Settings" level="system">
-<component name="gssensorplugin" filter="s60" long-name="GS Sensor Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gssensorplugin/group"/>
-</component>
-<component name="gsaccessoryplugin" filter="s60" long-name="GS Accessory Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gsaccessoryplugin/group"/>
-</component>
-</collection>
-<collection name="filehandling" long-name="File Handling" level="server">
-<component name="fileconverterfw" long-name="File Converter Framework" purpose="optional">
-<unit bldFile="mw/appsupport/filehandling/fileconverterfw/group" mrp="mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
-</component>
-<component name="htmltorichtextconverter" long-name="HTML to RichText Converter" introduced="7.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/htmltorichtextconverter/group" mrp="mw/appsupport/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
-</component>
-<component name="richtexttohtmlconverter" long-name="RichText to HTML Converter" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
-</component>
-</collection>
-<collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
-<component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
-</component>
-</collection>
-<collection name="commonappservices" long-name="Common Application Services" level="framework">
-<component name="alarmserver" long-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"/>
-</component>
-<component name="alarmservertest" long-name="Alarm Server Test" deprecated="^3" introduced="8.1" purpose="development">
-<unit bldFile="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
-</component>
-<component name="appservicesdocs" long-name="Application Services Documentation" purpose="development" class="doc">
-<unit mrp="mw/appsupport/commonappservices/appservicesdocs/app-services_documentation.mrp"/>
-</component>
-<component name="backuprestorenotification" long-name="Backup Restore Notification" introduced="8.1" purpose="optional">
-<unit bldFile="mw/appsupport/commonappservices/backuprestorenotification/group" mrp="mw/appsupport/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
-</component>
-</collection>
-<collection name="tzservices" long-name="Time Zone Services" level="plugin">
-<component name="tzserver" long-name="Time Zone Server" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzserver/group" mrp="mw/appsupport/tzservices/tzserver/group/app-services_tz.mrp"/>
-</component>
-<component name="tzloc" long-name="Time Zone Localization" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzloc/group" mrp="mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
-</component>
-<component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzlocrscfactory/group" mrp="mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
-</component>
-<component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzdatabase/group" mrp="mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
-</component>
-</collection>
-<collection name="contenthandling" long-name="Content Handling" level="plugin">
-<component name="webrecognisers" long-name="Web Recognisers" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/contenthandling/webrecognisers/group" mrp="mw/appsupport/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
-</component>
-</collection>
-<collection name="openenvutils" long-name="Open Environment Utilities" level="specific">
-<component name="commandshell" long-name="Command Shell" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/commandshell/group" mrp="mw/appsupport/openenvutils/commandshell/group/oetools_zsh.mrp"/>
-</component>
-<component name="telnetserver" long-name="Telnet Server" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/telnetserver/group" mrp="mw/appsupport/openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
-</component>
-</collection>
-<collection name="printingsupport" long-name="Printing Support" level="generic">
-<component name="printinguisupport" long-name="Printing UI Support" purpose="optional" introduced="^2" deprecated="^3">
-<unit bldFile="mw/appsupport/printingsupport/printinguisupport/group" mrp="mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
-</component>
-</collection>
-<collection name="appfw" long-name="Application Framework" level="framework">
-<component name="apparchitecture" long-name="Application Architecture" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/apparchitecture/group" mrp="mw/appsupport/appfw/apparchitecture/group/app-framework_apparc.mrp"/>
-</component>
-<component name="viewserver" long-name="View Server" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/viewserver/group" mrp="mw/appsupport/appfw/viewserver/group/app-framework_viewsrv.mrp"/>
-</component>
-</collection>
-<collection name="applaunchservices" long-name="Application Launch Services" level="generic">
-<component name="aftermarketappstarter" long-name="After Market Application Starter" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/aftermarketappstarter/group" mrp="mw/appsupport/applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
-</component>
-<component name="applaunchplugins" long-name="Application Launch Plugins" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/applaunchplugins/group" mrp="mw/appsupport/applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
-</component>
-</collection>
-<collection name="tzpcside" long-name="Time Zone PC Side" level="plugin">
-<component name="tzcompiler" long-name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config PC">
-<unit bldFile="mw/appsupport/tzpcside/tzcompiler/group" mrp="mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
-</component>
-</collection>
-<collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
-<component name="appsupport_metadata" long-name="Generic Application Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="securitysrv" level="generic" long-name="Security Services" levels="plugin framework server generic specific">
-<collection name="secsrv_plat" long-name="Security Services Platform Interfaces" level="specific">
-<component name="cms_api" long-name="CMS API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/cms_api/group"/>
-</component>
-<component name="pkcs12_parser_api" long-name="PKCS12 Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkcs12_parser_api/group"/>
-</component>
-<component name="java_utils_api" long-name="Java Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/java_utils_api/group"/>
-</component>
-<component name="wim_cert_api" long-name="WIM Cert API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/wim_cert_api/group"/>
-</component>
-<component name="device_key_store_encryption_plugin_api" long-name="Device Key Store Encryption Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/device_key_store_encryption_plugin_api/group"/>
-</component>
-<component name="x509certnameparser_api" long-name="X.509 Certificate Name Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
-</component>
-<component name="remote_lock_api" long-name="Remote Lock API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
-</component>
-<component name="pkidialog_api" long-name="PKI Dialog API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
-</component>
-<component name="provisioning_api" long-name="Provisioning API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/provisioning_api/group"/>
-</component>
-<component name="keyguard_configuration_api" long-name="Keyguard Configuration API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_configuration_api/group"/>
-</component>
-<component name="keylock_policy_api" long-name="Keylock Policy API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keylock_policy_api/group"/>
-</component>
-<component name="security_code_ui_api" long-name="Security Code UI API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
-</component>
-<component name="gba_api" long-name="GBA API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/gba_api/group"/>
-</component>
-<component name="keyguard_access_api" long-name="Keyguard Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_access_api/group"/>
-</component>
-<component name="devicelock_access_api" long-name="Device Lock Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devicelock_access_api/group"/>
-</component>
-<component name="lockapp_server_api" long-name="Lock Application Server API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
-</component>
-<component name="devencadaptation_api" long-name="Device Encryption Adaptation API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
-</component>
-<component name="devenccommonutils_api" long-name="Device Encryption Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
-</component>
-</collection>
-<collection name="cms" long-name="Certificate Management Service" level="server">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="cms_build" filter="s60" long-name="CMS" introduced="^3">
-<unit bldFile="mw/securitysrv/cms/group"/>
-</component>
-</collection>
-<collection name="pkiutilities" long-name="PKI Utilities" level="plugin">
-<component name="x509certnameparser" filter="s60" long-name="X.509 Certificate Name Parser">
-<unit bldFile="mw/securitysrv/pkiutilities/x509certnameparser/group"/>
-</component>
-<component name="pkcs12" filter="s60" long-name="PKCS #12">
-<unit bldFile="mw/securitysrv/pkiutilities/pkcs12/group"/>
-</component>
-<component name="certmanui" filter="s60" long-name="Certificate Management UI">
-<unit bldFile="mw/securitysrv/pkiutilities/certmanui/group"/>
-</component>
-<component name="ctsecuritydialogs" filter="s60" long-name="Crypto Token Security Dialogs">
-<unit bldFile="mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
-</component>
-<component name="certsaver" filter="s60" long-name="Certificate Saver">
-<unit bldFile="mw/securitysrv/pkiutilities/certsaver/group"/>
-</component>
-<component name="secmodui" filter="s60" long-name="Security Module UI">
-<unit bldFile="mw/securitysrv/pkiutilities/secmodui/group"/>
-</component>
-<component name="devicetoken" filter="s60" long-name="Device Token">
-<unit bldFile="mw/securitysrv/pkiutilities/devicetoken/group"/>
-</component>
-<component name="certificates" filter="s60" long-name="Certificates">
-<unit bldFile="mw/securitysrv/pkiutilities/Certificates/group" filter="sf_build"/>
-</component>
-<component name="pkiutilities_build" filter="s60" long-name="PKI Utilities Build">
-<!-- need to split this into the above components -->
-<unit bldFile="mw/securitysrv/pkiutilities/group"/>
-</component>
-<component name="ocsp" long-name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
-<unit bldFile="mw/securitysrv/pkiutilities/ocsp/group" mrp="mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
-</component>
-</collection>
-<collection name="wim" long-name="Wireless Identity Module " level="framework">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="wim_build" filter="s60" long-name="WIM Build">
-<unit bldFile="mw/securitysrv/wim/group"/>
-</component>
-</collection>
-<collection name="remotelock" long-name="Remote Lock" level="generic">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="remotelock_build" filter="s60" long-name="Remote Lock Build">
-<unit bldFile="mw/securitysrv/remotelock/group"/>
-</component>
-</collection>
-<collection name="securitydialogs" long-name="Security Dialogs" level="specific">
-<component name="keylockpolicyapi" filter="s60" long-name="Keylock Policy API">
-<unit bldFile="mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
-</component>
-<component name="autolock" long-name="Autolock" filter="s60">
-<unit bldFile="mw/securitysrv/securitydialogs/autolock/group"/>
-</component>
-<component name="secui" filter="s60" long-name="Security UI">
-<unit bldFile="mw/securitysrv/securitydialogs/secui/group"/>
-</component>
-<component name="securitynotifier" filter="s60" long-name="Security Notifier">
-<unit bldFile="mw/securitysrv/securitydialogs/securitynotifier/group"/>
-</component>
-<component name="lockclient" filter="s60" long-name="Lock Client" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockclient/group"/>
-</component>
-<component name="lockapp" filter="s60" long-name="Lock Application" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockapp/group"/>
-</component>
-<component name="simlockui" filter="s60" long-name="SIM Lock UI" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/simlockui/group"/>
-</component>
-</collection>
-<collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="boottimeintegritycheck_build" filter="s60" long-name="Boot Time Integrity Check Build">
-<unit bldFile="mw/securitysrv/boottimeintegritycheck/group"/>
-</component>
-</collection>
-<collection name="gba" long-name="Generic Bootstrapping Architecture" level="server">
-<component name="uicc" filter="s60" long-name="UICC" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/uicc/group"/>
-</component>
-<component name="gbaserver" filter="s60" long-name="GBA Server" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaserver/group"/>
-</component>
-<component name="gbaapi" filter="s60" long-name="GBA API" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaapi/group"/>
-</component>
-<component name="gbafilter" filter="s60" long-name="GBA HTTP Filter" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/gbafilter/group"/>
-</component>
-<component name="gba_build" filter="s60" long-name="Generic Boot Architecture Build" introduced="^2">
-<!-- need to split this into the above components, or remove #includes and make this GBA ROM -->
-<unit bldFile="mw/securitysrv/gba/group"/>
-</component>
-</collection>
-<collection name="devencdiskutils" long-name="Device Encryption Disk Utils" level="server">
-<component name="devenccommonutils" filter="s60" long-name="Device Encryption Common Utils" introduced="^3">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncCommonUtils/group"/>
-</component>
-<component name="devencrfsplugin" filter="s60" long-name="Device Encryption RFS Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncRfsPlugin/group"/>
-</component>
-<component name="pk5recognizer" filter="s60" long-name="Device Encryption Pk5 Recognizer" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/Pk5Recognizer/group"/>
-</component>
-<component name="devencstarter" filter="s60" long-name="Device Encryption Starter" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncStarter/group"/>
-</component>
-<component name="devencdiskutils" filter="s60" long-name="Device Encryption Disk Utils Build" introduced="^3">
-<!-- need to split this into the above components, or remove #includes and make this a ROM component-->
-<unit bldFile="mw/securitysrv/devencdiskutils/group"/>
-</component>
-</collection>
-<collection name="securitysrv_info" long-name="Security Services Info" level="specific">
-<component name="securitysrv_metadata" long-name="Security Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="drm" level="generic" long-name="DRM" levels="plugin framework server generic specific">
-<collection name="drm_plat" long-name="DRM Platform Interfaces" level="specific">
-<component name="roap_api" long-name="ROAP API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/roap_api/group"/>
-</component>
-<component name="drm_common_api" long-name="DRM Common API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_common_api/group"/>
-</component>
-<component name="drm_rights_api" long-name="DRM Rights API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_rights_api/group"/>
-</component>
-<component name="drm_legacy_api" long-name="DRM Legacy API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_legacy_api/group"/>
-</component>
-<component name="dcf_repository_api" long-name="DCF Repository API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/dcf_repository_api/group"/>
-</component>
-<component name="drm_service_api" long-name="DRM Service API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_service_api/group"/>
-</component>
-<component name="drm_secondary_display_api" long-name="DRM Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_secondary_display_api/group"/>
-</component>
-<component name="drm_license_manager_api" long-name="DRM License Manager API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_license_manager_api/group"/>
-</component>
-<component name="drm_utility_api" long-name="DRM Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_utility_api/group"/>
-</component>
-<component name="drm_agents_api" long-name="DRM Agents API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_agents_api/group"/>
-</component>
-<component name="wmdrm_core_api" long-name="WM DRM Core API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_core_api/group"/>
-</component>
-<component name="wmdrm_access_api" long-name="WMDRM Access API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_access_api/group"/>
-</component>
-<component name="wmdrm_ota_access_api" long-name="WMDRM OTA Access API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_ota_access_api/group"/>
-</component>
-<component name="camese_utility_api" long-name="Camese Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_utility_api/group"/>
-</component>
-<component name="camese_framework_api" long-name="Camese Framework API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_framework_api/group"/>
-</component>
-</collection>
-<collection name="drm_pub" long-name="DRM Public Interfaces" level="specific">
-<component name="drm_helper_api" long-name="DRM Helper API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_helper_api/group"/>
-</component>
-<component name="oma_drm_caf_agent_api" long-name="OMA DRM CAF Agent API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/group"/>
-</component>
-<component name="drm_license_checker_api" long-name="DRM License Checker API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_license_checker_api/group"/>
-</component>
-</collection>
-<collection name="commondrm" long-name="Common DRM" level="generic">
-<!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
-<component name="drmencryptor" filter="s60" long-name="DRM Encryptor" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmsettingsplugin" filter="s60" long-name="DRM Settings Plugin" plugin="Y" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmrightsmanagerui" filter="s60" long-name="DRM Rights Manager UI">
-<unit bldFile="mw/drm/commondrm/drmrightsmanagerui/help/group"/>
-</component>
-<component name="drmutility" filter="s60" long-name="DRM Utility">
-<!-- Uncomment unit when configuration is in place. Currently #included from commondrm_build -->
-<!--<unit bldFile="commondrm/drmutility/group"/>-->
-</component>
-<component name="drmserviceapiwrapper" filter="s60" long-name="DRM Service API Wrapper">
-<unit bldFile="mw/drm/commondrm/drmserviceapiwrapper/group"/>
-</component>
-<component name="drmrightsstoringlocation" filter="s60" long-name="DRM Rights Storing Location">
-<unit bldFile="mw/drm/commondrm/drmrightsstoringlocation/group"/>
-</component>
-<component name="commondrm_build" filter="s60" long-name="Common DRM Build">
-<!-- should be split into the above files, or them collapsed into a single component -->
-<unit bldFile="mw/drm/commondrm/group"/>
-</component>
-</collection>
-<collection name="omadrm" long-name="OMA DRM" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="omadrm_build" filter="s60" long-name="OMA DRM Build">
-<unit bldFile="mw/drm/omadrm/group"/>
-</component>
-<component name="foundationcerts" filter="sf_build" long-name="Foundation Certificates">
-<unit bldFile="mw/drm/omadrm/foundationcerts/group"/>
-</component>
-</collection>
-<collection name="wmdrm" long-name="Windows Media DRM" level="framework">
-<!-- collection is really a component. Move down a directory -->
-<component name="wmdrm_build" filter="s60" long-name="WM DRM Build">
-<unit bldFile="mw/drm/wmdrm/group"/>
-</component>
-</collection>
-<collection name="drm_info" long-name="DRM Info" level="specific"/>
-</block>
-<block name="locationsrv" level="specific" long-name="Location Services" levels="plugin fw server if">
-<collection name="locsrv_pub" long-name="Location Services Public Interfaces" level="if">
-<component name="landmarks_search_api" long-name="Landmarks Search API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
-</component>
-<component name="landmarks_api" long-name="Landmarks API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/group"/>
-</component>
-<component name="landmarks_database_management_api" long-name="Landmarks Database Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/group"/>
-</component>
-<component name="location_triggering_api" long-name="Location Triggering API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/location_triggering_api/group"/>
-</component>
-<component name="blid_application_satellite_info_api" long-name="BLID Application Satellite Info API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/group"/>
-</component>
-</collection>
-<collection name="locsrv_plat" long-name="Location Services Platform Interfaces" level="if">
-<component name="map_and_navigation_api" long-name="Map and Navigation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/group"/>
-</component>
-<component name="map_and_navigation_provider_discovery_api" long-name="Map and Navigation Provider Discovery API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/group"/>
-</component>
-<component name="geocoding_api" long-name="Geocoding API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
-</component>
-<component name="map_image_api" long-name="Map Image API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/group"/>
-</component>
-<component name="map_and_navigation_aiw_api" long-name="Map and Navigation AIW API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_aiw_api/group"/>
-</component>
-<component name="map_and_navigation_provider_api" long-name="Map and Navigation Provider API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_api/group"/>
-</component>
-<component name="landmarks_category_definition_api" long-name="Landmarks Category Definition API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
-</component>
-<component name="supl_settings_api" long-name="SUPL Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
-</component>
-<component name="location_settings_launch_api" long-name="Location Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/group"/>
-</component>
-<component name="map_image_conversion_plugin_api" long-name="Map Image Conversion Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/group"/>
-</component>
-<component name="psy_configuration_ui_plugin_api" long-name="PSY Configuration UI Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/psy_configuration_ui_plugin_api/group"/>
-</component>
-<component name="np_proxy_configuration_api" long-name="NP Proxy Configuration API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/np_proxy_configuration_api/group"/>
-</component>
-<component name="supl_terminal_initiation_api" long-name="SUPL Terminal Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/group"/>
-</component>
-<component name="location_notation_preferences_settings_api" long-name="Location Notation Preferences Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_notation_preferences_settings_api/group"/>
-</component>
-<component name="supl_settings_notifier_secondary_display_api" long-name="SUPL Settings Notifier Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_notifier_secondary_display_api/group"/>
-</component>
-<component name="supl_network_initiation_api" long-name="SUPL Network Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/group"/>
-</component>
-<component name="privacy_notifiers_secondary_display_api" long-name="Privacy Notifiers Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/privacy_notifiers_secondary_display_api/group"/>
-</component>
-<component name="oma_supl_configuration_parameter_api" long-name="OMA SUPL Configuration Parameter API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_configuration_parameter_api/group"/>
-</component>
-<component name="supl_query_secondary_display_api" long-name="SUPL Query Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_query_secondary_display_api/group"/>
-</component>
-<component name="location_triggering_management_api" long-name="Location Triggering Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_management_api/group"/>
-</component>
-<component name="location_triggering_status_information_api" long-name="Location Triggering Status Information API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_status_information_api/group"/>
-</component>
-<component name="oma_supl_asn_codec_plugin_api" long-name="OMA SUPL ASN Codec Plugin API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
-</component>
-<component name="query_and_notification_api" long-name="Query and Notification API" filter="s60" introduced="^3" class="api">
-<!-- needs metadata file: <meta rel="Api" href="locsrv_plat/query_and_notification_api/query_and_notification_api.metaxml"/> -->
-<unit bldFile="mw/locationsrv/locsrv_plat/query_and_notification_api/group"/>
-</component>
-<component name="location_local_variation_api" long-name="Location Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_local_variation_api/group"/>
-</component>
-</collection>
-<collection name="genericpositioningplugins" long-name="Generic Positioning Plugins" level="plugin">
-<component name="locationnpppsy" filter="s60" long-name="Location Positioning Proxy PSY" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
-</component>
-<component name="locationsuplpsy" filter="s60" long-name="Location SUPL PSY" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationsuplpsy/group"/>
-</component>
-<component name="genericpositioningplugins_build" filter="s60" long-name="Generic Positioning Plugins Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/genericpositioningplugins/group"/>
-</component>
-</collection>
-<collection name="landmarks" long-name="Landmarks" level="server">
-<component name="locationlandmarks" filter="s60" long-name="Location Landmarks">
-<unit bldFile="mw/locationsrv/landmarks/locationlandmarks/group"/>
-</component>
-</collection>
-<collection name="locationmapnavfw" long-name="Location Map and Navigation Framework" level="fw">
-<component name="mnlibrary" filter="s60" long-name="Map and Navigation Library">
-<unit bldFile="mw/locationsrv/locationmapnavfw/library/group"/>
-</component>
-<component name="mnaiwprovider" filter="s60" long-name="Map and Navigation AIW Provider" plugin="Y">
-<unit bldFile="mw/locationsrv/locationmapnavfw/aiwprovider/group"/>
-</component>
-<component name="locationmapnavfw_build" filter="s60" long-name="Location Map and Navigation Framework Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/locationmapnavfw/group"/>
-</component>
-</collection>
-<collection name="locationsystemui" long-name="Location System UI" level="if">
-<component name="locationsysui" filter="s60" long-name="Location System UI">
-<unit bldFile="mw/locationsrv/locationsystemui/locationsysui/group"/>
-</component>
-</collection>
-<collection name="supl" long-name="SUPL" level="fw">
-<component name="locationsuplfw" filter="s60" long-name="Location SUPL Framework">
-<unit bldFile="mw/locationsrv/supl/locationsuplfw/group"/>
-</component>
-<component name="locationomasuplprotocolhandler" filter="s60" long-name="OMA SUPL Protocol Handler">
-<unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/group"/>
-</component>
-<component name="supltiapiimplementation" filter="s60" long-name="SUPL TI API Implementation" introduced="^3">
-<unit bldFile="mw/locationsrv/supl/supltiapiimplementation/group"/>
-</component>
-</collection>
-<collection name="locationtriggering" long-name="Location Triggering" level="server">
-<component name="ltlogger" filter="s60" long-name="LT Logger">
-<unit bldFile="mw/locationsrv/locationtriggering/ltlogger/group"/>
-</component>
-<component name="ltclientlib" filter="s60" long-name="LT Client Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltclientlib/group"/>
-</component>
-<component name="ltmanagementlib" filter="s60" long-name="LT Management Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmanagementlib/group"/>
-</component>
-<component name="ltcontainer" filter="s60" long-name="LT Container">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontainer/group"/>
-</component>
-<component name="ltserver" filter="s60" long-name="LT Server">
-<unit bldFile="mw/locationsrv/locationtriggering/ltserver/group"/>
-</component>
-<component name="ltstrategypluginapi" filter="s60" long-name="LT Strategy Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategypluginapi/group"/>
-</component>
-<component name="ltstrategyengine" filter="s60" long-name="LT Strategy Engine">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategyengine/group"/>
-</component>
-<component name="ltmovementdetectionpluginapi" filter="s60" long-name="Movement Detection Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmovementdetectionpluginapi/group"/>
-</component>
-<component name="ltcellidmovementdetector" filter="s60" long-name="Cell ID Movement Detector">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/>
-</component>
-<component name="lbtmgmtui" filter="s60" long-name="LBT Management UI" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/lbtmgmtui/group"/>
-</component>
-<component name="ltcontextsourceplugin" filter="s60" long-name="LT Context Source Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontextsourceplugin/group"/>
-</component>
-<component name="locationtriggering_build" filter="s60" long-name="Location Triggering Build">
-<!-- should remove #include from this and maybe put exports in the above components -->
-<unit bldFile="mw/locationsrv/locationtriggering/group"/>
-</component>
-</collection>
-</block>
-<block name="accesssec" level="generic" long-name="Access Security" levels="plugin framework server generic specific">
-<collection name="accesssec_plat" long-name="Access Security Platform Interfaces" level="specific">
-<component name="wapi_security_settings_ui_api" long-name="WAPI Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_security_settings_ui_api/group"/>
-</component>
-<component name="wep_security_settings_ui_api" long-name="WEP Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wep_security_settings_ui_api/group"/>
-</component>
-<component name="wi-fi_protected_setup_ui_api" long-name="Wi-Fi Protected Setup UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
-</component>
-<component name="wlan_eap_settings_ui_api" long-name="WLAN EAP Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wlan_eap_settings_ui_api/group"/>
-</component>
-<component name="wpa_security_settings_ui_api" long-name="WPA Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wpa_security_settings_ui_api/group"/>
-</component>
-<component name="eap_vpn_api" long-name="EAP VPN API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
-</component>
-<component name="eapsim_db_api" long-name="EAP-SIM DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapsim_db_api/group"/>
-</component>
-<component name="eap_type_api" long-name="EAP Type API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_type_api/group"/>
-</component>
-<component name="eaptlspeap_db_api" long-name="EAP-TLS-PEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eaptlspeap_db_api/group"/>
-</component>
-<component name="eapleap_db_api" long-name="LEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapleap_db_api/group"/>
-</component>
-<component name="eapgtc_db_api" long-name="EAP-GTC DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapgtc_db_api/group"/>
-</component>
-<component name="eapmschapv2_db_api" long-name="EAP-MSCHAPV2 DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapmschapv2_db_api/group"/>
-</component>
-<component name="eapaka_db_api" long-name="EAP-AKA DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapaka_db_api/group"/>
-</component>
-<component name="wapi_db_api" long-name="WAPI DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_db_api/group"/>
-</component>
-</collection>
-<collection name="wlansecuritysettings" long-name="WLAN Security Settings" level="specific">
-<component name="wapisecuritysettingsui" filter="s60" long-name="WAPI Security Settings UI" introduced="9.1">
-<!-- the directory for this needs to be moved up to the right level -->
-<unit bldFile="mw/accesssec/wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
-</component>
-<component name="wepsecuritysettingsui" filter="s60" long-name="WEP Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wepsecuritysettingsui/group"/>
-</component>
-<component name="wifiprotectedsetup" filter="s60" long-name="WIFI Protected Setup" introduced="^1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wifiprotectedsetup/group"/>
-</component>
-<component name="wlaneapsettingsui" filter="s60" long-name="WLAN EAP Settings UI" introduced="9.3">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wlaneapsettingsui/group"/>
-</component>
-<component name="wpasecuritysettingsui" filter="s60" long-name="WPA Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wpasecuritysettingsui/group"/>
-</component>
-</collection>
-<collection name="eapol" long-name="EAPOL" level="framework">
-<component name="eapol_framework" filter="s60" long-name="EAPOL Framework" introduced="9.2">
-<unit bldFile="mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
-</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">
-<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>
-<component name="bearer_settings_plugin_api" long-name="Bearer Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/bearer_settings_plugin_api/group"/>
-</component>
-<component name="commsdat_wlan_api" long-name="CommsDat WLAN API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/commsdat_wlan_api/group"/>
-</component>
-<component name="connection_monitor_extension_api" long-name="Connection Monitor Extension API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_monitor_extension_api/group"/>
-</component>
-<component name="connection_ui_utilities_api" long-name="Connection UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_ui_utilities_api/group"/>
-</component>
-<component name="disconnect_dialog_api" long-name="Disconnect Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_api/group"/>
-</component>
-<component name="disconnect_dialog_disable_api" long-name="Disconnect Dialog Disable API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_disable_api/group"/>
-</component>
-<component name="extended_connection_settings_api" long-name="Extended Connection Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/extended_connection_settings_api/group"/>
-</component>
-<component name="mpm_default_connection_api" long-name="MPM Default Connection API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_default_connection_api/group"/>
-</component>
-<component name="pdpcontextmanager2_reset_factory_settings_api" long-name="PDP Context Manager 2 Reset Factory Settings API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_settings_api/group"/>
-</component>
-<component name="mpm_connect_screen_api" long-name="MPM Connect Screen API" filter="s60" class="api">
-<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">
-<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>
-<component name="access_point_engine_api" long-name="Access Point Engine API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_monitor_server_api/group"/>
-</component>
-<component name="connection_settings_ui_api" long-name="Connection Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_ui_api/group"/>
-</component>
-<component name="agent_dialog_api" long-name="Agent Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/agent_dialog_api/group"/>
-</component>
-<component name="extendedconnpref_api" long-name="Extended Connection Preferences API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/extendedconnpref_api/group"/>
-</component>
-</collection>
-<collection name="accesspointcontrol" long-name="Access Point Control" level="plugin">
-<component name="apcontrollistplugin" filter="s60" long-name="Access Point Control List Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
-</component>
-</collection>
-<collection name="alwayson_net_plugin" long-name="Always Online Net Plugin" level="server">
-<component name="pdpcontextmanager2" filter="s60" long-name="PDP Context Manager 2">
-<unit bldFile="mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
-</component>
-</collection>
-<collection name="apengine" long-name="Access Point Engine" level="framework">
-<component name="apeng" filter="s60" long-name="Access Point Engine">
-<unit bldFile="mw/ipconnmgmt/apengine/apeng/group"/>
-</component>
-<component name="apsettingshandlerui" filter="s60" long-name="Access Point Settings Handler UI">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingshandlerui/group"/>
-</component>
-<component name="apsettingsplugin" filter="s60" long-name="Access Point Settings Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="bearermanagement" long-name="Bearer Management" level="framework">
-<component name="mpm" filter="s60" long-name="Mobility Policy Manager">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/mpm/group"/>
-</component>
-<component name="extendedconnpref" filter="s60" long-name="Extended Connection Preferences">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/extendedconnpref/group"/>
-</component>
-<component name="s60mcpr" filter="s60" long-name="S60 Meta-Connection Provider" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/S60MCPR/group"/>
-</component>
-</collection>
-<collection name="cmmanager" long-name="Connection Method Manager" level="framework">
-<component name="cmmgr" filter="s60" long-name="CM Manager">
-<unit bldFile="mw/ipconnmgmt/cmmanager/cmmgr/group"/>
-</component>
-<component name="gsconnsettingsplugin" filter="s60" long-name="GS Connection Settings Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/cmmanager/gsconnsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="connectionmonitoring" long-name="Connection Monitoring" level="server">
-<component name="connectionmonitorplugin" filter="s60" long-name="Connection Monitor Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorplugin/group"/>
-</component>
-<component name="connectionmonitorui" filter="s60" long-name="Connection Monitor UI">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorui/group"/>
-</component>
-<component name="connmon" filter="s60" long-name="Connection Monitor">
-<!-- either split into two components, or #include from a common bld.inf -->
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/connectionmonitor/group"/>
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/dataconnectionlogger/group"/>
-</component>
-<component name="connmonext" filter="s60" long-name="Connection Monitor Extension API">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmonext/group"/>
-</component>
-</collection>
-<collection name="connectionutilities" long-name="Connection Utilities" level="utils">
-<component name="connectiondialogs" filter="s60" long-name="Connection Dialogs">
-<unit bldFile="mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/>
-</component>
-</collection>
-<collection name="dbcreator" long-name="DB Creator" level="utils">
-<component name="commsdatcreator" filter="s60" long-name="Comms Database Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
-</component>
-<component name="commsdatcreatorrfsplugin" filter="s60" long-name="Comms Database Creator RFS Plugin" introduced="9.3" plugin="Y">
-<!-- uncomment when config is turned on -->
-<!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
-</component>
-<component name="commsdatstartup" filter="s60" long-name="Comms Database Startup" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
-</component>
-<component name="dbcreatorexe" filter="s60" long-name="DB Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
-</component>
-<component name="dbcreator_build" filter="s60" long-name="DB Creator Build" introduced="9.3">
-<!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
-<unit bldFile="mw/ipconnmgmt/dbcreator/group"/>
-</component>
-</collection>
-<collection name="ipconnmgmt_info" long-name="IP Connectivity Management Info" level="utils">
-<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"/>
-</component>
-</collection>
-</block>
-<block name="netprotocols" level="generic" long-name="High-level Internet Protocols" levels="plugin framework server generic specific">
-<collection name="netprotocols_plat" long-name="High-level Internet Protocols Platform Interfaces" level="specific">
-<component name="cookie_manager_api" long-name="Cookie Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/cookie_manager_api/group"/>
-</component>
-<component name="http_cache_mgr_api" long-name="HTTP Cache Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_cache_mgr_api/group"/>
-</component>
-<component name="http_filters_api" long-name="HTTP Filters API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_filters_api/group"/>
-</component>
-</collection>
-<collection name="httpfilters" long-name="HTTP Filters" level="plugin">
-<component name="httpfiltercommon" filter="s60" long-name="HTTP Filter Common">
-<unit bldFile="mw/netprotocols/httpfilters/httpfiltercommon/group"/>
-</component>
-<component name="cookie" filter="s60" long-name="Cookie Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/cookie/group"/>
-</component>
-<component name="deflatefilter" filter="s60" long-name="Deflate Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/deflatefilter/group"/>
-</component>
-<component name="httpfilteracceptheader" filter="s60" long-name="Accept Header Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteracceptheader/group"/>
-</component>
-<component name="httpfilterauthentication" filter="s60" long-name="Authentication Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterauthentication/group"/>
-</component>
-<component name="httpfilterconnhandler" filter="s60" long-name="Connection Handler Fitler" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterconnhandler/group"/>
-</component>
-<component name="httpfilteriop" filter="s60" long-name="HTTP IOP Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteriop/group"/>
-</component>
-<component name="httpfilterproxy" filter="s60" long-name="HTTP Proxy Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterproxy/group"/>
-</component>
-<component name="uaproffilter" filter="s60" long-name="UAProf Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/uaproffilter/group"/>
-</component>
-</collection>
-<collection name="applayerprotocols" long-name="Application Layer Protocols" level="server">
-<component name="httptransportfw" long-name="HTTP Transport Framework" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
-</component>
-<component name="httpexamples" long-name="HTTP Examples" introduced="6.2" purpose="development">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpexamples/group" mrp="mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
-</component>
-<component name="wappushsupport" long-name="WAP Push Support" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
-</component>
-<component name="wapbase" long-name="WAP Base" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wapbase/Group" mrp="mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
-</component>
-<component name="ftpengine" long-name="FTP Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/ftpengine/group" mrp="mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
-</component>
-<component name="telnetengine" long-name="Telnet Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/telnetengine/group" mrp="mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
-</component>
-<component name="httpserviceapi" long-name="HTTP Service API" introduced="TB9.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpservice/group" mrp="mw/netprotocols/applayerprotocols/httpservice/group/http_service.mrp"/>
-</component>
-</collection>
-<collection name="applayerpluginsandutils" long-name="Application Layer Plugins and Utils" level="framework">
-<component name="uripermissionservices" long-name="URI Permission Services" introduced="^2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
-</component>
-<component name="bookmarksupport" long-name="Bookmark Support" introduced="9.1" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
-</component>
-<component name="httpprotocolplugins" long-name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
-</component>
-<component name="httptransportplugins" long-name="HTTP Transport Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
-</component>
-</collection>
-<collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
-<component name="netprotocols_metadata" long-name="High-level Internet Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ipappprotocols" level="generic" long-name="IP App Protocols" levels="plugin conn server if">
-<collection name="ipappprotocols_plat" long-name="IP App Protocols Platform Interfaces" level="if">
-<component name="srtp_api" long-name="SRTP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/srtp_api/group"/>
-</component>
-<component name="rtprtcp_api" long-name="RTP/RTCP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/rtprtcp_api/group"/>
-</component>
-</collection>
-<collection name="rtp" long-name="RTP" level="server">
-<component name="srtpstack" filter="s60" long-name="SRTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/srtpstack/group"/>
-</component>
-<component name="rtpstack" filter="s60" long-name="RTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/rtpstack/group"/>
-</component>
-</collection>
-<collection name="realtimenetprots" long-name="Real Time Net Protocols" level="server">
-<component name="symrtp" long-name="RTP" introduced="9.0" purpose="optional">
-<!-- Real Time Data Protocol -->
-<unit bldFile="mw/ipappprotocols/realtimenetprots/rtp/group" mrp="mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
-</component>
-<component name="sipfw" long-name="SIP Framework" introduced="9.2" purpose="optional">
-<unit bldFile="mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp" version="2"/>
-</component>
-</collection>
-<collection name="sipplugins" long-name="SIP Plugins" level="plugin">
-<component name="sippwlanplugin" filter="s60" long-name="SIP WLAN Plugin" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
-</component>
-<component name="sippsipsettingsui" filter="s60" long-name="SIP Settings UI" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
-</component>
-<component name="sippdevmgmtsipadapter" filter="s60" long-name="Device Management SIP Settings Adapter" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
-</component>
-<component name="sippsystemstatemonitor" filter="s60" long-name="SIP System State Monitor" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsystemstatemonitor/group"/>
-</component>
-<component name="sippsipadapter" filter="s60" long-name="SIP Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipadapter/group"/>
-</component>
-</collection>
-<collection name="sipproviderplugins" long-name="SIP Provider Plugins" level="conn">
-<component name="sipprovider" long-name="SIP Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipproviderplugins/sipprovider/group" mrp="mw/ipappprotocols/sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
-</component>
-</collection>
-<collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="if">
-<component name="ipappprotocols_metadata" long-name="IP App Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wirelessacc" level="specific" long-name="Wireless Access" levels="framework generic ui">
-<collection name="hsfw_plat" long-name="HotSpot Framework Platform Interfaces" level="ui">
-<component name="hotspot_framework_client_api" long-name="HotSpot Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_api" long-name="Internet Connectivity Test Service API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_settings_api" long-name="Internet Connectivity Test Service Settings API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
-</component>
-<component name="hotspot_framework_client_plugin_api" long-name="HotSpot Framework Client Plugin API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
-</component>
-</collection>
-<collection name="hotspotfw" long-name="HotSpot Framework" level="framework">
-<component name="hsserver" filter="s60" long-name="HotSpot Server" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="hsclient" filter="s60" long-name="HotSpot Client" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="internetconnectivitytestservice" filter="s60" long-name="Internet Connectivity Test Service" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
-</component>
-<component name="ictsdialogs" filter="s60" long-name="Internet Connectivity Test Service Dialogs" deprecated="^3" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
-</component>
-<component name="hspluginforagent" filter="s60" long-name="HotSpot Plugin for Agent" plugin="Y" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
-</component>
-<component name="hsbrowser" filter="s60" long-name="HotSpot Browser" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
-</component>
-<component name="hotspotfw_build" filter="s60" long-name="Hotspot Framework Build">
-<!-- should break up this bld.inf into the above components, or collapse them all into a single component -->
-<unit bldFile="mw/wirelessacc/hotspotfw/group"/>
-</component>
-</collection>
-<collection name="wlanutilities" long-name="WLAN Utilities" level="generic">
-<component name="wlanplugin" filter="s60" long-name="WLAN Plugin" plugin="Y">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlanplugin/group"/>
-</component>
-<component name="wlansettingsui" filter="s60" long-name="WLAN Settings UI">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlansettingsui/group"/>
-</component>
-<component name="wlansniffer" filter="s60" long-name="WLAN Sniffer">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlansniffer/group"/>
-</component>
-<component name="wlanindicatorplugin" filter="s60" long-name="WLAN Indicator Plugin" plugin="Y">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlanindicatorplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="vpnclient" level="specific" long-name="VPN Client" levels="engine ui api">
-<!-- is the !oem_build filter needed? -->
-<collection name="vpnc_plat" long-name="VPN Client Platform Interfaces" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API" class="api">
-<unit bldFile="mw/vpnclient/vpnc_plat/vpnapi/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API">
-<unit bldFile="mw/vpnclient/vpnapiimpl/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnengine" long-name="VPN Engine" level="engine">
-<!-- too many components in this collection.
- Probably best to group the binaries together into larger components
- or maybe split the collection into more reasonable groups -->
-<component name="eventmediatorapi" filter="s60" long-name="Event Mediator API">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediatorapi/group" filter="!oem_build"/>
-</component>
-<component name="eventviewer" filter="s60" long-name="Event Viewer">
-<unit bldFile="mw/vpnclient/vpnengine/eventviewer/group" filter="!oem_build"/>
-</component>
-<component name="vpnins" filter="s60" long-name="VPN Installer">
-<unit bldFile="mw/vpnclient/vpnengine/vpnins/group" filter="!oem_build"/>
-</component>
-<component name="ikepolparser" filter="s60" long-name="IKE Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/ikepolparser/group" filter="!oem_build"/>
-</component>
-<component name="utlbase64" filter="s60" long-name="Base64 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlbase64/group" filter="!oem_build"/>
-</component>
-<component name="utlcrypto" filter="s60" long-name="Crypto Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlcrypto/group" filter="!oem_build"/>
-</component>
-<component name="utlxml" filter="s60" long-name="XML Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlxml/group" filter="!oem_build"/>
-</component>
-<component name="utlpkcs10" filter="s60" long-name="PKCS#10 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs10/group" filter="!oem_build"/>
-</component>
-<component name="pkiserviceapi" filter="s60" long-name="PKI Service API">
-<unit bldFile="mw/vpnclient/vpnengine/pkiserviceapi/group" filter="!oem_build"/>
-</component>
-<component name="ikecert" filter="s60" long-name="IKE Certificate Management">
-<unit bldFile="mw/vpnclient/vpnengine/ikecert/group" filter="!oem_build"/>
-</component>
-<component name="kmdapi" filter="s60" long-name="Key Management Daemon API">
-<unit bldFile="mw/vpnclient/vpnengine/kmdapi/group" filter="!oem_build"/>
-</component>
-<component name="kmdserver" filter="s60" long-name="Key Management Daemon Server">
-<unit bldFile="mw/vpnclient/vpnengine/kmdserver/group" filter="!oem_build"/>
-</component>
-<component name="ikeutils" filter="s60" long-name="Internet Key Exchange Utils">
-<unit bldFile="mw/vpnclient/vpnengine/ikeutils/group" filter="!oem_build"/>
-</component>
-<component name="ikev1lib" filter="s60" long-name="IKEv1 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev1lib/group" filter="!oem_build"/>
-</component>
-<component name="ikev2lib" filter="s60" long-name="IKEv2 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev2lib/group" filter="!oem_build"/>
-</component>
-<component name="vpnipsecpolparser" filter="s60" long-name="VPN IPsec Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/vpnipsecpolparser/group" filter="!oem_build"/>
-</component>
-<component name="sit" filter="s60" long-name="Socket Interaction Thread">
-<unit bldFile="mw/vpnclient/vpnengine/sit/group" filter="!oem_build"/>
-</component>
-<component name="vpntcwrapper" filter="s60" long-name="VPN Terminal Control Wrapper">
-<unit bldFile="mw/vpnclient/vpnengine/vpntcwrapper/group" filter="!oem_build"/>
-</component>
-<component name="eventmediator" filter="s60" long-name="Event Mediator">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediator/group" filter="!oem_build"/>
-</component>
-<component name="pkiservice" filter="s60" long-name="PKI Service">
-<unit bldFile="mw/vpnclient/vpnengine/pkiservice/group" filter="!oem_build"/>
-</component>
-<component name="vpnconnagt" filter="s60" long-name="VPN Connection Agent">
-<unit bldFile="mw/vpnclient/vpnengine/vpnconnagt/group" filter="!oem_build"/>
-</component>
-<component name="vpnmanager" filter="s60" long-name="VPN Manager">
-<unit bldFile="mw/vpnclient/vpnengine/vpnmanager/group" filter="!oem_build"/>
-</component>
-<component name="vpncleaner" filter="s60" long-name="VPN Cleaner">
-<unit bldFile="mw/vpnclient/vpnengine/vpncleaner/group" filter="!oem_build"/>
-</component>
-<component name="utlpkcs12" filter="s60" long-name="PKCS#12 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs12/group" filter="!oem_build"/>
-</component>
-<component name="dmadengine" filter="s60" long-name="DM Adapter Engine">
-<unit bldFile="mw/vpnclient/vpnengine/dmadengine/group" filter="!oem_build"/>
-</component>
-<component name="dmadipsecvpn" filter="s60" long-name="IPsec VPN DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadipsecvpn/group" filter="!oem_build"/>
-</component>
-<component name="dmadpki" filter="s60" long-name="PKI DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadpki/group" filter="!oem_build"/>
-</component>
-<component name="ikesocket" filter="s60" long-name="IKE Socket" introduced="^3">
-<unit bldFile="mw/vpnclient/vpnengine/ikesocket/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnui" long-name="VPN UI" level="ui">
-<component name="vpnecomnotifier" filter="s60" long-name="VPN ECOM Notifier" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnecomnotifier/group" filter="!oem_build"/>
-</component>
-<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">
-<unit bldFile="mw/vpnclient/vpnui/vpnmanagementui/group" filter="!oem_build"/>
-</component>
-<component name="vpnpolins" filter="s60" long-name="VPN Policy Installer">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolins/group" filter="!oem_build"/>
-</component>
-<component name="vpnpolicyrecognizer" filter="s60" long-name="VPN Policy Recognizer" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolicyrecognizer/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnclient_info" long-name="VPN Client Info" level="api">
-<component name="vpnclient_help" filter="s60" long-name="VPN Client Help">
-<unit bldFile="mw/vpnclient/help/group" filter="!oem_build"/>
-</component>
-<component name="vpnclient_build" filter="s60" long-name="VPN Client Build">
-<!-- should split this up into the other components and remove this-->
-<unit bldFile="mw/vpnclient/group" filter="!oem_build"/>
-</component>
-</collection>
-</block>
-<block name="ipappsrv" level="specific" long-name="IP App Services" levels="framework generic server conn plugin">
-<collection name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" level="plugin">
-<component name="transcoder_api" long-name="Transcoder API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
-</component>
-<component name="comms_event_api" long-name="Comms Event API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/comms_event_api/group"/>
-</component>
-<component name="floor_control_api" long-name="Floor Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/floor_control_api/group"/>
-</component>
-<component name="media_control_api" long-name="Media Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/media_control_api/group"/>
-</component>
-<component name="multimedia_comms_api" long-name="Multimedia Comms API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/multimedia_comms_api/group"/>
-</component>
-<component name="nat_settings_api" long-name="NAT Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/nat_settings_api/group"/>
-</component>
-</collection>
-<collection name="natfw" long-name="NAT Framework" level="framework">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="natfw_build" filter="s60" long-name="NAT Framework Build" introduced="^2">
-<unit bldFile="mw/ipappsrv/natfw/group"/>
-</component>
-</collection>
-<collection name="multimediacommscontroller" long-name="Multimedia Comms Controller" level="conn">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommscontroller_build" filter="s60" long-name="Multimedia Comms Controller Build">
-<unit bldFile="mw/ipappsrv/multimediacommscontroller/group"/>
-</component>
-</collection>
-<collection name="multimediacommsengine" long-name="Multimedia Comms Engine" level="generic">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommsengine_build" filter="s60" long-name="Multimedia Comms Engine Build">
-<unit bldFile="mw/ipappsrv/multimediacommsengine/group"/>
-</component>
-</collection>
-<collection name="natplugins" long-name="NAT Plugins" level="plugin">
-<component name="natpcliprovisioningnatfwadapter" filter="s60" long-name="Client Provisioning NAT Framework Traversal Adapter" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/group"/>
-</component>
-<component name="natpdevmgmtnatfwadapter" filter="s60" long-name="Device Management NAT Framework Traversal Adapter" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/group"/>
-</component>
-<component name="natptraversalcontroller" filter="s60" long-name="NAT Traversal Controller" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natptraversalcontroller/group"/>
-</component>
-<component name="natpnatfwsdpprovider" filter="s60" long-name="NAT Framework SDP Provider" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpnatfwsdpprovider/group"/>
-</component>
-</collection>
-<collection name="ipappsrv_info" long-name="IP App Services Info" level="plugin">
-<component name="ipappsrv_build" long-name="IP App Services Build" filter="s60">
-<!-- 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">
-<collection name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" level="specific">
-<component name="string_parser_api" long-name="String Parser API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/string_parser_api/group"/>
-</component>
-<component name="cbs_mcn_client_api" long-name="CBS MCN Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cbs_mcn_client_api/group"/>
-</component>
-<component name="converged_call_engine_api" long-name="Converged Call Engine API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_engine_api/group"/>
-</component>
-<component name="aiw_dial_data_consumer_api" long-name="AIW Dial Data Consumer API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/aiw_dial_data_consumer_api/group"/>
-</component>
-<component name="phone_client_ussd_api" long-name="Phone Client USSD API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_api/group"/>
-</component>
-<component name="sat_refresh_api" long-name="SAT Refresh API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_refresh_api/group" filter="!test"/>
-</component>
-<component name="network_handling_engine_api" long-name="Network Handling Engine API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/network_handling_engine_api/group"/>
-</component>
-<component name="phone_client_emergency_call_api" long-name="Phone Client Emergency Call API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/group"/>
-</component>
-<component name="sat_configuration_api" long-name="SAT Configuration API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_configuration_api/group"/>
-</component>
-<component name="dial_utils_api" long-name="Dial Utils API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/dial_utils_api/group"/>
-</component>
-<component name="phone_client_image_handler_api" long-name="Phone Client Image Handler API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_image_handler_api/group"/>
-</component>
-<component name="phone_client_messenger_api" long-name="Phone Client Messenger API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_messenger_api/group"/>
-</component>
-<component name="sat_client_api" long-name="SAT Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_client_api/group" filter="!test"/>
-</component>
-<component name="phone_client_api" long-name="Phone Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_api/group"/>
-</component>
-<component name="sat_service_api" long-name="SAT Service API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_service_api/group" filter="!test"/>
-</component>
-<component name="cbs_message_api" long-name="CBS Message API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cbs_message_api/group"/>
-</component>
-<component name="phone_client_server_information_api" long-name="Phone Client Server Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_server_information_api/group"/>
-</component>
-<component name="phone_client_ussd_internal_api" long-name="Phone Client USSD Internal API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_internal_api/group"/>
-</component>
-<component name="phone_client_command_handler_api" long-name="Phone Client Command Handler API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_command_handler_api/group"/>
-</component>
-<component name="phone_client_notify_api" long-name="Phone Client Notify API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_notify_api/group"/>
-</component>
-<component name="phone_client_utility_api" long-name="Phone Client Utility API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_utility_api/group"/>
-</component>
-<component name="telephony_network_information_api" long-name="Telephony Network Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_network_information_api/group"/>
-</component>
-<component name="secondary_display_sat_api" long-name="Secondary Display SAT API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/secondary_display_sat_api/group"/>
-</component>
-<component name="callui_reconnect_query_api" long-name="CallUI Reconnect Query API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/callui_reconnect_query_api/group"/>
-</component>
-<component name="service_provider_settings_api" long-name="Service Provider Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/service_provider_settings_api/group"/>
-</component>
-<component name="converged_call_provider_api" long-name="Converged Call Provider API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_provider_api/group"/>
-</component>
-<component name="incoming_call_monitor_api" long-name="Incoming Call Monitor API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/incoming_call_monitor_api/group"/>
-</component>
-<component name="default_emergency_numbers_api" long-name="Default Emergency Numbers API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/default_emergency_numbers_api/group"/>
-</component>
-<component name="cenrep_database_api" long-name="Central Repository Database API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cenrep_database_api/group"/>
-</component>
-<component name="ss_settings_api" long-name="SS Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/ss_settings_api/group"/>
-</component>
-<component name="phone_settings_observer_api" long-name="Phone Settings Observer API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_observer_api/group"/>
-</component>
-<component name="phone_settings_notes_ui_api" long-name="Phone Settings Notes UI API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_notes_ui_api/group"/>
-</component>
-<component name="phone_settings_api" long-name="Phone Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_api/group"/>
-</component>
-<component name="voice_mailbox_number_api" long-name="Voice Mailbox Number API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_number_api/group"/>
-</component>
-<component name="voice_mailbox_settings_api" long-name="Voice Mailbox Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_settings_api/group"/>
-</component>
-<component name="call_information_api" long-name="Call Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/call_information_api/group" filter="!test"/>
-</component>
-<component name="call_remote_party_information_api" long-name="Call Remote Party Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/call_remote_party_information_api/group" filter="!test"/>
-</component>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_mediator_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="telutils" long-name="Telephony Utils" level="generic">
-<component name="phoneparser" filter="s60" long-name="Phone Parser">
-<unit bldFile="mw/phonesrv/telutils/phoneparser/group"/>
-</component>
-<component name="telephonyservice" filter="s60" long-name="Telephony Service">
-<unit bldFile="mw/phonesrv/telutils/telephonyservice/group"/>
-</component>
-</collection>
-<collection name="cbs" long-name="Cellular Baseband Services" level="plugin">
-<component name="cbsserver" filter="s60" long-name="CBS Server">
-<unit bldFile="mw/phonesrv/cbs/cbsserver/group"/>
-</component>
-<component name="cbsui" filter="s60" long-name="CBS UI">
-<unit bldFile="mw/phonesrv/cbs/cbsui/group"/>
-</component>
-</collection>
-<collection name="cellular" long-name="Cellular" level="server">
-<component name="telephonysettings" filter="s60" long-name="Telephony Settings">
-<unit bldFile="mw/phonesrv/cellular/telephonysettings/group" filter="!test"/>
-</component>
-<component name="sssettings" filter="s60" long-name="Supplementary Service Settings">
-<unit bldFile="mw/phonesrv/cellular/sssettings/group" filter="!test"/>
-</component>
-<component name="psetnotesui" filter="s60" long-name="Phone Settings Notes UI">
-<unit bldFile="mw/phonesrv/cellular/psetnotesui/group" filter="!test"/>
-</component>
-<component name="servicerequest" filter="s60" long-name="Service Request">
-<unit bldFile="mw/phonesrv/cellular/servicerequest/group"/>
-</component>
-</collection>
-<collection name="convergedcallengine" long-name="Converged Call Engine" level="framework">
-<component name="callprovider" filter="s60" long-name="Call Provider">
-<unit bldFile="mw/phonesrv/convergedcallengine/callprovider/group"/>
-</component>
-<component name="cce" filter="s60" long-name="CCE">
-<unit bldFile="mw/phonesrv/convergedcallengine/cce/group" filter="!test"/>
-</component>
-<component name="spsettings" filter="s60" long-name="Service Provider Settings">
-<unit bldFile="mw/phonesrv/convergedcallengine/spsettings/group" filter="!test"/>
-</component>
-<component name="cenrepdatabase" filter="s60" long-name="CCE Cenrep Database">
-<unit bldFile="mw/phonesrv/convergedcallengine/cenrepdatabase/group"/>
-</component>
-<component name="serviceselector" filter="s60" long-name="Service Selector">
-<unit bldFile="mw/phonesrv/convergedcallengine/serviceselector/group"/>
-</component>
-<component name="csplugin" filter="s60" long-name="CS Plugin" plugin="Y">
-<!-- should spell out CS in name -->
-<unit bldFile="mw/phonesrv/convergedcallengine/csplugin/group"/>
-</component>
-</collection>
-<collection name="engines" long-name="Telephony Engines" level="specific">
-<component name="vmbxengine" filter="s60" long-name="Voice Mailbox Engine">
-<unit bldFile="mw/phonesrv/engines/vmbxengine/group"/>
-</component>
-</collection>
-<collection name="networkhandling" long-name="Network Handling" level="plugin">
-<component name="networkhandlingengine" filter="s60" long-name="Network Handling Engine">
-<unit bldFile="mw/phonesrv/networkhandling/networkhandlingengine/group"/>
-</component>
-</collection>
-<collection name="phoneclientserver" long-name="Phone Client/Server" level="server">
-<component name="enpolicy" filter="s60" long-name="Emergency Number Policy">
-<unit bldFile="mw/phonesrv/phoneclientserver/enpolicy/group"/>
-</component>
-<component name="aiwdialdata" filter="s60" long-name="AIW Dial Data">
-<unit bldFile="mw/phonesrv/phoneclientserver/aiwdialdata/group" filter="!test"/>
-</component>
-<component name="dialutils" filter="s60" long-name="Dial Utils">
-<unit bldFile="mw/phonesrv/phoneclientserver/dialutils/group" filter="!test"/>
-</component>
-<component name="phoneclient" filter="s60" long-name="Phone Client">
-<unit bldFile="mw/phonesrv/phoneclientserver/phoneclient/group" filter="!test"/>
-</component>
-<component name="phoneserver" filter="s60" long-name="Phone Server">
-<unit bldFile="mw/phonesrv/phoneclientserver/phoneserver/group"/>
-</component>
-<component name="callui" filter="s60" long-name="Call UI">
-<unit bldFile="mw/phonesrv/phoneclientserver/callui/group"/>
-</component>
-</collection>
-<collection name="satengine" long-name="SIM Application Toolkit Engine" level="generic">
-<component name="satserver" filter="s60" long-name="SAT Server">
-<unit bldFile="mw/phonesrv/satengine/satserver/group"/>
-</component>
-</collection>
-<collection name="satui" long-name="SIM Application Toolkit UI" level="specific">
-<component name="satapp" filter="s60" long-name="SAT Application">
-<unit bldFile="mw/phonesrv/satui/satapp/group"/>
-</component>
-<component name="satplugin" filter="s60" long-name="SAT Plugin" plugin="Y">
-<unit bldFile="mw/phonesrv/satui/satplugin/group"/>
-</component>
-</collection>
-<collection name="phonecmdhandler" long-name="Phone Command Handler" level="generic">
-<component name="phonecmdhnlr" filter="s60" long-name="Phone Command Handler">
-<unit bldFile="mw/phonesrv/phonecmdhandler/phonecmdhnlr/group"/>
-</component>
-</collection>
-</block>
-<block name="messagingmw" level="specific" long-name="Messaging Middleware" levels="stack fw api">
-<collection name="msgfw_pub" long-name="Messaging Middleware Public Interfaces" level="api">
-<component name="send_ui_api" long-name="Send UI API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_pub/send_ui_api/group"/>
-</component>
-</collection>
-<collection name="msgfw_plat" long-name="Messaging Middleware Platform Interfaces" level="api">
-<component name="always_online_plugin_api" long-name="Always Online Plugin API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_plugin_api/group"/>
-</component>
-<component name="always_online_client_api" long-name="Always Online Client API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_client_api/group"/>
-</component>
-<component name="msg_common_utils_api" long-name="Messaging Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/msg_common_utils_api/group"/>
-</component>
-<component name="send_ui_plugin_api" long-name="Send UI Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/send_ui_plugin_api/group"/>
-</component>
-<component name="send_ui_datautils_api" long-name="Send UI Data Utils API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/send_ui_datautils_api/group"/>
-</component>
-</collection>
-<collection name="msgbranched" long-name="Messaging Branched" level="fw">
-<!-- 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"/>
-</component>
-</collection>
-<collection name="messagingfw" long-name="Messaging Framework" level="fw">
-<!-- should break this collection up into smaller related collections -->
-<component name="alwaysonline" filter="s60" long-name="Always Online Server" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/alwaysonline/group"/>
-</component>
-<component name="msgcommonutils" filter="s60" long-name="Messaging Common Utils" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/msgcommonutils/group"/>
-</component>
-<component name="senduiservices" filter="s60" long-name="Send UI Services" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/senduiservices/group"/>
-</component>
-<component name="scheduledsendmtm" long-name="Scheduled Send MTM" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/group" mrp="mw/messagingmw/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
-</component>
-<component name="msgsrvnstore" long-name="Message Server and Store" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/group" mrp="mw/messagingmw/messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
-</component>
-<component name="biomsgfw" long-name="BIO Messaging Framework" introduced="6.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/group" mrp="mw/messagingmw/messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
-</component>
-<component name="msgconf" long-name="Messaging Config" introduced="^2" purpose="optional" class="config">
-<unit bldFile="mw/messagingmw/messagingfw/msgconf/group" mrp="mw/messagingmw/messagingfw/msgconf/group/messaging_config.mrp"/>
-</component>
-<component name="watcherfw" long-name="Watcher Framework" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/watcherfw/group" mrp="mw/messagingmw/messagingfw/watcherfw/group/messaging_watcher.mrp"/>
-</component>
-<component name="msgtest" long-name="Messaging Test" purpose="development">
-<unit bldFile="mw/messagingmw/messagingfw/msgtest/group" mrp="mw/messagingmw/messagingfw/msgtest/group/messaging_test.mrp"/>
-</component>
-<component name="sendas" long-name="Send As" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/sendas/group" mrp="mw/messagingmw/messagingfw/sendas/group/messaging_sendas2.mrp"/>
-</component>
-<component name="msgurlhandler" long-name="Message URL Handler" introduced="7.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/group" mrp="mw/messagingmw/messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
-</component>
-<component name="wappushfw" long-name="WAP Push Framework" introduced="6.1" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/wappushfw/group" mrp="mw/messagingmw/messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
-</component>
-<component name="suplsmshandler" long-name="SUPL SMS Handler" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplsmshandler/group" mrp="mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/>
-</component>
-<component name="suplwappushhandler" long-name="SUPL WAP Push Handler" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
-</component>
-</collection>
-<collection name="messagingmw_info" long-name="Messaging Middleware Info" level="api">
-<component name="messagingmw_metadata" long-name="Messaging Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="imsrv" level="specific" long-name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
-<collection name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" level="specific">
-<component name="ximp_core_data_model_api" long-name="XIMP Core Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_host_api" long-name="XIMP Presence Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_presence_data_model_api" long-name="XIMP Presence Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_api" long-name="XIMP Presence Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_presence_management_api" long-name="XIMP Presence Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_management_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_host_api" long-name="XIMP Core Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_core_management_api" long-name="XIMP Core Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_management_api/group"/>
-</component>
-<component name="ximp_presence_base_api" long-name="XIMP Presence Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_base_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_api" long-name="XIMP Core Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_core_base_api" long-name="XIMP Core Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_base_api/group"/>
-</component>
-<component name="ximp_presence_cache_api" long-name="XIMP Presence Cache API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_cache_api/group"/>
-</component>
-<component name="ximp_core_feature_plugin_api" long-name="XIMP Core Feature Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_host_api" long-name="XIMP IM Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_im_data_model_api" long-name="XIMP IM Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_data_model_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_api" long-name="XIMP IM Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_im_management_api" long-name="XIMP IM Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_management_api/group"/>
-</component>
-<component name="ximp_im_base_api" long-name="XIMP IM Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_base_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_host_api" long-name="XIMP Search Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_search_data_model_api" long-name="XIMP Search Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_data_model_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_api" long-name="XIMP search Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_search_management_api" long-name="XIMP Search Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_management_api/group"/>
-</component>
-<component name="ximp_search_base_api" long-name="XIMP Search Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_base_api/group"/>
-</component>
-<component name="xmpp_settings_api" long-name="XMPP Settings API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/group"/>
-</component>
-<component name="im_cache_client_api" long-name="IM Cache Client API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/im_cache_client_api/group"/>
-</component>
-<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 Avability Text" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
-</component>
-</collection>
-<collection name="ximpfw" long-name="XIMP Framework" level="framework">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="ximpfw_build" filter="s60" long-name="XIMP Framework Build">
-<unit bldFile="mw/imsrv/ximpfw/group"/>
-</component>
-</collection>
-<collection name="imservices" long-name="IM Services" level="generic">
-<component name="imfeatureplugin" filter="s60" long-name="IM Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/imfeatureplugin/group"/>
-</component>
-<component name="searchfeatureplugin" filter="s60" long-name="Search Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/searchfeatureplugin/group"/>
-</component>
-<component name="xmppsettingsapi" filter="s60" long-name="XMPP Settings API" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsapi/group"/>
-</component>
-<component name="xmppsettingsfetcher" filter="s60" long-name="XMPP Settings Fetcher" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/group"/>
-</component>
-<component name="ossprotocoladaptation" filter="s60" long-name="OSS Protocol Adaptation" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/ossprotocoladaptation/group"/>
-</component>
-<component name="instantmessagingcache" filter="s60" long-name="Instant Messaging Cache" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/instantmessagingcache/group"/>
-</component>
-</collection>
-<collection name="brandingserver" long-name="Branding Server" level="specific">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="brandingserver_build" filter="s60" long-name="Branding Server Build">
-<unit bldFile="mw/imsrv/brandingserver/group"/>
-</component>
-</collection>
-</block>
-<block name="legacypresence" level="specific" long-name="Legacy Presence Services" levels="engine fw ui">
-<collection name="pressrv_plat" long-name="Legacy Presence Services Platform Interfaces" level="ui">
-<component name="presence_list_api" long-name="Presence List API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/presence_list_api/group"/>
-</component>
-<component name="watcher_info_api" long-name="Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_info_api/group"/>
-</component>
-<component name="simple_documents_api" long-name="SIMPLE Documents API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_documents_api/group"/>
-</component>
-<component name="authorization_api" long-name="Authorization API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/authorization_api/group"/>
-</component>
-<component name="xdm_protocol_plugin_api" long-name="XDM Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_protocol_plugin_api/group"/>
-</component>
-<component name="watcher_api" long-name="Watcher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_api/group"/>
-</component>
-<component name="xdm_api" long-name="XDM API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_api/group"/>
-</component>
-<component name="registration_api" long-name="Registration API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/registration_api/group"/>
-</component>
-<component name="publisher_api" long-name="Publisher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/publisher_api/group"/>
-</component>
-<component name="messaging_connection_manager_api" long-name="Messaging Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/messaging_connection_manager_api/group"/>
-</component>
-<component name="xdm_settings_api" long-name="XDM Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_settings_api/group"/>
-</component>
-<component name="simple_settings_api" long-name="SIMPLE Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_settings_api/group"/>
-</component>
-<component name="simple_instant_msg_api" long-name="Simple Instant Msg API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_instant_msg_api/group"/>
-</component>
-</collection>
-<collection name="xdmengine" long-name="XDM Engine" level="engine">
-<!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
-<component name="xdmengine_build" filter="s60" long-name="XDM Engine Build">
-<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">
-<unit bldFile="mw/legacypresence/xdmprotocols/group"/>
-</component>
-</collection>
-<collection name="msgconnmanager" long-name="Messaging Connection Manager" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="msgconnmanager_build" filter="s60" long-name="Messaging Connection Manager Build">
-<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">
-<unit bldFile="mw/legacypresence/simpleengine/group"/>
-</component>
-</collection>
-<collection name="presencefwsimpleadpt" long-name="Presence Framework SIMPLE Adaptation" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="simpleplugin" filter="s60" long-name="SIMPLE Plugin" plugin="Y">
-<unit bldFile="mw/legacypresence/presencefwsimpleadpt/group"/>
-</component>
-</collection>
-<collection name="simpledatamodeladapter" long-name="SIMPLE Data Model Adapter" level="fw">
-<component name="presenceplugin" filter="s60" long-name="Presence Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/legacypresence/simpledatamodeladapter/group"/>
-</component>
-</collection>
-</block>
-<block name="opensrv" level="specific" long-name="Open Services" levels="prt lib server eng">
-<collection name="opensrv_plat" long-name="Open Services Platform Interfaces" level="eng">
-<component name="messagequeue_api" long-name="Message Queue API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/opensrv/opensrv_plat/messagequeue_api/group"/>
-</component>
-</collection>
-<collection name="loudmouth" long-name="Loudmouth" level="prt">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="loudmouth_build" filter="s60" long-name="Loudmouth Build" introduced="^2">
-<unit bldFile="mw/opensrv/loudmouth/group"/>
-</component>
-</collection>
-<collection name="libtelepathy" long-name="Telepathy Library" level="lib">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="libtelepathy_build" filter="s60" long-name="Telepathy Library Build" introduced="^2">
-<unit bldFile="mw/opensrv/libtelepathy/group"/>
-</component>
-</collection>
-<collection name="telepathygabble" long-name="Telepathy Gabble" level="eng">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="telepathygabble_build" filter="s60" long-name="Telepathy Gabble Build" introduced="^2">
-<unit bldFile="mw/opensrv/telepathygabble/group"/>
-</component>
-</collection>
-<collection name="isolationserver" long-name="Isolation Server" level="server">
-<component name="messagequeue" filter="s60" long-name="Message Queue" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/messagequeue/group"/>
-</component>
-<component name="isoserver" filter="s60" long-name="ISO Server" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/isoserver/group"/>
-</component>
-<component name="isolationserver_build" filter="s60" long-name="Isloation Server Build" introduced="^2">
-<!-- needs #includes removed. either move the exports to another component or make this a ROM component -->
-<unit bldFile="mw/opensrv/isolationserver/group"/>
-</component>
-</collection>
-</block>
-<block name="remotemgmt" level="specific" long-name="Remote Management" levels="plugin framework server generic specific">
-<collection name="remotemgmt_pub" long-name="Remote Management Public Interfaces" level="specific">
-<component name="synchronization_capability_api" long-name="Synchronization Capability API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
-</component>
-</collection>
-<collection name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" level="specific">
-<component name="common_agent_util_and_definitions_api" long-name="Common Agent util and definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
-</component>
-<component name="policy_management_certificate_api" long-name="Policy Management Certificate API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/group"/>
-</component>
-<component name="oma_provisioning_adapter_api" long-name="OMA Provisioning Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_adapter_api/group"/>
-</component>
-<component name="device_management_parameter_api" long-name="Device Management Parameter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_parameter_api/group"/>
-</component>
-<component name="data_synchronization_plugin_api" long-name="Data Synchronization Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/group"/>
-</component>
-<component name="sync_alert_handler_api" long-name="Sync Alert Handler API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
-</component>
-<component name="syncml_notifier_api" long-name="SyncML Notifier API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
-</component>
-<component name="syncml_client_api" long-name="SyncML Client API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
-</component>
-<component name="device_management_plugin_api" long-name="Device Management plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_plugin_api/group"/>
-</component>
-<component name="dm_tree_apis" long-name="DM Tree APIs" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
-</component>
-<component name="terminal_security_device_lock_api" long-name="Terminal Security Device Lock API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/group"/>
-</component>
-<component name="policy_management_request_api" long-name="Policy Management Request API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/group"/>
-</component>
-<component name="ds_constant_definitions_api" long-name="DS Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_constant_definitions_api/group"/>
-</component>
-<component name="scp_server_api" long-name="SCP Server API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/group"/>
-</component>
-<component name="data_synchronization_notification_api" long-name="Data Synchronization Notification API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_notification_api/group"/>
-</component>
-<component name="oma_provisioning_engine_api" long-name="OMA Provisioning Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/group"/>
-</component>
-<component name="dm_utils_api" long-name="DM Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/group"/>
-</component>
-<component name="syncml_alert_api" long-name="SyncML Alert API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/group"/>
-</component>
-<component name="obex_client_session_api" long-name="OBEX Client session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/obex_client_session_api/group"/>
-</component>
-<component name="setting_enforcement_info_api" long-name="Setting Enforcement Info API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/group"/>
-</component>
-<component name="dm_constant_definitions_api" long-name="DM Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
-</component>
-<component name="oma_ds_extensions_api" long-name="OMA DS Extensions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
-</component>
-<component name="pnpms_utils_api" long-name="PNPMS Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
-</component>
-<component name="diagnostics_plugin_utility_api" long-name="Diagnostics Plugin Utility API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
-</component>
-<component name="diagnostics_plugin_api" long-name="Diagnostics Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
-</component>
-<component name="diagnostics_framework_api" long-name="Diagnostics Framework API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
-</component>
-<component name="diagnostics_results_api" long-name="Diagnostics Results API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
-</component>
-<component name="diagnostics_plugin_pool_api" long-name="Diagnostics Plugin Pool API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
-</component>
-<component name="adaptive_history_list_api" long-name="Adaptive History List API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
-</component>
-<component name="adaptive_history_list_session_api" long-name="Adaptive History List Session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
-</component>
-<component name="fota_engine_api" long-name="FOTA Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
-</component>
-<component name="update_package_storage_plugin_api" long-name="Update Package Storage Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
-</component>
-<component name="syncml_notifier_roaming_api" long-name="SyncML Notifier Roaming API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
-</component>
-<component name="sync_service_api" long-name="Sync Service API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_service_api/group"/>
-</component>
-<component name="dcmo_adapter_api" long-name="DCMO Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_adapter_api/group"/>
-</component>
-<component name="dcmo_control_api" long-name="DCMO Control API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_control_api/group"/>
-</component>
-<component name="ds_capability_mgmt_plugin_api" long-name="DS Capability Management Plugin API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
-</component>
-<component name="dm_native_notifier_api" long-name="DM Native Notifier API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_native_notifier_api/group"/>
-</component>
-<component name="syncml_ds_error_reporting_api" long-name="SyncML DS Error Reporting API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_ds_error_reporting_api/group"/>
-</component>
-<component name="syncml_ds_customization_api" long-name="SyncML DS Customization API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_ds_customization_api/group"/>
-</component>
-</collection>
-<collection name="policymanagement" long-name="Policy Management" level="generic">
-<component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">
-<unit bldFile="mw/remotemgmt/policymanagement/pmdmadapter/group"/>
-</component>
-<component name="dmutilserver" filter="s60" long-name="DM Util Server">
-<unit bldFile="mw/remotemgmt/policymanagement/dmutilserver/group"/>
-</component>
-<component name="policyengine" filter="s60" long-name="Policy Engine">
-<unit bldFile="mw/remotemgmt/policymanagement/policyengine/group"/>
-</component>
-<component name="policymanagement_build" filter="s60" long-name="Policy Management Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/policymanagement/group"/>
-</component>
-</collection>
-<collection name="syncmlfw" long-name="SyncML Framework" level="server">
-<component name="syncmlfw_build" filter="s60" long-name="SyncML Framework Build">
-<!-- need to break this up into components. Too convoluted a structure to be in a single bld.inf-->
-<unit bldFile="mw/remotemgmt/syncmlfw/group"/>
-</component>
-</collection>
-<collection name="terminalsecurity" long-name="Terminal Security" level="specific">
-<component name="scp" filter="s60" long-name="Security Code Proxy">
-<!-- can only have one unit, need to have these #included from a single bld.inf -->
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpdatabase/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpserver/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scppatternplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scphistoryplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scptimestampplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpeventhandler/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/dmeventnotifier/group"/>
-</component>
-<component name="terminalsecurity_client" filter="s60" long-name="Terminal Control Client">
-<unit bldFile="mw/remotemgmt/terminalsecurity/client/group"/>
-</component>
-<component name="terminalsecurity_server" filter="s60" long-name="Terminal Control Server">
-<unit bldFile="mw/remotemgmt/terminalsecurity/server/group"/>
-</component>
-<component name="tcadapter" filter="s60" long-name="Terminal Control Adapter">
-<unit bldFile="mw/remotemgmt/terminalsecurity/tcadapter/bld"/>
-</component>
-<component name="terminalsecurity_build" filter="s60" long-name="Terminal Security Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/terminalsecurity/group"/>
-</component>
-</collection>
-<collection name="omaprovisioning" long-name="OMA Provisioning" level="specific">
-<component name="pnputil" filter="s60" long-name="PnP Util">
-<unit bldFile="mw/remotemgmt/omaprovisioning/pnputil/group"/>
-</component>
-<component name="provisioning" filter="s60" long-name="Provisioning">
-<unit bldFile="mw/remotemgmt/omaprovisioning/provisioning/group"/>
-</component>
-</collection>
-<collection name="devicediagnosticsfw" long-name="Device Diagnostics Framework" level="framework">
-<component name="diagframework" filter="s60" long-name="Diagnostics Framework">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
-</component>
-<component name="diagpluginbase" filter="s60" long-name="Diagnostics Plugin Base">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
-</component>
-<component name="diagresultsdb" filter="s60" long-name="Diagnostics Results Database">
-<!-- can only have one unit, merge or split into two components -->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
-</component>
-<component name="devicediagnosticsfw_build" filter="s60" long-name="Device Diagnostics Framework Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/group"/>
-</component>
-</collection>
-<collection name="dcmofw" long-name="Device Capability Management Object Framework" level="framework">
-<component name="dcmoclient" filter="s60" long-name="DCMO Client">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoclient/group"/>
-</component>
-<component name="dcmoserver" filter="s60" long-name="DCMO Server">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoserver/group"/>
-</component>
-<component name="dcmocustcmd" filter="s60" long-name="DCMO Custom Commands">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmocustcmd/group"/>
-</component>
-<component name="dcmofw_build" filter="s60" long-name="DCMO Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/dcmofw/group"/>
-</component>
-</collection>
-<collection name="fotaapplication" long-name="FOTA Application" level="generic">
-<component name="fotaapplication_build" filter="s60" long-name="FOTA Application Build">
-<!-- remove this component when configuration is in place and the #ifdefs have been worked out -->
-<unit bldFile="mw/remotemgmt/fotaapplication/group"/>
-</component>
-<component name="fotaserver" filter="s60" long-name="FOTA Server">
-<!-- uncomment when #ifdefs are resolved -->
-<!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
-</component>
-<component name="fotacustcmds" filter="s60" long-name="FOTA Custom Commands" class="placeholder">
-<!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
-<!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
-</component>
-</collection>
-</block>
-<block name="remotestorage" level="generic" long-name="Remote Storage" levels="framework if">
-<collection name="rsfw_plat" long-name="Remote Storage Platform Interfaces" level="if">
-<component name="rsfw_access_protocol_plugin_api" filter="s60" long-name="Remote Storage Framework Access Protocol Plugin API" class="api">
-<unit bldFile="mw/remotestorage/rsfw_plat/rsfw_access_protocol_plugin_api/group"/>
-</component>
-</collection>
-<collection name="remotestoragefw" long-name="Remote Storage Framework" level="framework">
-<component name="mountstore" filter="s60" long-name="RSFW Mount Store">
-<unit bldFile="mw/remotestorage/remotestoragefw/mountstore/group"/>
-</component>
-<component name="rsfwnotifierplugins" filter="s60" long-name="RSFW Notifier Plugins" plugin="Y">
-<unit bldFile="mw/remotestorage/remotestoragefw/rsfwnotifierplugins/group"/>
-</component>
-<component name="remotefileengine" filter="s60" long-name="Remote File Engine">
-<unit bldFile="mw/remotestorage/remotestoragefw/remotefileengine/group"/>
-</component>
-<component name="mountmanager" filter="s60" long-name="RSFW Mount Manager">
-<unit bldFile="mw/remotestorage/remotestoragefw/mountmanager/group"/>
-</component>
-<component name="webdavaccessplugin" filter="s60" long-name="WebDAV Access Plugin" plugin="Y">
-<unit bldFile="mw/remotestorage/remotestoragefw/webdavaccessplugin/group"/>
-</component>
-<component name="remotefilesystemplugin" filter="s60" long-name="Remote Filesystem Plugin" plugin="Y">
-<unit bldFile="mw/remotestorage/remotestoragefw/remotefilesystemplugin/group"/>
-</component>
-<component name="remotestoragegsplugin" filter="s60" long-name="RS GS Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
-<!-- <unit bldFile="remotestoragefw/gsplugin/group"/>-->
-</component>
-<component name="remotedriveconfigurationbiocontrol" filter="s60" long-name="Remote Drive Configuration BIO Control">
-<!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
-<!-- <unit bldFile="remotestoragefw/remotedriveconfigurationbiocontrol/group"/>-->
-</component>
-<component name="remotestoragefw_build" filter="s60" long-name="Remote Storage Framework Build">
-<!-- move exports to other components.
- This is needed for #includes of configured component until congigiration is in place -->
-<unit bldFile="mw/remotestorage/remotestoragefw/group"/>
-</component>
-</collection>
-</block>
-<block name="remoteconn" level="generic" long-name="Remote Connectivity" levels="plugin framework server generic specific">
-<collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
-<component name="secon" filter="s60" long-name="Service Controllers">
-<unit bldFile="mw/remoteconn/connectivitymodules/secon/group"/>
-</component>
-</collection>
-<collection name="remoteconn_info" long-name="Remote Connectivity Info" level="specific">
-<component name="remoteconn_metadata" long-name="Remote Connectivity Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mtptransports" long-name="MTP Transports" level="plugin">
-<component name="mtpusbtransport" long-name="MTP USB Transport" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpusbtransport/group" mrp="mw/remoteconn/mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
-</component>
-<component name="mtpptpiptransport" long-name="MTP PTP-IP Transport" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpptpiptransport/group" mrp="mw/remoteconn/mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
-</component>
-<component name="mtpcontroller" long-name="MTP Controller" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpcontroller/group" mrp="mw/remoteconn/mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
-</component>
-</collection>
-<collection name="mtpfws" long-name="MTP Frameworks" level="framework">
-<component name="mtpfw" long-name="MTP Framework" introduced="^2" purpose="optional">
-<unit bldFile="mw/remoteconn/mtpfws/mtpfw/group" mrp="mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/>
-</component>
-</collection>
-<collection name="mtpdataproviders" long-name="MTP Data Providers" level="generic">
-<component name="mtpfileandfolderdp" long-name="MTP File and Folder Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group" mrp="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
-</component>
-<component name="mtpimagedp" long-name="MTP Image Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpimagedp/group" mrp="mw/remoteconn/mtpdataproviders/mtpimagedp/group/mtp_imagedp.mrp"/>
-</component>
-<component name="mtppictbridgedp" long-name="MTP PictBridge Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group" mrp="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group/mtp_pictbridgedp.mrp"/>
-</component>
-</collection>
-<collection name="backupandrestore" long-name="Backup and Restore" level="specific">
-<component name="backupengine" long-name="Backup Engine" introduced="9.0" purpose="optional">
-<unit bldFile="mw/remoteconn/backupandrestore/backupengine/group" mrp="mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
-</component>
-<component name="backuptest" long-name="Backup Test" introduced="^2" purpose="development">
-<unit bldFile="mw/remoteconn/backupandrestore/backuptest/group" mrp="mw/remoteconn/backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
-</component>
-</collection>
-<collection name="obex" long-name="OBEX" level="generic">
-<component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexprotocol/group" mrp="mw/remoteconn/obex/obexprotocol/group/obex.mrp"/>
-</component>
-<component name="obexextensionapi" long-name="OBEX Extension API" introduced="9.2" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexextensionapi/group" mrp="mw/remoteconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
-</component>
-</collection>
-</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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<unit mrp="mw/srvdiscovery/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="dlnasrv" level="specific" long-name="DLNA Services" levels="stack server ctrl framework plugin">
-<!-- uncomment all the units when configuration is in place, they're currently #included from other xxx_build components -->
-<collection name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" level="plugin">
-<component name="upnp_media_server_settings_api" long-name="UPnP Media Server Settings API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_settings_api/group"/>
-</component>
-<component name="upnp_av_objects_api" long-name="UPnP A/V Objects API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_av_objects_api/group"/>
-</component>
-<component name="upnp_media_server_api" long-name="UPnP Media Server API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_api/group"/>
-</component>
-<component name="upnp_security_plugin_api" long-name="UPnP Security Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_security_plugin_api/group"/>
-</component>
-<component name="upnp_avcp_api" long-name="UPnP AVCP API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_avcp_api/group"/>
-</component>
-<component name="upnp_media_server_metadata_api" long-name="UPnP Media Server Metadata API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_metadata_api/group"/>
-</component>
-<component name="upnp_command_api" long-name="UPnP Command API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_command_api/group"/>
-</component>
-<component name="upnp_plugin_api" long-name="UPnP Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_plugin_api/group"/>
-</component>
-</collection>
-<collection name="upnpavcontrolpoint" long-name="UPnP A/V Control Point" level="plugin">
-<component name="avcontrolframework" filter="s60" long-name="A/V Control Famework" introduced="9.1" deprecated="^3">
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
-</component>
-<component name="upnpavcontrolpoint_build" filter="s60" long-name="UPnP A/V Control Point Build" introduced="9.1" deprecated="^3">
-<!-- put exports in other component instead -->
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/group"/>
-</component>
-</collection>
-<collection name="upnpmediaserver" long-name="UPnP Media Server" level="server">
-<component name="avobjects" filter="s60" long-name="A/V Objects">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/avobjects/group"/>
-</component>
-<component name="mediaserverclient" filter="s60" long-name="Media Server Client">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverclient/group"/>
-</component>
-<component name="connectionmanagerservice" filter="s60" long-name="Connection Manager Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/connectionmanagerservice/group"/>
-</component>
-<component name="contentdirectoryservice" filter="s60" long-name="Content Directory Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/contentdirectoryservice/group"/>
-</component>
-<component name="mediaserverengine" filter="s60" long-name="Media Server Engine">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverengine/group"/>
-</component>
-<component name="upnpmediaserver_build" filter="s60" long-name="UPnP Media Server Build">
-<!-- move exports into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpmediaserver/group"/>
-</component>
-</collection>
-<collection name="upnpavcontroller" long-name="UPnP A/V Controller" level="ctrl">
-<component name="upnpxmlparser" filter="s60" long-name="UPnP XML Parser" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpxmlparser/group"/>
-</component>
-<component name="upnpavcontrollerserver" filter="s60" long-name="UPnP A/V Controller Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerserver/group"/>
-</component>
-<component name="upnpavcontrollerclient" filter="s60" long-name="UPnP A/V Ccontroller Client" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerclient/group"/>
-</component>
-<component name="upnpavcontrollerhelper" filter="s60" long-name="UPnP A/V Controller Helper" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerhelper/group"/>
-</component>
-<component name="upnpavcontroller_build" filter="s60" long-name="UPnP A/V Controller Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpavcontroller/group"/>
-</component>
-</collection>
-<collection name="upnpframework" long-name="UPnP Framework" level="framework">
-<component name="upnputilities" filter="s60" long-name="UPnP Utilities" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnputilities/group"/>
-</component>
-<component name="upnpextensionpluginif" filter="s60" long-name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpextensionpluginif/group"/> -->
-</component>
-<component name="upnpfiletransferengine" filter="s60" long-name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>-->
-</component>
-<component name="upnpcommonui" filter="s60" long-name="UPnP Common UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpcommonui/group"/>-->
-</component>
-<component name="upnpaiwengine" filter="s60" long-name="UPnP AIW Engine" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpaiwengine/group"/> -->
-</component>
-<component name="upnpaiwprovider" filter="s60" long-name="UPnP AIW Provider" introduced="^2" deprecated="^3" plugin="Y">
-<!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
-</component>
-<component name="upnpmusicadapter" filter="s60" long-name="UPnP Music Adapter" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
-</component>
-<component name="upnpcommand" filter="s60" long-name="UPnP Command" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpcommand/group"/>
-</component>
-<component name="upnpframework_build" filter="s60" long-name="UPnP Framework Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpframework/group"/>
-</component>
-</collection>
-<collection name="upnpsettings" long-name="UPnP Settings" level="framework">
-<component name="upnpsettingsengine" filter="s60" long-name="UPnP Settings Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
-</component>
-<component name="multiselectionui" filter="s60" long-name="Multi-Selection UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/multiselectionui/group"/>-->
-</component>
-<component name="appwizard" filter="s60" long-name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/appwizard/group"/>-->
-</component>
-<component name="upnpsharingui" filter="s60" long-name="UPnP Sharing UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
-</component>
-<component name="upnpgsplugin" filter="s60" long-name="UPnP GS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
-</component>
-<component name="upnpsettings_build" filter="s60" long-name="UPnP Settings Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsettings/group"/>
-</component>
-</collection>
-<collection name="upnpsharing" long-name="UPnP Sharing" level="server">
-<component name="upnpdlnaprofiler" filter="s60" long-name="UPnP DLNA Profiler" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpdlnaprofiler/group"/>
-</component>
-<component name="upnpsecurity" filter="s60" long-name="UPnP Security" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpsecurity/group"/>
-</component>
-<component name="upnpcontentserver" filter="s60" long-name="UPnP Content Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpcontentserver/group"/>
-</component>
-<component name="applicationengine" filter="s60" long-name="UPnP Application Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/applicationengine/group"/>
-</component>
-<component name="upnpsharing_build" filter="s60" long-name="UPnP Sharing Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsharing/group"/>
-</component>
-</collection>
-<collection name="upnpmpxplugins" long-name="UPnP MPX Plugins" level="plugin">
-<component name="upnpplaybackplugins" filter="s60" long-name="UPnP Playback Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/upnpplaybackplugins/group"/>
-</component>
-<component name="upnpmpxplugins_build" filter="s60" long-name="UPnP MPX Plugins Build" introduced="^2">
-<!-- move exports content into other component? -->
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/group"/>
-</component>
-</collection>
-<collection name="upnpharvester" long-name="UPnP Harvester" level="ctrl">
-<component name="upnpharvester_common" filter="s60" long-name="UPnP Harvester Common" introduced="^2" deprecated="^3" class="placeholder">
-<!-- need to merge or #include these to a single bld.inf -->
-<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
- <unit bldFile="upnpharvester/common/cmsettings/group"/>
- <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
- <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
-</component>
-<component name="cdssync" filter="s60" long-name="CDS Sync" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
-</component>
-<component name="mdhserver" filter="s60" long-name="Metadata Harvester Server" introduced="^2" deprecated="^3" class="placeholder">
-<!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
-</component>
-<component name="upnpharvester_build" filter="s60" long-name="UPnP Harvester Build" introduced="^2" deprecated="^3" class="placeholder">
-<!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
-<!--<unit bldFile="upnpharvester/group"/>-->
-</component>
-</collection>
-<collection name="homesync" long-name="Home Sync" level="plugin">
-<component name="contentmanager" filter="s60" long-name="Content Manager" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homesync/group"/>-->
-<!-- move bld.inf into contentmanager dir -->
-</component>
-</collection>
-<collection name="homemedia" long-name="Home Media" level="framework">
-<!-- collection is really just a component. Move down a directory -->
-<component name="homemedia_build" filter="s60" long-name="Home Media" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homemedia/group"/> -->
-</component>
-</collection>
-<collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin">
-<component name="dlnasrv_build" filter="s60" long-name="DLNA Services Build">
-<!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed -->
-<unit bldFile="mw/dlnasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="btservices" level="generic" long-name="Bluetooth Services" levels="framework server generic specific plugin">
-<collection name="btservices_pub" long-name="BT Services Public Interfaces" level="plugin">
-<component name="bluetooth_power_state_api" long-name="Bluetooth Power State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_power_state_api/group"/>
-</component>
-<component name="bluetooth_notifier_api" long-name="Bluetooth Notifier API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_notifier_api/group"/>
-</component>
-</collection>
-<collection name="btservices_plat" long-name="BT Services Platform Interfaces" level="plugin">
-<component name="bluetooth_dosserver_audio_api" long-name="Bluetooth DOS Server Audio API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dosserver_audio_api/group"/>
-</component>
-<component name="bluetooth_dut_mode_api" long-name="Bluetooth DUT Mode API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dut_mode_api/group"/>
-</component>
-<component name="bluetooth_engine_api" long-name="Bluetooth Engine API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-<component name="bluetooth_local_variation_api" long-name="Bluetooth Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_local_variation_api/group"/>
-</component>
-<component name="bluetooth_notifier_internal_api" long-name="Bluetooth Notifier internal API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_notifier_internal_api/group"/>
-</component>
-<component name="bluetooth_sap_connection_state_api" long-name="Bluetooth SAP Connection State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_sap_connection_state_api/group"/>
-</component>
-<component name="bluetooth_secondary_display_notification_api" long-name="Bluetooth Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_secondary_display_notification_api/group"/>
-</component>
-</collection>
-<collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
-<component name="bteng" filter="s60" long-name="Bluetooth Engine">
-<unit bldFile="mw/btservices/bluetoothengine/bteng/group"/>
-</component>
-<component name="btnotif" filter="s60" long-name="Bluetooth Notifier">
-<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"/>
-</component>
-<component name="btmac" filter="s60" long-name="Bluetooth Mono Audio Controller" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btmac/group"/>
-</component>
-<component name="btsac" filter="s60" long-name="Bluetooth Stereo Audio Controller" plugin="Y">
-<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"/>
-</component>
-<component name="btsap" filter="s60" long-name="Bluetooth SIM Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btsap/group"/>
-</component>
-<component name="btui" filter="s60" long-name="Bluetooth UI">
-<unit bldFile="mw/btservices/bluetoothengine/btui/group"/>
-</component>
-<component name="btpbap" filter="s60" long-name="Bluetooth Phonebook Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btpbap/group"/>
-</component>
-<component name="bthid" filter="s60" long-name="Bluetooth HID">
-<unit bldFile="mw/btservices/bluetoothengine/bthid/group"/>
-</component>
-<component name="btctrldcmoadapter" filter="s60" long-name="Bluetooth Control DCMO Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btctrldcmoadapter/group"/>
-</component>
-</collection>
-<collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
-<component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
-<unit bldFile="mw/btservices/bluetoothappprofiles/avrcp" mrp="mw/btservices/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
-</component>
-</collection>
-<collection name="atcommands" long-name="AT Commands" level="generic">
-<component name="modematplugin" long-name="Modem AT Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/modematplugin/group"/>
-</component>
-<component name="lccustomplugin" long-name="LC Custom Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/lccustomplugin/group"/>
-</component>
-</collection>
-<collection name="btservices_info" long-name="BT Services Info" level="plugin">
-<component name="btservices_metadata" long-name="BT Services Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usbservices" level="generic" long-name="USB Services" levels="framework server generic specific plugin">
-<collection name="usbservices_plat" long-name="USB Services Platform Interfaces" level="plugin">
-<component name="pictbridge_api" long-name="PictBridge API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/pictbridge_api/group"/>
-</component>
-<component name="ptp_responder_api" long-name="PTP Responder API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_responder_api/group"/>
-</component>
-<component name="ptp_transport_api" long-name="PTP Transport API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_transport_api/group"/>
-</component>
-<component name="usb_device_control_plugin_api" long-name="USB Device Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_device_control_plugin_api/group"/>
-</component>
-<component name="usb_notifier_api" long-name="USB Notifier API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_notifier_api/group"/>
-</component>
-<component name="usb_personality_api_header" long-name="USB Personality API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_api_header/group"/>
-</component>
-<component name="usb_personality_plugin_api" long-name="USB Personality Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_plugin_api/group"/>
-</component>
-<component name="usb_secondary_display_api" long-name="USB Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_secondary_display_api/group"/>
-</component>
-<component name="usb_watcher_api" long-name="USB Watcher API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_api/group"/>
-</component>
-<component name="usb_watcher_info_api_header" long-name="USB Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_info_api_header/group"/>
-</component>
-</collection>
-<collection name="usbservices_info" long-name="USB Services Info" level="plugin"/>
-<collection name="usbengines" long-name="USB Engines" level="generic">
-<component name="usbotgwatcher" filter="s60" long-name="USB OTG Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbotgwatcher/group"/>
-</component>
-<component name="usbwatcher" filter="s60" long-name="USB Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbwatcher/group"/>
-</component>
-<component name="usblocodplugin" filter="s60" long-name="USB Local Connectivity Domain Plugin" plugin="Y">
-<unit bldFile="mw/usbservices/usbengines/usblocodplugin/group"/>
-</component>
-<component name="usbdevcon" filter="s60" long-name="USB Device Control">
-<unit bldFile="mw/usbservices/usbengines/usbdevcon/group"/>
-</component>
-<component name="usbremotepersonality" filter="s60" long-name="USB Remote Personality">
-<unit bldFile="mw/usbservices/usbengines/usbremotepersonality/group"/>
-</component>
-</collection>
-<collection name="usbclasses" long-name="USB Classes" level="framework">
-<component name="usbobexclasscontroller" filter="s60" long-name="USB OBEX Class Controller" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbobexclasscontroller/group"/>
-</component>
-<component name="usbbasicpersonality" filter="s60" long-name="USB Basic Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbbasicpersonality/group"/>
-</component>
-<component name="usbmscpersonality" filter="s60" long-name="USB MSC Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbmscpersonality/group"/>
-</component>
-<!-- commented out in bld.inf. Should this be deleted?
- <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
- <unit bldFile="usbclasses/ptpstack/group"/>
- </component>
- <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
- <unit bldFile="usbclasses/sicdusbplugin/group"/>
- </component>
- <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
- <unit bldFile="usbclasses/ptpserver/group"/>
- </component>-->
-<component name="pictbridgeengine" filter="s60" long-name="PictBridge Engine">
-<unit bldFile="mw/usbservices/usbclasses/pictbridgeengine/group"/>
-</component>
-<component name="usbphoneasmodem" filter="s60" long-name="USB Phone as Modem" introduced="^3">
-<unit bldFile="mw/usbservices/usbclasses/usbphoneasmodem/group"/>
-</component>
-</collection>
-<collection name="usbuis" long-name="USB UIs" level="specific">
-<component name="usbui" filter="s60" long-name="USB UI">
-<unit bldFile="mw/usbservices/usbuis/usbui/group"/>
-</component>
-<component name="usbuinotif" filter="s60" long-name="USB UI Notifiers">
-<unit bldFile="mw/usbservices/usbuis/usbuinotif/group"/>
-</component>
-<component name="imageprintuiprovider" filter="s60" long-name="ImagePrint UI Provider" plugin="Y">
-<unit bldFile="mw/usbservices/usbuis/imageprintuiprovider/group"/>
-</component>
-<component name="usbimageprintui" filter="s60" long-name="ImagePrint UI">
-<unit bldFile="mw/usbservices/usbuis/imageprintui/group"/>
-</component>
-</collection>
-</block>
-<block name="shortlinkconn" level="generic" long-name="Shortlink Connectivity" levels="framework server generic specific plugin">
-<!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
-<collection name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" level="plugin">
-<component name="obex_service_utils_api" long-name="OBEX Service Utils API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_utils_api/group"/>
-</component>
-<component name="obex_service_plugin_api" long-name="OBEX Service Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_plugin_api/group"/>
-</component>
-<component name="dialup_connection_status_api" long-name="Dial-up Connection Status API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dialup_connection_status_api/group"/>
-</component>
-<component name="dun_secondary_display_notification_api" long-name="DUN Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
-</component>
-<component name="obex_secondary_display_notification_api" long-name="OBEX Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
-</component>
-<component name="generic_hid_api" long-name="Generic HID API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/generic_hid_api/group"/>
-</component>
-<component name="locod_bearer_plugin_api" long-name="Locod Bearer Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/locod_bearer_plugin_api/group"/>
-</component>
-<component name="usb_obexservicemanager_client_api" long-name="USB OBEX Service Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_obexservicemanager_client_api/group"/>
-</component>
-</collection>
-<collection name="localconnectivityservice" long-name="Local Connectivity Service" level="server">
-<component name="locod" long-name="Local Connectivity Daemon">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/locod/group"/>
-</component>
-<component name="obexserviceman" long-name="OBEX Service Managar">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
-</component>
-<component name="obexsendservices" long-name="OBEX Send Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
-</component>
-<component name="obexreceiveservices" long-name="OBEX Receive Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
-</component>
-<component name="dun" long-name="Dial Up Networking">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/dun/group"/>
-</component>
-<component name="lcstylustap" long-name="LC Stylus Tap Plugins" plugin="Y">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/lcstylustap/group"/>
-</component>
-<component name="generichid" long-name="Generic HID">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/generichid/group"/>
-</component>
-<component name="headset" long-name="Headset">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/headset/group"/>
-</component>
-</collection>
-</block>
-<block name="imghandling" level="specific" long-name="Image Handling" levels="lib util if">
-<collection name="imagehandling_plat" long-name="Image Handling Platform Interfaces" level="if">
-<component name="image_handling_library_api" long-name="Image Handling Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
-</component>
-<component name="3gp_library_api" long-name="3GP Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
-</component>
-<component name="thumbnailmanager_api" long-name="Thumbnail Manager API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagehandlinglib" long-name="Image Handling Library" level="lib">
-<!-- collection is really a component, need to move down a directory -->
-<component name="ihl" filter="s60" long-name="IHL">
-<unit bldFile="mw/imghandling/imagehandlinglib/group"/>
-</component>
-</collection>
-<collection name="imagehandlingutilities" long-name="Image Handling Utilities" level="util">
-<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager">
-<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
-</component>
-</collection>
-</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">
-<unit bldFile="mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
-</component>
-</collection>
-</block>
-<block name="mds" level="specific" long-name="Metadata Services" levels="mgr eng server int">
-<collection name="mds_plat" long-name="Metadata Services Platform Interfaces" level="int">
-<component name="context_engine_plugin_api" long-name="Context Engine Plugin API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/group" filter="!test"/>
-</component>
-<component name="harvester_framework_api" long-name="Harvester Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/harvester_framework_api/group" filter="!test"/>
-<!-- can only have one unit with the same filter, #include the following from the previous unit -->
-</component>
-<component name="location_manager_api" long-name="Location Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/location_manager_api/group" filter="!test"/>
-</component>
-<component name="metadata_engine_api" long-name="Metadata Engine API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/metadata_engine_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_collection_manager_api" long-name="Content Listing Framework Collection Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_extended_api" long-name="Content Listing Framework Extended API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_extended_api/group"/>
-</component>
-</collection>
-<collection name="mds_pub" long-name="Metadata Services Public Interfaces" level="int">
-<component name="content_listing_framework_api" long-name="Content Listing Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_pub/content_listing_framework_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="metadataengine" long-name="Metadata Engine" level="eng">
-<component name="metadataengine_common" filter="s60" long-name="Metadata Engine Common" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/common/group"/>
-</component>
-<component name="metadataengine_server" filter="s60" long-name="Metadata Engine Server" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/server/group"/>
-</component>
-<component name="metadataengine_client" filter="s60" long-name="Metadata Engine Client" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/client/group"/>
-</component>
-<component name="metadataengine_build" filter="s60" long-name="Metadata Engine Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/metadataengine/group"/>
-</component>
-</collection>
-<collection name="locationmanager" long-name="Location Manager" level="mgr">
-<component name="locationtrail" filter="s60" long-name="Location Trail" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/locationtrail/group"/>
-</component>
-<component name="locationmanager_server" filter="s60" long-name="Location Manager Server" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/server/group"/>
-</component>
-<component name="locationmanager_client" filter="s60" long-name="Location Manager Client" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/client/group"/>
-</component>
-<component name="locationmanager_build" filter="s60" long-name="Location Manager Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/locationmanager/group"/>
-</component>
-</collection>
-<collection name="contextengine" long-name="Context Engine" level="eng">
-<component name="contextengine_plugins" filter="s60" long-name="Context Engine Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/contextengine/plugins/group"/>
-</component>
-<component name="contextengine_build" filter="s60" long-name="Context Engine Build" introduced="^2">
-<!--make this collection a single component, or make this unit self-contained -->
-<unit bldFile="mw/mds/contextengine/group"/>
-</component>
-</collection>
-<collection name="harvester" long-name="Harvester" level="eng">
-<component name="blacklistclient" filter="s60" long-name="Blacklist Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistclient/group"/>
-</component>
-<component name="blacklistserver" filter="s60" long-name="Blacklist Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistserver/group"/>
-</component>
-<component name="harvester_common" filter="s60" long-name="Harvester Common" introduced="^2">
-<unit bldFile="mw/mds/harvester/common/group"/>
-</component>
-<component name="composerplugins" filter="s60" long-name="Composer Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/composerplugins/group"/>
-</component>
-<component name="harvesterplugins" filter="s60" long-name="Harvester Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/harvesterplugins/group"/>
-</component>
-<component name="monitorplugins" filter="s60" long-name="Monitor Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/monitorplugins/group"/>
-</component>
-<component name="harvester_server" filter="s60" long-name="Harvester Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/server/group"/>
-</component>
-<component name="harvester_client" filter="s60" long-name="Harvester Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/client/group"/>
-</component>
-<component name="harvester_build" filter="s60" long-name="Harvester Build" introduced="^2">
-<!-- split these exports into the other components -->
-<unit bldFile="mw/mds/harvester/group"/>
-</component>
-</collection>
-<collection name="watchdog" long-name="Watchdog" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="mdswatchdog" filter="s60" long-name="Metadata Watchdog" introduced="^2">
-<unit bldFile="mw/mds/watchdog/group"/>
-</component>
-</collection>
-<collection name="clfwrapper" long-name="Content Listing Framework Wrapper" level="int">
-<!-- collection is really a component. Move down a directory -->
-<component name="clfwrapper_build" filter="s60" long-name="CLF Wrapper Build" introduced="^2" class="placeholder">
-<!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
-<!--<unit bldFile="clfwrapper/group"/>-->
-</component>
-</collection>
-<collection name="mds_info" long-name="Metadata Services Info" level="int">
-<component name="mds_build" filter="s60" long-name="Metadata Services Build" introduced="^2">
-<!-- consider distributiing this into the rest of the components in the package -->
-<unit bldFile="mw/mds/group"/>
-</component>
-</collection>
-</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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<unit bldFile="mw/mmuifw/mmuifw_plat/alf_customlayoutmanagers_api/group"/>
-</component>
-<component name="gesturehelper_api" long-name="Gesture Helper API" filter="s60" 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">
-<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">
-<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">
-<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">
-<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">
-<!-- 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">
-<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">
-<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">
-<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">
-<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">
-<unit bldFile="mw/mmuifw/mulwidgets/mullogging/group"/>
-</component>
-<component name="muldatamodel" filter="s60" long-name="MUL Data Model">
-<unit bldFile="mw/mmuifw/mulwidgets/muldatamodel/group"/>
-</component>
-<component name="mulwidgets_common" filter="s60" long-name="MUL Common Utils">
-<unit bldFile="mw/mmuifw/mulwidgets/common/group"/>
-</component>
-<component name="gesturehelper" filter="s60" long-name="Gesture Helper">
-<unit bldFile="mw/mmuifw/mulwidgets/gesturehelper/group"/>
-</component>
-<component name="mulcoverflowwidget" filter="s60" long-name="MUL CoverFlow Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/mulcoverflowwidget/group"/>
-</component>
-<component name="mulsliderwidget" filter="s60" long-name="MUL Slider Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/mulsliderwidget/group"/>
-</component>
-<component name="alfviewwidget" filter="s60" long-name="ALF View Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/alfviewwidget/group"/>
-</component>
-<component name="alfcontainerwidget" filter="s60" long-name="ALF Container Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/alfcontainerwidget/group"/>
-</component>
-<component name="alfscrollbarwidget" filter="s60" long-name="ALF Scrollbar Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/alfscrollbarwidget/group"/>
-</component>
-</collection>
-</block>
-<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"/>
-</component>
-<component name="videoconnutility_api" long-name="Video Connection Utility API" filter="s60" class="api">
-<unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/group"/>
-</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"/>
-</component>
-</collection>
-<collection name="videoscheduler" long-name="Video Scheduler" level="util">
-<component name="schedulerclient" filter="s60" long-name="Video Scheduler Client">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerclient/group"/>
-</component>
-<component name="schedulerserver" filter="s60" long-name="Video Scheduler Server">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerserver/group"/>
-</component>
-</collection>
-<collection name="videoconnutility" long-name="Video Connection Utility" level="util">
-<component name="connutilpsworker" filter="s60" long-name="Connection Utility Publish and Subscribe Worker">
-<unit bldFile="mw/videoutils/videoconnutility/connutilpsworker/group"/>
-</component>
-<component name="video_connutility" filter="s60" long-name="Video Connection Utility">
-<unit bldFile="mw/videoutils/videoconnutility/connutility/group"/>
-</component>
-</collection>
-<collection name="videoutils_info" long-name="Video Utils Info" level="if"/>
-</block>
-<block name="mmmw" level="generic" long-name="Multimedia Middleware" levels="plugin framework server generic specific">
-<collection name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" level="specific">
-<component name="multimedia_data_source_api" long-name="Multimedia Data Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
-</component>
-<component name="progressive_download_api" long-name="Progressive Download API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/progressive_download_api/group"/>
-</component>
-<component name="equalizer_ui_api" long-name="Equalizer UI API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
-</component>
-<component name="enhanced_media_client_api" long-name="Enhanced Media Client API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
-</component>
-<component name="stream_control_custom_command_api" long-name="Stream Control Custom Command API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
-</component>
-<component name="emc_buffer_source_api" long-name="EMC Buffer Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_buffer_source_api/group"/>
-</component>
-<component name="emc_file_source_api" long-name="EMC File Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
-</component>
-<component name="audio_metadata_reader_api" long-name="Audio MetaData Reader API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
-</component>
-<component name="emc_progressive_download_source_api" long-name="EMC Progressive Download Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
-</component>
-<component name="emc_volume_effect_api" long-name="EMC Volume Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
-</component>
-<component name="emc_balance_effect_api" long-name="EMC Balance Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_balance_effect_api/group"/>
-</component>
-<component name="emc_descriptor_source_api" long-name="EMC Descriptor Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_descriptor_source_api/group"/>
-</component>
-<component name="emc_drm_config_intfc_api" long-name="EMC DRM Config Intfc API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
-</component>
-<component name="voip_audio_services_api" long-name="VoIP Audio Services" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/group"/>
-</component>
-<component name="configuration_components_factory_api" long-name="Configuration Components Factory API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
-</component>
-<component name="audio_output_control_utility_api" long-name="Audio Output Control Utility API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/group"/>
-</component>
-<component name="audio_output_control_utility_proxy_api" long-name="Audio Output Control Utility Proxy API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
-</component>
-<component name="emc_audio_effects_api" long-name="EMC Audio Effects API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
-</component>
-<component name="call_audio_control_api" long-name="Call AudioControl API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/group"/>
-</component>
-<component name="radio_utilities_api" long-name="Radio Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/group"/>
-</component>
-<component name="radio_preset_utilities_api" long-name="Radio Preset Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
-</component>
-<component name="radio_monitor_api" long-name="Radio Monitor API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
-</component>
-<component name="thumbnail_engine_api" long-name="Thumbnail Engine API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/thumbnail_engine_api/group"/>
-</component>
-<component name="telephony_multimedia_service_api" long-name="Telephony Multimedia Service API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="mmfenh" long-name="MMF Enhancements" level="generic">
-<component name="advancedaudiocontroller" filter="s60" long-name="Advanced Audio Controllers" plugin="Y">
-<unit bldFile="mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
-</component>
-<component name="audiooutputcontrolutility" filter="s60" long-name="Audio Output Control Utility">
-<unit bldFile="mw/mmmw/mmfenh/audiooutputcontrolutility/group"/>
-</component>
-<component name="configurationcomponentsfactory" filter="s60" long-name="Configuration Components Factory">
-<unit bldFile="mw/mmmw/mmfenh/configurationcomponentsfactory/group"/>
-</component>
-<component name="enhancedaudioplayerutility" filter="s60" long-name="Enhanced Audio Player Utility">
-<unit bldFile="mw/mmmw/mmfenh/enhancedaudioplayerutility/group"/>
-</component>
-<component name="enhancedmediaclient" filter="s60" long-name="Enhanced Media Client">
-<unit bldFile="mw/mmmw/mmfenh/enhancedmediaclient/group"/>
-</component>
-<component name="profilesettingsmonitor" filter="s60" long-name="Profile Settings Monitor">
-<unit bldFile="mw/mmmw/mmfenh/profilesettingsmonitor/group"/>
-</component>
-<component name="progressivedownload" filter="s60" long-name="Progressive Download">
-<unit bldFile="mw/mmmw/mmfenh/progressivedownload/group"/>
-</component>
-</collection>
-<collection name="mm_fw" long-name="Multimedia Frameworks" level="framework">
-<!-- Id needs to be unique, mmfw already in use -->
-<!-- Placeholder for OpenAX AL and other stuff -->
-</collection>
-<collection name="mmserv" long-name="Multimedia Services" level="specific">
-<component name="audioeffectsui" filter="s60" long-name="Audio Effects UI">
-<unit bldFile="mw/mmmw/mmserv/audioeffectsui/group"/>
-</component>
-<component name="callaudiocontrol" filter="s60" long-name="Call Audio Control">
-<unit bldFile="mw/mmmw/mmserv/callaudiocontrol/group"/>
-</component>
-<component name="metadatautility" filter="s60" long-name="Metadata Utility">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/group"/>
-</component>
-<component name="radioutility" filter="s60" long-name="Radio Utility">
-<unit bldFile="mw/mmmw/mmserv/radioutility/group"/>
-</component>
-<component name="thumbnailengine" filter="s60" long-name="Thumbnail Engine" introduced="^2">
-<unit bldFile="mw/mmmw/mmserv/thumbnailengine/group"/>
-</component>
-<component name="tms" filter="s60" long-name="Telephony Multimedia Service" introduced="^3">
-<unit bldFile="mw/mmmw/mmserv/tms/group"/>
-</component>
-<component name="voipaudioservices" filter="s60" long-name="VoIP Audio Services">
-<unit bldFile="mw/mmmw/mmserv/voipaudioservices/group"/>
-</component>
-<component name="lib3gpextparser" filter="s60" long-name="3GP Extension Metadata Parser Library">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group" filter="sf_build"/>
-</component>
-</collection>
-<collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
-<component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="helix" level="generic" long-name="Helix" levels="plugin framework server generic specific">
-<collection name="helix_ren" long-name="Helix Engine" level="framework">
-<!-- what does "ren" stand for? -->
-<component name="helix_stub" filter="s60" long-name="Helix Stub" introduced="^2" class="api">
-<unit bldFile="mw/helix/helix_ren/helix_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="camerasrv" level="specific" long-name="Camera Services" levels="plugin fw api">
-<collection name="camerasrv_plat" long-name="Camera Services Platform Interfaces" level="api">
-<component name="media_recorder_sink_api" long-name="Media Recorder Sink API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
-</component>
-<component name="cae_extentension_api" long-name="CAE Extension API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/cae_extentension_api/group"/>
-</component>
-<component name="camera_application_engine_api" long-name="Camera Application Engine API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/camera_application_engine_api/group" filter="!test"/>
-</component>
-<component name="custom_onboard_camera_api" long-name="Custom Onboard Camera API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
-</component>
-<component name="imaging_configuration_manager_api" long-name="Imaging Configuration Manager API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
-</component>
-<component name="media_recorder_api" long-name="Media Recorder API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_api/group" filter="!test"/>
-</component>
-<component name="3gp_file_composer_api" long-name="3GP File Composer API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
-</component>
-<component name="asynchronous_file_saving_queue_api" long-name="Asynchronous File Saving Queue API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="camappengine" long-name="Camera App Engine" level="fw">
-<!-- is this collection really a component? If so, move down a directory -->
-<component name="stillconverter" filter="s60" long-name="Still Image Converter" class="placeholder">
-<!-- should separate this from parent engine's bld.inf -->
-<!-- <unit bldFile="camappengine/stillconverter/group"/> -->
-</component>
-<component name="camappengine_engine" filter="s60" long-name="Camera App Engine" class="placeholder">
-<!-- should separate this from parent engine's bld.inf -->
-<!-- <unit bldFile="camappengine/engine/group"/> -->
-</component>
-<component name="asynchfilesavequeue" filter="s60" long-name="Asynch File Save Queue">
-<unit bldFile="mw/camerasrv/camappengine/asynchfilesavequeue/group"/>
-</component>
-<component name="camappengine_build" filter="s60" long-name="Camera App Engine Build">
-<unit bldFile="mw/camerasrv/camappengine/build"/>
-</component>
-</collection>
-<collection name="camcordermmfplugin" long-name="Camcorder MMF Plugin" level="plugin">
-<!-- collection is really a component. Should move down a directory -->
-<component name="camcordermmfplugin_build" filter="s60" long-name="Camcorder MMF Plugin Build" plugin="Y">
-<unit bldFile="mw/camerasrv/camcordermmfplugin/build"/>
-</component>
-</collection>
-<collection name="configmanagers" long-name="Config Managers" level="api">
-<component name="imagingconfigmanager" filter="s60" long-name="Imaging Config Manager">
-<unit bldFile="mw/camerasrv/configmanagers/imagingconfigmanager/group"/>
-</component>
-</collection>
-<collection name="camerasrv_info" long-name="Camera Services Info" level="api">
-<component name="camerasrv_build" filter="s60" long-name="Camera Services Build">
-<!-- should split into individual bld.infs -->
-<unit bldFile="mw/camerasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="mmappfw" level="specific" long-name="Multimedia App Framework" levels="fw utils if">
-<collection name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" level="if">
-<component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interfaces Build" introduced="^1" filter="s60">
-<!-- this is no longer necessary when confguration is put in place -->
-<unit bldFile="mw/mmappfw/mmappfw_plat"/>
-</component>
-<component name="collection_helper_api" long-name="Collection Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
-</component>
-<component name="harvester_collection_mediator_api" long-name="Harvester Collection Mediator API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/group"/>
-</component>
-<component name="harvester_metadata_extractor_api" long-name="Harvester Metadata Extractor API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/group"/>
-</component>
-<component name="harvester_server_api" long-name="Harvester Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_server_api/group"/>
-</component>
-<component name="harvester_utility_api" long-name="Harvester Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_utility_api/group"/>
-</component>
-<component name="playlist_engine_api" long-name="Playlist Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playlist_engine_api/group"/>
-</component>
-<component name="mtp_keys_api" long-name="MTP Keys API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mtp_keys_api/group"/>
-</component>
-<component name="mpx_collection_common_definition_api" long-name="MPX Collection Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_common_definition_api/group"/>
-</component>
-<component name="mpx_collection_utility_api" long-name="MPX Collection Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/group"/>
-</component>
-<component name="mpx_common_api" long-name="MPX Common API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_api/group"/>
-</component>
-<component name="mpx_common_definition_api" long-name="MPX Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_common_definition_api" long-name="MPX Playback Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_utility_api" long-name="MPX Playback Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/group"/>
-</component>
-<component name="mpx_base_view_plugins_api" long-name="MPX Base View Plugins API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/group"/>
-</component>
-<component name="mpx_view_utility_api" long-name="MPX View Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_view_utility_api/group"/>
-</component>
-<component name="mpx_albumart_utility_api" long-name="MPX Album Art Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/group"/>
-</component>
-<component name="media_player_settings_engine_api" long-name="Media Player Settings Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
-</component>
-<component name="mpx_backstepping_utility_api" long-name="MPX Backstepping Utility API" introduced="^1" filter="s60" class="api">
-<!-- uncomment when configuration is put in place
- <unit bldFile="mmappfw_plat/mpx_backstepping_utility_api/group"/> -->
-</component>
-<component name="asx_parser_api" long-name="ASX Parser API" introduced="^1" filter="s60" class="api">
-<!-- uncomment when configuration is put in place
- <unit bldFile="mmappfw_plat/asx_parser_api/group"/> -->
-</component>
-<component name="playback_helper_api" long-name="Playback Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playback_helper_api/group"/>
-</component>
-<component name="videoplaylist_utility_api" long-name="Video Playlist Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/videoplaylist_utility_api/group"/>
-</component>
-<component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interface Build" introduced="^1" filter="s60" class="api">
-<!-- needed only for #ifdefs. Remove anmd uncomment above units when configuration is in place -->
-<unit bldFile="mw/mmappfw/mmappfw_plat/group"/>
-</component>
-</collection>
-<collection name="mpx" long-name="Multimedia Player" level="fw">
-<component name="commonframework" filter="s60" long-name="MPX Common Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/commonframework/group"/>
-</component>
-<component name="playbackframework" filter="s60" long-name="MPX Playback Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/playbackframework/group"/>
-</component>
-<component name="mpxcollectionfw" filter="s60" long-name="MPX Collection Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/collectionframework/group"/>
-</component>
-<component name="mpxviewfw" filter="s60" long-name="MPX View Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/viewframework/group"/>
-</component>
-<component name="mpx_build" filter="s60" long-name="MPX Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/mpx/group"/>
-</component>
-</collection>
-<collection name="mmappcomponents" long-name="Multimedia App Components" level="utils">
-<component name="mmappcomponents_build" filter="s60" long-name="Multimedia App Components Build" introduced="^1">
-<!-- needed for #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
- Can remove this once configuration is in place-->
-<unit bldFile="mw/mmappfw/mmappcomponents/group"/>
-</component>
-<component name="collectionhelper" filter="s60" long-name="Media Player Collection Helper" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/collectionhelper/group"/>
-</component>
-<component name="playlistengine" filter="s60" long-name="Playlist Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/playlistengine/group"/>
-</component>
-<component name="mpxharvester" filter="s60" long-name="Media Player Harvester" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/harvester/group"/>
-</component>
-<component name="mmappcommonui" filter="s60" long-name="Multimedia App Common UI" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmappcommonui/group"/>
-</component>
-<component name="mediaplayersettingsengine" filter="s60" long-name="Media Player Settings Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
-</component>
-<component name="audiofetcher" filter="s60" long-name="Audio Fetcher" introduced="^1" plugin="Y">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
-</component>
-<component name="asxparser" filter="s60" long-name="ASX Parser" introduced="^1">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
-</component>
-<component name="playbackhelper" filter="s60" long-name="Playback Helper" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/playbackhelper/group"/>
-</component>
-<component name="videoplaylistutility" filter="s60" long-name="Video Playlist Utility" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/videoplaylistutility/group"/>
-</component>
-<component name="mmmtpdataprovider" filter="s60" long-name="Multimedia MTP Data Provider" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmmtpdataprovider/group"/>
-</component>
-</collection>
-<collection name="mmappfw_info" long-name="Multimedia App Framework Info" level="if">
-<component name="mmappfw_build" filter="s60" long-name="Multimedia App Framework Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/group"/>
-</component>
-<component name="mmappfw_test" filter="s60,test,api_test,pref_test" long-name="Multimedia App Framework Test" purpose="development" introduced="^1"/>
-</collection>
-</block>
-<block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework api">
-<collection name="inputmethods_pub" long-name="Input Methods Public Interfaces" level="api">
-<component name="ptiengine_iti_api" long-name="PTI Engine API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
-</component>
-<component name="optical_character_recognition_api" long-name="Optical Character Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
-</component>
-<component name="input_language_info_api" long-name="Input Language Info API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
-</component>
-</collection>
-<collection name="inputmethods_plat" long-name="Input Methods Platform Interfaces" level="api">
-<component name="pen_input_server_api" long-name="Pen Input Server API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/group" filter="!test"/>
-</component>
-<component name="ptiengine_hwr_api" long-name="PTI Engine Handwriting Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group" filter="!test"/>
-</component>
-<component name="aknfep_settings_api" long-name="Avkon FEP Settings API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
-</component>
-<component name="aknfep_status_api" long-name="Avkon FEP Status API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
-</component>
-<component name="ptiengine_key_definations_api" long-name="PTI Engine Key Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
-</component>
-<component name="aknfep_definitions_api" long-name="Avkon FEP Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
-</component>
-<component name="aknfep_pen_support_api" long-name="Avkon FEP Pen Support API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
-</component>
-<component name="ptiengine_indic_definitions_api" long-name="PTI Engine Indic Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
-</component>
-<component name="aknfep_uiinterface_api" long-name="Avkon FEP UI Interface API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="textinput" long-name="Text Input" level="framework">
-<component name="ptienginev2" filter="s60" long-name="Predictive Text Input Engine">
-<!--uncomment when configuration is turned on and textinput_build is removed-->
-<!-- <unit bldFile="textinput/ptienginev2/group"/>-->
-</component>
-<component name="akninputlanguage" filter="s60" long-name="Avkon Input Language">
-<unit bldFile="mw/inputmethods/textinput/akninputlanguage/group"/>
-</component>
-<component name="peninputarc" filter="s60" long-name="Pen Input Arc">
-<unit bldFile="mw/inputmethods/textinput/peninputarc/group"/>
-</component>
-<component name="peninputcommonctrls" filter="s60" long-name="Pen Input Common Controls">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonctrls/group"/>
-</component>
-<component name="peninputhwrboxcn" filter="s60" long-name="Chinese Handwriting Recognition Box" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrboxcn/group"/>
-</component>
-<component name="peninputvkbcn" filter="s60" long-name="Chinese Virtual Keyboard" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputvkbcn/group"/>
-</component>
-<component name="peninputcommonlayout" filter="s60" long-name="Pen Input Common Layout">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonlayout/group"/>
-</component>
-<component name="peninputgenerichwr" filter="s60" long-name="Pen Input Generic Handwriting Recognition" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputgenerichwr/group"/>
-</component>
-<component name="peninputgenericvkb" filter="s60" long-name="Pen Input Generic Virtual Keyboard" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputgenericvkb/group"/>
-</component>
-<component name="peninputcommonctrlsjp" filter="s60" long-name="Pen Input Common Controls Japanese">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonctrlsjp/group"/>
-</component>
-<component name="peninputhwrboxjp" filter="s60" long-name="Japanese Handwriting Recognition Box" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrboxjp/group"/>
-</component>
-<component name="peninputvkbjp" filter="s60" long-name="Japanese Virtual Keyboard" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputvkbjp/group"/>
-</component>
-<component name="gslangplugin" filter="s60" long-name="GS Language Plugin" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/GSLangPlugin"/>
-</component>
-<component name="peninputgenericitut" filter="s60" long-name="Pen Input Generic ITU-T" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputgenericitut/group"/>
-</component>
-<component name="peninputhwrtrui" filter="s60" long-name="Pen Input Handwriting Recognition Training UI" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrtrui/group"/>
-</component>
-<component name="peninputhwrfscn" filter="s60" long-name="Pen Input Chinese Full Screen Handwriting Recognition" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrfscn/group"/>
-</component>
-<component name="peninputvkbkr" filter="s60" long-name="Pen Input Korean Virtual Keyboard" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputvkbkr/group"/>
-</component>
-<component name="peninputfingerhwr" filter="s60" long-name="Pen Input Finger Handwriting Recognition" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputfingerhwr/group"/>
-</component>
-<component name="peninputsplititut" filter="s60" long-name="Pen Input Split ITU-T" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputsplititut/group"/>
-</component>
-<component name="peninputsplitqwerty" filter="s60" long-name="Pen Input Split QWERTY" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputsplitqwerty/group"/>
-</component>
-<component name="textinput_build" filter="s60" long-name="Text Input Build">
-<!--needed for #ifdef, can be removed when configuration is implemented -->
-<unit bldFile="mw/inputmethods/textinput/group"/>
-</component>
-</collection>
-<collection name="fep" long-name="FEP" level="engine">
-<component name="aknfep" filter="s60" long-name="Avkon FEP" plugin="Y">
-<unit bldFile="mw/inputmethods/fep/aknfep/group"/>
-</component>
-<component name="frontendprocessor" long-name="Front End Processor" purpose="mandatory">
-<unit bldFile="mw/inputmethods/fep/frontendprocessor/group" mrp="mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
-</component>
-</collection>
-<collection name="inputmethods_info" long-name="Input Methods Info" level="api">
-<component name="inputmethods_metadata" long-name="Input Methods Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="qt" level="generic" long-name="Qt" levels="tool mw app">
-<collection name="qtconf" long-name="Qt Config" level="tool">
-<component name="qt_deviceconfiguration" long-name="Qt Device Configuration" introduced="^2" class="config tool">
-<unit bldFile="mw/qt/src/s60installs/deviceconfiguration"/>
-</component>
-</collection>
-<collection name="qt_info" long-name="Qt Info" level="mw">
-<component name="qt_build" long-name="Qt Build" introduced="^2">
-<unit bldFile="mw/qt" proFile="projects.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-<collection name="qtdemos" long-name="Qt Demos" level="app">
-<component name="qtdemos_build" long-name="Qt Demos Build" introduced="^2" filter="qtdemos">
-<unit bldFile="mw/qt/demos" proFile="demos.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qtexamples" long-name="Qt Examples" level="app">
-<component name="qtexamples_build" long-name="Qt Examples Build" introduced="^2" filter="qtexamples">
-<unit bldFile="mw/qt/examples" proFile="examples.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qt_tests" long-name="Qt Tests" level="app">
-<component name="qttestsauto" long-name="Qt Automated Tests" introduced="^2" filter="qttestsauto">
-<unit bldFile="mw/qt/tests/auto" proFile="qtpauto.pro"/>
-</component>
-<component name="qttestsbenchmarks" long-name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks">
-<unit bldFile="mw/qt/tests/benchmarks" proFile="benchmarks.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</block>
-<block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
-<collection name="classicui_plat" long-name="Classic UI Platform Interfaces" level="specific">
-<component name="personalisation_framework_api" long-name="Personalisation Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_framework_api/group" filter="!test"/>
-</component>
-<component name="signal_pane_api" long-name="Signal Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
-</component>
-<component name="japanese_reading_api" long-name="Japanese Reading API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/japanese_reading_api/group" filter="!test"/>
-</component>
-<component name="global_popup_priority_controller_api" long-name="Global Popup Priority Controller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
-</component>
-<component name="item_finder_api" long-name="Item Finder API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/item_finder_api/group" filter="!test"/>
-</component>
-<component name="avkon_fonts_api" long-name="Avkon Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_fonts_api/group" filter="!test"/>
-</component>
-<component name="extended_utilities_api" long-name="Extended Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
-</component>
-<component name="personalisation_plugin_api" long-name="Personalisation Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
-</component>
-<component name="extended_aiw_criteria_api" long-name="Extended AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="personalisation_application_api" long-name="Personalisation Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_application_api/group"/>
-</component>
-<component name="volume_popup_api" long-name="Volume Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
-</component>
-<component name="avkon_secondary_display_support_api" long-name="AVKON Secondary Display Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_support_api/group" filter="!test"/>
-</component>
-<component name="extended_setting_pages_api" long-name="Extended Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_setting_pages_api/group" filter="!test"/>
-</component>
-<component name="extended_lists_api" long-name="Extended Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_lists_api/group" filter="!test"/>
-</component>
-<component name="input_block_api" long-name="Input Block API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/input_block_api/group" filter="!test"/>
-</component>
-<component name="avkon_ui_server_api" long-name="AVKON UI Server API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_ui_server_api/group" filter="!test"/>
-</component>
-<component name="number_grouping_api" long-name="Number Grouping API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/number_grouping_api/group" filter="!test"/>
-</component>
-<component name="extended_status_pane_api" long-name="Extended Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_status_pane_api/group" filter="!test"/>
-</component>
-<component name="extended_notifiers_api" long-name="Extended Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notifiers_api/group" filter="!test"/>
-</component>
-<component name="task_list_api" long-name="Task List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
-</component>
-<component name="personalisation_slide_show_dialog_api" long-name="Personalisation Slide Show Dialog API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
-</component>
-<component name="key_event_utilities_api" long-name="Key Event Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_event_utilities_api/group"/>
-</component>
-<component name="emergency_call_support_api" long-name="Emergency Call Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/emergency_call_support_api/group" filter="!test"/>
-</component>
-<component name="extended_dialogs_api" long-name="Extended Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_dialogs_api/group"/>
-</component>
-<component name="legacy_ui_framework_headers_api" long-name="Legacy UI Framework Headers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/legacy_ui_framework_headers_api/group"/>
-</component>
-<component name="extended_editors_api" long-name="Extended Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_editors_api/group" filter="!test"/>
-</component>
-<component name="alarm_api" long-name="Alarm API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alarm_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_interface_base_api" long-name="AIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_base_api/group" filter="!test"/>
-</component>
-<component name="list_effects_api" long-name="List Effects API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/list_effects_api/group" filter="!test"/>
-</component>
-<component name="find_item_ui_api" long-name="Find Item UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/find_item_ui_api/group" filter="!test"/>
-</component>
-<component name="server_application_services_api" long-name="Server Application Services API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/server_application_services_api/group" filter="!test"/>
-</component>
-<component name="common_ui_settings_api" long-name="Common UI Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_ui_settings_api/group"/>
-</component>
-<component name="aiw_service_interface_menu_api" long-name="AIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_menu_api/group" filter="!test"/>
-</component>
-<component name="eikon_server_extension_client_api" long-name="EIKON Server Extension Client API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/eikon_server_extension_client_api/group" filter="!test"/>
-</component>
-<component name="skinnable_clock_api" long-name="Skinnable Clock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/skinnable_clock_api/group" filter="!test"/>
-</component>
-<component name="battery_pane_api" long-name="Battery Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/battery_pane_api/group" filter="!test"/>
-</component>
-<component name="fep_document_navigation_api" long-name="FEP Document Navigation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
-</component>
-<component name="personalisation_localised_texts_api" long-name="Personalisation Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
-</component>
-<component name="memory_card_ui_api" long-name="Memory Card UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
-</component>
-<component name="avkon_status_api" long-name="AVKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_status_api/group"/>
-</component>
-<component name="application_switching_api" long-name="Application Switching API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/application_switching_api/group" filter="!test"/>
-</component>
-<component name="avkon_localised_texts_api" long-name="AVKON Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_localised_texts_api/group"/>
-</component>
-<component name="avkon_secondary_display_api" long-name="AVKON Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_api/group"/>
-</component>
-<component name="extended_animation_api" long-name="Extended Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_notes_api" long-name="Extended Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notes_api/group" filter="!test"/>
-</component>
-<component name="screensaver_animation_plugin_definitions_api" long-name="Screensaver Animation Plugin Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/screensaver_animation_plugin_definitions_api/group"/>
-</component>
-<component name="text_scroller_api" long-name="Text Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/text_scroller_api/group" filter="!test"/>
-</component>
-<component name="custom_cursors_api" long-name="Custom Cursors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/custom_cursors_api/group" filter="!test"/>
-</component>
-<component name="screensaver_settings_api" long-name="Screensaver Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/screensaver_settings_api/group"/>
-</component>
-<component name="global_window_priorities_api" long-name="Global Window Priorities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_window_priorities_api/group"/>
-</component>
-<component name="extended_indicators_api" long-name="Extended Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_indicators_api/group" filter="!test"/>
-</component>
-<component name="special_character_table_api" long-name="Special Character Table API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/special_character_table_api/group" filter="!test"/>
-</component>
-<component name="avkon_settings_api" long-name="AVKON Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_settings_api/group"/>
-</component>
-<component name="extended_sounds_api" long-name="Extended Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_sounds_api/group"/>
-</component>
-<component name="themes_settings_api" long-name="Themes Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/themes_settings_api/group"/>
-</component>
-<component name="media_shared_document_api" long-name="Media Shared Document API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/media_shared_document_api/group" filter="!test"/>
-</component>
-<component name="extended_queries_api" long-name="Extended Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_queries_api/group"/>
-</component>
-<component name="phone_number_text_utilities_api" long-name="Phone Number Text Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
-</component>
-<component name="screensaver_runtime_api" long-name="Screensaver Runtime API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/screensaver_runtime_api/group"/>
-</component>
-<component name="extended_scroller_api" long-name="Extended Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_scroller_api/group"/>
-</component>
-<component name="key_rotator_api" long-name="Key Rotator API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_rotator_api/group" filter="!test"/>
-</component>
-<component name="extended_grids_api" long-name="Extended Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_grids_api/group" filter="!test"/>
-</component>
-<component name="generic_parameter_api" long-name="Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="indicator_touch_observer_api" long-name="Indicator Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_touch_observer_api/group"/>
-</component>
-<component name="popup_form_api" long-name="Popup Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/popup_form_api/group" filter="!test"/>
-</component>
-<component name="stylus_activated_popup_api" long-name="Stylus Activated Pop-up API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/stylus_activated_popup_api/group" filter="!test"/>
-</component>
-<component name="indicator_plugin_api" long-name="Indicator Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_plugin_api/group" filter="!test"/>
-</component>
-<component name="layout_configuration_api" long-name="Layout Configuration API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/layout_configuration_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_filter_factory_api" long-name="Common File Dialogs Filter Factory API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group" filter="!test"/>
-</component>
-<component name="avkon_anim_dll_api" long-name="AVKON Anim DLL API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_anim_dll_api/group"/>
-</component>
-<component name="extended_initialization_api" long-name="Extended Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_initialization_api/group" filter="!test"/>
-</component>
-<component name="long_tap_animation_api" long-name="Long Tap Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/long_tap_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_ui_framework_definitions_api" long-name="Extended UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_ui_framework_definitions_api/group"/>
-</component>
-<component name="extended_buttons_api" long-name="Extended Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_buttons_api/group" filter="!test"/>
-</component>
-<component name="aiw_provider_utility_api" long-name="AIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_provider_utility_api/group" filter="!test"/>
-</component>
-<component name="transition_effect_parameters_api" long-name="Transition Effect Parameters API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_parameters_api/group" filter="!test"/>
-</component>
-<component name="extended_input_capabilities_api" long-name="Extended Input Capabilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_input_capabilities_api/group" filter="!test"/>
-</component>
-<component name="uikon_status_api" long-name="UIKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/uikon_status_api/group"/>
-</component>
-<component name="transition_effect_utilities_api" long-name="Transition Effect Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_utilities_api/group" filter="!test"/>
-</component>
-<component name="pointer_event_modifier_api" long-name="Pointer Event Modifier API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/pointer_event_modifier_api/group" filter="!test"/>
-</component>
-<component name="avkon_testability_api" long-name="AVKON Testability API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_testability_api/group"/>
-</component>
-<component name="ganes_api" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ganes_api/group"/>
-</component>
-<component name="ode_api" long-name="Ode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ode_api/group"/>
-</component>
-<component name="physics_api" long-name="Physics API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/physics_api/group"/>
-</component>
-<component name="touch_pane_api" long-name="Touch Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_api/group" filter="!test"/>
-</component>
-<component name="touch_pane_observer_api" long-name="Touch Pane Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_observer_api/group"/>
-</component>
-<component name="alternate_fs_api" long-name="Alternate FS API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alternate_fs_api/group"/>
-</component>
-<component name="discreet_popup_api" long-name="Discreet Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/discreet_popup_api/group"/>
-</component>
-<component name="touch_gesture_framework_api" long-name="Touch Gesture Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_gesture_framework_api/group"/>
-<!-- should this be commented out? -->
-<!--<unit bldFile="classicui_plat/touch_gesture_framework_api/tsrc/group" filter="test,api_test"/> -->
-</component>
-<component name="extended_options_menu_api" long-name="Extended Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="classicui_pub" long-name="Classic UI Public Interfaces" level="specific">
-<component name="input_frame_api" long-name="Input Frame API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/input_frame_api/group" filter="!test"/>
-</component>
-<component name="window_server_event_observer_api" long-name="Window Server Event Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/window_server_event_observer_api/group" filter="!test"/>
-</component>
-<component name="application_framework_api" long-name="Application Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/application_framework_api/group" filter="!test"/>
-</component>
-<component name="scroller_api" long-name="Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/scroller_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_utilities_api" long-name="UI Framework Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_utilities_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_definitions_api" long-name="UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_definitions_api/group" filter="!test"/>
-</component>
-<component name="buttons_api" long-name="Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/buttons_api/group" filter="!test"/>
-</component>
-<component name="queries_api" long-name="Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/queries_api/group" filter="!test"/>
-</component>
-<component name="aiw_generic_parameter_api" long-name="AIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="editors_api" long-name="Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/editors_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_api" long-name="Common File Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/common_file_dialogs_api/group" filter="!test"/>
-</component>
-<component name="dialog_shutter_api" long-name="Dialog Shutter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialog_shutter_api/group" filter="!test"/>
-</component>
-<component name="fonts_api" long-name="Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/fonts_api/group" filter="!test"/>
-</component>
-<component name="screen_clearer_api" long-name="Screen Clearer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_clearer_api/group" filter="!test"/>
-</component>
-<component name="notifiers_api" long-name="Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notifiers_api/group" filter="!test"/>
-</component>
-<component name="notes_api" long-name="Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notes_api/group" filter="!test"/>
-</component>
-<component name="screen_saver_api" long-name="Screen Saver API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_saver_api/group" filter="!test"/>
-</component>
-<component name="status_pane_api" long-name="Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/status_pane_api/group" filter="!test"/>
-</component>
-<component name="base_controls_api" long-name="Base Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/base_controls_api/group" filter="!test"/>
-</component>
-<component name="grids_api" long-name="Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/grids_api/group" filter="!test"/>
-</component>
-<component name="context_pane_api" long-name="Context Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/context_pane_api/group" filter="!test"/>
-</component>
-<component name="lists_api" long-name="Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/lists_api/group" filter="!test"/>
-</component>
-<component name="popups_api" long-name="Popups API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/popups_api/group" filter="!test"/>
-</component>
-<component name="misc_controls_api" long-name="Misc Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/misc_controls_api/group" filter="!test"/>
-</component>
-<component name="keylock_api" long-name="Keylock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/keylock_api/group" filter="!test"/>
-</component>
-<component name="options_menu_api" long-name="Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/options_menu_api/group" filter="!test"/>
-</component>
-<component name="hierarchical_lists_api" long-name="Hierarchical Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hierarchical_lists_api/group" filter="!test"/>
-</component>
-<component name="navigation_pane_api" long-name="Navigation Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/navigation_pane_api/group" filter="!test"/>
-</component>
-<component name="tabs_api" long-name="Tabs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/tabs_api/group" filter="!test"/>
-</component>
-<component name="title_pane_touch_observer_api" long-name="Title Pane Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_touch_observer_api/group"/>
-</component>
-<component name="choice_list_api" long-name="Choice List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/choice_list_api/group" filter="!test"/>
-</component>
-<component name="info_popup_note_api" long-name="Info Popup Note API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/info_popup_note_api/group" filter="!test"/>
-</component>
-<component name="setting_pages_api" long-name="Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/setting_pages_api/group" filter="!test"/>
-</component>
-<component name="screen_mode_api" long-name="Screen Mode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_mode_api/group" filter="!test"/>
-</component>
-<component name="indicators_api" long-name="Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/indicators_api/group" filter="!test"/>
-</component>
-<component name="error_ui_api" long-name="Error UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/error_ui_api/group" filter="!test"/>
-</component>
-<component name="animation_api" long-name="Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/animation_api/group" filter="!test"/>
-</component>
-<component name="searchfield_api" long-name="Searchfield API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/searchfield_api/group" filter="!test"/>
-</component>
-<component name="labels_api" long-name="Labels API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/labels_api/group" filter="!test"/>
-</component>
-<component name="hotkeys_api" long-name="Hotkeys API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hotkeys_api/group" filter="!test"/>
-</component>
-<component name="initialization_api" long-name="Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/initialization_api/group" filter="!test"/>
-</component>
-<component name="volume_control_api" long-name="Volume Control API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/volume_control_api/group" filter="!test"/>
-</component>
-<component name="title_pane_api" long-name="Title Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_api/group" filter="!test"/>
-</component>
-<component name="sounds_api" long-name="Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/sounds_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_handler_api" long-name="AIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_service_handler_api/group" filter="!test"/>
-</component>
-<component name="aiw_criteria_api" long-name="AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="touch_ui_utilities_api" long-name="Touch UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/touch_ui_utilities_api/group" filter="!test"/>
-</component>
-<component name="generic_button_api" long-name="Generic Button API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/generic_button_api/group" filter="!test"/>
-</component>
-<component name="form_api" long-name="Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/form_api/group" filter="!test"/>
-</component>
-<component name="uikon_core_controls" long-name="Uikon Core Controls" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/uikon_core_controls/group" filter="!test"/>
-</component>
-<component name="calendar_api" long-name="Calendar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/calendar_api/group"/>
-</component>
-<component name="toolbar_api" long-name="Toolbar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/toolbar_api/group" filter="!test"/>
-</component>
-<component name="server_application_api" long-name="Server Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/server_application_api/group"/>
-</component>
-<component name="slider_api" long-name="Slider API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/slider_api/group" filter="!test"/>
-</component>
-<component name="private_ui_framework_api" long-name="Private UI Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/private_ui_framework_api/group" filter="!test"/>
-</component>
-<component name="dialogs_api" long-name="Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialogs_api/group" filter="!test"/>
-</component>
-<component name="document_handler_api" long-name="Document handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/document_handler_api/group"/>
-</component>
-<component name="images_api" long-name="Images API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/images_api/group" filter="!test"/>
-</component>
-<component name="stylus_popup_menu_api" long-name="Stylus Pop-up Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/stylus_popup_menu_api/group" filter="!test"/>
-</component>
-<component name="information_preview_popup_api" long-name="Information Preview Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/information_preview_popup_api/group" filter="!test"/>
-</component>
-<component name="intermediate_state_api" long-name="Intermediate State API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/intermediate_state_api/group"/>
-</component>
-<component name="help_launcher_api" long-name="Help Launcher API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/help_launcher_api/group"/>
-</component>
-</collection>
-<collection name="ode" long-name="Open Dynamics Engine" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="ode_build" filter="s60" long-name="ODE">
-<unit bldFile="mw/classicui/ode/group"/>
-</component>
-</collection>
-<collection name="uifw" long-name="UI Framework" level="server">
-<component name="uiklaf" filter="s60" long-name="Uikon Look-and-Feel">
-<unit bldFile="mw/classicui/uifw/uiklaf/group"/>
-</component>
-<component name="eikctl" filter="s60" long-name="Eikon Controls">
-<unit bldFile="mw/classicui/uifw/eikctl/group"/>
-</component>
-<component name="avkon" filter="s60" long-name="Avkon">
-<!-- can only have one unit. Split into 3 components, or #include all from same bld.inf -->
-<unit bldFile="mw/classicui/uifw/avkon/aknphysics/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/aknconf/group"/>
-</component>
-<component name="eikstd" filter="s60" long-name="Eikon Standard">
-<unit bldFile="mw/classicui/uifw/eikstd/group"/>
-</component>
-<component name="aknglobalui" filter="s60" long-name="Avkon Global UI">
-<unit bldFile="mw/classicui/uifw/aknglobalui/group"/>
-</component>
-<component name="ganes" filter="s60" long-name="Ganes">
-<unit bldFile="mw/classicui/uifw/ganes/group"/>
-</component>
-</collection>
-<collection name="commonuis" long-name="Common UIs" level="specific">
-<component name="commonui" filter="s60" long-name="Common UI">
-<unit bldFile="mw/classicui/commonuis/commonui/group"/>
-</component>
-<component name="commondialogs" filter="s60" long-name="Common Dialogs">
-<unit bldFile="mw/classicui/commonuis/commondialogs/group"/>
-</component>
-</collection>
-<collection name="applicationinterworkingfw" long-name="Application Interworking Framework" level="generic">
-<component name="aifwservicehandler" filter="s60" long-name="Application Interworking Service Handler">
-<unit bldFile="mw/classicui/applicationinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-<collection name="psln" long-name="Personalization" level="specific">
-<!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
-<component name="psln_build" filter="s60" long-name="Personalization Build">
-<unit bldFile="mw/classicui/psln/group"/>
-</component>
-</collection>
-<collection name="commonadapter" long-name="Common Adapter" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="commonadapter_build" filter="s60" long-name="Common Adapter Build">
-<unit bldFile="mw/classicui/commonadapter/group"/>
-</component>
-</collection>
-<collection name="akntouchgesturefw" long-name="Avkon Touch Gesture Framework" level="generic">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="akntouchgesturefw_build" filter="s60" long-name="Avkon Touch Gesture Framework Build" introduced="^3">
-<unit bldFile="mw/classicui/akntouchgesturefw/group"/>
-</component>
-</collection>
-<collection name="uiutils" long-name="UI Utils" level="specific">
-<component name="localizer" filter="s60" long-name="Directory Localizer">
-<unit bldFile="mw/classicui/uiutils/localizer/group"/>
-</component>
-<component name="findutil" filter="s60" long-name="Find Utility">
-<unit bldFile="mw/classicui/uiutils/findutil/group"/>
-</component>
-<component name="gamerecognizer" filter="s60" long-name="Game Recognizer" plugin="Y">
-<unit bldFile="mw/classicui/uiutils/gamerecognizer/group"/>
-</component>
-<component name="aknjapanesereading" filter="s60" long-name="Avkon Japanese Reading">
-<unit bldFile="mw/classicui/uiutils/aknjapanesereading/group"/>
-</component>
-</collection>
-<collection name="commonuisupport" long-name="Common UI Support" level="support">
-<component name="uikon" long-name="Uikon" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uikon/group" mrp="mw/classicui/commonuisupport/uikon/group/app-framework_uikon.mrp"/>
-</component>
-<component name="errorresolverdata" long-name="Error Resolver Data" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/errorresolverdata/group" mrp="mw/classicui/commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
-</component>
-<component name="uilaf" long-name="UI Look and Feel" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uilaf/GROUP" mrp="mw/classicui/commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
-</component>
-<component name="grid" long-name="Grid" purpose="optional">
-<unit bldFile="mw/classicui/commonuisupport/grid/group" mrp="mw/classicui/commonuisupport/grid/group/app-framework_grid.mrp"/>
-</component>
-<component name="uifwsdocs" long-name="UI Frameworks Documentation" purpose="development" class="doc">
-<unit mrp="mw/classicui/commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
-</component>
-</collection>
-<collection name="lafagnosticuifoundation" long-name="Look-and-Feel Agnostic UI Foundation" level="base">
-<component name="cone" long-name="Control Environment" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/cone/group" mrp="mw/classicui/lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
-</component>
-<component name="graphicseffects" long-name="Graphics Effects" introduced="9.2" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/graphicseffects/group" mrp="mw/classicui/lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
-</component>
-<component name="uigraphicsutils" long-name="UI Graphics Utilities" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group" mrp="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
-</component>
-<component name="clockanim" long-name="Clock" purpose="optional" plugin="Y">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/clockanim/group" mrp="mw/classicui/lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
-</component>
-<component name="bmpanimation" long-name="BMP Animation" introduced="6.0" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/bmpanimation/group" mrp="mw/classicui/lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
-</component>
-<component name="animation" long-name="Animation" introduced="9.1" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/animation/group" mrp="mw/classicui/lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
-</component>
-</collection>
-<collection name="classicui_info" long-name="Classic UI Info" level="specific">
-<!-- the multiple units in the API test components need to be resolved -->
-<component name="classicui_metadata" long-name="Classic UI Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/classicui/classicui_info/classicui_metadata/classicui_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="svgt" level="generic" long-name="SVG Tiny" levels="util ui">
-<collection name="svgt_plat" long-name="SVG Tiny Platform Interfaces" level="ui">
-<component name="svgt_api" long-name="SVGT API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/svgt_api/group"/>
-</component>
-<component name="nvg_api" long-name="NVG API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/nvg_api/group"/>
-</component>
-</collection>
-<collection name="svgtopt" long-name="SVG-T Engine" level="util">
-<component name="svgtopt_build" filter="s60" long-name="SVG Engine" introduced="9.2">
-<!-- component is at collection level. Needs to be moved down a directory -->
-<unit bldFile="mw/svgt/svgtopt/group"/>
-</component>
-<component name="svgtplugin" filter="s60" long-name="SVG Plugin" introduced="9.2" plugin="Y">
-<unit bldFile="mw/svgt/svgtopt/svgtplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="uiaccelerator" level="generic" long-name="UI Accelerator" levels="plugin framework server ex if">
-<collection name="uiaccelerator_plat" long-name="UI Accelerator Platform Interfaces" level="if">
-<component name="alf_core_toolkit_api" long-name="ALF Core Toolkit API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/group"/>
-</component>
-<component name="alf_visual_api" long-name="ALF Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/group"/>
-</component>
-<component name="alf_extended_visual_api" long-name="ALF Extended Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/group"/>
-</component>
-<component name="alf_extension_api" long-name="ALF Extension API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/group"/>
-</component>
-<component name="alf_tracing_api" long-name="ALF Tracing API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/group"/>
-</component>
-<component name="alf_client_server_api" long-name="ALF Client Server API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/group"/>
-</component>
-</collection>
-<collection name="uiacceltk" long-name="UI Accelerator Toolkit" level="framework">
-<component name="hitchcock" filter="s60" long-name="Hitchcock">
-<unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/group"/>
-</component>
-<component name="uiacceltk_build" filter="s60" long-name="UI Accelerator Toolkit Build">
-<!-- move into the other component, or remove the #include and make this UI Accelerator Toolkit ROM-->
-<unit bldFile="mw/uiaccelerator/uiacceltk/group"/>
-</component>
-</collection>
-</block>
-<block name="uiresources" level="generic" long-name="UI Resources" levels="compile plugin framework server generic data">
-<!-- are the custom filters below needed? -->
-<collection name="uiresources_pub" long-name="UI Resources Public Interfaces" level="data">
-<component name="pictograph_api" long-name="Pictograph API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/pictograph_api/group" filter="!test"/>
-</component>
-<component name="skins_api" long-name="Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/skins_api/group" filter="!test"/>
-</component>
-<component name="font_definition_api" long-name="Font Definition API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/font_definition_api/group" filter="!test"/>
-</component>
-<component name="graphics_api" long-name="Graphics API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/graphics_api/group" filter="!test"/>
-</component>
-<component name="scalable_icons_api" long-name="Scalable Icons API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/scalable_icons_api/group"/>
-</component>
-<component name="layout_id_definitions_api" long-name="Layout ID Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/layout_id_definitions_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_plat" long-name="UI Resources Platform Interfaces" level="data">
-<component name="layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_system_private_api/group" filter="!test"/>
-</component>
-<component name="layout_data_api" long-name="Layout Data API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_data_api/group" filter="!test"/>
-</component>
-<component name="cdl_api" long-name="CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/cdl_api/group" filter="!test"/>
-</component>
-<component name="extended_skins_api" long-name="Extended Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_skins_api/group" filter="!test"/>
-</component>
-<component name="tfx_server_controller_plugin_api" long-name="TFX Server Controller Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_controller_plugin_api/group"/>
-</component>
-<component name="extended_fonts_api" long-name="Extended Fonts API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_fonts_api/group" filter="!test"/>
-</component>
-<component name="graphic_configuration_api" long-name="Graphic Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/graphic_configuration_api/group" filter="!test"/>
-</component>
-<component name="mif_header_cdl_api" long-name="MIF Header CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mif_header_cdl_api/group"/>
-</component>
-<component name="personalisation_and_skins_settings_api" long-name="Personalisation and Skins Settings API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/personalisation_and_skins_settings_api/group"/>
-</component>
-<component name="tfx_effect_setup_plugin_api" long-name="TFX Effect Setup Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_effect_setup_plugin_api/group"/>
-</component>
-<component name="mifconv_definitions_api" long-name="Mifconv Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mifconv_definitions_api/group"/>
-</component>
-<component name="wallpaper_configuration_api" long-name="Wallpaper Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/wallpaper_configuration_api/group"/>
-</component>
-<component name="language_code_definitions_api" long-name="Language Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/language_code_definitions_api/group"/>
-</component>
-<component name="skins_image_attributes_api" long-name="Skins Image Attributes API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
-</component>
-<component name="private_user_area_code_definitions_api" long-name="Private User Area Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/private_user_area_code_definitions_api/group"/>
-</component>
-<component name="tfx_server_plugin_ids_api" long-name="TFX Server Plug-in IDs API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_plugin_ids_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_info" long-name="UI Resources Info" level="data">
-<component name="uiresources_test" filter="s60,test,api_test" long-name="UI Resources Tests" purpose="development"/>
-</collection>
-<collection name="uigraphics" long-name="UI Graphics" level="generic">
-<component name="bitmaps2" filter="s60" long-name="Bitmaps 2" class="config">
-<unit bldFile="mw/uiresources/uigraphics/bitmaps2/group"/>
-</component>
-<component name="icons" filter="s60" long-name="Icons" class="config">
-<unit bldFile="mw/uiresources/uigraphics/icons/group"/>
-</component>
-<component name="variatedbitmaps" filter="s60" long-name="Variated Bitmaps" class="config">
-<unit bldFile="mw/uiresources/uigraphics/variatedbitmaps/group"/>
-</component>
-<component name="aknicon" filter="s60" long-name="Avkon Icon Framework">
-<unit bldFile="mw/uiresources/uigraphics/aknicon/group"/>
-</component>
-<component name="nvgrenderstage" filter="sf_build" long-name="NVG Render Stage">
-<unit bldFile="mw/uiresources/uigraphics/nvgrenderstage/group"/>
-</component>
-</collection>
-<collection name="layouts" long-name="Layouts" level="plugin">
-<component name="cdl" filter="s60" long-name="Customization Definition Language">
-<!-- can only have one unit. Need to #include them or split into multiple components -->
-<unit bldFile="mw/uiresources/layouts/cdl/cdlengine/group"/>
-<unit bldFile="mw/uiresources/layouts/cdl/cdlserver/group"/>
-</component>
-<component name="aknlayout2" filter="s60" long-name="Avkon Layout 2">
-<unit bldFile="mw/uiresources/layouts/aknlayout2/group"/>
-</component>
-</collection>
-<collection name="skins" long-name="Skins" level="data">
-<component name="aknskincontent" filter="s60" long-name="Avkon Skin Content" class="config">
-<unit bldFile="mw/uiresources/skins/aknskincontent/group"/>
-</component>
-<component name="aknskins" filter="s60" long-name="Avkon Skin Compiler">
-<unit bldFile="mw/uiresources/skins/aknskins/group"/>
-</component>
-</collection>
-<collection name="pictographs" long-name="Pictographs" level="data">
-<component name="aknpictograph" filter="s60" long-name="Avkon Pictograph">
-<unit bldFile="mw/uiresources/pictographs/aknpictograph/group"/>
-</component>
-</collection>
-<collection name="locales" long-name="Locales" level="framework">
-<component name="locales_build" filter="s60" long-name="Locales Build">
-<unit bldFile="mw/uiresources/locales/loce32"/>
-</component>
-</collection>
-<collection name="uiconfig" long-name="UI Config" level="server">
-<component name="s60config" filter="s60" long-name="S60 UI Config">
-<unit bldFile="mw/uiresources/uiconfig/s60config/group"/>
-</component>
-</collection>
-<collection name="fontsupport" long-name="Font Support" level="generic">
-<component name="fontprovider" filter="s60" long-name="Font Provider">
-<unit bldFile="mw/uiresources/fontsupport/fontprovider/group"/>
-</component>
-<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
- <component id="s60_fonts" filter="s60" name="S60 Fonts">
- <unit bldFile="fontsupport/fontutils/group"/>
- </component>
--->
-<component name="fontutils" filter="sf_build" long-name="Font Utils">
-<unit bldFile="mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
-</component>
-</collection>
-<collection name="helpthemes" long-name="Help Themes" level="data">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helpthemes_build" filter="s60" long-name="Help Themes Build" class="config">
-<unit bldFile="mw/uiresources/helpthemes/group"/>
-</component>
-</collection>
-</block>
-<block name="hapticsservices" level="generic" long-name="Haptics Services" levels="fw server api">
-<collection name="hapticsservices_plat" long-name="Haptics Services Platform Interfaces" level="api">
-<component name="tacticon_api" long-name="Tacticon API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tacticon_api/group"/>
-</component>
-<component name="tactile_feedback_core_api" long-name="Tactile Feedback Core API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_core_api/group"/>
-</component>
-<component name="tactile_feedback_server_api" long-name="Tactile Feedback Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_server_api/group"/>
-</component>
-</collection>
-<collection name="hapticsservices_pub" long-name="Haptics Services Public Interfaces" level="api">
-<component name="tactile_feedback_client_api" long-name="Tactile Feedback Client API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_pub/tactile_feedback_client_api/group"/>
-</component>
-</collection>
-<collection name="tacticonserver" long-name="Tacticon Server" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="tacticonserver_build" filter="s60" long-name="Tacticon Server Build" introduced="^3">
-<unit bldFile="mw/hapticsservices/tacticonserver/group"/>
-<!-- clients and servers are suauly the same component. Consider moving pluign to a separate component if needed -->
-</component>
-</collection>
-<collection name="tactilefeedback" long-name="Tactile Feedback" level="fw">
-<component name="tactilearearegistry" filter="s60" long-name="Tactile Area Registry" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilearearegistry/group"/>
-</component>
-<component name="tactilefeedbackresolver" filter="s60" long-name="Tactile Feedback Resolver" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackresolver/group"/>
-</component>
-<component name="tactileclickplugin" filter="s60" long-name="Tactile Click Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileclickplugin/group"/>
-</component>
-<component name="tactilefeedbackclient" filter="s60" long-name="Tactile Feedback Client" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackclient/group"/>
-</component>
-<component name="tactileactionplugin" filter="s60" long-name="Tactile Action Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileactionplugin/group"/>
-</component>
-<component name="tactilefeedback_build" filter="s60" long-name="Tactile Feedback Build" introduced="^1">
-<!-- consider moving IBY to one fo the above components -->
-<unit bldFile="mw/hapticsservices/tactilefeedback/group"/>
-</component>
-</collection>
-</block>
-<block name="gsprofilesrv" level="generic" long-name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
-<collection name="gsprofilesrv_pub" long-name="GS and Profiles Services Public Interfaces" level="specific">
-<component name="profiles_engine_active_profile_settings_api" long-name="Profiles Engine Active Profile Settings API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_active_profile_settings_api/group"/>
-</component>
-<component name="profiles_engine_wrapper_api" long-name="Profiles Engine Wrapper API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_wrapper_api/group"/>
-</component>
-</collection>
-<collection name="gsprofilesrv_plat" long-name="GS and Profiles Services Platform Interfaces" level="specific">
-<component name="profiles_engine_api" long-name="Profiles Engine API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_engine_api/group"/>
-</component>
-<component name="profiles_mediafilelist_api" long-name="Media File List API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_mediafilelist_api/group"/>
-</component>
-<component name="filelist_api" long-name="File List API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/filelist_api/group"/>
-</component>
-<component name="settings_backgroundimage_api" long-name="Settings Background Image API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_backgroundimage_api/group"/>
-</component>
-<component name="settings_framework_api" long-name="Settings Framework API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_framework_api/group"/>
-</component>
-<component name="settings_launch_api" long-name="Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_launch_api/group"/>
-</component>
-<component name="settings_listbox_api" long-name="Settings List Box API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_listbox_api/group"/>
-</component>
-<component name="settings_plugin_api" long-name="Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_plugin_api/group"/>
-</component>
-<component name="settings_uis_cenrep_collection_api" long-name="Settings UIs CenRep Collection API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
-</component>
-</collection>
-<collection name="gssettingsuis" long-name="General Settings UIs" level="framework">
-<component name="gs" filter="s60" long-name="General Settings" introduced="9.2">
-<unit bldFile="mw/gsprofilesrv/gssettingsuis/gs/group"/>
-</component>
-</collection>
-<collection name="profilesservices" long-name="Profiles Services" level="server">
-<component name="filelist" filter="s60" long-name="File List" introduced="9.1">
-<unit bldFile="mw/gsprofilesrv/profilesservices/filelist/group"/>
-</component>
-<component name="mediafilelist" filter="s60" long-name="Media File List" introduced="^2">
-<unit bldFile="mw/gsprofilesrv/profilesservices/mediafilelist/group"/>
-</component>
-<component name="profileengine" filter="s60" long-name="Profile Engine" introduced="9.1">
-<unit bldFile="mw/gsprofilesrv/profilesservices/profileengine/group"/>
-</component>
-<component name="ringingtone3dplugin" filter="s60" long-name="Ringing Tone 3D Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/gsprofilesrv/profilesservices/ringingtone3dplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreensrv" level="specific" long-name="Home Screen Services" levels="plugin framework server generic specific">
-<collection name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" level="specific">
-<component name="ai_content_model_api" long-name="AI Content Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_content_model_api/group"/>
-</component>
-<component name="ai_utilities_api" long-name="AI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_utilities_api/group" filter="!test"/>
-</component>
-<component name="ai_plugin_management_api" long-name="AI Plug-in Management API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_management_api/group"/>
-</component>
-<component name="ai_plugin_information_api" long-name="AI Plug-in Information API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_information_api/group"/>
-</component>
-<component name="ai_variation_api" long-name="AI Variation API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_variation_api/group"/>
-</component>
-<component name="action_handler_plugin_api" long-name="Action Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/group" filter="!test"/>
-</component>
-<component name="content_harvester_plugin_api" long-name="Content Harvester Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/group" filter="!test"/>
-</component>
-<component name="menu_model_api" long-name="Menu Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_model_api/group"/>
-</component>
-<component name="menu_sat_interface_api" long-name="Menu SAT Interface API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/group" filter="!test"/>
-</component>
-<component name="external_home_screen_api" long-name="External Home Screen API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/external_home_screen_api/group"/>
-</component>
-<component name="menu_content_service_api" long-name="Menu Content Service API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_content_service_api/group" filter="!test"/>
-</component>
-<component name="sapi_contentpublishing" long-name="SAPI Content Publishing" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing/group"/>
-</component>
-<component name="sapi_backstepping" long-name="SAPI Backstepping" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_backstepping/group"/>
-</component>
-<component name="sapi_actionhandler" long-name="SAPI Action Handler" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_actionhandler/group"/>
-</component>
-<component name="sapi_homescreenplugin" long-name="SAPI Homescreen Plugin" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_homescreenplugin/group" filter="!test"/>
-</component>
-<component name="sapi_menucontent" long-name="SAPI Menu Content" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_menucontent/group"/>
-</component>
-<component name="xcfw_api" long-name="XCFW API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/xcfw_api/group"/>
-</component>
-<component name="idlefw_api" long-name="Idle Framework API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/idlefw_api/group"/>
-</component>
-<component name="hs_widget_publisher_api" long-name="Home Screen Publishing API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_widget_publisher_api/group"/>
-</component>
-<component name="hs_settings_api" long-name="HS Settings API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_settings_api/group"/>
-</component>
-<component name="hs_content_control_api" long-name="HS Content Control API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_content_control_api/group"/>
-</component>
-</collection>
-<collection name="xcfw" long-name="XML Content Framework" level="framework">
-<!-- collection is really a component, needs to be moved down a directory -->
-<component name="xcfw_build" filter="s60" long-name="XML Content Framework Build">
-<unit bldFile="mw/homescreensrv/xcfw/group"/>
-</component>
-</collection>
-<collection name="homescreenpluginsrv" long-name="Home Screen Plugin Service" level="plugin">
-<component name="hspsdefinitionengine" filter="s60" long-name="HS Plugin Service Definition Engine" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsdefinitionengine/group"/> -->
-</component>
-<component name="hspsdom" filter="s60" long-name="HS Plugin Service DOM" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsdom/group"/> -->
-</component>
-<component name="hspstools" filter="s60" long-name="HS Server Tools">
-<!-- <unit bldFile="homescreenpluginsrv/hspstools/group"/> -->
-</component>
-<component name="hspspluginregistry" filter="s60" long-name="HS Plugin Registry" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspspluginregistry/group"/>-->
-</component>
-<component name="hspsmanager" filter="s60" long-name="HSPS Manager" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsmanager/group"/>-->
-</component>
-<component name="hspsodt" filter="s60" long-name="HSPS Object Description Tree" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsodt/group"/>-->
-</component>
-<component name="hspsresource" filter="s60" long-name="HS Plugin Server Resource" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresource/group"/>-->
-</component>
-<component name="hspsresult" filter="s60" long-name="HS Plugin Server Result" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
-</component>
-<component name="homescreen_settings_api" filter="s60" long-name="HS Settings API" class="api placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
-</component>
-<component name="homescreenpluginsrv_build" filter="s60" long-name="HSPS Build">
-<!-- need to break this up into the self-contained components above and uncomment them -->
-<unit bldFile="mw/homescreensrv/homescreenpluginsrv/group"/>
-</component>
-</collection>
-<collection name="idlefw" long-name="Idle Framework" level="framework">
-<!-- Uncomment all units when configuration is in place. All currently #included from idlefw_build -->
-<component name="idlefw_plugins" filter="s60" long-name="Idle Framework Plugins" plugin="Y" class="placeholder">
-<!--<unit bldFile="idlefw/plugins/group"/>-->
-</component>
-<component name="hslaunch" filter="s60" long-name="Home Screen Launch" class="placeholder">
-<!--<unit bldFile="idlefw/plugins/group"/>-->
-</component>
-<component name="idlefw_build" filter="s60" long-name="Idle Framework Build">
-<!--split this into components, or separate from the above components and move this down a directory -->
-<unit bldFile="mw/homescreensrv/idlefw/group"/>
-</component>
-</collection>
-<collection name="menucontentsrv" long-name="Menu Content Service" level="generic">
-<component name="menusatinterface" filter="s60" long-name="Menu SAT Interface">
-<unit bldFile="mw/homescreensrv/menucontentsrv/menusatinterface/group"/>
-</component>
-<component name="menucontentsrv_build" filter="s60" long-name="Menu Content Service Build">
-<!--split this into components, or separate from the above component and move this down a directory -->
-<unit bldFile="mw/homescreensrv/menucontentsrv/group"/>
-</component>
-</collection>
-<collection name="backsteppingsrv" long-name="Back Stepping Service" level="server">
-<!-- collection is really a component, needs to be moved down a directory -->
-<component name="bsengine" long-name="Back Stepping Engine" filter="s60">
-<unit bldFile="mw/homescreensrv/backsteppingsrv/group"/>
-</component>
-</collection>
-<collection name="contentpublishingsrv" long-name="Content Publishing Service" level="server">
-<component name="contentpublishingdebug" filter="s60" long-name="Content Publishing Debug">
-<!-- need to move this component outside of contentpublishingutils and into separate component directory -->
-<!-- <unit bldFile="contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/> -->
-</component>
-<component name="contentpublishingutils" filter="s60" long-name="Content Publishing Utils">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingutils/group"/>
-</component>
-<component name="contentpublishingserver" filter="s60" long-name="Content Publishing Server">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingserver/group"/>
-</component>
-<component name="contentharvester" filter="s60" long-name="Content Harvester">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
-</component>
-<component name="contentpublishingsrv_build" filter="s60" long-name="Content Publishing Service Build">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/group"/>
-</component>
-</collection>
-<collection name="contentcontrolsrv" long-name="Content Control Service" level="server">
-<component name="ccsrv" long-name="Content Control Service" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccsrv/group"/>
-</component>
-<component name="ccsrvapi" long-name="Content Control Service API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccsrvapi/group"/>
-</component>
-<component name="ccclientsession" long-name="Content Control Client Session" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccclientsession/group"/>
-</component>
-<component name="hsccclient" long-name="HS Content Control Client" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/hsccclient/group"/>
-</component>
-<component name="hscontentinfo" long-name="Home Screen Content Info" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/hscontentinfo/group"/>
-</component>
-<component name="contentcontrolsrv_build" long-name="Content Control Service Build" filter="s60" introduced="^3">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/group"/>
-</component>
-</collection>
-</block>
-<block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
-<collection name="appinstall_plat" long-name="Application Installation Platform Interfaces" level="api">
-<component name="iaupdate_api" long-name="IA Update API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/iaupdate_api/group"/>
-</component>
-<component name="task_plugin_api" long-name="Task Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_plugin_api/group"/>
-</component>
-<component name="sw_installer_common_ui_api" long-name="SW Installer Common UI API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_common_ui_api/group"/>
-</component>
-<component name="sw_installer_launcher_api" long-name="SW Installer Launcher API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_launcher_api/group"/>
-</component>
-<component name="task_management_api" long-name="Task Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_management_api/group"/>
-</component>
-<component name="sw_installer_ui_plugin_api" long-name="SW Installer UI Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ui_plugin_api/group"/>
-</component>
-<component name="sw_installer_cr_keys" long-name="SW Installer CR Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_cr_keys/group"/>
-</component>
-<component name="sw_installer_ps_keys" long-name="SW Installer PS Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
-</component>
-<component name="appmngr2runtimeapi" long-name="Application Manager 2 Runtime Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
-</component>
-</collection>
-<collection name="appinstall_pub" long-name="Application Installation Public Interfaces" level="api">
-<component name="startup_list_management_api" long-name="Startup List Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
-</component>
-</collection>
-<collection name="ncdengine" long-name="Nokia Content Discover" level="framework">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="ncdengine_engine" filter="s60" long-name="NCD Engine" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/engine/group"/>
-</component>
-<component name="debuglogger" filter="s60" long-name="NCD Debug Logger" introduced="^1" class="placeholder">
-<!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
-</component>
-<component name="ncdengine_build" filter="s60" long-name="NCD Build" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/group"/>
-</component>
-</collection>
-<collection name="appinstaller" long-name="Application Installer" level="generic">
-<component name="appmngr2" filter="s60" long-name="Application Manager 2" introduced="^2">
-<unit bldFile="mw/appinstall/appinstaller/appmngr2/group"/>
-</component>
-<component name="appinstui" filter="s60" long-name="Application Installer UI" introduced="^2">
-<unit bldFile="mw/appinstall/appinstaller/appinstui/group"/>
-</component>
-</collection>
-<collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="api">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="iaupdateapi_stub_build" long-name="IA Update API Stub Build" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdateapi_stub/group"/>
-</component>
-</collection>
-<collection name="iaupdate" long-name="Independent Apps Update" level="api">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="iad" long-name="Software Update" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/iad/group"/>
-</component>
-<component name="iaupdate_help" filter="s60" long-name="IA Update Help" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/help/group"/>
-</component>
-<component name="iaupdate_build" filter="s60" long-name="IA Update Build" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/group"/>
-</component>
-</collection>
-<collection name="installationservices" long-name="Installation Services" level="generic">
-<component name="swi" long-name="Secure Software Install" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swi/group" mrp="mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
-</component>
-<component name="swidevicetools" long-name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
-<unit bldFile="mw/appinstall/installationservices/swidevicetools/group" mrp="mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
-</component>
-<component name="swiconfig" long-name="Software Install Config" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appinstall/installationservices/swiconfig/group" mrp="mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
-</component>
-</collection>
-<collection name="secureswitools" long-name="Secure Software Install Tools" level="tool">
-<component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/makekeys/group" mrp="mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
-</component>
-<component name="swianalysistoolkit" long-name="SWI Analysis Toolkit" purpose="development" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
-</component>
-<component name="openssllib" long-name="OpenSSL Library" purpose="optional" class="PC">
-<unit mrp="mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
-</component>
-<component name="swisistools" long-name="Secure Software Install SIS Tools" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swisistools/group" mrp="mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
-</component>
-</collection>
-<collection name="appinstall_info" long-name="Application Installation Info" level="api">
-<component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="serviceapifw" level="specific" long-name="Service API Framework" levels="plugin framework server generic specific">
-<collection name="serviceapifw_pub" long-name="Service API Framework Public Interfaces" level="specific"/>
-<collection name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" level="specific">
-<component name="rtsecuritymanager_common_api" long-name="Runtime Security Manager Common API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/group"/>
-</component>
-<component name="rtsecuritymanager_utility_api" long-name="Runtime Security Manager Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
-</component>
-<component name="rtsecuritymanager_client_api" long-name="Runtime Security Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/group"/>
-</component>
-<component name="liw_provider_utility_api" long-name="LIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_provider_utility_api/group"/>
-</component>
-<component name="liw_service_interface_base_api" long-name="LIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_base_api/group"/>
-</component>
-<component name="liw_service_interface_menu_api" long-name="LIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_menu_api/group"/>
-</component>
-<component name="liw_criteria_api" long-name="LIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_criteria_api/group"/>
-</component>
-<component name="liw_generic_parameter_api" long-name="LIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_generic_parameter_api/group"/>
-</component>
-<component name="liw_service_handler_api" long-name="LIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_handler_api/group"/>
-</component>
-</collection>
-<collection name="rtsecuritymanager" long-name="Runtime Security Manager" level="server">
-<component name="rtsecuritymanagerutil" filter="s60" long-name="Runtime Security Manager Util">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
-</component>
-<component name="rtsecuritymanagerserver" filter="s60" long-name="Runtime Security Manager Server">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/>
-</component>
-<component name="rtsecuritymanagerclient" filter="s60" long-name="Runtime Security Manager Client">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/>
-</component>
-<component name="rtsecuritymanager_build" filter="s60" long-name="Runtime Security Manager Build">
-<!-- Move the export to the appropriate components, or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/group"/>
-</component>
-</collection>
-<collection name="languageinterworkingfw" long-name="Language Interworking Framework" level="framework">
-<component name="lifwservicehandler" filter="s60" long-name="Service Handler">
-<unit bldFile="mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-</block>
-<block name="serviceapi" level="specific" long-name="Service API" levels="os mw1 mw2 app">
-<!-- should break up this collection into something meaningful -->
-<collection name="serviceproviders" long-name="Service Providers" level="mw1">
-<component name="sapi_contacts_vpbk" long-name="Contacts Phonebook SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
-</component>
-<component name="sapi_location" long-name="Location SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_location/group"/>
-</component>
-<component name="sapi_mediamanagement" long-name="Media Management SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/group"/>
-</component>
-<component name="sapi_landmarks" long-name="Landmarks SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
-</component>
-<component name="sapi_messaging" long-name="Messaging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/group"/>
-</component>
-<component name="sapi_applicationmanager" long-name="Application Manager SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
-</component>
-<component name="sapi_calendar" long-name="Calendar SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_calendar/group"/>
-</component>
-<component name="sapi_logging" long-name="Logging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_logging/group"/>
-</component>
-<component name="sapi_sensor" long-name="Sensor SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sensor/group"/>
-</component>
-<component name="sapi_sysinfo" long-name="Sysinfo SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sysinfo/group"/>
-</component>
-<component name="sapi_serviceregistry" long-name="Service Registry SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
-</component>
-<component name="jsapi" long-name="Javascript API" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/jsapi/group"/>
-</component>
-<component name="serviceproviders_build" filter="s60" long-name="Service API Build">
-<!-- distribute the exports or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapi/serviceproviders/group"/>
-</component>
-</collection>
-</block>
-<block name="web" level="specific" long-name="Web" levels="plugin utils server generic specific">
-<collection name="web_pub" long-name="Web Public Interfaces" level="specific">
-<component name="browser_control_api" long-name="Browser Control API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_control_api/group"/>
-</component>
-<component name="download_mgr_client_api" long-name="Download Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_client_api/group"/>
-</component>
-<component name="download_mgr_ui_api" long-name="Download Manager UI Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_ui_api/group"/>
-</component>
-<component name="favourites_engine_api" long-name="Favourites Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/favourites_engine_api/group"/>
-</component>
-<component name="browser_plugin_api" long-name="Browser Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_plugin_api/group"/>
-</component>
-<component name="settings_api" long-name="Settings API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/settings_api/group"/>
-</component>
-</collection>
-<collection name="web_plat" long-name="Web Platform Interfaces" level="specific">
-<component name="aiw_browser_provider_api" long-name="AIW Browser Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/aiw_browser_provider_api/group"/>
-</component>
-<component name="browser_dialogs_provider_api" long-name="Browser Dialogs Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_dialogs_provider_api/group"/>
-</component>
-<component name="browser_platform_api" long-name="Browser Platform API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_platform_api/group"/>
-</component>
-<component name="cod_handler_api" long-name="COD Handler API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cod_handler_api/group"/>
-</component>
-<component name="connection_manager_api" long-name="Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/connection_manager_api/group"/>
-</component>
-<component name="cxml_library_api" long-name="cXml Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cxml_library_api/group"/>
-</component>
-<component name="download_mgr_client_api_extn" long-name="Download Manager Client API Extension" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/download_mgr_client_api_extn/group"/>
-</component>
-<component name="download_path_plugin_api" long-name="Download Path Plugin API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/web/web_plat/download_path_plugin_api/group"/>
-</component>
-<component name="feeds_engine_api" long-name="Feeds Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/feeds_engine_api/group"/>
-</component>
-<component name="launcher_api" long-name="Launcher API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/launcher_api/group"/>
-</component>
-<component name="multipart_parser_api" long-name="Multipart Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/multipart_parser_api/group"/>
-</component>
-<component name="recent_url_store_api" long-name="Recent URL Store API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/recent_url_store_api/group"/>
-</component>
-<component name="scheme_handler_plugin_api" long-name="Scheme Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scheme_handler_plugin_api/group"/>
-</component>
-<component name="scriptable_plugin_api" long-name="Scriptable Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scriptable_plugin_api/group"/>
-</component>
-<component name="webutils_api" long-name="Web Utils API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/webutils_api/group"/>
-</component>
-<component name="widget_registry_api" long-name="Widget Registry API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/widget_registry_api/group"/>
-</component>
-<component name="xml_parser_api" long-name="XML Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/xml_parser_api/group"/>
-</component>
-<component name="stmgesturefw_api" long-name="State Machine Gesture Framework API " filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/stmgesturefw_api/group"/>
-</component>
-</collection>
-<collection name="web_info" long-name="Web Info" level="specific">
-<component name="web_build" filter="s60" long-name="Web Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/group"/>
-</component>
-</collection>
-<collection name="browserutilities" long-name="Browser Utilities" level="utils">
-<component name="browserdialogsprovider" filter="s60" long-name="Browser Dialogs Provider">
-<unit bldFile="mw/web/browserutilities/browserdialogsprovider/group"/>
-</component>
-<component name="recenturlstore" filter="s60" long-name="Recent URL Store">
-<unit bldFile="mw/web/browserutilities/recenturlstore/group"/>
-</component>
-<component name="xmlparser" filter="s60" long-name="XML Interface">
-<unit bldFile="mw/web/browserutilities/xmlparser/group"/>
-</component>
-<component name="cxmllibrary" filter="s60" long-name="XML Parser Implementation">
-<unit bldFile="mw/web/browserutilities/cxmllibrary/group"/>
-</component>
-<component name="downloadmgr" filter="s60" long-name="Download Manager">
-<unit bldFile="mw/web/browserutilities/downloadmgr/group"/>
-</component>
-<component name="connectionmanager" filter="s60" long-name="Connection Manager">
-<unit bldFile="mw/web/browserutilities/connectionmanager/group"/>
-</component>
-<component name="browsertelservice" filter="s60" long-name="Browser Telephony Service">
-<unit bldFile="mw/web/browserutilities/browsertelservice/group"/>
-</component>
-<component name="favouritesengine" filter="s60" long-name="Favourites Engine">
-<unit bldFile="mw/web/browserutilities/favouritesengine/group"/>
-</component>
-<component name="feedsengine" filter="s60" long-name="Feeds Engine">
-<unit bldFile="mw/web/browserutilities/feedsengine/group"/>
-</component>
-<component name="multipartparser" filter="s60" long-name="Multipart Parser">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
-<!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
-</component>
-<component name="schemehandler" filter="s60" long-name="Scheme Handler">
-<unit bldFile="mw/web/browserutilities/schemehandler/group"/>
-</component>
-<component name="webutils" filter="s60" long-name="Web Utils">
-<unit bldFile="mw/web/browserutilities/webutils/group"/>
-</component>
-<component name="aiwbrowserprovider" filter="s60" long-name="AIW Browser Provider" plugin="Y">
-<unit bldFile="mw/web/browserutilities/aiwbrowserprovider/group"/>
-</component>
-<component name="browserutilities_build" filter="s60" long-name="Browser Utilities Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/browserutilities/group"/>
-</component>
-</collection>
-<collection name="webengine" long-name="Web Engine" level="server">
-<component name="osswebengine" filter="s60" long-name="OSS Web Engine">
-<!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
-<unit bldFile="mw/web/webengine/osswebengine/cache/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/memorymanager/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/npscript/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group/javascriptcore"/>
-</component>
-<component name="webkitutils" filter="s60" long-name="WebKit Utils">
-<unit bldFile="mw/web/webengine/webkitutils/group"/>
-</component>
-<component name="pagescaler" filter="s60" long-name="Page Scaler">
-<unit bldFile="mw/web/webengine/pagescaler/group"/>
-</component>
-<component name="webwidgetinstaller" filter="s60" long-name="Widget Installer">
-<unit bldFile="mw/web/webengine/widgetinstaller/group"/>
-</component>
-<component name="widgetregistry" filter="s60" long-name="Widget Registry">
-<unit bldFile="mw/web/webengine/widgetregistry/group"/>
-</component>
-<component name="wmlengine" filter="s60" long-name="WML Engine">
-<unit bldFile="mw/web/webengine/wmlengine/group"/>
-</component>
-<component name="device" filter="s60" long-name="Device">
-<!-- this needs a more meaningful name -->
-<unit bldFile="mw/web/webengine/device/group"/>
-</component>
-<component name="widgetengine" filter="s60" long-name="Widget Engine">
-<unit bldFile="mw/web/webengine/widgetengine/group"/>
-</component>
-<component name="web_memoryplugin" long-name="Memory Plugin" filter="s60" plugin="Y">
-<unit bldFile="mw/web/webengine/memoryplugin/group"/>
-</component>
-<component name="widgetmemoryplugin" filter="s60" long-name="Widget Memory Plugin" plugin="Y">
-<unit bldFile="mw/web/webengine/widgetmemoryplugin/group"/>
-</component>
-<component name="widgetbackuprestore" filter="s60" long-name="Widget Backup and Restore">
-<unit bldFile="mw/web/webengine/widgetbackuprestore/group"/>
-</component>
-<component name="browserrecognizers" filter="s60" long-name="Browser Recognizers" plugin="Y">
-<unit bldFile="mw/web/webengine/browserrecognizers/group"/>
-</component>
-<component name="wrtharvester" filter="s60" long-name="Web Runtime Harvester" plugin="Y">
-<unit bldFile="mw/web/webengine/wrtharvester/group"/>
-</component>
-</collection>
-<collection name="codhandler" long-name="Content Object Descriptor Handler" level="specific">
-<component name="codeng" filter="s60" long-name="COD Engine">
-<unit bldFile="mw/web/codhandler/codeng/group"/>
-</component>
-<component name="codui" filter="s60" long-name="COD UI">
-<unit bldFile="mw/web/codhandler/codui/group"/>
-</component>
-<component name="codrecog" filter="s60" long-name="COD Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/codrecog/group"/>
-</component>
-<component name="codviewer" filter="s60" long-name="COD Viewer">
-<unit bldFile="mw/web/codhandler/codviewer/group"/>
-</component>
-<component name="ddrecog" filter="s60" long-name="Download Descriptor Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/ddrecog/group"/>
-</component>
-<component name="ddviewer" filter="s60" long-name="Download Descriptor Viewer">
-<unit bldFile="mw/web/codhandler/ddviewer/group"/>
-</component>
-<component name="coddownload" filter="s60" long-name="COD Download">
-<unit bldFile="mw/web/codhandler/coddownload/group"/>
-</component>
-<component name="roapapp" filter="s60" long-name="ROAP Application">
-<unit bldFile="mw/web/codhandler/roapapp/group"/>
-</component>
-<component name="codhandler_build" filter="s60" long-name="COD Handler Build">
-<!-- Exports need to go into another component or make this self-contained.
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/codhandler/group"/>
-</component>
-</collection>
-<collection name="widgets" long-name="Web Widget Framework" level="generic">
-<!-- the following units can be uncommented when configuration is put in place -->
-<component name="widgetrecognizer" filter="s60" long-name="Widget Recognizer" plugin="Y">
-<!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
-</component>
-<component name="widgetinstaller" filter="s60" long-name="Widget Installer UI" plugin="Y">
-<!--<unit bldFile="widgets/widgetinstaller/group"/>-->
-</component>
-<component name="widgetlauncher" filter="s60" long-name="Widget Launcher">
-<!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
-</component>
-<component name="widgetapp" filter="s60" long-name="Widget UI">
-<!--<unit bldFile="widgets/widgetapp/group"/>-->
-</component>
-<component name="widgetsidchecker" filter="s60" long-name="Widget SID Checker" introduced="^3">
-<!--<unit bldFile="widgets/widgetsidchecker/group"/>-->
-</component>
-<component name="widgetpreinstaller" filter="s60" long-name="Widget Pre-Installer">
-<!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
-</component>
-<component name="widgetstartup" filter="s60" long-name="Widget Startup">
-<!--<unit bldFile="widgets/widgetstartup/group"/>-->
-</component>
-<component name="widgets_build" filter="s60" long-name="Widgets Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/widgets/group"/>
-</component>
-</collection>
-</block>
-<block name="websrv" level="generic" long-name="Web Services" levels="plugin framework server generic specific">
-<collection name="websrv_pub" long-name="Web Services Public Interfaces" level="specific">
-<component name="web_service_description_api" long-name="Web Service Description API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_description_api/group"/>
-</component>
-<component name="web_service_connection_api" long-name="Web Service Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/group"/>
-</component>
-<component name="web_service_manager_api" long-name="Web Service Manager API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/group"/>
-</component>
-<component name="hostlet_connection_api" long-name="Hostlet Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/group"/>
-</component>
-<component name="web_service_messaging_api" long-name="Web Service Messaging API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/group"/>
-</component>
-<component name="xml_extensions_api" long-name="XML Extensions API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/group"/>
-</component>
-<component name="xml_fragment_api" long-name="XML Fragment API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/group"/>
-</component>
-</collection>
-<collection name="webservices" long-name="Web Services Framework" level="generic">
-<!-- consider breaking this collection into more meaningful subsets -->
-<component name="wsnotifierplugins" filter="s60" long-name="WS Notifier Plugins" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsnotifierplugins/group"/>
-</component>
-<component name="wslogger" filter="s60" long-name="WS Logger">
-<unit bldFile="mw/websrv/webservices/wslogger/group"/>
-</component>
-<component name="wsxml" filter="s60" long-name="WS XML Extensions">
-<unit bldFile="mw/websrv/webservices/wsxml/group"/>
-</component>
-<component name="wsutils" filter="s60" long-name="WS Utils">
-<unit bldFile="mw/websrv/webservices/wsutils/group"/>
-</component>
-<component name="wsfragment" filter="s60" long-name="WS Fragment">
-<unit bldFile="mw/websrv/webservices/wsfragment/group"/>
-</component>
-<component name="wsdescription" filter="s60" long-name="WS Service Description">
-<unit bldFile="mw/websrv/webservices/wsdescription/group"/>
-</component>
-<component name="wsconnection" filter="s60" long-name="WS Service Connection">
-<unit bldFile="mw/websrv/webservices/wsconnection/group"/>
-</component>
-<component name="wsmessages" filter="s60" long-name="WS Messages">
-<unit bldFile="mw/websrv/webservices/wsmessages/group"/>
-</component>
-<component name="wscredentialmanager" filter="s60" long-name="WS Credential Manager">
-<unit bldFile="mw/websrv/webservices/wscredentialmanager/group"/>
-</component>
-<component name="wsframework" filter="s60" long-name="WS Framework">
-<unit bldFile="mw/websrv/webservices/wsframework/group"/>
-</component>
-<component name="wshttpchanneltransportplugin" filter="s60" long-name="WS HTTP Channel Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshttpchanneltransportplugin/group"/>
-</component>
-<component name="wsconnectionagent" filter="s60" long-name="WS Connection Agent">
-<unit bldFile="mw/websrv/webservices/wsconnectionagent/group"/>
-</component>
-<component name="wsprovider" filter="s60" long-name="WS Provider">
-<unit bldFile="mw/websrv/webservices/wsprovider/group"/>
-</component>
-<component name="wshostletconnection" filter="s60" long-name="WS Hostlet Connection">
-<unit bldFile="mw/websrv/webservices/wshostletconnection/group"/>
-</component>
-<component name="wsmanager" filter="s60" long-name="WS Service Manager">
-<unit bldFile="mw/websrv/webservices/wsmanager/group"/>
-</component>
-<component name="wsidentitymanager" filter="s60" long-name="WS Identity Manager">
-<unit bldFile="mw/websrv/webservices/wsidentitymanager/group"/>
-</component>
-<component name="idwsfplugin" filter="s60" long-name="ID-WSF Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/idwsfplugin/group"/>
-</component>
-<component name="wsibasicplugin" filter="s60" long-name="WS-I Basic Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsibasicplugin/group"/>
-</component>
-<component name="wsrestplugin" filter="s60" long-name="WS REST Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsrestplugin/group"/>
-</component>
-<component name="idwsfsecuritymechanism" filter="s60" long-name="ID-WSF Security Mechanism">
-<unit bldFile="mw/websrv/webservices/idwsfsecuritymechanism/group"/>
-</component>
-<component name="wspasswordtransforms" filter="s60" long-name="WS Password Transforms">
-<unit bldFile="mw/websrv/webservices/wspasswordtransforms/group"/>
-</component>
-<component name="wscore" filter="s60" long-name="WS Core Service Manager">
-<unit bldFile="mw/websrv/webservices/wscore/group"/>
-</component>
-<component name="wslocaltransportplugin" filter="s60" long-name="WS Local Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wslocaltransportplugin/group"/>
-</component>
-<component name="wshostlettransportplugin" filter="s60" long-name="WS Hostlet Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshostlettransportplugin/group"/>
-</component>
-<component name="wsstar" filter="s60" long-name="WS Star">
-<!-- can only have one unit. Need to split into separate components or #include from a single bld.inf -->
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarpolicy/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarplugin/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarmessagehandlers/group"/>
-</component>
-<component name="wsoviplugin" filter="s60" long-name="WS Ovi Plugin">
-<unit bldFile="mw/websrv/webservices/wsoviplugin/group"/>
-</component>
-<component name="webservices_build" filter="s60" long-name="Web Services Build">
-<!-- need to split into self-contained components -->
-<unit bldFile="mw/websrv/webservices/group"/>
-</component>
-</collection>
-<collection name="websrv_info" long-name="Web Services Info" level="specific">
-<component name="websrv_bld" filter="s60" long-name="Web Services Build">
-<!-- need to include common .hrh in each unit -->
-<unit bldFile="mw/websrv/group"/>
-</component>
-</collection>
-</block>
-<block name="platformtools" level="generic" long-name="Platform Tools">
-<collection name="gfxconversion" long-name="Graphics Conversion">
-<component name="bmconv_s60" filter="s60" long-name="S60 Bitmap Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/bmconv_s60/group"/>
-</component>
-<component name="mifconv" filter="s60" long-name="Multi Icon File Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/mifconv/group"/>
-</component>
-</collection>
-</block>
-<block name="uitools" level="specific" long-name="UI Tools" levels="compile encode tool if">
-<collection name="uitools_pub" long-name="UI Tools Public Interfaces" level="if">
-<component name="third_party_bitmap_palette_api" long-name="Third Party Bitmap Palette API" filter="s60" class="api">
-<unit bldFile="mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
-</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">
-<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">
-<unit bldFile="mw/uitools/uitools_plat/layout_system_private_api/group"/>
-</component>
-</collection>
-<collection name="cdlcompilertoolkit" long-name="CDL Compiler Toolkit" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompilertoolkit_build" filter="s60" long-name="CDL Compiler Toolkit Build">
-<unit bldFile="mw/uitools/cdlcompilertoolkit/group"/>
-</component>
-</collection>
-<collection name="cdlcompiler" long-name="CDL Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompiler_build" filter="s60" long-name="CDL Compiler Build">
-<unit bldFile="mw/uitools/cdlcompiler/group"/>
-</component>
-</collection>
-<collection name="gfxtools" long-name="Graphics Tools" level="tool">
-<component name="gditools" filter="s60" long-name="GDI Tools" class="PC">
-<unit bldFile="mw/uitools/gfxtools/gditools/group"/>
-</component>
-<component name="color" filter="s60" long-name="Bitmap Colour Palette" class="PC">
-<unit bldFile="mw/uitools/gfxtools/color/group"/>
-</component>
-</collection>
-<collection name="aknlayoutcompiler" long-name="Avkon Layout Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="aknlayoutcompiler_build" filter="s60" long-name="Avkon Layout Compiler Build">
-<unit bldFile="mw/uitools/aknlayoutcompiler/group"/>
-</component>
-</collection>
-<collection name="skincompiler" long-name="Skin Compiler" level="compile">
-<component name="aknskindesccompiler" filter="s60" long-name="Avkon Skin Descriptor Compiler">
-<unit bldFile="mw/uitools/skincompiler/AknSkinDescCompiler/group"/>
-</component>
-</collection>
-<collection name="reszip" long-name="Resource Zip" level="encode">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="reszip_build" filter="s60" long-name="Resource Zip Build">
-<unit bldFile="mw/uitools/reszip/group"/>
-</component>
-</collection>
-<collection name="toollibraries" long-name="Tool Libraries" level="tool"/>
-<collection name="svgtencoder" long-name="SVGT Encoder" level="encode">
-<component name="svgtenc" filter="s60" long-name="Standalone SVGT Encoder" class="PC">
-<unit bldFile="mw/uitools/svgtencoder/svgtenc/standalone/group"/>
-</component>
-</collection>
-</block>
-</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">
-<component name="location_centre_api" long-name="Location Centre API" introduced="^3" filter="s60" class="api">
-<unit bldFile="app/location/loc_plat/location_centre_api/group"/>
-</component>
-</collection>
-<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"/>
-</component>
-<component name="landmarks_ui_addedit_api" long-name="Landmarks UI Add/Edit API" filter="s60" class="api">
-<unit bldFile="app/location/loc_pub/landmarks_ui_addedit_api/group"/>
-</component>
-</collection>
-<collection name="basiclocationinfodisplay" long-name="Basic Location Info Display" level="ui">
-<component name="blid" filter="s60" long-name="Basic Location Info Display Build">
-<unit bldFile="app/location/basiclocationinfodisplay/blid/group"/>
-</component>
-</collection>
-<collection name="landmarksui" long-name="Landmarks UI" level="loc">
-<component name="landmarksui_help" filter="s60" long-name="Landmarks UI Help">
-<unit bldFile="app/location/landmarksui/help/group"/>
-</component>
-<component name="landmarksui_engine" filter="s60" long-name="Landmarks UI Engine">
-<unit bldFile="app/location/landmarksui/engine/group"/>
-</component>
-<component name="uicontrols" filter="s60" long-name="Landmarks UI Controls">
-<unit bldFile="app/location/landmarksui/uicontrols/group"/>
-</component>
-<component name="landmarksui_commonui" filter="s60" long-name="Landmarks Common UI">
-<unit bldFile="app/location/landmarksui/commonui/group"/>
-</component>
-<component name="landmarksui_app" filter="s60" long-name="Landmarks Application">
-<unit bldFile="app/location/landmarksui/app/group"/>
-</component>
-<component name="msgviewer" filter="s60" long-name="Landmarks Message Viewer">
-<unit bldFile="app/location/landmarksui/msgviewer/group"/>
-</component>
-<component name="landmarksui_build" filter="s60" long-name="Landmarks UI Build">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="app/location/landmarksui/group"/>
-</component>
-</collection>
-<collection name="eventsui" long-name="Location Events UI" level="events">
-<component name="eventsui_help" filter="s60" long-name="Events Help">
-<unit bldFile="app/location/eventsui/help/group"/>
-</component>
-<component name="eventsutils" filter="s60" long-name="Events Utils">
-<unit bldFile="app/location/eventsui/eventsutils/group"/>
-</component>
-<component name="eventsengine" filter="s60" long-name="Events Engine">
-<unit bldFile="app/location/eventsui/eventsengine/group"/>
-</component>
-<component name="eventshandlerui" filter="s60" long-name="Events Handler UI">
-<unit bldFile="app/location/eventsui/eventshandlerui/group"/>
-</component>
-<component name="eventseditor" filter="s60" long-name="Events Editor">
-<unit bldFile="app/location/eventsui/eventseditor/group"/>
-</component>
-<component name="eventsmgmtui" filter="s60" long-name="Events Management UI">
-<unit bldFile="app/location/eventsui/eventsmgmtui/group"/>
-</component>
-<component name="eventsui_build" filter="s60" long-name="Events UI Build">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="app/location/eventsui/group"/>
-</component>
-</collection>
-<collection name="locationlandmarksrefappfors60" long-name="Location Landmarks Reference App for S60" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="lmrefapp" filter="s60" long-name="Landmarks Reference Application">
-<unit bldFile="app/location/locationlandmarksrefappfors60/group"/>
-</component>
-</collection>
-<collection name="locationlandmarksuirefapp" long-name="Location Landmarks UI Reference App" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="lmuirefapp" filter="s60" long-name="Landmarks UI Reference Application">
-<unit bldFile="app/location/locationlandmarksuirefapp/group"/>
-</component>
-</collection>
-<collection name="locationsatviewrefapp" long-name="Location Satellite View Reference App" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="satellitereference" filter="s60" long-name="Satellite Info UI Reference Application">
-<unit bldFile="app/location/locationsatviewrefapp/group"/>
-</component>
-</collection>
-<collection name="simpsyconfigurator" long-name="Simulation PSY Configurator" level="ui">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="simpsyui" filter="s60" long-name="Simulation PSY UI">
-<unit bldFile="app/location/simpsyconfigurator/group"/>
-</component>
-</collection>
-<collection name="mapnavproviderrefapp" long-name="Map and Navigation Provider Reference App" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="mapnavproviderrefapp_build" filter="s60" long-name="Map and Navigation Provider Reference Application">
-<unit bldFile="app/location/mapnavproviderrefapp/group"/>
-</component>
-</collection>
-<collection name="locationcentre" long-name="Location Centre" level="loc">
-<component name="lcutils" long-name="Location Centre Utilities" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcutils/group"/>
-</component>
-<component name="lcservice" long-name="Location Centre Service Project" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcservice/group"/>
-</component>
-<component name="lcserver" long-name="Location Centre Server Project" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcserver/group"/>
-</component>
-<component name="lcapp" long-name="Location Centre Application" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcapp/group"/>
-</component>
-<component name="locationcentre_build" filter="s60" long-name="Location Centre Build" introduced="^3">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="app/location/locationcentre/group"/>
-</component>
-</collection>
-</block>
-<block name="mmsharinguis" level="services" long-name="Multimedia Sharing UIs" levels="base plugin if">
-<collection name="mmsharinguis_plat" long-name="Multimedia Sharing UIs Platform Interfaces" level="if">
-<component name="multimedia_sharing_settings_api" long-name="Multimedia Sharing Settings API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_settings_api/group"/>
-</component>
-<component name="multimedia_sharing_resource_api" long-name="Multimedia Sharing Resource API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_resource_api/group"/>
-</component>
-<component name="multimedia_sharing_manager_api" long-name="Multimedia Sharing Manager API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/group"/>
-</component>
-</collection>
-<collection name="mmsharing" long-name="Multimedia Sharing" level="base">
-<component name="mmshavailability" filter="s60" long-name="Multimedia Sharing Availability">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshavailability/group"/>
-</component>
-<component name="mmshindicator" filter="s60" long-name="Multimedia Sharing Indicator">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshindicator/group"/>
-</component>
-<!-- consider putting client and server in the same component -->
-<component name="mmshmanagercli" filter="s60" long-name="Multimedia Sharing Manager Client">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshmanagercli/group" filter="!test"/>
-</component>
-<component name="mmshmanagersrv" filter="s60" long-name="Multimedia Sharing Manager Server">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshmanagersrv/group"/>
-</component>
-<component name="mmshengine" filter="s60" long-name="Multimedia Sharing Engine">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshengine/group"/>
-</component>
-<component name="mmshui" filter="s60" long-name="Multimedia Sharing UI">
-<!-- can only have one unit: need to #include one from the other if it's needed -->
-<unit bldFile="app/mmsharinguis/mmsharing/mmshui/group"/>
-<unit bldFile="app/mmsharinguis/mmsharing/mmshui/help/group"/>
-</component>
-<component name="mmsharing_build" filter="s60" long-name="MM Sharing Build">
-<unit bldFile="app/mmsharinguis/mmsharing/group"/>
-</component>
-</collection>
-<collection name="mmshplugins" long-name="Multimedia Sharing Plugins" level="plugin">
-<component name="mmshaoplugin" filter="s60" long-name="Multimedia Sharing Always Online Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshaoplugin/group"/>
-</component>
-<component name="mmshaiwplugin" filter="s60" long-name="Multimedia Sharing AIW Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshaiwplugin/group"/>
-</component>
-<component name="mmshsipcrplugin" filter="s60" long-name="Multimedia Sharing SIP Client Resolver Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshsipcrplugin/group"/>
-</component>
-<component name="mmshsettingsuiplugin" filter="s60" long-name="Multimedia Sharing Settings UI Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshsettingsuiplugin/group"/>
-</component>
-<component name="mmshwpadapterplugin" filter="s60" long-name="Multimedia Sharing WAP Provisioning Adapter" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshwpadapterplugin/group"/>
-</component>
-</collection>
-<collection name="mmsharinguis_info" long-name="Multimedia Sharing UIs Info" level="if">
-<component name="mmsharinguis_build" filter="s60" long-name="Multimedia Sharing UIs Build">
-<!-- consider distributing to other components -->
-<unit bldFile="app/mmsharinguis/group"/>
-</component>
-</collection>
-</block>
-<block name="phone" level="apps" span="2" long-name="Phone Apps" levels="engine plugin ui app">
-<collection name="phone_plat" long-name="Phone Apps Platform Interfaces" level="app">
-<component name="3d_ringing_tone_enabler_api" long-name="3D Ringing Tone Enabler API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
-</component>
-<component name="telephony_comms_information_api" long-name="Telephony Comms Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_comms_information_api/group"/>
-</component>
-<component name="telephony_information_api" long-name="Telephony Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_information_api/group"/>
-</component>
-<component name="telephony_device_mode_api" long-name="Telephony Device Mode API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_device_mode_api/group"/>
-</component>
-<component name="telephony_remote_party_information_api" long-name="Telephony Remote Party Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_remote_party_information_api/group"/>
-</component>
-<component name="telephony_video_mailbox_settings_api" long-name="Telephony Video Mailbox Settings API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_video_mailbox_settings_api/group"/>
-</component>
-<component name="telephony_configuration_api" long-name="Telephony Configuration API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_configuration_api/group"/>
-</component>
-<component name="telephony_microphone_mute_status_api" long-name="Telephony Microphone Mute Status API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_microphone_mute_status_api/group"/>
-</component>
-<component name="dialer_keypad_api" long-name="Dialer Keypad API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/dialer_keypad_api/group"/>
-</component>
-<component name="telephony_logging_extension_api" long-name="Telephony Logging Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_logging_extension_api/group"/>
-</component>
-<component name="telephony_matching_extension_api" long-name="Telephony Matching Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_matching_extension_api/group"/>
-</component>
-<component name="telephony_bubble_extension_api" long-name="Telephony Bubble Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_bubble_extension_api/group"/>
-</component>
-<component name="telephony_menu_extension_api" long-name="Telephony Menu Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_menu_extension_api/group"/>
-</component>
-<component name="phone_application_commands_api" long-name="Phone Application Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_commands_api/group"/>
-</component>
-<component name="phone_application_voip_commands_api" long-name="Phone Application VOIP Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_voip_commands_api/group"/>
-</component>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_mediator_api/group"/>
-</component>
-<component name="video_telephony_mediator_api" long-name="Video Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/video_telephony_mediator_api/group"/>
-</component>
-</collection>
-<collection name="phoneapp" long-name="Phone Application" level="app">
-<component name="blacklist" filter="s60" long-name="Phone Blacklist Clearing" plugin="Y">
-<unit bldFile="app/phone/phoneapp/blacklist/group"/>
-</component>
-<component name="phoneui" filter="s60" long-name="Phone UI">
-<unit bldFile="app/phone/phoneapp/phoneui/group" filter="!test"/>
-</component>
-<component name="phoneuicontrol" filter="s60" long-name="Phone UI Control">
-<unit bldFile="app/phone/phoneapp/phoneuicontrol/group"/>
-</component>
-<component name="phoneuistates" filter="s60" long-name="Phone UI States">
-<unit bldFile="app/phone/phoneapp/phoneuistates/group"/>
-</component>
-<component name="phoneuiutils" filter="s60" long-name="Phone UI Utils">
-<unit bldFile="app/phone/phoneapp/phoneuiutils/group"/>
-</component>
-<component name="phoneuiview" filter="s60" long-name="Phone UI View">
-<unit bldFile="app/phone/phoneapp/phoneuiview/group"/>
-</component>
-<component name="phoneuivoipextension" filter="s60" long-name="Phone UI VOIP Extension">
-<unit bldFile="app/phone/phoneapp/phoneuivoipextension/group"/>
-</component>
-<component name="silenceactionplugin" filter="s60" long-name="Silence Action Plugin" plugin="Y">
-<unit bldFile="app/phone/phoneapp/silenceactionplugin/group"/>
-</component>
-<component name="phonemediatorcenter" filter="s60" long-name="Phone Mediator Center">
-<unit bldFile="app/phone/phoneapp/phonemediatorcenter/group"/>
-</component>
-</collection>
-<collection name="phoneengine" long-name="Phone Engine" level="engine">
-<component name="phonecntfinder" filter="s60" long-name="Phone Contact Finder">
-<unit bldFile="app/phone/phoneengine/phonecntfinder/group"/>
-</component>
-<component name="audiohandling" filter="s60" long-name="Phone Audio Handling">
-<unit bldFile="app/phone/phoneengine/audiohandling/group"/>
-</component>
-<component name="callhandling" filter="s60" long-name="Call Handling">
-<unit bldFile="app/phone/phoneengine/callhandling/group"/>
-</component>
-<component name="contacthandling" filter="s60" long-name="Phone Contact Handling">
-<unit bldFile="app/phone/phoneengine/contacthandling/group"/>
-</component>
-<component name="loghandling" filter="s60" long-name="Phone Log Handling">
-<unit bldFile="app/phone/phoneengine/loghandling/group"/>
-</component>
-<component name="engineinfo" filter="s60" long-name="Phone Engine Info">
-<unit bldFile="app/phone/phoneengine/engineinfo/group"/>
-</component>
-<component name="phonemodel" filter="s60" long-name="Phone Model">
-<unit bldFile="app/phone/phoneengine/phonemodel/group"/>
-</component>
-<component name="servicehandling" filter="s60" long-name="Phone Service Handling">
-<unit bldFile="app/phone/phoneengine/servicehandling/group"/>
-</component>
-</collection>
-<collection name="phonesettings" long-name="Phone Settings" level="plugin">
-<component name="aiwcallimageplugin" filter="s60" long-name="Call Image AIW Plugin" plugin="Y">
-<unit bldFile="app/phone/phonesettings/aiwcallimageplugin/group"/>
-</component>
-<component name="pslncallimageplugin" filter="s60" long-name="Call Image Personalization Plugin" plugin="Y">
-<unit bldFile="app/phone/phonesettings/pslncallimageplugin/group"/>
-</component>
-</collection>
-<collection name="phoneuis" long-name="Phone UIs" level="ui">
-<component name="dialer" filter="s60" long-name="Dialer">
-<unit bldFile="app/phone/phoneuis/dialer/group" filter="!test"/>
-</component>
-<component name="easydialing" filter="s60" long-name="Easy Dialing Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/phone/phoneuis/easydialing/group"/>
-</component>
-<component name="bubblemanager" filter="s60" long-name="Phone Bubble Manager">
-<unit bldFile="app/phone/phoneuis/bubblemanager/group"/>
-</component>
-<component name="connectutil" filter="s60" long-name="Connection Utility" plugin="Y">
-<unit bldFile="app/phone/phoneuis/connectutil/group"/>
-</component>
-<component name="ussd" filter="s60" long-name="Unstructured Supplementary Services Data">
-<unit bldFile="app/phone/phoneuis/ussd/group"/>
-</component>
-<component name="vmbx" filter="s60" long-name="Voice Mailbox">
-<unit bldFile="app/phone/phoneuis/vmbx/group"/>
-</component>
-<component name="telephonydevicemode" filter="s60" long-name="Telephony Device Mode">
-<unit bldFile="app/phone/phoneuis/telephonydevicemode/group"/>
-</component>
-</collection>
-<collection name="phoneplugins" long-name="Phone Plugins" level="plugin">
-<component name="telbranding" filter="s60" long-name="Tel Branding" introduced="^2" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/telbranding/group"/>
-</component>
-</collection>
-</block>
-<block name="videotelephony" level="apps" long-name="Video Telephony Apps" levels="engine plugin prot ui">
-<collection name="videotelephony_plat" long-name="VT Apps Platform Interfaces" level="ui">
-<component name="video_telephony_control_mediator_api" long-name="Video Telephony Control Mediator API" filter="s60" class="api">
-<unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_control_mediator_api/group"/>
-</component>
-<component name="video_telephony_media_configuration_api" long-name="Video Telephony Media Configuration API" filter="s60" class="api">
-<unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_media_configuration_api/group"/>
-</component>
-</collection>
-<collection name="vtengines" long-name="Video Telephony Engines" level="engine">
-<component name="videoteleng" filter="s60" long-name="Video Telephony Engine">
-<unit bldFile="app/videotelephony/vtengines/videoteleng/Group"/>
-</component>
-<component name="vtmediatorplugin" filter="s60" long-name="VT Mediator Plugin" plugin="Y">
-<unit bldFile="app/videotelephony/vtengines/vtmediatorplugin/group"/>
-</component>
-</collection>
-<collection name="vtuis" long-name="Video Telephony UIs" level="ui">
-<component name="videotelui" filter="s60" long-name="Video Telephony UI">
-<unit bldFile="app/videotelephony/vtuis/videotelui/group"/>
-</component>
-</collection>
-<collection name="vtprotocolplugins" long-name="VT Protocol Plugins" level="plugin">
-<component name="displaysink" filter="s60" long-name="Display Sink" introduced="^2">
-<unit bldFile="app/videotelephony/vtprotocolplugins/DisplaySink/group"/>
-</component>
-<component name="videosource" filter="s60" long-name="Video Source" introduced="^2">
-<unit bldFile="app/videotelephony/vtprotocolplugins/VideoSource/group"/>
-</component>
-</collection>
-<collection name="vtprotocolsstub" long-name="VT Protocols Stub" level="prot">
-<!-- this collection is really a component, move down a directory -->
-<component name="videotelproto" filter="s60" long-name="Video Telephony Protocol">
-<unit bldFile="app/videotelephony/vtprotocolsstub/group" filter="sf_build"/>
-</component>
-</collection>
-</block>
-<block name="iptelephony" level="apps" long-name="IP Telephony" levels="eng plugin util ui">
-<collection name="iptel_plat" long-name="IP Telephony Platform Interfaces" level="ui">
-<component name="richcallsettingsengine_api" long-name="Rich Call Settings Engine API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/richcallsettingsengine_api/group"/>
-</component>
-<component name="cch_client_api" long-name="CCH Client API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/cch_client_api/group"/>
-</component>
-<component name="cch_server_api" long-name="CCH Server API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/cch_server_api/group"/>
-</component>
-<component name="csc_settingsui_api" long-name="CSC Settings UI API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/csc_settingsui_api/group"/>
-</component>
-<component name="vccpropertyhandler_api" long-name="VCC Property Handler API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/vccpropertyhandler_api/group"/>
-</component>
-<component name="vcc_api" long-name="VCC API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/vcc_api/group"/>
-</component>
-</collection>
-<collection name="iptelcommsconfig" long-name="IP Telephony Comms Config" level="ui">
-<component name="cscgsplugin" filter="s60" long-name="CSC GS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/commsconfig/cscgsplugin/group"/>
-</component>
-<component name="cscsipvoipcleanupplugin" filter="s60" long-name="CSC SIP VoIP Cleanup Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/commsconfig/cscsipvoipcleanupplugin/group"/>
-</component>
-<component name="cscengine" filter="s60" long-name="Connection Service Configurator Engine" introduced="^2">
-<unit bldFile="app/iptelephony/commsconfig/cscengine/group"/>
-</component>
-<component name="cscsettingsui" filter="s60" long-name="CSC Settings UI" introduced="^2">
-<unit bldFile="app/iptelephony/commsconfig/cscsettingsui/group"/>
-</component>
-<component name="cscapplicationui" filter="s60" long-name="CSC Application UI" introduced="^2">
-<unit bldFile="app/iptelephony/commsconfig/cscapplicationui/group"/>
-</component>
-<component name="commsconfig_build" filter="s60" long-name="Comms Config Build" introduced="^2">
-<!-- consider distributing this into the above components -->
-<unit bldFile="app/iptelephony/commsconfig/group"/>
-</component>
-</collection>
-<collection name="convergedconnectionhandler" long-name="Converged Connection Handler" level="eng">
-<component name="cchserver" filter="s60" long-name="CCH Server" introduced="^2">
-<unit bldFile="app/iptelephony/convergedconnectionhandler/cchserver/group"/>
-</component>
-<component name="cchclient" filter="s60" long-name="CCH Client" introduced="^2">
-<unit bldFile="app/iptelephony/convergedconnectionhandler/cchclient/group"/>
-</component>
-<component name="cchclientapi" filter="s60" long-name="CCH Client API" introduced="^2">
-<unit bldFile="app/iptelephony/convergedconnectionhandler/cchclientapi/group"/>
-</component>
-<component name="convergedconnectionhandler_build" filter="s60" long-name="CCH Build" introduced="^2">
-<!-- consider distributing this into the above components, or collapse the collection into a single component.
- The latter is a better option since clients and sevrers are rarely separate components -->
-<unit bldFile="app/iptelephony/convergedconnectionhandler/group"/>
-</component>
-</collection>
-<collection name="richcallsettingsengine" long-name="Rich Call Settings Engine" level="eng">
-<component name="rcse2" filter="s60" long-name="Rich Call Settings Engine Build" introduced="^2">
-<unit bldFile="app/iptelephony/richcallsettingsengine/rcse2/group"/>
-</component>
-</collection>
-<collection name="sipvoipprovider" long-name="SIP VoIP Provider" level="plugin">
-<!-- collection is really a component. Should move down a directory -->
-<component name="svp" filter="s60" long-name="SIP VoIP Provider Build" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/sipvoipprovider/group"/>
-</component>
-</collection>
-<collection name="voipplugins" long-name="VoIP Plugins" level="plugin">
-<component name="sipmxresolver" filter="s60" long-name="SIP MX Resolver" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/sipmxresolver/group"/>
-</component>
-<component name="sipconnectionprovider" filter="s60" long-name="SIP Connection Provider" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/sipconnectionprovider/group"/>
-<!-- can only have one unit, can the next be #'included from the above? -->
-<unit bldFile="app/iptelephony/voipplugins/sipconnectionprovider/ipvoicemailengine/group"/>
-</component>
-<component name="ipapputils" filter="s60" long-name="IP App Utils" introduced="^2">
-<unit bldFile="app/iptelephony/voipplugins/ipapputils/group"/>
-</component>
-<component name="voipadapters" filter="s60" long-name="VoIP Adapters" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/voipadapters/group"/>
-</component>
-<component name="accountcreationplugin" filter="s60" long-name="Account Creation Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/accountcreationplugin/group"/>
-</component>
-<component name="dhcppositionprovider" filter="s60" long-name="DHCP Position Provider" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/dhcppositionprovider/group"/>
-</component>
-<component name="svtmatching" filter="s60" long-name="SIP VoIP Telephony Matching" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/svtmatching/group"/>
-</component>
-<component name="svtlogging" filter="s60" long-name="SVT Logging" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/svtlogging/group"/>
-</component>
-<component name="svtcallmenu" filter="s60" long-name="SVT Call Menu" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/svtcallmenu/group"/>
-</component>
-<component name="sipimresolver" filter="s60" long-name="SIP IM Resolver" introduced="^3" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/sipimresolver/group"/>
-</component>
-</collection>
-<collection name="callcontinuity" long-name="Call Continuity" level="util">
-<component name="vccutils" filter="s60" long-name="VCC Utils" introduced="^2">
-<unit bldFile="app/iptelephony/callcontinuity/vccutils/group"/>
-</component>
-<component name="nsmldmvccadapter" filter="s60" long-name="SyncML DM VCC Adapter" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/callcontinuity/nsmldmvccadapter/group"/>
-</component>
-<component name="vccclientprovisioningadapter" filter="s60" long-name="VCC Client Provisioning Adapter" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/callcontinuity/vccclientprovisioningadapter/group"/>
-</component>
-<component name="vccpropertyhandler" filter="s60" long-name="VCC Property Handler" introduced="^2">
-<unit bldFile="app/iptelephony/callcontinuity/vccpropertyhandler/group"/>
-</component>
-<component name="vcchotrigger" filter="s60" long-name="VCC HO Trigger" introduced="^2">
-<unit bldFile="app/iptelephony/callcontinuity/vcchotrigger/group"/>
-</component>
-<component name="vcc" filter="s60" long-name="VoIP Call Continuity" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/callcontinuity/vcc/group"/>
-</component>
-<component name="callcontinuity_build" filter="s60" long-name="Call Continuity Build" introduced="^2">
-<!-- consider distributing this into the above components -->
-<unit bldFile="app/iptelephony/callcontinuity/group"/>
-</component>
-</collection>
-</block>
-<block name="settingsuis" level="services" long-name="Settings UIs" levels="rsc ui">
-<collection name="devmngt_plat" long-name="Settings UIs Platform Interfaces" level="ui">
-<component name="default_app_client_api" long-name="Default App Client API" introduced="^1" filter="s60" class="api">
-<unit bldFile="app/settingsuis/devmngt_plat/default_app_client_api/group"/>
-</component>
-<component name="services_db_api" long-name="Services DB API" introduced="^1" filter="s60" class="api">
-<unit bldFile="app/settingsuis/devmngt_plat/services_db_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="defaultapplicationsettings" long-name="Default Application Settings" level="rsc">
-<component name="services_db" filter="s60" long-name="Services Database" introduced="^1">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/services_db/group"/>
-</component>
-<component name="defaultapplicationsettings_server" filter="s60" long-name="Default Application Server" introduced="^1">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/server/group"/>
-</component>
-<component name="service" filter="s60" long-name="Default Application Service" introduced="^1">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/service/group"/>
-</component>
-<component name="dasgsplugin" filter="s60" long-name="Default Application Settings GS Plugin" introduced="^1" plugin="Y">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/gsplugin/group"/>
-</component>
-<component name="defaultapplicationsettings_build" filter="s60" long-name="Default Application Settings Build" introduced="^1">
-<!-- split the IBYs up into the appropriate components? Make this a ROM component? -->
-<unit bldFile="app/settingsuis/defaultapplicationsettings/group"/>
-</component>
-</collection>
-<collection name="systemswuis" long-name="System SW UIs" level="ui">
-<component name="touchscreencalib" filter="s60" long-name="Touchscreen Calibration" introduced="^1">
-<unit bldFile="app/settingsuis/systemswuis/touchscreencalib/group"/>
-</component>
-</collection>
-</block>
-<block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin app">
-<collection name="contentctrl_plat" long-name="Content Control Daemons Platforn Interfaces" level="app">
-<component name="oma_ds_presync_plugin_api" long-name="OMA DS PreSync Plugin API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/oma_ds_presync_plugin_api/group"/>
-</component>
-<component name="ds_agenda_handler_plugin_api" long-name="DS Agenda Handler Plugin API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_agenda_handler_plugin_api/group"/>
-</component>
-<component name="ds_folder_util_api" long-name="DS Folder Util API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_folder_util_api/group"/>
-</component>
-</collection>
-<collection name="dsdcmoadapter" long-name="Data Sync DCMO Adapter" level="plugin">
-<!-- Component at wrong rank, should move down a directory -->
-<component name="dsdcmoadapter_build" filter="s60" long-name="Data Sync Control DCMO Adapter">
-<unit bldFile="app/contentcontrol/dsdcmoadapter/group"/>
-</component>
-</collection>
-<collection name="omads" long-name="OMA Data Sync" level="app">
-<component name="omadsappui" filter="s60" long-name="OMA DS Application UI">
-<unit bldFile="app/contentcontrol/omads/omadsappui/group"/>
-</component>
-<component name="omadsextensions" filter="s60" long-name="OMA DS Extensions" plugin="Y">
-<unit bldFile="app/contentcontrol/omads/omadsextensions/group"/>
-</component>
-</collection>
-</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">
-<unit bldFile="app/devicecontrol/devicediagnostics/devdiagapp/group"/>
-</component>
-<component name="devdiaggsplugin" filter="s60" long-name="Device Diagnostics GS Plugin" plugin="Y">
-<unit bldFile="app/devicecontrol/devicediagnostics/devdiaggsplugin/group"/>
-</component>
-<component name="diagplugins" filter="s60" long-name="Diagnostics Plugins" plugin="Y">
-<unit bldFile="app/devicecontrol/devicediagnostics/diagplugins/group"/>
-</component>
-<component name="diagsuites" filter="s60" long-name="Diagnostics Suites" plugin="Y">
-<unit bldFile="app/devicecontrol/devicediagnostics/diagsuites/group"/>
-</component>
-<component name="devicediagnostics_build" filter="s60" long-name="Device Diagnostics Build">
-<!-- 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">
-<unit bldFile="app/devicecontrol/omadm/omadmappui/group"/>
-</component>
-<component name="omadmextensions" filter="s60" long-name="OMA DM Extensions" 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">
-<unit bldFile="app/devicecontrol/omadm/dcmo/group"/>
-</component>
-</collection>
-<collection name="pnpmobileservices" long-name="PnP Mobile Services" level="mid">
-<component name="pnpms" filter="s60" long-name="PnP MS">
-<unit bldFile="app/devicecontrol/pnpmobileservices/pnpms/group"/>
-</component>
-</collection>
-<collection name="applicationmanagement" long-name="Application Management" level="app">
-<!-- could this collection be collapsed into a single component and moved down a dir? Do all these need to be noted separately? -->
-<component name="applicationmanagement_options" filter="s60" long-name="AM Install Options">
-<unit bldFile="app/devicecontrol/applicationmanagement/options/group"/>
-</component>
-<component name="applicationmanagement_client" filter="s60" long-name="AM Client">
-<unit bldFile="app/devicecontrol/applicationmanagement/client/group"/>
-</component>
-<component name="applicationmanagement_server" filter="s60" long-name="AM Server">
-<unit bldFile="app/devicecontrol/applicationmanagement/server/group"/>
-</component>
-<component name="rfsplugin" filter="s60" long-name="AM RFS Plugin" plugin="Y">
-<unit bldFile="app/devicecontrol/applicationmanagement/rfsplugin/group"/>
-</component>
-<component name="amadapter2" filter="s60" long-name="AM Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/applicationmanagement/amadapter2/group"/>
-</component>
-<component name="omascomoadapter" filter="s60" long-name="OMA SCOMO Adapter" introduced="^3" plugin="Y">
-<unit bldFile="app/devicecontrol/applicationmanagement/omascomoadapter/group"/>
-</component>
-<component name="applicationmanagement_build" filter="s60" long-name="AM Build">
-<!-- If thes aren't collapsed into one cmp, can all #includes removed from here, and it renamed AM ROM? -->
-<unit bldFile="app/devicecontrol/applicationmanagement/group"/>
-</component>
-</collection>
-<collection name="customization" long-name="DM Customization Adapters" level="mid">
-<component name="dmutils" long-name="DM Utils" filter="s60">
-<unit bldFile="app/devicecontrol/customization/dmutils/bld"/>
-</component>
-<component name="uisettingssrv" filter="s60" long-name="UI Settings Server">
-<unit bldFile="app/devicecontrol/customization/uisettingssrv/bld"/>
-</component>
-<component name="isadapter" filter="s60" long-name="Idle State Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/isadapter/bld"/>
-</component>
-<component name="supadapter" filter="s60" long-name="Startup Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/supadapter/bld"/>
-</component>
-<component name="wallpaperadapter" filter="s60" long-name="Wallpaper Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/wallpaperadapter/bld"/>
-</component>
-<component name="operatorlogoadapter" filter="s60" long-name="Operator Logo Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/operatorlogoadapter/bld"/>
-</component>
-<component name="screensaveradapter" filter="s60" long-name="Screen Saver Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/screensaveradapter/bld"/>
-</component>
-<component name="themesadapter" filter="s60" long-name="Themes Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/themesadapter/bld"/>
-</component>
-<component name="embeddedlinkadapter" filter="s60" long-name="Embedded Link Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/embeddedlinkadapter/bld"/>
-</component>
-<component name="customization_build" filter="s60" long-name="DM Customization Build">
-<!-- If thes aren't collapsed into one cmp, can all #includes removed from here, and it renamed DM Customization ROM? -->
-<unit bldFile="app/devicecontrol/customization/group"/>
-</component>
-</collection>
-<collection name="omacp" long-name="OMA Content Provisioning" level="oma">
-<component name="omacpadapters" filter="s60" long-name="OMA CP Adapters" plugin="Y">
-<unit bldFile="app/devicecontrol/omacp/omacpadapters/group"/>
-</component>
-</collection>
-</block>
-<block name="printing" level="services" long-name="Printing" levels="app">
-<collection name="DirectPrint" level="app">
-<component name="DirectPrintApp" filter="sf_build" long-name="DirectPrint App" introduced="^3">
-<unit bldFile="app/printing/DirectPrint/DirectPrintApp/group"/>
-</component>
-<component name="DirectPrintServer" filter="sf_build" long-name="DirectPrint Server" introduced="^3">
-<unit bldFile="app/printing/DirectPrint/DirectPrintServer/group"/>
-</component>
-<component name="DirectPrintClient" filter="sf_build" long-name="DirectPrint Client" introduced="^3">
-<unit bldFile="app/printing/DirectPrint/DirectPrintClient/group"/>
-</component>
-</collection>
-<collection name="imageprint" long-name="ImagePrint" level="app">
-<component name="clog" filter="s60" long-name="ImagePrint Logging" introduced="^2">
-<unit bldFile="app/printing/imageprint/clog/group"/>
-</component>
-<component name="imageprintengine" filter="s60" long-name="ImagePrint Engine" introduced="^2">
-<unit bldFile="app/printing/imageprint/imageprintengine/group"/>
-</component>
-<component name="imageprintui" filter="s60" long-name="ImagePrint UI" introduced="^2">
-<unit bldFile="app/printing/imageprint/imageprintui/group"/>
-</component>
-<component name="imageprint_build" filter="s60" long-name="ImagePrint Build" introduced="^2">
-<!-- Need to break the IBY includes into the other components, or remove #includes and make this a ROM component -->
-<unit bldFile="app/printing/imageprint/group"/>
-</component>
-</collection>
-</block>
-<block name="files" level="apps" long-name="File Manager Apps" levels="support apps">
-<collection name="files_plat" long-name="File Manager Apps Platform Interfaces" level="apps">
-<component name="memory_scan_popup_ui_api" long-name="Memory Scan Popup UI API" filter="s60" class="api">
-<unit bldFile="app/files/files_plat/memory_scan_popup_ui_api/group"/>
-</component>
-</collection>
-<collection name="deviceencryption" long-name="Device Encryption" level="support">
-<!-- this is either needs to be broken up into idependent bld.infs, or it's really a component and should move down a directory -->
-<component name="devencnotifplugin" filter="s60" long-name="Device Encryption Notifier Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/files/deviceencryption/devencnotifplugin/group"/>
-</component>
-<component name="devencui" filter="s60" long-name="Device Encryption UI" introduced="^3">
-<unit bldFile="app/files/deviceencryption/devencui/group"/>
-</component>
-<component name="devencdmadapter" filter="s60" long-name="Device Encryption DM Adapter" introduced="^3" plugin="Y">
-<unit bldFile="app/files/deviceencryption/devencdmadapter/group"/>
-</component>
-<component name="devencgsplugin" filter="s60" long-name="Device Encryption GS Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/files/deviceencryption/devencgsplugin/group"/>
-</component>
-<component name="deviceencryption_help" filter="s60" long-name="Device Encryption Help" introduced="^3">
-<unit bldFile="app/files/deviceencryption/help/group"/>
-</component>
-<component name="deviceencryption_build" filter="s60" long-name="Device Encryption Build" introduced="^3">
-<unit bldFile="app/files/deviceencryption/group"/>
-</component>
-</collection>
-<collection name="filemanager" long-name="File Manager" level="apps">
-<!-- this is really a component, should move down a directory -->
-<component name="filemanager_build" filter="s60" long-name="File Manager Build">
-<unit bldFile="app/files/filemanager/group"/>
-</component>
-</collection>
-<collection name="filesystemuis" long-name="File System UIs" level="support">
-<component name="memscaneng" filter="s60" long-name="Memory Scan Server">
-<unit bldFile="app/files/filesystemuis/memscaneng/group"/>
-</component>
-<component name="memstatepopup" filter="s60" long-name="Memory State Popup">
-<unit bldFile="app/files/filesystemuis/memstatepopup/group"/>
-</component>
-</collection>
-</block>
-<block name="utils" level="apps" long-name="Utility Apps" levels="app">
-<collection name="extras" long-name="Extras" level="app">
-<component name="about" filter="s60" long-name="About Application">
-<unit bldFile="app/utils/extras/about/group"/>
-</component>
-<component name="calcsoft" filter="s60" long-name="Calculator Application">
-<unit bldFile="app/utils/extras/calcsoft/group"/>
-</component>
-<component name="converter" filter="s60" long-name="Unit Converter">
-<unit bldFile="app/utils/extras/converter/group"/>
-</component>
-</collection>
-</block>
-<block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
-<collection name="contacts_pub" long-name="Contacts Apps Public Interfaces" level="ui">
-<component name="phonebook_fetch_ui_api" long-name="Phonebook Fetch UI API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_fetch_ui_api/group"/>
-</component>
-<component name="phonebook_data_management_api" long-name="Phonebook Data Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_data_management_api/group"/>
-</component>
-<component name="phonebook_vcard_importexport_api" long-name="Phonebook vCard Import/Export API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_vcard_importexport_api/group"/>
-</component>
-<component name="phonebook_data_addedit_ui_api" long-name="Phonebook Data Add/Edit UI API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_data_addedit_ui_api/group"/>
-</component>
-<component name="phonebook_ui_utilities_api" long-name="Phonebook UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_ui_utilities_api/group"/>
-</component>
-<component name="phonebook_thumbnail_operation_api" long-name="Phonebook Thumbnail Operation API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_thumbnail_operation_api/group"/>
-</component>
-<component name="speed_dial_utility_control_api" long-name="Speed Dial Utility Control API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/speed_dial_utility_control_api/group"/>
-</component>
-</collection>
-<collection name="contacts_plat" long-name="Contacts Apps Platform Interfaces" level="ui">
-<component name="virtual_phonebook_store_api" long-name="Virtual Phonebook Store API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_store_api/group"/>
-</component>
-<component name="virtual_phonebook_sim_services_api" long-name="Virtual Phonebook SIM Services API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_sim_services_api/group"/>
-</component>
-<component name="virtual_phonebook_configuration_api" long-name="Virtual Phonebook Configuration API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_configuration_api/group"/>
-</component>
-<component name="virtual_phonebook_copy_policy_api" long-name="Virtual Phonebook Copy Policy API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_copy_policy_api/group"/>
-</component>
-<component name="virtual_phonebook_policy_api" long-name="Virtual Phonebook Policy API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_policy_api/group"/>
-</component>
-<component name="virtual_phonebook_engine_api" long-name="Virtual Phonebook Engine API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_engine_api/group"/>
-</component>
-<component name="virtual_phonebook_migration_support_api" long-name="Virtual Phonebook Migration Support API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_migration_support_api/group"/>
-</component>
-<component name="virtual_phonebook_view_definition_api" long-name="Virtual Phonebook View Definition API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_view_definition_api/group"/>
-</component>
-<component name="virtual_phonebook_vcard_api" long-name="Virtual Phonebook vCard API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_vcard_api/group"/>
-</component>
-<component name="cms_contactor_api" long-name="CMS Contactor API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/cms_contactor_api/group"/>
-</component>
-<component name="contactpresence_api" long-name="Contact Presence API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/contactpresence_api/group"/>
-</component>
-<component name="presence_cache_api" long-name="Presence Cache API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/presence_cache_api/group"/>
-</component>
-<component name="phonebook_internal_common_api" long-name="Phonebook Internal Common API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_common_api/group"/>
-</component>
-<component name="phonebook_internal_appfw_api" long-name="Phonebook Internal App Framework API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_appfw_api/group"/>
-</component>
-<component name="phonebook_internal_data_management_api" long-name="Phonebook Internal Data Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_data_management_api/group"/>
-</component>
-<component name="phonebook_2_xsp_extension_manager_api" long-name="Phonebook 2 xSP Extension Manager API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_xsp_extension_manager_api/group"/>
-</component>
-<component name="phonebook_ui_controls_api" long-name="Phonebook UI Controls API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_ui_controls_api/group"/>
-</component>
-<component name="phonebook_2_image_management_api" long-name="Phonebook 2 Image Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_image_management_api/group"/>
-</component>
-<component name="phonebook_extension_api" long-name="Phonebook Extension API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_extension_api/group"/>
-</component>
-<component name="phonebook_public_constants_api" long-name="Phonebook Public Constants API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_public_constants_api/group"/>
-</component>
-<component name="phonebook_internal_ui_utilities_api" long-name="Phonebook Internal UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_ui_utilities_api/group"/>
-</component>
-<component name="logs_engine_api_extensions" long-name="Logs Engine API Extensions" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/logs_engine_api_extensions/group"/>
-</component>
-<component name="phonebook_thumbnails_api" long-name="Phonebook Thumbnails API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_thumbnails_api/group"/>
-</component>
-<component name="phonebook_2_icon_api" long-name="Phonebook 2 Icon API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_icon_api/group"/>
-</component>
-<component name="phonebook_engine_extension_api" long-name="Phonebook Engine Extension API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_engine_extension_api/group"/>
-</component>
-<component name="phonebook_2_store_configuration_management_api" long-name="Phonebook 2 Store Configuration Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_store_configuration_management_api/group"/>
-</component>
-<component name="logs_ui_command_line_api" long-name="Logs UI Command Line API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/logs_ui_command_line_api/group"/>
-</component>
-<component name="speed_dial_dialogs_api" long-name="Speed Dial Dialogs API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/speed_dial_dialogs_api/group"/>
-</component>
-<component name="phonebook_2_xsp_view_activation_api" long-name="Phonebook 2 xSP View Activation API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_xsp_view_activation_api/group"/>
-</component>
-<component name="logs_timers_api" long-name="Logs Timers API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/logs_timers_api/group"/>
-</component>
-<component name="phonebook_2_ui_extension_definition_api" long-name="Phonebook 2 UI Extension Definition API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_definition_api/group"/>
-</component>
-<component name="phonebook_2_common_ui_api" long-name="Phonebook 2 Common UI API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_common_ui_api/group"/>
-</component>
-<component name="phonebook_2_ui_extension_api" long-name="Phonebook 2 UI Extension API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_api/group"/>
-</component>
-<component name="phonebook_2_store_property_api" long-name="Phonebook 2 Store Property API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_store_property_api/group"/>
-</component>
-<component name="phonebook_2_ui_extension_plugin_api" long-name="Phonebook 2 UI Extension Plug-In API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_plugin_api/group"/>
-</component>
-<component name="phonebook_2_ui_controls_api" long-name="Phonebook 2 UI Controls API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_controls_api/group"/>
-</component>
-<component name="phonebook_2_thin_ui_extension_plugin_api" long-name="Phonebook 2 Thin UI Extension Plugin API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_thin_ui_extension_plugin_api/group"/>
-</component>
-<component name="phonebook_2_commands_api" long-name="Phonebook 2 Commands API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_commands_api/group"/>
-</component>
-<component name="phonebook_2_presentation_api" long-name="Phonebook 2 Presentation API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_presentation_api/group"/>
-</component>
-<component name="phonebook_2_ui_utilities_api" long-name="Phonebook 2 UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_utilities_api/group"/>
-</component>
-<component name="cca_launch_api" long-name="CCA Launch API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/cca_launch_api/group"/>
-</component>
-<component name="cca_view_plugin_api" long-name="CCA View Plugin API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/cca_view_plugin_api/group"/>
-</component>
-<component name="predictivesearch_client_api" long-name="Predictive Search Client API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_client_api/group"/>
-</component>
-<component name="predictivesearch_utils_api" long-name="Predictive Search Utils API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_utils_api/group"/>
-</component>
-<component name="predictivesearch_adapters_api" long-name="Predictive Search Adapters API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_adapters_api/group"/>
-</component>
-<component name="predictivesearch_algorithm_api" long-name="Predictive Search Algorithm API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_algorithm_api/group"/>
-</component>
-<component name="phonebook_2_rcl_api" long-name="Phonebook 2 RCL API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_rcl_api/group"/>
-</component>
-</collection>
-<collection name="contactextensions" long-name="Contacts Extensions" level="services">
-<component name="predefinedcontacts" filter="s60" long-name="Predefined Contacts">
-<unit bldFile="app/contacts/contactextensions/predefinedcontacts/group"/>
-</component>
-</collection>
-<collection name="logsui" long-name="Logs UI" level="ui">
-<component name="logsui_build" filter="s60" long-name="Logs UI Build">
-<!-- component at too high a rank, should move down one directory -->
-<unit bldFile="app/contacts/logsui/group"/>
-</component>
-</collection>
-<collection name="phonebookui" long-name="Phonebook UI" level="ui">
-<component name="phonebook" filter="s60" long-name="Phonebook">
-<unit bldFile="app/contacts/phonebookui/phonebook/group"/>
-</component>
-<component name="speeddial" filter="s60" long-name="Speed Dial">
-<unit bldFile="app/contacts/phonebookui/speeddial/group"/>
-</component>
-<component name="phonebook2" filter="s60" long-name="Phone Book 2">
-<unit bldFile="app/contacts/phonebookui/phonebook2/group"/>
-</component>
-</collection>
-<collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
-<component name="cntfindplugin" filter="s60" long-name="Contacts Find Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntfindplugin/group"/>
-</component>
-<component name="cntsortplugin" filter="s60" long-name="Contacts Sort Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntsortplugin/group"/>
-</component>
-<component name="virtualphonebook" filter="s60" long-name="Virtual Phonebook" introduced="^2">
-<unit bldFile="app/contacts/phonebookengines/virtualphonebook/group"/>
-</component>
-<component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
-<unit bldFile="app/contacts/phonebookengines/contactsmodel/groupsql" mrp="app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
-</component>
-</collection>
-<collection name="pimprotocols" long-name="PIM Protocols" level="services">
-<component name="phonebooksync" long-name="Phonebook Sync" purpose="optional" plugin="Y">
-<unit bldFile="app/contacts/pimprotocols/phonebooksync/group" mrp="app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
-</component>
-<component name="pbap" long-name="Bluetooth PBAP" introduced="9.2" purpose="optional">
-<unit bldFile="app/contacts/pimprotocols/pbap/group" mrp="app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
-</component>
-</collection>
-<collection name="ccservices" long-name="Contacts Centric Services" level="services">
-<component name="cmsservices" filter="s60" long-name="Contact Method Selector Services" introduced="^2">
-<unit bldFile="app/contacts/ccservices/cmsservices/group"/>
-</component>
-</collection>
-<collection name="presencecache" long-name="Presence Cache" level="support">
-<component name="presencecacheutils" filter="s60" long-name="Presence Cache Utils" introduced="^2" class="placeholder">
-<!-- <unit bldFile="presencecache/presencecacheutils/group"/> -->
-</component>
-<component name="presencecacheserver2" filter="s60" long-name="Presence Cache Server" introduced="^2" class="placeholder">
-<!-- <unit bldFile="presencecache/presencecacheserver2/group"/> -->
-</component>
-<component name="presencecacheclient2" filter="s60" long-name="Presence Cache Client" introduced="^2" class="placeholder">
-<!-- <unit bldFile="presencecache/presencecacheclient2/group"/> -->
-</component>
-<component name="presencecache_build" filter="s60" long-name="Presence Cache Build" introduced="^2">
-<!-- should divide this bld.inf into the other components, or collapse them into a single component -->
-<unit bldFile="app/contacts/presencecache/group"/>
-</component>
-</collection>
-<collection name="predictivesearch" long-name="Predictive Search" level="support">
-<component name="pcsutils" filter="s60" long-name="PCS Utils" introduced="^2">
-<unit bldFile="app/contacts/predictivesearch/pcsutils/group"/>
-</component>
-<component name="pcsserverclientapi" filter="s60" long-name="PCS Server Client API" introduced="^2">
-<unit bldFile="app/contacts/predictivesearch/pcsserverclientapi/group"/>
-</component>
-<component name="pcsserver" filter="s60" long-name="PCS Server" introduced="^2">
-<unit bldFile="app/contacts/predictivesearch/pcsserver/group"/>
-</component>
-<component name="pcsadapters" filter="s60" long-name="PCS Adapters" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/predictivesearch/adapters/contacts/group"/>
-</component>
-<component name="pcsalgorithm" filter="s60" long-name="PCS Algorithm" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/predictivesearch/pcsalgorithm/group"/>
-</component>
-<component name="predictivesearch_build" filter="s60" long-name="Predictive Search Build" introduced="^2">
-<!-- need to remove #includes from bld.inf and rename as Predictive Search ROM -->
-<unit bldFile="app/contacts/predictivesearch/group"/>
-</component>
-</collection>
-<collection name="contacts_info" long-name="Contacts Apps Info" level="ui">
-<component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="organizer" level="apps" span="2" long-name="Organizer Application Suite" levels="support services engine ui app">
-<collection name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" level="app">
-<component name="meeting_request_mailbox_utilities_api" long-name="Meeting Request Mailbox Utilities API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_mailbox_utilities_api/group"/>
-</component>
-<component name="meeting_request_uids_api" long-name="Meeting Request UIDs API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_uids_api/group"/>
-</component>
-<component name="calendar_exporter_api" long-name="Calendar Exporter API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_exporter_api/group"/>
-</component>
-<component name="agenda_versit_2_api" long-name="Agenda Versit 2 API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/agenda_versit_2_api/group"/>
-</component>
-<component name="calendar_importer_api" long-name="Calendar Importer API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_importer_api/group"/>
-</component>
-<component name="calendar_launcher_api" long-name="Calendar Launcher API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_launcher_api/group"/>
-</component>
-<component name="calendar_common_utils_api" long-name="Calendar Common Utils API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_common_utils_api/group"/>
-</component>
-<component name="searchfw_launcher_api" long-name="Search Framework Launcher API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/searchfw_launcher_api/group"/>
-</component>
-<component name="alarm_const_api" long-name="Alarm Const API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/alarm_const_api/group"/>
-</component>
-<component name="alarm_ui_external_control_api" long-name="Alarm UI External Control API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/alarm_ui_external_control_api/group"/>
-</component>
-<component name="calendar_settings_keys_api" long-name="Calendar Settings Keys API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_settings_keys_api/group"/>
-</component>
-<component name="calendar_tones_settings_keys_api" long-name="Calendar Tones Settings Keys API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_tones_settings_keys_api/group"/>
-</component>
-<component name="clock_settings_api" long-name="Clock Settings API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/clock_settings_api/group"/>
-</component>
-<component name="common_alarm_editor_api" long-name="Common Alarm Editor API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/common_alarm_editor_api/group"/>
-</component>
-<component name="alarm_ui_secondary_display_api" long-name="Alarm UI Secondary Display API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/alarm_ui_secondary_display_api/group"/>
-</component>
-<component name="searchui_launcher_api" long-name="Search UI Launcher API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/searchui_launcher_api/group"/>
-</component>
-<component name="agenda_entry_ui_api" long-name="Agenda Entry UI API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/agenda_entry_ui_api/group"/>
-</component>
-<component name="meeting_request_utillities_api" long-name="Meeting Request Utillities API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_utillities_api/group"/>
-</component>
-<component name="meeting_request_viewer_api" long-name="Meeting Request Viewer API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_viewer_api/group"/>
-</component>
-<component name="calendar_custamization_api" long-name="Calendar Customization API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_custamization_api/group"/>
-</component>
-</collection>
-<collection name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" level="app">
-<component name="calendar_interim_utils2_api" long-name="Calendar Interim Utils 2 API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_pub/calendar_interim_utils2_api/group"/>
-</component>
-<component name="notepad_library_api" long-name="Notepad Library API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_pub/notepad_library_api/group"/>
-</component>
-</collection>
-<collection name="alarmengines" long-name="Alarm Engines" level="engine">
-<component name="missedalarmstore" filter="s60" long-name="Missed Alarm Store">
-<unit bldFile="app/organizer/alarmengines/missedalarmstore/group"/>
-</component>
-</collection>
-<collection name="calendarengines" long-name="Calendar Engines" level="engine">
-<component name="versit2" filter="s60" long-name="Versit 2 iCal Parser" introduced="9.2">
-<unit bldFile="app/organizer/calendarengines/versit2/group"/>
-</component>
-<component name="agnversit2" filter="s60" long-name="Versit 2 Agenda Interface" introduced="9.2" plugin="Y">
-<unit bldFile="app/organizer/calendarengines/agnversit2/group"/>
-</component>
-<component name="caleninterimutils" filter="s60" long-name="Calendar Interim Utils" introduced="9.1">
-<unit bldFile="app/organizer/calendarengines/caleninterimutils/group"/>
-</component>
-<component name="calenimp" filter="s60" long-name="Calendar Import Wrapper" introduced="7.0s">
-<unit bldFile="app/organizer/calendarengines/calenimp/group"/>
-</component>
-<component name="calenlauncher" filter="s60" long-name="Calendar Launcher">
-<unit bldFile="app/organizer/calendarengines/calenlauncher/group"/>
-</component>
-<component name="caldavsrv" filter="sf_build" long-name="CalDAV Server" introduced="^3">
-<unit bldFile="app/organizer/calendarengines/caldav/group"/>
-</component>
-</collection>
-<collection name="meetingrequestengines" long-name="Meeting Request Engines" level="engine">
-<component name="mrmailbox" filter="s60" long-name="Meeting Request Mailbox">
-<unit bldFile="app/organizer/meetingrequestengines/mrmailbox/group"/>
-</component>
-<component name="mrmailboxutils" filter="s60" long-name="Meeting Request Mailbox Utils" plugin="Y">
-<unit bldFile="app/organizer/meetingrequestengines/mrmailboxutils/group"/>
-</component>
-</collection>
-<collection name="searchfw" long-name="Search Framework" level="services">
-<!-- Uncomment all units when configuration is in place. All currently #included from searchfw_build, which should be removed at the same time. -->
-<component name="coresearchfw" filter="s60" long-name="Core Search Framework" introduced="^1" class="placeholder">
-<!--<unit bldFile="searchfw/coresearchfw/group"/>-->
-</component>
-<component name="searchfw_plugins" filter="s60" long-name="Search Plugins" introduced="^1" plugin="Y" class="placeholder">
-<!--<unit bldFile="searchfw/plugins/group"/>-->
-</component>
-<component name="searchfw_build" filter="s60" long-name="Search Framework Build" introduced="^1">
-<unit bldFile="app/organizer/searchfw/group"/>
-</component>
-</collection>
-<collection name="alarmui" long-name="Alarm UI" level="app">
-<!-- collection is really a component, should move down a directory -->
-<component name="alarmui_build" filter="s60" long-name="Alarm UI Build">
-<unit bldFile="app/organizer/alarmui/group"/>
-</component>
-</collection>
-<collection name="calendarui" long-name="Calendar UI" level="ui">
-<component name="calendarui_help" filter="s60" long-name="Calendar UI Help">
-<unit bldFile="app/organizer/calendarui/help/group"/>
-</component>
-<component name="commonutils" filter="s60" long-name="Calendar Common Utils">
-<unit bldFile="app/organizer/calendarui/commonutils/group"/>
-</component>
-<component name="globaldata" filter="s60" long-name="Calendar Global Data">
-<unit bldFile="app/organizer/calendarui/globaldata/group"/>
-</component>
-<component name="settings" filter="s60" long-name="Calendar Settings">
-<!-- these should be merged into a single bld.inf or split into two components -->
-<unit bldFile="app/organizer/calendarui/settings/gsplugin/group"/>
-<unit bldFile="app/organizer/calendarui/settings/settingsui/group"/>
-</component>
-<component name="customisation" filter="s60" long-name="Calendar Customisation">
-<unit bldFile="app/organizer/calendarui/customisation/group"/>
-</component>
-<component name="customisationmanager" filter="s60" long-name="Calendar Customisation Manager">
-<unit bldFile="app/organizer/calendarui/customisationmanager/group"/>
-</component>
-<component name="multicaluidialog" filter="s60" long-name="Multi-Calendar UI Dialog" introduced="^3">
-<unit bldFile="app/organizer/calendarui/multicaluidialog/group"/>
-</component>
-<component name="views" filter="s60" long-name="Calendar Views">
-<unit bldFile="app/organizer/calendarui/views/group"/>
-</component>
-<component name="calendarui_controller" filter="s60" long-name="Calendar Controller">
-<unit bldFile="app/organizer/calendarui/controller/group"/>
-</component>
-<component name="calendarui_editors" filter="s60" long-name="Calendar Editors">
-<unit bldFile="app/organizer/calendarui/editors/group"/>
-</component>
-<component name="calendarui_application" filter="s60" long-name="Calendar Application">
-<unit bldFile="app/organizer/calendarui/application/group"/>
-</component>
-<component name="missedalarmindicatorplugin" filter="s60" long-name="Missed Alarm Indicator Plugin" plugin="Y">
-<unit bldFile="app/organizer/calendarui/missedalarmindicatorplugin/group"/>
-</component>
-<component name="calendarui_server" filter="s60" long-name="Calendar Server">
-<!-- these should be merged into a single bld.inf or split into two components -->
-<unit bldFile="app/organizer/calendarui/server/calensvr/group"/>
-<unit bldFile="app/organizer/calendarui/server/calensvrclient/group"/>
-</component>
-<component name="regionalplugins" filter="s60" long-name="Calendar Regional Plugins" plugin="Y">
-<!-- these should be merged into a single bld.inf or split into four components -->
-<unit bldFile="app/organizer/calendarui/regionalplugins/calenregionalutil/group"/>
-<unit bldFile="app/organizer/calendarui/regionalplugins/lunarchinese/group"/>
-<unit bldFile="app/organizer/calendarui/regionalplugins/lunarvietnamese/group"/>
-<unit bldFile="app/organizer/calendarui/regionalplugins/thai/group"/>
-</component>
-<component name="calenaiwprovider" filter="s60" long-name="Calendar AIW Proivder" introduced="^3" plugin="Y">
-<unit bldFile="app/organizer/calendarui/calenaiwprovider/group"/>
-</component>
-<component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y">
-<unit bldFile="app/organizer/calendarui/caldav/group"/>
-</component>
-<component name="calendarui_build" filter="s60" long-name="Calendar UI Build">
-<!-- split contents into separate components -->
-<unit bldFile="app/organizer/calendarui/group"/>
-</component>
-</collection>
-<collection name="meetingui" long-name="Meeting UI" level="ui">
-<component name="attendeeview" filter="s60" long-name="Attendee View">
-<unit bldFile="app/organizer/meetingui/attendeeview/group"/>
-</component>
-<component name="agnentryui" filter="s60" long-name="Agenda Entry UI" plugin="Y">
-<unit bldFile="app/organizer/meetingui/agnentryui/group"/>
-</component>
-<component name="meetingrequestutils" filter="s60" long-name="Meeting Request Utils">
-<unit bldFile="app/organizer/meetingui/meetingrequestutils/group"/>
-</component>
-<component name="meetingrequestviewers" filter="s60" long-name="Meeting Request Viewers" plugin="Y">
-<unit bldFile="app/organizer/meetingui/meetingrequestviewers/group"/>
-</component>
-<component name="meetingui_build" filter="s60" long-name="Meeting UI Build">
-<!-- split contents into separate components -->
-<unit bldFile="app/organizer/meetingui/group"/>
-</component>
-</collection>
-<collection name="clock2" long-name="Clock" level="app">
-<component name="clockengines" filter="s60" long-name="Clock Engines">
-<unit bldFile="app/organizer/clock2/clockengines/group"/>
-</component>
-<component name="clockui" filter="s60" long-name="Clock UI">
-<unit bldFile="app/organizer/clock2/clockui/group"/>
-</component>
-<component name="clock2_help" filter="s60" long-name="Clock Help">
-<unit bldFile="app/organizer/clock2/help/group"/>
-</component>
-<component name="clock2_build" filter="s60" long-name="Clock Build">
-<!-- split contents into separate components, or just make this one component -->
-<unit bldFile="app/organizer/clock2/group"/>
-</component>
-</collection>
-<collection name="notepad" long-name="Notepad" level="ui">
-<component name="notepad_help" filter="s60" long-name="Notepad Help">
-<unit bldFile="app/organizer/notepad/help/group"/>
-</component>
-<component name="notepad1" filter="s60" long-name="Notepad Application 1">
-<unit bldFile="app/organizer/notepad/notepad1/group"/>
-</component>
-<component name="txtrecog" filter="s60" long-name="Text Recognizer" plugin="Y">
-<unit bldFile="app/organizer/notepad/txtrecog/group"/>
-</component>
-</collection>
-<collection name="searchui" long-name="Search UI" level="app">
-<!-- consider making this a single component -->
-<!-- Uncomment all units when configuration is in place. All currently #included from searchui_build, which should be removed at the same time. -->
-<component name="searchui_help" filter="s60" long-name="Search UI Help" class="placeholder">
-<!--<unit bldFile="searchui/help/group"/>-->
-</component>
-<component name="searchapp" filter="s60" long-name="Search Application" class="placeholder">
-<!--<unit bldFile="searchui/searchapp/group"/>-->
-</component>
-<component name="searchui_build" filter="s60" long-name="Search UI Build">
-<unit bldFile="app/organizer/searchui/group"/>
-</component>
-</collection>
-<collection name="pimappservices" long-name="PIM Application Services" level="services">
-<component name="calendar" long-name="Calendar" introduced="9.2" purpose="optional">
-<unit bldFile="app/organizer/pimappservices/calendar/group" mrp="app/organizer/pimappservices/calendar/group/app-engines_calendar.mrp" version="2"/>
-</component>
-<component name="calendarvcalplugin" long-name="Calendar vCal Plugin" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="app/organizer/pimappservices/calendarvcalplugin/group" mrp="app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp" version="2"/>
-</component>
-<component name="appenginesdocs" long-name="Application Engines Documentation" purpose="development" class="doc">
-<unit mrp="app/organizer/pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
-</component>
-</collection>
-<collection name="pimappsupport" long-name="PIM Application Support" level="support">
-<component name="vcardandvcal" long-name="vCard and vCal" introduced="ER5" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/vcardandvcal/group" mrp="app/organizer/pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
-</component>
-<component name="chinesecalendarconverter" long-name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
-</component>
-<component name="chinesecalendaralg" long-name="Chinese Calendar Algorithm" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendaralg/group" mrp="app/organizer/pimappsupport/chinesecalendaralg/group/app-services_chinesecalendaralgorithm.mrp"/>
-</component>
-</collection>
-<collection name="organizer_info" long-name="Organizer Application Suite Info" level="app">
-<component name="organizer_metadata" long-name="Organizer Application Suite Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="mail eng base ui">
-<collection name="msg_pub" long-name="Messaging Apps Public APIs" level="ui">
-<component name="messaging_integration_api" long-name="Messaging Integration API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/messaging_integration_api/group"/>
-</component>
-<component name="plugin_bio_control_api" long-name="Plug-in Bio Control API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/plugin_bio_control_api/group"/>
-</component>
-<component name="mms_client_mtm_api" long-name="MMS Client MTM API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/mms_client_mtm_api/group"/>
-</component>
-<component name="open_new_message_notification_api" long-name="Open New Message Notification API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/open_new_message_notification_api/group"/>
-</component>
-<component name="messaging_editor_constants_api" long-name="Messaging Editor Constants API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/messaging_editor_constants_api/group"/>
-</component>
-</collection>
-<collection name="msg_plat" long-name="Messaging Apps Platform APIs" level="ui">
-<component name="smil_player_launch_api" long-name="SMIL Player Launch API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/smil_player_launch_api/group"/>
-</component>
-<component name="messaging_media_resolver_api" long-name="Messaging Media Resolver API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/messaging_media_resolver_api/group"/>
-</component>
-<component name="smil_engine_api" long-name="SMIL Engine API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/smil_engine_api/group"/>
-</component>
-<component name="mms_server_settings_api" long-name="MMS Server Settings API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_server_settings_api/group"/>
-</component>
-<component name="new_contacts_note_secondary_display_api" long-name="New Contacts Note Secondary Display API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contacts_note_secondary_display_api/group"/>
-</component>
-<component name="messaging_center_ui_utilities_api" long-name="Messaging Center UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/messaging_center_ui_utilities_api/group"/>
-</component>
-<component name="internet_mail_mtm_ui_api" long-name="Internet Mail MTM UI API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/internet_mail_mtm_ui_api/group"/>
-</component>
-<component name="messaging_editor_api" long-name="Messaging Editor API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/messaging_editor_api/group"/>
-</component>
-<component name="email_domain_utilities_api" long-name="Email Domain Utilities API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/email_domain_utilities_api/group"/>
-</component>
-<component name="smil_transition_api" long-name="SMIL Transition API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/smil_transition_api/group"/>
-</component>
-<component name="new_contacts_note_status_api" long-name="New Contacts Note Status API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contacts_note_status_api/group"/>
-</component>
-<component name="unified_editor_video_conversion_api" long-name="Unified Editor Video Conversion API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/unified_editor_video_conversion_api/group"/>
-</component>
-<component name="mms_conformance_api" long-name="MMS Conformance API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_conformance_api/group"/>
-</component>
-<component name="new_contacts_note_variables_api" long-name="New Contacts Note Variables API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contacts_note_variables_api/group"/>
-</component>
-<component name="new_message_notification_api" long-name="New Message Notification API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_message_notification_api/group"/>
-</component>
-<component name="mms_application_api" long-name="MMS Application API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_application_api/group"/>
-</component>
-<component name="mms_engine_settings_api" long-name="MMS Engine Settings API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_engine_settings_api/group"/>
-</component>
-<component name="mms_codec_client_api" long-name="MMS Codec Client API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_codec_client_api/group"/>
-</component>
-<component name="send_ui_meeting_request_api" long-name="Send UI Meeting Request API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/send_ui_meeting_request_api/group"/>
-</component>
-<component name="new_contact_notes_extended_api" long-name="New Contact Notes Extended API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contact_notes_extended_api/group"/>
-</component>
-<component name="mail_ui_constants_api" long-name="Mail UI Constants API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mail_ui_constants_api/group"/>
-</component>
-<component name="sim_dialog_launch_api" long-name="SIM Dialog Launch API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/sim_dialog_launch_api/group"/>
-</component>
-</collection>
-<collection name="mobilemessaging" long-name="Mobile Messaging" level="ui">
-<component name="audiomsg" filter="s60" long-name="Audio Message">
-<unit bldFile="app/messaging/mobilemessaging/audiomsg/group"/>
-</component>
-<component name="msgmedia" filter="s60" long-name="Message Media">
-<unit bldFile="app/messaging/mobilemessaging/msgmedia/group"/>
-</component>
-<component name="unieditor" filter="s60" long-name="Unified Editor">
-<unit bldFile="app/messaging/mobilemessaging/unieditor/group"/>
-</component>
-<component name="mmsui" filter="s60" long-name="MMS UI">
-<unit bldFile="app/messaging/mobilemessaging/mmsui/group"/>
-</component>
-<component name="postcard" filter="s60" long-name="Postcard">
-<unit bldFile="app/messaging/mobilemessaging/postcard/group"/>
-</component>
-<component name="smilui" filter="s60" long-name="SMIL UI">
-<unit bldFile="app/messaging/mobilemessaging/smilui/group"/>
-</component>
-<component name="smum" filter="s60" long-name="SMS UI MTM and UI Data MTM" plugin="Y">
-<unit bldFile="app/messaging/mobilemessaging/smum/group"/>
-</component>
-<component name="smsui" filter="s60" long-name="SMS UI">
-<unit bldFile="app/messaging/mobilemessaging/smsui/group"/>
-</component>
-<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/mobilemessaging/smsmtm/group" mrp="app/messaging/mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
-</component>
-</collection>
-<collection name="mmsengine" long-name="MMS Engine" level="eng">
-<component name="mmsconninit" filter="s60" long-name="MMS Connection Initiator" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsconninit/bld"/> -->
-</component>
-<component name="genutils" filter="s60" long-name="General Utils" class="placeholder">
-<!-- <unit bldFile="mmsengine/genutils/bld"/> -->
-</component>
-<component name="mmsserversettings" filter="s60" long-name="MMS Server Settings" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserversettings/bld"/> -->
-</component>
-<component name="mmsmessage" filter="s60" long-name="MMS Message" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsmessage/bld"/> -->
-</component>
-<component name="mmshttptransport" filter="s60" long-name="MMS HTTP Transport" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmshttptransport/bld"/> -->
-</component>
-<component name="mmscodec" filter="s60" long-name="MMS Codec" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodec/bld"/> -->
-</component>
-<component name="mmsserver" filter="s60" long-name="MMS Server" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserver/bld"/> -->
-</component>
-<component name="clientmtm" filter="s60" long-name="MMS Client MTM" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/clientmtm/bld"/> -->
-</component>
-<component name="mmswatcher" filter="s60" long-name="MMS Watcher" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmswatcher/bld"/> -->
-</component>
-<component name="mmspushhandler" filter="s60" long-name="MMS Push Handler" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmspushhandler/bld"/> -->
-</component>
-<component name="applicationadapter" filter="s60" long-name="MMS Application Adapter" class="placeholder">
-<!-- <unit bldFile="mmsengine/applicationadapter/bld"/> -->
-</component>
-<component name="mmscodecclient" filter="s60" long-name="MMS Codec Client" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodecclient/bld"/> -->
-</component>
-<component name="mmssettings" long-name="MMS Settings" introduced="9.2" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmssettings/group" mrp="app/messaging/mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
-</component>
-<component name="mmsconf" long-name="MMS Configuration" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmsconf" mrp="app/messaging/mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
-</component>
-<component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
-<!-- this bld.inf should be broken up into the individual other components -->
-<unit bldFile="app/messaging/mmsengine/group"/>
-</component>
-</collection>
-<collection name="messagingappbase" long-name="Messaging App Base" level="base">
-<component name="msgavkon" filter="s60" long-name="Messaging Avkon UI">
-<unit bldFile="app/messaging/messagingappbase/msgavkon/group"/>
-</component>
-<component name="mce" filter="s60" long-name="Message Center Application">
-<unit bldFile="app/messaging/messagingappbase/mce/group"/>
-</component>
-<component name="mceextraitems" filter="s60" long-name="Message Center Extra Items">
-<unit bldFile="app/messaging/messagingappbase/mceextraitems/group"/>
-</component>
-<component name="mcesettings" filter="s60" long-name="Message Center Settings">
-<unit bldFile="app/messaging/messagingappbase/mcesettings/group"/>
-</component>
-<component name="msgerrorwatcher" filter="s60" long-name="Messaging Error Watcher" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/msgerrorwatcher/group"/>
-</component>
-<component name="ncnlist" filter="s60" long-name="New Contacts Note List">
-<unit bldFile="app/messaging/messagingappbase/ncnlist/group"/>
-</component>
-<component name="schemeplugin" filter="s60" long-name="Scheme Handler Plugin" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/schemeplugin/group"/>
-</component>
-<component name="sendui" filter="s60" long-name="Send UI" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/sendui/group"/>
-</component>
-<component name="smilengine" filter="s60" long-name="SMIL Engine">
-<unit bldFile="app/messaging/messagingappbase/smilengine/group"/>
-</component>
-<component name="bium" filter="s60" long-name="BIO UI MTM" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/bium/group"/>
-</component>
-<component name="smartmessaging" filter="s60" long-name="Smart Messaging">
-<unit bldFile="app/messaging/messagingappbase/smartmessaging/group"/>
-</component>
-<component name="msgeditor" filter="s60" long-name="Messaging Editor">
-<unit bldFile="app/messaging/messagingappbase/msgeditor/group"/>
-</component>
-<component name="smilparser" long-name="SMIL Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="app/messaging/messagingappbase/smilparser/GROUP" mrp="app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
-</component>
-<component name="obexmtms" long-name="OBEX MTMs" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/obexmtms/Group" mrp="app/messaging/messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
-</component>
-</collection>
-<collection name="email" long-name="Email" level="mail">
-<!-- use commonemail instead -->
-<component name="alwaysonlineemailplugin" filter="s60" long-name="Always Online Mail Plugin" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/alwaysonlineemailplugin/group"/>
-</component>
-<component name="emailnotificationhandler" filter="s60" long-name="Email Notification Handler" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/emailnotificationhandler/group"/>
-</component>
-<component name="imum" filter="s60" long-name="Internet Mail UI MTM" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/imum/group"/>
-</component>
-<component name="mail" filter="s60" long-name="Mail Application" deprecated="^3">
-<unit bldFile="app/messaging/email/mail/group"/>
-</component>
-<component name="pop3andsmtpmtm" long-name="POP3 and SMTP MTM" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/pop3andsmtpmtm/group" mrp="app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
-</component>
-<component name="imap4mtm" long-name="IMAP4 MTM" introduced="9.2" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/imap4mtm/group" mrp="app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
-</component>
-</collection>
-<collection name="messaging_info" long-name="Messaging Apps Info" level="ui">
-<component name="messaging_metadata" long-name="Messaging Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commonemail" level="apps" span="2" long-name="Email Apps" levels="service support ui app">
-<collection name="email_pub" long-name="Email Apps Public Interfaces" level="app">
-<component name="email_widget_api" long-name="Email Widget API" filter="s60" class="api">
-<unit bldFile="app/commonemail/email_pub/email_widget_api/group"/>
-</component>
-</collection>
-<collection name="email_plat" long-name="Email Apps Platform Interfaces" level="app">
-<component name="email_client_api" long-name="Email Client API" filter="s60" class="api">
-<unit bldFile="app/commonemail/email_plat/email_client_api/group"/>
-</component>
-<component name="email_setup_plugin_api" long-name="Email Setup Plugin API" filter="s60" class="api">
-<unit bldFile="app/commonemail/email_plat/email_setup_plugin_api/group"/>
-</component>
-</collection>
-<collection name="emailservices" long-name="Email Services" level="service">
-<component name="emailframework" filter="s60" long-name="Email Framework" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailframework/group"/>
-</component>
-<component name="emailclientapi" filter="s60" long-name="Email Client API" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailclientapi/group"/>
-</component>
-<component name="emailserver" filter="s60" long-name="Email Server" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailserver/group"/>
-</component>
-<component name="emailservermonitor" filter="s60" long-name="Email Server Monitor" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailservermonitor/group"/>
-</component>
-<component name="psmruadapter" filter="s60" long-name="Predictive Search Most Recent Used Adapter" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailservices/psmruadapter/group"/>
-</component>
-<component name="emailstore" filter="s60" long-name="Email Store" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailstore/group"/>
-</component>
-<component name="emaildebug" filter="s60" long-name="Email Debug" introduced="^2" class="api">
-<unit bldFile="app/commonemail/emailservices/emaildebug/group"/>
-</component>
-<component name="emailinstallationinitiator" filter="s60" long-name="Email Installation Initiator" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailinstallationinitiator/group"/>
-</component>
-</collection>
-<collection name="ipsservices" long-name="IMAP/POP/SMTP Services" level="service">
-<component name="ipssossettings" filter="s60" long-name="IPS SOS Settings" introduced="^2">
-<!-- SOS? Consider spelling it out since the abbreviation is ambiguous -->
-<unit bldFile="app/commonemail/ipsservices/ipssossettings/group"/>
-</component>
-<component name="ipssosplugin" filter="s60" long-name="IPS SOS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/ipsservices/ipssosplugin/group"/>
-</component>
-<component name="ipssosaoplugin" filter="s60" long-name="IPS SOS Always Online Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/ipsservices/ipssosaoplugin/group"/>
-</component>
-<component name="ipsservices_build" filter="s60" long-name="IPS Services Build" introduced="^2">
-<unit bldFile="app/commonemail/ipsservices/group"/>
-<!-- can the exports be broken up into the other components or made a config component?-->
-</component>
-</collection>
-<collection name="emailcontacts" long-name="Email Contacts" level="support">
-<component name="contactactionservice" filter="s60" long-name="Contact Action Service" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailcontacts/contactactionservice/group"/>
-</component>
-<component name="contactactionmenu" filter="s60" long-name="Contact Action Menu" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailcontacts/contactactionmenu/group"/>
-</component>
-</collection>
-<collection name="meetingrequest" long-name="Meeting Request" level="ui">
-<component name="mrcommon" filter="s60" long-name="MR Common" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrcommon/group"/>
-</component>
-<component name="mrdb" filter="s60" long-name="MR Database" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrdb/group"/>
-</component>
-<component name="mrpolicy" filter="s60" long-name="MR Policy" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrpolicy/group"/>
-</component>
-<component name="mrservices" filter="s60" long-name="MR Services" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrservices/group"/>
-</component>
-<component name="mrgui" filter="s60" long-name="MR GUI" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrgui/group"/>
-</component>
-<component name="mrentry" filter="s60" long-name="MR Entry" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrentry/group"/>
-</component>
-<component name="mrtasks" filter="s60" long-name="MR Tasks" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrtasks/group"/>
-</component>
-<component name="mrutils" filter="s60" long-name="MR Utils" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrutils/group"/>
-</component>
-<component name="mrutilscalplugin" filter="s60" long-name="MR Utils Calendar Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mrutilscalplugin/group"/>
-</component>
-<component name="mrviewer" filter="s60" long-name="MR Viewer" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrviewer/group"/>
-</component>
-<component name="mrviewercalplugin" filter="s60" long-name="MR Viewer Calendar Plugin" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrviewercalplugin/group"/>
-</component>
-<component name="mricalviewer" filter="s60" long-name="MR iCal Viewer" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mricalviewer/group"/>
-</component>
-<component name="mrversit2" filter="s60" long-name="MR Versit2" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrversit2/group"/>
-</component>
-<component name="mragnversit2" filter="s60" long-name="MR Agenda Versit2" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mragnversit2/group"/>
-</component>
-<component name="mrcasplugin" filter="s60" long-name="MR Contact Action Service Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mrcasplugin/group"/>
-</component>
-<component name="mrurlparserplugin" filter="s60" long-name="MR URL Parser Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mrurlparserplugin/group"/>
-</component>
-<component name="meetingrequest_build" filter="s60" long-name="MR Build" introduced="^2">
-<!-- can the exports be broken up into the other components ?
- alternatively, move the exports into a RM Config component-->
-<unit bldFile="app/commonemail/meetingrequest/group"/>
-</component>
-</collection>
-<collection name="emailuis" long-name="Email UIs" level="app">
-<component name="emailui" filter="s60" long-name="Email UI" introduced="^2">
-<unit bldFile="app/commonemail/emailuis/emailui/group"/>
-</component>
-<component name="gsemailsettings" filter="s60" long-name="Email GS Settings" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailuis/gsemailsettings/group"/>
-</component>
-<component name="uicomponents" filter="s60" long-name="Email UI Components" introduced="^2">
-<unit bldFile="app/commonemail/emailuis/uicomponents/group"/>
-</component>
-<component name="widget" filter="s60" long-name="Email Widget" introduced="^2">
-<!-- Uncomment unit when configuration is in place. Currently #included from emailuis_build, which should be removed at the same time. -->
-<!--<unit bldFile="emailuis/widget/group"/>-->
-</component>
-<component name="emailuis_build" filter="s60" long-name="Email UIs Build" introduced="^2">
-<unit bldFile="app/commonemail/emailuis/group"/>
-</component>
-</collection>
-<collection name="commonemail_info" long-name="Email Apps Info" level="app">
-<component name="emailhelp" filter="s60" long-name="Email Help" class="placeholder">
-<!-- should this be commented out or not? -->
-<!-- <unit bldFile="emailhelp/group"/> -->
-</component>
-<component name="commonemail_help" filter="s60" long-name="Email Help" introduced="^2" class="placeholder">
-<!-- should this be commented out or not? -->
-<!-- <unit bldFile="help/group"/> -->
-</component>
-</collection>
-</block>
-<block name="conversations" level="apps" long-name="Conversation Apps" levels="settings utils plugin ui">
-<collection name="conversations_plat" long-name="Conversation Apps Platform Interfaces" level="ui">
-<component name="im_cv_launcher_api" long-name="IM CV Launcher API" filter="s60" class="api">
-<unit bldFile="app/conversations/conversations_plat/im_cv_launcher_api/group"/>
-</component>
-<component name="im_connection_api" long-name="IM Connection API" filter="s60" class="api">
-<unit bldFile="app/conversations/conversations_plat/im_connection_api/group"/>
-</component>
-<component name="im_cv_appui_api" long-name="IM CV App UI API" filter="s60" class="api">
-<unit bldFile="app/conversations/conversations_plat/im_cv_appui_api/group"/>
-</component>
-</collection>
-<collection name="uiservicetabsettings" long-name="UI Service Tab Settings" level="settings">
-<!-- this is really at the wrong rank. should move down a directory -->
-<component name="vimpstsettings" filter="s60" long-name="VIMP Service Tab Settings">
-<unit bldFile="app/conversations/uiservicetabsettings/group"/>
-</component>
-</collection>
-<collection name="instantmessagesalert" long-name="Instant Messages Alert" level="utils">
-<!-- this is really at the wrong rank. should move down a directory -->
-<component name="instantmessagesalert_build" filter="s60" long-name="Instant Messages Alert build" introduced="^3">
-<unit bldFile="app/conversations/instantmessagesalert/group"/>
-</component>
-</collection>
-<collection name="imstutils" long-name="IM Service Tab Utils" level="utils">
-<component name="imstutils_help" filter="s60" long-name="IM Service Tab Help">
-<unit bldFile="app/conversations/imstutils/help/group"/>
-</component>
-<component name="imconnectionprovider" filter="s60" long-name="IM Connection Provider" plugin="Y">
-<unit bldFile="app/conversations/imstutils/imconnectionprovider/group"/>
-</component>
-<component name="xmppadapter" filter="s60" long-name="XMPP Settings Adapter" plugin="Y">
-<unit bldFile="app/conversations/imstutils/xmppadapter/group"/>
-</component>
-<component name="imconversationview" filter="s60" long-name="IM Conversation View">
-<unit bldFile="app/conversations/imstutils/imconversationview/group"/>
-</component>
-<component name="imstutils_config" filter="s60" long-name="IM Service Tab Utils config" class="config">
-<!-- remove the #includes and or moved ithe loc file into one the above components -->
-<unit bldFile="app/conversations/imstutils/group"/>
-</component>
-</collection>
-<collection name="uiservicetab" long-name="UI Service Tab" level="ui">
-<component name="vimpstutils" filter="s60" long-name="VIMP Service Tab Utilities">
-<!-- need to spell out VIMP at least once -->
-<unit bldFile="app/conversations/uiservicetab/vimpstutils/group"/>
-</component>
-<component name="vimpststorage" filter="s60" long-name="VIMP Service Tab Storage">
-<unit bldFile="app/conversations/uiservicetab/vimpststorage/group"/>
-</component>
-<component name="vimpstengine" filter="s60" long-name="VIMP Service Tab Engine">
-<unit bldFile="app/conversations/uiservicetab/vimpstengine/group"/>
-</component>
-<component name="vimpstcmdprocess" filter="s60" long-name="VIMP Service Tab Command Process">
-<unit bldFile="app/conversations/uiservicetab/vimpstcmdprocess/group"/>
-</component>
-<component name="vimpstui" filter="s60" long-name="VIMP Service Tab UI">
-<unit bldFile="app/conversations/uiservicetab/vimpstui/group"/>
-</component>
-<component name="vimpstdetailsviewplugin" filter="s60" long-name="VIMP ST Details View Plugin" plugin="Y">
-<unit bldFile="app/conversations/uiservicetab/vimpstdetailsviewplugin/group"/>
-</component>
-<component name="uiservicetab_build" filter="s60" long-name="UI Service Tab Build">
-<!-- can this be distributed into the above bld.infs? -->
-<unit bldFile="app/conversations/uiservicetab/group"/>
-</component>
-</collection>
-<collection name="servicewidget" long-name="Service Widget" level="ui">
-<component name="servicewidgetdatapublisher" filter="s60" long-name="Service Widget Data Publisher" plugin="Y">
-<unit bldFile="app/conversations/servicewidget/servicewidgetdatapublisher/group"/>
-</component>
-<component name="themes" filter="s60" long-name="Service Widget Themes" class="config">
-<!-- does this really need to have that number in the directory name? -->
-<unit bldFile="app/conversations/servicewidget/themes/install-themes/install/servicewidget_20021383/group"/>
-</component>
-<component name="servicewidget_build" filter="s60" long-name="Service Widget Build">
-<!-- Either move the whole collection down one directory into a single component, or move the ROM and SIS parts into a Service Widget ROM component -->
-<unit bldFile="app/conversations/servicewidget/group"/>
-</component>
-</collection>
-<collection name="instantmsgindicatorplugin" long-name="Instant Message Indicator Plugin" level="plugin">
-<!-- collection is really a component. should move down a directory -->
-<component name="instantmsgindicatorplugin_build" filter="s60" long-name="Instant Message Indicator Plugin Build" introduced="^3" plugin="Y">
-<unit bldFile="app/conversations/instantmsgindicatorplugin/group"/>
-</component>
-</collection>
-<collection name="imstatuspaneindicatorplugin" long-name="IM Status Pane Indicator Plugin" level="plugin">
-<!-- collection is really a component. should move down a directory -->
-<component name="imstatuspaneindicatorplugin_build" filter="s60" long-name="IM Status Pane Indicator Plugin Build" introduced="^3" plugin="Y">
-<unit bldFile="app/conversations/imstatuspaneindicatorplugin/group"/>
-</component>
-</collection>
-<collection name="conversations_info" long-name="Conversation Apps Info" level="ui">
-<component name="conversations_build" filter="s60" long-name="Conversation Apps Build">
-<!-- can the exports be moved to other components? or this remade into a configuration component?-->
-<unit bldFile="app/conversations/group"/>
-</component>
-</collection>
-</block>
-<block name="im" level="apps" long-name="Instant Messaging Apps" levels="support prot engine apps">
-<collection name="im_plat" long-name="Instant Messaging Apps Platform Interfaces" level="apps">
-<component name="wv_sap_settings_api" long-name="WV SAP Settings API" filter="s60" class="api">
-<unit bldFile="app/im/im_plat/wv_sap_settings_api/group"/>
-</component>
-</collection>
-<collection name="wvsettings20" long-name="Wireless Village Settings Engine" level="support">
-<!-- this is really a component. should move down a directory -->
-<component name="wvsapsettingsstore" long-name="WV SAP Settings Store" filter="s60" introduced="9.3">
-<unit bldFile="app/im/wvsettings20/group"/>
-</component>
-</collection>
-</block>
-<block name="dictionary" level="services" long-name="Dictionary" levels="utils ui">
-<collection name="dictionary_plat" long-name="Dictionary Platform Interfaces" level="ui">
-<component name="menu_suites_macros_api" long-name="Menu Suites Macros API" filter="s60" class="api">
-<unit bldFile="app/dictionary/dictionary_plat/menu_suites_macros_api/group"/>
-</component>
-</collection>
-<collection name="userdict" long-name="User Dictionary" level="ui">
-<!-- collection is really a component, move down a dir -->
-<component name="userdict_build" filter="s60" long-name="Japanese User Dictionary">
-<unit bldFile="app/dictionary/userdict/group"/>
-</component>
-</collection>
-</block>
-<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"/>
-</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"/>
-</component>
-</collection>
-<collection name="camerauis" long-name="Camera UIs">
-<component name="activepalette" filter="s60" long-name="Active Palette">
-<unit bldFile="app/camera/camerauis/activepalette/group"/>
-</component>
-<component name="cameraapp" filter="s60" long-name="Camera Application">
-<unit bldFile="app/camera/camerauis/cameraapp/group"/>
-<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">
-<component name="image_editor_debug_utilities_api" long-name="Image Editor Debug Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
-</component>
-<component name="image_editor_utilities_api" long-name="Image Editor Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_utilities_api/group"/>
-</component>
-<component name="image_editor_definitions_api" long-name="Image Editor Definitions API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_definitions_api/group"/>
-</component>
-<component name="image_editor_system_parameters_api" long-name="Image Editor System Parameters API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_system_parameters_api/group"/>
-</component>
-<component name="image_processing_engine_api" long-name="Image Processing Engine API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_processing_engine_api/group"/>
-</component>
-</collection>
-<collection name="imageeditor" long-name="Image Editor UI" level="ui">
-<component name="pb" filter="s60" long-name="Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/pb/group"/>
-</component>
-<component name="iepb" filter="s60" long-name="Image Editor Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/iepb/group"/>
-</component>
-<component name="imageeditorui" filter="s60" long-name="Image Editor UI">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorui/group"/>
-</component>
-<component name="imageeditormanager" filter="s60" long-name="Image Editor Manager">
-<unit bldFile="app/imgeditor/imageeditor/imageeditormanager/group"/>
-</component>
-<component name="imageeditorapp" filter="s60" long-name="Image Editor Application">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorapp/group"/>
-</component>
-<component name="imageeditor_plugins" filter="s60" long-name="Image Editor Plugins" plugin="Y">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditor/plugins/blackwhiteplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/brightnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/bubbleplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cartoonizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/clipartplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/contrastplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cropplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/drawplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/frameplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/negativeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/redeyeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/resizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotatelplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotaterplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/textplugin/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditor/plugins/drawplugin/group"/>
- -->
-</component>
-<component name="editorprovider" filter="s60" long-name="Image Editor Provider">
-<unit bldFile="app/imgeditor/imageeditor/editorprovider/group"/>
-</component>
-<component name="imageeditor_build" filter="s60" long-name="Image Editor Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditor/group"/>
-</component>
-</collection>
-<collection name="imageeditorengine" long-name="Image Editor Engine" level="engine">
-<component name="filters" filter="s60" long-name="Image Editor Filters">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbrightness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbubble/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbuffer/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercartoon/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterclipart/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercontrast/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercrop/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterdraw/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterframe/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtergrayscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtericlsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegtarget/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filternegate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterredeye/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterrotate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtertext/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
- -->
-</component>
-<component name="imageeditorutils" filter="s60" long-name="Image Editor Utilities">
-<unit bldFile="app/imgeditor/imageeditorengine/imageeditorutils/group"/>
-</component>
-<component name="systemparameters" filter="s60" long-name="System Parameters">
-<unit bldFile="app/imgeditor/imageeditorengine/systemparameters/group"/>
-</component>
-<component name="enginewrapper" filter="s60" long-name="Image Editor Engine Wrapper">
-<unit bldFile="app/imgeditor/imageeditorengine/enginewrapper/group"/>
-</component>
-<component name="imageeditorengine_build" filter="s60" long-name="Image Editor Engine Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoeditor" level="apps" long-name="Video Editor Apps" levels="engine ui">
-<collection name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" level="ui">
-<component name="video_editor_engine_api" long-name="Video Editor Engine API" introduced="^2" class="api">
-<unit bldFile="app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
-</component>
-</collection>
-<collection name="videditor" long-name="Video Editor" level="ui">
-<component name="videoeditorcommon" filter="s60" long-name="Video Editor Common" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditorcommon/group"/>
-</component>
-<component name="videoeditoruicomponents" filter="s60" long-name="Video Editor UI Components" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditoruicomponents/group"/>
-</component>
-<component name="simplevideoeditor" filter="s60" long-name="Simple Video Editor" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplevideoeditor/group"/>
-</component>
-<component name="simplecutvideo" filter="s60" long-name="Simple Cut Video" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplecutvideo/group"/>
-</component>
-<component name="videoprovider" filter="s60" long-name="Video Provider" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoprovider/group"/>
-</component>
-<component name="manualvideoeditor" filter="s60" long-name="Manual Video Editor" introduced="^2" class="placeholder">
-<!-- uncomment when supported
- <meta rel="config">
- <defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
- </meta>
- <unit bldFile="videditor/manualvideoeditor/group"/> -->
-</component>
-<component name="videditor_build" filter="s60" long-name="Video Editor Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videditor/group"/>
-</component>
-</collection>
-<collection name="videoeditorengine" long-name="Video Editor Engine" level="engine">
-<component name="audioeditorengine" filter="s60" long-name="Audio Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/audioeditorengine/group"/>
-</component>
-<component name="avcedit" filter="s60" long-name="AVC Editing" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/avcedit/group"/>
-</component>
-<component name="h263decoder" filter="s60" long-name="H.263 Decoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/h263decoder/group"/>
-</component>
-<component name="mp3aacmaniplib" filter="s60" long-name="MP3 and AAC Manipulation Library" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
-</component>
-<component name="vedtranscoder" filter="s60" long-name="Video Editor Transcoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedtranscoder/group"/>
-</component>
-<component name="vedengine" filter="s60" long-name="Video Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedengine/group"/>
-</component>
-<component name="videoeditorengine_build" filter="s60" long-name="Video Editor Engine Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videoeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
-<collection name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" level="apps">
-<component name="videoplayer_startup_api" long-name="Video Player Startup API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videoplayer_startup_api/group" filter="!test"/>
-</component>
-<component name="video_player_file_details_dialog_api" long-name="Media Player File Details Dialog API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/video_player_file_details_dialog_api/group" filter="!test"/>
-</component>
-<component name="videocollection_api" long-name="Video Collection API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videocollection_api/group"/>
-</component>
-</collection>
-<collection name="videofeeds" long-name="Video Feeds" level="util">
-<component name="iptv_utils" filter="s60" long-name="IPTV Util" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/utils/group"/>
-</component>
-<component name="viewmessageutility" filter="s60" long-name="View Message Utility" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/viewmessageutility/group"/>
-</component>
-<component name="vcxnotifier" filter="s60" long-name="Video Connection Notifier" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/vcxnotifier/group"/>
-</component>
-<component name="vccommon" filter="s60" long-name="Video Connection Common" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/vccommon/group"/>
-</component>
-<component name="clientapi" long-name="Server Client" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/clientapi/group"/>
-</component>
-<component name="provisioningprocessor" long-name="Provisioning Processor" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/provisioningprocessor/group"/>
-</component>
-<component name="mrssplugin" long-name="RSS plugin" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/mrssplugin/group"/>
-</component>
-<component name="videofeeds_server" long-name="Server" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/server/group"/>
-</component>
-<component name="livetvutils" long-name="LiveTV Utils" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/livetvutils/group"/>
-</component>
-<component name="iptvprovisioningrecognizer" long-name="IP TV Provisioning Recognizer" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/provisioningrecognizer/group"/>
-</component>
-<component name="iptvprovisioningappui" long-name="IP TV Provisioning App UI" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/provisioningappui/group"/>
-</component>
-<component name="iptvomaprovisioning" long-name="IP TV OMA Provisioning" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/omaprovisioning/group"/>
-</component>
-<component name="vcnsuiengine" long-name="VoD UI Engine" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/vcnsuiengine/group"/>
-</component>
-<component name="hgvodui" long-name="Ganes UX2.0 VoD UI" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/hgvodui/group"/>
-</component>
-<component name="hgvodplugin" long-name="Ganes UX2.0 VoD UI Plugin" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/hgvodplugin/group"/>
-</component>
-<component name="vcnsscheduleview" long-name="Scheduled Download Settings View" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/vcnsscheduleview/group"/>
-</component>
-<component name="vcnsscheduleplugin" long-name="Scheduled Download Settings Plugin" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/vcnsscheduleplugin/group"/>
-</component>
-<component name="scheduleddlplugin" long-name="Scheduled download plugin" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/scheduleddlplugin/group"/>
-</component>
-</collection>
-<collection name="videocollection" long-name="Video Collection" level="util">
-<component name="mpxmyvideoscollection" filter="s60" long-name="MPX My Videos Collection" introduced="^3">
-<unit bldFile="app/videoplayer/videocollection/mpxmyvideoscollection/group"/>
-</component>
-<component name="myvideosindicatorplugin" filter="s60" long-name="My Videos Indicator Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videocollection/myvideosindicatorplugin/group"/>
-</component>
-<component name="hgmyvideos" filter="s60" long-name="Huriganes My Videos" introduced="^3">
-<unit bldFile="app/videoplayer/videocollection/hgmyvideos/group"/>
-</component>
-<component name="hgmyvideosplugin" filter="s60" long-name="Huriganes My VideosPlugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videocollection/hgmyvideosplugin/group"/>
-</component>
-</collection>
-<collection name="mediasettings" long-name="Media Settings" level="support">
-<!-- this is really a component. Should be moved down a directory -->
-<component name="mediasettings_build" filter="s60" long-name="Media Settings Build">
-<unit bldFile="app/videoplayer/mediasettings/group"/>
-</component>
-<component name="videoplayer_test" filter="s60" purpose="development" long-name="Video Player Apps Test">
-<!-- can only have one unit. Can thes be #included from the above or another bld.inf?-->
-<unit bldFile="app/videoplayer/tsrc/VCXTestCommon/group"/>
-<unit bldFile="app/videoplayer/tsrc/VCXTestUtilModule/group"/>
-<unit bldFile="app/videoplayer/tsrc/VCXTestMyVideosCollectionClient/group"/>
-<unit bldFile="app/videoplayer/mediasettings/mediasettingsengine/tsrc/mediasettingsenginetest/group"/>
-<unit bldFile="app/videoplayer/mediasettings/videoplayersettingsengine/tsrc/vpsettingsenginetest/group"/>
-</component>
-</collection>
-<collection name="filedetails" long-name="File Details" level="support">
-<component name="filedetailsplugin" filter="s60" long-name="File Details Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/filedetails/filedetailsplugin/group"/>
-</component>
-<component name="filedetailsdialog" filter="s60" long-name="File Details Dialog" introduced="^3">
-<unit bldFile="app/videoplayer/filedetails/filedetailsdialog/group"/>
-</component>
-</collection>
-<collection name="videoplayerapp" long-name="Video Player App" level="apps">
-<component name="lwplayer" long-name="Lightweight Player" filter="s60">
-<unit bldFile="app/videoplayer/videoplayerapp/lwplayer/group"/>
-</component>
-<component name="mpxvideoplayer" filter="s60" long-name="MPX Video Player" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayerapp/mpxvideoplayer/group" filter="!test"/>
-</component>
-</collection>
-<collection name="videoplayback" long-name="Video Playback Plugins" level="plugin">
-<component name="videohelix" long-name="Video Helix" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videohelix/group" filter="!test"/>
-</component>
-<component name="videopdlplaybackviewplugin" filter="s60" long-name="Video PDL Playback View Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videopdlplaybackviewplugin/group" filter="!test"/>
-</component>
-<component name="videoplaybackcontrols" filter="s60" long-name="Video Playback Controls" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videoplaybackcontrols/group" filter="!test"/>
-</component>
-<component name="videoplaybackviewplugin" filter="s60" long-name="Video Playback View Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videoplaybackviewplugin/group"/>
-</component>
-<component name="videoplaybackviews" filter="s60" long-name="Video Playback Views" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videoplaybackviews/group" filter="!test"/>
-</component>
-</collection>
-</block>
-<block name="photos" level="apps" long-name="Photos" levels="support fw ui app">
-<collection name="photos_plat" long-name="Photos Platform Interfaces" level="app">
-<component name="collection_plugins_api" long-name="Collection Plugins API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/collection_plugins_api/group"/>
-</component>
-<component name="controllers_collection_api" long-name="Controllers Collection API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/controllers_collection_api/group"/>
-</component>
-<component name="gallery_utilities_api" long-name="Gallery Utilities API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/gallery_utilities_api/group"/>
-</component>
-<component name="slideshow_ui_constants_api" long-name="Slideshow Ui Constants API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/slideshow_ui_constants_api/group"/>
-</component>
-<component name="views_metadatadialog_api" long-name="Views Metadata Dialog API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/views_metadatadialog_api/group"/>
-</component>
-</collection>
-<collection name="photosgallery" long-name="Photos Gallery" level="app">
-<!-- consider splitting this collection into the application itself, and the frameworks behind it -->
-<component name="photosgallery_help" filter="s60" long-name="Photos Help" introduced="^2">
-<unit bldFile="app/photos/photosgallery/help/group"/>
-</component>
-<component name="logging" filter="s60" long-name="Photos Logging" introduced="^2">
-<unit bldFile="app/photos/photosgallery/logging/group"/>
-</component>
-<component name="photosgallery_common" filter="s60" long-name="Photos Common" introduced="^2">
-<unit bldFile="app/photos/photosgallery/common/group"/>
-</component>
-<component name="photosgallery_commonui" filter="s60" long-name="Photos Common UI" introduced="^2">
-<unit bldFile="app/photos/photosgallery/commonui/group"/>
-</component>
-<component name="photosgalleryollectionfw" filter="s60" long-name="Photos Collection Framework" introduced="^2">
-<unit bldFile="app/photos/photosgallery/collectionframework/group"/>
-</component>
-<component name="galleryicons" filter="s60" long-name="Photos Icons" introduced="^2" class="config">
-<unit bldFile="app/photos/photosgallery/icons"/>
-</component>
-<component name="imageviewer" filter="s60" long-name="Image Viewer" introduced="^3">
-<!-- this is really a part of controllers component, #include from there instead -->
-<unit bldFile="app/photos/photosgallery/controllers/imageviewer/group"/>
-</component>
-<component name="photosgalleryviewfw" filter="s60" long-name="View Framework" introduced="^2">
-<unit bldFile="app/photos/photosgallery/viewframework/group"/>
-</component>
-<component name="controllers" filter="s60" long-name="Photos Controllers" introduced="^2">
-<unit bldFile="app/photos/photosgallery/controllers/group"/>
-</component>
-<component name="photogallery" filter="s60" long-name="Media Gallery" introduced="^2">
-<unit bldFile="app/photos/photosgallery/gallery/group"/>
-</component>
-<component name="slideshow" filter="s60" long-name="Slideshow" introduced="^2">
-<unit bldFile="app/photos/photosgallery/slideshow/group"/>
-</component>
-<component name="memoryplugin" long-name="Memory Plugin" filter="s60" introduced="^2" plugin="Y">
-<unit bldFile="app/photos/photosgallery/memoryplugin/group"/>
-</component>
-<component name="imgvwr" filter="s60" long-name="Photos Image Viewer" introduced="^3">
-<unit bldFile="app/photos/photosgallery/imgvwr/group"/>
-</component>
-<component name="photosgallery_build" filter="s60" long-name="Photos Gallery Build" introduced="^2">
-<!-- need to remove the #included above bld.infs from this -->
-<unit bldFile="app/photos/photosgallery/group"/>
-</component>
-</collection>
-</block>
-<block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support hs app">
-<collection name="musicplayer_plat" long-name="Music Player Apps Platform Interfaces" level="app">
-<component name="mpx_music_player_app_api" long-name="MPX Music Player App API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_app_api/group"/>
-</component>
-<component name="mpx_music_player_commonui_api" long-name="MPX Music Player Common UI API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_commonui_api/group"/>
-</component>
-<component name="mpx_music_player_media_key_handler_api" long-name="MPX Music Player Media Key Handler API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_media_key_handler_api/group"/>
-</component>
-<component name="mpx_music_player_remote_control_api" long-name="MPX Music Player Remote Control API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_remote_control_api/group"/>
-</component>
-<component name="mpx_music_shop_ui_api" long-name="MPX Music Shop UI API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_shop_ui_api/group"/>
-</component>
-<component name="mpx_music_wap_adapter_cenrep_api" long-name="MPX Music Wap Adapter CenRep API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_wap_adapter_cenrep_api/group"/>
-</component>
-<component name="mpx_music_store_api" long-name="MPX Music Store Find API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_store_api/group"/>
-</component>
-<component name="audio_application_features_api" long-name="Audio Application Features API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/audio_application_features_api/group"/>
-</component>
-<component name="music_content_publisher_plugin_api" long-name="Music Content Publisher Plugin API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/music_content_publisher_plugin_api/group"/>
-</component>
-</collection>
-<collection name="mpxmusicplayer" long-name="MPX Music Player" level="app">
-<component name="mpxmusicplayer_help" filter="s60" long-name="Help">
-<unit bldFile="app/musicplayer/mpxmusicplayer/help/group"/>
-</component>
-<component name="mpxmusicplayer_commonui" filter="s60" long-name="MPX Common UI">
-<unit bldFile="app/musicplayer/mpxmusicplayer/commonui/group"/>
-</component>
-<component name="mpx_metadatahandler" filter="s60" long-name="MPX Metadata Handler">
-<unit bldFile="app/musicplayer/mpxmusicplayer/metadatahandler/group"/>
-</component>
-<component name="mediakeyhandler" filter="s60" long-name="MPX Media Key Handler">
-<unit bldFile="app/musicplayer/mpxmusicplayer/mediakeyhandler/group"/>
-</component>
-<component name="mpxmusicplayer_app" filter="s60" long-name="MPX Application">
-<unit bldFile="app/musicplayer/mpxmusicplayer/app/group"/>
-</component>
-<component name="mpxmusicplayer_build" filter="s60" long-name="MPX Music Player Build">
-<!-- can the exports be distributed to the above components? -->
-<unit bldFile="app/musicplayer/mpxmusicplayer/group"/>
-</component>
-</collection>
-<collection name="musichomescreen_multiview" long-name="Music Home Screen Multiview" level="hs">
-<!-- Uncomment all units when configuration is in place. All currently #included from musichomescreen_build -->
-<component name="mpxcollectionpublisher" filter="s60" long-name="MPX Collection Publisher" introduced="^2" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/mpxcollectionpublisher/group"/>-->
-</component>
-<component name="musiccontentpublisher" filter="s60" long-name="Music Content Publisher" introduced="^2" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/musiccontentpublisher/group"/>-->
-</component>
-<component name="mcpmusicplayer" filter="s60" long-name="Music Player MCP Plugin" introduced="^2" plugin="Y" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/mcpmusicplayer/group"/>-->
-</component>
-<component name="musicplayeractionhandlerplugin" filter="s60" long-name="Music Player Action Handler Plugin" introduced="^2" plugin="Y" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/musicplayeractionhandlerplugin/group"/>-->
-</component>
-<component name="mpx_data" filter="s60" long-name="MPX Data" introduced="^2" class="placeholder">
-<!-- does this make sense to be a component? should it just be #include from musichomescreen_multiview/group? -->
-<!--<unit bldFile="musichomescreen_multiview/data/themes/default/group"/>-->
-</component>
-<component name="musichomescreen_build" filter="s60" long-name="Music Homescreen Multiview Build" introduced="^2">
-<unit bldFile="app/musicplayer/musichomescreen_multiview/group"/>
-</component>
-</collection>
-<collection name="mpxplugins" long-name="MPX Plugins" level="plugins">
-<component name="serviceplugins" filter="s60" long-name="MPX Service Plugins" plugin="Y">
-<unit bldFile="app/musicplayer/mpxplugins/serviceplugins/group"/>
-</component>
-<component name="viewplugins" filter="s60" long-name="MPX View Plugins" plugin="Y">
-<unit bldFile="app/musicplayer/mpxplugins/viewplugins/group"/>
-</component>
-<component name="mpxplugins_build" filter="s60" long-name="MPX Plugins Build">
-<!-- can the exports be distributed to the above components? -->
-<unit bldFile="app/musicplayer/mpxplugins/group"/>
-</component>
-</collection>
-<collection name="musicplayer_info" long-name="Music Player Apps Info" level="app">
-<component name="musicplayer_build" filter="s60" long-name="Music Player Build">
-<!-- should explicitly #inlcude musicplayerbldvariant.hrh in each component -->
-<unit bldFile="app/musicplayer/group"/>
-</component>
-</collection>
-</block>
-<block name="radio" level="apps" long-name="Radio Apps" levels="engine ui">
-<collection name="fmradio" long-name="FM Radio" level="ui">
-<component name="activeidleengine" filter="s60" long-name="FM Radio Active Idle Engine">
-<unit bldFile="app/radio/fmradio/activeidleengine/group"/>
-</component>
-<component name="fmradioengine" filter="s60" long-name="FM Radio Engine">
-<unit bldFile="app/radio/fmradio/fmradioengine/group"/>
-</component>
-<component name="fmradioactionhandler" filter="s60" long-name="FM Radio Action Handler" plugin="Y">
-<unit bldFile="app/radio/fmradio/fmradioactionhandler/group"/>
-</component>
-<component name="fmradiomcpplugin" filter="s60" long-name="FM Radio Content Publisher Plugin" plugin="Y">
-<unit bldFile="app/radio/fmradio/fmradiomcpplugin/group"/>
-</component>
-<component name="fmradio_build" filter="s60" long-name="FM Radio Build">
-<unit bldFile="app/radio/fmradio/fmradio/group"/>
-</component>
-<component name="fmradio_help" filter="s60" long-name="FM Radio Help">
-<unit bldFile="app/radio/fmradio/help/group"/>
-</component>
-<component name="fmradio_build" filter="s60" long-name="FM Radio ROM">
-<!-- remove above #included bld.infs -->
-<unit bldFile="app/radio/fmradio/group"/>
-</component>
-</collection>
-</block>
-<block name="internetradio" level="apps" long-name="Internet Radio Apps"/>
-<block name="tv" level="services" long-name="TV Apps"/>
-<block name="voicerec" level="apps" long-name="Voice Recorder Apps">
-<!-- custom filter pref_test-->
-<collection name="voicerec_plat" long-name="Voice Recorder Apps Platform Interfaces">
-<component name="new_file_service_api" long-name="New File Service API" filter="s60" class="api">
-<unit bldFile="app/voicerec/voicerec_plat/new_file_service_api/group"/>
-</component>
-<component name="voicerecorder_public_constants_api" long-name="Voice Recorder Public Constants API" filter="s60" class="api">
-<unit bldFile="app/voicerec/voicerec_plat/voicerecorder_public_constants_api/group"/>
-</component>
-</collection>
-<collection name="voicerecorder" long-name="Voice Recorder">
-<!--this is really a component, move down a directory -->
-<component name="voicerecorder_build" filter="s60" long-name="Voice Recorder Build">
-<unit bldFile="app/voicerec/voicerecorder/group"/>
-</component>
-</collection>
-<collection name="voicerec_info" long-name="Voice Recorder Apps Info"/>
-</block>
-<block name="screensaver" level="apps" long-name="Screen Saver Apps" levels="plugin ui">
-<!-- is this a user-facing application or a daemon? -->
-<!-- units need to be commented out until configuration is in place. They are currently #included from screensaver_build-->
-<collection name="scrsaver" long-name="Screen Saver" level="plugin">
-<component name="scrsaverplugins" filter="s60" long-name="Screen Saver Plugins" plugin="Y">
-<!-- must have only one component. #include from a common bld.inf, or move up a directory and make scrsaverplugins a collection -->
-<!--<unit bldFile="scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/"/>
- <unit bldFile="scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/group/"/>-->
-</component>
-<component name="scrsaver_slideshowplugin" filter="s60" long-name="Screen Saver Slideshow Plugin" plugin="Y">
-<!--<unit bldFile="scrsaver/scrsaverplugins/SlideshowPlugin/group"/> -->
-</component>
-<component name="screensaveraiwplugin" filter="s60" long-name="Screen Saver AIW Plugin" plugin="Y">
-<!-- <unit bldFile="scrsaver/screensaveraiwplugin/group"/>-->
-</component>
-</collection>
-<collection name="screensaver_info" long-name="Screen Saver Apps Info" level="ui">
-<component name="screensaver_build" filter="s60" long-name="Screen Saver Application">
-<!--the app should be a separate component -->
-<unit bldFile="app/screensaver/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreen" level="apps" long-name="Home Screen Apps" levels="fw support apps">
-<collection name="homescreen_plat" long-name="Home Screen Apps Platform Interfaces" level="apps">
-<component name="menu_settings_api" long-name="Menu Settings API" filter="s60" class="api">
-<unit bldFile="app/homescreen/homescreen_plat/menu_settings_api/group"/>
-</component>
-<component name="hs_content_control_ui" long-name="HS Content Control Ui" filter="s60" class="api">
-<unit bldFile="app/homescreen/homescreen_plat/hs_content_control_ui/group"/>
-</component>
-<component name="hs_renderingplugin_api" long-name="HS Rendering Plugin API" filter="s60" class="api">
-<unit bldFile="app/homescreen/homescreen_plat/hs_renderingplugin_api/group"/>
-</component>
-</collection>
-<collection name="idlehomescreen" long-name="Idle Home Screen" level="apps">
-<component name="nativeuicontroller" filter="s60" long-name="Native UI Controller">
-<unit bldFile="app/homescreen/idlehomescreen/nativeuicontroller/group"/>
-</component>
-<component name="exths" filter="s60" long-name="Active Idle Container" plugin="Y">
-<!-- why is the ID so different from the name? Is one wrong? -->
-<unit bldFile="app/homescreen/idlehomescreen/exths/group"/>
-</component>
-<component name="hscontentcontrol" filter="s60" long-name="Home Screen Content Control" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/hscontentcontrol/group"/>
-</component>
-<component name="hssapiwrapper" filter="s60" long-name="HS SAPI Wrapper" introduced="^3">
-<!-- can only have one unit. #include from a common bld.inf, or split into two components -->
-<unit bldFile="app/homescreen/idlehomescreen/sapiwrapper/cpswrapper/group"/>
-<unit bldFile="app/homescreen/idlehomescreen/sapiwrapper/hspswrapper/group"/>
-</component>
-<component name="xmluirendering" filter="s60" long-name="XML UI Rendering" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/xmluirendering/group"/>
-</component>
-<component name="xmluicontroller" filter="s60" long-name="XML UI Controller" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/xmluicontroller/group"/>
-</component>
-<component name="widgetmanager" filter="s60" long-name="Widget Manager" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/widgetmanager/group"/>
-</component>
-<component name="idlehomescreen_help" filter="s60" long-name="Idle Home Screen Help">
-<unit bldFile="app/homescreen/idlehomescreen/help/group"/>
-</component>
-<component name="idlehomescreen_data" filter="s60" long-name="Idle Home Screen Data">
-<unit bldFile="app/homescreen/idlehomescreen/data/group"/>
-</component>
-<component name="idlehomescreen_build" filter="s60" long-name="Idle Home Screen Build">
-<!-- can the loc file be moved to another comopnent and this one removed? -->
-<unit bldFile="app/homescreen/idlehomescreen/group"/>
-</component>
-</collection>
-<collection name="menufw" long-name="Menu Framework" level="fw">
-<component name="hierarchynavigator" filter="s60" long-name="Hierarchy Navigator">
-<unit bldFile="app/homescreen/menufw/hierarchynavigator/group"/>
-</component>
-<component name="menufwui" filter="s60" long-name="Menu Framework UI">
-<unit bldFile="app/homescreen/menufw/menufwui/group"/>
-</component>
-<component name="menusuites" filter="s60" long-name="Menu Suites">
-<unit bldFile="app/homescreen/menufw/menusuites/group"/>
-</component>
-<component name="menufw_build" filter="s60" long-name="Menu Framework Build">
-<!-- can the exports be exported by the other components? -->
-<unit bldFile="app/homescreen/menufw/group"/>
-</component>
-</collection>
-<collection name="taskswitcher" long-name="Task Switcher" level="support">
-<component name="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">
-<unit bldFile="app/homescreen/taskswitcher/taskswitcherui/group"/>
-</component>
-</collection>
-</block>
-<block name="graphicsuis" level="services" long-name="Graphics UIs" levels="util ui">
-<collection name="graphicsuis_plat" long-name="Graphics UIs Platform Interfaces" level="ui">
-<component name="svgt_viewer_ui_api" long-name="SVG-T Viewer UI API" filter="s60" class="api">
-<unit bldFile="app/graphicsuis/graphicsuis_plat/svgt_viewer_ui_api/group"/>
-</component>
-<component name="svg_application_observer_utility_api" long-name="SVG Application Observer Utility API" filter="s60" class="api">
-<unit bldFile="app/graphicsuis/graphicsuis_plat/svg_application_observer_utility_api/group"/>
-</component>
-<component name="svgt_file_view_details_dialog_api" long-name="SVG-T File View Details Dialog API" filter="s60" class="api">
-<unit bldFile="app/graphicsuis/graphicsuis_plat/svgt_file_view_details_dialog_api/group"/>
-</component>
-</collection>
-<collection name="svgtviewer" long-name="SVG-T Viewer" level="ui">
-<component name="svgtviewerplugin" filter="s60" long-name="SVG-T Viewer Plugin">
-<unit bldFile="app/graphicsuis/svgtviewer/svgtviewerplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="profile" level="apps" long-name="Profiles" levels="app">
-<collection name="profile_plat" long-name="Profiles Platform Interfaces" level="app">
-<component name="profiles_settings_view_api" long-name="Profiles Settings View API" filter="s60" class="api">
-<unit bldFile="app/profile/profile_plat/profiles_settings_view_api/group"/>
-</component>
-</collection>
-<collection name="profilesapplication" long-name="Profiles Application" level="app">
-<component name="profiles" filter="s60" long-name="Profiles">
-<unit bldFile="app/profile/profilesapplication/profiles/group"/>
-</component>
-</collection>
-<collection name="profile_info" long-name="Profiles Info" level="app">
-<component name="profile_help" filter="s60" long-name="Profiles Help">
-<unit bldFile="app/profile/help/group"/>
-</component>
-</collection>
-</block>
-<block name="speechsrv" level="services" long-name="Speech Recognition UIs" levels="engine framework ui">
-<collection name="speechsrv_plat" long-name="Speech Recognition UIs Platform Interfaces" level="ui">
-<component name="vas_api" long-name="VAS API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vas_api/group"/>
-</component>
-<component name="nss_devasr_api" long-name="NSS DevASR API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_devasr_api/group"/>
-</component>
-<component name="tts_hw_device_api" long-name="TTS HW Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/tts_hw_device_api/group"/>
-</component>
-<component name="voice_commands_resource_header_api" long-name="Voice Commands Resource Header API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/voice_commands_resource_header_api/group"/>
-</component>
-<component name="nss_mmf_tts_custom_commands_api" long-name="NSS MMF TTS Custom Commands API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_mmf_tts_custom_commands_api/group"/>
-</component>
-<component name="srsf_cenrep_settings_api" long-name="SRSF CenRep Settings API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/srsf_cenrep_settings_api/group"/>
-</component>
-<component name="voice_ui_plugin_api" long-name="Voice UI Plug-in API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/voice_ui_plugin_api/group"/>
-</component>
-<component name="nss_tts_utility_api" long-name="NSS TTS Utility API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_tts_utility_api/group"/>
-</component>
-<component name="nss_srs_custom_commands_api" long-name="NSS SRS Custom Commands API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_srs_custom_commands_api/group"/>
-</component>
-<component name="srsf_secondarydisplay_api" long-name="SRSF Secondary Display API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/srsf_secondarydisplay_api/group"/>
-</component>
-<component name="asrs_hw_device_api" long-name="ASRS Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/asrs_hw_device_api/group"/>
-</component>
-<component name="vas_vcommand_api" long-name="VAS Voice Command API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vas_vcommand_api/group"/>
-</component>
-<component name="adaptation_hw_device_api" long-name="Adaptation Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/adaptation_hw_device_api/group"/>
-</component>
-<component name="nss_devtts_api" long-name="NSS DevTTS API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_devtts_api/group"/>
-</component>
-<component name="nss_srs_utility_api" long-name="NSS SRS Utility API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_srs_utility_api/group"/>
-</component>
-<component name="recognition_hw_device_api" long-name="Recognition Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/recognition_hw_device_api/group"/>
-</component>
-<component name="vas_contact_handler_api" long-name="VAS Contact Handler API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vas_contact_handler_api/group"/>
-</component>
-<component name="nlp_hw_device" long-name="NLP Hardware Device" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nlp_hw_device/group"/>
-</component>
-<component name="nss_si_speech_recognition_data_api" long-name="NSS SI Speech Recognition Data API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_si_speech_recognition_data_api/group"/>
-</component>
-<component name="nss_tts_common_api" long-name="NSS TTS Common API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_tts_common_api/group"/>
-</component>
-<component name="grcompiler_hw_device_api" long-name="Grammar Compiler Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/grcompiler_hw_device_api/group"/>
-</component>
-<component name="ttp_hw_device_api" long-name="TTP Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/ttp_hw_device_api/group"/>
-</component>
-<component name="vocman_hw_device_api" long-name="VocMan Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vocman_hw_device_api/group"/>
-</component>
-<component name="speech_synthesis_clientserver_api" long-name="Speech Synthesis Client-Server API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/speech_synthesis_clientserver_api/group"/>
-</component>
-<component name="voice_ui_accessory_button_handling_api" long-name="Voice UI Accessory Button Handling API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/voice_ui_accessory_button_handling_api/group"/>
-</component>
-<component name="ui_voice_recognition_api" long-name="UI Voice Recognition API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/ui_voice_recognition_api/group"/>
-</component>
-<component name="vcommand_settings_cenrep_api" long-name="Voice Command Settings CenRep API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vcommand_settings_cenrep_api/group"/>
-</component>
-</collection>
-<collection name="voiceui" long-name="Voice UI" level="ui">
-<component name="vcommand" filter="s60" long-name="Voice Commands UI" introduced="^1">
-<unit bldFile="app/speechsrv/voiceui/vcommand/group"/>
-</component>
-<component name="voiceuivoicerecognition" filter="s60" long-name="Voice UI Recognition" introduced="^1">
-<unit bldFile="app/speechsrv/voiceui/voiceuivoicerecognition/group"/>
-</component>
-<component name="pbkinfoviewimpl" filter="s60" long-name="Phonebook Info View Implementation" introduced="^1">
-<unit bldFile="app/speechsrv/voiceui/pbkinfoviewimpl/group"/>
-</component>
-<component name="aiwpbkinfoviewprovider" filter="s60" long-name="AIW Phonebook Info View Provider" introduced="^1" plugin="Y">
-<unit bldFile="app/speechsrv/voiceui/aiwpbkinfoviewprovider/group"/>
-</component>
-<component name="vccontrolpanelplugin" filter="s60" long-name="Voice Commands Control Panel Plugin" introduced="^1" plugin="Y">
-<!-- component is commented out until configuration is in place. Currently #included from voiceui_build -->
-<!--<unit bldFile="voiceui/vccontrolpanelplugin/group"/>-->
-</component>
-<component name="voiceui_build" filter="s60" long-name="Voice UI Build" introduced="^1">
-<!-- can this be put into the other components? -->
-<unit bldFile="app/speechsrv/voiceui/group"/>
-</component>
-</collection>
-<collection name="srsf" long-name="Speech Recognition and Synthesis Framework" level="framework">
-<component name="sispeechrecognitiondata" filter="s60" long-name="SI Speech Recognition Data">
-<unit bldFile="app/speechsrv/srsf/sispeechrecognitiondata/group"/>
-</component>
-<component name="ttscommon" filter="s60" long-name="TTS Common">
-<unit bldFile="app/speechsrv/srsf/ttscommon/group"/>
-</component>
-<component name="devtts" filter="s60" long-name="Text to Speech">
-<unit bldFile="app/speechsrv/srsf/devtts/group"/>
-</component>
-<component name="ttscustomcommands" filter="s60" long-name="TTS Custom Commands">
-<unit bldFile="app/speechsrv/srsf/ttscustomcommands/group"/>
-</component>
-<component name="ttscontrollerplugin" filter="s60" long-name="TTS Controller Plugin" plugin="Y">
-<unit bldFile="app/speechsrv/srsf/ttscontrollerplugin/group"/>
-</component>
-<component name="ttsutility" filter="s60" long-name="TTS Utility">
-<unit bldFile="app/speechsrv/srsf/ttsutility/group"/>
-</component>
-<component name="speechsynthesis" filter="s60" long-name="Speech Synthesis">
-<!-- can only have one unit. #include these from a common bld.inf -->
-<unit bldFile="app/speechsrv/srsf/speechsynthesis/client/group"/>
-<unit bldFile="app/speechsrv/srsf/speechsynthesis/server/group"/>
-</component>
-<component name="devasr" filter="s60" long-name="Audio Recording and Speech Recognition">
-<unit bldFile="app/speechsrv/srsf/devasr/group"/>
-</component>
-<component name="sicc" filter="s60" long-name="Speaker Independent Custom Commands">
-<unit bldFile="app/speechsrv/srsf/sicc/group"/>
-</component>
-<component name="sisrscontrollerplugin" filter="s60" long-name="SI SRS Controller Plugin" plugin="Y">
-<unit bldFile="app/speechsrv/srsf/sisrscontrollerplugin/group"/>
-</component>
-<component name="siutility" filter="s60" long-name="Speaker Independent Utility">
-<unit bldFile="app/speechsrv/srsf/siutility/group"/>
-</component>
-<component name="nssvasapi" filter="s60" long-name="NSS VAS API">
-<unit bldFile="app/speechsrv/srsf/nssvasapi/group"/>
-</component>
-<component name="nssvascontacthdlr" filter="s60" long-name="NSS VAS Contact Handler">
-<unit bldFile="app/speechsrv/srsf/nssvascontacthdlr/group"/>
-</component>
-<component name="vcommandhandler" filter="s60" long-name="Voice Command Handler">
-<unit bldFile="app/speechsrv/srsf/vcommandhandler/group"/>
-</component>
-<component name="vuiphandler" filter="s60" long-name="Voice UI Plugin Handler">
-<unit bldFile="app/speechsrv/srsf/vuiphandler/group"/>
-</component>
-<component name="vcommandexecutor" filter="s60" long-name="Voice Command Executor">
-<unit bldFile="app/speechsrv/srsf/vcommandexecutor/group"/>
-</component>
-<component name="vcommandexecutorbearer" filter="s60" long-name="Voice Command Executor Bearer">
-<unit bldFile="app/speechsrv/srsf/vcommandexecutorbearer/group"/>
-</component>
-<component name="vcommandmanager" filter="s60" long-name="Voice Command Manager">
-<unit bldFile="app/speechsrv/srsf/vcommandmanager/group"/>
-</component>
-<component name="vcexecutorapp" filter="s60" long-name="Voice Command Executor Application">
-<unit bldFile="app/speechsrv/srsf/vcexecutorapp/group"/>
-</component>
-<component name="profileobserverplugin" filter="s60" long-name="Profile Observer Plugin" plugin="Y">
-<unit bldFile="app/speechsrv/srsf/profileobserverplugin/group"/>
-</component>
-<component name="srsf_build" filter="s60" long-name="Speech Recognition and Synthesis Framework Build">
-<!-- should distribute this into the above components -->
-<unit bldFile="app/speechsrv/srsf/group"/>
-</component>
-</collection>
-<collection name="speechsrv_info" long-name="Speech Recognition UIs Info" level="ui"/>
-</block>
-<block name="homescreentools" level="services" long-name="Home Screen Tools" levels="tool install">
-<collection name="dtdinstaller" long-name="DTD Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<!-- this needs to be built first, does build order need to be forced with filters? -->
-<component name="dtdinstaller_build" filter="s60" long-name="DTD Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/dtdinstaller/group"/>
-</component>
-</collection>
-<collection name="themeinstaller" long-name="Theme Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="themeinstaller_build" filter="s60" long-name="Theme Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/themeinstaller/group"/>
-</component>
-</collection>
-<collection name="widgettools" long-name="Widget Tools" level="install">
-<component name="hspluginpreinstaller" filter="s60" long-name="HS Plugin Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/hspluginspreinstaller/group"/>
-</component>
-<component name="wrtwidgetpreinstaller" filter="s60" long-name="WRT Widget Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
-</component>
-</collection>
-</block>
-<block name="webuis" level="services" long-name="Web UIs" levels="plugin app">
-<collection name="browserui" long-name="Browser UI" level="app">
-<component name="browser" filter="s60" long-name="Browser">
-<unit bldFile="app/webuis/browserui/browser/group"/>
-</component>
-<component name="operatormenu" filter="s60" long-name="Browser Operator Menu">
-<unit bldFile="app/webuis/browserui/operatormenu/group"/>
-</component>
-<component name="videoservices" filter="s60" long-name="Browser Video Services">
-<unit bldFile="app/webuis/browserui/videoservices/group"/>
-</component>
-</collection>
-<collection name="browserplugins" long-name="Browser Plugins" level="plugin">
-<component name="browsersysteminfoplugin" filter="s60" long-name="Browser System Info Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsersysteminfoplugin/group"/>-->
-</component>
-<component name="browsergpsplugin" filter="s60" long-name="Browser GPS Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsergpsplugin/group"/>-->
-</component>
-<component name="browseraudiovideoplugin" filter="s60" long-name="Browser Audio Video Plugin" plugin="Y">
-<unit bldFile="app/webuis/browserplugins/browseraudiovideoplugin/group"/>
-</component>
-<component name="browserplugins_build" filter="s60" long-name="Browser Plugins Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="app/webuis/browserplugins/group"/>
-</component>
-</collection>
-<collection name="pushmtm" long-name="Push MTM" level="plugin">
-<component name="pushmtm_help" filter="s60" long-name="Push MTM Help">
-<unit bldFile="app/webuis/pushmtm/help/group"/>
-</component>
-<component name="plugins" filter="s60" long-name="Push MTM Plugins" plugin="Y">
-<unit bldFile="app/webuis/pushmtm/plugins/group"/>
-</component>
-<component name="pushmtm_build" filter="s60" long-name="Push MTM Build">
-<!-- Some content is at collection level and some is at comopnent level. Either make this a single
- component and move it down a diretcory, or make separate independent components in this collection -->
-<unit bldFile="app/webuis/pushmtm/group"/>
-</component>
-</collection>
-</block>
-<block name="jrt" level="services" long-name="Java Runtime" levels="util generic rt ui">
-<collection name="jrt_plat" long-name="JRT Platform Interfaces" level="ui">
-<component name="java_registry_api" long-name="Java Registry API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_registry_api/build"/>
-</component>
-<component name="java_env_info_api" long-name="Java Environment Info API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_env_info_api/build"/>
-</component>
-<component name="java_debug_api" long-name="Java Debug API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_debug_api/build"/>
-</component>
-</collection>
-<collection name="java_stubs" long-name="Java Stubs" level="util">
-<component name="java_stubs_build" filter="s60" long-name="JRT Stubs Build">
-<unit bldFile="app/jrt/java_stubs/group"/>
-</component>
-</collection>
-</block>
-<block name="conntools" level="services" long-name="Connectivity Tools" levels="config app">
-<collection name="nettools" long-name="Net Tools" level="app">
-<component name="conntest" filter="s60" long-name="Connection Test" purpose="development">
-<unit bldFile="app/conntools/nettools/conntest/group"/>
-</component>
-</collection>
-<collection name="emulatorlan" long-name="Emulator LAN" level="config">
-<!-- component is actually a colleciton, should be moved down a directory -->
-<component name="emulatorlan_build" filter="s60" long-name="Emulator LAN Build" purpose="development" class="config">
-<unit bldFile="app/conntools/emulatorlan/group"/>
-</component>
-</collection>
-</block>
-<block name="rndtools" level="services" long-name="R&D tools" levels="support generic test util">
-<collection name="creator" long-name="Creator" level="support">
-<!-- collection is really a component. Should move down a directory -->
-<component name="creator_build" filter="s60" long-name="Creator Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/creator/group"/>
-</component>
-</collection>
-<collection name="filebrowser" long-name="File Browser" level="util">
-<!-- consider collapsing into a single component -->
-<component name="fileopserver" filter="s60" long-name="File Operations Server" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
-</component>
-<component name="fileopclient" filter="s60" long-name="File Operations Client" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!--<unit bldFile="filebrowser/fileopclient/group"/>-->
-</component>
-<component name="filebrowser_build" filter="s60" long-name="File Browser Application" purpose="development" class="tool">
-<!-- Need to make this a self-contained component by removing #includes. Can only do when configuration is in place-->
-<unit bldFile="app/rndtools/filebrowser/group"/>
-</component>
-</collection>
-<collection name="launcher" long-name="Launcher" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="launcher_build" filter="s60" long-name="Launcher Utility" purpose="development" class="tool">
-<unit bldFile="app/rndtools/launcher/group"/>
-</component>
-</collection>
-<collection name="loadgen" long-name="Load Generator" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="loadgen_build" filter="s60" long-name="Load Generator Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/loadgen/group"/>
-</component>
-</collection>
-<collection name="perfmon" long-name="Performance Monitor" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="perfmon_build" filter="s60" long-name="Performance Monitor Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/perfmon/group"/>
-</component>
-</collection>
-<collection name="screengrabber" long-name="Screen Grabber" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="screengrabber_build" filter="s60" long-name="ScreenGrabber" purpose="development" class="tool">
-<unit bldFile="app/rndtools/screengrabber/group"/>
-</component>
-</collection>
-<collection name="stifui" long-name="STIF UI" level="generic">
-<component name="stifui_stifui" filter="s60" long-name="STIF UI" purpose="development">
-<unit bldFile="app/rndtools/stifui/stifui/group"/>
-</component>
-<component name="uitestserverstarter" filter="s60" long-name="UI Test Server Starter" purpose="development">
-<unit bldFile="app/rndtools/stifui/uitestserverstarter/group"/>
-</component>
-<component name="stifui_build" filter="s60" long-name="STIF UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/stifui/group"/>
-</component>
-</collection>
-<collection name="memspyui" long-name="Memspy UI" level="generic">
-<!-- collection is really a component. Should move down a directory -->
-<component name="memspyui_build" filter="s60" long-name="Memspy UI Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/memspyui/group"/>
-</component>
-</collection>
-<collection name="htiui" long-name="Harmonized Test Interface UI" level="generic">
-<component name="HtiCommPlugins" filter="s60" long-name="HTI Comm Plugins" purpose="development" plugin="Y">
-<unit bldFile="app/rndtools/htiui/HtiCommPlugins/HtiBtCommPlugin/group"/>
-</component>
-<component name="HtiServicePlugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- can only have a single unit. Should #include from a common bld.inf file -->
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiFtpBackupFake/group"/>
-</component>
-<component name="htidevicereboot" filter="s60" long-name="HTI Device Reboot" purpose="development">
-<unit bldFile="app/rndtools/htiui/htidevicereboot/group"/>
-</component>
-<component name="htistartupwait" filter="s60" long-name="HTI Startup Wait" purpose="development">
-<unit bldFile="app/rndtools/htiui/htistartupwait/group"/>
-</component>
-<component name="htiadmin" filter="s60" long-name="HTI Admin" purpose="development">
-<unit bldFile="app/rndtools/htiui/htiadmin/group"/>
-</component>
-<component name="htiui_build" filter="s60" long-name="HTI UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/htiui/group"/>
-</component>
-</collection>
-</block>
-<block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools if ui">
-<collection name="csxhelp" long-name="Context Sensitive Extended Help" level="if">
-<!-- this is really a component. Should move it down a directory -->
-<component name="csxhelp_build" filter="s60" long-name="Context Sensitive Extended Help Build">
-<unit bldFile="app/helps/csxhelp/group"/>
-</component>
-</collection>
-<collection name="symhelp" long-name="Symbian Help" level="eng">
-<component name="helpmodel" long-name="Help" introduced="6.0" purpose="optional">
-<unit bldFile="app/helps/symhelp/helpmodel/group" mrp="app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
-</component>
-</collection>
-<collection name="helps_info" long-name="Help Apps Info" level="ui">
-<component name="helps_metadata" long-name="Help Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/helps/helps_info/helps_metadata/helps_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
-<collection name="buildverification" long-name="Build Verification" level="services">
-<component name="autosmoketest" long-name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
-<unit bldFile="app/techview/buildverification/autosmoketest/Group" mrp="app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
-</component>
-<component name="smoketest" long-name="Smoke Test" filter="gt" purpose="development">
-<unit bldFile="app/techview/buildverification/smoketest/Group" mrp="app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
-</component>
-</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="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"/>
-<collection name="installationapps" long-name="Installation Apps" level="apps2"/>
-<collection name="messagingapps" long-name="Messaging Apps" level="apps2"/>
-<collection name="telephonyapps" long-name="Telephony Apps" level="apps1"/>
-<collection name="networkingapps" long-name="Networking Apps" level="apps1"/>
-<collection name="networkingutils" long-name="Networking Utils" level="utils"/>
-<collection name="shortlinkapps" long-name="Shortlink Apps" level="apps1"/>
-<collection name="testapps" long-name="Test Apps" level="utils"/>
-<collection name="avapps" long-name="A/V Apps" level="apps3"/>
-<collection name="toolkit" long-name="Toolkit" level="utils"/>
-<collection name="techview_info" long-name="Techview Info" level="apps3">
-<component name="techview_metadata" long-name="Techview Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/techview/techview_info/techview_metadata/techview_metadata.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
--- a/symbian3/single/sysdefs/auto/model_20100504170201_730e85656f7d.xml Wed May 05 12:21:47 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10736 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a package or prebuilt -->
-<!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) "N"
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile may someday be removed in favour of mrp -->
-<!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
-<systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="low mw high">
-<block name="stubs" level="high" long-name="Stubs" levels="stub">
-<collection name="s60_stubs" level="stub">
-<component name="audiostubs" long-name="Audio Stubs">
-<unit bldFile="adaptation/stubs/audiostubs/group"/>
-</component>
-<component name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaptation Stub">
-<unit bldFile="adaptation/stubs/btaudioadaptation_stub/group"/>
-</component>
-<component name="drm_stubs" long-name="DRM Stubs">
-<unit bldFile="adaptation/stubs/drm_stubs/group"/>
-</component>
-<component name="ocrsrv_stub" long-name="OCR Services Stub">
-<unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
-</component>
-<component name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation">
-<unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
-</component>
-<component name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" plugin="Y">
-<unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
-</component>
-<component name="srsfenginestub" long-name="SRSF Engine Stub">
-<unit bldFile="adaptation/stubs/srsfenginestub/group"/>
-</component>
-<component name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub">
-<unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
-</component>
-<component name="systemswstubs" long-name="System Software Stubs">
-<unit bldFile="adaptation/stubs/systemswstubs/group"/>
-</component>
-<component name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" plugin="Y">
-<unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
-</component>
-<component name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub">
-<unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
-<collection name="omap3530" long-name="OMAP 3530" level="hw-if">
-<component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530" mrp="adaptation/beagleboard/omap3530/base_beagle.mrp"/>
-</component>
-<component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/kernel"/>
-</component>
-<component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/beagleboard"/>
-</component>
-</collection>
-</block>
-<block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
-<collection name="qemu_baseport" long-name="Baseport" level="hw-if">
-<component name="syborg" long-name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/qemu/baseport/syborg" mrp="adaptation/qemu/baseport/syborg/syborg.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
-<collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
-<component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
-<unit mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
-</component>
-</collection>
-<collection name="bsptemplate" long-name="Board Support Package Template" level="hw-if">
-<component name="asspandvariant" long-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 name="kernel" long-name="Kernel Architecture" level="adaptation">
-<component name="eka" long-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 name="kerneltest" long-name="Kernel Test" level="hw-if">
-<component name="e32utils" long-name="E32 Utilities" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32utils/group" mrp="os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/>
-</component>
-<component name="e32test" long-name="E32 Tests" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32test/group" mrp="os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
-</component>
-<component name="f32test" long-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 name="ldds" long-name="Logical Device Drivers" level="adaptation">
-<component name="ethernetldd" long-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 name="audioldd" long-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>
-<component name="serialldd" long-name="Serial Port Drivers" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
-</component>
-<component name="legacydrivers" long-name="Legacy Drivers" purpose="optional">
-<unit mrp="os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
-</component>
-<component name="locmedia" long-name="Local Media Subsystem" introduced="8.1b" purpose="mandatory">
-<!-- these are LDDs for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
-</component>
-<component name="runmodedebugger" long-name="Run Mode Debugger" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/debug/group" mrp="os/kernelhwsrv/kernel/eka/drivers/debug/group/base_e32_drivers_debug.mrp"/>
-</component>
-<component name="btrace" long-name="Kernel Trace Tool" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/trace" mrp="os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
-</component>
-<component name="cameraldd" long-name="Camera Drivers" introduced="^3" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/camerasc" mrp="os/kernelhwsrv/kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
-</component>
-<component name="displayldd" long-name="Display Drivers" introduced="^3" purpose="optional">
-<!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/display" mrp="os/kernelhwsrv/kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
-</component>
-<component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
-</component>
-</collection>
-<collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
-<component name="mediadrivers" long-name="Media Drivers" purpose="optional">
-<!-- these are for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/media" mrp="os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
-</component>
-<component name="genericboardsupport" long-name="Generic Board Support" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
-</component>
-</collection>
-<collection name="userlibandfileserver" long-name="User Library and File Server" level="framework">
-<component name="euser" long-name="User Library" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/euser" mrp="os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
-</component>
-<component name="compsupp" long-name="Compiler Runtime Support" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/compsupp" mrp="os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
-</component>
-<component name="fileserver" long-name="File Server" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
-</component>
-<component name="estart" long-name="Base Starter" filter="gt" purpose="optional">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
-</component>
-<component name="domainmgr" long-name="Domain Manager" introduced="8.1b" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
-</component>
-</collection>
-<collection name="filesystems" long-name="File Systems" level="framework">
-<component name="romfs" long-name="ROM File System" filter="gt" purpose="optional" plugin="Y">
-<unit mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
-</component>
-<component name="rofs" long-name="ROFS" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
-</component>
-<component name="usbmsfs" long-name="USB Mass Storage File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
-</component>
-<component name="usbhostmssrv" long-name="USB Host Mass Storage Server" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage/base_f32_shostmassstorage.mrp"/>
-</component>
-<component name="fat32fs" long-name="FAT32 File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
-</component>
-<component name="fatfs" long-name="FAT File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
-</component>
-<component name="compfs" long-name="Composite File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
-</component>
-</collection>
-<collection name="halservices" long-name="HAL Services" level="framework">
-<component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
-<unit bldFile="os/kernelhwsrv/halservices/hal" mrp="os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
-</component>
-</collection>
-<collection name="textmodeshell" long-name="Text Mode Shell" level="test">
-<component name="e32wsrv" long-name="Text Window Server" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/ewsrv" mrp="os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
-</component>
-<component name="textshell" long-name="Text Shell" filter="gt" purpose="development">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
-</component>
-</collection>
-<collection name="baseapitest" long-name="Base API Tests" level="test"/>
-<collection name="kernelhwsrv_info" long-name="Kernel and Hardware Services Info" level="test">
-<component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 config">
-<collection name="emulator" long-name="Emulator" level="bsp">
-<component name="emulatorbsp" long-name="Emulator BSP" purpose="optional">
-<unit bldFile="os/boardsupport/emulator/emulatorbsp" mrp="os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
-</component>
-</collection>
-<collection name="haitest" long-name="HAI Test Suites" level="test">
-<component name="bspsvs" long-name="BSP Verification Suite" introduced="^2" purpose="development">
-<unit mrp="os/boardsupport/haitest/bspsvs/group/bspsvs.mrp"/>
-</component>
-</collection>
-<collection name="boardsupport_info" long-name="Board Support Info" level="config">
-<component name="boardsupport_metadata" long-name="Board Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/boardsupport/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
-<collection name="bldsystemtools" long-name="Build System Tools" level="bld">
-<component name="sysdeftools" long-name="System Definition Tools" purpose="development" introduced="^2">
-<unit mrp="os/buildtools/bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
-</component>
-<component name="commonbldutils" long-name="Common Utils" purpose="development">
-<unit mrp="os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
-</component>
-</collection>
-<collection name="toolsandutils" long-name="Tools and Utils" level="mw">
-<component name="productionbldtools" long-name="Production Build Tools" filter="gt" purpose="development">
-<unit mrp="os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
-</component>
-<component name="e32tools" long-name="E32 Tools" deprecated="^2" purpose="development" class="PC">
-<unit bldFile="os/buildtools/toolsandutils/e32tools/group" mrp="os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
-</component>
-<component name="autotest" long-name="Autotest" purpose="development">
-<unit bldFile="os/buildtools/toolsandutils/autotest/group" mrp="os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
-</component>
-</collection>
-<collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
-<component name="e32toolp" long-name="E32 Perl Tools" purpose="development" filter="sf_build" class="PC">
-<unit mrp="os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="os/buildtools/sbsv1_os/e32toolp/group"/>
-</component>
-</collection>
-<collection name="imgtools_os" long-name="Image Tools" level="fw">
-<component name="romkiteka2" long-name="ROMKIT EKA2" deprecated="^2" purpose="development">
-<unit bldFile="os/buildtools/imgtools_os/romkiteka2/group" mrp="os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
-</component>
-</collection>
-<collection name="misccomponents" long-name="Misc Components" level="mw">
-<component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt" purpose="development">
-<unit bldFile="os/buildtools/misccomponents/emulatorlauncher/group" mrp="os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
-</component>
-</collection>
-<collection name="buildtools_info" long-name="Build Tools Info" level="ui">
-<component name="buildtools_metadata" long-name="Build Tools Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/buildtools/buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
-<collection name="ossrv_pub" long-name="Generic OS Services Public Interfaces" level="utilities">
-<component name="boost_apis" long-name="Boost APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/boost_apis/group"/>
-</component>
-<component name="cpp_wrappers" long-name="Cpp wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cpp_wrappers/group"/>
-</component>
-<component name="character_type_apis" long-name="Character Type APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/character_type_apis/group"/>
-</component>
-<component name="compiler_specific_runtime_support" long-name="Compiler Specific Runtime Support" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/compiler_specific_runtime_support/group"/>
-</component>
-<component name="ossrv_configuration_api" long-name="Generic OS Services Configuration API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/configuration/group"/>
-</component>
-<component name="crypto_authentication_codes_and_hash_functions_api" long-name="Crypto Authentication Codes and Hash Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
-</component>
-<component name="crypto_auxillary_functions_api" long-name="Crypto Auxillary Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_auxillary_functions_api/group"/>
-</component>
-<component name="crypto_certificates_api" long-name="Crypto Certificates API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_certificates_api/group"/>
-</component>
-<component name="crypto_inputoutput_and_data_encoding_api" long-name="Crypto Input/Output and Data Encoding API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
-</component>
-<component name="crypto_public_key_cryptography_and_key_agreement_api" long-name="Crypto Public Key Cryptography and Key Agreement API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
-</component>
-<component name="crypto_symmetric_ciphers_api" long-name="Crypto Symmetric Ciphers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_symmetric_ciphers_api/group"/>
-</component>
-<component name="crypto_utility_functions_api" long-name="Crypto Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_utility_functions_api/group"/>
-</component>
-<component name="cryptogaphy_related_api" long-name="Cryptogaphy Related API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cryptogaphy_related_api/group"/>
-</component>
-<component name="ossrv_debug_api" long-name="Generic OS Services Debug API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/debug/group"/>
-</component>
-<component name="ossrv_exceptions_api" long-name="Generic OS Services Exceptions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/exceptions/group"/>
-</component>
-<component name="gboxed" long-name="GBoxed API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gboxed/group"/>
-</component>
-<component name="glib_arrays" long-name="Glib Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_arrays/group"/>
-</component>
-<component name="glib_asynchronous_queues" long-name="Glib Asynchronous Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_asynchronous_queues/group"/>
-</component>
-<component name="glib_atomic_operations" long-name="Glib Atomic Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_atomic_operations/group"/>
-</component>
-<component name="glib_automatic_string_completion" long-name="Glib Automatic String Completion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_automatic_string_completion/group"/>
-</component>
-<component name="glib_balanced_binary_trees" long-name="Glib Balanced Binary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_balanced_binary_trees/group"/>
-</component>
-<component name="glib_basic_types" long-name="Glib Basic Types API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_basic_types/group"/>
-</component>
-<component name="glib_caches" long-name="Glib Caches API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_caches/group"/>
-</component>
-<component name="glib_character_set_conversion" long-name="Glib Character Set Conversion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_character_set_conversion/group"/>
-</component>
-<component name="glib_closures" long-name="Glib Closures API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_closures/group"/>
-</component>
-<component name="glib_commandline_option_parser" long-name="Glib Command Line Option Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_commandline_option_parser/group"/>
-</component>
-<component name="glib_datasets" long-name="Glib Datasets API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_datasets/group"/>
-</component>
-<component name="glib_date_and_time_functions" long-name="Glib Date and Time Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_date_and_time_functions/group"/>
-</component>
-<component name="glib_doubleended_queues" long-name="Glib Double-ended Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doubleended_queues/group"/>
-</component>
-<component name="glib_doublylinked_lists" long-name="Glib Doubly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doublylinked_lists/group"/>
-</component>
-<component name="glib_dynamic_loading_of_modules" long-name="Glib Dynamic Loading of Modules API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_dynamic_loading_of_modules/group"/>
-</component>
-<component name="glib_enums_and_flags" long-name="Glib Enums and Flags API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_enums_and_flags/group"/>
-</component>
-<component name="glib_error_reporting" long-name="Glib Error Reporting API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_error_reporting/group"/>
-</component>
-<component name="glib_file_utilities" long-name="Glib File Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_file_utilities/group"/>
-</component>
-<component name="glib_generic_values" long-name="Glib Generic Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_generic_values/group"/>
-</component>
-<component name="glib_globstyle_pattern_matching" long-name="Glib Glob-Style Pattern Matching API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_globstyle_pattern_matching/group"/>
-</component>
-<component name="glib_hash_tables" long-name="Glib Hash Tables API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hash_tables/group"/>
-</component>
-<component name="glib_hook_functions" long-name="Glib Hook Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hook_functions/group"/>
-</component>
-<component name="glib_internationalization" long-name="Glib Internationalization API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_internationalization/group"/>
-</component>
-<component name="glib_io_channels" long-name="Glib I/O Channels API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_io_channels/group"/>
-</component>
-<component name="glib_keyvalue_file_parser" long-name="Glib Key-Value File Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_keyvalue_file_parser/group"/>
-</component>
-<component name="glib_lexical_scanner" long-name="Glib Lexical Scanner API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_lexical_scanner/group"/>
-</component>
-<component name="glib_main_event_loop" long-name="Glib Main Event Loop API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_main_event_loop/group"/>
-</component>
-<component name="glib_memory_allocation" long-name="Glib Memory Allocation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_allocation/group"/>
-</component>
-<component name="glib_memory_slices" long-name="Glib Memory Slices API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_slices/group"/>
-</component>
-<component name="glib_message_logging" long-name="Glib Message Logging API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_message_logging/group"/>
-</component>
-<component name="glib_miscellaneous_utility_functions" long-name="Glib Miscellaneous Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_miscellaneous_utility_functions/group"/>
-</component>
-<component name="glib_nary_trees" long-name="Glib N-ary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_nary_trees/group"/>
-</component>
-<component name="glib_parameters_and_values" long-name="Glib Parameters and Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_parameters_and_values/group"/>
-</component>
-<component name="glib_quarks" long-name="Glib Quarks API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_quarks/group"/>
-</component>
-<component name="glib_random_numbers" long-name="Glib Random Numbers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_random_numbers/group"/>
-</component>
-<component name="glib_relations_and_tuples" long-name="Glib Relations and Tuples API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_relations_and_tuples/group"/>
-</component>
-<component name="glib_shellrelated_utilities" long-name="Glib Shell-related Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_shellrelated_utilities/group"/>
-</component>
-<component name="glib_signals" long-name="Glib Signals API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_signals/group"/>
-</component>
-<component name="glib_simple_xml_subset_parser" long-name="Glib Simple XML Subset Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_simple_xml_subset_parser/group"/>
-</component>
-<component name="glib_singlylinked_lists" long-name="Glib Singly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_singlylinked_lists/group"/>
-</component>
-<component name="glib_spawning_processes" long-name="Glib Spawning Processes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_spawning_processes/group"/>
-</component>
-<component name="glib_standard_macros" long-name="Glib Standard Macros API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_standard_macros/group"/>
-</component>
-<component name="glib_string_utility_functions" long-name="Glib String Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_string_utility_functions/group"/>
-</component>
-<component name="glib_strings" long-name="Glib Strings API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_strings/group"/>
-</component>
-<component name="glib_thread_pools" long-name="Glib Thread Pools API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_thread_pools/group"/>
-</component>
-<component name="glib_threads" long-name="Glib Threads API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_threads/group"/>
-</component>
-<component name="glib_timers" long-name="Glib Timers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_timers/group"/>
-</component>
-<component name="glib_unicode_manipulation" long-name="Glib Unicode Manipulation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_unicode_manipulation/group"/>
-</component>
-<component name="glib_value_arrays" long-name="Glib Value Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_value_arrays/group"/>
-</component>
-<component name="glib_varargs_value_collection" long-name="Glib Varargs Value Collection API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_varargs_value_collection/group"/>
-</component>
-<component name="gobject" long-name="GObject API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gobject/group"/>
-</component>
-<component name="gparamspec" long-name="GParamSpec API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gparamspec/group"/>
-</component>
-<component name="gtype" long-name="GType API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtype/group"/>
-</component>
-<component name="gtypemodule" long-name="GTypeModule API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypemodule/group"/>
-</component>
-<component name="gtypeplugin" long-name="GTypePlugin API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypeplugin/group"/>
-</component>
-<component name="io_stream_api" long-name="I/O stream API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/io_stream_api/group"/>
-</component>
-<component name="localization_function_api" long-name="Localization Function API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/localization_function_api/group"/>
-</component>
-<component name="math_operations_api" long-name="Math Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/math_operations_api/group"/>
-</component>
-<component name="ossrv_memory_api" long-name="Generic OS Services Memory API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/memory/group"/>
-</component>
-<component name="no_namespace_headers" long-name="No Namespace Headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/no_namespace_headers/group"/>
-</component>
-<component name="openc_headers" long-name="OpenC headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_headers/group"/>
-</component>
-<component name="openc_wrappers" long-name="OpenC wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_wrappers/group"/>
-</component>
-<component name="ssl_general_api" long-name="SSL General API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_general_api/group"/>
-</component>
-<component name="ssl_protocol_methods_api" long-name="SSL Protocol Methods API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_protocol_methods_api/group"/>
-</component>
-<component name="standard_compressiondecompression_api" long-name="Standard Compression/Decompression API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/standard_compressiondecompression_api/group"/>
-</component>
-<component name="stl" long-name="STL API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/stl/group"/>
-</component>
-<component name="thread_api" long-name="Thread API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/thread_api/group"/>
-</component>
-<component name="type_attributes" long-name="Type Attributes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/type_attributes/group"/>
-</component>
-<component name="typeinfo" long-name="Type Info API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/typeinfo/group"/>
-</component>
-<component name="utility_apis" long-name="Utility APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/utility_apis/group"/>
-</component>
-<component name="wide_character_classapis" long-name="Wide character class/apis" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/wide_character_classapis/group"/>
-</component>
-<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">
-<unit bldFile="os/ossrv/ossrv_pub/dbus-glib/group"/>
-</component>
-</collection>
-<collection name="ossrv_plat" long-name="Generic OS Services Platform Interfaces" level="utilities">
-<component name="libutils_apis" long-name="Utility Library APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_plat/libutils/group"/>
-</component>
-</collection>
-<collection name="stdlibs" long-name="Standard Libraries" level="translation">
-<component name="libz" filter="s60" long-name="Z Compression Library">
-<unit bldFile="os/ossrv/stdlibs/libz/group"/>
-</component>
-<component name="libcrypt" filter="s60" long-name="Crypt Library">
-<unit bldFile="os/ossrv/stdlibs/libcrypt/group"/>
-</component>
-</collection>
-<collection name="ssl" long-name="SSL" level="data-services">
-<component name="libcrypto" filter="s60" long-name="Crypto Library">
-<unit bldFile="os/ossrv/ssl/libcrypto/group"/>
-</component>
-<component name="libssl" filter="s60" purpose="development" long-name="SSL Library">
-<unit bldFile="os/ossrv/ssl/libssl/group"/>
-</component>
-</collection>
-<collection name="glib" long-name="GLib" level="utilities">
-<component name="glibbackend" filter="s60" long-name="GLib Backend">
-<unit bldFile="os/ossrv/glib/glibbackend/group"/>
-</component>
-<component name="libglib" filter="s60" long-name="GLib Library">
-<unit bldFile="os/ossrv/glib/libglib/group"/>
-</component>
-<component name="libgthread" filter="s60" long-name="Libg Thread">
-<unit bldFile="os/ossrv/glib/libgthread/group"/>
-</component>
-<component name="libgmodule" filter="s60" long-name="Libg Module">
-<unit bldFile="os/ossrv/glib/libgmodule/group"/>
-</component>
-<component name="libgobject" filter="s60" long-name="Libg Object">
-<unit bldFile="os/ossrv/glib/libgobject/group"/>
-</component>
-</collection>
-<collection name="stdcpp" long-name="C++ Standard Library" level="translation">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="stdcpp_build" filter="s60" long-name="Stdcpp">
-<unit bldFile="os/ossrv/stdcpp/group"/>
-</component>
-</collection>
-<collection name="ofdbus" long-name="Open Foundation D-Bus" level="utilities">
-<component name="dbus" filter="s60" long-name="D-Bus">
-<unit bldFile="os/ossrv/ofdbus/dbus/group"/>
-</component>
-<component name="dbus-glib" filter="s60" long-name="D-Bus GLib">
-<unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
-</component>
-<component name="ofdbus_rom" filter="s60" long-name="D-Bus ROM">
-<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory
- Consider moving IBY file to one of the above as well and removing this component entirely -->
-<unit bldFile="os/ossrv/ofdbus/group"/>
-</component>
-</collection>
-<collection name="utilitylibraries" long-name="Utility Libraries" level="encoding">
-<component name="libutils" filter="s60" long-name="Utility Library">
-<unit bldFile="os/ossrv/utilitylibraries/libutils/group"/>
-</component>
-</collection>
-<collection name="genericservices" long-name="Generic Services" level="utilities">
-<component name="s60compatibilityheaders" long-name="S60 Compatibility Headers" filter="gt" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp" version="tb101sf"/>
-</component>
-<component name="mimerecognitionfw" long-name="MIME Recognition Framework" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/mimerecognitionfw/group" mrp="os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
-</component>
-<component name="systemagent" long-name="System Agent" introduced="9.0" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/systemagent/group" mrp="os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
-</component>
-<component name="taskscheduler" long-name="Task Scheduler" introduced="6.0" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/taskscheduler/group" mrp="os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
-</component>
-<component name="activebackupclient" long-name="Active Backup Client" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/activebackupclient/group" mrp="os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
-</component>
-<component name="syslibsdocs" long-name="Syslibs Documentation" purpose="development" class="doc">
-<unit mrp="os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
-</component>
-<component name="httputils" long-name="HTTP Utilities Library" introduced="6.2" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/httputils/group" mrp="os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
-</component>
-</collection>
-<collection name="syslibsapitest" long-name="SysLibs API Tests" level="utilities"/>
-<collection name="compressionlibs" long-name="Compression Libraries" level="data-services">
-<component name="ziplib" long-name="Zip Compression Library" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/ossrv/compressionlibs/ziplib/group" mrp="os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
-</component>
-</collection>
-<collection name="genericopenlibs" long-name="Generic Open Libraries" level="translation">
-<component name="cstdlib" long-name="C Standard Library" introduced="ER5" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/cstdlib/group" mrp="os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
-</component>
-<component name="cppstdlib" long-name="C++ Standard Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/cppstdlib/group" mrp="os/ossrv/genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
-</component>
-<component name="openenvcore" long-name="Open Environment Core" introduced="^2" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/openenvcore/group" mrp="os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
-</component>
-<component name="posixrealtimeextensions" long-name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/posixrealtimeextensions/group" mrp="os/ossrv/genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
-</component>
-</collection>
-<collection name="lowlevellibsandfws" long-name="Low Level Libraries and Frameworks" level="app-libs">
-<component name="pluginfw" long-name="Plugin Framework" introduced="6.2" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp" version="3"/>
-</component>
-<component name="apputils" long-name="Application Utilities" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/apputils/group" mrp="os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
-</component>
-<component name="genericusabilitylib" long-name="Generic Usability Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/genericusabilitylib/group" mrp="os/ossrv/lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
-</component>
-</collection>
-<collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
-<component name="ossrv_build" filter="s60" long-name="Generic OS Services Build">
-<!-- exports should be moved to individual components -->
-<unit bldFile="os/ossrv/group"/>
-</component>
-<component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="featuremgmt" long-name="Feature Management" level="framework">
-<component name="featuremgr" long-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 name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/persistentdata/featuremgmt/featureregistry/group" mrp="os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
-</component>
-</collection>
-<collection name="loggingservices" long-name="Logging Services" level="server">
-<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">
-<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">
-<unit bldFile="os/persistentdata/loggingservices/rfilelogger/group" mrp="os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
-</component>
-</collection>
-<collection name="traceservices" long-name="Trace Services" level="server">
-<component name="commsdebugutility" long-name="Comms Debug Utility" introduced="7.0s" purpose="optional">
-<unit bldFile="os/persistentdata/traceservices/commsdebugutility/group" mrp="os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
-</component>
-<component name="tracefw" long-name="Trace Framework" introduced="9.2" purpose="development">
-<unit bldFile="os/persistentdata/traceservices/tracefw/ulogger/group" mrp="os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
-</component>
-</collection>
-<collection name="persistentstorage" long-name="Persistent Storage" level="framework">
-<component name="store" long-name="Store" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/store/group" mrp="os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
-</component>
-<component name="dbms" long-name="DBMS" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/dbms/group" mrp="os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
-</component>
-<component name="centralrepository" long-name="Central Repository" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/persistentdata/persistentstorage/centralrepository/group" mrp="os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
-</component>
-<component name="sql" long-name="SQL" introduced="9.3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sql/GROUP" mrp="os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
-</component>
-<component name="sqlite3api" long-name="SQLite 3 API" introduced="^3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sqlite3api/GROUP" mrp="os/persistentdata/persistentstorage/sqlite3api/GROUP/syslibs_sqlite3.mrp"/>
-</component>
-</collection>
-<collection name="persistentdata_info" long-name="Persistent Data Services Info" level="app-if">
-<component name="persistentdata_metadata" long-name="Persistent Data Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/persistentdata/persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
-<component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
-</component>
-<component name="common_platform_security_definitions_api" long-name="Common Platform Security Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group"/>
-</component>
-<component name="feature_discovery_api" long-name="Feature Discovery API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/group"/>
-</component>
-<component name="platform_environment_api" long-name="Platform Environment API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_environment_api/group"/>
-</component>
-<component name="sensor_channel_api" long-name="Sensor Channel API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_channel_api/group"/>
-</component>
-<component name="sensor_definitions_api" long-name="Sensor Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_definitions_api/group"/>
-</component>
-<component name="version_info_api" long-name="Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/group"/>
-</component>
-<component name="accessory_monitoring_api" long-name="Accessory Monitoring API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/group"/>
-</component>
-<component name="haptics_api" long-name="Haptics API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/haptics_api/group"/>
-</component>
-<component name="sensor_data_compensator_api" long-name="Sensor Data Compensator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
-</component>
-</collection>
-<collection name="devicesrv_plat" long-name="Device Services Platform Interfaces" level="app-if">
-<component name="configuration_file_parser_api" long-name="Configuration File Parser API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/configuration_file_parser_api/group"/>
-</component>
-<component name="dos_extension_plugin_api" long-name="DOS Extension Plug-In API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_plugin_api/group"/>
-</component>
-<component name="mediator_command_initiator_api" long-name="Mediator Command Initiator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_initiator_api/group"/>
-</component>
-<component name="syslangutil_api" long-name="SysLangUtil API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/syslangutil_api/group"/>
-</component>
-<component name="wakeup_alarm_api" long-name="Wakeup Alarm API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/wakeup_alarm_api/group"/>
-</component>
-<component name="disk_and_memory_level_keys_api" long-name="Disk and Memory Level Keys API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_and_memory_level_keys_api/group"/>
-</component>
-<component name="mediator_plugin_api" long-name="Mediator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_plugin_api/group"/>
-</component>
-<component name="headset_status_api" long-name="Headset Status API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/headset_status_api/group"/>
-</component>
-<component name="system_startup_extension_plugin_api" long-name="System Startup Extension Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/system_startup_extension_plugin_api/group"/>
-</component>
-<component name="sensor_plugin_api" long-name="Sensor Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_plugin_api/group"/>
-</component>
-<component name="accessory_api" long-name="Accessory API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_api/group"/>
-</component>
-<component name="display_language_definition_api" long-name="Display Language Definition API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/display_language_definition_api/group"/>
-</component>
-<component name="mediator_command_responder_api" long-name="Mediator Command Responder API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_responder_api/group"/>
-</component>
-<component name="accessory_policy_definitions_api" long-name="Accessory Policy Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_definitions_api/group"/>
-</component>
-<component name="hw_settings_api" long-name="Hardware Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/hw_settings_api/group"/>
-</component>
-<component name="mediator_domain_definitions_api" long-name="Mediator Domain Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_domain_definitions_api/group"/>
-</component>
-<component name="sensor_extension_api" long-name="Sensor Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_extension_api/group"/>
-</component>
-<component name="accessory_plugin_api" long-name="Accessory Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_plugin_api/group"/>
-</component>
-<component name="sae_api" long-name="SAE API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sae_api/group"/>
-</component>
-<component name="accessory_control_api" long-name="Accessory Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_control_api/group"/>
-</component>
-<component name="mediator_static_registration_api" long-name="Mediator Static Registration API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_static_registration_api/group"/>
-</component>
-<component name="accessory_key_event_handling_api" long-name="Accessory Key Event Handling API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_key_event_handling_api/group"/>
-</component>
-<component name="mediator_notification_api" long-name="Mediator Notification API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_notification_api/group"/>
-</component>
-<component name="accessory_policy_utility_api" long-name="Accessory Policy Utility API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_utility_api/group"/>
-</component>
-<component name="common_dsy_plugin_api" long-name="Common DSY Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/common_dsy_plugin_api/group"/>
-</component>
-<component name="remote_control_extension_api" long-name="Remote Control Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/remote_control_extension_api/group"/>
-</component>
-<component name="sensor_channel_filter_api" long-name="Sensor Channel Filter API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_channel_filter_api/group"/>
-</component>
-<component name="dos_extension_api" long-name="DOS Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_api/group"/>
-</component>
-<component name="accessory_audio_control_api" long-name="Accessory Audio Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_audio_control_api/group"/>
-</component>
-<component name="mediator_event_consumer_api" long-name="Mediator Event Consumer API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_consumer_api/group"/>
-</component>
-<component name="shared_data_api" long-name="Shared Data API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/shared_data_api/group"/>
-</component>
-<component name="accessory_settings_api" long-name="Accessory Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_settings_api/group"/>
-</component>
-<component name="accessory_bluetooth_control_api" long-name="Accessory Bluetooth Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_bluetooth_control_api/group"/>
-</component>
-<component name="extended_version_info_api" long-name="Extended Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_api/group"/>
-</component>
-<component name="mediator_event_provider_api" long-name="Mediator Event Provider API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_provider_api/group"/>
-</component>
-<component name="tv_out_config_api" long-name="TV Out Config API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_config_api/group"/>
-</component>
-<component name="tspclientmapper_api" long-name="TSP Client Mapper API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tspclientmapper_api/group"/>
-</component>
-<component name="powersave_api" long-name="Power Save API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_api/group"/>
-</component>
-<component name="powersave_definitions_api" long-name="Power Save Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_definitions_api/group"/>
-</component>
-<component name="powersave_plugin_api" long-name="Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_plugin_api/group"/>
-</component>
-<component name="extended_version_info_plugin_api" long-name="Extended Version Info Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_plugin_api/group"/>
-</component>
-<component name="haptics_plugin_api" long-name="Haptics Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_plugin_api/group"/>
-</component>
-<component name="haptics_effect_data_getter_plugin_api" long-name="Haptics Effect Data Getter Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
-</component>
-<component name="haptics_packetizer_plugin_api" long-name="Haptics Packetizer Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_packetizer_plugin_api/group"/>
-</component>
-<component name="tiltcompensation_api" long-name="Tilt Compensation API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tiltcompensation_api/group"/>
-</component>
-<component name="disk_notification_handler_api" long-name="Disk Notification Handler API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_notification_handler_api/group"/>
-</component>
-<component name="accessory_policy_usb_audio_api" long-name="Accessory Policy USB Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_usb_audio_api/group"/>
-</component>
-<component name="accessory_policy_hdmi_audio_api" long-name="Accessory Policy HDMI Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_hdmi_audio_api/group"/>
-</component>
-<component name="sensor_data_compensator_plugin_api" long-name="Sensor Data Compensator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
-</component>
-<component name="ddc_access_api" long-name="DDC Access API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/ddc_access_api/group"/>
-</component>
-<component name="tv_out_behaviour_api" long-name="TV Out Behaviour API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_behaviour_api/group"/>
-</component>
-</collection>
-<collection name="accessoryservices" long-name="Accessory Services" level="framework">
-<component name="accessorymonitor" filter="s60" long-name="Accessory Monitor">
-<unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/group"/>
-</component>
-<component name="accessoryremotecontrol" filter="s60" long-name="Accessory Remote Control">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
-</component>
-<component name="accessoryserver" filter="s60" long-name="Accessory Server">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryserver/group"/>
-</component>
-<component name="pluggeddisplay" filter="s60" long-name="Plugged Display" introduced="^3">
-<unit bldFile="os/devicesrv/accessoryservices/pluggeddisplay/group"/>
-</component>
-<component name="headsetstatusapi" filter="s60" long-name="Headset Status API">
-<unit bldFile="os/devicesrv/accessoryservices/headsetstatusapi/group"/>
-</component>
-<component name="tspclientmapper" filter="s60" long-name="TSP Client Mapper">
-<unit bldFile="os/devicesrv/accessoryservices/tspclientmapper/group"/>
-</component>
-<component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional">
-<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
-</component>
-<component name="gid_pc_tool" filter="s60" long-name="Generic ID PC Tool" class="tool PC">
-<unit bldFile="os/devicesrv/accessoryservices/gid_pc_tool/group"/>
-</component>
-</collection>
-<collection name="commonservices" long-name="Common Services" level="app-if">
-<component name="commonengine" filter="s60" long-name="Common Engine">
-<unit bldFile="os/devicesrv/commonservices/commonengine/group"/>
-</component>
-<component name="commonengineresources" filter="s60" long-name="Common Engine Resources" class="config">
-<unit bldFile="os/devicesrv/commonservices/commonengineresources/group"/>
-</component>
-<component name="platformenv" filter="s60" long-name="Platform Environment">
-<unit bldFile="os/devicesrv/commonservices/platformenv/group"/>
-</component>
-<component name="sysutil" long-name="System Utilities" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/sysutil/group" mrp="os/devicesrv/commonservices/sysutil/group/sysutil.mrp"/>
-</component>
-<component name="activitymanager" long-name="Activity Manager" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/activitymanager/group" mrp="os/devicesrv/commonservices/activitymanager/group/activitymanager.mrp"/>
-</component>
-</collection>
-<collection name="dosservices" long-name="Domestic Operating System Services" level="hw-if">
-<component name="commondsy" filter="s60" long-name="Common DSY" plugin="Y">
-<unit bldFile="os/devicesrv/dosservices/commondsy/group"/>
-</component>
-<component name="dosserver" filter="s60" long-name="Domestic OS Server">
-<unit bldFile="os/devicesrv/dosservices/dosserver/group"/>
-</component>
-</collection>
-<collection name="sensorservices" long-name="Sensor Services" level="framework">
-<component name="sensorserver" filter="s60" long-name="Sensor Server">
-<unit bldFile="os/devicesrv/sensorservices/sensorserver/group"/>
-</component>
-<component name="orientationssy" filter="s60" long-name="Orientation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/orientationssy/group"/>
-</component>
-<component name="tiltcompensationssy" filter="s60" long-name="Tilt Compensation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/tiltcompensationssy/group"/>
-</component>
-<component name="sensordatacompensator" filter="s60" long-name="Sensor Data Compensator">
-<unit bldFile="os/devicesrv/sensorservices/sensordatacompensator/group"/>
-</component>
-</collection>
-<collection name="hwrmhaptics" long-name="HWRM Haptics" level="plugin">
-<component name="hapticseffectdatagetterfw" filter="s60" long-name="Haptics Effect Data Getter Framework">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
-</component>
-<component name="hapticspluginservice" filter="s60" long-name="Haptics Plugin Service">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
-</component>
-<component name="hapticspacketizer" filter="s60" long-name="Haptics Packetizer">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
-</component>
-<component name="hapticspluginmanager" filter="s60" long-name="Haptics Plugin Manager">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
-</component>
-<component name="hapticsserver" filter="s60" long-name="Haptics Server">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsserver/group"/>
-</component>
-<component name="hapticsclient" filter="s60" long-name="Haptics Client">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsclient/group"/>
-</component>
-<component name="hwrmhaptics_build" filter="s60" long-name="HWRM Haptics Build">
-<!-- move these exports into the appropriate above components and delete this component-->
-<unit bldFile="os/devicesrv/hwrmhaptics/group"/>
-</component>
-</collection>
-<collection name="mediator" long-name="Mediator" level="app-if">
-<!--collection is really a component. Move it down a directory -->
-<component name="mediator_build" filter="s60" long-name="Mediator Build">
-<unit bldFile="os/devicesrv/mediator/group"/>
-</component>
-</collection>
-<collection name="psmservices" long-name="Power Save Mode Services" level="app-if">
-<component name="psmserver" filter="s60" long-name="PSM Server">
-<unit bldFile="os/devicesrv/psmservices/psmserver/group"/>
-</component>
-</collection>
-<collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
-<component name="hwrmfmtxwatcherplugin" filter="s60" long-name="HWRM FM Transmitter Watcher Plugin" plugin="Y">
-<unit bldFile="os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
-</component>
-<component name="hwrmtargetmodifierplugin" filter="s60" long-name="HWRM Target Modifier Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build,
- may need to -->
-<!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
-</component>
-<component name="vibractrl" filter="s60" long-name="Vibra Control" deprecated="9.1">
-<unit bldFile="os/devicesrv/resourcemgmt/vibractrl/group"/>
-</component>
-<component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="^2" purpose="optional">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
-</component>
-<component name="hwresourcesmgrconfig" long-name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
-</component>
-<component name="resourcemgmt_build" filter="s60" long-name="Resource Management Build">
-<!-- Move exports to a self-contained component.
- This needs to be kept around until configuration is in place -->
-<unit bldFile="os/devicesrv/resourcemgmt/group"/>
-</component>
-<component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
-</component>
-</collection>
-<collection name="sysstatemgmt" long-name="System State Management" level="server">
-<component name="ssmmapperutility" filter="s60" long-name="SSM Mapper Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmmapperutility/group"/>
-</component>
-<component name="ssmpolicyplugins" filter="s60" long-name="SSM Policy Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmpolicyplugins/group"/>
-</component>
-<component name="ssmutilityplugins" filter="s60" long-name="SSM Utility Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmutilityplugins/group"/>
-</component>
-<component name="ssmcmdlists" filter="s60" long-name="SSM Command Lists" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcmdlists/group"/>
-</component>
-<component name="ssmcustcmds" filter="s60" long-name="SSM Custom Commands" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcustcmds/group"/>
-</component>
-<component name="syslangutil" filter="s60" long-name="System Language Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/syslangutil/group"/>
-</component>
-<component name="sysrestart" filter="s60" long-name="System Restart" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysrestart/group"/>
-</component>
-<component name="sysuiprovider" filter="s60" long-name="System UI Provider" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysuiprovider/group"/>
-</component>
-<component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/group" mrp="os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
-</component>
-<component name="systemstatemgr" long-name="System State Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
-</component>
-<component name="systemstateplugins" long-name="System State Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
-</component>
-<component name="systemstatereferenceplugins" long-name="System State Reference Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
-</component>
-</collection>
-<collection name="resourceinterfaces" long-name="Resource Interfaces" level="hw-if">
-<component name="fmtransmittercontrol" long-name="FM Transmitter Control" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group" mrp="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
-</component>
-</collection>
-<collection name="systemhealthmanagement" long-name="System Health Management" level="server">
-<component name="systemhealthmgr" long-name="System Health Manager" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
-</component>
-</collection>
-<collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if"/>
-<collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
-<component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
-<collection name="authorisation" long-name="Authorisation" level="utilities">
-<component name="userpromptservice" long-name="User Prompt Service" introduced="^3" purpose="mandatory">
-<unit bldFile="os/security/authorisation/userpromptservice/group" mrp="os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
-</component>
-<component name="userpromptutils" long-name="User Prompt Utils" introduced="^3" purpose="optional">
-<unit bldFile="os/security/authorisation/userpromptutils/group" mrp="os/security/authorisation/userpromptutils/group/security_ups_utils.mrp"/>
-</component>
-</collection>
-<collection name="contentmgmt" long-name="Content Management" level="utilities">
-<component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
-<unit bldFile="os/security/contentmgmt/contentaccessfwfordrm/group" mrp="os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
-</component>
-<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>
-</collection>
-<collection name="crypto" long-name="Crypto Libraries" level="libraries">
-<component name="weakcryptospi" long-name="Weak Crypto SPI" filter="gt" introduced="^3" purpose="optional">
-<unit bldFile="os/security/crypto/weakcryptospi/group" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
-</component>
-<component name="strongcryptospi" long-name="Strong Crypto SPI" filter="gt" introduced="^3" purpose="optional">
-<unit bldFile="os/security/crypto/weakcryptospi/strong" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
-</component>
-</collection>
-<collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
-<component name="securityutils" long-name="Security Utils" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/securityutils/group" mrp="os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
-</component>
-<component name="securitydocs" long-name="Security Documentation" purpose="development" class="doc">
-<unit mrp="os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
-</component>
-<component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
-</component>
-<component name="securitycommonutils" long-name="Security Common Utils" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/security/cryptomgmtlibs/securitycommonutils/group" mrp="os/security/cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
-</component>
-</collection>
-<collection name="securityanddataprivacytools" long-name="Security and Data Privacy Tools" level="services">
-<component name="securityconfig" long-name="Security Config" introduced="9.1" purpose="optional">
-<unit bldFile="os/security/securityanddataprivacytools/securityconfig/group" mrp="os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
-</component>
-<component name="securitytools" long-name="Security Tools" introduced="^3" purpose="optional" class="PC">
-<unit bldFile="os/security/securityanddataprivacytools/securitytools/group" mrp="os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
-</component>
-</collection>
-<collection name="cryptoplugins" long-name="Crypto Plugins" level="plugins">
-<component name="cryptospiplugins" long-name="Crypto SPI Plugins" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/security/cryptoplugins/cryptospiplugins/group" mrp="os/security/cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
-</component>
-</collection>
-<collection name="cryptoservices" long-name="Crypto Services" level="plugins">
-<component name="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/certificateandkeymgmt/group" mrp="os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
-</component>
-<component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
-</component>
-<component name="browserrootcertificates" long-name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
-<unit mrp="os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
-</component>
-<component name="rootcertificates" filter="sf_build" long-name="Root Certificates" introduced="7.0s" purpose="optional">
-<!-- not in S60 codebase -->
-<unit bldFile="os/security/cryptoservices/rootcertificates/group" mrp="os/security/cryptoservices/rootcertificates/group/rootcerts.mrp"/>
-</component>
-<component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/asnpkcs/group" mrp="os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
-</component>
-</collection>
-<collection name="security_info" long-name="OS Security Info" level="utilities">
-<component name="security_metadata" long-name="OS Security Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/security/security_info/security_metadata/security_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
-<collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
-<component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
-</component>
-<component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
-</component>
-<component name="simulationpositioningmodule" long-name="Simulation Positioning Module" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
-</component>
-<component name="gpspositioningmodule" long-name="GPS/A-GPS Positioning Module" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/gpspositioningmodule/group" mrp="os/lbs/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
-</component>
-<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>
-</collection>
-<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
-<component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
-</component>
-</collection>
-<collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
-<component name="locationserver" long-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 name="networkrequesthandler" long-name="Network Request Handler" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
-</component>
-</collection>
-<collection name="lbstest" long-name="Locating Services Tests" level="application-interface">
-<component name="locationprotocoltest" long-name="Location Protocol Tests" introduced="9.2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/lbstest/locationprotocoltest/group" mrp="os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
-</component>
-</collection>
-<collection name="locationmgmt" long-name="Location Management" level="management">
-<component name="locmonitor" long-name="Location Monitor" introduced="^3" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
-</component>
-<component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/agpslocationmgr/group" mrp="os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
-</component>
-<component name="networklocationmgr" long-name="Network Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/networklocationmgr/group" mrp="os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
-</component>
-<component name="locationcore" long-name="Location Core" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locationcore/group" mrp="os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
-</component>
-<component name="networkgateway" long-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 name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
-<component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
-</component>
-<component name="suplrrlpasn1" filter="sf_build" long-name="SUPL RRLP ASN1 Parser">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
-</component>
-</collection>
-<collection name="lbsapitest" long-name="Location API Tests" level="application-interface"/>
-<collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
-<component name="lbs_metadata" long-name="Locating Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commsfw" level="services" long-name="Communications Framework" levels="server support framework process app-if">
-<collection name="commsprocess" long-name="Comms Process" level="process">
-<component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/commsfw/commsprocess/commsrootserverconfig/group" mrp="os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
-</component>
-</collection>
-<collection name="commsconfig" long-name="Comms Config" level="process">
-<component name="commsdatabase" long-name="Comms Database" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
-</component>
-<component name="commsdatabaseshim" long-name="Comms Database Shim" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/commsfw/commsconfig/commsdatabaseshim/group" mrp="os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
-</component>
-</collection>
-<collection name="datacommsserver" long-name="Data Comms Server" level="framework">
-<component name="esockserver" long-name="ESock Server" purpose="mandatory">
-<unit bldFile="os/commsfw/datacommsserver/esockserver/group" mrp="os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp" version="3"/>
-</component>
-<component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/group" mrp="os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
-</component>
-<component name="networkingdialogstub" long-name="Networking Dialog Stub" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/default" mrp="os/commsfw/datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
-</component>
-<component name="networkcontroller" long-name="Network Controller" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/datacommsserver/networkcontroller/group" mrp="os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
-</component>
-</collection>
-<collection name="serialserver" long-name="Serial Server" level="server">
-<component name="serialportcsy" long-name="Serial Port CSY" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/serialserver/serialportcsy" mrp="os/commsfw/serialserver/serialportcsy/ser-comms_serialportcsy.mrp"/>
-</component>
-<component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" purpose="development">
-<unit bldFile="os/commsfw/serialserver/packetloopbackcsy/group" mrp="os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
-</component>
-<component name="c32serialserver" long-name="C32 Serial Server" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/commsfw/serialserver/c32serialserver/group" mrp="os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
-</component>
-<component name="c32serialserverconfig" long-name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config">
-<unit bldFile="os/commsfw/serialserver/c32serialserverconfig" mrp="os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
-</component>
-<component name="c32serialserverdocs" long-name="C32 Serial Server Documentation" purpose="development" class="doc">
-<unit mrp="os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
-</component>
-</collection>
-<collection name="commsfwutils" long-name="Comms Framework Utilities" level="framework">
-<component name="commsbufs" long-name="Comms Buffers" introduced="^3" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwutils/commsbufs/group" mrp="os/commsfw/commsfwutils/commsbufs/group/comms-infras_commsbufs.mrp"/>
-</component>
-</collection>
-<collection name="commsfw_info" long-name="Comms Framework Info" level="app-if">
-<component name="commsinfrastructuredocs" long-name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
-<unit mrp="os/commsfw/commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
-</component>
-<component name="commsfw_metadata" long-name="Communications Framework Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/commsfw/commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
-</component>
-</collection>
-<collection name="commsfwsupport" long-name="Comms Framework Support" level="support">
-<component name="commselements" long-name="Comms Elements" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwsupport/commselements/group" mrp="os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
-</component>
-</collection>
-<collection name="commsinfrastructureapitest" long-name="Comms-Infras API Tests" level="app-if">
-<component name="commsinfrastructuresvs" long-name="Comms Infrastructure Verification Suite" introduced="^3" purpose="development">
-<unit mrp="os/commsfw/commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
-</component>
-</collection>
-<collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
-<component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
-</component>
-<component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" purpose="mandatory" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
-</component>
-<component name="commstools" long-name="Comms Tools" introduced="^3" purpose="development" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/commstools/group" mrp="os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
-</component>
-</collection>
-</block>
-<block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
-<component name="internetsockets" long-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>
-<collection name="tcpiputils" long-name="TCP/IP Utilities" level="plugin">
-<component name="dnd" long-name="DND" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/dnd/group" mrp="os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
-</component>
-<component name="dhcp" long-name="DHCP" introduced="8.0" purpose="optional">
-<unit bldFile="os/networkingsrv/tcpiputils/dhcp/group" mrp="os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
-</component>
-<component name="networkaddressandporttranslation" long-name="Network Address and Port Translation" introduced="^2" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
-</component>
-<component name="punycodeconv" long-name="Punycode Converter" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/punycodeconv/group" mrp="os/networkingsrv/tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
-</component>
-</collection>
-<collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
-<component name="nullagt" long-name="NULL AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/nullagt/group" mrp="os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
-</component>
-<component name="genericscprparameters" long-name="Generic SCPR Parameters" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/linklayercontrol/genericscprparameters/group" mrp="os/networkingsrv/linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
-</component>
-<component name="mbmsparameters" long-name="MBMS Parameters" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/mbmsparameters/group" mrp="os/networkingsrv/linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
-</component>
-<component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
-<unit bldFile="os/networkingsrv/linklayercontrol/networkinterfacemgr/group" mrp="os/networkingsrv/linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp" version="2"/>
-</component>
-</collection>
-<collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
-<component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
-</component>
-<component name="pppnif" long-name="PPP NIF" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/pppnif/group" mrp="os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp" version="2"/>
-</component>
-<component name="slipnif" long-name="SLIP NIF" purpose="development" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/slipnif/group" mrp="os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
-</component>
-<component name="tunnelnif" long-name="Tunnel NIF" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
-</component>
-</collection>
-<collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
-<component name="packetlogger" long-name="Packet Logger" introduced="8.1" purpose="development">
-<unit bldFile="os/networkingsrv/linklayerutils/packetlogger/group" mrp="os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
-</component>
-</collection>
-<collection name="networkcontrol" long-name="Network Control" level="plugin">
-<component name="qoslib" long-name="QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/qoslib/group" mrp="os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
-</component>
-<component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/pfqoslib/group" mrp="os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
-</component>
-<component name="qosfwprt" long-name="QoS Framework PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
-</component>
-<component name="qosipscpr" long-name="QoS IP SCPR" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosipscpr/group" mrp="os/networkingsrv/networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
-</component>
-<component name="ipnetworklayer" long-name="IP Network Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/ipnetworklayer/group" mrp="os/networkingsrv/networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
-</component>
-<component name="iptransportlayer" long-name="IP Transport Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/iptransportlayer/group" mrp="os/networkingsrv/networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
-</component>
-<component name="commsuserpromptmgr" long-name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkcontrol/commsuserpromptmgr/group" mrp="os/networkingsrv/networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
-</component>
-</collection>
-<collection name="networkprotocols" long-name="Network Protocols" level="plugin">
-<component name="ipeventnotifier" long-name="IP Event Notifier" introduced="8.1" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
-</component>
-<component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
-</component>
-<component name="iphook" long-name="IP Hook" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
-</component>
-<component name="mobileip" long-name="Mobile IP" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/mobileip/group" mrp="os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
-</component>
-<component name="dnsproxy" long-name="DNS Proxy" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/networkprotocols/dnsproxy/group" mrp="os/networkingsrv/networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
-</component>
-</collection>
-<collection name="networksecurity" long-name="Network Security" level="framework">
-<component name="tls" long-name="TLS" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tls/group" mrp="os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
-</component>
-<component name="tlsprovider" long-name="TLS Provider" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tlsprovider/group" mrp="os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
-</component>
-<component name="ipsec" long-name="IPsec" introduced="7.0" purpose="optional">
-<unit bldFile="os/networkingsrv/networksecurity/ipsec/group" mrp="os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
-</component>
-</collection>
-<collection name="networkingtestandutils" long-name="Networking Test and Utils" level="app-if">
-<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">
-<!-- production component: contains the IBY files -->
-<unit bldFile="os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
-</component>
-<component name="networkingdocs" long-name="Networking Documentation" purpose="development" class="doc">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
-</component>
-<component name="networkingsrv_metadata" long-name="Networking Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
-<component name="predictorcompression" long-name="Predictor Compression" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wlan" level="services" long-name="WLAN" levels="hw low mid high tools test">
-<collection name="wlan_plat" long-name="WLAN Platform Interfaces" level="test">
-<component name="wlan_dbif_api" long-name="WLAN DBIF API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_dbif_api/group"/>
-</component>
-<component name="wlan_hal_api" long-name="WLAN HAL API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hal_api/group"/>
-</component>
-<component name="wlan_management_api" long-name="WLAN Management API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_management_api/group"/>
-</component>
-<component name="wlan_device_settings_api" long-name="WLAN Device Settings API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_device_settings_api/group"/>
-</component>
-<component name="wlan_control_api" long-name="WLAN Control API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_control_api/group"/>
-</component>
-<component name="wlan_hw_initialization_data_api" long-name="WLAN Hardware Initialization Data API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hw_initialization_data_api/group"/>
-</component>
-<component name="wlan_power_save_plugin_api" long-name="WLAN Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_power_save_plugin_api/group"/>
-</component>
-<component name="wlan_info_api" long-name="WLAN Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_info_api/group"/>
-</component>
-<component name="wlan_agent_hotspot_plugin_api" long-name="WLAN Agent Hotspot Plug-in API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
-</component>
-<component name="wlan_osa_api" long-name="WLAN OSA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_osa_api/group"/>
-</component>
-<component name="wlan_spia_api" long-name="WLAN SPIA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_spia_api/group"/>
-</component>
-<component name="wlan_hpa_api" long-name="WLAN HPA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hpa_api/group"/>
-</component>
-<component name="wlan_eapol_plugin_api" long-name="WLAN EAPOL Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_eapol_plugin_api/group"/>
-</component>
-<component name="wlan_generic_plugin_api" long-name="WLAN Generic Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_generic_plugin_api/group"/>
-</component>
-<component name="wlan_aws_plugin_api" long-name="WLAN AWS Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_aws_plugin_api/group"/>
-</component>
-</collection>
-<collection name="wlan_pub" long-name="WLAN Public Interfaces" level="test">
-<component name="wlan_sdk_info_api" long-name="WLAN SDK Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_pub/wlan_sdk_info_api/group"/>
-</component>
-</collection>
-<collection name="wlan_bearer" long-name="WLAN Bearer" level="hw">
-<component name="wlanpsmplugin" filter="s60" long-name="WLAN PSM Plugin" plugin="Y">
-<unit bldFile="os/wlan/wlan_bearer/wlanpsmplugin/group"/>
-</component>
-<component name="wlanagent" filter="s60" long-name="WLAN Agent">
-<unit bldFile="os/wlan/wlan_bearer/wlanagent/group"/>
-</component>
-<component name="wlandbif_cd" filter="s60" long-name="WLAN CommsDat interface">
-<unit bldFile="os/wlan/wlan_bearer/wlandbif_cd/group"/>
-</component>
-<!-- should follow component directory rules for stuff in wlan_symbian/ and put in a single component or split up properly -->
-<component name="wlanengine" filter="s60" long-name="WLAN Engine">
-<unit bldFile="os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
-</component>
-<component name="wlanldd" filter="s60" long-name="WLAN LDD">
-<unit bldFile="os/wlan/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
-</component>
-<component name="wlannwif" filter="s60" long-name="WLAN Network Interface">
-<unit bldFile="os/wlan/wlan_bearer/wlannwif/group"/>
-</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="adaptation hw-if plugin framework server app-if">
-<collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
-<component name="basebandchanneladaptor" long-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 name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
-<component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
-</component>
-</collection>
-<collection name="fax" long-name="Fax" level="server">
-<component name="faxclientandserver" long-name="Fax Client and Server" purpose="optional">
-<unit bldFile="os/cellularsrv/fax/faxclientandserver/Group" mrp="os/cellularsrv/fax/faxclientandserver/Group/telephony_fax.mrp"/>
-</component>
-</collection>
-<collection name="smsprotocols" long-name="SMS Protocols" level="framework">
-<component name="smsstack" long-name="SMS Stack" introduced="6.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/cellularsrv/smsprotocols/smsstack/group" mrp="os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
-</component>
-</collection>
-<collection name="telephonyprotocols" long-name="Telephony Protocols" level="framework">
-<component name="csdagt" long-name="CSD AGT" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/csdagt/group" mrp="os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
-</component>
-<component name="psdagt" long-name="PSD AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/psdagt/group" mrp="os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
-</component>
-<component name="gprsumtsqosprt" long-name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
-</component>
-<component name="gprsumtsqosinterface" long-name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
-</component>
-<component name="qosextnapi" long-name="QoS Extn API" introduced="9.2" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
-</component>
-<component name="secondarypdpcontextumtsdriver" long-name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
-</component>
-<component name="qos3gppcpr" long-name="QoS 3GPP CPR" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
-</component>
-<component name="pdplayer" long-name="PDP Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/pdplayer/group" mrp="os/cellularsrv/telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
-</component>
-<component name="rawipnif" long-name="Raw IP NIF" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserver" long-name="Telephony Server" level="server">
-<component name="etelserverandcore" long-name="ETel Server and Core" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
-</component>
-<component name="etelmultimode" long-name="ETel Multimode" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelmultimode/group" mrp="os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
-</component>
-<component name="etelpacketdata" long-name="ETel Packet Data" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
-</component>
-<component name="etelsimtoolkit" long-name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
-<component name="common_tsy" long-name="Common TSY" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
-</component>
-<component name="licenseetsystub" long-name="Licensee TSY Stub" introduced="^2" purpose="development" filter="sf_build" plugin="Y">
-<unit mrp="os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="os/cellularsrv/telephonyserverplugins/licenseetsystub/group"/>
-</component>
-<component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
-</component>
-<component name="simtsy" long-name="SIM TSY" introduced="7.0" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
-</component>
-<component name="ctsydispatchlayer" long-name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
-</component>
-<component name="simatktsy" long-name="SIMATK TSY" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simatktsy/group" mrp="os/cellularsrv/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
-</component>
-</collection>
-<collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
-<component name="dial" long-name="Dial" deprecated="9.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyutils/dial/group" mrp="os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
-</component>
-<component name="telephonywatchers" long-name="Telephony Watchers" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
-</component>
-<component name="etel3rdpartyapi" long-name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrv_info" long-name="Cellular Baseband Services Info" level="app-if">
-<component name="telephonyconfidentialdocs" long-name="Telephony Confidential Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
-</component>
-<component name="telephonydocs" long-name="Telephony Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
-</component>
-<component name="cellularsrv_metadata" long-name="Cellular Baseband Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
-<component name="mocksy" long-name="MockSY" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if"/>
-<collection name="wapstack" long-name="WAP Stack" level="app-if">
-<component name="wapmessageapi" long-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>
-</block>
-<block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
-<collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
-<component name="bluetooth_audio_adaptation_api" long-name="Bluetooth Audio Adaptation API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
-</component>
-<component name="bluetooth_power_management_api" long-name="Bluetooth Power Management API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_power_management_api/group"/>
-</component>
-<component name="at_command_handler_plugin_api" long-name="AT Command Handler Plugin API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/at_command_handler_plugin_api/group"/>
-</component>
-</collection>
-<collection name="bluetooth" long-name="Bluetooth Core" level="framework">
-<component name="btstack" long-name="Bluetooth Stack" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btstack" mrp="os/bt/bluetooth/btstack/bluetooth_stack.mrp"/>
-</component>
-<component name="btcomm" long-name="Bluetooth CSY" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetooth/btcomm" mrp="os/bt/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
-</component>
-<component name="btsdp" long-name="Bluetooth SDP" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btsdp" mrp="os/bt/bluetooth/btsdp/bluetooth_sdp.mrp"/>
-</component>
-<component name="btextnotifiers" long-name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btextnotifiers" mrp="os/bt/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
-</component>
-<component name="gavdp" long-name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/gavdp/group" mrp="os/bt/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
-</component>
-<component name="btlogger" long-name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btlogger/group" mrp="os/bt/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
-</component>
-<component name="btdocs" long-name="Bluetooth Documentation" purpose="development" class="doc">
-<unit mrp="os/bt/bluetooth/btdocs/bluetooth_documentation.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothmgmt" long-name="Bluetooth Management" level="plugin">
-<component name="btmgr" long-name="Bluetooth Manager" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btmgr" mrp="os/bt/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
-</component>
-<component name="btconfig" long-name="Bluetooth Config" purpose="optional" class="config">
-<unit bldFile="os/bt/bluetoothmgmt/btconfig" mrp="os/bt/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
-</component>
-<component name="btrom" long-name="Bluetooth ROM" introduced="9.1" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btrom" mrp="os/bt/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
-</component>
-<component name="bluetoothclientlib" long-name="Bluetooth Client Library" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/bluetoothclientlib" mrp="os/bt/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothcommsprofiles" long-name="Bluetooth Comms Profiles" level="app-if">
-<component name="btpan" long-name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetoothcommsprofiles/btpan/group" mrp="os/bt/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
-</component>
-</collection>
-<collection name="bthci" long-name="Host Controller Interface" level="server">
-<component name="bthci2" long-name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bthci/bthci2/group" mrp="os/bt/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
-</component>
-<component name="hciextensioninterface" long-name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bthci/hciextensioninterface" mrp="os/bt/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
-</component>
-<component name="hci2implementations" long-name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bthci/hci2implementations/group" mrp="os/bt/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
-</component>
-</collection>
-<collection name="irda" long-name="IrDA" level="plugin">
-<component name="irdastack" long-name="IrDA Stack" purpose="optional">
-<unit bldFile="os/bt/irda/irdastack/group" mrp="os/bt/irda/irdastack/group/infra-red_irda.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if"/>
-<collection name="atext" long-name="AT Extensions" level="server">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="atext_build" long-name="AT Extension Build" introduced="^3" purpose="optional" filter="s60">
-<unit bldFile="os/bt/atext/group"/>
-</component>
-</collection>
-<collection name="bt_info" long-name="Bluetooth Info" level="app-if">
-<component name="bt_metadata" long-name="Bluetooth Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/bt/bt_info/bt_metadata/bt_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
-<collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
-<!-- usbclientdrivers to be moved here from kernelhwsrv-->
-</collection>
-<collection name="usbmgmt" long-name="USB Management" level="server">
-<component name="usbmgr" long-name="USB Manager" purpose="optional">
-<unit bldFile="os/usb/usbmgmt/usbmgr/group" mrp="os/usb/usbmgmt/usbmgr/group/usb_manager.mrp" version="2"/>
-</component>
-<component name="usbclassandmgrdocs" long-name="USB Class and Manager Documentation" purpose="development" class="doc">
-<unit mrp="os/usb/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
-</component>
-</collection>
-<collection name="usb_info" long-name="USB Info" level="app-if">
-<component name="usb_metadata" long-name="USB Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/usb/usb_info/usb_metadata/usb_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="mm" level="services" long-name="Multimedia" levels="adaptation 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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-</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"/>
-</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"/>
-</component>
-<component name="aac_decoder_config_proxy_api" long-name="AAC Decoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/aac_decoder_config_proxy_api/group"/>
-</component>
-<component name="added_devsound_control_api" long-name="Added DevSound Control API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_api/group"/>
-</component>
-<component name="added_devsound_control_msg_hdlr_api" long-name="Added DevSound Control Msg Hdlr API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_msg_hdlr_api/group"/>
-</component>
-<component name="added_devsound_control_proxy_api" long-name="Added DevSound Control Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_proxy_api/group"/>
-</component>
-<component name="audio_effects_msg_hdlr_api" long-name="Audio Effects Message Handler API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_msg_hdlr_api/group"/>
-</component>
-<component name="audio_effects_proxy_api" long-name="Audio Effects Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_proxy_api/group"/>
-</component>
-<component name="audio_policy_header_api" long-name="Audio Policy Header API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="audio_routing_proxy_api" long-name="Audio Routing Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_routing_proxy_api/group"/>
-</component>
-<component name="custom_interface_builder_api" long-name="Custom Interface Builder API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_builder_api/group"/>
-</component>
-<component name="custom_interface_message_handler_factory_api" long-name="Custom Interface Message Handler Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_message_handler_factory_api/group"/>
-</component>
-<component name="custom_interface_proxy_factory_api" long-name="Custom Interface Proxy Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_proxy_factory_api/group"/>
-</component>
-<component name="custom_interface_utility_api" long-name="Custom Interface Utility API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_utility_api/group"/>
-</component>
-<component name="devsound_adaptation_api" long-name="DevSound Adaptation API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/devsound_adaptation_api/group"/>
-</component>
-<component name="display_posting_api" long-name="Display Posting API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="eaac_plus_decoder_interface_proxy_api" long-name="eAAC Plus Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="error_concealment_interface_proxy_api" long-name="Error Concealment Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
-</component>
-<component name="fm_radio_adaptation_api" long-name="FM Radio Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_decoder_interface_proxy_api" long-name="G711 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_encoder_interface_proxy_api" long-name="G711 Encoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_decoder_interface_proxy_api" long-name="G729 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_encoder_interface_msg_hdlr_api" long-name="G729 Encoder Interface Message Handler API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</component>
-<component name="ilbc_decoder_interface_proxy_api" long-name="Ilbc Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ilbc_encoder_interface_proxy_api" long-name="Ilbc Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="mdf_plugin_uids" long-name="MDF Plug-in UIDs" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/mdf_plugin_uids/group"/>
-</component>
-<component name="multimedia_fourcc_definitions_api" long-name="Multimedia FourCC Definitions API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/multimedia_fourcc_definitions_api/group"/>
-</component>
-<component name="nokia_audio_policy_header_api" long-name="Nokia Audio Policy Header API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/nokia_audio_policy_header_api/group"/>
-</component>
-<component name="nokia_multimedia_fourcc_definitions_api" long-name="Nokia Multimedia Fourcc Definitions API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ra8_decoder_interface_proxy_api" long-name="RA8 Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
-</component>
-<component name="rds_adaptation_api" long-name="RDS Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="restricted_audio_output_proxy_api" long-name="Restricted Audio Output Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="sbc_encoder_interface_proxy_api" long-name="SBC Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/sbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="secure_output_mdf_custom_interface" long-name="Secure Output MDF Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="speech_encoder_config_proxy_api" long-name="Speech Encoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/speech_encoder_config_proxy_api/group"/>
-</component>
-<component name="telephony_audio_routing_client_api" long-name="Telephony Audio Routing Client API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_client_api/group"/>
-</component>
-<component name="telephony_audio_routing_manager_api" long-name="Telephony Audio Routing Manager API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_manager_api/group"/>
-</component>
-<component name="video_buffer_management_mdf_custom_interface" long-name="Video Buffer Management MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_buffer_management_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_rotation_mdf_custom_interface" long-name="Video Decoder Rotation MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_scaling_mdf_custom_interface" long-name="Video Decoder Scaling MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
-</component>
-<component name="video_reclaim_extbuffers_ci" long-name="Video Reclaim Extbuffers Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_reclaim_extbuffers_ci/group"/>
-</component>
-<component name="video_window_control_custom_interface" long-name="Video Window Control Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="wma_decoder_interface_proxy_api" long-name="WMA Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/wma_decoder_interface_proxy_api/group"/>
-</component>
-<component name="eaacplusutil_api" long-name="EAac Plus Util API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/eaacplusutil_api/group"/>
-</component>
-<component name="frametable_api" long-name="Frametable API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/frametable_api/group"/>
-</component>
-</collection>
-<collection name="devsoundextensions" long-name="Devsound Extensions" level="device-fw">
-<component name="drmaudioplayer" filter="s60" long-name="DRM Audio Player">
-<unit bldFile="os/mm/devsoundextensions/drmaudioplayer/group"/>
-</component>
-<component name="mmextfw" filter="s60" long-name="Multimedia Extension Framework">
-<unit bldFile="os/mm/devsoundextensions/mmextfw/group"/>
-</component>
-<component name="audiorouting" filter="s60" long-name="Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/audiorouting/group"/>
-</component>
-<component name="effects" filter="s60" long-name="Effects">
-<unit bldFile="os/mm/devsoundextensions/effects/group"/>
-</component>
-<component name="effectspresets" filter="s60" long-name="Effects Presets">
-<unit bldFile="os/mm/devsoundextensions/effectspresets/group"/>
-</component>
-<component name="effectspresets_utils" filter="s60" long-name="Effects Presets Utils">
-<!-- need to #include the lot from a single bld.inf
- Also move to a standard component location, not under effectspresets -->
-<unit bldFile="os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
-<unit bldFile="os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
-</component>
-<component name="telephonyaudiorouting" filter="s60" long-name="Telephony Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/group"/>
-</component>
-<component name="mmfcustominterfaces" filter="s60" long-name="MMF Custom Interfaces">
-<unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/group"/>
-</component>
-<component name="addeddevsoundcontrol" filter="s60" long-name="Added DevSound Control">
-<unit bldFile="os/mm/devsoundextensions/addeddevsoundcontrol/group"/>
-</component>
-<component name="globalaudiosettings" filter="s60" long-name="Global Audio Settings">
-<unit bldFile="os/mm/devsoundextensions/globalaudiosettings/group"/>
-</component>
-<component name="restrictedaudiooutput" filter="s60" long-name="Restricted Audio Output">
-<unit bldFile="os/mm/devsoundextensions/restrictedaudiooutput/group"/>
-</component>
-<component name="ciextnfactoryplugins" filter="s60" long-name="Custom Interface Extension Factory Plugins" plugin="Y">
-<unit bldFile="os/mm/devsoundextensions/ciextnfactoryplugins/group"/>
-</component>
-</collection>
-<collection name="mdfdevvideoextensions" long-name="MDF Dev Video Extensions" level="device-fw">
-<component name="nga_mdf_postprocessor" long-name="NGA MDF Postprocessor" filter="s60">
-<unit bldFile="os/mm/mdfdevvideoextensions/nga_mdf_postprocessor/group"/>
-</component>
-</collection>
-<collection name="audio" long-name="Audio Codecs" level="middleware">
-<component name="arm_cmmf_codecs" filter="s60" long-name="ARM CMMF Codecs" plugin="Y">
-<unit bldFile="os/mm/audio/arm_cmmf_codecs/group"/>
-</component>
-</collection>
-<collection name="video" long-name="Video Codecs" level="middleware">
-<!-- empty -->
-</collection>
-<collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
-<component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/imagingandcamerafws/imagingfws/group" mrp="os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
-</component>
-<component name="camerafw" long-name="Camera Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/imagingandcamerafws/camerafw/group" mrp="os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
-</component>
-</collection>
-<collection name="mmlibs" long-name="Multimedia Libraries" level="middleware">
-<component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmutilitylib/group" mrp="os/mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
-</component>
-<component name="mmfw" long-name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmfw/group" mrp="os/mm/mmlibs/mmfw/group/multimedia_mmf.mrp"/>
-</component>
-</collection>
-<collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
-<component name="imagingplugins" long-name="Imaging Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/imagingplugins/group" mrp="os/mm/mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
-</component>
-<component name="cameraplugins" long-name="Camera Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/cameraplugins/group" mrp="os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
-</component>
-<component name="lib3gp" long-name="3GP Library" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/mmplugins/lib3gp/group" mrp="os/mm/mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
-</component>
-<component name="mmfwplugins" long-name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/mmfwplugins/group" mrp="os/mm/mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
-</component>
-</collection>
-<collection name="mm_info" long-name="Multimedia Info" level="app-if">
-<component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc">
-<unit mrp="os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
-</component>
-<component name="mm_metadata" long-name="Multimedia Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
-<component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="^2" purpose="development">
-<unit bldFile="os/mm/mmresourcemgmt/mmresctrl/group" mrp="os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
-</component>
-</collection>
-<collection name="mmdevicefw" long-name="Multimedia Device Framework" level="device-fw">
-<component name="mdf" long-name="Media Device Framework" introduced="9.2" purpose="mandatory">
-<unit bldFile="os/mm/mmdevicefw/mdf/group" mrp="os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
-</component>
-<component name="speechrecogsupport" long-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 name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
-<component name="videorenderer" long-name="Video Renderer" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/mmswadaptation/videorenderer/group" mrp="os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
-</component>
-</collection>
-<collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw"/>
-<collection name="omxil" long-name="OpenMAX IL" level="hw-if">
-<component name="omxilapi" long-name="OpenMAX IL API" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilapi/group" mrp="os/mm/omxil/omxilapi/group/multimedia_omx_il_api.mrp" version="1"/>
-</component>
-<component name="omxilcore" long-name="OpenMAX IL Core" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcore/group" mrp="os/mm/omxil/omxilcore/group/multimedia_omx_il_core.mrp" version="1"/>
-</component>
-<component name="omxilcomponentcommon" long-name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcomponentcommon/group" mrp="os/mm/omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp" version="1"/>
-</component>
-<component name="omxilrefcomps" long-name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilrefcomps/ref_components/group" mrp="os/mm/omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp" version="1"/>
-</component>
-<component name="mmilapi" long-name="Multimedia Integration Layer API" introduced="^3" purpose="development">
-<unit bldFile="os/mm/omxil/mmilapi/group" mrp="os/mm/omxil/mmilapi/group/multimedia_il_api.mrp"/>
-</component>
-</collection>
-<collection name="devsound" long-name="Sound Device" level="devices">
-<component name="devsoundapi" long-name="DevSound API" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/devsound/devsoundapi/group" mrp="os/mm/devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
-</component>
-<component name="a3fdevsound" long-name="A3F DevSound" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3fdevsound/group" mrp="os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
-</component>
-<component name="a3facf" long-name="A3F Audio Component Framework" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3facf/group" mrp="os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
-</component>
-<component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/devsound/devsoundpluginsupport/group" mrp="os/mm/devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
-</component>
-<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">
-<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">
-<unit bldFile="os/mm/devsound/a3ftrace/group" mrp="os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
-</component>
-<component name="a3fsrvstart" long-name="A3F Server Start" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
-</component>
-</collection>
-<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
-<component name="devsoundhwdeviceapi" long-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 name="a3facl" long-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 name="a3fdevsoundcustomisation" long-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"/>
-</component>
-<component name="refacladapt" long-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"/>
-</component>
-<component name="videohai" long-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 name="dvbhreceiverhai" long-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>
-</block>
-<block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
-<collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
-<component name="exif_api" long-name="Exif API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagingext_plat" long-name="Imaging Extensions Platform Interfaces" level="app-if">
-<component name="jpeg2000_icl_plugin_api" long-name="JPEG2000 ICL plugin API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/jpeg2000_icl_plugin_api/group"/>
-</component>
-<component name="extended_icl_jpeg_api" long-name="Extended ICL Jpeg API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
-</component>
-<component name="h324_annex_k_custom_api" long-name="H324 Annex K Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/h324_annex_k_custom_api/group"/>
-</component>
-<component name="ecam_orientation_custom_api" long-name="ECam Orientation Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_orientation_custom_api/group"/>
-</component>
-<component name="ecam_ui_orientation_override_custom_api" long-name="ECam UI Orientation Override Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
-</component>
-<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>
-</collection>
-<collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
-<component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
-<unit bldFile="os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
-</component>
-<component name="imageadaptationextensions_build" filter="s60" long-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"/>
-</component>
-</collection>
-<collection name="imagingmodules" long-name="Imaging Modules" level="hw-if">
-<component name="exiflib" filter="s60" long-name="Exif Library">
-<unit bldFile="os/imagingext/imagingmodules/exiflib/group"/>
-</component>
-<component name="jp2kcodec" filter="s60" long-name="JPEG2000 Decoder Plugin" plugin="Y">
-<unit bldFile="os/imagingext/imagingmodules/jp2kcodec/group"/>
-</component>
-</collection>
-</block>
-<block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
-<component name="vgi" filter="s60" long-name="VGI">
-<unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
-</component>
-</collection>
-<collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adaptations">
-<component name="m3gcore11" filter="s60" long-name="M3G Core 1.1">
-<unit bldFile="os/graphics/m3g/m3gcore11/group"/>
-</component>
-</collection>
-<collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines">
-<component name="graphicsresource" long-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 name="graphicsresourceadaptation" long-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"/>
-</component>
-</collection>
-<collection name="graphicsutils" long-name="Graphics Utils" level="engines">
-<component name="commongraphicsheaders" long-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 name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
-<!-- displayldd to be moved here -->
-<component name="surfacemgr" long-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 name="graphicscomposition" long-name="Graphics Composition" level="engines">
-<component name="openwfcinterface" long-name="OpenWF Composition Interface" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfcinterface/group" mrp="os/graphics/graphicscomposition/openwfcinterface/group/graphics_openwfcinterface.mrp"/>
-</component>
-<component name="openwfcompositionengine" long-name="OpenWF Composition Engine" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/graphicscomposition/openwfcompositionengine/group" mrp="os/graphics/graphicscomposition/openwfcompositionengine/group/graphics_openwfcompositionengine.mrp"/>
-</component>
-<component name="openwfsupport" long-name="OpenWF Support" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfsupport/group" mrp="os/graphics/graphicscomposition/openwfsupport/group/graphics_openwfsupport.mrp"/>
-</component>
-<component name="surfaceupdate" long-name="Surface Update" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/surfaceupdate/group" mrp="os/graphics/graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
-</component>
-</collection>
-<collection name="graphicstest" long-name="Graphics Test" level="app-if">
-<component name="uibench" long-name="UI Bench" introduced="9.2" purpose="development">
-<unit bldFile="os/graphics/graphicstest/uibench/group" mrp="os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
-</component>
-</collection>
-<collection name="graphics_plat" long-name="Graphics Platform Interfaces" level="app-if">
-<component name="m3g_core_api" filter="sf_build" long-name="M3G Core API" class="api">
-<unit bldFile="os/graphics/graphics_plat/m3g_core_api/group"/>
-</component>
-</collection>
-<collection name="graphics_info" long-name="Graphics Info" level="app-if">
-<component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc">
-<unit mrp="os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
-</component>
-<component name="graphics_metadata" long-name="Graphics Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
-</component>
-</collection>
-<collection name="windowing" long-name="Windowing" level="app-if">
-<component name="windowserver" long-name="Window Server" purpose="mandatory">
-<unit bldFile="os/graphics/windowing/windowserver/group" mrp="os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
-</component>
-<component name="windowserverplugins" long-name="Window Server Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/windowing/windowserverplugins/group" mrp="os/graphics/windowing/windowserverplugins/group/graphics_wserv_std_plugins.mrp"/>
-</component>
-</collection>
-<collection name="printingservices" long-name="Printing Services" level="app-if">
-<component name="printerdriversupport" long-name="Printer Driver Support" purpose="optional">
-<unit bldFile="os/graphics/printingservices/printerdriversupport/group" mrp="os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
-</component>
-<component name="printerdrivers" long-name="Printer Drivers" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/printingservices/printerdrivers/group" mrp="os/graphics/printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
-</component>
-</collection>
-<collection name="fbs" long-name="Font and Bitmap Server" level="device-interface">
-<component name="fontandbitmapserver" long-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 name="opengles" long-name="OpenGLES" level="internal-adaptations">
-<component name="openglesinterface" long-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 name="opengles_stub" filter="sf_build" long-name="OpenGL ES Stub" purpose="optional" introduced="^2">
-<unit bldFile="os/graphics/opengles/openglesinterface/group/opengles_stub"/>
-</component>
-</collection>
-<collection name="openvg" long-name="OpenVG" level="internal-adaptations">
-<component name="openvginterface" long-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 name="openvg11" filter="s60" long-name="OpenVG 1.1">
-<!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
-<unit bldFile="os/graphics/openvg/openvginterface/group/openvg11"/>
-</component>
-<component name="sfopenvg" filter="sf_build" long-name="Khronos OpenVG Reference Implementation" introduced="^2" purpose="optional">
-<unit bldFile="os/graphics/openvg/openvgrefimplementation/sfopenvg/group"/>
-</component>
-</collection>
-<collection name="egl" long-name="EGL" level="internal-adaptations">
-<component name="eglinterface" long-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 name="eglswitch" long-name="EGL Switch" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglswitch/group" mrp="os/graphics/egl/eglswitch/group/graphics_eglswitch.mrp"/>
-</component>
-<component name="eglrefimpl" long-name="EGL Reference Implementation" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglrefimpl/group" mrp="os/graphics/egl/eglrefimpl/group/graphics_eglrefimpl.mrp"/>
-</component>
-<component name="egltest" long-name="EGL Tests" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/egl/egltest/group" mrp="os/graphics/egl/egltest/group/graphics_egltest.mrp"/>
-</component>
-</collection>
-<collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
-<component name="gdi" long-name="GDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/gdi/group" mrp="os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
-</component>
-<component name="bitgdi" long-name="BitGDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
-</component>
-<component name="colourpalette" long-name="Colour Palette" introduced="7.0s" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
-</component>
-<component name="screendriver" long-name="Screen Driver" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/graphicsdeviceinterface/screendriver/group" mrp="os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
-</component>
-<component name="directgdi" long-name="DirectGDI" introduced="^3" deprecated="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/directgdi/group" mrp="os/graphics/graphicsdeviceinterface/directgdi/group/graphics_directgdi.mrp"/>
-</component>
-<component name="directgdiinterface" long-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 name="directgdiadaptation" long-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"/>
-</component>
-</collection>
-<collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
-<component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/gdi_tools/group" mrp="os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
-</component>
-</collection>
-<collection name="graphicsapitest" long-name="Graphics API Tests" level="app-if"/>
-</block>
-<block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
-<collection name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" level="text">
-<component name="findutil_api" long-name="Find Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/findutil_api/group"/>
-</component>
-<component name="japanese_language_utilities_api" long-name="Japanese Language Utilities API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
-</component>
-<component name="sortutil_api" long-name="Sorting Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/sortutil_api/group"/>
-</component>
-</collection>
-<collection name="textandloc_pub" long-name="Text and Localisation Public Interfaces" level="text">
-<component name="directory_localizer_api" long-name="Directory Localizer API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_pub/directory_localizer_api/group"/>
-</component>
-</collection>
-<collection name="charconvfw" long-name="Character Conversion" level="encoding">
-<component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional">
-<unit bldFile="os/textandloc/charconvfw/charconv_fw/group" mrp="os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
-</component>
-<component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/charconvplugins/group" mrp="os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
-</component>
-<component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/fatfilenameconversionplugins/group" mrp="os/textandloc/charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
-</component>
-</collection>
-<collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
-<component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/textshaperplugin/group" mrp="os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
-</component>
-<component name="fontstore" long-name="Font Store" purpose="mandatory">
-<unit bldFile="os/textandloc/fontservices/fontstore/group" mrp="os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
-</component>
-<component name="textrendering" long-name="Text Rendering" purpose="mandatory" class="placeholder">
-<!-- placeholder for text code from GDI -->
-</component>
-<component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/freetypefontrasteriser/group" mrp="os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
-</component>
-<component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional">
-<unit bldFile="os/textandloc/fontservices/referencefonts/group" mrp="os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
-</component>
-</collection>
-<collection name="textlayout" long-name="Text Layout" level="text">
-<component name="texthandling" long-name="Text Handling" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/texthandling/group" mrp="os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
-</component>
-<component name="textformatting" long-name="Text Formatting" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/textformatting/group" mrp="os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
-</component>
-</collection>
-<collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
-<!-- components in this collection need to be moved to the right collection.
- Either move into the units' directories, or create a new textandlocutils directory -->
-<component name="numbergrouping" filter="s60" long-name="Number Grouping">
-<unit bldFile="os/textandloc/charconvfw/numbergrouping/group"/>
-</component>
-<component name="jplangutil" filter="s60" long-name="Japanese Language Utilities">
-<unit bldFile="os/textandloc/charconvfw/jplangutil/group"/>
-</component>
-<component name="sortutil" filter="s60" long-name="Sorting Utility">
-<unit bldFile="os/textandloc/charconvfw/sortutil/group"/>
-</component>
-<component name="inlinetext" filter="s60" long-name="Inline Text">
-<unit bldFile="os/textandloc/charconvfw/inlinetext/group"/>
-</component>
-<component name="nearestlangutil" long-name="Nearest Language Util" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-<component name="numberformatting" long-name="Number Formatting" introduced="7.0s" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/numberformatting/group" mrp="os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
-</component>
-</collection>
-<collection name="localesupport" long-name="Locale Support" level="util">
-<component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/localisation/localesupport" mrp="os/textandloc/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
-</component>
-<component name="initlocale" long-name="Initialise Locale" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-</collection>
-<collection name="textandloctools" long-name="Text and Localisation Tools" level="tools">
-<component name="fontcompiler" long-name="Font Compiler" purpose="development" class="placeholder PC">
-<!-- placeholder for split from GDI Tools -->
-</component>
-<component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/bitmapfonttools/group" mrp="os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
-</component>
-</collection>
-<collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
-<component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
-<collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
-<component name="xmlsrv_plat_build" long-name="XML Services Platform Interface Build" filter="s60" class="api">
-<!-- need to fix the configuration used here.
- Either destribute to other components or use the new feature flags confguration mechanisms.
- Remove this component and uncomment the other units when fixed-->
-<unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
-</component>
-<component name="xml_encryption_api" long-name="XML Encryption API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/> -->
-</component>
-<component name="xml_signature_api" long-name="XML Signature API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_signature_api/group"/> -->
-</component>
-<component name="xml_security_engine_utils_api" long-name="XML Security Engine Utils API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/> -->
-</component>
-</collection>
-<collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
-<component name="xmlseccertman" filter="s60" long-name="XML Security Certificate Manager">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
-</component>
-<component name="xmlsec" filter="s60" long-name="XML Security">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsec/group"/>
-</component>
-<component name="xmlseccrypto" filter="s60" long-name="XML Security Crypto">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccrypto/group"/>
-</component>
-<component name="xmlsecwrapper" filter="s60" long-name="XML Security Wrapper">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsecwrapper/group"/>
-</component>
-</collection>
-<collection name="xml" long-name="XML" level="generic">
-<component name="xmlfw" long-name="XML Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmlfw/group" mrp="os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
-</component>
-<component name="libxml2libs" long-name="Libxml2 Libraries" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/libxml2libs/group" mrp="os/xmlsrv/xml/libxml2libs/group/syslibs_libxml2.mrp"/>
-</component>
-<component name="legacyminidomparser" long-name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/legacyminidomparser/GROUP" mrp="os/xmlsrv/xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp"/>
-</component>
-<component name="xmldomandxpath" long-name="XML DOM and XPath" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmldomandxpath/group" mrp="os/xmlsrv/xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
-</component>
-<component name="xmlexpatparser" long-name="XML Expat Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmlexpatparser/group" mrp="os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
-</component>
-<component name="xmllibxml2parser" long-name="XML Libxml2 Parser" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmllibxml2parser/group" mrp="os/xmlsrv/xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
-</component>
-<component name="wbxmlparser" long-name="WBXML Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/wbxmlparser/group" mrp="os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
-</component>
-</collection>
-<collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
-<component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="deviceplatformrelease" level="services" long-name="Device Platform Release" levels="bld mid top">
-<collection name="s60extras" long-name="S60 Extras" level="mid">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="s60extras_build" filter="s60" long-name="S60 Extras Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/S60Extras/group"/>
-</component>
-</collection>
-<collection name="locfiles" long-name="Locale Files" level="mid">
-<component name="locfiles_build" filter="s60" long-name="S60 Locale Files Build" purpose="development" class="config">
-<!-- need to move component down a directory -->
-<unit bldFile="os/deviceplatformrelease/locfiles/group"/>
-</component>
-<component name="locfiles_set1" long-name="Locale Files Set 1" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set1"/>
-</component>
-<component name="locfiles_set2" long-name="Locale Files Set 2" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set2"/>
-</component>
-<component name="locfiles_set3" long-name="Locale Files Set 3" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set3"/>
-</component>
-<component name="locfiles_set4" long-name="Locale Files Set 4" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set4"/>
-</component>
-<component name="locfiles_set5" long-name="Locale Files Set 5" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set5"/>
-</component>
-<component name="locfiles_set6" long-name="Locale Files Set 6" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set6"/>
-</component>
-<!-- is the a problem with SF builds with the following? -->
-<component name="locfiles_set7" long-name="Locale Files Set 7" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set7"/>
-</component>
-<component name="locfiles_set8" long-name="Locale Files Set 8" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set8"/>
-</component>
-<component name="locfiles_set9" long-name="Locale Files Set 9" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set9"/>
-</component>
-<component name="locfiles_set10" long-name="Locale Files Set 10" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set10"/>
-</component>
-<component name="locfiles_set11" long-name="Locale Files Set 11" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set11"/>
-</component>
-<component name="locfiles_set12" long-name="Locale Files Set 12" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set12"/>
-</component>
-<component name="locfiles_set13" long-name="Locale Files Set 13" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set13"/>
-</component>
-<component name="locfiles_set14" long-name="Locale Files Set 14" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set14"/>
-</component>
-<component name="locfiles_set15" long-name="Locale Files Set 15" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set15"/>
-</component>
-<component name="locfiles_set16" long-name="Locale Files Set 16" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set16"/>
-</component>
-</collection>
-<collection name="version" long-name="Version" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="version_build" filter="s60" long-name="Version Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/Version/group"/>
-</component>
-</collection>
-<collection name="helps_loc2" long-name="Helps Locale 2" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helps_loc2_build" long-name="Helps Locale 2 Build" filter="s60">
-<unit bldFile="os/deviceplatformrelease/helps_loc2/group"/>
-</component>
-</collection>
-<collection name="sf_config" long-name="SF Config" level="mid">
-<component name="config" filter="s60" long-name="Config" purpose="development" class="config"/>
-<component name="cenrep" filter="sf_build" long-name="ConE Central Repository Config" purpose="development" class="config">
-<!-- will shoudl give the id/path something more unique than cenrep -->
-<unit bldFile="os/deviceplatformrelease/sf_config/cenrep/group"/>
-</component>
-<component name="rombuild_syborg" filter="sf_build" long-name="Syborg iMaker Config" purpose="development" introduced="^3" class="config">
-<unit bldFile="os/deviceplatformrelease/sf_config/rombuild/syborg/group"/>
-</component>
-<component name="rombuild_zoom2" filter="sf_build" long-name="Zoom2 iMaker Config" purpose="development" introduced="^3" class="config">
-<unit bldFile="os/deviceplatformrelease/sf_config/rombuild/zoom2/group"/>
-</component>
-</collection>
-<!-- should be located locally in buildplatforms/group. NB. This is a different package! -->
-<collection name="s60bld" long-name="S60 Build">
-<component name="buildplatforms" filter="s60" long-name="Build Platforms">
-<unit bldFile="tools/buildplatforms/group"/>
-</component>
-</collection>
-<collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
-<component name="cedarutils" long-name="Cedar Utils" purpose="development">
-<unit mrp="os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
-</component>
-<component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt" purpose="development" class="config">
-<unit mrp="os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
-</component>
-<component name="foundation_s60_packages" long-name="Foundation S60 Packages" introduced="^3" deprecated="^3" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/symbianosbld/foundation_s60_packages/foundation_s60_packages.mrp"/>
-</component>
-</collection>
-<collection name="foundation_system" long-name="Foundation System" level="top">
-<component name="system_model" long-name="System Model" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
-</component>
-</collection>
-<collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
-<component name="deviceplatformrelease_metadata" long-name="Device Platform Release Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="osrndtools" level="services" long-name="OS R&D tools" levels="fw trace">
-<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"/>
-</component>
-<component name="testinterface" filter="s60" long-name="Test Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/testinterface/group"/>
-</component>
-<component name="testserver" filter="s60" long-name="Test Server" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserver/group"/>
-</component>
-<component name="testengine" filter="s60" long-name="Test Engine" purpose="development">
-<unit bldFile="os/osrndtools/stif/testengine/group"/>
-</component>
-<component name="testserverstarter" filter="s60" long-name="Test Server Starter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserverstarter/group"/>
-</component>
-<component name="stiftfwif" filter="s60" long-name="STIF Test Framework Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/stiftfwif/group"/>
-</component>
-<component name="consoleui" filter="s60" long-name="Console UI" purpose="development">
-<unit bldFile="os/osrndtools/stif/consoleui/group"/>
-</component>
-<component name="testcombiner" filter="s60" long-name="Test Combiner" purpose="development">
-<unit bldFile="os/osrndtools/stif/testcombiner/group"/>
-</component>
-<component name="demomodule" filter="s60" long-name="Demo Module" purpose="development">
-<unit bldFile="os/osrndtools/stif/demomodule/group"/>
-</component>
-<component name="atslogger" filter="s60" long-name="ATS Logger" purpose="development">
-<unit bldFile="os/osrndtools/stif/atslogger/group"/>
-</component>
-<component name="atsinterface" filter="s60" long-name="ATS Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/atsinterface/group"/>
-</component>
-<component name="testscripter" filter="s60" long-name="Test Scripter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testscripter/group"/>
-</component>
-<component name="suevent" filter="s60" long-name="SU Event" purpose="development">
-<unit bldFile="os/osrndtools/stif/suevent/group"/>
-</component>
-<component name="stifkerneltestclassbase" filter="s60" long-name="STIF Kernel Test Class Base" purpose="development">
-<!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
-<!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
-</component>
-<component name="stif_build" filter="s60" long-name="STIF Build" purpose="development">
-<!-- move exports into self-contained component. Remove this when configuration is in place-->
-<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">
-<unit bldFile="os/osrndtools/memspy/memspy_plat/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/engine/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/console/group"/>
-</component>
-<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>
-</collection>
-<collection name="hti" long-name="Harmonized Test Interface" level="trace">
-<component name="hti_plat" filter="s60" long-name="HTI Platform Interfaces" purpose="development" class="api">
-<unit bldFile="os/osrndtools/hti/hti_plat/group"/>
-</component>
-<component name="hticfg" filter="s60" long-name="HTI Config" purpose="development">
-<unit bldFile="os/osrndtools/hti/hticfg/group"/>
-</component>
-<component name="htiautostart" filter="s60" long-name="HTI Autostart" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiautostart/group"/>
-</component>
-<component name="htiframework" filter="s60" long-name="HTI Framework" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiframework/group"/>
-</component>
-<component name="hticommplugins" filter="s60" long-name="HTI Communication Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
-</component>
-<component name="htiserviceplugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
-</component>
-<component name="htifilehlp" filter="s60" long-name="HTI File Help" purpose="development">
-<unit bldFile="os/osrndtools/hti/htifilehlp/group"/>
-</component>
-<component name="htiwatchdog" filter="s60" long-name="HTI Watchdog" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiwatchdog/group"/>
-</component>
-<component name="hti_build" filter="s60" long-name="HTI Build" purpose="development">
-<!-- move exports into self-contained component.-->
-<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">
-<block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
-<collection name="appsupport_pub" long-name="Generic Application Support Public Interfaces" level="specific">
-<component name="flash_viewer_framework_api" long-name="Flash Viewer Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
-</component>
-<component name="network_status_api" long-name="Network Status API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/network_status_api/group"/>
-</component>
-</collection>
-<collection name="appsupport_plat" long-name="Generic Application Support Platform Interfaces" level="specific">
-<component name="action_plugin_api" long-name="Action Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/action_plugin_api/group"/>
-</component>
-<component name="application_orientation_api" long-name="Application Orientation API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/application_orientation_api/group"/>
-</component>
-<component name="context_access_api" long-name="Context Access API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_access_api/group"/>
-</component>
-<component name="context_framework_services_api" long-name="Context Framework Services API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_services_api/group"/>
-</component>
-<component name="context_framework_client_api" long-name="Context Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_client_api/group"/>
-</component>
-<component name="context_framework_listener_api" long-name="Context Framework Listener API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_listener_api/group"/>
-</component>
-<component name="context_framework_version_api" long-name="Context Framework Version API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_version_api/group"/>
-</component>
-<component name="context_source_plugin_api" long-name="Context Source Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_plugin_api/group"/>
-</component>
-<component name="context_source_settings_manager_api" long-name="Context Source Settings Manager API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_settings_manager_api/group"/>
-</component>
-<component name="context_subscription_api" long-name="Context Subscription API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_subscription_api/group"/>
-</component>
-<component name="key_event_framework_api" long-name="Key Event Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_api/group"/>
-</component>
-<component name="key_event_framework_mapper_api" long-name="Key Event Framework Mapper API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_mapper_api/group"/>
-</component>
-<component name="media_keys_definition_api" long-name="Media Keys Definition API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/media_keys_definition_api/group"/>
-</component>
-<component name="ood_threshold_api" long-name="OOD Threshold API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/ood_threshold_api/group"/>
-</component>
-<component name="oom_monitor_api" long-name="OOM Monitor API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_api/group"/>
-</component>
-<component name="oom_monitor_plugin_api" long-name="OOM Monitor Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_plugin_api/group"/>
-</component>
-<component name="operation_provider_api" long-name="Operation Provider API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/operation_provider_api/group"/>
-</component>
-<component name="phonecmdhandler_api" long-name="Phone Command Handler API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/phonecmdhandler_api/group"/>
-</component>
-<component name="restore_factory_settings_api" long-name="Restore Factory Settings API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_api/group"/>
-</component>
-<component name="restore_factory_settings_plugin_api" long-name="Restore Factory Settings Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_plugin_api/group"/>
-</component>
-<component name="secondary_display_accfw_api" long-name="Secondary Display Accessory Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_accfw_api/group"/>
-</component>
-<component name="secondary_display_startup_api" long-name="Secondary Display Startup API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_startup_api/group"/>
-</component>
-<component name="secondary_display_sysap_api" long-name="Secondary Display System Application API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_sysap_api/group"/>
-</component>
-<component name="secondary_display_system_state_api" long-name="Secondary Display System State API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_system_state_api/group"/>
-</component>
-<component name="sensor_user_setting_api" long-name="Sensor User Setting API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/sensor_user_setting_api/group"/>
-</component>
-<component name="startup_configuration_api" long-name="Startup Configuration API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/startup_configuration_api/group"/>
-</component>
-<component name="system_application_key_handler_plugin_api" long-name="System Application Key Handler Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_key_handler_plugin_api/group"/>
-</component>
-<component name="system_application_light_control_plugin_api" long-name="System Application Light Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_light_control_plugin_api/group"/>
-</component>
-<component name="system_application_notification_api" long-name="System Application Notification API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_notification_api/group"/>
-</component>
-<component name="system_application_plugin_callback_api" long-name="System Application Plug-in Callback API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
-</component>
-</collection>
-<collection name="contextframework" long-name="Context Framework" level="framework">
-<!-- the units that are commented out need to be put back when configuration is in place.
- They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
-<component name="cfw" filter="s60" long-name="Context Framework">
-<!--<unit bldFile="contextframework/cfw/group"/> -->
-</component>
-<component name="cfwplugins" filter="s60" long-name="Context Framework Plugins" plugin="Y">
-<!--<unit bldFile="contextframework/cfwplugins/group"/>-->
-</component>
-<component name="contextframework_build" filter="s60" long-name="Context Framework Build">
-<unit bldFile="mw/appsupport/contextframework/group"/>
-</component>
-</collection>
-<collection name="coreapplicationuis" long-name="Core Application UIs" level="server">
-<component name="dbrecovery" filter="s60" long-name="Database Recovery">
-<unit bldFile="mw/appsupport/coreapplicationuis/dbrecovery/group"/>
-</component>
-<component name="nspswsplugin" filter="s60" long-name="NSPS WS Plugin" plugin="Y">
-<!-- No Service Power Save? Window Server? Please elaborate-->
-<unit bldFile="mw/appsupport/coreapplicationuis/nspswsplugin/group"/>
-</component>
-<component name="rfs" filter="s60" long-name="Restore Factory Settings">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfs/group"/>
-</component>
-<component name="rfsplugins" filter="s60" long-name="Restore Factory Settings Plugins" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/group"/>
-</component>
-<component name="sysap" filter="s60" long-name="System Application">
-<unit bldFile="mw/appsupport/coreapplicationuis/sysap/group"/>
-</component>
-<component name="variatedsettings" filter="s60" long-name="Variated Settings" class="config">
-<unit bldFile="mw/appsupport/coreapplicationuis/variatedsettings/group"/>
-</component>
-<component name="accfwuinotifier" filter="s60" long-name="Accessory Framework UI Notifier" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/accfwuinotifier/group"/>
-</component>
-<component name="kefmapper" filter="s60" long-name="Key Event Framework">
-<unit bldFile="mw/appsupport/coreapplicationuis/kefmapper/group"/>
-</component>
-<component name="advancedtspcontroller" filter="s60" long-name="Advanced TSP Controller">
-<unit bldFile="mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
-</component>
-<component name="powersaveutilities" filter="s60" long-name="Power Save Utilities">
-<unit bldFile="mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
-</component>
-<component name="gsserverenginestub" filter="s60" long-name="GS Server Engine Stub">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
-</component>
-<component name="gsserverengine" filter="s60" long-name="GS Server Engine">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverengine/group"/>
-</component>
-<component name="sensordatacompensatorplugin" filter="s60" long-name="Sensor Data Compensator Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/group"/>
-</component>
-</collection>
-<collection name="flashliteapi_3_1" long-name="Flash Lite API 3.1" level="specific">
-<!-- collection is really a component. Move down a directory -->
-<component name="flashliteapi_3_1_build" long-name="Flash Lite API Build" filter="s60" introduced="^2"/>
-</collection>
-<collection name="mediakeys" long-name="Media Keys" level="plugin">
-<!-- collection is really a component. Move down a directory -->
-<component name="mediakeys_build" filter="s60" long-name="Media Keys Build">
-<unit bldFile="mw/appsupport/mediakeys/group"/>
-</component>
-</collection>
-<collection name="startupservices" long-name="Startup Services" level="system">
-<component name="splashscreen" filter="s60" long-name="Splash Screen">
-<unit bldFile="mw/appsupport/startupservices/splashscreen/group"/>
-</component>
-<component name="startupanimation" filter="s60" long-name="Startup Animation">
-<unit bldFile="mw/appsupport/startupservices/startupanimation/group"/>
-</component>
-<component name="startup" long-name="Startup Application" filter="s60">
-<unit bldFile="mw/appsupport/startupservices/startup/group"/>
-</component>
-</collection>
-<collection name="sysresmonitoring" long-name="System Resource Monitoring" level="system">
-<component name="oodmonitor" filter="s60" long-name="OOD Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oodmonitor/group"/>
-</component>
-<component name="oommonitor" filter="s60" long-name="OOM Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oommonitor/group"/>
-</component>
-</collection>
-<collection name="systemsettings" long-name="System Settings" level="system">
-<component name="gssensorplugin" filter="s60" long-name="GS Sensor Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gssensorplugin/group"/>
-</component>
-<component name="gsaccessoryplugin" filter="s60" long-name="GS Accessory Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gsaccessoryplugin/group"/>
-</component>
-</collection>
-<collection name="filehandling" long-name="File Handling" level="server">
-<component name="fileconverterfw" long-name="File Converter Framework" purpose="optional">
-<unit bldFile="mw/appsupport/filehandling/fileconverterfw/group" mrp="mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
-</component>
-<component name="htmltorichtextconverter" long-name="HTML to RichText Converter" introduced="7.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/htmltorichtextconverter/group" mrp="mw/appsupport/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
-</component>
-<component name="richtexttohtmlconverter" long-name="RichText to HTML Converter" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
-</component>
-</collection>
-<collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
-<component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
-</component>
-</collection>
-<collection name="commonappservices" long-name="Common Application Services" level="framework">
-<component name="alarmserver" long-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"/>
-</component>
-<component name="alarmservertest" long-name="Alarm Server Test" deprecated="^3" introduced="8.1" purpose="development">
-<unit bldFile="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
-</component>
-<component name="appservicesdocs" long-name="Application Services Documentation" purpose="development" class="doc">
-<unit mrp="mw/appsupport/commonappservices/appservicesdocs/app-services_documentation.mrp"/>
-</component>
-<component name="backuprestorenotification" long-name="Backup Restore Notification" introduced="8.1" purpose="optional">
-<unit bldFile="mw/appsupport/commonappservices/backuprestorenotification/group" mrp="mw/appsupport/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
-</component>
-</collection>
-<collection name="tzservices" long-name="Time Zone Services" level="plugin">
-<component name="tzserver" long-name="Time Zone Server" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzserver/group" mrp="mw/appsupport/tzservices/tzserver/group/app-services_tz.mrp"/>
-</component>
-<component name="tzloc" long-name="Time Zone Localization" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzloc/group" mrp="mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
-</component>
-<component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzlocrscfactory/group" mrp="mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
-</component>
-<component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzdatabase/group" mrp="mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
-</component>
-</collection>
-<collection name="contenthandling" long-name="Content Handling" level="plugin">
-<component name="webrecognisers" long-name="Web Recognisers" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/contenthandling/webrecognisers/group" mrp="mw/appsupport/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
-</component>
-</collection>
-<collection name="openenvutils" long-name="Open Environment Utilities" level="specific">
-<component name="commandshell" long-name="Command Shell" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/commandshell/group" mrp="mw/appsupport/openenvutils/commandshell/group/oetools_zsh.mrp"/>
-</component>
-<component name="telnetserver" long-name="Telnet Server" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/telnetserver/group" mrp="mw/appsupport/openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
-</component>
-</collection>
-<collection name="printingsupport" long-name="Printing Support" level="generic">
-<component name="printinguisupport" long-name="Printing UI Support" purpose="optional" introduced="^2" deprecated="^3">
-<unit bldFile="mw/appsupport/printingsupport/printinguisupport/group" mrp="mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
-</component>
-</collection>
-<collection name="appfw" long-name="Application Framework" level="framework">
-<component name="apparchitecture" long-name="Application Architecture" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/apparchitecture/group" mrp="mw/appsupport/appfw/apparchitecture/group/app-framework_apparc.mrp"/>
-</component>
-<component name="viewserver" long-name="View Server" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/viewserver/group" mrp="mw/appsupport/appfw/viewserver/group/app-framework_viewsrv.mrp"/>
-</component>
-</collection>
-<collection name="applaunchservices" long-name="Application Launch Services" level="generic">
-<component name="aftermarketappstarter" long-name="After Market Application Starter" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/aftermarketappstarter/group" mrp="mw/appsupport/applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
-</component>
-<component name="applaunchplugins" long-name="Application Launch Plugins" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/applaunchplugins/group" mrp="mw/appsupport/applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
-</component>
-</collection>
-<collection name="tzpcside" long-name="Time Zone PC Side" level="plugin">
-<component name="tzcompiler" long-name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config PC">
-<unit bldFile="mw/appsupport/tzpcside/tzcompiler/group" mrp="mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
-</component>
-</collection>
-<collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
-<component name="appsupport_metadata" long-name="Generic Application Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="securitysrv" level="generic" long-name="Security Services" levels="plugin framework server generic specific">
-<collection name="secsrv_plat" long-name="Security Services Platform Interfaces" level="specific">
-<component name="cms_api" long-name="CMS API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/cms_api/group"/>
-</component>
-<component name="pkcs12_parser_api" long-name="PKCS12 Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkcs12_parser_api/group"/>
-</component>
-<component name="java_utils_api" long-name="Java Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/java_utils_api/group"/>
-</component>
-<component name="wim_cert_api" long-name="WIM Cert API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/wim_cert_api/group"/>
-</component>
-<component name="device_key_store_encryption_plugin_api" long-name="Device Key Store Encryption Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/device_key_store_encryption_plugin_api/group"/>
-</component>
-<component name="x509certnameparser_api" long-name="X.509 Certificate Name Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
-</component>
-<component name="remote_lock_api" long-name="Remote Lock API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
-</component>
-<component name="pkidialog_api" long-name="PKI Dialog API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
-</component>
-<component name="provisioning_api" long-name="Provisioning API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/provisioning_api/group"/>
-</component>
-<component name="keyguard_configuration_api" long-name="Keyguard Configuration API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_configuration_api/group"/>
-</component>
-<component name="keylock_policy_api" long-name="Keylock Policy API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keylock_policy_api/group"/>
-</component>
-<component name="security_code_ui_api" long-name="Security Code UI API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
-</component>
-<component name="gba_api" long-name="GBA API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/gba_api/group"/>
-</component>
-<component name="keyguard_access_api" long-name="Keyguard Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_access_api/group"/>
-</component>
-<component name="devicelock_access_api" long-name="Device Lock Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devicelock_access_api/group"/>
-</component>
-<component name="lockapp_server_api" long-name="Lock Application Server API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
-</component>
-<component name="devencadaptation_api" long-name="Device Encryption Adaptation API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
-</component>
-<component name="devenccommonutils_api" long-name="Device Encryption Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
-</component>
-</collection>
-<collection name="cms" long-name="Certificate Management Service" level="server">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="cms_build" filter="s60" long-name="CMS" introduced="^3">
-<unit bldFile="mw/securitysrv/cms/group"/>
-</component>
-</collection>
-<collection name="pkiutilities" long-name="PKI Utilities" level="plugin">
-<component name="x509certnameparser" filter="s60" long-name="X.509 Certificate Name Parser">
-<unit bldFile="mw/securitysrv/pkiutilities/x509certnameparser/group"/>
-</component>
-<component name="pkcs12" filter="s60" long-name="PKCS #12">
-<unit bldFile="mw/securitysrv/pkiutilities/pkcs12/group"/>
-</component>
-<component name="certmanui" filter="s60" long-name="Certificate Management UI">
-<unit bldFile="mw/securitysrv/pkiutilities/certmanui/group"/>
-</component>
-<component name="ctsecuritydialogs" filter="s60" long-name="Crypto Token Security Dialogs">
-<unit bldFile="mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
-</component>
-<component name="certsaver" filter="s60" long-name="Certificate Saver">
-<unit bldFile="mw/securitysrv/pkiutilities/certsaver/group"/>
-</component>
-<component name="secmodui" filter="s60" long-name="Security Module UI">
-<unit bldFile="mw/securitysrv/pkiutilities/secmodui/group"/>
-</component>
-<component name="devicetoken" filter="s60" long-name="Device Token">
-<unit bldFile="mw/securitysrv/pkiutilities/devicetoken/group"/>
-</component>
-<component name="certificates" filter="s60" long-name="Certificates">
-<unit bldFile="mw/securitysrv/pkiutilities/Certificates/group" filter="sf_build"/>
-</component>
-<component name="pkiutilities_build" filter="s60" long-name="PKI Utilities Build">
-<!-- need to split this into the above components -->
-<unit bldFile="mw/securitysrv/pkiutilities/group"/>
-</component>
-<component name="ocsp" long-name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
-<unit bldFile="mw/securitysrv/pkiutilities/ocsp/group" mrp="mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
-</component>
-</collection>
-<collection name="wim" long-name="Wireless Identity Module " level="framework">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="wim_build" filter="s60" long-name="WIM Build">
-<unit bldFile="mw/securitysrv/wim/group"/>
-</component>
-</collection>
-<collection name="remotelock" long-name="Remote Lock" level="generic">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="remotelock_build" filter="s60" long-name="Remote Lock Build">
-<unit bldFile="mw/securitysrv/remotelock/group"/>
-</component>
-</collection>
-<collection name="securitydialogs" long-name="Security Dialogs" level="specific">
-<component name="keylockpolicyapi" filter="s60" long-name="Keylock Policy API">
-<unit bldFile="mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
-</component>
-<component name="autolock" long-name="Autolock" filter="s60">
-<unit bldFile="mw/securitysrv/securitydialogs/autolock/group"/>
-</component>
-<component name="secui" filter="s60" long-name="Security UI">
-<unit bldFile="mw/securitysrv/securitydialogs/secui/group"/>
-</component>
-<component name="securitynotifier" filter="s60" long-name="Security Notifier">
-<unit bldFile="mw/securitysrv/securitydialogs/securitynotifier/group"/>
-</component>
-<component name="lockclient" filter="s60" long-name="Lock Client" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockclient/group"/>
-</component>
-<component name="lockapp" filter="s60" long-name="Lock Application" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockapp/group"/>
-</component>
-<component name="simlockui" filter="s60" long-name="SIM Lock UI" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/simlockui/group"/>
-</component>
-</collection>
-<collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="boottimeintegritycheck_build" filter="s60" long-name="Boot Time Integrity Check Build">
-<unit bldFile="mw/securitysrv/boottimeintegritycheck/group"/>
-</component>
-</collection>
-<collection name="gba" long-name="Generic Bootstrapping Architecture" level="server">
-<component name="uicc" filter="s60" long-name="UICC" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/uicc/group"/>
-</component>
-<component name="gbaserver" filter="s60" long-name="GBA Server" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaserver/group"/>
-</component>
-<component name="gbaapi" filter="s60" long-name="GBA API" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaapi/group"/>
-</component>
-<component name="gbafilter" filter="s60" long-name="GBA HTTP Filter" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/gbafilter/group"/>
-</component>
-<component name="gba_build" filter="s60" long-name="Generic Boot Architecture Build" introduced="^2">
-<!-- need to split this into the above components, or remove #includes and make this GBA ROM -->
-<unit bldFile="mw/securitysrv/gba/group"/>
-</component>
-</collection>
-<collection name="devencdiskutils" long-name="Device Encryption Disk Utils" level="server">
-<component name="devenccommonutils" filter="s60" long-name="Device Encryption Common Utils" introduced="^3">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncCommonUtils/group"/>
-</component>
-<component name="devencrfsplugin" filter="s60" long-name="Device Encryption RFS Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncRfsPlugin/group"/>
-</component>
-<component name="pk5recognizer" filter="s60" long-name="Device Encryption Pk5 Recognizer" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/Pk5Recognizer/group"/>
-</component>
-<component name="devencstarter" filter="s60" long-name="Device Encryption Starter" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncStarter/group"/>
-</component>
-<component name="devencdiskutils" filter="s60" long-name="Device Encryption Disk Utils Build" introduced="^3">
-<!-- need to split this into the above components, or remove #includes and make this a ROM component-->
-<unit bldFile="mw/securitysrv/devencdiskutils/group"/>
-</component>
-</collection>
-<collection name="securitysrv_info" long-name="Security Services Info" level="specific">
-<component name="securitysrv_metadata" long-name="Security Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="drm" level="generic" long-name="DRM" levels="plugin framework server generic specific">
-<collection name="drm_plat" long-name="DRM Platform Interfaces" level="specific">
-<component name="roap_api" long-name="ROAP API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/roap_api/group"/>
-</component>
-<component name="drm_common_api" long-name="DRM Common API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_common_api/group"/>
-</component>
-<component name="drm_rights_api" long-name="DRM Rights API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_rights_api/group"/>
-</component>
-<component name="drm_legacy_api" long-name="DRM Legacy API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_legacy_api/group"/>
-</component>
-<component name="dcf_repository_api" long-name="DCF Repository API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/dcf_repository_api/group"/>
-</component>
-<component name="drm_service_api" long-name="DRM Service API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_service_api/group"/>
-</component>
-<component name="drm_secondary_display_api" long-name="DRM Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_secondary_display_api/group"/>
-</component>
-<component name="drm_license_manager_api" long-name="DRM License Manager API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_license_manager_api/group"/>
-</component>
-<component name="drm_utility_api" long-name="DRM Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_utility_api/group"/>
-</component>
-<component name="drm_agents_api" long-name="DRM Agents API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_agents_api/group"/>
-</component>
-<component name="wmdrm_core_api" long-name="WM DRM Core API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_core_api/group"/>
-</component>
-<component name="wmdrm_access_api" long-name="WMDRM Access API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_access_api/group"/>
-</component>
-<component name="wmdrm_ota_access_api" long-name="WMDRM OTA Access API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_ota_access_api/group"/>
-</component>
-<component name="camese_utility_api" long-name="Camese Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_utility_api/group"/>
-</component>
-<component name="camese_framework_api" long-name="Camese Framework API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_framework_api/group"/>
-</component>
-</collection>
-<collection name="drm_pub" long-name="DRM Public Interfaces" level="specific">
-<component name="drm_helper_api" long-name="DRM Helper API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_helper_api/group"/>
-</component>
-<component name="oma_drm_caf_agent_api" long-name="OMA DRM CAF Agent API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/group"/>
-</component>
-<component name="drm_license_checker_api" long-name="DRM License Checker API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_license_checker_api/group"/>
-</component>
-</collection>
-<collection name="commondrm" long-name="Common DRM" level="generic">
-<!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
-<component name="drmencryptor" filter="s60" long-name="DRM Encryptor" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmsettingsplugin" filter="s60" long-name="DRM Settings Plugin" plugin="Y" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmrightsmanagerui" filter="s60" long-name="DRM Rights Manager UI">
-<unit bldFile="mw/drm/commondrm/drmrightsmanagerui/help/group"/>
-</component>
-<component name="drmutility" filter="s60" long-name="DRM Utility">
-<!-- Uncomment unit when configuration is in place. Currently #included from commondrm_build -->
-<!--<unit bldFile="commondrm/drmutility/group"/>-->
-</component>
-<component name="drmserviceapiwrapper" filter="s60" long-name="DRM Service API Wrapper">
-<unit bldFile="mw/drm/commondrm/drmserviceapiwrapper/group"/>
-</component>
-<component name="drmrightsstoringlocation" filter="s60" long-name="DRM Rights Storing Location">
-<unit bldFile="mw/drm/commondrm/drmrightsstoringlocation/group"/>
-</component>
-<component name="commondrm_build" filter="s60" long-name="Common DRM Build">
-<!-- should be split into the above files, or them collapsed into a single component -->
-<unit bldFile="mw/drm/commondrm/group"/>
-</component>
-</collection>
-<collection name="omadrm" long-name="OMA DRM" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="omadrm_build" filter="s60" long-name="OMA DRM Build">
-<unit bldFile="mw/drm/omadrm/group"/>
-</component>
-<component name="foundationcerts" filter="sf_build" long-name="Foundation Certificates">
-<unit bldFile="mw/drm/omadrm/foundationcerts/group"/>
-</component>
-</collection>
-<collection name="wmdrm" long-name="Windows Media DRM" level="framework">
-<!-- collection is really a component. Move down a directory -->
-<component name="wmdrm_build" filter="s60" long-name="WM DRM Build">
-<unit bldFile="mw/drm/wmdrm/group"/>
-</component>
-</collection>
-<collection name="drm_info" long-name="DRM Info" level="specific"/>
-</block>
-<block name="locationsrv" level="specific" long-name="Location Services" levels="plugin fw server if">
-<collection name="locsrv_pub" long-name="Location Services Public Interfaces" level="if">
-<component name="landmarks_search_api" long-name="Landmarks Search API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
-</component>
-<component name="landmarks_api" long-name="Landmarks API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/group"/>
-</component>
-<component name="landmarks_database_management_api" long-name="Landmarks Database Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/group"/>
-</component>
-<component name="location_triggering_api" long-name="Location Triggering API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/location_triggering_api/group"/>
-</component>
-<component name="blid_application_satellite_info_api" long-name="BLID Application Satellite Info API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/group"/>
-</component>
-</collection>
-<collection name="locsrv_plat" long-name="Location Services Platform Interfaces" level="if">
-<component name="map_and_navigation_api" long-name="Map and Navigation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/group"/>
-</component>
-<component name="map_and_navigation_provider_discovery_api" long-name="Map and Navigation Provider Discovery API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/group"/>
-</component>
-<component name="geocoding_api" long-name="Geocoding API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
-</component>
-<component name="map_image_api" long-name="Map Image API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/group"/>
-</component>
-<component name="map_and_navigation_aiw_api" long-name="Map and Navigation AIW API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_aiw_api/group"/>
-</component>
-<component name="map_and_navigation_provider_api" long-name="Map and Navigation Provider API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_api/group"/>
-</component>
-<component name="landmarks_category_definition_api" long-name="Landmarks Category Definition API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
-</component>
-<component name="supl_settings_api" long-name="SUPL Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
-</component>
-<component name="location_settings_launch_api" long-name="Location Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/group"/>
-</component>
-<component name="map_image_conversion_plugin_api" long-name="Map Image Conversion Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/group"/>
-</component>
-<component name="psy_configuration_ui_plugin_api" long-name="PSY Configuration UI Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/psy_configuration_ui_plugin_api/group"/>
-</component>
-<component name="np_proxy_configuration_api" long-name="NP Proxy Configuration API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/np_proxy_configuration_api/group"/>
-</component>
-<component name="supl_terminal_initiation_api" long-name="SUPL Terminal Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/group"/>
-</component>
-<component name="location_notation_preferences_settings_api" long-name="Location Notation Preferences Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_notation_preferences_settings_api/group"/>
-</component>
-<component name="supl_settings_notifier_secondary_display_api" long-name="SUPL Settings Notifier Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_notifier_secondary_display_api/group"/>
-</component>
-<component name="supl_network_initiation_api" long-name="SUPL Network Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/group"/>
-</component>
-<component name="privacy_notifiers_secondary_display_api" long-name="Privacy Notifiers Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/privacy_notifiers_secondary_display_api/group"/>
-</component>
-<component name="oma_supl_configuration_parameter_api" long-name="OMA SUPL Configuration Parameter API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_configuration_parameter_api/group"/>
-</component>
-<component name="supl_query_secondary_display_api" long-name="SUPL Query Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_query_secondary_display_api/group"/>
-</component>
-<component name="location_triggering_management_api" long-name="Location Triggering Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_management_api/group"/>
-</component>
-<component name="location_triggering_status_information_api" long-name="Location Triggering Status Information API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_status_information_api/group"/>
-</component>
-<component name="oma_supl_asn_codec_plugin_api" long-name="OMA SUPL ASN Codec Plugin API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
-</component>
-<component name="query_and_notification_api" long-name="Query and Notification API" filter="s60" introduced="^3" class="api">
-<!-- needs metadata file: <meta rel="Api" href="locsrv_plat/query_and_notification_api/query_and_notification_api.metaxml"/> -->
-<unit bldFile="mw/locationsrv/locsrv_plat/query_and_notification_api/group"/>
-</component>
-<component name="location_local_variation_api" long-name="Location Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_local_variation_api/group"/>
-</component>
-</collection>
-<collection name="genericpositioningplugins" long-name="Generic Positioning Plugins" level="plugin">
-<component name="locationnpppsy" filter="s60" long-name="Location Positioning Proxy PSY" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
-</component>
-<component name="locationsuplpsy" filter="s60" long-name="Location SUPL PSY" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationsuplpsy/group"/>
-</component>
-<component name="genericpositioningplugins_build" filter="s60" long-name="Generic Positioning Plugins Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/genericpositioningplugins/group"/>
-</component>
-</collection>
-<collection name="landmarks" long-name="Landmarks" level="server">
-<component name="locationlandmarks" filter="s60" long-name="Location Landmarks">
-<unit bldFile="mw/locationsrv/landmarks/locationlandmarks/group"/>
-</component>
-</collection>
-<collection name="locationmapnavfw" long-name="Location Map and Navigation Framework" level="fw">
-<component name="mnlibrary" filter="s60" long-name="Map and Navigation Library">
-<unit bldFile="mw/locationsrv/locationmapnavfw/library/group"/>
-</component>
-<component name="mnaiwprovider" filter="s60" long-name="Map and Navigation AIW Provider" plugin="Y">
-<unit bldFile="mw/locationsrv/locationmapnavfw/aiwprovider/group"/>
-</component>
-<component name="locationmapnavfw_build" filter="s60" long-name="Location Map and Navigation Framework Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/locationmapnavfw/group"/>
-</component>
-</collection>
-<collection name="locationsystemui" long-name="Location System UI" level="if">
-<component name="locationsysui" filter="s60" long-name="Location System UI">
-<unit bldFile="mw/locationsrv/locationsystemui/locationsysui/group"/>
-</component>
-</collection>
-<collection name="supl" long-name="SUPL" level="fw">
-<component name="locationsuplfw" filter="s60" long-name="Location SUPL Framework">
-<unit bldFile="mw/locationsrv/supl/locationsuplfw/group"/>
-</component>
-<component name="locationomasuplprotocolhandler" filter="s60" long-name="OMA SUPL Protocol Handler">
-<unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/group"/>
-</component>
-<component name="supltiapiimplementation" filter="s60" long-name="SUPL TI API Implementation" introduced="^3">
-<unit bldFile="mw/locationsrv/supl/supltiapiimplementation/group"/>
-</component>
-</collection>
-<collection name="locationtriggering" long-name="Location Triggering" level="server">
-<component name="ltlogger" filter="s60" long-name="LT Logger">
-<unit bldFile="mw/locationsrv/locationtriggering/ltlogger/group"/>
-</component>
-<component name="ltclientlib" filter="s60" long-name="LT Client Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltclientlib/group"/>
-</component>
-<component name="ltmanagementlib" filter="s60" long-name="LT Management Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmanagementlib/group"/>
-</component>
-<component name="ltcontainer" filter="s60" long-name="LT Container">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontainer/group"/>
-</component>
-<component name="ltserver" filter="s60" long-name="LT Server">
-<unit bldFile="mw/locationsrv/locationtriggering/ltserver/group"/>
-</component>
-<component name="ltstrategypluginapi" filter="s60" long-name="LT Strategy Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategypluginapi/group"/>
-</component>
-<component name="ltstrategyengine" filter="s60" long-name="LT Strategy Engine">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategyengine/group"/>
-</component>
-<component name="ltmovementdetectionpluginapi" filter="s60" long-name="Movement Detection Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmovementdetectionpluginapi/group"/>
-</component>
-<component name="ltcellidmovementdetector" filter="s60" long-name="Cell ID Movement Detector">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/>
-</component>
-<component name="lbtmgmtui" filter="s60" long-name="LBT Management UI" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/lbtmgmtui/group"/>
-</component>
-<component name="ltcontextsourceplugin" filter="s60" long-name="LT Context Source Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontextsourceplugin/group"/>
-</component>
-<component name="locationtriggering_build" filter="s60" long-name="Location Triggering Build">
-<!-- should remove #include from this and maybe put exports in the above components -->
-<unit bldFile="mw/locationsrv/locationtriggering/group"/>
-</component>
-</collection>
-</block>
-<block name="accesssec" level="generic" long-name="Access Security" levels="plugin framework server generic specific">
-<collection name="accesssec_plat" long-name="Access Security Platform Interfaces" level="specific">
-<component name="wapi_security_settings_ui_api" long-name="WAPI Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_security_settings_ui_api/group"/>
-</component>
-<component name="wep_security_settings_ui_api" long-name="WEP Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wep_security_settings_ui_api/group"/>
-</component>
-<component name="wi-fi_protected_setup_ui_api" long-name="Wi-Fi Protected Setup UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
-</component>
-<component name="wlan_eap_settings_ui_api" long-name="WLAN EAP Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wlan_eap_settings_ui_api/group"/>
-</component>
-<component name="wpa_security_settings_ui_api" long-name="WPA Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wpa_security_settings_ui_api/group"/>
-</component>
-<component name="eap_vpn_api" long-name="EAP VPN API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
-</component>
-<component name="eapsim_db_api" long-name="EAP-SIM DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapsim_db_api/group"/>
-</component>
-<component name="eap_type_api" long-name="EAP Type API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_type_api/group"/>
-</component>
-<component name="eaptlspeap_db_api" long-name="EAP-TLS-PEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eaptlspeap_db_api/group"/>
-</component>
-<component name="eapleap_db_api" long-name="LEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapleap_db_api/group"/>
-</component>
-<component name="eapgtc_db_api" long-name="EAP-GTC DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapgtc_db_api/group"/>
-</component>
-<component name="eapmschapv2_db_api" long-name="EAP-MSCHAPV2 DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapmschapv2_db_api/group"/>
-</component>
-<component name="eapaka_db_api" long-name="EAP-AKA DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapaka_db_api/group"/>
-</component>
-<component name="wapi_db_api" long-name="WAPI DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_db_api/group"/>
-</component>
-</collection>
-<collection name="wlansecuritysettings" long-name="WLAN Security Settings" level="specific">
-<component name="wapisecuritysettingsui" filter="s60" long-name="WAPI Security Settings UI" introduced="9.1">
-<!-- the directory for this needs to be moved up to the right level -->
-<unit bldFile="mw/accesssec/wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
-</component>
-<component name="wepsecuritysettingsui" filter="s60" long-name="WEP Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wepsecuritysettingsui/group"/>
-</component>
-<component name="wifiprotectedsetup" filter="s60" long-name="WIFI Protected Setup" introduced="^1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wifiprotectedsetup/group"/>
-</component>
-<component name="wlaneapsettingsui" filter="s60" long-name="WLAN EAP Settings UI" introduced="9.3">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wlaneapsettingsui/group"/>
-</component>
-<component name="wpasecuritysettingsui" filter="s60" long-name="WPA Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wpasecuritysettingsui/group"/>
-</component>
-</collection>
-<collection name="eapol" long-name="EAPOL" level="framework">
-<component name="eapol_framework" filter="s60" long-name="EAPOL Framework" introduced="9.2">
-<unit bldFile="mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
-</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">
-<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>
-<component name="bearer_settings_plugin_api" long-name="Bearer Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/bearer_settings_plugin_api/group"/>
-</component>
-<component name="commsdat_wlan_api" long-name="CommsDat WLAN API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/commsdat_wlan_api/group"/>
-</component>
-<component name="connection_monitor_extension_api" long-name="Connection Monitor Extension API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_monitor_extension_api/group"/>
-</component>
-<component name="connection_ui_utilities_api" long-name="Connection UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_ui_utilities_api/group"/>
-</component>
-<component name="disconnect_dialog_api" long-name="Disconnect Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_api/group"/>
-</component>
-<component name="disconnect_dialog_disable_api" long-name="Disconnect Dialog Disable API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_disable_api/group"/>
-</component>
-<component name="extended_connection_settings_api" long-name="Extended Connection Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/extended_connection_settings_api/group"/>
-</component>
-<component name="mpm_default_connection_api" long-name="MPM Default Connection API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_default_connection_api/group"/>
-</component>
-<component name="pdpcontextmanager2_reset_factory_settings_api" long-name="PDP Context Manager 2 Reset Factory Settings API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_settings_api/group"/>
-</component>
-<component name="mpm_connect_screen_api" long-name="MPM Connect Screen API" filter="s60" class="api">
-<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">
-<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>
-<component name="access_point_engine_api" long-name="Access Point Engine API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_monitor_server_api/group"/>
-</component>
-<component name="connection_settings_ui_api" long-name="Connection Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_ui_api/group"/>
-</component>
-<component name="agent_dialog_api" long-name="Agent Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/agent_dialog_api/group"/>
-</component>
-<component name="extendedconnpref_api" long-name="Extended Connection Preferences API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/extendedconnpref_api/group"/>
-</component>
-</collection>
-<collection name="accesspointcontrol" long-name="Access Point Control" level="plugin">
-<component name="apcontrollistplugin" filter="s60" long-name="Access Point Control List Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
-</component>
-</collection>
-<collection name="alwayson_net_plugin" long-name="Always Online Net Plugin" level="server">
-<component name="pdpcontextmanager2" filter="s60" long-name="PDP Context Manager 2">
-<unit bldFile="mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
-</component>
-</collection>
-<collection name="apengine" long-name="Access Point Engine" level="framework">
-<component name="apeng" filter="s60" long-name="Access Point Engine">
-<unit bldFile="mw/ipconnmgmt/apengine/apeng/group"/>
-</component>
-<component name="apsettingshandlerui" filter="s60" long-name="Access Point Settings Handler UI">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingshandlerui/group"/>
-</component>
-<component name="apsettingsplugin" filter="s60" long-name="Access Point Settings Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="bearermanagement" long-name="Bearer Management" level="framework">
-<component name="mpm" filter="s60" long-name="Mobility Policy Manager">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/mpm/group"/>
-</component>
-<component name="extendedconnpref" filter="s60" long-name="Extended Connection Preferences">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/extendedconnpref/group"/>
-</component>
-<component name="s60mcpr" filter="s60" long-name="S60 Meta-Connection Provider" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/S60MCPR/group"/>
-</component>
-</collection>
-<collection name="cmmanager" long-name="Connection Method Manager" level="framework">
-<component name="cmmgr" filter="s60" long-name="CM Manager">
-<unit bldFile="mw/ipconnmgmt/cmmanager/cmmgr/group"/>
-</component>
-<component name="gsconnsettingsplugin" filter="s60" long-name="GS Connection Settings Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/cmmanager/gsconnsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="connectionmonitoring" long-name="Connection Monitoring" level="server">
-<component name="connectionmonitorplugin" filter="s60" long-name="Connection Monitor Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorplugin/group"/>
-</component>
-<component name="connectionmonitorui" filter="s60" long-name="Connection Monitor UI">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorui/group"/>
-</component>
-<component name="connmon" filter="s60" long-name="Connection Monitor">
-<!-- either split into two components, or #include from a common bld.inf -->
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/connectionmonitor/group"/>
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/dataconnectionlogger/group"/>
-</component>
-<component name="connmonext" filter="s60" long-name="Connection Monitor Extension API">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmonext/group"/>
-</component>
-</collection>
-<collection name="connectionutilities" long-name="Connection Utilities" level="utils">
-<component name="connectiondialogs" filter="s60" long-name="Connection Dialogs">
-<unit bldFile="mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/>
-</component>
-</collection>
-<collection name="dbcreator" long-name="DB Creator" level="utils">
-<component name="commsdatcreator" filter="s60" long-name="Comms Database Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
-</component>
-<component name="commsdatcreatorrfsplugin" filter="s60" long-name="Comms Database Creator RFS Plugin" introduced="9.3" plugin="Y">
-<!-- uncomment when config is turned on -->
-<!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
-</component>
-<component name="commsdatstartup" filter="s60" long-name="Comms Database Startup" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
-</component>
-<component name="dbcreatorexe" filter="s60" long-name="DB Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
-</component>
-<component name="dbcreator_build" filter="s60" long-name="DB Creator Build" introduced="9.3">
-<!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
-<unit bldFile="mw/ipconnmgmt/dbcreator/group"/>
-</component>
-</collection>
-<collection name="ipconnmgmt_info" long-name="IP Connectivity Management Info" level="utils">
-<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"/>
-</component>
-</collection>
-</block>
-<block name="netprotocols" level="generic" long-name="High-level Internet Protocols" levels="plugin framework server generic specific">
-<collection name="netprotocols_plat" long-name="High-level Internet Protocols Platform Interfaces" level="specific">
-<component name="cookie_manager_api" long-name="Cookie Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/cookie_manager_api/group"/>
-</component>
-<component name="http_cache_mgr_api" long-name="HTTP Cache Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_cache_mgr_api/group"/>
-</component>
-<component name="http_filters_api" long-name="HTTP Filters API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_filters_api/group"/>
-</component>
-</collection>
-<collection name="httpfilters" long-name="HTTP Filters" level="plugin">
-<component name="httpfiltercommon" filter="s60" long-name="HTTP Filter Common">
-<unit bldFile="mw/netprotocols/httpfilters/httpfiltercommon/group"/>
-</component>
-<component name="cookie" filter="s60" long-name="Cookie Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/cookie/group"/>
-</component>
-<component name="deflatefilter" filter="s60" long-name="Deflate Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/deflatefilter/group"/>
-</component>
-<component name="httpfilteracceptheader" filter="s60" long-name="Accept Header Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteracceptheader/group"/>
-</component>
-<component name="httpfilterauthentication" filter="s60" long-name="Authentication Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterauthentication/group"/>
-</component>
-<component name="httpfilterconnhandler" filter="s60" long-name="Connection Handler Fitler" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterconnhandler/group"/>
-</component>
-<component name="httpfilteriop" filter="s60" long-name="HTTP IOP Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteriop/group"/>
-</component>
-<component name="httpfilterproxy" filter="s60" long-name="HTTP Proxy Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterproxy/group"/>
-</component>
-<component name="uaproffilter" filter="s60" long-name="UAProf Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/uaproffilter/group"/>
-</component>
-</collection>
-<collection name="applayerprotocols" long-name="Application Layer Protocols" level="server">
-<component name="httptransportfw" long-name="HTTP Transport Framework" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
-</component>
-<component name="httpexamples" long-name="HTTP Examples" introduced="6.2" purpose="development">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpexamples/group" mrp="mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
-</component>
-<component name="wappushsupport" long-name="WAP Push Support" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
-</component>
-<component name="wapbase" long-name="WAP Base" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wapbase/Group" mrp="mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
-</component>
-<component name="ftpengine" long-name="FTP Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/ftpengine/group" mrp="mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
-</component>
-<component name="telnetengine" long-name="Telnet Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/telnetengine/group" mrp="mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
-</component>
-<component name="httpserviceapi" long-name="HTTP Service API" introduced="TB9.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpservice/group" mrp="mw/netprotocols/applayerprotocols/httpservice/group/http_service.mrp"/>
-</component>
-</collection>
-<collection name="applayerpluginsandutils" long-name="Application Layer Plugins and Utils" level="framework">
-<component name="uripermissionservices" long-name="URI Permission Services" introduced="^2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
-</component>
-<component name="bookmarksupport" long-name="Bookmark Support" introduced="9.1" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
-</component>
-<component name="httpprotocolplugins" long-name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
-</component>
-<component name="httptransportplugins" long-name="HTTP Transport Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
-</component>
-</collection>
-<collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
-<component name="netprotocols_metadata" long-name="High-level Internet Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ipappprotocols" level="generic" long-name="IP App Protocols" levels="plugin conn server if">
-<collection name="ipappprotocols_plat" long-name="IP App Protocols Platform Interfaces" level="if">
-<component name="srtp_api" long-name="SRTP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/srtp_api/group"/>
-</component>
-<component name="rtprtcp_api" long-name="RTP/RTCP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/rtprtcp_api/group"/>
-</component>
-</collection>
-<collection name="rtp" long-name="RTP" level="server">
-<component name="srtpstack" filter="s60" long-name="SRTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/srtpstack/group"/>
-</component>
-<component name="rtpstack" filter="s60" long-name="RTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/rtpstack/group"/>
-</component>
-</collection>
-<collection name="realtimenetprots" long-name="Real Time Net Protocols" level="server">
-<component name="symrtp" long-name="RTP" introduced="9.0" purpose="optional">
-<!-- Real Time Data Protocol -->
-<unit bldFile="mw/ipappprotocols/realtimenetprots/rtp/group" mrp="mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
-</component>
-<component name="sipfw" long-name="SIP Framework" introduced="9.2" purpose="optional">
-<unit bldFile="mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp" version="2"/>
-</component>
-</collection>
-<collection name="sipplugins" long-name="SIP Plugins" level="plugin">
-<component name="sippwlanplugin" filter="s60" long-name="SIP WLAN Plugin" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
-</component>
-<component name="sippsipsettingsui" filter="s60" long-name="SIP Settings UI" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
-</component>
-<component name="sippdevmgmtsipadapter" filter="s60" long-name="Device Management SIP Settings Adapter" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
-</component>
-<component name="sippsystemstatemonitor" filter="s60" long-name="SIP System State Monitor" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsystemstatemonitor/group"/>
-</component>
-<component name="sippsipadapter" filter="s60" long-name="SIP Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipadapter/group"/>
-</component>
-</collection>
-<collection name="sipproviderplugins" long-name="SIP Provider Plugins" level="conn">
-<component name="sipprovider" long-name="SIP Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipproviderplugins/sipprovider/group" mrp="mw/ipappprotocols/sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
-</component>
-</collection>
-<collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="if">
-<component name="ipappprotocols_metadata" long-name="IP App Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wirelessacc" level="specific" long-name="Wireless Access" levels="framework generic ui">
-<collection name="hsfw_plat" long-name="HotSpot Framework Platform Interfaces" level="ui">
-<component name="hotspot_framework_client_api" long-name="HotSpot Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_api" long-name="Internet Connectivity Test Service API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_settings_api" long-name="Internet Connectivity Test Service Settings API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
-</component>
-<component name="hotspot_framework_client_plugin_api" long-name="HotSpot Framework Client Plugin API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
-</component>
-</collection>
-<collection name="hotspotfw" long-name="HotSpot Framework" level="framework">
-<component name="hsserver" filter="s60" long-name="HotSpot Server" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="hsclient" filter="s60" long-name="HotSpot Client" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="internetconnectivitytestservice" filter="s60" long-name="Internet Connectivity Test Service" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
-</component>
-<component name="ictsdialogs" filter="s60" long-name="Internet Connectivity Test Service Dialogs" deprecated="^3" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
-</component>
-<component name="hspluginforagent" filter="s60" long-name="HotSpot Plugin for Agent" plugin="Y" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
-</component>
-<component name="hsbrowser" filter="s60" long-name="HotSpot Browser" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
-</component>
-<component name="hotspotfw_build" filter="s60" long-name="Hotspot Framework Build">
-<!-- should break up this bld.inf into the above components, or collapse them all into a single component -->
-<unit bldFile="mw/wirelessacc/hotspotfw/group"/>
-</component>
-</collection>
-<collection name="wlanutilities" long-name="WLAN Utilities" level="generic">
-<component name="wlanplugin" filter="s60" long-name="WLAN Plugin" plugin="Y">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlanplugin/group"/>
-</component>
-<component name="wlansettingsui" filter="s60" long-name="WLAN Settings UI">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlansettingsui/group"/>
-</component>
-<component name="wlansniffer" filter="s60" long-name="WLAN Sniffer">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlansniffer/group"/>
-</component>
-<component name="wlanindicatorplugin" filter="s60" long-name="WLAN Indicator Plugin" plugin="Y">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlanindicatorplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="vpnclient" level="specific" long-name="VPN Client" levels="engine ui api">
-<!-- is the !oem_build filter needed? -->
-<collection name="vpnc_plat" long-name="VPN Client Platform Interfaces" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API" class="api">
-<unit bldFile="mw/vpnclient/vpnc_plat/vpnapi/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API">
-<unit bldFile="mw/vpnclient/vpnapiimpl/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnengine" long-name="VPN Engine" level="engine">
-<!-- too many components in this collection.
- Probably best to group the binaries together into larger components
- or maybe split the collection into more reasonable groups -->
-<component name="eventmediatorapi" filter="s60" long-name="Event Mediator API">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediatorapi/group" filter="!oem_build"/>
-</component>
-<component name="eventviewer" filter="s60" long-name="Event Viewer">
-<unit bldFile="mw/vpnclient/vpnengine/eventviewer/group" filter="!oem_build"/>
-</component>
-<component name="vpnins" filter="s60" long-name="VPN Installer">
-<unit bldFile="mw/vpnclient/vpnengine/vpnins/group" filter="!oem_build"/>
-</component>
-<component name="ikepolparser" filter="s60" long-name="IKE Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/ikepolparser/group" filter="!oem_build"/>
-</component>
-<component name="utlbase64" filter="s60" long-name="Base64 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlbase64/group" filter="!oem_build"/>
-</component>
-<component name="utlcrypto" filter="s60" long-name="Crypto Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlcrypto/group" filter="!oem_build"/>
-</component>
-<component name="utlxml" filter="s60" long-name="XML Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlxml/group" filter="!oem_build"/>
-</component>
-<component name="utlpkcs10" filter="s60" long-name="PKCS#10 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs10/group" filter="!oem_build"/>
-</component>
-<component name="pkiserviceapi" filter="s60" long-name="PKI Service API">
-<unit bldFile="mw/vpnclient/vpnengine/pkiserviceapi/group" filter="!oem_build"/>
-</component>
-<component name="ikecert" filter="s60" long-name="IKE Certificate Management">
-<unit bldFile="mw/vpnclient/vpnengine/ikecert/group" filter="!oem_build"/>
-</component>
-<component name="kmdapi" filter="s60" long-name="Key Management Daemon API">
-<unit bldFile="mw/vpnclient/vpnengine/kmdapi/group" filter="!oem_build"/>
-</component>
-<component name="kmdserver" filter="s60" long-name="Key Management Daemon Server">
-<unit bldFile="mw/vpnclient/vpnengine/kmdserver/group" filter="!oem_build"/>
-</component>
-<component name="ikeutils" filter="s60" long-name="Internet Key Exchange Utils">
-<unit bldFile="mw/vpnclient/vpnengine/ikeutils/group" filter="!oem_build"/>
-</component>
-<component name="ikev1lib" filter="s60" long-name="IKEv1 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev1lib/group" filter="!oem_build"/>
-</component>
-<component name="ikev2lib" filter="s60" long-name="IKEv2 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev2lib/group" filter="!oem_build"/>
-</component>
-<component name="vpnipsecpolparser" filter="s60" long-name="VPN IPsec Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/vpnipsecpolparser/group" filter="!oem_build"/>
-</component>
-<component name="sit" filter="s60" long-name="Socket Interaction Thread">
-<unit bldFile="mw/vpnclient/vpnengine/sit/group" filter="!oem_build"/>
-</component>
-<component name="vpntcwrapper" filter="s60" long-name="VPN Terminal Control Wrapper">
-<unit bldFile="mw/vpnclient/vpnengine/vpntcwrapper/group" filter="!oem_build"/>
-</component>
-<component name="eventmediator" filter="s60" long-name="Event Mediator">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediator/group" filter="!oem_build"/>
-</component>
-<component name="pkiservice" filter="s60" long-name="PKI Service">
-<unit bldFile="mw/vpnclient/vpnengine/pkiservice/group" filter="!oem_build"/>
-</component>
-<component name="vpnconnagt" filter="s60" long-name="VPN Connection Agent">
-<unit bldFile="mw/vpnclient/vpnengine/vpnconnagt/group" filter="!oem_build"/>
-</component>
-<component name="vpnmanager" filter="s60" long-name="VPN Manager">
-<unit bldFile="mw/vpnclient/vpnengine/vpnmanager/group" filter="!oem_build"/>
-</component>
-<component name="vpncleaner" filter="s60" long-name="VPN Cleaner">
-<unit bldFile="mw/vpnclient/vpnengine/vpncleaner/group" filter="!oem_build"/>
-</component>
-<component name="utlpkcs12" filter="s60" long-name="PKCS#12 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs12/group" filter="!oem_build"/>
-</component>
-<component name="dmadengine" filter="s60" long-name="DM Adapter Engine">
-<unit bldFile="mw/vpnclient/vpnengine/dmadengine/group" filter="!oem_build"/>
-</component>
-<component name="dmadipsecvpn" filter="s60" long-name="IPsec VPN DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadipsecvpn/group" filter="!oem_build"/>
-</component>
-<component name="dmadpki" filter="s60" long-name="PKI DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadpki/group" filter="!oem_build"/>
-</component>
-<component name="ikesocket" filter="s60" long-name="IKE Socket" introduced="^3">
-<unit bldFile="mw/vpnclient/vpnengine/ikesocket/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnui" long-name="VPN UI" level="ui">
-<component name="vpnecomnotifier" filter="s60" long-name="VPN ECOM Notifier" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnecomnotifier/group" filter="!oem_build"/>
-</component>
-<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">
-<unit bldFile="mw/vpnclient/vpnui/vpnmanagementui/group" filter="!oem_build"/>
-</component>
-<component name="vpnpolins" filter="s60" long-name="VPN Policy Installer">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolins/group" filter="!oem_build"/>
-</component>
-<component name="vpnpolicyrecognizer" filter="s60" long-name="VPN Policy Recognizer" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolicyrecognizer/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnclient_info" long-name="VPN Client Info" level="api">
-<component name="vpnclient_help" filter="s60" long-name="VPN Client Help">
-<unit bldFile="mw/vpnclient/help/group" filter="!oem_build"/>
-</component>
-<component name="vpnclient_build" filter="s60" long-name="VPN Client Build">
-<!-- should split this up into the other components and remove this-->
-<unit bldFile="mw/vpnclient/group" filter="!oem_build"/>
-</component>
-</collection>
-</block>
-<block name="ipappsrv" level="specific" long-name="IP App Services" levels="framework generic server conn plugin">
-<collection name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" level="plugin">
-<component name="transcoder_api" long-name="Transcoder API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
-</component>
-<component name="comms_event_api" long-name="Comms Event API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/comms_event_api/group"/>
-</component>
-<component name="floor_control_api" long-name="Floor Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/floor_control_api/group"/>
-</component>
-<component name="media_control_api" long-name="Media Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/media_control_api/group"/>
-</component>
-<component name="multimedia_comms_api" long-name="Multimedia Comms API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/multimedia_comms_api/group"/>
-</component>
-<component name="nat_settings_api" long-name="NAT Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/nat_settings_api/group"/>
-</component>
-</collection>
-<collection name="natfw" long-name="NAT Framework" level="framework">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="natfw_build" filter="s60" long-name="NAT Framework Build" introduced="^2">
-<unit bldFile="mw/ipappsrv/natfw/group"/>
-</component>
-</collection>
-<collection name="multimediacommscontroller" long-name="Multimedia Comms Controller" level="conn">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommscontroller_build" filter="s60" long-name="Multimedia Comms Controller Build">
-<unit bldFile="mw/ipappsrv/multimediacommscontroller/group"/>
-</component>
-</collection>
-<collection name="multimediacommsengine" long-name="Multimedia Comms Engine" level="generic">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommsengine_build" filter="s60" long-name="Multimedia Comms Engine Build">
-<unit bldFile="mw/ipappsrv/multimediacommsengine/group"/>
-</component>
-</collection>
-<collection name="natplugins" long-name="NAT Plugins" level="plugin">
-<component name="natpcliprovisioningnatfwadapter" filter="s60" long-name="Client Provisioning NAT Framework Traversal Adapter" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/group"/>
-</component>
-<component name="natpdevmgmtnatfwadapter" filter="s60" long-name="Device Management NAT Framework Traversal Adapter" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/group"/>
-</component>
-<component name="natptraversalcontroller" filter="s60" long-name="NAT Traversal Controller" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natptraversalcontroller/group"/>
-</component>
-<component name="natpnatfwsdpprovider" filter="s60" long-name="NAT Framework SDP Provider" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpnatfwsdpprovider/group"/>
-</component>
-</collection>
-<collection name="ipappsrv_info" long-name="IP App Services Info" level="plugin">
-<component name="ipappsrv_build" long-name="IP App Services Build" filter="s60">
-<!-- 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">
-<collection name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" level="specific">
-<component name="string_parser_api" long-name="String Parser API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/string_parser_api/group"/>
-</component>
-<component name="cbs_mcn_client_api" long-name="CBS MCN Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cbs_mcn_client_api/group"/>
-</component>
-<component name="converged_call_engine_api" long-name="Converged Call Engine API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_engine_api/group"/>
-</component>
-<component name="aiw_dial_data_consumer_api" long-name="AIW Dial Data Consumer API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/aiw_dial_data_consumer_api/group"/>
-</component>
-<component name="phone_client_ussd_api" long-name="Phone Client USSD API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_api/group"/>
-</component>
-<component name="sat_refresh_api" long-name="SAT Refresh API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_refresh_api/group" filter="!test"/>
-</component>
-<component name="network_handling_engine_api" long-name="Network Handling Engine API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/network_handling_engine_api/group"/>
-</component>
-<component name="phone_client_emergency_call_api" long-name="Phone Client Emergency Call API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/group"/>
-</component>
-<component name="sat_configuration_api" long-name="SAT Configuration API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_configuration_api/group"/>
-</component>
-<component name="dial_utils_api" long-name="Dial Utils API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/dial_utils_api/group"/>
-</component>
-<component name="phone_client_image_handler_api" long-name="Phone Client Image Handler API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_image_handler_api/group"/>
-</component>
-<component name="phone_client_messenger_api" long-name="Phone Client Messenger API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_messenger_api/group"/>
-</component>
-<component name="sat_client_api" long-name="SAT Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_client_api/group" filter="!test"/>
-</component>
-<component name="phone_client_api" long-name="Phone Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_api/group"/>
-</component>
-<component name="sat_service_api" long-name="SAT Service API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_service_api/group" filter="!test"/>
-</component>
-<component name="cbs_message_api" long-name="CBS Message API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cbs_message_api/group"/>
-</component>
-<component name="phone_client_server_information_api" long-name="Phone Client Server Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_server_information_api/group"/>
-</component>
-<component name="phone_client_ussd_internal_api" long-name="Phone Client USSD Internal API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_internal_api/group"/>
-</component>
-<component name="phone_client_command_handler_api" long-name="Phone Client Command Handler API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_command_handler_api/group"/>
-</component>
-<component name="phone_client_notify_api" long-name="Phone Client Notify API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_notify_api/group"/>
-</component>
-<component name="phone_client_utility_api" long-name="Phone Client Utility API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_utility_api/group"/>
-</component>
-<component name="telephony_network_information_api" long-name="Telephony Network Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_network_information_api/group"/>
-</component>
-<component name="secondary_display_sat_api" long-name="Secondary Display SAT API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/secondary_display_sat_api/group"/>
-</component>
-<component name="callui_reconnect_query_api" long-name="CallUI Reconnect Query API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/callui_reconnect_query_api/group"/>
-</component>
-<component name="service_provider_settings_api" long-name="Service Provider Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/service_provider_settings_api/group"/>
-</component>
-<component name="converged_call_provider_api" long-name="Converged Call Provider API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_provider_api/group"/>
-</component>
-<component name="incoming_call_monitor_api" long-name="Incoming Call Monitor API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/incoming_call_monitor_api/group"/>
-</component>
-<component name="default_emergency_numbers_api" long-name="Default Emergency Numbers API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/default_emergency_numbers_api/group"/>
-</component>
-<component name="cenrep_database_api" long-name="Central Repository Database API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cenrep_database_api/group"/>
-</component>
-<component name="ss_settings_api" long-name="SS Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/ss_settings_api/group"/>
-</component>
-<component name="phone_settings_observer_api" long-name="Phone Settings Observer API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_observer_api/group"/>
-</component>
-<component name="phone_settings_notes_ui_api" long-name="Phone Settings Notes UI API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_notes_ui_api/group"/>
-</component>
-<component name="phone_settings_api" long-name="Phone Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_api/group"/>
-</component>
-<component name="voice_mailbox_number_api" long-name="Voice Mailbox Number API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_number_api/group"/>
-</component>
-<component name="voice_mailbox_settings_api" long-name="Voice Mailbox Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_settings_api/group"/>
-</component>
-<component name="call_information_api" long-name="Call Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/call_information_api/group" filter="!test"/>
-</component>
-<component name="call_remote_party_information_api" long-name="Call Remote Party Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/call_remote_party_information_api/group" filter="!test"/>
-</component>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_mediator_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="telutils" long-name="Telephony Utils" level="generic">
-<component name="phoneparser" filter="s60" long-name="Phone Parser">
-<unit bldFile="mw/phonesrv/telutils/phoneparser/group"/>
-</component>
-<component name="telephonyservice" filter="s60" long-name="Telephony Service">
-<unit bldFile="mw/phonesrv/telutils/telephonyservice/group"/>
-</component>
-</collection>
-<collection name="cbs" long-name="Cellular Baseband Services" level="plugin">
-<component name="cbsserver" filter="s60" long-name="CBS Server">
-<unit bldFile="mw/phonesrv/cbs/cbsserver/group"/>
-</component>
-<component name="cbsui" filter="s60" long-name="CBS UI">
-<unit bldFile="mw/phonesrv/cbs/cbsui/group"/>
-</component>
-</collection>
-<collection name="cellular" long-name="Cellular" level="server">
-<component name="telephonysettings" filter="s60" long-name="Telephony Settings">
-<unit bldFile="mw/phonesrv/cellular/telephonysettings/group" filter="!test"/>
-</component>
-<component name="sssettings" filter="s60" long-name="Supplementary Service Settings">
-<unit bldFile="mw/phonesrv/cellular/sssettings/group" filter="!test"/>
-</component>
-<component name="psetnotesui" filter="s60" long-name="Phone Settings Notes UI">
-<unit bldFile="mw/phonesrv/cellular/psetnotesui/group" filter="!test"/>
-</component>
-<component name="servicerequest" filter="s60" long-name="Service Request">
-<unit bldFile="mw/phonesrv/cellular/servicerequest/group"/>
-</component>
-</collection>
-<collection name="convergedcallengine" long-name="Converged Call Engine" level="framework">
-<component name="callprovider" filter="s60" long-name="Call Provider">
-<unit bldFile="mw/phonesrv/convergedcallengine/callprovider/group"/>
-</component>
-<component name="cce" filter="s60" long-name="CCE">
-<unit bldFile="mw/phonesrv/convergedcallengine/cce/group" filter="!test"/>
-</component>
-<component name="spsettings" filter="s60" long-name="Service Provider Settings">
-<unit bldFile="mw/phonesrv/convergedcallengine/spsettings/group" filter="!test"/>
-</component>
-<component name="cenrepdatabase" filter="s60" long-name="CCE Cenrep Database">
-<unit bldFile="mw/phonesrv/convergedcallengine/cenrepdatabase/group"/>
-</component>
-<component name="serviceselector" filter="s60" long-name="Service Selector">
-<unit bldFile="mw/phonesrv/convergedcallengine/serviceselector/group"/>
-</component>
-<component name="csplugin" filter="s60" long-name="CS Plugin" plugin="Y">
-<!-- should spell out CS in name -->
-<unit bldFile="mw/phonesrv/convergedcallengine/csplugin/group"/>
-</component>
-</collection>
-<collection name="engines" long-name="Telephony Engines" level="specific">
-<component name="vmbxengine" filter="s60" long-name="Voice Mailbox Engine">
-<unit bldFile="mw/phonesrv/engines/vmbxengine/group"/>
-</component>
-</collection>
-<collection name="networkhandling" long-name="Network Handling" level="plugin">
-<component name="networkhandlingengine" filter="s60" long-name="Network Handling Engine">
-<unit bldFile="mw/phonesrv/networkhandling/networkhandlingengine/group"/>
-</component>
-</collection>
-<collection name="phoneclientserver" long-name="Phone Client/Server" level="server">
-<component name="enpolicy" filter="s60" long-name="Emergency Number Policy">
-<unit bldFile="mw/phonesrv/phoneclientserver/enpolicy/group"/>
-</component>
-<component name="aiwdialdata" filter="s60" long-name="AIW Dial Data">
-<unit bldFile="mw/phonesrv/phoneclientserver/aiwdialdata/group" filter="!test"/>
-</component>
-<component name="dialutils" filter="s60" long-name="Dial Utils">
-<unit bldFile="mw/phonesrv/phoneclientserver/dialutils/group" filter="!test"/>
-</component>
-<component name="phoneclient" filter="s60" long-name="Phone Client">
-<unit bldFile="mw/phonesrv/phoneclientserver/phoneclient/group" filter="!test"/>
-</component>
-<component name="phoneserver" filter="s60" long-name="Phone Server">
-<unit bldFile="mw/phonesrv/phoneclientserver/phoneserver/group"/>
-</component>
-<component name="callui" filter="s60" long-name="Call UI">
-<unit bldFile="mw/phonesrv/phoneclientserver/callui/group"/>
-</component>
-</collection>
-<collection name="satengine" long-name="SIM Application Toolkit Engine" level="generic">
-<component name="satserver" filter="s60" long-name="SAT Server">
-<unit bldFile="mw/phonesrv/satengine/satserver/group"/>
-</component>
-</collection>
-<collection name="satui" long-name="SIM Application Toolkit UI" level="specific">
-<component name="satapp" filter="s60" long-name="SAT Application">
-<unit bldFile="mw/phonesrv/satui/satapp/group"/>
-</component>
-<component name="satplugin" filter="s60" long-name="SAT Plugin" plugin="Y">
-<unit bldFile="mw/phonesrv/satui/satplugin/group"/>
-</component>
-</collection>
-<collection name="phonecmdhandler" long-name="Phone Command Handler" level="generic">
-<component name="phonecmdhnlr" filter="s60" long-name="Phone Command Handler">
-<unit bldFile="mw/phonesrv/phonecmdhandler/phonecmdhnlr/group"/>
-</component>
-</collection>
-</block>
-<block name="messagingmw" level="specific" long-name="Messaging Middleware" levels="stack fw api">
-<collection name="msgfw_pub" long-name="Messaging Middleware Public Interfaces" level="api">
-<component name="send_ui_api" long-name="Send UI API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_pub/send_ui_api/group"/>
-</component>
-</collection>
-<collection name="msgfw_plat" long-name="Messaging Middleware Platform Interfaces" level="api">
-<component name="always_online_plugin_api" long-name="Always Online Plugin API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_plugin_api/group"/>
-</component>
-<component name="always_online_client_api" long-name="Always Online Client API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_client_api/group"/>
-</component>
-<component name="msg_common_utils_api" long-name="Messaging Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/msg_common_utils_api/group"/>
-</component>
-<component name="send_ui_plugin_api" long-name="Send UI Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/send_ui_plugin_api/group"/>
-</component>
-<component name="send_ui_datautils_api" long-name="Send UI Data Utils API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/send_ui_datautils_api/group"/>
-</component>
-</collection>
-<collection name="msgbranched" long-name="Messaging Branched" level="fw">
-<!-- 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"/>
-</component>
-</collection>
-<collection name="messagingfw" long-name="Messaging Framework" level="fw">
-<!-- should break this collection up into smaller related collections -->
-<component name="alwaysonline" filter="s60" long-name="Always Online Server" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/alwaysonline/group"/>
-</component>
-<component name="msgcommonutils" filter="s60" long-name="Messaging Common Utils" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/msgcommonutils/group"/>
-</component>
-<component name="senduiservices" filter="s60" long-name="Send UI Services" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/senduiservices/group"/>
-</component>
-<component name="scheduledsendmtm" long-name="Scheduled Send MTM" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/group" mrp="mw/messagingmw/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
-</component>
-<component name="msgsrvnstore" long-name="Message Server and Store" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/group" mrp="mw/messagingmw/messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
-</component>
-<component name="biomsgfw" long-name="BIO Messaging Framework" introduced="6.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/group" mrp="mw/messagingmw/messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
-</component>
-<component name="msgconf" long-name="Messaging Config" introduced="^2" purpose="optional" class="config">
-<unit bldFile="mw/messagingmw/messagingfw/msgconf/group" mrp="mw/messagingmw/messagingfw/msgconf/group/messaging_config.mrp"/>
-</component>
-<component name="watcherfw" long-name="Watcher Framework" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/watcherfw/group" mrp="mw/messagingmw/messagingfw/watcherfw/group/messaging_watcher.mrp"/>
-</component>
-<component name="msgtest" long-name="Messaging Test" purpose="development">
-<unit bldFile="mw/messagingmw/messagingfw/msgtest/group" mrp="mw/messagingmw/messagingfw/msgtest/group/messaging_test.mrp"/>
-</component>
-<component name="sendas" long-name="Send As" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/sendas/group" mrp="mw/messagingmw/messagingfw/sendas/group/messaging_sendas2.mrp"/>
-</component>
-<component name="msgurlhandler" long-name="Message URL Handler" introduced="7.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/group" mrp="mw/messagingmw/messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
-</component>
-<component name="wappushfw" long-name="WAP Push Framework" introduced="6.1" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/wappushfw/group" mrp="mw/messagingmw/messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
-</component>
-<component name="suplsmshandler" long-name="SUPL SMS Handler" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplsmshandler/group" mrp="mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/>
-</component>
-<component name="suplwappushhandler" long-name="SUPL WAP Push Handler" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
-</component>
-</collection>
-<collection name="messagingmw_info" long-name="Messaging Middleware Info" level="api">
-<component name="messagingmw_metadata" long-name="Messaging Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="imsrv" level="specific" long-name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
-<collection name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" level="specific">
-<component name="ximp_core_data_model_api" long-name="XIMP Core Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_host_api" long-name="XIMP Presence Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_presence_data_model_api" long-name="XIMP Presence Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_api" long-name="XIMP Presence Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_presence_management_api" long-name="XIMP Presence Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_management_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_host_api" long-name="XIMP Core Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_core_management_api" long-name="XIMP Core Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_management_api/group"/>
-</component>
-<component name="ximp_presence_base_api" long-name="XIMP Presence Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_base_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_api" long-name="XIMP Core Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_core_base_api" long-name="XIMP Core Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_base_api/group"/>
-</component>
-<component name="ximp_presence_cache_api" long-name="XIMP Presence Cache API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_cache_api/group"/>
-</component>
-<component name="ximp_core_feature_plugin_api" long-name="XIMP Core Feature Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_host_api" long-name="XIMP IM Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_im_data_model_api" long-name="XIMP IM Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_data_model_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_api" long-name="XIMP IM Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_im_management_api" long-name="XIMP IM Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_management_api/group"/>
-</component>
-<component name="ximp_im_base_api" long-name="XIMP IM Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_base_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_host_api" long-name="XIMP Search Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_search_data_model_api" long-name="XIMP Search Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_data_model_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_api" long-name="XIMP search Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_search_management_api" long-name="XIMP Search Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_management_api/group"/>
-</component>
-<component name="ximp_search_base_api" long-name="XIMP Search Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_base_api/group"/>
-</component>
-<component name="xmpp_settings_api" long-name="XMPP Settings API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/group"/>
-</component>
-<component name="im_cache_client_api" long-name="IM Cache Client API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/im_cache_client_api/group"/>
-</component>
-<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 Avability Text" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
-</component>
-</collection>
-<collection name="ximpfw" long-name="XIMP Framework" level="framework">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="ximpfw_build" filter="s60" long-name="XIMP Framework Build">
-<unit bldFile="mw/imsrv/ximpfw/group"/>
-</component>
-</collection>
-<collection name="imservices" long-name="IM Services" level="generic">
-<component name="imfeatureplugin" filter="s60" long-name="IM Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/imfeatureplugin/group"/>
-</component>
-<component name="searchfeatureplugin" filter="s60" long-name="Search Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/searchfeatureplugin/group"/>
-</component>
-<component name="xmppsettingsapi" filter="s60" long-name="XMPP Settings API" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsapi/group"/>
-</component>
-<component name="xmppsettingsfetcher" filter="s60" long-name="XMPP Settings Fetcher" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/group"/>
-</component>
-<component name="ossprotocoladaptation" filter="s60" long-name="OSS Protocol Adaptation" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/ossprotocoladaptation/group"/>
-</component>
-<component name="instantmessagingcache" filter="s60" long-name="Instant Messaging Cache" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/instantmessagingcache/group"/>
-</component>
-</collection>
-<collection name="brandingserver" long-name="Branding Server" level="specific">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="brandingserver_build" filter="s60" long-name="Branding Server Build">
-<unit bldFile="mw/imsrv/brandingserver/group"/>
-</component>
-</collection>
-</block>
-<block name="legacypresence" level="specific" long-name="Legacy Presence Services" levels="engine fw ui">
-<collection name="pressrv_plat" long-name="Legacy Presence Services Platform Interfaces" level="ui">
-<component name="presence_list_api" long-name="Presence List API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/presence_list_api/group"/>
-</component>
-<component name="watcher_info_api" long-name="Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_info_api/group"/>
-</component>
-<component name="simple_documents_api" long-name="SIMPLE Documents API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_documents_api/group"/>
-</component>
-<component name="authorization_api" long-name="Authorization API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/authorization_api/group"/>
-</component>
-<component name="xdm_protocol_plugin_api" long-name="XDM Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_protocol_plugin_api/group"/>
-</component>
-<component name="watcher_api" long-name="Watcher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_api/group"/>
-</component>
-<component name="xdm_api" long-name="XDM API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_api/group"/>
-</component>
-<component name="registration_api" long-name="Registration API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/registration_api/group"/>
-</component>
-<component name="publisher_api" long-name="Publisher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/publisher_api/group"/>
-</component>
-<component name="messaging_connection_manager_api" long-name="Messaging Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/messaging_connection_manager_api/group"/>
-</component>
-<component name="xdm_settings_api" long-name="XDM Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_settings_api/group"/>
-</component>
-<component name="simple_settings_api" long-name="SIMPLE Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_settings_api/group"/>
-</component>
-<component name="simple_instant_msg_api" long-name="Simple Instant Msg API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_instant_msg_api/group"/>
-</component>
-</collection>
-<collection name="xdmengine" long-name="XDM Engine" level="engine">
-<!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
-<component name="xdmengine_build" filter="s60" long-name="XDM Engine Build">
-<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">
-<unit bldFile="mw/legacypresence/xdmprotocols/group"/>
-</component>
-</collection>
-<collection name="msgconnmanager" long-name="Messaging Connection Manager" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="msgconnmanager_build" filter="s60" long-name="Messaging Connection Manager Build">
-<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">
-<unit bldFile="mw/legacypresence/simpleengine/group"/>
-</component>
-</collection>
-<collection name="presencefwsimpleadpt" long-name="Presence Framework SIMPLE Adaptation" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="simpleplugin" filter="s60" long-name="SIMPLE Plugin" plugin="Y">
-<unit bldFile="mw/legacypresence/presencefwsimpleadpt/group"/>
-</component>
-</collection>
-<collection name="simpledatamodeladapter" long-name="SIMPLE Data Model Adapter" level="fw">
-<component name="presenceplugin" filter="s60" long-name="Presence Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/legacypresence/simpledatamodeladapter/group"/>
-</component>
-</collection>
-</block>
-<block name="opensrv" level="specific" long-name="Open Services" levels="prt lib server eng">
-<collection name="opensrv_plat" long-name="Open Services Platform Interfaces" level="eng">
-<component name="messagequeue_api" long-name="Message Queue API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/opensrv/opensrv_plat/messagequeue_api/group"/>
-</component>
-</collection>
-<collection name="loudmouth" long-name="Loudmouth" level="prt">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="loudmouth_build" filter="s60" long-name="Loudmouth Build" introduced="^2">
-<unit bldFile="mw/opensrv/loudmouth/group"/>
-</component>
-</collection>
-<collection name="libtelepathy" long-name="Telepathy Library" level="lib">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="libtelepathy_build" filter="s60" long-name="Telepathy Library Build" introduced="^2">
-<unit bldFile="mw/opensrv/libtelepathy/group"/>
-</component>
-</collection>
-<collection name="telepathygabble" long-name="Telepathy Gabble" level="eng">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="telepathygabble_build" filter="s60" long-name="Telepathy Gabble Build" introduced="^2">
-<unit bldFile="mw/opensrv/telepathygabble/group"/>
-</component>
-</collection>
-<collection name="isolationserver" long-name="Isolation Server" level="server">
-<component name="messagequeue" filter="s60" long-name="Message Queue" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/messagequeue/group"/>
-</component>
-<component name="isoserver" filter="s60" long-name="ISO Server" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/isoserver/group"/>
-</component>
-<component name="isolationserver_build" filter="s60" long-name="Isloation Server Build" introduced="^2">
-<!-- needs #includes removed. either move the exports to another component or make this a ROM component -->
-<unit bldFile="mw/opensrv/isolationserver/group"/>
-</component>
-</collection>
-</block>
-<block name="remotemgmt" level="specific" long-name="Remote Management" levels="plugin framework server generic specific">
-<collection name="remotemgmt_pub" long-name="Remote Management Public Interfaces" level="specific">
-<component name="synchronization_capability_api" long-name="Synchronization Capability API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
-</component>
-</collection>
-<collection name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" level="specific">
-<component name="common_agent_util_and_definitions_api" long-name="Common Agent util and definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
-</component>
-<component name="policy_management_certificate_api" long-name="Policy Management Certificate API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/group"/>
-</component>
-<component name="oma_provisioning_adapter_api" long-name="OMA Provisioning Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_adapter_api/group"/>
-</component>
-<component name="device_management_parameter_api" long-name="Device Management Parameter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_parameter_api/group"/>
-</component>
-<component name="data_synchronization_plugin_api" long-name="Data Synchronization Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/group"/>
-</component>
-<component name="sync_alert_handler_api" long-name="Sync Alert Handler API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
-</component>
-<component name="syncml_notifier_api" long-name="SyncML Notifier API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
-</component>
-<component name="syncml_client_api" long-name="SyncML Client API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
-</component>
-<component name="device_management_plugin_api" long-name="Device Management plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_plugin_api/group"/>
-</component>
-<component name="dm_tree_apis" long-name="DM Tree APIs" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
-</component>
-<component name="terminal_security_device_lock_api" long-name="Terminal Security Device Lock API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/group"/>
-</component>
-<component name="policy_management_request_api" long-name="Policy Management Request API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/group"/>
-</component>
-<component name="ds_constant_definitions_api" long-name="DS Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_constant_definitions_api/group"/>
-</component>
-<component name="scp_server_api" long-name="SCP Server API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/group"/>
-</component>
-<component name="data_synchronization_notification_api" long-name="Data Synchronization Notification API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_notification_api/group"/>
-</component>
-<component name="oma_provisioning_engine_api" long-name="OMA Provisioning Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/group"/>
-</component>
-<component name="dm_utils_api" long-name="DM Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/group"/>
-</component>
-<component name="syncml_alert_api" long-name="SyncML Alert API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/group"/>
-</component>
-<component name="obex_client_session_api" long-name="OBEX Client session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/obex_client_session_api/group"/>
-</component>
-<component name="setting_enforcement_info_api" long-name="Setting Enforcement Info API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/group"/>
-</component>
-<component name="dm_constant_definitions_api" long-name="DM Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
-</component>
-<component name="oma_ds_extensions_api" long-name="OMA DS Extensions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
-</component>
-<component name="pnpms_utils_api" long-name="PNPMS Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
-</component>
-<component name="diagnostics_plugin_utility_api" long-name="Diagnostics Plugin Utility API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
-</component>
-<component name="diagnostics_plugin_api" long-name="Diagnostics Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
-</component>
-<component name="diagnostics_framework_api" long-name="Diagnostics Framework API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
-</component>
-<component name="diagnostics_results_api" long-name="Diagnostics Results API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
-</component>
-<component name="diagnostics_plugin_pool_api" long-name="Diagnostics Plugin Pool API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
-</component>
-<component name="adaptive_history_list_api" long-name="Adaptive History List API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
-</component>
-<component name="adaptive_history_list_session_api" long-name="Adaptive History List Session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
-</component>
-<component name="fota_engine_api" long-name="FOTA Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
-</component>
-<component name="update_package_storage_plugin_api" long-name="Update Package Storage Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
-</component>
-<component name="syncml_notifier_roaming_api" long-name="SyncML Notifier Roaming API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
-</component>
-<component name="sync_service_api" long-name="Sync Service API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_service_api/group"/>
-</component>
-<component name="dcmo_adapter_api" long-name="DCMO Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_adapter_api/group"/>
-</component>
-<component name="dcmo_control_api" long-name="DCMO Control API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_control_api/group"/>
-</component>
-<component name="ds_capability_mgmt_plugin_api" long-name="DS Capability Management Plugin API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
-</component>
-<component name="dm_native_notifier_api" long-name="DM Native Notifier API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_native_notifier_api/group"/>
-</component>
-<component name="syncml_ds_error_reporting_api" long-name="SyncML DS Error Reporting API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_ds_error_reporting_api/group"/>
-</component>
-<component name="syncml_ds_customization_api" long-name="SyncML DS Customization API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_ds_customization_api/group"/>
-</component>
-</collection>
-<collection name="policymanagement" long-name="Policy Management" level="generic">
-<component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">
-<unit bldFile="mw/remotemgmt/policymanagement/pmdmadapter/group"/>
-</component>
-<component name="dmutilserver" filter="s60" long-name="DM Util Server">
-<unit bldFile="mw/remotemgmt/policymanagement/dmutilserver/group"/>
-</component>
-<component name="policyengine" filter="s60" long-name="Policy Engine">
-<unit bldFile="mw/remotemgmt/policymanagement/policyengine/group"/>
-</component>
-<component name="policymanagement_build" filter="s60" long-name="Policy Management Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/policymanagement/group"/>
-</component>
-</collection>
-<collection name="syncmlfw" long-name="SyncML Framework" level="server">
-<component name="syncmlfw_build" filter="s60" long-name="SyncML Framework Build">
-<!-- need to break this up into components. Too convoluted a structure to be in a single bld.inf-->
-<unit bldFile="mw/remotemgmt/syncmlfw/group"/>
-</component>
-</collection>
-<collection name="terminalsecurity" long-name="Terminal Security" level="specific">
-<component name="scp" filter="s60" long-name="Security Code Proxy">
-<!-- can only have one unit, need to have these #included from a single bld.inf -->
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpdatabase/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpserver/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scppatternplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scphistoryplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scptimestampplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpeventhandler/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/dmeventnotifier/group"/>
-</component>
-<component name="terminalsecurity_client" filter="s60" long-name="Terminal Control Client">
-<unit bldFile="mw/remotemgmt/terminalsecurity/client/group"/>
-</component>
-<component name="terminalsecurity_server" filter="s60" long-name="Terminal Control Server">
-<unit bldFile="mw/remotemgmt/terminalsecurity/server/group"/>
-</component>
-<component name="tcadapter" filter="s60" long-name="Terminal Control Adapter">
-<unit bldFile="mw/remotemgmt/terminalsecurity/tcadapter/bld"/>
-</component>
-<component name="terminalsecurity_build" filter="s60" long-name="Terminal Security Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/terminalsecurity/group"/>
-</component>
-</collection>
-<collection name="omaprovisioning" long-name="OMA Provisioning" level="specific">
-<component name="pnputil" filter="s60" long-name="PnP Util">
-<unit bldFile="mw/remotemgmt/omaprovisioning/pnputil/group"/>
-</component>
-<component name="provisioning" filter="s60" long-name="Provisioning">
-<unit bldFile="mw/remotemgmt/omaprovisioning/provisioning/group"/>
-</component>
-</collection>
-<collection name="devicediagnosticsfw" long-name="Device Diagnostics Framework" level="framework">
-<component name="diagframework" filter="s60" long-name="Diagnostics Framework">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
-</component>
-<component name="diagpluginbase" filter="s60" long-name="Diagnostics Plugin Base">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
-</component>
-<component name="diagresultsdb" filter="s60" long-name="Diagnostics Results Database">
-<!-- can only have one unit, merge or split into two components -->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
-</component>
-<component name="devicediagnosticsfw_build" filter="s60" long-name="Device Diagnostics Framework Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/group"/>
-</component>
-</collection>
-<collection name="dcmofw" long-name="Device Capability Management Object Framework" level="framework">
-<component name="dcmoclient" filter="s60" long-name="DCMO Client">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoclient/group"/>
-</component>
-<component name="dcmoserver" filter="s60" long-name="DCMO Server">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoserver/group"/>
-</component>
-<component name="dcmocustcmd" filter="s60" long-name="DCMO Custom Commands">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmocustcmd/group"/>
-</component>
-<component name="dcmofw_build" filter="s60" long-name="DCMO Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/dcmofw/group"/>
-</component>
-</collection>
-<collection name="fotaapplication" long-name="FOTA Application" level="generic">
-<component name="fotaapplication_build" filter="s60" long-name="FOTA Application Build">
-<!-- remove this component when configuration is in place and the #ifdefs have been worked out -->
-<unit bldFile="mw/remotemgmt/fotaapplication/group"/>
-</component>
-<component name="fotaserver" filter="s60" long-name="FOTA Server">
-<!-- uncomment when #ifdefs are resolved -->
-<!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
-</component>
-<component name="fotacustcmds" filter="s60" long-name="FOTA Custom Commands" class="placeholder">
-<!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
-<!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
-</component>
-</collection>
-</block>
-<block name="remotestorage" level="generic" long-name="Remote Storage" levels="framework if">
-<collection name="rsfw_plat" long-name="Remote Storage Platform Interfaces" level="if">
-<component name="rsfw_access_protocol_plugin_api" filter="s60" long-name="Remote Storage Framework Access Protocol Plugin API" class="api">
-<unit bldFile="mw/remotestorage/rsfw_plat/rsfw_access_protocol_plugin_api/group"/>
-</component>
-</collection>
-<collection name="remotestoragefw" long-name="Remote Storage Framework" level="framework">
-<component name="mountstore" filter="s60" long-name="RSFW Mount Store">
-<unit bldFile="mw/remotestorage/remotestoragefw/mountstore/group"/>
-</component>
-<component name="rsfwnotifierplugins" filter="s60" long-name="RSFW Notifier Plugins" plugin="Y">
-<unit bldFile="mw/remotestorage/remotestoragefw/rsfwnotifierplugins/group"/>
-</component>
-<component name="remotefileengine" filter="s60" long-name="Remote File Engine">
-<unit bldFile="mw/remotestorage/remotestoragefw/remotefileengine/group"/>
-</component>
-<component name="mountmanager" filter="s60" long-name="RSFW Mount Manager">
-<unit bldFile="mw/remotestorage/remotestoragefw/mountmanager/group"/>
-</component>
-<component name="webdavaccessplugin" filter="s60" long-name="WebDAV Access Plugin" plugin="Y">
-<unit bldFile="mw/remotestorage/remotestoragefw/webdavaccessplugin/group"/>
-</component>
-<component name="remotefilesystemplugin" filter="s60" long-name="Remote Filesystem Plugin" plugin="Y">
-<unit bldFile="mw/remotestorage/remotestoragefw/remotefilesystemplugin/group"/>
-</component>
-<component name="remotestoragegsplugin" filter="s60" long-name="RS GS Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
-<!-- <unit bldFile="remotestoragefw/gsplugin/group"/>-->
-</component>
-<component name="remotedriveconfigurationbiocontrol" filter="s60" long-name="Remote Drive Configuration BIO Control">
-<!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
-<!-- <unit bldFile="remotestoragefw/remotedriveconfigurationbiocontrol/group"/>-->
-</component>
-<component name="remotestoragefw_build" filter="s60" long-name="Remote Storage Framework Build">
-<!-- move exports to other components.
- This is needed for #includes of configured component until congigiration is in place -->
-<unit bldFile="mw/remotestorage/remotestoragefw/group"/>
-</component>
-</collection>
-</block>
-<block name="remoteconn" level="generic" long-name="Remote Connectivity" levels="plugin framework server generic specific">
-<collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
-<component name="secon" filter="s60" long-name="Service Controllers">
-<unit bldFile="mw/remoteconn/connectivitymodules/secon/group"/>
-</component>
-</collection>
-<collection name="remoteconn_info" long-name="Remote Connectivity Info" level="specific">
-<component name="remoteconn_metadata" long-name="Remote Connectivity Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mtptransports" long-name="MTP Transports" level="plugin">
-<component name="mtpusbtransport" long-name="MTP USB Transport" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpusbtransport/group" mrp="mw/remoteconn/mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
-</component>
-<component name="mtpptpiptransport" long-name="MTP PTP-IP Transport" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpptpiptransport/group" mrp="mw/remoteconn/mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
-</component>
-<component name="mtpcontroller" long-name="MTP Controller" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpcontroller/group" mrp="mw/remoteconn/mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
-</component>
-</collection>
-<collection name="mtpfws" long-name="MTP Frameworks" level="framework">
-<component name="mtpfw" long-name="MTP Framework" introduced="^2" purpose="optional">
-<unit bldFile="mw/remoteconn/mtpfws/mtpfw/group" mrp="mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/>
-</component>
-</collection>
-<collection name="mtpdataproviders" long-name="MTP Data Providers" level="generic">
-<component name="mtpfileandfolderdp" long-name="MTP File and Folder Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group" mrp="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
-</component>
-<component name="mtpimagedp" long-name="MTP Image Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpimagedp/group" mrp="mw/remoteconn/mtpdataproviders/mtpimagedp/group/mtp_imagedp.mrp"/>
-</component>
-<component name="mtppictbridgedp" long-name="MTP PictBridge Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group" mrp="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group/mtp_pictbridgedp.mrp"/>
-</component>
-</collection>
-<collection name="backupandrestore" long-name="Backup and Restore" level="specific">
-<component name="backupengine" long-name="Backup Engine" introduced="9.0" purpose="optional">
-<unit bldFile="mw/remoteconn/backupandrestore/backupengine/group" mrp="mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
-</component>
-<component name="backuptest" long-name="Backup Test" introduced="^2" purpose="development">
-<unit bldFile="mw/remoteconn/backupandrestore/backuptest/group" mrp="mw/remoteconn/backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
-</component>
-</collection>
-<collection name="obex" long-name="OBEX" level="generic">
-<component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexprotocol/group" mrp="mw/remoteconn/obex/obexprotocol/group/obex.mrp"/>
-</component>
-<component name="obexextensionapi" long-name="OBEX Extension API" introduced="9.2" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexextensionapi/group" mrp="mw/remoteconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
-</component>
-</collection>
-</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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<unit mrp="mw/srvdiscovery/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="dlnasrv" level="specific" long-name="DLNA Services" levels="stack server ctrl framework plugin">
-<!-- uncomment all the units when configuration is in place, they're currently #included from other xxx_build components -->
-<collection name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" level="plugin">
-<component name="upnp_media_server_settings_api" long-name="UPnP Media Server Settings API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_settings_api/group"/>
-</component>
-<component name="upnp_av_objects_api" long-name="UPnP A/V Objects API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_av_objects_api/group"/>
-</component>
-<component name="upnp_media_server_api" long-name="UPnP Media Server API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_api/group"/>
-</component>
-<component name="upnp_security_plugin_api" long-name="UPnP Security Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_security_plugin_api/group"/>
-</component>
-<component name="upnp_avcp_api" long-name="UPnP AVCP API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_avcp_api/group"/>
-</component>
-<component name="upnp_media_server_metadata_api" long-name="UPnP Media Server Metadata API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_metadata_api/group"/>
-</component>
-<component name="upnp_command_api" long-name="UPnP Command API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_command_api/group"/>
-</component>
-<component name="upnp_plugin_api" long-name="UPnP Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_plugin_api/group"/>
-</component>
-</collection>
-<collection name="upnpavcontrolpoint" long-name="UPnP A/V Control Point" level="plugin">
-<component name="avcontrolframework" filter="s60" long-name="A/V Control Famework" introduced="9.1" deprecated="^3">
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
-</component>
-<component name="upnpavcontrolpoint_build" filter="s60" long-name="UPnP A/V Control Point Build" introduced="9.1" deprecated="^3">
-<!-- put exports in other component instead -->
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/group"/>
-</component>
-</collection>
-<collection name="upnpmediaserver" long-name="UPnP Media Server" level="server">
-<component name="avobjects" filter="s60" long-name="A/V Objects">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/avobjects/group"/>
-</component>
-<component name="mediaserverclient" filter="s60" long-name="Media Server Client">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverclient/group"/>
-</component>
-<component name="connectionmanagerservice" filter="s60" long-name="Connection Manager Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/connectionmanagerservice/group"/>
-</component>
-<component name="contentdirectoryservice" filter="s60" long-name="Content Directory Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/contentdirectoryservice/group"/>
-</component>
-<component name="mediaserverengine" filter="s60" long-name="Media Server Engine">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverengine/group"/>
-</component>
-<component name="upnpmediaserver_build" filter="s60" long-name="UPnP Media Server Build">
-<!-- move exports into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpmediaserver/group"/>
-</component>
-</collection>
-<collection name="upnpavcontroller" long-name="UPnP A/V Controller" level="ctrl">
-<component name="upnpxmlparser" filter="s60" long-name="UPnP XML Parser" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpxmlparser/group"/>
-</component>
-<component name="upnpavcontrollerserver" filter="s60" long-name="UPnP A/V Controller Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerserver/group"/>
-</component>
-<component name="upnpavcontrollerclient" filter="s60" long-name="UPnP A/V Ccontroller Client" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerclient/group"/>
-</component>
-<component name="upnpavcontrollerhelper" filter="s60" long-name="UPnP A/V Controller Helper" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerhelper/group"/>
-</component>
-<component name="upnpavcontroller_build" filter="s60" long-name="UPnP A/V Controller Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpavcontroller/group"/>
-</component>
-</collection>
-<collection name="upnpframework" long-name="UPnP Framework" level="framework">
-<component name="upnputilities" filter="s60" long-name="UPnP Utilities" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnputilities/group"/>
-</component>
-<component name="upnpextensionpluginif" filter="s60" long-name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpextensionpluginif/group"/> -->
-</component>
-<component name="upnpfiletransferengine" filter="s60" long-name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>-->
-</component>
-<component name="upnpcommonui" filter="s60" long-name="UPnP Common UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpcommonui/group"/>-->
-</component>
-<component name="upnpaiwengine" filter="s60" long-name="UPnP AIW Engine" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpaiwengine/group"/> -->
-</component>
-<component name="upnpaiwprovider" filter="s60" long-name="UPnP AIW Provider" introduced="^2" deprecated="^3" plugin="Y">
-<!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
-</component>
-<component name="upnpmusicadapter" filter="s60" long-name="UPnP Music Adapter" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
-</component>
-<component name="upnpcommand" filter="s60" long-name="UPnP Command" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpcommand/group"/>
-</component>
-<component name="upnpframework_build" filter="s60" long-name="UPnP Framework Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpframework/group"/>
-</component>
-</collection>
-<collection name="upnpsettings" long-name="UPnP Settings" level="framework">
-<component name="upnpsettingsengine" filter="s60" long-name="UPnP Settings Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
-</component>
-<component name="multiselectionui" filter="s60" long-name="Multi-Selection UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/multiselectionui/group"/>-->
-</component>
-<component name="appwizard" filter="s60" long-name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/appwizard/group"/>-->
-</component>
-<component name="upnpsharingui" filter="s60" long-name="UPnP Sharing UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
-</component>
-<component name="upnpgsplugin" filter="s60" long-name="UPnP GS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
-</component>
-<component name="upnpsettings_build" filter="s60" long-name="UPnP Settings Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsettings/group"/>
-</component>
-</collection>
-<collection name="upnpsharing" long-name="UPnP Sharing" level="server">
-<component name="upnpdlnaprofiler" filter="s60" long-name="UPnP DLNA Profiler" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpdlnaprofiler/group"/>
-</component>
-<component name="upnpsecurity" filter="s60" long-name="UPnP Security" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpsecurity/group"/>
-</component>
-<component name="upnpcontentserver" filter="s60" long-name="UPnP Content Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpcontentserver/group"/>
-</component>
-<component name="applicationengine" filter="s60" long-name="UPnP Application Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/applicationengine/group"/>
-</component>
-<component name="upnpsharing_build" filter="s60" long-name="UPnP Sharing Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsharing/group"/>
-</component>
-</collection>
-<collection name="upnpmpxplugins" long-name="UPnP MPX Plugins" level="plugin">
-<component name="upnpplaybackplugins" filter="s60" long-name="UPnP Playback Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/upnpplaybackplugins/group"/>
-</component>
-<component name="upnpmpxplugins_build" filter="s60" long-name="UPnP MPX Plugins Build" introduced="^2">
-<!-- move exports content into other component? -->
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/group"/>
-</component>
-</collection>
-<collection name="upnpharvester" long-name="UPnP Harvester" level="ctrl">
-<component name="upnpharvester_common" filter="s60" long-name="UPnP Harvester Common" introduced="^2" deprecated="^3" class="placeholder">
-<!-- need to merge or #include these to a single bld.inf -->
-<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
- <unit bldFile="upnpharvester/common/cmsettings/group"/>
- <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
- <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
-</component>
-<component name="cdssync" filter="s60" long-name="CDS Sync" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
-</component>
-<component name="mdhserver" filter="s60" long-name="Metadata Harvester Server" introduced="^2" deprecated="^3" class="placeholder">
-<!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
-</component>
-<component name="upnpharvester_build" filter="s60" long-name="UPnP Harvester Build" introduced="^2" deprecated="^3" class="placeholder">
-<!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
-<!--<unit bldFile="upnpharvester/group"/>-->
-</component>
-</collection>
-<collection name="homesync" long-name="Home Sync" level="plugin">
-<component name="contentmanager" filter="s60" long-name="Content Manager" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homesync/group"/>-->
-<!-- move bld.inf into contentmanager dir -->
-</component>
-</collection>
-<collection name="homemedia" long-name="Home Media" level="framework">
-<!-- collection is really just a component. Move down a directory -->
-<component name="homemedia_build" filter="s60" long-name="Home Media" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homemedia/group"/> -->
-</component>
-</collection>
-<collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin">
-<component name="dlnasrv_build" filter="s60" long-name="DLNA Services Build">
-<!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed -->
-<unit bldFile="mw/dlnasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="btservices" level="generic" long-name="Bluetooth Services" levels="framework server generic specific plugin">
-<collection name="btservices_pub" long-name="BT Services Public Interfaces" level="plugin">
-<component name="bluetooth_power_state_api" long-name="Bluetooth Power State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_power_state_api/group"/>
-</component>
-<component name="bluetooth_notifier_api" long-name="Bluetooth Notifier API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_notifier_api/group"/>
-</component>
-</collection>
-<collection name="btservices_plat" long-name="BT Services Platform Interfaces" level="plugin">
-<component name="bluetooth_dosserver_audio_api" long-name="Bluetooth DOS Server Audio API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dosserver_audio_api/group"/>
-</component>
-<component name="bluetooth_dut_mode_api" long-name="Bluetooth DUT Mode API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dut_mode_api/group"/>
-</component>
-<component name="bluetooth_engine_api" long-name="Bluetooth Engine API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-<component name="bluetooth_local_variation_api" long-name="Bluetooth Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_local_variation_api/group"/>
-</component>
-<component name="bluetooth_notifier_internal_api" long-name="Bluetooth Notifier internal API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_notifier_internal_api/group"/>
-</component>
-<component name="bluetooth_sap_connection_state_api" long-name="Bluetooth SAP Connection State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_sap_connection_state_api/group"/>
-</component>
-<component name="bluetooth_secondary_display_notification_api" long-name="Bluetooth Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_secondary_display_notification_api/group"/>
-</component>
-</collection>
-<collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
-<component name="bteng" filter="s60" long-name="Bluetooth Engine">
-<unit bldFile="mw/btservices/bluetoothengine/bteng/group"/>
-</component>
-<component name="btnotif" filter="s60" long-name="Bluetooth Notifier">
-<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"/>
-</component>
-<component name="btmac" filter="s60" long-name="Bluetooth Mono Audio Controller" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btmac/group"/>
-</component>
-<component name="btsac" filter="s60" long-name="Bluetooth Stereo Audio Controller" plugin="Y">
-<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"/>
-</component>
-<component name="btsap" filter="s60" long-name="Bluetooth SIM Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btsap/group"/>
-</component>
-<component name="btui" filter="s60" long-name="Bluetooth UI">
-<unit bldFile="mw/btservices/bluetoothengine/btui/group"/>
-</component>
-<component name="btpbap" filter="s60" long-name="Bluetooth Phonebook Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btpbap/group"/>
-</component>
-<component name="bthid" filter="s60" long-name="Bluetooth HID">
-<unit bldFile="mw/btservices/bluetoothengine/bthid/group"/>
-</component>
-<component name="btctrldcmoadapter" filter="s60" long-name="Bluetooth Control DCMO Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btctrldcmoadapter/group"/>
-</component>
-</collection>
-<collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
-<component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
-<unit bldFile="mw/btservices/bluetoothappprofiles/avrcp" mrp="mw/btservices/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
-</component>
-</collection>
-<collection name="atcommands" long-name="AT Commands" level="generic">
-<component name="modematplugin" long-name="Modem AT Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/modematplugin/group"/>
-</component>
-<component name="lccustomplugin" long-name="LC Custom Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/lccustomplugin/group"/>
-</component>
-</collection>
-<collection name="btservices_info" long-name="BT Services Info" level="plugin">
-<component name="btservices_metadata" long-name="BT Services Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usbservices" level="generic" long-name="USB Services" levels="framework server generic specific plugin">
-<collection name="usbservices_plat" long-name="USB Services Platform Interfaces" level="plugin">
-<component name="pictbridge_api" long-name="PictBridge API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/pictbridge_api/group"/>
-</component>
-<component name="ptp_responder_api" long-name="PTP Responder API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_responder_api/group"/>
-</component>
-<component name="ptp_transport_api" long-name="PTP Transport API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_transport_api/group"/>
-</component>
-<component name="usb_device_control_plugin_api" long-name="USB Device Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_device_control_plugin_api/group"/>
-</component>
-<component name="usb_notifier_api" long-name="USB Notifier API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_notifier_api/group"/>
-</component>
-<component name="usb_personality_api_header" long-name="USB Personality API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_api_header/group"/>
-</component>
-<component name="usb_personality_plugin_api" long-name="USB Personality Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_plugin_api/group"/>
-</component>
-<component name="usb_secondary_display_api" long-name="USB Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_secondary_display_api/group"/>
-</component>
-<component name="usb_watcher_api" long-name="USB Watcher API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_api/group"/>
-</component>
-<component name="usb_watcher_info_api_header" long-name="USB Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_info_api_header/group"/>
-</component>
-</collection>
-<collection name="usbservices_info" long-name="USB Services Info" level="plugin"/>
-<collection name="usbengines" long-name="USB Engines" level="generic">
-<component name="usbotgwatcher" filter="s60" long-name="USB OTG Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbotgwatcher/group"/>
-</component>
-<component name="usbwatcher" filter="s60" long-name="USB Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbwatcher/group"/>
-</component>
-<component name="usblocodplugin" filter="s60" long-name="USB Local Connectivity Domain Plugin" plugin="Y">
-<unit bldFile="mw/usbservices/usbengines/usblocodplugin/group"/>
-</component>
-<component name="usbdevcon" filter="s60" long-name="USB Device Control">
-<unit bldFile="mw/usbservices/usbengines/usbdevcon/group"/>
-</component>
-<component name="usbremotepersonality" filter="s60" long-name="USB Remote Personality">
-<unit bldFile="mw/usbservices/usbengines/usbremotepersonality/group"/>
-</component>
-</collection>
-<collection name="usbclasses" long-name="USB Classes" level="framework">
-<component name="usbobexclasscontroller" filter="s60" long-name="USB OBEX Class Controller" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbobexclasscontroller/group"/>
-</component>
-<component name="usbbasicpersonality" filter="s60" long-name="USB Basic Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbbasicpersonality/group"/>
-</component>
-<component name="usbmscpersonality" filter="s60" long-name="USB MSC Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbmscpersonality/group"/>
-</component>
-<!-- commented out in bld.inf. Should this be deleted?
- <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
- <unit bldFile="usbclasses/ptpstack/group"/>
- </component>
- <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
- <unit bldFile="usbclasses/sicdusbplugin/group"/>
- </component>
- <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
- <unit bldFile="usbclasses/ptpserver/group"/>
- </component>-->
-<component name="pictbridgeengine" filter="s60" long-name="PictBridge Engine">
-<unit bldFile="mw/usbservices/usbclasses/pictbridgeengine/group"/>
-</component>
-<component name="usbphoneasmodem" filter="s60" long-name="USB Phone as Modem" introduced="^3">
-<unit bldFile="mw/usbservices/usbclasses/usbphoneasmodem/group"/>
-</component>
-</collection>
-<collection name="usbuis" long-name="USB UIs" level="specific">
-<component name="usbui" filter="s60" long-name="USB UI">
-<unit bldFile="mw/usbservices/usbuis/usbui/group"/>
-</component>
-<component name="usbuinotif" filter="s60" long-name="USB UI Notifiers">
-<unit bldFile="mw/usbservices/usbuis/usbuinotif/group"/>
-</component>
-<component name="imageprintuiprovider" filter="s60" long-name="ImagePrint UI Provider" plugin="Y">
-<unit bldFile="mw/usbservices/usbuis/imageprintuiprovider/group"/>
-</component>
-<component name="usbimageprintui" filter="s60" long-name="ImagePrint UI">
-<unit bldFile="mw/usbservices/usbuis/imageprintui/group"/>
-</component>
-</collection>
-</block>
-<block name="shortlinkconn" level="generic" long-name="Shortlink Connectivity" levels="framework server generic specific plugin">
-<!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
-<collection name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" level="plugin">
-<component name="obex_service_utils_api" long-name="OBEX Service Utils API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_utils_api/group"/>
-</component>
-<component name="obex_service_plugin_api" long-name="OBEX Service Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_plugin_api/group"/>
-</component>
-<component name="dialup_connection_status_api" long-name="Dial-up Connection Status API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dialup_connection_status_api/group"/>
-</component>
-<component name="dun_secondary_display_notification_api" long-name="DUN Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
-</component>
-<component name="obex_secondary_display_notification_api" long-name="OBEX Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
-</component>
-<component name="generic_hid_api" long-name="Generic HID API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/generic_hid_api/group"/>
-</component>
-<component name="locod_bearer_plugin_api" long-name="Locod Bearer Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/locod_bearer_plugin_api/group"/>
-</component>
-<component name="usb_obexservicemanager_client_api" long-name="USB OBEX Service Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_obexservicemanager_client_api/group"/>
-</component>
-</collection>
-<collection name="localconnectivityservice" long-name="Local Connectivity Service" level="server">
-<component name="locod" long-name="Local Connectivity Daemon">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/locod/group"/>
-</component>
-<component name="obexserviceman" long-name="OBEX Service Managar">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
-</component>
-<component name="obexsendservices" long-name="OBEX Send Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
-</component>
-<component name="obexreceiveservices" long-name="OBEX Receive Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
-</component>
-<component name="dun" long-name="Dial Up Networking">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/dun/group"/>
-</component>
-<component name="lcstylustap" long-name="LC Stylus Tap Plugins" plugin="Y">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/lcstylustap/group"/>
-</component>
-<component name="generichid" long-name="Generic HID">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/generichid/group"/>
-</component>
-<component name="headset" long-name="Headset">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/headset/group"/>
-</component>
-</collection>
-</block>
-<block name="imghandling" level="specific" long-name="Image Handling" levels="lib util if">
-<collection name="imagehandling_plat" long-name="Image Handling Platform Interfaces" level="if">
-<component name="image_handling_library_api" long-name="Image Handling Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
-</component>
-<component name="3gp_library_api" long-name="3GP Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
-</component>
-<component name="thumbnailmanager_api" long-name="Thumbnail Manager API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagehandlinglib" long-name="Image Handling Library" level="lib">
-<!-- collection is really a component, need to move down a directory -->
-<component name="ihl" filter="s60" long-name="IHL">
-<unit bldFile="mw/imghandling/imagehandlinglib/group"/>
-</component>
-</collection>
-<collection name="imagehandlingutilities" long-name="Image Handling Utilities" level="util">
-<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager">
-<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
-</component>
-</collection>
-</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">
-<unit bldFile="mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
-</component>
-</collection>
-</block>
-<block name="mds" level="specific" long-name="Metadata Services" levels="mgr eng server int">
-<collection name="mds_plat" long-name="Metadata Services Platform Interfaces" level="int">
-<component name="context_engine_plugin_api" long-name="Context Engine Plugin API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/group" filter="!test"/>
-</component>
-<component name="harvester_framework_api" long-name="Harvester Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/harvester_framework_api/group" filter="!test"/>
-<!-- can only have one unit with the same filter, #include the following from the previous unit -->
-</component>
-<component name="location_manager_api" long-name="Location Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/location_manager_api/group" filter="!test"/>
-</component>
-<component name="metadata_engine_api" long-name="Metadata Engine API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/metadata_engine_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_collection_manager_api" long-name="Content Listing Framework Collection Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_extended_api" long-name="Content Listing Framework Extended API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_extended_api/group"/>
-</component>
-</collection>
-<collection name="mds_pub" long-name="Metadata Services Public Interfaces" level="int">
-<component name="content_listing_framework_api" long-name="Content Listing Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_pub/content_listing_framework_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="metadataengine" long-name="Metadata Engine" level="eng">
-<component name="metadataengine_common" filter="s60" long-name="Metadata Engine Common" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/common/group"/>
-</component>
-<component name="metadataengine_server" filter="s60" long-name="Metadata Engine Server" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/server/group"/>
-</component>
-<component name="metadataengine_client" filter="s60" long-name="Metadata Engine Client" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/client/group"/>
-</component>
-<component name="metadataengine_build" filter="s60" long-name="Metadata Engine Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/metadataengine/group"/>
-</component>
-</collection>
-<collection name="locationmanager" long-name="Location Manager" level="mgr">
-<component name="locationtrail" filter="s60" long-name="Location Trail" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/locationtrail/group"/>
-</component>
-<component name="locationmanager_server" filter="s60" long-name="Location Manager Server" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/server/group"/>
-</component>
-<component name="locationmanager_client" filter="s60" long-name="Location Manager Client" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/client/group"/>
-</component>
-<component name="locationmanager_build" filter="s60" long-name="Location Manager Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/locationmanager/group"/>
-</component>
-</collection>
-<collection name="contextengine" long-name="Context Engine" level="eng">
-<component name="contextengine_plugins" filter="s60" long-name="Context Engine Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/contextengine/plugins/group"/>
-</component>
-<component name="contextengine_build" filter="s60" long-name="Context Engine Build" introduced="^2">
-<!--make this collection a single component, or make this unit self-contained -->
-<unit bldFile="mw/mds/contextengine/group"/>
-</component>
-</collection>
-<collection name="harvester" long-name="Harvester" level="eng">
-<component name="blacklistclient" filter="s60" long-name="Blacklist Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistclient/group"/>
-</component>
-<component name="blacklistserver" filter="s60" long-name="Blacklist Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistserver/group"/>
-</component>
-<component name="harvester_common" filter="s60" long-name="Harvester Common" introduced="^2">
-<unit bldFile="mw/mds/harvester/common/group"/>
-</component>
-<component name="composerplugins" filter="s60" long-name="Composer Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/composerplugins/group"/>
-</component>
-<component name="harvesterplugins" filter="s60" long-name="Harvester Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/harvesterplugins/group"/>
-</component>
-<component name="monitorplugins" filter="s60" long-name="Monitor Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/monitorplugins/group"/>
-</component>
-<component name="harvester_server" filter="s60" long-name="Harvester Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/server/group"/>
-</component>
-<component name="harvester_client" filter="s60" long-name="Harvester Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/client/group"/>
-</component>
-<component name="harvester_build" filter="s60" long-name="Harvester Build" introduced="^2">
-<!-- split these exports into the other components -->
-<unit bldFile="mw/mds/harvester/group"/>
-</component>
-</collection>
-<collection name="watchdog" long-name="Watchdog" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="mdswatchdog" filter="s60" long-name="Metadata Watchdog" introduced="^2">
-<unit bldFile="mw/mds/watchdog/group"/>
-</component>
-</collection>
-<collection name="clfwrapper" long-name="Content Listing Framework Wrapper" level="int">
-<!-- collection is really a component. Move down a directory -->
-<component name="clfwrapper_build" filter="s60" long-name="CLF Wrapper Build" introduced="^2" class="placeholder">
-<!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
-<!--<unit bldFile="clfwrapper/group"/>-->
-</component>
-</collection>
-<collection name="mds_info" long-name="Metadata Services Info" level="int">
-<component name="mds_build" filter="s60" long-name="Metadata Services Build" introduced="^2">
-<!-- consider distributiing this into the rest of the components in the package -->
-<unit bldFile="mw/mds/group"/>
-</component>
-</collection>
-</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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<unit bldFile="mw/mmuifw/mmuifw_plat/alf_customlayoutmanagers_api/group"/>
-</component>
-<component name="gesturehelper_api" long-name="Gesture Helper API" filter="s60" 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">
-<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">
-<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">
-<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">
-<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">
-<!-- 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">
-<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">
-<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">
-<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">
-<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">
-<unit bldFile="mw/mmuifw/mulwidgets/mullogging/group"/>
-</component>
-<component name="muldatamodel" filter="s60" long-name="MUL Data Model">
-<unit bldFile="mw/mmuifw/mulwidgets/muldatamodel/group"/>
-</component>
-<component name="mulwidgets_common" filter="s60" long-name="MUL Common Utils">
-<unit bldFile="mw/mmuifw/mulwidgets/common/group"/>
-</component>
-<component name="gesturehelper" filter="s60" long-name="Gesture Helper">
-<unit bldFile="mw/mmuifw/mulwidgets/gesturehelper/group"/>
-</component>
-<component name="mulcoverflowwidget" filter="s60" long-name="MUL CoverFlow Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/mulcoverflowwidget/group"/>
-</component>
-<component name="mulsliderwidget" filter="s60" long-name="MUL Slider Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/mulsliderwidget/group"/>
-</component>
-<component name="alfviewwidget" filter="s60" long-name="ALF View Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/alfviewwidget/group"/>
-</component>
-<component name="alfcontainerwidget" filter="s60" long-name="ALF Container Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/alfcontainerwidget/group"/>
-</component>
-<component name="alfscrollbarwidget" filter="s60" long-name="ALF Scrollbar Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/alfscrollbarwidget/group"/>
-</component>
-</collection>
-</block>
-<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"/>
-</component>
-<component name="videoconnutility_api" long-name="Video Connection Utility API" filter="s60" class="api">
-<unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/group"/>
-</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"/>
-</component>
-</collection>
-<collection name="videoscheduler" long-name="Video Scheduler" level="util">
-<component name="schedulerclient" filter="s60" long-name="Video Scheduler Client">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerclient/group"/>
-</component>
-<component name="schedulerserver" filter="s60" long-name="Video Scheduler Server">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerserver/group"/>
-</component>
-</collection>
-<collection name="videoconnutility" long-name="Video Connection Utility" level="util">
-<component name="connutilpsworker" filter="s60" long-name="Connection Utility Publish and Subscribe Worker">
-<unit bldFile="mw/videoutils/videoconnutility/connutilpsworker/group"/>
-</component>
-<component name="video_connutility" filter="s60" long-name="Video Connection Utility">
-<unit bldFile="mw/videoutils/videoconnutility/connutility/group"/>
-</component>
-</collection>
-<collection name="videoutils_info" long-name="Video Utils Info" level="if"/>
-</block>
-<block name="mmmw" level="generic" long-name="Multimedia Middleware" levels="plugin framework server generic specific">
-<collection name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" level="specific">
-<component name="multimedia_data_source_api" long-name="Multimedia Data Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
-</component>
-<component name="progressive_download_api" long-name="Progressive Download API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/progressive_download_api/group"/>
-</component>
-<component name="equalizer_ui_api" long-name="Equalizer UI API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
-</component>
-<component name="enhanced_media_client_api" long-name="Enhanced Media Client API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
-</component>
-<component name="stream_control_custom_command_api" long-name="Stream Control Custom Command API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
-</component>
-<component name="emc_buffer_source_api" long-name="EMC Buffer Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_buffer_source_api/group"/>
-</component>
-<component name="emc_file_source_api" long-name="EMC File Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
-</component>
-<component name="audio_metadata_reader_api" long-name="Audio MetaData Reader API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
-</component>
-<component name="emc_progressive_download_source_api" long-name="EMC Progressive Download Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
-</component>
-<component name="emc_volume_effect_api" long-name="EMC Volume Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
-</component>
-<component name="emc_balance_effect_api" long-name="EMC Balance Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_balance_effect_api/group"/>
-</component>
-<component name="emc_descriptor_source_api" long-name="EMC Descriptor Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_descriptor_source_api/group"/>
-</component>
-<component name="emc_drm_config_intfc_api" long-name="EMC DRM Config Intfc API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
-</component>
-<component name="voip_audio_services_api" long-name="VoIP Audio Services" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/group"/>
-</component>
-<component name="configuration_components_factory_api" long-name="Configuration Components Factory API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
-</component>
-<component name="audio_output_control_utility_api" long-name="Audio Output Control Utility API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/group"/>
-</component>
-<component name="audio_output_control_utility_proxy_api" long-name="Audio Output Control Utility Proxy API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
-</component>
-<component name="emc_audio_effects_api" long-name="EMC Audio Effects API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
-</component>
-<component name="call_audio_control_api" long-name="Call AudioControl API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/group"/>
-</component>
-<component name="radio_utilities_api" long-name="Radio Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/group"/>
-</component>
-<component name="radio_preset_utilities_api" long-name="Radio Preset Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
-</component>
-<component name="radio_monitor_api" long-name="Radio Monitor API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
-</component>
-<component name="thumbnail_engine_api" long-name="Thumbnail Engine API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/thumbnail_engine_api/group"/>
-</component>
-<component name="telephony_multimedia_service_api" long-name="Telephony Multimedia Service API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="mmfenh" long-name="MMF Enhancements" level="generic">
-<component name="advancedaudiocontroller" filter="s60" long-name="Advanced Audio Controllers" plugin="Y">
-<unit bldFile="mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
-</component>
-<component name="audiooutputcontrolutility" filter="s60" long-name="Audio Output Control Utility">
-<unit bldFile="mw/mmmw/mmfenh/audiooutputcontrolutility/group"/>
-</component>
-<component name="configurationcomponentsfactory" filter="s60" long-name="Configuration Components Factory">
-<unit bldFile="mw/mmmw/mmfenh/configurationcomponentsfactory/group"/>
-</component>
-<component name="enhancedaudioplayerutility" filter="s60" long-name="Enhanced Audio Player Utility">
-<unit bldFile="mw/mmmw/mmfenh/enhancedaudioplayerutility/group"/>
-</component>
-<component name="enhancedmediaclient" filter="s60" long-name="Enhanced Media Client">
-<unit bldFile="mw/mmmw/mmfenh/enhancedmediaclient/group"/>
-</component>
-<component name="profilesettingsmonitor" filter="s60" long-name="Profile Settings Monitor">
-<unit bldFile="mw/mmmw/mmfenh/profilesettingsmonitor/group"/>
-</component>
-<component name="progressivedownload" filter="s60" long-name="Progressive Download">
-<unit bldFile="mw/mmmw/mmfenh/progressivedownload/group"/>
-</component>
-</collection>
-<collection name="mm_fw" long-name="Multimedia Frameworks" level="framework">
-<!-- Id needs to be unique, mmfw already in use -->
-<!-- Placeholder for OpenAX AL and other stuff -->
-</collection>
-<collection name="mmserv" long-name="Multimedia Services" level="specific">
-<component name="audioeffectsui" filter="s60" long-name="Audio Effects UI">
-<unit bldFile="mw/mmmw/mmserv/audioeffectsui/group"/>
-</component>
-<component name="callaudiocontrol" filter="s60" long-name="Call Audio Control">
-<unit bldFile="mw/mmmw/mmserv/callaudiocontrol/group"/>
-</component>
-<component name="metadatautility" filter="s60" long-name="Metadata Utility">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/group"/>
-</component>
-<component name="radioutility" filter="s60" long-name="Radio Utility">
-<unit bldFile="mw/mmmw/mmserv/radioutility/group"/>
-</component>
-<component name="thumbnailengine" filter="s60" long-name="Thumbnail Engine" introduced="^2">
-<unit bldFile="mw/mmmw/mmserv/thumbnailengine/group"/>
-</component>
-<component name="tms" filter="s60" long-name="Telephony Multimedia Service" introduced="^3">
-<unit bldFile="mw/mmmw/mmserv/tms/group"/>
-</component>
-<component name="voipaudioservices" filter="s60" long-name="VoIP Audio Services">
-<unit bldFile="mw/mmmw/mmserv/voipaudioservices/group"/>
-</component>
-<component name="lib3gpextparser" filter="s60" long-name="3GP Extension Metadata Parser Library">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group" filter="sf_build"/>
-</component>
-</collection>
-<collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
-<component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="helix" level="generic" long-name="Helix" levels="plugin framework server generic specific">
-<collection name="helix_ren" long-name="Helix Engine" level="framework">
-<!-- what does "ren" stand for? -->
-<component name="helix_stub" filter="s60" long-name="Helix Stub" introduced="^2" class="api">
-<unit bldFile="mw/helix/helix_ren/helix_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="camerasrv" level="specific" long-name="Camera Services" levels="plugin fw api">
-<collection name="camerasrv_plat" long-name="Camera Services Platform Interfaces" level="api">
-<component name="media_recorder_sink_api" long-name="Media Recorder Sink API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
-</component>
-<component name="cae_extentension_api" long-name="CAE Extension API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/cae_extentension_api/group"/>
-</component>
-<component name="camera_application_engine_api" long-name="Camera Application Engine API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/camera_application_engine_api/group" filter="!test"/>
-</component>
-<component name="custom_onboard_camera_api" long-name="Custom Onboard Camera API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
-</component>
-<component name="imaging_configuration_manager_api" long-name="Imaging Configuration Manager API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
-</component>
-<component name="media_recorder_api" long-name="Media Recorder API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_api/group" filter="!test"/>
-</component>
-<component name="3gp_file_composer_api" long-name="3GP File Composer API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
-</component>
-<component name="asynchronous_file_saving_queue_api" long-name="Asynchronous File Saving Queue API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="camappengine" long-name="Camera App Engine" level="fw">
-<!-- is this collection really a component? If so, move down a directory -->
-<component name="stillconverter" filter="s60" long-name="Still Image Converter" class="placeholder">
-<!-- should separate this from parent engine's bld.inf -->
-<!-- <unit bldFile="camappengine/stillconverter/group"/> -->
-</component>
-<component name="camappengine_engine" filter="s60" long-name="Camera App Engine" class="placeholder">
-<!-- should separate this from parent engine's bld.inf -->
-<!-- <unit bldFile="camappengine/engine/group"/> -->
-</component>
-<component name="asynchfilesavequeue" filter="s60" long-name="Asynch File Save Queue">
-<unit bldFile="mw/camerasrv/camappengine/asynchfilesavequeue/group"/>
-</component>
-<component name="camappengine_build" filter="s60" long-name="Camera App Engine Build">
-<unit bldFile="mw/camerasrv/camappengine/build"/>
-</component>
-</collection>
-<collection name="camcordermmfplugin" long-name="Camcorder MMF Plugin" level="plugin">
-<!-- collection is really a component. Should move down a directory -->
-<component name="camcordermmfplugin_build" filter="s60" long-name="Camcorder MMF Plugin Build" plugin="Y">
-<unit bldFile="mw/camerasrv/camcordermmfplugin/build"/>
-</component>
-</collection>
-<collection name="configmanagers" long-name="Config Managers" level="api">
-<component name="imagingconfigmanager" filter="s60" long-name="Imaging Config Manager">
-<unit bldFile="mw/camerasrv/configmanagers/imagingconfigmanager/group"/>
-</component>
-</collection>
-<collection name="camerasrv_info" long-name="Camera Services Info" level="api">
-<component name="camerasrv_build" filter="s60" long-name="Camera Services Build">
-<!-- should split into individual bld.infs -->
-<unit bldFile="mw/camerasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="mmappfw" level="specific" long-name="Multimedia App Framework" levels="fw utils if">
-<collection name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" level="if">
-<component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interfaces Build" introduced="^1" filter="s60">
-<!-- this is no longer necessary when confguration is put in place -->
-<unit bldFile="mw/mmappfw/mmappfw_plat"/>
-</component>
-<component name="collection_helper_api" long-name="Collection Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
-</component>
-<component name="harvester_collection_mediator_api" long-name="Harvester Collection Mediator API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/group"/>
-</component>
-<component name="harvester_metadata_extractor_api" long-name="Harvester Metadata Extractor API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/group"/>
-</component>
-<component name="harvester_server_api" long-name="Harvester Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_server_api/group"/>
-</component>
-<component name="harvester_utility_api" long-name="Harvester Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_utility_api/group"/>
-</component>
-<component name="playlist_engine_api" long-name="Playlist Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playlist_engine_api/group"/>
-</component>
-<component name="mtp_keys_api" long-name="MTP Keys API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mtp_keys_api/group"/>
-</component>
-<component name="mpx_collection_common_definition_api" long-name="MPX Collection Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_common_definition_api/group"/>
-</component>
-<component name="mpx_collection_utility_api" long-name="MPX Collection Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/group"/>
-</component>
-<component name="mpx_common_api" long-name="MPX Common API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_api/group"/>
-</component>
-<component name="mpx_common_definition_api" long-name="MPX Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_common_definition_api" long-name="MPX Playback Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_utility_api" long-name="MPX Playback Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/group"/>
-</component>
-<component name="mpx_base_view_plugins_api" long-name="MPX Base View Plugins API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/group"/>
-</component>
-<component name="mpx_view_utility_api" long-name="MPX View Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_view_utility_api/group"/>
-</component>
-<component name="mpx_albumart_utility_api" long-name="MPX Album Art Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/group"/>
-</component>
-<component name="media_player_settings_engine_api" long-name="Media Player Settings Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
-</component>
-<component name="mpx_backstepping_utility_api" long-name="MPX Backstepping Utility API" introduced="^1" filter="s60" class="api">
-<!-- uncomment when configuration is put in place
- <unit bldFile="mmappfw_plat/mpx_backstepping_utility_api/group"/> -->
-</component>
-<component name="asx_parser_api" long-name="ASX Parser API" introduced="^1" filter="s60" class="api">
-<!-- uncomment when configuration is put in place
- <unit bldFile="mmappfw_plat/asx_parser_api/group"/> -->
-</component>
-<component name="playback_helper_api" long-name="Playback Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playback_helper_api/group"/>
-</component>
-<component name="videoplaylist_utility_api" long-name="Video Playlist Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/videoplaylist_utility_api/group"/>
-</component>
-<component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interface Build" introduced="^1" filter="s60" class="api">
-<!-- needed only for #ifdefs. Remove anmd uncomment above units when configuration is in place -->
-<unit bldFile="mw/mmappfw/mmappfw_plat/group"/>
-</component>
-</collection>
-<collection name="mpx" long-name="Multimedia Player" level="fw">
-<component name="commonframework" filter="s60" long-name="MPX Common Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/commonframework/group"/>
-</component>
-<component name="playbackframework" filter="s60" long-name="MPX Playback Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/playbackframework/group"/>
-</component>
-<component name="mpxcollectionfw" filter="s60" long-name="MPX Collection Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/collectionframework/group"/>
-</component>
-<component name="mpxviewfw" filter="s60" long-name="MPX View Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/viewframework/group"/>
-</component>
-<component name="mpx_build" filter="s60" long-name="MPX Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/mpx/group"/>
-</component>
-</collection>
-<collection name="mmappcomponents" long-name="Multimedia App Components" level="utils">
-<component name="mmappcomponents_build" filter="s60" long-name="Multimedia App Components Build" introduced="^1">
-<!-- needed for #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
- Can remove this once configuration is in place-->
-<unit bldFile="mw/mmappfw/mmappcomponents/group"/>
-</component>
-<component name="collectionhelper" filter="s60" long-name="Media Player Collection Helper" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/collectionhelper/group"/>
-</component>
-<component name="playlistengine" filter="s60" long-name="Playlist Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/playlistengine/group"/>
-</component>
-<component name="mpxharvester" filter="s60" long-name="Media Player Harvester" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/harvester/group"/>
-</component>
-<component name="mmappcommonui" filter="s60" long-name="Multimedia App Common UI" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmappcommonui/group"/>
-</component>
-<component name="mediaplayersettingsengine" filter="s60" long-name="Media Player Settings Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
-</component>
-<component name="audiofetcher" filter="s60" long-name="Audio Fetcher" introduced="^1" plugin="Y">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
-</component>
-<component name="asxparser" filter="s60" long-name="ASX Parser" introduced="^1">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
-</component>
-<component name="playbackhelper" filter="s60" long-name="Playback Helper" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/playbackhelper/group"/>
-</component>
-<component name="videoplaylistutility" filter="s60" long-name="Video Playlist Utility" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/videoplaylistutility/group"/>
-</component>
-<component name="mmmtpdataprovider" filter="s60" long-name="Multimedia MTP Data Provider" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmmtpdataprovider/group"/>
-</component>
-</collection>
-<collection name="mmappfw_info" long-name="Multimedia App Framework Info" level="if">
-<component name="mmappfw_build" filter="s60" long-name="Multimedia App Framework Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/group"/>
-</component>
-<component name="mmappfw_test" filter="s60,test,api_test,pref_test" long-name="Multimedia App Framework Test" purpose="development" introduced="^1"/>
-</collection>
-</block>
-<block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework api">
-<collection name="inputmethods_pub" long-name="Input Methods Public Interfaces" level="api">
-<component name="ptiengine_iti_api" long-name="PTI Engine API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
-</component>
-<component name="optical_character_recognition_api" long-name="Optical Character Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
-</component>
-<component name="input_language_info_api" long-name="Input Language Info API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
-</component>
-</collection>
-<collection name="inputmethods_plat" long-name="Input Methods Platform Interfaces" level="api">
-<component name="pen_input_server_api" long-name="Pen Input Server API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/group" filter="!test"/>
-</component>
-<component name="ptiengine_hwr_api" long-name="PTI Engine Handwriting Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group" filter="!test"/>
-</component>
-<component name="aknfep_settings_api" long-name="Avkon FEP Settings API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
-</component>
-<component name="aknfep_status_api" long-name="Avkon FEP Status API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
-</component>
-<component name="ptiengine_key_definations_api" long-name="PTI Engine Key Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
-</component>
-<component name="aknfep_definitions_api" long-name="Avkon FEP Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
-</component>
-<component name="aknfep_pen_support_api" long-name="Avkon FEP Pen Support API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
-</component>
-<component name="ptiengine_indic_definitions_api" long-name="PTI Engine Indic Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
-</component>
-<component name="aknfep_uiinterface_api" long-name="Avkon FEP UI Interface API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="textinput" long-name="Text Input" level="framework">
-<component name="ptienginev2" filter="s60" long-name="Predictive Text Input Engine">
-<!--uncomment when configuration is turned on and textinput_build is removed-->
-<!-- <unit bldFile="textinput/ptienginev2/group"/>-->
-</component>
-<component name="akninputlanguage" filter="s60" long-name="Avkon Input Language">
-<unit bldFile="mw/inputmethods/textinput/akninputlanguage/group"/>
-</component>
-<component name="peninputarc" filter="s60" long-name="Pen Input Arc">
-<unit bldFile="mw/inputmethods/textinput/peninputarc/group"/>
-</component>
-<component name="peninputcommonctrls" filter="s60" long-name="Pen Input Common Controls">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonctrls/group"/>
-</component>
-<component name="peninputhwrboxcn" filter="s60" long-name="Chinese Handwriting Recognition Box" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrboxcn/group"/>
-</component>
-<component name="peninputvkbcn" filter="s60" long-name="Chinese Virtual Keyboard" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputvkbcn/group"/>
-</component>
-<component name="peninputcommonlayout" filter="s60" long-name="Pen Input Common Layout">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonlayout/group"/>
-</component>
-<component name="peninputgenerichwr" filter="s60" long-name="Pen Input Generic Handwriting Recognition" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputgenerichwr/group"/>
-</component>
-<component name="peninputgenericvkb" filter="s60" long-name="Pen Input Generic Virtual Keyboard" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputgenericvkb/group"/>
-</component>
-<component name="peninputcommonctrlsjp" filter="s60" long-name="Pen Input Common Controls Japanese">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonctrlsjp/group"/>
-</component>
-<component name="peninputhwrboxjp" filter="s60" long-name="Japanese Handwriting Recognition Box" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrboxjp/group"/>
-</component>
-<component name="peninputvkbjp" filter="s60" long-name="Japanese Virtual Keyboard" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputvkbjp/group"/>
-</component>
-<component name="gslangplugin" filter="s60" long-name="GS Language Plugin" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/GSLangPlugin"/>
-</component>
-<component name="peninputgenericitut" filter="s60" long-name="Pen Input Generic ITU-T" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputgenericitut/group"/>
-</component>
-<component name="peninputhwrtrui" filter="s60" long-name="Pen Input Handwriting Recognition Training UI" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrtrui/group"/>
-</component>
-<component name="peninputhwrfscn" filter="s60" long-name="Pen Input Chinese Full Screen Handwriting Recognition" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrfscn/group"/>
-</component>
-<component name="peninputvkbkr" filter="s60" long-name="Pen Input Korean Virtual Keyboard" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputvkbkr/group"/>
-</component>
-<component name="peninputfingerhwr" filter="s60" long-name="Pen Input Finger Handwriting Recognition" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputfingerhwr/group"/>
-</component>
-<component name="peninputsplititut" filter="s60" long-name="Pen Input Split ITU-T" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputsplititut/group"/>
-</component>
-<component name="peninputsplitqwerty" filter="s60" long-name="Pen Input Split QWERTY" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputsplitqwerty/group"/>
-</component>
-<component name="textinput_build" filter="s60" long-name="Text Input Build">
-<!--needed for #ifdef, can be removed when configuration is implemented -->
-<unit bldFile="mw/inputmethods/textinput/group"/>
-</component>
-</collection>
-<collection name="fep" long-name="FEP" level="engine">
-<component name="aknfep" filter="s60" long-name="Avkon FEP" plugin="Y">
-<unit bldFile="mw/inputmethods/fep/aknfep/group"/>
-</component>
-<component name="frontendprocessor" long-name="Front End Processor" purpose="mandatory">
-<unit bldFile="mw/inputmethods/fep/frontendprocessor/group" mrp="mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
-</component>
-</collection>
-<collection name="inputmethods_info" long-name="Input Methods Info" level="api">
-<component name="inputmethods_metadata" long-name="Input Methods Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="qt" level="generic" long-name="Qt" levels="tool mw app">
-<collection name="qtconf" long-name="Qt Config" level="tool">
-<component name="qt_deviceconfiguration" long-name="Qt Device Configuration" introduced="^2" class="config tool">
-<unit bldFile="mw/qt/src/s60installs/deviceconfiguration"/>
-</component>
-</collection>
-<collection name="qt_info" long-name="Qt Info" level="mw">
-<component name="qt_build" long-name="Qt Build" introduced="^2">
-<unit bldFile="mw/qt" proFile="projects.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-<collection name="qtdemos" long-name="Qt Demos" level="app">
-<component name="qtdemos_build" long-name="Qt Demos Build" introduced="^2" filter="qtdemos">
-<unit bldFile="mw/qt/demos" proFile="demos.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qtexamples" long-name="Qt Examples" level="app">
-<component name="qtexamples_build" long-name="Qt Examples Build" introduced="^2" filter="qtexamples">
-<unit bldFile="mw/qt/examples" proFile="examples.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qt_tests" long-name="Qt Tests" level="app">
-<component name="qttestsauto" long-name="Qt Automated Tests" introduced="^2" filter="qttestsauto">
-<unit bldFile="mw/qt/tests/auto" proFile="qtpauto.pro"/>
-</component>
-<component name="qttestsbenchmarks" long-name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks">
-<unit bldFile="mw/qt/tests/benchmarks" proFile="benchmarks.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</block>
-<block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
-<collection name="classicui_plat" long-name="Classic UI Platform Interfaces" level="specific">
-<component name="personalisation_framework_api" long-name="Personalisation Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_framework_api/group" filter="!test"/>
-</component>
-<component name="signal_pane_api" long-name="Signal Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
-</component>
-<component name="japanese_reading_api" long-name="Japanese Reading API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/japanese_reading_api/group" filter="!test"/>
-</component>
-<component name="global_popup_priority_controller_api" long-name="Global Popup Priority Controller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
-</component>
-<component name="item_finder_api" long-name="Item Finder API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/item_finder_api/group" filter="!test"/>
-</component>
-<component name="avkon_fonts_api" long-name="Avkon Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_fonts_api/group" filter="!test"/>
-</component>
-<component name="extended_utilities_api" long-name="Extended Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
-</component>
-<component name="personalisation_plugin_api" long-name="Personalisation Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
-</component>
-<component name="extended_aiw_criteria_api" long-name="Extended AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="personalisation_application_api" long-name="Personalisation Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_application_api/group"/>
-</component>
-<component name="volume_popup_api" long-name="Volume Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
-</component>
-<component name="avkon_secondary_display_support_api" long-name="AVKON Secondary Display Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_support_api/group" filter="!test"/>
-</component>
-<component name="extended_setting_pages_api" long-name="Extended Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_setting_pages_api/group" filter="!test"/>
-</component>
-<component name="extended_lists_api" long-name="Extended Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_lists_api/group" filter="!test"/>
-</component>
-<component name="input_block_api" long-name="Input Block API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/input_block_api/group" filter="!test"/>
-</component>
-<component name="avkon_ui_server_api" long-name="AVKON UI Server API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_ui_server_api/group" filter="!test"/>
-</component>
-<component name="number_grouping_api" long-name="Number Grouping API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/number_grouping_api/group" filter="!test"/>
-</component>
-<component name="extended_status_pane_api" long-name="Extended Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_status_pane_api/group" filter="!test"/>
-</component>
-<component name="extended_notifiers_api" long-name="Extended Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notifiers_api/group" filter="!test"/>
-</component>
-<component name="task_list_api" long-name="Task List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
-</component>
-<component name="personalisation_slide_show_dialog_api" long-name="Personalisation Slide Show Dialog API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
-</component>
-<component name="key_event_utilities_api" long-name="Key Event Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_event_utilities_api/group"/>
-</component>
-<component name="emergency_call_support_api" long-name="Emergency Call Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/emergency_call_support_api/group" filter="!test"/>
-</component>
-<component name="extended_dialogs_api" long-name="Extended Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_dialogs_api/group"/>
-</component>
-<component name="legacy_ui_framework_headers_api" long-name="Legacy UI Framework Headers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/legacy_ui_framework_headers_api/group"/>
-</component>
-<component name="extended_editors_api" long-name="Extended Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_editors_api/group" filter="!test"/>
-</component>
-<component name="alarm_api" long-name="Alarm API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alarm_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_interface_base_api" long-name="AIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_base_api/group" filter="!test"/>
-</component>
-<component name="list_effects_api" long-name="List Effects API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/list_effects_api/group" filter="!test"/>
-</component>
-<component name="find_item_ui_api" long-name="Find Item UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/find_item_ui_api/group" filter="!test"/>
-</component>
-<component name="server_application_services_api" long-name="Server Application Services API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/server_application_services_api/group" filter="!test"/>
-</component>
-<component name="common_ui_settings_api" long-name="Common UI Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_ui_settings_api/group"/>
-</component>
-<component name="aiw_service_interface_menu_api" long-name="AIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_menu_api/group" filter="!test"/>
-</component>
-<component name="eikon_server_extension_client_api" long-name="EIKON Server Extension Client API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/eikon_server_extension_client_api/group" filter="!test"/>
-</component>
-<component name="skinnable_clock_api" long-name="Skinnable Clock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/skinnable_clock_api/group" filter="!test"/>
-</component>
-<component name="battery_pane_api" long-name="Battery Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/battery_pane_api/group" filter="!test"/>
-</component>
-<component name="fep_document_navigation_api" long-name="FEP Document Navigation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
-</component>
-<component name="personalisation_localised_texts_api" long-name="Personalisation Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
-</component>
-<component name="memory_card_ui_api" long-name="Memory Card UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
-</component>
-<component name="avkon_status_api" long-name="AVKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_status_api/group"/>
-</component>
-<component name="application_switching_api" long-name="Application Switching API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/application_switching_api/group" filter="!test"/>
-</component>
-<component name="avkon_localised_texts_api" long-name="AVKON Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_localised_texts_api/group"/>
-</component>
-<component name="avkon_secondary_display_api" long-name="AVKON Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_api/group"/>
-</component>
-<component name="extended_animation_api" long-name="Extended Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_notes_api" long-name="Extended Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notes_api/group" filter="!test"/>
-</component>
-<component name="screensaver_animation_plugin_definitions_api" long-name="Screensaver Animation Plugin Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/screensaver_animation_plugin_definitions_api/group"/>
-</component>
-<component name="text_scroller_api" long-name="Text Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/text_scroller_api/group" filter="!test"/>
-</component>
-<component name="custom_cursors_api" long-name="Custom Cursors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/custom_cursors_api/group" filter="!test"/>
-</component>
-<component name="screensaver_settings_api" long-name="Screensaver Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/screensaver_settings_api/group"/>
-</component>
-<component name="global_window_priorities_api" long-name="Global Window Priorities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_window_priorities_api/group"/>
-</component>
-<component name="extended_indicators_api" long-name="Extended Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_indicators_api/group" filter="!test"/>
-</component>
-<component name="special_character_table_api" long-name="Special Character Table API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/special_character_table_api/group" filter="!test"/>
-</component>
-<component name="avkon_settings_api" long-name="AVKON Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_settings_api/group"/>
-</component>
-<component name="extended_sounds_api" long-name="Extended Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_sounds_api/group"/>
-</component>
-<component name="themes_settings_api" long-name="Themes Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/themes_settings_api/group"/>
-</component>
-<component name="media_shared_document_api" long-name="Media Shared Document API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/media_shared_document_api/group" filter="!test"/>
-</component>
-<component name="extended_queries_api" long-name="Extended Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_queries_api/group"/>
-</component>
-<component name="phone_number_text_utilities_api" long-name="Phone Number Text Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
-</component>
-<component name="screensaver_runtime_api" long-name="Screensaver Runtime API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/screensaver_runtime_api/group"/>
-</component>
-<component name="extended_scroller_api" long-name="Extended Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_scroller_api/group"/>
-</component>
-<component name="key_rotator_api" long-name="Key Rotator API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_rotator_api/group" filter="!test"/>
-</component>
-<component name="extended_grids_api" long-name="Extended Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_grids_api/group" filter="!test"/>
-</component>
-<component name="generic_parameter_api" long-name="Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="indicator_touch_observer_api" long-name="Indicator Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_touch_observer_api/group"/>
-</component>
-<component name="popup_form_api" long-name="Popup Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/popup_form_api/group" filter="!test"/>
-</component>
-<component name="stylus_activated_popup_api" long-name="Stylus Activated Pop-up API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/stylus_activated_popup_api/group" filter="!test"/>
-</component>
-<component name="indicator_plugin_api" long-name="Indicator Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_plugin_api/group" filter="!test"/>
-</component>
-<component name="layout_configuration_api" long-name="Layout Configuration API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/layout_configuration_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_filter_factory_api" long-name="Common File Dialogs Filter Factory API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group" filter="!test"/>
-</component>
-<component name="avkon_anim_dll_api" long-name="AVKON Anim DLL API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_anim_dll_api/group"/>
-</component>
-<component name="extended_initialization_api" long-name="Extended Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_initialization_api/group" filter="!test"/>
-</component>
-<component name="long_tap_animation_api" long-name="Long Tap Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/long_tap_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_ui_framework_definitions_api" long-name="Extended UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_ui_framework_definitions_api/group"/>
-</component>
-<component name="extended_buttons_api" long-name="Extended Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_buttons_api/group" filter="!test"/>
-</component>
-<component name="aiw_provider_utility_api" long-name="AIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_provider_utility_api/group" filter="!test"/>
-</component>
-<component name="transition_effect_parameters_api" long-name="Transition Effect Parameters API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_parameters_api/group" filter="!test"/>
-</component>
-<component name="extended_input_capabilities_api" long-name="Extended Input Capabilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_input_capabilities_api/group" filter="!test"/>
-</component>
-<component name="uikon_status_api" long-name="UIKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/uikon_status_api/group"/>
-</component>
-<component name="transition_effect_utilities_api" long-name="Transition Effect Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_utilities_api/group" filter="!test"/>
-</component>
-<component name="pointer_event_modifier_api" long-name="Pointer Event Modifier API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/pointer_event_modifier_api/group" filter="!test"/>
-</component>
-<component name="avkon_testability_api" long-name="AVKON Testability API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_testability_api/group"/>
-</component>
-<component name="ganes_api" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ganes_api/group"/>
-</component>
-<component name="ode_api" long-name="Ode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ode_api/group"/>
-</component>
-<component name="physics_api" long-name="Physics API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/physics_api/group"/>
-</component>
-<component name="touch_pane_api" long-name="Touch Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_api/group" filter="!test"/>
-</component>
-<component name="touch_pane_observer_api" long-name="Touch Pane Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_observer_api/group"/>
-</component>
-<component name="alternate_fs_api" long-name="Alternate FS API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alternate_fs_api/group"/>
-</component>
-<component name="discreet_popup_api" long-name="Discreet Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/discreet_popup_api/group"/>
-</component>
-<component name="touch_gesture_framework_api" long-name="Touch Gesture Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_gesture_framework_api/group"/>
-<!-- should this be commented out? -->
-<!--<unit bldFile="classicui_plat/touch_gesture_framework_api/tsrc/group" filter="test,api_test"/> -->
-</component>
-<component name="extended_options_menu_api" long-name="Extended Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="classicui_pub" long-name="Classic UI Public Interfaces" level="specific">
-<component name="input_frame_api" long-name="Input Frame API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/input_frame_api/group" filter="!test"/>
-</component>
-<component name="window_server_event_observer_api" long-name="Window Server Event Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/window_server_event_observer_api/group" filter="!test"/>
-</component>
-<component name="application_framework_api" long-name="Application Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/application_framework_api/group" filter="!test"/>
-</component>
-<component name="scroller_api" long-name="Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/scroller_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_utilities_api" long-name="UI Framework Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_utilities_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_definitions_api" long-name="UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_definitions_api/group" filter="!test"/>
-</component>
-<component name="buttons_api" long-name="Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/buttons_api/group" filter="!test"/>
-</component>
-<component name="queries_api" long-name="Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/queries_api/group" filter="!test"/>
-</component>
-<component name="aiw_generic_parameter_api" long-name="AIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="editors_api" long-name="Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/editors_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_api" long-name="Common File Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/common_file_dialogs_api/group" filter="!test"/>
-</component>
-<component name="dialog_shutter_api" long-name="Dialog Shutter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialog_shutter_api/group" filter="!test"/>
-</component>
-<component name="fonts_api" long-name="Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/fonts_api/group" filter="!test"/>
-</component>
-<component name="screen_clearer_api" long-name="Screen Clearer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_clearer_api/group" filter="!test"/>
-</component>
-<component name="notifiers_api" long-name="Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notifiers_api/group" filter="!test"/>
-</component>
-<component name="notes_api" long-name="Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notes_api/group" filter="!test"/>
-</component>
-<component name="screen_saver_api" long-name="Screen Saver API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_saver_api/group" filter="!test"/>
-</component>
-<component name="status_pane_api" long-name="Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/status_pane_api/group" filter="!test"/>
-</component>
-<component name="base_controls_api" long-name="Base Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/base_controls_api/group" filter="!test"/>
-</component>
-<component name="grids_api" long-name="Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/grids_api/group" filter="!test"/>
-</component>
-<component name="context_pane_api" long-name="Context Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/context_pane_api/group" filter="!test"/>
-</component>
-<component name="lists_api" long-name="Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/lists_api/group" filter="!test"/>
-</component>
-<component name="popups_api" long-name="Popups API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/popups_api/group" filter="!test"/>
-</component>
-<component name="misc_controls_api" long-name="Misc Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/misc_controls_api/group" filter="!test"/>
-</component>
-<component name="keylock_api" long-name="Keylock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/keylock_api/group" filter="!test"/>
-</component>
-<component name="options_menu_api" long-name="Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/options_menu_api/group" filter="!test"/>
-</component>
-<component name="hierarchical_lists_api" long-name="Hierarchical Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hierarchical_lists_api/group" filter="!test"/>
-</component>
-<component name="navigation_pane_api" long-name="Navigation Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/navigation_pane_api/group" filter="!test"/>
-</component>
-<component name="tabs_api" long-name="Tabs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/tabs_api/group" filter="!test"/>
-</component>
-<component name="title_pane_touch_observer_api" long-name="Title Pane Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_touch_observer_api/group"/>
-</component>
-<component name="choice_list_api" long-name="Choice List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/choice_list_api/group" filter="!test"/>
-</component>
-<component name="info_popup_note_api" long-name="Info Popup Note API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/info_popup_note_api/group" filter="!test"/>
-</component>
-<component name="setting_pages_api" long-name="Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/setting_pages_api/group" filter="!test"/>
-</component>
-<component name="screen_mode_api" long-name="Screen Mode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_mode_api/group" filter="!test"/>
-</component>
-<component name="indicators_api" long-name="Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/indicators_api/group" filter="!test"/>
-</component>
-<component name="error_ui_api" long-name="Error UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/error_ui_api/group" filter="!test"/>
-</component>
-<component name="animation_api" long-name="Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/animation_api/group" filter="!test"/>
-</component>
-<component name="searchfield_api" long-name="Searchfield API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/searchfield_api/group" filter="!test"/>
-</component>
-<component name="labels_api" long-name="Labels API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/labels_api/group" filter="!test"/>
-</component>
-<component name="hotkeys_api" long-name="Hotkeys API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hotkeys_api/group" filter="!test"/>
-</component>
-<component name="initialization_api" long-name="Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/initialization_api/group" filter="!test"/>
-</component>
-<component name="volume_control_api" long-name="Volume Control API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/volume_control_api/group" filter="!test"/>
-</component>
-<component name="title_pane_api" long-name="Title Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_api/group" filter="!test"/>
-</component>
-<component name="sounds_api" long-name="Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/sounds_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_handler_api" long-name="AIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_service_handler_api/group" filter="!test"/>
-</component>
-<component name="aiw_criteria_api" long-name="AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="touch_ui_utilities_api" long-name="Touch UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/touch_ui_utilities_api/group" filter="!test"/>
-</component>
-<component name="generic_button_api" long-name="Generic Button API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/generic_button_api/group" filter="!test"/>
-</component>
-<component name="form_api" long-name="Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/form_api/group" filter="!test"/>
-</component>
-<component name="uikon_core_controls" long-name="Uikon Core Controls" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/uikon_core_controls/group" filter="!test"/>
-</component>
-<component name="calendar_api" long-name="Calendar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/calendar_api/group"/>
-</component>
-<component name="toolbar_api" long-name="Toolbar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/toolbar_api/group" filter="!test"/>
-</component>
-<component name="server_application_api" long-name="Server Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/server_application_api/group"/>
-</component>
-<component name="slider_api" long-name="Slider API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/slider_api/group" filter="!test"/>
-</component>
-<component name="private_ui_framework_api" long-name="Private UI Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/private_ui_framework_api/group" filter="!test"/>
-</component>
-<component name="dialogs_api" long-name="Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialogs_api/group" filter="!test"/>
-</component>
-<component name="document_handler_api" long-name="Document handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/document_handler_api/group"/>
-</component>
-<component name="images_api" long-name="Images API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/images_api/group" filter="!test"/>
-</component>
-<component name="stylus_popup_menu_api" long-name="Stylus Pop-up Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/stylus_popup_menu_api/group" filter="!test"/>
-</component>
-<component name="information_preview_popup_api" long-name="Information Preview Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/information_preview_popup_api/group" filter="!test"/>
-</component>
-<component name="intermediate_state_api" long-name="Intermediate State API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/intermediate_state_api/group"/>
-</component>
-<component name="help_launcher_api" long-name="Help Launcher API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/help_launcher_api/group"/>
-</component>
-</collection>
-<collection name="ode" long-name="Open Dynamics Engine" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="ode_build" filter="s60" long-name="ODE">
-<unit bldFile="mw/classicui/ode/group"/>
-</component>
-</collection>
-<collection name="uifw" long-name="UI Framework" level="server">
-<component name="uiklaf" filter="s60" long-name="Uikon Look-and-Feel">
-<unit bldFile="mw/classicui/uifw/uiklaf/group"/>
-</component>
-<component name="eikctl" filter="s60" long-name="Eikon Controls">
-<unit bldFile="mw/classicui/uifw/eikctl/group"/>
-</component>
-<component name="avkon" filter="s60" long-name="Avkon">
-<!-- can only have one unit. Split into 3 components, or #include all from same bld.inf -->
-<unit bldFile="mw/classicui/uifw/avkon/aknphysics/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/aknconf/group"/>
-</component>
-<component name="eikstd" filter="s60" long-name="Eikon Standard">
-<unit bldFile="mw/classicui/uifw/eikstd/group"/>
-</component>
-<component name="aknglobalui" filter="s60" long-name="Avkon Global UI">
-<unit bldFile="mw/classicui/uifw/aknglobalui/group"/>
-</component>
-<component name="ganes" filter="s60" long-name="Ganes">
-<unit bldFile="mw/classicui/uifw/ganes/group"/>
-</component>
-</collection>
-<collection name="commonuis" long-name="Common UIs" level="specific">
-<component name="commonui" filter="s60" long-name="Common UI">
-<unit bldFile="mw/classicui/commonuis/commonui/group"/>
-</component>
-<component name="commondialogs" filter="s60" long-name="Common Dialogs">
-<unit bldFile="mw/classicui/commonuis/commondialogs/group"/>
-</component>
-</collection>
-<collection name="applicationinterworkingfw" long-name="Application Interworking Framework" level="generic">
-<component name="aifwservicehandler" filter="s60" long-name="Application Interworking Service Handler">
-<unit bldFile="mw/classicui/applicationinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-<collection name="psln" long-name="Personalization" level="specific">
-<!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
-<component name="psln_build" filter="s60" long-name="Personalization Build">
-<unit bldFile="mw/classicui/psln/group"/>
-</component>
-</collection>
-<collection name="commonadapter" long-name="Common Adapter" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="commonadapter_build" filter="s60" long-name="Common Adapter Build">
-<unit bldFile="mw/classicui/commonadapter/group"/>
-</component>
-</collection>
-<collection name="akntouchgesturefw" long-name="Avkon Touch Gesture Framework" level="generic">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="akntouchgesturefw_build" filter="s60" long-name="Avkon Touch Gesture Framework Build" introduced="^3">
-<unit bldFile="mw/classicui/akntouchgesturefw/group"/>
-</component>
-</collection>
-<collection name="uiutils" long-name="UI Utils" level="specific">
-<component name="localizer" filter="s60" long-name="Directory Localizer">
-<unit bldFile="mw/classicui/uiutils/localizer/group"/>
-</component>
-<component name="findutil" filter="s60" long-name="Find Utility">
-<unit bldFile="mw/classicui/uiutils/findutil/group"/>
-</component>
-<component name="gamerecognizer" filter="s60" long-name="Game Recognizer" plugin="Y">
-<unit bldFile="mw/classicui/uiutils/gamerecognizer/group"/>
-</component>
-<component name="aknjapanesereading" filter="s60" long-name="Avkon Japanese Reading">
-<unit bldFile="mw/classicui/uiutils/aknjapanesereading/group"/>
-</component>
-</collection>
-<collection name="commonuisupport" long-name="Common UI Support" level="support">
-<component name="uikon" long-name="Uikon" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uikon/group" mrp="mw/classicui/commonuisupport/uikon/group/app-framework_uikon.mrp"/>
-</component>
-<component name="errorresolverdata" long-name="Error Resolver Data" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/errorresolverdata/group" mrp="mw/classicui/commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
-</component>
-<component name="uilaf" long-name="UI Look and Feel" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uilaf/GROUP" mrp="mw/classicui/commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
-</component>
-<component name="grid" long-name="Grid" purpose="optional">
-<unit bldFile="mw/classicui/commonuisupport/grid/group" mrp="mw/classicui/commonuisupport/grid/group/app-framework_grid.mrp"/>
-</component>
-<component name="uifwsdocs" long-name="UI Frameworks Documentation" purpose="development" class="doc">
-<unit mrp="mw/classicui/commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
-</component>
-</collection>
-<collection name="lafagnosticuifoundation" long-name="Look-and-Feel Agnostic UI Foundation" level="base">
-<component name="cone" long-name="Control Environment" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/cone/group" mrp="mw/classicui/lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
-</component>
-<component name="graphicseffects" long-name="Graphics Effects" introduced="9.2" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/graphicseffects/group" mrp="mw/classicui/lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
-</component>
-<component name="uigraphicsutils" long-name="UI Graphics Utilities" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group" mrp="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
-</component>
-<component name="clockanim" long-name="Clock" purpose="optional" plugin="Y">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/clockanim/group" mrp="mw/classicui/lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
-</component>
-<component name="bmpanimation" long-name="BMP Animation" introduced="6.0" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/bmpanimation/group" mrp="mw/classicui/lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
-</component>
-<component name="animation" long-name="Animation" introduced="9.1" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/animation/group" mrp="mw/classicui/lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
-</component>
-</collection>
-<collection name="classicui_info" long-name="Classic UI Info" level="specific">
-<!-- the multiple units in the API test components need to be resolved -->
-<component name="classicui_metadata" long-name="Classic UI Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/classicui/classicui_info/classicui_metadata/classicui_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="svgt" level="generic" long-name="SVG Tiny" levels="util ui">
-<collection name="svgt_plat" long-name="SVG Tiny Platform Interfaces" level="ui">
-<component name="svgt_api" long-name="SVGT API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/svgt_api/group"/>
-</component>
-<component name="nvg_api" long-name="NVG API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/nvg_api/group"/>
-</component>
-</collection>
-<collection name="svgtopt" long-name="SVG-T Engine" level="util">
-<component name="svgtopt_build" filter="s60" long-name="SVG Engine" introduced="9.2">
-<!-- component is at collection level. Needs to be moved down a directory -->
-<unit bldFile="mw/svgt/svgtopt/group"/>
-</component>
-<component name="svgtplugin" filter="s60" long-name="SVG Plugin" introduced="9.2" plugin="Y">
-<unit bldFile="mw/svgt/svgtopt/svgtplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="uiaccelerator" level="generic" long-name="UI Accelerator" levels="plugin framework server ex if">
-<collection name="uiaccelerator_plat" long-name="UI Accelerator Platform Interfaces" level="if">
-<component name="alf_core_toolkit_api" long-name="ALF Core Toolkit API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/group"/>
-</component>
-<component name="alf_visual_api" long-name="ALF Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/group"/>
-</component>
-<component name="alf_extended_visual_api" long-name="ALF Extended Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/group"/>
-</component>
-<component name="alf_extension_api" long-name="ALF Extension API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/group"/>
-</component>
-<component name="alf_tracing_api" long-name="ALF Tracing API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/group"/>
-</component>
-<component name="alf_client_server_api" long-name="ALF Client Server API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/group"/>
-</component>
-</collection>
-<collection name="uiacceltk" long-name="UI Accelerator Toolkit" level="framework">
-<component name="hitchcock" filter="s60" long-name="Hitchcock">
-<unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/group"/>
-</component>
-<component name="uiacceltk_build" filter="s60" long-name="UI Accelerator Toolkit Build">
-<!-- move into the other component, or remove the #include and make this UI Accelerator Toolkit ROM-->
-<unit bldFile="mw/uiaccelerator/uiacceltk/group"/>
-</component>
-</collection>
-</block>
-<block name="uiresources" level="generic" long-name="UI Resources" levels="compile plugin framework server generic data">
-<!-- are the custom filters below needed? -->
-<collection name="uiresources_pub" long-name="UI Resources Public Interfaces" level="data">
-<component name="pictograph_api" long-name="Pictograph API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/pictograph_api/group" filter="!test"/>
-</component>
-<component name="skins_api" long-name="Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/skins_api/group" filter="!test"/>
-</component>
-<component name="font_definition_api" long-name="Font Definition API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/font_definition_api/group" filter="!test"/>
-</component>
-<component name="graphics_api" long-name="Graphics API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/graphics_api/group" filter="!test"/>
-</component>
-<component name="scalable_icons_api" long-name="Scalable Icons API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/scalable_icons_api/group"/>
-</component>
-<component name="layout_id_definitions_api" long-name="Layout ID Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/layout_id_definitions_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_plat" long-name="UI Resources Platform Interfaces" level="data">
-<component name="layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_system_private_api/group" filter="!test"/>
-</component>
-<component name="layout_data_api" long-name="Layout Data API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_data_api/group" filter="!test"/>
-</component>
-<component name="cdl_api" long-name="CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/cdl_api/group" filter="!test"/>
-</component>
-<component name="extended_skins_api" long-name="Extended Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_skins_api/group" filter="!test"/>
-</component>
-<component name="tfx_server_controller_plugin_api" long-name="TFX Server Controller Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_controller_plugin_api/group"/>
-</component>
-<component name="extended_fonts_api" long-name="Extended Fonts API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_fonts_api/group" filter="!test"/>
-</component>
-<component name="graphic_configuration_api" long-name="Graphic Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/graphic_configuration_api/group" filter="!test"/>
-</component>
-<component name="mif_header_cdl_api" long-name="MIF Header CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mif_header_cdl_api/group"/>
-</component>
-<component name="personalisation_and_skins_settings_api" long-name="Personalisation and Skins Settings API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/personalisation_and_skins_settings_api/group"/>
-</component>
-<component name="tfx_effect_setup_plugin_api" long-name="TFX Effect Setup Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_effect_setup_plugin_api/group"/>
-</component>
-<component name="mifconv_definitions_api" long-name="Mifconv Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mifconv_definitions_api/group"/>
-</component>
-<component name="wallpaper_configuration_api" long-name="Wallpaper Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/wallpaper_configuration_api/group"/>
-</component>
-<component name="language_code_definitions_api" long-name="Language Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/language_code_definitions_api/group"/>
-</component>
-<component name="skins_image_attributes_api" long-name="Skins Image Attributes API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
-</component>
-<component name="private_user_area_code_definitions_api" long-name="Private User Area Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/private_user_area_code_definitions_api/group"/>
-</component>
-<component name="tfx_server_plugin_ids_api" long-name="TFX Server Plug-in IDs API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_plugin_ids_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_info" long-name="UI Resources Info" level="data">
-<component name="uiresources_test" filter="s60,test,api_test" long-name="UI Resources Tests" purpose="development"/>
-</collection>
-<collection name="uigraphics" long-name="UI Graphics" level="generic">
-<component name="bitmaps2" filter="s60" long-name="Bitmaps 2" class="config">
-<unit bldFile="mw/uiresources/uigraphics/bitmaps2/group"/>
-</component>
-<component name="icons" filter="s60" long-name="Icons" class="config">
-<unit bldFile="mw/uiresources/uigraphics/icons/group"/>
-</component>
-<component name="variatedbitmaps" filter="s60" long-name="Variated Bitmaps" class="config">
-<unit bldFile="mw/uiresources/uigraphics/variatedbitmaps/group"/>
-</component>
-<component name="aknicon" filter="s60" long-name="Avkon Icon Framework">
-<unit bldFile="mw/uiresources/uigraphics/aknicon/group"/>
-</component>
-<component name="nvgrenderstage" filter="sf_build" long-name="NVG Render Stage">
-<unit bldFile="mw/uiresources/uigraphics/nvgrenderstage/group"/>
-</component>
-</collection>
-<collection name="layouts" long-name="Layouts" level="plugin">
-<component name="cdl" filter="s60" long-name="Customization Definition Language">
-<!-- can only have one unit. Need to #include them or split into multiple components -->
-<unit bldFile="mw/uiresources/layouts/cdl/cdlengine/group"/>
-<unit bldFile="mw/uiresources/layouts/cdl/cdlserver/group"/>
-</component>
-<component name="aknlayout2" filter="s60" long-name="Avkon Layout 2">
-<unit bldFile="mw/uiresources/layouts/aknlayout2/group"/>
-</component>
-</collection>
-<collection name="skins" long-name="Skins" level="data">
-<component name="aknskincontent" filter="s60" long-name="Avkon Skin Content" class="config">
-<unit bldFile="mw/uiresources/skins/aknskincontent/group"/>
-</component>
-<component name="aknskins" filter="s60" long-name="Avkon Skin Compiler">
-<unit bldFile="mw/uiresources/skins/aknskins/group"/>
-</component>
-</collection>
-<collection name="pictographs" long-name="Pictographs" level="data">
-<component name="aknpictograph" filter="s60" long-name="Avkon Pictograph">
-<unit bldFile="mw/uiresources/pictographs/aknpictograph/group"/>
-</component>
-</collection>
-<collection name="locales" long-name="Locales" level="framework">
-<component name="locales_build" filter="s60" long-name="Locales Build">
-<unit bldFile="mw/uiresources/locales/loce32"/>
-</component>
-</collection>
-<collection name="uiconfig" long-name="UI Config" level="server">
-<component name="s60config" filter="s60" long-name="S60 UI Config">
-<unit bldFile="mw/uiresources/uiconfig/s60config/group"/>
-</component>
-</collection>
-<collection name="fontsupport" long-name="Font Support" level="generic">
-<component name="fontprovider" filter="s60" long-name="Font Provider">
-<unit bldFile="mw/uiresources/fontsupport/fontprovider/group"/>
-</component>
-<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
- <component id="s60_fonts" filter="s60" name="S60 Fonts">
- <unit bldFile="fontsupport/fontutils/group"/>
- </component>
--->
-<component name="fontutils" filter="sf_build" long-name="Font Utils">
-<unit bldFile="mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
-</component>
-</collection>
-<collection name="helpthemes" long-name="Help Themes" level="data">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helpthemes_build" filter="s60" long-name="Help Themes Build" class="config">
-<unit bldFile="mw/uiresources/helpthemes/group"/>
-</component>
-</collection>
-</block>
-<block name="hapticsservices" level="generic" long-name="Haptics Services" levels="fw server api">
-<collection name="hapticsservices_plat" long-name="Haptics Services Platform Interfaces" level="api">
-<component name="tacticon_api" long-name="Tacticon API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tacticon_api/group"/>
-</component>
-<component name="tactile_feedback_core_api" long-name="Tactile Feedback Core API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_core_api/group"/>
-</component>
-<component name="tactile_feedback_server_api" long-name="Tactile Feedback Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_server_api/group"/>
-</component>
-</collection>
-<collection name="hapticsservices_pub" long-name="Haptics Services Public Interfaces" level="api">
-<component name="tactile_feedback_client_api" long-name="Tactile Feedback Client API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_pub/tactile_feedback_client_api/group"/>
-</component>
-</collection>
-<collection name="tacticonserver" long-name="Tacticon Server" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="tacticonserver_build" filter="s60" long-name="Tacticon Server Build" introduced="^3">
-<unit bldFile="mw/hapticsservices/tacticonserver/group"/>
-<!-- clients and servers are suauly the same component. Consider moving pluign to a separate component if needed -->
-</component>
-</collection>
-<collection name="tactilefeedback" long-name="Tactile Feedback" level="fw">
-<component name="tactilearearegistry" filter="s60" long-name="Tactile Area Registry" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilearearegistry/group"/>
-</component>
-<component name="tactilefeedbackresolver" filter="s60" long-name="Tactile Feedback Resolver" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackresolver/group"/>
-</component>
-<component name="tactileclickplugin" filter="s60" long-name="Tactile Click Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileclickplugin/group"/>
-</component>
-<component name="tactilefeedbackclient" filter="s60" long-name="Tactile Feedback Client" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackclient/group"/>
-</component>
-<component name="tactileactionplugin" filter="s60" long-name="Tactile Action Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileactionplugin/group"/>
-</component>
-<component name="tactilefeedback_build" filter="s60" long-name="Tactile Feedback Build" introduced="^1">
-<!-- consider moving IBY to one fo the above components -->
-<unit bldFile="mw/hapticsservices/tactilefeedback/group"/>
-</component>
-</collection>
-</block>
-<block name="gsprofilesrv" level="generic" long-name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
-<collection name="gsprofilesrv_pub" long-name="GS and Profiles Services Public Interfaces" level="specific">
-<component name="profiles_engine_active_profile_settings_api" long-name="Profiles Engine Active Profile Settings API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_active_profile_settings_api/group"/>
-</component>
-<component name="profiles_engine_wrapper_api" long-name="Profiles Engine Wrapper API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_wrapper_api/group"/>
-</component>
-</collection>
-<collection name="gsprofilesrv_plat" long-name="GS and Profiles Services Platform Interfaces" level="specific">
-<component name="profiles_engine_api" long-name="Profiles Engine API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_engine_api/group"/>
-</component>
-<component name="profiles_mediafilelist_api" long-name="Media File List API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_mediafilelist_api/group"/>
-</component>
-<component name="filelist_api" long-name="File List API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/filelist_api/group"/>
-</component>
-<component name="settings_backgroundimage_api" long-name="Settings Background Image API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_backgroundimage_api/group"/>
-</component>
-<component name="settings_framework_api" long-name="Settings Framework API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_framework_api/group"/>
-</component>
-<component name="settings_launch_api" long-name="Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_launch_api/group"/>
-</component>
-<component name="settings_listbox_api" long-name="Settings List Box API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_listbox_api/group"/>
-</component>
-<component name="settings_plugin_api" long-name="Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_plugin_api/group"/>
-</component>
-<component name="settings_uis_cenrep_collection_api" long-name="Settings UIs CenRep Collection API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
-</component>
-</collection>
-<collection name="gssettingsuis" long-name="General Settings UIs" level="framework">
-<component name="gs" filter="s60" long-name="General Settings" introduced="9.2">
-<unit bldFile="mw/gsprofilesrv/gssettingsuis/gs/group"/>
-</component>
-</collection>
-<collection name="profilesservices" long-name="Profiles Services" level="server">
-<component name="filelist" filter="s60" long-name="File List" introduced="9.1">
-<unit bldFile="mw/gsprofilesrv/profilesservices/filelist/group"/>
-</component>
-<component name="mediafilelist" filter="s60" long-name="Media File List" introduced="^2">
-<unit bldFile="mw/gsprofilesrv/profilesservices/mediafilelist/group"/>
-</component>
-<component name="profileengine" filter="s60" long-name="Profile Engine" introduced="9.1">
-<unit bldFile="mw/gsprofilesrv/profilesservices/profileengine/group"/>
-</component>
-<component name="ringingtone3dplugin" filter="s60" long-name="Ringing Tone 3D Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/gsprofilesrv/profilesservices/ringingtone3dplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreensrv" level="specific" long-name="Home Screen Services" levels="plugin framework server generic specific">
-<collection name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" level="specific">
-<component name="ai_content_model_api" long-name="AI Content Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_content_model_api/group"/>
-</component>
-<component name="ai_utilities_api" long-name="AI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_utilities_api/group" filter="!test"/>
-</component>
-<component name="ai_plugin_management_api" long-name="AI Plug-in Management API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_management_api/group"/>
-</component>
-<component name="ai_plugin_information_api" long-name="AI Plug-in Information API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_information_api/group"/>
-</component>
-<component name="ai_variation_api" long-name="AI Variation API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_variation_api/group"/>
-</component>
-<component name="action_handler_plugin_api" long-name="Action Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/group" filter="!test"/>
-</component>
-<component name="content_harvester_plugin_api" long-name="Content Harvester Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/group" filter="!test"/>
-</component>
-<component name="menu_model_api" long-name="Menu Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_model_api/group"/>
-</component>
-<component name="menu_sat_interface_api" long-name="Menu SAT Interface API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/group" filter="!test"/>
-</component>
-<component name="external_home_screen_api" long-name="External Home Screen API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/external_home_screen_api/group"/>
-</component>
-<component name="menu_content_service_api" long-name="Menu Content Service API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_content_service_api/group" filter="!test"/>
-</component>
-<component name="sapi_contentpublishing" long-name="SAPI Content Publishing" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing/group"/>
-</component>
-<component name="sapi_backstepping" long-name="SAPI Backstepping" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_backstepping/group"/>
-</component>
-<component name="sapi_actionhandler" long-name="SAPI Action Handler" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_actionhandler/group"/>
-</component>
-<component name="sapi_homescreenplugin" long-name="SAPI Homescreen Plugin" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_homescreenplugin/group" filter="!test"/>
-</component>
-<component name="sapi_menucontent" long-name="SAPI Menu Content" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_menucontent/group"/>
-</component>
-<component name="xcfw_api" long-name="XCFW API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/xcfw_api/group"/>
-</component>
-<component name="idlefw_api" long-name="Idle Framework API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/idlefw_api/group"/>
-</component>
-<component name="hs_widget_publisher_api" long-name="Home Screen Publishing API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_widget_publisher_api/group"/>
-</component>
-<component name="hs_settings_api" long-name="HS Settings API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_settings_api/group"/>
-</component>
-<component name="hs_content_control_api" long-name="HS Content Control API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_content_control_api/group"/>
-</component>
-</collection>
-<collection name="xcfw" long-name="XML Content Framework" level="framework">
-<!-- collection is really a component, needs to be moved down a directory -->
-<component name="xcfw_build" filter="s60" long-name="XML Content Framework Build">
-<unit bldFile="mw/homescreensrv/xcfw/group"/>
-</component>
-</collection>
-<collection name="homescreenpluginsrv" long-name="Home Screen Plugin Service" level="plugin">
-<component name="hspsdefinitionengine" filter="s60" long-name="HS Plugin Service Definition Engine" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsdefinitionengine/group"/> -->
-</component>
-<component name="hspsdom" filter="s60" long-name="HS Plugin Service DOM" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsdom/group"/> -->
-</component>
-<component name="hspstools" filter="s60" long-name="HS Server Tools">
-<!-- <unit bldFile="homescreenpluginsrv/hspstools/group"/> -->
-</component>
-<component name="hspspluginregistry" filter="s60" long-name="HS Plugin Registry" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspspluginregistry/group"/>-->
-</component>
-<component name="hspsmanager" filter="s60" long-name="HSPS Manager" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsmanager/group"/>-->
-</component>
-<component name="hspsodt" filter="s60" long-name="HSPS Object Description Tree" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsodt/group"/>-->
-</component>
-<component name="hspsresource" filter="s60" long-name="HS Plugin Server Resource" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresource/group"/>-->
-</component>
-<component name="hspsresult" filter="s60" long-name="HS Plugin Server Result" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
-</component>
-<component name="homescreen_settings_api" filter="s60" long-name="HS Settings API" class="api placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
-</component>
-<component name="homescreenpluginsrv_build" filter="s60" long-name="HSPS Build">
-<!-- need to break this up into the self-contained components above and uncomment them -->
-<unit bldFile="mw/homescreensrv/homescreenpluginsrv/group"/>
-</component>
-</collection>
-<collection name="idlefw" long-name="Idle Framework" level="framework">
-<!-- Uncomment all units when configuration is in place. All currently #included from idlefw_build -->
-<component name="idlefw_plugins" filter="s60" long-name="Idle Framework Plugins" plugin="Y" class="placeholder">
-<!--<unit bldFile="idlefw/plugins/group"/>-->
-</component>
-<component name="hslaunch" filter="s60" long-name="Home Screen Launch" class="placeholder">
-<!--<unit bldFile="idlefw/plugins/group"/>-->
-</component>
-<component name="idlefw_build" filter="s60" long-name="Idle Framework Build">
-<!--split this into components, or separate from the above components and move this down a directory -->
-<unit bldFile="mw/homescreensrv/idlefw/group"/>
-</component>
-</collection>
-<collection name="menucontentsrv" long-name="Menu Content Service" level="generic">
-<component name="menusatinterface" filter="s60" long-name="Menu SAT Interface">
-<unit bldFile="mw/homescreensrv/menucontentsrv/menusatinterface/group"/>
-</component>
-<component name="menucontentsrv_build" filter="s60" long-name="Menu Content Service Build">
-<!--split this into components, or separate from the above component and move this down a directory -->
-<unit bldFile="mw/homescreensrv/menucontentsrv/group"/>
-</component>
-</collection>
-<collection name="backsteppingsrv" long-name="Back Stepping Service" level="server">
-<!-- collection is really a component, needs to be moved down a directory -->
-<component name="bsengine" long-name="Back Stepping Engine" filter="s60">
-<unit bldFile="mw/homescreensrv/backsteppingsrv/group"/>
-</component>
-</collection>
-<collection name="contentpublishingsrv" long-name="Content Publishing Service" level="server">
-<component name="contentpublishingdebug" filter="s60" long-name="Content Publishing Debug">
-<!-- need to move this component outside of contentpublishingutils and into separate component directory -->
-<!-- <unit bldFile="contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/> -->
-</component>
-<component name="contentpublishingutils" filter="s60" long-name="Content Publishing Utils">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingutils/group"/>
-</component>
-<component name="contentpublishingserver" filter="s60" long-name="Content Publishing Server">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingserver/group"/>
-</component>
-<component name="contentharvester" filter="s60" long-name="Content Harvester">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
-</component>
-<component name="contentpublishingsrv_build" filter="s60" long-name="Content Publishing Service Build">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/group"/>
-</component>
-</collection>
-<collection name="contentcontrolsrv" long-name="Content Control Service" level="server">
-<component name="ccsrv" long-name="Content Control Service" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccsrv/group"/>
-</component>
-<component name="ccsrvapi" long-name="Content Control Service API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccsrvapi/group"/>
-</component>
-<component name="ccclientsession" long-name="Content Control Client Session" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccclientsession/group"/>
-</component>
-<component name="hsccclient" long-name="HS Content Control Client" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/hsccclient/group"/>
-</component>
-<component name="hscontentinfo" long-name="Home Screen Content Info" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/hscontentinfo/group"/>
-</component>
-<component name="contentcontrolsrv_build" long-name="Content Control Service Build" filter="s60" introduced="^3">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/group"/>
-</component>
-</collection>
-</block>
-<block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
-<collection name="appinstall_plat" long-name="Application Installation Platform Interfaces" level="api">
-<component name="iaupdate_api" long-name="IA Update API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/iaupdate_api/group"/>
-</component>
-<component name="task_plugin_api" long-name="Task Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_plugin_api/group"/>
-</component>
-<component name="sw_installer_common_ui_api" long-name="SW Installer Common UI API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_common_ui_api/group"/>
-</component>
-<component name="sw_installer_launcher_api" long-name="SW Installer Launcher API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_launcher_api/group"/>
-</component>
-<component name="task_management_api" long-name="Task Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_management_api/group"/>
-</component>
-<component name="sw_installer_ui_plugin_api" long-name="SW Installer UI Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ui_plugin_api/group"/>
-</component>
-<component name="sw_installer_cr_keys" long-name="SW Installer CR Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_cr_keys/group"/>
-</component>
-<component name="sw_installer_ps_keys" long-name="SW Installer PS Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
-</component>
-<component name="appmngr2runtimeapi" long-name="Application Manager 2 Runtime Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
-</component>
-</collection>
-<collection name="appinstall_pub" long-name="Application Installation Public Interfaces" level="api">
-<component name="startup_list_management_api" long-name="Startup List Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
-</component>
-</collection>
-<collection name="ncdengine" long-name="Nokia Content Discover" level="framework">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="ncdengine_engine" filter="s60" long-name="NCD Engine" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/engine/group"/>
-</component>
-<component name="debuglogger" filter="s60" long-name="NCD Debug Logger" introduced="^1" class="placeholder">
-<!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
-</component>
-<component name="ncdengine_build" filter="s60" long-name="NCD Build" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/group"/>
-</component>
-</collection>
-<collection name="appinstaller" long-name="Application Installer" level="generic">
-<component name="appmngr2" filter="s60" long-name="Application Manager 2" introduced="^2">
-<unit bldFile="mw/appinstall/appinstaller/appmngr2/group"/>
-</component>
-<component name="appinstui" filter="s60" long-name="Application Installer UI" introduced="^2">
-<unit bldFile="mw/appinstall/appinstaller/appinstui/group"/>
-</component>
-</collection>
-<collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="api">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="iaupdateapi_stub_build" long-name="IA Update API Stub Build" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdateapi_stub/group"/>
-</component>
-</collection>
-<collection name="iaupdate" long-name="Independent Apps Update" level="api">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="iad" long-name="Software Update" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/iad/group"/>
-</component>
-<component name="iaupdate_help" filter="s60" long-name="IA Update Help" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/help/group"/>
-</component>
-<component name="iaupdate_build" filter="s60" long-name="IA Update Build" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/group"/>
-</component>
-</collection>
-<collection name="installationservices" long-name="Installation Services" level="generic">
-<component name="swi" long-name="Secure Software Install" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swi/group" mrp="mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
-</component>
-<component name="swidevicetools" long-name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
-<unit bldFile="mw/appinstall/installationservices/swidevicetools/group" mrp="mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
-</component>
-<component name="swiconfig" long-name="Software Install Config" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appinstall/installationservices/swiconfig/group" mrp="mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
-</component>
-</collection>
-<collection name="secureswitools" long-name="Secure Software Install Tools" level="tool">
-<component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/makekeys/group" mrp="mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
-</component>
-<component name="swianalysistoolkit" long-name="SWI Analysis Toolkit" purpose="development" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
-</component>
-<component name="openssllib" long-name="OpenSSL Library" purpose="optional" class="PC">
-<unit mrp="mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
-</component>
-<component name="swisistools" long-name="Secure Software Install SIS Tools" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swisistools/group" mrp="mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
-</component>
-</collection>
-<collection name="appinstall_info" long-name="Application Installation Info" level="api">
-<component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="serviceapifw" level="specific" long-name="Service API Framework" levels="plugin framework server generic specific">
-<collection name="serviceapifw_pub" long-name="Service API Framework Public Interfaces" level="specific"/>
-<collection name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" level="specific">
-<component name="rtsecuritymanager_common_api" long-name="Runtime Security Manager Common API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/group"/>
-</component>
-<component name="rtsecuritymanager_utility_api" long-name="Runtime Security Manager Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
-</component>
-<component name="rtsecuritymanager_client_api" long-name="Runtime Security Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/group"/>
-</component>
-<component name="liw_provider_utility_api" long-name="LIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_provider_utility_api/group"/>
-</component>
-<component name="liw_service_interface_base_api" long-name="LIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_base_api/group"/>
-</component>
-<component name="liw_service_interface_menu_api" long-name="LIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_menu_api/group"/>
-</component>
-<component name="liw_criteria_api" long-name="LIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_criteria_api/group"/>
-</component>
-<component name="liw_generic_parameter_api" long-name="LIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_generic_parameter_api/group"/>
-</component>
-<component name="liw_service_handler_api" long-name="LIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_handler_api/group"/>
-</component>
-</collection>
-<collection name="rtsecuritymanager" long-name="Runtime Security Manager" level="server">
-<component name="rtsecuritymanagerutil" filter="s60" long-name="Runtime Security Manager Util">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
-</component>
-<component name="rtsecuritymanagerserver" filter="s60" long-name="Runtime Security Manager Server">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/>
-</component>
-<component name="rtsecuritymanagerclient" filter="s60" long-name="Runtime Security Manager Client">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/>
-</component>
-<component name="rtsecuritymanager_build" filter="s60" long-name="Runtime Security Manager Build">
-<!-- Move the export to the appropriate components, or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/group"/>
-</component>
-</collection>
-<collection name="languageinterworkingfw" long-name="Language Interworking Framework" level="framework">
-<component name="lifwservicehandler" filter="s60" long-name="Service Handler">
-<unit bldFile="mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-</block>
-<block name="serviceapi" level="specific" long-name="Service API" levels="os mw1 mw2 app">
-<!-- should break up this collection into something meaningful -->
-<collection name="serviceproviders" long-name="Service Providers" level="mw1">
-<component name="sapi_contacts_vpbk" long-name="Contacts Phonebook SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
-</component>
-<component name="sapi_location" long-name="Location SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_location/group"/>
-</component>
-<component name="sapi_mediamanagement" long-name="Media Management SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/group"/>
-</component>
-<component name="sapi_landmarks" long-name="Landmarks SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
-</component>
-<component name="sapi_messaging" long-name="Messaging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/group"/>
-</component>
-<component name="sapi_applicationmanager" long-name="Application Manager SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
-</component>
-<component name="sapi_calendar" long-name="Calendar SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_calendar/group"/>
-</component>
-<component name="sapi_logging" long-name="Logging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_logging/group"/>
-</component>
-<component name="sapi_sensor" long-name="Sensor SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sensor/group"/>
-</component>
-<component name="sapi_sysinfo" long-name="Sysinfo SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sysinfo/group"/>
-</component>
-<component name="sapi_serviceregistry" long-name="Service Registry SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
-</component>
-<component name="jsapi" long-name="Javascript API" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/jsapi/group"/>
-</component>
-<component name="serviceproviders_build" filter="s60" long-name="Service API Build">
-<!-- distribute the exports or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapi/serviceproviders/group"/>
-</component>
-</collection>
-</block>
-<block name="web" level="specific" long-name="Web" levels="plugin utils server generic specific">
-<collection name="web_pub" long-name="Web Public Interfaces" level="specific">
-<component name="browser_control_api" long-name="Browser Control API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_control_api/group"/>
-</component>
-<component name="download_mgr_client_api" long-name="Download Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_client_api/group"/>
-</component>
-<component name="download_mgr_ui_api" long-name="Download Manager UI Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_ui_api/group"/>
-</component>
-<component name="favourites_engine_api" long-name="Favourites Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/favourites_engine_api/group"/>
-</component>
-<component name="browser_plugin_api" long-name="Browser Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_plugin_api/group"/>
-</component>
-<component name="settings_api" long-name="Settings API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/settings_api/group"/>
-</component>
-</collection>
-<collection name="web_plat" long-name="Web Platform Interfaces" level="specific">
-<component name="aiw_browser_provider_api" long-name="AIW Browser Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/aiw_browser_provider_api/group"/>
-</component>
-<component name="browser_dialogs_provider_api" long-name="Browser Dialogs Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_dialogs_provider_api/group"/>
-</component>
-<component name="browser_platform_api" long-name="Browser Platform API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_platform_api/group"/>
-</component>
-<component name="cod_handler_api" long-name="COD Handler API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cod_handler_api/group"/>
-</component>
-<component name="connection_manager_api" long-name="Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/connection_manager_api/group"/>
-</component>
-<component name="cxml_library_api" long-name="cXml Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cxml_library_api/group"/>
-</component>
-<component name="download_mgr_client_api_extn" long-name="Download Manager Client API Extension" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/download_mgr_client_api_extn/group"/>
-</component>
-<component name="download_path_plugin_api" long-name="Download Path Plugin API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/web/web_plat/download_path_plugin_api/group"/>
-</component>
-<component name="feeds_engine_api" long-name="Feeds Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/feeds_engine_api/group"/>
-</component>
-<component name="launcher_api" long-name="Launcher API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/launcher_api/group"/>
-</component>
-<component name="multipart_parser_api" long-name="Multipart Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/multipart_parser_api/group"/>
-</component>
-<component name="recent_url_store_api" long-name="Recent URL Store API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/recent_url_store_api/group"/>
-</component>
-<component name="scheme_handler_plugin_api" long-name="Scheme Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scheme_handler_plugin_api/group"/>
-</component>
-<component name="scriptable_plugin_api" long-name="Scriptable Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scriptable_plugin_api/group"/>
-</component>
-<component name="webutils_api" long-name="Web Utils API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/webutils_api/group"/>
-</component>
-<component name="widget_registry_api" long-name="Widget Registry API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/widget_registry_api/group"/>
-</component>
-<component name="xml_parser_api" long-name="XML Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/xml_parser_api/group"/>
-</component>
-<component name="stmgesturefw_api" long-name="State Machine Gesture Framework API " filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/stmgesturefw_api/group"/>
-</component>
-</collection>
-<collection name="web_info" long-name="Web Info" level="specific">
-<component name="web_build" filter="s60" long-name="Web Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/group"/>
-</component>
-</collection>
-<collection name="browserutilities" long-name="Browser Utilities" level="utils">
-<component name="browserdialogsprovider" filter="s60" long-name="Browser Dialogs Provider">
-<unit bldFile="mw/web/browserutilities/browserdialogsprovider/group"/>
-</component>
-<component name="recenturlstore" filter="s60" long-name="Recent URL Store">
-<unit bldFile="mw/web/browserutilities/recenturlstore/group"/>
-</component>
-<component name="xmlparser" filter="s60" long-name="XML Interface">
-<unit bldFile="mw/web/browserutilities/xmlparser/group"/>
-</component>
-<component name="cxmllibrary" filter="s60" long-name="XML Parser Implementation">
-<unit bldFile="mw/web/browserutilities/cxmllibrary/group"/>
-</component>
-<component name="downloadmgr" filter="s60" long-name="Download Manager">
-<unit bldFile="mw/web/browserutilities/downloadmgr/group"/>
-</component>
-<component name="connectionmanager" filter="s60" long-name="Connection Manager">
-<unit bldFile="mw/web/browserutilities/connectionmanager/group"/>
-</component>
-<component name="browsertelservice" filter="s60" long-name="Browser Telephony Service">
-<unit bldFile="mw/web/browserutilities/browsertelservice/group"/>
-</component>
-<component name="favouritesengine" filter="s60" long-name="Favourites Engine">
-<unit bldFile="mw/web/browserutilities/favouritesengine/group"/>
-</component>
-<component name="feedsengine" filter="s60" long-name="Feeds Engine">
-<unit bldFile="mw/web/browserutilities/feedsengine/group"/>
-</component>
-<component name="multipartparser" filter="s60" long-name="Multipart Parser">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
-<!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
-</component>
-<component name="schemehandler" filter="s60" long-name="Scheme Handler">
-<unit bldFile="mw/web/browserutilities/schemehandler/group"/>
-</component>
-<component name="webutils" filter="s60" long-name="Web Utils">
-<unit bldFile="mw/web/browserutilities/webutils/group"/>
-</component>
-<component name="aiwbrowserprovider" filter="s60" long-name="AIW Browser Provider" plugin="Y">
-<unit bldFile="mw/web/browserutilities/aiwbrowserprovider/group"/>
-</component>
-<component name="browserutilities_build" filter="s60" long-name="Browser Utilities Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/browserutilities/group"/>
-</component>
-</collection>
-<collection name="webengine" long-name="Web Engine" level="server">
-<component name="osswebengine" filter="s60" long-name="OSS Web Engine">
-<!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
-<unit bldFile="mw/web/webengine/osswebengine/cache/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/memorymanager/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/npscript/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group/javascriptcore"/>
-</component>
-<component name="webkitutils" filter="s60" long-name="WebKit Utils">
-<unit bldFile="mw/web/webengine/webkitutils/group"/>
-</component>
-<component name="pagescaler" filter="s60" long-name="Page Scaler">
-<unit bldFile="mw/web/webengine/pagescaler/group"/>
-</component>
-<component name="webwidgetinstaller" filter="s60" long-name="Widget Installer">
-<unit bldFile="mw/web/webengine/widgetinstaller/group"/>
-</component>
-<component name="widgetregistry" filter="s60" long-name="Widget Registry">
-<unit bldFile="mw/web/webengine/widgetregistry/group"/>
-</component>
-<component name="wmlengine" filter="s60" long-name="WML Engine">
-<unit bldFile="mw/web/webengine/wmlengine/group"/>
-</component>
-<component name="device" filter="s60" long-name="Device">
-<!-- this needs a more meaningful name -->
-<unit bldFile="mw/web/webengine/device/group"/>
-</component>
-<component name="widgetengine" filter="s60" long-name="Widget Engine">
-<unit bldFile="mw/web/webengine/widgetengine/group"/>
-</component>
-<component name="web_memoryplugin" long-name="Memory Plugin" filter="s60" plugin="Y">
-<unit bldFile="mw/web/webengine/memoryplugin/group"/>
-</component>
-<component name="widgetmemoryplugin" filter="s60" long-name="Widget Memory Plugin" plugin="Y">
-<unit bldFile="mw/web/webengine/widgetmemoryplugin/group"/>
-</component>
-<component name="widgetbackuprestore" filter="s60" long-name="Widget Backup and Restore">
-<unit bldFile="mw/web/webengine/widgetbackuprestore/group"/>
-</component>
-<component name="browserrecognizers" filter="s60" long-name="Browser Recognizers" plugin="Y">
-<unit bldFile="mw/web/webengine/browserrecognizers/group"/>
-</component>
-<component name="wrtharvester" filter="s60" long-name="Web Runtime Harvester" plugin="Y">
-<unit bldFile="mw/web/webengine/wrtharvester/group"/>
-</component>
-</collection>
-<collection name="codhandler" long-name="Content Object Descriptor Handler" level="specific">
-<component name="codeng" filter="s60" long-name="COD Engine">
-<unit bldFile="mw/web/codhandler/codeng/group"/>
-</component>
-<component name="codui" filter="s60" long-name="COD UI">
-<unit bldFile="mw/web/codhandler/codui/group"/>
-</component>
-<component name="codrecog" filter="s60" long-name="COD Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/codrecog/group"/>
-</component>
-<component name="codviewer" filter="s60" long-name="COD Viewer">
-<unit bldFile="mw/web/codhandler/codviewer/group"/>
-</component>
-<component name="ddrecog" filter="s60" long-name="Download Descriptor Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/ddrecog/group"/>
-</component>
-<component name="ddviewer" filter="s60" long-name="Download Descriptor Viewer">
-<unit bldFile="mw/web/codhandler/ddviewer/group"/>
-</component>
-<component name="coddownload" filter="s60" long-name="COD Download">
-<unit bldFile="mw/web/codhandler/coddownload/group"/>
-</component>
-<component name="roapapp" filter="s60" long-name="ROAP Application">
-<unit bldFile="mw/web/codhandler/roapapp/group"/>
-</component>
-<component name="codhandler_build" filter="s60" long-name="COD Handler Build">
-<!-- Exports need to go into another component or make this self-contained.
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/codhandler/group"/>
-</component>
-</collection>
-<collection name="widgets" long-name="Web Widget Framework" level="generic">
-<!-- the following units can be uncommented when configuration is put in place -->
-<component name="widgetrecognizer" filter="s60" long-name="Widget Recognizer" plugin="Y">
-<!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
-</component>
-<component name="widgetinstaller" filter="s60" long-name="Widget Installer UI" plugin="Y">
-<!--<unit bldFile="widgets/widgetinstaller/group"/>-->
-</component>
-<component name="widgetlauncher" filter="s60" long-name="Widget Launcher">
-<!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
-</component>
-<component name="widgetapp" filter="s60" long-name="Widget UI">
-<!--<unit bldFile="widgets/widgetapp/group"/>-->
-</component>
-<component name="widgetsidchecker" filter="s60" long-name="Widget SID Checker" introduced="^3">
-<!--<unit bldFile="widgets/widgetsidchecker/group"/>-->
-</component>
-<component name="widgetpreinstaller" filter="s60" long-name="Widget Pre-Installer">
-<!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
-</component>
-<component name="widgetstartup" filter="s60" long-name="Widget Startup">
-<!--<unit bldFile="widgets/widgetstartup/group"/>-->
-</component>
-<component name="widgets_build" filter="s60" long-name="Widgets Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/widgets/group"/>
-</component>
-</collection>
-</block>
-<block name="websrv" level="generic" long-name="Web Services" levels="plugin framework server generic specific">
-<collection name="websrv_pub" long-name="Web Services Public Interfaces" level="specific">
-<component name="web_service_description_api" long-name="Web Service Description API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_description_api/group"/>
-</component>
-<component name="web_service_connection_api" long-name="Web Service Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/group"/>
-</component>
-<component name="web_service_manager_api" long-name="Web Service Manager API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/group"/>
-</component>
-<component name="hostlet_connection_api" long-name="Hostlet Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/group"/>
-</component>
-<component name="web_service_messaging_api" long-name="Web Service Messaging API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/group"/>
-</component>
-<component name="xml_extensions_api" long-name="XML Extensions API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/group"/>
-</component>
-<component name="xml_fragment_api" long-name="XML Fragment API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/group"/>
-</component>
-</collection>
-<collection name="webservices" long-name="Web Services Framework" level="generic">
-<!-- consider breaking this collection into more meaningful subsets -->
-<component name="wsnotifierplugins" filter="s60" long-name="WS Notifier Plugins" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsnotifierplugins/group"/>
-</component>
-<component name="wslogger" filter="s60" long-name="WS Logger">
-<unit bldFile="mw/websrv/webservices/wslogger/group"/>
-</component>
-<component name="wsxml" filter="s60" long-name="WS XML Extensions">
-<unit bldFile="mw/websrv/webservices/wsxml/group"/>
-</component>
-<component name="wsutils" filter="s60" long-name="WS Utils">
-<unit bldFile="mw/websrv/webservices/wsutils/group"/>
-</component>
-<component name="wsfragment" filter="s60" long-name="WS Fragment">
-<unit bldFile="mw/websrv/webservices/wsfragment/group"/>
-</component>
-<component name="wsdescription" filter="s60" long-name="WS Service Description">
-<unit bldFile="mw/websrv/webservices/wsdescription/group"/>
-</component>
-<component name="wsconnection" filter="s60" long-name="WS Service Connection">
-<unit bldFile="mw/websrv/webservices/wsconnection/group"/>
-</component>
-<component name="wsmessages" filter="s60" long-name="WS Messages">
-<unit bldFile="mw/websrv/webservices/wsmessages/group"/>
-</component>
-<component name="wscredentialmanager" filter="s60" long-name="WS Credential Manager">
-<unit bldFile="mw/websrv/webservices/wscredentialmanager/group"/>
-</component>
-<component name="wsframework" filter="s60" long-name="WS Framework">
-<unit bldFile="mw/websrv/webservices/wsframework/group"/>
-</component>
-<component name="wshttpchanneltransportplugin" filter="s60" long-name="WS HTTP Channel Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshttpchanneltransportplugin/group"/>
-</component>
-<component name="wsconnectionagent" filter="s60" long-name="WS Connection Agent">
-<unit bldFile="mw/websrv/webservices/wsconnectionagent/group"/>
-</component>
-<component name="wsprovider" filter="s60" long-name="WS Provider">
-<unit bldFile="mw/websrv/webservices/wsprovider/group"/>
-</component>
-<component name="wshostletconnection" filter="s60" long-name="WS Hostlet Connection">
-<unit bldFile="mw/websrv/webservices/wshostletconnection/group"/>
-</component>
-<component name="wsmanager" filter="s60" long-name="WS Service Manager">
-<unit bldFile="mw/websrv/webservices/wsmanager/group"/>
-</component>
-<component name="wsidentitymanager" filter="s60" long-name="WS Identity Manager">
-<unit bldFile="mw/websrv/webservices/wsidentitymanager/group"/>
-</component>
-<component name="idwsfplugin" filter="s60" long-name="ID-WSF Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/idwsfplugin/group"/>
-</component>
-<component name="wsibasicplugin" filter="s60" long-name="WS-I Basic Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsibasicplugin/group"/>
-</component>
-<component name="wsrestplugin" filter="s60" long-name="WS REST Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsrestplugin/group"/>
-</component>
-<component name="idwsfsecuritymechanism" filter="s60" long-name="ID-WSF Security Mechanism">
-<unit bldFile="mw/websrv/webservices/idwsfsecuritymechanism/group"/>
-</component>
-<component name="wspasswordtransforms" filter="s60" long-name="WS Password Transforms">
-<unit bldFile="mw/websrv/webservices/wspasswordtransforms/group"/>
-</component>
-<component name="wscore" filter="s60" long-name="WS Core Service Manager">
-<unit bldFile="mw/websrv/webservices/wscore/group"/>
-</component>
-<component name="wslocaltransportplugin" filter="s60" long-name="WS Local Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wslocaltransportplugin/group"/>
-</component>
-<component name="wshostlettransportplugin" filter="s60" long-name="WS Hostlet Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshostlettransportplugin/group"/>
-</component>
-<component name="wsstar" filter="s60" long-name="WS Star">
-<!-- can only have one unit. Need to split into separate components or #include from a single bld.inf -->
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarpolicy/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarplugin/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarmessagehandlers/group"/>
-</component>
-<component name="wsoviplugin" filter="s60" long-name="WS Ovi Plugin">
-<unit bldFile="mw/websrv/webservices/wsoviplugin/group"/>
-</component>
-<component name="webservices_build" filter="s60" long-name="Web Services Build">
-<!-- need to split into self-contained components -->
-<unit bldFile="mw/websrv/webservices/group"/>
-</component>
-</collection>
-<collection name="websrv_info" long-name="Web Services Info" level="specific">
-<component name="websrv_bld" filter="s60" long-name="Web Services Build">
-<!-- need to include common .hrh in each unit -->
-<unit bldFile="mw/websrv/group"/>
-</component>
-</collection>
-</block>
-<block name="platformtools" level="generic" long-name="Platform Tools">
-<collection name="gfxconversion" long-name="Graphics Conversion">
-<component name="bmconv_s60" filter="s60" long-name="S60 Bitmap Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/bmconv_s60/group"/>
-</component>
-<component name="mifconv" filter="s60" long-name="Multi Icon File Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/mifconv/group"/>
-</component>
-</collection>
-</block>
-<block name="uitools" level="specific" long-name="UI Tools" levels="compile encode tool if">
-<collection name="uitools_pub" long-name="UI Tools Public Interfaces" level="if">
-<component name="third_party_bitmap_palette_api" long-name="Third Party Bitmap Palette API" filter="s60" class="api">
-<unit bldFile="mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
-</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">
-<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">
-<unit bldFile="mw/uitools/uitools_plat/layout_system_private_api/group"/>
-</component>
-</collection>
-<collection name="cdlcompilertoolkit" long-name="CDL Compiler Toolkit" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompilertoolkit_build" filter="s60" long-name="CDL Compiler Toolkit Build">
-<unit bldFile="mw/uitools/cdlcompilertoolkit/group"/>
-</component>
-</collection>
-<collection name="cdlcompiler" long-name="CDL Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompiler_build" filter="s60" long-name="CDL Compiler Build">
-<unit bldFile="mw/uitools/cdlcompiler/group"/>
-</component>
-</collection>
-<collection name="gfxtools" long-name="Graphics Tools" level="tool">
-<component name="gditools" filter="s60" long-name="GDI Tools" class="PC">
-<unit bldFile="mw/uitools/gfxtools/gditools/group"/>
-</component>
-<component name="color" filter="s60" long-name="Bitmap Colour Palette" class="PC">
-<unit bldFile="mw/uitools/gfxtools/color/group"/>
-</component>
-</collection>
-<collection name="aknlayoutcompiler" long-name="Avkon Layout Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="aknlayoutcompiler_build" filter="s60" long-name="Avkon Layout Compiler Build">
-<unit bldFile="mw/uitools/aknlayoutcompiler/group"/>
-</component>
-</collection>
-<collection name="skincompiler" long-name="Skin Compiler" level="compile">
-<component name="aknskindesccompiler" filter="s60" long-name="Avkon Skin Descriptor Compiler">
-<unit bldFile="mw/uitools/skincompiler/AknSkinDescCompiler/group"/>
-</component>
-</collection>
-<collection name="reszip" long-name="Resource Zip" level="encode">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="reszip_build" filter="s60" long-name="Resource Zip Build">
-<unit bldFile="mw/uitools/reszip/group"/>
-</component>
-</collection>
-<collection name="toollibraries" long-name="Tool Libraries" level="tool"/>
-<collection name="svgtencoder" long-name="SVGT Encoder" level="encode">
-<component name="svgtenc" filter="s60" long-name="Standalone SVGT Encoder" class="PC">
-<unit bldFile="mw/uitools/svgtencoder/svgtenc/standalone/group"/>
-</component>
-</collection>
-</block>
-</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">
-<component name="location_centre_api" long-name="Location Centre API" introduced="^3" filter="s60" class="api">
-<unit bldFile="app/location/loc_plat/location_centre_api/group"/>
-</component>
-</collection>
-<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"/>
-</component>
-<component name="landmarks_ui_addedit_api" long-name="Landmarks UI Add/Edit API" filter="s60" class="api">
-<unit bldFile="app/location/loc_pub/landmarks_ui_addedit_api/group"/>
-</component>
-</collection>
-<collection name="basiclocationinfodisplay" long-name="Basic Location Info Display" level="ui">
-<component name="blid" filter="s60" long-name="Basic Location Info Display Build">
-<unit bldFile="app/location/basiclocationinfodisplay/blid/group"/>
-</component>
-</collection>
-<collection name="landmarksui" long-name="Landmarks UI" level="loc">
-<component name="landmarksui_help" filter="s60" long-name="Landmarks UI Help">
-<unit bldFile="app/location/landmarksui/help/group"/>
-</component>
-<component name="landmarksui_engine" filter="s60" long-name="Landmarks UI Engine">
-<unit bldFile="app/location/landmarksui/engine/group"/>
-</component>
-<component name="uicontrols" filter="s60" long-name="Landmarks UI Controls">
-<unit bldFile="app/location/landmarksui/uicontrols/group"/>
-</component>
-<component name="landmarksui_commonui" filter="s60" long-name="Landmarks Common UI">
-<unit bldFile="app/location/landmarksui/commonui/group"/>
-</component>
-<component name="landmarksui_app" filter="s60" long-name="Landmarks Application">
-<unit bldFile="app/location/landmarksui/app/group"/>
-</component>
-<component name="msgviewer" filter="s60" long-name="Landmarks Message Viewer">
-<unit bldFile="app/location/landmarksui/msgviewer/group"/>
-</component>
-<component name="landmarksui_build" filter="s60" long-name="Landmarks UI Build">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="app/location/landmarksui/group"/>
-</component>
-</collection>
-<collection name="eventsui" long-name="Location Events UI" level="events">
-<component name="eventsui_help" filter="s60" long-name="Events Help">
-<unit bldFile="app/location/eventsui/help/group"/>
-</component>
-<component name="eventsutils" filter="s60" long-name="Events Utils">
-<unit bldFile="app/location/eventsui/eventsutils/group"/>
-</component>
-<component name="eventsengine" filter="s60" long-name="Events Engine">
-<unit bldFile="app/location/eventsui/eventsengine/group"/>
-</component>
-<component name="eventshandlerui" filter="s60" long-name="Events Handler UI">
-<unit bldFile="app/location/eventsui/eventshandlerui/group"/>
-</component>
-<component name="eventseditor" filter="s60" long-name="Events Editor">
-<unit bldFile="app/location/eventsui/eventseditor/group"/>
-</component>
-<component name="eventsmgmtui" filter="s60" long-name="Events Management UI">
-<unit bldFile="app/location/eventsui/eventsmgmtui/group"/>
-</component>
-<component name="eventsui_build" filter="s60" long-name="Events UI Build">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="app/location/eventsui/group"/>
-</component>
-</collection>
-<collection name="locationlandmarksrefappfors60" long-name="Location Landmarks Reference App for S60" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="lmrefapp" filter="s60" long-name="Landmarks Reference Application">
-<unit bldFile="app/location/locationlandmarksrefappfors60/group"/>
-</component>
-</collection>
-<collection name="locationlandmarksuirefapp" long-name="Location Landmarks UI Reference App" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="lmuirefapp" filter="s60" long-name="Landmarks UI Reference Application">
-<unit bldFile="app/location/locationlandmarksuirefapp/group"/>
-</component>
-</collection>
-<collection name="locationsatviewrefapp" long-name="Location Satellite View Reference App" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="satellitereference" filter="s60" long-name="Satellite Info UI Reference Application">
-<unit bldFile="app/location/locationsatviewrefapp/group"/>
-</component>
-</collection>
-<collection name="simpsyconfigurator" long-name="Simulation PSY Configurator" level="ui">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="simpsyui" filter="s60" long-name="Simulation PSY UI">
-<unit bldFile="app/location/simpsyconfigurator/group"/>
-</component>
-</collection>
-<collection name="mapnavproviderrefapp" long-name="Map and Navigation Provider Reference App" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="mapnavproviderrefapp_build" filter="s60" long-name="Map and Navigation Provider Reference Application">
-<unit bldFile="app/location/mapnavproviderrefapp/group"/>
-</component>
-</collection>
-<collection name="locationcentre" long-name="Location Centre" level="loc">
-<component name="lcutils" long-name="Location Centre Utilities" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcutils/group"/>
-</component>
-<component name="lcservice" long-name="Location Centre Service Project" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcservice/group"/>
-</component>
-<component name="lcserver" long-name="Location Centre Server Project" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcserver/group"/>
-</component>
-<component name="lcapp" long-name="Location Centre Application" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcapp/group"/>
-</component>
-<component name="locationcentre_build" filter="s60" long-name="Location Centre Build" introduced="^3">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="app/location/locationcentre/group"/>
-</component>
-</collection>
-</block>
-<block name="mmsharinguis" level="services" long-name="Multimedia Sharing UIs" levels="base plugin if">
-<collection name="mmsharinguis_plat" long-name="Multimedia Sharing UIs Platform Interfaces" level="if">
-<component name="multimedia_sharing_settings_api" long-name="Multimedia Sharing Settings API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_settings_api/group"/>
-</component>
-<component name="multimedia_sharing_resource_api" long-name="Multimedia Sharing Resource API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_resource_api/group"/>
-</component>
-<component name="multimedia_sharing_manager_api" long-name="Multimedia Sharing Manager API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/group"/>
-</component>
-</collection>
-<collection name="mmsharing" long-name="Multimedia Sharing" level="base">
-<component name="mmshavailability" filter="s60" long-name="Multimedia Sharing Availability">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshavailability/group"/>
-</component>
-<component name="mmshindicator" filter="s60" long-name="Multimedia Sharing Indicator">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshindicator/group"/>
-</component>
-<!-- consider putting client and server in the same component -->
-<component name="mmshmanagercli" filter="s60" long-name="Multimedia Sharing Manager Client">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshmanagercli/group" filter="!test"/>
-</component>
-<component name="mmshmanagersrv" filter="s60" long-name="Multimedia Sharing Manager Server">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshmanagersrv/group"/>
-</component>
-<component name="mmshengine" filter="s60" long-name="Multimedia Sharing Engine">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshengine/group"/>
-</component>
-<component name="mmshui" filter="s60" long-name="Multimedia Sharing UI">
-<!-- can only have one unit: need to #include one from the other if it's needed -->
-<unit bldFile="app/mmsharinguis/mmsharing/mmshui/group"/>
-<unit bldFile="app/mmsharinguis/mmsharing/mmshui/help/group"/>
-</component>
-<component name="mmsharing_build" filter="s60" long-name="MM Sharing Build">
-<unit bldFile="app/mmsharinguis/mmsharing/group"/>
-</component>
-</collection>
-<collection name="mmshplugins" long-name="Multimedia Sharing Plugins" level="plugin">
-<component name="mmshaoplugin" filter="s60" long-name="Multimedia Sharing Always Online Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshaoplugin/group"/>
-</component>
-<component name="mmshaiwplugin" filter="s60" long-name="Multimedia Sharing AIW Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshaiwplugin/group"/>
-</component>
-<component name="mmshsipcrplugin" filter="s60" long-name="Multimedia Sharing SIP Client Resolver Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshsipcrplugin/group"/>
-</component>
-<component name="mmshsettingsuiplugin" filter="s60" long-name="Multimedia Sharing Settings UI Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshsettingsuiplugin/group"/>
-</component>
-<component name="mmshwpadapterplugin" filter="s60" long-name="Multimedia Sharing WAP Provisioning Adapter" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshwpadapterplugin/group"/>
-</component>
-</collection>
-<collection name="mmsharinguis_info" long-name="Multimedia Sharing UIs Info" level="if">
-<component name="mmsharinguis_build" filter="s60" long-name="Multimedia Sharing UIs Build">
-<!-- consider distributing to other components -->
-<unit bldFile="app/mmsharinguis/group"/>
-</component>
-</collection>
-</block>
-<block name="phone" level="apps" span="2" long-name="Phone Apps" levels="engine plugin ui app">
-<collection name="phone_plat" long-name="Phone Apps Platform Interfaces" level="app">
-<component name="3d_ringing_tone_enabler_api" long-name="3D Ringing Tone Enabler API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
-</component>
-<component name="telephony_comms_information_api" long-name="Telephony Comms Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_comms_information_api/group"/>
-</component>
-<component name="telephony_information_api" long-name="Telephony Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_information_api/group"/>
-</component>
-<component name="telephony_device_mode_api" long-name="Telephony Device Mode API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_device_mode_api/group"/>
-</component>
-<component name="telephony_remote_party_information_api" long-name="Telephony Remote Party Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_remote_party_information_api/group"/>
-</component>
-<component name="telephony_video_mailbox_settings_api" long-name="Telephony Video Mailbox Settings API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_video_mailbox_settings_api/group"/>
-</component>
-<component name="telephony_configuration_api" long-name="Telephony Configuration API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_configuration_api/group"/>
-</component>
-<component name="telephony_microphone_mute_status_api" long-name="Telephony Microphone Mute Status API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_microphone_mute_status_api/group"/>
-</component>
-<component name="dialer_keypad_api" long-name="Dialer Keypad API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/dialer_keypad_api/group"/>
-</component>
-<component name="telephony_logging_extension_api" long-name="Telephony Logging Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_logging_extension_api/group"/>
-</component>
-<component name="telephony_matching_extension_api" long-name="Telephony Matching Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_matching_extension_api/group"/>
-</component>
-<component name="telephony_bubble_extension_api" long-name="Telephony Bubble Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_bubble_extension_api/group"/>
-</component>
-<component name="telephony_menu_extension_api" long-name="Telephony Menu Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_menu_extension_api/group"/>
-</component>
-<component name="phone_application_commands_api" long-name="Phone Application Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_commands_api/group"/>
-</component>
-<component name="phone_application_voip_commands_api" long-name="Phone Application VOIP Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_voip_commands_api/group"/>
-</component>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_mediator_api/group"/>
-</component>
-<component name="video_telephony_mediator_api" long-name="Video Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/video_telephony_mediator_api/group"/>
-</component>
-</collection>
-<collection name="phoneapp" long-name="Phone Application" level="app">
-<component name="blacklist" filter="s60" long-name="Phone Blacklist Clearing" plugin="Y">
-<unit bldFile="app/phone/phoneapp/blacklist/group"/>
-</component>
-<component name="phoneui" filter="s60" long-name="Phone UI">
-<unit bldFile="app/phone/phoneapp/phoneui/group" filter="!test"/>
-</component>
-<component name="phoneuicontrol" filter="s60" long-name="Phone UI Control">
-<unit bldFile="app/phone/phoneapp/phoneuicontrol/group"/>
-</component>
-<component name="phoneuistates" filter="s60" long-name="Phone UI States">
-<unit bldFile="app/phone/phoneapp/phoneuistates/group"/>
-</component>
-<component name="phoneuiutils" filter="s60" long-name="Phone UI Utils">
-<unit bldFile="app/phone/phoneapp/phoneuiutils/group"/>
-</component>
-<component name="phoneuiview" filter="s60" long-name="Phone UI View">
-<unit bldFile="app/phone/phoneapp/phoneuiview/group"/>
-</component>
-<component name="phoneuivoipextension" filter="s60" long-name="Phone UI VOIP Extension">
-<unit bldFile="app/phone/phoneapp/phoneuivoipextension/group"/>
-</component>
-<component name="silenceactionplugin" filter="s60" long-name="Silence Action Plugin" plugin="Y">
-<unit bldFile="app/phone/phoneapp/silenceactionplugin/group"/>
-</component>
-<component name="phonemediatorcenter" filter="s60" long-name="Phone Mediator Center">
-<unit bldFile="app/phone/phoneapp/phonemediatorcenter/group"/>
-</component>
-</collection>
-<collection name="phoneengine" long-name="Phone Engine" level="engine">
-<component name="phonecntfinder" filter="s60" long-name="Phone Contact Finder">
-<unit bldFile="app/phone/phoneengine/phonecntfinder/group"/>
-</component>
-<component name="audiohandling" filter="s60" long-name="Phone Audio Handling">
-<unit bldFile="app/phone/phoneengine/audiohandling/group"/>
-</component>
-<component name="callhandling" filter="s60" long-name="Call Handling">
-<unit bldFile="app/phone/phoneengine/callhandling/group"/>
-</component>
-<component name="contacthandling" filter="s60" long-name="Phone Contact Handling">
-<unit bldFile="app/phone/phoneengine/contacthandling/group"/>
-</component>
-<component name="loghandling" filter="s60" long-name="Phone Log Handling">
-<unit bldFile="app/phone/phoneengine/loghandling/group"/>
-</component>
-<component name="engineinfo" filter="s60" long-name="Phone Engine Info">
-<unit bldFile="app/phone/phoneengine/engineinfo/group"/>
-</component>
-<component name="phonemodel" filter="s60" long-name="Phone Model">
-<unit bldFile="app/phone/phoneengine/phonemodel/group"/>
-</component>
-<component name="servicehandling" filter="s60" long-name="Phone Service Handling">
-<unit bldFile="app/phone/phoneengine/servicehandling/group"/>
-</component>
-</collection>
-<collection name="phonesettings" long-name="Phone Settings" level="plugin">
-<component name="aiwcallimageplugin" filter="s60" long-name="Call Image AIW Plugin" plugin="Y">
-<unit bldFile="app/phone/phonesettings/aiwcallimageplugin/group"/>
-</component>
-<component name="pslncallimageplugin" filter="s60" long-name="Call Image Personalization Plugin" plugin="Y">
-<unit bldFile="app/phone/phonesettings/pslncallimageplugin/group"/>
-</component>
-</collection>
-<collection name="phoneuis" long-name="Phone UIs" level="ui">
-<component name="dialer" filter="s60" long-name="Dialer">
-<unit bldFile="app/phone/phoneuis/dialer/group" filter="!test"/>
-</component>
-<component name="easydialing" filter="s60" long-name="Easy Dialing Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/phone/phoneuis/easydialing/group"/>
-</component>
-<component name="bubblemanager" filter="s60" long-name="Phone Bubble Manager">
-<unit bldFile="app/phone/phoneuis/bubblemanager/group"/>
-</component>
-<component name="connectutil" filter="s60" long-name="Connection Utility" plugin="Y">
-<unit bldFile="app/phone/phoneuis/connectutil/group"/>
-</component>
-<component name="ussd" filter="s60" long-name="Unstructured Supplementary Services Data">
-<unit bldFile="app/phone/phoneuis/ussd/group"/>
-</component>
-<component name="vmbx" filter="s60" long-name="Voice Mailbox">
-<unit bldFile="app/phone/phoneuis/vmbx/group"/>
-</component>
-<component name="telephonydevicemode" filter="s60" long-name="Telephony Device Mode">
-<unit bldFile="app/phone/phoneuis/telephonydevicemode/group"/>
-</component>
-</collection>
-<collection name="phoneplugins" long-name="Phone Plugins" level="plugin">
-<component name="telbranding" filter="s60" long-name="Tel Branding" introduced="^2" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/telbranding/group"/>
-</component>
-</collection>
-</block>
-<block name="videotelephony" level="apps" long-name="Video Telephony Apps" levels="engine plugin prot ui">
-<collection name="videotelephony_plat" long-name="VT Apps Platform Interfaces" level="ui">
-<component name="video_telephony_control_mediator_api" long-name="Video Telephony Control Mediator API" filter="s60" class="api">
-<unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_control_mediator_api/group"/>
-</component>
-<component name="video_telephony_media_configuration_api" long-name="Video Telephony Media Configuration API" filter="s60" class="api">
-<unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_media_configuration_api/group"/>
-</component>
-</collection>
-<collection name="vtengines" long-name="Video Telephony Engines" level="engine">
-<component name="videoteleng" filter="s60" long-name="Video Telephony Engine">
-<unit bldFile="app/videotelephony/vtengines/videoteleng/Group"/>
-</component>
-<component name="vtmediatorplugin" filter="s60" long-name="VT Mediator Plugin" plugin="Y">
-<unit bldFile="app/videotelephony/vtengines/vtmediatorplugin/group"/>
-</component>
-</collection>
-<collection name="vtuis" long-name="Video Telephony UIs" level="ui">
-<component name="videotelui" filter="s60" long-name="Video Telephony UI">
-<unit bldFile="app/videotelephony/vtuis/videotelui/group"/>
-</component>
-</collection>
-<collection name="vtprotocolplugins" long-name="VT Protocol Plugins" level="plugin">
-<component name="displaysink" filter="s60" long-name="Display Sink" introduced="^2">
-<unit bldFile="app/videotelephony/vtprotocolplugins/DisplaySink/group"/>
-</component>
-<component name="videosource" filter="s60" long-name="Video Source" introduced="^2">
-<unit bldFile="app/videotelephony/vtprotocolplugins/VideoSource/group"/>
-</component>
-</collection>
-<collection name="vtprotocolsstub" long-name="VT Protocols Stub" level="prot">
-<!-- this collection is really a component, move down a directory -->
-<component name="videotelproto" filter="s60" long-name="Video Telephony Protocol">
-<unit bldFile="app/videotelephony/vtprotocolsstub/group" filter="sf_build"/>
-</component>
-</collection>
-</block>
-<block name="iptelephony" level="apps" long-name="IP Telephony" levels="eng plugin util ui">
-<collection name="iptel_plat" long-name="IP Telephony Platform Interfaces" level="ui">
-<component name="richcallsettingsengine_api" long-name="Rich Call Settings Engine API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/richcallsettingsengine_api/group"/>
-</component>
-<component name="cch_client_api" long-name="CCH Client API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/cch_client_api/group"/>
-</component>
-<component name="cch_server_api" long-name="CCH Server API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/cch_server_api/group"/>
-</component>
-<component name="csc_settingsui_api" long-name="CSC Settings UI API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/csc_settingsui_api/group"/>
-</component>
-<component name="vccpropertyhandler_api" long-name="VCC Property Handler API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/vccpropertyhandler_api/group"/>
-</component>
-<component name="vcc_api" long-name="VCC API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/vcc_api/group"/>
-</component>
-</collection>
-<collection name="iptelcommsconfig" long-name="IP Telephony Comms Config" level="ui">
-<component name="cscgsplugin" filter="s60" long-name="CSC GS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/commsconfig/cscgsplugin/group"/>
-</component>
-<component name="cscsipvoipcleanupplugin" filter="s60" long-name="CSC SIP VoIP Cleanup Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/commsconfig/cscsipvoipcleanupplugin/group"/>
-</component>
-<component name="cscengine" filter="s60" long-name="Connection Service Configurator Engine" introduced="^2">
-<unit bldFile="app/iptelephony/commsconfig/cscengine/group"/>
-</component>
-<component name="cscsettingsui" filter="s60" long-name="CSC Settings UI" introduced="^2">
-<unit bldFile="app/iptelephony/commsconfig/cscsettingsui/group"/>
-</component>
-<component name="cscapplicationui" filter="s60" long-name="CSC Application UI" introduced="^2">
-<unit bldFile="app/iptelephony/commsconfig/cscapplicationui/group"/>
-</component>
-<component name="commsconfig_build" filter="s60" long-name="Comms Config Build" introduced="^2">
-<!-- consider distributing this into the above components -->
-<unit bldFile="app/iptelephony/commsconfig/group"/>
-</component>
-</collection>
-<collection name="convergedconnectionhandler" long-name="Converged Connection Handler" level="eng">
-<component name="cchserver" filter="s60" long-name="CCH Server" introduced="^2">
-<unit bldFile="app/iptelephony/convergedconnectionhandler/cchserver/group"/>
-</component>
-<component name="cchclient" filter="s60" long-name="CCH Client" introduced="^2">
-<unit bldFile="app/iptelephony/convergedconnectionhandler/cchclient/group"/>
-</component>
-<component name="cchclientapi" filter="s60" long-name="CCH Client API" introduced="^2">
-<unit bldFile="app/iptelephony/convergedconnectionhandler/cchclientapi/group"/>
-</component>
-<component name="convergedconnectionhandler_build" filter="s60" long-name="CCH Build" introduced="^2">
-<!-- consider distributing this into the above components, or collapse the collection into a single component.
- The latter is a better option since clients and sevrers are rarely separate components -->
-<unit bldFile="app/iptelephony/convergedconnectionhandler/group"/>
-</component>
-</collection>
-<collection name="richcallsettingsengine" long-name="Rich Call Settings Engine" level="eng">
-<component name="rcse2" filter="s60" long-name="Rich Call Settings Engine Build" introduced="^2">
-<unit bldFile="app/iptelephony/richcallsettingsengine/rcse2/group"/>
-</component>
-</collection>
-<collection name="sipvoipprovider" long-name="SIP VoIP Provider" level="plugin">
-<!-- collection is really a component. Should move down a directory -->
-<component name="svp" filter="s60" long-name="SIP VoIP Provider Build" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/sipvoipprovider/group"/>
-</component>
-</collection>
-<collection name="voipplugins" long-name="VoIP Plugins" level="plugin">
-<component name="sipmxresolver" filter="s60" long-name="SIP MX Resolver" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/sipmxresolver/group"/>
-</component>
-<component name="sipconnectionprovider" filter="s60" long-name="SIP Connection Provider" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/sipconnectionprovider/group"/>
-<!-- can only have one unit, can the next be #'included from the above? -->
-<unit bldFile="app/iptelephony/voipplugins/sipconnectionprovider/ipvoicemailengine/group"/>
-</component>
-<component name="ipapputils" filter="s60" long-name="IP App Utils" introduced="^2">
-<unit bldFile="app/iptelephony/voipplugins/ipapputils/group"/>
-</component>
-<component name="voipadapters" filter="s60" long-name="VoIP Adapters" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/voipadapters/group"/>
-</component>
-<component name="accountcreationplugin" filter="s60" long-name="Account Creation Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/accountcreationplugin/group"/>
-</component>
-<component name="dhcppositionprovider" filter="s60" long-name="DHCP Position Provider" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/dhcppositionprovider/group"/>
-</component>
-<component name="svtmatching" filter="s60" long-name="SIP VoIP Telephony Matching" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/svtmatching/group"/>
-</component>
-<component name="svtlogging" filter="s60" long-name="SVT Logging" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/svtlogging/group"/>
-</component>
-<component name="svtcallmenu" filter="s60" long-name="SVT Call Menu" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/svtcallmenu/group"/>
-</component>
-<component name="sipimresolver" filter="s60" long-name="SIP IM Resolver" introduced="^3" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/sipimresolver/group"/>
-</component>
-</collection>
-<collection name="callcontinuity" long-name="Call Continuity" level="util">
-<component name="vccutils" filter="s60" long-name="VCC Utils" introduced="^2">
-<unit bldFile="app/iptelephony/callcontinuity/vccutils/group"/>
-</component>
-<component name="nsmldmvccadapter" filter="s60" long-name="SyncML DM VCC Adapter" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/callcontinuity/nsmldmvccadapter/group"/>
-</component>
-<component name="vccclientprovisioningadapter" filter="s60" long-name="VCC Client Provisioning Adapter" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/callcontinuity/vccclientprovisioningadapter/group"/>
-</component>
-<component name="vccpropertyhandler" filter="s60" long-name="VCC Property Handler" introduced="^2">
-<unit bldFile="app/iptelephony/callcontinuity/vccpropertyhandler/group"/>
-</component>
-<component name="vcchotrigger" filter="s60" long-name="VCC HO Trigger" introduced="^2">
-<unit bldFile="app/iptelephony/callcontinuity/vcchotrigger/group"/>
-</component>
-<component name="vcc" filter="s60" long-name="VoIP Call Continuity" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/callcontinuity/vcc/group"/>
-</component>
-<component name="callcontinuity_build" filter="s60" long-name="Call Continuity Build" introduced="^2">
-<!-- consider distributing this into the above components -->
-<unit bldFile="app/iptelephony/callcontinuity/group"/>
-</component>
-</collection>
-</block>
-<block name="settingsuis" level="services" long-name="Settings UIs" levels="rsc ui">
-<collection name="devmngt_plat" long-name="Settings UIs Platform Interfaces" level="ui">
-<component name="default_app_client_api" long-name="Default App Client API" introduced="^1" filter="s60" class="api">
-<unit bldFile="app/settingsuis/devmngt_plat/default_app_client_api/group"/>
-</component>
-<component name="services_db_api" long-name="Services DB API" introduced="^1" filter="s60" class="api">
-<unit bldFile="app/settingsuis/devmngt_plat/services_db_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="defaultapplicationsettings" long-name="Default Application Settings" level="rsc">
-<component name="services_db" filter="s60" long-name="Services Database" introduced="^1">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/services_db/group"/>
-</component>
-<component name="defaultapplicationsettings_server" filter="s60" long-name="Default Application Server" introduced="^1">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/server/group"/>
-</component>
-<component name="service" filter="s60" long-name="Default Application Service" introduced="^1">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/service/group"/>
-</component>
-<component name="dasgsplugin" filter="s60" long-name="Default Application Settings GS Plugin" introduced="^1" plugin="Y">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/gsplugin/group"/>
-</component>
-<component name="defaultapplicationsettings_build" filter="s60" long-name="Default Application Settings Build" introduced="^1">
-<!-- split the IBYs up into the appropriate components? Make this a ROM component? -->
-<unit bldFile="app/settingsuis/defaultapplicationsettings/group"/>
-</component>
-</collection>
-<collection name="systemswuis" long-name="System SW UIs" level="ui">
-<component name="touchscreencalib" filter="s60" long-name="Touchscreen Calibration" introduced="^1">
-<unit bldFile="app/settingsuis/systemswuis/touchscreencalib/group"/>
-</component>
-</collection>
-</block>
-<block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin app">
-<collection name="contentctrl_plat" long-name="Content Control Daemons Platforn Interfaces" level="app">
-<component name="oma_ds_presync_plugin_api" long-name="OMA DS PreSync Plugin API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/oma_ds_presync_plugin_api/group"/>
-</component>
-<component name="ds_agenda_handler_plugin_api" long-name="DS Agenda Handler Plugin API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_agenda_handler_plugin_api/group"/>
-</component>
-<component name="ds_folder_util_api" long-name="DS Folder Util API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_folder_util_api/group"/>
-</component>
-</collection>
-<collection name="dsdcmoadapter" long-name="Data Sync DCMO Adapter" level="plugin">
-<!-- Component at wrong rank, should move down a directory -->
-<component name="dsdcmoadapter_build" filter="s60" long-name="Data Sync Control DCMO Adapter">
-<unit bldFile="app/contentcontrol/dsdcmoadapter/group"/>
-</component>
-</collection>
-<collection name="omads" long-name="OMA Data Sync" level="app">
-<component name="omadsappui" filter="s60" long-name="OMA DS Application UI">
-<unit bldFile="app/contentcontrol/omads/omadsappui/group"/>
-</component>
-<component name="omadsextensions" filter="s60" long-name="OMA DS Extensions" plugin="Y">
-<unit bldFile="app/contentcontrol/omads/omadsextensions/group"/>
-</component>
-</collection>
-</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">
-<unit bldFile="app/devicecontrol/devicediagnostics/devdiagapp/group"/>
-</component>
-<component name="devdiaggsplugin" filter="s60" long-name="Device Diagnostics GS Plugin" plugin="Y">
-<unit bldFile="app/devicecontrol/devicediagnostics/devdiaggsplugin/group"/>
-</component>
-<component name="diagplugins" filter="s60" long-name="Diagnostics Plugins" plugin="Y">
-<unit bldFile="app/devicecontrol/devicediagnostics/diagplugins/group"/>
-</component>
-<component name="diagsuites" filter="s60" long-name="Diagnostics Suites" plugin="Y">
-<unit bldFile="app/devicecontrol/devicediagnostics/diagsuites/group"/>
-</component>
-<component name="devicediagnostics_build" filter="s60" long-name="Device Diagnostics Build">
-<!-- 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">
-<unit bldFile="app/devicecontrol/omadm/omadmappui/group"/>
-</component>
-<component name="omadmextensions" filter="s60" long-name="OMA DM Extensions" 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">
-<unit bldFile="app/devicecontrol/omadm/dcmo/group"/>
-</component>
-</collection>
-<collection name="pnpmobileservices" long-name="PnP Mobile Services" level="mid">
-<component name="pnpms" filter="s60" long-name="PnP MS">
-<unit bldFile="app/devicecontrol/pnpmobileservices/pnpms/group"/>
-</component>
-</collection>
-<collection name="applicationmanagement" long-name="Application Management" level="app">
-<!-- could this collection be collapsed into a single component and moved down a dir? Do all these need to be noted separately? -->
-<component name="applicationmanagement_options" filter="s60" long-name="AM Install Options">
-<unit bldFile="app/devicecontrol/applicationmanagement/options/group"/>
-</component>
-<component name="applicationmanagement_client" filter="s60" long-name="AM Client">
-<unit bldFile="app/devicecontrol/applicationmanagement/client/group"/>
-</component>
-<component name="applicationmanagement_server" filter="s60" long-name="AM Server">
-<unit bldFile="app/devicecontrol/applicationmanagement/server/group"/>
-</component>
-<component name="rfsplugin" filter="s60" long-name="AM RFS Plugin" plugin="Y">
-<unit bldFile="app/devicecontrol/applicationmanagement/rfsplugin/group"/>
-</component>
-<component name="amadapter2" filter="s60" long-name="AM Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/applicationmanagement/amadapter2/group"/>
-</component>
-<component name="omascomoadapter" filter="s60" long-name="OMA SCOMO Adapter" introduced="^3" plugin="Y">
-<unit bldFile="app/devicecontrol/applicationmanagement/omascomoadapter/group"/>
-</component>
-<component name="applicationmanagement_build" filter="s60" long-name="AM Build">
-<!-- If thes aren't collapsed into one cmp, can all #includes removed from here, and it renamed AM ROM? -->
-<unit bldFile="app/devicecontrol/applicationmanagement/group"/>
-</component>
-</collection>
-<collection name="customization" long-name="DM Customization Adapters" level="mid">
-<component name="dmutils" long-name="DM Utils" filter="s60">
-<unit bldFile="app/devicecontrol/customization/dmutils/bld"/>
-</component>
-<component name="uisettingssrv" filter="s60" long-name="UI Settings Server">
-<unit bldFile="app/devicecontrol/customization/uisettingssrv/bld"/>
-</component>
-<component name="isadapter" filter="s60" long-name="Idle State Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/isadapter/bld"/>
-</component>
-<component name="supadapter" filter="s60" long-name="Startup Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/supadapter/bld"/>
-</component>
-<component name="wallpaperadapter" filter="s60" long-name="Wallpaper Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/wallpaperadapter/bld"/>
-</component>
-<component name="operatorlogoadapter" filter="s60" long-name="Operator Logo Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/operatorlogoadapter/bld"/>
-</component>
-<component name="screensaveradapter" filter="s60" long-name="Screen Saver Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/screensaveradapter/bld"/>
-</component>
-<component name="themesadapter" filter="s60" long-name="Themes Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/themesadapter/bld"/>
-</component>
-<component name="embeddedlinkadapter" filter="s60" long-name="Embedded Link Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/embeddedlinkadapter/bld"/>
-</component>
-<component name="customization_build" filter="s60" long-name="DM Customization Build">
-<!-- If thes aren't collapsed into one cmp, can all #includes removed from here, and it renamed DM Customization ROM? -->
-<unit bldFile="app/devicecontrol/customization/group"/>
-</component>
-</collection>
-<collection name="omacp" long-name="OMA Content Provisioning" level="oma">
-<component name="omacpadapters" filter="s60" long-name="OMA CP Adapters" plugin="Y">
-<unit bldFile="app/devicecontrol/omacp/omacpadapters/group"/>
-</component>
-</collection>
-</block>
-<block name="printing" level="services" long-name="Printing" levels="app">
-<collection name="DirectPrint" level="app">
-<component name="DirectPrintApp" filter="sf_build" long-name="DirectPrint App" introduced="^3">
-<unit bldFile="app/printing/DirectPrint/DirectPrintApp/group"/>
-</component>
-<component name="DirectPrintServer" filter="sf_build" long-name="DirectPrint Server" introduced="^3">
-<unit bldFile="app/printing/DirectPrint/DirectPrintServer/group"/>
-</component>
-<component name="DirectPrintClient" filter="sf_build" long-name="DirectPrint Client" introduced="^3">
-<unit bldFile="app/printing/DirectPrint/DirectPrintClient/group"/>
-</component>
-</collection>
-<collection name="imageprint" long-name="ImagePrint" level="app">
-<component name="clog" filter="s60" long-name="ImagePrint Logging" introduced="^2">
-<unit bldFile="app/printing/imageprint/clog/group"/>
-</component>
-<component name="imageprintengine" filter="s60" long-name="ImagePrint Engine" introduced="^2">
-<unit bldFile="app/printing/imageprint/imageprintengine/group"/>
-</component>
-<component name="imageprintui" filter="s60" long-name="ImagePrint UI" introduced="^2">
-<unit bldFile="app/printing/imageprint/imageprintui/group"/>
-</component>
-<component name="imageprint_build" filter="s60" long-name="ImagePrint Build" introduced="^2">
-<!-- Need to break the IBY includes into the other components, or remove #includes and make this a ROM component -->
-<unit bldFile="app/printing/imageprint/group"/>
-</component>
-</collection>
-</block>
-<block name="files" level="apps" long-name="File Manager Apps" levels="support apps">
-<collection name="files_plat" long-name="File Manager Apps Platform Interfaces" level="apps">
-<component name="memory_scan_popup_ui_api" long-name="Memory Scan Popup UI API" filter="s60" class="api">
-<unit bldFile="app/files/files_plat/memory_scan_popup_ui_api/group"/>
-</component>
-</collection>
-<collection name="deviceencryption" long-name="Device Encryption" level="support">
-<!-- this is either needs to be broken up into idependent bld.infs, or it's really a component and should move down a directory -->
-<component name="devencnotifplugin" filter="s60" long-name="Device Encryption Notifier Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/files/deviceencryption/devencnotifplugin/group"/>
-</component>
-<component name="devencui" filter="s60" long-name="Device Encryption UI" introduced="^3">
-<unit bldFile="app/files/deviceencryption/devencui/group"/>
-</component>
-<component name="devencdmadapter" filter="s60" long-name="Device Encryption DM Adapter" introduced="^3" plugin="Y">
-<unit bldFile="app/files/deviceencryption/devencdmadapter/group"/>
-</component>
-<component name="devencgsplugin" filter="s60" long-name="Device Encryption GS Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/files/deviceencryption/devencgsplugin/group"/>
-</component>
-<component name="deviceencryption_help" filter="s60" long-name="Device Encryption Help" introduced="^3">
-<unit bldFile="app/files/deviceencryption/help/group"/>
-</component>
-<component name="deviceencryption_build" filter="s60" long-name="Device Encryption Build" introduced="^3">
-<unit bldFile="app/files/deviceencryption/group"/>
-</component>
-</collection>
-<collection name="filemanager" long-name="File Manager" level="apps">
-<!-- this is really a component, should move down a directory -->
-<component name="filemanager_build" filter="s60" long-name="File Manager Build">
-<unit bldFile="app/files/filemanager/group"/>
-</component>
-</collection>
-<collection name="filesystemuis" long-name="File System UIs" level="support">
-<component name="memscaneng" filter="s60" long-name="Memory Scan Server">
-<unit bldFile="app/files/filesystemuis/memscaneng/group"/>
-</component>
-<component name="memstatepopup" filter="s60" long-name="Memory State Popup">
-<unit bldFile="app/files/filesystemuis/memstatepopup/group"/>
-</component>
-</collection>
-</block>
-<block name="utils" level="apps" long-name="Utility Apps" levels="app">
-<collection name="extras" long-name="Extras" level="app">
-<component name="about" filter="s60" long-name="About Application">
-<unit bldFile="app/utils/extras/about/group"/>
-</component>
-<component name="calcsoft" filter="s60" long-name="Calculator Application">
-<unit bldFile="app/utils/extras/calcsoft/group"/>
-</component>
-<component name="converter" filter="s60" long-name="Unit Converter">
-<unit bldFile="app/utils/extras/converter/group"/>
-</component>
-</collection>
-</block>
-<block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
-<collection name="contacts_pub" long-name="Contacts Apps Public Interfaces" level="ui">
-<component name="phonebook_fetch_ui_api" long-name="Phonebook Fetch UI API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_fetch_ui_api/group"/>
-</component>
-<component name="phonebook_data_management_api" long-name="Phonebook Data Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_data_management_api/group"/>
-</component>
-<component name="phonebook_vcard_importexport_api" long-name="Phonebook vCard Import/Export API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_vcard_importexport_api/group"/>
-</component>
-<component name="phonebook_data_addedit_ui_api" long-name="Phonebook Data Add/Edit UI API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_data_addedit_ui_api/group"/>
-</component>
-<component name="phonebook_ui_utilities_api" long-name="Phonebook UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_ui_utilities_api/group"/>
-</component>
-<component name="phonebook_thumbnail_operation_api" long-name="Phonebook Thumbnail Operation API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_thumbnail_operation_api/group"/>
-</component>
-<component name="speed_dial_utility_control_api" long-name="Speed Dial Utility Control API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/speed_dial_utility_control_api/group"/>
-</component>
-</collection>
-<collection name="contacts_plat" long-name="Contacts Apps Platform Interfaces" level="ui">
-<component name="virtual_phonebook_store_api" long-name="Virtual Phonebook Store API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_store_api/group"/>
-</component>
-<component name="virtual_phonebook_sim_services_api" long-name="Virtual Phonebook SIM Services API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_sim_services_api/group"/>
-</component>
-<component name="virtual_phonebook_configuration_api" long-name="Virtual Phonebook Configuration API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_configuration_api/group"/>
-</component>
-<component name="virtual_phonebook_copy_policy_api" long-name="Virtual Phonebook Copy Policy API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_copy_policy_api/group"/>
-</component>
-<component name="virtual_phonebook_policy_api" long-name="Virtual Phonebook Policy API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_policy_api/group"/>
-</component>
-<component name="virtual_phonebook_engine_api" long-name="Virtual Phonebook Engine API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_engine_api/group"/>
-</component>
-<component name="virtual_phonebook_migration_support_api" long-name="Virtual Phonebook Migration Support API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_migration_support_api/group"/>
-</component>
-<component name="virtual_phonebook_view_definition_api" long-name="Virtual Phonebook View Definition API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_view_definition_api/group"/>
-</component>
-<component name="virtual_phonebook_vcard_api" long-name="Virtual Phonebook vCard API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_vcard_api/group"/>
-</component>
-<component name="cms_contactor_api" long-name="CMS Contactor API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/cms_contactor_api/group"/>
-</component>
-<component name="contactpresence_api" long-name="Contact Presence API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/contactpresence_api/group"/>
-</component>
-<component name="presence_cache_api" long-name="Presence Cache API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/presence_cache_api/group"/>
-</component>
-<component name="phonebook_internal_common_api" long-name="Phonebook Internal Common API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_common_api/group"/>
-</component>
-<component name="phonebook_internal_appfw_api" long-name="Phonebook Internal App Framework API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_appfw_api/group"/>
-</component>
-<component name="phonebook_internal_data_management_api" long-name="Phonebook Internal Data Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_data_management_api/group"/>
-</component>
-<component name="phonebook_2_xsp_extension_manager_api" long-name="Phonebook 2 xSP Extension Manager API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_xsp_extension_manager_api/group"/>
-</component>
-<component name="phonebook_ui_controls_api" long-name="Phonebook UI Controls API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_ui_controls_api/group"/>
-</component>
-<component name="phonebook_2_image_management_api" long-name="Phonebook 2 Image Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_image_management_api/group"/>
-</component>
-<component name="phonebook_extension_api" long-name="Phonebook Extension API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_extension_api/group"/>
-</component>
-<component name="phonebook_public_constants_api" long-name="Phonebook Public Constants API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_public_constants_api/group"/>
-</component>
-<component name="phonebook_internal_ui_utilities_api" long-name="Phonebook Internal UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_ui_utilities_api/group"/>
-</component>
-<component name="logs_engine_api_extensions" long-name="Logs Engine API Extensions" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/logs_engine_api_extensions/group"/>
-</component>
-<component name="phonebook_thumbnails_api" long-name="Phonebook Thumbnails API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_thumbnails_api/group"/>
-</component>
-<component name="phonebook_2_icon_api" long-name="Phonebook 2 Icon API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_icon_api/group"/>
-</component>
-<component name="phonebook_engine_extension_api" long-name="Phonebook Engine Extension API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_engine_extension_api/group"/>
-</component>
-<component name="phonebook_2_store_configuration_management_api" long-name="Phonebook 2 Store Configuration Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_store_configuration_management_api/group"/>
-</component>
-<component name="logs_ui_command_line_api" long-name="Logs UI Command Line API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/logs_ui_command_line_api/group"/>
-</component>
-<component name="speed_dial_dialogs_api" long-name="Speed Dial Dialogs API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/speed_dial_dialogs_api/group"/>
-</component>
-<component name="phonebook_2_xsp_view_activation_api" long-name="Phonebook 2 xSP View Activation API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_xsp_view_activation_api/group"/>
-</component>
-<component name="logs_timers_api" long-name="Logs Timers API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/logs_timers_api/group"/>
-</component>
-<component name="phonebook_2_ui_extension_definition_api" long-name="Phonebook 2 UI Extension Definition API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_definition_api/group"/>
-</component>
-<component name="phonebook_2_common_ui_api" long-name="Phonebook 2 Common UI API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_common_ui_api/group"/>
-</component>
-<component name="phonebook_2_ui_extension_api" long-name="Phonebook 2 UI Extension API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_api/group"/>
-</component>
-<component name="phonebook_2_store_property_api" long-name="Phonebook 2 Store Property API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_store_property_api/group"/>
-</component>
-<component name="phonebook_2_ui_extension_plugin_api" long-name="Phonebook 2 UI Extension Plug-In API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_plugin_api/group"/>
-</component>
-<component name="phonebook_2_ui_controls_api" long-name="Phonebook 2 UI Controls API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_controls_api/group"/>
-</component>
-<component name="phonebook_2_thin_ui_extension_plugin_api" long-name="Phonebook 2 Thin UI Extension Plugin API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_thin_ui_extension_plugin_api/group"/>
-</component>
-<component name="phonebook_2_commands_api" long-name="Phonebook 2 Commands API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_commands_api/group"/>
-</component>
-<component name="phonebook_2_presentation_api" long-name="Phonebook 2 Presentation API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_presentation_api/group"/>
-</component>
-<component name="phonebook_2_ui_utilities_api" long-name="Phonebook 2 UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_utilities_api/group"/>
-</component>
-<component name="cca_launch_api" long-name="CCA Launch API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/cca_launch_api/group"/>
-</component>
-<component name="cca_view_plugin_api" long-name="CCA View Plugin API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/cca_view_plugin_api/group"/>
-</component>
-<component name="predictivesearch_client_api" long-name="Predictive Search Client API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_client_api/group"/>
-</component>
-<component name="predictivesearch_utils_api" long-name="Predictive Search Utils API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_utils_api/group"/>
-</component>
-<component name="predictivesearch_adapters_api" long-name="Predictive Search Adapters API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_adapters_api/group"/>
-</component>
-<component name="predictivesearch_algorithm_api" long-name="Predictive Search Algorithm API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_algorithm_api/group"/>
-</component>
-<component name="phonebook_2_rcl_api" long-name="Phonebook 2 RCL API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_rcl_api/group"/>
-</component>
-</collection>
-<collection name="contactextensions" long-name="Contacts Extensions" level="services">
-<component name="predefinedcontacts" filter="s60" long-name="Predefined Contacts">
-<unit bldFile="app/contacts/contactextensions/predefinedcontacts/group"/>
-</component>
-</collection>
-<collection name="logsui" long-name="Logs UI" level="ui">
-<component name="logsui_build" filter="s60" long-name="Logs UI Build">
-<!-- component at too high a rank, should move down one directory -->
-<unit bldFile="app/contacts/logsui/group"/>
-</component>
-</collection>
-<collection name="phonebookui" long-name="Phonebook UI" level="ui">
-<component name="phonebook" filter="s60" long-name="Phonebook">
-<unit bldFile="app/contacts/phonebookui/phonebook/group"/>
-</component>
-<component name="speeddial" filter="s60" long-name="Speed Dial">
-<unit bldFile="app/contacts/phonebookui/speeddial/group"/>
-</component>
-<component name="phonebook2" filter="s60" long-name="Phone Book 2">
-<unit bldFile="app/contacts/phonebookui/phonebook2/group"/>
-</component>
-</collection>
-<collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
-<component name="cntfindplugin" filter="s60" long-name="Contacts Find Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntfindplugin/group"/>
-</component>
-<component name="cntsortplugin" filter="s60" long-name="Contacts Sort Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntsortplugin/group"/>
-</component>
-<component name="virtualphonebook" filter="s60" long-name="Virtual Phonebook" introduced="^2">
-<unit bldFile="app/contacts/phonebookengines/virtualphonebook/group"/>
-</component>
-<component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
-<unit bldFile="app/contacts/phonebookengines/contactsmodel/groupsql" mrp="app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
-</component>
-</collection>
-<collection name="pimprotocols" long-name="PIM Protocols" level="services">
-<component name="phonebooksync" long-name="Phonebook Sync" purpose="optional" plugin="Y">
-<unit bldFile="app/contacts/pimprotocols/phonebooksync/group" mrp="app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
-</component>
-<component name="pbap" long-name="Bluetooth PBAP" introduced="9.2" purpose="optional">
-<unit bldFile="app/contacts/pimprotocols/pbap/group" mrp="app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
-</component>
-</collection>
-<collection name="ccservices" long-name="Contacts Centric Services" level="services">
-<component name="cmsservices" filter="s60" long-name="Contact Method Selector Services" introduced="^2">
-<unit bldFile="app/contacts/ccservices/cmsservices/group"/>
-</component>
-</collection>
-<collection name="presencecache" long-name="Presence Cache" level="support">
-<component name="presencecacheutils" filter="s60" long-name="Presence Cache Utils" introduced="^2" class="placeholder">
-<!-- <unit bldFile="presencecache/presencecacheutils/group"/> -->
-</component>
-<component name="presencecacheserver2" filter="s60" long-name="Presence Cache Server" introduced="^2" class="placeholder">
-<!-- <unit bldFile="presencecache/presencecacheserver2/group"/> -->
-</component>
-<component name="presencecacheclient2" filter="s60" long-name="Presence Cache Client" introduced="^2" class="placeholder">
-<!-- <unit bldFile="presencecache/presencecacheclient2/group"/> -->
-</component>
-<component name="presencecache_build" filter="s60" long-name="Presence Cache Build" introduced="^2">
-<!-- should divide this bld.inf into the other components, or collapse them into a single component -->
-<unit bldFile="app/contacts/presencecache/group"/>
-</component>
-</collection>
-<collection name="predictivesearch" long-name="Predictive Search" level="support">
-<component name="pcsutils" filter="s60" long-name="PCS Utils" introduced="^2">
-<unit bldFile="app/contacts/predictivesearch/pcsutils/group"/>
-</component>
-<component name="pcsserverclientapi" filter="s60" long-name="PCS Server Client API" introduced="^2">
-<unit bldFile="app/contacts/predictivesearch/pcsserverclientapi/group"/>
-</component>
-<component name="pcsserver" filter="s60" long-name="PCS Server" introduced="^2">
-<unit bldFile="app/contacts/predictivesearch/pcsserver/group"/>
-</component>
-<component name="pcsadapters" filter="s60" long-name="PCS Adapters" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/predictivesearch/adapters/contacts/group"/>
-</component>
-<component name="pcsalgorithm" filter="s60" long-name="PCS Algorithm" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/predictivesearch/pcsalgorithm/group"/>
-</component>
-<component name="predictivesearch_build" filter="s60" long-name="Predictive Search Build" introduced="^2">
-<!-- need to remove #includes from bld.inf and rename as Predictive Search ROM -->
-<unit bldFile="app/contacts/predictivesearch/group"/>
-</component>
-</collection>
-<collection name="contacts_info" long-name="Contacts Apps Info" level="ui">
-<component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="organizer" level="apps" span="2" long-name="Organizer Application Suite" levels="support services engine ui app">
-<collection name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" level="app">
-<component name="meeting_request_mailbox_utilities_api" long-name="Meeting Request Mailbox Utilities API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_mailbox_utilities_api/group"/>
-</component>
-<component name="meeting_request_uids_api" long-name="Meeting Request UIDs API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_uids_api/group"/>
-</component>
-<component name="calendar_exporter_api" long-name="Calendar Exporter API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_exporter_api/group"/>
-</component>
-<component name="agenda_versit_2_api" long-name="Agenda Versit 2 API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/agenda_versit_2_api/group"/>
-</component>
-<component name="calendar_importer_api" long-name="Calendar Importer API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_importer_api/group"/>
-</component>
-<component name="calendar_launcher_api" long-name="Calendar Launcher API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_launcher_api/group"/>
-</component>
-<component name="calendar_common_utils_api" long-name="Calendar Common Utils API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_common_utils_api/group"/>
-</component>
-<component name="searchfw_launcher_api" long-name="Search Framework Launcher API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/searchfw_launcher_api/group"/>
-</component>
-<component name="alarm_const_api" long-name="Alarm Const API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/alarm_const_api/group"/>
-</component>
-<component name="alarm_ui_external_control_api" long-name="Alarm UI External Control API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/alarm_ui_external_control_api/group"/>
-</component>
-<component name="calendar_settings_keys_api" long-name="Calendar Settings Keys API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_settings_keys_api/group"/>
-</component>
-<component name="calendar_tones_settings_keys_api" long-name="Calendar Tones Settings Keys API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_tones_settings_keys_api/group"/>
-</component>
-<component name="clock_settings_api" long-name="Clock Settings API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/clock_settings_api/group"/>
-</component>
-<component name="common_alarm_editor_api" long-name="Common Alarm Editor API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/common_alarm_editor_api/group"/>
-</component>
-<component name="alarm_ui_secondary_display_api" long-name="Alarm UI Secondary Display API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/alarm_ui_secondary_display_api/group"/>
-</component>
-<component name="searchui_launcher_api" long-name="Search UI Launcher API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/searchui_launcher_api/group"/>
-</component>
-<component name="agenda_entry_ui_api" long-name="Agenda Entry UI API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/agenda_entry_ui_api/group"/>
-</component>
-<component name="meeting_request_utillities_api" long-name="Meeting Request Utillities API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_utillities_api/group"/>
-</component>
-<component name="meeting_request_viewer_api" long-name="Meeting Request Viewer API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_viewer_api/group"/>
-</component>
-<component name="calendar_custamization_api" long-name="Calendar Customization API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_custamization_api/group"/>
-</component>
-</collection>
-<collection name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" level="app">
-<component name="calendar_interim_utils2_api" long-name="Calendar Interim Utils 2 API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_pub/calendar_interim_utils2_api/group"/>
-</component>
-<component name="notepad_library_api" long-name="Notepad Library API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_pub/notepad_library_api/group"/>
-</component>
-</collection>
-<collection name="alarmengines" long-name="Alarm Engines" level="engine">
-<component name="missedalarmstore" filter="s60" long-name="Missed Alarm Store">
-<unit bldFile="app/organizer/alarmengines/missedalarmstore/group"/>
-</component>
-</collection>
-<collection name="calendarengines" long-name="Calendar Engines" level="engine">
-<component name="versit2" filter="s60" long-name="Versit 2 iCal Parser" introduced="9.2">
-<unit bldFile="app/organizer/calendarengines/versit2/group"/>
-</component>
-<component name="agnversit2" filter="s60" long-name="Versit 2 Agenda Interface" introduced="9.2" plugin="Y">
-<unit bldFile="app/organizer/calendarengines/agnversit2/group"/>
-</component>
-<component name="caleninterimutils" filter="s60" long-name="Calendar Interim Utils" introduced="9.1">
-<unit bldFile="app/organizer/calendarengines/caleninterimutils/group"/>
-</component>
-<component name="calenimp" filter="s60" long-name="Calendar Import Wrapper" introduced="7.0s">
-<unit bldFile="app/organizer/calendarengines/calenimp/group"/>
-</component>
-<component name="calenlauncher" filter="s60" long-name="Calendar Launcher">
-<unit bldFile="app/organizer/calendarengines/calenlauncher/group"/>
-</component>
-<component name="caldavsrv" filter="sf_build" long-name="CalDAV Server" introduced="^3">
-<unit bldFile="app/organizer/calendarengines/caldav/group"/>
-</component>
-</collection>
-<collection name="meetingrequestengines" long-name="Meeting Request Engines" level="engine">
-<component name="mrmailbox" filter="s60" long-name="Meeting Request Mailbox">
-<unit bldFile="app/organizer/meetingrequestengines/mrmailbox/group"/>
-</component>
-<component name="mrmailboxutils" filter="s60" long-name="Meeting Request Mailbox Utils" plugin="Y">
-<unit bldFile="app/organizer/meetingrequestengines/mrmailboxutils/group"/>
-</component>
-</collection>
-<collection name="searchfw" long-name="Search Framework" level="services">
-<!-- Uncomment all units when configuration is in place. All currently #included from searchfw_build, which should be removed at the same time. -->
-<component name="coresearchfw" filter="s60" long-name="Core Search Framework" introduced="^1" class="placeholder">
-<!--<unit bldFile="searchfw/coresearchfw/group"/>-->
-</component>
-<component name="searchfw_plugins" filter="s60" long-name="Search Plugins" introduced="^1" plugin="Y" class="placeholder">
-<!--<unit bldFile="searchfw/plugins/group"/>-->
-</component>
-<component name="searchfw_build" filter="s60" long-name="Search Framework Build" introduced="^1">
-<unit bldFile="app/organizer/searchfw/group"/>
-</component>
-</collection>
-<collection name="alarmui" long-name="Alarm UI" level="app">
-<!-- collection is really a component, should move down a directory -->
-<component name="alarmui_build" filter="s60" long-name="Alarm UI Build">
-<unit bldFile="app/organizer/alarmui/group"/>
-</component>
-</collection>
-<collection name="calendarui" long-name="Calendar UI" level="ui">
-<component name="calendarui_help" filter="s60" long-name="Calendar UI Help">
-<unit bldFile="app/organizer/calendarui/help/group"/>
-</component>
-<component name="commonutils" filter="s60" long-name="Calendar Common Utils">
-<unit bldFile="app/organizer/calendarui/commonutils/group"/>
-</component>
-<component name="globaldata" filter="s60" long-name="Calendar Global Data">
-<unit bldFile="app/organizer/calendarui/globaldata/group"/>
-</component>
-<component name="settings" filter="s60" long-name="Calendar Settings">
-<!-- these should be merged into a single bld.inf or split into two components -->
-<unit bldFile="app/organizer/calendarui/settings/gsplugin/group"/>
-<unit bldFile="app/organizer/calendarui/settings/settingsui/group"/>
-</component>
-<component name="customisation" filter="s60" long-name="Calendar Customisation">
-<unit bldFile="app/organizer/calendarui/customisation/group"/>
-</component>
-<component name="customisationmanager" filter="s60" long-name="Calendar Customisation Manager">
-<unit bldFile="app/organizer/calendarui/customisationmanager/group"/>
-</component>
-<component name="multicaluidialog" filter="s60" long-name="Multi-Calendar UI Dialog" introduced="^3">
-<unit bldFile="app/organizer/calendarui/multicaluidialog/group"/>
-</component>
-<component name="views" filter="s60" long-name="Calendar Views">
-<unit bldFile="app/organizer/calendarui/views/group"/>
-</component>
-<component name="calendarui_controller" filter="s60" long-name="Calendar Controller">
-<unit bldFile="app/organizer/calendarui/controller/group"/>
-</component>
-<component name="calendarui_editors" filter="s60" long-name="Calendar Editors">
-<unit bldFile="app/organizer/calendarui/editors/group"/>
-</component>
-<component name="calendarui_application" filter="s60" long-name="Calendar Application">
-<unit bldFile="app/organizer/calendarui/application/group"/>
-</component>
-<component name="missedalarmindicatorplugin" filter="s60" long-name="Missed Alarm Indicator Plugin" plugin="Y">
-<unit bldFile="app/organizer/calendarui/missedalarmindicatorplugin/group"/>
-</component>
-<component name="calendarui_server" filter="s60" long-name="Calendar Server">
-<!-- these should be merged into a single bld.inf or split into two components -->
-<unit bldFile="app/organizer/calendarui/server/calensvr/group"/>
-<unit bldFile="app/organizer/calendarui/server/calensvrclient/group"/>
-</component>
-<component name="regionalplugins" filter="s60" long-name="Calendar Regional Plugins" plugin="Y">
-<!-- these should be merged into a single bld.inf or split into four components -->
-<unit bldFile="app/organizer/calendarui/regionalplugins/calenregionalutil/group"/>
-<unit bldFile="app/organizer/calendarui/regionalplugins/lunarchinese/group"/>
-<unit bldFile="app/organizer/calendarui/regionalplugins/lunarvietnamese/group"/>
-<unit bldFile="app/organizer/calendarui/regionalplugins/thai/group"/>
-</component>
-<component name="calenaiwprovider" filter="s60" long-name="Calendar AIW Proivder" introduced="^3" plugin="Y">
-<unit bldFile="app/organizer/calendarui/calenaiwprovider/group"/>
-</component>
-<component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y">
-<unit bldFile="app/organizer/calendarui/caldav/group"/>
-</component>
-<component name="calendarui_build" filter="s60" long-name="Calendar UI Build">
-<!-- split contents into separate components -->
-<unit bldFile="app/organizer/calendarui/group"/>
-</component>
-</collection>
-<collection name="meetingui" long-name="Meeting UI" level="ui">
-<component name="attendeeview" filter="s60" long-name="Attendee View">
-<unit bldFile="app/organizer/meetingui/attendeeview/group"/>
-</component>
-<component name="agnentryui" filter="s60" long-name="Agenda Entry UI" plugin="Y">
-<unit bldFile="app/organizer/meetingui/agnentryui/group"/>
-</component>
-<component name="meetingrequestutils" filter="s60" long-name="Meeting Request Utils">
-<unit bldFile="app/organizer/meetingui/meetingrequestutils/group"/>
-</component>
-<component name="meetingrequestviewers" filter="s60" long-name="Meeting Request Viewers" plugin="Y">
-<unit bldFile="app/organizer/meetingui/meetingrequestviewers/group"/>
-</component>
-<component name="meetingui_build" filter="s60" long-name="Meeting UI Build">
-<!-- split contents into separate components -->
-<unit bldFile="app/organizer/meetingui/group"/>
-</component>
-</collection>
-<collection name="clock2" long-name="Clock" level="app">
-<component name="clockengines" filter="s60" long-name="Clock Engines">
-<unit bldFile="app/organizer/clock2/clockengines/group"/>
-</component>
-<component name="clockui" filter="s60" long-name="Clock UI">
-<unit bldFile="app/organizer/clock2/clockui/group"/>
-</component>
-<component name="clock2_help" filter="s60" long-name="Clock Help">
-<unit bldFile="app/organizer/clock2/help/group"/>
-</component>
-<component name="clock2_build" filter="s60" long-name="Clock Build">
-<!-- split contents into separate components, or just make this one component -->
-<unit bldFile="app/organizer/clock2/group"/>
-</component>
-</collection>
-<collection name="notepad" long-name="Notepad" level="ui">
-<component name="notepad_help" filter="s60" long-name="Notepad Help">
-<unit bldFile="app/organizer/notepad/help/group"/>
-</component>
-<component name="notepad1" filter="s60" long-name="Notepad Application 1">
-<unit bldFile="app/organizer/notepad/notepad1/group"/>
-</component>
-<component name="txtrecog" filter="s60" long-name="Text Recognizer" plugin="Y">
-<unit bldFile="app/organizer/notepad/txtrecog/group"/>
-</component>
-</collection>
-<collection name="searchui" long-name="Search UI" level="app">
-<!-- consider making this a single component -->
-<!-- Uncomment all units when configuration is in place. All currently #included from searchui_build, which should be removed at the same time. -->
-<component name="searchui_help" filter="s60" long-name="Search UI Help" class="placeholder">
-<!--<unit bldFile="searchui/help/group"/>-->
-</component>
-<component name="searchapp" filter="s60" long-name="Search Application" class="placeholder">
-<!--<unit bldFile="searchui/searchapp/group"/>-->
-</component>
-<component name="searchui_build" filter="s60" long-name="Search UI Build">
-<unit bldFile="app/organizer/searchui/group"/>
-</component>
-</collection>
-<collection name="pimappservices" long-name="PIM Application Services" level="services">
-<component name="calendar" long-name="Calendar" introduced="9.2" purpose="optional">
-<unit bldFile="app/organizer/pimappservices/calendar/group" mrp="app/organizer/pimappservices/calendar/group/app-engines_calendar.mrp" version="2"/>
-</component>
-<component name="calendarvcalplugin" long-name="Calendar vCal Plugin" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="app/organizer/pimappservices/calendarvcalplugin/group" mrp="app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp" version="2"/>
-</component>
-<component name="appenginesdocs" long-name="Application Engines Documentation" purpose="development" class="doc">
-<unit mrp="app/organizer/pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
-</component>
-</collection>
-<collection name="pimappsupport" long-name="PIM Application Support" level="support">
-<component name="vcardandvcal" long-name="vCard and vCal" introduced="ER5" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/vcardandvcal/group" mrp="app/organizer/pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
-</component>
-<component name="chinesecalendarconverter" long-name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
-</component>
-<component name="chinesecalendaralg" long-name="Chinese Calendar Algorithm" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendaralg/group" mrp="app/organizer/pimappsupport/chinesecalendaralg/group/app-services_chinesecalendaralgorithm.mrp"/>
-</component>
-</collection>
-<collection name="organizer_info" long-name="Organizer Application Suite Info" level="app">
-<component name="organizer_metadata" long-name="Organizer Application Suite Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="mail eng base ui">
-<collection name="msg_pub" long-name="Messaging Apps Public APIs" level="ui">
-<component name="messaging_integration_api" long-name="Messaging Integration API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/messaging_integration_api/group"/>
-</component>
-<component name="plugin_bio_control_api" long-name="Plug-in Bio Control API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/plugin_bio_control_api/group"/>
-</component>
-<component name="mms_client_mtm_api" long-name="MMS Client MTM API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/mms_client_mtm_api/group"/>
-</component>
-<component name="open_new_message_notification_api" long-name="Open New Message Notification API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/open_new_message_notification_api/group"/>
-</component>
-<component name="messaging_editor_constants_api" long-name="Messaging Editor Constants API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/messaging_editor_constants_api/group"/>
-</component>
-</collection>
-<collection name="msg_plat" long-name="Messaging Apps Platform APIs" level="ui">
-<component name="smil_player_launch_api" long-name="SMIL Player Launch API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/smil_player_launch_api/group"/>
-</component>
-<component name="messaging_media_resolver_api" long-name="Messaging Media Resolver API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/messaging_media_resolver_api/group"/>
-</component>
-<component name="smil_engine_api" long-name="SMIL Engine API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/smil_engine_api/group"/>
-</component>
-<component name="mms_server_settings_api" long-name="MMS Server Settings API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_server_settings_api/group"/>
-</component>
-<component name="new_contacts_note_secondary_display_api" long-name="New Contacts Note Secondary Display API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contacts_note_secondary_display_api/group"/>
-</component>
-<component name="messaging_center_ui_utilities_api" long-name="Messaging Center UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/messaging_center_ui_utilities_api/group"/>
-</component>
-<component name="internet_mail_mtm_ui_api" long-name="Internet Mail MTM UI API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/internet_mail_mtm_ui_api/group"/>
-</component>
-<component name="messaging_editor_api" long-name="Messaging Editor API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/messaging_editor_api/group"/>
-</component>
-<component name="email_domain_utilities_api" long-name="Email Domain Utilities API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/email_domain_utilities_api/group"/>
-</component>
-<component name="smil_transition_api" long-name="SMIL Transition API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/smil_transition_api/group"/>
-</component>
-<component name="new_contacts_note_status_api" long-name="New Contacts Note Status API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contacts_note_status_api/group"/>
-</component>
-<component name="unified_editor_video_conversion_api" long-name="Unified Editor Video Conversion API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/unified_editor_video_conversion_api/group"/>
-</component>
-<component name="mms_conformance_api" long-name="MMS Conformance API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_conformance_api/group"/>
-</component>
-<component name="new_contacts_note_variables_api" long-name="New Contacts Note Variables API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contacts_note_variables_api/group"/>
-</component>
-<component name="new_message_notification_api" long-name="New Message Notification API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_message_notification_api/group"/>
-</component>
-<component name="mms_application_api" long-name="MMS Application API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_application_api/group"/>
-</component>
-<component name="mms_engine_settings_api" long-name="MMS Engine Settings API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_engine_settings_api/group"/>
-</component>
-<component name="mms_codec_client_api" long-name="MMS Codec Client API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_codec_client_api/group"/>
-</component>
-<component name="send_ui_meeting_request_api" long-name="Send UI Meeting Request API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/send_ui_meeting_request_api/group"/>
-</component>
-<component name="new_contact_notes_extended_api" long-name="New Contact Notes Extended API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contact_notes_extended_api/group"/>
-</component>
-<component name="mail_ui_constants_api" long-name="Mail UI Constants API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mail_ui_constants_api/group"/>
-</component>
-<component name="sim_dialog_launch_api" long-name="SIM Dialog Launch API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/sim_dialog_launch_api/group"/>
-</component>
-</collection>
-<collection name="mobilemessaging" long-name="Mobile Messaging" level="ui">
-<component name="audiomsg" filter="s60" long-name="Audio Message">
-<unit bldFile="app/messaging/mobilemessaging/audiomsg/group"/>
-</component>
-<component name="msgmedia" filter="s60" long-name="Message Media">
-<unit bldFile="app/messaging/mobilemessaging/msgmedia/group"/>
-</component>
-<component name="unieditor" filter="s60" long-name="Unified Editor">
-<unit bldFile="app/messaging/mobilemessaging/unieditor/group"/>
-</component>
-<component name="mmsui" filter="s60" long-name="MMS UI">
-<unit bldFile="app/messaging/mobilemessaging/mmsui/group"/>
-</component>
-<component name="postcard" filter="s60" long-name="Postcard">
-<unit bldFile="app/messaging/mobilemessaging/postcard/group"/>
-</component>
-<component name="smilui" filter="s60" long-name="SMIL UI">
-<unit bldFile="app/messaging/mobilemessaging/smilui/group"/>
-</component>
-<component name="smum" filter="s60" long-name="SMS UI MTM and UI Data MTM" plugin="Y">
-<unit bldFile="app/messaging/mobilemessaging/smum/group"/>
-</component>
-<component name="smsui" filter="s60" long-name="SMS UI">
-<unit bldFile="app/messaging/mobilemessaging/smsui/group"/>
-</component>
-<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/mobilemessaging/smsmtm/group" mrp="app/messaging/mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
-</component>
-</collection>
-<collection name="mmsengine" long-name="MMS Engine" level="eng">
-<component name="mmsconninit" filter="s60" long-name="MMS Connection Initiator" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsconninit/bld"/> -->
-</component>
-<component name="genutils" filter="s60" long-name="General Utils" class="placeholder">
-<!-- <unit bldFile="mmsengine/genutils/bld"/> -->
-</component>
-<component name="mmsserversettings" filter="s60" long-name="MMS Server Settings" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserversettings/bld"/> -->
-</component>
-<component name="mmsmessage" filter="s60" long-name="MMS Message" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsmessage/bld"/> -->
-</component>
-<component name="mmshttptransport" filter="s60" long-name="MMS HTTP Transport" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmshttptransport/bld"/> -->
-</component>
-<component name="mmscodec" filter="s60" long-name="MMS Codec" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodec/bld"/> -->
-</component>
-<component name="mmsserver" filter="s60" long-name="MMS Server" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserver/bld"/> -->
-</component>
-<component name="clientmtm" filter="s60" long-name="MMS Client MTM" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/clientmtm/bld"/> -->
-</component>
-<component name="mmswatcher" filter="s60" long-name="MMS Watcher" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmswatcher/bld"/> -->
-</component>
-<component name="mmspushhandler" filter="s60" long-name="MMS Push Handler" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmspushhandler/bld"/> -->
-</component>
-<component name="applicationadapter" filter="s60" long-name="MMS Application Adapter" class="placeholder">
-<!-- <unit bldFile="mmsengine/applicationadapter/bld"/> -->
-</component>
-<component name="mmscodecclient" filter="s60" long-name="MMS Codec Client" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodecclient/bld"/> -->
-</component>
-<component name="mmssettings" long-name="MMS Settings" introduced="9.2" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmssettings/group" mrp="app/messaging/mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
-</component>
-<component name="mmsconf" long-name="MMS Configuration" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmsconf" mrp="app/messaging/mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
-</component>
-<component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
-<!-- this bld.inf should be broken up into the individual other components -->
-<unit bldFile="app/messaging/mmsengine/group"/>
-</component>
-</collection>
-<collection name="messagingappbase" long-name="Messaging App Base" level="base">
-<component name="msgavkon" filter="s60" long-name="Messaging Avkon UI">
-<unit bldFile="app/messaging/messagingappbase/msgavkon/group"/>
-</component>
-<component name="mce" filter="s60" long-name="Message Center Application">
-<unit bldFile="app/messaging/messagingappbase/mce/group"/>
-</component>
-<component name="mceextraitems" filter="s60" long-name="Message Center Extra Items">
-<unit bldFile="app/messaging/messagingappbase/mceextraitems/group"/>
-</component>
-<component name="mcesettings" filter="s60" long-name="Message Center Settings">
-<unit bldFile="app/messaging/messagingappbase/mcesettings/group"/>
-</component>
-<component name="msgerrorwatcher" filter="s60" long-name="Messaging Error Watcher" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/msgerrorwatcher/group"/>
-</component>
-<component name="ncnlist" filter="s60" long-name="New Contacts Note List">
-<unit bldFile="app/messaging/messagingappbase/ncnlist/group"/>
-</component>
-<component name="schemeplugin" filter="s60" long-name="Scheme Handler Plugin" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/schemeplugin/group"/>
-</component>
-<component name="sendui" filter="s60" long-name="Send UI" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/sendui/group"/>
-</component>
-<component name="smilengine" filter="s60" long-name="SMIL Engine">
-<unit bldFile="app/messaging/messagingappbase/smilengine/group"/>
-</component>
-<component name="bium" filter="s60" long-name="BIO UI MTM" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/bium/group"/>
-</component>
-<component name="smartmessaging" filter="s60" long-name="Smart Messaging">
-<unit bldFile="app/messaging/messagingappbase/smartmessaging/group"/>
-</component>
-<component name="msgeditor" filter="s60" long-name="Messaging Editor">
-<unit bldFile="app/messaging/messagingappbase/msgeditor/group"/>
-</component>
-<component name="smilparser" long-name="SMIL Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="app/messaging/messagingappbase/smilparser/GROUP" mrp="app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
-</component>
-<component name="obexmtms" long-name="OBEX MTMs" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/obexmtms/Group" mrp="app/messaging/messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
-</component>
-</collection>
-<collection name="email" long-name="Email" level="mail">
-<!-- use commonemail instead -->
-<component name="alwaysonlineemailplugin" filter="s60" long-name="Always Online Mail Plugin" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/alwaysonlineemailplugin/group"/>
-</component>
-<component name="emailnotificationhandler" filter="s60" long-name="Email Notification Handler" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/emailnotificationhandler/group"/>
-</component>
-<component name="imum" filter="s60" long-name="Internet Mail UI MTM" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/imum/group"/>
-</component>
-<component name="mail" filter="s60" long-name="Mail Application" deprecated="^3">
-<unit bldFile="app/messaging/email/mail/group"/>
-</component>
-<component name="pop3andsmtpmtm" long-name="POP3 and SMTP MTM" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/pop3andsmtpmtm/group" mrp="app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
-</component>
-<component name="imap4mtm" long-name="IMAP4 MTM" introduced="9.2" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/imap4mtm/group" mrp="app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
-</component>
-</collection>
-<collection name="messaging_info" long-name="Messaging Apps Info" level="ui">
-<component name="messaging_metadata" long-name="Messaging Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commonemail" level="apps" span="2" long-name="Email Apps" levels="service support ui app">
-<collection name="email_pub" long-name="Email Apps Public Interfaces" level="app">
-<component name="email_widget_api" long-name="Email Widget API" filter="s60" class="api">
-<unit bldFile="app/commonemail/email_pub/email_widget_api/group"/>
-</component>
-</collection>
-<collection name="email_plat" long-name="Email Apps Platform Interfaces" level="app">
-<component name="email_client_api" long-name="Email Client API" filter="s60" class="api">
-<unit bldFile="app/commonemail/email_plat/email_client_api/group"/>
-</component>
-<component name="email_setup_plugin_api" long-name="Email Setup Plugin API" filter="s60" class="api">
-<unit bldFile="app/commonemail/email_plat/email_setup_plugin_api/group"/>
-</component>
-</collection>
-<collection name="emailservices" long-name="Email Services" level="service">
-<component name="emailframework" filter="s60" long-name="Email Framework" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailframework/group"/>
-</component>
-<component name="emailclientapi" filter="s60" long-name="Email Client API" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailclientapi/group"/>
-</component>
-<component name="emailserver" filter="s60" long-name="Email Server" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailserver/group"/>
-</component>
-<component name="emailservermonitor" filter="s60" long-name="Email Server Monitor" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailservermonitor/group"/>
-</component>
-<component name="psmruadapter" filter="s60" long-name="Predictive Search Most Recent Used Adapter" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailservices/psmruadapter/group"/>
-</component>
-<component name="emailstore" filter="s60" long-name="Email Store" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailstore/group"/>
-</component>
-<component name="emaildebug" filter="s60" long-name="Email Debug" introduced="^2" class="api">
-<unit bldFile="app/commonemail/emailservices/emaildebug/group"/>
-</component>
-<component name="emailinstallationinitiator" filter="s60" long-name="Email Installation Initiator" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailinstallationinitiator/group"/>
-</component>
-</collection>
-<collection name="ipsservices" long-name="IMAP/POP/SMTP Services" level="service">
-<component name="ipssossettings" filter="s60" long-name="IPS SOS Settings" introduced="^2">
-<!-- SOS? Consider spelling it out since the abbreviation is ambiguous -->
-<unit bldFile="app/commonemail/ipsservices/ipssossettings/group"/>
-</component>
-<component name="ipssosplugin" filter="s60" long-name="IPS SOS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/ipsservices/ipssosplugin/group"/>
-</component>
-<component name="ipssosaoplugin" filter="s60" long-name="IPS SOS Always Online Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/ipsservices/ipssosaoplugin/group"/>
-</component>
-<component name="ipsservices_build" filter="s60" long-name="IPS Services Build" introduced="^2">
-<unit bldFile="app/commonemail/ipsservices/group"/>
-<!-- can the exports be broken up into the other components or made a config component?-->
-</component>
-</collection>
-<collection name="emailcontacts" long-name="Email Contacts" level="support">
-<component name="contactactionservice" filter="s60" long-name="Contact Action Service" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailcontacts/contactactionservice/group"/>
-</component>
-<component name="contactactionmenu" filter="s60" long-name="Contact Action Menu" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailcontacts/contactactionmenu/group"/>
-</component>
-</collection>
-<collection name="meetingrequest" long-name="Meeting Request" level="ui">
-<component name="mrcommon" filter="s60" long-name="MR Common" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrcommon/group"/>
-</component>
-<component name="mrdb" filter="s60" long-name="MR Database" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrdb/group"/>
-</component>
-<component name="mrpolicy" filter="s60" long-name="MR Policy" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrpolicy/group"/>
-</component>
-<component name="mrservices" filter="s60" long-name="MR Services" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrservices/group"/>
-</component>
-<component name="mrgui" filter="s60" long-name="MR GUI" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrgui/group"/>
-</component>
-<component name="mrentry" filter="s60" long-name="MR Entry" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrentry/group"/>
-</component>
-<component name="mrtasks" filter="s60" long-name="MR Tasks" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrtasks/group"/>
-</component>
-<component name="mrutils" filter="s60" long-name="MR Utils" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrutils/group"/>
-</component>
-<component name="mrutilscalplugin" filter="s60" long-name="MR Utils Calendar Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mrutilscalplugin/group"/>
-</component>
-<component name="mrviewer" filter="s60" long-name="MR Viewer" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrviewer/group"/>
-</component>
-<component name="mrviewercalplugin" filter="s60" long-name="MR Viewer Calendar Plugin" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrviewercalplugin/group"/>
-</component>
-<component name="mricalviewer" filter="s60" long-name="MR iCal Viewer" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mricalviewer/group"/>
-</component>
-<component name="mrversit2" filter="s60" long-name="MR Versit2" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrversit2/group"/>
-</component>
-<component name="mragnversit2" filter="s60" long-name="MR Agenda Versit2" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mragnversit2/group"/>
-</component>
-<component name="mrcasplugin" filter="s60" long-name="MR Contact Action Service Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mrcasplugin/group"/>
-</component>
-<component name="mrurlparserplugin" filter="s60" long-name="MR URL Parser Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mrurlparserplugin/group"/>
-</component>
-<component name="meetingrequest_build" filter="s60" long-name="MR Build" introduced="^2">
-<!-- can the exports be broken up into the other components ?
- alternatively, move the exports into a RM Config component-->
-<unit bldFile="app/commonemail/meetingrequest/group"/>
-</component>
-</collection>
-<collection name="emailuis" long-name="Email UIs" level="app">
-<component name="emailui" filter="s60" long-name="Email UI" introduced="^2">
-<unit bldFile="app/commonemail/emailuis/emailui/group"/>
-</component>
-<component name="gsemailsettings" filter="s60" long-name="Email GS Settings" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailuis/gsemailsettings/group"/>
-</component>
-<component name="uicomponents" filter="s60" long-name="Email UI Components" introduced="^2">
-<unit bldFile="app/commonemail/emailuis/uicomponents/group"/>
-</component>
-<component name="widget" filter="s60" long-name="Email Widget" introduced="^2">
-<!-- Uncomment unit when configuration is in place. Currently #included from emailuis_build, which should be removed at the same time. -->
-<!--<unit bldFile="emailuis/widget/group"/>-->
-</component>
-<component name="emailuis_build" filter="s60" long-name="Email UIs Build" introduced="^2">
-<unit bldFile="app/commonemail/emailuis/group"/>
-</component>
-</collection>
-<collection name="commonemail_info" long-name="Email Apps Info" level="app">
-<component name="emailhelp" filter="s60" long-name="Email Help" class="placeholder">
-<!-- should this be commented out or not? -->
-<!-- <unit bldFile="emailhelp/group"/> -->
-</component>
-<component name="commonemail_help" filter="s60" long-name="Email Help" introduced="^2" class="placeholder">
-<!-- should this be commented out or not? -->
-<!-- <unit bldFile="help/group"/> -->
-</component>
-</collection>
-</block>
-<block name="conversations" level="apps" long-name="Conversation Apps" levels="settings utils plugin ui">
-<collection name="conversations_plat" long-name="Conversation Apps Platform Interfaces" level="ui">
-<component name="im_cv_launcher_api" long-name="IM CV Launcher API" filter="s60" class="api">
-<unit bldFile="app/conversations/conversations_plat/im_cv_launcher_api/group"/>
-</component>
-<component name="im_connection_api" long-name="IM Connection API" filter="s60" class="api">
-<unit bldFile="app/conversations/conversations_plat/im_connection_api/group"/>
-</component>
-<component name="im_cv_appui_api" long-name="IM CV App UI API" filter="s60" class="api">
-<unit bldFile="app/conversations/conversations_plat/im_cv_appui_api/group"/>
-</component>
-</collection>
-<collection name="uiservicetabsettings" long-name="UI Service Tab Settings" level="settings">
-<!-- this is really at the wrong rank. should move down a directory -->
-<component name="vimpstsettings" filter="s60" long-name="VIMP Service Tab Settings">
-<unit bldFile="app/conversations/uiservicetabsettings/group"/>
-</component>
-</collection>
-<collection name="instantmessagesalert" long-name="Instant Messages Alert" level="utils">
-<!-- this is really at the wrong rank. should move down a directory -->
-<component name="instantmessagesalert_build" filter="s60" long-name="Instant Messages Alert build" introduced="^3">
-<unit bldFile="app/conversations/instantmessagesalert/group"/>
-</component>
-</collection>
-<collection name="imstutils" long-name="IM Service Tab Utils" level="utils">
-<component name="imstutils_help" filter="s60" long-name="IM Service Tab Help">
-<unit bldFile="app/conversations/imstutils/help/group"/>
-</component>
-<component name="imconnectionprovider" filter="s60" long-name="IM Connection Provider" plugin="Y">
-<unit bldFile="app/conversations/imstutils/imconnectionprovider/group"/>
-</component>
-<component name="xmppadapter" filter="s60" long-name="XMPP Settings Adapter" plugin="Y">
-<unit bldFile="app/conversations/imstutils/xmppadapter/group"/>
-</component>
-<component name="imconversationview" filter="s60" long-name="IM Conversation View">
-<unit bldFile="app/conversations/imstutils/imconversationview/group"/>
-</component>
-<component name="imstutils_config" filter="s60" long-name="IM Service Tab Utils config" class="config">
-<!-- remove the #includes and or moved ithe loc file into one the above components -->
-<unit bldFile="app/conversations/imstutils/group"/>
-</component>
-</collection>
-<collection name="uiservicetab" long-name="UI Service Tab" level="ui">
-<component name="vimpstutils" filter="s60" long-name="VIMP Service Tab Utilities">
-<!-- need to spell out VIMP at least once -->
-<unit bldFile="app/conversations/uiservicetab/vimpstutils/group"/>
-</component>
-<component name="vimpststorage" filter="s60" long-name="VIMP Service Tab Storage">
-<unit bldFile="app/conversations/uiservicetab/vimpststorage/group"/>
-</component>
-<component name="vimpstengine" filter="s60" long-name="VIMP Service Tab Engine">
-<unit bldFile="app/conversations/uiservicetab/vimpstengine/group"/>
-</component>
-<component name="vimpstcmdprocess" filter="s60" long-name="VIMP Service Tab Command Process">
-<unit bldFile="app/conversations/uiservicetab/vimpstcmdprocess/group"/>
-</component>
-<component name="vimpstui" filter="s60" long-name="VIMP Service Tab UI">
-<unit bldFile="app/conversations/uiservicetab/vimpstui/group"/>
-</component>
-<component name="vimpstdetailsviewplugin" filter="s60" long-name="VIMP ST Details View Plugin" plugin="Y">
-<unit bldFile="app/conversations/uiservicetab/vimpstdetailsviewplugin/group"/>
-</component>
-<component name="uiservicetab_build" filter="s60" long-name="UI Service Tab Build">
-<!-- can this be distributed into the above bld.infs? -->
-<unit bldFile="app/conversations/uiservicetab/group"/>
-</component>
-</collection>
-<collection name="servicewidget" long-name="Service Widget" level="ui">
-<component name="servicewidgetdatapublisher" filter="s60" long-name="Service Widget Data Publisher" plugin="Y">
-<unit bldFile="app/conversations/servicewidget/servicewidgetdatapublisher/group"/>
-</component>
-<component name="themes" filter="s60" long-name="Service Widget Themes" class="config">
-<!-- does this really need to have that number in the directory name? -->
-<unit bldFile="app/conversations/servicewidget/themes/install-themes/install/servicewidget_20021383/group"/>
-</component>
-<component name="servicewidget_build" filter="s60" long-name="Service Widget Build">
-<!-- Either move the whole collection down one directory into a single component, or move the ROM and SIS parts into a Service Widget ROM component -->
-<unit bldFile="app/conversations/servicewidget/group"/>
-</component>
-</collection>
-<collection name="instantmsgindicatorplugin" long-name="Instant Message Indicator Plugin" level="plugin">
-<!-- collection is really a component. should move down a directory -->
-<component name="instantmsgindicatorplugin_build" filter="s60" long-name="Instant Message Indicator Plugin Build" introduced="^3" plugin="Y">
-<unit bldFile="app/conversations/instantmsgindicatorplugin/group"/>
-</component>
-</collection>
-<collection name="imstatuspaneindicatorplugin" long-name="IM Status Pane Indicator Plugin" level="plugin">
-<!-- collection is really a component. should move down a directory -->
-<component name="imstatuspaneindicatorplugin_build" filter="s60" long-name="IM Status Pane Indicator Plugin Build" introduced="^3" plugin="Y">
-<unit bldFile="app/conversations/imstatuspaneindicatorplugin/group"/>
-</component>
-</collection>
-<collection name="conversations_info" long-name="Conversation Apps Info" level="ui">
-<component name="conversations_build" filter="s60" long-name="Conversation Apps Build">
-<!-- can the exports be moved to other components? or this remade into a configuration component?-->
-<unit bldFile="app/conversations/group"/>
-</component>
-</collection>
-</block>
-<block name="im" level="apps" long-name="Instant Messaging Apps" levels="support prot engine apps">
-<collection name="im_plat" long-name="Instant Messaging Apps Platform Interfaces" level="apps">
-<component name="wv_sap_settings_api" long-name="WV SAP Settings API" filter="s60" class="api">
-<unit bldFile="app/im/im_plat/wv_sap_settings_api/group"/>
-</component>
-</collection>
-<collection name="wvsettings20" long-name="Wireless Village Settings Engine" level="support">
-<!-- this is really a component. should move down a directory -->
-<component name="wvsapsettingsstore" long-name="WV SAP Settings Store" filter="s60" introduced="9.3">
-<unit bldFile="app/im/wvsettings20/group"/>
-</component>
-</collection>
-</block>
-<block name="dictionary" level="services" long-name="Dictionary" levels="utils ui">
-<collection name="dictionary_plat" long-name="Dictionary Platform Interfaces" level="ui">
-<component name="menu_suites_macros_api" long-name="Menu Suites Macros API" filter="s60" class="api">
-<unit bldFile="app/dictionary/dictionary_plat/menu_suites_macros_api/group"/>
-</component>
-</collection>
-<collection name="userdict" long-name="User Dictionary" level="ui">
-<!-- collection is really a component, move down a dir -->
-<component name="userdict_build" filter="s60" long-name="Japanese User Dictionary">
-<unit bldFile="app/dictionary/userdict/group"/>
-</component>
-</collection>
-</block>
-<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"/>
-</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"/>
-</component>
-</collection>
-<collection name="camerauis" long-name="Camera UIs">
-<component name="activepalette" filter="s60" long-name="Active Palette">
-<unit bldFile="app/camera/camerauis/activepalette/group"/>
-</component>
-<component name="cameraapp" filter="s60" long-name="Camera Application">
-<unit bldFile="app/camera/camerauis/cameraapp/group"/>
-<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">
-<component name="image_editor_debug_utilities_api" long-name="Image Editor Debug Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
-</component>
-<component name="image_editor_utilities_api" long-name="Image Editor Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_utilities_api/group"/>
-</component>
-<component name="image_editor_definitions_api" long-name="Image Editor Definitions API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_definitions_api/group"/>
-</component>
-<component name="image_editor_system_parameters_api" long-name="Image Editor System Parameters API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_system_parameters_api/group"/>
-</component>
-<component name="image_processing_engine_api" long-name="Image Processing Engine API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_processing_engine_api/group"/>
-</component>
-</collection>
-<collection name="imageeditor" long-name="Image Editor UI" level="ui">
-<component name="pb" filter="s60" long-name="Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/pb/group"/>
-</component>
-<component name="iepb" filter="s60" long-name="Image Editor Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/iepb/group"/>
-</component>
-<component name="imageeditorui" filter="s60" long-name="Image Editor UI">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorui/group"/>
-</component>
-<component name="imageeditormanager" filter="s60" long-name="Image Editor Manager">
-<unit bldFile="app/imgeditor/imageeditor/imageeditormanager/group"/>
-</component>
-<component name="imageeditorapp" filter="s60" long-name="Image Editor Application">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorapp/group"/>
-</component>
-<component name="imageeditor_plugins" filter="s60" long-name="Image Editor Plugins" plugin="Y">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditor/plugins/blackwhiteplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/brightnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/bubbleplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cartoonizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/clipartplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/contrastplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cropplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/drawplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/frameplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/negativeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/redeyeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/resizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotatelplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotaterplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/textplugin/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditor/plugins/drawplugin/group"/>
- -->
-</component>
-<component name="editorprovider" filter="s60" long-name="Image Editor Provider">
-<unit bldFile="app/imgeditor/imageeditor/editorprovider/group"/>
-</component>
-<component name="imageeditor_build" filter="s60" long-name="Image Editor Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditor/group"/>
-</component>
-</collection>
-<collection name="imageeditorengine" long-name="Image Editor Engine" level="engine">
-<component name="filters" filter="s60" long-name="Image Editor Filters">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbrightness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbubble/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbuffer/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercartoon/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterclipart/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercontrast/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercrop/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterdraw/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterframe/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtergrayscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtericlsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegtarget/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filternegate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterredeye/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterrotate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtertext/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
- -->
-</component>
-<component name="imageeditorutils" filter="s60" long-name="Image Editor Utilities">
-<unit bldFile="app/imgeditor/imageeditorengine/imageeditorutils/group"/>
-</component>
-<component name="systemparameters" filter="s60" long-name="System Parameters">
-<unit bldFile="app/imgeditor/imageeditorengine/systemparameters/group"/>
-</component>
-<component name="enginewrapper" filter="s60" long-name="Image Editor Engine Wrapper">
-<unit bldFile="app/imgeditor/imageeditorengine/enginewrapper/group"/>
-</component>
-<component name="imageeditorengine_build" filter="s60" long-name="Image Editor Engine Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoeditor" level="apps" long-name="Video Editor Apps" levels="engine ui">
-<collection name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" level="ui">
-<component name="video_editor_engine_api" long-name="Video Editor Engine API" introduced="^2" class="api">
-<unit bldFile="app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
-</component>
-</collection>
-<collection name="videditor" long-name="Video Editor" level="ui">
-<component name="videoeditorcommon" filter="s60" long-name="Video Editor Common" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditorcommon/group"/>
-</component>
-<component name="videoeditoruicomponents" filter="s60" long-name="Video Editor UI Components" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditoruicomponents/group"/>
-</component>
-<component name="simplevideoeditor" filter="s60" long-name="Simple Video Editor" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplevideoeditor/group"/>
-</component>
-<component name="simplecutvideo" filter="s60" long-name="Simple Cut Video" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplecutvideo/group"/>
-</component>
-<component name="videoprovider" filter="s60" long-name="Video Provider" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoprovider/group"/>
-</component>
-<component name="manualvideoeditor" filter="s60" long-name="Manual Video Editor" introduced="^2" class="placeholder">
-<!-- uncomment when supported
- <meta rel="config">
- <defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
- </meta>
- <unit bldFile="videditor/manualvideoeditor/group"/> -->
-</component>
-<component name="videditor_build" filter="s60" long-name="Video Editor Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videditor/group"/>
-</component>
-</collection>
-<collection name="videoeditorengine" long-name="Video Editor Engine" level="engine">
-<component name="audioeditorengine" filter="s60" long-name="Audio Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/audioeditorengine/group"/>
-</component>
-<component name="avcedit" filter="s60" long-name="AVC Editing" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/avcedit/group"/>
-</component>
-<component name="h263decoder" filter="s60" long-name="H.263 Decoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/h263decoder/group"/>
-</component>
-<component name="mp3aacmaniplib" filter="s60" long-name="MP3 and AAC Manipulation Library" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
-</component>
-<component name="vedtranscoder" filter="s60" long-name="Video Editor Transcoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedtranscoder/group"/>
-</component>
-<component name="vedengine" filter="s60" long-name="Video Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedengine/group"/>
-</component>
-<component name="videoeditorengine_build" filter="s60" long-name="Video Editor Engine Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videoeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
-<collection name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" level="apps">
-<component name="videoplayer_startup_api" long-name="Video Player Startup API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videoplayer_startup_api/group" filter="!test"/>
-</component>
-<component name="video_player_file_details_dialog_api" long-name="Media Player File Details Dialog API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/video_player_file_details_dialog_api/group" filter="!test"/>
-</component>
-<component name="videocollection_api" long-name="Video Collection API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videocollection_api/group"/>
-</component>
-</collection>
-<collection name="videofeeds" long-name="Video Feeds" level="util">
-<component name="iptv_utils" filter="s60" long-name="IPTV Util" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/utils/group"/>
-</component>
-<component name="viewmessageutility" filter="s60" long-name="View Message Utility" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/viewmessageutility/group"/>
-</component>
-<component name="vcxnotifier" filter="s60" long-name="Video Connection Notifier" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/vcxnotifier/group"/>
-</component>
-<component name="vccommon" filter="s60" long-name="Video Connection Common" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/vccommon/group"/>
-</component>
-<component name="clientapi" long-name="Server Client" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/clientapi/group"/>
-</component>
-<component name="provisioningprocessor" long-name="Provisioning Processor" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/provisioningprocessor/group"/>
-</component>
-<component name="mrssplugin" long-name="RSS plugin" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/mrssplugin/group"/>
-</component>
-<component name="videofeeds_server" long-name="Server" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/server/group"/>
-</component>
-<component name="livetvutils" long-name="LiveTV Utils" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/livetvutils/group"/>
-</component>
-<component name="iptvprovisioningrecognizer" long-name="IP TV Provisioning Recognizer" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/provisioningrecognizer/group"/>
-</component>
-<component name="iptvprovisioningappui" long-name="IP TV Provisioning App UI" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/provisioningappui/group"/>
-</component>
-<component name="iptvomaprovisioning" long-name="IP TV OMA Provisioning" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/omaprovisioning/group"/>
-</component>
-<component name="vcnsuiengine" long-name="VoD UI Engine" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/vcnsuiengine/group"/>
-</component>
-<component name="hgvodui" long-name="Ganes UX2.0 VoD UI" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/hgvodui/group"/>
-</component>
-<component name="hgvodplugin" long-name="Ganes UX2.0 VoD UI Plugin" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/hgvodplugin/group"/>
-</component>
-<component name="vcnsscheduleview" long-name="Scheduled Download Settings View" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/vcnsscheduleview/group"/>
-</component>
-<component name="vcnsscheduleplugin" long-name="Scheduled Download Settings Plugin" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/vcnsscheduleplugin/group"/>
-</component>
-<component name="scheduleddlplugin" long-name="Scheduled download plugin" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/scheduleddlplugin/group"/>
-</component>
-</collection>
-<collection name="videocollection" long-name="Video Collection" level="util">
-<component name="mpxmyvideoscollection" filter="s60" long-name="MPX My Videos Collection" introduced="^3">
-<unit bldFile="app/videoplayer/videocollection/mpxmyvideoscollection/group"/>
-</component>
-<component name="myvideosindicatorplugin" filter="s60" long-name="My Videos Indicator Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videocollection/myvideosindicatorplugin/group"/>
-</component>
-<component name="hgmyvideos" filter="s60" long-name="Huriganes My Videos" introduced="^3">
-<unit bldFile="app/videoplayer/videocollection/hgmyvideos/group"/>
-</component>
-<component name="hgmyvideosplugin" filter="s60" long-name="Huriganes My VideosPlugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videocollection/hgmyvideosplugin/group"/>
-</component>
-</collection>
-<collection name="mediasettings" long-name="Media Settings" level="support">
-<!-- this is really a component. Should be moved down a directory -->
-<component name="mediasettings_build" filter="s60" long-name="Media Settings Build">
-<unit bldFile="app/videoplayer/mediasettings/group"/>
-</component>
-<component name="videoplayer_test" filter="s60" purpose="development" long-name="Video Player Apps Test">
-<!-- can only have one unit. Can thes be #included from the above or another bld.inf?-->
-<unit bldFile="app/videoplayer/tsrc/VCXTestCommon/group"/>
-<unit bldFile="app/videoplayer/tsrc/VCXTestUtilModule/group"/>
-<unit bldFile="app/videoplayer/tsrc/VCXTestMyVideosCollectionClient/group"/>
-<unit bldFile="app/videoplayer/mediasettings/mediasettingsengine/tsrc/mediasettingsenginetest/group"/>
-<unit bldFile="app/videoplayer/mediasettings/videoplayersettingsengine/tsrc/vpsettingsenginetest/group"/>
-</component>
-</collection>
-<collection name="filedetails" long-name="File Details" level="support">
-<component name="filedetailsplugin" filter="s60" long-name="File Details Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/filedetails/filedetailsplugin/group"/>
-</component>
-<component name="filedetailsdialog" filter="s60" long-name="File Details Dialog" introduced="^3">
-<unit bldFile="app/videoplayer/filedetails/filedetailsdialog/group"/>
-</component>
-</collection>
-<collection name="videoplayerapp" long-name="Video Player App" level="apps">
-<component name="lwplayer" long-name="Lightweight Player" filter="s60">
-<unit bldFile="app/videoplayer/videoplayerapp/lwplayer/group"/>
-</component>
-<component name="mpxvideoplayer" filter="s60" long-name="MPX Video Player" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayerapp/mpxvideoplayer/group" filter="!test"/>
-</component>
-</collection>
-<collection name="videoplayback" long-name="Video Playback Plugins" level="plugin">
-<component name="videohelix" long-name="Video Helix" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videohelix/group" filter="!test"/>
-</component>
-<component name="videopdlplaybackviewplugin" filter="s60" long-name="Video PDL Playback View Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videopdlplaybackviewplugin/group" filter="!test"/>
-</component>
-<component name="videoplaybackcontrols" filter="s60" long-name="Video Playback Controls" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videoplaybackcontrols/group" filter="!test"/>
-</component>
-<component name="videoplaybackviewplugin" filter="s60" long-name="Video Playback View Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videoplaybackviewplugin/group"/>
-</component>
-<component name="videoplaybackviews" filter="s60" long-name="Video Playback Views" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videoplaybackviews/group" filter="!test"/>
-</component>
-</collection>
-</block>
-<block name="photos" level="apps" long-name="Photos" levels="support fw ui app">
-<collection name="photos_plat" long-name="Photos Platform Interfaces" level="app">
-<component name="collection_plugins_api" long-name="Collection Plugins API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/collection_plugins_api/group"/>
-</component>
-<component name="controllers_collection_api" long-name="Controllers Collection API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/controllers_collection_api/group"/>
-</component>
-<component name="gallery_utilities_api" long-name="Gallery Utilities API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/gallery_utilities_api/group"/>
-</component>
-<component name="slideshow_ui_constants_api" long-name="Slideshow Ui Constants API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/slideshow_ui_constants_api/group"/>
-</component>
-<component name="views_metadatadialog_api" long-name="Views Metadata Dialog API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/views_metadatadialog_api/group"/>
-</component>
-</collection>
-<collection name="photosgallery" long-name="Photos Gallery" level="app">
-<!-- consider splitting this collection into the application itself, and the frameworks behind it -->
-<component name="photosgallery_help" filter="s60" long-name="Photos Help" introduced="^2">
-<unit bldFile="app/photos/photosgallery/help/group"/>
-</component>
-<component name="logging" filter="s60" long-name="Photos Logging" introduced="^2">
-<unit bldFile="app/photos/photosgallery/logging/group"/>
-</component>
-<component name="photosgallery_common" filter="s60" long-name="Photos Common" introduced="^2">
-<unit bldFile="app/photos/photosgallery/common/group"/>
-</component>
-<component name="photosgallery_commonui" filter="s60" long-name="Photos Common UI" introduced="^2">
-<unit bldFile="app/photos/photosgallery/commonui/group"/>
-</component>
-<component name="photosgalleryollectionfw" filter="s60" long-name="Photos Collection Framework" introduced="^2">
-<unit bldFile="app/photos/photosgallery/collectionframework/group"/>
-</component>
-<component name="galleryicons" filter="s60" long-name="Photos Icons" introduced="^2" class="config">
-<unit bldFile="app/photos/photosgallery/icons"/>
-</component>
-<component name="imageviewer" filter="s60" long-name="Image Viewer" introduced="^3">
-<!-- this is really a part of controllers component, #include from there instead -->
-<unit bldFile="app/photos/photosgallery/controllers/imageviewer/group"/>
-</component>
-<component name="photosgalleryviewfw" filter="s60" long-name="View Framework" introduced="^2">
-<unit bldFile="app/photos/photosgallery/viewframework/group"/>
-</component>
-<component name="controllers" filter="s60" long-name="Photos Controllers" introduced="^2">
-<unit bldFile="app/photos/photosgallery/controllers/group"/>
-</component>
-<component name="photogallery" filter="s60" long-name="Media Gallery" introduced="^2">
-<unit bldFile="app/photos/photosgallery/gallery/group"/>
-</component>
-<component name="slideshow" filter="s60" long-name="Slideshow" introduced="^2">
-<unit bldFile="app/photos/photosgallery/slideshow/group"/>
-</component>
-<component name="memoryplugin" long-name="Memory Plugin" filter="s60" introduced="^2" plugin="Y">
-<unit bldFile="app/photos/photosgallery/memoryplugin/group"/>
-</component>
-<component name="imgvwr" filter="s60" long-name="Photos Image Viewer" introduced="^3">
-<unit bldFile="app/photos/photosgallery/imgvwr/group"/>
-</component>
-<component name="photosgallery_build" filter="s60" long-name="Photos Gallery Build" introduced="^2">
-<!-- need to remove the #included above bld.infs from this -->
-<unit bldFile="app/photos/photosgallery/group"/>
-</component>
-</collection>
-</block>
-<block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support hs app">
-<collection name="musicplayer_plat" long-name="Music Player Apps Platform Interfaces" level="app">
-<component name="mpx_music_player_app_api" long-name="MPX Music Player App API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_app_api/group"/>
-</component>
-<component name="mpx_music_player_commonui_api" long-name="MPX Music Player Common UI API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_commonui_api/group"/>
-</component>
-<component name="mpx_music_player_media_key_handler_api" long-name="MPX Music Player Media Key Handler API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_media_key_handler_api/group"/>
-</component>
-<component name="mpx_music_player_remote_control_api" long-name="MPX Music Player Remote Control API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_remote_control_api/group"/>
-</component>
-<component name="mpx_music_shop_ui_api" long-name="MPX Music Shop UI API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_shop_ui_api/group"/>
-</component>
-<component name="mpx_music_wap_adapter_cenrep_api" long-name="MPX Music Wap Adapter CenRep API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_wap_adapter_cenrep_api/group"/>
-</component>
-<component name="mpx_music_store_api" long-name="MPX Music Store Find API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_store_api/group"/>
-</component>
-<component name="audio_application_features_api" long-name="Audio Application Features API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/audio_application_features_api/group"/>
-</component>
-<component name="music_content_publisher_plugin_api" long-name="Music Content Publisher Plugin API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/music_content_publisher_plugin_api/group"/>
-</component>
-</collection>
-<collection name="mpxmusicplayer" long-name="MPX Music Player" level="app">
-<component name="mpxmusicplayer_help" filter="s60" long-name="Help">
-<unit bldFile="app/musicplayer/mpxmusicplayer/help/group"/>
-</component>
-<component name="mpxmusicplayer_commonui" filter="s60" long-name="MPX Common UI">
-<unit bldFile="app/musicplayer/mpxmusicplayer/commonui/group"/>
-</component>
-<component name="mpx_metadatahandler" filter="s60" long-name="MPX Metadata Handler">
-<unit bldFile="app/musicplayer/mpxmusicplayer/metadatahandler/group"/>
-</component>
-<component name="mediakeyhandler" filter="s60" long-name="MPX Media Key Handler">
-<unit bldFile="app/musicplayer/mpxmusicplayer/mediakeyhandler/group"/>
-</component>
-<component name="mpxmusicplayer_app" filter="s60" long-name="MPX Application">
-<unit bldFile="app/musicplayer/mpxmusicplayer/app/group"/>
-</component>
-<component name="mpxmusicplayer_build" filter="s60" long-name="MPX Music Player Build">
-<!-- can the exports be distributed to the above components? -->
-<unit bldFile="app/musicplayer/mpxmusicplayer/group"/>
-</component>
-</collection>
-<collection name="musichomescreen_multiview" long-name="Music Home Screen Multiview" level="hs">
-<!-- Uncomment all units when configuration is in place. All currently #included from musichomescreen_build -->
-<component name="mpxcollectionpublisher" filter="s60" long-name="MPX Collection Publisher" introduced="^2" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/mpxcollectionpublisher/group"/>-->
-</component>
-<component name="musiccontentpublisher" filter="s60" long-name="Music Content Publisher" introduced="^2" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/musiccontentpublisher/group"/>-->
-</component>
-<component name="mcpmusicplayer" filter="s60" long-name="Music Player MCP Plugin" introduced="^2" plugin="Y" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/mcpmusicplayer/group"/>-->
-</component>
-<component name="musicplayeractionhandlerplugin" filter="s60" long-name="Music Player Action Handler Plugin" introduced="^2" plugin="Y" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/musicplayeractionhandlerplugin/group"/>-->
-</component>
-<component name="mpx_data" filter="s60" long-name="MPX Data" introduced="^2" class="placeholder">
-<!-- does this make sense to be a component? should it just be #include from musichomescreen_multiview/group? -->
-<!--<unit bldFile="musichomescreen_multiview/data/themes/default/group"/>-->
-</component>
-<component name="musichomescreen_build" filter="s60" long-name="Music Homescreen Multiview Build" introduced="^2">
-<unit bldFile="app/musicplayer/musichomescreen_multiview/group"/>
-</component>
-</collection>
-<collection name="mpxplugins" long-name="MPX Plugins" level="plugins">
-<component name="serviceplugins" filter="s60" long-name="MPX Service Plugins" plugin="Y">
-<unit bldFile="app/musicplayer/mpxplugins/serviceplugins/group"/>
-</component>
-<component name="viewplugins" filter="s60" long-name="MPX View Plugins" plugin="Y">
-<unit bldFile="app/musicplayer/mpxplugins/viewplugins/group"/>
-</component>
-<component name="mpxplugins_build" filter="s60" long-name="MPX Plugins Build">
-<!-- can the exports be distributed to the above components? -->
-<unit bldFile="app/musicplayer/mpxplugins/group"/>
-</component>
-</collection>
-<collection name="musicplayer_info" long-name="Music Player Apps Info" level="app">
-<component name="musicplayer_build" filter="s60" long-name="Music Player Build">
-<!-- should explicitly #inlcude musicplayerbldvariant.hrh in each component -->
-<unit bldFile="app/musicplayer/group"/>
-</component>
-</collection>
-</block>
-<block name="radio" level="apps" long-name="Radio Apps" levels="engine ui">
-<collection name="fmradio" long-name="FM Radio" level="ui">
-<component name="activeidleengine" filter="s60" long-name="FM Radio Active Idle Engine">
-<unit bldFile="app/radio/fmradio/activeidleengine/group"/>
-</component>
-<component name="fmradioengine" filter="s60" long-name="FM Radio Engine">
-<unit bldFile="app/radio/fmradio/fmradioengine/group"/>
-</component>
-<component name="fmradioactionhandler" filter="s60" long-name="FM Radio Action Handler" plugin="Y">
-<unit bldFile="app/radio/fmradio/fmradioactionhandler/group"/>
-</component>
-<component name="fmradiomcpplugin" filter="s60" long-name="FM Radio Content Publisher Plugin" plugin="Y">
-<unit bldFile="app/radio/fmradio/fmradiomcpplugin/group"/>
-</component>
-<component name="fmradio_build" filter="s60" long-name="FM Radio Build">
-<unit bldFile="app/radio/fmradio/fmradio/group"/>
-</component>
-<component name="fmradio_help" filter="s60" long-name="FM Radio Help">
-<unit bldFile="app/radio/fmradio/help/group"/>
-</component>
-<component name="fmradio_build" filter="s60" long-name="FM Radio ROM">
-<!-- remove above #included bld.infs -->
-<unit bldFile="app/radio/fmradio/group"/>
-</component>
-</collection>
-</block>
-<block name="internetradio" level="apps" long-name="Internet Radio Apps"/>
-<block name="tv" level="services" long-name="TV Apps"/>
-<block name="voicerec" level="apps" long-name="Voice Recorder Apps">
-<!-- custom filter pref_test-->
-<collection name="voicerec_plat" long-name="Voice Recorder Apps Platform Interfaces">
-<component name="new_file_service_api" long-name="New File Service API" filter="s60" class="api">
-<unit bldFile="app/voicerec/voicerec_plat/new_file_service_api/group"/>
-</component>
-<component name="voicerecorder_public_constants_api" long-name="Voice Recorder Public Constants API" filter="s60" class="api">
-<unit bldFile="app/voicerec/voicerec_plat/voicerecorder_public_constants_api/group"/>
-</component>
-</collection>
-<collection name="voicerecorder" long-name="Voice Recorder">
-<!--this is really a component, move down a directory -->
-<component name="voicerecorder_build" filter="s60" long-name="Voice Recorder Build">
-<unit bldFile="app/voicerec/voicerecorder/group"/>
-</component>
-</collection>
-<collection name="voicerec_info" long-name="Voice Recorder Apps Info"/>
-</block>
-<block name="screensaver" level="apps" long-name="Screen Saver Apps" levels="plugin ui">
-<!-- is this a user-facing application or a daemon? -->
-<!-- units need to be commented out until configuration is in place. They are currently #included from screensaver_build-->
-<collection name="scrsaver" long-name="Screen Saver" level="plugin">
-<component name="scrsaverplugins" filter="s60" long-name="Screen Saver Plugins" plugin="Y">
-<!-- must have only one component. #include from a common bld.inf, or move up a directory and make scrsaverplugins a collection -->
-<!--<unit bldFile="scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/"/>
- <unit bldFile="scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/group/"/>-->
-</component>
-<component name="scrsaver_slideshowplugin" filter="s60" long-name="Screen Saver Slideshow Plugin" plugin="Y">
-<!--<unit bldFile="scrsaver/scrsaverplugins/SlideshowPlugin/group"/> -->
-</component>
-<component name="screensaveraiwplugin" filter="s60" long-name="Screen Saver AIW Plugin" plugin="Y">
-<!-- <unit bldFile="scrsaver/screensaveraiwplugin/group"/>-->
-</component>
-</collection>
-<collection name="screensaver_info" long-name="Screen Saver Apps Info" level="ui">
-<component name="screensaver_build" filter="s60" long-name="Screen Saver Application">
-<!--the app should be a separate component -->
-<unit bldFile="app/screensaver/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreen" level="apps" long-name="Home Screen Apps" levels="fw support apps">
-<collection name="homescreen_plat" long-name="Home Screen Apps Platform Interfaces" level="apps">
-<component name="menu_settings_api" long-name="Menu Settings API" filter="s60" class="api">
-<unit bldFile="app/homescreen/homescreen_plat/menu_settings_api/group"/>
-</component>
-<component name="hs_content_control_ui" long-name="HS Content Control Ui" filter="s60" class="api">
-<unit bldFile="app/homescreen/homescreen_plat/hs_content_control_ui/group"/>
-</component>
-<component name="hs_renderingplugin_api" long-name="HS Rendering Plugin API" filter="s60" class="api">
-<unit bldFile="app/homescreen/homescreen_plat/hs_renderingplugin_api/group"/>
-</component>
-</collection>
-<collection name="idlehomescreen" long-name="Idle Home Screen" level="apps">
-<component name="nativeuicontroller" filter="s60" long-name="Native UI Controller">
-<unit bldFile="app/homescreen/idlehomescreen/nativeuicontroller/group"/>
-</component>
-<component name="exths" filter="s60" long-name="Active Idle Container" plugin="Y">
-<!-- why is the ID so different from the name? Is one wrong? -->
-<unit bldFile="app/homescreen/idlehomescreen/exths/group"/>
-</component>
-<component name="hscontentcontrol" filter="s60" long-name="Home Screen Content Control" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/hscontentcontrol/group"/>
-</component>
-<component name="hssapiwrapper" filter="s60" long-name="HS SAPI Wrapper" introduced="^3">
-<!-- can only have one unit. #include from a common bld.inf, or split into two components -->
-<unit bldFile="app/homescreen/idlehomescreen/sapiwrapper/cpswrapper/group"/>
-<unit bldFile="app/homescreen/idlehomescreen/sapiwrapper/hspswrapper/group"/>
-</component>
-<component name="xmluirendering" filter="s60" long-name="XML UI Rendering" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/xmluirendering/group"/>
-</component>
-<component name="xmluicontroller" filter="s60" long-name="XML UI Controller" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/xmluicontroller/group"/>
-</component>
-<component name="widgetmanager" filter="s60" long-name="Widget Manager" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/widgetmanager/group"/>
-</component>
-<component name="idlehomescreen_help" filter="s60" long-name="Idle Home Screen Help">
-<unit bldFile="app/homescreen/idlehomescreen/help/group"/>
-</component>
-<component name="idlehomescreen_data" filter="s60" long-name="Idle Home Screen Data">
-<unit bldFile="app/homescreen/idlehomescreen/data/group"/>
-</component>
-<component name="idlehomescreen_build" filter="s60" long-name="Idle Home Screen Build">
-<!-- can the loc file be moved to another comopnent and this one removed? -->
-<unit bldFile="app/homescreen/idlehomescreen/group"/>
-</component>
-</collection>
-<collection name="menufw" long-name="Menu Framework" level="fw">
-<component name="hierarchynavigator" filter="s60" long-name="Hierarchy Navigator">
-<unit bldFile="app/homescreen/menufw/hierarchynavigator/group"/>
-</component>
-<component name="menufwui" filter="s60" long-name="Menu Framework UI">
-<unit bldFile="app/homescreen/menufw/menufwui/group"/>
-</component>
-<component name="menusuites" filter="s60" long-name="Menu Suites">
-<unit bldFile="app/homescreen/menufw/menusuites/group"/>
-</component>
-<component name="menufw_build" filter="s60" long-name="Menu Framework Build">
-<!-- can the exports be exported by the other components? -->
-<unit bldFile="app/homescreen/menufw/group"/>
-</component>
-</collection>
-<collection name="taskswitcher" long-name="Task Switcher" level="support">
-<component name="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">
-<unit bldFile="app/homescreen/taskswitcher/taskswitcherui/group"/>
-</component>
-</collection>
-</block>
-<block name="graphicsuis" level="services" long-name="Graphics UIs" levels="util ui">
-<collection name="graphicsuis_plat" long-name="Graphics UIs Platform Interfaces" level="ui">
-<component name="svgt_viewer_ui_api" long-name="SVG-T Viewer UI API" filter="s60" class="api">
-<unit bldFile="app/graphicsuis/graphicsuis_plat/svgt_viewer_ui_api/group"/>
-</component>
-<component name="svg_application_observer_utility_api" long-name="SVG Application Observer Utility API" filter="s60" class="api">
-<unit bldFile="app/graphicsuis/graphicsuis_plat/svg_application_observer_utility_api/group"/>
-</component>
-<component name="svgt_file_view_details_dialog_api" long-name="SVG-T File View Details Dialog API" filter="s60" class="api">
-<unit bldFile="app/graphicsuis/graphicsuis_plat/svgt_file_view_details_dialog_api/group"/>
-</component>
-</collection>
-<collection name="svgtviewer" long-name="SVG-T Viewer" level="ui">
-<component name="svgtviewerplugin" filter="s60" long-name="SVG-T Viewer Plugin">
-<unit bldFile="app/graphicsuis/svgtviewer/svgtviewerplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="profile" level="apps" long-name="Profiles" levels="app">
-<collection name="profile_plat" long-name="Profiles Platform Interfaces" level="app">
-<component name="profiles_settings_view_api" long-name="Profiles Settings View API" filter="s60" class="api">
-<unit bldFile="app/profile/profile_plat/profiles_settings_view_api/group"/>
-</component>
-</collection>
-<collection name="profilesapplication" long-name="Profiles Application" level="app">
-<component name="profiles" filter="s60" long-name="Profiles">
-<unit bldFile="app/profile/profilesapplication/profiles/group"/>
-</component>
-</collection>
-<collection name="profile_info" long-name="Profiles Info" level="app">
-<component name="profile_help" filter="s60" long-name="Profiles Help">
-<unit bldFile="app/profile/help/group"/>
-</component>
-</collection>
-</block>
-<block name="speechsrv" level="services" long-name="Speech Recognition UIs" levels="engine framework ui">
-<collection name="speechsrv_plat" long-name="Speech Recognition UIs Platform Interfaces" level="ui">
-<component name="vas_api" long-name="VAS API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vas_api/group"/>
-</component>
-<component name="nss_devasr_api" long-name="NSS DevASR API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_devasr_api/group"/>
-</component>
-<component name="tts_hw_device_api" long-name="TTS HW Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/tts_hw_device_api/group"/>
-</component>
-<component name="voice_commands_resource_header_api" long-name="Voice Commands Resource Header API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/voice_commands_resource_header_api/group"/>
-</component>
-<component name="nss_mmf_tts_custom_commands_api" long-name="NSS MMF TTS Custom Commands API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_mmf_tts_custom_commands_api/group"/>
-</component>
-<component name="srsf_cenrep_settings_api" long-name="SRSF CenRep Settings API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/srsf_cenrep_settings_api/group"/>
-</component>
-<component name="voice_ui_plugin_api" long-name="Voice UI Plug-in API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/voice_ui_plugin_api/group"/>
-</component>
-<component name="nss_tts_utility_api" long-name="NSS TTS Utility API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_tts_utility_api/group"/>
-</component>
-<component name="nss_srs_custom_commands_api" long-name="NSS SRS Custom Commands API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_srs_custom_commands_api/group"/>
-</component>
-<component name="srsf_secondarydisplay_api" long-name="SRSF Secondary Display API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/srsf_secondarydisplay_api/group"/>
-</component>
-<component name="asrs_hw_device_api" long-name="ASRS Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/asrs_hw_device_api/group"/>
-</component>
-<component name="vas_vcommand_api" long-name="VAS Voice Command API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vas_vcommand_api/group"/>
-</component>
-<component name="adaptation_hw_device_api" long-name="Adaptation Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/adaptation_hw_device_api/group"/>
-</component>
-<component name="nss_devtts_api" long-name="NSS DevTTS API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_devtts_api/group"/>
-</component>
-<component name="nss_srs_utility_api" long-name="NSS SRS Utility API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_srs_utility_api/group"/>
-</component>
-<component name="recognition_hw_device_api" long-name="Recognition Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/recognition_hw_device_api/group"/>
-</component>
-<component name="vas_contact_handler_api" long-name="VAS Contact Handler API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vas_contact_handler_api/group"/>
-</component>
-<component name="nlp_hw_device" long-name="NLP Hardware Device" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nlp_hw_device/group"/>
-</component>
-<component name="nss_si_speech_recognition_data_api" long-name="NSS SI Speech Recognition Data API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_si_speech_recognition_data_api/group"/>
-</component>
-<component name="nss_tts_common_api" long-name="NSS TTS Common API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_tts_common_api/group"/>
-</component>
-<component name="grcompiler_hw_device_api" long-name="Grammar Compiler Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/grcompiler_hw_device_api/group"/>
-</component>
-<component name="ttp_hw_device_api" long-name="TTP Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/ttp_hw_device_api/group"/>
-</component>
-<component name="vocman_hw_device_api" long-name="VocMan Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vocman_hw_device_api/group"/>
-</component>
-<component name="speech_synthesis_clientserver_api" long-name="Speech Synthesis Client-Server API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/speech_synthesis_clientserver_api/group"/>
-</component>
-<component name="voice_ui_accessory_button_handling_api" long-name="Voice UI Accessory Button Handling API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/voice_ui_accessory_button_handling_api/group"/>
-</component>
-<component name="ui_voice_recognition_api" long-name="UI Voice Recognition API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/ui_voice_recognition_api/group"/>
-</component>
-<component name="vcommand_settings_cenrep_api" long-name="Voice Command Settings CenRep API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vcommand_settings_cenrep_api/group"/>
-</component>
-</collection>
-<collection name="voiceui" long-name="Voice UI" level="ui">
-<component name="vcommand" filter="s60" long-name="Voice Commands UI" introduced="^1">
-<unit bldFile="app/speechsrv/voiceui/vcommand/group"/>
-</component>
-<component name="voiceuivoicerecognition" filter="s60" long-name="Voice UI Recognition" introduced="^1">
-<unit bldFile="app/speechsrv/voiceui/voiceuivoicerecognition/group"/>
-</component>
-<component name="pbkinfoviewimpl" filter="s60" long-name="Phonebook Info View Implementation" introduced="^1">
-<unit bldFile="app/speechsrv/voiceui/pbkinfoviewimpl/group"/>
-</component>
-<component name="aiwpbkinfoviewprovider" filter="s60" long-name="AIW Phonebook Info View Provider" introduced="^1" plugin="Y">
-<unit bldFile="app/speechsrv/voiceui/aiwpbkinfoviewprovider/group"/>
-</component>
-<component name="vccontrolpanelplugin" filter="s60" long-name="Voice Commands Control Panel Plugin" introduced="^1" plugin="Y">
-<!-- component is commented out until configuration is in place. Currently #included from voiceui_build -->
-<!--<unit bldFile="voiceui/vccontrolpanelplugin/group"/>-->
-</component>
-<component name="voiceui_build" filter="s60" long-name="Voice UI Build" introduced="^1">
-<!-- can this be put into the other components? -->
-<unit bldFile="app/speechsrv/voiceui/group"/>
-</component>
-</collection>
-<collection name="srsf" long-name="Speech Recognition and Synthesis Framework" level="framework">
-<component name="sispeechrecognitiondata" filter="s60" long-name="SI Speech Recognition Data">
-<unit bldFile="app/speechsrv/srsf/sispeechrecognitiondata/group"/>
-</component>
-<component name="ttscommon" filter="s60" long-name="TTS Common">
-<unit bldFile="app/speechsrv/srsf/ttscommon/group"/>
-</component>
-<component name="devtts" filter="s60" long-name="Text to Speech">
-<unit bldFile="app/speechsrv/srsf/devtts/group"/>
-</component>
-<component name="ttscustomcommands" filter="s60" long-name="TTS Custom Commands">
-<unit bldFile="app/speechsrv/srsf/ttscustomcommands/group"/>
-</component>
-<component name="ttscontrollerplugin" filter="s60" long-name="TTS Controller Plugin" plugin="Y">
-<unit bldFile="app/speechsrv/srsf/ttscontrollerplugin/group"/>
-</component>
-<component name="ttsutility" filter="s60" long-name="TTS Utility">
-<unit bldFile="app/speechsrv/srsf/ttsutility/group"/>
-</component>
-<component name="speechsynthesis" filter="s60" long-name="Speech Synthesis">
-<!-- can only have one unit. #include these from a common bld.inf -->
-<unit bldFile="app/speechsrv/srsf/speechsynthesis/client/group"/>
-<unit bldFile="app/speechsrv/srsf/speechsynthesis/server/group"/>
-</component>
-<component name="devasr" filter="s60" long-name="Audio Recording and Speech Recognition">
-<unit bldFile="app/speechsrv/srsf/devasr/group"/>
-</component>
-<component name="sicc" filter="s60" long-name="Speaker Independent Custom Commands">
-<unit bldFile="app/speechsrv/srsf/sicc/group"/>
-</component>
-<component name="sisrscontrollerplugin" filter="s60" long-name="SI SRS Controller Plugin" plugin="Y">
-<unit bldFile="app/speechsrv/srsf/sisrscontrollerplugin/group"/>
-</component>
-<component name="siutility" filter="s60" long-name="Speaker Independent Utility">
-<unit bldFile="app/speechsrv/srsf/siutility/group"/>
-</component>
-<component name="nssvasapi" filter="s60" long-name="NSS VAS API">
-<unit bldFile="app/speechsrv/srsf/nssvasapi/group"/>
-</component>
-<component name="nssvascontacthdlr" filter="s60" long-name="NSS VAS Contact Handler">
-<unit bldFile="app/speechsrv/srsf/nssvascontacthdlr/group"/>
-</component>
-<component name="vcommandhandler" filter="s60" long-name="Voice Command Handler">
-<unit bldFile="app/speechsrv/srsf/vcommandhandler/group"/>
-</component>
-<component name="vuiphandler" filter="s60" long-name="Voice UI Plugin Handler">
-<unit bldFile="app/speechsrv/srsf/vuiphandler/group"/>
-</component>
-<component name="vcommandexecutor" filter="s60" long-name="Voice Command Executor">
-<unit bldFile="app/speechsrv/srsf/vcommandexecutor/group"/>
-</component>
-<component name="vcommandexecutorbearer" filter="s60" long-name="Voice Command Executor Bearer">
-<unit bldFile="app/speechsrv/srsf/vcommandexecutorbearer/group"/>
-</component>
-<component name="vcommandmanager" filter="s60" long-name="Voice Command Manager">
-<unit bldFile="app/speechsrv/srsf/vcommandmanager/group"/>
-</component>
-<component name="vcexecutorapp" filter="s60" long-name="Voice Command Executor Application">
-<unit bldFile="app/speechsrv/srsf/vcexecutorapp/group"/>
-</component>
-<component name="profileobserverplugin" filter="s60" long-name="Profile Observer Plugin" plugin="Y">
-<unit bldFile="app/speechsrv/srsf/profileobserverplugin/group"/>
-</component>
-<component name="srsf_build" filter="s60" long-name="Speech Recognition and Synthesis Framework Build">
-<!-- should distribute this into the above components -->
-<unit bldFile="app/speechsrv/srsf/group"/>
-</component>
-</collection>
-<collection name="speechsrv_info" long-name="Speech Recognition UIs Info" level="ui"/>
-</block>
-<block name="homescreentools" level="services" long-name="Home Screen Tools" levels="tool install">
-<collection name="dtdinstaller" long-name="DTD Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<!-- this needs to be built first, does build order need to be forced with filters? -->
-<component name="dtdinstaller_build" filter="s60" long-name="DTD Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/dtdinstaller/group"/>
-</component>
-</collection>
-<collection name="themeinstaller" long-name="Theme Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="themeinstaller_build" filter="s60" long-name="Theme Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/themeinstaller/group"/>
-</component>
-</collection>
-<collection name="widgettools" long-name="Widget Tools" level="install">
-<component name="hspluginpreinstaller" filter="s60" long-name="HS Plugin Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/hspluginspreinstaller/group"/>
-</component>
-<component name="wrtwidgetpreinstaller" filter="s60" long-name="WRT Widget Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
-</component>
-</collection>
-</block>
-<block name="webuis" level="services" long-name="Web UIs" levels="plugin app">
-<collection name="browserui" long-name="Browser UI" level="app">
-<component name="browser" filter="s60" long-name="Browser">
-<unit bldFile="app/webuis/browserui/browser/group"/>
-</component>
-<component name="operatormenu" filter="s60" long-name="Browser Operator Menu">
-<unit bldFile="app/webuis/browserui/operatormenu/group"/>
-</component>
-<component name="videoservices" filter="s60" long-name="Browser Video Services">
-<unit bldFile="app/webuis/browserui/videoservices/group"/>
-</component>
-</collection>
-<collection name="browserplugins" long-name="Browser Plugins" level="plugin">
-<component name="browsersysteminfoplugin" filter="s60" long-name="Browser System Info Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsersysteminfoplugin/group"/>-->
-</component>
-<component name="browsergpsplugin" filter="s60" long-name="Browser GPS Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsergpsplugin/group"/>-->
-</component>
-<component name="browseraudiovideoplugin" filter="s60" long-name="Browser Audio Video Plugin" plugin="Y">
-<unit bldFile="app/webuis/browserplugins/browseraudiovideoplugin/group"/>
-</component>
-<component name="browserplugins_build" filter="s60" long-name="Browser Plugins Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="app/webuis/browserplugins/group"/>
-</component>
-</collection>
-<collection name="pushmtm" long-name="Push MTM" level="plugin">
-<component name="pushmtm_help" filter="s60" long-name="Push MTM Help">
-<unit bldFile="app/webuis/pushmtm/help/group"/>
-</component>
-<component name="plugins" filter="s60" long-name="Push MTM Plugins" plugin="Y">
-<unit bldFile="app/webuis/pushmtm/plugins/group"/>
-</component>
-<component name="pushmtm_build" filter="s60" long-name="Push MTM Build">
-<!-- Some content is at collection level and some is at comopnent level. Either make this a single
- component and move it down a diretcory, or make separate independent components in this collection -->
-<unit bldFile="app/webuis/pushmtm/group"/>
-</component>
-</collection>
-</block>
-<block name="jrt" level="services" long-name="Java Runtime" levels="util generic rt ui">
-<collection name="jrt_plat" long-name="JRT Platform Interfaces" level="ui">
-<component name="java_registry_api" long-name="Java Registry API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_registry_api/build"/>
-</component>
-<component name="java_env_info_api" long-name="Java Environment Info API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_env_info_api/build"/>
-</component>
-<component name="java_debug_api" long-name="Java Debug API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_debug_api/build"/>
-</component>
-</collection>
-<collection name="java_stubs" long-name="Java Stubs" level="util">
-<component name="java_stubs_build" filter="s60" long-name="JRT Stubs Build">
-<unit bldFile="app/jrt/java_stubs/group"/>
-</component>
-</collection>
-</block>
-<block name="conntools" level="services" long-name="Connectivity Tools" levels="config app">
-<collection name="nettools" long-name="Net Tools" level="app">
-<component name="conntest" filter="s60" long-name="Connection Test" purpose="development">
-<unit bldFile="app/conntools/nettools/conntest/group"/>
-</component>
-</collection>
-<collection name="emulatorlan" long-name="Emulator LAN" level="config">
-<!-- component is actually a colleciton, should be moved down a directory -->
-<component name="emulatorlan_build" filter="s60" long-name="Emulator LAN Build" purpose="development" class="config">
-<unit bldFile="app/conntools/emulatorlan/group"/>
-</component>
-</collection>
-</block>
-<block name="rndtools" level="services"/>
-<block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools if ui">
-<collection name="csxhelp" long-name="Context Sensitive Extended Help" level="if">
-<!-- this is really a component. Should move it down a directory -->
-<component name="csxhelp_build" filter="s60" long-name="Context Sensitive Extended Help Build">
-<unit bldFile="app/helps/csxhelp/group"/>
-</component>
-</collection>
-<collection name="symhelp" long-name="Symbian Help" level="eng">
-<component name="helpmodel" long-name="Help" introduced="6.0" purpose="optional">
-<unit bldFile="app/helps/symhelp/helpmodel/group" mrp="app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
-</component>
-</collection>
-<collection name="helps_info" long-name="Help Apps Info" level="ui">
-<component name="helps_metadata" long-name="Help Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/helps/helps_info/helps_metadata/helps_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
-<collection name="buildverification" long-name="Build Verification" level="services">
-<component name="autosmoketest" long-name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
-<unit bldFile="app/techview/buildverification/autosmoketest/Group" mrp="app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
-</component>
-<component name="smoketest" long-name="Smoke Test" filter="gt" purpose="development">
-<unit bldFile="app/techview/buildverification/smoketest/Group" mrp="app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
-</component>
-</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="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"/>
-<collection name="installationapps" long-name="Installation Apps" level="apps2"/>
-<collection name="messagingapps" long-name="Messaging Apps" level="apps2"/>
-<collection name="telephonyapps" long-name="Telephony Apps" level="apps1"/>
-<collection name="networkingapps" long-name="Networking Apps" level="apps1"/>
-<collection name="networkingutils" long-name="Networking Utils" level="utils"/>
-<collection name="shortlinkapps" long-name="Shortlink Apps" level="apps1"/>
-<collection name="testapps" long-name="Test Apps" level="utils"/>
-<collection name="avapps" long-name="A/V Apps" level="apps3"/>
-<collection name="toolkit" long-name="Toolkit" level="utils"/>
-<collection name="techview_info" long-name="Techview Info" level="apps3">
-<component name="techview_metadata" long-name="Techview Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/techview/techview_info/techview_metadata/techview_metadata.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
--- a/symbian3/single/sysdefs/auto/model_20100504180744_d492ced65292.xml Wed May 05 12:21:47 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10692 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a package or prebuilt -->
-<!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) "N"
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile may someday be removed in favour of mrp -->
-<!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
-<systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="low mw high">
-<block name="stubs" level="high" long-name="Stubs" levels="stub">
-<collection name="s60_stubs" level="stub">
-<component name="audiostubs" long-name="Audio Stubs">
-<unit bldFile="adaptation/stubs/audiostubs/group"/>
-</component>
-<component name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaptation Stub">
-<unit bldFile="adaptation/stubs/btaudioadaptation_stub/group"/>
-</component>
-<component name="drm_stubs" long-name="DRM Stubs">
-<unit bldFile="adaptation/stubs/drm_stubs/group"/>
-</component>
-<component name="ocrsrv_stub" long-name="OCR Services Stub">
-<unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
-</component>
-<component name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation">
-<unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
-</component>
-<component name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" plugin="Y">
-<unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
-</component>
-<component name="srsfenginestub" long-name="SRSF Engine Stub">
-<unit bldFile="adaptation/stubs/srsfenginestub/group"/>
-</component>
-<component name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub">
-<unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
-</component>
-<component name="systemswstubs" long-name="System Software Stubs">
-<unit bldFile="adaptation/stubs/systemswstubs/group"/>
-</component>
-<component name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" plugin="Y">
-<unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
-</component>
-<component name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub">
-<unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
-<collection name="omap3530" long-name="OMAP 3530" level="hw-if">
-<component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530" mrp="adaptation/beagleboard/omap3530/base_beagle.mrp"/>
-</component>
-<component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/kernel"/>
-</component>
-<component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/beagleboard"/>
-</component>
-</collection>
-</block>
-<block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
-<collection name="qemu_baseport" long-name="Baseport" level="hw-if">
-<component name="syborg" long-name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/qemu/baseport/syborg" mrp="adaptation/qemu/baseport/syborg/syborg.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
-<collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
-<component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
-<unit mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
-</component>
-</collection>
-<collection name="bsptemplate" long-name="Board Support Package Template" level="hw-if">
-<component name="asspandvariant" long-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 name="kernel" long-name="Kernel Architecture" level="adaptation">
-<component name="eka" long-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 name="kerneltest" long-name="Kernel Test" level="hw-if">
-<component name="e32utils" long-name="E32 Utilities" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32utils/group" mrp="os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/>
-</component>
-<component name="e32test" long-name="E32 Tests" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32test/group" mrp="os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
-</component>
-<component name="f32test" long-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 name="ldds" long-name="Logical Device Drivers" level="adaptation">
-<component name="ethernetldd" long-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 name="audioldd" long-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>
-<component name="serialldd" long-name="Serial Port Drivers" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
-</component>
-<component name="legacydrivers" long-name="Legacy Drivers" purpose="optional">
-<unit mrp="os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
-</component>
-<component name="locmedia" long-name="Local Media Subsystem" introduced="8.1b" purpose="mandatory">
-<!-- these are LDDs for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
-</component>
-<component name="runmodedebugger" long-name="Run Mode Debugger" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/debug/group" mrp="os/kernelhwsrv/kernel/eka/drivers/debug/group/base_e32_drivers_debug.mrp"/>
-</component>
-<component name="btrace" long-name="Kernel Trace Tool" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/trace" mrp="os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
-</component>
-<component name="cameraldd" long-name="Camera Drivers" introduced="^3" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/camerasc" mrp="os/kernelhwsrv/kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
-</component>
-<component name="displayldd" long-name="Display Drivers" introduced="^3" purpose="optional">
-<!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/display" mrp="os/kernelhwsrv/kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
-</component>
-<component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
-</component>
-</collection>
-<collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
-<component name="mediadrivers" long-name="Media Drivers" purpose="optional">
-<!-- these are for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/media" mrp="os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
-</component>
-<component name="genericboardsupport" long-name="Generic Board Support" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
-</component>
-</collection>
-<collection name="userlibandfileserver" long-name="User Library and File Server" level="framework">
-<component name="euser" long-name="User Library" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/euser" mrp="os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
-</component>
-<component name="compsupp" long-name="Compiler Runtime Support" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/compsupp" mrp="os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
-</component>
-<component name="fileserver" long-name="File Server" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
-</component>
-<component name="estart" long-name="Base Starter" filter="gt" purpose="optional">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
-</component>
-<component name="domainmgr" long-name="Domain Manager" introduced="8.1b" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
-</component>
-</collection>
-<collection name="filesystems" long-name="File Systems" level="framework">
-<component name="romfs" long-name="ROM File System" filter="gt" purpose="optional" plugin="Y">
-<unit mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
-</component>
-<component name="rofs" long-name="ROFS" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
-</component>
-<component name="usbmsfs" long-name="USB Mass Storage File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
-</component>
-<component name="usbhostmssrv" long-name="USB Host Mass Storage Server" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage/base_f32_shostmassstorage.mrp"/>
-</component>
-<component name="fat32fs" long-name="FAT32 File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
-</component>
-<component name="fatfs" long-name="FAT File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
-</component>
-<component name="compfs" long-name="Composite File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
-</component>
-</collection>
-<collection name="halservices" long-name="HAL Services" level="framework">
-<component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
-<unit bldFile="os/kernelhwsrv/halservices/hal" mrp="os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
-</component>
-</collection>
-<collection name="textmodeshell" long-name="Text Mode Shell" level="test">
-<component name="e32wsrv" long-name="Text Window Server" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/ewsrv" mrp="os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
-</component>
-<component name="textshell" long-name="Text Shell" filter="gt" purpose="development">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
-</component>
-</collection>
-<collection name="baseapitest" long-name="Base API Tests" level="test"/>
-<collection name="kernelhwsrv_info" long-name="Kernel and Hardware Services Info" level="test">
-<component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 config">
-<collection name="emulator" long-name="Emulator" level="bsp">
-<component name="emulatorbsp" long-name="Emulator BSP" purpose="optional">
-<unit bldFile="os/boardsupport/emulator/emulatorbsp" mrp="os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
-</component>
-</collection>
-<collection name="haitest" long-name="HAI Test Suites" level="test">
-<component name="bspsvs" long-name="BSP Verification Suite" introduced="^2" purpose="development">
-<unit mrp="os/boardsupport/haitest/bspsvs/group/bspsvs.mrp"/>
-</component>
-</collection>
-<collection name="boardsupport_info" long-name="Board Support Info" level="config">
-<component name="boardsupport_metadata" long-name="Board Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/boardsupport/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
-<collection name="bldsystemtools" long-name="Build System Tools" level="bld">
-<component name="sysdeftools" long-name="System Definition Tools" purpose="development" introduced="^2">
-<unit mrp="os/buildtools/bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
-</component>
-<component name="commonbldutils" long-name="Common Utils" purpose="development">
-<unit mrp="os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
-</component>
-</collection>
-<collection name="toolsandutils" long-name="Tools and Utils" level="mw">
-<component name="productionbldtools" long-name="Production Build Tools" filter="gt" purpose="development">
-<unit mrp="os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
-</component>
-<component name="e32tools" long-name="E32 Tools" deprecated="^2" purpose="development" class="PC">
-<unit bldFile="os/buildtools/toolsandutils/e32tools/group" mrp="os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
-</component>
-<component name="autotest" long-name="Autotest" purpose="development">
-<unit bldFile="os/buildtools/toolsandutils/autotest/group" mrp="os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
-</component>
-</collection>
-<collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
-<component name="e32toolp" long-name="E32 Perl Tools" purpose="development" filter="sf_build" class="PC">
-<unit mrp="os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="os/buildtools/sbsv1_os/e32toolp/group"/>
-</component>
-</collection>
-<collection name="imgtools_os" long-name="Image Tools" level="fw">
-<component name="romkiteka2" long-name="ROMKIT EKA2" deprecated="^2" purpose="development">
-<unit bldFile="os/buildtools/imgtools_os/romkiteka2/group" mrp="os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
-</component>
-</collection>
-<collection name="misccomponents" long-name="Misc Components" level="mw">
-<component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt" purpose="development">
-<unit bldFile="os/buildtools/misccomponents/emulatorlauncher/group" mrp="os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
-</component>
-</collection>
-<collection name="buildtools_info" long-name="Build Tools Info" level="ui">
-<component name="buildtools_metadata" long-name="Build Tools Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/buildtools/buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
-<collection name="ossrv_pub" long-name="Generic OS Services Public Interfaces" level="utilities">
-<component name="boost_apis" long-name="Boost APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/boost_apis/group"/>
-</component>
-<component name="cpp_wrappers" long-name="Cpp wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cpp_wrappers/group"/>
-</component>
-<component name="character_type_apis" long-name="Character Type APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/character_type_apis/group"/>
-</component>
-<component name="compiler_specific_runtime_support" long-name="Compiler Specific Runtime Support" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/compiler_specific_runtime_support/group"/>
-</component>
-<component name="ossrv_configuration_api" long-name="Generic OS Services Configuration API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/configuration/group"/>
-</component>
-<component name="crypto_authentication_codes_and_hash_functions_api" long-name="Crypto Authentication Codes and Hash Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
-</component>
-<component name="crypto_auxillary_functions_api" long-name="Crypto Auxillary Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_auxillary_functions_api/group"/>
-</component>
-<component name="crypto_certificates_api" long-name="Crypto Certificates API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_certificates_api/group"/>
-</component>
-<component name="crypto_inputoutput_and_data_encoding_api" long-name="Crypto Input/Output and Data Encoding API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
-</component>
-<component name="crypto_public_key_cryptography_and_key_agreement_api" long-name="Crypto Public Key Cryptography and Key Agreement API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
-</component>
-<component name="crypto_symmetric_ciphers_api" long-name="Crypto Symmetric Ciphers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_symmetric_ciphers_api/group"/>
-</component>
-<component name="crypto_utility_functions_api" long-name="Crypto Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_utility_functions_api/group"/>
-</component>
-<component name="cryptogaphy_related_api" long-name="Cryptogaphy Related API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cryptogaphy_related_api/group"/>
-</component>
-<component name="ossrv_debug_api" long-name="Generic OS Services Debug API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/debug/group"/>
-</component>
-<component name="ossrv_exceptions_api" long-name="Generic OS Services Exceptions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/exceptions/group"/>
-</component>
-<component name="gboxed" long-name="GBoxed API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gboxed/group"/>
-</component>
-<component name="glib_arrays" long-name="Glib Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_arrays/group"/>
-</component>
-<component name="glib_asynchronous_queues" long-name="Glib Asynchronous Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_asynchronous_queues/group"/>
-</component>
-<component name="glib_atomic_operations" long-name="Glib Atomic Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_atomic_operations/group"/>
-</component>
-<component name="glib_automatic_string_completion" long-name="Glib Automatic String Completion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_automatic_string_completion/group"/>
-</component>
-<component name="glib_balanced_binary_trees" long-name="Glib Balanced Binary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_balanced_binary_trees/group"/>
-</component>
-<component name="glib_basic_types" long-name="Glib Basic Types API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_basic_types/group"/>
-</component>
-<component name="glib_caches" long-name="Glib Caches API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_caches/group"/>
-</component>
-<component name="glib_character_set_conversion" long-name="Glib Character Set Conversion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_character_set_conversion/group"/>
-</component>
-<component name="glib_closures" long-name="Glib Closures API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_closures/group"/>
-</component>
-<component name="glib_commandline_option_parser" long-name="Glib Command Line Option Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_commandline_option_parser/group"/>
-</component>
-<component name="glib_datasets" long-name="Glib Datasets API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_datasets/group"/>
-</component>
-<component name="glib_date_and_time_functions" long-name="Glib Date and Time Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_date_and_time_functions/group"/>
-</component>
-<component name="glib_doubleended_queues" long-name="Glib Double-ended Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doubleended_queues/group"/>
-</component>
-<component name="glib_doublylinked_lists" long-name="Glib Doubly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doublylinked_lists/group"/>
-</component>
-<component name="glib_dynamic_loading_of_modules" long-name="Glib Dynamic Loading of Modules API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_dynamic_loading_of_modules/group"/>
-</component>
-<component name="glib_enums_and_flags" long-name="Glib Enums and Flags API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_enums_and_flags/group"/>
-</component>
-<component name="glib_error_reporting" long-name="Glib Error Reporting API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_error_reporting/group"/>
-</component>
-<component name="glib_file_utilities" long-name="Glib File Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_file_utilities/group"/>
-</component>
-<component name="glib_generic_values" long-name="Glib Generic Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_generic_values/group"/>
-</component>
-<component name="glib_globstyle_pattern_matching" long-name="Glib Glob-Style Pattern Matching API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_globstyle_pattern_matching/group"/>
-</component>
-<component name="glib_hash_tables" long-name="Glib Hash Tables API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hash_tables/group"/>
-</component>
-<component name="glib_hook_functions" long-name="Glib Hook Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hook_functions/group"/>
-</component>
-<component name="glib_internationalization" long-name="Glib Internationalization API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_internationalization/group"/>
-</component>
-<component name="glib_io_channels" long-name="Glib I/O Channels API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_io_channels/group"/>
-</component>
-<component name="glib_keyvalue_file_parser" long-name="Glib Key-Value File Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_keyvalue_file_parser/group"/>
-</component>
-<component name="glib_lexical_scanner" long-name="Glib Lexical Scanner API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_lexical_scanner/group"/>
-</component>
-<component name="glib_main_event_loop" long-name="Glib Main Event Loop API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_main_event_loop/group"/>
-</component>
-<component name="glib_memory_allocation" long-name="Glib Memory Allocation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_allocation/group"/>
-</component>
-<component name="glib_memory_slices" long-name="Glib Memory Slices API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_slices/group"/>
-</component>
-<component name="glib_message_logging" long-name="Glib Message Logging API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_message_logging/group"/>
-</component>
-<component name="glib_miscellaneous_utility_functions" long-name="Glib Miscellaneous Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_miscellaneous_utility_functions/group"/>
-</component>
-<component name="glib_nary_trees" long-name="Glib N-ary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_nary_trees/group"/>
-</component>
-<component name="glib_parameters_and_values" long-name="Glib Parameters and Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_parameters_and_values/group"/>
-</component>
-<component name="glib_quarks" long-name="Glib Quarks API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_quarks/group"/>
-</component>
-<component name="glib_random_numbers" long-name="Glib Random Numbers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_random_numbers/group"/>
-</component>
-<component name="glib_relations_and_tuples" long-name="Glib Relations and Tuples API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_relations_and_tuples/group"/>
-</component>
-<component name="glib_shellrelated_utilities" long-name="Glib Shell-related Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_shellrelated_utilities/group"/>
-</component>
-<component name="glib_signals" long-name="Glib Signals API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_signals/group"/>
-</component>
-<component name="glib_simple_xml_subset_parser" long-name="Glib Simple XML Subset Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_simple_xml_subset_parser/group"/>
-</component>
-<component name="glib_singlylinked_lists" long-name="Glib Singly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_singlylinked_lists/group"/>
-</component>
-<component name="glib_spawning_processes" long-name="Glib Spawning Processes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_spawning_processes/group"/>
-</component>
-<component name="glib_standard_macros" long-name="Glib Standard Macros API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_standard_macros/group"/>
-</component>
-<component name="glib_string_utility_functions" long-name="Glib String Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_string_utility_functions/group"/>
-</component>
-<component name="glib_strings" long-name="Glib Strings API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_strings/group"/>
-</component>
-<component name="glib_thread_pools" long-name="Glib Thread Pools API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_thread_pools/group"/>
-</component>
-<component name="glib_threads" long-name="Glib Threads API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_threads/group"/>
-</component>
-<component name="glib_timers" long-name="Glib Timers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_timers/group"/>
-</component>
-<component name="glib_unicode_manipulation" long-name="Glib Unicode Manipulation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_unicode_manipulation/group"/>
-</component>
-<component name="glib_value_arrays" long-name="Glib Value Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_value_arrays/group"/>
-</component>
-<component name="glib_varargs_value_collection" long-name="Glib Varargs Value Collection API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_varargs_value_collection/group"/>
-</component>
-<component name="gobject" long-name="GObject API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gobject/group"/>
-</component>
-<component name="gparamspec" long-name="GParamSpec API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gparamspec/group"/>
-</component>
-<component name="gtype" long-name="GType API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtype/group"/>
-</component>
-<component name="gtypemodule" long-name="GTypeModule API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypemodule/group"/>
-</component>
-<component name="gtypeplugin" long-name="GTypePlugin API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypeplugin/group"/>
-</component>
-<component name="io_stream_api" long-name="I/O stream API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/io_stream_api/group"/>
-</component>
-<component name="localization_function_api" long-name="Localization Function API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/localization_function_api/group"/>
-</component>
-<component name="math_operations_api" long-name="Math Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/math_operations_api/group"/>
-</component>
-<component name="ossrv_memory_api" long-name="Generic OS Services Memory API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/memory/group"/>
-</component>
-<component name="no_namespace_headers" long-name="No Namespace Headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/no_namespace_headers/group"/>
-</component>
-<component name="openc_headers" long-name="OpenC headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_headers/group"/>
-</component>
-<component name="openc_wrappers" long-name="OpenC wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_wrappers/group"/>
-</component>
-<component name="ssl_general_api" long-name="SSL General API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_general_api/group"/>
-</component>
-<component name="ssl_protocol_methods_api" long-name="SSL Protocol Methods API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_protocol_methods_api/group"/>
-</component>
-<component name="standard_compressiondecompression_api" long-name="Standard Compression/Decompression API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/standard_compressiondecompression_api/group"/>
-</component>
-<component name="stl" long-name="STL API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/stl/group"/>
-</component>
-<component name="thread_api" long-name="Thread API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/thread_api/group"/>
-</component>
-<component name="type_attributes" long-name="Type Attributes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/type_attributes/group"/>
-</component>
-<component name="typeinfo" long-name="Type Info API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/typeinfo/group"/>
-</component>
-<component name="utility_apis" long-name="Utility APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/utility_apis/group"/>
-</component>
-<component name="wide_character_classapis" long-name="Wide character class/apis" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/wide_character_classapis/group"/>
-</component>
-<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">
-<unit bldFile="os/ossrv/ossrv_pub/dbus-glib/group"/>
-</component>
-</collection>
-<collection name="ossrv_plat" long-name="Generic OS Services Platform Interfaces" level="utilities">
-<component name="libutils_apis" long-name="Utility Library APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_plat/libutils/group"/>
-</component>
-</collection>
-<collection name="stdlibs" long-name="Standard Libraries" level="translation">
-<component name="libz" filter="s60" long-name="Z Compression Library">
-<unit bldFile="os/ossrv/stdlibs/libz/group"/>
-</component>
-<component name="libcrypt" filter="s60" long-name="Crypt Library">
-<unit bldFile="os/ossrv/stdlibs/libcrypt/group"/>
-</component>
-</collection>
-<collection name="ssl" long-name="SSL" level="data-services">
-<component name="libcrypto" filter="s60" long-name="Crypto Library">
-<unit bldFile="os/ossrv/ssl/libcrypto/group"/>
-</component>
-<component name="libssl" filter="s60" purpose="development" long-name="SSL Library">
-<unit bldFile="os/ossrv/ssl/libssl/group"/>
-</component>
-</collection>
-<collection name="glib" long-name="GLib" level="utilities">
-<component name="glibbackend" filter="s60" long-name="GLib Backend">
-<unit bldFile="os/ossrv/glib/glibbackend/group"/>
-</component>
-<component name="libglib" filter="s60" long-name="GLib Library">
-<unit bldFile="os/ossrv/glib/libglib/group"/>
-</component>
-<component name="libgthread" filter="s60" long-name="Libg Thread">
-<unit bldFile="os/ossrv/glib/libgthread/group"/>
-</component>
-<component name="libgmodule" filter="s60" long-name="Libg Module">
-<unit bldFile="os/ossrv/glib/libgmodule/group"/>
-</component>
-<component name="libgobject" filter="s60" long-name="Libg Object">
-<unit bldFile="os/ossrv/glib/libgobject/group"/>
-</component>
-</collection>
-<collection name="stdcpp" long-name="C++ Standard Library" level="translation">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="stdcpp_build" filter="s60" long-name="Stdcpp">
-<unit bldFile="os/ossrv/stdcpp/group"/>
-</component>
-</collection>
-<collection name="ofdbus" long-name="Open Foundation D-Bus" level="utilities">
-<component name="dbus" filter="s60" long-name="D-Bus">
-<unit bldFile="os/ossrv/ofdbus/dbus/group"/>
-</component>
-<component name="dbus-glib" filter="s60" long-name="D-Bus GLib">
-<unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
-</component>
-<component name="ofdbus_rom" filter="s60" long-name="D-Bus ROM">
-<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory
- Consider moving IBY file to one of the above as well and removing this component entirely -->
-<unit bldFile="os/ossrv/ofdbus/group"/>
-</component>
-</collection>
-<collection name="utilitylibraries" long-name="Utility Libraries" level="encoding">
-<component name="libutils" filter="s60" long-name="Utility Library">
-<unit bldFile="os/ossrv/utilitylibraries/libutils/group"/>
-</component>
-</collection>
-<collection name="genericservices" long-name="Generic Services" level="utilities">
-<component name="s60compatibilityheaders" long-name="S60 Compatibility Headers" filter="gt" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp" version="tb101sf"/>
-</component>
-<component name="mimerecognitionfw" long-name="MIME Recognition Framework" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/mimerecognitionfw/group" mrp="os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
-</component>
-<component name="systemagent" long-name="System Agent" introduced="9.0" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/systemagent/group" mrp="os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
-</component>
-<component name="taskscheduler" long-name="Task Scheduler" introduced="6.0" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/taskscheduler/group" mrp="os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
-</component>
-<component name="activebackupclient" long-name="Active Backup Client" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/activebackupclient/group" mrp="os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
-</component>
-<component name="syslibsdocs" long-name="Syslibs Documentation" purpose="development" class="doc">
-<unit mrp="os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
-</component>
-<component name="httputils" long-name="HTTP Utilities Library" introduced="6.2" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/httputils/group" mrp="os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
-</component>
-</collection>
-<collection name="syslibsapitest" long-name="SysLibs API Tests" level="utilities"/>
-<collection name="compressionlibs" long-name="Compression Libraries" level="data-services">
-<component name="ziplib" long-name="Zip Compression Library" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/ossrv/compressionlibs/ziplib/group" mrp="os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
-</component>
-</collection>
-<collection name="genericopenlibs" long-name="Generic Open Libraries" level="translation">
-<component name="cstdlib" long-name="C Standard Library" introduced="ER5" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/cstdlib/group" mrp="os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
-</component>
-<component name="cppstdlib" long-name="C++ Standard Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/cppstdlib/group" mrp="os/ossrv/genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
-</component>
-<component name="openenvcore" long-name="Open Environment Core" introduced="^2" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/openenvcore/group" mrp="os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
-</component>
-<component name="posixrealtimeextensions" long-name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/posixrealtimeextensions/group" mrp="os/ossrv/genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
-</component>
-</collection>
-<collection name="lowlevellibsandfws" long-name="Low Level Libraries and Frameworks" level="app-libs">
-<component name="pluginfw" long-name="Plugin Framework" introduced="6.2" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp" version="3"/>
-</component>
-<component name="apputils" long-name="Application Utilities" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/apputils/group" mrp="os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
-</component>
-<component name="genericusabilitylib" long-name="Generic Usability Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/genericusabilitylib/group" mrp="os/ossrv/lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
-</component>
-</collection>
-<collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
-<component name="ossrv_build" filter="s60" long-name="Generic OS Services Build">
-<!-- exports should be moved to individual components -->
-<unit bldFile="os/ossrv/group"/>
-</component>
-<component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="featuremgmt" long-name="Feature Management" level="framework">
-<component name="featuremgr" long-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 name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/persistentdata/featuremgmt/featureregistry/group" mrp="os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
-</component>
-</collection>
-<collection name="loggingservices" long-name="Logging Services" level="server">
-<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">
-<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">
-<unit bldFile="os/persistentdata/loggingservices/rfilelogger/group" mrp="os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
-</component>
-</collection>
-<collection name="traceservices" long-name="Trace Services" level="server">
-<component name="commsdebugutility" long-name="Comms Debug Utility" introduced="7.0s" purpose="optional">
-<unit bldFile="os/persistentdata/traceservices/commsdebugutility/group" mrp="os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
-</component>
-<component name="tracefw" long-name="Trace Framework" introduced="9.2" purpose="development">
-<unit bldFile="os/persistentdata/traceservices/tracefw/ulogger/group" mrp="os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
-</component>
-</collection>
-<collection name="persistentstorage" long-name="Persistent Storage" level="framework">
-<component name="store" long-name="Store" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/store/group" mrp="os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
-</component>
-<component name="dbms" long-name="DBMS" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/dbms/group" mrp="os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
-</component>
-<component name="centralrepository" long-name="Central Repository" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/persistentdata/persistentstorage/centralrepository/group" mrp="os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
-</component>
-<component name="sql" long-name="SQL" introduced="9.3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sql/GROUP" mrp="os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
-</component>
-<component name="sqlite3api" long-name="SQLite 3 API" introduced="^3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sqlite3api/GROUP" mrp="os/persistentdata/persistentstorage/sqlite3api/GROUP/syslibs_sqlite3.mrp"/>
-</component>
-</collection>
-<collection name="persistentdata_info" long-name="Persistent Data Services Info" level="app-if">
-<component name="persistentdata_metadata" long-name="Persistent Data Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/persistentdata/persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
-<component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
-</component>
-<component name="common_platform_security_definitions_api" long-name="Common Platform Security Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group"/>
-</component>
-<component name="feature_discovery_api" long-name="Feature Discovery API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/group"/>
-</component>
-<component name="platform_environment_api" long-name="Platform Environment API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_environment_api/group"/>
-</component>
-<component name="sensor_channel_api" long-name="Sensor Channel API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_channel_api/group"/>
-</component>
-<component name="sensor_definitions_api" long-name="Sensor Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_definitions_api/group"/>
-</component>
-<component name="version_info_api" long-name="Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/group"/>
-</component>
-<component name="accessory_monitoring_api" long-name="Accessory Monitoring API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/group"/>
-</component>
-<component name="haptics_api" long-name="Haptics API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/haptics_api/group"/>
-</component>
-<component name="sensor_data_compensator_api" long-name="Sensor Data Compensator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
-</component>
-</collection>
-<collection name="devicesrv_plat" long-name="Device Services Platform Interfaces" level="app-if">
-<component name="configuration_file_parser_api" long-name="Configuration File Parser API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/configuration_file_parser_api/group"/>
-</component>
-<component name="dos_extension_plugin_api" long-name="DOS Extension Plug-In API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_plugin_api/group"/>
-</component>
-<component name="mediator_command_initiator_api" long-name="Mediator Command Initiator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_initiator_api/group"/>
-</component>
-<component name="syslangutil_api" long-name="SysLangUtil API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/syslangutil_api/group"/>
-</component>
-<component name="wakeup_alarm_api" long-name="Wakeup Alarm API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/wakeup_alarm_api/group"/>
-</component>
-<component name="disk_and_memory_level_keys_api" long-name="Disk and Memory Level Keys API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_and_memory_level_keys_api/group"/>
-</component>
-<component name="mediator_plugin_api" long-name="Mediator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_plugin_api/group"/>
-</component>
-<component name="headset_status_api" long-name="Headset Status API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/headset_status_api/group"/>
-</component>
-<component name="system_startup_extension_plugin_api" long-name="System Startup Extension Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/system_startup_extension_plugin_api/group"/>
-</component>
-<component name="sensor_plugin_api" long-name="Sensor Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_plugin_api/group"/>
-</component>
-<component name="accessory_api" long-name="Accessory API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_api/group"/>
-</component>
-<component name="display_language_definition_api" long-name="Display Language Definition API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/display_language_definition_api/group"/>
-</component>
-<component name="mediator_command_responder_api" long-name="Mediator Command Responder API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_responder_api/group"/>
-</component>
-<component name="accessory_policy_definitions_api" long-name="Accessory Policy Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_definitions_api/group"/>
-</component>
-<component name="hw_settings_api" long-name="Hardware Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/hw_settings_api/group"/>
-</component>
-<component name="mediator_domain_definitions_api" long-name="Mediator Domain Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_domain_definitions_api/group"/>
-</component>
-<component name="sensor_extension_api" long-name="Sensor Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_extension_api/group"/>
-</component>
-<component name="accessory_plugin_api" long-name="Accessory Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_plugin_api/group"/>
-</component>
-<component name="sae_api" long-name="SAE API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sae_api/group"/>
-</component>
-<component name="accessory_control_api" long-name="Accessory Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_control_api/group"/>
-</component>
-<component name="mediator_static_registration_api" long-name="Mediator Static Registration API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_static_registration_api/group"/>
-</component>
-<component name="accessory_key_event_handling_api" long-name="Accessory Key Event Handling API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_key_event_handling_api/group"/>
-</component>
-<component name="mediator_notification_api" long-name="Mediator Notification API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_notification_api/group"/>
-</component>
-<component name="accessory_policy_utility_api" long-name="Accessory Policy Utility API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_utility_api/group"/>
-</component>
-<component name="common_dsy_plugin_api" long-name="Common DSY Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/common_dsy_plugin_api/group"/>
-</component>
-<component name="remote_control_extension_api" long-name="Remote Control Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/remote_control_extension_api/group"/>
-</component>
-<component name="sensor_channel_filter_api" long-name="Sensor Channel Filter API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_channel_filter_api/group"/>
-</component>
-<component name="dos_extension_api" long-name="DOS Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_api/group"/>
-</component>
-<component name="accessory_audio_control_api" long-name="Accessory Audio Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_audio_control_api/group"/>
-</component>
-<component name="mediator_event_consumer_api" long-name="Mediator Event Consumer API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_consumer_api/group"/>
-</component>
-<component name="shared_data_api" long-name="Shared Data API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/shared_data_api/group"/>
-</component>
-<component name="accessory_settings_api" long-name="Accessory Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_settings_api/group"/>
-</component>
-<component name="accessory_bluetooth_control_api" long-name="Accessory Bluetooth Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_bluetooth_control_api/group"/>
-</component>
-<component name="extended_version_info_api" long-name="Extended Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_api/group"/>
-</component>
-<component name="mediator_event_provider_api" long-name="Mediator Event Provider API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_provider_api/group"/>
-</component>
-<component name="tv_out_config_api" long-name="TV Out Config API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_config_api/group"/>
-</component>
-<component name="tspclientmapper_api" long-name="TSP Client Mapper API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tspclientmapper_api/group"/>
-</component>
-<component name="powersave_api" long-name="Power Save API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_api/group"/>
-</component>
-<component name="powersave_definitions_api" long-name="Power Save Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_definitions_api/group"/>
-</component>
-<component name="powersave_plugin_api" long-name="Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_plugin_api/group"/>
-</component>
-<component name="extended_version_info_plugin_api" long-name="Extended Version Info Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_plugin_api/group"/>
-</component>
-<component name="haptics_plugin_api" long-name="Haptics Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_plugin_api/group"/>
-</component>
-<component name="haptics_effect_data_getter_plugin_api" long-name="Haptics Effect Data Getter Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
-</component>
-<component name="haptics_packetizer_plugin_api" long-name="Haptics Packetizer Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_packetizer_plugin_api/group"/>
-</component>
-<component name="tiltcompensation_api" long-name="Tilt Compensation API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tiltcompensation_api/group"/>
-</component>
-<component name="disk_notification_handler_api" long-name="Disk Notification Handler API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_notification_handler_api/group"/>
-</component>
-<component name="accessory_policy_usb_audio_api" long-name="Accessory Policy USB Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_usb_audio_api/group"/>
-</component>
-<component name="accessory_policy_hdmi_audio_api" long-name="Accessory Policy HDMI Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_hdmi_audio_api/group"/>
-</component>
-<component name="sensor_data_compensator_plugin_api" long-name="Sensor Data Compensator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
-</component>
-<component name="ddc_access_api" long-name="DDC Access API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/ddc_access_api/group"/>
-</component>
-<component name="tv_out_behaviour_api" long-name="TV Out Behaviour API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_behaviour_api/group"/>
-</component>
-</collection>
-<collection name="accessoryservices" long-name="Accessory Services" level="framework">
-<component name="accessorymonitor" filter="s60" long-name="Accessory Monitor">
-<unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/group"/>
-</component>
-<component name="accessoryremotecontrol" filter="s60" long-name="Accessory Remote Control">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
-</component>
-<component name="accessoryserver" filter="s60" long-name="Accessory Server">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryserver/group"/>
-</component>
-<component name="pluggeddisplay" filter="s60" long-name="Plugged Display" introduced="^3">
-<unit bldFile="os/devicesrv/accessoryservices/pluggeddisplay/group"/>
-</component>
-<component name="headsetstatusapi" filter="s60" long-name="Headset Status API">
-<unit bldFile="os/devicesrv/accessoryservices/headsetstatusapi/group"/>
-</component>
-<component name="tspclientmapper" filter="s60" long-name="TSP Client Mapper">
-<unit bldFile="os/devicesrv/accessoryservices/tspclientmapper/group"/>
-</component>
-<component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional">
-<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
-</component>
-<component name="gid_pc_tool" filter="s60" long-name="Generic ID PC Tool" class="tool PC">
-<unit bldFile="os/devicesrv/accessoryservices/gid_pc_tool/group"/>
-</component>
-</collection>
-<collection name="commonservices" long-name="Common Services" level="app-if">
-<component name="commonengine" filter="s60" long-name="Common Engine">
-<unit bldFile="os/devicesrv/commonservices/commonengine/group"/>
-</component>
-<component name="commonengineresources" filter="s60" long-name="Common Engine Resources" class="config">
-<unit bldFile="os/devicesrv/commonservices/commonengineresources/group"/>
-</component>
-<component name="platformenv" filter="s60" long-name="Platform Environment">
-<unit bldFile="os/devicesrv/commonservices/platformenv/group"/>
-</component>
-<component name="sysutil" long-name="System Utilities" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/sysutil/group" mrp="os/devicesrv/commonservices/sysutil/group/sysutil.mrp"/>
-</component>
-<component name="activitymanager" long-name="Activity Manager" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/activitymanager/group" mrp="os/devicesrv/commonservices/activitymanager/group/activitymanager.mrp"/>
-</component>
-</collection>
-<collection name="dosservices" long-name="Domestic Operating System Services" level="hw-if">
-<component name="commondsy" filter="s60" long-name="Common DSY" plugin="Y">
-<unit bldFile="os/devicesrv/dosservices/commondsy/group"/>
-</component>
-<component name="dosserver" filter="s60" long-name="Domestic OS Server">
-<unit bldFile="os/devicesrv/dosservices/dosserver/group"/>
-</component>
-</collection>
-<collection name="sensorservices" long-name="Sensor Services" level="framework">
-<component name="sensorserver" filter="s60" long-name="Sensor Server">
-<unit bldFile="os/devicesrv/sensorservices/sensorserver/group"/>
-</component>
-<component name="orientationssy" filter="s60" long-name="Orientation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/orientationssy/group"/>
-</component>
-<component name="tiltcompensationssy" filter="s60" long-name="Tilt Compensation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/tiltcompensationssy/group"/>
-</component>
-<component name="sensordatacompensator" filter="s60" long-name="Sensor Data Compensator">
-<unit bldFile="os/devicesrv/sensorservices/sensordatacompensator/group"/>
-</component>
-</collection>
-<collection name="hwrmhaptics" long-name="HWRM Haptics" level="plugin">
-<component name="hapticseffectdatagetterfw" filter="s60" long-name="Haptics Effect Data Getter Framework">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
-</component>
-<component name="hapticspluginservice" filter="s60" long-name="Haptics Plugin Service">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
-</component>
-<component name="hapticspacketizer" filter="s60" long-name="Haptics Packetizer">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
-</component>
-<component name="hapticspluginmanager" filter="s60" long-name="Haptics Plugin Manager">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
-</component>
-<component name="hapticsserver" filter="s60" long-name="Haptics Server">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsserver/group"/>
-</component>
-<component name="hapticsclient" filter="s60" long-name="Haptics Client">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsclient/group"/>
-</component>
-<component name="hwrmhaptics_build" filter="s60" long-name="HWRM Haptics Build">
-<!-- move these exports into the appropriate above components and delete this component-->
-<unit bldFile="os/devicesrv/hwrmhaptics/group"/>
-</component>
-</collection>
-<collection name="mediator" long-name="Mediator" level="app-if">
-<!--collection is really a component. Move it down a directory -->
-<component name="mediator_build" filter="s60" long-name="Mediator Build">
-<unit bldFile="os/devicesrv/mediator/group"/>
-</component>
-</collection>
-<collection name="psmservices" long-name="Power Save Mode Services" level="app-if">
-<component name="psmserver" filter="s60" long-name="PSM Server">
-<unit bldFile="os/devicesrv/psmservices/psmserver/group"/>
-</component>
-</collection>
-<collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
-<component name="hwrmfmtxwatcherplugin" filter="s60" long-name="HWRM FM Transmitter Watcher Plugin" plugin="Y">
-<unit bldFile="os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
-</component>
-<component name="hwrmtargetmodifierplugin" filter="s60" long-name="HWRM Target Modifier Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build,
- may need to -->
-<!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
-</component>
-<component name="vibractrl" filter="s60" long-name="Vibra Control" deprecated="9.1">
-<unit bldFile="os/devicesrv/resourcemgmt/vibractrl/group"/>
-</component>
-<component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="^2" purpose="optional">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
-</component>
-<component name="hwresourcesmgrconfig" long-name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
-</component>
-<component name="resourcemgmt_build" filter="s60" long-name="Resource Management Build">
-<!-- Move exports to a self-contained component.
- This needs to be kept around until configuration is in place -->
-<unit bldFile="os/devicesrv/resourcemgmt/group"/>
-</component>
-<component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
-</component>
-</collection>
-<collection name="sysstatemgmt" long-name="System State Management" level="server">
-<component name="ssmmapperutility" filter="s60" long-name="SSM Mapper Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmmapperutility/group"/>
-</component>
-<component name="ssmpolicyplugins" filter="s60" long-name="SSM Policy Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmpolicyplugins/group"/>
-</component>
-<component name="ssmutilityplugins" filter="s60" long-name="SSM Utility Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmutilityplugins/group"/>
-</component>
-<component name="ssmcmdlists" filter="s60" long-name="SSM Command Lists" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcmdlists/group"/>
-</component>
-<component name="ssmcustcmds" filter="s60" long-name="SSM Custom Commands" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcustcmds/group"/>
-</component>
-<component name="syslangutil" filter="s60" long-name="System Language Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/syslangutil/group"/>
-</component>
-<component name="sysrestart" filter="s60" long-name="System Restart" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysrestart/group"/>
-</component>
-<component name="sysuiprovider" filter="s60" long-name="System UI Provider" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysuiprovider/group"/>
-</component>
-<component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/group" mrp="os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
-</component>
-<component name="systemstatemgr" long-name="System State Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
-</component>
-<component name="systemstateplugins" long-name="System State Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
-</component>
-<component name="systemstatereferenceplugins" long-name="System State Reference Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
-</component>
-</collection>
-<collection name="resourceinterfaces" long-name="Resource Interfaces" level="hw-if">
-<component name="fmtransmittercontrol" long-name="FM Transmitter Control" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group" mrp="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
-</component>
-</collection>
-<collection name="systemhealthmanagement" long-name="System Health Management" level="server">
-<component name="systemhealthmgr" long-name="System Health Manager" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
-</component>
-</collection>
-<collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if"/>
-<collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
-<component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
-<collection name="authorisation" long-name="Authorisation" level="utilities">
-<component name="userpromptservice" long-name="User Prompt Service" introduced="^3" purpose="mandatory">
-<unit bldFile="os/security/authorisation/userpromptservice/group" mrp="os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
-</component>
-<component name="userpromptutils" long-name="User Prompt Utils" introduced="^3" purpose="optional">
-<unit bldFile="os/security/authorisation/userpromptutils/group" mrp="os/security/authorisation/userpromptutils/group/security_ups_utils.mrp"/>
-</component>
-</collection>
-<collection name="contentmgmt" long-name="Content Management" level="utilities">
-<component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
-<unit bldFile="os/security/contentmgmt/contentaccessfwfordrm/group" mrp="os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
-</component>
-<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>
-</collection>
-<collection name="crypto" long-name="Crypto Libraries" level="libraries">
-<component name="weakcryptospi" long-name="Weak Crypto SPI" filter="gt" introduced="^3" purpose="optional">
-<unit bldFile="os/security/crypto/weakcryptospi/group" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
-</component>
-<component name="strongcryptospi" long-name="Strong Crypto SPI" filter="gt" introduced="^3" purpose="optional">
-<unit bldFile="os/security/crypto/weakcryptospi/strong" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
-</component>
-</collection>
-<collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
-<component name="securityutils" long-name="Security Utils" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/securityutils/group" mrp="os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
-</component>
-<component name="securitydocs" long-name="Security Documentation" purpose="development" class="doc">
-<unit mrp="os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
-</component>
-<component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
-</component>
-<component name="securitycommonutils" long-name="Security Common Utils" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/security/cryptomgmtlibs/securitycommonutils/group" mrp="os/security/cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
-</component>
-</collection>
-<collection name="securityanddataprivacytools" long-name="Security and Data Privacy Tools" level="services">
-<component name="securityconfig" long-name="Security Config" introduced="9.1" purpose="optional">
-<unit bldFile="os/security/securityanddataprivacytools/securityconfig/group" mrp="os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
-</component>
-<component name="securitytools" long-name="Security Tools" introduced="^3" purpose="optional" class="PC">
-<unit bldFile="os/security/securityanddataprivacytools/securitytools/group" mrp="os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
-</component>
-</collection>
-<collection name="cryptoplugins" long-name="Crypto Plugins" level="plugins">
-<component name="cryptospiplugins" long-name="Crypto SPI Plugins" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/security/cryptoplugins/cryptospiplugins/group" mrp="os/security/cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
-</component>
-</collection>
-<collection name="cryptoservices" long-name="Crypto Services" level="plugins">
-<component name="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/certificateandkeymgmt/group" mrp="os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
-</component>
-<component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
-</component>
-<component name="browserrootcertificates" long-name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
-<unit mrp="os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
-</component>
-<component name="rootcertificates" filter="sf_build" long-name="Root Certificates" introduced="7.0s" purpose="optional">
-<!-- not in S60 codebase -->
-<unit bldFile="os/security/cryptoservices/rootcertificates/group" mrp="os/security/cryptoservices/rootcertificates/group/rootcerts.mrp"/>
-</component>
-<component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/asnpkcs/group" mrp="os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
-</component>
-</collection>
-<collection name="security_info" long-name="OS Security Info" level="utilities">
-<component name="security_metadata" long-name="OS Security Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/security/security_info/security_metadata/security_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
-<collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
-<component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
-</component>
-<component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
-</component>
-<component name="simulationpositioningmodule" long-name="Simulation Positioning Module" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
-</component>
-<component name="gpspositioningmodule" long-name="GPS/A-GPS Positioning Module" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/gpspositioningmodule/group" mrp="os/lbs/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
-</component>
-<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>
-</collection>
-<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
-<component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
-</component>
-</collection>
-<collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
-<component name="locationserver" long-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 name="networkrequesthandler" long-name="Network Request Handler" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
-</component>
-</collection>
-<collection name="lbstest" long-name="Locating Services Tests" level="application-interface">
-<component name="locationprotocoltest" long-name="Location Protocol Tests" introduced="9.2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/lbstest/locationprotocoltest/group" mrp="os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
-</component>
-</collection>
-<collection name="locationmgmt" long-name="Location Management" level="management">
-<component name="locmonitor" long-name="Location Monitor" introduced="^3" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
-</component>
-<component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/agpslocationmgr/group" mrp="os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
-</component>
-<component name="networklocationmgr" long-name="Network Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/networklocationmgr/group" mrp="os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
-</component>
-<component name="locationcore" long-name="Location Core" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locationcore/group" mrp="os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
-</component>
-<component name="networkgateway" long-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 name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
-<component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
-</component>
-<component name="suplrrlpasn1" filter="sf_build" long-name="SUPL RRLP ASN1 Parser">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
-</component>
-</collection>
-<collection name="lbsapitest" long-name="Location API Tests" level="application-interface"/>
-<collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
-<component name="lbs_metadata" long-name="Locating Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commsfw" level="services" long-name="Communications Framework" levels="server support framework process app-if">
-<collection name="commsprocess" long-name="Comms Process" level="process">
-<component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/commsfw/commsprocess/commsrootserverconfig/group" mrp="os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
-</component>
-</collection>
-<collection name="commsconfig" long-name="Comms Config" level="process">
-<component name="commsdatabase" long-name="Comms Database" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
-</component>
-<component name="commsdatabaseshim" long-name="Comms Database Shim" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/commsfw/commsconfig/commsdatabaseshim/group" mrp="os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
-</component>
-</collection>
-<collection name="datacommsserver" long-name="Data Comms Server" level="framework">
-<component name="esockserver" long-name="ESock Server" purpose="mandatory">
-<unit bldFile="os/commsfw/datacommsserver/esockserver/group" mrp="os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp" version="3"/>
-</component>
-<component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/group" mrp="os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
-</component>
-<component name="networkingdialogstub" long-name="Networking Dialog Stub" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/default" mrp="os/commsfw/datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
-</component>
-<component name="networkcontroller" long-name="Network Controller" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/datacommsserver/networkcontroller/group" mrp="os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
-</component>
-</collection>
-<collection name="serialserver" long-name="Serial Server" level="server">
-<component name="serialportcsy" long-name="Serial Port CSY" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/serialserver/serialportcsy" mrp="os/commsfw/serialserver/serialportcsy/ser-comms_serialportcsy.mrp"/>
-</component>
-<component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" purpose="development">
-<unit bldFile="os/commsfw/serialserver/packetloopbackcsy/group" mrp="os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
-</component>
-<component name="c32serialserver" long-name="C32 Serial Server" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/commsfw/serialserver/c32serialserver/group" mrp="os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
-</component>
-<component name="c32serialserverconfig" long-name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config">
-<unit bldFile="os/commsfw/serialserver/c32serialserverconfig" mrp="os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
-</component>
-<component name="c32serialserverdocs" long-name="C32 Serial Server Documentation" purpose="development" class="doc">
-<unit mrp="os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
-</component>
-</collection>
-<collection name="commsfwutils" long-name="Comms Framework Utilities" level="framework">
-<component name="commsbufs" long-name="Comms Buffers" introduced="^3" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwutils/commsbufs/group" mrp="os/commsfw/commsfwutils/commsbufs/group/comms-infras_commsbufs.mrp"/>
-</component>
-</collection>
-<collection name="commsfw_info" long-name="Comms Framework Info" level="app-if">
-<component name="commsinfrastructuredocs" long-name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
-<unit mrp="os/commsfw/commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
-</component>
-<component name="commsfw_metadata" long-name="Communications Framework Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/commsfw/commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
-</component>
-</collection>
-<collection name="commsfwsupport" long-name="Comms Framework Support" level="support">
-<component name="commselements" long-name="Comms Elements" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwsupport/commselements/group" mrp="os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
-</component>
-</collection>
-<collection name="commsinfrastructureapitest" long-name="Comms-Infras API Tests" level="app-if">
-<component name="commsinfrastructuresvs" long-name="Comms Infrastructure Verification Suite" introduced="^3" purpose="development">
-<unit mrp="os/commsfw/commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
-</component>
-</collection>
-<collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
-<component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
-</component>
-<component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" purpose="mandatory" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
-</component>
-<component name="commstools" long-name="Comms Tools" introduced="^3" purpose="development" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/commstools/group" mrp="os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
-</component>
-</collection>
-</block>
-<block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
-<component name="internetsockets" long-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>
-<collection name="tcpiputils" long-name="TCP/IP Utilities" level="plugin">
-<component name="dnd" long-name="DND" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/dnd/group" mrp="os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
-</component>
-<component name="dhcp" long-name="DHCP" introduced="8.0" purpose="optional">
-<unit bldFile="os/networkingsrv/tcpiputils/dhcp/group" mrp="os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
-</component>
-<component name="networkaddressandporttranslation" long-name="Network Address and Port Translation" introduced="^2" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
-</component>
-<component name="punycodeconv" long-name="Punycode Converter" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/punycodeconv/group" mrp="os/networkingsrv/tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
-</component>
-</collection>
-<collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
-<component name="nullagt" long-name="NULL AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/nullagt/group" mrp="os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
-</component>
-<component name="genericscprparameters" long-name="Generic SCPR Parameters" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/linklayercontrol/genericscprparameters/group" mrp="os/networkingsrv/linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
-</component>
-<component name="mbmsparameters" long-name="MBMS Parameters" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/mbmsparameters/group" mrp="os/networkingsrv/linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
-</component>
-<component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
-<unit bldFile="os/networkingsrv/linklayercontrol/networkinterfacemgr/group" mrp="os/networkingsrv/linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp" version="2"/>
-</component>
-</collection>
-<collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
-<component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
-</component>
-<component name="pppnif" long-name="PPP NIF" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/pppnif/group" mrp="os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp" version="2"/>
-</component>
-<component name="slipnif" long-name="SLIP NIF" purpose="development" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/slipnif/group" mrp="os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
-</component>
-<component name="tunnelnif" long-name="Tunnel NIF" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
-</component>
-</collection>
-<collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
-<component name="packetlogger" long-name="Packet Logger" introduced="8.1" purpose="development">
-<unit bldFile="os/networkingsrv/linklayerutils/packetlogger/group" mrp="os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
-</component>
-</collection>
-<collection name="networkcontrol" long-name="Network Control" level="plugin">
-<component name="qoslib" long-name="QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/qoslib/group" mrp="os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
-</component>
-<component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/pfqoslib/group" mrp="os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
-</component>
-<component name="qosfwprt" long-name="QoS Framework PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
-</component>
-<component name="qosipscpr" long-name="QoS IP SCPR" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosipscpr/group" mrp="os/networkingsrv/networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
-</component>
-<component name="ipnetworklayer" long-name="IP Network Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/ipnetworklayer/group" mrp="os/networkingsrv/networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
-</component>
-<component name="iptransportlayer" long-name="IP Transport Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/iptransportlayer/group" mrp="os/networkingsrv/networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
-</component>
-<component name="commsuserpromptmgr" long-name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkcontrol/commsuserpromptmgr/group" mrp="os/networkingsrv/networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
-</component>
-</collection>
-<collection name="networkprotocols" long-name="Network Protocols" level="plugin">
-<component name="ipeventnotifier" long-name="IP Event Notifier" introduced="8.1" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
-</component>
-<component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
-</component>
-<component name="iphook" long-name="IP Hook" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
-</component>
-<component name="mobileip" long-name="Mobile IP" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/mobileip/group" mrp="os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
-</component>
-<component name="dnsproxy" long-name="DNS Proxy" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/networkprotocols/dnsproxy/group" mrp="os/networkingsrv/networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
-</component>
-</collection>
-<collection name="networksecurity" long-name="Network Security" level="framework">
-<component name="tls" long-name="TLS" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tls/group" mrp="os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
-</component>
-<component name="tlsprovider" long-name="TLS Provider" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tlsprovider/group" mrp="os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
-</component>
-<component name="ipsec" long-name="IPsec" introduced="7.0" purpose="optional">
-<unit bldFile="os/networkingsrv/networksecurity/ipsec/group" mrp="os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
-</component>
-</collection>
-<collection name="networkingtestandutils" long-name="Networking Test and Utils" level="app-if">
-<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">
-<!-- production component: contains the IBY files -->
-<unit bldFile="os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
-</component>
-<component name="networkingdocs" long-name="Networking Documentation" purpose="development" class="doc">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
-</component>
-<component name="networkingsrv_metadata" long-name="Networking Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
-<component name="predictorcompression" long-name="Predictor Compression" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wlan" level="services" long-name="WLAN" levels="hw low mid high tools test">
-<collection name="wlan_plat" long-name="WLAN Platform Interfaces" level="test">
-<component name="wlan_dbif_api" long-name="WLAN DBIF API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_dbif_api/group"/>
-</component>
-<component name="wlan_hal_api" long-name="WLAN HAL API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hal_api/group"/>
-</component>
-<component name="wlan_management_api" long-name="WLAN Management API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_management_api/group"/>
-</component>
-<component name="wlan_device_settings_api" long-name="WLAN Device Settings API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_device_settings_api/group"/>
-</component>
-<component name="wlan_control_api" long-name="WLAN Control API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_control_api/group"/>
-</component>
-<component name="wlan_hw_initialization_data_api" long-name="WLAN Hardware Initialization Data API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hw_initialization_data_api/group"/>
-</component>
-<component name="wlan_power_save_plugin_api" long-name="WLAN Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_power_save_plugin_api/group"/>
-</component>
-<component name="wlan_info_api" long-name="WLAN Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_info_api/group"/>
-</component>
-<component name="wlan_agent_hotspot_plugin_api" long-name="WLAN Agent Hotspot Plug-in API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
-</component>
-<component name="wlan_osa_api" long-name="WLAN OSA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_osa_api/group"/>
-</component>
-<component name="wlan_spia_api" long-name="WLAN SPIA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_spia_api/group"/>
-</component>
-<component name="wlan_hpa_api" long-name="WLAN HPA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hpa_api/group"/>
-</component>
-<component name="wlan_eapol_plugin_api" long-name="WLAN EAPOL Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_eapol_plugin_api/group"/>
-</component>
-<component name="wlan_generic_plugin_api" long-name="WLAN Generic Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_generic_plugin_api/group"/>
-</component>
-<component name="wlan_aws_plugin_api" long-name="WLAN AWS Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_aws_plugin_api/group"/>
-</component>
-</collection>
-<collection name="wlan_pub" long-name="WLAN Public Interfaces" level="test">
-<component name="wlan_sdk_info_api" long-name="WLAN SDK Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_pub/wlan_sdk_info_api/group"/>
-</component>
-</collection>
-<collection name="wlan_bearer" long-name="WLAN Bearer" level="hw">
-<component name="wlanpsmplugin" filter="s60" long-name="WLAN PSM Plugin" plugin="Y">
-<unit bldFile="os/wlan/wlan_bearer/wlanpsmplugin/group"/>
-</component>
-<component name="wlanagent" filter="s60" long-name="WLAN Agent">
-<unit bldFile="os/wlan/wlan_bearer/wlanagent/group"/>
-</component>
-<component name="wlandbif_cd" filter="s60" long-name="WLAN CommsDat interface">
-<unit bldFile="os/wlan/wlan_bearer/wlandbif_cd/group"/>
-</component>
-<!-- should follow component directory rules for stuff in wlan_symbian/ and put in a single component or split up properly -->
-<component name="wlanengine" filter="s60" long-name="WLAN Engine">
-<unit bldFile="os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
-</component>
-<component name="wlanldd" filter="s60" long-name="WLAN LDD">
-<unit bldFile="os/wlan/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
-</component>
-<component name="wlannwif" filter="s60" long-name="WLAN Network Interface">
-<unit bldFile="os/wlan/wlan_bearer/wlannwif/group"/>
-</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="adaptation hw-if plugin framework server app-if">
-<collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
-<component name="basebandchanneladaptor" long-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 name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
-<component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
-</component>
-</collection>
-<collection name="fax" long-name="Fax" level="server">
-<component name="faxclientandserver" long-name="Fax Client and Server" purpose="optional">
-<unit bldFile="os/cellularsrv/fax/faxclientandserver/Group" mrp="os/cellularsrv/fax/faxclientandserver/Group/telephony_fax.mrp"/>
-</component>
-</collection>
-<collection name="smsprotocols" long-name="SMS Protocols" level="framework">
-<component name="smsstack" long-name="SMS Stack" introduced="6.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/cellularsrv/smsprotocols/smsstack/group" mrp="os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
-</component>
-</collection>
-<collection name="telephonyprotocols" long-name="Telephony Protocols" level="framework">
-<component name="csdagt" long-name="CSD AGT" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/csdagt/group" mrp="os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
-</component>
-<component name="psdagt" long-name="PSD AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/psdagt/group" mrp="os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
-</component>
-<component name="gprsumtsqosprt" long-name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
-</component>
-<component name="gprsumtsqosinterface" long-name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
-</component>
-<component name="qosextnapi" long-name="QoS Extn API" introduced="9.2" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
-</component>
-<component name="secondarypdpcontextumtsdriver" long-name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
-</component>
-<component name="qos3gppcpr" long-name="QoS 3GPP CPR" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
-</component>
-<component name="pdplayer" long-name="PDP Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/pdplayer/group" mrp="os/cellularsrv/telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
-</component>
-<component name="rawipnif" long-name="Raw IP NIF" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserver" long-name="Telephony Server" level="server">
-<component name="etelserverandcore" long-name="ETel Server and Core" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
-</component>
-<component name="etelmultimode" long-name="ETel Multimode" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelmultimode/group" mrp="os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
-</component>
-<component name="etelpacketdata" long-name="ETel Packet Data" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
-</component>
-<component name="etelsimtoolkit" long-name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
-<component name="common_tsy" long-name="Common TSY" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
-</component>
-<component name="licenseetsystub" long-name="Licensee TSY Stub" introduced="^2" purpose="development" filter="sf_build" plugin="Y">
-<unit mrp="os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="os/cellularsrv/telephonyserverplugins/licenseetsystub/group"/>
-</component>
-<component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
-</component>
-<component name="simtsy" long-name="SIM TSY" introduced="7.0" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
-</component>
-<component name="ctsydispatchlayer" long-name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
-</component>
-<component name="simatktsy" long-name="SIMATK TSY" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simatktsy/group" mrp="os/cellularsrv/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
-</component>
-</collection>
-<collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
-<component name="dial" long-name="Dial" deprecated="9.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyutils/dial/group" mrp="os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
-</component>
-<component name="telephonywatchers" long-name="Telephony Watchers" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
-</component>
-<component name="etel3rdpartyapi" long-name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrv_info" long-name="Cellular Baseband Services Info" level="app-if">
-<component name="telephonyconfidentialdocs" long-name="Telephony Confidential Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
-</component>
-<component name="telephonydocs" long-name="Telephony Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
-</component>
-<component name="cellularsrv_metadata" long-name="Cellular Baseband Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
-<component name="mocksy" long-name="MockSY" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if"/>
-<collection name="wapstack" long-name="WAP Stack" level="app-if">
-<component name="wapmessageapi" long-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>
-</block>
-<block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
-<collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
-<component name="bluetooth_audio_adaptation_api" long-name="Bluetooth Audio Adaptation API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
-</component>
-<component name="bluetooth_power_management_api" long-name="Bluetooth Power Management API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_power_management_api/group"/>
-</component>
-<component name="at_command_handler_plugin_api" long-name="AT Command Handler Plugin API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/at_command_handler_plugin_api/group"/>
-</component>
-</collection>
-<collection name="bluetooth" long-name="Bluetooth Core" level="framework">
-<component name="btstack" long-name="Bluetooth Stack" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btstack" mrp="os/bt/bluetooth/btstack/bluetooth_stack.mrp"/>
-</component>
-<component name="btcomm" long-name="Bluetooth CSY" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetooth/btcomm" mrp="os/bt/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
-</component>
-<component name="btsdp" long-name="Bluetooth SDP" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btsdp" mrp="os/bt/bluetooth/btsdp/bluetooth_sdp.mrp"/>
-</component>
-<component name="btextnotifiers" long-name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btextnotifiers" mrp="os/bt/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
-</component>
-<component name="gavdp" long-name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/gavdp/group" mrp="os/bt/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
-</component>
-<component name="btlogger" long-name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btlogger/group" mrp="os/bt/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
-</component>
-<component name="btdocs" long-name="Bluetooth Documentation" purpose="development" class="doc">
-<unit mrp="os/bt/bluetooth/btdocs/bluetooth_documentation.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothmgmt" long-name="Bluetooth Management" level="plugin">
-<component name="btmgr" long-name="Bluetooth Manager" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btmgr" mrp="os/bt/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
-</component>
-<component name="btconfig" long-name="Bluetooth Config" purpose="optional" class="config">
-<unit bldFile="os/bt/bluetoothmgmt/btconfig" mrp="os/bt/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
-</component>
-<component name="btrom" long-name="Bluetooth ROM" introduced="9.1" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btrom" mrp="os/bt/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
-</component>
-<component name="bluetoothclientlib" long-name="Bluetooth Client Library" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/bluetoothclientlib" mrp="os/bt/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothcommsprofiles" long-name="Bluetooth Comms Profiles" level="app-if">
-<component name="btpan" long-name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetoothcommsprofiles/btpan/group" mrp="os/bt/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
-</component>
-</collection>
-<collection name="bthci" long-name="Host Controller Interface" level="server">
-<component name="bthci2" long-name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bthci/bthci2/group" mrp="os/bt/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
-</component>
-<component name="hciextensioninterface" long-name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bthci/hciextensioninterface" mrp="os/bt/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
-</component>
-<component name="hci2implementations" long-name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bthci/hci2implementations/group" mrp="os/bt/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
-</component>
-</collection>
-<collection name="irda" long-name="IrDA" level="plugin">
-<component name="irdastack" long-name="IrDA Stack" purpose="optional">
-<unit bldFile="os/bt/irda/irdastack/group" mrp="os/bt/irda/irdastack/group/infra-red_irda.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if"/>
-<collection name="atext" long-name="AT Extensions" level="server">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="atext_build" long-name="AT Extension Build" introduced="^3" purpose="optional" filter="s60">
-<unit bldFile="os/bt/atext/group"/>
-</component>
-</collection>
-<collection name="bt_info" long-name="Bluetooth Info" level="app-if">
-<component name="bt_metadata" long-name="Bluetooth Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/bt/bt_info/bt_metadata/bt_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
-<collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
-<!-- usbclientdrivers to be moved here from kernelhwsrv-->
-</collection>
-<collection name="usbmgmt" long-name="USB Management" level="server">
-<component name="usbmgr" long-name="USB Manager" purpose="optional">
-<unit bldFile="os/usb/usbmgmt/usbmgr/group" mrp="os/usb/usbmgmt/usbmgr/group/usb_manager.mrp" version="2"/>
-</component>
-<component name="usbclassandmgrdocs" long-name="USB Class and Manager Documentation" purpose="development" class="doc">
-<unit mrp="os/usb/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
-</component>
-</collection>
-<collection name="usb_info" long-name="USB Info" level="app-if">
-<component name="usb_metadata" long-name="USB Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/usb/usb_info/usb_metadata/usb_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="mm" level="services" long-name="Multimedia" levels="adaptation 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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-</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"/>
-</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"/>
-</component>
-<component name="aac_decoder_config_proxy_api" long-name="AAC Decoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/aac_decoder_config_proxy_api/group"/>
-</component>
-<component name="added_devsound_control_api" long-name="Added DevSound Control API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_api/group"/>
-</component>
-<component name="added_devsound_control_msg_hdlr_api" long-name="Added DevSound Control Msg Hdlr API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_msg_hdlr_api/group"/>
-</component>
-<component name="added_devsound_control_proxy_api" long-name="Added DevSound Control Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_proxy_api/group"/>
-</component>
-<component name="audio_effects_msg_hdlr_api" long-name="Audio Effects Message Handler API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_msg_hdlr_api/group"/>
-</component>
-<component name="audio_effects_proxy_api" long-name="Audio Effects Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_proxy_api/group"/>
-</component>
-<component name="audio_policy_header_api" long-name="Audio Policy Header API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="audio_routing_proxy_api" long-name="Audio Routing Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_routing_proxy_api/group"/>
-</component>
-<component name="custom_interface_builder_api" long-name="Custom Interface Builder API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_builder_api/group"/>
-</component>
-<component name="custom_interface_message_handler_factory_api" long-name="Custom Interface Message Handler Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_message_handler_factory_api/group"/>
-</component>
-<component name="custom_interface_proxy_factory_api" long-name="Custom Interface Proxy Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_proxy_factory_api/group"/>
-</component>
-<component name="custom_interface_utility_api" long-name="Custom Interface Utility API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_utility_api/group"/>
-</component>
-<component name="devsound_adaptation_api" long-name="DevSound Adaptation API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/devsound_adaptation_api/group"/>
-</component>
-<component name="display_posting_api" long-name="Display Posting API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="eaac_plus_decoder_interface_proxy_api" long-name="eAAC Plus Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="error_concealment_interface_proxy_api" long-name="Error Concealment Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
-</component>
-<component name="fm_radio_adaptation_api" long-name="FM Radio Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_decoder_interface_proxy_api" long-name="G711 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_encoder_interface_proxy_api" long-name="G711 Encoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_decoder_interface_proxy_api" long-name="G729 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_encoder_interface_msg_hdlr_api" long-name="G729 Encoder Interface Message Handler API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</component>
-<component name="ilbc_decoder_interface_proxy_api" long-name="Ilbc Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ilbc_encoder_interface_proxy_api" long-name="Ilbc Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="mdf_plugin_uids" long-name="MDF Plug-in UIDs" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/mdf_plugin_uids/group"/>
-</component>
-<component name="multimedia_fourcc_definitions_api" long-name="Multimedia FourCC Definitions API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/multimedia_fourcc_definitions_api/group"/>
-</component>
-<component name="nokia_audio_policy_header_api" long-name="Nokia Audio Policy Header API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/nokia_audio_policy_header_api/group"/>
-</component>
-<component name="nokia_multimedia_fourcc_definitions_api" long-name="Nokia Multimedia Fourcc Definitions API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ra8_decoder_interface_proxy_api" long-name="RA8 Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
-</component>
-<component name="rds_adaptation_api" long-name="RDS Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="restricted_audio_output_proxy_api" long-name="Restricted Audio Output Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="sbc_encoder_interface_proxy_api" long-name="SBC Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/sbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="secure_output_mdf_custom_interface" long-name="Secure Output MDF Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="speech_encoder_config_proxy_api" long-name="Speech Encoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/speech_encoder_config_proxy_api/group"/>
-</component>
-<component name="telephony_audio_routing_client_api" long-name="Telephony Audio Routing Client API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_client_api/group"/>
-</component>
-<component name="telephony_audio_routing_manager_api" long-name="Telephony Audio Routing Manager API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_manager_api/group"/>
-</component>
-<component name="video_buffer_management_mdf_custom_interface" long-name="Video Buffer Management MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_buffer_management_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_rotation_mdf_custom_interface" long-name="Video Decoder Rotation MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_scaling_mdf_custom_interface" long-name="Video Decoder Scaling MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
-</component>
-<component name="video_reclaim_extbuffers_ci" long-name="Video Reclaim Extbuffers Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_reclaim_extbuffers_ci/group"/>
-</component>
-<component name="video_window_control_custom_interface" long-name="Video Window Control Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="wma_decoder_interface_proxy_api" long-name="WMA Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/wma_decoder_interface_proxy_api/group"/>
-</component>
-<component name="eaacplusutil_api" long-name="EAac Plus Util API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/eaacplusutil_api/group"/>
-</component>
-<component name="frametable_api" long-name="Frametable API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/frametable_api/group"/>
-</component>
-</collection>
-<collection name="devsoundextensions" long-name="Devsound Extensions" level="device-fw">
-<component name="drmaudioplayer" filter="s60" long-name="DRM Audio Player">
-<unit bldFile="os/mm/devsoundextensions/drmaudioplayer/group"/>
-</component>
-<component name="mmextfw" filter="s60" long-name="Multimedia Extension Framework">
-<unit bldFile="os/mm/devsoundextensions/mmextfw/group"/>
-</component>
-<component name="audiorouting" filter="s60" long-name="Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/audiorouting/group"/>
-</component>
-<component name="effects" filter="s60" long-name="Effects">
-<unit bldFile="os/mm/devsoundextensions/effects/group"/>
-</component>
-<component name="effectspresets" filter="s60" long-name="Effects Presets">
-<unit bldFile="os/mm/devsoundextensions/effectspresets/group"/>
-</component>
-<component name="effectspresets_utils" filter="s60" long-name="Effects Presets Utils">
-<!-- need to #include the lot from a single bld.inf
- Also move to a standard component location, not under effectspresets -->
-<unit bldFile="os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
-<unit bldFile="os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
-</component>
-<component name="telephonyaudiorouting" filter="s60" long-name="Telephony Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/group"/>
-</component>
-<component name="mmfcustominterfaces" filter="s60" long-name="MMF Custom Interfaces">
-<unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/group"/>
-</component>
-<component name="addeddevsoundcontrol" filter="s60" long-name="Added DevSound Control">
-<unit bldFile="os/mm/devsoundextensions/addeddevsoundcontrol/group"/>
-</component>
-<component name="globalaudiosettings" filter="s60" long-name="Global Audio Settings">
-<unit bldFile="os/mm/devsoundextensions/globalaudiosettings/group"/>
-</component>
-<component name="restrictedaudiooutput" filter="s60" long-name="Restricted Audio Output">
-<unit bldFile="os/mm/devsoundextensions/restrictedaudiooutput/group"/>
-</component>
-<component name="ciextnfactoryplugins" filter="s60" long-name="Custom Interface Extension Factory Plugins" plugin="Y">
-<unit bldFile="os/mm/devsoundextensions/ciextnfactoryplugins/group"/>
-</component>
-</collection>
-<collection name="mdfdevvideoextensions" long-name="MDF Dev Video Extensions" level="device-fw">
-<component name="nga_mdf_postprocessor" long-name="NGA MDF Postprocessor" filter="s60">
-<unit bldFile="os/mm/mdfdevvideoextensions/nga_mdf_postprocessor/group"/>
-</component>
-</collection>
-<collection name="audio" long-name="Audio Codecs" level="middleware">
-<component name="arm_cmmf_codecs" filter="s60" long-name="ARM CMMF Codecs" plugin="Y">
-<unit bldFile="os/mm/audio/arm_cmmf_codecs/group"/>
-</component>
-</collection>
-<collection name="video" long-name="Video Codecs" level="middleware">
-<!-- empty -->
-</collection>
-<collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
-<component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/imagingandcamerafws/imagingfws/group" mrp="os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
-</component>
-<component name="camerafw" long-name="Camera Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/imagingandcamerafws/camerafw/group" mrp="os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
-</component>
-</collection>
-<collection name="mmlibs" long-name="Multimedia Libraries" level="middleware">
-<component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmutilitylib/group" mrp="os/mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
-</component>
-<component name="mmfw" long-name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmfw/group" mrp="os/mm/mmlibs/mmfw/group/multimedia_mmf.mrp"/>
-</component>
-</collection>
-<collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
-<component name="imagingplugins" long-name="Imaging Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/imagingplugins/group" mrp="os/mm/mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
-</component>
-<component name="cameraplugins" long-name="Camera Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/cameraplugins/group" mrp="os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
-</component>
-<component name="lib3gp" long-name="3GP Library" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/mmplugins/lib3gp/group" mrp="os/mm/mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
-</component>
-<component name="mmfwplugins" long-name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/mmfwplugins/group" mrp="os/mm/mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
-</component>
-</collection>
-<collection name="mm_info" long-name="Multimedia Info" level="app-if">
-<component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc">
-<unit mrp="os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
-</component>
-<component name="mm_metadata" long-name="Multimedia Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
-<component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="^2" purpose="development">
-<unit bldFile="os/mm/mmresourcemgmt/mmresctrl/group" mrp="os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
-</component>
-</collection>
-<collection name="mmdevicefw" long-name="Multimedia Device Framework" level="device-fw">
-<component name="mdf" long-name="Media Device Framework" introduced="9.2" purpose="mandatory">
-<unit bldFile="os/mm/mmdevicefw/mdf/group" mrp="os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
-</component>
-<component name="speechrecogsupport" long-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 name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
-<component name="videorenderer" long-name="Video Renderer" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/mmswadaptation/videorenderer/group" mrp="os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
-</component>
-</collection>
-<collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw"/>
-<collection name="omxil" long-name="OpenMAX IL" level="hw-if">
-<component name="omxilapi" long-name="OpenMAX IL API" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilapi/group" mrp="os/mm/omxil/omxilapi/group/multimedia_omx_il_api.mrp" version="1"/>
-</component>
-<component name="omxilcore" long-name="OpenMAX IL Core" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcore/group" mrp="os/mm/omxil/omxilcore/group/multimedia_omx_il_core.mrp" version="1"/>
-</component>
-<component name="omxilcomponentcommon" long-name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcomponentcommon/group" mrp="os/mm/omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp" version="1"/>
-</component>
-<component name="omxilrefcomps" long-name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilrefcomps/ref_components/group" mrp="os/mm/omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp" version="1"/>
-</component>
-<component name="mmilapi" long-name="Multimedia Integration Layer API" introduced="^3" purpose="development">
-<unit bldFile="os/mm/omxil/mmilapi/group" mrp="os/mm/omxil/mmilapi/group/multimedia_il_api.mrp"/>
-</component>
-</collection>
-<collection name="devsound" long-name="Sound Device" level="devices">
-<component name="devsoundapi" long-name="DevSound API" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/devsound/devsoundapi/group" mrp="os/mm/devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
-</component>
-<component name="a3fdevsound" long-name="A3F DevSound" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3fdevsound/group" mrp="os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
-</component>
-<component name="a3facf" long-name="A3F Audio Component Framework" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3facf/group" mrp="os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
-</component>
-<component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/devsound/devsoundpluginsupport/group" mrp="os/mm/devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
-</component>
-<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">
-<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">
-<unit bldFile="os/mm/devsound/a3ftrace/group" mrp="os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
-</component>
-<component name="a3fsrvstart" long-name="A3F Server Start" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
-</component>
-</collection>
-<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
-<component name="devsoundhwdeviceapi" long-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 name="a3facl" long-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 name="a3fdevsoundcustomisation" long-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"/>
-</component>
-<component name="refacladapt" long-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"/>
-</component>
-<component name="videohai" long-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 name="dvbhreceiverhai" long-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>
-</block>
-<block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
-<collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
-<component name="exif_api" long-name="Exif API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagingext_plat" long-name="Imaging Extensions Platform Interfaces" level="app-if">
-<component name="jpeg2000_icl_plugin_api" long-name="JPEG2000 ICL plugin API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/jpeg2000_icl_plugin_api/group"/>
-</component>
-<component name="extended_icl_jpeg_api" long-name="Extended ICL Jpeg API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
-</component>
-<component name="h324_annex_k_custom_api" long-name="H324 Annex K Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/h324_annex_k_custom_api/group"/>
-</component>
-<component name="ecam_orientation_custom_api" long-name="ECam Orientation Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_orientation_custom_api/group"/>
-</component>
-<component name="ecam_ui_orientation_override_custom_api" long-name="ECam UI Orientation Override Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
-</component>
-<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>
-</collection>
-<collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
-<component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
-<unit bldFile="os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
-</component>
-<component name="imageadaptationextensions_build" filter="s60" long-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"/>
-</component>
-</collection>
-<collection name="imagingmodules" long-name="Imaging Modules" level="hw-if">
-<component name="exiflib" filter="s60" long-name="Exif Library">
-<unit bldFile="os/imagingext/imagingmodules/exiflib/group"/>
-</component>
-<component name="jp2kcodec" filter="s60" long-name="JPEG2000 Decoder Plugin" plugin="Y">
-<unit bldFile="os/imagingext/imagingmodules/jp2kcodec/group"/>
-</component>
-</collection>
-</block>
-<block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
-<component name="vgi" filter="s60" long-name="VGI">
-<unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
-</component>
-</collection>
-<collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adaptations">
-<component name="m3gcore11" filter="s60" long-name="M3G Core 1.1">
-<unit bldFile="os/graphics/m3g/m3gcore11/group"/>
-</component>
-</collection>
-<collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines">
-<component name="graphicsresource" long-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 name="graphicsresourceadaptation" long-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"/>
-</component>
-</collection>
-<collection name="graphicsutils" long-name="Graphics Utils" level="engines">
-<component name="commongraphicsheaders" long-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 name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
-<!-- displayldd to be moved here -->
-<component name="surfacemgr" long-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 name="graphicscomposition" long-name="Graphics Composition" level="engines">
-<component name="openwfcinterface" long-name="OpenWF Composition Interface" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfcinterface/group" mrp="os/graphics/graphicscomposition/openwfcinterface/group/graphics_openwfcinterface.mrp"/>
-</component>
-<component name="openwfcompositionengine" long-name="OpenWF Composition Engine" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/graphicscomposition/openwfcompositionengine/group" mrp="os/graphics/graphicscomposition/openwfcompositionengine/group/graphics_openwfcompositionengine.mrp"/>
-</component>
-<component name="openwfsupport" long-name="OpenWF Support" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfsupport/group" mrp="os/graphics/graphicscomposition/openwfsupport/group/graphics_openwfsupport.mrp"/>
-</component>
-<component name="surfaceupdate" long-name="Surface Update" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/surfaceupdate/group" mrp="os/graphics/graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
-</component>
-</collection>
-<collection name="graphicstest" long-name="Graphics Test" level="app-if">
-<component name="uibench" long-name="UI Bench" introduced="9.2" purpose="development">
-<unit bldFile="os/graphics/graphicstest/uibench/group" mrp="os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
-</component>
-</collection>
-<collection name="graphics_plat" long-name="Graphics Platform Interfaces" level="app-if">
-<component name="m3g_core_api" filter="sf_build" long-name="M3G Core API" class="api">
-<unit bldFile="os/graphics/graphics_plat/m3g_core_api/group"/>
-</component>
-</collection>
-<collection name="graphics_info" long-name="Graphics Info" level="app-if">
-<component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc">
-<unit mrp="os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
-</component>
-<component name="graphics_metadata" long-name="Graphics Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
-</component>
-</collection>
-<collection name="windowing" long-name="Windowing" level="app-if">
-<component name="windowserver" long-name="Window Server" purpose="mandatory">
-<unit bldFile="os/graphics/windowing/windowserver/group" mrp="os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
-</component>
-<component name="windowserverplugins" long-name="Window Server Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/windowing/windowserverplugins/group" mrp="os/graphics/windowing/windowserverplugins/group/graphics_wserv_std_plugins.mrp"/>
-</component>
-</collection>
-<collection name="printingservices" long-name="Printing Services" level="app-if">
-<component name="printerdriversupport" long-name="Printer Driver Support" purpose="optional">
-<unit bldFile="os/graphics/printingservices/printerdriversupport/group" mrp="os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
-</component>
-<component name="printerdrivers" long-name="Printer Drivers" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/printingservices/printerdrivers/group" mrp="os/graphics/printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
-</component>
-</collection>
-<collection name="fbs" long-name="Font and Bitmap Server" level="device-interface">
-<component name="fontandbitmapserver" long-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 name="opengles" long-name="OpenGLES" level="internal-adaptations">
-<component name="openglesinterface" long-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 name="opengles_stub" filter="sf_build" long-name="OpenGL ES Stub" purpose="optional" introduced="^2">
-<unit bldFile="os/graphics/opengles/openglesinterface/group/opengles_stub"/>
-</component>
-</collection>
-<collection name="openvg" long-name="OpenVG" level="internal-adaptations">
-<component name="openvginterface" long-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 name="openvg11" filter="s60" long-name="OpenVG 1.1">
-<!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
-<unit bldFile="os/graphics/openvg/openvginterface/group/openvg11"/>
-</component>
-<component name="sfopenvg" filter="sf_build" long-name="Khronos OpenVG Reference Implementation" introduced="^2" purpose="optional">
-<unit bldFile="os/graphics/openvg/openvgrefimplementation/sfopenvg/group"/>
-</component>
-</collection>
-<collection name="egl" long-name="EGL" level="internal-adaptations">
-<component name="eglinterface" long-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 name="eglswitch" long-name="EGL Switch" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglswitch/group" mrp="os/graphics/egl/eglswitch/group/graphics_eglswitch.mrp"/>
-</component>
-<component name="eglrefimpl" long-name="EGL Reference Implementation" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglrefimpl/group" mrp="os/graphics/egl/eglrefimpl/group/graphics_eglrefimpl.mrp"/>
-</component>
-<component name="egltest" long-name="EGL Tests" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/egl/egltest/group" mrp="os/graphics/egl/egltest/group/graphics_egltest.mrp"/>
-</component>
-</collection>
-<collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
-<component name="gdi" long-name="GDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/gdi/group" mrp="os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
-</component>
-<component name="bitgdi" long-name="BitGDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
-</component>
-<component name="colourpalette" long-name="Colour Palette" introduced="7.0s" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
-</component>
-<component name="screendriver" long-name="Screen Driver" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/graphicsdeviceinterface/screendriver/group" mrp="os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
-</component>
-<component name="directgdi" long-name="DirectGDI" introduced="^3" deprecated="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/directgdi/group" mrp="os/graphics/graphicsdeviceinterface/directgdi/group/graphics_directgdi.mrp"/>
-</component>
-<component name="directgdiinterface" long-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 name="directgdiadaptation" long-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"/>
-</component>
-</collection>
-<collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
-<component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/gdi_tools/group" mrp="os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
-</component>
-</collection>
-<collection name="graphicsapitest" long-name="Graphics API Tests" level="app-if"/>
-</block>
-<block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
-<collection name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" level="text">
-<component name="findutil_api" long-name="Find Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/findutil_api/group"/>
-</component>
-<component name="japanese_language_utilities_api" long-name="Japanese Language Utilities API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
-</component>
-<component name="sortutil_api" long-name="Sorting Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/sortutil_api/group"/>
-</component>
-</collection>
-<collection name="textandloc_pub" long-name="Text and Localisation Public Interfaces" level="text">
-<component name="directory_localizer_api" long-name="Directory Localizer API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_pub/directory_localizer_api/group"/>
-</component>
-</collection>
-<collection name="charconvfw" long-name="Character Conversion" level="encoding">
-<component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional">
-<unit bldFile="os/textandloc/charconvfw/charconv_fw/group" mrp="os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
-</component>
-<component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/charconvplugins/group" mrp="os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
-</component>
-<component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/fatfilenameconversionplugins/group" mrp="os/textandloc/charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
-</component>
-</collection>
-<collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
-<component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/textshaperplugin/group" mrp="os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
-</component>
-<component name="fontstore" long-name="Font Store" purpose="mandatory">
-<unit bldFile="os/textandloc/fontservices/fontstore/group" mrp="os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
-</component>
-<component name="textrendering" long-name="Text Rendering" purpose="mandatory" class="placeholder">
-<!-- placeholder for text code from GDI -->
-</component>
-<component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/freetypefontrasteriser/group" mrp="os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
-</component>
-<component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional">
-<unit bldFile="os/textandloc/fontservices/referencefonts/group" mrp="os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
-</component>
-</collection>
-<collection name="textlayout" long-name="Text Layout" level="text">
-<component name="texthandling" long-name="Text Handling" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/texthandling/group" mrp="os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
-</component>
-<component name="textformatting" long-name="Text Formatting" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/textformatting/group" mrp="os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
-</component>
-</collection>
-<collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
-<!-- components in this collection need to be moved to the right collection.
- Either move into the units' directories, or create a new textandlocutils directory -->
-<component name="numbergrouping" filter="s60" long-name="Number Grouping">
-<unit bldFile="os/textandloc/charconvfw/numbergrouping/group"/>
-</component>
-<component name="jplangutil" filter="s60" long-name="Japanese Language Utilities">
-<unit bldFile="os/textandloc/charconvfw/jplangutil/group"/>
-</component>
-<component name="sortutil" filter="s60" long-name="Sorting Utility">
-<unit bldFile="os/textandloc/charconvfw/sortutil/group"/>
-</component>
-<component name="inlinetext" filter="s60" long-name="Inline Text">
-<unit bldFile="os/textandloc/charconvfw/inlinetext/group"/>
-</component>
-<component name="nearestlangutil" long-name="Nearest Language Util" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-<component name="numberformatting" long-name="Number Formatting" introduced="7.0s" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/numberformatting/group" mrp="os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
-</component>
-</collection>
-<collection name="localesupport" long-name="Locale Support" level="util">
-<component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/localisation/localesupport" mrp="os/textandloc/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
-</component>
-<component name="initlocale" long-name="Initialise Locale" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-</collection>
-<collection name="textandloctools" long-name="Text and Localisation Tools" level="tools">
-<component name="fontcompiler" long-name="Font Compiler" purpose="development" class="placeholder PC">
-<!-- placeholder for split from GDI Tools -->
-</component>
-<component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/bitmapfonttools/group" mrp="os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
-</component>
-</collection>
-<collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
-<component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
-<collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
-<component name="xmlsrv_plat_build" long-name="XML Services Platform Interface Build" filter="s60" class="api">
-<!-- need to fix the configuration used here.
- Either destribute to other components or use the new feature flags confguration mechanisms.
- Remove this component and uncomment the other units when fixed-->
-<unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
-</component>
-<component name="xml_encryption_api" long-name="XML Encryption API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/> -->
-</component>
-<component name="xml_signature_api" long-name="XML Signature API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_signature_api/group"/> -->
-</component>
-<component name="xml_security_engine_utils_api" long-name="XML Security Engine Utils API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/> -->
-</component>
-</collection>
-<collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
-<component name="xmlseccertman" filter="s60" long-name="XML Security Certificate Manager">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
-</component>
-<component name="xmlsec" filter="s60" long-name="XML Security">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsec/group"/>
-</component>
-<component name="xmlseccrypto" filter="s60" long-name="XML Security Crypto">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccrypto/group"/>
-</component>
-<component name="xmlsecwrapper" filter="s60" long-name="XML Security Wrapper">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsecwrapper/group"/>
-</component>
-</collection>
-<collection name="xml" long-name="XML" level="generic">
-<component name="xmlfw" long-name="XML Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmlfw/group" mrp="os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
-</component>
-<component name="libxml2libs" long-name="Libxml2 Libraries" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/libxml2libs/group" mrp="os/xmlsrv/xml/libxml2libs/group/syslibs_libxml2.mrp"/>
-</component>
-<component name="legacyminidomparser" long-name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/legacyminidomparser/GROUP" mrp="os/xmlsrv/xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp"/>
-</component>
-<component name="xmldomandxpath" long-name="XML DOM and XPath" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmldomandxpath/group" mrp="os/xmlsrv/xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
-</component>
-<component name="xmlexpatparser" long-name="XML Expat Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmlexpatparser/group" mrp="os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
-</component>
-<component name="xmllibxml2parser" long-name="XML Libxml2 Parser" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmllibxml2parser/group" mrp="os/xmlsrv/xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
-</component>
-<component name="wbxmlparser" long-name="WBXML Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/wbxmlparser/group" mrp="os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
-</component>
-</collection>
-<collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
-<component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="deviceplatformrelease" level="services" long-name="Device Platform Release" levels="bld mid top">
-<collection name="s60extras" long-name="S60 Extras" level="mid">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="s60extras_build" filter="s60" long-name="S60 Extras Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/S60Extras/group"/>
-</component>
-</collection>
-<collection name="locfiles" long-name="Locale Files" level="mid">
-<component name="locfiles_build" filter="s60" long-name="S60 Locale Files Build" purpose="development" class="config">
-<!-- need to move component down a directory -->
-<unit bldFile="os/deviceplatformrelease/locfiles/group"/>
-</component>
-<component name="locfiles_set1" long-name="Locale Files Set 1" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set1"/>
-</component>
-<component name="locfiles_set2" long-name="Locale Files Set 2" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set2"/>
-</component>
-<component name="locfiles_set3" long-name="Locale Files Set 3" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set3"/>
-</component>
-<component name="locfiles_set4" long-name="Locale Files Set 4" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set4"/>
-</component>
-<component name="locfiles_set5" long-name="Locale Files Set 5" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set5"/>
-</component>
-<component name="locfiles_set6" long-name="Locale Files Set 6" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set6"/>
-</component>
-<!-- is the a problem with SF builds with the following? -->
-<component name="locfiles_set7" long-name="Locale Files Set 7" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set7"/>
-</component>
-<component name="locfiles_set8" long-name="Locale Files Set 8" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set8"/>
-</component>
-<component name="locfiles_set9" long-name="Locale Files Set 9" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set9"/>
-</component>
-<component name="locfiles_set10" long-name="Locale Files Set 10" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set10"/>
-</component>
-<component name="locfiles_set11" long-name="Locale Files Set 11" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set11"/>
-</component>
-<component name="locfiles_set12" long-name="Locale Files Set 12" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set12"/>
-</component>
-<component name="locfiles_set13" long-name="Locale Files Set 13" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set13"/>
-</component>
-<component name="locfiles_set14" long-name="Locale Files Set 14" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set14"/>
-</component>
-<component name="locfiles_set15" long-name="Locale Files Set 15" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set15"/>
-</component>
-<component name="locfiles_set16" long-name="Locale Files Set 16" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set16"/>
-</component>
-</collection>
-<collection name="version" long-name="Version" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="version_build" filter="s60" long-name="Version Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/Version/group"/>
-</component>
-</collection>
-<collection name="helps_loc2" long-name="Helps Locale 2" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helps_loc2_build" long-name="Helps Locale 2 Build" filter="s60">
-<unit bldFile="os/deviceplatformrelease/helps_loc2/group"/>
-</component>
-</collection>
-<collection name="sf_config" long-name="SF Config" level="mid">
-<component name="config" filter="s60" long-name="Config" purpose="development" class="config"/>
-<component name="cenrep" filter="sf_build" long-name="ConE Central Repository Config" purpose="development" class="config">
-<!-- will shoudl give the id/path something more unique than cenrep -->
-<unit bldFile="os/deviceplatformrelease/sf_config/cenrep/group"/>
-</component>
-<component name="rombuild_syborg" filter="sf_build" long-name="Syborg iMaker Config" purpose="development" introduced="^3" class="config">
-<unit bldFile="os/deviceplatformrelease/sf_config/rombuild/syborg/group"/>
-</component>
-<component name="rombuild_zoom2" filter="sf_build" long-name="Zoom2 iMaker Config" purpose="development" introduced="^3" class="config">
-<unit bldFile="os/deviceplatformrelease/sf_config/rombuild/zoom2/group"/>
-</component>
-</collection>
-<!-- should be located locally in buildplatforms/group. NB. This is a different package! -->
-<collection name="s60bld" long-name="S60 Build">
-<component name="buildplatforms" filter="s60" long-name="Build Platforms">
-<unit bldFile="tools/buildplatforms/group"/>
-</component>
-</collection>
-<collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
-<component name="cedarutils" long-name="Cedar Utils" purpose="development">
-<unit mrp="os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
-</component>
-<component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt" purpose="development" class="config">
-<unit mrp="os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
-</component>
-<component name="foundation_s60_packages" long-name="Foundation S60 Packages" introduced="^3" deprecated="^3" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/symbianosbld/foundation_s60_packages/foundation_s60_packages.mrp"/>
-</component>
-</collection>
-<collection name="foundation_system" long-name="Foundation System" level="top">
-<component name="system_model" long-name="System Model" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
-</component>
-</collection>
-<collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
-<component name="deviceplatformrelease_metadata" long-name="Device Platform Release Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="osrndtools" level="services" long-name="OS R&D tools" levels="fw trace">
-<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"/>
-</component>
-<component name="testinterface" filter="s60" long-name="Test Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/testinterface/group"/>
-</component>
-<component name="testserver" filter="s60" long-name="Test Server" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserver/group"/>
-</component>
-<component name="testengine" filter="s60" long-name="Test Engine" purpose="development">
-<unit bldFile="os/osrndtools/stif/testengine/group"/>
-</component>
-<component name="testserverstarter" filter="s60" long-name="Test Server Starter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserverstarter/group"/>
-</component>
-<component name="stiftfwif" filter="s60" long-name="STIF Test Framework Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/stiftfwif/group"/>
-</component>
-<component name="consoleui" filter="s60" long-name="Console UI" purpose="development">
-<unit bldFile="os/osrndtools/stif/consoleui/group"/>
-</component>
-<component name="testcombiner" filter="s60" long-name="Test Combiner" purpose="development">
-<unit bldFile="os/osrndtools/stif/testcombiner/group"/>
-</component>
-<component name="demomodule" filter="s60" long-name="Demo Module" purpose="development">
-<unit bldFile="os/osrndtools/stif/demomodule/group"/>
-</component>
-<component name="atslogger" filter="s60" long-name="ATS Logger" purpose="development">
-<unit bldFile="os/osrndtools/stif/atslogger/group"/>
-</component>
-<component name="atsinterface" filter="s60" long-name="ATS Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/atsinterface/group"/>
-</component>
-<component name="testscripter" filter="s60" long-name="Test Scripter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testscripter/group"/>
-</component>
-<component name="suevent" filter="s60" long-name="SU Event" purpose="development">
-<unit bldFile="os/osrndtools/stif/suevent/group"/>
-</component>
-<component name="stifkerneltestclassbase" filter="s60" long-name="STIF Kernel Test Class Base" purpose="development">
-<!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
-<!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
-</component>
-<component name="stif_build" filter="s60" long-name="STIF Build" purpose="development">
-<!-- move exports into self-contained component. Remove this when configuration is in place-->
-<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">
-<unit bldFile="os/osrndtools/memspy/memspy_plat/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/engine/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/console/group"/>
-</component>
-<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>
-</collection>
-<collection name="hti" long-name="Harmonized Test Interface" level="trace">
-<component name="hti_plat" filter="s60" long-name="HTI Platform Interfaces" purpose="development" class="api">
-<unit bldFile="os/osrndtools/hti/hti_plat/group"/>
-</component>
-<component name="hticfg" filter="s60" long-name="HTI Config" purpose="development">
-<unit bldFile="os/osrndtools/hti/hticfg/group"/>
-</component>
-<component name="htiautostart" filter="s60" long-name="HTI Autostart" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiautostart/group"/>
-</component>
-<component name="htiframework" filter="s60" long-name="HTI Framework" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiframework/group"/>
-</component>
-<component name="hticommplugins" filter="s60" long-name="HTI Communication Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
-</component>
-<component name="htiserviceplugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
-</component>
-<component name="htifilehlp" filter="s60" long-name="HTI File Help" purpose="development">
-<unit bldFile="os/osrndtools/hti/htifilehlp/group"/>
-</component>
-<component name="htiwatchdog" filter="s60" long-name="HTI Watchdog" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiwatchdog/group"/>
-</component>
-<component name="hti_build" filter="s60" long-name="HTI Build" purpose="development">
-<!-- move exports into self-contained component.-->
-<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">
-<block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
-<collection name="appsupport_pub" long-name="Generic Application Support Public Interfaces" level="specific">
-<component name="flash_viewer_framework_api" long-name="Flash Viewer Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
-</component>
-<component name="network_status_api" long-name="Network Status API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/network_status_api/group"/>
-</component>
-</collection>
-<collection name="appsupport_plat" long-name="Generic Application Support Platform Interfaces" level="specific">
-<component name="action_plugin_api" long-name="Action Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/action_plugin_api/group"/>
-</component>
-<component name="application_orientation_api" long-name="Application Orientation API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/application_orientation_api/group"/>
-</component>
-<component name="context_access_api" long-name="Context Access API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_access_api/group"/>
-</component>
-<component name="context_framework_services_api" long-name="Context Framework Services API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_services_api/group"/>
-</component>
-<component name="context_framework_client_api" long-name="Context Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_client_api/group"/>
-</component>
-<component name="context_framework_listener_api" long-name="Context Framework Listener API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_listener_api/group"/>
-</component>
-<component name="context_framework_version_api" long-name="Context Framework Version API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_version_api/group"/>
-</component>
-<component name="context_source_plugin_api" long-name="Context Source Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_plugin_api/group"/>
-</component>
-<component name="context_source_settings_manager_api" long-name="Context Source Settings Manager API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_settings_manager_api/group"/>
-</component>
-<component name="context_subscription_api" long-name="Context Subscription API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_subscription_api/group"/>
-</component>
-<component name="key_event_framework_api" long-name="Key Event Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_api/group"/>
-</component>
-<component name="key_event_framework_mapper_api" long-name="Key Event Framework Mapper API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_mapper_api/group"/>
-</component>
-<component name="media_keys_definition_api" long-name="Media Keys Definition API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/media_keys_definition_api/group"/>
-</component>
-<component name="ood_threshold_api" long-name="OOD Threshold API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/ood_threshold_api/group"/>
-</component>
-<component name="oom_monitor_api" long-name="OOM Monitor API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_api/group"/>
-</component>
-<component name="oom_monitor_plugin_api" long-name="OOM Monitor Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_plugin_api/group"/>
-</component>
-<component name="operation_provider_api" long-name="Operation Provider API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/operation_provider_api/group"/>
-</component>
-<component name="phonecmdhandler_api" long-name="Phone Command Handler API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/phonecmdhandler_api/group"/>
-</component>
-<component name="restore_factory_settings_api" long-name="Restore Factory Settings API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_api/group"/>
-</component>
-<component name="restore_factory_settings_plugin_api" long-name="Restore Factory Settings Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_plugin_api/group"/>
-</component>
-<component name="secondary_display_accfw_api" long-name="Secondary Display Accessory Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_accfw_api/group"/>
-</component>
-<component name="secondary_display_startup_api" long-name="Secondary Display Startup API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_startup_api/group"/>
-</component>
-<component name="secondary_display_sysap_api" long-name="Secondary Display System Application API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_sysap_api/group"/>
-</component>
-<component name="secondary_display_system_state_api" long-name="Secondary Display System State API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_system_state_api/group"/>
-</component>
-<component name="sensor_user_setting_api" long-name="Sensor User Setting API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/sensor_user_setting_api/group"/>
-</component>
-<component name="startup_configuration_api" long-name="Startup Configuration API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/startup_configuration_api/group"/>
-</component>
-<component name="system_application_key_handler_plugin_api" long-name="System Application Key Handler Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_key_handler_plugin_api/group"/>
-</component>
-<component name="system_application_light_control_plugin_api" long-name="System Application Light Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_light_control_plugin_api/group"/>
-</component>
-<component name="system_application_notification_api" long-name="System Application Notification API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_notification_api/group"/>
-</component>
-<component name="system_application_plugin_callback_api" long-name="System Application Plug-in Callback API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
-</component>
-</collection>
-<collection name="contextframework" long-name="Context Framework" level="framework">
-<!-- the units that are commented out need to be put back when configuration is in place.
- They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
-<component name="cfw" filter="s60" long-name="Context Framework">
-<!--<unit bldFile="contextframework/cfw/group"/> -->
-</component>
-<component name="cfwplugins" filter="s60" long-name="Context Framework Plugins" plugin="Y">
-<!--<unit bldFile="contextframework/cfwplugins/group"/>-->
-</component>
-<component name="contextframework_build" filter="s60" long-name="Context Framework Build">
-<unit bldFile="mw/appsupport/contextframework/group"/>
-</component>
-</collection>
-<collection name="coreapplicationuis" long-name="Core Application UIs" level="server">
-<component name="dbrecovery" filter="s60" long-name="Database Recovery">
-<unit bldFile="mw/appsupport/coreapplicationuis/dbrecovery/group"/>
-</component>
-<component name="nspswsplugin" filter="s60" long-name="NSPS WS Plugin" plugin="Y">
-<!-- No Service Power Save? Window Server? Please elaborate-->
-<unit bldFile="mw/appsupport/coreapplicationuis/nspswsplugin/group"/>
-</component>
-<component name="rfs" filter="s60" long-name="Restore Factory Settings">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfs/group"/>
-</component>
-<component name="rfsplugins" filter="s60" long-name="Restore Factory Settings Plugins" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/group"/>
-</component>
-<component name="sysap" filter="s60" long-name="System Application">
-<unit bldFile="mw/appsupport/coreapplicationuis/sysap/group"/>
-</component>
-<component name="variatedsettings" filter="s60" long-name="Variated Settings" class="config">
-<unit bldFile="mw/appsupport/coreapplicationuis/variatedsettings/group"/>
-</component>
-<component name="accfwuinotifier" filter="s60" long-name="Accessory Framework UI Notifier" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/accfwuinotifier/group"/>
-</component>
-<component name="kefmapper" filter="s60" long-name="Key Event Framework">
-<unit bldFile="mw/appsupport/coreapplicationuis/kefmapper/group"/>
-</component>
-<component name="advancedtspcontroller" filter="s60" long-name="Advanced TSP Controller">
-<unit bldFile="mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
-</component>
-<component name="powersaveutilities" filter="s60" long-name="Power Save Utilities">
-<unit bldFile="mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
-</component>
-<component name="gsserverenginestub" filter="s60" long-name="GS Server Engine Stub">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
-</component>
-<component name="gsserverengine" filter="s60" long-name="GS Server Engine">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverengine/group"/>
-</component>
-<component name="sensordatacompensatorplugin" filter="s60" long-name="Sensor Data Compensator Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/group"/>
-</component>
-</collection>
-<collection name="flashliteapi_3_1" long-name="Flash Lite API 3.1" level="specific">
-<!-- collection is really a component. Move down a directory -->
-<component name="flashliteapi_3_1_build" long-name="Flash Lite API Build" filter="s60" introduced="^2"/>
-</collection>
-<collection name="mediakeys" long-name="Media Keys" level="plugin">
-<!-- collection is really a component. Move down a directory -->
-<component name="mediakeys_build" filter="s60" long-name="Media Keys Build">
-<unit bldFile="mw/appsupport/mediakeys/group"/>
-</component>
-</collection>
-<collection name="startupservices" long-name="Startup Services" level="system">
-<component name="splashscreen" filter="s60" long-name="Splash Screen">
-<unit bldFile="mw/appsupport/startupservices/splashscreen/group"/>
-</component>
-<component name="startupanimation" filter="s60" long-name="Startup Animation">
-<unit bldFile="mw/appsupport/startupservices/startupanimation/group"/>
-</component>
-<component name="startup" long-name="Startup Application" filter="s60">
-<unit bldFile="mw/appsupport/startupservices/startup/group"/>
-</component>
-</collection>
-<collection name="sysresmonitoring" long-name="System Resource Monitoring" level="system">
-<component name="oodmonitor" filter="s60" long-name="OOD Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oodmonitor/group"/>
-</component>
-<component name="oommonitor" filter="s60" long-name="OOM Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oommonitor/group"/>
-</component>
-</collection>
-<collection name="systemsettings" long-name="System Settings" level="system">
-<component name="gssensorplugin" filter="s60" long-name="GS Sensor Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gssensorplugin/group"/>
-</component>
-<component name="gsaccessoryplugin" filter="s60" long-name="GS Accessory Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gsaccessoryplugin/group"/>
-</component>
-</collection>
-<collection name="filehandling" long-name="File Handling" level="server">
-<component name="fileconverterfw" long-name="File Converter Framework" purpose="optional">
-<unit bldFile="mw/appsupport/filehandling/fileconverterfw/group" mrp="mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
-</component>
-<component name="htmltorichtextconverter" long-name="HTML to RichText Converter" introduced="7.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/htmltorichtextconverter/group" mrp="mw/appsupport/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
-</component>
-<component name="richtexttohtmlconverter" long-name="RichText to HTML Converter" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
-</component>
-</collection>
-<collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
-<component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
-</component>
-</collection>
-<collection name="commonappservices" long-name="Common Application Services" level="framework">
-<component name="alarmserver" long-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"/>
-</component>
-<component name="alarmservertest" long-name="Alarm Server Test" deprecated="^3" introduced="8.1" purpose="development">
-<unit bldFile="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
-</component>
-<component name="appservicesdocs" long-name="Application Services Documentation" purpose="development" class="doc">
-<unit mrp="mw/appsupport/commonappservices/appservicesdocs/app-services_documentation.mrp"/>
-</component>
-<component name="backuprestorenotification" long-name="Backup Restore Notification" introduced="8.1" purpose="optional">
-<unit bldFile="mw/appsupport/commonappservices/backuprestorenotification/group" mrp="mw/appsupport/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
-</component>
-</collection>
-<collection name="tzservices" long-name="Time Zone Services" level="plugin">
-<component name="tzserver" long-name="Time Zone Server" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzserver/group" mrp="mw/appsupport/tzservices/tzserver/group/app-services_tz.mrp"/>
-</component>
-<component name="tzloc" long-name="Time Zone Localization" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzloc/group" mrp="mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
-</component>
-<component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzlocrscfactory/group" mrp="mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
-</component>
-<component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzdatabase/group" mrp="mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
-</component>
-</collection>
-<collection name="contenthandling" long-name="Content Handling" level="plugin">
-<component name="webrecognisers" long-name="Web Recognisers" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/contenthandling/webrecognisers/group" mrp="mw/appsupport/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
-</component>
-</collection>
-<collection name="openenvutils" long-name="Open Environment Utilities" level="specific">
-<component name="commandshell" long-name="Command Shell" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/commandshell/group" mrp="mw/appsupport/openenvutils/commandshell/group/oetools_zsh.mrp"/>
-</component>
-<component name="telnetserver" long-name="Telnet Server" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/telnetserver/group" mrp="mw/appsupport/openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
-</component>
-</collection>
-<collection name="printingsupport" long-name="Printing Support" level="generic">
-<component name="printinguisupport" long-name="Printing UI Support" purpose="optional" introduced="^2" deprecated="^3">
-<unit bldFile="mw/appsupport/printingsupport/printinguisupport/group" mrp="mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
-</component>
-</collection>
-<collection name="appfw" long-name="Application Framework" level="framework">
-<component name="apparchitecture" long-name="Application Architecture" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/apparchitecture/group" mrp="mw/appsupport/appfw/apparchitecture/group/app-framework_apparc.mrp"/>
-</component>
-<component name="viewserver" long-name="View Server" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/viewserver/group" mrp="mw/appsupport/appfw/viewserver/group/app-framework_viewsrv.mrp"/>
-</component>
-</collection>
-<collection name="applaunchservices" long-name="Application Launch Services" level="generic">
-<component name="aftermarketappstarter" long-name="After Market Application Starter" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/aftermarketappstarter/group" mrp="mw/appsupport/applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
-</component>
-<component name="applaunchplugins" long-name="Application Launch Plugins" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/applaunchplugins/group" mrp="mw/appsupport/applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
-</component>
-</collection>
-<collection name="tzpcside" long-name="Time Zone PC Side" level="plugin">
-<component name="tzcompiler" long-name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config PC">
-<unit bldFile="mw/appsupport/tzpcside/tzcompiler/group" mrp="mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
-</component>
-</collection>
-<collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
-<component name="appsupport_metadata" long-name="Generic Application Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="securitysrv" level="generic" long-name="Security Services" levels="plugin framework server generic specific">
-<collection name="secsrv_plat" long-name="Security Services Platform Interfaces" level="specific">
-<component name="cms_api" long-name="CMS API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/cms_api/group"/>
-</component>
-<component name="pkcs12_parser_api" long-name="PKCS12 Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkcs12_parser_api/group"/>
-</component>
-<component name="java_utils_api" long-name="Java Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/java_utils_api/group"/>
-</component>
-<component name="wim_cert_api" long-name="WIM Cert API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/wim_cert_api/group"/>
-</component>
-<component name="device_key_store_encryption_plugin_api" long-name="Device Key Store Encryption Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/device_key_store_encryption_plugin_api/group"/>
-</component>
-<component name="x509certnameparser_api" long-name="X.509 Certificate Name Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
-</component>
-<component name="remote_lock_api" long-name="Remote Lock API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
-</component>
-<component name="pkidialog_api" long-name="PKI Dialog API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
-</component>
-<component name="provisioning_api" long-name="Provisioning API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/provisioning_api/group"/>
-</component>
-<component name="keyguard_configuration_api" long-name="Keyguard Configuration API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_configuration_api/group"/>
-</component>
-<component name="keylock_policy_api" long-name="Keylock Policy API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keylock_policy_api/group"/>
-</component>
-<component name="security_code_ui_api" long-name="Security Code UI API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
-</component>
-<component name="gba_api" long-name="GBA API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/gba_api/group"/>
-</component>
-<component name="keyguard_access_api" long-name="Keyguard Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_access_api/group"/>
-</component>
-<component name="devicelock_access_api" long-name="Device Lock Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devicelock_access_api/group"/>
-</component>
-<component name="lockapp_server_api" long-name="Lock Application Server API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
-</component>
-<component name="devencadaptation_api" long-name="Device Encryption Adaptation API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
-</component>
-<component name="devenccommonutils_api" long-name="Device Encryption Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
-</component>
-</collection>
-<collection name="cms" long-name="Certificate Management Service" level="server">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="cms_build" filter="s60" long-name="CMS" introduced="^3">
-<unit bldFile="mw/securitysrv/cms/group"/>
-</component>
-</collection>
-<collection name="pkiutilities" long-name="PKI Utilities" level="plugin">
-<component name="x509certnameparser" filter="s60" long-name="X.509 Certificate Name Parser">
-<unit bldFile="mw/securitysrv/pkiutilities/x509certnameparser/group"/>
-</component>
-<component name="pkcs12" filter="s60" long-name="PKCS #12">
-<unit bldFile="mw/securitysrv/pkiutilities/pkcs12/group"/>
-</component>
-<component name="certmanui" filter="s60" long-name="Certificate Management UI">
-<unit bldFile="mw/securitysrv/pkiutilities/certmanui/group"/>
-</component>
-<component name="ctsecuritydialogs" filter="s60" long-name="Crypto Token Security Dialogs">
-<unit bldFile="mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
-</component>
-<component name="certsaver" filter="s60" long-name="Certificate Saver">
-<unit bldFile="mw/securitysrv/pkiutilities/certsaver/group"/>
-</component>
-<component name="secmodui" filter="s60" long-name="Security Module UI">
-<unit bldFile="mw/securitysrv/pkiutilities/secmodui/group"/>
-</component>
-<component name="devicetoken" filter="s60" long-name="Device Token">
-<unit bldFile="mw/securitysrv/pkiutilities/devicetoken/group"/>
-</component>
-<component name="certificates" filter="s60" long-name="Certificates">
-<unit bldFile="mw/securitysrv/pkiutilities/Certificates/group" filter="sf_build"/>
-</component>
-<component name="pkiutilities_build" filter="s60" long-name="PKI Utilities Build">
-<!-- need to split this into the above components -->
-<unit bldFile="mw/securitysrv/pkiutilities/group"/>
-</component>
-<component name="ocsp" long-name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
-<unit bldFile="mw/securitysrv/pkiutilities/ocsp/group" mrp="mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
-</component>
-</collection>
-<collection name="wim" long-name="Wireless Identity Module " level="framework">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="wim_build" filter="s60" long-name="WIM Build">
-<unit bldFile="mw/securitysrv/wim/group"/>
-</component>
-</collection>
-<collection name="remotelock" long-name="Remote Lock" level="generic">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="remotelock_build" filter="s60" long-name="Remote Lock Build">
-<unit bldFile="mw/securitysrv/remotelock/group"/>
-</component>
-</collection>
-<collection name="securitydialogs" long-name="Security Dialogs" level="specific">
-<component name="keylockpolicyapi" filter="s60" long-name="Keylock Policy API">
-<unit bldFile="mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
-</component>
-<component name="autolock" long-name="Autolock" filter="s60">
-<unit bldFile="mw/securitysrv/securitydialogs/autolock/group"/>
-</component>
-<component name="secui" filter="s60" long-name="Security UI">
-<unit bldFile="mw/securitysrv/securitydialogs/secui/group"/>
-</component>
-<component name="securitynotifier" filter="s60" long-name="Security Notifier">
-<unit bldFile="mw/securitysrv/securitydialogs/securitynotifier/group"/>
-</component>
-<component name="lockclient" filter="s60" long-name="Lock Client" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockclient/group"/>
-</component>
-<component name="lockapp" filter="s60" long-name="Lock Application" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockapp/group"/>
-</component>
-<component name="simlockui" filter="s60" long-name="SIM Lock UI" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/simlockui/group"/>
-</component>
-</collection>
-<collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="boottimeintegritycheck_build" filter="s60" long-name="Boot Time Integrity Check Build">
-<unit bldFile="mw/securitysrv/boottimeintegritycheck/group"/>
-</component>
-</collection>
-<collection name="gba" long-name="Generic Bootstrapping Architecture" level="server">
-<component name="uicc" filter="s60" long-name="UICC" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/uicc/group"/>
-</component>
-<component name="gbaserver" filter="s60" long-name="GBA Server" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaserver/group"/>
-</component>
-<component name="gbaapi" filter="s60" long-name="GBA API" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaapi/group"/>
-</component>
-<component name="gbafilter" filter="s60" long-name="GBA HTTP Filter" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/gbafilter/group"/>
-</component>
-<component name="gba_build" filter="s60" long-name="Generic Boot Architecture Build" introduced="^2">
-<!-- need to split this into the above components, or remove #includes and make this GBA ROM -->
-<unit bldFile="mw/securitysrv/gba/group"/>
-</component>
-</collection>
-<collection name="devencdiskutils" long-name="Device Encryption Disk Utils" level="server">
-<component name="devenccommonutils" filter="s60" long-name="Device Encryption Common Utils" introduced="^3">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncCommonUtils/group"/>
-</component>
-<component name="devencrfsplugin" filter="s60" long-name="Device Encryption RFS Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncRfsPlugin/group"/>
-</component>
-<component name="pk5recognizer" filter="s60" long-name="Device Encryption Pk5 Recognizer" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/Pk5Recognizer/group"/>
-</component>
-<component name="devencstarter" filter="s60" long-name="Device Encryption Starter" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncStarter/group"/>
-</component>
-<component name="devencdiskutils" filter="s60" long-name="Device Encryption Disk Utils Build" introduced="^3">
-<!-- need to split this into the above components, or remove #includes and make this a ROM component-->
-<unit bldFile="mw/securitysrv/devencdiskutils/group"/>
-</component>
-</collection>
-<collection name="securitysrv_info" long-name="Security Services Info" level="specific">
-<component name="securitysrv_metadata" long-name="Security Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="drm" level="generic" long-name="DRM" levels="plugin framework server generic specific">
-<collection name="drm_plat" long-name="DRM Platform Interfaces" level="specific">
-<component name="roap_api" long-name="ROAP API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/roap_api/group"/>
-</component>
-<component name="drm_common_api" long-name="DRM Common API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_common_api/group"/>
-</component>
-<component name="drm_rights_api" long-name="DRM Rights API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_rights_api/group"/>
-</component>
-<component name="drm_legacy_api" long-name="DRM Legacy API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_legacy_api/group"/>
-</component>
-<component name="dcf_repository_api" long-name="DCF Repository API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/dcf_repository_api/group"/>
-</component>
-<component name="drm_service_api" long-name="DRM Service API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_service_api/group"/>
-</component>
-<component name="drm_secondary_display_api" long-name="DRM Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_secondary_display_api/group"/>
-</component>
-<component name="drm_license_manager_api" long-name="DRM License Manager API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_license_manager_api/group"/>
-</component>
-<component name="drm_utility_api" long-name="DRM Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_utility_api/group"/>
-</component>
-<component name="drm_agents_api" long-name="DRM Agents API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_agents_api/group"/>
-</component>
-<component name="wmdrm_core_api" long-name="WM DRM Core API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_core_api/group"/>
-</component>
-<component name="wmdrm_access_api" long-name="WMDRM Access API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_access_api/group"/>
-</component>
-<component name="wmdrm_ota_access_api" long-name="WMDRM OTA Access API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_ota_access_api/group"/>
-</component>
-<component name="camese_utility_api" long-name="Camese Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_utility_api/group"/>
-</component>
-<component name="camese_framework_api" long-name="Camese Framework API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_framework_api/group"/>
-</component>
-</collection>
-<collection name="drm_pub" long-name="DRM Public Interfaces" level="specific">
-<component name="drm_helper_api" long-name="DRM Helper API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_helper_api/group"/>
-</component>
-<component name="oma_drm_caf_agent_api" long-name="OMA DRM CAF Agent API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/group"/>
-</component>
-<component name="drm_license_checker_api" long-name="DRM License Checker API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_license_checker_api/group"/>
-</component>
-</collection>
-<collection name="commondrm" long-name="Common DRM" level="generic">
-<!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
-<component name="drmencryptor" filter="s60" long-name="DRM Encryptor" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmsettingsplugin" filter="s60" long-name="DRM Settings Plugin" plugin="Y" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmrightsmanagerui" filter="s60" long-name="DRM Rights Manager UI">
-<unit bldFile="mw/drm/commondrm/drmrightsmanagerui/help/group"/>
-</component>
-<component name="drmutility" filter="s60" long-name="DRM Utility">
-<!-- Uncomment unit when configuration is in place. Currently #included from commondrm_build -->
-<!--<unit bldFile="commondrm/drmutility/group"/>-->
-</component>
-<component name="drmserviceapiwrapper" filter="s60" long-name="DRM Service API Wrapper">
-<unit bldFile="mw/drm/commondrm/drmserviceapiwrapper/group"/>
-</component>
-<component name="drmrightsstoringlocation" filter="s60" long-name="DRM Rights Storing Location">
-<unit bldFile="mw/drm/commondrm/drmrightsstoringlocation/group"/>
-</component>
-<component name="commondrm_build" filter="s60" long-name="Common DRM Build">
-<!-- should be split into the above files, or them collapsed into a single component -->
-<unit bldFile="mw/drm/commondrm/group"/>
-</component>
-</collection>
-<collection name="omadrm" long-name="OMA DRM" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="omadrm_build" filter="s60" long-name="OMA DRM Build">
-<unit bldFile="mw/drm/omadrm/group"/>
-</component>
-<component name="foundationcerts" filter="sf_build" long-name="Foundation Certificates">
-<unit bldFile="mw/drm/omadrm/foundationcerts/group"/>
-</component>
-</collection>
-<collection name="wmdrm" long-name="Windows Media DRM" level="framework">
-<!-- collection is really a component. Move down a directory -->
-<component name="wmdrm_build" filter="s60" long-name="WM DRM Build">
-<unit bldFile="mw/drm/wmdrm/group"/>
-</component>
-</collection>
-<collection name="drm_info" long-name="DRM Info" level="specific"/>
-</block>
-<block name="locationsrv" level="specific" long-name="Location Services" levels="plugin fw server if">
-<collection name="locsrv_pub" long-name="Location Services Public Interfaces" level="if">
-<component name="landmarks_search_api" long-name="Landmarks Search API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
-</component>
-<component name="landmarks_api" long-name="Landmarks API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/group"/>
-</component>
-<component name="landmarks_database_management_api" long-name="Landmarks Database Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/group"/>
-</component>
-<component name="location_triggering_api" long-name="Location Triggering API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/location_triggering_api/group"/>
-</component>
-<component name="blid_application_satellite_info_api" long-name="BLID Application Satellite Info API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/group"/>
-</component>
-</collection>
-<collection name="locsrv_plat" long-name="Location Services Platform Interfaces" level="if">
-<component name="map_and_navigation_api" long-name="Map and Navigation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/group"/>
-</component>
-<component name="map_and_navigation_provider_discovery_api" long-name="Map and Navigation Provider Discovery API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/group"/>
-</component>
-<component name="geocoding_api" long-name="Geocoding API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
-</component>
-<component name="map_image_api" long-name="Map Image API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/group"/>
-</component>
-<component name="map_and_navigation_aiw_api" long-name="Map and Navigation AIW API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_aiw_api/group"/>
-</component>
-<component name="map_and_navigation_provider_api" long-name="Map and Navigation Provider API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_api/group"/>
-</component>
-<component name="landmarks_category_definition_api" long-name="Landmarks Category Definition API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
-</component>
-<component name="supl_settings_api" long-name="SUPL Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
-</component>
-<component name="location_settings_launch_api" long-name="Location Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/group"/>
-</component>
-<component name="map_image_conversion_plugin_api" long-name="Map Image Conversion Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/group"/>
-</component>
-<component name="psy_configuration_ui_plugin_api" long-name="PSY Configuration UI Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/psy_configuration_ui_plugin_api/group"/>
-</component>
-<component name="np_proxy_configuration_api" long-name="NP Proxy Configuration API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/np_proxy_configuration_api/group"/>
-</component>
-<component name="supl_terminal_initiation_api" long-name="SUPL Terminal Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/group"/>
-</component>
-<component name="location_notation_preferences_settings_api" long-name="Location Notation Preferences Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_notation_preferences_settings_api/group"/>
-</component>
-<component name="supl_settings_notifier_secondary_display_api" long-name="SUPL Settings Notifier Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_notifier_secondary_display_api/group"/>
-</component>
-<component name="supl_network_initiation_api" long-name="SUPL Network Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/group"/>
-</component>
-<component name="privacy_notifiers_secondary_display_api" long-name="Privacy Notifiers Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/privacy_notifiers_secondary_display_api/group"/>
-</component>
-<component name="oma_supl_configuration_parameter_api" long-name="OMA SUPL Configuration Parameter API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_configuration_parameter_api/group"/>
-</component>
-<component name="supl_query_secondary_display_api" long-name="SUPL Query Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_query_secondary_display_api/group"/>
-</component>
-<component name="location_triggering_management_api" long-name="Location Triggering Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_management_api/group"/>
-</component>
-<component name="location_triggering_status_information_api" long-name="Location Triggering Status Information API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_status_information_api/group"/>
-</component>
-<component name="oma_supl_asn_codec_plugin_api" long-name="OMA SUPL ASN Codec Plugin API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
-</component>
-<component name="query_and_notification_api" long-name="Query and Notification API" filter="s60" introduced="^3" class="api">
-<!-- needs metadata file: <meta rel="Api" href="locsrv_plat/query_and_notification_api/query_and_notification_api.metaxml"/> -->
-<unit bldFile="mw/locationsrv/locsrv_plat/query_and_notification_api/group"/>
-</component>
-<component name="location_local_variation_api" long-name="Location Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_local_variation_api/group"/>
-</component>
-</collection>
-<collection name="genericpositioningplugins" long-name="Generic Positioning Plugins" level="plugin">
-<component name="locationnpppsy" filter="s60" long-name="Location Positioning Proxy PSY" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
-</component>
-<component name="locationsuplpsy" filter="s60" long-name="Location SUPL PSY" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationsuplpsy/group"/>
-</component>
-<component name="genericpositioningplugins_build" filter="s60" long-name="Generic Positioning Plugins Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/genericpositioningplugins/group"/>
-</component>
-</collection>
-<collection name="landmarks" long-name="Landmarks" level="server">
-<component name="locationlandmarks" filter="s60" long-name="Location Landmarks">
-<unit bldFile="mw/locationsrv/landmarks/locationlandmarks/group"/>
-</component>
-</collection>
-<collection name="locationmapnavfw" long-name="Location Map and Navigation Framework" level="fw">
-<component name="mnlibrary" filter="s60" long-name="Map and Navigation Library">
-<unit bldFile="mw/locationsrv/locationmapnavfw/library/group"/>
-</component>
-<component name="mnaiwprovider" filter="s60" long-name="Map and Navigation AIW Provider" plugin="Y">
-<unit bldFile="mw/locationsrv/locationmapnavfw/aiwprovider/group"/>
-</component>
-<component name="locationmapnavfw_build" filter="s60" long-name="Location Map and Navigation Framework Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/locationmapnavfw/group"/>
-</component>
-</collection>
-<collection name="locationsystemui" long-name="Location System UI" level="if">
-<component name="locationsysui" filter="s60" long-name="Location System UI">
-<unit bldFile="mw/locationsrv/locationsystemui/locationsysui/group"/>
-</component>
-</collection>
-<collection name="supl" long-name="SUPL" level="fw">
-<component name="locationsuplfw" filter="s60" long-name="Location SUPL Framework">
-<unit bldFile="mw/locationsrv/supl/locationsuplfw/group"/>
-</component>
-<component name="locationomasuplprotocolhandler" filter="s60" long-name="OMA SUPL Protocol Handler">
-<unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/group"/>
-</component>
-<component name="supltiapiimplementation" filter="s60" long-name="SUPL TI API Implementation" introduced="^3">
-<unit bldFile="mw/locationsrv/supl/supltiapiimplementation/group"/>
-</component>
-</collection>
-<collection name="locationtriggering" long-name="Location Triggering" level="server">
-<component name="ltlogger" filter="s60" long-name="LT Logger">
-<unit bldFile="mw/locationsrv/locationtriggering/ltlogger/group"/>
-</component>
-<component name="ltclientlib" filter="s60" long-name="LT Client Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltclientlib/group"/>
-</component>
-<component name="ltmanagementlib" filter="s60" long-name="LT Management Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmanagementlib/group"/>
-</component>
-<component name="ltcontainer" filter="s60" long-name="LT Container">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontainer/group"/>
-</component>
-<component name="ltserver" filter="s60" long-name="LT Server">
-<unit bldFile="mw/locationsrv/locationtriggering/ltserver/group"/>
-</component>
-<component name="ltstrategypluginapi" filter="s60" long-name="LT Strategy Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategypluginapi/group"/>
-</component>
-<component name="ltstrategyengine" filter="s60" long-name="LT Strategy Engine">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategyengine/group"/>
-</component>
-<component name="ltmovementdetectionpluginapi" filter="s60" long-name="Movement Detection Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmovementdetectionpluginapi/group"/>
-</component>
-<component name="ltcellidmovementdetector" filter="s60" long-name="Cell ID Movement Detector">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/>
-</component>
-<component name="lbtmgmtui" filter="s60" long-name="LBT Management UI" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/lbtmgmtui/group"/>
-</component>
-<component name="ltcontextsourceplugin" filter="s60" long-name="LT Context Source Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontextsourceplugin/group"/>
-</component>
-<component name="locationtriggering_build" filter="s60" long-name="Location Triggering Build">
-<!-- should remove #include from this and maybe put exports in the above components -->
-<unit bldFile="mw/locationsrv/locationtriggering/group"/>
-</component>
-</collection>
-</block>
-<block name="accesssec" level="generic" long-name="Access Security" levels="plugin framework server generic specific">
-<collection name="accesssec_plat" long-name="Access Security Platform Interfaces" level="specific">
-<component name="wapi_security_settings_ui_api" long-name="WAPI Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_security_settings_ui_api/group"/>
-</component>
-<component name="wep_security_settings_ui_api" long-name="WEP Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wep_security_settings_ui_api/group"/>
-</component>
-<component name="wi-fi_protected_setup_ui_api" long-name="Wi-Fi Protected Setup UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
-</component>
-<component name="wlan_eap_settings_ui_api" long-name="WLAN EAP Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wlan_eap_settings_ui_api/group"/>
-</component>
-<component name="wpa_security_settings_ui_api" long-name="WPA Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wpa_security_settings_ui_api/group"/>
-</component>
-<component name="eap_vpn_api" long-name="EAP VPN API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
-</component>
-<component name="eapsim_db_api" long-name="EAP-SIM DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapsim_db_api/group"/>
-</component>
-<component name="eap_type_api" long-name="EAP Type API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_type_api/group"/>
-</component>
-<component name="eaptlspeap_db_api" long-name="EAP-TLS-PEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eaptlspeap_db_api/group"/>
-</component>
-<component name="eapleap_db_api" long-name="LEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapleap_db_api/group"/>
-</component>
-<component name="eapgtc_db_api" long-name="EAP-GTC DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapgtc_db_api/group"/>
-</component>
-<component name="eapmschapv2_db_api" long-name="EAP-MSCHAPV2 DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapmschapv2_db_api/group"/>
-</component>
-<component name="eapaka_db_api" long-name="EAP-AKA DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapaka_db_api/group"/>
-</component>
-<component name="wapi_db_api" long-name="WAPI DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_db_api/group"/>
-</component>
-</collection>
-<collection name="wlansecuritysettings" long-name="WLAN Security Settings" level="specific">
-<component name="wapisecuritysettingsui" filter="s60" long-name="WAPI Security Settings UI" introduced="9.1">
-<!-- the directory for this needs to be moved up to the right level -->
-<unit bldFile="mw/accesssec/wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
-</component>
-<component name="wepsecuritysettingsui" filter="s60" long-name="WEP Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wepsecuritysettingsui/group"/>
-</component>
-<component name="wifiprotectedsetup" filter="s60" long-name="WIFI Protected Setup" introduced="^1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wifiprotectedsetup/group"/>
-</component>
-<component name="wlaneapsettingsui" filter="s60" long-name="WLAN EAP Settings UI" introduced="9.3">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wlaneapsettingsui/group"/>
-</component>
-<component name="wpasecuritysettingsui" filter="s60" long-name="WPA Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wpasecuritysettingsui/group"/>
-</component>
-</collection>
-<collection name="eapol" long-name="EAPOL" level="framework">
-<component name="eapol_framework" filter="s60" long-name="EAPOL Framework" introduced="9.2">
-<unit bldFile="mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
-</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">
-<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>
-<component name="bearer_settings_plugin_api" long-name="Bearer Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/bearer_settings_plugin_api/group"/>
-</component>
-<component name="commsdat_wlan_api" long-name="CommsDat WLAN API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/commsdat_wlan_api/group"/>
-</component>
-<component name="connection_monitor_extension_api" long-name="Connection Monitor Extension API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_monitor_extension_api/group"/>
-</component>
-<component name="connection_ui_utilities_api" long-name="Connection UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_ui_utilities_api/group"/>
-</component>
-<component name="disconnect_dialog_api" long-name="Disconnect Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_api/group"/>
-</component>
-<component name="disconnect_dialog_disable_api" long-name="Disconnect Dialog Disable API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_disable_api/group"/>
-</component>
-<component name="extended_connection_settings_api" long-name="Extended Connection Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/extended_connection_settings_api/group"/>
-</component>
-<component name="mpm_default_connection_api" long-name="MPM Default Connection API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_default_connection_api/group"/>
-</component>
-<component name="pdpcontextmanager2_reset_factory_settings_api" long-name="PDP Context Manager 2 Reset Factory Settings API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_settings_api/group"/>
-</component>
-<component name="mpm_connect_screen_api" long-name="MPM Connect Screen API" filter="s60" class="api">
-<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">
-<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>
-<component name="access_point_engine_api" long-name="Access Point Engine API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_monitor_server_api/group"/>
-</component>
-<component name="connection_settings_ui_api" long-name="Connection Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_ui_api/group"/>
-</component>
-<component name="agent_dialog_api" long-name="Agent Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/agent_dialog_api/group"/>
-</component>
-<component name="extendedconnpref_api" long-name="Extended Connection Preferences API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/extendedconnpref_api/group"/>
-</component>
-</collection>
-<collection name="accesspointcontrol" long-name="Access Point Control" level="plugin">
-<component name="apcontrollistplugin" filter="s60" long-name="Access Point Control List Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
-</component>
-</collection>
-<collection name="alwayson_net_plugin" long-name="Always Online Net Plugin" level="server">
-<component name="pdpcontextmanager2" filter="s60" long-name="PDP Context Manager 2">
-<unit bldFile="mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
-</component>
-</collection>
-<collection name="apengine" long-name="Access Point Engine" level="framework">
-<component name="apeng" filter="s60" long-name="Access Point Engine">
-<unit bldFile="mw/ipconnmgmt/apengine/apeng/group"/>
-</component>
-<component name="apsettingshandlerui" filter="s60" long-name="Access Point Settings Handler UI">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingshandlerui/group"/>
-</component>
-<component name="apsettingsplugin" filter="s60" long-name="Access Point Settings Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="bearermanagement" long-name="Bearer Management" level="framework">
-<component name="mpm" filter="s60" long-name="Mobility Policy Manager">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/mpm/group"/>
-</component>
-<component name="extendedconnpref" filter="s60" long-name="Extended Connection Preferences">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/extendedconnpref/group"/>
-</component>
-<component name="s60mcpr" filter="s60" long-name="S60 Meta-Connection Provider" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/S60MCPR/group"/>
-</component>
-</collection>
-<collection name="cmmanager" long-name="Connection Method Manager" level="framework">
-<component name="cmmgr" filter="s60" long-name="CM Manager">
-<unit bldFile="mw/ipconnmgmt/cmmanager/cmmgr/group"/>
-</component>
-<component name="gsconnsettingsplugin" filter="s60" long-name="GS Connection Settings Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/cmmanager/gsconnsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="connectionmonitoring" long-name="Connection Monitoring" level="server">
-<component name="connectionmonitorplugin" filter="s60" long-name="Connection Monitor Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorplugin/group"/>
-</component>
-<component name="connectionmonitorui" filter="s60" long-name="Connection Monitor UI">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorui/group"/>
-</component>
-<component name="connmon" filter="s60" long-name="Connection Monitor">
-<!-- either split into two components, or #include from a common bld.inf -->
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/connectionmonitor/group"/>
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/dataconnectionlogger/group"/>
-</component>
-<component name="connmonext" filter="s60" long-name="Connection Monitor Extension API">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmonext/group"/>
-</component>
-</collection>
-<collection name="connectionutilities" long-name="Connection Utilities" level="utils">
-<component name="connectiondialogs" filter="s60" long-name="Connection Dialogs">
-<unit bldFile="mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/>
-</component>
-</collection>
-<collection name="dbcreator" long-name="DB Creator" level="utils">
-<component name="commsdatcreator" filter="s60" long-name="Comms Database Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
-</component>
-<component name="commsdatcreatorrfsplugin" filter="s60" long-name="Comms Database Creator RFS Plugin" introduced="9.3" plugin="Y">
-<!-- uncomment when config is turned on -->
-<!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
-</component>
-<component name="commsdatstartup" filter="s60" long-name="Comms Database Startup" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
-</component>
-<component name="dbcreatorexe" filter="s60" long-name="DB Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
-</component>
-<component name="dbcreator_build" filter="s60" long-name="DB Creator Build" introduced="9.3">
-<!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
-<unit bldFile="mw/ipconnmgmt/dbcreator/group"/>
-</component>
-</collection>
-<collection name="ipconnmgmt_info" long-name="IP Connectivity Management Info" level="utils">
-<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"/>
-</component>
-</collection>
-</block>
-<block name="netprotocols" level="generic" long-name="High-level Internet Protocols" levels="plugin framework server generic specific">
-<collection name="netprotocols_plat" long-name="High-level Internet Protocols Platform Interfaces" level="specific">
-<component name="cookie_manager_api" long-name="Cookie Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/cookie_manager_api/group"/>
-</component>
-<component name="http_cache_mgr_api" long-name="HTTP Cache Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_cache_mgr_api/group"/>
-</component>
-<component name="http_filters_api" long-name="HTTP Filters API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_filters_api/group"/>
-</component>
-</collection>
-<collection name="httpfilters" long-name="HTTP Filters" level="plugin">
-<component name="httpfiltercommon" filter="s60" long-name="HTTP Filter Common">
-<unit bldFile="mw/netprotocols/httpfilters/httpfiltercommon/group"/>
-</component>
-<component name="cookie" filter="s60" long-name="Cookie Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/cookie/group"/>
-</component>
-<component name="deflatefilter" filter="s60" long-name="Deflate Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/deflatefilter/group"/>
-</component>
-<component name="httpfilteracceptheader" filter="s60" long-name="Accept Header Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteracceptheader/group"/>
-</component>
-<component name="httpfilterauthentication" filter="s60" long-name="Authentication Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterauthentication/group"/>
-</component>
-<component name="httpfilterconnhandler" filter="s60" long-name="Connection Handler Fitler" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterconnhandler/group"/>
-</component>
-<component name="httpfilteriop" filter="s60" long-name="HTTP IOP Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteriop/group"/>
-</component>
-<component name="httpfilterproxy" filter="s60" long-name="HTTP Proxy Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterproxy/group"/>
-</component>
-<component name="uaproffilter" filter="s60" long-name="UAProf Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/uaproffilter/group"/>
-</component>
-</collection>
-<collection name="applayerprotocols" long-name="Application Layer Protocols" level="server">
-<component name="httptransportfw" long-name="HTTP Transport Framework" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
-</component>
-<component name="httpexamples" long-name="HTTP Examples" introduced="6.2" purpose="development">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpexamples/group" mrp="mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
-</component>
-<component name="wappushsupport" long-name="WAP Push Support" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
-</component>
-<component name="wapbase" long-name="WAP Base" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wapbase/Group" mrp="mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
-</component>
-<component name="ftpengine" long-name="FTP Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/ftpengine/group" mrp="mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
-</component>
-<component name="telnetengine" long-name="Telnet Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/telnetengine/group" mrp="mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
-</component>
-<component name="httpserviceapi" long-name="HTTP Service API" introduced="TB9.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpservice/group" mrp="mw/netprotocols/applayerprotocols/httpservice/group/http_service.mrp"/>
-</component>
-</collection>
-<collection name="applayerpluginsandutils" long-name="Application Layer Plugins and Utils" level="framework">
-<component name="uripermissionservices" long-name="URI Permission Services" introduced="^2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
-</component>
-<component name="bookmarksupport" long-name="Bookmark Support" introduced="9.1" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
-</component>
-<component name="httpprotocolplugins" long-name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
-</component>
-<component name="httptransportplugins" long-name="HTTP Transport Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
-</component>
-</collection>
-<collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
-<component name="netprotocols_metadata" long-name="High-level Internet Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ipappprotocols" level="generic" long-name="IP App Protocols" levels="plugin conn server if">
-<collection name="ipappprotocols_plat" long-name="IP App Protocols Platform Interfaces" level="if">
-<component name="srtp_api" long-name="SRTP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/srtp_api/group"/>
-</component>
-<component name="rtprtcp_api" long-name="RTP/RTCP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/rtprtcp_api/group"/>
-</component>
-</collection>
-<collection name="rtp" long-name="RTP" level="server">
-<component name="srtpstack" filter="s60" long-name="SRTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/srtpstack/group"/>
-</component>
-<component name="rtpstack" filter="s60" long-name="RTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/rtpstack/group"/>
-</component>
-</collection>
-<collection name="realtimenetprots" long-name="Real Time Net Protocols" level="server">
-<component name="symrtp" long-name="RTP" introduced="9.0" purpose="optional">
-<!-- Real Time Data Protocol -->
-<unit bldFile="mw/ipappprotocols/realtimenetprots/rtp/group" mrp="mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
-</component>
-<component name="sipfw" long-name="SIP Framework" introduced="9.2" purpose="optional">
-<unit bldFile="mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp" version="2"/>
-</component>
-</collection>
-<collection name="sipplugins" long-name="SIP Plugins" level="plugin">
-<component name="sippwlanplugin" filter="s60" long-name="SIP WLAN Plugin" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
-</component>
-<component name="sippsipsettingsui" filter="s60" long-name="SIP Settings UI" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
-</component>
-<component name="sippdevmgmtsipadapter" filter="s60" long-name="Device Management SIP Settings Adapter" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
-</component>
-<component name="sippsystemstatemonitor" filter="s60" long-name="SIP System State Monitor" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsystemstatemonitor/group"/>
-</component>
-<component name="sippsipadapter" filter="s60" long-name="SIP Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipadapter/group"/>
-</component>
-</collection>
-<collection name="sipproviderplugins" long-name="SIP Provider Plugins" level="conn">
-<component name="sipprovider" long-name="SIP Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipproviderplugins/sipprovider/group" mrp="mw/ipappprotocols/sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
-</component>
-</collection>
-<collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="if">
-<component name="ipappprotocols_metadata" long-name="IP App Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wirelessacc" level="specific" long-name="Wireless Access" levels="framework generic ui">
-<collection name="hsfw_plat" long-name="HotSpot Framework Platform Interfaces" level="ui">
-<component name="hotspot_framework_client_api" long-name="HotSpot Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_api" long-name="Internet Connectivity Test Service API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_settings_api" long-name="Internet Connectivity Test Service Settings API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
-</component>
-<component name="hotspot_framework_client_plugin_api" long-name="HotSpot Framework Client Plugin API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
-</component>
-</collection>
-<collection name="hotspotfw" long-name="HotSpot Framework" level="framework">
-<component name="hsserver" filter="s60" long-name="HotSpot Server" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="hsclient" filter="s60" long-name="HotSpot Client" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="internetconnectivitytestservice" filter="s60" long-name="Internet Connectivity Test Service" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
-</component>
-<component name="ictsdialogs" filter="s60" long-name="Internet Connectivity Test Service Dialogs" deprecated="^3" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
-</component>
-<component name="hspluginforagent" filter="s60" long-name="HotSpot Plugin for Agent" plugin="Y" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
-</component>
-<component name="hsbrowser" filter="s60" long-name="HotSpot Browser" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
-</component>
-<component name="hotspotfw_build" filter="s60" long-name="Hotspot Framework Build">
-<!-- should break up this bld.inf into the above components, or collapse them all into a single component -->
-<unit bldFile="mw/wirelessacc/hotspotfw/group"/>
-</component>
-</collection>
-<collection name="wlanutilities" long-name="WLAN Utilities" level="generic">
-<component name="wlanplugin" filter="s60" long-name="WLAN Plugin" plugin="Y">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlanplugin/group"/>
-</component>
-<component name="wlansettingsui" filter="s60" long-name="WLAN Settings UI">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlansettingsui/group"/>
-</component>
-<component name="wlansniffer" filter="s60" long-name="WLAN Sniffer">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlansniffer/group"/>
-</component>
-<component name="wlanindicatorplugin" filter="s60" long-name="WLAN Indicator Plugin" plugin="Y">
-<unit bldFile="mw/wirelessacc/wlanutilities/wlanindicatorplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="vpnclient" level="specific" long-name="VPN Client" levels="engine ui api">
-<!-- is the !oem_build filter needed? -->
-<collection name="vpnc_plat" long-name="VPN Client Platform Interfaces" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API" class="api">
-<unit bldFile="mw/vpnclient/vpnc_plat/vpnapi/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API">
-<unit bldFile="mw/vpnclient/vpnapiimpl/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnengine" long-name="VPN Engine" level="engine">
-<!-- too many components in this collection.
- Probably best to group the binaries together into larger components
- or maybe split the collection into more reasonable groups -->
-<component name="eventmediatorapi" filter="s60" long-name="Event Mediator API">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediatorapi/group" filter="!oem_build"/>
-</component>
-<component name="eventviewer" filter="s60" long-name="Event Viewer">
-<unit bldFile="mw/vpnclient/vpnengine/eventviewer/group" filter="!oem_build"/>
-</component>
-<component name="vpnins" filter="s60" long-name="VPN Installer">
-<unit bldFile="mw/vpnclient/vpnengine/vpnins/group" filter="!oem_build"/>
-</component>
-<component name="ikepolparser" filter="s60" long-name="IKE Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/ikepolparser/group" filter="!oem_build"/>
-</component>
-<component name="utlbase64" filter="s60" long-name="Base64 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlbase64/group" filter="!oem_build"/>
-</component>
-<component name="utlcrypto" filter="s60" long-name="Crypto Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlcrypto/group" filter="!oem_build"/>
-</component>
-<component name="utlxml" filter="s60" long-name="XML Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlxml/group" filter="!oem_build"/>
-</component>
-<component name="utlpkcs10" filter="s60" long-name="PKCS#10 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs10/group" filter="!oem_build"/>
-</component>
-<component name="pkiserviceapi" filter="s60" long-name="PKI Service API">
-<unit bldFile="mw/vpnclient/vpnengine/pkiserviceapi/group" filter="!oem_build"/>
-</component>
-<component name="ikecert" filter="s60" long-name="IKE Certificate Management">
-<unit bldFile="mw/vpnclient/vpnengine/ikecert/group" filter="!oem_build"/>
-</component>
-<component name="kmdapi" filter="s60" long-name="Key Management Daemon API">
-<unit bldFile="mw/vpnclient/vpnengine/kmdapi/group" filter="!oem_build"/>
-</component>
-<component name="kmdserver" filter="s60" long-name="Key Management Daemon Server">
-<unit bldFile="mw/vpnclient/vpnengine/kmdserver/group" filter="!oem_build"/>
-</component>
-<component name="ikeutils" filter="s60" long-name="Internet Key Exchange Utils">
-<unit bldFile="mw/vpnclient/vpnengine/ikeutils/group" filter="!oem_build"/>
-</component>
-<component name="ikev1lib" filter="s60" long-name="IKEv1 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev1lib/group" filter="!oem_build"/>
-</component>
-<component name="ikev2lib" filter="s60" long-name="IKEv2 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev2lib/group" filter="!oem_build"/>
-</component>
-<component name="vpnipsecpolparser" filter="s60" long-name="VPN IPsec Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/vpnipsecpolparser/group" filter="!oem_build"/>
-</component>
-<component name="sit" filter="s60" long-name="Socket Interaction Thread">
-<unit bldFile="mw/vpnclient/vpnengine/sit/group" filter="!oem_build"/>
-</component>
-<component name="vpntcwrapper" filter="s60" long-name="VPN Terminal Control Wrapper">
-<unit bldFile="mw/vpnclient/vpnengine/vpntcwrapper/group" filter="!oem_build"/>
-</component>
-<component name="eventmediator" filter="s60" long-name="Event Mediator">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediator/group" filter="!oem_build"/>
-</component>
-<component name="pkiservice" filter="s60" long-name="PKI Service">
-<unit bldFile="mw/vpnclient/vpnengine/pkiservice/group" filter="!oem_build"/>
-</component>
-<component name="vpnconnagt" filter="s60" long-name="VPN Connection Agent">
-<unit bldFile="mw/vpnclient/vpnengine/vpnconnagt/group" filter="!oem_build"/>
-</component>
-<component name="vpnmanager" filter="s60" long-name="VPN Manager">
-<unit bldFile="mw/vpnclient/vpnengine/vpnmanager/group" filter="!oem_build"/>
-</component>
-<component name="vpncleaner" filter="s60" long-name="VPN Cleaner">
-<unit bldFile="mw/vpnclient/vpnengine/vpncleaner/group" filter="!oem_build"/>
-</component>
-<component name="utlpkcs12" filter="s60" long-name="PKCS#12 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs12/group" filter="!oem_build"/>
-</component>
-<component name="dmadengine" filter="s60" long-name="DM Adapter Engine">
-<unit bldFile="mw/vpnclient/vpnengine/dmadengine/group" filter="!oem_build"/>
-</component>
-<component name="dmadipsecvpn" filter="s60" long-name="IPsec VPN DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadipsecvpn/group" filter="!oem_build"/>
-</component>
-<component name="dmadpki" filter="s60" long-name="PKI DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadpki/group" filter="!oem_build"/>
-</component>
-<component name="ikesocket" filter="s60" long-name="IKE Socket" introduced="^3">
-<unit bldFile="mw/vpnclient/vpnengine/ikesocket/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnui" long-name="VPN UI" level="ui">
-<component name="vpnecomnotifier" filter="s60" long-name="VPN ECOM Notifier" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnecomnotifier/group" filter="!oem_build"/>
-</component>
-<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">
-<unit bldFile="mw/vpnclient/vpnui/vpnmanagementui/group" filter="!oem_build"/>
-</component>
-<component name="vpnpolins" filter="s60" long-name="VPN Policy Installer">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolins/group" filter="!oem_build"/>
-</component>
-<component name="vpnpolicyrecognizer" filter="s60" long-name="VPN Policy Recognizer" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolicyrecognizer/group" filter="!oem_build"/>
-</component>
-</collection>
-<collection name="vpnclient_info" long-name="VPN Client Info" level="api">
-<component name="vpnclient_help" filter="s60" long-name="VPN Client Help">
-<unit bldFile="mw/vpnclient/help/group" filter="!oem_build"/>
-</component>
-<component name="vpnclient_build" filter="s60" long-name="VPN Client Build">
-<!-- should split this up into the other components and remove this-->
-<unit bldFile="mw/vpnclient/group" filter="!oem_build"/>
-</component>
-</collection>
-</block>
-<block name="ipappsrv" level="specific" long-name="IP App Services" levels="framework generic server conn plugin">
-<collection name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" level="plugin">
-<component name="transcoder_api" long-name="Transcoder API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
-</component>
-<component name="comms_event_api" long-name="Comms Event API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/comms_event_api/group"/>
-</component>
-<component name="floor_control_api" long-name="Floor Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/floor_control_api/group"/>
-</component>
-<component name="media_control_api" long-name="Media Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/media_control_api/group"/>
-</component>
-<component name="multimedia_comms_api" long-name="Multimedia Comms API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/multimedia_comms_api/group"/>
-</component>
-<component name="nat_settings_api" long-name="NAT Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/nat_settings_api/group"/>
-</component>
-</collection>
-<collection name="natfw" long-name="NAT Framework" level="framework">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="natfw_build" filter="s60" long-name="NAT Framework Build" introduced="^2">
-<unit bldFile="mw/ipappsrv/natfw/group"/>
-</component>
-</collection>
-<collection name="multimediacommscontroller" long-name="Multimedia Comms Controller" level="conn">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommscontroller_build" filter="s60" long-name="Multimedia Comms Controller Build">
-<unit bldFile="mw/ipappsrv/multimediacommscontroller/group"/>
-</component>
-</collection>
-<collection name="multimediacommsengine" long-name="Multimedia Comms Engine" level="generic">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommsengine_build" filter="s60" long-name="Multimedia Comms Engine Build">
-<unit bldFile="mw/ipappsrv/multimediacommsengine/group"/>
-</component>
-</collection>
-<collection name="natplugins" long-name="NAT Plugins" level="plugin">
-<component name="natpcliprovisioningnatfwadapter" filter="s60" long-name="Client Provisioning NAT Framework Traversal Adapter" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/group"/>
-</component>
-<component name="natpdevmgmtnatfwadapter" filter="s60" long-name="Device Management NAT Framework Traversal Adapter" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/group"/>
-</component>
-<component name="natptraversalcontroller" filter="s60" long-name="NAT Traversal Controller" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natptraversalcontroller/group"/>
-</component>
-<component name="natpnatfwsdpprovider" filter="s60" long-name="NAT Framework SDP Provider" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpnatfwsdpprovider/group"/>
-</component>
-</collection>
-<collection name="ipappsrv_info" long-name="IP App Services Info" level="plugin">
-<component name="ipappsrv_build" long-name="IP App Services Build" filter="s60">
-<!-- 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">
-<collection name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" level="specific">
-<component name="string_parser_api" long-name="String Parser API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/string_parser_api/group"/>
-</component>
-<component name="cbs_mcn_client_api" long-name="CBS MCN Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cbs_mcn_client_api/group"/>
-</component>
-<component name="converged_call_engine_api" long-name="Converged Call Engine API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_engine_api/group"/>
-</component>
-<component name="aiw_dial_data_consumer_api" long-name="AIW Dial Data Consumer API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/aiw_dial_data_consumer_api/group"/>
-</component>
-<component name="phone_client_ussd_api" long-name="Phone Client USSD API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_api/group"/>
-</component>
-<component name="sat_refresh_api" long-name="SAT Refresh API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_refresh_api/group" filter="!test"/>
-</component>
-<component name="network_handling_engine_api" long-name="Network Handling Engine API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/network_handling_engine_api/group"/>
-</component>
-<component name="phone_client_emergency_call_api" long-name="Phone Client Emergency Call API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/group"/>
-</component>
-<component name="sat_configuration_api" long-name="SAT Configuration API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_configuration_api/group"/>
-</component>
-<component name="dial_utils_api" long-name="Dial Utils API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/dial_utils_api/group"/>
-</component>
-<component name="phone_client_image_handler_api" long-name="Phone Client Image Handler API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_image_handler_api/group"/>
-</component>
-<component name="phone_client_messenger_api" long-name="Phone Client Messenger API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_messenger_api/group"/>
-</component>
-<component name="sat_client_api" long-name="SAT Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_client_api/group" filter="!test"/>
-</component>
-<component name="phone_client_api" long-name="Phone Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_api/group"/>
-</component>
-<component name="sat_service_api" long-name="SAT Service API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_service_api/group" filter="!test"/>
-</component>
-<component name="cbs_message_api" long-name="CBS Message API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cbs_message_api/group"/>
-</component>
-<component name="phone_client_server_information_api" long-name="Phone Client Server Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_server_information_api/group"/>
-</component>
-<component name="phone_client_ussd_internal_api" long-name="Phone Client USSD Internal API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_internal_api/group"/>
-</component>
-<component name="phone_client_command_handler_api" long-name="Phone Client Command Handler API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_command_handler_api/group"/>
-</component>
-<component name="phone_client_notify_api" long-name="Phone Client Notify API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_notify_api/group"/>
-</component>
-<component name="phone_client_utility_api" long-name="Phone Client Utility API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_utility_api/group"/>
-</component>
-<component name="telephony_network_information_api" long-name="Telephony Network Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_network_information_api/group"/>
-</component>
-<component name="secondary_display_sat_api" long-name="Secondary Display SAT API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/secondary_display_sat_api/group"/>
-</component>
-<component name="callui_reconnect_query_api" long-name="CallUI Reconnect Query API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/callui_reconnect_query_api/group"/>
-</component>
-<component name="service_provider_settings_api" long-name="Service Provider Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/service_provider_settings_api/group"/>
-</component>
-<component name="converged_call_provider_api" long-name="Converged Call Provider API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_provider_api/group"/>
-</component>
-<component name="incoming_call_monitor_api" long-name="Incoming Call Monitor API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/incoming_call_monitor_api/group"/>
-</component>
-<component name="default_emergency_numbers_api" long-name="Default Emergency Numbers API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/default_emergency_numbers_api/group"/>
-</component>
-<component name="cenrep_database_api" long-name="Central Repository Database API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cenrep_database_api/group"/>
-</component>
-<component name="ss_settings_api" long-name="SS Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/ss_settings_api/group"/>
-</component>
-<component name="phone_settings_observer_api" long-name="Phone Settings Observer API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_observer_api/group"/>
-</component>
-<component name="phone_settings_notes_ui_api" long-name="Phone Settings Notes UI API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_notes_ui_api/group"/>
-</component>
-<component name="phone_settings_api" long-name="Phone Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_api/group"/>
-</component>
-<component name="voice_mailbox_number_api" long-name="Voice Mailbox Number API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_number_api/group"/>
-</component>
-<component name="voice_mailbox_settings_api" long-name="Voice Mailbox Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_settings_api/group"/>
-</component>
-<component name="call_information_api" long-name="Call Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/call_information_api/group" filter="!test"/>
-</component>
-<component name="call_remote_party_information_api" long-name="Call Remote Party Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/call_remote_party_information_api/group" filter="!test"/>
-</component>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_mediator_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="telutils" long-name="Telephony Utils" level="generic">
-<component name="phoneparser" filter="s60" long-name="Phone Parser">
-<unit bldFile="mw/phonesrv/telutils/phoneparser/group"/>
-</component>
-<component name="telephonyservice" filter="s60" long-name="Telephony Service">
-<unit bldFile="mw/phonesrv/telutils/telephonyservice/group"/>
-</component>
-</collection>
-<collection name="cbs" long-name="Cellular Baseband Services" level="plugin">
-<component name="cbsserver" filter="s60" long-name="CBS Server">
-<unit bldFile="mw/phonesrv/cbs/cbsserver/group"/>
-</component>
-<component name="cbsui" filter="s60" long-name="CBS UI">
-<unit bldFile="mw/phonesrv/cbs/cbsui/group"/>
-</component>
-</collection>
-<collection name="cellular" long-name="Cellular" level="server">
-<component name="telephonysettings" filter="s60" long-name="Telephony Settings">
-<unit bldFile="mw/phonesrv/cellular/telephonysettings/group" filter="!test"/>
-</component>
-<component name="sssettings" filter="s60" long-name="Supplementary Service Settings">
-<unit bldFile="mw/phonesrv/cellular/sssettings/group" filter="!test"/>
-</component>
-<component name="psetnotesui" filter="s60" long-name="Phone Settings Notes UI">
-<unit bldFile="mw/phonesrv/cellular/psetnotesui/group" filter="!test"/>
-</component>
-<component name="servicerequest" filter="s60" long-name="Service Request">
-<unit bldFile="mw/phonesrv/cellular/servicerequest/group"/>
-</component>
-</collection>
-<collection name="convergedcallengine" long-name="Converged Call Engine" level="framework">
-<component name="callprovider" filter="s60" long-name="Call Provider">
-<unit bldFile="mw/phonesrv/convergedcallengine/callprovider/group"/>
-</component>
-<component name="cce" filter="s60" long-name="CCE">
-<unit bldFile="mw/phonesrv/convergedcallengine/cce/group" filter="!test"/>
-</component>
-<component name="spsettings" filter="s60" long-name="Service Provider Settings">
-<unit bldFile="mw/phonesrv/convergedcallengine/spsettings/group" filter="!test"/>
-</component>
-<component name="cenrepdatabase" filter="s60" long-name="CCE Cenrep Database">
-<unit bldFile="mw/phonesrv/convergedcallengine/cenrepdatabase/group"/>
-</component>
-<component name="serviceselector" filter="s60" long-name="Service Selector">
-<unit bldFile="mw/phonesrv/convergedcallengine/serviceselector/group"/>
-</component>
-<component name="csplugin" filter="s60" long-name="CS Plugin" plugin="Y">
-<!-- should spell out CS in name -->
-<unit bldFile="mw/phonesrv/convergedcallengine/csplugin/group"/>
-</component>
-</collection>
-<collection name="engines" long-name="Telephony Engines" level="specific">
-<component name="vmbxengine" filter="s60" long-name="Voice Mailbox Engine">
-<unit bldFile="mw/phonesrv/engines/vmbxengine/group"/>
-</component>
-</collection>
-<collection name="networkhandling" long-name="Network Handling" level="plugin">
-<component name="networkhandlingengine" filter="s60" long-name="Network Handling Engine">
-<unit bldFile="mw/phonesrv/networkhandling/networkhandlingengine/group"/>
-</component>
-</collection>
-<collection name="phoneclientserver" long-name="Phone Client/Server" level="server">
-<component name="enpolicy" filter="s60" long-name="Emergency Number Policy">
-<unit bldFile="mw/phonesrv/phoneclientserver/enpolicy/group"/>
-</component>
-<component name="aiwdialdata" filter="s60" long-name="AIW Dial Data">
-<unit bldFile="mw/phonesrv/phoneclientserver/aiwdialdata/group" filter="!test"/>
-</component>
-<component name="dialutils" filter="s60" long-name="Dial Utils">
-<unit bldFile="mw/phonesrv/phoneclientserver/dialutils/group" filter="!test"/>
-</component>
-<component name="phoneclient" filter="s60" long-name="Phone Client">
-<unit bldFile="mw/phonesrv/phoneclientserver/phoneclient/group" filter="!test"/>
-</component>
-<component name="phoneserver" filter="s60" long-name="Phone Server">
-<unit bldFile="mw/phonesrv/phoneclientserver/phoneserver/group"/>
-</component>
-<component name="callui" filter="s60" long-name="Call UI">
-<unit bldFile="mw/phonesrv/phoneclientserver/callui/group"/>
-</component>
-</collection>
-<collection name="satengine" long-name="SIM Application Toolkit Engine" level="generic">
-<component name="satserver" filter="s60" long-name="SAT Server">
-<unit bldFile="mw/phonesrv/satengine/satserver/group"/>
-</component>
-</collection>
-<collection name="satui" long-name="SIM Application Toolkit UI" level="specific">
-<component name="satapp" filter="s60" long-name="SAT Application">
-<unit bldFile="mw/phonesrv/satui/satapp/group"/>
-</component>
-<component name="satplugin" filter="s60" long-name="SAT Plugin" plugin="Y">
-<unit bldFile="mw/phonesrv/satui/satplugin/group"/>
-</component>
-</collection>
-<collection name="phonecmdhandler" long-name="Phone Command Handler" level="generic">
-<component name="phonecmdhnlr" filter="s60" long-name="Phone Command Handler">
-<unit bldFile="mw/phonesrv/phonecmdhandler/phonecmdhnlr/group"/>
-</component>
-</collection>
-</block>
-<block name="messagingmw" level="specific" long-name="Messaging Middleware" levels="stack fw api">
-<collection name="msgfw_pub" long-name="Messaging Middleware Public Interfaces" level="api">
-<component name="send_ui_api" long-name="Send UI API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_pub/send_ui_api/group"/>
-</component>
-</collection>
-<collection name="msgfw_plat" long-name="Messaging Middleware Platform Interfaces" level="api">
-<component name="always_online_plugin_api" long-name="Always Online Plugin API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_plugin_api/group"/>
-</component>
-<component name="always_online_client_api" long-name="Always Online Client API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_client_api/group"/>
-</component>
-<component name="msg_common_utils_api" long-name="Messaging Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/msg_common_utils_api/group"/>
-</component>
-<component name="send_ui_plugin_api" long-name="Send UI Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/send_ui_plugin_api/group"/>
-</component>
-<component name="send_ui_datautils_api" long-name="Send UI Data Utils API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/send_ui_datautils_api/group"/>
-</component>
-</collection>
-<collection name="msgbranched" long-name="Messaging Branched" level="fw">
-<!-- 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"/>
-</component>
-</collection>
-<collection name="messagingfw" long-name="Messaging Framework" level="fw">
-<!-- should break this collection up into smaller related collections -->
-<component name="alwaysonline" filter="s60" long-name="Always Online Server" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/alwaysonline/group"/>
-</component>
-<component name="msgcommonutils" filter="s60" long-name="Messaging Common Utils" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/msgcommonutils/group"/>
-</component>
-<component name="senduiservices" filter="s60" long-name="Send UI Services" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/senduiservices/group"/>
-</component>
-<component name="scheduledsendmtm" long-name="Scheduled Send MTM" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/group" mrp="mw/messagingmw/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
-</component>
-<component name="msgsrvnstore" long-name="Message Server and Store" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/group" mrp="mw/messagingmw/messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
-</component>
-<component name="biomsgfw" long-name="BIO Messaging Framework" introduced="6.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/group" mrp="mw/messagingmw/messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
-</component>
-<component name="msgconf" long-name="Messaging Config" introduced="^2" purpose="optional" class="config">
-<unit bldFile="mw/messagingmw/messagingfw/msgconf/group" mrp="mw/messagingmw/messagingfw/msgconf/group/messaging_config.mrp"/>
-</component>
-<component name="watcherfw" long-name="Watcher Framework" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/watcherfw/group" mrp="mw/messagingmw/messagingfw/watcherfw/group/messaging_watcher.mrp"/>
-</component>
-<component name="msgtest" long-name="Messaging Test" purpose="development">
-<unit bldFile="mw/messagingmw/messagingfw/msgtest/group" mrp="mw/messagingmw/messagingfw/msgtest/group/messaging_test.mrp"/>
-</component>
-<component name="sendas" long-name="Send As" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/sendas/group" mrp="mw/messagingmw/messagingfw/sendas/group/messaging_sendas2.mrp"/>
-</component>
-<component name="msgurlhandler" long-name="Message URL Handler" introduced="7.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/group" mrp="mw/messagingmw/messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
-</component>
-<component name="wappushfw" long-name="WAP Push Framework" introduced="6.1" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/wappushfw/group" mrp="mw/messagingmw/messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
-</component>
-<component name="suplsmshandler" long-name="SUPL SMS Handler" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplsmshandler/group" mrp="mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/>
-</component>
-<component name="suplwappushhandler" long-name="SUPL WAP Push Handler" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
-</component>
-</collection>
-<collection name="messagingmw_info" long-name="Messaging Middleware Info" level="api">
-<component name="messagingmw_metadata" long-name="Messaging Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="imsrv" level="specific" long-name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
-<collection name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" level="specific">
-<component name="ximp_core_data_model_api" long-name="XIMP Core Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_host_api" long-name="XIMP Presence Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_presence_data_model_api" long-name="XIMP Presence Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_api" long-name="XIMP Presence Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_presence_management_api" long-name="XIMP Presence Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_management_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_host_api" long-name="XIMP Core Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_core_management_api" long-name="XIMP Core Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_management_api/group"/>
-</component>
-<component name="ximp_presence_base_api" long-name="XIMP Presence Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_base_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_api" long-name="XIMP Core Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_core_base_api" long-name="XIMP Core Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_base_api/group"/>
-</component>
-<component name="ximp_presence_cache_api" long-name="XIMP Presence Cache API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_cache_api/group"/>
-</component>
-<component name="ximp_core_feature_plugin_api" long-name="XIMP Core Feature Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_host_api" long-name="XIMP IM Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_im_data_model_api" long-name="XIMP IM Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_data_model_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_api" long-name="XIMP IM Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_im_management_api" long-name="XIMP IM Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_management_api/group"/>
-</component>
-<component name="ximp_im_base_api" long-name="XIMP IM Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_base_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_host_api" long-name="XIMP Search Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_search_data_model_api" long-name="XIMP Search Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_data_model_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_api" long-name="XIMP search Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_search_management_api" long-name="XIMP Search Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_management_api/group"/>
-</component>
-<component name="ximp_search_base_api" long-name="XIMP Search Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_base_api/group"/>
-</component>
-<component name="xmpp_settings_api" long-name="XMPP Settings API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/group"/>
-</component>
-<component name="im_cache_client_api" long-name="IM Cache Client API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/im_cache_client_api/group"/>
-</component>
-<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 Avability Text" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
-</component>
-</collection>
-<collection name="ximpfw" long-name="XIMP Framework" level="framework">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="ximpfw_build" filter="s60" long-name="XIMP Framework Build">
-<unit bldFile="mw/imsrv/ximpfw/group"/>
-</component>
-</collection>
-<collection name="imservices" long-name="IM Services" level="generic">
-<component name="imfeatureplugin" filter="s60" long-name="IM Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/imfeatureplugin/group"/>
-</component>
-<component name="searchfeatureplugin" filter="s60" long-name="Search Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/searchfeatureplugin/group"/>
-</component>
-<component name="xmppsettingsapi" filter="s60" long-name="XMPP Settings API" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsapi/group"/>
-</component>
-<component name="xmppsettingsfetcher" filter="s60" long-name="XMPP Settings Fetcher" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/group"/>
-</component>
-<component name="ossprotocoladaptation" filter="s60" long-name="OSS Protocol Adaptation" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/ossprotocoladaptation/group"/>
-</component>
-<component name="instantmessagingcache" filter="s60" long-name="Instant Messaging Cache" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/instantmessagingcache/group"/>
-</component>
-</collection>
-<collection name="brandingserver" long-name="Branding Server" level="specific">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="brandingserver_build" filter="s60" long-name="Branding Server Build">
-<unit bldFile="mw/imsrv/brandingserver/group"/>
-</component>
-</collection>
-</block>
-<block name="legacypresence" level="specific" long-name="Legacy Presence Services" levels="engine fw ui">
-<collection name="pressrv_plat" long-name="Legacy Presence Services Platform Interfaces" level="ui">
-<component name="presence_list_api" long-name="Presence List API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/presence_list_api/group"/>
-</component>
-<component name="watcher_info_api" long-name="Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_info_api/group"/>
-</component>
-<component name="simple_documents_api" long-name="SIMPLE Documents API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_documents_api/group"/>
-</component>
-<component name="authorization_api" long-name="Authorization API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/authorization_api/group"/>
-</component>
-<component name="xdm_protocol_plugin_api" long-name="XDM Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_protocol_plugin_api/group"/>
-</component>
-<component name="watcher_api" long-name="Watcher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_api/group"/>
-</component>
-<component name="xdm_api" long-name="XDM API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_api/group"/>
-</component>
-<component name="registration_api" long-name="Registration API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/registration_api/group"/>
-</component>
-<component name="publisher_api" long-name="Publisher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/publisher_api/group"/>
-</component>
-<component name="messaging_connection_manager_api" long-name="Messaging Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/messaging_connection_manager_api/group"/>
-</component>
-<component name="xdm_settings_api" long-name="XDM Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_settings_api/group"/>
-</component>
-<component name="simple_settings_api" long-name="SIMPLE Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_settings_api/group"/>
-</component>
-<component name="simple_instant_msg_api" long-name="Simple Instant Msg API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_instant_msg_api/group"/>
-</component>
-</collection>
-<collection name="xdmengine" long-name="XDM Engine" level="engine">
-<!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
-<component name="xdmengine_build" filter="s60" long-name="XDM Engine Build">
-<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">
-<unit bldFile="mw/legacypresence/xdmprotocols/group"/>
-</component>
-</collection>
-<collection name="msgconnmanager" long-name="Messaging Connection Manager" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="msgconnmanager_build" filter="s60" long-name="Messaging Connection Manager Build">
-<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">
-<unit bldFile="mw/legacypresence/simpleengine/group"/>
-</component>
-</collection>
-<collection name="presencefwsimpleadpt" long-name="Presence Framework SIMPLE Adaptation" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="simpleplugin" filter="s60" long-name="SIMPLE Plugin" plugin="Y">
-<unit bldFile="mw/legacypresence/presencefwsimpleadpt/group"/>
-</component>
-</collection>
-<collection name="simpledatamodeladapter" long-name="SIMPLE Data Model Adapter" level="fw">
-<component name="presenceplugin" filter="s60" long-name="Presence Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/legacypresence/simpledatamodeladapter/group"/>
-</component>
-</collection>
-</block>
-<block name="remotemgmt" level="specific" long-name="Remote Management" levels="plugin framework server generic specific">
-<collection name="remotemgmt_pub" long-name="Remote Management Public Interfaces" level="specific">
-<component name="synchronization_capability_api" long-name="Synchronization Capability API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
-</component>
-</collection>
-<collection name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" level="specific">
-<component name="common_agent_util_and_definitions_api" long-name="Common Agent util and definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
-</component>
-<component name="policy_management_certificate_api" long-name="Policy Management Certificate API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/group"/>
-</component>
-<component name="oma_provisioning_adapter_api" long-name="OMA Provisioning Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_adapter_api/group"/>
-</component>
-<component name="device_management_parameter_api" long-name="Device Management Parameter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_parameter_api/group"/>
-</component>
-<component name="data_synchronization_plugin_api" long-name="Data Synchronization Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/group"/>
-</component>
-<component name="sync_alert_handler_api" long-name="Sync Alert Handler API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
-</component>
-<component name="syncml_notifier_api" long-name="SyncML Notifier API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
-</component>
-<component name="syncml_client_api" long-name="SyncML Client API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
-</component>
-<component name="device_management_plugin_api" long-name="Device Management plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_plugin_api/group"/>
-</component>
-<component name="dm_tree_apis" long-name="DM Tree APIs" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
-</component>
-<component name="terminal_security_device_lock_api" long-name="Terminal Security Device Lock API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/group"/>
-</component>
-<component name="policy_management_request_api" long-name="Policy Management Request API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/group"/>
-</component>
-<component name="ds_constant_definitions_api" long-name="DS Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_constant_definitions_api/group"/>
-</component>
-<component name="scp_server_api" long-name="SCP Server API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/group"/>
-</component>
-<component name="data_synchronization_notification_api" long-name="Data Synchronization Notification API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_notification_api/group"/>
-</component>
-<component name="oma_provisioning_engine_api" long-name="OMA Provisioning Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/group"/>
-</component>
-<component name="dm_utils_api" long-name="DM Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/group"/>
-</component>
-<component name="syncml_alert_api" long-name="SyncML Alert API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/group"/>
-</component>
-<component name="obex_client_session_api" long-name="OBEX Client session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/obex_client_session_api/group"/>
-</component>
-<component name="setting_enforcement_info_api" long-name="Setting Enforcement Info API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/group"/>
-</component>
-<component name="dm_constant_definitions_api" long-name="DM Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
-</component>
-<component name="oma_ds_extensions_api" long-name="OMA DS Extensions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
-</component>
-<component name="pnpms_utils_api" long-name="PNPMS Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
-</component>
-<component name="diagnostics_plugin_utility_api" long-name="Diagnostics Plugin Utility API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
-</component>
-<component name="diagnostics_plugin_api" long-name="Diagnostics Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
-</component>
-<component name="diagnostics_framework_api" long-name="Diagnostics Framework API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
-</component>
-<component name="diagnostics_results_api" long-name="Diagnostics Results API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
-</component>
-<component name="diagnostics_plugin_pool_api" long-name="Diagnostics Plugin Pool API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
-</component>
-<component name="adaptive_history_list_api" long-name="Adaptive History List API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
-</component>
-<component name="adaptive_history_list_session_api" long-name="Adaptive History List Session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
-</component>
-<component name="fota_engine_api" long-name="FOTA Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
-</component>
-<component name="update_package_storage_plugin_api" long-name="Update Package Storage Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
-</component>
-<component name="syncml_notifier_roaming_api" long-name="SyncML Notifier Roaming API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
-</component>
-<component name="sync_service_api" long-name="Sync Service API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_service_api/group"/>
-</component>
-<component name="dcmo_adapter_api" long-name="DCMO Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_adapter_api/group"/>
-</component>
-<component name="dcmo_control_api" long-name="DCMO Control API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_control_api/group"/>
-</component>
-<component name="ds_capability_mgmt_plugin_api" long-name="DS Capability Management Plugin API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
-</component>
-<component name="dm_native_notifier_api" long-name="DM Native Notifier API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_native_notifier_api/group"/>
-</component>
-<component name="syncml_ds_error_reporting_api" long-name="SyncML DS Error Reporting API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_ds_error_reporting_api/group"/>
-</component>
-<component name="syncml_ds_customization_api" long-name="SyncML DS Customization API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_ds_customization_api/group"/>
-</component>
-</collection>
-<collection name="policymanagement" long-name="Policy Management" level="generic">
-<component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">
-<unit bldFile="mw/remotemgmt/policymanagement/pmdmadapter/group"/>
-</component>
-<component name="dmutilserver" filter="s60" long-name="DM Util Server">
-<unit bldFile="mw/remotemgmt/policymanagement/dmutilserver/group"/>
-</component>
-<component name="policyengine" filter="s60" long-name="Policy Engine">
-<unit bldFile="mw/remotemgmt/policymanagement/policyengine/group"/>
-</component>
-<component name="policymanagement_build" filter="s60" long-name="Policy Management Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/policymanagement/group"/>
-</component>
-</collection>
-<collection name="syncmlfw" long-name="SyncML Framework" level="server">
-<component name="syncmlfw_build" filter="s60" long-name="SyncML Framework Build">
-<!-- need to break this up into components. Too convoluted a structure to be in a single bld.inf-->
-<unit bldFile="mw/remotemgmt/syncmlfw/group"/>
-</component>
-</collection>
-<collection name="terminalsecurity" long-name="Terminal Security" level="specific">
-<component name="scp" filter="s60" long-name="Security Code Proxy">
-<!-- can only have one unit, need to have these #included from a single bld.inf -->
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpdatabase/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpserver/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scppatternplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scphistoryplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scptimestampplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpeventhandler/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/dmeventnotifier/group"/>
-</component>
-<component name="terminalsecurity_client" filter="s60" long-name="Terminal Control Client">
-<unit bldFile="mw/remotemgmt/terminalsecurity/client/group"/>
-</component>
-<component name="terminalsecurity_server" filter="s60" long-name="Terminal Control Server">
-<unit bldFile="mw/remotemgmt/terminalsecurity/server/group"/>
-</component>
-<component name="tcadapter" filter="s60" long-name="Terminal Control Adapter">
-<unit bldFile="mw/remotemgmt/terminalsecurity/tcadapter/bld"/>
-</component>
-<component name="terminalsecurity_build" filter="s60" long-name="Terminal Security Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/terminalsecurity/group"/>
-</component>
-</collection>
-<collection name="omaprovisioning" long-name="OMA Provisioning" level="specific">
-<component name="pnputil" filter="s60" long-name="PnP Util">
-<unit bldFile="mw/remotemgmt/omaprovisioning/pnputil/group"/>
-</component>
-<component name="provisioning" filter="s60" long-name="Provisioning">
-<unit bldFile="mw/remotemgmt/omaprovisioning/provisioning/group"/>
-</component>
-</collection>
-<collection name="devicediagnosticsfw" long-name="Device Diagnostics Framework" level="framework">
-<component name="diagframework" filter="s60" long-name="Diagnostics Framework">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
-</component>
-<component name="diagpluginbase" filter="s60" long-name="Diagnostics Plugin Base">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
-</component>
-<component name="diagresultsdb" filter="s60" long-name="Diagnostics Results Database">
-<!-- can only have one unit, merge or split into two components -->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
-</component>
-<component name="devicediagnosticsfw_build" filter="s60" long-name="Device Diagnostics Framework Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/group"/>
-</component>
-</collection>
-<collection name="dcmofw" long-name="Device Capability Management Object Framework" level="framework">
-<component name="dcmoclient" filter="s60" long-name="DCMO Client">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoclient/group"/>
-</component>
-<component name="dcmoserver" filter="s60" long-name="DCMO Server">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoserver/group"/>
-</component>
-<component name="dcmocustcmd" filter="s60" long-name="DCMO Custom Commands">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmocustcmd/group"/>
-</component>
-<component name="dcmofw_build" filter="s60" long-name="DCMO Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/dcmofw/group"/>
-</component>
-</collection>
-<collection name="fotaapplication" long-name="FOTA Application" level="generic">
-<component name="fotaapplication_build" filter="s60" long-name="FOTA Application Build">
-<!-- remove this component when configuration is in place and the #ifdefs have been worked out -->
-<unit bldFile="mw/remotemgmt/fotaapplication/group"/>
-</component>
-<component name="fotaserver" filter="s60" long-name="FOTA Server">
-<!-- uncomment when #ifdefs are resolved -->
-<!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
-</component>
-<component name="fotacustcmds" filter="s60" long-name="FOTA Custom Commands" class="placeholder">
-<!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
-<!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
-</component>
-</collection>
-</block>
-<block name="remotestorage" level="generic" long-name="Remote Storage" levels="framework if">
-<collection name="rsfw_plat" long-name="Remote Storage Platform Interfaces" level="if">
-<component name="rsfw_access_protocol_plugin_api" filter="s60" long-name="Remote Storage Framework Access Protocol Plugin API" class="api">
-<unit bldFile="mw/remotestorage/rsfw_plat/rsfw_access_protocol_plugin_api/group"/>
-</component>
-</collection>
-<collection name="remotestoragefw" long-name="Remote Storage Framework" level="framework">
-<component name="mountstore" filter="s60" long-name="RSFW Mount Store">
-<unit bldFile="mw/remotestorage/remotestoragefw/mountstore/group"/>
-</component>
-<component name="rsfwnotifierplugins" filter="s60" long-name="RSFW Notifier Plugins" plugin="Y">
-<unit bldFile="mw/remotestorage/remotestoragefw/rsfwnotifierplugins/group"/>
-</component>
-<component name="remotefileengine" filter="s60" long-name="Remote File Engine">
-<unit bldFile="mw/remotestorage/remotestoragefw/remotefileengine/group"/>
-</component>
-<component name="mountmanager" filter="s60" long-name="RSFW Mount Manager">
-<unit bldFile="mw/remotestorage/remotestoragefw/mountmanager/group"/>
-</component>
-<component name="webdavaccessplugin" filter="s60" long-name="WebDAV Access Plugin" plugin="Y">
-<unit bldFile="mw/remotestorage/remotestoragefw/webdavaccessplugin/group"/>
-</component>
-<component name="remotefilesystemplugin" filter="s60" long-name="Remote Filesystem Plugin" plugin="Y">
-<unit bldFile="mw/remotestorage/remotestoragefw/remotefilesystemplugin/group"/>
-</component>
-<component name="remotestoragegsplugin" filter="s60" long-name="RS GS Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
-<!-- <unit bldFile="remotestoragefw/gsplugin/group"/>-->
-</component>
-<component name="remotedriveconfigurationbiocontrol" filter="s60" long-name="Remote Drive Configuration BIO Control">
-<!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
-<!-- <unit bldFile="remotestoragefw/remotedriveconfigurationbiocontrol/group"/>-->
-</component>
-<component name="remotestoragefw_build" filter="s60" long-name="Remote Storage Framework Build">
-<!-- move exports to other components.
- This is needed for #includes of configured component until congigiration is in place -->
-<unit bldFile="mw/remotestorage/remotestoragefw/group"/>
-</component>
-</collection>
-</block>
-<block name="remoteconn" level="generic" long-name="Remote Connectivity" levels="plugin framework server generic specific">
-<collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
-<component name="secon" filter="s60" long-name="Service Controllers">
-<unit bldFile="mw/remoteconn/connectivitymodules/secon/group"/>
-</component>
-</collection>
-<collection name="remoteconn_info" long-name="Remote Connectivity Info" level="specific">
-<component name="remoteconn_metadata" long-name="Remote Connectivity Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mtptransports" long-name="MTP Transports" level="plugin">
-<component name="mtpusbtransport" long-name="MTP USB Transport" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpusbtransport/group" mrp="mw/remoteconn/mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
-</component>
-<component name="mtpptpiptransport" long-name="MTP PTP-IP Transport" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpptpiptransport/group" mrp="mw/remoteconn/mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
-</component>
-<component name="mtpcontroller" long-name="MTP Controller" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpcontroller/group" mrp="mw/remoteconn/mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
-</component>
-</collection>
-<collection name="mtpfws" long-name="MTP Frameworks" level="framework">
-<component name="mtpfw" long-name="MTP Framework" introduced="^2" purpose="optional">
-<unit bldFile="mw/remoteconn/mtpfws/mtpfw/group" mrp="mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/>
-</component>
-</collection>
-<collection name="mtpdataproviders" long-name="MTP Data Providers" level="generic">
-<component name="mtpfileandfolderdp" long-name="MTP File and Folder Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group" mrp="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
-</component>
-<component name="mtpimagedp" long-name="MTP Image Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpimagedp/group" mrp="mw/remoteconn/mtpdataproviders/mtpimagedp/group/mtp_imagedp.mrp"/>
-</component>
-<component name="mtppictbridgedp" long-name="MTP PictBridge Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group" mrp="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group/mtp_pictbridgedp.mrp"/>
-</component>
-</collection>
-<collection name="backupandrestore" long-name="Backup and Restore" level="specific">
-<component name="backupengine" long-name="Backup Engine" introduced="9.0" purpose="optional">
-<unit bldFile="mw/remoteconn/backupandrestore/backupengine/group" mrp="mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
-</component>
-<component name="backuptest" long-name="Backup Test" introduced="^2" purpose="development">
-<unit bldFile="mw/remoteconn/backupandrestore/backuptest/group" mrp="mw/remoteconn/backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
-</component>
-</collection>
-<collection name="obex" long-name="OBEX" level="generic">
-<component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexprotocol/group" mrp="mw/remoteconn/obex/obexprotocol/group/obex.mrp"/>
-</component>
-<component name="obexextensionapi" long-name="OBEX Extension API" introduced="9.2" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexextensionapi/group" mrp="mw/remoteconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
-</component>
-</collection>
-</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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<unit mrp="mw/srvdiscovery/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="dlnasrv" level="specific" long-name="DLNA Services" levels="stack server ctrl framework plugin">
-<!-- uncomment all the units when configuration is in place, they're currently #included from other xxx_build components -->
-<collection name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" level="plugin">
-<component name="upnp_media_server_settings_api" long-name="UPnP Media Server Settings API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_settings_api/group"/>
-</component>
-<component name="upnp_av_objects_api" long-name="UPnP A/V Objects API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_av_objects_api/group"/>
-</component>
-<component name="upnp_media_server_api" long-name="UPnP Media Server API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_api/group"/>
-</component>
-<component name="upnp_security_plugin_api" long-name="UPnP Security Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_security_plugin_api/group"/>
-</component>
-<component name="upnp_avcp_api" long-name="UPnP AVCP API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_avcp_api/group"/>
-</component>
-<component name="upnp_media_server_metadata_api" long-name="UPnP Media Server Metadata API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_metadata_api/group"/>
-</component>
-<component name="upnp_command_api" long-name="UPnP Command API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_command_api/group"/>
-</component>
-<component name="upnp_plugin_api" long-name="UPnP Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_plugin_api/group"/>
-</component>
-</collection>
-<collection name="upnpavcontrolpoint" long-name="UPnP A/V Control Point" level="plugin">
-<component name="avcontrolframework" filter="s60" long-name="A/V Control Famework" introduced="9.1" deprecated="^3">
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
-</component>
-<component name="upnpavcontrolpoint_build" filter="s60" long-name="UPnP A/V Control Point Build" introduced="9.1" deprecated="^3">
-<!-- put exports in other component instead -->
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/group"/>
-</component>
-</collection>
-<collection name="upnpmediaserver" long-name="UPnP Media Server" level="server">
-<component name="avobjects" filter="s60" long-name="A/V Objects">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/avobjects/group"/>
-</component>
-<component name="mediaserverclient" filter="s60" long-name="Media Server Client">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverclient/group"/>
-</component>
-<component name="connectionmanagerservice" filter="s60" long-name="Connection Manager Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/connectionmanagerservice/group"/>
-</component>
-<component name="contentdirectoryservice" filter="s60" long-name="Content Directory Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/contentdirectoryservice/group"/>
-</component>
-<component name="mediaserverengine" filter="s60" long-name="Media Server Engine">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverengine/group"/>
-</component>
-<component name="upnpmediaserver_build" filter="s60" long-name="UPnP Media Server Build">
-<!-- move exports into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpmediaserver/group"/>
-</component>
-</collection>
-<collection name="upnpavcontroller" long-name="UPnP A/V Controller" level="ctrl">
-<component name="upnpxmlparser" filter="s60" long-name="UPnP XML Parser" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpxmlparser/group"/>
-</component>
-<component name="upnpavcontrollerserver" filter="s60" long-name="UPnP A/V Controller Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerserver/group"/>
-</component>
-<component name="upnpavcontrollerclient" filter="s60" long-name="UPnP A/V Ccontroller Client" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerclient/group"/>
-</component>
-<component name="upnpavcontrollerhelper" filter="s60" long-name="UPnP A/V Controller Helper" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerhelper/group"/>
-</component>
-<component name="upnpavcontroller_build" filter="s60" long-name="UPnP A/V Controller Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpavcontroller/group"/>
-</component>
-</collection>
-<collection name="upnpframework" long-name="UPnP Framework" level="framework">
-<component name="upnputilities" filter="s60" long-name="UPnP Utilities" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnputilities/group"/>
-</component>
-<component name="upnpextensionpluginif" filter="s60" long-name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpextensionpluginif/group"/> -->
-</component>
-<component name="upnpfiletransferengine" filter="s60" long-name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>-->
-</component>
-<component name="upnpcommonui" filter="s60" long-name="UPnP Common UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpcommonui/group"/>-->
-</component>
-<component name="upnpaiwengine" filter="s60" long-name="UPnP AIW Engine" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpaiwengine/group"/> -->
-</component>
-<component name="upnpaiwprovider" filter="s60" long-name="UPnP AIW Provider" introduced="^2" deprecated="^3" plugin="Y">
-<!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
-</component>
-<component name="upnpmusicadapter" filter="s60" long-name="UPnP Music Adapter" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
-</component>
-<component name="upnpcommand" filter="s60" long-name="UPnP Command" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpcommand/group"/>
-</component>
-<component name="upnpframework_build" filter="s60" long-name="UPnP Framework Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpframework/group"/>
-</component>
-</collection>
-<collection name="upnpsettings" long-name="UPnP Settings" level="framework">
-<component name="upnpsettingsengine" filter="s60" long-name="UPnP Settings Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
-</component>
-<component name="multiselectionui" filter="s60" long-name="Multi-Selection UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/multiselectionui/group"/>-->
-</component>
-<component name="appwizard" filter="s60" long-name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/appwizard/group"/>-->
-</component>
-<component name="upnpsharingui" filter="s60" long-name="UPnP Sharing UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
-</component>
-<component name="upnpgsplugin" filter="s60" long-name="UPnP GS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
-</component>
-<component name="upnpsettings_build" filter="s60" long-name="UPnP Settings Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsettings/group"/>
-</component>
-</collection>
-<collection name="upnpsharing" long-name="UPnP Sharing" level="server">
-<component name="upnpdlnaprofiler" filter="s60" long-name="UPnP DLNA Profiler" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpdlnaprofiler/group"/>
-</component>
-<component name="upnpsecurity" filter="s60" long-name="UPnP Security" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpsecurity/group"/>
-</component>
-<component name="upnpcontentserver" filter="s60" long-name="UPnP Content Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpcontentserver/group"/>
-</component>
-<component name="applicationengine" filter="s60" long-name="UPnP Application Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/applicationengine/group"/>
-</component>
-<component name="upnpsharing_build" filter="s60" long-name="UPnP Sharing Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsharing/group"/>
-</component>
-</collection>
-<collection name="upnpmpxplugins" long-name="UPnP MPX Plugins" level="plugin">
-<component name="upnpplaybackplugins" filter="s60" long-name="UPnP Playback Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/upnpplaybackplugins/group"/>
-</component>
-<component name="upnpmpxplugins_build" filter="s60" long-name="UPnP MPX Plugins Build" introduced="^2">
-<!-- move exports content into other component? -->
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/group"/>
-</component>
-</collection>
-<collection name="upnpharvester" long-name="UPnP Harvester" level="ctrl">
-<component name="upnpharvester_common" filter="s60" long-name="UPnP Harvester Common" introduced="^2" deprecated="^3" class="placeholder">
-<!-- need to merge or #include these to a single bld.inf -->
-<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
- <unit bldFile="upnpharvester/common/cmsettings/group"/>
- <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
- <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
-</component>
-<component name="cdssync" filter="s60" long-name="CDS Sync" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
-</component>
-<component name="mdhserver" filter="s60" long-name="Metadata Harvester Server" introduced="^2" deprecated="^3" class="placeholder">
-<!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
-</component>
-<component name="upnpharvester_build" filter="s60" long-name="UPnP Harvester Build" introduced="^2" deprecated="^3" class="placeholder">
-<!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
-<!--<unit bldFile="upnpharvester/group"/>-->
-</component>
-</collection>
-<collection name="homesync" long-name="Home Sync" level="plugin">
-<component name="contentmanager" filter="s60" long-name="Content Manager" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homesync/group"/>-->
-<!-- move bld.inf into contentmanager dir -->
-</component>
-</collection>
-<collection name="homemedia" long-name="Home Media" level="framework">
-<!-- collection is really just a component. Move down a directory -->
-<component name="homemedia_build" filter="s60" long-name="Home Media" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homemedia/group"/> -->
-</component>
-</collection>
-<collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin">
-<component name="dlnasrv_build" filter="s60" long-name="DLNA Services Build">
-<!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed -->
-<unit bldFile="mw/dlnasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="btservices" level="generic" long-name="Bluetooth Services" levels="framework server generic specific plugin">
-<collection name="btservices_pub" long-name="BT Services Public Interfaces" level="plugin">
-<component name="bluetooth_power_state_api" long-name="Bluetooth Power State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_power_state_api/group"/>
-</component>
-<component name="bluetooth_notifier_api" long-name="Bluetooth Notifier API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_notifier_api/group"/>
-</component>
-</collection>
-<collection name="btservices_plat" long-name="BT Services Platform Interfaces" level="plugin">
-<component name="bluetooth_dosserver_audio_api" long-name="Bluetooth DOS Server Audio API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dosserver_audio_api/group"/>
-</component>
-<component name="bluetooth_dut_mode_api" long-name="Bluetooth DUT Mode API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dut_mode_api/group"/>
-</component>
-<component name="bluetooth_engine_api" long-name="Bluetooth Engine API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-<component name="bluetooth_local_variation_api" long-name="Bluetooth Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_local_variation_api/group"/>
-</component>
-<component name="bluetooth_notifier_internal_api" long-name="Bluetooth Notifier internal API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_notifier_internal_api/group"/>
-</component>
-<component name="bluetooth_sap_connection_state_api" long-name="Bluetooth SAP Connection State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_sap_connection_state_api/group"/>
-</component>
-<component name="bluetooth_secondary_display_notification_api" long-name="Bluetooth Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_secondary_display_notification_api/group"/>
-</component>
-</collection>
-<collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
-<component name="bteng" filter="s60" long-name="Bluetooth Engine">
-<unit bldFile="mw/btservices/bluetoothengine/bteng/group"/>
-</component>
-<component name="btnotif" filter="s60" long-name="Bluetooth Notifier">
-<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"/>
-</component>
-<component name="btmac" filter="s60" long-name="Bluetooth Mono Audio Controller" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btmac/group"/>
-</component>
-<component name="btsac" filter="s60" long-name="Bluetooth Stereo Audio Controller" plugin="Y">
-<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"/>
-</component>
-<component name="btsap" filter="s60" long-name="Bluetooth SIM Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btsap/group"/>
-</component>
-<component name="btui" filter="s60" long-name="Bluetooth UI">
-<unit bldFile="mw/btservices/bluetoothengine/btui/group"/>
-</component>
-<component name="btpbap" filter="s60" long-name="Bluetooth Phonebook Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btpbap/group"/>
-</component>
-<component name="bthid" filter="s60" long-name="Bluetooth HID">
-<unit bldFile="mw/btservices/bluetoothengine/bthid/group"/>
-</component>
-<component name="btctrldcmoadapter" filter="s60" long-name="Bluetooth Control DCMO Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btctrldcmoadapter/group"/>
-</component>
-</collection>
-<collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
-<component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
-<unit bldFile="mw/btservices/bluetoothappprofiles/avrcp" mrp="mw/btservices/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
-</component>
-</collection>
-<collection name="atcommands" long-name="AT Commands" level="generic">
-<component name="modematplugin" long-name="Modem AT Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/modematplugin/group"/>
-</component>
-<component name="lccustomplugin" long-name="LC Custom Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/lccustomplugin/group"/>
-</component>
-</collection>
-<collection name="btservices_info" long-name="BT Services Info" level="plugin">
-<component name="btservices_metadata" long-name="BT Services Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usbservices" level="generic" long-name="USB Services" levels="framework server generic specific plugin">
-<collection name="usbservices_plat" long-name="USB Services Platform Interfaces" level="plugin">
-<component name="pictbridge_api" long-name="PictBridge API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/pictbridge_api/group"/>
-</component>
-<component name="ptp_responder_api" long-name="PTP Responder API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_responder_api/group"/>
-</component>
-<component name="ptp_transport_api" long-name="PTP Transport API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_transport_api/group"/>
-</component>
-<component name="usb_device_control_plugin_api" long-name="USB Device Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_device_control_plugin_api/group"/>
-</component>
-<component name="usb_notifier_api" long-name="USB Notifier API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_notifier_api/group"/>
-</component>
-<component name="usb_personality_api_header" long-name="USB Personality API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_api_header/group"/>
-</component>
-<component name="usb_personality_plugin_api" long-name="USB Personality Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_plugin_api/group"/>
-</component>
-<component name="usb_secondary_display_api" long-name="USB Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_secondary_display_api/group"/>
-</component>
-<component name="usb_watcher_api" long-name="USB Watcher API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_api/group"/>
-</component>
-<component name="usb_watcher_info_api_header" long-name="USB Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_info_api_header/group"/>
-</component>
-</collection>
-<collection name="usbservices_info" long-name="USB Services Info" level="plugin"/>
-<collection name="usbengines" long-name="USB Engines" level="generic">
-<component name="usbotgwatcher" filter="s60" long-name="USB OTG Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbotgwatcher/group"/>
-</component>
-<component name="usbwatcher" filter="s60" long-name="USB Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbwatcher/group"/>
-</component>
-<component name="usblocodplugin" filter="s60" long-name="USB Local Connectivity Domain Plugin" plugin="Y">
-<unit bldFile="mw/usbservices/usbengines/usblocodplugin/group"/>
-</component>
-<component name="usbdevcon" filter="s60" long-name="USB Device Control">
-<unit bldFile="mw/usbservices/usbengines/usbdevcon/group"/>
-</component>
-<component name="usbremotepersonality" filter="s60" long-name="USB Remote Personality">
-<unit bldFile="mw/usbservices/usbengines/usbremotepersonality/group"/>
-</component>
-</collection>
-<collection name="usbclasses" long-name="USB Classes" level="framework">
-<component name="usbobexclasscontroller" filter="s60" long-name="USB OBEX Class Controller" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbobexclasscontroller/group"/>
-</component>
-<component name="usbbasicpersonality" filter="s60" long-name="USB Basic Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbbasicpersonality/group"/>
-</component>
-<component name="usbmscpersonality" filter="s60" long-name="USB MSC Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbmscpersonality/group"/>
-</component>
-<!-- commented out in bld.inf. Should this be deleted?
- <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
- <unit bldFile="usbclasses/ptpstack/group"/>
- </component>
- <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
- <unit bldFile="usbclasses/sicdusbplugin/group"/>
- </component>
- <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
- <unit bldFile="usbclasses/ptpserver/group"/>
- </component>-->
-<component name="pictbridgeengine" filter="s60" long-name="PictBridge Engine">
-<unit bldFile="mw/usbservices/usbclasses/pictbridgeengine/group"/>
-</component>
-<component name="usbphoneasmodem" filter="s60" long-name="USB Phone as Modem" introduced="^3">
-<unit bldFile="mw/usbservices/usbclasses/usbphoneasmodem/group"/>
-</component>
-</collection>
-<collection name="usbuis" long-name="USB UIs" level="specific">
-<component name="usbui" filter="s60" long-name="USB UI">
-<unit bldFile="mw/usbservices/usbuis/usbui/group"/>
-</component>
-<component name="usbuinotif" filter="s60" long-name="USB UI Notifiers">
-<unit bldFile="mw/usbservices/usbuis/usbuinotif/group"/>
-</component>
-<component name="imageprintuiprovider" filter="s60" long-name="ImagePrint UI Provider" plugin="Y">
-<unit bldFile="mw/usbservices/usbuis/imageprintuiprovider/group"/>
-</component>
-<component name="usbimageprintui" filter="s60" long-name="ImagePrint UI">
-<unit bldFile="mw/usbservices/usbuis/imageprintui/group"/>
-</component>
-</collection>
-</block>
-<block name="shortlinkconn" level="generic" long-name="Shortlink Connectivity" levels="framework server generic specific plugin">
-<!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
-<collection name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" level="plugin">
-<component name="obex_service_utils_api" long-name="OBEX Service Utils API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_utils_api/group"/>
-</component>
-<component name="obex_service_plugin_api" long-name="OBEX Service Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_plugin_api/group"/>
-</component>
-<component name="dialup_connection_status_api" long-name="Dial-up Connection Status API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dialup_connection_status_api/group"/>
-</component>
-<component name="dun_secondary_display_notification_api" long-name="DUN Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
-</component>
-<component name="obex_secondary_display_notification_api" long-name="OBEX Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
-</component>
-<component name="generic_hid_api" long-name="Generic HID API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/generic_hid_api/group"/>
-</component>
-<component name="locod_bearer_plugin_api" long-name="Locod Bearer Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/locod_bearer_plugin_api/group"/>
-</component>
-<component name="usb_obexservicemanager_client_api" long-name="USB OBEX Service Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_obexservicemanager_client_api/group"/>
-</component>
-</collection>
-<collection name="localconnectivityservice" long-name="Local Connectivity Service" level="server">
-<component name="locod" long-name="Local Connectivity Daemon">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/locod/group"/>
-</component>
-<component name="obexserviceman" long-name="OBEX Service Managar">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
-</component>
-<component name="obexsendservices" long-name="OBEX Send Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
-</component>
-<component name="obexreceiveservices" long-name="OBEX Receive Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
-</component>
-<component name="dun" long-name="Dial Up Networking">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/dun/group"/>
-</component>
-<component name="lcstylustap" long-name="LC Stylus Tap Plugins" plugin="Y">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/lcstylustap/group"/>
-</component>
-<component name="generichid" long-name="Generic HID">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/generichid/group"/>
-</component>
-<component name="headset" long-name="Headset">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/headset/group"/>
-</component>
-</collection>
-</block>
-<block name="imghandling" level="specific" long-name="Image Handling" levels="lib util if">
-<collection name="imagehandling_plat" long-name="Image Handling Platform Interfaces" level="if">
-<component name="image_handling_library_api" long-name="Image Handling Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
-</component>
-<component name="3gp_library_api" long-name="3GP Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
-</component>
-<component name="thumbnailmanager_api" long-name="Thumbnail Manager API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagehandlinglib" long-name="Image Handling Library" level="lib">
-<!-- collection is really a component, need to move down a directory -->
-<component name="ihl" filter="s60" long-name="IHL">
-<unit bldFile="mw/imghandling/imagehandlinglib/group"/>
-</component>
-</collection>
-<collection name="imagehandlingutilities" long-name="Image Handling Utilities" level="util">
-<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager">
-<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
-</component>
-</collection>
-</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">
-<unit bldFile="mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
-</component>
-</collection>
-</block>
-<block name="mds" level="specific" long-name="Metadata Services" levels="mgr eng server int">
-<collection name="mds_plat" long-name="Metadata Services Platform Interfaces" level="int">
-<component name="context_engine_plugin_api" long-name="Context Engine Plugin API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/group" filter="!test"/>
-</component>
-<component name="harvester_framework_api" long-name="Harvester Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/harvester_framework_api/group" filter="!test"/>
-<!-- can only have one unit with the same filter, #include the following from the previous unit -->
-</component>
-<component name="location_manager_api" long-name="Location Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/location_manager_api/group" filter="!test"/>
-</component>
-<component name="metadata_engine_api" long-name="Metadata Engine API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/metadata_engine_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_collection_manager_api" long-name="Content Listing Framework Collection Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_extended_api" long-name="Content Listing Framework Extended API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_extended_api/group"/>
-</component>
-</collection>
-<collection name="mds_pub" long-name="Metadata Services Public Interfaces" level="int">
-<component name="content_listing_framework_api" long-name="Content Listing Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_pub/content_listing_framework_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="metadataengine" long-name="Metadata Engine" level="eng">
-<component name="metadataengine_common" filter="s60" long-name="Metadata Engine Common" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/common/group"/>
-</component>
-<component name="metadataengine_server" filter="s60" long-name="Metadata Engine Server" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/server/group"/>
-</component>
-<component name="metadataengine_client" filter="s60" long-name="Metadata Engine Client" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/client/group"/>
-</component>
-<component name="metadataengine_build" filter="s60" long-name="Metadata Engine Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/metadataengine/group"/>
-</component>
-</collection>
-<collection name="locationmanager" long-name="Location Manager" level="mgr">
-<component name="locationtrail" filter="s60" long-name="Location Trail" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/locationtrail/group"/>
-</component>
-<component name="locationmanager_server" filter="s60" long-name="Location Manager Server" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/server/group"/>
-</component>
-<component name="locationmanager_client" filter="s60" long-name="Location Manager Client" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/client/group"/>
-</component>
-<component name="locationmanager_build" filter="s60" long-name="Location Manager Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/locationmanager/group"/>
-</component>
-</collection>
-<collection name="contextengine" long-name="Context Engine" level="eng">
-<component name="contextengine_plugins" filter="s60" long-name="Context Engine Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/contextengine/plugins/group"/>
-</component>
-<component name="contextengine_build" filter="s60" long-name="Context Engine Build" introduced="^2">
-<!--make this collection a single component, or make this unit self-contained -->
-<unit bldFile="mw/mds/contextengine/group"/>
-</component>
-</collection>
-<collection name="harvester" long-name="Harvester" level="eng">
-<component name="blacklistclient" filter="s60" long-name="Blacklist Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistclient/group"/>
-</component>
-<component name="blacklistserver" filter="s60" long-name="Blacklist Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistserver/group"/>
-</component>
-<component name="harvester_common" filter="s60" long-name="Harvester Common" introduced="^2">
-<unit bldFile="mw/mds/harvester/common/group"/>
-</component>
-<component name="composerplugins" filter="s60" long-name="Composer Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/composerplugins/group"/>
-</component>
-<component name="harvesterplugins" filter="s60" long-name="Harvester Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/harvesterplugins/group"/>
-</component>
-<component name="monitorplugins" filter="s60" long-name="Monitor Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/monitorplugins/group"/>
-</component>
-<component name="harvester_server" filter="s60" long-name="Harvester Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/server/group"/>
-</component>
-<component name="harvester_client" filter="s60" long-name="Harvester Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/client/group"/>
-</component>
-<component name="harvester_build" filter="s60" long-name="Harvester Build" introduced="^2">
-<!-- split these exports into the other components -->
-<unit bldFile="mw/mds/harvester/group"/>
-</component>
-</collection>
-<collection name="watchdog" long-name="Watchdog" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="mdswatchdog" filter="s60" long-name="Metadata Watchdog" introduced="^2">
-<unit bldFile="mw/mds/watchdog/group"/>
-</component>
-</collection>
-<collection name="clfwrapper" long-name="Content Listing Framework Wrapper" level="int">
-<!-- collection is really a component. Move down a directory -->
-<component name="clfwrapper_build" filter="s60" long-name="CLF Wrapper Build" introduced="^2" class="placeholder">
-<!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
-<!--<unit bldFile="clfwrapper/group"/>-->
-</component>
-</collection>
-<collection name="mds_info" long-name="Metadata Services Info" level="int">
-<component name="mds_build" filter="s60" long-name="Metadata Services Build" introduced="^2">
-<!-- consider distributiing this into the rest of the components in the package -->
-<unit bldFile="mw/mds/group"/>
-</component>
-</collection>
-</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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<unit bldFile="mw/mmuifw/mmuifw_plat/alf_customlayoutmanagers_api/group"/>
-</component>
-<component name="gesturehelper_api" long-name="Gesture Helper API" filter="s60" 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">
-<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">
-<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">
-<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">
-<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">
-<!-- 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">
-<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">
-<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">
-<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">
-<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">
-<unit bldFile="mw/mmuifw/mulwidgets/mullogging/group"/>
-</component>
-<component name="muldatamodel" filter="s60" long-name="MUL Data Model">
-<unit bldFile="mw/mmuifw/mulwidgets/muldatamodel/group"/>
-</component>
-<component name="mulwidgets_common" filter="s60" long-name="MUL Common Utils">
-<unit bldFile="mw/mmuifw/mulwidgets/common/group"/>
-</component>
-<component name="gesturehelper" filter="s60" long-name="Gesture Helper">
-<unit bldFile="mw/mmuifw/mulwidgets/gesturehelper/group"/>
-</component>
-<component name="mulcoverflowwidget" filter="s60" long-name="MUL CoverFlow Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/mulcoverflowwidget/group"/>
-</component>
-<component name="mulsliderwidget" filter="s60" long-name="MUL Slider Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/mulsliderwidget/group"/>
-</component>
-<component name="alfviewwidget" filter="s60" long-name="ALF View Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/alfviewwidget/group"/>
-</component>
-<component name="alfcontainerwidget" filter="s60" long-name="ALF Container Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/alfcontainerwidget/group"/>
-</component>
-<component name="alfscrollbarwidget" filter="s60" long-name="ALF Scrollbar Widget">
-<unit bldFile="mw/mmuifw/mulwidgets/alfscrollbarwidget/group"/>
-</component>
-</collection>
-</block>
-<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"/>
-</component>
-<component name="videoconnutility_api" long-name="Video Connection Utility API" filter="s60" class="api">
-<unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/group"/>
-</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"/>
-</component>
-</collection>
-<collection name="videoscheduler" long-name="Video Scheduler" level="util">
-<component name="schedulerclient" filter="s60" long-name="Video Scheduler Client">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerclient/group"/>
-</component>
-<component name="schedulerserver" filter="s60" long-name="Video Scheduler Server">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerserver/group"/>
-</component>
-</collection>
-<collection name="videoconnutility" long-name="Video Connection Utility" level="util">
-<component name="connutilpsworker" filter="s60" long-name="Connection Utility Publish and Subscribe Worker">
-<unit bldFile="mw/videoutils/videoconnutility/connutilpsworker/group"/>
-</component>
-<component name="video_connutility" filter="s60" long-name="Video Connection Utility">
-<unit bldFile="mw/videoutils/videoconnutility/connutility/group"/>
-</component>
-</collection>
-<collection name="videoutils_info" long-name="Video Utils Info" level="if"/>
-</block>
-<block name="mmmw" level="generic" long-name="Multimedia Middleware" levels="plugin framework server generic specific">
-<collection name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" level="specific">
-<component name="multimedia_data_source_api" long-name="Multimedia Data Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
-</component>
-<component name="progressive_download_api" long-name="Progressive Download API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/progressive_download_api/group"/>
-</component>
-<component name="equalizer_ui_api" long-name="Equalizer UI API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
-</component>
-<component name="enhanced_media_client_api" long-name="Enhanced Media Client API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
-</component>
-<component name="stream_control_custom_command_api" long-name="Stream Control Custom Command API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
-</component>
-<component name="emc_buffer_source_api" long-name="EMC Buffer Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_buffer_source_api/group"/>
-</component>
-<component name="emc_file_source_api" long-name="EMC File Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
-</component>
-<component name="audio_metadata_reader_api" long-name="Audio MetaData Reader API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
-</component>
-<component name="emc_progressive_download_source_api" long-name="EMC Progressive Download Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
-</component>
-<component name="emc_volume_effect_api" long-name="EMC Volume Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
-</component>
-<component name="emc_balance_effect_api" long-name="EMC Balance Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_balance_effect_api/group"/>
-</component>
-<component name="emc_descriptor_source_api" long-name="EMC Descriptor Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_descriptor_source_api/group"/>
-</component>
-<component name="emc_drm_config_intfc_api" long-name="EMC DRM Config Intfc API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
-</component>
-<component name="voip_audio_services_api" long-name="VoIP Audio Services" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/group"/>
-</component>
-<component name="configuration_components_factory_api" long-name="Configuration Components Factory API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
-</component>
-<component name="audio_output_control_utility_api" long-name="Audio Output Control Utility API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/group"/>
-</component>
-<component name="audio_output_control_utility_proxy_api" long-name="Audio Output Control Utility Proxy API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
-</component>
-<component name="emc_audio_effects_api" long-name="EMC Audio Effects API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
-</component>
-<component name="call_audio_control_api" long-name="Call AudioControl API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/group"/>
-</component>
-<component name="radio_utilities_api" long-name="Radio Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/group"/>
-</component>
-<component name="radio_preset_utilities_api" long-name="Radio Preset Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
-</component>
-<component name="radio_monitor_api" long-name="Radio Monitor API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
-</component>
-<component name="thumbnail_engine_api" long-name="Thumbnail Engine API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/thumbnail_engine_api/group"/>
-</component>
-<component name="telephony_multimedia_service_api" long-name="Telephony Multimedia Service API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="mmfenh" long-name="MMF Enhancements" level="generic">
-<component name="advancedaudiocontroller" filter="s60" long-name="Advanced Audio Controllers" plugin="Y">
-<unit bldFile="mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
-</component>
-<component name="audiooutputcontrolutility" filter="s60" long-name="Audio Output Control Utility">
-<unit bldFile="mw/mmmw/mmfenh/audiooutputcontrolutility/group"/>
-</component>
-<component name="configurationcomponentsfactory" filter="s60" long-name="Configuration Components Factory">
-<unit bldFile="mw/mmmw/mmfenh/configurationcomponentsfactory/group"/>
-</component>
-<component name="enhancedaudioplayerutility" filter="s60" long-name="Enhanced Audio Player Utility">
-<unit bldFile="mw/mmmw/mmfenh/enhancedaudioplayerutility/group"/>
-</component>
-<component name="enhancedmediaclient" filter="s60" long-name="Enhanced Media Client">
-<unit bldFile="mw/mmmw/mmfenh/enhancedmediaclient/group"/>
-</component>
-<component name="profilesettingsmonitor" filter="s60" long-name="Profile Settings Monitor">
-<unit bldFile="mw/mmmw/mmfenh/profilesettingsmonitor/group"/>
-</component>
-<component name="progressivedownload" filter="s60" long-name="Progressive Download">
-<unit bldFile="mw/mmmw/mmfenh/progressivedownload/group"/>
-</component>
-</collection>
-<collection name="mm_fw" long-name="Multimedia Frameworks" level="framework">
-<!-- Id needs to be unique, mmfw already in use -->
-<!-- Placeholder for OpenAX AL and other stuff -->
-</collection>
-<collection name="mmserv" long-name="Multimedia Services" level="specific">
-<component name="audioeffectsui" filter="s60" long-name="Audio Effects UI">
-<unit bldFile="mw/mmmw/mmserv/audioeffectsui/group"/>
-</component>
-<component name="callaudiocontrol" filter="s60" long-name="Call Audio Control">
-<unit bldFile="mw/mmmw/mmserv/callaudiocontrol/group"/>
-</component>
-<component name="metadatautility" filter="s60" long-name="Metadata Utility">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/group"/>
-</component>
-<component name="radioutility" filter="s60" long-name="Radio Utility">
-<unit bldFile="mw/mmmw/mmserv/radioutility/group"/>
-</component>
-<component name="thumbnailengine" filter="s60" long-name="Thumbnail Engine" introduced="^2">
-<unit bldFile="mw/mmmw/mmserv/thumbnailengine/group"/>
-</component>
-<component name="tms" filter="s60" long-name="Telephony Multimedia Service" introduced="^3">
-<unit bldFile="mw/mmmw/mmserv/tms/group"/>
-</component>
-<component name="voipaudioservices" filter="s60" long-name="VoIP Audio Services">
-<unit bldFile="mw/mmmw/mmserv/voipaudioservices/group"/>
-</component>
-<component name="lib3gpextparser" filter="s60" long-name="3GP Extension Metadata Parser Library">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group" filter="sf_build"/>
-</component>
-</collection>
-<collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
-<component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="helix" level="generic" long-name="Helix" levels="plugin framework server generic specific">
-<collection name="helix_ren" long-name="Helix Engine" level="framework">
-<!-- what does "ren" stand for? -->
-<component name="helix_stub" filter="s60" long-name="Helix Stub" introduced="^2" class="api">
-<unit bldFile="mw/helix/helix_ren/helix_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="camerasrv" level="specific" long-name="Camera Services" levels="plugin fw api">
-<collection name="camerasrv_plat" long-name="Camera Services Platform Interfaces" level="api">
-<component name="media_recorder_sink_api" long-name="Media Recorder Sink API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
-</component>
-<component name="cae_extentension_api" long-name="CAE Extension API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/cae_extentension_api/group"/>
-</component>
-<component name="camera_application_engine_api" long-name="Camera Application Engine API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/camera_application_engine_api/group" filter="!test"/>
-</component>
-<component name="custom_onboard_camera_api" long-name="Custom Onboard Camera API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
-</component>
-<component name="imaging_configuration_manager_api" long-name="Imaging Configuration Manager API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
-</component>
-<component name="media_recorder_api" long-name="Media Recorder API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_api/group" filter="!test"/>
-</component>
-<component name="3gp_file_composer_api" long-name="3GP File Composer API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
-</component>
-<component name="asynchronous_file_saving_queue_api" long-name="Asynchronous File Saving Queue API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="camappengine" long-name="Camera App Engine" level="fw">
-<!-- is this collection really a component? If so, move down a directory -->
-<component name="stillconverter" filter="s60" long-name="Still Image Converter" class="placeholder">
-<!-- should separate this from parent engine's bld.inf -->
-<!-- <unit bldFile="camappengine/stillconverter/group"/> -->
-</component>
-<component name="camappengine_engine" filter="s60" long-name="Camera App Engine" class="placeholder">
-<!-- should separate this from parent engine's bld.inf -->
-<!-- <unit bldFile="camappengine/engine/group"/> -->
-</component>
-<component name="asynchfilesavequeue" filter="s60" long-name="Asynch File Save Queue">
-<unit bldFile="mw/camerasrv/camappengine/asynchfilesavequeue/group"/>
-</component>
-<component name="camappengine_build" filter="s60" long-name="Camera App Engine Build">
-<unit bldFile="mw/camerasrv/camappengine/build"/>
-</component>
-</collection>
-<collection name="camcordermmfplugin" long-name="Camcorder MMF Plugin" level="plugin">
-<!-- collection is really a component. Should move down a directory -->
-<component name="camcordermmfplugin_build" filter="s60" long-name="Camcorder MMF Plugin Build" plugin="Y">
-<unit bldFile="mw/camerasrv/camcordermmfplugin/build"/>
-</component>
-</collection>
-<collection name="configmanagers" long-name="Config Managers" level="api">
-<component name="imagingconfigmanager" filter="s60" long-name="Imaging Config Manager">
-<unit bldFile="mw/camerasrv/configmanagers/imagingconfigmanager/group"/>
-</component>
-</collection>
-<collection name="camerasrv_info" long-name="Camera Services Info" level="api">
-<component name="camerasrv_build" filter="s60" long-name="Camera Services Build">
-<!-- should split into individual bld.infs -->
-<unit bldFile="mw/camerasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="mmappfw" level="specific" long-name="Multimedia App Framework" levels="fw utils if">
-<collection name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" level="if">
-<component name="collection_helper_api" long-name="Collection Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
-</component>
-<component name="harvester_collection_mediator_api" long-name="Harvester Collection Mediator API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/group"/>
-</component>
-<component name="harvester_metadata_extractor_api" long-name="Harvester Metadata Extractor API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/group"/>
-</component>
-<component name="harvester_server_api" long-name="Harvester Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_server_api/group"/>
-</component>
-<component name="harvester_utility_api" long-name="Harvester Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_utility_api/group"/>
-</component>
-<component name="playlist_engine_api" long-name="Playlist Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playlist_engine_api/group"/>
-</component>
-<component name="mtp_keys_api" long-name="MTP Keys API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mtp_keys_api/group"/>
-</component>
-<component name="mpx_collection_common_definition_api" long-name="MPX Collection Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_common_definition_api/group"/>
-</component>
-<component name="mpx_collection_utility_api" long-name="MPX Collection Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/group"/>
-</component>
-<component name="mpx_common_api" long-name="MPX Common API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_api/group"/>
-</component>
-<component name="mpx_common_definition_api" long-name="MPX Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_common_definition_api" long-name="MPX Playback Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_utility_api" long-name="MPX Playback Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/group"/>
-</component>
-<component name="mpx_base_view_plugins_api" long-name="MPX Base View Plugins API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/group"/>
-</component>
-<component name="mpx_view_utility_api" long-name="MPX View Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_view_utility_api/group"/>
-</component>
-<component name="mpx_albumart_utility_api" long-name="MPX Album Art Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/group"/>
-</component>
-<component name="media_player_settings_engine_api" long-name="Media Player Settings Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
-</component>
-<component name="mpx_backstepping_utility_api" long-name="MPX Backstepping Utility API" introduced="^1" filter="s60" class="api">
-<!-- uncomment when configuration is put in place
- <unit bldFile="mmappfw_plat/mpx_backstepping_utility_api/group"/> -->
-</component>
-<component name="asx_parser_api" long-name="ASX Parser API" introduced="^1" filter="s60" class="api">
-<!-- uncomment when configuration is put in place
- <unit bldFile="mmappfw_plat/asx_parser_api/group"/> -->
-</component>
-<component name="playback_helper_api" long-name="Playback Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playback_helper_api/group"/>
-</component>
-<component name="videoplaylist_utility_api" long-name="Video Playlist Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/videoplaylist_utility_api/group"/>
-</component>
-<component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interface Build" introduced="^1" filter="s60" class="api">
-<!-- needed only for #ifdefs. Remove anmd uncomment above units when configuration is in place -->
-<unit bldFile="mw/mmappfw/mmappfw_plat/group"/>
-</component>
-</collection>
-<collection name="mpx" long-name="Multimedia Player" level="fw">
-<component name="commonframework" filter="s60" long-name="MPX Common Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/commonframework/group"/>
-</component>
-<component name="playbackframework" filter="s60" long-name="MPX Playback Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/playbackframework/group"/>
-</component>
-<component name="mpxcollectionfw" filter="s60" long-name="MPX Collection Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/collectionframework/group"/>
-</component>
-<component name="mpxviewfw" filter="s60" long-name="MPX View Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/viewframework/group"/>
-</component>
-<component name="mpx_build" filter="s60" long-name="MPX Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/mpx/group"/>
-</component>
-</collection>
-<collection name="mmappcomponents" long-name="Multimedia App Components" level="utils">
-<component name="mmappcomponents_build" filter="s60" long-name="Multimedia App Components Build" introduced="^1">
-<!-- needed for #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
- Can remove this once configuration is in place-->
-<unit bldFile="mw/mmappfw/mmappcomponents/group"/>
-</component>
-<component name="collectionhelper" filter="s60" long-name="Media Player Collection Helper" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/collectionhelper/group"/>
-</component>
-<component name="playlistengine" filter="s60" long-name="Playlist Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/playlistengine/group"/>
-</component>
-<component name="mpxharvester" filter="s60" long-name="Media Player Harvester" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/harvester/group"/>
-</component>
-<component name="mmappcommonui" filter="s60" long-name="Multimedia App Common UI" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmappcommonui/group"/>
-</component>
-<component name="mediaplayersettingsengine" filter="s60" long-name="Media Player Settings Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
-</component>
-<component name="audiofetcher" filter="s60" long-name="Audio Fetcher" introduced="^1" plugin="Y">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
-</component>
-<component name="asxparser" filter="s60" long-name="ASX Parser" introduced="^1">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
-</component>
-<component name="playbackhelper" filter="s60" long-name="Playback Helper" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/playbackhelper/group"/>
-</component>
-<component name="videoplaylistutility" filter="s60" long-name="Video Playlist Utility" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/videoplaylistutility/group"/>
-</component>
-<component name="mmmtpdataprovider" filter="s60" long-name="Multimedia MTP Data Provider" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmmtpdataprovider/group"/>
-</component>
-</collection>
-<collection name="mmappfw_info" long-name="Multimedia App Framework Info" level="if">
-<component name="mmappfw_build" filter="s60" long-name="Multimedia App Framework Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/group"/>
-</component>
-<component name="mmappfw_test" filter="s60,test,api_test,pref_test" long-name="Multimedia App Framework Test" purpose="development" introduced="^1"/>
-</collection>
-</block>
-<block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework api">
-<collection name="inputmethods_pub" long-name="Input Methods Public Interfaces" level="api">
-<component name="ptiengine_iti_api" long-name="PTI Engine API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
-</component>
-<component name="optical_character_recognition_api" long-name="Optical Character Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
-</component>
-<component name="input_language_info_api" long-name="Input Language Info API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
-</component>
-</collection>
-<collection name="inputmethods_plat" long-name="Input Methods Platform Interfaces" level="api">
-<component name="pen_input_server_api" long-name="Pen Input Server API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/group" filter="!test"/>
-</component>
-<component name="ptiengine_hwr_api" long-name="PTI Engine Handwriting Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group" filter="!test"/>
-</component>
-<component name="aknfep_settings_api" long-name="Avkon FEP Settings API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
-</component>
-<component name="aknfep_status_api" long-name="Avkon FEP Status API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
-</component>
-<component name="ptiengine_key_definations_api" long-name="PTI Engine Key Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
-</component>
-<component name="aknfep_definitions_api" long-name="Avkon FEP Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
-</component>
-<component name="aknfep_pen_support_api" long-name="Avkon FEP Pen Support API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
-</component>
-<component name="ptiengine_indic_definitions_api" long-name="PTI Engine Indic Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
-</component>
-<component name="aknfep_uiinterface_api" long-name="Avkon FEP UI Interface API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="textinput" long-name="Text Input" level="framework">
-<component name="ptienginev2" filter="s60" long-name="Predictive Text Input Engine">
-<!--uncomment when configuration is turned on and textinput_build is removed-->
-<!-- <unit bldFile="textinput/ptienginev2/group"/>-->
-</component>
-<component name="akninputlanguage" filter="s60" long-name="Avkon Input Language">
-<unit bldFile="mw/inputmethods/textinput/akninputlanguage/group"/>
-</component>
-<component name="peninputarc" filter="s60" long-name="Pen Input Arc">
-<unit bldFile="mw/inputmethods/textinput/peninputarc/group"/>
-</component>
-<component name="peninputcommonctrls" filter="s60" long-name="Pen Input Common Controls">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonctrls/group"/>
-</component>
-<component name="peninputhwrboxcn" filter="s60" long-name="Chinese Handwriting Recognition Box" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrboxcn/group"/>
-</component>
-<component name="peninputvkbcn" filter="s60" long-name="Chinese Virtual Keyboard" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputvkbcn/group"/>
-</component>
-<component name="peninputcommonlayout" filter="s60" long-name="Pen Input Common Layout">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonlayout/group"/>
-</component>
-<component name="peninputgenerichwr" filter="s60" long-name="Pen Input Generic Handwriting Recognition" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputgenerichwr/group"/>
-</component>
-<component name="peninputgenericvkb" filter="s60" long-name="Pen Input Generic Virtual Keyboard" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputgenericvkb/group"/>
-</component>
-<component name="peninputcommonctrlsjp" filter="s60" long-name="Pen Input Common Controls Japanese">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonctrlsjp/group"/>
-</component>
-<component name="peninputhwrboxjp" filter="s60" long-name="Japanese Handwriting Recognition Box" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrboxjp/group"/>
-</component>
-<component name="peninputvkbjp" filter="s60" long-name="Japanese Virtual Keyboard" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputvkbjp/group"/>
-</component>
-<component name="gslangplugin" filter="s60" long-name="GS Language Plugin" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/GSLangPlugin"/>
-</component>
-<component name="peninputgenericitut" filter="s60" long-name="Pen Input Generic ITU-T" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputgenericitut/group"/>
-</component>
-<component name="peninputhwrtrui" filter="s60" long-name="Pen Input Handwriting Recognition Training UI" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrtrui/group"/>
-</component>
-<component name="peninputhwrfscn" filter="s60" long-name="Pen Input Chinese Full Screen Handwriting Recognition" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrfscn/group"/>
-</component>
-<component name="peninputvkbkr" filter="s60" long-name="Pen Input Korean Virtual Keyboard" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputvkbkr/group"/>
-</component>
-<component name="peninputfingerhwr" filter="s60" long-name="Pen Input Finger Handwriting Recognition" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputfingerhwr/group"/>
-</component>
-<component name="peninputsplititut" filter="s60" long-name="Pen Input Split ITU-T" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputsplititut/group"/>
-</component>
-<component name="peninputsplitqwerty" filter="s60" long-name="Pen Input Split QWERTY" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputsplitqwerty/group"/>
-</component>
-<component name="textinput_build" filter="s60" long-name="Text Input Build">
-<!--needed for #ifdef, can be removed when configuration is implemented -->
-<unit bldFile="mw/inputmethods/textinput/group"/>
-</component>
-</collection>
-<collection name="fep" long-name="FEP" level="engine">
-<component name="aknfep" filter="s60" long-name="Avkon FEP" plugin="Y">
-<unit bldFile="mw/inputmethods/fep/aknfep/group"/>
-</component>
-<component name="frontendprocessor" long-name="Front End Processor" purpose="mandatory">
-<unit bldFile="mw/inputmethods/fep/frontendprocessor/group" mrp="mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
-</component>
-</collection>
-<collection name="inputmethods_info" long-name="Input Methods Info" level="api">
-<component name="inputmethods_metadata" long-name="Input Methods Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="qt" level="generic" long-name="Qt" levels="tool mw app">
-<collection name="qtconf" long-name="Qt Config" level="tool">
-<component name="qt_deviceconfiguration" long-name="Qt Device Configuration" introduced="^2" class="config tool">
-<unit bldFile="mw/qt/src/s60installs/deviceconfiguration"/>
-</component>
-</collection>
-<collection name="qt_info" long-name="Qt Info" level="mw">
-<component name="qt_build" long-name="Qt Build" introduced="^2">
-<unit bldFile="mw/qt" proFile="projects.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-<collection name="qtdemos" long-name="Qt Demos" level="app">
-<component name="qtdemos_build" long-name="Qt Demos Build" introduced="^2" filter="qtdemos">
-<unit bldFile="mw/qt/demos" proFile="demos.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qtexamples" long-name="Qt Examples" level="app">
-<component name="qtexamples_build" long-name="Qt Examples Build" introduced="^2" filter="qtexamples">
-<unit bldFile="mw/qt/examples" proFile="examples.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qt_tests" long-name="Qt Tests" level="app">
-<component name="qttestsauto" long-name="Qt Automated Tests" introduced="^2" filter="qttestsauto">
-<unit bldFile="mw/qt/tests/auto" proFile="qtpauto.pro"/>
-</component>
-<component name="qttestsbenchmarks" long-name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks">
-<unit bldFile="mw/qt/tests/benchmarks" proFile="benchmarks.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</block>
-<block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
-<collection name="classicui_plat" long-name="Classic UI Platform Interfaces" level="specific">
-<component name="personalisation_framework_api" long-name="Personalisation Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_framework_api/group" filter="!test"/>
-</component>
-<component name="signal_pane_api" long-name="Signal Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
-</component>
-<component name="japanese_reading_api" long-name="Japanese Reading API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/japanese_reading_api/group" filter="!test"/>
-</component>
-<component name="global_popup_priority_controller_api" long-name="Global Popup Priority Controller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
-</component>
-<component name="item_finder_api" long-name="Item Finder API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/item_finder_api/group" filter="!test"/>
-</component>
-<component name="avkon_fonts_api" long-name="Avkon Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_fonts_api/group" filter="!test"/>
-</component>
-<component name="extended_utilities_api" long-name="Extended Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
-</component>
-<component name="personalisation_plugin_api" long-name="Personalisation Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
-</component>
-<component name="extended_aiw_criteria_api" long-name="Extended AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="personalisation_application_api" long-name="Personalisation Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_application_api/group"/>
-</component>
-<component name="volume_popup_api" long-name="Volume Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
-</component>
-<component name="avkon_secondary_display_support_api" long-name="AVKON Secondary Display Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_support_api/group" filter="!test"/>
-</component>
-<component name="extended_setting_pages_api" long-name="Extended Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_setting_pages_api/group" filter="!test"/>
-</component>
-<component name="extended_lists_api" long-name="Extended Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_lists_api/group" filter="!test"/>
-</component>
-<component name="input_block_api" long-name="Input Block API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/input_block_api/group" filter="!test"/>
-</component>
-<component name="avkon_ui_server_api" long-name="AVKON UI Server API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_ui_server_api/group" filter="!test"/>
-</component>
-<component name="number_grouping_api" long-name="Number Grouping API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/number_grouping_api/group" filter="!test"/>
-</component>
-<component name="extended_status_pane_api" long-name="Extended Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_status_pane_api/group" filter="!test"/>
-</component>
-<component name="extended_notifiers_api" long-name="Extended Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notifiers_api/group" filter="!test"/>
-</component>
-<component name="task_list_api" long-name="Task List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
-</component>
-<component name="personalisation_slide_show_dialog_api" long-name="Personalisation Slide Show Dialog API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
-</component>
-<component name="key_event_utilities_api" long-name="Key Event Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_event_utilities_api/group"/>
-</component>
-<component name="emergency_call_support_api" long-name="Emergency Call Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/emergency_call_support_api/group" filter="!test"/>
-</component>
-<component name="extended_dialogs_api" long-name="Extended Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_dialogs_api/group"/>
-</component>
-<component name="legacy_ui_framework_headers_api" long-name="Legacy UI Framework Headers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/legacy_ui_framework_headers_api/group"/>
-</component>
-<component name="extended_editors_api" long-name="Extended Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_editors_api/group" filter="!test"/>
-</component>
-<component name="alarm_api" long-name="Alarm API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alarm_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_interface_base_api" long-name="AIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_base_api/group" filter="!test"/>
-</component>
-<component name="list_effects_api" long-name="List Effects API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/list_effects_api/group" filter="!test"/>
-</component>
-<component name="find_item_ui_api" long-name="Find Item UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/find_item_ui_api/group" filter="!test"/>
-</component>
-<component name="server_application_services_api" long-name="Server Application Services API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/server_application_services_api/group" filter="!test"/>
-</component>
-<component name="common_ui_settings_api" long-name="Common UI Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_ui_settings_api/group"/>
-</component>
-<component name="aiw_service_interface_menu_api" long-name="AIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_menu_api/group" filter="!test"/>
-</component>
-<component name="eikon_server_extension_client_api" long-name="EIKON Server Extension Client API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/eikon_server_extension_client_api/group" filter="!test"/>
-</component>
-<component name="skinnable_clock_api" long-name="Skinnable Clock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/skinnable_clock_api/group" filter="!test"/>
-</component>
-<component name="battery_pane_api" long-name="Battery Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/battery_pane_api/group" filter="!test"/>
-</component>
-<component name="fep_document_navigation_api" long-name="FEP Document Navigation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
-</component>
-<component name="personalisation_localised_texts_api" long-name="Personalisation Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
-</component>
-<component name="memory_card_ui_api" long-name="Memory Card UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
-</component>
-<component name="avkon_status_api" long-name="AVKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_status_api/group"/>
-</component>
-<component name="application_switching_api" long-name="Application Switching API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/application_switching_api/group" filter="!test"/>
-</component>
-<component name="avkon_localised_texts_api" long-name="AVKON Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_localised_texts_api/group"/>
-</component>
-<component name="avkon_secondary_display_api" long-name="AVKON Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_api/group"/>
-</component>
-<component name="extended_animation_api" long-name="Extended Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_notes_api" long-name="Extended Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notes_api/group" filter="!test"/>
-</component>
-<component name="screensaver_animation_plugin_definitions_api" long-name="Screensaver Animation Plugin Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/screensaver_animation_plugin_definitions_api/group"/>
-</component>
-<component name="text_scroller_api" long-name="Text Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/text_scroller_api/group" filter="!test"/>
-</component>
-<component name="custom_cursors_api" long-name="Custom Cursors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/custom_cursors_api/group" filter="!test"/>
-</component>
-<component name="screensaver_settings_api" long-name="Screensaver Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/screensaver_settings_api/group"/>
-</component>
-<component name="global_window_priorities_api" long-name="Global Window Priorities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_window_priorities_api/group"/>
-</component>
-<component name="extended_indicators_api" long-name="Extended Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_indicators_api/group" filter="!test"/>
-</component>
-<component name="special_character_table_api" long-name="Special Character Table API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/special_character_table_api/group" filter="!test"/>
-</component>
-<component name="avkon_settings_api" long-name="AVKON Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_settings_api/group"/>
-</component>
-<component name="extended_sounds_api" long-name="Extended Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_sounds_api/group"/>
-</component>
-<component name="themes_settings_api" long-name="Themes Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/themes_settings_api/group"/>
-</component>
-<component name="media_shared_document_api" long-name="Media Shared Document API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/media_shared_document_api/group" filter="!test"/>
-</component>
-<component name="extended_queries_api" long-name="Extended Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_queries_api/group"/>
-</component>
-<component name="phone_number_text_utilities_api" long-name="Phone Number Text Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
-</component>
-<component name="screensaver_runtime_api" long-name="Screensaver Runtime API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/screensaver_runtime_api/group"/>
-</component>
-<component name="extended_scroller_api" long-name="Extended Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_scroller_api/group"/>
-</component>
-<component name="key_rotator_api" long-name="Key Rotator API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_rotator_api/group" filter="!test"/>
-</component>
-<component name="extended_grids_api" long-name="Extended Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_grids_api/group" filter="!test"/>
-</component>
-<component name="generic_parameter_api" long-name="Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="indicator_touch_observer_api" long-name="Indicator Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_touch_observer_api/group"/>
-</component>
-<component name="popup_form_api" long-name="Popup Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/popup_form_api/group" filter="!test"/>
-</component>
-<component name="stylus_activated_popup_api" long-name="Stylus Activated Pop-up API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/stylus_activated_popup_api/group" filter="!test"/>
-</component>
-<component name="indicator_plugin_api" long-name="Indicator Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_plugin_api/group" filter="!test"/>
-</component>
-<component name="layout_configuration_api" long-name="Layout Configuration API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/layout_configuration_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_filter_factory_api" long-name="Common File Dialogs Filter Factory API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group" filter="!test"/>
-</component>
-<component name="avkon_anim_dll_api" long-name="AVKON Anim DLL API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_anim_dll_api/group"/>
-</component>
-<component name="extended_initialization_api" long-name="Extended Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_initialization_api/group" filter="!test"/>
-</component>
-<component name="long_tap_animation_api" long-name="Long Tap Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/long_tap_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_ui_framework_definitions_api" long-name="Extended UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_ui_framework_definitions_api/group"/>
-</component>
-<component name="extended_buttons_api" long-name="Extended Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_buttons_api/group" filter="!test"/>
-</component>
-<component name="aiw_provider_utility_api" long-name="AIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_provider_utility_api/group" filter="!test"/>
-</component>
-<component name="transition_effect_parameters_api" long-name="Transition Effect Parameters API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_parameters_api/group" filter="!test"/>
-</component>
-<component name="extended_input_capabilities_api" long-name="Extended Input Capabilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_input_capabilities_api/group" filter="!test"/>
-</component>
-<component name="uikon_status_api" long-name="UIKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/uikon_status_api/group"/>
-</component>
-<component name="transition_effect_utilities_api" long-name="Transition Effect Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_utilities_api/group" filter="!test"/>
-</component>
-<component name="pointer_event_modifier_api" long-name="Pointer Event Modifier API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/pointer_event_modifier_api/group" filter="!test"/>
-</component>
-<component name="avkon_testability_api" long-name="AVKON Testability API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_testability_api/group"/>
-</component>
-<component name="ganes_api" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ganes_api/group"/>
-</component>
-<component name="ode_api" long-name="Ode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ode_api/group"/>
-</component>
-<component name="physics_api" long-name="Physics API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/physics_api/group"/>
-</component>
-<component name="touch_pane_api" long-name="Touch Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_api/group" filter="!test"/>
-</component>
-<component name="touch_pane_observer_api" long-name="Touch Pane Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_observer_api/group"/>
-</component>
-<component name="alternate_fs_api" long-name="Alternate FS API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alternate_fs_api/group"/>
-</component>
-<component name="discreet_popup_api" long-name="Discreet Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/discreet_popup_api/group"/>
-</component>
-<component name="touch_gesture_framework_api" long-name="Touch Gesture Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_gesture_framework_api/group"/>
-<!-- should this be commented out? -->
-<!--<unit bldFile="classicui_plat/touch_gesture_framework_api/tsrc/group" filter="test,api_test"/> -->
-</component>
-<component name="extended_options_menu_api" long-name="Extended Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="classicui_pub" long-name="Classic UI Public Interfaces" level="specific">
-<component name="input_frame_api" long-name="Input Frame API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/input_frame_api/group" filter="!test"/>
-</component>
-<component name="window_server_event_observer_api" long-name="Window Server Event Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/window_server_event_observer_api/group" filter="!test"/>
-</component>
-<component name="application_framework_api" long-name="Application Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/application_framework_api/group" filter="!test"/>
-</component>
-<component name="scroller_api" long-name="Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/scroller_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_utilities_api" long-name="UI Framework Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_utilities_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_definitions_api" long-name="UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_definitions_api/group" filter="!test"/>
-</component>
-<component name="buttons_api" long-name="Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/buttons_api/group" filter="!test"/>
-</component>
-<component name="queries_api" long-name="Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/queries_api/group" filter="!test"/>
-</component>
-<component name="aiw_generic_parameter_api" long-name="AIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="editors_api" long-name="Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/editors_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_api" long-name="Common File Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/common_file_dialogs_api/group" filter="!test"/>
-</component>
-<component name="dialog_shutter_api" long-name="Dialog Shutter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialog_shutter_api/group" filter="!test"/>
-</component>
-<component name="fonts_api" long-name="Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/fonts_api/group" filter="!test"/>
-</component>
-<component name="screen_clearer_api" long-name="Screen Clearer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_clearer_api/group" filter="!test"/>
-</component>
-<component name="notifiers_api" long-name="Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notifiers_api/group" filter="!test"/>
-</component>
-<component name="notes_api" long-name="Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notes_api/group" filter="!test"/>
-</component>
-<component name="screen_saver_api" long-name="Screen Saver API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_saver_api/group" filter="!test"/>
-</component>
-<component name="status_pane_api" long-name="Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/status_pane_api/group" filter="!test"/>
-</component>
-<component name="base_controls_api" long-name="Base Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/base_controls_api/group" filter="!test"/>
-</component>
-<component name="grids_api" long-name="Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/grids_api/group" filter="!test"/>
-</component>
-<component name="context_pane_api" long-name="Context Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/context_pane_api/group" filter="!test"/>
-</component>
-<component name="lists_api" long-name="Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/lists_api/group" filter="!test"/>
-</component>
-<component name="popups_api" long-name="Popups API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/popups_api/group" filter="!test"/>
-</component>
-<component name="misc_controls_api" long-name="Misc Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/misc_controls_api/group" filter="!test"/>
-</component>
-<component name="keylock_api" long-name="Keylock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/keylock_api/group" filter="!test"/>
-</component>
-<component name="options_menu_api" long-name="Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/options_menu_api/group" filter="!test"/>
-</component>
-<component name="hierarchical_lists_api" long-name="Hierarchical Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hierarchical_lists_api/group" filter="!test"/>
-</component>
-<component name="navigation_pane_api" long-name="Navigation Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/navigation_pane_api/group" filter="!test"/>
-</component>
-<component name="tabs_api" long-name="Tabs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/tabs_api/group" filter="!test"/>
-</component>
-<component name="title_pane_touch_observer_api" long-name="Title Pane Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_touch_observer_api/group"/>
-</component>
-<component name="choice_list_api" long-name="Choice List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/choice_list_api/group" filter="!test"/>
-</component>
-<component name="info_popup_note_api" long-name="Info Popup Note API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/info_popup_note_api/group" filter="!test"/>
-</component>
-<component name="setting_pages_api" long-name="Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/setting_pages_api/group" filter="!test"/>
-</component>
-<component name="screen_mode_api" long-name="Screen Mode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_mode_api/group" filter="!test"/>
-</component>
-<component name="indicators_api" long-name="Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/indicators_api/group" filter="!test"/>
-</component>
-<component name="error_ui_api" long-name="Error UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/error_ui_api/group" filter="!test"/>
-</component>
-<component name="animation_api" long-name="Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/animation_api/group" filter="!test"/>
-</component>
-<component name="searchfield_api" long-name="Searchfield API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/searchfield_api/group" filter="!test"/>
-</component>
-<component name="labels_api" long-name="Labels API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/labels_api/group" filter="!test"/>
-</component>
-<component name="hotkeys_api" long-name="Hotkeys API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hotkeys_api/group" filter="!test"/>
-</component>
-<component name="initialization_api" long-name="Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/initialization_api/group" filter="!test"/>
-</component>
-<component name="volume_control_api" long-name="Volume Control API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/volume_control_api/group" filter="!test"/>
-</component>
-<component name="title_pane_api" long-name="Title Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_api/group" filter="!test"/>
-</component>
-<component name="sounds_api" long-name="Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/sounds_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_handler_api" long-name="AIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_service_handler_api/group" filter="!test"/>
-</component>
-<component name="aiw_criteria_api" long-name="AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="touch_ui_utilities_api" long-name="Touch UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/touch_ui_utilities_api/group" filter="!test"/>
-</component>
-<component name="generic_button_api" long-name="Generic Button API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/generic_button_api/group" filter="!test"/>
-</component>
-<component name="form_api" long-name="Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/form_api/group" filter="!test"/>
-</component>
-<component name="uikon_core_controls" long-name="Uikon Core Controls" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/uikon_core_controls/group" filter="!test"/>
-</component>
-<component name="calendar_api" long-name="Calendar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/calendar_api/group"/>
-</component>
-<component name="toolbar_api" long-name="Toolbar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/toolbar_api/group" filter="!test"/>
-</component>
-<component name="server_application_api" long-name="Server Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/server_application_api/group"/>
-</component>
-<component name="slider_api" long-name="Slider API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/slider_api/group" filter="!test"/>
-</component>
-<component name="private_ui_framework_api" long-name="Private UI Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/private_ui_framework_api/group" filter="!test"/>
-</component>
-<component name="dialogs_api" long-name="Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialogs_api/group" filter="!test"/>
-</component>
-<component name="document_handler_api" long-name="Document handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/document_handler_api/group"/>
-</component>
-<component name="images_api" long-name="Images API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/images_api/group" filter="!test"/>
-</component>
-<component name="stylus_popup_menu_api" long-name="Stylus Pop-up Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/stylus_popup_menu_api/group" filter="!test"/>
-</component>
-<component name="information_preview_popup_api" long-name="Information Preview Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/information_preview_popup_api/group" filter="!test"/>
-</component>
-<component name="intermediate_state_api" long-name="Intermediate State API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/intermediate_state_api/group"/>
-</component>
-<component name="help_launcher_api" long-name="Help Launcher API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/help_launcher_api/group"/>
-</component>
-</collection>
-<collection name="ode" long-name="Open Dynamics Engine" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="ode_build" filter="s60" long-name="ODE">
-<unit bldFile="mw/classicui/ode/group"/>
-</component>
-</collection>
-<collection name="uifw" long-name="UI Framework" level="server">
-<component name="uiklaf" filter="s60" long-name="Uikon Look-and-Feel">
-<unit bldFile="mw/classicui/uifw/uiklaf/group"/>
-</component>
-<component name="eikctl" filter="s60" long-name="Eikon Controls">
-<unit bldFile="mw/classicui/uifw/eikctl/group"/>
-</component>
-<component name="avkon" filter="s60" long-name="Avkon">
-<!-- can only have one unit. Split into 3 components, or #include all from same bld.inf -->
-<unit bldFile="mw/classicui/uifw/avkon/aknphysics/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/aknconf/group"/>
-</component>
-<component name="eikstd" filter="s60" long-name="Eikon Standard">
-<unit bldFile="mw/classicui/uifw/eikstd/group"/>
-</component>
-<component name="aknglobalui" filter="s60" long-name="Avkon Global UI">
-<unit bldFile="mw/classicui/uifw/aknglobalui/group"/>
-</component>
-<component name="ganes" filter="s60" long-name="Ganes">
-<unit bldFile="mw/classicui/uifw/ganes/group"/>
-</component>
-</collection>
-<collection name="commonuis" long-name="Common UIs" level="specific">
-<component name="commonui" filter="s60" long-name="Common UI">
-<unit bldFile="mw/classicui/commonuis/commonui/group"/>
-</component>
-<component name="commondialogs" filter="s60" long-name="Common Dialogs">
-<unit bldFile="mw/classicui/commonuis/commondialogs/group"/>
-</component>
-</collection>
-<collection name="applicationinterworkingfw" long-name="Application Interworking Framework" level="generic">
-<component name="aifwservicehandler" filter="s60" long-name="Application Interworking Service Handler">
-<unit bldFile="mw/classicui/applicationinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-<collection name="psln" long-name="Personalization" level="specific">
-<!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
-<component name="psln_build" filter="s60" long-name="Personalization Build">
-<unit bldFile="mw/classicui/psln/group"/>
-</component>
-</collection>
-<collection name="commonadapter" long-name="Common Adapter" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="commonadapter_build" filter="s60" long-name="Common Adapter Build">
-<unit bldFile="mw/classicui/commonadapter/group"/>
-</component>
-</collection>
-<collection name="akntouchgesturefw" long-name="Avkon Touch Gesture Framework" level="generic">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="akntouchgesturefw_build" filter="s60" long-name="Avkon Touch Gesture Framework Build" introduced="^3">
-<unit bldFile="mw/classicui/akntouchgesturefw/group"/>
-</component>
-</collection>
-<collection name="uiutils" long-name="UI Utils" level="specific">
-<component name="localizer" filter="s60" long-name="Directory Localizer">
-<unit bldFile="mw/classicui/uiutils/localizer/group"/>
-</component>
-<component name="findutil" filter="s60" long-name="Find Utility">
-<unit bldFile="mw/classicui/uiutils/findutil/group"/>
-</component>
-<component name="gamerecognizer" filter="s60" long-name="Game Recognizer" plugin="Y">
-<unit bldFile="mw/classicui/uiutils/gamerecognizer/group"/>
-</component>
-<component name="aknjapanesereading" filter="s60" long-name="Avkon Japanese Reading">
-<unit bldFile="mw/classicui/uiutils/aknjapanesereading/group"/>
-</component>
-</collection>
-<collection name="commonuisupport" long-name="Common UI Support" level="support">
-<component name="uikon" long-name="Uikon" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uikon/group" mrp="mw/classicui/commonuisupport/uikon/group/app-framework_uikon.mrp"/>
-</component>
-<component name="errorresolverdata" long-name="Error Resolver Data" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/errorresolverdata/group" mrp="mw/classicui/commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
-</component>
-<component name="uilaf" long-name="UI Look and Feel" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uilaf/GROUP" mrp="mw/classicui/commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
-</component>
-<component name="grid" long-name="Grid" purpose="optional">
-<unit bldFile="mw/classicui/commonuisupport/grid/group" mrp="mw/classicui/commonuisupport/grid/group/app-framework_grid.mrp"/>
-</component>
-<component name="uifwsdocs" long-name="UI Frameworks Documentation" purpose="development" class="doc">
-<unit mrp="mw/classicui/commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
-</component>
-</collection>
-<collection name="lafagnosticuifoundation" long-name="Look-and-Feel Agnostic UI Foundation" level="base">
-<component name="cone" long-name="Control Environment" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/cone/group" mrp="mw/classicui/lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
-</component>
-<component name="graphicseffects" long-name="Graphics Effects" introduced="9.2" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/graphicseffects/group" mrp="mw/classicui/lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
-</component>
-<component name="uigraphicsutils" long-name="UI Graphics Utilities" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group" mrp="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
-</component>
-<component name="clockanim" long-name="Clock" purpose="optional" plugin="Y">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/clockanim/group" mrp="mw/classicui/lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
-</component>
-<component name="bmpanimation" long-name="BMP Animation" introduced="6.0" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/bmpanimation/group" mrp="mw/classicui/lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
-</component>
-<component name="animation" long-name="Animation" introduced="9.1" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/animation/group" mrp="mw/classicui/lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
-</component>
-</collection>
-<collection name="classicui_info" long-name="Classic UI Info" level="specific">
-<!-- the multiple units in the API test components need to be resolved -->
-<component name="classicui_metadata" long-name="Classic UI Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/classicui/classicui_info/classicui_metadata/classicui_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="svgt" level="generic" long-name="SVG Tiny" levels="util ui">
-<collection name="svgt_plat" long-name="SVG Tiny Platform Interfaces" level="ui">
-<component name="svgt_api" long-name="SVGT API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/svgt_api/group"/>
-</component>
-<component name="nvg_api" long-name="NVG API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/nvg_api/group"/>
-</component>
-</collection>
-<collection name="svgtopt" long-name="SVG-T Engine" level="util">
-<component name="svgtopt_build" filter="s60" long-name="SVG Engine" introduced="9.2">
-<!-- component is at collection level. Needs to be moved down a directory -->
-<unit bldFile="mw/svgt/svgtopt/group"/>
-</component>
-<component name="svgtplugin" filter="s60" long-name="SVG Plugin" introduced="9.2" plugin="Y">
-<unit bldFile="mw/svgt/svgtopt/svgtplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="uiaccelerator" level="generic" long-name="UI Accelerator" levels="plugin framework server ex if">
-<collection name="uiaccelerator_plat" long-name="UI Accelerator Platform Interfaces" level="if">
-<component name="alf_core_toolkit_api" long-name="ALF Core Toolkit API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/group"/>
-</component>
-<component name="alf_visual_api" long-name="ALF Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/group"/>
-</component>
-<component name="alf_extended_visual_api" long-name="ALF Extended Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/group"/>
-</component>
-<component name="alf_extension_api" long-name="ALF Extension API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/group"/>
-</component>
-<component name="alf_tracing_api" long-name="ALF Tracing API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/group"/>
-</component>
-<component name="alf_client_server_api" long-name="ALF Client Server API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/group"/>
-</component>
-</collection>
-<collection name="uiacceltk" long-name="UI Accelerator Toolkit" level="framework">
-<component name="hitchcock" filter="s60" long-name="Hitchcock">
-<unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/group"/>
-</component>
-<component name="uiacceltk_build" filter="s60" long-name="UI Accelerator Toolkit Build">
-<!-- move into the other component, or remove the #include and make this UI Accelerator Toolkit ROM-->
-<unit bldFile="mw/uiaccelerator/uiacceltk/group"/>
-</component>
-</collection>
-</block>
-<block name="uiresources" level="generic" long-name="UI Resources" levels="compile plugin framework server generic data">
-<!-- are the custom filters below needed? -->
-<collection name="uiresources_pub" long-name="UI Resources Public Interfaces" level="data">
-<component name="pictograph_api" long-name="Pictograph API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/pictograph_api/group" filter="!test"/>
-</component>
-<component name="skins_api" long-name="Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/skins_api/group" filter="!test"/>
-</component>
-<component name="font_definition_api" long-name="Font Definition API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/font_definition_api/group" filter="!test"/>
-</component>
-<component name="graphics_api" long-name="Graphics API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/graphics_api/group" filter="!test"/>
-</component>
-<component name="scalable_icons_api" long-name="Scalable Icons API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/scalable_icons_api/group"/>
-</component>
-<component name="layout_id_definitions_api" long-name="Layout ID Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/layout_id_definitions_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_plat" long-name="UI Resources Platform Interfaces" level="data">
-<component name="layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_system_private_api/group" filter="!test"/>
-</component>
-<component name="layout_data_api" long-name="Layout Data API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_data_api/group" filter="!test"/>
-</component>
-<component name="cdl_api" long-name="CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/cdl_api/group" filter="!test"/>
-</component>
-<component name="extended_skins_api" long-name="Extended Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_skins_api/group" filter="!test"/>
-</component>
-<component name="tfx_server_controller_plugin_api" long-name="TFX Server Controller Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_controller_plugin_api/group"/>
-</component>
-<component name="extended_fonts_api" long-name="Extended Fonts API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_fonts_api/group" filter="!test"/>
-</component>
-<component name="graphic_configuration_api" long-name="Graphic Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/graphic_configuration_api/group" filter="!test"/>
-</component>
-<component name="mif_header_cdl_api" long-name="MIF Header CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mif_header_cdl_api/group"/>
-</component>
-<component name="personalisation_and_skins_settings_api" long-name="Personalisation and Skins Settings API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/personalisation_and_skins_settings_api/group"/>
-</component>
-<component name="tfx_effect_setup_plugin_api" long-name="TFX Effect Setup Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_effect_setup_plugin_api/group"/>
-</component>
-<component name="mifconv_definitions_api" long-name="Mifconv Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mifconv_definitions_api/group"/>
-</component>
-<component name="wallpaper_configuration_api" long-name="Wallpaper Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/wallpaper_configuration_api/group"/>
-</component>
-<component name="language_code_definitions_api" long-name="Language Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/language_code_definitions_api/group"/>
-</component>
-<component name="skins_image_attributes_api" long-name="Skins Image Attributes API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
-</component>
-<component name="private_user_area_code_definitions_api" long-name="Private User Area Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/private_user_area_code_definitions_api/group"/>
-</component>
-<component name="tfx_server_plugin_ids_api" long-name="TFX Server Plug-in IDs API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_plugin_ids_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_info" long-name="UI Resources Info" level="data">
-<component name="uiresources_test" filter="s60,test,api_test" long-name="UI Resources Tests" purpose="development"/>
-</collection>
-<collection name="uigraphics" long-name="UI Graphics" level="generic">
-<component name="bitmaps2" filter="s60" long-name="Bitmaps 2" class="config">
-<unit bldFile="mw/uiresources/uigraphics/bitmaps2/group"/>
-</component>
-<component name="icons" filter="s60" long-name="Icons" class="config">
-<unit bldFile="mw/uiresources/uigraphics/icons/group"/>
-</component>
-<component name="variatedbitmaps" filter="s60" long-name="Variated Bitmaps" class="config">
-<unit bldFile="mw/uiresources/uigraphics/variatedbitmaps/group"/>
-</component>
-<component name="aknicon" filter="s60" long-name="Avkon Icon Framework">
-<unit bldFile="mw/uiresources/uigraphics/aknicon/group"/>
-</component>
-<component name="nvgrenderstage" filter="sf_build" long-name="NVG Render Stage">
-<unit bldFile="mw/uiresources/uigraphics/nvgrenderstage/group"/>
-</component>
-</collection>
-<collection name="layouts" long-name="Layouts" level="plugin">
-<component name="cdl" filter="s60" long-name="Customization Definition Language">
-<!-- can only have one unit. Need to #include them or split into multiple components -->
-<unit bldFile="mw/uiresources/layouts/cdl/cdlengine/group"/>
-<unit bldFile="mw/uiresources/layouts/cdl/cdlserver/group"/>
-</component>
-<component name="aknlayout2" filter="s60" long-name="Avkon Layout 2">
-<unit bldFile="mw/uiresources/layouts/aknlayout2/group"/>
-</component>
-</collection>
-<collection name="skins" long-name="Skins" level="data">
-<component name="aknskincontent" filter="s60" long-name="Avkon Skin Content" class="config">
-<unit bldFile="mw/uiresources/skins/aknskincontent/group"/>
-</component>
-<component name="aknskins" filter="s60" long-name="Avkon Skin Compiler">
-<unit bldFile="mw/uiresources/skins/aknskins/group"/>
-</component>
-</collection>
-<collection name="pictographs" long-name="Pictographs" level="data">
-<component name="aknpictograph" filter="s60" long-name="Avkon Pictograph">
-<unit bldFile="mw/uiresources/pictographs/aknpictograph/group"/>
-</component>
-</collection>
-<collection name="locales" long-name="Locales" level="framework">
-<component name="locales_build" filter="s60" long-name="Locales Build">
-<unit bldFile="mw/uiresources/locales/loce32"/>
-</component>
-</collection>
-<collection name="uiconfig" long-name="UI Config" level="server">
-<component name="s60config" filter="s60" long-name="S60 UI Config">
-<unit bldFile="mw/uiresources/uiconfig/s60config/group"/>
-</component>
-</collection>
-<collection name="fontsupport" long-name="Font Support" level="generic">
-<component name="fontprovider" filter="s60" long-name="Font Provider">
-<unit bldFile="mw/uiresources/fontsupport/fontprovider/group"/>
-</component>
-<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
- <component id="s60_fonts" filter="s60" name="S60 Fonts">
- <unit bldFile="fontsupport/fontutils/group"/>
- </component>
--->
-<component name="fontutils" filter="sf_build" long-name="Font Utils">
-<unit bldFile="mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
-</component>
-</collection>
-<collection name="helpthemes" long-name="Help Themes" level="data">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helpthemes_build" filter="s60" long-name="Help Themes Build" class="config">
-<unit bldFile="mw/uiresources/helpthemes/group"/>
-</component>
-</collection>
-</block>
-<block name="hapticsservices" level="generic" long-name="Haptics Services" levels="fw server api">
-<collection name="hapticsservices_plat" long-name="Haptics Services Platform Interfaces" level="api">
-<component name="tacticon_api" long-name="Tacticon API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tacticon_api/group"/>
-</component>
-<component name="tactile_feedback_core_api" long-name="Tactile Feedback Core API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_core_api/group"/>
-</component>
-<component name="tactile_feedback_server_api" long-name="Tactile Feedback Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_server_api/group"/>
-</component>
-</collection>
-<collection name="hapticsservices_pub" long-name="Haptics Services Public Interfaces" level="api">
-<component name="tactile_feedback_client_api" long-name="Tactile Feedback Client API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_pub/tactile_feedback_client_api/group"/>
-</component>
-</collection>
-<collection name="tacticonserver" long-name="Tacticon Server" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="tacticonserver_build" filter="s60" long-name="Tacticon Server Build" introduced="^3">
-<unit bldFile="mw/hapticsservices/tacticonserver/group"/>
-<!-- clients and servers are suauly the same component. Consider moving pluign to a separate component if needed -->
-</component>
-</collection>
-<collection name="tactilefeedback" long-name="Tactile Feedback" level="fw">
-<component name="tactilearearegistry" filter="s60" long-name="Tactile Area Registry" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilearearegistry/group"/>
-</component>
-<component name="tactilefeedbackresolver" filter="s60" long-name="Tactile Feedback Resolver" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackresolver/group"/>
-</component>
-<component name="tactileclickplugin" filter="s60" long-name="Tactile Click Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileclickplugin/group"/>
-</component>
-<component name="tactilefeedbackclient" filter="s60" long-name="Tactile Feedback Client" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackclient/group"/>
-</component>
-<component name="tactileactionplugin" filter="s60" long-name="Tactile Action Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileactionplugin/group"/>
-</component>
-<component name="tactilefeedback_build" filter="s60" long-name="Tactile Feedback Build" introduced="^1">
-<!-- consider moving IBY to one fo the above components -->
-<unit bldFile="mw/hapticsservices/tactilefeedback/group"/>
-</component>
-</collection>
-</block>
-<block name="gsprofilesrv" level="generic" long-name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
-<collection name="gsprofilesrv_pub" long-name="GS and Profiles Services Public Interfaces" level="specific">
-<component name="profiles_engine_active_profile_settings_api" long-name="Profiles Engine Active Profile Settings API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_active_profile_settings_api/group"/>
-</component>
-<component name="profiles_engine_wrapper_api" long-name="Profiles Engine Wrapper API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_wrapper_api/group"/>
-</component>
-</collection>
-<collection name="gsprofilesrv_plat" long-name="GS and Profiles Services Platform Interfaces" level="specific">
-<component name="profiles_engine_api" long-name="Profiles Engine API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_engine_api/group"/>
-</component>
-<component name="profiles_mediafilelist_api" long-name="Media File List API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_mediafilelist_api/group"/>
-</component>
-<component name="filelist_api" long-name="File List API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/filelist_api/group"/>
-</component>
-<component name="settings_backgroundimage_api" long-name="Settings Background Image API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_backgroundimage_api/group"/>
-</component>
-<component name="settings_framework_api" long-name="Settings Framework API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_framework_api/group"/>
-</component>
-<component name="settings_launch_api" long-name="Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_launch_api/group"/>
-</component>
-<component name="settings_listbox_api" long-name="Settings List Box API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_listbox_api/group"/>
-</component>
-<component name="settings_plugin_api" long-name="Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_plugin_api/group"/>
-</component>
-<component name="settings_uis_cenrep_collection_api" long-name="Settings UIs CenRep Collection API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
-</component>
-</collection>
-<collection name="gssettingsuis" long-name="General Settings UIs" level="framework">
-<component name="gs" filter="s60" long-name="General Settings" introduced="9.2">
-<unit bldFile="mw/gsprofilesrv/gssettingsuis/gs/group"/>
-</component>
-</collection>
-<collection name="profilesservices" long-name="Profiles Services" level="server">
-<component name="filelist" filter="s60" long-name="File List" introduced="9.1">
-<unit bldFile="mw/gsprofilesrv/profilesservices/filelist/group"/>
-</component>
-<component name="mediafilelist" filter="s60" long-name="Media File List" introduced="^2">
-<unit bldFile="mw/gsprofilesrv/profilesservices/mediafilelist/group"/>
-</component>
-<component name="profileengine" filter="s60" long-name="Profile Engine" introduced="9.1">
-<unit bldFile="mw/gsprofilesrv/profilesservices/profileengine/group"/>
-</component>
-<component name="ringingtone3dplugin" filter="s60" long-name="Ringing Tone 3D Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/gsprofilesrv/profilesservices/ringingtone3dplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreensrv" level="specific" long-name="Home Screen Services" levels="plugin framework server generic specific">
-<collection name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" level="specific">
-<component name="ai_content_model_api" long-name="AI Content Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_content_model_api/group"/>
-</component>
-<component name="ai_utilities_api" long-name="AI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_utilities_api/group" filter="!test"/>
-</component>
-<component name="ai_plugin_management_api" long-name="AI Plug-in Management API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_management_api/group"/>
-</component>
-<component name="ai_plugin_information_api" long-name="AI Plug-in Information API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_information_api/group"/>
-</component>
-<component name="ai_variation_api" long-name="AI Variation API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_variation_api/group"/>
-</component>
-<component name="action_handler_plugin_api" long-name="Action Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/group" filter="!test"/>
-</component>
-<component name="content_harvester_plugin_api" long-name="Content Harvester Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/group" filter="!test"/>
-</component>
-<component name="menu_model_api" long-name="Menu Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_model_api/group"/>
-</component>
-<component name="menu_sat_interface_api" long-name="Menu SAT Interface API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/group" filter="!test"/>
-</component>
-<component name="external_home_screen_api" long-name="External Home Screen API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/external_home_screen_api/group"/>
-</component>
-<component name="menu_content_service_api" long-name="Menu Content Service API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_content_service_api/group" filter="!test"/>
-</component>
-<component name="sapi_contentpublishing" long-name="SAPI Content Publishing" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing/group"/>
-</component>
-<component name="sapi_backstepping" long-name="SAPI Backstepping" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_backstepping/group"/>
-</component>
-<component name="sapi_actionhandler" long-name="SAPI Action Handler" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_actionhandler/group"/>
-</component>
-<component name="sapi_homescreenplugin" long-name="SAPI Homescreen Plugin" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_homescreenplugin/group" filter="!test"/>
-</component>
-<component name="sapi_menucontent" long-name="SAPI Menu Content" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_menucontent/group"/>
-</component>
-<component name="xcfw_api" long-name="XCFW API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/xcfw_api/group"/>
-</component>
-<component name="idlefw_api" long-name="Idle Framework API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/idlefw_api/group"/>
-</component>
-<component name="hs_widget_publisher_api" long-name="Home Screen Publishing API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_widget_publisher_api/group"/>
-</component>
-<component name="hs_settings_api" long-name="HS Settings API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_settings_api/group"/>
-</component>
-<component name="hs_content_control_api" long-name="HS Content Control API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_content_control_api/group"/>
-</component>
-</collection>
-<collection name="xcfw" long-name="XML Content Framework" level="framework">
-<!-- collection is really a component, needs to be moved down a directory -->
-<component name="xcfw_build" filter="s60" long-name="XML Content Framework Build">
-<unit bldFile="mw/homescreensrv/xcfw/group"/>
-</component>
-</collection>
-<collection name="homescreenpluginsrv" long-name="Home Screen Plugin Service" level="plugin">
-<component name="hspsdefinitionengine" filter="s60" long-name="HS Plugin Service Definition Engine" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsdefinitionengine/group"/> -->
-</component>
-<component name="hspsdom" filter="s60" long-name="HS Plugin Service DOM" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsdom/group"/> -->
-</component>
-<component name="hspstools" filter="s60" long-name="HS Server Tools">
-<!-- <unit bldFile="homescreenpluginsrv/hspstools/group"/> -->
-</component>
-<component name="hspspluginregistry" filter="s60" long-name="HS Plugin Registry" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspspluginregistry/group"/>-->
-</component>
-<component name="hspsmanager" filter="s60" long-name="HSPS Manager" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsmanager/group"/>-->
-</component>
-<component name="hspsodt" filter="s60" long-name="HSPS Object Description Tree" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsodt/group"/>-->
-</component>
-<component name="hspsresource" filter="s60" long-name="HS Plugin Server Resource" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresource/group"/>-->
-</component>
-<component name="hspsresult" filter="s60" long-name="HS Plugin Server Result" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
-</component>
-<component name="homescreen_settings_api" filter="s60" long-name="HS Settings API" class="api placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
-</component>
-<component name="homescreenpluginsrv_build" filter="s60" long-name="HSPS Build">
-<!-- need to break this up into the self-contained components above and uncomment them -->
-<unit bldFile="mw/homescreensrv/homescreenpluginsrv/group"/>
-</component>
-</collection>
-<collection name="idlefw" long-name="Idle Framework" level="framework">
-<!-- Uncomment all units when configuration is in place. All currently #included from idlefw_build -->
-<component name="idlefw_plugins" filter="s60" long-name="Idle Framework Plugins" plugin="Y" class="placeholder">
-<!--<unit bldFile="idlefw/plugins/group"/>-->
-</component>
-<component name="hslaunch" filter="s60" long-name="Home Screen Launch" class="placeholder">
-<!--<unit bldFile="idlefw/plugins/group"/>-->
-</component>
-<component name="idlefw_build" filter="s60" long-name="Idle Framework Build">
-<!--split this into components, or separate from the above components and move this down a directory -->
-<unit bldFile="mw/homescreensrv/idlefw/group"/>
-</component>
-</collection>
-<collection name="menucontentsrv" long-name="Menu Content Service" level="generic">
-<component name="menusatinterface" filter="s60" long-name="Menu SAT Interface">
-<unit bldFile="mw/homescreensrv/menucontentsrv/menusatinterface/group"/>
-</component>
-<component name="menucontentsrv_build" filter="s60" long-name="Menu Content Service Build">
-<!--split this into components, or separate from the above component and move this down a directory -->
-<unit bldFile="mw/homescreensrv/menucontentsrv/group"/>
-</component>
-</collection>
-<collection name="backsteppingsrv" long-name="Back Stepping Service" level="server">
-<!-- collection is really a component, needs to be moved down a directory -->
-<component name="bsengine" long-name="Back Stepping Engine" filter="s60">
-<unit bldFile="mw/homescreensrv/backsteppingsrv/group"/>
-</component>
-</collection>
-<collection name="contentpublishingsrv" long-name="Content Publishing Service" level="server">
-<component name="contentpublishingdebug" filter="s60" long-name="Content Publishing Debug">
-<!-- need to move this component outside of contentpublishingutils and into separate component directory -->
-<!-- <unit bldFile="contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/> -->
-</component>
-<component name="contentpublishingutils" filter="s60" long-name="Content Publishing Utils">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingutils/group"/>
-</component>
-<component name="contentpublishingserver" filter="s60" long-name="Content Publishing Server">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingserver/group"/>
-</component>
-<component name="contentharvester" filter="s60" long-name="Content Harvester">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
-</component>
-<component name="contentpublishingsrv_build" filter="s60" long-name="Content Publishing Service Build">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/group"/>
-</component>
-</collection>
-<collection name="contentcontrolsrv" long-name="Content Control Service" level="server">
-<component name="ccsrv" long-name="Content Control Service" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccsrv/group"/>
-</component>
-<component name="ccsrvapi" long-name="Content Control Service API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccsrvapi/group"/>
-</component>
-<component name="ccclientsession" long-name="Content Control Client Session" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccclientsession/group"/>
-</component>
-<component name="hsccclient" long-name="HS Content Control Client" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/hsccclient/group"/>
-</component>
-<component name="hscontentinfo" long-name="Home Screen Content Info" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/hscontentinfo/group"/>
-</component>
-<component name="contentcontrolsrv_build" long-name="Content Control Service Build" filter="s60" introduced="^3">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/group"/>
-</component>
-</collection>
-</block>
-<block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
-<collection name="appinstall_plat" long-name="Application Installation Platform Interfaces" level="api">
-<component name="iaupdate_api" long-name="IA Update API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/iaupdate_api/group"/>
-</component>
-<component name="task_plugin_api" long-name="Task Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_plugin_api/group"/>
-</component>
-<component name="sw_installer_common_ui_api" long-name="SW Installer Common UI API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_common_ui_api/group"/>
-</component>
-<component name="sw_installer_launcher_api" long-name="SW Installer Launcher API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_launcher_api/group"/>
-</component>
-<component name="task_management_api" long-name="Task Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_management_api/group"/>
-</component>
-<component name="sw_installer_ui_plugin_api" long-name="SW Installer UI Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ui_plugin_api/group"/>
-</component>
-<component name="sw_installer_cr_keys" long-name="SW Installer CR Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_cr_keys/group"/>
-</component>
-<component name="sw_installer_ps_keys" long-name="SW Installer PS Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
-</component>
-<component name="appmngr2runtimeapi" long-name="Application Manager 2 Runtime Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
-</component>
-</collection>
-<collection name="appinstall_pub" long-name="Application Installation Public Interfaces" level="api">
-<component name="startup_list_management_api" long-name="Startup List Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
-</component>
-</collection>
-<collection name="ncdengine" long-name="Nokia Content Discover" level="framework">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="ncdengine_engine" filter="s60" long-name="NCD Engine" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/engine/group"/>
-</component>
-<component name="debuglogger" filter="s60" long-name="NCD Debug Logger" introduced="^1" class="placeholder">
-<!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
-</component>
-<component name="ncdengine_build" filter="s60" long-name="NCD Build" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/group"/>
-</component>
-</collection>
-<collection name="appinstaller" long-name="Application Installer" level="generic">
-<component name="appmngr2" filter="s60" long-name="Application Manager 2" introduced="^2">
-<unit bldFile="mw/appinstall/appinstaller/appmngr2/group"/>
-</component>
-<component name="appinstui" filter="s60" long-name="Application Installer UI" introduced="^2">
-<unit bldFile="mw/appinstall/appinstaller/appinstui/group"/>
-</component>
-</collection>
-<collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="api">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="iaupdateapi_stub_build" long-name="IA Update API Stub Build" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdateapi_stub/group"/>
-</component>
-</collection>
-<collection name="iaupdate" long-name="Independent Apps Update" level="api">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="iad" long-name="Software Update" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/iad/group"/>
-</component>
-<component name="iaupdate_help" filter="s60" long-name="IA Update Help" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/help/group"/>
-</component>
-<component name="iaupdate_build" filter="s60" long-name="IA Update Build" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/group"/>
-</component>
-</collection>
-<collection name="installationservices" long-name="Installation Services" level="generic">
-<component name="swi" long-name="Secure Software Install" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swi/group" mrp="mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
-</component>
-<component name="swidevicetools" long-name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
-<unit bldFile="mw/appinstall/installationservices/swidevicetools/group" mrp="mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
-</component>
-<component name="swiconfig" long-name="Software Install Config" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appinstall/installationservices/swiconfig/group" mrp="mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
-</component>
-</collection>
-<collection name="secureswitools" long-name="Secure Software Install Tools" level="tool">
-<component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/makekeys/group" mrp="mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
-</component>
-<component name="swianalysistoolkit" long-name="SWI Analysis Toolkit" purpose="development" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
-</component>
-<component name="openssllib" long-name="OpenSSL Library" purpose="optional" class="PC">
-<unit mrp="mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
-</component>
-<component name="swisistools" long-name="Secure Software Install SIS Tools" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swisistools/group" mrp="mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
-</component>
-</collection>
-<collection name="appinstall_info" long-name="Application Installation Info" level="api">
-<component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="serviceapifw" level="specific" long-name="Service API Framework" levels="plugin framework server generic specific">
-<collection name="serviceapifw_pub" long-name="Service API Framework Public Interfaces" level="specific"/>
-<collection name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" level="specific">
-<component name="rtsecuritymanager_common_api" long-name="Runtime Security Manager Common API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/group"/>
-</component>
-<component name="rtsecuritymanager_utility_api" long-name="Runtime Security Manager Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
-</component>
-<component name="rtsecuritymanager_client_api" long-name="Runtime Security Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/group"/>
-</component>
-<component name="liw_provider_utility_api" long-name="LIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_provider_utility_api/group"/>
-</component>
-<component name="liw_service_interface_base_api" long-name="LIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_base_api/group"/>
-</component>
-<component name="liw_service_interface_menu_api" long-name="LIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_menu_api/group"/>
-</component>
-<component name="liw_criteria_api" long-name="LIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_criteria_api/group"/>
-</component>
-<component name="liw_generic_parameter_api" long-name="LIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_generic_parameter_api/group"/>
-</component>
-<component name="liw_service_handler_api" long-name="LIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_handler_api/group"/>
-</component>
-</collection>
-<collection name="rtsecuritymanager" long-name="Runtime Security Manager" level="server">
-<component name="rtsecuritymanagerutil" filter="s60" long-name="Runtime Security Manager Util">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
-</component>
-<component name="rtsecuritymanagerserver" filter="s60" long-name="Runtime Security Manager Server">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/>
-</component>
-<component name="rtsecuritymanagerclient" filter="s60" long-name="Runtime Security Manager Client">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/>
-</component>
-<component name="rtsecuritymanager_build" filter="s60" long-name="Runtime Security Manager Build">
-<!-- Move the export to the appropriate components, or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/group"/>
-</component>
-</collection>
-<collection name="languageinterworkingfw" long-name="Language Interworking Framework" level="framework">
-<component name="lifwservicehandler" filter="s60" long-name="Service Handler">
-<unit bldFile="mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-</block>
-<block name="serviceapi" level="specific" long-name="Service API" levels="os mw1 mw2 app">
-<!-- should break up this collection into something meaningful -->
-<collection name="serviceproviders" long-name="Service Providers" level="mw1">
-<component name="sapi_contacts_vpbk" long-name="Contacts Phonebook SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
-</component>
-<component name="sapi_location" long-name="Location SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_location/group"/>
-</component>
-<component name="sapi_mediamanagement" long-name="Media Management SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/group"/>
-</component>
-<component name="sapi_landmarks" long-name="Landmarks SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
-</component>
-<component name="sapi_messaging" long-name="Messaging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/group"/>
-</component>
-<component name="sapi_applicationmanager" long-name="Application Manager SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
-</component>
-<component name="sapi_calendar" long-name="Calendar SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_calendar/group"/>
-</component>
-<component name="sapi_logging" long-name="Logging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_logging/group"/>
-</component>
-<component name="sapi_sensor" long-name="Sensor SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sensor/group"/>
-</component>
-<component name="sapi_sysinfo" long-name="Sysinfo SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sysinfo/group"/>
-</component>
-<component name="sapi_serviceregistry" long-name="Service Registry SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
-</component>
-<component name="jsapi" long-name="Javascript API" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/jsapi/group"/>
-</component>
-<component name="serviceproviders_build" filter="s60" long-name="Service API Build">
-<!-- distribute the exports or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapi/serviceproviders/group"/>
-</component>
-</collection>
-</block>
-<block name="web" level="specific" long-name="Web" levels="plugin utils server generic specific">
-<collection name="web_pub" long-name="Web Public Interfaces" level="specific">
-<component name="browser_control_api" long-name="Browser Control API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_control_api/group"/>
-</component>
-<component name="download_mgr_client_api" long-name="Download Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_client_api/group"/>
-</component>
-<component name="download_mgr_ui_api" long-name="Download Manager UI Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_ui_api/group"/>
-</component>
-<component name="favourites_engine_api" long-name="Favourites Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/favourites_engine_api/group"/>
-</component>
-<component name="browser_plugin_api" long-name="Browser Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_plugin_api/group"/>
-</component>
-<component name="settings_api" long-name="Settings API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/settings_api/group"/>
-</component>
-</collection>
-<collection name="web_plat" long-name="Web Platform Interfaces" level="specific">
-<component name="aiw_browser_provider_api" long-name="AIW Browser Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/aiw_browser_provider_api/group"/>
-</component>
-<component name="browser_dialogs_provider_api" long-name="Browser Dialogs Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_dialogs_provider_api/group"/>
-</component>
-<component name="browser_platform_api" long-name="Browser Platform API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_platform_api/group"/>
-</component>
-<component name="cod_handler_api" long-name="COD Handler API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cod_handler_api/group"/>
-</component>
-<component name="connection_manager_api" long-name="Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/connection_manager_api/group"/>
-</component>
-<component name="cxml_library_api" long-name="cXml Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cxml_library_api/group"/>
-</component>
-<component name="download_mgr_client_api_extn" long-name="Download Manager Client API Extension" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/download_mgr_client_api_extn/group"/>
-</component>
-<component name="download_path_plugin_api" long-name="Download Path Plugin API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/web/web_plat/download_path_plugin_api/group"/>
-</component>
-<component name="feeds_engine_api" long-name="Feeds Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/feeds_engine_api/group"/>
-</component>
-<component name="launcher_api" long-name="Launcher API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/launcher_api/group"/>
-</component>
-<component name="multipart_parser_api" long-name="Multipart Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/multipart_parser_api/group"/>
-</component>
-<component name="recent_url_store_api" long-name="Recent URL Store API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/recent_url_store_api/group"/>
-</component>
-<component name="scheme_handler_plugin_api" long-name="Scheme Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scheme_handler_plugin_api/group"/>
-</component>
-<component name="scriptable_plugin_api" long-name="Scriptable Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scriptable_plugin_api/group"/>
-</component>
-<component name="webutils_api" long-name="Web Utils API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/webutils_api/group"/>
-</component>
-<component name="widget_registry_api" long-name="Widget Registry API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/widget_registry_api/group"/>
-</component>
-<component name="xml_parser_api" long-name="XML Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/xml_parser_api/group"/>
-</component>
-<component name="stmgesturefw_api" long-name="State Machine Gesture Framework API " filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/stmgesturefw_api/group"/>
-</component>
-</collection>
-<collection name="web_info" long-name="Web Info" level="specific">
-<component name="web_build" filter="s60" long-name="Web Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/group"/>
-</component>
-</collection>
-<collection name="browserutilities" long-name="Browser Utilities" level="utils">
-<component name="browserdialogsprovider" filter="s60" long-name="Browser Dialogs Provider">
-<unit bldFile="mw/web/browserutilities/browserdialogsprovider/group"/>
-</component>
-<component name="recenturlstore" filter="s60" long-name="Recent URL Store">
-<unit bldFile="mw/web/browserutilities/recenturlstore/group"/>
-</component>
-<component name="xmlparser" filter="s60" long-name="XML Interface">
-<unit bldFile="mw/web/browserutilities/xmlparser/group"/>
-</component>
-<component name="cxmllibrary" filter="s60" long-name="XML Parser Implementation">
-<unit bldFile="mw/web/browserutilities/cxmllibrary/group"/>
-</component>
-<component name="downloadmgr" filter="s60" long-name="Download Manager">
-<unit bldFile="mw/web/browserutilities/downloadmgr/group"/>
-</component>
-<component name="connectionmanager" filter="s60" long-name="Connection Manager">
-<unit bldFile="mw/web/browserutilities/connectionmanager/group"/>
-</component>
-<component name="browsertelservice" filter="s60" long-name="Browser Telephony Service">
-<unit bldFile="mw/web/browserutilities/browsertelservice/group"/>
-</component>
-<component name="favouritesengine" filter="s60" long-name="Favourites Engine">
-<unit bldFile="mw/web/browserutilities/favouritesengine/group"/>
-</component>
-<component name="feedsengine" filter="s60" long-name="Feeds Engine">
-<unit bldFile="mw/web/browserutilities/feedsengine/group"/>
-</component>
-<component name="multipartparser" filter="s60" long-name="Multipart Parser">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
-<!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
-</component>
-<component name="schemehandler" filter="s60" long-name="Scheme Handler">
-<unit bldFile="mw/web/browserutilities/schemehandler/group"/>
-</component>
-<component name="webutils" filter="s60" long-name="Web Utils">
-<unit bldFile="mw/web/browserutilities/webutils/group"/>
-</component>
-<component name="aiwbrowserprovider" filter="s60" long-name="AIW Browser Provider" plugin="Y">
-<unit bldFile="mw/web/browserutilities/aiwbrowserprovider/group"/>
-</component>
-<component name="browserutilities_build" filter="s60" long-name="Browser Utilities Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/browserutilities/group"/>
-</component>
-</collection>
-<collection name="webengine" long-name="Web Engine" level="server">
-<component name="osswebengine" filter="s60" long-name="OSS Web Engine">
-<!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
-<unit bldFile="mw/web/webengine/osswebengine/cache/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/memorymanager/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/npscript/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group/javascriptcore"/>
-</component>
-<component name="webkitutils" filter="s60" long-name="WebKit Utils">
-<unit bldFile="mw/web/webengine/webkitutils/group"/>
-</component>
-<component name="pagescaler" filter="s60" long-name="Page Scaler">
-<unit bldFile="mw/web/webengine/pagescaler/group"/>
-</component>
-<component name="webwidgetinstaller" filter="s60" long-name="Widget Installer">
-<unit bldFile="mw/web/webengine/widgetinstaller/group"/>
-</component>
-<component name="widgetregistry" filter="s60" long-name="Widget Registry">
-<unit bldFile="mw/web/webengine/widgetregistry/group"/>
-</component>
-<component name="wmlengine" filter="s60" long-name="WML Engine">
-<unit bldFile="mw/web/webengine/wmlengine/group"/>
-</component>
-<component name="device" filter="s60" long-name="Device">
-<!-- this needs a more meaningful name -->
-<unit bldFile="mw/web/webengine/device/group"/>
-</component>
-<component name="widgetengine" filter="s60" long-name="Widget Engine">
-<unit bldFile="mw/web/webengine/widgetengine/group"/>
-</component>
-<component name="web_memoryplugin" long-name="Memory Plugin" filter="s60" plugin="Y">
-<unit bldFile="mw/web/webengine/memoryplugin/group"/>
-</component>
-<component name="widgetmemoryplugin" filter="s60" long-name="Widget Memory Plugin" plugin="Y">
-<unit bldFile="mw/web/webengine/widgetmemoryplugin/group"/>
-</component>
-<component name="widgetbackuprestore" filter="s60" long-name="Widget Backup and Restore">
-<unit bldFile="mw/web/webengine/widgetbackuprestore/group"/>
-</component>
-<component name="browserrecognizers" filter="s60" long-name="Browser Recognizers" plugin="Y">
-<unit bldFile="mw/web/webengine/browserrecognizers/group"/>
-</component>
-<component name="wrtharvester" filter="s60" long-name="Web Runtime Harvester" plugin="Y">
-<unit bldFile="mw/web/webengine/wrtharvester/group"/>
-</component>
-</collection>
-<collection name="codhandler" long-name="Content Object Descriptor Handler" level="specific">
-<component name="codeng" filter="s60" long-name="COD Engine">
-<unit bldFile="mw/web/codhandler/codeng/group"/>
-</component>
-<component name="codui" filter="s60" long-name="COD UI">
-<unit bldFile="mw/web/codhandler/codui/group"/>
-</component>
-<component name="codrecog" filter="s60" long-name="COD Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/codrecog/group"/>
-</component>
-<component name="codviewer" filter="s60" long-name="COD Viewer">
-<unit bldFile="mw/web/codhandler/codviewer/group"/>
-</component>
-<component name="ddrecog" filter="s60" long-name="Download Descriptor Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/ddrecog/group"/>
-</component>
-<component name="ddviewer" filter="s60" long-name="Download Descriptor Viewer">
-<unit bldFile="mw/web/codhandler/ddviewer/group"/>
-</component>
-<component name="coddownload" filter="s60" long-name="COD Download">
-<unit bldFile="mw/web/codhandler/coddownload/group"/>
-</component>
-<component name="roapapp" filter="s60" long-name="ROAP Application">
-<unit bldFile="mw/web/codhandler/roapapp/group"/>
-</component>
-<component name="codhandler_build" filter="s60" long-name="COD Handler Build">
-<!-- Exports need to go into another component or make this self-contained.
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/codhandler/group"/>
-</component>
-</collection>
-<collection name="widgets" long-name="Web Widget Framework" level="generic">
-<!-- the following units can be uncommented when configuration is put in place -->
-<component name="widgetrecognizer" filter="s60" long-name="Widget Recognizer" plugin="Y">
-<!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
-</component>
-<component name="widgetinstaller" filter="s60" long-name="Widget Installer UI" plugin="Y">
-<!--<unit bldFile="widgets/widgetinstaller/group"/>-->
-</component>
-<component name="widgetlauncher" filter="s60" long-name="Widget Launcher">
-<!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
-</component>
-<component name="widgetapp" filter="s60" long-name="Widget UI">
-<!--<unit bldFile="widgets/widgetapp/group"/>-->
-</component>
-<component name="widgetsidchecker" filter="s60" long-name="Widget SID Checker" introduced="^3">
-<!--<unit bldFile="widgets/widgetsidchecker/group"/>-->
-</component>
-<component name="widgetpreinstaller" filter="s60" long-name="Widget Pre-Installer">
-<!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
-</component>
-<component name="widgetstartup" filter="s60" long-name="Widget Startup">
-<!--<unit bldFile="widgets/widgetstartup/group"/>-->
-</component>
-<component name="widgets_build" filter="s60" long-name="Widgets Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/widgets/group"/>
-</component>
-</collection>
-</block>
-<block name="websrv" level="generic" long-name="Web Services" levels="plugin framework server generic specific">
-<collection name="websrv_pub" long-name="Web Services Public Interfaces" level="specific">
-<component name="web_service_description_api" long-name="Web Service Description API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_description_api/group"/>
-</component>
-<component name="web_service_connection_api" long-name="Web Service Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/group"/>
-</component>
-<component name="web_service_manager_api" long-name="Web Service Manager API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/group"/>
-</component>
-<component name="hostlet_connection_api" long-name="Hostlet Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/group"/>
-</component>
-<component name="web_service_messaging_api" long-name="Web Service Messaging API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/group"/>
-</component>
-<component name="xml_extensions_api" long-name="XML Extensions API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/group"/>
-</component>
-<component name="xml_fragment_api" long-name="XML Fragment API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/group"/>
-</component>
-</collection>
-<collection name="webservices" long-name="Web Services Framework" level="generic">
-<!-- consider breaking this collection into more meaningful subsets -->
-<component name="wsnotifierplugins" filter="s60" long-name="WS Notifier Plugins" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsnotifierplugins/group"/>
-</component>
-<component name="wslogger" filter="s60" long-name="WS Logger">
-<unit bldFile="mw/websrv/webservices/wslogger/group"/>
-</component>
-<component name="wsxml" filter="s60" long-name="WS XML Extensions">
-<unit bldFile="mw/websrv/webservices/wsxml/group"/>
-</component>
-<component name="wsutils" filter="s60" long-name="WS Utils">
-<unit bldFile="mw/websrv/webservices/wsutils/group"/>
-</component>
-<component name="wsfragment" filter="s60" long-name="WS Fragment">
-<unit bldFile="mw/websrv/webservices/wsfragment/group"/>
-</component>
-<component name="wsdescription" filter="s60" long-name="WS Service Description">
-<unit bldFile="mw/websrv/webservices/wsdescription/group"/>
-</component>
-<component name="wsconnection" filter="s60" long-name="WS Service Connection">
-<unit bldFile="mw/websrv/webservices/wsconnection/group"/>
-</component>
-<component name="wsmessages" filter="s60" long-name="WS Messages">
-<unit bldFile="mw/websrv/webservices/wsmessages/group"/>
-</component>
-<component name="wscredentialmanager" filter="s60" long-name="WS Credential Manager">
-<unit bldFile="mw/websrv/webservices/wscredentialmanager/group"/>
-</component>
-<component name="wsframework" filter="s60" long-name="WS Framework">
-<unit bldFile="mw/websrv/webservices/wsframework/group"/>
-</component>
-<component name="wshttpchanneltransportplugin" filter="s60" long-name="WS HTTP Channel Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshttpchanneltransportplugin/group"/>
-</component>
-<component name="wsconnectionagent" filter="s60" long-name="WS Connection Agent">
-<unit bldFile="mw/websrv/webservices/wsconnectionagent/group"/>
-</component>
-<component name="wsprovider" filter="s60" long-name="WS Provider">
-<unit bldFile="mw/websrv/webservices/wsprovider/group"/>
-</component>
-<component name="wshostletconnection" filter="s60" long-name="WS Hostlet Connection">
-<unit bldFile="mw/websrv/webservices/wshostletconnection/group"/>
-</component>
-<component name="wsmanager" filter="s60" long-name="WS Service Manager">
-<unit bldFile="mw/websrv/webservices/wsmanager/group"/>
-</component>
-<component name="wsidentitymanager" filter="s60" long-name="WS Identity Manager">
-<unit bldFile="mw/websrv/webservices/wsidentitymanager/group"/>
-</component>
-<component name="idwsfplugin" filter="s60" long-name="ID-WSF Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/idwsfplugin/group"/>
-</component>
-<component name="wsibasicplugin" filter="s60" long-name="WS-I Basic Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsibasicplugin/group"/>
-</component>
-<component name="wsrestplugin" filter="s60" long-name="WS REST Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsrestplugin/group"/>
-</component>
-<component name="idwsfsecuritymechanism" filter="s60" long-name="ID-WSF Security Mechanism">
-<unit bldFile="mw/websrv/webservices/idwsfsecuritymechanism/group"/>
-</component>
-<component name="wspasswordtransforms" filter="s60" long-name="WS Password Transforms">
-<unit bldFile="mw/websrv/webservices/wspasswordtransforms/group"/>
-</component>
-<component name="wscore" filter="s60" long-name="WS Core Service Manager">
-<unit bldFile="mw/websrv/webservices/wscore/group"/>
-</component>
-<component name="wslocaltransportplugin" filter="s60" long-name="WS Local Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wslocaltransportplugin/group"/>
-</component>
-<component name="wshostlettransportplugin" filter="s60" long-name="WS Hostlet Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshostlettransportplugin/group"/>
-</component>
-<component name="wsstar" filter="s60" long-name="WS Star">
-<!-- can only have one unit. Need to split into separate components or #include from a single bld.inf -->
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarpolicy/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarplugin/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarmessagehandlers/group"/>
-</component>
-<component name="wsoviplugin" filter="s60" long-name="WS Ovi Plugin">
-<unit bldFile="mw/websrv/webservices/wsoviplugin/group"/>
-</component>
-<component name="webservices_build" filter="s60" long-name="Web Services Build">
-<!-- need to split into self-contained components -->
-<unit bldFile="mw/websrv/webservices/group"/>
-</component>
-</collection>
-<collection name="websrv_info" long-name="Web Services Info" level="specific">
-<component name="websrv_bld" filter="s60" long-name="Web Services Build">
-<!-- need to include common .hrh in each unit -->
-<unit bldFile="mw/websrv/group"/>
-</component>
-</collection>
-</block>
-<block name="platformtools" level="generic" long-name="Platform Tools">
-<collection name="gfxconversion" long-name="Graphics Conversion">
-<component name="bmconv_s60" filter="s60" long-name="S60 Bitmap Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/bmconv_s60/group"/>
-</component>
-<component name="mifconv" filter="s60" long-name="Multi Icon File Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/mifconv/group"/>
-</component>
-</collection>
-</block>
-<block name="uitools" level="specific" long-name="UI Tools" levels="compile encode tool if">
-<collection name="uitools_pub" long-name="UI Tools Public Interfaces" level="if">
-<component name="third_party_bitmap_palette_api" long-name="Third Party Bitmap Palette API" filter="s60" class="api">
-<unit bldFile="mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
-</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">
-<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">
-<unit bldFile="mw/uitools/uitools_plat/layout_system_private_api/group"/>
-</component>
-</collection>
-<collection name="cdlcompilertoolkit" long-name="CDL Compiler Toolkit" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompilertoolkit_build" filter="s60" long-name="CDL Compiler Toolkit Build">
-<unit bldFile="mw/uitools/cdlcompilertoolkit/group"/>
-</component>
-</collection>
-<collection name="cdlcompiler" long-name="CDL Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompiler_build" filter="s60" long-name="CDL Compiler Build">
-<unit bldFile="mw/uitools/cdlcompiler/group"/>
-</component>
-</collection>
-<collection name="gfxtools" long-name="Graphics Tools" level="tool">
-<component name="color" filter="s60" long-name="Bitmap Colour Palette" class="PC">
-<unit bldFile="mw/uitools/gfxtools/color/group"/>
-</component>
-</collection>
-<collection name="aknlayoutcompiler" long-name="Avkon Layout Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="aknlayoutcompiler_build" filter="s60" long-name="Avkon Layout Compiler Build">
-<unit bldFile="mw/uitools/aknlayoutcompiler/group"/>
-</component>
-</collection>
-<collection name="skincompiler" long-name="Skin Compiler" level="compile">
-<component name="aknskindesccompiler" filter="s60" long-name="Avkon Skin Descriptor Compiler">
-<unit bldFile="mw/uitools/skincompiler/AknSkinDescCompiler/group"/>
-</component>
-</collection>
-<collection name="reszip" long-name="Resource Zip" level="encode">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="reszip_build" filter="s60" long-name="Resource Zip Build">
-<unit bldFile="mw/uitools/reszip/group"/>
-</component>
-</collection>
-<collection name="toollibraries" long-name="Tool Libraries" level="tool"/>
-<collection name="svgtencoder" long-name="SVGT Encoder" level="encode">
-<component name="svgtenc" filter="s60" long-name="Standalone SVGT Encoder" class="PC">
-<unit bldFile="mw/uitools/svgtencoder/svgtenc/standalone/group"/>
-</component>
-</collection>
-</block>
-</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">
-<component name="location_centre_api" long-name="Location Centre API" introduced="^3" filter="s60" class="api">
-<unit bldFile="app/location/loc_plat/location_centre_api/group"/>
-</component>
-</collection>
-<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"/>
-</component>
-<component name="landmarks_ui_addedit_api" long-name="Landmarks UI Add/Edit API" filter="s60" class="api">
-<unit bldFile="app/location/loc_pub/landmarks_ui_addedit_api/group"/>
-</component>
-</collection>
-<collection name="basiclocationinfodisplay" long-name="Basic Location Info Display" level="ui">
-<component name="blid" filter="s60" long-name="Basic Location Info Display Build">
-<unit bldFile="app/location/basiclocationinfodisplay/blid/group"/>
-</component>
-</collection>
-<collection name="landmarksui" long-name="Landmarks UI" level="loc">
-<component name="landmarksui_help" filter="s60" long-name="Landmarks UI Help">
-<unit bldFile="app/location/landmarksui/help/group"/>
-</component>
-<component name="landmarksui_engine" filter="s60" long-name="Landmarks UI Engine">
-<unit bldFile="app/location/landmarksui/engine/group"/>
-</component>
-<component name="uicontrols" filter="s60" long-name="Landmarks UI Controls">
-<unit bldFile="app/location/landmarksui/uicontrols/group"/>
-</component>
-<component name="landmarksui_commonui" filter="s60" long-name="Landmarks Common UI">
-<unit bldFile="app/location/landmarksui/commonui/group"/>
-</component>
-<component name="landmarksui_app" filter="s60" long-name="Landmarks Application">
-<unit bldFile="app/location/landmarksui/app/group"/>
-</component>
-<component name="msgviewer" filter="s60" long-name="Landmarks Message Viewer">
-<unit bldFile="app/location/landmarksui/msgviewer/group"/>
-</component>
-<component name="landmarksui_build" filter="s60" long-name="Landmarks UI Build">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="app/location/landmarksui/group"/>
-</component>
-</collection>
-<collection name="eventsui" long-name="Location Events UI" level="events">
-<component name="eventsui_help" filter="s60" long-name="Events Help">
-<unit bldFile="app/location/eventsui/help/group"/>
-</component>
-<component name="eventsutils" filter="s60" long-name="Events Utils">
-<unit bldFile="app/location/eventsui/eventsutils/group"/>
-</component>
-<component name="eventsengine" filter="s60" long-name="Events Engine">
-<unit bldFile="app/location/eventsui/eventsengine/group"/>
-</component>
-<component name="eventshandlerui" filter="s60" long-name="Events Handler UI">
-<unit bldFile="app/location/eventsui/eventshandlerui/group"/>
-</component>
-<component name="eventseditor" filter="s60" long-name="Events Editor">
-<unit bldFile="app/location/eventsui/eventseditor/group"/>
-</component>
-<component name="eventsmgmtui" filter="s60" long-name="Events Management UI">
-<unit bldFile="app/location/eventsui/eventsmgmtui/group"/>
-</component>
-<component name="eventsui_build" filter="s60" long-name="Events UI Build">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="app/location/eventsui/group"/>
-</component>
-</collection>
-<collection name="locationlandmarksrefappfors60" long-name="Location Landmarks Reference App for S60" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="lmrefapp" filter="s60" long-name="Landmarks Reference Application">
-<unit bldFile="app/location/locationlandmarksrefappfors60/group"/>
-</component>
-</collection>
-<collection name="locationlandmarksuirefapp" long-name="Location Landmarks UI Reference App" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="lmuirefapp" filter="s60" long-name="Landmarks UI Reference Application">
-<unit bldFile="app/location/locationlandmarksuirefapp/group"/>
-</component>
-</collection>
-<collection name="locationsatviewrefapp" long-name="Location Satellite View Reference App" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="satellitereference" filter="s60" long-name="Satellite Info UI Reference Application">
-<unit bldFile="app/location/locationsatviewrefapp/group"/>
-</component>
-</collection>
-<collection name="simpsyconfigurator" long-name="Simulation PSY Configurator" level="ui">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="simpsyui" filter="s60" long-name="Simulation PSY UI">
-<unit bldFile="app/location/simpsyconfigurator/group"/>
-</component>
-</collection>
-<collection name="mapnavproviderrefapp" long-name="Map and Navigation Provider Reference App" level="apps">
-<!-- this is a component, needs to be moved down a directory -->
-<component name="mapnavproviderrefapp_build" filter="s60" long-name="Map and Navigation Provider Reference Application">
-<unit bldFile="app/location/mapnavproviderrefapp/group"/>
-</component>
-</collection>
-<collection name="locationcentre" long-name="Location Centre" level="loc">
-<component name="lcutils" long-name="Location Centre Utilities" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcutils/group"/>
-</component>
-<component name="lcservice" long-name="Location Centre Service Project" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcservice/group"/>
-</component>
-<component name="lcserver" long-name="Location Centre Server Project" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcserver/group"/>
-</component>
-<component name="lcapp" long-name="Location Centre Application" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcapp/group"/>
-</component>
-<component name="locationcentre_build" filter="s60" long-name="Location Centre Build" introduced="^3">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="app/location/locationcentre/group"/>
-</component>
-</collection>
-</block>
-<block name="mmsharinguis" level="services" long-name="Multimedia Sharing UIs" levels="base plugin if">
-<collection name="mmsharinguis_plat" long-name="Multimedia Sharing UIs Platform Interfaces" level="if">
-<component name="multimedia_sharing_settings_api" long-name="Multimedia Sharing Settings API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_settings_api/group"/>
-</component>
-<component name="multimedia_sharing_resource_api" long-name="Multimedia Sharing Resource API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_resource_api/group"/>
-</component>
-<component name="multimedia_sharing_manager_api" long-name="Multimedia Sharing Manager API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/group"/>
-</component>
-</collection>
-<collection name="mmsharing" long-name="Multimedia Sharing" level="base">
-<component name="mmshavailability" filter="s60" long-name="Multimedia Sharing Availability">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshavailability/group"/>
-</component>
-<component name="mmshindicator" filter="s60" long-name="Multimedia Sharing Indicator">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshindicator/group"/>
-</component>
-<!-- consider putting client and server in the same component -->
-<component name="mmshmanagercli" filter="s60" long-name="Multimedia Sharing Manager Client">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshmanagercli/group" filter="!test"/>
-</component>
-<component name="mmshmanagersrv" filter="s60" long-name="Multimedia Sharing Manager Server">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshmanagersrv/group"/>
-</component>
-<component name="mmshengine" filter="s60" long-name="Multimedia Sharing Engine">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshengine/group"/>
-</component>
-<component name="mmshui" filter="s60" long-name="Multimedia Sharing UI">
-<!-- can only have one unit: need to #include one from the other if it's needed -->
-<unit bldFile="app/mmsharinguis/mmsharing/mmshui/group"/>
-<unit bldFile="app/mmsharinguis/mmsharing/mmshui/help/group"/>
-</component>
-<component name="mmsharing_build" filter="s60" long-name="MM Sharing Build">
-<unit bldFile="app/mmsharinguis/mmsharing/group"/>
-</component>
-</collection>
-<collection name="mmshplugins" long-name="Multimedia Sharing Plugins" level="plugin">
-<component name="mmshaoplugin" filter="s60" long-name="Multimedia Sharing Always Online Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshaoplugin/group"/>
-</component>
-<component name="mmshaiwplugin" filter="s60" long-name="Multimedia Sharing AIW Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshaiwplugin/group"/>
-</component>
-<component name="mmshsipcrplugin" filter="s60" long-name="Multimedia Sharing SIP Client Resolver Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshsipcrplugin/group"/>
-</component>
-<component name="mmshsettingsuiplugin" filter="s60" long-name="Multimedia Sharing Settings UI Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshsettingsuiplugin/group"/>
-</component>
-<component name="mmshwpadapterplugin" filter="s60" long-name="Multimedia Sharing WAP Provisioning Adapter" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshwpadapterplugin/group"/>
-</component>
-</collection>
-<collection name="mmsharinguis_info" long-name="Multimedia Sharing UIs Info" level="if">
-<component name="mmsharinguis_build" filter="s60" long-name="Multimedia Sharing UIs Build">
-<!-- consider distributing to other components -->
-<unit bldFile="app/mmsharinguis/group"/>
-</component>
-</collection>
-</block>
-<block name="phone" level="apps" span="2" long-name="Phone Apps" levels="engine plugin ui app">
-<collection name="phone_plat" long-name="Phone Apps Platform Interfaces" level="app">
-<component name="3d_ringing_tone_enabler_api" long-name="3D Ringing Tone Enabler API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
-</component>
-<component name="telephony_comms_information_api" long-name="Telephony Comms Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_comms_information_api/group"/>
-</component>
-<component name="telephony_information_api" long-name="Telephony Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_information_api/group"/>
-</component>
-<component name="telephony_device_mode_api" long-name="Telephony Device Mode API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_device_mode_api/group"/>
-</component>
-<component name="telephony_remote_party_information_api" long-name="Telephony Remote Party Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_remote_party_information_api/group"/>
-</component>
-<component name="telephony_video_mailbox_settings_api" long-name="Telephony Video Mailbox Settings API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_video_mailbox_settings_api/group"/>
-</component>
-<component name="telephony_configuration_api" long-name="Telephony Configuration API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_configuration_api/group"/>
-</component>
-<component name="telephony_microphone_mute_status_api" long-name="Telephony Microphone Mute Status API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_microphone_mute_status_api/group"/>
-</component>
-<component name="dialer_keypad_api" long-name="Dialer Keypad API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/dialer_keypad_api/group"/>
-</component>
-<component name="telephony_logging_extension_api" long-name="Telephony Logging Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_logging_extension_api/group"/>
-</component>
-<component name="telephony_matching_extension_api" long-name="Telephony Matching Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_matching_extension_api/group"/>
-</component>
-<component name="telephony_bubble_extension_api" long-name="Telephony Bubble Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_bubble_extension_api/group"/>
-</component>
-<component name="telephony_menu_extension_api" long-name="Telephony Menu Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_menu_extension_api/group"/>
-</component>
-<component name="phone_application_commands_api" long-name="Phone Application Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_commands_api/group"/>
-</component>
-<component name="phone_application_voip_commands_api" long-name="Phone Application VOIP Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_voip_commands_api/group"/>
-</component>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_mediator_api/group"/>
-</component>
-<component name="video_telephony_mediator_api" long-name="Video Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/video_telephony_mediator_api/group"/>
-</component>
-</collection>
-<collection name="phoneapp" long-name="Phone Application" level="app">
-<component name="blacklist" filter="s60" long-name="Phone Blacklist Clearing" plugin="Y">
-<unit bldFile="app/phone/phoneapp/blacklist/group"/>
-</component>
-<component name="phoneui" filter="s60" long-name="Phone UI">
-<unit bldFile="app/phone/phoneapp/phoneui/group" filter="!test"/>
-</component>
-<component name="phoneuicontrol" filter="s60" long-name="Phone UI Control">
-<unit bldFile="app/phone/phoneapp/phoneuicontrol/group"/>
-</component>
-<component name="phoneuistates" filter="s60" long-name="Phone UI States">
-<unit bldFile="app/phone/phoneapp/phoneuistates/group"/>
-</component>
-<component name="phoneuiutils" filter="s60" long-name="Phone UI Utils">
-<unit bldFile="app/phone/phoneapp/phoneuiutils/group"/>
-</component>
-<component name="phoneuiview" filter="s60" long-name="Phone UI View">
-<unit bldFile="app/phone/phoneapp/phoneuiview/group"/>
-</component>
-<component name="phoneuivoipextension" filter="s60" long-name="Phone UI VOIP Extension">
-<unit bldFile="app/phone/phoneapp/phoneuivoipextension/group"/>
-</component>
-<component name="silenceactionplugin" filter="s60" long-name="Silence Action Plugin" plugin="Y">
-<unit bldFile="app/phone/phoneapp/silenceactionplugin/group"/>
-</component>
-<component name="phonemediatorcenter" filter="s60" long-name="Phone Mediator Center">
-<unit bldFile="app/phone/phoneapp/phonemediatorcenter/group"/>
-</component>
-</collection>
-<collection name="phoneengine" long-name="Phone Engine" level="engine">
-<component name="phonecntfinder" filter="s60" long-name="Phone Contact Finder">
-<unit bldFile="app/phone/phoneengine/phonecntfinder/group"/>
-</component>
-<component name="audiohandling" filter="s60" long-name="Phone Audio Handling">
-<unit bldFile="app/phone/phoneengine/audiohandling/group"/>
-</component>
-<component name="callhandling" filter="s60" long-name="Call Handling">
-<unit bldFile="app/phone/phoneengine/callhandling/group"/>
-</component>
-<component name="contacthandling" filter="s60" long-name="Phone Contact Handling">
-<unit bldFile="app/phone/phoneengine/contacthandling/group"/>
-</component>
-<component name="loghandling" filter="s60" long-name="Phone Log Handling">
-<unit bldFile="app/phone/phoneengine/loghandling/group"/>
-</component>
-<component name="engineinfo" filter="s60" long-name="Phone Engine Info">
-<unit bldFile="app/phone/phoneengine/engineinfo/group"/>
-</component>
-<component name="phonemodel" filter="s60" long-name="Phone Model">
-<unit bldFile="app/phone/phoneengine/phonemodel/group"/>
-</component>
-<component name="servicehandling" filter="s60" long-name="Phone Service Handling">
-<unit bldFile="app/phone/phoneengine/servicehandling/group"/>
-</component>
-</collection>
-<collection name="phonesettings" long-name="Phone Settings" level="plugin">
-<component name="aiwcallimageplugin" filter="s60" long-name="Call Image AIW Plugin" plugin="Y">
-<unit bldFile="app/phone/phonesettings/aiwcallimageplugin/group"/>
-</component>
-<component name="pslncallimageplugin" filter="s60" long-name="Call Image Personalization Plugin" plugin="Y">
-<unit bldFile="app/phone/phonesettings/pslncallimageplugin/group"/>
-</component>
-</collection>
-<collection name="phoneuis" long-name="Phone UIs" level="ui">
-<component name="dialer" filter="s60" long-name="Dialer">
-<unit bldFile="app/phone/phoneuis/dialer/group" filter="!test"/>
-</component>
-<component name="easydialing" filter="s60" long-name="Easy Dialing Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/phone/phoneuis/easydialing/group"/>
-</component>
-<component name="bubblemanager" filter="s60" long-name="Phone Bubble Manager">
-<unit bldFile="app/phone/phoneuis/bubblemanager/group"/>
-</component>
-<component name="connectutil" filter="s60" long-name="Connection Utility" plugin="Y">
-<unit bldFile="app/phone/phoneuis/connectutil/group"/>
-</component>
-<component name="ussd" filter="s60" long-name="Unstructured Supplementary Services Data">
-<unit bldFile="app/phone/phoneuis/ussd/group"/>
-</component>
-<component name="vmbx" filter="s60" long-name="Voice Mailbox">
-<unit bldFile="app/phone/phoneuis/vmbx/group"/>
-</component>
-<component name="telephonydevicemode" filter="s60" long-name="Telephony Device Mode">
-<unit bldFile="app/phone/phoneuis/telephonydevicemode/group"/>
-</component>
-</collection>
-<collection name="phoneplugins" long-name="Phone Plugins" level="plugin">
-<component name="telbranding" filter="s60" long-name="Tel Branding" introduced="^2" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/telbranding/group"/>
-</component>
-</collection>
-</block>
-<block name="videotelephony" level="apps" long-name="Video Telephony Apps" levels="engine plugin prot ui">
-<collection name="videotelephony_plat" long-name="VT Apps Platform Interfaces" level="ui">
-<component name="video_telephony_control_mediator_api" long-name="Video Telephony Control Mediator API" filter="s60" class="api">
-<unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_control_mediator_api/group"/>
-</component>
-<component name="video_telephony_media_configuration_api" long-name="Video Telephony Media Configuration API" filter="s60" class="api">
-<unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_media_configuration_api/group"/>
-</component>
-</collection>
-<collection name="vtengines" long-name="Video Telephony Engines" level="engine">
-<component name="videoteleng" filter="s60" long-name="Video Telephony Engine">
-<unit bldFile="app/videotelephony/vtengines/videoteleng/Group"/>
-</component>
-<component name="vtmediatorplugin" filter="s60" long-name="VT Mediator Plugin" plugin="Y">
-<unit bldFile="app/videotelephony/vtengines/vtmediatorplugin/group"/>
-</component>
-</collection>
-<collection name="vtuis" long-name="Video Telephony UIs" level="ui">
-<component name="videotelui" filter="s60" long-name="Video Telephony UI">
-<unit bldFile="app/videotelephony/vtuis/videotelui/group"/>
-</component>
-</collection>
-<collection name="vtprotocolplugins" long-name="VT Protocol Plugins" level="plugin">
-<component name="displaysink" filter="s60" long-name="Display Sink" introduced="^2">
-<unit bldFile="app/videotelephony/vtprotocolplugins/DisplaySink/group"/>
-</component>
-<component name="videosource" filter="s60" long-name="Video Source" introduced="^2">
-<unit bldFile="app/videotelephony/vtprotocolplugins/VideoSource/group"/>
-</component>
-</collection>
-<collection name="vtprotocolsstub" long-name="VT Protocols Stub" level="prot">
-<!-- this collection is really a component, move down a directory -->
-<component name="videotelproto" filter="s60" long-name="Video Telephony Protocol">
-<unit bldFile="app/videotelephony/vtprotocolsstub/group" filter="sf_build"/>
-</component>
-</collection>
-</block>
-<block name="iptelephony" level="apps" long-name="IP Telephony" levels="eng plugin util ui">
-<collection name="iptel_plat" long-name="IP Telephony Platform Interfaces" level="ui">
-<component name="richcallsettingsengine_api" long-name="Rich Call Settings Engine API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/richcallsettingsengine_api/group"/>
-</component>
-<component name="cch_client_api" long-name="CCH Client API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/cch_client_api/group"/>
-</component>
-<component name="cch_server_api" long-name="CCH Server API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/cch_server_api/group"/>
-</component>
-<component name="csc_settingsui_api" long-name="CSC Settings UI API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/csc_settingsui_api/group"/>
-</component>
-<component name="vccpropertyhandler_api" long-name="VCC Property Handler API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/vccpropertyhandler_api/group"/>
-</component>
-<component name="vcc_api" long-name="VCC API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/iptelephony/iptel_plat/vcc_api/group"/>
-</component>
-</collection>
-<collection name="iptelcommsconfig" long-name="IP Telephony Comms Config" level="ui">
-<component name="cscgsplugin" filter="s60" long-name="CSC GS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/commsconfig/cscgsplugin/group"/>
-</component>
-<component name="cscsipvoipcleanupplugin" filter="s60" long-name="CSC SIP VoIP Cleanup Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/commsconfig/cscsipvoipcleanupplugin/group"/>
-</component>
-<component name="cscengine" filter="s60" long-name="Connection Service Configurator Engine" introduced="^2">
-<unit bldFile="app/iptelephony/commsconfig/cscengine/group"/>
-</component>
-<component name="cscsettingsui" filter="s60" long-name="CSC Settings UI" introduced="^2">
-<unit bldFile="app/iptelephony/commsconfig/cscsettingsui/group"/>
-</component>
-<component name="cscapplicationui" filter="s60" long-name="CSC Application UI" introduced="^2">
-<unit bldFile="app/iptelephony/commsconfig/cscapplicationui/group"/>
-</component>
-<component name="commsconfig_build" filter="s60" long-name="Comms Config Build" introduced="^2">
-<!-- consider distributing this into the above components -->
-<unit bldFile="app/iptelephony/commsconfig/group"/>
-</component>
-</collection>
-<collection name="convergedconnectionhandler" long-name="Converged Connection Handler" level="eng">
-<component name="cchserver" filter="s60" long-name="CCH Server" introduced="^2">
-<unit bldFile="app/iptelephony/convergedconnectionhandler/cchserver/group"/>
-</component>
-<component name="cchclient" filter="s60" long-name="CCH Client" introduced="^2">
-<unit bldFile="app/iptelephony/convergedconnectionhandler/cchclient/group"/>
-</component>
-<component name="cchclientapi" filter="s60" long-name="CCH Client API" introduced="^2">
-<unit bldFile="app/iptelephony/convergedconnectionhandler/cchclientapi/group"/>
-</component>
-<component name="convergedconnectionhandler_build" filter="s60" long-name="CCH Build" introduced="^2">
-<!-- consider distributing this into the above components, or collapse the collection into a single component.
- The latter is a better option since clients and sevrers are rarely separate components -->
-<unit bldFile="app/iptelephony/convergedconnectionhandler/group"/>
-</component>
-</collection>
-<collection name="richcallsettingsengine" long-name="Rich Call Settings Engine" level="eng">
-<component name="rcse2" filter="s60" long-name="Rich Call Settings Engine Build" introduced="^2">
-<unit bldFile="app/iptelephony/richcallsettingsengine/rcse2/group"/>
-</component>
-</collection>
-<collection name="sipvoipprovider" long-name="SIP VoIP Provider" level="plugin">
-<!-- collection is really a component. Should move down a directory -->
-<component name="svp" filter="s60" long-name="SIP VoIP Provider Build" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/sipvoipprovider/group"/>
-</component>
-</collection>
-<collection name="voipplugins" long-name="VoIP Plugins" level="plugin">
-<component name="sipmxresolver" filter="s60" long-name="SIP MX Resolver" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/sipmxresolver/group"/>
-</component>
-<component name="sipconnectionprovider" filter="s60" long-name="SIP Connection Provider" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/sipconnectionprovider/group"/>
-<!-- can only have one unit, can the next be #'included from the above? -->
-<unit bldFile="app/iptelephony/voipplugins/sipconnectionprovider/ipvoicemailengine/group"/>
-</component>
-<component name="ipapputils" filter="s60" long-name="IP App Utils" introduced="^2">
-<unit bldFile="app/iptelephony/voipplugins/ipapputils/group"/>
-</component>
-<component name="voipadapters" filter="s60" long-name="VoIP Adapters" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/voipadapters/group"/>
-</component>
-<component name="accountcreationplugin" filter="s60" long-name="Account Creation Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/accountcreationplugin/group"/>
-</component>
-<component name="dhcppositionprovider" filter="s60" long-name="DHCP Position Provider" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/dhcppositionprovider/group"/>
-</component>
-<component name="svtmatching" filter="s60" long-name="SIP VoIP Telephony Matching" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/svtmatching/group"/>
-</component>
-<component name="svtlogging" filter="s60" long-name="SVT Logging" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/svtlogging/group"/>
-</component>
-<component name="svtcallmenu" filter="s60" long-name="SVT Call Menu" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/svtcallmenu/group"/>
-</component>
-<component name="sipimresolver" filter="s60" long-name="SIP IM Resolver" introduced="^3" plugin="Y">
-<unit bldFile="app/iptelephony/voipplugins/sipimresolver/group"/>
-</component>
-</collection>
-<collection name="callcontinuity" long-name="Call Continuity" level="util">
-<component name="vccutils" filter="s60" long-name="VCC Utils" introduced="^2">
-<unit bldFile="app/iptelephony/callcontinuity/vccutils/group"/>
-</component>
-<component name="nsmldmvccadapter" filter="s60" long-name="SyncML DM VCC Adapter" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/callcontinuity/nsmldmvccadapter/group"/>
-</component>
-<component name="vccclientprovisioningadapter" filter="s60" long-name="VCC Client Provisioning Adapter" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/callcontinuity/vccclientprovisioningadapter/group"/>
-</component>
-<component name="vccpropertyhandler" filter="s60" long-name="VCC Property Handler" introduced="^2">
-<unit bldFile="app/iptelephony/callcontinuity/vccpropertyhandler/group"/>
-</component>
-<component name="vcchotrigger" filter="s60" long-name="VCC HO Trigger" introduced="^2">
-<unit bldFile="app/iptelephony/callcontinuity/vcchotrigger/group"/>
-</component>
-<component name="vcc" filter="s60" long-name="VoIP Call Continuity" introduced="^2" plugin="Y">
-<unit bldFile="app/iptelephony/callcontinuity/vcc/group"/>
-</component>
-<component name="callcontinuity_build" filter="s60" long-name="Call Continuity Build" introduced="^2">
-<!-- consider distributing this into the above components -->
-<unit bldFile="app/iptelephony/callcontinuity/group"/>
-</component>
-</collection>
-</block>
-<block name="settingsuis" level="services" long-name="Settings UIs" levels="rsc ui">
-<collection name="devmngt_plat" long-name="Settings UIs Platform Interfaces" level="ui">
-<component name="default_app_client_api" long-name="Default App Client API" introduced="^1" filter="s60" class="api">
-<unit bldFile="app/settingsuis/devmngt_plat/default_app_client_api/group"/>
-</component>
-<component name="services_db_api" long-name="Services DB API" introduced="^1" filter="s60" class="api">
-<unit bldFile="app/settingsuis/devmngt_plat/services_db_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="defaultapplicationsettings" long-name="Default Application Settings" level="rsc">
-<component name="services_db" filter="s60" long-name="Services Database" introduced="^1">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/services_db/group"/>
-</component>
-<component name="defaultapplicationsettings_server" filter="s60" long-name="Default Application Server" introduced="^1">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/server/group"/>
-</component>
-<component name="service" filter="s60" long-name="Default Application Service" introduced="^1">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/service/group"/>
-</component>
-<component name="dasgsplugin" filter="s60" long-name="Default Application Settings GS Plugin" introduced="^1" plugin="Y">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/gsplugin/group"/>
-</component>
-<component name="defaultapplicationsettings_build" filter="s60" long-name="Default Application Settings Build" introduced="^1">
-<!-- split the IBYs up into the appropriate components? Make this a ROM component? -->
-<unit bldFile="app/settingsuis/defaultapplicationsettings/group"/>
-</component>
-</collection>
-<collection name="systemswuis" long-name="System SW UIs" level="ui">
-<component name="touchscreencalib" filter="s60" long-name="Touchscreen Calibration" introduced="^1">
-<unit bldFile="app/settingsuis/systemswuis/touchscreencalib/group"/>
-</component>
-</collection>
-</block>
-<block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin app">
-<collection name="contentctrl_plat" long-name="Content Control Daemons Platforn Interfaces" level="app">
-<component name="oma_ds_presync_plugin_api" long-name="OMA DS PreSync Plugin API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/oma_ds_presync_plugin_api/group"/>
-</component>
-<component name="ds_agenda_handler_plugin_api" long-name="DS Agenda Handler Plugin API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_agenda_handler_plugin_api/group"/>
-</component>
-<component name="ds_folder_util_api" long-name="DS Folder Util API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_folder_util_api/group"/>
-</component>
-</collection>
-<collection name="dsdcmoadapter" long-name="Data Sync DCMO Adapter" level="plugin">
-<!-- Component at wrong rank, should move down a directory -->
-<component name="dsdcmoadapter_build" filter="s60" long-name="Data Sync Control DCMO Adapter">
-<unit bldFile="app/contentcontrol/dsdcmoadapter/group"/>
-</component>
-</collection>
-<collection name="omads" long-name="OMA Data Sync" level="app">
-<component name="omadsappui" filter="s60" long-name="OMA DS Application UI">
-<unit bldFile="app/contentcontrol/omads/omadsappui/group"/>
-</component>
-<component name="omadsextensions" filter="s60" long-name="OMA DS Extensions" plugin="Y">
-<unit bldFile="app/contentcontrol/omads/omadsextensions/group"/>
-</component>
-</collection>
-</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">
-<unit bldFile="app/devicecontrol/devicediagnostics/devdiagapp/group"/>
-</component>
-<component name="devdiaggsplugin" filter="s60" long-name="Device Diagnostics GS Plugin" plugin="Y">
-<unit bldFile="app/devicecontrol/devicediagnostics/devdiaggsplugin/group"/>
-</component>
-<component name="diagplugins" filter="s60" long-name="Diagnostics Plugins" plugin="Y">
-<unit bldFile="app/devicecontrol/devicediagnostics/diagplugins/group"/>
-</component>
-<component name="diagsuites" filter="s60" long-name="Diagnostics Suites" plugin="Y">
-<unit bldFile="app/devicecontrol/devicediagnostics/diagsuites/group"/>
-</component>
-<component name="devicediagnostics_build" filter="s60" long-name="Device Diagnostics Build">
-<!-- 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">
-<unit bldFile="app/devicecontrol/omadm/omadmappui/group"/>
-</component>
-<component name="omadmextensions" filter="s60" long-name="OMA DM Extensions" 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">
-<unit bldFile="app/devicecontrol/omadm/dcmo/group"/>
-</component>
-</collection>
-<collection name="pnpmobileservices" long-name="PnP Mobile Services" level="mid">
-<component name="pnpms" filter="s60" long-name="PnP MS">
-<unit bldFile="app/devicecontrol/pnpmobileservices/pnpms/group"/>
-</component>
-</collection>
-<collection name="applicationmanagement" long-name="Application Management" level="app">
-<!-- could this collection be collapsed into a single component and moved down a dir? Do all these need to be noted separately? -->
-<component name="applicationmanagement_options" filter="s60" long-name="AM Install Options">
-<unit bldFile="app/devicecontrol/applicationmanagement/options/group"/>
-</component>
-<component name="applicationmanagement_client" filter="s60" long-name="AM Client">
-<unit bldFile="app/devicecontrol/applicationmanagement/client/group"/>
-</component>
-<component name="applicationmanagement_server" filter="s60" long-name="AM Server">
-<unit bldFile="app/devicecontrol/applicationmanagement/server/group"/>
-</component>
-<component name="rfsplugin" filter="s60" long-name="AM RFS Plugin" plugin="Y">
-<unit bldFile="app/devicecontrol/applicationmanagement/rfsplugin/group"/>
-</component>
-<component name="amadapter2" filter="s60" long-name="AM Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/applicationmanagement/amadapter2/group"/>
-</component>
-<component name="omascomoadapter" filter="s60" long-name="OMA SCOMO Adapter" introduced="^3" plugin="Y">
-<unit bldFile="app/devicecontrol/applicationmanagement/omascomoadapter/group"/>
-</component>
-<component name="applicationmanagement_build" filter="s60" long-name="AM Build">
-<!-- If thes aren't collapsed into one cmp, can all #includes removed from here, and it renamed AM ROM? -->
-<unit bldFile="app/devicecontrol/applicationmanagement/group"/>
-</component>
-</collection>
-<collection name="customization" long-name="DM Customization Adapters" level="mid">
-<component name="dmutils" long-name="DM Utils" filter="s60">
-<unit bldFile="app/devicecontrol/customization/dmutils/bld"/>
-</component>
-<component name="uisettingssrv" filter="s60" long-name="UI Settings Server">
-<unit bldFile="app/devicecontrol/customization/uisettingssrv/bld"/>
-</component>
-<component name="isadapter" filter="s60" long-name="Idle State Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/isadapter/bld"/>
-</component>
-<component name="supadapter" filter="s60" long-name="Startup Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/supadapter/bld"/>
-</component>
-<component name="wallpaperadapter" filter="s60" long-name="Wallpaper Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/wallpaperadapter/bld"/>
-</component>
-<component name="operatorlogoadapter" filter="s60" long-name="Operator Logo Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/operatorlogoadapter/bld"/>
-</component>
-<component name="screensaveradapter" filter="s60" long-name="Screen Saver Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/screensaveradapter/bld"/>
-</component>
-<component name="themesadapter" filter="s60" long-name="Themes Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/themesadapter/bld"/>
-</component>
-<component name="embeddedlinkadapter" filter="s60" long-name="Embedded Link Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/embeddedlinkadapter/bld"/>
-</component>
-<component name="customization_build" filter="s60" long-name="DM Customization Build">
-<!-- If thes aren't collapsed into one cmp, can all #includes removed from here, and it renamed DM Customization ROM? -->
-<unit bldFile="app/devicecontrol/customization/group"/>
-</component>
-</collection>
-<collection name="omacp" long-name="OMA Content Provisioning" level="oma">
-<component name="omacpadapters" filter="s60" long-name="OMA CP Adapters" plugin="Y">
-<unit bldFile="app/devicecontrol/omacp/omacpadapters/group"/>
-</component>
-</collection>
-</block>
-<block name="printing" level="services" long-name="Printing" levels="app">
-<collection name="DirectPrint" level="app">
-<component name="DirectPrintApp" filter="sf_build" long-name="DirectPrint App" introduced="^3">
-<unit bldFile="app/printing/DirectPrint/DirectPrintApp/group"/>
-</component>
-<component name="DirectPrintServer" filter="sf_build" long-name="DirectPrint Server" introduced="^3">
-<unit bldFile="app/printing/DirectPrint/DirectPrintServer/group"/>
-</component>
-<component name="DirectPrintClient" filter="sf_build" long-name="DirectPrint Client" introduced="^3">
-<unit bldFile="app/printing/DirectPrint/DirectPrintClient/group"/>
-</component>
-</collection>
-<collection name="imageprint" long-name="ImagePrint" level="app">
-<component name="clog" filter="s60" long-name="ImagePrint Logging" introduced="^2">
-<unit bldFile="app/printing/imageprint/clog/group"/>
-</component>
-<component name="imageprintengine" filter="s60" long-name="ImagePrint Engine" introduced="^2">
-<unit bldFile="app/printing/imageprint/imageprintengine/group"/>
-</component>
-<component name="imageprintui" filter="s60" long-name="ImagePrint UI" introduced="^2">
-<unit bldFile="app/printing/imageprint/imageprintui/group"/>
-</component>
-<component name="imageprint_build" filter="s60" long-name="ImagePrint Build" introduced="^2">
-<!-- Need to break the IBY includes into the other components, or remove #includes and make this a ROM component -->
-<unit bldFile="app/printing/imageprint/group"/>
-</component>
-</collection>
-</block>
-<block name="files" level="apps" long-name="File Manager Apps" levels="support apps">
-<collection name="files_plat" long-name="File Manager Apps Platform Interfaces" level="apps">
-<component name="memory_scan_popup_ui_api" long-name="Memory Scan Popup UI API" filter="s60" class="api">
-<unit bldFile="app/files/files_plat/memory_scan_popup_ui_api/group"/>
-</component>
-</collection>
-<collection name="deviceencryption" long-name="Device Encryption" level="support">
-<!-- this is either needs to be broken up into idependent bld.infs, or it's really a component and should move down a directory -->
-<component name="devencnotifplugin" filter="s60" long-name="Device Encryption Notifier Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/files/deviceencryption/devencnotifplugin/group"/>
-</component>
-<component name="devencui" filter="s60" long-name="Device Encryption UI" introduced="^3">
-<unit bldFile="app/files/deviceencryption/devencui/group"/>
-</component>
-<component name="devencdmadapter" filter="s60" long-name="Device Encryption DM Adapter" introduced="^3" plugin="Y">
-<unit bldFile="app/files/deviceencryption/devencdmadapter/group"/>
-</component>
-<component name="devencgsplugin" filter="s60" long-name="Device Encryption GS Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/files/deviceencryption/devencgsplugin/group"/>
-</component>
-<component name="deviceencryption_help" filter="s60" long-name="Device Encryption Help" introduced="^3">
-<unit bldFile="app/files/deviceencryption/help/group"/>
-</component>
-<component name="deviceencryption_build" filter="s60" long-name="Device Encryption Build" introduced="^3">
-<unit bldFile="app/files/deviceencryption/group"/>
-</component>
-</collection>
-<collection name="filemanager" long-name="File Manager" level="apps">
-<!-- this is really a component, should move down a directory -->
-<component name="filemanager_build" filter="s60" long-name="File Manager Build">
-<unit bldFile="app/files/filemanager/group"/>
-</component>
-</collection>
-<collection name="filesystemuis" long-name="File System UIs" level="support">
-<component name="memscaneng" filter="s60" long-name="Memory Scan Server">
-<unit bldFile="app/files/filesystemuis/memscaneng/group"/>
-</component>
-<component name="memstatepopup" filter="s60" long-name="Memory State Popup">
-<unit bldFile="app/files/filesystemuis/memstatepopup/group"/>
-</component>
-</collection>
-</block>
-<block name="utils" level="apps" long-name="Utility Apps" levels="app">
-<collection name="extras" long-name="Extras" level="app">
-<component name="about" filter="s60" long-name="About Application">
-<unit bldFile="app/utils/extras/about/group"/>
-</component>
-<component name="calcsoft" filter="s60" long-name="Calculator Application">
-<unit bldFile="app/utils/extras/calcsoft/group"/>
-</component>
-<component name="converter" filter="s60" long-name="Unit Converter">
-<unit bldFile="app/utils/extras/converter/group"/>
-</component>
-</collection>
-</block>
-<block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
-<collection name="contacts_pub" long-name="Contacts Apps Public Interfaces" level="ui">
-<component name="phonebook_fetch_ui_api" long-name="Phonebook Fetch UI API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_fetch_ui_api/group"/>
-</component>
-<component name="phonebook_data_management_api" long-name="Phonebook Data Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_data_management_api/group"/>
-</component>
-<component name="phonebook_vcard_importexport_api" long-name="Phonebook vCard Import/Export API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_vcard_importexport_api/group"/>
-</component>
-<component name="phonebook_data_addedit_ui_api" long-name="Phonebook Data Add/Edit UI API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_data_addedit_ui_api/group"/>
-</component>
-<component name="phonebook_ui_utilities_api" long-name="Phonebook UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_ui_utilities_api/group"/>
-</component>
-<component name="phonebook_thumbnail_operation_api" long-name="Phonebook Thumbnail Operation API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/phonebook_thumbnail_operation_api/group"/>
-</component>
-<component name="speed_dial_utility_control_api" long-name="Speed Dial Utility Control API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_pub/speed_dial_utility_control_api/group"/>
-</component>
-</collection>
-<collection name="contacts_plat" long-name="Contacts Apps Platform Interfaces" level="ui">
-<component name="virtual_phonebook_store_api" long-name="Virtual Phonebook Store API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_store_api/group"/>
-</component>
-<component name="virtual_phonebook_sim_services_api" long-name="Virtual Phonebook SIM Services API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_sim_services_api/group"/>
-</component>
-<component name="virtual_phonebook_configuration_api" long-name="Virtual Phonebook Configuration API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_configuration_api/group"/>
-</component>
-<component name="virtual_phonebook_copy_policy_api" long-name="Virtual Phonebook Copy Policy API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_copy_policy_api/group"/>
-</component>
-<component name="virtual_phonebook_policy_api" long-name="Virtual Phonebook Policy API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_policy_api/group"/>
-</component>
-<component name="virtual_phonebook_engine_api" long-name="Virtual Phonebook Engine API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_engine_api/group"/>
-</component>
-<component name="virtual_phonebook_migration_support_api" long-name="Virtual Phonebook Migration Support API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_migration_support_api/group"/>
-</component>
-<component name="virtual_phonebook_view_definition_api" long-name="Virtual Phonebook View Definition API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_view_definition_api/group"/>
-</component>
-<component name="virtual_phonebook_vcard_api" long-name="Virtual Phonebook vCard API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_vcard_api/group"/>
-</component>
-<component name="cms_contactor_api" long-name="CMS Contactor API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/cms_contactor_api/group"/>
-</component>
-<component name="contactpresence_api" long-name="Contact Presence API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/contactpresence_api/group"/>
-</component>
-<component name="presence_cache_api" long-name="Presence Cache API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/presence_cache_api/group"/>
-</component>
-<component name="phonebook_internal_common_api" long-name="Phonebook Internal Common API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_common_api/group"/>
-</component>
-<component name="phonebook_internal_appfw_api" long-name="Phonebook Internal App Framework API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_appfw_api/group"/>
-</component>
-<component name="phonebook_internal_data_management_api" long-name="Phonebook Internal Data Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_data_management_api/group"/>
-</component>
-<component name="phonebook_2_xsp_extension_manager_api" long-name="Phonebook 2 xSP Extension Manager API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_xsp_extension_manager_api/group"/>
-</component>
-<component name="phonebook_ui_controls_api" long-name="Phonebook UI Controls API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_ui_controls_api/group"/>
-</component>
-<component name="phonebook_2_image_management_api" long-name="Phonebook 2 Image Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_image_management_api/group"/>
-</component>
-<component name="phonebook_extension_api" long-name="Phonebook Extension API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_extension_api/group"/>
-</component>
-<component name="phonebook_public_constants_api" long-name="Phonebook Public Constants API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_public_constants_api/group"/>
-</component>
-<component name="phonebook_internal_ui_utilities_api" long-name="Phonebook Internal UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_internal_ui_utilities_api/group"/>
-</component>
-<component name="logs_engine_api_extensions" long-name="Logs Engine API Extensions" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/logs_engine_api_extensions/group"/>
-</component>
-<component name="phonebook_thumbnails_api" long-name="Phonebook Thumbnails API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_thumbnails_api/group"/>
-</component>
-<component name="phonebook_2_icon_api" long-name="Phonebook 2 Icon API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_icon_api/group"/>
-</component>
-<component name="phonebook_engine_extension_api" long-name="Phonebook Engine Extension API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_engine_extension_api/group"/>
-</component>
-<component name="phonebook_2_store_configuration_management_api" long-name="Phonebook 2 Store Configuration Management API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_store_configuration_management_api/group"/>
-</component>
-<component name="logs_ui_command_line_api" long-name="Logs UI Command Line API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/logs_ui_command_line_api/group"/>
-</component>
-<component name="speed_dial_dialogs_api" long-name="Speed Dial Dialogs API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/speed_dial_dialogs_api/group"/>
-</component>
-<component name="phonebook_2_xsp_view_activation_api" long-name="Phonebook 2 xSP View Activation API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_xsp_view_activation_api/group"/>
-</component>
-<component name="logs_timers_api" long-name="Logs Timers API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/logs_timers_api/group"/>
-</component>
-<component name="phonebook_2_ui_extension_definition_api" long-name="Phonebook 2 UI Extension Definition API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_definition_api/group"/>
-</component>
-<component name="phonebook_2_common_ui_api" long-name="Phonebook 2 Common UI API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_common_ui_api/group"/>
-</component>
-<component name="phonebook_2_ui_extension_api" long-name="Phonebook 2 UI Extension API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_api/group"/>
-</component>
-<component name="phonebook_2_store_property_api" long-name="Phonebook 2 Store Property API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_store_property_api/group"/>
-</component>
-<component name="phonebook_2_ui_extension_plugin_api" long-name="Phonebook 2 UI Extension Plug-In API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_plugin_api/group"/>
-</component>
-<component name="phonebook_2_ui_controls_api" long-name="Phonebook 2 UI Controls API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_controls_api/group"/>
-</component>
-<component name="phonebook_2_thin_ui_extension_plugin_api" long-name="Phonebook 2 Thin UI Extension Plugin API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_thin_ui_extension_plugin_api/group"/>
-</component>
-<component name="phonebook_2_commands_api" long-name="Phonebook 2 Commands API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_commands_api/group"/>
-</component>
-<component name="phonebook_2_presentation_api" long-name="Phonebook 2 Presentation API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_presentation_api/group"/>
-</component>
-<component name="phonebook_2_ui_utilities_api" long-name="Phonebook 2 UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_utilities_api/group"/>
-</component>
-<component name="cca_launch_api" long-name="CCA Launch API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/cca_launch_api/group"/>
-</component>
-<component name="cca_view_plugin_api" long-name="CCA View Plugin API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/cca_view_plugin_api/group"/>
-</component>
-<component name="predictivesearch_client_api" long-name="Predictive Search Client API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_client_api/group"/>
-</component>
-<component name="predictivesearch_utils_api" long-name="Predictive Search Utils API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_utils_api/group"/>
-</component>
-<component name="predictivesearch_adapters_api" long-name="Predictive Search Adapters API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_adapters_api/group"/>
-</component>
-<component name="predictivesearch_algorithm_api" long-name="Predictive Search Algorithm API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_algorithm_api/group"/>
-</component>
-<component name="phonebook_2_rcl_api" long-name="Phonebook 2 RCL API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_rcl_api/group"/>
-</component>
-</collection>
-<collection name="contactextensions" long-name="Contacts Extensions" level="services">
-<component name="predefinedcontacts" filter="s60" long-name="Predefined Contacts">
-<unit bldFile="app/contacts/contactextensions/predefinedcontacts/group"/>
-</component>
-</collection>
-<collection name="logsui" long-name="Logs UI" level="ui">
-<component name="logsui_build" filter="s60" long-name="Logs UI Build">
-<!-- component at too high a rank, should move down one directory -->
-<unit bldFile="app/contacts/logsui/group"/>
-</component>
-</collection>
-<collection name="phonebookui" long-name="Phonebook UI" level="ui">
-<component name="phonebook" filter="s60" long-name="Phonebook">
-<unit bldFile="app/contacts/phonebookui/phonebook/group"/>
-</component>
-<component name="speeddial" filter="s60" long-name="Speed Dial">
-<unit bldFile="app/contacts/phonebookui/speeddial/group"/>
-</component>
-<component name="phonebook2" filter="s60" long-name="Phone Book 2">
-<unit bldFile="app/contacts/phonebookui/phonebook2/group"/>
-</component>
-</collection>
-<collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
-<component name="cntfindplugin" filter="s60" long-name="Contacts Find Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntfindplugin/group"/>
-</component>
-<component name="cntsortplugin" filter="s60" long-name="Contacts Sort Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntsortplugin/group"/>
-</component>
-<component name="virtualphonebook" filter="s60" long-name="Virtual Phonebook" introduced="^2">
-<unit bldFile="app/contacts/phonebookengines/virtualphonebook/group"/>
-</component>
-<component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
-<unit bldFile="app/contacts/phonebookengines/contactsmodel/groupsql" mrp="app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
-</component>
-</collection>
-<collection name="pimprotocols" long-name="PIM Protocols" level="services">
-<component name="phonebooksync" long-name="Phonebook Sync" purpose="optional" plugin="Y">
-<unit bldFile="app/contacts/pimprotocols/phonebooksync/group" mrp="app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
-</component>
-<component name="pbap" long-name="Bluetooth PBAP" introduced="9.2" purpose="optional">
-<unit bldFile="app/contacts/pimprotocols/pbap/group" mrp="app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
-</component>
-</collection>
-<collection name="ccservices" long-name="Contacts Centric Services" level="services">
-<component name="cmsservices" filter="s60" long-name="Contact Method Selector Services" introduced="^2">
-<unit bldFile="app/contacts/ccservices/cmsservices/group"/>
-</component>
-</collection>
-<collection name="presencecache" long-name="Presence Cache" level="support">
-<component name="presencecacheutils" filter="s60" long-name="Presence Cache Utils" introduced="^2" class="placeholder">
-<!-- <unit bldFile="presencecache/presencecacheutils/group"/> -->
-</component>
-<component name="presencecacheserver2" filter="s60" long-name="Presence Cache Server" introduced="^2" class="placeholder">
-<!-- <unit bldFile="presencecache/presencecacheserver2/group"/> -->
-</component>
-<component name="presencecacheclient2" filter="s60" long-name="Presence Cache Client" introduced="^2" class="placeholder">
-<!-- <unit bldFile="presencecache/presencecacheclient2/group"/> -->
-</component>
-<component name="presencecache_build" filter="s60" long-name="Presence Cache Build" introduced="^2">
-<!-- should divide this bld.inf into the other components, or collapse them into a single component -->
-<unit bldFile="app/contacts/presencecache/group"/>
-</component>
-</collection>
-<collection name="predictivesearch" long-name="Predictive Search" level="support">
-<component name="pcsutils" filter="s60" long-name="PCS Utils" introduced="^2">
-<unit bldFile="app/contacts/predictivesearch/pcsutils/group"/>
-</component>
-<component name="pcsserverclientapi" filter="s60" long-name="PCS Server Client API" introduced="^2">
-<unit bldFile="app/contacts/predictivesearch/pcsserverclientapi/group"/>
-</component>
-<component name="pcsserver" filter="s60" long-name="PCS Server" introduced="^2">
-<unit bldFile="app/contacts/predictivesearch/pcsserver/group"/>
-</component>
-<component name="pcsadapters" filter="s60" long-name="PCS Adapters" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/predictivesearch/adapters/contacts/group"/>
-</component>
-<component name="pcsalgorithm" filter="s60" long-name="PCS Algorithm" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/predictivesearch/pcsalgorithm/group"/>
-</component>
-<component name="predictivesearch_build" filter="s60" long-name="Predictive Search Build" introduced="^2">
-<!-- need to remove #includes from bld.inf and rename as Predictive Search ROM -->
-<unit bldFile="app/contacts/predictivesearch/group"/>
-</component>
-</collection>
-<collection name="contacts_info" long-name="Contacts Apps Info" level="ui">
-<component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="organizer" level="apps" span="2" long-name="Organizer Application Suite" levels="support services engine ui app">
-<collection name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" level="app">
-<component name="meeting_request_mailbox_utilities_api" long-name="Meeting Request Mailbox Utilities API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_mailbox_utilities_api/group"/>
-</component>
-<component name="meeting_request_uids_api" long-name="Meeting Request UIDs API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_uids_api/group"/>
-</component>
-<component name="calendar_exporter_api" long-name="Calendar Exporter API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_exporter_api/group"/>
-</component>
-<component name="agenda_versit_2_api" long-name="Agenda Versit 2 API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/agenda_versit_2_api/group"/>
-</component>
-<component name="calendar_importer_api" long-name="Calendar Importer API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_importer_api/group"/>
-</component>
-<component name="calendar_launcher_api" long-name="Calendar Launcher API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_launcher_api/group"/>
-</component>
-<component name="calendar_common_utils_api" long-name="Calendar Common Utils API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_common_utils_api/group"/>
-</component>
-<component name="searchfw_launcher_api" long-name="Search Framework Launcher API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/searchfw_launcher_api/group"/>
-</component>
-<component name="alarm_const_api" long-name="Alarm Const API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/alarm_const_api/group"/>
-</component>
-<component name="alarm_ui_external_control_api" long-name="Alarm UI External Control API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/alarm_ui_external_control_api/group"/>
-</component>
-<component name="calendar_settings_keys_api" long-name="Calendar Settings Keys API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_settings_keys_api/group"/>
-</component>
-<component name="calendar_tones_settings_keys_api" long-name="Calendar Tones Settings Keys API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_tones_settings_keys_api/group"/>
-</component>
-<component name="clock_settings_api" long-name="Clock Settings API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/clock_settings_api/group"/>
-</component>
-<component name="common_alarm_editor_api" long-name="Common Alarm Editor API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/common_alarm_editor_api/group"/>
-</component>
-<component name="alarm_ui_secondary_display_api" long-name="Alarm UI Secondary Display API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/alarm_ui_secondary_display_api/group"/>
-</component>
-<component name="searchui_launcher_api" long-name="Search UI Launcher API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/searchui_launcher_api/group"/>
-</component>
-<component name="agenda_entry_ui_api" long-name="Agenda Entry UI API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/agenda_entry_ui_api/group"/>
-</component>
-<component name="meeting_request_utillities_api" long-name="Meeting Request Utillities API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_utillities_api/group"/>
-</component>
-<component name="meeting_request_viewer_api" long-name="Meeting Request Viewer API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/meeting_request_viewer_api/group"/>
-</component>
-<component name="calendar_custamization_api" long-name="Calendar Customization API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_plat/calendar_custamization_api/group"/>
-</component>
-</collection>
-<collection name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" level="app">
-<component name="calendar_interim_utils2_api" long-name="Calendar Interim Utils 2 API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_pub/calendar_interim_utils2_api/group"/>
-</component>
-<component name="notepad_library_api" long-name="Notepad Library API" filter="s60" class="api">
-<unit bldFile="app/organizer/organizer_pub/notepad_library_api/group"/>
-</component>
-</collection>
-<collection name="alarmengines" long-name="Alarm Engines" level="engine">
-<component name="missedalarmstore" filter="s60" long-name="Missed Alarm Store">
-<unit bldFile="app/organizer/alarmengines/missedalarmstore/group"/>
-</component>
-</collection>
-<collection name="calendarengines" long-name="Calendar Engines" level="engine">
-<component name="versit2" filter="s60" long-name="Versit 2 iCal Parser" introduced="9.2">
-<unit bldFile="app/organizer/calendarengines/versit2/group"/>
-</component>
-<component name="agnversit2" filter="s60" long-name="Versit 2 Agenda Interface" introduced="9.2" plugin="Y">
-<unit bldFile="app/organizer/calendarengines/agnversit2/group"/>
-</component>
-<component name="caleninterimutils" filter="s60" long-name="Calendar Interim Utils" introduced="9.1">
-<unit bldFile="app/organizer/calendarengines/caleninterimutils/group"/>
-</component>
-<component name="calenimp" filter="s60" long-name="Calendar Import Wrapper" introduced="7.0s">
-<unit bldFile="app/organizer/calendarengines/calenimp/group"/>
-</component>
-<component name="calenlauncher" filter="s60" long-name="Calendar Launcher">
-<unit bldFile="app/organizer/calendarengines/calenlauncher/group"/>
-</component>
-<component name="caldavsrv" filter="sf_build" long-name="CalDAV Server" introduced="^3">
-<unit bldFile="app/organizer/calendarengines/caldav/group"/>
-</component>
-</collection>
-<collection name="meetingrequestengines" long-name="Meeting Request Engines" level="engine">
-<component name="mrmailbox" filter="s60" long-name="Meeting Request Mailbox">
-<unit bldFile="app/organizer/meetingrequestengines/mrmailbox/group"/>
-</component>
-<component name="mrmailboxutils" filter="s60" long-name="Meeting Request Mailbox Utils" plugin="Y">
-<unit bldFile="app/organizer/meetingrequestengines/mrmailboxutils/group"/>
-</component>
-</collection>
-<collection name="searchfw" long-name="Search Framework" level="services">
-<!-- Uncomment all units when configuration is in place. All currently #included from searchfw_build, which should be removed at the same time. -->
-<component name="coresearchfw" filter="s60" long-name="Core Search Framework" introduced="^1" class="placeholder">
-<!--<unit bldFile="searchfw/coresearchfw/group"/>-->
-</component>
-<component name="searchfw_plugins" filter="s60" long-name="Search Plugins" introduced="^1" plugin="Y" class="placeholder">
-<!--<unit bldFile="searchfw/plugins/group"/>-->
-</component>
-<component name="searchfw_build" filter="s60" long-name="Search Framework Build" introduced="^1">
-<unit bldFile="app/organizer/searchfw/group"/>
-</component>
-</collection>
-<collection name="alarmui" long-name="Alarm UI" level="app">
-<!-- collection is really a component, should move down a directory -->
-<component name="alarmui_build" filter="s60" long-name="Alarm UI Build">
-<unit bldFile="app/organizer/alarmui/group"/>
-</component>
-</collection>
-<collection name="calendarui" long-name="Calendar UI" level="ui">
-<component name="calendarui_help" filter="s60" long-name="Calendar UI Help">
-<unit bldFile="app/organizer/calendarui/help/group"/>
-</component>
-<component name="commonutils" filter="s60" long-name="Calendar Common Utils">
-<unit bldFile="app/organizer/calendarui/commonutils/group"/>
-</component>
-<component name="globaldata" filter="s60" long-name="Calendar Global Data">
-<unit bldFile="app/organizer/calendarui/globaldata/group"/>
-</component>
-<component name="settings" filter="s60" long-name="Calendar Settings">
-<!-- these should be merged into a single bld.inf or split into two components -->
-<unit bldFile="app/organizer/calendarui/settings/gsplugin/group"/>
-<unit bldFile="app/organizer/calendarui/settings/settingsui/group"/>
-</component>
-<component name="customisation" filter="s60" long-name="Calendar Customisation">
-<unit bldFile="app/organizer/calendarui/customisation/group"/>
-</component>
-<component name="customisationmanager" filter="s60" long-name="Calendar Customisation Manager">
-<unit bldFile="app/organizer/calendarui/customisationmanager/group"/>
-</component>
-<component name="multicaluidialog" filter="s60" long-name="Multi-Calendar UI Dialog" introduced="^3">
-<unit bldFile="app/organizer/calendarui/multicaluidialog/group"/>
-</component>
-<component name="views" filter="s60" long-name="Calendar Views">
-<unit bldFile="app/organizer/calendarui/views/group"/>
-</component>
-<component name="calendarui_controller" filter="s60" long-name="Calendar Controller">
-<unit bldFile="app/organizer/calendarui/controller/group"/>
-</component>
-<component name="calendarui_editors" filter="s60" long-name="Calendar Editors">
-<unit bldFile="app/organizer/calendarui/editors/group"/>
-</component>
-<component name="calendarui_application" filter="s60" long-name="Calendar Application">
-<unit bldFile="app/organizer/calendarui/application/group"/>
-</component>
-<component name="missedalarmindicatorplugin" filter="s60" long-name="Missed Alarm Indicator Plugin" plugin="Y">
-<unit bldFile="app/organizer/calendarui/missedalarmindicatorplugin/group"/>
-</component>
-<component name="calendarui_server" filter="s60" long-name="Calendar Server">
-<!-- these should be merged into a single bld.inf or split into two components -->
-<unit bldFile="app/organizer/calendarui/server/calensvr/group"/>
-<unit bldFile="app/organizer/calendarui/server/calensvrclient/group"/>
-</component>
-<component name="regionalplugins" filter="s60" long-name="Calendar Regional Plugins" plugin="Y">
-<!-- these should be merged into a single bld.inf or split into four components -->
-<unit bldFile="app/organizer/calendarui/regionalplugins/calenregionalutil/group"/>
-<unit bldFile="app/organizer/calendarui/regionalplugins/lunarchinese/group"/>
-<unit bldFile="app/organizer/calendarui/regionalplugins/lunarvietnamese/group"/>
-<unit bldFile="app/organizer/calendarui/regionalplugins/thai/group"/>
-</component>
-<component name="calenaiwprovider" filter="s60" long-name="Calendar AIW Proivder" introduced="^3" plugin="Y">
-<unit bldFile="app/organizer/calendarui/calenaiwprovider/group"/>
-</component>
-<component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y">
-<unit bldFile="app/organizer/calendarui/caldav/group"/>
-</component>
-<component name="calendarui_build" filter="s60" long-name="Calendar UI Build">
-<!-- split contents into separate components -->
-<unit bldFile="app/organizer/calendarui/group"/>
-</component>
-</collection>
-<collection name="meetingui" long-name="Meeting UI" level="ui">
-<component name="attendeeview" filter="s60" long-name="Attendee View">
-<unit bldFile="app/organizer/meetingui/attendeeview/group"/>
-</component>
-<component name="agnentryui" filter="s60" long-name="Agenda Entry UI" plugin="Y">
-<unit bldFile="app/organizer/meetingui/agnentryui/group"/>
-</component>
-<component name="meetingrequestutils" filter="s60" long-name="Meeting Request Utils">
-<unit bldFile="app/organizer/meetingui/meetingrequestutils/group"/>
-</component>
-<component name="meetingrequestviewers" filter="s60" long-name="Meeting Request Viewers" plugin="Y">
-<unit bldFile="app/organizer/meetingui/meetingrequestviewers/group"/>
-</component>
-<component name="meetingui_build" filter="s60" long-name="Meeting UI Build">
-<!-- split contents into separate components -->
-<unit bldFile="app/organizer/meetingui/group"/>
-</component>
-</collection>
-<collection name="clock2" long-name="Clock" level="app">
-<component name="clockengines" filter="s60" long-name="Clock Engines">
-<unit bldFile="app/organizer/clock2/clockengines/group"/>
-</component>
-<component name="clockui" filter="s60" long-name="Clock UI">
-<unit bldFile="app/organizer/clock2/clockui/group"/>
-</component>
-<component name="clock2_help" filter="s60" long-name="Clock Help">
-<unit bldFile="app/organizer/clock2/help/group"/>
-</component>
-<component name="clock2_build" filter="s60" long-name="Clock Build">
-<!-- split contents into separate components, or just make this one component -->
-<unit bldFile="app/organizer/clock2/group"/>
-</component>
-</collection>
-<collection name="notepad" long-name="Notepad" level="ui">
-<component name="notepad_help" filter="s60" long-name="Notepad Help">
-<unit bldFile="app/organizer/notepad/help/group"/>
-</component>
-<component name="notepad1" filter="s60" long-name="Notepad Application 1">
-<unit bldFile="app/organizer/notepad/notepad1/group"/>
-</component>
-<component name="txtrecog" filter="s60" long-name="Text Recognizer" plugin="Y">
-<unit bldFile="app/organizer/notepad/txtrecog/group"/>
-</component>
-</collection>
-<collection name="searchui" long-name="Search UI" level="app">
-<!-- consider making this a single component -->
-<!-- Uncomment all units when configuration is in place. All currently #included from searchui_build, which should be removed at the same time. -->
-<component name="searchui_help" filter="s60" long-name="Search UI Help" class="placeholder">
-<!--<unit bldFile="searchui/help/group"/>-->
-</component>
-<component name="searchapp" filter="s60" long-name="Search Application" class="placeholder">
-<!--<unit bldFile="searchui/searchapp/group"/>-->
-</component>
-<component name="searchui_build" filter="s60" long-name="Search UI Build">
-<unit bldFile="app/organizer/searchui/group"/>
-</component>
-</collection>
-<collection name="pimappservices" long-name="PIM Application Services" level="services">
-<component name="calendar" long-name="Calendar" introduced="9.2" purpose="optional">
-<unit bldFile="app/organizer/pimappservices/calendar/group" mrp="app/organizer/pimappservices/calendar/group/app-engines_calendar.mrp" version="2"/>
-</component>
-<component name="calendarvcalplugin" long-name="Calendar vCal Plugin" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="app/organizer/pimappservices/calendarvcalplugin/group" mrp="app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp" version="2"/>
-</component>
-<component name="appenginesdocs" long-name="Application Engines Documentation" purpose="development" class="doc">
-<unit mrp="app/organizer/pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
-</component>
-</collection>
-<collection name="pimappsupport" long-name="PIM Application Support" level="support">
-<component name="vcardandvcal" long-name="vCard and vCal" introduced="ER5" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/vcardandvcal/group" mrp="app/organizer/pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
-</component>
-<component name="chinesecalendarconverter" long-name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
-</component>
-<component name="chinesecalendaralg" long-name="Chinese Calendar Algorithm" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendaralg/group" mrp="app/organizer/pimappsupport/chinesecalendaralg/group/app-services_chinesecalendaralgorithm.mrp"/>
-</component>
-</collection>
-<collection name="organizer_info" long-name="Organizer Application Suite Info" level="app">
-<component name="organizer_metadata" long-name="Organizer Application Suite Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="mail eng base ui">
-<collection name="msg_pub" long-name="Messaging Apps Public APIs" level="ui">
-<component name="messaging_integration_api" long-name="Messaging Integration API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/messaging_integration_api/group"/>
-</component>
-<component name="plugin_bio_control_api" long-name="Plug-in Bio Control API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/plugin_bio_control_api/group"/>
-</component>
-<component name="mms_client_mtm_api" long-name="MMS Client MTM API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/mms_client_mtm_api/group"/>
-</component>
-<component name="open_new_message_notification_api" long-name="Open New Message Notification API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/open_new_message_notification_api/group"/>
-</component>
-<component name="messaging_editor_constants_api" long-name="Messaging Editor Constants API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_pub/messaging_editor_constants_api/group"/>
-</component>
-</collection>
-<collection name="msg_plat" long-name="Messaging Apps Platform APIs" level="ui">
-<component name="smil_player_launch_api" long-name="SMIL Player Launch API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/smil_player_launch_api/group"/>
-</component>
-<component name="messaging_media_resolver_api" long-name="Messaging Media Resolver API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/messaging_media_resolver_api/group"/>
-</component>
-<component name="smil_engine_api" long-name="SMIL Engine API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/smil_engine_api/group"/>
-</component>
-<component name="mms_server_settings_api" long-name="MMS Server Settings API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_server_settings_api/group"/>
-</component>
-<component name="new_contacts_note_secondary_display_api" long-name="New Contacts Note Secondary Display API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contacts_note_secondary_display_api/group"/>
-</component>
-<component name="messaging_center_ui_utilities_api" long-name="Messaging Center UI Utilities API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/messaging_center_ui_utilities_api/group"/>
-</component>
-<component name="internet_mail_mtm_ui_api" long-name="Internet Mail MTM UI API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/internet_mail_mtm_ui_api/group"/>
-</component>
-<component name="messaging_editor_api" long-name="Messaging Editor API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/messaging_editor_api/group"/>
-</component>
-<component name="email_domain_utilities_api" long-name="Email Domain Utilities API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/email_domain_utilities_api/group"/>
-</component>
-<component name="smil_transition_api" long-name="SMIL Transition API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/smil_transition_api/group"/>
-</component>
-<component name="new_contacts_note_status_api" long-name="New Contacts Note Status API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contacts_note_status_api/group"/>
-</component>
-<component name="unified_editor_video_conversion_api" long-name="Unified Editor Video Conversion API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/unified_editor_video_conversion_api/group"/>
-</component>
-<component name="mms_conformance_api" long-name="MMS Conformance API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_conformance_api/group"/>
-</component>
-<component name="new_contacts_note_variables_api" long-name="New Contacts Note Variables API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contacts_note_variables_api/group"/>
-</component>
-<component name="new_message_notification_api" long-name="New Message Notification API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_message_notification_api/group"/>
-</component>
-<component name="mms_application_api" long-name="MMS Application API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_application_api/group"/>
-</component>
-<component name="mms_engine_settings_api" long-name="MMS Engine Settings API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_engine_settings_api/group"/>
-</component>
-<component name="mms_codec_client_api" long-name="MMS Codec Client API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mms_codec_client_api/group"/>
-</component>
-<component name="send_ui_meeting_request_api" long-name="Send UI Meeting Request API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/send_ui_meeting_request_api/group"/>
-</component>
-<component name="new_contact_notes_extended_api" long-name="New Contact Notes Extended API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/new_contact_notes_extended_api/group"/>
-</component>
-<component name="mail_ui_constants_api" long-name="Mail UI Constants API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/mail_ui_constants_api/group"/>
-</component>
-<component name="sim_dialog_launch_api" long-name="SIM Dialog Launch API" filter="s60" class="api">
-<unit bldFile="app/messaging/msg_plat/sim_dialog_launch_api/group"/>
-</component>
-</collection>
-<collection name="mobilemessaging" long-name="Mobile Messaging" level="ui">
-<component name="audiomsg" filter="s60" long-name="Audio Message">
-<unit bldFile="app/messaging/mobilemessaging/audiomsg/group"/>
-</component>
-<component name="msgmedia" filter="s60" long-name="Message Media">
-<unit bldFile="app/messaging/mobilemessaging/msgmedia/group"/>
-</component>
-<component name="unieditor" filter="s60" long-name="Unified Editor">
-<unit bldFile="app/messaging/mobilemessaging/unieditor/group"/>
-</component>
-<component name="mmsui" filter="s60" long-name="MMS UI">
-<unit bldFile="app/messaging/mobilemessaging/mmsui/group"/>
-</component>
-<component name="postcard" filter="s60" long-name="Postcard">
-<unit bldFile="app/messaging/mobilemessaging/postcard/group"/>
-</component>
-<component name="smilui" filter="s60" long-name="SMIL UI">
-<unit bldFile="app/messaging/mobilemessaging/smilui/group"/>
-</component>
-<component name="smum" filter="s60" long-name="SMS UI MTM and UI Data MTM" plugin="Y">
-<unit bldFile="app/messaging/mobilemessaging/smum/group"/>
-</component>
-<component name="smsui" filter="s60" long-name="SMS UI">
-<unit bldFile="app/messaging/mobilemessaging/smsui/group"/>
-</component>
-<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/mobilemessaging/smsmtm/group" mrp="app/messaging/mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
-</component>
-</collection>
-<collection name="mmsengine" long-name="MMS Engine" level="eng">
-<component name="mmsconninit" filter="s60" long-name="MMS Connection Initiator" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsconninit/bld"/> -->
-</component>
-<component name="genutils" filter="s60" long-name="General Utils" class="placeholder">
-<!-- <unit bldFile="mmsengine/genutils/bld"/> -->
-</component>
-<component name="mmsserversettings" filter="s60" long-name="MMS Server Settings" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserversettings/bld"/> -->
-</component>
-<component name="mmsmessage" filter="s60" long-name="MMS Message" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsmessage/bld"/> -->
-</component>
-<component name="mmshttptransport" filter="s60" long-name="MMS HTTP Transport" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmshttptransport/bld"/> -->
-</component>
-<component name="mmscodec" filter="s60" long-name="MMS Codec" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodec/bld"/> -->
-</component>
-<component name="mmsserver" filter="s60" long-name="MMS Server" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserver/bld"/> -->
-</component>
-<component name="clientmtm" filter="s60" long-name="MMS Client MTM" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/clientmtm/bld"/> -->
-</component>
-<component name="mmswatcher" filter="s60" long-name="MMS Watcher" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmswatcher/bld"/> -->
-</component>
-<component name="mmspushhandler" filter="s60" long-name="MMS Push Handler" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmspushhandler/bld"/> -->
-</component>
-<component name="applicationadapter" filter="s60" long-name="MMS Application Adapter" class="placeholder">
-<!-- <unit bldFile="mmsengine/applicationadapter/bld"/> -->
-</component>
-<component name="mmscodecclient" filter="s60" long-name="MMS Codec Client" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodecclient/bld"/> -->
-</component>
-<component name="mmssettings" long-name="MMS Settings" introduced="9.2" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmssettings/group" mrp="app/messaging/mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
-</component>
-<component name="mmsconf" long-name="MMS Configuration" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmsconf" mrp="app/messaging/mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
-</component>
-<component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
-<!-- this bld.inf should be broken up into the individual other components -->
-<unit bldFile="app/messaging/mmsengine/group"/>
-</component>
-</collection>
-<collection name="messagingappbase" long-name="Messaging App Base" level="base">
-<component name="msgavkon" filter="s60" long-name="Messaging Avkon UI">
-<unit bldFile="app/messaging/messagingappbase/msgavkon/group"/>
-</component>
-<component name="mce" filter="s60" long-name="Message Center Application">
-<unit bldFile="app/messaging/messagingappbase/mce/group"/>
-</component>
-<component name="mceextraitems" filter="s60" long-name="Message Center Extra Items">
-<unit bldFile="app/messaging/messagingappbase/mceextraitems/group"/>
-</component>
-<component name="mcesettings" filter="s60" long-name="Message Center Settings">
-<unit bldFile="app/messaging/messagingappbase/mcesettings/group"/>
-</component>
-<component name="msgerrorwatcher" filter="s60" long-name="Messaging Error Watcher" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/msgerrorwatcher/group"/>
-</component>
-<component name="ncnlist" filter="s60" long-name="New Contacts Note List">
-<unit bldFile="app/messaging/messagingappbase/ncnlist/group"/>
-</component>
-<component name="schemeplugin" filter="s60" long-name="Scheme Handler Plugin" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/schemeplugin/group"/>
-</component>
-<component name="sendui" filter="s60" long-name="Send UI" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/sendui/group"/>
-</component>
-<component name="smilengine" filter="s60" long-name="SMIL Engine">
-<unit bldFile="app/messaging/messagingappbase/smilengine/group"/>
-</component>
-<component name="bium" filter="s60" long-name="BIO UI MTM" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/bium/group"/>
-</component>
-<component name="smartmessaging" filter="s60" long-name="Smart Messaging">
-<unit bldFile="app/messaging/messagingappbase/smartmessaging/group"/>
-</component>
-<component name="msgeditor" filter="s60" long-name="Messaging Editor">
-<unit bldFile="app/messaging/messagingappbase/msgeditor/group"/>
-</component>
-<component name="smilparser" long-name="SMIL Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="app/messaging/messagingappbase/smilparser/GROUP" mrp="app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
-</component>
-<component name="obexmtms" long-name="OBEX MTMs" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/obexmtms/Group" mrp="app/messaging/messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
-</component>
-</collection>
-<collection name="email" long-name="Email" level="mail">
-<!-- use commonemail instead -->
-<component name="alwaysonlineemailplugin" filter="s60" long-name="Always Online Mail Plugin" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/alwaysonlineemailplugin/group"/>
-</component>
-<component name="emailnotificationhandler" filter="s60" long-name="Email Notification Handler" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/emailnotificationhandler/group"/>
-</component>
-<component name="imum" filter="s60" long-name="Internet Mail UI MTM" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/imum/group"/>
-</component>
-<component name="mail" filter="s60" long-name="Mail Application" deprecated="^3">
-<unit bldFile="app/messaging/email/mail/group"/>
-</component>
-<component name="pop3andsmtpmtm" long-name="POP3 and SMTP MTM" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/pop3andsmtpmtm/group" mrp="app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
-</component>
-<component name="imap4mtm" long-name="IMAP4 MTM" introduced="9.2" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/imap4mtm/group" mrp="app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
-</component>
-</collection>
-<collection name="messaging_info" long-name="Messaging Apps Info" level="ui">
-<component name="messaging_metadata" long-name="Messaging Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commonemail" level="apps" span="2" long-name="Email Apps" levels="service support ui app">
-<collection name="email_pub" long-name="Email Apps Public Interfaces" level="app">
-<component name="email_widget_api" long-name="Email Widget API" filter="s60" class="api">
-<unit bldFile="app/commonemail/email_pub/email_widget_api/group"/>
-</component>
-</collection>
-<collection name="email_plat" long-name="Email Apps Platform Interfaces" level="app">
-<component name="email_client_api" long-name="Email Client API" filter="s60" class="api">
-<unit bldFile="app/commonemail/email_plat/email_client_api/group"/>
-</component>
-<component name="email_setup_plugin_api" long-name="Email Setup Plugin API" filter="s60" class="api">
-<unit bldFile="app/commonemail/email_plat/email_setup_plugin_api/group"/>
-</component>
-</collection>
-<collection name="emailservices" long-name="Email Services" level="service">
-<component name="emailframework" filter="s60" long-name="Email Framework" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailframework/group"/>
-</component>
-<component name="emailclientapi" filter="s60" long-name="Email Client API" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailclientapi/group"/>
-</component>
-<component name="emailserver" filter="s60" long-name="Email Server" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailserver/group"/>
-</component>
-<component name="emailservermonitor" filter="s60" long-name="Email Server Monitor" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailservermonitor/group"/>
-</component>
-<component name="psmruadapter" filter="s60" long-name="Predictive Search Most Recent Used Adapter" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailservices/psmruadapter/group"/>
-</component>
-<component name="emailstore" filter="s60" long-name="Email Store" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailstore/group"/>
-</component>
-<component name="emaildebug" filter="s60" long-name="Email Debug" introduced="^2" class="api">
-<unit bldFile="app/commonemail/emailservices/emaildebug/group"/>
-</component>
-<component name="emailinstallationinitiator" filter="s60" long-name="Email Installation Initiator" introduced="^2">
-<unit bldFile="app/commonemail/emailservices/emailinstallationinitiator/group"/>
-</component>
-</collection>
-<collection name="ipsservices" long-name="IMAP/POP/SMTP Services" level="service">
-<component name="ipssossettings" filter="s60" long-name="IPS SOS Settings" introduced="^2">
-<!-- SOS? Consider spelling it out since the abbreviation is ambiguous -->
-<unit bldFile="app/commonemail/ipsservices/ipssossettings/group"/>
-</component>
-<component name="ipssosplugin" filter="s60" long-name="IPS SOS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/ipsservices/ipssosplugin/group"/>
-</component>
-<component name="ipssosaoplugin" filter="s60" long-name="IPS SOS Always Online Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/ipsservices/ipssosaoplugin/group"/>
-</component>
-<component name="ipsservices_build" filter="s60" long-name="IPS Services Build" introduced="^2">
-<unit bldFile="app/commonemail/ipsservices/group"/>
-<!-- can the exports be broken up into the other components or made a config component?-->
-</component>
-</collection>
-<collection name="emailcontacts" long-name="Email Contacts" level="support">
-<component name="contactactionservice" filter="s60" long-name="Contact Action Service" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailcontacts/contactactionservice/group"/>
-</component>
-<component name="contactactionmenu" filter="s60" long-name="Contact Action Menu" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailcontacts/contactactionmenu/group"/>
-</component>
-</collection>
-<collection name="meetingrequest" long-name="Meeting Request" level="ui">
-<component name="mrcommon" filter="s60" long-name="MR Common" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrcommon/group"/>
-</component>
-<component name="mrdb" filter="s60" long-name="MR Database" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrdb/group"/>
-</component>
-<component name="mrpolicy" filter="s60" long-name="MR Policy" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrpolicy/group"/>
-</component>
-<component name="mrservices" filter="s60" long-name="MR Services" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrservices/group"/>
-</component>
-<component name="mrgui" filter="s60" long-name="MR GUI" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrgui/group"/>
-</component>
-<component name="mrentry" filter="s60" long-name="MR Entry" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrentry/group"/>
-</component>
-<component name="mrtasks" filter="s60" long-name="MR Tasks" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrtasks/group"/>
-</component>
-<component name="mrutils" filter="s60" long-name="MR Utils" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrutils/group"/>
-</component>
-<component name="mrutilscalplugin" filter="s60" long-name="MR Utils Calendar Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mrutilscalplugin/group"/>
-</component>
-<component name="mrviewer" filter="s60" long-name="MR Viewer" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrviewer/group"/>
-</component>
-<component name="mrviewercalplugin" filter="s60" long-name="MR Viewer Calendar Plugin" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrviewercalplugin/group"/>
-</component>
-<component name="mricalviewer" filter="s60" long-name="MR iCal Viewer" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mricalviewer/group"/>
-</component>
-<component name="mrversit2" filter="s60" long-name="MR Versit2" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrversit2/group"/>
-</component>
-<component name="mragnversit2" filter="s60" long-name="MR Agenda Versit2" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mragnversit2/group"/>
-</component>
-<component name="mrcasplugin" filter="s60" long-name="MR Contact Action Service Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mrcasplugin/group"/>
-</component>
-<component name="mrurlparserplugin" filter="s60" long-name="MR URL Parser Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/meetingrequest/mrurlparserplugin/group"/>
-</component>
-<component name="meetingrequest_build" filter="s60" long-name="MR Build" introduced="^2">
-<!-- can the exports be broken up into the other components ?
- alternatively, move the exports into a RM Config component-->
-<unit bldFile="app/commonemail/meetingrequest/group"/>
-</component>
-</collection>
-<collection name="emailuis" long-name="Email UIs" level="app">
-<component name="emailui" filter="s60" long-name="Email UI" introduced="^2">
-<unit bldFile="app/commonemail/emailuis/emailui/group"/>
-</component>
-<component name="gsemailsettings" filter="s60" long-name="Email GS Settings" introduced="^2" plugin="Y">
-<unit bldFile="app/commonemail/emailuis/gsemailsettings/group"/>
-</component>
-<component name="uicomponents" filter="s60" long-name="Email UI Components" introduced="^2">
-<unit bldFile="app/commonemail/emailuis/uicomponents/group"/>
-</component>
-<component name="widget" filter="s60" long-name="Email Widget" introduced="^2">
-<!-- Uncomment unit when configuration is in place. Currently #included from emailuis_build, which should be removed at the same time. -->
-<!--<unit bldFile="emailuis/widget/group"/>-->
-</component>
-<component name="emailuis_build" filter="s60" long-name="Email UIs Build" introduced="^2">
-<unit bldFile="app/commonemail/emailuis/group"/>
-</component>
-</collection>
-<collection name="commonemail_info" long-name="Email Apps Info" level="app">
-<component name="emailhelp" filter="s60" long-name="Email Help" class="placeholder">
-<!-- should this be commented out or not? -->
-<!-- <unit bldFile="emailhelp/group"/> -->
-</component>
-<component name="commonemail_help" filter="s60" long-name="Email Help" introduced="^2" class="placeholder">
-<!-- should this be commented out or not? -->
-<!-- <unit bldFile="help/group"/> -->
-</component>
-</collection>
-</block>
-<block name="conversations" level="apps" long-name="Conversation Apps" levels="settings utils plugin ui">
-<collection name="conversations_plat" long-name="Conversation Apps Platform Interfaces" level="ui">
-<component name="im_cv_launcher_api" long-name="IM CV Launcher API" filter="s60" class="api">
-<unit bldFile="app/conversations/conversations_plat/im_cv_launcher_api/group"/>
-</component>
-<component name="im_connection_api" long-name="IM Connection API" filter="s60" class="api">
-<unit bldFile="app/conversations/conversations_plat/im_connection_api/group"/>
-</component>
-<component name="im_cv_appui_api" long-name="IM CV App UI API" filter="s60" class="api">
-<unit bldFile="app/conversations/conversations_plat/im_cv_appui_api/group"/>
-</component>
-</collection>
-<collection name="uiservicetabsettings" long-name="UI Service Tab Settings" level="settings">
-<!-- this is really at the wrong rank. should move down a directory -->
-<component name="vimpstsettings" filter="s60" long-name="VIMP Service Tab Settings">
-<unit bldFile="app/conversations/uiservicetabsettings/group"/>
-</component>
-</collection>
-<collection name="instantmessagesalert" long-name="Instant Messages Alert" level="utils">
-<!-- this is really at the wrong rank. should move down a directory -->
-<component name="instantmessagesalert_build" filter="s60" long-name="Instant Messages Alert build" introduced="^3">
-<unit bldFile="app/conversations/instantmessagesalert/group"/>
-</component>
-</collection>
-<collection name="imstutils" long-name="IM Service Tab Utils" level="utils">
-<component name="imstutils_help" filter="s60" long-name="IM Service Tab Help">
-<unit bldFile="app/conversations/imstutils/help/group"/>
-</component>
-<component name="imconnectionprovider" filter="s60" long-name="IM Connection Provider" plugin="Y">
-<unit bldFile="app/conversations/imstutils/imconnectionprovider/group"/>
-</component>
-<component name="xmppadapter" filter="s60" long-name="XMPP Settings Adapter" plugin="Y">
-<unit bldFile="app/conversations/imstutils/xmppadapter/group"/>
-</component>
-<component name="imconversationview" filter="s60" long-name="IM Conversation View">
-<unit bldFile="app/conversations/imstutils/imconversationview/group"/>
-</component>
-<component name="imstutils_config" filter="s60" long-name="IM Service Tab Utils config" class="config">
-<!-- remove the #includes and or moved ithe loc file into one the above components -->
-<unit bldFile="app/conversations/imstutils/group"/>
-</component>
-</collection>
-<collection name="uiservicetab" long-name="UI Service Tab" level="ui">
-<component name="vimpstutils" filter="s60" long-name="VIMP Service Tab Utilities">
-<!-- need to spell out VIMP at least once -->
-<unit bldFile="app/conversations/uiservicetab/vimpstutils/group"/>
-</component>
-<component name="vimpststorage" filter="s60" long-name="VIMP Service Tab Storage">
-<unit bldFile="app/conversations/uiservicetab/vimpststorage/group"/>
-</component>
-<component name="vimpstengine" filter="s60" long-name="VIMP Service Tab Engine">
-<unit bldFile="app/conversations/uiservicetab/vimpstengine/group"/>
-</component>
-<component name="vimpstcmdprocess" filter="s60" long-name="VIMP Service Tab Command Process">
-<unit bldFile="app/conversations/uiservicetab/vimpstcmdprocess/group"/>
-</component>
-<component name="vimpstui" filter="s60" long-name="VIMP Service Tab UI">
-<unit bldFile="app/conversations/uiservicetab/vimpstui/group"/>
-</component>
-<component name="vimpstdetailsviewplugin" filter="s60" long-name="VIMP ST Details View Plugin" plugin="Y">
-<unit bldFile="app/conversations/uiservicetab/vimpstdetailsviewplugin/group"/>
-</component>
-<component name="uiservicetab_build" filter="s60" long-name="UI Service Tab Build">
-<!-- can this be distributed into the above bld.infs? -->
-<unit bldFile="app/conversations/uiservicetab/group"/>
-</component>
-</collection>
-<collection name="servicewidget" long-name="Service Widget" level="ui">
-<component name="servicewidgetdatapublisher" filter="s60" long-name="Service Widget Data Publisher" plugin="Y">
-<unit bldFile="app/conversations/servicewidget/servicewidgetdatapublisher/group"/>
-</component>
-<component name="themes" filter="s60" long-name="Service Widget Themes" class="config">
-<!-- does this really need to have that number in the directory name? -->
-<unit bldFile="app/conversations/servicewidget/themes/install-themes/install/servicewidget_20021383/group"/>
-</component>
-<component name="servicewidget_build" filter="s60" long-name="Service Widget Build">
-<!-- Either move the whole collection down one directory into a single component, or move the ROM and SIS parts into a Service Widget ROM component -->
-<unit bldFile="app/conversations/servicewidget/group"/>
-</component>
-</collection>
-<collection name="instantmsgindicatorplugin" long-name="Instant Message Indicator Plugin" level="plugin">
-<!-- collection is really a component. should move down a directory -->
-<component name="instantmsgindicatorplugin_build" filter="s60" long-name="Instant Message Indicator Plugin Build" introduced="^3" plugin="Y">
-<unit bldFile="app/conversations/instantmsgindicatorplugin/group"/>
-</component>
-</collection>
-<collection name="imstatuspaneindicatorplugin" long-name="IM Status Pane Indicator Plugin" level="plugin">
-<!-- collection is really a component. should move down a directory -->
-<component name="imstatuspaneindicatorplugin_build" filter="s60" long-name="IM Status Pane Indicator Plugin Build" introduced="^3" plugin="Y">
-<unit bldFile="app/conversations/imstatuspaneindicatorplugin/group"/>
-</component>
-</collection>
-<collection name="conversations_info" long-name="Conversation Apps Info" level="ui">
-<component name="conversations_build" filter="s60" long-name="Conversation Apps Build">
-<!-- can the exports be moved to other components? or this remade into a configuration component?-->
-<unit bldFile="app/conversations/group"/>
-</component>
-</collection>
-</block>
-<block name="im" level="apps" long-name="Instant Messaging Apps" levels="support prot engine apps">
-<collection name="im_plat" long-name="Instant Messaging Apps Platform Interfaces" level="apps">
-<component name="wv_sap_settings_api" long-name="WV SAP Settings API" filter="s60" class="api">
-<unit bldFile="app/im/im_plat/wv_sap_settings_api/group"/>
-</component>
-</collection>
-<collection name="wvsettings20" long-name="Wireless Village Settings Engine" level="support">
-<!-- this is really a component. should move down a directory -->
-<component name="wvsapsettingsstore" long-name="WV SAP Settings Store" filter="s60" introduced="9.3">
-<unit bldFile="app/im/wvsettings20/group"/>
-</component>
-</collection>
-</block>
-<block name="dictionary" level="services" long-name="Dictionary" levels="utils ui">
-<collection name="dictionary_plat" long-name="Dictionary Platform Interfaces" level="ui">
-<component name="menu_suites_macros_api" long-name="Menu Suites Macros API" filter="s60" class="api">
-<unit bldFile="app/dictionary/dictionary_plat/menu_suites_macros_api/group"/>
-</component>
-</collection>
-<collection name="userdict" long-name="User Dictionary" level="ui">
-<!-- collection is really a component, move down a dir -->
-<component name="userdict_build" filter="s60" long-name="Japanese User Dictionary">
-<unit bldFile="app/dictionary/userdict/group"/>
-</component>
-</collection>
-</block>
-<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"/>
-</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"/>
-</component>
-</collection>
-<collection name="camerauis" long-name="Camera UIs">
-<component name="activepalette" filter="s60" long-name="Active Palette">
-<unit bldFile="app/camera/camerauis/activepalette/group"/>
-</component>
-<component name="cameraapp" filter="s60" long-name="Camera Application">
-<unit bldFile="app/camera/camerauis/cameraapp/group"/>
-<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">
-<component name="image_editor_debug_utilities_api" long-name="Image Editor Debug Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
-</component>
-<component name="image_editor_utilities_api" long-name="Image Editor Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_utilities_api/group"/>
-</component>
-<component name="image_editor_definitions_api" long-name="Image Editor Definitions API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_definitions_api/group"/>
-</component>
-<component name="image_editor_system_parameters_api" long-name="Image Editor System Parameters API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_system_parameters_api/group"/>
-</component>
-<component name="image_processing_engine_api" long-name="Image Processing Engine API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_processing_engine_api/group"/>
-</component>
-</collection>
-<collection name="imageeditor" long-name="Image Editor UI" level="ui">
-<component name="pb" filter="s60" long-name="Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/pb/group"/>
-</component>
-<component name="iepb" filter="s60" long-name="Image Editor Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/iepb/group"/>
-</component>
-<component name="imageeditorui" filter="s60" long-name="Image Editor UI">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorui/group"/>
-</component>
-<component name="imageeditormanager" filter="s60" long-name="Image Editor Manager">
-<unit bldFile="app/imgeditor/imageeditor/imageeditormanager/group"/>
-</component>
-<component name="imageeditorapp" filter="s60" long-name="Image Editor Application">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorapp/group"/>
-</component>
-<component name="imageeditor_plugins" filter="s60" long-name="Image Editor Plugins" plugin="Y">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditor/plugins/blackwhiteplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/brightnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/bubbleplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cartoonizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/clipartplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/contrastplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cropplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/drawplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/frameplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/negativeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/redeyeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/resizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotatelplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotaterplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/textplugin/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditor/plugins/drawplugin/group"/>
- -->
-</component>
-<component name="editorprovider" filter="s60" long-name="Image Editor Provider">
-<unit bldFile="app/imgeditor/imageeditor/editorprovider/group"/>
-</component>
-<component name="imageeditor_build" filter="s60" long-name="Image Editor Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditor/group"/>
-</component>
-</collection>
-<collection name="imageeditorengine" long-name="Image Editor Engine" level="engine">
-<component name="filters" filter="s60" long-name="Image Editor Filters">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbrightness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbubble/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbuffer/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercartoon/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterclipart/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercontrast/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercrop/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterdraw/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterframe/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtergrayscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtericlsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegtarget/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filternegate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterredeye/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterrotate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtertext/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
- -->
-</component>
-<component name="imageeditorutils" filter="s60" long-name="Image Editor Utilities">
-<unit bldFile="app/imgeditor/imageeditorengine/imageeditorutils/group"/>
-</component>
-<component name="systemparameters" filter="s60" long-name="System Parameters">
-<unit bldFile="app/imgeditor/imageeditorengine/systemparameters/group"/>
-</component>
-<component name="enginewrapper" filter="s60" long-name="Image Editor Engine Wrapper">
-<unit bldFile="app/imgeditor/imageeditorengine/enginewrapper/group"/>
-</component>
-<component name="imageeditorengine_build" filter="s60" long-name="Image Editor Engine Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoeditor" level="apps" long-name="Video Editor Apps" levels="engine ui">
-<collection name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" level="ui">
-<component name="video_editor_engine_api" long-name="Video Editor Engine API" introduced="^2" class="api">
-<unit bldFile="app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
-</component>
-</collection>
-<collection name="videditor" long-name="Video Editor" level="ui">
-<component name="videoeditorcommon" filter="s60" long-name="Video Editor Common" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditorcommon/group"/>
-</component>
-<component name="videoeditoruicomponents" filter="s60" long-name="Video Editor UI Components" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditoruicomponents/group"/>
-</component>
-<component name="simplevideoeditor" filter="s60" long-name="Simple Video Editor" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplevideoeditor/group"/>
-</component>
-<component name="simplecutvideo" filter="s60" long-name="Simple Cut Video" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplecutvideo/group"/>
-</component>
-<component name="videoprovider" filter="s60" long-name="Video Provider" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoprovider/group"/>
-</component>
-<component name="manualvideoeditor" filter="s60" long-name="Manual Video Editor" introduced="^2" class="placeholder">
-<!-- uncomment when supported
- <meta rel="config">
- <defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
- </meta>
- <unit bldFile="videditor/manualvideoeditor/group"/> -->
-</component>
-<component name="videditor_build" filter="s60" long-name="Video Editor Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videditor/group"/>
-</component>
-</collection>
-<collection name="videoeditorengine" long-name="Video Editor Engine" level="engine">
-<component name="audioeditorengine" filter="s60" long-name="Audio Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/audioeditorengine/group"/>
-</component>
-<component name="avcedit" filter="s60" long-name="AVC Editing" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/avcedit/group"/>
-</component>
-<component name="h263decoder" filter="s60" long-name="H.263 Decoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/h263decoder/group"/>
-</component>
-<component name="mp3aacmaniplib" filter="s60" long-name="MP3 and AAC Manipulation Library" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
-</component>
-<component name="vedtranscoder" filter="s60" long-name="Video Editor Transcoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedtranscoder/group"/>
-</component>
-<component name="vedengine" filter="s60" long-name="Video Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedengine/group"/>
-</component>
-<component name="videoeditorengine_build" filter="s60" long-name="Video Editor Engine Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videoeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
-<collection name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" level="apps">
-<component name="videoplayer_startup_api" long-name="Video Player Startup API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videoplayer_startup_api/group" filter="!test"/>
-</component>
-<component name="video_player_file_details_dialog_api" long-name="Media Player File Details Dialog API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/video_player_file_details_dialog_api/group" filter="!test"/>
-</component>
-<component name="videocollection_api" long-name="Video Collection API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videocollection_api/group"/>
-</component>
-</collection>
-<collection name="videofeeds" long-name="Video Feeds" level="util">
-<component name="iptv_utils" filter="s60" long-name="IPTV Util" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/utils/group"/>
-</component>
-<component name="viewmessageutility" filter="s60" long-name="View Message Utility" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/viewmessageutility/group"/>
-</component>
-<component name="vcxnotifier" filter="s60" long-name="Video Connection Notifier" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/vcxnotifier/group"/>
-</component>
-<component name="vccommon" filter="s60" long-name="Video Connection Common" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/vccommon/group"/>
-</component>
-<component name="clientapi" long-name="Server Client" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/clientapi/group"/>
-</component>
-<component name="provisioningprocessor" long-name="Provisioning Processor" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/provisioningprocessor/group"/>
-</component>
-<component name="mrssplugin" long-name="RSS plugin" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/mrssplugin/group"/>
-</component>
-<component name="videofeeds_server" long-name="Server" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/server/group"/>
-</component>
-<component name="livetvutils" long-name="LiveTV Utils" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/livetvutils/group"/>
-</component>
-<component name="iptvprovisioningrecognizer" long-name="IP TV Provisioning Recognizer" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/provisioningrecognizer/group"/>
-</component>
-<component name="iptvprovisioningappui" long-name="IP TV Provisioning App UI" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/provisioningappui/group"/>
-</component>
-<component name="iptvomaprovisioning" long-name="IP TV OMA Provisioning" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/omaprovisioning/group"/>
-</component>
-<component name="vcnsuiengine" long-name="VoD UI Engine" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/vcnsuiengine/group"/>
-</component>
-<component name="hgvodui" long-name="Ganes UX2.0 VoD UI" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/hgvodui/group"/>
-</component>
-<component name="hgvodplugin" long-name="Ganes UX2.0 VoD UI Plugin" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/hgvodplugin/group"/>
-</component>
-<component name="vcnsscheduleview" long-name="Scheduled Download Settings View" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/vcnsscheduleview/group"/>
-</component>
-<component name="vcnsscheduleplugin" long-name="Scheduled Download Settings Plugin" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videofeeds/vcnsscheduleplugin/group"/>
-</component>
-<component name="scheduleddlplugin" long-name="Scheduled download plugin" filter="s60" introduced="^3">
-<unit bldFile="app/videoplayer/videofeeds/scheduleddlplugin/group"/>
-</component>
-</collection>
-<collection name="videocollection" long-name="Video Collection" level="util">
-<component name="mpxmyvideoscollection" filter="s60" long-name="MPX My Videos Collection" introduced="^3">
-<unit bldFile="app/videoplayer/videocollection/mpxmyvideoscollection/group"/>
-</component>
-<component name="myvideosindicatorplugin" filter="s60" long-name="My Videos Indicator Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videocollection/myvideosindicatorplugin/group"/>
-</component>
-<component name="hgmyvideos" filter="s60" long-name="Huriganes My Videos" introduced="^3">
-<unit bldFile="app/videoplayer/videocollection/hgmyvideos/group"/>
-</component>
-<component name="hgmyvideosplugin" filter="s60" long-name="Huriganes My VideosPlugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videocollection/hgmyvideosplugin/group"/>
-</component>
-</collection>
-<collection name="mediasettings" long-name="Media Settings" level="support">
-<!-- this is really a component. Should be moved down a directory -->
-<component name="mediasettings_build" filter="s60" long-name="Media Settings Build">
-<unit bldFile="app/videoplayer/mediasettings/group"/>
-</component>
-<component name="videoplayer_test" filter="s60" purpose="development" long-name="Video Player Apps Test">
-<!-- can only have one unit. Can thes be #included from the above or another bld.inf?-->
-<unit bldFile="app/videoplayer/tsrc/VCXTestCommon/group"/>
-<unit bldFile="app/videoplayer/tsrc/VCXTestUtilModule/group"/>
-<unit bldFile="app/videoplayer/tsrc/VCXTestMyVideosCollectionClient/group"/>
-<unit bldFile="app/videoplayer/mediasettings/mediasettingsengine/tsrc/mediasettingsenginetest/group"/>
-<unit bldFile="app/videoplayer/mediasettings/videoplayersettingsengine/tsrc/vpsettingsenginetest/group"/>
-</component>
-</collection>
-<collection name="filedetails" long-name="File Details" level="support">
-<component name="filedetailsplugin" filter="s60" long-name="File Details Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/filedetails/filedetailsplugin/group"/>
-</component>
-<component name="filedetailsdialog" filter="s60" long-name="File Details Dialog" introduced="^3">
-<unit bldFile="app/videoplayer/filedetails/filedetailsdialog/group"/>
-</component>
-</collection>
-<collection name="videoplayerapp" long-name="Video Player App" level="apps">
-<component name="lwplayer" long-name="Lightweight Player" filter="s60">
-<unit bldFile="app/videoplayer/videoplayerapp/lwplayer/group"/>
-</component>
-<component name="mpxvideoplayer" filter="s60" long-name="MPX Video Player" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayerapp/mpxvideoplayer/group" filter="!test"/>
-</component>
-</collection>
-<collection name="videoplayback" long-name="Video Playback Plugins" level="plugin">
-<component name="videohelix" long-name="Video Helix" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videohelix/group" filter="!test"/>
-</component>
-<component name="videopdlplaybackviewplugin" filter="s60" long-name="Video PDL Playback View Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videopdlplaybackviewplugin/group" filter="!test"/>
-</component>
-<component name="videoplaybackcontrols" filter="s60" long-name="Video Playback Controls" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videoplaybackcontrols/group" filter="!test"/>
-</component>
-<component name="videoplaybackviewplugin" filter="s60" long-name="Video Playback View Plugin" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videoplaybackviewplugin/group"/>
-</component>
-<component name="videoplaybackviews" filter="s60" long-name="Video Playback Views" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videoplaybackviews/group" filter="!test"/>
-</component>
-</collection>
-</block>
-<block name="photos" level="apps" long-name="Photos" levels="support fw ui app">
-<collection name="photos_plat" long-name="Photos Platform Interfaces" level="app">
-<component name="collection_plugins_api" long-name="Collection Plugins API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/collection_plugins_api/group"/>
-</component>
-<component name="controllers_collection_api" long-name="Controllers Collection API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/controllers_collection_api/group"/>
-</component>
-<component name="gallery_utilities_api" long-name="Gallery Utilities API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/gallery_utilities_api/group"/>
-</component>
-<component name="slideshow_ui_constants_api" long-name="Slideshow Ui Constants API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/slideshow_ui_constants_api/group"/>
-</component>
-<component name="views_metadatadialog_api" long-name="Views Metadata Dialog API" introduced="^2" filter="s60" class="api">
-<unit bldFile="app/photos/photos_plat/views_metadatadialog_api/group"/>
-</component>
-</collection>
-<collection name="photosgallery" long-name="Photos Gallery" level="app">
-<!-- consider splitting this collection into the application itself, and the frameworks behind it -->
-<component name="photosgallery_help" filter="s60" long-name="Photos Help" introduced="^2">
-<unit bldFile="app/photos/photosgallery/help/group"/>
-</component>
-<component name="logging" filter="s60" long-name="Photos Logging" introduced="^2">
-<unit bldFile="app/photos/photosgallery/logging/group"/>
-</component>
-<component name="photosgallery_common" filter="s60" long-name="Photos Common" introduced="^2">
-<unit bldFile="app/photos/photosgallery/common/group"/>
-</component>
-<component name="photosgallery_commonui" filter="s60" long-name="Photos Common UI" introduced="^2">
-<unit bldFile="app/photos/photosgallery/commonui/group"/>
-</component>
-<component name="photosgalleryollectionfw" filter="s60" long-name="Photos Collection Framework" introduced="^2">
-<unit bldFile="app/photos/photosgallery/collectionframework/group"/>
-</component>
-<component name="galleryicons" filter="s60" long-name="Photos Icons" introduced="^2" class="config">
-<unit bldFile="app/photos/photosgallery/icons"/>
-</component>
-<component name="imageviewer" filter="s60" long-name="Image Viewer" introduced="^3">
-<!-- this is really a part of controllers component, #include from there instead -->
-<unit bldFile="app/photos/photosgallery/controllers/imageviewer/group"/>
-</component>
-<component name="photosgalleryviewfw" filter="s60" long-name="View Framework" introduced="^2">
-<unit bldFile="app/photos/photosgallery/viewframework/group"/>
-</component>
-<component name="controllers" filter="s60" long-name="Photos Controllers" introduced="^2">
-<unit bldFile="app/photos/photosgallery/controllers/group"/>
-</component>
-<component name="photogallery" filter="s60" long-name="Media Gallery" introduced="^2">
-<unit bldFile="app/photos/photosgallery/gallery/group"/>
-</component>
-<component name="slideshow" filter="s60" long-name="Slideshow" introduced="^2">
-<unit bldFile="app/photos/photosgallery/slideshow/group"/>
-</component>
-<component name="memoryplugin" long-name="Memory Plugin" filter="s60" introduced="^2" plugin="Y">
-<unit bldFile="app/photos/photosgallery/memoryplugin/group"/>
-</component>
-<component name="imgvwr" filter="s60" long-name="Photos Image Viewer" introduced="^3">
-<unit bldFile="app/photos/photosgallery/imgvwr/group"/>
-</component>
-<component name="photosgallery_build" filter="s60" long-name="Photos Gallery Build" introduced="^2">
-<!-- need to remove the #included above bld.infs from this -->
-<unit bldFile="app/photos/photosgallery/group"/>
-</component>
-</collection>
-</block>
-<block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support hs app">
-<collection name="musicplayer_plat" long-name="Music Player Apps Platform Interfaces" level="app">
-<component name="mpx_music_player_app_api" long-name="MPX Music Player App API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_app_api/group"/>
-</component>
-<component name="mpx_music_player_commonui_api" long-name="MPX Music Player Common UI API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_commonui_api/group"/>
-</component>
-<component name="mpx_music_player_media_key_handler_api" long-name="MPX Music Player Media Key Handler API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_media_key_handler_api/group"/>
-</component>
-<component name="mpx_music_player_remote_control_api" long-name="MPX Music Player Remote Control API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_remote_control_api/group"/>
-</component>
-<component name="mpx_music_shop_ui_api" long-name="MPX Music Shop UI API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_shop_ui_api/group"/>
-</component>
-<component name="mpx_music_wap_adapter_cenrep_api" long-name="MPX Music Wap Adapter CenRep API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_wap_adapter_cenrep_api/group"/>
-</component>
-<component name="mpx_music_store_api" long-name="MPX Music Store Find API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_store_api/group"/>
-</component>
-<component name="audio_application_features_api" long-name="Audio Application Features API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/audio_application_features_api/group"/>
-</component>
-<component name="music_content_publisher_plugin_api" long-name="Music Content Publisher Plugin API" filter="s60" class="api">
-<unit bldFile="app/musicplayer/musicplayer_plat/music_content_publisher_plugin_api/group"/>
-</component>
-</collection>
-<collection name="mpxmusicplayer" long-name="MPX Music Player" level="app">
-<component name="mpxmusicplayer_help" filter="s60" long-name="Help">
-<unit bldFile="app/musicplayer/mpxmusicplayer/help/group"/>
-</component>
-<component name="mpxmusicplayer_commonui" filter="s60" long-name="MPX Common UI">
-<unit bldFile="app/musicplayer/mpxmusicplayer/commonui/group"/>
-</component>
-<component name="mpx_metadatahandler" filter="s60" long-name="MPX Metadata Handler">
-<unit bldFile="app/musicplayer/mpxmusicplayer/metadatahandler/group"/>
-</component>
-<component name="mediakeyhandler" filter="s60" long-name="MPX Media Key Handler">
-<unit bldFile="app/musicplayer/mpxmusicplayer/mediakeyhandler/group"/>
-</component>
-<component name="mpxmusicplayer_app" filter="s60" long-name="MPX Application">
-<unit bldFile="app/musicplayer/mpxmusicplayer/app/group"/>
-</component>
-<component name="mpxmusicplayer_build" filter="s60" long-name="MPX Music Player Build">
-<!-- can the exports be distributed to the above components? -->
-<unit bldFile="app/musicplayer/mpxmusicplayer/group"/>
-</component>
-</collection>
-<collection name="musichomescreen_multiview" long-name="Music Home Screen Multiview" level="hs">
-<!-- Uncomment all units when configuration is in place. All currently #included from musichomescreen_build -->
-<component name="mpxcollectionpublisher" filter="s60" long-name="MPX Collection Publisher" introduced="^2" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/mpxcollectionpublisher/group"/>-->
-</component>
-<component name="musiccontentpublisher" filter="s60" long-name="Music Content Publisher" introduced="^2" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/musiccontentpublisher/group"/>-->
-</component>
-<component name="mcpmusicplayer" filter="s60" long-name="Music Player MCP Plugin" introduced="^2" plugin="Y" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/mcpmusicplayer/group"/>-->
-</component>
-<component name="musicplayeractionhandlerplugin" filter="s60" long-name="Music Player Action Handler Plugin" introduced="^2" plugin="Y" class="placeholder">
-<!--<unit bldFile="musichomescreen_multiview/musicplayeractionhandlerplugin/group"/>-->
-</component>
-<component name="mpx_data" filter="s60" long-name="MPX Data" introduced="^2" class="placeholder">
-<!-- does this make sense to be a component? should it just be #include from musichomescreen_multiview/group? -->
-<!--<unit bldFile="musichomescreen_multiview/data/themes/default/group"/>-->
-</component>
-<component name="musichomescreen_build" filter="s60" long-name="Music Homescreen Multiview Build" introduced="^2">
-<unit bldFile="app/musicplayer/musichomescreen_multiview/group"/>
-</component>
-</collection>
-<collection name="mpxplugins" long-name="MPX Plugins" level="plugins">
-<component name="serviceplugins" filter="s60" long-name="MPX Service Plugins" plugin="Y">
-<unit bldFile="app/musicplayer/mpxplugins/serviceplugins/group"/>
-</component>
-<component name="viewplugins" filter="s60" long-name="MPX View Plugins" plugin="Y">
-<unit bldFile="app/musicplayer/mpxplugins/viewplugins/group"/>
-</component>
-<component name="mpxplugins_build" filter="s60" long-name="MPX Plugins Build">
-<!-- can the exports be distributed to the above components? -->
-<unit bldFile="app/musicplayer/mpxplugins/group"/>
-</component>
-</collection>
-<collection name="musicplayer_info" long-name="Music Player Apps Info" level="app">
-<component name="musicplayer_build" filter="s60" long-name="Music Player Build">
-<!-- should explicitly #inlcude musicplayerbldvariant.hrh in each component -->
-<unit bldFile="app/musicplayer/group"/>
-</component>
-</collection>
-</block>
-<block name="radio" level="apps" long-name="Radio Apps" levels="engine ui">
-<collection name="fmradio" long-name="FM Radio" level="ui">
-<component name="activeidleengine" filter="s60" long-name="FM Radio Active Idle Engine">
-<unit bldFile="app/radio/fmradio/activeidleengine/group"/>
-</component>
-<component name="fmradioengine" filter="s60" long-name="FM Radio Engine">
-<unit bldFile="app/radio/fmradio/fmradioengine/group"/>
-</component>
-<component name="fmradioactionhandler" filter="s60" long-name="FM Radio Action Handler" plugin="Y">
-<unit bldFile="app/radio/fmradio/fmradioactionhandler/group"/>
-</component>
-<component name="fmradiomcpplugin" filter="s60" long-name="FM Radio Content Publisher Plugin" plugin="Y">
-<unit bldFile="app/radio/fmradio/fmradiomcpplugin/group"/>
-</component>
-<component name="fmradio_build" filter="s60" long-name="FM Radio Build">
-<unit bldFile="app/radio/fmradio/fmradio/group"/>
-</component>
-<component name="fmradio_help" filter="s60" long-name="FM Radio Help">
-<unit bldFile="app/radio/fmradio/help/group"/>
-</component>
-<component name="fmradio_build" filter="s60" long-name="FM Radio ROM">
-<!-- remove above #included bld.infs -->
-<unit bldFile="app/radio/fmradio/group"/>
-</component>
-</collection>
-</block>
-<block name="internetradio" level="apps" long-name="Internet Radio Apps"/>
-<block name="tv" level="services" long-name="TV Apps"/>
-<block name="voicerec" level="apps" long-name="Voice Recorder Apps">
-<!-- custom filter pref_test-->
-<collection name="voicerec_plat" long-name="Voice Recorder Apps Platform Interfaces">
-<component name="new_file_service_api" long-name="New File Service API" filter="s60" class="api">
-<unit bldFile="app/voicerec/voicerec_plat/new_file_service_api/group"/>
-</component>
-<component name="voicerecorder_public_constants_api" long-name="Voice Recorder Public Constants API" filter="s60" class="api">
-<unit bldFile="app/voicerec/voicerec_plat/voicerecorder_public_constants_api/group"/>
-</component>
-</collection>
-<collection name="voicerecorder" long-name="Voice Recorder">
-<!--this is really a component, move down a directory -->
-<component name="voicerecorder_build" filter="s60" long-name="Voice Recorder Build">
-<unit bldFile="app/voicerec/voicerecorder/group"/>
-</component>
-</collection>
-<collection name="voicerec_info" long-name="Voice Recorder Apps Info"/>
-</block>
-<block name="screensaver" level="apps" long-name="Screen Saver Apps" levels="plugin ui">
-<!-- is this a user-facing application or a daemon? -->
-<!-- units need to be commented out until configuration is in place. They are currently #included from screensaver_build-->
-<collection name="scrsaver" long-name="Screen Saver" level="plugin">
-<component name="scrsaverplugins" filter="s60" long-name="Screen Saver Plugins" plugin="Y">
-<!-- must have only one component. #include from a common bld.inf, or move up a directory and make scrsaverplugins a collection -->
-<!--<unit bldFile="scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/"/>
- <unit bldFile="scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/group/"/>-->
-</component>
-<component name="scrsaver_slideshowplugin" filter="s60" long-name="Screen Saver Slideshow Plugin" plugin="Y">
-<!--<unit bldFile="scrsaver/scrsaverplugins/SlideshowPlugin/group"/> -->
-</component>
-<component name="screensaveraiwplugin" filter="s60" long-name="Screen Saver AIW Plugin" plugin="Y">
-<!-- <unit bldFile="scrsaver/screensaveraiwplugin/group"/>-->
-</component>
-</collection>
-<collection name="screensaver_info" long-name="Screen Saver Apps Info" level="ui">
-<component name="screensaver_build" filter="s60" long-name="Screen Saver Application">
-<!--the app should be a separate component -->
-<unit bldFile="app/screensaver/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreen" level="apps" long-name="Home Screen Apps" levels="fw support apps">
-<collection name="homescreen_plat" long-name="Home Screen Apps Platform Interfaces" level="apps">
-<component name="menu_settings_api" long-name="Menu Settings API" filter="s60" class="api">
-<unit bldFile="app/homescreen/homescreen_plat/menu_settings_api/group"/>
-</component>
-<component name="hs_content_control_ui" long-name="HS Content Control Ui" filter="s60" class="api">
-<unit bldFile="app/homescreen/homescreen_plat/hs_content_control_ui/group"/>
-</component>
-<component name="hs_renderingplugin_api" long-name="HS Rendering Plugin API" filter="s60" class="api">
-<unit bldFile="app/homescreen/homescreen_plat/hs_renderingplugin_api/group"/>
-</component>
-</collection>
-<collection name="idlehomescreen" long-name="Idle Home Screen" level="apps">
-<component name="nativeuicontroller" filter="s60" long-name="Native UI Controller">
-<unit bldFile="app/homescreen/idlehomescreen/nativeuicontroller/group"/>
-</component>
-<component name="exths" filter="s60" long-name="Active Idle Container" plugin="Y">
-<!-- why is the ID so different from the name? Is one wrong? -->
-<unit bldFile="app/homescreen/idlehomescreen/exths/group"/>
-</component>
-<component name="hscontentcontrol" filter="s60" long-name="Home Screen Content Control" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/hscontentcontrol/group"/>
-</component>
-<component name="hssapiwrapper" filter="s60" long-name="HS SAPI Wrapper" introduced="^3">
-<!-- can only have one unit. #include from a common bld.inf, or split into two components -->
-<unit bldFile="app/homescreen/idlehomescreen/sapiwrapper/cpswrapper/group"/>
-<unit bldFile="app/homescreen/idlehomescreen/sapiwrapper/hspswrapper/group"/>
-</component>
-<component name="xmluirendering" filter="s60" long-name="XML UI Rendering" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/xmluirendering/group"/>
-</component>
-<component name="xmluicontroller" filter="s60" long-name="XML UI Controller" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/xmluicontroller/group"/>
-</component>
-<component name="widgetmanager" filter="s60" long-name="Widget Manager" introduced="^3">
-<unit bldFile="app/homescreen/idlehomescreen/widgetmanager/group"/>
-</component>
-<component name="idlehomescreen_help" filter="s60" long-name="Idle Home Screen Help">
-<unit bldFile="app/homescreen/idlehomescreen/help/group"/>
-</component>
-<component name="idlehomescreen_data" filter="s60" long-name="Idle Home Screen Data">
-<unit bldFile="app/homescreen/idlehomescreen/data/group"/>
-</component>
-<component name="idlehomescreen_build" filter="s60" long-name="Idle Home Screen Build">
-<!-- can the loc file be moved to another comopnent and this one removed? -->
-<unit bldFile="app/homescreen/idlehomescreen/group"/>
-</component>
-</collection>
-<collection name="menufw" long-name="Menu Framework" level="fw">
-<component name="hierarchynavigator" filter="s60" long-name="Hierarchy Navigator">
-<unit bldFile="app/homescreen/menufw/hierarchynavigator/group"/>
-</component>
-<component name="menufwui" filter="s60" long-name="Menu Framework UI">
-<unit bldFile="app/homescreen/menufw/menufwui/group"/>
-</component>
-<component name="menusuites" filter="s60" long-name="Menu Suites">
-<unit bldFile="app/homescreen/menufw/menusuites/group"/>
-</component>
-<component name="menufw_build" filter="s60" long-name="Menu Framework Build">
-<!-- can the exports be exported by the other components? -->
-<unit bldFile="app/homescreen/menufw/group"/>
-</component>
-</collection>
-<collection name="taskswitcher" long-name="Task Switcher" level="support">
-<component name="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">
-<unit bldFile="app/homescreen/taskswitcher/taskswitcherui/group"/>
-</component>
-</collection>
-</block>
-<block name="graphicsuis" level="services" long-name="Graphics UIs" levels="util ui">
-<collection name="graphicsuis_plat" long-name="Graphics UIs Platform Interfaces" level="ui">
-<component name="svgt_viewer_ui_api" long-name="SVG-T Viewer UI API" filter="s60" class="api">
-<unit bldFile="app/graphicsuis/graphicsuis_plat/svgt_viewer_ui_api/group"/>
-</component>
-<component name="svg_application_observer_utility_api" long-name="SVG Application Observer Utility API" filter="s60" class="api">
-<unit bldFile="app/graphicsuis/graphicsuis_plat/svg_application_observer_utility_api/group"/>
-</component>
-<component name="svgt_file_view_details_dialog_api" long-name="SVG-T File View Details Dialog API" filter="s60" class="api">
-<unit bldFile="app/graphicsuis/graphicsuis_plat/svgt_file_view_details_dialog_api/group"/>
-</component>
-</collection>
-<collection name="svgtviewer" long-name="SVG-T Viewer" level="ui">
-<component name="svgtviewerplugin" filter="s60" long-name="SVG-T Viewer Plugin">
-<unit bldFile="app/graphicsuis/svgtviewer/svgtviewerplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="profile" level="apps" long-name="Profiles" levels="app">
-<collection name="profile_plat" long-name="Profiles Platform Interfaces" level="app">
-<component name="profiles_settings_view_api" long-name="Profiles Settings View API" filter="s60" class="api">
-<unit bldFile="app/profile/profile_plat/profiles_settings_view_api/group"/>
-</component>
-</collection>
-<collection name="profilesapplication" long-name="Profiles Application" level="app">
-<component name="profiles" filter="s60" long-name="Profiles">
-<unit bldFile="app/profile/profilesapplication/profiles/group"/>
-</component>
-</collection>
-<collection name="profile_info" long-name="Profiles Info" level="app">
-<component name="profile_help" filter="s60" long-name="Profiles Help">
-<unit bldFile="app/profile/help/group"/>
-</component>
-</collection>
-</block>
-<block name="speechsrv" level="services" long-name="Speech Recognition UIs" levels="engine framework ui">
-<collection name="speechsrv_plat" long-name="Speech Recognition UIs Platform Interfaces" level="ui">
-<component name="vas_api" long-name="VAS API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vas_api/group"/>
-</component>
-<component name="nss_devasr_api" long-name="NSS DevASR API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_devasr_api/group"/>
-</component>
-<component name="tts_hw_device_api" long-name="TTS HW Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/tts_hw_device_api/group"/>
-</component>
-<component name="voice_commands_resource_header_api" long-name="Voice Commands Resource Header API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/voice_commands_resource_header_api/group"/>
-</component>
-<component name="nss_mmf_tts_custom_commands_api" long-name="NSS MMF TTS Custom Commands API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_mmf_tts_custom_commands_api/group"/>
-</component>
-<component name="srsf_cenrep_settings_api" long-name="SRSF CenRep Settings API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/srsf_cenrep_settings_api/group"/>
-</component>
-<component name="voice_ui_plugin_api" long-name="Voice UI Plug-in API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/voice_ui_plugin_api/group"/>
-</component>
-<component name="nss_tts_utility_api" long-name="NSS TTS Utility API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_tts_utility_api/group"/>
-</component>
-<component name="nss_srs_custom_commands_api" long-name="NSS SRS Custom Commands API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_srs_custom_commands_api/group"/>
-</component>
-<component name="srsf_secondarydisplay_api" long-name="SRSF Secondary Display API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/srsf_secondarydisplay_api/group"/>
-</component>
-<component name="asrs_hw_device_api" long-name="ASRS Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/asrs_hw_device_api/group"/>
-</component>
-<component name="vas_vcommand_api" long-name="VAS Voice Command API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vas_vcommand_api/group"/>
-</component>
-<component name="adaptation_hw_device_api" long-name="Adaptation Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/adaptation_hw_device_api/group"/>
-</component>
-<component name="nss_devtts_api" long-name="NSS DevTTS API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_devtts_api/group"/>
-</component>
-<component name="nss_srs_utility_api" long-name="NSS SRS Utility API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_srs_utility_api/group"/>
-</component>
-<component name="recognition_hw_device_api" long-name="Recognition Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/recognition_hw_device_api/group"/>
-</component>
-<component name="vas_contact_handler_api" long-name="VAS Contact Handler API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vas_contact_handler_api/group"/>
-</component>
-<component name="nlp_hw_device" long-name="NLP Hardware Device" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nlp_hw_device/group"/>
-</component>
-<component name="nss_si_speech_recognition_data_api" long-name="NSS SI Speech Recognition Data API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_si_speech_recognition_data_api/group"/>
-</component>
-<component name="nss_tts_common_api" long-name="NSS TTS Common API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/nss_tts_common_api/group"/>
-</component>
-<component name="grcompiler_hw_device_api" long-name="Grammar Compiler Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/grcompiler_hw_device_api/group"/>
-</component>
-<component name="ttp_hw_device_api" long-name="TTP Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/ttp_hw_device_api/group"/>
-</component>
-<component name="vocman_hw_device_api" long-name="VocMan Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vocman_hw_device_api/group"/>
-</component>
-<component name="speech_synthesis_clientserver_api" long-name="Speech Synthesis Client-Server API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/speech_synthesis_clientserver_api/group"/>
-</component>
-<component name="voice_ui_accessory_button_handling_api" long-name="Voice UI Accessory Button Handling API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/voice_ui_accessory_button_handling_api/group"/>
-</component>
-<component name="ui_voice_recognition_api" long-name="UI Voice Recognition API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/ui_voice_recognition_api/group"/>
-</component>
-<component name="vcommand_settings_cenrep_api" long-name="Voice Command Settings CenRep API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/vcommand_settings_cenrep_api/group"/>
-</component>
-</collection>
-<collection name="voiceui" long-name="Voice UI" level="ui">
-<component name="vcommand" filter="s60" long-name="Voice Commands UI" introduced="^1">
-<unit bldFile="app/speechsrv/voiceui/vcommand/group"/>
-</component>
-<component name="voiceuivoicerecognition" filter="s60" long-name="Voice UI Recognition" introduced="^1">
-<unit bldFile="app/speechsrv/voiceui/voiceuivoicerecognition/group"/>
-</component>
-<component name="pbkinfoviewimpl" filter="s60" long-name="Phonebook Info View Implementation" introduced="^1">
-<unit bldFile="app/speechsrv/voiceui/pbkinfoviewimpl/group"/>
-</component>
-<component name="aiwpbkinfoviewprovider" filter="s60" long-name="AIW Phonebook Info View Provider" introduced="^1" plugin="Y">
-<unit bldFile="app/speechsrv/voiceui/aiwpbkinfoviewprovider/group"/>
-</component>
-<component name="vccontrolpanelplugin" filter="s60" long-name="Voice Commands Control Panel Plugin" introduced="^1" plugin="Y">
-<!-- component is commented out until configuration is in place. Currently #included from voiceui_build -->
-<!--<unit bldFile="voiceui/vccontrolpanelplugin/group"/>-->
-</component>
-<component name="voiceui_build" filter="s60" long-name="Voice UI Build" introduced="^1">
-<!-- can this be put into the other components? -->
-<unit bldFile="app/speechsrv/voiceui/group"/>
-</component>
-</collection>
-<collection name="srsf" long-name="Speech Recognition and Synthesis Framework" level="framework">
-<component name="sispeechrecognitiondata" filter="s60" long-name="SI Speech Recognition Data">
-<unit bldFile="app/speechsrv/srsf/sispeechrecognitiondata/group"/>
-</component>
-<component name="ttscommon" filter="s60" long-name="TTS Common">
-<unit bldFile="app/speechsrv/srsf/ttscommon/group"/>
-</component>
-<component name="devtts" filter="s60" long-name="Text to Speech">
-<unit bldFile="app/speechsrv/srsf/devtts/group"/>
-</component>
-<component name="ttscustomcommands" filter="s60" long-name="TTS Custom Commands">
-<unit bldFile="app/speechsrv/srsf/ttscustomcommands/group"/>
-</component>
-<component name="ttscontrollerplugin" filter="s60" long-name="TTS Controller Plugin" plugin="Y">
-<unit bldFile="app/speechsrv/srsf/ttscontrollerplugin/group"/>
-</component>
-<component name="ttsutility" filter="s60" long-name="TTS Utility">
-<unit bldFile="app/speechsrv/srsf/ttsutility/group"/>
-</component>
-<component name="speechsynthesis" filter="s60" long-name="Speech Synthesis">
-<!-- can only have one unit. #include these from a common bld.inf -->
-<unit bldFile="app/speechsrv/srsf/speechsynthesis/client/group"/>
-<unit bldFile="app/speechsrv/srsf/speechsynthesis/server/group"/>
-</component>
-<component name="devasr" filter="s60" long-name="Audio Recording and Speech Recognition">
-<unit bldFile="app/speechsrv/srsf/devasr/group"/>
-</component>
-<component name="sicc" filter="s60" long-name="Speaker Independent Custom Commands">
-<unit bldFile="app/speechsrv/srsf/sicc/group"/>
-</component>
-<component name="sisrscontrollerplugin" filter="s60" long-name="SI SRS Controller Plugin" plugin="Y">
-<unit bldFile="app/speechsrv/srsf/sisrscontrollerplugin/group"/>
-</component>
-<component name="siutility" filter="s60" long-name="Speaker Independent Utility">
-<unit bldFile="app/speechsrv/srsf/siutility/group"/>
-</component>
-<component name="nssvasapi" filter="s60" long-name="NSS VAS API">
-<unit bldFile="app/speechsrv/srsf/nssvasapi/group"/>
-</component>
-<component name="nssvascontacthdlr" filter="s60" long-name="NSS VAS Contact Handler">
-<unit bldFile="app/speechsrv/srsf/nssvascontacthdlr/group"/>
-</component>
-<component name="vcommandhandler" filter="s60" long-name="Voice Command Handler">
-<unit bldFile="app/speechsrv/srsf/vcommandhandler/group"/>
-</component>
-<component name="vuiphandler" filter="s60" long-name="Voice UI Plugin Handler">
-<unit bldFile="app/speechsrv/srsf/vuiphandler/group"/>
-</component>
-<component name="vcommandexecutor" filter="s60" long-name="Voice Command Executor">
-<unit bldFile="app/speechsrv/srsf/vcommandexecutor/group"/>
-</component>
-<component name="vcommandexecutorbearer" filter="s60" long-name="Voice Command Executor Bearer">
-<unit bldFile="app/speechsrv/srsf/vcommandexecutorbearer/group"/>
-</component>
-<component name="vcommandmanager" filter="s60" long-name="Voice Command Manager">
-<unit bldFile="app/speechsrv/srsf/vcommandmanager/group"/>
-</component>
-<component name="vcexecutorapp" filter="s60" long-name="Voice Command Executor Application">
-<unit bldFile="app/speechsrv/srsf/vcexecutorapp/group"/>
-</component>
-<component name="profileobserverplugin" filter="s60" long-name="Profile Observer Plugin" plugin="Y">
-<unit bldFile="app/speechsrv/srsf/profileobserverplugin/group"/>
-</component>
-<component name="srsf_build" filter="s60" long-name="Speech Recognition and Synthesis Framework Build">
-<!-- should distribute this into the above components -->
-<unit bldFile="app/speechsrv/srsf/group"/>
-</component>
-</collection>
-<collection name="speechsrv_info" long-name="Speech Recognition UIs Info" level="ui"/>
-</block>
-<block name="homescreentools" level="services" long-name="Home Screen Tools" levels="tool install">
-<collection name="dtdinstaller" long-name="DTD Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<!-- this needs to be built first, does build order need to be forced with filters? -->
-<component name="dtdinstaller_build" filter="s60" long-name="DTD Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/dtdinstaller/group"/>
-</component>
-</collection>
-<collection name="themeinstaller" long-name="Theme Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="themeinstaller_build" filter="s60" long-name="Theme Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/themeinstaller/group"/>
-</component>
-</collection>
-<collection name="widgettools" long-name="Widget Tools" level="install">
-<component name="hspluginpreinstaller" filter="s60" long-name="HS Plugin Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/hspluginspreinstaller/group"/>
-</component>
-<component name="wrtwidgetpreinstaller" filter="s60" long-name="WRT Widget Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
-</component>
-</collection>
-</block>
-<block name="webuis" level="services" long-name="Web UIs" levels="plugin app">
-<collection name="browserui" long-name="Browser UI" level="app">
-<component name="browser" filter="s60" long-name="Browser">
-<unit bldFile="app/webuis/browserui/browser/group"/>
-</component>
-<component name="operatormenu" filter="s60" long-name="Browser Operator Menu">
-<unit bldFile="app/webuis/browserui/operatormenu/group"/>
-</component>
-<component name="videoservices" filter="s60" long-name="Browser Video Services">
-<unit bldFile="app/webuis/browserui/videoservices/group"/>
-</component>
-</collection>
-<collection name="browserplugins" long-name="Browser Plugins" level="plugin">
-<component name="browsersysteminfoplugin" filter="s60" long-name="Browser System Info Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsersysteminfoplugin/group"/>-->
-</component>
-<component name="browsergpsplugin" filter="s60" long-name="Browser GPS Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsergpsplugin/group"/>-->
-</component>
-<component name="browseraudiovideoplugin" filter="s60" long-name="Browser Audio Video Plugin" plugin="Y">
-<unit bldFile="app/webuis/browserplugins/browseraudiovideoplugin/group"/>
-</component>
-<component name="browserplugins_build" filter="s60" long-name="Browser Plugins Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="app/webuis/browserplugins/group"/>
-</component>
-</collection>
-<collection name="pushmtm" long-name="Push MTM" level="plugin">
-<component name="pushmtm_help" filter="s60" long-name="Push MTM Help">
-<unit bldFile="app/webuis/pushmtm/help/group"/>
-</component>
-<component name="plugins" filter="s60" long-name="Push MTM Plugins" plugin="Y">
-<unit bldFile="app/webuis/pushmtm/plugins/group"/>
-</component>
-<component name="pushmtm_build" filter="s60" long-name="Push MTM Build">
-<!-- Some content is at collection level and some is at comopnent level. Either make this a single
- component and move it down a diretcory, or make separate independent components in this collection -->
-<unit bldFile="app/webuis/pushmtm/group"/>
-</component>
-</collection>
-</block>
-<block name="jrt" level="services" long-name="Java Runtime" levels="util generic rt ui">
-<collection name="jrt_plat" long-name="JRT Platform Interfaces" level="ui">
-<component name="java_registry_api" long-name="Java Registry API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_registry_api/build"/>
-</component>
-<component name="java_env_info_api" long-name="Java Environment Info API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_env_info_api/build"/>
-</component>
-<component name="java_debug_api" long-name="Java Debug API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_debug_api/build"/>
-</component>
-</collection>
-<collection name="java_stubs" long-name="Java Stubs" level="util">
-<component name="java_stubs_build" filter="s60" long-name="JRT Stubs Build">
-<unit bldFile="app/jrt/java_stubs/group"/>
-</component>
-</collection>
-</block>
-<block name="conntools" level="services" long-name="Connectivity Tools" levels="config app">
-<collection name="nettools" long-name="Net Tools" level="app">
-<component name="conntest" filter="s60" long-name="Connection Test" purpose="development">
-<unit bldFile="app/conntools/nettools/conntest/group"/>
-</component>
-</collection>
-<collection name="emulatorlan" long-name="Emulator LAN" level="config">
-<!-- component is actually a colleciton, should be moved down a directory -->
-<component name="emulatorlan_build" filter="s60" long-name="Emulator LAN Build" purpose="development" class="config">
-<unit bldFile="app/conntools/emulatorlan/group"/>
-</component>
-</collection>
-</block>
-<block name="rndtools" level="services"/>
-<block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools if ui">
-<collection name="csxhelp" long-name="Context Sensitive Extended Help" level="if">
-<!-- this is really a component. Should move it down a directory -->
-<component name="csxhelp_build" filter="s60" long-name="Context Sensitive Extended Help Build">
-<unit bldFile="app/helps/csxhelp/group"/>
-</component>
-</collection>
-<collection name="symhelp" long-name="Symbian Help" level="eng">
-<component name="helpmodel" long-name="Help" introduced="6.0" purpose="optional">
-<unit bldFile="app/helps/symhelp/helpmodel/group" mrp="app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
-</component>
-</collection>
-<collection name="helps_info" long-name="Help Apps Info" level="ui">
-<component name="helps_metadata" long-name="Help Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/helps/helps_info/helps_metadata/helps_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
-<collection name="buildverification" long-name="Build Verification" level="services">
-<component name="autosmoketest" long-name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
-<unit bldFile="app/techview/buildverification/autosmoketest/Group" mrp="app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
-</component>
-<component name="smoketest" long-name="Smoke Test" filter="gt" purpose="development">
-<unit bldFile="app/techview/buildverification/smoketest/Group" mrp="app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
-</component>
-</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="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"/>
-<collection name="installationapps" long-name="Installation Apps" level="apps2"/>
-<collection name="messagingapps" long-name="Messaging Apps" level="apps2"/>
-<collection name="telephonyapps" long-name="Telephony Apps" level="apps1"/>
-<collection name="networkingapps" long-name="Networking Apps" level="apps1"/>
-<collection name="networkingutils" long-name="Networking Utils" level="utils"/>
-<collection name="shortlinkapps" long-name="Shortlink Apps" level="apps1"/>
-<collection name="testapps" long-name="Test Apps" level="utils"/>
-<collection name="avapps" long-name="A/V Apps" level="apps3"/>
-<collection name="toolkit" long-name="Toolkit" level="utils"/>
-<collection name="techview_info" long-name="Techview Info" level="apps3">
-<component name="techview_metadata" long-name="Techview Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/techview/techview_info/techview_metadata/techview_metadata.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/single/sysdefs/auto/system_model.xml Tue Jul 13 12:21:44 2010 +0100
@@ -0,0 +1,10715 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+<systemModel>
+<layer name="adaptation" long-name="Adaptation" levels="low mw high">
+<block name="stubs" level="high" long-name="Stubs" levels="stub">
+<collection name="s60_stubs" level="stub">
+<component name="audiostubs" long-name="Audio Stubs">
+<unit bldFile="adaptation/stubs/audiostubs/group"/>
+</component>
+<component name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaptation Stub">
+<unit bldFile="adaptation/stubs/btaudioadaptation_stub/group"/>
+</component>
+<component name="drm_stubs" long-name="DRM Stubs">
+<unit bldFile="adaptation/stubs/drm_stubs/group"/>
+</component>
+<component name="ocrsrv_stub" long-name="OCR Services Stub">
+<unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
+</component>
+<component name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation">
+<unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
+</component>
+<component name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" plugin="Y">
+<unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
+</component>
+<component name="srsfenginestub" long-name="SRSF Engine Stub">
+<unit bldFile="adaptation/stubs/srsfenginestub/group"/>
+</component>
+<component name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub">
+<unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
+</component>
+<component name="systemswstubs" long-name="System Software Stubs">
+<unit bldFile="adaptation/stubs/systemswstubs/group"/>
+</component>
+<component name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" plugin="Y">
+<unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
+</component>
+<component name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub">
+<unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
+</component>
+</collection>
+</block>
+<block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
+<collection name="omap3530" long-name="OMAP 3530" level="hw-if">
+<component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
+<unit bldFile="adaptation/beagleboard/omap3530" mrp="adaptation/beagleboard/omap3530/base_beagle.mrp"/>
+</component>
+<component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
+<unit bldFile="adaptation/beagleboard/omap3530/kernel"/>
+</component>
+<component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
+<unit bldFile="adaptation/beagleboard/omap3530/beagleboard"/>
+</component>
+</collection>
+</block>
+<block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
+<collection name="qemu_baseport" long-name="Baseport" level="hw-if">
+<component name="syborg" long-name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
+<unit bldFile="adaptation/qemu/baseport/syborg" mrp="adaptation/qemu/baseport/syborg/syborg.mrp"/>
+</component>
+</collection>
+</block>
+</layer>
+<layer name="os" long-name="OS" levels="hw services">
+<block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
+<collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
+<component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
+<unit mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
+</component>
+</collection>
+<collection name="bsptemplate" long-name="Board Support Package Template" level="hw-if">
+<component name="asspandvariant" long-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 name="kernel" long-name="Kernel Architecture" level="adaptation">
+<component name="eka" long-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 name="kerneltest" long-name="Kernel Test" level="hw-if">
+<component name="e32utils" long-name="E32 Utilities" purpose="development">
+<unit bldFile="os/kernelhwsrv/kerneltest/e32utils/group" mrp="os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/>
+</component>
+<component name="e32test" long-name="E32 Tests" purpose="development">
+<unit bldFile="os/kernelhwsrv/kerneltest/e32test/group" mrp="os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
+</component>
+<component name="f32test" long-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 name="ldds" long-name="Logical Device Drivers" level="adaptation">
+<component name="ethernetldd" long-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 name="audioldd" long-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>
+<component name="serialldd" long-name="Serial Port Drivers" purpose="optional">
+<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
+</component>
+<component name="legacydrivers" long-name="Legacy Drivers" purpose="optional">
+<unit mrp="os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
+</component>
+<component name="locmedia" long-name="Local Media Subsystem" introduced="8.1b" purpose="mandatory">
+<!-- these are LDDs for storage media-->
+<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
+</component>
+<component name="runmodedebugger" long-name="Run Mode Debugger" purpose="mandatory">
+<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/debug/group" mrp="os/kernelhwsrv/kernel/eka/drivers/debug/group/base_e32_drivers_debug.mrp"/>
+</component>
+<component name="btrace" long-name="Kernel Trace Tool" purpose="mandatory">
+<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/trace" mrp="os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
+</component>
+<component name="cameraldd" long-name="Camera Drivers" introduced="^3" purpose="optional">
+<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/camerasc" mrp="os/kernelhwsrv/kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
+</component>
+<component name="displayldd" long-name="Display Drivers" introduced="^3" purpose="optional">
+<!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
+<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/display" mrp="os/kernelhwsrv/kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
+</component>
+<component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b" purpose="optional">
+<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
+</component>
+<component name="usbdescriptors" long-name="USB Descriptors" purpose="optional">
+<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors" mrp="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors/base_drivers_usbdescriptors.mrp"/>
+</component>
+<component name="usbdi_utils" long-name="USB DI Utils" purpose="optional">
+<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils" mrp="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils/base_drivers_usbdi_utils.mrp"/>
+</component>
+</collection>
+<collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
+<component name="mediadrivers" long-name="Media Drivers" purpose="optional">
+<!-- these are for storage media-->
+<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/media" mrp="os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
+</component>
+<component name="genericboardsupport" long-name="Generic Board Support" purpose="optional">
+<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
+</component>
+</collection>
+<collection name="userlibandfileserver" long-name="User Library and File Server" level="framework">
+<component name="euser" long-name="User Library" purpose="mandatory">
+<unit bldFile="os/kernelhwsrv/kernel/eka/euser" mrp="os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
+</component>
+<component name="compsupp" long-name="Compiler Runtime Support" filter="gt" purpose="mandatory">
+<unit bldFile="os/kernelhwsrv/kernel/eka/compsupp" mrp="os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
+</component>
+<component name="fileserver" long-name="File Server" filter="gt" purpose="mandatory">
+<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
+</component>
+<component name="estart" long-name="Base Starter" filter="gt" purpose="optional">
+<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
+</component>
+<component name="domainmgr" long-name="Domain Manager" introduced="8.1b" purpose="mandatory">
+<unit bldFile="os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
+</component>
+</collection>
+<collection name="filesystems" long-name="File Systems" level="framework">
+<component name="romfs" long-name="ROM File System" filter="gt" purpose="optional" plugin="Y">
+<unit mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
+</component>
+<component name="rofs" long-name="ROFS" filter="gt" purpose="optional" plugin="Y">
+<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
+</component>
+<component name="usbmsfs" long-name="USB Mass Storage File System" filter="gt" purpose="optional" plugin="Y">
+<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
+</component>
+<component name="usbhostmssrv" long-name="USB Host Mass Storage Server" filter="gt" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage/base_f32_shostmassstorage.mrp"/>
+</component>
+<component name="fat32fs" long-name="FAT32 File System" filter="gt" purpose="optional" plugin="Y">
+<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
+</component>
+<component name="fatfs" long-name="FAT File System" filter="gt" purpose="optional" plugin="Y">
+<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
+</component>
+<component name="compfs" long-name="Composite File System" filter="gt" purpose="optional" plugin="Y">
+<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
+</component>
+</collection>
+<collection name="halservices" long-name="HAL Services" level="framework">
+<component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
+<unit bldFile="os/kernelhwsrv/halservices/hal" mrp="os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
+</component>
+</collection>
+<collection name="textmodeshell" long-name="Text Mode Shell" level="test">
+<component name="e32wsrv" long-name="Text Window Server" purpose="optional">
+<unit bldFile="os/kernelhwsrv/kernel/eka/ewsrv" mrp="os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
+</component>
+<component name="textshell" long-name="Text Shell" filter="gt" purpose="development">
+<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
+</component>
+</collection>
+<collection name="baseapitest" long-name="Base API Tests" level="test"/>
+<collection name="kernelhwsrv_info" long-name="Kernel and Hardware Services Info" level="test">
+<component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 config">
+<collection name="emulator" long-name="Emulator" level="bsp">
+<component name="emulatorbsp" long-name="Emulator BSP" purpose="optional">
+<unit bldFile="os/boardsupport/emulator/emulatorbsp" mrp="os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
+</component>
+</collection>
+<collection name="haitest" long-name="HAI Test Suites" level="test">
+<component name="bspsvs" long-name="BSP Verification Suite" introduced="^2" purpose="development">
+<unit mrp="os/boardsupport/haitest/bspsvs/group/bspsvs.mrp"/>
+</component>
+</collection>
+<collection name="boardsupport_info" long-name="Board Support Info" level="config">
+<component name="boardsupport_metadata" long-name="Board Support Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/boardsupport/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
+<collection name="bldsystemtools" long-name="Build System Tools" level="bld">
+<component name="sysdeftools" long-name="System Definition Tools" purpose="development" introduced="^2">
+<unit mrp="os/buildtools/bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
+</component>
+<component name="commonbldutils" long-name="Common Utils" purpose="development">
+<unit mrp="os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
+</component>
+</collection>
+<collection name="toolsandutils" long-name="Tools and Utils" level="mw">
+<component name="productionbldtools" long-name="Production Build Tools" filter="gt" purpose="development">
+<unit mrp="os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
+</component>
+<component name="e32tools" long-name="E32 Tools" deprecated="^2" purpose="development" class="PC">
+<unit bldFile="os/buildtools/toolsandutils/e32tools/group" mrp="os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
+</component>
+<component name="autotest" long-name="Autotest" purpose="development">
+<unit bldFile="os/buildtools/toolsandutils/autotest/group" mrp="os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
+</component>
+</collection>
+<collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
+<component name="e32toolp" long-name="E32 Perl Tools" purpose="development" filter="sf_build" class="PC">
+<unit mrp="os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="os/buildtools/sbsv1_os/e32toolp/group"/>
+</component>
+</collection>
+<collection name="imgtools_os" long-name="Image Tools" level="fw">
+<component name="romkiteka2" long-name="ROMKIT EKA2" deprecated="^2" purpose="development">
+<unit bldFile="os/buildtools/imgtools_os/romkiteka2/group" mrp="os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
+</component>
+</collection>
+<collection name="misccomponents" long-name="Misc Components" level="mw">
+<component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt" purpose="development">
+<unit bldFile="os/buildtools/misccomponents/emulatorlauncher/group" mrp="os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
+</component>
+</collection>
+<collection name="buildtools_info" long-name="Build Tools Info" level="ui">
+<component name="buildtools_metadata" long-name="Build Tools Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/buildtools/buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
+<collection name="ossrv_pub" long-name="Generic OS Services Public Interfaces" level="utilities">
+<component name="boost_apis" long-name="Boost APIs" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/boost_apis/group"/>
+</component>
+<component name="cpp_wrappers" long-name="Cpp wrappers" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/cpp_wrappers/group"/>
+</component>
+<component name="character_type_apis" long-name="Character Type APIs" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/character_type_apis/group"/>
+</component>
+<component name="compiler_specific_runtime_support" long-name="Compiler Specific Runtime Support" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/compiler_specific_runtime_support/group"/>
+</component>
+<component name="ossrv_configuration_api" long-name="Generic OS Services Configuration API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/configuration/group"/>
+</component>
+<component name="crypto_authentication_codes_and_hash_functions_api" long-name="Crypto Authentication Codes and Hash Functions API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
+</component>
+<component name="crypto_auxillary_functions_api" long-name="Crypto Auxillary Functions API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/crypto_auxillary_functions_api/group"/>
+</component>
+<component name="crypto_certificates_api" long-name="Crypto Certificates API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/crypto_certificates_api/group"/>
+</component>
+<component name="crypto_inputoutput_and_data_encoding_api" long-name="Crypto Input/Output and Data Encoding API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
+</component>
+<component name="crypto_public_key_cryptography_and_key_agreement_api" long-name="Crypto Public Key Cryptography and Key Agreement API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
+</component>
+<component name="crypto_symmetric_ciphers_api" long-name="Crypto Symmetric Ciphers API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/crypto_symmetric_ciphers_api/group"/>
+</component>
+<component name="crypto_utility_functions_api" long-name="Crypto Utility Functions API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/crypto_utility_functions_api/group"/>
+</component>
+<component name="cryptogaphy_related_api" long-name="Cryptogaphy Related API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/cryptogaphy_related_api/group"/>
+</component>
+<component name="ossrv_debug_api" long-name="Generic OS Services Debug API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/debug/group"/>
+</component>
+<component name="ossrv_exceptions_api" long-name="Generic OS Services Exceptions API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/exceptions/group"/>
+</component>
+<component name="gboxed" long-name="GBoxed API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/gboxed/group"/>
+</component>
+<component name="glib_arrays" long-name="Glib Arrays API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_arrays/group"/>
+</component>
+<component name="glib_asynchronous_queues" long-name="Glib Asynchronous Queues API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_asynchronous_queues/group"/>
+</component>
+<component name="glib_atomic_operations" long-name="Glib Atomic Operations API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_atomic_operations/group"/>
+</component>
+<component name="glib_automatic_string_completion" long-name="Glib Automatic String Completion API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_automatic_string_completion/group"/>
+</component>
+<component name="glib_balanced_binary_trees" long-name="Glib Balanced Binary Trees API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_balanced_binary_trees/group"/>
+</component>
+<component name="glib_basic_types" long-name="Glib Basic Types API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_basic_types/group"/>
+</component>
+<component name="glib_caches" long-name="Glib Caches API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_caches/group"/>
+</component>
+<component name="glib_character_set_conversion" long-name="Glib Character Set Conversion API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_character_set_conversion/group"/>
+</component>
+<component name="glib_closures" long-name="Glib Closures API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_closures/group"/>
+</component>
+<component name="glib_commandline_option_parser" long-name="Glib Command Line Option Parser API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_commandline_option_parser/group"/>
+</component>
+<component name="glib_datasets" long-name="Glib Datasets API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_datasets/group"/>
+</component>
+<component name="glib_date_and_time_functions" long-name="Glib Date and Time Functions API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_date_and_time_functions/group"/>
+</component>
+<component name="glib_doubleended_queues" long-name="Glib Double-ended Queues API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_doubleended_queues/group"/>
+</component>
+<component name="glib_doublylinked_lists" long-name="Glib Doubly-Linked Lists API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_doublylinked_lists/group"/>
+</component>
+<component name="glib_dynamic_loading_of_modules" long-name="Glib Dynamic Loading of Modules API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_dynamic_loading_of_modules/group"/>
+</component>
+<component name="glib_enums_and_flags" long-name="Glib Enums and Flags API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_enums_and_flags/group"/>
+</component>
+<component name="glib_error_reporting" long-name="Glib Error Reporting API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_error_reporting/group"/>
+</component>
+<component name="glib_file_utilities" long-name="Glib File Utilities API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_file_utilities/group"/>
+</component>
+<component name="glib_generic_values" long-name="Glib Generic Values API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_generic_values/group"/>
+</component>
+<component name="glib_globstyle_pattern_matching" long-name="Glib Glob-Style Pattern Matching API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_globstyle_pattern_matching/group"/>
+</component>
+<component name="glib_hash_tables" long-name="Glib Hash Tables API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_hash_tables/group"/>
+</component>
+<component name="glib_hook_functions" long-name="Glib Hook Functions API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_hook_functions/group"/>
+</component>
+<component name="glib_internationalization" long-name="Glib Internationalization API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_internationalization/group"/>
+</component>
+<component name="glib_io_channels" long-name="Glib I/O Channels API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_io_channels/group"/>
+</component>
+<component name="glib_keyvalue_file_parser" long-name="Glib Key-Value File Parser API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_keyvalue_file_parser/group"/>
+</component>
+<component name="glib_lexical_scanner" long-name="Glib Lexical Scanner API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_lexical_scanner/group"/>
+</component>
+<component name="glib_main_event_loop" long-name="Glib Main Event Loop API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_main_event_loop/group"/>
+</component>
+<component name="glib_memory_allocation" long-name="Glib Memory Allocation API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_memory_allocation/group"/>
+</component>
+<component name="glib_memory_slices" long-name="Glib Memory Slices API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_memory_slices/group"/>
+</component>
+<component name="glib_message_logging" long-name="Glib Message Logging API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_message_logging/group"/>
+</component>
+<component name="glib_miscellaneous_utility_functions" long-name="Glib Miscellaneous Utility Functions API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_miscellaneous_utility_functions/group"/>
+</component>
+<component name="glib_nary_trees" long-name="Glib N-ary Trees API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_nary_trees/group"/>
+</component>
+<component name="glib_parameters_and_values" long-name="Glib Parameters and Values API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_parameters_and_values/group"/>
+</component>
+<component name="glib_quarks" long-name="Glib Quarks API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_quarks/group"/>
+</component>
+<component name="glib_random_numbers" long-name="Glib Random Numbers API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_random_numbers/group"/>
+</component>
+<component name="glib_relations_and_tuples" long-name="Glib Relations and Tuples API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_relations_and_tuples/group"/>
+</component>
+<component name="glib_shellrelated_utilities" long-name="Glib Shell-related Utilities API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_shellrelated_utilities/group"/>
+</component>
+<component name="glib_signals" long-name="Glib Signals API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_signals/group"/>
+</component>
+<component name="glib_simple_xml_subset_parser" long-name="Glib Simple XML Subset Parser API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_simple_xml_subset_parser/group"/>
+</component>
+<component name="glib_singlylinked_lists" long-name="Glib Singly-Linked Lists API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_singlylinked_lists/group"/>
+</component>
+<component name="glib_spawning_processes" long-name="Glib Spawning Processes API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_spawning_processes/group"/>
+</component>
+<component name="glib_standard_macros" long-name="Glib Standard Macros API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_standard_macros/group"/>
+</component>
+<component name="glib_string_utility_functions" long-name="Glib String Utility Functions API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_string_utility_functions/group"/>
+</component>
+<component name="glib_strings" long-name="Glib Strings API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_strings/group"/>
+</component>
+<component name="glib_thread_pools" long-name="Glib Thread Pools API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_thread_pools/group"/>
+</component>
+<component name="glib_threads" long-name="Glib Threads API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_threads/group"/>
+</component>
+<component name="glib_timers" long-name="Glib Timers API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_timers/group"/>
+</component>
+<component name="glib_unicode_manipulation" long-name="Glib Unicode Manipulation API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_unicode_manipulation/group"/>
+</component>
+<component name="glib_value_arrays" long-name="Glib Value Arrays API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_value_arrays/group"/>
+</component>
+<component name="glib_varargs_value_collection" long-name="Glib Varargs Value Collection API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/glib_varargs_value_collection/group"/>
+</component>
+<component name="gobject" long-name="GObject API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/gobject/group"/>
+</component>
+<component name="gparamspec" long-name="GParamSpec API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/gparamspec/group"/>
+</component>
+<component name="gtype" long-name="GType API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/gtype/group"/>
+</component>
+<component name="gtypemodule" long-name="GTypeModule API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/gtypemodule/group"/>
+</component>
+<component name="gtypeplugin" long-name="GTypePlugin API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/gtypeplugin/group"/>
+</component>
+<component name="io_stream_api" long-name="I/O stream API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/io_stream_api/group"/>
+</component>
+<component name="localization_function_api" long-name="Localization Function API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/localization_function_api/group"/>
+</component>
+<component name="math_operations_api" long-name="Math Operations API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/math_operations_api/group"/>
+</component>
+<component name="ossrv_memory_api" long-name="Generic OS Services Memory API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/memory/group"/>
+</component>
+<component name="no_namespace_headers" long-name="No Namespace Headers" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/no_namespace_headers/group"/>
+</component>
+<component name="openc_headers" long-name="OpenC headers" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/openc_headers/group"/>
+</component>
+<component name="openc_wrappers" long-name="OpenC wrappers" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/openc_wrappers/group"/>
+</component>
+<component name="ssl_general_api" long-name="SSL General API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/ssl_general_api/group"/>
+</component>
+<component name="ssl_protocol_methods_api" long-name="SSL Protocol Methods API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/ssl_protocol_methods_api/group"/>
+</component>
+<component name="standard_compressiondecompression_api" long-name="Standard Compression/Decompression API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/standard_compressiondecompression_api/group"/>
+</component>
+<component name="stl" long-name="STL API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/stl/group"/>
+</component>
+<component name="thread_api" long-name="Thread API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/thread_api/group"/>
+</component>
+<component name="type_attributes" long-name="Type Attributes API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/type_attributes/group"/>
+</component>
+<component name="typeinfo" long-name="Type Info API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/typeinfo/group"/>
+</component>
+<component name="utility_apis" long-name="Utility APIs" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/utility_apis/group"/>
+</component>
+<component name="wide_character_classapis" long-name="Wide character class/apis" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/wide_character_classapis/group"/>
+</component>
+<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">
+<unit bldFile="os/ossrv/ossrv_pub/dbus-glib/group"/>
+</component>
+</collection>
+<collection name="ossrv_plat" long-name="Generic OS Services Platform Interfaces" level="utilities">
+<component name="libutils_apis" long-name="Utility Library APIs" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_plat/libutils/group"/>
+</component>
+</collection>
+<collection name="stdlibs" long-name="Standard Libraries" level="translation">
+<component name="libz" filter="s60" long-name="Z Compression Library">
+<unit bldFile="os/ossrv/stdlibs/libz/group"/>
+</component>
+<component name="libcrypt" filter="s60" long-name="Crypt Library">
+<unit bldFile="os/ossrv/stdlibs/libcrypt/group"/>
+</component>
+</collection>
+<collection name="ssl" long-name="SSL" level="data-services">
+<component name="libcrypto" filter="s60" long-name="Crypto Library">
+<unit bldFile="os/ossrv/ssl/libcrypto/group"/>
+</component>
+<component name="libssl" filter="s60" purpose="development" long-name="SSL Library">
+<unit bldFile="os/ossrv/ssl/libssl/group"/>
+</component>
+</collection>
+<collection name="glib" long-name="GLib" level="utilities">
+<component name="glibbackend" filter="s60" long-name="GLib Backend">
+<unit bldFile="os/ossrv/glib/glibbackend/group"/>
+</component>
+<component name="libglib" filter="s60" long-name="GLib Library">
+<unit bldFile="os/ossrv/glib/libglib/group"/>
+</component>
+<component name="libgthread" filter="s60" long-name="Libg Thread">
+<unit bldFile="os/ossrv/glib/libgthread/group"/>
+</component>
+<component name="libgmodule" filter="s60" long-name="Libg Module">
+<unit bldFile="os/ossrv/glib/libgmodule/group"/>
+</component>
+<component name="libgobject" filter="s60" long-name="Libg Object">
+<unit bldFile="os/ossrv/glib/libgobject/group"/>
+</component>
+</collection>
+<collection name="stdcpp" long-name="C++ Standard Library" level="translation">
+<!-- collection is really a component. Needs to be moved down a directory -->
+<component name="stdcpp_build" filter="s60" long-name="Stdcpp">
+<unit bldFile="os/ossrv/stdcpp/group"/>
+</component>
+</collection>
+<collection name="ofdbus" long-name="Open Foundation D-Bus" level="utilities">
+<component name="dbus" filter="s60" long-name="D-Bus">
+<unit bldFile="os/ossrv/ofdbus/dbus/group"/>
+</component>
+<component name="dbus-glib" filter="s60" long-name="D-Bus GLib">
+<unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
+</component>
+<component name="ofdbus_rom" filter="s60" long-name="D-Bus ROM">
+<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory
+ Consider moving IBY file to one of the above as well and removing this component entirely -->
+<unit bldFile="os/ossrv/ofdbus/group"/>
+</component>
+</collection>
+<collection name="utilitylibraries" long-name="Utility Libraries" level="encoding">
+<component name="libutils" filter="s60" long-name="Utility Library">
+<unit bldFile="os/ossrv/utilitylibraries/libutils/group"/>
+</component>
+</collection>
+<collection name="genericservices" long-name="Generic Services" level="utilities">
+<component name="s60compatibilityheaders" long-name="S60 Compatibility Headers" filter="gt" purpose="optional">
+<unit bldFile="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp" version="tb101sf"/>
+</component>
+<component name="mimerecognitionfw" long-name="MIME Recognition Framework" purpose="mandatory">
+<unit bldFile="os/ossrv/genericservices/mimerecognitionfw/group" mrp="os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
+</component>
+<component name="systemagent" long-name="System Agent" introduced="9.0" purpose="mandatory">
+<unit bldFile="os/ossrv/genericservices/systemagent/group" mrp="os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
+</component>
+<component name="taskscheduler" long-name="Task Scheduler" introduced="6.0" purpose="optional">
+<unit bldFile="os/ossrv/genericservices/taskscheduler/group" mrp="os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
+</component>
+<component name="activebackupclient" long-name="Active Backup Client" purpose="optional">
+<unit bldFile="os/ossrv/genericservices/activebackupclient/group" mrp="os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
+</component>
+<component name="syslibsdocs" long-name="Syslibs Documentation" purpose="development" class="doc">
+<unit mrp="os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
+</component>
+<component name="httputils" long-name="HTTP Utilities Library" introduced="6.2" purpose="optional">
+<unit bldFile="os/ossrv/genericservices/httputils/group" mrp="os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
+</component>
+</collection>
+<collection name="syslibsapitest" long-name="SysLibs API Tests" level="utilities"/>
+<collection name="compressionlibs" long-name="Compression Libraries" level="data-services">
+<component name="ziplib" long-name="Zip Compression Library" introduced="6.0" purpose="mandatory">
+<unit bldFile="os/ossrv/compressionlibs/ziplib/group" mrp="os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
+</component>
+</collection>
+<collection name="genericopenlibs" long-name="Generic Open Libraries" level="translation">
+<component name="cstdlib" long-name="C Standard Library" introduced="ER5" purpose="optional">
+<unit bldFile="os/ossrv/genericopenlibs/cstdlib/group" mrp="os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
+</component>
+<component name="cppstdlib" long-name="C++ Standard Library" introduced="^3" purpose="mandatory">
+<unit bldFile="os/ossrv/genericopenlibs/cppstdlib/group" mrp="os/ossrv/genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
+</component>
+<component name="openenvcore" long-name="Open Environment Core" introduced="^2" purpose="mandatory">
+<unit bldFile="os/ossrv/genericopenlibs/openenvcore/group" mrp="os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
+</component>
+<component name="posixrealtimeextensions" long-name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
+<unit bldFile="os/ossrv/genericopenlibs/posixrealtimeextensions/group" mrp="os/ossrv/genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
+</component>
+</collection>
+<collection name="lowlevellibsandfws" long-name="Low Level Libraries and Frameworks" level="app-libs">
+<component name="pluginfw" long-name="Plugin Framework" introduced="6.2" purpose="mandatory">
+<unit bldFile="os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp" version="3"/>
+</component>
+<component name="apputils" long-name="Application Utilities" introduced="ER5" purpose="mandatory">
+<unit bldFile="os/ossrv/lowlevellibsandfws/apputils/group" mrp="os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
+</component>
+<component name="genericusabilitylib" long-name="Generic Usability Library" introduced="^3" purpose="mandatory">
+<unit bldFile="os/ossrv/lowlevellibsandfws/genericusabilitylib/group" mrp="os/ossrv/lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
+</component>
+</collection>
+<collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
+<component name="ossrv_build" filter="s60" long-name="Generic OS Services Build">
+<!-- exports should be moved to individual components -->
+<unit bldFile="os/ossrv/group"/>
+</component>
+<component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
+<collection name="featuremgmt" long-name="Feature Management" level="framework">
+<component name="featuremgr" long-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 name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="^3" purpose="mandatory">
+<unit bldFile="os/persistentdata/featuremgmt/featureregistry/group" mrp="os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
+</component>
+</collection>
+<collection name="loggingservices" long-name="Logging Services" level="server">
+<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">
+<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">
+<unit bldFile="os/persistentdata/loggingservices/rfilelogger/group" mrp="os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
+</component>
+</collection>
+<collection name="traceservices" long-name="Trace Services" level="server">
+<component name="commsdebugutility" long-name="Comms Debug Utility" introduced="7.0s" purpose="optional">
+<unit bldFile="os/persistentdata/traceservices/commsdebugutility/group" mrp="os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
+</component>
+<component name="tracefw" long-name="Trace Framework" introduced="9.2" purpose="development">
+<unit bldFile="os/persistentdata/traceservices/tracefw/ulogger/group" mrp="os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
+</component>
+</collection>
+<collection name="persistentstorage" long-name="Persistent Storage" level="framework">
+<component name="store" long-name="Store" purpose="optional">
+<unit bldFile="os/persistentdata/persistentstorage/store/group" mrp="os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
+</component>
+<component name="dbms" long-name="DBMS" purpose="optional">
+<unit bldFile="os/persistentdata/persistentstorage/dbms/group" mrp="os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
+</component>
+<component name="centralrepository" long-name="Central Repository" introduced="7.0s" purpose="mandatory">
+<unit bldFile="os/persistentdata/persistentstorage/centralrepository/group" mrp="os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
+</component>
+<component name="sql" long-name="SQL" introduced="9.3" purpose="optional">
+<unit bldFile="os/persistentdata/persistentstorage/sql/GROUP" mrp="os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
+</component>
+<component name="sqlite3api" long-name="SQLite 3 API" introduced="^3" purpose="optional">
+<unit bldFile="os/persistentdata/persistentstorage/sqlite3api/GROUP" mrp="os/persistentdata/persistentstorage/sqlite3api/GROUP/syslibs_sqlite3.mrp"/>
+</component>
+</collection>
+<collection name="persistentdata_info" long-name="Persistent Data Services Info" level="app-if">
+<component name="persistentdata_metadata" long-name="Persistent Data Services Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/persistentdata/persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
+<collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
+<component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" class="api">
+<unit bldFile="os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
+</component>
+<component name="common_platform_security_definitions_api" long-name="Common Platform Security Definitions API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group"/>
+</component>
+<component name="feature_discovery_api" long-name="Feature Discovery API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/group"/>
+</component>
+<component name="platform_environment_api" long-name="Platform Environment API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_pub/platform_environment_api/group"/>
+</component>
+<component name="sensor_channel_api" long-name="Sensor Channel API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_pub/sensor_channel_api/group"/>
+</component>
+<component name="sensor_definitions_api" long-name="Sensor Definitions API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_pub/sensor_definitions_api/group"/>
+</component>
+<component name="version_info_api" long-name="Version Info API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/group"/>
+</component>
+<component name="accessory_monitoring_api" long-name="Accessory Monitoring API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/group"/>
+</component>
+<component name="haptics_api" long-name="Haptics API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_pub/haptics_api/group"/>
+</component>
+<component name="sensor_data_compensator_api" long-name="Sensor Data Compensator API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
+</component>
+</collection>
+<collection name="devicesrv_plat" long-name="Device Services Platform Interfaces" level="app-if">
+<component name="configuration_file_parser_api" long-name="Configuration File Parser API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/configuration_file_parser_api/group"/>
+</component>
+<component name="dos_extension_plugin_api" long-name="DOS Extension Plug-In API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_plugin_api/group"/>
+</component>
+<component name="mediator_command_initiator_api" long-name="Mediator Command Initiator API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_initiator_api/group"/>
+</component>
+<component name="syslangutil_api" long-name="SysLangUtil API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/syslangutil_api/group"/>
+</component>
+<component name="wakeup_alarm_api" long-name="Wakeup Alarm API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/wakeup_alarm_api/group"/>
+</component>
+<component name="disk_and_memory_level_keys_api" long-name="Disk and Memory Level Keys API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/disk_and_memory_level_keys_api/group"/>
+</component>
+<component name="mediator_plugin_api" long-name="Mediator Plugin API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/mediator_plugin_api/group"/>
+</component>
+<component name="headset_status_api" long-name="Headset Status API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/headset_status_api/group"/>
+</component>
+<component name="system_startup_extension_plugin_api" long-name="System Startup Extension Plugin API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/system_startup_extension_plugin_api/group"/>
+</component>
+<component name="sensor_plugin_api" long-name="Sensor Plugin API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/sensor_plugin_api/group"/>
+</component>
+<component name="accessory_api" long-name="Accessory API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/accessory_api/group"/>
+</component>
+<component name="display_language_definition_api" long-name="Display Language Definition API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/display_language_definition_api/group"/>
+</component>
+<component name="mediator_command_responder_api" long-name="Mediator Command Responder API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_responder_api/group"/>
+</component>
+<component name="accessory_policy_definitions_api" long-name="Accessory Policy Definitions API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_definitions_api/group"/>
+</component>
+<component name="hw_settings_api" long-name="Hardware Settings API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/hw_settings_api/group"/>
+</component>
+<component name="mediator_domain_definitions_api" long-name="Mediator Domain Definitions API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/mediator_domain_definitions_api/group"/>
+</component>
+<component name="sensor_extension_api" long-name="Sensor Extension API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/sensor_extension_api/group"/>
+</component>
+<component name="accessory_plugin_api" long-name="Accessory Plugin API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/accessory_plugin_api/group"/>
+</component>
+<component name="sae_api" long-name="SAE API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/sae_api/group"/>
+</component>
+<component name="accessory_control_api" long-name="Accessory Control API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/accessory_control_api/group"/>
+</component>
+<component name="mediator_static_registration_api" long-name="Mediator Static Registration API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/mediator_static_registration_api/group"/>
+</component>
+<component name="accessory_key_event_handling_api" long-name="Accessory Key Event Handling API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/accessory_key_event_handling_api/group"/>
+</component>
+<component name="mediator_notification_api" long-name="Mediator Notification API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/mediator_notification_api/group"/>
+</component>
+<component name="accessory_policy_utility_api" long-name="Accessory Policy Utility API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_utility_api/group"/>
+</component>
+<component name="common_dsy_plugin_api" long-name="Common DSY Plugin API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/common_dsy_plugin_api/group"/>
+</component>
+<component name="remote_control_extension_api" long-name="Remote Control Extension API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/remote_control_extension_api/group"/>
+</component>
+<component name="sensor_channel_filter_api" long-name="Sensor Channel Filter API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/sensor_channel_filter_api/group"/>
+</component>
+<component name="dos_extension_api" long-name="DOS Extension API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_api/group"/>
+</component>
+<component name="accessory_audio_control_api" long-name="Accessory Audio Control API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/accessory_audio_control_api/group"/>
+</component>
+<component name="mediator_event_consumer_api" long-name="Mediator Event Consumer API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_consumer_api/group"/>
+</component>
+<component name="shared_data_api" long-name="Shared Data API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/shared_data_api/group"/>
+</component>
+<component name="accessory_settings_api" long-name="Accessory Settings API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/accessory_settings_api/group"/>
+</component>
+<component name="accessory_bluetooth_control_api" long-name="Accessory Bluetooth Control API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/accessory_bluetooth_control_api/group"/>
+</component>
+<component name="extended_version_info_api" long-name="Extended Version Info API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_api/group"/>
+</component>
+<component name="mediator_event_provider_api" long-name="Mediator Event Provider API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_provider_api/group"/>
+</component>
+<component name="tv_out_config_api" long-name="TV Out Config API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_config_api/group"/>
+</component>
+<component name="tspclientmapper_api" long-name="TSP Client Mapper API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/tspclientmapper_api/group"/>
+</component>
+<component name="powersave_api" long-name="Power Save API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/powersave_api/group"/>
+</component>
+<component name="powersave_definitions_api" long-name="Power Save Definitions API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/powersave_definitions_api/group"/>
+</component>
+<component name="powersave_plugin_api" long-name="Power Save Plugin API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/powersave_plugin_api/group"/>
+</component>
+<component name="extended_version_info_plugin_api" long-name="Extended Version Info Plugin API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_plugin_api/group"/>
+</component>
+<component name="haptics_plugin_api" long-name="Haptics Plugin API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/haptics_plugin_api/group"/>
+</component>
+<component name="haptics_effect_data_getter_plugin_api" long-name="Haptics Effect Data Getter Plugin API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
+</component>
+<component name="haptics_packetizer_plugin_api" long-name="Haptics Packetizer Plugin API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/haptics_packetizer_plugin_api/group"/>
+</component>
+<component name="tiltcompensation_api" long-name="Tilt Compensation API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/tiltcompensation_api/group"/>
+</component>
+<component name="disk_notification_handler_api" long-name="Disk Notification Handler API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/disk_notification_handler_api/group"/>
+</component>
+<component name="accessory_policy_usb_audio_api" long-name="Accessory Policy USB Audio API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_usb_audio_api/group"/>
+</component>
+<component name="accessory_policy_hdmi_audio_api" long-name="Accessory Policy HDMI Audio API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_hdmi_audio_api/group"/>
+</component>
+<component name="sensor_data_compensator_plugin_api" long-name="Sensor Data Compensator Plugin API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
+</component>
+<component name="ddc_access_api" long-name="DDC Access API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/ddc_access_api/group"/>
+</component>
+<component name="tv_out_behaviour_api" long-name="TV Out Behaviour API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_behaviour_api/group"/>
+</component>
+</collection>
+<collection name="accessoryservices" long-name="Accessory Services" level="framework">
+<component name="accessorymonitor" filter="s60" long-name="Accessory Monitor">
+<unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/group"/>
+</component>
+<component name="accessoryremotecontrol" filter="s60" long-name="Accessory Remote Control">
+<unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
+</component>
+<component name="accessoryserver" filter="s60" long-name="Accessory Server">
+<unit bldFile="os/devicesrv/accessoryservices/accessoryserver/group"/>
+</component>
+<component name="pluggeddisplay" filter="s60" long-name="Plugged Display" introduced="^3">
+<unit bldFile="os/devicesrv/accessoryservices/pluggeddisplay/group"/>
+</component>
+<component name="headsetstatusapi" filter="s60" long-name="Headset Status API">
+<unit bldFile="os/devicesrv/accessoryservices/headsetstatusapi/group"/>
+</component>
+<component name="tspclientmapper" filter="s60" long-name="TSP Client Mapper">
+<unit bldFile="os/devicesrv/accessoryservices/tspclientmapper/group"/>
+</component>
+<component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional">
+<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
+</component>
+<component name="gid_pc_tool" filter="s60" long-name="Generic ID PC Tool" class="tool PC">
+<unit bldFile="os/devicesrv/accessoryservices/gid_pc_tool/group"/>
+</component>
+</collection>
+<collection name="commonservices" long-name="Common Services" level="app-if">
+<component name="commonengine" filter="s60" long-name="Common Engine">
+<unit bldFile="os/devicesrv/commonservices/commonengine/group"/>
+</component>
+<component name="commonengineresources" filter="s60" long-name="Common Engine Resources" class="config">
+<unit bldFile="os/devicesrv/commonservices/commonengineresources/group"/>
+</component>
+<component name="platformenv" filter="s60" long-name="Platform Environment">
+<unit bldFile="os/devicesrv/commonservices/platformenv/group"/>
+</component>
+<component name="sysutil" long-name="System Utilities" purpose="mandatory" introduced="ER5">
+<unit bldFile="os/devicesrv/commonservices/sysutil/group" mrp="os/devicesrv/commonservices/sysutil/group/sysutil.mrp"/>
+</component>
+<component name="activitymanager" long-name="Activity Manager" purpose="mandatory" introduced="ER5">
+<unit bldFile="os/devicesrv/commonservices/activitymanager/group" mrp="os/devicesrv/commonservices/activitymanager/group/activitymanager.mrp"/>
+</component>
+</collection>
+<collection name="dosservices" long-name="Domestic Operating System Services" level="hw-if">
+<component name="commondsy" filter="s60" long-name="Common DSY" plugin="Y">
+<unit bldFile="os/devicesrv/dosservices/commondsy/group"/>
+</component>
+<component name="dosserver" filter="s60" long-name="Domestic OS Server">
+<unit bldFile="os/devicesrv/dosservices/dosserver/group"/>
+</component>
+</collection>
+<collection name="sensorservices" long-name="Sensor Services" level="framework">
+<component name="sensorserver" filter="s60" long-name="Sensor Server">
+<unit bldFile="os/devicesrv/sensorservices/sensorserver/group"/>
+</component>
+<component name="orientationssy" filter="s60" long-name="Orientation SSY" plugin="Y">
+<unit bldFile="os/devicesrv/sensorservices/orientationssy/group"/>
+</component>
+<component name="tiltcompensationssy" filter="s60" long-name="Tilt Compensation SSY" plugin="Y">
+<unit bldFile="os/devicesrv/sensorservices/tiltcompensationssy/group"/>
+</component>
+<component name="sensordatacompensator" filter="s60" long-name="Sensor Data Compensator">
+<unit bldFile="os/devicesrv/sensorservices/sensordatacompensator/group"/>
+</component>
+</collection>
+<collection name="hwrmhaptics" long-name="HWRM Haptics" level="plugin">
+<component name="hapticseffectdatagetterfw" filter="s60" long-name="Haptics Effect Data Getter Framework">
+<unit bldFile="os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
+</component>
+<component name="hapticspluginservice" filter="s60" long-name="Haptics Plugin Service">
+<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
+</component>
+<component name="hapticspacketizer" filter="s60" long-name="Haptics Packetizer">
+<unit bldFile="os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
+</component>
+<component name="hapticspluginmanager" filter="s60" long-name="Haptics Plugin Manager">
+<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
+</component>
+<component name="hapticsserver" filter="s60" long-name="Haptics Server">
+<unit bldFile="os/devicesrv/hwrmhaptics/hapticsserver/group"/>
+</component>
+<component name="hapticsclient" filter="s60" long-name="Haptics Client">
+<unit bldFile="os/devicesrv/hwrmhaptics/hapticsclient/group"/>
+</component>
+<component name="hwrmhaptics_build" filter="s60" long-name="HWRM Haptics Build">
+<!-- move these exports into the appropriate above components and delete this component-->
+<unit bldFile="os/devicesrv/hwrmhaptics/group"/>
+</component>
+</collection>
+<collection name="mediator" long-name="Mediator" level="app-if">
+<!--collection is really a component. Move it down a directory -->
+<component name="mediator_build" filter="s60" long-name="Mediator Build">
+<unit bldFile="os/devicesrv/mediator/group"/>
+</component>
+</collection>
+<collection name="psmservices" long-name="Power Save Mode Services" level="app-if">
+<component name="psmserver" filter="s60" long-name="PSM Server">
+<unit bldFile="os/devicesrv/psmservices/psmserver/group"/>
+</component>
+</collection>
+<collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
+<component name="hwrmfmtxwatcherplugin" filter="s60" long-name="HWRM FM Transmitter Watcher Plugin" plugin="Y">
+<unit bldFile="os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
+</component>
+<component name="hwrmtargetmodifierplugin" filter="s60" long-name="HWRM Target Modifier Plugin" plugin="Y">
+<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build,
+ may need to -->
+<!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
+</component>
+<component name="vibractrl" filter="s60" long-name="Vibra Control" deprecated="9.1">
+<unit bldFile="os/devicesrv/resourcemgmt/vibractrl/group"/>
+</component>
+<component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="^2" purpose="optional">
+<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
+</component>
+<component name="hwresourcesmgrconfig" long-name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
+<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
+</component>
+<component name="resourcemgmt_build" filter="s60" long-name="Resource Management Build">
+<!-- Move exports to a self-contained component.
+ This needs to be kept around until configuration is in place -->
+<unit bldFile="os/devicesrv/resourcemgmt/group"/>
+</component>
+<component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
+<unit bldFile="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
+</component>
+</collection>
+<collection name="sysstatemgmt" long-name="System State Management" level="server">
+<component name="ssmmapperutility" filter="s60" long-name="SSM Mapper Utility" introduced="^3">
+<unit bldFile="os/devicesrv/sysstatemgmt/ssmmapperutility/group"/>
+</component>
+<component name="ssmpolicyplugins" filter="s60" long-name="SSM Policy Plugins" introduced="^3" plugin="Y">
+<unit bldFile="os/devicesrv/sysstatemgmt/ssmpolicyplugins/group"/>
+</component>
+<component name="ssmutilityplugins" filter="s60" long-name="SSM Utility Plugins" introduced="^3" plugin="Y">
+<unit bldFile="os/devicesrv/sysstatemgmt/ssmutilityplugins/group"/>
+</component>
+<component name="ssmcmdlists" filter="s60" long-name="SSM Command Lists" introduced="^3">
+<unit bldFile="os/devicesrv/sysstatemgmt/ssmcmdlists/group"/>
+</component>
+<component name="ssmcustcmds" filter="s60" long-name="SSM Custom Commands" introduced="^3">
+<unit bldFile="os/devicesrv/sysstatemgmt/ssmcustcmds/group"/>
+</component>
+<component name="syslangutil" filter="s60" long-name="System Language Utility" introduced="^3">
+<unit bldFile="os/devicesrv/sysstatemgmt/syslangutil/group"/>
+</component>
+<component name="sysrestart" filter="s60" long-name="System Restart" introduced="^3">
+<unit bldFile="os/devicesrv/sysstatemgmt/sysrestart/group"/>
+</component>
+<component name="sysuiprovider" filter="s60" long-name="System UI Provider" introduced="^3">
+<unit bldFile="os/devicesrv/sysstatemgmt/sysuiprovider/group"/>
+</component>
+<component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
+<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/group" mrp="os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
+</component>
+<component name="systemstatemgr" long-name="System State Manager" introduced="^3" purpose="mandatory">
+<unit bldFile="os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
+</component>
+<component name="systemstateplugins" long-name="System State Plugins" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
+</component>
+<component name="systemstatereferenceplugins" long-name="System State Reference Plugins" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
+</component>
+</collection>
+<collection name="resourceinterfaces" long-name="Resource Interfaces" level="hw-if">
+<component name="fmtransmittercontrol" long-name="FM Transmitter Control" introduced="^3" purpose="optional">
+<unit bldFile="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group" mrp="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
+</component>
+</collection>
+<collection name="systemhealthmanagement" long-name="System Health Management" level="server">
+<component name="systemhealthmgr" long-name="System Health Manager" introduced="^3" purpose="optional">
+<unit bldFile="os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
+</component>
+</collection>
+<collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if"/>
+<collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
+<component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
+<collection name="authorisation" long-name="Authorisation" level="utilities">
+<component name="userpromptservice" long-name="User Prompt Service" introduced="^3" purpose="mandatory">
+<unit bldFile="os/security/authorisation/userpromptservice/group" mrp="os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
+</component>
+<component name="userpromptutils" long-name="User Prompt Utils" introduced="^3" purpose="optional">
+<unit bldFile="os/security/authorisation/userpromptutils/group" mrp="os/security/authorisation/userpromptutils/group/security_ups_utils.mrp"/>
+</component>
+</collection>
+<collection name="contentmgmt" long-name="Content Management" level="utilities">
+<component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
+<unit bldFile="os/security/contentmgmt/contentaccessfwfordrm/group" mrp="os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
+</component>
+<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>
+</collection>
+<collection name="crypto" long-name="Crypto Libraries" level="libraries">
+<component name="weakcryptospi" long-name="Weak Crypto SPI" filter="gt" introduced="^3" purpose="optional">
+<unit bldFile="os/security/crypto/weakcryptospi/group" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
+</component>
+<component name="strongcryptospi" long-name="Strong Crypto SPI" filter="gt" introduced="^3" purpose="optional">
+<unit bldFile="os/security/crypto/weakcryptospi/strong" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
+</component>
+</collection>
+<collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
+<component name="securityutils" long-name="Security Utils" introduced="8.0" purpose="optional">
+<unit bldFile="os/security/cryptomgmtlibs/securityutils/group" mrp="os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
+</component>
+<component name="securitydocs" long-name="Security Documentation" purpose="development" class="doc">
+<unit mrp="os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
+</component>
+<component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0" purpose="optional">
+<unit bldFile="os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
+</component>
+<component name="securitycommonutils" long-name="Security Common Utils" introduced="8.0" purpose="mandatory">
+<unit bldFile="os/security/cryptomgmtlibs/securitycommonutils/group" mrp="os/security/cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
+</component>
+</collection>
+<collection name="securityanddataprivacytools" long-name="Security and Data Privacy Tools" level="services">
+<component name="securityconfig" long-name="Security Config" introduced="9.1" purpose="optional">
+<unit bldFile="os/security/securityanddataprivacytools/securityconfig/group" mrp="os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
+</component>
+<component name="securitytools" long-name="Security Tools" introduced="^3" purpose="optional" class="PC">
+<unit bldFile="os/security/securityanddataprivacytools/securitytools/group" mrp="os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
+</component>
+</collection>
+<collection name="cryptoplugins" long-name="Crypto Plugins" level="plugins">
+<component name="cryptospiplugins" long-name="Crypto SPI Plugins" filter="gt" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/security/cryptoplugins/cryptospiplugins/group" mrp="os/security/cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
+</component>
+</collection>
+<collection name="cryptoservices" long-name="Crypto Services" level="plugins">
+<component name="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0" purpose="optional">
+<unit bldFile="os/security/cryptoservices/certificateandkeymgmt/group" mrp="os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
+</component>
+<component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
+<unit bldFile="os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
+</component>
+<component name="browserrootcertificates" long-name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
+<unit mrp="os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
+</component>
+<component name="rootcertificates" filter="sf_build" long-name="Root Certificates" introduced="7.0s" purpose="optional">
+<!-- not in S60 codebase -->
+<unit bldFile="os/security/cryptoservices/rootcertificates/group" mrp="os/security/cryptoservices/rootcertificates/group/rootcerts.mrp"/>
+</component>
+<component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional">
+<unit bldFile="os/security/cryptoservices/asnpkcs/group" mrp="os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
+</component>
+</collection>
+<collection name="security_info" long-name="OS Security Info" level="utilities">
+<component name="security_metadata" long-name="OS Security Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/security/security_info/security_metadata/security_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
+<collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
+<component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
+<unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
+</component>
+<component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" introduced="^2" purpose="optional" plugin="Y">
+<unit bldFile="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
+</component>
+<component name="simulationpositioningmodule" long-name="Simulation Positioning Module" introduced="^2" purpose="development" plugin="Y">
+<unit bldFile="os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
+</component>
+<component name="gpspositioningmodule" long-name="GPS/A-GPS Positioning Module" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/lbs/datasourcemodules/gpspositioningmodule/group" mrp="os/lbs/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
+</component>
+<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>
+</collection>
+<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
+<component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
+<unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
+</component>
+</collection>
+<collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
+<component name="locationserver" long-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 name="networkrequesthandler" long-name="Network Request Handler" introduced="9.2" purpose="optional">
+<unit bldFile="os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
+</component>
+</collection>
+<collection name="lbstest" long-name="Locating Services Tests" level="application-interface">
+<component name="locationprotocoltest" long-name="Location Protocol Tests" introduced="9.2" purpose="development" plugin="Y">
+<unit bldFile="os/lbs/lbstest/locationprotocoltest/group" mrp="os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
+</component>
+</collection>
+<collection name="locationmgmt" long-name="Location Management" level="management">
+<component name="locmonitor" long-name="Location Monitor" introduced="^3" purpose="optional">
+<unit bldFile="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
+</component>
+<component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2" purpose="optional">
+<unit bldFile="os/lbs/locationmgmt/agpslocationmgr/group" mrp="os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
+</component>
+<component name="networklocationmgr" long-name="Network Location Manager" introduced="9.2" purpose="optional">
+<unit bldFile="os/lbs/locationmgmt/networklocationmgr/group" mrp="os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
+</component>
+<component name="locationcore" long-name="Location Core" introduced="9.2" purpose="optional">
+<unit bldFile="os/lbs/locationmgmt/locationcore/group" mrp="os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
+</component>
+<component name="networkgateway" long-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 name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
+<component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
+<unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
+</component>
+<component name="suplproxyprotocolmodule" long-name="SUPL Proxy Protocol Module" introduced="^3" purpose="optional" plugin="Y">
+<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+<unit bldFile="os/lbs/networkprotocolmodules/suplproxyprotocolmodule/sfgroup" mrp="os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
+</component>
+<component name="suplprotocolmodule" long-name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" plugin="Y">
+<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+<unit bldFile="os/lbs/networkprotocolmodules/suplprotocolmodule/sfgroup" mrp="os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
+</component>
+<component name="suplrrlpasn1" filter="sf_build" long-name="SUPL RRLP ASN1 Parser">
+<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+<unit bldFile="os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
+</component>
+<component name="suplrrlpprotocol" long-name="SUPL RRLP Protocol Module">
+<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+<unit bldFile="os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup"/>
+</component>
+</collection>
+<collection name="lbsapitest" long-name="Location API Tests" level="application-interface"/>
+<collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
+<component name="lbs_metadata" long-name="Locating Services Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="commsfw" level="services" long-name="Communications Framework" levels="server support framework process app-if">
+<collection name="commsprocess" long-name="Comms Process" level="process">
+<component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s" purpose="mandatory">
+<unit bldFile="os/commsfw/commsprocess/commsrootserverconfig/group" mrp="os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
+</component>
+</collection>
+<collection name="commsconfig" long-name="Comms Config" level="process">
+<component name="commsdatabase" long-name="Comms Database" purpose="mandatory">
+<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
+</component>
+<component name="commsdatabaseshim" long-name="Comms Database Shim" introduced="8.1" purpose="mandatory">
+<unit bldFile="os/commsfw/commsconfig/commsdatabaseshim/group" mrp="os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
+</component>
+</collection>
+<collection name="datacommsserver" long-name="Data Comms Server" level="framework">
+<component name="esockserver" long-name="ESock Server" purpose="mandatory">
+<unit bldFile="os/commsfw/datacommsserver/esockserver/group" mrp="os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp" version="3"/>
+</component>
+<component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1" purpose="optional">
+<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/group" mrp="os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
+</component>
+<component name="networkingdialogstub" long-name="Networking Dialog Stub" introduced="6.1" purpose="optional">
+<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/default" mrp="os/commsfw/datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
+</component>
+<component name="networkcontroller" long-name="Network Controller" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="os/commsfw/datacommsserver/networkcontroller/group" mrp="os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
+</component>
+</collection>
+<collection name="serialserver" long-name="Serial Server" level="server">
+<component name="serialportcsy" long-name="Serial Port CSY" introduced="ER5" purpose="optional" plugin="Y">
+<unit bldFile="os/commsfw/serialserver/serialportcsy" mrp="os/commsfw/serialserver/serialportcsy/ser-comms_serialportcsy.mrp"/>
+</component>
+<component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" purpose="development">
+<unit bldFile="os/commsfw/serialserver/packetloopbackcsy/group" mrp="os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
+</component>
+<component name="c32serialserver" long-name="C32 Serial Server" introduced="ER5" purpose="mandatory">
+<unit bldFile="os/commsfw/serialserver/c32serialserver/group" mrp="os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
+</component>
+<component name="c32serialserverconfig" long-name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config">
+<unit bldFile="os/commsfw/serialserver/c32serialserverconfig" mrp="os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
+</component>
+<component name="c32serialserverdocs" long-name="C32 Serial Server Documentation" purpose="development" class="doc">
+<unit mrp="os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
+</component>
+</collection>
+<collection name="commsfwutils" long-name="Comms Framework Utilities" level="framework">
+<component name="commsbufs" long-name="Comms Buffers" introduced="^3" purpose="mandatory">
+<unit bldFile="os/commsfw/commsfwutils/commsbufs/group" mrp="os/commsfw/commsfwutils/commsbufs/group/comms-infras_commsbufs.mrp"/>
+</component>
+</collection>
+<collection name="commsfw_info" long-name="Comms Framework Info" level="app-if">
+<component name="commsinfrastructuredocs" long-name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
+<unit mrp="os/commsfw/commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
+</component>
+<component name="commsfw_metadata" long-name="Communications Framework Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/commsfw/commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
+</component>
+</collection>
+<collection name="commsfwsupport" long-name="Comms Framework Support" level="support">
+<component name="commselements" long-name="Comms Elements" introduced="8.0" purpose="mandatory">
+<unit bldFile="os/commsfw/commsfwsupport/commselements/group" mrp="os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
+</component>
+</collection>
+<collection name="commsinfrastructureapitest" long-name="Comms-Infras API Tests" level="app-if">
+<component name="commsinfrastructuresvs" long-name="Comms Infrastructure Verification Suite" introduced="^3" purpose="development">
+<unit mrp="os/commsfw/commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
+</component>
+</collection>
+<collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
+<component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC">
+<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
+</component>
+<component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" purpose="mandatory" class="PC">
+<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
+</component>
+<component name="commstools" long-name="Comms Tools" introduced="^3" purpose="development" class="PC">
+<unit bldFile="os/commsfw/commsfwtools/commstools/group" mrp="os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
+</component>
+</collection>
+</block>
+<block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
+<collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
+<component name="internetsockets" long-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>
+<collection name="tcpiputils" long-name="TCP/IP Utilities" level="plugin">
+<component name="dnd" long-name="DND" introduced="7.0" purpose="mandatory">
+<unit bldFile="os/networkingsrv/tcpiputils/dnd/group" mrp="os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
+</component>
+<component name="dhcp" long-name="DHCP" introduced="8.0" purpose="optional">
+<unit bldFile="os/networkingsrv/tcpiputils/dhcp/group" mrp="os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
+</component>
+<component name="networkaddressandporttranslation" long-name="Network Address and Port Translation" introduced="^2" purpose="mandatory" plugin="Y">
+<unit bldFile="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
+</component>
+<component name="punycodeconv" long-name="Punycode Converter" introduced="^3" purpose="mandatory">
+<unit bldFile="os/networkingsrv/tcpiputils/punycodeconv/group" mrp="os/networkingsrv/tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
+</component>
+</collection>
+<collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
+<component name="nullagt" long-name="NULL AGT" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="os/networkingsrv/linklayercontrol/nullagt/group" mrp="os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
+</component>
+<component name="genericscprparameters" long-name="Generic SCPR Parameters" introduced="^3" purpose="optional">
+<unit bldFile="os/networkingsrv/linklayercontrol/genericscprparameters/group" mrp="os/networkingsrv/linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
+</component>
+<component name="mbmsparameters" long-name="MBMS Parameters" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/networkingsrv/linklayercontrol/mbmsparameters/group" mrp="os/networkingsrv/linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
+</component>
+<component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
+<unit bldFile="os/networkingsrv/linklayercontrol/networkinterfacemgr/group" mrp="os/networkingsrv/linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp" version="2"/>
+</component>
+</collection>
+<collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
+<component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y">
+<unit bldFile="os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
+</component>
+<component name="pppnif" long-name="PPP NIF" introduced="ER5" purpose="optional" plugin="Y">
+<unit bldFile="os/networkingsrv/linklayerprotocols/pppnif/group" mrp="os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp" version="2"/>
+</component>
+<component name="slipnif" long-name="SLIP NIF" purpose="development" plugin="Y">
+<unit bldFile="os/networkingsrv/linklayerprotocols/slipnif/group" mrp="os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
+</component>
+<component name="tunnelnif" long-name="Tunnel NIF" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
+</component>
+</collection>
+<collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
+<component name="packetlogger" long-name="Packet Logger" introduced="8.1" purpose="development">
+<unit bldFile="os/networkingsrv/linklayerutils/packetlogger/group" mrp="os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
+</component>
+</collection>
+<collection name="networkcontrol" long-name="Network Control" level="plugin">
+<component name="qoslib" long-name="QoS Library" introduced="7.0s" purpose="optional">
+<unit bldFile="os/networkingsrv/networkcontrol/qoslib/group" mrp="os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
+</component>
+<component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s" purpose="optional">
+<unit bldFile="os/networkingsrv/networkcontrol/pfqoslib/group" mrp="os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
+</component>
+<component name="qosfwprt" long-name="QoS Framework PRT" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
+</component>
+<component name="qosipscpr" long-name="QoS IP SCPR" purpose="optional" plugin="Y">
+<unit bldFile="os/networkingsrv/networkcontrol/qosipscpr/group" mrp="os/networkingsrv/networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
+</component>
+<component name="ipnetworklayer" long-name="IP Network Layer" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/networkingsrv/networkcontrol/ipnetworklayer/group" mrp="os/networkingsrv/networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
+</component>
+<component name="iptransportlayer" long-name="IP Transport Layer" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/networkingsrv/networkcontrol/iptransportlayer/group" mrp="os/networkingsrv/networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
+</component>
+<component name="commsuserpromptmgr" long-name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
+<unit bldFile="os/networkingsrv/networkcontrol/commsuserpromptmgr/group" mrp="os/networkingsrv/networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
+</component>
+</collection>
+<collection name="networkprotocols" long-name="Network Protocols" level="plugin">
+<component name="ipeventnotifier" long-name="IP Event Notifier" introduced="8.1" purpose="mandatory" plugin="Y">
+<unit bldFile="os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
+</component>
+<component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" plugin="Y">
+<unit bldFile="os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
+</component>
+<component name="iphook" long-name="IP Hook" introduced="7.0" purpose="mandatory">
+<unit bldFile="os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
+</component>
+<component name="mobileip" long-name="Mobile IP" introduced="8.1" purpose="optional" plugin="Y">
+<unit bldFile="os/networkingsrv/networkprotocols/mobileip/group" mrp="os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
+</component>
+<component name="dnsproxy" long-name="DNS Proxy" introduced="^3" purpose="optional">
+<unit bldFile="os/networkingsrv/networkprotocols/dnsproxy/group" mrp="os/networkingsrv/networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
+</component>
+</collection>
+<collection name="networksecurity" long-name="Network Security" level="framework">
+<component name="tls" long-name="TLS" introduced="6.0" purpose="mandatory">
+<unit bldFile="os/networkingsrv/networksecurity/tls/group" mrp="os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
+</component>
+<component name="tlsprovider" long-name="TLS Provider" introduced="8.1" purpose="mandatory">
+<unit bldFile="os/networkingsrv/networksecurity/tlsprovider/group" mrp="os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
+</component>
+<component name="ipsec" long-name="IPsec" introduced="7.0" purpose="optional">
+<unit bldFile="os/networkingsrv/networksecurity/ipsec/group" mrp="os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
+</component>
+</collection>
+<collection name="networkingtestandutils" long-name="Networking Test and Utils" level="app-if">
+<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>
+</collection>
+<collection name="networkingsrv_info" long-name="Networking Services Info" level="app-if">
+<component name="networkingrom" long-name="Networking ROM" purpose="mandatory">
+<!-- production component: contains the IBY files -->
+<unit bldFile="os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
+</component>
+<component name="networkingdocs" long-name="Networking Documentation" purpose="development" class="doc">
+<unit mrp="os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
+</component>
+<component name="networkingsrv_metadata" long-name="Networking Services Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
+</component>
+</collection>
+<collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
+<component name="predictorcompression" long-name="Predictor Compression" introduced="6.0" purpose="optional" plugin="Y">
+<unit bldFile="os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
+</component>
+</collection>
+</block>
+<block name="wlan" level="services" long-name="WLAN" levels="hw low mid high tools test">
+<collection name="wlan_plat" long-name="WLAN Platform Interfaces" level="test">
+<component name="wlan_dbif_api" long-name="WLAN DBIF API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_dbif_api/group"/>
+</component>
+<component name="wlan_hal_api" long-name="WLAN HAL API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_hal_api/group"/>
+</component>
+<component name="wlan_management_api" long-name="WLAN Management API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_management_api/group"/>
+</component>
+<component name="wlan_device_settings_api" long-name="WLAN Device Settings API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_device_settings_api/group"/>
+</component>
+<component name="wlan_control_api" long-name="WLAN Control API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_control_api/group"/>
+</component>
+<component name="wlan_hw_initialization_data_api" long-name="WLAN Hardware Initialization Data API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_hw_initialization_data_api/group"/>
+</component>
+<component name="wlan_power_save_plugin_api" long-name="WLAN Power Save Plugin API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_power_save_plugin_api/group"/>
+</component>
+<component name="wlan_info_api" long-name="WLAN Info API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_info_api/group"/>
+</component>
+<component name="wlan_agent_hotspot_plugin_api" long-name="WLAN Agent Hotspot Plug-in API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
+</component>
+<component name="wlan_osa_api" long-name="WLAN OSA API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_osa_api/group"/>
+</component>
+<component name="wlan_spia_api" long-name="WLAN SPIA API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_spia_api/group"/>
+</component>
+<component name="wlan_hpa_api" long-name="WLAN HPA API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_hpa_api/group"/>
+</component>
+<component name="wlan_eapol_plugin_api" long-name="WLAN EAPOL Plugin API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_eapol_plugin_api/group"/>
+</component>
+<component name="wlan_generic_plugin_api" long-name="WLAN Generic Plugin API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_generic_plugin_api/group"/>
+</component>
+<component name="wlan_aws_plugin_api" long-name="WLAN AWS Plugin API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_aws_plugin_api/group"/>
+</component>
+</collection>
+<collection name="wlan_pub" long-name="WLAN Public Interfaces" level="test">
+<component name="wlan_sdk_info_api" long-name="WLAN SDK Info API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_pub/wlan_sdk_info_api/group"/>
+</component>
+</collection>
+<collection name="wlan_bearer" long-name="WLAN Bearer" level="hw">
+<component name="wlanpsmplugin" filter="s60" long-name="WLAN PSM Plugin" plugin="Y">
+<unit bldFile="os/wlan/wlan_bearer/wlanpsmplugin/group"/>
+</component>
+<component name="wlanagent" filter="s60" long-name="WLAN Agent">
+<unit bldFile="os/wlan/wlan_bearer/wlanagent/group"/>
+</component>
+<component name="wlandbif_cd" filter="s60" long-name="WLAN CommsDat interface">
+<unit bldFile="os/wlan/wlan_bearer/wlandbif_cd/group"/>
+</component>
+<!-- should follow component directory rules for stuff in wlan_symbian/ and put in a single component or split up properly -->
+<component name="wlanengine" filter="s60" long-name="WLAN Engine">
+<unit bldFile="os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
+</component>
+<component name="wlanldd" filter="s60" long-name="WLAN LDD">
+<unit bldFile="os/wlan/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
+</component>
+<component name="wlannwif" filter="s60" long-name="WLAN Network Interface">
+<unit bldFile="os/wlan/wlan_bearer/wlannwif/group"/>
+</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="adaptation hw-if plugin framework server app-if">
+<collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
+<component name="basebandchanneladaptor" long-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 name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
+<component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
+<unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
+</component>
+</collection>
+<collection name="fax" long-name="Fax" level="server">
+<component name="faxclientandserver" long-name="Fax Client and Server" purpose="optional">
+<unit bldFile="os/cellularsrv/fax/faxclientandserver/Group" mrp="os/cellularsrv/fax/faxclientandserver/Group/telephony_fax.mrp"/>
+</component>
+</collection>
+<collection name="smsprotocols" long-name="SMS Protocols" level="framework">
+<component name="smsstack" long-name="SMS Stack" introduced="6.0" purpose="mandatory" plugin="Y">
+<unit bldFile="os/cellularsrv/smsprotocols/smsstack/group" mrp="os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
+</component>
+</collection>
+<collection name="telephonyprotocols" long-name="Telephony Protocols" level="framework">
+<component name="csdagt" long-name="CSD AGT" introduced="6.1" purpose="optional" plugin="Y">
+<unit bldFile="os/cellularsrv/telephonyprotocols/csdagt/group" mrp="os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
+</component>
+<component name="psdagt" long-name="PSD AGT" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="os/cellularsrv/telephonyprotocols/psdagt/group" mrp="os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
+</component>
+<component name="gprsumtsqosprt" long-name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
+</component>
+<component name="gprsumtsqosinterface" long-name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
+</component>
+<component name="qosextnapi" long-name="QoS Extn API" introduced="9.2" purpose="optional">
+<unit bldFile="os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
+</component>
+<component name="secondarypdpcontextumtsdriver" long-name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
+<unit bldFile="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
+</component>
+<component name="qos3gppcpr" long-name="QoS 3GPP CPR" introduced="9.2" purpose="optional" plugin="Y">
+<unit bldFile="os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
+</component>
+<component name="pdplayer" long-name="PDP Layer" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/cellularsrv/telephonyprotocols/pdplayer/group" mrp="os/cellularsrv/telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
+</component>
+<component name="rawipnif" long-name="Raw IP NIF" introduced="8.1" purpose="optional" plugin="Y">
+<unit bldFile="os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
+</component>
+</collection>
+<collection name="telephonyserver" long-name="Telephony Server" level="server">
+<component name="etelserverandcore" long-name="ETel Server and Core" purpose="mandatory">
+<unit bldFile="os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
+</component>
+<component name="etelmultimode" long-name="ETel Multimode" introduced="7.0" purpose="mandatory">
+<unit bldFile="os/cellularsrv/telephonyserver/etelmultimode/group" mrp="os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
+</component>
+<component name="etelpacketdata" long-name="ETel Packet Data" introduced="7.0" purpose="mandatory">
+<unit bldFile="os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
+</component>
+<component name="etelsimtoolkit" long-name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory">
+<unit bldFile="os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
+</component>
+</collection>
+<collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
+<component name="common_tsy" long-name="Common TSY" introduced="^2" purpose="optional" plugin="Y">
+<unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
+</component>
+<component name="licenseetsystub" long-name="Licensee TSY Stub" introduced="^2" purpose="development" filter="sf_build" plugin="Y">
+<unit mrp="os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="os/cellularsrv/telephonyserverplugins/licenseetsystub/group"/>
+</component>
+<component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y">
+<unit bldFile="os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
+</component>
+<component name="ctsydispatchlayer" long-name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
+</component>
+<component name="simatktsy" long-name="SIMATK TSY" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/cellularsrv/telephonyserverplugins/simatktsy/group" mrp="os/cellularsrv/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
+</component>
+</collection>
+<collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
+<component name="dial" long-name="Dial" deprecated="9.1" purpose="optional">
+<unit bldFile="os/cellularsrv/telephonyutils/dial/group" mrp="os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
+</component>
+<component name="telephonywatchers" long-name="Telephony Watchers" introduced="6.0" purpose="optional" plugin="Y">
+<unit bldFile="os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
+</component>
+<component name="etel3rdpartyapi" long-name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
+<unit bldFile="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
+</component>
+</collection>
+<collection name="cellularsrv_info" long-name="Cellular Baseband Services Info" level="app-if">
+<component name="telephonyconfidentialdocs" long-name="Telephony Confidential Documentation" purpose="development" class="doc">
+<unit mrp="os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
+</component>
+<component name="telephonydocs" long-name="Telephony Documentation" purpose="development" class="doc">
+<unit mrp="os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
+</component>
+<component name="cellularsrv_metadata" long-name="Cellular Baseband Services Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
+</component>
+</collection>
+<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
+<component name="mocksy" long-name="MockSY" introduced="^2" purpose="development" plugin="Y">
+<unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
+</component>
+</collection>
+<collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if"/>
+<collection name="wapstack" long-name="WAP Stack" level="app-if">
+<component name="wapmessageapi" long-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>
+</block>
+<block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
+<collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
+<component name="bluetooth_audio_adaptation_api" long-name="Bluetooth Audio Adaptation API" filter="s60" class="api">
+<unit bldFile="os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
+</component>
+<component name="bluetooth_power_management_api" long-name="Bluetooth Power Management API" filter="s60" class="api">
+<unit bldFile="os/bt/bt_plat/bluetooth_power_management_api/group"/>
+</component>
+<component name="at_command_handler_plugin_api" long-name="AT Command Handler Plugin API" filter="s60" class="api">
+<unit bldFile="os/bt/bt_plat/at_command_handler_plugin_api/group"/>
+</component>
+</collection>
+<collection name="bluetooth" long-name="Bluetooth Core" level="framework">
+<component name="btstack" long-name="Bluetooth Stack" introduced="6.0" purpose="optional">
+<unit bldFile="os/bt/bluetooth/btstack" mrp="os/bt/bluetooth/btstack/bluetooth_stack.mrp"/>
+</component>
+<component name="btcomm" long-name="Bluetooth CSY" introduced="6.0" purpose="optional" plugin="Y">
+<unit bldFile="os/bt/bluetooth/btcomm" mrp="os/bt/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
+</component>
+<component name="btsdp" long-name="Bluetooth SDP" introduced="6.1" purpose="optional">
+<unit bldFile="os/bt/bluetooth/btsdp" mrp="os/bt/bluetooth/btsdp/bluetooth_sdp.mrp"/>
+</component>
+<component name="btextnotifiers" long-name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
+<unit bldFile="os/bt/bluetooth/btextnotifiers" mrp="os/bt/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
+</component>
+<component name="gavdp" long-name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
+<unit bldFile="os/bt/bluetooth/gavdp/group" mrp="os/bt/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
+</component>
+<component name="btlogger" long-name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
+<unit bldFile="os/bt/bluetooth/btlogger/group" mrp="os/bt/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
+</component>
+<component name="btdocs" long-name="Bluetooth Documentation" purpose="development" class="doc">
+<unit mrp="os/bt/bluetooth/btdocs/bluetooth_documentation.mrp"/>
+</component>
+</collection>
+<collection name="bluetoothmgmt" long-name="Bluetooth Management" level="plugin">
+<component name="btmgr" long-name="Bluetooth Manager" introduced="6.0" purpose="optional">
+<unit bldFile="os/bt/bluetoothmgmt/btmgr" mrp="os/bt/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
+</component>
+<component name="btconfig" long-name="Bluetooth Config" purpose="optional" class="config">
+<unit bldFile="os/bt/bluetoothmgmt/btconfig" mrp="os/bt/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
+</component>
+<component name="btrom" long-name="Bluetooth ROM" introduced="9.1" purpose="optional">
+<unit bldFile="os/bt/bluetoothmgmt/btrom" mrp="os/bt/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
+</component>
+<component name="bluetoothclientlib" long-name="Bluetooth Client Library" introduced="6.0" purpose="optional">
+<unit bldFile="os/bt/bluetoothmgmt/bluetoothclientlib" mrp="os/bt/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
+</component>
+</collection>
+<collection name="bluetoothcommsprofiles" long-name="Bluetooth Comms Profiles" level="app-if">
+<component name="btpan" long-name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" plugin="Y">
+<unit bldFile="os/bt/bluetoothcommsprofiles/btpan/group" mrp="os/bt/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
+</component>
+</collection>
+<collection name="bthci" long-name="Host Controller Interface" level="server">
+<component name="bthci2" long-name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
+<unit bldFile="os/bt/bthci/bthci2/group" mrp="os/bt/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
+</component>
+<component name="hciextensioninterface" long-name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
+<unit bldFile="os/bt/bthci/hciextensioninterface" mrp="os/bt/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
+</component>
+<component name="hci2implementations" long-name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" plugin="Y">
+<unit bldFile="os/bt/bthci/hci2implementations/group" mrp="os/bt/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
+</component>
+</collection>
+<collection name="irda" long-name="IrDA" level="plugin">
+<component name="irdastack" long-name="IrDA Stack" purpose="optional">
+<unit bldFile="os/bt/irda/irdastack/group" mrp="os/bt/irda/irdastack/group/infra-red_irda.mrp"/>
+</component>
+</collection>
+<collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if"/>
+<collection name="atext" long-name="AT Extensions" level="server">
+<!-- collection is really a component. Need to move down a directory -->
+<component name="atext_build" long-name="AT Extension Build" introduced="^3" purpose="optional" filter="s60">
+<unit bldFile="os/bt/atext/group"/>
+</component>
+</collection>
+<collection name="bt_info" long-name="Bluetooth Info" level="app-if">
+<component name="bt_metadata" long-name="Bluetooth Metadata" introduced="^3" purpose="development" class="config PC">
+<unit mrp="os/bt/bt_info/bt_metadata/bt_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
+<collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
+<!-- usbclientdrivers to be moved here from kernelhwsrv-->
+</collection>
+<collection name="usbmgmt" long-name="USB Management" level="server">
+<component name="usbmgr" long-name="USB Manager" purpose="optional">
+<unit bldFile="os/usb/usbmgmt/usbmgr/group" mrp="os/usb/usbmgmt/usbmgr/group/usb_manager.mrp" version="2"/>
+</component>
+<component name="usbclassandmgrdocs" long-name="USB Class and Manager Documentation" purpose="development" class="doc">
+<unit mrp="os/usb/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
+</component>
+</collection>
+<collection name="usb_info" long-name="USB Info" level="app-if">
+<component name="usb_metadata" long-name="USB Metadata" introduced="^3" purpose="development" class="config PC">
+<unit mrp="os/usb/usb_info/usb_metadata/usb_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="mm" level="services" long-name="Multimedia" levels="adaptation 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"/>
+</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"/>
+</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"/>
+</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"/>
+</component>
+</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"/>
+</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"/>
+</component>
+<component name="aac_decoder_config_proxy_api" long-name="AAC Decoder Config Proxy API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/aac_decoder_config_proxy_api/group"/>
+</component>
+<component name="added_devsound_control_api" long-name="Added DevSound Control API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/added_devsound_control_api/group"/>
+</component>
+<component name="added_devsound_control_msg_hdlr_api" long-name="Added DevSound Control Msg Hdlr API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/added_devsound_control_msg_hdlr_api/group"/>
+</component>
+<component name="added_devsound_control_proxy_api" long-name="Added DevSound Control Proxy API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/added_devsound_control_proxy_api/group"/>
+</component>
+<component name="audio_effects_msg_hdlr_api" long-name="Audio Effects Message Handler API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/audio_effects_msg_hdlr_api/group"/>
+</component>
+<component name="audio_effects_proxy_api" long-name="Audio Effects Proxy API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/audio_effects_proxy_api/group"/>
+</component>
+<component name="audio_policy_header_api" long-name="Audio Policy Header API" filter="s60" class="api">
+<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"/>
+</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"/>
+</component>
+<component name="audio_routing_proxy_api" long-name="Audio Routing Proxy API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/audio_routing_proxy_api/group"/>
+</component>
+<component name="custom_interface_builder_api" long-name="Custom Interface Builder API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/custom_interface_builder_api/group"/>
+</component>
+<component name="custom_interface_message_handler_factory_api" long-name="Custom Interface Message Handler Factory API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/custom_interface_message_handler_factory_api/group"/>
+</component>
+<component name="custom_interface_proxy_factory_api" long-name="Custom Interface Proxy Factory API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/custom_interface_proxy_factory_api/group"/>
+</component>
+<component name="custom_interface_utility_api" long-name="Custom Interface Utility API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/custom_interface_utility_api/group"/>
+</component>
+<component name="devsound_adaptation_api" long-name="DevSound Adaptation API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/devsound_adaptation_api/group"/>
+</component>
+<component name="display_posting_api" long-name="Display Posting API" filter="s60" class="api">
+<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"/>
+</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"/>
+</component>
+<component name="eaac_plus_decoder_interface_proxy_api" long-name="eAAC Plus Decoder Interface Proxy API" filter="s60" class="api">
+<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"/>
+</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"/>
+</component>
+<component name="error_concealment_interface_proxy_api" long-name="Error Concealment Interface Proxy API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
+</component>
+<component name="fm_radio_adaptation_api" long-name="FM Radio Adaptation API" filter="s60" class="api">
+<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"/>
+</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"/>
+</component>
+<component name="g711_decoder_interface_proxy_api" long-name="G711 Decoder Interface Proxy API" filter="s60" class="api">
+<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"/>
+</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"/>
+</component>
+<component name="g711_encoder_interface_proxy_api" long-name="G711 Encoder Interface Proxy API" filter="s60" class="api">
+<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"/>
+</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"/>
+</component>
+<component name="g729_decoder_interface_proxy_api" long-name="G729 Decoder Interface Proxy API" filter="s60" class="api">
+<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"/>
+</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"/>
+</component>
+<component name="g729_encoder_interface_msg_hdlr_api" long-name="G729 Encoder Interface Message Handler API" filter="s60" class="api">
+<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"/>
+</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"/>
+</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"/>
+</component>
+<component name="ilbc_decoder_interface_proxy_api" long-name="Ilbc Decoder Interface Proxy API" filter="s60" class="api">
+<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"/>
+</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"/>
+</component>
+<component name="ilbc_encoder_interface_proxy_api" long-name="Ilbc Encoder Interface Proxy API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_proxy_api/group"/>
+</component>
+<component name="mdf_plugin_uids" long-name="MDF Plug-in UIDs" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/mdf_plugin_uids/group"/>
+</component>
+<component name="multimedia_fourcc_definitions_api" long-name="Multimedia FourCC Definitions API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/multimedia_fourcc_definitions_api/group"/>
+</component>
+<component name="nokia_audio_policy_header_api" long-name="Nokia Audio Policy Header API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/nokia_audio_policy_header_api/group"/>
+</component>
+<component name="nokia_multimedia_fourcc_definitions_api" long-name="Nokia Multimedia Fourcc Definitions API" filter="s60" class="api">
+<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"/>
+</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"/>
+</component>
+<component name="ra8_decoder_interface_proxy_api" long-name="RA8 Decoder Interface Proxy API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
+</component>
+<component name="rds_adaptation_api" long-name="RDS Adaptation API" filter="s60" class="api">
+<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"/>
+</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"/>
+</component>
+<component name="restricted_audio_output_proxy_api" long-name="Restricted Audio Output Proxy API" filter="s60" class="api">
+<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"/>
+</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"/>
+</component>
+<component name="sbc_encoder_interface_proxy_api" long-name="SBC Encoder Interface Proxy API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/sbc_encoder_interface_proxy_api/group"/>
+</component>
+<component name="secure_output_mdf_custom_interface" long-name="Secure Output MDF Custom Interface" filter="s60" class="api">
+<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"/>
+</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"/>
+</component>
+<component name="speech_encoder_config_proxy_api" long-name="Speech Encoder Config Proxy API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/speech_encoder_config_proxy_api/group"/>
+</component>
+<component name="telephony_audio_routing_client_api" long-name="Telephony Audio Routing Client API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/telephony_audio_routing_client_api/group"/>
+</component>
+<component name="telephony_audio_routing_manager_api" long-name="Telephony Audio Routing Manager API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/telephony_audio_routing_manager_api/group"/>
+</component>
+<component name="video_buffer_management_mdf_custom_interface" long-name="Video Buffer Management MDF Custom Interface" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/video_buffer_management_mdf_custom_interface/group"/>
+</component>
+<component name="video_decoder_rotation_mdf_custom_interface" long-name="Video Decoder Rotation MDF Custom Interface" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
+</component>
+<component name="video_decoder_scaling_mdf_custom_interface" long-name="Video Decoder Scaling MDF Custom Interface" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
+</component>
+<component name="video_reclaim_extbuffers_ci" long-name="Video Reclaim Extbuffers Custom Interface" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/video_reclaim_extbuffers_ci/group"/>
+</component>
+<component name="video_window_control_custom_interface" long-name="Video Window Control Custom Interface" filter="s60" class="api">
+<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"/>
+</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"/>
+</component>
+<component name="wma_decoder_interface_proxy_api" long-name="WMA Decoder Interface Proxy API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/wma_decoder_interface_proxy_api/group"/>
+</component>
+<component name="eaacplusutil_api" long-name="EAac Plus Util API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/eaacplusutil_api/group"/>
+</component>
+<component name="frametable_api" long-name="Frametable API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/frametable_api/group"/>
+</component>
+</collection>
+<collection name="devsoundextensions" long-name="Devsound Extensions" level="device-fw">
+<component name="drmaudioplayer" filter="s60" long-name="DRM Audio Player">
+<unit bldFile="os/mm/devsoundextensions/drmaudioplayer/group"/>
+</component>
+<component name="mmextfw" filter="s60" long-name="Multimedia Extension Framework">
+<unit bldFile="os/mm/devsoundextensions/mmextfw/group"/>
+</component>
+<component name="audiorouting" filter="s60" long-name="Audio Routing">
+<unit bldFile="os/mm/devsoundextensions/audiorouting/group"/>
+</component>
+<component name="effects" filter="s60" long-name="Effects">
+<unit bldFile="os/mm/devsoundextensions/effects/group"/>
+</component>
+<component name="effectspresets" filter="s60" long-name="Effects Presets">
+<unit bldFile="os/mm/devsoundextensions/effectspresets/group"/>
+</component>
+<component name="effectspresets_utils" filter="s60" long-name="Effects Presets Utils">
+<!-- need to #include the lot from a single bld.inf
+ Also move to a standard component location, not under effectspresets -->
+<unit bldFile="os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
+<unit bldFile="os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
+</component>
+<component name="telephonyaudiorouting" filter="s60" long-name="Telephony Audio Routing">
+<unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/group"/>
+</component>
+<component name="mmfcustominterfaces" filter="s60" long-name="MMF Custom Interfaces">
+<unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/group"/>
+</component>
+<component name="addeddevsoundcontrol" filter="s60" long-name="Added DevSound Control">
+<unit bldFile="os/mm/devsoundextensions/addeddevsoundcontrol/group"/>
+</component>
+<component name="globalaudiosettings" filter="s60" long-name="Global Audio Settings">
+<unit bldFile="os/mm/devsoundextensions/globalaudiosettings/group"/>
+</component>
+<component name="restrictedaudiooutput" filter="s60" long-name="Restricted Audio Output">
+<unit bldFile="os/mm/devsoundextensions/restrictedaudiooutput/group"/>
+</component>
+<component name="ciextnfactoryplugins" filter="s60" long-name="Custom Interface Extension Factory Plugins" plugin="Y">
+<unit bldFile="os/mm/devsoundextensions/ciextnfactoryplugins/group"/>
+</component>
+</collection>
+<collection name="mdfdevvideoextensions" long-name="MDF Dev Video Extensions" level="device-fw">
+<component name="nga_mdf_postprocessor" long-name="NGA MDF Postprocessor" filter="s60">
+<unit bldFile="os/mm/mdfdevvideoextensions/nga_mdf_postprocessor/group"/>
+</component>
+</collection>
+<collection name="audio" long-name="Audio Codecs" level="middleware">
+<component name="arm_cmmf_codecs" filter="s60" long-name="ARM CMMF Codecs" plugin="Y">
+<unit bldFile="os/mm/audio/arm_cmmf_codecs/group"/>
+</component>
+</collection>
+<collection name="video" long-name="Video Codecs" level="middleware">
+<!-- empty -->
+</collection>
+<collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
+<component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
+<unit bldFile="os/mm/imagingandcamerafws/imagingfws/group" mrp="os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
+</component>
+<component name="camerafw" long-name="Camera Framework" introduced="7.0s" purpose="optional">
+<unit bldFile="os/mm/imagingandcamerafws/camerafw/group" mrp="os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
+</component>
+</collection>
+<collection name="mmlibs" long-name="Multimedia Libraries" level="middleware">
+<component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
+<unit bldFile="os/mm/mmlibs/mmutilitylib/group" mrp="os/mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
+</component>
+<component name="mmfw" long-name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
+<unit bldFile="os/mm/mmlibs/mmfw/group" mrp="os/mm/mmlibs/mmfw/group/multimedia_mmf.mrp"/>
+</component>
+</collection>
+<collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
+<component name="imagingplugins" long-name="Imaging Plugins" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="os/mm/mmplugins/imagingplugins/group" mrp="os/mm/mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
+</component>
+<component name="cameraplugins" long-name="Camera Plugins" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="os/mm/mmplugins/cameraplugins/group" mrp="os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
+</component>
+<component name="lib3gp" long-name="3GP Library" introduced="^2" purpose="optional">
+<unit bldFile="os/mm/mmplugins/lib3gp/group" mrp="os/mm/mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
+</component>
+<component name="mmfwplugins" long-name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="os/mm/mmplugins/mmfwplugins/group" mrp="os/mm/mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
+</component>
+</collection>
+<collection name="mm_info" long-name="Multimedia Info" level="app-if">
+<component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc">
+<unit mrp="os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
+</component>
+<component name="mm_metadata" long-name="Multimedia Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
+</component>
+</collection>
+<collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
+<component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="^2" purpose="development">
+<unit bldFile="os/mm/mmresourcemgmt/mmresctrl/group" mrp="os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
+</component>
+</collection>
+<collection name="mmdevicefw" long-name="Multimedia Device Framework" level="device-fw">
+<component name="mdf" long-name="Media Device Framework" introduced="9.2" purpose="mandatory">
+<unit bldFile="os/mm/mmdevicefw/mdf/group" mrp="os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
+</component>
+<component name="speechrecogsupport" long-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 name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
+<component name="videorenderer" long-name="Video Renderer" introduced="^3" purpose="optional">
+<unit bldFile="os/mm/mmswadaptation/videorenderer/group" mrp="os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
+</component>
+</collection>
+<collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw"/>
+<collection name="omxil" long-name="OpenMAX IL" level="hw-if">
+<component name="omxilapi" long-name="OpenMAX IL API" introduced="^3" purpose="optional">
+<unit bldFile="os/mm/omxil/omxilapi/group" mrp="os/mm/omxil/omxilapi/group/multimedia_omx_il_api.mrp" version="1"/>
+</component>
+<component name="omxilcore" long-name="OpenMAX IL Core" introduced="^3" purpose="optional">
+<unit bldFile="os/mm/omxil/omxilcore/group" mrp="os/mm/omxil/omxilcore/group/multimedia_omx_il_core.mrp" version="1"/>
+</component>
+<component name="omxilcomponentcommon" long-name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
+<unit bldFile="os/mm/omxil/omxilcomponentcommon/group" mrp="os/mm/omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp" version="1"/>
+</component>
+<component name="omxilrefcomps" long-name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
+<unit bldFile="os/mm/omxil/omxilrefcomps/ref_components/group" mrp="os/mm/omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp" version="1"/>
+</component>
+<component name="mmilapi" long-name="Multimedia Integration Layer API" introduced="^3" purpose="development">
+<unit bldFile="os/mm/omxil/mmilapi/group" mrp="os/mm/omxil/mmilapi/group/multimedia_il_api.mrp"/>
+</component>
+</collection>
+<collection name="devsound" long-name="Sound Device" level="devices">
+<component name="devsoundapi" long-name="DevSound API" introduced="7.0s" purpose="mandatory">
+<unit bldFile="os/mm/devsound/devsoundapi/group" mrp="os/mm/devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
+</component>
+<component name="a3fdevsound" long-name="A3F DevSound" introduced="^2" purpose="optional">
+<unit bldFile="os/mm/devsound/a3fdevsound/group" mrp="os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
+</component>
+<component name="a3facf" long-name="A3F Audio Component Framework" introduced="^2" purpose="optional">
+<unit bldFile="os/mm/devsound/a3facf/group" mrp="os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
+</component>
+<component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
+<unit bldFile="os/mm/devsound/devsoundpluginsupport/group" mrp="os/mm/devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
+</component>
+<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">
+<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">
+<unit bldFile="os/mm/devsound/a3ftrace/group" mrp="os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
+</component>
+<component name="a3fsrvstart" long-name="A3F Server Start" introduced="^2" purpose="optional" plugin="Y">
+<unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
+</component>
+</collection>
+<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
+<component name="devsoundhwdeviceapi" long-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 name="a3facl" long-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 name="a3fdevsoundcustomisation" long-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"/>
+</component>
+<component name="refacladapt" long-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"/>
+</component>
+<component name="videohai" long-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 name="dvbhreceiverhai" long-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>
+</block>
+<block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
+<collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
+<component name="exif_api" long-name="Exif API" filter="s60" class="api">
+<unit bldFile="os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
+</component>
+</collection>
+<collection name="imagingext_plat" long-name="Imaging Extensions Platform Interfaces" level="app-if">
+<component name="jpeg2000_icl_plugin_api" long-name="JPEG2000 ICL plugin API" filter="s60" class="api">
+<unit bldFile="os/imagingext/imagingext_plat/jpeg2000_icl_plugin_api/group"/>
+</component>
+<component name="extended_icl_jpeg_api" long-name="Extended ICL Jpeg API" filter="s60" class="api">
+<unit bldFile="os/imagingext/imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
+</component>
+<component name="h324_annex_k_custom_api" long-name="H324 Annex K Custom API" filter="s60" class="api">
+<unit bldFile="os/imagingext/imagingext_plat/h324_annex_k_custom_api/group"/>
+</component>
+<component name="ecam_orientation_custom_api" long-name="ECam Orientation Custom API" filter="s60" class="api">
+<unit bldFile="os/imagingext/imagingext_plat/ecam_orientation_custom_api/group"/>
+</component>
+<component name="ecam_ui_orientation_override_custom_api" long-name="ECam UI Orientation Override Custom API" filter="s60" class="api">
+<unit bldFile="os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
+</component>
+<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">
+<unit bldFile="os/imagingext/imagingext_plat/ecam_use_case_hint_custom_api/group"/>
+</component>
+</collection>
+<collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
+<component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
+<unit bldFile="os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
+</component>
+<component name="imageadaptationextensions_build" filter="s60" long-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"/>
+</component>
+</collection>
+<collection name="imagingmodules" long-name="Imaging Modules" level="hw-if">
+<component name="exiflib" filter="s60" long-name="Exif Library">
+<unit bldFile="os/imagingext/imagingmodules/exiflib/group"/>
+</component>
+<component name="jp2kcodec" filter="s60" long-name="JPEG2000 Decoder Plugin" plugin="Y">
+<unit bldFile="os/imagingext/imagingmodules/jp2kcodec/group"/>
+</component>
+</collection>
+</block>
+<block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
+<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
+<component name="vgi" filter="s60" long-name="VGI">
+<unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
+</component>
+</collection>
+<collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adaptations">
+<component name="m3gcore11" filter="s60" long-name="M3G Core 1.1">
+<unit bldFile="os/graphics/m3g/m3gcore11/group"/>
+</component>
+</collection>
+<collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines">
+<component name="graphicsresource" long-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 name="graphicsresourceadaptation" long-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"/>
+</component>
+</collection>
+<collection name="graphicsutils" long-name="Graphics Utils" level="engines">
+<component name="commongraphicsheaders" long-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 name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
+<!-- displayldd to be moved here -->
+<component name="surfacemgr" long-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 name="graphicscomposition" long-name="Graphics Composition" level="engines">
+<component name="openwfcinterface" long-name="OpenWF Composition Interface" introduced="^3" purpose="optional">
+<unit bldFile="os/graphics/graphicscomposition/openwfcinterface/group" mrp="os/graphics/graphicscomposition/openwfcinterface/group/graphics_openwfcinterface.mrp"/>
+</component>
+<component name="openwfcompositionengine" long-name="OpenWF Composition Engine" introduced="^3" purpose="development">
+<unit bldFile="os/graphics/graphicscomposition/openwfcompositionengine/group" mrp="os/graphics/graphicscomposition/openwfcompositionengine/group/graphics_openwfcompositionengine.mrp"/>
+</component>
+<component name="openwfsupport" long-name="OpenWF Support" introduced="^3" purpose="optional">
+<unit bldFile="os/graphics/graphicscomposition/openwfsupport/group" mrp="os/graphics/graphicscomposition/openwfsupport/group/graphics_openwfsupport.mrp"/>
+</component>
+<component name="surfaceupdate" long-name="Surface Update" introduced="^3" purpose="optional">
+<unit bldFile="os/graphics/graphicscomposition/surfaceupdate/group" mrp="os/graphics/graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
+</component>
+</collection>
+<collection name="graphicstest" long-name="Graphics Test" level="app-if">
+<component name="uibench" long-name="UI Bench" introduced="9.2" purpose="development">
+<unit bldFile="os/graphics/graphicstest/uibench/group" mrp="os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
+</component>
+</collection>
+<collection name="graphics_plat" long-name="Graphics Platform Interfaces" level="app-if">
+<component name="m3g_core_api" filter="sf_build" long-name="M3G Core API" class="api">
+<unit bldFile="os/graphics/graphics_plat/m3g_core_api/group"/>
+</component>
+</collection>
+<collection name="graphics_info" long-name="Graphics Info" level="app-if">
+<component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc">
+<unit mrp="os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
+</component>
+<component name="graphics_metadata" long-name="Graphics Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
+</component>
+</collection>
+<collection name="windowing" long-name="Windowing" level="app-if">
+<component name="windowserver" long-name="Window Server" purpose="mandatory">
+<unit bldFile="os/graphics/windowing/windowserver/group" mrp="os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
+</component>
+<component name="windowserverplugins" long-name="Window Server Plugins" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/graphics/windowing/windowserverplugins/group" mrp="os/graphics/windowing/windowserverplugins/group/graphics_wserv_std_plugins.mrp"/>
+</component>
+</collection>
+<collection name="printingservices" long-name="Printing Services" level="app-if">
+<component name="printerdriversupport" long-name="Printer Driver Support" purpose="optional">
+<unit bldFile="os/graphics/printingservices/printerdriversupport/group" mrp="os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
+</component>
+<component name="printerdrivers" long-name="Printer Drivers" purpose="optional" plugin="Y">
+<unit bldFile="os/graphics/printingservices/printerdrivers/group" mrp="os/graphics/printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
+</component>
+</collection>
+<collection name="fbs" long-name="Font and Bitmap Server" level="device-interface">
+<component name="fontandbitmapserver" long-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 name="opengles" long-name="OpenGLES" level="internal-adaptations">
+<component name="openglesinterface" long-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 name="opengles_stub" filter="sf_build" long-name="OpenGL ES Stub" purpose="optional" introduced="^2">
+<unit bldFile="os/graphics/opengles/openglesinterface/group/opengles_stub"/>
+</component>
+</collection>
+<collection name="openvg" long-name="OpenVG" level="internal-adaptations">
+<component name="openvginterface" long-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 name="openvg11" filter="s60" long-name="OpenVG 1.1">
+<!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
+<unit bldFile="os/graphics/openvg/openvginterface/group/openvg11"/>
+</component>
+<component name="sfopenvg" filter="sf_build" long-name="Khronos OpenVG Reference Implementation" introduced="^2" purpose="optional">
+<unit bldFile="os/graphics/openvg/openvgrefimplementation/sfopenvg/group"/>
+</component>
+</collection>
+<collection name="egl" long-name="EGL" level="internal-adaptations">
+<component name="eglinterface" long-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 name="eglswitch" long-name="EGL Switch" introduced="^3" purpose="optional">
+<unit bldFile="os/graphics/egl/eglswitch/group" mrp="os/graphics/egl/eglswitch/group/graphics_eglswitch.mrp"/>
+</component>
+<component name="eglrefimpl" long-name="EGL Reference Implementation" introduced="^3" purpose="optional">
+<unit bldFile="os/graphics/egl/eglrefimpl/group" mrp="os/graphics/egl/eglrefimpl/group/graphics_eglrefimpl.mrp"/>
+</component>
+<component name="egltest" long-name="EGL Tests" introduced="^3" purpose="development">
+<unit bldFile="os/graphics/egl/egltest/group" mrp="os/graphics/egl/egltest/group/graphics_egltest.mrp"/>
+</component>
+</collection>
+<collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
+<component name="gdi" long-name="GDI" purpose="mandatory">
+<unit bldFile="os/graphics/graphicsdeviceinterface/gdi/group" mrp="os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
+</component>
+<component name="bitgdi" long-name="BitGDI" purpose="mandatory">
+<unit bldFile="os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
+</component>
+<component name="colourpalette" long-name="Colour Palette" introduced="7.0s" purpose="optional">
+<unit bldFile="os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
+</component>
+<component name="screendriver" long-name="Screen Driver" introduced="6.1" purpose="optional" plugin="Y">
+<unit bldFile="os/graphics/graphicsdeviceinterface/screendriver/group" mrp="os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
+</component>
+<component name="directgdi" long-name="DirectGDI" introduced="^3" deprecated="^3" purpose="optional">
+<unit bldFile="os/graphics/graphicsdeviceinterface/directgdi/group" mrp="os/graphics/graphicsdeviceinterface/directgdi/group/graphics_directgdi.mrp"/>
+</component>
+<component name="directgdiinterface" long-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 name="directgdiadaptation" long-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"/>
+</component>
+</collection>
+<collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
+<component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC">
+<unit bldFile="os/graphics/graphicstools/gdi_tools/group" mrp="os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
+</component>
+</collection>
+<collection name="graphicsapitest" long-name="Graphics API Tests" level="app-if"/>
+</block>
+<block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
+<collection name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" level="text">
+<component name="findutil_api" long-name="Find Utility API" filter="s60" class="api">
+<unit bldFile="os/textandloc/textandloc_plat/findutil_api/group"/>
+</component>
+<component name="japanese_language_utilities_api" long-name="Japanese Language Utilities API" filter="s60" class="api">
+<unit bldFile="os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
+</component>
+<component name="sortutil_api" long-name="Sorting Utility API" filter="s60" class="api">
+<unit bldFile="os/textandloc/textandloc_plat/sortutil_api/group"/>
+</component>
+</collection>
+<collection name="textandloc_pub" long-name="Text and Localisation Public Interfaces" level="text">
+<component name="directory_localizer_api" long-name="Directory Localizer API" filter="s60" class="api">
+<unit bldFile="os/textandloc/textandloc_pub/directory_localizer_api/group"/>
+</component>
+</collection>
+<collection name="charconvfw" long-name="Character Conversion" level="encoding">
+<component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional">
+<unit bldFile="os/textandloc/charconvfw/charconv_fw/group" mrp="os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
+</component>
+<component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" plugin="Y">
+<unit bldFile="os/textandloc/charconvfw/charconvplugins/group" mrp="os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
+</component>
+<component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y">
+<unit bldFile="os/textandloc/charconvfw/fatfilenameconversionplugins/group" mrp="os/textandloc/charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
+</component>
+</collection>
+<collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
+<component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" plugin="Y">
+<unit bldFile="os/textandloc/fontservices/textshaperplugin/group" mrp="os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
+</component>
+<component name="fontstore" long-name="Font Store" purpose="mandatory">
+<unit bldFile="os/textandloc/fontservices/fontstore/group" mrp="os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
+</component>
+<component name="textrendering" long-name="Text Rendering" purpose="mandatory" class="placeholder">
+<!-- placeholder for text code from GDI -->
+</component>
+<component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y">
+<unit bldFile="os/textandloc/fontservices/freetypefontrasteriser/group" mrp="os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
+</component>
+<component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional">
+<unit bldFile="os/textandloc/fontservices/referencefonts/group" mrp="os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
+</component>
+</collection>
+<collection name="textlayout" long-name="Text Layout" level="text">
+<component name="texthandling" long-name="Text Handling" purpose="optional">
+<unit bldFile="os/textandloc/textrendering/texthandling/group" mrp="os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
+</component>
+<component name="textformatting" long-name="Text Formatting" purpose="optional">
+<unit bldFile="os/textandloc/textrendering/textformatting/group" mrp="os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
+</component>
+</collection>
+<collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
+<!-- components in this collection need to be moved to the right collection.
+ Either move into the units' directories, or create a new textandlocutils directory -->
+<component name="numbergrouping" filter="s60" long-name="Number Grouping">
+<unit bldFile="os/textandloc/charconvfw/numbergrouping/group"/>
+</component>
+<component name="jplangutil" filter="s60" long-name="Japanese Language Utilities">
+<unit bldFile="os/textandloc/charconvfw/jplangutil/group"/>
+</component>
+<component name="sortutil" filter="s60" long-name="Sorting Utility">
+<unit bldFile="os/textandloc/charconvfw/sortutil/group"/>
+</component>
+<component name="inlinetext" filter="s60" long-name="Inline Text">
+<unit bldFile="os/textandloc/charconvfw/inlinetext/group"/>
+</component>
+<component name="nearestlangutil" long-name="Nearest Language Util" introduced="^2" purpose="mandatory" class="placeholder">
+<!-- placeholder for split from bafl -->
+</component>
+<component name="numberformatting" long-name="Number Formatting" introduced="7.0s" purpose="optional">
+<unit bldFile="os/textandloc/textrendering/numberformatting/group" mrp="os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
+</component>
+</collection>
+<collection name="localesupport" long-name="Locale Support" level="util">
+<component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y">
+<unit bldFile="os/textandloc/localisation/localesupport" mrp="os/textandloc/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
+</component>
+<component name="initlocale" long-name="Initialise Locale" introduced="^2" purpose="mandatory" class="placeholder">
+<!-- placeholder for split from bafl -->
+</component>
+</collection>
+<collection name="textandloctools" long-name="Text and Localisation Tools" level="tools">
+<component name="fontcompiler" long-name="Font Compiler" purpose="development" class="placeholder PC">
+<!-- placeholder for split from GDI Tools -->
+</component>
+<component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC">
+<unit bldFile="os/graphics/graphicstools/bitmapfonttools/group" mrp="os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
+</component>
+</collection>
+<collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
+<component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
+<collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
+<component name="xmlsrv_plat_build" long-name="XML Services Platform Interface Build" filter="s60" class="api">
+<!-- need to fix the configuration used here.
+ Either destribute to other components or use the new feature flags confguration mechanisms.
+ Remove this component and uncomment the other units when fixed-->
+<unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
+</component>
+<component name="xml_encryption_api" long-name="XML Encryption API" filter="s60" class="api placeholder">
+<!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/> -->
+</component>
+<component name="xml_signature_api" long-name="XML Signature API" filter="s60" class="api placeholder">
+<!-- <unit bldFile="xmlsrv_plat/xml_signature_api/group"/> -->
+</component>
+<component name="xml_security_engine_utils_api" long-name="XML Security Engine Utils API" filter="s60" class="api placeholder">
+<!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/> -->
+</component>
+</collection>
+<collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
+<component name="xmlseccertman" filter="s60" long-name="XML Security Certificate Manager">
+<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
+</component>
+<component name="xmlsec" filter="s60" long-name="XML Security">
+<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsec/group"/>
+</component>
+<component name="xmlseccrypto" filter="s60" long-name="XML Security Crypto">
+<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccrypto/group"/>
+</component>
+<component name="xmlsecwrapper" filter="s60" long-name="XML Security Wrapper">
+<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsecwrapper/group"/>
+</component>
+</collection>
+<collection name="xml" long-name="XML" level="generic">
+<component name="xmlfw" long-name="XML Framework" introduced="7.0s" purpose="optional">
+<unit bldFile="os/xmlsrv/xml/xmlfw/group" mrp="os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
+</component>
+<component name="libxml2libs" long-name="Libxml2 Libraries" introduced="^3" purpose="optional">
+<unit bldFile="os/xmlsrv/xml/libxml2libs/group" mrp="os/xmlsrv/xml/libxml2libs/group/syslibs_libxml2.mrp"/>
+</component>
+<component name="legacyminidomparser" long-name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
+<unit bldFile="os/xmlsrv/xml/legacyminidomparser/GROUP" mrp="os/xmlsrv/xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp"/>
+</component>
+<component name="xmldomandxpath" long-name="XML DOM and XPath" introduced="^3" purpose="optional">
+<unit bldFile="os/xmlsrv/xml/xmldomandxpath/group" mrp="os/xmlsrv/xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
+</component>
+<component name="xmlexpatparser" long-name="XML Expat Parser" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="os/xmlsrv/xml/xmlexpatparser/group" mrp="os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
+</component>
+<component name="xmllibxml2parser" long-name="XML Libxml2 Parser" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/xmlsrv/xml/xmllibxml2parser/group" mrp="os/xmlsrv/xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
+</component>
+<component name="wbxmlparser" long-name="WBXML Parser" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="os/xmlsrv/xml/wbxmlparser/group" mrp="os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
+</component>
+</collection>
+<collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
+<component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="deviceplatformrelease" level="services" long-name="Device Platform Release" levels="bld mid top">
+<collection name="s60extras" long-name="S60 Extras" level="mid">
+<!-- collection is really a component. Need to move down a directory -->
+<component name="s60extras_build" filter="s60" long-name="S60 Extras Build" purpose="development" class="config">
+<unit bldFile="os/deviceplatformrelease/S60Extras/group"/>
+</component>
+</collection>
+<collection name="locfiles" long-name="Locale Files" level="mid">
+<component name="locfiles_build" filter="s60" long-name="S60 Locale Files Build" purpose="development" class="config">
+<!-- need to move component down a directory -->
+<unit bldFile="os/deviceplatformrelease/locfiles/group"/>
+</component>
+<component name="locfiles_set1" long-name="Locale Files Set 1" filter="s60" class="config">
+<unit bldFile="os/deviceplatformrelease/locfiles/group/set1"/>
+</component>
+<component name="locfiles_set2" long-name="Locale Files Set 2" filter="s60" class="config">
+<unit bldFile="os/deviceplatformrelease/locfiles/group/set2"/>
+</component>
+<component name="locfiles_set3" long-name="Locale Files Set 3" filter="s60" class="config">
+<unit bldFile="os/deviceplatformrelease/locfiles/group/set3"/>
+</component>
+<component name="locfiles_set4" long-name="Locale Files Set 4" filter="s60" class="config">
+<unit bldFile="os/deviceplatformrelease/locfiles/group/set4"/>
+</component>
+<component name="locfiles_set5" long-name="Locale Files Set 5" filter="s60" class="config">
+<unit bldFile="os/deviceplatformrelease/locfiles/group/set5"/>
+</component>
+<component name="locfiles_set6" long-name="Locale Files Set 6" filter="s60" class="config">
+<unit bldFile="os/deviceplatformrelease/locfiles/group/set6"/>
+</component>
+<!-- is the a problem with SF builds with the following? -->
+<component name="locfiles_set7" long-name="Locale Files Set 7" filter="s60" class="config">
+<unit bldFile="os/deviceplatformrelease/locfiles/group/set7"/>
+</component>
+<component name="locfiles_set8" long-name="Locale Files Set 8" filter="s60" class="config">
+<unit bldFile="os/deviceplatformrelease/locfiles/group/set8"/>
+</component>
+<component name="locfiles_set9" long-name="Locale Files Set 9" filter="s60" class="config">
+<unit bldFile="os/deviceplatformrelease/locfiles/group/set9"/>
+</component>
+<component name="locfiles_set10" long-name="Locale Files Set 10" filter="s60" class="config">
+<unit bldFile="os/deviceplatformrelease/locfiles/group/set10"/>
+</component>
+<component name="locfiles_set11" long-name="Locale Files Set 11" filter="s60" class="config">
+<unit bldFile="os/deviceplatformrelease/locfiles/group/set11"/>
+</component>
+<component name="locfiles_set12" long-name="Locale Files Set 12" filter="s60" class="config">
+<unit bldFile="os/deviceplatformrelease/locfiles/group/set12"/>
+</component>
+<component name="locfiles_set13" long-name="Locale Files Set 13" filter="s60" class="config">
+<unit bldFile="os/deviceplatformrelease/locfiles/group/set13"/>
+</component>
+<component name="locfiles_set14" long-name="Locale Files Set 14" filter="s60" class="config">
+<unit bldFile="os/deviceplatformrelease/locfiles/group/set14"/>
+</component>
+<component name="locfiles_set15" long-name="Locale Files Set 15" filter="s60" class="config">
+<unit bldFile="os/deviceplatformrelease/locfiles/group/set15"/>
+</component>
+<component name="locfiles_set16" long-name="Locale Files Set 16" filter="s60" class="config">
+<unit bldFile="os/deviceplatformrelease/locfiles/group/set16"/>
+</component>
+</collection>
+<collection name="version" long-name="Version" level="top">
+<!-- collection is really a component. Need to move down a directory -->
+<component name="version_build" filter="s60" long-name="Version Build" purpose="development" class="config">
+<unit bldFile="os/deviceplatformrelease/Version/group"/>
+</component>
+</collection>
+<collection name="helps_loc2" long-name="Helps Locale 2" level="top">
+<!-- collection is really a component. Need to move down a directory -->
+<component name="helps_loc2_build" long-name="Helps Locale 2 Build" filter="s60">
+<unit bldFile="os/deviceplatformrelease/helps_loc2/group"/>
+</component>
+</collection>
+<collection name="sf_config" long-name="SF Config" level="mid">
+<component name="config" filter="s60" long-name="Config" purpose="development" class="config"/>
+<component name="cenrep" filter="sf_build" long-name="ConE Central Repository Config" purpose="development" class="config">
+<!-- will shoudl give the id/path something more unique than cenrep -->
+<unit bldFile="os/deviceplatformrelease/sf_config/cenrep/group"/>
+</component>
+<component name="rombuild_syborg" filter="sf_build" long-name="Syborg iMaker Config" purpose="development" introduced="^3" class="config">
+<unit bldFile="os/deviceplatformrelease/sf_config/rombuild/syborg/group"/>
+</component>
+<component name="rombuild_zoom2" filter="sf_build" long-name="Zoom2 iMaker Config" purpose="development" introduced="^3" class="config">
+<unit bldFile="os/deviceplatformrelease/sf_config/rombuild/zoom2/group"/>
+</component>
+</collection>
+<!-- should be located locally in buildplatforms/group. NB. This is a different package! -->
+<collection name="s60bld" long-name="S60 Build">
+<component name="buildplatforms" filter="s60" long-name="Build Platforms">
+<unit bldFile="tools/buildplatforms/group"/>
+</component>
+</collection>
+<collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
+<component name="cedarutils" long-name="Cedar Utils" purpose="development">
+<unit mrp="os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
+</component>
+<component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt" purpose="development" class="config">
+<unit mrp="os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
+</component>
+<component name="foundation_s60_packages" long-name="Foundation S60 Packages" introduced="^3" deprecated="^3" purpose="development" class="config PC">
+<unit mrp="os/deviceplatformrelease/symbianosbld/foundation_s60_packages/foundation_s60_packages.mrp"/>
+</component>
+</collection>
+<collection name="foundation_system" long-name="Foundation System" level="top">
+<component name="system_model" long-name="System Model" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
+</component>
+</collection>
+<collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
+<component name="deviceplatformrelease_metadata" long-name="Device Platform Release Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="osrndtools" level="services" long-name="OS R&D tools" levels="fw trace">
+<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"/>
+</component>
+<component name="testinterface" filter="s60" long-name="Test Interface" purpose="development">
+<unit bldFile="os/osrndtools/stif/testinterface/group"/>
+</component>
+<component name="testserver" filter="s60" long-name="Test Server" purpose="development">
+<unit bldFile="os/osrndtools/stif/testserver/group"/>
+</component>
+<component name="testengine" filter="s60" long-name="Test Engine" purpose="development">
+<unit bldFile="os/osrndtools/stif/testengine/group"/>
+</component>
+<component name="testserverstarter" filter="s60" long-name="Test Server Starter" purpose="development">
+<unit bldFile="os/osrndtools/stif/testserverstarter/group"/>
+</component>
+<component name="stiftfwif" filter="s60" long-name="STIF Test Framework Interface" purpose="development">
+<unit bldFile="os/osrndtools/stif/stiftfwif/group"/>
+</component>
+<component name="consoleui" filter="s60" long-name="Console UI" purpose="development">
+<unit bldFile="os/osrndtools/stif/consoleui/group"/>
+</component>
+<component name="testcombiner" filter="s60" long-name="Test Combiner" purpose="development">
+<unit bldFile="os/osrndtools/stif/testcombiner/group"/>
+</component>
+<component name="demomodule" filter="s60" long-name="Demo Module" purpose="development">
+<unit bldFile="os/osrndtools/stif/demomodule/group"/>
+</component>
+<component name="atslogger" filter="s60" long-name="ATS Logger" purpose="development">
+<unit bldFile="os/osrndtools/stif/atslogger/group"/>
+</component>
+<component name="atsinterface" filter="s60" long-name="ATS Interface" purpose="development">
+<unit bldFile="os/osrndtools/stif/atsinterface/group"/>
+</component>
+<component name="testscripter" filter="s60" long-name="Test Scripter" purpose="development">
+<unit bldFile="os/osrndtools/stif/testscripter/group"/>
+</component>
+<component name="suevent" filter="s60" long-name="SU Event" purpose="development">
+<unit bldFile="os/osrndtools/stif/suevent/group"/>
+</component>
+<component name="stifkerneltestclassbase" filter="s60" long-name="STIF Kernel Test Class Base" purpose="development">
+<!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
+<!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
+</component>
+<component name="stif_build" filter="s60" long-name="STIF Build" purpose="development">
+<!-- move exports into self-contained component. Remove this when configuration is in place-->
+<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">
+<unit bldFile="os/osrndtools/memspy/memspy_plat/group"/>
+</component>
+<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">
+<unit bldFile="os/osrndtools/memspy/engine/group"/>
+</component>
+<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">
+<unit bldFile="os/osrndtools/memspy/console/group"/>
+</component>
+<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>
+</collection>
+<collection name="hti" long-name="Harmonized Test Interface" level="trace">
+<component name="hti_plat" filter="s60" long-name="HTI Platform Interfaces" purpose="development" class="api">
+<unit bldFile="os/osrndtools/hti/hti_plat/group"/>
+</component>
+<component name="hticfg" filter="s60" long-name="HTI Config" purpose="development">
+<unit bldFile="os/osrndtools/hti/hticfg/group"/>
+</component>
+<component name="htiautostart" filter="s60" long-name="HTI Autostart" purpose="development">
+<unit bldFile="os/osrndtools/hti/htiautostart/group"/>
+</component>
+<component name="htiframework" filter="s60" long-name="HTI Framework" purpose="development">
+<unit bldFile="os/osrndtools/hti/htiframework/group"/>
+</component>
+<component name="hticommplugins" filter="s60" long-name="HTI Communication Plugins" purpose="development" plugin="Y">
+<!-- need to #include these from a single unit or separate into component at the right directory level -->
+<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
+<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
+<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
+<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
+</component>
+<component name="htiserviceplugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
+<!-- need to #include these from a single unit or separate into component at the right directory level -->
+<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
+<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
+<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
+<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
+<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
+</component>
+<component name="htifilehlp" filter="s60" long-name="HTI File Help" purpose="development">
+<unit bldFile="os/osrndtools/hti/htifilehlp/group"/>
+</component>
+<component name="htiwatchdog" filter="s60" long-name="HTI Watchdog" purpose="development">
+<unit bldFile="os/osrndtools/hti/htiwatchdog/group"/>
+</component>
+<component name="hti_build" filter="s60" long-name="HTI Build" purpose="development">
+<!-- move exports into self-contained component.-->
+<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">
+<block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
+<collection name="appsupport_pub" long-name="Generic Application Support Public Interfaces" level="specific">
+<component name="flash_viewer_framework_api" long-name="Flash Viewer Framework API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
+</component>
+<component name="network_status_api" long-name="Network Status API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_pub/network_status_api/group"/>
+</component>
+</collection>
+<collection name="appsupport_plat" long-name="Generic Application Support Platform Interfaces" level="specific">
+<component name="action_plugin_api" long-name="Action Plug-In API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/action_plugin_api/group"/>
+</component>
+<component name="application_orientation_api" long-name="Application Orientation API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/application_orientation_api/group"/>
+</component>
+<component name="context_access_api" long-name="Context Access API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/context_access_api/group"/>
+</component>
+<component name="context_framework_services_api" long-name="Context Framework Services API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/context_framework_services_api/group"/>
+</component>
+<component name="context_framework_client_api" long-name="Context Framework Client API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/context_framework_client_api/group"/>
+</component>
+<component name="context_framework_listener_api" long-name="Context Framework Listener API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/context_framework_listener_api/group"/>
+</component>
+<component name="context_framework_version_api" long-name="Context Framework Version API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/context_framework_version_api/group"/>
+</component>
+<component name="context_source_plugin_api" long-name="Context Source Plug-In API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/context_source_plugin_api/group"/>
+</component>
+<component name="context_source_settings_manager_api" long-name="Context Source Settings Manager API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/context_source_settings_manager_api/group"/>
+</component>
+<component name="context_subscription_api" long-name="Context Subscription API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/context_subscription_api/group"/>
+</component>
+<component name="key_event_framework_api" long-name="Key Event Framework API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_api/group"/>
+</component>
+<component name="key_event_framework_mapper_api" long-name="Key Event Framework Mapper API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_mapper_api/group"/>
+</component>
+<component name="media_keys_definition_api" long-name="Media Keys Definition API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/media_keys_definition_api/group"/>
+</component>
+<component name="ood_threshold_api" long-name="OOD Threshold API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/ood_threshold_api/group"/>
+</component>
+<component name="oom_monitor_api" long-name="OOM Monitor API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_api/group"/>
+</component>
+<component name="oom_monitor_plugin_api" long-name="OOM Monitor Plugin API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_plugin_api/group"/>
+</component>
+<component name="operation_provider_api" long-name="Operation Provider API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/operation_provider_api/group"/>
+</component>
+<component name="phonecmdhandler_api" long-name="Phone Command Handler API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/phonecmdhandler_api/group"/>
+</component>
+<component name="restore_factory_settings_api" long-name="Restore Factory Settings API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_api/group"/>
+</component>
+<component name="restore_factory_settings_plugin_api" long-name="Restore Factory Settings Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_plugin_api/group"/>
+</component>
+<component name="secondary_display_accfw_api" long-name="Secondary Display Accessory Framework API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_accfw_api/group"/>
+</component>
+<component name="secondary_display_startup_api" long-name="Secondary Display Startup API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_startup_api/group"/>
+</component>
+<component name="secondary_display_sysap_api" long-name="Secondary Display System Application API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_sysap_api/group"/>
+</component>
+<component name="secondary_display_system_state_api" long-name="Secondary Display System State API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_system_state_api/group"/>
+</component>
+<component name="sensor_user_setting_api" long-name="Sensor User Setting API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/sensor_user_setting_api/group"/>
+</component>
+<component name="startup_configuration_api" long-name="Startup Configuration API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/startup_configuration_api/group"/>
+</component>
+<component name="system_application_key_handler_plugin_api" long-name="System Application Key Handler Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/system_application_key_handler_plugin_api/group"/>
+</component>
+<component name="system_application_light_control_plugin_api" long-name="System Application Light Control Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/system_application_light_control_plugin_api/group"/>
+</component>
+<component name="system_application_notification_api" long-name="System Application Notification API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/system_application_notification_api/group"/>
+</component>
+<component name="system_application_plugin_callback_api" long-name="System Application Plug-in Callback API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
+</component>
+</collection>
+<collection name="contextframework" long-name="Context Framework" level="framework">
+<!-- the units that are commented out need to be put back when configuration is in place.
+ They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
+<component name="cfw" filter="s60" long-name="Context Framework">
+<!--<unit bldFile="contextframework/cfw/group"/> -->
+</component>
+<component name="cfwplugins" filter="s60" long-name="Context Framework Plugins" plugin="Y">
+<!--<unit bldFile="contextframework/cfwplugins/group"/>-->
+</component>
+<component name="contextframework_build" filter="s60" long-name="Context Framework Build">
+<unit bldFile="mw/appsupport/contextframework/group"/>
+</component>
+</collection>
+<collection name="coreapplicationuis" long-name="Core Application UIs" level="server">
+<component name="dbrecovery" filter="s60" long-name="Database Recovery">
+<unit bldFile="mw/appsupport/coreapplicationuis/dbrecovery/group"/>
+</component>
+<component name="nspswsplugin" filter="s60" long-name="NSPS WS Plugin" plugin="Y">
+<!-- No Service Power Save? Window Server? Please elaborate-->
+<unit bldFile="mw/appsupport/coreapplicationuis/nspswsplugin/group"/>
+</component>
+<component name="rfs" filter="s60" long-name="Restore Factory Settings">
+<unit bldFile="mw/appsupport/coreapplicationuis/rfs/group"/>
+</component>
+<component name="rfsplugins" filter="s60" long-name="Restore Factory Settings Plugins" plugin="Y">
+<unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/group"/>
+</component>
+<component name="sysap" filter="s60" long-name="System Application">
+<unit bldFile="mw/appsupport/coreapplicationuis/sysap/group"/>
+</component>
+<component name="variatedsettings" filter="s60" long-name="Variated Settings" class="config">
+<unit bldFile="mw/appsupport/coreapplicationuis/variatedsettings/group"/>
+</component>
+<component name="accfwuinotifier" filter="s60" long-name="Accessory Framework UI Notifier" plugin="Y">
+<unit bldFile="mw/appsupport/coreapplicationuis/accfwuinotifier/group"/>
+</component>
+<component name="kefmapper" filter="s60" long-name="Key Event Framework">
+<unit bldFile="mw/appsupport/coreapplicationuis/kefmapper/group"/>
+</component>
+<component name="advancedtspcontroller" filter="s60" long-name="Advanced TSP Controller">
+<unit bldFile="mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
+</component>
+<component name="powersaveutilities" filter="s60" long-name="Power Save Utilities">
+<unit bldFile="mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
+</component>
+<component name="gsserverenginestub" filter="s60" long-name="GS Server Engine Stub">
+<unit bldFile="mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
+</component>
+<component name="gsserverengine" filter="s60" long-name="GS Server Engine">
+<unit bldFile="mw/appsupport/coreapplicationuis/gsserverengine/group"/>
+</component>
+<component name="sensordatacompensatorplugin" filter="s60" long-name="Sensor Data Compensator Plugin" plugin="Y">
+<unit bldFile="mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/group"/>
+</component>
+</collection>
+<collection name="flashliteapi_3_1" long-name="Flash Lite API 3.1" level="specific">
+<!-- collection is really a component. Move down a directory -->
+<component name="flashliteapi_3_1_build" long-name="Flash Lite API Build" filter="s60" introduced="^2"/>
+</collection>
+<collection name="mediakeys" long-name="Media Keys" level="plugin">
+<!-- collection is really a component. Move down a directory -->
+<component name="mediakeys_build" filter="s60" long-name="Media Keys Build">
+<unit bldFile="mw/appsupport/mediakeys/group"/>
+</component>
+</collection>
+<collection name="startupservices" long-name="Startup Services" level="system">
+<component name="splashscreen" filter="s60" long-name="Splash Screen">
+<unit bldFile="mw/appsupport/startupservices/splashscreen/group"/>
+</component>
+<component name="startupanimation" filter="s60" long-name="Startup Animation">
+<unit bldFile="mw/appsupport/startupservices/startupanimation/group"/>
+</component>
+<component name="startup" long-name="Startup Application" filter="s60">
+<unit bldFile="mw/appsupport/startupservices/startup/group"/>
+</component>
+</collection>
+<collection name="sysresmonitoring" long-name="System Resource Monitoring" level="system">
+<component name="oodmonitor" filter="s60" long-name="OOD Monitor" introduced="7.0s">
+<unit bldFile="mw/appsupport/sysresmonitoring/oodmonitor/group"/>
+</component>
+<component name="oommonitor" filter="s60" long-name="OOM Monitor" introduced="7.0s">
+<unit bldFile="mw/appsupport/sysresmonitoring/oommonitor/group"/>
+</component>
+</collection>
+<collection name="systemsettings" long-name="System Settings" level="system">
+<component name="gssensorplugin" filter="s60" long-name="GS Sensor Plugin" plugin="Y">
+<unit bldFile="mw/appsupport/systemsettings/gssensorplugin/group"/>
+</component>
+<component name="gsaccessoryplugin" filter="s60" long-name="GS Accessory Plugin" plugin="Y">
+<unit bldFile="mw/appsupport/systemsettings/gsaccessoryplugin/group"/>
+</component>
+</collection>
+<collection name="filehandling" long-name="File Handling" level="server">
+<component name="fileconverterfw" long-name="File Converter Framework" purpose="optional">
+<unit bldFile="mw/appsupport/filehandling/fileconverterfw/group" mrp="mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
+</component>
+<component name="htmltorichtextconverter" long-name="HTML to RichText Converter" introduced="7.0" purpose="optional" plugin="Y">
+<unit bldFile="mw/appsupport/filehandling/htmltorichtextconverter/group" mrp="mw/appsupport/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
+</component>
+<component name="richtexttohtmlconverter" long-name="RichText to HTML Converter" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
+</component>
+</collection>
+<collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
+<component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" plugin="Y">
+<unit bldFile="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
+</component>
+</collection>
+<collection name="commonappservices" long-name="Common Application Services" level="framework">
+<component name="alarmserver" long-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"/>
+</component>
+<component name="alarmservertest" long-name="Alarm Server Test" deprecated="^3" introduced="8.1" purpose="development">
+<unit bldFile="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
+</component>
+<component name="appservicesdocs" long-name="Application Services Documentation" purpose="development" class="doc">
+<unit mrp="mw/appsupport/commonappservices/appservicesdocs/app-services_documentation.mrp"/>
+</component>
+<component name="backuprestorenotification" long-name="Backup Restore Notification" introduced="8.1" purpose="optional">
+<unit bldFile="mw/appsupport/commonappservices/backuprestorenotification/group" mrp="mw/appsupport/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
+</component>
+</collection>
+<collection name="tzservices" long-name="Time Zone Services" level="plugin">
+<component name="tzserver" long-name="Time Zone Server" introduced="9.1" purpose="optional">
+<unit bldFile="mw/appsupport/tzservices/tzserver/group" mrp="mw/appsupport/tzservices/tzserver/group/app-services_tz.mrp"/>
+</component>
+<component name="tzloc" long-name="Time Zone Localization" introduced="9.1" purpose="optional">
+<unit bldFile="mw/appsupport/tzservices/tzloc/group" mrp="mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
+</component>
+<component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
+<unit bldFile="mw/appsupport/tzservices/tzlocrscfactory/group" mrp="mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
+</component>
+<component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
+<unit bldFile="mw/appsupport/tzservices/tzdatabase/group" mrp="mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
+</component>
+</collection>
+<collection name="contenthandling" long-name="Content Handling" level="plugin">
+<component name="webrecognisers" long-name="Web Recognisers" purpose="optional" plugin="Y">
+<unit bldFile="mw/appsupport/contenthandling/webrecognisers/group" mrp="mw/appsupport/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
+</component>
+</collection>
+<collection name="openenvutils" long-name="Open Environment Utilities" level="specific">
+<component name="commandshell" long-name="Command Shell" introduced="^3" purpose="development">
+<unit bldFile="mw/appsupport/openenvutils/commandshell/group" mrp="mw/appsupport/openenvutils/commandshell/group/oetools_zsh.mrp"/>
+</component>
+<component name="telnetserver" long-name="Telnet Server" introduced="^3" purpose="development">
+<unit bldFile="mw/appsupport/openenvutils/telnetserver/group" mrp="mw/appsupport/openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
+</component>
+</collection>
+<collection name="printingsupport" long-name="Printing Support" level="generic">
+<component name="printinguisupport" long-name="Printing UI Support" purpose="optional" introduced="^2" deprecated="^3">
+<unit bldFile="mw/appsupport/printingsupport/printinguisupport/group" mrp="mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
+</component>
+</collection>
+<collection name="appfw" long-name="Application Framework" level="framework">
+<component name="apparchitecture" long-name="Application Architecture" purpose="mandatory">
+<unit bldFile="mw/appsupport/appfw/apparchitecture/group" mrp="mw/appsupport/appfw/apparchitecture/group/app-framework_apparc.mrp"/>
+</component>
+<component name="viewserver" long-name="View Server" introduced="6.0" purpose="mandatory">
+<unit bldFile="mw/appsupport/appfw/viewserver/group" mrp="mw/appsupport/appfw/viewserver/group/app-framework_viewsrv.mrp"/>
+</component>
+</collection>
+<collection name="applaunchservices" long-name="Application Launch Services" level="generic">
+<component name="aftermarketappstarter" long-name="After Market Application Starter" introduced="^3" purpose="optional">
+<unit bldFile="mw/appsupport/applaunchservices/aftermarketappstarter/group" mrp="mw/appsupport/applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
+</component>
+<component name="applaunchplugins" long-name="Application Launch Plugins" introduced="^3" purpose="optional">
+<unit bldFile="mw/appsupport/applaunchservices/applaunchplugins/group" mrp="mw/appsupport/applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
+</component>
+</collection>
+<collection name="tzpcside" long-name="Time Zone PC Side" level="plugin">
+<component name="tzcompiler" long-name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config PC">
+<unit bldFile="mw/appsupport/tzpcside/tzcompiler/group" mrp="mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
+</component>
+</collection>
+<collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
+<component name="appsupport_metadata" long-name="Generic Application Support Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="securitysrv" level="generic" long-name="Security Services" levels="plugin framework server generic specific">
+<collection name="secsrv_plat" long-name="Security Services Platform Interfaces" level="specific">
+<component name="cms_api" long-name="CMS API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/cms_api/group"/>
+</component>
+<component name="pkcs12_parser_api" long-name="PKCS12 Parser API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/pkcs12_parser_api/group"/>
+</component>
+<component name="java_utils_api" long-name="Java Utils API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/java_utils_api/group"/>
+</component>
+<component name="wim_cert_api" long-name="WIM Cert API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/wim_cert_api/group"/>
+</component>
+<component name="device_key_store_encryption_plugin_api" long-name="Device Key Store Encryption Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/device_key_store_encryption_plugin_api/group"/>
+</component>
+<component name="x509certnameparser_api" long-name="X.509 Certificate Name Parser API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
+</component>
+<component name="remote_lock_api" long-name="Remote Lock API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
+</component>
+<component name="pkidialog_api" long-name="PKI Dialog API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
+</component>
+<component name="provisioning_api" long-name="Provisioning API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/provisioning_api/group"/>
+</component>
+<component name="keyguard_configuration_api" long-name="Keyguard Configuration API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_configuration_api/group"/>
+</component>
+<component name="keylock_policy_api" long-name="Keylock Policy API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/keylock_policy_api/group"/>
+</component>
+<component name="security_code_ui_api" long-name="Security Code UI API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
+</component>
+<component name="gba_api" long-name="GBA API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/gba_api/group"/>
+</component>
+<component name="keyguard_access_api" long-name="Keyguard Access API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_access_api/group"/>
+</component>
+<component name="devicelock_access_api" long-name="Device Lock Access API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/devicelock_access_api/group"/>
+</component>
+<component name="lockapp_server_api" long-name="Lock Application Server API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
+</component>
+<component name="devencadaptation_api" long-name="Device Encryption Adaptation API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
+</component>
+<component name="devenccommonutils_api" long-name="Device Encryption Common Utils API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
+</component>
+</collection>
+<collection name="cms" long-name="Certificate Management Service" level="server">
+<!-- collection is really a component. Need to move down a directory-->
+<component name="cms_build" filter="s60" long-name="CMS" introduced="^3">
+<unit bldFile="mw/securitysrv/cms/group"/>
+</component>
+</collection>
+<collection name="pkiutilities" long-name="PKI Utilities" level="plugin">
+<component name="x509certnameparser" filter="s60" long-name="X.509 Certificate Name Parser">
+<unit bldFile="mw/securitysrv/pkiutilities/x509certnameparser/group"/>
+</component>
+<component name="pkcs12" filter="s60" long-name="PKCS #12">
+<unit bldFile="mw/securitysrv/pkiutilities/pkcs12/group"/>
+</component>
+<component name="certmanui" filter="s60" long-name="Certificate Management UI">
+<unit bldFile="mw/securitysrv/pkiutilities/certmanui/group"/>
+</component>
+<component name="ctsecuritydialogs" filter="s60" long-name="Crypto Token Security Dialogs">
+<unit bldFile="mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
+</component>
+<component name="certsaver" filter="s60" long-name="Certificate Saver">
+<unit bldFile="mw/securitysrv/pkiutilities/certsaver/group"/>
+</component>
+<component name="secmodui" filter="s60" long-name="Security Module UI">
+<unit bldFile="mw/securitysrv/pkiutilities/secmodui/group"/>
+</component>
+<component name="devicetoken" filter="s60" long-name="Device Token">
+<unit bldFile="mw/securitysrv/pkiutilities/devicetoken/group"/>
+</component>
+<component name="certificates" filter="s60" long-name="Certificates">
+<unit bldFile="mw/securitysrv/pkiutilities/Certificates/group" filter="sf_build"/>
+</component>
+<component name="pkiutilities_build" filter="s60" long-name="PKI Utilities Build">
+<!-- need to split this into the above components -->
+<unit bldFile="mw/securitysrv/pkiutilities/group"/>
+</component>
+<component name="ocsp" long-name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
+<unit bldFile="mw/securitysrv/pkiutilities/ocsp/group" mrp="mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
+</component>
+</collection>
+<collection name="wim" long-name="Wireless Identity Module " level="framework">
+<!-- collection is really a component. Need to move down a directory-->
+<component name="wim_build" filter="s60" long-name="WIM Build">
+<unit bldFile="mw/securitysrv/wim/group"/>
+</component>
+</collection>
+<collection name="remotelock" long-name="Remote Lock" level="generic">
+<!-- collection is really a component. Need to move down a directory-->
+<component name="remotelock_build" filter="s60" long-name="Remote Lock Build">
+<unit bldFile="mw/securitysrv/remotelock/group"/>
+</component>
+</collection>
+<collection name="securitydialogs" long-name="Security Dialogs" level="specific">
+<component name="keylockpolicyapi" filter="s60" long-name="Keylock Policy API">
+<unit bldFile="mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
+</component>
+<component name="autolock" long-name="Autolock" filter="s60">
+<unit bldFile="mw/securitysrv/securitydialogs/autolock/group"/>
+</component>
+<component name="secui" filter="s60" long-name="Security UI">
+<unit bldFile="mw/securitysrv/securitydialogs/secui/group"/>
+</component>
+<component name="securitynotifier" filter="s60" long-name="Security Notifier">
+<unit bldFile="mw/securitysrv/securitydialogs/securitynotifier/group"/>
+</component>
+<component name="lockclient" filter="s60" long-name="Lock Client" introduced="^3">
+<unit bldFile="mw/securitysrv/securitydialogs/lockclient/group"/>
+</component>
+<component name="lockapp" filter="s60" long-name="Lock Application" introduced="^3">
+<unit bldFile="mw/securitysrv/securitydialogs/lockapp/group"/>
+</component>
+<component name="simlockui" filter="s60" long-name="SIM Lock UI" introduced="^3">
+<unit bldFile="mw/securitysrv/securitydialogs/simlockui/group"/>
+</component>
+</collection>
+<collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
+<!-- collection is really a component. Need to move down a directory-->
+<component name="boottimeintegritycheck_build" filter="s60" long-name="Boot Time Integrity Check Build">
+<unit bldFile="mw/securitysrv/boottimeintegritycheck/group"/>
+</component>
+</collection>
+<collection name="gba" long-name="Generic Bootstrapping Architecture" level="server">
+<component name="uicc" filter="s60" long-name="UICC" introduced="^2" plugin="Y">
+<unit bldFile="mw/securitysrv/gba/uicc/group"/>
+</component>
+<component name="gbaserver" filter="s60" long-name="GBA Server" introduced="^2">
+<unit bldFile="mw/securitysrv/gba/gbaserver/group"/>
+</component>
+<component name="gbaapi" filter="s60" long-name="GBA API" introduced="^2">
+<unit bldFile="mw/securitysrv/gba/gbaapi/group"/>
+</component>
+<component name="gbafilter" filter="s60" long-name="GBA HTTP Filter" introduced="^2" plugin="Y">
+<unit bldFile="mw/securitysrv/gba/gbafilter/group"/>
+</component>
+<component name="gba_build" filter="s60" long-name="Generic Boot Architecture Build" introduced="^2">
+<!-- need to split this into the above components, or remove #includes and make this GBA ROM -->
+<unit bldFile="mw/securitysrv/gba/group"/>
+</component>
+</collection>
+<collection name="devencdiskutils" long-name="Device Encryption Disk Utils" level="server">
+<component name="devenccommonutils" filter="s60" long-name="Device Encryption Common Utils" introduced="^3">
+<unit bldFile="mw/securitysrv/devencdiskutils/DevEncCommonUtils/group"/>
+</component>
+<component name="devencrfsplugin" filter="s60" long-name="Device Encryption RFS Plugin" introduced="^3" plugin="Y">
+<unit bldFile="mw/securitysrv/devencdiskutils/DevEncRfsPlugin/group"/>
+</component>
+<component name="pk5recognizer" filter="s60" long-name="Device Encryption Pk5 Recognizer" introduced="^3" plugin="Y">
+<unit bldFile="mw/securitysrv/devencdiskutils/Pk5Recognizer/group"/>
+</component>
+<component name="devencstarter" filter="s60" long-name="Device Encryption Starter" introduced="^3" plugin="Y">
+<unit bldFile="mw/securitysrv/devencdiskutils/DevEncStarter/group"/>
+</component>
+<component name="devencdiskutils" filter="s60" long-name="Device Encryption Disk Utils Build" introduced="^3">
+<!-- need to split this into the above components, or remove #includes and make this a ROM component-->
+<unit bldFile="mw/securitysrv/devencdiskutils/group"/>
+</component>
+</collection>
+<collection name="securitysrv_info" long-name="Security Services Info" level="specific">
+<component name="securitysrv_metadata" long-name="Security Services Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="drm" level="generic" long-name="DRM" levels="plugin framework server generic specific">
+<collection name="drm_plat" long-name="DRM Platform Interfaces" level="specific">
+<component name="roap_api" long-name="ROAP API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/roap_api/group"/>
+</component>
+<component name="drm_common_api" long-name="DRM Common API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/drm_common_api/group"/>
+</component>
+<component name="drm_rights_api" long-name="DRM Rights API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/drm_rights_api/group"/>
+</component>
+<component name="drm_legacy_api" long-name="DRM Legacy API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/drm_legacy_api/group"/>
+</component>
+<component name="dcf_repository_api" long-name="DCF Repository API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/dcf_repository_api/group"/>
+</component>
+<component name="drm_service_api" long-name="DRM Service API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/drm_service_api/group"/>
+</component>
+<component name="drm_secondary_display_api" long-name="DRM Secondary Display API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/drm_secondary_display_api/group"/>
+</component>
+<component name="drm_license_manager_api" long-name="DRM License Manager API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/drm_license_manager_api/group"/>
+</component>
+<component name="drm_utility_api" long-name="DRM Utility API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/drm_utility_api/group"/>
+</component>
+<component name="drm_agents_api" long-name="DRM Agents API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/drm_agents_api/group"/>
+</component>
+<component name="wmdrm_core_api" long-name="WM DRM Core API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/wmdrm_core_api/group"/>
+</component>
+<component name="wmdrm_access_api" long-name="WMDRM Access API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/wmdrm_access_api/group"/>
+</component>
+<component name="wmdrm_ota_access_api" long-name="WMDRM OTA Access API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/wmdrm_ota_access_api/group"/>
+</component>
+<component name="camese_utility_api" long-name="Camese Utility API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/camese_utility_api/group"/>
+</component>
+<component name="camese_framework_api" long-name="Camese Framework API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/camese_framework_api/group"/>
+</component>
+</collection>
+<collection name="drm_pub" long-name="DRM Public Interfaces" level="specific">
+<component name="drm_helper_api" long-name="DRM Helper API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_pub/drm_helper_api/group"/>
+</component>
+<component name="oma_drm_caf_agent_api" long-name="OMA DRM CAF Agent API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/group"/>
+</component>
+<component name="drm_license_checker_api" long-name="DRM License Checker API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_pub/drm_license_checker_api/group"/>
+</component>
+</collection>
+<collection name="commondrm" long-name="Common DRM" level="generic">
+<!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
+<component name="drmencryptor" filter="s60" long-name="DRM Encryptor" class="placeholder">
+<!-- this should have its own bld.inf or be removed as a component -->
+</component>
+<component name="drmsettingsplugin" filter="s60" long-name="DRM Settings Plugin" plugin="Y" class="placeholder">
+<!-- this should have its own bld.inf or be removed as a component -->
+</component>
+<component name="drmrightsmanagerui" filter="s60" long-name="DRM Rights Manager UI">
+<unit bldFile="mw/drm/commondrm/drmrightsmanagerui/help/group"/>
+</component>
+<component name="drmutility" filter="s60" long-name="DRM Utility">
+<!-- Uncomment unit when configuration is in place. Currently #included from commondrm_build -->
+<!--<unit bldFile="commondrm/drmutility/group"/>-->
+</component>
+<component name="drmserviceapiwrapper" filter="s60" long-name="DRM Service API Wrapper">
+<unit bldFile="mw/drm/commondrm/drmserviceapiwrapper/group"/>
+</component>
+<component name="drmrightsstoringlocation" filter="s60" long-name="DRM Rights Storing Location">
+<unit bldFile="mw/drm/commondrm/drmrightsstoringlocation/group"/>
+</component>
+<component name="commondrm_build" filter="s60" long-name="Common DRM Build">
+<!-- should be split into the above files, or them collapsed into a single component -->
+<unit bldFile="mw/drm/commondrm/group"/>
+</component>
+</collection>
+<collection name="omadrm" long-name="OMA DRM" level="server">
+<!-- collection is really a component. Move down a directory -->
+<component name="omadrm_build" filter="s60" long-name="OMA DRM Build">
+<unit bldFile="mw/drm/omadrm/group"/>
+</component>
+<component name="foundationcerts" filter="sf_build" long-name="Foundation Certificates">
+<unit bldFile="mw/drm/omadrm/foundationcerts/group"/>
+</component>
+</collection>
+<collection name="wmdrm" long-name="Windows Media DRM" level="framework">
+<!-- collection is really a component. Move down a directory -->
+<component name="wmdrm_build" filter="s60" long-name="WM DRM Build">
+<unit bldFile="mw/drm/wmdrm/group"/>
+</component>
+</collection>
+<collection name="drm_info" long-name="DRM Info" level="specific"/>
+</block>
+<block name="locationsrv" level="specific" long-name="Location Services" levels="plugin fw server if">
+<collection name="locsrv_pub" long-name="Location Services Public Interfaces" level="if">
+<component name="landmarks_search_api" long-name="Landmarks Search API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
+</component>
+<component name="landmarks_api" long-name="Landmarks API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/group"/>
+</component>
+<component name="landmarks_database_management_api" long-name="Landmarks Database Management API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/group"/>
+</component>
+<component name="location_triggering_api" long-name="Location Triggering API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_pub/location_triggering_api/group"/>
+</component>
+<component name="blid_application_satellite_info_api" long-name="BLID Application Satellite Info API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/group"/>
+</component>
+</collection>
+<collection name="locsrv_plat" long-name="Location Services Platform Interfaces" level="if">
+<component name="map_and_navigation_api" long-name="Map and Navigation API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/group"/>
+</component>
+<component name="map_and_navigation_provider_discovery_api" long-name="Map and Navigation Provider Discovery API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/group"/>
+</component>
+<component name="geocoding_api" long-name="Geocoding API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
+</component>
+<component name="map_image_api" long-name="Map Image API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/group"/>
+</component>
+<component name="map_and_navigation_aiw_api" long-name="Map and Navigation AIW API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_aiw_api/group"/>
+</component>
+<component name="map_and_navigation_provider_api" long-name="Map and Navigation Provider API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_api/group"/>
+</component>
+<component name="landmarks_category_definition_api" long-name="Landmarks Category Definition API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
+</component>
+<component name="supl_settings_api" long-name="SUPL Settings API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
+</component>
+<component name="location_settings_launch_api" long-name="Location Settings Launch API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/group"/>
+</component>
+<component name="map_image_conversion_plugin_api" long-name="Map Image Conversion Plug-In API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/group"/>
+</component>
+<component name="psy_configuration_ui_plugin_api" long-name="PSY Configuration UI Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/psy_configuration_ui_plugin_api/group"/>
+</component>
+<component name="np_proxy_configuration_api" long-name="NP Proxy Configuration API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/np_proxy_configuration_api/group"/>
+</component>
+<component name="supl_terminal_initiation_api" long-name="SUPL Terminal Initiation API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/group"/>
+</component>
+<component name="location_notation_preferences_settings_api" long-name="Location Notation Preferences Settings API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/location_notation_preferences_settings_api/group"/>
+</component>
+<component name="supl_settings_notifier_secondary_display_api" long-name="SUPL Settings Notifier Secondary Display API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_notifier_secondary_display_api/group"/>
+</component>
+<component name="supl_network_initiation_api" long-name="SUPL Network Initiation API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/group"/>
+</component>
+<component name="privacy_notifiers_secondary_display_api" long-name="Privacy Notifiers Secondary Display API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/privacy_notifiers_secondary_display_api/group"/>
+</component>
+<component name="oma_supl_configuration_parameter_api" long-name="OMA SUPL Configuration Parameter API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_configuration_parameter_api/group"/>
+</component>
+<component name="supl_query_secondary_display_api" long-name="SUPL Query Secondary Display API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/supl_query_secondary_display_api/group"/>
+</component>
+<component name="location_triggering_management_api" long-name="Location Triggering Management API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_management_api/group"/>
+</component>
+<component name="location_triggering_status_information_api" long-name="Location Triggering Status Information API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_status_information_api/group"/>
+</component>
+<component name="oma_supl_asn_codec_plugin_api" long-name="OMA SUPL ASN Codec Plugin API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
+</component>
+<component name="query_and_notification_api" long-name="Query and Notification API" filter="s60" introduced="^3" class="api">
+<!-- needs metadata file: <meta rel="Api" href="locsrv_plat/query_and_notification_api/query_and_notification_api.metaxml"/> -->
+<unit bldFile="mw/locationsrv/locsrv_plat/query_and_notification_api/group"/>
+</component>
+<component name="location_local_variation_api" long-name="Location Local Variation API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/location_local_variation_api/group"/>
+</component>
+</collection>
+<collection name="genericpositioningplugins" long-name="Generic Positioning Plugins" level="plugin">
+<component name="locationnpppsy" filter="s60" long-name="Location Positioning Proxy PSY" plugin="Y">
+<unit bldFile="mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
+</component>
+<component name="locationsuplpsy" filter="s60" long-name="Location SUPL PSY" introduced="^3" plugin="Y">
+<unit bldFile="mw/locationsrv/genericpositioningplugins/locationsuplpsy/group"/>
+</component>
+<component name="genericpositioningplugins_build" filter="s60" long-name="Generic Positioning Plugins Build">
+<!-- need to break this up into the other components -->
+<unit bldFile="mw/locationsrv/genericpositioningplugins/group"/>
+</component>
+</collection>
+<collection name="landmarks" long-name="Landmarks" level="server">
+<component name="locationlandmarks" filter="s60" long-name="Location Landmarks">
+<unit bldFile="mw/locationsrv/landmarks/locationlandmarks/group"/>
+</component>
+</collection>
+<collection name="locationmapnavfw" long-name="Location Map and Navigation Framework" level="fw">
+<component name="mnlibrary" filter="s60" long-name="Map and Navigation Library">
+<unit bldFile="mw/locationsrv/locationmapnavfw/library/group"/>
+</component>
+<component name="mnaiwprovider" filter="s60" long-name="Map and Navigation AIW Provider" plugin="Y">
+<unit bldFile="mw/locationsrv/locationmapnavfw/aiwprovider/group"/>
+</component>
+<component name="locationmapnavfw_build" filter="s60" long-name="Location Map and Navigation Framework Build">
+<!-- need to break this up into the other components -->
+<unit bldFile="mw/locationsrv/locationmapnavfw/group"/>
+</component>
+</collection>
+<collection name="locationsystemui" long-name="Location System UI" level="if">
+<component name="locationsysui" filter="s60" long-name="Location System UI">
+<unit bldFile="mw/locationsrv/locationsystemui/locationsysui/group"/>
+</component>
+</collection>
+<collection name="supl" long-name="SUPL" level="fw">
+<component name="locationsuplfw" filter="s60" long-name="Location SUPL Framework">
+<unit bldFile="mw/locationsrv/supl/locationsuplfw/group"/>
+</component>
+<component name="locationomasuplprotocolhandler" filter="s60" long-name="OMA SUPL Protocol Handler">
+<unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/group"/>
+</component>
+<component name="supltiapiimplementation" filter="s60" long-name="SUPL TI API Implementation" introduced="^3">
+<unit bldFile="mw/locationsrv/supl/supltiapiimplementation/group"/>
+</component>
+</collection>
+<collection name="locationtriggering" long-name="Location Triggering" level="server">
+<component name="ltlogger" filter="s60" long-name="LT Logger">
+<unit bldFile="mw/locationsrv/locationtriggering/ltlogger/group"/>
+</component>
+<component name="ltclientlib" filter="s60" long-name="LT Client Library">
+<unit bldFile="mw/locationsrv/locationtriggering/ltclientlib/group"/>
+</component>
+<component name="ltmanagementlib" filter="s60" long-name="LT Management Library">
+<unit bldFile="mw/locationsrv/locationtriggering/ltmanagementlib/group"/>
+</component>
+<component name="ltcontainer" filter="s60" long-name="LT Container">
+<unit bldFile="mw/locationsrv/locationtriggering/ltcontainer/group"/>
+</component>
+<component name="ltserver" filter="s60" long-name="LT Server">
+<unit bldFile="mw/locationsrv/locationtriggering/ltserver/group"/>
+</component>
+<component name="ltstrategypluginapi" filter="s60" long-name="LT Strategy Plugin API">
+<unit bldFile="mw/locationsrv/locationtriggering/ltstrategypluginapi/group"/>
+</component>
+<component name="ltstrategyengine" filter="s60" long-name="LT Strategy Engine">
+<unit bldFile="mw/locationsrv/locationtriggering/ltstrategyengine/group"/>
+</component>
+<component name="ltmovementdetectionpluginapi" filter="s60" long-name="Movement Detection Plugin API">
+<unit bldFile="mw/locationsrv/locationtriggering/ltmovementdetectionpluginapi/group"/>
+</component>
+<component name="ltcellidmovementdetector" filter="s60" long-name="Cell ID Movement Detector">
+<unit bldFile="mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/>
+</component>
+<component name="lbtmgmtui" filter="s60" long-name="LBT Management UI" plugin="Y">
+<unit bldFile="mw/locationsrv/locationtriggering/lbtmgmtui/group"/>
+</component>
+<component name="ltcontextsourceplugin" filter="s60" long-name="LT Context Source Plugin" introduced="^3" plugin="Y">
+<unit bldFile="mw/locationsrv/locationtriggering/ltcontextsourceplugin/group"/>
+</component>
+<component name="locationtriggering_build" filter="s60" long-name="Location Triggering Build">
+<!-- should remove #include from this and maybe put exports in the above components -->
+<unit bldFile="mw/locationsrv/locationtriggering/group"/>
+</component>
+</collection>
+</block>
+<block name="accesssec" level="generic" long-name="Access Security" levels="plugin framework server generic specific">
+<collection name="accesssec_plat" long-name="Access Security Platform Interfaces" level="specific">
+<component name="wapi_security_settings_ui_api" long-name="WAPI Security Settings UI API" filter="s60" class="api">
+<unit bldFile="mw/accesssec/accesssec_plat/wapi_security_settings_ui_api/group"/>
+</component>
+<component name="wep_security_settings_ui_api" long-name="WEP Security Settings UI API" filter="s60" class="api">
+<unit bldFile="mw/accesssec/accesssec_plat/wep_security_settings_ui_api/group"/>
+</component>
+<component name="wi-fi_protected_setup_ui_api" long-name="Wi-Fi Protected Setup UI API" filter="s60" class="api">
+<unit bldFile="mw/accesssec/accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
+</component>
+<component name="wlan_eap_settings_ui_api" long-name="WLAN EAP Settings UI API" filter="s60" class="api">
+<unit bldFile="mw/accesssec/accesssec_plat/wlan_eap_settings_ui_api/group"/>
+</component>
+<component name="wpa_security_settings_ui_api" long-name="WPA Security Settings UI API" filter="s60" class="api">
+<unit bldFile="mw/accesssec/accesssec_plat/wpa_security_settings_ui_api/group"/>
+</component>
+<component name="eap_vpn_api" long-name="EAP VPN API" filter="s60" class="api">
+<unit bldFile="mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
+</component>
+<component name="eapsim_db_api" long-name="EAP-SIM DB API" filter="s60" class="api">
+<unit bldFile="mw/accesssec/accesssec_plat/eapsim_db_api/group"/>
+</component>
+<component name="eap_type_api" long-name="EAP Type API" filter="s60" class="api">
+<unit bldFile="mw/accesssec/accesssec_plat/eap_type_api/group"/>
+</component>
+<component name="eaptlspeap_db_api" long-name="EAP-TLS-PEAP DB API" filter="s60" class="api">
+<unit bldFile="mw/accesssec/accesssec_plat/eaptlspeap_db_api/group"/>
+</component>
+<component name="eapleap_db_api" long-name="LEAP DB API" filter="s60" class="api">
+<unit bldFile="mw/accesssec/accesssec_plat/eapleap_db_api/group"/>
+</component>
+<component name="eapgtc_db_api" long-name="EAP-GTC DB API" filter="s60" class="api">
+<unit bldFile="mw/accesssec/accesssec_plat/eapgtc_db_api/group"/>
+</component>
+<component name="eapmschapv2_db_api" long-name="EAP-MSCHAPV2 DB API" filter="s60" class="api">
+<unit bldFile="mw/accesssec/accesssec_plat/eapmschapv2_db_api/group"/>
+</component>
+<component name="eapaka_db_api" long-name="EAP-AKA DB API" filter="s60" class="api">
+<unit bldFile="mw/accesssec/accesssec_plat/eapaka_db_api/group"/>
+</component>
+<component name="wapi_db_api" long-name="WAPI DB API" filter="s60" class="api">
+<unit bldFile="mw/accesssec/accesssec_plat/wapi_db_api/group"/>
+</component>
+</collection>
+<collection name="wlansecuritysettings" long-name="WLAN Security Settings" level="specific">
+<component name="wapisecuritysettingsui" filter="s60" long-name="WAPI Security Settings UI" introduced="9.1">
+<!-- the directory for this needs to be moved up to the right level -->
+<unit bldFile="mw/accesssec/wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
+</component>
+<component name="wepsecuritysettingsui" filter="s60" long-name="WEP Security Settings UI" introduced="9.1">
+<unit bldFile="mw/accesssec/wlansecuritysettings/wepsecuritysettingsui/group"/>
+</component>
+<component name="wifiprotectedsetup" filter="s60" long-name="WIFI Protected Setup" introduced="^1">
+<unit bldFile="mw/accesssec/wlansecuritysettings/wifiprotectedsetup/group"/>
+</component>
+<component name="wlaneapsettingsui" filter="s60" long-name="WLAN EAP Settings UI" introduced="9.3">
+<unit bldFile="mw/accesssec/wlansecuritysettings/wlaneapsettingsui/group"/>
+</component>
+<component name="wpasecuritysettingsui" filter="s60" long-name="WPA Security Settings UI" introduced="9.1">
+<unit bldFile="mw/accesssec/wlansecuritysettings/wpasecuritysettingsui/group"/>
+</component>
+</collection>
+<collection name="eapol" long-name="EAPOL" level="framework">
+<component name="eapol_framework" filter="s60" long-name="EAPOL Framework" introduced="9.2">
+<unit bldFile="mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
+</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">
+<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>
+<component name="bearer_settings_plugin_api" long-name="Bearer Settings Plugin API" filter="s60" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_plat/bearer_settings_plugin_api/group"/>
+</component>
+<component name="commsdat_wlan_api" long-name="CommsDat WLAN API" filter="s60" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_plat/commsdat_wlan_api/group"/>
+</component>
+<component name="connection_monitor_extension_api" long-name="Connection Monitor Extension API" filter="s60" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_monitor_extension_api/group"/>
+</component>
+<component name="connection_ui_utilities_api" long-name="Connection UI Utilities API" filter="s60" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_ui_utilities_api/group"/>
+</component>
+<component name="disconnect_dialog_api" long-name="Disconnect Dialog API" filter="s60" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_api/group"/>
+</component>
+<component name="disconnect_dialog_disable_api" long-name="Disconnect Dialog Disable API" filter="s60" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_disable_api/group"/>
+</component>
+<component name="extended_connection_settings_api" long-name="Extended Connection Settings API" filter="s60" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_plat/extended_connection_settings_api/group"/>
+</component>
+<component name="mpm_default_connection_api" long-name="MPM Default Connection API" filter="s60" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_default_connection_api/group"/>
+</component>
+<component name="pdpcontextmanager2_reset_factory_settings_api" long-name="PDP Context Manager 2 Reset Factory Settings API" filter="s60" class="api">
+<unit bldFile="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" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_settings_api/group"/>
+</component>
+<component name="mpm_connect_screen_api" long-name="MPM Connect Screen API" filter="s60" class="api">
+<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">
+<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>
+<component name="access_point_engine_api" long-name="Access Point Engine API" filter="s60" class="api">
+<unit bldFile="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" class="api">
+<unit bldFile="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" class="api">
+<unit bldFile="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" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_monitor_server_api/group"/>
+</component>
+<component name="connection_settings_ui_api" long-name="Connection Settings UI API" filter="s60" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_ui_api/group"/>
+</component>
+<component name="agent_dialog_api" long-name="Agent Dialog API" filter="s60" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_pub/agent_dialog_api/group"/>
+</component>
+<component name="extendedconnpref_api" long-name="Extended Connection Preferences API" filter="s60" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_pub/extendedconnpref_api/group"/>
+</component>
+</collection>
+<collection name="accesspointcontrol" long-name="Access Point Control" level="plugin">
+<component name="apcontrollistplugin" filter="s60" long-name="Access Point Control List Plugin" introduced="^2" plugin="Y">
+<unit bldFile="mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
+</component>
+</collection>
+<collection name="alwayson_net_plugin" long-name="Always Online Net Plugin" level="server">
+<component name="pdpcontextmanager2" filter="s60" long-name="PDP Context Manager 2">
+<unit bldFile="mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
+</component>
+</collection>
+<collection name="apengine" long-name="Access Point Engine" level="framework">
+<component name="apeng" filter="s60" long-name="Access Point Engine">
+<unit bldFile="mw/ipconnmgmt/apengine/apeng/group"/>
+</component>
+<component name="apsettingshandlerui" filter="s60" long-name="Access Point Settings Handler UI">
+<unit bldFile="mw/ipconnmgmt/apengine/apsettingshandlerui/group"/>
+</component>
+<component name="apsettingsplugin" filter="s60" long-name="Access Point Settings Plugin" plugin="Y">
+<unit bldFile="mw/ipconnmgmt/apengine/apsettingsplugin/group"/>
+</component>
+</collection>
+<collection name="bearermanagement" long-name="Bearer Management" level="framework">
+<component name="mpm" filter="s60" long-name="Mobility Policy Manager">
+<unit bldFile="mw/ipconnmgmt/bearermanagement/mpm/group"/>
+</component>
+<component name="extendedconnpref" filter="s60" long-name="Extended Connection Preferences">
+<unit bldFile="mw/ipconnmgmt/bearermanagement/extendedconnpref/group"/>
+</component>
+<component name="s60mcpr" filter="s60" long-name="S60 Meta-Connection Provider" plugin="Y">
+<unit bldFile="mw/ipconnmgmt/bearermanagement/S60MCPR/group"/>
+</component>
+</collection>
+<collection name="cmmanager" long-name="Connection Method Manager" level="framework">
+<component name="cmmgr" filter="s60" long-name="CM Manager">
+<unit bldFile="mw/ipconnmgmt/cmmanager/cmmgr/group"/>
+</component>
+<component name="gsconnsettingsplugin" filter="s60" long-name="GS Connection Settings Plugin" introduced="^3" plugin="Y">
+<unit bldFile="mw/ipconnmgmt/cmmanager/gsconnsettingsplugin/group"/>
+</component>
+</collection>
+<collection name="connectionmonitoring" long-name="Connection Monitoring" level="server">
+<component name="connectionmonitorplugin" filter="s60" long-name="Connection Monitor Plugin" plugin="Y">
+<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorplugin/group"/>
+</component>
+<component name="connectionmonitorui" filter="s60" long-name="Connection Monitor UI">
+<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorui/group"/>
+</component>
+<component name="connmon" filter="s60" long-name="Connection Monitor">
+<!-- either split into two components, or #include from a common bld.inf -->
+<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/connectionmonitor/group"/>
+<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/dataconnectionlogger/group"/>
+</component>
+<component name="connmonext" filter="s60" long-name="Connection Monitor Extension API">
+<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmonext/group"/>
+</component>
+</collection>
+<collection name="connectionutilities" long-name="Connection Utilities" level="utils">
+<component name="connectiondialogs" filter="s60" long-name="Connection Dialogs">
+<unit bldFile="mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/>
+</component>
+</collection>
+<collection name="dbcreator" long-name="DB Creator" level="utils">
+<component name="commsdatcreator" filter="s60" long-name="Comms Database Creator" introduced="9.3">
+<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
+</component>
+<component name="commsdatcreatorrfsplugin" filter="s60" long-name="Comms Database Creator RFS Plugin" introduced="9.3" plugin="Y">
+<!-- uncomment when config is turned on -->
+<!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
+</component>
+<component name="commsdatstartup" filter="s60" long-name="Comms Database Startup" introduced="9.3">
+<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
+</component>
+<component name="dbcreatorexe" filter="s60" long-name="DB Creator" introduced="9.3">
+<unit bldFile="mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
+</component>
+<component name="dbcreator_build" filter="s60" long-name="DB Creator Build" introduced="9.3">
+<!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
+<unit bldFile="mw/ipconnmgmt/dbcreator/group"/>
+</component>
+</collection>
+<collection name="ipconnmgmt_info" long-name="IP Connectivity Management Info" level="utils">
+<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"/>
+</component>
+</collection>
+</block>
+<block name="netprotocols" level="generic" long-name="High-level Internet Protocols" levels="plugin framework server generic specific">
+<collection name="netprotocols_plat" long-name="High-level Internet Protocols Platform Interfaces" level="specific">
+<component name="cookie_manager_api" long-name="Cookie Manager API" filter="s60" class="api">
+<unit bldFile="mw/netprotocols/netprotocols_plat/cookie_manager_api/group"/>
+</component>
+<component name="http_cache_mgr_api" long-name="HTTP Cache Manager API" filter="s60" class="api">
+<unit bldFile="mw/netprotocols/netprotocols_plat/http_cache_mgr_api/group"/>
+</component>
+<component name="http_filters_api" long-name="HTTP Filters API" filter="s60" class="api">
+<unit bldFile="mw/netprotocols/netprotocols_plat/http_filters_api/group"/>
+</component>
+</collection>
+<collection name="httpfilters" long-name="HTTP Filters" level="plugin">
+<component name="httpfiltercommon" filter="s60" long-name="HTTP Filter Common">
+<unit bldFile="mw/netprotocols/httpfilters/httpfiltercommon/group"/>
+</component>
+<component name="cookie" filter="s60" long-name="Cookie Filter" plugin="Y">
+<unit bldFile="mw/netprotocols/httpfilters/cookie/group"/>
+</component>
+<component name="deflatefilter" filter="s60" long-name="Deflate Filter" plugin="Y">
+<unit bldFile="mw/netprotocols/httpfilters/deflatefilter/group"/>
+</component>
+<component name="httpfilteracceptheader" filter="s60" long-name="Accept Header Filter" plugin="Y">
+<unit bldFile="mw/netprotocols/httpfilters/httpfilteracceptheader/group"/>
+</component>
+<component name="httpfilterauthentication" filter="s60" long-name="Authentication Filter" plugin="Y">
+<unit bldFile="mw/netprotocols/httpfilters/httpfilterauthentication/group"/>
+</component>
+<component name="httpfilterconnhandler" filter="s60" long-name="Connection Handler Fitler" plugin="Y">
+<unit bldFile="mw/netprotocols/httpfilters/httpfilterconnhandler/group"/>
+</component>
+<component name="httpfilteriop" filter="s60" long-name="HTTP IOP Filter" plugin="Y">
+<unit bldFile="mw/netprotocols/httpfilters/httpfilteriop/group"/>
+</component>
+<component name="httpfilterproxy" filter="s60" long-name="HTTP Proxy Filter" plugin="Y">
+<unit bldFile="mw/netprotocols/httpfilters/httpfilterproxy/group"/>
+</component>
+<component name="uaproffilter" filter="s60" long-name="UAProf Filter" plugin="Y">
+<unit bldFile="mw/netprotocols/httpfilters/uaproffilter/group"/>
+</component>
+</collection>
+<collection name="applayerprotocols" long-name="Application Layer Protocols" level="server">
+<component name="httptransportfw" long-name="HTTP Transport Framework" introduced="6.2" purpose="optional">
+<unit bldFile="mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
+</component>
+<component name="httpexamples" long-name="HTTP Examples" introduced="6.2" purpose="development">
+<unit bldFile="mw/netprotocols/applayerprotocols/httpexamples/group" mrp="mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
+</component>
+<component name="wappushsupport" long-name="WAP Push Support" introduced="6.2" purpose="optional">
+<unit bldFile="mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
+</component>
+<component name="wapbase" long-name="WAP Base" introduced="6.0" purpose="optional">
+<unit bldFile="mw/netprotocols/applayerprotocols/wapbase/Group" mrp="mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
+</component>
+<component name="ftpengine" long-name="FTP Engine" introduced="6.0" purpose="optional">
+<unit bldFile="mw/netprotocols/applayerprotocols/ftpengine/group" mrp="mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
+</component>
+<component name="telnetengine" long-name="Telnet Engine" introduced="6.0" purpose="optional">
+<unit bldFile="mw/netprotocols/applayerprotocols/telnetengine/group" mrp="mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
+</component>
+<component name="httpserviceapi" long-name="HTTP Service API" introduced="TB9.2" purpose="optional">
+<unit bldFile="mw/netprotocols/applayerprotocols/httpservice/group" mrp="mw/netprotocols/applayerprotocols/httpservice/group/http_service.mrp"/>
+</component>
+</collection>
+<collection name="applayerpluginsandutils" long-name="Application Layer Plugins and Utils" level="framework">
+<component name="uripermissionservices" long-name="URI Permission Services" introduced="^2" purpose="optional">
+<unit bldFile="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
+</component>
+<component name="bookmarksupport" long-name="Bookmark Support" introduced="9.1" purpose="optional">
+<unit bldFile="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
+</component>
+<component name="httpprotocolplugins" long-name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" plugin="Y">
+<unit bldFile="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
+</component>
+<component name="httptransportplugins" long-name="HTTP Transport Plugins" introduced="6.2" purpose="optional" plugin="Y">
+<unit bldFile="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
+</component>
+</collection>
+<collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
+<component name="netprotocols_metadata" long-name="High-level Internet Protocols Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="ipappprotocols" level="generic" long-name="IP App Protocols" levels="plugin conn server if">
+<collection name="ipappprotocols_plat" long-name="IP App Protocols Platform Interfaces" level="if">
+<component name="srtp_api" long-name="SRTP API" filter="s60" class="api">
+<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/srtp_api/group"/>
+</component>
+<component name="rtprtcp_api" long-name="RTP/RTCP API" filter="s60" class="api">
+<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/rtprtcp_api/group"/>
+</component>
+</collection>
+<collection name="rtp" long-name="RTP" level="server">
+<component name="srtpstack" filter="s60" long-name="SRTP Stack">
+<unit bldFile="mw/ipappprotocols/rtp/srtpstack/group"/>
+</component>
+<component name="rtpstack" filter="s60" long-name="RTP Stack">
+<unit bldFile="mw/ipappprotocols/rtp/rtpstack/group"/>
+</component>
+</collection>
+<collection name="realtimenetprots" long-name="Real Time Net Protocols" level="server">
+<component name="symrtp" long-name="RTP" introduced="9.0" purpose="optional">
+<!-- Real Time Data Protocol -->
+<unit bldFile="mw/ipappprotocols/realtimenetprots/rtp/group" mrp="mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
+</component>
+<component name="sipfw" long-name="SIP Framework" introduced="9.2" purpose="optional">
+<unit bldFile="mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp" version="2"/>
+</component>
+</collection>
+<collection name="sipplugins" long-name="SIP Plugins" level="plugin">
+<component name="sippwlanplugin" filter="s60" long-name="SIP WLAN Plugin" plugin="Y">
+<unit bldFile="mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
+</component>
+<component name="sippsipsettingsui" filter="s60" long-name="SIP Settings UI" plugin="Y">
+<unit bldFile="mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
+</component>
+<component name="sippdevmgmtsipadapter" filter="s60" long-name="Device Management SIP Settings Adapter" plugin="Y">
+<unit bldFile="mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
+</component>
+<component name="sippsystemstatemonitor" filter="s60" long-name="SIP System State Monitor" plugin="Y">
+<unit bldFile="mw/ipappprotocols/sipplugins/sippsystemstatemonitor/group"/>
+</component>
+<component name="sippsipadapter" filter="s60" long-name="SIP Adapter" introduced="^3" plugin="Y">
+<unit bldFile="mw/ipappprotocols/sipplugins/sippsipadapter/group"/>
+</component>
+</collection>
+<collection name="sipproviderplugins" long-name="SIP Provider Plugins" level="conn">
+<component name="sipprovider" long-name="SIP Provider" introduced="^2" purpose="optional" plugin="Y">
+<unit bldFile="mw/ipappprotocols/sipproviderplugins/sipprovider/group" mrp="mw/ipappprotocols/sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
+</component>
+</collection>
+<collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="if">
+<component name="ipappprotocols_metadata" long-name="IP App Protocols Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="wirelessacc" level="specific" long-name="Wireless Access" levels="framework generic ui">
+<collection name="hsfw_plat" long-name="HotSpot Framework Platform Interfaces" level="ui">
+<component name="hotspot_framework_client_api" long-name="HotSpot Framework Client API" filter="s60" class="api">
+<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
+</component>
+<component name="internet_connectivity_test_service_api" long-name="Internet Connectivity Test Service API" filter="s60" class="api">
+<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
+</component>
+<component name="internet_connectivity_test_service_settings_api" long-name="Internet Connectivity Test Service Settings API" filter="s60" class="api">
+<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
+</component>
+<component name="hotspot_framework_client_plugin_api" long-name="HotSpot Framework Client Plugin API" filter="s60" class="api">
+<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
+</component>
+</collection>
+<collection name="hotspotfw" long-name="HotSpot Framework" level="framework">
+<component name="hsserver" filter="s60" long-name="HotSpot Server" class="placeholder">
+<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
+</component>
+<component name="hsclient" filter="s60" long-name="HotSpot Client" class="placeholder">
+<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
+</component>
+<component name="internetconnectivitytestservice" filter="s60" long-name="Internet Connectivity Test Service" class="placeholder">
+<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+<!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
+</component>
+<component name="ictsdialogs" filter="s60" long-name="Internet Connectivity Test Service Dialogs" deprecated="^3" class="placeholder">
+<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+<!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
+</component>
+<component name="hspluginforagent" filter="s60" long-name="HotSpot Plugin for Agent" plugin="Y" class="placeholder">
+<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+<!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
+</component>
+<component name="hsbrowser" filter="s60" long-name="HotSpot Browser" class="placeholder">
+<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+<!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
+</component>
+<component name="hotspotfw_build" filter="s60" long-name="Hotspot Framework Build">
+<!-- should break up this bld.inf into the above components, or collapse them all into a single component -->
+<unit bldFile="mw/wirelessacc/hotspotfw/group"/>
+</component>
+</collection>
+<collection name="wlanutilities" long-name="WLAN Utilities" level="generic">
+<component name="wlanplugin" filter="s60" long-name="WLAN Plugin" plugin="Y">
+<unit bldFile="mw/wirelessacc/wlanutilities/wlanplugin/group"/>
+</component>
+<component name="wlansettingsui" filter="s60" long-name="WLAN Settings UI">
+<unit bldFile="mw/wirelessacc/wlanutilities/wlansettingsui/group"/>
+</component>
+<component name="wlansniffer" filter="s60" long-name="WLAN Sniffer">
+<unit bldFile="mw/wirelessacc/wlanutilities/wlansniffer/group"/>
+</component>
+<component name="wlanindicatorplugin" filter="s60" long-name="WLAN Indicator Plugin" plugin="Y">
+<unit bldFile="mw/wirelessacc/wlanutilities/wlanindicatorplugin/group"/>
+</component>
+</collection>
+</block>
+<block name="vpnclient" level="specific" long-name="VPN Client" levels="engine ui api">
+<!-- is the !oem_build filter needed? -->
+<collection name="vpnc_plat" long-name="VPN Client Platform Interfaces" level="api">
+<component name="vpnapi" filter="s60" long-name="VPN API" class="api">
+<unit bldFile="mw/vpnclient/vpnc_plat/vpnapi/group" filter="!oem_build"/>
+</component>
+</collection>
+<collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
+<component name="vpnapi" filter="s60" long-name="VPN API">
+<unit bldFile="mw/vpnclient/vpnapiimpl/group" filter="!oem_build"/>
+</component>
+</collection>
+<collection name="vpnengine" long-name="VPN Engine" level="engine">
+<!-- too many components in this collection.
+ Probably best to group the binaries together into larger components
+ or maybe split the collection into more reasonable groups -->
+<component name="eventmediatorapi" filter="s60" long-name="Event Mediator API">
+<unit bldFile="mw/vpnclient/vpnengine/eventmediatorapi/group" filter="!oem_build"/>
+</component>
+<component name="eventviewer" filter="s60" long-name="Event Viewer">
+<unit bldFile="mw/vpnclient/vpnengine/eventviewer/group" filter="!oem_build"/>
+</component>
+<component name="vpnins" filter="s60" long-name="VPN Installer">
+<unit bldFile="mw/vpnclient/vpnengine/vpnins/group" filter="!oem_build"/>
+</component>
+<component name="ikepolparser" filter="s60" long-name="IKE Policy Parser">
+<unit bldFile="mw/vpnclient/vpnengine/ikepolparser/group" filter="!oem_build"/>
+</component>
+<component name="utlbase64" filter="s60" long-name="Base64 Utilities">
+<unit bldFile="mw/vpnclient/vpnengine/utlbase64/group" filter="!oem_build"/>
+</component>
+<component name="utlcrypto" filter="s60" long-name="Crypto Utilities">
+<unit bldFile="mw/vpnclient/vpnengine/utlcrypto/group" filter="!oem_build"/>
+</component>
+<component name="utlxml" filter="s60" long-name="XML Utilities">
+<unit bldFile="mw/vpnclient/vpnengine/utlxml/group" filter="!oem_build"/>
+</component>
+<component name="utlpkcs10" filter="s60" long-name="PKCS#10 Utilities">
+<unit bldFile="mw/vpnclient/vpnengine/utlpkcs10/group" filter="!oem_build"/>
+</component>
+<component name="pkiserviceapi" filter="s60" long-name="PKI Service API">
+<unit bldFile="mw/vpnclient/vpnengine/pkiserviceapi/group" filter="!oem_build"/>
+</component>
+<component name="ikecert" filter="s60" long-name="IKE Certificate Management">
+<unit bldFile="mw/vpnclient/vpnengine/ikecert/group" filter="!oem_build"/>
+</component>
+<component name="kmdapi" filter="s60" long-name="Key Management Daemon API">
+<unit bldFile="mw/vpnclient/vpnengine/kmdapi/group" filter="!oem_build"/>
+</component>
+<component name="kmdserver" filter="s60" long-name="Key Management Daemon Server">
+<unit bldFile="mw/vpnclient/vpnengine/kmdserver/group" filter="!oem_build"/>
+</component>
+<component name="ikeutils" filter="s60" long-name="Internet Key Exchange Utils">
+<unit bldFile="mw/vpnclient/vpnengine/ikeutils/group" filter="!oem_build"/>
+</component>
+<component name="ikev1lib" filter="s60" long-name="IKEv1 Library">
+<unit bldFile="mw/vpnclient/vpnengine/ikev1lib/group" filter="!oem_build"/>
+</component>
+<component name="ikev2lib" filter="s60" long-name="IKEv2 Library">
+<unit bldFile="mw/vpnclient/vpnengine/ikev2lib/group" filter="!oem_build"/>
+</component>
+<component name="vpnipsecpolparser" filter="s60" long-name="VPN IPsec Policy Parser">
+<unit bldFile="mw/vpnclient/vpnengine/vpnipsecpolparser/group" filter="!oem_build"/>
+</component>
+<component name="sit" filter="s60" long-name="Socket Interaction Thread">
+<unit bldFile="mw/vpnclient/vpnengine/sit/group" filter="!oem_build"/>
+</component>
+<component name="vpntcwrapper" filter="s60" long-name="VPN Terminal Control Wrapper">
+<unit bldFile="mw/vpnclient/vpnengine/vpntcwrapper/group" filter="!oem_build"/>
+</component>
+<component name="eventmediator" filter="s60" long-name="Event Mediator">
+<unit bldFile="mw/vpnclient/vpnengine/eventmediator/group" filter="!oem_build"/>
+</component>
+<component name="pkiservice" filter="s60" long-name="PKI Service">
+<unit bldFile="mw/vpnclient/vpnengine/pkiservice/group" filter="!oem_build"/>
+</component>
+<component name="vpnconnagt" filter="s60" long-name="VPN Connection Agent">
+<unit bldFile="mw/vpnclient/vpnengine/vpnconnagt/group" filter="!oem_build"/>
+</component>
+<component name="vpnmanager" filter="s60" long-name="VPN Manager">
+<unit bldFile="mw/vpnclient/vpnengine/vpnmanager/group" filter="!oem_build"/>
+</component>
+<component name="vpncleaner" filter="s60" long-name="VPN Cleaner">
+<unit bldFile="mw/vpnclient/vpnengine/vpncleaner/group" filter="!oem_build"/>
+</component>
+<component name="utlpkcs12" filter="s60" long-name="PKCS#12 Utilities">
+<unit bldFile="mw/vpnclient/vpnengine/utlpkcs12/group" filter="!oem_build"/>
+</component>
+<component name="dmadengine" filter="s60" long-name="DM Adapter Engine">
+<unit bldFile="mw/vpnclient/vpnengine/dmadengine/group" filter="!oem_build"/>
+</component>
+<component name="dmadipsecvpn" filter="s60" long-name="IPsec VPN DM Adapter" plugin="Y">
+<unit bldFile="mw/vpnclient/vpnengine/dmadipsecvpn/group" filter="!oem_build"/>
+</component>
+<component name="dmadpki" filter="s60" long-name="PKI DM Adapter" plugin="Y">
+<unit bldFile="mw/vpnclient/vpnengine/dmadpki/group" filter="!oem_build"/>
+</component>
+<component name="ikesocket" filter="s60" long-name="IKE Socket" introduced="^3">
+<unit bldFile="mw/vpnclient/vpnengine/ikesocket/group" filter="!oem_build"/>
+</component>
+</collection>
+<collection name="vpnui" long-name="VPN UI" level="ui">
+<component name="vpnecomnotifier" filter="s60" long-name="VPN ECOM Notifier" plugin="Y">
+<unit bldFile="mw/vpnclient/vpnui/vpnecomnotifier/group" filter="!oem_build"/>
+</component>
+<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">
+<unit bldFile="mw/vpnclient/vpnui/vpnmanagementui/group" filter="!oem_build"/>
+</component>
+<component name="vpnpolins" filter="s60" long-name="VPN Policy Installer">
+<unit bldFile="mw/vpnclient/vpnui/vpnpolins/group" filter="!oem_build"/>
+</component>
+<component name="vpnpolicyrecognizer" filter="s60" long-name="VPN Policy Recognizer" plugin="Y">
+<unit bldFile="mw/vpnclient/vpnui/vpnpolicyrecognizer/group" filter="!oem_build"/>
+</component>
+</collection>
+<collection name="vpnclient_info" long-name="VPN Client Info" level="api">
+<component name="vpnclient_help" filter="s60" long-name="VPN Client Help">
+<unit bldFile="mw/vpnclient/help/group" filter="!oem_build"/>
+</component>
+<component name="vpnclient_build" filter="s60" long-name="VPN Client Build">
+<!-- should split this up into the other components and remove this-->
+<unit bldFile="mw/vpnclient/group" filter="!oem_build"/>
+</component>
+</collection>
+</block>
+<block name="ipappsrv" level="specific" long-name="IP App Services" levels="framework generic server conn plugin">
+<collection name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" level="plugin">
+<component name="transcoder_api" long-name="Transcoder API" filter="s60" class="api">
+<unit bldFile="mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
+</component>
+<component name="comms_event_api" long-name="Comms Event API" filter="s60" class="api">
+<unit bldFile="mw/ipappsrv/ipappsrv_plat/comms_event_api/group"/>
+</component>
+<component name="floor_control_api" long-name="Floor Control API" filter="s60" class="api">
+<unit bldFile="mw/ipappsrv/ipappsrv_plat/floor_control_api/group"/>
+</component>
+<component name="media_control_api" long-name="Media Control API" filter="s60" class="api">
+<unit bldFile="mw/ipappsrv/ipappsrv_plat/media_control_api/group"/>
+</component>
+<component name="multimedia_comms_api" long-name="Multimedia Comms API" filter="s60" class="api">
+<unit bldFile="mw/ipappsrv/ipappsrv_plat/multimedia_comms_api/group"/>
+</component>
+<component name="nat_settings_api" long-name="NAT Settings API" filter="s60" class="api">
+<unit bldFile="mw/ipappsrv/ipappsrv_plat/nat_settings_api/group"/>
+</component>
+</collection>
+<collection name="natfw" long-name="NAT Framework" level="framework">
+<!-- collection is really a component. Need to move down a directory -->
+<component name="natfw_build" filter="s60" long-name="NAT Framework Build" introduced="^2">
+<unit bldFile="mw/ipappsrv/natfw/group"/>
+</component>
+</collection>
+<collection name="multimediacommscontroller" long-name="Multimedia Comms Controller" level="conn">
+<!-- collection is really a component. Need to move down a directory -->
+<component name="multimediacommscontroller_build" filter="s60" long-name="Multimedia Comms Controller Build">
+<unit bldFile="mw/ipappsrv/multimediacommscontroller/group"/>
+</component>
+</collection>
+<collection name="multimediacommsengine" long-name="Multimedia Comms Engine" level="generic">
+<!-- collection is really a component. Need to move down a directory -->
+<component name="multimediacommsengine_build" filter="s60" long-name="Multimedia Comms Engine Build">
+<unit bldFile="mw/ipappsrv/multimediacommsengine/group"/>
+</component>
+</collection>
+<collection name="natplugins" long-name="NAT Plugins" level="plugin">
+<component name="natpcliprovisioningnatfwadapter" filter="s60" long-name="Client Provisioning NAT Framework Traversal Adapter" introduced="^2" plugin="Y">
+<unit bldFile="mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/group"/>
+</component>
+<component name="natpdevmgmtnatfwadapter" filter="s60" long-name="Device Management NAT Framework Traversal Adapter" plugin="Y">
+<unit bldFile="mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/group"/>
+</component>
+<component name="natptraversalcontroller" filter="s60" long-name="NAT Traversal Controller" plugin="Y">
+<unit bldFile="mw/ipappsrv/natplugins/natptraversalcontroller/group"/>
+</component>
+<component name="natpnatfwsdpprovider" filter="s60" long-name="NAT Framework SDP Provider" plugin="Y">
+<unit bldFile="mw/ipappsrv/natplugins/natpnatfwsdpprovider/group"/>
+</component>
+</collection>
+<collection name="ipappsrv_info" long-name="IP App Services Info" level="plugin">
+<component name="ipappsrv_build" long-name="IP App Services Build" filter="s60">
+<!-- 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">
+<collection name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" level="specific">
+<component name="string_parser_api" long-name="String Parser API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/string_parser_api/group"/>
+</component>
+<component name="cbs_mcn_client_api" long-name="CBS MCN Client API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/cbs_mcn_client_api/group"/>
+</component>
+<component name="converged_call_engine_api" long-name="Converged Call Engine API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_engine_api/group"/>
+</component>
+<component name="aiw_dial_data_consumer_api" long-name="AIW Dial Data Consumer API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/aiw_dial_data_consumer_api/group"/>
+</component>
+<component name="phone_client_ussd_api" long-name="Phone Client USSD API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_api/group"/>
+</component>
+<component name="sat_refresh_api" long-name="SAT Refresh API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/sat_refresh_api/group" filter="!test"/>
+</component>
+<component name="network_handling_engine_api" long-name="Network Handling Engine API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/network_handling_engine_api/group"/>
+</component>
+<component name="phone_client_emergency_call_api" long-name="Phone Client Emergency Call API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/group"/>
+</component>
+<component name="sat_configuration_api" long-name="SAT Configuration API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/sat_configuration_api/group"/>
+</component>
+<component name="dial_utils_api" long-name="Dial Utils API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/dial_utils_api/group"/>
+</component>
+<component name="phone_client_image_handler_api" long-name="Phone Client Image Handler API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_image_handler_api/group"/>
+</component>
+<component name="phone_client_messenger_api" long-name="Phone Client Messenger API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_messenger_api/group"/>
+</component>
+<component name="sat_client_api" long-name="SAT Client API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/sat_client_api/group" filter="!test"/>
+</component>
+<component name="phone_client_api" long-name="Phone Client API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_api/group"/>
+</component>
+<component name="sat_service_api" long-name="SAT Service API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/sat_service_api/group" filter="!test"/>
+</component>
+<component name="cbs_message_api" long-name="CBS Message API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/cbs_message_api/group"/>
+</component>
+<component name="phone_client_server_information_api" long-name="Phone Client Server Information API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_server_information_api/group"/>
+</component>
+<component name="phone_client_ussd_internal_api" long-name="Phone Client USSD Internal API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_internal_api/group"/>
+</component>
+<component name="phone_client_command_handler_api" long-name="Phone Client Command Handler API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_command_handler_api/group"/>
+</component>
+<component name="phone_client_notify_api" long-name="Phone Client Notify API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_notify_api/group"/>
+</component>
+<component name="phone_client_utility_api" long-name="Phone Client Utility API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_utility_api/group"/>
+</component>
+<component name="telephony_network_information_api" long-name="Telephony Network Information API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_network_information_api/group"/>
+</component>
+<component name="secondary_display_sat_api" long-name="Secondary Display SAT API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/secondary_display_sat_api/group"/>
+</component>
+<component name="callui_reconnect_query_api" long-name="CallUI Reconnect Query API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/callui_reconnect_query_api/group"/>
+</component>
+<component name="service_provider_settings_api" long-name="Service Provider Settings API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/service_provider_settings_api/group"/>
+</component>
+<component name="converged_call_provider_api" long-name="Converged Call Provider API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_provider_api/group"/>
+</component>
+<component name="incoming_call_monitor_api" long-name="Incoming Call Monitor API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/incoming_call_monitor_api/group"/>
+</component>
+<component name="default_emergency_numbers_api" long-name="Default Emergency Numbers API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/default_emergency_numbers_api/group"/>
+</component>
+<component name="cenrep_database_api" long-name="Central Repository Database API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/cenrep_database_api/group"/>
+</component>
+<component name="ss_settings_api" long-name="SS Settings API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/ss_settings_api/group"/>
+</component>
+<component name="phone_settings_observer_api" long-name="Phone Settings Observer API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_observer_api/group"/>
+</component>
+<component name="phone_settings_notes_ui_api" long-name="Phone Settings Notes UI API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_notes_ui_api/group"/>
+</component>
+<component name="phone_settings_api" long-name="Phone Settings API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_api/group"/>
+</component>
+<component name="voice_mailbox_number_api" long-name="Voice Mailbox Number API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_number_api/group"/>
+</component>
+<component name="voice_mailbox_settings_api" long-name="Voice Mailbox Settings API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_settings_api/group"/>
+</component>
+<component name="call_information_api" long-name="Call Information API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/call_information_api/group" filter="!test"/>
+</component>
+<component name="call_remote_party_information_api" long-name="Call Remote Party Information API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/call_remote_party_information_api/group" filter="!test"/>
+</component>
+<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_mediator_api/group" filter="!test"/>
+</component>
+</collection>
+<collection name="telutils" long-name="Telephony Utils" level="generic">
+<component name="phoneparser" filter="s60" long-name="Phone Parser">
+<unit bldFile="mw/phonesrv/telutils/phoneparser/group"/>
+</component>
+<component name="telephonyservice" filter="s60" long-name="Telephony Service">
+<unit bldFile="mw/phonesrv/telutils/telephonyservice/group"/>
+</component>
+</collection>
+<collection name="cbs" long-name="Cellular Baseband Services" level="plugin">
+<component name="cbsserver" filter="s60" long-name="CBS Server">
+<unit bldFile="mw/phonesrv/cbs/cbsserver/group"/>
+</component>
+<component name="cbsui" filter="s60" long-name="CBS UI">
+<unit bldFile="mw/phonesrv/cbs/cbsui/group"/>
+</component>
+</collection>
+<collection name="cellular" long-name="Cellular" level="server">
+<component name="telephonysettings" filter="s60" long-name="Telephony Settings">
+<unit bldFile="mw/phonesrv/cellular/telephonysettings/group" filter="!test"/>
+</component>
+<component name="sssettings" filter="s60" long-name="Supplementary Service Settings">
+<unit bldFile="mw/phonesrv/cellular/sssettings/group" filter="!test"/>
+</component>
+<component name="psetnotesui" filter="s60" long-name="Phone Settings Notes UI">
+<unit bldFile="mw/phonesrv/cellular/psetnotesui/group" filter="!test"/>
+</component>
+<component name="servicerequest" filter="s60" long-name="Service Request">
+<unit bldFile="mw/phonesrv/cellular/servicerequest/group"/>
+</component>
+</collection>
+<collection name="convergedcallengine" long-name="Converged Call Engine" level="framework">
+<component name="callprovider" filter="s60" long-name="Call Provider">
+<unit bldFile="mw/phonesrv/convergedcallengine/callprovider/group"/>
+</component>
+<component name="cce" filter="s60" long-name="CCE">
+<unit bldFile="mw/phonesrv/convergedcallengine/cce/group" filter="!test"/>
+</component>
+<component name="spsettings" filter="s60" long-name="Service Provider Settings">
+<unit bldFile="mw/phonesrv/convergedcallengine/spsettings/group" filter="!test"/>
+</component>
+<component name="cenrepdatabase" filter="s60" long-name="CCE Cenrep Database">
+<unit bldFile="mw/phonesrv/convergedcallengine/cenrepdatabase/group"/>
+</component>
+<component name="serviceselector" filter="s60" long-name="Service Selector">
+<unit bldFile="mw/phonesrv/convergedcallengine/serviceselector/group"/>
+</component>
+<component name="csplugin" filter="s60" long-name="CS Plugin" plugin="Y">
+<!-- should spell out CS in name -->
+<unit bldFile="mw/phonesrv/convergedcallengine/csplugin/group"/>
+</component>
+</collection>
+<collection name="engines" long-name="Telephony Engines" level="specific">
+<component name="vmbxengine" filter="s60" long-name="Voice Mailbox Engine">
+<unit bldFile="mw/phonesrv/engines/vmbxengine/group"/>
+</component>
+</collection>
+<collection name="networkhandling" long-name="Network Handling" level="plugin">
+<component name="networkhandlingengine" filter="s60" long-name="Network Handling Engine">
+<unit bldFile="mw/phonesrv/networkhandling/networkhandlingengine/group"/>
+</component>
+</collection>
+<collection name="phoneclientserver" long-name="Phone Client/Server" level="server">
+<component name="enpolicy" filter="s60" long-name="Emergency Number Policy">
+<unit bldFile="mw/phonesrv/phoneclientserver/enpolicy/group"/>
+</component>
+<component name="aiwdialdata" filter="s60" long-name="AIW Dial Data">
+<unit bldFile="mw/phonesrv/phoneclientserver/aiwdialdata/group" filter="!test"/>
+</component>
+<component name="dialutils" filter="s60" long-name="Dial Utils">
+<unit bldFile="mw/phonesrv/phoneclientserver/dialutils/group" filter="!test"/>
+</component>
+<component name="phoneclient" filter="s60" long-name="Phone Client">
+<unit bldFile="mw/phonesrv/phoneclientserver/phoneclient/group" filter="!test"/>
+</component>
+<component name="phoneserver" filter="s60" long-name="Phone Server">
+<unit bldFile="mw/phonesrv/phoneclientserver/phoneserver/group"/>
+</component>
+<component name="callui" filter="s60" long-name="Call UI">
+<unit bldFile="mw/phonesrv/phoneclientserver/callui/group"/>
+</component>
+</collection>
+<collection name="satengine" long-name="SIM Application Toolkit Engine" level="generic">
+<component name="satserver" filter="s60" long-name="SAT Server">
+<unit bldFile="mw/phonesrv/satengine/satserver/group"/>
+</component>
+</collection>
+<collection name="satui" long-name="SIM Application Toolkit UI" level="specific">
+<component name="satapp" filter="s60" long-name="SAT Application">
+<unit bldFile="mw/phonesrv/satui/satapp/group"/>
+</component>
+<component name="satplugin" filter="s60" long-name="SAT Plugin" plugin="Y">
+<unit bldFile="mw/phonesrv/satui/satplugin/group"/>
+</component>
+</collection>
+<collection name="phonecmdhandler" long-name="Phone Command Handler" level="generic">
+<component name="phonecmdhnlr" filter="s60" long-name="Phone Command Handler">
+<unit bldFile="mw/phonesrv/phonecmdhandler/phonecmdhnlr/group"/>
+</component>
+</collection>
+</block>
+<block name="messagingmw" level="specific" long-name="Messaging Middleware" levels="stack fw api">
+<collection name="msgfw_pub" long-name="Messaging Middleware Public Interfaces" level="api">
+<component name="send_ui_api" long-name="Send UI API" filter="s60" class="api">
+<unit bldFile="mw/messagingmw/msgfw_pub/send_ui_api/group"/>
+</component>
+</collection>
+<collection name="msgfw_plat" long-name="Messaging Middleware Platform Interfaces" level="api">
+<component name="always_online_plugin_api" long-name="Always Online Plugin API" filter="s60" class="api">
+<unit bldFile="mw/messagingmw/msgfw_plat/always_online_plugin_api/group"/>
+</component>
+<component name="always_online_client_api" long-name="Always Online Client API" filter="s60" class="api">
+<unit bldFile="mw/messagingmw/msgfw_plat/always_online_client_api/group"/>
+</component>
+<component name="msg_common_utils_api" long-name="Messaging Common Utils API" filter="s60" class="api">
+<unit bldFile="mw/messagingmw/msgfw_plat/msg_common_utils_api/group"/>
+</component>
+<component name="send_ui_plugin_api" long-name="Send UI Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/messagingmw/msgfw_plat/send_ui_plugin_api/group"/>
+</component>
+<component name="send_ui_datautils_api" long-name="Send UI Data Utils API" filter="s60" class="api">
+<unit bldFile="mw/messagingmw/msgfw_plat/send_ui_datautils_api/group"/>
+</component>
+</collection>
+<collection name="msgbranched" long-name="Messaging Branched" level="fw">
+<!-- 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"/>
+</component>
+</collection>
+<collection name="messagingfw" long-name="Messaging Framework" level="fw">
+<!-- should break this collection up into smaller related collections -->
+<component name="alwaysonline" filter="s60" long-name="Always Online Server" introduced="^2">
+<unit bldFile="mw/messagingmw/messagingfw/alwaysonline/group"/>
+</component>
+<component name="msgcommonutils" filter="s60" long-name="Messaging Common Utils" introduced="^2">
+<unit bldFile="mw/messagingmw/messagingfw/msgcommonutils/group"/>
+</component>
+<component name="senduiservices" filter="s60" long-name="Send UI Services" introduced="^2">
+<unit bldFile="mw/messagingmw/messagingfw/senduiservices/group"/>
+</component>
+<component name="scheduledsendmtm" long-name="Scheduled Send MTM" introduced="6.0" purpose="optional" plugin="Y">
+<unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/group" mrp="mw/messagingmw/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
+</component>
+<component name="msgsrvnstore" long-name="Message Server and Store" purpose="optional">
+<unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/group" mrp="mw/messagingmw/messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
+</component>
+<component name="biomsgfw" long-name="BIO Messaging Framework" introduced="6.0" purpose="optional">
+<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/group" mrp="mw/messagingmw/messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
+</component>
+<component name="msgconf" long-name="Messaging Config" introduced="^2" purpose="optional" class="config">
+<unit bldFile="mw/messagingmw/messagingfw/msgconf/group" mrp="mw/messagingmw/messagingfw/msgconf/group/messaging_config.mrp"/>
+</component>
+<component name="watcherfw" long-name="Watcher Framework" purpose="optional">
+<unit bldFile="mw/messagingmw/messagingfw/watcherfw/group" mrp="mw/messagingmw/messagingfw/watcherfw/group/messaging_watcher.mrp"/>
+</component>
+<component name="msgtest" long-name="Messaging Test" purpose="development">
+<unit bldFile="mw/messagingmw/messagingfw/msgtest/group" mrp="mw/messagingmw/messagingfw/msgtest/group/messaging_test.mrp"/>
+</component>
+<component name="sendas" long-name="Send As" purpose="optional">
+<unit bldFile="mw/messagingmw/messagingfw/sendas/group" mrp="mw/messagingmw/messagingfw/sendas/group/messaging_sendas2.mrp"/>
+</component>
+<component name="msgurlhandler" long-name="Message URL Handler" introduced="7.0" purpose="optional">
+<unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/group" mrp="mw/messagingmw/messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
+</component>
+<component name="wappushfw" long-name="WAP Push Framework" introduced="6.1" purpose="optional">
+<unit bldFile="mw/messagingmw/messagingfw/wappushfw/group" mrp="mw/messagingmw/messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
+</component>
+<component name="suplsmshandler" long-name="SUPL SMS Handler" introduced="^2" purpose="development" plugin="Y">
+<unit bldFile="mw/messagingmw/messagingfw/suplsmshandler/group" mrp="mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/>
+</component>
+<component name="suplwappushhandler" long-name="SUPL WAP Push Handler" introduced="^2" purpose="optional" plugin="Y">
+<unit bldFile="mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
+</component>
+</collection>
+<collection name="messagingmw_info" long-name="Messaging Middleware Info" level="api">
+<component name="messagingmw_metadata" long-name="Messaging Middleware Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="imsrv" level="specific" long-name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
+<collection name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" level="specific">
+<component name="ximp_core_data_model_api" long-name="XIMP Core Data Model API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_data_model_api/group"/>
+</component>
+<component name="ximp_presence_protocol_plugin_host_api" long-name="XIMP Presence Protocol Plug-in Host API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_host_api/group"/>
+</component>
+<component name="ximp_presence_data_model_api" long-name="XIMP Presence Data Model API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_data_model_api/group"/>
+</component>
+<component name="ximp_presence_protocol_plugin_api" long-name="XIMP Presence Protocol Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_api/group"/>
+</component>
+<component name="ximp_presence_management_api" long-name="XIMP Presence Management API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_management_api/group"/>
+</component>
+<component name="ximp_core_protocol_plugin_host_api" long-name="XIMP Core Protocol Plug-in Host API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_host_api/group"/>
+</component>
+<component name="ximp_core_management_api" long-name="XIMP Core Management API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_management_api/group"/>
+</component>
+<component name="ximp_presence_base_api" long-name="XIMP Presence Base API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_base_api/group"/>
+</component>
+<component name="ximp_core_protocol_plugin_api" long-name="XIMP Core Protocol Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_api/group"/>
+</component>
+<component name="ximp_core_base_api" long-name="XIMP Core Base API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_base_api/group"/>
+</component>
+<component name="ximp_presence_cache_api" long-name="XIMP Presence Cache API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_cache_api/group"/>
+</component>
+<component name="ximp_core_feature_plugin_api" long-name="XIMP Core Feature Plugin API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/group"/>
+</component>
+<component name="ximp_im_protocol_plugin_host_api" long-name="XIMP IM Protocol Plugin Host API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_host_api/group"/>
+</component>
+<component name="ximp_im_data_model_api" long-name="XIMP IM Data Model API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_data_model_api/group"/>
+</component>
+<component name="ximp_im_protocol_plugin_api" long-name="XIMP IM Protocol Plugin API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_api/group"/>
+</component>
+<component name="ximp_im_management_api" long-name="XIMP IM Management API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_management_api/group"/>
+</component>
+<component name="ximp_im_base_api" long-name="XIMP IM Base API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_base_api/group"/>
+</component>
+<component name="ximp_search_protocol_plugin_host_api" long-name="XIMP Search Protocol Plugin Host API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_host_api/group"/>
+</component>
+<component name="ximp_search_data_model_api" long-name="XIMP Search Data Model API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_data_model_api/group"/>
+</component>
+<component name="ximp_search_protocol_plugin_api" long-name="XIMP search Protocol Plugin API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_api/group"/>
+</component>
+<component name="ximp_search_management_api" long-name="XIMP Search Management API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_management_api/group"/>
+</component>
+<component name="ximp_search_base_api" long-name="XIMP Search Base API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_base_api/group"/>
+</component>
+<component name="xmpp_settings_api" long-name="XMPP Settings API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/group"/>
+</component>
+<component name="im_cache_client_api" long-name="IM Cache Client API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/im_cache_client_api/group"/>
+</component>
+<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">
+<unit bldFile="mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
+</component>
+</collection>
+<collection name="ximpfw" long-name="XIMP Framework" level="framework">
+<!-- collection is really a component. Needs to be moved down a directory -->
+<component name="ximpfw_build" filter="s60" long-name="XIMP Framework Build">
+<unit bldFile="mw/imsrv/ximpfw/group"/>
+</component>
+</collection>
+<collection name="imservices" long-name="IM Services" level="generic">
+<component name="imfeatureplugin" filter="s60" long-name="IM Feature Plugin" introduced="^2" plugin="Y">
+<unit bldFile="mw/imsrv/imservices/imfeatureplugin/group"/>
+</component>
+<component name="searchfeatureplugin" filter="s60" long-name="Search Feature Plugin" introduced="^2" plugin="Y">
+<unit bldFile="mw/imsrv/imservices/searchfeatureplugin/group"/>
+</component>
+<component name="xmppsettingsapi" filter="s60" long-name="XMPP Settings API" introduced="^2">
+<unit bldFile="mw/imsrv/imservices/xmppsettingsapi/group"/>
+</component>
+<component name="xmppsettingsfetcher" filter="s60" long-name="XMPP Settings Fetcher" introduced="^2">
+<unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/group"/>
+</component>
+<component name="instantmessagingcache" filter="s60" long-name="Instant Messaging Cache" introduced="^2">
+<unit bldFile="mw/imsrv/imservices/instantmessagingcache/group"/>
+</component>
+</collection>
+<collection name="brandingserver" long-name="Branding Server" level="specific">
+<!-- collection is really a component. Needs to be moved down a directory -->
+<component name="brandingserver_build" filter="s60" long-name="Branding Server Build">
+<unit bldFile="mw/imsrv/brandingserver/group"/>
+</component>
+</collection>
+</block>
+<block name="legacypresence" level="specific" long-name="Legacy Presence Services" levels="engine fw ui">
+<collection name="pressrv_plat" long-name="Legacy Presence Services Platform Interfaces" level="ui">
+<component name="presence_list_api" long-name="Presence List API" filter="s60" class="api">
+<unit bldFile="mw/legacypresence/pressrv_plat/presence_list_api/group"/>
+</component>
+<component name="watcher_info_api" long-name="Watcher Info API" filter="s60" class="api">
+<unit bldFile="mw/legacypresence/pressrv_plat/watcher_info_api/group"/>
+</component>
+<component name="simple_documents_api" long-name="SIMPLE Documents API" filter="s60" class="api">
+<unit bldFile="mw/legacypresence/pressrv_plat/simple_documents_api/group"/>
+</component>
+<component name="authorization_api" long-name="Authorization API" filter="s60" class="api">
+<unit bldFile="mw/legacypresence/pressrv_plat/authorization_api/group"/>
+</component>
+<component name="xdm_protocol_plugin_api" long-name="XDM Protocol Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/legacypresence/pressrv_plat/xdm_protocol_plugin_api/group"/>
+</component>
+<component name="watcher_api" long-name="Watcher API" filter="s60" class="api">
+<unit bldFile="mw/legacypresence/pressrv_plat/watcher_api/group"/>
+</component>
+<component name="xdm_api" long-name="XDM API" filter="s60" class="api">
+<unit bldFile="mw/legacypresence/pressrv_plat/xdm_api/group"/>
+</component>
+<component name="registration_api" long-name="Registration API" filter="s60" class="api">
+<unit bldFile="mw/legacypresence/pressrv_plat/registration_api/group"/>
+</component>
+<component name="publisher_api" long-name="Publisher API" filter="s60" class="api">
+<unit bldFile="mw/legacypresence/pressrv_plat/publisher_api/group"/>
+</component>
+<component name="messaging_connection_manager_api" long-name="Messaging Connection Manager API" filter="s60" class="api">
+<unit bldFile="mw/legacypresence/pressrv_plat/messaging_connection_manager_api/group"/>
+</component>
+<component name="xdm_settings_api" long-name="XDM Settings API" filter="s60" class="api">
+<unit bldFile="mw/legacypresence/pressrv_plat/xdm_settings_api/group"/>
+</component>
+<component name="simple_settings_api" long-name="SIMPLE Settings API" filter="s60" class="api">
+<unit bldFile="mw/legacypresence/pressrv_plat/simple_settings_api/group"/>
+</component>
+<component name="simple_instant_msg_api" long-name="Simple Instant Msg API" filter="s60" class="api">
+<unit bldFile="mw/legacypresence/pressrv_plat/simple_instant_msg_api/group"/>
+</component>
+</collection>
+<collection name="xdmengine" long-name="XDM Engine" level="engine">
+<!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
+<component name="xdmengine_build" filter="s60" long-name="XDM Engine Build">
+<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">
+<unit bldFile="mw/legacypresence/xdmprotocols/group"/>
+</component>
+</collection>
+<collection name="msgconnmanager" long-name="Messaging Connection Manager" level="fw">
+<!-- collection is really a component. Need to move down a directory-->
+<component name="msgconnmanager_build" filter="s60" long-name="Messaging Connection Manager Build">
+<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">
+<unit bldFile="mw/legacypresence/simpleengine/group"/>
+</component>
+</collection>
+<collection name="presencefwsimpleadpt" long-name="Presence Framework SIMPLE Adaptation" level="fw">
+<!-- collection is really a component. Need to move down a directory-->
+<component name="simpleplugin" filter="s60" long-name="SIMPLE Plugin" plugin="Y">
+<unit bldFile="mw/legacypresence/presencefwsimpleadpt/group"/>
+</component>
+</collection>
+<collection name="simpledatamodeladapter" long-name="SIMPLE Data Model Adapter" level="fw">
+<component name="presenceplugin" filter="s60" long-name="Presence Plugin" introduced="^2" plugin="Y">
+<unit bldFile="mw/legacypresence/simpledatamodeladapter/group"/>
+</component>
+</collection>
+</block>
+<block name="remotemgmt" level="specific" long-name="Remote Management" levels="plugin framework server generic specific">
+<collection name="remotemgmt_pub" long-name="Remote Management Public Interfaces" level="specific">
+<component name="synchronization_capability_api" long-name="Synchronization Capability API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
+</component>
+</collection>
+<collection name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" level="specific">
+<component name="common_agent_util_and_definitions_api" long-name="Common Agent util and definitions API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
+</component>
+<component name="policy_management_certificate_api" long-name="Policy Management Certificate API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/group"/>
+</component>
+<component name="oma_provisioning_adapter_api" long-name="OMA Provisioning Adapter API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_adapter_api/group"/>
+</component>
+<component name="device_management_parameter_api" long-name="Device Management Parameter API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_parameter_api/group"/>
+</component>
+<component name="data_synchronization_plugin_api" long-name="Data Synchronization Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/group"/>
+</component>
+<component name="sync_alert_handler_api" long-name="Sync Alert Handler API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
+</component>
+<component name="syncml_notifier_api" long-name="SyncML Notifier API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
+</component>
+<component name="syncml_client_api" long-name="SyncML Client API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
+</component>
+<component name="device_management_plugin_api" long-name="Device Management plug-in API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_plugin_api/group"/>
+</component>
+<component name="dm_tree_apis" long-name="DM Tree APIs" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
+</component>
+<component name="terminal_security_device_lock_api" long-name="Terminal Security Device Lock API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/group"/>
+</component>
+<component name="policy_management_request_api" long-name="Policy Management Request API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/group"/>
+</component>
+<component name="ds_constant_definitions_api" long-name="DS Constant Definitions API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_constant_definitions_api/group"/>
+</component>
+<component name="scp_server_api" long-name="SCP Server API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/group"/>
+</component>
+<component name="data_synchronization_notification_api" long-name="Data Synchronization Notification API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_notification_api/group"/>
+</component>
+<component name="oma_provisioning_engine_api" long-name="OMA Provisioning Engine API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/group"/>
+</component>
+<component name="dm_utils_api" long-name="DM Utils API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/group"/>
+</component>
+<component name="syncml_alert_api" long-name="SyncML Alert API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/group"/>
+</component>
+<component name="obex_client_session_api" long-name="OBEX Client session API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/obex_client_session_api/group"/>
+</component>
+<component name="setting_enforcement_info_api" long-name="Setting Enforcement Info API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/group"/>
+</component>
+<component name="dm_constant_definitions_api" long-name="DM Constant Definitions API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
+</component>
+<component name="oma_ds_extensions_api" long-name="OMA DS Extensions API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
+</component>
+<component name="pnpms_utils_api" long-name="PNPMS Utils API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
+</component>
+<component name="diagnostics_plugin_utility_api" long-name="Diagnostics Plugin Utility API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
+</component>
+<component name="diagnostics_plugin_api" long-name="Diagnostics Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
+</component>
+<component name="diagnostics_framework_api" long-name="Diagnostics Framework API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
+</component>
+<component name="diagnostics_results_api" long-name="Diagnostics Results API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
+</component>
+<component name="diagnostics_plugin_pool_api" long-name="Diagnostics Plugin Pool API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
+</component>
+<component name="adaptive_history_list_api" long-name="Adaptive History List API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
+</component>
+<component name="adaptive_history_list_session_api" long-name="Adaptive History List Session API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
+</component>
+<component name="fota_engine_api" long-name="FOTA Engine API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
+</component>
+<component name="update_package_storage_plugin_api" long-name="Update Package Storage Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
+</component>
+<component name="syncml_notifier_roaming_api" long-name="SyncML Notifier Roaming API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
+</component>
+<component name="sync_service_api" long-name="Sync Service API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_service_api/group"/>
+</component>
+<component name="dcmo_adapter_api" long-name="DCMO Adapter API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_adapter_api/group"/>
+</component>
+<component name="dcmo_control_api" long-name="DCMO Control API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_control_api/group"/>
+</component>
+<component name="ds_capability_mgmt_plugin_api" long-name="DS Capability Management Plugin API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
+</component>
+<component name="dm_native_notifier_api" long-name="DM Native Notifier API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_native_notifier_api/group"/>
+</component>
+<component name="syncml_ds_error_reporting_api" long-name="SyncML DS Error Reporting API" filter="s60" introduced="^3" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_ds_error_reporting_api/group"/>
+</component>
+<component name="syncml_ds_customization_api" long-name="SyncML DS Customization API" filter="s60" introduced="^3" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_ds_customization_api/group"/>
+</component>
+</collection>
+<collection name="policymanagement" long-name="Policy Management" level="generic">
+<component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">
+<unit bldFile="mw/remotemgmt/policymanagement/pmdmadapter/group"/>
+</component>
+<component name="dmutilserver" filter="s60" long-name="DM Util Server">
+<unit bldFile="mw/remotemgmt/policymanagement/dmutilserver/group"/>
+</component>
+<component name="policyengine" filter="s60" long-name="Policy Engine">
+<unit bldFile="mw/remotemgmt/policymanagement/policyengine/group"/>
+</component>
+<component name="policymanagement_build" filter="s60" long-name="Policy Management Build">
+<!-- need to distribute exports, etc into the other components and remove this-->
+<unit bldFile="mw/remotemgmt/policymanagement/group"/>
+</component>
+</collection>
+<collection name="syncmlfw" long-name="SyncML Framework" level="server">
+<component name="syncmlfw_build" filter="s60" long-name="SyncML Framework Build">
+<!-- need to break this up into components. Too convoluted a structure to be in a single bld.inf-->
+<unit bldFile="mw/remotemgmt/syncmlfw/group"/>
+</component>
+</collection>
+<collection name="terminalsecurity" long-name="Terminal Security" level="specific">
+<component name="scp" filter="s60" long-name="Security Code Proxy">
+<!-- can only have one unit, need to have these #included from a single bld.inf -->
+<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
+<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpdatabase/group"/>
+<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpserver/group"/>
+<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scppatternplugin/group"/>
+<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scphistoryplugin/group"/>
+<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scptimestampplugin/group"/>
+<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpeventhandler/group"/>
+<unit bldFile="mw/remotemgmt/terminalsecurity/scp/dmeventnotifier/group"/>
+</component>
+<component name="terminalsecurity_client" filter="s60" long-name="Terminal Control Client">
+<unit bldFile="mw/remotemgmt/terminalsecurity/client/group"/>
+</component>
+<component name="terminalsecurity_server" filter="s60" long-name="Terminal Control Server">
+<unit bldFile="mw/remotemgmt/terminalsecurity/server/group"/>
+</component>
+<component name="tcadapter" filter="s60" long-name="Terminal Control Adapter">
+<unit bldFile="mw/remotemgmt/terminalsecurity/tcadapter/bld"/>
+</component>
+<component name="terminalsecurity_build" filter="s60" long-name="Terminal Security Build">
+<!-- need to distribute exports, etc into the other components and remove this-->
+<unit bldFile="mw/remotemgmt/terminalsecurity/group"/>
+</component>
+</collection>
+<collection name="omaprovisioning" long-name="OMA Provisioning" level="specific">
+<component name="pnputil" filter="s60" long-name="PnP Util">
+<unit bldFile="mw/remotemgmt/omaprovisioning/pnputil/group"/>
+</component>
+<component name="provisioning" filter="s60" long-name="Provisioning">
+<unit bldFile="mw/remotemgmt/omaprovisioning/provisioning/group"/>
+</component>
+</collection>
+<collection name="devicediagnosticsfw" long-name="Device Diagnostics Framework" level="framework">
+<component name="diagframework" filter="s60" long-name="Diagnostics Framework">
+<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
+</component>
+<component name="diagpluginbase" filter="s60" long-name="Diagnostics Plugin Base">
+<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
+</component>
+<component name="diagresultsdb" filter="s60" long-name="Diagnostics Results Database">
+<!-- can only have one unit, merge or split into two components -->
+<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
+<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
+</component>
+<component name="devicediagnosticsfw_build" filter="s60" long-name="Device Diagnostics Framework Build">
+<!-- need to distribute exports, etc into the other components and remove this-->
+<unit bldFile="mw/remotemgmt/devicediagnosticsfw/group"/>
+</component>
+</collection>
+<collection name="dcmofw" long-name="Device Capability Management Object Framework" level="framework">
+<component name="dcmoclient" filter="s60" long-name="DCMO Client">
+<unit bldFile="mw/remotemgmt/dcmofw/dcmoclient/group"/>
+</component>
+<component name="dcmoserver" filter="s60" long-name="DCMO Server">
+<unit bldFile="mw/remotemgmt/dcmofw/dcmoserver/group"/>
+</component>
+<component name="dcmocustcmd" filter="s60" long-name="DCMO Custom Commands">
+<unit bldFile="mw/remotemgmt/dcmofw/dcmocustcmd/group"/>
+</component>
+<component name="dcmofw_build" filter="s60" long-name="DCMO Build">
+<!-- need to distribute exports, etc into the other components and remove this-->
+<unit bldFile="mw/remotemgmt/dcmofw/group"/>
+</component>
+</collection>
+<collection name="fotaapplication" long-name="FOTA Application" level="generic">
+<component name="fotaapplication_build" filter="s60" long-name="FOTA Application Build">
+<!-- remove this component when configuration is in place and the #ifdefs have been worked out -->
+<unit bldFile="mw/remotemgmt/fotaapplication/group"/>
+</component>
+<component name="fotaserver" filter="s60" long-name="FOTA Server">
+<!-- uncomment when #ifdefs are resolved -->
+<!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
+</component>
+<component name="fotacustcmds" filter="s60" long-name="FOTA Custom Commands" class="placeholder">
+<!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
+<!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
+</component>
+</collection>
+</block>
+<block name="remotestorage" level="generic" long-name="Remote Storage" levels="framework if">
+<collection name="rsfw_plat" long-name="Remote Storage Platform Interfaces" level="if">
+<component name="rsfw_access_protocol_plugin_api" filter="s60" long-name="Remote Storage Framework Access Protocol Plugin API" class="api">
+<unit bldFile="mw/remotestorage/rsfw_plat/rsfw_access_protocol_plugin_api/group"/>
+</component>
+</collection>
+<collection name="remotestoragefw" long-name="Remote Storage Framework" level="framework">
+<component name="mountstore" filter="s60" long-name="RSFW Mount Store">
+<unit bldFile="mw/remotestorage/remotestoragefw/mountstore/group"/>
+</component>
+<component name="rsfwnotifierplugins" filter="s60" long-name="RSFW Notifier Plugins" plugin="Y">
+<unit bldFile="mw/remotestorage/remotestoragefw/rsfwnotifierplugins/group"/>
+</component>
+<component name="remotefileengine" filter="s60" long-name="Remote File Engine">
+<unit bldFile="mw/remotestorage/remotestoragefw/remotefileengine/group"/>
+</component>
+<component name="mountmanager" filter="s60" long-name="RSFW Mount Manager">
+<unit bldFile="mw/remotestorage/remotestoragefw/mountmanager/group"/>
+</component>
+<component name="webdavaccessplugin" filter="s60" long-name="WebDAV Access Plugin" plugin="Y">
+<unit bldFile="mw/remotestorage/remotestoragefw/webdavaccessplugin/group"/>
+</component>
+<component name="remotefilesystemplugin" filter="s60" long-name="Remote Filesystem Plugin" plugin="Y">
+<unit bldFile="mw/remotestorage/remotestoragefw/remotefilesystemplugin/group"/>
+</component>
+<component name="remotestoragegsplugin" filter="s60" long-name="RS GS Plugin" plugin="Y">
+<!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
+<!-- <unit bldFile="remotestoragefw/gsplugin/group"/>-->
+</component>
+<component name="remotedriveconfigurationbiocontrol" filter="s60" long-name="Remote Drive Configuration BIO Control">
+<!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
+<!-- <unit bldFile="remotestoragefw/remotedriveconfigurationbiocontrol/group"/>-->
+</component>
+<component name="remotestoragefw_build" filter="s60" long-name="Remote Storage Framework Build">
+<!-- move exports to other components.
+ This is needed for #includes of configured component until congigiration is in place -->
+<unit bldFile="mw/remotestorage/remotestoragefw/group"/>
+</component>
+</collection>
+</block>
+<block name="remoteconn" level="generic" long-name="Remote Connectivity" levels="plugin framework server generic specific">
+<collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
+<component name="secon" filter="s60" long-name="Service Controllers">
+<unit bldFile="mw/remoteconn/connectivitymodules/secon/group"/>
+</component>
+</collection>
+<collection name="remoteconn_info" long-name="Remote Connectivity Info" level="specific">
+<component name="remoteconn_metadata" long-name="Remote Connectivity Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
+</component>
+</collection>
+<collection name="mtptransports" long-name="MTP Transports" level="plugin">
+<component name="mtpusbtransport" long-name="MTP USB Transport" introduced="^2" purpose="optional" plugin="Y">
+<unit bldFile="mw/remoteconn/mtptransports/mtpusbtransport/group" mrp="mw/remoteconn/mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
+</component>
+<component name="mtpptpiptransport" long-name="MTP PTP-IP Transport" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="mw/remoteconn/mtptransports/mtpptpiptransport/group" mrp="mw/remoteconn/mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
+</component>
+<component name="mtpcontroller" long-name="MTP Controller" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="mw/remoteconn/mtptransports/mtpcontroller/group" mrp="mw/remoteconn/mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
+</component>
+</collection>
+<collection name="mtpfws" long-name="MTP Frameworks" level="framework">
+<component name="mtpfw" long-name="MTP Framework" introduced="^2" purpose="optional">
+<unit bldFile="mw/remoteconn/mtpfws/mtpfw/group" mrp="mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/>
+</component>
+</collection>
+<collection name="mtpdataproviders" long-name="MTP Data Providers" level="generic">
+<component name="mtpfileandfolderdp" long-name="MTP File and Folder Provider" introduced="^2" purpose="optional" plugin="Y">
+<unit bldFile="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group" mrp="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
+</component>
+<component name="mtpimagedp" long-name="MTP Image Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="mw/remoteconn/mtpdataproviders/mtpimagedp/group" mrp="mw/remoteconn/mtpdataproviders/mtpimagedp/group/mtp_imagedp.mrp"/>
+</component>
+<component name="mtppictbridgedp" long-name="MTP PictBridge Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group" mrp="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group/mtp_pictbridgedp.mrp"/>
+</component>
+</collection>
+<collection name="backupandrestore" long-name="Backup and Restore" level="specific">
+<component name="backupengine" long-name="Backup Engine" introduced="9.0" purpose="optional">
+<unit bldFile="mw/remoteconn/backupandrestore/backupengine/group" mrp="mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
+</component>
+<component name="backuptest" long-name="Backup Test" introduced="^2" purpose="development">
+<unit bldFile="mw/remoteconn/backupandrestore/backuptest/group" mrp="mw/remoteconn/backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
+</component>
+</collection>
+<collection name="obex" long-name="OBEX" level="generic">
+<component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1" purpose="optional">
+<unit bldFile="mw/remoteconn/obex/obexprotocol/group" mrp="mw/remoteconn/obex/obexprotocol/group/obex.mrp"/>
+</component>
+<component name="obexextensionapi" long-name="OBEX Extension API" introduced="9.2" purpose="optional">
+<unit bldFile="mw/remoteconn/obex/obexextensionapi/group" mrp="mw/remoteconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
+</component>
+</collection>
+</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">
+<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">
+<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">
+<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">
+<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">
+<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">
+<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">
+<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">
+<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">
+<unit mrp="mw/srvdiscovery/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="dlnasrv" level="specific" long-name="DLNA Services" levels="stack server ctrl framework plugin">
+<!-- uncomment all the units when configuration is in place, they're currently #included from other xxx_build components -->
+<collection name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" level="plugin">
+<component name="upnp_media_server_settings_api" long-name="UPnP Media Server Settings API" filter="s60" class="api">
+<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_settings_api/group"/>
+</component>
+<component name="upnp_av_objects_api" long-name="UPnP A/V Objects API" filter="s60" class="api">
+<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_av_objects_api/group"/>
+</component>
+<component name="upnp_media_server_api" long-name="UPnP Media Server API" filter="s60" class="api">
+<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_api/group"/>
+</component>
+<component name="upnp_security_plugin_api" long-name="UPnP Security Plugin API" filter="s60" class="api">
+<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_security_plugin_api/group"/>
+</component>
+<component name="upnp_avcp_api" long-name="UPnP AVCP API" filter="s60" class="api">
+<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_avcp_api/group"/>
+</component>
+<component name="upnp_media_server_metadata_api" long-name="UPnP Media Server Metadata API" filter="s60" class="api">
+<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_metadata_api/group"/>
+</component>
+<component name="upnp_command_api" long-name="UPnP Command API" filter="s60" class="api">
+<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_command_api/group"/>
+</component>
+<component name="upnp_plugin_api" long-name="UPnP Plugin API" filter="s60" class="api">
+<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_plugin_api/group"/>
+</component>
+</collection>
+<collection name="upnpavcontrolpoint" long-name="UPnP A/V Control Point" level="plugin">
+<component name="avcontrolframework" filter="s60" long-name="A/V Control Famework" introduced="9.1" deprecated="^3">
+<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
+</component>
+<component name="upnpavcontrolpoint_build" filter="s60" long-name="UPnP A/V Control Point Build" introduced="9.1" deprecated="^3">
+<!-- put exports in other component instead -->
+<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/group"/>
+</component>
+</collection>
+<collection name="upnpmediaserver" long-name="UPnP Media Server" level="server">
+<component name="avobjects" filter="s60" long-name="A/V Objects">
+<unit bldFile="mw/dlnasrv/upnpmediaserver/avobjects/group"/>
+</component>
+<component name="mediaserverclient" filter="s60" long-name="Media Server Client">
+<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverclient/group"/>
+</component>
+<component name="connectionmanagerservice" filter="s60" long-name="Connection Manager Service">
+<unit bldFile="mw/dlnasrv/upnpmediaserver/connectionmanagerservice/group"/>
+</component>
+<component name="contentdirectoryservice" filter="s60" long-name="Content Directory Service">
+<unit bldFile="mw/dlnasrv/upnpmediaserver/contentdirectoryservice/group"/>
+</component>
+<component name="mediaserverengine" filter="s60" long-name="Media Server Engine">
+<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverengine/group"/>
+</component>
+<component name="upnpmediaserver_build" filter="s60" long-name="UPnP Media Server Build">
+<!-- move exports into one of above components -->
+<unit bldFile="mw/dlnasrv/upnpmediaserver/group"/>
+</component>
+</collection>
+<collection name="upnpavcontroller" long-name="UPnP A/V Controller" level="ctrl">
+<component name="upnpxmlparser" filter="s60" long-name="UPnP XML Parser" introduced="^2">
+<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpxmlparser/group"/>
+</component>
+<component name="upnpavcontrollerserver" filter="s60" long-name="UPnP A/V Controller Server" introduced="^2">
+<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerserver/group"/>
+</component>
+<component name="upnpavcontrollerclient" filter="s60" long-name="UPnP A/V Ccontroller Client" introduced="^2">
+<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerclient/group"/>
+</component>
+<component name="upnpavcontrollerhelper" filter="s60" long-name="UPnP A/V Controller Helper" introduced="^2">
+<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerhelper/group"/>
+</component>
+<component name="upnpavcontroller_build" filter="s60" long-name="UPnP A/V Controller Build" introduced="^2">
+<!-- move exports content into one of above components -->
+<unit bldFile="mw/dlnasrv/upnpavcontroller/group"/>
+</component>
+</collection>
+<collection name="upnpframework" long-name="UPnP Framework" level="framework">
+<component name="upnputilities" filter="s60" long-name="UPnP Utilities" introduced="^2">
+<unit bldFile="mw/dlnasrv/upnpframework/upnputilities/group"/>
+</component>
+<component name="upnpextensionpluginif" filter="s60" long-name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
+<!-- <unit bldFile="upnpframework/upnpextensionpluginif/group"/> -->
+</component>
+<component name="upnpfiletransferengine" filter="s60" long-name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
+<!-- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>-->
+</component>
+<component name="upnpcommonui" filter="s60" long-name="UPnP Common UI" introduced="^2" deprecated="^3">
+<!--<unit bldFile="upnpframework/upnpcommonui/group"/>-->
+</component>
+<component name="upnpaiwengine" filter="s60" long-name="UPnP AIW Engine" introduced="^2" deprecated="^3">
+<!--<unit bldFile="upnpframework/upnpaiwengine/group"/> -->
+</component>
+<component name="upnpaiwprovider" filter="s60" long-name="UPnP AIW Provider" introduced="^2" deprecated="^3" plugin="Y">
+<!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
+</component>
+<component name="upnpmusicadapter" filter="s60" long-name="UPnP Music Adapter" introduced="^2">
+<unit bldFile="mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
+</component>
+<component name="upnpcommand" filter="s60" long-name="UPnP Command" introduced="^2">
+<unit bldFile="mw/dlnasrv/upnpframework/upnpcommand/group"/>
+</component>
+<component name="upnpframework_build" filter="s60" long-name="UPnP Framework Build" introduced="^2">
+<!-- move exports content into one of above components -->
+<unit bldFile="mw/dlnasrv/upnpframework/group"/>
+</component>
+</collection>
+<collection name="upnpsettings" long-name="UPnP Settings" level="framework">
+<component name="upnpsettingsengine" filter="s60" long-name="UPnP Settings Engine" introduced="^2">
+<unit bldFile="mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
+</component>
+<component name="multiselectionui" filter="s60" long-name="Multi-Selection UI" introduced="^2" deprecated="^3">
+<!--<unit bldFile="upnpsettings/multiselectionui/group"/>-->
+</component>
+<component name="appwizard" filter="s60" long-name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
+<!--<unit bldFile="upnpsettings/appwizard/group"/>-->
+</component>
+<component name="upnpsharingui" filter="s60" long-name="UPnP Sharing UI" introduced="^2" deprecated="^3">
+<!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
+</component>
+<component name="upnpgsplugin" filter="s60" long-name="UPnP GS Plugin" introduced="^2" plugin="Y">
+<unit bldFile="mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
+</component>
+<component name="upnpsettings_build" filter="s60" long-name="UPnP Settings Build" introduced="^2">
+<!-- move exports content into one of above components -->
+<unit bldFile="mw/dlnasrv/upnpsettings/group"/>
+</component>
+</collection>
+<collection name="upnpsharing" long-name="UPnP Sharing" level="server">
+<component name="upnpdlnaprofiler" filter="s60" long-name="UPnP DLNA Profiler" introduced="^2">
+<unit bldFile="mw/dlnasrv/upnpsharing/upnpdlnaprofiler/group"/>
+</component>
+<component name="upnpsecurity" filter="s60" long-name="UPnP Security" introduced="^2">
+<unit bldFile="mw/dlnasrv/upnpsharing/upnpsecurity/group"/>
+</component>
+<component name="upnpcontentserver" filter="s60" long-name="UPnP Content Server" introduced="^2">
+<unit bldFile="mw/dlnasrv/upnpsharing/upnpcontentserver/group"/>
+</component>
+<component name="applicationengine" filter="s60" long-name="UPnP Application Engine" introduced="^2">
+<unit bldFile="mw/dlnasrv/upnpsharing/applicationengine/group"/>
+</component>
+<component name="upnpsharing_build" filter="s60" long-name="UPnP Sharing Build" introduced="^2">
+<!-- move exports content into one of above components -->
+<unit bldFile="mw/dlnasrv/upnpsharing/group"/>
+</component>
+</collection>
+<collection name="upnpmpxplugins" long-name="UPnP MPX Plugins" level="plugin">
+<component name="upnpplaybackplugins" filter="s60" long-name="UPnP Playback Plugins" introduced="^2" plugin="Y">
+<unit bldFile="mw/dlnasrv/upnpmpxplugins/upnpplaybackplugins/group"/>
+</component>
+<component name="upnpmpxplugins_build" filter="s60" long-name="UPnP MPX Plugins Build" introduced="^2">
+<!-- move exports content into other component? -->
+<unit bldFile="mw/dlnasrv/upnpmpxplugins/group"/>
+</component>
+</collection>
+<collection name="upnpharvester" long-name="UPnP Harvester" level="ctrl">
+<component name="upnpharvester_common" filter="s60" long-name="UPnP Harvester Common" introduced="^2" deprecated="^3" class="placeholder">
+<!-- need to merge or #include these to a single bld.inf -->
+<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
+ <unit bldFile="upnpharvester/common/cmsettings/group"/>
+ <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
+ <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
+</component>
+<component name="cdssync" filter="s60" long-name="CDS Sync" introduced="^2" deprecated="^3" class="placeholder">
+<!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
+</component>
+<component name="mdhserver" filter="s60" long-name="Metadata Harvester Server" introduced="^2" deprecated="^3" class="placeholder">
+<!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
+</component>
+<component name="upnpharvester_build" filter="s60" long-name="UPnP Harvester Build" introduced="^2" deprecated="^3" class="placeholder">
+<!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
+<!--<unit bldFile="upnpharvester/group"/>-->
+</component>
+</collection>
+<collection name="homesync" long-name="Home Sync" level="plugin">
+<component name="contentmanager" filter="s60" long-name="Content Manager" introduced="^2" deprecated="^3" class="placeholder">
+<!-- <unit bldFile="homesync/group"/>-->
+<!-- move bld.inf into contentmanager dir -->
+</component>
+</collection>
+<collection name="homemedia" long-name="Home Media" level="framework">
+<!-- collection is really just a component. Move down a directory -->
+<component name="homemedia_build" filter="s60" long-name="Home Media" introduced="^2" deprecated="^3" class="placeholder">
+<!-- <unit bldFile="homemedia/group"/> -->
+</component>
+</collection>
+<collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin">
+<component name="dlnasrv_build" filter="s60" long-name="DLNA Services Build">
+<!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed -->
+<unit bldFile="mw/dlnasrv/group"/>
+</component>
+</collection>
+</block>
+<block name="btservices" level="generic" long-name="Bluetooth Services" levels="framework server generic specific plugin">
+<collection name="btservices_pub" long-name="BT Services Public Interfaces" level="plugin">
+<component name="bluetooth_power_state_api" long-name="Bluetooth Power State API" filter="s60" class="api">
+<unit bldFile="mw/btservices/btservices_pub/bluetooth_power_state_api/group"/>
+</component>
+<component name="bluetooth_notifier_api" long-name="Bluetooth Notifier API" filter="s60" class="api">
+<unit bldFile="mw/btservices/btservices_pub/bluetooth_notifier_api/group"/>
+</component>
+</collection>
+<collection name="btservices_plat" long-name="BT Services Platform Interfaces" level="plugin">
+<component name="bluetooth_dosserver_audio_api" long-name="Bluetooth DOS Server Audio API" filter="s60" class="api">
+<unit bldFile="mw/btservices/btservices_plat/bluetooth_dosserver_audio_api/group"/>
+</component>
+<component name="bluetooth_dut_mode_api" long-name="Bluetooth DUT Mode API" filter="s60" class="api">
+<unit bldFile="mw/btservices/btservices_plat/bluetooth_dut_mode_api/group"/>
+</component>
+<component name="bluetooth_engine_api" long-name="Bluetooth Engine API" filter="s60" class="api">
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</component>
+<component name="bluetooth_local_variation_api" long-name="Bluetooth Local Variation API" filter="s60" class="api">
+<unit bldFile="mw/btservices/btservices_plat/bluetooth_local_variation_api/group"/>
+</component>
+<component name="bluetooth_notifier_internal_api" long-name="Bluetooth Notifier internal API" filter="s60" class="api">
+<unit bldFile="mw/btservices/btservices_plat/bluetooth_notifier_internal_api/group"/>
+</component>
+<component name="bluetooth_sap_connection_state_api" long-name="Bluetooth SAP Connection State API" filter="s60" class="api">
+<unit bldFile="mw/btservices/btservices_plat/bluetooth_sap_connection_state_api/group"/>
+</component>
+<component name="bluetooth_secondary_display_notification_api" long-name="Bluetooth Secondary Display Notification API" filter="s60" class="api">
+<unit bldFile="mw/btservices/btservices_plat/bluetooth_secondary_display_notification_api/group"/>
+</component>
+</collection>
+<collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
+<component name="bteng" filter="s60" long-name="Bluetooth Engine">
+<unit bldFile="mw/btservices/bluetoothengine/bteng/group"/>
+</component>
+<component name="btnotif" filter="s60" long-name="Bluetooth Notifier">
+<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"/>
+</component>
+<component name="btmac" filter="s60" long-name="Bluetooth Mono Audio Controller" plugin="Y">
+<unit bldFile="mw/btservices/bluetoothengine/btmac/group"/>
+</component>
+<component name="btsac" filter="s60" long-name="Bluetooth Stereo Audio Controller" plugin="Y">
+<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"/>
+</component>
+<component name="btsap" filter="s60" long-name="Bluetooth SIM Access Profile" plugin="Y">
+<unit bldFile="mw/btservices/bluetoothengine/btsap/group"/>
+</component>
+<component name="btui" filter="s60" long-name="Bluetooth UI">
+<unit bldFile="mw/btservices/bluetoothengine/btui/group"/>
+</component>
+<component name="btpbap" filter="s60" long-name="Bluetooth Phonebook Access Profile" plugin="Y">
+<unit bldFile="mw/btservices/bluetoothengine/btpbap/group"/>
+</component>
+<component name="bthid" filter="s60" long-name="Bluetooth HID">
+<unit bldFile="mw/btservices/bluetoothengine/bthid/group"/>
+</component>
+<component name="btctrldcmoadapter" filter="s60" long-name="Bluetooth Control DCMO Adapter" introduced="^3" plugin="Y">
+<unit bldFile="mw/btservices/bluetoothengine/btctrldcmoadapter/group"/>
+</component>
+</collection>
+<collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
+<component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
+<unit bldFile="mw/btservices/bluetoothappprofiles/avrcp" mrp="mw/btservices/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
+</component>
+</collection>
+<collection name="atcommands" long-name="AT Commands" level="generic">
+<component name="modematplugin" long-name="Modem AT Plugin" filter="s60" introduced="^4" plugin="Y">
+<unit bldFile="mw/btservices/atcommands/modematplugin/group"/>
+</component>
+<component name="lccustomplugin" long-name="LC Custom Plugin" filter="s60" introduced="^4" plugin="Y">
+<unit bldFile="mw/btservices/atcommands/lccustomplugin/group"/>
+</component>
+</collection>
+<collection name="btservices_info" long-name="BT Services Info" level="plugin">
+<component name="btservices_metadata" long-name="BT Services Metadata" introduced="^3" purpose="development" class="config PC">
+<unit mrp="mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="usbservices" level="generic" long-name="USB Services" levels="framework server generic specific plugin">
+<collection name="usbservices_plat" long-name="USB Services Platform Interfaces" level="plugin">
+<component name="pictbridge_api" long-name="PictBridge API" filter="s60" class="api">
+<unit bldFile="mw/usbservices/usbservices_plat/pictbridge_api/group"/>
+</component>
+<component name="ptp_responder_api" long-name="PTP Responder API" filter="s60" class="api">
+<unit bldFile="mw/usbservices/usbservices_plat/ptp_responder_api/group"/>
+</component>
+<component name="ptp_transport_api" long-name="PTP Transport API" filter="s60" class="api">
+<unit bldFile="mw/usbservices/usbservices_plat/ptp_transport_api/group"/>
+</component>
+<component name="usb_device_control_plugin_api" long-name="USB Device Control Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/usbservices/usbservices_plat/usb_device_control_plugin_api/group"/>
+</component>
+<component name="usb_notifier_api" long-name="USB Notifier API" filter="s60" class="api">
+<unit bldFile="mw/usbservices/usbservices_plat/usb_notifier_api/group"/>
+</component>
+<component name="usb_personality_api_header" long-name="USB Personality API" filter="s60" class="api">
+<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_api_header/group"/>
+</component>
+<component name="usb_personality_plugin_api" long-name="USB Personality Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_plugin_api/group"/>
+</component>
+<component name="usb_secondary_display_api" long-name="USB Secondary Display API" filter="s60" class="api">
+<unit bldFile="mw/usbservices/usbservices_plat/usb_secondary_display_api/group"/>
+</component>
+<component name="usb_watcher_api" long-name="USB Watcher API" filter="s60" class="api">
+<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_api/group"/>
+</component>
+<component name="usb_watcher_info_api_header" long-name="USB Watcher Info API" filter="s60" class="api">
+<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_info_api_header/group"/>
+</component>
+</collection>
+<collection name="usbservices_info" long-name="USB Services Info" level="plugin"/>
+<collection name="usbengines" long-name="USB Engines" level="generic">
+<component name="usbotgwatcher" filter="s60" long-name="USB OTG Watcher">
+<unit bldFile="mw/usbservices/usbengines/usbotgwatcher/group"/>
+</component>
+<component name="usbwatcher" filter="s60" long-name="USB Watcher">
+<unit bldFile="mw/usbservices/usbengines/usbwatcher/group"/>
+</component>
+<component name="usblocodplugin" filter="s60" long-name="USB Local Connectivity Domain Plugin" plugin="Y">
+<unit bldFile="mw/usbservices/usbengines/usblocodplugin/group"/>
+</component>
+<component name="usbdevcon" filter="s60" long-name="USB Device Control">
+<unit bldFile="mw/usbservices/usbengines/usbdevcon/group"/>
+</component>
+<component name="usbremotepersonality" filter="s60" long-name="USB Remote Personality">
+<unit bldFile="mw/usbservices/usbengines/usbremotepersonality/group"/>
+</component>
+</collection>
+<collection name="usbclasses" long-name="USB Classes" level="framework">
+<component name="usbobexclasscontroller" filter="s60" long-name="USB OBEX Class Controller" plugin="Y">
+<unit bldFile="mw/usbservices/usbclasses/usbobexclasscontroller/group"/>
+</component>
+<component name="usbbasicpersonality" filter="s60" long-name="USB Basic Personality" plugin="Y">
+<unit bldFile="mw/usbservices/usbclasses/usbbasicpersonality/group"/>
+</component>
+<component name="usbmscpersonality" filter="s60" long-name="USB MSC Personality" plugin="Y">
+<unit bldFile="mw/usbservices/usbclasses/usbmscpersonality/group"/>
+</component>
+<!-- commented out in bld.inf. Should this be deleted?
+ <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
+ <unit bldFile="usbclasses/ptpstack/group"/>
+ </component>
+ <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
+ <unit bldFile="usbclasses/sicdusbplugin/group"/>
+ </component>
+ <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
+ <unit bldFile="usbclasses/ptpserver/group"/>
+ </component>-->
+<component name="pictbridgeengine" filter="s60" long-name="PictBridge Engine">
+<unit bldFile="mw/usbservices/usbclasses/pictbridgeengine/group"/>
+</component>
+<component name="usbphoneasmodem" filter="s60" long-name="USB Phone as Modem" introduced="^3">
+<unit bldFile="mw/usbservices/usbclasses/usbphoneasmodem/group"/>
+</component>
+</collection>
+<collection name="usbuis" long-name="USB UIs" level="specific">
+<component name="usbui" filter="s60" long-name="USB UI">
+<unit bldFile="mw/usbservices/usbuis/usbui/group"/>
+</component>
+<component name="usbuinotif" filter="s60" long-name="USB UI Notifiers">
+<unit bldFile="mw/usbservices/usbuis/usbuinotif/group"/>
+</component>
+<component name="imageprintuiprovider" filter="s60" long-name="ImagePrint UI Provider" plugin="Y">
+<unit bldFile="mw/usbservices/usbuis/imageprintuiprovider/group"/>
+</component>
+<component name="usbimageprintui" filter="s60" long-name="ImagePrint UI">
+<unit bldFile="mw/usbservices/usbuis/imageprintui/group"/>
+</component>
+</collection>
+</block>
+<block name="shortlinkconn" level="generic" long-name="Shortlink Connectivity" levels="framework server generic specific plugin">
+<!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
+<collection name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" level="plugin">
+<component name="obex_service_utils_api" long-name="OBEX Service Utils API" filter="s60" class="api">
+<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_utils_api/group"/>
+</component>
+<component name="obex_service_plugin_api" long-name="OBEX Service Plugin API" filter="s60" class="api">
+<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_plugin_api/group"/>
+</component>
+<component name="dialup_connection_status_api" long-name="Dial-up Connection Status API" filter="s60" class="api">
+<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dialup_connection_status_api/group"/>
+</component>
+<component name="dun_secondary_display_notification_api" long-name="DUN Secondary Display Notification API" filter="s60" class="api">
+<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
+</component>
+<component name="obex_secondary_display_notification_api" long-name="OBEX Secondary Display Notification API" filter="s60" class="api">
+<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
+</component>
+<component name="generic_hid_api" long-name="Generic HID API" filter="s60" class="api">
+<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/generic_hid_api/group"/>
+</component>
+<component name="locod_bearer_plugin_api" long-name="Locod Bearer Plugin API" filter="s60" class="api">
+<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/locod_bearer_plugin_api/group"/>
+</component>
+<component name="usb_obexservicemanager_client_api" long-name="USB OBEX Service Manager Client API" filter="s60" class="api">
+<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_obexservicemanager_client_api/group"/>
+</component>
+</collection>
+<collection name="localconnectivityservice" long-name="Local Connectivity Service" level="server">
+<component name="locod" long-name="Local Connectivity Daemon">
+<unit bldFile="mw/shortlinkconn/localconnectivityservice/locod/group"/>
+</component>
+<component name="obexserviceman" long-name="OBEX Service Managar">
+<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
+</component>
+<component name="obexsendservices" long-name="OBEX Send Services">
+<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
+</component>
+<component name="obexreceiveservices" long-name="OBEX Receive Services">
+<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
+</component>
+<component name="dun" long-name="Dial Up Networking">
+<unit bldFile="mw/shortlinkconn/localconnectivityservice/dun/group"/>
+</component>
+<component name="lcstylustap" long-name="LC Stylus Tap Plugins" plugin="Y">
+<unit bldFile="mw/shortlinkconn/localconnectivityservice/lcstylustap/group"/>
+</component>
+<component name="generichid" long-name="Generic HID">
+<unit bldFile="mw/shortlinkconn/localconnectivityservice/generichid/group"/>
+</component>
+<component name="headset" long-name="Headset">
+<unit bldFile="mw/shortlinkconn/localconnectivityservice/headset/group"/>
+</component>
+</collection>
+</block>
+<block name="imghandling" level="specific" long-name="Image Handling" levels="lib util if">
+<collection name="imagehandling_plat" long-name="Image Handling Platform Interfaces" level="if">
+<component name="image_handling_library_api" long-name="Image Handling Library API" filter="s60" class="api">
+<unit bldFile="mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
+</component>
+<component name="3gp_library_api" long-name="3GP Library API" filter="s60" class="api">
+<unit bldFile="mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
+</component>
+<component name="thumbnailmanager_api" long-name="Thumbnail Manager API" filter="s60" class="api">
+<unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
+</component>
+</collection>
+<collection name="imagehandlinglib" long-name="Image Handling Library" level="lib">
+<!-- collection is really a component, need to move down a directory -->
+<component name="ihl" filter="s60" long-name="IHL">
+<unit bldFile="mw/imghandling/imagehandlinglib/group"/>
+</component>
+</collection>
+<collection name="imagehandlingutilities" long-name="Image Handling Utilities" level="util">
+<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager">
+<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
+</component>
+</collection>
+</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">
+<unit bldFile="mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
+</component>
+</collection>
+</block>
+<block name="mds" level="specific" long-name="Metadata Services" levels="mgr eng server int">
+<collection name="mds_plat" long-name="Metadata Services Platform Interfaces" level="int">
+<component name="context_engine_plugin_api" long-name="Context Engine Plugin API" introduced="^2" filter="s60" class="api">
+<unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/group" filter="!test"/>
+</component>
+<component name="harvester_framework_api" long-name="Harvester Framework API" introduced="^2" filter="s60" class="api">
+<unit bldFile="mw/mds/mds_plat/harvester_framework_api/group" filter="!test"/>
+<!-- can only have one unit with the same filter, #include the following from the previous unit -->
+</component>
+<component name="location_manager_api" long-name="Location Manager API" introduced="^2" filter="s60" class="api">
+<unit bldFile="mw/mds/mds_plat/location_manager_api/group" filter="!test"/>
+</component>
+<component name="metadata_engine_api" long-name="Metadata Engine API" introduced="^2" filter="s60" class="api">
+<unit bldFile="mw/mds/mds_plat/metadata_engine_api/group" filter="!test"/>
+</component>
+<component name="content_listing_framework_collection_manager_api" long-name="Content Listing Framework Collection Manager API" introduced="^2" filter="s60" class="api">
+<unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/group" filter="!test"/>
+</component>
+<component name="content_listing_framework_extended_api" long-name="Content Listing Framework Extended API" introduced="^2" filter="s60" class="api">
+<unit bldFile="mw/mds/mds_plat/content_listing_framework_extended_api/group"/>
+</component>
+</collection>
+<collection name="mds_pub" long-name="Metadata Services Public Interfaces" level="int">
+<component name="content_listing_framework_api" long-name="Content Listing Framework API" introduced="^2" filter="s60" class="api">
+<unit bldFile="mw/mds/mds_pub/content_listing_framework_api/group" filter="!test"/>
+</component>
+</collection>
+<collection name="metadataengine" long-name="Metadata Engine" level="eng">
+<component name="metadataengine_common" filter="s60" long-name="Metadata Engine Common" introduced="^2">
+<unit bldFile="mw/mds/metadataengine/common/group"/>
+</component>
+<component name="metadataengine_server" filter="s60" long-name="Metadata Engine Server" introduced="^2">
+<unit bldFile="mw/mds/metadataengine/server/group"/>
+</component>
+<component name="metadataengine_client" filter="s60" long-name="Metadata Engine Client" introduced="^2">
+<unit bldFile="mw/mds/metadataengine/client/group"/>
+</component>
+<component name="metadataengine_build" filter="s60" long-name="Metadata Engine Build" introduced="^2">
+<!--make this collection a single component, or split this bld.inf into the other units -->
+<unit bldFile="mw/mds/metadataengine/group"/>
+</component>
+</collection>
+<collection name="locationmanager" long-name="Location Manager" level="mgr">
+<component name="locationtrail" filter="s60" long-name="Location Trail" introduced="^2">
+<unit bldFile="mw/mds/locationmanager/locationtrail/group"/>
+</component>
+<component name="locationmanager_server" filter="s60" long-name="Location Manager Server" introduced="^2">
+<unit bldFile="mw/mds/locationmanager/server/group"/>
+</component>
+<component name="locationmanager_client" filter="s60" long-name="Location Manager Client" introduced="^2">
+<unit bldFile="mw/mds/locationmanager/client/group"/>
+</component>
+<component name="locationmanager_build" filter="s60" long-name="Location Manager Build" introduced="^2">
+<!--make this collection a single component, or split this bld.inf into the other units -->
+<unit bldFile="mw/mds/locationmanager/group"/>
+</component>
+</collection>
+<collection name="contextengine" long-name="Context Engine" level="eng">
+<component name="contextengine_plugins" filter="s60" long-name="Context Engine Plugins" introduced="^2" plugin="Y">
+<unit bldFile="mw/mds/contextengine/plugins/group"/>
+</component>
+<component name="contextengine_build" filter="s60" long-name="Context Engine Build" introduced="^2">
+<!--make this collection a single component, or make this unit self-contained -->
+<unit bldFile="mw/mds/contextengine/group"/>
+</component>
+</collection>
+<collection name="harvester" long-name="Harvester" level="eng">
+<component name="blacklistclient" filter="s60" long-name="Blacklist Client" introduced="^2">
+<unit bldFile="mw/mds/harvester/blacklistclient/group"/>
+</component>
+<component name="blacklistserver" filter="s60" long-name="Blacklist Server" introduced="^2">
+<unit bldFile="mw/mds/harvester/blacklistserver/group"/>
+</component>
+<component name="harvester_common" filter="s60" long-name="Harvester Common" introduced="^2">
+<unit bldFile="mw/mds/harvester/common/group"/>
+</component>
+<component name="composerplugins" filter="s60" long-name="Composer Plugins" introduced="^2" plugin="Y">
+<unit bldFile="mw/mds/harvester/composerplugins/group"/>
+</component>
+<component name="harvesterplugins" filter="s60" long-name="Harvester Plugins" introduced="^2" plugin="Y">
+<unit bldFile="mw/mds/harvester/harvesterplugins/group"/>
+</component>
+<component name="monitorplugins" filter="s60" long-name="Monitor Plugins" introduced="^2" plugin="Y">
+<unit bldFile="mw/mds/harvester/monitorplugins/group"/>
+</component>
+<component name="harvester_server" filter="s60" long-name="Harvester Server" introduced="^2">
+<unit bldFile="mw/mds/harvester/server/group"/>
+</component>
+<component name="harvester_client" filter="s60" long-name="Harvester Client" introduced="^2">
+<unit bldFile="mw/mds/harvester/client/group"/>
+</component>
+<component name="harvester_build" filter="s60" long-name="Harvester Build" introduced="^2">
+<!-- split these exports into the other components -->
+<unit bldFile="mw/mds/harvester/group"/>
+</component>
+</collection>
+<collection name="watchdog" long-name="Watchdog" level="server">
+<!-- collection is really a component. Move down a directory -->
+<component name="mdswatchdog" filter="s60" long-name="Metadata Watchdog" introduced="^2">
+<unit bldFile="mw/mds/watchdog/group"/>
+</component>
+</collection>
+<collection name="clfwrapper" long-name="Content Listing Framework Wrapper" level="int">
+<!-- collection is really a component. Move down a directory -->
+<component name="clfwrapper_build" filter="s60" long-name="CLF Wrapper Build" introduced="^2" class="placeholder">
+<!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
+<!--<unit bldFile="clfwrapper/group"/>-->
+</component>
+</collection>
+<collection name="mds_info" long-name="Metadata Services Info" level="int">
+<component name="mds_build" filter="s60" long-name="Metadata Services Build" introduced="^2">
+<!-- consider distributiing this into the rest of the components in the package -->
+<unit bldFile="mw/mds/group"/>
+</component>
+</collection>
+</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">
+<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">
+<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">
+<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">
+<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">
+<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">
+<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">
+<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">
+<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">
+<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">
+<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">
+<unit bldFile="mw/mmuifw/mmuifw_plat/alf_customlayoutmanagers_api/group"/>
+</component>
+<component name="gesturehelper_api" long-name="Gesture Helper API" filter="s60" 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">
+<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">
+<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">
+<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">
+<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">
+<!-- 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">
+<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">
+<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">
+<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">
+<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">
+<unit bldFile="mw/mmuifw/mulwidgets/mullogging/group"/>
+</component>
+<component name="muldatamodel" filter="s60" long-name="MUL Data Model">
+<unit bldFile="mw/mmuifw/mulwidgets/muldatamodel/group"/>
+</component>
+<component name="mulwidgets_common" filter="s60" long-name="MUL Common Utils">
+<unit bldFile="mw/mmuifw/mulwidgets/common/group"/>
+</component>
+<component name="gesturehelper" filter="s60" long-name="Gesture Helper">
+<unit bldFile="mw/mmuifw/mulwidgets/gesturehelper/group"/>
+</component>
+<component name="mulcoverflowwidget" filter="s60" long-name="MUL CoverFlow Widget">
+<unit bldFile="mw/mmuifw/mulwidgets/mulcoverflowwidget/group"/>
+</component>
+<component name="mulsliderwidget" filter="s60" long-name="MUL Slider Widget">
+<unit bldFile="mw/mmuifw/mulwidgets/mulsliderwidget/group"/>
+</component>
+<component name="alfviewwidget" filter="s60" long-name="ALF View Widget">
+<unit bldFile="mw/mmuifw/mulwidgets/alfviewwidget/group"/>
+</component>
+<component name="alfcontainerwidget" filter="s60" long-name="ALF Container Widget">
+<unit bldFile="mw/mmuifw/mulwidgets/alfcontainerwidget/group"/>
+</component>
+<component name="alfscrollbarwidget" filter="s60" long-name="ALF Scrollbar Widget">
+<unit bldFile="mw/mmuifw/mulwidgets/alfscrollbarwidget/group"/>
+</component>
+</collection>
+</block>
+<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"/>
+</component>
+<component name="videoconnutility_api" long-name="Video Connection Utility API" filter="s60" class="api">
+<unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/group"/>
+</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"/>
+</component>
+</collection>
+<collection name="videoscheduler" long-name="Video Scheduler" level="util">
+<component name="schedulerclient" filter="s60" long-name="Video Scheduler Client">
+<unit bldFile="mw/videoutils/videoscheduler/schedulerclient/group"/>
+</component>
+<component name="schedulerserver" filter="s60" long-name="Video Scheduler Server">
+<unit bldFile="mw/videoutils/videoscheduler/schedulerserver/group"/>
+</component>
+</collection>
+<collection name="videoconnutility" long-name="Video Connection Utility" level="util">
+<component name="connutilpsworker" filter="s60" long-name="Connection Utility Publish and Subscribe Worker">
+<unit bldFile="mw/videoutils/videoconnutility/connutilpsworker/group"/>
+</component>
+<component name="video_connutility" filter="s60" long-name="Video Connection Utility">
+<unit bldFile="mw/videoutils/videoconnutility/connutility/group"/>
+</component>
+</collection>
+<collection name="videoutils_info" long-name="Video Utils Info" level="if"/>
+</block>
+<block name="mmmw" level="generic" long-name="Multimedia Middleware" levels="plugin framework server generic specific">
+<collection name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" level="specific">
+<component name="multimedia_data_source_api" long-name="Multimedia Data Source API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
+</component>
+<component name="progressive_download_api" long-name="Progressive Download API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/progressive_download_api/group"/>
+</component>
+<component name="equalizer_ui_api" long-name="Equalizer UI API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
+</component>
+<component name="enhanced_media_client_api" long-name="Enhanced Media Client API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
+</component>
+<component name="stream_control_custom_command_api" long-name="Stream Control Custom Command API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
+</component>
+<component name="emc_buffer_source_api" long-name="EMC Buffer Source API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/emc_buffer_source_api/group"/>
+</component>
+<component name="emc_file_source_api" long-name="EMC File Source API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
+</component>
+<component name="audio_metadata_reader_api" long-name="Audio MetaData Reader API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
+</component>
+<component name="emc_progressive_download_source_api" long-name="EMC Progressive Download Source API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
+</component>
+<component name="emc_volume_effect_api" long-name="EMC Volume Effect API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
+</component>
+<component name="emc_balance_effect_api" long-name="EMC Balance Effect API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/emc_balance_effect_api/group"/>
+</component>
+<component name="emc_descriptor_source_api" long-name="EMC Descriptor Source API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/emc_descriptor_source_api/group"/>
+</component>
+<component name="emc_drm_config_intfc_api" long-name="EMC DRM Config Intfc API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
+</component>
+<component name="voip_audio_services_api" long-name="VoIP Audio Services" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/group"/>
+</component>
+<component name="configuration_components_factory_api" long-name="Configuration Components Factory API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
+</component>
+<component name="audio_output_control_utility_api" long-name="Audio Output Control Utility API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/group"/>
+</component>
+<component name="audio_output_control_utility_proxy_api" long-name="Audio Output Control Utility Proxy API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
+</component>
+<component name="emc_audio_effects_api" long-name="EMC Audio Effects API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
+</component>
+<component name="call_audio_control_api" long-name="Call AudioControl API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/group"/>
+</component>
+<component name="radio_utilities_api" long-name="Radio Utilities API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/group"/>
+</component>
+<component name="radio_preset_utilities_api" long-name="Radio Preset Utilities API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
+</component>
+<component name="radio_monitor_api" long-name="Radio Monitor API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
+</component>
+<component name="thumbnail_engine_api" long-name="Thumbnail Engine API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/thumbnail_engine_api/group"/>
+</component>
+<component name="telephony_multimedia_service_api" long-name="Telephony Multimedia Service API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
+</component>
+</collection>
+<collection name="mmfenh" long-name="MMF Enhancements" level="generic">
+<component name="advancedaudiocontroller" filter="s60" long-name="Advanced Audio Controllers" plugin="Y">
+<unit bldFile="mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
+</component>
+<component name="audiooutputcontrolutility" filter="s60" long-name="Audio Output Control Utility">
+<unit bldFile="mw/mmmw/mmfenh/audiooutputcontrolutility/group"/>
+</component>
+<component name="configurationcomponentsfactory" filter="s60" long-name="Configuration Components Factory">
+<unit bldFile="mw/mmmw/mmfenh/configurationcomponentsfactory/group"/>
+</component>
+<component name="enhancedaudioplayerutility" filter="s60" long-name="Enhanced Audio Player Utility">
+<unit bldFile="mw/mmmw/mmfenh/enhancedaudioplayerutility/group"/>
+</component>
+<component name="enhancedmediaclient" filter="s60" long-name="Enhanced Media Client">
+<unit bldFile="mw/mmmw/mmfenh/enhancedmediaclient/group"/>
+</component>
+<component name="profilesettingsmonitor" filter="s60" long-name="Profile Settings Monitor">
+<unit bldFile="mw/mmmw/mmfenh/profilesettingsmonitor/group"/>
+</component>
+<component name="progressivedownload" filter="s60" long-name="Progressive Download">
+<unit bldFile="mw/mmmw/mmfenh/progressivedownload/group"/>
+</component>
+</collection>
+<collection name="mm_fw" long-name="Multimedia Frameworks" level="framework">
+<!-- Id needs to be unique, mmfw already in use -->
+<!-- Placeholder for OpenAX AL and other stuff -->
+</collection>
+<collection name="mmserv" long-name="Multimedia Services" level="specific">
+<component name="audioeffectsui" filter="s60" long-name="Audio Effects UI">
+<unit bldFile="mw/mmmw/mmserv/audioeffectsui/group"/>
+</component>
+<component name="callaudiocontrol" filter="s60" long-name="Call Audio Control">
+<unit bldFile="mw/mmmw/mmserv/callaudiocontrol/group"/>
+</component>
+<component name="metadatautility" filter="s60" long-name="Metadata Utility">
+<unit bldFile="mw/mmmw/mmserv/metadatautility/group"/>
+</component>
+<component name="radioutility" filter="s60" long-name="Radio Utility">
+<unit bldFile="mw/mmmw/mmserv/radioutility/group"/>
+</component>
+<component name="thumbnailengine" filter="s60" long-name="Thumbnail Engine" introduced="^2">
+<unit bldFile="mw/mmmw/mmserv/thumbnailengine/group"/>
+</component>
+<component name="tms" filter="s60" long-name="Telephony Multimedia Service" introduced="^3">
+<unit bldFile="mw/mmmw/mmserv/tms/group"/>
+</component>
+<component name="voipaudioservices" filter="s60" long-name="VoIP Audio Services">
+<unit bldFile="mw/mmmw/mmserv/voipaudioservices/group"/>
+</component>
+<component name="lib3gpextparser" filter="s60" long-name="3GP Extension Metadata Parser Library">
+<unit bldFile="mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group" filter="sf_build"/>
+</component>
+</collection>
+<collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
+<component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="helix" level="generic" long-name="Helix" levels="plugin framework server generic specific">
+<collection name="helix_ren" long-name="Helix Engine" level="framework">
+<!-- what does "ren" stand for? -->
+<component name="helix_stub" filter="s60" long-name="Helix Stub" introduced="^2" class="api">
+<unit bldFile="mw/helix/helix_ren/helix_stub/group"/>
+</component>
+</collection>
+</block>
+<block name="camerasrv" level="specific" long-name="Camera Services" levels="plugin fw api">
+<collection name="camerasrv_plat" long-name="Camera Services Platform Interfaces" level="api">
+<component name="media_recorder_sink_api" long-name="Media Recorder Sink API" filter="s60" class="api">
+<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
+</component>
+<component name="cae_extentension_api" long-name="CAE Extension API" filter="s60" class="api">
+<unit bldFile="mw/camerasrv/camerasrv_plat/cae_extentension_api/group"/>
+</component>
+<component name="camera_application_engine_api" long-name="Camera Application Engine API" filter="s60" class="api">
+<unit bldFile="mw/camerasrv/camerasrv_plat/camera_application_engine_api/group" filter="!test"/>
+</component>
+<component name="custom_onboard_camera_api" long-name="Custom Onboard Camera API" filter="s60" class="api">
+<unit bldFile="mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
+</component>
+<component name="imaging_configuration_manager_api" long-name="Imaging Configuration Manager API" filter="s60" class="api">
+<unit bldFile="mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
+</component>
+<component name="media_recorder_api" long-name="Media Recorder API" filter="s60" class="api">
+<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_api/group" filter="!test"/>
+</component>
+<component name="3gp_file_composer_api" long-name="3GP File Composer API" filter="s60" class="api">
+<unit bldFile="mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
+</component>
+<component name="asynchronous_file_saving_queue_api" long-name="Asynchronous File Saving Queue API" filter="s60" class="api">
+<unit bldFile="mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/group" filter="!test"/>
+</component>
+</collection>
+<collection name="camappengine" long-name="Camera App Engine" level="fw">
+<!-- is this collection really a component? If so, move down a directory -->
+<component name="stillconverter" filter="s60" long-name="Still Image Converter" class="placeholder">
+<!-- should separate this from parent engine's bld.inf -->
+<!-- <unit bldFile="camappengine/stillconverter/group"/> -->
+</component>
+<component name="camappengine_engine" filter="s60" long-name="Camera App Engine" class="placeholder">
+<!-- should separate this from parent engine's bld.inf -->
+<!-- <unit bldFile="camappengine/engine/group"/> -->
+</component>
+<component name="asynchfilesavequeue" filter="s60" long-name="Asynch File Save Queue">
+<unit bldFile="mw/camerasrv/camappengine/asynchfilesavequeue/group"/>
+</component>
+<component name="camappengine_build" filter="s60" long-name="Camera App Engine Build">
+<unit bldFile="mw/camerasrv/camappengine/build"/>
+</component>
+</collection>
+<collection name="camcordermmfplugin" long-name="Camcorder MMF Plugin" level="plugin">
+<!-- collection is really a component. Should move down a directory -->
+<component name="camcordermmfplugin_build" filter="s60" long-name="Camcorder MMF Plugin Build" plugin="Y">
+<unit bldFile="mw/camerasrv/camcordermmfplugin/build"/>
+</component>
+</collection>
+<collection name="configmanagers" long-name="Config Managers" level="api">
+<component name="imagingconfigmanager" filter="s60" long-name="Imaging Config Manager">
+<unit bldFile="mw/camerasrv/configmanagers/imagingconfigmanager/group"/>
+</component>
+</collection>
+<collection name="camerasrv_info" long-name="Camera Services Info" level="api">
+<component name="camerasrv_build" filter="s60" long-name="Camera Services Build">
+<!-- should split into individual bld.infs -->
+<unit bldFile="mw/camerasrv/group"/>
+</component>
+</collection>
+</block>
+<block name="mmappfw" level="specific" long-name="Multimedia App Framework" levels="fw utils if">
+<collection name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" level="if">
+<component name="collection_helper_api" long-name="Collection Helper API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
+</component>
+<component name="harvester_collection_mediator_api" long-name="Harvester Collection Mediator API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/group"/>
+</component>
+<component name="harvester_metadata_extractor_api" long-name="Harvester Metadata Extractor API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/group"/>
+</component>
+<component name="harvester_server_api" long-name="Harvester Server API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_server_api/group"/>
+</component>
+<component name="harvester_utility_api" long-name="Harvester Utility API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_utility_api/group"/>
+</component>
+<component name="playlist_engine_api" long-name="Playlist Engine API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/playlist_engine_api/group"/>
+</component>
+<component name="mtp_keys_api" long-name="MTP Keys API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/mtp_keys_api/group"/>
+</component>
+<component name="mpx_collection_common_definition_api" long-name="MPX Collection Common Definition API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_common_definition_api/group"/>
+</component>
+<component name="mpx_collection_utility_api" long-name="MPX Collection Utility API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/group"/>
+</component>
+<component name="mpx_common_api" long-name="MPX Common API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_api/group"/>
+</component>
+<component name="mpx_common_definition_api" long-name="MPX Common Definition API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_definition_api/group"/>
+</component>
+<component name="mpx_playback_common_definition_api" long-name="MPX Playback Common Definition API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_common_definition_api/group"/>
+</component>
+<component name="mpx_playback_utility_api" long-name="MPX Playback Utility API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/group"/>
+</component>
+<component name="mpx_base_view_plugins_api" long-name="MPX Base View Plugins API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/group"/>
+</component>
+<component name="mpx_view_utility_api" long-name="MPX View Utility API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_view_utility_api/group"/>
+</component>
+<component name="mpx_albumart_utility_api" long-name="MPX Album Art Utility API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/group"/>
+</component>
+<component name="media_player_settings_engine_api" long-name="Media Player Settings Engine API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
+</component>
+<component name="mpx_backstepping_utility_api" long-name="MPX Backstepping Utility API" introduced="^1" filter="s60" class="api">
+<!-- uncomment when configuration is put in place
+ <unit bldFile="mmappfw_plat/mpx_backstepping_utility_api/group"/> -->
+</component>
+<component name="asx_parser_api" long-name="ASX Parser API" introduced="^1" filter="s60" class="api">
+<!-- uncomment when configuration is put in place
+ <unit bldFile="mmappfw_plat/asx_parser_api/group"/> -->
+</component>
+<component name="playback_helper_api" long-name="Playback Helper API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/playback_helper_api/group"/>
+</component>
+<component name="videoplaylist_utility_api" long-name="Video Playlist Utility API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/videoplaylist_utility_api/group"/>
+</component>
+<component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interface Build" introduced="^1" filter="s60" class="api">
+<!-- needed only for #ifdefs. Remove anmd uncomment above units when configuration is in place -->
+<unit bldFile="mw/mmappfw/mmappfw_plat/group"/>
+</component>
+</collection>
+<collection name="mpx" long-name="Multimedia Player" level="fw">
+<component name="commonframework" filter="s60" long-name="MPX Common Framework" introduced="^1">
+<unit bldFile="mw/mmappfw/mpx/commonframework/group"/>
+</component>
+<component name="playbackframework" filter="s60" long-name="MPX Playback Framework" introduced="^1">
+<unit bldFile="mw/mmappfw/mpx/playbackframework/group"/>
+</component>
+<component name="mpxcollectionfw" filter="s60" long-name="MPX Collection Framework" introduced="^1">
+<unit bldFile="mw/mmappfw/mpx/collectionframework/group"/>
+</component>
+<component name="mpxviewfw" filter="s60" long-name="MPX View Framework" introduced="^1">
+<unit bldFile="mw/mmappfw/mpx/viewframework/group"/>
+</component>
+<component name="mpx_build" filter="s60" long-name="MPX Build" introduced="^1">
+<!-- Move the export to another component or remove the #includes from this one -->
+<unit bldFile="mw/mmappfw/mpx/group"/>
+</component>
+</collection>
+<collection name="mmappcomponents" long-name="Multimedia App Components" level="utils">
+<component name="mmappcomponents_build" filter="s60" long-name="Multimedia App Components Build" introduced="^1">
+<!-- needed for #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
+ Can remove this once configuration is in place-->
+<unit bldFile="mw/mmappfw/mmappcomponents/group"/>
+</component>
+<component name="collectionhelper" filter="s60" long-name="Media Player Collection Helper" introduced="^1">
+<unit bldFile="mw/mmappfw/mmappcomponents/collectionhelper/group"/>
+</component>
+<component name="playlistengine" filter="s60" long-name="Playlist Engine" introduced="^1">
+<unit bldFile="mw/mmappfw/mmappcomponents/playlistengine/group"/>
+</component>
+<component name="mpxharvester" filter="s60" long-name="Media Player Harvester" introduced="^1">
+<unit bldFile="mw/mmappfw/mmappcomponents/harvester/group"/>
+</component>
+<component name="mmappcommonui" filter="s60" long-name="Multimedia App Common UI" introduced="^1">
+<unit bldFile="mw/mmappfw/mmappcomponents/mmappcommonui/group"/>
+</component>
+<component name="mediaplayersettingsengine" filter="s60" long-name="Media Player Settings Engine" introduced="^1">
+<unit bldFile="mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
+</component>
+<component name="audiofetcher" filter="s60" long-name="Audio Fetcher" introduced="^1" plugin="Y">
+<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
+<!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
+</component>
+<component name="asxparser" filter="s60" long-name="ASX Parser" introduced="^1">
+<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
+<!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
+</component>
+<component name="playbackhelper" filter="s60" long-name="Playback Helper" introduced="^3">
+<unit bldFile="mw/mmappfw/mmappcomponents/playbackhelper/group"/>
+</component>
+<component name="videoplaylistutility" filter="s60" long-name="Video Playlist Utility" introduced="^3">
+<unit bldFile="mw/mmappfw/mmappcomponents/videoplaylistutility/group"/>
+</component>
+<component name="mmmtpdataprovider" filter="s60" long-name="Multimedia MTP Data Provider" introduced="^3">
+<unit bldFile="mw/mmappfw/mmappcomponents/mmmtpdataprovider/group"/>
+</component>
+</collection>
+<collection name="mmappfw_info" long-name="Multimedia App Framework Info" level="if">
+<component name="mmappfw_build" filter="s60" long-name="Multimedia App Framework Build" introduced="^1">
+<!-- Move the export to another component or remove the #includes from this one -->
+<unit bldFile="mw/mmappfw/group"/>
+</component>
+<component name="mmappfw_test" filter="s60,test,api_test,pref_test" long-name="Multimedia App Framework Test" purpose="development" introduced="^1"/>
+</collection>
+</block>
+<block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework api">
+<collection name="inputmethods_pub" long-name="Input Methods Public Interfaces" level="api">
+<component name="ptiengine_iti_api" long-name="PTI Engine API" filter="s60" class="api">
+<unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
+</component>
+<component name="optical_character_recognition_api" long-name="Optical Character Recognition API" filter="s60" class="api">
+<unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
+</component>
+<component name="input_language_info_api" long-name="Input Language Info API" filter="s60" class="api">
+<unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
+</component>
+</collection>
+<collection name="inputmethods_plat" long-name="Input Methods Platform Interfaces" level="api">
+<component name="pen_input_server_api" long-name="Pen Input Server API" filter="s60" class="api">
+<unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/group" filter="!test"/>
+</component>
+<component name="ptiengine_hwr_api" long-name="PTI Engine Handwriting Recognition API" filter="s60" class="api">
+<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group" filter="!test"/>
+</component>
+<component name="aknfep_settings_api" long-name="Avkon FEP Settings API" filter="s60" class="api">
+<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
+</component>
+<component name="aknfep_status_api" long-name="Avkon FEP Status API" filter="s60" class="api">
+<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
+</component>
+<component name="ptiengine_key_definations_api" long-name="PTI Engine Key Definitions API" filter="s60" class="api">
+<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
+</component>
+<component name="aknfep_definitions_api" long-name="Avkon FEP Definitions API" filter="s60" class="api">
+<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
+</component>
+<component name="aknfep_pen_support_api" long-name="Avkon FEP Pen Support API" filter="s60" class="api">
+<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
+</component>
+<component name="ptiengine_indic_definitions_api" long-name="PTI Engine Indic Definitions API" filter="s60" class="api">
+<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
+</component>
+<component name="aknfep_uiinterface_api" long-name="Avkon FEP UI Interface API" filter="s60" class="api">
+<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group" filter="!test"/>
+</component>
+</collection>
+<collection name="textinput" long-name="Text Input" level="framework">
+<component name="ptienginev2" filter="s60" long-name="Predictive Text Input Engine">
+<!--uncomment when configuration is turned on and textinput_build is removed-->
+<!-- <unit bldFile="textinput/ptienginev2/group"/>-->
+</component>
+<component name="akninputlanguage" filter="s60" long-name="Avkon Input Language">
+<unit bldFile="mw/inputmethods/textinput/akninputlanguage/group"/>
+</component>
+<component name="peninputarc" filter="s60" long-name="Pen Input Arc">
+<unit bldFile="mw/inputmethods/textinput/peninputarc/group"/>
+</component>
+<component name="peninputcommonctrls" filter="s60" long-name="Pen Input Common Controls">
+<unit bldFile="mw/inputmethods/textinput/peninputcommonctrls/group"/>
+</component>
+<component name="peninputhwrboxcn" filter="s60" long-name="Chinese Handwriting Recognition Box" plugin="Y">
+<unit bldFile="mw/inputmethods/textinput/peninputhwrboxcn/group"/>
+</component>
+<component name="peninputvkbcn" filter="s60" long-name="Chinese Virtual Keyboard" plugin="Y">
+<unit bldFile="mw/inputmethods/textinput/peninputvkbcn/group"/>
+</component>
+<component name="peninputcommonlayout" filter="s60" long-name="Pen Input Common Layout">
+<unit bldFile="mw/inputmethods/textinput/peninputcommonlayout/group"/>
+</component>
+<component name="peninputgenerichwr" filter="s60" long-name="Pen Input Generic Handwriting Recognition" plugin="Y">
+<unit bldFile="mw/inputmethods/textinput/peninputgenerichwr/group"/>
+</component>
+<component name="peninputgenericvkb" filter="s60" long-name="Pen Input Generic Virtual Keyboard" plugin="Y">
+<unit bldFile="mw/inputmethods/textinput/peninputgenericvkb/group"/>
+</component>
+<component name="peninputcommonctrlsjp" filter="s60" long-name="Pen Input Common Controls Japanese">
+<unit bldFile="mw/inputmethods/textinput/peninputcommonctrlsjp/group"/>
+</component>
+<component name="peninputhwrboxjp" filter="s60" long-name="Japanese Handwriting Recognition Box" plugin="Y">
+<unit bldFile="mw/inputmethods/textinput/peninputhwrboxjp/group"/>
+</component>
+<component name="peninputvkbjp" filter="s60" long-name="Japanese Virtual Keyboard" plugin="Y">
+<unit bldFile="mw/inputmethods/textinput/peninputvkbjp/group"/>
+</component>
+<component name="gslangplugin" filter="s60" long-name="GS Language Plugin" plugin="Y">
+<unit bldFile="mw/inputmethods/textinput/GSLangPlugin"/>
+</component>
+<component name="peninputgenericitut" filter="s60" long-name="Pen Input Generic ITU-T" introduced="^3" plugin="Y">
+<unit bldFile="mw/inputmethods/textinput/peninputgenericitut/group"/>
+</component>
+<component name="peninputhwrtrui" filter="s60" long-name="Pen Input Handwriting Recognition Training UI" introduced="^3" plugin="Y">
+<unit bldFile="mw/inputmethods/textinput/peninputhwrtrui/group"/>
+</component>
+<component name="peninputhwrfscn" filter="s60" long-name="Pen Input Chinese Full Screen Handwriting Recognition" introduced="^3" plugin="Y">
+<unit bldFile="mw/inputmethods/textinput/peninputhwrfscn/group"/>
+</component>
+<component name="peninputvkbkr" filter="s60" long-name="Pen Input Korean Virtual Keyboard" introduced="^3" plugin="Y">
+<unit bldFile="mw/inputmethods/textinput/peninputvkbkr/group"/>
+</component>
+<component name="peninputfingerhwr" filter="s60" long-name="Pen Input Finger Handwriting Recognition" introduced="^3" plugin="Y">
+<unit bldFile="mw/inputmethods/textinput/peninputfingerhwr/group"/>
+</component>
+<component name="peninputsplititut" filter="s60" long-name="Pen Input Split ITU-T" introduced="^3" plugin="Y">
+<unit bldFile="mw/inputmethods/textinput/peninputsplititut/group"/>
+</component>
+<component name="peninputsplitqwerty" filter="s60" long-name="Pen Input Split QWERTY" introduced="^3" plugin="Y">
+<unit bldFile="mw/inputmethods/textinput/peninputsplitqwerty/group"/>
+</component>
+<component name="textinput_build" filter="s60" long-name="Text Input Build">
+<!--needed for #ifdef, can be removed when configuration is implemented -->
+<unit bldFile="mw/inputmethods/textinput/group"/>
+</component>
+</collection>
+<collection name="fep" long-name="FEP" level="engine">
+<component name="aknfep" filter="s60" long-name="Avkon FEP" plugin="Y">
+<unit bldFile="mw/inputmethods/fep/aknfep/group"/>
+</component>
+<component name="frontendprocessor" long-name="Front End Processor" purpose="mandatory">
+<unit bldFile="mw/inputmethods/fep/frontendprocessor/group" mrp="mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
+</component>
+</collection>
+<collection name="inputmethods_info" long-name="Input Methods Info" level="api">
+<component name="inputmethods_metadata" long-name="Input Methods Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="qt" level="generic" long-name="Qt" levels="tool mw app">
+<collection name="qtconf" long-name="Qt Config" level="tool">
+<component name="qt_deviceconfiguration" long-name="Qt Device Configuration" introduced="^2" class="config tool">
+<unit bldFile="mw/qt/src/s60installs/deviceconfiguration"/>
+</component>
+</collection>
+<collection name="qt_info" long-name="Qt Info" level="mw">
+<component name="qt_build" long-name="Qt Build" introduced="^2">
+<unit bldFile="mw/qt" proFile="projects.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+<collection name="qtdemos" long-name="Qt Demos" level="app">
+<component name="qtdemos_build" long-name="Qt Demos Build" introduced="^2" filter="qtdemos">
+<unit bldFile="mw/qt/demos" proFile="demos.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+<collection name="qtexamples" long-name="Qt Examples" level="app">
+<component name="qtexamples_build" long-name="Qt Examples Build" introduced="^2" filter="qtexamples">
+<unit bldFile="mw/qt/examples" proFile="examples.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+<collection name="qt_tests" long-name="Qt Tests" level="app">
+<component name="qttestsauto" long-name="Qt Automated Tests" introduced="^2" filter="qttestsauto">
+<unit bldFile="mw/qt/tests/auto" proFile="qtpauto.pro" makeArgs="-r"/>
+</component>
+<component name="qttestsbenchmarks" long-name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks">
+<unit bldFile="mw/qt/tests/benchmarks" proFile="benchmarks.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+</block>
+<block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
+<collection name="classicui_plat" long-name="Classic UI Platform Interfaces" level="specific">
+<component name="personalisation_framework_api" long-name="Personalisation Framework API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/personalisation_framework_api/group" filter="!test"/>
+</component>
+<component name="signal_pane_api" long-name="Signal Pane API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
+</component>
+<component name="japanese_reading_api" long-name="Japanese Reading API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/japanese_reading_api/group" filter="!test"/>
+</component>
+<component name="global_popup_priority_controller_api" long-name="Global Popup Priority Controller API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
+</component>
+<component name="item_finder_api" long-name="Item Finder API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/item_finder_api/group" filter="!test"/>
+</component>
+<component name="avkon_fonts_api" long-name="Avkon Fonts API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/avkon_fonts_api/group" filter="!test"/>
+</component>
+<component name="extended_utilities_api" long-name="Extended Utilities API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
+</component>
+<component name="personalisation_plugin_api" long-name="Personalisation Plugin API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
+</component>
+<component name="extended_aiw_criteria_api" long-name="Extended AIW Criteria API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
+</component>
+<component name="personalisation_application_api" long-name="Personalisation Application API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/personalisation_application_api/group"/>
+</component>
+<component name="volume_popup_api" long-name="Volume Popup API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
+</component>
+<component name="avkon_secondary_display_support_api" long-name="AVKON Secondary Display Support API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_support_api/group" filter="!test"/>
+</component>
+<component name="extended_setting_pages_api" long-name="Extended Setting Pages API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_setting_pages_api/group" filter="!test"/>
+</component>
+<component name="extended_lists_api" long-name="Extended Lists API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_lists_api/group" filter="!test"/>
+</component>
+<component name="input_block_api" long-name="Input Block API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/input_block_api/group" filter="!test"/>
+</component>
+<component name="avkon_ui_server_api" long-name="AVKON UI Server API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/avkon_ui_server_api/group" filter="!test"/>
+</component>
+<component name="number_grouping_api" long-name="Number Grouping API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/number_grouping_api/group" filter="!test"/>
+</component>
+<component name="extended_status_pane_api" long-name="Extended Status Pane API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_status_pane_api/group" filter="!test"/>
+</component>
+<component name="extended_notifiers_api" long-name="Extended Notifiers API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_notifiers_api/group" filter="!test"/>
+</component>
+<component name="task_list_api" long-name="Task List API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
+</component>
+<component name="personalisation_slide_show_dialog_api" long-name="Personalisation Slide Show Dialog API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
+</component>
+<component name="key_event_utilities_api" long-name="Key Event Utilities API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/key_event_utilities_api/group"/>
+</component>
+<component name="emergency_call_support_api" long-name="Emergency Call Support API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/emergency_call_support_api/group" filter="!test"/>
+</component>
+<component name="extended_dialogs_api" long-name="Extended Dialogs API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_dialogs_api/group"/>
+</component>
+<component name="legacy_ui_framework_headers_api" long-name="Legacy UI Framework Headers API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/legacy_ui_framework_headers_api/group"/>
+</component>
+<component name="extended_editors_api" long-name="Extended Editors API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_editors_api/group" filter="!test"/>
+</component>
+<component name="alarm_api" long-name="Alarm API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/alarm_api/group" filter="!test"/>
+</component>
+<component name="aiw_service_interface_base_api" long-name="AIW Service Interface Base API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_base_api/group" filter="!test"/>
+</component>
+<component name="list_effects_api" long-name="List Effects API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/list_effects_api/group" filter="!test"/>
+</component>
+<component name="find_item_ui_api" long-name="Find Item UI API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/find_item_ui_api/group" filter="!test"/>
+</component>
+<component name="server_application_services_api" long-name="Server Application Services API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/server_application_services_api/group" filter="!test"/>
+</component>
+<component name="common_ui_settings_api" long-name="Common UI Settings API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/common_ui_settings_api/group"/>
+</component>
+<component name="aiw_service_interface_menu_api" long-name="AIW Service Interface Menu API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_menu_api/group" filter="!test"/>
+</component>
+<component name="eikon_server_extension_client_api" long-name="EIKON Server Extension Client API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/eikon_server_extension_client_api/group" filter="!test"/>
+</component>
+<component name="skinnable_clock_api" long-name="Skinnable Clock API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/skinnable_clock_api/group" filter="!test"/>
+</component>
+<component name="battery_pane_api" long-name="Battery Pane API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/battery_pane_api/group" filter="!test"/>
+</component>
+<component name="fep_document_navigation_api" long-name="FEP Document Navigation API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
+</component>
+<component name="personalisation_localised_texts_api" long-name="Personalisation Localised Texts API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
+</component>
+<component name="memory_card_ui_api" long-name="Memory Card UI API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
+</component>
+<component name="avkon_status_api" long-name="AVKON Status API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/avkon_status_api/group"/>
+</component>
+<component name="application_switching_api" long-name="Application Switching API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/application_switching_api/group" filter="!test"/>
+</component>
+<component name="avkon_localised_texts_api" long-name="AVKON Localised Texts API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/avkon_localised_texts_api/group"/>
+</component>
+<component name="avkon_secondary_display_api" long-name="AVKON Secondary Display API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_api/group"/>
+</component>
+<component name="extended_animation_api" long-name="Extended Animation API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_animation_api/group" filter="!test"/>
+</component>
+<component name="extended_notes_api" long-name="Extended Notes API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_notes_api/group" filter="!test"/>
+</component>
+<component name="screensaver_animation_plugin_definitions_api" long-name="Screensaver Animation Plugin Definitions API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/screensaver_animation_plugin_definitions_api/group"/>
+</component>
+<component name="text_scroller_api" long-name="Text Scroller API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/text_scroller_api/group" filter="!test"/>
+</component>
+<component name="custom_cursors_api" long-name="Custom Cursors API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/custom_cursors_api/group" filter="!test"/>
+</component>
+<component name="screensaver_settings_api" long-name="Screensaver Settings API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/screensaver_settings_api/group"/>
+</component>
+<component name="global_window_priorities_api" long-name="Global Window Priorities API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/global_window_priorities_api/group"/>
+</component>
+<component name="extended_indicators_api" long-name="Extended Indicators API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_indicators_api/group" filter="!test"/>
+</component>
+<component name="special_character_table_api" long-name="Special Character Table API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/special_character_table_api/group" filter="!test"/>
+</component>
+<component name="avkon_settings_api" long-name="AVKON Settings API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/avkon_settings_api/group"/>
+</component>
+<component name="extended_sounds_api" long-name="Extended Sounds API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_sounds_api/group"/>
+</component>
+<component name="themes_settings_api" long-name="Themes Settings API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/themes_settings_api/group"/>
+</component>
+<component name="media_shared_document_api" long-name="Media Shared Document API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/media_shared_document_api/group" filter="!test"/>
+</component>
+<component name="extended_queries_api" long-name="Extended Queries API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_queries_api/group"/>
+</component>
+<component name="phone_number_text_utilities_api" long-name="Phone Number Text Utilities API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
+</component>
+<component name="screensaver_runtime_api" long-name="Screensaver Runtime API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/screensaver_runtime_api/group"/>
+</component>
+<component name="extended_scroller_api" long-name="Extended Scroller API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_scroller_api/group"/>
+</component>
+<component name="key_rotator_api" long-name="Key Rotator API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/key_rotator_api/group" filter="!test"/>
+</component>
+<component name="extended_grids_api" long-name="Extended Grids API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_grids_api/group" filter="!test"/>
+</component>
+<component name="generic_parameter_api" long-name="Generic Parameter API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/generic_parameter_api/group" filter="!test"/>
+</component>
+<component name="indicator_touch_observer_api" long-name="Indicator Touch Observer API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/indicator_touch_observer_api/group"/>
+</component>
+<component name="popup_form_api" long-name="Popup Form API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/popup_form_api/group" filter="!test"/>
+</component>
+<component name="stylus_activated_popup_api" long-name="Stylus Activated Pop-up API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/stylus_activated_popup_api/group" filter="!test"/>
+</component>
+<component name="indicator_plugin_api" long-name="Indicator Plugin API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/indicator_plugin_api/group" filter="!test"/>
+</component>
+<component name="layout_configuration_api" long-name="Layout Configuration API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/layout_configuration_api/group" filter="!test"/>
+</component>
+<component name="common_file_dialogs_filter_factory_api" long-name="Common File Dialogs Filter Factory API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group" filter="!test"/>
+</component>
+<component name="avkon_anim_dll_api" long-name="AVKON Anim DLL API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/avkon_anim_dll_api/group"/>
+</component>
+<component name="extended_initialization_api" long-name="Extended Initialization API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_initialization_api/group" filter="!test"/>
+</component>
+<component name="long_tap_animation_api" long-name="Long Tap Animation API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/long_tap_animation_api/group" filter="!test"/>
+</component>
+<component name="extended_ui_framework_definitions_api" long-name="Extended UI Framework Definitions API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_ui_framework_definitions_api/group"/>
+</component>
+<component name="extended_buttons_api" long-name="Extended Buttons API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_buttons_api/group" filter="!test"/>
+</component>
+<component name="aiw_provider_utility_api" long-name="AIW Provider Utility API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/aiw_provider_utility_api/group" filter="!test"/>
+</component>
+<component name="transition_effect_parameters_api" long-name="Transition Effect Parameters API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/transition_effect_parameters_api/group" filter="!test"/>
+</component>
+<component name="extended_input_capabilities_api" long-name="Extended Input Capabilities API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_input_capabilities_api/group" filter="!test"/>
+</component>
+<component name="uikon_status_api" long-name="UIKON Status API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/uikon_status_api/group"/>
+</component>
+<component name="transition_effect_utilities_api" long-name="Transition Effect Utilities API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/transition_effect_utilities_api/group" filter="!test"/>
+</component>
+<component name="pointer_event_modifier_api" long-name="Pointer Event Modifier API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/pointer_event_modifier_api/group" filter="!test"/>
+</component>
+<component name="avkon_testability_api" long-name="AVKON Testability API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/avkon_testability_api/group"/>
+</component>
+<component name="ganes_api" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/ganes_api/group"/>
+</component>
+<component name="ode_api" long-name="Ode API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/ode_api/group"/>
+</component>
+<component name="physics_api" long-name="Physics API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/physics_api/group"/>
+</component>
+<component name="touch_pane_api" long-name="Touch Pane API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/touch_pane_api/group" filter="!test"/>
+</component>
+<component name="touch_pane_observer_api" long-name="Touch Pane Observer API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/touch_pane_observer_api/group"/>
+</component>
+<component name="alternate_fs_api" long-name="Alternate FS API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/alternate_fs_api/group"/>
+</component>
+<component name="discreet_popup_api" long-name="Discreet Popup API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/discreet_popup_api/group"/>
+</component>
+<component name="touch_gesture_framework_api" long-name="Touch Gesture Framework API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/touch_gesture_framework_api/group"/>
+<!-- should this be commented out? -->
+<!--<unit bldFile="classicui_plat/touch_gesture_framework_api/tsrc/group" filter="test,api_test"/> -->
+</component>
+<component name="extended_options_menu_api" long-name="Extended Options Menu API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
+</component>
+</collection>
+<collection name="classicui_pub" long-name="Classic UI Public Interfaces" level="specific">
+<component name="input_frame_api" long-name="Input Frame API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/input_frame_api/group" filter="!test"/>
+</component>
+<component name="window_server_event_observer_api" long-name="Window Server Event Observer API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/window_server_event_observer_api/group" filter="!test"/>
+</component>
+<component name="application_framework_api" long-name="Application Framework API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/application_framework_api/group" filter="!test"/>
+</component>
+<component name="scroller_api" long-name="Scroller API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/scroller_api/group" filter="!test"/>
+</component>
+<component name="ui_framework_utilities_api" long-name="UI Framework Utilities API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/ui_framework_utilities_api/group" filter="!test"/>
+</component>
+<component name="ui_framework_definitions_api" long-name="UI Framework Definitions API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/ui_framework_definitions_api/group" filter="!test"/>
+</component>
+<component name="buttons_api" long-name="Buttons API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/buttons_api/group" filter="!test"/>
+</component>
+<component name="queries_api" long-name="Queries API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/queries_api/group" filter="!test"/>
+</component>
+<component name="aiw_generic_parameter_api" long-name="AIW Generic Parameter API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/aiw_generic_parameter_api/group" filter="!test"/>
+</component>
+<component name="editors_api" long-name="Editors API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/editors_api/group" filter="!test"/>
+</component>
+<component name="common_file_dialogs_api" long-name="Common File Dialogs API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/common_file_dialogs_api/group" filter="!test"/>
+</component>
+<component name="dialog_shutter_api" long-name="Dialog Shutter API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/dialog_shutter_api/group" filter="!test"/>
+</component>
+<component name="fonts_api" long-name="Fonts API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/fonts_api/group" filter="!test"/>
+</component>
+<component name="screen_clearer_api" long-name="Screen Clearer API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/screen_clearer_api/group" filter="!test"/>
+</component>
+<component name="notifiers_api" long-name="Notifiers API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/notifiers_api/group" filter="!test"/>
+</component>
+<component name="notes_api" long-name="Notes API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/notes_api/group" filter="!test"/>
+</component>
+<component name="screen_saver_api" long-name="Screen Saver API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/screen_saver_api/group" filter="!test"/>
+</component>
+<component name="status_pane_api" long-name="Status Pane API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/status_pane_api/group" filter="!test"/>
+</component>
+<component name="base_controls_api" long-name="Base Controls API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/base_controls_api/group" filter="!test"/>
+</component>
+<component name="grids_api" long-name="Grids API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/grids_api/group" filter="!test"/>
+</component>
+<component name="context_pane_api" long-name="Context Pane API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/context_pane_api/group" filter="!test"/>
+</component>
+<component name="lists_api" long-name="Lists API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/lists_api/group" filter="!test"/>
+</component>
+<component name="popups_api" long-name="Popups API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/popups_api/group" filter="!test"/>
+</component>
+<component name="misc_controls_api" long-name="Misc Controls API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/misc_controls_api/group" filter="!test"/>
+</component>
+<component name="keylock_api" long-name="Keylock API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/keylock_api/group" filter="!test"/>
+</component>
+<component name="options_menu_api" long-name="Options Menu API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/options_menu_api/group" filter="!test"/>
+</component>
+<component name="hierarchical_lists_api" long-name="Hierarchical Lists API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/hierarchical_lists_api/group" filter="!test"/>
+</component>
+<component name="navigation_pane_api" long-name="Navigation Pane API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/navigation_pane_api/group" filter="!test"/>
+</component>
+<component name="tabs_api" long-name="Tabs API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/tabs_api/group" filter="!test"/>
+</component>
+<component name="title_pane_touch_observer_api" long-name="Title Pane Touch Observer API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/title_pane_touch_observer_api/group"/>
+</component>
+<component name="choice_list_api" long-name="Choice List API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/choice_list_api/group" filter="!test"/>
+</component>
+<component name="info_popup_note_api" long-name="Info Popup Note API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/info_popup_note_api/group" filter="!test"/>
+</component>
+<component name="setting_pages_api" long-name="Setting Pages API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/setting_pages_api/group" filter="!test"/>
+</component>
+<component name="screen_mode_api" long-name="Screen Mode API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/screen_mode_api/group" filter="!test"/>
+</component>
+<component name="indicators_api" long-name="Indicators API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/indicators_api/group" filter="!test"/>
+</component>
+<component name="error_ui_api" long-name="Error UI API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/error_ui_api/group" filter="!test"/>
+</component>
+<component name="animation_api" long-name="Animation API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/animation_api/group" filter="!test"/>
+</component>
+<component name="searchfield_api" long-name="Searchfield API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/searchfield_api/group" filter="!test"/>
+</component>
+<component name="labels_api" long-name="Labels API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/labels_api/group" filter="!test"/>
+</component>
+<component name="hotkeys_api" long-name="Hotkeys API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/hotkeys_api/group" filter="!test"/>
+</component>
+<component name="initialization_api" long-name="Initialization API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/initialization_api/group" filter="!test"/>
+</component>
+<component name="volume_control_api" long-name="Volume Control API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/volume_control_api/group" filter="!test"/>
+</component>
+<component name="title_pane_api" long-name="Title Pane API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/title_pane_api/group" filter="!test"/>
+</component>
+<component name="sounds_api" long-name="Sounds API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/sounds_api/group" filter="!test"/>
+</component>
+<component name="aiw_service_handler_api" long-name="AIW Service Handler API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/aiw_service_handler_api/group" filter="!test"/>
+</component>
+<component name="aiw_criteria_api" long-name="AIW Criteria API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/aiw_criteria_api/group" filter="!test"/>
+</component>
+<component name="touch_ui_utilities_api" long-name="Touch UI Utilities API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/touch_ui_utilities_api/group" filter="!test"/>
+</component>
+<component name="generic_button_api" long-name="Generic Button API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/generic_button_api/group" filter="!test"/>
+</component>
+<component name="form_api" long-name="Form API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/form_api/group" filter="!test"/>
+</component>
+<component name="uikon_core_controls" long-name="Uikon Core Controls" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/uikon_core_controls/group" filter="!test"/>
+</component>
+<component name="calendar_api" long-name="Calendar API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/calendar_api/group"/>
+</component>
+<component name="toolbar_api" long-name="Toolbar API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/toolbar_api/group" filter="!test"/>
+</component>
+<component name="server_application_api" long-name="Server Application API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/server_application_api/group"/>
+</component>
+<component name="slider_api" long-name="Slider API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/slider_api/group" filter="!test"/>
+</component>
+<component name="private_ui_framework_api" long-name="Private UI Framework API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/private_ui_framework_api/group" filter="!test"/>
+</component>
+<component name="dialogs_api" long-name="Dialogs API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/dialogs_api/group" filter="!test"/>
+</component>
+<component name="document_handler_api" long-name="Document handler API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/document_handler_api/group"/>
+</component>
+<component name="images_api" long-name="Images API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/images_api/group" filter="!test"/>
+</component>
+<component name="stylus_popup_menu_api" long-name="Stylus Pop-up Menu API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/stylus_popup_menu_api/group" filter="!test"/>
+</component>
+<component name="information_preview_popup_api" long-name="Information Preview Popup API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/information_preview_popup_api/group" filter="!test"/>
+</component>
+<component name="intermediate_state_api" long-name="Intermediate State API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/intermediate_state_api/group"/>
+</component>
+<component name="help_launcher_api" long-name="Help Launcher API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/help_launcher_api/group"/>
+</component>
+</collection>
+<collection name="ode" long-name="Open Dynamics Engine" level="support">
+<!-- the collection is really a component. Move down a directory.-->
+<component name="ode_build" filter="s60" long-name="ODE">
+<unit bldFile="mw/classicui/ode/group"/>
+</component>
+</collection>
+<collection name="uifw" long-name="UI Framework" level="server">
+<component name="uiklaf" filter="s60" long-name="Uikon Look-and-Feel">
+<unit bldFile="mw/classicui/uifw/uiklaf/group"/>
+</component>
+<component name="eikctl" filter="s60" long-name="Eikon Controls">
+<unit bldFile="mw/classicui/uifw/eikctl/group"/>
+</component>
+<component name="avkon" filter="s60" long-name="Avkon">
+<!-- can only have one unit. Split into 3 components, or #include all from same bld.inf -->
+<unit bldFile="mw/classicui/uifw/avkon/aknphysics/group"/>
+<unit bldFile="mw/classicui/uifw/avkon/group"/>
+<unit bldFile="mw/classicui/uifw/avkon/aknconf/group"/>
+</component>
+<component name="eikstd" filter="s60" long-name="Eikon Standard">
+<unit bldFile="mw/classicui/uifw/eikstd/group"/>
+</component>
+<component name="aknglobalui" filter="s60" long-name="Avkon Global UI">
+<unit bldFile="mw/classicui/uifw/aknglobalui/group"/>
+</component>
+<component name="ganes" filter="s60" long-name="Ganes">
+<unit bldFile="mw/classicui/uifw/ganes/group"/>
+</component>
+</collection>
+<collection name="commonuis" long-name="Common UIs" level="specific">
+<component name="commonui" filter="s60" long-name="Common UI">
+<unit bldFile="mw/classicui/commonuis/commonui/group"/>
+</component>
+<component name="commondialogs" filter="s60" long-name="Common Dialogs">
+<unit bldFile="mw/classicui/commonuis/commondialogs/group"/>
+</component>
+</collection>
+<collection name="applicationinterworkingfw" long-name="Application Interworking Framework" level="generic">
+<component name="aifwservicehandler" filter="s60" long-name="Application Interworking Service Handler">
+<unit bldFile="mw/classicui/applicationinterworkingfw/servicehandler/group"/>
+</component>
+</collection>
+<collection name="psln" long-name="Personalization" level="specific">
+<!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
+<component name="psln_build" filter="s60" long-name="Personalization Build">
+<unit bldFile="mw/classicui/psln/group"/>
+</component>
+</collection>
+<collection name="commonadapter" long-name="Common Adapter" level="support">
+<!-- the collection is really a component. Move down a directory.-->
+<component name="commonadapter_build" filter="s60" long-name="Common Adapter Build">
+<unit bldFile="mw/classicui/commonadapter/group"/>
+</component>
+</collection>
+<collection name="akntouchgesturefw" long-name="Avkon Touch Gesture Framework" level="generic">
+<!-- the collection is really a component. Move down a directory.-->
+<component name="akntouchgesturefw_build" filter="s60" long-name="Avkon Touch Gesture Framework Build" introduced="^3">
+<unit bldFile="mw/classicui/akntouchgesturefw/group"/>
+</component>
+</collection>
+<collection name="uiutils" long-name="UI Utils" level="specific">
+<component name="localizer" filter="s60" long-name="Directory Localizer">
+<unit bldFile="mw/classicui/uiutils/localizer/group"/>
+</component>
+<component name="findutil" filter="s60" long-name="Find Utility">
+<unit bldFile="mw/classicui/uiutils/findutil/group"/>
+</component>
+<component name="gamerecognizer" filter="s60" long-name="Game Recognizer" plugin="Y">
+<unit bldFile="mw/classicui/uiutils/gamerecognizer/group"/>
+</component>
+<component name="aknjapanesereading" filter="s60" long-name="Avkon Japanese Reading">
+<unit bldFile="mw/classicui/uiutils/aknjapanesereading/group"/>
+</component>
+</collection>
+<collection name="commonuisupport" long-name="Common UI Support" level="support">
+<component name="uikon" long-name="Uikon" introduced="6.0" purpose="mandatory">
+<unit bldFile="mw/classicui/commonuisupport/uikon/group" mrp="mw/classicui/commonuisupport/uikon/group/app-framework_uikon.mrp"/>
+</component>
+<component name="errorresolverdata" long-name="Error Resolver Data" purpose="mandatory">
+<unit bldFile="mw/classicui/commonuisupport/errorresolverdata/group" mrp="mw/classicui/commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
+</component>
+<component name="uilaf" long-name="UI Look and Feel" introduced="6.0" purpose="mandatory">
+<unit bldFile="mw/classicui/commonuisupport/uilaf/GROUP" mrp="mw/classicui/commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
+</component>
+<component name="grid" long-name="Grid" purpose="optional">
+<unit bldFile="mw/classicui/commonuisupport/grid/group" mrp="mw/classicui/commonuisupport/grid/group/app-framework_grid.mrp"/>
+</component>
+<component name="uifwsdocs" long-name="UI Frameworks Documentation" purpose="development" class="doc">
+<unit mrp="mw/classicui/commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
+</component>
+</collection>
+<collection name="lafagnosticuifoundation" long-name="Look-and-Feel Agnostic UI Foundation" level="base">
+<component name="cone" long-name="Control Environment" purpose="mandatory">
+<unit bldFile="mw/classicui/lafagnosticuifoundation/cone/group" mrp="mw/classicui/lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
+</component>
+<component name="graphicseffects" long-name="Graphics Effects" introduced="9.2" purpose="optional">
+<unit bldFile="mw/classicui/lafagnosticuifoundation/graphicseffects/group" mrp="mw/classicui/lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
+</component>
+<component name="uigraphicsutils" long-name="UI Graphics Utilities" purpose="mandatory">
+<unit bldFile="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group" mrp="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
+</component>
+<component name="clockanim" long-name="Clock" purpose="optional" plugin="Y">
+<unit bldFile="mw/classicui/lafagnosticuifoundation/clockanim/group" mrp="mw/classicui/lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
+</component>
+<component name="bmpanimation" long-name="BMP Animation" introduced="6.0" purpose="optional">
+<unit bldFile="mw/classicui/lafagnosticuifoundation/bmpanimation/group" mrp="mw/classicui/lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
+</component>
+<component name="animation" long-name="Animation" introduced="9.1" purpose="optional">
+<unit bldFile="mw/classicui/lafagnosticuifoundation/animation/group" mrp="mw/classicui/lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
+</component>
+</collection>
+<collection name="classicui_info" long-name="Classic UI Info" level="specific">
+<!-- the multiple units in the API test components need to be resolved -->
+<component name="classicui_metadata" long-name="Classic UI Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="mw/classicui/classicui_info/classicui_metadata/classicui_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="svgt" level="generic" long-name="SVG Tiny" levels="util ui">
+<collection name="svgt_plat" long-name="SVG Tiny Platform Interfaces" level="ui">
+<component name="svgt_api" long-name="SVGT API" introduced="9.2" filter="s60" class="api">
+<unit bldFile="mw/svgt/svgt_plat/svgt_api/group"/>
+</component>
+<component name="nvg_api" long-name="NVG API" introduced="9.2" filter="s60" class="api">
+<unit bldFile="mw/svgt/svgt_plat/nvg_api/group"/>
+</component>
+</collection>
+<collection name="svgtopt" long-name="SVG-T Engine" level="util">
+<component name="svgtopt_build" filter="s60" long-name="SVG Engine" introduced="9.2">
+<!-- component is at collection level. Needs to be moved down a directory -->
+<unit bldFile="mw/svgt/svgtopt/group"/>
+</component>
+<component name="svgtplugin" filter="s60" long-name="SVG Plugin" introduced="9.2" plugin="Y">
+<unit bldFile="mw/svgt/svgtopt/svgtplugin/group"/>
+</component>
+</collection>
+</block>
+<block name="uiaccelerator" level="generic" long-name="UI Accelerator" levels="plugin framework server ex if">
+<collection name="uiaccelerator_plat" long-name="UI Accelerator Platform Interfaces" level="if">
+<component name="alf_core_toolkit_api" long-name="ALF Core Toolkit API" filter="s60" class="api">
+<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/group"/>
+</component>
+<component name="alf_visual_api" long-name="ALF Visual API" filter="s60" class="api">
+<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/group"/>
+</component>
+<component name="alf_extended_visual_api" long-name="ALF Extended Visual API" filter="s60" class="api">
+<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/group"/>
+</component>
+<component name="alf_extension_api" long-name="ALF Extension API" filter="s60" class="api">
+<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/group"/>
+</component>
+<component name="alf_tracing_api" long-name="ALF Tracing API" filter="s60" class="api">
+<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/group"/>
+</component>
+<component name="alf_client_server_api" long-name="ALF Client Server API" filter="s60" class="api">
+<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/group"/>
+</component>
+</collection>
+<collection name="uiacceltk" long-name="UI Accelerator Toolkit" level="framework">
+<component name="hitchcock" filter="s60" long-name="Hitchcock">
+<unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/group"/>
+</component>
+<component name="uiacceltk_build" filter="s60" long-name="UI Accelerator Toolkit Build">
+<!-- move into the other component, or remove the #include and make this UI Accelerator Toolkit ROM-->
+<unit bldFile="mw/uiaccelerator/uiacceltk/group"/>
+</component>
+</collection>
+</block>
+<block name="uiresources" level="generic" long-name="UI Resources" levels="compile plugin framework server generic data">
+<!-- are the custom filters below needed? -->
+<collection name="uiresources_pub" long-name="UI Resources Public Interfaces" level="data">
+<component name="pictograph_api" long-name="Pictograph API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_pub/pictograph_api/group" filter="!test"/>
+</component>
+<component name="skins_api" long-name="Skins API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_pub/skins_api/group" filter="!test"/>
+</component>
+<component name="font_definition_api" long-name="Font Definition API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_pub/font_definition_api/group" filter="!test"/>
+</component>
+<component name="graphics_api" long-name="Graphics API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_pub/graphics_api/group" filter="!test"/>
+</component>
+<component name="scalable_icons_api" long-name="Scalable Icons API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_pub/scalable_icons_api/group"/>
+</component>
+<component name="layout_id_definitions_api" long-name="Layout ID Definitions API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_pub/layout_id_definitions_api/group"/>
+</component>
+</collection>
+<collection name="uiresources_plat" long-name="UI Resources Platform Interfaces" level="data">
+<component name="layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/layout_system_private_api/group" filter="!test"/>
+</component>
+<component name="layout_data_api" long-name="Layout Data API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/layout_data_api/group" filter="!test"/>
+</component>
+<component name="cdl_api" long-name="CDL API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/cdl_api/group" filter="!test"/>
+</component>
+<component name="extended_skins_api" long-name="Extended Skins API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/extended_skins_api/group" filter="!test"/>
+</component>
+<component name="tfx_server_controller_plugin_api" long-name="TFX Server Controller Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_controller_plugin_api/group"/>
+</component>
+<component name="extended_fonts_api" long-name="Extended Fonts API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/extended_fonts_api/group" filter="!test"/>
+</component>
+<component name="graphic_configuration_api" long-name="Graphic Configuration API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/graphic_configuration_api/group" filter="!test"/>
+</component>
+<component name="mif_header_cdl_api" long-name="MIF Header CDL API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/mif_header_cdl_api/group"/>
+</component>
+<component name="personalisation_and_skins_settings_api" long-name="Personalisation and Skins Settings API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/personalisation_and_skins_settings_api/group"/>
+</component>
+<component name="tfx_effect_setup_plugin_api" long-name="TFX Effect Setup Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/tfx_effect_setup_plugin_api/group"/>
+</component>
+<component name="mifconv_definitions_api" long-name="Mifconv Definitions API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/mifconv_definitions_api/group"/>
+</component>
+<component name="wallpaper_configuration_api" long-name="Wallpaper Configuration API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/wallpaper_configuration_api/group"/>
+</component>
+<component name="language_code_definitions_api" long-name="Language Code Definitions API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/language_code_definitions_api/group"/>
+</component>
+<component name="skins_image_attributes_api" long-name="Skins Image Attributes API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
+</component>
+<component name="private_user_area_code_definitions_api" long-name="Private User Area Code Definitions API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/private_user_area_code_definitions_api/group"/>
+</component>
+<component name="tfx_server_plugin_ids_api" long-name="TFX Server Plug-in IDs API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_plugin_ids_api/group"/>
+</component>
+</collection>
+<collection name="uiresources_info" long-name="UI Resources Info" level="data">
+<component name="uiresources_test" filter="s60,test,api_test" long-name="UI Resources Tests" purpose="development"/>
+</collection>
+<collection name="uigraphics" long-name="UI Graphics" level="generic">
+<component name="bitmaps2" filter="s60" long-name="Bitmaps 2" class="config">
+<unit bldFile="mw/uiresources/uigraphics/bitmaps2/group"/>
+</component>
+<component name="icons" filter="s60" long-name="Icons" class="config">
+<unit bldFile="mw/uiresources/uigraphics/icons/group"/>
+</component>
+<component name="variatedbitmaps" filter="s60" long-name="Variated Bitmaps" class="config">
+<unit bldFile="mw/uiresources/uigraphics/variatedbitmaps/group"/>
+</component>
+<component name="aknicon" filter="s60" long-name="Avkon Icon Framework">
+<unit bldFile="mw/uiresources/uigraphics/aknicon/group"/>
+</component>
+<component name="nvgrenderstage" filter="sf_build" long-name="NVG Render Stage">
+<unit bldFile="mw/uiresources/uigraphics/nvgrenderstage/group"/>
+</component>
+</collection>
+<collection name="layouts" long-name="Layouts" level="plugin">
+<component name="cdl" filter="s60" long-name="Customization Definition Language">
+<!-- can only have one unit. Need to #include them or split into multiple components -->
+<unit bldFile="mw/uiresources/layouts/cdl/cdlengine/group"/>
+<unit bldFile="mw/uiresources/layouts/cdl/cdlserver/group"/>
+</component>
+<component name="aknlayout2" filter="s60" long-name="Avkon Layout 2">
+<unit bldFile="mw/uiresources/layouts/aknlayout2/group"/>
+</component>
+</collection>
+<collection name="skins" long-name="Skins" level="data">
+<component name="aknskincontent" filter="s60" long-name="Avkon Skin Content" class="config">
+<unit bldFile="mw/uiresources/skins/aknskincontent/group"/>
+</component>
+<component name="symbiantheme" filter="sf_build" long-name="Symbian^3 Theme" class="config">
+<unit bldFile="mw/uiresources/skins/Symbian/group"/>
+</component>
+<component name="aknskins" filter="s60" long-name="Avkon Skin Compiler">
+<unit bldFile="mw/uiresources/skins/aknskins/group"/>
+</component>
+</collection>
+<collection name="pictographs" long-name="Pictographs" level="data">
+<component name="aknpictograph" filter="s60" long-name="Avkon Pictograph">
+<unit bldFile="mw/uiresources/pictographs/aknpictograph/group"/>
+</component>
+</collection>
+<collection name="locales" long-name="Locales" level="framework">
+<component name="locales_build" filter="s60" long-name="Locales Build">
+<unit bldFile="mw/uiresources/locales/loce32"/>
+</component>
+</collection>
+<collection name="uiconfig" long-name="UI Config" level="server">
+<component name="s60config" filter="s60" long-name="S60 UI Config">
+<unit bldFile="mw/uiresources/uiconfig/s60config/group"/>
+</component>
+</collection>
+<collection name="fontsupport" long-name="Font Support" level="generic">
+<component name="fontprovider" filter="s60" long-name="Font Provider">
+<unit bldFile="mw/uiresources/fontsupport/fontprovider/group"/>
+</component>
+<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
+ <component id="s60_fonts" filter="s60" name="S60 Fonts">
+ <unit bldFile="fontsupport/fontutils/group"/>
+ </component>
+-->
+<component name="fontutils" filter="sf_build" long-name="Font Utils">
+<unit bldFile="mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
+</component>
+</collection>
+<collection name="helpthemes" long-name="Help Themes" level="data">
+<!-- collection is really a component. Need to move down a directory -->
+<component name="helpthemes_build" filter="s60" long-name="Help Themes Build" class="config">
+<unit bldFile="mw/uiresources/helpthemes/group"/>
+</component>
+</collection>
+</block>
+<block name="hapticsservices" level="generic" long-name="Haptics Services" levels="fw server api">
+<collection name="hapticsservices_plat" long-name="Haptics Services Platform Interfaces" level="api">
+<component name="tacticon_api" long-name="Tacticon API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/hapticsservices/hapticsservices_plat/tacticon_api/group"/>
+</component>
+<component name="tactile_feedback_core_api" long-name="Tactile Feedback Core API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_core_api/group"/>
+</component>
+<component name="tactile_feedback_server_api" long-name="Tactile Feedback Server API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_server_api/group"/>
+</component>
+</collection>
+<collection name="hapticsservices_pub" long-name="Haptics Services Public Interfaces" level="api">
+<component name="tactile_feedback_client_api" long-name="Tactile Feedback Client API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/hapticsservices/hapticsservices_pub/tactile_feedback_client_api/group"/>
+</component>
+</collection>
+<collection name="tacticonserver" long-name="Tacticon Server" level="server">
+<!-- collection is really a component. Move down a directory -->
+<component name="tacticonserver_build" filter="s60" long-name="Tacticon Server Build" introduced="^3">
+<unit bldFile="mw/hapticsservices/tacticonserver/group"/>
+<!-- clients and servers are suauly the same component. Consider moving pluign to a separate component if needed -->
+</component>
+</collection>
+<collection name="tactilefeedback" long-name="Tactile Feedback" level="fw">
+<component name="tactilearearegistry" filter="s60" long-name="Tactile Area Registry" introduced="^1">
+<unit bldFile="mw/hapticsservices/tactilefeedback/tactilearearegistry/group"/>
+</component>
+<component name="tactilefeedbackresolver" filter="s60" long-name="Tactile Feedback Resolver" introduced="^1">
+<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackresolver/group"/>
+</component>
+<component name="tactileclickplugin" filter="s60" long-name="Tactile Click Plugin" introduced="^1" plugin="Y">
+<unit bldFile="mw/hapticsservices/tactilefeedback/tactileclickplugin/group"/>
+</component>
+<component name="tactilefeedbackclient" filter="s60" long-name="Tactile Feedback Client" introduced="^1">
+<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackclient/group"/>
+</component>
+<component name="tactileactionplugin" filter="s60" long-name="Tactile Action Plugin" introduced="^1" plugin="Y">
+<unit bldFile="mw/hapticsservices/tactilefeedback/tactileactionplugin/group"/>
+</component>
+<component name="tactilefeedback_build" filter="s60" long-name="Tactile Feedback Build" introduced="^1">
+<!-- consider moving IBY to one fo the above components -->
+<unit bldFile="mw/hapticsservices/tactilefeedback/group"/>
+</component>
+</collection>
+</block>
+<block name="gsprofilesrv" level="generic" long-name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
+<collection name="gsprofilesrv_pub" long-name="GS and Profiles Services Public Interfaces" level="specific">
+<component name="profiles_engine_active_profile_settings_api" long-name="Profiles Engine Active Profile Settings API" filter="s60" class="api">
+<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_active_profile_settings_api/group"/>
+</component>
+<component name="profiles_engine_wrapper_api" long-name="Profiles Engine Wrapper API" filter="s60" class="api">
+<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_wrapper_api/group"/>
+</component>
+</collection>
+<collection name="gsprofilesrv_plat" long-name="GS and Profiles Services Platform Interfaces" level="specific">
+<component name="profiles_engine_api" long-name="Profiles Engine API" filter="s60" class="api">
+<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_engine_api/group"/>
+</component>
+<component name="profiles_mediafilelist_api" long-name="Media File List API" filter="s60" class="api">
+<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_mediafilelist_api/group"/>
+</component>
+<component name="filelist_api" long-name="File List API" filter="s60" class="api">
+<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/filelist_api/group"/>
+</component>
+<component name="settings_backgroundimage_api" long-name="Settings Background Image API" filter="s60" class="api">
+<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_backgroundimage_api/group"/>
+</component>
+<component name="settings_framework_api" long-name="Settings Framework API" filter="s60" class="api">
+<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_framework_api/group"/>
+</component>
+<component name="settings_launch_api" long-name="Settings Launch API" filter="s60" class="api">
+<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_launch_api/group"/>
+</component>
+<component name="settings_listbox_api" long-name="Settings List Box API" filter="s60" class="api">
+<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_listbox_api/group"/>
+</component>
+<component name="settings_plugin_api" long-name="Settings Plugin API" filter="s60" class="api">
+<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_plugin_api/group"/>
+</component>
+<component name="settings_uis_cenrep_collection_api" long-name="Settings UIs CenRep Collection API" filter="s60" class="api">
+<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
+</component>
+</collection>
+<collection name="gssettingsuis" long-name="General Settings UIs" level="framework">
+<component name="gs" filter="s60" long-name="General Settings" introduced="9.2">
+<unit bldFile="mw/gsprofilesrv/gssettingsuis/gs/group"/>
+</component>
+</collection>
+<collection name="profilesservices" long-name="Profiles Services" level="server">
+<component name="filelist" filter="s60" long-name="File List" introduced="9.1">
+<unit bldFile="mw/gsprofilesrv/profilesservices/filelist/group"/>
+</component>
+<component name="mediafilelist" filter="s60" long-name="Media File List" introduced="^2">
+<unit bldFile="mw/gsprofilesrv/profilesservices/mediafilelist/group"/>
+</component>
+<component name="profileengine" filter="s60" long-name="Profile Engine" introduced="9.1">
+<unit bldFile="mw/gsprofilesrv/profilesservices/profileengine/group"/>
+</component>
+<component name="ringingtone3dplugin" filter="s60" long-name="Ringing Tone 3D Plugin" introduced="^2" plugin="Y">
+<unit bldFile="mw/gsprofilesrv/profilesservices/ringingtone3dplugin/group"/>
+</component>
+</collection>
+</block>
+<block name="homescreensrv" level="specific" long-name="Home Screen Services" levels="plugin framework server generic specific">
+<collection name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" level="specific">
+<component name="ai_content_model_api" long-name="AI Content Model API" filter="s60" class="api">
+<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_content_model_api/group"/>
+</component>
+<component name="ai_utilities_api" long-name="AI Utilities API" filter="s60" class="api">
+<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_utilities_api/group" filter="!test"/>
+</component>
+<component name="ai_plugin_management_api" long-name="AI Plug-in Management API" filter="s60" class="api">
+<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_management_api/group"/>
+</component>
+<component name="ai_plugin_information_api" long-name="AI Plug-in Information API" filter="s60" class="api">
+<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_information_api/group"/>
+</component>
+<component name="ai_variation_api" long-name="AI Variation API" filter="s60" class="api">
+<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_variation_api/group"/>
+</component>
+<component name="action_handler_plugin_api" long-name="Action Handler Plugin API" filter="s60" class="api">
+<unit bldFile="mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/group" filter="!test"/>
+</component>
+<component name="content_harvester_plugin_api" long-name="Content Harvester Plugin API" filter="s60" class="api">
+<unit bldFile="mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/group" filter="!test"/>
+</component>
+<component name="menu_model_api" long-name="Menu Model API" filter="s60" class="api">
+<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_model_api/group"/>
+</component>
+<component name="menu_sat_interface_api" long-name="Menu SAT Interface API" filter="s60" class="api">
+<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/group" filter="!test"/>
+</component>
+<component name="external_home_screen_api" long-name="External Home Screen API" filter="s60" class="api">
+<unit bldFile="mw/homescreensrv/homescreensrv_plat/external_home_screen_api/group"/>
+</component>
+<component name="menu_content_service_api" long-name="Menu Content Service API" filter="s60" class="api">
+<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_content_service_api/group" filter="!test"/>
+</component>
+<component name="sapi_contentpublishing" long-name="SAPI Content Publishing" filter="s60" class="api">
+<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing/group"/>
+</component>
+<component name="sapi_backstepping" long-name="SAPI Backstepping" filter="s60" class="api">
+<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_backstepping/group"/>
+</component>
+<component name="sapi_actionhandler" long-name="SAPI Action Handler" filter="s60" class="api">
+<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_actionhandler/group"/>
+</component>
+<component name="sapi_homescreenplugin" long-name="SAPI Homescreen Plugin" filter="s60" class="api">
+<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_homescreenplugin/group" filter="!test"/>
+</component>
+<component name="sapi_menucontent" long-name="SAPI Menu Content" filter="s60" class="api">
+<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_menucontent/group"/>
+</component>
+<component name="xcfw_api" long-name="XCFW API" filter="s60" class="api">
+<unit bldFile="mw/homescreensrv/homescreensrv_plat/xcfw_api/group"/>
+</component>
+<component name="idlefw_api" long-name="Idle Framework API" filter="s60" class="api">
+<unit bldFile="mw/homescreensrv/homescreensrv_plat/idlefw_api/group"/>
+</component>
+<component name="hs_widget_publisher_api" long-name="Home Screen Publishing API" filter="s60" class="api">
+<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_widget_publisher_api/group"/>
+</component>
+<component name="hs_settings_api" long-name="HS Settings API" filter="s60" class="api">
+<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_settings_api/group"/>
+</component>
+<component name="hs_content_control_api" long-name="HS Content Control API" filter="s60" class="api">
+<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_content_control_api/group"/>
+</component>
+</collection>
+<collection name="xcfw" long-name="XML Content Framework" level="framework">
+<!-- collection is really a component, needs to be moved down a directory -->
+<component name="xcfw_build" filter="s60" long-name="XML Content Framework Build">
+<unit bldFile="mw/homescreensrv/xcfw/group"/>
+</component>
+</collection>
+<collection name="homescreenpluginsrv" long-name="Home Screen Plugin Service" level="plugin">
+<component name="hspsdefinitionengine" filter="s60" long-name="HS Plugin Service Definition Engine" class="placeholder">
+<!-- <unit bldFile="homescreenpluginsrv/hspsdefinitionengine/group"/> -->
+</component>
+<component name="hspsdom" filter="s60" long-name="HS Plugin Service DOM" class="placeholder">
+<!-- <unit bldFile="homescreenpluginsrv/hspsdom/group"/> -->
+</component>
+<component name="hspstools" filter="s60" long-name="HS Server Tools">
+<!-- <unit bldFile="homescreenpluginsrv/hspstools/group"/> -->
+</component>
+<component name="hspspluginregistry" filter="s60" long-name="HS Plugin Registry" class="placeholder">
+<!-- <unit bldFile="homescreenpluginsrv/hspspluginregistry/group"/>-->
+</component>
+<component name="hspsmanager" filter="s60" long-name="HSPS Manager" class="placeholder">
+<!-- <unit bldFile="homescreenpluginsrv/hspsmanager/group"/>-->
+</component>
+<component name="hspsodt" filter="s60" long-name="HSPS Object Description Tree" class="placeholder">
+<!-- <unit bldFile="homescreenpluginsrv/hspsodt/group"/>-->
+</component>
+<component name="hspsresource" filter="s60" long-name="HS Plugin Server Resource" class="placeholder">
+<!-- <unit bldFile="homescreenpluginsrv/hspsresource/group"/>-->
+</component>
+<component name="hspsresult" filter="s60" long-name="HS Plugin Server Result" class="placeholder">
+<!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
+</component>
+<component name="homescreen_settings_api" filter="s60" long-name="HS Settings API" class="api placeholder">
+<!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
+</component>
+<component name="homescreenpluginsrv_build" filter="s60" long-name="HSPS Build">
+<!-- need to break this up into the self-contained components above and uncomment them -->
+<unit bldFile="mw/homescreensrv/homescreenpluginsrv/group"/>
+</component>
+</collection>
+<collection name="idlefw" long-name="Idle Framework" level="framework">
+<!-- Uncomment all units when configuration is in place. All currently #included from idlefw_build -->
+<component name="idlefw_plugins" filter="s60" long-name="Idle Framework Plugins" plugin="Y" class="placeholder">
+<!--<unit bldFile="idlefw/plugins/group"/>-->
+</component>
+<component name="hslaunch" filter="s60" long-name="Home Screen Launch" class="placeholder">
+<!--<unit bldFile="idlefw/plugins/group"/>-->
+</component>
+<component name="idlefw_build" filter="s60" long-name="Idle Framework Build">
+<!--split this into components, or separate from the above components and move this down a directory -->
+<unit bldFile="mw/homescreensrv/idlefw/group"/>
+</component>
+</collection>
+<collection name="menucontentsrv" long-name="Menu Content Service" level="generic">
+<component name="menusatinterface" filter="s60" long-name="Menu SAT Interface">
+<unit bldFile="mw/homescreensrv/menucontentsrv/menusatinterface/group"/>
+</component>
+<component name="menucontentsrv_build" filter="s60" long-name="Menu Content Service Build">
+<!--split this into components, or separate from the above component and move this down a directory -->
+<unit bldFile="mw/homescreensrv/menucontentsrv/group"/>
+</component>
+</collection>
+<collection name="backsteppingsrv" long-name="Back Stepping Service" level="server">
+<!-- collection is really a component, needs to be moved down a directory -->
+<component name="bsengine" long-name="Back Stepping Engine" filter="s60">
+<unit bldFile="mw/homescreensrv/backsteppingsrv/group"/>
+</component>
+</collection>
+<collection name="contentpublishingsrv" long-name="Content Publishing Service" level="server">
+<component name="contentpublishingdebug" filter="s60" long-name="Content Publishing Debug">
+<!-- need to move this component outside of contentpublishingutils and into separate component directory -->
+<!-- <unit bldFile="contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/> -->
+</component>
+<component name="contentpublishingutils" filter="s60" long-name="Content Publishing Utils">
+<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingutils/group"/>
+</component>
+<component name="contentpublishingserver" filter="s60" long-name="Content Publishing Server">
+<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingserver/group"/>
+</component>
+<component name="contentharvester" filter="s60" long-name="Content Harvester">
+<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
+</component>
+<component name="contentpublishingsrv_build" filter="s60" long-name="Content Publishing Service Build">
+<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
+ If keeping, it need to move down a directory.-->
+<unit bldFile="mw/homescreensrv/contentpublishingsrv/group"/>
+</component>
+</collection>
+<collection name="contentcontrolsrv" long-name="Content Control Service" level="server">
+<component name="ccsrv" long-name="Content Control Service" filter="s60" introduced="^3">
+<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccsrv/group"/>
+</component>
+<component name="ccsrvapi" long-name="Content Control Service API" filter="s60" introduced="^3" class="api">
+<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccsrvapi/group"/>
+</component>
+<component name="ccclientsession" long-name="Content Control Client Session" filter="s60" introduced="^3">
+<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccclientsession/group"/>
+</component>
+<component name="hsccclient" long-name="HS Content Control Client" filter="s60" introduced="^3">
+<unit bldFile="mw/homescreensrv/contentcontrolsrv/hsccclient/group"/>
+</component>
+<component name="hscontentinfo" long-name="Home Screen Content Info" filter="s60" introduced="^3">
+<unit bldFile="mw/homescreensrv/contentcontrolsrv/hscontentinfo/group"/>
+</component>
+<component name="contentcontrolsrv_build" long-name="Content Control Service Build" filter="s60" introduced="^3">
+<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
+ If keeping, it need to move down a directory.-->
+<unit bldFile="mw/homescreensrv/contentcontrolsrv/group"/>
+</component>
+</collection>
+</block>
+<block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
+<collection name="appinstall_plat" long-name="Application Installation Platform Interfaces" level="api">
+<component name="iaupdate_api" long-name="IA Update API" filter="s60" class="api">
+<unit bldFile="mw/appinstall/appinstall_plat/iaupdate_api/group"/>
+</component>
+<component name="task_plugin_api" long-name="Task Plugin API" filter="s60" class="api">
+<unit bldFile="mw/appinstall/appinstall_plat/task_plugin_api/group"/>
+</component>
+<component name="sw_installer_common_ui_api" long-name="SW Installer Common UI API" filter="s60" class="api">
+<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_common_ui_api/group"/>
+</component>
+<component name="sw_installer_launcher_api" long-name="SW Installer Launcher API" filter="s60" class="api">
+<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_launcher_api/group"/>
+</component>
+<component name="task_management_api" long-name="Task Management API" filter="s60" class="api">
+<unit bldFile="mw/appinstall/appinstall_plat/task_management_api/group"/>
+</component>
+<component name="sw_installer_ui_plugin_api" long-name="SW Installer UI Plugin API" filter="s60" class="api">
+<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ui_plugin_api/group"/>
+</component>
+<component name="sw_installer_cr_keys" long-name="SW Installer CR Keys" filter="s60" class="api">
+<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_cr_keys/group"/>
+</component>
+<component name="sw_installer_ps_keys" long-name="SW Installer PS Keys" filter="s60" class="api">
+<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
+</component>
+<component name="appmngr2runtimeapi" long-name="Application Manager 2 Runtime Plugin API" filter="s60" class="api">
+<unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
+</component>
+</collection>
+<collection name="appinstall_pub" long-name="Application Installation Public Interfaces" level="api">
+<component name="startup_list_management_api" long-name="Startup List Management API" filter="s60" class="api">
+<unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
+</component>
+</collection>
+<collection name="ncdengine" long-name="Nokia Content Discover" level="framework">
+<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
+<component name="ncdengine_engine" filter="s60" long-name="NCD Engine" introduced="^1">
+<unit bldFile="mw/appinstall/ncdengine/engine/group"/>
+</component>
+<component name="debuglogger" filter="s60" long-name="NCD Debug Logger" introduced="^1" class="placeholder">
+<!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
+</component>
+<component name="ncdengine_build" filter="s60" long-name="NCD Build" introduced="^1">
+<unit bldFile="mw/appinstall/ncdengine/group"/>
+</component>
+</collection>
+<collection name="appinstaller" long-name="Application Installer" level="generic">
+<component name="appmngr2" filter="s60" long-name="Application Manager 2" introduced="^2">
+<unit bldFile="mw/appinstall/appinstaller/appmngr2/group"/>
+</component>
+<component name="appinstui" filter="s60" long-name="Application Installer UI" introduced="^2">
+<unit bldFile="mw/appinstall/appinstaller/appinstui/group"/>
+</component>
+</collection>
+<collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="api">
+<!-- the collection is really a component. Move down a directory.-->
+<component name="iaupdateapi_stub_build" long-name="IA Update API Stub Build" filter="s60" introduced="^2">
+<unit bldFile="mw/appinstall/iaupdateapi_stub/group"/>
+</component>
+</collection>
+<collection name="iaupdate" long-name="Independent Apps Update" level="api">
+<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
+<component name="iad" long-name="Software Update" filter="s60" introduced="^2">
+<unit bldFile="mw/appinstall/iaupdate/iad/group"/>
+</component>
+<component name="iaupdate_help" filter="s60" long-name="IA Update Help" introduced="^2">
+<unit bldFile="mw/appinstall/iaupdate/help/group"/>
+</component>
+<component name="iaupdate_build" filter="s60" long-name="IA Update Build" introduced="^2">
+<unit bldFile="mw/appinstall/iaupdate/group"/>
+</component>
+</collection>
+<collection name="installationservices" long-name="Installation Services" level="generic">
+<component name="swi" long-name="Secure Software Install" purpose="optional">
+<unit bldFile="mw/appinstall/installationservices/swi/group" mrp="mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
+</component>
+<component name="swidevicetools" long-name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
+<unit bldFile="mw/appinstall/installationservices/swidevicetools/group" mrp="mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
+</component>
+<component name="swiconfig" long-name="Software Install Config" introduced="9.1" purpose="optional" class="config">
+<unit bldFile="mw/appinstall/installationservices/swiconfig/group" mrp="mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
+</component>
+</collection>
+<collection name="secureswitools" long-name="Secure Software Install Tools" level="tool">
+<component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" class="PC">
+<unit bldFile="mw/appinstall/secureswitools/makekeys/group" mrp="mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
+</component>
+<component name="swianalysistoolkit" long-name="SWI Analysis Toolkit" purpose="development" class="PC">
+<unit bldFile="mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
+</component>
+<component name="openssllib" long-name="OpenSSL Library" purpose="optional" class="PC">
+<unit mrp="mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
+</component>
+<component name="swisistools" long-name="Secure Software Install SIS Tools" purpose="optional" class="PC">
+<unit bldFile="mw/appinstall/secureswitools/swisistools/group" mrp="mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
+</component>
+</collection>
+<collection name="appinstall_info" long-name="Application Installation Info" level="api">
+<component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="serviceapifw" level="specific" long-name="Service API Framework" levels="plugin framework server generic specific">
+<collection name="serviceapifw_pub" long-name="Service API Framework Public Interfaces" level="specific"/>
+<collection name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" level="specific">
+<component name="rtsecuritymanager_common_api" long-name="Runtime Security Manager Common API" filter="s60" class="api">
+<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/group"/>
+</component>
+<component name="rtsecuritymanager_utility_api" long-name="Runtime Security Manager Utility API" filter="s60" class="api">
+<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
+</component>
+<component name="rtsecuritymanager_client_api" long-name="Runtime Security Manager Client API" filter="s60" class="api">
+<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/group"/>
+</component>
+<component name="liw_provider_utility_api" long-name="LIW Provider Utility API" filter="s60" class="api">
+<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_provider_utility_api/group"/>
+</component>
+<component name="liw_service_interface_base_api" long-name="LIW Service Interface Base API" filter="s60" class="api">
+<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_base_api/group"/>
+</component>
+<component name="liw_service_interface_menu_api" long-name="LIW Service Interface Menu API" filter="s60" class="api">
+<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_menu_api/group"/>
+</component>
+<component name="liw_criteria_api" long-name="LIW Criteria API" filter="s60" class="api">
+<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_criteria_api/group"/>
+</component>
+<component name="liw_generic_parameter_api" long-name="LIW Generic Parameter API" filter="s60" class="api">
+<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_generic_parameter_api/group"/>
+</component>
+<component name="liw_service_handler_api" long-name="LIW Service Handler API" filter="s60" class="api">
+<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_handler_api/group"/>
+</component>
+</collection>
+<collection name="rtsecuritymanager" long-name="Runtime Security Manager" level="server">
+<component name="rtsecuritymanagerutil" filter="s60" long-name="Runtime Security Manager Util">
+<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
+</component>
+<component name="rtsecuritymanagerserver" filter="s60" long-name="Runtime Security Manager Server">
+<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/>
+</component>
+<component name="rtsecuritymanagerclient" filter="s60" long-name="Runtime Security Manager Client">
+<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/>
+</component>
+<component name="rtsecuritymanager_build" filter="s60" long-name="Runtime Security Manager Build">
+<!-- Move the export to the appropriate components, or make this a ROM component by removing the #includes -->
+<unit bldFile="mw/serviceapifw/rtsecuritymanager/group"/>
+</component>
+</collection>
+<collection name="languageinterworkingfw" long-name="Language Interworking Framework" level="framework">
+<component name="lifwservicehandler" filter="s60" long-name="Service Handler">
+<unit bldFile="mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
+</component>
+</collection>
+</block>
+<block name="serviceapi" level="specific" long-name="Service API" levels="os mw1 mw2 app">
+<!-- should break up this collection into something meaningful -->
+<collection name="serviceproviders" long-name="Service Providers" level="mw1">
+<component name="sapi_contacts_vpbk" long-name="Contacts Phonebook SAPI" filter="s60" plugin="Y">
+<unit bldFile="mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
+</component>
+<component name="sapi_location" long-name="Location SAPI" filter="s60" plugin="Y">
+<unit bldFile="mw/serviceapi/serviceproviders/sapi_location/group"/>
+</component>
+<component name="sapi_mediamanagement" long-name="Media Management SAPI" filter="s60" plugin="Y">
+<unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/group"/>
+</component>
+<component name="sapi_landmarks" long-name="Landmarks SAPI" filter="s60" plugin="Y">
+<unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
+</component>
+<component name="sapi_messaging" long-name="Messaging SAPI" filter="s60" plugin="Y">
+<unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/group"/>
+</component>
+<component name="sapi_applicationmanager" long-name="Application Manager SAPI" filter="s60" plugin="Y">
+<unit bldFile="mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
+</component>
+<component name="sapi_calendar" long-name="Calendar SAPI" filter="s60" plugin="Y">
+<unit bldFile="mw/serviceapi/serviceproviders/sapi_calendar/group"/>
+</component>
+<component name="sapi_logging" long-name="Logging SAPI" filter="s60" plugin="Y">
+<unit bldFile="mw/serviceapi/serviceproviders/sapi_logging/group"/>
+</component>
+<component name="sapi_sensor" long-name="Sensor SAPI" filter="s60" plugin="Y">
+<unit bldFile="mw/serviceapi/serviceproviders/sapi_sensor/group"/>
+</component>
+<component name="sapi_sysinfo" long-name="Sysinfo SAPI" filter="s60" plugin="Y">
+<unit bldFile="mw/serviceapi/serviceproviders/sapi_sysinfo/group"/>
+</component>
+<component name="sapi_serviceregistry" long-name="Service Registry SAPI" filter="s60" plugin="Y">
+<unit bldFile="mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
+</component>
+<component name="jsapi" long-name="Javascript API" filter="s60" plugin="Y">
+<unit bldFile="mw/serviceapi/serviceproviders/jsapi/group"/>
+</component>
+<component name="serviceproviders_build" filter="s60" long-name="Service API Build">
+<!-- distribute the exports or make this a ROM component by removing the #includes -->
+<unit bldFile="mw/serviceapi/serviceproviders/group"/>
+</component>
+</collection>
+</block>
+<block name="web" level="specific" long-name="Web" levels="plugin utils server generic specific">
+<collection name="web_pub" long-name="Web Public Interfaces" level="specific">
+<component name="browser_control_api" long-name="Browser Control API" filter="s60" class="api">
+<unit bldFile="mw/web/web_pub/browser_control_api/group"/>
+</component>
+<component name="download_mgr_client_api" long-name="Download Manager Client API" filter="s60" class="api">
+<unit bldFile="mw/web/web_pub/download_mgr_client_api/group"/>
+</component>
+<component name="download_mgr_ui_api" long-name="Download Manager UI Library API" filter="s60" class="api">
+<unit bldFile="mw/web/web_pub/download_mgr_ui_api/group"/>
+</component>
+<component name="favourites_engine_api" long-name="Favourites Engine API" filter="s60" class="api">
+<unit bldFile="mw/web/web_pub/favourites_engine_api/group"/>
+</component>
+<component name="browser_plugin_api" long-name="Browser Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/web/web_pub/browser_plugin_api/group"/>
+</component>
+<component name="settings_api" long-name="Settings API" filter="s60" class="api">
+<unit bldFile="mw/web/web_pub/settings_api/group"/>
+</component>
+</collection>
+<collection name="web_plat" long-name="Web Platform Interfaces" level="specific">
+<component name="aiw_browser_provider_api" long-name="AIW Browser Provider API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/aiw_browser_provider_api/group"/>
+</component>
+<component name="browser_dialogs_provider_api" long-name="Browser Dialogs Provider API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/browser_dialogs_provider_api/group"/>
+</component>
+<component name="browser_platform_api" long-name="Browser Platform API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/browser_platform_api/group"/>
+</component>
+<component name="cod_handler_api" long-name="COD Handler API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/cod_handler_api/group"/>
+</component>
+<component name="connection_manager_api" long-name="Connection Manager API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/connection_manager_api/group"/>
+</component>
+<component name="cxml_library_api" long-name="cXml Library API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/cxml_library_api/group"/>
+</component>
+<component name="download_mgr_client_api_extn" long-name="Download Manager Client API Extension" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/download_mgr_client_api_extn/group"/>
+</component>
+<component name="download_path_plugin_api" long-name="Download Path Plugin API" filter="s60" introduced="^3" class="api">
+<unit bldFile="mw/web/web_plat/download_path_plugin_api/group"/>
+</component>
+<component name="feeds_engine_api" long-name="Feeds Engine API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/feeds_engine_api/group"/>
+</component>
+<component name="launcher_api" long-name="Launcher API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/launcher_api/group"/>
+</component>
+<component name="multipart_parser_api" long-name="Multipart Parser API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/multipart_parser_api/group"/>
+</component>
+<component name="recent_url_store_api" long-name="Recent URL Store API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/recent_url_store_api/group"/>
+</component>
+<component name="scheme_handler_plugin_api" long-name="Scheme Handler Plugin API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/scheme_handler_plugin_api/group"/>
+</component>
+<component name="scriptable_plugin_api" long-name="Scriptable Plugin API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/scriptable_plugin_api/group"/>
+</component>
+<component name="webutils_api" long-name="Web Utils API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/webutils_api/group"/>
+</component>
+<component name="widget_registry_api" long-name="Widget Registry API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/widget_registry_api/group"/>
+</component>
+<component name="xml_parser_api" long-name="XML Parser API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/xml_parser_api/group"/>
+</component>
+<component name="stmgesturefw_api" long-name="State Machine Gesture Framework API " filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/stmgesturefw_api/group"/>
+</component>
+</collection>
+<collection name="web_info" long-name="Web Info" level="specific">
+<component name="web_build" filter="s60" long-name="Web Build">
+<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
+<unit bldFile="mw/web/group"/>
+</component>
+</collection>
+<collection name="browserutilities" long-name="Browser Utilities" level="utils">
+<component name="browserdialogsprovider" filter="s60" long-name="Browser Dialogs Provider">
+<unit bldFile="mw/web/browserutilities/browserdialogsprovider/group"/>
+</component>
+<component name="recenturlstore" filter="s60" long-name="Recent URL Store">
+<unit bldFile="mw/web/browserutilities/recenturlstore/group"/>
+</component>
+<component name="xmlparser" filter="s60" long-name="XML Interface">
+<unit bldFile="mw/web/browserutilities/xmlparser/group"/>
+</component>
+<component name="cxmllibrary" filter="s60" long-name="XML Parser Implementation">
+<unit bldFile="mw/web/browserutilities/cxmllibrary/group"/>
+</component>
+<component name="downloadmgr" filter="s60" long-name="Download Manager">
+<unit bldFile="mw/web/browserutilities/downloadmgr/group"/>
+</component>
+<component name="connectionmanager" filter="s60" long-name="Connection Manager">
+<unit bldFile="mw/web/browserutilities/connectionmanager/group"/>
+</component>
+<component name="browsertelservice" filter="s60" long-name="Browser Telephony Service">
+<unit bldFile="mw/web/browserutilities/browsertelservice/group"/>
+</component>
+<component name="favouritesengine" filter="s60" long-name="Favourites Engine">
+<unit bldFile="mw/web/browserutilities/favouritesengine/group"/>
+</component>
+<component name="feedsengine" filter="s60" long-name="Feeds Engine">
+<unit bldFile="mw/web/browserutilities/feedsengine/group"/>
+</component>
+<component name="multipartparser" filter="s60" long-name="Multipart Parser">
+<!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
+<!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
+</component>
+<component name="schemehandler" filter="s60" long-name="Scheme Handler">
+<unit bldFile="mw/web/browserutilities/schemehandler/group"/>
+</component>
+<component name="webutils" filter="s60" long-name="Web Utils">
+<unit bldFile="mw/web/browserutilities/webutils/group"/>
+</component>
+<component name="aiwbrowserprovider" filter="s60" long-name="AIW Browser Provider" plugin="Y">
+<unit bldFile="mw/web/browserutilities/aiwbrowserprovider/group"/>
+</component>
+<component name="browserutilities_build" filter="s60" long-name="Browser Utilities Build">
+<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
+<unit bldFile="mw/web/browserutilities/group"/>
+</component>
+</collection>
+<collection name="webengine" long-name="Web Engine" level="server">
+<component name="osswebengine" filter="s60" long-name="OSS Web Engine">
+<!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
+<unit bldFile="mw/web/webengine/osswebengine/cache/group"/>
+<unit bldFile="mw/web/webengine/osswebengine/memorymanager/group"/>
+<unit bldFile="mw/web/webengine/osswebengine/npscript/group"/>
+<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group"/>
+<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group/javascriptcore"/>
+</component>
+<component name="webkitutils" filter="s60" long-name="WebKit Utils">
+<unit bldFile="mw/web/webengine/webkitutils/group"/>
+</component>
+<component name="pagescaler" filter="s60" long-name="Page Scaler">
+<unit bldFile="mw/web/webengine/pagescaler/group"/>
+</component>
+<component name="webwidgetinstaller" filter="s60" long-name="Widget Installer">
+<unit bldFile="mw/web/webengine/widgetinstaller/group"/>
+</component>
+<component name="widgetregistry" filter="s60" long-name="Widget Registry">
+<unit bldFile="mw/web/webengine/widgetregistry/group"/>
+</component>
+<component name="wmlengine" filter="s60" long-name="WML Engine">
+<unit bldFile="mw/web/webengine/wmlengine/group"/>
+</component>
+<component name="device" filter="s60" long-name="Device">
+<!-- this needs a more meaningful name -->
+<unit bldFile="mw/web/webengine/device/group"/>
+</component>
+<component name="widgetengine" filter="s60" long-name="Widget Engine">
+<unit bldFile="mw/web/webengine/widgetengine/group"/>
+</component>
+<component name="web_memoryplugin" long-name="Memory Plugin" filter="s60" plugin="Y">
+<unit bldFile="mw/web/webengine/memoryplugin/group"/>
+</component>
+<component name="widgetmemoryplugin" filter="s60" long-name="Widget Memory Plugin" plugin="Y">
+<unit bldFile="mw/web/webengine/widgetmemoryplugin/group"/>
+</component>
+<component name="widgetbackuprestore" filter="s60" long-name="Widget Backup and Restore">
+<unit bldFile="mw/web/webengine/widgetbackuprestore/group"/>
+</component>
+<component name="browserrecognizers" filter="s60" long-name="Browser Recognizers" plugin="Y">
+<unit bldFile="mw/web/webengine/browserrecognizers/group"/>
+</component>
+<component name="wrtharvester" filter="s60" long-name="Web Runtime Harvester" plugin="Y">
+<unit bldFile="mw/web/webengine/wrtharvester/group"/>
+</component>
+</collection>
+<collection name="codhandler" long-name="Content Object Descriptor Handler" level="specific">
+<component name="codeng" filter="s60" long-name="COD Engine">
+<unit bldFile="mw/web/codhandler/codeng/group"/>
+</component>
+<component name="codui" filter="s60" long-name="COD UI">
+<unit bldFile="mw/web/codhandler/codui/group"/>
+</component>
+<component name="codrecog" filter="s60" long-name="COD Recogniser" plugin="Y">
+<unit bldFile="mw/web/codhandler/codrecog/group"/>
+</component>
+<component name="codviewer" filter="s60" long-name="COD Viewer">
+<unit bldFile="mw/web/codhandler/codviewer/group"/>
+</component>
+<component name="ddrecog" filter="s60" long-name="Download Descriptor Recogniser" plugin="Y">
+<unit bldFile="mw/web/codhandler/ddrecog/group"/>
+</component>
+<component name="ddviewer" filter="s60" long-name="Download Descriptor Viewer">
+<unit bldFile="mw/web/codhandler/ddviewer/group"/>
+</component>
+<component name="coddownload" filter="s60" long-name="COD Download">
+<unit bldFile="mw/web/codhandler/coddownload/group"/>
+</component>
+<component name="roapapp" filter="s60" long-name="ROAP Application">
+<unit bldFile="mw/web/codhandler/roapapp/group"/>
+</component>
+<component name="codhandler_build" filter="s60" long-name="COD Handler Build">
+<!-- Exports need to go into another component or make this self-contained.
+ #included .hrh file needs to be #included in each of the other components -->
+<unit bldFile="mw/web/codhandler/group"/>
+</component>
+</collection>
+<collection name="widgets" long-name="Web Widget Framework" level="generic">
+<!-- the following units can be uncommented when configuration is put in place -->
+<component name="widgetrecognizer" filter="s60" long-name="Widget Recognizer" plugin="Y">
+<!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
+</component>
+<component name="widgetinstaller" filter="s60" long-name="Widget Installer UI" plugin="Y">
+<!--<unit bldFile="widgets/widgetinstaller/group"/>-->
+</component>
+<component name="widgetlauncher" filter="s60" long-name="Widget Launcher">
+<!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
+</component>
+<component name="widgetapp" filter="s60" long-name="Widget UI">
+<!--<unit bldFile="widgets/widgetapp/group"/>-->
+</component>
+<component name="widgetsidchecker" filter="s60" long-name="Widget SID Checker" introduced="^3">
+<!--<unit bldFile="widgets/widgetsidchecker/group"/>-->
+</component>
+<component name="widgetpreinstaller" filter="s60" long-name="Widget Pre-Installer">
+<!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
+</component>
+<component name="widgetstartup" filter="s60" long-name="Widget Startup">
+<!--<unit bldFile="widgets/widgetstartup/group"/>-->
+</component>
+<component name="widgets_build" filter="s60" long-name="Widgets Build">
+<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed
+ #included .hrh file needs to be #included in each of the other components -->
+<unit bldFile="mw/web/widgets/group"/>
+</component>
+</collection>
+</block>
+<block name="websrv" level="generic" long-name="Web Services" levels="plugin framework server generic specific">
+<collection name="websrv_pub" long-name="Web Services Public Interfaces" level="specific">
+<component name="web_service_description_api" long-name="Web Service Description API" filter="s60" class="api">
+<unit bldFile="mw/websrv/websrv_pub/web_service_description_api/group"/>
+</component>
+<component name="web_service_connection_api" long-name="Web Service Connection API" filter="s60" class="api">
+<unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/group"/>
+</component>
+<component name="web_service_manager_api" long-name="Web Service Manager API" filter="s60" class="api">
+<unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/group"/>
+</component>
+<component name="hostlet_connection_api" long-name="Hostlet Connection API" filter="s60" class="api">
+<unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/group"/>
+</component>
+<component name="web_service_messaging_api" long-name="Web Service Messaging API" filter="s60" class="api">
+<unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/group"/>
+</component>
+<component name="xml_extensions_api" long-name="XML Extensions API" filter="s60" class="api">
+<unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/group"/>
+</component>
+<component name="xml_fragment_api" long-name="XML Fragment API" filter="s60" class="api">
+<unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/group"/>
+</component>
+</collection>
+<collection name="webservices" long-name="Web Services Framework" level="generic">
+<!-- consider breaking this collection into more meaningful subsets -->
+<component name="wsnotifierplugins" filter="s60" long-name="WS Notifier Plugins" plugin="Y">
+<unit bldFile="mw/websrv/webservices/wsnotifierplugins/group"/>
+</component>
+<component name="wslogger" filter="s60" long-name="WS Logger">
+<unit bldFile="mw/websrv/webservices/wslogger/group"/>
+</component>
+<component name="wsxml" filter="s60" long-name="WS XML Extensions">
+<unit bldFile="mw/websrv/webservices/wsxml/group"/>
+</component>
+<component name="wsutils" filter="s60" long-name="WS Utils">
+<unit bldFile="mw/websrv/webservices/wsutils/group"/>
+</component>
+<component name="wsfragment" filter="s60" long-name="WS Fragment">
+<unit bldFile="mw/websrv/webservices/wsfragment/group"/>
+</component>
+<component name="wsdescription" filter="s60" long-name="WS Service Description">
+<unit bldFile="mw/websrv/webservices/wsdescription/group"/>
+</component>
+<component name="wsconnection" filter="s60" long-name="WS Service Connection">
+<unit bldFile="mw/websrv/webservices/wsconnection/group"/>
+</component>
+<component name="wsmessages" filter="s60" long-name="WS Messages">
+<unit bldFile="mw/websrv/webservices/wsmessages/group"/>
+</component>
+<component name="wscredentialmanager" filter="s60" long-name="WS Credential Manager">
+<unit bldFile="mw/websrv/webservices/wscredentialmanager/group"/>
+</component>
+<component name="wsframework" filter="s60" long-name="WS Framework">
+<unit bldFile="mw/websrv/webservices/wsframework/group"/>
+</component>
+<component name="wshttpchanneltransportplugin" filter="s60" long-name="WS HTTP Channel Transport Plugin" plugin="Y">
+<unit bldFile="mw/websrv/webservices/wshttpchanneltransportplugin/group"/>
+</component>
+<component name="wsconnectionagent" filter="s60" long-name="WS Connection Agent">
+<unit bldFile="mw/websrv/webservices/wsconnectionagent/group"/>
+</component>
+<component name="wsprovider" filter="s60" long-name="WS Provider">
+<unit bldFile="mw/websrv/webservices/wsprovider/group"/>
+</component>
+<component name="wshostletconnection" filter="s60" long-name="WS Hostlet Connection">
+<unit bldFile="mw/websrv/webservices/wshostletconnection/group"/>
+</component>
+<component name="wsmanager" filter="s60" long-name="WS Service Manager">
+<unit bldFile="mw/websrv/webservices/wsmanager/group"/>
+</component>
+<component name="wsidentitymanager" filter="s60" long-name="WS Identity Manager">
+<unit bldFile="mw/websrv/webservices/wsidentitymanager/group"/>
+</component>
+<component name="idwsfplugin" filter="s60" long-name="ID-WSF Plugin" plugin="Y">
+<unit bldFile="mw/websrv/webservices/idwsfplugin/group"/>
+</component>
+<component name="wsibasicplugin" filter="s60" long-name="WS-I Basic Plugin" plugin="Y">
+<unit bldFile="mw/websrv/webservices/wsibasicplugin/group"/>
+</component>
+<component name="wsrestplugin" filter="s60" long-name="WS REST Plugin" plugin="Y">
+<unit bldFile="mw/websrv/webservices/wsrestplugin/group"/>
+</component>
+<component name="idwsfsecuritymechanism" filter="s60" long-name="ID-WSF Security Mechanism">
+<unit bldFile="mw/websrv/webservices/idwsfsecuritymechanism/group"/>
+</component>
+<component name="wspasswordtransforms" filter="s60" long-name="WS Password Transforms">
+<unit bldFile="mw/websrv/webservices/wspasswordtransforms/group"/>
+</component>
+<component name="wscore" filter="s60" long-name="WS Core Service Manager">
+<unit bldFile="mw/websrv/webservices/wscore/group"/>
+</component>
+<component name="wslocaltransportplugin" filter="s60" long-name="WS Local Transport Plugin" plugin="Y">
+<unit bldFile="mw/websrv/webservices/wslocaltransportplugin/group"/>
+</component>
+<component name="wshostlettransportplugin" filter="s60" long-name="WS Hostlet Transport Plugin" plugin="Y">
+<unit bldFile="mw/websrv/webservices/wshostlettransportplugin/group"/>
+</component>
+<component name="wsstar" filter="s60" long-name="WS Star">
+<!-- can only have one unit. Need to split into separate components or #include from a single bld.inf -->
+<unit bldFile="mw/websrv/webservices/wsstar/wsstarpolicy/group"/>
+<unit bldFile="mw/websrv/webservices/wsstar/wsstarplugin/group"/>
+<unit bldFile="mw/websrv/webservices/wsstar/wsstarmessagehandlers/group"/>
+</component>
+<component name="wsoviplugin" filter="s60" long-name="WS Ovi Plugin">
+<unit bldFile="mw/websrv/webservices/wsoviplugin/group"/>
+</component>
+<component name="webservices_build" filter="s60" long-name="Web Services Build">
+<!-- need to split into self-contained components -->
+<unit bldFile="mw/websrv/webservices/group"/>
+</component>
+</collection>
+<collection name="websrv_info" long-name="Web Services Info" level="specific">
+<component name="websrv_bld" filter="s60" long-name="Web Services Build">
+<!-- need to include common .hrh in each unit -->
+<unit bldFile="mw/websrv/group"/>
+</component>
+</collection>
+</block>
+<block name="platformtools" level="generic" long-name="Platform Tools">
+<collection name="gfxconversion" long-name="Graphics Conversion">
+<component name="bmconv_s60" filter="s60" long-name="S60 Bitmap Converter" class="PC">
+<unit bldFile="mw/platformtools/gfxconversion/bmconv_s60/group"/>
+</component>
+<component name="mifconv" filter="s60" long-name="Multi Icon File Converter" class="PC">
+<unit bldFile="mw/platformtools/gfxconversion/mifconv/group"/>
+</component>
+</collection>
+</block>
+<block name="uitools" level="specific" long-name="UI Tools" levels="compile encode tool if">
+<collection name="uitools_pub" long-name="UI Tools Public Interfaces" level="if">
+<component name="third_party_bitmap_palette_api" long-name="Third Party Bitmap Palette API" filter="s60" class="api">
+<unit bldFile="mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
+</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">
+<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">
+<unit bldFile="mw/uitools/uitools_plat/layout_system_private_api/group"/>
+</component>
+</collection>
+<collection name="cdlcompilertoolkit" long-name="CDL Compiler Toolkit" level="compile">
+<!-- collection is actually a component. Needs to be moved down a directory -->
+<component name="cdlcompilertoolkit_build" filter="s60" long-name="CDL Compiler Toolkit Build">
+<unit bldFile="mw/uitools/cdlcompilertoolkit/group"/>
+</component>
+</collection>
+<collection name="cdlcompiler" long-name="CDL Compiler" level="compile">
+<!-- collection is actually a component. Needs to be moved down a directory -->
+<component name="cdlcompiler_build" filter="s60" long-name="CDL Compiler Build">
+<unit bldFile="mw/uitools/cdlcompiler/group"/>
+</component>
+</collection>
+<collection name="gfxtools" long-name="Graphics Tools" level="tool">
+<component name="color" filter="s60" long-name="Bitmap Colour Palette" class="PC">
+<unit bldFile="mw/uitools/gfxtools/color/group"/>
+</component>
+</collection>
+<collection name="aknlayoutcompiler" long-name="Avkon Layout Compiler" level="compile">
+<!-- collection is actually a component. Needs to be moved down a directory -->
+<component name="aknlayoutcompiler_build" filter="s60" long-name="Avkon Layout Compiler Build">
+<unit bldFile="mw/uitools/aknlayoutcompiler/group"/>
+</component>
+</collection>
+<collection name="skincompiler" long-name="Skin Compiler" level="compile">
+<component name="aknskindesccompiler" filter="s60" long-name="Avkon Skin Descriptor Compiler">
+<unit bldFile="mw/uitools/skincompiler/AknSkinDescCompiler/group"/>
+</component>
+</collection>
+<collection name="reszip" long-name="Resource Zip" level="encode">
+<!-- collection is actually a component. Needs to be moved down a directory -->
+<component name="reszip_build" filter="s60" long-name="Resource Zip Build">
+<unit bldFile="mw/uitools/reszip/group"/>
+</component>
+</collection>
+<collection name="toollibraries" long-name="Tool Libraries" level="tool"/>
+<collection name="svgtencoder" long-name="SVGT Encoder" level="encode">
+<component name="svgtenc" filter="s60" long-name="Standalone SVGT Encoder" class="PC">
+<unit bldFile="mw/uitools/svgtencoder/svgtenc/standalone/group"/>
+</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"/>
+</component>
+<component name="landmarks_ui_addedit_api" long-name="Landmarks UI Add/Edit API" filter="s60" class="api">
+<unit bldFile="app/location/loc_pub/landmarks_ui_addedit_api/group"/>
+</component>
+</collection>
+<collection name="basiclocationinfodisplay" long-name="Basic Location Info Display" level="ui">
+<component name="blid" filter="s60" long-name="Basic Location Info Display Build">
+<unit bldFile="app/location/basiclocationinfodisplay/blid/group"/>
+</component>
+</collection>
+<collection name="landmarksui" long-name="Landmarks UI" level="loc">
+<component name="landmarksui_help" filter="s60" long-name="Landmarks UI Help">
+<unit bldFile="app/location/landmarksui/help/group"/>
+</component>
+<component name="landmarksui_engine" filter="s60" long-name="Landmarks UI Engine">
+<unit bldFile="app/location/landmarksui/engine/group"/>
+</component>
+<component name="uicontrols" filter="s60" long-name="Landmarks UI Controls">
+<unit bldFile="app/location/landmarksui/uicontrols/group"/>
+</component>
+<component name="landmarksui_commonui" filter="s60" long-name="Landmarks Common UI">
+<unit bldFile="app/location/landmarksui/commonui/group"/>
+</component>
+<component name="landmarksui_app" filter="s60" long-name="Landmarks Application">
+<unit bldFile="app/location/landmarksui/app/group"/>
+</component>
+<component name="msgviewer" filter="s60" long-name="Landmarks Message Viewer">
+<unit bldFile="app/location/landmarksui/msgviewer/group"/>
+</component>
+<component name="landmarksui_build" filter="s60" long-name="Landmarks UI Build">
+<!-- consider distributing this into the other components or collapsing into a single component -->
+<unit bldFile="app/location/landmarksui/group"/>
+</component>
+</collection>
+<collection name="eventsui" long-name="Location Events UI" level="events">
+<component name="eventsui_help" filter="s60" long-name="Events Help">
+<unit bldFile="app/location/eventsui/help/group"/>
+</component>
+<component name="eventsutils" filter="s60" long-name="Events Utils">
+<unit bldFile="app/location/eventsui/eventsutils/group"/>
+</component>
+<component name="eventsengine" filter="s60" long-name="Events Engine">
+<unit bldFile="app/location/eventsui/eventsengine/group"/>
+</component>
+<component name="eventshandlerui" filter="s60" long-name="Events Handler UI">
+<unit bldFile="app/location/eventsui/eventshandlerui/group"/>
+</component>
+<component name="eventseditor" filter="s60" long-name="Events Editor">
+<unit bldFile="app/location/eventsui/eventseditor/group"/>
+</component>
+<component name="eventsmgmtui" filter="s60" long-name="Events Management UI">
+<unit bldFile="app/location/eventsui/eventsmgmtui/group"/>
+</component>
+<component name="eventsui_build" filter="s60" long-name="Events UI Build">
+<!-- consider distributing this into the other components or collapsing into a single component -->
+<unit bldFile="app/location/eventsui/group"/>
+</component>
+</collection>
+<collection name="locationlandmarksrefappfors60" long-name="Location Landmarks Reference App for S60" level="apps">
+<!-- this is a component, needs to be moved down a directory -->
+<component name="lmrefapp" filter="s60" long-name="Landmarks Reference Application">
+<unit bldFile="app/location/locationlandmarksrefappfors60/group"/>
+</component>
+</collection>
+<collection name="locationlandmarksuirefapp" long-name="Location Landmarks UI Reference App" level="apps">
+<!-- this is a component, needs to be moved down a directory -->
+<component name="lmuirefapp" filter="s60" long-name="Landmarks UI Reference Application">
+<unit bldFile="app/location/locationlandmarksuirefapp/group"/>
+</component>
+</collection>
+<collection name="locationsatviewrefapp" long-name="Location Satellite View Reference App" level="apps">
+<!-- this is a component, needs to be moved down a directory -->
+<component name="satellitereference" filter="s60" long-name="Satellite Info UI Reference Application">
+<unit bldFile="app/location/locationsatviewrefapp/group"/>
+</component>
+</collection>
+<collection name="simpsyconfigurator" long-name="Simulation PSY Configurator" level="ui">
+<!-- this is a component, needs to be moved down a directory -->
+<component name="simpsyui" filter="s60" long-name="Simulation PSY UI">
+<unit bldFile="app/location/simpsyconfigurator/group"/>
+</component>
+</collection>
+<collection name="mapnavproviderrefapp" long-name="Map and Navigation Provider Reference App" level="apps">
+<!-- this is a component, needs to be moved down a directory -->
+<component name="mapnavproviderrefapp_build" filter="s60" long-name="Map and Navigation Provider Reference Application">
+<unit bldFile="app/location/mapnavproviderrefapp/group"/>
+</component>
+</collection>
+</block>
+<block name="mmsharinguis" level="services" long-name="Multimedia Sharing UIs" levels="base plugin if">
+<collection name="mmsharinguis_plat" long-name="Multimedia Sharing UIs Platform Interfaces" level="if">
+<component name="multimedia_sharing_settings_api" long-name="Multimedia Sharing Settings API" filter="s60" class="api">
+<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_settings_api/group"/>
+</component>
+<component name="multimedia_sharing_resource_api" long-name="Multimedia Sharing Resource API" filter="s60" class="api">
+<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_resource_api/group"/>
+</component>
+<component name="multimedia_sharing_manager_api" long-name="Multimedia Sharing Manager API" filter="s60" class="api">
+<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/group"/>
+</component>
+</collection>
+<collection name="mmsharing" long-name="Multimedia Sharing" level="base">
+<component name="mmshavailability" filter="s60" long-name="Multimedia Sharing Availability">
+<unit bldFile="app/mmsharinguis/mmsharing/mmshavailability/group"/>
+</component>
+<component name="mmshindicator" filter="s60" long-name="Multimedia Sharing Indicator">
+<unit bldFile="app/mmsharinguis/mmsharing/mmshindicator/group"/>
+</component>
+<!-- consider putting client and server in the same component -->
+<component name="mmshmanagercli" filter="s60" long-name="Multimedia Sharing Manager Client">
+<unit bldFile="app/mmsharinguis/mmsharing/mmshmanagercli/group" filter="!test"/>
+</component>
+<component name="mmshmanagersrv" filter="s60" long-name="Multimedia Sharing Manager Server">
+<unit bldFile="app/mmsharinguis/mmsharing/mmshmanagersrv/group"/>
+</component>
+<component name="mmshengine" filter="s60" long-name="Multimedia Sharing Engine">
+<unit bldFile="app/mmsharinguis/mmsharing/mmshengine/group"/>
+</component>
+<component name="mmshui" filter="s60" long-name="Multimedia Sharing UI">
+<!-- can only have one unit: need to #include one from the other if it's needed -->
+<unit bldFile="app/mmsharinguis/mmsharing/mmshui/group"/>
+<unit bldFile="app/mmsharinguis/mmsharing/mmshui/help/group"/>
+</component>
+<component name="mmsharing_build" filter="s60" long-name="MM Sharing Build">
+<unit bldFile="app/mmsharinguis/mmsharing/group"/>
+</component>
+</collection>
+<collection name="mmshplugins" long-name="Multimedia Sharing Plugins" level="plugin">
+<component name="mmshaoplugin" filter="s60" long-name="Multimedia Sharing Always Online Plugin" plugin="Y">
+<unit bldFile="app/mmsharinguis/mmshplugins/mmshaoplugin/group"/>
+</component>
+<component name="mmshaiwplugin" filter="s60" long-name="Multimedia Sharing AIW Plugin" plugin="Y">
+<unit bldFile="app/mmsharinguis/mmshplugins/mmshaiwplugin/group"/>
+</component>
+<component name="mmshsipcrplugin" filter="s60" long-name="Multimedia Sharing SIP Client Resolver Plugin" plugin="Y">
+<unit bldFile="app/mmsharinguis/mmshplugins/mmshsipcrplugin/group"/>
+</component>
+<component name="mmshsettingsuiplugin" filter="s60" long-name="Multimedia Sharing Settings UI Plugin" plugin="Y">
+<unit bldFile="app/mmsharinguis/mmshplugins/mmshsettingsuiplugin/group"/>
+</component>
+<component name="mmshwpadapterplugin" filter="s60" long-name="Multimedia Sharing WAP Provisioning Adapter" plugin="Y">
+<unit bldFile="app/mmsharinguis/mmshplugins/mmshwpadapterplugin/group"/>
+</component>
+</collection>
+<collection name="mmsharinguis_info" long-name="Multimedia Sharing UIs Info" level="if">
+<component name="mmsharinguis_build" filter="s60" long-name="Multimedia Sharing UIs Build">
+<!-- consider distributing to other components -->
+<unit bldFile="app/mmsharinguis/group"/>
+</component>
+</collection>
+</block>
+<block name="phone" level="apps" span="2" long-name="Phone Apps" levels="engine plugin ui app">
+<collection name="phone_plat" long-name="Phone Apps Platform Interfaces" level="app">
+<component name="3d_ringing_tone_enabler_api" long-name="3D Ringing Tone Enabler API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
+</component>
+<component name="telephony_comms_information_api" long-name="Telephony Comms Information API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/telephony_comms_information_api/group"/>
+</component>
+<component name="telephony_information_api" long-name="Telephony Information API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/telephony_information_api/group"/>
+</component>
+<component name="telephony_device_mode_api" long-name="Telephony Device Mode API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/telephony_device_mode_api/group"/>
+</component>
+<component name="telephony_remote_party_information_api" long-name="Telephony Remote Party Information API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/telephony_remote_party_information_api/group"/>
+</component>
+<component name="telephony_video_mailbox_settings_api" long-name="Telephony Video Mailbox Settings API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/telephony_video_mailbox_settings_api/group"/>
+</component>
+<component name="telephony_configuration_api" long-name="Telephony Configuration API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/telephony_configuration_api/group"/>
+</component>
+<component name="telephony_microphone_mute_status_api" long-name="Telephony Microphone Mute Status API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/telephony_microphone_mute_status_api/group"/>
+</component>
+<component name="dialer_keypad_api" long-name="Dialer Keypad API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/dialer_keypad_api/group"/>
+</component>
+<component name="telephony_logging_extension_api" long-name="Telephony Logging Extension API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/telephony_logging_extension_api/group"/>
+</component>
+<component name="telephony_matching_extension_api" long-name="Telephony Matching Extension API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/telephony_matching_extension_api/group"/>
+</component>
+<component name="telephony_bubble_extension_api" long-name="Telephony Bubble Extension API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/telephony_bubble_extension_api/group"/>
+</component>
+<component name="telephony_menu_extension_api" long-name="Telephony Menu Extension API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/telephony_menu_extension_api/group"/>
+</component>
+<component name="phone_application_commands_api" long-name="Phone Application Commands API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/phone_application_commands_api/group"/>
+</component>
+<component name="phone_application_voip_commands_api" long-name="Phone Application VOIP Commands API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/phone_application_voip_commands_api/group"/>
+</component>
+<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/telephony_mediator_api/group"/>
+</component>
+<component name="video_telephony_mediator_api" long-name="Video Telephony Mediator API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/video_telephony_mediator_api/group"/>
+</component>
+</collection>
+<collection name="phoneapp" long-name="Phone Application" level="app">
+<component name="blacklist" filter="s60" long-name="Phone Blacklist Clearing" plugin="Y">
+<unit bldFile="app/phone/phoneapp/blacklist/group"/>
+</component>
+<component name="phoneui" filter="s60" long-name="Phone UI">
+<unit bldFile="app/phone/phoneapp/phoneui/group" filter="!test"/>
+</component>
+<component name="phoneuicontrol" filter="s60" long-name="Phone UI Control">
+<unit bldFile="app/phone/phoneapp/phoneuicontrol/group"/>
+</component>
+<component name="phoneuistates" filter="s60" long-name="Phone UI States">
+<unit bldFile="app/phone/phoneapp/phoneuistates/group"/>
+</component>
+<component name="phoneuiutils" filter="s60" long-name="Phone UI Utils">
+<unit bldFile="app/phone/phoneapp/phoneuiutils/group"/>
+</component>
+<component name="phoneuiview" filter="s60" long-name="Phone UI View">
+<unit bldFile="app/phone/phoneapp/phoneuiview/group"/>
+</component>
+<component name="phoneuivoipextension" filter="s60" long-name="Phone UI VOIP Extension">
+<unit bldFile="app/phone/phoneapp/phoneuivoipextension/group"/>
+</component>
+<component name="silenceactionplugin" filter="s60" long-name="Silence Action Plugin" plugin="Y">
+<unit bldFile="app/phone/phoneapp/silenceactionplugin/group"/>
+</component>
+<component name="phonemediatorcenter" filter="s60" long-name="Phone Mediator Center">
+<unit bldFile="app/phone/phoneapp/phonemediatorcenter/group"/>
+</component>
+</collection>
+<collection name="phoneengine" long-name="Phone Engine" level="engine">
+<component name="phonecntfinder" filter="s60" long-name="Phone Contact Finder">
+<unit bldFile="app/phone/phoneengine/phonecntfinder/group"/>
+</component>
+<component name="audiohandling" filter="s60" long-name="Phone Audio Handling">
+<unit bldFile="app/phone/phoneengine/audiohandling/group"/>
+</component>
+<component name="callhandling" filter="s60" long-name="Call Handling">
+<unit bldFile="app/phone/phoneengine/callhandling/group"/>
+</component>
+<component name="contacthandling" filter="s60" long-name="Phone Contact Handling">
+<unit bldFile="app/phone/phoneengine/contacthandling/group"/>
+</component>
+<component name="loghandling" filter="s60" long-name="Phone Log Handling">
+<unit bldFile="app/phone/phoneengine/loghandling/group"/>
+</component>
+<component name="engineinfo" filter="s60" long-name="Phone Engine Info">
+<unit bldFile="app/phone/phoneengine/engineinfo/group"/>
+</component>
+<component name="phonemodel" filter="s60" long-name="Phone Model">
+<unit bldFile="app/phone/phoneengine/phonemodel/group"/>
+</component>
+<component name="servicehandling" filter="s60" long-name="Phone Service Handling">
+<unit bldFile="app/phone/phoneengine/servicehandling/group"/>
+</component>
+</collection>
+<collection name="phonesettings" long-name="Phone Settings" level="plugin">
+<component name="aiwcallimageplugin" filter="s60" long-name="Call Image AIW Plugin" plugin="Y">
+<unit bldFile="app/phone/phonesettings/aiwcallimageplugin/group"/>
+</component>
+<component name="pslncallimageplugin" filter="s60" long-name="Call Image Personalization Plugin" plugin="Y">
+<unit bldFile="app/phone/phonesettings/pslncallimageplugin/group"/>
+</component>
+</collection>
+<collection name="phoneuis" long-name="Phone UIs" level="ui">
+<component name="dialer" filter="s60" long-name="Dialer">
+<unit bldFile="app/phone/phoneuis/dialer/group" filter="!test"/>
+</component>
+<component name="easydialing" filter="s60" long-name="Easy Dialing Plugin" introduced="^3" plugin="Y">
+<unit bldFile="app/phone/phoneuis/easydialing/group"/>
+</component>
+<component name="bubblemanager" filter="s60" long-name="Phone Bubble Manager">
+<unit bldFile="app/phone/phoneuis/bubblemanager/group"/>
+</component>
+<component name="connectutil" filter="s60" long-name="Connection Utility" plugin="Y">
+<unit bldFile="app/phone/phoneuis/connectutil/group"/>
+</component>
+<component name="ussd" filter="s60" long-name="Unstructured Supplementary Services Data">
+<unit bldFile="app/phone/phoneuis/ussd/group"/>
+</component>
+<component name="vmbx" filter="s60" long-name="Voice Mailbox">
+<unit bldFile="app/phone/phoneuis/vmbx/group"/>
+</component>
+<component name="telephonydevicemode" filter="s60" long-name="Telephony Device Mode">
+<unit bldFile="app/phone/phoneuis/telephonydevicemode/group"/>
+</component>
+</collection>
+<collection name="phoneplugins" long-name="Phone Plugins" level="plugin">
+<component name="telbranding" filter="s60" long-name="Tel Branding" introduced="^2" plugin="Y">
+<unit bldFile="app/phone/phoneplugins/telbranding/group"/>
+</component>
+</collection>
+</block>
+<block name="videotelephony" level="apps" long-name="Video Telephony Apps" levels="engine plugin prot ui">
+<collection name="videotelephony_plat" long-name="VT Apps Platform Interfaces" level="ui">
+<component name="video_telephony_control_mediator_api" long-name="Video Telephony Control Mediator API" filter="s60" class="api">
+<unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_control_mediator_api/group"/>
+</component>
+<component name="video_telephony_media_configuration_api" long-name="Video Telephony Media Configuration API" filter="s60" class="api">
+<unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_media_configuration_api/group"/>
+</component>
+</collection>
+<collection name="vtengines" long-name="Video Telephony Engines" level="engine">
+<component name="videoteleng" filter="s60" long-name="Video Telephony Engine">
+<unit bldFile="app/videotelephony/vtengines/videoteleng/Group"/>
+</component>
+<component name="vtmediatorplugin" filter="s60" long-name="VT Mediator Plugin" plugin="Y">
+<unit bldFile="app/videotelephony/vtengines/vtmediatorplugin/group"/>
+</component>
+</collection>
+<collection name="vtuis" long-name="Video Telephony UIs" level="ui">
+<component name="videotelui" filter="s60" long-name="Video Telephony UI">
+<unit bldFile="app/videotelephony/vtuis/videotelui/group"/>
+</component>
+</collection>
+<collection name="vtprotocolplugins" long-name="VT Protocol Plugins" level="plugin">
+<component name="displaysink" filter="s60" long-name="Display Sink" introduced="^2">
+<unit bldFile="app/videotelephony/vtprotocolplugins/DisplaySink/group"/>
+</component>
+<component name="videosource" filter="s60" long-name="Video Source" introduced="^2">
+<unit bldFile="app/videotelephony/vtprotocolplugins/VideoSource/group"/>
+</component>
+</collection>
+<collection name="vtprotocolsstub" long-name="VT Protocols Stub" level="prot">
+<!-- this collection is really a component, move down a directory -->
+<component name="videotelproto" filter="s60" long-name="Video Telephony Protocol">
+<unit bldFile="app/videotelephony/vtprotocolsstub/group" filter="sf_build"/>
+</component>
+</collection>
+</block>
+<block name="iptelephony" level="apps" long-name="IP Telephony" levels="eng plugin util ui">
+<collection name="iptel_plat" long-name="IP Telephony Platform Interfaces" level="ui">
+<component name="richcallsettingsengine_api" long-name="Rich Call Settings Engine API" introduced="^2" filter="s60" class="api">
+<unit bldFile="app/iptelephony/iptel_plat/richcallsettingsengine_api/group"/>
+</component>
+<component name="cch_client_api" long-name="CCH Client API" introduced="^2" filter="s60" class="api">
+<unit bldFile="app/iptelephony/iptel_plat/cch_client_api/group"/>
+</component>
+<component name="cch_server_api" long-name="CCH Server API" introduced="^2" filter="s60" class="api">
+<unit bldFile="app/iptelephony/iptel_plat/cch_server_api/group"/>
+</component>
+<component name="csc_settingsui_api" long-name="CSC Settings UI API" introduced="^2" filter="s60" class="api">
+<unit bldFile="app/iptelephony/iptel_plat/csc_settingsui_api/group"/>
+</component>
+<component name="vccpropertyhandler_api" long-name="VCC Property Handler API" introduced="^2" filter="s60" class="api">
+<unit bldFile="app/iptelephony/iptel_plat/vccpropertyhandler_api/group"/>
+</component>
+<component name="vcc_api" long-name="VCC API" introduced="^2" filter="s60" class="api">
+<unit bldFile="app/iptelephony/iptel_plat/vcc_api/group"/>
+</component>
+</collection>
+<collection name="iptelcommsconfig" long-name="IP Telephony Comms Config" level="ui">
+<component name="cscgsplugin" filter="s60" long-name="CSC GS Plugin" introduced="^2" plugin="Y">
+<unit bldFile="app/iptelephony/commsconfig/cscgsplugin/group"/>
+</component>
+<component name="cscsipvoipcleanupplugin" filter="s60" long-name="CSC SIP VoIP Cleanup Plugin" introduced="^2" plugin="Y">
+<unit bldFile="app/iptelephony/commsconfig/cscsipvoipcleanupplugin/group"/>
+</component>
+<component name="cscengine" filter="s60" long-name="Connection Service Configurator Engine" introduced="^2">
+<unit bldFile="app/iptelephony/commsconfig/cscengine/group"/>
+</component>
+<component name="cscsettingsui" filter="s60" long-name="CSC Settings UI" introduced="^2">
+<unit bldFile="app/iptelephony/commsconfig/cscsettingsui/group"/>
+</component>
+<component name="cscapplicationui" filter="s60" long-name="CSC Application UI" introduced="^2">
+<unit bldFile="app/iptelephony/commsconfig/cscapplicationui/group"/>
+</component>
+<component name="commsconfig_build" filter="s60" long-name="Comms Config Build" introduced="^2">
+<!-- consider distributing this into the above components -->
+<unit bldFile="app/iptelephony/commsconfig/group"/>
+</component>
+</collection>
+<collection name="convergedconnectionhandler" long-name="Converged Connection Handler" level="eng">
+<component name="cchserver" filter="s60" long-name="CCH Server" introduced="^2">
+<unit bldFile="app/iptelephony/convergedconnectionhandler/cchserver/group"/>
+</component>
+<component name="cchclient" filter="s60" long-name="CCH Client" introduced="^2">
+<unit bldFile="app/iptelephony/convergedconnectionhandler/cchclient/group"/>
+</component>
+<component name="cchclientapi" filter="s60" long-name="CCH Client API" introduced="^2">
+<unit bldFile="app/iptelephony/convergedconnectionhandler/cchclientapi/group"/>
+</component>
+<component name="convergedconnectionhandler_build" filter="s60" long-name="CCH Build" introduced="^2">
+<!-- consider distributing this into the above components, or collapse the collection into a single component.
+ The latter is a better option since clients and sevrers are rarely separate components -->
+<unit bldFile="app/iptelephony/convergedconnectionhandler/group"/>
+</component>
+</collection>
+<collection name="richcallsettingsengine" long-name="Rich Call Settings Engine" level="eng">
+<component name="rcse2" filter="s60" long-name="Rich Call Settings Engine Build" introduced="^2">
+<unit bldFile="app/iptelephony/richcallsettingsengine/rcse2/group"/>
+</component>
+</collection>
+<collection name="sipvoipprovider" long-name="SIP VoIP Provider" level="plugin">
+<!-- collection is really a component. Should move down a directory -->
+<component name="svp" filter="s60" long-name="SIP VoIP Provider Build" introduced="^2" plugin="Y">
+<unit bldFile="app/iptelephony/sipvoipprovider/group"/>
+</component>
+</collection>
+<collection name="voipplugins" long-name="VoIP Plugins" level="plugin">
+<component name="sipmxresolver" filter="s60" long-name="SIP MX Resolver" introduced="^2" plugin="Y">
+<unit bldFile="app/iptelephony/voipplugins/sipmxresolver/group"/>
+</component>
+<component name="sipconnectionprovider" filter="s60" long-name="SIP Connection Provider" introduced="^2" plugin="Y">
+<unit bldFile="app/iptelephony/voipplugins/sipconnectionprovider/group"/>
+<!-- can only have one unit, can the next be #'included from the above? -->
+<unit bldFile="app/iptelephony/voipplugins/sipconnectionprovider/ipvoicemailengine/group"/>
+</component>
+<component name="ipapputils" filter="s60" long-name="IP App Utils" introduced="^2">
+<unit bldFile="app/iptelephony/voipplugins/ipapputils/group"/>
+</component>
+<component name="voipadapters" filter="s60" long-name="VoIP Adapters" introduced="^2" plugin="Y">
+<unit bldFile="app/iptelephony/voipplugins/voipadapters/group"/>
+</component>
+<component name="accountcreationplugin" filter="s60" long-name="Account Creation Plugin" introduced="^2" plugin="Y">
+<unit bldFile="app/iptelephony/voipplugins/accountcreationplugin/group"/>
+</component>
+<component name="dhcppositionprovider" filter="s60" long-name="DHCP Position Provider" introduced="^2" plugin="Y">
+<unit bldFile="app/iptelephony/voipplugins/dhcppositionprovider/group"/>
+</component>
+<component name="svtmatching" filter="s60" long-name="SIP VoIP Telephony Matching" introduced="^2" plugin="Y">
+<unit bldFile="app/iptelephony/voipplugins/svtmatching/group"/>
+</component>
+<component name="svtlogging" filter="s60" long-name="SVT Logging" introduced="^2" plugin="Y">
+<unit bldFile="app/iptelephony/voipplugins/svtlogging/group"/>
+</component>
+<component name="svtcallmenu" filter="s60" long-name="SVT Call Menu" introduced="^2" plugin="Y">
+<unit bldFile="app/iptelephony/voipplugins/svtcallmenu/group"/>
+</component>
+<component name="sipimresolver" filter="s60" long-name="SIP IM Resolver" introduced="^3" plugin="Y">
+<unit bldFile="app/iptelephony/voipplugins/sipimresolver/group"/>
+</component>
+</collection>
+<collection name="callcontinuity" long-name="Call Continuity" level="util">
+<component name="vccutils" filter="s60" long-name="VCC Utils" introduced="^2">
+<unit bldFile="app/iptelephony/callcontinuity/vccutils/group"/>
+</component>
+<component name="nsmldmvccadapter" filter="s60" long-name="SyncML DM VCC Adapter" introduced="^2" plugin="Y">
+<unit bldFile="app/iptelephony/callcontinuity/nsmldmvccadapter/group"/>
+</component>
+<component name="vccclientprovisioningadapter" filter="s60" long-name="VCC Client Provisioning Adapter" introduced="^2" plugin="Y">
+<unit bldFile="app/iptelephony/callcontinuity/vccclientprovisioningadapter/group"/>
+</component>
+<component name="vccpropertyhandler" filter="s60" long-name="VCC Property Handler" introduced="^2">
+<unit bldFile="app/iptelephony/callcontinuity/vccpropertyhandler/group"/>
+</component>
+<component name="vcchotrigger" filter="s60" long-name="VCC HO Trigger" introduced="^2">
+<unit bldFile="app/iptelephony/callcontinuity/vcchotrigger/group"/>
+</component>
+<component name="vcc" filter="s60" long-name="VoIP Call Continuity" introduced="^2" plugin="Y">
+<unit bldFile="app/iptelephony/callcontinuity/vcc/group"/>
+</component>
+<component name="callcontinuity_build" filter="s60" long-name="Call Continuity Build" introduced="^2">
+<!-- consider distributing this into the above components -->
+<unit bldFile="app/iptelephony/callcontinuity/group"/>
+</component>
+</collection>
+</block>
+<block name="settingsuis" level="services" long-name="Settings UIs" levels="rsc ui">
+<collection name="devmngt_plat" long-name="Settings UIs Platform Interfaces" level="ui">
+<component name="default_app_client_api" long-name="Default App Client API" introduced="^1" filter="s60" class="api">
+<unit bldFile="app/settingsuis/devmngt_plat/default_app_client_api/group"/>
+</component>
+<component name="services_db_api" long-name="Services DB API" introduced="^1" filter="s60" class="api">
+<unit bldFile="app/settingsuis/devmngt_plat/services_db_api/group" filter="!test"/>
+</component>
+</collection>
+<collection name="defaultapplicationsettings" long-name="Default Application Settings" level="rsc">
+<component name="services_db" filter="s60" long-name="Services Database" introduced="^1">
+<unit bldFile="app/settingsuis/defaultapplicationsettings/services_db/group"/>
+</component>
+<component name="defaultapplicationsettings_server" filter="s60" long-name="Default Application Server" introduced="^1">
+<unit bldFile="app/settingsuis/defaultapplicationsettings/server/group"/>
+</component>
+<component name="service" filter="s60" long-name="Default Application Service" introduced="^1">
+<unit bldFile="app/settingsuis/defaultapplicationsettings/service/group"/>
+</component>
+<component name="dasgsplugin" filter="s60" long-name="Default Application Settings GS Plugin" introduced="^1" plugin="Y">
+<unit bldFile="app/settingsuis/defaultapplicationsettings/gsplugin/group"/>
+</component>
+<component name="defaultapplicationsettings_build" filter="s60" long-name="Default Application Settings Build" introduced="^1">
+<!-- split the IBYs up into the appropriate components? Make this a ROM component? -->
+<unit bldFile="app/settingsuis/defaultapplicationsettings/group"/>
+</component>
+</collection>
+<collection name="systemswuis" long-name="System SW UIs" level="ui">
+<component name="touchscreencalib" filter="s60" long-name="Touchscreen Calibration" introduced="^1">
+<unit bldFile="app/settingsuis/systemswuis/touchscreencalib/group"/>
+</component>
+</collection>
+</block>
+<block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin app">
+<collection name="contentctrl_plat" long-name="Content Control Daemons Platforn Interfaces" level="app">
+<component name="oma_ds_presync_plugin_api" long-name="OMA DS PreSync Plugin API" filter="s60" class="api">
+<unit bldFile="app/contentcontrol/contentctrl_plat/oma_ds_presync_plugin_api/group"/>
+</component>
+<component name="ds_agenda_handler_plugin_api" long-name="DS Agenda Handler Plugin API" filter="s60" class="api">
+<unit bldFile="app/contentcontrol/contentctrl_plat/ds_agenda_handler_plugin_api/group"/>
+</component>
+<component name="ds_folder_util_api" long-name="DS Folder Util API" filter="s60" class="api">
+<unit bldFile="app/contentcontrol/contentctrl_plat/ds_folder_util_api/group"/>
+</component>
+<component name="adapter_customization_api" long-name="Adapter Customization API" filter="s60" introduced="^3" class="api">
+<unit bldFile="app/contentcontrol/contentctrl_plat/adapter_customization_api/group"/>
+</component>
+<component name="ds_data_modification_api" long-name="DS Data Modification API" filter="s60" introduced="^3" class="api">
+<unit bldFile="app/contentcontrol/contentctrl_plat/ds_data_modification_api/group"/>
+</component>
+</collection>
+<collection name="dsdcmoadapter" long-name="Data Sync DCMO Adapter" level="plugin">
+<!-- Component at wrong rank, should move down a directory -->
+<component name="dsdcmoadapter_build" filter="s60" long-name="Data Sync Control DCMO Adapter">
+<unit bldFile="app/contentcontrol/dsdcmoadapter/group"/>
+</component>
+</collection>
+<collection name="omads" long-name="OMA Data Sync" level="app">
+<component name="omadsappui" filter="s60" long-name="OMA DS Application UI">
+<unit bldFile="app/contentcontrol/omads/omadsappui/group"/>
+</component>
+<component name="omadsextensions" filter="s60" long-name="OMA DS Extensions" plugin="Y">
+<unit bldFile="app/contentcontrol/omads/omadsextensions/group"/>
+</component>
+</collection>
+</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">
+<unit bldFile="app/devicecontrol/devicediagnostics/devdiagapp/group"/>
+</component>
+<component name="devdiaggsplugin" filter="s60" long-name="Device Diagnostics GS Plugin" plugin="Y">
+<unit bldFile="app/devicecontrol/devicediagnostics/devdiaggsplugin/group"/>
+</component>
+<component name="diagplugins" filter="s60" long-name="Diagnostics Plugins" plugin="Y">
+<unit bldFile="app/devicecontrol/devicediagnostics/diagplugins/group"/>
+</component>
+<component name="diagsuites" filter="s60" long-name="Diagnostics Suites" plugin="Y">
+<unit bldFile="app/devicecontrol/devicediagnostics/diagsuites/group"/>
+</component>
+<component name="devicediagnostics_build" filter="s60" long-name="Device Diagnostics Build">
+<!-- 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">
+<unit bldFile="app/devicecontrol/omadm/omadmappui/group"/>
+</component>
+<component name="omadmextensions" filter="s60" long-name="OMA DM Extensions" 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">
+<unit bldFile="app/devicecontrol/omadm/dcmo/group"/>
+</component>
+</collection>
+<collection name="pnpmobileservices" long-name="PnP Mobile Services" level="mid">
+<component name="pnpms" filter="s60" long-name="PnP MS">
+<unit bldFile="app/devicecontrol/pnpmobileservices/pnpms/group"/>
+</component>
+</collection>
+<collection name="applicationmanagement" long-name="Application Management" level="app">
+<!-- could this collection be collapsed into a single component and moved down a dir? Do all these need to be noted separately? -->
+<component name="applicationmanagement_options" filter="s60" long-name="AM Install Options">
+<unit bldFile="app/devicecontrol/applicationmanagement/options/group"/>
+</component>
+<component name="applicationmanagement_client" filter="s60" long-name="AM Client">
+<unit bldFile="app/devicecontrol/applicationmanagement/client/group"/>
+</component>
+<component name="applicationmanagement_server" filter="s60" long-name="AM Server">
+<unit bldFile="app/devicecontrol/applicationmanagement/server/group"/>
+</component>
+<component name="rfsplugin" filter="s60" long-name="AM RFS Plugin" plugin="Y">
+<unit bldFile="app/devicecontrol/applicationmanagement/rfsplugin/group"/>
+</component>
+<component name="amadapter2" filter="s60" long-name="AM Adapter" plugin="Y">
+<unit bldFile="app/devicecontrol/applicationmanagement/amadapter2/group"/>
+</component>
+<component name="omascomoadapter" filter="s60" long-name="OMA SCOMO Adapter" introduced="^3" plugin="Y">
+<unit bldFile="app/devicecontrol/applicationmanagement/omascomoadapter/group"/>
+</component>
+<component name="applicationmanagement_build" filter="s60" long-name="AM Build">
+<!-- If thes aren't collapsed into one cmp, can all #includes removed from here, and it renamed AM ROM? -->
+<unit bldFile="app/devicecontrol/applicationmanagement/group"/>
+</component>
+</collection>
+<collection name="customization" long-name="DM Customization Adapters" level="mid">
+<component name="dmutils" long-name="DM Utils" filter="s60">
+<unit bldFile="app/devicecontrol/customization/dmutils/bld"/>
+</component>
+<component name="uisettingssrv" filter="s60" long-name="UI Settings Server">
+<unit bldFile="app/devicecontrol/customization/uisettingssrv/bld"/>
+</component>
+<component name="supadapter" filter="s60" long-name="Startup Adapter" plugin="Y">
+<unit bldFile="app/devicecontrol/customization/supadapter/bld"/>
+</component>
+<component name="wallpaperadapter" filter="s60" long-name="Wallpaper Adapter" plugin="Y">
+<unit bldFile="app/devicecontrol/customization/wallpaperadapter/bld"/>
+</component>
+<component name="operatorlogoadapter" filter="s60" long-name="Operator Logo Adapter" plugin="Y">
+<unit bldFile="app/devicecontrol/customization/operatorlogoadapter/bld"/>
+</component>
+<component name="screensaveradapter" filter="s60" long-name="Screen Saver Adapter" plugin="Y">
+<unit bldFile="app/devicecontrol/customization/screensaveradapter/bld"/>
+</component>
+<component name="themesadapter" filter="s60" long-name="Themes Adapter" plugin="Y">
+<unit bldFile="app/devicecontrol/customization/themesadapter/bld"/>
+</component>
+<component name="embeddedlinkadapter" filter="s60" long-name="Embedded Link Adapter" plugin="Y">
+<unit bldFile="app/devicecontrol/customization/embeddedlinkadapter/bld"/>
+</component>
+<component name="customization_build" filter="s60" long-name="DM Customization Build">
+<!-- If thes aren't collapsed into one cmp, can all #includes removed from here, and it renamed DM Customization ROM? -->
+<unit bldFile="app/devicecontrol/customization/group"/>
+</component>
+</collection>
+<collection name="omacp" long-name="OMA Content Provisioning" level="oma">
+<component name="omacpadapters" filter="s60" long-name="OMA CP Adapters" plugin="Y">
+<unit bldFile="app/devicecontrol/omacp/omacpadapters/group"/>
+</component>
+</collection>
+</block>
+<block name="printing" level="services" long-name="Printing" levels="app">
+<collection name="DirectPrint" level="app">
+<component name="DirectPrintApp" filter="sf_build" long-name="DirectPrint App" introduced="^3">
+<unit bldFile="app/printing/DirectPrint/DirectPrintApp/group"/>
+</component>
+<component name="DirectPrintServer" filter="sf_build" long-name="DirectPrint Server" introduced="^3">
+<unit bldFile="app/printing/DirectPrint/DirectPrintServer/group"/>
+</component>
+<component name="DirectPrintClient" filter="sf_build" long-name="DirectPrint Client" introduced="^3">
+<unit bldFile="app/printing/DirectPrint/DirectPrintClient/group"/>
+</component>
+</collection>
+<collection name="imageprint" long-name="ImagePrint" level="app">
+<component name="clog" filter="s60" long-name="ImagePrint Logging" introduced="^2">
+<unit bldFile="app/printing/imageprint/clog/group"/>
+</component>
+<component name="imageprintengine" filter="s60" long-name="ImagePrint Engine" introduced="^2">
+<unit bldFile="app/printing/imageprint/imageprintengine/group"/>
+</component>
+<component name="imageprintui" filter="s60" long-name="ImagePrint UI" introduced="^2">
+<unit bldFile="app/printing/imageprint/imageprintui/group"/>
+</component>
+<component name="imageprint_build" filter="s60" long-name="ImagePrint Build" introduced="^2">
+<!-- Need to break the IBY includes into the other components, or remove #includes and make this a ROM component -->
+<unit bldFile="app/printing/imageprint/group"/>
+</component>
+</collection>
+</block>
+<block name="files" level="apps" long-name="File Manager Apps" levels="support apps">
+<collection name="files_plat" long-name="File Manager Apps Platform Interfaces" level="apps">
+<component name="memory_scan_popup_ui_api" long-name="Memory Scan Popup UI API" filter="s60" class="api">
+<unit bldFile="app/files/files_plat/memory_scan_popup_ui_api/group"/>
+</component>
+</collection>
+<collection name="deviceencryption" long-name="Device Encryption" level="support">
+<!-- this is either needs to be broken up into idependent bld.infs, or it's really a component and should move down a directory -->
+<component name="devencnotifplugin" filter="s60" long-name="Device Encryption Notifier Plugin" introduced="^3" plugin="Y">
+<unit bldFile="app/files/deviceencryption/devencnotifplugin/group"/>
+</component>
+<component name="devencui" filter="s60" long-name="Device Encryption UI" introduced="^3">
+<unit bldFile="app/files/deviceencryption/devencui/group"/>
+</component>
+<component name="devencdmadapter" filter="s60" long-name="Device Encryption DM Adapter" introduced="^3" plugin="Y">
+<unit bldFile="app/files/deviceencryption/devencdmadapter/group"/>
+</component>
+<component name="devencgsplugin" filter="s60" long-name="Device Encryption GS Plugin" introduced="^3" plugin="Y">
+<unit bldFile="app/files/deviceencryption/devencgsplugin/group"/>
+</component>
+<component name="deviceencryption_help" filter="s60" long-name="Device Encryption Help" introduced="^3">
+<unit bldFile="app/files/deviceencryption/help/group"/>
+</component>
+<component name="deviceencryption_build" filter="s60" long-name="Device Encryption Build" introduced="^3">
+<unit bldFile="app/files/deviceencryption/group"/>
+</component>
+</collection>
+<collection name="filemanager" long-name="File Manager" level="apps">
+<!-- this is really a component, should move down a directory -->
+<component name="filemanager_build" filter="s60" long-name="File Manager Build">
+<unit bldFile="app/files/filemanager/group"/>
+</component>
+</collection>
+<collection name="filesystemuis" long-name="File System UIs" level="support">
+<component name="memscaneng" filter="s60" long-name="Memory Scan Server">
+<unit bldFile="app/files/filesystemuis/memscaneng/group"/>
+</component>
+<component name="memstatepopup" filter="s60" long-name="Memory State Popup">
+<unit bldFile="app/files/filesystemuis/memstatepopup/group"/>
+</component>
+</collection>
+</block>
+<block name="utils" level="apps" long-name="Utility Apps" levels="app">
+<collection name="extras" long-name="Extras" level="app">
+<component name="about" filter="s60" long-name="About Application">
+<unit bldFile="app/utils/extras/about/group"/>
+</component>
+<component name="calcsoft" filter="s60" long-name="Calculator Application">
+<unit bldFile="app/utils/extras/calcsoft/group"/>
+</component>
+</collection>
+</block>
+<block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
+<collection name="contacts_pub" long-name="Contacts Apps Public Interfaces" level="ui">
+<component name="phonebook_fetch_ui_api" long-name="Phonebook Fetch UI API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_pub/phonebook_fetch_ui_api/group"/>
+</component>
+<component name="phonebook_data_management_api" long-name="Phonebook Data Management API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_pub/phonebook_data_management_api/group"/>
+</component>
+<component name="phonebook_vcard_importexport_api" long-name="Phonebook vCard Import/Export API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_pub/phonebook_vcard_importexport_api/group"/>
+</component>
+<component name="phonebook_data_addedit_ui_api" long-name="Phonebook Data Add/Edit UI API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_pub/phonebook_data_addedit_ui_api/group"/>
+</component>
+<component name="phonebook_ui_utilities_api" long-name="Phonebook UI Utilities API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_pub/phonebook_ui_utilities_api/group"/>
+</component>
+<component name="phonebook_thumbnail_operation_api" long-name="Phonebook Thumbnail Operation API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_pub/phonebook_thumbnail_operation_api/group"/>
+</component>
+<component name="speed_dial_utility_control_api" long-name="Speed Dial Utility Control API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_pub/speed_dial_utility_control_api/group"/>
+</component>
+</collection>
+<collection name="contacts_plat" long-name="Contacts Apps Platform Interfaces" level="ui">
+<component name="virtual_phonebook_store_api" long-name="Virtual Phonebook Store API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_store_api/group"/>
+</component>
+<component name="virtual_phonebook_sim_services_api" long-name="Virtual Phonebook SIM Services API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_sim_services_api/group"/>
+</component>
+<component name="virtual_phonebook_configuration_api" long-name="Virtual Phonebook Configuration API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_configuration_api/group"/>
+</component>
+<component name="virtual_phonebook_copy_policy_api" long-name="Virtual Phonebook Copy Policy API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_copy_policy_api/group"/>
+</component>
+<component name="virtual_phonebook_policy_api" long-name="Virtual Phonebook Policy API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_policy_api/group"/>
+</component>
+<component name="virtual_phonebook_engine_api" long-name="Virtual Phonebook Engine API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_engine_api/group"/>
+</component>
+<component name="virtual_phonebook_migration_support_api" long-name="Virtual Phonebook Migration Support API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_migration_support_api/group"/>
+</component>
+<component name="virtual_phonebook_view_definition_api" long-name="Virtual Phonebook View Definition API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_view_definition_api/group"/>
+</component>
+<component name="virtual_phonebook_vcard_api" long-name="Virtual Phonebook vCard API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_vcard_api/group"/>
+</component>
+<component name="cms_contactor_api" long-name="CMS Contactor API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/cms_contactor_api/group"/>
+</component>
+<component name="contactpresence_api" long-name="Contact Presence API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/contactpresence_api/group"/>
+</component>
+<component name="presence_cache_api" long-name="Presence Cache API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/presence_cache_api/group"/>
+</component>
+<component name="phonebook_internal_common_api" long-name="Phonebook Internal Common API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/phonebook_internal_common_api/group"/>
+</component>
+<component name="phonebook_internal_appfw_api" long-name="Phonebook Internal App Framework API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/phonebook_internal_appfw_api/group"/>
+</component>
+<component name="phonebook_internal_data_management_api" long-name="Phonebook Internal Data Management API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/phonebook_internal_data_management_api/group"/>
+</component>
+<component name="phonebook_2_xsp_extension_manager_api" long-name="Phonebook 2 xSP Extension Manager API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/phonebook_2_xsp_extension_manager_api/group"/>
+</component>
+<component name="phonebook_ui_controls_api" long-name="Phonebook UI Controls API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/phonebook_ui_controls_api/group"/>
+</component>
+<component name="phonebook_2_image_management_api" long-name="Phonebook 2 Image Management API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/phonebook_2_image_management_api/group"/>
+</component>
+<component name="phonebook_extension_api" long-name="Phonebook Extension API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/phonebook_extension_api/group"/>
+</component>
+<component name="phonebook_public_constants_api" long-name="Phonebook Public Constants API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/phonebook_public_constants_api/group"/>
+</component>
+<component name="phonebook_internal_ui_utilities_api" long-name="Phonebook Internal UI Utilities API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/phonebook_internal_ui_utilities_api/group"/>
+</component>
+<component name="logs_engine_api_extensions" long-name="Logs Engine API Extensions" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/logs_engine_api_extensions/group"/>
+</component>
+<component name="phonebook_thumbnails_api" long-name="Phonebook Thumbnails API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/phonebook_thumbnails_api/group"/>
+</component>
+<component name="phonebook_2_icon_api" long-name="Phonebook 2 Icon API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/phonebook_2_icon_api/group"/>
+</component>
+<component name="phonebook_engine_extension_api" long-name="Phonebook Engine Extension API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/phonebook_engine_extension_api/group"/>
+</component>
+<component name="phonebook_2_store_configuration_management_api" long-name="Phonebook 2 Store Configuration Management API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/phonebook_2_store_configuration_management_api/group"/>
+</component>
+<component name="logs_ui_command_line_api" long-name="Logs UI Command Line API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/logs_ui_command_line_api/group"/>
+</component>
+<component name="speed_dial_dialogs_api" long-name="Speed Dial Dialogs API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/speed_dial_dialogs_api/group"/>
+</component>
+<component name="phonebook_2_xsp_view_activation_api" long-name="Phonebook 2 xSP View Activation API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/phonebook_2_xsp_view_activation_api/group"/>
+</component>
+<component name="logs_timers_api" long-name="Logs Timers API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/logs_timers_api/group"/>
+</component>
+<component name="phonebook_2_ui_extension_definition_api" long-name="Phonebook 2 UI Extension Definition API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_definition_api/group"/>
+</component>
+<component name="phonebook_2_common_ui_api" long-name="Phonebook 2 Common UI API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/phonebook_2_common_ui_api/group"/>
+</component>
+<component name="phonebook_2_ui_extension_api" long-name="Phonebook 2 UI Extension API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_api/group"/>
+</component>
+<component name="phonebook_2_store_property_api" long-name="Phonebook 2 Store Property API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/phonebook_2_store_property_api/group"/>
+</component>
+<component name="phonebook_2_ui_extension_plugin_api" long-name="Phonebook 2 UI Extension Plug-In API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_plugin_api/group"/>
+</component>
+<component name="phonebook_2_ui_controls_api" long-name="Phonebook 2 UI Controls API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_controls_api/group"/>
+</component>
+<component name="phonebook_2_thin_ui_extension_plugin_api" long-name="Phonebook 2 Thin UI Extension Plugin API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/phonebook_2_thin_ui_extension_plugin_api/group"/>
+</component>
+<component name="phonebook_2_commands_api" long-name="Phonebook 2 Commands API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/phonebook_2_commands_api/group"/>
+</component>
+<component name="phonebook_2_presentation_api" long-name="Phonebook 2 Presentation API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/phonebook_2_presentation_api/group"/>
+</component>
+<component name="phonebook_2_ui_utilities_api" long-name="Phonebook 2 UI Utilities API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_utilities_api/group"/>
+</component>
+<component name="cca_launch_api" long-name="CCA Launch API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/cca_launch_api/group"/>
+</component>
+<component name="cca_view_plugin_api" long-name="CCA View Plugin API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/cca_view_plugin_api/group"/>
+</component>
+<component name="predictivesearch_client_api" long-name="Predictive Search Client API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/predictivesearch_client_api/group"/>
+</component>
+<component name="predictivesearch_utils_api" long-name="Predictive Search Utils API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/predictivesearch_utils_api/group"/>
+</component>
+<component name="predictivesearch_adapters_api" long-name="Predictive Search Adapters API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/predictivesearch_adapters_api/group"/>
+</component>
+<component name="predictivesearch_algorithm_api" long-name="Predictive Search Algorithm API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/predictivesearch_algorithm_api/group"/>
+</component>
+<component name="phonebook_2_rcl_api" long-name="Phonebook 2 RCL API" filter="s60" class="api">
+<unit bldFile="app/contacts/contacts_plat/phonebook_2_rcl_api/group"/>
+</component>
+</collection>
+<collection name="contactextensions" long-name="Contacts Extensions" level="services">
+<component name="predefinedcontacts" filter="s60" long-name="Predefined Contacts">
+<unit bldFile="app/contacts/contactextensions/predefinedcontacts/group"/>
+</component>
+</collection>
+<collection name="logsui" long-name="Logs UI" level="ui">
+<component name="logsui_build" filter="s60" long-name="Logs UI Build">
+<!-- component at too high a rank, should move down one directory -->
+<unit bldFile="app/contacts/logsui/group"/>
+</component>
+</collection>
+<collection name="phonebookui" long-name="Phonebook UI" level="ui">
+<component name="phonebook" filter="s60" long-name="Phonebook">
+<unit bldFile="app/contacts/phonebookui/phonebook/group"/>
+</component>
+<component name="speeddial" filter="s60" long-name="Speed Dial">
+<unit bldFile="app/contacts/phonebookui/speeddial/group"/>
+</component>
+<component name="phonebook2" filter="s60" long-name="Phone Book 2">
+<unit bldFile="app/contacts/phonebookui/phonebook2/group"/>
+</component>
+</collection>
+<collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
+<component name="cntfindplugin" filter="s60" long-name="Contacts Find Plugin" introduced="^2" plugin="Y">
+<unit bldFile="app/contacts/phonebookengines/cntfindplugin/group"/>
+</component>
+<component name="cntsortplugin" filter="s60" long-name="Contacts Sort Plugin" introduced="^2" plugin="Y">
+<unit bldFile="app/contacts/phonebookengines/cntsortplugin/group"/>
+</component>
+<component name="virtualphonebook" filter="s60" long-name="Virtual Phonebook" introduced="^2">
+<unit bldFile="app/contacts/phonebookengines/virtualphonebook/group"/>
+</component>
+<component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
+<unit bldFile="app/contacts/phonebookengines/contactsmodel/groupsql" mrp="app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
+</component>
+</collection>
+<collection name="pimprotocols" long-name="PIM Protocols" level="services">
+<component name="phonebooksync" long-name="Phonebook Sync" purpose="optional" plugin="Y">
+<unit bldFile="app/contacts/pimprotocols/phonebooksync/group" mrp="app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
+</component>
+<component name="pbap" long-name="Bluetooth PBAP" introduced="9.2" purpose="optional">
+<unit bldFile="app/contacts/pimprotocols/pbap/group" mrp="app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
+</component>
+</collection>
+<collection name="ccservices" long-name="Contacts Centric Services" level="services">
+<component name="cmsservices" filter="s60" long-name="Contact Method Selector Services" introduced="^2">
+<unit bldFile="app/contacts/ccservices/cmsservices/group"/>
+</component>
+</collection>
+<collection name="presencecache" long-name="Presence Cache" level="support">
+<component name="presencecacheutils" filter="s60" long-name="Presence Cache Utils" introduced="^2" class="placeholder">
+<!-- <unit bldFile="presencecache/presencecacheutils/group"/> -->
+</component>
+<component name="presencecacheserver2" filter="s60" long-name="Presence Cache Server" introduced="^2" class="placeholder">
+<!-- <unit bldFile="presencecache/presencecacheserver2/group"/> -->
+</component>
+<component name="presencecacheclient2" filter="s60" long-name="Presence Cache Client" introduced="^2" class="placeholder">
+<!-- <unit bldFile="presencecache/presencecacheclient2/group"/> -->
+</component>
+<component name="presencecache_build" filter="s60" long-name="Presence Cache Build" introduced="^2">
+<!-- should divide this bld.inf into the other components, or collapse them into a single component -->
+<unit bldFile="app/contacts/presencecache/group"/>
+</component>
+</collection>
+<collection name="predictivesearch" long-name="Predictive Search" level="support">
+<component name="pcsutils" filter="s60" long-name="PCS Utils" introduced="^2">
+<unit bldFile="app/contacts/predictivesearch/pcsutils/group"/>
+</component>
+<component name="pcsserverclientapi" filter="s60" long-name="PCS Server Client API" introduced="^2">
+<unit bldFile="app/contacts/predictivesearch/pcsserverclientapi/group"/>
+</component>
+<component name="pcsserver" filter="s60" long-name="PCS Server" introduced="^2">
+<unit bldFile="app/contacts/predictivesearch/pcsserver/group"/>
+</component>
+<component name="pcsadapters" filter="s60" long-name="PCS Adapters" introduced="^2" plugin="Y">
+<unit bldFile="app/contacts/predictivesearch/adapters/contacts/group"/>
+</component>
+<component name="pcsalgorithm" filter="s60" long-name="PCS Algorithm" introduced="^2" plugin="Y">
+<unit bldFile="app/contacts/predictivesearch/pcsalgorithm/group"/>
+</component>
+<component name="predictivesearch_build" filter="s60" long-name="Predictive Search Build" introduced="^2">
+<!-- need to remove #includes from bld.inf and rename as Predictive Search ROM -->
+<unit bldFile="app/contacts/predictivesearch/group"/>
+</component>
+</collection>
+<collection name="contacts_info" long-name="Contacts Apps Info" level="ui">
+<component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="organizer" level="apps" span="2" long-name="Organizer Application Suite" levels="support services engine ui app">
+<collection name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" level="app">
+<component name="meeting_request_mailbox_utilities_api" long-name="Meeting Request Mailbox Utilities API" filter="s60" class="api">
+<unit bldFile="app/organizer/organizer_plat/meeting_request_mailbox_utilities_api/group"/>
+</component>
+<component name="meeting_request_uids_api" long-name="Meeting Request UIDs API" filter="s60" class="api">
+<unit bldFile="app/organizer/organizer_plat/meeting_request_uids_api/group"/>
+</component>
+<component name="calendar_exporter_api" long-name="Calendar Exporter API" filter="s60" class="api">
+<unit bldFile="app/organizer/organizer_plat/calendar_exporter_api/group"/>
+</component>
+<component name="agenda_versit_2_api" long-name="Agenda Versit 2 API" filter="s60" class="api">
+<unit bldFile="app/organizer/organizer_plat/agenda_versit_2_api/group"/>
+</component>
+<component name="calendar_importer_api" long-name="Calendar Importer API" filter="s60" class="api">
+<unit bldFile="app/organizer/organizer_plat/calendar_importer_api/group"/>
+</component>
+<component name="calendar_launcher_api" long-name="Calendar Launcher API" filter="s60" class="api">
+<unit bldFile="app/organizer/organizer_plat/calendar_launcher_api/group"/>
+</component>
+<component name="calendar_common_utils_api" long-name="Calendar Common Utils API" filter="s60" class="api">
+<unit bldFile="app/organizer/organizer_plat/calendar_common_utils_api/group"/>
+</component>
+<component name="searchfw_launcher_api" long-name="Search Framework Launcher API" filter="s60" class="api">
+<unit bldFile="app/organizer/organizer_plat/searchfw_launcher_api/group"/>
+</component>
+<component name="alarm_const_api" long-name="Alarm Const API" filter="s60" class="api">
+<unit bldFile="app/organizer/organizer_plat/alarm_const_api/group"/>
+</component>
+<component name="alarm_ui_external_control_api" long-name="Alarm UI External Control API" filter="s60" class="api">
+<unit bldFile="app/organizer/organizer_plat/alarm_ui_external_control_api/group"/>
+</component>
+<component name="calendar_settings_keys_api" long-name="Calendar Settings Keys API" filter="s60" class="api">
+<unit bldFile="app/organizer/organizer_plat/calendar_settings_keys_api/group"/>
+</component>
+<component name="calendar_tones_settings_keys_api" long-name="Calendar Tones Settings Keys API" filter="s60" class="api">
+<unit bldFile="app/organizer/organizer_plat/calendar_tones_settings_keys_api/group"/>
+</component>
+<component name="clock_settings_api" long-name="Clock Settings API" filter="s60" class="api">
+<unit bldFile="app/organizer/organizer_plat/clock_settings_api/group"/>
+</component>
+<component name="common_alarm_editor_api" long-name="Common Alarm Editor API" filter="s60" class="api">
+<unit bldFile="app/organizer/organizer_plat/common_alarm_editor_api/group"/>
+</component>
+<component name="alarm_ui_secondary_display_api" long-name="Alarm UI Secondary Display API" filter="s60" class="api">
+<unit bldFile="app/organizer/organizer_plat/alarm_ui_secondary_display_api/group"/>
+</component>
+<component name="searchui_launcher_api" long-name="Search UI Launcher API" filter="s60" class="api">
+<unit bldFile="app/organizer/organizer_plat/searchui_launcher_api/group"/>
+</component>
+<component name="agenda_entry_ui_api" long-name="Agenda Entry UI API" filter="s60" class="api">
+<unit bldFile="app/organizer/organizer_plat/agenda_entry_ui_api/group"/>
+</component>
+<component name="meeting_request_utillities_api" long-name="Meeting Request Utillities API" filter="s60" class="api">
+<unit bldFile="app/organizer/organizer_plat/meeting_request_utillities_api/group"/>
+</component>
+<component name="meeting_request_viewer_api" long-name="Meeting Request Viewer API" filter="s60" class="api">
+<unit bldFile="app/organizer/organizer_plat/meeting_request_viewer_api/group"/>
+</component>
+<component name="calendar_custamization_api" long-name="Calendar Customization API" filter="s60" class="api">
+<unit bldFile="app/organizer/organizer_plat/calendar_custamization_api/group"/>
+</component>
+</collection>
+<collection name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" level="app">
+<component name="calendar_interim_utils2_api" long-name="Calendar Interim Utils 2 API" filter="s60" class="api">
+<unit bldFile="app/organizer/organizer_pub/calendar_interim_utils2_api/group"/>
+</component>
+<component name="notepad_library_api" long-name="Notepad Library API" filter="s60" class="api">
+<unit bldFile="app/organizer/organizer_pub/notepad_library_api/group"/>
+</component>
+</collection>
+<collection name="alarmengines" long-name="Alarm Engines" level="engine">
+<component name="missedalarmstore" filter="s60" long-name="Missed Alarm Store">
+<unit bldFile="app/organizer/alarmengines/missedalarmstore/group"/>
+</component>
+</collection>
+<collection name="calendarengines" long-name="Calendar Engines" level="engine">
+<component name="versit2" filter="s60" long-name="Versit 2 iCal Parser" introduced="9.2">
+<unit bldFile="app/organizer/calendarengines/versit2/group"/>
+</component>
+<component name="agnversit2" filter="s60" long-name="Versit 2 Agenda Interface" introduced="9.2" plugin="Y">
+<unit bldFile="app/organizer/calendarengines/agnversit2/group"/>
+</component>
+<component name="caleninterimutils" filter="s60" long-name="Calendar Interim Utils" introduced="9.1">
+<unit bldFile="app/organizer/calendarengines/caleninterimutils/group"/>
+</component>
+<component name="calenimp" filter="s60" long-name="Calendar Import Wrapper" introduced="7.0s">
+<unit bldFile="app/organizer/calendarengines/calenimp/group"/>
+</component>
+<component name="calenlauncher" filter="s60" long-name="Calendar Launcher">
+<unit bldFile="app/organizer/calendarengines/calenlauncher/group"/>
+</component>
+<component name="caldavsrv" filter="sf_build" long-name="CalDAV Server" introduced="^3">
+<unit bldFile="app/organizer/calendarengines/caldav/group"/>
+</component>
+</collection>
+<collection name="meetingrequestengines" long-name="Meeting Request Engines" level="engine">
+<component name="mrmailbox" filter="s60" long-name="Meeting Request Mailbox">
+<unit bldFile="app/organizer/meetingrequestengines/mrmailbox/group"/>
+</component>
+<component name="mrmailboxutils" filter="s60" long-name="Meeting Request Mailbox Utils" plugin="Y">
+<unit bldFile="app/organizer/meetingrequestengines/mrmailboxutils/group"/>
+</component>
+</collection>
+<collection name="searchfw" long-name="Search Framework" level="services">
+<!-- Uncomment all units when configuration is in place. All currently #included from searchfw_build, which should be removed at the same time. -->
+<component name="coresearchfw" filter="s60" long-name="Core Search Framework" introduced="^1" class="placeholder">
+<!--<unit bldFile="searchfw/coresearchfw/group"/>-->
+</component>
+<component name="searchfw_plugins" filter="s60" long-name="Search Plugins" introduced="^1" plugin="Y" class="placeholder">
+<!--<unit bldFile="searchfw/plugins/group"/>-->
+</component>
+<component name="searchfw_build" filter="s60" long-name="Search Framework Build" introduced="^1">
+<unit bldFile="app/organizer/searchfw/group"/>
+</component>
+</collection>
+<collection name="alarmui" long-name="Alarm UI" level="app">
+<!-- collection is really a component, should move down a directory -->
+<component name="alarmui_build" filter="s60" long-name="Alarm UI Build">
+<unit bldFile="app/organizer/alarmui/group"/>
+</component>
+</collection>
+<collection name="calendarui" long-name="Calendar UI" level="ui">
+<component name="calendarui_help" filter="s60" long-name="Calendar UI Help">
+<unit bldFile="app/organizer/calendarui/help/group"/>
+</component>
+<component name="commonutils" filter="s60" long-name="Calendar Common Utils">
+<unit bldFile="app/organizer/calendarui/commonutils/group"/>
+</component>
+<component name="globaldata" filter="s60" long-name="Calendar Global Data">
+<unit bldFile="app/organizer/calendarui/globaldata/group"/>
+</component>
+<component name="settings" filter="s60" long-name="Calendar Settings">
+<!-- these should be merged into a single bld.inf or split into two components -->
+<unit bldFile="app/organizer/calendarui/settings/gsplugin/group"/>
+<unit bldFile="app/organizer/calendarui/settings/settingsui/group"/>
+</component>
+<component name="customisation" filter="s60" long-name="Calendar Customisation">
+<unit bldFile="app/organizer/calendarui/customisation/group"/>
+</component>
+<component name="customisationmanager" filter="s60" long-name="Calendar Customisation Manager">
+<unit bldFile="app/organizer/calendarui/customisationmanager/group"/>
+</component>
+<component name="multicaluidialog" filter="s60" long-name="Multi-Calendar UI Dialog" introduced="^3">
+<unit bldFile="app/organizer/calendarui/multicaluidialog/group"/>
+</component>
+<component name="views" filter="s60" long-name="Calendar Views">
+<unit bldFile="app/organizer/calendarui/views/group"/>
+</component>
+<component name="calendarui_controller" filter="s60" long-name="Calendar Controller">
+<unit bldFile="app/organizer/calendarui/controller/group"/>
+</component>
+<component name="calendarui_editors" filter="s60" long-name="Calendar Editors">
+<unit bldFile="app/organizer/calendarui/editors/group"/>
+</component>
+<component name="calendarui_application" filter="s60" long-name="Calendar Application">
+<unit bldFile="app/organizer/calendarui/application/group"/>
+</component>
+<component name="missedalarmindicatorplugin" filter="s60" long-name="Missed Alarm Indicator Plugin" plugin="Y">
+<unit bldFile="app/organizer/calendarui/missedalarmindicatorplugin/group"/>
+</component>
+<component name="calendarui_server" filter="s60" long-name="Calendar Server">
+<!-- these should be merged into a single bld.inf or split into two components -->
+<unit bldFile="app/organizer/calendarui/server/calensvr/group"/>
+<unit bldFile="app/organizer/calendarui/server/calensvrclient/group"/>
+</component>
+<component name="regionalplugins" filter="s60" long-name="Calendar Regional Plugins" plugin="Y">
+<!-- these should be merged into a single bld.inf or split into four components -->
+<unit bldFile="app/organizer/calendarui/regionalplugins/calenregionalutil/group"/>
+<unit bldFile="app/organizer/calendarui/regionalplugins/lunarchinese/group"/>
+<unit bldFile="app/organizer/calendarui/regionalplugins/lunarvietnamese/group"/>
+<unit bldFile="app/organizer/calendarui/regionalplugins/thai/group"/>
+</component>
+<component name="calenaiwprovider" filter="s60" long-name="Calendar AIW Proivder" introduced="^3" plugin="Y">
+<unit bldFile="app/organizer/calendarui/calenaiwprovider/group"/>
+</component>
+<component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y">
+<unit bldFile="app/organizer/calendarui/caldav/group"/>
+</component>
+<component name="calendarui_build" filter="s60" long-name="Calendar UI Build">
+<!-- split contents into separate components -->
+<unit bldFile="app/organizer/calendarui/group"/>
+</component>
+</collection>
+<collection name="meetingui" long-name="Meeting UI" level="ui">
+<component name="attendeeview" filter="s60" long-name="Attendee View">
+<unit bldFile="app/organizer/meetingui/attendeeview/group"/>
+</component>
+<component name="agnentryui" filter="s60" long-name="Agenda Entry UI" plugin="Y">
+<unit bldFile="app/organizer/meetingui/agnentryui/group"/>
+</component>
+<component name="meetingrequestutils" filter="s60" long-name="Meeting Request Utils">
+<unit bldFile="app/organizer/meetingui/meetingrequestutils/group"/>
+</component>
+<component name="meetingrequestviewers" filter="s60" long-name="Meeting Request Viewers" plugin="Y">
+<unit bldFile="app/organizer/meetingui/meetingrequestviewers/group"/>
+</component>
+<component name="meetingui_build" filter="s60" long-name="Meeting UI Build">
+<!-- split contents into separate components -->
+<unit bldFile="app/organizer/meetingui/group"/>
+</component>
+</collection>
+<collection name="clock2" long-name="Clock" level="app">
+<component name="clockengines" filter="s60" long-name="Clock Engines">
+<unit bldFile="app/organizer/clock2/clockengines/group"/>
+</component>
+<component name="clockui" filter="s60" long-name="Clock UI">
+<unit bldFile="app/organizer/clock2/clockui/group"/>
+</component>
+<component name="clock2_help" filter="s60" long-name="Clock Help">
+<unit bldFile="app/organizer/clock2/help/group"/>
+</component>
+<component name="clock2_build" filter="s60" long-name="Clock Build">
+<!-- split contents into separate components, or just make this one component -->
+<unit bldFile="app/organizer/clock2/group"/>
+</component>
+</collection>
+<collection name="notepad" long-name="Notepad" level="ui">
+<component name="notepad_help" filter="s60" long-name="Notepad Help">
+<unit bldFile="app/organizer/notepad/help/group"/>
+</component>
+<component name="notepad1" filter="s60" long-name="Notepad Application 1">
+<unit bldFile="app/organizer/notepad/notepad1/group"/>
+</component>
+<component name="txtrecog" filter="s60" long-name="Text Recognizer" plugin="Y">
+<unit bldFile="app/organizer/notepad/txtrecog/group"/>
+</component>
+</collection>
+<collection name="searchui" long-name="Search UI" level="app">
+<!-- consider making this a single component -->
+<!-- Uncomment all units when configuration is in place. All currently #included from searchui_build, which should be removed at the same time. -->
+<component name="searchui_help" filter="s60" long-name="Search UI Help" class="placeholder">
+<!--<unit bldFile="searchui/help/group"/>-->
+</component>
+<component name="searchapp" filter="s60" long-name="Search Application" class="placeholder">
+<!--<unit bldFile="searchui/searchapp/group"/>-->
+</component>
+<component name="searchui_build" filter="s60" long-name="Search UI Build">
+<unit bldFile="app/organizer/searchui/group"/>
+</component>
+</collection>
+<collection name="pimappservices" long-name="PIM Application Services" level="services">
+<component name="calendar" long-name="Calendar" introduced="9.2" purpose="optional">
+<unit bldFile="app/organizer/pimappservices/calendar/group" mrp="app/organizer/pimappservices/calendar/group/app-engines_calendar.mrp" version="2"/>
+</component>
+<component name="calendarvcalplugin" long-name="Calendar vCal Plugin" introduced="8.1" purpose="optional" plugin="Y">
+<unit bldFile="app/organizer/pimappservices/calendarvcalplugin/group" mrp="app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp" version="2"/>
+</component>
+<component name="appenginesdocs" long-name="Application Engines Documentation" purpose="development" class="doc">
+<unit mrp="app/organizer/pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
+</component>
+</collection>
+<collection name="pimappsupport" long-name="PIM Application Support" level="support">
+<component name="vcardandvcal" long-name="vCard and vCal" introduced="ER5" purpose="optional">
+<unit bldFile="app/organizer/pimappsupport/vcardandvcal/group" mrp="app/organizer/pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
+</component>
+<component name="chinesecalendarconverter" long-name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
+<unit bldFile="app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
+</component>
+<component name="chinesecalendaralg" long-name="Chinese Calendar Algorithm" introduced="^2" purpose="optional" plugin="Y">
+<unit bldFile="app/organizer/pimappsupport/chinesecalendaralg/group" mrp="app/organizer/pimappsupport/chinesecalendaralg/group/app-services_chinesecalendaralgorithm.mrp"/>
+</component>
+</collection>
+<collection name="organizer_info" long-name="Organizer Application Suite Info" level="app">
+<component name="organizer_metadata" long-name="Organizer Application Suite Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="mail eng base ui">
+<collection name="msg_pub" long-name="Messaging Apps Public APIs" level="ui">
+<component name="messaging_integration_api" long-name="Messaging Integration API" filter="s60" class="api">
+<unit bldFile="app/messaging/msg_pub/messaging_integration_api/group"/>
+</component>
+<component name="plugin_bio_control_api" long-name="Plug-in Bio Control API" filter="s60" class="api">
+<unit bldFile="app/messaging/msg_pub/plugin_bio_control_api/group"/>
+</component>
+<component name="mms_client_mtm_api" long-name="MMS Client MTM API" filter="s60" class="api">
+<unit bldFile="app/messaging/msg_pub/mms_client_mtm_api/group"/>
+</component>
+<component name="open_new_message_notification_api" long-name="Open New Message Notification API" filter="s60" class="api">
+<unit bldFile="app/messaging/msg_pub/open_new_message_notification_api/group"/>
+</component>
+<component name="messaging_editor_constants_api" long-name="Messaging Editor Constants API" filter="s60" class="api">
+<unit bldFile="app/messaging/msg_pub/messaging_editor_constants_api/group"/>
+</component>
+</collection>
+<collection name="msg_plat" long-name="Messaging Apps Platform APIs" level="ui">
+<component name="smil_player_launch_api" long-name="SMIL Player Launch API" filter="s60" class="api">
+<unit bldFile="app/messaging/msg_plat/smil_player_launch_api/group"/>
+</component>
+<component name="messaging_media_resolver_api" long-name="Messaging Media Resolver API" filter="s60" class="api">
+<unit bldFile="app/messaging/msg_plat/messaging_media_resolver_api/group"/>
+</component>
+<component name="smil_engine_api" long-name="SMIL Engine API" filter="s60" class="api">
+<unit bldFile="app/messaging/msg_plat/smil_engine_api/group"/>
+</component>
+<component name="mms_server_settings_api" long-name="MMS Server Settings API" filter="s60" class="api">
+<unit bldFile="app/messaging/msg_plat/mms_server_settings_api/group"/>
+</component>
+<component name="new_contacts_note_secondary_display_api" long-name="New Contacts Note Secondary Display API" filter="s60" class="api">
+<unit bldFile="app/messaging/msg_plat/new_contacts_note_secondary_display_api/group"/>
+</component>
+<component name="messaging_center_ui_utilities_api" long-name="Messaging Center UI Utilities API" filter="s60" class="api">
+<unit bldFile="app/messaging/msg_plat/messaging_center_ui_utilities_api/group"/>
+</component>
+<component name="internet_mail_mtm_ui_api" long-name="Internet Mail MTM UI API" filter="s60" class="api">
+<unit bldFile="app/messaging/msg_plat/internet_mail_mtm_ui_api/group"/>
+</component>
+<component name="messaging_editor_api" long-name="Messaging Editor API" filter="s60" class="api">
+<unit bldFile="app/messaging/msg_plat/messaging_editor_api/group"/>
+</component>
+<component name="email_domain_utilities_api" long-name="Email Domain Utilities API" filter="s60" class="api">
+<unit bldFile="app/messaging/msg_plat/email_domain_utilities_api/group"/>
+</component>
+<component name="smil_transition_api" long-name="SMIL Transition API" filter="s60" class="api">
+<unit bldFile="app/messaging/msg_plat/smil_transition_api/group"/>
+</component>
+<component name="new_contacts_note_status_api" long-name="New Contacts Note Status API" filter="s60" class="api">
+<unit bldFile="app/messaging/msg_plat/new_contacts_note_status_api/group"/>
+</component>
+<component name="unified_editor_video_conversion_api" long-name="Unified Editor Video Conversion API" filter="s60" class="api">
+<unit bldFile="app/messaging/msg_plat/unified_editor_video_conversion_api/group"/>
+</component>
+<component name="mms_conformance_api" long-name="MMS Conformance API" filter="s60" class="api">
+<unit bldFile="app/messaging/msg_plat/mms_conformance_api/group"/>
+</component>
+<component name="new_contacts_note_variables_api" long-name="New Contacts Note Variables API" filter="s60" class="api">
+<unit bldFile="app/messaging/msg_plat/new_contacts_note_variables_api/group"/>
+</component>
+<component name="new_message_notification_api" long-name="New Message Notification API" filter="s60" class="api">
+<unit bldFile="app/messaging/msg_plat/new_message_notification_api/group"/>
+</component>
+<component name="mms_application_api" long-name="MMS Application API" filter="s60" class="api">
+<unit bldFile="app/messaging/msg_plat/mms_application_api/group"/>
+</component>
+<component name="mms_engine_settings_api" long-name="MMS Engine Settings API" filter="s60" class="api">
+<unit bldFile="app/messaging/msg_plat/mms_engine_settings_api/group"/>
+</component>
+<component name="mms_codec_client_api" long-name="MMS Codec Client API" filter="s60" class="api">
+<unit bldFile="app/messaging/msg_plat/mms_codec_client_api/group"/>
+</component>
+<component name="send_ui_meeting_request_api" long-name="Send UI Meeting Request API" filter="s60" class="api">
+<unit bldFile="app/messaging/msg_plat/send_ui_meeting_request_api/group"/>
+</component>
+<component name="new_contact_notes_extended_api" long-name="New Contact Notes Extended API" filter="s60" class="api">
+<unit bldFile="app/messaging/msg_plat/new_contact_notes_extended_api/group"/>
+</component>
+<component name="mail_ui_constants_api" long-name="Mail UI Constants API" filter="s60" class="api">
+<unit bldFile="app/messaging/msg_plat/mail_ui_constants_api/group"/>
+</component>
+<component name="sim_dialog_launch_api" long-name="SIM Dialog Launch API" filter="s60" class="api">
+<unit bldFile="app/messaging/msg_plat/sim_dialog_launch_api/group"/>
+</component>
+</collection>
+<collection name="mobilemessaging" long-name="Mobile Messaging" level="ui">
+<component name="audiomsg" filter="s60" long-name="Audio Message">
+<unit bldFile="app/messaging/mobilemessaging/audiomsg/group"/>
+</component>
+<component name="msgmedia" filter="s60" long-name="Message Media">
+<unit bldFile="app/messaging/mobilemessaging/msgmedia/group"/>
+</component>
+<component name="unieditor" filter="s60" long-name="Unified Editor">
+<unit bldFile="app/messaging/mobilemessaging/unieditor/group"/>
+</component>
+<component name="mmsui" filter="s60" long-name="MMS UI">
+<unit bldFile="app/messaging/mobilemessaging/mmsui/group"/>
+</component>
+<component name="postcard" filter="s60" long-name="Postcard">
+<unit bldFile="app/messaging/mobilemessaging/postcard/group"/>
+</component>
+<component name="smilui" filter="s60" long-name="SMIL UI">
+<unit bldFile="app/messaging/mobilemessaging/smilui/group"/>
+</component>
+<component name="smum" filter="s60" long-name="SMS UI MTM and UI Data MTM" plugin="Y">
+<unit bldFile="app/messaging/mobilemessaging/smum/group"/>
+</component>
+<component name="smsui" filter="s60" long-name="SMS UI">
+<unit bldFile="app/messaging/mobilemessaging/smsui/group"/>
+</component>
+<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
+<unit bldFile="app/messaging/mobilemessaging/smsmtm/group" mrp="app/messaging/mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
+</component>
+</collection>
+<collection name="mmsengine" long-name="MMS Engine" level="eng">
+<component name="mmsconninit" filter="s60" long-name="MMS Connection Initiator" class="placeholder">
+<!-- <unit bldFile="mmsengine/mmsconninit/bld"/> -->
+</component>
+<component name="genutils" filter="s60" long-name="General Utils" class="placeholder">
+<!-- <unit bldFile="mmsengine/genutils/bld"/> -->
+</component>
+<component name="mmsserversettings" filter="s60" long-name="MMS Server Settings" class="placeholder">
+<!-- <unit bldFile="mmsengine/mmsserversettings/bld"/> -->
+</component>
+<component name="mmsmessage" filter="s60" long-name="MMS Message" class="placeholder">
+<!-- <unit bldFile="mmsengine/mmsmessage/bld"/> -->
+</component>
+<component name="mmshttptransport" filter="s60" long-name="MMS HTTP Transport" class="placeholder">
+<!-- <unit bldFile="mmsengine/mmshttptransport/bld"/> -->
+</component>
+<component name="mmscodec" filter="s60" long-name="MMS Codec" class="placeholder">
+<!-- <unit bldFile="mmsengine/mmscodec/bld"/> -->
+</component>
+<component name="mmsserver" filter="s60" long-name="MMS Server" class="placeholder">
+<!-- <unit bldFile="mmsengine/mmsserver/bld"/> -->
+</component>
+<component name="clientmtm" filter="s60" long-name="MMS Client MTM" plugin="Y" class="placeholder">
+<!-- <unit bldFile="mmsengine/clientmtm/bld"/> -->
+</component>
+<component name="mmswatcher" filter="s60" long-name="MMS Watcher" plugin="Y" class="placeholder">
+<!-- <unit bldFile="mmsengine/mmswatcher/bld"/> -->
+</component>
+<component name="mmspushhandler" filter="s60" long-name="MMS Push Handler" plugin="Y" class="placeholder">
+<!-- <unit bldFile="mmsengine/mmspushhandler/bld"/> -->
+</component>
+<component name="applicationadapter" filter="s60" long-name="MMS Application Adapter" class="placeholder">
+<!-- <unit bldFile="mmsengine/applicationadapter/bld"/> -->
+</component>
+<component name="mmscodecclient" filter="s60" long-name="MMS Codec Client" class="placeholder">
+<!-- <unit bldFile="mmsengine/mmscodecclient/bld"/> -->
+</component>
+<component name="mmssettings" long-name="MMS Settings" introduced="9.2" purpose="optional">
+<unit bldFile="app/messaging/mmsengine/mmssettings/group" mrp="app/messaging/mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
+</component>
+<component name="mmsconf" long-name="MMS Configuration" purpose="optional">
+<unit bldFile="app/messaging/mmsengine/mmsconf" mrp="app/messaging/mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
+</component>
+<component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
+<!-- this bld.inf should be broken up into the individual other components -->
+<unit bldFile="app/messaging/mmsengine/group"/>
+</component>
+</collection>
+<collection name="messagingappbase" long-name="Messaging App Base" level="base">
+<component name="msgavkon" filter="s60" long-name="Messaging Avkon UI">
+<unit bldFile="app/messaging/messagingappbase/msgavkon/group"/>
+</component>
+<component name="mce" filter="s60" long-name="Message Center Application">
+<unit bldFile="app/messaging/messagingappbase/mce/group"/>
+</component>
+<component name="mceextraitems" filter="s60" long-name="Message Center Extra Items">
+<unit bldFile="app/messaging/messagingappbase/mceextraitems/group"/>
+</component>
+<component name="mcesettings" filter="s60" long-name="Message Center Settings">
+<unit bldFile="app/messaging/messagingappbase/mcesettings/group"/>
+</component>
+<component name="msgerrorwatcher" filter="s60" long-name="Messaging Error Watcher" plugin="Y">
+<unit bldFile="app/messaging/messagingappbase/msgerrorwatcher/group"/>
+</component>
+<component name="ncnlist" filter="s60" long-name="New Contacts Note List">
+<unit bldFile="app/messaging/messagingappbase/ncnlist/group"/>
+</component>
+<component name="schemeplugin" filter="s60" long-name="Scheme Handler Plugin" plugin="Y">
+<unit bldFile="app/messaging/messagingappbase/schemeplugin/group"/>
+</component>
+<component name="sendui" filter="s60" long-name="Send UI" plugin="Y">
+<unit bldFile="app/messaging/messagingappbase/sendui/group"/>
+</component>
+<component name="smilengine" filter="s60" long-name="SMIL Engine">
+<unit bldFile="app/messaging/messagingappbase/smilengine/group"/>
+</component>
+<component name="bium" filter="s60" long-name="BIO UI MTM" plugin="Y">
+<unit bldFile="app/messaging/messagingappbase/bium/group"/>
+</component>
+<component name="smartmessaging" filter="s60" long-name="Smart Messaging">
+<unit bldFile="app/messaging/messagingappbase/smartmessaging/group"/>
+</component>
+<component name="msgeditor" filter="s60" long-name="Messaging Editor">
+<unit bldFile="app/messaging/messagingappbase/msgeditor/group"/>
+</component>
+<component name="smilparser" long-name="SMIL Parser" introduced="7.0s" purpose="optional">
+<unit bldFile="app/messaging/messagingappbase/smilparser/GROUP" mrp="app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
+</component>
+<component name="obexmtms" long-name="OBEX MTMs" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="app/messaging/messagingappbase/obexmtms/Group" mrp="app/messaging/messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
+</component>
+</collection>
+<collection name="email" long-name="Email" level="mail">
+<!-- use commonemail instead -->
+<component name="alwaysonlineemailplugin" filter="s60" long-name="Always Online Mail Plugin" deprecated="^3" plugin="Y">
+<unit bldFile="app/messaging/email/alwaysonlineemailplugin/group"/>
+</component>
+<component name="emailnotificationhandler" filter="s60" long-name="Email Notification Handler" deprecated="^3" plugin="Y">
+<unit bldFile="app/messaging/email/emailnotificationhandler/group"/>
+</component>
+<component name="imum" filter="s60" long-name="Internet Mail UI MTM" deprecated="^3" plugin="Y">
+<unit bldFile="app/messaging/email/imum/group"/>
+</component>
+<component name="mail" filter="s60" long-name="Mail Application" deprecated="^3">
+<unit bldFile="app/messaging/email/mail/group"/>
+</component>
+<component name="pop3andsmtpmtm" long-name="POP3 and SMTP MTM" purpose="optional" deprecated="^3" plugin="Y">
+<unit bldFile="app/messaging/email/pop3andsmtpmtm/group" mrp="app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
+</component>
+<component name="imap4mtm" long-name="IMAP4 MTM" introduced="9.2" purpose="optional" deprecated="^3" plugin="Y">
+<unit bldFile="app/messaging/email/imap4mtm/group" mrp="app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
+</component>
+</collection>
+<collection name="messaging_info" long-name="Messaging Apps Info" level="ui">
+<component name="messaging_metadata" long-name="Messaging Apps Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="commonemail" level="apps" span="2" long-name="Email Apps" levels="service support ui app">
+<collection name="email_pub" long-name="Email Apps Public Interfaces" level="app">
+<component name="email_widget_api" long-name="Email Widget API" filter="s60" class="api">
+<unit bldFile="app/commonemail/email_pub/email_widget_api/group"/>
+</component>
+</collection>
+<collection name="email_plat" long-name="Email Apps Platform Interfaces" level="app">
+<component name="email_client_api" long-name="Email Client API" filter="s60" class="api">
+<unit bldFile="app/commonemail/email_plat/email_client_api/group"/>
+</component>
+<component name="email_setup_plugin_api" long-name="Email Setup Plugin API" filter="s60" class="api">
+<unit bldFile="app/commonemail/email_plat/email_setup_plugin_api/group"/>
+</component>
+</collection>
+<collection name="emailservices" long-name="Email Services" level="service">
+<component name="emailframework" filter="s60" long-name="Email Framework" introduced="^2">
+<unit bldFile="app/commonemail/emailservices/emailframework/group"/>
+</component>
+<component name="emailclientapi" filter="s60" long-name="Email Client API" introduced="^2">
+<unit bldFile="app/commonemail/emailservices/emailclientapi/group"/>
+</component>
+<component name="emailserver" filter="s60" long-name="Email Server" introduced="^2">
+<unit bldFile="app/commonemail/emailservices/emailserver/group"/>
+</component>
+<component name="emailservermonitor" filter="s60" long-name="Email Server Monitor" introduced="^2">
+<unit bldFile="app/commonemail/emailservices/emailservermonitor/group"/>
+</component>
+<component name="psmruadapter" filter="s60" long-name="Predictive Search Most Recent Used Adapter" introduced="^2" plugin="Y">
+<unit bldFile="app/commonemail/emailservices/psmruadapter/group"/>
+</component>
+<component name="emailstore" filter="s60" long-name="Email Store" introduced="^2">
+<unit bldFile="app/commonemail/emailservices/emailstore/group"/>
+</component>
+<component name="emaildebug" filter="s60" long-name="Email Debug" introduced="^2" class="api">
+<unit bldFile="app/commonemail/emailservices/emaildebug/group"/>
+</component>
+<component name="emailinstallationinitiator" filter="s60" long-name="Email Installation Initiator" introduced="^2">
+<unit bldFile="app/commonemail/emailservices/emailinstallationinitiator/group"/>
+</component>
+</collection>
+<collection name="ipsservices" long-name="IMAP/POP/SMTP Services" level="service">
+<component name="ipssossettings" filter="s60" long-name="IPS SOS Settings" introduced="^2">
+<!-- SOS? Consider spelling it out since the abbreviation is ambiguous -->
+<unit bldFile="app/commonemail/ipsservices/ipssossettings/group"/>
+</component>
+<component name="ipssosplugin" filter="s60" long-name="IPS SOS Plugin" introduced="^2" plugin="Y">
+<unit bldFile="app/commonemail/ipsservices/ipssosplugin/group"/>
+</component>
+<component name="ipssosaoplugin" filter="s60" long-name="IPS SOS Always Online Plugin" introduced="^2" plugin="Y">
+<unit bldFile="app/commonemail/ipsservices/ipssosaoplugin/group"/>
+</component>
+<component name="ipsservices_build" filter="s60" long-name="IPS Services Build" introduced="^2">
+<unit bldFile="app/commonemail/ipsservices/group"/>
+<!-- can the exports be broken up into the other components or made a config component?-->
+</component>
+</collection>
+<collection name="emailcontacts" long-name="Email Contacts" level="support">
+<component name="contactactionservice" filter="s60" long-name="Contact Action Service" introduced="^2" plugin="Y">
+<unit bldFile="app/commonemail/emailcontacts/contactactionservice/group"/>
+</component>
+<component name="contactactionmenu" filter="s60" long-name="Contact Action Menu" introduced="^2" plugin="Y">
+<unit bldFile="app/commonemail/emailcontacts/contactactionmenu/group"/>
+</component>
+</collection>
+<collection name="meetingrequest" long-name="Meeting Request" level="ui">
+<component name="mrcommon" filter="s60" long-name="MR Common" introduced="^2">
+<unit bldFile="app/commonemail/meetingrequest/mrcommon/group"/>
+</component>
+<component name="mrdb" filter="s60" long-name="MR Database" introduced="^2">
+<unit bldFile="app/commonemail/meetingrequest/mrdb/group"/>
+</component>
+<component name="mrpolicy" filter="s60" long-name="MR Policy" introduced="^2">
+<unit bldFile="app/commonemail/meetingrequest/mrpolicy/group"/>
+</component>
+<component name="mrservices" filter="s60" long-name="MR Services" introduced="^2">
+<unit bldFile="app/commonemail/meetingrequest/mrservices/group"/>
+</component>
+<component name="mrgui" filter="s60" long-name="MR GUI" introduced="^2">
+<unit bldFile="app/commonemail/meetingrequest/mrgui/group"/>
+</component>
+<component name="mrentry" filter="s60" long-name="MR Entry" introduced="^2">
+<unit bldFile="app/commonemail/meetingrequest/mrentry/group"/>
+</component>
+<component name="mrtasks" filter="s60" long-name="MR Tasks" introduced="^2">
+<unit bldFile="app/commonemail/meetingrequest/mrtasks/group"/>
+</component>
+<component name="mrutils" filter="s60" long-name="MR Utils" introduced="^2">
+<unit bldFile="app/commonemail/meetingrequest/mrutils/group"/>
+</component>
+<component name="mrutilscalplugin" filter="s60" long-name="MR Utils Calendar Plugin" introduced="^2" plugin="Y">
+<unit bldFile="app/commonemail/meetingrequest/mrutilscalplugin/group"/>
+</component>
+<component name="mrviewer" filter="s60" long-name="MR Viewer" introduced="^2">
+<unit bldFile="app/commonemail/meetingrequest/mrviewer/group"/>
+</component>
+<component name="mrviewercalplugin" filter="s60" long-name="MR Viewer Calendar Plugin" introduced="^2">
+<unit bldFile="app/commonemail/meetingrequest/mrviewercalplugin/group"/>
+</component>
+<component name="mricalviewer" filter="s60" long-name="MR iCal Viewer" introduced="^2" plugin="Y">
+<unit bldFile="app/commonemail/meetingrequest/mricalviewer/group"/>
+</component>
+<component name="mrversit2" filter="s60" long-name="MR Versit2" introduced="^2">
+<unit bldFile="app/commonemail/meetingrequest/mrversit2/group"/>
+</component>
+<component name="mragnversit2" filter="s60" long-name="MR Agenda Versit2" introduced="^2">
+<unit bldFile="app/commonemail/meetingrequest/mragnversit2/group"/>
+</component>
+<component name="mrcasplugin" filter="s60" long-name="MR Contact Action Service Plugin" introduced="^2" plugin="Y">
+<unit bldFile="app/commonemail/meetingrequest/mrcasplugin/group"/>
+</component>
+<component name="mrurlparserplugin" filter="s60" long-name="MR URL Parser Plugin" introduced="^2" plugin="Y">
+<unit bldFile="app/commonemail/meetingrequest/mrurlparserplugin/group"/>
+</component>
+<component name="meetingrequest_build" filter="s60" long-name="MR Build" introduced="^2">
+<!-- can the exports be broken up into the other components ?
+ alternatively, move the exports into a RM Config component-->
+<unit bldFile="app/commonemail/meetingrequest/group"/>
+</component>
+</collection>
+<collection name="emailuis" long-name="Email UIs" level="app">
+<component name="emailui" filter="s60" long-name="Email UI" introduced="^2">
+<unit bldFile="app/commonemail/emailuis/emailui/group"/>
+</component>
+<component name="gsemailsettings" filter="s60" long-name="Email GS Settings" introduced="^2" plugin="Y">
+<unit bldFile="app/commonemail/emailuis/gsemailsettings/group"/>
+</component>
+<component name="uicomponents" filter="s60" long-name="Email UI Components" introduced="^2">
+<unit bldFile="app/commonemail/emailuis/uicomponents/group"/>
+</component>
+<component name="widget" filter="s60" long-name="Email Widget" introduced="^2">
+<!-- Uncomment unit when configuration is in place. Currently #included from emailuis_build, which should be removed at the same time. -->
+<!--<unit bldFile="emailuis/widget/group"/>-->
+</component>
+<component name="emailuis_build" filter="s60" long-name="Email UIs Build" introduced="^2">
+<unit bldFile="app/commonemail/emailuis/group"/>
+</component>
+</collection>
+<collection name="commonemail_info" long-name="Email Apps Info" level="app">
+<component name="emailhelp" filter="s60" long-name="Email Help" class="placeholder">
+<!-- should this be commented out or not? -->
+<!-- <unit bldFile="emailhelp/group"/> -->
+</component>
+<component name="commonemail_help" filter="s60" long-name="Email Help" introduced="^2" class="placeholder">
+<!-- should this be commented out or not? -->
+<!-- <unit bldFile="help/group"/> -->
+</component>
+</collection>
+</block>
+<block name="conversations" level="apps" long-name="Conversation Apps" levels="settings utils plugin ui">
+<collection name="conversations_plat" long-name="Conversation Apps Platform Interfaces" level="ui">
+<component name="im_cv_launcher_api" long-name="IM CV Launcher API" filter="s60" class="api">
+<unit bldFile="app/conversations/conversations_plat/im_cv_launcher_api/group"/>
+</component>
+<component name="im_connection_api" long-name="IM Connection API" filter="s60" class="api">
+<unit bldFile="app/conversations/conversations_plat/im_connection_api/group"/>
+</component>
+<component name="im_cv_appui_api" long-name="IM CV App UI API" filter="s60" class="api">
+<unit bldFile="app/conversations/conversations_plat/im_cv_appui_api/group"/>
+</component>
+</collection>
+<collection name="uiservicetabsettings" long-name="UI Service Tab Settings" level="settings">
+<!-- this is really at the wrong rank. should move down a directory -->
+<component name="vimpstsettings" filter="s60" long-name="VIMP Service Tab Settings">
+<unit bldFile="app/conversations/uiservicetabsettings/group"/>
+</component>
+</collection>
+<collection name="instantmessagesalert" long-name="Instant Messages Alert" level="utils">
+<!-- this is really at the wrong rank. should move down a directory -->
+<component name="instantmessagesalert_build" filter="s60" long-name="Instant Messages Alert build" introduced="^3">
+<unit bldFile="app/conversations/instantmessagesalert/group"/>
+</component>
+</collection>
+<collection name="imstutils" long-name="IM Service Tab Utils" level="utils">
+<component name="imstutils_help" filter="s60" long-name="IM Service Tab Help">
+<unit bldFile="app/conversations/imstutils/help/group"/>
+</component>
+<component name="imconnectionprovider" filter="s60" long-name="IM Connection Provider" plugin="Y">
+<unit bldFile="app/conversations/imstutils/imconnectionprovider/group"/>
+</component>
+<component name="xmppadapter" filter="s60" long-name="XMPP Settings Adapter" plugin="Y">
+<unit bldFile="app/conversations/imstutils/xmppadapter/group"/>
+</component>
+<component name="imconversationview" filter="s60" long-name="IM Conversation View">
+<unit bldFile="app/conversations/imstutils/imconversationview/group"/>
+</component>
+<component name="imstutils_config" filter="s60" long-name="IM Service Tab Utils config" class="config">
+<!-- remove the #includes and or moved ithe loc file into one the above components -->
+<unit bldFile="app/conversations/imstutils/group"/>
+</component>
+</collection>
+<collection name="uiservicetab" long-name="UI Service Tab" level="ui">
+<component name="vimpstutils" filter="s60" long-name="VIMP Service Tab Utilities">
+<!-- need to spell out VIMP at least once -->
+<unit bldFile="app/conversations/uiservicetab/vimpstutils/group"/>
+</component>
+<component name="vimpststorage" filter="s60" long-name="VIMP Service Tab Storage">
+<unit bldFile="app/conversations/uiservicetab/vimpststorage/group"/>
+</component>
+<component name="vimpstengine" filter="s60" long-name="VIMP Service Tab Engine">
+<unit bldFile="app/conversations/uiservicetab/vimpstengine/group"/>
+</component>
+<component name="vimpstcmdprocess" filter="s60" long-name="VIMP Service Tab Command Process">
+<unit bldFile="app/conversations/uiservicetab/vimpstcmdprocess/group"/>
+</component>
+<component name="vimpstui" filter="s60" long-name="VIMP Service Tab UI">
+<unit bldFile="app/conversations/uiservicetab/vimpstui/group"/>
+</component>
+<component name="vimpstdetailsviewplugin" filter="s60" long-name="VIMP ST Details View Plugin" plugin="Y">
+<unit bldFile="app/conversations/uiservicetab/vimpstdetailsviewplugin/group"/>
+</component>
+<component name="uiservicetab_build" filter="s60" long-name="UI Service Tab Build">
+<!-- can this be distributed into the above bld.infs? -->
+<unit bldFile="app/conversations/uiservicetab/group"/>
+</component>
+</collection>
+<collection name="servicewidget" long-name="Service Widget" level="ui">
+<component name="servicewidgetdatapublisher" filter="s60" long-name="Service Widget Data Publisher" plugin="Y">
+<unit bldFile="app/conversations/servicewidget/servicewidgetdatapublisher/group"/>
+</component>
+<component name="themes" filter="s60" long-name="Service Widget Themes" class="config">
+<!-- does this really need to have that number in the directory name? -->
+<unit bldFile="app/conversations/servicewidget/themes/install-themes/install/servicewidget_20021383/group"/>
+</component>
+<component name="servicewidget_build" filter="s60" long-name="Service Widget Build">
+<!-- Either move the whole collection down one directory into a single component, or move the ROM and SIS parts into a Service Widget ROM component -->
+<unit bldFile="app/conversations/servicewidget/group"/>
+</component>
+</collection>
+<collection name="instantmsgindicatorplugin" long-name="Instant Message Indicator Plugin" level="plugin">
+<!-- collection is really a component. should move down a directory -->
+<component name="instantmsgindicatorplugin_build" filter="s60" long-name="Instant Message Indicator Plugin Build" introduced="^3" plugin="Y">
+<unit bldFile="app/conversations/instantmsgindicatorplugin/group"/>
+</component>
+</collection>
+<collection name="imstatuspaneindicatorplugin" long-name="IM Status Pane Indicator Plugin" level="plugin">
+<!-- collection is really a component. should move down a directory -->
+<component name="imstatuspaneindicatorplugin_build" filter="s60" long-name="IM Status Pane Indicator Plugin Build" introduced="^3" plugin="Y">
+<unit bldFile="app/conversations/imstatuspaneindicatorplugin/group"/>
+</component>
+</collection>
+<collection name="conversations_info" long-name="Conversation Apps Info" level="ui">
+<component name="conversations_build" filter="s60" long-name="Conversation Apps Build">
+<!-- can the exports be moved to other components? or this remade into a configuration component?-->
+<unit bldFile="app/conversations/group"/>
+</component>
+</collection>
+</block>
+<block name="im" level="apps" long-name="Instant Messaging Apps" levels="support prot engine apps">
+<collection name="im_plat" long-name="Instant Messaging Apps Platform Interfaces" level="apps">
+<component name="wv_sap_settings_api" long-name="WV SAP Settings API" filter="s60" class="api">
+<unit bldFile="app/im/im_plat/wv_sap_settings_api/group"/>
+</component>
+</collection>
+<collection name="wvsettings20" long-name="Wireless Village Settings Engine" level="support">
+<!-- this is really a component. should move down a directory -->
+<component name="wvsapsettingsstore" long-name="WV SAP Settings Store" filter="s60" introduced="9.3">
+<unit bldFile="app/im/wvsettings20/group"/>
+</component>
+</collection>
+</block>
+<block name="dictionary" level="services" long-name="Dictionary" levels="utils ui">
+<collection name="dictionary_plat" long-name="Dictionary Platform Interfaces" level="ui">
+<component name="menu_suites_macros_api" long-name="Menu Suites Macros API" filter="s60" class="api">
+<unit bldFile="app/dictionary/dictionary_plat/menu_suites_macros_api/group"/>
+</component>
+</collection>
+<collection name="userdict" long-name="User Dictionary" level="ui">
+<!-- collection is really a component, move down a dir -->
+<component name="userdict_build" filter="s60" long-name="Japanese User Dictionary">
+<unit bldFile="app/dictionary/userdict/group"/>
+</component>
+</collection>
+</block>
+<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"/>
+</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"/>
+</component>
+</collection>
+<collection name="camerauis" long-name="Camera UIs">
+<component name="activepalette" filter="s60" long-name="Active Palette">
+<unit bldFile="app/camera/camerauis/activepalette/group"/>
+</component>
+<component name="cameraapp" filter="s60" long-name="Camera Application">
+<unit bldFile="app/camera/camerauis/cameraapp/group"/>
+<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">
+<component name="image_editor_debug_utilities_api" long-name="Image Editor Debug Utilities API" filter="s60" class="api">
+<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
+</component>
+<component name="image_editor_utilities_api" long-name="Image Editor Utilities API" filter="s60" class="api">
+<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_utilities_api/group"/>
+</component>
+<component name="image_editor_definitions_api" long-name="Image Editor Definitions API" filter="s60" class="api">
+<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_definitions_api/group"/>
+</component>
+<component name="image_editor_system_parameters_api" long-name="Image Editor System Parameters API" filter="s60" class="api">
+<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_system_parameters_api/group"/>
+</component>
+<component name="image_processing_engine_api" long-name="Image Processing Engine API" filter="s60" class="api">
+<unit bldFile="app/imgeditor/imgeditor_plat/image_processing_engine_api/group"/>
+</component>
+</collection>
+<collection name="imageeditor" long-name="Image Editor UI" level="ui">
+<component name="pb" filter="s60" long-name="Plugin Base">
+<unit bldFile="app/imgeditor/imageeditor/pb/group"/>
+</component>
+<component name="iepb" filter="s60" long-name="Image Editor Plugin Base">
+<unit bldFile="app/imgeditor/imageeditor/iepb/group"/>
+</component>
+<component name="imageeditorui" filter="s60" long-name="Image Editor UI">
+<unit bldFile="app/imgeditor/imageeditor/imageeditorui/group"/>
+</component>
+<component name="imageeditormanager" filter="s60" long-name="Image Editor Manager">
+<unit bldFile="app/imgeditor/imageeditor/imageeditormanager/group"/>
+</component>
+<component name="imageeditorapp" filter="s60" long-name="Image Editor Application">
+<unit bldFile="app/imgeditor/imageeditor/imageeditorapp/group"/>
+</component>
+<component name="imageeditor_plugins" filter="s60" long-name="Image Editor Plugins" plugin="Y">
+<!-- can only have one unit. Need to include all from a single bld.inf -->
+<unit bldFile="app/imgeditor/imageeditor/plugins/blackwhiteplugin/group"/>
+<unit bldFile="app/imgeditor/imageeditor/plugins/brightnessplugin/group"/>
+<unit bldFile="app/imgeditor/imageeditor/plugins/bubbleplugin/group"/>
+<unit bldFile="app/imgeditor/imageeditor/plugins/cartoonizeplugin/group"/>
+<unit bldFile="app/imgeditor/imageeditor/plugins/clipartplugin/group"/>
+<unit bldFile="app/imgeditor/imageeditor/plugins/contrastplugin/group"/>
+<unit bldFile="app/imgeditor/imageeditor/plugins/cropplugin/group"/>
+<unit bldFile="app/imgeditor/imageeditor/plugins/drawplugin/group"/>
+<unit bldFile="app/imgeditor/imageeditor/plugins/frameplugin/group"/>
+<unit bldFile="app/imgeditor/imageeditor/plugins/negativeplugin/group"/>
+<unit bldFile="app/imgeditor/imageeditor/plugins/redeyeplugin/group"/>
+<unit bldFile="app/imgeditor/imageeditor/plugins/resizeplugin/group"/>
+<unit bldFile="app/imgeditor/imageeditor/plugins/rotatelplugin/group"/>
+<unit bldFile="app/imgeditor/imageeditor/plugins/rotaterplugin/group"/>
+<unit bldFile="app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
+<unit bldFile="app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
+<unit bldFile="app/imgeditor/imageeditor/plugins/textplugin/group"/>
+<!-- conditionally #included in imageeditor_build: need to fix
+ <unit bldFile="imageeditor/plugins/drawplugin/group"/>
+ -->
+</component>
+<component name="editorprovider" filter="s60" long-name="Image Editor Provider">
+<unit bldFile="app/imgeditor/imageeditor/editorprovider/group"/>
+</component>
+<component name="imageeditor_build" filter="s60" long-name="Image Editor Build">
+<!-- should distribute this to the other components -->
+<unit bldFile="app/imgeditor/imageeditor/group"/>
+</component>
+</collection>
+<collection name="imageeditorengine" long-name="Image Editor Engine" level="engine">
+<component name="filters" filter="s60" long-name="Image Editor Filters">
+<!-- can only have one unit. Need to include all from a single bld.inf -->
+<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbrightness/group"/>
+<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbubble/group"/>
+<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbuffer/group"/>
+<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercartoon/group"/>
+<unit bldFile="app/imgeditor/imageeditorengine/filters/filterclipart/group"/>
+<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercontrast/group"/>
+<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercrop/group"/>
+<unit bldFile="app/imgeditor/imageeditorengine/filters/filterdraw/group"/>
+<unit bldFile="app/imgeditor/imageeditorengine/filters/filterframe/group"/>
+<unit bldFile="app/imgeditor/imageeditorengine/filters/filtergrayscale/group"/>
+<unit bldFile="app/imgeditor/imageeditorengine/filters/filtericlsource/group"/>
+<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegsource/group"/>
+<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegtarget/group"/>
+<unit bldFile="app/imgeditor/imageeditorengine/filters/filternegate/group"/>
+<unit bldFile="app/imgeditor/imageeditorengine/filters/filterredeye/group"/>
+<unit bldFile="app/imgeditor/imageeditorengine/filters/filterrotate/group"/>
+<unit bldFile="app/imgeditor/imageeditorengine/filters/filterscale/group"/>
+<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
+<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
+<unit bldFile="app/imgeditor/imageeditorengine/filters/filtertext/group"/>
+<!-- conditionally #included in imageeditor_build: need to fix
+ <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
+ -->
+</component>
+<component name="imageeditorutils" filter="s60" long-name="Image Editor Utilities">
+<unit bldFile="app/imgeditor/imageeditorengine/imageeditorutils/group"/>
+</component>
+<component name="systemparameters" filter="s60" long-name="System Parameters">
+<unit bldFile="app/imgeditor/imageeditorengine/systemparameters/group"/>
+</component>
+<component name="enginewrapper" filter="s60" long-name="Image Editor Engine Wrapper">
+<unit bldFile="app/imgeditor/imageeditorengine/enginewrapper/group"/>
+</component>
+<component name="imageeditorengine_build" filter="s60" long-name="Image Editor Engine Build">
+<!-- should distribute this to the other components -->
+<unit bldFile="app/imgeditor/imageeditorengine/group"/>
+</component>
+</collection>
+</block>
+<!-- <package id="videoeditor" level="apps" tech-domain="ma" href="../../../../app/videoeditor/package_definition.xml"/> -->
+<block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
+<collection name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" level="apps">
+<component name="videoplayer_startup_api" long-name="Video Player Startup API" filter="s60" class="api">
+<unit bldFile="app/videoplayer/videoplayer_plat/videoplayer_startup_api/group" filter="!test"/>
+</component>
+<component name="video_player_file_details_dialog_api" long-name="Media Player File Details Dialog API" filter="s60" class="api">
+<unit bldFile="app/videoplayer/videoplayer_plat/video_player_file_details_dialog_api/group" filter="!test"/>
+</component>
+<component name="videocollection_api" long-name="Video Collection API" filter="s60" class="api">
+<unit bldFile="app/videoplayer/videoplayer_plat/videocollection_api/group"/>
+</component>
+</collection>
+<collection name="videofeeds" long-name="Video Feeds" level="util">
+<component name="iptv_utils" filter="s60" long-name="IPTV Util" introduced="^3">
+<unit bldFile="app/videoplayer/videofeeds/utils/group"/>
+</component>
+<component name="viewmessageutility" filter="s60" long-name="View Message Utility" introduced="^3">
+<unit bldFile="app/videoplayer/videofeeds/viewmessageutility/group"/>
+</component>
+<component name="vcxnotifier" filter="s60" long-name="Video Connection Notifier" introduced="^3" plugin="Y">
+<unit bldFile="app/videoplayer/videofeeds/vcxnotifier/group"/>
+</component>
+<component name="vccommon" filter="s60" long-name="Video Connection Common" introduced="^3">
+<unit bldFile="app/videoplayer/videofeeds/vccommon/group"/>
+</component>
+<component name="clientapi" long-name="Server Client" filter="s60" introduced="^3">
+<unit bldFile="app/videoplayer/videofeeds/clientapi/group"/>
+</component>
+<component name="provisioningprocessor" long-name="Provisioning Processor" filter="s60" introduced="^3">
+<unit bldFile="app/videoplayer/videofeeds/provisioningprocessor/group"/>
+</component>
+<component name="mrssplugin" long-name="RSS plugin" filter="s60" introduced="^3" plugin="Y">
+<unit bldFile="app/videoplayer/videofeeds/mrssplugin/group"/>
+</component>
+<component name="videofeeds_server" long-name="Server" filter="s60" introduced="^3">
+<unit bldFile="app/videoplayer/videofeeds/server/group"/>
+</component>
+<component name="livetvutils" long-name="LiveTV Utils" filter="s60" introduced="^3">
+<unit bldFile="app/videoplayer/videofeeds/livetvutils/group"/>
+</component>
+<component name="iptvprovisioningrecognizer" long-name="IP TV Provisioning Recognizer" filter="s60" introduced="^3" plugin="Y">
+<unit bldFile="app/videoplayer/videofeeds/provisioningrecognizer/group"/>
+</component>
+<component name="iptvprovisioningappui" long-name="IP TV Provisioning App UI" filter="s60" introduced="^3">
+<unit bldFile="app/videoplayer/videofeeds/provisioningappui/group"/>
+</component>
+<component name="iptvomaprovisioning" long-name="IP TV OMA Provisioning" filter="s60" introduced="^3">
+<unit bldFile="app/videoplayer/videofeeds/omaprovisioning/group"/>
+</component>
+<component name="vcnsuiengine" long-name="VoD UI Engine" filter="s60" introduced="^3">
+<unit bldFile="app/videoplayer/videofeeds/vcnsuiengine/group"/>
+</component>
+<component name="hgvodui" long-name="Ganes UX2.0 VoD UI" filter="s60" introduced="^3">
+<unit bldFile="app/videoplayer/videofeeds/hgvodui/group"/>
+</component>
+<component name="hgvodplugin" long-name="Ganes UX2.0 VoD UI Plugin" filter="s60" introduced="^3" plugin="Y">
+<unit bldFile="app/videoplayer/videofeeds/hgvodplugin/group"/>
+</component>
+<component name="vcnsscheduleview" long-name="Scheduled Download Settings View" filter="s60" introduced="^3">
+<unit bldFile="app/videoplayer/videofeeds/vcnsscheduleview/group"/>
+</component>
+<component name="vcnsscheduleplugin" long-name="Scheduled Download Settings Plugin" filter="s60" introduced="^3" plugin="Y">
+<unit bldFile="app/videoplayer/videofeeds/vcnsscheduleplugin/group"/>
+</component>
+<component name="scheduleddlplugin" long-name="Scheduled download plugin" filter="s60" introduced="^3">
+<unit bldFile="app/videoplayer/videofeeds/scheduleddlplugin/group"/>
+</component>
+</collection>
+<collection name="videocollection" long-name="Video Collection" level="util">
+<component name="mpxmyvideoscollection" filter="s60" long-name="MPX My Videos Collection" introduced="^3">
+<unit bldFile="app/videoplayer/videocollection/mpxmyvideoscollection/group"/>
+</component>
+<component name="myvideosindicatorplugin" filter="s60" long-name="My Videos Indicator Plugin" introduced="^3" plugin="Y">
+<unit bldFile="app/videoplayer/videocollection/myvideosindicatorplugin/group"/>
+</component>
+<component name="hgmyvideos" filter="s60" long-name="Huriganes My Videos" introduced="^3">
+<unit bldFile="app/videoplayer/videocollection/hgmyvideos/group"/>
+</component>
+<component name="hgmyvideosplugin" filter="s60" long-name="Huriganes My VideosPlugin" introduced="^3" plugin="Y">
+<unit bldFile="app/videoplayer/videocollection/hgmyvideosplugin/group"/>
+</component>
+</collection>
+<collection name="mediasettings" long-name="Media Settings" level="support">
+<!-- this is really a component. Should be moved down a directory -->
+<component name="mediasettings_build" filter="s60" long-name="Media Settings Build">
+<unit bldFile="app/videoplayer/mediasettings/group"/>
+</component>
+<component name="videoplayer_test" filter="s60" purpose="development" long-name="Video Player Apps Test">
+<!-- can only have one unit. Can thes be #included from the above or another bld.inf?-->
+<unit bldFile="app/videoplayer/tsrc/VCXTestCommon/group"/>
+<unit bldFile="app/videoplayer/tsrc/VCXTestUtilModule/group"/>
+<unit bldFile="app/videoplayer/tsrc/VCXTestMyVideosCollectionClient/group"/>
+<unit bldFile="app/videoplayer/mediasettings/mediasettingsengine/tsrc/mediasettingsenginetest/group"/>
+<unit bldFile="app/videoplayer/mediasettings/videoplayersettingsengine/tsrc/vpsettingsenginetest/group"/>
+</component>
+</collection>
+<collection name="filedetails" long-name="File Details" level="support">
+<component name="filedetailsplugin" filter="s60" long-name="File Details Plugin" introduced="^3" plugin="Y">
+<unit bldFile="app/videoplayer/filedetails/filedetailsplugin/group"/>
+</component>
+<component name="filedetailsdialog" filter="s60" long-name="File Details Dialog" introduced="^3">
+<unit bldFile="app/videoplayer/filedetails/filedetailsdialog/group"/>
+</component>
+</collection>
+<collection name="videoplayerapp" long-name="Video Player App" level="apps">
+<component name="lwplayer" long-name="Lightweight Player" filter="s60">
+<unit bldFile="app/videoplayer/videoplayerapp/lwplayer/group"/>
+</component>
+<component name="mpxvideoplayer" filter="s60" long-name="MPX Video Player" plugin="Y">
+<unit bldFile="app/videoplayer/videoplayerapp/mpxvideoplayer/group" filter="!test"/>
+</component>
+</collection>
+<collection name="videoplayback" long-name="Video Playback Plugins" level="plugin">
+<component name="videohelix" long-name="Video Helix" filter="s60" introduced="^3" plugin="Y">
+<unit bldFile="app/videoplayer/videoplayback/videohelix/group" filter="!test"/>
+</component>
+<component name="videopdlplaybackviewplugin" filter="s60" long-name="Video PDL Playback View Plugin" introduced="^3" plugin="Y">
+<unit bldFile="app/videoplayer/videoplayback/videopdlplaybackviewplugin/group" filter="!test"/>
+</component>
+<component name="videoplaybackcontrols" filter="s60" long-name="Video Playback Controls" introduced="^3" plugin="Y">
+<unit bldFile="app/videoplayer/videoplayback/videoplaybackcontrols/group" filter="!test"/>
+</component>
+<component name="videoplaybackviewplugin" filter="s60" long-name="Video Playback View Plugin" introduced="^3" plugin="Y">
+<unit bldFile="app/videoplayer/videoplayback/videoplaybackviewplugin/group"/>
+</component>
+<component name="videoplaybackviews" filter="s60" long-name="Video Playback Views" introduced="^3" plugin="Y">
+<unit bldFile="app/videoplayer/videoplayback/videoplaybackviews/group" filter="!test"/>
+</component>
+</collection>
+</block>
+<block name="photos" level="apps" long-name="Photos" levels="support fw ui app">
+<collection name="photos_plat" long-name="Photos Platform Interfaces" level="app">
+<component name="collection_plugins_api" long-name="Collection Plugins API" introduced="^2" filter="s60" class="api">
+<unit bldFile="app/photos/photos_plat/collection_plugins_api/group"/>
+</component>
+<component name="controllers_collection_api" long-name="Controllers Collection API" introduced="^2" filter="s60" class="api">
+<unit bldFile="app/photos/photos_plat/controllers_collection_api/group"/>
+</component>
+<component name="gallery_utilities_api" long-name="Gallery Utilities API" introduced="^2" filter="s60" class="api">
+<unit bldFile="app/photos/photos_plat/gallery_utilities_api/group"/>
+</component>
+<component name="slideshow_ui_constants_api" long-name="Slideshow Ui Constants API" introduced="^2" filter="s60" class="api">
+<unit bldFile="app/photos/photos_plat/slideshow_ui_constants_api/group"/>
+</component>
+<component name="views_metadatadialog_api" long-name="Views Metadata Dialog API" introduced="^2" filter="s60" class="api">
+<unit bldFile="app/photos/photos_plat/views_metadatadialog_api/group"/>
+</component>
+</collection>
+<collection name="photosgallery" long-name="Photos Gallery" level="app">
+<!-- consider splitting this collection into the application itself, and the frameworks behind it -->
+<component name="photosgallery_help" filter="s60" long-name="Photos Help" introduced="^2">
+<unit bldFile="app/photos/photosgallery/help/group"/>
+</component>
+<component name="logging" filter="s60" long-name="Photos Logging" introduced="^2">
+<unit bldFile="app/photos/photosgallery/logging/group"/>
+</component>
+<component name="photosgallery_common" filter="s60" long-name="Photos Common" introduced="^2">
+<unit bldFile="app/photos/photosgallery/common/group"/>
+</component>
+<component name="photosgallery_commonui" filter="s60" long-name="Photos Common UI" introduced="^2">
+<unit bldFile="app/photos/photosgallery/commonui/group"/>
+</component>
+<component name="photosgalleryollectionfw" filter="s60" long-name="Photos Collection Framework" introduced="^2">
+<unit bldFile="app/photos/photosgallery/collectionframework/group"/>
+</component>
+<component name="galleryicons" filter="s60" long-name="Photos Icons" introduced="^2" class="config">
+<unit bldFile="app/photos/photosgallery/icons"/>
+</component>
+<component name="imageviewer" filter="s60" long-name="Image Viewer" introduced="^3">
+<!-- this is really a part of controllers component, #include from there instead -->
+<unit bldFile="app/photos/photosgallery/controllers/imageviewer/group"/>
+</component>
+<component name="photosgalleryviewfw" filter="s60" long-name="View Framework" introduced="^2">
+<unit bldFile="app/photos/photosgallery/viewframework/group"/>
+</component>
+<component name="controllers" filter="s60" long-name="Photos Controllers" introduced="^2">
+<unit bldFile="app/photos/photosgallery/controllers/group"/>
+</component>
+<component name="photogallery" filter="s60" long-name="Media Gallery" introduced="^2">
+<unit bldFile="app/photos/photosgallery/gallery/group"/>
+</component>
+<component name="slideshow" filter="s60" long-name="Slideshow" introduced="^2">
+<unit bldFile="app/photos/photosgallery/slideshow/group"/>
+</component>
+<component name="memoryplugin" long-name="Memory Plugin" filter="s60" introduced="^2" plugin="Y">
+<unit bldFile="app/photos/photosgallery/memoryplugin/group"/>
+</component>
+<component name="imgvwr" filter="s60" long-name="Photos Image Viewer" introduced="^3">
+<unit bldFile="app/photos/photosgallery/imgvwr/group"/>
+</component>
+<component name="photosgallery_build" filter="s60" long-name="Photos Gallery Build" introduced="^2">
+<!-- need to remove the #included above bld.infs from this -->
+<unit bldFile="app/photos/photosgallery/group"/>
+</component>
+</collection>
+</block>
+<block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support hs app">
+<collection name="musicplayer_plat" long-name="Music Player Apps Platform Interfaces" level="app">
+<component name="mpx_music_player_app_api" long-name="MPX Music Player App API" filter="s60" class="api">
+<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_app_api/group"/>
+</component>
+<component name="mpx_music_player_commonui_api" long-name="MPX Music Player Common UI API" filter="s60" class="api">
+<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_commonui_api/group"/>
+</component>
+<component name="mpx_music_player_media_key_handler_api" long-name="MPX Music Player Media Key Handler API" filter="s60" class="api">
+<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_media_key_handler_api/group"/>
+</component>
+<component name="mpx_music_player_remote_control_api" long-name="MPX Music Player Remote Control API" filter="s60" class="api">
+<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_remote_control_api/group"/>
+</component>
+<component name="mpx_music_shop_ui_api" long-name="MPX Music Shop UI API" filter="s60" class="api">
+<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_shop_ui_api/group"/>
+</component>
+<component name="mpx_music_wap_adapter_cenrep_api" long-name="MPX Music Wap Adapter CenRep API" filter="s60" class="api">
+<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_wap_adapter_cenrep_api/group"/>
+</component>
+<component name="mpx_music_store_api" long-name="MPX Music Store Find API" filter="s60" class="api">
+<unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_store_api/group"/>
+</component>
+<component name="audio_application_features_api" long-name="Audio Application Features API" filter="s60" class="api">
+<unit bldFile="app/musicplayer/musicplayer_plat/audio_application_features_api/group"/>
+</component>
+<component name="music_content_publisher_plugin_api" long-name="Music Content Publisher Plugin API" filter="s60" class="api">
+<unit bldFile="app/musicplayer/musicplayer_plat/music_content_publisher_plugin_api/group"/>
+</component>
+</collection>
+<collection name="mpxmusicplayer" long-name="MPX Music Player" level="app">
+<component name="mpxmusicplayer_help" filter="s60" long-name="Help">
+<unit bldFile="app/musicplayer/mpxmusicplayer/help/group"/>
+</component>
+<component name="mpxmusicplayer_commonui" filter="s60" long-name="MPX Common UI">
+<unit bldFile="app/musicplayer/mpxmusicplayer/commonui/group"/>
+</component>
+<component name="mpx_metadatahandler" filter="s60" long-name="MPX Metadata Handler">
+<unit bldFile="app/musicplayer/mpxmusicplayer/metadatahandler/group"/>
+</component>
+<component name="mediakeyhandler" filter="s60" long-name="MPX Media Key Handler">
+<unit bldFile="app/musicplayer/mpxmusicplayer/mediakeyhandler/group"/>
+</component>
+<component name="mpxmusicplayer_app" filter="s60" long-name="MPX Application">
+<unit bldFile="app/musicplayer/mpxmusicplayer/app/group"/>
+</component>
+<component name="mpxmusicplayer_build" filter="s60" long-name="MPX Music Player Build">
+<!-- can the exports be distributed to the above components? -->
+<unit bldFile="app/musicplayer/mpxmusicplayer/group"/>
+</component>
+</collection>
+<collection name="musichomescreen_multiview" long-name="Music Home Screen Multiview" level="hs">
+<!-- Uncomment all units when configuration is in place. All currently #included from musichomescreen_build -->
+<component name="mpxcollectionpublisher" filter="s60" long-name="MPX Collection Publisher" introduced="^2" class="placeholder">
+<!--<unit bldFile="musichomescreen_multiview/mpxcollectionpublisher/group"/>-->
+</component>
+<component name="musiccontentpublisher" filter="s60" long-name="Music Content Publisher" introduced="^2" class="placeholder">
+<!--<unit bldFile="musichomescreen_multiview/musiccontentpublisher/group"/>-->
+</component>
+<component name="mcpmusicplayer" filter="s60" long-name="Music Player MCP Plugin" introduced="^2" plugin="Y" class="placeholder">
+<!--<unit bldFile="musichomescreen_multiview/mcpmusicplayer/group"/>-->
+</component>
+<component name="musicplayeractionhandlerplugin" filter="s60" long-name="Music Player Action Handler Plugin" introduced="^2" plugin="Y" class="placeholder">
+<!--<unit bldFile="musichomescreen_multiview/musicplayeractionhandlerplugin/group"/>-->
+</component>
+<component name="mpx_data" filter="s60" long-name="MPX Data" introduced="^2" class="placeholder">
+<!-- does this make sense to be a component? should it just be #include from musichomescreen_multiview/group? -->
+<!--<unit bldFile="musichomescreen_multiview/data/themes/default/group"/>-->
+</component>
+<component name="musichomescreen_build" filter="s60" long-name="Music Homescreen Multiview Build" introduced="^2">
+<unit bldFile="app/musicplayer/musichomescreen_multiview/group"/>
+</component>
+</collection>
+<collection name="mpxplugins" long-name="MPX Plugins" level="plugins">
+<component name="serviceplugins" filter="s60" long-name="MPX Service Plugins" plugin="Y">
+<unit bldFile="app/musicplayer/mpxplugins/serviceplugins/group"/>
+</component>
+<component name="viewplugins" filter="s60" long-name="MPX View Plugins" plugin="Y">
+<unit bldFile="app/musicplayer/mpxplugins/viewplugins/group"/>
+</component>
+<component name="mpxplugins_build" filter="s60" long-name="MPX Plugins Build">
+<!-- can the exports be distributed to the above components? -->
+<unit bldFile="app/musicplayer/mpxplugins/group"/>
+</component>
+</collection>
+<collection name="musicplayer_info" long-name="Music Player Apps Info" level="app">
+<component name="musicplayer_build" filter="s60" long-name="Music Player Build">
+<!-- should explicitly #inlcude musicplayerbldvariant.hrh in each component -->
+<unit bldFile="app/musicplayer/group"/>
+</component>
+</collection>
+</block>
+<block name="radio" level="apps" long-name="Radio Apps" levels="engine ui">
+<collection name="fmradio" long-name="FM Radio" level="ui">
+<component name="activeidleengine" filter="s60" long-name="FM Radio Active Idle Engine">
+<unit bldFile="app/radio/fmradio/activeidleengine/group"/>
+</component>
+<component name="fmradioengine" filter="s60" long-name="FM Radio Engine">
+<unit bldFile="app/radio/fmradio/fmradioengine/group"/>
+</component>
+<component name="fmradioactionhandler" filter="s60" long-name="FM Radio Action Handler" plugin="Y">
+<unit bldFile="app/radio/fmradio/fmradioactionhandler/group"/>
+</component>
+<component name="fmradiomcpplugin" filter="s60" long-name="FM Radio Content Publisher Plugin" plugin="Y">
+<unit bldFile="app/radio/fmradio/fmradiomcpplugin/group"/>
+</component>
+<component name="fmradio_build" filter="s60" long-name="FM Radio Build">
+<unit bldFile="app/radio/fmradio/fmradio/group"/>
+</component>
+<component name="fmradio_help" filter="s60" long-name="FM Radio Help">
+<unit bldFile="app/radio/fmradio/help/group"/>
+</component>
+<component name="fmradio_build" filter="s60" long-name="FM Radio ROM">
+<!-- remove above #included bld.infs -->
+<unit bldFile="app/radio/fmradio/group"/>
+</component>
+</collection>
+</block>
+<block name="podcatcher" level="apps" long-name="Podcatcher" levels="app">
+<collection name="podcatcher_info" long-name="Podcatcher" level="app">
+<component name="podcatcher_build" filter="sf_build" long-name="Podcatcher Build" introduced="^3">
+<unit bldFile="app/podcatcher/group"/>
+</component>
+</collection>
+</block>
+<block name="voicerec" level="apps" long-name="Voice Recorder Apps">
+<!-- custom filter pref_test-->
+<collection name="voicerec_plat" long-name="Voice Recorder Apps Platform Interfaces">
+<component name="new_file_service_api" long-name="New File Service API" filter="s60" class="api">
+<unit bldFile="app/voicerec/voicerec_plat/new_file_service_api/group"/>
+</component>
+<component name="voicerecorder_public_constants_api" long-name="Voice Recorder Public Constants API" filter="s60" class="api">
+<unit bldFile="app/voicerec/voicerec_plat/voicerecorder_public_constants_api/group"/>
+</component>
+</collection>
+<collection name="voicerecorder" long-name="Voice Recorder">
+<!--this is really a component, move down a directory -->
+<component name="voicerecorder_build" filter="s60" long-name="Voice Recorder Build">
+<unit bldFile="app/voicerec/voicerecorder/group"/>
+</component>
+</collection>
+<collection name="voicerec_info" long-name="Voice Recorder Apps Info"/>
+</block>
+<block name="screensaver" level="apps" long-name="Screen Saver Apps" levels="plugin ui">
+<!-- is this a user-facing application or a daemon? -->
+<!-- units need to be commented out until configuration is in place. They are currently #included from screensaver_build-->
+<collection name="scrsaver" long-name="Screen Saver" level="plugin">
+<component name="scrsaverplugins" filter="s60" long-name="Screen Saver Plugins" plugin="Y">
+<!-- must have only one component. #include from a common bld.inf, or move up a directory and make scrsaverplugins a collection -->
+<!--<unit bldFile="scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/"/>
+ <unit bldFile="scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/group/"/>-->
+</component>
+<component name="scrsaver_slideshowplugin" filter="s60" long-name="Screen Saver Slideshow Plugin" plugin="Y">
+<!--<unit bldFile="scrsaver/scrsaverplugins/SlideshowPlugin/group"/> -->
+</component>
+<component name="screensaveraiwplugin" filter="s60" long-name="Screen Saver AIW Plugin" plugin="Y">
+<!-- <unit bldFile="scrsaver/screensaveraiwplugin/group"/>-->
+</component>
+</collection>
+<collection name="screensaver_info" long-name="Screen Saver Apps Info" level="ui">
+<component name="screensaver_build" filter="s60" long-name="Screen Saver Application">
+<!--the app should be a separate component -->
+<unit bldFile="app/screensaver/group"/>
+</component>
+</collection>
+</block>
+<block name="homescreen" level="apps" long-name="Home Screen Apps" levels="fw support apps">
+<collection name="homescreen_plat" long-name="Home Screen Apps Platform Interfaces" level="apps">
+<component name="menu_settings_api" long-name="Menu Settings API" filter="s60" class="api">
+<unit bldFile="app/homescreen/homescreen_plat/menu_settings_api/group"/>
+</component>
+<component name="hs_content_control_ui" long-name="HS Content Control Ui" filter="s60" class="api">
+<unit bldFile="app/homescreen/homescreen_plat/hs_content_control_ui/group"/>
+</component>
+<component name="hs_renderingplugin_api" long-name="HS Rendering Plugin API" filter="s60" class="api">
+<unit bldFile="app/homescreen/homescreen_plat/hs_renderingplugin_api/group"/>
+</component>
+</collection>
+<collection name="idlehomescreen" long-name="Idle Home Screen" level="apps">
+<component name="nativeuicontroller" filter="s60" long-name="Native UI Controller">
+<unit bldFile="app/homescreen/idlehomescreen/nativeuicontroller/group"/>
+</component>
+<component name="exths" filter="s60" long-name="Active Idle Container" plugin="Y">
+<!-- why is the ID so different from the name? Is one wrong? -->
+<unit bldFile="app/homescreen/idlehomescreen/exths/group"/>
+</component>
+<component name="hscontentcontrol" filter="s60" long-name="Home Screen Content Control" introduced="^3">
+<unit bldFile="app/homescreen/idlehomescreen/hscontentcontrol/group"/>
+</component>
+<component name="hssapiwrapper" filter="s60" long-name="HS SAPI Wrapper" introduced="^3">
+<!-- can only have one unit. #include from a common bld.inf, or split into two components -->
+<unit bldFile="app/homescreen/idlehomescreen/sapiwrapper/cpswrapper/group"/>
+<unit bldFile="app/homescreen/idlehomescreen/sapiwrapper/hspswrapper/group"/>
+</component>
+<component name="xmluirendering" filter="s60" long-name="XML UI Rendering" introduced="^3">
+<unit bldFile="app/homescreen/idlehomescreen/xmluirendering/group"/>
+</component>
+<component name="xmluicontroller" filter="s60" long-name="XML UI Controller" introduced="^3">
+<unit bldFile="app/homescreen/idlehomescreen/xmluicontroller/group"/>
+</component>
+<component name="widgetmanager" filter="s60" long-name="Widget Manager" introduced="^3">
+<unit bldFile="app/homescreen/idlehomescreen/widgetmanager/group"/>
+</component>
+<component name="idlehomescreen_help" filter="s60" long-name="Idle Home Screen Help">
+<unit bldFile="app/homescreen/idlehomescreen/help/group"/>
+</component>
+<component name="idlehomescreen_data" filter="s60" long-name="Idle Home Screen Data">
+<unit bldFile="app/homescreen/idlehomescreen/data/group"/>
+</component>
+<component name="idlehomescreen_build" filter="s60" long-name="Idle Home Screen Build">
+<!-- can the loc file be moved to another comopnent and this one removed? -->
+<unit bldFile="app/homescreen/idlehomescreen/group"/>
+</component>
+</collection>
+<collection name="menufw" long-name="Menu Framework" level="fw">
+<component name="hierarchynavigator" filter="s60" long-name="Hierarchy Navigator">
+<unit bldFile="app/homescreen/menufw/hierarchynavigator/group"/>
+</component>
+<component name="menufwui" filter="s60" long-name="Menu Framework UI">
+<unit bldFile="app/homescreen/menufw/menufwui/group"/>
+</component>
+<component name="menusuites" filter="s60" long-name="Menu Suites">
+<unit bldFile="app/homescreen/menufw/menusuites/group"/>
+</component>
+<component name="menufw_build" filter="s60" long-name="Menu Framework Build">
+<!-- can the exports be exported by the other components? -->
+<unit bldFile="app/homescreen/menufw/group"/>
+</component>
+</collection>
+<collection name="taskswitcher" long-name="Task Switcher" level="support">
+<component name="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">
+<unit bldFile="app/homescreen/taskswitcher/taskswitcherui/group"/>
+</component>
+</collection>
+</block>
+<block name="graphicsuis" level="services" long-name="Graphics UIs" levels="util ui">
+<collection name="graphicsuis_plat" long-name="Graphics UIs Platform Interfaces" level="ui">
+<component name="svgt_viewer_ui_api" long-name="SVG-T Viewer UI API" filter="s60" class="api">
+<unit bldFile="app/graphicsuis/graphicsuis_plat/svgt_viewer_ui_api/group"/>
+</component>
+<component name="svg_application_observer_utility_api" long-name="SVG Application Observer Utility API" filter="s60" class="api">
+<unit bldFile="app/graphicsuis/graphicsuis_plat/svg_application_observer_utility_api/group"/>
+</component>
+<component name="svgt_file_view_details_dialog_api" long-name="SVG-T File View Details Dialog API" filter="s60" class="api">
+<unit bldFile="app/graphicsuis/graphicsuis_plat/svgt_file_view_details_dialog_api/group"/>
+</component>
+</collection>
+<collection name="svgtviewer" long-name="SVG-T Viewer" level="ui">
+<component name="svgtviewerplugin" filter="s60" long-name="SVG-T Viewer Plugin">
+<unit bldFile="app/graphicsuis/svgtviewer/svgtviewerplugin/group"/>
+</component>
+</collection>
+</block>
+<block name="profile" level="apps" long-name="Profiles" levels="app">
+<collection name="profile_plat" long-name="Profiles Platform Interfaces" level="app">
+<component name="profiles_settings_view_api" long-name="Profiles Settings View API" filter="s60" class="api">
+<unit bldFile="app/profile/profile_plat/profiles_settings_view_api/group"/>
+</component>
+</collection>
+<collection name="profilesapplication" long-name="Profiles Application" level="app">
+<component name="profiles" filter="s60" long-name="Profiles">
+<unit bldFile="app/profile/profilesapplication/profiles/group"/>
+</component>
+</collection>
+<collection name="profile_info" long-name="Profiles Info" level="app">
+<component name="profile_help" filter="s60" long-name="Profiles Help">
+<unit bldFile="app/profile/help/group"/>
+</component>
+</collection>
+</block>
+<block name="speechsrv" level="services" long-name="Speech Recognition UIs" levels="engine framework ui">
+<collection name="speechsrv_plat" long-name="Speech Recognition UIs Platform Interfaces" level="ui">
+<component name="vas_api" long-name="VAS API" filter="s60" class="api">
+<unit bldFile="app/speechsrv/speechsrv_plat/vas_api/group"/>
+</component>
+<component name="nss_devasr_api" long-name="NSS DevASR API" filter="s60" class="api">
+<unit bldFile="app/speechsrv/speechsrv_plat/nss_devasr_api/group"/>
+</component>
+<component name="tts_hw_device_api" long-name="TTS HW Device API" filter="s60" class="api">
+<unit bldFile="app/speechsrv/speechsrv_plat/tts_hw_device_api/group"/>
+</component>
+<component name="voice_commands_resource_header_api" long-name="Voice Commands Resource Header API" filter="s60" class="api">
+<unit bldFile="app/speechsrv/speechsrv_plat/voice_commands_resource_header_api/group"/>
+</component>
+<component name="nss_mmf_tts_custom_commands_api" long-name="NSS MMF TTS Custom Commands API" filter="s60" class="api">
+<unit bldFile="app/speechsrv/speechsrv_plat/nss_mmf_tts_custom_commands_api/group"/>
+</component>
+<component name="srsf_cenrep_settings_api" long-name="SRSF CenRep Settings API" filter="s60" class="api">
+<unit bldFile="app/speechsrv/speechsrv_plat/srsf_cenrep_settings_api/group"/>
+</component>
+<component name="voice_ui_plugin_api" long-name="Voice UI Plug-in API" filter="s60" class="api">
+<unit bldFile="app/speechsrv/speechsrv_plat/voice_ui_plugin_api/group"/>
+</component>
+<component name="nss_tts_utility_api" long-name="NSS TTS Utility API" filter="s60" class="api">
+<unit bldFile="app/speechsrv/speechsrv_plat/nss_tts_utility_api/group"/>
+</component>
+<component name="nss_srs_custom_commands_api" long-name="NSS SRS Custom Commands API" filter="s60" class="api">
+<unit bldFile="app/speechsrv/speechsrv_plat/nss_srs_custom_commands_api/group"/>
+</component>
+<component name="srsf_secondarydisplay_api" long-name="SRSF Secondary Display API" filter="s60" class="api">
+<unit bldFile="app/speechsrv/speechsrv_plat/srsf_secondarydisplay_api/group"/>
+</component>
+<component name="asrs_hw_device_api" long-name="ASRS Hardware Device API" filter="s60" class="api">
+<unit bldFile="app/speechsrv/speechsrv_plat/asrs_hw_device_api/group"/>
+</component>
+<component name="vas_vcommand_api" long-name="VAS Voice Command API" filter="s60" class="api">
+<unit bldFile="app/speechsrv/speechsrv_plat/vas_vcommand_api/group"/>
+</component>
+<component name="adaptation_hw_device_api" long-name="Adaptation Hardware Device API" filter="s60" class="api">
+<unit bldFile="app/speechsrv/speechsrv_plat/adaptation_hw_device_api/group"/>
+</component>
+<component name="nss_devtts_api" long-name="NSS DevTTS API" filter="s60" class="api">
+<unit bldFile="app/speechsrv/speechsrv_plat/nss_devtts_api/group"/>
+</component>
+<component name="nss_srs_utility_api" long-name="NSS SRS Utility API" filter="s60" class="api">
+<unit bldFile="app/speechsrv/speechsrv_plat/nss_srs_utility_api/group"/>
+</component>
+<component name="recognition_hw_device_api" long-name="Recognition Hardware Device API" filter="s60" class="api">
+<unit bldFile="app/speechsrv/speechsrv_plat/recognition_hw_device_api/group"/>
+</component>
+<component name="vas_contact_handler_api" long-name="VAS Contact Handler API" filter="s60" class="api">
+<unit bldFile="app/speechsrv/speechsrv_plat/vas_contact_handler_api/group"/>
+</component>
+<component name="nlp_hw_device" long-name="NLP Hardware Device" filter="s60" class="api">
+<unit bldFile="app/speechsrv/speechsrv_plat/nlp_hw_device/group"/>
+</component>
+<component name="nss_si_speech_recognition_data_api" long-name="NSS SI Speech Recognition Data API" filter="s60" class="api">
+<unit bldFile="app/speechsrv/speechsrv_plat/nss_si_speech_recognition_data_api/group"/>
+</component>
+<component name="nss_tts_common_api" long-name="NSS TTS Common API" filter="s60" class="api">
+<unit bldFile="app/speechsrv/speechsrv_plat/nss_tts_common_api/group"/>
+</component>
+<component name="grcompiler_hw_device_api" long-name="Grammar Compiler Hardware Device API" filter="s60" class="api">
+<unit bldFile="app/speechsrv/speechsrv_plat/grcompiler_hw_device_api/group"/>
+</component>
+<component name="ttp_hw_device_api" long-name="TTP Hardware Device API" filter="s60" class="api">
+<unit bldFile="app/speechsrv/speechsrv_plat/ttp_hw_device_api/group"/>
+</component>
+<component name="vocman_hw_device_api" long-name="VocMan Hardware Device API" filter="s60" class="api">
+<unit bldFile="app/speechsrv/speechsrv_plat/vocman_hw_device_api/group"/>
+</component>
+<component name="speech_synthesis_clientserver_api" long-name="Speech Synthesis Client-Server API" filter="s60" class="api">
+<unit bldFile="app/speechsrv/speechsrv_plat/speech_synthesis_clientserver_api/group"/>
+</component>
+<component name="voice_ui_accessory_button_handling_api" long-name="Voice UI Accessory Button Handling API" filter="s60" class="api">
+<unit bldFile="app/speechsrv/speechsrv_plat/voice_ui_accessory_button_handling_api/group"/>
+</component>
+<component name="ui_voice_recognition_api" long-name="UI Voice Recognition API" filter="s60" class="api">
+<unit bldFile="app/speechsrv/speechsrv_plat/ui_voice_recognition_api/group"/>
+</component>
+<component name="vcommand_settings_cenrep_api" long-name="Voice Command Settings CenRep API" filter="s60" class="api">
+<unit bldFile="app/speechsrv/speechsrv_plat/vcommand_settings_cenrep_api/group"/>
+</component>
+</collection>
+<collection name="voiceui" long-name="Voice UI" level="ui">
+<component name="vcommand" filter="s60" long-name="Voice Commands UI" introduced="^1">
+<unit bldFile="app/speechsrv/voiceui/vcommand/group"/>
+</component>
+<component name="voiceuivoicerecognition" filter="s60" long-name="Voice UI Recognition" introduced="^1">
+<unit bldFile="app/speechsrv/voiceui/voiceuivoicerecognition/group"/>
+</component>
+<component name="pbkinfoviewimpl" filter="s60" long-name="Phonebook Info View Implementation" introduced="^1">
+<unit bldFile="app/speechsrv/voiceui/pbkinfoviewimpl/group"/>
+</component>
+<component name="aiwpbkinfoviewprovider" filter="s60" long-name="AIW Phonebook Info View Provider" introduced="^1" plugin="Y">
+<unit bldFile="app/speechsrv/voiceui/aiwpbkinfoviewprovider/group"/>
+</component>
+<component name="vccontrolpanelplugin" filter="s60" long-name="Voice Commands Control Panel Plugin" introduced="^1" plugin="Y">
+<!-- component is commented out until configuration is in place. Currently #included from voiceui_build -->
+<!--<unit bldFile="voiceui/vccontrolpanelplugin/group"/>-->
+</component>
+<component name="voiceui_build" filter="s60" long-name="Voice UI Build" introduced="^1">
+<!-- can this be put into the other components? -->
+<unit bldFile="app/speechsrv/voiceui/group"/>
+</component>
+</collection>
+<collection name="srsf" long-name="Speech Recognition and Synthesis Framework" level="framework">
+<component name="sispeechrecognitiondata" filter="s60" long-name="SI Speech Recognition Data">
+<unit bldFile="app/speechsrv/srsf/sispeechrecognitiondata/group"/>
+</component>
+<component name="ttscommon" filter="s60" long-name="TTS Common">
+<unit bldFile="app/speechsrv/srsf/ttscommon/group"/>
+</component>
+<component name="devtts" filter="s60" long-name="Text to Speech">
+<unit bldFile="app/speechsrv/srsf/devtts/group"/>
+</component>
+<component name="ttscustomcommands" filter="s60" long-name="TTS Custom Commands">
+<unit bldFile="app/speechsrv/srsf/ttscustomcommands/group"/>
+</component>
+<component name="ttscontrollerplugin" filter="s60" long-name="TTS Controller Plugin" plugin="Y">
+<unit bldFile="app/speechsrv/srsf/ttscontrollerplugin/group"/>
+</component>
+<component name="ttsutility" filter="s60" long-name="TTS Utility">
+<unit bldFile="app/speechsrv/srsf/ttsutility/group"/>
+</component>
+<component name="speechsynthesis" filter="s60" long-name="Speech Synthesis">
+<!-- can only have one unit. #include these from a common bld.inf -->
+<unit bldFile="app/speechsrv/srsf/speechsynthesis/client/group"/>
+<unit bldFile="app/speechsrv/srsf/speechsynthesis/server/group"/>
+</component>
+<component name="devasr" filter="s60" long-name="Audio Recording and Speech Recognition">
+<unit bldFile="app/speechsrv/srsf/devasr/group"/>
+</component>
+<component name="sicc" filter="s60" long-name="Speaker Independent Custom Commands">
+<unit bldFile="app/speechsrv/srsf/sicc/group"/>
+</component>
+<component name="sisrscontrollerplugin" filter="s60" long-name="SI SRS Controller Plugin" plugin="Y">
+<unit bldFile="app/speechsrv/srsf/sisrscontrollerplugin/group"/>
+</component>
+<component name="siutility" filter="s60" long-name="Speaker Independent Utility">
+<unit bldFile="app/speechsrv/srsf/siutility/group"/>
+</component>
+<component name="nssvasapi" filter="s60" long-name="NSS VAS API">
+<unit bldFile="app/speechsrv/srsf/nssvasapi/group"/>
+</component>
+<component name="nssvascontacthdlr" filter="s60" long-name="NSS VAS Contact Handler">
+<unit bldFile="app/speechsrv/srsf/nssvascontacthdlr/group"/>
+</component>
+<component name="vcommandhandler" filter="s60" long-name="Voice Command Handler">
+<unit bldFile="app/speechsrv/srsf/vcommandhandler/group"/>
+</component>
+<component name="vuiphandler" filter="s60" long-name="Voice UI Plugin Handler">
+<unit bldFile="app/speechsrv/srsf/vuiphandler/group"/>
+</component>
+<component name="vcommandexecutor" filter="s60" long-name="Voice Command Executor">
+<unit bldFile="app/speechsrv/srsf/vcommandexecutor/group"/>
+</component>
+<component name="vcommandexecutorbearer" filter="s60" long-name="Voice Command Executor Bearer">
+<unit bldFile="app/speechsrv/srsf/vcommandexecutorbearer/group"/>
+</component>
+<component name="vcommandmanager" filter="s60" long-name="Voice Command Manager">
+<unit bldFile="app/speechsrv/srsf/vcommandmanager/group"/>
+</component>
+<component name="vcexecutorapp" filter="s60" long-name="Voice Command Executor Application">
+<unit bldFile="app/speechsrv/srsf/vcexecutorapp/group"/>
+</component>
+<component name="profileobserverplugin" filter="s60" long-name="Profile Observer Plugin" plugin="Y">
+<unit bldFile="app/speechsrv/srsf/profileobserverplugin/group"/>
+</component>
+<component name="srsf_build" filter="s60" long-name="Speech Recognition and Synthesis Framework Build">
+<!-- should distribute this into the above components -->
+<unit bldFile="app/speechsrv/srsf/group"/>
+</component>
+</collection>
+<collection name="speechsrv_info" long-name="Speech Recognition UIs Info" level="ui"/>
+</block>
+<block name="homescreentools" level="services" long-name="Home Screen Tools" levels="tool install">
+<collection name="dtdinstaller" long-name="DTD Installer" level="install">
+<!-- collection is really a component. Needs to be moved down a directory -->
+<!-- this needs to be built first, does build order need to be forced with filters? -->
+<component name="dtdinstaller_build" filter="s60" long-name="DTD Installer Build" class="tool PC">
+<unit bldFile="app/homescreentools/dtdinstaller/group"/>
+</component>
+</collection>
+<collection name="themeinstaller" long-name="Theme Installer" level="install">
+<!-- collection is really a component. Needs to be moved down a directory -->
+<component name="themeinstaller_build" filter="s60" long-name="Theme Installer Build" class="tool PC">
+<unit bldFile="app/homescreentools/themeinstaller/group"/>
+</component>
+</collection>
+<collection name="widgettools" long-name="Widget Tools" level="install">
+<component name="hspluginpreinstaller" filter="s60" long-name="HS Plugin Preinstaller" introduced="^3" class="tool PC">
+<unit bldFile="app/homescreentools/widgettools/hspluginspreinstaller/group"/>
+</component>
+<component name="wrtwidgetpreinstaller" filter="s60" long-name="WRT Widget Preinstaller" introduced="^3" class="tool PC">
+<unit bldFile="app/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
+</component>
+</collection>
+</block>
+<block name="webuis" level="services" long-name="Web UIs" levels="plugin app">
+<collection name="browserui" long-name="Browser UI" level="app">
+<component name="browser" filter="s60" long-name="Browser">
+<unit bldFile="app/webuis/browserui/browser/group"/>
+</component>
+<component name="operatormenu" filter="s60" long-name="Browser Operator Menu">
+<unit bldFile="app/webuis/browserui/operatormenu/group"/>
+</component>
+<component name="videoservices" filter="s60" long-name="Browser Video Services">
+<unit bldFile="app/webuis/browserui/videoservices/group"/>
+</component>
+</collection>
+<collection name="browserplugins" long-name="Browser Plugins" level="plugin">
+<component name="browsersysteminfoplugin" filter="s60" long-name="Browser System Info Plugin" plugin="Y">
+<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
+<!-- <unit bldFile="browserplugins/browsersysteminfoplugin/group"/>-->
+</component>
+<component name="browsergpsplugin" filter="s60" long-name="Browser GPS Plugin" plugin="Y">
+<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
+<!-- <unit bldFile="browserplugins/browsergpsplugin/group"/>-->
+</component>
+<component name="browseraudiovideoplugin" filter="s60" long-name="Browser Audio Video Plugin" plugin="Y">
+<unit bldFile="app/webuis/browserplugins/browseraudiovideoplugin/group"/>
+</component>
+<component name="browserplugins_build" filter="s60" long-name="Browser Plugins Build">
+<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
+<unit bldFile="app/webuis/browserplugins/group"/>
+</component>
+</collection>
+<collection name="pushmtm" long-name="Push MTM" level="plugin">
+<component name="pushmtm_help" filter="s60" long-name="Push MTM Help">
+<unit bldFile="app/webuis/pushmtm/help/group"/>
+</component>
+<component name="plugins" filter="s60" long-name="Push MTM Plugins" plugin="Y">
+<unit bldFile="app/webuis/pushmtm/plugins/group"/>
+</component>
+<component name="pushmtm_build" filter="s60" long-name="Push MTM Build">
+<!-- Some content is at collection level and some is at comopnent level. Either make this a single
+ component and move it down a diretcory, or make separate independent components in this collection -->
+<unit bldFile="app/webuis/pushmtm/group"/>
+</component>
+</collection>
+</block>
+<block name="jrt" level="services" long-name="Java Runtime" levels="util generic rt ui">
+<collection name="jrt_plat" long-name="JRT Platform Interfaces" level="ui">
+<component name="java_registry_api" long-name="Java Registry API" filter="s60" class="api">
+<unit bldFile="app/jrt/jrt_plat/java_registry_api/build"/>
+</component>
+<component name="java_env_info_api" long-name="Java Environment Info API" filter="s60" class="api">
+<unit bldFile="app/jrt/jrt_plat/java_env_info_api/build"/>
+</component>
+<component name="java_debug_api" long-name="Java Debug API" filter="s60" class="api">
+<unit bldFile="app/jrt/jrt_plat/java_debug_api/build"/>
+</component>
+</collection>
+<collection name="java_build" long-name="JRT Build" level="util">
+<component name="java_build_sf" filter="sf_build" long-name="JRT Build for Symbian Foundation">
+<unit bldFile="app/jrt/group/sf"/>
+</component>
+</collection>
+</block>
+<block name="conntools" level="services" long-name="Connectivity Tools" levels="config app">
+<collection name="nettools" long-name="Net Tools" level="app">
+<component name="conntest" filter="s60" long-name="Connection Test" purpose="development">
+<unit bldFile="app/conntools/nettools/conntest/group"/>
+</component>
+</collection>
+<collection name="emulatorlan" long-name="Emulator LAN" level="config">
+<!-- component is actually a colleciton, should be moved down a directory -->
+<component name="emulatorlan_build" filter="s60" long-name="Emulator LAN Build" purpose="development" class="config">
+<unit bldFile="app/conntools/emulatorlan/group"/>
+</component>
+</collection>
+</block>
+<block name="rndtools" level="services" long-name="R&D tools" levels="support generic test util">
+<collection name="creator" long-name="Creator" level="support">
+<!-- collection is really a component. Should move down a directory -->
+<component name="creator_build" filter="s60" long-name="Creator Tool" purpose="development" class="tool">
+<unit bldFile="app/rndtools/creator/group"/>
+</component>
+</collection>
+<collection name="filebrowser" long-name="File Browser" level="util">
+<!-- consider collapsing into a single component -->
+<component name="fileopserver" filter="s60" long-name="File Operations Server" purpose="development" class="tool">
+<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
+<!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
+</component>
+<component name="fileopclient" filter="s60" long-name="File Operations Client" purpose="development" class="tool">
+<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
+<!--<unit bldFile="filebrowser/fileopclient/group"/>-->
+</component>
+<component name="filebrowser_build" filter="s60" long-name="File Browser Application" purpose="development" class="tool">
+<!-- Need to make this a self-contained component by removing #includes. Can only do when configuration is in place-->
+<unit bldFile="app/rndtools/filebrowser/group"/>
+</component>
+</collection>
+<collection name="launcher" long-name="Launcher" level="util">
+<!-- collection is really a component. Should move down a directory -->
+<component name="launcher_build" filter="s60" long-name="Launcher Utility" purpose="development" class="tool">
+<unit bldFile="app/rndtools/launcher/group"/>
+</component>
+</collection>
+<collection name="loadgen" long-name="Load Generator" level="test">
+<!-- collection is really a component. Should move down a directory -->
+<component name="loadgen_build" filter="s60" long-name="Load Generator Application" purpose="development" class="tool">
+<unit bldFile="app/rndtools/loadgen/group"/>
+</component>
+</collection>
+<collection name="perfmon" long-name="Performance Monitor" level="test">
+<!-- collection is really a component. Should move down a directory -->
+<component name="perfmon_build" filter="s60" long-name="Performance Monitor Tool" purpose="development" class="tool">
+<unit bldFile="app/rndtools/perfmon/group"/>
+</component>
+</collection>
+<collection name="screengrabber" long-name="Screen Grabber" level="util">
+<!-- collection is really a component. Should move down a directory -->
+<component name="screengrabber_build" filter="s60" long-name="ScreenGrabber" purpose="development" class="tool">
+<unit bldFile="app/rndtools/screengrabber/group"/>
+</component>
+</collection>
+<collection name="stifui" long-name="STIF UI" level="generic">
+<component name="stifui_avkon" filter="s60" long-name="STIF UI for Avkon" purpose="development">
+<unit bldFile="app/rndtools/stifui/avkon/group"/>
+</component>
+</collection>
+<collection name="memspyui" long-name="Memspy UI" level="generic">
+<!-- collection is really a component. Should move down a directory -->
+<component name="memspyui_build" filter="s60" long-name="Memspy UI Application" purpose="development" class="tool">
+<unit bldFile="app/rndtools/memspyui/group"/>
+</component>
+</collection>
+<collection name="htiui" long-name="Harmonized Test Interface UI" level="generic">
+<component name="HtiServicePlugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
+<!-- can only have a single unit. Should #include from a common bld.inf file -->
+<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
+<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
+<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
+<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
+<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
+<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
+<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
+<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiFtpBackupFake/group"/>
+</component>
+<component name="htidevicereboot" filter="s60" long-name="HTI Device Reboot" purpose="development">
+<unit bldFile="app/rndtools/htiui/htidevicereboot/group"/>
+</component>
+<component name="htistartupwait" filter="s60" long-name="HTI Startup Wait" purpose="development">
+<unit bldFile="app/rndtools/htiui/htistartupwait/group"/>
+</component>
+<component name="htiadmin" filter="s60" long-name="HTI Admin" purpose="development">
+<unit bldFile="app/rndtools/htiui/htiadmin/group"/>
+</component>
+<component name="htiui_build" filter="s60" long-name="HTI UI Build" purpose="development">
+<!-- can this be split up into the other components or made a ROM component? -->
+<unit bldFile="app/rndtools/htiui/group"/>
+</component>
+</collection>
+</block>
+<block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools if ui">
+<collection name="csxhelp" long-name="Context Sensitive Extended Help" level="if">
+<!-- this is really a component. Should move it down a directory -->
+<component name="csxhelp_build" filter="s60" long-name="Context Sensitive Extended Help Build">
+<unit bldFile="app/helps/csxhelp/group"/>
+</component>
+</collection>
+<collection name="symhelp" long-name="Symbian Help" level="eng">
+<component name="helpmodel" long-name="Help" introduced="6.0" purpose="optional">
+<unit bldFile="app/helps/symhelp/helpmodel/group" mrp="app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
+</component>
+</collection>
+<collection name="helps_info" long-name="Help Apps Info" level="ui">
+<component name="helps_metadata" long-name="Help Apps Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="app/helps/helps_info/helps_metadata/helps_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
+<collection name="buildverification" long-name="Build Verification" level="services">
+<component name="autosmoketest" long-name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
+<unit bldFile="app/techview/buildverification/autosmoketest/Group" mrp="app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
+</component>
+<component name="smoketest" long-name="Smoke Test" filter="gt" purpose="development">
+<unit bldFile="app/techview/buildverification/smoketest/Group" mrp="app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
+</component>
+</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="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"/>
+<collection name="installationapps" long-name="Installation Apps" level="apps2"/>
+<collection name="messagingapps" long-name="Messaging Apps" level="apps2"/>
+<collection name="telephonyapps" long-name="Telephony Apps" level="apps1"/>
+<collection name="networkingapps" long-name="Networking Apps" level="apps1"/>
+<collection name="networkingutils" long-name="Networking Utils" level="utils"/>
+<collection name="shortlinkapps" long-name="Shortlink Apps" level="apps1"/>
+<collection name="testapps" long-name="Test Apps" level="utils"/>
+<collection name="avapps" long-name="A/V Apps" level="apps3"/>
+<collection name="toolkit" long-name="Toolkit" level="utils"/>
+<collection name="techview_info" long-name="Techview Info" level="apps3">
+<component name="techview_metadata" long-name="Techview Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="app/techview/techview_info/techview_metadata/techview_metadata.mrp"/>
+</component>
+</collection>
+</block>
+</layer>
+</systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/single/sysdefs/auto/system_model_3.0.xml Tue Jul 13 12:21:44 2010 +0100
@@ -0,0 +1,11180 @@
+<?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">
+<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"/>
+</component>
+<component id="btaudioadaptation_stub" name="Bluetooth Audio Adaptation Stub">
+<unit bldFile="/adaptation/stubs/btaudioadaptation_stub/group"/>
+</component>
+<component id="drm_stubs" name="DRM Stubs">
+<unit bldFile="/adaptation/stubs/drm_stubs/group"/>
+</component>
+<component id="ocrsrv_stub" name="OCR Services Stub">
+<unit bldFile="/adaptation/stubs/ocrsrv_stub/group"/>
+</component>
+<component id="omasuplasnconverterstubimpl" name="OMA SUPL ASN Converter Stub Implementation">
+<unit bldFile="/adaptation/stubs/omasuplasnconverterstubimpl/group"/>
+</component>
+<component id="posmsgpluginreferenceimpl" name="POS Message Plugin Reference Implementation" class="plugin">
+<unit bldFile="/adaptation/stubs/posmsgpluginreferenceimpl/group"/>
+</component>
+<component id="srsfenginestub" name="SRSF Engine Stub">
+<unit bldFile="/adaptation/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"/>
+</component>
+<component id="systemswstubs" name="System Software Stubs">
+<unit bldFile="/adaptation/stubs/systemswstubs/group"/>
+</component>
+<component id="tactileclickplugin_stub" name="Tactile Click Plugin Stub" class="plugin">
+<unit bldFile="/adaptation/stubs/tactileclickplugin_stub/group"/>
+</component>
+<component id="wlanhwinit_stub" name="WLAN Hardware Init Stub">
+<unit bldFile="/adaptation/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"/>
+</component>
+<component id="omap3530_kernel" name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
+<unit bldFile="/adaptation/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"/>
+</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"/>
+</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">
+<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">
+<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 id="e32utils" name="E32 Utilities" purpose="development">
+<unit bldFile="/os/kernelhwsrv/kerneltest/e32utils/group" mrp="/os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/>
+</component>
+<component id="e32test" name="E32 Tests" purpose="development">
+<unit bldFile="/os/kernelhwsrv/kerneltest/e32test/group" mrp="/os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
+</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">
+<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>
+<component id="serialldd" name="Serial Port Drivers" purpose="optional">
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="/os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
+</component>
+<component id="legacydrivers" name="Legacy Drivers" purpose="optional">
+<unit mrp="/os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
+</component>
+<component id="locmedia" name="Local Media Subsystem" introduced="8.1b" purpose="mandatory">
+<!-- these are LDDs for storage media-->
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="/os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
+</component>
+<component id="runmodedebugger" name="Run Mode Debugger" purpose="mandatory">
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/debug/group" mrp="/os/kernelhwsrv/kernel/eka/drivers/debug/group/base_e32_drivers_debug.mrp"/>
+</component>
+<component id="btrace" name="Kernel Trace Tool" purpose="mandatory">
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/trace" mrp="/os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
+</component>
+<component id="cameraldd" name="Camera Drivers" introduced="^3" purpose="optional">
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/camerasc" mrp="/os/kernelhwsrv/kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
+</component>
+<component id="displayldd" name="Display Drivers" introduced="^3" purpose="optional">
+<!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/display" mrp="/os/kernelhwsrv/kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
+</component>
+<component id="usbclientdrivers" name="USB Client Drivers" introduced="8.1b" purpose="optional">
+<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="/os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
+</component>
+<component id="usbdescriptors" name="USB Descriptors" purpose="optional">
+<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors" mrp="/os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors/base_drivers_usbdescriptors.mrp"/>
+</component>
+<component id="usbdi_utils" name="USB DI Utils" purpose="optional">
+<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils" mrp="/os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils/base_drivers_usbdi_utils.mrp"/>
+</component>
+</collection>
+<collection id="driversupport" name="Generic Driver Support" level="hw-if">
+<component id="mediadrivers" name="Media Drivers" purpose="optional">
+<!-- these are for storage media-->
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/media" mrp="/os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
+</component>
+<component id="genericboardsupport" name="Generic Board Support" purpose="optional">
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="/os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
+</component>
+</collection>
+<collection id="userlibandfileserver" name="User Library and File Server" level="framework">
+<component id="euser" name="User Library" purpose="mandatory">
+<unit bldFile="/os/kernelhwsrv/kernel/eka/euser" mrp="/os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
+</component>
+<component id="compsupp" name="Compiler Runtime Support" filter="gt" purpose="mandatory">
+<unit bldFile="/os/kernelhwsrv/kernel/eka/compsupp" mrp="/os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
+</component>
+<component id="fileserver" name="File Server" filter="gt" purpose="mandatory">
+<unit bldFile="/os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
+</component>
+<component id="estart" name="Base Starter" filter="gt" purpose="optional">
+<unit bldFile="/os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
+</component>
+<component id="domainmgr" name="Domain Manager" introduced="8.1b" purpose="mandatory">
+<unit bldFile="/os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="/os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
+</component>
+</collection>
+<collection id="filesystems" name="File Systems" level="framework">
+<component id="romfs" name="ROM File System" filter="gt" purpose="optional" class="plugin">
+<unit mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
+</component>
+<component id="rofs" name="ROFS" filter="gt" purpose="optional" class="plugin">
+<unit bldFile="/os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
+</component>
+<component id="usbmsfs" name="USB Mass Storage File System" filter="gt" purpose="optional" class="plugin">
+<unit bldFile="/os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
+</component>
+<component id="usbhostmssrv" name="USB Host Mass Storage Server" filter="gt" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage" mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage/base_f32_shostmassstorage.mrp"/>
+</component>
+<component id="fat32fs" name="FAT32 File System" filter="gt" purpose="optional" class="plugin">
+<unit bldFile="/os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
+</component>
+<component id="fatfs" name="FAT File System" filter="gt" purpose="optional" class="plugin">
+<unit bldFile="/os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
+</component>
+<component id="compfs" name="Composite File System" filter="gt" purpose="optional" class="plugin">
+<unit bldFile="/os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
+</component>
+</collection>
+<collection id="halservices" name="HAL Services" level="framework">
+<component id="hal" name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
+<unit bldFile="/os/kernelhwsrv/halservices/hal" mrp="/os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
+</component>
+</collection>
+<collection id="textmodeshell" name="Text Mode Shell" level="test">
+<component id="e32wsrv" name="Text Window Server" purpose="optional">
+<unit bldFile="/os/kernelhwsrv/kernel/eka/ewsrv" mrp="/os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
+</component>
+<component id="textshell" name="Text Shell" filter="gt" purpose="development">
+<unit bldFile="/os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
+</component>
+</collection>
+<collection id="baseapitest" name="Base API Tests" level="test">
+
+</collection>
+<collection id="kernelhwsrv_info" name="Kernel and Hardware Services Info" level="test">
+<component id="kernelhwsrv_metadata" name="Kernel and Hardware Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="boardsupport" level="hw" tech-domain="hb" name="Board Support" levels="bsp test 2 3 config">
+<collection id="emulator" name="Emulator" level="bsp">
+<component id="emulatorbsp" name="Emulator BSP" purpose="optional">
+<unit bldFile="/os/boardsupport/emulator/emulatorbsp" mrp="/os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
+</component>
+</collection>
+<collection id="haitest" name="HAI Test Suites" level="test">
+<component id="bspsvs" name="BSP Verification Suite" introduced="^2" purpose="development">
+<unit mrp="/os/boardsupport/haitest/bspsvs/group/bspsvs.mrp"/>
+</component>
+</collection>
+<collection id="boardsupport_info" name="Board Support Info" level="config">
+<component id="boardsupport_metadata" name="Board Support Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/boardsupport/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="buildtools" level="hw" tech-domain="to" name="Build Tools" levels="bld mw fw ui">
+<collection id="bldsystemtools" name="Build System Tools" level="bld">
+<component id="sysdeftools" name="System Definition Tools" purpose="development" introduced="^2">
+<unit mrp="/os/buildtools/bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
+</component>
+<component id="commonbldutils" name="Common Utils" purpose="development">
+<unit mrp="/os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
+</component>
+</collection>
+<collection id="toolsandutils" name="Tools and Utils" level="mw">
+<component id="productionbldtools" name="Production Build Tools" filter="gt" purpose="development">
+<unit mrp="/os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
+</component>
+<component id="e32tools" name="E32 Tools" deprecated="^2" purpose="development" target="desktop">
+<unit bldFile="/os/buildtools/toolsandutils/e32tools/group" mrp="/os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
+</component>
+
+<component id="autotest" name="Autotest" purpose="development">
+<unit bldFile="/os/buildtools/toolsandutils/autotest/group" mrp="/os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
+</component>
+</collection>
+<collection id="sbsv1_os" name="Symbian Build System v1" level="fw">
+<component id="e32toolp" name="E32 Perl Tools" purpose="development" target="desktop" filter="sf_build">
+<unit mrp="/os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="/os/buildtools/sbsv1_os/e32toolp/group"/>
+</component>
+</collection>
+<collection id="imgtools_os" name="Image Tools" level="fw">
+<component id="romkiteka2" name="ROMKIT EKA2" deprecated="^2" purpose="development">
+<unit bldFile="/os/buildtools/imgtools_os/romkiteka2/group" mrp="/os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
+</component>
+</collection>
+<collection id="misccomponents" name="Misc Components" level="mw">
+<component id="emulatorlauncher" name="Emulator Launcher" filter="gt" purpose="development">
+<unit bldFile="/os/buildtools/misccomponents/emulatorlauncher/group" mrp="/os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
+</component>
+</collection>
+<collection id="buildtools_info" name="Build Tools Info" level="ui">
+<component id="buildtools_metadata" name="Build Tools Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/buildtools/buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="ossrv" level="services" tech-domain="hb" name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
+<collection id="ossrv_pub" name="Generic OS Services Public Interfaces" level="utilities">
+<component id="boost_apis" name="Boost APIs" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/boost_apis/group"/>
+</component>
+<component id="cpp_wrappers" name="Cpp wrappers" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/cpp_wrappers/group"/>
+</component>
+<component id="character_type_apis" name="Character Type APIs" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/character_type_apis/group"/>
+</component>
+<component id="compiler_specific_runtime_support" name="Compiler Specific Runtime Support" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/compiler_specific_runtime_support/group"/>
+</component>
+<component id="ossrv_configuration_api" name="Generic OS Services Configuration API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/configuration/group"/>
+</component>
+<component id="crypto_authentication_codes_and_hash_functions_api" name="Crypto Authentication Codes and Hash Functions API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
+</component>
+<component id="crypto_auxillary_functions_api" name="Crypto Auxillary Functions API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/crypto_auxillary_functions_api/group"/>
+</component>
+<component id="crypto_certificates_api" name="Crypto Certificates API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/crypto_certificates_api/group"/>
+</component>
+<component id="crypto_inputoutput_and_data_encoding_api" name="Crypto Input/Output and Data Encoding API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
+</component>
+<component id="crypto_public_key_cryptography_and_key_agreement_api" name="Crypto Public Key Cryptography and Key Agreement API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
+</component>
+<component id="crypto_symmetric_ciphers_api" name="Crypto Symmetric Ciphers API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/crypto_symmetric_ciphers_api/group"/>
+</component>
+<component id="crypto_utility_functions_api" name="Crypto Utility Functions API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/crypto_utility_functions_api/group"/>
+</component>
+<component id="cryptogaphy_related_api" name="Cryptogaphy Related API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/cryptogaphy_related_api/group"/>
+</component>
+<component id="ossrv_debug_api" name="Generic OS Services Debug API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/debug/group"/>
+</component>
+<component id="ossrv_exceptions_api" name="Generic OS Services Exceptions API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/exceptions/group"/>
+</component>
+<component id="gboxed" name="GBoxed API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/gboxed/group"/>
+</component>
+<component id="glib_arrays" name="Glib Arrays API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_arrays/group"/>
+</component>
+<component id="glib_asynchronous_queues" name="Glib Asynchronous Queues API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_asynchronous_queues/group"/>
+</component>
+<component id="glib_atomic_operations" name="Glib Atomic Operations API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_atomic_operations/group"/>
+</component>
+<component id="glib_automatic_string_completion" name="Glib Automatic String Completion API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_automatic_string_completion/group"/>
+</component>
+<component id="glib_balanced_binary_trees" name="Glib Balanced Binary Trees API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_balanced_binary_trees/group"/>
+</component>
+<component id="glib_basic_types" name="Glib Basic Types API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_basic_types/group"/>
+</component>
+<component id="glib_caches" name="Glib Caches API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_caches/group"/>
+</component>
+<component id="glib_character_set_conversion" name="Glib Character Set Conversion API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_character_set_conversion/group"/>
+</component>
+<component id="glib_closures" name="Glib Closures API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_closures/group"/>
+</component>
+<component id="glib_commandline_option_parser" name="Glib Command Line Option Parser API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_commandline_option_parser/group"/>
+</component>
+<component id="glib_datasets" name="Glib Datasets API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_datasets/group"/>
+</component>
+<component id="glib_date_and_time_functions" name="Glib Date and Time Functions API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_date_and_time_functions/group"/>
+</component>
+<component id="glib_doubleended_queues" name="Glib Double-ended Queues API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_doubleended_queues/group"/>
+</component>
+<component id="glib_doublylinked_lists" name="Glib Doubly-Linked Lists API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_doublylinked_lists/group"/>
+</component>
+<component id="glib_dynamic_loading_of_modules" name="Glib Dynamic Loading of Modules API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_dynamic_loading_of_modules/group"/>
+</component>
+<component id="glib_enums_and_flags" name="Glib Enums and Flags API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_enums_and_flags/group"/>
+</component>
+<component id="glib_error_reporting" name="Glib Error Reporting API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_error_reporting/group"/>
+</component>
+<component id="glib_file_utilities" name="Glib File Utilities API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_file_utilities/group"/>
+</component>
+<component id="glib_generic_values" name="Glib Generic Values API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_generic_values/group"/>
+</component>
+<component id="glib_globstyle_pattern_matching" name="Glib Glob-Style Pattern Matching API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_globstyle_pattern_matching/group"/>
+</component>
+<component id="glib_hash_tables" name="Glib Hash Tables API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_hash_tables/group"/>
+</component>
+<component id="glib_hook_functions" name="Glib Hook Functions API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_hook_functions/group"/>
+</component>
+<component id="glib_internationalization" name="Glib Internationalization API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_internationalization/group"/>
+</component>
+<component id="glib_io_channels" name="Glib I/O Channels API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_io_channels/group"/>
+</component>
+<component id="glib_keyvalue_file_parser" name="Glib Key-Value File Parser API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_keyvalue_file_parser/group"/>
+</component>
+<component id="glib_lexical_scanner" name="Glib Lexical Scanner API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_lexical_scanner/group"/>
+</component>
+<component id="glib_main_event_loop" name="Glib Main Event Loop API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_main_event_loop/group"/>
+</component>
+<component id="glib_memory_allocation" name="Glib Memory Allocation API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_memory_allocation/group"/>
+</component>
+<component id="glib_memory_slices" name="Glib Memory Slices API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_memory_slices/group"/>
+</component>
+<component id="glib_message_logging" name="Glib Message Logging API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_message_logging/group"/>
+</component>
+<component id="glib_miscellaneous_utility_functions" name="Glib Miscellaneous Utility Functions API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_miscellaneous_utility_functions/group"/>
+</component>
+<component id="glib_nary_trees" name="Glib N-ary Trees API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_nary_trees/group"/>
+</component>
+<component id="glib_parameters_and_values" name="Glib Parameters and Values API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_parameters_and_values/group"/>
+</component>
+<component id="glib_quarks" name="Glib Quarks API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_quarks/group"/>
+</component>
+<component id="glib_random_numbers" name="Glib Random Numbers API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_random_numbers/group"/>
+</component>
+<component id="glib_relations_and_tuples" name="Glib Relations and Tuples API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_relations_and_tuples/group"/>
+</component>
+<component id="glib_shellrelated_utilities" name="Glib Shell-related Utilities API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_shellrelated_utilities/group"/>
+</component>
+<component id="glib_signals" name="Glib Signals API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_signals/group"/>
+</component>
+<component id="glib_simple_xml_subset_parser" name="Glib Simple XML Subset Parser API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_simple_xml_subset_parser/group"/>
+</component>
+<component id="glib_singlylinked_lists" name="Glib Singly-Linked Lists API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_singlylinked_lists/group"/>
+</component>
+<component id="glib_spawning_processes" name="Glib Spawning Processes API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_spawning_processes/group"/>
+</component>
+<component id="glib_standard_macros" name="Glib Standard Macros API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_standard_macros/group"/>
+</component>
+<component id="glib_string_utility_functions" name="Glib String Utility Functions API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_string_utility_functions/group"/>
+</component>
+<component id="glib_strings" name="Glib Strings API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_strings/group"/>
+</component>
+<component id="glib_thread_pools" name="Glib Thread Pools API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_thread_pools/group"/>
+</component>
+<component id="glib_threads" name="Glib Threads API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_threads/group"/>
+</component>
+<component id="glib_timers" name="Glib Timers API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_timers/group"/>
+</component>
+<component id="glib_unicode_manipulation" name="Glib Unicode Manipulation API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_unicode_manipulation/group"/>
+</component>
+<component id="glib_value_arrays" name="Glib Value Arrays API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_value_arrays/group"/>
+</component>
+<component id="glib_varargs_value_collection" name="Glib Varargs Value Collection API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/glib_varargs_value_collection/group"/>
+</component>
+<component id="gobject" name="GObject API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/gobject/group"/>
+</component>
+<component id="gparamspec" name="GParamSpec API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/gparamspec/group"/>
+</component>
+<component id="gtype" name="GType API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/gtype/group"/>
+</component>
+<component id="gtypemodule" name="GTypeModule API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/gtypemodule/group"/>
+</component>
+<component id="gtypeplugin" name="GTypePlugin API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/gtypeplugin/group"/>
+</component>
+<component id="io_stream_api" name="I/O stream API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/io_stream_api/group"/>
+</component>
+<component id="localization_function_api" name="Localization Function API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/localization_function_api/group"/>
+</component>
+<component id="math_operations_api" name="Math Operations API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/math_operations_api/group"/>
+</component>
+<component id="ossrv_memory_api" name="Generic OS Services Memory API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/memory/group"/>
+</component>
+<component id="no_namespace_headers" name="No Namespace Headers" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/no_namespace_headers/group"/>
+</component>
+<component id="openc_headers" name="OpenC headers" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/openc_headers/group"/>
+</component>
+<component id="openc_wrappers" name="OpenC wrappers" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/openc_wrappers/group"/>
+</component>
+<component id="ssl_general_api" name="SSL General API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/ssl_general_api/group"/>
+</component>
+<component id="ssl_protocol_methods_api" name="SSL Protocol Methods API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/ssl_protocol_methods_api/group"/>
+</component>
+<component id="standard_compressiondecompression_api" name="Standard Compression/Decompression API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/standard_compressiondecompression_api/group"/>
+</component>
+<component id="stl" name="STL API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/stl/group"/>
+</component>
+<component id="thread_api" name="Thread API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/thread_api/group"/>
+</component>
+<component id="type_attributes" name="Type Attributes API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/type_attributes/group"/>
+</component>
+<component id="typeinfo" name="Type Info API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/typeinfo/group"/>
+</component>
+<component id="utility_apis" name="Utility APIs" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/utility_apis/group"/>
+</component>
+<component id="wide_character_classapis" name="Wide character class/apis" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/wide_character_classapis/group"/>
+</component>
+<component id="dbus_api" name="Dbus API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/dbus/group"/>
+</component>
+<component id="dbus-glib" name="Dbus-glib API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/dbus-glib/group"/>
+</component>
+</collection>
+<collection id="ossrv_plat" name="Generic OS Services Platform Interfaces" level="utilities">
+<component id="libutils_apis" name="Utility Library APIs" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_plat/libutils/group"/>
+</component>
+</collection>
+<collection id="stdlibs" name="Standard Libraries" level="translation">
+<component id="libz" filter="s60" name="Z Compression Library">
+<unit bldFile="/os/ossrv/stdlibs/libz/group"/>
+</component>
+<component id="libcrypt" filter="s60" name="Crypt Library">
+<unit bldFile="/os/ossrv/stdlibs/libcrypt/group"/>
+</component>
+</collection>
+<collection id="ssl" name="SSL" level="data-services">
+<component id="libcrypto" filter="s60" name="Crypto Library">
+<unit bldFile="/os/ossrv/ssl/libcrypto/group"/>
+</component>
+<component id="libssl" filter="s60" purpose="development" name="SSL Library">
+<unit bldFile="/os/ossrv/ssl/libssl/group"/>
+</component>
+</collection>
+<collection id="glib" name="GLib" level="utilities">
+<component id="glibbackend" filter="s60" name="GLib Backend">
+<unit bldFile="/os/ossrv/glib/glibbackend/group"/>
+</component>
+<component id="libglib" filter="s60" name="GLib Library">
+<unit bldFile="/os/ossrv/glib/libglib/group"/>
+</component>
+<component id="libgthread" filter="s60" name="Libg Thread">
+<unit bldFile="/os/ossrv/glib/libgthread/group"/>
+</component>
+<component id="libgmodule" filter="s60" name="Libg Module">
+<unit bldFile="/os/ossrv/glib/libgmodule/group"/>
+</component>
+<component id="libgobject" filter="s60" name="Libg Object">
+<unit bldFile="/os/ossrv/glib/libgobject/group"/>
+</component>
+</collection>
+<collection id="stdcpp" name="C++ Standard Library" level="translation">
+<!-- collection is really a component. Needs to be moved down a directory -->
+<component id="stdcpp_build" filter="s60" name="Stdcpp">
+<unit bldFile="/os/ossrv/stdcpp/group"/>
+</component>
+</collection>
+<collection id="ofdbus" name="Open Foundation D-Bus" level="utilities">
+<component id="dbus" filter="s60" name="D-Bus">
+<unit bldFile="/os/ossrv/ofdbus/dbus/group"/>
+</component>
+<component id="dbus-glib" filter="s60" name="D-Bus GLib">
+<unit bldFile="/os/ossrv/ofdbus/dbus-glib/group"/>
+</component>
+<component id="ofdbus_rom" filter="s60" name="D-Bus ROM">
+<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory
+ Consider moving IBY file to one of the above as well and removing this component entirely -->
+<unit bldFile="/os/ossrv/ofdbus/group"/>
+</component>
+</collection>
+<collection id="utilitylibraries" name="Utility Libraries" level="encoding">
+<component id="libutils" filter="s60" name="Utility Library">
+<unit bldFile="/os/ossrv/utilitylibraries/libutils/group"/>
+</component>
+</collection>
+<collection id="genericservices" name="Generic Services" level="utilities">
+<component id="s60compatibilityheaders" name="S60 Compatibility Headers" filter="gt" purpose="optional">
+<unit version="tb101sf" bldFile="/os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="/os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp"/>
+</component>
+<component id="mimerecognitionfw" name="MIME Recognition Framework" purpose="mandatory">
+<unit bldFile="/os/ossrv/genericservices/mimerecognitionfw/group" mrp="/os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
+</component>
+<component id="systemagent" name="System Agent" introduced="9.0" purpose="mandatory">
+<unit bldFile="/os/ossrv/genericservices/systemagent/group" mrp="/os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
+</component>
+<component id="taskscheduler" name="Task Scheduler" introduced="6.0" purpose="optional">
+<unit bldFile="/os/ossrv/genericservices/taskscheduler/group" mrp="/os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
+</component>
+<component id="activebackupclient" name="Active Backup Client" purpose="optional">
+<unit bldFile="/os/ossrv/genericservices/activebackupclient/group" mrp="/os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
+</component>
+<component id="syslibsdocs" name="Syslibs Documentation" purpose="development" class="doc">
+<unit mrp="/os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
+</component>
+<component id="httputils" name="HTTP Utilities Library" introduced="6.2" purpose="optional">
+<unit bldFile="/os/ossrv/genericservices/httputils/group" mrp="/os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
+</component>
+</collection>
+<collection id="syslibsapitest" name="SysLibs API Tests" level="utilities">
+
+</collection>
+<collection id="compressionlibs" name="Compression Libraries" level="data-services">
+<component id="ziplib" name="Zip Compression Library" introduced="6.0" purpose="mandatory">
+<unit bldFile="/os/ossrv/compressionlibs/ziplib/group" mrp="/os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
+</component>
+</collection>
+<collection id="genericopenlibs" name="Generic Open Libraries" level="translation">
+<component id="cstdlib" name="C Standard Library" introduced="ER5" purpose="optional">
+<unit bldFile="/os/ossrv/genericopenlibs/cstdlib/group" mrp="/os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
+</component>
+<component id="cppstdlib" name="C++ Standard Library" introduced="^3" purpose="mandatory">
+<unit bldFile="/os/ossrv/genericopenlibs/cppstdlib/group" mrp="/os/ossrv/genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
+</component>
+<component id="openenvcore" name="Open Environment Core" introduced="^2" purpose="mandatory">
+<unit bldFile="/os/ossrv/genericopenlibs/openenvcore/group" mrp="/os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
+</component>
+<component id="posixrealtimeextensions" name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
+<unit bldFile="/os/ossrv/genericopenlibs/posixrealtimeextensions/group" mrp="/os/ossrv/genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
+</component>
+</collection>
+<collection id="lowlevellibsandfws" name="Low Level Libraries and Frameworks" level="app-libs">
+<component id="pluginfw" name="Plugin Framework" introduced="6.2" purpose="mandatory">
+<unit version="3" bldFile="/os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="/os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp"/>
+</component>
+<component id="apputils" name="Application Utilities" introduced="ER5" purpose="mandatory">
+<unit bldFile="/os/ossrv/lowlevellibsandfws/apputils/group" mrp="/os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
+</component>
+<component id="genericusabilitylib" name="Generic Usability Library" introduced="^3" purpose="mandatory">
+<unit bldFile="/os/ossrv/lowlevellibsandfws/genericusabilitylib/group" mrp="/os/ossrv/lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
+</component>
+</collection>
+<collection id="ossrv_info" name="Generic OS Services Info" level="utilities">
+<component id="ossrv_build" filter="s60" name="Generic OS Services Build">
+<!-- exports should be moved to individual components -->
+<unit bldFile="/os/ossrv/group"/>
+</component>
+<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">
+<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">
+<unit bldFile="/os/persistentdata/featuremgmt/featureregistry/group" mrp="/os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
+</component>
+</collection>
+<collection id="loggingservices" name="Logging Services" level="server">
+<component id="eventlogger" 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 id="filelogger" name="File Logger" introduced="ER5" purpose="optional">
+<unit bldFile="/os/persistentdata/loggingservices/filelogger/group" mrp="/os/persistentdata/loggingservices/filelogger/group/comms-infras_flogger.mrp"/>
+</component>
+<component id="rfilelogger" name="RFile Logger" deprecated="^3" introduced="9.1" purpose="development">
+<unit bldFile="/os/persistentdata/loggingservices/rfilelogger/group" mrp="/os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
+</component>
+</collection>
+<collection id="traceservices" name="Trace Services" level="server">
+<component id="commsdebugutility" name="Comms Debug Utility" introduced="7.0s" purpose="optional">
+<unit bldFile="/os/persistentdata/traceservices/commsdebugutility/group" mrp="/os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
+</component>
+<component id="tracefw" name="Trace Framework" introduced="9.2" purpose="development">
+<unit bldFile="/os/persistentdata/traceservices/tracefw/ulogger/group" mrp="/os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
+</component>
+</collection>
+<collection id="persistentstorage" name="Persistent Storage" level="framework">
+<component id="store" name="Store" purpose="optional">
+<unit bldFile="/os/persistentdata/persistentstorage/store/group" mrp="/os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
+</component>
+<component id="dbms" name="DBMS" purpose="optional">
+<unit bldFile="/os/persistentdata/persistentstorage/dbms/group" mrp="/os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
+</component>
+<component id="centralrepository" name="Central Repository" introduced="7.0s" purpose="mandatory">
+<unit bldFile="/os/persistentdata/persistentstorage/centralrepository/group" mrp="/os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
+</component>
+<component id="sql" name="SQL" introduced="9.3" purpose="optional">
+<unit bldFile="/os/persistentdata/persistentstorage/sql/GROUP" mrp="/os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
+</component>
+<component id="sqlite3api" name="SQLite 3 API" introduced="^3" purpose="optional">
+<unit bldFile="/os/persistentdata/persistentstorage/sqlite3api/GROUP" mrp="/os/persistentdata/persistentstorage/sqlite3api/GROUP/syslibs_sqlite3.mrp"/>
+</component>
+</collection>
+<collection id="persistentdata_info" name="Persistent Data Services Info" level="app-if">
+<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">
+<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">
+<unit bldFile="/os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group"/>
+</component>
+<component id="feature_discovery_api" name="Feature Discovery API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_pub/feature_discovery_api/group"/>
+</component>
+<component id="platform_environment_api" name="Platform Environment API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_pub/platform_environment_api/group"/>
+</component>
+<component id="sensor_channel_api" name="Sensor Channel API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_pub/sensor_channel_api/group"/>
+</component>
+<component id="sensor_definitions_api" name="Sensor Definitions API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_pub/sensor_definitions_api/group"/>
+</component>
+<component id="version_info_api" name="Version Info API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_pub/version_info_api/group"/>
+</component>
+<component id="accessory_monitoring_api" name="Accessory Monitoring API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_pub/accessory_monitoring_api/group"/>
+</component>
+<component id="haptics_api" name="Haptics API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_pub/haptics_api/group"/>
+</component>
+<component id="sensor_data_compensator_api" name="Sensor Data Compensator API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
+</component>
+</collection>
+<collection id="devicesrv_plat" name="Device Services Platform Interfaces" level="app-if">
+<component id="configuration_file_parser_api" name="Configuration File Parser API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/configuration_file_parser_api/group"/>
+</component>
+<component id="dos_extension_plugin_api" name="DOS Extension Plug-In API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/dos_extension_plugin_api/group"/>
+</component>
+<component id="mediator_command_initiator_api" name="Mediator Command Initiator API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/mediator_command_initiator_api/group"/>
+</component>
+<component id="syslangutil_api" name="SysLangUtil API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/syslangutil_api/group"/>
+</component>
+<component id="wakeup_alarm_api" name="Wakeup Alarm API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/wakeup_alarm_api/group"/>
+</component>
+<component id="disk_and_memory_level_keys_api" name="Disk and Memory Level Keys API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/disk_and_memory_level_keys_api/group"/>
+</component>
+<component id="mediator_plugin_api" name="Mediator Plugin API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/mediator_plugin_api/group"/>
+</component>
+<component id="headset_status_api" name="Headset Status API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/headset_status_api/group"/>
+</component>
+<component id="system_startup_extension_plugin_api" name="System Startup Extension Plugin API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/system_startup_extension_plugin_api/group"/>
+</component>
+<component id="sensor_plugin_api" name="Sensor Plugin API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/sensor_plugin_api/group"/>
+</component>
+<component id="accessory_api" name="Accessory API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_api/group"/>
+</component>
+<component id="display_language_definition_api" name="Display Language Definition API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/display_language_definition_api/group"/>
+</component>
+<component id="mediator_command_responder_api" name="Mediator Command Responder API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/mediator_command_responder_api/group"/>
+</component>
+<component id="accessory_policy_definitions_api" name="Accessory Policy Definitions API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_policy_definitions_api/group"/>
+</component>
+<component id="hw_settings_api" name="Hardware Settings API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/hw_settings_api/group"/>
+</component>
+<component id="mediator_domain_definitions_api" name="Mediator Domain Definitions API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/mediator_domain_definitions_api/group"/>
+</component>
+<component id="sensor_extension_api" name="Sensor Extension API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/sensor_extension_api/group"/>
+</component>
+<component id="accessory_plugin_api" name="Accessory Plugin API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_plugin_api/group"/>
+</component>
+<component id="sae_api" name="SAE API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/sae_api/group"/>
+</component>
+<component id="accessory_control_api" name="Accessory Control API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_control_api/group"/>
+</component>
+<component id="mediator_static_registration_api" name="Mediator Static Registration API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/mediator_static_registration_api/group"/>
+</component>
+<component id="accessory_key_event_handling_api" name="Accessory Key Event Handling API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_key_event_handling_api/group"/>
+</component>
+<component id="mediator_notification_api" name="Mediator Notification API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/mediator_notification_api/group"/>
+</component>
+<component id="accessory_policy_utility_api" name="Accessory Policy Utility API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_policy_utility_api/group"/>
+</component>
+<component id="common_dsy_plugin_api" name="Common DSY Plugin API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/common_dsy_plugin_api/group"/>
+</component>
+<component id="remote_control_extension_api" name="Remote Control Extension API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/remote_control_extension_api/group"/>
+</component>
+<component id="sensor_channel_filter_api" name="Sensor Channel Filter API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/sensor_channel_filter_api/group"/>
+</component>
+<component id="dos_extension_api" name="DOS Extension API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/dos_extension_api/group"/>
+</component>
+<component id="accessory_audio_control_api" name="Accessory Audio Control API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_audio_control_api/group"/>
+</component>
+<component id="mediator_event_consumer_api" name="Mediator Event Consumer API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/mediator_event_consumer_api/group"/>
+</component>
+<component id="shared_data_api" name="Shared Data API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/shared_data_api/group"/>
+</component>
+<component id="accessory_settings_api" name="Accessory Settings API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_settings_api/group"/>
+</component>
+<component id="accessory_bluetooth_control_api" name="Accessory Bluetooth Control API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_bluetooth_control_api/group"/>
+</component>
+<component id="extended_version_info_api" name="Extended Version Info API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/extended_version_info_api/group"/>
+</component>
+<component id="mediator_event_provider_api" name="Mediator Event Provider API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/mediator_event_provider_api/group"/>
+</component>
+<component id="tv_out_config_api" name="TV Out Config API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/tv_out_config_api/group"/>
+</component>
+<component id="tspclientmapper_api" name="TSP Client Mapper API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/tspclientmapper_api/group"/>
+</component>
+<component id="powersave_api" name="Power Save API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/powersave_api/group"/>
+</component>
+<component id="powersave_definitions_api" name="Power Save Definitions API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/powersave_definitions_api/group"/>
+</component>
+<component id="powersave_plugin_api" name="Power Save Plugin API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/powersave_plugin_api/group"/>
+</component>
+<component id="extended_version_info_plugin_api" name="Extended Version Info Plugin API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/extended_version_info_plugin_api/group"/>
+</component>
+<component id="haptics_plugin_api" name="Haptics Plugin API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/haptics_plugin_api/group"/>
+</component>
+<component id="haptics_effect_data_getter_plugin_api" name="Haptics Effect Data Getter Plugin API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
+</component>
+<component id="haptics_packetizer_plugin_api" name="Haptics Packetizer Plugin API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/haptics_packetizer_plugin_api/group"/>
+</component>
+<component id="tiltcompensation_api" name="Tilt Compensation API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/tiltcompensation_api/group"/>
+</component>
+<component id="disk_notification_handler_api" name="Disk Notification Handler API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/disk_notification_handler_api/group"/>
+</component>
+<component id="accessory_policy_usb_audio_api" name="Accessory Policy USB Audio API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_policy_usb_audio_api/group"/>
+</component>
+<component id="accessory_policy_hdmi_audio_api" name="Accessory Policy HDMI Audio API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_policy_hdmi_audio_api/group"/>
+</component>
+<component id="sensor_data_compensator_plugin_api" name="Sensor Data Compensator Plugin API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
+</component>
+<component id="ddc_access_api" name="DDC Access API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/ddc_access_api/group"/>
+</component>
+<component id="tv_out_behaviour_api" name="TV Out Behaviour API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/tv_out_behaviour_api/group"/>
+</component>
+</collection>
+<collection id="accessoryservices" name="Accessory Services" level="framework">
+<component id="accessorymonitor" filter="s60" name="Accessory Monitor">
+<unit bldFile="/os/devicesrv/accessoryservices/accessorymonitor/group"/>
+</component>
+<component id="accessoryremotecontrol" filter="s60" name="Accessory Remote Control">
+<unit bldFile="/os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
+</component>
+<component id="accessoryserver" filter="s60" name="Accessory Server">
+<unit bldFile="/os/devicesrv/accessoryservices/accessoryserver/group"/>
+</component>
+<component id="pluggeddisplay" filter="s60" name="Plugged Display" introduced="^3">
+<unit bldFile="/os/devicesrv/accessoryservices/pluggeddisplay/group"/>
+</component>
+<component id="headsetstatusapi" filter="s60" name="Headset Status API">
+<unit bldFile="/os/devicesrv/accessoryservices/headsetstatusapi/group"/>
+</component>
+<component id="tspclientmapper" filter="s60" name="TSP Client Mapper">
+<unit bldFile="/os/devicesrv/accessoryservices/tspclientmapper/group"/>
+</component>
+<component id="remotecontrolfw" name="Remote Control Framework" introduced="9.1" purpose="optional">
+<unit bldFile="/os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="/os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
+</component>
+<component id="gid_pc_tool" filter="s60" name="Generic ID PC Tool" target="desktop" class="tool">
+<unit bldFile="/os/devicesrv/accessoryservices/gid_pc_tool/group"/>
+</component>
+</collection>
+<collection id="commonservices" name="Common Services" level="app-if">
+<component id="commonengine" filter="s60" name="Common Engine">
+<unit bldFile="/os/devicesrv/commonservices/commonengine/group"/>
+</component>
+<component id="commonengineresources" filter="s60" name="Common Engine Resources" class="config">
+<unit bldFile="/os/devicesrv/commonservices/commonengineresources/group"/>
+</component>
+<component id="platformenv" filter="s60" name="Platform Environment">
+<unit bldFile="/os/devicesrv/commonservices/platformenv/group"/>
+</component>
+<component id="sysutil" name="System Utilities" purpose="mandatory" introduced="ER5">
+<unit bldFile="/os/devicesrv/commonservices/sysutil/group" mrp="/os/devicesrv/commonservices/sysutil/group/sysutil.mrp"/>
+</component>
+<component id="activitymanager" name="Activity Manager" purpose="mandatory" introduced="ER5">
+<unit bldFile="/os/devicesrv/commonservices/activitymanager/group" mrp="/os/devicesrv/commonservices/activitymanager/group/activitymanager.mrp"/>
+</component>
+</collection>
+<collection id="dosservices" name="Domestic Operating System Services" level="hw-if">
+<component id="commondsy" filter="s60" name="Common DSY" class="plugin">
+<unit bldFile="/os/devicesrv/dosservices/commondsy/group"/>
+</component>
+<component id="dosserver" filter="s60" name="Domestic OS Server">
+<unit bldFile="/os/devicesrv/dosservices/dosserver/group"/>
+</component>
+</collection>
+<collection id="sensorservices" name="Sensor Services" level="framework">
+<component id="sensorserver" filter="s60" name="Sensor Server">
+<unit bldFile="/os/devicesrv/sensorservices/sensorserver/group"/>
+</component>
+<component id="orientationssy" filter="s60" name="Orientation SSY" class="plugin">
+<unit bldFile="/os/devicesrv/sensorservices/orientationssy/group"/>
+</component>
+<component id="tiltcompensationssy" filter="s60" name="Tilt Compensation SSY" class="plugin">
+<unit bldFile="/os/devicesrv/sensorservices/tiltcompensationssy/group"/>
+</component>
+<component id="sensordatacompensator" filter="s60" name="Sensor Data Compensator">
+<unit bldFile="/os/devicesrv/sensorservices/sensordatacompensator/group"/>
+</component>
+</collection>
+<collection id="hwrmhaptics" name="HWRM Haptics" level="plugin">
+<component id="hapticseffectdatagetterfw" filter="s60" name="Haptics Effect Data Getter Framework">
+<unit bldFile="/os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
+</component>
+<component id="hapticspluginservice" filter="s60" name="Haptics Plugin Service">
+<unit bldFile="/os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
+</component>
+<component id="hapticspacketizer" filter="s60" name="Haptics Packetizer">
+<unit bldFile="/os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
+</component>
+<component id="hapticspluginmanager" filter="s60" name="Haptics Plugin Manager">
+<unit bldFile="/os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
+</component>
+<component id="hapticsserver" filter="s60" name="Haptics Server">
+<unit bldFile="/os/devicesrv/hwrmhaptics/hapticsserver/group"/>
+</component>
+<component id="hapticsclient" filter="s60" name="Haptics Client">
+<unit bldFile="/os/devicesrv/hwrmhaptics/hapticsclient/group"/>
+</component>
+<component id="hwrmhaptics_build" filter="s60" name="HWRM Haptics Build">
+<!-- move these exports into the appropriate above components and delete this component-->
+<unit bldFile="/os/devicesrv/hwrmhaptics/group"/>
+</component>
+</collection>
+<collection id="mediator" name="Mediator" level="app-if">
+<!--collection is really a component. Move it down a directory -->
+<component id="mediator_build" filter="s60" name="Mediator Build">
+<unit bldFile="/os/devicesrv/mediator/group"/>
+</component>
+</collection>
+<collection id="psmservices" name="Power Save Mode Services" level="app-if">
+<component id="psmserver" filter="s60" name="PSM Server">
+<unit bldFile="/os/devicesrv/psmservices/psmserver/group"/>
+</component>
+</collection>
+<collection id="resourcemgmt" name="Resource Management" level="hw-if">
+<component id="hwrmfmtxwatcherplugin" filter="s60" name="HWRM FM Transmitter Watcher Plugin" class="plugin">
+<unit bldFile="/os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
+</component>
+<component id="hwrmtargetmodifierplugin" filter="s60" name="HWRM Target Modifier Plugin" class="plugin">
+<meta rel="config">
+<defined condition="__HWRM_TARGET_MODIFIER_PLUGIN"/>
+</meta>
+<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build,
+ may need to -->
+<!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
+</component>
+<component id="vibractrl" filter="s60" name="Vibra Control" deprecated="9.1">
+<unit bldFile="/os/devicesrv/resourcemgmt/vibractrl/group"/>
+</component>
+<component id="hwresourcesmgr" name="Hardware Resources Manager" introduced="^2" purpose="optional">
+<unit bldFile="/os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="/os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
+</component>
+<component id="hwresourcesmgrconfig" name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
+<unit bldFile="/os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="/os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
+</component>
+<component id="resourcemgmt_build" filter="s60" name="Resource Management Build">
+<!-- Move exports to a self-contained component.
+ This needs to be kept around until configuration is in place -->
+<unit bldFile="/os/devicesrv/resourcemgmt/group"/>
+</component>
+<component id="powerandmemorynotificationservice" name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
+<unit bldFile="/os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="/os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
+</component>
+</collection>
+<collection id="sysstatemgmt" name="System State Management" level="server">
+<component id="ssmmapperutility" filter="s60" name="SSM Mapper Utility" introduced="^3">
+<unit bldFile="/os/devicesrv/sysstatemgmt/ssmmapperutility/group"/>
+</component>
+<component id="ssmpolicyplugins" filter="s60" name="SSM Policy Plugins" class="plugin" introduced="^3">
+<unit bldFile="/os/devicesrv/sysstatemgmt/ssmpolicyplugins/group"/>
+</component>
+<component id="ssmutilityplugins" filter="s60" name="SSM Utility Plugins" class="plugin" introduced="^3">
+<unit bldFile="/os/devicesrv/sysstatemgmt/ssmutilityplugins/group"/>
+</component>
+<component id="ssmcmdlists" filter="s60" name="SSM Command Lists" introduced="^3">
+<unit bldFile="/os/devicesrv/sysstatemgmt/ssmcmdlists/group"/>
+</component>
+<component id="ssmcustcmds" filter="s60" name="SSM Custom Commands" introduced="^3">
+<unit bldFile="/os/devicesrv/sysstatemgmt/ssmcustcmds/group"/>
+</component>
+<component id="syslangutil" filter="s60" name="System Language Utility" introduced="^3">
+<unit bldFile="/os/devicesrv/sysstatemgmt/syslangutil/group"/>
+</component>
+<component id="sysrestart" filter="s60" name="System Restart" introduced="^3">
+<unit bldFile="/os/devicesrv/sysstatemgmt/sysrestart/group"/>
+</component>
+<component id="sysuiprovider" filter="s60" name="System UI Provider" introduced="^3">
+<unit bldFile="/os/devicesrv/sysstatemgmt/sysuiprovider/group"/>
+</component>
+<component id="systemstarter" name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
+<unit bldFile="/os/devicesrv/sysstatemgmt/systemstarter/group" mrp="/os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
+</component>
+<component id="systemstatemgr" name="System State Manager" introduced="^3" purpose="mandatory">
+<unit bldFile="/os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="/os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
+</component>
+<component id="systemstateplugins" name="System State Plugins" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="/os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
+</component>
+<component id="systemstatereferenceplugins" name="System State Reference Plugins" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="/os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
+</component>
+</collection>
+<collection id="resourceinterfaces" name="Resource Interfaces" level="hw-if">
+<component id="fmtransmittercontrol" name="FM Transmitter Control" introduced="^3" purpose="optional">
+<unit bldFile="/os/devicesrv/resourceinterfaces/fmtransmittercontrol/group" mrp="/os/devicesrv/resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
+</component>
+</collection>
+<collection id="systemhealthmanagement" name="System Health Management" level="server">
+<component id="systemhealthmgr" name="System Health Manager" introduced="^3" purpose="optional">
+<unit bldFile="/os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="/os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
+</component>
+</collection>
+<collection id="devicesrvapitest" name="Devices Services API Tests" level="app-if">
+
+
+</collection>
+<collection id="devicesrv_info" name="Device Services Info" level="app-if">
+<component id="devicesrv_metadata" name="Device Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="security" level="services" tech-domain="se" name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
+<collection id="authorisation" name="Authorisation" level="utilities">
+<component id="userpromptservice" name="User Prompt Service" introduced="^3" purpose="mandatory">
+<unit bldFile="/os/security/authorisation/userpromptservice/group" mrp="/os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
+</component>
+<component id="userpromptutils" name="User Prompt Utils" introduced="^3" purpose="optional">
+<unit bldFile="/os/security/authorisation/userpromptutils/group" mrp="/os/security/authorisation/userpromptutils/group/security_ups_utils.mrp"/>
+</component>
+</collection>
+<collection id="contentmgmt" name="Content Management" level="utilities">
+<component id="contentaccessfwfordrm" name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
+<unit bldFile="/os/security/contentmgmt/contentaccessfwfordrm/group" mrp="/os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
+</component>
+<component id="cafrecogniserconfig" name="CAF Recogniser Config" introduced="9.1" purpose="mandatory">
+<unit bldFile="/os/security/contentmgmt/cafrecogniserconfig" mrp="/os/security/contentmgmt/cafrecogniserconfig/security_reccafconfig.mrp"/>
+</component>
+
+</collection>
+<collection id="crypto" name="Crypto Libraries" level="libraries">
+<component id="weakcryptospi" name="Weak Crypto SPI" filter="gt" introduced="^3" purpose="optional">
+<unit bldFile="/os/security/crypto/weakcryptospi/group" mrp="/os/security/crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
+</component>
+<component id="strongcryptospi" name="Strong Crypto SPI" filter="gt" introduced="^3" purpose="optional">
+<unit bldFile="/os/security/crypto/weakcryptospi/strong" mrp="/os/security/crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
+</component>
+</collection>
+<collection id="cryptomgmtlibs" name="Crypto Management Libraries" level="management">
+<component id="securityutils" name="Security Utils" introduced="8.0" purpose="optional">
+<unit bldFile="/os/security/cryptomgmtlibs/securityutils/group" mrp="/os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
+</component>
+
+<component id="securitydocs" name="Security Documentation" purpose="development" class="doc">
+<unit mrp="/os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
+</component>
+<component id="cryptotokenfw" name="Crypto Token Framework" introduced="7.0" purpose="optional">
+<unit bldFile="/os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="/os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
+</component>
+<component id="securitycommonutils" name="Security Common Utils" introduced="8.0" purpose="mandatory">
+<unit bldFile="/os/security/cryptomgmtlibs/securitycommonutils/group" mrp="/os/security/cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
+</component>
+</collection>
+<collection id="securityanddataprivacytools" name="Security and Data Privacy Tools" level="services">
+<component id="securityconfig" name="Security Config" introduced="9.1" purpose="optional">
+<unit bldFile="/os/security/securityanddataprivacytools/securityconfig/group" mrp="/os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
+</component>
+<component id="securitytools" name="Security Tools" introduced="^3" purpose="optional" target="desktop">
+<unit bldFile="/os/security/securityanddataprivacytools/securitytools/group" mrp="/os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
+</component>
+</collection>
+<collection id="cryptoplugins" name="Crypto Plugins" level="plugins">
+<component id="cryptospiplugins" name="Crypto SPI Plugins" filter="gt" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/security/cryptoplugins/cryptospiplugins/group" mrp="/os/security/cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
+</component>
+</collection>
+<collection id="cryptoservices" name="Crypto Services" level="plugins">
+<component id="certificateandkeymgmt" name="Certificate and Key Management" introduced="6.0" purpose="optional">
+<unit bldFile="/os/security/cryptoservices/certificateandkeymgmt/group" mrp="/os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
+</component>
+<component id="filebasedcertificateandkeystores" name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
+<unit bldFile="/os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="/os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
+</component>
+<component id="browserrootcertificates" name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
+<unit mrp="/os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
+</component>
+<component id="rootcertificates" filter="sf_build" name="Root Certificates" introduced="7.0s" purpose="optional">
+<!-- not in S60 codebase -->
+<unit bldFile="/os/security/cryptoservices/rootcertificates/group" mrp="/os/security/cryptoservices/rootcertificates/group/rootcerts.mrp"/>
+</component>
+<component id="asnpkcs" name="ASN PKCS" introduced="8.0" purpose="optional">
+<unit bldFile="/os/security/cryptoservices/asnpkcs/group" mrp="/os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
+</component>
+</collection>
+<collection id="security_info" name="OS Security Info" level="utilities">
+<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">
+<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">
+<unit bldFile="/os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="/os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
+</component>
+<component id="simulationpositioningmodule" name="Simulation Positioning Module" introduced="^2" purpose="development" class="plugin">
+<unit bldFile="/os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="/os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
+</component>
+<component id="gpspositioningmodule" name="GPS/A-GPS Positioning Module" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/lbs/datasourcemodules/gpspositioningmodule/group" mrp="/os/lbs/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
+</component>
+<component id="networkpositioningmodule" name="Network Positioning Module" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/lbs/datasourcemodules/networkpositioningmodule/group" mrp="/os/lbs/datasourcemodules/networkpositioningmodule/group/lbs_network_positioning_module.mrp"/>
+</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">
+<component id="gpsdatasourceadaptation" 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"/>
+</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="networkrequesthandler" name="Network Request Handler" introduced="9.2" purpose="optional">
+<unit bldFile="/os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="/os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
+</component>
+</collection>
+<collection id="lbstest" name="Locating Services Tests" level="application-interface">
+
+<component id="locationprotocoltest" name="Location Protocol Tests" introduced="9.2" purpose="development" class="plugin">
+<unit bldFile="/os/lbs/lbstest/locationprotocoltest/group" mrp="/os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
+</component>
+</collection>
+<collection id="locationmgmt" name="Location Management" level="management">
+<component id="locmonitor" name="Location Monitor" introduced="^3" purpose="optional">
+<unit bldFile="/os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="/os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
+</component>
+<component id="agpslocationmgr" name="A-GPS Location Manager" introduced="9.2" purpose="optional">
+<unit bldFile="/os/lbs/locationmgmt/agpslocationmgr/group" mrp="/os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
+</component>
+<component id="networklocationmgr" name="Network Location Manager" introduced="9.2" purpose="optional">
+<unit bldFile="/os/lbs/locationmgmt/networklocationmgr/group" mrp="/os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
+</component>
+<component id="locationcore" name="Location Core" introduced="9.2" purpose="optional">
+<unit bldFile="/os/lbs/locationmgmt/locationcore/group" mrp="/os/lbs/locationmgmt/locationcore/group/lbs_admin.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">
+<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 -->
+<unit bldFile="/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/sfgroup" mrp="/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
+</component>
+<component id="suplprotocolmodule" name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" class="plugin">
+<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+<unit bldFile="/os/lbs/networkprotocolmodules/suplprotocolmodule/sfgroup" mrp="/os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
+</component>
+<component id="suplrrlpasn1" filter="sf_build" name="SUPL RRLP ASN1 Parser">
+<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+<unit bldFile="/os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
+</component>
+<component id="suplrrlpprotocol" name="SUPL RRLP Protocol Module">
+<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+<unit bldFile="/os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup"/>
+</component>
+</collection>
+<collection id="lbsapitest" name="Location API Tests" level="application-interface">
+
+</collection>
+<collection id="lbs_info" name="Locating Services Info" level="application-interface">
+<component id="lbs_metadata" name="Locating Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="commsfw" level="services" tech-domain="dc" name="Communications Framework" levels="server support framework process app-if">
+<collection id="commsprocess" name="Comms Process" level="process">
+<component id="commsrootserver" name="Comms Root Server" introduced="7.0s" purpose="mandatory">
+<unit bldFile="/os/commsfw/commsprocess/commsrootserverconfig/group" mrp="/os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
+</component>
+
+</collection>
+<collection id="commsconfig" name="Comms Config" level="process">
+<component id="commsdatabase" name="Comms Database" purpose="mandatory">
+<unit bldFile="/os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="/os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
+</component>
+<component id="commsdatabaseshim" name="Comms Database Shim" introduced="8.1" purpose="mandatory">
+<unit bldFile="/os/commsfw/commsconfig/commsdatabaseshim/group" mrp="/os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
+</component>
+</collection>
+<collection id="datacommsserver" name="Data Comms Server" level="framework">
+<component id="esockserver" name="ESock Server" purpose="mandatory">
+<unit version="3" bldFile="/os/commsfw/datacommsserver/esockserver/group" mrp="/os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp"/>
+</component>
+
+<component id="networkingdialogapi" name="Networking Dialog API" introduced="6.1" purpose="optional">
+<unit bldFile="/os/commsfw/datacommsserver/networkingdialogapi/group" mrp="/os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
+</component>
+<component id="networkingdialogstub" name="Networking Dialog Stub" introduced="6.1" purpose="optional">
+<unit bldFile="/os/commsfw/datacommsserver/networkingdialogapi/default" mrp="/os/commsfw/datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
+</component>
+<component id="networkcontroller" name="Network Controller" introduced="7.0s" purpose="optional" class="plugin">
+<unit bldFile="/os/commsfw/datacommsserver/networkcontroller/group" mrp="/os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
+</component>
+</collection>
+<collection id="serialserver" name="Serial Server" level="server">
+<component id="serialportcsy" name="Serial Port CSY" introduced="ER5" purpose="optional" class="plugin">
+<unit bldFile="/os/commsfw/serialserver/serialportcsy" mrp="/os/commsfw/serialserver/serialportcsy/ser-comms_serialportcsy.mrp"/>
+</component>
+<component id="packetloopbackcsy" name="Packet Loopback CSY" introduced="8.1" purpose="development">
+<unit bldFile="/os/commsfw/serialserver/packetloopbackcsy/group" mrp="/os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
+</component>
+<component id="c32serialserver" name="C32 Serial Server" introduced="ER5" purpose="mandatory">
+<unit bldFile="/os/commsfw/serialserver/c32serialserver/group" mrp="/os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
+</component>
+<component id="c32serialserverconfig" name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config">
+<unit bldFile="/os/commsfw/serialserver/c32serialserverconfig" mrp="/os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
+</component>
+<component id="c32serialserverdocs" name="C32 Serial Server Documentation" purpose="development" class="doc">
+<unit mrp="/os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
+</component>
+</collection>
+<collection id="commsfwutils" name="Comms Framework Utilities" level="framework">
+<component id="commsbufs" name="Comms Buffers" introduced="^3" purpose="mandatory">
+<unit bldFile="/os/commsfw/commsfwutils/commsbufs/group" mrp="/os/commsfw/commsfwutils/commsbufs/group/comms-infras_commsbufs.mrp"/>
+</component>
+</collection>
+<collection id="commsfw_info" name="Comms Framework Info" level="app-if">
+<component id="commsinfrastructuredocs" name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
+<unit mrp="/os/commsfw/commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
+</component>
+<component id="commsfw_metadata" name="Communications Framework Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/commsfw/commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
+</component>
+</collection>
+<collection id="commsfwsupport" name="Comms Framework Support" level="support">
+<component id="commselements" name="Comms Elements" introduced="8.0" purpose="mandatory">
+<unit bldFile="/os/commsfw/commsfwsupport/commselements/group" mrp="/os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
+</component>
+</collection>
+<collection id="commsinfrastructureapitest" name="Comms-Infras API Tests" level="app-if">
+<component id="commsinfrastructuresvs" name="Comms Infrastructure Verification Suite" introduced="^3" purpose="development">
+<unit mrp="/os/commsfw/commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
+</component>
+</collection>
+<collection id="commsfwtools" name="Comms Framework Tools" level="app-if">
+<component id="preparedefaultcommsdatabase" name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config" target="desktop">
+<unit bldFile="/os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="/os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
+</component>
+<component id="installdefaultcommsdatabase" name="Install Default Comms Database" purpose="mandatory" target="desktop">
+<unit bldFile="/os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="/os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
+</component>
+<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">
+<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>
+<collection id="tcpiputils" name="TCP/IP Utilities" level="plugin">
+<component id="dnd" name="DND" introduced="7.0" purpose="mandatory">
+<unit bldFile="/os/networkingsrv/tcpiputils/dnd/group" mrp="/os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
+</component>
+
+<component id="dhcp" name="DHCP" introduced="8.0" purpose="optional">
+<unit bldFile="/os/networkingsrv/tcpiputils/dhcp/group" mrp="/os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
+</component>
+<component id="networkaddressandporttranslation" name="Network Address and Port Translation" introduced="^2" purpose="mandatory" class="plugin">
+<unit bldFile="/os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="/os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
+</component>
+<component id="punycodeconv" name="Punycode Converter" introduced="^3" purpose="mandatory">
+<unit bldFile="/os/networkingsrv/tcpiputils/punycodeconv/group" mrp="/os/networkingsrv/tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
+</component>
+</collection>
+<collection id="linklayercontrol" name="Link Layer Control" level="hw-if">
+<component id="nullagt" name="NULL AGT" introduced="7.0s" purpose="optional" class="plugin">
+<unit bldFile="/os/networkingsrv/linklayercontrol/nullagt/group" mrp="/os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
+</component>
+<component id="genericscprparameters" name="Generic SCPR Parameters" introduced="^3" purpose="optional">
+<unit bldFile="/os/networkingsrv/linklayercontrol/genericscprparameters/group" mrp="/os/networkingsrv/linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
+</component>
+<component id="mbmsparameters" name="MBMS Parameters" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/networkingsrv/linklayercontrol/mbmsparameters/group" mrp="/os/networkingsrv/linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
+</component>
+<component id="networkinterfacemgr" name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
+<unit version="2" bldFile="/os/networkingsrv/linklayercontrol/networkinterfacemgr/group" mrp="/os/networkingsrv/linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp"/>
+</component>
+</collection>
+<collection id="linklayerprotocols" name="Link Layer Protocols" level="hw-if">
+<component id="ethernetnif" name="Ethernet NIF" purpose="optional" class="plugin">
+<unit bldFile="/os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="/os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
+</component>
+
+<component id="pppnif" name="PPP NIF" introduced="ER5" purpose="optional" class="plugin">
+<unit version="2" bldFile="/os/networkingsrv/linklayerprotocols/pppnif/group" mrp="/os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp"/>
+</component>
+
+<component id="slipnif" name="SLIP NIF" purpose="development" class="plugin">
+<unit bldFile="/os/networkingsrv/linklayerprotocols/slipnif/group" mrp="/os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
+</component>
+<component id="tunnelnif" name="Tunnel NIF" introduced="7.0s" purpose="optional" class="plugin">
+<unit bldFile="/os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="/os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
+</component>
+</collection>
+<collection id="linklayerutils" name="Link Layer Utilities" level="hw-if">
+<component id="packetlogger" name="Packet Logger" introduced="8.1" purpose="development">
+<unit bldFile="/os/networkingsrv/linklayerutils/packetlogger/group" mrp="/os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
+</component>
+</collection>
+<collection id="networkcontrol" name="Network Control" level="plugin">
+
+<component id="qoslib" name="QoS Library" introduced="7.0s" purpose="optional">
+<unit bldFile="/os/networkingsrv/networkcontrol/qoslib/group" mrp="/os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
+</component>
+<component id="pfqoslib" name="PF QoS Library" introduced="7.0s" purpose="optional">
+<unit bldFile="/os/networkingsrv/networkcontrol/pfqoslib/group" mrp="/os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
+</component>
+<component id="qosfwprt" name="QoS Framework PRT" introduced="7.0s" purpose="optional" class="plugin">
+<unit bldFile="/os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="/os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
+</component>
+<component id="qosipscpr" name="QoS IP SCPR" purpose="optional" class="plugin">
+<unit bldFile="/os/networkingsrv/networkcontrol/qosipscpr/group" mrp="/os/networkingsrv/networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
+</component>
+<component id="ipnetworklayer" name="IP Network Layer" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/networkingsrv/networkcontrol/ipnetworklayer/group" mrp="/os/networkingsrv/networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
+</component>
+<component id="iptransportlayer" name="IP Transport Layer" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/networkingsrv/networkcontrol/iptransportlayer/group" mrp="/os/networkingsrv/networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
+</component>
+<component id="commsuserpromptmgr" name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
+<unit bldFile="/os/networkingsrv/networkcontrol/commsuserpromptmgr/group" mrp="/os/networkingsrv/networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
+</component>
+</collection>
+<collection id="networkprotocols" name="Network Protocols" level="plugin">
+
+<component id="ipeventnotifier" name="IP Event Notifier" introduced="8.1" purpose="mandatory" class="plugin">
+<unit bldFile="/os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="/os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
+</component>
+<component id="tcpipv4v6prt" name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" class="plugin">
+<unit bldFile="/os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="/os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
+</component>
+<component id="iphook" name="IP Hook" introduced="7.0" purpose="mandatory">
+<unit bldFile="/os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="/os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
+</component>
+<component id="mobileip" name="Mobile IP" introduced="8.1" purpose="optional" class="plugin">
+<unit bldFile="/os/networkingsrv/networkprotocols/mobileip/group" mrp="/os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
+</component>
+<component id="dnsproxy" name="DNS Proxy" introduced="^3" purpose="optional">
+<unit bldFile="/os/networkingsrv/networkprotocols/dnsproxy/group" mrp="/os/networkingsrv/networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
+</component>
+</collection>
+<collection id="networksecurity" name="Network Security" level="framework">
+<component id="tls" name="TLS" introduced="6.0" purpose="mandatory">
+<unit bldFile="/os/networkingsrv/networksecurity/tls/group" mrp="/os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
+</component>
+<component id="tlsprovider" name="TLS Provider" introduced="8.1" purpose="mandatory">
+<unit bldFile="/os/networkingsrv/networksecurity/tlsprovider/group" mrp="/os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
+</component>
+<component id="ipsec" name="IPsec" introduced="7.0" purpose="optional">
+<unit bldFile="/os/networkingsrv/networksecurity/ipsec/group" mrp="/os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
+</component>
+</collection>
+<collection id="networkingtestandutils" name="Networking Test and Utils" level="app-if">
+
+<component id="networkingexamples" 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>
+
+
+
+
+
+
+</collection>
+<collection id="networkingsrv_info" name="Networking Services Info" level="app-if">
+<component id="networkingrom" name="Networking ROM" purpose="mandatory">
+<!-- production component: contains the IBY files -->
+<unit bldFile="/os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="/os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
+</component>
+<component id="networkingdocs" name="Networking Documentation" purpose="development" class="doc">
+<unit mrp="/os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
+</component>
+<component id="networkingsrv_metadata" name="Networking Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
+</component>
+</collection>
+<collection id="pppcompressionplugins" name="PPP Compression Plugins" level="plugin">
+<component id="predictorcompression" name="Predictor Compression" introduced="6.0" purpose="optional" class="plugin">
+<unit bldFile="/os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="/os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
+</component>
+</collection>
+</package>
+<package id="wlan" level="services" tech-domain="dc" name="WLAN" levels="hw low mid high tools test">
+<collection id="wlan_plat" name="WLAN Platform Interfaces" level="test">
+<component id="wlan_dbif_api" name="WLAN DBIF API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_dbif_api/group"/>
+</component>
+<component id="wlan_hal_api" name="WLAN HAL API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_hal_api/group"/>
+</component>
+<component id="wlan_management_api" name="WLAN Management API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_management_api/group"/>
+</component>
+<component id="wlan_device_settings_api" name="WLAN Device Settings API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_device_settings_api/group"/>
+</component>
+<component id="wlan_control_api" name="WLAN Control API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_control_api/group"/>
+</component>
+<component id="wlan_hw_initialization_data_api" name="WLAN Hardware Initialization Data API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_hw_initialization_data_api/group"/>
+</component>
+<component id="wlan_power_save_plugin_api" name="WLAN Power Save Plugin API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_power_save_plugin_api/group"/>
+</component>
+<component id="wlan_info_api" name="WLAN Info API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_info_api/group"/>
+</component>
+<component id="wlan_agent_hotspot_plugin_api" name="WLAN Agent Hotspot Plug-in API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
+</component>
+<component id="wlan_osa_api" name="WLAN OSA API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_osa_api/group"/>
+</component>
+<component id="wlan_spia_api" name="WLAN SPIA API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_spia_api/group"/>
+</component>
+<component id="wlan_hpa_api" name="WLAN HPA API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_hpa_api/group"/>
+</component>
+<component id="wlan_eapol_plugin_api" name="WLAN EAPOL Plugin API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_eapol_plugin_api/group"/>
+</component>
+<component id="wlan_generic_plugin_api" name="WLAN Generic Plugin API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_generic_plugin_api/group"/>
+</component>
+<component id="wlan_aws_plugin_api" name="WLAN AWS Plugin API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_aws_plugin_api/group"/>
+</component>
+</collection>
+<collection id="wlan_pub" name="WLAN Public Interfaces" level="test">
+<component id="wlan_sdk_info_api" name="WLAN SDK Info API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_pub/wlan_sdk_info_api/group"/>
+</component>
+</collection>
+<collection id="wlan_bearer" name="WLAN Bearer" level="hw">
+<component id="wlanpsmplugin" filter="s60" name="WLAN PSM Plugin" class="plugin">
+<unit bldFile="/os/wlan/wlan_bearer/wlanpsmplugin/group"/>
+</component>
+<component id="wlanagent" filter="s60" name="WLAN Agent">
+<unit bldFile="/os/wlan/wlan_bearer/wlanagent/group"/>
+</component>
+<component id="wlandbif_cd" filter="s60" name="WLAN CommsDat interface">
+<unit bldFile="/os/wlan/wlan_bearer/wlandbif_cd/group"/>
+</component>
+<!-- should follow component directory rules for stuff in wlan_symbian/ and put in a single component or split up properly -->
+<component id="wlanengine" filter="s60" name="WLAN Engine">
+<unit bldFile="/os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
+</component>
+<component id="wlanldd" filter="s60" name="WLAN LDD">
+<unit bldFile="/os/wlan/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
+</component>
+<component id="wlannwif" filter="s60" name="WLAN Network Interface">
+<unit bldFile="/os/wlan/wlan_bearer/wlannwif/group"/>
+</component>
+</collection>
+<collection id="wlanapitest" name="WLAN API Tests" level="test">
+
+</collection>
+<collection id="wlan_info" name="WLAN Info" level="test">
+<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">
+<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">
+<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"/>
+</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>
+</collection>
+<collection id="smsprotocols" name="SMS Protocols" level="framework">
+<component id="smsstack" name="SMS Stack" introduced="6.0" purpose="mandatory" class="plugin">
+<unit bldFile="/os/cellularsrv/smsprotocols/smsstack/group" mrp="/os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
+</component>
+</collection>
+<collection id="telephonyprotocols" name="Telephony Protocols" level="framework">
+<component id="csdagt" name="CSD AGT" introduced="6.1" purpose="optional" class="plugin">
+<unit bldFile="/os/cellularsrv/telephonyprotocols/csdagt/group" mrp="/os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
+</component>
+<component id="psdagt" name="PSD AGT" introduced="7.0s" purpose="optional" class="plugin">
+<unit bldFile="/os/cellularsrv/telephonyprotocols/psdagt/group" mrp="/os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
+</component>
+<component id="gprsumtsqosprt" name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" class="plugin">
+<unit bldFile="/os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="/os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
+</component>
+<component id="gprsumtsqosinterface" name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" class="plugin">
+<unit bldFile="/os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="/os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
+</component>
+<component id="qosextnapi" name="QoS Extn API" introduced="9.2" purpose="optional">
+<unit bldFile="/os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="/os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
+</component>
+<component id="secondarypdpcontextumtsdriver" name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
+<unit bldFile="/os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="/os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
+</component>
+<component id="qos3gppcpr" name="QoS 3GPP CPR" introduced="9.2" purpose="optional" class="plugin">
+<unit bldFile="/os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="/os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
+</component>
+<component id="pdplayer" name="PDP Layer" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/cellularsrv/telephonyprotocols/pdplayer/group" mrp="/os/cellularsrv/telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
+</component>
+<component id="rawipnif" name="Raw IP NIF" introduced="8.1" purpose="optional" class="plugin">
+<unit bldFile="/os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="/os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
+</component>
+</collection>
+<collection id="telephonyserver" name="Telephony Server" level="server">
+<component id="etelserverandcore" name="ETel Server and Core" purpose="mandatory">
+<unit bldFile="/os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="/os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
+</component>
+
+<component id="etelmultimode" name="ETel Multimode" introduced="7.0" purpose="mandatory">
+<unit bldFile="/os/cellularsrv/telephonyserver/etelmultimode/group" mrp="/os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
+</component>
+<component id="etelpacketdata" name="ETel Packet Data" introduced="7.0" purpose="mandatory">
+<unit bldFile="/os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="/os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
+</component>
+<component id="etelsimtoolkit" name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory">
+<unit bldFile="/os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="/os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
+</component>
+</collection>
+<collection id="telephonyserverplugins" name="Telephony Server Plugins" level="plugin">
+<component id="common_tsy" name="Common TSY" introduced="^2" purpose="optional" class="plugin">
+<unit bldFile="/os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="/os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
+</component>
+<component id="licenseetsystub" name="Licensee TSY Stub" introduced="^2" purpose="development" class="plugin" filter="sf_build">
+<unit mrp="/os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="/os/cellularsrv/telephonyserverplugins/licenseetsystub/group"/>
+</component>
+<component id="multimodetsy" name="Multimode TSY" purpose="development" class="plugin">
+<unit bldFile="/os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="/os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
+</component>
+
+<component id="ctsydispatchlayer" name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="/os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
+</component>
+<component id="simatktsy" name="SIMATK TSY" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/cellularsrv/telephonyserverplugins/simatktsy/group" mrp="/os/cellularsrv/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
+</component>
+</collection>
+<collection id="telephonyutils" name="Telephony Utilities" level="app-if">
+<component id="dial" name="Dial" deprecated="9.1" purpose="optional">
+<unit bldFile="/os/cellularsrv/telephonyutils/dial/group" mrp="/os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
+</component>
+<component id="telephonywatchers" name="Telephony Watchers" introduced="6.0" purpose="optional" class="plugin">
+<unit bldFile="/os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="/os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
+</component>
+<component id="etel3rdpartyapi" name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
+<unit bldFile="/os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="/os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
+</component>
+</collection>
+<collection id="cellularsrv_info" name="Cellular Baseband Services Info" level="app-if">
+<component id="telephonyconfidentialdocs" name="Telephony Confidential Documentation" purpose="development" class="doc">
+<unit mrp="/os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
+</component>
+<component id="telephonydocs" name="Telephony Documentation" purpose="development" class="doc">
+<unit mrp="/os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.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">
+<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">
+
+
+
+</collection>
+<collection id="wapstack" name="WAP Stack" 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">
+<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">
+<unit bldFile="/os/bt/bt_plat/bluetooth_audio_adaptation_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">
+<unit bldFile="/os/bt/bt_plat/at_command_handler_plugin_api/group"/>
+</component>
+</collection>
+<collection id="bluetooth" name="Bluetooth Core" level="framework">
+<component id="btstack" name="Bluetooth Stack" introduced="6.0" purpose="optional">
+<unit bldFile="/os/bt/bluetooth/btstack" mrp="/os/bt/bluetooth/btstack/bluetooth_stack.mrp"/>
+</component>
+<component id="btcomm" name="Bluetooth CSY" introduced="6.0" purpose="optional" class="plugin">
+<unit bldFile="/os/bt/bluetooth/btcomm" mrp="/os/bt/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
+</component>
+<component id="btsdp" name="Bluetooth SDP" introduced="6.1" purpose="optional">
+<unit bldFile="/os/bt/bluetooth/btsdp" mrp="/os/bt/bluetooth/btsdp/bluetooth_sdp.mrp"/>
+</component>
+<component id="btextnotifiers" name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
+<unit bldFile="/os/bt/bluetooth/btextnotifiers" mrp="/os/bt/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
+</component>
+<component id="gavdp" name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
+<unit bldFile="/os/bt/bluetooth/gavdp/group" mrp="/os/bt/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
+</component>
+
+<component id="btlogger" name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
+<unit bldFile="/os/bt/bluetooth/btlogger/group" mrp="/os/bt/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
+</component>
+<component id="btdocs" name="Bluetooth Documentation" purpose="development" class="doc">
+<unit mrp="/os/bt/bluetooth/btdocs/bluetooth_documentation.mrp"/>
+</component>
+</collection>
+<collection id="bluetoothmgmt" name="Bluetooth Management" level="plugin">
+<component id="btmgr" name="Bluetooth Manager" introduced="6.0" purpose="optional">
+<unit bldFile="/os/bt/bluetoothmgmt/btmgr" mrp="/os/bt/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
+</component>
+<component id="btconfig" name="Bluetooth Config" purpose="optional" class="config">
+<unit bldFile="/os/bt/bluetoothmgmt/btconfig" mrp="/os/bt/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
+</component>
+<component id="btrom" name="Bluetooth ROM" introduced="9.1" purpose="optional">
+<unit bldFile="/os/bt/bluetoothmgmt/btrom" mrp="/os/bt/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
+</component>
+<component id="bluetoothclientlib" name="Bluetooth Client Library" introduced="6.0" purpose="optional">
+<unit bldFile="/os/bt/bluetoothmgmt/bluetoothclientlib" mrp="/os/bt/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
+</component>
+
+</collection>
+<collection id="bluetoothcommsprofiles" name="Bluetooth Comms Profiles" level="app-if">
+<component id="btpan" name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" class="plugin">
+<unit bldFile="/os/bt/bluetoothcommsprofiles/btpan/group" mrp="/os/bt/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
+</component>
+</collection>
+<collection id="bthci" name="Host Controller Interface" level="server">
+<component id="bthci2" name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
+<unit bldFile="/os/bt/bthci/bthci2/group" mrp="/os/bt/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
+</component>
+<component id="hciextensioninterface" name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
+<unit bldFile="/os/bt/bthci/hciextensioninterface" mrp="/os/bt/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
+</component>
+<component id="hci2implementations" name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" class="plugin">
+<unit bldFile="/os/bt/bthci/hci2implementations/group" mrp="/os/bt/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
+</component>
+</collection>
+<collection id="irda" name="IrDA" level="plugin">
+<component id="irdastack" name="IrDA Stack" purpose="optional">
+<unit bldFile="/os/bt/irda/irdastack/group" mrp="/os/bt/irda/irdastack/group/infra-red_irda.mrp"/>
+</component>
+</collection>
+<collection id="bluetoothapitest" name="Bluetooth API Tests" level="app-if">
+
+</collection>
+<collection id="atext" name="AT Extensions" level="server">
+<!-- collection is really a component. Need to move down a directory -->
+<component id="atext_build" name="AT Extension Build" introduced="^3" purpose="optional" filter="s60">
+<unit bldFile="/os/bt/atext/group"/>
+</component>
+</collection>
+<collection id="bt_info" name="Bluetooth Info" level="app-if">
+<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">
+<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">
+<unit version="2" bldFile="/os/usb/usbmgmt/usbmgr/group" mrp="/os/usb/usbmgmt/usbmgr/group/usb_manager.mrp"/>
+</component>
+
+<component id="usbclassandmgrdocs" name="USB Class and Manager Documentation" purpose="development" class="doc">
+<unit mrp="/os/usb/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
+</component>
+</collection>
+<collection id="usb_info" name="USB Info" level="app-if">
+<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">
+<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_pub/audio_effects_presets_api/group"/>
+</component>
+<component id="drm_audio_player_api" name="DRM Audio Player API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_pub/drm_audio_player_api/group"/>
+</component>
+<component id="multimedia_extension_interfaces_api" name="Multimedia Extension Interfaces API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_pub/multimedia_extension_interfaces_api/group"/>
+</component>
+</collection>
+<collection id="mm_plat" name="Multimedia Platform Interfaces" level="app-if">
+<component id="aac_decoder_config_api" name="AAC Decoder Config API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/aac_decoder_config_api/group"/>
+</component>
+<component id="aac_decoder_config_msg_hdlr_api" name="AAC Decoder Config Msg Hdlr API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/aac_decoder_config_msg_hdlr_api/group"/>
+</component>
+<component id="aac_decoder_config_proxy_api" name="AAC Decoder Config Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/aac_decoder_config_proxy_api/group"/>
+</component>
+<component id="added_devsound_control_api" name="Added DevSound Control API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/added_devsound_control_api/group"/>
+</component>
+<component id="added_devsound_control_msg_hdlr_api" name="Added DevSound Control Msg Hdlr API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/added_devsound_control_msg_hdlr_api/group"/>
+</component>
+<component id="added_devsound_control_proxy_api" name="Added DevSound Control Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/added_devsound_control_proxy_api/group"/>
+</component>
+<component id="audio_effects_msg_hdlr_api" name="Audio Effects Message Handler API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/audio_effects_msg_hdlr_api/group"/>
+</component>
+<component id="audio_effects_proxy_api" name="Audio Effects Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/audio_effects_proxy_api/group"/>
+</component>
+<component id="audio_policy_header_api" name="Audio Policy Header API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/audio_policy_header_api/group"/>
+</component>
+<component id="audio_routing_api" name="Audio Routing API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/audio_routing_api/group"/>
+</component>
+<component id="audio_routing_msg_hdlr_api" name="Audio Routing Msg Hdlr API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/audio_routing_msg_hdlr_api/group"/>
+</component>
+<component id="audio_routing_proxy_api" name="Audio Routing Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/audio_routing_proxy_api/group"/>
+</component>
+<component id="custom_interface_builder_api" name="Custom Interface Builder API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/custom_interface_builder_api/group"/>
+</component>
+<component id="custom_interface_message_handler_factory_api" name="Custom Interface Message Handler Factory API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/custom_interface_message_handler_factory_api/group"/>
+</component>
+<component id="custom_interface_proxy_factory_api" name="Custom Interface Proxy Factory 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">
+<unit bldFile="/os/mm/mm_plat/devsound_adaptation_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/eaac_plus_decoder_interface_api/group"/>
+</component>
+<component id="eaac_plus_decoder_interface_msg_hdlr_api" name="eAAC Plus Decoder Interface Message Handler API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/eaac_plus_decoder_interface_msg_hdlr_api/group"/>
+</component>
+<component id="eaac_plus_decoder_interface_proxy_api" name="eAAC Plus Decoder Interface Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/eaac_plus_decoder_interface_proxy_api/group"/>
+</component>
+<component id="error_concealment_interface_api" name="Error Concealment Interface API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/error_concealment_interface_api/group"/>
+</component>
+<component id="error_concealment_interface_msg_hdlr_api" name="Error Concealment Interface Message Handler 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">
+<unit bldFile="/os/mm/mm_plat/fm_radio_adaptation_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/g711_decoder_interface_msg_hdlr_api/group"/>
+</component>
+<component id="g711_decoder_interface_proxy_api" name="G711 Decoder Interface Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/g711_decoder_interface_proxy_api/group"/>
+</component>
+<component id="g711_encoder_interface_api" name="G711 Encoder Interface API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/g711_encoder_interface_api/group"/>
+</component>
+<component id="g711_encoder_interface_msg_hdlr_api" name="G711 Encoder Interface Message Handler API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/g711_encoder_interface_msg_hdlr_api/group"/>
+</component>
+<component id="g711_encoder_interface_proxy_api" name="G711 Encoder Interface Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/g711_encoder_interface_proxy_api/group"/>
+</component>
+<component id="g729_decoder_interface_api" name="G729 Decoder Interface API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/g729_decoder_interface_api/group"/>
+</component>
+<component id="g729_decoder_interface_msg_hdlr_api" name="G729 Decoder Interface Message Handler API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/g729_decoder_interface_msg_hdlr_api/group"/>
+</component>
+<component id="g729_decoder_interface_proxy_api" name="G729 Decoder Interface Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/g729_decoder_interface_proxy_api/group"/>
+</component>
+<component id="g729_encoder_interface_api" name="G729 Encoder Interface API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/g729_encoder_interface_api/group"/>
+</component>
+<component id="g729_encoder_interface_proxy_api" name="G729 Encoder Interface Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/g729_encoder_interface_proxy_api/group"/>
+</component>
+<component id="g729_encoder_interface_msg_hdlr_api" name="G729 Encoder Interface Message Handler API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/g729_encoder_interface_msg_hdlr_api/group"/>
+</component>
+<component id="global_audio_settings_api" name="Global Audio Settings API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/global_audio_settings_api/group"/>
+</component>
+<component id="global_audio_settings_definition_api" name="Global Audio Settings Definition API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/global_audio_settings_definition_api/group"/>
+</component>
+<component id="ilbc_decoder_interface_api" name="Ilbc Decoder Interface API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/ilbc_decoder_interface_api/group"/>
+</component>
+<component id="ilbc_decoder_interface_msg_hdlr_api" name="Ilbc Decoder Interface Message Handler API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/ilbc_decoder_interface_msg_hdlr_api/group"/>
+</component>
+<component id="ilbc_decoder_interface_proxy_api" name="Ilbc Decoder Interface Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/ilbc_decoder_interface_proxy_api/group"/>
+</component>
+<component id="ilbc_encoder_interface_api" name="Ilbc Encoder Interface API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/ilbc_encoder_interface_api/group"/>
+</component>
+<component id="ilbc_encoder_interface_msg_hdlr_api" name="Ilbc Encoder Interface Message Handler API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/ilbc_encoder_interface_msg_hdlr_api/group"/>
+</component>
+<component id="ilbc_encoder_interface_proxy_api" name="Ilbc Encoder Interface Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/ilbc_encoder_interface_proxy_api/group"/>
+</component>
+<component id="mdf_plugin_uids" name="MDF Plug-in UIDs" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/mdf_plugin_uids/group"/>
+</component>
+<component id="multimedia_fourcc_definitions_api" name="Multimedia FourCC Definitions API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/multimedia_fourcc_definitions_api/group"/>
+</component>
+<component id="nokia_audio_policy_header_api" name="Nokia Audio Policy Header API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/nokia_audio_policy_header_api/group"/>
+</component>
+<component id="nokia_multimedia_fourcc_definitions_api" name="Nokia Multimedia Fourcc Definitions API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/nokia_multimedia_fourcc_definitions_api/group"/>
+</component>
+<component id="ra8_decoder_interface_api" name="RA8 Decoder Interface API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/ra8_decoder_interface_api/group"/>
+</component>
+<component id="ra8_decoder_interface_msg_hdlr_api" name="RA8 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">
+<unit bldFile="/os/mm/mm_plat/rds_adaptation_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">
+<unit bldFile="/os/mm/mm_plat/restricted_audio_output_msg_hdlr_api/group"/>
+</component>
+<component id="restricted_audio_output_proxy_api" name="Restricted Audio Output Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/restricted_audio_output_proxy_api/group"/>
+</component>
+<component id="sbc_encoder_interface_api" name="SBC Encoder Interface API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/sbc_encoder_interface_api/group"/>
+</component>
+<component id="sbc_encoder_interface_msg_hdlr_api" name="SBC Encoder Interface Message Handler API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/sbc_encoder_interface_msg_hdlr_api/group"/>
+</component>
+<component id="sbc_encoder_interface_proxy_api" name="SBC Encoder Interface Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/sbc_encoder_interface_proxy_api/group"/>
+</component>
+<component id="secure_output_mdf_custom_interface" name="Secure Output MDF Custom Interface" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/secure_output_mdf_custom_interface/group"/>
+</component>
+<component id="speech_encoder_config_api" name="Speech Encoder Config API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/speech_encoder_config_api/group"/>
+</component>
+<component id="speech_encoder_config_msg_hdlr_api" name="Speech Encoder Config Message Handler API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/speech_encoder_config_msg_hdlr_api/group"/>
+</component>
+<component id="speech_encoder_config_proxy_api" name="Speech Encoder Config Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/speech_encoder_config_proxy_api/group"/>
+</component>
+<component id="telephony_audio_routing_client_api" name="Telephony Audio Routing Client API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/telephony_audio_routing_client_api/group"/>
+</component>
+<component id="telephony_audio_routing_manager_api" name="Telephony Audio Routing Manager API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/telephony_audio_routing_manager_api/group"/>
+</component>
+<component id="video_buffer_management_mdf_custom_interface" name="Video Buffer Management MDF Custom Interface" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/video_buffer_management_mdf_custom_interface/group"/>
+</component>
+<component id="video_decoder_rotation_mdf_custom_interface" name="Video Decoder Rotation MDF Custom Interface" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
+</component>
+<component id="video_decoder_scaling_mdf_custom_interface" name="Video Decoder Scaling MDF Custom Interface" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
+</component>
+<component id="video_reclaim_extbuffers_ci" name="Video Reclaim Extbuffers Custom Interface" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/video_reclaim_extbuffers_ci/group"/>
+</component>
+<component id="video_window_control_custom_interface" name="Video Window Control Custom Interface" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/video_window_control_custom_interface/group"/>
+</component>
+<component id="wma_decoder_interface_api" name="WMA Decoder Interface API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/wma_decoder_interface_api/group"/>
+</component>
+<component id="wma_decoder_interface_msg_hdlr_api" name="WMA Decoder Interface Message Handler API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/wma_decoder_interface_msg_hdlr_api/group"/>
+</component>
+<component id="wma_decoder_interface_proxy_api" name="WMA Decoder Interface Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/wma_decoder_interface_proxy_api/group"/>
+</component>
+<component id="eaacplusutil_api" name="EAac Plus Util API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/eaacplusutil_api/group"/>
+</component>
+<component id="frametable_api" name="Frametable API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/frametable_api/group"/>
+</component>
+</collection>
+<collection id="devsoundextensions" name="Devsound Extensions" level="device-fw">
+<component id="drmaudioplayer" filter="s60" name="DRM Audio Player">
+<unit bldFile="/os/mm/devsoundextensions/drmaudioplayer/group"/>
+</component>
+<component id="mmextfw" filter="s60" name="Multimedia Extension Framework">
+<unit bldFile="/os/mm/devsoundextensions/mmextfw/group"/>
+</component>
+<component id="audiorouting" filter="s60" name="Audio Routing">
+<unit bldFile="/os/mm/devsoundextensions/audiorouting/group"/>
+</component>
+<component id="effects" filter="s60" name="Effects">
+<unit bldFile="/os/mm/devsoundextensions/effects/group"/>
+</component>
+<component id="effectspresets" filter="s60" name="Effects Presets">
+<unit bldFile="/os/mm/devsoundextensions/effectspresets/group"/>
+</component>
+<component id="effectspresets_utils" filter="s60" name="Effects Presets Utils">
+<!-- need to #include the lot from a single bld.inf
+ Also move to a standard component location, not under effectspresets -->
+<unit bldFile="/os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
+<unit bldFile="/os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
+</component>
+<component id="telephonyaudiorouting" filter="s60" name="Telephony Audio Routing">
+<unit bldFile="/os/mm/devsoundextensions/telephonyaudiorouting/group"/>
+</component>
+<component id="mmfcustominterfaces" filter="s60" name="MMF Custom Interfaces">
+<unit bldFile="/os/mm/devsoundextensions/mmfcustominterfaces/group"/>
+</component>
+<component id="addeddevsoundcontrol" filter="s60" name="Added DevSound Control">
+<unit bldFile="/os/mm/devsoundextensions/addeddevsoundcontrol/group"/>
+</component>
+<component id="globalaudiosettings" filter="s60" name="Global Audio Settings">
+<unit bldFile="/os/mm/devsoundextensions/globalaudiosettings/group"/>
+</component>
+<component id="restrictedaudiooutput" filter="s60" name="Restricted Audio Output">
+<unit bldFile="/os/mm/devsoundextensions/restrictedaudiooutput/group"/>
+</component>
+<component id="ciextnfactoryplugins" filter="s60" name="Custom Interface Extension Factory Plugins" class="plugin">
+<unit bldFile="/os/mm/devsoundextensions/ciextnfactoryplugins/group"/>
+</component>
+</collection>
+<collection id="mdfdevvideoextensions" name="MDF Dev Video Extensions" level="device-fw">
+<component id="nga_mdf_postprocessor" name="NGA MDF Postprocessor" filter="s60">
+<unit bldFile="/os/mm/mdfdevvideoextensions/nga_mdf_postprocessor/group"/>
+</component>
+</collection>
+<collection id="audio" name="Audio Codecs" level="middleware">
+<component id="arm_cmmf_codecs" filter="s60" name="ARM CMMF Codecs" class="plugin">
+<unit bldFile="/os/mm/audio/arm_cmmf_codecs/group"/>
+</component>
+</collection>
+<collection id="video" name="Video Codecs" level="middleware">
+<!-- empty -->
+</collection>
+<collection id="imagingandcamerafws" name="Imaging and Camera Frameworks" level="app-if">
+<component id="imagingfws" name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
+<unit bldFile="/os/mm/imagingandcamerafws/imagingfws/group" mrp="/os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
+</component>
+
+
+<component id="camerafw" name="Camera Framework" introduced="7.0s" purpose="optional">
+<unit bldFile="/os/mm/imagingandcamerafws/camerafw/group" mrp="/os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
+</component>
+
+</collection>
+<collection id="mmlibs" name="Multimedia Libraries" level="middleware">
+<component id="mmutilitylib" name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
+<unit bldFile="/os/mm/mmlibs/mmutilitylib/group" mrp="/os/mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
+</component>
+<component id="mmfw" name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
+<unit bldFile="/os/mm/mmlibs/mmfw/group" mrp="/os/mm/mmlibs/mmfw/group/multimedia_mmf.mrp"/>
+</component>
+</collection>
+<collection id="mmplugins" name="Multimedia Plugins" level="middleware">
+<component id="imagingplugins" name="Imaging Plugins" introduced="7.0s" purpose="optional" class="plugin">
+<unit bldFile="/os/mm/mmplugins/imagingplugins/group" mrp="/os/mm/mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
+</component>
+<component id="cameraplugins" name="Camera Plugins" introduced="7.0s" purpose="optional" class="plugin">
+<unit bldFile="/os/mm/mmplugins/cameraplugins/group" mrp="/os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
+</component>
+<component id="lib3gp" name="3GP Library" introduced="^2" purpose="optional">
+<unit bldFile="/os/mm/mmplugins/lib3gp/group" mrp="/os/mm/mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
+</component>
+
+<component id="mmfwplugins" name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" class="plugin">
+<unit bldFile="/os/mm/mmplugins/mmfwplugins/group" mrp="/os/mm/mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
+</component>
+</collection>
+<collection id="mm_info" name="Multimedia Info" level="app-if">
+<component id="mmdocs" name="Multimedia Documentation" purpose="development" class="doc">
+<unit mrp="/os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
+</component>
+
+<component id="mm_metadata" name="Multimedia Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
+</component>
+</collection>
+<collection id="mmresourcemgmt" name="Multimedia Resource Management" level="middleware">
+<component id="mmresctrl" name="Multimedia Resource Controller" introduced="^2" purpose="development">
+<unit bldFile="/os/mm/mmresourcemgmt/mmresctrl/group" mrp="/os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
+</component>
+</collection>
+<collection id="mmdevicefw" name="Multimedia Device Framework" level="device-fw">
+<component id="mdf" name="Media Device Framework" introduced="9.2" purpose="mandatory">
+<unit bldFile="/os/mm/mmdevicefw/mdf/group" mrp="/os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
+</component>
+
+<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">
+<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"/>
+</component>
+</collection>
+<collection id="mmtestenv" name="Multimedia Test Environment" level="device-fw">
+
+
+
+
+</collection>
+<collection id="omxil" name="OpenMAX IL" level="hw-if">
+<component id="omxilapi" name="OpenMAX IL API" introduced="^3" purpose="optional">
+<unit version="1" bldFile="/os/mm/omxil/omxilapi/group" mrp="/os/mm/omxil/omxilapi/group/multimedia_omx_il_api.mrp"/>
+</component>
+<component id="omxilcore" name="OpenMAX IL Core" introduced="^3" purpose="optional">
+<unit version="1" bldFile="/os/mm/omxil/omxilcore/group" mrp="/os/mm/omxil/omxilcore/group/multimedia_omx_il_core.mrp"/>
+</component>
+<component id="omxilcomponentcommon" name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
+<unit version="1" bldFile="/os/mm/omxil/omxilcomponentcommon/group" mrp="/os/mm/omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp"/>
+</component>
+<component id="omxilrefcomps" name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
+<unit version="1" bldFile="/os/mm/omxil/omxilrefcomps/ref_components/group" mrp="/os/mm/omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp"/>
+</component>
+
+
+<component id="mmilapi" name="Multimedia Integration Layer API" introduced="^3" purpose="development">
+<unit bldFile="/os/mm/omxil/mmilapi/group" mrp="/os/mm/omxil/mmilapi/group/multimedia_il_api.mrp"/>
+</component>
+</collection>
+<collection id="devsound" name="Sound Device" level="devices">
+<component id="devsoundapi" name="DevSound API" introduced="7.0s" purpose="mandatory">
+<unit bldFile="/os/mm/devsound/devsoundapi/group" mrp="/os/mm/devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
+</component>
+<component id="a3fdevsound" name="A3F DevSound" introduced="^2" purpose="optional">
+<unit bldFile="/os/mm/devsound/a3fdevsound/group" mrp="/os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
+</component>
+<component id="a3facf" name="A3F Audio Component Framework" introduced="^2" purpose="optional">
+<unit bldFile="/os/mm/devsound/a3facf/group" mrp="/os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
+</component>
+<component id="devsoundpluginsupport" name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
+<unit bldFile="/os/mm/devsound/devsoundpluginsupport/group" mrp="/os/mm/devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
+</component>
+<component id="refdevsound" 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 id="btdevsound" name="Bluetooth DevSound Plugin" introduced="7.0s" purpose="development" class="plugin">
+<unit bldFile="/os/mm/devsound/sounddevbt/group" mrp="/os/mm/devsound/sounddevbt/group/multimedia_mdf_devsound_refbtplugin.mrp"/>
+</component>
+<component id="a3ftrace" name="A3F Trace Utility" introduced="^2" purpose="development">
+<unit bldFile="/os/mm/devsound/a3ftrace/group" mrp="/os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
+</component>
+
+<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">
+<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"/>
+</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"/>
+</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">
+<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>
+</collection>
+<collection id="imagingext_plat" name="Imaging Extensions Platform Interfaces" level="app-if">
+<component id="jpeg2000_icl_plugin_api" name="JPEG2000 ICL plugin API" class="api" filter="s60">
+<unit bldFile="/os/imagingext/imagingext_plat/jpeg2000_icl_plugin_api/group"/>
+</component>
+<component id="extended_icl_jpeg_api" name="Extended ICL Jpeg API" class="api" filter="s60">
+<unit bldFile="/os/imagingext/imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
+
+</component>
+<component id="h324_annex_k_custom_api" name="H324 Annex K Custom API" class="api" filter="s60">
+<unit bldFile="/os/imagingext/imagingext_plat/h324_annex_k_custom_api/group"/>
+</component>
+<component id="ecam_orientation_custom_api" name="ECam Orientation Custom API" class="api" filter="s60">
+<unit bldFile="/os/imagingext/imagingext_plat/ecam_orientation_custom_api/group"/>
+</component>
+<component id="ecam_ui_orientation_override_custom_api" name="ECam UI Orientation Override Custom API" class="api" filter="s60">
+<unit bldFile="/os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
+</component>
+<component id="ecam_face_tracking_custom_api" name="ECam Face Tracking Custom API" class="api" filter="s60">
+<unit bldFile="/os/imagingext/imagingext_plat/ecam_face_tracking_custom_api/group"/>
+</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">
+<component id="iclextjpegapi" filter="s60" name="ICL Extension JPEG API">
+<unit bldFile="/os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
+</component>
+<component id="imageadaptationextensions_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"/>
+</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>
+<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">
+<collection id="graphicsaccelaration" name="Graphics Acceleration" level="adaptation">
+<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">
+<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">
+<unit bldFile="/os/graphics/graphicsresourceservices/graphicsresourceadaptation/group" mrp="/os/graphics/graphicsresourceservices/graphicsresourceadaptation/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">
+<!-- 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="graphicscomposition" name="Graphics Composition" level="engines">
+<component id="openwfcinterface" name="OpenWF Composition Interface" introduced="^3" purpose="optional">
+<unit bldFile="/os/graphics/graphicscomposition/openwfcinterface/group" mrp="/os/graphics/graphicscomposition/openwfcinterface/group/graphics_openwfcinterface.mrp"/>
+</component>
+<component id="openwfcompositionengine" name="OpenWF Composition Engine" introduced="^3" purpose="development">
+<unit bldFile="/os/graphics/graphicscomposition/openwfcompositionengine/group" mrp="/os/graphics/graphicscomposition/openwfcompositionengine/group/graphics_openwfcompositionengine.mrp"/>
+</component>
+<component id="openwfsupport" name="OpenWF Support" introduced="^3" purpose="optional">
+<unit bldFile="/os/graphics/graphicscomposition/openwfsupport/group" mrp="/os/graphics/graphicscomposition/openwfsupport/group/graphics_openwfsupport.mrp"/>
+</component>
+<component id="surfaceupdate" name="Surface Update" introduced="^3" purpose="optional">
+<unit bldFile="/os/graphics/graphicscomposition/surfaceupdate/group" mrp="/os/graphics/graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
+</component>
+</collection>
+<collection id="graphicstest" name="Graphics Test" level="app-if">
+
+<component id="uibench" name="UI Bench" introduced="9.2" purpose="development">
+<unit bldFile="/os/graphics/graphicstest/uibench/group" mrp="/os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
+</component>
+</collection>
+<collection id="graphics_plat" name="Graphics Platform Interfaces" level="app-if">
+<component id="m3g_core_api" filter="sf_build" name="M3G Core API" class="api">
+<unit bldFile="/os/graphics/graphics_plat/m3g_core_api/group"/>
+</component>
+</collection>
+<collection id="graphics_info" name="Graphics Info" level="app-if">
+<component id="graphicsdocs" name="Graphics Documentation" purpose="development" class="doc">
+<unit mrp="/os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
+</component>
+<component id="graphics_metadata" name="Graphics Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
+</component>
+</collection>
+<collection id="windowing" name="Windowing" level="app-if">
+<component id="windowserver" name="Window Server" purpose="mandatory">
+<unit bldFile="/os/graphics/windowing/windowserver/group" mrp="/os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
+</component>
+<component id="windowserverplugins" name="Window Server Plugins" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/graphics/windowing/windowserverplugins/group" mrp="/os/graphics/windowing/windowserverplugins/group/graphics_wserv_std_plugins.mrp"/>
+</component>
+</collection>
+<collection id="printingservices" name="Printing Services" level="app-if">
+<component id="printerdriversupport" name="Printer Driver Support" purpose="optional">
+<unit bldFile="/os/graphics/printingservices/printerdriversupport/group" mrp="/os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
+</component>
+<component id="printerdrivers" name="Printer Drivers" purpose="optional" class="plugin">
+<unit bldFile="/os/graphics/printingservices/printerdrivers/group" mrp="/os/graphics/printingservices/printerdrivers/group/graphics_printdrv.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">
+<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">
+<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 -->
+<unit bldFile="/os/graphics/openvg/openvginterface/group/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">
+<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"/>
+</component>
+<component id="eglrefimpl" name="EGL Reference Implementation" introduced="^3" purpose="optional">
+<unit bldFile="/os/graphics/egl/eglrefimpl/group" mrp="/os/graphics/egl/eglrefimpl/group/graphics_eglrefimpl.mrp"/>
+</component>
+<component id="egltest" name="EGL Tests" introduced="^3" purpose="development">
+<unit bldFile="/os/graphics/egl/egltest/group" mrp="/os/graphics/egl/egltest/group/graphics_egltest.mrp"/>
+</component>
+</collection>
+<collection id="graphicsdeviceinterface" name="Graphics Device Interface" level="device-interface">
+<component id="gdi" name="GDI" purpose="mandatory">
+<unit bldFile="/os/graphics/graphicsdeviceinterface/gdi/group" mrp="/os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
+</component>
+<component id="bitgdi" name="BitGDI" purpose="mandatory">
+<unit bldFile="/os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="/os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
+</component>
+<component id="colourpalette" name="Colour Palette" introduced="7.0s" purpose="optional">
+<unit bldFile="/os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="/os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
+</component>
+<component id="screendriver" name="Screen Driver" introduced="6.1" purpose="optional" class="plugin">
+<unit bldFile="/os/graphics/graphicsdeviceinterface/screendriver/group" mrp="/os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
+</component>
+<component id="directgdi" name="DirectGDI" introduced="^3" deprecated="^3" purpose="optional">
+<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">
+<unit bldFile="/os/graphics/graphicsdeviceinterface/directgdiadaptation/group" mrp="/os/graphics/graphicsdeviceinterface/directgdiadaptation/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>
+</collection>
+<collection id="graphicsapitest" name="Graphics API Tests" level="app-if">
+
+
+</collection>
+</package>
+<package id="textandloc" level="services" tech-domain="ui" name="Text and Localisation Services" levels="encoding util fonts tools text">
+<collection id="textandloc_plat" name="Text and Localisation Platform Interfaces" level="text">
+<component id="findutil_api" name="Find Utility API" class="api" filter="s60">
+<unit bldFile="/os/textandloc/textandloc_plat/findutil_api/group"/>
+</component>
+<component id="japanese_language_utilities_api" name="Japanese Language Utilities API" class="api" filter="s60">
+<unit bldFile="/os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
+</component>
+<component id="sortutil_api" name="Sorting Utility API" class="api" filter="s60">
+<unit bldFile="/os/textandloc/textandloc_plat/sortutil_api/group"/>
+</component>
+</collection>
+<collection id="textandloc_pub" name="Text and Localisation Public Interfaces" level="text">
+<component id="directory_localizer_api" name="Directory Localizer API" class="api" filter="s60">
+<unit bldFile="/os/textandloc/textandloc_pub/directory_localizer_api/group"/>
+</component>
+</collection>
+<collection id="charconvfw" name="Character Conversion" level="encoding">
+<component id="charconv_fw" name="Character Encoding and Conversion Framework" purpose="optional">
+<unit bldFile="/os/textandloc/charconvfw/charconv_fw/group" mrp="/os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
+</component>
+<component id="charconvplugins" name="Character Encoding and Conversion Plugins" purpose="optional" class="plugin">
+<unit bldFile="/os/textandloc/charconvfw/charconvplugins/group" mrp="/os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
+</component>
+<component id="fatfilenameconversionplugins" name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" class="plugin">
+<unit bldFile="/os/textandloc/charconvfw/fatfilenameconversionplugins/group" mrp="/os/textandloc/charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
+</component>
+</collection>
+<collection id="fontandtxtsrv" name="Font and Text Services" level="fonts">
+<component id="iculayoutengine" name="ICU Layout Engine" introduced="9.2" purpose="optional" class="plugin">
+<unit bldFile="/os/textandloc/fontservices/textshaperplugin/group" mrp="/os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
+</component>
+<component id="fontstore" name="Font Store" purpose="mandatory">
+<unit bldFile="/os/textandloc/fontservices/fontstore/group" mrp="/os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
+</component>
+<component id="textrendering" name="Text Rendering" purpose="mandatory">
+<!-- placeholder for text code from GDI -->
+</component>
+<component id="freetypefontrasteriser" name="FreeType Font Rasteriser" purpose="optional" class="plugin">
+<unit bldFile="/os/textandloc/fontservices/freetypefontrasteriser/group" mrp="/os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
+</component>
+<component id="referencefonts" name="Reference Fonts" introduced="6.0" purpose="optional">
+<unit bldFile="/os/textandloc/fontservices/referencefonts/group" mrp="/os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
+</component>
+</collection>
+<collection id="textlayout" name="Text Layout" level="text">
+<component id="texthandling" name="Text Handling" purpose="optional">
+<unit bldFile="/os/textandloc/textrendering/texthandling/group" mrp="/os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
+</component>
+<component id="textformatting" name="Text Formatting" purpose="optional">
+<unit bldFile="/os/textandloc/textrendering/textformatting/group" mrp="/os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
+</component>
+
+</collection>
+<collection id="textandlocutils" name="Text and Localisation Utils" level="util">
+<!-- components in this collection need to be moved to the right collection.
+ Either move into the units' directories, or create a new textandlocutils directory -->
+<component id="numbergrouping" filter="s60" name="Number Grouping">
+<unit bldFile="/os/textandloc/charconvfw/numbergrouping/group"/>
+</component>
+<component id="jplangutil" filter="s60" name="Japanese Language Utilities">
+<unit bldFile="/os/textandloc/charconvfw/jplangutil/group"/>
+</component>
+<component id="sortutil" filter="s60" name="Sorting Utility">
+<unit bldFile="/os/textandloc/charconvfw/sortutil/group"/>
+</component>
+<component id="inlinetext" filter="s60" name="Inline Text">
+<unit bldFile="/os/textandloc/charconvfw/inlinetext/group"/>
+</component>
+<component id="nearestlangutil" name="Nearest Language Util" introduced="^2" purpose="mandatory">
+<!-- placeholder for split from bafl -->
+</component>
+<component id="numberformatting" name="Number Formatting" introduced="7.0s" purpose="optional">
+<unit bldFile="/os/textandloc/textrendering/numberformatting/group" mrp="/os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
+</component>
+</collection>
+<collection id="localesupport" name="Locale Support" level="util">
+<component id="reflocales" name="Reference Locales" purpose="optional" class="plugin">
+<unit bldFile="/os/textandloc/localisation/localesupport" mrp="/os/textandloc/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
+</component>
+<component id="initlocale" name="Initialise Locale" introduced="^2" purpose="mandatory">
+<!-- placeholder for split from bafl -->
+</component>
+</collection>
+<collection id="textandloctools" name="Text and Localisation Tools" level="tools">
+<component id="fontcompiler" name="Font Compiler" purpose="development" target="desktop">
+<!-- placeholder for split from GDI Tools -->
+</component>
+<component id="bitmapfonttools" name="Bitmap Font Tools" purpose="development" target="desktop">
+<unit bldFile="/os/graphics/graphicstools/bitmapfonttools/group" mrp="/os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
+</component>
+</collection>
+<collection id="textandloc_info" name="Text and Localisation Info" level="text">
+<component id="textandloc_metadata" name="Text and Localisation Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="xmlsrv" level="services" tech-domain="rt" name="XML Services" levels="plugin server framework generic specific">
+<collection id="xmlsrv_plat" name="XML Services Platform Interfaces" level="specific">
+<component id="xmlsrv_plat_build" name="XML Services Platform Interface Build" class="api" filter="s60">
+<!-- need to fix the configuration used here.
+ Either destribute to other components or use the new feature flags confguration mechanisms.
+ Remove this component and uncomment the other units when fixed-->
+<unit bldFile="/os/xmlsrv/xmlsrv_plat/group"/>
+</component>
+<component id="xml_encryption_api" name="XML Encryption API" class="api" filter="s60">
+<!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/> -->
+</component>
+<component id="xml_signature_api" name="XML Signature API" class="api" filter="s60">
+<!-- <unit bldFile="xmlsrv_plat/xml_signature_api/group"/> -->
+</component>
+<component id="xml_security_engine_utils_api" name="XML Security Engine Utils API" class="api" filter="s60">
+<!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/> -->
+</component>
+</collection>
+<collection id="xmlsecurityengine" name="XML Security Engine" level="framework">
+<component id="xmlseccertman" filter="s60" name="XML Security Certificate Manager">
+<unit bldFile="/os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
+</component>
+<component id="xmlsec" filter="s60" name="XML Security">
+<unit bldFile="/os/xmlsrv/xmlsecurityengine/xmlsec/group"/>
+</component>
+<component id="xmlseccrypto" filter="s60" name="XML Security Crypto">
+<unit bldFile="/os/xmlsrv/xmlsecurityengine/xmlseccrypto/group"/>
+</component>
+<component id="xmlsecwrapper" filter="s60" name="XML Security Wrapper">
+<unit bldFile="/os/xmlsrv/xmlsecurityengine/xmlsecwrapper/group"/>
+</component>
+</collection>
+<collection id="xml" name="XML" level="generic">
+<component id="xmlfw" name="XML Framework" introduced="7.0s" purpose="optional">
+<unit bldFile="/os/xmlsrv/xml/xmlfw/group" mrp="/os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
+</component>
+<component id="libxml2libs" name="Libxml2 Libraries" introduced="^3" purpose="optional">
+<unit bldFile="/os/xmlsrv/xml/libxml2libs/group" mrp="/os/xmlsrv/xml/libxml2libs/group/syslibs_libxml2.mrp"/>
+</component>
+<component id="legacyminidomparser" name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
+<unit bldFile="/os/xmlsrv/xml/legacyminidomparser/GROUP" mrp="/os/xmlsrv/xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp"/>
+</component>
+<component id="xmldomandxpath" name="XML DOM and XPath" introduced="^3" purpose="optional">
+<unit bldFile="/os/xmlsrv/xml/xmldomandxpath/group" mrp="/os/xmlsrv/xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
+</component>
+<component id="xmlexpatparser" name="XML Expat Parser" introduced="7.0s" purpose="optional" class="plugin">
+<unit bldFile="/os/xmlsrv/xml/xmlexpatparser/group" mrp="/os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
+</component>
+<component id="xmllibxml2parser" name="XML Libxml2 Parser" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/xmlsrv/xml/xmllibxml2parser/group" mrp="/os/xmlsrv/xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
+</component>
+<component id="wbxmlparser" name="WBXML Parser" introduced="7.0s" purpose="optional" class="plugin">
+<unit bldFile="/os/xmlsrv/xml/wbxmlparser/group" mrp="/os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
+</component>
+</collection>
+<collection id="xmlsrv_info" name="XML Services Info" level="specific">
+<component id="xmlsrv_metadata" name="XML Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="deviceplatformrelease" level="services" tech-domain="to" name="Device Platform Release" levels="bld mid top">
+<collection id="s60extras" name="S60 Extras" level="mid">
+<!-- collection is really a component. Need to move down a directory -->
+<component id="s60extras_build" filter="s60" name="S60 Extras Build" class="config" purpose="development">
+<unit bldFile="/os/deviceplatformrelease/S60Extras/group"/>
+</component>
+</collection>
+<collection id="locfiles" name="Locale Files" level="mid">
+<component id="locfiles_build" filter="s60" name="S60 Locale Files Build" class="config" purpose="development">
+<!-- need to move component down a directory -->
+<unit bldFile="/os/deviceplatformrelease/locfiles/group"/>
+</component>
+<component id="locfiles_set1" name="Locale Files Set 1" class="config" filter="s60">
+<unit bldFile="/os/deviceplatformrelease/locfiles/group/set1"/>
+</component>
+<component id="locfiles_set2" name="Locale Files Set 2" class="config" filter="s60">
+<unit bldFile="/os/deviceplatformrelease/locfiles/group/set2"/>
+</component>
+<component id="locfiles_set3" name="Locale Files Set 3" class="config" filter="s60">
+<unit bldFile="/os/deviceplatformrelease/locfiles/group/set3"/>
+</component>
+<component id="locfiles_set4" name="Locale Files Set 4" class="config" filter="s60">
+<unit bldFile="/os/deviceplatformrelease/locfiles/group/set4"/>
+</component>
+<component id="locfiles_set5" name="Locale Files Set 5" class="config" filter="s60">
+<unit bldFile="/os/deviceplatformrelease/locfiles/group/set5"/>
+</component>
+<component id="locfiles_set6" name="Locale Files Set 6" class="config" filter="s60">
+<unit bldFile="/os/deviceplatformrelease/locfiles/group/set6"/>
+</component>
+<!-- is the a problem with SF builds with the following? -->
+<component id="locfiles_set7" name="Locale Files Set 7" class="config" filter="s60">
+<unit bldFile="/os/deviceplatformrelease/locfiles/group/set7"/>
+</component>
+<component id="locfiles_set8" name="Locale Files Set 8" class="config" filter="s60">
+<unit bldFile="/os/deviceplatformrelease/locfiles/group/set8"/>
+</component>
+<component id="locfiles_set9" name="Locale Files Set 9" class="config" filter="s60">
+<unit bldFile="/os/deviceplatformrelease/locfiles/group/set9"/>
+</component>
+<component id="locfiles_set10" name="Locale Files Set 10" class="config" filter="s60">
+<unit bldFile="/os/deviceplatformrelease/locfiles/group/set10"/>
+</component>
+<component id="locfiles_set11" name="Locale Files Set 11" class="config" filter="s60">
+<unit bldFile="/os/deviceplatformrelease/locfiles/group/set11"/>
+</component>
+<component id="locfiles_set12" name="Locale Files Set 12" class="config" filter="s60">
+<unit bldFile="/os/deviceplatformrelease/locfiles/group/set12"/>
+</component>
+<component id="locfiles_set13" name="Locale Files Set 13" class="config" filter="s60">
+<unit bldFile="/os/deviceplatformrelease/locfiles/group/set13"/>
+</component>
+<component id="locfiles_set14" name="Locale Files Set 14" class="config" filter="s60">
+<unit bldFile="/os/deviceplatformrelease/locfiles/group/set14"/>
+</component>
+<component id="locfiles_set15" name="Locale Files Set 15" class="config" filter="s60">
+<unit bldFile="/os/deviceplatformrelease/locfiles/group/set15"/>
+</component>
+<component id="locfiles_set16" name="Locale Files Set 16" class="config" filter="s60">
+<unit bldFile="/os/deviceplatformrelease/locfiles/group/set16"/>
+</component>
+</collection>
+<collection id="version" name="Version" level="top">
+<!-- collection is really a component. Need to move down a directory -->
+<component id="version_build" filter="s60" name="Version Build" class="config" purpose="development">
+<unit bldFile="/os/deviceplatformrelease/Version/group"/>
+</component>
+</collection>
+<collection id="helps_loc2" name="Helps Locale 2" level="top">
+<!-- collection is really a component. Need to move down a directory -->
+<component id="helps_loc2_build" name="Helps Locale 2 Build" filter="s60">
+<unit bldFile="/os/deviceplatformrelease/helps_loc2/group"/>
+</component>
+</collection>
+<collection id="sf_config" name="SF Config" level="mid">
+<component id="config" filter="s60" name="Config" class="config" purpose="development">
+<unit base="/os/deviceplatformrelease/sf_config/config"/>
+</component>
+<component id="cenrep" filter="sf_build" name="ConE Central Repository Config" class="config" purpose="development">
+<!-- will shoudl give the id/path something more unique than cenrep -->
+<unit bldFile="/os/deviceplatformrelease/sf_config/cenrep/group"/>
+</component>
+<component id="rombuild_syborg" filter="sf_build" name="Syborg iMaker Config" purpose="development" class="config" introduced="^3">
+<unit bldFile="/os/deviceplatformrelease/sf_config/rombuild/syborg/group"/>
+</component>
+<component id="rombuild_zoom2" filter="sf_build" name="Zoom2 iMaker Config" purpose="development" class="config" introduced="^3">
+<unit bldFile="/os/deviceplatformrelease/sf_config/rombuild/zoom2/group"/>
+</component>
+</collection>
+<!-- should be located locally in buildplatforms/group. NB. This is a different package! -->
+<collection id="s60bld" name="S60 Build">
+<component id="buildplatforms" filter="s60" name="Build Platforms">
+<unit bldFile="/tools/buildplatforms/group"/>
+</component>
+</collection>
+<collection id="symbianosbld" name="Symbian OS Build" level="bld">
+<component id="cedarutils" name="Cedar Utils" purpose="development">
+<unit mrp="/os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
+</component>
+<component id="productionbldcbrconfig" name="Production Build CBR Config" filter="gt" purpose="development" class="config">
+<unit mrp="/os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
+</component>
+<component id="foundation_s60_packages" name="Foundation S60 Packages" class="config" introduced="^3" deprecated="^3" purpose="development" target="desktop">
+<unit mrp="/os/deviceplatformrelease/symbianosbld/foundation_s60_packages/foundation_s60_packages.mrp"/>
+</component>
+</collection>
+<collection id="foundation_system" name="Foundation System" level="top">
+<component id="system_model" name="System Model" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
+</component>
+</collection>
+<collection id="deviceplatformrelease_info" name="Device Platform Release Info" level="top">
+<component id="deviceplatformrelease_metadata" name="Device Platform Release Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="osrndtools" level="services" tech-domain="to" name="OS R&D tools" levels="fw trace">
+<collection id="stif" name="STIF" level="fw">
+<component id="stif_plat" filter="s60" name="STIF Platform Interfaces" class="api" purpose="development">
+<unit bldFile="/os/osrndtools/stif/stif_plat/group"/>
+</component>
+<component id="testinterface" filter="s60" name="Test Interface" purpose="development">
+<unit bldFile="/os/osrndtools/stif/testinterface/group"/>
+</component>
+<component id="testserver" filter="s60" name="Test Server" purpose="development">
+<unit bldFile="/os/osrndtools/stif/testserver/group"/>
+</component>
+<component id="testengine" filter="s60" name="Test Engine" purpose="development">
+<unit bldFile="/os/osrndtools/stif/testengine/group"/>
+</component>
+<component id="testserverstarter" filter="s60" name="Test Server Starter" purpose="development">
+<unit bldFile="/os/osrndtools/stif/testserverstarter/group"/>
+</component>
+<component id="stiftfwif" filter="s60" name="STIF Test Framework Interface" purpose="development">
+<unit bldFile="/os/osrndtools/stif/stiftfwif/group"/>
+</component>
+<component id="consoleui" filter="s60" name="Console UI" purpose="development">
+<unit bldFile="/os/osrndtools/stif/consoleui/group"/>
+</component>
+<component id="testcombiner" filter="s60" name="Test Combiner" purpose="development">
+<unit bldFile="/os/osrndtools/stif/testcombiner/group"/>
+</component>
+<component id="demomodule" filter="s60" name="Demo Module" purpose="development">
+<unit bldFile="/os/osrndtools/stif/demomodule/group"/>
+</component>
+<component id="atslogger" filter="s60" name="ATS Logger" purpose="development">
+<unit bldFile="/os/osrndtools/stif/atslogger/group"/>
+</component>
+<component id="atsinterface" filter="s60" name="ATS Interface" purpose="development">
+<unit bldFile="/os/osrndtools/stif/atsinterface/group"/>
+</component>
+<component id="testscripter" filter="s60" name="Test Scripter" purpose="development">
+<unit bldFile="/os/osrndtools/stif/testscripter/group"/>
+</component>
+<component id="suevent" filter="s60" name="SU Event" purpose="development">
+<unit bldFile="/os/osrndtools/stif/suevent/group"/>
+</component>
+<component id="stifkerneltestclassbase" filter="s60" name="STIF Kernel Test Class Base" purpose="development">
+<meta rel="config">
+<defined condition="__S60_"/>
+</meta>
+<!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
+<!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
+</component>
+<component id="stif_build" filter="s60" name="STIF Build" purpose="development">
+<!-- move exports into self-contained component. Remove this when configuration is in place-->
+<unit bldFile="/os/osrndtools/stif/group"/>
+</component>
+</collection>
+<collection id="memspy" name="Memspy" level="trace">
+<component id="memspy_plat" filter="s60" name="Memspy Platform Interfaces" class="api" purpose="development">
+<unit bldFile="/os/osrndtools/memspy/memspy_plat/group"/>
+</component>
+<component id="driver" filter="s60" name="Memspy Driver" purpose="development">
+<unit bldFile="/os/osrndtools/memspy/driver/group"/>
+</component>
+<component id="memspy_engine" filter="s60" name="Memspy Engine" purpose="development">
+<unit bldFile="/os/osrndtools/memspy/engine/group"/>
+</component>
+<component id="commandline" filter="s60" name="Memspy Command Line" purpose="development">
+<unit bldFile="/os/osrndtools/memspy/commandline/group"/>
+</component>
+<component id="console" filter="s60" name="Memspy Console" purpose="development">
+<unit bldFile="/os/osrndtools/memspy/console/group"/>
+</component>
+<component id="memspy_build" filter="s60" name="Memspy Build" purpose="development">
+<!-- move exports into self-contained component.-->
+<unit bldFile="/os/osrndtools/memspy/group"/>
+</component>
+</collection>
+<collection id="hti" name="Harmonized Test Interface" level="trace">
+<component id="hti_plat" filter="s60" name="HTI Platform Interfaces" class="api" purpose="development">
+<unit bldFile="/os/osrndtools/hti/hti_plat/group"/>
+</component>
+<component id="hticfg" filter="s60" name="HTI Config" purpose="development">
+<unit bldFile="/os/osrndtools/hti/hticfg/group"/>
+</component>
+<component id="htiautostart" filter="s60" name="HTI Autostart" purpose="development">
+<unit bldFile="/os/osrndtools/hti/htiautostart/group"/>
+</component>
+<component id="htiframework" filter="s60" name="HTI Framework" purpose="development">
+<unit bldFile="/os/osrndtools/hti/htiframework/group"/>
+</component>
+<component id="hticommplugins" filter="s60" name="HTI Communication Plugins" purpose="development" class="plugin">
+<!-- need to #include these from a single unit or separate into component at the right directory level -->
+<unit bldFile="/os/osrndtools/hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
+<unit bldFile="/os/osrndtools/hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
+<unit bldFile="/os/osrndtools/hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
+<unit bldFile="/os/osrndtools/hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
+</component>
+<component id="htiserviceplugins" filter="s60" name="HTI Service Plugins" purpose="development" class="plugin">
+<!-- need to #include these from a single unit or separate into component at the right directory level -->
+<unit bldFile="/os/osrndtools/hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
+<unit bldFile="/os/osrndtools/hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
+<unit bldFile="/os/osrndtools/hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
+<unit bldFile="/os/osrndtools/hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
+<unit bldFile="/os/osrndtools/hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
+</component>
+<component id="htifilehlp" filter="s60" name="HTI File Help" purpose="development">
+<unit bldFile="/os/osrndtools/hti/htifilehlp/group"/>
+</component>
+<component id="htiwatchdog" filter="s60" name="HTI Watchdog" purpose="development">
+<unit bldFile="/os/osrndtools/hti/htiwatchdog/group"/>
+</component>
+<component id="hti_build" filter="s60" name="HTI Build" purpose="development">
+<!-- move exports into self-contained component.-->
+<unit bldFile="/os/osrndtools/hti/group"/>
+</component>
+</collection>
+<collection id="osrndtools_info" name="OS R&D tools Info" level="trace">
+<component id="osrndtools_metadata" name="OS R&D tools Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/osrndtools/osrndtools_info/osrndtools_metadata/osrndtools_metadata.mrp"/>
+</component>
+</collection>
+</package>
+</layer>
+<layer id="mw" name="Middleware" levels="generic specific">
+<package id="appsupport" level="generic" tech-domain="rt" name="Generic Application Support" levels="system plugin framework server generic specific">
+<collection id="appsupport_pub" name="Generic Application Support Public Interfaces" level="specific">
+<component id="flash_viewer_framework_api" name="Flash Viewer Framework API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
+</component>
+<component id="network_status_api" name="Network Status API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_pub/network_status_api/group"/>
+</component>
+</collection>
+<collection id="appsupport_plat" name="Generic Application Support Platform Interfaces" level="specific">
+<component id="action_plugin_api" name="Action Plug-In API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/action_plugin_api/group"/>
+</component>
+<component id="application_orientation_api" name="Application Orientation API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/application_orientation_api/group"/>
+</component>
+<component id="context_access_api" name="Context Access API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/context_access_api/group"/>
+</component>
+<component id="context_framework_services_api" name="Context Framework Services API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/context_framework_services_api/group"/>
+</component>
+<component id="context_framework_client_api" name="Context Framework Client API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/context_framework_client_api/group"/>
+</component>
+<component id="context_framework_listener_api" name="Context Framework Listener API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/context_framework_listener_api/group"/>
+</component>
+<component id="context_framework_version_api" name="Context Framework Version API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/context_framework_version_api/group"/>
+</component>
+<component id="context_source_plugin_api" name="Context Source Plug-In API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/context_source_plugin_api/group"/>
+</component>
+<component id="context_source_settings_manager_api" name="Context Source Settings Manager API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/context_source_settings_manager_api/group"/>
+</component>
+<component id="context_subscription_api" name="Context Subscription API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/context_subscription_api/group"/>
+</component>
+<component id="key_event_framework_api" name="Key Event Framework API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/key_event_framework_api/group"/>
+</component>
+<component id="key_event_framework_mapper_api" name="Key Event Framework Mapper API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/key_event_framework_mapper_api/group"/>
+</component>
+<component id="media_keys_definition_api" name="Media Keys Definition API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/media_keys_definition_api/group"/>
+</component>
+<component id="ood_threshold_api" name="OOD Threshold API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/ood_threshold_api/group"/>
+</component>
+<component id="oom_monitor_api" name="OOM Monitor API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/oom_monitor_api/group"/>
+</component>
+<component id="oom_monitor_plugin_api" name="OOM Monitor Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/oom_monitor_plugin_api/group"/>
+</component>
+<component id="operation_provider_api" name="Operation Provider API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/operation_provider_api/group"/>
+</component>
+<component id="phonecmdhandler_api" name="Phone Command Handler API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/phonecmdhandler_api/group"/>
+</component>
+<component id="restore_factory_settings_api" name="Restore Factory Settings API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/restore_factory_settings_api/group"/>
+</component>
+<component id="restore_factory_settings_plugin_api" name="Restore Factory Settings Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/restore_factory_settings_plugin_api/group"/>
+</component>
+<component id="secondary_display_accfw_api" name="Secondary Display Accessory Framework API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/secondary_display_accfw_api/group"/>
+</component>
+<component id="secondary_display_startup_api" name="Secondary Display Startup API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/secondary_display_startup_api/group"/>
+</component>
+<component id="secondary_display_sysap_api" name="Secondary Display System Application API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/secondary_display_sysap_api/group"/>
+</component>
+<component id="secondary_display_system_state_api" name="Secondary Display System State API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/secondary_display_system_state_api/group"/>
+</component>
+<component id="sensor_user_setting_api" name="Sensor User Setting API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/sensor_user_setting_api/group"/>
+</component>
+<component id="startup_configuration_api" name="Startup Configuration API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/startup_configuration_api/group"/>
+</component>
+<component id="system_application_key_handler_plugin_api" name="System Application Key Handler Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/system_application_key_handler_plugin_api/group"/>
+</component>
+<component id="system_application_light_control_plugin_api" name="System Application Light Control Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/system_application_light_control_plugin_api/group"/>
+</component>
+<component id="system_application_notification_api" name="System Application Notification API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/system_application_notification_api/group"/>
+</component>
+<component id="system_application_plugin_callback_api" name="System Application Plug-in Callback API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
+</component>
+</collection>
+<collection id="contextframework" name="Context Framework" level="framework">
+<!-- the units that are commented out need to be put back when configuration is in place.
+ They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
+<component id="cfw" filter="s60" name="Context Framework">
+<meta rel="config">
+<defined condition="RD_CONTEXT_FRAMEWORK"/>
+</meta>
+<!--<unit bldFile="contextframework/cfw/group"/> -->
+</component>
+<component id="cfwplugins" filter="s60" name="Context Framework Plugins" class="plugin">
+<meta rel="config">
+<defined condition="RD_CONTEXT_FRAMEWORK"/>
+</meta>
+<!--<unit bldFile="contextframework/cfwplugins/group"/>-->
+</component>
+<component id="contextframework_build" filter="s60" name="Context Framework Build">
+<unit bldFile="/mw/appsupport/contextframework/group"/>
+</component>
+</collection>
+<collection id="coreapplicationuis" name="Core Application UIs" level="server">
+<component id="dbrecovery" filter="s60" name="Database Recovery">
+<unit bldFile="/mw/appsupport/coreapplicationuis/dbrecovery/group"/>
+</component>
+<component id="nspswsplugin" filter="s60" name="NSPS WS Plugin" class="plugin">
+<!-- No Service Power Save? Window Server? Please elaborate-->
+<unit bldFile="/mw/appsupport/coreapplicationuis/nspswsplugin/group"/>
+</component>
+<component id="rfs" filter="s60" name="Restore Factory Settings">
+<unit bldFile="/mw/appsupport/coreapplicationuis/rfs/group"/>
+</component>
+<component id="rfsplugins" filter="s60" name="Restore Factory Settings Plugins" class="plugin">
+<unit bldFile="/mw/appsupport/coreapplicationuis/rfsplugins/group"/>
+</component>
+<component id="sysap" filter="s60" name="System Application">
+<unit bldFile="/mw/appsupport/coreapplicationuis/sysap/group"/>
+</component>
+<component id="variatedsettings" filter="s60" name="Variated Settings" class="config">
+<unit bldFile="/mw/appsupport/coreapplicationuis/variatedsettings/group"/>
+</component>
+<component id="accfwuinotifier" filter="s60" name="Accessory Framework UI Notifier" class="plugin">
+<unit bldFile="/mw/appsupport/coreapplicationuis/accfwuinotifier/group"/>
+</component>
+<component id="kefmapper" filter="s60" name="Key Event Framework">
+<unit bldFile="/mw/appsupport/coreapplicationuis/kefmapper/group"/>
+</component>
+<component id="advancedtspcontroller" filter="s60" name="Advanced TSP Controller">
+<unit bldFile="/mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
+</component>
+<component id="powersaveutilities" filter="s60" name="Power Save Utilities">
+<unit bldFile="/mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
+</component>
+<component id="gsserverenginestub" filter="s60" name="GS Server Engine Stub">
+<unit bldFile="/mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
+</component>
+<component id="gsserverengine" filter="s60" name="GS Server Engine">
+<unit bldFile="/mw/appsupport/coreapplicationuis/gsserverengine/group"/>
+</component>
+<component id="sensordatacompensatorplugin" filter="s60" name="Sensor Data Compensator Plugin" class="plugin">
+<unit bldFile="/mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/group"/>
+</component>
+</collection>
+<collection id="flashliteapi_3_1" name="Flash Lite API 3.1" level="specific">
+<!-- collection is really a component. Move down a directory -->
+<component id="flashliteapi_3_1_build" name="Flash Lite API Build" filter="s60" introduced="^2">
+<unit base="/mw/appsupport/flashliteapi_3_1/group"/>
+</component>
+</collection>
+<collection id="mediakeys" name="Media Keys" level="plugin">
+<!-- collection is really a component. Move down a directory -->
+<component id="mediakeys_build" filter="s60" name="Media Keys Build">
+<unit bldFile="/mw/appsupport/mediakeys/group"/>
+</component>
+</collection>
+<collection id="startupservices" name="Startup Services" level="system">
+<component id="splashscreen" filter="s60" name="Splash Screen">
+<unit bldFile="/mw/appsupport/startupservices/splashscreen/group"/>
+</component>
+<component id="startupanimation" filter="s60" name="Startup Animation">
+<unit bldFile="/mw/appsupport/startupservices/startupanimation/group"/>
+</component>
+<component id="startup" name="Startup Application" filter="s60">
+<unit bldFile="/mw/appsupport/startupservices/startup/group"/>
+</component>
+</collection>
+<collection id="sysresmonitoring" name="System Resource Monitoring" level="system">
+<component id="oodmonitor" filter="s60" name="OOD Monitor" introduced="7.0s">
+<unit bldFile="/mw/appsupport/sysresmonitoring/oodmonitor/group"/>
+</component>
+<component id="oommonitor" filter="s60" name="OOM Monitor" introduced="7.0s">
+<unit bldFile="/mw/appsupport/sysresmonitoring/oommonitor/group"/>
+</component>
+</collection>
+<collection id="systemsettings" name="System Settings" level="system">
+<component id="gssensorplugin" filter="s60" name="GS Sensor Plugin" class="plugin">
+<unit bldFile="/mw/appsupport/systemsettings/gssensorplugin/group"/>
+</component>
+<component id="gsaccessoryplugin" filter="s60" name="GS Accessory Plugin" class="plugin">
+<unit bldFile="/mw/appsupport/systemsettings/gsaccessoryplugin/group"/>
+</component>
+</collection>
+<collection id="filehandling" name="File Handling" level="server">
+<component id="fileconverterfw" name="File Converter Framework" purpose="optional">
+<unit bldFile="/mw/appsupport/filehandling/fileconverterfw/group" mrp="/mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
+</component>
+<component id="htmltorichtextconverter" name="HTML to RichText Converter" introduced="7.0" purpose="optional" class="plugin">
+<unit bldFile="/mw/appsupport/filehandling/htmltorichtextconverter/group" mrp="/mw/appsupport/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.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">
+<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"/>
+</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"/>
+</component>
+<component id="alarmservertest" name="Alarm Server Test" deprecated="^3" introduced="8.1" purpose="development">
+<unit bldFile="/mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="/mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
+</component>
+
+<component id="appservicesdocs" name="Application Services Documentation" purpose="development" class="doc">
+<unit mrp="/mw/appsupport/commonappservices/appservicesdocs/app-services_documentation.mrp"/>
+</component>
+<component id="backuprestorenotification" name="Backup Restore Notification" introduced="8.1" purpose="optional">
+<unit bldFile="/mw/appsupport/commonappservices/backuprestorenotification/group" mrp="/mw/appsupport/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
+</component>
+</collection>
+<collection id="tzservices" name="Time Zone Services" level="plugin">
+<component id="tzserver" name="Time Zone Server" introduced="9.1" purpose="optional">
+<unit bldFile="/mw/appsupport/tzservices/tzserver/group" mrp="/mw/appsupport/tzservices/tzserver/group/app-services_tz.mrp"/>
+</component>
+<component id="tzloc" name="Time Zone Localization" introduced="9.1" purpose="optional">
+<unit bldFile="/mw/appsupport/tzservices/tzloc/group" mrp="/mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
+</component>
+<component id="tzlocrscfactory" name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
+<unit bldFile="/mw/appsupport/tzservices/tzlocrscfactory/group" mrp="/mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
+</component>
+<component id="tzdatabase" name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
+<unit bldFile="/mw/appsupport/tzservices/tzdatabase/group" mrp="/mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
+</component>
+</collection>
+<collection id="contenthandling" name="Content Handling" level="plugin">
+<component id="webrecognisers" name="Web Recognisers" purpose="optional" class="plugin">
+<unit bldFile="/mw/appsupport/contenthandling/webrecognisers/group" mrp="/mw/appsupport/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
+</component>
+</collection>
+<collection id="openenvutils" name="Open Environment Utilities" level="specific">
+<component id="commandshell" name="Command Shell" introduced="^3" purpose="development">
+<unit bldFile="/mw/appsupport/openenvutils/commandshell/group" mrp="/mw/appsupport/openenvutils/commandshell/group/oetools_zsh.mrp"/>
+</component>
+<component id="telnetserver" name="Telnet Server" introduced="^3" purpose="development">
+<unit bldFile="/mw/appsupport/openenvutils/telnetserver/group" mrp="/mw/appsupport/openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
+</component>
+</collection>
+<collection id="printingsupport" name="Printing Support" level="generic">
+<component id="printinguisupport" name="Printing UI Support" purpose="optional" introduced="^2" deprecated="^3">
+<unit bldFile="/mw/appsupport/printingsupport/printinguisupport/group" mrp="/mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
+</component>
+</collection>
+<collection id="appfw" name="Application Framework" level="framework">
+<component id="apparchitecture" name="Application Architecture" purpose="mandatory">
+<unit bldFile="/mw/appsupport/appfw/apparchitecture/group" mrp="/mw/appsupport/appfw/apparchitecture/group/app-framework_apparc.mrp"/>
+</component>
+<component id="viewserver" name="View Server" introduced="6.0" purpose="mandatory">
+<unit bldFile="/mw/appsupport/appfw/viewserver/group" mrp="/mw/appsupport/appfw/viewserver/group/app-framework_viewsrv.mrp"/>
+</component>
+
+</collection>
+<collection id="applaunchservices" name="Application Launch Services" level="generic">
+<component id="aftermarketappstarter" name="After Market Application Starter" introduced="^3" purpose="optional">
+<unit bldFile="/mw/appsupport/applaunchservices/aftermarketappstarter/group" mrp="/mw/appsupport/applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
+</component>
+<component id="applaunchplugins" name="Application Launch Plugins" introduced="^3" purpose="optional">
+<unit bldFile="/mw/appsupport/applaunchservices/applaunchplugins/group" mrp="/mw/appsupport/applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
+</component>
+</collection>
+<collection id="tzpcside" name="Time Zone PC Side" level="plugin">
+<component id="tzcompiler" name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config" target="desktop">
+<unit bldFile="/mw/appsupport/tzpcside/tzcompiler/group" mrp="/mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
+</component>
+</collection>
+<collection id="appsupport_info" name="Generic Application Support Info" level="specific">
+<component id="appsupport_metadata" name="Generic Application Support Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="securitysrv" level="generic" tech-domain="se" name="Security Services" levels="plugin framework server generic specific">
+<collection id="secsrv_plat" name="Security Services Platform Interfaces" level="specific">
+<component id="cms_api" name="CMS API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/cms_api/group"/>
+</component>
+<component id="pkcs12_parser_api" name="PKCS12 Parser API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/pkcs12_parser_api/group"/>
+</component>
+<component id="java_utils_api" name="Java Utils API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/java_utils_api/group"/>
+</component>
+<component id="wim_cert_api" name="WIM Cert API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/wim_cert_api/group"/>
+</component>
+<component id="device_key_store_encryption_plugin_api" name="Device Key Store Encryption Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/device_key_store_encryption_plugin_api/group"/>
+</component>
+<component id="x509certnameparser_api" name="X.509 Certificate Name Parser API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
+</component>
+<component id="remote_lock_api" name="Remote Lock API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
+</component>
+<component id="pkidialog_api" name="PKI Dialog API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
+</component>
+<component id="provisioning_api" name="Provisioning API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/provisioning_api/group"/>
+</component>
+<component id="keyguard_configuration_api" name="Keyguard Configuration API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/keyguard_configuration_api/group"/>
+</component>
+<component id="keylock_policy_api" name="Keylock Policy API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/keylock_policy_api/group"/>
+</component>
+<component id="security_code_ui_api" name="Security Code UI API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
+</component>
+<component id="gba_api" name="GBA API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/gba_api/group"/>
+</component>
+<component id="keyguard_access_api" name="Keyguard Access API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/keyguard_access_api/group"/>
+</component>
+<component id="devicelock_access_api" name="Device Lock Access API" class="api" filter="s60">
+<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">
+<unit bldFile="/mw/securitysrv/secsrv_plat/devencadaptation_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>
+<collection id="cms" name="Certificate Management Service" level="server">
+<!-- collection is really a component. Need to move down a directory-->
+<component id="cms_build" filter="s60" name="CMS" introduced="^3">
+<unit bldFile="/mw/securitysrv/cms/group"/>
+</component>
+</collection>
+<collection id="pkiutilities" name="PKI Utilities" level="plugin">
+<component id="x509certnameparser" filter="s60" name="X.509 Certificate Name Parser">
+<unit bldFile="/mw/securitysrv/pkiutilities/x509certnameparser/group"/>
+</component>
+<component id="pkcs12" filter="s60" name="PKCS #12">
+<unit bldFile="/mw/securitysrv/pkiutilities/pkcs12/group"/>
+</component>
+<component id="certmanui" filter="s60" name="Certificate Management UI">
+<unit bldFile="/mw/securitysrv/pkiutilities/certmanui/group"/>
+</component>
+<component id="ctsecuritydialogs" filter="s60" name="Crypto Token Security Dialogs">
+<unit bldFile="/mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
+</component>
+<component id="certsaver" filter="s60" name="Certificate Saver">
+<unit bldFile="/mw/securitysrv/pkiutilities/certsaver/group"/>
+</component>
+<component id="secmodui" filter="s60" name="Security Module UI">
+<unit bldFile="/mw/securitysrv/pkiutilities/secmodui/group"/>
+</component>
+<component id="devicetoken" filter="s60" name="Device Token">
+<unit bldFile="/mw/securitysrv/pkiutilities/devicetoken/group"/>
+</component>
+<component id="certificates" filter="s60" name="Certificates">
+<unit bldFile="/mw/securitysrv/pkiutilities/Certificates/group" filter="sf_build"/>
+</component>
+<component id="pkiutilities_build" filter="s60" name="PKI Utilities Build">
+<!-- need to split this into the above components -->
+<unit bldFile="/mw/securitysrv/pkiutilities/group"/>
+</component>
+<component id="ocsp" name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
+<unit bldFile="/mw/securitysrv/pkiutilities/ocsp/group" mrp="/mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
+</component>
+</collection>
+<collection id="wim" name="Wireless Identity Module " level="framework">
+<!-- collection is really a component. Need to move down a directory-->
+<component id="wim_build" filter="s60" name="WIM Build">
+<unit bldFile="/mw/securitysrv/wim/group"/>
+</component>
+</collection>
+<collection id="remotelock" name="Remote Lock" level="generic">
+<!-- collection is really a component. Need to move down a directory-->
+<component id="remotelock_build" filter="s60" name="Remote Lock Build">
+<unit bldFile="/mw/securitysrv/remotelock/group"/>
+</component>
+</collection>
+<collection id="securitydialogs" name="Security Dialogs" level="specific">
+<component id="keylockpolicyapi" filter="s60" name="Keylock Policy API">
+<unit bldFile="/mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
+</component>
+<component id="autolock" name="Autolock" filter="s60">
+<unit bldFile="/mw/securitysrv/securitydialogs/autolock/group"/>
+</component>
+<component id="secui" filter="s60" name="Security UI">
+<unit bldFile="/mw/securitysrv/securitydialogs/secui/group"/>
+</component>
+<component id="securitynotifier" filter="s60" name="Security Notifier">
+<unit bldFile="/mw/securitysrv/securitydialogs/securitynotifier/group"/>
+</component>
+<component id="lockclient" filter="s60" name="Lock Client" introduced="^3">
+<unit bldFile="/mw/securitysrv/securitydialogs/lockclient/group"/>
+</component>
+<component id="lockapp" filter="s60" name="Lock Application" introduced="^3">
+<unit bldFile="/mw/securitysrv/securitydialogs/lockapp/group"/>
+</component>
+<component id="simlockui" filter="s60" name="SIM Lock UI" introduced="^3">
+<unit bldFile="/mw/securitysrv/securitydialogs/simlockui/group"/>
+</component>
+</collection>
+<collection id="boottimeintegritycheck" name="Boot Time Integrity Check" level="plugin">
+<!-- collection is really a component. Need to move down a directory-->
+<component id="boottimeintegritycheck_build" filter="s60" name="Boot Time Integrity Check Build">
+<unit bldFile="/mw/securitysrv/boottimeintegritycheck/group"/>
+</component>
+</collection>
+<collection id="gba" name="Generic Bootstrapping Architecture" level="server">
+<component id="uicc" filter="s60" name="UICC" class="plugin" introduced="^2">
+<unit bldFile="/mw/securitysrv/gba/uicc/group"/>
+</component>
+<component id="gbaserver" filter="s60" name="GBA Server" introduced="^2">
+<unit bldFile="/mw/securitysrv/gba/gbaserver/group"/>
+</component>
+<component id="gbaapi" filter="s60" name="GBA API" introduced="^2">
+<unit bldFile="/mw/securitysrv/gba/gbaapi/group"/>
+</component>
+<component id="gbafilter" filter="s60" name="GBA HTTP Filter" class="plugin" introduced="^2">
+<unit bldFile="/mw/securitysrv/gba/gbafilter/group"/>
+</component>
+<component id="gba_build" filter="s60" name="Generic Boot Architecture Build" introduced="^2">
+<!-- need to split this into the above components, or remove #includes and make this GBA ROM -->
+<unit bldFile="/mw/securitysrv/gba/group"/>
+</component>
+</collection>
+<collection id="devencdiskutils" name="Device Encryption Disk Utils" level="server">
+<component id="devenccommonutils" filter="s60" name="Device Encryption Common Utils" introduced="^3">
+<unit bldFile="/mw/securitysrv/devencdiskutils/DevEncCommonUtils/group"/>
+</component>
+<component id="devencrfsplugin" filter="s60" name="Device Encryption RFS Plugin" introduced="^3" class="plugin">
+<unit bldFile="/mw/securitysrv/devencdiskutils/DevEncRfsPlugin/group"/>
+</component>
+<component id="pk5recognizer" filter="s60" name="Device Encryption Pk5 Recognizer" introduced="^3" class="plugin">
+<unit bldFile="/mw/securitysrv/devencdiskutils/Pk5Recognizer/group"/>
+</component>
+<component id="devencstarter" filter="s60" name="Device Encryption Starter" introduced="^3" class="plugin">
+<unit bldFile="/mw/securitysrv/devencdiskutils/DevEncStarter/group"/>
+</component>
+<component id="devencdiskutils" filter="s60" name="Device Encryption Disk Utils Build" introduced="^3">
+<!-- need to split this into the above components, or remove #includes and make this a ROM component-->
+<unit bldFile="/mw/securitysrv/devencdiskutils/group"/>
+</component>
+</collection>
+<collection id="securitysrv_info" name="Security Services Info" level="specific">
+
+<component id="securitysrv_metadata" name="Security Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="drm" level="generic" tech-domain="se" name="DRM" levels="plugin framework server generic specific">
+<collection id="drm_plat" name="DRM Platform Interfaces" level="specific">
+<component id="roap_api" name="ROAP API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/roap_api/group"/>
+</component>
+<component id="drm_common_api" name="DRM Common API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/drm_common_api/group"/>
+</component>
+<component id="drm_rights_api" name="DRM Rights API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/drm_rights_api/group"/>
+</component>
+<component id="drm_legacy_api" name="DRM Legacy API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/drm_legacy_api/group"/>
+</component>
+<component id="dcf_repository_api" name="DCF Repository API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/dcf_repository_api/group"/>
+</component>
+<component id="drm_service_api" name="DRM Service API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/drm_service_api/group"/>
+</component>
+<component id="drm_secondary_display_api" name="DRM Secondary Display API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/drm_secondary_display_api/group"/>
+</component>
+<component id="drm_license_manager_api" name="DRM License Manager API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/drm_license_manager_api/group"/>
+</component>
+<component id="drm_utility_api" name="DRM Utility API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/drm_utility_api/group"/>
+</component>
+<component id="drm_agents_api" name="DRM Agents API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/drm_agents_api/group"/>
+</component>
+<component id="wmdrm_core_api" name="WM DRM Core API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/wmdrm_core_api/group"/>
+</component>
+<component id="wmdrm_access_api" name="WMDRM Access API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/wmdrm_access_api/group"/>
+</component>
+<component id="wmdrm_ota_access_api" name="WMDRM OTA Access API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/wmdrm_ota_access_api/group"/>
+</component>
+<component id="camese_utility_api" name="Camese Utility API" class="api" filter="s60">
+<meta rel="config">
+<defined condition="__WINDOWS_MEDIA_DRM"/>
+</meta>
+<unit bldFile="/mw/drm/drm_plat/camese_utility_api/group"/>
+</component>
+<component id="camese_framework_api" name="Camese Framework API" class="api" filter="s60">
+<meta rel="config">
+<defined condition="__WINDOWS_MEDIA_DRM"/>
+</meta>
+<unit bldFile="/mw/drm/drm_plat/camese_framework_api/group"/>
+</component>
+</collection>
+<collection id="drm_pub" name="DRM Public Interfaces" level="specific">
+<component id="drm_helper_api" name="DRM Helper API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_pub/drm_helper_api/group"/>
+</component>
+<component id="oma_drm_caf_agent_api" name="OMA DRM CAF Agent API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_pub/oma_drm_caf_agent_api/group"/>
+</component>
+<component id="drm_license_checker_api" name="DRM License Checker API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_pub/drm_license_checker_api/group"/>
+</component>
+</collection>
+<collection id="commondrm" name="Common DRM" level="generic">
+<!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
+<component id="drmencryptor" filter="s60" name="DRM Encryptor">
+<!-- this should have its own bld.inf or be removed as a component -->
+</component>
+<component id="drmsettingsplugin" filter="s60" name="DRM Settings Plugin" class="plugin">
+<!-- this should have its own bld.inf or be removed as a component -->
+</component>
+<component id="drmrightsmanagerui" filter="s60" name="DRM Rights Manager UI">
+<unit bldFile="/mw/drm/commondrm/drmrightsmanagerui/help/group"/>
+</component>
+<component id="drmutility" filter="s60" name="DRM Utility">
+<meta rel="config">
+<defined condition="RD_DRM_COMMON_INTERFACE_FOR_OMA_AND_WMDRM"/>
+</meta>
+<!-- Uncomment unit when configuration is in place. Currently #included from commondrm_build -->
+<!--<unit bldFile="commondrm/drmutility/group"/>-->
+</component>
+<component id="drmserviceapiwrapper" filter="s60" name="DRM Service API Wrapper">
+<unit bldFile="/mw/drm/commondrm/drmserviceapiwrapper/group"/>
+</component>
+<component id="drmrightsstoringlocation" filter="s60" name="DRM Rights Storing Location">
+<unit bldFile="/mw/drm/commondrm/drmrightsstoringlocation/group"/>
+</component>
+<component id="commondrm_build" filter="s60" name="Common DRM Build">
+<!-- should be split into the above files, or them collapsed into a single component -->
+<unit bldFile="/mw/drm/commondrm/group"/>
+</component>
+</collection>
+<collection id="omadrm" name="OMA DRM" level="server">
+<!-- collection is really a component. Move down a directory -->
+<component id="omadrm_build" filter="s60" name="OMA DRM Build">
+<unit bldFile="/mw/drm/omadrm/group"/>
+</component>
+
+<component id="foundationcerts" filter="sf_build" name="Foundation Certificates">
+<unit bldFile="/mw/drm/omadrm/foundationcerts/group"/>
+</component>
+</collection>
+<collection id="wmdrm" name="Windows Media DRM" level="framework">
+<!-- collection is really a component. Move down a directory -->
+<component id="wmdrm_build" filter="s60" name="WM DRM Build">
+<unit bldFile="/mw/drm/wmdrm/group"/>
+</component>
+</collection>
+<collection id="drm_info" name="DRM Info" level="specific">
+
+</collection>
+</package>
+<package id="locationsrv" level="specific" tech-domain="lo" name="Location Services" levels="plugin fw server if">
+<collection id="locsrv_pub" name="Location Services Public Interfaces" level="if">
+<component id="landmarks_search_api" name="Landmarks Search API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
+</component>
+<component id="landmarks_api" name="Landmarks API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_pub/landmarks_api/group"/>
+</component>
+<component id="landmarks_database_management_api" name="Landmarks Database Management API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_pub/landmarks_database_management_api/group"/>
+</component>
+<component id="location_triggering_api" name="Location Triggering API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_pub/location_triggering_api/group"/>
+</component>
+<component id="blid_application_satellite_info_api" name="BLID Application Satellite Info API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/group"/>
+</component>
+</collection>
+<collection id="locsrv_plat" name="Location Services Platform Interfaces" level="if">
+<component id="map_and_navigation_api" name="Map and Navigation API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/map_and_navigation_api/group"/>
+</component>
+<component id="map_and_navigation_provider_discovery_api" name="Map and Navigation Provider Discovery API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/group"/>
+</component>
+<component id="geocoding_api" name="Geocoding API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/geocoding_api/group"/>
+</component>
+<component id="map_image_api" name="Map Image API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/map_image_api/group"/>
+</component>
+<component id="map_and_navigation_aiw_api" name="Map and Navigation AIW API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/map_and_navigation_aiw_api/group"/>
+</component>
+<component id="map_and_navigation_provider_api" name="Map and Navigation Provider API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/map_and_navigation_provider_api/group"/>
+</component>
+<component id="landmarks_category_definition_api" name="Landmarks Category Definition API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
+</component>
+<component id="supl_settings_api" name="SUPL Settings API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
+</component>
+<component id="location_settings_launch_api" name="Location Settings Launch API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/location_settings_launch_api/group"/>
+</component>
+<component id="map_image_conversion_plugin_api" name="Map Image Conversion Plug-In API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/group"/>
+</component>
+<component id="psy_configuration_ui_plugin_api" name="PSY Configuration UI Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/psy_configuration_ui_plugin_api/group"/>
+</component>
+<component id="np_proxy_configuration_api" name="NP Proxy Configuration API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/np_proxy_configuration_api/group"/>
+</component>
+<component id="supl_terminal_initiation_api" name="SUPL Terminal Initiation API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/group"/>
+</component>
+<component id="location_notation_preferences_settings_api" name="Location Notation Preferences Settings API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/location_notation_preferences_settings_api/group"/>
+</component>
+<component id="supl_settings_notifier_secondary_display_api" name="SUPL Settings Notifier Secondary Display API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/supl_settings_notifier_secondary_display_api/group"/>
+</component>
+<component id="supl_network_initiation_api" name="SUPL Network Initiation API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/supl_network_initiation_api/group"/>
+</component>
+<component id="privacy_notifiers_secondary_display_api" name="Privacy Notifiers Secondary Display API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/privacy_notifiers_secondary_display_api/group"/>
+</component>
+<component id="oma_supl_configuration_parameter_api" name="OMA SUPL Configuration Parameter API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/oma_supl_configuration_parameter_api/group"/>
+</component>
+<component id="supl_query_secondary_display_api" name="SUPL Query Secondary Display API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/supl_query_secondary_display_api/group"/>
+</component>
+<component id="location_triggering_management_api" name="Location Triggering Management API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/location_triggering_management_api/group"/>
+</component>
+<component id="location_triggering_status_information_api" name="Location Triggering Status Information API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/location_triggering_status_information_api/group"/>
+</component>
+<component id="oma_supl_asn_codec_plugin_api" name="OMA SUPL ASN Codec Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
+</component>
+<component id="query_and_notification_api" name="Query and Notification API" class="api" filter="s60" introduced="^3">
+<!-- needs metadata file: <meta rel="Api" href="locsrv_plat/query_and_notification_api/query_and_notification_api.metaxml"/> -->
+<unit bldFile="/mw/locationsrv/locsrv_plat/query_and_notification_api/group"/>
+</component>
+<component id="location_local_variation_api" name="Location Local Variation API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/location_local_variation_api/group"/>
+</component>
+</collection>
+<collection id="genericpositioningplugins" name="Generic Positioning Plugins" level="plugin">
+<component id="locationnpppsy" filter="s60" name="Location Positioning Proxy PSY" class="plugin">
+<unit bldFile="/mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
+</component>
+<component id="locationsuplpsy" filter="s60" name="Location SUPL PSY" class="plugin" introduced="^3">
+<unit bldFile="/mw/locationsrv/genericpositioningplugins/locationsuplpsy/group"/>
+</component>
+<component id="genericpositioningplugins_build" filter="s60" name="Generic Positioning Plugins Build">
+<!-- need to break this up into the other components -->
+<unit bldFile="/mw/locationsrv/genericpositioningplugins/group"/>
+</component>
+</collection>
+<collection id="landmarks" name="Landmarks" level="server">
+<component id="locationlandmarks" filter="s60" name="Location Landmarks">
+<unit bldFile="/mw/locationsrv/landmarks/locationlandmarks/group"/>
+</component>
+</collection>
+<collection id="locationmapnavfw" name="Location Map and Navigation Framework" level="fw">
+<component id="mnlibrary" filter="s60" name="Map and Navigation Library">
+<unit bldFile="/mw/locationsrv/locationmapnavfw/library/group"/>
+</component>
+<component id="mnaiwprovider" filter="s60" name="Map and Navigation AIW Provider" class="plugin">
+<unit bldFile="/mw/locationsrv/locationmapnavfw/aiwprovider/group"/>
+</component>
+<component id="locationmapnavfw_build" filter="s60" name="Location Map and Navigation Framework Build">
+<!-- need to break this up into the other components -->
+<unit bldFile="/mw/locationsrv/locationmapnavfw/group"/>
+</component>
+</collection>
+<collection id="locationsystemui" name="Location System UI" level="if">
+<component id="locationsysui" filter="s60" name="Location System UI">
+<unit bldFile="/mw/locationsrv/locationsystemui/locationsysui/group"/>
+</component>
+</collection>
+<collection id="supl" name="SUPL" level="fw">
+<component id="locationsuplfw" filter="s60" name="Location SUPL Framework">
+<unit bldFile="/mw/locationsrv/supl/locationsuplfw/group"/>
+</component>
+<component id="locationomasuplprotocolhandler" filter="s60" name="OMA SUPL Protocol Handler">
+<unit bldFile="/mw/locationsrv/supl/locationomasuplprotocolhandler/group"/>
+</component>
+<component id="supltiapiimplementation" filter="s60" name="SUPL TI API Implementation" introduced="^3">
+<unit bldFile="/mw/locationsrv/supl/supltiapiimplementation/group"/>
+</component>
+</collection>
+<collection id="locationtriggering" name="Location Triggering" level="server">
+<component id="ltlogger" filter="s60" name="LT Logger">
+<unit bldFile="/mw/locationsrv/locationtriggering/ltlogger/group"/>
+</component>
+<component id="ltclientlib" filter="s60" name="LT Client Library">
+<unit bldFile="/mw/locationsrv/locationtriggering/ltclientlib/group"/>
+</component>
+<component id="ltmanagementlib" filter="s60" name="LT Management Library">
+<unit bldFile="/mw/locationsrv/locationtriggering/ltmanagementlib/group"/>
+</component>
+<component id="ltcontainer" filter="s60" name="LT Container">
+<unit bldFile="/mw/locationsrv/locationtriggering/ltcontainer/group"/>
+</component>
+<component id="ltserver" filter="s60" name="LT Server">
+<unit bldFile="/mw/locationsrv/locationtriggering/ltserver/group"/>
+</component>
+<component id="ltstrategypluginapi" filter="s60" name="LT Strategy Plugin API">
+<unit bldFile="/mw/locationsrv/locationtriggering/ltstrategypluginapi/group"/>
+</component>
+<component id="ltstrategyengine" filter="s60" name="LT Strategy Engine">
+<unit bldFile="/mw/locationsrv/locationtriggering/ltstrategyengine/group"/>
+</component>
+<component id="ltmovementdetectionpluginapi" filter="s60" name="Movement Detection Plugin API">
+<unit bldFile="/mw/locationsrv/locationtriggering/ltmovementdetectionpluginapi/group"/>
+</component>
+<component id="ltcellidmovementdetector" filter="s60" name="Cell ID Movement Detector">
+<unit bldFile="/mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/>
+</component>
+<component id="lbtmgmtui" filter="s60" name="LBT Management UI" class="plugin">
+<unit bldFile="/mw/locationsrv/locationtriggering/lbtmgmtui/group"/>
+</component>
+<component id="ltcontextsourceplugin" filter="s60" name="LT Context Source Plugin" class="plugin" introduced="^3">
+<unit bldFile="/mw/locationsrv/locationtriggering/ltcontextsourceplugin/group"/>
+</component>
+<component id="locationtriggering_build" filter="s60" name="Location Triggering Build">
+<!-- should remove #include from this and maybe put exports in the above components -->
+<unit bldFile="/mw/locationsrv/locationtriggering/group"/>
+</component>
+</collection>
+</package>
+<package id="accesssec" level="generic" tech-domain="dc" name="Access Security" levels="plugin framework server generic specific">
+<collection id="accesssec_plat" name="Access Security Platform Interfaces" level="specific">
+<component id="wapi_security_settings_ui_api" name="WAPI Security Settings UI API" class="api" filter="s60">
+<unit bldFile="/mw/accesssec/accesssec_plat/wapi_security_settings_ui_api/group"/>
+</component>
+<component id="wep_security_settings_ui_api" name="WEP Security Settings UI API" class="api" filter="s60">
+<unit bldFile="/mw/accesssec/accesssec_plat/wep_security_settings_ui_api/group"/>
+</component>
+<component id="wi-fi_protected_setup_ui_api" name="Wi-Fi Protected Setup UI API" class="api" filter="s60">
+<unit bldFile="/mw/accesssec/accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
+</component>
+<component id="wlan_eap_settings_ui_api" name="WLAN EAP Settings UI API" class="api" filter="s60">
+<unit bldFile="/mw/accesssec/accesssec_plat/wlan_eap_settings_ui_api/group"/>
+</component>
+<component id="wpa_security_settings_ui_api" name="WPA Security Settings UI API" class="api" filter="s60">
+<unit bldFile="/mw/accesssec/accesssec_plat/wpa_security_settings_ui_api/group"/>
+</component>
+<component id="eap_vpn_api" name="EAP VPN API" class="api" filter="s60">
+<unit bldFile="/mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
+</component>
+<component id="eapsim_db_api" name="EAP-SIM DB API" class="api" filter="s60">
+<unit bldFile="/mw/accesssec/accesssec_plat/eapsim_db_api/group"/>
+</component>
+<component id="eap_type_api" name="EAP Type API" class="api" filter="s60">
+<unit bldFile="/mw/accesssec/accesssec_plat/eap_type_api/group"/>
+</component>
+<component id="eaptlspeap_db_api" name="EAP-TLS-PEAP DB API" class="api" filter="s60">
+<unit bldFile="/mw/accesssec/accesssec_plat/eaptlspeap_db_api/group"/>
+</component>
+<component id="eapleap_db_api" name="LEAP DB API" class="api" filter="s60">
+<unit bldFile="/mw/accesssec/accesssec_plat/eapleap_db_api/group"/>
+</component>
+<component id="eapgtc_db_api" name="EAP-GTC DB API" class="api" filter="s60">
+<unit bldFile="/mw/accesssec/accesssec_plat/eapgtc_db_api/group"/>
+</component>
+<component id="eapmschapv2_db_api" name="EAP-MSCHAPV2 DB API" class="api" filter="s60">
+<unit bldFile="/mw/accesssec/accesssec_plat/eapmschapv2_db_api/group"/>
+</component>
+<component id="eapaka_db_api" name="EAP-AKA DB API" class="api" filter="s60">
+<unit bldFile="/mw/accesssec/accesssec_plat/eapaka_db_api/group"/>
+</component>
+<component id="wapi_db_api" name="WAPI DB API" class="api" filter="s60">
+<unit bldFile="/mw/accesssec/accesssec_plat/wapi_db_api/group"/>
+</component>
+</collection>
+<collection id="wlansecuritysettings" name="WLAN Security Settings" level="specific">
+<component id="wapisecuritysettingsui" filter="s60" name="WAPI Security Settings UI" introduced="9.1">
+<!-- the directory for this needs to be moved up to the right level -->
+<unit bldFile="/mw/accesssec/wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
+</component>
+<component id="wepsecuritysettingsui" filter="s60" name="WEP Security Settings UI" introduced="9.1">
+<unit bldFile="/mw/accesssec/wlansecuritysettings/wepsecuritysettingsui/group"/>
+</component>
+<component id="wifiprotectedsetup" filter="s60" name="WIFI Protected Setup" introduced="^1">
+<unit bldFile="/mw/accesssec/wlansecuritysettings/wifiprotectedsetup/group"/>
+</component>
+<component id="wlaneapsettingsui" filter="s60" name="WLAN EAP Settings UI" introduced="9.3">
+<unit bldFile="/mw/accesssec/wlansecuritysettings/wlaneapsettingsui/group"/>
+</component>
+<component id="wpasecuritysettingsui" filter="s60" name="WPA Security Settings UI" introduced="9.1">
+<unit bldFile="/mw/accesssec/wlansecuritysettings/wpasecuritysettingsui/group"/>
+</component>
+</collection>
+<collection id="eapol" name="EAPOL" level="framework">
+<component id="eapol_framework" filter="s60" name="EAPOL Framework" introduced="9.2">
+<unit bldFile="/mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
+</component>
+</collection>
+</package>
+<package id="ipconnmgmt" level="generic" tech-domain="dc" name="IP Connectivity Management" levels="plugin framework server generic utils">
+<collection id="ipcm_plat" name="IP Connectivity Management Platform Interfaces" level="utils">
+<component id="access_point_engine_misc_api" name="Access Point Engine Misc API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/access_point_engine_misc_api/group"/>
+</component>
+<component id="bearer_settings_plugin_api" name="Bearer Settings Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/bearer_settings_plugin_api/group"/>
+</component>
+<component id="commsdat_wlan_api" name="CommsDat WLAN API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/commsdat_wlan_api/group"/>
+</component>
+<component id="connection_monitor_extension_api" name="Connection Monitor Extension API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/connection_monitor_extension_api/group"/>
+</component>
+<component id="connection_ui_utilities_api" name="Connection UI Utilities API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/connection_ui_utilities_api/group"/>
+</component>
+<component id="disconnect_dialog_api" name="Disconnect Dialog API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/disconnect_dialog_api/group"/>
+</component>
+<component id="disconnect_dialog_disable_api" name="Disconnect Dialog Disable API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/disconnect_dialog_disable_api/group"/>
+</component>
+<component id="extended_connection_settings_api" name="Extended Connection Settings API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/extended_connection_settings_api/group"/>
+</component>
+<component id="mpm_default_connection_api" name="MPM Default Connection API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/mpm_default_connection_api/group"/>
+</component>
+<component id="pdpcontextmanager2_reset_factory_settings_api" name="PDP Context Manager 2 Reset Factory Settings API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_reset_factory_settings_api/group"/>
+</component>
+<component id="pdpcontextmanager2_settings_api" name="PDP Context Manager 2 Settings API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_settings_api/group"/>
+</component>
+<component id="mpm_connect_screen_api" name="MPM Connect Screen API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/mpm_connect_screen_api/group"/>
+</component>
+</collection>
+<collection id="ipcm_pub" name="IP Connectivity Management Public Interfaces" level="utils">
+<component id="connection_settings_api" name="Connection Settings API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_pub/connection_settings_api/group"/>
+</component>
+<component id="access_point_engine_api" name="Access Point Engine API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_pub/access_point_engine_api/group"/>
+</component>
+<component id="access_point_settings_handler_api" name="Access Point Settings Handler API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_pub/access_point_settings_handler_api/group"/>
+</component>
+<component id="data_connection_log_counters_api" name="Data Connection Log Counters API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_pub/data_connection_log_counters_api/group"/>
+</component>
+<component id="connection_monitor_server_api" name="Connection Monitor Server API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_pub/connection_monitor_server_api/group"/>
+</component>
+<component id="connection_settings_ui_api" name="Connection Settings UI API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_pub/connection_settings_ui_api/group"/>
+</component>
+<component id="agent_dialog_api" name="Agent Dialog API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_pub/agent_dialog_api/group"/>
+</component>
+<component id="extendedconnpref_api" name="Extended Connection Preferences API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_pub/extendedconnpref_api/group"/>
+</component>
+</collection>
+<collection id="accesspointcontrol" name="Access Point Control" level="plugin">
+<component id="apcontrollistplugin" filter="s60" name="Access Point Control List Plugin" class="plugin" introduced="^2">
+<unit bldFile="/mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
+</component>
+</collection>
+<collection id="alwayson_net_plugin" name="Always Online Net Plugin" level="server">
+<component id="pdpcontextmanager2" filter="s60" name="PDP Context Manager 2">
+<unit bldFile="/mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
+</component>
+</collection>
+<collection id="apengine" name="Access Point Engine" level="framework">
+<component id="apeng" filter="s60" name="Access Point Engine">
+<unit bldFile="/mw/ipconnmgmt/apengine/apeng/group"/>
+</component>
+<component id="apsettingshandlerui" filter="s60" name="Access Point Settings Handler UI">
+<unit bldFile="/mw/ipconnmgmt/apengine/apsettingshandlerui/group"/>
+</component>
+<component id="apsettingsplugin" filter="s60" name="Access Point Settings Plugin" class="plugin">
+<unit bldFile="/mw/ipconnmgmt/apengine/apsettingsplugin/group"/>
+</component>
+</collection>
+<collection id="bearermanagement" name="Bearer Management" level="framework">
+<component id="mpm" filter="s60" name="Mobility Policy Manager">
+<unit bldFile="/mw/ipconnmgmt/bearermanagement/mpm/group"/>
+</component>
+<component id="extendedconnpref" filter="s60" name="Extended Connection Preferences">
+<unit bldFile="/mw/ipconnmgmt/bearermanagement/extendedconnpref/group"/>
+</component>
+<component id="s60mcpr" filter="s60" name="S60 Meta-Connection Provider" class="plugin">
+<unit bldFile="/mw/ipconnmgmt/bearermanagement/S60MCPR/group"/>
+</component>
+</collection>
+<collection id="cmmanager" name="Connection Method Manager" level="framework">
+<component id="cmmgr" filter="s60" name="CM Manager">
+<unit bldFile="/mw/ipconnmgmt/cmmanager/cmmgr/group"/>
+</component>
+<component id="gsconnsettingsplugin" filter="s60" name="GS Connection Settings Plugin" introduced="^3" class="plugin">
+<unit bldFile="/mw/ipconnmgmt/cmmanager/gsconnsettingsplugin/group"/>
+</component>
+</collection>
+<collection id="connectionmonitoring" name="Connection Monitoring" level="server">
+<component id="connectionmonitorplugin" filter="s60" name="Connection Monitor Plugin" class="plugin">
+<unit bldFile="/mw/ipconnmgmt/connectionmonitoring/connectionmonitorplugin/group"/>
+</component>
+<component id="connectionmonitorui" filter="s60" name="Connection Monitor UI">
+<unit bldFile="/mw/ipconnmgmt/connectionmonitoring/connectionmonitorui/group"/>
+</component>
+<component id="connmon" filter="s60" name="Connection Monitor">
+<!-- either split into two components, or #include from a common bld.inf -->
+<unit bldFile="/mw/ipconnmgmt/connectionmonitoring/connmon/connectionmonitor/group"/>
+<unit bldFile="/mw/ipconnmgmt/connectionmonitoring/connmon/dataconnectionlogger/group"/>
+</component>
+<component id="connmonext" filter="s60" name="Connection Monitor Extension API">
+<unit bldFile="/mw/ipconnmgmt/connectionmonitoring/connmonext/group"/>
+</component>
+</collection>
+<collection id="connectionutilities" name="Connection Utilities" level="utils">
+<component id="connectiondialogs" filter="s60" name="Connection Dialogs">
+<unit bldFile="/mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/>
+</component>
+</collection>
+<collection id="dbcreator" name="DB Creator" level="utils">
+<component id="commsdatcreator" filter="s60" name="Comms Database Creator" introduced="9.3">
+<unit bldFile="/mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
+</component>
+<component id="commsdatcreatorrfsplugin" filter="s60" name="Comms Database Creator RFS Plugin" class="plugin" introduced="9.3">
+<meta rel="config">
+<not-defined condition="WINSCW"/>
+</meta>
+<!-- uncomment when config is turned on -->
+<!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
+</component>
+<component id="commsdatstartup" filter="s60" name="Comms Database Startup" introduced="9.3">
+<unit bldFile="/mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
+</component>
+<component id="dbcreatorexe" filter="s60" name="DB Creator" introduced="9.3">
+<unit bldFile="/mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
+</component>
+<component id="dbcreator_build" filter="s60" name="DB Creator Build" introduced="9.3">
+<!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
+<unit bldFile="/mw/ipconnmgmt/dbcreator/group"/>
+</component>
+</collection>
+<collection id="ipconnmgmt_info" name="IP Connectivity Management Info" level="utils">
+<component id="ipcm_build" filter="s60" 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"/>
+</component>
+</collection>
+</package>
+<package id="netprotocols" level="generic" tech-domain="dc" name="High-level Internet Protocols" levels="plugin framework server generic specific">
+<collection id="netprotocols_plat" name="High-level Internet Protocols Platform Interfaces" level="specific">
+<component id="cookie_manager_api" name="Cookie Manager API" class="api" filter="s60">
+<unit bldFile="/mw/netprotocols/netprotocols_plat/cookie_manager_api/group"/>
+</component>
+<component id="http_cache_mgr_api" name="HTTP Cache Manager API" class="api" filter="s60">
+<unit bldFile="/mw/netprotocols/netprotocols_plat/http_cache_mgr_api/group"/>
+</component>
+<component id="http_filters_api" name="HTTP Filters API" class="api" filter="s60">
+<unit bldFile="/mw/netprotocols/netprotocols_plat/http_filters_api/group"/>
+</component>
+</collection>
+<collection id="httpfilters" name="HTTP Filters" level="plugin">
+<component id="httpfiltercommon" filter="s60" name="HTTP Filter Common">
+<unit bldFile="/mw/netprotocols/httpfilters/httpfiltercommon/group"/>
+</component>
+<component id="cookie" filter="s60" name="Cookie Filter" class="plugin">
+<unit bldFile="/mw/netprotocols/httpfilters/cookie/group"/>
+</component>
+<component id="deflatefilter" filter="s60" name="Deflate Filter" class="plugin">
+<unit bldFile="/mw/netprotocols/httpfilters/deflatefilter/group"/>
+</component>
+<component id="httpfilteracceptheader" filter="s60" name="Accept Header Filter" class="plugin">
+<unit bldFile="/mw/netprotocols/httpfilters/httpfilteracceptheader/group"/>
+</component>
+<component id="httpfilterauthentication" filter="s60" name="Authentication Filter" class="plugin">
+<unit bldFile="/mw/netprotocols/httpfilters/httpfilterauthentication/group"/>
+</component>
+<component id="httpfilterconnhandler" filter="s60" name="Connection Handler Fitler" class="plugin">
+<unit bldFile="/mw/netprotocols/httpfilters/httpfilterconnhandler/group"/>
+</component>
+<component id="httpfilteriop" filter="s60" name="HTTP IOP Filter" class="plugin">
+<unit bldFile="/mw/netprotocols/httpfilters/httpfilteriop/group"/>
+</component>
+<component id="httpfilterproxy" filter="s60" name="HTTP Proxy Filter" class="plugin">
+<unit bldFile="/mw/netprotocols/httpfilters/httpfilterproxy/group"/>
+</component>
+<component id="uaproffilter" filter="s60" name="UAProf Filter" class="plugin">
+<unit bldFile="/mw/netprotocols/httpfilters/uaproffilter/group"/>
+</component>
+</collection>
+<collection id="applayerprotocols" name="Application Layer Protocols" level="server">
+<component id="httptransportfw" name="HTTP Transport Framework" introduced="6.2" purpose="optional">
+<unit bldFile="/mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="/mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
+</component>
+<component id="httpexamples" name="HTTP Examples" introduced="6.2" purpose="development">
+<unit bldFile="/mw/netprotocols/applayerprotocols/httpexamples/group" mrp="/mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
+</component>
+<component id="wappushsupport" name="WAP Push Support" introduced="6.2" purpose="optional">
+<unit bldFile="/mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="/mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
+</component>
+<component id="wapbase" name="WAP Base" introduced="6.0" purpose="optional">
+<unit bldFile="/mw/netprotocols/applayerprotocols/wapbase/Group" mrp="/mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
+</component>
+<component id="ftpengine" name="FTP Engine" introduced="6.0" purpose="optional">
+<unit bldFile="/mw/netprotocols/applayerprotocols/ftpengine/group" mrp="/mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
+</component>
+<component id="telnetengine" name="Telnet Engine" introduced="6.0" purpose="optional">
+<unit bldFile="/mw/netprotocols/applayerprotocols/telnetengine/group" mrp="/mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
+</component>
+<component id="httpserviceapi" name="HTTP Service API" introduced="TB9.2" purpose="optional">
+<unit bldFile="/mw/netprotocols/applayerprotocols/httpservice/group" mrp="/mw/netprotocols/applayerprotocols/httpservice/group/http_service.mrp"/>
+</component>
+</collection>
+<collection id="applayerpluginsandutils" name="Application Layer Plugins and Utils" level="framework">
+<component id="uripermissionservices" name="URI Permission Services" introduced="^2" purpose="optional">
+<unit bldFile="/mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="/mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
+</component>
+<component id="bookmarksupport" name="Bookmark Support" introduced="9.1" purpose="optional">
+<unit bldFile="/mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="/mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
+</component>
+<component id="httpprotocolplugins" name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" class="plugin">
+<unit bldFile="/mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="/mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
+</component>
+<component id="httptransportplugins" name="HTTP Transport Plugins" introduced="6.2" purpose="optional" class="plugin">
+<unit bldFile="/mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="/mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
+</component>
+</collection>
+<collection id="netprotocols_info" name="High-level Internet Protocols Info" level="specific">
+<component id="netprotocols_metadata" name="High-level Internet Protocols Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="ipappprotocols" level="generic" tech-domain="dc" name="IP App Protocols" levels="plugin conn server if">
+<collection id="ipappprotocols_plat" name="IP App Protocols Platform Interfaces" level="if">
+<component id="srtp_api" name="SRTP API" class="api" filter="s60">
+<unit bldFile="/mw/ipappprotocols/ipappprotocols_plat/srtp_api/group"/>
+</component>
+<component id="rtprtcp_api" name="RTP/RTCP API" class="api" filter="s60">
+<unit bldFile="/mw/ipappprotocols/ipappprotocols_plat/rtprtcp_api/group"/>
+</component>
+</collection>
+<collection id="rtp" name="RTP" level="server">
+<component id="srtpstack" filter="s60" name="SRTP Stack">
+<unit bldFile="/mw/ipappprotocols/rtp/srtpstack/group"/>
+</component>
+<component id="rtpstack" filter="s60" name="RTP Stack">
+<unit bldFile="/mw/ipappprotocols/rtp/rtpstack/group"/>
+</component>
+</collection>
+<collection id="realtimenetprots" name="Real Time Net Protocols" level="server">
+<component id="symrtp" name="RTP" introduced="9.0" purpose="optional">
+<!-- Real Time Data Protocol -->
+<unit bldFile="/mw/ipappprotocols/realtimenetprots/rtp/group" mrp="/mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
+</component>
+<component id="sipfw" name="SIP Framework" introduced="9.2" purpose="optional">
+<unit version="2" bldFile="/mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="/mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp"/>
+</component>
+</collection>
+<collection id="sipplugins" name="SIP Plugins" level="plugin">
+<component id="sippwlanplugin" filter="s60" name="SIP WLAN Plugin" class="plugin">
+<unit bldFile="/mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
+</component>
+<component id="sippsipsettingsui" filter="s60" name="SIP Settings UI" class="plugin">
+<unit bldFile="/mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
+</component>
+<component id="sippdevmgmtsipadapter" filter="s60" name="Device Management SIP Settings Adapter" class="plugin">
+<unit bldFile="/mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
+</component>
+<component id="sippsystemstatemonitor" filter="s60" name="SIP System State Monitor" class="plugin">
+<unit bldFile="/mw/ipappprotocols/sipplugins/sippsystemstatemonitor/group"/>
+</component>
+<component id="sippsipadapter" filter="s60" name="SIP Adapter" class="plugin" introduced="^3">
+<unit bldFile="/mw/ipappprotocols/sipplugins/sippsipadapter/group"/>
+</component>
+</collection>
+<collection id="sipproviderplugins" name="SIP Provider Plugins" level="conn">
+<component id="sipprovider" name="SIP Provider" introduced="^2" purpose="optional" class="plugin">
+<unit bldFile="/mw/ipappprotocols/sipproviderplugins/sipprovider/group" mrp="/mw/ipappprotocols/sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
+</component>
+</collection>
+<collection id="ipappprotocols_info" name="IP App Protocols Info" level="if">
+<component id="ipappprotocols_metadata" name="IP App Protocols Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="wirelessacc" level="specific" tech-domain="dc" name="Wireless Access" levels="framework generic ui">
+<collection id="hsfw_plat" name="HotSpot Framework Platform Interfaces" level="ui">
+<component id="hotspot_framework_client_api" name="HotSpot Framework Client API" class="api" filter="s60">
+<unit bldFile="/mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
+</component>
+<component id="internet_connectivity_test_service_api" name="Internet Connectivity Test Service API" class="api" filter="s60">
+<unit bldFile="/mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
+</component>
+<component id="internet_connectivity_test_service_settings_api" name="Internet Connectivity Test Service Settings API" class="api" filter="s60">
+<unit bldFile="/mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
+</component>
+<component id="hotspot_framework_client_plugin_api" name="HotSpot Framework Client Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
+</component>
+</collection>
+<collection id="hotspotfw" name="HotSpot Framework" level="framework">
+<component id="hsserver" filter="s60" name="HotSpot Server">
+<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
+</component>
+<component id="hsclient" filter="s60" name="HotSpot Client">
+<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
+</component>
+<component id="internetconnectivitytestservice" filter="s60" name="Internet Connectivity Test Service">
+<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+<!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
+</component>
+<component id="ictsdialogs" filter="s60" name="Internet Connectivity Test Service Dialogs" deprecated="^3">
+<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+<!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
+</component>
+<component id="hspluginforagent" filter="s60" name="HotSpot Plugin for Agent" class="plugin">
+<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+<!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
+</component>
+<component id="hsbrowser" filter="s60" name="HotSpot Browser">
+<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+<!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
+</component>
+<component id="hotspotfw_build" filter="s60" name="Hotspot Framework Build">
+<!-- should break up this bld.inf into the above components, or collapse them all into a single component -->
+<unit bldFile="/mw/wirelessacc/hotspotfw/group"/>
+</component>
+</collection>
+<collection id="wlanutilities" name="WLAN Utilities" level="generic">
+<component id="wlanplugin" filter="s60" name="WLAN Plugin" class="plugin">
+<unit bldFile="/mw/wirelessacc/wlanutilities/wlanplugin/group"/>
+</component>
+<component id="wlansettingsui" filter="s60" name="WLAN Settings UI">
+<unit bldFile="/mw/wirelessacc/wlanutilities/wlansettingsui/group"/>
+</component>
+<component id="wlansniffer" filter="s60" name="WLAN Sniffer">
+<unit bldFile="/mw/wirelessacc/wlanutilities/wlansniffer/group"/>
+</component>
+<component id="wlanindicatorplugin" filter="s60" name="WLAN Indicator Plugin" class="plugin">
+<unit bldFile="/mw/wirelessacc/wlanutilities/wlanindicatorplugin/group"/>
+</component>
+</collection>
+</package>
+<package id="vpnclient" level="specific" tech-domain="dc" name="VPN Client" levels="engine ui api">
+<!-- is the !oem_build filter needed? -->
+<collection id="vpnc_plat" name="VPN Client Platform Interfaces" level="api">
+<component id="vpnapi" filter="s60" class="api" name="VPN API">
+<unit bldFile="/mw/vpnclient/vpnc_plat/vpnapi/group" filter="!oem_build"/>
+</component>
+</collection>
+<collection id="vpnapiimpl" name="VPN API Implementation" level="api">
+<component id="vpnapi" filter="s60" name="VPN API">
+<unit bldFile="/mw/vpnclient/vpnapiimpl/group" filter="!oem_build"/>
+</component>
+</collection>
+<collection id="vpnengine" name="VPN Engine" level="engine">
+<!-- too many components in this collection.
+ Probably best to group the binaries together into larger components
+ or maybe split the collection into more reasonable groups -->
+<component id="eventmediatorapi" filter="s60" name="Event Mediator API">
+<unit bldFile="/mw/vpnclient/vpnengine/eventmediatorapi/group" filter="!oem_build"/>
+</component>
+<component id="eventviewer" filter="s60" name="Event Viewer">
+<unit bldFile="/mw/vpnclient/vpnengine/eventviewer/group" filter="!oem_build"/>
+</component>
+<component id="vpnins" filter="s60" name="VPN Installer">
+<unit bldFile="/mw/vpnclient/vpnengine/vpnins/group" filter="!oem_build"/>
+</component>
+<component id="ikepolparser" filter="s60" name="IKE Policy Parser">
+<unit bldFile="/mw/vpnclient/vpnengine/ikepolparser/group" filter="!oem_build"/>
+</component>
+<component id="utlbase64" filter="s60" name="Base64 Utilities">
+<unit bldFile="/mw/vpnclient/vpnengine/utlbase64/group" filter="!oem_build"/>
+</component>
+<component id="utlcrypto" filter="s60" name="Crypto Utilities">
+<unit bldFile="/mw/vpnclient/vpnengine/utlcrypto/group" filter="!oem_build"/>
+</component>
+<component id="utlxml" filter="s60" name="XML Utilities">
+<unit bldFile="/mw/vpnclient/vpnengine/utlxml/group" filter="!oem_build"/>
+</component>
+<component id="utlpkcs10" filter="s60" name="PKCS#10 Utilities">
+<unit bldFile="/mw/vpnclient/vpnengine/utlpkcs10/group" filter="!oem_build"/>
+</component>
+<component id="pkiserviceapi" filter="s60" name="PKI Service API">
+<unit bldFile="/mw/vpnclient/vpnengine/pkiserviceapi/group" filter="!oem_build"/>
+</component>
+<component id="ikecert" filter="s60" name="IKE Certificate Management">
+<unit bldFile="/mw/vpnclient/vpnengine/ikecert/group" filter="!oem_build"/>
+</component>
+<component id="kmdapi" filter="s60" name="Key Management Daemon API">
+<unit bldFile="/mw/vpnclient/vpnengine/kmdapi/group" filter="!oem_build"/>
+</component>
+<component id="kmdserver" filter="s60" name="Key Management Daemon Server">
+<unit bldFile="/mw/vpnclient/vpnengine/kmdserver/group" filter="!oem_build"/>
+</component>
+<component id="ikeutils" filter="s60" name="Internet Key Exchange Utils">
+<unit bldFile="/mw/vpnclient/vpnengine/ikeutils/group" filter="!oem_build"/>
+</component>
+<component id="ikev1lib" filter="s60" name="IKEv1 Library">
+<unit bldFile="/mw/vpnclient/vpnengine/ikev1lib/group" filter="!oem_build"/>
+</component>
+<component id="ikev2lib" filter="s60" name="IKEv2 Library">
+<unit bldFile="/mw/vpnclient/vpnengine/ikev2lib/group" filter="!oem_build"/>
+</component>
+<component id="vpnipsecpolparser" filter="s60" name="VPN IPsec Policy Parser">
+<unit bldFile="/mw/vpnclient/vpnengine/vpnipsecpolparser/group" filter="!oem_build"/>
+</component>
+<component id="sit" filter="s60" name="Socket Interaction Thread">
+<unit bldFile="/mw/vpnclient/vpnengine/sit/group" filter="!oem_build"/>
+</component>
+<component id="vpntcwrapper" filter="s60" name="VPN Terminal Control Wrapper">
+<unit bldFile="/mw/vpnclient/vpnengine/vpntcwrapper/group" filter="!oem_build"/>
+</component>
+<component id="eventmediator" filter="s60" name="Event Mediator">
+<unit bldFile="/mw/vpnclient/vpnengine/eventmediator/group" filter="!oem_build"/>
+</component>
+<component id="pkiservice" filter="s60" name="PKI Service">
+<unit bldFile="/mw/vpnclient/vpnengine/pkiservice/group" filter="!oem_build"/>
+</component>
+<component id="vpnconnagt" filter="s60" name="VPN Connection Agent">
+<unit bldFile="/mw/vpnclient/vpnengine/vpnconnagt/group" filter="!oem_build"/>
+</component>
+<component id="vpnmanager" filter="s60" name="VPN Manager">
+<unit bldFile="/mw/vpnclient/vpnengine/vpnmanager/group" filter="!oem_build"/>
+</component>
+<component id="vpncleaner" filter="s60" name="VPN Cleaner">
+<unit bldFile="/mw/vpnclient/vpnengine/vpncleaner/group" filter="!oem_build"/>
+</component>
+<component id="utlpkcs12" filter="s60" name="PKCS#12 Utilities">
+<unit bldFile="/mw/vpnclient/vpnengine/utlpkcs12/group" filter="!oem_build"/>
+</component>
+<component id="dmadengine" filter="s60" name="DM Adapter Engine">
+<unit bldFile="/mw/vpnclient/vpnengine/dmadengine/group" filter="!oem_build"/>
+</component>
+<component id="dmadipsecvpn" filter="s60" name="IPsec VPN DM Adapter" class="plugin">
+<unit bldFile="/mw/vpnclient/vpnengine/dmadipsecvpn/group" filter="!oem_build"/>
+</component>
+<component id="dmadpki" filter="s60" name="PKI DM Adapter" class="plugin">
+<unit bldFile="/mw/vpnclient/vpnengine/dmadpki/group" filter="!oem_build"/>
+</component>
+<component id="ikesocket" filter="s60" name="IKE Socket" introduced="^3">
+<unit bldFile="/mw/vpnclient/vpnengine/ikesocket/group" filter="!oem_build"/>
+</component>
+</collection>
+<collection id="vpnui" name="VPN UI" level="ui">
+<component id="vpnecomnotifier" filter="s60" name="VPN ECOM Notifier" class="plugin">
+<unit bldFile="/mw/vpnclient/vpnui/vpnecomnotifier/group" filter="!oem_build"/>
+</component>
+<component id="vpndialogmanager" filter="s60" name="VPN Dialog Manager">
+<unit bldFile="/mw/vpnclient/vpnui/vpndialogmanager/group" filter="!oem_build"/>
+</component>
+<component id="vpnmanagementui" filter="s60" name="VPN Management UI" class="plugin">
+<unit bldFile="/mw/vpnclient/vpnui/vpnmanagementui/group" filter="!oem_build"/>
+</component>
+<component id="vpnpolins" filter="s60" name="VPN Policy Installer">
+<unit bldFile="/mw/vpnclient/vpnui/vpnpolins/group" filter="!oem_build"/>
+</component>
+<component id="vpnpolicyrecognizer" filter="s60" name="VPN Policy Recognizer" class="plugin">
+<unit bldFile="/mw/vpnclient/vpnui/vpnpolicyrecognizer/group" filter="!oem_build"/>
+</component>
+</collection>
+<collection id="vpnclient_info" name="VPN Client Info" level="api">
+<component id="vpnclient_help" filter="s60" name="VPN Client Help">
+<unit bldFile="/mw/vpnclient/help/group" filter="!oem_build"/>
+</component>
+<component id="vpnclient_build" filter="s60" name="VPN Client Build">
+<!-- should split this up into the other components and remove this-->
+<unit bldFile="/mw/vpnclient/group" filter="!oem_build"/>
+</component>
+</collection>
+</package>
+<package id="ipappsrv" level="specific" tech-domain="vc" name="IP App Services" levels="framework generic server conn plugin">
+<collection id="ipappsrv_plat" name="IP App Services Platform Interfaces" level="plugin">
+<component id="transcoder_api" name="Transcoder API" class="api" filter="s60">
+<unit bldFile="/mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
+</component>
+<component id="comms_event_api" name="Comms Event API" class="api" filter="s60">
+<unit bldFile="/mw/ipappsrv/ipappsrv_plat/comms_event_api/group"/>
+</component>
+<component id="floor_control_api" name="Floor Control API" class="api" filter="s60">
+<unit bldFile="/mw/ipappsrv/ipappsrv_plat/floor_control_api/group"/>
+</component>
+<component id="media_control_api" name="Media Control API" class="api" filter="s60">
+<unit bldFile="/mw/ipappsrv/ipappsrv_plat/media_control_api/group"/>
+</component>
+<component id="multimedia_comms_api" name="Multimedia Comms API" class="api" filter="s60">
+<unit bldFile="/mw/ipappsrv/ipappsrv_plat/multimedia_comms_api/group"/>
+</component>
+<component id="nat_settings_api" name="NAT Settings API" class="api" filter="s60">
+<unit bldFile="/mw/ipappsrv/ipappsrv_plat/nat_settings_api/group"/>
+</component>
+</collection>
+<collection id="natfw" name="NAT Framework" level="framework">
+<!-- collection is really a component. Need to move down a directory -->
+<component id="natfw_build" filter="s60" name="NAT Framework Build" introduced="^2">
+<unit bldFile="/mw/ipappsrv/natfw/group"/>
+</component>
+</collection>
+<collection id="multimediacommscontroller" name="Multimedia Comms Controller" level="conn">
+<!-- collection is really a component. Need to move down a directory -->
+<component id="multimediacommscontroller_build" filter="s60" name="Multimedia Comms Controller Build">
+<unit bldFile="/mw/ipappsrv/multimediacommscontroller/group"/>
+</component>
+</collection>
+<collection id="multimediacommsengine" name="Multimedia Comms Engine" level="generic">
+<!-- collection is really a component. Need to move down a directory -->
+<component id="multimediacommsengine_build" filter="s60" name="Multimedia Comms Engine Build">
+<unit bldFile="/mw/ipappsrv/multimediacommsengine/group"/>
+</component>
+</collection>
+<collection id="natplugins" name="NAT Plugins" level="plugin">
+<component id="natpcliprovisioningnatfwadapter" filter="s60" name="Client Provisioning NAT Framework Traversal Adapter" class="plugin" introduced="^2">
+<unit bldFile="/mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/group"/>
+</component>
+<component id="natpdevmgmtnatfwadapter" filter="s60" name="Device Management NAT Framework Traversal Adapter" class="plugin">
+<unit bldFile="/mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/group"/>
+</component>
+<component id="natptraversalcontroller" filter="s60" name="NAT Traversal Controller" class="plugin">
+<unit bldFile="/mw/ipappsrv/natplugins/natptraversalcontroller/group"/>
+</component>
+<component id="natpnatfwsdpprovider" filter="s60" name="NAT Framework SDP Provider" class="plugin">
+<unit bldFile="/mw/ipappsrv/natplugins/natpnatfwsdpprovider/group"/>
+</component>
+</collection>
+<collection id="ipappsrv_info" name="IP App Services Info" level="plugin">
+<component id="ipappsrv_build" name="IP App Services Build" filter="s60">
+<!-- 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 id="ipappsrv_metadata" name="IP App Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/mw/ipappsrv/ipappsrv_info/ipappsrv_metadata/ipappsrv_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="phonesrv" level="specific" tech-domain="vc" name="Telephony and SIM Services" levels="plugin framework server generic specific">
+<collection id="phonesrv_plat" name="Telephony and SIM Services Platform Interfaces" level="specific">
+<component id="string_parser_api" name="String Parser API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/string_parser_api/group"/>
+</component>
+<component id="cbs_mcn_client_api" name="CBS MCN Client API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/cbs_mcn_client_api/group"/>
+</component>
+<component id="converged_call_engine_api" name="Converged Call Engine API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/converged_call_engine_api/group"/>
+</component>
+<component id="aiw_dial_data_consumer_api" name="AIW Dial Data Consumer API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/aiw_dial_data_consumer_api/group"/>
+</component>
+<component id="phone_client_ussd_api" name="Phone Client USSD API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_ussd_api/group"/>
+</component>
+<component id="sat_refresh_api" name="SAT Refresh API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/sat_refresh_api/group" filter="!test"/>
+
+</component>
+<component id="network_handling_engine_api" name="Network Handling Engine API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/network_handling_engine_api/group"/>
+</component>
+<component id="phone_client_emergency_call_api" name="Phone Client Emergency Call API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/group"/>
+</component>
+<component id="sat_configuration_api" name="SAT Configuration API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/sat_configuration_api/group"/>
+</component>
+<component id="dial_utils_api" name="Dial Utils API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/dial_utils_api/group"/>
+</component>
+<component id="phone_client_image_handler_api" name="Phone Client Image Handler API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_image_handler_api/group"/>
+</component>
+<component id="phone_client_messenger_api" name="Phone Client Messenger API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_messenger_api/group"/>
+</component>
+<component id="sat_client_api" name="SAT Client API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/sat_client_api/group" filter="!test"/>
+
+</component>
+<component id="phone_client_api" name="Phone Client API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_api/group"/>
+</component>
+<component id="sat_service_api" name="SAT Service API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/sat_service_api/group" filter="!test"/>
+
+</component>
+<component id="cbs_message_api" name="CBS Message API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/cbs_message_api/group"/>
+</component>
+<component id="phone_client_server_information_api" name="Phone Client Server Information API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_server_information_api/group"/>
+</component>
+<component id="phone_client_ussd_internal_api" name="Phone Client USSD Internal API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_ussd_internal_api/group"/>
+</component>
+<component id="phone_client_command_handler_api" name="Phone Client Command Handler API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_command_handler_api/group"/>
+</component>
+<component id="phone_client_notify_api" name="Phone Client Notify API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_notify_api/group"/>
+</component>
+<component id="phone_client_utility_api" name="Phone Client Utility API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_utility_api/group"/>
+</component>
+<component id="telephony_network_information_api" name="Telephony Network Information API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/telephony_network_information_api/group"/>
+</component>
+<component id="secondary_display_sat_api" name="Secondary Display SAT API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/secondary_display_sat_api/group"/>
+</component>
+<component id="callui_reconnect_query_api" name="CallUI Reconnect Query API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/callui_reconnect_query_api/group"/>
+</component>
+<component id="service_provider_settings_api" name="Service Provider Settings API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/service_provider_settings_api/group"/>
+</component>
+<component id="converged_call_provider_api" name="Converged Call Provider API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/converged_call_provider_api/group"/>
+</component>
+<component id="incoming_call_monitor_api" name="Incoming Call Monitor API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/incoming_call_monitor_api/group"/>
+</component>
+<component id="default_emergency_numbers_api" name="Default Emergency Numbers API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/default_emergency_numbers_api/group"/>
+</component>
+<component id="cenrep_database_api" name="Central Repository Database API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/cenrep_database_api/group"/>
+</component>
+<component id="ss_settings_api" name="SS Settings API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/ss_settings_api/group"/>
+</component>
+<component id="phone_settings_observer_api" name="Phone Settings Observer API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_settings_observer_api/group"/>
+</component>
+<component id="phone_settings_notes_ui_api" name="Phone Settings Notes UI API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_settings_notes_ui_api/group"/>
+</component>
+<component id="phone_settings_api" name="Phone Settings API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_settings_api/group"/>
+</component>
+<component id="voice_mailbox_number_api" name="Voice Mailbox Number API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/voice_mailbox_number_api/group"/>
+</component>
+<component id="voice_mailbox_settings_api" name="Voice Mailbox Settings API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/voice_mailbox_settings_api/group"/>
+</component>
+<component id="call_information_api" name="Call Information API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/call_information_api/group" filter="!test"/>
+
+</component>
+<component id="call_remote_party_information_api" name="Call Remote Party Information API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/call_remote_party_information_api/group" filter="!test"/>
+
+</component>
+<component id="telephony_mediator_api" name="Telephony Mediator API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/telephony_mediator_api/group" filter="!test"/>
+
+</component>
+</collection>
+<collection id="telutils" name="Telephony Utils" level="generic">
+<component id="phoneparser" filter="s60" name="Phone Parser">
+<unit bldFile="/mw/phonesrv/telutils/phoneparser/group"/>
+</component>
+<component id="telephonyservice" filter="s60" name="Telephony Service">
+<unit bldFile="/mw/phonesrv/telutils/telephonyservice/group"/>
+</component>
+</collection>
+<collection id="cbs" name="Cellular Baseband Services" level="plugin">
+<component id="cbsserver" filter="s60" name="CBS Server">
+<unit bldFile="/mw/phonesrv/cbs/cbsserver/group"/>
+</component>
+<component id="cbsui" filter="s60" name="CBS UI">
+<unit bldFile="/mw/phonesrv/cbs/cbsui/group"/>
+</component>
+</collection>
+<collection id="cellular" name="Cellular" level="server">
+<component id="telephonysettings" filter="s60" name="Telephony Settings">
+<unit bldFile="/mw/phonesrv/cellular/telephonysettings/group" filter="!test"/>
+
+</component>
+<component id="sssettings" filter="s60" name="Supplementary Service Settings">
+<unit bldFile="/mw/phonesrv/cellular/sssettings/group" filter="!test"/>
+
+</component>
+<component id="psetnotesui" filter="s60" name="Phone Settings Notes UI">
+<unit bldFile="/mw/phonesrv/cellular/psetnotesui/group" filter="!test"/>
+
+</component>
+<component id="servicerequest" filter="s60" name="Service Request">
+<unit bldFile="/mw/phonesrv/cellular/servicerequest/group"/>
+</component>
+</collection>
+<collection id="convergedcallengine" name="Converged Call Engine" level="framework">
+<component id="callprovider" filter="s60" name="Call Provider">
+<unit bldFile="/mw/phonesrv/convergedcallengine/callprovider/group"/>
+</component>
+<component id="cce" filter="s60" name="CCE">
+<unit bldFile="/mw/phonesrv/convergedcallengine/cce/group" filter="!test"/>
+
+</component>
+<component id="spsettings" filter="s60" name="Service Provider Settings">
+<unit bldFile="/mw/phonesrv/convergedcallengine/spsettings/group" filter="!test"/>
+
+</component>
+<component id="cenrepdatabase" filter="s60" name="CCE Cenrep Database">
+<unit bldFile="/mw/phonesrv/convergedcallengine/cenrepdatabase/group"/>
+</component>
+<component id="serviceselector" filter="s60" name="Service Selector">
+<unit bldFile="/mw/phonesrv/convergedcallengine/serviceselector/group"/>
+</component>
+<component id="csplugin" filter="s60" name="CS Plugin" class="plugin">
+<!-- should spell out CS in name -->
+<unit bldFile="/mw/phonesrv/convergedcallengine/csplugin/group"/>
+</component>
+</collection>
+<collection id="engines" name="Telephony Engines" level="specific">
+<component id="vmbxengine" filter="s60" name="Voice Mailbox Engine">
+<unit bldFile="/mw/phonesrv/engines/vmbxengine/group"/>
+</component>
+</collection>
+<collection id="networkhandling" name="Network Handling" level="plugin">
+<component id="networkhandlingengine" filter="s60" name="Network Handling Engine">
+<unit bldFile="/mw/phonesrv/networkhandling/networkhandlingengine/group"/>
+</component>
+</collection>
+<collection id="phoneclientserver" name="Phone Client/Server" level="server">
+<component id="enpolicy" filter="s60" name="Emergency Number Policy">
+<unit bldFile="/mw/phonesrv/phoneclientserver/enpolicy/group"/>
+</component>
+<component id="aiwdialdata" filter="s60" name="AIW Dial Data">
+<unit bldFile="/mw/phonesrv/phoneclientserver/aiwdialdata/group" filter="!test"/>
+
+</component>
+<component id="dialutils" filter="s60" name="Dial Utils">
+<unit bldFile="/mw/phonesrv/phoneclientserver/dialutils/group" filter="!test"/>
+
+</component>
+<component id="phoneclient" filter="s60" name="Phone Client">
+<unit bldFile="/mw/phonesrv/phoneclientserver/phoneclient/group" filter="!test"/>
+
+</component>
+<component id="phoneserver" filter="s60" name="Phone Server">
+<unit bldFile="/mw/phonesrv/phoneclientserver/phoneserver/group"/>
+</component>
+<component id="callui" filter="s60" name="Call UI">
+<unit bldFile="/mw/phonesrv/phoneclientserver/callui/group"/>
+</component>
+</collection>
+<collection id="satengine" name="SIM Application Toolkit Engine" level="generic">
+<component id="satserver" filter="s60" name="SAT Server">
+<unit bldFile="/mw/phonesrv/satengine/satserver/group"/>
+</component>
+</collection>
+<collection id="satui" name="SIM Application Toolkit UI" level="specific">
+<component id="satapp" filter="s60" name="SAT Application">
+<unit bldFile="/mw/phonesrv/satui/satapp/group"/>
+</component>
+<component id="satplugin" filter="s60" name="SAT Plugin" class="plugin">
+<unit bldFile="/mw/phonesrv/satui/satplugin/group"/>
+</component>
+</collection>
+<collection id="phonecmdhandler" name="Phone Command Handler" level="generic">
+<component id="phonecmdhnlr" filter="s60" name="Phone Command Handler">
+<unit bldFile="/mw/phonesrv/phonecmdhandler/phonecmdhnlr/group"/>
+</component>
+</collection>
+</package>
+<package id="messagingmw" level="specific" tech-domain="pr" name="Messaging Middleware" levels="stack fw api">
+<collection id="msgfw_pub" name="Messaging Middleware Public Interfaces" level="api">
+<component id="send_ui_api" name="Send UI API" class="api" filter="s60">
+<unit bldFile="/mw/messagingmw/msgfw_pub/send_ui_api/group"/>
+</component>
+</collection>
+<collection id="msgfw_plat" name="Messaging Middleware Platform Interfaces" level="api">
+<component id="always_online_plugin_api" name="Always Online Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/messagingmw/msgfw_plat/always_online_plugin_api/group"/>
+</component>
+<component id="always_online_client_api" name="Always Online Client API" class="api" filter="s60">
+<unit bldFile="/mw/messagingmw/msgfw_plat/always_online_client_api/group"/>
+</component>
+<component id="msg_common_utils_api" name="Messaging Common Utils API" class="api" filter="s60">
+<unit bldFile="/mw/messagingmw/msgfw_plat/msg_common_utils_api/group"/>
+</component>
+<component id="send_ui_plugin_api" name="Send UI Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/messagingmw/msgfw_plat/send_ui_plugin_api/group"/>
+</component>
+<component id="send_ui_datautils_api" name="Send UI Data Utils API" class="api" filter="s60">
+<unit bldFile="/mw/messagingmw/msgfw_plat/send_ui_datautils_api/group"/>
+</component>
+</collection>
+<collection id="msgbranched" name="Messaging Branched" level="fw">
+<!-- collection is really a component. Need to move down a directory -->
+<component id="msgbranched_build" filter="s60" name="Messaging Branched Build">
+<unit bldFile="/mw/messagingmw/msgbranched/group"/>
+</component>
+</collection>
+<collection id="messagingfw" name="Messaging Framework" level="fw">
+<!-- should break this collection up into smaller related collections -->
+<component id="alwaysonline" filter="s60" name="Always Online Server" introduced="^2">
+<unit bldFile="/mw/messagingmw/messagingfw/alwaysonline/group"/>
+</component>
+<component id="msgcommonutils" filter="s60" name="Messaging Common Utils" introduced="^2">
+<unit bldFile="/mw/messagingmw/messagingfw/msgcommonutils/group"/>
+</component>
+<component id="senduiservices" filter="s60" name="Send UI Services" introduced="^2">
+<unit bldFile="/mw/messagingmw/messagingfw/senduiservices/group"/>
+</component>
+<component id="scheduledsendmtm" name="Scheduled Send MTM" introduced="6.0" purpose="optional" class="plugin">
+<unit bldFile="/mw/messagingmw/messagingfw/scheduledsendmtm/group" mrp="/mw/messagingmw/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
+</component>
+<component id="msgsrvnstore" name="Message Server and Store" purpose="optional">
+<unit bldFile="/mw/messagingmw/messagingfw/msgsrvnstore/group" mrp="/mw/messagingmw/messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
+</component>
+<component id="biomsgfw" name="BIO Messaging Framework" introduced="6.0" purpose="optional">
+<unit bldFile="/mw/messagingmw/messagingfw/biomsgfw/group" mrp="/mw/messagingmw/messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
+</component>
+<component id="msgconf" name="Messaging Config" introduced="^2" purpose="optional" class="config">
+<unit bldFile="/mw/messagingmw/messagingfw/msgconf/group" mrp="/mw/messagingmw/messagingfw/msgconf/group/messaging_config.mrp"/>
+</component>
+<component id="watcherfw" name="Watcher Framework" purpose="optional">
+<unit bldFile="/mw/messagingmw/messagingfw/watcherfw/group" mrp="/mw/messagingmw/messagingfw/watcherfw/group/messaging_watcher.mrp"/>
+</component>
+<component id="msgtest" name="Messaging Test" purpose="development">
+<unit bldFile="/mw/messagingmw/messagingfw/msgtest/group" mrp="/mw/messagingmw/messagingfw/msgtest/group/messaging_test.mrp"/>
+</component>
+
+
+
+<component id="sendas" name="Send As" purpose="optional">
+<unit bldFile="/mw/messagingmw/messagingfw/sendas/group" mrp="/mw/messagingmw/messagingfw/sendas/group/messaging_sendas2.mrp"/>
+</component>
+<component id="msgurlhandler" name="Message URL Handler" introduced="7.0" purpose="optional">
+<unit bldFile="/mw/messagingmw/messagingfw/msgurlhandler/group" mrp="/mw/messagingmw/messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
+</component>
+<component id="wappushfw" name="WAP Push Framework" introduced="6.1" purpose="optional">
+<unit bldFile="/mw/messagingmw/messagingfw/wappushfw/group" mrp="/mw/messagingmw/messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
+</component>
+<component id="suplsmshandler" name="SUPL SMS Handler" introduced="^2" purpose="development" class="plugin">
+<unit bldFile="/mw/messagingmw/messagingfw/suplsmshandler/group" mrp="/mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/>
+</component>
+<component id="suplwappushhandler" name="SUPL WAP Push Handler" introduced="^2" purpose="optional" class="plugin">
+<unit bldFile="/mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="/mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
+</component>
+</collection>
+<collection id="messagingmw_info" name="Messaging Middleware Info" level="api">
+<component id="messagingmw_metadata" name="Messaging Middleware Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="imsrv" level="specific" tech-domain="pr" name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
+<collection id="imsrv_plat" name="Instant Messaging and Presence Services Platform Interfaces" level="specific">
+<component id="ximp_core_data_model_api" name="XIMP Core Data Model API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_core_data_model_api/group"/>
+</component>
+<component id="ximp_presence_protocol_plugin_host_api" name="XIMP Presence Protocol Plug-in Host API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_host_api/group"/>
+</component>
+<component id="ximp_presence_data_model_api" name="XIMP Presence Data Model API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_presence_data_model_api/group"/>
+</component>
+<component id="ximp_presence_protocol_plugin_api" name="XIMP Presence Protocol Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_api/group"/>
+</component>
+<component id="ximp_presence_management_api" name="XIMP Presence Management API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_presence_management_api/group"/>
+</component>
+<component id="ximp_core_protocol_plugin_host_api" name="XIMP Core Protocol Plug-in Host API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_host_api/group"/>
+</component>
+<component id="ximp_core_management_api" name="XIMP Core Management API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_core_management_api/group"/>
+</component>
+<component id="ximp_presence_base_api" name="XIMP Presence Base API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_presence_base_api/group"/>
+</component>
+<component id="ximp_core_protocol_plugin_api" name="XIMP Core Protocol Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_api/group"/>
+</component>
+<component id="ximp_core_base_api" name="XIMP Core Base API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_core_base_api/group"/>
+</component>
+<component id="ximp_presence_cache_api" name="XIMP Presence Cache API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_presence_cache_api/group"/>
+</component>
+<component id="ximp_core_feature_plugin_api" name="XIMP Core Feature Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/group"/>
+</component>
+<component id="ximp_im_protocol_plugin_host_api" name="XIMP IM Protocol Plugin Host API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_host_api/group"/>
+</component>
+<component id="ximp_im_data_model_api" name="XIMP IM Data Model API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_im_data_model_api/group"/>
+</component>
+<component id="ximp_im_protocol_plugin_api" name="XIMP IM Protocol Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_api/group"/>
+</component>
+<component id="ximp_im_management_api" name="XIMP IM Management API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_im_management_api/group"/>
+</component>
+<component id="ximp_im_base_api" name="XIMP IM Base API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_im_base_api/group"/>
+</component>
+<component id="ximp_search_protocol_plugin_host_api" name="XIMP Search Protocol Plugin Host API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_host_api/group"/>
+</component>
+<component id="ximp_search_data_model_api" name="XIMP Search Data Model API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_search_data_model_api/group"/>
+</component>
+<component id="ximp_search_protocol_plugin_api" name="XIMP search Protocol Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_api/group"/>
+</component>
+<component id="ximp_search_management_api" name="XIMP Search Management API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_search_management_api/group"/>
+</component>
+<component id="ximp_search_base_api" name="XIMP Search Base API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_search_base_api/group"/>
+</component>
+<component id="xmpp_settings_api" name="XMPP Settings API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/xmpp_settings_api/group"/>
+</component>
+<component id="im_cache_client_api" name="IM Cache Client API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/im_cache_client_api/group"/>
+</component>
+<component id="im_cache_server_api" name="IM Cache Server API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/im_cache_server_api/group"/>
+</component>
+<component id="presence_avabilitytext" name="Presence Availbility Text" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
+</component>
+</collection>
+<collection id="ximpfw" name="XIMP Framework" level="framework">
+<!-- collection is really a component. Needs to be moved down a directory -->
+<component id="ximpfw_build" filter="s60" name="XIMP Framework Build">
+<unit bldFile="/mw/imsrv/ximpfw/group"/>
+</component>
+</collection>
+<collection id="imservices" name="IM Services" level="generic">
+<component id="imfeatureplugin" filter="s60" name="IM Feature Plugin" class="plugin" introduced="^2">
+<unit bldFile="/mw/imsrv/imservices/imfeatureplugin/group"/>
+</component>
+<component id="searchfeatureplugin" filter="s60" name="Search Feature Plugin" class="plugin" introduced="^2">
+<unit bldFile="/mw/imsrv/imservices/searchfeatureplugin/group"/>
+</component>
+<component id="xmppsettingsapi" filter="s60" name="XMPP Settings API" introduced="^2">
+<unit bldFile="/mw/imsrv/imservices/xmppsettingsapi/group"/>
+</component>
+<component id="xmppsettingsfetcher" filter="s60" name="XMPP Settings Fetcher" introduced="^2">
+<unit bldFile="/mw/imsrv/imservices/xmppsettingsfetcher/group"/>
+</component>
+<component id="instantmessagingcache" filter="s60" name="Instant Messaging Cache" introduced="^2">
+<unit bldFile="/mw/imsrv/imservices/instantmessagingcache/group"/>
+</component>
+</collection>
+<collection id="brandingserver" name="Branding Server" level="specific">
+<!-- collection is really a component. Needs to be moved down a directory -->
+<component id="brandingserver_build" filter="s60" name="Branding Server Build">
+<unit bldFile="/mw/imsrv/brandingserver/group"/>
+</component>
+</collection>
+</package>
+<package id="legacypresence" level="specific" tech-domain="pr" name="Legacy Presence Services" levels="engine fw ui">
+<collection id="pressrv_plat" name="Legacy Presence Services Platform Interfaces" level="ui">
+<component id="presence_list_api" name="Presence List API" class="api" filter="s60">
+<unit bldFile="/mw/legacypresence/pressrv_plat/presence_list_api/group"/>
+</component>
+<component id="watcher_info_api" name="Watcher Info API" class="api" filter="s60">
+<unit bldFile="/mw/legacypresence/pressrv_plat/watcher_info_api/group"/>
+</component>
+<component id="simple_documents_api" name="SIMPLE Documents API" class="api" filter="s60">
+<unit bldFile="/mw/legacypresence/pressrv_plat/simple_documents_api/group"/>
+</component>
+<component id="authorization_api" name="Authorization API" class="api" filter="s60">
+<unit bldFile="/mw/legacypresence/pressrv_plat/authorization_api/group"/>
+</component>
+<component id="xdm_protocol_plugin_api" name="XDM Protocol Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/legacypresence/pressrv_plat/xdm_protocol_plugin_api/group"/>
+</component>
+<component id="watcher_api" name="Watcher API" class="api" filter="s60">
+<unit bldFile="/mw/legacypresence/pressrv_plat/watcher_api/group"/>
+</component>
+<component id="xdm_api" name="XDM API" class="api" filter="s60">
+<unit bldFile="/mw/legacypresence/pressrv_plat/xdm_api/group"/>
+</component>
+<component id="registration_api" name="Registration API" class="api" filter="s60">
+<unit bldFile="/mw/legacypresence/pressrv_plat/registration_api/group"/>
+</component>
+<component id="publisher_api" name="Publisher API" class="api" filter="s60">
+<unit bldFile="/mw/legacypresence/pressrv_plat/publisher_api/group"/>
+</component>
+<component id="messaging_connection_manager_api" name="Messaging Connection Manager API" class="api" filter="s60">
+<unit bldFile="/mw/legacypresence/pressrv_plat/messaging_connection_manager_api/group"/>
+</component>
+<component id="xdm_settings_api" name="XDM Settings API" class="api" filter="s60">
+<unit bldFile="/mw/legacypresence/pressrv_plat/xdm_settings_api/group"/>
+</component>
+<component id="simple_settings_api" name="SIMPLE Settings API" class="api" filter="s60">
+<unit bldFile="/mw/legacypresence/pressrv_plat/simple_settings_api/group"/>
+</component>
+<component id="simple_instant_msg_api" name="Simple Instant Msg API" class="api" filter="s60">
+<unit bldFile="/mw/legacypresence/pressrv_plat/simple_instant_msg_api/group"/>
+</component>
+</collection>
+<collection id="xdmengine" name="XDM Engine" level="engine">
+<!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
+<component id="xdmengine_build" filter="s60" name="XDM Engine Build">
+<unit bldFile="/mw/legacypresence/xdmengine/group"/>
+</component>
+</collection>
+<collection id="xdmsettingsui" name="XDM Settings UI" level="ui">
+<!-- collection is really a component. Need to move down a directory (eg xdm/xdmsettingsui)-->
+<component id="xdmsettingsui_build" filter="s60" name="XDM Settings UI Build">
+<unit bldFile="/mw/legacypresence/xdmsettingsui/group"/>
+</component>
+</collection>
+<collection id="xdmprotocols" name="XDM Protocols" level="fw">
+<!-- collection is really a component. Need to move down a directory (eg xdm/xdmprotocols)-->
+<component id="xdmprotocols_build" filter="s60" name="XDM Protocols Build">
+<unit bldFile="/mw/legacypresence/xdmprotocols/group"/>
+</component>
+</collection>
+<collection id="msgconnmanager" name="Messaging Connection Manager" level="fw">
+<!-- collection is really a component. Need to move down a directory-->
+<component id="msgconnmanager_build" filter="s60" name="Messaging Connection Manager Build">
+<unit bldFile="/mw/legacypresence/msgconnmanager/group"/>
+</component>
+</collection>
+<collection id="presencesettingsui" name="Presence Settings UI" level="ui">
+<!-- collection is really a component. Need to move down a directory-->
+<component id="presencesettingsui_build" filter="s60" name="Presence Settings UI Build">
+<unit bldFile="/mw/legacypresence/presencesettingsui/group"/>
+</component>
+</collection>
+<collection id="simpleengine" name="SIMPLE Engine" level="engine">
+<!-- collection is really a component. Need to move down a directory-->
+<component id="simpleengine_build" filter="s60" name="SIMPLE Engine Build">
+<unit bldFile="/mw/legacypresence/simpleengine/group"/>
+</component>
+</collection>
+<collection id="presencefwsimpleadpt" name="Presence Framework SIMPLE Adaptation" level="fw">
+<!-- collection is really a component. Need to move down a directory-->
+<component id="simpleplugin" filter="s60" class="plugin" name="SIMPLE Plugin">
+<unit bldFile="/mw/legacypresence/presencefwsimpleadpt/group"/>
+</component>
+</collection>
+<collection id="simpledatamodeladapter" name="SIMPLE Data Model Adapter" level="fw">
+<component id="presenceplugin" filter="s60" class="plugin" name="Presence Plugin" introduced="^2">
+<unit bldFile="/mw/legacypresence/simpledatamodeladapter/group"/>
+</component>
+</collection>
+</package>
+<package id="remotemgmt" level="specific" tech-domain="dm" name="Remote Management" levels="plugin framework server generic specific">
+<collection id="remotemgmt_pub" name="Remote Management Public Interfaces" level="specific">
+<component id="synchronization_capability_api" name="Synchronization Capability API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
+</component>
+</collection>
+<collection id="remotemgmt_plat" name="Remote Management Platform Interfaces" level="specific">
+<component id="common_agent_util_and_definitions_api" name="Common Agent util and definitions API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
+</component>
+<component id="policy_management_certificate_api" name="Policy Management Certificate API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/group"/>
+</component>
+<component id="oma_provisioning_adapter_api" name="OMA Provisioning Adapter API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/oma_provisioning_adapter_api/group"/>
+</component>
+<component id="device_management_parameter_api" name="Device Management Parameter API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/device_management_parameter_api/group"/>
+</component>
+<component id="data_synchronization_plugin_api" name="Data Synchronization Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/group"/>
+</component>
+<component id="sync_alert_handler_api" name="Sync Alert Handler API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
+</component>
+<component id="syncml_notifier_api" name="SyncML Notifier API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
+</component>
+<component id="syncml_client_api" name="SyncML Client API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
+</component>
+<component id="device_management_plugin_api" name="Device Management plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/device_management_plugin_api/group"/>
+</component>
+<component id="dm_tree_apis" name="DM Tree APIs" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
+</component>
+<component id="terminal_security_device_lock_api" name="Terminal Security Device Lock API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/group"/>
+</component>
+<component id="policy_management_request_api" name="Policy Management Request API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/policy_management_request_api/group"/>
+</component>
+<component id="ds_constant_definitions_api" name="DS Constant Definitions API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/ds_constant_definitions_api/group"/>
+</component>
+<component id="scp_server_api" name="SCP Server API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/scp_server_api/group"/>
+</component>
+<component id="data_synchronization_notification_api" name="Data Synchronization Notification API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/data_synchronization_notification_api/group"/>
+</component>
+<component id="oma_provisioning_engine_api" name="OMA Provisioning Engine API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/group"/>
+</component>
+<component id="dm_utils_api" name="DM Utils API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/dm_utils_api/group"/>
+</component>
+<component id="syncml_alert_api" name="SyncML Alert API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/syncml_alert_api/group"/>
+</component>
+<component id="obex_client_session_api" name="OBEX Client session API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/obex_client_session_api/group"/>
+</component>
+<component id="setting_enforcement_info_api" name="Setting Enforcement Info API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/group"/>
+</component>
+<component id="dm_constant_definitions_api" name="DM Constant Definitions API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
+</component>
+<component id="oma_ds_extensions_api" name="OMA DS Extensions API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
+</component>
+<component id="pnpms_utils_api" name="PNPMS Utils API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
+</component>
+<component id="diagnostics_plugin_utility_api" name="Diagnostics Plugin Utility API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
+</component>
+<component id="diagnostics_plugin_api" name="Diagnostics Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
+</component>
+<component id="diagnostics_framework_api" name="Diagnostics Framework API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
+</component>
+<component id="diagnostics_results_api" name="Diagnostics Results API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
+</component>
+<component id="diagnostics_plugin_pool_api" name="Diagnostics Plugin Pool API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
+</component>
+<component id="adaptive_history_list_api" name="Adaptive History List API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
+</component>
+<component id="adaptive_history_list_session_api" name="Adaptive History List Session API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
+</component>
+<component id="fota_engine_api" name="FOTA Engine API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
+</component>
+<component id="update_package_storage_plugin_api" name="Update Package Storage Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
+</component>
+<component id="syncml_notifier_roaming_api" name="SyncML Notifier Roaming API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
+</component>
+<component id="sync_service_api" name="Sync Service API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/sync_service_api/group"/>
+</component>
+<component id="dcmo_adapter_api" name="DCMO Adapter API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/dcmo_adapter_api/group"/>
+</component>
+<component id="dcmo_control_api" name="DCMO Control API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/dcmo_control_api/group"/>
+</component>
+<component id="ds_capability_mgmt_plugin_api" name="DS Capability Management Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
+</component>
+<component id="dm_native_notifier_api" name="DM Native Notifier API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/dm_native_notifier_api/group"/>
+</component>
+<component id="syncml_ds_error_reporting_api" name="SyncML DS Error Reporting API" class="api" filter="s60" introduced="^3">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/syncml_ds_error_reporting_api/group"/>
+</component>
+<component id="syncml_ds_customization_api" name="SyncML DS Customization API" class="api" filter="s60" introduced="^3">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/syncml_ds_customization_api/group"/>
+</component>
+</collection>
+<collection id="policymanagement" name="Policy Management" level="generic">
+<component id="pmdmadapter" filter="s60" name="PM DM Adapter" class="plugin">
+<unit bldFile="/mw/remotemgmt/policymanagement/pmdmadapter/group"/>
+</component>
+<component id="dmutilserver" filter="s60" name="DM Util Server">
+<unit bldFile="/mw/remotemgmt/policymanagement/dmutilserver/group"/>
+</component>
+<component id="policyengine" filter="s60" name="Policy Engine">
+<unit bldFile="/mw/remotemgmt/policymanagement/policyengine/group"/>
+</component>
+<component id="policymanagement_build" filter="s60" name="Policy Management Build">
+<!-- need to distribute exports, etc into the other components and remove this-->
+<unit bldFile="/mw/remotemgmt/policymanagement/group"/>
+</component>
+</collection>
+<collection id="syncmlfw" name="SyncML Framework" level="server">
+<component id="syncmlfw_build" filter="s60" name="SyncML Framework Build">
+<!-- need to break this up into components. Too convoluted a structure to be in a single bld.inf-->
+<unit bldFile="/mw/remotemgmt/syncmlfw/group"/>
+</component>
+</collection>
+<collection id="terminalsecurity" name="Terminal Security" level="specific">
+<component id="scp" filter="s60" name="Security Code Proxy">
+<!-- can only have one unit, need to have these #included from a single bld.inf -->
+<unit bldFile="/mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
+<unit bldFile="/mw/remotemgmt/terminalsecurity/scp/scpdatabase/group"/>
+<unit bldFile="/mw/remotemgmt/terminalsecurity/scp/scpserver/group"/>
+<unit bldFile="/mw/remotemgmt/terminalsecurity/scp/scppatternplugin/group"/>
+<unit bldFile="/mw/remotemgmt/terminalsecurity/scp/scphistoryplugin/group"/>
+<unit bldFile="/mw/remotemgmt/terminalsecurity/scp/scptimestampplugin/group"/>
+<unit bldFile="/mw/remotemgmt/terminalsecurity/scp/scpeventhandler/group"/>
+<unit bldFile="/mw/remotemgmt/terminalsecurity/scp/dmeventnotifier/group"/>
+</component>
+<component id="terminalsecurity_client" filter="s60" name="Terminal Control Client">
+<unit bldFile="/mw/remotemgmt/terminalsecurity/client/group"/>
+</component>
+<component id="terminalsecurity_server" filter="s60" name="Terminal Control Server">
+<unit bldFile="/mw/remotemgmt/terminalsecurity/server/group"/>
+</component>
+<component id="tcadapter" filter="s60" name="Terminal Control Adapter">
+<unit bldFile="/mw/remotemgmt/terminalsecurity/tcadapter/bld"/>
+</component>
+<component id="terminalsecurity_build" filter="s60" name="Terminal Security Build">
+<!-- need to distribute exports, etc into the other components and remove this-->
+<unit bldFile="/mw/remotemgmt/terminalsecurity/group"/>
+</component>
+</collection>
+<collection id="omaprovisioning" name="OMA Provisioning" level="specific">
+<component id="pnputil" filter="s60" name="PnP Util">
+<unit bldFile="/mw/remotemgmt/omaprovisioning/pnputil/group"/>
+</component>
+<component id="provisioning" filter="s60" name="Provisioning">
+<unit bldFile="/mw/remotemgmt/omaprovisioning/provisioning/group"/>
+</component>
+</collection>
+<collection id="devicediagnosticsfw" name="Device Diagnostics Framework" level="framework">
+<component id="diagframework" filter="s60" name="Diagnostics Framework">
+<unit bldFile="/mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
+</component>
+<component id="diagpluginbase" filter="s60" name="Diagnostics Plugin Base">
+<unit bldFile="/mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
+</component>
+<component id="diagresultsdb" filter="s60" name="Diagnostics Results Database">
+<!-- can only have one unit, merge or split into two components -->
+<unit bldFile="/mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
+<unit bldFile="/mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
+</component>
+<component id="devicediagnosticsfw_build" filter="s60" name="Device Diagnostics Framework Build">
+<!-- need to distribute exports, etc into the other components and remove this-->
+<unit bldFile="/mw/remotemgmt/devicediagnosticsfw/group"/>
+</component>
+</collection>
+<collection id="dcmofw" name="Device Capability Management Object Framework" level="framework">
+<component id="dcmoclient" filter="s60" name="DCMO Client">
+<unit bldFile="/mw/remotemgmt/dcmofw/dcmoclient/group"/>
+</component>
+<component id="dcmoserver" filter="s60" name="DCMO Server">
+<unit bldFile="/mw/remotemgmt/dcmofw/dcmoserver/group"/>
+</component>
+<component id="dcmocustcmd" filter="s60" name="DCMO Custom Commands">
+<unit bldFile="/mw/remotemgmt/dcmofw/dcmocustcmd/group"/>
+</component>
+<component id="dcmofw_build" filter="s60" name="DCMO Build">
+<!-- need to distribute exports, etc into the other components and remove this-->
+<unit bldFile="/mw/remotemgmt/dcmofw/group"/>
+</component>
+</collection>
+<collection id="fotaapplication" name="FOTA Application" level="generic">
+<component id="fotaapplication_build" filter="s60" name="FOTA Application Build">
+<!-- remove this component when configuration is in place and the #ifdefs have been worked out -->
+<unit bldFile="/mw/remotemgmt/fotaapplication/group"/>
+</component>
+<component id="fotaserver" filter="s60" name="FOTA Server">
+<meta rel="config">
+<defined condition="__SYNCML_DM_FOTA"/>
+</meta>
+<!-- uncomment when #ifdefs are resolved -->
+<!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
+</component>
+<component id="fotacustcmds" filter="s60" name="FOTA Custom Commands">
+<!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
+<!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
+</component>
+</collection>
+</package>
+<package id="remotestorage" level="generic" tech-domain="de" name="Remote Storage" levels="framework if">
+<collection id="rsfw_plat" name="Remote Storage Platform Interfaces" level="if">
+<component id="rsfw_access_protocol_plugin_api" filter="s60" class="api" name="Remote Storage Framework Access Protocol Plugin API">
+<unit bldFile="/mw/remotestorage/rsfw_plat/rsfw_access_protocol_plugin_api/group"/>
+</component>
+</collection>
+<collection id="remotestoragefw" name="Remote Storage Framework" level="framework">
+<component id="mountstore" filter="s60" name="RSFW Mount Store">
+<unit bldFile="/mw/remotestorage/remotestoragefw/mountstore/group"/>
+</component>
+<component id="rsfwnotifierplugins" filter="s60" name="RSFW Notifier Plugins" class="plugin">
+<unit bldFile="/mw/remotestorage/remotestoragefw/rsfwnotifierplugins/group"/>
+</component>
+<component id="remotefileengine" filter="s60" name="Remote File Engine">
+<unit bldFile="/mw/remotestorage/remotestoragefw/remotefileengine/group"/>
+</component>
+<component id="mountmanager" filter="s60" name="RSFW Mount Manager">
+<unit bldFile="/mw/remotestorage/remotestoragefw/mountmanager/group"/>
+</component>
+<component id="webdavaccessplugin" filter="s60" name="WebDAV Access Plugin" class="plugin">
+<unit bldFile="/mw/remotestorage/remotestoragefw/webdavaccessplugin/group"/>
+</component>
+<component id="remotefilesystemplugin" filter="s60" name="Remote Filesystem Plugin" class="plugin">
+<unit bldFile="/mw/remotestorage/remotestoragefw/remotefilesystemplugin/group"/>
+</component>
+<component id="remotestoragegsplugin" filter="s60" name="RS GS Plugin" class="plugin">
+<meta rel="config">
+<defined condition="__REMOTE_STORAGE_FW"/>
+</meta>
+<!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
+<!-- <unit bldFile="remotestoragefw/gsplugin/group"/>-->
+</component>
+<component id="remotedriveconfigurationbiocontrol" filter="s60" name="Remote Drive Configuration BIO Control">
+<meta rel="config">
+<defined condition="__REMOTE_STORAGE_FW"/>
+</meta>
+<!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
+<!-- <unit bldFile="remotestoragefw/remotedriveconfigurationbiocontrol/group"/>-->
+</component>
+<component id="remotestoragefw_build" filter="s60" name="Remote Storage Framework Build">
+<!-- move exports to other components.
+ This is needed for #includes of configured component until congigiration is in place -->
+<unit bldFile="/mw/remotestorage/remotestoragefw/group"/>
+</component>
+</collection>
+</package>
+<package id="remoteconn" level="generic" tech-domain="de" name="Remote Connectivity" levels="plugin framework server generic specific">
+<collection id="connectivitymodules" name="Connectivity Modules" level="framework">
+<component id="secon" filter="s60" name="Service Controllers">
+<unit bldFile="/mw/remoteconn/connectivitymodules/secon/group"/>
+</component>
+</collection>
+<collection id="remoteconn_info" name="Remote Connectivity Info" level="specific">
+<component id="remoteconn_metadata" name="Remote Connectivity Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
+</component>
+</collection>
+<collection id="mtptransports" name="MTP Transports" level="plugin">
+<component id="mtpusbtransport" name="MTP USB Transport" introduced="^2" purpose="optional" class="plugin">
+<unit bldFile="/mw/remoteconn/mtptransports/mtpusbtransport/group" mrp="/mw/remoteconn/mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
+</component>
+<component id="mtpptpiptransport" name="MTP PTP-IP Transport" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/mw/remoteconn/mtptransports/mtpptpiptransport/group" mrp="/mw/remoteconn/mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
+</component>
+<component id="mtpcontroller" name="MTP Controller" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/mw/remoteconn/mtptransports/mtpcontroller/group" mrp="/mw/remoteconn/mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
+</component>
+</collection>
+<collection id="mtpfws" name="MTP Frameworks" level="framework">
+<component id="mtpfw" name="MTP Framework" introduced="^2" purpose="optional">
+<unit bldFile="/mw/remoteconn/mtpfws/mtpfw/group" mrp="/mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/>
+</component>
+</collection>
+<collection id="mtpdataproviders" name="MTP Data Providers" level="generic">
+<component id="mtpfileandfolderdp" name="MTP File and Folder Provider" introduced="^2" purpose="optional" class="plugin">
+<unit bldFile="/mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group" mrp="/mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
+</component>
+<component id="mtpimagedp" name="MTP Image Data Provider" filter="gt" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/mw/remoteconn/mtpdataproviders/mtpimagedp/group" mrp="/mw/remoteconn/mtpdataproviders/mtpimagedp/group/mtp_imagedp.mrp"/>
+</component>
+<component id="mtppictbridgedp" name="MTP PictBridge Data Provider" filter="gt" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/mw/remoteconn/mtpdataproviders/mtppictbridgedp/group" mrp="/mw/remoteconn/mtpdataproviders/mtppictbridgedp/group/mtp_pictbridgedp.mrp"/>
+</component>
+</collection>
+<collection id="backupandrestore" name="Backup and Restore" level="specific">
+<component id="backupengine" name="Backup Engine" introduced="9.0" purpose="optional">
+<unit bldFile="/mw/remoteconn/backupandrestore/backupengine/group" mrp="/mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
+</component>
+<component id="backuptest" name="Backup Test" introduced="^2" purpose="development">
+<unit bldFile="/mw/remoteconn/backupandrestore/backuptest/group" mrp="/mw/remoteconn/backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
+</component>
+</collection>
+<collection id="obex" name="OBEX" level="generic">
+<component id="obexprotocol" name="OBEX Protocol" introduced="9.1" purpose="optional">
+<unit bldFile="/mw/remoteconn/obex/obexprotocol/group" mrp="/mw/remoteconn/obex/obexprotocol/group/obex.mrp"/>
+</component>
+<component id="obexextensionapi" name="OBEX Extension API" introduced="9.2" purpose="optional">
+<unit bldFile="/mw/remoteconn/obex/obexextensionapi/group" mrp="/mw/remoteconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
+</component>
+</collection>
+</package>
+<package id="srvdiscovery" level="generic" tech-domain="de" name="Service Discovery and Usage" levels="plugin framework server generic specific">
+<collection id="upnpstack_plat" name="UPnP Stack Platform Interfaces" level="specific">
+<component id="upnpstack_plat" name="UPnP Device API" purpose="optional" introduced="^3" class="api">
+<unit bldFile="/mw/srvdiscovery/upnp/upnpstack_plat/upnp_device_api/group"/>
+</component>
+<component id="upnpstack_plat" name="UPnP Common API" purpose="optional" introduced="^3" class="api">
+<unit bldFile="/mw/srvdiscovery/upnp/upnpstack_plat/upnp_common_api/group"/>
+</component>
+<component id="upnpstack_plat" name="UPnP Utils API" purpose="optional" introduced="^3" class="api">
+<unit bldFile="/mw/srvdiscovery/upnp/upnpstack_plat/upnp_utils_api/group"/>
+</component>
+<component id="upnpstack_plat" 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 id="upnpstack_plat" name="UPnP HTTP Server API" purpose="optional" introduced="^3" class="api">
+<unit bldFile="/mw/srvdiscovery/upnp/upnpstack_plat/upnp_httpserver_api/group"/>
+</component>
+<component id="upnpstack_plat" 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 id="servicediscoveryandcontrol" name="Service Discovery and Control" level="framework">
+<component id="servicediscoveryfw" name="Service Discovery Framework" introduced="^3" purpose="optional">
+<unit bldFile="/mw/srvdiscovery/servicediscoveryandcontrol/pnp/group" mrp="/mw/srvdiscovery/servicediscoveryandcontrol/pnp/group/servicediscoveryframework.mrp"/>
+</component>
+</collection>
+<collection id="upnp" name="UPnP" level="server">
+<component id="upnpstack" name="UPnP Stack" introduced="^3" purpose="optional">
+<unit bldFile="/mw/srvdiscovery/upnp/upnpstack/group"/>
+</component>
+</collection>
+<collection id="srvdiscovery_info" name="Service Discovery and Usage Info" level="specific">
+<component id="srvdiscovery_metadata" name="Service Discovery and Usage Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/mw/srvdiscovery/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="dlnasrv" level="specific" tech-domain="de" name="DLNA Services" levels="stack server ctrl framework plugin">
+<!-- uncomment all the units when configuration is in place, they're currently #included from other xxx_build components -->
+<collection id="dlnasrv_plat" name="DLNA Services Platform Interfaces" level="plugin">
+<component id="upnp_media_server_settings_api" name="UPnP Media Server Settings API" class="api" filter="s60">
+<unit bldFile="/mw/dlnasrv/dlnasrv_plat/upnp_media_server_settings_api/group"/>
+</component>
+<component id="upnp_av_objects_api" name="UPnP A/V Objects API" class="api" filter="s60">
+<unit bldFile="/mw/dlnasrv/dlnasrv_plat/upnp_av_objects_api/group"/>
+</component>
+<component id="upnp_media_server_api" name="UPnP Media Server API" class="api" filter="s60">
+<unit bldFile="/mw/dlnasrv/dlnasrv_plat/upnp_media_server_api/group"/>
+</component>
+<component id="upnp_security_plugin_api" name="UPnP Security Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/dlnasrv/dlnasrv_plat/upnp_security_plugin_api/group"/>
+</component>
+<component id="upnp_avcp_api" name="UPnP AVCP API" class="api" filter="s60">
+<unit bldFile="/mw/dlnasrv/dlnasrv_plat/upnp_avcp_api/group"/>
+</component>
+<component id="upnp_media_server_metadata_api" name="UPnP Media Server Metadata API" class="api" filter="s60">
+<unit bldFile="/mw/dlnasrv/dlnasrv_plat/upnp_media_server_metadata_api/group"/>
+</component>
+<component id="upnp_command_api" name="UPnP Command API" class="api" filter="s60">
+<unit bldFile="/mw/dlnasrv/dlnasrv_plat/upnp_command_api/group"/>
+</component>
+<component id="upnp_plugin_api" name="UPnP Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/dlnasrv/dlnasrv_plat/upnp_plugin_api/group"/>
+</component>
+</collection>
+<collection id="upnpavcontrolpoint" name="UPnP A/V Control Point" level="plugin">
+<component id="avcontrolframework" filter="s60" name="A/V Control Famework" introduced="9.1" deprecated="^3">
+<unit bldFile="/mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
+</component>
+<component id="upnpavcontrolpoint_build" filter="s60" name="UPnP A/V Control Point Build" introduced="9.1" deprecated="^3">
+<!-- put exports in other component instead -->
+<unit bldFile="/mw/dlnasrv/upnpavcontrolpoint/group"/>
+</component>
+</collection>
+<collection id="upnpmediaserver" name="UPnP Media Server" level="server">
+<component id="avobjects" filter="s60" name="A/V Objects">
+<unit bldFile="/mw/dlnasrv/upnpmediaserver/avobjects/group"/>
+</component>
+<component id="mediaserverclient" filter="s60" name="Media Server Client">
+<unit bldFile="/mw/dlnasrv/upnpmediaserver/mediaserverclient/group"/>
+</component>
+<component id="connectionmanagerservice" filter="s60" name="Connection Manager Service">
+<unit bldFile="/mw/dlnasrv/upnpmediaserver/connectionmanagerservice/group"/>
+</component>
+<component id="contentdirectoryservice" filter="s60" name="Content Directory Service">
+<unit bldFile="/mw/dlnasrv/upnpmediaserver/contentdirectoryservice/group"/>
+</component>
+<component id="mediaserverengine" filter="s60" name="Media Server Engine">
+<unit bldFile="/mw/dlnasrv/upnpmediaserver/mediaserverengine/group"/>
+</component>
+<component id="upnpmediaserver_build" filter="s60" name="UPnP Media Server Build">
+<!-- move exports into one of above components -->
+<unit bldFile="/mw/dlnasrv/upnpmediaserver/group"/>
+</component>
+</collection>
+<collection id="upnpavcontroller" name="UPnP A/V Controller" level="ctrl">
+<component id="upnpxmlparser" filter="s60" name="UPnP XML Parser" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpavcontroller/upnpxmlparser/group"/>
+</component>
+<component id="upnpavcontrollerserver" filter="s60" name="UPnP A/V Controller Server" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpavcontroller/upnpavcontrollerserver/group"/>
+</component>
+<component id="upnpavcontrollerclient" filter="s60" name="UPnP A/V Ccontroller Client" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpavcontroller/upnpavcontrollerclient/group"/>
+</component>
+<component id="upnpavcontrollerhelper" filter="s60" name="UPnP A/V Controller Helper" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpavcontroller/upnpavcontrollerhelper/group"/>
+</component>
+<component id="upnpavcontroller_build" filter="s60" name="UPnP A/V Controller Build" introduced="^2">
+<!-- move exports content into one of above components -->
+<unit bldFile="/mw/dlnasrv/upnpavcontroller/group"/>
+</component>
+</collection>
+<collection id="upnpframework" name="UPnP Framework" level="framework">
+<component id="upnputilities" filter="s60" name="UPnP Utilities" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpframework/upnputilities/group"/>
+</component>
+<component id="upnpextensionpluginif" filter="s60" name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
+<meta rel="config">
+<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+</meta>
+<!-- <unit bldFile="upnpframework/upnpextensionpluginif/group"/> -->
+</component>
+<component id="upnpfiletransferengine" filter="s60" name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
+<meta rel="config">
+<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+</meta>
+<!-- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>-->
+</component>
+<component id="upnpcommonui" filter="s60" name="UPnP Common UI" introduced="^2" deprecated="^3">
+<meta rel="config">
+<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+</meta>
+<!--<unit bldFile="upnpframework/upnpcommonui/group"/>-->
+</component>
+<component id="upnpaiwengine" filter="s60" name="UPnP AIW Engine" introduced="^2" deprecated="^3">
+<meta rel="config">
+<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+</meta>
+<!--<unit bldFile="upnpframework/upnpaiwengine/group"/> -->
+</component>
+<component id="upnpaiwprovider" filter="s60" name="UPnP AIW Provider" class="plugin" introduced="^2" deprecated="^3">
+<meta rel="config">
+<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+</meta>
+<!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
+</component>
+<component id="upnpmusicadapter" filter="s60" name="UPnP Music Adapter" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
+</component>
+<component id="upnpcommand" filter="s60" name="UPnP Command" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpframework/upnpcommand/group"/>
+</component>
+<component id="upnpframework_build" filter="s60" name="UPnP Framework Build" introduced="^2">
+<!-- move exports content into one of above components -->
+<unit bldFile="/mw/dlnasrv/upnpframework/group"/>
+</component>
+</collection>
+<collection id="upnpsettings" name="UPnP Settings" level="framework">
+<component id="upnpsettingsengine" filter="s60" name="UPnP Settings Engine" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
+</component>
+<component id="multiselectionui" filter="s60" name="Multi-Selection UI" introduced="^2" deprecated="^3">
+<meta rel="config">
+<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+</meta>
+<!--<unit bldFile="upnpsettings/multiselectionui/group"/>-->
+</component>
+<component id="appwizard" filter="s60" name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
+<meta rel="config">
+<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+</meta>
+<!--<unit bldFile="upnpsettings/appwizard/group"/>-->
+</component>
+<component id="upnpsharingui" filter="s60" name="UPnP Sharing UI" introduced="^2" deprecated="^3">
+<meta rel="config">
+<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+</meta>
+<!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
+</component>
+<component id="upnpgsplugin" filter="s60" name="UPnP GS Plugin" class="plugin" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
+</component>
+<component id="upnpsettings_build" filter="s60" name="UPnP Settings Build" introduced="^2">
+<!-- move exports content into one of above components -->
+<unit bldFile="/mw/dlnasrv/upnpsettings/group"/>
+</component>
+</collection>
+<collection id="upnpsharing" name="UPnP Sharing" level="server">
+<component id="upnpdlnaprofiler" filter="s60" name="UPnP DLNA Profiler" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpsharing/upnpdlnaprofiler/group"/>
+</component>
+<component id="upnpsecurity" filter="s60" name="UPnP Security" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpsharing/upnpsecurity/group"/>
+</component>
+<component id="upnpcontentserver" filter="s60" name="UPnP Content Server" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpsharing/upnpcontentserver/group"/>
+</component>
+<component id="applicationengine" filter="s60" name="UPnP Application Engine" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpsharing/applicationengine/group"/>
+</component>
+<component id="upnpsharing_build" filter="s60" name="UPnP Sharing Build" introduced="^2">
+<!-- move exports content into one of above components -->
+<unit bldFile="/mw/dlnasrv/upnpsharing/group"/>
+</component>
+</collection>
+<collection id="upnpmpxplugins" name="UPnP MPX Plugins" level="plugin">
+<component id="upnpplaybackplugins" filter="s60" name="UPnP Playback Plugins" class="plugin" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpmpxplugins/upnpplaybackplugins/group"/>
+</component>
+<component id="upnpmpxplugins_build" filter="s60" name="UPnP MPX Plugins Build" introduced="^2">
+<!-- move exports content into other component? -->
+<unit bldFile="/mw/dlnasrv/upnpmpxplugins/group"/>
+</component>
+</collection>
+<collection id="upnpharvester" name="UPnP Harvester" level="ctrl">
+<meta rel="config">
+<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+</meta>
+<component id="upnpharvester_common" filter="s60" name="UPnP Harvester Common" introduced="^2" deprecated="^3">
+<!-- need to merge or #include these to a single bld.inf -->
+<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
+ <unit bldFile="upnpharvester/common/cmsettings/group"/>
+ <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
+ <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
+</component>
+<component id="cdssync" filter="s60" name="CDS Sync" introduced="^2" deprecated="^3">
+<!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
+</component>
+<component id="mdhserver" filter="s60" name="Metadata Harvester Server" introduced="^2" deprecated="^3">
+<!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
+</component>
+<component id="upnpharvester_build" filter="s60" name="UPnP Harvester Build" introduced="^2" deprecated="^3">
+<!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
+<!--<unit bldFile="upnpharvester/group"/>-->
+</component>
+</collection>
+<collection id="homesync" name="Home Sync" level="plugin">
+<meta rel="config">
+<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+</meta>
+<component id="contentmanager" filter="s60" name="Content Manager" introduced="^2" deprecated="^3">
+<!-- <unit bldFile="homesync/group"/>-->
+<!-- move bld.inf into contentmanager dir -->
+</component>
+</collection>
+<collection id="homemedia" name="Home Media" level="framework">
+<meta rel="config">
+<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+</meta>
+<!-- collection is really just a component. Move down a directory -->
+<component id="homemedia_build" filter="s60" name="Home Media" introduced="^2" deprecated="^3">
+<!-- <unit bldFile="homemedia/group"/> -->
+</component>
+</collection>
+<collection id="dlnasrv_info" name="DLNA Services Info" level="plugin">
+<component id="dlnasrv_build" filter="s60" name="DLNA Services Build">
+<!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed -->
+<unit bldFile="/mw/dlnasrv/group"/>
+</component>
+
+</collection>
+</package>
+<package id="btservices" level="generic" tech-domain="de" name="Bluetooth Services" levels="framework server generic specific plugin">
+<collection id="btservices_pub" name="BT Services Public Interfaces" level="plugin">
+<component id="bluetooth_power_state_api" name="Bluetooth Power State API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_pub/bluetooth_power_state_api/group"/>
+</component>
+<component id="bluetooth_notifier_api" name="Bluetooth Notifier API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_pub/bluetooth_notifier_api/group"/>
+</component>
+</collection>
+<collection id="btservices_plat" name="BT Services Platform Interfaces" level="plugin">
+<component id="bluetooth_dosserver_audio_api" name="Bluetooth DOS Server Audio API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_dosserver_audio_api/group"/>
+</component>
+<component id="bluetooth_dut_mode_api" name="Bluetooth DUT Mode API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_dut_mode_api/group"/>
+</component>
+<component id="bluetooth_engine_api" name="Bluetooth Engine API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_engine_api/group"/>
+</component>
+<component id="bluetooth_engine_connection_management_api" name="Bluetooth Engine Connection Management API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_engine_connection_management_api/group"/>
+</component>
+<component id="bluetooth_engine_device_management_api" name="Bluetooth Engine Device Management API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_engine_device_management_api/group"/>
+</component>
+<component id="bluetooth_engine_discovery_api" name="Bluetooth Engine Discovery API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_engine_discovery_api/group"/>
+</component>
+<component id="bluetooth_engine_features_api" name="Bluetooth Engine Features API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_engine_features_api/group"/>
+</component>
+<component id="bluetooth_engine_settings_api" name="Bluetooth Engine Settings API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_engine_settings_api/group"/>
+</component>
+<component id="bluetooth_engine_plugin_api" name="Bluetooth Engine Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_engine_plugin_api/group"/>
+</component>
+<component id="bluetooth_local_variation_api" name="Bluetooth Local Variation API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_local_variation_api/group"/>
+</component>
+<component id="bluetooth_notifier_internal_api" name="Bluetooth Notifier internal API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_notifier_internal_api/group"/>
+</component>
+<component id="bluetooth_sap_connection_state_api" name="Bluetooth SAP Connection State API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_sap_connection_state_api/group"/>
+</component>
+<component id="bluetooth_secondary_display_notification_api" name="Bluetooth Secondary Display Notification API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_secondary_display_notification_api/group"/>
+</component>
+</collection>
+<collection id="bluetoothengine" name="Bluetooth Engine" level="framework">
+<component id="bteng" filter="s60" name="Bluetooth Engine">
+<unit bldFile="/mw/btservices/bluetoothengine/bteng/group"/>
+</component>
+<component id="btnotif" filter="s60" name="Bluetooth Notifier">
+<unit bldFile="/mw/btservices/bluetoothengine/btnotif/group"/>
+</component>
+<component id="btaudioman" filter="s60" name="Bluetooth Audio Manager">
+<unit bldFile="/mw/btservices/bluetoothengine/btaudioman/group"/>
+</component>
+<component id="btmac" filter="s60" name="Bluetooth Mono Audio Controller" class="plugin">
+<unit bldFile="/mw/btservices/bluetoothengine/btmac/group"/>
+</component>
+<component id="btsac" filter="s60" name="Bluetooth Stereo Audio Controller" class="plugin">
+<unit bldFile="/mw/btservices/bluetoothengine/btsac/group"/>
+</component>
+<component id="btaudiostreamer" filter="s60" name="Bluetooth Audio Streamer">
+<unit bldFile="/mw/btservices/bluetoothengine/btaudiostreamer/group"/>
+</component>
+<component id="btsap" filter="s60" name="Bluetooth SIM Access Profile" class="plugin">
+<unit bldFile="/mw/btservices/bluetoothengine/btsap/group"/>
+</component>
+<component id="btui" filter="s60" name="Bluetooth UI">
+<unit bldFile="/mw/btservices/bluetoothengine/btui/group"/>
+</component>
+<component id="btpbap" filter="s60" name="Bluetooth Phonebook Access Profile" class="plugin">
+<unit bldFile="/mw/btservices/bluetoothengine/btpbap/group"/>
+</component>
+<component id="bthid" filter="s60" name="Bluetooth HID">
+<unit bldFile="/mw/btservices/bluetoothengine/bthid/group"/>
+</component>
+<component id="btctrldcmoadapter" filter="s60" name="Bluetooth Control DCMO Adapter" class="plugin" introduced="^3">
+<unit bldFile="/mw/btservices/bluetoothengine/btctrldcmoadapter/group"/>
+</component>
+</collection>
+<collection id="bluetoothappprofiles" name="Bluetooth Application Profiles" level="plugin">
+<component id="avrcp" name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
+<unit bldFile="/mw/btservices/bluetoothappprofiles/avrcp" mrp="/mw/btservices/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
+</component>
+</collection>
+<collection id="atcommands" name="AT Commands" level="generic">
+<component id="modematplugin" name="Modem AT Plugin" filter="s60" class="plugin" introduced="^4">
+<unit bldFile="/mw/btservices/atcommands/modematplugin/group"/>
+</component>
+<component id="lccustomplugin" name="LC Custom Plugin" filter="s60" class="plugin" introduced="^4">
+<unit bldFile="/mw/btservices/atcommands/lccustomplugin/group"/>
+</component>
+</collection>
+<collection id="btservices_info" name="BT Services Info" level="plugin">
+<component id="btservices_metadata" name="BT Services Metadata" class="config" introduced="^3" purpose="development" target="desktop">
+<unit mrp="/mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
+</component>
+
+</collection>
+</package>
+<package id="usbservices" level="generic" tech-domain="de" name="USB Services" levels="framework server generic specific plugin">
+<collection id="usbservices_plat" name="USB Services Platform Interfaces" level="plugin">
+<component id="pictbridge_api" name="PictBridge API" class="api" filter="s60">
+<unit bldFile="/mw/usbservices/usbservices_plat/pictbridge_api/group"/>
+</component>
+<component id="ptp_responder_api" name="PTP Responder API" class="api" filter="s60">
+<unit bldFile="/mw/usbservices/usbservices_plat/ptp_responder_api/group"/>
+</component>
+<component id="ptp_transport_api" name="PTP Transport API" class="api" filter="s60">
+<unit bldFile="/mw/usbservices/usbservices_plat/ptp_transport_api/group"/>
+</component>
+<component id="usb_device_control_plugin_api" name="USB Device Control Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/usbservices/usbservices_plat/usb_device_control_plugin_api/group"/>
+</component>
+<component id="usb_notifier_api" name="USB Notifier API" class="api" filter="s60">
+<unit bldFile="/mw/usbservices/usbservices_plat/usb_notifier_api/group"/>
+</component>
+<component id="usb_personality_api_header" name="USB Personality API" class="api" filter="s60">
+<unit bldFile="/mw/usbservices/usbservices_plat/usb_personality_api_header/group"/>
+</component>
+<component id="usb_personality_plugin_api" name="USB Personality Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/usbservices/usbservices_plat/usb_personality_plugin_api/group"/>
+</component>
+<component id="usb_secondary_display_api" name="USB Secondary Display API" class="api" filter="s60">
+<unit bldFile="/mw/usbservices/usbservices_plat/usb_secondary_display_api/group"/>
+</component>
+<component id="usb_watcher_api" name="USB Watcher API" class="api" filter="s60">
+<unit bldFile="/mw/usbservices/usbservices_plat/usb_watcher_api/group"/>
+</component>
+<component id="usb_watcher_info_api_header" name="USB Watcher Info API" class="api" filter="s60">
+<unit bldFile="/mw/usbservices/usbservices_plat/usb_watcher_info_api_header/group"/>
+</component>
+</collection>
+<collection id="usbservices_info" name="USB Services Info" level="plugin">
+
+</collection>
+<collection id="usbengines" name="USB Engines" level="generic">
+<component id="usbotgwatcher" filter="s60" name="USB OTG Watcher">
+<unit bldFile="/mw/usbservices/usbengines/usbotgwatcher/group"/>
+</component>
+<component id="usbwatcher" filter="s60" name="USB Watcher">
+<unit bldFile="/mw/usbservices/usbengines/usbwatcher/group"/>
+</component>
+<component id="usblocodplugin" filter="s60" name="USB Local Connectivity Domain Plugin" class="plugin">
+<unit bldFile="/mw/usbservices/usbengines/usblocodplugin/group"/>
+</component>
+<component id="usbdevcon" filter="s60" name="USB Device Control">
+<unit bldFile="/mw/usbservices/usbengines/usbdevcon/group"/>
+</component>
+<component id="usbremotepersonality" filter="s60" name="USB Remote Personality">
+<unit bldFile="/mw/usbservices/usbengines/usbremotepersonality/group"/>
+</component>
+</collection>
+<collection id="usbclasses" name="USB Classes" level="framework">
+<component id="usbobexclasscontroller" filter="s60" name="USB OBEX Class Controller" class="plugin">
+<unit bldFile="/mw/usbservices/usbclasses/usbobexclasscontroller/group"/>
+</component>
+<component id="usbbasicpersonality" filter="s60" name="USB Basic Personality" class="plugin">
+<unit bldFile="/mw/usbservices/usbclasses/usbbasicpersonality/group"/>
+</component>
+<component id="usbmscpersonality" filter="s60" name="USB MSC Personality" class="plugin">
+<unit bldFile="/mw/usbservices/usbclasses/usbmscpersonality/group"/>
+</component>
+<!-- commented out in bld.inf. Should this be deleted?
+ <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
+ <unit bldFile="usbclasses/ptpstack/group"/>
+ </component>
+ <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
+ <unit bldFile="usbclasses/sicdusbplugin/group"/>
+ </component>
+ <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
+ <unit bldFile="usbclasses/ptpserver/group"/>
+ </component>-->
+<component id="pictbridgeengine" filter="s60" name="PictBridge Engine">
+<unit bldFile="/mw/usbservices/usbclasses/pictbridgeengine/group"/>
+</component>
+<component id="usbphoneasmodem" filter="s60" name="USB Phone as Modem" introduced="^3">
+<unit bldFile="/mw/usbservices/usbclasses/usbphoneasmodem/group"/>
+</component>
+</collection>
+<collection id="usbuis" name="USB UIs" level="specific">
+<component id="usbui" filter="s60" name="USB UI">
+<unit bldFile="/mw/usbservices/usbuis/usbui/group"/>
+</component>
+<component id="usbuinotif" filter="s60" name="USB UI Notifiers">
+<unit bldFile="/mw/usbservices/usbuis/usbuinotif/group"/>
+</component>
+<component id="imageprintuiprovider" filter="s60" name="ImagePrint UI Provider" class="plugin">
+<unit bldFile="/mw/usbservices/usbuis/imageprintuiprovider/group"/>
+</component>
+<component id="usbimageprintui" filter="s60" name="ImagePrint UI">
+<unit bldFile="/mw/usbservices/usbuis/imageprintui/group"/>
+</component>
+</collection>
+</package>
+<package id="shortlinkconn" level="generic" tech-domain="de" name="Shortlink Connectivity" levels="framework server generic specific plugin">
+<!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
+<collection id="shortlinkconn_plat" name="Shortlink Connectivity Platform Interfaces" level="plugin">
+<component id="obex_service_utils_api" name="OBEX Service Utils API" class="api" filter="s60">
+<unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/obex_service_utils_api/group"/>
+</component>
+<component id="obex_service_plugin_api" name="OBEX Service Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/obex_service_plugin_api/group"/>
+</component>
+<component id="dialup_connection_status_api" name="Dial-up Connection Status API" class="api" filter="s60">
+<unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/dialup_connection_status_api/group"/>
+</component>
+<component id="dun_secondary_display_notification_api" name="DUN Secondary Display Notification API" class="api" filter="s60">
+<unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
+</component>
+<component id="obex_secondary_display_notification_api" name="OBEX Secondary Display Notification API" class="api" filter="s60">
+<unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
+</component>
+<component id="generic_hid_api" name="Generic HID API" class="api" filter="s60">
+<unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/generic_hid_api/group"/>
+</component>
+<component id="locod_bearer_plugin_api" name="Locod Bearer Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/locod_bearer_plugin_api/group"/>
+</component>
+<component id="usb_obexservicemanager_client_api" name="USB OBEX Service Manager Client API" class="api" filter="s60">
+<unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/usb_obexservicemanager_client_api/group"/>
+</component>
+</collection>
+<collection id="localconnectivityservice" name="Local Connectivity Service" level="server">
+<component id="locod" name="Local Connectivity Daemon">
+<unit bldFile="/mw/shortlinkconn/localconnectivityservice/locod/group"/>
+</component>
+<component id="obexserviceman" name="OBEX Service Managar">
+<unit bldFile="/mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
+</component>
+<component id="obexsendservices" name="OBEX Send Services">
+<unit bldFile="/mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
+</component>
+<component id="obexreceiveservices" name="OBEX Receive Services">
+<unit bldFile="/mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
+</component>
+<component id="dun" name="Dial Up Networking">
+<unit bldFile="/mw/shortlinkconn/localconnectivityservice/dun/group"/>
+</component>
+<component id="lcstylustap" name="LC Stylus Tap Plugins" class="plugin">
+<unit bldFile="/mw/shortlinkconn/localconnectivityservice/lcstylustap/group"/>
+</component>
+<component id="generichid" name="Generic HID">
+<unit bldFile="/mw/shortlinkconn/localconnectivityservice/generichid/group"/>
+</component>
+<component id="headset" name="Headset">
+<unit bldFile="/mw/shortlinkconn/localconnectivityservice/headset/group"/>
+</component>
+</collection>
+</package>
+<package id="imghandling" level="specific" tech-domain="mm" name="Image Handling" levels="lib util if">
+<collection id="imagehandling_plat" name="Image Handling Platform Interfaces" level="if">
+<component id="image_handling_library_api" name="Image Handling Library API" class="api" filter="s60">
+<unit bldFile="/mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
+</component>
+<component id="3gp_library_api" name="3GP Library API" class="api" filter="s60">
+<unit bldFile="/mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
+</component>
+<component id="thumbnailmanager_api" name="Thumbnail Manager API" class="api" filter="s60">
+<unit bldFile="/mw/imghandling/imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
+
+</component>
+</collection>
+<collection id="imagehandlinglib" name="Image Handling Library" level="lib">
+<!-- collection is really a component, need to move down a directory -->
+<component id="ihl" filter="s60" name="IHL">
+<unit bldFile="/mw/imghandling/imagehandlinglib/group"/>
+</component>
+
+</collection>
+<collection id="imagehandlingutilities" name="Image Handling Utilities" level="util">
+<component id="thumbnailmanager" filter="s60" name="Thumbnail Manager">
+<unit bldFile="/mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
+</component>
+</collection>
+</package>
+<package id="metadatasrv" level="specific" tech-domain="mm" name="Legacy Metadata Services" levels="plugin framework server generic specific">
+<collection id="metadatasrv_pub" name="Legacy Metadata Services Public Interfaces" level="specific">
+<component id="content_listing_framework_api" name="Content Listing Framework API" class="api" filter="s60">
+<meta rel="config">
+<not-defined condition="RD_MDS_2_5"/>
+</meta>
+<!-- Leave commented out until confguration is in use
+ unit bldFile="metadatasrv_pub/content_listing_framework_api/group"/>-->
+</component>
+<component id="media_fetch_api" name="Media Fetch API" class="api" filter="s60">
+<unit bldFile="/mw/metadatasrv/metadatasrv_pub/media_fetch_api/group"/>
+</component>
+<component id="metadatasrv_pub_build" name="Legacy Metadata Services Public Interface Build" class="api" filter="s60">
+<!-- only needed for #ifdefs, remove when confguration is in use -->
+<unit bldFile="/mw/metadatasrv/metadatasrv_pub/group"/>
+</component>
+</collection>
+<collection id="metadatasrv_plat" name="Legacy Metadata Services Platform Interfaces" level="specific">
+<component id="media_fetch_implementation_api" name="Media Fetch Implementation API" class="api" filter="s60">
+<unit bldFile="/mw/metadatasrv/metadatasrv_plat/media_fetch_implementation_api/group"/>
+</component>
+<component id="content_listing_framework_collection_manager_api" name="Content Listing Framework Collection Manager API" class="api" filter="s60">
+<meta rel="config">
+<not-defined condition="RD_MDS_2_5"/>
+</meta>
+<!-- Leave commented out until confguration is in use
+ <unit bldFile="metadatasrv_plat/content_listing_framework_collection_manager_api/group"/>-->
+</component>
+<component id="content_listing_framework_extended_api" name="Content Listing Framework Extended API" class="api" filter="s60">
+<meta rel="config">
+<not-defined condition="RD_MDS_2_5"/>
+</meta>
+<!-- Leave commented out until confguration is in use
+ <unit bldFile="metadatasrv_plat/content_listing_framework_extended_api/group"/>-->
+</component>
+<component id="metadatasrv_plat_build" name="Legacy Metadata Services Platform Interface Build" class="api" filter="s60">
+<!-- only needed for #ifdefs, remove when confguration is in use -->
+<unit bldFile="/mw/metadatasrv/metadatasrv_plat/group"/>
+</component>
+</collection>
+<collection id="mediamanagementutilities" name="Media Management Utilities" level="generic">
+<component id="mediafetch" filter="s60" name="Media Fetch">
+<unit bldFile="/mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
+</component>
+</collection>
+</package>
+<package id="mds" level="specific" tech-domain="mm" name="Metadata Services" levels="mgr eng server int">
+<collection id="mds_plat" name="Metadata Services Platform Interfaces" level="int">
+<component id="context_engine_plugin_api" name="Context Engine Plugin API" introduced="^2" class="api" filter="s60">
+<unit bldFile="/mw/mds/mds_plat/context_engine_plugin_api/group" filter="!test"/>
+
+</component>
+<component id="harvester_framework_api" name="Harvester Framework API" introduced="^2" class="api" filter="s60">
+<unit bldFile="/mw/mds/mds_plat/harvester_framework_api/group" filter="!test"/>
+
+<!-- can only have one unit with the same filter, #include the following from the previous unit -->
+
+
+
+
+
+</component>
+<component id="location_manager_api" name="Location Manager API" introduced="^2" class="api" filter="s60">
+<unit bldFile="/mw/mds/mds_plat/location_manager_api/group" filter="!test"/>
+
+</component>
+<component id="metadata_engine_api" name="Metadata Engine API" introduced="^2" class="api" filter="s60">
+<unit bldFile="/mw/mds/mds_plat/metadata_engine_api/group" filter="!test"/>
+
+</component>
+<component id="content_listing_framework_collection_manager_api" name="Content Listing Framework Collection Manager API" introduced="^2" class="api" filter="s60">
+<meta rel="config">
+<defined condition="RD_MDS_2_5"/>
+</meta>
+<unit bldFile="/mw/mds/mds_plat/content_listing_framework_collection_manager_api/group" filter="!test"/>
+
+</component>
+<component id="content_listing_framework_extended_api" name="Content Listing Framework Extended API" introduced="^2" class="api" filter="s60">
+<meta rel="config">
+<defined condition="RD_MDS_2_5"/>
+</meta>
+<unit bldFile="/mw/mds/mds_plat/content_listing_framework_extended_api/group"/>
+</component>
+</collection>
+<collection id="mds_pub" name="Metadata Services Public Interfaces" level="int">
+<component id="content_listing_framework_api" name="Content Listing Framework API" introduced="^2" class="api" filter="s60">
+<meta rel="config">
+<defined condition="RD_MDS_2_5"/>
+</meta>
+<unit bldFile="/mw/mds/mds_pub/content_listing_framework_api/group" filter="!test"/>
+
+</component>
+</collection>
+<collection id="metadataengine" name="Metadata Engine" level="eng">
+<component id="metadataengine_common" filter="s60" name="Metadata Engine Common" introduced="^2">
+<unit bldFile="/mw/mds/metadataengine/common/group"/>
+</component>
+<component id="metadataengine_server" filter="s60" name="Metadata Engine Server" introduced="^2">
+<unit bldFile="/mw/mds/metadataengine/server/group"/>
+</component>
+<component id="metadataengine_client" filter="s60" name="Metadata Engine Client" introduced="^2">
+<unit bldFile="/mw/mds/metadataengine/client/group"/>
+</component>
+<component id="metadataengine_build" filter="s60" name="Metadata Engine Build" introduced="^2">
+<!--make this collection a single component, or split this bld.inf into the other units -->
+<unit bldFile="/mw/mds/metadataengine/group"/>
+</component>
+</collection>
+<collection id="locationmanager" name="Location Manager" level="mgr">
+<component id="locationtrail" filter="s60" name="Location Trail" introduced="^2">
+<unit bldFile="/mw/mds/locationmanager/locationtrail/group"/>
+</component>
+<component id="locationmanager_server" filter="s60" name="Location Manager Server" introduced="^2">
+<unit bldFile="/mw/mds/locationmanager/server/group"/>
+</component>
+<component id="locationmanager_client" filter="s60" name="Location Manager Client" introduced="^2">
+<unit bldFile="/mw/mds/locationmanager/client/group"/>
+</component>
+<component id="locationmanager_build" filter="s60" name="Location Manager Build" introduced="^2">
+<!--make this collection a single component, or split this bld.inf into the other units -->
+<unit bldFile="/mw/mds/locationmanager/group"/>
+</component>
+</collection>
+<collection id="contextengine" name="Context Engine" level="eng">
+<component id="contextengine_plugins" filter="s60" name="Context Engine Plugins" class="plugin" introduced="^2">
+<unit bldFile="/mw/mds/contextengine/plugins/group"/>
+</component>
+<component id="contextengine_build" filter="s60" name="Context Engine Build" introduced="^2">
+<!--make this collection a single component, or make this unit self-contained -->
+<unit bldFile="/mw/mds/contextengine/group"/>
+</component>
+</collection>
+<collection id="harvester" name="Harvester" level="eng">
+<component id="blacklistclient" filter="s60" name="Blacklist Client" introduced="^2">
+<unit bldFile="/mw/mds/harvester/blacklistclient/group"/>
+</component>
+<component id="blacklistserver" filter="s60" name="Blacklist Server" introduced="^2">
+<unit bldFile="/mw/mds/harvester/blacklistserver/group"/>
+</component>
+<component id="harvester_common" filter="s60" name="Harvester Common" introduced="^2">
+<unit bldFile="/mw/mds/harvester/common/group"/>
+</component>
+<component id="composerplugins" filter="s60" name="Composer Plugins" class="plugin" introduced="^2">
+<unit bldFile="/mw/mds/harvester/composerplugins/group"/>
+</component>
+<component id="harvesterplugins" filter="s60" name="Harvester Plugins" class="plugin" introduced="^2">
+<unit bldFile="/mw/mds/harvester/harvesterplugins/group"/>
+</component>
+<component id="monitorplugins" filter="s60" name="Monitor Plugins" class="plugin" introduced="^2">
+<unit bldFile="/mw/mds/harvester/monitorplugins/group"/>
+</component>
+<component id="harvester_server" filter="s60" name="Harvester Server" introduced="^2">
+<unit bldFile="/mw/mds/harvester/server/group"/>
+</component>
+<component id="harvester_client" filter="s60" name="Harvester Client" introduced="^2">
+<unit bldFile="/mw/mds/harvester/client/group"/>
+</component>
+<component id="harvester_build" filter="s60" name="Harvester Build" introduced="^2">
+<!-- split these exports into the other components -->
+<unit bldFile="/mw/mds/harvester/group"/>
+</component>
+</collection>
+<collection id="watchdog" name="Watchdog" level="server">
+<!-- collection is really a component. Move down a directory -->
+<component id="mdswatchdog" filter="s60" name="Metadata Watchdog" introduced="^2">
+<unit bldFile="/mw/mds/watchdog/group"/>
+</component>
+</collection>
+<collection id="clfwrapper" name="Content Listing Framework Wrapper" level="int">
+<!-- collection is really a component. Move down a directory -->
+<meta rel="config">
+<defined condition="RD_MDS_2_5"/>
+</meta>
+<component id="clfwrapper_build" filter="s60" name="CLF Wrapper Build" introduced="^2">
+<!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
+<!--<unit bldFile="clfwrapper/group"/>-->
+</component>
+</collection>
+<collection id="mds_info" name="Metadata Services Info" level="int">
+<component id="mds_build" filter="s60" name="Metadata Services Build" introduced="^2">
+<!-- consider distributiing this into the rest of the components in the package -->
+<unit bldFile="/mw/mds/group"/>
+</component>
+</collection>
+</package>
+<package id="mmuifw" level="specific" tech-domain="mm" name="Multimedia UI Framework" levels="mgr mdl util ui api">
+<collection id="mmuifw_plat" name="Multimedia UI Framework Platform Interfaces" level="api">
+<component id="alf_widgetfactory_api" name="ALF Widget Factory API" class="api" filter="s60">
+<unit bldFile="/mw/mmuifw/mmuifw_plat/alf_widgetfactory_api/group"/>
+</component>
+<component id="alf_widgetutils_api" name="ALF Widget Utils API" class="api" filter="s60">
+<unit bldFile="/mw/mmuifw/mmuifw_plat/alf_widgetutils_api/group"/>
+</component>
+<component id="alf_widgetmodel_api" name="ALF Widget Model API" class="api" filter="s60">
+<unit bldFile="/mw/mmuifw/mmuifw_plat/alf_widgetmodel_api/group"/>
+</component>
+<component id="osn_container_api" name="OSN Container API" class="api" filter="s60">
+<unit bldFile="/mw/mmuifw/mmuifw_plat/osn_container_api/group"/>
+</component>
+<component id="osn_global_api" name="OSN Global API" class="api" filter="s60">
+<unit bldFile="/mw/mmuifw/mmuifw_plat/osn_global_api/group"/>
+</component>
+<component id="osn_string_api" name="OSN String API" class="api" filter="s60">
+<unit bldFile="/mw/mmuifw/mmuifw_plat/osn_string_api/group"/>
+</component>
+<component id="alf_resourcepool_api" name="ALF Resource Pool API" class="api" filter="s60">
+<unit bldFile="/mw/mmuifw/mmuifw_plat/alf_resourcepool_api/group"/>
+</component>
+<component id="alf_containerwidget_api" name="ALF Container Widget API" class="api" filter="s60">
+<unit bldFile="/mw/mmuifw/mmuifw_plat/alf_containerwidget_api/group"/>
+</component>
+<component id="alf_viewwidget_api" name="ALF View Widget API" class="api" filter="s60">
+<unit bldFile="/mw/mmuifw/mmuifw_plat/alf_viewwidget_api/group"/>
+</component>
+<component id="alf_scrollbarwidget_api" name="ALF Scrollbar Widget API" class="api" filter="s60">
+<unit bldFile="/mw/mmuifw/mmuifw_plat/alf_scrollbarwidget_api/group"/>
+</component>
+<component id="alf_customlayoutmanagers_api" name="ALF Custom Layout Managers API" class="api" filter="s60">
+<unit bldFile="/mw/mmuifw/mmuifw_plat/alf_customlayoutmanagers_api/group"/>
+</component>
+<component id="gesturehelper_api" name="Gesture Helper API" class="api" filter="s60">
+<unit bldFile="/mw/mmuifw/mmuifw_plat/gesturehelper_api/group"/>
+</component>
+<component id="mul_coverflowwidget_api" name="MUL Coverflow Widget API" class="api" filter="s60">
+<unit bldFile="/mw/mmuifw/mmuifw_plat/mul_coverflowwidget_api/group"/>
+</component>
+<component id="mul_datamodel_api" name="MUL Data Model API" class="api" filter="s60">
+<unit bldFile="/mw/mmuifw/mmuifw_plat/mul_datamodel_api/group"/>
+</component>
+<component id="mul_sliderwidget_api" name="MUL Slider Widget API" class="api" filter="s60">
+<unit bldFile="/mw/mmuifw/mmuifw_plat/mul_sliderwidget_api/group"/>
+</component>
+<component id="mul_widget_api" name="MUL Widget API" class="api" filter="s60">
+<unit bldFile="/mw/mmuifw/mmuifw_plat/mul_widget_api/group"/>
+</component>
+</collection>
+<collection id="mmuifw_info" name="Multimedia UI Framework Info" level="ui">
+<component id="mmuifw_build" filter="s60" name="Multimedia UI Framework Build">
+<!-- Move exports into other componetns or remove all #includes and make this a ROM component -->
+<unit bldFile="/mw/mmuifw/group"/>
+</component>
+</collection>
+<collection id="osncore" name="OS Neutral Library Core" level="util">
+<!-- collection is really a component. Move down a directory -->
+<component id="osncore_build" filter="s60" name="OSN Core Build">
+<unit bldFile="/mw/mmuifw/osncore/group"/>
+</component>
+</collection>
+<collection id="alfwidgetutils" name="Accelerated LAF Widget Utils" level="ui">
+<!-- collection is really a component. Move down a directory -->
+<component id="alfwidgetutils_build" filter="s60" name="ALF Widget Utils">
+<unit bldFile="/mw/mmuifw/alfwidgetutils/group"/>
+</component>
+</collection>
+<collection id="resourcepool" name="Resource Pool" level="util">
+<!-- collection is really a component. Move down a directory -->
+<component id="alfresourcepool" filter="s60" name="ALF Resource Pool">
+<unit bldFile="/mw/mmuifw/resourcepool/group"/>
+</component>
+</collection>
+<collection id="widgetmodel" name="Widget Model" level="mdl">
+<!-- collection is really a component. Move down a directory -->
+<component id="widgetmodel_build" filter="s60" name="Widget Model Build">
+<unit bldFile="/mw/mmuifw/widgetmodel/group"/>
+</component>
+</collection>
+<collection id="mulwidgets" name="MUL Widgets" level="ui">
+<!-- should spell out MUL in the collection name -->
+<component id="mullogging" filter="s60" name="MUL Logging">
+<unit bldFile="/mw/mmuifw/mulwidgets/mullogging/group"/>
+</component>
+<component id="muldatamodel" filter="s60" name="MUL Data Model">
+<unit bldFile="/mw/mmuifw/mulwidgets/muldatamodel/group"/>
+</component>
+<component id="mulwidgets_common" filter="s60" name="MUL Common Utils">
+<unit bldFile="/mw/mmuifw/mulwidgets/common/group"/>
+</component>
+<component id="gesturehelper" filter="s60" name="Gesture Helper">
+<unit bldFile="/mw/mmuifw/mulwidgets/gesturehelper/group"/>
+</component>
+<component id="mulcoverflowwidget" filter="s60" name="MUL CoverFlow Widget">
+<unit bldFile="/mw/mmuifw/mulwidgets/mulcoverflowwidget/group"/>
+</component>
+<component id="mulsliderwidget" filter="s60" name="MUL Slider Widget">
+<unit bldFile="/mw/mmuifw/mulwidgets/mulsliderwidget/group"/>
+</component>
+<component id="alfviewwidget" filter="s60" name="ALF View Widget">
+<unit bldFile="/mw/mmuifw/mulwidgets/alfviewwidget/group"/>
+</component>
+<component id="alfcontainerwidget" filter="s60" name="ALF Container Widget">
+<unit bldFile="/mw/mmuifw/mulwidgets/alfcontainerwidget/group"/>
+</component>
+<component id="alfscrollbarwidget" filter="s60" name="ALF Scrollbar Widget">
+<unit bldFile="/mw/mmuifw/mulwidgets/alfscrollbarwidget/group"/>
+</component>
+</collection>
+</package>
+<package id="videoutils" level="specific" tech-domain="mm" name="Video Utils" levels="eng util if">
+<collection id="videoutils_plat" name="Video Utils Platform Interfaces" level="if">
+<component id="videoscheduler_api" name="Video Scheduler API" class="api" filter="s60">
+<unit bldFile="/mw/videoutils/videoutils_plat/videoscheduler_api/group"/>
+</component>
+<component id="videoconnutility_api" name="Video Connection Utility API" class="api" filter="s60">
+<unit bldFile="/mw/videoutils/videoutils_plat/videoconnutility_api/group"/>
+</component>
+<component id="videoplayer_constants_api" name="Videoplayer Constants API" class="api" filter="s60">
+<unit bldFile="/mw/videoutils/videoutils_plat/videoplayer_constants_api/group"/>
+</component>
+</collection>
+<collection id="videoscheduler" name="Video Scheduler" level="util">
+<component id="schedulerclient" filter="s60" name="Video Scheduler Client">
+<unit bldFile="/mw/videoutils/videoscheduler/schedulerclient/group"/>
+</component>
+<component id="schedulerserver" filter="s60" name="Video Scheduler Server">
+<unit bldFile="/mw/videoutils/videoscheduler/schedulerserver/group"/>
+</component>
+</collection>
+<collection id="videoconnutility" name="Video Connection Utility" level="util">
+<component id="connutilpsworker" filter="s60" name="Connection Utility Publish and Subscribe Worker">
+<unit bldFile="/mw/videoutils/videoconnutility/connutilpsworker/group"/>
+</component>
+<component id="video_connutility" filter="s60" name="Video Connection Utility">
+<unit bldFile="/mw/videoutils/videoconnutility/connutility/group"/>
+</component>
+</collection>
+<collection id="videoutils_info" name="Video Utils Info" level="if">
+
+</collection>
+</package>
+<package id="mmmw" level="generic" tech-domain="mm" name="Multimedia Middleware" levels="plugin framework server generic specific">
+<collection id="mmmw_plat" name="Multimedia Middleware Platform Interfaces" level="specific">
+<component id="multimedia_data_source_api" name="Multimedia Data Source API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
+</component>
+<component id="progressive_download_api" name="Progressive Download API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/progressive_download_api/group"/>
+</component>
+<component id="equalizer_ui_api" name="Equalizer UI API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
+</component>
+<component id="enhanced_media_client_api" name="Enhanced Media Client API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
+</component>
+<component id="stream_control_custom_command_api" name="Stream Control Custom Command API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
+</component>
+<component id="emc_buffer_source_api" name="EMC Buffer Source API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/emc_buffer_source_api/group"/>
+</component>
+<component id="emc_file_source_api" name="EMC File Source API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
+</component>
+<component id="audio_metadata_reader_api" name="Audio MetaData Reader API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
+</component>
+<component id="emc_progressive_download_source_api" name="EMC Progressive Download Source API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
+</component>
+<component id="emc_volume_effect_api" name="EMC Volume Effect API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
+</component>
+<component id="emc_balance_effect_api" name="EMC Balance Effect API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/emc_balance_effect_api/group"/>
+</component>
+<component id="emc_descriptor_source_api" name="EMC Descriptor Source API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/emc_descriptor_source_api/group"/>
+</component>
+<component id="emc_drm_config_intfc_api" name="EMC DRM Config Intfc API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
+</component>
+<component id="voip_audio_services_api" name="VoIP Audio Services" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/voip_audio_services_api/group"/>
+</component>
+<component id="configuration_components_factory_api" name="Configuration Components Factory API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
+</component>
+<component id="audio_output_control_utility_api" name="Audio Output Control Utility API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/audio_output_control_utility_api/group"/>
+</component>
+<component id="audio_output_control_utility_proxy_api" name="Audio Output Control Utility Proxy API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
+</component>
+<component id="emc_audio_effects_api" name="EMC Audio Effects API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
+</component>
+<component id="call_audio_control_api" name="Call AudioControl API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/call_audio_control_api/group"/>
+</component>
+<component id="radio_utilities_api" name="Radio Utilities API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/radio_utilities_api/group"/>
+</component>
+<component id="radio_preset_utilities_api" name="Radio Preset Utilities API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
+</component>
+<component id="radio_monitor_api" name="Radio Monitor API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
+</component>
+<component id="thumbnail_engine_api" name="Thumbnail Engine API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/thumbnail_engine_api/group"/>
+</component>
+<component id="telephony_multimedia_service_api" name="Telephony Multimedia Service API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
+
+</component>
+</collection>
+<collection id="mmfenh" name="MMF Enhancements" level="generic">
+<component id="advancedaudiocontroller" filter="s60" name="Advanced Audio Controllers" class="plugin">
+<unit bldFile="/mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
+</component>
+<component id="audiooutputcontrolutility" filter="s60" name="Audio Output Control Utility">
+<unit bldFile="/mw/mmmw/mmfenh/audiooutputcontrolutility/group"/>
+</component>
+<component id="configurationcomponentsfactory" filter="s60" name="Configuration Components Factory">
+<unit bldFile="/mw/mmmw/mmfenh/configurationcomponentsfactory/group"/>
+</component>
+<component id="enhancedaudioplayerutility" filter="s60" name="Enhanced Audio Player Utility">
+<unit bldFile="/mw/mmmw/mmfenh/enhancedaudioplayerutility/group"/>
+</component>
+<component id="enhancedmediaclient" filter="s60" name="Enhanced Media Client">
+<unit bldFile="/mw/mmmw/mmfenh/enhancedmediaclient/group"/>
+</component>
+<component id="profilesettingsmonitor" filter="s60" name="Profile Settings Monitor">
+<unit bldFile="/mw/mmmw/mmfenh/profilesettingsmonitor/group"/>
+</component>
+<component id="progressivedownload" filter="s60" name="Progressive Download">
+<unit bldFile="/mw/mmmw/mmfenh/progressivedownload/group"/>
+</component>
+
+</collection>
+<collection id="mm_fw" name="Multimedia Frameworks" level="framework">
+<!-- Id needs to be unique, mmfw already in use -->
+<!-- Placeholder for OpenAX AL and other stuff -->
+</collection>
+<collection id="mmserv" name="Multimedia Services" level="specific">
+<component id="audioeffectsui" filter="s60" name="Audio Effects UI">
+<unit bldFile="/mw/mmmw/mmserv/audioeffectsui/group"/>
+</component>
+<component id="callaudiocontrol" filter="s60" name="Call Audio Control">
+<unit bldFile="/mw/mmmw/mmserv/callaudiocontrol/group"/>
+</component>
+<component id="metadatautility" filter="s60" name="Metadata Utility">
+<unit bldFile="/mw/mmmw/mmserv/metadatautility/group"/>
+</component>
+<component id="radioutility" filter="s60" name="Radio Utility">
+<unit bldFile="/mw/mmmw/mmserv/radioutility/group"/>
+</component>
+<component id="thumbnailengine" filter="s60" name="Thumbnail Engine" introduced="^2">
+<unit bldFile="/mw/mmmw/mmserv/thumbnailengine/group"/>
+</component>
+<component id="tms" filter="s60" name="Telephony Multimedia Service" introduced="^3">
+<unit bldFile="/mw/mmmw/mmserv/tms/group"/>
+</component>
+<component id="voipaudioservices" filter="s60" name="VoIP Audio Services">
+<unit bldFile="/mw/mmmw/mmserv/voipaudioservices/group"/>
+</component>
+<component id="lib3gpextparser" filter="s60" name="3GP Extension Metadata Parser Library">
+<unit bldFile="/mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group" filter="sf_build"/>
+</component>
+</collection>
+<collection id="mmmw_info" name="Multimedia Middleware Info" level="specific">
+
+<component id="mmmw_metadata" name="Multimedia Middleware Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="helix" level="generic" tech-domain="mm" name="Helix" levels="plugin framework server generic specific">
+<collection id="helix_ren" name="Helix Engine" level="framework">
+<!-- what does "ren" stand for? -->
+<component id="helix_stub" filter="s60" name="Helix Stub" class="api" introduced="^2">
+<unit bldFile="/mw/helix/helix_ren/helix_stub/group"/>
+</component>
+</collection>
+</package>
+<package id="camerasrv" level="specific" tech-domain="mm" name="Camera Services" levels="plugin fw api">
+<collection id="camerasrv_plat" name="Camera Services Platform Interfaces" level="api">
+<component id="media_recorder_sink_api" name="Media Recorder Sink API" class="api" filter="s60">
+<unit bldFile="/mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
+</component>
+<component id="cae_extentension_api" name="CAE Extension API" class="api" filter="s60">
+<unit bldFile="/mw/camerasrv/camerasrv_plat/cae_extentension_api/group"/>
+</component>
+<component id="camera_application_engine_api" name="Camera Application Engine API" class="api" filter="s60">
+<unit bldFile="/mw/camerasrv/camerasrv_plat/camera_application_engine_api/group" filter="!test"/>
+
+</component>
+<component id="custom_onboard_camera_api" name="Custom Onboard Camera API" class="api" filter="s60">
+<unit bldFile="/mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
+</component>
+<component id="imaging_configuration_manager_api" name="Imaging Configuration Manager API" class="api" filter="s60">
+<unit bldFile="/mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
+
+</component>
+<component id="media_recorder_api" name="Media Recorder API" class="api" filter="s60">
+<unit bldFile="/mw/camerasrv/camerasrv_plat/media_recorder_api/group" filter="!test"/>
+
+</component>
+<component id="3gp_file_composer_api" name="3GP File Composer API" class="api" filter="s60">
+<unit bldFile="/mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
+</component>
+<component id="asynchronous_file_saving_queue_api" name="Asynchronous File Saving Queue API" class="api" filter="s60">
+<unit bldFile="/mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/group" filter="!test"/>
+
+</component>
+</collection>
+<collection id="camappengine" name="Camera App Engine" level="fw">
+<!-- is this collection really a component? If so, move down a directory -->
+<component id="stillconverter" filter="s60" name="Still Image Converter">
+<!-- should separate this from parent engine's bld.inf -->
+<!-- <unit bldFile="camappengine/stillconverter/group"/> -->
+</component>
+<component id="camappengine_engine" filter="s60" name="Camera App Engine">
+<!-- should separate this from parent engine's bld.inf -->
+<!-- <unit bldFile="camappengine/engine/group"/> -->
+</component>
+<component id="asynchfilesavequeue" filter="s60" name="Asynch File Save Queue">
+<unit bldFile="/mw/camerasrv/camappengine/asynchfilesavequeue/group"/>
+</component>
+<component id="camappengine_build" filter="s60" name="Camera App Engine Build">
+<unit bldFile="/mw/camerasrv/camappengine/build"/>
+</component>
+</collection>
+<collection id="camcordermmfplugin" name="Camcorder MMF Plugin" level="plugin">
+<!-- collection is really a component. Should move down a directory -->
+<component id="camcordermmfplugin_build" filter="s60" name="Camcorder MMF Plugin Build" class="plugin">
+<unit bldFile="/mw/camerasrv/camcordermmfplugin/build"/>
+</component>
+</collection>
+<collection id="configmanagers" name="Config Managers" level="api">
+<component id="imagingconfigmanager" filter="s60" name="Imaging Config Manager">
+<unit bldFile="/mw/camerasrv/configmanagers/imagingconfigmanager/group"/>
+</component>
+</collection>
+<collection id="camerasrv_info" name="Camera Services Info" level="api">
+<component id="camerasrv_build" filter="s60" name="Camera Services Build">
+<!-- should split into individual bld.infs -->
+<unit bldFile="/mw/camerasrv/group"/>
+</component>
+</collection>
+</package>
+<package id="mmappfw" level="specific" tech-domain="mm" name="Multimedia App Framework" levels="fw utils if">
+<collection id="mmappfw_plat" name="Multimedia App Framework Platform Interfaces" level="if">
+<component id="collection_helper_api" name="Collection Helper API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
+</component>
+<component id="harvester_collection_mediator_api" name="Harvester Collection Mediator API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/group"/>
+</component>
+<component id="harvester_metadata_extractor_api" name="Harvester Metadata Extractor API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/group"/>
+</component>
+<component id="harvester_server_api" name="Harvester Server API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/harvester_server_api/group"/>
+</component>
+<component id="harvester_utility_api" name="Harvester Utility API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/harvester_utility_api/group"/>
+</component>
+<component id="playlist_engine_api" name="Playlist Engine API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/playlist_engine_api/group"/>
+</component>
+<component id="mtp_keys_api" name="MTP Keys API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mtp_keys_api/group"/>
+</component>
+<component id="mpx_collection_common_definition_api" name="MPX Collection Common Definition API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_collection_common_definition_api/group"/>
+</component>
+<component id="mpx_collection_utility_api" name="MPX Collection Utility API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/group"/>
+</component>
+<component id="mpx_common_api" name="MPX Common API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_common_api/group"/>
+</component>
+<component id="mpx_common_definition_api" name="MPX Common Definition API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_common_definition_api/group"/>
+</component>
+<component id="mpx_playback_common_definition_api" name="MPX Playback Common Definition API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_playback_common_definition_api/group"/>
+</component>
+<component id="mpx_playback_utility_api" name="MPX Playback Utility API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/group"/>
+</component>
+<component id="mpx_base_view_plugins_api" name="MPX Base View Plugins API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/group"/>
+</component>
+<component id="mpx_view_utility_api" name="MPX View Utility API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_view_utility_api/group"/>
+</component>
+<component id="mpx_albumart_utility_api" name="MPX Album Art Utility API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/group"/>
+</component>
+<component id="media_player_settings_engine_api" name="Media Player Settings Engine API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
+</component>
+<component id="mpx_backstepping_utility_api" name="MPX Backstepping Utility API" introduced="^1" class="api" filter="s60">
+<meta rel="config">
+<defined condition="IAD_INCLUDE_BACKSTEPPING"/>
+</meta>
+<!-- uncomment when configuration is put in place
+ <unit bldFile="mmappfw_plat/mpx_backstepping_utility_api/group"/> -->
+</component>
+<component id="asx_parser_api" name="ASX Parser API" introduced="^1" class="api" filter="s60">
+<meta rel="config">
+<defined condition="__WINDOWS_MEDIA"/>
+</meta>
+<!-- uncomment when configuration is put in place
+ <unit bldFile="mmappfw_plat/asx_parser_api/group"/> -->
+</component>
+<component id="playback_helper_api" name="Playback Helper API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/playback_helper_api/group"/>
+</component>
+<component id="videoplaylist_utility_api" name="Video Playlist Utility API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/videoplaylist_utility_api/group"/>
+</component>
+<component id="mmappfw_plat_build" name="Multimedia App Framework Platform Interface Build" introduced="^1" class="api" filter="s60">
+<!-- needed only for #ifdefs. Remove anmd uncomment above units when configuration is in place -->
+<unit bldFile="/mw/mmappfw/mmappfw_plat/group"/>
+</component>
+</collection>
+<collection id="mpx" name="Multimedia Player" level="fw">
+<component id="commonframework" filter="s60" name="MPX Common Framework" introduced="^1">
+<unit bldFile="/mw/mmappfw/mpx/commonframework/group"/>
+</component>
+<component id="playbackframework" filter="s60" name="MPX Playback Framework" introduced="^1">
+<unit bldFile="/mw/mmappfw/mpx/playbackframework/group"/>
+</component>
+<component id="mpxcollectionfw" filter="s60" name="MPX Collection Framework" introduced="^1">
+<unit bldFile="/mw/mmappfw/mpx/collectionframework/group"/>
+</component>
+<component id="mpxviewfw" filter="s60" name="MPX View Framework" introduced="^1">
+<unit bldFile="/mw/mmappfw/mpx/viewframework/group"/>
+</component>
+<component id="mpx_build" filter="s60" name="MPX Build" introduced="^1">
+<!-- Move the export to another component or remove the #includes from this one -->
+<unit bldFile="/mw/mmappfw/mpx/group"/>
+</component>
+</collection>
+<collection id="mmappcomponents" name="Multimedia App Components" level="utils">
+<component id="mmappcomponents_build" filter="s60" name="Multimedia App Components Build" introduced="^1">
+<!-- needed for #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
+ Can remove this once configuration is in place-->
+<unit bldFile="/mw/mmappfw/mmappcomponents/group"/>
+</component>
+<component id="collectionhelper" filter="s60" name="Media Player Collection Helper" introduced="^1">
+<unit bldFile="/mw/mmappfw/mmappcomponents/collectionhelper/group"/>
+</component>
+<component id="playlistengine" filter="s60" name="Playlist Engine" introduced="^1">
+<unit bldFile="/mw/mmappfw/mmappcomponents/playlistengine/group"/>
+</component>
+<component id="mpxharvester" filter="s60" name="Media Player Harvester" introduced="^1">
+<unit bldFile="/mw/mmappfw/mmappcomponents/harvester/group"/>
+</component>
+<component id="mmappcommonui" filter="s60" name="Multimedia App Common UI" introduced="^1">
+<unit bldFile="/mw/mmappfw/mmappcomponents/mmappcommonui/group"/>
+</component>
+<component id="mediaplayersettingsengine" filter="s60" name="Media Player Settings Engine" introduced="^1">
+<unit bldFile="/mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
+</component>
+<component id="audiofetcher" filter="s60" name="Audio Fetcher" class="plugin" introduced="^1">
+<meta rel="config">
+<defined condition="IAD_INCLUDE_AUDIOFETCHER"/>
+</meta>
+<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
+<!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
+</component>
+<component id="asxparser" filter="s60" name="ASX Parser" introduced="^1">
+<meta rel="config">
+<defined condition="__WINDOWS_MEDIA"/>
+</meta>
+<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
+<!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
+</component>
+<component id="playbackhelper" filter="s60" name="Playback Helper" introduced="^3">
+<unit bldFile="/mw/mmappfw/mmappcomponents/playbackhelper/group"/>
+</component>
+<component id="videoplaylistutility" filter="s60" name="Video Playlist Utility" introduced="^3">
+<unit bldFile="/mw/mmappfw/mmappcomponents/videoplaylistutility/group"/>
+</component>
+<component id="mmmtpdataprovider" filter="s60" name="Multimedia MTP Data Provider" introduced="^3">
+<unit bldFile="/mw/mmappfw/mmappcomponents/mmmtpdataprovider/group"/>
+</component>
+</collection>
+<collection id="mmappfw_info" name="Multimedia App Framework Info" level="if">
+<component id="mmappfw_build" filter="s60" name="Multimedia App Framework Build" introduced="^1">
+<!-- Move the export to another component or remove the #includes from this one -->
+<unit bldFile="/mw/mmappfw/group"/>
+</component>
+<component id="mmappfw_test" filter="s60,test,api_test,pref_test" name="Multimedia App Framework Test" purpose="development" introduced="^1">
+
+</component>
+</collection>
+</package>
+<package id="inputmethods" level="generic" tech-domain="ui" name="Input Methods" levels="plugin engine framework api">
+<collection id="inputmethods_pub" name="Input Methods Public Interfaces" level="api">
+<component id="ptiengine_iti_api" name="PTI Engine API" class="api" filter="s60">
+<meta rel="config">
+<defined condition="RD_INTELLIGENT_TEXT_INPUT"/>
+</meta>
+<unit bldFile="/mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
+</component>
+<component id="optical_character_recognition_api" name="Optical Character Recognition API" class="api" filter="s60">
+<unit bldFile="/mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
+</component>
+<component id="input_language_info_api" name="Input Language Info API" class="api" filter="s60">
+<unit bldFile="/mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
+</component>
+</collection>
+<collection id="inputmethods_plat" name="Input Methods Platform Interfaces" level="api">
+<component id="pen_input_server_api" name="Pen Input Server API" class="api" filter="s60">
+<unit bldFile="/mw/inputmethods/inputmethods_plat/pen_input_server_api/group" filter="!test"/>
+
+</component>
+<component id="ptiengine_hwr_api" name="PTI Engine Handwriting Recognition API" class="api" filter="s60">
+<unit bldFile="/mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group" filter="!test"/>
+
+</component>
+<component id="aknfep_settings_api" name="Avkon FEP Settings API" class="api" filter="s60">
+<unit bldFile="/mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
+</component>
+<component id="aknfep_status_api" name="Avkon FEP Status API" class="api" filter="s60">
+<meta rel="config">
+<defined condition="RD_INTELLIGENT_TEXT_INPUT"/>
+</meta>
+<unit bldFile="/mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
+</component>
+<component id="ptiengine_key_definations_api" name="PTI Engine Key Definitions API" class="api" filter="s60">
+<meta rel="config">
+<defined condition="RD_INTELLIGENT_TEXT_INPUT"/>
+</meta>
+<unit bldFile="/mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
+</component>
+<component id="aknfep_definitions_api" name="Avkon FEP Definitions API" class="api" filter="s60">
+<unit bldFile="/mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
+</component>
+<component id="aknfep_pen_support_api" name="Avkon FEP Pen Support API" class="api" filter="s60">
+<unit bldFile="/mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
+</component>
+<component id="ptiengine_indic_definitions_api" name="PTI Engine Indic Definitions API" class="api" filter="s60">
+<unit bldFile="/mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
+</component>
+<component id="aknfep_uiinterface_api" name="Avkon FEP UI Interface API" class="api" filter="s60">
+<unit bldFile="/mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group" filter="!test"/>
+
+</component>
+</collection>
+<collection id="textinput" name="Text Input" level="framework">
+<component id="ptienginev2" filter="s60" name="Predictive Text Input Engine">
+<meta rel="config">
+<defined condition="RD_INTELLIGENT_TEXT_INPUT"/>
+</meta>
+<!--uncomment when configuration is turned on and textinput_build is removed-->
+<!-- <unit bldFile="textinput/ptienginev2/group"/>-->
+</component>
+<component id="akninputlanguage" filter="s60" name="Avkon Input Language">
+<unit bldFile="/mw/inputmethods/textinput/akninputlanguage/group"/>
+</component>
+<component id="peninputarc" filter="s60" name="Pen Input Arc">
+<unit bldFile="/mw/inputmethods/textinput/peninputarc/group"/>
+</component>
+<component id="peninputcommonctrls" filter="s60" name="Pen Input Common Controls">
+<unit bldFile="/mw/inputmethods/textinput/peninputcommonctrls/group"/>
+</component>
+<component id="peninputhwrboxcn" filter="s60" name="Chinese Handwriting Recognition Box" class="plugin">
+<unit bldFile="/mw/inputmethods/textinput/peninputhwrboxcn/group"/>
+</component>
+<component id="peninputvkbcn" filter="s60" name="Chinese Virtual Keyboard" class="plugin">
+<unit bldFile="/mw/inputmethods/textinput/peninputvkbcn/group"/>
+</component>
+<component id="peninputcommonlayout" filter="s60" name="Pen Input Common Layout">
+<unit bldFile="/mw/inputmethods/textinput/peninputcommonlayout/group"/>
+</component>
+<component id="peninputgenerichwr" filter="s60" name="Pen Input Generic Handwriting Recognition" class="plugin">
+<unit bldFile="/mw/inputmethods/textinput/peninputgenerichwr/group"/>
+</component>
+<component id="peninputgenericvkb" filter="s60" name="Pen Input Generic Virtual Keyboard" class="plugin">
+<unit bldFile="/mw/inputmethods/textinput/peninputgenericvkb/group"/>
+</component>
+<component id="peninputcommonctrlsjp" filter="s60" name="Pen Input Common Controls Japanese">
+<unit bldFile="/mw/inputmethods/textinput/peninputcommonctrlsjp/group"/>
+</component>
+<component id="peninputhwrboxjp" filter="s60" name="Japanese Handwriting Recognition Box" class="plugin">
+<unit bldFile="/mw/inputmethods/textinput/peninputhwrboxjp/group"/>
+</component>
+<component id="peninputvkbjp" filter="s60" name="Japanese Virtual Keyboard" class="plugin">
+<unit bldFile="/mw/inputmethods/textinput/peninputvkbjp/group"/>
+</component>
+<component id="gslangplugin" filter="s60" name="GS Language Plugin" class="plugin">
+<unit bldFile="/mw/inputmethods/textinput/GSLangPlugin"/>
+</component>
+<component id="peninputgenericitut" filter="s60" name="Pen Input Generic ITU-T" class="plugin" introduced="^3">
+<unit bldFile="/mw/inputmethods/textinput/peninputgenericitut/group"/>
+</component>
+<component id="peninputhwrtrui" filter="s60" name="Pen Input Handwriting Recognition Training UI" class="plugin" introduced="^3">
+<unit bldFile="/mw/inputmethods/textinput/peninputhwrtrui/group"/>
+</component>
+<component id="peninputhwrfscn" filter="s60" name="Pen Input Chinese Full Screen Handwriting Recognition" class="plugin" introduced="^3">
+<unit bldFile="/mw/inputmethods/textinput/peninputhwrfscn/group"/>
+</component>
+<component id="peninputvkbkr" filter="s60" name="Pen Input Korean Virtual Keyboard" class="plugin" introduced="^3">
+<unit bldFile="/mw/inputmethods/textinput/peninputvkbkr/group"/>
+</component>
+<component id="peninputfingerhwr" filter="s60" name="Pen Input Finger Handwriting Recognition" class="plugin" introduced="^3">
+<unit bldFile="/mw/inputmethods/textinput/peninputfingerhwr/group"/>
+</component>
+<component id="peninputsplititut" filter="s60" name="Pen Input Split ITU-T" class="plugin" introduced="^3">
+<unit bldFile="/mw/inputmethods/textinput/peninputsplititut/group"/>
+</component>
+<component id="peninputsplitqwerty" filter="s60" name="Pen Input Split QWERTY" class="plugin" introduced="^3">
+<unit bldFile="/mw/inputmethods/textinput/peninputsplitqwerty/group"/>
+</component>
+<component id="textinput_build" filter="s60" name="Text Input Build">
+<!--needed for #ifdef, can be removed when configuration is implemented -->
+<unit bldFile="/mw/inputmethods/textinput/group"/>
+</component>
+</collection>
+<collection id="fep" name="FEP" level="engine">
+<component id="aknfep" filter="s60" name="Avkon FEP" class="plugin">
+<unit bldFile="/mw/inputmethods/fep/aknfep/group"/>
+</component>
+<component id="frontendprocessor" name="Front End Processor" purpose="mandatory">
+<unit bldFile="/mw/inputmethods/fep/frontendprocessor/group" mrp="/mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
+</component>
+</collection>
+<collection id="inputmethods_info" name="Input Methods Info" level="api">
+
+<component id="inputmethods_metadata" name="Input Methods Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="qt" level="generic" tech-domain="ui" name="Qt" levels="tool mw app">
+<collection id="qtconf" name="Qt Config" level="tool">
+<component id="qt_deviceconfiguration" name="Qt Device Configuration" class="config tool" introduced="^2">
+<unit bldFile="/mw/qt/src/s60installs/deviceconfiguration"/>
+</component>
+</collection>
+<collection id="qt_info" name="Qt Info" level="mw">
+<component id="qt_build" name="Qt Build" introduced="^2">
+<unit bldFile="/mw/qt" qt:proFile="projects.pro" qt:qmakeArgs="-r"/>
+</component>
+</collection>
+<collection id="qtdemos" name="Qt Demos" level="app">
+<component id="qtdemos_build" name="Qt Demos Build" introduced="^2" filter="qtdemos">
+<unit bldFile="/mw/qt/demos" qt:proFile="demos.pro" qt:qmakeArgs="-r"/>
+</component>
+</collection>
+<collection id="qtexamples" name="Qt Examples" level="app">
+<component id="qtexamples_build" name="Qt Examples Build" introduced="^2" filter="qtexamples">
+<unit bldFile="/mw/qt/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
+</component>
+</collection>
+<collection id="qt_tests" name="Qt Tests" level="app">
+<component id="qttestsauto" name="Qt Automated Tests" introduced="^2" filter="qttestsauto">
+<unit bldFile="/mw/qt/tests/auto" qt:proFile="qtpauto.pro" qt:makeArgs="-r"/>
+</component>
+<component id="qttestsbenchmarks" name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks">
+<unit bldFile="/mw/qt/tests/benchmarks" qt:proFile="benchmarks.pro" qt:qmakeArgs="-r"/>
+</component>
+</collection>
+</package>
+<package id="classicui" level="generic" tech-domain="ui" name="Classic UI" levels="base support server generic specific">
+<collection id="classicui_plat" name="Classic UI Platform Interfaces" level="specific">
+<component id="personalisation_framework_api" name="Personalisation Framework API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/personalisation_framework_api/group" filter="!test"/>
+
+</component>
+<component id="signal_pane_api" name="Signal Pane API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
+
+</component>
+<component id="japanese_reading_api" name="Japanese Reading API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/japanese_reading_api/group" filter="!test"/>
+
+</component>
+<component id="global_popup_priority_controller_api" name="Global Popup Priority Controller API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
+
+</component>
+<component id="item_finder_api" name="Item Finder API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/item_finder_api/group" filter="!test"/>
+
+</component>
+<component id="avkon_fonts_api" name="Avkon Fonts API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/avkon_fonts_api/group" filter="!test"/>
+
+</component>
+<component id="extended_utilities_api" name="Extended Utilities API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
+
+</component>
+<component id="personalisation_plugin_api" name="Personalisation Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
+</component>
+<component id="extended_aiw_criteria_api" name="Extended AIW Criteria API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
+
+</component>
+<component id="personalisation_application_api" name="Personalisation Application API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/personalisation_application_api/group"/>
+</component>
+<component id="volume_popup_api" name="Volume Popup API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
+
+</component>
+<component id="avkon_secondary_display_support_api" name="AVKON Secondary Display Support API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/avkon_secondary_display_support_api/group" filter="!test"/>
+
+</component>
+<component id="extended_setting_pages_api" name="Extended Setting Pages API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_setting_pages_api/group" filter="!test"/>
+
+</component>
+<component id="extended_lists_api" name="Extended Lists API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_lists_api/group" filter="!test"/>
+
+</component>
+<component id="input_block_api" name="Input Block API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/input_block_api/group" filter="!test"/>
+
+</component>
+<component id="avkon_ui_server_api" name="AVKON UI Server API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/avkon_ui_server_api/group" filter="!test"/>
+
+</component>
+<component id="number_grouping_api" name="Number Grouping API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/number_grouping_api/group" filter="!test"/>
+
+</component>
+<component id="extended_status_pane_api" name="Extended Status Pane API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_status_pane_api/group" filter="!test"/>
+
+</component>
+<component id="extended_notifiers_api" name="Extended Notifiers API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_notifiers_api/group" filter="!test"/>
+
+</component>
+<component id="task_list_api" name="Task List API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
+
+</component>
+<component id="personalisation_slide_show_dialog_api" name="Personalisation Slide Show Dialog API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
+</component>
+<component id="key_event_utilities_api" name="Key Event Utilities API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/key_event_utilities_api/group"/>
+</component>
+<component id="emergency_call_support_api" name="Emergency Call Support API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/emergency_call_support_api/group" filter="!test"/>
+
+</component>
+<component id="extended_dialogs_api" name="Extended Dialogs API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_dialogs_api/group"/>
+</component>
+<component id="legacy_ui_framework_headers_api" name="Legacy UI Framework Headers API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/legacy_ui_framework_headers_api/group"/>
+</component>
+<component id="extended_editors_api" name="Extended Editors API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_editors_api/group" filter="!test"/>
+
+</component>
+<component id="alarm_api" name="Alarm API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/alarm_api/group" filter="!test"/>
+
+</component>
+<component id="aiw_service_interface_base_api" name="AIW Service Interface Base API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/aiw_service_interface_base_api/group" filter="!test"/>
+
+</component>
+<component id="list_effects_api" name="List Effects API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/list_effects_api/group" filter="!test"/>
+
+</component>
+<component id="find_item_ui_api" name="Find Item UI API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/find_item_ui_api/group" filter="!test"/>
+
+</component>
+<component id="server_application_services_api" name="Server Application Services API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/server_application_services_api/group" filter="!test"/>
+
+</component>
+<component id="common_ui_settings_api" name="Common UI Settings API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/common_ui_settings_api/group"/>
+</component>
+<component id="aiw_service_interface_menu_api" name="AIW Service Interface Menu API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/aiw_service_interface_menu_api/group" filter="!test"/>
+
+</component>
+<component id="eikon_server_extension_client_api" name="EIKON Server Extension Client API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/eikon_server_extension_client_api/group" filter="!test"/>
+
+</component>
+<component id="skinnable_clock_api" name="Skinnable Clock API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/skinnable_clock_api/group" filter="!test"/>
+
+</component>
+<component id="battery_pane_api" name="Battery Pane API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/battery_pane_api/group" filter="!test"/>
+
+</component>
+<component id="fep_document_navigation_api" name="FEP Document Navigation API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
+</component>
+<component id="personalisation_localised_texts_api" name="Personalisation Localised Texts API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
+</component>
+<component id="memory_card_ui_api" name="Memory Card UI API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
+
+</component>
+<component id="avkon_status_api" name="AVKON Status API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/avkon_status_api/group"/>
+</component>
+<component id="application_switching_api" name="Application Switching API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/application_switching_api/group" filter="!test"/>
+
+</component>
+<component id="avkon_localised_texts_api" name="AVKON Localised Texts API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/avkon_localised_texts_api/group"/>
+</component>
+<component id="avkon_secondary_display_api" name="AVKON Secondary Display API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/avkon_secondary_display_api/group"/>
+</component>
+<component id="extended_animation_api" name="Extended Animation API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_animation_api/group" filter="!test"/>
+
+</component>
+<component id="extended_notes_api" name="Extended Notes API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_notes_api/group" filter="!test"/>
+
+</component>
+<component id="screensaver_animation_plugin_definitions_api" name="Screensaver Animation Plugin Definitions API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/screensaver_animation_plugin_definitions_api/group"/>
+</component>
+<component id="text_scroller_api" name="Text Scroller API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/text_scroller_api/group" filter="!test"/>
+
+</component>
+<component id="custom_cursors_api" name="Custom Cursors API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/custom_cursors_api/group" filter="!test"/>
+
+</component>
+<component id="screensaver_settings_api" name="Screensaver Settings API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/screensaver_settings_api/group"/>
+</component>
+<component id="global_window_priorities_api" name="Global Window Priorities API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/global_window_priorities_api/group"/>
+</component>
+<component id="extended_indicators_api" name="Extended Indicators API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_indicators_api/group" filter="!test"/>
+
+</component>
+<component id="special_character_table_api" name="Special Character Table API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/special_character_table_api/group" filter="!test"/>
+
+</component>
+<component id="avkon_settings_api" name="AVKON Settings API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/avkon_settings_api/group"/>
+</component>
+<component id="extended_sounds_api" name="Extended Sounds API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_sounds_api/group"/>
+</component>
+<component id="themes_settings_api" name="Themes Settings API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/themes_settings_api/group"/>
+</component>
+<component id="media_shared_document_api" name="Media Shared Document API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/media_shared_document_api/group" filter="!test"/>
+
+</component>
+<component id="extended_queries_api" name="Extended Queries API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_queries_api/group"/>
+</component>
+<component id="phone_number_text_utilities_api" name="Phone Number Text Utilities API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
+
+</component>
+<component id="screensaver_runtime_api" name="Screensaver Runtime API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/screensaver_runtime_api/group"/>
+</component>
+<component id="extended_scroller_api" name="Extended Scroller API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_scroller_api/group"/>
+</component>
+<component id="key_rotator_api" name="Key Rotator API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/key_rotator_api/group" filter="!test"/>
+
+</component>
+<component id="extended_grids_api" name="Extended Grids API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_grids_api/group" filter="!test"/>
+
+</component>
+<component id="generic_parameter_api" name="Generic Parameter API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/generic_parameter_api/group" filter="!test"/>
+
+</component>
+<component id="indicator_touch_observer_api" name="Indicator Touch Observer API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/indicator_touch_observer_api/group"/>
+</component>
+<component id="popup_form_api" name="Popup Form API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/popup_form_api/group" filter="!test"/>
+
+</component>
+<component id="stylus_activated_popup_api" name="Stylus Activated Pop-up API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/stylus_activated_popup_api/group" filter="!test"/>
+
+</component>
+<component id="indicator_plugin_api" name="Indicator Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/indicator_plugin_api/group" filter="!test"/>
+
+</component>
+<component id="layout_configuration_api" name="Layout Configuration API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/layout_configuration_api/group" filter="!test"/>
+
+</component>
+<component id="common_file_dialogs_filter_factory_api" name="Common File Dialogs Filter Factory API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group" filter="!test"/>
+
+</component>
+<component id="avkon_anim_dll_api" name="AVKON Anim DLL API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/avkon_anim_dll_api/group"/>
+</component>
+<component id="extended_initialization_api" name="Extended Initialization API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_initialization_api/group" filter="!test"/>
+
+</component>
+<component id="long_tap_animation_api" name="Long Tap Animation API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/long_tap_animation_api/group" filter="!test"/>
+
+</component>
+<component id="extended_ui_framework_definitions_api" name="Extended UI Framework Definitions API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_ui_framework_definitions_api/group"/>
+</component>
+<component id="extended_buttons_api" name="Extended Buttons API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_buttons_api/group" filter="!test"/>
+
+</component>
+<component id="aiw_provider_utility_api" name="AIW Provider Utility API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/aiw_provider_utility_api/group" filter="!test"/>
+
+</component>
+<component id="transition_effect_parameters_api" name="Transition Effect Parameters API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/transition_effect_parameters_api/group" filter="!test"/>
+
+</component>
+<component id="extended_input_capabilities_api" name="Extended Input Capabilities API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_input_capabilities_api/group" filter="!test"/>
+
+</component>
+<component id="uikon_status_api" name="UIKON Status API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/uikon_status_api/group"/>
+</component>
+<component id="transition_effect_utilities_api" name="Transition Effect Utilities API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/transition_effect_utilities_api/group" filter="!test"/>
+
+</component>
+<component id="pointer_event_modifier_api" name="Pointer Event Modifier API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/pointer_event_modifier_api/group" filter="!test"/>
+
+</component>
+<component id="avkon_testability_api" name="AVKON Testability API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/avkon_testability_api/group"/>
+</component>
+<component id="ganes_api" name="ganes_api" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/ganes_api/group"/>
+</component>
+<component id="ode_api" name="Ode API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/ode_api/group"/>
+</component>
+<component id="physics_api" name="Physics API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/physics_api/group"/>
+</component>
+<component id="touch_pane_api" name="Touch Pane API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/touch_pane_api/group" filter="!test"/>
+
+</component>
+<component id="touch_pane_observer_api" name="Touch Pane Observer API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/touch_pane_observer_api/group"/>
+</component>
+<component id="alternate_fs_api" name="Alternate FS API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/alternate_fs_api/group"/>
+</component>
+<component id="discreet_popup_api" name="Discreet Popup API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/discreet_popup_api/group"/>
+</component>
+<component id="touch_gesture_framework_api" name="Touch Gesture Framework API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/touch_gesture_framework_api/group"/>
+<!-- should this be commented out? -->
+<!--<unit bldFile="classicui_plat/touch_gesture_framework_api/tsrc/group" filter="test,api_test"/> -->
+</component>
+<component id="extended_options_menu_api" name="Extended Options Menu API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
+
+</component>
+</collection>
+<collection id="classicui_pub" name="Classic UI Public Interfaces" level="specific">
+<component id="input_frame_api" name="Input Frame API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/input_frame_api/group" filter="!test"/>
+
+</component>
+<component id="window_server_event_observer_api" name="Window Server Event Observer API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/window_server_event_observer_api/group" filter="!test"/>
+
+</component>
+<component id="application_framework_api" name="Application Framework API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/application_framework_api/group" filter="!test"/>
+
+</component>
+<component id="scroller_api" name="Scroller API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/scroller_api/group" filter="!test"/>
+
+</component>
+<component id="ui_framework_utilities_api" name="UI Framework Utilities API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/ui_framework_utilities_api/group" filter="!test"/>
+
+</component>
+<component id="ui_framework_definitions_api" name="UI Framework Definitions API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/ui_framework_definitions_api/group" filter="!test"/>
+
+</component>
+<component id="buttons_api" name="Buttons API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/buttons_api/group" filter="!test"/>
+
+</component>
+<component id="queries_api" name="Queries API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/queries_api/group" filter="!test"/>
+
+</component>
+<component id="aiw_generic_parameter_api" name="AIW Generic Parameter API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/aiw_generic_parameter_api/group" filter="!test"/>
+
+</component>
+<component id="editors_api" name="Editors API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/editors_api/group" filter="!test"/>
+
+</component>
+<component id="common_file_dialogs_api" name="Common File Dialogs API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/common_file_dialogs_api/group" filter="!test"/>
+
+</component>
+<component id="dialog_shutter_api" name="Dialog Shutter API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/dialog_shutter_api/group" filter="!test"/>
+
+</component>
+<component id="fonts_api" name="Fonts API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/fonts_api/group" filter="!test"/>
+
+</component>
+<component id="screen_clearer_api" name="Screen Clearer API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/screen_clearer_api/group" filter="!test"/>
+
+</component>
+<component id="notifiers_api" name="Notifiers API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/notifiers_api/group" filter="!test"/>
+
+</component>
+<component id="notes_api" name="Notes API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/notes_api/group" filter="!test"/>
+
+</component>
+<component id="screen_saver_api" name="Screen Saver API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/screen_saver_api/group" filter="!test"/>
+
+</component>
+<component id="status_pane_api" name="Status Pane API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/status_pane_api/group" filter="!test"/>
+
+</component>
+<component id="base_controls_api" name="Base Controls API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/base_controls_api/group" filter="!test"/>
+
+</component>
+<component id="grids_api" name="Grids API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/grids_api/group" filter="!test"/>
+
+</component>
+<component id="context_pane_api" name="Context Pane API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/context_pane_api/group" filter="!test"/>
+
+</component>
+<component id="lists_api" name="Lists API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/lists_api/group" filter="!test"/>
+
+</component>
+<component id="popups_api" name="Popups API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/popups_api/group" filter="!test"/>
+
+</component>
+<component id="misc_controls_api" name="Misc Controls API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/misc_controls_api/group" filter="!test"/>
+
+</component>
+<component id="keylock_api" name="Keylock API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/keylock_api/group" filter="!test"/>
+
+</component>
+<component id="options_menu_api" name="Options Menu API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/options_menu_api/group" filter="!test"/>
+
+</component>
+<component id="hierarchical_lists_api" name="Hierarchical Lists API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/hierarchical_lists_api/group" filter="!test"/>
+
+</component>
+<component id="navigation_pane_api" name="Navigation Pane API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/navigation_pane_api/group" filter="!test"/>
+
+</component>
+<component id="tabs_api" name="Tabs API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/tabs_api/group" filter="!test"/>
+
+</component>
+<component id="title_pane_touch_observer_api" name="Title Pane Touch Observer API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/title_pane_touch_observer_api/group"/>
+</component>
+<component id="choice_list_api" name="Choice List API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/choice_list_api/group" filter="!test"/>
+
+</component>
+<component id="info_popup_note_api" name="Info Popup Note API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/info_popup_note_api/group" filter="!test"/>
+
+</component>
+<component id="setting_pages_api" name="Setting Pages API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/setting_pages_api/group" filter="!test"/>
+
+</component>
+<component id="screen_mode_api" name="Screen Mode API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/screen_mode_api/group" filter="!test"/>
+
+</component>
+<component id="indicators_api" name="Indicators API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/indicators_api/group" filter="!test"/>
+
+</component>
+<component id="error_ui_api" name="Error UI API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/error_ui_api/group" filter="!test"/>
+
+</component>
+<component id="animation_api" name="Animation API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/animation_api/group" filter="!test"/>
+
+</component>
+<component id="searchfield_api" name="Searchfield API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/searchfield_api/group" filter="!test"/>
+
+</component>
+<component id="labels_api" name="Labels API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/labels_api/group" filter="!test"/>
+
+</component>
+<component id="hotkeys_api" name="Hotkeys API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/hotkeys_api/group" filter="!test"/>
+
+</component>
+<component id="initialization_api" name="Initialization API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/initialization_api/group" filter="!test"/>
+
+</component>
+<component id="volume_control_api" name="Volume Control API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/volume_control_api/group" filter="!test"/>
+
+</component>
+<component id="title_pane_api" name="Title Pane API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/title_pane_api/group" filter="!test"/>
+
+</component>
+<component id="sounds_api" name="Sounds API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/sounds_api/group" filter="!test"/>
+
+</component>
+<component id="aiw_service_handler_api" name="AIW Service Handler API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/aiw_service_handler_api/group" filter="!test"/>
+
+</component>
+<component id="aiw_criteria_api" name="AIW Criteria API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/aiw_criteria_api/group" filter="!test"/>
+
+</component>
+<component id="touch_ui_utilities_api" name="Touch UI Utilities API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/touch_ui_utilities_api/group" filter="!test"/>
+
+</component>
+<component id="generic_button_api" name="Generic Button API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/generic_button_api/group" filter="!test"/>
+
+</component>
+<component id="form_api" name="Form API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/form_api/group" filter="!test"/>
+
+</component>
+<component id="uikon_core_controls" name="Uikon Core Controls" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/uikon_core_controls/group" filter="!test"/>
+
+</component>
+<component id="calendar_api" name="Calendar API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/calendar_api/group"/>
+</component>
+<component id="toolbar_api" name="Toolbar API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/toolbar_api/group" filter="!test"/>
+
+</component>
+<component id="server_application_api" name="Server Application API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/server_application_api/group"/>
+</component>
+<component id="slider_api" name="Slider API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/slider_api/group" filter="!test"/>
+
+</component>
+<component id="private_ui_framework_api" name="Private UI Framework API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/private_ui_framework_api/group" filter="!test"/>
+
+</component>
+<component id="dialogs_api" name="Dialogs API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/dialogs_api/group" filter="!test"/>
+
+</component>
+<component id="document_handler_api" name="Document handler API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/document_handler_api/group"/>
+</component>
+<component id="images_api" name="Images API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/images_api/group" filter="!test"/>
+
+</component>
+<component id="stylus_popup_menu_api" name="Stylus Pop-up Menu API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/stylus_popup_menu_api/group" filter="!test"/>
+
+</component>
+<component id="information_preview_popup_api" name="Information Preview Popup API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/information_preview_popup_api/group" filter="!test"/>
+
+</component>
+<component id="intermediate_state_api" name="Intermediate State API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/intermediate_state_api/group"/>
+</component>
+<component id="help_launcher_api" name="Help Launcher API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/help_launcher_api/group"/>
+</component>
+</collection>
+<collection id="ode" name="Open Dynamics Engine" level="support">
+<!-- the collection is really a component. Move down a directory.-->
+<component id="ode_build" filter="s60" name="ODE">
+<unit bldFile="/mw/classicui/ode/group"/>
+</component>
+</collection>
+<collection id="uifw" name="UI Framework" level="server">
+<component id="uiklaf" filter="s60" name="Uikon Look-and-Feel">
+<unit bldFile="/mw/classicui/uifw/uiklaf/group"/>
+</component>
+<component id="eikctl" filter="s60" name="Eikon Controls">
+<unit bldFile="/mw/classicui/uifw/eikctl/group"/>
+</component>
+<component id="avkon" filter="s60" name="Avkon">
+<!-- can only have one unit. Split into 3 components, or #include all from same bld.inf -->
+<unit bldFile="/mw/classicui/uifw/avkon/aknphysics/group"/>
+<unit bldFile="/mw/classicui/uifw/avkon/group"/>
+<unit bldFile="/mw/classicui/uifw/avkon/aknconf/group"/>
+</component>
+<component id="eikstd" filter="s60" name="Eikon Standard">
+<unit bldFile="/mw/classicui/uifw/eikstd/group"/>
+</component>
+<component id="aknglobalui" filter="s60" name="Avkon Global UI">
+<unit bldFile="/mw/classicui/uifw/aknglobalui/group"/>
+</component>
+<component id="ganes" filter="s60" name="Ganes">
+<unit bldFile="/mw/classicui/uifw/ganes/group"/>
+</component>
+</collection>
+<collection id="commonuis" name="Common UIs" level="specific">
+<component id="commonui" filter="s60" name="Common UI">
+<unit bldFile="/mw/classicui/commonuis/commonui/group"/>
+</component>
+<component id="commondialogs" filter="s60" name="Common Dialogs">
+<unit bldFile="/mw/classicui/commonuis/commondialogs/group"/>
+</component>
+</collection>
+<collection id="applicationinterworkingfw" name="Application Interworking Framework" level="generic">
+<component id="aifwservicehandler" filter="s60" name="Application Interworking Service Handler">
+<unit bldFile="/mw/classicui/applicationinterworkingfw/servicehandler/group"/>
+</component>
+</collection>
+<collection id="psln" name="Personalization" level="specific">
+<!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
+<component id="psln_build" filter="s60" name="Personalization Build">
+<unit bldFile="/mw/classicui/psln/group"/>
+</component>
+</collection>
+<collection id="commonadapter" name="Common Adapter" level="support">
+<!-- the collection is really a component. Move down a directory.-->
+<component id="commonadapter_build" filter="s60" name="Common Adapter Build">
+<unit bldFile="/mw/classicui/commonadapter/group"/>
+</component>
+</collection>
+<collection id="akntouchgesturefw" name="Avkon Touch Gesture Framework" level="generic">
+<!-- the collection is really a component. Move down a directory.-->
+<component id="akntouchgesturefw_build" filter="s60" name="Avkon Touch Gesture Framework Build" introduced="^3">
+<unit bldFile="/mw/classicui/akntouchgesturefw/group"/>
+</component>
+</collection>
+<collection id="uiutils" name="UI Utils" level="specific">
+<component id="localizer" filter="s60" name="Directory Localizer">
+<unit bldFile="/mw/classicui/uiutils/localizer/group"/>
+</component>
+<component id="findutil" filter="s60" name="Find Utility">
+<unit bldFile="/mw/classicui/uiutils/findutil/group"/>
+</component>
+<component id="gamerecognizer" filter="s60" name="Game Recognizer" class="plugin">
+<unit bldFile="/mw/classicui/uiutils/gamerecognizer/group"/>
+</component>
+<component id="aknjapanesereading" filter="s60" name="Avkon Japanese Reading">
+<unit bldFile="/mw/classicui/uiutils/aknjapanesereading/group"/>
+</component>
+</collection>
+<collection id="commonuisupport" name="Common UI Support" level="support">
+<component id="uikon" name="Uikon" introduced="6.0" purpose="mandatory">
+<unit bldFile="/mw/classicui/commonuisupport/uikon/group" mrp="/mw/classicui/commonuisupport/uikon/group/app-framework_uikon.mrp"/>
+</component>
+<component id="errorresolverdata" name="Error Resolver Data" purpose="mandatory">
+<unit bldFile="/mw/classicui/commonuisupport/errorresolverdata/group" mrp="/mw/classicui/commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
+</component>
+<component id="uilaf" name="UI Look and Feel" introduced="6.0" purpose="mandatory">
+<unit bldFile="/mw/classicui/commonuisupport/uilaf/GROUP" mrp="/mw/classicui/commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
+</component>
+<component id="grid" name="Grid" purpose="optional">
+<unit bldFile="/mw/classicui/commonuisupport/grid/group" mrp="/mw/classicui/commonuisupport/grid/group/app-framework_grid.mrp"/>
+</component>
+<component id="uifwsdocs" name="UI Frameworks Documentation" purpose="development" class="doc">
+<unit mrp="/mw/classicui/commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
+</component>
+</collection>
+<collection id="lafagnosticuifoundation" name="Look-and-Feel Agnostic UI Foundation" level="base">
+<component id="cone" name="Control Environment" purpose="mandatory">
+<unit bldFile="/mw/classicui/lafagnosticuifoundation/cone/group" mrp="/mw/classicui/lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
+</component>
+<component id="graphicseffects" name="Graphics Effects" introduced="9.2" purpose="optional">
+<unit bldFile="/mw/classicui/lafagnosticuifoundation/graphicseffects/group" mrp="/mw/classicui/lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
+</component>
+<component id="uigraphicsutils" name="UI Graphics Utilities" purpose="mandatory">
+<unit bldFile="/mw/classicui/lafagnosticuifoundation/uigraphicsutils/group" mrp="/mw/classicui/lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
+</component>
+<component id="clockanim" name="Clock" purpose="optional" class="plugin">
+<unit bldFile="/mw/classicui/lafagnosticuifoundation/clockanim/group" mrp="/mw/classicui/lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
+</component>
+<component id="bmpanimation" name="BMP Animation" introduced="6.0" purpose="optional">
+<unit bldFile="/mw/classicui/lafagnosticuifoundation/bmpanimation/group" mrp="/mw/classicui/lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
+</component>
+<component id="animation" name="Animation" introduced="9.1" purpose="optional">
+<unit bldFile="/mw/classicui/lafagnosticuifoundation/animation/group" mrp="/mw/classicui/lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
+</component>
+</collection>
+<collection id="classicui_info" name="Classic UI Info" level="specific">
+<!-- the multiple units in the API test components need to be resolved -->
+
+<component id="classicui_metadata" name="Classic UI Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/mw/classicui/classicui_info/classicui_metadata/classicui_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="svgt" level="generic" tech-domain="ui" name="SVG Tiny" levels="util ui">
+<collection id="svgt_plat" name="SVG Tiny Platform Interfaces" level="ui">
+<component id="svgt_api" name="SVGT API" introduced="9.2" class="api" filter="s60">
+<unit bldFile="/mw/svgt/svgt_plat/svgt_api/group"/>
+</component>
+<component id="nvg_api" name="NVG API" introduced="9.2" class="api" filter="s60">
+<unit bldFile="/mw/svgt/svgt_plat/nvg_api/group"/>
+</component>
+</collection>
+<collection id="svgtopt" name="SVG-T Engine" level="util">
+<component id="svgtopt_build" filter="s60" name="SVG Engine" introduced="9.2">
+<!-- component is at collection level. Needs to be moved down a directory -->
+<unit bldFile="/mw/svgt/svgtopt/group"/>
+</component>
+<component id="svgtplugin" filter="s60" name="SVG Plugin" class="plugin" introduced="9.2">
+<unit bldFile="/mw/svgt/svgtopt/svgtplugin/group"/>
+</component>
+</collection>
+</package>
+<package id="uiaccelerator" level="generic" tech-domain="ui" name="UI Accelerator" levels="plugin framework server ex if">
+<collection id="uiaccelerator_plat" name="UI Accelerator Platform Interfaces" level="if">
+<component id="alf_core_toolkit_api" name="ALF Core Toolkit API" class="api" filter="s60">
+<unit bldFile="/mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/group"/>
+</component>
+<component id="alf_visual_api" name="ALF Visual API" class="api" filter="s60">
+<unit bldFile="/mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/group"/>
+</component>
+<component id="alf_extended_visual_api" name="ALF Extended Visual API" class="api" filter="s60">
+<unit bldFile="/mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/group"/>
+</component>
+<component id="alf_extension_api" name="ALF Extension API" class="api" filter="s60">
+<unit bldFile="/mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/group"/>
+</component>
+<component id="alf_tracing_api" name="ALF Tracing API" class="api" filter="s60">
+<unit bldFile="/mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/group"/>
+</component>
+<component id="alf_client_server_api" name="ALF Client Server API" class="api" filter="s60">
+<unit bldFile="/mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/group"/>
+</component>
+</collection>
+<collection id="uiacceltk" name="UI Accelerator Toolkit" level="framework">
+<component id="hitchcock" filter="s60" name="Hitchcock">
+<unit bldFile="/mw/uiaccelerator/uiacceltk/hitchcock/group"/>
+</component>
+<component id="uiacceltk_build" filter="s60" name="UI Accelerator Toolkit Build">
+<!-- move into the other component, or remove the #include and make this UI Accelerator Toolkit ROM-->
+<unit bldFile="/mw/uiaccelerator/uiacceltk/group"/>
+</component>
+</collection>
+</package>
+<package id="uiresources" level="generic" tech-domain="ui" name="UI Resources" levels="compile plugin framework server generic data">
+<!-- are the custom filters below needed? -->
+<collection id="uiresources_pub" name="UI Resources Public Interfaces" level="data">
+<component id="pictograph_api" name="Pictograph API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_pub/pictograph_api/group" filter="!test"/>
+
+</component>
+<component id="skins_api" name="Skins API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_pub/skins_api/group" filter="!test"/>
+
+</component>
+<component id="font_definition_api" name="Font Definition API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_pub/font_definition_api/group" filter="!test"/>
+
+</component>
+<component id="graphics_api" name="Graphics API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_pub/graphics_api/group" filter="!test"/>
+
+</component>
+<component id="scalable_icons_api" name="Scalable Icons API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_pub/scalable_icons_api/group"/>
+</component>
+<component id="layout_id_definitions_api" name="Layout ID Definitions API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_pub/layout_id_definitions_api/group"/>
+</component>
+</collection>
+<collection id="uiresources_plat" name="UI Resources Platform Interfaces" level="data">
+<component id="layout_system_private_api" name="Layout System Private API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/layout_system_private_api/group" filter="!test"/>
+
+</component>
+<component id="layout_data_api" name="Layout Data API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/layout_data_api/group" filter="!test"/>
+
+</component>
+<component id="cdl_api" name="CDL API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/cdl_api/group" filter="!test"/>
+
+</component>
+<component id="extended_skins_api" name="Extended Skins API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/extended_skins_api/group" filter="!test"/>
+
+</component>
+<component id="tfx_server_controller_plugin_api" name="TFX Server Controller Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/tfx_server_controller_plugin_api/group"/>
+</component>
+<component id="extended_fonts_api" name="Extended Fonts API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/extended_fonts_api/group" filter="!test"/>
+
+</component>
+<component id="graphic_configuration_api" name="Graphic Configuration API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/graphic_configuration_api/group" filter="!test"/>
+
+</component>
+<component id="mif_header_cdl_api" name="MIF Header CDL API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/mif_header_cdl_api/group"/>
+</component>
+<component id="personalisation_and_skins_settings_api" name="Personalisation and Skins Settings API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/personalisation_and_skins_settings_api/group"/>
+</component>
+<component id="tfx_effect_setup_plugin_api" name="TFX Effect Setup Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/tfx_effect_setup_plugin_api/group"/>
+</component>
+<component id="mifconv_definitions_api" name="Mifconv Definitions API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/mifconv_definitions_api/group"/>
+</component>
+<component id="wallpaper_configuration_api" name="Wallpaper Configuration API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/wallpaper_configuration_api/group"/>
+</component>
+<component id="language_code_definitions_api" name="Language Code Definitions API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/language_code_definitions_api/group"/>
+</component>
+<component id="skins_image_attributes_api" name="Skins Image Attributes API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
+
+</component>
+<component id="private_user_area_code_definitions_api" name="Private User Area Code Definitions API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/private_user_area_code_definitions_api/group"/>
+</component>
+<component id="tfx_server_plugin_ids_api" name="TFX Server Plug-in IDs API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/tfx_server_plugin_ids_api/group"/>
+</component>
+</collection>
+<collection id="uiresources_info" name="UI Resources Info" level="data">
+<component id="uiresources_test" filter="s60,test,api_test" name="UI Resources Tests" purpose="development">
+
+</component>
+</collection>
+<collection id="uigraphics" name="UI Graphics" level="generic">
+<component id="bitmaps2" filter="s60" name="Bitmaps 2" class="config">
+<unit bldFile="/mw/uiresources/uigraphics/bitmaps2/group"/>
+</component>
+<component id="icons" filter="s60" class="config" name="Icons">
+<unit bldFile="/mw/uiresources/uigraphics/icons/group"/>
+</component>
+<component id="variatedbitmaps" filter="s60" name="Variated Bitmaps" class="config">
+<unit bldFile="/mw/uiresources/uigraphics/variatedbitmaps/group"/>
+</component>
+<component id="aknicon" filter="s60" name="Avkon Icon Framework">
+<unit bldFile="/mw/uiresources/uigraphics/aknicon/group"/>
+</component>
+<component id="nvgrenderstage" filter="sf_build" name="NVG Render Stage">
+<unit bldFile="/mw/uiresources/uigraphics/nvgrenderstage/group"/>
+</component>
+</collection>
+<collection id="layouts" name="Layouts" level="plugin">
+<component id="cdl" filter="s60" name="Customization Definition Language">
+<!-- can only have one unit. Need to #include them or split into multiple components -->
+<unit bldFile="/mw/uiresources/layouts/cdl/cdlengine/group"/>
+<unit bldFile="/mw/uiresources/layouts/cdl/cdlserver/group"/>
+</component>
+<component id="aknlayout2" filter="s60" name="Avkon Layout 2">
+<unit bldFile="/mw/uiresources/layouts/aknlayout2/group"/>
+</component>
+</collection>
+<collection id="skins" name="Skins" level="data">
+<component id="aknskincontent" filter="s60" name="Avkon Skin Content" class="config">
+<unit bldFile="/mw/uiresources/skins/aknskincontent/group"/>
+</component>
+<component id="aknskins" filter="s60" name="Avkon Skin Compiler">
+<unit bldFile="/mw/uiresources/skins/aknskins/group"/>
+</component>
+</collection>
+<collection id="pictographs" name="Pictographs" level="data">
+<component id="aknpictograph" filter="s60" name="Avkon Pictograph">
+<unit bldFile="/mw/uiresources/pictographs/aknpictograph/group"/>
+</component>
+</collection>
+<collection id="locales" name="Locales" level="framework">
+<component id="locales_build" filter="s60" name="Locales Build">
+<unit bldFile="/mw/uiresources/locales/loce32"/>
+</component>
+</collection>
+<collection id="uiconfig" name="UI Config" level="server">
+<component id="s60config" filter="s60" name="S60 UI Config">
+<unit bldFile="/mw/uiresources/uiconfig/s60config/group"/>
+</component>
+</collection>
+<collection id="fontsupport" name="Font Support" level="generic">
+<component id="fontprovider" filter="s60" name="Font Provider">
+<unit bldFile="/mw/uiresources/fontsupport/fontprovider/group"/>
+</component>
+<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
+ <component id="s60_fonts" filter="s60" name="S60 Fonts">
+ <unit bldFile="fontsupport/fontutils/group"/>
+ </component>
+-->
+<component id="fontutils" filter="sf_build" name="Font Utils">
+<unit bldFile="/mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
+</component>
+</collection>
+<collection id="helpthemes" name="Help Themes" level="data">
+<!-- collection is really a component. Need to move down a directory -->
+<component id="helpthemes_build" filter="s60" name="Help Themes Build" class="config">
+<unit bldFile="/mw/uiresources/helpthemes/group"/>
+</component>
+</collection>
+</package>
+<package id="hapticsservices" level="generic" tech-domain="ui" name="Haptics Services" levels="fw server api">
+<collection id="hapticsservices_plat" name="Haptics Services Platform Interfaces" level="api">
+<component id="tacticon_api" name="Tacticon API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/hapticsservices/hapticsservices_plat/tacticon_api/group"/>
+</component>
+<component id="tactile_feedback_core_api" name="Tactile Feedback Core API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/hapticsservices/hapticsservices_plat/tactile_feedback_core_api/group"/>
+</component>
+<component id="tactile_feedback_server_api" name="Tactile Feedback Server API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/hapticsservices/hapticsservices_plat/tactile_feedback_server_api/group"/>
+</component>
+</collection>
+<collection id="hapticsservices_pub" name="Haptics Services Public Interfaces" level="api">
+<component id="tactile_feedback_client_api" name="Tactile Feedback Client API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/hapticsservices/hapticsservices_pub/tactile_feedback_client_api/group"/>
+</component>
+</collection>
+<collection id="tacticonserver" name="Tacticon Server" level="server">
+<!-- collection is really a component. Move down a directory -->
+<component id="tacticonserver_build" filter="s60" name="Tacticon Server Build" introduced="^3">
+<unit bldFile="/mw/hapticsservices/tacticonserver/group"/>
+<!-- clients and servers are suauly the same component. Consider moving pluign to a separate component if needed -->
+</component>
+</collection>
+<collection id="tactilefeedback" name="Tactile Feedback" level="fw">
+<component id="tactilearearegistry" filter="s60" name="Tactile Area Registry" introduced="^1">
+<unit bldFile="/mw/hapticsservices/tactilefeedback/tactilearearegistry/group"/>
+</component>
+<component id="tactilefeedbackresolver" filter="s60" name="Tactile Feedback Resolver" introduced="^1">
+<unit bldFile="/mw/hapticsservices/tactilefeedback/tactilefeedbackresolver/group"/>
+</component>
+<component id="tactileclickplugin" filter="s60" name="Tactile Click Plugin" class="plugin" introduced="^1">
+<unit bldFile="/mw/hapticsservices/tactilefeedback/tactileclickplugin/group"/>
+</component>
+<component id="tactilefeedbackclient" filter="s60" name="Tactile Feedback Client" introduced="^1">
+<unit bldFile="/mw/hapticsservices/tactilefeedback/tactilefeedbackclient/group"/>
+</component>
+<component id="tactileactionplugin" filter="s60" name="Tactile Action Plugin" class="plugin" introduced="^1">
+<unit bldFile="/mw/hapticsservices/tactilefeedback/tactileactionplugin/group"/>
+</component>
+<component id="tactilefeedback_build" filter="s60" name="Tactile Feedback Build" introduced="^1">
+<!-- consider moving IBY to one fo the above components -->
+<unit bldFile="/mw/hapticsservices/tactilefeedback/group"/>
+</component>
+</collection>
+</package>
+<package id="gsprofilesrv" level="generic" tech-domain="ui" name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
+<collection id="gsprofilesrv_pub" name="GS and Profiles Services Public Interfaces" level="specific">
+<component id="profiles_engine_active_profile_settings_api" name="Profiles Engine Active Profile Settings API" class="api" filter="s60">
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_active_profile_settings_api/group"/>
+</component>
+<component id="profiles_engine_wrapper_api" name="Profiles Engine Wrapper API" class="api" filter="s60">
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_wrapper_api/group"/>
+</component>
+</collection>
+<collection id="gsprofilesrv_plat" name="GS and Profiles Services Platform Interfaces" level="specific">
+<component id="profiles_engine_api" name="Profiles Engine API" class="api" filter="s60">
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/profiles_engine_api/group"/>
+</component>
+<component id="profiles_mediafilelist_api" name="Media File List API" class="api" filter="s60">
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/profiles_mediafilelist_api/group"/>
+</component>
+<component id="filelist_api" name="File List API" class="api" filter="s60">
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/filelist_api/group"/>
+</component>
+<component id="settings_backgroundimage_api" name="Settings Background Image API" class="api" filter="s60">
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_backgroundimage_api/group"/>
+</component>
+<component id="settings_framework_api" name="Settings Framework API" class="api" filter="s60">
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_framework_api/group"/>
+</component>
+<component id="settings_launch_api" name="Settings Launch API" class="api" filter="s60">
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_launch_api/group"/>
+</component>
+<component id="settings_listbox_api" name="Settings List Box API" class="api" filter="s60">
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_listbox_api/group"/>
+</component>
+<component id="settings_plugin_api" name="Settings Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_plugin_api/group"/>
+</component>
+<component id="settings_uis_cenrep_collection_api" name="Settings UIs CenRep Collection API" class="api" filter="s60">
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
+</component>
+</collection>
+<collection id="gssettingsuis" name="General Settings UIs" level="framework">
+<component id="gs" filter="s60" name="General Settings" introduced="9.2">
+<unit bldFile="/mw/gsprofilesrv/gssettingsuis/gs/group"/>
+</component>
+</collection>
+<collection id="profilesservices" name="Profiles Services" level="server">
+<component id="filelist" filter="s60" name="File List" introduced="9.1">
+<unit bldFile="/mw/gsprofilesrv/profilesservices/filelist/group"/>
+</component>
+<component id="mediafilelist" filter="s60" name="Media File List" introduced="^2">
+<unit bldFile="/mw/gsprofilesrv/profilesservices/mediafilelist/group"/>
+</component>
+<component id="profileengine" filter="s60" name="Profile Engine" introduced="9.1">
+<unit bldFile="/mw/gsprofilesrv/profilesservices/profileengine/group"/>
+</component>
+<component id="ringingtone3dplugin" filter="s60" name="Ringing Tone 3D Plugin" class="plugin" introduced="^2">
+<unit bldFile="/mw/gsprofilesrv/profilesservices/ringingtone3dplugin/group"/>
+</component>
+</collection>
+</package>
+<package id="homescreensrv" level="specific" tech-domain="ui" name="Home Screen Services" levels="plugin framework server generic specific">
+<collection id="homescreensrv_plat" name="Home Screen Services Platform Interfaces" level="specific">
+<component id="ai_content_model_api" name="AI Content Model API" class="api" filter="s60">
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/ai_content_model_api/group"/>
+</component>
+<component id="ai_utilities_api" name="AI Utilities API" class="api" filter="s60">
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/ai_utilities_api/group" filter="!test"/>
+
+</component>
+<component id="ai_plugin_management_api" name="AI Plug-in Management API" class="api" filter="s60">
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/ai_plugin_management_api/group"/>
+</component>
+<component id="ai_plugin_information_api" name="AI Plug-in Information API" class="api" filter="s60">
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/ai_plugin_information_api/group"/>
+</component>
+<component id="ai_variation_api" name="AI Variation API" class="api" filter="s60">
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/ai_variation_api/group"/>
+</component>
+<component id="action_handler_plugin_api" name="Action Handler Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/group" filter="!test"/>
+
+</component>
+<component id="content_harvester_plugin_api" name="Content Harvester Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/group" filter="!test"/>
+
+</component>
+<component id="menu_model_api" name="Menu Model API" class="api" filter="s60">
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/menu_model_api/group"/>
+</component>
+<component id="menu_sat_interface_api" name="Menu SAT Interface API" class="api" filter="s60">
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/group" filter="!test"/>
+
+</component>
+<component id="external_home_screen_api" name="External Home Screen API" class="api" filter="s60">
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/external_home_screen_api/group"/>
+</component>
+<component id="menu_content_service_api" name="Menu Content Service API" class="api" filter="s60">
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/menu_content_service_api/group" filter="!test"/>
+
+</component>
+<component id="sapi_contentpublishing" name="SAPI Content Publishing" class="api" filter="s60">
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing/group"/>
+</component>
+<component id="sapi_backstepping" name="SAPI Backstepping" class="api" filter="s60">
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/sapi_backstepping/group"/>
+</component>
+<component id="sapi_actionhandler" name="SAPI Action Handler" class="api" filter="s60">
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/sapi_actionhandler/group"/>
+</component>
+<component id="sapi_homescreenplugin" name="SAPI Homescreen Plugin" class="api" filter="s60">
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/sapi_homescreenplugin/group" filter="!test"/>
+
+</component>
+<component id="sapi_menucontent" name="SAPI Menu Content" class="api" filter="s60">
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/sapi_menucontent/group"/>
+</component>
+<component id="xcfw_api" name="XCFW API" class="api" filter="s60">
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/xcfw_api/group"/>
+</component>
+<component id="idlefw_api" name="Idle Framework API" class="api" filter="s60">
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/idlefw_api/group"/>
+</component>
+<component id="hs_widget_publisher_api" name="Home Screen Publishing API" class="api" filter="s60">
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/hs_widget_publisher_api/group"/>
+</component>
+<component id="hs_settings_api" name="HS Settings API" class="api" filter="s60">
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/hs_settings_api/group"/>
+</component>
+<component id="hs_content_control_api" name="HS Content Control API" class="api" filter="s60">
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/hs_content_control_api/group"/>
+</component>
+</collection>
+<collection id="xcfw" name="XML Content Framework" level="framework">
+<!-- collection is really a component, needs to be moved down a directory -->
+<component id="xcfw_build" filter="s60" name="XML Content Framework Build">
+<unit bldFile="/mw/homescreensrv/xcfw/group"/>
+</component>
+</collection>
+<collection id="homescreenpluginsrv" name="Home Screen Plugin Service" level="plugin">
+<component id="hspsdefinitionengine" filter="s60" name="HS Plugin Service Definition Engine">
+<!-- <unit bldFile="homescreenpluginsrv/hspsdefinitionengine/group"/> -->
+</component>
+<component id="hspsdom" filter="s60" name="HS Plugin Service DOM">
+<!-- <unit bldFile="homescreenpluginsrv/hspsdom/group"/> -->
+</component>
+<component id="hspstools" filter="s60" name="HS Server Tools">
+<meta rel="config">
+<defined condition="____HSPS_CFG_LOG_ON____"/>
+</meta>
+<!-- <unit bldFile="homescreenpluginsrv/hspstools/group"/> -->
+</component>
+<component id="hspspluginregistry" filter="s60" name="HS Plugin Registry">
+<!-- <unit bldFile="homescreenpluginsrv/hspspluginregistry/group"/>-->
+</component>
+<component id="hspsmanager" filter="s60" name="HSPS Manager">
+<!-- <unit bldFile="homescreenpluginsrv/hspsmanager/group"/>-->
+</component>
+<component id="hspsodt" filter="s60" name="HSPS Object Description Tree">
+<!-- <unit bldFile="homescreenpluginsrv/hspsodt/group"/>-->
+</component>
+<component id="hspsresource" filter="s60" name="HS Plugin Server Resource">
+<!-- <unit bldFile="homescreenpluginsrv/hspsresource/group"/>-->
+</component>
+<component id="hspsresult" filter="s60" name="HS Plugin Server Result">
+<!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
+</component>
+<component id="homescreen_settings_api" filter="s60" name="HS Settings API" class="api">
+<!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
+</component>
+<component id="homescreenpluginsrv_build" filter="s60" name="HSPS Build">
+<!-- need to break this up into the self-contained components above and uncomment them -->
+<unit bldFile="/mw/homescreensrv/homescreenpluginsrv/group"/>
+</component>
+</collection>
+<collection id="idlefw" name="Idle Framework" level="framework">
+<meta rel="config">
+<defined condition="RD_CUSTOMIZABLE_AI"/>
+</meta>
+<!-- Uncomment all units when configuration is in place. All currently #included from idlefw_build -->
+<component id="idlefw_plugins" filter="s60" name="Idle Framework Plugins" class="plugin">
+<!--<unit bldFile="idlefw/plugins/group"/>-->
+</component>
+<component id="hslaunch" filter="s60" name="Home Screen Launch">
+<!--<unit bldFile="idlefw/plugins/group"/>-->
+</component>
+<component id="idlefw_build" filter="s60" name="Idle Framework Build">
+<!--split this into components, or separate from the above components and move this down a directory -->
+<unit bldFile="/mw/homescreensrv/idlefw/group"/>
+</component>
+</collection>
+<collection id="menucontentsrv" name="Menu Content Service" level="generic">
+<component id="menusatinterface" filter="s60" name="Menu SAT Interface">
+<unit bldFile="/mw/homescreensrv/menucontentsrv/menusatinterface/group"/>
+</component>
+<component id="menucontentsrv_build" filter="s60" name="Menu Content Service Build">
+<!--split this into components, or separate from the above component and move this down a directory -->
+<unit bldFile="/mw/homescreensrv/menucontentsrv/group"/>
+</component>
+</collection>
+<collection id="backsteppingsrv" name="Back Stepping Service" level="server">
+<!-- collection is really a component, needs to be moved down a directory -->
+<component id="bsengine" name="Back Stepping Engine" filter="s60">
+<unit bldFile="/mw/homescreensrv/backsteppingsrv/group"/>
+</component>
+</collection>
+<collection id="contentpublishingsrv" name="Content Publishing Service" level="server">
+<component id="contentpublishingdebug" filter="s60" name="Content Publishing Debug">
+<!-- need to move this component outside of contentpublishingutils and into separate component directory -->
+<meta rel="config">
+<defined condition="CONTENT_PUBLISHER_DEBUG"/>
+</meta>
+<!-- <unit bldFile="contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/> -->
+</component>
+<component id="contentpublishingutils" filter="s60" name="Content Publishing Utils">
+<unit bldFile="/mw/homescreensrv/contentpublishingsrv/contentpublishingutils/group"/>
+</component>
+<component id="contentpublishingserver" filter="s60" name="Content Publishing Server">
+<unit bldFile="/mw/homescreensrv/contentpublishingsrv/contentpublishingserver/group"/>
+</component>
+<component id="contentharvester" filter="s60" name="Content Harvester">
+<unit bldFile="/mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
+</component>
+<component id="contentpublishingsrv_build" filter="s60" name="Content Publishing Service Build">
+<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
+ If keeping, it need to move down a directory.-->
+<unit bldFile="/mw/homescreensrv/contentpublishingsrv/group"/>
+</component>
+</collection>
+<collection id="contentcontrolsrv" name="Content Control Service" level="server">
+<component id="ccsrv" name="Content Control Service" filter="s60" introduced="^3">
+<unit bldFile="/mw/homescreensrv/contentcontrolsrv/ccsrv/group"/>
+</component>
+<component id="ccsrvapi" name="Content Control Service API" filter="s60" introduced="^3" class="api">
+<unit bldFile="/mw/homescreensrv/contentcontrolsrv/ccsrvapi/group"/>
+</component>
+<component id="ccclientsession" name="Content Control Client Session" filter="s60" introduced="^3">
+<unit bldFile="/mw/homescreensrv/contentcontrolsrv/ccclientsession/group"/>
+</component>
+<component id="hsccclient" name="HS Content Control Client" filter="s60" introduced="^3">
+<unit bldFile="/mw/homescreensrv/contentcontrolsrv/hsccclient/group"/>
+</component>
+<component id="hscontentinfo" name="Home Screen Content Info" filter="s60" introduced="^3">
+<unit bldFile="/mw/homescreensrv/contentcontrolsrv/hscontentinfo/group"/>
+</component>
+<component id="contentcontrolsrv_build" name="Content Control Service Build" filter="s60" introduced="^3">
+<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
+ If keeping, it need to move down a directory.-->
+<unit bldFile="/mw/homescreensrv/contentcontrolsrv/group"/>
+</component>
+</collection>
+</package>
+<package id="appinstall" level="generic" tech-domain="rt" name="Application Installation" levels="tool framework generic api">
+<collection id="appinstall_plat" name="Application Installation Platform Interfaces" level="api">
+<component id="iaupdate_api" name="IA Update API" class="api" filter="s60">
+<unit bldFile="/mw/appinstall/appinstall_plat/iaupdate_api/group"/>
+</component>
+<component id="task_plugin_api" name="Task Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/appinstall/appinstall_plat/task_plugin_api/group"/>
+</component>
+<component id="sw_installer_common_ui_api" name="SW Installer Common UI API" class="api" filter="s60">
+<unit bldFile="/mw/appinstall/appinstall_plat/sw_installer_common_ui_api/group"/>
+</component>
+<component id="sw_installer_launcher_api" name="SW Installer Launcher API" class="api" filter="s60">
+<unit bldFile="/mw/appinstall/appinstall_plat/sw_installer_launcher_api/group"/>
+</component>
+<component id="task_management_api" name="Task Management API" class="api" filter="s60">
+<unit bldFile="/mw/appinstall/appinstall_plat/task_management_api/group"/>
+</component>
+<component id="sw_installer_ui_plugin_api" name="SW Installer UI Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/appinstall/appinstall_plat/sw_installer_ui_plugin_api/group"/>
+</component>
+<component id="sw_installer_cr_keys" name="SW Installer CR Keys" class="api" filter="s60">
+<unit bldFile="/mw/appinstall/appinstall_plat/sw_installer_cr_keys/group"/>
+</component>
+<component id="sw_installer_ps_keys" name="SW Installer PS Keys" class="api" filter="s60">
+<unit bldFile="/mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
+</component>
+<component id="appmngr2runtimeapi" name="Application Manager 2 Runtime Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
+</component>
+</collection>
+<collection id="appinstall_pub" name="Application Installation Public Interfaces" level="api">
+<component id="startup_list_management_api" name="Startup List Management API" class="api" filter="s60">
+<unit bldFile="/mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
+</component>
+</collection>
+<collection id="ncdengine" name="Nokia Content Discover" level="framework">
+<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
+<component id="ncdengine_engine" filter="s60" name="NCD Engine" introduced="^1">
+<unit bldFile="/mw/appinstall/ncdengine/engine/group"/>
+</component>
+<component id="debuglogger" filter="s60" name="NCD Debug Logger" introduced="^1">
+<!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
+</component>
+<component id="ncdengine_build" filter="s60" name="NCD Build" introduced="^1">
+<unit bldFile="/mw/appinstall/ncdengine/group"/>
+</component>
+</collection>
+<collection id="appinstaller" name="Application Installer" level="generic">
+<component id="appmngr2" filter="s60" name="Application Manager 2" introduced="^2">
+<unit bldFile="/mw/appinstall/appinstaller/appmngr2/group"/>
+</component>
+<component id="appinstui" filter="s60" name="Application Installer UI" introduced="^2">
+<unit bldFile="/mw/appinstall/appinstaller/appinstui/group"/>
+</component>
+</collection>
+<collection id="iaupdateapi_stub" name="IA Update API Stub" level="api">
+<!-- the collection is really a component. Move down a directory.-->
+<component id="iaupdateapi_stub_build" name="IA Update API Stub Build" filter="s60" introduced="^2">
+<unit bldFile="/mw/appinstall/iaupdateapi_stub/group"/>
+</component>
+</collection>
+<collection id="iaupdate" name="Independent Apps Update" level="api">
+<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
+<component id="iad" name="Software Update" filter="s60" introduced="^2">
+<unit bldFile="/mw/appinstall/iaupdate/iad/group"/>
+</component>
+<component id="iaupdate_help" filter="s60" name="IA Update Help" introduced="^2">
+<unit bldFile="/mw/appinstall/iaupdate/help/group"/>
+</component>
+<component id="iaupdate_build" filter="s60" name="IA Update Build" introduced="^2">
+<unit bldFile="/mw/appinstall/iaupdate/group"/>
+</component>
+</collection>
+<collection id="installationservices" name="Installation Services" level="generic">
+<component id="swi" name="Secure Software Install" purpose="optional">
+<unit bldFile="/mw/appinstall/installationservices/swi/group" mrp="/mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
+</component>
+<component id="swidevicetools" name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
+<unit bldFile="/mw/appinstall/installationservices/swidevicetools/group" mrp="/mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
+</component>
+
+<component id="swiconfig" name="Software Install Config" introduced="9.1" purpose="optional" class="config">
+<unit bldFile="/mw/appinstall/installationservices/swiconfig/group" mrp="/mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
+</component>
+</collection>
+<collection id="secureswitools" name="Secure Software Install Tools" level="tool">
+<component id="makekeys" name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" target="desktop">
+<unit bldFile="/mw/appinstall/secureswitools/makekeys/group" mrp="/mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
+</component>
+<component id="swianalysistoolkit" name="SWI Analysis Toolkit" purpose="development" target="desktop">
+<unit bldFile="/mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="/mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
+</component>
+<component id="openssllib" name="OpenSSL Library" purpose="optional" target="desktop">
+<unit mrp="/mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
+</component>
+<component id="swisistools" name="Secure Software Install SIS Tools" purpose="optional" target="desktop">
+<unit bldFile="/mw/appinstall/secureswitools/swisistools/group" mrp="/mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
+</component>
+</collection>
+<collection id="appinstall_info" name="Application Installation Info" level="api">
+
+<component id="appinstall_metadata" name="Application Installation Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="serviceapifw" level="specific" tech-domain="rt" name="Service API Framework" levels="plugin framework server generic specific">
+<collection id="serviceapifw_pub" name="Service API Framework Public Interfaces" level="specific"/>
+<collection id="serviceapifw_plat" name="Service API Framework Platform Interfaces" level="specific">
+<component id="rtsecuritymanager_common_api" name="Runtime Security Manager Common API" class="api" filter="s60">
+<unit bldFile="/mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/group"/>
+</component>
+<component id="rtsecuritymanager_utility_api" name="Runtime Security Manager Utility API" class="api" filter="s60">
+<unit bldFile="/mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
+</component>
+<component id="rtsecuritymanager_client_api" name="Runtime Security Manager Client API" class="api" filter="s60">
+<unit bldFile="/mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/group"/>
+</component>
+<component id="liw_provider_utility_api" name="LIW Provider Utility API" class="api" filter="s60">
+<unit bldFile="/mw/serviceapifw/serviceapifw_plat/liw_provider_utility_api/group"/>
+</component>
+<component id="liw_service_interface_base_api" name="LIW Service Interface Base API" class="api" filter="s60">
+<unit bldFile="/mw/serviceapifw/serviceapifw_plat/liw_service_interface_base_api/group"/>
+</component>
+<component id="liw_service_interface_menu_api" name="LIW Service Interface Menu API" class="api" filter="s60">
+<unit bldFile="/mw/serviceapifw/serviceapifw_plat/liw_service_interface_menu_api/group"/>
+</component>
+<component id="liw_criteria_api" name="LIW Criteria API" class="api" filter="s60">
+<unit bldFile="/mw/serviceapifw/serviceapifw_plat/liw_criteria_api/group"/>
+</component>
+<component id="liw_generic_parameter_api" name="LIW Generic Parameter API" class="api" filter="s60">
+<unit bldFile="/mw/serviceapifw/serviceapifw_plat/liw_generic_parameter_api/group"/>
+</component>
+<component id="liw_service_handler_api" name="LIW Service Handler API" class="api" filter="s60">
+<unit bldFile="/mw/serviceapifw/serviceapifw_plat/liw_service_handler_api/group"/>
+</component>
+</collection>
+<collection id="rtsecuritymanager" name="Runtime Security Manager" level="server">
+<component id="rtsecuritymanagerutil" filter="s60" name="Runtime Security Manager Util">
+<unit bldFile="/mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
+</component>
+<component id="rtsecuritymanagerserver" filter="s60" name="Runtime Security Manager Server">
+<unit bldFile="/mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/>
+</component>
+<component id="rtsecuritymanagerclient" filter="s60" name="Runtime Security Manager Client">
+<unit bldFile="/mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/>
+</component>
+<component id="rtsecuritymanager_build" filter="s60" name="Runtime Security Manager Build">
+<!-- Move the export to the appropriate components, or make this a ROM component by removing the #includes -->
+<unit bldFile="/mw/serviceapifw/rtsecuritymanager/group"/>
+</component>
+</collection>
+<collection id="languageinterworkingfw" name="Language Interworking Framework" level="framework">
+<component id="lifwservicehandler" filter="s60" name="Service Handler">
+<unit bldFile="/mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
+</component>
+</collection>
+</package>
+<package id="serviceapi" level="specific" tech-domain="rt" name="Service API" levels="os mw1 mw2 app">
+<!-- should break up this collection into something meaningful -->
+<collection id="serviceproviders" name="Service Providers" level="mw1">
+<component id="sapi_contacts_vpbk" name="Contacts Phonebook SAPI" filter="s60" class="plugin">
+<unit bldFile="/mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
+</component>
+<component id="sapi_location" name="Location SAPI" filter="s60" class="plugin">
+<unit bldFile="/mw/serviceapi/serviceproviders/sapi_location/group"/>
+</component>
+<component id="sapi_mediamanagement" name="Media Management SAPI" filter="s60" class="plugin">
+<unit bldFile="/mw/serviceapi/serviceproviders/sapi_mediamanagement/group"/>
+</component>
+<component id="sapi_landmarks" name="Landmarks SAPI" filter="s60" class="plugin">
+<unit bldFile="/mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
+</component>
+<component id="sapi_messaging" name="Messaging SAPI" filter="s60" class="plugin">
+<unit bldFile="/mw/serviceapi/serviceproviders/sapi_messaging/group"/>
+</component>
+<component id="sapi_applicationmanager" name="Application Manager SAPI" filter="s60" class="plugin">
+<unit bldFile="/mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
+</component>
+<component id="sapi_calendar" name="Calendar SAPI" filter="s60" class="plugin">
+<unit bldFile="/mw/serviceapi/serviceproviders/sapi_calendar/group"/>
+</component>
+<component id="sapi_logging" name="Logging SAPI" filter="s60" class="plugin">
+<unit bldFile="/mw/serviceapi/serviceproviders/sapi_logging/group"/>
+</component>
+<component id="sapi_sensor" name="Sensor SAPI" filter="s60" class="plugin">
+<unit bldFile="/mw/serviceapi/serviceproviders/sapi_sensor/group"/>
+</component>
+<component id="sapi_sysinfo" name="Sysinfo SAPI" filter="s60" class="plugin">
+<unit bldFile="/mw/serviceapi/serviceproviders/sapi_sysinfo/group"/>
+</component>
+<component id="sapi_serviceregistry" name="Service Registry SAPI" filter="s60" class="plugin">
+<unit bldFile="/mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
+</component>
+<component id="jsapi" name="Javascript API" filter="s60" class="plugin">
+<unit bldFile="/mw/serviceapi/serviceproviders/jsapi/group"/>
+</component>
+<component id="serviceproviders_build" filter="s60" name="Service API Build">
+<!-- distribute the exports or make this a ROM component by removing the #includes -->
+<unit bldFile="/mw/serviceapi/serviceproviders/group"/>
+</component>
+</collection>
+</package>
+<package id="web" level="specific" tech-domain="rt" name="Web" levels="plugin utils server generic specific">
+<collection id="web_pub" name="Web Public Interfaces" level="specific">
+<component id="browser_control_api" name="Browser Control API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_pub/browser_control_api/group"/>
+</component>
+<component id="download_mgr_client_api" name="Download Manager Client API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_pub/download_mgr_client_api/group"/>
+</component>
+<component id="download_mgr_ui_api" name="Download Manager UI Library API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_pub/download_mgr_ui_api/group"/>
+</component>
+<component id="favourites_engine_api" name="Favourites Engine API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_pub/favourites_engine_api/group"/>
+</component>
+<component id="browser_plugin_api" name="Browser Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_pub/browser_plugin_api/group"/>
+</component>
+<component id="settings_api" name="Settings API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_pub/settings_api/group"/>
+</component>
+</collection>
+<collection id="web_plat" name="Web Platform Interfaces" level="specific">
+<component id="aiw_browser_provider_api" name="AIW Browser Provider API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/aiw_browser_provider_api/group"/>
+</component>
+<component id="browser_dialogs_provider_api" name="Browser Dialogs Provider API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/browser_dialogs_provider_api/group"/>
+</component>
+<component id="browser_platform_api" name="Browser Platform API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/browser_platform_api/group"/>
+</component>
+<component id="cod_handler_api" name="COD Handler API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/cod_handler_api/group"/>
+</component>
+<component id="connection_manager_api" name="Connection Manager API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/connection_manager_api/group"/>
+</component>
+<component id="cxml_library_api" name="cXml Library API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/cxml_library_api/group"/>
+</component>
+<component id="download_mgr_client_api_extn" name="Download Manager Client API Extension" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/download_mgr_client_api_extn/group"/>
+</component>
+<component id="download_path_plugin_api" name="Download Path Plugin API" class="api" filter="s60" introduced="^3">
+<unit bldFile="/mw/web/web_plat/download_path_plugin_api/group"/>
+</component>
+<component id="feeds_engine_api" name="Feeds Engine API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/feeds_engine_api/group"/>
+</component>
+<component id="launcher_api" name="Launcher API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/launcher_api/group"/>
+</component>
+<component id="multipart_parser_api" name="Multipart Parser API" class="api" filter="s60">
+<meta rel="config">
+<defined condition="BRDO_MULTIPART_PARSER_FF"/>
+</meta>
+<unit bldFile="/mw/web/web_plat/multipart_parser_api/group"/>
+</component>
+<component id="recent_url_store_api" name="Recent URL Store API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/recent_url_store_api/group"/>
+</component>
+<component id="scheme_handler_plugin_api" name="Scheme Handler Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/scheme_handler_plugin_api/group"/>
+</component>
+<component id="scriptable_plugin_api" name="Scriptable Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/scriptable_plugin_api/group"/>
+</component>
+<component id="webutils_api" name="Web Utils API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/webutils_api/group"/>
+</component>
+<component id="widget_registry_api" name="Widget Registry API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/widget_registry_api/group"/>
+</component>
+<component id="xml_parser_api" name="XML Parser API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/xml_parser_api/group"/>
+</component>
+<component id="stmgesturefw_api" name="State Machine Gesture Framework API " class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/stmgesturefw_api/group"/>
+</component>
+</collection>
+<collection id="web_info" name="Web Info" level="specific">
+<component id="web_build" filter="s60" name="Web Build">
+<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
+<unit bldFile="/mw/web/group"/>
+</component>
+</collection>
+<collection id="browserutilities" name="Browser Utilities" level="utils">
+<component id="browserdialogsprovider" filter="s60" name="Browser Dialogs Provider">
+<unit bldFile="/mw/web/browserutilities/browserdialogsprovider/group"/>
+</component>
+<component id="recenturlstore" filter="s60" name="Recent URL Store">
+<unit bldFile="/mw/web/browserutilities/recenturlstore/group"/>
+</component>
+<component id="xmlparser" filter="s60" name="XML Interface">
+<unit bldFile="/mw/web/browserutilities/xmlparser/group"/>
+</component>
+<component id="cxmllibrary" filter="s60" name="XML Parser Implementation">
+<unit bldFile="/mw/web/browserutilities/cxmllibrary/group"/>
+</component>
+<component id="downloadmgr" filter="s60" name="Download Manager">
+<unit bldFile="/mw/web/browserutilities/downloadmgr/group"/>
+</component>
+<component id="connectionmanager" filter="s60" name="Connection Manager">
+<unit bldFile="/mw/web/browserutilities/connectionmanager/group"/>
+</component>
+<component id="browsertelservice" filter="s60" name="Browser Telephony Service">
+<unit bldFile="/mw/web/browserutilities/browsertelservice/group"/>
+</component>
+<component id="favouritesengine" filter="s60" name="Favourites Engine">
+<unit bldFile="/mw/web/browserutilities/favouritesengine/group"/>
+</component>
+<component id="feedsengine" filter="s60" name="Feeds Engine">
+<unit bldFile="/mw/web/browserutilities/feedsengine/group"/>
+</component>
+<component id="multipartparser" filter="s60" name="Multipart Parser">
+<meta rel="config">
+<defined condition="BRDO_MULTIPART_PARSER_FF"/>
+</meta>
+<!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
+<!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
+</component>
+<component id="schemehandler" filter="s60" name="Scheme Handler">
+<unit bldFile="/mw/web/browserutilities/schemehandler/group"/>
+</component>
+<component id="webutils" filter="s60" name="Web Utils">
+<unit bldFile="/mw/web/browserutilities/webutils/group"/>
+</component>
+<component id="aiwbrowserprovider" filter="s60" name="AIW Browser Provider" class="plugin">
+<unit bldFile="/mw/web/browserutilities/aiwbrowserprovider/group"/>
+</component>
+<component id="browserutilities_build" filter="s60" name="Browser Utilities Build">
+<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
+<unit bldFile="/mw/web/browserutilities/group"/>
+</component>
+</collection>
+<collection id="webengine" name="Web Engine" level="server">
+<component id="osswebengine" filter="s60" name="OSS Web Engine">
+<!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
+<unit bldFile="/mw/web/webengine/osswebengine/cache/group"/>
+<unit bldFile="/mw/web/webengine/osswebengine/memorymanager/group"/>
+<unit bldFile="/mw/web/webengine/osswebengine/npscript/group"/>
+<unit bldFile="/mw/web/webengine/osswebengine/webkit/s60/group"/>
+<unit bldFile="/mw/web/webengine/osswebengine/webkit/s60/group/javascriptcore"/>
+</component>
+<component id="webkitutils" filter="s60" name="WebKit Utils">
+<unit bldFile="/mw/web/webengine/webkitutils/group"/>
+</component>
+<component id="pagescaler" filter="s60" name="Page Scaler">
+<unit bldFile="/mw/web/webengine/pagescaler/group"/>
+</component>
+<component id="webwidgetinstaller" filter="s60" name="Widget Installer">
+<unit bldFile="/mw/web/webengine/widgetinstaller/group"/>
+</component>
+<component id="widgetregistry" filter="s60" name="Widget Registry">
+<unit bldFile="/mw/web/webengine/widgetregistry/group"/>
+</component>
+<component id="wmlengine" filter="s60" name="WML Engine">
+<unit bldFile="/mw/web/webengine/wmlengine/group"/>
+</component>
+<component id="device" filter="s60" name="Device">
+<!-- this needs a more meaningful name -->
+<unit bldFile="/mw/web/webengine/device/group"/>
+</component>
+<component id="widgetengine" filter="s60" name="Widget Engine">
+<unit bldFile="/mw/web/webengine/widgetengine/group"/>
+</component>
+<component id="web_memoryplugin" name="Memory Plugin" filter="s60" class="plugin">
+<unit bldFile="/mw/web/webengine/memoryplugin/group"/>
+</component>
+<component id="widgetmemoryplugin" filter="s60" name="Widget Memory Plugin" class="plugin">
+<unit bldFile="/mw/web/webengine/widgetmemoryplugin/group"/>
+</component>
+<component id="widgetbackuprestore" filter="s60" name="Widget Backup and Restore">
+<unit bldFile="/mw/web/webengine/widgetbackuprestore/group"/>
+</component>
+<component id="browserrecognizers" filter="s60" name="Browser Recognizers" class="plugin">
+<unit bldFile="/mw/web/webengine/browserrecognizers/group"/>
+</component>
+<component id="wrtharvester" filter="s60" name="Web Runtime Harvester" class="plugin">
+<unit bldFile="/mw/web/webengine/wrtharvester/group"/>
+</component>
+</collection>
+<collection id="codhandler" name="Content Object Descriptor Handler" level="specific">
+<component id="codeng" filter="s60" name="COD Engine">
+<unit bldFile="/mw/web/codhandler/codeng/group"/>
+</component>
+<component id="codui" filter="s60" name="COD UI">
+<unit bldFile="/mw/web/codhandler/codui/group"/>
+</component>
+<component id="codrecog" filter="s60" name="COD Recogniser" class="plugin">
+<unit bldFile="/mw/web/codhandler/codrecog/group"/>
+</component>
+<component id="codviewer" filter="s60" name="COD Viewer">
+<unit bldFile="/mw/web/codhandler/codviewer/group"/>
+</component>
+<component id="ddrecog" filter="s60" name="Download Descriptor Recogniser" class="plugin">
+<unit bldFile="/mw/web/codhandler/ddrecog/group"/>
+</component>
+<component id="ddviewer" filter="s60" name="Download Descriptor Viewer">
+<unit bldFile="/mw/web/codhandler/ddviewer/group"/>
+</component>
+<component id="coddownload" filter="s60" name="COD Download">
+<unit bldFile="/mw/web/codhandler/coddownload/group"/>
+</component>
+<component id="roapapp" filter="s60" name="ROAP Application">
+<unit bldFile="/mw/web/codhandler/roapapp/group"/>
+</component>
+<component id="codhandler_build" filter="s60" name="COD Handler Build">
+<!-- Exports need to go into another component or make this self-contained.
+ #included .hrh file needs to be #included in each of the other components -->
+<unit bldFile="/mw/web/codhandler/group"/>
+</component>
+</collection>
+<collection id="widgets" name="Web Widget Framework" level="generic">
+<meta rel="config">
+<defined condition="RD_BROWSER_WIDGETS"/>
+</meta>
+<!-- the following units can be uncommented when configuration is put in place -->
+<component id="widgetrecognizer" filter="s60" name="Widget Recognizer" class="plugin">
+<meta rel="config">
+<defined condition="__WEB_WIDGETS"/>
+</meta>
+<!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
+</component>
+<component id="widgetinstaller" filter="s60" name="Widget Installer UI" class="plugin">
+<meta rel="config">
+<defined condition="__WEB_WIDGETS"/>
+</meta>
+<!--<unit bldFile="widgets/widgetinstaller/group"/>-->
+</component>
+<component id="widgetlauncher" filter="s60" name="Widget Launcher">
+<meta rel="config">
+<defined condition="__WEB_WIDGETS"/>
+</meta>
+<!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
+</component>
+<component id="widgetapp" filter="s60" name="Widget UI">
+<meta rel="config">
+<defined condition="__WEB_WIDGETS"/>
+</meta>
+<!--<unit bldFile="widgets/widgetapp/group"/>-->
+</component>
+<component id="widgetsidchecker" filter="s60" name="Widget SID Checker" introduced="^3">
+<meta rel="config">
+<defined condition="APP_SID_CHECK_SUPPORT_FF"/>
+</meta>
+<!--<unit bldFile="widgets/widgetsidchecker/group"/>-->
+</component>
+<component id="widgetpreinstaller" filter="s60" name="Widget Pre-Installer">
+<meta rel="config">
+<defined condition="RD_WIDGET_PREINSTALLER"/>
+</meta>
+<!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
+</component>
+<component id="widgetstartup" filter="s60" name="Widget Startup">
+<meta rel="config">
+<defined condition="RD_WIDGET_PREINSTALLER"/>
+</meta>
+<!--<unit bldFile="widgets/widgetstartup/group"/>-->
+</component>
+<component id="widgets_build" filter="s60" name="Widgets Build">
+<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed
+ #included .hrh file needs to be #included in each of the other components -->
+<unit bldFile="/mw/web/widgets/group"/>
+</component>
+</collection>
+</package>
+<package id="websrv" level="generic" tech-domain="rt" name="Web Services" levels="plugin framework server generic specific">
+<collection id="websrv_pub" name="Web Services Public Interfaces" level="specific">
+<component id="web_service_description_api" name="Web Service Description API" class="api" filter="s60">
+<unit bldFile="/mw/websrv/websrv_pub/web_service_description_api/group"/>
+</component>
+<component id="web_service_connection_api" name="Web Service Connection API" class="api" filter="s60">
+<unit bldFile="/mw/websrv/websrv_pub/web_service_connection_api/group"/>
+</component>
+<component id="web_service_manager_api" name="Web Service Manager API" class="api" filter="s60">
+<unit bldFile="/mw/websrv/websrv_pub/web_service_manager_api/group"/>
+</component>
+<component id="hostlet_connection_api" name="Hostlet Connection API" class="api" filter="s60">
+<unit bldFile="/mw/websrv/websrv_pub/hostlet_connection_api/group"/>
+</component>
+<component id="web_service_messaging_api" name="Web Service Messaging API" class="api" filter="s60">
+<unit bldFile="/mw/websrv/websrv_pub/web_service_messaging_api/group"/>
+</component>
+<component id="xml_extensions_api" name="XML Extensions API" class="api" filter="s60">
+<unit bldFile="/mw/websrv/websrv_pub/xml_extensions_api/group"/>
+</component>
+<component id="xml_fragment_api" name="XML Fragment API" class="api" filter="s60">
+<unit bldFile="/mw/websrv/websrv_pub/xml_fragment_api/group"/>
+</component>
+</collection>
+<collection id="webservices" name="Web Services Framework" level="generic">
+<!-- consider breaking this collection into more meaningful subsets -->
+<component id="wsnotifierplugins" filter="s60" name="WS Notifier Plugins" class="plugin">
+<unit bldFile="/mw/websrv/webservices/wsnotifierplugins/group"/>
+</component>
+<component id="wslogger" filter="s60" name="WS Logger">
+<unit bldFile="/mw/websrv/webservices/wslogger/group"/>
+</component>
+<component id="wsxml" filter="s60" name="WS XML Extensions">
+<unit bldFile="/mw/websrv/webservices/wsxml/group"/>
+</component>
+<component id="wsutils" filter="s60" name="WS Utils">
+<unit bldFile="/mw/websrv/webservices/wsutils/group"/>
+</component>
+<component id="wsfragment" filter="s60" name="WS Fragment">
+<unit bldFile="/mw/websrv/webservices/wsfragment/group"/>
+</component>
+<component id="wsdescription" filter="s60" name="WS Service Description">
+<unit bldFile="/mw/websrv/webservices/wsdescription/group"/>
+</component>
+<component id="wsconnection" filter="s60" name="WS Service Connection">
+<unit bldFile="/mw/websrv/webservices/wsconnection/group"/>
+</component>
+<component id="wsmessages" filter="s60" name="WS Messages">
+<unit bldFile="/mw/websrv/webservices/wsmessages/group"/>
+</component>
+<component id="wscredentialmanager" filter="s60" name="WS Credential Manager">
+<unit bldFile="/mw/websrv/webservices/wscredentialmanager/group"/>
+</component>
+<component id="wsframework" filter="s60" name="WS Framework">
+<unit bldFile="/mw/websrv/webservices/wsframework/group"/>
+</component>
+<component id="wshttpchanneltransportplugin" filter="s60" name="WS HTTP Channel Transport Plugin" class="plugin">
+<unit bldFile="/mw/websrv/webservices/wshttpchanneltransportplugin/group"/>
+</component>
+<component id="wsconnectionagent" filter="s60" name="WS Connection Agent">
+<unit bldFile="/mw/websrv/webservices/wsconnectionagent/group"/>
+</component>
+<component id="wsprovider" filter="s60" name="WS Provider">
+<unit bldFile="/mw/websrv/webservices/wsprovider/group"/>
+</component>
+<component id="wshostletconnection" filter="s60" name="WS Hostlet Connection">
+<unit bldFile="/mw/websrv/webservices/wshostletconnection/group"/>
+</component>
+<component id="wsmanager" filter="s60" name="WS Service Manager">
+<unit bldFile="/mw/websrv/webservices/wsmanager/group"/>
+</component>
+<component id="wsidentitymanager" filter="s60" name="WS Identity Manager">
+<unit bldFile="/mw/websrv/webservices/wsidentitymanager/group"/>
+</component>
+<component id="idwsfplugin" filter="s60" name="ID-WSF Plugin" class="plugin">
+<unit bldFile="/mw/websrv/webservices/idwsfplugin/group"/>
+</component>
+<component id="wsibasicplugin" filter="s60" name="WS-I Basic Plugin" class="plugin">
+<unit bldFile="/mw/websrv/webservices/wsibasicplugin/group"/>
+</component>
+<component id="wsrestplugin" filter="s60" name="WS REST Plugin" class="plugin">
+<unit bldFile="/mw/websrv/webservices/wsrestplugin/group"/>
+</component>
+<component id="idwsfsecuritymechanism" filter="s60" name="ID-WSF Security Mechanism">
+<unit bldFile="/mw/websrv/webservices/idwsfsecuritymechanism/group"/>
+</component>
+<component id="wspasswordtransforms" filter="s60" name="WS Password Transforms">
+<unit bldFile="/mw/websrv/webservices/wspasswordtransforms/group"/>
+</component>
+<component id="wscore" filter="s60" name="WS Core Service Manager">
+<unit bldFile="/mw/websrv/webservices/wscore/group"/>
+</component>
+<component id="wslocaltransportplugin" filter="s60" name="WS Local Transport Plugin" class="plugin">
+<unit bldFile="/mw/websrv/webservices/wslocaltransportplugin/group"/>
+</component>
+<component id="wshostlettransportplugin" filter="s60" name="WS Hostlet Transport Plugin" class="plugin">
+<unit bldFile="/mw/websrv/webservices/wshostlettransportplugin/group"/>
+</component>
+<component id="wsstar" filter="s60" name="WS Star">
+<!-- can only have one unit. Need to split into separate components or #include from a single bld.inf -->
+<unit bldFile="/mw/websrv/webservices/wsstar/wsstarpolicy/group"/>
+<unit bldFile="/mw/websrv/webservices/wsstar/wsstarplugin/group"/>
+<unit bldFile="/mw/websrv/webservices/wsstar/wsstarmessagehandlers/group"/>
+</component>
+<component id="wsoviplugin" filter="s60" name="WS Ovi Plugin">
+<unit bldFile="/mw/websrv/webservices/wsoviplugin/group"/>
+</component>
+<component id="webservices_build" filter="s60" name="Web Services Build">
+<!-- need to split into self-contained components -->
+<unit bldFile="/mw/websrv/webservices/group"/>
+</component>
+</collection>
+<collection id="websrv_info" name="Web Services Info" level="specific">
+<component id="websrv_bld" filter="s60" name="Web Services Build">
+<!-- need to include common .hrh in each unit -->
+<unit bldFile="/mw/websrv/group"/>
+</component>
+</collection>
+</package>
+<package id="platformtools" level="generic" tech-domain="to" name="Platform Tools">
+<collection id="gfxconversion" name="Graphics Conversion">
+<component id="bmconv_s60" filter="s60" name="S60 Bitmap Converter" target="desktop">
+<unit bldFile="/mw/platformtools/gfxconversion/bmconv_s60/group"/>
+</component>
+<component id="mifconv" filter="s60" name="Multi Icon File Converter" target="desktop">
+<unit bldFile="/mw/platformtools/gfxconversion/mifconv/group"/>
+</component>
+</collection>
+</package>
+<package id="uitools" level="specific" tech-domain="to" name="UI Tools" levels="compile encode tool if">
+<collection id="uitools_pub" name="UI Tools Public Interfaces" level="if">
+<component id="third_party_bitmap_palette_api" name="Third Party Bitmap Palette API" class="api" filter="s60">
+<unit bldFile="/mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
+</component>
+</collection>
+<collection id="uitools_plat" name="UI Tools Platform Interfaces" level="if">
+<component id="cdl_api" name="CDL API" class="api" filter="s60">
+<unit bldFile="/mw/uitools/uitools_plat/cdl_api/group"/>
+</component>
+<component id="layout_system_private_api" name="Layout System Private API" class="api" filter="s60">
+<unit bldFile="/mw/uitools/uitools_plat/layout_system_private_api/group"/>
+</component>
+</collection>
+<collection id="cdlcompilertoolkit" name="CDL Compiler Toolkit" level="compile">
+<!-- collection is actually a component. Needs to be moved down a directory -->
+<component id="cdlcompilertoolkit_build" filter="s60" name="CDL Compiler Toolkit Build">
+<unit bldFile="/mw/uitools/cdlcompilertoolkit/group"/>
+</component>
+</collection>
+<collection id="cdlcompiler" name="CDL Compiler" level="compile">
+<!-- collection is actually a component. Needs to be moved down a directory -->
+<component id="cdlcompiler_build" filter="s60" name="CDL Compiler Build">
+<unit bldFile="/mw/uitools/cdlcompiler/group"/>
+</component>
+</collection>
+<collection id="gfxtools" name="Graphics Tools" level="tool">
+<component id="color" filter="s60" name="Bitmap Colour Palette" target="desktop">
+<unit bldFile="/mw/uitools/gfxtools/color/group"/>
+</component>
+</collection>
+<collection id="aknlayoutcompiler" name="Avkon Layout Compiler" level="compile">
+<!-- collection is actually a component. Needs to be moved down a directory -->
+<component id="aknlayoutcompiler_build" filter="s60" name="Avkon Layout Compiler Build">
+<unit bldFile="/mw/uitools/aknlayoutcompiler/group"/>
+</component>
+</collection>
+<collection id="skincompiler" name="Skin Compiler" level="compile">
+<component id="aknskindesccompiler" filter="s60" name="Avkon Skin Descriptor Compiler">
+<unit bldFile="/mw/uitools/skincompiler/AknSkinDescCompiler/group"/>
+</component>
+</collection>
+<collection id="reszip" name="Resource Zip" level="encode">
+<!-- collection is actually a component. Needs to be moved down a directory -->
+<component id="reszip_build" filter="s60" name="Resource Zip Build">
+<unit bldFile="/mw/uitools/reszip/group"/>
+</component>
+</collection>
+<collection id="toollibraries" name="Tool Libraries" level="tool"/>
+<collection id="svgtencoder" name="SVGT Encoder" level="encode">
+<component id="svgtenc" filter="s60" name="Standalone SVGT Encoder" target="desktop">
+<unit bldFile="/mw/uitools/svgtencoder/svgtenc/standalone/group"/>
+</component>
+</collection>
+</package>
+<!-- <package id="opensrv" level="specific" tech-domain="pr" href="../../../../mw/opensrv/package_definition.xml"/> -->
+</layer>
+<layer id="app" name="Applications" levels="services apps">
+<package id="location" level="apps" tech-domain="lo" name="Location Apps" levels="ui events loc apps">
+<collection id="loc_plat" name="Location Apps Platform Interfaces" level="apps"/>
+<collection id="loc_pub" name="Location Apps Public Interfaces" level="apps">
+<component id="landmarks_ui_selector_api" name="Landmarks UI Selector API" class="api" filter="s60">
+<unit bldFile="/app/location/loc_pub/landmarks_ui_selector_api/group"/>
+</component>
+<component id="landmarks_ui_addedit_api" name="Landmarks UI Add/Edit API" class="api" filter="s60">
+<unit bldFile="/app/location/loc_pub/landmarks_ui_addedit_api/group"/>
+</component>
+</collection>
+<collection id="basiclocationinfodisplay" name="Basic Location Info Display" level="ui">
+<component id="blid" filter="s60" name="Basic Location Info Display Build">
+<unit bldFile="/app/location/basiclocationinfodisplay/blid/group"/>
+</component>
+</collection>
+<collection id="landmarksui" name="Landmarks UI" level="loc">
+<component id="landmarksui_help" filter="s60" name="Landmarks UI Help">
+<unit bldFile="/app/location/landmarksui/help/group"/>
+</component>
+<component id="landmarksui_engine" filter="s60" name="Landmarks UI Engine">
+<unit bldFile="/app/location/landmarksui/engine/group"/>
+</component>
+<component id="uicontrols" filter="s60" name="Landmarks UI Controls">
+<unit bldFile="/app/location/landmarksui/uicontrols/group"/>
+</component>
+<component id="landmarksui_commonui" filter="s60" name="Landmarks Common UI">
+<unit bldFile="/app/location/landmarksui/commonui/group"/>
+</component>
+<component id="landmarksui_app" filter="s60" name="Landmarks Application">
+<unit bldFile="/app/location/landmarksui/app/group"/>
+</component>
+<component id="msgviewer" filter="s60" name="Landmarks Message Viewer">
+<unit bldFile="/app/location/landmarksui/msgviewer/group"/>
+</component>
+<component id="landmarksui_build" filter="s60" name="Landmarks UI Build">
+<!-- consider distributing this into the other components or collapsing into a single component -->
+<unit bldFile="/app/location/landmarksui/group"/>
+</component>
+</collection>
+<collection id="eventsui" name="Location Events UI" level="events">
+<component id="eventsui_help" filter="s60" name="Events Help">
+<unit bldFile="/app/location/eventsui/help/group"/>
+</component>
+<component id="eventsutils" filter="s60" name="Events Utils">
+<unit bldFile="/app/location/eventsui/eventsutils/group"/>
+</component>
+<component id="eventsengine" filter="s60" name="Events Engine">
+<unit bldFile="/app/location/eventsui/eventsengine/group"/>
+</component>
+<component id="eventshandlerui" filter="s60" name="Events Handler UI">
+<unit bldFile="/app/location/eventsui/eventshandlerui/group"/>
+</component>
+<component id="eventseditor" filter="s60" name="Events Editor">
+<unit bldFile="/app/location/eventsui/eventseditor/group"/>
+</component>
+<component id="eventsmgmtui" filter="s60" name="Events Management UI">
+<unit bldFile="/app/location/eventsui/eventsmgmtui/group"/>
+</component>
+<component id="eventsui_build" filter="s60" name="Events UI Build">
+<!-- consider distributing this into the other components or collapsing into a single component -->
+<unit bldFile="/app/location/eventsui/group"/>
+</component>
+</collection>
+<collection id="locationlandmarksrefappfors60" name="Location Landmarks Reference App for S60" level="apps">
+<!-- this is a component, needs to be moved down a directory -->
+<component id="lmrefapp" filter="s60" name="Landmarks Reference Application">
+<unit bldFile="/app/location/locationlandmarksrefappfors60/group"/>
+</component>
+</collection>
+<collection id="locationlandmarksuirefapp" name="Location Landmarks UI Reference App" level="apps">
+<!-- this is a component, needs to be moved down a directory -->
+<component id="lmuirefapp" filter="s60" name="Landmarks UI Reference Application">
+<unit bldFile="/app/location/locationlandmarksuirefapp/group"/>
+</component>
+</collection>
+<collection id="locationsatviewrefapp" name="Location Satellite View Reference App" level="apps">
+<!-- this is a component, needs to be moved down a directory -->
+<component id="satellitereference" filter="s60" name="Satellite Info UI Reference Application">
+<unit bldFile="/app/location/locationsatviewrefapp/group"/>
+</component>
+</collection>
+<collection id="simpsyconfigurator" name="Simulation PSY Configurator" level="ui">
+<!-- this is a component, needs to be moved down a directory -->
+<component id="simpsyui" filter="s60" name="Simulation PSY UI">
+<unit bldFile="/app/location/simpsyconfigurator/group"/>
+</component>
+</collection>
+<collection id="mapnavproviderrefapp" name="Map and Navigation Provider Reference App" level="apps">
+<!-- this is a component, needs to be moved down a directory -->
+<component id="mapnavproviderrefapp_build" filter="s60" name="Map and Navigation Provider Reference Application">
+<unit bldFile="/app/location/mapnavproviderrefapp/group"/>
+</component>
+</collection>
+</package>
+<package id="mmsharinguis" level="services" tech-domain="vc" name="Multimedia Sharing UIs" levels="base plugin if">
+<collection id="mmsharinguis_plat" name="Multimedia Sharing UIs Platform Interfaces" level="if">
+<component id="multimedia_sharing_settings_api" name="Multimedia Sharing Settings API" class="api" filter="s60">
+<unit bldFile="/app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_settings_api/group"/>
+</component>
+<component id="multimedia_sharing_resource_api" name="Multimedia Sharing Resource API" class="api" filter="s60">
+<unit bldFile="/app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_resource_api/group"/>
+</component>
+<component id="multimedia_sharing_manager_api" name="Multimedia Sharing Manager API" class="api" filter="s60">
+<unit bldFile="/app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/group"/>
+</component>
+</collection>
+<collection id="mmsharing" name="Multimedia Sharing" level="base">
+<component id="mmshavailability" filter="s60" name="Multimedia Sharing Availability">
+<unit bldFile="/app/mmsharinguis/mmsharing/mmshavailability/group"/>
+</component>
+<component id="mmshindicator" filter="s60" name="Multimedia Sharing Indicator">
+<unit bldFile="/app/mmsharinguis/mmsharing/mmshindicator/group"/>
+</component>
+<!-- consider putting client and server in the same component -->
+<component id="mmshmanagercli" filter="s60" name="Multimedia Sharing Manager Client">
+<unit bldFile="/app/mmsharinguis/mmsharing/mmshmanagercli/group" filter="!test"/>
+
+</component>
+<component id="mmshmanagersrv" filter="s60" name="Multimedia Sharing Manager Server">
+<unit bldFile="/app/mmsharinguis/mmsharing/mmshmanagersrv/group"/>
+</component>
+<component id="mmshengine" filter="s60" name="Multimedia Sharing Engine">
+<unit bldFile="/app/mmsharinguis/mmsharing/mmshengine/group"/>
+</component>
+<component id="mmshui" filter="s60" name="Multimedia Sharing UI">
+<!-- can only have one unit: need to #include one from the other if it's needed -->
+<unit bldFile="/app/mmsharinguis/mmsharing/mmshui/group"/>
+<unit bldFile="/app/mmsharinguis/mmsharing/mmshui/help/group"/>
+</component>
+<component id="mmsharing_build" filter="s60" name="MM Sharing Build">
+<unit bldFile="/app/mmsharinguis/mmsharing/group"/>
+</component>
+</collection>
+<collection id="mmshplugins" name="Multimedia Sharing Plugins" level="plugin">
+<component id="mmshaoplugin" filter="s60" name="Multimedia Sharing Always Online Plugin" class="plugin">
+<unit bldFile="/app/mmsharinguis/mmshplugins/mmshaoplugin/group"/>
+</component>
+<component id="mmshaiwplugin" filter="s60" name="Multimedia Sharing AIW Plugin" class="plugin">
+<unit bldFile="/app/mmsharinguis/mmshplugins/mmshaiwplugin/group"/>
+</component>
+<component id="mmshsipcrplugin" filter="s60" name="Multimedia Sharing SIP Client Resolver Plugin" class="plugin">
+<unit bldFile="/app/mmsharinguis/mmshplugins/mmshsipcrplugin/group"/>
+</component>
+<component id="mmshsettingsuiplugin" filter="s60" name="Multimedia Sharing Settings UI Plugin" class="plugin">
+<unit bldFile="/app/mmsharinguis/mmshplugins/mmshsettingsuiplugin/group"/>
+</component>
+<component id="mmshwpadapterplugin" filter="s60" name="Multimedia Sharing WAP Provisioning Adapter" class="plugin">
+<unit bldFile="/app/mmsharinguis/mmshplugins/mmshwpadapterplugin/group"/>
+</component>
+</collection>
+<collection id="mmsharinguis_info" name="Multimedia Sharing UIs Info" level="if">
+<component id="mmsharinguis_build" filter="s60" name="Multimedia Sharing UIs Build">
+<!-- consider distributing to other components -->
+<unit bldFile="/app/mmsharinguis/group"/>
+</component>
+</collection>
+</package>
+<package id="phone" level="apps" span="2" tech-domain="vc" name="Phone Apps" levels="engine plugin ui app">
+<collection id="phone_plat" name="Phone Apps Platform Interfaces" level="app">
+<component id="3d_ringing_tone_enabler_api" name="3D Ringing Tone Enabler API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
+</component>
+<component id="telephony_comms_information_api" name="Telephony Comms Information API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/telephony_comms_information_api/group"/>
+</component>
+<component id="telephony_information_api" name="Telephony Information API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/telephony_information_api/group"/>
+</component>
+<component id="telephony_device_mode_api" name="Telephony Device Mode API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/telephony_device_mode_api/group"/>
+</component>
+<component id="telephony_remote_party_information_api" name="Telephony Remote Party Information API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/telephony_remote_party_information_api/group"/>
+</component>
+<component id="telephony_video_mailbox_settings_api" name="Telephony Video Mailbox Settings API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/telephony_video_mailbox_settings_api/group"/>
+</component>
+<component id="telephony_configuration_api" name="Telephony Configuration API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/telephony_configuration_api/group"/>
+</component>
+<component id="telephony_microphone_mute_status_api" name="Telephony Microphone Mute Status API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/telephony_microphone_mute_status_api/group"/>
+</component>
+<component id="dialer_keypad_api" name="Dialer Keypad API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/dialer_keypad_api/group"/>
+</component>
+<component id="telephony_logging_extension_api" name="Telephony Logging Extension API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/telephony_logging_extension_api/group"/>
+</component>
+<component id="telephony_matching_extension_api" name="Telephony Matching Extension API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/telephony_matching_extension_api/group"/>
+</component>
+<component id="telephony_bubble_extension_api" name="Telephony Bubble Extension API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/telephony_bubble_extension_api/group"/>
+</component>
+<component id="telephony_menu_extension_api" name="Telephony Menu Extension API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/telephony_menu_extension_api/group"/>
+</component>
+<component id="phone_application_commands_api" name="Phone Application Commands API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/phone_application_commands_api/group"/>
+</component>
+<component id="phone_application_voip_commands_api" name="Phone Application VOIP Commands API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/phone_application_voip_commands_api/group"/>
+</component>
+<component id="telephony_mediator_api" name="Telephony Mediator API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/telephony_mediator_api/group"/>
+</component>
+<component id="video_telephony_mediator_api" name="Video Telephony Mediator API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/video_telephony_mediator_api/group"/>
+</component>
+</collection>
+<collection id="phoneapp" name="Phone Application" level="app">
+<component id="blacklist" filter="s60" name="Phone Blacklist Clearing" class="plugin">
+<unit bldFile="/app/phone/phoneapp/blacklist/group"/>
+</component>
+<component id="phoneui" filter="s60" name="Phone UI">
+<unit bldFile="/app/phone/phoneapp/phoneui/group" filter="!test"/>
+
+</component>
+<component id="phoneuicontrol" filter="s60" name="Phone UI Control">
+<unit bldFile="/app/phone/phoneapp/phoneuicontrol/group"/>
+</component>
+<component id="phoneuistates" filter="s60" name="Phone UI States">
+<unit bldFile="/app/phone/phoneapp/phoneuistates/group"/>
+</component>
+<component id="phoneuiutils" filter="s60" name="Phone UI Utils">
+<unit bldFile="/app/phone/phoneapp/phoneuiutils/group"/>
+</component>
+<component id="phoneuiview" filter="s60" name="Phone UI View">
+<unit bldFile="/app/phone/phoneapp/phoneuiview/group"/>
+</component>
+<component id="phoneuivoipextension" filter="s60" name="Phone UI VOIP Extension">
+<unit bldFile="/app/phone/phoneapp/phoneuivoipextension/group"/>
+</component>
+<component id="silenceactionplugin" filter="s60" name="Silence Action Plugin" class="plugin">
+<unit bldFile="/app/phone/phoneapp/silenceactionplugin/group"/>
+</component>
+<component id="phonemediatorcenter" filter="s60" name="Phone Mediator Center">
+<unit bldFile="/app/phone/phoneapp/phonemediatorcenter/group"/>
+</component>
+</collection>
+<collection id="phoneengine" name="Phone Engine" level="engine">
+<component id="phonecntfinder" filter="s60" name="Phone Contact Finder">
+<unit bldFile="/app/phone/phoneengine/phonecntfinder/group"/>
+</component>
+<component id="audiohandling" filter="s60" name="Phone Audio Handling">
+<unit bldFile="/app/phone/phoneengine/audiohandling/group"/>
+</component>
+<component id="callhandling" filter="s60" name="Call Handling">
+<unit bldFile="/app/phone/phoneengine/callhandling/group"/>
+</component>
+<component id="contacthandling" filter="s60" name="Phone Contact Handling">
+<unit bldFile="/app/phone/phoneengine/contacthandling/group"/>
+</component>
+<component id="loghandling" filter="s60" name="Phone Log Handling">
+<unit bldFile="/app/phone/phoneengine/loghandling/group"/>
+</component>
+<component id="engineinfo" filter="s60" name="Phone Engine Info">
+<unit bldFile="/app/phone/phoneengine/engineinfo/group"/>
+</component>
+<component id="phonemodel" filter="s60" name="Phone Model">
+<unit bldFile="/app/phone/phoneengine/phonemodel/group"/>
+</component>
+<component id="servicehandling" filter="s60" name="Phone Service Handling">
+<unit bldFile="/app/phone/phoneengine/servicehandling/group"/>
+</component>
+</collection>
+<collection id="phonesettings" name="Phone Settings" level="plugin">
+<component id="aiwcallimageplugin" filter="s60" name="Call Image AIW Plugin" class="plugin">
+<unit bldFile="/app/phone/phonesettings/aiwcallimageplugin/group"/>
+</component>
+<component id="pslncallimageplugin" filter="s60" name="Call Image Personalization Plugin" class="plugin">
+<unit bldFile="/app/phone/phonesettings/pslncallimageplugin/group"/>
+</component>
+</collection>
+<collection id="phoneuis" name="Phone UIs" level="ui">
+<component id="dialer" filter="s60" name="Dialer">
+<unit bldFile="/app/phone/phoneuis/dialer/group" filter="!test"/>
+
+</component>
+<component id="easydialing" filter="s60" name="Easy Dialing Plugin" class="plugin" introduced="^3">
+<unit bldFile="/app/phone/phoneuis/easydialing/group"/>
+</component>
+<component id="bubblemanager" filter="s60" name="Phone Bubble Manager">
+<unit bldFile="/app/phone/phoneuis/bubblemanager/group"/>
+</component>
+<component id="connectutil" filter="s60" name="Connection Utility" class="plugin">
+<unit bldFile="/app/phone/phoneuis/connectutil/group"/>
+</component>
+<component id="ussd" filter="s60" name="Unstructured Supplementary Services Data">
+<unit bldFile="/app/phone/phoneuis/ussd/group"/>
+</component>
+<component id="vmbx" filter="s60" name="Voice Mailbox">
+<unit bldFile="/app/phone/phoneuis/vmbx/group"/>
+</component>
+<component id="telephonydevicemode" filter="s60" name="Telephony Device Mode">
+<unit bldFile="/app/phone/phoneuis/telephonydevicemode/group"/>
+</component>
+</collection>
+<collection id="phoneplugins" name="Phone Plugins" level="plugin">
+<component id="telbranding" filter="s60" name="Tel Branding" class="plugin" introduced="^2">
+<unit bldFile="/app/phone/phoneplugins/telbranding/group"/>
+</component>
+</collection>
+</package>
+<package id="videotelephony" level="apps" tech-domain="vc" name="Video Telephony Apps" levels="engine plugin prot ui">
+<collection id="videotelephony_plat" name="VT Apps Platform Interfaces" level="ui">
+<component id="video_telephony_control_mediator_api" name="Video Telephony Control Mediator API" class="api" filter="s60">
+<unit bldFile="/app/videotelephony/videotelephony_plat/video_telephony_control_mediator_api/group"/>
+</component>
+<component id="video_telephony_media_configuration_api" name="Video Telephony Media Configuration API" class="api" filter="s60">
+<unit bldFile="/app/videotelephony/videotelephony_plat/video_telephony_media_configuration_api/group"/>
+</component>
+</collection>
+<collection id="vtengines" name="Video Telephony Engines" level="engine">
+<component id="videoteleng" filter="s60" name="Video Telephony Engine">
+<unit bldFile="/app/videotelephony/vtengines/videoteleng/Group"/>
+</component>
+<component id="vtmediatorplugin" filter="s60" name="VT Mediator Plugin" class="plugin">
+<unit bldFile="/app/videotelephony/vtengines/vtmediatorplugin/group"/>
+</component>
+</collection>
+<collection id="vtuis" name="Video Telephony UIs" level="ui">
+<component id="videotelui" filter="s60" name="Video Telephony UI">
+<unit bldFile="/app/videotelephony/vtuis/videotelui/group"/>
+</component>
+</collection>
+<collection id="vtprotocolplugins" name="VT Protocol Plugins" level="plugin">
+<component id="displaysink" filter="s60" name="Display Sink" introduced="^2">
+<unit bldFile="/app/videotelephony/vtprotocolplugins/DisplaySink/group"/>
+</component>
+<component id="videosource" filter="s60" name="Video Source" introduced="^2">
+<unit bldFile="/app/videotelephony/vtprotocolplugins/VideoSource/group"/>
+</component>
+</collection>
+<collection id="vtprotocolsstub" name="VT Protocols Stub" level="prot">
+<!-- this collection is really a component, move down a directory -->
+<component id="videotelproto" filter="s60" name="Video Telephony Protocol">
+<unit bldFile="/app/videotelephony/vtprotocolsstub/group" filter="sf_build"/>
+</component>
+</collection>
+</package>
+<package id="iptelephony" level="apps" tech-domain="vc" name="IP Telephony" levels="eng plugin util ui">
+<collection id="iptel_plat" name="IP Telephony Platform Interfaces" level="ui">
+<component id="richcallsettingsengine_api" name="Rich Call Settings Engine API" introduced="^2" class="api" filter="s60">
+<unit bldFile="/app/iptelephony/iptel_plat/richcallsettingsengine_api/group"/>
+</component>
+<component id="cch_client_api" name="CCH Client API" introduced="^2" class="api" filter="s60">
+<unit bldFile="/app/iptelephony/iptel_plat/cch_client_api/group"/>
+</component>
+<component id="cch_server_api" name="CCH Server API" introduced="^2" class="api" filter="s60">
+<unit bldFile="/app/iptelephony/iptel_plat/cch_server_api/group"/>
+</component>
+<component id="csc_settingsui_api" name="CSC Settings UI API" introduced="^2" class="api" filter="s60">
+<unit bldFile="/app/iptelephony/iptel_plat/csc_settingsui_api/group"/>
+</component>
+<component id="vccpropertyhandler_api" name="VCC Property Handler API" introduced="^2" class="api" filter="s60">
+<unit bldFile="/app/iptelephony/iptel_plat/vccpropertyhandler_api/group"/>
+</component>
+<component id="vcc_api" name="VCC API" introduced="^2" class="api" filter="s60">
+<unit bldFile="/app/iptelephony/iptel_plat/vcc_api/group"/>
+</component>
+</collection>
+<collection id="iptelcommsconfig" name="IP Telephony Comms Config" level="ui">
+<component id="cscgsplugin" filter="s60" name="CSC GS Plugin" class="plugin" introduced="^2">
+<unit bldFile="/app/iptelephony/commsconfig/cscgsplugin/group"/>
+</component>
+<component id="cscsipvoipcleanupplugin" filter="s60" name="CSC SIP VoIP Cleanup Plugin" class="plugin" introduced="^2">
+<unit bldFile="/app/iptelephony/commsconfig/cscsipvoipcleanupplugin/group"/>
+</component>
+<component id="cscengine" filter="s60" name="Connection Service Configurator Engine" introduced="^2">
+<unit bldFile="/app/iptelephony/commsconfig/cscengine/group"/>
+</component>
+<component id="cscsettingsui" filter="s60" name="CSC Settings UI" introduced="^2">
+<unit bldFile="/app/iptelephony/commsconfig/cscsettingsui/group"/>
+</component>
+<component id="cscapplicationui" filter="s60" name="CSC Application UI" introduced="^2">
+<unit bldFile="/app/iptelephony/commsconfig/cscapplicationui/group"/>
+</component>
+<component id="commsconfig_build" filter="s60" name="Comms Config Build" introduced="^2">
+<!-- consider distributing this into the above components -->
+<unit bldFile="/app/iptelephony/commsconfig/group"/>
+</component>
+</collection>
+<collection id="convergedconnectionhandler" name="Converged Connection Handler" level="eng">
+<component id="cchserver" filter="s60" name="CCH Server" introduced="^2">
+<unit bldFile="/app/iptelephony/convergedconnectionhandler/cchserver/group"/>
+</component>
+<component id="cchclient" filter="s60" name="CCH Client" introduced="^2">
+<unit bldFile="/app/iptelephony/convergedconnectionhandler/cchclient/group"/>
+</component>
+<component id="cchclientapi" filter="s60" name="CCH Client API" introduced="^2">
+<unit bldFile="/app/iptelephony/convergedconnectionhandler/cchclientapi/group"/>
+</component>
+<component id="convergedconnectionhandler_build" filter="s60" name="CCH Build" introduced="^2">
+<!-- consider distributing this into the above components, or collapse the collection into a single component.
+ The latter is a better option since clients and sevrers are rarely separate components -->
+<unit bldFile="/app/iptelephony/convergedconnectionhandler/group"/>
+</component>
+</collection>
+<collection id="richcallsettingsengine" name="Rich Call Settings Engine" level="eng">
+<component id="rcse2" filter="s60" name="Rich Call Settings Engine Build" introduced="^2">
+<unit bldFile="/app/iptelephony/richcallsettingsengine/rcse2/group"/>
+</component>
+</collection>
+<collection id="sipvoipprovider" name="SIP VoIP Provider" level="plugin">
+<!-- collection is really a component. Should move down a directory -->
+<component id="svp" filter="s60" name="SIP VoIP Provider Build" class="plugin" introduced="^2">
+<unit bldFile="/app/iptelephony/sipvoipprovider/group"/>
+</component>
+</collection>
+<collection id="voipplugins" name="VoIP Plugins" level="plugin">
+<component id="sipmxresolver" filter="s60" name="SIP MX Resolver" class="plugin" introduced="^2">
+<unit bldFile="/app/iptelephony/voipplugins/sipmxresolver/group"/>
+</component>
+<component id="sipconnectionprovider" filter="s60" name="SIP Connection Provider" class="plugin" introduced="^2">
+<unit bldFile="/app/iptelephony/voipplugins/sipconnectionprovider/group"/>
+<!-- can only have one unit, can the next be #'included from the above? -->
+<unit bldFile="/app/iptelephony/voipplugins/sipconnectionprovider/ipvoicemailengine/group"/>
+</component>
+<component id="ipapputils" filter="s60" name="IP App Utils" introduced="^2">
+<unit bldFile="/app/iptelephony/voipplugins/ipapputils/group"/>
+</component>
+<component id="voipadapters" filter="s60" name="VoIP Adapters" class="plugin" introduced="^2">
+<unit bldFile="/app/iptelephony/voipplugins/voipadapters/group"/>
+</component>
+<component id="accountcreationplugin" filter="s60" name="Account Creation Plugin" class="plugin" introduced="^2">
+<unit bldFile="/app/iptelephony/voipplugins/accountcreationplugin/group"/>
+</component>
+<component id="dhcppositionprovider" filter="s60" name="DHCP Position Provider" class="plugin" introduced="^2">
+<unit bldFile="/app/iptelephony/voipplugins/dhcppositionprovider/group"/>
+</component>
+<component id="svtmatching" filter="s60" name="SIP VoIP Telephony Matching" class="plugin" introduced="^2">
+<unit bldFile="/app/iptelephony/voipplugins/svtmatching/group"/>
+</component>
+<component id="svtlogging" filter="s60" name="SVT Logging" class="plugin" introduced="^2">
+<unit bldFile="/app/iptelephony/voipplugins/svtlogging/group"/>
+</component>
+<component id="svtcallmenu" filter="s60" name="SVT Call Menu" class="plugin" introduced="^2">
+<unit bldFile="/app/iptelephony/voipplugins/svtcallmenu/group"/>
+</component>
+<component id="sipimresolver" filter="s60" name="SIP IM Resolver" class="plugin" introduced="^3">
+<unit bldFile="/app/iptelephony/voipplugins/sipimresolver/group"/>
+</component>
+</collection>
+<collection id="callcontinuity" name="Call Continuity" level="util">
+<component id="vccutils" filter="s60" name="VCC Utils" introduced="^2">
+<unit bldFile="/app/iptelephony/callcontinuity/vccutils/group"/>
+</component>
+<component id="nsmldmvccadapter" filter="s60" name="SyncML DM VCC Adapter" class="plugin" introduced="^2">
+<unit bldFile="/app/iptelephony/callcontinuity/nsmldmvccadapter/group"/>
+</component>
+<component id="vccclientprovisioningadapter" filter="s60" name="VCC Client Provisioning Adapter" class="plugin" introduced="^2">
+<unit bldFile="/app/iptelephony/callcontinuity/vccclientprovisioningadapter/group"/>
+</component>
+<component id="vccpropertyhandler" filter="s60" name="VCC Property Handler" introduced="^2">
+<unit bldFile="/app/iptelephony/callcontinuity/vccpropertyhandler/group"/>
+</component>
+<component id="vcchotrigger" filter="s60" name="VCC HO Trigger" introduced="^2">
+<unit bldFile="/app/iptelephony/callcontinuity/vcchotrigger/group"/>
+</component>
+<component id="vcc" filter="s60" name="VoIP Call Continuity" class="plugin" introduced="^2">
+<unit bldFile="/app/iptelephony/callcontinuity/vcc/group"/>
+</component>
+<component id="callcontinuity_build" filter="s60" name="Call Continuity Build" introduced="^2">
+<!-- consider distributing this into the above components -->
+<unit bldFile="/app/iptelephony/callcontinuity/group"/>
+</component>
+</collection>
+</package>
+<package id="settingsuis" level="services" tech-domain="dm" name="Settings UIs" levels="rsc ui">
+<collection id="devmngt_plat" name="Settings UIs Platform Interfaces" level="ui">
+<component id="default_app_client_api" name="Default App Client API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/app/settingsuis/devmngt_plat/default_app_client_api/group"/>
+</component>
+<component id="services_db_api" name="Services DB API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/app/settingsuis/devmngt_plat/services_db_api/group" filter="!test"/>
+
+</component>
+</collection>
+<collection id="defaultapplicationsettings" name="Default Application Settings" level="rsc">
+<component id="services_db" filter="s60" name="Services Database" introduced="^1">
+<unit bldFile="/app/settingsuis/defaultapplicationsettings/services_db/group"/>
+</component>
+<component id="defaultapplicationsettings_server" filter="s60" name="Default Application Server" introduced="^1">
+<unit bldFile="/app/settingsuis/defaultapplicationsettings/server/group"/>
+</component>
+<component id="service" filter="s60" name="Default Application Service" introduced="^1">
+<unit bldFile="/app/settingsuis/defaultapplicationsettings/service/group"/>
+</component>
+<component id="dasgsplugin" filter="s60" name="Default Application Settings GS Plugin" class="plugin" introduced="^1">
+<unit bldFile="/app/settingsuis/defaultapplicationsettings/gsplugin/group"/>
+</component>
+<component id="defaultapplicationsettings_build" filter="s60" name="Default Application Settings Build" introduced="^1">
+<!-- split the IBYs up into the appropriate components? Make this a ROM component? -->
+<unit bldFile="/app/settingsuis/defaultapplicationsettings/group"/>
+</component>
+</collection>
+<collection id="systemswuis" name="System SW UIs" level="ui">
+<component id="touchscreencalib" filter="s60" name="Touchscreen Calibration" introduced="^1">
+<unit bldFile="/app/settingsuis/systemswuis/touchscreencalib/group"/>
+</component>
+</collection>
+</package>
+<package id="contentcontrol" level="services" tech-domain="dm" name="Content Control Daemons" levels="plugin app">
+<collection id="contentctrl_plat" name="Content Control Daemons Platforn Interfaces" level="app">
+<component id="oma_ds_presync_plugin_api" name="OMA DS PreSync Plugin API" class="api" filter="s60">
+<unit bldFile="/app/contentcontrol/contentctrl_plat/oma_ds_presync_plugin_api/group"/>
+</component>
+<component id="ds_agenda_handler_plugin_api" name="DS Agenda Handler Plugin API" class="api" filter="s60">
+<unit bldFile="/app/contentcontrol/contentctrl_plat/ds_agenda_handler_plugin_api/group"/>
+</component>
+<component id="ds_folder_util_api" name="DS Folder Util API" class="api" filter="s60">
+<unit bldFile="/app/contentcontrol/contentctrl_plat/ds_folder_util_api/group"/>
+</component>
+<component id="adapter_customization_api" name="Adapter Customization API" class="api" filter="s60" introduced="^3">
+<unit bldFile="/app/contentcontrol/contentctrl_plat/adapter_customization_api/group"/>
+</component>
+<component id="ds_data_modification_api" name="DS Data Modification API" class="api" filter="s60" introduced="^3">
+<unit bldFile="/app/contentcontrol/contentctrl_plat/ds_data_modification_api/group"/>
+</component>
+</collection>
+<collection id="dsdcmoadapter" name="Data Sync DCMO Adapter" level="plugin">
+<!-- Component at wrong rank, should move down a directory -->
+<component id="dsdcmoadapter_build" filter="s60" name="Data Sync Control DCMO Adapter">
+<unit bldFile="/app/contentcontrol/dsdcmoadapter/group"/>
+</component>
+</collection>
+<collection id="omads" name="OMA Data Sync" level="app">
+<component id="omadsappui" filter="s60" name="OMA DS Application UI">
+<unit bldFile="/app/contentcontrol/omads/omadsappui/group"/>
+</component>
+<component id="omadsextensions" filter="s60" name="OMA DS Extensions" class="plugin">
+<unit bldFile="/app/contentcontrol/omads/omadsextensions/group"/>
+</component>
+</collection>
+</package>
+<package id="devicecontrol" level="services" tech-domain="dm" name="Device Control Daemons" levels="oma mid app">
+<collection id="devicediagnostics" name="Device Diagnostics" level="app">
+<component id="devdiagapp" filter="s60" name="Device Diagnostics App">
+<unit bldFile="/app/devicecontrol/devicediagnostics/devdiagapp/group"/>
+</component>
+<component id="devdiaggsplugin" filter="s60" name="Device Diagnostics GS Plugin" class="plugin">
+<unit bldFile="/app/devicecontrol/devicediagnostics/devdiaggsplugin/group"/>
+</component>
+<component id="diagplugins" filter="s60" name="Diagnostics Plugins" class="plugin">
+<unit bldFile="/app/devicecontrol/devicediagnostics/diagplugins/group"/>
+</component>
+<component id="diagsuites" filter="s60" name="Diagnostics Suites" class="plugin">
+<unit bldFile="/app/devicecontrol/devicediagnostics/diagsuites/group"/>
+</component>
+<component id="devicediagnostics_build" filter="s60" name="Device Diagnostics Build">
+<!-- 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 id="omadm" name="OMA Device Management" level="oma">
+<component id="omadmappui" filter="s60" name="OMA DM Application UI">
+<unit bldFile="/app/devicecontrol/omadm/omadmappui/group"/>
+</component>
+<component id="omadmextensions" filter="s60" name="OMA DM Extensions" class="plugin">
+<unit bldFile="/app/devicecontrol/omadm/omadmextensions/group"/>
+</component>
+<component id="dcmo" filter="s60" name="Device Capabilities Management Object" class="plugin" introduced="^3">
+<unit bldFile="/app/devicecontrol/omadm/dcmo/group"/>
+</component>
+</collection>
+<collection id="pnpmobileservices" name="PnP Mobile Services" level="mid">
+<component id="pnpms" filter="s60" name="PnP MS">
+<unit bldFile="/app/devicecontrol/pnpmobileservices/pnpms/group"/>
+</component>
+</collection>
+<collection id="applicationmanagement" name="Application Management" level="app">
+<!-- could this collection be collapsed into a single component and moved down a dir? Do all these need to be noted separately? -->
+<component id="applicationmanagement_options" filter="s60" name="AM Install Options">
+<unit bldFile="/app/devicecontrol/applicationmanagement/options/group"/>
+</component>
+<component id="applicationmanagement_client" filter="s60" name="AM Client">
+<unit bldFile="/app/devicecontrol/applicationmanagement/client/group"/>
+</component>
+<component id="applicationmanagement_server" filter="s60" name="AM Server">
+<unit bldFile="/app/devicecontrol/applicationmanagement/server/group"/>
+</component>
+<component id="rfsplugin" filter="s60" name="AM RFS Plugin" class="plugin">
+<unit bldFile="/app/devicecontrol/applicationmanagement/rfsplugin/group"/>
+</component>
+<component id="amadapter2" filter="s60" name="AM Adapter" class="plugin">
+<unit bldFile="/app/devicecontrol/applicationmanagement/amadapter2/group"/>
+</component>
+<component id="omascomoadapter" filter="s60" name="OMA SCOMO Adapter" class="plugin" introduced="^3">
+<unit bldFile="/app/devicecontrol/applicationmanagement/omascomoadapter/group"/>
+</component>
+<component id="applicationmanagement_build" filter="s60" name="AM Build">
+<!-- If thes aren't collapsed into one cmp, can all #includes removed from here, and it renamed AM ROM? -->
+<unit bldFile="/app/devicecontrol/applicationmanagement/group"/>
+</component>
+</collection>
+<collection id="customization" name="DM Customization Adapters" level="mid">
+<component id="dmutils" name="DM Utils" filter="s60">
+<unit bldFile="/app/devicecontrol/customization/dmutils/bld"/>
+</component>
+<component id="uisettingssrv" filter="s60" name="UI Settings Server">
+<unit bldFile="/app/devicecontrol/customization/uisettingssrv/bld"/>
+</component>
+<component id="supadapter" filter="s60" name="Startup Adapter" class="plugin">
+<unit bldFile="/app/devicecontrol/customization/supadapter/bld"/>
+</component>
+<component id="wallpaperadapter" filter="s60" name="Wallpaper Adapter" class="plugin">
+<unit bldFile="/app/devicecontrol/customization/wallpaperadapter/bld"/>
+</component>
+<component id="operatorlogoadapter" filter="s60" name="Operator Logo Adapter" class="plugin">
+<unit bldFile="/app/devicecontrol/customization/operatorlogoadapter/bld"/>
+</component>
+<component id="screensaveradapter" filter="s60" name="Screen Saver Adapter" class="plugin">
+<unit bldFile="/app/devicecontrol/customization/screensaveradapter/bld"/>
+</component>
+<component id="themesadapter" filter="s60" name="Themes Adapter" class="plugin">
+<unit bldFile="/app/devicecontrol/customization/themesadapter/bld"/>
+</component>
+<component id="embeddedlinkadapter" filter="s60" name="Embedded Link Adapter" class="plugin">
+<unit bldFile="/app/devicecontrol/customization/embeddedlinkadapter/bld"/>
+</component>
+<component id="customization_build" filter="s60" name="DM Customization Build">
+<!-- If thes aren't collapsed into one cmp, can all #includes removed from here, and it renamed DM Customization ROM? -->
+<unit bldFile="/app/devicecontrol/customization/group"/>
+</component>
+</collection>
+<collection id="omacp" name="OMA Content Provisioning" level="oma">
+<component id="omacpadapters" filter="s60" name="OMA CP Adapters" class="plugin">
+<unit bldFile="/app/devicecontrol/omacp/omacpadapters/group"/>
+</component>
+</collection>
+</package>
+<package id="printing" level="services" tech-domain="de" name="Printing" levels="app">
+<collection id="DirectPrint" name="DirectPrint" level="app">
+<component id="DirectPrintApp" filter="sf_build" name="DirectPrint App" introduced="^3">
+<unit bldFile="/app/printing/DirectPrint/DirectPrintApp/group"/>
+</component>
+<component id="DirectPrintServer" filter="sf_build" name="DirectPrint Server" introduced="^3">
+<unit bldFile="/app/printing/DirectPrint/DirectPrintServer/group"/>
+</component>
+<component id="DirectPrintClient" filter="sf_build" name="DirectPrint Client" introduced="^3">
+<unit bldFile="/app/printing/DirectPrint/DirectPrintClient/group"/>
+</component>
+</collection>
+<collection id="imageprint" name="ImagePrint" level="app">
+<component id="clog" filter="s60" name="ImagePrint Logging" introduced="^2">
+<unit bldFile="/app/printing/imageprint/clog/group"/>
+</component>
+<component id="imageprintengine" filter="s60" name="ImagePrint Engine" introduced="^2">
+<unit bldFile="/app/printing/imageprint/imageprintengine/group"/>
+</component>
+<component id="imageprintui" filter="s60" name="ImagePrint UI" introduced="^2">
+<unit bldFile="/app/printing/imageprint/imageprintui/group"/>
+</component>
+<component id="imageprint_build" filter="s60" name="ImagePrint Build" introduced="^2">
+<!-- Need to break the IBY includes into the other components, or remove #includes and make this a ROM component -->
+<unit bldFile="/app/printing/imageprint/group"/>
+</component>
+</collection>
+</package>
+<package id="files" level="apps" tech-domain="pr" name="File Manager Apps" levels="support apps">
+<collection id="files_plat" name="File Manager Apps Platform Interfaces" level="apps">
+<component id="memory_scan_popup_ui_api" name="Memory Scan Popup UI API" class="api" filter="s60">
+<unit bldFile="/app/files/files_plat/memory_scan_popup_ui_api/group"/>
+</component>
+</collection>
+<collection id="deviceencryption" name="Device Encryption" level="support">
+<!-- this is either needs to be broken up into idependent bld.infs, or it's really a component and should move down a directory -->
+<component id="devencnotifplugin" filter="s60" name="Device Encryption Notifier Plugin" class="plugin" introduced="^3">
+<unit bldFile="/app/files/deviceencryption/devencnotifplugin/group"/>
+</component>
+<component id="devencui" filter="s60" name="Device Encryption UI" introduced="^3">
+<unit bldFile="/app/files/deviceencryption/devencui/group"/>
+</component>
+<component id="devencdmadapter" filter="s60" name="Device Encryption DM Adapter" class="plugin" introduced="^3">
+<unit bldFile="/app/files/deviceencryption/devencdmadapter/group"/>
+</component>
+<component id="devencgsplugin" filter="s60" name="Device Encryption GS Plugin" class="plugin" introduced="^3">
+<unit bldFile="/app/files/deviceencryption/devencgsplugin/group"/>
+</component>
+<component id="deviceencryption_help" filter="s60" name="Device Encryption Help" introduced="^3">
+<unit bldFile="/app/files/deviceencryption/help/group"/>
+</component>
+<component id="deviceencryption_build" filter="s60" name="Device Encryption Build" introduced="^3">
+<unit bldFile="/app/files/deviceencryption/group"/>
+</component>
+</collection>
+<collection id="filemanager" name="File Manager" level="apps">
+<!-- this is really a component, should move down a directory -->
+<component id="filemanager_build" filter="s60" name="File Manager Build">
+<unit bldFile="/app/files/filemanager/group"/>
+</component>
+</collection>
+<collection id="filesystemuis" name="File System UIs" level="support">
+<component id="memscaneng" filter="s60" name="Memory Scan Server">
+<unit bldFile="/app/files/filesystemuis/memscaneng/group"/>
+</component>
+<component id="memstatepopup" filter="s60" name="Memory State Popup">
+<unit bldFile="/app/files/filesystemuis/memstatepopup/group"/>
+</component>
+</collection>
+</package>
+<package id="utils" level="apps" tech-domain="pr" name="Utility Apps" levels="app">
+<collection id="extras" name="Extras" level="app">
+<component id="about" filter="s60" name="About Application">
+<unit bldFile="/app/utils/extras/about/group"/>
+</component>
+<component id="calcsoft" filter="s60" name="Calculator Application">
+<unit bldFile="/app/utils/extras/calcsoft/group"/>
+</component>
+</collection>
+</package>
+<package id="contacts" level="apps" span="2" tech-domain="pr" name="Contacts Apps" levels="engine support services ui">
+<collection id="contacts_pub" name="Contacts Apps Public Interfaces" level="ui">
+<component id="phonebook_fetch_ui_api" name="Phonebook Fetch UI API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_pub/phonebook_fetch_ui_api/group"/>
+</component>
+<component id="phonebook_data_management_api" name="Phonebook Data Management API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_pub/phonebook_data_management_api/group"/>
+</component>
+<component id="phonebook_vcard_importexport_api" name="Phonebook vCard Import/Export API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_pub/phonebook_vcard_importexport_api/group"/>
+</component>
+<component id="phonebook_data_addedit_ui_api" name="Phonebook Data Add/Edit UI API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_pub/phonebook_data_addedit_ui_api/group"/>
+</component>
+<component id="phonebook_ui_utilities_api" name="Phonebook UI Utilities API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_pub/phonebook_ui_utilities_api/group"/>
+</component>
+<component id="phonebook_thumbnail_operation_api" name="Phonebook Thumbnail Operation API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_pub/phonebook_thumbnail_operation_api/group"/>
+</component>
+<component id="speed_dial_utility_control_api" name="Speed Dial Utility Control API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_pub/speed_dial_utility_control_api/group"/>
+</component>
+</collection>
+<collection id="contacts_plat" name="Contacts Apps Platform Interfaces" level="ui">
+<component id="virtual_phonebook_store_api" name="Virtual Phonebook Store API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_store_api/group" fitler="!test"/>
+
+</component>
+<component id="virtual_phonebook_sim_services_api" name="Virtual Phonebook SIM Services API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_sim_services_api/group" fitler="!test"/>
+
+</component>
+<component id="virtual_phonebook_configuration_api" name="Virtual Phonebook Configuration API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_configuration_api/group"/>
+</component>
+<component id="virtual_phonebook_copy_policy_api" name="Virtual Phonebook Copy Policy API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_copy_policy_api/group"/>
+</component>
+<component id="virtual_phonebook_policy_api" name="Virtual Phonebook Policy API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_policy_api/group" fitler="!test"/>
+
+</component>
+<component id="virtual_phonebook_engine_api" name="Virtual Phonebook Engine API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_engine_api/group" fitler="!test"/>
+
+</component>
+<component id="virtual_phonebook_migration_support_api" name="Virtual Phonebook Migration Support API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_migration_support_api/group"/>
+</component>
+<component id="virtual_phonebook_view_definition_api" name="Virtual Phonebook View Definition API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_view_definition_api/group" fitler="!test"/>
+
+</component>
+<component id="virtual_phonebook_vcard_api" name="Virtual Phonebook vCard API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_vcard_api/group" fitler="!test"/>
+
+</component>
+<component id="cms_contactor_api" name="CMS Contactor API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/cms_contactor_api/group"/>
+</component>
+<component id="contactpresence_api" name="Contact Presence API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/contactpresence_api/group" fitler="!test"/>
+
+</component>
+<component id="presence_cache_api" name="Presence Cache API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/presence_cache_api/group" fitler="!test"/>
+
+</component>
+<component id="phonebook_internal_common_api" name="Phonebook Internal Common API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/phonebook_internal_common_api/group"/>
+</component>
+<component id="phonebook_internal_appfw_api" name="Phonebook Internal App Framework API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/phonebook_internal_appfw_api/group"/>
+</component>
+<component id="phonebook_internal_data_management_api" name="Phonebook Internal Data Management API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/phonebook_internal_data_management_api/group"/>
+</component>
+<component id="phonebook_2_xsp_extension_manager_api" name="Phonebook 2 xSP Extension Manager API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/phonebook_2_xsp_extension_manager_api/group"/>
+</component>
+<component id="phonebook_ui_controls_api" name="Phonebook UI Controls API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/phonebook_ui_controls_api/group"/>
+</component>
+<component id="phonebook_2_image_management_api" name="Phonebook 2 Image Management API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/phonebook_2_image_management_api/group"/>
+</component>
+<component id="phonebook_extension_api" name="Phonebook Extension API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/phonebook_extension_api/group"/>
+</component>
+<component id="phonebook_public_constants_api" name="Phonebook Public Constants API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/phonebook_public_constants_api/group"/>
+</component>
+<component id="phonebook_internal_ui_utilities_api" name="Phonebook Internal UI Utilities API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/phonebook_internal_ui_utilities_api/group"/>
+</component>
+<component id="logs_engine_api_extensions" name="Logs Engine API Extensions" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/logs_engine_api_extensions/group"/>
+</component>
+<component id="phonebook_thumbnails_api" name="Phonebook Thumbnails API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/phonebook_thumbnails_api/group"/>
+</component>
+<component id="phonebook_2_icon_api" name="Phonebook 2 Icon API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/phonebook_2_icon_api/group"/>
+</component>
+<component id="phonebook_engine_extension_api" name="Phonebook Engine Extension API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/phonebook_engine_extension_api/group"/>
+</component>
+<component id="phonebook_2_store_configuration_management_api" name="Phonebook 2 Store Configuration Management API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/phonebook_2_store_configuration_management_api/group"/>
+</component>
+<component id="logs_ui_command_line_api" name="Logs UI Command Line API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/logs_ui_command_line_api/group"/>
+</component>
+<component id="speed_dial_dialogs_api" name="Speed Dial Dialogs API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/speed_dial_dialogs_api/group"/>
+</component>
+<component id="phonebook_2_xsp_view_activation_api" name="Phonebook 2 xSP View Activation API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/phonebook_2_xsp_view_activation_api/group"/>
+</component>
+<component id="logs_timers_api" name="Logs Timers API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/logs_timers_api/group"/>
+</component>
+<component id="phonebook_2_ui_extension_definition_api" name="Phonebook 2 UI Extension Definition API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/phonebook_2_ui_extension_definition_api/group"/>
+</component>
+<component id="phonebook_2_common_ui_api" name="Phonebook 2 Common UI API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/phonebook_2_common_ui_api/group"/>
+</component>
+<component id="phonebook_2_ui_extension_api" name="Phonebook 2 UI Extension API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/phonebook_2_ui_extension_api/group"/>
+</component>
+<component id="phonebook_2_store_property_api" name="Phonebook 2 Store Property API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/phonebook_2_store_property_api/group"/>
+</component>
+<component id="phonebook_2_ui_extension_plugin_api" name="Phonebook 2 UI Extension Plug-In API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/phonebook_2_ui_extension_plugin_api/group"/>
+</component>
+<component id="phonebook_2_ui_controls_api" name="Phonebook 2 UI Controls API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/phonebook_2_ui_controls_api/group"/>
+</component>
+<component id="phonebook_2_thin_ui_extension_plugin_api" name="Phonebook 2 Thin UI Extension Plugin API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/phonebook_2_thin_ui_extension_plugin_api/group"/>
+</component>
+<component id="phonebook_2_commands_api" name="Phonebook 2 Commands API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/phonebook_2_commands_api/group"/>
+</component>
+<component id="phonebook_2_presentation_api" name="Phonebook 2 Presentation API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/phonebook_2_presentation_api/group"/>
+</component>
+<component id="phonebook_2_ui_utilities_api" name="Phonebook 2 UI Utilities API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/phonebook_2_ui_utilities_api/group"/>
+</component>
+<component id="cca_launch_api" name="CCA Launch API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/cca_launch_api/group" fitler="!test"/>
+
+</component>
+<component id="cca_view_plugin_api" name="CCA View Plugin API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/cca_view_plugin_api/group" fitler="!test"/>
+
+</component>
+<component id="predictivesearch_client_api" name="Predictive Search Client API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/predictivesearch_client_api/group" fitler="!test"/>
+
+</component>
+<component id="predictivesearch_utils_api" name="Predictive Search Utils API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/predictivesearch_utils_api/group" fitler="!test"/>
+
+</component>
+<component id="predictivesearch_adapters_api" name="Predictive Search Adapters API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/predictivesearch_adapters_api/group"/>
+</component>
+<component id="predictivesearch_algorithm_api" name="Predictive Search Algorithm API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/predictivesearch_algorithm_api/group"/>
+</component>
+<component id="phonebook_2_rcl_api" name="Phonebook 2 RCL API" class="api" filter="s60">
+<unit bldFile="/app/contacts/contacts_plat/phonebook_2_rcl_api/group" fitler="!test"/>
+
+</component>
+</collection>
+<collection id="contactextensions" name="Contacts Extensions" level="services">
+<component id="predefinedcontacts" filter="s60" name="Predefined Contacts">
+<unit bldFile="/app/contacts/contactextensions/predefinedcontacts/group"/>
+</component>
+</collection>
+<collection id="logsui" name="Logs UI" level="ui">
+<component id="logsui_build" filter="s60" name="Logs UI Build">
+<!-- component at too high a rank, should move down one directory -->
+<unit bldFile="/app/contacts/logsui/group"/>
+</component>
+</collection>
+<collection id="phonebookui" name="Phonebook UI" level="ui">
+<component id="phonebook" filter="s60" name="Phonebook">
+<unit bldFile="/app/contacts/phonebookui/phonebook/group"/>
+</component>
+<component id="speeddial" filter="s60" name="Speed Dial">
+<unit bldFile="/app/contacts/phonebookui/speeddial/group"/>
+</component>
+<component id="phonebook2" filter="s60" name="Phone Book 2">
+<unit bldFile="/app/contacts/phonebookui/phonebook2/group"/>
+</component>
+</collection>
+<collection id="phonebookengines" name="Phonebook Engines" level="engine">
+<component id="cntfindplugin" filter="s60" name="Contacts Find Plugin" class="plugin" introduced="^2">
+<unit bldFile="/app/contacts/phonebookengines/cntfindplugin/group"/>
+</component>
+<component id="cntsortplugin" filter="s60" name="Contacts Sort Plugin" class="plugin" introduced="^2">
+<unit bldFile="/app/contacts/phonebookengines/cntsortplugin/group"/>
+</component>
+<component id="virtualphonebook" filter="s60" name="Virtual Phonebook" introduced="^2">
+<unit bldFile="/app/contacts/phonebookengines/virtualphonebook/group"/>
+</component>
+<component id="contactsmodel" name="Contacts Model" introduced="ER5" purpose="optional">
+<unit version="2" bldFile="/app/contacts/phonebookengines/contactsmodel/groupsql" mrp="/app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp"/>
+</component>
+</collection>
+<collection id="pimprotocols" name="PIM Protocols" level="services">
+<component id="phonebooksync" name="Phonebook Sync" purpose="optional" class="plugin">
+<unit bldFile="/app/contacts/pimprotocols/phonebooksync/group" mrp="/app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
+</component>
+<component id="pbap" name="Bluetooth PBAP" introduced="9.2" purpose="optional">
+<unit bldFile="/app/contacts/pimprotocols/pbap/group" mrp="/app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
+</component>
+</collection>
+<collection id="ccservices" name="Contacts Centric Services" level="services">
+<component id="cmsservices" filter="s60" name="Contact Method Selector Services" introduced="^2">
+<unit bldFile="/app/contacts/ccservices/cmsservices/group"/>
+</component>
+</collection>
+<collection id="presencecache" name="Presence Cache" level="support">
+<component id="presencecacheutils" filter="s60" name="Presence Cache Utils" introduced="^2">
+<!-- <unit bldFile="presencecache/presencecacheutils/group"/> -->
+</component>
+<component id="presencecacheserver2" filter="s60" name="Presence Cache Server" introduced="^2">
+<!-- <unit bldFile="presencecache/presencecacheserver2/group"/> -->
+</component>
+<component id="presencecacheclient2" filter="s60" name="Presence Cache Client" introduced="^2">
+<!-- <unit bldFile="presencecache/presencecacheclient2/group"/> -->
+</component>
+<component id="presencecache_build" filter="s60" name="Presence Cache Build" introduced="^2">
+<!-- should divide this bld.inf into the other components, or collapse them into a single component -->
+<unit bldFile="/app/contacts/presencecache/group"/>
+</component>
+</collection>
+<collection id="predictivesearch" name="Predictive Search" level="support">
+<component id="pcsutils" filter="s60" name="PCS Utils" introduced="^2">
+<unit bldFile="/app/contacts/predictivesearch/pcsutils/group"/>
+</component>
+<component id="pcsserverclientapi" filter="s60" name="PCS Server Client API" introduced="^2">
+<unit bldFile="/app/contacts/predictivesearch/pcsserverclientapi/group"/>
+</component>
+<component id="pcsserver" filter="s60" name="PCS Server" introduced="^2">
+<unit bldFile="/app/contacts/predictivesearch/pcsserver/group"/>
+</component>
+<component id="pcsadapters" filter="s60" name="PCS Adapters" class="plugin" introduced="^2">
+<unit bldFile="/app/contacts/predictivesearch/adapters/contacts/group"/>
+</component>
+<component id="pcsalgorithm" filter="s60" name="PCS Algorithm" class="plugin" introduced="^2">
+<unit bldFile="/app/contacts/predictivesearch/pcsalgorithm/group"/>
+</component>
+<component id="predictivesearch_build" filter="s60" name="Predictive Search Build" introduced="^2">
+<!-- need to remove #includes from bld.inf and rename as Predictive Search ROM -->
+<unit bldFile="/app/contacts/predictivesearch/group"/>
+</component>
+</collection>
+<collection id="contacts_info" name="Contacts Apps Info" level="ui">
+<component id="contacts_metadata" name="Contacts Apps Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="organizer" level="apps" span="2" tech-domain="pr" name="Organizer Application Suite" levels="support services engine ui app">
+<collection id="organizer_plat" name="Organizer Application Suite Platform Interfaces" level="app">
+<component id="meeting_request_mailbox_utilities_api" name="Meeting Request Mailbox Utilities API" class="api" filter="s60">
+<unit bldFile="/app/organizer/organizer_plat/meeting_request_mailbox_utilities_api/group"/>
+</component>
+<component id="meeting_request_uids_api" name="Meeting Request UIDs API" class="api" filter="s60">
+<unit bldFile="/app/organizer/organizer_plat/meeting_request_uids_api/group"/>
+</component>
+<component id="calendar_exporter_api" name="Calendar Exporter API" class="api" filter="s60">
+<unit bldFile="/app/organizer/organizer_plat/calendar_exporter_api/group"/>
+</component>
+<component id="agenda_versit_2_api" name="Agenda Versit 2 API" class="api" filter="s60">
+<unit bldFile="/app/organizer/organizer_plat/agenda_versit_2_api/group"/>
+</component>
+<component id="calendar_importer_api" name="Calendar Importer API" class="api" filter="s60">
+<unit bldFile="/app/organizer/organizer_plat/calendar_importer_api/group"/>
+</component>
+<component id="calendar_launcher_api" name="Calendar Launcher API" class="api" filter="s60">
+<unit bldFile="/app/organizer/organizer_plat/calendar_launcher_api/group"/>
+</component>
+<component id="calendar_common_utils_api" name="Calendar Common Utils API" class="api" filter="s60">
+<unit bldFile="/app/organizer/organizer_plat/calendar_common_utils_api/group"/>
+</component>
+<component id="searchfw_launcher_api" name="Search Framework Launcher API" class="api" filter="s60">
+<unit bldFile="/app/organizer/organizer_plat/searchfw_launcher_api/group"/>
+</component>
+<component id="alarm_const_api" name="Alarm Const API" class="api" filter="s60">
+<unit bldFile="/app/organizer/organizer_plat/alarm_const_api/group"/>
+</component>
+<component id="alarm_ui_external_control_api" name="Alarm UI External Control API" class="api" filter="s60">
+<unit bldFile="/app/organizer/organizer_plat/alarm_ui_external_control_api/group"/>
+</component>
+<component id="calendar_settings_keys_api" name="Calendar Settings Keys API" class="api" filter="s60">
+<unit bldFile="/app/organizer/organizer_plat/calendar_settings_keys_api/group"/>
+</component>
+<component id="calendar_tones_settings_keys_api" name="Calendar Tones Settings Keys API" class="api" filter="s60">
+<unit bldFile="/app/organizer/organizer_plat/calendar_tones_settings_keys_api/group"/>
+</component>
+<component id="clock_settings_api" name="Clock Settings API" class="api" filter="s60">
+<unit bldFile="/app/organizer/organizer_plat/clock_settings_api/group"/>
+</component>
+<component id="common_alarm_editor_api" name="Common Alarm Editor API" class="api" filter="s60">
+<unit bldFile="/app/organizer/organizer_plat/common_alarm_editor_api/group"/>
+</component>
+<component id="alarm_ui_secondary_display_api" name="Alarm UI Secondary Display API" class="api" filter="s60">
+<unit bldFile="/app/organizer/organizer_plat/alarm_ui_secondary_display_api/group"/>
+</component>
+<component id="searchui_launcher_api" name="Search UI Launcher API" class="api" filter="s60">
+<unit bldFile="/app/organizer/organizer_plat/searchui_launcher_api/group"/>
+</component>
+<component id="agenda_entry_ui_api" name="Agenda Entry UI API" class="api" filter="s60">
+<unit bldFile="/app/organizer/organizer_plat/agenda_entry_ui_api/group"/>
+</component>
+<component id="meeting_request_utillities_api" name="Meeting Request Utillities API" class="api" filter="s60">
+<unit bldFile="/app/organizer/organizer_plat/meeting_request_utillities_api/group"/>
+</component>
+<component id="meeting_request_viewer_api" name="Meeting Request Viewer API" class="api" filter="s60">
+<unit bldFile="/app/organizer/organizer_plat/meeting_request_viewer_api/group"/>
+</component>
+<component id="calendar_custamization_api" name="Calendar Customization API" class="api" filter="s60">
+<unit bldFile="/app/organizer/organizer_plat/calendar_custamization_api/group"/>
+</component>
+</collection>
+<collection id="organizer_pub" name="Organizer Application Suite Public Interfaces" level="app">
+<component id="calendar_interim_utils2_api" name="Calendar Interim Utils 2 API" class="api" filter="s60">
+<unit bldFile="/app/organizer/organizer_pub/calendar_interim_utils2_api/group"/>
+</component>
+<component id="notepad_library_api" name="Notepad Library API" class="api" filter="s60">
+<unit bldFile="/app/organizer/organizer_pub/notepad_library_api/group"/>
+</component>
+</collection>
+<collection id="alarmengines" name="Alarm Engines" level="engine">
+<component id="missedalarmstore" filter="s60" name="Missed Alarm Store">
+<unit bldFile="/app/organizer/alarmengines/missedalarmstore/group"/>
+</component>
+</collection>
+<collection id="calendarengines" name="Calendar Engines" level="engine">
+<component id="versit2" filter="s60" name="Versit 2 iCal Parser" introduced="9.2">
+<unit bldFile="/app/organizer/calendarengines/versit2/group"/>
+</component>
+<component id="agnversit2" filter="s60" name="Versit 2 Agenda Interface" class="plugin" introduced="9.2">
+<unit bldFile="/app/organizer/calendarengines/agnversit2/group"/>
+</component>
+<component id="caleninterimutils" filter="s60" name="Calendar Interim Utils" introduced="9.1">
+<unit bldFile="/app/organizer/calendarengines/caleninterimutils/group"/>
+</component>
+<component id="calenimp" filter="s60" name="Calendar Import Wrapper" introduced="7.0s">
+<unit bldFile="/app/organizer/calendarengines/calenimp/group"/>
+</component>
+<component id="calenlauncher" filter="s60" name="Calendar Launcher">
+<unit bldFile="/app/organizer/calendarengines/calenlauncher/group"/>
+</component>
+<component id="caldavsrv" filter="sf_build" name="CalDAV Server" introduced="^3">
+<unit bldFile="/app/organizer/calendarengines/caldav/group"/>
+</component>
+</collection>
+<collection id="meetingrequestengines" name="Meeting Request Engines" level="engine">
+<component id="mrmailbox" filter="s60" name="Meeting Request Mailbox">
+<unit bldFile="/app/organizer/meetingrequestengines/mrmailbox/group"/>
+</component>
+<component id="mrmailboxutils" filter="s60" name="Meeting Request Mailbox Utils" class="plugin">
+<unit bldFile="/app/organizer/meetingrequestengines/mrmailboxutils/group"/>
+</component>
+</collection>
+<collection id="searchfw" name="Search Framework" level="services">
+<meta rel="config">
+<defined condition="RD_GENERAL_SEARCH"/>
+</meta>
+<!-- Uncomment all units when configuration is in place. All currently #included from searchfw_build, which should be removed at the same time. -->
+<component id="coresearchfw" filter="s60" name="Core Search Framework" introduced="^1">
+<!--<unit bldFile="searchfw/coresearchfw/group"/>-->
+</component>
+<component id="searchfw_plugins" filter="s60" name="Search Plugins" class="plugin" introduced="^1">
+<!--<unit bldFile="searchfw/plugins/group"/>-->
+</component>
+<component id="searchfw_build" filter="s60" name="Search Framework Build" introduced="^1">
+<unit bldFile="/app/organizer/searchfw/group"/>
+</component>
+</collection>
+<collection id="alarmui" name="Alarm UI" level="app">
+<!-- collection is really a component, should move down a directory -->
+<component id="alarmui_build" filter="s60" name="Alarm UI Build">
+<unit bldFile="/app/organizer/alarmui/group"/>
+</component>
+</collection>
+<collection id="calendarui" name="Calendar UI" level="ui">
+<component id="calendarui_help" filter="s60" name="Calendar UI Help">
+<unit bldFile="/app/organizer/calendarui/help/group"/>
+</component>
+<component id="commonutils" filter="s60" name="Calendar Common Utils">
+<unit bldFile="/app/organizer/calendarui/commonutils/group"/>
+</component>
+<component id="globaldata" filter="s60" name="Calendar Global Data">
+<unit bldFile="/app/organizer/calendarui/globaldata/group"/>
+</component>
+<component id="settings" filter="s60" name="Calendar Settings">
+<!-- these should be merged into a single bld.inf or split into two components -->
+<unit bldFile="/app/organizer/calendarui/settings/gsplugin/group"/>
+<unit bldFile="/app/organizer/calendarui/settings/settingsui/group"/>
+</component>
+<component id="customisation" filter="s60" name="Calendar Customisation">
+<unit bldFile="/app/organizer/calendarui/customisation/group"/>
+</component>
+<component id="customisationmanager" filter="s60" name="Calendar Customisation Manager">
+<unit bldFile="/app/organizer/calendarui/customisationmanager/group"/>
+</component>
+<component id="multicaluidialog" filter="s60" name="Multi-Calendar UI Dialog" introduced="^3">
+<unit bldFile="/app/organizer/calendarui/multicaluidialog/group"/>
+</component>
+<component id="views" filter="s60" name="Calendar Views">
+<unit bldFile="/app/organizer/calendarui/views/group"/>
+</component>
+<component id="calendarui_controller" filter="s60" name="Calendar Controller">
+<unit bldFile="/app/organizer/calendarui/controller/group"/>
+</component>
+<component id="calendarui_editors" filter="s60" name="Calendar Editors">
+<unit bldFile="/app/organizer/calendarui/editors/group"/>
+</component>
+<component id="calendarui_application" filter="s60" name="Calendar Application">
+<unit bldFile="/app/organizer/calendarui/application/group"/>
+</component>
+<component id="missedalarmindicatorplugin" filter="s60" name="Missed Alarm Indicator Plugin" class="plugin">
+<unit bldFile="/app/organizer/calendarui/missedalarmindicatorplugin/group"/>
+</component>
+<component id="calendarui_server" filter="s60" name="Calendar Server">
+<!-- these should be merged into a single bld.inf or split into two components -->
+<unit bldFile="/app/organizer/calendarui/server/calensvr/group"/>
+<unit bldFile="/app/organizer/calendarui/server/calensvrclient/group"/>
+</component>
+<component id="regionalplugins" filter="s60" name="Calendar Regional Plugins" class="plugin">
+<!-- these should be merged into a single bld.inf or split into four components -->
+<unit bldFile="/app/organizer/calendarui/regionalplugins/calenregionalutil/group"/>
+<unit bldFile="/app/organizer/calendarui/regionalplugins/lunarchinese/group"/>
+<unit bldFile="/app/organizer/calendarui/regionalplugins/lunarvietnamese/group"/>
+<unit bldFile="/app/organizer/calendarui/regionalplugins/thai/group"/>
+</component>
+<component id="calenaiwprovider" filter="s60" name="Calendar AIW Proivder" class="plugin" introduced="^3">
+<unit bldFile="/app/organizer/calendarui/calenaiwprovider/group"/>
+</component>
+<component id="caldav" filter="sf_build" name="CalDAV" class="plugin" introduced="^3">
+<unit bldFile="/app/organizer/calendarui/caldav/group"/>
+</component>
+<component id="calendarui_build" filter="s60" name="Calendar UI Build">
+<!-- split contents into separate components -->
+<unit bldFile="/app/organizer/calendarui/group"/>
+</component>
+</collection>
+<collection id="meetingui" name="Meeting UI" level="ui">
+<component id="attendeeview" filter="s60" name="Attendee View">
+<unit bldFile="/app/organizer/meetingui/attendeeview/group"/>
+</component>
+<component id="agnentryui" filter="s60" name="Agenda Entry UI" class="plugin">
+<unit bldFile="/app/organizer/meetingui/agnentryui/group"/>
+</component>
+<component id="meetingrequestutils" filter="s60" name="Meeting Request Utils">
+<unit bldFile="/app/organizer/meetingui/meetingrequestutils/group"/>
+</component>
+<component id="meetingrequestviewers" filter="s60" name="Meeting Request Viewers" class="plugin">
+<unit bldFile="/app/organizer/meetingui/meetingrequestviewers/group"/>
+</component>
+<component id="meetingui_build" filter="s60" name="Meeting UI Build">
+<!-- split contents into separate components -->
+<unit bldFile="/app/organizer/meetingui/group"/>
+</component>
+</collection>
+<collection id="clock2" name="Clock" level="app">
+<component id="clockengines" filter="s60" name="Clock Engines">
+<unit bldFile="/app/organizer/clock2/clockengines/group"/>
+</component>
+<component id="clockui" filter="s60" name="Clock UI">
+<unit bldFile="/app/organizer/clock2/clockui/group"/>
+</component>
+<component id="clock2_help" filter="s60" name="Clock Help">
+<unit bldFile="/app/organizer/clock2/help/group"/>
+</component>
+<component id="clock2_build" filter="s60" name="Clock Build">
+<!-- split contents into separate components, or just make this one component -->
+<unit bldFile="/app/organizer/clock2/group"/>
+</component>
+</collection>
+<collection id="notepad" name="Notepad" level="ui">
+<component id="notepad_help" filter="s60" name="Notepad Help">
+<unit bldFile="/app/organizer/notepad/help/group"/>
+</component>
+<component id="notepad1" filter="s60" name="Notepad Application 1">
+<unit bldFile="/app/organizer/notepad/notepad1/group"/>
+</component>
+<component id="txtrecog" filter="s60" name="Text Recognizer" class="plugin">
+<unit bldFile="/app/organizer/notepad/txtrecog/group"/>
+</component>
+</collection>
+<collection id="searchui" name="Search UI" level="app">
+<!-- consider making this a single component -->
+<meta rel="config">
+<defined condition="RD_GENERAL_SEARCH"/>
+</meta>
+<!-- Uncomment all units when configuration is in place. All currently #included from searchui_build, which should be removed at the same time. -->
+<component id="searchui_help" filter="s60" name="Search UI Help">
+<!--<unit bldFile="searchui/help/group"/>-->
+</component>
+<component id="searchapp" filter="s60" name="Search Application">
+<!--<unit bldFile="searchui/searchapp/group"/>-->
+</component>
+<component id="searchui_build" filter="s60" name="Search UI Build">
+<unit bldFile="/app/organizer/searchui/group"/>
+</component>
+</collection>
+<collection id="pimappservices" name="PIM Application Services" level="services">
+<component id="calendar" name="Calendar" introduced="9.2" purpose="optional">
+<unit version="2" bldFile="/app/organizer/pimappservices/calendar/group" mrp="/app/organizer/pimappservices/calendar/group/app-engines_calendar.mrp"/>
+</component>
+<component id="calendarvcalplugin" name="Calendar vCal Plugin" introduced="8.1" purpose="optional" class="plugin">
+<unit version="2" bldFile="/app/organizer/pimappservices/calendarvcalplugin/group" mrp="/app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp"/>
+</component>
+<component id="appenginesdocs" name="Application Engines Documentation" purpose="development" class="doc">
+<unit mrp="/app/organizer/pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
+</component>
+</collection>
+<collection id="pimappsupport" name="PIM Application Support" level="support">
+<component id="vcardandvcal" name="vCard and vCal" introduced="ER5" purpose="optional">
+<unit bldFile="/app/organizer/pimappsupport/vcardandvcal/group" mrp="/app/organizer/pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
+</component>
+<component id="chinesecalendarconverter" name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
+<unit bldFile="/app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="/app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
+</component>
+<component id="chinesecalendaralg" name="Chinese Calendar Algorithm" introduced="^2" purpose="optional" class="plugin">
+<unit bldFile="/app/organizer/pimappsupport/chinesecalendaralg/group" mrp="/app/organizer/pimappsupport/chinesecalendaralg/group/app-services_chinesecalendaralgorithm.mrp"/>
+</component>
+</collection>
+<collection id="organizer_info" name="Organizer Application Suite Info" level="app">
+<component id="organizer_metadata" name="Organizer Application Suite Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="messaging" level="apps" span="2" tech-domain="pr" name="Messaging Apps" levels="mail eng base ui">
+<collection id="msg_pub" name="Messaging Apps Public APIs" level="ui">
+<component id="messaging_integration_api" name="Messaging Integration API" class="api" filter="s60">
+<unit bldFile="/app/messaging/msg_pub/messaging_integration_api/group"/>
+</component>
+<component id="plugin_bio_control_api" name="Plug-in Bio Control API" class="api" filter="s60">
+<unit bldFile="/app/messaging/msg_pub/plugin_bio_control_api/group"/>
+</component>
+<component id="mms_client_mtm_api" name="MMS Client MTM API" class="api" filter="s60">
+<unit bldFile="/app/messaging/msg_pub/mms_client_mtm_api/group"/>
+</component>
+<component id="open_new_message_notification_api" name="Open New Message Notification API" class="api" filter="s60">
+<unit bldFile="/app/messaging/msg_pub/open_new_message_notification_api/group"/>
+</component>
+<component id="messaging_editor_constants_api" name="Messaging Editor Constants API" class="api" filter="s60">
+<unit bldFile="/app/messaging/msg_pub/messaging_editor_constants_api/group"/>
+</component>
+</collection>
+<collection id="msg_plat" name="Messaging Apps Platform APIs" level="ui">
+<component id="smil_player_launch_api" name="SMIL Player Launch API" class="api" filter="s60">
+<unit bldFile="/app/messaging/msg_plat/smil_player_launch_api/group"/>
+</component>
+<component id="messaging_media_resolver_api" name="Messaging Media Resolver API" class="api" filter="s60">
+<unit bldFile="/app/messaging/msg_plat/messaging_media_resolver_api/group"/>
+</component>
+<component id="smil_engine_api" name="SMIL Engine API" class="api" filter="s60">
+<unit bldFile="/app/messaging/msg_plat/smil_engine_api/group"/>
+</component>
+<component id="mms_server_settings_api" name="MMS Server Settings API" class="api" filter="s60">
+<unit bldFile="/app/messaging/msg_plat/mms_server_settings_api/group"/>
+</component>
+<component id="new_contacts_note_secondary_display_api" name="New Contacts Note Secondary Display API" class="api" filter="s60">
+<unit bldFile="/app/messaging/msg_plat/new_contacts_note_secondary_display_api/group"/>
+</component>
+<component id="messaging_center_ui_utilities_api" name="Messaging Center UI Utilities API" class="api" filter="s60">
+<unit bldFile="/app/messaging/msg_plat/messaging_center_ui_utilities_api/group"/>
+</component>
+<component id="internet_mail_mtm_ui_api" name="Internet Mail MTM UI API" class="api" filter="s60">
+<unit bldFile="/app/messaging/msg_plat/internet_mail_mtm_ui_api/group"/>
+</component>
+<component id="messaging_editor_api" name="Messaging Editor API" class="api" filter="s60">
+<unit bldFile="/app/messaging/msg_plat/messaging_editor_api/group"/>
+</component>
+<component id="email_domain_utilities_api" name="Email Domain Utilities API" class="api" filter="s60">
+<unit bldFile="/app/messaging/msg_plat/email_domain_utilities_api/group"/>
+</component>
+<component id="smil_transition_api" name="SMIL Transition API" class="api" filter="s60">
+<unit bldFile="/app/messaging/msg_plat/smil_transition_api/group"/>
+</component>
+<component id="new_contacts_note_status_api" name="New Contacts Note Status API" class="api" filter="s60">
+<unit bldFile="/app/messaging/msg_plat/new_contacts_note_status_api/group"/>
+</component>
+<component id="unified_editor_video_conversion_api" name="Unified Editor Video Conversion API" class="api" filter="s60">
+<unit bldFile="/app/messaging/msg_plat/unified_editor_video_conversion_api/group"/>
+</component>
+<component id="mms_conformance_api" name="MMS Conformance API" class="api" filter="s60">
+<unit bldFile="/app/messaging/msg_plat/mms_conformance_api/group"/>
+</component>
+<component id="new_contacts_note_variables_api" name="New Contacts Note Variables API" class="api" filter="s60">
+<unit bldFile="/app/messaging/msg_plat/new_contacts_note_variables_api/group"/>
+</component>
+<component id="new_message_notification_api" name="New Message Notification API" class="api" filter="s60">
+<unit bldFile="/app/messaging/msg_plat/new_message_notification_api/group"/>
+</component>
+<component id="mms_application_api" name="MMS Application API" class="api" filter="s60">
+<unit bldFile="/app/messaging/msg_plat/mms_application_api/group"/>
+</component>
+<component id="mms_engine_settings_api" name="MMS Engine Settings API" class="api" filter="s60">
+<unit bldFile="/app/messaging/msg_plat/mms_engine_settings_api/group"/>
+</component>
+<component id="mms_codec_client_api" name="MMS Codec Client API" class="api" filter="s60">
+<unit bldFile="/app/messaging/msg_plat/mms_codec_client_api/group"/>
+</component>
+<component id="send_ui_meeting_request_api" name="Send UI Meeting Request API" class="api" filter="s60">
+<unit bldFile="/app/messaging/msg_plat/send_ui_meeting_request_api/group"/>
+</component>
+<component id="new_contact_notes_extended_api" name="New Contact Notes Extended API" class="api" filter="s60">
+<unit bldFile="/app/messaging/msg_plat/new_contact_notes_extended_api/group"/>
+</component>
+<component id="mail_ui_constants_api" name="Mail UI Constants API" class="api" filter="s60">
+<unit bldFile="/app/messaging/msg_plat/mail_ui_constants_api/group"/>
+</component>
+<component id="sim_dialog_launch_api" name="SIM Dialog Launch API" class="api" filter="s60">
+<unit bldFile="/app/messaging/msg_plat/sim_dialog_launch_api/group"/>
+</component>
+</collection>
+<collection id="mobilemessaging" name="Mobile Messaging" level="ui">
+<component id="audiomsg" filter="s60" name="Audio Message">
+<unit bldFile="/app/messaging/mobilemessaging/audiomsg/group"/>
+</component>
+<component id="msgmedia" filter="s60" name="Message Media">
+<unit bldFile="/app/messaging/mobilemessaging/msgmedia/group"/>
+</component>
+<component id="unieditor" filter="s60" name="Unified Editor">
+<unit bldFile="/app/messaging/mobilemessaging/unieditor/group"/>
+</component>
+<component id="mmsui" filter="s60" name="MMS UI">
+<unit bldFile="/app/messaging/mobilemessaging/mmsui/group"/>
+</component>
+<component id="postcard" filter="s60" name="Postcard">
+<unit bldFile="/app/messaging/mobilemessaging/postcard/group"/>
+</component>
+<component id="smilui" filter="s60" name="SMIL UI">
+<unit bldFile="/app/messaging/mobilemessaging/smilui/group"/>
+</component>
+<component id="smum" filter="s60" name="SMS UI MTM and UI Data MTM" class="plugin">
+<unit bldFile="/app/messaging/mobilemessaging/smum/group"/>
+</component>
+<component id="smsui" filter="s60" name="SMS UI">
+<unit bldFile="/app/messaging/mobilemessaging/smsui/group"/>
+</component>
+<component id="smsmtm" name="SMS MTM" purpose="optional" class="plugin">
+<unit bldFile="/app/messaging/mobilemessaging/smsmtm/group" mrp="/app/messaging/mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
+</component>
+</collection>
+<collection id="mmsengine" name="MMS Engine" level="eng">
+<component id="mmsconninit" filter="s60" name="MMS Connection Initiator">
+<!-- <unit bldFile="mmsengine/mmsconninit/bld"/> -->
+</component>
+<component id="genutils" filter="s60" name="General Utils">
+<!-- <unit bldFile="mmsengine/genutils/bld"/> -->
+</component>
+<component id="mmsserversettings" filter="s60" name="MMS Server Settings">
+<!-- <unit bldFile="mmsengine/mmsserversettings/bld"/> -->
+</component>
+<component id="mmsmessage" filter="s60" name="MMS Message">
+<!-- <unit bldFile="mmsengine/mmsmessage/bld"/> -->
+</component>
+<component id="mmshttptransport" filter="s60" name="MMS HTTP Transport">
+<!-- <unit bldFile="mmsengine/mmshttptransport/bld"/> -->
+</component>
+<component id="mmscodec" filter="s60" name="MMS Codec">
+<!-- <unit bldFile="mmsengine/mmscodec/bld"/> -->
+</component>
+<component id="mmsserver" filter="s60" name="MMS Server">
+<!-- <unit bldFile="mmsengine/mmsserver/bld"/> -->
+</component>
+<component id="clientmtm" filter="s60" name="MMS Client MTM" class="plugin">
+<!-- <unit bldFile="mmsengine/clientmtm/bld"/> -->
+</component>
+<component id="mmswatcher" filter="s60" name="MMS Watcher" class="plugin">
+<!-- <unit bldFile="mmsengine/mmswatcher/bld"/> -->
+</component>
+<component id="mmspushhandler" filter="s60" name="MMS Push Handler" class="plugin">
+<!-- <unit bldFile="mmsengine/mmspushhandler/bld"/> -->
+</component>
+<component id="applicationadapter" filter="s60" name="MMS Application Adapter">
+<!-- <unit bldFile="mmsengine/applicationadapter/bld"/> -->
+</component>
+<component id="mmscodecclient" filter="s60" name="MMS Codec Client">
+<!-- <unit bldFile="mmsengine/mmscodecclient/bld"/> -->
+</component>
+<component id="mmssettings" name="MMS Settings" introduced="9.2" purpose="optional">
+<unit bldFile="/app/messaging/mmsengine/mmssettings/group" mrp="/app/messaging/mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
+</component>
+<component id="mmsconf" name="MMS Configuration" purpose="optional">
+<unit bldFile="/app/messaging/mmsengine/mmsconf" mrp="/app/messaging/mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
+</component>
+<component id="mmsengine_build" filter="s60" name="MMS Engine Build">
+<!-- this bld.inf should be broken up into the individual other components -->
+<unit bldFile="/app/messaging/mmsengine/group"/>
+</component>
+</collection>
+<collection id="messagingappbase" name="Messaging App Base" level="base">
+<component id="msgavkon" filter="s60" name="Messaging Avkon UI">
+<unit bldFile="/app/messaging/messagingappbase/msgavkon/group"/>
+</component>
+<component id="mce" filter="s60" name="Message Center Application">
+<unit bldFile="/app/messaging/messagingappbase/mce/group"/>
+</component>
+<component id="mceextraitems" filter="s60" name="Message Center Extra Items">
+<unit bldFile="/app/messaging/messagingappbase/mceextraitems/group"/>
+</component>
+<component id="mcesettings" filter="s60" name="Message Center Settings">
+<unit bldFile="/app/messaging/messagingappbase/mcesettings/group"/>
+</component>
+<component id="msgerrorwatcher" filter="s60" name="Messaging Error Watcher" class="plugin">
+<unit bldFile="/app/messaging/messagingappbase/msgerrorwatcher/group"/>
+</component>
+<component id="ncnlist" filter="s60" name="New Contacts Note List">
+<unit bldFile="/app/messaging/messagingappbase/ncnlist/group"/>
+</component>
+<component id="schemeplugin" filter="s60" name="Scheme Handler Plugin" class="plugin">
+<unit bldFile="/app/messaging/messagingappbase/schemeplugin/group"/>
+</component>
+<component id="sendui" filter="s60" name="Send UI" class="plugin">
+<unit bldFile="/app/messaging/messagingappbase/sendui/group"/>
+</component>
+<component id="smilengine" filter="s60" name="SMIL Engine">
+<unit bldFile="/app/messaging/messagingappbase/smilengine/group"/>
+</component>
+<component id="bium" filter="s60" name="BIO UI MTM" class="plugin">
+<unit bldFile="/app/messaging/messagingappbase/bium/group"/>
+</component>
+<component id="smartmessaging" filter="s60" name="Smart Messaging">
+<unit bldFile="/app/messaging/messagingappbase/smartmessaging/group"/>
+</component>
+<component id="msgeditor" filter="s60" name="Messaging Editor">
+<unit bldFile="/app/messaging/messagingappbase/msgeditor/group"/>
+</component>
+<component id="smilparser" name="SMIL Parser" introduced="7.0s" purpose="optional">
+<unit bldFile="/app/messaging/messagingappbase/smilparser/GROUP" mrp="/app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
+</component>
+<component id="obexmtms" name="OBEX MTMs" introduced="7.0s" purpose="optional" class="plugin">
+<unit bldFile="/app/messaging/messagingappbase/obexmtms/Group" mrp="/app/messaging/messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
+</component>
+</collection>
+<collection id="email" name="Email" level="mail">
+<!-- use commonemail instead -->
+<component id="alwaysonlineemailplugin" filter="s60" name="Always Online Mail Plugin" class="plugin" deprecated="^3">
+<unit bldFile="/app/messaging/email/alwaysonlineemailplugin/group"/>
+</component>
+<component id="emailnotificationhandler" filter="s60" name="Email Notification Handler" class="plugin" deprecated="^3">
+<unit bldFile="/app/messaging/email/emailnotificationhandler/group"/>
+</component>
+<component id="imum" filter="s60" name="Internet Mail UI MTM" class="plugin" deprecated="^3">
+<unit bldFile="/app/messaging/email/imum/group"/>
+</component>
+<component id="mail" filter="s60" name="Mail Application" deprecated="^3">
+<unit bldFile="/app/messaging/email/mail/group"/>
+</component>
+<component id="pop3andsmtpmtm" name="POP3 and SMTP MTM" purpose="optional" class="plugin" deprecated="^3">
+<unit bldFile="/app/messaging/email/pop3andsmtpmtm/group" mrp="/app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
+</component>
+<component id="imap4mtm" name="IMAP4 MTM" introduced="9.2" purpose="optional" class="plugin" deprecated="^3">
+<unit bldFile="/app/messaging/email/imap4mtm/group" mrp="/app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
+</component>
+</collection>
+<collection id="messaging_info" name="Messaging Apps Info" level="ui">
+<component id="messaging_metadata" name="Messaging Apps Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="commonemail" level="apps" span="2" tech-domain="pr" name="Email Apps" levels="service support ui app">
+<collection id="email_pub" name="Email Apps Public Interfaces" level="app">
+<component id="email_widget_api" name="Email Widget API" class="api" filter="s60">
+<unit bldFile="/app/commonemail/email_pub/email_widget_api/group"/>
+</component>
+</collection>
+<collection id="email_plat" name="Email Apps Platform Interfaces" level="app">
+<component id="email_client_api" name="Email Client API" class="api" filter="s60">
+<unit bldFile="/app/commonemail/email_plat/email_client_api/group"/>
+</component>
+<component id="email_setup_plugin_api" name="Email Setup Plugin API" class="api" filter="s60">
+<unit bldFile="/app/commonemail/email_plat/email_setup_plugin_api/group"/>
+</component>
+</collection>
+<collection id="emailservices" name="Email Services" level="service">
+<component id="emailframework" filter="s60" name="Email Framework" introduced="^2">
+<unit bldFile="/app/commonemail/emailservices/emailframework/group"/>
+</component>
+<component id="emailclientapi" filter="s60" name="Email Client API" introduced="^2">
+<unit bldFile="/app/commonemail/emailservices/emailclientapi/group"/>
+</component>
+<component id="emailserver" filter="s60" name="Email Server" introduced="^2">
+<unit bldFile="/app/commonemail/emailservices/emailserver/group"/>
+</component>
+<component id="emailservermonitor" filter="s60" name="Email Server Monitor" introduced="^2">
+<unit bldFile="/app/commonemail/emailservices/emailservermonitor/group"/>
+</component>
+<component id="psmruadapter" filter="s60" name="Predictive Search Most Recent Used Adapter" class="plugin" introduced="^2">
+<unit bldFile="/app/commonemail/emailservices/psmruadapter/group"/>
+</component>
+<component id="emailstore" filter="s60" name="Email Store" introduced="^2">
+<unit bldFile="/app/commonemail/emailservices/emailstore/group"/>
+</component>
+<component id="emaildebug" filter="s60" name="Email Debug" class="api" introduced="^2">
+<unit bldFile="/app/commonemail/emailservices/emaildebug/group"/>
+</component>
+<component id="emailinstallationinitiator" filter="s60" name="Email Installation Initiator" introduced="^2">
+<unit bldFile="/app/commonemail/emailservices/emailinstallationinitiator/group"/>
+</component>
+</collection>
+<collection id="ipsservices" name="IMAP/POP/SMTP Services" level="service">
+<component id="ipssossettings" filter="s60" name="IPS SOS Settings" introduced="^2">
+<!-- SOS? Consider spelling it out since the abbreviation is ambiguous -->
+<unit bldFile="/app/commonemail/ipsservices/ipssossettings/group"/>
+</component>
+<component id="ipssosplugin" filter="s60" name="IPS SOS Plugin" class="plugin" introduced="^2">
+<unit bldFile="/app/commonemail/ipsservices/ipssosplugin/group"/>
+</component>
+<component id="ipssosaoplugin" filter="s60" name="IPS SOS Always Online Plugin" class="plugin" introduced="^2">
+<unit bldFile="/app/commonemail/ipsservices/ipssosaoplugin/group"/>
+</component>
+<component id="ipsservices_build" filter="s60" name="IPS Services Build" introduced="^2">
+<unit bldFile="/app/commonemail/ipsservices/group"/>
+<!-- can the exports be broken up into the other components or made a config component?-->
+</component>
+</collection>
+<collection id="emailcontacts" name="Email Contacts" level="support">
+<component id="contactactionservice" filter="s60" name="Contact Action Service" class="plugin" introduced="^2">
+<unit bldFile="/app/commonemail/emailcontacts/contactactionservice/group"/>
+</component>
+<component id="contactactionmenu" filter="s60" name="Contact Action Menu" class="plugin" introduced="^2">
+<unit bldFile="/app/commonemail/emailcontacts/contactactionmenu/group"/>
+</component>
+</collection>
+<collection id="meetingrequest" name="Meeting Request" level="ui">
+<component id="mrcommon" filter="s60" name="MR Common" introduced="^2">
+<unit bldFile="/app/commonemail/meetingrequest/mrcommon/group"/>
+</component>
+<component id="mrdb" filter="s60" name="MR Database" introduced="^2">
+<unit bldFile="/app/commonemail/meetingrequest/mrdb/group"/>
+</component>
+<component id="mrpolicy" filter="s60" name="MR Policy" introduced="^2">
+<unit bldFile="/app/commonemail/meetingrequest/mrpolicy/group"/>
+</component>
+<component id="mrservices" filter="s60" name="MR Services" introduced="^2">
+<unit bldFile="/app/commonemail/meetingrequest/mrservices/group"/>
+</component>
+<component id="mrgui" filter="s60" name="MR GUI" introduced="^2">
+<unit bldFile="/app/commonemail/meetingrequest/mrgui/group"/>
+</component>
+<component id="mrentry" filter="s60" name="MR Entry" introduced="^2">
+<unit bldFile="/app/commonemail/meetingrequest/mrentry/group"/>
+</component>
+<component id="mrtasks" filter="s60" name="MR Tasks" introduced="^2">
+<unit bldFile="/app/commonemail/meetingrequest/mrtasks/group"/>
+</component>
+<component id="mrutils" filter="s60" name="MR Utils" introduced="^2">
+<unit bldFile="/app/commonemail/meetingrequest/mrutils/group"/>
+</component>
+<component id="mrutilscalplugin" filter="s60" name="MR Utils Calendar Plugin" class="plugin" introduced="^2">
+<unit bldFile="/app/commonemail/meetingrequest/mrutilscalplugin/group"/>
+</component>
+<component id="mrviewer" filter="s60" name="MR Viewer" introduced="^2">
+<unit bldFile="/app/commonemail/meetingrequest/mrviewer/group"/>
+</component>
+<component id="mrviewercalplugin" filter="s60" name="MR Viewer Calendar Plugin" introduced="^2">
+<unit bldFile="/app/commonemail/meetingrequest/mrviewercalplugin/group"/>
+</component>
+<component id="mricalviewer" filter="s60" name="MR iCal Viewer" class="plugin" introduced="^2">
+<unit bldFile="/app/commonemail/meetingrequest/mricalviewer/group"/>
+</component>
+<component id="mrversit2" filter="s60" name="MR Versit2" introduced="^2">
+<unit bldFile="/app/commonemail/meetingrequest/mrversit2/group"/>
+</component>
+<component id="mragnversit2" filter="s60" name="MR Agenda Versit2" introduced="^2">
+<unit bldFile="/app/commonemail/meetingrequest/mragnversit2/group"/>
+</component>
+<component id="mrcasplugin" filter="s60" name="MR Contact Action Service Plugin" class="plugin" introduced="^2">
+<unit bldFile="/app/commonemail/meetingrequest/mrcasplugin/group"/>
+</component>
+<component id="mrurlparserplugin" filter="s60" name="MR URL Parser Plugin" class="plugin" introduced="^2">
+<unit bldFile="/app/commonemail/meetingrequest/mrurlparserplugin/group"/>
+</component>
+<component id="meetingrequest_build" filter="s60" name="MR Build" introduced="^2">
+<!-- can the exports be broken up into the other components ?
+ alternatively, move the exports into a RM Config component-->
+<unit bldFile="/app/commonemail/meetingrequest/group"/>
+</component>
+</collection>
+<collection id="emailuis" name="Email UIs" level="app">
+<component id="emailui" filter="s60" name="Email UI" introduced="^2">
+<unit bldFile="/app/commonemail/emailuis/emailui/group"/>
+</component>
+<component id="gsemailsettings" filter="s60" name="Email GS Settings" class="plugin" introduced="^2">
+<unit bldFile="/app/commonemail/emailuis/gsemailsettings/group"/>
+</component>
+<component id="uicomponents" filter="s60" name="Email UI Components" introduced="^2">
+<unit bldFile="/app/commonemail/emailuis/uicomponents/group"/>
+</component>
+<component id="widget" filter="s60" name="Email Widget" introduced="^2">
+<meta rel="config">
+<not-defined condition="FF_CMAIL_INTEGRATION"/>
+</meta>
+<!-- Uncomment unit when configuration is in place. Currently #included from emailuis_build, which should be removed at the same time. -->
+<!--<unit bldFile="emailuis/widget/group"/>-->
+</component>
+<component id="emailuis_build" filter="s60" name="Email UIs Build" introduced="^2">
+<unit bldFile="/app/commonemail/emailuis/group"/>
+</component>
+</collection>
+<collection id="commonemail_info" name="Email Apps Info" level="app">
+<component id="emailhelp" filter="s60" name="Email Help">
+<!-- should this be commented out or not? -->
+<!-- <unit bldFile="emailhelp/group"/> -->
+</component>
+<component id="commonemail_help" filter="s60" name="Email Help" introduced="^2">
+<!-- should this be commented out or not? -->
+<!-- <unit bldFile="help/group"/> -->
+</component>
+</collection>
+</package>
+<package id="conversations" level="apps" tech-domain="pr" name="Conversation Apps" levels="settings utils plugin ui">
+<collection id="conversations_plat" name="Conversation Apps Platform Interfaces" level="ui">
+<component id="im_cv_launcher_api" name="IM CV Launcher API" class="api" filter="s60">
+<unit bldFile="/app/conversations/conversations_plat/im_cv_launcher_api/group"/>
+</component>
+<component id="im_connection_api" name="IM Connection API" class="api" filter="s60">
+<unit bldFile="/app/conversations/conversations_plat/im_connection_api/group"/>
+</component>
+<component id="im_cv_appui_api" name="IM CV App UI API" class="api" filter="s60">
+<unit bldFile="/app/conversations/conversations_plat/im_cv_appui_api/group"/>
+</component>
+</collection>
+<collection id="uiservicetabsettings" name="UI Service Tab Settings" level="settings">
+<!-- this is really at the wrong rank. should move down a directory -->
+<component id="vimpstsettings" filter="s60" name="VIMP Service Tab Settings">
+<unit bldFile="/app/conversations/uiservicetabsettings/group"/>
+</component>
+</collection>
+<collection id="instantmessagesalert" name="Instant Messages Alert" level="utils">
+<!-- this is really at the wrong rank. should move down a directory -->
+<component id="instantmessagesalert_build" filter="s60" name="Instant Messages Alert build" introduced="^3">
+<unit bldFile="/app/conversations/instantmessagesalert/group"/>
+</component>
+</collection>
+<collection id="imstutils" name="IM Service Tab Utils" level="utils">
+<component id="imstutils_help" filter="s60" name="IM Service Tab Help">
+<unit bldFile="/app/conversations/imstutils/help/group"/>
+</component>
+<component id="imconnectionprovider" filter="s60" name="IM Connection Provider" class="plugin">
+<unit bldFile="/app/conversations/imstutils/imconnectionprovider/group"/>
+</component>
+<component id="xmppadapter" filter="s60" name="XMPP Settings Adapter" class="plugin">
+<unit bldFile="/app/conversations/imstutils/xmppadapter/group"/>
+</component>
+<component id="imconversationview" filter="s60" name="IM Conversation View">
+<unit bldFile="/app/conversations/imstutils/imconversationview/group"/>
+</component>
+<component id="imstutils_config" filter="s60" name="IM Service Tab Utils config" class="config">
+<!-- remove the #includes and or moved ithe loc file into one the above components -->
+<unit bldFile="/app/conversations/imstutils/group"/>
+</component>
+</collection>
+<collection id="uiservicetab" name="UI Service Tab" level="ui">
+<component id="vimpstutils" filter="s60" name="VIMP Service Tab Utilities">
+<!-- need to spell out VIMP at least once -->
+<unit bldFile="/app/conversations/uiservicetab/vimpstutils/group"/>
+</component>
+<component id="vimpststorage" filter="s60" name="VIMP Service Tab Storage">
+<unit bldFile="/app/conversations/uiservicetab/vimpststorage/group"/>
+</component>
+<component id="vimpstengine" filter="s60" name="VIMP Service Tab Engine">
+<unit bldFile="/app/conversations/uiservicetab/vimpstengine/group"/>
+</component>
+<component id="vimpstcmdprocess" filter="s60" name="VIMP Service Tab Command Process">
+<unit bldFile="/app/conversations/uiservicetab/vimpstcmdprocess/group"/>
+</component>
+<component id="vimpstui" filter="s60" name="VIMP Service Tab UI">
+<unit bldFile="/app/conversations/uiservicetab/vimpstui/group"/>
+</component>
+<component id="vimpstdetailsviewplugin" filter="s60" name="VIMP ST Details View Plugin" class="plugin">
+<unit bldFile="/app/conversations/uiservicetab/vimpstdetailsviewplugin/group"/>
+</component>
+<component id="uiservicetab_build" filter="s60" name="UI Service Tab Build">
+<!-- can this be distributed into the above bld.infs? -->
+<unit bldFile="/app/conversations/uiservicetab/group"/>
+</component>
+</collection>
+<collection id="servicewidget" name="Service Widget" level="ui">
+<component id="servicewidgetdatapublisher" filter="s60" name="Service Widget Data Publisher" class="plugin">
+<unit bldFile="/app/conversations/servicewidget/servicewidgetdatapublisher/group"/>
+</component>
+<component id="themes" filter="s60" name="Service Widget Themes" class="config">
+<!-- does this really need to have that number in the directory name? -->
+<unit bldFile="/app/conversations/servicewidget/themes/install-themes/install/servicewidget_20021383/group"/>
+</component>
+<component id="servicewidget_build" filter="s60" name="Service Widget Build">
+<!-- Either move the whole collection down one directory into a single component, or move the ROM and SIS parts into a Service Widget ROM component -->
+<unit bldFile="/app/conversations/servicewidget/group"/>
+</component>
+</collection>
+<collection id="instantmsgindicatorplugin" name="Instant Message Indicator Plugin" level="plugin">
+<!-- collection is really a component. should move down a directory -->
+<component id="instantmsgindicatorplugin_build" filter="s60" name="Instant Message Indicator Plugin Build" class="plugin" introduced="^3">
+<unit bldFile="/app/conversations/instantmsgindicatorplugin/group"/>
+</component>
+</collection>
+<collection id="imstatuspaneindicatorplugin" name="IM Status Pane Indicator Plugin" level="plugin">
+<!-- collection is really a component. should move down a directory -->
+<component id="imstatuspaneindicatorplugin_build" filter="s60" name="IM Status Pane Indicator Plugin Build" class="plugin" introduced="^3">
+<unit bldFile="/app/conversations/imstatuspaneindicatorplugin/group"/>
+</component>
+</collection>
+<collection id="conversations_info" name="Conversation Apps Info" level="ui">
+<component id="conversations_build" filter="s60" name="Conversation Apps Build">
+<!-- can the exports be moved to other components? or this remade into a configuration component?-->
+<unit bldFile="/app/conversations/group"/>
+</component>
+</collection>
+</package>
+<package id="im" level="apps" tech-domain="pr" name="Instant Messaging Apps" levels="support prot engine apps">
+<collection id="im_plat" name="Instant Messaging Apps Platform Interfaces" level="apps">
+<component id="wv_sap_settings_api" name="WV SAP Settings API" class="api" filter="s60">
+<unit bldFile="/app/im/im_plat/wv_sap_settings_api/group"/>
+</component>
+</collection>
+<collection id="wvsettings20" name="Wireless Village Settings Engine" level="support">
+<!-- this is really a component. should move down a directory -->
+<component id="wvsapsettingsstore" name="WV SAP Settings Store" filter="s60" introduced="9.3">
+<unit bldFile="/app/im/wvsettings20/group"/>
+</component>
+</collection>
+</package>
+<package id="dictionary" level="services" tech-domain="pr" name="Dictionary" levels="utils ui">
+<collection id="dictionary_plat" name="Dictionary Platform Interfaces" level="ui">
+<component id="menu_suites_macros_api" name="Menu Suites Macros API" class="api" filter="s60">
+<unit bldFile="/app/dictionary/dictionary_plat/menu_suites_macros_api/group"/>
+</component>
+</collection>
+<collection id="userdict" name="User Dictionary" level="ui">
+<!-- collection is really a component, move down a dir -->
+<component id="userdict_build" filter="s60" name="Japanese User Dictionary">
+<unit bldFile="/app/dictionary/userdict/group"/>
+</component>
+</collection>
+</package>
+<package id="camera" level="apps" tech-domain="ma" name="Camera Apps">
+<collection id="camera_plat" name="Camera Apps Platform Interfaces">
+<component id="camcorder_ui_constants_api" name="Camcorder UI Constants API" class="api" filter="s60">
+<unit bldFile="/app/camera/camera_plat/camcorder_ui_constants_api/group"/>
+</component>
+<component id="active_palette_2_api" name="Active Palette 2 API" class="api" filter="s60">
+<unit bldFile="/app/camera/camera_plat/active_palette_2_api/group"/>
+</component>
+</collection>
+<collection id="camerauis" name="Camera UIs">
+<component id="activepalette" filter="s60" name="Active Palette">
+<unit bldFile="/app/camera/camerauis/activepalette/group"/>
+</component>
+<component id="cameraapp" filter="s60" name="Camera Application">
+<unit bldFile="/app/camera/camerauis/cameraapp/group"/>
+<unit bldFile="/app/camera/camerauis/cameraapp/help/group"/>
+</component>
+</collection>
+<collection id="camera_info" name="Camera Apps Info">
+
+</collection>
+</package>
+<package id="imgeditor" level="apps" tech-domain="ma" name="Image Editor Apps" levels="engine ui">
+<collection id="imgeditor_plat" name="Image Editor Apps Platform Interfaces" level="ui">
+<component id="image_editor_debug_utilities_api" name="Image Editor Debug Utilities API" class="api" filter="s60">
+<unit bldFile="/app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
+</component>
+<component id="image_editor_utilities_api" name="Image Editor Utilities API" class="api" filter="s60">
+<unit bldFile="/app/imgeditor/imgeditor_plat/image_editor_utilities_api/group"/>
+</component>
+<component id="image_editor_definitions_api" name="Image Editor Definitions API" class="api" filter="s60">
+<unit bldFile="/app/imgeditor/imgeditor_plat/image_editor_definitions_api/group"/>
+</component>
+<component id="image_editor_system_parameters_api" name="Image Editor System Parameters API" class="api" filter="s60">
+<unit bldFile="/app/imgeditor/imgeditor_plat/image_editor_system_parameters_api/group"/>
+</component>
+<component id="image_processing_engine_api" name="Image Processing Engine API" class="api" filter="s60">
+<unit bldFile="/app/imgeditor/imgeditor_plat/image_processing_engine_api/group"/>
+</component>
+</collection>
+<collection id="imageeditor" name="Image Editor UI" level="ui">
+<component id="pb" filter="s60" name="Plugin Base">
+<unit bldFile="/app/imgeditor/imageeditor/pb/group"/>
+</component>
+<component id="iepb" filter="s60" name="Image Editor Plugin Base">
+<unit bldFile="/app/imgeditor/imageeditor/iepb/group"/>
+</component>
+<component id="imageeditorui" filter="s60" name="Image Editor UI">
+<unit bldFile="/app/imgeditor/imageeditor/imageeditorui/group"/>
+</component>
+<component id="imageeditormanager" filter="s60" name="Image Editor Manager">
+<unit bldFile="/app/imgeditor/imageeditor/imageeditormanager/group"/>
+</component>
+<component id="imageeditorapp" filter="s60" name="Image Editor Application">
+<unit bldFile="/app/imgeditor/imageeditor/imageeditorapp/group"/>
+</component>
+<component id="imageeditor_plugins" filter="s60" name="Image Editor Plugins" class="plugin">
+<!-- can only have one unit. Need to include all from a single bld.inf -->
+<unit bldFile="/app/imgeditor/imageeditor/plugins/blackwhiteplugin/group"/>
+<unit bldFile="/app/imgeditor/imageeditor/plugins/brightnessplugin/group"/>
+<unit bldFile="/app/imgeditor/imageeditor/plugins/bubbleplugin/group"/>
+<unit bldFile="/app/imgeditor/imageeditor/plugins/cartoonizeplugin/group"/>
+<unit bldFile="/app/imgeditor/imageeditor/plugins/clipartplugin/group"/>
+<unit bldFile="/app/imgeditor/imageeditor/plugins/contrastplugin/group"/>
+<unit bldFile="/app/imgeditor/imageeditor/plugins/cropplugin/group"/>
+<unit bldFile="/app/imgeditor/imageeditor/plugins/drawplugin/group"/>
+<unit bldFile="/app/imgeditor/imageeditor/plugins/frameplugin/group"/>
+<unit bldFile="/app/imgeditor/imageeditor/plugins/negativeplugin/group"/>
+<unit bldFile="/app/imgeditor/imageeditor/plugins/redeyeplugin/group"/>
+<unit bldFile="/app/imgeditor/imageeditor/plugins/resizeplugin/group"/>
+<unit bldFile="/app/imgeditor/imageeditor/plugins/rotatelplugin/group"/>
+<unit bldFile="/app/imgeditor/imageeditor/plugins/rotaterplugin/group"/>
+<unit bldFile="/app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
+<unit bldFile="/app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
+<unit bldFile="/app/imgeditor/imageeditor/plugins/textplugin/group"/>
+<!-- conditionally #included in imageeditor_build: need to fix
+ <unit bldFile="imageeditor/plugins/drawplugin/group"/>
+ -->
+</component>
+<component id="editorprovider" filter="s60" name="Image Editor Provider">
+<unit bldFile="/app/imgeditor/imageeditor/editorprovider/group"/>
+</component>
+<component id="imageeditor_build" filter="s60" name="Image Editor Build">
+<!-- should distribute this to the other components -->
+<unit bldFile="/app/imgeditor/imageeditor/group"/>
+</component>
+</collection>
+<collection id="imageeditorengine" name="Image Editor Engine" level="engine">
+<component id="filters" filter="s60" name="Image Editor Filters">
+<!-- can only have one unit. Need to include all from a single bld.inf -->
+<unit bldFile="/app/imgeditor/imageeditorengine/filters/filterbrightness/group"/>
+<unit bldFile="/app/imgeditor/imageeditorengine/filters/filterbubble/group"/>
+<unit bldFile="/app/imgeditor/imageeditorengine/filters/filterbuffer/group"/>
+<unit bldFile="/app/imgeditor/imageeditorengine/filters/filtercartoon/group"/>
+<unit bldFile="/app/imgeditor/imageeditorengine/filters/filterclipart/group"/>
+<unit bldFile="/app/imgeditor/imageeditorengine/filters/filtercontrast/group"/>
+<unit bldFile="/app/imgeditor/imageeditorengine/filters/filtercrop/group"/>
+<unit bldFile="/app/imgeditor/imageeditorengine/filters/filterdraw/group"/>
+<unit bldFile="/app/imgeditor/imageeditorengine/filters/filterframe/group"/>
+<unit bldFile="/app/imgeditor/imageeditorengine/filters/filtergrayscale/group"/>
+<unit bldFile="/app/imgeditor/imageeditorengine/filters/filtericlsource/group"/>
+<unit bldFile="/app/imgeditor/imageeditorengine/filters/filterjpegsource/group"/>
+<unit bldFile="/app/imgeditor/imageeditorengine/filters/filterjpegtarget/group"/>
+<unit bldFile="/app/imgeditor/imageeditorengine/filters/filternegate/group"/>
+<unit bldFile="/app/imgeditor/imageeditorengine/filters/filterredeye/group"/>
+<unit bldFile="/app/imgeditor/imageeditorengine/filters/filterrotate/group"/>
+<unit bldFile="/app/imgeditor/imageeditorengine/filters/filterscale/group"/>
+<unit bldFile="/app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
+<unit bldFile="/app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
+<unit bldFile="/app/imgeditor/imageeditorengine/filters/filtertext/group"/>
+<!-- conditionally #included in imageeditor_build: need to fix
+ <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
+ -->
+</component>
+<component id="imageeditorutils" filter="s60" name="Image Editor Utilities">
+<unit bldFile="/app/imgeditor/imageeditorengine/imageeditorutils/group"/>
+</component>
+<component id="systemparameters" filter="s60" name="System Parameters">
+<unit bldFile="/app/imgeditor/imageeditorengine/systemparameters/group"/>
+</component>
+<component id="enginewrapper" filter="s60" name="Image Editor Engine Wrapper">
+<unit bldFile="/app/imgeditor/imageeditorengine/enginewrapper/group"/>
+</component>
+<component id="imageeditorengine_build" filter="s60" name="Image Editor Engine Build">
+<!-- should distribute this to the other components -->
+<unit bldFile="/app/imgeditor/imageeditorengine/group"/>
+</component>
+</collection>
+</package>
+<!-- <package id="videoeditor" level="apps" tech-domain="ma" href="../../../../app/videoeditor/package_definition.xml"/> -->
+<package id="videoplayer" level="apps" tech-domain="ma" name="Video Player Apps" levels="support plugin util apps">
+<collection id="videoplayer_plat" name="Video Player Apps Platform Interfaces" level="apps">
+<component id="videoplayer_startup_api" name="Video Player Startup API" class="api" filter="s60">
+<unit bldFile="/app/videoplayer/videoplayer_plat/videoplayer_startup_api/group" filter="!test"/>
+
+</component>
+<component id="video_player_file_details_dialog_api" name="Media Player File Details Dialog API" class="api" filter="s60">
+<unit bldFile="/app/videoplayer/videoplayer_plat/video_player_file_details_dialog_api/group" filter="!test"/>
+
+</component>
+<component id="videocollection_api" name="Video Collection API" class="api" filter="s60">
+<unit bldFile="/app/videoplayer/videoplayer_plat/videocollection_api/group"/>
+</component>
+</collection>
+<collection id="videofeeds" name="Video Feeds" level="util">
+<component id="iptv_utils" filter="s60" name="IPTV Util" introduced="^3">
+<unit bldFile="/app/videoplayer/videofeeds/utils/group"/>
+</component>
+<component id="viewmessageutility" filter="s60" name="View Message Utility" introduced="^3">
+<unit bldFile="/app/videoplayer/videofeeds/viewmessageutility/group"/>
+</component>
+<component id="vcxnotifier" filter="s60" name="Video Connection Notifier" introduced="^3" class="plugin">
+<unit bldFile="/app/videoplayer/videofeeds/vcxnotifier/group"/>
+</component>
+<component id="vccommon" filter="s60" name="Video Connection Common" introduced="^3">
+<unit bldFile="/app/videoplayer/videofeeds/vccommon/group"/>
+</component>
+<component id="clientapi" name="Server Client" filter="s60" introduced="^3">
+<unit bldFile="/app/videoplayer/videofeeds/clientapi/group"/>
+</component>
+<component id="provisioningprocessor" name="Provisioning Processor" filter="s60" introduced="^3">
+<unit bldFile="/app/videoplayer/videofeeds/provisioningprocessor/group"/>
+</component>
+<component id="mrssplugin" name="RSS plugin" filter="s60" introduced="^3" class="plugin">
+<unit bldFile="/app/videoplayer/videofeeds/mrssplugin/group"/>
+</component>
+<component id="videofeeds_server" name="Server" filter="s60" introduced="^3">
+<unit bldFile="/app/videoplayer/videofeeds/server/group"/>
+</component>
+
+<component id="livetvutils" name="LiveTV Utils" filter="s60" introduced="^3">
+<unit bldFile="/app/videoplayer/videofeeds/livetvutils/group"/>
+</component>
+<component id="iptvprovisioningrecognizer" name="IP TV Provisioning Recognizer" filter="s60" introduced="^3" class="plugin">
+<unit bldFile="/app/videoplayer/videofeeds/provisioningrecognizer/group"/>
+</component>
+<component id="iptvprovisioningappui" name="IP TV Provisioning App UI" filter="s60" introduced="^3">
+<unit bldFile="/app/videoplayer/videofeeds/provisioningappui/group"/>
+</component>
+<component id="iptvomaprovisioning" name="IP TV OMA Provisioning" filter="s60" introduced="^3">
+<unit bldFile="/app/videoplayer/videofeeds/omaprovisioning/group"/>
+</component>
+<component id="vcnsuiengine" name="VoD UI Engine" filter="s60" introduced="^3">
+<unit bldFile="/app/videoplayer/videofeeds/vcnsuiengine/group"/>
+</component>
+<component id="hgvodui" name="Ganes UX2.0 VoD UI" filter="s60" introduced="^3">
+<unit bldFile="/app/videoplayer/videofeeds/hgvodui/group"/>
+</component>
+<component id="hgvodplugin" name="Ganes UX2.0 VoD UI Plugin" filter="s60" introduced="^3" class="plugin">
+<unit bldFile="/app/videoplayer/videofeeds/hgvodplugin/group"/>
+</component>
+<component id="vcnsscheduleview" name="Scheduled Download Settings View" filter="s60" introduced="^3">
+<unit bldFile="/app/videoplayer/videofeeds/vcnsscheduleview/group"/>
+</component>
+<component id="vcnsscheduleplugin" name="Scheduled Download Settings Plugin" filter="s60" introduced="^3" class="plugin">
+<unit bldFile="/app/videoplayer/videofeeds/vcnsscheduleplugin/group"/>
+</component>
+<component id="scheduleddlplugin" name="Scheduled download plugin" filter="s60" introduced="^3">
+<unit bldFile="/app/videoplayer/videofeeds/scheduleddlplugin/group"/>
+</component>
+
+</collection>
+<collection id="videocollection" name="Video Collection" level="util">
+<component id="mpxmyvideoscollection" filter="s60" name="MPX My Videos Collection" introduced="^3">
+<unit bldFile="/app/videoplayer/videocollection/mpxmyvideoscollection/group"/>
+</component>
+
+<component id="myvideosindicatorplugin" filter="s60" name="My Videos Indicator Plugin" introduced="^3" class="plugin">
+<unit bldFile="/app/videoplayer/videocollection/myvideosindicatorplugin/group"/>
+</component>
+<component id="hgmyvideos" filter="s60" name="Huriganes My Videos" introduced="^3">
+<unit bldFile="/app/videoplayer/videocollection/hgmyvideos/group"/>
+</component>
+<component id="hgmyvideosplugin" filter="s60" name="Huriganes My VideosPlugin" introduced="^3" class="plugin">
+<unit bldFile="/app/videoplayer/videocollection/hgmyvideosplugin/group"/>
+</component>
+
+</collection>
+<collection id="mediasettings" name="Media Settings" level="support">
+<!-- this is really a component. Should be moved down a directory -->
+<component id="mediasettings_build" filter="s60" name="Media Settings Build">
+<unit bldFile="/app/videoplayer/mediasettings/group"/>
+</component>
+<component id="videoplayer_test" filter="s60" purpose="development" name="Video Player Apps Test">
+<!-- can only have one unit. Can thes be #included from the above or another bld.inf?-->
+<unit bldFile="/app/videoplayer/tsrc/VCXTestCommon/group"/>
+<unit bldFile="/app/videoplayer/tsrc/VCXTestUtilModule/group"/>
+<unit bldFile="/app/videoplayer/tsrc/VCXTestMyVideosCollectionClient/group"/>
+<unit bldFile="/app/videoplayer/mediasettings/mediasettingsengine/tsrc/mediasettingsenginetest/group"/>
+<unit bldFile="/app/videoplayer/mediasettings/videoplayersettingsengine/tsrc/vpsettingsenginetest/group"/>
+</component>
+</collection>
+<collection id="filedetails" name="File Details" level="support">
+<component id="filedetailsplugin" filter="s60" name="File Details Plugin" class="plugin" introduced="^3">
+<unit bldFile="/app/videoplayer/filedetails/filedetailsplugin/group"/>
+</component>
+<component id="filedetailsdialog" filter="s60" name="File Details Dialog" introduced="^3">
+<unit bldFile="/app/videoplayer/filedetails/filedetailsdialog/group"/>
+</component>
+</collection>
+<collection id="videoplayerapp" name="Video Player App" level="apps">
+<component id="lwplayer" name="Lightweight Player" filter="s60">
+<unit bldFile="/app/videoplayer/videoplayerapp/lwplayer/group"/>
+</component>
+<component id="mpxvideoplayer" filter="s60" name="MPX Video Player" class="plugin">
+<unit bldFile="/app/videoplayer/videoplayerapp/mpxvideoplayer/group" filter="!test"/>
+
+</component>
+</collection>
+<collection id="videoplayback" name="Video Playback Plugins" level="plugin">
+<component id="videohelix" name="Video Helix" filter="s60" introduced="^3" class="plugin">
+<unit bldFile="/app/videoplayer/videoplayback/videohelix/group" filter="!test"/>
+
+</component>
+<component id="videopdlplaybackviewplugin" filter="s60" name="Video PDL Playback View Plugin" class="plugin" introduced="^3">
+<unit bldFile="/app/videoplayer/videoplayback/videopdlplaybackviewplugin/group" filter="!test"/>
+</component>
+<component id="videoplaybackcontrols" filter="s60" name="Video Playback Controls" introduced="^3" class="plugin">
+<unit bldFile="/app/videoplayer/videoplayback/videoplaybackcontrols/group" filter="!test"/>
+
+</component>
+<component id="videoplaybackviewplugin" filter="s60" name="Video Playback View Plugin" class="plugin" introduced="^3">
+<unit bldFile="/app/videoplayer/videoplayback/videoplaybackviewplugin/group"/>
+</component>
+<component id="videoplaybackviews" filter="s60" name="Video Playback Views" class="plugin" introduced="^3">
+<unit bldFile="/app/videoplayer/videoplayback/videoplaybackviews/group" filter="!test"/>
+
+</component>
+</collection>
+</package>
+<package id="photos" level="apps" tech-domain="ma" name="Photos" levels="support fw ui app">
+<collection id="photos_plat" name="Photos Platform Interfaces" level="app">
+<component id="collection_plugins_api" name="Collection Plugins API" introduced="^2" class="api" filter="s60">
+<unit bldFile="/app/photos/photos_plat/collection_plugins_api/group"/>
+</component>
+<component id="controllers_collection_api" name="Controllers Collection API" introduced="^2" class="api" filter="s60">
+<unit bldFile="/app/photos/photos_plat/controllers_collection_api/group"/>
+</component>
+<component id="gallery_utilities_api" name="Gallery Utilities API" introduced="^2" class="api" filter="s60">
+<unit bldFile="/app/photos/photos_plat/gallery_utilities_api/group"/>
+</component>
+<component id="slideshow_ui_constants_api" name="Slideshow Ui Constants API" introduced="^2" class="api" filter="s60">
+<unit bldFile="/app/photos/photos_plat/slideshow_ui_constants_api/group"/>
+</component>
+<component id="views_metadatadialog_api" name="Views Metadata Dialog API" introduced="^2" class="api" filter="s60">
+<unit bldFile="/app/photos/photos_plat/views_metadatadialog_api/group"/>
+</component>
+</collection>
+<collection id="photosgallery" name="Photos Gallery" level="app">
+<!-- consider splitting this collection into the application itself, and the frameworks behind it -->
+<component id="photosgallery_help" filter="s60" name="Photos Help" introduced="^2">
+<unit bldFile="/app/photos/photosgallery/help/group"/>
+</component>
+<component id="logging" filter="s60" name="Photos Logging" introduced="^2">
+<unit bldFile="/app/photos/photosgallery/logging/group"/>
+</component>
+<component id="photosgallery_common" filter="s60" name="Photos Common" introduced="^2">
+<unit bldFile="/app/photos/photosgallery/common/group"/>
+</component>
+<component id="photosgallery_commonui" filter="s60" name="Photos Common UI" introduced="^2">
+<unit bldFile="/app/photos/photosgallery/commonui/group"/>
+</component>
+<component id="photosgalleryollectionfw" filter="s60" name="Photos Collection Framework" introduced="^2">
+<unit bldFile="/app/photos/photosgallery/collectionframework/group"/>
+</component>
+<component id="galleryicons" filter="s60" name="Photos Icons" class="config" introduced="^2">
+<unit bldFile="/app/photos/photosgallery/icons"/>
+</component>
+<component id="imageviewer" filter="s60" name="Image Viewer" introduced="^3">
+<!-- this is really a part of controllers component, #include from there instead -->
+<unit bldFile="/app/photos/photosgallery/controllers/imageviewer/group"/>
+</component>
+<component id="photosgalleryviewfw" filter="s60" name="View Framework" introduced="^2">
+<unit bldFile="/app/photos/photosgallery/viewframework/group"/>
+</component>
+<component id="controllers" filter="s60" name="Photos Controllers" introduced="^2">
+<unit bldFile="/app/photos/photosgallery/controllers/group"/>
+</component>
+<component id="photogallery" filter="s60" name="Media Gallery" introduced="^2">
+<unit bldFile="/app/photos/photosgallery/gallery/group"/>
+</component>
+<component id="slideshow" filter="s60" name="Slideshow" introduced="^2">
+<unit bldFile="/app/photos/photosgallery/slideshow/group"/>
+</component>
+<component id="memoryplugin" name="Memory Plugin" class="plugin" filter="s60" introduced="^2">
+<unit bldFile="/app/photos/photosgallery/memoryplugin/group"/>
+</component>
+<component id="imgvwr" filter="s60" name="Photos Image Viewer" introduced="^3">
+<unit bldFile="/app/photos/photosgallery/imgvwr/group"/>
+</component>
+<component id="photosgallery_build" filter="s60" name="Photos Gallery Build" introduced="^2">
+<!-- need to remove the #included above bld.infs from this -->
+<unit bldFile="/app/photos/photosgallery/group"/>
+</component>
+</collection>
+</package>
+<package id="musicplayer" level="apps" tech-domain="ma" name="Music Player Apps" levels="plugins support hs app">
+<collection id="musicplayer_plat" name="Music Player Apps Platform Interfaces" level="app">
+<component id="mpx_music_player_app_api" name="MPX Music Player App API" class="api" filter="s60">
+<unit bldFile="/app/musicplayer/musicplayer_plat/mpx_music_player_app_api/group"/>
+</component>
+<component id="mpx_music_player_commonui_api" name="MPX Music Player Common UI API" class="api" filter="s60">
+<unit bldFile="/app/musicplayer/musicplayer_plat/mpx_music_player_commonui_api/group"/>
+</component>
+<component id="mpx_music_player_media_key_handler_api" name="MPX Music Player Media Key Handler API" class="api" filter="s60">
+<unit bldFile="/app/musicplayer/musicplayer_plat/mpx_music_player_media_key_handler_api/group"/>
+</component>
+<component id="mpx_music_player_remote_control_api" name="MPX Music Player Remote Control API" class="api" filter="s60">
+<unit bldFile="/app/musicplayer/musicplayer_plat/mpx_music_player_remote_control_api/group"/>
+</component>
+<component id="mpx_music_shop_ui_api" name="MPX Music Shop UI API" class="api" filter="s60">
+<unit bldFile="/app/musicplayer/musicplayer_plat/mpx_music_shop_ui_api/group"/>
+</component>
+<component id="mpx_music_wap_adapter_cenrep_api" name="MPX Music Wap Adapter CenRep API" class="api" filter="s60">
+<unit bldFile="/app/musicplayer/musicplayer_plat/mpx_music_wap_adapter_cenrep_api/group"/>
+</component>
+<component id="mpx_music_store_api" name="MPX Music Store Find API" class="api" filter="s60">
+<unit bldFile="/app/musicplayer/musicplayer_plat/mpx_music_store_api/group"/>
+</component>
+<component id="audio_application_features_api" name="Audio Application Features API" class="api" filter="s60">
+<unit bldFile="/app/musicplayer/musicplayer_plat/audio_application_features_api/group"/>
+</component>
+<component id="music_content_publisher_plugin_api" name="Music Content Publisher Plugin API" class="api" filter="s60">
+<unit bldFile="/app/musicplayer/musicplayer_plat/music_content_publisher_plugin_api/group"/>
+</component>
+</collection>
+<collection id="mpxmusicplayer" name="MPX Music Player" level="app">
+<component id="mpxmusicplayer_help" filter="s60" name="Help">
+<unit bldFile="/app/musicplayer/mpxmusicplayer/help/group"/>
+</component>
+<component id="mpxmusicplayer_commonui" filter="s60" name="MPX Common UI">
+<unit bldFile="/app/musicplayer/mpxmusicplayer/commonui/group"/>
+</component>
+<component id="mpx_metadatahandler" filter="s60" name="MPX Metadata Handler">
+<unit bldFile="/app/musicplayer/mpxmusicplayer/metadatahandler/group"/>
+</component>
+<component id="mediakeyhandler" filter="s60" name="MPX Media Key Handler">
+<unit bldFile="/app/musicplayer/mpxmusicplayer/mediakeyhandler/group"/>
+</component>
+<component id="mpxmusicplayer_app" filter="s60" name="MPX Application">
+<unit bldFile="/app/musicplayer/mpxmusicplayer/app/group"/>
+</component>
+<component id="mpxmusicplayer_build" filter="s60" name="MPX Music Player Build">
+<!-- can the exports be distributed to the above components? -->
+<unit bldFile="/app/musicplayer/mpxmusicplayer/group"/>
+</component>
+</collection>
+<collection id="musichomescreen_multiview" name="Music Home Screen Multiview" level="hs">
+<meta rel="config">
+<defined condition="IAD_INCLUDE_ENHANCED_HOMESCREEN"/>
+</meta>
+<!-- Uncomment all units when configuration is in place. All currently #included from musichomescreen_build -->
+<component id="mpxcollectionpublisher" filter="s60" name="MPX Collection Publisher" introduced="^2">
+<!--<unit bldFile="musichomescreen_multiview/mpxcollectionpublisher/group"/>-->
+</component>
+<component id="musiccontentpublisher" filter="s60" name="Music Content Publisher" introduced="^2">
+<!--<unit bldFile="musichomescreen_multiview/musiccontentpublisher/group"/>-->
+</component>
+<component id="mcpmusicplayer" filter="s60" name="Music Player MCP Plugin" class="plugin" introduced="^2">
+<!--<unit bldFile="musichomescreen_multiview/mcpmusicplayer/group"/>-->
+</component>
+<component id="musicplayeractionhandlerplugin" filter="s60" name="Music Player Action Handler Plugin" class="plugin" introduced="^2">
+<!--<unit bldFile="musichomescreen_multiview/musicplayeractionhandlerplugin/group"/>-->
+</component>
+<component id="mpx_data" filter="s60" name="MPX Data" introduced="^2">
+<!-- does this make sense to be a component? should it just be #include from musichomescreen_multiview/group? -->
+<!--<unit bldFile="musichomescreen_multiview/data/themes/default/group"/>-->
+</component>
+<component id="musichomescreen_build" filter="s60" name="Music Homescreen Multiview Build" introduced="^2">
+<unit bldFile="/app/musicplayer/musichomescreen_multiview/group"/>
+</component>
+</collection>
+<collection id="mpxplugins" name="MPX Plugins" level="plugins">
+<component id="serviceplugins" filter="s60" name="MPX Service Plugins" class="plugin">
+<unit bldFile="/app/musicplayer/mpxplugins/serviceplugins/group"/>
+</component>
+<component id="viewplugins" filter="s60" name="MPX View Plugins" class="plugin">
+<unit bldFile="/app/musicplayer/mpxplugins/viewplugins/group"/>
+</component>
+<component id="mpxplugins_build" filter="s60" name="MPX Plugins Build">
+<!-- can the exports be distributed to the above components? -->
+<unit bldFile="/app/musicplayer/mpxplugins/group"/>
+</component>
+</collection>
+<collection id="musicplayer_info" name="Music Player Apps Info" level="app">
+<component id="musicplayer_build" filter="s60" name="Music Player Build">
+<!-- should explicitly #inlcude musicplayerbldvariant.hrh in each component -->
+<unit bldFile="/app/musicplayer/group"/>
+</component>
+
+</collection>
+</package>
+<package id="radio" level="apps" tech-domain="ma" name="Radio Apps" levels="engine ui">
+<collection id="fmradio" name="FM Radio" level="ui">
+<component id="activeidleengine" filter="s60" name="FM Radio Active Idle Engine">
+<unit bldFile="/app/radio/fmradio/activeidleengine/group"/>
+</component>
+<component id="fmradioengine" filter="s60" name="FM Radio Engine">
+<unit bldFile="/app/radio/fmradio/fmradioengine/group"/>
+</component>
+<component id="fmradioactionhandler" filter="s60" name="FM Radio Action Handler" class="plugin">
+<unit bldFile="/app/radio/fmradio/fmradioactionhandler/group"/>
+</component>
+<component id="fmradiomcpplugin" filter="s60" name="FM Radio Content Publisher Plugin" class="plugin">
+<unit bldFile="/app/radio/fmradio/fmradiomcpplugin/group"/>
+</component>
+<component id="fmradio_build" filter="s60" name="FM Radio Build">
+<unit bldFile="/app/radio/fmradio/fmradio/group"/>
+</component>
+<component id="fmradio_help" filter="s60" name="FM Radio Help">
+<unit bldFile="/app/radio/fmradio/help/group"/>
+</component>
+<component id="fmradio_build" filter="s60" name="FM Radio ROM">
+<!-- remove above #included bld.infs -->
+<unit bldFile="/app/radio/fmradio/group"/>
+</component>
+</collection>
+</package>
+<package id="podcatcher" level="apps" tech-domain="ma" name="Podcatcher" levels="app">
+<collection id="podcatcher_info" name="Podcatcher" level="app">
+<component id="podcatcher_build" filter="sf_build" name="Podcatcher Build" introduced="^3">
+<unit bldFile="/app/podcatcher/group"/>
+</component>
+</collection>
+</package>
+<package id="voicerec" level="apps" tech-domain="ma" name="Voice Recorder Apps">
+<!-- custom filter pref_test-->
+<collection id="voicerec_plat" name="Voice Recorder Apps Platform Interfaces">
+<component id="new_file_service_api" name="New File Service API" class="api" filter="s60">
+<unit bldFile="/app/voicerec/voicerec_plat/new_file_service_api/group"/>
+</component>
+<component id="voicerecorder_public_constants_api" name="Voice Recorder Public Constants API" class="api" filter="s60">
+<unit bldFile="/app/voicerec/voicerec_plat/voicerecorder_public_constants_api/group"/>
+</component>
+</collection>
+<collection id="voicerecorder" name="Voice Recorder">
+<!--this is really a component, move down a directory -->
+<component id="voicerecorder_build" filter="s60" name="Voice Recorder Build">
+<unit bldFile="/app/voicerec/voicerecorder/group"/>
+</component>
+</collection>
+<collection id="voicerec_info" name="Voice Recorder Apps Info">
+
+</collection>
+</package>
+<package id="screensaver" level="apps" tech-domain="ui" name="Screen Saver Apps" levels="plugin ui">
+<!-- is this a user-facing application or a daemon? -->
+<!-- units need to be commented out until configuration is in place. They are currently #included from screensaver_build-->
+<collection id="scrsaver" name="Screen Saver" level="plugin">
+<meta rel="config">
+<not-defined condition="TOOLS"/>
+</meta>
+<component id="scrsaverplugins" filter="s60" name="Screen Saver Plugins" class="plugin">
+<meta rel="config">
+<not-defined condition="__SERIES60_30__"/>
+<defined condition="__SERIES60_NATIVE_BROWSER"/>
+</meta>
+<!-- must have only one component. #include from a common bld.inf, or move up a directory and make scrsaverplugins a collection -->
+<!--<unit bldFile="scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/"/>
+ <unit bldFile="scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/group/"/>-->
+</component>
+<component id="scrsaver_slideshowplugin" filter="s60" name="Screen Saver Slideshow Plugin" class="plugin">
+<meta rel="config">
+<defined condition="__SLIDESHOW_SCREENSAVER "/>
+</meta>
+<!--<unit bldFile="scrsaver/scrsaverplugins/SlideshowPlugin/group"/> -->
+</component>
+<component id="screensaveraiwplugin" filter="s60" name="Screen Saver AIW Plugin" class="plugin">
+<meta rel="config">
+<defined condition="RD_SCREENSAVERAIWPLUGIN "/>
+</meta>
+<!-- <unit bldFile="scrsaver/screensaveraiwplugin/group"/>-->
+</component>
+</collection>
+<collection id="screensaver_info" name="Screen Saver Apps Info" level="ui">
+<component id="screensaver_build" filter="s60" name="Screen Saver Application">
+<!--the app should be a separate component -->
+<unit bldFile="/app/screensaver/group"/>
+</component>
+</collection>
+</package>
+<package id="homescreen" level="apps" tech-domain="ui" name="Home Screen Apps" levels="fw support apps">
+<collection id="homescreen_plat" name="Home Screen Apps Platform Interfaces" level="apps">
+<component id="menu_settings_api" name="Menu Settings API" class="api" filter="s60">
+<unit bldFile="/app/homescreen/homescreen_plat/menu_settings_api/group"/>
+</component>
+<component id="hs_content_control_ui" name="HS Content Control Ui" class="api" filter="s60">
+<unit bldFile="/app/homescreen/homescreen_plat/hs_content_control_ui/group"/>
+</component>
+<component id="hs_renderingplugin_api" name="HS Rendering Plugin API" class="api" filter="s60">
+<unit bldFile="/app/homescreen/homescreen_plat/hs_renderingplugin_api/group"/>
+</component>
+</collection>
+<collection id="idlehomescreen" name="Idle Home Screen" level="apps">
+<component id="nativeuicontroller" filter="s60" name="Native UI Controller">
+<unit bldFile="/app/homescreen/idlehomescreen/nativeuicontroller/group"/>
+</component>
+<component id="exths" filter="s60" name="Active Idle Container" class="plugin">
+<!-- why is the ID so different from the name? Is one wrong? -->
+<unit bldFile="/app/homescreen/idlehomescreen/exths/group"/>
+</component>
+<component id="hscontentcontrol" filter="s60" name="Home Screen Content Control" introduced="^3">
+<unit bldFile="/app/homescreen/idlehomescreen/hscontentcontrol/group"/>
+</component>
+<component id="hssapiwrapper" filter="s60" name="HS SAPI Wrapper" introduced="^3">
+<!-- can only have one unit. #include from a common bld.inf, or split into two components -->
+<unit bldFile="/app/homescreen/idlehomescreen/sapiwrapper/cpswrapper/group"/>
+<unit bldFile="/app/homescreen/idlehomescreen/sapiwrapper/hspswrapper/group"/>
+</component>
+<component id="xmluirendering" filter="s60" name="XML UI Rendering" introduced="^3">
+<unit bldFile="/app/homescreen/idlehomescreen/xmluirendering/group"/>
+</component>
+<component id="xmluicontroller" filter="s60" name="XML UI Controller" introduced="^3">
+<unit bldFile="/app/homescreen/idlehomescreen/xmluicontroller/group"/>
+</component>
+<component id="widgetmanager" filter="s60" name="Widget Manager" introduced="^3">
+<unit bldFile="/app/homescreen/idlehomescreen/widgetmanager/group"/>
+</component>
+<component id="idlehomescreen_help" filter="s60" name="Idle Home Screen Help">
+<unit bldFile="/app/homescreen/idlehomescreen/help/group"/>
+</component>
+<component id="idlehomescreen_data" filter="s60" name="Idle Home Screen Data">
+<meta rel="config">
+<defined condition="FF_HOMESCREEN_COMMON_IDLEFW"/>
+<!-- currently always on, so safe to define here for now -->
+</meta>
+<unit bldFile="/app/homescreen/idlehomescreen/data/group"/>
+</component>
+<component id="idlehomescreen_build" filter="s60" name="Idle Home Screen Build">
+<!-- can the loc file be moved to another comopnent and this one removed? -->
+<unit bldFile="/app/homescreen/idlehomescreen/group"/>
+</component>
+
+</collection>
+<collection id="menufw" name="Menu Framework" level="fw">
+<component id="hierarchynavigator" filter="s60" name="Hierarchy Navigator">
+<unit bldFile="/app/homescreen/menufw/hierarchynavigator/group"/>
+</component>
+<component id="menufwui" filter="s60" name="Menu Framework UI">
+<unit bldFile="/app/homescreen/menufw/menufwui/group"/>
+</component>
+<component id="menusuites" filter="s60" name="Menu Suites">
+<unit bldFile="/app/homescreen/menufw/menusuites/group"/>
+</component>
+<component id="menufw_build" filter="s60" name="Menu Framework Build">
+<!-- can the exports be exported by the other components? -->
+<unit bldFile="/app/homescreen/menufw/group"/>
+</component>
+</collection>
+<collection id="taskswitcher" name="Task Switcher" level="support">
+<component id="contextengine" filter="s60" name="Context Engine" introduced="^3">
+<unit bldFile="/app/homescreen/taskswitcher/contextengine/group"/>
+</component>
+<component id="taskswitcherui" filter="s60" name="Task Switcher UI" introduced="^3">
+<unit bldFile="/app/homescreen/taskswitcher/taskswitcherui/group"/>
+</component>
+</collection>
+</package>
+<package id="graphicsuis" level="services" tech-domain="ui" name="Graphics UIs" levels="util ui">
+<collection id="graphicsuis_plat" name="Graphics UIs Platform Interfaces" level="ui">
+<component id="svgt_viewer_ui_api" name="SVG-T Viewer UI API" class="api" filter="s60">
+<unit bldFile="/app/graphicsuis/graphicsuis_plat/svgt_viewer_ui_api/group"/>
+</component>
+<component id="svg_application_observer_utility_api" name="SVG Application Observer Utility API" class="api" filter="s60">
+<unit bldFile="/app/graphicsuis/graphicsuis_plat/svg_application_observer_utility_api/group"/>
+</component>
+<component id="svgt_file_view_details_dialog_api" name="SVG-T File View Details Dialog API" class="api" filter="s60">
+<unit bldFile="/app/graphicsuis/graphicsuis_plat/svgt_file_view_details_dialog_api/group"/>
+</component>
+</collection>
+<collection id="svgtviewer" name="SVG-T Viewer" level="ui">
+<component id="svgtviewerplugin" filter="s60" name="SVG-T Viewer Plugin">
+<unit bldFile="/app/graphicsuis/svgtviewer/svgtviewerplugin/group"/>
+</component>
+</collection>
+</package>
+<package id="profile" level="apps" tech-domain="ui" name="Profiles" levels="app">
+<collection id="profile_plat" name="Profiles Platform Interfaces" level="app">
+<component id="profiles_settings_view_api" name="Profiles Settings View API" class="api" filter="s60">
+<unit bldFile="/app/profile/profile_plat/profiles_settings_view_api/group"/>
+</component>
+</collection>
+<collection id="profilesapplication" name="Profiles Application" level="app">
+<component id="profiles" filter="s60" name="Profiles">
+<unit bldFile="/app/profile/profilesapplication/profiles/group"/>
+</component>
+
+</collection>
+<collection id="profile_info" name="Profiles Info" level="app">
+<component id="profile_help" filter="s60" name="Profiles Help">
+<unit bldFile="/app/profile/help/group"/>
+</component>
+</collection>
+</package>
+<package id="speechsrv" level="services" tech-domain="ui" name="Speech Recognition UIs" levels="engine framework ui">
+<collection id="speechsrv_plat" name="Speech Recognition UIs Platform Interfaces" level="ui">
+<component id="vas_api" name="VAS API" class="api" filter="s60">
+<unit bldFile="/app/speechsrv/speechsrv_plat/vas_api/group"/>
+</component>
+<component id="nss_devasr_api" name="NSS DevASR API" class="api" filter="s60">
+<unit bldFile="/app/speechsrv/speechsrv_plat/nss_devasr_api/group"/>
+</component>
+<component id="tts_hw_device_api" name="TTS HW Device API" class="api" filter="s60">
+<unit bldFile="/app/speechsrv/speechsrv_plat/tts_hw_device_api/group"/>
+</component>
+<component id="voice_commands_resource_header_api" name="Voice Commands Resource Header API" class="api" filter="s60">
+<unit bldFile="/app/speechsrv/speechsrv_plat/voice_commands_resource_header_api/group"/>
+</component>
+<component id="nss_mmf_tts_custom_commands_api" name="NSS MMF TTS Custom Commands API" class="api" filter="s60">
+<unit bldFile="/app/speechsrv/speechsrv_plat/nss_mmf_tts_custom_commands_api/group"/>
+</component>
+<component id="srsf_cenrep_settings_api" name="SRSF CenRep Settings API" class="api" filter="s60">
+<unit bldFile="/app/speechsrv/speechsrv_plat/srsf_cenrep_settings_api/group"/>
+</component>
+<component id="voice_ui_plugin_api" name="Voice UI Plug-in API" class="api" filter="s60">
+<unit bldFile="/app/speechsrv/speechsrv_plat/voice_ui_plugin_api/group"/>
+</component>
+<component id="nss_tts_utility_api" name="NSS TTS Utility API" class="api" filter="s60">
+<unit bldFile="/app/speechsrv/speechsrv_plat/nss_tts_utility_api/group"/>
+</component>
+<component id="nss_srs_custom_commands_api" name="NSS SRS Custom Commands API" class="api" filter="s60">
+<unit bldFile="/app/speechsrv/speechsrv_plat/nss_srs_custom_commands_api/group"/>
+</component>
+<component id="srsf_secondarydisplay_api" name="SRSF Secondary Display API" class="api" filter="s60">
+<unit bldFile="/app/speechsrv/speechsrv_plat/srsf_secondarydisplay_api/group"/>
+</component>
+<component id="asrs_hw_device_api" name="ASRS Hardware Device API" class="api" filter="s60">
+<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">
+<unit bldFile="/app/speechsrv/speechsrv_plat/adaptation_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">
+<unit bldFile="/app/speechsrv/speechsrv_plat/nss_srs_utility_api/group"/>
+</component>
+<component id="recognition_hw_device_api" name="Recognition Hardware Device API" class="api" filter="s60">
+<unit bldFile="/app/speechsrv/speechsrv_plat/recognition_hw_device_api/group"/>
+</component>
+<component id="vas_contact_handler_api" name="VAS Contact Handler API" class="api" filter="s60">
+<unit bldFile="/app/speechsrv/speechsrv_plat/vas_contact_handler_api/group"/>
+</component>
+<component id="nlp_hw_device" name="NLP Hardware Device" class="api" filter="s60">
+<unit bldFile="/app/speechsrv/speechsrv_plat/nlp_hw_device/group"/>
+</component>
+<component id="nss_si_speech_recognition_data_api" name="NSS SI Speech Recognition Data API" class="api" filter="s60">
+<unit bldFile="/app/speechsrv/speechsrv_plat/nss_si_speech_recognition_data_api/group"/>
+</component>
+<component id="nss_tts_common_api" name="NSS TTS Common API" class="api" filter="s60">
+<unit bldFile="/app/speechsrv/speechsrv_plat/nss_tts_common_api/group"/>
+</component>
+<component id="grcompiler_hw_device_api" name="Grammar Compiler Hardware Device API" class="api" filter="s60">
+<unit bldFile="/app/speechsrv/speechsrv_plat/grcompiler_hw_device_api/group"/>
+</component>
+<component id="ttp_hw_device_api" name="TTP Hardware Device API" class="api" filter="s60">
+<unit bldFile="/app/speechsrv/speechsrv_plat/ttp_hw_device_api/group"/>
+</component>
+<component id="vocman_hw_device_api" name="VocMan Hardware Device API" class="api" filter="s60">
+<unit bldFile="/app/speechsrv/speechsrv_plat/vocman_hw_device_api/group"/>
+</component>
+<component id="speech_synthesis_clientserver_api" name="Speech Synthesis Client-Server API" class="api" filter="s60">
+<unit bldFile="/app/speechsrv/speechsrv_plat/speech_synthesis_clientserver_api/group"/>
+</component>
+<component id="voice_ui_accessory_button_handling_api" name="Voice UI Accessory Button Handling API" class="api" filter="s60">
+<unit bldFile="/app/speechsrv/speechsrv_plat/voice_ui_accessory_button_handling_api/group"/>
+</component>
+<component id="ui_voice_recognition_api" name="UI Voice Recognition API" class="api" filter="s60">
+<unit bldFile="/app/speechsrv/speechsrv_plat/ui_voice_recognition_api/group"/>
+</component>
+<component id="vcommand_settings_cenrep_api" name="Voice Command Settings CenRep API" class="api" filter="s60">
+<unit bldFile="/app/speechsrv/speechsrv_plat/vcommand_settings_cenrep_api/group"/>
+</component>
+</collection>
+<collection id="voiceui" name="Voice UI" level="ui">
+<component id="vcommand" filter="s60" name="Voice Commands UI" introduced="^1">
+<unit bldFile="/app/speechsrv/voiceui/vcommand/group"/>
+</component>
+<component id="voiceuivoicerecognition" filter="s60" name="Voice UI Recognition" introduced="^1">
+<unit bldFile="/app/speechsrv/voiceui/voiceuivoicerecognition/group"/>
+</component>
+<component id="pbkinfoviewimpl" filter="s60" name="Phonebook Info View Implementation" introduced="^1">
+<unit bldFile="/app/speechsrv/voiceui/pbkinfoviewimpl/group"/>
+</component>
+<component id="aiwpbkinfoviewprovider" filter="s60" name="AIW Phonebook Info View Provider" class="plugin" introduced="^1">
+<unit bldFile="/app/speechsrv/voiceui/aiwpbkinfoviewprovider/group"/>
+</component>
+<component id="vccontrolpanelplugin" filter="s60" name="Voice Commands Control Panel Plugin" class="plugin" introduced="^1">
+<meta rel="config">
+<defined condition="__VCOMMAND_CONTROL_PANEL"/>
+</meta>
+<!-- component is commented out until configuration is in place. Currently #included from voiceui_build -->
+<!--<unit bldFile="voiceui/vccontrolpanelplugin/group"/>-->
+</component>
+<component id="voiceui_build" filter="s60" name="Voice UI Build" introduced="^1">
+<!-- can this be put into the other components? -->
+<unit bldFile="/app/speechsrv/voiceui/group"/>
+</component>
+</collection>
+<collection id="srsf" name="Speech Recognition and Synthesis Framework" level="framework">
+<component id="sispeechrecognitiondata" filter="s60" name="SI Speech Recognition Data">
+<unit bldFile="/app/speechsrv/srsf/sispeechrecognitiondata/group"/>
+</component>
+<component id="ttscommon" filter="s60" name="TTS Common">
+<unit bldFile="/app/speechsrv/srsf/ttscommon/group"/>
+</component>
+<component id="devtts" filter="s60" name="Text to Speech">
+<unit bldFile="/app/speechsrv/srsf/devtts/group"/>
+</component>
+<component id="ttscustomcommands" filter="s60" name="TTS Custom Commands">
+<unit bldFile="/app/speechsrv/srsf/ttscustomcommands/group"/>
+</component>
+<component id="ttscontrollerplugin" filter="s60" name="TTS Controller Plugin" class="plugin">
+<unit bldFile="/app/speechsrv/srsf/ttscontrollerplugin/group"/>
+</component>
+<component id="ttsutility" filter="s60" name="TTS Utility">
+<unit bldFile="/app/speechsrv/srsf/ttsutility/group"/>
+</component>
+<component id="speechsynthesis" filter="s60" name="Speech Synthesis">
+<!-- can only have one unit. #include these from a common bld.inf -->
+<unit bldFile="/app/speechsrv/srsf/speechsynthesis/client/group"/>
+<unit bldFile="/app/speechsrv/srsf/speechsynthesis/server/group"/>
+</component>
+<component id="devasr" filter="s60" name="Audio Recording and Speech Recognition">
+<unit bldFile="/app/speechsrv/srsf/devasr/group"/>
+</component>
+<component id="sicc" filter="s60" name="Speaker Independent Custom Commands">
+<unit bldFile="/app/speechsrv/srsf/sicc/group"/>
+</component>
+<component id="sisrscontrollerplugin" filter="s60" name="SI SRS Controller Plugin" class="plugin">
+<unit bldFile="/app/speechsrv/srsf/sisrscontrollerplugin/group"/>
+</component>
+<component id="siutility" filter="s60" name="Speaker Independent Utility">
+<unit bldFile="/app/speechsrv/srsf/siutility/group"/>
+</component>
+<component id="nssvasapi" filter="s60" name="NSS VAS API">
+<unit bldFile="/app/speechsrv/srsf/nssvasapi/group"/>
+</component>
+<component id="nssvascontacthdlr" filter="s60" name="NSS VAS Contact Handler">
+<unit bldFile="/app/speechsrv/srsf/nssvascontacthdlr/group"/>
+</component>
+<component id="vcommandhandler" filter="s60" name="Voice Command Handler">
+<unit bldFile="/app/speechsrv/srsf/vcommandhandler/group"/>
+</component>
+<component id="vuiphandler" filter="s60" name="Voice UI Plugin Handler">
+<unit bldFile="/app/speechsrv/srsf/vuiphandler/group"/>
+</component>
+<component id="vcommandexecutor" filter="s60" name="Voice Command Executor">
+<unit bldFile="/app/speechsrv/srsf/vcommandexecutor/group"/>
+</component>
+<component id="vcommandexecutorbearer" filter="s60" name="Voice Command Executor Bearer">
+<unit bldFile="/app/speechsrv/srsf/vcommandexecutorbearer/group"/>
+</component>
+<component id="vcommandmanager" filter="s60" name="Voice Command Manager">
+<unit bldFile="/app/speechsrv/srsf/vcommandmanager/group"/>
+</component>
+<component id="vcexecutorapp" filter="s60" name="Voice Command Executor Application">
+<unit bldFile="/app/speechsrv/srsf/vcexecutorapp/group"/>
+</component>
+<component id="profileobserverplugin" filter="s60" name="Profile Observer Plugin" class="plugin">
+<unit bldFile="/app/speechsrv/srsf/profileobserverplugin/group"/>
+</component>
+<component id="srsf_build" filter="s60" name="Speech Recognition and Synthesis Framework Build">
+<!-- should distribute this into the above components -->
+<unit bldFile="/app/speechsrv/srsf/group"/>
+</component>
+</collection>
+<collection id="speechsrv_info" name="Speech Recognition UIs Info" level="ui">
+
+</collection>
+</package>
+<package id="homescreentools" level="services" tech-domain="ui" name="Home Screen Tools" levels="tool install">
+<collection id="dtdinstaller" name="DTD Installer" level="install">
+<!-- collection is really a component. Needs to be moved down a directory -->
+<!-- this needs to be built first, does build order need to be forced with filters? -->
+<component id="dtdinstaller_build" filter="s60" name="DTD Installer Build" target="desktop" class="tool">
+<unit bldFile="/app/homescreentools/dtdinstaller/group"/>
+</component>
+</collection>
+<collection id="themeinstaller" name="Theme Installer" level="install">
+<!-- collection is really a component. Needs to be moved down a directory -->
+<component id="themeinstaller_build" filter="s60" name="Theme Installer Build" target="desktop" class="tool">
+<unit bldFile="/app/homescreentools/themeinstaller/group"/>
+</component>
+</collection>
+<collection id="widgettools" name="Widget Tools" level="install">
+<component id="hspluginpreinstaller" filter="s60" name="HS Plugin Preinstaller" target="desktop" class="tool" introduced="^3">
+<unit bldFile="/app/homescreentools/widgettools/hspluginspreinstaller/group"/>
+</component>
+<component id="wrtwidgetpreinstaller" filter="s60" name="WRT Widget Preinstaller" target="desktop" class="tool" introduced="^3">
+<unit bldFile="/app/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
+</component>
+</collection>
+</package>
+<package id="webuis" level="services" tech-domain="rt" name="Web UIs" levels="plugin app">
+<collection id="browserui" name="Browser UI" level="app">
+<component id="browser" filter="s60" name="Browser">
+<unit bldFile="/app/webuis/browserui/browser/group"/>
+</component>
+<component id="operatormenu" filter="s60" name="Browser Operator Menu">
+<unit bldFile="/app/webuis/browserui/operatormenu/group"/>
+</component>
+<component id="videoservices" filter="s60" name="Browser Video Services">
+<unit bldFile="/app/webuis/browserui/videoservices/group"/>
+</component>
+</collection>
+<collection id="browserplugins" name="Browser Plugins" level="plugin">
+<component id="browsersysteminfoplugin" filter="s60" name="Browser System Info Plugin" class="plugin">
+<meta rel="config">
+<defined condition="__WEB_WIDGETS"/>
+</meta>
+<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
+<!-- <unit bldFile="browserplugins/browsersysteminfoplugin/group"/>-->
+</component>
+<component id="browsergpsplugin" filter="s60" name="Browser GPS Plugin" class="plugin">
+<meta rel="config">
+<defined condition="__WEB_WIDGETS"/>
+</meta>
+<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
+<!-- <unit bldFile="browserplugins/browsergpsplugin/group"/>-->
+</component>
+<component id="browseraudiovideoplugin" filter="s60" name="Browser Audio Video Plugin" class="plugin">
+<unit bldFile="/app/webuis/browserplugins/browseraudiovideoplugin/group"/>
+</component>
+<component id="browserplugins_build" filter="s60" name="Browser Plugins Build">
+<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
+<unit bldFile="/app/webuis/browserplugins/group"/>
+</component>
+</collection>
+<collection id="pushmtm" name="Push MTM" level="plugin">
+<component id="pushmtm_help" filter="s60" name="Push MTM Help">
+<unit bldFile="/app/webuis/pushmtm/help/group"/>
+</component>
+<component id="plugins" filter="s60" name="Push MTM Plugins" class="plugin">
+<unit bldFile="/app/webuis/pushmtm/plugins/group"/>
+</component>
+<component id="pushmtm_build" filter="s60" name="Push MTM Build">
+<!-- Some content is at collection level and some is at comopnent level. Either make this a single
+ component and move it down a diretcory, or make separate independent components in this collection -->
+<unit bldFile="/app/webuis/pushmtm/group"/>
+</component>
+</collection>
+</package>
+<package id="jrt" level="services" tech-domain="rt" name="Java Runtime" levels="util generic rt ui">
+<collection id="jrt_plat" name="JRT Platform Interfaces" level="ui">
+<component id="java_registry_api" name="Java Registry API" class="api" filter="s60">
+<unit bldFile="/app/jrt/jrt_plat/java_registry_api/build"/>
+</component>
+<component id="java_env_info_api" name="Java Environment Info API" class="api" filter="s60">
+<unit bldFile="/app/jrt/jrt_plat/java_env_info_api/build"/>
+</component>
+<component id="java_debug_api" name="Java Debug API" class="api" filter="s60">
+<unit bldFile="/app/jrt/jrt_plat/java_debug_api/build"/>
+</component>
+</collection>
+<collection id="java_build" name="JRT Build" level="util">
+<component id="java_build_sf" filter="sf_build" name="JRT Build for Symbian Foundation">
+<unit bldFile="/app/jrt/group/sf"/>
+</component>
+</collection>
+</package>
+<package id="conntools" level="services" tech-domain="dc" name="Connectivity Tools" levels="config app">
+<collection id="nettools" name="Net Tools" level="app">
+<component id="conntest" filter="s60" name="Connection Test" purpose="development">
+<unit bldFile="/app/conntools/nettools/conntest/group"/>
+</component>
+</collection>
+<collection id="emulatorlan" name="Emulator LAN" level="config">
+<!-- component is actually a colleciton, should be moved down a directory -->
+<component id="emulatorlan_build" filter="s60" name="Emulator LAN Build" class="config" purpose="development">
+<unit bldFile="/app/conntools/emulatorlan/group"/>
+</component>
+</collection>
+</package>
+<package id="rndtools" level="services" tech-domain="to" name="R&D tools" levels="support generic test util">
+<collection id="creator" name="Creator" level="support">
+<!-- collection is really a component. Should move down a directory -->
+<component id="creator_build" filter="s60" name="Creator Tool" purpose="development" target="device" class="tool">
+<unit bldFile="/app/rndtools/creator/group"/>
+</component>
+</collection>
+<collection id="filebrowser" name="File Browser" level="util">
+<!-- consider collapsing into a single component -->
+<component id="fileopserver" filter="s60" name="File Operations Server" purpose="development" target="device" class="tool">
+<meta rel="config">
+<not-defined condition="FILEBROWSER_LITE"/>
+</meta>
+<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
+<!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
+</component>
+<component id="fileopclient" filter="s60" name="File Operations Client" purpose="development" target="device" class="tool">
+<meta rel="config">
+<not-defined condition="FILEBROWSER_LITE"/>
+</meta>
+<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
+<!--<unit bldFile="filebrowser/fileopclient/group"/>-->
+</component>
+<component id="filebrowser_build" filter="s60" name="File Browser Application" purpose="development" target="device" class="tool">
+<!-- Need to make this a self-contained component by removing #includes. Can only do when configuration is in place-->
+<unit bldFile="/app/rndtools/filebrowser/group"/>
+</component>
+</collection>
+<collection id="launcher" name="Launcher" level="util">
+<!-- collection is really a component. Should move down a directory -->
+<component id="launcher_build" filter="s60" name="Launcher Utility" purpose="development" target="device" class="tool">
+<unit bldFile="/app/rndtools/launcher/group"/>
+</component>
+</collection>
+<collection id="loadgen" name="Load Generator" level="test">
+<!-- collection is really a component. Should move down a directory -->
+<component id="loadgen_build" filter="s60" name="Load Generator Application" purpose="development" target="device" class="tool">
+<unit bldFile="/app/rndtools/loadgen/group"/>
+</component>
+</collection>
+<collection id="perfmon" name="Performance Monitor" level="test">
+<!-- collection is really a component. Should move down a directory -->
+<component id="perfmon_build" filter="s60" name="Performance Monitor Tool" purpose="development" target="device" class="tool">
+<unit bldFile="/app/rndtools/perfmon/group"/>
+</component>
+</collection>
+<collection id="screengrabber" name="Screen Grabber" level="util">
+<!-- collection is really a component. Should move down a directory -->
+<component id="screengrabber_build" filter="s60" name="ScreenGrabber" purpose="development" target="device" class="tool">
+<unit bldFile="/app/rndtools/screengrabber/group"/>
+</component>
+</collection>
+<collection id="stifui" name="STIF UI" level="generic">
+<component id="stifui_avkon" filter="s60" name="STIF UI for Avkon" purpose="development" target="device">
+<unit bldFile="/app/rndtools/stifui/avkon/group"/>
+</component>
+
+</collection>
+<collection id="memspyui" name="Memspy UI" level="generic">
+<!-- collection is really a component. Should move down a directory -->
+<component id="memspyui_build" filter="s60" name="Memspy UI Application" purpose="development" target="device" class="tool">
+<unit bldFile="/app/rndtools/memspyui/group"/>
+</component>
+</collection>
+<collection id="htiui" name="Harmonized Test Interface UI" level="generic">
+<component id="HtiServicePlugins" filter="s60" name="HTI Service Plugins" purpose="development" target="device" class="plugin">
+<!-- can only have a single unit. Should #include from a common bld.inf file -->
+<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
+<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
+<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
+<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
+<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
+<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
+<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
+<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiFtpBackupFake/group"/>
+</component>
+<component id="htidevicereboot" filter="s60" name="HTI Device Reboot" purpose="development" target="device">
+<unit bldFile="/app/rndtools/htiui/htidevicereboot/group"/>
+</component>
+<component id="htistartupwait" filter="s60" name="HTI Startup Wait" purpose="development" target="device">
+<unit bldFile="/app/rndtools/htiui/htistartupwait/group"/>
+</component>
+<component id="htiadmin" filter="s60" name="HTI Admin" purpose="development" target="device">
+<unit bldFile="/app/rndtools/htiui/htiadmin/group"/>
+</component>
+<component id="htiui_build" filter="s60" name="HTI UI Build" purpose="development">
+<!-- can this be split up into the other components or made a ROM component? -->
+<unit bldFile="/app/rndtools/htiui/group"/>
+</component>
+</collection>
+</package>
+<package id="helps" level="apps" span="2" tech-domain="ui" name="Help Apps" levels="eng tools if ui">
+<collection id="csxhelp" name="Context Sensitive Extended Help" level="if">
+<!-- this is really a component. Should move it down a directory -->
+<component id="csxhelp_build" filter="s60" name="Context Sensitive Extended Help Build">
+<unit bldFile="/app/helps/csxhelp/group"/>
+</component>
+</collection>
+<collection id="symhelp" name="Symbian Help" level="eng">
+<component id="helpmodel" name="Help" introduced="6.0" purpose="optional">
+<unit bldFile="/app/helps/symhelp/helpmodel/group" mrp="/app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
+</component>
+</collection>
+<collection id="helps_info" name="Help Apps Info" level="ui">
+<component id="helps_metadata" name="Help Apps Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/app/helps/helps_info/helps_metadata/helps_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="techview" level="apps" span="2" tech-domain="ui" name="Techview" levels="services ui utils apps1 apps2 apps3">
+<collection id="buildverification" name="Build Verification" level="services">
+<component id="autosmoketest" name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
+<unit bldFile="/app/techview/buildverification/autosmoketest/Group" mrp="/app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
+</component>
+<component id="smoketest" name="Smoke Test" filter="gt" purpose="development">
+<unit bldFile="/app/techview/buildverification/smoketest/Group" mrp="/app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
+</component>
+</collection>
+<collection id="techviewplat" name="Techview Platform" level="services">
+
+
+
+</collection>
+<collection id="techviewui" name="Techview UI" level="ui">
+
+
+
+
+</collection>
+<collection id="controlpanel" name="Control Panel" level="ui">
+
+
+
+
+</collection>
+<collection id="pimapps" name="PIM Apps" level="apps3">
+
+
+
+</collection>
+<collection id="securityapps" name="Security Apps" level="apps3">
+
+
+</collection>
+<collection id="utilityapps" name="Utility Apps" level="apps2">
+
+
+
+</collection>
+<collection id="installationapps" name="Installation Apps" level="apps2">
+
+</collection>
+<collection id="messagingapps" name="Messaging Apps" level="apps2">
+
+</collection>
+<collection id="telephonyapps" name="Telephony Apps" level="apps1">
+
+</collection>
+<collection id="networkingapps" name="Networking Apps" level="apps1">
+
+
+
+</collection>
+<collection id="networkingutils" name="Networking Utils" level="utils">
+
+
+</collection>
+<collection id="shortlinkapps" name="Shortlink Apps" level="apps1">
+
+
+
+</collection>
+<collection id="testapps" name="Test Apps" level="utils">
+
+
+
+
+
+</collection>
+<collection id="avapps" name="A/V Apps" level="apps3">
+
+</collection>
+<collection id="toolkit" name="Toolkit" level="utils">
+
+
+
+
+</collection>
+<collection id="techview_info" name="Techview Info" level="apps3">
+<component id="techview_metadata" name="Techview Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/app/techview/techview_info/techview_metadata/techview_metadata.mrp"/>
+</component>
+</collection>
+</package>
+</layer>
+</systemModel>
+</SystemDefinition>
--- a/symbian3/single/sysdefs/full_system_model_3.0.xml Wed May 05 12:21:47 2010 +0100
+++ b/symbian3/single/sysdefs/full_system_model_3.0.xml Tue Jul 13 12:21:44 2010 +0100
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><SystemDefinition schema="3.0.0" id-namespace="http://www.symbian.org/system-definition">
+<?xml version="1.0" encoding="UTF-8"?><SystemDefinition 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">
<package id="stubs" tech-domain="hb" level="high" name="Stubs" levels="stub">
@@ -121,6 +121,14 @@
<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="/os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
</component>
+<component id="usbdescriptors" name="USB Descriptors" purpose="optional">
+<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors" mrp="/os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors/base_drivers_usbdescriptors.mrp"/>
+</component>
+<component id="usbdi_utils" name="USB DI Utils" purpose="optional">
+<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils" mrp="/os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils/base_drivers_usbdi_utils.mrp"/>
+</component>
</collection>
<collection id="driversupport" name="Generic Driver Support" level="hw-if">
<component id="mediadrivers" name="Media Drivers" purpose="optional">
@@ -1233,10 +1241,22 @@
<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 -->
+<unit bldFile="/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/sfgroup" mrp="/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
+</component>
+<component id="suplprotocolmodule" name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" class="plugin">
+<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+<unit bldFile="/os/lbs/networkprotocolmodules/suplprotocolmodule/sfgroup" mrp="/os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
+</component>
<component id="suplrrlpasn1" filter="sf_build" name="SUPL RRLP ASN1 Parser">
<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
<unit bldFile="/os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
</component>
+<component id="suplrrlpprotocol" name="SUPL RRLP Protocol Module">
+<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+<unit bldFile="/os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup"/>
+</component>
</collection>
<collection id="lbsapitest" name="Location API Tests" level="application-interface">
<component id="lbshaitest" name="Location HAI Tests" introduced="^2" purpose="development" filter="test">
@@ -1473,10 +1493,10 @@
<component id="ipanalyzer" name="IP Analyzer" deprecated="^3" introduced="7.0" purpose="development" filter="test">
<unit mrp="/os/networkingsrv/networkingtestandutils/ipanalyzer/group/networking_iprotor.mrp" bldFile="/os/networkingsrv/networkingtestandutils/ipanalyzer/group"/>
</component>
-<component id="networkingintegrationtest" name="Networking Integration Test" introduced="ER5" purpose="development">
+<component id="networkingintegrationtest" name="Networking Integration Test" introduced="ER5" purpose="development" filter="test">
<unit bldFile="/os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group" mrp="/os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group/networking_integrationtest.mrp"/>
</component>
-<component id="networkingperformancemeasurementtools" name="Networking Performance Measurement Tools" introduced="^3" purpose="development">
+<component id="networkingperformancemeasurementtools" name="Networking Performance Measurement Tools" introduced="^3" purpose="development" filter="test">
<unit bldFile="/os/networkingsrv/networkingtestandutils/networkingperformancemeasurementtools/group" mrp="/os/networkingsrv/networkingtestandutils/networkingperformancemeasurementtools/group/networking_netperf.mrp"/>
</component>
</collection>
@@ -1660,7 +1680,7 @@
<component id="multimodetsy" name="Multimode TSY" purpose="development" class="plugin">
<unit bldFile="/os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="/os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
</component>
-<component id="simtsy" name="SIM TSY" introduced="7.0" purpose="development" class="plugin">
+<component id="simtsy" name="SIM TSY" introduced="7.0" purpose="development" class="plugin" filter="test">
<unit bldFile="/os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="/os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
</component>
<component id="ctsydispatchlayer" name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" class="plugin">
@@ -2315,6 +2335,9 @@
<component id="ecam_face_tracking_custom_api" name="ECam Face Tracking Custom API" class="api" filter="s60">
<unit bldFile="/os/imagingext/imagingext_plat/ecam_face_tracking_custom_api/group"/>
</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">
<component id="iclextjpegapi" filter="s60" name="ICL Extension JPEG API">
@@ -4672,7 +4695,7 @@
<component id="im_cache_server_api" name="IM Cache Server API" class="api" filter="s60">
<unit bldFile="/mw/imsrv/imsrv_plat/im_cache_server_api/group"/>
</component>
-<component id="presence_avabilitytext" name="Presence Avability Text" class="api" filter="s60">
+<component id="presence_avabilitytext" name="Presence Availbility Text" class="api" filter="s60">
<unit bldFile="/mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
</component>
</collection>
@@ -4695,9 +4718,6 @@
<component id="xmppsettingsfetcher" filter="s60" name="XMPP Settings Fetcher" introduced="^2">
<unit bldFile="/mw/imsrv/imservices/xmppsettingsfetcher/group"/>
</component>
-<component id="ossprotocoladaptation" filter="s60" name="OSS Protocol Adaptation" class="plugin" introduced="^2">
-<unit bldFile="/mw/imsrv/imservices/ossprotocoladaptation/group"/>
-</component>
<component id="instantmessagingcache" filter="s60" name="Instant Messaging Cache" introduced="^2">
<unit bldFile="/mw/imsrv/imservices/instantmessagingcache/group"/>
</component>
@@ -6530,7 +6550,7 @@
</collection>
<collection id="qt_info" name="Qt Info" level="mw">
<component id="qt_build" name="Qt Build" introduced="^2">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qt" qt:proFile="projects.pro" qt:qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qt" qt:proFile="projects.pro" qt:qmakeArgs="-r"/>
</component>
</collection>
<collection id="qtdemos" name="Qt Demos" level="app">
@@ -8411,14 +8431,11 @@
</component>
</collection>
</package>
+<!-- <package id="opensrv" level="specific" tech-domain="pr" href="../../../../mw/opensrv/package_definition.xml"/> -->
</layer>
<layer id="app" name="Applications" levels="services apps">
<package id="location" level="apps" tech-domain="lo" name="Location Apps" levels="ui events loc apps">
-<collection id="loc_plat" name="Location Apps Platform Interfaces" level="apps">
-<component id="location_centre_api" name="Location Centre API" introduced="^3" class="api" filter="s60">
-<unit bldFile="/app/location/loc_plat/location_centre_api/group"/>
-</component>
-</collection>
+<collection id="loc_plat" name="Location Apps Platform Interfaces" level="apps"/>
<collection id="loc_pub" name="Location Apps Public Interfaces" level="apps">
<component id="landmarks_ui_selector_api" name="Landmarks UI Selector API" class="api" filter="s60">
<unit bldFile="/app/location/loc_pub/landmarks_ui_selector_api/group"/>
@@ -8510,24 +8527,6 @@
<unit bldFile="/app/location/mapnavproviderrefapp/group"/>
</component>
</collection>
-<collection id="locationcentre" name="Location Centre" level="loc">
-<component id="lcutils" name="Location Centre Utilities" filter="s60" introduced="^3">
-<unit bldFile="/app/location/locationcentre/lcutils/group"/>
-</component>
-<component id="lcservice" name="Location Centre Service Project" filter="s60" introduced="^3">
-<unit bldFile="/app/location/locationcentre/lcservice/group"/>
-</component>
-<component id="lcserver" name="Location Centre Server Project" filter="s60" introduced="^3">
-<unit bldFile="/app/location/locationcentre/lcserver/group"/>
-</component>
-<component id="lcapp" name="Location Centre Application" filter="s60" introduced="^3">
-<unit bldFile="/app/location/locationcentre/lcapp/group"/>
-</component>
-<component id="locationcentre_build" filter="s60" name="Location Centre Build" introduced="^3">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="/app/location/locationcentre/group"/>
-</component>
-</collection>
</package>
<package id="mmsharinguis" level="services" tech-domain="vc" name="Multimedia Sharing UIs" levels="base plugin if">
<collection id="mmsharinguis_plat" name="Multimedia Sharing UIs Platform Interfaces" level="if">
@@ -8950,6 +8949,12 @@
<component id="ds_folder_util_api" name="DS Folder Util API" class="api" filter="s60">
<unit bldFile="/app/contentcontrol/contentctrl_plat/ds_folder_util_api/group"/>
</component>
+<component id="adapter_customization_api" name="Adapter Customization API" class="api" filter="s60" introduced="^3">
+<unit bldFile="/app/contentcontrol/contentctrl_plat/adapter_customization_api/group"/>
+</component>
+<component id="ds_data_modification_api" name="DS Data Modification API" class="api" filter="s60" introduced="^3">
+<unit bldFile="/app/contentcontrol/contentctrl_plat/ds_data_modification_api/group"/>
+</component>
</collection>
<collection id="dsdcmoadapter" name="Data Sync DCMO Adapter" level="plugin">
<!-- Component at wrong rank, should move down a directory -->
@@ -9034,9 +9039,6 @@
<component id="uisettingssrv" filter="s60" name="UI Settings Server">
<unit bldFile="/app/devicecontrol/customization/uisettingssrv/bld"/>
</component>
-<component id="isadapter" filter="s60" name="Idle State Adapter" class="plugin">
-<unit bldFile="/app/devicecontrol/customization/isadapter/bld"/>
-</component>
<component id="supadapter" filter="s60" name="Startup Adapter" class="plugin">
<unit bldFile="/app/devicecontrol/customization/supadapter/bld"/>
</component>
@@ -9144,9 +9146,6 @@
<component id="calcsoft" filter="s60" name="Calculator Application">
<unit bldFile="/app/utils/extras/calcsoft/group"/>
</component>
-<component id="converter" filter="s60" name="Unit Converter">
-<unit bldFile="/app/utils/extras/converter/group"/>
-</component>
</collection>
</package>
<package id="contacts" level="apps" span="2" tech-domain="pr" name="Contacts Apps" levels="engine support services ui">
@@ -10338,65 +10337,7 @@
</component>
</collection>
</package>
-<package id="videoeditor" level="apps" tech-domain="ma" name="Video Editor Apps" levels="engine ui">
-<collection id="videoeditor_plat" filter="s60" name="Video Editor Apps Platform Interfaces" level="ui">
-<component id="video_editor_engine_api" name="Video Editor Engine API" class="api" introduced="^2">
-<unit bldFile="/app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
-</component>
-</collection>
-<collection id="videditor" name="Video Editor" level="ui">
-<component id="videoeditorcommon" filter="s60" name="Video Editor Common" introduced="^2">
-<unit bldFile="/app/videoeditor/videditor/videoeditorcommon/group"/>
-</component>
-<component id="videoeditoruicomponents" filter="s60" name="Video Editor UI Components" introduced="^2">
-<unit bldFile="/app/videoeditor/videditor/videoeditoruicomponents/group"/>
-</component>
-<component id="simplevideoeditor" filter="s60" name="Simple Video Editor" introduced="^2">
-<unit bldFile="/app/videoeditor/videditor/simplevideoeditor/group"/>
-</component>
-<component id="simplecutvideo" filter="s60" name="Simple Cut Video" introduced="^2">
-<unit bldFile="/app/videoeditor/videditor/simplecutvideo/group"/>
-</component>
-<component id="videoprovider" filter="s60" name="Video Provider" introduced="^2">
-<unit bldFile="/app/videoeditor/videditor/videoprovider/group"/>
-</component>
-<component id="manualvideoeditor" filter="s60" name="Manual Video Editor" introduced="^2">
-<!-- uncomment when supported
- <meta rel="config">
- <defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
- </meta>
- <unit bldFile="videditor/manualvideoeditor/group"/> -->
-</component>
-<component id="videditor_build" filter="s60" name="Video Editor Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="/app/videoeditor/videditor/group"/>
-</component>
-</collection>
-<collection id="videoeditorengine" name="Video Editor Engine" level="engine">
-<component id="audioeditorengine" filter="s60" name="Audio Editor Engine" introduced="^2">
-<unit bldFile="/app/videoeditor/videoeditorengine/audioeditorengine/group"/>
-</component>
-<component id="avcedit" filter="s60" name="AVC Editing" introduced="^2">
-<unit bldFile="/app/videoeditor/videoeditorengine/avcedit/group"/>
-</component>
-<component id="h263decoder" filter="s60" name="H.263 Decoder" introduced="^2">
-<unit bldFile="/app/videoeditor/videoeditorengine/h263decoder/group"/>
-</component>
-<component id="mp3aacmaniplib" filter="s60" name="MP3 and AAC Manipulation Library" introduced="^2">
-<unit bldFile="/app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
-</component>
-<component id="vedtranscoder" filter="s60" name="Video Editor Transcoder" introduced="^2">
-<unit bldFile="/app/videoeditor/videoeditorengine/vedtranscoder/group"/>
-</component>
-<component id="vedengine" filter="s60" name="Video Editor Engine" introduced="^2">
-<unit bldFile="/app/videoeditor/videoeditorengine/vedengine/group"/>
-</component>
-<component id="videoeditorengine_build" filter="s60" name="Video Editor Engine Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="/app/videoeditor/videoeditorengine/group"/>
-</component>
-</collection>
-</package>
+<!-- <package id="videoeditor" level="apps" tech-domain="ma" href="../../../../app/videoeditor/package_definition.xml"/> -->
<package id="videoplayer" level="apps" tech-domain="ma" name="Video Player Apps" levels="support plugin util apps">
<collection id="videoplayer_plat" name="Video Player Apps Platform Interfaces" level="apps">
<component id="videoplayer_startup_api" name="Video Player Startup API" class="api" filter="s60">
@@ -10745,8 +10686,13 @@
</component>
</collection>
</package>
-<package id="internetradio" level="apps" tech-domain="ma" name="Internet Radio Apps"/>
-<package id="tv" level="services" tech-domain="ma" name="TV Apps"/>
+<package id="podcatcher" level="apps" tech-domain="ma" name="Podcatcher" levels="app">
+<collection id="podcatcher_info" name="Podcatcher" level="app">
+<component id="podcatcher_build" filter="sf_build" name="Podcatcher Build" introduced="^3">
+<unit bldFile="/app/podcatcher/group"/>
+</component>
+</collection>
+</package>
<package id="voicerec" level="apps" tech-domain="ma" name="Voice Recorder Apps">
<!-- custom filter pref_test-->
<collection id="voicerec_plat" name="Voice Recorder Apps Platform Interfaces">
@@ -11189,9 +11135,9 @@
<unit bldFile="/app/jrt/jrt_plat/java_debug_api/build"/>
</component>
</collection>
-<collection id="java_stubs" name="Java Stubs" level="util">
-<component id="java_stubs_build" filter="s60" name="JRT Stubs Build">
-<unit bldFile="/app/jrt/java_stubs/group"/>
+<collection id="java_build" name="JRT Build" level="util">
+<component id="java_build_sf" filter="sf_build" name="JRT Build for Symbian Foundation">
+<unit bldFile="/app/jrt/group/sf"/>
</component>
</collection>
</package>
@@ -11261,10 +11207,10 @@
</component>
</collection>
<collection id="stifui" name="STIF UI" level="generic">
-<component id="stifui_avkon" filter="s60" name="STIF UI for Avkon" purpose="development">
+<component id="stifui_avkon" filter="s60" name="STIF UI for Avkon" purpose="development" target="device">
<unit bldFile="/app/rndtools/stifui/avkon/group"/>
</component>
-<component id="stifui_qt" filter="s60,test" name="STIF UI for Qt" purpose="development">
+<component id="stifui_qt" filter="s60,test" name="STIF UI for Qt" purpose="development" introduced="^4" target="device">
<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/rndtools/stifui/qt" qt:proFile="stifqtui.pro"/>
<!-- marked as test until we know what to do with it -->
</component>
@@ -11276,9 +11222,6 @@
</component>
</collection>
<collection id="htiui" name="Harmonized Test Interface UI" level="generic">
-<component id="HtiCommPlugins" filter="s60" name="HTI Comm Plugins" purpose="development" target="device" class="plugin">
-<unit bldFile="/app/rndtools/htiui/HtiCommPlugins/HtiBtCommPlugin/group"/>
-</component>
<component id="HtiServicePlugins" filter="s60" name="HTI Service Plugins" purpose="development" target="device" class="plugin">
<!-- can only have a single unit. Should #include from a common bld.inf file -->
<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
--- a/symbian3/single/sysdefs/sf3.svg Wed May 05 12:21:47 2010 +0100
+++ b/symbian3/single/sysdefs/sf3.svg Tue Jul 13 12:21:44 2010 +0100
@@ -426,8 +426,8 @@
<g id="os" transform="translate(3.1999999999999993 404.06)" class="layer">
<rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="231.26000000000002"/>
<text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="231.26000000000002" height="9.3" x="-115.93">OS</text>
- <g class="layer-detail" transform="translate(496.09999999999974 3.2)">
- <rect x="-483.2999999999997" class="layer" y="-3.2" width="5072.699999999998" height="231.26000000000002"/>
+ <g class="layer-detail" transform="translate(491.4500000000001 3.2)">
+ <rect x="-478.6500000000001" class="layer" y="-3.2" width="5072.699999999998" height="231.26000000000002"/>
<g>
<g id="kernelhwsrv" class="package" transform="translate( 0 123.43000000000002)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color0.mouseover" end="s8-color0.mouseout"/>
@@ -493,8 +493,8 @@
</g>
</g>
<g id="ldds" transform="translate(17.7 37.6)" class="collection">
- <rect class="collection" x="0" y="0" height="15.6" width="92.99999999999999"/>
- <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="91.59999999999998" height="6.299999999999999">Logical DevÂice Drivers</text>
+ <rect class="collection" x="0" y="0" height="15.6" width="111.59999999999998"/>
+ <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="110.19999999999997" height="6.299999999999999">Logical DevÂice Drivers</text>
<g transform="translate(0 6.299999999999999)">
<g id="ethernetldd" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
@@ -546,6 +546,16 @@
<use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">USB Client Drivers</text>
</g>
+ <g id="usbdescriptors" class="component">
+ <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+ <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">USB Descriptors</text>
+ </g>
+ <g id="usbdi_utils" class="component">
+ <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+ <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">USB DI Utils</text>
+ </g>
</g>
</g>
<g id="driversupport" transform="translate(65.4 56.400000000000006)" class="collection">
@@ -2546,18 +2556,34 @@
</g>
</g>
<g id="networkprotocolmodules" transform="translate(17.7 37.6)" class="collection">
- <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
- <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Network Protocol Modules</text>
+ <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
+ <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Network Protocol Modules</text>
<g transform="translate(0 6.299999999999999)">
<g id="privacyprotocolmodule" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
<use width="9.3" height="9.3" x="0" y="0" xlink:href="#BorderShape2" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Privacy Protocol Module</text>
</g>
+ <g id="suplproxyprotocolmodule" class="component">
+ <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+ <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#BorderShape2" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">SUPL Proxy Protocol Module</text>
+ </g>
+ <g id="suplprotocolmodule" class="component">
+ <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+ <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#BorderShape2" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+ <use width="9.3" height="9.3" x="18.6" y="0" style="fill:url(#PatternOverlay4); stroke: none; stroke-width: 0;" xlink:href="#BorderShape2"/>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">SUPL Protocol Module</text>
+ </g>
<g id="suplrrlpasn1" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
- <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">SUPL RRLP ASN1 Parser</text>
+ <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">SUPL RRLP ASN1 Parser</text>
+ </g>
+ <g id="suplrrlpprotocol" class="component">
+ <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+ <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">SUPL RRLP Protocol Module</text>
</g>
</g>
</g>
@@ -2948,8 +2974,8 @@
</g>
</g>
<g id="networkingtestandutils" transform="translate(17.7 0)" class="collection">
- <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
- <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">NetworkÂing Test & Utils</text>
+ <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+ <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">NetworkÂing Test & Utils</text>
<g transform="translate(0 6.299999999999999)">
<g id="networkingexamples" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
@@ -2957,21 +2983,9 @@
<use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">NetworkÂing Examples</text>
</g>
- <g id="networkingintegrationtest" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
- <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
- <use width="9.3" height="9.3" x="9.3" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">NetworkÂing Integ Test</text>
- </g>
- <g id="networkingperformancemeasurementtools" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
- <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
- <use width="9.3" height="9.3" x="18.6" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">NetworkÂing PerforÂmance Measurement Tools</text>
- </g>
- </g>
- </g>
- <g id="networkingsrv_info" transform="translate(47.7 0)" class="collection">
+ </g>
+ </g>
+ <g id="networkingsrv_info" transform="translate(35.4 0)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
<text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">NetworkÂing Services Info</text>
<g transform="translate(0 6.299999999999999)">
@@ -3286,8 +3300,8 @@
</g>
</g>
<g id="telephonyserverplugins" transform="translate(0 56.400000000000006)" class="collection">
- <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
- <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">Telephony Server Plugins</text>
+ <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
+ <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Telephony Server Plugins</text>
<g transform="translate(0 6.299999999999999)">
<g id="common_tsy" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
@@ -3306,21 +3320,15 @@
<use width="9.3" height="9.3" x="18.6" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#BorderShape2"/>
<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">MultiÂmode TSY</text>
</g>
- <g id="simtsy" class="component">
+ <g id="ctsydispatchlayer" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
<use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#BorderShape2" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
- <use width="9.3" height="9.3" x="27.900000000000002" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#BorderShape2"/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">SIM TSY</text>
- </g>
- <g id="ctsydispatchlayer" class="component">
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">C-TSY Dispatch Layer</text>
+ </g>
+ <g id="simatktsy" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
<use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#BorderShape2" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">C-TSY Dispatch Layer</text>
- </g>
- <g id="simatktsy" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
- <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#BorderShape2" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">SIMATK TSY</text>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">SIMATK TSY</text>
</g>
</g>
</g>
@@ -4355,8 +4363,8 @@
</g>
<g id="imagingext" class="package" transform="translate( 3364.799999999999 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
- <rect class="package" x="0" width="94.2" height="120.23000000000002" y="0" style="fill:rgb(175,212,240);"/>
- <text text-anchor="middle" class="package" width="94.2" x="47.1" y="119.23000000000002">Imaging ExtenÂsions</text>
+ <rect class="package" x="0" width="103.49999999999999" height="120.23000000000002" y="0" style="fill:rgb(175,212,240);"/>
+ <text text-anchor="middle" class="package" width="103.49999999999999" x="51.74999999999999" y="119.23000000000002">Imaging ExtenÂsions</text>
<g transform="translate(0 3.2)">
<g id="imagingext_pub" transform="translate(0 0)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -4370,8 +4378,8 @@
</g>
</g>
<g id="imagingext_plat" transform="translate(17.7 0)" class="collection">
- <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
- <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">Imaging Ext. Platform InterÂfaces</text>
+ <rect class="collection" x="0" y="0" height="15.6" width="65.1"/>
+ <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="63.699999999999996" height="6.299999999999999">Imaging Ext. Platform InterÂfaces</text>
<g transform="translate(0 6.299999999999999)">
<g id="jpeg2000_icl_plugin_api" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
@@ -4403,9 +4411,14 @@
<use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">ECam Face Tracking Custom API</text>
</g>
- </g>
- </g>
- <g id="imageadaptationextensions" transform="translate(75.6 0)" class="collection">
+ <g id="ecam_use_case_hint_custom_api" class="component">
+ <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+ <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">ECam Use Case Hint Custom API</text>
+ </g>
+ </g>
+ </g>
+ <g id="imageadaptationextensions" transform="translate(84.89999999999999 0)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
<text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Image Adapt. Ext.</text>
<g transform="translate(0 6.299999999999999)">
@@ -4439,7 +4452,7 @@
</g>
</g>
</g>
- <g id="graphics" class="package" transform="translate( 3461.099999999999 0)">
+ <g id="graphics" class="package" transform="translate( 3470.3999999999987 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
<rect class="package" x="0" width="113.1" height="120.23000000000002" y="0" style="fill:orange;"/>
<text text-anchor="middle" class="package" width="113.1" x="56.55" y="119.23000000000002">Graphics</text>
@@ -4739,7 +4752,7 @@
</g>
</g>
</g>
- <g id="textandloc" class="package" transform="translate( 3576.299999999999 0)">
+ <g id="textandloc" class="package" transform="translate( 3585.5999999999985 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
<rect class="package" x="0" width="84" height="120.23000000000002" y="0" style="fill:orange;"/>
<text text-anchor="middle" class="package" width="84" x="42" y="119.23000000000002">Text & LocalisÂation Services</text>
@@ -4932,7 +4945,7 @@
</g>
</g>
</g>
- <g id="xmlsrv" class="package" transform="translate( 3662.3999999999987 0)">
+ <g id="xmlsrv" class="package" transform="translate( 3671.6999999999985 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
<rect class="package" x="0" width="65.1" height="120.23000000000002" y="0" style="fill:slateblue;"/>
<text text-anchor="middle" class="package" width="65.1" x="32.55" y="119.23000000000002">XML Services</text>
@@ -5047,7 +5060,7 @@
</g>
</g>
</g>
- <g id="deviceplatformrelease" class="package" transform="translate( 3729.5999999999985 0)">
+ <g id="deviceplatformrelease" class="package" transform="translate( 3738.8999999999983 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
<rect class="package" x="0" width="215.10000000000002" height="120.23000000000002" y="0" style="fill:darkgray;"/>
<text text-anchor="middle" class="package" width="215.10000000000002" x="107.55000000000001" y="119.23000000000002">DevÂice Platform Release</text>
@@ -5270,7 +5283,7 @@
</g>
</g>
</g>
- <g id="osrndtools" class="package" transform="translate( 3946.7999999999984 0)">
+ <g id="osrndtools" class="package" transform="translate( 3956.099999999998 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
<rect class="package" x="0" width="159.29999999999998" height="120.23000000000002" y="0" style="fill:darkgray;"/>
<text text-anchor="middle" class="package" width="159.29999999999998" x="79.64999999999999" y="119.23000000000002">OS R&D tools</text>
@@ -8643,7 +8656,7 @@
<g id="presence_avabilitytext" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
<use width="9.3" height="9.3" x="232.5000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="237.15000000000012">Presence Avability Text</text>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="237.15000000000012">Presence Availbility Text</text>
</g>
</g>
</g>
@@ -8659,8 +8672,8 @@
</g>
</g>
<g id="imservices" transform="translate(0 18.8)" class="collection">
- <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
- <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">IM Services</text>
+ <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
+ <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">IM Services</text>
<g transform="translate(0 6.299999999999999)">
<g id="imfeatureplugin" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
@@ -8682,15 +8695,10 @@
<use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">XMPP Settings Fetcher</text>
</g>
- <g id="ossprotocoladaptation" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">OSS Protocol Adapt.</text>
- </g>
<g id="instantmessagingcache" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Instant Msg. Cache</text>
+ <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Instant Msg. Cache</text>
</g>
</g>
</g>
@@ -14782,24 +14790,18 @@
<g id="app" transform="translate(3.1999999999999993 0)" class="layer">
<rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="174.86"/>
<text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="174.86" height="9.3" x="-87.73">Applications</text>
- <g class="layer-detail" transform="translate(771.1999999999987 3.2)">
- <rect x="-758.3999999999987" class="layer" y="-3.2" width="5072.699999999998" height="174.86"/>
+ <g class="layer-detail" transform="translate(832.6999999999987 3.2)">
+ <rect x="-819.8999999999987" class="layer" y="-3.2" width="5072.699999999998" height="174.86"/>
<g>
<g id="location" class="package" transform="translate( 0 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color2.mouseover" end="s8-color2.mouseout"/>
- <rect class="package" x="0" width="113.69999999999999" height="82.63000000000001" y="0" style="fill:whitesmoke;"/>
- <text text-anchor="middle" class="package" width="113.69999999999999" x="56.849999999999994" y="81.63000000000001">Location Apps</text>
- <g transform="translate(0 3.2)">
- <g id="loc_plat" transform="translate(0 0)" class="collection">
- <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
- <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Location Apps Platform Interfaces</text>
- <g transform="translate(0 6.299999999999999)">
- <g id="location_centre_api" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Location Centre API</text>
- </g>
- </g>
+ <rect class="package" x="0" width="107.1" height="82.63000000000001" y="0" style="fill:whitesmoke;"/>
+ <text text-anchor="middle" class="package" width="107.1" x="53.55" y="81.63000000000001">Location Apps</text>
+ <g transform="translate(0 3.2)">
+ <g id="loc_plat" transform="translate(0 0)" class="collection placeholder">
+ <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+ <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location Apps Platform Interfaces</text>
+ <g transform="translate(0 6.299999999999999)"/>
</g>
<g id="loc_pub" transform="translate(17.7 0)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
@@ -14965,37 +14967,6 @@
</g>
</g>
</g>
- <g id="locationcentre" transform="translate(67.19999999999999 18.8)" class="collection">
- <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
- <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Location Centre</text>
- <g transform="translate(0 6.299999999999999)">
- <g id="lcutils" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Location Centre Utilities</text>
- </g>
- <g id="lcservice" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Location Centre Service Project</text>
- </g>
- <g id="lcserver" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Location Centre Server Project</text>
- </g>
- <g id="lcapp" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Location Centre Application</text>
- </g>
- <g id="locationcentre_build" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Location Centre Build</text>
- </g>
- </g>
- </g>
</g>
</g>
<g id="mmsharinguis" class="package" transform="translate( 0 85.83000000000001)">
@@ -15109,7 +15080,7 @@
</g>
</g>
</g>
- <g id="phone" class="package" transform="translate( 115.79999999999998 0)">
+ <g id="phone" class="package" transform="translate( 109.19999999999999 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
<rect class="package" x="0" width="243.9" height="168.46" y="0" style="fill:darkkhaki;"/>
<text text-anchor="middle" class="package" width="243.9" x="121.95" y="167.46">Phone Apps</text>
@@ -15372,7 +15343,7 @@
</g>
</g>
</g>
- <g id="videotelephony" class="package" transform="translate( 361.8 0)">
+ <g id="videotelephony" class="package" transform="translate( 355.20000000000005 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
<rect class="package" x="0" width="36.300000000000004" height="82.63000000000001" y="0" style="fill:darkkhaki;"/>
<text text-anchor="middle" class="package" width="36.300000000000004" x="18.150000000000002" y="81.63000000000001">Video Telephony Apps</text>
@@ -15449,7 +15420,7 @@
</g>
</g>
</g>
- <g id="iptelephony" class="package" transform="translate( 400.20000000000005 0)">
+ <g id="iptelephony" class="package" transform="translate( 393.6 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
<rect class="package" x="0" width="113.69999999999999" height="82.63000000000001" y="0" style="fill:darkkhaki;"/>
<text text-anchor="middle" class="package" width="113.69999999999999" x="56.849999999999994" y="81.63000000000001">IP Telephony</text>
@@ -15673,7 +15644,7 @@
</g>
</g>
</g>
- <g id="settingsuis" class="package" transform="translate( 361.8 85.83000000000001)">
+ <g id="settingsuis" class="package" transform="translate( 355.20000000000005 85.83000000000001)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
<rect class="package" x="0" width="46.5" height="82.63000000000001" y="0" style="fill:darkseagreen;"/>
<text text-anchor="middle" class="package" width="46.5" x="23.25" y="81.63000000000002">Settings UIs</text>
@@ -15738,14 +15709,14 @@
</g>
</g>
</g>
- <g id="contentcontrol" class="package" transform="translate( 410.40000000000003 85.83000000000001)">
+ <g id="contentcontrol" class="package" transform="translate( 403.80000000000007 85.83000000000001)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
- <rect class="package" x="0" width="48.6" height="82.63000000000001" y="0" style="fill:darkseagreen;"/>
- <text text-anchor="middle" class="package" width="48.6" x="24.3" y="81.63000000000002">Content Control Daemons</text>
+ <rect class="package" x="0" width="67.19999999999999" height="82.63000000000001" y="0" style="fill:darkseagreen;"/>
+ <text text-anchor="middle" class="package" width="67.19999999999999" x="33.599999999999994" y="81.63000000000002">Content Control Daemons</text>
<g transform="translate(0 3.2)">
<g id="contentctrl_plat" transform="translate(0 0)" class="collection">
- <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
- <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Content Control Daemons Platforn InterÂfaces</text>
+ <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
+ <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Content Control Daemons Platforn InterÂfaces</text>
<g transform="translate(0 6.299999999999999)">
<g id="oma_ds_presync_plugin_api" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
@@ -15762,6 +15733,16 @@
<use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">DS Folder Util API</text>
</g>
+ <g id="adapter_customization_api" class="component">
+ <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+ <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Adapter Customization API</text>
+ </g>
+ <g id="ds_data_modification_api" class="component">
+ <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+ <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">DS Data Modification API</text>
+ </g>
</g>
</g>
<g id="dsdcmoadapter" transform="translate(0 18.8)" class="collection">
@@ -15775,7 +15756,7 @@
</g>
</g>
</g>
- <g id="omads" transform="translate(30.000000000000004 0)" class="collection">
+ <g id="omads" transform="translate(48.6 0)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
<text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">OMA Data Sync</text>
<g transform="translate(0 6.299999999999999)">
@@ -15793,7 +15774,7 @@
</g>
</g>
</g>
- <g id="devicecontrol" class="package" transform="translate( 461.1 85.83000000000001)">
+ <g id="devicecontrol" class="package" transform="translate( 473.1 85.83000000000001)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
<rect class="package" x="0" width="113.69999999999999" height="82.63000000000001" y="0" style="fill:darkseagreen;"/>
<text text-anchor="middle" class="package" width="113.69999999999999" x="56.849999999999994" y="81.63000000000002">DevÂice Control Daemons</text>
@@ -15903,8 +15884,8 @@
</g>
</g>
<g id="customization" transform="translate(17.7 18.8)" class="collection">
- <rect class="collection" x="0" y="0" height="15.6" width="92.99999999999999"/>
- <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="91.59999999999998" height="6.299999999999999">DM CustomÂization Adapters</text>
+ <rect class="collection" x="0" y="0" height="15.6" width="83.69999999999999"/>
+ <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="82.29999999999998" height="6.299999999999999">DM CustomÂization Adapters</text>
<g transform="translate(0 6.299999999999999)">
<g id="dmutils" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
@@ -15916,45 +15897,40 @@
<use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">UI Settings Server</text>
</g>
- <g id="isadapter" class="component">
+ <g id="supadapter" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
<use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Idle State Adapter</text>
- </g>
- <g id="supadapter" class="component">
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Startup Adapter</text>
+ </g>
+ <g id="wallpaperadapter" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
<use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Startup Adapter</text>
- </g>
- <g id="wallpaperadapter" class="component">
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Wallpaper Adapter</text>
+ </g>
+ <g id="operatorlogoadapter" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
<use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Wallpaper Adapter</text>
- </g>
- <g id="operatorlogoadapter" class="component">
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Operator Logo Adapter</text>
+ </g>
+ <g id="screensaveradapter" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
<use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Operator Logo Adapter</text>
- </g>
- <g id="screensaveradapter" class="component">
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Screen Saver Adapter</text>
+ </g>
+ <g id="themesadapter" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
<use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Screen Saver Adapter</text>
- </g>
- <g id="themesadapter" class="component">
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Themes Adapter</text>
+ </g>
+ <g id="embeddedlinkadapter" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
<use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Themes Adapter</text>
- </g>
- <g id="embeddedlinkadapter" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Embedded Link Adapter</text>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Embedded Link Adapter</text>
</g>
<g id="customization_build" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">DM CustomÂization Build</text>
+ <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">DM CustomÂization Build</text>
</g>
</g>
</g>
@@ -15971,7 +15947,7 @@
</g>
</g>
</g>
- <g id="printing" class="package" transform="translate( 576.9 85.83000000000001)">
+ <g id="printing" class="package" transform="translate( 588.9 85.83000000000001)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
<rect class="package" x="0" width="67.2" height="82.63000000000001" y="0" style="fill:orchid;"/>
<text text-anchor="middle" class="package" width="67.2" x="33.6" y="81.63000000000002">Printing</text>
@@ -16025,7 +16001,7 @@
</g>
</g>
</g>
- <g id="files" class="package" transform="translate( 516 0)">
+ <g id="files" class="package" transform="translate( 509.4 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
<rect class="package" x="0" width="76.5" height="82.63000000000001" y="0" style="fill:lightpink;"/>
<text text-anchor="middle" class="package" width="76.5" x="38.25" y="81.63000000000001">File Manager Apps</text>
@@ -16106,14 +16082,14 @@
</g>
</g>
</g>
- <g id="utils" class="package" transform="translate( 594.6 0)">
+ <g id="utils" class="package" transform="translate( 588 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
<rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:lightpink;"/>
<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000001">Utility Apps</text>
<g transform="translate(0 3.2)">
<g id="extras" transform="translate(0 0)" class="collection">
- <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
- <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Extras</text>
+ <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+ <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Extras</text>
<g transform="translate(0 6.299999999999999)">
<g id="about" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
@@ -16125,16 +16101,11 @@
<use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Calculator App</text>
</g>
- <g id="converter" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Unit Converter</text>
- </g>
- </g>
- </g>
- </g>
- </g>
- <g id="contacts" class="package" transform="translate( 646.1999999999999 0)">
+ </g>
+ </g>
+ </g>
+ </g>
+ <g id="contacts" class="package" transform="translate( 658.1999999999999 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
<rect class="package" x="0" width="569.7000000000004" height="168.46" y="0" style="fill:lightpink;"/>
<text text-anchor="middle" class="package" width="569.7000000000004" x="284.8500000000002" y="167.46">Contacts Apps</text>
@@ -16596,7 +16567,7 @@
</g>
</g>
</g>
- <g id="organizer" class="package" transform="translate( 1218.0000000000002 0)">
+ <g id="organizer" class="package" transform="translate( 1230.0000000000002 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
<rect class="package" x="0" width="311.40000000000003" height="168.46" y="0" style="fill:lightpink;"/>
<text text-anchor="middle" class="package" width="311.40000000000003" x="155.70000000000002" y="167.46">Organizer App Suite</text>
@@ -17069,7 +17040,7 @@
</g>
</g>
</g>
- <g id="messaging" class="package" transform="translate( 1531.5000000000002 0)">
+ <g id="messaging" class="package" transform="translate( 1543.5000000000002 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
<rect class="package" x="0" width="356.7000000000001" height="168.46" y="0" style="fill:lightpink;"/>
<text text-anchor="middle" class="package" width="356.7000000000001" x="178.35000000000005" y="167.46">MessagÂing Apps</text>
@@ -17491,7 +17462,7 @@
</g>
</g>
</g>
- <g id="commonemail" class="package" transform="translate( 1890.3000000000004 0)">
+ <g id="commonemail" class="package" transform="translate( 1902.3000000000004 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
<rect class="package" x="0" width="158.10000000000002" height="168.46" y="0" style="fill:lightpink;"/>
<text text-anchor="middle" class="package" width="158.10000000000002" x="79.05000000000001" y="167.46">Email Apps</text>
@@ -17754,7 +17725,7 @@
</g>
</g>
</g>
- <g id="conversations" class="package" transform="translate( 2050.5000000000005 0)">
+ <g id="conversations" class="package" transform="translate( 2062.5000000000005 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
<rect class="package" x="0" width="142.8" height="82.63000000000001" y="0" style="fill:lightpink;"/>
<text text-anchor="middle" class="package" width="142.8" x="71.4" y="81.63000000000001">ConversaÂtion Apps</text>
@@ -17930,7 +17901,7 @@
</g>
</g>
</g>
- <g id="im" class="package" transform="translate( 2195.4000000000005 0)">
+ <g id="im" class="package" transform="translate( 2207.4000000000005 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
<rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:lightpink;"/>
<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000001">Instant Msg. Apps</text>
@@ -17959,7 +17930,7 @@
</g>
</g>
</g>
- <g id="dictionary" class="package" transform="translate( 2050.5000000000005 85.83000000000001)">
+ <g id="dictionary" class="package" transform="translate( 2062.5000000000005 85.83000000000001)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
<rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:lightpink;"/>
<text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000002">DictioÂnary</text>
@@ -17988,7 +17959,7 @@
</g>
</g>
</g>
- <g id="camera" class="package" transform="translate( 2225.4000000000005 0)">
+ <g id="camera" class="package" transform="translate( 2237.4000000000005 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
<rect class="package" x="0" width="57.00000000000001" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
<text text-anchor="middle" class="package" width="57.00000000000001" x="28.500000000000004" y="81.63000000000001">Camera Apps</text>
@@ -18032,7 +18003,7 @@
</g>
</g>
</g>
- <g id="imgeditor" class="package" transform="translate( 2284.5000000000005 0)">
+ <g id="imgeditor" class="package" transform="translate( 2296.5000000000005 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
<rect class="package" x="0" width="122.99999999999999" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
<text text-anchor="middle" class="package" width="122.99999999999999" x="61.49999999999999" y="81.63000000000001">Image Editor Apps</text>
@@ -18147,108 +18118,7 @@
</g>
</g>
</g>
- <g id="videoeditor" class="package" transform="translate( 2409.6000000000004 0)">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
- <rect class="package" x="0" width="82.79999999999998" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
- <text text-anchor="middle" class="package" width="82.79999999999998" x="41.39999999999999" y="81.63000000000001">Video Editor Apps</text>
- <g transform="translate(0 3.2)">
- <g id="videoeditor_plat" transform="translate(0 0)" class="collection">
- <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
- <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Video Editor Apps Platform InterÂfaces</text>
- <g transform="translate(0 6.299999999999999)">
- <g id="video_editor_engine_api" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
- <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Video Editor Engine API</text>
- </g>
- </g>
- </g>
- <g id="videditor" transform="translate(17.7 0)" class="collection">
- <rect class="collection" x="0" y="0" height="15.6" width="65.1"/>
- <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="63.699999999999996" height="6.299999999999999">Video Editor</text>
- <g transform="translate(0 6.299999999999999)">
- <g id="videoeditorcommon" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Video Editor Common</text>
- </g>
- <g id="videoeditoruicomponents" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Video Editor UI Cmp.</text>
- </g>
- <g id="simplevideoeditor" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Simple Video Editor</text>
- </g>
- <g id="simplecutvideo" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Simple Cut Video</text>
- </g>
- <g id="videoprovider" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Video Provider</text>
- </g>
- <g id="manualvideoeditor" class="component placeholder">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <use width="9.3" height="9.3" x="46.5" y="0" style="fill:url(#PatternOverlay1); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Manual Video Editor</text>
- </g>
- <g id="videditor_build" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Video Editor Build</text>
- </g>
- </g>
- </g>
- <g id="videoeditorengine" transform="translate(0 18.8)" class="collection">
- <rect class="collection" x="0" y="0" height="15.6" width="65.1"/>
- <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="63.699999999999996" height="6.299999999999999">Video Editor Engine</text>
- <g transform="translate(0 6.299999999999999)">
- <g id="audioeditorengine" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Audio Editor Engine</text>
- </g>
- <g id="avcedit" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">AVC Editing</text>
- </g>
- <g id="h263decoder" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">H.263 Decoder</text>
- </g>
- <g id="mp3aacmaniplib" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">MP3 & AAC Manipulation Library</text>
- </g>
- <g id="vedtranscoder" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Video Editor Transcoder</text>
- </g>
- <g id="vedengine" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Video Editor Engine</text>
- </g>
- <g id="videoeditorengine_build" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Video Editor Engine Build</text>
- </g>
- </g>
- </g>
- </g>
- </g>
- <g id="videoplayer" class="package" transform="translate( 2494.5000000000005 0)">
+ <g id="videoplayer" class="package" transform="translate( 2421.6000000000004 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
<rect class="package" x="0" width="206.70000000000002" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
<text text-anchor="middle" class="package" width="206.70000000000002" x="103.35000000000001" y="81.63000000000001">Video Player Apps</text>
@@ -18478,7 +18348,7 @@
</g>
</g>
</g>
- <g id="photos" class="package" transform="translate( 2703.3000000000006 0)">
+ <g id="photos" class="package" transform="translate( 2630.4000000000005 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
<rect class="package" x="0" width="178.79999999999998" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
<text text-anchor="middle" class="package" width="178.79999999999998" x="89.39999999999999" y="81.63000000000001">Photos</text>
@@ -18592,7 +18462,7 @@
</g>
</g>
</g>
- <g id="musicplayer" class="package" transform="translate( 2884.2000000000007 0)">
+ <g id="musicplayer" class="package" transform="translate( 2811.3000000000006 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
<rect class="package" x="0" width="159.29999999999998" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
<text text-anchor="middle" class="package" width="159.29999999999998" x="79.64999999999999" y="81.63000000000001">Music Player Apps</text>
@@ -18759,7 +18629,7 @@
</g>
</g>
</g>
- <g id="radio" class="package" transform="translate( 3045.600000000001 0)">
+ <g id="radio" class="package" transform="translate( 2972.7000000000007 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
<rect class="package" x="0" width="65.1" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
<text text-anchor="middle" class="package" width="65.1" x="32.55" y="81.63000000000001">Radio Apps</text>
@@ -18807,19 +18677,25 @@
</g>
</g>
</g>
- <g id="internetradio" class="package placeholder" transform="translate( 3112.8000000000006 0)">
+ <g id="podcatcher" class="package" transform="translate( 3039.9000000000005 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
- <rect class="package" x="0" width="78" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
- <text text-anchor="middle" class="package" width="78" x="39" y="40.315000000000005" dy="0.375em" height="15.600000000000001">Internet Radio Apps</text>
- <g transform="translate(0 3.2)"/>
- </g>
- <g id="tv" class="package placeholder" transform="translate( 2085.9000000000005 85.83000000000001)">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
- <rect class="package" x="0" width="78" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
- <text text-anchor="middle" class="package" width="78" x="39" y="40.315000000000026" dy="0.375em" height="15.600000000000001">TV Apps</text>
- <g transform="translate(0 3.2)"/>
- </g>
- <g id="voicerec" class="package" transform="translate( 3192.9000000000005 0)">
+ <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
+ <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000001">Podcatcher</text>
+ <g transform="translate(0 3.2)">
+ <g id="podcatcher_info" transform="translate(0 0)" class="collection">
+ <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+ <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Podcatcher</text>
+ <g transform="translate(0 6.299999999999999)">
+ <g id="podcatcher_build" class="component">
+ <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+ <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Podcatcher Build</text>
+ </g>
+ </g>
+ </g>
+ </g>
+ </g>
+ <g id="voicerec" class="package" transform="translate( 3069.9000000000005 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
<rect class="package" x="0" width="54.00000000000001" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
<text text-anchor="middle" class="package" width="54.00000000000001" x="27.000000000000004" y="81.63000000000001">Voice Recorder Apps</text>
@@ -18858,7 +18734,7 @@
</g>
</g>
</g>
- <g id="screensaver" class="package" transform="translate( 3249.0000000000005 0)">
+ <g id="screensaver" class="package" transform="translate( 3126.0000000000005 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
<rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:orange;"/>
<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000001">Screen Saver Apps</text>
@@ -18900,7 +18776,7 @@
</g>
</g>
</g>
- <g id="homescreen" class="package" transform="translate( 3279.0000000000005 0)">
+ <g id="homescreen" class="package" transform="translate( 3156.0000000000005 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
<rect class="package" x="0" width="122.99999999999999" height="82.63000000000001" y="0" style="fill:orange;"/>
<text text-anchor="middle" class="package" width="122.99999999999999" x="61.49999999999999" y="81.63000000000001">Home Screen Apps</text>
@@ -19026,7 +18902,7 @@
</g>
</g>
</g>
- <g id="graphicsuis" class="package" transform="translate( 2166.0000000000005 85.83000000000001)">
+ <g id="graphicsuis" class="package" transform="translate( 2097.9000000000005 85.83000000000001)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
<rect class="package" x="0" width="45.6" height="82.63000000000001" y="0" style="fill:orange;"/>
<text text-anchor="middle" class="package" width="45.6" x="22.8" y="81.63000000000002">Graphics UIs</text>
@@ -19065,7 +18941,7 @@
</g>
</g>
</g>
- <g id="profile" class="package" transform="translate( 3404.1000000000004 0)">
+ <g id="profile" class="package" transform="translate( 3281.1000000000004 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
<rect class="package" x="0" width="51" height="82.63000000000001" y="0" style="fill:orange;"/>
<text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000001">Profiles</text>
@@ -19105,7 +18981,7 @@
</g>
</g>
</g>
- <g id="speechsrv" class="package" transform="translate( 2213.7000000000003 85.83000000000001)">
+ <g id="speechsrv" class="package" transform="translate( 2145.6000000000004 85.83000000000001)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
<rect class="package" x="0" width="326.70000000000016" height="82.63000000000001" y="0" style="fill:orange;"/>
<text text-anchor="middle" class="package" width="326.70000000000016" x="163.35000000000008" y="81.63000000000002">Speech RecogÂnition UIs</text>
@@ -19406,7 +19282,7 @@
</g>
</g>
</g>
- <g id="homescreentools" class="package" transform="translate( 2542.5000000000005 85.83000000000001)">
+ <g id="homescreentools" class="package" transform="translate( 2474.4000000000005 85.83000000000001)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
<rect class="package" x="0" width="54" height="82.63000000000001" y="0" style="fill:orange;"/>
<text text-anchor="middle" class="package" width="54" x="27" y="81.63000000000002">Home Screen Tools</text>
@@ -19451,7 +19327,7 @@
</g>
</g>
</g>
- <g id="webuis" class="package" transform="translate( 2598.6000000000004 85.83000000000001)">
+ <g id="webuis" class="package" transform="translate( 2530.5000000000005 85.83000000000001)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
<rect class="package" x="0" width="67.2" height="82.63000000000001" y="0" style="fill:slateblue;"/>
<text text-anchor="middle" class="package" width="67.2" x="33.6" y="81.63000000000002">Web UIs</text>
@@ -19528,7 +19404,7 @@
</g>
</g>
</g>
- <g id="jrt" class="package" transform="translate( 2667.9000000000005 85.83000000000001)">
+ <g id="jrt" class="package" transform="translate( 2599.8000000000006 85.83000000000001)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
<rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:slateblue;"/>
<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000002">Java Runtime</text>
@@ -19554,20 +19430,20 @@
</g>
</g>
</g>
- <g id="java_stubs" transform="translate(0 56.400000000000006)" class="collection">
- <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
- <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Java Stubs</text>
- <g transform="translate(0 6.299999999999999)">
- <g id="java_stubs_build" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">JRT Stubs Build</text>
- </g>
- </g>
- </g>
- </g>
- </g>
- <g id="conntools" class="package" transform="translate( 2697.9000000000005 85.83000000000001)">
+ <g id="java_build" transform="translate(0 56.400000000000006)" class="collection">
+ <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+ <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">JRT Build</text>
+ <g transform="translate(0 6.299999999999999)">
+ <g id="java_build_sf" class="component">
+ <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+ <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">JRT Build for Symbian Foundation</text>
+ </g>
+ </g>
+ </g>
+ </g>
+ </g>
+ <g id="conntools" class="package" transform="translate( 2629.8000000000006 85.83000000000001)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
<rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:moccasin;"/>
<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000002">ConnectÂivity Tools</text>
@@ -19598,10 +19474,10 @@
</g>
</g>
</g>
- <g id="rndtools" class="package" transform="translate( 2727.9000000000005 85.83000000000001)">
+ <g id="rndtools" class="package" transform="translate( 2659.8000000000006 85.83000000000001)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
- <rect class="package" x="0" width="91.2" height="82.63000000000001" y="0" style="fill:darkgray;"/>
- <text text-anchor="middle" class="package" width="91.2" x="45.6" y="81.63000000000002">R&D tools</text>
+ <rect class="package" x="0" width="81.9" height="82.63000000000001" y="0" style="fill:darkgray;"/>
+ <text text-anchor="middle" class="package" width="81.9" x="40.95" y="81.63000000000002">R&D tools</text>
<g transform="translate(0 3.2)">
<g id="creator" transform="translate(0 56.400000000000006)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -19714,50 +19590,44 @@
</g>
</g>
<g id="htiui" transform="translate(35.4 37.6)" class="collection">
- <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
- <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">Harmonized Test InterÂface UI</text>
- <g transform="translate(0 6.299999999999999)">
- <g id="HtiCommPlugins" class="component">
+ <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
+ <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Harmonized Test InterÂface UI</text>
+ <g transform="translate(0 6.299999999999999)">
+ <g id="HtiServicePlugins" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
<use width="9.3" height="9.3" x="0" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
<use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#BorderShape2"/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">HTI Comm Plugins</text>
- </g>
- <g id="HtiServicePlugins" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
- <use width="9.3" height="9.3" x="9.3" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#BorderShape2"/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">HTI Service Plugins</text>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">HTI Service Plugins</text>
</g>
<g id="htidevicereboot" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+ <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
+ <use width="9.3" height="9.3" x="9.3" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">HTI DevÂice Reboot</text>
+ </g>
+ <g id="htistartupwait" class="component">
+ <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
<use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
<use width="9.3" height="9.3" x="18.6" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">HTI DevÂice Reboot</text>
- </g>
- <g id="htistartupwait" class="component">
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">HTI Startup Wait</text>
+ </g>
+ <g id="htiadmin" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
<use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
<use width="9.3" height="9.3" x="27.900000000000002" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">HTI Startup Wait</text>
- </g>
- <g id="htiadmin" class="component">
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">HTI Admin</text>
+ </g>
+ <g id="htiui_build" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
<use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
<use width="9.3" height="9.3" x="37.2" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">HTI Admin</text>
- </g>
- <g id="htiui_build" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <use width="9.3" height="9.3" x="46.5" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">HTI UI Build</text>
- </g>
- </g>
- </g>
- </g>
- </g>
- <g id="helps" class="package" transform="translate( 3457.2000000000003 0)">
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">HTI UI Build</text>
+ </g>
+ </g>
+ </g>
+ </g>
+ </g>
+ <g id="helps" class="package" transform="translate( 3334.2000000000003 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
<rect class="package" x="0" width="27.900000000000002" height="168.46" y="0" style="fill:orange;"/>
<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="167.46">Help Apps</text>
@@ -19798,7 +19668,7 @@
</g>
</g>
</g>
- <g id="techview" class="package" transform="translate( 3487.2000000000003 0)">
+ <g id="techview" class="package" transform="translate( 3364.2000000000003 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
<rect class="package" x="0" width="68.7" height="168.46" y="0" style="fill:orange;"/>
<text text-anchor="middle" class="package" width="68.7" x="34.35" y="167.46">Techview</text>
@@ -19964,7 +19834,7 @@
</g>
<g id="s8-color9">
<rect class="cbox" height="3.1" width="15.5" fill="#ffff00" x="77" y="3.1"/>
- <text text-anchor="middle" class="cbox" width="15.5" dy="0.375em" x="84.75" y="4.65">Multimedia Apps (10)</text>
+ <text text-anchor="middle" class="cbox" width="15.5" dy="0.375em" x="84.75" y="4.65">Multimedia Apps (8)</text>
</g>
<g id="s8-color10">
<rect class="cbox" height="3.1" width="15.5" fill="orange" x="15" y="6.2"/>
@@ -20013,7 +19883,7 @@
<g id="s4-overlay0" class="cmp placeholder">
<use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:grey;stroke-width: 0.5;"/>
<use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Test CompoÂnent (168)</text>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Test CompoÂnent (164)</text>
</g>
</g>
</g>
@@ -20022,7 +19892,7 @@
<g id="s5-overlay1" class="cmp placeholder">
<use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:grey;stroke-width: 0.5;"/>
<use width="9.3" height="9.3" x="0" y="0" style="fill:url(#PatternOverlay4); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">DepreÂcated in TB 9.1 (4)</text>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">DepreÂcated in TB 9.1 (5)</text>
</g>
</g>
</g>
@@ -20046,9 +19916,9 @@
</g>
</g>
<text text-anchor="middle" class="label" dy="0.375em" x="265.17499999999995" y="4.65">
- <tspan dy="-1em" x="265.17499999999995">109 Packages</tspan>
- <tspan dy="1em" x="265.17499999999995">661 Collections</tspan>
- <tspan dy="1em" x="265.17499999999995">2898 Components</tspan>
+ <tspan dy="-1em" x="265.17499999999995">107 Packages</tspan>
+ <tspan dy="1em" x="265.17499999999995">658 Collections</tspan>
+ <tspan dy="1em" x="265.17499999999995">2879 Components</tspan>
</text>
</g>
</g>
--- a/symbian3/single/sysdefs/sf3c.svg Wed May 05 12:21:47 2010 +0100
+++ b/symbian3/single/sysdefs/sf3c.svg Tue Jul 13 12:21:44 2010 +0100
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<?AdobeSVGViewer resolution="600"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:m="http://exslt.org/math" version="1.1" onload="wrapalltext()" viewBox="-3.2 -3.2 1370.8999999999999 689.5597784394387" class="collection-fixed" onscroll="resized()" onzoom="resized()" onresize="resized()">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:m="http://exslt.org/math" version="1.1" onload="wrapalltext()" viewBox="-3.2 -3.2 1333.1000000000004 688.4144807681579" class="collection-fixed" onscroll="resized()" onzoom="resized()" onresize="resized()">
<title>Symbian OS ^3 System Model: date</title>
<defs>
<style type="text/css">
@@ -431,8 +431,8 @@
<g id="os" transform="translate(3.1999999999999993 404.06)" class="layer">
<rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="231.26000000000002"/>
<text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="231.26000000000002" height="9.3" x="-115.93">OS</text>
- <g class="layer-detail" transform="translate(62.449999999999974 3.2)">
- <rect x="-49.64999999999998" class="layer" y="-3.2" width="1348.4999999999998" height="231.26000000000002"/>
+ <g class="layer-detail" transform="translate(43.550000000000225 3.2)">
+ <rect x="-30.750000000000227" class="layer" y="-3.2" width="1310.7000000000003" height="231.26000000000002"/>
<g>
<g id="kernelhwsrv" class="package" transform="translate( 0 123.43000000000002)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color0.mouseover" end="s8-color0.mouseout"/>
@@ -1512,8 +1512,8 @@
<g id="mw" transform="translate(3.1999999999999993 178.06)" class="layer">
<rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="222.8"/>
<text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="222.8" height="9.3" x="-111.7">Middleware</text>
- <g class="layer-detail" transform="translate(31.69999999999975 3.2)">
- <rect x="-18.89999999999975" class="layer" y="-3.2" width="1348.4999999999998" height="222.8"/>
+ <g class="layer-detail" transform="translate(12.8 3.2)">
+ <rect x="0" class="layer" y="-3.2" width="1310.7000000000003" height="222.8"/>
<g>
<g id="appsupport" class="package" transform="translate( 0 100.4)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
@@ -3302,15 +3302,15 @@
<g id="app" transform="translate(3.1999999999999993 0)" class="layer">
<rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="174.86"/>
<text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="174.86" height="9.3" x="-87.73">Applications</text>
- <g class="layer-detail" transform="translate(12.8 3.2)">
- <rect x="0" class="layer" y="-3.2" width="1348.4999999999998" height="174.86"/>
+ <g class="layer-detail" transform="translate(36.65000000000025 3.2)">
+ <rect x="-23.85000000000025" class="layer" y="-3.2" width="1310.7000000000003" height="174.86"/>
<g>
<g id="location" class="package" transform="translate( 0 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color2.mouseover" end="s8-color2.mouseout"/>
<rect class="package" x="0" width="104.1" height="82.63000000000001" y="0" style="fill:whitesmoke;"/>
<text text-anchor="middle" class="package" width="104.1" x="52.05" y="81.63000000000001">Location Apps</text>
<g transform="translate(0 3.2)">
- <g id="loc_plat" transform="translate(0 0)" class="collection">
+ <g id="loc_plat" transform="translate(0 0)" class="collection placeholder">
<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location Apps Platform Interfaces</text>
<g transform="translate(0 6.299999999999999)"/>
@@ -3360,11 +3360,6 @@
<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Map & Nav Provider Ref App</text>
<g transform="translate(0 6.299999999999999)"/>
</g>
- <g id="locationcentre" transform="translate(17.7 18.8)" class="collection">
- <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
- <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location Centre</text>
- <g transform="translate(0 6.299999999999999)"/>
- </g>
</g>
</g>
<g id="mmsharinguis" class="package" transform="translate( 0 85.83000000000001)">
@@ -4005,29 +4000,7 @@
</g>
</g>
</g>
- <g id="videoeditor" class="package" transform="translate( 808.8 0)">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
- <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
- <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000001">Video Editor Apps</text>
- <g transform="translate(0 3.2)">
- <g id="videoeditor_plat" transform="translate(0 0)" class="collection">
- <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
- <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Video Editor Apps Platform InterÂfaces</text>
- <g transform="translate(0 6.299999999999999)"/>
- </g>
- <g id="videditor" transform="translate(17.7 0)" class="collection">
- <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
- <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Video Editor</text>
- <g transform="translate(0 6.299999999999999)"/>
- </g>
- <g id="videoeditorengine" transform="translate(0 18.8)" class="collection">
- <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
- <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Video Editor Engine</text>
- <g transform="translate(0 6.299999999999999)"/>
- </g>
- </g>
- </g>
- <g id="videoplayer" class="package" transform="translate( 844.1999999999999 0)">
+ <g id="videoplayer" class="package" transform="translate( 808.8 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
<rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
<text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000001">Video Player Apps</text>
@@ -4069,7 +4042,7 @@
</g>
</g>
</g>
- <g id="photos" class="package" transform="translate( 879.5999999999999 0)">
+ <g id="photos" class="package" transform="translate( 844.1999999999999 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
<rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
<text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000001">Photos</text>
@@ -4086,7 +4059,7 @@
</g>
</g>
</g>
- <g id="musicplayer" class="package" transform="translate( 914.9999999999999 0)">
+ <g id="musicplayer" class="package" transform="translate( 879.5999999999999 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
<rect class="package" x="0" width="51" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
<text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000001">Music Player Apps</text>
@@ -4118,7 +4091,7 @@
</g>
</g>
</g>
- <g id="radio" class="package" transform="translate( 968.0999999999999 0)">
+ <g id="radio" class="package" transform="translate( 932.6999999999999 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
<rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000001">Radio Apps</text>
@@ -4130,19 +4103,19 @@
</g>
</g>
</g>
- <g id="internetradio" class="package placeholder" transform="translate( 998.0999999999999 0)">
+ <g id="podcatcher" class="package" transform="translate( 962.6999999999999 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
- <rect class="package" x="0" width="78" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
- <text text-anchor="middle" class="package" width="78" x="39" y="40.315000000000005" dy="0.375em" height="15.600000000000001">Internet Radio Apps</text>
- <g transform="translate(0 3.2)"/>
+ <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
+ <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000001">Podcatcher</text>
+ <g transform="translate(0 3.2)">
+ <g id="podcatcher_info" transform="translate(0 0)" class="collection">
+ <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+ <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Podcatcher</text>
+ <g transform="translate(0 6.299999999999999)"/>
+ </g>
+ </g>
</g>
- <g id="tv" class="package placeholder" transform="translate( 654.9 85.83000000000001)">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
- <rect class="package" x="0" width="78" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
- <text text-anchor="middle" class="package" width="78" x="39" y="40.315000000000026" dy="0.375em" height="15.600000000000001">TV Apps</text>
- <g transform="translate(0 3.2)"/>
- </g>
- <g id="voicerec" class="package" transform="translate( 1078.1999999999998 0)">
+ <g id="voicerec" class="package" transform="translate( 992.6999999999999 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
<rect class="package" x="0" width="51" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
<text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000001">Voice Recorder Apps</text>
@@ -4164,7 +4137,7 @@
</g>
</g>
</g>
- <g id="screensaver" class="package" transform="translate( 1131.2999999999997 0)">
+ <g id="screensaver" class="package" transform="translate( 1045.7999999999997 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
<rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:orange;"/>
<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000001">Screen Saver Apps</text>
@@ -4181,7 +4154,7 @@
</g>
</g>
</g>
- <g id="homescreen" class="package" transform="translate( 1161.2999999999997 0)">
+ <g id="homescreen" class="package" transform="translate( 1075.7999999999997 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
<rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:orange;"/>
<text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000001">Home Screen Apps</text>
@@ -4208,7 +4181,7 @@
</g>
</g>
</g>
- <g id="graphicsuis" class="package" transform="translate( 735 85.83000000000001)">
+ <g id="graphicsuis" class="package" transform="translate( 654.9 85.83000000000001)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
<rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:orange;"/>
<text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000002">Graphics UIs</text>
@@ -4225,7 +4198,7 @@
</g>
</g>
</g>
- <g id="profile" class="package" transform="translate( 1196.6999999999998 0)">
+ <g id="profile" class="package" transform="translate( 1111.1999999999998 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
<rect class="package" x="0" width="51" height="82.63000000000001" y="0" style="fill:orange;"/>
<text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000001">Profiles</text>
@@ -4247,7 +4220,7 @@
</g>
</g>
</g>
- <g id="speechsrv" class="package" transform="translate( 770.4 85.83000000000001)">
+ <g id="speechsrv" class="package" transform="translate( 690.3 85.83000000000001)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
<rect class="package" x="0" width="51" height="82.63000000000001" y="0" style="fill:orange;"/>
<text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000002">Speech RecogÂnition UIs</text>
@@ -4274,7 +4247,7 @@
</g>
</g>
</g>
- <g id="homescreentools" class="package" transform="translate( 823.5 85.83000000000001)">
+ <g id="homescreentools" class="package" transform="translate( 743.4 85.83000000000001)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
<rect class="package" x="0" width="51" height="82.63000000000001" y="0" style="fill:orange;"/>
<text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000002">Home Screen Tools</text>
@@ -4296,7 +4269,7 @@
</g>
</g>
</g>
- <g id="webuis" class="package" transform="translate( 876.6 85.83000000000001)">
+ <g id="webuis" class="package" transform="translate( 796.5 85.83000000000001)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
<rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:slateblue;"/>
<text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000002">Web UIs</text>
@@ -4318,7 +4291,7 @@
</g>
</g>
</g>
- <g id="jrt" class="package" transform="translate( 912 85.83000000000001)">
+ <g id="jrt" class="package" transform="translate( 831.9 85.83000000000001)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
<rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:slateblue;"/>
<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000002">Java Runtime</text>
@@ -4328,14 +4301,14 @@
<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">JRT Platform Interfaces</text>
<g transform="translate(0 6.299999999999999)"/>
</g>
- <g id="java_stubs" transform="translate(0 56.400000000000006)" class="collection">
- <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
- <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Java Stubs</text>
+ <g id="java_build" transform="translate(0 56.400000000000006)" class="collection">
+ <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+ <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">JRT Build</text>
<g transform="translate(0 6.299999999999999)"/>
</g>
</g>
</g>
- <g id="conntools" class="package" transform="translate( 942 85.83000000000001)">
+ <g id="conntools" class="package" transform="translate( 861.9 85.83000000000001)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
<rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:moccasin;"/>
<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000002">ConnectÂivity Tools</text>
@@ -4352,7 +4325,7 @@
</g>
</g>
</g>
- <g id="rndtools" class="package" transform="translate( 972 85.83000000000001)">
+ <g id="rndtools" class="package" transform="translate( 891.9 85.83000000000001)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
<rect class="package" x="0" width="51" height="82.63000000000001" y="0" style="fill:darkgray;"/>
<text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000002">R&D tools</text>
@@ -4404,7 +4377,7 @@
</g>
</g>
</g>
- <g id="helps" class="package" transform="translate( 1249.7999999999997 0)">
+ <g id="helps" class="package" transform="translate( 1164.2999999999997 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
<rect class="package" x="0" width="27.900000000000002" height="168.46" y="0" style="fill:orange;"/>
<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="167.46">Help Apps</text>
@@ -4426,7 +4399,7 @@
</g>
</g>
</g>
- <g id="techview" class="package" transform="translate( 1279.7999999999997 0)">
+ <g id="techview" class="package" transform="translate( 1194.2999999999997 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
<rect class="package" x="0" width="68.7" height="168.46" y="0" style="fill:orange;"/>
<text text-anchor="middle" class="package" width="68.7" x="34.35" y="167.46">Techview</text>
@@ -4521,7 +4494,7 @@
</g>
</g>
</g>
- <g id="legend-root" class="legend" transform="translate(1071.9795 641.7200000000001) translate(295.7205 0) scale(3.6999802178070165) translate(-295.7205)">
+ <g id="legend-root" class="legend" transform="translate(1034.1795000000002 641.7200000000001) translate(295.7205 0) scale(3.5977214971569444) translate(-295.7205)">
<text text-anchor="middle" class="title" x="279.38525000000004" y="0">
<tspan dy="0.75em" x="279.38525000000004">Symbian OS ^3</tspan>
<tspan dy="1em" x="279.38525000000004">System Model</tspan>
@@ -4572,7 +4545,7 @@
</g>
<g id="s8-color9">
<rect class="cbox" height="3.1" width="15.5" fill="#ffff00" x="46" y="3.0999999999999996"/>
- <text text-anchor="middle" class="cbox" width="15.5" dy="0.375em" x="53.75" y="4.65">Multimedia Apps (10)</text>
+ <text text-anchor="middle" class="cbox" width="15.5" dy="0.375em" x="53.75" y="4.65">Multimedia Apps (8)</text>
</g>
<g id="s8-color10">
<rect class="cbox" height="3.1" width="15.5" fill="orange" x="61.5" y="3.0999999999999996"/>
@@ -4589,8 +4562,8 @@
</g>
</g>
<text text-anchor="middle" class="label" dy="0.375em" x="243.275" y="3.0999999999999996">
- <tspan dy="-0.5em" x="243.275">109 Packages</tspan>
- <tspan dy="1em" x="243.275">661 Collections</tspan>
+ <tspan dy="-0.5em" x="243.275">107 Packages</tspan>
+ <tspan dy="1em" x="243.275">658 Collections</tspan>
</text>
</g>
</g>
--- a/symbian3/single/sysdefs/sf3lit.svg Wed May 05 12:21:47 2010 +0100
+++ b/symbian3/single/sysdefs/sf3lit.svg Tue Jul 13 12:21:44 2010 +0100
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<?AdobeSVGViewer resolution="600"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:m="http://exslt.org/math" version="1.1" onload="wrapalltext()" viewBox="-3.2 -3.2 4894.1 872.3546042717193" class="component-fixed" onscroll="resized()" onzoom="resized()" onresize="resized()">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:m="http://exslt.org/math" version="1.1" onload="wrapalltext()" viewBox="-3.2 -3.2 4894.1 891.1546042717192" class="component-fixed" onscroll="resized()" onzoom="resized()" onresize="resized()">
<title>Symbian OS ^3 System Model: date</title>
<defs>
<style type="text/css">
@@ -423,11 +423,11 @@
]]><![CDATA[
}
]]></script>
- <g id="os" transform="translate(3.1999999999999993 443.83000000000004)" class="layer">
+ <g id="os" transform="translate(3.1999999999999993 462.63)" class="layer">
<rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="231.26000000000002"/>
<text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="231.26000000000002" height="9.3" x="-115.93">OS</text>
- <g class="layer-detail" transform="translate(550.1000000000008 3.2)">
- <rect x="-537.3000000000009" class="layer" y="-3.2" width="4871.700000000001" height="231.26000000000002"/>
+ <g class="layer-detail" transform="translate(541.2500000000009 3.2)">
+ <rect x="-528.450000000001" class="layer" y="-3.2" width="4871.700000000001" height="231.26000000000002"/>
<g>
<g id="kernelhwsrv" class="package" transform="translate( 0 123.43000000000002)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color0.mouseover" end="s8-color0.mouseout"/>
@@ -2232,8 +2232,8 @@
</g>
<g id="lbs" class="package" transform="translate( 1810.4999999999993 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color2.mouseover" end="s8-color2.mouseout"/>
- <rect class="package" x="0" width="55.8" height="120.23000000000002" y="0" style="fill:whitesmoke;"/>
- <text text-anchor="middle" class="package" width="55.8" x="27.9" y="119.23000000000002">Locating Services</text>
+ <rect class="package" x="0" width="64.2" height="120.23000000000002" y="0" style="fill:whitesmoke;"/>
+ <text text-anchor="middle" class="package" width="64.2" x="32.1" y="119.23000000000002">Locating Services</text>
<g transform="translate(0 3.2)">
<g id="datasourcemodules" transform="translate(0 56.400000000000006)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
@@ -2343,18 +2343,34 @@
</g>
</g>
<g id="networkprotocolmodules" transform="translate(17.7 37.6)" class="collection">
- <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
- <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Network Protocol Modules</text>
+ <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
+ <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Network Protocol Modules</text>
<g transform="translate(0 6.299999999999999)">
<g id="privacyprotocolmodule" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
<use width="9.3" height="9.3" x="0" y="0" xlink:href="#BorderShape2" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Privacy Protocol Module</text>
</g>
+ <g id="suplproxyprotocolmodule" class="component">
+ <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+ <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#BorderShape2" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">SUPL Proxy Protocol Module</text>
+ </g>
+ <g id="suplprotocolmodule" class="component">
+ <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+ <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#BorderShape2" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+ <use width="9.3" height="9.3" x="18.6" y="0" style="fill:url(#PatternOverlay4); stroke: none; stroke-width: 0;" xlink:href="#BorderShape2"/>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">SUPL Protocol Module</text>
+ </g>
<g id="common" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
- <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">common</text>
+ <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">common</text>
+ </g>
+ <g id="suplcontrolplaneprotocols" class="component">
+ <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+ <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">suplcontrolplaneprotocols</text>
</g>
</g>
</g>
@@ -2372,7 +2388,7 @@
</g>
</g>
</g>
- <g id="commsfw" class="package" transform="translate( 1868.3999999999994 0)">
+ <g id="commsfw" class="package" transform="translate( 1876.7999999999993 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
<rect class="package" x="0" width="57.00000000000001" height="120.23000000000002" y="0" style="fill:moccasin;"/>
<text text-anchor="middle" class="package" width="57.00000000000001" x="28.500000000000004" y="119.23000000000002">Comms FrameÂwork</text>
@@ -2524,7 +2540,7 @@
</g>
</g>
</g>
- <g id="networkingsrv" class="package" transform="translate( 1927.4999999999993 0)">
+ <g id="networkingsrv" class="package" transform="translate( 1935.8999999999992 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
<rect class="package" x="0" width="170.70000000000002" height="120.23000000000002" y="0" style="fill:moccasin;"/>
<text text-anchor="middle" class="package" width="170.70000000000002" x="85.35000000000001" y="119.23000000000002">NetworkÂing Services</text>
@@ -2725,8 +2741,8 @@
</g>
</g>
<g id="networkingtestandutils" transform="translate(17.7 0)" class="collection">
- <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
- <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">NetworkÂing Test & Utils</text>
+ <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+ <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">NetworkÂing Test & Utils</text>
<g transform="translate(0 6.299999999999999)">
<g id="networkingexamples" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
@@ -2734,21 +2750,9 @@
<use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">NetworkÂing Examples</text>
</g>
- <g id="networkingintegrationtest" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
- <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
- <use width="9.3" height="9.3" x="9.3" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">NetworkÂing Integ Test</text>
- </g>
- <g id="networkingperformancemeasurementtools" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
- <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
- <use width="9.3" height="9.3" x="18.6" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">NetworkÂing PerforÂmance Measurement Tools</text>
- </g>
- </g>
- </g>
- <g id="networkingsrv_info" transform="translate(47.7 0)" class="collection">
+ </g>
+ </g>
+ <g id="networkingsrv_info" transform="translate(35.4 0)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
<text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">NetworkÂing Services Info</text>
<g transform="translate(0 6.299999999999999)">
@@ -2784,7 +2788,7 @@
</g>
</g>
</g>
- <g id="wlan" class="package" transform="translate( 2100.2999999999993 0)">
+ <g id="wlan" class="package" transform="translate( 2108.6999999999994 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
<rect class="package" x="0" width="174.89999999999998" height="120.23000000000002" y="0" style="fill:moccasin;"/>
<text text-anchor="middle" class="package" width="174.89999999999998" x="87.44999999999999" y="119.23000000000002">WLAN</text>
@@ -2931,7 +2935,7 @@
</g>
</g>
</g>
- <g id="cellularsrv" class="package" transform="translate( 2277.2999999999993 0)">
+ <g id="cellularsrv" class="package" transform="translate( 2285.6999999999994 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
<rect class="package" x="0" width="101.39999999999998" height="120.23000000000002" y="0" style="fill:darkkhaki;"/>
<text text-anchor="middle" class="package" width="101.39999999999998" x="50.69999999999999" y="119.23000000000002">Cellular Baseband Services</text>
@@ -3058,8 +3062,8 @@
</g>
</g>
<g id="telephonyserverplugins" transform="translate(0 56.400000000000006)" class="collection">
- <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
- <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">Telephony Server Plugins</text>
+ <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
+ <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Telephony Server Plugins</text>
<g transform="translate(0 6.299999999999999)">
<g id="common_tsy" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
@@ -3078,21 +3082,15 @@
<use width="9.3" height="9.3" x="18.6" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#BorderShape2"/>
<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">MultiÂmode TSY</text>
</g>
- <g id="simtsy" class="component">
+ <g id="ctsydispatchlayer" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
<use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#BorderShape2" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
- <use width="9.3" height="9.3" x="27.900000000000002" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#BorderShape2"/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">SIM TSY</text>
- </g>
- <g id="ctsydispatchlayer" class="component">
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">C-TSY Dispatch Layer</text>
+ </g>
+ <g id="simatktsy" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
<use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#BorderShape2" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">C-TSY Dispatch Layer</text>
- </g>
- <g id="simatktsy" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
- <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#BorderShape2" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">SIMATK TSY</text>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">SIMATK TSY</text>
</g>
</g>
</g>
@@ -3168,7 +3166,7 @@
</g>
</g>
</g>
- <g id="bt" class="package" transform="translate( 2380.7999999999993 0)">
+ <g id="bt" class="package" transform="translate( 2389.1999999999994 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
<rect class="package" x="0" width="65.1" height="120.23000000000002" y="0" style="fill:orchid;"/>
<text text-anchor="middle" class="package" width="65.1" x="32.55" y="119.23000000000002">BlueÂtooth</text>
@@ -3324,7 +3322,7 @@
</g>
</g>
</g>
- <g id="usb" class="package" transform="translate( 2447.999999999999 0)">
+ <g id="usb" class="package" transform="translate( 2456.399999999999 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
<rect class="package" x="0" width="27.900000000000002" height="120.23000000000002" y="0" style="fill:orchid;"/>
<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="119.23000000000002">USB</text>
@@ -3360,7 +3358,7 @@
</g>
</g>
</g>
- <g id="mm" class="package" transform="translate( 2477.999999999999 0)">
+ <g id="mm" class="package" transform="translate( 2486.399999999999 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
<rect class="package" x="0" width="778.1999999999996" height="120.23000000000002" y="0" style="fill:rgb(175,212,240);"/>
<text text-anchor="middle" class="package" width="778.1999999999996" x="389.0999999999998" y="119.23000000000002">MultiÂmedia</text>
@@ -4088,10 +4086,10 @@
</g>
</g>
</g>
- <g id="imagingext" class="package" transform="translate( 3258.299999999999 0)">
+ <g id="imagingext" class="package" transform="translate( 3266.699999999999 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
- <rect class="package" x="0" width="91.19999999999999" height="120.23000000000002" y="0" style="fill:rgb(175,212,240);"/>
- <text text-anchor="middle" class="package" width="91.19999999999999" x="45.599999999999994" y="119.23000000000002">Imaging ExtenÂsions</text>
+ <rect class="package" x="0" width="100.49999999999999" height="120.23000000000002" y="0" style="fill:rgb(175,212,240);"/>
+ <text text-anchor="middle" class="package" width="100.49999999999999" x="50.24999999999999" y="119.23000000000002">Imaging ExtenÂsions</text>
<g transform="translate(0 3.2)">
<g id="imagingext_pub" transform="translate(0 0)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -4105,8 +4103,8 @@
</g>
</g>
<g id="imagingext_plat" transform="translate(17.7 0)" class="collection">
- <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
- <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">Imaging Ext. Platform InterÂfaces</text>
+ <rect class="collection" x="0" y="0" height="15.6" width="65.1"/>
+ <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="63.699999999999996" height="6.299999999999999">Imaging Ext. Platform InterÂfaces</text>
<g transform="translate(0 6.299999999999999)">
<g id="jpeg2000_icl_plugin_api" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
@@ -4138,9 +4136,14 @@
<use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">ECam Face Tracking Custom API</text>
</g>
- </g>
- </g>
- <g id="imageadaptationextensions" transform="translate(75.6 0)" class="collection">
+ <g id="ecam_use_case_hint_custom_api" class="component">
+ <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+ <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">ECam Use Case Hint Custom API</text>
+ </g>
+ </g>
+ </g>
+ <g id="imageadaptationextensions" transform="translate(84.89999999999999 0)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
<text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Image Adapt. Ext.</text>
<g transform="translate(0 6.299999999999999)">
@@ -4169,7 +4172,7 @@
</g>
</g>
</g>
- <g id="graphics" class="package" transform="translate( 3351.599999999999 0)">
+ <g id="graphics" class="package" transform="translate( 3369.299999999999 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
<rect class="package" x="0" width="95.4" height="120.23000000000002" y="0" style="fill:orange;"/>
<text text-anchor="middle" class="package" width="95.4" x="47.7" y="119.23000000000002">Graphics</text>
@@ -4460,7 +4463,7 @@
</g>
</g>
</g>
- <g id="textandloc" class="package" transform="translate( 3449.099999999999 0)">
+ <g id="textandloc" class="package" transform="translate( 3466.799999999999 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
<rect class="package" x="0" width="84.9" height="120.23000000000002" y="0" style="fill:orange;"/>
<text text-anchor="middle" class="package" width="84.9" x="42.45" y="119.23000000000002">Text & LocalisÂation Services</text>
@@ -4610,7 +4613,7 @@
</g>
</g>
</g>
- <g id="xmlsrv" class="package" transform="translate( 3536.099999999999 0)">
+ <g id="xmlsrv" class="package" transform="translate( 3553.799999999999 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
<rect class="package" x="0" width="65.1" height="120.23000000000002" y="0" style="fill:slateblue;"/>
<text text-anchor="middle" class="package" width="65.1" x="32.55" y="119.23000000000002">XML Services</text>
@@ -4701,7 +4704,7 @@
</g>
</g>
</g>
- <g id="deviceplatformrelease" class="package" transform="translate( 3603.299999999999 0)">
+ <g id="deviceplatformrelease" class="package" transform="translate( 3620.9999999999986 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
<rect class="package" x="0" width="51" height="120.23000000000002" y="0" style="fill:darkgray;"/>
<text text-anchor="middle" class="package" width="51" x="25.5" y="119.23000000000002">DevÂice Platform Release</text>
@@ -4806,7 +4809,7 @@
</g>
</g>
</g>
- <g id="osrndtools" class="package" transform="translate( 3656.3999999999987 0)">
+ <g id="osrndtools" class="package" transform="translate( 3674.0999999999985 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
<rect class="package" x="0" width="140.7" height="120.23000000000002" y="0" style="fill:darkgray;"/>
<text text-anchor="middle" class="package" width="140.7" x="70.35" y="119.23000000000002">OS R&D tools</text>
@@ -4999,7 +5002,7 @@
</g>
</g>
</g>
- <g id="mw" transform="translate(3.1999999999999993 217.83)" class="layer">
+ <g id="mw" transform="translate(3.1999999999999993 236.63)" class="layer">
<rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="222.8"/>
<text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="222.8" height="9.3" x="-111.7">Middleware</text>
<g class="layer-detail" transform="translate(12.8 3.2)">
@@ -7918,7 +7921,7 @@
<g id="presence_avabilitytext" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
<use width="9.3" height="9.3" x="232.5000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="237.15000000000012">Presence Avability Text</text>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="237.15000000000012">Presence Availbility Text</text>
</g>
</g>
</g>
@@ -7928,8 +7931,8 @@
<g transform="translate(0 6.299999999999999)"/>
</g>
<g id="imservices" transform="translate(0 18.8)" class="collection">
- <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
- <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">IM Services</text>
+ <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
+ <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">IM Services</text>
<g transform="translate(0 6.299999999999999)">
<g id="imfeatureplugin" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
@@ -7951,15 +7954,10 @@
<use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">XMPP Settings Fetcher</text>
</g>
- <g id="ossprotocoladaptation" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">OSS Protocol Adapt.</text>
- </g>
<g id="instantmessagingcache" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Instant Msg. Cache</text>
+ <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Instant Msg. Cache</text>
</g>
</g>
</g>
@@ -13171,28 +13169,17 @@
</g>
</g>
<g id="app" transform="translate(3.1999999999999993 25.2)" class="layer">
- <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="189.43"/>
- <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="189.43" height="9.3" x="-95.015">Applications</text>
- <g class="layer-detail" transform="translate(831.0499999999993 3.2)">
- <rect x="-818.2499999999993" class="layer" y="-3.2" width="4871.700000000001" height="189.43"/>
+ <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="208.23"/>
+ <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="208.23" height="9.3" x="-104.41499999999999">Applications</text>
+ <g class="layer-detail" transform="translate(826.8499999999997 3.2)">
+ <rect x="-814.0499999999997" class="layer" y="-3.2" width="4871.700000000001" height="208.23"/>
<g>
<g id="location" class="package" transform="translate( 0 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color2.mouseover" end="s8-color2.mouseout"/>
- <rect class="package" x="0" width="107.1" height="97.2" y="0" style="fill:whitesmoke;"/>
- <text text-anchor="middle" class="package" width="107.1" x="53.55" y="96.2">Location Apps</text>
- <g transform="translate(0 3.2)">
- <g id="loc_plat" transform="translate(0 0)" class="collection">
- <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
- <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Location Apps Platform Interfaces</text>
- <g transform="translate(0 6.299999999999999)">
- <g id="location_centre_api" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Location Centre API</text>
- </g>
- </g>
- </g>
- <g id="loc_pub" transform="translate(17.7 0)" class="collection">
+ <rect class="package" x="0" width="89.4" height="97.2" y="0" style="fill:whitesmoke;"/>
+ <text text-anchor="middle" class="package" width="89.4" x="44.7" y="96.2">Location Apps</text>
+ <g transform="translate(0 3.2)">
+ <g id="loc_pub" transform="translate(0 0)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
<text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Location Apps Public InterÂfaces</text>
<g transform="translate(0 6.299999999999999)">
@@ -13291,17 +13278,17 @@
</g>
</g>
</g>
- <g id="locationlandmarksrefappfors60" transform="translate(38.400000000000006 0)" class="collection placeholder">
+ <g id="locationlandmarksrefappfors60" transform="translate(20.700000000000003 0)" class="collection placeholder">
<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location LandÂmarks Ref App for S60</text>
<g transform="translate(0 6.299999999999999)"/>
</g>
- <g id="locationlandmarksuirefapp" transform="translate(56.10000000000001 0)" class="collection placeholder">
+ <g id="locationlandmarksuirefapp" transform="translate(38.400000000000006 0)" class="collection placeholder">
<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location LandÂmarks UI Ref App</text>
<g transform="translate(0 6.299999999999999)"/>
</g>
- <g id="locationsatviewrefapp" transform="translate(73.80000000000001 0)" class="collection placeholder">
+ <g id="locationsatviewrefapp" transform="translate(56.10000000000001 0)" class="collection placeholder">
<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location Satellite View Ref App</text>
<g transform="translate(0 6.299999999999999)"/>
@@ -13311,43 +13298,17 @@
<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">SimulaÂtion PSY ConfigÂurator</text>
<g transform="translate(0 6.299999999999999)"/>
</g>
- <g id="mapnavproviderrefapp" transform="translate(91.5 0)" class="collection placeholder">
+ <g id="mapnavproviderrefapp" transform="translate(73.80000000000001 0)" class="collection placeholder">
<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Map & Nav Provider Ref App</text>
<g transform="translate(0 6.299999999999999)"/>
</g>
- <g id="locationcentre" transform="translate(57.9 18.8)" class="collection">
- <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
- <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Location Centre</text>
- <g transform="translate(0 6.299999999999999)">
- <g id="lcutils" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Location Centre Utilities</text>
- </g>
- <g id="lcservice" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Location Centre Service Project</text>
- </g>
- <g id="lcserver" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Location Centre Server Project</text>
- </g>
- <g id="lcapp" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Location Centre Application</text>
- </g>
- </g>
- </g>
</g>
</g>
<g id="mmsharinguis" class="package" transform="translate( 0 100.4)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
- <rect class="package" x="0" width="55.8" height="82.63000000000001" y="0" style="fill:darkkhaki;"/>
- <text text-anchor="middle" class="package" width="55.8" x="27.9" y="81.63000000000002">MultiÂmedia Sharing UIs</text>
+ <rect class="package" x="0" width="55.8" height="101.43" y="0" style="fill:darkkhaki;"/>
+ <text text-anchor="middle" class="package" width="55.8" x="27.9" y="100.43">MultiÂmedia Sharing UIs</text>
<g transform="translate(0 3.2)">
<g id="mmsharinguis_plat" transform="translate(0 0)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
@@ -13439,10 +13400,10 @@
</g>
</g>
</g>
- <g id="phone" class="package" transform="translate( 109.19999999999999 0)">
+ <g id="phone" class="package" transform="translate( 91.5 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
- <rect class="package" x="0" width="243.9" height="183.03" y="0" style="fill:darkkhaki;"/>
- <text text-anchor="middle" class="package" width="243.9" x="121.95" y="182.03">Phone Apps</text>
+ <rect class="package" x="0" width="243.9" height="201.82999999999998" y="0" style="fill:darkkhaki;"/>
+ <text text-anchor="middle" class="package" width="243.9" x="121.95" y="200.82999999999998">Phone Apps</text>
<g transform="translate(0 3.2)">
<g id="phone_plat" transform="translate(0 0)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="158.10000000000002"/>
@@ -13702,7 +13663,7 @@
</g>
</g>
</g>
- <g id="videotelephony" class="package" transform="translate( 355.20000000000005 0)">
+ <g id="videotelephony" class="package" transform="translate( 337.5 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
<rect class="package" x="0" width="36.300000000000004" height="97.2" y="0" style="fill:darkkhaki;"/>
<text text-anchor="middle" class="package" width="36.300000000000004" x="18.150000000000002" y="96.2">Video Telephony Apps</text>
@@ -13773,7 +13734,7 @@
</g>
</g>
</g>
- <g id="iptelephony" class="package" transform="translate( 393.6 0)">
+ <g id="iptelephony" class="package" transform="translate( 375.9 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
<rect class="package" x="0" width="110.69999999999997" height="97.2" y="0" style="fill:darkkhaki;"/>
<text text-anchor="middle" class="package" width="65.09999999999997" x="78.14999999999999" y="86.2" dy="0.375em">IP Telephony</text>
@@ -13976,10 +13937,10 @@
</g>
</g>
</g>
- <g id="settingsuis" class="package" transform="translate( 355.20000000000005 100.4)">
+ <g id="settingsuis" class="package" transform="translate( 337.5 100.4)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
- <rect class="package" x="0" width="37.2" height="82.63000000000001" y="0" style="fill:darkseagreen;"/>
- <text text-anchor="middle" class="package" width="37.2" x="18.6" y="81.63000000000002">Settings UIs</text>
+ <rect class="package" x="0" width="37.2" height="101.43" y="0" style="fill:darkseagreen;"/>
+ <text text-anchor="middle" class="package" width="37.2" x="18.6" y="100.43">Settings UIs</text>
<g transform="translate(0 3.2)">
<g id="devmngt_plat" transform="translate(0 0)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
@@ -14036,14 +13997,14 @@
</g>
</g>
</g>
- <g id="contentcontrol" class="package" transform="translate( 394.50000000000006 100.4)">
+ <g id="contentcontrol" class="package" transform="translate( 376.8 100.4)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
- <rect class="package" x="0" width="48.6" height="82.63000000000001" y="0" style="fill:darkseagreen;"/>
- <text text-anchor="middle" class="package" width="48.6" x="24.3" y="81.63000000000002">Content Control Daemons</text>
+ <rect class="package" x="0" width="67.19999999999999" height="101.43" y="0" style="fill:darkseagreen;"/>
+ <text text-anchor="middle" class="package" width="67.19999999999999" x="33.599999999999994" y="100.43">Content Control Daemons</text>
<g transform="translate(0 3.2)">
<g id="contentctrl_plat" transform="translate(0 0)" class="collection">
- <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
- <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Content Control Daemons Platforn InterÂfaces</text>
+ <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
+ <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Content Control Daemons Platforn InterÂfaces</text>
<g transform="translate(0 6.299999999999999)">
<g id="oma_ds_presync_plugin_api" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
@@ -14060,6 +14021,16 @@
<use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">DS Folder Util API</text>
</g>
+ <g id="adapter_customization_api" class="component">
+ <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+ <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Adapter Customization API</text>
+ </g>
+ <g id="ds_data_modification_api" class="component">
+ <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+ <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">DS Data Modification API</text>
+ </g>
</g>
</g>
<g id="dsdcmoadapter" transform="translate(0 18.8)" class="collection placeholder">
@@ -14067,7 +14038,7 @@
<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Data Sync DCMO Adapter</text>
<g transform="translate(0 6.299999999999999)"/>
</g>
- <g id="omads" transform="translate(30.000000000000004 0)" class="collection">
+ <g id="omads" transform="translate(48.6 0)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
<text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">OMA Data Sync</text>
<g transform="translate(0 6.299999999999999)">
@@ -14085,10 +14056,10 @@
</g>
</g>
</g>
- <g id="devicecontrol" class="package" transform="translate( 445.20000000000005 100.4)">
+ <g id="devicecontrol" class="package" transform="translate( 446.1 100.4)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
- <rect class="package" x="0" width="101.39999999999998" height="82.63000000000001" y="0" style="fill:darkseagreen;"/>
- <text text-anchor="middle" class="package" width="101.39999999999998" x="50.69999999999999" y="81.63000000000002">DevÂice Control Daemons</text>
+ <rect class="package" x="0" width="95.1" height="101.43" y="0" style="fill:darkseagreen;"/>
+ <text text-anchor="middle" class="package" width="95.1" x="47.55" y="100.43">DevÂice Control Daemons</text>
<g transform="translate(0 3.2)">
<g id="devicediagnostics" transform="translate(0 0)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
@@ -14185,8 +14156,8 @@
</g>
</g>
<g id="customization" transform="translate(17.7 18.8)" class="collection">
- <rect class="collection" x="0" y="0" height="15.6" width="83.69999999999999"/>
- <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="82.29999999999998" height="6.299999999999999">DM CustomÂization Adapters</text>
+ <rect class="collection" x="0" y="0" height="15.6" width="74.39999999999999"/>
+ <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="72.99999999999999" height="6.299999999999999">DM CustomÂization Adapters</text>
<g transform="translate(0 6.299999999999999)">
<g id="dmutils" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
@@ -14198,40 +14169,35 @@
<use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">UI Settings Server</text>
</g>
- <g id="isadapter" class="component">
+ <g id="supadapter" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
<use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Idle State Adapter</text>
- </g>
- <g id="supadapter" class="component">
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Startup Adapter</text>
+ </g>
+ <g id="wallpaperadapter" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
<use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Startup Adapter</text>
- </g>
- <g id="wallpaperadapter" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Wallpaper Adapter</text>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Wallpaper Adapter</text>
</g>
<g id="operatorlogoadapter" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Operator Logo Adapter</text>
+ <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Operator Logo Adapter</text>
</g>
<g id="screensaveradapter" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Screen Saver Adapter</text>
+ <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Screen Saver Adapter</text>
</g>
<g id="themesadapter" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Themes Adapter</text>
+ <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Themes Adapter</text>
</g>
<g id="embeddedlinkadapter" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Embedded Link Adapter</text>
+ <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Embedded Link Adapter</text>
</g>
</g>
</g>
@@ -14248,10 +14214,10 @@
</g>
</g>
</g>
- <g id="printing" class="package" transform="translate( 548.7 100.4)">
+ <g id="printing" class="package" transform="translate( 543.3000000000001 100.4)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
- <rect class="package" x="0" width="57.900000000000006" height="82.63000000000001" y="0" style="fill:orchid;"/>
- <text text-anchor="middle" class="package" width="57.900000000000006" x="28.950000000000003" y="81.63000000000002">Printing</text>
+ <rect class="package" x="0" width="57.900000000000006" height="101.43" y="0" style="fill:orchid;"/>
+ <text text-anchor="middle" class="package" width="57.900000000000006" x="28.950000000000003" y="100.43">Printing</text>
<g transform="translate(0 3.2)">
<g id="DirectPrint" transform="translate(0 0)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
@@ -14297,7 +14263,7 @@
</g>
</g>
</g>
- <g id="files" class="package" transform="translate( 506.4 0)">
+ <g id="files" class="package" transform="translate( 488.69999999999993 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
<rect class="package" x="0" width="67.19999999999999" height="97.2" y="0" style="fill:lightpink;"/>
<text text-anchor="middle" class="package" width="67.19999999999999" x="33.599999999999994" y="96.2">File Manager Apps</text>
@@ -14367,14 +14333,14 @@
</g>
</g>
</g>
- <g id="utils" class="package" transform="translate( 575.6999999999999 0)">
+ <g id="utils" class="package" transform="translate( 557.9999999999999 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
<rect class="package" x="0" width="27.900000000000002" height="97.2" y="0" style="fill:lightpink;"/>
<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="96.2">Utility Apps</text>
<g transform="translate(0 3.2)">
<g id="extras" transform="translate(0 0)" class="collection">
- <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
- <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Extras</text>
+ <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+ <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Extras</text>
<g transform="translate(0 6.299999999999999)">
<g id="about" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
@@ -14386,19 +14352,14 @@
<use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Calculator App</text>
</g>
- <g id="converter" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Unit Converter</text>
- </g>
- </g>
- </g>
- </g>
- </g>
- <g id="contacts" class="package" transform="translate( 608.7 0)">
+ </g>
+ </g>
+ </g>
+ </g>
+ <g id="contacts" class="package" transform="translate( 603.3000000000001 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
- <rect class="package" x="0" width="569.7000000000004" height="183.03" y="0" style="fill:lightpink;"/>
- <text text-anchor="middle" class="package" width="569.7000000000004" x="284.8500000000002" y="182.03">Contacts Apps</text>
+ <rect class="package" x="0" width="569.7000000000004" height="201.82999999999998" y="0" style="fill:lightpink;"/>
+ <text text-anchor="middle" class="package" width="569.7000000000004" x="284.8500000000002" y="200.82999999999998">Contacts Apps</text>
<g transform="translate(0 3.2)">
<g id="contacts_pub" transform="translate(0 0)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="65.1"/>
@@ -14822,10 +14783,10 @@
</g>
</g>
</g>
- <g id="organizer" class="package" transform="translate( 1180.5000000000005 0)">
+ <g id="organizer" class="package" transform="translate( 1175.1000000000004 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
- <rect class="package" x="0" width="289.80000000000007" height="183.03" y="0" style="fill:lightpink;"/>
- <text text-anchor="middle" class="package" width="289.80000000000007" x="144.90000000000003" y="182.03">Organizer App Suite</text>
+ <rect class="package" x="0" width="289.80000000000007" height="201.82999999999998" y="0" style="fill:lightpink;"/>
+ <text text-anchor="middle" class="package" width="289.80000000000007" x="144.90000000000003" y="200.82999999999998">Organizer App Suite</text>
<g transform="translate(0 3.2)">
<g id="organizer_plat" transform="translate(0 0)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="186.00000000000006"/>
@@ -15238,10 +15199,10 @@
</g>
</g>
</g>
- <g id="messaging" class="package" transform="translate( 1472.4000000000005 0)">
+ <g id="messaging" class="package" transform="translate( 1467.0000000000005 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
- <rect class="package" x="0" width="356.7000000000001" height="183.03" y="0" style="fill:lightpink;"/>
- <text text-anchor="middle" class="package" width="356.7000000000001" x="178.35000000000005" y="182.03">MessagÂing Apps</text>
+ <rect class="package" x="0" width="356.7000000000001" height="201.82999999999998" y="0" style="fill:lightpink;"/>
+ <text text-anchor="middle" class="package" width="356.7000000000001" x="178.35000000000005" y="200.82999999999998">MessagÂing Apps</text>
<g transform="translate(0 3.2)">
<g id="msg_pub" transform="translate(0 0)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
@@ -15583,10 +15544,10 @@
</g>
</g>
</g>
- <g id="commonemail" class="package" transform="translate( 1831.2000000000007 0)">
+ <g id="commonemail" class="package" transform="translate( 1825.8000000000006 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
- <rect class="package" x="0" width="148.8" height="183.03" y="0" style="fill:lightpink;"/>
- <text text-anchor="middle" class="package" width="148.8" x="74.4" y="182.03">Email Apps</text>
+ <rect class="package" x="0" width="148.8" height="201.82999999999998" y="0" style="fill:lightpink;"/>
+ <text text-anchor="middle" class="package" width="148.8" x="74.4" y="200.82999999999998">Email Apps</text>
<g transform="translate(0 3.2)">
<g id="email_pub" transform="translate(0 0)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -15807,7 +15768,7 @@
</g>
</g>
</g>
- <g id="conversations" class="package" transform="translate( 1982.1000000000008 0)">
+ <g id="conversations" class="package" transform="translate( 1976.7000000000007 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
<rect class="package" x="0" width="106.50000000000001" height="97.2" y="0" style="fill:lightpink;"/>
<text text-anchor="middle" class="package" width="106.50000000000001" x="53.25000000000001" y="96.2">ConversaÂtion Apps</text>
@@ -15933,7 +15894,7 @@
</g>
</g>
</g>
- <g id="im" class="package" transform="translate( 2090.7000000000007 0)">
+ <g id="im" class="package" transform="translate( 2085.3000000000006 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
<rect class="package" x="0" width="27.900000000000002" height="97.2" y="0" style="fill:lightpink;"/>
<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="96.2">Instant Msg. Apps</text>
@@ -15956,10 +15917,10 @@
</g>
</g>
</g>
- <g id="dictionary" class="package" transform="translate( 1982.1000000000008 100.4)">
+ <g id="dictionary" class="package" transform="translate( 1976.7000000000007 100.4)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
- <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:lightpink;"/>
- <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000002">DictioÂnary</text>
+ <rect class="package" x="0" width="33.3" height="101.43" y="0" style="fill:lightpink;"/>
+ <text text-anchor="middle" class="package" width="33.3" x="16.65" y="100.43">DictioÂnary</text>
<g transform="translate(0 3.2)">
<g id="dictionary_plat" transform="translate(0 0)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -15979,7 +15940,7 @@
</g>
</g>
</g>
- <g id="camera" class="package" transform="translate( 2120.7000000000007 0)">
+ <g id="camera" class="package" transform="translate( 2115.3000000000006 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
<rect class="package" x="0" width="39.300000000000004" height="97.2" y="0" style="fill:#ffff00;"/>
<text text-anchor="middle" class="package" width="39.300000000000004" x="19.650000000000002" y="96.2">Camera Apps</text>
@@ -16018,7 +15979,7 @@
</g>
</g>
</g>
- <g id="imgeditor" class="package" transform="translate( 2162.100000000001 0)">
+ <g id="imgeditor" class="package" transform="translate( 2156.7000000000007 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
<rect class="package" x="0" width="113.69999999999999" height="97.2" y="0" style="fill:#ffff00;"/>
<text text-anchor="middle" class="package" width="113.69999999999999" x="56.849999999999994" y="96.2">Image Editor Apps</text>
@@ -16123,92 +16084,7 @@
</g>
</g>
</g>
- <g id="videoeditor" class="package" transform="translate( 2277.900000000001 0)">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
- <rect class="package" x="0" width="64.2" height="97.2" y="0" style="fill:#ffff00;"/>
- <text text-anchor="middle" class="package" width="64.2" x="32.1" y="96.2">Video Editor Apps</text>
- <g transform="translate(0 3.2)">
- <g id="videoeditor_plat" transform="translate(0 0)" class="collection">
- <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
- <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Video Editor Apps Platform InterÂfaces</text>
- <g transform="translate(0 6.299999999999999)">
- <g id="video_editor_engine_api" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
- <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Video Editor Engine API</text>
- </g>
- </g>
- </g>
- <g id="videditor" transform="translate(17.7 0)" class="collection">
- <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
- <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Video Editor</text>
- <g transform="translate(0 6.299999999999999)">
- <g id="videoeditorcommon" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Video Editor Common</text>
- </g>
- <g id="videoeditoruicomponents" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Video Editor UI Cmp.</text>
- </g>
- <g id="simplevideoeditor" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Simple Video Editor</text>
- </g>
- <g id="simplecutvideo" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Simple Cut Video</text>
- </g>
- <g id="videoprovider" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Video Provider</text>
- </g>
- </g>
- </g>
- <g id="videoeditorengine" transform="translate(0 18.8)" class="collection">
- <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
- <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">Video Editor Engine</text>
- <g transform="translate(0 6.299999999999999)">
- <g id="audioeditorengine" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Audio Editor Engine</text>
- </g>
- <g id="avcedit" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">AVC Editing</text>
- </g>
- <g id="h263decoder" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">H.263 Decoder</text>
- </g>
- <g id="mp3aacmaniplib" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">MP3 & AAC Manipulation Library</text>
- </g>
- <g id="vedtranscoder" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Video Editor Transcoder</text>
- </g>
- <g id="vedengine" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Video Editor Engine</text>
- </g>
- </g>
- </g>
- </g>
- </g>
- <g id="videoplayer" class="package" transform="translate( 2344.200000000001 0)">
+ <g id="videoplayer" class="package" transform="translate( 2272.500000000001 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
<rect class="package" x="0" width="206.70000000000002" height="97.2" y="0" style="fill:#ffff00;"/>
<text text-anchor="middle" class="package" width="178.8" x="117.30000000000001" y="11" dy="0.375em">Video Player Apps</text>
@@ -16458,7 +16334,7 @@
</g>
</g>
</g>
- <g id="photos" class="package" transform="translate( 2553.0000000000014 0)">
+ <g id="photos" class="package" transform="translate( 2481.300000000001 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
<rect class="package" x="0" width="160.19999999999996" height="97.2" y="0" style="fill:#ffff00;"/>
<text text-anchor="middle" class="package" width="160.19999999999996" x="80.09999999999998" y="96.2">Photos</text>
@@ -16562,7 +16438,7 @@
</g>
</g>
</g>
- <g id="musicplayer" class="package" transform="translate( 2715.3000000000015 0)">
+ <g id="musicplayer" class="package" transform="translate( 2643.600000000001 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
<rect class="package" x="0" width="132.29999999999998" height="97.2" y="0" style="fill:#ffff00;"/>
<text text-anchor="middle" class="package" width="132.29999999999998" x="66.14999999999999" y="96.2">Music Player Apps</text>
@@ -16672,7 +16548,7 @@
</g>
</g>
</g>
- <g id="radio" class="package" transform="translate( 2849.7000000000016 0)">
+ <g id="radio" class="package" transform="translate( 2778.000000000001 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
<rect class="package" x="0" width="55.8" height="97.2" y="0" style="fill:#ffff00;"/>
<text text-anchor="middle" class="package" width="55.8" x="27.9" y="96.2">Radio Apps</text>
@@ -16715,7 +16591,13 @@
</g>
</g>
</g>
- <g id="voicerec" class="package" transform="translate( 2907.6000000000017 0)">
+ <g id="podcatcher" class="package placeholder" transform="translate( 2835.900000000001 0)">
+ <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
+ <rect class="package" x="0" width="78" height="97.2" y="0" style="fill:#ffff00;"/>
+ <text text-anchor="middle" class="package" width="78" x="39" y="47.6" dy="0.375em" height="15.600000000000001">Podcatcher</text>
+ <g transform="translate(0 3.2)"/>
+ </g>
+ <g id="voicerec" class="package" transform="translate( 2916.000000000001 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
<rect class="package" x="0" width="36.300000000000004" height="97.2" y="0" style="fill:#ffff00;"/>
<text text-anchor="middle" class="package" width="36.300000000000004" x="18.150000000000002" y="96.2">Voice Recorder Apps</text>
@@ -16743,13 +16625,13 @@
</g>
</g>
</g>
- <g id="screensaver" class="package placeholder" transform="translate( 2946.000000000002 0)">
+ <g id="screensaver" class="package placeholder" transform="translate( 2954.400000000001 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
<rect class="package" x="0" width="78" height="97.2" y="0" style="fill:orange;"/>
<text text-anchor="middle" class="package" width="78" x="39" y="47.6" dy="0.375em" height="45.03">Screen Saver Apps</text>
<g transform="translate(0 3.2)"/>
</g>
- <g id="homescreen" class="package" transform="translate( 3026.1000000000017 0)">
+ <g id="homescreen" class="package" transform="translate( 3034.500000000001 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
<rect class="package" x="0" width="113.69999999999999" height="97.2" y="0" style="fill:orange;"/>
<text text-anchor="middle" class="package" width="113.69999999999999" x="56.849999999999994" y="96.2">Home Screen Apps</text>
@@ -16865,10 +16747,10 @@
</g>
</g>
</g>
- <g id="graphicsuis" class="package" transform="translate( 2017.500000000001 100.4)">
+ <g id="graphicsuis" class="package" transform="translate( 2012.1000000000008 100.4)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
- <rect class="package" x="0" width="45.6" height="82.63000000000001" y="0" style="fill:orange;"/>
- <text text-anchor="middle" class="package" width="45.6" x="22.8" y="81.63000000000002">Graphics UIs</text>
+ <rect class="package" x="0" width="45.6" height="101.43" y="0" style="fill:orange;"/>
+ <text text-anchor="middle" class="package" width="45.6" x="22.8" y="100.43">Graphics UIs</text>
<g transform="translate(0 3.2)">
<g id="graphicsuis_plat" transform="translate(0 0)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
@@ -16904,7 +16786,7 @@
</g>
</g>
</g>
- <g id="profile" class="package" transform="translate( 3141.900000000002 0)">
+ <g id="profile" class="package" transform="translate( 3150.300000000001 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
<rect class="package" x="0" width="33.3" height="97.2" y="0" style="fill:orange;"/>
<text text-anchor="middle" class="package" width="33.3" x="16.65" y="96.2">Profiles</text>
@@ -16938,10 +16820,10 @@
</g>
</g>
</g>
- <g id="speechsrv" class="package" transform="translate( 2065.2000000000007 100.4)">
+ <g id="speechsrv" class="package" transform="translate( 2059.8000000000006 100.4)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
- <rect class="package" x="0" width="290.40000000000015" height="82.63000000000001" y="0" style="fill:orange;"/>
- <text text-anchor="middle" class="package" width="290.40000000000015" x="145.20000000000007" y="81.63000000000002">Speech RecogÂnition UIs</text>
+ <rect class="package" x="0" width="290.40000000000015" height="101.43" y="0" style="fill:orange;"/>
+ <text text-anchor="middle" class="package" width="290.40000000000015" x="145.20000000000007" y="100.43">Speech RecogÂnition UIs</text>
<g transform="translate(0 3.2)">
<g id="speechsrv_plat" transform="translate(0 0)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="251.10000000000014"/>
@@ -17218,10 +17100,10 @@
</g>
</g>
</g>
- <g id="homescreentools" class="package" transform="translate( 2357.7000000000007 100.4)">
+ <g id="homescreentools" class="package" transform="translate( 2352.3000000000006 100.4)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
- <rect class="package" x="0" width="54" height="82.63000000000001" y="0" style="fill:orange;"/>
- <text text-anchor="middle" class="package" width="54" x="27" y="81.63000000000002">Home Screen Tools</text>
+ <rect class="package" x="0" width="54" height="101.43" y="0" style="fill:orange;"/>
+ <text text-anchor="middle" class="package" width="54" x="27" y="100.43">Home Screen Tools</text>
<g transform="translate(0 3.2)">
<g id="dtdinstaller" transform="translate(0 0)" class="collection placeholder">
<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -17251,10 +17133,10 @@
</g>
</g>
</g>
- <g id="webuis" class="package" transform="translate( 2413.8000000000006 100.4)">
+ <g id="webuis" class="package" transform="translate( 2408.4000000000005 100.4)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
- <rect class="package" x="0" width="36.300000000000004" height="82.63000000000001" y="0" style="fill:slateblue;"/>
- <text text-anchor="middle" class="package" width="36.300000000000004" x="18.150000000000002" y="81.63000000000002">Web UIs</text>
+ <rect class="package" x="0" width="36.300000000000004" height="101.43" y="0" style="fill:slateblue;"/>
+ <text text-anchor="middle" class="package" width="36.300000000000004" x="18.150000000000002" y="100.43">Web UIs</text>
<g transform="translate(0 3.2)">
<g id="browserui" transform="translate(0 0)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
@@ -17306,12 +17188,12 @@
</g>
</g>
</g>
- <g id="jrt" class="package" transform="translate( 2452.2000000000007 100.4)">
+ <g id="jrt" class="package" transform="translate( 2446.8000000000006 100.4)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
- <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:slateblue;"/>
- <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000002">Java Runtime</text>
- <g transform="translate(0 3.2)">
- <g id="jrt_plat" transform="translate(0 0)" class="collection">
+ <rect class="package" x="0" width="27.900000000000002" height="101.43" y="0" style="fill:slateblue;"/>
+ <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="100.43">Java Runtime</text>
+ <g transform="translate(0 3.2)">
+ <g id="jrt_plat" transform="translate(0 18.8)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
<text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">JRT Platform Interfaces</text>
<g transform="translate(0 6.299999999999999)">
@@ -17332,17 +17214,23 @@
</g>
</g>
</g>
- <g id="java_stubs" transform="translate(0 56.400000000000006)" class="collection placeholder">
- <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
- <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Java Stubs</text>
- <g transform="translate(0 6.299999999999999)"/>
- </g>
- </g>
- </g>
- <g id="conntools" class="package" transform="translate( 2482.2000000000007 100.4)">
+ <g id="jrt_info" transform="translate(0 0)" class="collection">
+ <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+ <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">jrt_info</text>
+ <g transform="translate(0 6.299999999999999)">
+ <g id="sf" class="component">
+ <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+ <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">sf</text>
+ </g>
+ </g>
+ </g>
+ </g>
+ </g>
+ <g id="conntools" class="package" transform="translate( 2476.8000000000006 100.4)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
- <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:moccasin;"/>
- <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000002">ConnectÂivity Tools</text>
+ <rect class="package" x="0" width="27.900000000000002" height="101.43" y="0" style="fill:moccasin;"/>
+ <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="100.43">ConnectÂivity Tools</text>
<g transform="translate(0 3.2)">
<g id="nettools" transform="translate(0 0)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -17363,10 +17251,10 @@
</g>
</g>
</g>
- <g id="rndtools" class="package" transform="translate( 2512.2000000000007 100.4)">
+ <g id="rndtools" class="package" transform="translate( 2506.8000000000006 100.4)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
- <rect class="package" x="0" width="81.9" height="82.63000000000001" y="0" style="fill:darkgray;"/>
- <text text-anchor="middle" class="package" width="81.9" x="40.95" y="81.63000000000002">R&D tools</text>
+ <rect class="package" x="0" width="72.60000000000001" height="101.43" y="0" style="fill:darkgray;"/>
+ <text text-anchor="middle" class="package" width="72.60000000000001" x="36.300000000000004" y="100.43">R&D tools</text>
<g transform="translate(0 3.2)">
<g id="creator" transform="translate(0 56.400000000000006)" class="collection placeholder">
<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -17415,47 +17303,41 @@
<g transform="translate(0 6.299999999999999)"/>
</g>
<g id="htiui" transform="translate(35.4 37.6)" class="collection">
- <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
- <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Harmonized Test InterÂface UI</text>
- <g transform="translate(0 6.299999999999999)">
- <g id="HtiCommPlugins" class="component">
+ <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
+ <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Harmonized Test InterÂface UI</text>
+ <g transform="translate(0 6.299999999999999)">
+ <g id="HtiServicePlugins" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
<use width="9.3" height="9.3" x="0" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
<use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#BorderShape2"/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">HTI Comm Plugins</text>
- </g>
- <g id="HtiServicePlugins" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
- <use width="9.3" height="9.3" x="9.3" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#BorderShape2"/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">HTI Service Plugins</text>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">HTI Service Plugins</text>
</g>
<g id="htidevicereboot" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+ <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
+ <use width="9.3" height="9.3" x="9.3" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">HTI DevÂice Reboot</text>
+ </g>
+ <g id="htistartupwait" class="component">
+ <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
<use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
<use width="9.3" height="9.3" x="18.6" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">HTI DevÂice Reboot</text>
- </g>
- <g id="htistartupwait" class="component">
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">HTI Startup Wait</text>
+ </g>
+ <g id="htiadmin" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
<use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
<use width="9.3" height="9.3" x="27.900000000000002" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">HTI Startup Wait</text>
- </g>
- <g id="htiadmin" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <use width="9.3" height="9.3" x="37.2" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">HTI Admin</text>
- </g>
- </g>
- </g>
- </g>
- </g>
- <g id="helps" class="package" transform="translate( 3177.300000000002 0)">
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">HTI Admin</text>
+ </g>
+ </g>
+ </g>
+ </g>
+ </g>
+ <g id="helps" class="package" transform="translate( 3185.700000000001 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
- <rect class="package" x="0" width="27.900000000000002" height="183.03" y="0" style="fill:orange;"/>
- <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="182.03">Help Apps</text>
+ <rect class="package" x="0" width="27.900000000000002" height="201.82999999999998" y="0" style="fill:orange;"/>
+ <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="200.82999999999998">Help Apps</text>
<g transform="translate(0 3.2)">
<g id="csxhelp" transform="translate(0 18.8)" class="collection placeholder">
<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -17487,10 +17369,10 @@
</g>
</g>
</g>
- <g id="techview" class="package" transform="translate( 3207.300000000002 0)">
+ <g id="techview" class="package" transform="translate( 3215.700000000001 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
- <rect class="package" x="0" width="27.900000000000002" height="183.03" y="0" style="fill:orange;"/>
- <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="182.03">Techview</text>
+ <rect class="package" x="0" width="27.900000000000002" height="201.82999999999998" y="0" style="fill:orange;"/>
+ <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="200.82999999999998">Techview</text>
<g transform="translate(0 3.2)">
<g id="buildverification" transform="translate(0 94)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
@@ -17541,7 +17423,7 @@
</g>
</g>
</g>
- <g id="legend-root" class="legend" transform="translate(4587.579500000001 681.49) translate(303.3205 0) scale(12.899622676344002) translate(-303.3205)">
+ <g id="legend-root" class="legend" transform="translate(4587.579500000001 700.29) translate(303.3205 0) scale(12.899622676344002) translate(-303.3205)">
<text text-anchor="middle" class="title" x="286.98525" y="0">
<tspan dy="0.75em" x="286.98525">Symbian OS ^3</tspan>
<tspan dy="1em" x="286.98525">System Model</tspan>
@@ -17632,7 +17514,7 @@
<g id="s4-overlay0" class="cmp placeholder">
<use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:grey;stroke-width: 0.5;"/>
<use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Test CompoÂnent (139)</text>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Test CompoÂnent (135)</text>
</g>
</g>
</g>
@@ -17641,7 +17523,7 @@
<g id="s5-overlay1" class="cmp placeholder">
<use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:grey;stroke-width: 0.5;"/>
<use width="9.3" height="9.3" x="0" y="0" style="fill:url(#PatternOverlay4); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">DepreÂcated in TB 9.1 (4)</text>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">DepreÂcated in TB 9.1 (5)</text>
</g>
</g>
</g>
@@ -17666,8 +17548,8 @@
</g>
<text text-anchor="middle" class="label" dy="0.375em" x="250.875" y="4.65">
<tspan dy="-1em" x="250.875">108 Packages</tspan>
- <tspan dy="1em" x="250.875">599 Collections</tspan>
- <tspan dy="1em" x="250.875">2537 Components</tspan>
+ <tspan dy="1em" x="250.875">594 Collections</tspan>
+ <tspan dy="1em" x="250.875">2520 Components</tspan>
</text>
</g>
</g>
--- a/symbian3/single/sysdefs/sf3pkg.svg Wed May 05 12:21:47 2010 +0100
+++ b/symbian3/single/sysdefs/sf3pkg.svg Tue Jul 13 12:21:44 2010 +0100
@@ -863,8 +863,8 @@
<g id="app" transform="translate(3.1999999999999993 0)" class="layer">
<rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="166.4"/>
<text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="166.4" height="9.3" x="-83.5">Applications</text>
- <g class="layer-detail" transform="translate(12.8 3.2)">
- <rect x="0" class="layer" y="-3.2" width="2080.499999999999" height="166.4"/>
+ <g class="layer-detail" transform="translate(52.850000000000065 3.2)">
+ <rect x="-40.05000000000007" class="layer" y="-3.2" width="2080.499999999999" height="166.4"/>
<g>
<g id="location" class="package" transform="translate( 0 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color2.mouseover" end="s8-color2.mouseout"/>
@@ -986,121 +986,109 @@
<text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="40.8">Image Editor Apps</text>
<g transform="translate(0 3.2)"/>
</g>
- <g id="videoeditor" class="package" transform="translate( 1121.3999999999999 0)">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
- <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:#ffff00;"/>
- <text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="40.8">Video Editor Apps</text>
- <g transform="translate(0 3.2)"/>
- </g>
- <g id="videoplayer" class="package" transform="translate( 1201.4999999999998 0)">
+ <g id="videoplayer" class="package" transform="translate( 1121.3999999999999 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
<rect class="package" x="0" width="78" height="78.4" y="0" style="fill:#ffff00;"/>
<text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="78.4">Video Player Apps</text>
<g transform="translate(0 3.2)"/>
</g>
- <g id="photos" class="package" transform="translate( 1281.5999999999997 0)">
+ <g id="photos" class="package" transform="translate( 1201.4999999999998 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
<rect class="package" x="0" width="78" height="78.4" y="0" style="fill:#ffff00;"/>
<text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="78.4">Photos</text>
<g transform="translate(0 3.2)"/>
</g>
- <g id="musicplayer" class="package" transform="translate( 1361.6999999999996 0)">
+ <g id="musicplayer" class="package" transform="translate( 1281.5999999999997 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
<rect class="package" x="0" width="78" height="78.4" y="0" style="fill:#ffff00;"/>
<text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="78.4">Music Player Apps</text>
<g transform="translate(0 3.2)"/>
</g>
- <g id="radio" class="package" transform="translate( 1441.7999999999995 0)">
+ <g id="radio" class="package" transform="translate( 1361.6999999999996 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
<rect class="package" x="0" width="78" height="78.4" y="0" style="fill:#ffff00;"/>
<text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="40.8">Radio Apps</text>
<g transform="translate(0 3.2)"/>
</g>
- <g id="internetradio" class="package placeholder" transform="translate( 1521.8999999999994 0)">
+ <g id="podcatcher" class="package" transform="translate( 1441.7999999999995 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
<rect class="package" x="0" width="78" height="78.4" y="0" style="fill:#ffff00;"/>
- <text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="15.600000000000001">Internet Radio Apps</text>
+ <text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="15.600000000000001">Podcatcher</text>
<g transform="translate(0 3.2)"/>
</g>
- <g id="tv" class="package placeholder" transform="translate( 881.1000000000001 81.60000000000001)">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
- <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:#ffff00;"/>
- <text text-anchor="middle" class="package" width="78" x="39" y="38.19999999999999" dy="0.375em" height="15.600000000000001">TV Apps</text>
- <g transform="translate(0 3.2)"/>
- </g>
- <g id="voicerec" class="package" transform="translate( 1601.9999999999993 0)">
+ <g id="voicerec" class="package" transform="translate( 1521.8999999999994 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
<rect class="package" x="0" width="78" height="78.4" y="0" style="fill:#ffff00;"/>
<text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="15.600000000000001">Voice Recorder Apps</text>
<g transform="translate(0 3.2)"/>
</g>
- <g id="screensaver" class="package" transform="translate( 1682.0999999999992 0)">
+ <g id="screensaver" class="package" transform="translate( 1601.9999999999993 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
<rect class="package" x="0" width="78" height="78.4" y="0" style="fill:orange;"/>
<text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="40.8">Screen Saver Apps</text>
<g transform="translate(0 3.2)"/>
</g>
- <g id="homescreen" class="package" transform="translate( 1762.1999999999991 0)">
+ <g id="homescreen" class="package" transform="translate( 1682.0999999999992 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
<rect class="package" x="0" width="78" height="78.4" y="0" style="fill:orange;"/>
<text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="59.6">Home Screen Apps</text>
<g transform="translate(0 3.2)"/>
</g>
- <g id="graphicsuis" class="package" transform="translate( 961.2000000000002 81.60000000000001)">
+ <g id="graphicsuis" class="package" transform="translate( 881.1000000000001 81.60000000000001)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
<rect class="package" x="0" width="78" height="78.4" y="0" style="fill:orange;"/>
<text text-anchor="middle" class="package" width="78" x="39" y="38.19999999999999" dy="0.375em" height="40.8">Graphics UIs</text>
<g transform="translate(0 3.2)"/>
</g>
- <g id="profile" class="package" transform="translate( 1842.299999999999 0)">
+ <g id="profile" class="package" transform="translate( 1762.1999999999991 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
<rect class="package" x="0" width="78" height="78.4" y="0" style="fill:orange;"/>
<text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="15.600000000000001">Profiles</text>
<g transform="translate(0 3.2)"/>
</g>
- <g id="speechsrv" class="package" transform="translate( 1041.3 81.60000000000001)">
+ <g id="speechsrv" class="package" transform="translate( 961.2000000000002 81.60000000000001)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
<rect class="package" x="0" width="78" height="78.4" y="0" style="fill:orange;"/>
<text text-anchor="middle" class="package" width="78" x="39" y="38.19999999999999" dy="0.375em" height="59.6">Speech RecogÂnition UIs</text>
<g transform="translate(0 3.2)"/>
</g>
- <g id="homescreentools" class="package" transform="translate( 1121.3999999999999 81.60000000000001)">
+ <g id="homescreentools" class="package" transform="translate( 1041.3 81.60000000000001)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
<rect class="package" x="0" width="78" height="78.4" y="0" style="fill:orange;"/>
<text text-anchor="middle" class="package" width="78" x="39" y="38.19999999999999" dy="0.375em" height="40.8">Home Screen Tools</text>
<g transform="translate(0 3.2)"/>
</g>
- <g id="webuis" class="package" transform="translate( 1201.4999999999998 81.60000000000001)">
+ <g id="webuis" class="package" transform="translate( 1121.3999999999999 81.60000000000001)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
<rect class="package" x="0" width="78" height="78.4" y="0" style="fill:slateblue;"/>
<text text-anchor="middle" class="package" width="78" x="39" y="38.19999999999999" dy="0.375em" height="40.8">Web UIs</text>
<g transform="translate(0 3.2)"/>
</g>
- <g id="jrt" class="package" transform="translate( 1281.5999999999997 81.60000000000001)">
+ <g id="jrt" class="package" transform="translate( 1201.4999999999998 81.60000000000001)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
<rect class="package" x="0" width="78" height="78.4" y="0" style="fill:slateblue;"/>
<text text-anchor="middle" class="package" width="78" x="39" y="38.19999999999999" dy="0.375em" height="78.4">Java Runtime</text>
<g transform="translate(0 3.2)"/>
</g>
- <g id="conntools" class="package" transform="translate( 1361.6999999999996 81.60000000000001)">
+ <g id="conntools" class="package" transform="translate( 1281.5999999999997 81.60000000000001)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
<rect class="package" x="0" width="78" height="78.4" y="0" style="fill:moccasin;"/>
<text text-anchor="middle" class="package" width="78" x="39" y="38.19999999999999" dy="0.375em" height="40.8">ConnectÂivity Tools</text>
<g transform="translate(0 3.2)"/>
</g>
- <g id="rndtools" class="package" transform="translate( 1441.7999999999995 81.60000000000001)">
+ <g id="rndtools" class="package" transform="translate( 1361.6999999999996 81.60000000000001)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
<rect class="package" x="0" width="78" height="78.4" y="0" style="fill:darkgray;"/>
<text text-anchor="middle" class="package" width="78" x="39" y="38.19999999999999" dy="0.375em" height="78.4">R&D tools</text>
<g transform="translate(0 3.2)"/>
</g>
- <g id="helps" class="package" transform="translate( 1922.399999999999 0)">
+ <g id="helps" class="package" transform="translate( 1842.299999999999 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
<rect class="package" x="0" width="78" height="160" y="0" style="fill:orange;"/>
<text text-anchor="middle" class="package" width="78" x="39" y="79" dy="0.375em" height="78.4">Help Apps</text>
<g transform="translate(0 3.2)"/>
</g>
- <g id="techview" class="package" transform="translate( 2002.4999999999989 0)">
+ <g id="techview" class="package" transform="translate( 1922.399999999999 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
<rect class="package" x="0" width="78" height="160" y="0" style="fill:orange;"/>
<text text-anchor="middle" class="package" width="78" x="39" y="79" dy="0.375em" height="116.00000000000001">Techview</text>
@@ -1160,7 +1148,7 @@
</g>
<g id="s8-color9">
<rect class="cbox" height="3.1" width="15.5" fill="#ffff00" x="154.5" y="-0.0000000000000002220446049250313"/>
- <text text-anchor="middle" class="cbox" width="15.5" dy="0.375em" x="162.25" y="1.5499999999999998">Multimedia Apps (10)</text>
+ <text text-anchor="middle" class="cbox" width="15.5" dy="0.375em" x="162.25" y="1.5499999999999998">Multimedia Apps (8)</text>
</g>
<g id="s8-color10">
<rect class="cbox" height="3.1" width="15.5" fill="orange" x="170" y="-0.0000000000000002220446049250313"/>
@@ -1177,7 +1165,7 @@
</g>
</g>
<text text-anchor="middle" class="label" dy="0.375em" x="241.82" y="1.5499999999999998">
- <tspan dy="0em" x="241.82">109 Packages</tspan>
+ <tspan dy="0em" x="241.82">107 Packages</tspan>
</text>
</g>
</g>
--- a/symbian3/single/sysdefs/system_model.xml Wed May 05 12:21:47 2010 +0100
+++ b/symbian3/single/sysdefs/system_model.xml Tue Jul 13 12:21:44 2010 +0100
@@ -1,77 +1,77 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a package or prebuilt -->
-<!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) "N"
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile may someday be removed in favour of mrp -->
-<!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED
->
-]>
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
<SystemDefinition schema="2.0.1" name="Symbian^3">
<systemModel>
<layer name="adaptation" long-name="Adaptation" levels="low mw high">
@@ -195,6 +195,14 @@
<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
</component>
+<component name="usbdescriptors" long-name="USB Descriptors" purpose="optional">
+<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors" mrp="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors/base_drivers_usbdescriptors.mrp"/>
+</component>
+<component name="usbdi_utils" long-name="USB DI Utils" purpose="optional">
+<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils" mrp="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils/base_drivers_usbdi_utils.mrp"/>
+</component>
</collection>
<collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
<component name="mediadrivers" long-name="Media Drivers" purpose="optional">
@@ -645,7 +653,7 @@
<unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
</component>
<component name="ofdbus_rom" filter="s60" long-name="D-Bus ROM">
-<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory
+<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory
Consider moving IBY file to one of the above as well and removing this component entirely -->
<unit bldFile="os/ossrv/ofdbus/group"/>
</component>
@@ -1063,7 +1071,7 @@
<unit bldFile="os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
</component>
<component name="hwrmtargetmodifierplugin" filter="s60" long-name="HWRM Target Modifier Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build,
+<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build,
may need to -->
<!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
</component>
@@ -1077,7 +1085,7 @@
<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
</component>
<component name="resourcemgmt_build" filter="s60" long-name="Resource Management Build">
-<!-- Move exports to a self-contained component.
+<!-- Move exports to a self-contained component.
This needs to be kept around until configuration is in place -->
<unit bldFile="os/devicesrv/resourcemgmt/group"/>
</component>
@@ -1276,10 +1284,22 @@
<component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
<unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
</component>
+<component name="suplproxyprotocolmodule" long-name="SUPL Proxy Protocol Module" introduced="^3" purpose="optional" plugin="Y">
+<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+<unit bldFile="os/lbs/networkprotocolmodules/suplproxyprotocolmodule/sfgroup" mrp="os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
+</component>
+<component name="suplprotocolmodule" long-name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" plugin="Y">
+<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+<unit bldFile="os/lbs/networkprotocolmodules/suplprotocolmodule/sfgroup" mrp="os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
+</component>
<component name="suplrrlpasn1" filter="sf_build" long-name="SUPL RRLP ASN1 Parser">
<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
<unit bldFile="os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
</component>
+<component name="suplrrlpprotocol" long-name="SUPL RRLP Protocol Module">
+<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+<unit bldFile="os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup"/>
+</component>
</collection>
<collection name="lbsapitest" long-name="Location API Tests" level="application-interface"/>
<collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
@@ -1476,12 +1496,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">
@@ -1656,9 +1670,6 @@
<component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y">
<unit bldFile="os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
</component>
-<component name="simtsy" long-name="SIM TSY" introduced="7.0" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
-</component>
<component name="ctsydispatchlayer" long-name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" plugin="Y">
<unit bldFile="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
</component>
@@ -2060,7 +2071,7 @@
<unit bldFile="os/mm/devsoundextensions/effectspresets/group"/>
</component>
<component name="effectspresets_utils" filter="s60" long-name="Effects Presets Utils">
-<!-- need to #include the lot from a single bld.inf
+<!-- need to #include the lot from a single bld.inf
Also move to a standard component location, not under effectspresets -->
<unit bldFile="os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
<unit bldFile="os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
@@ -2243,6 +2254,9 @@
<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">
+<unit bldFile="os/imagingext/imagingext_plat/ecam_use_case_hint_custom_api/group"/>
+</component>
</collection>
<collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
<component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
@@ -2463,7 +2477,7 @@
</component>
</collection>
<collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
-<!-- components in this collection need to be moved to the right collection.
+<!-- components in this collection need to be moved to the right collection.
Either move into the units' directories, or create a new textandlocutils directory -->
<component name="numbergrouping" filter="s60" long-name="Number Grouping">
<unit bldFile="os/textandloc/charconvfw/numbergrouping/group"/>
@@ -2509,8 +2523,8 @@
<block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
<collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
<component name="xmlsrv_plat_build" long-name="XML Services Platform Interface Build" filter="s60" class="api">
-<!-- need to fix the configuration used here.
- Either destribute to other components or use the new feature flags confguration mechanisms.
+<!-- need to fix the configuration used here.
+ Either destribute to other components or use the new feature flags confguration mechanisms.
Remove this component and uncomment the other units when fixed-->
<unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
</component>
@@ -2653,6 +2667,9 @@
<component name="rombuild_zoom2" filter="sf_build" long-name="Zoom2 iMaker Config" purpose="development" introduced="^3" class="config">
<unit bldFile="os/deviceplatformrelease/sf_config/rombuild/zoom2/group"/>
</component>
+<component name="rombuild_sfrefhw" filter="sf_build" long-name="sf_refhw iMaker Config" purpose="development" introduced="^3" class="config">
+<unit bldFile="os/deviceplatformrelease/sf_config/rombuild/sf_refhw/group"/>
+</component>
</collection>
<!-- should be located locally in buildplatforms/group. NB. This is a different package! -->
<collection name="s60bld" long-name="S60 Build">
@@ -2902,7 +2919,7 @@
</component>
</collection>
<collection name="contextframework" long-name="Context Framework" level="framework">
-<!-- the units that are commented out need to be put back when configuration is in place.
+<!-- the units that are commented out need to be put back when configuration is in place.
They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
<component name="cfw" filter="s60" long-name="Context Framework">
<!--<unit bldFile="contextframework/cfw/group"/> -->
@@ -3971,8 +3988,8 @@
</component>
</collection>
<collection name="vpnengine" long-name="VPN Engine" level="engine">
-<!-- too many components in this collection.
- Probably best to group the binaries together into larger components
+<!-- too many components in this collection.
+ Probably best to group the binaries together into larger components
or maybe split the collection into more reasonable groups -->
<component name="eventmediatorapi" filter="s60" long-name="Event Mediator API">
<unit bldFile="mw/vpnclient/vpnengine/eventmediatorapi/group" filter="!oem_build"/>
@@ -4523,7 +4540,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 Avability Text" filter="s60" class="api">
+<component name="presence_avabilitytext" long-name="Presence Availbility Text" filter="s60" class="api">
<unit bldFile="mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
</component>
</collection>
@@ -4546,9 +4563,6 @@
<component name="xmppsettingsfetcher" filter="s60" long-name="XMPP Settings Fetcher" introduced="^2">
<unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/group"/>
</component>
-<component name="ossprotocoladaptation" filter="s60" long-name="OSS Protocol Adaptation" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/ossprotocoladaptation/group"/>
-</component>
<component name="instantmessagingcache" filter="s60" long-name="Instant Messaging Cache" introduced="^2">
<unit bldFile="mw/imsrv/imservices/instantmessagingcache/group"/>
</component>
@@ -4914,7 +4928,7 @@
<!-- <unit bldFile="remotestoragefw/remotedriveconfigurationbiocontrol/group"/>-->
</component>
<component name="remotestoragefw_build" filter="s60" long-name="Remote Storage Framework Build">
-<!-- move exports to other components.
+<!-- move exports to other components.
This is needed for #includes of configured component until congigiration is in place -->
<unit bldFile="mw/remotestorage/remotestoragefw/group"/>
</component>
@@ -5169,9 +5183,9 @@
<collection name="upnpharvester" long-name="UPnP Harvester" level="ctrl">
<component name="upnpharvester_common" filter="s60" long-name="UPnP Harvester Common" introduced="^2" deprecated="^3" class="placeholder">
<!-- need to merge or #include these to a single bld.inf -->
-<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
- <unit bldFile="upnpharvester/common/cmsettings/group"/>
- <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
+<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
+ <unit bldFile="upnpharvester/common/cmsettings/group"/>
+ <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
<unit bldFile="upnpharvester/common/dbmanager/group"/>-->
</component>
<component name="cdssync" filter="s60" long-name="CDS Sync" introduced="^2" deprecated="^3" class="placeholder">
@@ -5369,15 +5383,15 @@
<component name="usbmscpersonality" filter="s60" long-name="USB MSC Personality" plugin="Y">
<unit bldFile="mw/usbservices/usbclasses/usbmscpersonality/group"/>
</component>
-<!-- commented out in bld.inf. Should this be deleted?
- <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
- <unit bldFile="usbclasses/ptpstack/group"/>
- </component>
- <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
- <unit bldFile="usbclasses/sicdusbplugin/group"/>
- </component>
- <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
- <unit bldFile="usbclasses/ptpserver/group"/>
+<!-- commented out in bld.inf. Should this be deleted?
+ <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
+ <unit bldFile="usbclasses/ptpstack/group"/>
+ </component>
+ <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
+ <unit bldFile="usbclasses/sicdusbplugin/group"/>
+ </component>
+ <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
+ <unit bldFile="usbclasses/ptpserver/group"/>
</component>-->
<component name="pictbridgeengine" filter="s60" long-name="PictBridge Engine">
<unit bldFile="mw/usbservices/usbclasses/pictbridgeengine/group"/>
@@ -5483,7 +5497,7 @@
<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
+<!-- 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">
@@ -5499,11 +5513,11 @@
<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
+<!-- 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
+<!-- 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">
@@ -6033,11 +6047,11 @@
<unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
</component>
<component name="mpx_backstepping_utility_api" long-name="MPX Backstepping Utility API" introduced="^1" filter="s60" class="api">
-<!-- uncomment when configuration is put in place
+<!-- uncomment when configuration is put in place
<unit bldFile="mmappfw_plat/mpx_backstepping_utility_api/group"/> -->
</component>
<component name="asx_parser_api" long-name="ASX Parser API" introduced="^1" filter="s60" class="api">
-<!-- uncomment when configuration is put in place
+<!-- uncomment when configuration is put in place
<unit bldFile="mmappfw_plat/asx_parser_api/group"/> -->
</component>
<component name="playback_helper_api" long-name="Playback Helper API" introduced="^1" filter="s60" class="api">
@@ -6071,7 +6085,7 @@
</collection>
<collection name="mmappcomponents" long-name="Multimedia App Components" level="utils">
<component name="mmappcomponents_build" filter="s60" long-name="Multimedia App Components Build" introduced="^1">
-<!-- needed for #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
+<!-- needed for #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
Can remove this once configuration is in place-->
<unit bldFile="mw/mmappfw/mmappcomponents/group"/>
</component>
@@ -6246,7 +6260,7 @@
</collection>
<collection name="qt_info" long-name="Qt Info" level="mw">
<component name="qt_build" long-name="Qt Build" introduced="^2">
-<unit bldFile="mw/qt" proFile="projects.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
+<unit bldFile="mw/qt" proFile="projects.pro" qmakeArgs="-r"/>
</component>
</collection>
<collection name="qtdemos" long-name="Qt Demos" level="app">
@@ -6259,14 +6273,6 @@
<unit bldFile="mw/qt/examples" proFile="examples.pro" qmakeArgs="-r"/>
</component>
</collection>
-<collection name="qt_tests" long-name="Qt Tests" level="app">
-<component name="qttestsauto" long-name="Qt Automated Tests" introduced="^2" filter="qttestsauto">
-<unit bldFile="mw/qt/tests/auto" proFile="qtpauto.pro"/>
-</component>
-<component name="qttestsbenchmarks" long-name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks">
-<unit bldFile="mw/qt/tests/benchmarks" proFile="benchmarks.pro" qmakeArgs="-r"/>
-</component>
-</collection>
</block>
<block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
<collection name="classicui_plat" long-name="Classic UI Platform Interfaces" level="specific">
@@ -7005,6 +7011,9 @@
<component name="aknskincontent" filter="s60" long-name="Avkon Skin Content" class="config">
<unit bldFile="mw/uiresources/skins/aknskincontent/group"/>
</component>
+<component name="symbiantheme" filter="sf_build" long-name="Symbian^3 Theme">
+<unit bldFile="mw/uiresources/skins/Symbian/group"/>
+</component>
<component name="aknskins" filter="s60" long-name="Avkon Skin Compiler">
<unit bldFile="mw/uiresources/skins/aknskins/group"/>
</component>
@@ -7028,10 +7037,10 @@
<component name="fontprovider" filter="s60" long-name="Font Provider">
<unit bldFile="mw/uiresources/fontsupport/fontprovider/group"/>
</component>
-<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
- <component id="s60_fonts" filter="s60" name="S60 Fonts">
- <unit bldFile="fontsupport/fontutils/group"/>
- </component>
+<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
+ <component id="s60_fonts" filter="s60" name="S60 Fonts">
+ <unit bldFile="fontsupport/fontutils/group"/>
+ </component>
-->
<component name="fontutils" filter="sf_build" long-name="Font Utils">
<unit bldFile="mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
@@ -7296,7 +7305,7 @@
<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
</component>
<component name="contentpublishingsrv_build" filter="s60" long-name="Content Publishing Service Build">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
+<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
If keeping, it need to move down a directory.-->
<unit bldFile="mw/homescreensrv/contentpublishingsrv/group"/>
</component>
@@ -7318,7 +7327,7 @@
<unit bldFile="mw/homescreensrv/contentcontrolsrv/hscontentinfo/group"/>
</component>
<component name="contentcontrolsrv_build" long-name="Content Control Service Build" filter="s60" introduced="^3">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
+<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
If keeping, it need to move down a directory.-->
<unit bldFile="mw/homescreensrv/contentcontrolsrv/group"/>
</component>
@@ -7727,7 +7736,7 @@
<unit bldFile="mw/web/codhandler/roapapp/group"/>
</component>
<component name="codhandler_build" filter="s60" long-name="COD Handler Build">
-<!-- Exports need to go into another component or make this self-contained.
+<!-- Exports need to go into another component or make this self-contained.
#included .hrh file needs to be #included in each of the other components -->
<unit bldFile="mw/web/codhandler/group"/>
</component>
@@ -7756,7 +7765,7 @@
<!--<unit bldFile="widgets/widgetstartup/group"/>-->
</component>
<component name="widgets_build" filter="s60" long-name="Widgets Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed
+<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed
#included .hrh file needs to be #included in each of the other components -->
<unit bldFile="mw/web/widgets/group"/>
</component>
@@ -7946,14 +7955,11 @@
</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">
-<component name="location_centre_api" long-name="Location Centre API" introduced="^3" filter="s60" class="api">
-<unit bldFile="app/location/loc_plat/location_centre_api/group"/>
-</component>
-</collection>
+<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"/>
@@ -8045,24 +8051,6 @@
<unit bldFile="app/location/mapnavproviderrefapp/group"/>
</component>
</collection>
-<collection name="locationcentre" long-name="Location Centre" level="loc">
-<component name="lcutils" long-name="Location Centre Utilities" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcutils/group"/>
-</component>
-<component name="lcservice" long-name="Location Centre Service Project" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcservice/group"/>
-</component>
-<component name="lcserver" long-name="Location Centre Server Project" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcserver/group"/>
-</component>
-<component name="lcapp" long-name="Location Centre Application" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcapp/group"/>
-</component>
-<component name="locationcentre_build" filter="s60" long-name="Location Centre Build" introduced="^3">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="app/location/locationcentre/group"/>
-</component>
-</collection>
</block>
<block name="mmsharinguis" level="services" long-name="Multimedia Sharing UIs" levels="base plugin if">
<collection name="mmsharinguis_plat" long-name="Multimedia Sharing UIs Platform Interfaces" level="if">
@@ -8362,7 +8350,7 @@
<unit bldFile="app/iptelephony/convergedconnectionhandler/cchclientapi/group"/>
</component>
<component name="convergedconnectionhandler_build" filter="s60" long-name="CCH Build" introduced="^2">
-<!-- consider distributing this into the above components, or collapse the collection into a single component.
+<!-- consider distributing this into the above components, or collapse the collection into a single component.
The latter is a better option since clients and sevrers are rarely separate components -->
<unit bldFile="app/iptelephony/convergedconnectionhandler/group"/>
</component>
@@ -8481,6 +8469,12 @@
<component name="ds_folder_util_api" long-name="DS Folder Util API" filter="s60" class="api">
<unit bldFile="app/contentcontrol/contentctrl_plat/ds_folder_util_api/group"/>
</component>
+<component name="adapter_customization_api" long-name="Adapter Customization API" filter="s60" introduced="^3" class="api">
+<unit bldFile="app/contentcontrol/contentctrl_plat/adapter_customization_api/group"/>
+</component>
+<component name="ds_data_modification_api" long-name="DS Data Modification API" filter="s60" introduced="^3" class="api">
+<unit bldFile="app/contentcontrol/contentctrl_plat/ds_data_modification_api/group"/>
+</component>
</collection>
<collection name="dsdcmoadapter" long-name="Data Sync DCMO Adapter" level="plugin">
<!-- Component at wrong rank, should move down a directory -->
@@ -8512,7 +8506,7 @@
<unit bldFile="app/devicecontrol/devicediagnostics/diagsuites/group"/>
</component>
<component name="devicediagnostics_build" filter="s60" long-name="Device Diagnostics Build">
-<!-- can the exports be moved to one of the other components?
+<!-- 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>
@@ -8565,9 +8559,6 @@
<component name="uisettingssrv" filter="s60" long-name="UI Settings Server">
<unit bldFile="app/devicecontrol/customization/uisettingssrv/bld"/>
</component>
-<component name="isadapter" filter="s60" long-name="Idle State Adapter" plugin="Y">
-<unit bldFile="app/devicecontrol/customization/isadapter/bld"/>
-</component>
<component name="supadapter" filter="s60" long-name="Startup Adapter" plugin="Y">
<unit bldFile="app/devicecontrol/customization/supadapter/bld"/>
</component>
@@ -8675,9 +8666,6 @@
<component name="calcsoft" filter="s60" long-name="Calculator Application">
<unit bldFile="app/utils/extras/calcsoft/group"/>
</component>
-<component name="converter" filter="s60" long-name="Unit Converter">
-<unit bldFile="app/utils/extras/converter/group"/>
-</component>
</collection>
</block>
<block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
@@ -9555,7 +9543,7 @@
<unit bldFile="app/commonemail/meetingrequest/mrurlparserplugin/group"/>
</component>
<component name="meetingrequest_build" filter="s60" long-name="MR Build" introduced="^2">
-<!-- can the exports be broken up into the other components ?
+<!-- can the exports be broken up into the other components ?
alternatively, move the exports into a RM Config component-->
<unit bldFile="app/commonemail/meetingrequest/group"/>
</component>
@@ -9787,8 +9775,8 @@
<unit bldFile="app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
<unit bldFile="app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
<unit bldFile="app/imgeditor/imageeditor/plugins/textplugin/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditor/plugins/drawplugin/group"/>
+<!-- conditionally #included in imageeditor_build: need to fix
+ <unit bldFile="imageeditor/plugins/drawplugin/group"/>
-->
</component>
<component name="editorprovider" filter="s60" long-name="Image Editor Provider">
@@ -9822,8 +9810,8 @@
<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
<unit bldFile="app/imgeditor/imageeditorengine/filters/filtertext/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
+<!-- conditionally #included in imageeditor_build: need to fix
+ <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
-->
</component>
<component name="imageeditorutils" filter="s60" long-name="Image Editor Utilities">
@@ -9841,65 +9829,7 @@
</component>
</collection>
</block>
-<block name="videoeditor" level="apps" long-name="Video Editor Apps" levels="engine ui">
-<collection name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" level="ui">
-<component name="video_editor_engine_api" long-name="Video Editor Engine API" introduced="^2" class="api">
-<unit bldFile="app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
-</component>
-</collection>
-<collection name="videditor" long-name="Video Editor" level="ui">
-<component name="videoeditorcommon" filter="s60" long-name="Video Editor Common" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditorcommon/group"/>
-</component>
-<component name="videoeditoruicomponents" filter="s60" long-name="Video Editor UI Components" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditoruicomponents/group"/>
-</component>
-<component name="simplevideoeditor" filter="s60" long-name="Simple Video Editor" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplevideoeditor/group"/>
-</component>
-<component name="simplecutvideo" filter="s60" long-name="Simple Cut Video" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplecutvideo/group"/>
-</component>
-<component name="videoprovider" filter="s60" long-name="Video Provider" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoprovider/group"/>
-</component>
-<component name="manualvideoeditor" filter="s60" long-name="Manual Video Editor" introduced="^2" class="placeholder">
-<!-- uncomment when supported
- <meta rel="config">
- <defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
- </meta>
- <unit bldFile="videditor/manualvideoeditor/group"/> -->
-</component>
-<component name="videditor_build" filter="s60" long-name="Video Editor Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videditor/group"/>
-</component>
-</collection>
-<collection name="videoeditorengine" long-name="Video Editor Engine" level="engine">
-<component name="audioeditorengine" filter="s60" long-name="Audio Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/audioeditorengine/group"/>
-</component>
-<component name="avcedit" filter="s60" long-name="AVC Editing" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/avcedit/group"/>
-</component>
-<component name="h263decoder" filter="s60" long-name="H.263 Decoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/h263decoder/group"/>
-</component>
-<component name="mp3aacmaniplib" filter="s60" long-name="MP3 and AAC Manipulation Library" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
-</component>
-<component name="vedtranscoder" filter="s60" long-name="Video Editor Transcoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedtranscoder/group"/>
-</component>
-<component name="vedengine" filter="s60" long-name="Video Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedengine/group"/>
-</component>
-<component name="videoeditorengine_build" filter="s60" long-name="Video Editor Engine Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videoeditorengine/group"/>
-</component>
-</collection>
-</block>
+<!-- <package id="videoeditor" level="apps" tech-domain="ma" href="../../../../app/videoeditor/package_definition.xml"/> -->
<block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
<collection name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" level="apps">
<component name="videoplayer_startup_api" long-name="Video Player Startup API" filter="s60" class="api">
@@ -10214,8 +10144,13 @@
</component>
</collection>
</block>
-<block name="internetradio" level="apps" long-name="Internet Radio Apps"/>
-<block name="tv" level="services" long-name="TV Apps"/>
+<block name="podcatcher" level="apps" long-name="Podcatcher" levels="app">
+<collection name="podcatcher_info" long-name="Podcatcher" level="app">
+<component name="podcatcher_build" filter="sf_build" long-name="Podcatcher Build" introduced="^3">
+<unit bldFile="app/podcatcher/group"/>
+</component>
+</collection>
+</block>
<block name="voicerec" level="apps" long-name="Voice Recorder Apps">
<!-- custom filter pref_test-->
<collection name="voicerec_plat" long-name="Voice Recorder Apps Platform Interfaces">
@@ -10240,7 +10175,7 @@
<collection name="scrsaver" long-name="Screen Saver" level="plugin">
<component name="scrsaverplugins" filter="s60" long-name="Screen Saver Plugins" plugin="Y">
<!-- must have only one component. #include from a common bld.inf, or move up a directory and make scrsaverplugins a collection -->
-<!--<unit bldFile="scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/"/>
+<!--<unit bldFile="scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/"/>
<unit bldFile="scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/group/"/>-->
</component>
<component name="scrsaver_slideshowplugin" filter="s60" long-name="Screen Saver Slideshow Plugin" plugin="Y">
@@ -10600,7 +10535,7 @@
<unit bldFile="app/webuis/pushmtm/plugins/group"/>
</component>
<component name="pushmtm_build" filter="s60" long-name="Push MTM Build">
-<!-- Some content is at collection level and some is at comopnent level. Either make this a single
+<!-- Some content is at collection level and some is at comopnent level. Either make this a single
component and move it down a diretcory, or make separate independent components in this collection -->
<unit bldFile="app/webuis/pushmtm/group"/>
</component>
@@ -10618,9 +10553,9 @@
<unit bldFile="app/jrt/jrt_plat/java_debug_api/build"/>
</component>
</collection>
-<collection name="java_stubs" long-name="Java Stubs" level="util">
-<component name="java_stubs_build" filter="s60" long-name="JRT Stubs Build">
-<unit bldFile="app/jrt/java_stubs/group"/>
+<collection name="java_build" long-name="JRT Build" level="util">
+<component name="java_build_sf" filter="sf_build" long-name="JRT Build for Symbian Foundation">
+<unit bldFile="app/jrt/group/sf"/>
</component>
</collection>
</block>
@@ -10695,9 +10630,6 @@
</component>
</collection>
<collection name="htiui" long-name="Harmonized Test Interface UI" level="generic">
-<component name="HtiCommPlugins" filter="s60" long-name="HTI Comm Plugins" purpose="development" plugin="Y">
-<unit bldFile="app/rndtools/htiui/HtiCommPlugins/HtiBtCommPlugin/group"/>
-</component>
<component name="HtiServicePlugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
<!-- can only have a single unit. Should #include from a common bld.inf file -->
<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
--- a/symbian3/single/sysdefs/system_model_3.0.xml Wed May 05 12:21:47 2010 +0100
+++ b/symbian3/single/sysdefs/system_model_3.0.xml Tue Jul 13 12:21:44 2010 +0100
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?><SystemDefinition schema="3.0.0" id-namespace="http://www.symbian.org/system-definition">
+<?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">
<package id="stubs" tech-domain="hb" level="high" name="Stubs" levels="stub">
@@ -121,6 +122,14 @@
<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="/os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
</component>
+<component id="usbdescriptors" name="USB Descriptors" purpose="optional">
+<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors" mrp="/os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors/base_drivers_usbdescriptors.mrp"/>
+</component>
+<component id="usbdi_utils" name="USB DI Utils" purpose="optional">
+<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils" mrp="/os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils/base_drivers_usbdi_utils.mrp"/>
+</component>
</collection>
<collection id="driversupport" name="Generic Driver Support" level="hw-if">
<component id="mediadrivers" name="Media Drivers" purpose="optional">
@@ -1216,10 +1225,22 @@
<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 -->
+<unit bldFile="/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/sfgroup" mrp="/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
+</component>
+<component id="suplprotocolmodule" name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" class="plugin">
+<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+<unit bldFile="/os/lbs/networkprotocolmodules/suplprotocolmodule/sfgroup" mrp="/os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
+</component>
<component id="suplrrlpasn1" filter="sf_build" name="SUPL RRLP ASN1 Parser">
<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
<unit bldFile="/os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
</component>
+<component id="suplrrlpprotocol" name="SUPL RRLP Protocol Module">
+<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+<unit bldFile="/os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup"/>
+</component>
</collection>
<collection id="lbsapitest" name="Location API Tests" level="application-interface">
@@ -1430,12 +1451,8 @@
-<component id="networkingintegrationtest" 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 id="networkingperformancemeasurementtools" 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 id="networkingsrv_info" name="Networking Services Info" level="app-if">
<component id="networkingrom" name="Networking ROM" purpose="mandatory">
@@ -1613,9 +1630,7 @@
<component id="multimodetsy" name="Multimode TSY" purpose="development" class="plugin">
<unit bldFile="/os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="/os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
</component>
-<component id="simtsy" name="SIM TSY" introduced="7.0" purpose="development" class="plugin">
-<unit bldFile="/os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="/os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
-</component>
+
<component id="ctsydispatchlayer" name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" class="plugin">
<unit bldFile="/os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="/os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
</component>
@@ -2226,6 +2241,9 @@
<component id="ecam_face_tracking_custom_api" name="ECam Face Tracking Custom API" class="api" filter="s60">
<unit bldFile="/os/imagingext/imagingext_plat/ecam_face_tracking_custom_api/group"/>
</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">
<component id="iclextjpegapi" filter="s60" name="ICL Extension JPEG API">
@@ -4559,7 +4577,7 @@
<component id="im_cache_server_api" name="IM Cache Server API" class="api" filter="s60">
<unit bldFile="/mw/imsrv/imsrv_plat/im_cache_server_api/group"/>
</component>
-<component id="presence_avabilitytext" name="Presence Avability Text" class="api" filter="s60">
+<component id="presence_avabilitytext" name="Presence Availbility Text" class="api" filter="s60">
<unit bldFile="/mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
</component>
</collection>
@@ -4582,9 +4600,6 @@
<component id="xmppsettingsfetcher" filter="s60" name="XMPP Settings Fetcher" introduced="^2">
<unit bldFile="/mw/imsrv/imservices/xmppsettingsfetcher/group"/>
</component>
-<component id="ossprotocoladaptation" filter="s60" name="OSS Protocol Adaptation" class="plugin" introduced="^2">
-<unit bldFile="/mw/imsrv/imservices/ossprotocoladaptation/group"/>
-</component>
<component id="instantmessagingcache" filter="s60" name="Instant Messaging Cache" introduced="^2">
<unit bldFile="/mw/imsrv/imservices/instantmessagingcache/group"/>
</component>
@@ -6401,25 +6416,25 @@
</collection>
<collection id="qt_info" name="Qt Info" level="mw">
<component id="qt_build" name="Qt Build" introduced="^2">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qt" qt:proFile="projects.pro" qt:qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
+<unit bldFile="/mw/qt" qt:proFile="projects.pro" qt:qmakeArgs="-r"/>
</component>
</collection>
<collection id="qtdemos" name="Qt Demos" level="app">
<component id="qtdemos_build" name="Qt Demos Build" introduced="^2" filter="qtdemos">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qt/demos" qt:proFile="demos.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/mw/qt/demos" qt:proFile="demos.pro" qt:qmakeArgs="-r"/>
</component>
</collection>
<collection id="qtexamples" name="Qt Examples" level="app">
<component id="qtexamples_build" name="Qt Examples Build" introduced="^2" filter="qtexamples">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qt/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/mw/qt/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
</component>
</collection>
<collection id="qt_tests" name="Qt Tests" level="app">
<component id="qttestsauto" name="Qt Automated Tests" introduced="^2" filter="qttestsauto">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qt/tests/auto" qt:proFile="qtpauto.pro" qt:makeArgs="-r"/>
+<unit bldFile="/mw/qt/tests/auto" qt:proFile="qtpauto.pro" qt:makeArgs="-r"/>
</component>
<component id="qttestsbenchmarks" name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qt/tests/benchmarks" qt:proFile="benchmarks.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/mw/qt/tests/benchmarks" qt:proFile="benchmarks.pro" qt:qmakeArgs="-r"/>
</component>
</collection>
</package>
@@ -8275,14 +8290,11 @@
</component>
</collection>
</package>
+<!-- <package id="opensrv" level="specific" tech-domain="pr" href="../../../../mw/opensrv/package_definition.xml"/> -->
</layer>
<layer id="app" name="Applications" levels="services apps">
<package id="location" level="apps" tech-domain="lo" name="Location Apps" levels="ui events loc apps">
-<collection id="loc_plat" name="Location Apps Platform Interfaces" level="apps">
-<component id="location_centre_api" name="Location Centre API" introduced="^3" class="api" filter="s60">
-<unit bldFile="/app/location/loc_plat/location_centre_api/group"/>
-</component>
-</collection>
+<collection id="loc_plat" name="Location Apps Platform Interfaces" level="apps"/>
<collection id="loc_pub" name="Location Apps Public Interfaces" level="apps">
<component id="landmarks_ui_selector_api" name="Landmarks UI Selector API" class="api" filter="s60">
<unit bldFile="/app/location/loc_pub/landmarks_ui_selector_api/group"/>
@@ -8374,24 +8386,6 @@
<unit bldFile="/app/location/mapnavproviderrefapp/group"/>
</component>
</collection>
-<collection id="locationcentre" name="Location Centre" level="loc">
-<component id="lcutils" name="Location Centre Utilities" filter="s60" introduced="^3">
-<unit bldFile="/app/location/locationcentre/lcutils/group"/>
-</component>
-<component id="lcservice" name="Location Centre Service Project" filter="s60" introduced="^3">
-<unit bldFile="/app/location/locationcentre/lcservice/group"/>
-</component>
-<component id="lcserver" name="Location Centre Server Project" filter="s60" introduced="^3">
-<unit bldFile="/app/location/locationcentre/lcserver/group"/>
-</component>
-<component id="lcapp" name="Location Centre Application" filter="s60" introduced="^3">
-<unit bldFile="/app/location/locationcentre/lcapp/group"/>
-</component>
-<component id="locationcentre_build" filter="s60" name="Location Centre Build" introduced="^3">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="/app/location/locationcentre/group"/>
-</component>
-</collection>
</package>
<package id="mmsharinguis" level="services" tech-domain="vc" name="Multimedia Sharing UIs" levels="base plugin if">
<collection id="mmsharinguis_plat" name="Multimedia Sharing UIs Platform Interfaces" level="if">
@@ -8814,6 +8808,12 @@
<component id="ds_folder_util_api" name="DS Folder Util API" class="api" filter="s60">
<unit bldFile="/app/contentcontrol/contentctrl_plat/ds_folder_util_api/group"/>
</component>
+<component id="adapter_customization_api" name="Adapter Customization API" class="api" filter="s60" introduced="^3">
+<unit bldFile="/app/contentcontrol/contentctrl_plat/adapter_customization_api/group"/>
+</component>
+<component id="ds_data_modification_api" name="DS Data Modification API" class="api" filter="s60" introduced="^3">
+<unit bldFile="/app/contentcontrol/contentctrl_plat/ds_data_modification_api/group"/>
+</component>
</collection>
<collection id="dsdcmoadapter" name="Data Sync DCMO Adapter" level="plugin">
<!-- Component at wrong rank, should move down a directory -->
@@ -8898,9 +8898,6 @@
<component id="uisettingssrv" filter="s60" name="UI Settings Server">
<unit bldFile="/app/devicecontrol/customization/uisettingssrv/bld"/>
</component>
-<component id="isadapter" filter="s60" name="Idle State Adapter" class="plugin">
-<unit bldFile="/app/devicecontrol/customization/isadapter/bld"/>
-</component>
<component id="supadapter" filter="s60" name="Startup Adapter" class="plugin">
<unit bldFile="/app/devicecontrol/customization/supadapter/bld"/>
</component>
@@ -9008,9 +9005,6 @@
<component id="calcsoft" filter="s60" name="Calculator Application">
<unit bldFile="/app/utils/extras/calcsoft/group"/>
</component>
-<component id="converter" filter="s60" name="Unit Converter">
-<unit bldFile="/app/utils/extras/converter/group"/>
-</component>
</collection>
</package>
<package id="contacts" level="apps" span="2" tech-domain="pr" name="Contacts Apps" levels="engine support services ui">
@@ -10198,65 +10192,7 @@
</component>
</collection>
</package>
-<package id="videoeditor" level="apps" tech-domain="ma" name="Video Editor Apps" levels="engine ui">
-<collection id="videoeditor_plat" filter="s60" name="Video Editor Apps Platform Interfaces" level="ui">
-<component id="video_editor_engine_api" name="Video Editor Engine API" class="api" introduced="^2">
-<unit bldFile="/app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
-</component>
-</collection>
-<collection id="videditor" name="Video Editor" level="ui">
-<component id="videoeditorcommon" filter="s60" name="Video Editor Common" introduced="^2">
-<unit bldFile="/app/videoeditor/videditor/videoeditorcommon/group"/>
-</component>
-<component id="videoeditoruicomponents" filter="s60" name="Video Editor UI Components" introduced="^2">
-<unit bldFile="/app/videoeditor/videditor/videoeditoruicomponents/group"/>
-</component>
-<component id="simplevideoeditor" filter="s60" name="Simple Video Editor" introduced="^2">
-<unit bldFile="/app/videoeditor/videditor/simplevideoeditor/group"/>
-</component>
-<component id="simplecutvideo" filter="s60" name="Simple Cut Video" introduced="^2">
-<unit bldFile="/app/videoeditor/videditor/simplecutvideo/group"/>
-</component>
-<component id="videoprovider" filter="s60" name="Video Provider" introduced="^2">
-<unit bldFile="/app/videoeditor/videditor/videoprovider/group"/>
-</component>
-<component id="manualvideoeditor" filter="s60" name="Manual Video Editor" introduced="^2">
-<!-- uncomment when supported
- <meta rel="config">
- <defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
- </meta>
- <unit bldFile="videditor/manualvideoeditor/group"/> -->
-</component>
-<component id="videditor_build" filter="s60" name="Video Editor Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="/app/videoeditor/videditor/group"/>
-</component>
-</collection>
-<collection id="videoeditorengine" name="Video Editor Engine" level="engine">
-<component id="audioeditorengine" filter="s60" name="Audio Editor Engine" introduced="^2">
-<unit bldFile="/app/videoeditor/videoeditorengine/audioeditorengine/group"/>
-</component>
-<component id="avcedit" filter="s60" name="AVC Editing" introduced="^2">
-<unit bldFile="/app/videoeditor/videoeditorengine/avcedit/group"/>
-</component>
-<component id="h263decoder" filter="s60" name="H.263 Decoder" introduced="^2">
-<unit bldFile="/app/videoeditor/videoeditorengine/h263decoder/group"/>
-</component>
-<component id="mp3aacmaniplib" filter="s60" name="MP3 and AAC Manipulation Library" introduced="^2">
-<unit bldFile="/app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
-</component>
-<component id="vedtranscoder" filter="s60" name="Video Editor Transcoder" introduced="^2">
-<unit bldFile="/app/videoeditor/videoeditorengine/vedtranscoder/group"/>
-</component>
-<component id="vedengine" filter="s60" name="Video Editor Engine" introduced="^2">
-<unit bldFile="/app/videoeditor/videoeditorengine/vedengine/group"/>
-</component>
-<component id="videoeditorengine_build" filter="s60" name="Video Editor Engine Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="/app/videoeditor/videoeditorengine/group"/>
-</component>
-</collection>
-</package>
+<!-- <package id="videoeditor" level="apps" tech-domain="ma" href="../../../../app/videoeditor/package_definition.xml"/> -->
<package id="videoplayer" level="apps" tech-domain="ma" name="Video Player Apps" levels="support plugin util apps">
<collection id="videoplayer_plat" name="Video Player Apps Platform Interfaces" level="apps">
<component id="videoplayer_startup_api" name="Video Player Startup API" class="api" filter="s60">
@@ -10585,8 +10521,13 @@
</component>
</collection>
</package>
-<package id="internetradio" level="apps" tech-domain="ma" name="Internet Radio Apps"/>
-<package id="tv" level="services" tech-domain="ma" name="TV Apps"/>
+<package id="podcatcher" level="apps" tech-domain="ma" name="Podcatcher" levels="app">
+<collection id="podcatcher_info" name="Podcatcher" level="app">
+<component id="podcatcher_build" filter="sf_build" name="Podcatcher Build" introduced="^3">
+<unit bldFile="/app/podcatcher/group"/>
+</component>
+</collection>
+</package>
<package id="voicerec" level="apps" tech-domain="ma" name="Voice Recorder Apps">
<!-- custom filter pref_test-->
<collection id="voicerec_plat" name="Voice Recorder Apps Platform Interfaces">
@@ -11021,9 +10962,9 @@
<unit bldFile="/app/jrt/jrt_plat/java_debug_api/build"/>
</component>
</collection>
-<collection id="java_stubs" name="Java Stubs" level="util">
-<component id="java_stubs_build" filter="s60" name="JRT Stubs Build">
-<unit bldFile="/app/jrt/java_stubs/group"/>
+<collection id="java_build" name="JRT Build" level="util">
+<component id="java_build_sf" filter="sf_build" name="JRT Build for Symbian Foundation">
+<unit bldFile="/app/jrt/group/sf"/>
</component>
</collection>
</package>
@@ -11051,14 +10992,14 @@
<!-- consider collapsing into a single component -->
<component id="fileopserver" filter="s60" name="File Operations Server" purpose="development" target="device" class="tool">
<meta rel="config">
-<not-defined xmlns:qt="http://www.nokia.com/qt" condition="FILEBROWSER_LITE"/>
+<not-defined condition="FILEBROWSER_LITE"/>
</meta>
<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
<!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
</component>
<component id="fileopclient" filter="s60" name="File Operations Client" purpose="development" target="device" class="tool">
<meta rel="config">
-<not-defined xmlns:qt="http://www.nokia.com/qt" condition="FILEBROWSER_LITE"/>
+<not-defined condition="FILEBROWSER_LITE"/>
</meta>
<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
<!--<unit bldFile="filebrowser/fileopclient/group"/>-->
@@ -11093,7 +11034,7 @@
</component>
</collection>
<collection id="stifui" name="STIF UI" level="generic">
-<component id="stifui_avkon" filter="s60" name="STIF UI for Avkon" purpose="development">
+<component id="stifui_avkon" filter="s60" name="STIF UI for Avkon" purpose="development" target="device">
<unit bldFile="/app/rndtools/stifui/avkon/group"/>
</component>
@@ -11105,9 +11046,6 @@
</component>
</collection>
<collection id="htiui" name="Harmonized Test Interface UI" level="generic">
-<component id="HtiCommPlugins" filter="s60" name="HTI Comm Plugins" purpose="development" target="device" class="plugin">
-<unit bldFile="/app/rndtools/htiui/HtiCommPlugins/HtiBtCommPlugin/group"/>
-</component>
<component id="HtiServicePlugins" filter="s60" name="HTI Service Plugins" purpose="development" target="device" class="plugin">
<!-- can only have a single unit. Should #include from a common bld.inf file -->
<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
--- a/symbian3/split/job_props.ant.xml Wed May 05 12:21:47 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="SF-JOB-PROPS" >
-
- <dirname property="sf.spec.job.dir" file="${ant.file.SF-JOB-PROPS}"/>
- <property name="sf.project.type" value="platform" />
-
- <property name="sf.previous.pdk.tag" value="PDK_3.0.g" />
-
- <property name="sf.spec.job.name" value="symbian3"/>
- <property name="sf.spec.corebuildversion" value="week37"/>
-
- <property name="sf.spec.sbs.variant" value="tb92sf"/>
- <property name="sf.spec.sbs.config" value="winscw.whatlog,armv5.whatlog"/> <!-- both _urel and _udeb -->
- <property name="sf.spec.sbs.tools.config" value="tools2_rel.whatlog,tools_rel.whatlog"/>
-
- <property name="sf.spec.bldmefirst.gt.variant" value="sf/os/deviceplatformrelease/symbianosbld/cedarutils/Symbian_OS_v${sf.spec.sbs.variant}.cfg" />
- <!-- Location of Symbian_OS.hrh changed for Symbian3 to an inc directory -->
- <property name="sf.spec.bldmefirst.gt.hrh.os" value="sf/os/deviceplatformrelease/symbianosbld/cedarutils/inc/Symbian_OS_${sf.spec.sbs.variant}.hrh" />
- <property name="sf.spec.bldmefirst.gt.hrh" value="sf/os/deviceplatformrelease/symbianosbld/cedarutils/" />
-
- <property name="sf.spec.bldmefirst.s60.variant" value="western" /> <!-- western|apac|japan but only western is used at the moment -->
- <property name="sf.spec.bldmefirst.s60.config.root" value="sf/os/deviceplatformrelease/sf_config/config" />
- <property name="sf.spec.bldmefirst.s60.sbs.variant.cfg" value="${sf.spec.bldmefirst.s60.config.root}/inc/variant.cfg" /> <!-- currently needed for touching -->
- <property name="sf.spec.bldmefirst.s60.exports" value="${sf.spec.bldmefirst.s60.config.root}/${sf.spec.bldmefirst.s60.variant}/group,${sf.spec.bldmefirst.s60.config.root}/group,sf/os/devicesrv/devicesrv_pub/platform_path_definitions_api/group,sf/os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group,sf/os/devicesrv/commonservices/commonengine/group,sf/mw/web/web_plat/browser_platform_api/group,sf/tools/homescreentools/dtdinstaller/group"/>
-
- <!-- To sync the tools instead of building them, change sf.spec.sbs.tools.config to tools2_rel.whatlog -->
- <!-- check that sf.spec.baseline.getenv_options includes 'tools' -->
- <!-- and set sf.spec.baseline.enable to 'true' -->
-
- <!-- get full source env and binaries from pdk -->
- <property name="sf.spec.baseline.location" value="\\v800008\Builds01\Releases\${sf.previous.pdk.tag}" />
- <property name="sf.spec.toolsbaseline.location" value="\\v800008\Builds01\PDT\PDT_1.6" /> <!-- for TEF etc -->
-
- <!-- platform build specific properties -->
- <property name="sf.spec.s60.sysdef.clean.configurations.list" value="S60_5_2_sf" />
- <property name="sf.spec.os.sysdef.clean.configurations.list" value="GT_${sf.spec.sbs.variant}" />
-
- <!-- provide dtd location as os and s60 layers will be different -->
- <property name="sf.spec.s60.sysdef.dtd" value="${sf.spec.job.dir}\sysdefs\sysdef_dtd_1_4_0.xml"/>
- <property name="sf.spec.os.sysdef.dtd" value="${sf.spec.job.dir}\sysdefs\sysdef_dtd_2_0_0.xml"/>
-
- <property name="sf.spec.sysdef.version" value="1.4.0"/> <!-- default -->
- <property name="sf.spec.s60.sysdef.version" value="1.4.0"/>
- <property name="sf.spec.os.sysdef.version" value="2.0.0"/>
-
- <!-- build os and s60 by default -->
- <property name="sf.spec.os.skipbuild" value="false"/>
- <property name="sf.spec.s60.skipbuild" value="false"/>
- <property name="sf.spec.splitbuild" value="true"/> <!-- *this* platform build defines two steps -->
-
- <!-- generate dir list(s) of epoc32 tree -->
- <property name="sf.spec.dirlist.enable" value="true"/>
-
- <!-- generate delta of two epoc32 trees. note: this takes a while! -->
- <property name="sf.spec.dirdelta.enable" value="true"/>
-
- <!-- prefilter raptor logs -->
- <property name="sf.spec.logs.raptorfilter.enable" value="false"/>
-
- <!-- zip all logs before publish -->
- <property name="sf.spec.logs.zip.enable" value="true"/>
-
- <!-- packaging options for bin/src-->
- <property name="sf.spec.package.bin.enable" value="true"/>
- <property name="sf.spec.package.src.enable" value="true"/>
- <property name="sf.sdk.header.list.file" value="${sf.spec.job.dir}/../sdkFiles.txt"/>
-
- <property name="sf.spec.test.sendpkg.enable" value="true"/>
- <property name="sf.test.csv.file" value="${sf.spec.job.dir}/../platform_test.csv"/>
-
- <property name="sf.spec.md5.enable" value="true"/>
-
- <!-- Build ROMs defined in list -->
- <property name="sf.spec.referenceroms.createimages.enable" value="true"/>
- <property name="sf.spec.referenceroms.list" value="syborg,beagle"/>
-
-</project>
--- a/symbian3/split/job_refs.ant.xml Wed May 05 12:21:47 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="SF-JOB-REFS">
-
-<path id="sf.spec.os.system.definition.files">
- <fileset dir="${sf.project.location}/" casesensitive="false">
- <include name="sysdefs/system_model_os.xml" />
- </fileset>
- </path>
-
- <path id="sf.spec.s60.system.definition.files">
-<!-- <fileset dir="${sf.project.location}\sysdefs\" includes="S60_*.xml"/> -->
- <fileset dir="${sf.project.location}/" casesensitive="false">
- <include name="sysdefs/system_model_s60.xml" />
- </fileset>
- </path>
-
- </project>
\ No newline at end of file
--- a/symbian3/split/sources.csv Wed May 05 12:21:47 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,123 +0,0 @@
-source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/MCL/sftools/fbf/utilities/,/utilities,branch,default,
-//v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,RCL_3,
-//v800008/Builds01/mercurial_internal/rnd/rndonly/aricent/,/rnd/rndonly/aricent,branch,default,
-//v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,
-//v800008/Builds01/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,branch,default,
-//v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,branch,default,
-//v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,branch,default,
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/camera/,/sf/app/camera,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/commonemail/,/sf/app/commonemail,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/conntools/,/sf/app/conntools,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/contacts/,/sf/app/contacts,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/contentcontrol/,/sf/app/contentcontrol,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/conversations/,/sf/app/conversations,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/devicecontrol/,/sf/app/devicecontrol,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/dictionary/,/sf/app/dictionary,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/files/,/sf/app/files,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/gallery/,/sf/app/gallery,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/graphicsuis/,/sf/app/graphicsuis,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/helps/,/sf/app/helps,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/homescreen/,/sf/app/homescreen,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/im/,/sf/app/im,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/imgeditor/,/sf/app/imgeditor,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/imgvieweruis/,/sf/app/imgvieweruis,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/iptelephony/,/sf/app/iptelephony,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/java/,/sf/app/java,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/location/,/sf/app/location,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/messaging/,/sf/app/messaging,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/mmsharinguis/,/sf/app/mmsharinguis,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/musicplayer/,/sf/app/musicplayer,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/organizer/,/sf/app/organizer,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/phone/,/sf/app/phone,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/photos/,/sf/app/photos,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/poc/,/sf/app/poc,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/printing/,/sf/app/printing,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/profile/,/sf/app/profile,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/radio/,/sf/app/radio,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/screensaver/,/sf/app/screensaver,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/settingsuis/,/sf/app/settingsuis,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/speechsrv/,/sf/app/speechsrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/techview/,/sf/app/techview,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/utils/,/sf/app/utils,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/videocenter/,/sf/app/videocenter,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/videoeditor/,/sf/app/videoeditor,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/videoplayer/,/sf/app/videoplayer,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/videotelephony/,/sf/app/videotelephony,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/voicerec/,/sf/app/voicerec,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/webuis/,/sf/app/webuis,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/accesssec/,/sf/mw/accesssec,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/appinstall/,/sf/mw/appinstall,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/appsupport/,/sf/mw/appsupport,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/btservices/,/sf/mw/btservices,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/camerasrv/,/sf/mw/camerasrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/classicui/,/sf/mw/classicui,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/dlnasrv/,/sf/mw/dlnasrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/drm/,/sf/mw/drm,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/gsprofilesrv,/sf/mw/gsprofilesrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/hapticsservices/,/sf/mw/hapticsservices,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/helix/,/sf/mw/helix,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/homescreensrv/,/sf/mw/homescreensrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/imghandling/,/sf/mw/imghandling,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/imsrv/,/sf/mw/imsrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/inputmethods/,/sf/mw/inputmethods,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/ipappprotocols/,/sf/mw/ipappprotocols,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/ipappsrv/,/sf/mw/ipappsrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/ipconnmgmt/,/sf/mw/ipconnmgmt,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/legacypresence/,/sf/mw/legacypresence,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/locationsrv/,/sf/mw/locationsrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/mds/,/sf/mw/mds,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/messagingmw/,/sf/mw/messagingmw,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/metadatasrv/,/sf/mw/metadatasrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/mmappfw/,/sf/mw/mmappfw,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/mmmw/,/sf/mw/mmmw,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/mmuifw/,/sf/mw/mmuifw,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/netprotocols/,/sf/mw/netprotocols,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/networkingdm/,/sf/mw/networkingdm,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/opensrv/,/sf/mw/opensrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/phonesrv/,/sf/mw/phonesrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/remoteconn/,/sf/mw/remoteconn,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/remotemgmt/,/sf/mw/remotemgmt,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/remotestorage/,/sf/mw/remotestorage,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/securitysrv/,/sf/mw/securitysrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/serviceapi/,/sf/mw/serviceapi,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/serviceapifw/,/sf/mw/serviceapifw,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/shortlinkconn/,/sf/mw/shortlinkconn,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/srvdiscovery/,/sf/mw/srvdiscovery,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/svgt/,/sf/mw/svgt,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/uiaccelerator/,/sf/mw/uiaccelerator,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/uiresources/,/sf/mw/uiresources,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/uitools/,/sf/mw/uitools,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/videoutils/,/sf/mw/videoutils,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/vpnclient/,/sf/mw/vpnclient,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/web/,/sf/mw/web,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/websrv/,/sf/mw/websrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/wirelessacc/,/sf/mw/wirelessacc,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/boardsupport/,/sf/os/boardsupport,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/os/bt/,/sf/os/bt,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/buildtools/,/sf/os/buildtools,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/cellularsrv/,/sf/os/cellularsrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/commsfw/,/sf/os/commsfw,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/devicesrv/,/sf/os/devicesrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/graphics/,/sf/os/graphics,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/imagingext/,/sf/os/imagingext,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/lbs/,/sf/os/lbs,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/mm/,/sf/os/mm,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/networkingsrv/,/sf/os/networkingsrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/ossrv/,/sf/os/ossrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/persistentdata/,/sf/os/persistentdata,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/os/security/,/sf/os/security,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/textandloc/,/sf/os/textandloc,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/unref/,/sf/os/unref,branch,default,
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/usb/,/sf/os/usb,branch,default,
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/wlan/,/sf/os/wlan,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/osrndtools/,/sf/os/osrndtools,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,branch,default,
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/tools/homescreentools/,/sf/tools/homescreentools,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/platformtools/,/sf/mw/platformtools,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/rndtools/,/sf/app/rndtools,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/tools/swconfigtools/,/sf/tools/swconfigtools,branch,default,layers.sysdef.xml
--- a/symbian3/split/sources_fcl.csv Wed May 05 12:21:47 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +0,0 @@
-source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/MCL/sftools/fbf/utilities/,/utilities,branch,default,
-//v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,RCL_3,
-//v800008/Builds01/mercurial_internal/rnd/rndonly/aricent/,/rnd/rndonly/aricent,branch,default,
-//v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,
-//v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,branch,default,
-//v800008/Builds01/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,branch,default,
-//v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,branch,default,
-http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/camera/,/sf/app/camera,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/commonemail/,/sf/app/commonemail,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/conntools/,/sf/app/conntools,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/contacts/,/sf/app/contacts,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/contentcontrol/,/sf/app/contentcontrol,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/conversations/,/sf/app/conversations,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/devicecontrol/,/sf/app/devicecontrol,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/dictionary/,/sf/app/dictionary,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/files/,/sf/app/files,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/graphicsuis/,/sf/app/graphicsuis,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/helps/,/sf/app/helps,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/homescreen/,/sf/app/homescreen,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/im/,/sf/app/im,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/imgeditor/,/sf/app/imgeditor,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/iptelephony/,/sf/app/iptelephony,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/jrt/,/sf/app/jrt,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/location/,/sf/app/location,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/messaging/,/sf/app/messaging,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/mmsharinguis/,/sf/app/mmsharinguis,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/musicplayer/,/sf/app/musicplayer,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/organizer/,/sf/app/organizer,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/app/phone/,/sf/app/phone,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/photos/,/sf/app/photos,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/printing/,/sf/app/printing,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/profile/,/sf/app/profile,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/radio/,/sf/app/radio,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/screensaver/,/sf/app/screensaver,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/settingsuis/,/sf/app/settingsuis,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/speechsrv/,/sf/app/speechsrv,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/techview/,/sf/app/techview,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/utils/,/sf/app/utils,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/videoeditor/,/sf/app/videoeditor,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/videoplayer/,/sf/app/videoplayer,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/videotelephony/,/sf/app/videotelephony,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/voicerec/,/sf/app/voicerec,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/webuis/,/sf/app/webuis,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/accesssec/,/sf/mw/accesssec,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/appinstall/,/sf/mw/appinstall,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/appsupport/,/sf/mw/appsupport,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/btservices/,/sf/mw/btservices,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/camerasrv/,/sf/mw/camerasrv,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/classicui/,/sf/mw/classicui,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/dlnasrv/,/sf/mw/dlnasrv,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/drm/,/sf/mw/drm,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/gsprofilesrv/,/sf/mw/gsprofilesrv,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/hapticsservices/,/sf/mw/hapticsservices,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/helix/,/sf/mw/helix,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/homescreensrv/,/sf/mw/homescreensrv,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/imghandling/,/sf/mw/imghandling,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/imsrv/,/sf/mw/imsrv,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/inputmethods/,/sf/mw/inputmethods,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/ipappprotocols/,/sf/mw/ipappprotocols,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/ipappsrv/,/sf/mw/ipappsrv,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/ipconnmgmt/,/sf/mw/ipconnmgmt,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/legacypresence/,/sf/mw/legacypresence,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/locationsrv/,/sf/mw/locationsrv,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/mds/,/sf/mw/mds,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/messagingmw/,/sf/mw/messagingmw,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/metadatasrv/,/sf/mw/metadatasrv,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/mmappfw/,/sf/mw/mmappfw,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/mmmw/,/sf/mw/mmmw,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/mmuifw/,/sf/mw/mmuifw,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/netprotocols/,/sf/mw/netprotocols,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/networkingdm/,/sf/mw/networkingdm,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/opensrv/,/sf/mw/opensrv,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/phonesrv/,/sf/mw/phonesrv,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/remoteconn/,/sf/mw/remoteconn,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/remotemgmt/,/sf/mw/remotemgmt,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/remotestorage/,/sf/mw/remotestorage,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/securitysrv/,/sf/mw/securitysrv,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/serviceapi/,/sf/mw/serviceapi,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/serviceapifw/,/sf/mw/serviceapifw,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/shortlinkconn/,/sf/mw/shortlinkconn,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/srvdiscovery/,/sf/mw/srvdiscovery,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/svgt/,/sf/mw/svgt,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/uiaccelerator/,/sf/mw/uiaccelerator,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/uiresources/,/sf/mw/uiresources,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/uitools/,/sf/mw/uitools,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/usbservices/,/sf/mw/usbservices,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/videoutils/,/sf/mw/videoutils,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/vpnclient/,/sf/mw/vpnclient,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/web/,/sf/mw/web,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/websrv/,/sf/mw/websrv,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/wirelessacc/,/sf/mw/wirelessacc,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/boardsupport/,/sf/os/boardsupport,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/bt/,/sf/os/bt,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/buildtools/,/sf/os/buildtools,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/cellularsrv/,/sf/os/cellularsrv,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/commsfw/,/sf/os/commsfw,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/devicesrv/,/sf/os/devicesrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_development_new/oss/FCL/sf/os/graphics/,/sf/os/graphics,branch,NewGraphicsArchitecture,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/imagingext/,/sf/os/imagingext,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/lbs/,/sf/os/lbs,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/mm/,/sf/os/mm,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/networkingsrv/,/sf/os/networkingsrv,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/ossrv/,/sf/os/ossrv,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/persistentdata/,/sf/os/persistentdata,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/security/,/sf/os/security,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/textandloc/,/sf/os/textandloc,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/usb/,/sf/os/usb,branch,default,
-http://developer.symbian.org/oss/MCL/sf/os/wlan/,/sf/os/wlan,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/osrndtools/,/sf/os/osrndtools,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,branch,default,
-http://developer.symbian.org/oss/MCL/sf/tools/homescreentools/,/sf/tools/homescreentools,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/platformtools/,/sf/mw/platformtools,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/rndtools/,/sf/app/rndtools,branch,default,layers.sysdef.xml
--- a/symbian3/split/sysdefs/S60_SystemBuild.xml Wed May 05 12:21:47 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,526 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE SystemDefinition [
-
- <!ELEMENT SystemDefinition (systemModel?, build?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (logicalset* | module*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- levels CDATA #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT logicalset (logicalsubset* | module* | unit* | package* | prebuilt*)*>
- <!ATTLIST logicalset
- name CDATA #REQUIRED
- levels CDATA #IMPLIED
- span CDATA #IMPLIED
- level CDATA #IMPLIED>
- <!ELEMENT logicalsubset (module* | unit* | package* | prebuilt*)*>
- <!ATTLIST logicalsubset name CDATA #REQUIRED>
- <!ELEMENT module (component* | unit* | package* | prebuilt*)*>
- <!ATTLIST module
- name CDATA #REQUIRED
- level CDATA #IMPLIED>
- <!ELEMENT component (unit* | package* | prebuilt*)*>
- <!ATTLIST component name CDATA #REQUIRED>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- unitID ID #REQUIRED
- name CDATA #REQUIRED
- mrp CDATA #REQUIRED
- filter CDATA #IMPLIED
- bldFile CDATA #REQUIRED
- priority CDATA #IMPLIED
- contract CDATA #IMPLIED>
- <!ELEMENT package EMPTY>
- <!ATTLIST package
- name CDATA #REQUIRED
- mrp CDATA #REQUIRED
- filter CDATA #IMPLIED
- contract CDATA #IMPLIED>
- <!ELEMENT prebuilt EMPTY>
- <!ATTLIST prebuilt
- name CDATA #REQUIRED
- version CDATA #REQUIRED
- late (Y|N) #IMPLIED
- filter CDATA #IMPLIED
- contract CDATA #IMPLIED>
- <!ELEMENT build (option* | target+ | targetList+ | unitList+ | configuration+)*>
- <!ELEMENT unitList (unitRef+)>
- <!ATTLIST unitList
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT unitRef EMPTY>
- <!ATTLIST unitRef unit IDREF #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y | N | y | n) #REQUIRED>
- <!ELEMENT configuration (unitListRef+ | layerRef+ | task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task ( unitListRef* , (buildLayer | specialInstructions))>
- <!ELEMENT unitListRef EMPTY>
- <!ATTLIST unitListRef unitList IDREF #REQUIRED>
- <!ELEMENT layerRef EMPTY>
- <!ATTLIST layerRef layerName CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y | N | y | n) #REQUIRED
- targetParallel (Y | N | y | n) #IMPLIED>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition name="S60_SystemBuild" schema="1.4.0">
-<systemModel>
-
-
- <layer name="os_layer">
- </layer>
- <layer name="bldfirst_mw_layer">
- </layer>
- <layer name="mw_layer">
- </layer>
- <layer name="bldfirst_app_layer">
- </layer>
- <layer name="app_layer">
- </layer>
- <layer name="tools_layer">
- </layer>
- <layer name="stubs_layer">
- </layer>
-
-<layer name="src">
-<module name="hlpmodel">
-<component name="hlpmodel">
-<unit unitID="S60_hlpmodel" name="hlpmodel" bldFile="\src\common\generic\app-services\hlpmodel\group" mrp=""/>
-</component>
-</module>
-</layer>
-<layer name="extra">
- <module name="WlanEapSettingsUi_ccx">
- <component name="WlanEapSettingsUi_ccx">
- <unit unitID="s60_mw_networking_networkingutilities_WlanEapSettingsUi_group_ccx" name="WlanEapSettingsUi_ccx" bldFile="\sf\mw\accesssec\wlansecuritysettings\wlaneapsettingsui\group\ccx" mrp=""/>
- </component>
- </module>
-</layer>
-
-<layer name="SF_SOS">
-<module name="sf_licenseetsystub">
-<component name="sf_licenseetsystub">
-<unit unitID="sf_os_cellularsrv_telephonyserverplugins_licenseetsystub" name="sf_licenseetsystub" bldFile="\sf\os\cellularsrv\telephonyserverplugins\licenseetsystub\group" mrp="" filter="!no_stubs"/>
-</component>
-</module>
-<module name="sf_common_tsy">
-<component name="sf_common_tsy">
-<unit unitID="sf_os_cellularsrv_telephonyserverplugins_common_tsy" name="sf_common_tsy" bldFile="\sf\os\cellularsrv\telephonyserverplugins\common_tsy\group" mrp="" filter=""/>
-</component>
-</module>
-</layer>
-
-</systemModel>
-
- <build>
- <option name="KEEPGOING" abldOption="-keepgoing" description="Causes make to keepgoing on errors" enable="Y"/>
-<!-- <option name="SAVESPACE" abldOption="-savespace" description="Causes the removal of intermediate files" enable="Y"/> -->
- <target name="WINS" abldTarget="wins" description="MSVC Compiler"/>
- <target name="WINS_REL" abldTarget="wins urel" description="MSVC Compiler"/>
- <target name="WINS_DEB" abldTarget="wins udeb" description="MSVC Compiler"/>
- <target name="WINSCW" abldTarget="winscw" description="CodeWarrior Compiler"/>
- <target name="WINSCW_REL" abldTarget="winscw urel" description="CodeWarrior Compiler"/>
- <target name="WINSCW_DEB" abldTarget="winscw udeb" description="CodeWarrior Compiler"/>
- <target name="TOOLS" abldTarget="tools" description="MSVC Compiler for Tools"/>
- <target name="TOOLS_REL" abldTarget="tools rel" description="MSVC Compiler for Tools Release mode only"/>
- <target name="ARMV5" abldTarget="armv5" description="RVCT Compiler"/>
- <target name="ARMV5_REL" abldTarget="armv5 urel" description="RVCT Compiler"/>
- <target name="ARMV5_DEB" abldTarget="armv5 udeb" description="RVCT Compiler"/>
-
- <!-- Aditional Targets -->
- <target name="CWTOOLS" abldTarget="cwtools" description="CodeWarrior Compiler for Tools"/> <!-- Not supported -->
- <target name="CWTOOLS_REL" abldTarget="cwtools rel" description="CodeWarrior Compiler for Tools Release mode only"/> <!-- Not supported -->
-
- <targetList name="default" description="Main Targets" target="WINSCW ARMV5"/>
- <targetList name="default_winscw" description="Main Targets" target="WINSCW"/>
- <targetList name="default_armv5" description="Main Targets" target="ARMV5"/>
- <targetList name="default_rel" description="Main Targets for rel" target="WINSCW_REL ARMV5_REL"/>
- <targetList name="default_deb" description="Main Targets for deb" target="WINSCW_DEB ARMV5_DEB"/>
- <targetList name="default_debrel" description="Main Targets for WINSCW deb and ARMV5 urel" target="WINSCW_DEB ARMV5_REL"/>
- <targetList name="default_tools" description="tools Targets" target="TOOLS"/>
- <targetList name="tools_rel" description="tools Release Targets" target="TOOLS_REL"/>
- <targetList name="cwtools" description="cwtools Targets" target="CWTOOLS"/>
- <targetList name="cwtools_rel" description="cwtools Release Targets" target="CWTOOLS_REL"/>
-
-
-
- <configuration name="S60_bldmelast" description="S60 bldmelast part" filter="S60_5_0,western">
- <task><specialInstructions name="S60_config_western" cwd="\" command="toucher.exe \config\s60_52_config"/></task>
- <task><specialInstructions name="S60_config_western" cwd="\config\s60_52_config" command="cmaker s60_52_config REGION=western ACTION=what"/></task>
-<layerRef layerName="japan_layer"/>
-<layerRef layerName="china_layer"/>
-
-<!-- for target arm9e -->
- <task><specialInstructions name="EAacPlusCodecPlugin" cwd="\sf\os\mm\audio\ARM_CMMF_codecs\EAacPlusCodecPlugin\Group" command="bldmake bldfiles -k"/></task>
- <task><specialInstructions name="EAacPlusCodecPlugin" cwd="\sf\os\mm\audio\ARM_CMMF_codecs\EAacPlusCodecPlugin\Group" command="abld build arm9e -k"/></task>
-
-<!--new configuration tool cenrep generation western -->
- <task><specialInstructions name="cenrep_generation" cwd="\epoc32\tools" command="call cli_build.cmd -master_conf s60 -impl \epoc32\rom\config\confml_data\s60 -confml \epoc32\rom\config\confml_data\s60 -ignore_errors"/></task>
- <task><specialInstructions name="cenrep_generation_symbianos" cwd="\ext\tools" command="call cli_build.cmd -master_conf symbianos.confml -impl \epoc32\rom\config\confml_data\symbianos -confml \epoc32\rom\config\confml_data\symbianos -iby \epoc32\rom\include\customer\mw\SymbianCenRep_variant.iby -ignore_errors" /></task>
-
-<!-- do what for regional variant that those can be zipped from bldmelast build log file -->
- <task><buildLayer command="bldmake bldfiles" unitParallel="Y"/></task>
- <task><buildLayer command="abld makefile" targetList="default" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld -what build" targetList="default" unitParallel="Y" targetParallel="Y"/></task>
-
- </configuration>
-
- <configuration name="S60_bldmelast_sf" description="S60 bldmelast part" filter="S60_5_0,western">
- <!--unitListRef unitList="S60_BLDVARIANT_SF"/>
- <unitListRef unitList="S60_REGIONALVARIANT"/-->
-
-<!-- for target arm9e -->
-<!--
- <task><specialInstructions name="EAacPlusCodecPlugin" cwd="\sf\os\mm\audio\ARM_CMMF_codecs\EAacPlusCodecPlugin\Group" command="bldmake bldfiles -k"/></task>
- <task><specialInstructions name="EAacPlusCodecPlugin" cwd="\sf\os\mm\audio\ARM_CMMF_codecs\EAacPlusCodecPlugin\Group" command="abld build arm9e -k"/></task>
--->
-<!--new configuration tool cenrep generation western -->
- <task><specialInstructions name="cenrep_generation" cwd="\epoc32\tools" command="call cli_build.cmd -master_conf s60 -impl \epoc32\rom\config\confml_data\s60 -confml \epoc32\rom\config\confml_data\s60 -ignore_errors"/></task>
- <task><specialInstructions name="cenrep_generation_symbianos" cwd="\ext\tools" command="call cli_build.cmd -master_conf symbianos.confml -impl \epoc32\rom\config\confml_data\symbianos -confml \epoc32\rom\config\confml_data\symbianos -iby \epoc32\rom\include\customer\mw\SymbianCenRep_variant.iby -ignore_errors" /></task>
-
-<!-- do what for regional variant that those can be zipped from bldmelast build log file -->
- <task><buildLayer command="bldmake bldfiles" unitParallel="Y"/></task>
- <task><buildLayer command="abld makefile" targetList="default" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld -what build" targetList="default" unitParallel="Y" targetParallel="Y"/></task>
-
- </configuration>
- <configuration name="S60_variant_china" description="S60 chinese regional variant" filter="S60_5_0,china">
- <task><specialInstructions name="S60_config_china" cwd="\" command="toucher.exe \config\s60_52_config"/></task>
- <task><specialInstructions name="S60_config_china" cwd="\config\s60_52_config" command="cmaker s60_52_config REGION=apac ACTION=export"/></task>
- <task><specialInstructions name="S60_config_china" cwd="\config\s60_52_config" command="cmaker s60_52_config REGION=apac ACTION=what"/></task>
-<layerRef layerName="china_layer"/>
-
-<!-- do what for regional variant that those can be zipped from bldmelast build log file -->
- <task><buildLayer command="toucher.exe ..\.." unitParallel="Y"/></task>
- <task><buildLayer command="bldmake bldfiles" unitParallel="Y"/></task>
- <task><buildLayer command="abld export" unitParallel="N"/></task>
- <task><specialInstructions name="clean_version" cwd="\sf\os\deviceplatformrelease\Version\group" command="abld cleanexport -k"/></task>
-<!-- this is not a mistake, bldmake bldfiles and exports have to do twice because of changes in bldvariant.hrh -->
- <task><buildLayer command="bldmake bldfiles" unitParallel="Y"/></task>
- <task><buildLayer command="abld export" unitParallel="N"/></task>
- <task><buildLayer command="abld makefile" targetList="default" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld resource" targetList="default" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld library" targetList="default" unitParallel="Y" targetParallel="N"/></task>
- <task><buildLayer command="abld target" targetList="default" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld final" targetList="default" unitParallel="Y" targetParallel="N"/></task>
- <task><buildLayer command="abld -what build" targetList="default" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld -check build" targetList="default" unitParallel="Y" targetParallel="Y"/></task>
- </configuration>
-
- <configuration name="S60_variant_china_armv5" description="S60 chinese regional variant" filter="S60_5_0,china">
- <task><specialInstructions name="S60_config_china" cwd="\" command="toucher.exe \config\s60_52_config"/></task>
- <task><specialInstructions name="S60_config_china" cwd="\config\s60_52_config" command="cmaker s60_52_config REGION=apac ACTION=export"/></task>
- <task><specialInstructions name="S60_config_china" cwd="\config\s60_52_config" command="cmaker s60_52_config REGION=apac ACTION=what"/></task>
-<layerRef layerName="pf_52_featuremgr_var"/>
-<layerRef layerName="china_layer"/>
-
-<!-- do what for regional variant that those can be zipped from bldmelast build log file -->
- <task><buildLayer command="toucher.exe ..\.." unitParallel="Y"/></task>
- <task><buildLayer command="bldmake bldfiles" unitParallel="Y"/></task>
- <task><buildLayer command="abld export" unitParallel="N"/></task>
- <task><specialInstructions name="clean_version" cwd="\sf\os\deviceplatformrelease\Version\group" command="abld cleanexport -k"/></task>
-<!-- this is not a mistake, bldmake bldfiles and exports have to do twice because of changes in bldvariant.hrh -->
- <task><buildLayer command="bldmake bldfiles" unitParallel="Y"/></task>
- <task><buildLayer command="abld export" unitParallel="N"/></task>
- <task><buildLayer command="abld makefile" targetList="default_armv5" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld resource" targetList="default_armv5" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld library" targetList="default_armv5" unitParallel="Y" targetParallel="N"/></task>
- <task><buildLayer command="abld target" targetList="default_armv5" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld final" targetList="default_armv5" unitParallel="Y" targetParallel="N"/></task>
- <task><buildLayer command="abld -what build" targetList="default_armv5" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld -check build" targetList="default_armv5" unitParallel="Y" targetParallel="Y"/></task>
- </configuration>
-
- <configuration name="S60_variant_china_winscw" description="S60 chinese regional variant" filter="S60_5_0,china">
- <task><specialInstructions name="S60_config_china" cwd="\" command="toucher.exe \config\s60_52_config"/></task>
- <task><specialInstructions name="S60_config_china" cwd="\config\s60_52_config" command="cmaker s60_52_config REGION=apac ACTION=export"/></task>
- <task><specialInstructions name="S60_config_china" cwd="\config\s60_52_config" command="cmaker s60_52_config REGION=apac ACTION=what"/></task>
-<layerRef layerName="pf_52_featuremgr_var"/>
-<layerRef layerName="china_layer"/>
-
-<!-- do what for regional variant that those can be zipped from bldmelast build log file -->
- <task><buildLayer command="toucher.exe ..\.." unitParallel="Y"/></task>
- <task><buildLayer command="bldmake bldfiles" unitParallel="Y"/></task>
- <task><buildLayer command="abld export" unitParallel="N"/></task>
- <task><specialInstructions name="clean_version" cwd="\sf\os\deviceplatformrelease\Version\group" command="abld cleanexport -k"/></task>
-<!-- this is not a mistake, bldmake bldfiles and exports have to do twice because of changes in bldvariant.hrh -->
- <task><buildLayer command="bldmake bldfiles" unitParallel="Y"/></task>
- <task><buildLayer command="abld export" unitParallel="N"/></task>
- <task><buildLayer command="abld makefile" targetList="default_winscw" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld resource" targetList="default_winscw" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld library" targetList="default_winscw" unitParallel="Y" targetParallel="N"/></task>
- <task><buildLayer command="abld target" targetList="default_winscw" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld final" targetList="default_winscw" unitParallel="Y" targetParallel="N"/></task>
- <task><buildLayer command="abld -what build" targetList="default_winscw" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld -check build" targetList="default_winscw" unitParallel="Y" targetParallel="Y"/></task>
- </configuration>
-
- <configuration name="S60_variant_japan" description="S60 japanese regional variant" filter="S60_5_0,japan">
- <task><specialInstructions name="S60_config_japan" cwd="\" command="toucher.exe \config\s60_52_config"/></task>
- <task><specialInstructions name="S60_config_japan" cwd="\config\s60_52_config" command="cmaker s60_52_config REGION=japan ACTION=export"/></task>
- <task><specialInstructions name="S60_config_japan" cwd="\config\s60_52_config" command="cmaker s60_52_config REGION=japan ACTION=what"/></task>
-<layerRef layerName="japan_layer"/>
-
-<!-- do what for regional variant that those can be zipped from bldmelast build log file -->
- <task><buildLayer command="toucher.exe ..\.." unitParallel="Y"/></task>
- <task><buildLayer command="bldmake bldfiles" unitParallel="Y"/></task>
- <task><buildLayer command="abld export" unitParallel="N"/></task>
- <task><specialInstructions name="clean_version" cwd="\sf\os\deviceplatformrelease\Version\group" command="abld cleanexport -k"/></task>
-<!-- this is not a mistake, bldmake bldfiles and exports have to do twice because of changes in bldvariant.hrh -->
- <task><buildLayer command="bldmake bldfiles" unitParallel="Y"/></task>
- <task><buildLayer command="abld export" unitParallel="N"/></task>
- <task><buildLayer command="abld makefile" targetList="default" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld resource" targetList="default" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld library" targetList="default" unitParallel="Y" targetParallel="N"/></task>
- <task><buildLayer command="abld target" targetList="default" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld final" targetList="default" unitParallel="Y" targetParallel="N"/></task>
- <task><buildLayer command="abld -what build" targetList="default" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld -check build" targetList="default" unitParallel="Y" targetParallel="Y"/></task>
- </configuration>
-
- <configuration name="S60_variant_japan_winscw" description="S60 japanese regional variant" filter="S60_5_0,japan">
- <task><specialInstructions name="S60_config_japan" cwd="\" command="toucher.exe \config\s60_52_config"/></task>
- <task><specialInstructions name="S60_config_japan" cwd="\config\s60_52_config" command="cmaker s60_52_config REGION=japan ACTION=export"/></task>
- <task><specialInstructions name="S60_config_japan" cwd="\config\s60_52_config" command="cmaker s60_52_config REGION=japan ACTION=what"/></task>
-<layerRef layerName="pf_52_featuremgr_var"/>
- <layerRef layerName="japan_layer"/>
-
-<!-- do what for regional variant that those can be zipped from bldmelast build log file -->
- <task><buildLayer command="toucher.exe ..\.." unitParallel="Y"/></task>
- <task><buildLayer command="bldmake bldfiles" unitParallel="Y"/></task>
- <task><buildLayer command="abld export" unitParallel="N"/></task>
- <task><specialInstructions name="clean_version" cwd="\sf\os\deviceplatformrelease\Version\group" command="abld cleanexport -k"/></task>
-<!-- this is not a mistake, bldmake bldfiles and exports have to do twice because of changes in bldvariant.hrh -->
- <task><buildLayer command="bldmake bldfiles" unitParallel="Y"/></task>
- <task><buildLayer command="abld export" unitParallel="N"/></task>
- <task><buildLayer command="abld makefile" targetList="default_winscw" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld resource" targetList="default_winscw" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld library" targetList="default_winscw" unitParallel="Y" targetParallel="N"/></task>
- <task><buildLayer command="abld target" targetList="default_winscw" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld final" targetList="default_winscw" unitParallel="Y" targetParallel="N"/></task>
- <task><buildLayer command="abld -what build" targetList="default_winscw" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld -check build" targetList="default_winscw" unitParallel="Y" targetParallel="Y"/></task>
- </configuration>
-
- <configuration name="S60_variant_japan_armv5" description="S60 japanese regional variant" filter="S60_5_0,japan">
- <task><specialInstructions name="S60_config_japan" cwd="\" command="toucher.exe \config\s60_52_config"/></task>
- <task><specialInstructions name="S60_config_japan" cwd="\config\s60_52_config" command="cmaker s60_52_config REGION=japan ACTION=export"/></task>
- <task><specialInstructions name="S60_config_japan" cwd="\config\s60_52_config" command="cmaker s60_52_config REGION=japan ACTION=what"/></task>
-<layerRef layerName="pf_52_featuremgr_var"/>
-<layerRef layerName="japan_layer"/>
-
-<!-- do what for regional variant that those can be zipped from bldmelast build log file -->
- <task><buildLayer command="toucher.exe ..\.." unitParallel="Y"/></task>
- <task><buildLayer command="bldmake bldfiles" unitParallel="Y"/></task>
- <task><buildLayer command="abld export" unitParallel="N"/></task>
- <task><specialInstructions name="clean_version" cwd="\sf\os\deviceplatformrelease\Version\group" command="abld cleanexport -k"/></task>
-<!-- this is not a mistake, bldmake bldfiles and exports have to do twice because of changes in bldvariant.hrh -->
- <task><buildLayer command="bldmake bldfiles" unitParallel="Y"/></task>
- <task><buildLayer command="abld export" unitParallel="N"/></task>
- <task><buildLayer command="abld makefile" targetList="default_armv5" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld resource" targetList="default_armv5" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld library" targetList="default_armv5" unitParallel="Y" targetParallel="N"/></task>
- <task><buildLayer command="abld target" targetList="default_armv5" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld final" targetList="default_armv5" unitParallel="Y" targetParallel="N"/></task>
- <task><buildLayer command="abld -what build" targetList="default_armv5" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld -check build" targetList="default_armv5" unitParallel="Y" targetParallel="Y"/></task>
- </configuration>
-
- <configuration name="S60_5_1_clean" description="S60 5.1 clean build" filter="raptor_S60_5_1_clean,oem_build,stubs">
-<layerRef layerName="os_layer"/>
-<layerRef layerName="bldfirst_mw_layer"/>
-<layerRef layerName="mw_layer"/>
-<layerRef layerName="bldfirst_app_layer"/>
-<layerRef layerName="app_layer"/>
-<layerRef layerName="tools_layer"/>
-<layerRef layerName="stubs_layer"/>
-
- <task><buildLayer command="bldmake bldfiles" unitParallel="Y"/></task>
- <task><buildLayer command="abld export" unitParallel="Y"/></task>
- <task><buildLayer command="abld makefile" targetList="default_tools" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld library" targetList="default_tools" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld target" targetList="tools_rel" unitParallel="N" targetParallel="Y"/></task>
- <task><buildLayer command="abld final" targetList="tools_rel" unitParallel="N" targetParallel="Y"/></task>
- <task><buildLayer command="abld -what build" targetList="tools_rel" unitParallel="N" targetParallel="Y"/></task>
- <task><buildLayer command="abld -check build" targetList="tools_rel" unitParallel="N" targetParallel="Y"/></task>
- <task><buildLayer command="abld makefile" targetList="default_winscw" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld resource" targetList="default_winscw" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld library" targetList="default_winscw" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld makefile" targetList="default_armv5" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld resource" targetList="default_armv5" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld library" targetList="default_armv5" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld target" targetList="default" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld final" targetList="default" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld -what build" targetList="default" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld -check build" targetList="default" unitParallel="Y" targetParallel="Y"/></task>
- </configuration>
-
- <configuration name="S60_sf" description="S60 sf build" filter="sf_build">
-<layerRef layerName="os_layer"/>
-<layerRef layerName="bldfirst_mw_layer"/>
-<layerRef layerName="mw_layer"/>
-<layerRef layerName="bldfirst_app_layer"/>
-<layerRef layerName="app_layer"/>
-<layerRef layerName="tools_layer"/>
-<layerRef layerName="stubs_layer"/>
-
- <task><buildLayer command="bldmake bldfiles" unitParallel="Y"/></task>
- <task><buildLayer command="abld export" unitParallel="Y"/></task>
- <task><buildLayer command="abld makefile" targetList="default_tools" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld library" targetList="default_tools" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld target" targetList="tools_rel" unitParallel="N" targetParallel="Y"/></task>
- <task><buildLayer command="abld final" targetList="tools_rel" unitParallel="N" targetParallel="Y"/></task>
- <task><buildLayer command="abld -what build" targetList="tools_rel" unitParallel="N" targetParallel="Y"/></task>
- <task><buildLayer command="abld -check build" targetList="tools_rel" unitParallel="N" targetParallel="Y"/></task>
- <task><buildLayer command="abld makefile" targetList="default_winscw" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld resource" targetList="default_winscw" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld library" targetList="default_winscw" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld makefile" targetList="default_armv5" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld resource" targetList="default_armv5" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld library" targetList="default_armv5" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld target" targetList="default" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld final" targetList="default" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld -what build" targetList="default" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld -check build" targetList="default" unitParallel="Y" targetParallel="Y"/></task>
- </configuration>
- <configuration name="S60_winscw" description="S60 winscw build" filter="oem_build">
-<layerRef layerName="os_layer"/>
-<layerRef layerName="bldfirst_mw_layer"/>
-<layerRef layerName="mw_layer"/>
-<layerRef layerName="bldfirst_app_layer"/>
-<layerRef layerName="app_layer"/>
-<layerRef layerName="tools_layer"/>
-<layerRef layerName="stubs_layer"/>
-
- <task><buildLayer command="bldmake bldfiles" unitParallel="Y"/></task>
- <task><buildLayer command="abld export" unitParallel="Y"/></task>
- <task><buildLayer command="abld makefile" targetList="default_tools" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld library" targetList="default_tools" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld target" targetList="tools_rel" unitParallel="N" targetParallel="Y"/></task>
- <task><buildLayer command="abld final" targetList="tools_rel" unitParallel="N" targetParallel="Y"/></task>
- <task><buildLayer command="abld -what build" targetList="tools_rel" unitParallel="N" targetParallel="Y"/></task>
- <task><buildLayer command="abld -check build" targetList="tools_rel" unitParallel="N" targetParallel="Y"/></task>
- <task><buildLayer command="abld makefile" targetList="default_winscw" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld resource" targetList="default_winscw" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld library" targetList="default_winscw" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld target" targetList="default_winscw" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld final" targetList="default_winscw" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld -what build" targetList="default_winscw" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld -check build" targetList="default_winscw" unitParallel="Y" targetParallel="Y"/></task>
- </configuration>
-
- <configuration name="S60_5_1_fast" description="S60 clean build for winscw udeb and armv5 urel" filter="oem_build">
-<layerRef layerName="os_layer"/>
-<layerRef layerName="bldfirst_mw_layer"/>
-<layerRef layerName="mw_layer"/>
-<layerRef layerName="bldfirst_app_layer"/>
-<layerRef layerName="app_layer"/>
-<layerRef layerName="tools_layer"/>
-<layerRef layerName="stubs_layer"/>
-
- <task><buildLayer command="bldmake bldfiles" unitParallel="Y"/></task>
- <task><buildLayer command="abld export" unitParallel="Y"/></task>
- <task><buildLayer command="abld makefile" targetList="default_tools" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld library" targetList="default_tools" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld target" targetList="tools_rel" unitParallel="N" targetParallel="Y"/></task>
- <task><buildLayer command="abld final" targetList="tools_rel" unitParallel="N" targetParallel="Y"/></task>
- <task><buildLayer command="abld -what build" targetList="tools_rel" unitParallel="N" targetParallel="Y"/></task>
- <task><buildLayer command="abld -check build" targetList="tools_rel" unitParallel="N" targetParallel="Y"/></task>
- <task><buildLayer command="abld makefile" targetList="default_winscw" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld resource" targetList="default_winscw" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld library" targetList="default_winscw" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld makefile" targetList="default_armv5" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld resource" targetList="default_armv5" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld library" targetList="default_armv5" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld target" targetList="default_debrel" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld final" targetList="default_debrel" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld -what build" targetList="default_debrel" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld -check build" targetList="default_debrel" unitParallel="Y" targetParallel="Y"/></task>
-
- </configuration>
-
-
- <configuration name="S60_5_1_complementary" description="S60 5.1 complementary build" filter="raptor_S60_5_1_complementary">
-<layerRef layerName="complementary_layer"/>
- <task><buildLayer command="bldmake bldfiles" unitParallel="Y"/></task>
- <task><buildLayer command="abld export" unitParallel="Y"/></task>
- <task><buildLayer command="abld makefile" targetList="default_tools" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld library" targetList="default_tools" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld target" targetList="tools_rel" unitParallel="N" targetParallel="Y"/></task>
- <task><buildLayer command="abld final" targetList="tools_rel" unitParallel="N" targetParallel="Y"/></task>
- <task><buildLayer command="abld -what build" targetList="tools_rel" unitParallel="N" targetParallel="Y"/></task>
- <task><buildLayer command="abld -check build" targetList="tools_rel" unitParallel="N" targetParallel="Y"/></task>
- <task><buildLayer command="abld makefile" targetList="default_winscw" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld resource" targetList="default_winscw" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld library" targetList="default_winscw" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld makefile" targetList="default_armv5" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld resource" targetList="default_armv5" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld library" targetList="default_armv5" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld target" targetList="default" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld final" targetList="default" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld -what build" targetList="default" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld -check build" targetList="default" unitParallel="Y" targetParallel="Y"/></task>
- </configuration>
-
-<!--
-launch -what command for binary only component so thosa can be zipped
-this configuration can be used only when those components has built among normal build
--->
- <configuration name="binary_only_what" description="do what command for binary only components" filter="raptor_binary_only_what">
-<layerRef layerName="bin_layer"/>
- <task><buildLayer command="abld -what build" targetList="default" unitParallel="Y" targetParallel="Y"/></task>
- </configuration>
-
-
-<!-- OS Extension build configurations start -->
-
- <configuration name="OSExt" description="S60 OS Extension build" filter="osext,dfs_build">
- <layerRef layerName="os_layer"/>
- <layerRef layerName="stubs_layer"/>
- <task><buildLayer command="bldmake bldfiles -k" unitParallel="Y"/></task>
- <task><buildLayer command="abld export -k" unitParallel="Y"/></task>
- <task><buildLayer command="abld makefile" targetList="default_winscw" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld resource" targetList="default_winscw" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld library" targetList="default_winscw" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld makefile" targetList="default_armv5" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld resource" targetList="default_armv5" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld library" targetList="default_armv5" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld target -k" targetList="default" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld final" targetList="default_armv5" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld -what build" targetList="default_armv5" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld -check build" targetList="default_armv5" unitParallel="Y" targetParallel="Y"/></task>
- </configuration>
-
-
-
- </build>
-</SystemDefinition>
--- a/symbian3/split/sysdefs/S60_SystemModel.xml Wed May 05 12:21:47 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1090 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?, build?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (logicalset* | module*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- levels CDATA #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT logicalset (logicalsubset* | module* | unit* | package* | prebuilt*)*>
- <!ATTLIST logicalset name CDATA #REQUIRED>
- <!ELEMENT logicalsubset (module* | unit* | package* | prebuilt*)*>
- <!ATTLIST logicalsubset name CDATA #REQUIRED>
- <!ELEMENT module (component* | unit* | package* | prebuilt*)*>
- <!ATTLIST module
- name CDATA #REQUIRED
- level CDATA #IMPLIED>
- <!ELEMENT component (unit* | package* | prebuilt*)*>
- <!ATTLIST component name CDATA #REQUIRED>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- unitID ID #REQUIRED
- name CDATA #REQUIRED
- mrp CDATA #REQUIRED
- filter CDATA #IMPLIED
- bldFile CDATA #REQUIRED
- priority CDATA #IMPLIED
- contract CDATA #IMPLIED>
- <!ELEMENT package EMPTY>
- <!ATTLIST package
- name CDATA #REQUIRED
- mrp CDATA #REQUIRED
- filter CDATA #IMPLIED
- contract CDATA #IMPLIED>
- <!ELEMENT prebuilt EMPTY>
- <!ATTLIST prebuilt
- name CDATA #REQUIRED
- version CDATA #REQUIRED
- late (Y|N) #IMPLIED
- filter CDATA #IMPLIED
- contract CDATA #IMPLIED>
- <!ELEMENT build (option* | target+ | targetList+ | unitList+ | configuration+)*>
- <!ELEMENT unitList (unitRef+)>
- <!ATTLIST unitList
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT unitRef EMPTY>
- <!ATTLIST unitRef unit IDREF #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y | N | y | n) #REQUIRED>
- <!ELEMENT configuration (unitListRef+ | layerRef+ | task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task ( unitListRef* , (buildLayer | specialInstructions))>
- <!ELEMENT unitListRef EMPTY>
- <!ATTLIST unitListRef unitList IDREF #REQUIRED>
- <!ELEMENT layerRef EMPTY>
- <!ATTLIST layerRef layerName CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y | N | y | n) #REQUIRED
- targetParallel (Y | N | y | n) #IMPLIED>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- command CDATA #REQUIRED>
-]>
-<!--
-============================================================================
-Name : sysdef_dtd_1_4_0.xml
-Part of : Helium
-Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-All rights reserved.
-This component and the accompanying materials are made available
-under the terms of the License "Eclipse Public License v1.0"
-which accompanies this distribution, and is available
-at the URL "http://www.eclipse.org/legal/epl-v10.html".
-Initial Contributors:
-Nokia Corporation - initial contribution.
-Contributors:
-Description:
-============================================================================
--->
-<SystemDefinition name="sysdef_dtd_1_4_0_xml + devicesync + eas + QuickOffice + adobereader + tfxserver + webvideo + wmdrmkeystorage_dist + wmdrmpd_dist + zipviewer + webservde + oemrndtools + swconfigapps + toolsextensions + avdomain + btaudioadaptation_stub + drm_stub + ocrsrv_stub + omasuplasnconverterstubimpl + posmsgpluginreferenceimpl + power_save_display_mode_stub + srsfenginestub + systemswstubs + tactileclickplugin_stub + wlanhwinit_stub + camera + commonemail + conntools + contacts + contentcontrol + conversations + devicecontrol + systemswextensions + files + gallery + graphicsuis + helps + homescreen + im + imgeditor + imgvieweruis + iptelephony + java + location + messaging + mmsharinguis + avdomain + organizer + phone + photos + printing + profile + radio + rndtools + screensaver + settingsuis + speechsrv + utils + videocenter + videoeditor + avdomain + videotelephony + avdomain + webuis + accesssec + appinstall + appsupport + btservices + camerasrv + classicui + dlnasrv + drm + hapticsservices + avdomain + homescreensrv + imghandling + imsrv + inputmethods + ipappprotocols + ipappservices + ipconnmgmt + legacypresence + locationsrv + mds + messagingmw + metadatasrv + avdomain + avdomain + mmuifw + netprotocols + networkingdm + opensrv + phonesrv + platformtools + remoteconn + remotemgmt + remotestorage + securitysrv + serviceapi + serviceapifw + shortlinkconn + ossrv + svgt + uiaccelerator + uiresources + uitools + usbservices + videoutils + vpnclient + web + websrv + wirelessacc + cellularsrv + S60Extras + devicesrv + graphics + imagingext + lbs + avdomainosext + networkingsrv + osrndtools + ossrv + shortlinksrv + systemswextensions + wlan + xmlsrv + buildplatforms + homescreentools + swconfigtools" schema="1.4.0"><systemModel>
- <layer name="app_layer">
- <module name="devicesync">
- <unit unitID="spdo.devicesync" mrp="" bldFile="ext/app/devicesync/group" filter="dfs_build" name="devicesync"/>
- </module>
-<module name="eas">
- <unit unitID="EDo.eas" mrp="" bldFile="ext/app/eas/group" name="eas" filter="dfs_build"/>
- </module>
-<module name="oemrndtools">
- <unit unitID="tools.oemrndtools" mrp="" bldFile="ext/tools/oemrndtools/group" name="oemrndtools"/>
- </module>
-<module name="">
- <unit unitID="tools.oemrndtools.trk" mrp="" bldFile="ext/tools/oemrndtools/trk/group" filter="oem_build" name="tools_oemrndtools_trk"/>
-<unit unitID="java.java.java_plat" mrp="" bldFile="sf/app/java/java_plat/group" filter="sf_build" name="java_java_plat"/>
-<unit unitID="java.java.java_stubs" mrp="" bldFile="sf/app/java/java_stubs/group" filter="sf_build" name="java_java_stubs"/>
-<unit unitID="tools.rndtools.htiui" mrp="" bldFile="sf/app/rndtools/htiui/group" filter="sf_build" name="tools_rndtools_htiui"/></module>
-<module name="swconfigapps">
- <unit unitID="tools.swconfigapps" mrp="" bldFile="ext/tools/swconfigapps/group" name="swconfigapps"/>
- </module>
-<module name="camera">
- <unit unitID="imm.camera" mrp="" bldFile="sf/app/camera/group" name="camera"/>
- <unit unitID="imm.camera.help" mrp="" bldFile="sf/app/camera/camerauis/cameraapp/help/group" name="camera_help"/>
- </module>
-<module name="commonemail">
- <unit unitID="EDo.commonemail" mrp="" bldFile="sf/app/commonemail/group" name="commonemail"/>
- </module>
-<module name="conntools">
- <unit unitID="netdo.conntools" mrp="" bldFile="sf/app/conntools/group" name="conntools"/>
- </module>
-<module name="contentcontrol">
- <unit unitID="spdo.contentcontrol" mrp="" bldFile="sf/app/contentcontrol/group" name="contentcontrol"/>
- </module>
-<module name="conversations">
- <unit unitID="MeCodo.conversations" mrp="" bldFile="sf/app/conversations/group" name="conversations"/>
- </module>
-<module name="devicecontrol">
- <unit unitID="spdo.devicecontrol" mrp="" bldFile="sf/app/devicecontrol/group" name="devicecontrol"/>
- </module>
-<module name="dictionary">
- <unit unitID="abs.dictionary" mrp="" bldFile="sf/app/dictionary/group" name="dictionary"/>
- </module>
-<module name="files">
- <unit name="files" unitID="sydo.files" bldFile="sf/app/files/group" mrp=""/>
- </module>
-<module name="gallery">
- <unit unitID="imm.gallery" mrp="" bldFile="sf/app/gallery/group" name="gallery"/>
- </module>
-<module name="graphicsuis">
- <unit unitID="abs.graphicsuis" mrp="" bldFile="sf/app/graphicsuis/group" name="graphicsuis"/>
- </module>
-<module name="helps">
- <unit unitID="abs.helps" mrp="" bldFile="sf/app/helps/group" name="helps"/>
- </module>
-<module name="homescreen">
- <unit unitID="abs.homescreen" mrp="" bldFile="sf/app/homescreen/group" name="homescreen"/>
- </module>
-<module name="im">
- <unit unitID="impp.im" mrp="" bldFile="sf/app/im/group" name="im"/>
- </module>
-<module name="imgeditor">
- <unit unitID="imm.imgeditor" mrp="" bldFile="sf/app/imgeditor/group" name="imgeditor"/>
- </module>
-<module name="imgvieweruis">
- <unit unitID="imm.imgvieweruis" mrp="" bldFile="sf/app/imgvieweruis/group" name="imgvieweruis"/>
- </module>
-<module name="iptelephony">
- <unit name="iptelephony" unitID="te.iptelephony" bldFile="sf/app/iptelephony/group" mrp=""/>
- </module>
-<module name="java">
- <unit unitID="java.java" mrp="" bldFile="sf/app/java/group" filter="!sf_build" name="java"/>
- </module>
-<module name="location">
- <unit unitID="lodo.location" mrp="" bldFile="sf/app/location/group" name="location"/>
- </module>
-<module name="messaging">
- <unit unitID="Medo.messaging" mrp="" bldFile="sf/app/messaging/group" name="messaging"/>
- </module>
-<module name="mmsharinguis">
- <unit unitID="msdo.mmsharinguis" name="mmsharinguis" bldFile="\sf\app\mmsharinguis\group" mrp=""/>
- </module>
-<module name="musicplayer">
- <unit unitID="musicplayer" mrp="" bldFile="sf/app/musicplayer/group" name="musicplayer"/>
- </module>
-<module name="organizer">
- <unit unitID="orgdo.organizer" mrp="" bldFile="sf/app/organizer/group" name="organizer"/>
- </module>
-<module name="phone">
- <unit name="phone" unitID="tedo.phone" bldFile="sf/app/phone/group" mrp=""/>
- </module>
-<module name="photos">
- <unit unitID="uxdo.photos" mrp="" bldFile="sf/app/photos/group" name="photos"/>
- </module>
-<module name="printing">
- <unit unitID="lcdo.printing" mrp="" bldFile="sf/app/printing/group" name="printing"/>
- </module>
-<module name="profile">
- <unit name="profile" unitID="presdo.profile" bldFile="sf/app/profile/group" mrp=""/>
- </module>
-<module name="radio">
- <unit unitID="vado.radio" mrp="" bldFile="sf/app/radio/group" name="radio"/>
- </module>
-<module name="rndtools">
- <unit unitID="tools.rndtools" mrp="" bldFile="sf/app/rndtools/group" name="rndtools"/>
- </module>
-<module name="screensaver">
- <unit unitID="abs.screensaver" mrp="" bldFile="sf/app/screensaver/group" name="screensaver"/>
- </module>
-<module name="settingsuis">
- <unit name="settingsuis" unitID="presdo.settingsuis" bldFile="sf/app/settingsuis/group" mrp=""/>
- </module>
-<module name="speechsrv">
- <unit unitID="MuiDo.speechsrv" mrp="" bldFile="sf/app/speechsrv/group" name="speechsrv"/>
- </module>
-<module name="utils">
- <unit unitID="orgdo.utils" mrp="" bldFile="sf/app/utils/group" name="utils"/>
- </module>
-<module name="videocenter">
- <unit unitID="vado.videocenter" mrp="" bldFile="sf/app/videocenter/group" name="videocenter"/>
- </module>
-<module name="videoeditor">
- <unit unitID="imm.videoeditor" mrp="" bldFile="sf/app/videoeditor/group" name="videoeditor"/>
- </module>
-<module name="videoplayer">
- <unit unitID="videoplayer" mrp="" bldFile="sf/app/videoplayer/group" name="videoplayer"/>
- </module>
-<module name="videotelephony">
- <unit name="videotelephony_plat" unitID="tedo.videotelephony_plat" bldFile="sf/app/videotelephony/videotelephony_plat/group" mrp=""/>
- <unit name="PacketVideoEngineBinaries" unitID="tedo.PacketVideoEngineBinaries" bldFile="sf/app/videotelephony/packetvideoengine/PacketVideoEngineBinaries/group" mrp="" filter="!sf_build"/>
- <unit name="vtprotocolsstub" unitID="tedo.vtprotocolsstub" bldFile="sf/app/videotelephony/vtprotocolsstub/group" mrp="" filter="sf_build"/>
- <unit name="vtprotocols" unitID="tedo.vtprotocols" bldFile="sf/app/videotelephony/vtprotocols/group" mrp="" filter="!sf_build"/>
- <unit name="DisplaySink" unitID="tedo.DisplaySink" bldFile="sf/app/videotelephony/vtprotocolplugins/DisplaySink/group" mrp=""/>
- <unit name="VideoSource" unitID="tedo.VideoSource" bldFile="sf/app/videotelephony/vtprotocolplugins/VideoSource/group" mrp=""/>
- <unit name="videoteleng" unitID="tedo.videoteleng" bldFile="sf/app/videotelephony/vtengines/videoteleng/Group" mrp=""/>
- <unit name="videotelui" unitID="tedo.videotelui" bldFile="sf/app/videotelephony/vtuis/videotelui/group" mrp=""/>
- <unit name="vtmediatorplugin" unitID="tedo.vtmediatorplugin" bldFile="sf/app/videotelephony/vtengines/vtmediatorplugin/group" mrp=""/>
- </module>
-<module name="voicerec">
- <unit unitID="voicerec" mrp="" bldFile="sf/app/voicerec/group" name="voicerec"/>
- </module>
-<module name="webuis">
- <unit unitID="browsing_domain.webuis" mrp="" bldFile="sf/app/webuis/group" name="webuis"/>
- </module></layer>
-<layer name="complementary_layer">
- <module name="QuickOffice">
- <unit unitID="orgdo.QuickOffice" mrp="" bldFile="ext/complementary/QuickOffice/group" name="QuickOffice"/>
- </module>
-<module name="adobereader">
- <unit unitID="orgdo.adobereader" mrp="" bldFile="ext/complementary/adobereader/group" name="adobereader"/>
- </module>
-<module name="webvideo">
- <unit unitID="wvdo.webvideo" mrp="" bldFile="ext/complementary/webvideo/group" name="webvideo"/>
- </module>
-<module name="wmdrmkeystorage_dist">
- <unit unitID="sedo.wmdrmkeystorage_dist" mrp="" bldFile="ext/complementary/wmdrmkeystorage_dist/group" name="wmdrmkeystorage_dist" filter="dfs_build"/>
- </module>
-<module name="wmdrmpd_dist">
- <unit unitID="sedo.wmdrmpd_dist" mrp="" bldFile="ext/complementary/wmdrmpd_dist/group" name="wmdrmpd_dist" filter="dfs_build"/>
- </module>
-<module name="zipviewer">
- <unit unitID="orgdo.zipviewer" mrp="" bldFile="ext/complementary/zipviewer/group" name="zipviewer"/>
- </module></layer>
-<layer name="mw_layer">
- <module name="websrvde">
- <unit unitID="WSDo.websrvde" mrp="" bldFile="ext/mw/websrvde/group" name="websrvde" filter="dfs_build"/>
- </module>
-<module name="accesssec">
- <unit unitID="netdo.accesssec" mrp="" bldFile="sf/mw/accesssec/group" name="accesssec"/>
- </module>
-<module name="appinstall">
- <unit unitID="sedo.appinstall" mrp="" bldFile="sf/mw/appinstall/group" name="appinstall"/>
- </module>
-<module name="appsupport">
- <unit unitID="sydo.appsupport" name="appsupport" bldFile="sf/mw/appsupport/group" mrp=""/>
- </module>
-<module name="">
- <unit unitID="sydo.appsupport.appsupport_plat.flash_mmi_service_interface_custom_api" name="sydo_appsupport_appsupport_plat_flash_mmi_service_interface_custom_api" bldFile="sf/mw/appsupport/appsupport_plat/flash_mmi_service_interface_custom_api/group" mrp="" filter="!sf_build"/>
- <unit unitID="sydo.appsupport.appsupport_plat.flash_netscape_plugin_command_api" name="sydo_appsupport_appsupport_plat_flash_netscape_plugin_command_api" bldFile="sf/mw/appsupport/appsupport_plat/flash_netscape_plugin_command_api/group" mrp="" filter="!sf_build"/>
-<unit unitID="mmmw_3GPExtParserLib" mrp="" bldFile="sf/mw/mmmw/metadatautility/3GPExtParserLib/group" filter="!sf_build" name="mmmw_3GPExtParserLib"/>
-<unit unitID="mtp" mrp="" bldFile="sf/mw/mmmw/mtp/group" filter="!sf_build" name="mtp"/>
-<unit unitID="helix_stub" mrp="" bldFile="sf/mw/mmmw/mmfw/helix_stub/group" filter="sf_build" name="helix_stub"/>
-<unit unitID="sedo.securitysrv.pkiutilities.Certificates" bldFile="sf/mw/securitysrv/pkiutilities/Certificates/group" mrp="" filter="sf_build" name="sedo_securitysrv_pkiutilities_Certificates"/>
-<unit unitID="sedo.securitysrv.pkiutilities.Certificates_OEM" bldFile="sf/mw/securitysrv/pkiutilities/Certificates_OEM/group" mrp="" filter="oem_build" name="sedo_securitysrv_pkiutilities_Certificates_OEM"/>
-<unit unitID="lcdo.usbservices.usbclasses.usbosdescriptorhandler" mrp="" bldFile="\sf\mw\usbservices\usbclasses\usbosdescriptorhandler\group" filter="!sf_build" name="usbservices_usbclasses_usbosdescriptorhandler"/></module>
-<module name="btservices">
- <unit unitID="lcdo.btservices" mrp="" bldFile="\sf\mw\btservices\group" name="btservices"/>
- </module>
-<module name="camerasrv">
- <unit unitID="imm.camerasrv" mrp="" bldFile="sf/mw/camerasrv/group" name="camerasrv"/>
- </module>
-<module name="dlnasrv">
- <unit name="homemedia" unitID="hcdo.homemedia" bldFile="sf/mw/dlnasrv/homemedia/group" mrp=""/>
- <unit name="homesync" unitID="hcdo.homesync" bldFile="sf/mw/dlnasrv/homesync/group" mrp=""/>
- <unit name="upnpavcontrolpoint" unitID="hcdo.upnpavcontrolpoint" bldFile="sf/mw/dlnasrv/upnpavcontrolpoint/group" mrp=""/>
- <unit name="upnpframework" unitID="hcdo.upnpframework" bldFile="sf/mw/dlnasrv/upnpframework/group" mrp=""/>
- <unit name="upnpharvester" unitID="hcdo.upnpharvester" bldFile="sf/mw/dlnasrv/upnpharvester/group" mrp=""/>
- <unit name="upnpmediaserver" unitID="hcdo.upnpmediaserver" bldFile="sf/mw/dlnasrv/upnpmediaserver/group" mrp=""/>
- <unit name="upnpavcontroller" unitID="hcdo.upnpavcontroller" bldFile="sf/mw/dlnasrv/upnpavcontroller/group" mrp=""/>
- <unit name="upnpsharing" unitID="hcdo.upnpsharing" bldFile="sf/mw/dlnasrv/upnpsharing/group" mrp=""/>
- <unit name="upnpsettings" unitID="hcdo.upnpsettings" bldFile="sf/mw/dlnasrv/upnpsettings/group" mrp=""/>
- <unit name="upnpmpxplugins" unitID="hcdo.upnpmpxplugins" bldFile="sf/mw/dlnasrv/upnpmpxplugins/group" mrp=""/>
- <unit name="dlnasrv_plat" unitID="hcdo.dlnasrv_plat" bldFile="sf/mw/dlnasrv/dlnasrv_plat/group" mrp=""/>
- </module>
-<module name="drm">
- <unit unitID="sedo.drm" mrp="" bldFile="sf/mw/drm/group" name="drm"/>
- </module>
-<module name="hapticsservices">
- <unit unitID="abs.hapticsservices" mrp="" bldFile="sf/mw/hapticsservices/group" name="hapticsservices"/>
- <unit unitID="abs.tactilefeedbackresolver" mrp="" bldFile="sf/mw/hapticsservices/tactilefeedback/tactilefeedbackresolver/plugins/group" filter="dfs_build" name="tactilefeedbackresolver"/>
- <unit unitID="abs.tacticonhapticsplugin" mrp="" bldFile="sf/mw/hapticsservices/tacticonserver/server/tacticonpluginfw/tacticonhapticsplugin/group" filter="dfs_build" name="tacticonhapticsplugin"/>
- </module>
-<module name="helix">
- <unit unitID="helix" mrp="" bldFile="sf/mw/helix/group" filter="!sf_build" name="helix"/>
- <unit unitID="helix_src" mrp="" bldFile="sf/mw/helix/helix_ren/src/group" filter="!sf_build" name="helix_src"/>
- </module>
-<module name="homescreensrv">
- <unit unitID="hs.homescreensrv" mrp="" bldFile="sf/mw/homescreensrv/group" name="homescreensrv"/>
- </module>
-<module name="imghandling">
- <unit unitID="imm.imghandling" mrp="" bldFile="sf/mw/imghandling/group" name="imghandling"/>
- </module>
-<module name="imsrv">
- <unit unitID="MeCodo.imsrv" mrp="" bldFile="sf/mw/imsrv/group" name="imsrv"/>
- </module>
-<module name="inputmethods">
- <unit unitID="abs.inputmethods" mrp="" bldFile="sf/mw/inputmethods/group" name="inputmethods"/>
- </module>
-<module name="ipappprotocols">
- <unit unitID="ipappprotocol" name="ipappprotocol" bldFile="\sf\mw\ipappprotocols\group" mrp=""/>
- </module>
-<module name="ipappsrv">
- <unit unitID="ipappsrv" name="ipappservice" bldFile="\sf\mw\ipappsrv\group" mrp=""/>
- </module>
-<module name="ipconnmgmt">
- <unit unitID="netdo.ipconnmgmt" mrp="" bldFile="sf/mw/ipconnmgmt/group" name="ipconnmgmt"/>
- </module>
-<module name="legacypresence">
- <unit unitID="presdo.legacypresence" mrp="" bldFile="sf/mw/legacypresence/group" name="legacypresence"/>
- </module>
-<module name="locationsrv">
- <unit unitID="lodo.locationsrv" mrp="" bldFile="sf/mw/locationsrv/group" name="locationsrv"/>
- </module>
-<module name="asnpluginimplementation">
- <unit unitID="lodo.locationsrv.supl.asnpluginimplementation" mrp="" bldFile="sf/mw/locationsrv/supl/locationomasuplprotocolhandler/asnpluginimplementation/group" filter="dfs_build" name="lodo_locationsrv_supl_asnpluginimplementation>"/>
- </module>
-<module name="mds">
- <unit unitID="imm.mds" mrp="" bldFile="sf/mw/mds/group" name="mds"/>
- </module>
-<module name="messagingmw">
- <unit unitID="Medo.messagingmw" mrp="" bldFile="sf/mw/messagingmw/group" name="messagingmw"/>
- </module>
-<module name="metadatasrv">
- <unit unitID="imm.metadatasrv" mrp="" bldFile="sf/mw/metadatasrv/group" name="metadatasrv"/>
- </module>
-<module name="mmappfw">
- <unit unitID="mmappfw" mrp="" bldFile="sf/mw/mmappfw/group" name="mmappfw"/>
- </module>
-<module name="mmmw">
- <unit unitID="mmmw" mrp="" bldFile="sf/mw/mmmw/group" name="mmmw"/>
- </module>
-<module name="mmuifw">
- <unit unitID="uxdo.mmuifw" mrp="" bldFile="sf/mw/mmuifw/group" name="mmuifw"/>
- </module>
-<module name="netprotocols">
- <unit unitID="browsing_domain.netprotocols" mrp="" bldFile="sf/mw/netprotocols/group" name="netprotocols"/>
- </module>
-<module name="networkingdm">
- <unit unitID="netdo.networkingdm" mrp="" bldFile="sf/mw/networkingdm/group" name="networkingdm"/>
- </module>
-<module name="opensrv">
- <unit unitID="MeCodo.opensrv" mrp="" bldFile="sf/mw/opensrv/group" name="opensrv"/>
- </module>
-<module name="phonesrv">
- <unit name="phonesrv_plat" unitID="tedo.phonesrv_plat" bldFile="sf/mw/phonesrv/phonesrv_plat/group" mrp=""/>
- <unit name="phonesrv_pub" unitID="tedo.phonesrv_pub" bldFile="sf/mw/phonesrv/phonesrv_pub/group" mrp=""/>
- <unit name="CbsServer" unitID="tedo.CbsServer" bldFile="sf/mw/phonesrv/cbs/CbsServer/group" mrp=""/>
- <unit name="cbsui" unitID="tedo.cbsui" bldFile="sf/mw/phonesrv/cbs/cbsui/group" mrp=""/>
- <unit name="convergedcallengine" unitID="tedo.convergedcallengine" bldFile="sf/mw/phonesrv/convergedcallengine/group" mrp=""/>
- <unit name="networkhandlingengine" unitID="tedo.networkhandlingengine" bldFile="sf/mw/phonesrv/networkhandling/networkhandlingengine/group" mrp=""/>
- <unit name="aiwdialdata" unitID="tedo.aiwdialdata" bldFile="sf/mw/phonesrv/phoneclientserver/aiwdialdata/group" mrp=""/>
- <unit name="CallUI" unitID="tedo.CallUI" bldFile="sf/mw/phonesrv/phoneclientserver/CallUI/group" mrp=""/>
- <unit name="dialutils" unitID="tedo.dialutils" bldFile="sf/mw/phonesrv/phoneclientserver/dialutils/group" mrp=""/>
- <unit name="EnPolicy" unitID="tedo.EnPolicy" bldFile="sf/mw/phonesrv/phoneclientserver/EnPolicy/group" mrp=""/>
- <unit name="phoneclient" unitID="tedo.phoneclient" bldFile="sf/mw/phonesrv/phoneclientserver/phoneclient/group" mrp=""/>
- <unit name="phoneserver" unitID="tedo.phoneserver" bldFile="sf/mw/phonesrv/phoneclientserver/phoneserver/group" mrp=""/>
- <unit name="SatServer" unitID="tedo.SatServer" bldFile="sf/mw/phonesrv/satengine/SatServer/group" mrp=""/>
- <unit name="satapp" unitID="tedo.satapp" bldFile="sf/mw/phonesrv/satui/satapp/group" mrp=""/>
- <unit name="satplugin" unitID="tedo.satplugin" bldFile="sf/mw/phonesrv/satui/satplugin/group" mrp=""/>
- <unit name="phoneparser" unitID="tedo.phoneparser" bldFile="sf/mw/phonesrv/telutils/phoneparser/group" mrp=""/>
- <unit name="telephonyservice" unitID="tedo.telephonyservice" bldFile="sf/mw/phonesrv/telutils/telephonyservice/group" mrp=""/>
- <unit name="telephonysettings" unitID="tedo.telephonysettings" bldFile="sf/mw/phonesrv/cellular/telephonysettings/group" mrp=""/>
- <unit name="sssettings" unitID="tedo.sssettings" bldFile="sf/mw/phonesrv/cellular/sssettings/group" mrp=""/>
- <unit name="psetnotesui" unitID="tedo.psetnotesui" bldFile="sf/mw/phonesrv/cellular/psetnotesui/group" mrp=""/>
- <unit name="servicerequest" unitID="tedo.servicerequest" bldFile="sf/mw/phonesrv/cellular/servicerequest/group" mrp=""/>
- <unit name="phonecmdhnlr" unitID="tedo.phonecmdhnlr" bldFile="sf/mw/phonesrv/phonecmdhandler/phonecmdhnlr/group" mrp=""/>
- <unit name="vmbxengine" unitID="tedo.vmbxengine" bldFile="sf/mw/phonesrv/engines/vmbxengine/group" mrp=""/>
- </module>
-<module name="platformtools">
- <unit unitID="tools.platformtools" mrp="" bldFile="sf/mw/platformtools/group" name="platformtools"/>
- </module>
-<module name="remoteconn">
- <unit name="remoteconn" unitID="sydo.remoteconn" bldFile="sf/mw/remoteconn/group" mrp=""/>
- </module>
-<module name="remotemgmt">
- <unit unitID="spdo.remotemgmt" mrp="" bldFile="sf/mw/remotemgmt/group" name="remotemgmt"/>
- </module>
-<module name="remotestorage">
- <unit unitID="presdo.remotestorage" mrp="" bldFile="sf/mw/remotestorage/group" name="remotestorage"/>
- </module>
-<module name="securitysrv">
- <unit name="securitysrv" unitID="sedo.securitysrv" bldFile="sf/mw/securitysrv/group" mrp=""/>
- </module>
-<module name="serviceapi">
-<unit name="serviceapi" unitID="sapido.serviceapi" bldFile="sf/mw/serviceapi/group" mrp=""/>
-</module>
-<module name="serviceapifw">
-<unit name="serviceapifw" unitID="sapido.serviceapifw" bldFile="sf/mw/serviceapifw/group" mrp=""/>
-</module>
-<module name="shortlinkconn">
- <unit unitID="lcdo.shortlinkconn" mrp="" bldFile="\sf\mw\shortlinkconn\group" name="shortlinkconn"/>
- </module>
-<module name="upnp">
-<unit name="upnp" unitID="mrtdo.upnp" bldFile="sf/mw/srvdiscovery/upnp/group" mrp=""/>
-</module>
-<module name="svgt">
- <unit unitID="abs.svgt" mrp="" bldFile="sf/mw/svgt/group" name="svgt"/>
- </module>
-<module name="uiaccelerator">
- <unit unitID="abs.uiaccelerator" mrp="" bldFile="sf/mw/uiaccelerator/group" name="uiaccelerator"/>
- </module>
-<module name="uiresources">
- <unit unitID="abs.uiresources" mrp="" bldFile="sf/mw/uiresources/group" name="uiresources"/>
- </module>
-<module name="usbservices">
- <unit unitID="lcdo.usbservices" mrp="" bldFile="\sf\mw\usbservices\group" name="usbservices"/>
- </module>
-<module name="videoutils">
- <unit unitID="vado.videoutils" mrp="" bldFile="sf/mw/videoutils/group" name="videoutils"/>
- </module>
-<module name="vpnclient">
- <unit unitID="netdo.vpnclient" mrp="" bldFile="sf/mw/vpnclient/group" filter="!oem_build" name="vpnclient"/>
- </module>
-<module name="web">
- <unit unitID="browsing_domain.web" mrp="" bldFile="sf/mw/web/group" name="web"/>
- </module>
-<module name="websrv">
- <unit unitID="WSDo.websrv" mrp="" bldFile="sf/mw/websrv/group" name="websrv"/>
- </module>
-<module name="wirelessacc">
- <unit unitID="netdo.wirelessacc" mrp="" bldFile="sf/mw/wirelessacc/group" name="wirelessacc"/>
- </module></layer>
-<layer name="os_layer">
- <module name="toolsextensions">
- <unit unitID="tools.toolsextensions" mrp="" bldFile="ext/tools/toolsextensions/group" name="toolsextensions"/>
- </module>
-<module name="cellularsrv">
- <unit name="cellularsrv" unitID="tsydo.cellularsrv" bldFile="sf/os/cellularsrv/group" mrp=""/>
- </module>
-<module name="S60Extras">
- <unit unitID="platform.S60Extras" mrp="" bldFile="sf/os/deviceplatformrelease/S60Extras/group" name="S60Extras"/>
- </module>
-<module name="S60LocFiles">
- <unit unitID="platform.S60LocFiles" mrp="" bldFile="sf/os/deviceplatformrelease/S60LocFiles/group" filter="sf_build" name="S60LocFiles"/>
- <unit unitID="platform.S60LocFiles_oem" mrp="" bldFile="sf/os/deviceplatformrelease/S60LocFiles/group_oem" filter="!sf_build" name="group_oem"/>
- </module>
-<module name="version">
- <unit unitID="platform.version" mrp="" bldFile="sf/os/deviceplatformrelease/Version/group" name="version"/>
- </module>
-<module name="devicesrv">
- <unit unitID="sydo.devicesrv" mrp="" bldFile="sf/os/devicesrv/group" name="devicesrv"/>
- </module>
-<module name="">
- <unit unitID="sydo.devicesrv.hapticsvibepacketizerplugin" mrp="" bldFile="sf/os/devicesrv/hwrmhaptics/hapticspacketizer/plugins/hapticsvibepacketizerplugin/group" name="sydo_devicesrv_hapticsvibepacketizerplugin" filter="dfs_build"/>
- <unit unitID="sydo.devicesrv.hapticsivtgetterplugin" mrp="" bldFile="sf/os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/plugins/hapticsivtgetterplugin/group" name="sydo_devicesrv_hapticsivtgetterplugin" filter="dfs_build"/>
-<unit unitID="imm.imagingext.imagingmodules.videoencpluginarm" mrp="" bldFile="sf/os/imagingext/imagingmodules/VideoEncPluginARM/Build" filter="oem_build" name="imm_imagingext_imagingmodules_videoencpluginarm"/>
-<unit unitID="imm.imagingext.imagingmodules.h264avcvideoencarm" mrp="" bldFile="sf/os/imagingext/imagingmodules/H264AVCVideoEncARM/group" filter="oem_build" name="imm_imagingext_imagingmodules_h264avcvideoencarm"/>
-<unit unitID="AacEncoderPlugin" mrp="" bldFile="sf/os/mm/audio/ARM_CMMF_codecs/AacEncoderPlugin/group" filter="!sf_build" name="AacEncoderPlugin"/>
-<unit unitID="AmrNbCodecPlugin" mrp="" bldFile="sf/os/mm/audio/ARM_CMMF_codecs/AmrNbCodecPlugin/group" filter="!sf_build" name="AmrNbCodecPlugin"/>
-<unit unitID="AmrWbCodecPlugin" mrp="" bldFile="sf/os/mm/audio/ARM_CMMF_codecs/AmrWbCodecPlugin/group" filter="!sf_build" name="AmrWbCodecPlugin"/>
-<unit unitID="EAacPlusCodecPlugin" mrp="" bldFile="sf/os/mm/audio/ARM_CMMF_codecs/EAacPlusCodecPlugin/group" filter="!sf_build" name="EAacPlusCodecPlugin"/>
-<unit unitID="MP3CodecPlugin" mrp="" bldFile="sf/os/mm/audio/ARM_CMMF_codecs/MP3CodecPlugin/group" filter="!sf_build" name="MP3CodecPlugin"/>
-<unit unitID="WMADecoderPlugin" mrp="" bldFile="sf/os/mm/audio/ARM_CMMF_codecs/WMADecoderPlugin/group" filter="!sf_build" name="WMADecoderPlugin"/>
-<unit unitID="ARM_MDF_Decoders" mrp="" bldFile="sf/os/mm/video/ARM_MDF_Decoders/group" filter="!sf_build" name="ARM_MDF_Decoders"/>
-<unit unitID="tools.osrndtools.osrndtools_plat.hti_api" mrp="" bldFile="sf/os/osrndtools/osrndtools_plat/hti_api/group" filter="sf_build" name="tools_osrndtools_osrndtools_plat_hti_api"/>
-<unit unitID="tools.osrndtools.hti" mrp="" bldFile="sf/os/osrndtools/hti/group" filter="sf_build" name="tools_osrndtools_hti"/></module>
-<module name="graphics">
- <unit unitID="abs.graphics" mrp="" bldFile="sf/os/graphics/group" name="graphics"/>
- </module>
-<module name="imagingext">
- <unit unitID="imm.imagingext" mrp="" bldFile="sf/os/imagingext/group" name="imagingext"/>
- </module>
-<module name="lbs">
- <unit unitID="lodo.lbs" mrp="" bldFile="sf/os/lbs/group" name="lodo.lbs"/>
- </module>
-<module name="mm">
- <unit unitID="mm" mrp="" bldFile="sf/os/mm/group" name="mm"/>
- </module>
-<module name="networkingsrv">
- <unit unitID="netdo.networkingsrv" mrp="" bldFile="sf/os/networkingsrv/group" name="networkingsrv"/>
- </module>
-<module name="osrndtools">
- <unit unitID="tools.osrndtools" mrp="" bldFile="sf/os/osrndtools/group" name="osrndtools"/>
- </module>
-<module name="ossrv">
-<unit name="ossrv" unitID="mrtdo.ossrv" bldFile="sf/os/ossrv/group" mrp=""/>
-</module>
-<module name="shortlinksrv">
- <unit unitID="lcdo.shortlinksrv" mrp="" bldFile="sf/os/shortlinksrv/group" name="shortlinksrv"/>
- </module>
-<module name="textandloc">
- <unit unitID="abs.textandloc" mrp="" bldFile="sf/os/textandloc/group" name="textandloc"/>
- </module>
-<module name="wlan">
- <unit unitID="netdo.wlan" mrp="" bldFile="sf/os/wlan/group" name="wlan"/>
- <unit unitID="netdo.wlanwpx" mrp="" bldFile="sf/os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group/wpx" filter="dfs_build" name="wlanwpx"/>
- </module>
-<module name="xmlsrv">
- <unit unitID="WSDo.xmlsrv" mrp="" bldFile="sf/os/xmlsrv/group" name="xmlsrv"/>
- </module>
-<module name="sf_common_tsy">
- <component name="sf_common_tsy">
- <unit unitID="symbian.common_tsy" name="sf_common_tsy" bldFile="\sf\os\cellularsrv\telephonyserverplugins\common_tsy\group" mrp="" filter=""/>
- </component>
- </module>
-<module name="sf_openvg11">
- <component name="sf_openvg11">
- <unit unitID="symbian.openvg11" name="sf_openvg11" bldFile="\sf\os\graphics\openvg\openvginterface\group\openvg11" mrp="" filter="sf_build"/>
- </component>
- </module></layer>
-<layer name="stubs_layer">
- <module name="audiostubs">
- <unit unitID="audiostubs" mrp="" bldFile="sf/adaptation/stubs/audiostubs/group" name="audiostubs"/>
- </module>
-<module name="btaudioadaptation_stub">
- <unit unitID="lcdo.btaudioadaptation_stub" mrp="" bldFile="sf/adaptation/stubs/btaudioadaptation_stub/group" name="btaudioadaptation_stub" filter="oem_build"/>
- </module>
-<module name="drm_stubs">
- <unit name="drm_stubs" unitID="sedo.drm_stubs" bldFile="sf/adaptation/stubs/drm_stubs/group" mrp=""/>
- </module>
-<module name="ocrsrv_stub">
- <unit unitID="abs.ocrsrv_stub" mrp="" bldFile="sf/adaptation/stubs/ocrsrv_stub/group" filter="!dfs_build" name="ocrsrv_stub"/>
- </module>
-<module name="omasuplasnconverterstubimpl">
- <unit unitID="lodo.omasuplasnconverterstubimpl" mrp="" bldFile="sf/adaptation/stubs/omasuplasnconverterstubimpl/group" filter="!dfs_build" name="omasuplasnconverterstubimpl"/>
- </module>
-<module name="posmsgpluginreferenceimpl">
- <unit unitID="lodo.posmsgpluginreferenceimpl" mrp="" bldFile="sf/adaptation/stubs/posmsgpluginreferenceimpl/group" name="posmsgpluginreferenceimpl"/>
- </module>
-<module name="power_save_display_mode_stub">
- <unit unitID="abs.power_save_display_mode_stub" mrp="" bldFile="sf/adaptation/stubs/power_save_display_mode_stub/group" name="power_save_display_mode_stub"/>
- </module>
-<module name="srsfenginestub">
- <unit unitID="MuiDo.srsfenginestub" mrp="" bldFile="sf/adaptation/stubs/srsfenginestub/group" name="srsfenginestub" filter="stubs"/>
- </module>
-<module name="systemswstubs">
- <unit name="systemswstubs" unitID="sydo.systemswstubs" bldFile="sf/adaptation/stubs/systemswstubs/group" mrp=""/>
- </module>
-<module name="">
- <unit name="sydo_systemswstubs_TVOutConfig" unitID="sydo.systemswstubs.TVOutConfig" bldFile="sf/adaptation/stubs/systemswstubs/TVOutConfig/group" mrp="" filter="oem_build"/>
- <unit name="sydo_systemswstubs_accessorypolicyreference" unitID="sydo.systemswstubs.accessorypolicyreference" bldFile="sf/adaptation/stubs/systemswstubs/accessorypolicyreference/group" mrp="" filter="oem_build"/>
- <unit name="sydo_systemswstubs_asyreference" unitID="sydo.systemswstubs.asyreference" bldFile="sf/adaptation/stubs/systemswstubs/asyreference/group" mrp="" filter="oem_build"/>
- <unit name="sydo_systemswstubs_examplecommonisc" unitID="sydo.systemswstubs.examplecommonisc" bldFile="sf/adaptation/stubs/systemswstubs/examplecommonisc/group" mrp="" filter="oem_build"/>
- <unit name="sydo_systemswstubs_exampledsy" unitID="sydo.systemswstubs.exampledsy" bldFile="sf/adaptation/stubs/systemswstubs/exampledsy/group" mrp="" filter="oem_build"/>
- <unit name="sydo_systemswstubs_featuremanagerstub" unitID="sydo.systemswstubs.featuremanagerstub" bldFile="sf/adaptation/stubs/systemswstubs/featuremanagerstub/group" mrp="" filter="oem_build"/>
- <unit name="sydo_systemswstubs_hwrmstubplugins" unitID="sydo.systemswstubs.hwrmstubplugins" bldFile="sf/adaptation/stubs/systemswstubs/hwrmstubplugins/group" mrp="" filter="oem_build"/>
- <unit name="sydo_systemswstubs_hwrmhapticsstubplugin" unitID="sydo.systemswstubs.hwrmhapticsstubplugin" bldFile="sf/adaptation/stubs/systemswstubs/hwrmhapticsstubplugin/group" mrp="" filter="oem_build"/>
- <unit name="sydo_systemswstubs_sensorchannelsreference" unitID="sydo.systemswstubs.sensorchannelsreference" bldFile="sf/adaptation/stubs/systemswstubs/sensorchannelsreference/group" mrp="" filter="oem_build"/>
- <unit name="sydo_systemswstubs_ssyreference" unitID="sydo.systemswstubs.ssyreference" bldFile="sf/adaptation/stubs/systemswstubs/ssyreference/group" mrp="" filter="oem_build"/>
- <unit name="sydo_systemswstubs_startupadaptationstub" unitID="sydo.systemswstubs.startupadaptationstub" bldFile="sf/adaptation/stubs/systemswstubs/startupadaptationstub/group" mrp="" filter="oem_build"/>
- <unit name="sydo_systemswstubs_tiltcompensationstub" unitID="sydo.systemswstubs.tiltcompensationstub" bldFile="sf/adaptation/stubs/systemswstubs/tiltcompensationstub/group" mrp="" filter="oem_build"/>
- <unit name="sydo_systemswstubs_tvoutbehaviour" unitID="sydo.systemswstubs.tvoutbehaviour" bldFile="sf/adaptation/stubs/systemswstubs/tvoutbehaviour/group" mrp="" filter="oem_build"/>
- <unit name="sydo_systemswstubs_wiredbearerreference" unitID="sydo.systemswstubs.wiredbearerreference" bldFile="sf/adaptation/stubs/systemswstubs/wiredbearerreference/group" mrp="" filter="oem_build"/>
- </module>
-<module name="tactileclickplugin_stub">
- <unit unitID="abs.tactileclickplugin_stub" mrp="" bldFile="sf/adaptation/stubs/tactileclickplugin_stub/group" name="tactileclickplugin_stub"/>
- </module>
-<module name="wlanhwinit_stub">
- <unit unitID="netdo.wlanhwinit_stub" mrp="" bldFile="sf/adaptation/stubs/wlanhwinit_stub/group" name="wlanhwinit_stub"/>
- </module>
-<module name="sf_licenseetsystub">
- <component name="sf_licenseetsystub">
- <unit unitID="symbian.licenseetsystub" name="sf_licenseetsystub" bldFile="\sf\os\cellularsrv\telephonyserverplugins\licenseetsystub\group" mrp="" filter=""/>
- </component>
- </module></layer>
-<layer name="adaptation_stubs_audiostubs_layer">
- <module name="audiostubs_group">
- <unit unitID="audiostubs_group" mrp="" bldFile="sf/adaptation/stubs/audiostubs/group" name="audiostubs_group"/>
- </module>
- </layer>
-<layer name="api_test_layer">
- <module name="camera_api_tests">
- <unit unitID="imm.camera.camcorder_ui_constants_api" mrp="" bldFile="sf/app/camera/camera_plat/camcorder_ui_constants_api/tsrc/group" name="camcorder_ui_constants_api"/>
- </module>
- <module name="active_palette_2_api_tests">
- <unit unitID="imm.camera.active_palette_2_api" mrp="" bldFile="sf/app/camera/camera_plat/active_palette_2_api/tsrc/group" name="active_palette_2_api"/>
- </module>
-<module name="contacts_plat">
- <unit unitID="cms_contactor_api" mrp="" bldFile="sf/app/contacts/contacts_plat/cms_contactor_api/tsrc/group" name="cms_contactor_api"/>
- <unit unitID="cca_launch_api" mrp="" bldFile="sf/app/contacts/contacts_plat/cca_launch_api/tsrc/group" name="cca_launch_api"/>
- <unit unitID="cca_view_plugin_api" mrp="" bldFile="sf/app/contacts/contacts_plat/cca_view_plugin_api/tsrc/group" name="cca_view_plugin_api"/>
- <unit unitID="contactpresence_api" mrp="" bldFile="sf/app/contacts/contacts_plat/contactpresence_api/tsrc/group" name="contactpresence_api"/>
- <unit unitID="presence_cache_api" mrp="" bldFile="sf/app/contacts/contacts_plat/presence_cache_api/tsrc/group" name="clientsrvtester"/>
- <unit unitID="virtual_phonebook_policy_api" mrp="" bldFile="sf/app/contacts/contacts_plat/virtual_phonebook_policy_api/tsrc/group" name="virtual_phonebook_policy_api"/>
- <unit unitID="virtual_phonebook_sim_services_api" mrp="" bldFile="sf/app/contacts/contacts_plat/virtual_phonebook_sim_services_api/tsrc/group" name="virtual_phonebook_sim_services_api"/>
- <unit unitID="virtual_phonebook_store_api" mrp="" bldFile="sf/app/contacts/contacts_plat/virtual_phonebook_store_api/tsrc/group" name="virtual_phonebook_store_api"/>
- <unit unitID="virtual_phonebook_vcard_api" mrp="" bldFile="sf/app/contacts/contacts_plat/virtual_phonebook_vcard_api/tsrc/group" name="virtual_phonebook_vcard_api"/>
- <unit unitID="virtual_phonebook_view_definition_api" mrp="" bldFile="sf/app/contacts/contacts_plat/virtual_phonebook_view_definition_api/tsrc/group" name="virtual_phonebook_view_definition_api"/>
- <unit unitID="predictivesearch_client_api" mrp="" bldFile="sf/app/contacts/contacts_plat/predictivesearch_client_api/tsrc/group" name="predictivesearch_client_api"/>
- <unit unitID="predictivesearch_utils_api" mrp="" bldFile="sf/app/contacts/contacts_plat/predictivesearch_utils_api/tsrc/group" name="predictivesearch_utils_api"/>
- </module>
-<module name="gallery_api_tests">
- <unit unitID="imm.gallery_api" mrp="" bldFile="sf/app/gallery/mediagallery/mediagallery2/tsrc/public/basic/group" name="gallery_api"/>
- </module>
-<module name="imgeditor_api_tests">
- <unit unitID="imm.imageeditorengine_api" mrp="" bldFile="sf/app/imgeditor/imageeditorengine/tsrc/public/basic/group" name="imageeditorengine_api"/>
- </module>
-<module name="mmsharinguis_api_test">
- <unit unitID="msdo.mmsharinguis_api_test" mrp="" bldFile="\sf\app\mmsharinguis\mmsharinguis_plat\multimedia_sharing_manager_api\tsrc\group" name="mmsharinguis_api_test"/>
- </module>
-<module name="musicplayer_tsrc">
- <unit unitID="musicplayer_tsrc" name="musicplayer_tsrc" bldFile="sf/app/musicplayer/tsrc/group" mrp=""/>
- </module>
-<module name="tedo_api_tests">
- <unit unitID="tedo.dialer.test" name="dialer.test" bldFile="sf/app/phone/phoneuis/dialer/tsrc/public/basic/group" mrp=""/>
- <unit unitID="tedo.SFIUtils.test" name="SFIUtils.test" bldFile="sf/app/phone/phoneuis/SFIUtils/tsrc/public/basic/group" mrp=""/>
- <unit unitID="tedo.phoneui.test" name="phoneui.test" bldFile="sf/app/phone/phoneapp/phoneui/tsrc/public/basic/group" mrp=""/>
-<unit unitID="tedo.PsetNotesUi.test" name="PsetNotesUi.test" bldFile="sf/mw/phonesrv/cellular/PsetNotesUi/tsrc/public/basic/group" mrp=""/>
-<unit unitID="tedo.SSSettings.test" name="SSSettings.test" bldFile="sf/mw/phonesrv/cellular/SSSettings/tsrc/public/basic/group" mrp=""/>
-<unit unitID="tedo.telephonysettings.test" name="telephonysettings.test" bldFile="sf/mw/phonesrv/cellular/telephonysettings/tsrc/public/basic/group" mrp=""/>
-<unit unitID="tedo.cce.test" name="cce.test" bldFile="sf/mw/phonesrv/convergedcallengine/cce/tsrc/public/basic/group" mrp=""/>
-<unit unitID="tedo.spsettings.test" name="spsettings.test" bldFile="sf/mw/phonesrv/convergedcallengine/spsettings/tsrc/public/basic/group" mrp=""/>
-<unit unitID="tedo.aiwdialdata.test" name="aiwdialdata.test" bldFile="sf/mw/phonesrv/phoneclientserver/aiwdialdata/tsrc/public/basic/group" mrp=""/>
-<unit unitID="tedo.dialutils.test" name="dialutils.test" bldFile="sf/mw/phonesrv/phoneclientserver/dialutils/tsrc/public/basic/group" mrp=""/>
-<unit unitID="tedo.phoneclient.test" name="phoneclient.test" bldFile="sf/mw/phonesrv/phoneclientserver/phoneclient/tsrc/public/basic/group" mrp=""/>
-<unit unitID="tedo.call_information_api.test" name="call_information_api.test" bldFile="sf/mw/phonesrv/phonesrv_plat/call_information_api/tsrc/group" mrp=""/>
-<unit unitID="tedo.call_information_mediator_api.test" name="call_information_mediator_api.test" bldFile="sf/mw/phonesrv/phonesrv_plat/call_information_mediator_api/tsrc/ut_CallInfos/group" mrp=""/>
-<unit unitID="tedo.sat_client_api.test" name="sat_client_api.test" bldFile="sf/mw/phonesrv/phonesrv_plat/sat_client_api/tsrc/group" mrp=""/>
-<unit unitID="tedo.sat_refresh_api.test" name="sat_refresh_api.test" bldFile="sf/mw/phonesrv/phonesrv_plat/sat_refresh_api/tsrc/group" mrp=""/>
-<unit unitID="tedo.sat_service_api.test" name="sat_service_api.test" bldFile="sf/mw/phonesrv/phonesrv_plat/sat_service_api/tsrc/group" mrp=""/></module>
-<module name="profile_test">
- <!--<unit unitID="presdo.profile_test" mrp="" bldFile="&layer_real_source_path;/tsrc/group" name="profile_test" />-->
- <unit unitID="presdo.profile_test" mrp="" bldFile="sf/app/profile/profilesapplication/Profiles/ProfileApp/tsrc/public/basic/group" name="profile_test"/>
- </module>
-<module name="settingsuis_test">
- <!--<unit unitID="presdo.settingsuis_test" mrp="" bldFile="&layer_real_source_path;/tsrc/group" name="settingsuis_test" />-->
- <unit unitID="presdo.settingsuis_test" mrp="" bldFile="sf/app/settingsuis/devmngt_plat/services_db_api/tsrc/ServicesDbApiTest/group" name="settingsuis_test"/>
- </module>
-<module name="speechsrv.ui_voice_recognition_api">
- <unit unitID="MuiDo.speechsrv.ui_voice_recognition_api" mrp="" bldFile="sf/app/speechsrv/speechsrv_plat/ui_voice_recognition_api/tsrc/group" name="speechsrv.ui_voice_recognition_api"/>
- </module>
-<module name="speechsrv.speech_synthesis_clientserver_api">
- <unit unitID="MuiDo.speechsrv.speech_synthesis_clientserver_api" mrp="" bldFile="sf/app/speechsrv/srsf/speechsynthesis/tsrc/speechsynthesistest/group" name="speechsrv.speech_synthesis_clientserver_api"/>
- </module>
-<module name="speechsrv.nss_tts_utility_api">
- <unit unitID="MuiDo.speechsrv.nss_tts_utility_api" mrp="" bldFile="sf/app/speechsrv/srsf/tsrc/public/basic/group" name="speechsrv.nss_tts_utility_api"/>
- </module>
-<module name="videoeditor_api_tests">
- <unit unitID="imm.videoeditorengine_api" mrp="" bldFile="sf/app/videoeditor/videoeditorengine/tsrc/public/basic/group" name="videoeditorengine_api"/>
- </module>
-<module name="videoplayer_tsrc">
- <unit unitID="videoplayer_tsrc" name="videoplayer_tsrc" bldFile="sf/app/videoplayer/tsrc/group" mrp=""/>
- </module>
-<module name="voicerec_tsrc">
- <unit unitID="voicerec_tsrc" name="voicerec_tsrc" bldFile="sf/app/voicerec/tsrc/group" mrp=""/>
- </module>
-<module name="appinstall_test">
- <unit unitID="sedo.appinstall_test" mrp="" bldFile="sf/mw/appinstall/tsrc/group" name="appinstall_test"/>
- </module>
-<module name="btservices_test">
- <unit unitID="lcdo.btservices_test" mrp="" bldFile="\sf\mw\btservices\tsrc\group" name="btservices_test"/>
- </module>
-<module name="camerasrv_api_tests">
- <unit unitID="imm.camerasrv.asynchronous_file_saving_queue_api" mrp="" bldFile="sf/mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/tsrc/group" name="asynchronous_file_saving_queue_api"/>
- <unit unitID="imm.camerasrv.camera_application_engine_api" mrp="" bldFile="sf/mw/camerasrv/camerasrv_plat/camera_application_engine_api/tsrc/group" name="camera_application_engine_api"/>
- <unit unitID="imm.camerasrv.imaging_configuration_manager_api" mrp="" bldFile="sf/mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/tsrc/group" name="imaging_configuration_manager_api"/>
- <unit unitID="imm.camerasrv.media_recorder_api" mrp="" bldFile="sf/mw/camerasrv/camerasrv_plat/media_recorder_api/tsrc/group" name="media_recorder_api"/>
- </module>
-<module name="classicui_plat_api_tests">
- <unit unitID="abs.classicui.tsrc.all" mrp="" bldFile="sf/mw/classicui/tsrc/group" name="classicui_tsrc_all" filter="classicui_api_all"/>
- <unit unitID="abs.classicui.tsrc.aiw_provider_utility" mrp="" bldFile="sf/mw/classicui/classicui_plat/aiw_provider_utility_api/tsrc/group" name="classicui_tsrc_aiw_provider_utility" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.aiw_service_interface_base" mrp="" bldFile="sf/mw/classicui/classicui_plat/aiw_service_interface_base_api/tsrc/group" name="classicui_tsrc_aiw_service_interface" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.aiw_service_interface_menu" mrp="" bldFile="sf/mw/classicui/classicui_plat/aiw_service_interface_menu_api/tsrc/group" name="classicui_tsrc_aiw_service_interface_menu" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.alarm" mrp="" bldFile="sf/mw/classicui/classicui_plat/alarm_api/tsrc/group" name="classicui_tsrc_alarm" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.application_switching" mrp="" bldFile="sf/mw/classicui/classicui_plat/application_switching_api/tsrc/group" name="classicui_tsrc_application_switching" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.avkon_fonts" mrp="" bldFile="sf/mw/classicui/classicui_plat/avkon_fonts_api/tsrc/group" name="classicui_tsrc_avkonfonts" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.avkon_secondary_display_support" mrp="" bldFile="sf/mw/classicui/classicui_plat/avkon_secondary_display_support_api/tsrc/group" name="classicui_tsrc_avkon_secondary_display_support" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.avkon_ui_server" mrp="" bldFile="sf/mw/classicui/classicui_plat/avkon_ui_server_api/tsrc/group" name="classicui_tsrc_avkon_ui_server" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.battery_pane" mrp="" bldFile="sf/mw/classicui/classicui_plat/battery_pane_api/tsrc/group" name="classicui_tsrc_battery_pane" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.common_file_dialogs_filter" mrp="" bldFile="sf/mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/tsrc/group" name="classicui_tsrc_common_file_dialogs_filter_factory" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.custom_cursors" mrp="" bldFile="sf/mw/classicui/classicui_plat/custom_cursors_api/tsrc/group" name="classicui_tsrc_custom_cursors" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.eikon_server_extension_client" mrp="" bldFile="sf/mw/classicui/classicui_plat/eikon_server_extension_client_api/tsrc/group" name="classicui_tsrc_eikon_server_extension_client" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.emergency_call_support" mrp="" bldFile="sf/mw/classicui/classicui_plat/emergency_call_support_api/tsrc/group" name="classicui_tsrc_emergency_call_support" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.extended_aiw_criteria" mrp="" bldFile="sf/mw/classicui/classicui_plat/extended_aiw_criteria_api/tsrc/group" name="classicui_tsrc_extended_aiw_criteria" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.extended_animation" mrp="" bldFile="sf/mw/classicui/classicui_plat/extended_animation_api/tsrc/group" name="classicui_tsrc_extended_animation" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.extended_buttons" mrp="" bldFile="sf/mw/classicui/classicui_plat/extended_buttons_api/tsrc/group" name="classicui_tsrc_extended_buttons" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.extended_editors" mrp="" bldFile="sf/mw/classicui/classicui_plat/extended_editors_api/tsrc/group" name="classicui_tsrc_extended_editors" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.extended_grids" mrp="" bldFile="sf/mw/classicui/classicui_plat/extended_grids_api/tsrc/group" name="classicui_tsrc_extended_grids" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.extended_indicators" mrp="" bldFile="sf/mw/classicui/classicui_plat/extended_indicators_api/tsrc/group" name="classicui_tsrc_extended_indicators" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.extended_initialization" mrp="" bldFile="sf/mw/classicui/classicui_plat/extended_initialization_api/tsrc/group" name="classicui_tsrc_extended_initialization" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.extended_input_capabilities" mrp="" bldFile="sf/mw/classicui/classicui_plat/extended_input_capabilities_api/tsrc/group" name="classicui_tsrc_extended_input_capabilities" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.extended_lists" mrp="" bldFile="sf/mw/classicui/classicui_plat/extended_lists_api/tsrc/group" name="classicui_tsrc_extended_lists" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.extended_notes" mrp="" bldFile="sf/mw/classicui/classicui_plat/extended_notes_api/tsrc/group" name="classicui_tsrc_extended_notes" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.extended_notifiers" mrp="" bldFile="sf/mw/classicui/classicui_plat/extended_notifiers_api/tsrc/group" name="classicui_tsrc_extended_notifiers" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.extended_setting_pages" mrp="" bldFile="sf/mw/classicui/classicui_plat/extended_setting_pages_api/tsrc/group" name="classicui_tsrc_extended_setting_pages" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.extended_status_pane" mrp="" bldFile="sf/mw/classicui/classicui_plat/extended_status_pane_api/tsrc/group" name="classicui_tsrc_extended_status_pane" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.extended_utilities" mrp="" bldFile="sf/mw/classicui/classicui_plat/extended_utilities_api/tsrc/group" name="classicui_tsrc_extended_utilities" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.find_item_ui" mrp="" bldFile="sf/mw/classicui/classicui_plat/find_item_ui_api/tsrc/group" name="classicui_tsrc_find_item_ui" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.generic_parameter" mrp="" bldFile="sf/mw/classicui/classicui_plat/generic_parameter_api/tsrc/group" name="classicui_tsrc_generic_parameter" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.global_popup_priority_controller" mrp="" bldFile="sf/mw/classicui/classicui_plat/global_popup_priority_controller_api/tsrc/group" name="classicui_tsrc_global_popup_priority_controller" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.indicator_plugin" mrp="" bldFile="sf/mw/classicui/classicui_plat/indicator_plugin_api/tsrc/group" name="classicui_tsrc_indicator_plugin" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.input_block" mrp="" bldFile="sf/mw/classicui/classicui_plat/input_block_api/tsrc/group" name="classicui_tsrc_input_block" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.item_finder" mrp="" bldFile="sf/mw/classicui/classicui_plat/item_finder_api/tsrc/group" name="classicui_tsrc_item_finder" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.japanese_reading" mrp="" bldFile="sf/mw/classicui/classicui_plat/japanese_reading_api/tsrc/group" name="classicui_tsrc_japanese_reading" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.key_rotator" mrp="" bldFile="sf/mw/classicui/classicui_plat/key_rotator_api/tsrc/group" name="classicui_tsrc_key_rotator" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.layout_configuration" mrp="" bldFile="sf/mw/classicui/classicui_plat/layout_configuration_api/tsrc/group" name="classicui_tsrc_layout_configuration" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.list_effects" mrp="" bldFile="sf/mw/classicui/classicui_plat/list_effects_api/tsrc/group" name="classicui_tsrc_list_effects" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.long_tap_animation" mrp="" bldFile="sf/mw/classicui/classicui_plat/long_tap_animation_api/tsrc/group" name="classicui_tsrc_long_tap_animation" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.media_shared_document" mrp="" bldFile="sf/mw/classicui/classicui_plat/media_shared_document_api/tsrc/group" name="classicui_tsrc_media_shared_document" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.memory_card_ui" mrp="" bldFile="sf/mw/classicui/classicui_plat/memory_card_ui_api/tsrc/group" name="classicui_tsrc_memory_card_ui" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.number_grouping" mrp="" bldFile="sf/mw/classicui/classicui_plat/number_grouping_api/tsrc/group" name="classicui_tsrc_number_grouping" filter="classicui_plat_api"/>
- <!--unit unitID="abs.classicui.tsrc.personalisation_framework" mrp="" bldFile="&layer_real_source_path;/classicui_plat/personalisation_framework_api/tsrc/group" name="classicui_tsrc_personalisation_framework" filter="classicui_plat_api" /-->
- <unit unitID="abs.classicui.tsrc.phone_number_text_utilities" mrp="" bldFile="sf/mw/classicui/classicui_plat/phone_number_text_utilities_api/tsrc/group" name="classicui_tsrc_phone_number_text_utilities" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.pointer_event_modifier" mrp="" bldFile="sf/mw/classicui/classicui_plat/pointer_event_modifier_api/tsrc/group" name="classicui_tsrc_pointer_event_modifier" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.popup_form" mrp="" bldFile="sf/mw/classicui/classicui_plat/popup_form_api/tsrc/group" name="classicui_tsrc_popup_form" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.server_application_services" mrp="" bldFile="sf/mw/classicui/classicui_plat/server_application_services_api/tsrc/group" name="classicui_tsrc_server_application_services" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.signal_pane" mrp="" bldFile="sf/mw/classicui/classicui_plat/signal_pane_api/tsrc/group" name="classicui_tsrc_signal_pane" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.skinnable_clock" mrp="" bldFile="sf/mw/classicui/classicui_plat/skinnable_clock_api/tsrc/group" name="classicui_tsrc_skinnable_clock" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.special_character_table" mrp="" bldFile="sf/mw/classicui/classicui_plat/special_character_table_api/tsrc/group" name="classicui_tsrc_special_character_table" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.stylus_activated_popup" mrp="" bldFile="sf/mw/classicui/classicui_plat/stylus_activated_popup_api/tsrc/group" name="classicui_tsrc_stylus_activated_popup" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.task_list" mrp="" bldFile="sf/mw/classicui/classicui_plat/task_list_api/tsrc/group" name="classicui_tsrc_task_list" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.text_scroller" mrp="" bldFile="sf/mw/classicui/classicui_plat/text_scroller_api/tsrc/group" name="classicui_tsrc_text_scroller" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.touch_pane" mrp="" bldFile="sf/mw/classicui/classicui_plat/touch_pane_api/tsrc/group" name="classicui_tsrc_touch_pane" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.transition_effect_parameters" mrp="" bldFile="sf/mw/classicui/classicui_plat/transition_effect_parameters_api/tsrc/group" name="classicui_tsrc_transition_effect_parameters" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.transition_effect_utilities" mrp="" bldFile="sf/mw/classicui/classicui_plat/transition_effect_utilities_api/tsrc/group" name="classicui_tsrc_transition_effect_utilities" filter="classicui_plat_api"/>
- <unit unitID="abs.classicui.tsrc.volume_popup" mrp="" bldFile="sf/mw/classicui/classicui_plat/volume_popup_api/tsrc/group" name="classicui_tsrc_volume_popup" filter="classicui_plat_api"/>
- </module>
-<module name="classicui_pub_api_tests">
- <unit unitID="abs.classicui.tsrc.aiw_criteria" mrp="" bldFile="sf/mw/classicui/classicui_pub/aiw_criteria_api/tsrc/group" name="classicui_tsrc_aiw_criteria" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.aiw_generic_parameter" mrp="" bldFile="sf/mw/classicui/classicui_pub/aiw_generic_parameter_api/tsrc/group" name="classicui_tsrc_aiw_generic_parameter" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.aiw_service_handler" mrp="" bldFile="sf/mw/classicui/classicui_pub/aiw_service_handler_api/tsrc/group" name="classicui_tsrc_aiw_service_handler" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.animation" mrp="" bldFile="sf/mw/classicui/classicui_pub/animation_api/tsrc/group" name="classicui_tsrc_animation" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.application" mrp="" bldFile="sf/mw/classicui/classicui_pub/application_framework_api/tsrc/group" name="classicui_tsrc_application_framework" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.base_controls" mrp="" bldFile="sf/mw/classicui/classicui_pub/base_controls_api/tsrc/group" name="classicui_tsrc_base_controls" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.buttons" mrp="" bldFile="sf/mw/classicui/classicui_pub/buttons_api/tsrc/group" name="classicui_tsrc_buttons" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.choice_list" mrp="" bldFile="sf/mw/classicui/classicui_pub/choice_list_api/tsrc/group" name="classicui_tsrc_choicelist" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.common_file_dialogs" mrp="" bldFile="sf/mw/classicui/classicui_pub/common_file_dialogs_api/tsrc/group" name="classicui_tsrc_common_file_dialogs" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.context_pane" mrp="" bldFile="sf/mw/classicui/classicui_pub/context_pane_api/tsrc/group" name="classicui_tsrc_context_pane" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.dialog_shutter" mrp="" bldFile="sf/mw/classicui/classicui_pub/dialog_shutter_api/tsrc/group" name="classicui_tsrc_dialog_shutter" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.dialogs" mrp="" bldFile="sf/mw/classicui/classicui_pub/dialogs_api/tsrc/group" name="classicui_tsrc_dialogs" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.editors" mrp="" bldFile="sf/mw/classicui/classicui_pub/editors_api/tsrc/group" name="classicui_tsrc_editors" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.errorui" mrp="" bldFile="sf/mw/classicui/classicui_pub/error_ui_api/tsrc/group" name="classicui_tsrc_error_ui" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.fonts" mrp="" bldFile="sf/mw/classicui/classicui_pub/fonts_api/tsrc/group" name="classicui_tsrc_fonts" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.form" mrp="" bldFile="sf/mw/classicui/classicui_pub/form_api/tsrc/group" name="classicui_tsrc_form" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.generic_button" mrp="" bldFile="sf/mw/classicui/classicui_pub/generic_button_api/tsrc/group" name="classicui_tsrc_generic_button" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.grids" mrp="" bldFile="sf/mw/classicui/classicui_pub/grids_api/tsrc/group" name="classicui_tsrc_grids" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.hierarchical_list" mrp="" bldFile="sf/mw/classicui/classicui_pub/hierarchical_lists_api/tsrc/group" name="classicui_tsrc_hierarchical_lists" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.hotkeys" mrp="" bldFile="sf/mw/classicui/classicui_pub/hotkeys_api/tsrc/group" name="classicui_tsrc_hotkeys" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.images" mrp="" bldFile="sf/mw/classicui/classicui_pub/images_api/tsrc/group" name="classicui_tsrc_images" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.indicators" mrp="" bldFile="sf/mw/classicui/classicui_pub/indicators_api/tsrc/group" name="classicui_tsrc_indicators" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.info_popup_note" mrp="" bldFile="sf/mw/classicui/classicui_pub/info_popup_note_api/tsrc/group" name="classicui_tsrc_info_popup_note" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.info_preview_popup" mrp="" bldFile="sf/mw/classicui/classicui_pub/information_preview_popup_api/tsrc/group" name="classicui_tsrc_info_preview_popup" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.initialization" mrp="" bldFile="sf/mw/classicui/classicui_pub/initialization_api/tsrc/group" name="classicui_tsrc_initialization" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.input_frame" mrp="" bldFile="sf/mw/classicui/classicui_pub/input_frame_api/tsrc/group" name="classicui_tsrc_input_frame" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.keylock" mrp="" bldFile="sf/mw/classicui/classicui_pub/keylock_api/tsrc/group" name="classicui_tsrc_keylock" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.labels" mrp="" bldFile="sf/mw/classicui/classicui_pub/labels_api/tsrc/group" name="classicui_tsrc_labels" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.lists" mrp="" bldFile="sf/mw/classicui/classicui_pub/lists_api/tsrc/group" name="classicui_tsrc_lists" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.misc_ctrls" mrp="" bldFile="sf/mw/classicui/classicui_pub/misc_controls_api/tsrc/group" name="classicui_tsrc_misc_controls" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.navigation_pane" mrp="" bldFile="sf/mw/classicui/classicui_pub/navigation_pane_api/tsrc/group" name="classicui_tsrc_navigation_pane" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.notes" mrp="" bldFile="sf/mw/classicui/classicui_pub/notes_api/tsrc/group" name="classicui_tsrc_notes" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.notifiers" mrp="" bldFile="sf/mw/classicui/classicui_pub/notifiers_api/tsrc/group" name="classicui_tsrc_notifiers" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.popups" mrp="" bldFile="sf/mw/classicui/classicui_pub/popups_api/tsrc/group" name="classicui_tsrc_popups" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.private_ui_framework" mrp="" bldFile="sf/mw/classicui/classicui_pub/private_ui_framework_api/tsrc/group" name="classicui_tsrc_private_ui_framework" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.queries" mrp="" bldFile="sf/mw/classicui/classicui_pub/queries_api/tsrc/group" name="classicui_tsrc_queries" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.screen_clearer" mrp="" bldFile="sf/mw/classicui/classicui_pub/screen_clearer_api/tsrc/group" name="classicui_tsrc_screen_clearer" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.screen_mode" mrp="" bldFile="sf/mw/classicui/classicui_pub/screen_mode_api/tsrc/group" name="classicui_tsrc_screen_mode" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.screen_saver" mrp="" bldFile="sf/mw/classicui/classicui_pub/screen_saver_api/tsrc/group" name="classicui_tsrc_screen_saver" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.scroller" mrp="" bldFile="sf/mw/classicui/classicui_pub/scroller_api/tsrc/group" name="classicui_tsrc_scroller" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.search_field" mrp="" bldFile="sf/mw/classicui/classicui_pub/searchfield_api/tsrc/group" name="classicui_tsrc_searchfield" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.settings_pages" mrp="" bldFile="sf/mw/classicui/classicui_pub/setting_pages_api/tsrc/group" name="classicui_tsrc_setting_pages" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.slider" mrp="" bldFile="sf/mw/classicui/classicui_pub/slider_api/tsrc/group" name="classicui_tsrc_slider" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.sounds" mrp="" bldFile="sf/mw/classicui/classicui_pub/sounds_api/tsrc/group" name="classicui_tsrc_sounds" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.status_pane" mrp="" bldFile="sf/mw/classicui/classicui_pub/status_pane_api/tsrc/group" name="classicui_tsrc_status_pane" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.stylus_popup_menu" mrp="" bldFile="sf/mw/classicui/classicui_pub/stylus_popup_menu_api/tsrc/group" name="classicui_tsrc_stylus_popup_menu" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.tabs" mrp="" bldFile="sf/mw/classicui/classicui_pub/tabs_api/tsrc/group" name="classicui_tsrc_tabs" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.title_pane" mrp="" bldFile="sf/mw/classicui/classicui_pub/title_pane_api/tsrc/group" name="classicui_tsrc_title_pane" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.toolbar" mrp="" bldFile="sf/mw/classicui/classicui_pub/toolbar_api/tsrc/group" name="classicui_tsrc_toolbar" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.touch_ui_utilities" mrp="" bldFile="sf/mw/classicui/classicui_pub/touch_ui_utilities_api/tsrc/group" name="classicui_tsrc_touch_ui_utilities" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.ui_fw_definitions" mrp="" bldFile="sf/mw/classicui/classicui_pub/ui_framework_definitions_api/tsrc/group" name="classicui_tsrc_ui_framework_definitions" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.ui_fw_util" mrp="" bldFile="sf/mw/classicui/classicui_pub/ui_framework_utilities_api/tsrc/group" name="classicui_tsrc_ui_framework_utilities" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.vol_ctrl" mrp="" bldFile="sf/mw/classicui/classicui_pub/volume_control_api/tsrc/group" name="classicui_tsrc_volume_control" filter="classicui_pub_api"/>
- <unit unitID="abs.classicui.tsrc.window_server_event_observer" mrp="" bldFile="sf/mw/classicui/classicui_pub/window_server_event_observer_api/tsrc/group" name="classicui_tsrc_window_server_event_observer" filter="classicui_pub_api"/>
- </module>
-<module name="hcdo_api_tests">
-<!--
- <unit unitID="hcdo.avcontrolframework.test" name="avcontrolframework.test" bldFile="&layer_real_source_path;/upnpavcontrolpoint/avcontrolframework/tsrc/public/basic/group" mrp="" />
- <unit unitID="hcdo.avobjects.test" name="avobjects.test" bldFile="&layer_real_source_path;/upnpmediaserver/avobjects/tsrc/public/basic/group" mrp="" />
- <unit unitID="hcdo.mediaserverclient.test" name="mediaserverclient.test" bldFile="&layer_real_source_path;/upnpmediaserver/mediaserverclient/tsrc/public/basic/group" mrp="" />
- <unit unitID="hcdo.controlpointbase.test" name="controlpointbase.test" bldFile="&layer_real_source_path;/upnpstack/controlpointbase/tsrc/public/basic/group" mrp="" />
- <unit unitID="hcdo.serviceframework.test" name="serviceframework.test" bldFile="&layer_real_source_path;/upnpstack/serviceframework/tsrc/public/basic/group" mrp="" />
- <unit unitID="hcdo.upnputils.test" name="upnputils.test" bldFile="&layer_real_source_path;/upnpstack/upnputils/tsrc/public/basic/group" mrp="" />
- <unit unitID="hcdo.testplugin.test" name="testplugin.test" bldFile="&layer_real_source_path;/dlnasrv_plat/upnp_plugin_api/tsrc/testplugin/group" mrp="" />
- <unit unitID="hcdo.upnpextensionpluginiftest.test" name="upnpextensionpluginiftest.test" bldFile="&layer_real_source_path;/dlnasrv_plat/upnp_plugin_api/tsrc/upnpextensionpluginiftest/group" mrp="" />
- <unit unitID="hcdo.upnpxmlparsertes.test" name="upnpxmlparsertest.test" bldFile="&layer_real_source_path;/upnpavcontroller/upnpxmlparser/tsrc/upnpxmlparsertest/group" mrp="" />
- <unit unitID="hcdo.upnpsecuritytest.test" name="upnpsecuritytest.test" bldFile="&layer_real_source_path;/upnpsharing/upnpsecurity/tsrc/upnpsecuritytest/group" mrp="" />
--->
- <unit unitID="hcdo.api.test" name="api.test" bldFile="sf/mw/dlnasrv/tsrc/group" mrp=""/>
- </module>
-<module name="drm_test">
- <unit unitID="sedo.drm_test" mrp="" bldFile="sf/mw/drm/tsrc/group" name="drm_test"/>
- </module>
-<module name="helix_tsrc">
- <unit unitID="helix_tsrc" name="helix_tsrc" bldFile="sf/mw/helix/tsrc/group" mrp=""/>
- </module>
-<module name="homescreensrv_api_tests">
- <unit unitID="hsdo.content_harvester.test" name="content_harvester.test" bldFile="sf/mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/tsrc/group" mrp=""/>
- <unit unitID="hsdo.menu_content_service.test" name="menu_content_service.test" bldFile="sf/mw/homescreensrv/homescreensrv_plat/menu_content_service_api/tsrc/group" mrp=""/>
- <unit unitID="hsdo.ai_utilities_api.test" name="ai_utilities_api.test" bldFile="sf/mw/homescreensrv/homescreensrv_plat/ai_utilities_api/internal/tsrc/group" mrp=""/>
- <unit unitID="hsdo.action_handler_plugin_api.test" name="action_handler_plugin_api.test" bldFile="sf/mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/tsrc/group" mrp=""/>
- <unit unitID="hsdo.menu_sat_interface_api.test" name="menu_sat_interface_api.test" bldFile="sf/mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/tsrc/group" mrp=""/>
- <unit unitID="hsdo.hs_widget_publisher_api.test" name="hs_widget_publisher_api.test" bldFile="sf/mw/homescreensrv/homescreensrv_pub/hs_widget_publisher_api/tsrc/group" mrp=""/>
- <unit unitID="hsdo.sapi_homescreenplugin.test" name="sapi_homescreenplugin.test" bldFile="sf/mw/homescreensrv/homescreensrv_plat/sapi_homescreenplugin/tsrc/group" mrp=""/>
- </module>
-<module name="imagehandling_api_tests">
- <unit unitID="imm.3gp_library_api" mrp="" bldFile="sf/mw/imghandling/imagehandling_plat/3gp_library_api/tsrc/group" name="3gp_library_api"/>
- <unit unitID="imm.imagehandlinglib_api" mrp="" bldFile="sf/mw/imghandling/imagehandlinglib/tsrc/public/basic/group" name="imagehandlinglib_api"/>
- <unit unitID="imm.imageinfopopup_api" mrp="" bldFile="sf/mw/imghandling/imagehandlingutilities/imageinfopopup/tsrc/public/basic/group" name="imageinfopopup_api"/>
- <unit unitID="imm.imagepreview_api" mrp="" bldFile="sf/mw/imghandling/imagehandlingutilities/imagepreview/tsrc/public/basic/group" name="imagepreview_api"/>
- <unit unitID="imm.thumbnailmanager_api" mrp="" bldFile="sf/mw/imghandling/imagehandling_plat/thumbnailmanager_api/tsrc/group" name="thumbnailmanager_api"/>
- <unit unitID="imm.tvoutengine_api" mrp="" bldFile="sf/mw/imghandling/imagehandling_plat/tvoutengine_api/tsrc/group" name="tvoutengine_api"/>
- </module>
-<module name="inputmethods_api_tests">
- <unit unitID="abs.inputmethods.tsrc.all" mrp="" bldFile="sf/mw/inputmethods/tsrc/group" name="inputmethods_tsrc_all"/>
- <unit unitID="abs.inputmethods.tsrc.pen_input_server_api" mrp="" bldFile="sf/mw/inputmethods/inputmethods_plat/pen_input_server_api/tsrc/group" name="inputmethods_tsrc_pen_input_server"/>
- <unit unitID="abs.inputmethods.tsrc.ptiengine_hwr_api" mrp="" bldFile="sf/mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/tsrc/group" name="inputmethods_tsrc_ptiengine_hwr"/>
- <unit unitID="abs.inputmethods.tsrc.aknfep_uiinterface_api" mrp="" bldFile="sf/mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/tsrc/group" name="inputmethods_tsrc_aknfep_uiinterface"/>
- </module>
-<module name="mds_api_tests">
- <unit unitID="imm.mds.content_listing_framework_collection_manager_api" mrp="" bldFile="sf/mw/mds/mds_plat/content_listing_framework_collection_manager_api/tsrc/group" name="content_listing_framework_collection_manager_api"/>
- <unit unitID="imm.mds.context_engine_plugin_api" mrp="" bldFile="sf/mw/mds/mds_plat/context_engine_plugin_api/tsrc/group" name="context_engine_plugin_api"/>
- <unit unitID="imm.mds.harvester_framework_api" mrp="" bldFile="sf/mw/mds/mds_plat/harvester_framework_api/tsrc/group" name="harvester_framework_api"/>
- <unit unitID="imm.mds.location_manager_api" mrp="" bldFile="sf/mw/mds/mds_plat/location_manager_api/tsrc/group" name="location_manager_api"/>
- <unit unitID="imm.mds.metadata_engine_api" mrp="" bldFile="sf/mw/mds/mds_plat/metadata_engine_api/tsrc/group" name="metadata_engine_api"/>
- </module>
-<module name="metadatasrv_api_tests">
- <unit unitID="imm.contentlistingframework_api" mrp="" bldFile="sf/mw/metadatasrv/contentlistingframework/tsrc/Public/Basic/group" name="contentlistingframework_api"/>
- <unit unitID="imm.mediastylegrid_api" mrp="" bldFile="sf/mw/metadatasrv/mediamanagementuis/mediastylegrid/tsrc/Public/Basic/group" name="mediastylegrid_api"/>
- </module>
-<module name="mmappfw_tsrc">
- <unit unitID="mmappfw_tsrc" name="mmappfw_tsrc" bldFile="sf/mw/mmappfw/tsrc/group" mrp=""/>
- </module>
-<module name="mmmw_tsrc">
- <unit unitID="mmmw_tsrc" name="mmmw_tsrc" bldFile="sf/mw/mmmw/tsrc/group" mrp=""/>
- </module>
-<module name="securitysrv_test">
- <unit unitID="sedo.securitysrv_test" mrp="" bldFile="sf/mw/securitysrv/tsrc/group" name="securitysrv_test"/>
- </module>
-<module name="uiresources_api_tests">
- <unit unitID="abs.uiresources.tsrc.all_tests" mrp="" bldFile="sf/mw/uiresources/tsrc/group" name="uiresources_tsrc_cdl" filter="uiresources_api_all"/>
- <unit unitID="abs.uiresources.tsrc.cdl" mrp="" bldFile="sf/mw/uiresources/uiresources_plat/cdl_api/tsrc/group" name="uiresources_tsrc_cdl" filter="cdl_api"/>
- <unit unitID="abs.uiresources.tsrc.extended_fonts" mrp="" bldFile="sf/mw/uiresources/uiresources_plat/extended_fonts_api/tsrc/group" name="uiresources_tsrc_extended_fonts" filter="extended_fonts_api"/>
- <unit unitID="abs.uiresources.tsrc.extended_skins" mrp="" bldFile="sf/mw/uiresources/uiresources_plat/extended_skins_api/tsrc/group" name="uiresources_tsrc_extended_skins" filter="extended_skins_api"/>
- <unit unitID="abs.uiresources.tsrc.graphic_configuration" mrp="" bldFile="sf/mw/uiresources/uiresources_plat/graphic_configuration_api/tsrc/group" name="uiresources_tsrc_graphic_configuration" filter="graphic_configuration_api"/>
- <unit unitID="abs.uiresources.tsrc.layout_data" mrp="" bldFile="sf/mw/uiresources/uiresources_plat/layout_data_api/tsrc/group" name="uiresources_tsrc_layout_data" filter="layout_data_api"/>
- <unit unitID="abs.uiresources.tsrc.layout_system_private" mrp="" bldFile="sf/mw/uiresources/uiresources_plat/layout_system_private_api/tsrc/group" name="uiresources_tsrc_layout_system_private" filter="layout_system_private_api"/>
- <unit unitID="abs.uiresources.tsrc.skins_image_attributes" mrp="" bldFile="sf/mw/uiresources/uiresources_plat/skins_image_attributes_api/tsrc/group" name="uiresources_tsrc_skins_image_attributes" filter="skins_image_attributes_api"/>
- <unit unitID="abs.uiresources.tsrc.font_definition" mrp="" bldFile="sf/mw/uiresources/uiresources_pub/font_definition_api/tsrc/group" name="uiresources_tsrc_font_definition" filter="font_definition_api"/>
- <unit unitID="abs.uiresources.tsrc.graphics" mrp="" bldFile="sf/mw/uiresources/uiresources_pub/graphics_api/tsrc/group" name="uiresources_tsrc_graphics" filter="graphics_api"/>
- <unit unitID="abs.uiresources.tsrc.pictograph" mrp="" bldFile="sf/mw/uiresources/uiresources_pub/pictograph_api/tsrc/group" name="uiresources_tsrc_pictograph" filter="pictograph_api"/>
- <unit unitID="abs.uiresources.tsrc.skins" mrp="" bldFile="sf/mw/uiresources/uiresources_pub/skins_api/tsrc/group" name="uiresources_tsrc_skins" filter="skins_api"/>
- </module>
-<module name="videoscheduler_api_tsrc">
- <unit unitID="vado.videoscheduler_api_test" name="videoscheduler_api_tsrc" bldFile="sf/mw/videoutils/videoutils_plat/videoscheduler_api/tsrc/group" mrp=""/>
- </module>
-<module name="videoconnutility_apitsrc">
- <unit unitID="vado.videoconnutility_api_test" name="videoconnutility_api_tsrc" bldFile="sf/mw/videoutils/videoutils_plat/videoconnutility_api/tsrc/group" mrp=""/>
- </module>
-<module name="imagingext_api_tests">
- <unit unitID="imm.imagingext.exif_api" mrp="" bldFile="sf/os/imagingext/imagingext_pub/exif_api/tsrc/group" name="exif_api"/>
- <unit unitID="imm.imagingext.iclextjpegapi_api" mrp="" bldFile="sf/os/imagingext/imagingext_plat/extended_icl_jpeg_api/tsrc/group" name="iclextjpegapi_api"/>
- </module>
-<module name="mm_tsrc">
- <unit unitID="mm_tsrc" name="mm_tsrc" bldFile="sf/os/mm/tsrc/group" mrp=""/>
- </module></layer>
-<layer name="unit_test_layer">
- <module name="camera_unit_tests">
- </module>
-<module name="Phonebook2">
- <unit unitID="Phonebook2" mrp="" bldFile="sf/app/contacts/phonebookui/Phonebook2/tsrc/group" name="Phonebook2"/>
- <unit unitID="Phonebook" mrp="" bldFile="sf/app/contacts/phonebookui/Phonebook/tsrc/group" name="Phonebook"/>
- </module>
-<module name="UIControls_Presentation_USIMExtension_CCA">
- <unit unitID="UIControls" mrp="" bldFile="sf/app/contacts/phonebookui/Phonebook2/UIControls/tsrc/group" name="UIControls"/>
- <unit unitID="Presentation" mrp="" bldFile="sf/app/contacts/phonebookui/Phonebook2/Presentation/tsrc/group" name="Presentation"/>
- <unit unitID="USIMExtension" mrp="" bldFile="sf/app/contacts/phonebookui/Phonebook2/USIMExtension/tsrc/group" name="USIMExtension"/>
- <unit unitID="xSPExtensionManager" mrp="" bldFile="sf/app/contacts/phonebookui/Phonebook2/xSPExtensionManager/tsrc/group" name="xSPExtensionManager"/>
- <unit unitID="ccacommlauncherplugin" mrp="" bldFile="sf/app/contacts/phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/tsrc/group" name="ccacommlauncherplugin"/>
- <unit unitID="ccacontactorservice" mrp="" bldFile="sf/app/contacts/phonebookui/Phonebook2/ccapplication/ccacontactorservice/tsrc/group" name="ccacontactorservice"/>
- <unit unitID="ccapp" mrp="" bldFile="sf/app/contacts/phonebookui/Phonebook2/ccapplication/ccapp/tsrc/group" name="ccapp"/>
- </module>
-<module name="VirtualPhonebook_VPbkCntModel">
- <unit unitID="VirtualPhonebook" mrp="" bldFile="sf/app/contacts/phonebookengines/VirtualPhonebook/tsrc/group" name="VirtualPhonebook"/>
- <unit unitID="VPbkCntModel" mrp="" bldFile="sf/app/contacts/phonebookengines/VirtualPhonebook/VPbkCntModel/tsrc/group" name="VPbkCntModel"/>
- </module>
-<module name="VPbk_cms_presencecache">
- <unit unitID="VPbkEng" mrp="" bldFile="sf/app/contacts/phonebookengines/VirtualPhonebook/VPbkEng/tsrc/group" name="VPbkEng"/>
- <unit unitID="VPbkEngUtils" mrp="" bldFile="sf/app/contacts/phonebookengines/VirtualPhonebook/VPbkEngUtils/tsrc/group" name="VPbkEngUtils"/>
- <unit unitID="VPbkSimStoreImpl" mrp="" bldFile="sf/app/contacts/phonebookengines/VirtualPhonebook/VPbkSimStoreImpl/tsrc/group" name="VPbkSimStoreImpl"/>
- <unit unitID="VPbkSimStoreService" mrp="" bldFile="sf/app/contacts/phonebookengines/VirtualPhonebook/VPbkSimStoreService/tsrc/group" name="VPbkSimStoreService"/>
- <unit unitID="bpastester" mrp="" bldFile="sf/app/contacts/ccservices/cmsservices/bpas/tsrc/group" name="bpastester"/>
- <unit unitID="cmsengine" mrp="" bldFile="sf/app/contacts/ccservices/cmsservices/cmsengine/tsrc/group" name="cmsengine"/>
- <unit unitID="contactpresence" mrp="" bldFile="sf/app/contacts/ccservices/cmsservices/contactpresence/tsrc/group" name="contactpresence"/>
- <unit unitID="presencetrafficlights" mrp="" bldFile="sf/app/contacts/ccservices/cmsservices/presencetrafficlights/tsrc/group" name="presencetrafficlights"/>
- <unit unitID="utilstester" mrp="" bldFile="sf/app/contacts/presencecache/presencecacheutils/tsrc/group" name="utilstester"/>
- </module>
-<module name="gallery_unit_tests">
- </module>
-<module name="imgeditor_unit_tests">
- </module>
-<module name="videoeditor_unit_tests">
- </module>
-<module name="camerasrv_unit_tests">
- </module>
-<module name="imagehandling_unit_tests">
- </module>
-<module name="mds_unit_tests">
- </module>
-<module name="metadatasrv_unit_tests">
- </module></layer>
-<layer name="bldfirst_app_layer">
- <module name="contacts">
- <unit unitID="contacts" mrp="" bldFile="sf/app/contacts/group" name="contacts"/>
- </module>
- </layer>
-<layer name="pref_test_layer">
- <module name="musicplayer_tsrc_group">
- <unit unitID="musicplayer_tsrc_group" name="musicplayer_tsrc_group" bldFile="sf/app/musicplayer/tsrc/group" mrp="" filter="TA_MUSICPLAYER"/>
- </module>
-<module name="videoplayer_tsrc_group">
- <unit unitID="videoplayer_tsrc_group" name="videoplayer_tsrc_group" bldFile="sf/app/videoplayer/tsrc/group" mrp="" filter="TA_VIDEOPLAYER"/>
- </module>
-<module name="voicerec_tsrc_group">
- <unit unitID="voicerec_tsrc_group" name="voicerec_tsrc_group" bldFile="sf/app/voicerec/tsrc/group" mrp="" filter="TA_VOICEREC"/>
- </module>
-<module name="helix_tsrc_group">
- <unit unitID="helix_tsrc_group" name="helix_tsrc_group" bldFile="sf/mw/helix/tsrc/group" mrp="" filter="TA_HELIX"/>
- </module>
-<module name="helix_ren_tsrc_group">
- <unit unitID="helix_ren_tsrc_group" name="helix_ren_tsrc_group" bldFile="sf/mw/helix/helix_ren/tsrc/helixstiftest/group" mrp="" filter="TA_HELIX_REN"/>
- </module>
-<module name="mmappfw_tsrc_group">
- <unit unitID="mmappfw_tsrc_group" name="mmappfw_tsrc_group" bldFile="sf/mw/mmappfw/tsrc/group" mrp="" filter="TA_MMAPPFW"/>
- </module>
-<module name="mmmw_tsrc_group">
- <unit unitID="mmmw_tsrc_group" name="mmmw_tsrc_group" bldFile="sf/mw/mmmw/tsrc/group" mrp="" filter="TA_MMMW"/>
- </module>
-<module name="advancedaudiocontroller_tsrc_group">
- <unit unitID="advancedaudiocontroller_tsrc_group" name="advancedaudiocontroller_tsrc_group" bldFile="sf/mw/mmmw/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/group" mrp="" filter="TA_ADVANCEDAUDIOCONTROLLER"/>
- </module>
-<module name="mm_tsrc_group">
- <unit unitID="mm_tsrc_group" name="mm_tsrc_group" bldFile="sf/os/mm/tsrc/group" mrp="" filter="TA_MM"/>
- </module>
-<module name="nga_mdf_tsrc_group">
- <unit unitID="nga_mdf_tsrc_group" name="nga_mdf_tsrc_group" bldFile="sf/os/mm/mdfdevvideoextensions/nga_mdf_postprocessor/tsrc/StifNgaMdfPoPTest/group" mrp="" filter="TA_NGA_MDF_POSTPROCESSOR"/>
- </module></layer>
-<layer name="app_musicplayer_layer">
- <module name="musicplayer_group">
- <unit unitID="musicplayer_group" mrp="" bldFile="sf/app/musicplayer/group" name="musicplayer_group"/>
- </module>
- </layer>
-<layer name="app_videoplayer_layer">
- <module name="videoplayer_group">
- <unit unitID="videoplayer_group" mrp="" bldFile="sf/app/videoplayer/group" name="videoplayer_group"/>
- </module>
- </layer>
-<layer name="app_voicerec_layer">
- <module name="voicerec_group">
- <unit unitID="voicerec_group" mrp="" bldFile="sf/app/voicerec/group" name="voicerec_group"/>
- </module>
- </layer>
-<layer name="bldfirst_mw_layer">
- <module name="classicui">
- <unit unitID="abs.classicui" mrp="" bldFile="sf/mw/classicui/group" name="classicui"/>
- </module>
- </layer>
-<layer name="module_test_layer">
- <module name="helix_ren_tsrc">
- <unit unitID="helix_ren_tsrc" name="helix_ren_tsrc" bldFile="sf/mw/helix/helix_ren/tsrc/helixstiftest/group" mrp=""/>
- </module>
-<module name="advancedaudiocontroller_tsrc">
- <unit unitID="advancedaudiocontroller_tsrc" name="advancedaudiocontroller_tsrc" bldFile="sf/mw/mmmw/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/group" mrp=""/>
- </module>
-<module name="nga_mdf_tsrc">
- <unit unitID="nga_mdf_tsrc" name="nga_mdf_tsrc" bldFile="sf/os/mm/mdfdevvideoextensions/nga_mdf_postprocessor/tsrc/StifNgaMdfPoPTest/group" mrp=""/>
- </module></layer>
-<layer name="mw_helix_layer">
- <module name="helix_group">
- <unit unitID="helix_group" mrp="" bldFile="sf/mw/helix/group" filter="!sf_build" name="helix_group"/>
- <unit unitID="helix_src_group" mrp="" bldFile="sf/mw/helix/helix_ren/src/group" filter="!sf_build" name="helix_src_group"/>
- </module>
- </layer>
-<layer name="mw_mmappfw_layer">
- <module name="mmappfw_group">
- <unit unitID="mmappfw_group" mrp="" bldFile="sf/mw/mmappfw/group" name="mmappfw_group"/>
- </module>
- </layer>
-<layer name="mw_mmmw_layer">
- <module name="mmmw_group">
- <unit unitID="mmmw_group" mrp="" bldFile="sf/mw/mmmw/group" name="mmmw_group"/>
- </module>
- <module name="">
- <unit unitID="mmmw_3GPExtParserLib_group" mrp="" bldFile="sf/mw/mmmw/metadatautility/3GPExtParserLib/group" filter="!sf_build" name="mmmw_3GPExtParserLib_group"/>
- </module>
- <module name="">
- <unit unitID="mtp_group" mrp="" bldFile="sf/mw/mmmw/mtp/group" filter="!sf_build" name="mtp_group"/>
- </module>
- <module name="">
- <unit unitID="helix_stub_group" mrp="" bldFile="sf/mw/mmmw/mmfw/helix_stub/group" filter="sf_build" name="helix_stub_group"/>
- </module>
- </layer>
-<layer name="tools_layer">
- <module name="uitools">
- <unit unitID="abs.uitools" mrp="" bldFile="sf/mw/uitools/group" name="uitools"/>
- </module>
- <module name="">
- <unit unitID="abs.uitools.toollibraries" mrp="" bldFile="sf/mw/uitools/toollibraries/group" name="uitools_toollibraries" filter="!sf_build"/>
- </module>
-<module name="homescreentools">
- <unit unitID="abs.homescreentools" mrp="" bldFile="sf/tools/homescreentools/group" name="homescreentools"/>
- </module>
-<module name="swconfigtools">
- <unit name="swconfigtools" unitID="sydo.swconfigtools" bldFile="sf/tools/swconfigtools/group" mrp=""/>
- </module></layer>
-<layer name="bldmefirst_layer">
- <module name="devicesrv">
- <unit unitID="sydo.platformpaths" bldFile="sf/os/devicesrv/devicesrv_pub/platform_path_definitions_api/group" name="platformpaths" mrp=""/>
- </module>
-<module name="homescreentoolsdtd">
- <unit unitID="abs.homescreentoolsdtd" mrp="" bldFile="sf/tools/homescreentools/dtdinstaller/group" name="homescreentoolsdtd"/>
- </module></layer>
-<layer name="bldmelast_layer">
- <module name="">
- <unit unitID="EAacPlusCodecPlugin_arm9e" mrp="" bldFile="sf/os/mm/audio/ARM_CMMF_codecs/EAacPlusCodecPlugin/group" filter="!sf_build" name="EAacPlusCodecPlugin_arm9e"/>
- </module>
- </layer>
-<layer name="os_mm_layer">
- <module name="mm_group">
- <unit unitID="mm_group" mrp="" bldFile="sf/os/mm/group" name="mm_group"/>
- </module>
- <module name="">
- <unit unitID="AacEncoderPlugin_group" mrp="" bldFile="sf/os/mm/audio/ARM_CMMF_codecs/AacEncoderPlugin/group" filter="!sf_build" name="AacEncoderPlugin_group"/>
- </module>
- <module name="">
- <unit unitID="AmrNbCodecPlugin_group" mrp="" bldFile="sf/os/mm/audio/ARM_CMMF_codecs/AmrNbCodecPlugin/group" filter="!sf_build" name="AmrNbCodecPlugin_group"/>
- </module>
- <module name="">
- <unit unitID="AmrWbCodecPlugin_group" mrp="" bldFile="sf/os/mm/audio/ARM_CMMF_codecs/AmrWbCodecPlugin/group" filter="!sf_build" name="AmrWbCodecPlugin_group"/>
- </module>
- <module name="">
- <unit unitID="EAacPlusCodecPlugin_group" mrp="" bldFile="sf/os/mm/audio/ARM_CMMF_codecs/EAacPlusCodecPlugin/group" filter="!sf_build" name="EAacPlusCodecPlugin_group"/>
- </module>
- <module name="">
- <unit unitID="MP3CodecPlugin_group" mrp="" bldFile="sf/os/mm/audio/ARM_CMMF_codecs/MP3CodecPlugin/group" filter="!sf_build" name="MP3CodecPlugin_group"/>
- </module>
- <module name="">
- <unit unitID="WMADecoderPlugin_group" mrp="" bldFile="sf/os/mm/audio/ARM_CMMF_codecs/WMADecoderPlugin/group" filter="!sf_build" name="WMADecoderPlugin_group"/>
- </module>
- <module name="">
- <unit unitID="ARM_MDF_Decoders_group" mrp="" bldFile="sf/os/mm/video/ARM_MDF_Decoders/group" filter="!sf_build" name="ARM_MDF_Decoders_group"/>
- </module>
- </layer>
-<layer name="bin_layer">
- <module name="bin_layer_helix_ren">
- <unit unitID="bin_layer_sf_mw_helix_helix_ren_src" name="src" bldFile="\sf\mw\helix\helix_ren\src\group" mrp="" filter="!no_binonly"/>
- </module>
- </layer>
-<layer name="japan_layer">
- <module name="japan_Version">
- <unit unitID="japan_sf_os_deviceplatformrelease_Version" name="Version" bldFile="\sf\os\deviceplatformrelease\Version\group" mrp=""/>
- </module>
- </layer>
-<layer name="china_layer">
- <module name="china_Version">
- <unit unitID="china_Version" name="Version" bldFile="\sf\os\deviceplatformrelease\Version\group" mrp=""/>
- </module>
- </layer></systemModel>
-</SystemDefinition>
\ No newline at end of file
--- a/symbian3/split/sysdefs/sysdef_1_4_0.dtd Wed May 05 12:21:47 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
- <!ELEMENT SystemDefinition (systemModel?, build?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (logicalset* | module*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- levels CDATA #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT logicalset (logicalsubset* | module* | unit* | package* | prebuilt*)*>
- <!ATTLIST logicalset name CDATA #REQUIRED>
- <!ELEMENT logicalsubset (module* | unit* | package* | prebuilt*)*>
- <!ATTLIST logicalsubset name CDATA #REQUIRED>
- <!ELEMENT module (component* | unit* | package* | prebuilt*)*>
- <!ATTLIST module
- name CDATA #REQUIRED
- level CDATA #IMPLIED>
- <!ELEMENT component (unit* | package* | prebuilt*)*>
- <!ATTLIST component name CDATA #REQUIRED>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- unitID ID #REQUIRED
- name CDATA #REQUIRED
- mrp CDATA #REQUIRED
- filter CDATA #IMPLIED
- bldFile CDATA #REQUIRED
- priority CDATA #IMPLIED
- contract CDATA #IMPLIED>
- <!ELEMENT package EMPTY>
- <!ATTLIST package
- name CDATA #REQUIRED
- mrp CDATA #REQUIRED
- filter CDATA #IMPLIED
- contract CDATA #IMPLIED>
- <!ELEMENT prebuilt EMPTY>
- <!ATTLIST prebuilt
- name CDATA #REQUIRED
- version CDATA #REQUIRED
- late (Y|N) #IMPLIED
- filter CDATA #IMPLIED
- contract CDATA #IMPLIED>
- <!ELEMENT build (option* | target+ | targetList+ | unitList+ | configuration+)*>
- <!ELEMENT unitList (unitRef+)>
- <!ATTLIST unitList
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT unitRef EMPTY>
- <!ATTLIST unitRef unit IDREF #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y | N | y | n) #REQUIRED>
- <!ELEMENT configuration (unitListRef+ | layerRef+ | task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task ( unitListRef* , (buildLayer | specialInstructions))>
- <!ELEMENT unitListRef EMPTY>
- <!ATTLIST unitListRef unitList IDREF #REQUIRED>
- <!ELEMENT layerRef EMPTY>
- <!ATTLIST layerRef layerName CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y | N | y | n) #REQUIRED
- targetParallel (Y | N | y | n) #IMPLIED>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- command CDATA #REQUIRED>
--- a/symbian3/split/sysdefs/sysdef_2_0_0.dtd Wed May 05 12:21:47 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
- <!ELEMENT SystemDefinition ( systemModel?, SystemBuild? )>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block* | collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock* | collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock name CDATA #REQUIRED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) "N"
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option* | target+ | targetList+ | list+ | configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y | N ) #REQUIRED>
- <!ELEMENT configuration (listRef+ | ref+ | task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef* , (buildLayer | specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y | N ) #REQUIRED
- targetParallel (Y | N ) "N">
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
\ No newline at end of file
--- a/symbian3/split/sysdefs/sysdef_dtd_1_4_0.xml Wed May 05 12:21:47 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-============================================================================
-Name : sysdef_dtd_1_4_0.xml
-Part of : Helium
-
-Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-All rights reserved.
-This component and the accompanying materials are made available
-under the terms of the License "Eclipse Public License v1.0"
-which accompanies this distribution, and is available
-at the URL "http://www.eclipse.org/legal/epl-v10.html".
-
-Initial Contributors:
-Nokia Corporation - initial contribution.
-
-Contributors:
-
-Description:
-
-============================================================================
--->
-<!DOCTYPE SystemDefinition [<!ELEMENT SystemDefinition (systemModel?, build?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (logicalset* | module*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- levels CDATA #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT logicalset (logicalsubset* | module* | unit* | package* | prebuilt*)*>
- <!ATTLIST logicalset name CDATA #REQUIRED>
- <!ELEMENT logicalsubset (module* | unit* | package* | prebuilt*)*>
- <!ATTLIST logicalsubset name CDATA #REQUIRED>
- <!ELEMENT module (component* | unit* | package* | prebuilt*)*>
- <!ATTLIST module
- name CDATA #REQUIRED
- level CDATA #IMPLIED>
- <!ELEMENT component (unit* | package* | prebuilt*)*>
- <!ATTLIST component name CDATA #REQUIRED>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- unitID ID #REQUIRED
- name CDATA #REQUIRED
- mrp CDATA #REQUIRED
- filter CDATA #IMPLIED
- bldFile CDATA #REQUIRED
- priority CDATA #IMPLIED
- contract CDATA #IMPLIED>
- <!ELEMENT package EMPTY>
- <!ATTLIST package
- name CDATA #REQUIRED
- mrp CDATA #REQUIRED
- filter CDATA #IMPLIED
- contract CDATA #IMPLIED>
- <!ELEMENT prebuilt EMPTY>
- <!ATTLIST prebuilt
- name CDATA #REQUIRED
- version CDATA #REQUIRED
- late (Y|N) #IMPLIED
- filter CDATA #IMPLIED
- contract CDATA #IMPLIED>
- <!ELEMENT build (option* | target+ | targetList+ | unitList+ | configuration+)*>
- <!ELEMENT unitList (unitRef+)>
- <!ATTLIST unitList
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT unitRef EMPTY>
- <!ATTLIST unitRef unit IDREF #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y | N | y | n) #REQUIRED>
- <!ELEMENT configuration (unitListRef+ | layerRef+ | task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task ( unitListRef* , (buildLayer | specialInstructions))>
- <!ELEMENT unitListRef EMPTY>
- <!ATTLIST unitListRef unitList IDREF #REQUIRED>
- <!ELEMENT layerRef EMPTY>
- <!ATTLIST layerRef layerName CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y | N | y | n) #REQUIRED
- targetParallel (Y | N | y | n) #IMPLIED>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition name="sysdef_dtd_1_4_0_xml" schema="1.4.0">
-</SystemDefinition>
--- a/symbian3/split/sysdefs/sysdef_dtd_2_0_0.xml Wed May 05 12:21:47 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-============================================================================
-Name : sysdef_dtd_1_4_0.xml
-Part of : Helium
-
-Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-All rights reserved.
-This component and the accompanying materials are made available
-under the terms of the License "Eclipse Public License v1.0"
-which accompanies this distribution, and is available
-at the URL "http://www.eclipse.org/legal/epl-v10.html".
-
-Initial Contributors:
-Nokia Corporation - initial contribution.
-
-Contributors:
-
-Description:
-
-============================================================================
--->
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition ( systemModel?, SystemBuild? )>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block* | collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock* | collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock name CDATA #REQUIRED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) "N"
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option* | target+ | targetList+ | list+ | configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y | N ) #REQUIRED>
- <!ELEMENT configuration (listRef+ | ref+ | task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef* , (buildLayer | specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y | N ) #REQUIRED
- targetParallel (Y | N ) "N">
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition name="MCL" schema="2.0.0">
-</SystemDefinition>
--- a/symbian3/split/sysdefs/system_model_os.xml Wed May 05 12:21:47 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2343 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition ( systemModel?, SystemBuild? )>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block* | collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock* | collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) "N"
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose ( optional | mandatory | development ) "optional">
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option* | target+ | targetList+ | list+ | configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y | N ) #REQUIRED>
- <!ELEMENT configuration (listRef+ | ref+ | task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef* , (buildLayer | specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y | N ) #REQUIRED
- targetParallel (Y | N ) "N">
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
-<collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
-<component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
-<unit mrp="os\kernelhwsrv\brdbootldr\ubootldr\base_ubootldr.mrp"/>
-</component>
-</collection>
-<collection name="bsptemplate" long-name="Board Support Package Template" level="hw-if">
-<component name="asspandvariant" long-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 name="kernel" long-name="Kernel Architecture" level="adaptation">
-<component name="eka" long-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 name="kerneltest" long-name="Kernel Test" level="hw-if">
-<component name="e32utils" long-name="E32 Utilities" purpose="development">
-<unit bldFile="os\kernelhwsrv\kerneltest\e32utils\group" mrp="os\kernelhwsrv\kerneltest\e32utils\group\base_e32utils.mrp"/>
-</component>
-<component name="e32test" long-name="E32 Tests" purpose="development">
-<unit bldFile="os\kernelhwsrv\kerneltest\e32test\group" mrp="os\kernelhwsrv\kerneltest\e32test\group\base_e32test.mrp"/>
-</component>
-<component name="f32test" long-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 name="ldds" long-name="Logical Device Drivers" level="adaptation">
-<component name="ethernetldd" long-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 name="audioldd" long-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>
-<component name="serialldd" long-name="Serial Port Drivers" purpose="optional">
-<unit bldFile="os\kernelhwsrv\kernel\eka\drivers\ecomm" mrp="os\kernelhwsrv\kernel\eka\drivers\ecomm\base_e32_drivers_ecomm.mrp"/>
-</component>
-<component name="legacydrivers" long-name="Legacy Drivers" purpose="optional">
-<unit mrp="os\kernelhwsrv\kernel\eka\drivers\adc\base_e32_drivers_adc.mrp"/>
-</component>
-<component name="locmedia" long-name="Local Media Subsystem" introduced="8.1b" purpose="mandatory">
-<!-- these are LDDs for storage media-->
-<unit bldFile="os\kernelhwsrv\kernel\eka\drivers\locmedia" mrp="os\kernelhwsrv\kernel\eka\drivers\locmedia\base_e32_drivers_locmedia.mrp"/>
-</component>
-<component name="runmodedebugger" long-name="Run Mode Debugger" purpose="mandatory">
-<unit bldFile="os\kernelhwsrv\kernel\eka\drivers\debug\group" mrp="os\kernelhwsrv\kernel\eka\drivers\debug\group\base_e32_drivers_debug.mrp"/>
-</component>
-<component name="btrace" long-name="Kernel Trace Tool" purpose="mandatory">
-<unit bldFile="os\kernelhwsrv\kernel\eka\drivers\trace" mrp="os\kernelhwsrv\kernel\eka\drivers\trace\base_e32_drivers_trace.mrp"/>
-</component>
-<component name="cameraldd" long-name="Camera Drivers" introduced="tb92" purpose="optional">
-<unit bldFile="os\kernelhwsrv\kernel\eka\drivers\camerasc" mrp="os\kernelhwsrv\kernel\eka\drivers\camerasc\base_drivers_camerasc.mrp"/>
-</component>
-<component name="displayldd" long-name="Display Drivers" introduced="^3" purpose="optional" plugin="N">
-<!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os\kernelhwsrv\kernel\eka\drivers\display" mrp="kernelhwsrv/kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
-</component>
-<component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b" purpose="optional" plugin="N">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os\kernelhwsrv\kernel\eka\drivers\usbc" mrp="kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
-</component>
-</collection>
-<collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
-<component name="mediadrivers" long-name="Media Drivers" purpose="optional">
-<!-- these are for storage media-->
-<unit bldFile="os\kernelhwsrv\kernel\eka\drivers\media" mrp="os\kernelhwsrv\kernel\eka\drivers\media\base_e32_drivers_media.mrp"/>
-</component>
-<component name="genericboardsupport" long-name="Generic Board Support" purpose="optional">
-<unit bldFile="os\kernelhwsrv\kernel\eka\drivers\bsp" mrp="os\kernelhwsrv\kernel\eka\drivers\bsp\base_e32_drivers_bsp.mrp"/>
-</component>
-</collection>
-<collection name="userlibandfileserver" long-name="User Library and File Server" level="framework">
-<component name="euser" long-name="User Library" purpose="mandatory">
-<unit bldFile="os\kernelhwsrv\kernel\eka\euser" mrp="os\kernelhwsrv\kernel\eka\euser\base_e32_euser.mrp"/>
-</component>
-<component name="compsupp" long-name="Compiler Runtime Support" filter="gt" purpose="mandatory">
-<unit bldFile="os\kernelhwsrv\kernel\eka\compsupp" mrp="os\kernelhwsrv\kernel\eka\compsupp\base_e32_compsupp.mrp"/>
-</component>
-<component name="fileserver" long-name="File Server" filter="gt" purpose="mandatory">
-<unit bldFile="os\kernelhwsrv\userlibandfileserver\fileserver\group" mrp="os\kernelhwsrv\userlibandfileserver\fileserver\group\base_f32.mrp"/>
-</component>
-<component name="estart" long-name="Base Starter" filter="gt" purpose="optional">
-<unit bldFile="os\kernelhwsrv\userlibandfileserver\fileserver\estart" mrp="os\kernelhwsrv\userlibandfileserver\fileserver\estart\base_f32_estart.mrp"/>
-</component>
-<component name="domainmgr" long-name="Domain Manager" introduced="8.1b" purpose="mandatory">
-<unit bldFile="os\kernelhwsrv\userlibandfileserver\domainmgr\group" mrp="os\kernelhwsrv\userlibandfileserver\domainmgr\group\base_domain.mrp"/>
-</component>
-</collection>
-<collection name="filesystems" long-name="File Systems" level="framework">
-<component name="romfs" long-name="ROM File System" filter="gt" purpose="optional" plugin="Y">
-<unit mrp="os\kernelhwsrv\userlibandfileserver\fileserver\srom\base_f32_srom.mrp"/>
-</component>
-<component name="rofs" long-name="ROFS" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os\kernelhwsrv\userlibandfileserver\fileserver\srofs" mrp="os\kernelhwsrv\userlibandfileserver\fileserver\srofs\base_f32_srofs.mrp"/>
-</component>
-<component name="usbmsfs" long-name="USB Mass Storage File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os\kernelhwsrv\userlibandfileserver\fileserver\smassstorage" mrp="os\kernelhwsrv\userlibandfileserver\fileserver\smassstorage\base_f32_smassstorage.mrp"/>
-</component>
-<component name="usbhostmssrv" long-name="USB Host Mass Storage Server" filter="gt" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="os\kernelhwsrv\userlibandfileserver\fileserver\shostmassstorage" mrp="os\kernelhwsrv\userlibandfileserver\fileserver\shostmassstorage\base_f32_shostmassstorage.mrp"/>
-</component>
-<component name="fat32fs" long-name="FAT32 File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os\kernelhwsrv\userlibandfileserver\fileserver\sfat32" mrp="os\kernelhwsrv\userlibandfileserver\fileserver\sfat32\base_f32_sfat32.mrp"/>
-</component>
-<component name="fatfs" long-name="FAT File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os\kernelhwsrv\userlibandfileserver\fileserver\sfat" mrp="os\kernelhwsrv\userlibandfileserver\fileserver\sfat\base_f32_sfat.mrp"/>
-</component>
-<component name="compfs" long-name="Composite File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os\kernelhwsrv\userlibandfileserver\fileserver\scomp" mrp="os\kernelhwsrv\userlibandfileserver\fileserver\scomp\base_f32_scomp.mrp"/>
-</component>
-</collection>
-<collection name="halservices" long-name="HAL Services" level="framework">
-<component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
-<unit bldFile="os\kernelhwsrv\halservices\hal" mrp="os\kernelhwsrv\halservices\hal\base_hal.mrp"/>
-</component>
-</collection>
-<collection name="textmodeshell" long-name="Text Mode Shell" level="test">
-<component name="e32wsrv" long-name="Text Window Server" purpose="optional">
-<unit bldFile="os\kernelhwsrv\kernel\eka\ewsrv" mrp="os\kernelhwsrv\kernel\eka\ewsrv\base_e32_ewsrv.mrp"/>
-</component>
-<component name="textshell" long-name="Text Shell" filter="gt" purpose="development">
-<unit bldFile="os\kernelhwsrv\userlibandfileserver\fileserver\etshell" mrp="os\kernelhwsrv\userlibandfileserver\fileserver\etshell\base_f32_eshell.mrp"/>
-</component>
-</collection>
-<collection name="baseapitest" long-name="Base API Tests" level="test">
-<component name="basesvs" long-name="Base Verification Suite" introduced="tb91" purpose="development">
-<unit mrp="os\kernelhwsrv\baseapitest\basesvs\group\basesvs.mrp"/>
-</component>
-</collection>
-<collection name="kernelhwsrv_info" long-name="Kernel and Hardware Services Info" level="test">
-<component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os\kernelhwsrv\kernelhwsrv_info\kernelhwsrv_metadata\kernelhwsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 config">
-<collection name="emulator" long-name="Emulator" level="bsp">
-<component name="emulatorbsp" long-name="Emulator BSP" purpose="optional">
-<unit bldFile="os\boardsupport\emulator\emulatorbsp" mrp="os\boardsupport\emulator\emulatorbsp\base_wins.mrp"/>
-</component>
-</collection>
-<collection name="haitest" long-name="HAI Test Suites" level="test">
-<component name="bspsvs" long-name="BSP Verification Suite" introduced="tb91" purpose="development">
-<unit mrp="os\boardsupport\haitest\bspsvs\group\bspsvs.mrp"/>
-</component>
-</collection>
-<collection name="boardsupport_info" long-name="Board Support Info" level="config">
-<component name="boardsupport_metadata" long-name="Board Support Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os\boardsupport\boardsupport_info\boardsupport_metadata\boardsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
-<collection name="bldsystemtools" long-name="Build System Tools" level="bld">
-<component name="sysdeftools" long-name="System Definition Tools" purpose="development" introduced="^2" plugin="N">
-<unit mrp="os/buildtools/bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
-</component>
-<component name="gttechviewbaseline" long-name="GT Techview Baseline" purpose="development">
-<unit mrp="os\buildtools\packaging\additionalutils\gt_techview_baseline.mrp"/>
-</component>
-<component name="commonbldutils" long-name="Common Utils" purpose="development">
-<unit mrp="os\buildtools\bldsystemtools\commonbldutils\tools_utils_common.mrp"/>
-</component>
-</collection>
-<collection name="packaging" long-name="Packaging" level="ui">
-<component name="additionalutils" long-name="Additional Utils" purpose="development">
-<unit mrp="os\buildtools\packaging\additionalutils\additional_unknown_cedar.mrp"/>
-</component>
-<component name="dummy" long-name="Dummy" purpose="development">
-<unit bldFile="os\buildtools\packaging\dummy" mrp="os\buildtools\packaging\dummy\additional_dummy.mrp"/>
-</component>
-</collection>
-<collection name="toolsandutils" long-name="Tools and Utils" level="mw">
-<component name="productionbldtools" long-name="Production Build Tools" filter="gt" purpose="development">
-<unit mrp="os\buildtools\toolsandutils\productionbldtools\product_tools.mrp"/>
-</component>
-<component name="e32tools" long-name="E32 Tools" deprecated="tb91" purpose="development" class="PC">
-<unit bldFile="os\buildtools\toolsandutils\e32tools\group" mrp="os\buildtools\toolsandutils\e32tools\group\tools_e32tools.mrp"/>
-</component>
-
-
-<component name="statapi" long-name="STAT API" filter="gt" purpose="development">
-<unit bldFile="os\buildtools\toolsandutils\statapi\source\statapi\console" mrp="os\buildtools\toolsandutils\statapi\group\testtools_stat_device_gt.mrp"/>
-</component>
-<component name="wintunnel" long-name="Wintunnel" purpose="development">
-<unit mrp="os\buildtools\toolsandutils\wintunnel\group\testtools_WinTunnel_srconly.mrp"/>
-</component>
-<component name="autotest" long-name="Autotest" purpose="development">
-<unit bldFile="os\buildtools\toolsandutils\autotest\group" mrp="os\buildtools\toolsandutils\autotest\group\tools_autotest.mrp"/>
-</component>
-</collection>
-<collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
-<component name="e32toolp" long-name="E32 Perl Tools" purpose="development" class="PC">
-<unit bldFile="os\buildtools\sbsv1_os\e32toolp\group" mrp="os\buildtools\sbsv1_os\e32toolp\group\tools_e32toolp.mrp"/>
-</component>
-</collection>
-<collection name="imgtools_os" long-name="Image Tools" level="fw">
-<component name="romkiteka2" long-name="ROMKIT EKA2" deprecated="tb91" purpose="development">
-<unit bldFile="os\buildtools\imgtools_os\romkiteka2\group" mrp="os\buildtools\imgtools_os\romkiteka2\group\tools_romkit.mrp"/>
-</component>
-</collection>
-<collection name="misccomponents" long-name="Misc Components" level="mw">
-<component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt" purpose="development">
-<unit bldFile="os\buildtools\misccomponents\emulatorlauncher\group" mrp="os\buildtools\misccomponents\emulatorlauncher\group\tools_sdk_eng_emulator_launcher.mrp"/>
-</component>
-</collection>
-<collection name="buildtools_info" long-name="Build Tools Info" level="ui">
-<component name="buildtools_metadata" long-name="Build Tools Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os\buildtools\buildtools_info\buildtools_metadata\buildtools_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
-<collection name="genericservices" long-name="Generic Services" level="utilities">
-<component name="s60compatibilityheaders" long-name="S60 Compatibility Headers" filter="gt" purpose="optional">
-<unit bldFile="os\ossrv\genericservices\s60compatibilityheaders\groupsymtb101sf" mrp="os\ossrv\genericservices\s60compatibilityheaders\groupsymtb101sf\tools_s60_header_compatsymtb101sf.mrp" version="tb101sf"/>
-</component>
-<component name="mimerecognitionfw" long-name="MIME Recognition Framework" purpose="mandatory">
-<unit bldFile="os\ossrv\genericservices\mimerecognitionfw\group" mrp="os\ossrv\genericservices\mimerecognitionfw\group\app-framework_emime.mrp"/>
-</component>
-<component name="systemagent" long-name="System Agent" introduced="9.0" purpose="mandatory">
-<unit bldFile="os\ossrv\genericservices\systemagent\group" mrp="os\ossrv\genericservices\systemagent\group\syslibs_sysagent2.mrp"/>
-</component>
-<component name="taskscheduler" long-name="Task Scheduler" introduced="6.0" purpose="optional">
-<unit bldFile="os\ossrv\genericservices\taskscheduler\group" mrp="os\ossrv\genericservices\taskscheduler\group\syslibs_schsvr.mrp"/>
-</component>
-<component name="activebackupclient" long-name="Active Backup Client" purpose="optional">
-<unit bldFile="os\ossrv\genericservices\activebackupclient\group" mrp="os\ossrv\genericservices\activebackupclient\group\connectivity_abclient.mrp"/>
-</component>
-<component name="syslibsdocs" long-name="Syslibs Documentation" purpose="development" class="doc">
-<unit mrp="os\ossrv\genericservices\syslibsdocs\syslibs_documentation.mrp"/>
-</component>
-<component name="httputils" long-name="HTTP Utilities Library" introduced="6.2" purpose="optional">
-<unit bldFile="os\ossrv\genericservices\httputils\group" mrp="os\ossrv\genericservices\httputils\group\application-protocols_inetprotutil.mrp"/>
-</component>
-</collection>
-<collection name="syslibsapitest" long-name="SysLibs API Tests" level="utilities">
-<component name="syslibssvs" long-name="Syslibs Verfication Suite" introduced="tb91" purpose="development">
-<unit mrp="os\ossrv\syslibsapitest\syslibssvs\group\syslibssvs.mrp"/>
-</component>
-</collection>
-<collection name="compressionlibs" long-name="Compression Libraries" level="data-services">
-<component name="ziplib" long-name="Zip Compression Library" introduced="6.0" purpose="mandatory">
-<unit bldFile="os\ossrv\compressionlibs\ziplib\group" mrp="os\ossrv\compressionlibs\ziplib\group\syslibs_ezlib2.mrp"/>
-</component>
-</collection>
-<collection name="genericopenlibs" long-name="Generic Open Libraries" level="translation">
-<component name="cstdlib" long-name="C Standard Library" introduced="ER5" purpose="optional">
-<unit bldFile="os\ossrv\genericopenlibs\cstdlib\group" mrp="os\ossrv\genericopenlibs\cstdlib\group\syslibs_stdlib.mrp"/>
-</component>
-<component name="cppstdlib" long-name="C++ Standard Library" introduced="tb92" purpose="mandatory">
-<unit bldFile="os\ossrv\genericopenlibs\cppstdlib\group" mrp="os\ossrv\genericopenlibs\cppstdlib\group\openenv_libstdcpp.mrp"/>
-</component>
-<component name="openenvcore" long-name="Open Environment Core" introduced="tb91" purpose="mandatory">
-<unit bldFile="os\ossrv\genericopenlibs\openenvcore\group" mrp="os\ossrv\genericopenlibs\openenvcore\group\openenv.mrp"/>
-</component>
-<component name="posixrealtimeextensions" long-name="POSIX Realtime Extensions" introduced="tb92" purpose="optional">
-<unit bldFile="os\ossrv\genericopenlibs\posixrealtimeextensions\group" mrp="os\ossrv\genericopenlibs\posixrealtimeextensions\group\oeaddons_librt.mrp"/>
-</component>
-</collection>
-<collection name="lowlevellibsandfws" long-name="Low Level Libraries and Frameworks" level="app-libs">
-<component name="pluginfw" long-name="Plugin Framework" introduced="6.2" purpose="mandatory">
-<unit bldFile="os\ossrv\lowlevellibsandfws\pluginfw\Group" mrp="os\ossrv\lowlevellibsandfws\pluginfw\Group\syslibs_ecom3.mrp" version="3"/>
-</component>
-<component name="apputils" long-name="Application Utilities" introduced="ER5" purpose="mandatory">
-<unit bldFile="os\ossrv\lowlevellibsandfws\apputils\group" mrp="os\ossrv\lowlevellibsandfws\apputils\group\syslibs_bafl.mrp"/>
-</component>
-<component name="genericusabilitylib" long-name="Generic Usability Library" introduced="tb92" purpose="mandatory">
-<unit bldFile="os\ossrv\lowlevellibsandfws\genericusabilitylib\group" mrp="os\ossrv\lowlevellibsandfws\genericusabilitylib\group\syslibs_euserhl.mrp"/>
-</component>
-</collection>
-<collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
-<component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os\ossrv\ossrv_info\ossrv_metadata\ossrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
-<collection name="authenticationservices" long-name="Authentication Services" level="utilities">
-<component name="authenticationserver" long-name="Authentication Server" introduced="^3" purpose="optional" plugin="N">
-<unit bldFile="os\security\authenticationservices\authenticationserver\group" mrp="security/authenticationservices/authenticationserver/group/security_authserver.mrp"/>
-</component>
-</collection>
-<collection name="authorisation" long-name="Authorisation" level="utilities">
-<component name="userpromptservice" long-name="User Prompt Service" introduced="tb92" purpose="mandatory">
-<unit bldFile="os\security\authorisation\userpromptservice\group" mrp="os\security\authorisation\userpromptservice\group\security_ups.mrp"/>
-</component>
-<component name="userpromptutils" long-name="User Prompt Utils" introduced="tb92" purpose="optional">
-<unit bldFile="os\security\authorisation\userpromptutils\group" mrp="os\security\authorisation\userpromptutils\group\security_ups_utils.mrp"/>
-</component>
-</collection>
-<collection name="contentmgmt" long-name="Content Management" level="utilities">
-<component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
-<unit bldFile="os\security\contentmgmt\contentaccessfwfordrm\group" mrp="os\security\contentmgmt\contentaccessfwfordrm\group\security_caf2.mrp"/>
-</component>
-<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>
-</collection>
-<collection name="crypto" long-name="Crypto Libraries" level="libraries">
-<component name="weakcryptospi" long-name="Weak Crypto SPI" filter="gt" introduced="tb92" purpose="optional">
-<unit bldFile="os\security\crypto\weakcryptospi\group" mrp="os\security\crypto\weakcryptospi\group\security_cryptospi_weak.mrp"/>
-</component>
-<component name="strongcryptospi" long-name="Strong Crypto SPI" filter="gt" introduced="tb92" purpose="optional">
-<unit bldFile="os\security\crypto\weakcryptospi\strong" mrp="os\security\crypto\weakcryptospi\group\security_cryptospi_strong.mrp"/>
-</component>
-</collection>
-<collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
-<component name="securityutils" long-name="Security Utils" introduced="8.0" purpose="optional">
-<unit bldFile="os\security\cryptomgmtlibs\securityutils\group" mrp="os\security\cryptomgmtlibs\securityutils\group\security_common.mrp"/>
-</component>
-<component name="securitytestfw" long-name="Security Test Framework" deprecated="tb92" introduced="7.0" purpose="development">
-<unit mrp="os\security\cryptomgmtlibs\securitytestfw\group\security_testframework.mrp"/>
-</component>
-<component name="securitydocs" long-name="Security Documentation" purpose="development" class="doc">
-<unit mrp="os\security\cryptomgmtlibs\securitydocs\security_documentation.mrp"/>
-</component>
-<component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0" purpose="optional">
-<unit bldFile="os\security\cryptomgmtlibs\cryptotokenfw\group" mrp="os\security\cryptomgmtlibs\cryptotokenfw\group\security_cryptotokens.mrp"/>
-</component>
-<component name="securitycommonutils" long-name="Security Common Utils" introduced="8.0" purpose="mandatory">
-<unit bldFile="os\security\cryptomgmtlibs\securitycommonutils\group" mrp="os\security\cryptomgmtlibs\securitycommonutils\group\security_commonutils.mrp"/>
-</component>
-</collection>
-<collection name="securityanddataprivacytools" long-name="Security and Data Privacy Tools" level="services">
-<component name="securityconfig" long-name="Security Config" introduced="9.1" purpose="optional">
-<unit bldFile="os\security\securityanddataprivacytools\securityconfig\group" mrp="os\security\securityanddataprivacytools\securityconfig\group\security_config.mrp"/>
-</component>
-<component name="securitytools" long-name="Security Tools" introduced="tb92" purpose="optional" class="PC">
-<unit bldFile="os\security\securityanddataprivacytools\securitytools\group" mrp="os\security\securityanddataprivacytools\securitytools\group\security_tools.mrp"/>
-</component>
-</collection>
-<collection name="cryptoplugins" long-name="Crypto Plugins" level="plugins">
-<component name="cryptospiplugins" long-name="Crypto SPI Plugins" filter="gt" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="os\security\cryptoplugins\cryptospiplugins\group" mrp="os\security\cryptoplugins\cryptospiplugins\group\security_cryptospi_plugins.mrp"/>
-</component>
-</collection>
-<collection name="cryptoservices" long-name="Crypto Services" level="plugins">
-<component name="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0" purpose="optional">
-<unit bldFile="os\security\cryptoservices\certificateandkeymgmt\group" mrp="os\security\cryptoservices\certificateandkeymgmt\group\security_certman.mrp"/>
-</component>
-<component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
-<unit bldFile="os\security\cryptoservices\filebasedcertificateandkeystores\group" mrp="os\security\cryptoservices\filebasedcertificateandkeystores\group\security_filetokens.mrp"/>
-</component>
- <component id="browserrootcertificates" name="Browser Root Certificates" introduced="symbian^2" purpose="optional">
- <unit mrp="os\security\cryptoservices\browserrootcertificates\browserrootcerts.mrp"/>
- </component>
-<component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional">
-<unit bldFile="os\security\cryptoservices\asnpkcs\group" mrp="os\security\cryptoservices\asnpkcs\group\security_asnpkcs.mrp"/>
-</component>
-</collection>
-<collection name="authenticationservices" long-name="Authentication Services" level="utilities">
-</collection>
-<collection name="security_info" long-name="OS Security Info" level="utilities">
-<component name="security_metadata" long-name="OS Security Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os\security\security_info\security_metadata\security_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="featuremgmt" long-name="Feature Management" level="framework">
-<component name="featuremgr" long-name="Feature Manager" introduced="tb92" purpose="mandatory">
-<unit bldFile="os\persistentdata\featuremgmt\featuremgr\group" mrp="os\persistentdata\featuremgmt\featuremgr\group\syslibs_featmgr.mrp"/>
-</component>
-<component name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="tb92" purpose="mandatory">
-<unit bldFile="os\persistentdata\featuremgmt\featureregistry\group" mrp="os\persistentdata\featuremgmt\featureregistry\group\syslibs_featreg.mrp"/>
-</component>
-</collection>
-<collection name="loggingservices" long-name="Logging Services" level="server">
-<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">
-<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="tb92" introduced="9.1" purpose="development">
-<unit bldFile="os\persistentdata\loggingservices\rfilelogger\group" mrp="os\persistentdata\loggingservices\rfilelogger\group\testtools_utilities.mrp"/>
-</component>
-</collection>
-<collection name="traceservices" long-name="Trace Services" level="server">
-<component name="commsdebugutility" long-name="Comms Debug Utility" introduced="7.0s" purpose="optional">
-<unit bldFile="os\persistentdata\traceservices\commsdebugutility\group" mrp="os\persistentdata\traceservices\commsdebugutility\group\comms-infras_commsdebugutility.mrp"/>
-</component>
-<component name="tracefw" long-name="Trace Framework" introduced="9.2" purpose="development">
-<unit bldFile="os\persistentdata\traceservices\tracefw\ulogger\group" mrp="os\persistentdata\traceservices\tracefw\ulogger\group\tools_debug_trace.mrp"/>
-</component>
-</collection>
-<collection name="persistentstorage" long-name="Persistent Storage" level="framework">
-<component name="store" long-name="Store" purpose="optional">
-<unit bldFile="os\persistentdata\persistentstorage\store\group" mrp="os\persistentdata\persistentstorage\store\group\syslibs_store.mrp"/>
-</component>
-<component name="dbms" long-name="DBMS" purpose="optional">
-<unit bldFile="os\persistentdata\persistentstorage\dbms\group" mrp="os\persistentdata\persistentstorage\dbms\group\syslibs_dbms.mrp"/>
-</component>
-<component name="centralrepository" long-name="Central Repository" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os\persistentdata\persistentstorage\centralrepository\group" mrp="os\persistentdata\persistentstorage\centralrepository\group\syslibs_centralrepository.mrp"/>
-</component>
-<component name="sql" long-name="SQL" introduced="9.3" purpose="optional">
-<unit bldFile="os\persistentdata\persistentstorage\sql\GROUP" mrp="os\persistentdata\persistentstorage\sql\GROUP\syslibs_sql.mrp"/>
-</component>
-<component name="sqlite3api" long-name="SQLite 3 API" introduced="tb92" purpose="optional">
-<unit bldFile="os\persistentdata\persistentstorage\sqlite3api\GROUP" mrp="os\persistentdata\persistentstorage\sqlite3api\GROUP\syslibs_sqlite3.mrp"/>
-</component>
-</collection>
-<collection name="persistentdata_info" long-name="Persistent Data Services Info" level="app-if">
-<component name="persistentdata_metadata" long-name="Persistent Data Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os\persistentdata\persistentdata_info\persistentdata_metadata\persistentdata_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="accessoryservices" long-name="Accessory Services" level="framework">
-<component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional">
-<unit bldFile="os\devicesrv\accessoryservices\remotecontrolfw\group" mrp="os\devicesrv\accessoryservices\remotecontrolfw\group\bluetooth_remotecontrol.mrp"/>
-</component>
-</collection>
-<!-- MattD 20091030 - hacked in from package definition. Presume these should be in the GT model... -->
- <collection name="commonservices" long-name="Common Services" level="app-if">
- <component name="sysutil" long-name="System Utilities" purpose="mandatory" introduced="ER5">
- <unit bldFile="os\devicesrv\commonservices\sysutil\group" mrp="os\devicesrv\commonservices\sysutil\group\sysutil.mrp"/>
- </component>
- <component name="activitymanager" long-name="Activity Manager" purpose="mandatory" introduced="ER5">
- <unit bldFile="os\devicesrv\commonservices\activitymanager\group" mrp="commonservices\activitymanager\group\activitymanager.mrp"/>
- </component>
- </collection>
-<collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
-<component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="tb91" purpose="optional">
-<unit bldFile="os\devicesrv\resourcemgmt\hwresourcesmgr\group" mrp="os\devicesrv\resourcemgmt\hwresourcesmgr\group\telephony_hwrm.mrp"/>
-</component>
-<component name="hwresourcesmgrconfig" long-name="Hardware Resources Manager Config" introduced="tb92" purpose="optional" class="config">
-<unit bldFile="os\devicesrv\resourcemgmt\hwresourcesmgrconfig" mrp="os\devicesrv\resourcemgmt\hwresourcesmgrconfig\telephony_hwrm-config.mrp"/>
-</component>
-<component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
-<unit bldFile="os\devicesrv\resourcemgmt\powerandmemorynotificationservice\group" mrp="os\devicesrv\resourcemgmt\powerandmemorynotificationservice\group\syslibs_pwrcli.mrp"/>
-</component>
-</collection>
-<collection name="sysstatemgmt" long-name="System State Management" level="server">
-<component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="tb92" purpose="mandatory">
-<unit bldFile="os\devicesrv\sysstatemgmt\systemstarter\group" mrp="os\devicesrv\sysstatemgmt\systemstarter\group\app-framework_sysstart.mrp"/>
-</component>
-<component name="systemstatemgr" long-name="System State Manager" introduced="tb92" purpose="mandatory">
-<unit bldFile="os\devicesrv\sysstatemgmt\systemstatemgr\group" mrp="os\devicesrv\sysstatemgmt\systemstatemgr\group\app-framework_ssma.mrp"/>
-</component>
-<component name="systemstateplugins" long-name="System State Plugins" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="os\devicesrv\sysstatemgmt\systemstateplugins\group" mrp="os\devicesrv\sysstatemgmt\systemstateplugins\group\app-framework_ssplugins.mrp"/>
-</component>
-<component name="systemstatereferenceplugins" long-name="System State Reference Plugins" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="os\devicesrv\sysstatemgmt\systemstatereferenceplugins\group" mrp="os\devicesrv\sysstatemgmt\systemstatereferenceplugins\group\app-framework_ssrefplugins.mrp"/>
-</component>
-</collection>
-<collection name="resourceinterfaces" long-name="Resource Interfaces" level="hw-if">
-<component name="fmtransmittercontrol" long-name="FM Transmitter Control" introduced="tb92" purpose="optional">
-<unit bldFile="os\devicesrv\resourceinterfaces\fmtransmittercontrol\group" mrp="os\devicesrv\resourceinterfaces\fmtransmittercontrol\group\telephony_hwrmfmtx.mrp"/>
-</component>
-</collection>
-<collection name="systemhealthmanagement" long-name="System Health Management" level="server">
-<component name="systemhealthmgr" long-name="System Health Manager" introduced="tb92" purpose="optional">
-<unit bldFile="os\devicesrv\systemhealthmanagement\systemhealthmgr\group" mrp="os\devicesrv\systemhealthmanagement\systemhealthmgr\group\app-framework_shma.mrp"/>
-</component>
-</collection>
-<collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if">
-<component name="accessorieshaitest" long-name="Accessories HAI Tests" introduced="tb91" purpose="development">
-<unit mrp="os\devicesrv\devicesrvapitest\accessorieshaitest\group\accessorieshaitest.mrp"/>
-</component>
-<component name="hwrmhaitest" long-name="HWRM HAI Tests" introduced="tb91" purpose="development">
-<unit mrp="os\devicesrv\devicesrvapitest\hwrmhaitest\group\hwrmhaitest.mrp"/>
-</component>
-</collection>
-<collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
-<component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os\devicesrv\devicesrv_info\devicesrv_metadata\devicesrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
-<collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
-<component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="os\lbs\datasourcemodules\defaultpositioningmodule\group" mrp="os\lbs\datasourcemodules\defaultpositioningmodule\group\lbs_default_positioning_module.mrp"/>
-</component>
-<component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="os\lbs\datasourcemodules\bluetoothgpspositioningmodule\group" mrp="os\lbs\datasourcemodules\bluetoothgpspositioningmodule\group\lbs_bt_positioning_module.mrp"/>
-</component>
-<component name="simulationpositioningmodule" long-name="Simulation Positioning Module" introduced="tb91" purpose="development" plugin="Y">
-<unit bldFile="os\lbs\datasourcemodules\simulationpositioningmodule\group" mrp="os\lbs\datasourcemodules\simulationpositioningmodule\group\lbs_simulation_positioning_module.mrp"/>
-</component>
-<component name="gpspositioningmodule" long-name="GPS/A-GPS Positioning Module" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="os\lbs\datasourcemodules\gpspositioningmodule\group" mrp="os\lbs\datasourcemodules\gpspositioningmodule\group\lbs_agps_positioning_module.mrp"/>
-</component>
-<component name="networkpositioningmodule" long-name="Network Positioning Module" introduced="tb92" 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="npeintegmodule" long-name="NPE Integration Module" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os\lbs\datasourcemodules\npeintegmodule\group" mrp="lbs/datasourcemodules/npeintegmodule/group/lbs_npeintegrationmodule.mrp"/>
-</component>
-</collection>
-<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
-<component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="os\lbs\datasourceadaptation\gpsdatasourceadaptation\group" mrp="os\lbs\datasourceadaptation\gpsdatasourceadaptation\group\lbs_gps_data_source_adaptation.mrp"/>
-</component>
-</collection>
-<collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
-<component name="locationserver" long-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 name="networkrequesthandler" long-name="Network Request Handler" introduced="9.2" purpose="optional">
-<unit bldFile="os\lbs\locationrequestmgmt\networkrequesthandler\group" mrp="os\lbs\locationrequestmgmt\networkrequesthandler\group\lbs_networkrequesthandler.mrp"/>
-</component>
-</collection>
-<collection name="lbstest" long-name="Locating Services Tests" level="application-interface">
-<component name="lbstestproduct" long-name="LBS Test Product" introduced="9.2" purpose="development">
-<unit mrp="os\lbs\lbstest\lbstestproduct\group\lbs_testproduct.mrp"/>
-</component>
-<component name="locationprotocoltest" long-name="Location Protocol Tests" introduced="9.2" purpose="development" plugin="Y">
-<unit bldFile="os\lbs\lbstest\locationprotocoltest\group" mrp="os\lbs\lbstest\locationprotocoltest\group\lbs_networktest.mrp"/>
-</component>
-</collection>
-<collection name="locationmgmt" long-name="Location Management" level="management">
-<component name="locmonitor" long-name="Location Monitor" introduced="tb92" purpose="optional">
-<unit bldFile="os\lbs\locationmgmt\locmonitor\lbslocmonitorserver\group" mrp="os\lbs\locationmgmt\locmonitor\lbslocmonitorserver\group\lbs_locationmonitor.mrp"/>
-</component>
-<component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os\lbs\locationmgmt\agpslocationmgr\group" mrp="os\lbs\locationmgmt\agpslocationmgr\group\lbs_agpslocationmanager.mrp"/>
-</component>
-<component name="networklocationmgr" long-name="Network Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os\lbs\locationmgmt\networklocationmgr\group" mrp="os\lbs\locationmgmt\networklocationmgr\group\lbs_networklocationmanager.mrp"/>
-</component>
-<component name="locationcore" long-name="Location Core" introduced="9.2" purpose="optional">
-<unit bldFile="os\lbs\locationmgmt\locationcore\group" mrp="os\lbs\locationmgmt\locationcore\group\lbs_admin.mrp"/>
-</component>
-<component name="networkgateway" long-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 name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
-<component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="os\lbs\networkprotocolmodules\privacyprotocolmodule\group" mrp="os\lbs\networkprotocolmodules\privacyprotocolmodule\group\lbs_privacyprotocolmodule.mrp"/>
-</component>
-<component name="suplproxyprotocolmodule" long-name="SUPL Proxy Protocol Module" introduced="tb92" purpose="optional" plugin="Y" class="placeholder">
-<unit bldFile="os\lbs\networkprotocolmodules\suplproxyprotocolmodule\group" mrp="lbs/networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
-</component>
-</collection>
-<collection name="lbsapitest" long-name="Location API Tests" level="application-interface">
-<component name="lbshaitest" long-name="Location HAI Tests" introduced="tb91" purpose="development">
-<unit mrp="os\lbs\lbsapitest\lbshaitest\group\lbshaitest.mrp"/>
-</component>
-</collection>
-<collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
-<component name="lbs_metadata" long-name="Locating Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os\lbs\lbs_info\lbs_metadata\lbs_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commsfw" level="services" long-name="Communications Framework" levels="server support framework process app-if">
-<collection name="commsprocess" long-name="Comms Process" level="process">
-<component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os\commsfw\commsprocess\commsrootserverconfig\group" mrp="os\commsfw\commsprocess\commsrootserverconfig\group\comms-infras_rootserver.mrp"/>
-</component>
-<component name="commsrootserverconfig" long-name="Comms Root Server Config" introduced="9.1" purpose="mandatory" class="config">
-<unit mrp="os\commsfw\commsprocess\commsrootserverconfig\group\comms-infras_rootserver-config.mrp"/>
-</component>
-</collection>
-<collection name="commsconfig" long-name="Comms Config" level="process">
-<component name="commsdatabase" long-name="Comms Database" purpose="mandatory">
-<unit bldFile="os\commsfw\commsfwtools\preparedefaultcommsdatabase\group" mrp="os\commsfw\commsfwtools\preparedefaultcommsdatabase\group\comms-infras_commsdat.mrp"/>
-</component>
-<component name="commsdatabaseshim" long-name="Comms Database Shim" introduced="8.1" purpose="mandatory">
-<unit bldFile="os\commsfw\commsconfig\commsdatabaseshim\group" mrp="os\commsfw\commsconfig\commsdatabaseshim\group\comms-infras_commdbshim.mrp"/>
-</component>
-</collection>
-<collection name="datacommsserver" long-name="Data Comms Server" level="framework">
-<component name="esockserver" long-name="ESock Server" purpose="mandatory">
-<unit bldFile="os\commsfw\datacommsserver\esockserver\group" mrp="os\commsfw\datacommsserver\esockserver\group\comms-infras_esock.mrp" version="3"/>
-</component>
-
-<component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1" purpose="optional">
-<unit bldFile="os\commsfw\datacommsserver\networkingdialogapi\group" mrp="os\commsfw\datacommsserver\networkingdialogapi\group\networking_dialog.mrp"/>
-</component>
-<component name="networkingdialogstub" long-name="Networking Dialog Stub" introduced="6.1" purpose="optional">
-<unit bldFile="os\commsfw\datacommsserver\networkingdialogapi\default" mrp="os\commsfw\datacommsserver\networkingdialogapi\default\networking_dialog_default.mrp"/>
-</component>
-<component name="networkcontroller" long-name="Network Controller" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os\commsfw\datacommsserver\networkcontroller\group" mrp="os\commsfw\datacommsserver\networkcontroller\group\networking_netcon.mrp"/>
-</component>
-</collection>
-<collection name="serialserver" long-name="Serial Server" level="server">
-<component name="serialportcsy" long-name="Serial Port CSY" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os\commsfw\serialserver\serialportcsy" mrp="os\commsfw\serialserver\serialportcsy\ser-comms_serialportcsy.mrp"/>
-</component>
-<component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" purpose="development">
-<unit bldFile="os\commsfw\serialserver\packetloopbackcsy\group" mrp="os\commsfw\serialserver\packetloopbackcsy\group\PacketLoopbackCSY.mrp"/>
-</component>
-<component name="c32serialserver" long-name="C32 Serial Server" introduced="ER5" purpose="mandatory">
-<unit bldFile="os\commsfw\serialserver\c32serialserver\group" mrp="os\commsfw\serialserver\c32serialserver\group\ser-comms_c32.mrp"/>
-</component>
-<component name="c32serialserverconfig" long-name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config">
-<unit bldFile="os\commsfw\serialserver\c32serialserverconfig" mrp="os\commsfw\serialserver\c32serialserverconfig\ser-comms_c32-config.mrp"/>
-</component>
-<component name="c32serialserverdocs" long-name="C32 Serial Server Documentation" purpose="development" class="doc">
-<unit mrp="os\commsfw\serialserver\c32serialserverdocs\ser-comms_documentation.mrp"/>
-</component>
-</collection>
-<collection name="commsfwutils" long-name="Comms Framework Utilities" level="framework">
-<component name="commsbufs" long-name="Comms Buffers" introduced="tb92" purpose="mandatory">
-<!-- <unit bldFile="os\unref\orphan\comgen\comms-infras\commsbufs\group" mrp="os\unref\orphan\comgen\comms-infras\commsbufs\group\comms-infras_commsbufs.mrp"/> -->
- <unit bldFile="os\commsfw\commsfwutils\commsbufs\group" mrp="os\commsfw\commsfwutils\commsbufs\group\comms-infras_commsbufs.mrp"/>
-</component>
-</collection>
-<collection name="commsfw_info" long-name="Comms Framework Info" level="app-if">
-<component name="commsinfrastructuredocs" long-name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
-<unit mrp="os\commsfw\commsfw_info\commsinfrastructuredocs\comms-infras_documentation.mrp"/>
-</component>
-<component name="commsfw_metadata" long-name="Communications Framework Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os\commsfw\commsfw_info\commsfw_metadata\commsfw_metadata.mrp"/>
-</component>
-</collection>
-<collection name="commsfwsupport" long-name="Comms Framework Support" level="support">
-<component name="commselements" long-name="Comms Elements" introduced="8.0" purpose="mandatory">
-<unit bldFile="os\commsfw\commsfwsupport\commselements\group" mrp="os\commsfw\commsfwsupport\commselements\group\comms-infras_elements.mrp"/>
-</component>
-</collection>
-<collection name="commsinfrastructureapitest" long-name="Comms-Infras API Tests" level="app-if">
-<component name="commsinfrastructuresvs" long-name="Comms Infrastructure Verification Suite" introduced="tb92" purpose="development">
-<unit mrp="os\commsfw\commsinfrastructureapitest\commsinfrastructuresvs\group\commsinfrastructuresvs.mrp"/>
-</component>
-</collection>
-<collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
-<!-- Removing GT commdb
-<component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC">
-<unit bldFile="os\commsfw\commsfwtools\preparedefaultcommsdatabase\defaultcommdb\group" mrp="os\commsfw\commsfwtools\preparedefaultcommsdatabase\defaultcommdb\group\comms-infras_defaultcommdb.mrp"/>
-</component>
-<component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" purpose="mandatory" class="PC">
-<unit bldFile="os\commsfw\commsfwtools\preparedefaultcommsdatabase\installdefaultcommdb\group" mrp="os\commsfw\commsfwtools\preparedefaultcommsdatabase\installdefaultcommdb\group\comms-infras_installdefaultcommdb.mrp" priority="1010"/>
-</component>
--->
-<component name="commstools" long-name="Comms Tools" introduced="tb91" purpose="development" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/commstools/group" mrp="os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
-</component>
-</collection>
-</block>
-<block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
-<component name="internetsockets" long-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>
-<collection name="tcpiputils" long-name="TCP/IP Utilities" level="plugin">
-<component name="dnd" long-name="DND" introduced="7.0" purpose="mandatory">
-<unit bldFile="os\networkingsrv\tcpiputils\dnd\group" mrp="os\networkingsrv\tcpiputils\dnd\group\networking_dnd.mrp"/>
-</component>
-<component name="dndconfig" long-name="DND Config" introduced="7.0" purpose="mandatory" class="config">
-<unit mrp="os\networkingsrv\tcpiputils\dnd\group\networking_dnd-config.mrp"/>
-</component>
-<component name="dhcp" long-name="DHCP" introduced="8.0" purpose="optional">
-<unit bldFile="os\networkingsrv\tcpiputils\dhcp\group" mrp="os\networkingsrv\tcpiputils\dhcp\group\networking_dhcp.mrp"/>
-</component>
-<component name="networkaddressandporttranslation" long-name="Network Address and Port Translation" introduced="tb91" purpose="mandatory" plugin="Y">
-<unit bldFile="os\networkingsrv\tcpiputils\networkaddressandporttranslation\group" mrp="os\networkingsrv\tcpiputils\networkaddressandporttranslation\group\networking_napt.mrp"/>
-</component>
-<component name="punycodeconv" long-name="Punycode Converter" introduced="tb92" purpose="mandatory">
-<unit bldFile="os\networkingsrv\tcpiputils\punycodeconv\group" mrp="os\networkingsrv\tcpiputils\punycodeconv\group\networking_punycodeconverter.mrp"/>
-</component>
-</collection>
-<collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
-<component name="nullagt" long-name="NULL AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os\networkingsrv\linklayercontrol\nullagt\group" mrp="os\networkingsrv\linklayercontrol\nullagt\group\networking_nullagt.mrp"/>
-</component>
-<component name="genericscprparameters" long-name="Generic SCPR Parameters" introduced="tb92" purpose="optional">
-<unit bldFile="os\networkingsrv\linklayercontrol\genericscprparameters\group" mrp="os\networkingsrv\linklayercontrol\genericscprparameters\group\networking_genericscprparams.mrp"/>
-</component>
-<component name="mbmsparameters" long-name="MBMS Parameters" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="os\networkingsrv\linklayercontrol\mbmsparameters\group" mrp="os\networkingsrv\linklayercontrol\mbmsparameters\group\networking_mbmsparams.mrp"/>
-</component>
-<component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory" plugin="N">
-<unit bldFile="os\networkingsrv\linklayercontrol\networkinterfacemgr\group" mrp="networkingsrv/linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp" version="2"/>
-</component>
-</collection>
-<collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
-<component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y">
-<unit bldFile="os\networkingsrv\linklayerprotocols\ethernetnif\group" mrp="os\networkingsrv\linklayerprotocols\ethernetnif\group\networking_ether802.mrp"/>
-</component>
-
-<component name="pppnif" long-name="PPP NIF" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os\networkingsrv\linklayerprotocols\pppnif\group" mrp="os\networkingsrv\linklayerprotocols\pppnif\group\networking_ppp.mrp" version="2"/>
-</component>
-
-<component name="slipnif" long-name="SLIP NIF" purpose="development" plugin="Y">
-<unit bldFile="os\networkingsrv\linklayerprotocols\slipnif\group" mrp="os\networkingsrv\linklayerprotocols\slipnif\group\networking_slip.mrp"/>
-</component>
-<component name="tunnelnif" long-name="Tunnel NIF" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os\networkingsrv\linklayerprotocols\tunnelnif\group" mrp="os\networkingsrv\linklayerprotocols\tunnelnif\group\networking_tunnelnif.mrp"/>
-</component>
-</collection>
-<collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
-<component name="packetlogger" long-name="Packet Logger" introduced="8.1" purpose="development">
-<unit bldFile="os\networkingsrv\linklayerutils\packetlogger\group" mrp="os\networkingsrv\linklayerutils\packetlogger\group\networking_packetlogger.mrp"/>
-</component>
-</collection>
-<collection name="networkcontrol" long-name="Network Control" level="plugin">
-
-<component name="qoslib" long-name="QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os\networkingsrv\networkcontrol\qoslib\group" mrp="os\networkingsrv\networkcontrol\qoslib\group\networking_qoslib.mrp"/>
-</component>
-<component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os\networkingsrv\networkcontrol\pfqoslib\group" mrp="os\networkingsrv\networkcontrol\pfqoslib\group\networking_pfqoslib.mrp"/>
-</component>
-<component name="qosfwprt" long-name="QoS Framework PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os\networkingsrv\networkcontrol\qosfwconfig\qos\group" mrp="os\networkingsrv\networkcontrol\qosfwconfig\qos\group\networking_qos.mrp"/>
-</component>
-<component name="qosipscpr" long-name="QoS IP SCPR" purpose="optional" plugin="Y">
-<unit bldFile="os\networkingsrv\networkcontrol\qosipscpr\group" mrp="os\networkingsrv\networkcontrol\qosipscpr\group\networking_qosipscpr.mrp"/>
-</component>
-<component name="ipnetworklayer" long-name="IP Network Layer" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="os\networkingsrv\networkcontrol\ipnetworklayer\group" mrp="os\networkingsrv\networkcontrol\ipnetworklayer\group\networking_ipproto.mrp"/>
-</component>
-<component name="iptransportlayer" long-name="IP Transport Layer" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="os\networkingsrv\networkcontrol\iptransportlayer\group" mrp="os\networkingsrv\networkcontrol\iptransportlayer\group\networking_iptransport.mrp"/>
-</component>
-<component name="commsuserpromptmgr" long-name="Comms User Prompt Manager" introduced="tb92" purpose="mandatory">
-<unit bldFile="os\networkingsrv\networkcontrol\commsuserpromptmgr\group" mrp="os\networkingsrv\networkcontrol\commsuserpromptmgr\group\networking_netups.mrp"/>
-</component>
-<component name="ipupsplugins" long-name="IP UPS Plugins" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="os\networkingsrv\networkcontrol\ipupsplugins\group" mrp="os\networkingsrv\networkcontrol\ipupsplugins\group\networking_ipups.mrp"/>
-</component>
-</collection>
-<collection name="networkprotocols" long-name="Network Protocols" level="plugin">
-<component name="tcpipv4config" long-name="TCP/IPv4/v6 Config" introduced="7.0" purpose="mandatory" class="config">
-<unit mrp="os\networkingsrv\networkprotocols\tcpipv4v6prt\group\networking_tcpip6-config.mrp"/>
-</component>
-<component name="ipeventnotifier" long-name="IP Event Notifier" introduced="8.1" purpose="mandatory" plugin="Y">
-<unit bldFile="os\networkingsrv\networkprotocols\ipeventnotifier\group" mrp="os\networkingsrv\networkprotocols\ipeventnotifier\group\networking_ipeventnotifier.mrp"/>
-</component>
-<component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os\networkingsrv\networkprotocols\tcpipv4v6prt\group" mrp="os\networkingsrv\networkprotocols\tcpipv4v6prt\group\networking_tcpip6.mrp"/>
-</component>
-<component name="iphook" long-name="IP Hook" introduced="7.0" purpose="mandatory">
-<unit bldFile="os\networkingsrv\networkprotocols\iphook\inhook6\group" mrp="os\networkingsrv\networkprotocols\iphook\inhook6\group\networking_inhook6.mrp"/>
-</component>
-<component name="mobileip" long-name="Mobile IP" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os\networkingsrv\networkprotocols\mobileip\group" mrp="os\networkingsrv\networkprotocols\mobileip\group\networking_mobileip.mrp"/>
-</component>
-<component name="dnsproxy" long-name="DNS Proxy" introduced="tb92" purpose="optional">
-<unit bldFile="os\networkingsrv\networkprotocols\dnsproxy\group" mrp="os\networkingsrv\networkprotocols\dnsproxy\group\networking_dnsproxy.mrp"/>
-</component>
-</collection>
-<collection name="networksecurity" long-name="Network Security" level="framework">
-<component name="tls" long-name="TLS" introduced="6.0" purpose="mandatory">
-<unit bldFile="os\networkingsrv\networksecurity\tls\group" mrp="os\networkingsrv\networksecurity\tls\group\networking_tls.mrp"/>
-</component>
-<component name="tlsprovider" long-name="TLS Provider" introduced="8.1" purpose="mandatory">
-<unit bldFile="os\networkingsrv\networksecurity\tlsprovider\group" mrp="os\networkingsrv\networksecurity\tlsprovider\group\security_tlsprovider.mrp"/>
-</component>
-<component name="ipsec" long-name="IPsec" introduced="7.0" purpose="optional">
-<unit bldFile="os\networkingsrv\networksecurity\ipsec\group" mrp="os\networkingsrv\networksecurity\ipsec\group\networking_ipsec.mrp"/>
-</component>
-</collection>
-<collection name="networkingtestandutils" long-name="Networking Test and Utils" level="app-if">
-<component name="networkingunittest" long-name="Networking Unit Test" introduced="7.0" purpose="development">
-<unit mrp="os\networkingsrv\networkingtestandutils\networkingunittest\group\networking_unittest.mrp"/>
-</component>
-<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="exampleinternetutilities" long-name="Example Internet Utilities" introduced="ER5" purpose="development">
-<unit mrp="os\networkingsrv\networkingtestandutils\exampleinternetutilities\group\networking_inetutil.mrp"/>
-</component>
-<component name="ipprobe" long-name="IP Probe" introduced="7.0s" purpose="development" plugin="Y">
-<unit mrp="os\networkingsrv\networkingtestandutils\ipprobe\group\networking_probe.mrp"/>
-</component>
-<component name="ipv6to4tunnel" long-name="IPv6 to 4 Tunnel" purpose="development" plugin="Y">
-<unit mrp="os\networkingsrv\networkingtestandutils\ipv6to4tunnel\group\networking_6to4.mrp"/>
-</component>
-<component name="ipanalyzer" long-name="IP Analyzer" deprecated="tb92" introduced="7.0" purpose="development">
-<unit mrp="os\networkingsrv\networkingtestandutils\ipanalyzer\group\networking_iprotor.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="tb92" 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">
-<!-- production component: contains the IBY files -->
-<unit bldFile="os\networkingsrv\networkingsrv_info\networkingrom\group" mrp="os\networkingsrv\networkingsrv_info\networkingrom\group\networking_general.mrp"/>
-</component>
-<component name="networkingdocs" long-name="Networking Documentation" purpose="development" class="doc">
-<unit mrp="os\networkingsrv\networkingsrv_info\networkingdocs\networking_documentation.mrp"/>
-</component>
-<component name="networkingsrv_metadata" long-name="Networking Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os\networkingsrv\networkingsrv_info\networkingsrv_metadata\networkingsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
-<component name="predictorcompression" long-name="Predictor Compression" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os\networkingsrv\pppcompressionplugins\predictorcompression\group" mrp="os\networkingsrv\pppcompressionplugins\predictorcompression\group\networking_predcomp.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wlan" level="services" long-name="WLAN" levels="hw low mid high tools test">
-<collection name="wlanapitest" long-name="WLAN API Tests" level="test">
-<component name="wlanhaitest" long-name="WLAN HAI Tests" introduced="tb91" purpose="development">
-<unit mrp="os\wlan\wlanapitest\wlanhaitest\group\wlanhaitest.mrp"/>
-</component>
-</collection>
-<collection name="wlan_info" long-name="WLAN Info" level="test">
-<component name="wlan_metadata" long-name="WLAN Metadata" introduced="tb91" 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="adaptation hw-if plugin framework server app-if">
-<collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
-<component name="basebandchanneladaptor" long-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 name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
-<component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os\cellularsrv\basebandadaptationplugins\basebandchanneladaptorforc32\group" mrp="os\cellularsrv\basebandadaptationplugins\basebandchanneladaptorforc32\group\networking_c32bca.mrp"/>
-</component>
-</collection>
-<collection name="fax" long-name="Fax" level="server">
-<component name="faxclientandserver" long-name="Fax Client and Server" purpose="optional">
-<unit bldFile="os\cellularsrv\fax\faxclientandserver\Group" mrp="os\cellularsrv\fax\faxclientandserver\Group\telephony_fax.mrp"/>
-</component>
-</collection>
-<collection name="smsprotocols" long-name="SMS Protocols" level="framework">
-<component name="smsstack" long-name="SMS Stack" introduced="6.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os\cellularsrv\smsprotocols\smsstack\group" mrp="os\cellularsrv\smsprotocols\smsstack\group\nbprotocols_smsstackv2.mrp"/>
-</component>
-</collection>
-<collection name="telephonyprotocols" long-name="Telephony Protocols" level="framework">
-<component name="csdagt" long-name="CSD AGT" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os\cellularsrv\telephonyprotocols\csdagt\group" mrp="os\cellularsrv\telephonyprotocols\csdagt\group\networking_csdagt.mrp"/>
-</component>
-<component name="psdagt" long-name="PSD AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os\cellularsrv\telephonyprotocols\psdagt\group" mrp="os\cellularsrv\telephonyprotocols\psdagt\group\networking_psdagt.mrp"/>
-</component>
-<component name="gprsumtsqosprt" long-name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os\cellularsrv\telephonyprotocols\gprsumtsqosprt\group" mrp="os\cellularsrv\telephonyprotocols\gprsumtsqosprt\group\networking_guqos.mrp"/>
-</component>
-<component name="gprsumtsqosinterface" long-name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os\cellularsrv\telephonyprotocols\gprsumtsqosinterface\group" mrp="os\cellularsrv\telephonyprotocols\gprsumtsqosinterface\group\networking_umtsif.mrp"/>
-</component>
-<component name="qosextnapi" long-name="QoS Extn API" introduced="9.2" purpose="optional">
-<unit bldFile="os\cellularsrv\telephonyprotocols\qosextnapi\group" mrp="os\cellularsrv\telephonyprotocols\qosextnapi\group\networking_qosextnapi.mrp"/>
-</component>
-<component name="secondarypdpcontextumtsdriver" long-name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
-<unit bldFile="os\cellularsrv\telephonyprotocols\secondarypdpcontextumtsdriver\group" mrp="os\cellularsrv\telephonyprotocols\secondarypdpcontextumtsdriver\group\networking_spud.mrp"/>
-</component>
-<component name="qos3gppcpr" long-name="QoS 3GPP CPR" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os\cellularsrv\telephonyprotocols\qos3gppcpr\group" mrp="os\cellularsrv\telephonyprotocols\qos3gppcpr\group\networking_Qos3GPP.mrp"/>
-</component>
-<component name="pdplayer" long-name="PDP Layer" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="os\cellularsrv\telephonyprotocols\pdplayer\group" mrp="os\cellularsrv\telephonyprotocols\pdplayer\group\networking_pdp.mrp"/>
-</component>
-<component name="rawipnif" long-name="Raw IP NIF" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os\cellularsrv\telephonyprotocols\rawipnif\group" mrp="os\cellularsrv\telephonyprotocols\rawipnif\group\networking_rawipnif.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserver" long-name="Telephony Server" level="server">
-<component name="etelserverandcore" long-name="ETel Server and Core" purpose="mandatory">
-<unit bldFile="os\cellularsrv\telephonyserver\etelserverandcore\group" mrp="os\cellularsrv\telephonyserver\etelserverandcore\group\telephony_etel.mrp"/>
-</component>
-<component name="etelconfig" long-name="ETel Config" purpose="mandatory" class="config">
-<unit mrp="os\cellularsrv\telephonyserver\etelserverandcore\group\telephony_etel-config.mrp"/>
-</component>
-<component name="etelmultimode" long-name="ETel Multimode" introduced="7.0" purpose="mandatory">
-<unit bldFile="os\cellularsrv\telephonyserver\etelmultimode\group" mrp="os\cellularsrv\telephonyserver\etelmultimode\group\telephony_etelmm.mrp"/>
-</component>
-<component name="etelpacketdata" long-name="ETel Packet Data" introduced="7.0" purpose="mandatory">
-<unit bldFile="os\cellularsrv\telephonyserver\etelpacketdata\group" mrp="os\cellularsrv\telephonyserver\etelpacketdata\group\telephony_etelpckt.mrp"/>
-</component>
-<component name="etelsimtoolkit" long-name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory">
-<unit bldFile="os\cellularsrv\telephonyserver\etelsimtoolkit\group" mrp="os\cellularsrv\telephonyserver\etelsimtoolkit\group\telephony_etelsat.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
-<component name="common_tsy" long-name="Common TSY" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="os\cellularsrv\telephonyserverplugins\common_tsy\group" mrp="os\cellularsrv\telephonyserverplugins\common_tsy\group\telephony_commontsy.mrp"/>
-</component>
-<component name="licenseetsystub" long-name="Licensee TSY Stub" introduced="tb91" purpose="development" plugin="Y">
-<unit mrp="os\cellularsrv\telephonyserverplugins\licenseetsystub\group\licenseetsystub.mrp"/>
-</component>
-<component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y">
-<unit bldFile="os\cellularsrv\telephonyserverplugins\multimodetsy\group" mrp="os\cellularsrv\telephonyserverplugins\multimodetsy\group\telephony_mmtsy.mrp"/>
-</component>
-<component name="simtsy" long-name="SIM TSY" introduced="7.0" purpose="development" plugin="Y">
-<unit bldFile="os\cellularsrv\telephonyserverplugins\simtsy\group" mrp="os\cellularsrv\telephonyserverplugins\simtsy\group\telephony_simtsy.mrp"/>
-</component>
-<component name="ctsydispatchlayer" long-name="C-TSY Dispatch Layer" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\group" mrp="os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\group\telephony_dispatcher.mrp"/>
-</component>
-<component name="simatktsy" long-name="SIMATK TSY" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="os\cellularsrv\telephonyserverplugins\simatktsy\group" mrp="os\cellularsrv\telephonyserverplugins\simatktsy\group\commonsimatktsy.mrp"/>
-</component>
-</collection>
-<collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
-<component name="dial" long-name="Dial" deprecated="9.1" purpose="optional">
-<unit bldFile="os\cellularsrv\telephonyutils\dial\group" mrp="os\cellularsrv\telephonyutils\dial\group\telephony_dial.mrp"/>
-</component>
-<component name="telephonywatchers" long-name="Telephony Watchers" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os\cellularsrv\telephonyutils\telephonywatchers\group" mrp="os\cellularsrv\telephonyutils\telephonywatchers\group\telephony_watchers.mrp"/>
-</component>
-<component name="etel3rdpartyapi" long-name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
-<unit bldFile="os\cellularsrv\telephonyutils\etel3rdpartyapi\Group" mrp="os\cellularsrv\telephonyutils\etel3rdpartyapi\Group\telephony_etel3rdparty.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrv_info" long-name="Cellular Baseband Services Info" level="app-if">
-<component name="telephonyconfidentialdocs" long-name="Telephony Confidential Documentation" purpose="development" class="doc">
-<unit mrp="os\cellularsrv\cellularsrv_info\telephonyconfidentialdocs\telephony_confidential.mrp"/>
-</component>
-<component name="telephonydocs" long-name="Telephony Documentation" purpose="development" class="doc">
-<unit mrp="os\cellularsrv\cellularsrv_info\telephonydocs\telephony_documentation.mrp"/>
-</component>
-<component name="cellularsrv_metadata" long-name="Cellular Baseband Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os\cellularsrv\cellularsrv_info\cellularsrv_metadata\cellularsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
-<component name="mocksy" long-name="MockSY" introduced="tb91" purpose="development" plugin="Y">
-<unit bldFile="os\cellularsrv\hwpluginsimulation\mocksy\group" mrp="os\cellularsrv\hwpluginsimulation\mocksy\group\telephony_tools_mocksy.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if">
-<component name="datatransferhaitest" long-name="Data Transfer HAI Tests" introduced="tb91" purpose="development">
-<unit mrp="os\cellularsrv\cellularsrvapitest\datatransferhaitest\group\datatransferhaitest.mrp"/>
-</component>
-<component name="telephonyhaitest" long-name="Telephony HAI Tests" introduced="tb91" purpose="development">
-<unit mrp="os\cellularsrv\cellularsrvapitest\telephonyhaitest\group\telephonyhaitest.mrp"/>
-</component>
-<component name="telephonydevsoundhaitest" long-name="DevSound Telephony HAI Tests" introduced="tb91" purpose="development">
-<unit mrp="os\cellularsrv\cellularsrvapitest\telephonydevsoundhaitest\group\telephonydevsoundhaitest.mrp"/>
-</component>
-</collection>
-</block>
-<block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
-<collection name="bluetooth" long-name="Bluetooth Core" level="framework">
-<component name="btstack" long-name="Bluetooth Stack" introduced="6.0" purpose="optional">
-<unit bldFile="os\bt\bluetooth\btstack" mrp="os\bt\bluetooth\btstack\bluetooth_stack.mrp"/>
-</component>
-<component name="btcomm" long-name="Bluetooth CSY" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os\bt\bluetooth\btcomm" mrp="os\bt\bluetooth\btcomm\bluetooth_btcomm.mrp"/>
-</component>
-<component name="btsdp" long-name="Bluetooth SDP" introduced="6.1" purpose="optional">
-<unit bldFile="os\bt\bluetooth\btsdp" mrp="os\bt\bluetooth\btsdp\bluetooth_sdp.mrp"/>
-</component>
-<component name="btextnotifiers" long-name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
-<unit bldFile="os\bt\bluetooth\btextnotifiers" mrp="os\bt\bluetooth\btextnotifiers\bluetooth_btextnotifiers.mrp"/>
-</component>
-<component name="gavdp" long-name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
-<unit bldFile="os\bt\bluetooth\gavdp\group" mrp="os\bt\bluetooth\gavdp\group\bluetooth_gavdp.mrp"/>
-</component>
-<component name="btexample" long-name="Bluetooth Examples and Tests" introduced="6.1" purpose="development">
-<unit mrp="os\bt\bluetooth\btexample\test\bluetooth_tests_examples.mrp"/>
-</component>
-<component name="btlogger" long-name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
-<unit bldFile="os\bt\bluetooth\btlogger\group" mrp="os\bt\bluetooth\btlogger\group\bluetooth_logger.mrp"/>
-</component>
-<component name="btdocs" long-name="Bluetooth Documentation" purpose="development" class="doc">
-<unit mrp="os\bt\bluetooth\btdocs\bluetooth_documentation.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothmgmt" long-name="Bluetooth Management" level="plugin">
-<component name="btmgr" long-name="Bluetooth Manager" introduced="6.0" purpose="optional">
-<unit bldFile="os\bt\bluetoothmgmt\btmgr" mrp="os\bt\bluetoothmgmt\btmgr\bluetooth_manager.mrp"/>
-</component>
-<component name="btconfig" long-name="Bluetooth Config" purpose="optional" class="config">
-<unit bldFile="os\bt\bluetoothmgmt\btconfig" mrp="os\bt\bluetoothmgmt\btconfig\bluetooth_config.mrp"/>
-</component>
-<component name="btrom" long-name="Bluetooth ROM" introduced="9.1" purpose="optional">
-<unit bldFile="os\bt\bluetoothmgmt\btrom" mrp="os\bt\bluetoothmgmt\btrom\bluetooth_rom.mrp"/>
-</component>
-<component name="bluetoothclientlib" long-name="Bluetooth Client Library" introduced="6.0" purpose="optional">
-<unit bldFile="os\bt\bluetoothmgmt\bluetoothclientlib" mrp="os\bt\bluetoothmgmt\bluetoothclientlib\bluetooth_user.mrp"/>
-</component>
-<component name="btcommon" long-name="Bluetooth Build Utilities" purpose="optional">
-<unit mrp="os\bt\bluetoothmgmt\btcommon\bluetooth_common.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothcommsprofiles" long-name="Bluetooth Comms Profiles" level="app-if">
-<component name="btpan" long-name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os\bt\bluetoothcommsprofiles\btpan\group" mrp="os\bt\bluetoothcommsprofiles\btpan\group\bluetooth_pan.mrp"/>
-</component>
-</collection>
-<collection name="bthci" long-name="Host Controller Interface" level="server">
-<component name="bthci2" long-name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
-<unit bldFile="os\bt\bthci\bthci2\group" mrp="os\bt\bthci\bthci2\group\bluetooth_hci_v2_framework.mrp"/>
-</component>
-<component name="hciextensioninterface" long-name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
-<unit bldFile="os\bt\bthci\hciextensioninterface" mrp="os\bt\bthci\hciextensioninterface\bluetooth_hciproxy.mrp"/>
-</component>
-<component name="hci2implementations" long-name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os\bt\bthci\hci2implementations\group" mrp="os\bt\bthci\hci2implementations\group\bluetooth_hci_v2_implementations.mrp"/>
-</component>
-</collection>
-<collection name="irda" long-name="IrDA" level="plugin">
-<component name="irdastack" long-name="IrDA Stack" purpose="optional">
-<unit bldFile="os\bt\irda\irdastack\group" mrp="os\bt\irda\irdastack\group\infra-red_irda.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if">
-<component name="bluetoothsvs" long-name="Bluetooth Verification Suite" introduced="tb92" purpose="development">
-<unit mrp="os\bt\bluetoothapitest\bluetoothsvs\group\bluetoothsvs.mrp"/>
-</component>
-</collection>
-<collection name="bt_info" long-name="Bluetooth Info" level="app-if">
-<!-- MattD 20091102 - Added manually to stop build failures... Probably an S60 component -->
- <component name="bt_plat" filter="s60" class="api">
- <unit bldFile="os\bt\bt_plat\group"/>
- </component>
-<component name="bt_metadata" long-name="Bluetooth Metadata" introduced="tb92" purpose="development" class="config PC">
-<unit mrp="os\bt\bt_info\bt_metadata\bt_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
-<collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
-<!-- usbclientdrivers to be moved here from kernelhwsrv-->
-</collection>
-<collection name="usbmgmt" long-name="USB Management" level="server">
-<component name="usbmgr" long-name="USB Manager" purpose="optional">
-<unit bldFile="os\usb\usbmgmt\usbmgr\group" mrp="os\usb\usbmgmt\usbmgr\group\usb_manager.mrp" version="2"/>
-</component>
-<component name="usbmgrtest" long-name="USB Manager Tests" introduced="7.0" purpose="development">
-<unit mrp="os\usb\usbmgmt\usbmgrtest\group\usb_test.mrp" version="2"/>
-</component>
-<component name="usbclassandmgrdocs" long-name="USB Class and Manager Documentation" purpose="development" class="doc">
-<unit mrp="os\usb\usbmgmt\usbclassandmgrdocs\usb_documentation.mrp"/>
-</component>
-</collection>
-<collection name="usb_info" long-name="USB Info" level="app-if">
-<component name="usb_metadata" long-name="USB Metadata" introduced="tb92" purpose="development" class="config PC">
-<unit mrp="os\usb\usb_info\usb_metadata\usb_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="mm" level="services" long-name="Multimedia" levels="adaptation hw-if device-fw devices middleware app-if">
-<collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
-<component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os\mm\imagingandcamerafws\imagingfws\group" mrp="os\mm\imagingandcamerafws\imagingfws\group\multimedia_icl.mrp"/>
-</component>
-<component name="imagingunittest" long-name="Imaging Unit Tests" introduced="7.0s" purpose="development">
-<unit mrp="os\mm\imagingandcamerafws\imagingunittest\group\multimedia_unittest_icl_source.mrp"/>
-</component>
-<component name="imaginginttest" long-name="Imaging Integration Tests" introduced="7.0s" purpose="development">
-<unit mrp="os\mm\imagingandcamerafws\imaginginttest\group\multimedia_inttest_icl_source.mrp"/>
-</component>
-<component name="camerafw" long-name="Camera Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os\mm\imagingandcamerafws\camerafw\group" mrp="os\mm\imagingandcamerafws\camerafw\group\multimedia_ecam_framework.mrp"/>
-</component>
-<component name="cameraunittest" long-name="Camera Unit Tests" introduced="9.2" purpose="development">
-<unit mrp="os\mm\imagingandcamerafws\cameraunittest\group\multimedia_unittest_ecam_source.mrp"/>
-</component>
-</collection>
-<collection name="mmlibs" long-name="Multimedia Libraries" level="middleware">
-<component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
-<unit bldFile="os\mm\mmlibs\mmutilitylib\group" mrp="mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
-</component>
-<component name="mmfw" long-name="Multimedia Framework" introduced="7.0s" purpose="mandatory" plugin="N">
-<unit bldFile="os/mm/mmlibs/mmfw/group" mrp="mm/mmlibs/mmfw/group/multimedia_mmf.mrp"/>
-</component>
-</collection>
-<collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
-<component name="imagingplugins" long-name="Imaging Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os\mm\mmplugins\imagingplugins\group" mrp="mm/mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
-</component>
-<component name="cameraplugins" long-name="Camera Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os\mm\mmplugins\cameraplugins\group" mrp="os\mm\mmplugins\cameraplugins\group\multimedia_ecam_plugins.mrp"/>
-</component>
-<component name="lib3gp" long-name="3GP Library" introduced="tb91" purpose="optional">
-<unit bldFile="os\mm\mmplugins\lib3gp\group" mrp="os\mm\mmplugins\lib3gp\group\multimedia_3gplibrary.mrp"/>
-</component>
-<component name="lib3gpunittest" long-name="3GP Unit Tests" introduced="tb91" purpose="development">
-<unit mrp="os\mm\mmplugins\lib3gpunittest\group\multimedia_unittest_3gplibrary_source.mrp"/>
-</component>
-<component name="mmfwplugins" long-name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/mmfwplugins/group" mrp="mm/mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
-</component>
-</collection>
-<collection name="mm_info" long-name="Multimedia Info" level="app-if">
-<component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc">
-<unit mrp="os\mm\mm_info\mmdocs\multimedia_documentation.mrp"/>
-</component>
-<component name="mm_metadata" long-name="Multimedia Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os\mm\mm_info\mm_metadata\mm_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
-<component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="tb91" purpose="development">
-<unit bldFile="os\mm\mmresourcemgmt\mmresctrl\group" mrp="os\mm\mmresourcemgmt\mmresctrl\group\multimedia_a3f_refmmrc.mrp"/>
-</component>
-<!-- decsionfw is not used in any active configuration yet
- <component id="decisionfw" name="Decision Framework" introduced="Future" purpose="optional">
- <unit bldFile="mmresourcemgmt/decisionfw/group" mrp="mmresourcemgmt/decisionfw/group/multimedia_mmrcfw.mrp"/>
- </component>
- -->
-<!-- mmgmtengine in not used in any active configuration yet
- <component id="mmmgmtengine" name="Multimedia Management Engine" introduced="Future" purpose="optional">
- <unit bldFile="mmresourcemgmt/mmmgmtengine/group" mrp="mmresourcemgmt/mmmgmtengine/group/multimedia_mgtengine.mrp"/>
- </component>
- -->
-</collection>
-<collection name="mmdevicefw" long-name="Multimedia Device Framework" level="device-fw">
-<component name="mdf" long-name="Media Device Framework" introduced="9.2" purpose="mandatory">
-<unit bldFile="os\mm\mmdevicefw\mdf\group" mrp="os\mm\mmdevicefw\mdf\group\multimedia_mdf.mrp"/>
-</component>
-<!-- mdf2 is not used in any active configuration yet
- <component id="mdf2" name="Media Device Framework 2" introduced="Future" purpose="optional">
- <unit bldFile="mmdevicefw/mdf2/group" mrp="mmdevicefw/mdf2/group/multimedia_mm-infras.mrp"/>
- </component>
- -->
-<component name="mdfunittest" long-name="MDF Unit Tests" introduced="9.2" purpose="development">
-<unit mrp="os\mm\mmdevicefw\mdfunittest\group\multimedia_unittest_mdf_source.mrp"/>
-</component>
-<component name="speechrecogsupport" long-name="Speech Recognition Support" introduced="7.0s" purpose="mandatory" plugin="N">
-<unit bldFile="os/mm/mmdevicefw/speechrecogsupport/group" mrp="mm/mmdevicefw/speechrecogsupport/group/multimedia_mmf_ASR.mrp"/>
-</component>
-</collection>
-<collection name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
-<component name="videorenderer" long-name="Video Renderer" introduced="tb92" purpose="optional">
-<unit bldFile="os\mm\mmswadaptation\videorenderer\group" mrp="os\mm\mmswadaptation\videorenderer\group\multimedia_videorenderer.mrp"/>
-</component>
-</collection>
-<collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw">
-<component name="mmtestfw" long-name="Multimedia Test Framework" introduced="7.0s" purpose="development">
-<unit mrp="os\mm\mmtestenv\mmtestfw\group\multimedia_testframework_source.mrp"/>
-</component>
-<component name="mmtestfwunittest" long-name="Multimedia Test Framework Unit Tests" introduced="7.0s" purpose="development">
-<unit mrp="os\mm\mmtestenv\mmtestfwunittest\group\multimedia_unittest_testframework_source.mrp"/>
-</component>
-<component name="mmtestagent" long-name="Multimedia Test Agent" introduced="8.0" purpose="development">
-<unit mrp="os\mm\mmtestenv\mmtestagent\group\multimediatestagent_source.mrp"/>
-</component>
-<component name="mmtesttools" long-name="Multimedia Test Tools" purpose="development">
-<unit mrp="os\mm\mmtestenv\mmtesttools\Group\multimedia_testtools_source.mrp"/>
-</component>
-</collection>
-<collection name="omxil" long-name="OpenMAX IL" level="hw-if">
-<component name="omxilapi" long-name="OpenMAX IL API" introduced="tb92" purpose="optional">
-<unit bldFile="os\mm\omxil\omxilapi\group" mrp="os\mm\omxil\omxilapi\group\multimedia_omx_il_api.mrp" version="1"/>
-<!-- not used in an active conifguration
- <unit version="2" bldFile="omxil/omxilapi2/group" mrp="omxil/omxilapi2/group/multimedia_omx_il_api.mrp"/>
- -->
-</component>
-<component name="omxilcore" long-name="OpenMAX IL Core" introduced="tb92" purpose="optional">
-<unit bldFile="os\mm\omxil\omxilcore\group" mrp="os\mm\omxil\omxilcore\group\multimedia_omx_il_core.mrp" version="1"/>
-<!-- not used in an active conifguration
- <unit version="2" bldFile="omxil/omxilcore2/group" mrp="omxil/omxilcore2/group/multimedia_omx_il_core.mrp"/>
- -->
-</component>
-<component name="omxilcomponentcommon" long-name="OpenMAX IL Component Framework" introduced="^3" purpose="optional" plugin="N">
-<unit bldFile="os/mm/omxil/omxilcomponentcommon/group" mrp="mm/omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp" version="1"/>
-</component>
-<component name="omxilrefcomps" long-name="OpenMAX IL Reference Components" introduced="tb92" purpose="optional">
-<unit bldFile="os\mm\omxil\omxilrefcomps\ref_components\group" mrp="os\mm\omxil\omxilrefcomps\ref_components\group\multimedia_omx_il_comp_ref.mrp" version="1"/>
-</component>
-<component name="omxilunittest" long-name="OpenMAX IL Unit Tests" introduced="tb92" purpose="development">
-<unit mrp="os\mm\omxil\omxilunittest\group\multimedia_unittest_omx_il.mrp"/>
-</component>
-<component name="omxilcoreconftest" long-name="OpenMAX IL Core Conformance Suite" introduced="tb92" purpose="development">
-<unit mrp="os\mm\omxil\omxilcoreconftest\group\multimedia_omx_il_core_loader_conf_suite.mrp"/>
-</component>
-<component name="mmilapi" long-name="Multimedia Integration Layer API" introduced="tb92" purpose="development">
-<unit bldFile="os\mm\omxil\mmilapi\group" mrp="os\mm\omxil\mmilapi\group\multimedia_il_api.mrp"/>
-</component>
-</collection>
-<collection name="devsound" long-name="Sound Device" level="devices">
-<component name="devsoundapi" long-name="DevSound API" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/devsound/devsoundapi/group" mrp="mm/devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
-</component>
-<component name="a3fdevsound" long-name="A3F DevSound" introduced="tb91" purpose="optional">
-<unit bldFile="os\mm\devsound\a3fdevsound\group" mrp="os\mm\devsound\a3fdevsound\group\multimedia_a3f_devsound.mrp"/>
-</component>
-<component name="a3facf" long-name="A3F Audio Component Framework" introduced="tb91" purpose="optional">
-<unit bldFile="os\mm\devsound\a3facf\group" mrp="os\mm\devsound\a3facf\group\multimedia_a3f_acf.mrp"/>
-</component>
-<component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/devsound/devsoundpluginsupport/group" mrp="mm/devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
-</component>
-<component name="refdevsound" long-name="Reference DevSound Plugins" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/devsound/devsoundrefplugin/group" mrp="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">
-<unit bldFile="os/mm/devsound/sounddevbt/group" mrp="mm/devsound/sounddevbt/group/multimedia_mdf_devsound_refbtplugin.mrp"/>
-</component>
-<component name="a3ftrace" long-name="A3F Trace Utility" introduced="tb91" purpose="development">
-<unit bldFile="os\mm\devsound\a3ftrace\group" mrp="os\mm\devsound\a3ftrace\group\multimedia_a3f_traces.mrp"/>
-</component>
-<component name="a3fintegrationtest" long-name="A3F Integration Tests" introduced="tb91" purpose="development">
-<unit mrp="os\mm\devsound\a3fintegrationtest\group\multimedia_inttest_a3f_devsound_source.mrp" />
-</component>
-<component name="a3fsrvstart" long-name="A3F Server Start" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="os\mm\devsound\a3fsrvstart\group" mrp="os\mm\devsound\a3fsrvstart\group\multimedia_a3f_serverstart.mrp"/>
-</component>
-</collection>
-<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
-<component name="devsoundhwdeviceapi" long-name="DevSound Hardware Device API" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/devsound/hwdevapi/group" mrp="mm/devsound/hwdevapi/group/multimedia_mdf_devsound_hwdev.mrp"/>
-</component>
-<component name="a3facl" long-name="A3F Audio Component Library" introduced="tb91" purpose="development">
-<unit bldFile="os\mm\mmhais\a3facl\group" mrp="os\mm\mmhais\a3facl\group\multimedia_a3f_acl.mrp"/>
-</component>
-<component name="a3fdevsoundcustomisation" long-name="A3F DevSound Customisation" introduced="tb91" purpose="optional">
-<unit bldFile="os\mm\mmhais\a3fdevsoundcustomisation\group" mrp="os\mm\mmhais\a3fdevsoundcustomisation\group\multimedia_a3f_devsoundadaptationinfo.mrp"/>
-</component>
-<component name="refacladapt" long-name="Reference ACL Adaptation" introduced="tb91" purpose="optional">
-<unit bldFile="os\mm\mmhais\refacladapt\group" mrp="os\mm\mmhais\refacladapt\group\multimedia_a3f_refacladaptation.mrp"/>
-</component>
-<component name="videohai" long-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 name="dvbhreceiverhai" long-name="Mobile TV DVB-H Receiver HAI" introduced="tb91" 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>
-<component name="dvbhunittest" long-name="Mobile TV DVB-H Unit Tests" introduced="tb91" purpose="development">
-<unit mrp="os\mm\mmhais\dvbhunittest\hai\dvbh\group\multimedia_unittest_dvbhhai.mrp"/>
-</component>
-</collection>
-<collection name="mmapitest" long-name="Multimedia API Tests" level="app-if">
-<component name="mmsvs" long-name="Multimedia Verification Suite" introduced="tb91" purpose="development">
-<unit mrp="os\mm\mmapitest\mmsvs\group\mmsvs.mrp"/>
-</component>
-<component name="devvideohaitest" long-name="DevVideo HAI Tests" introduced="tb91" purpose="development">
-<unit mrp="os\mm\mmapitest\devvideohaitest\group\devvideohaitest.mrp"/>
-</component>
-<component name="devsoundhaitest" long-name="DevSound HAI Tests" introduced="tb91" purpose="development">
-<unit mrp="os\mm\mmapitest\devsoundhaitest\group\devsoundhaitest.mrp"/>
-</component>
-<component name="devsoundexthaitest" long-name="DevSound Extensions HAI Tests" introduced="tb91" purpose="development">
-<unit mrp="os\mm\mmapitest\devsoundexthaitest\group\devsoundexthaitest.mrp"/>
-</component>
-</collection>
-</block>
-<block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-<collection name="graphicsaccelaration" long-name="Graphics Accelaration" level="adaptation">
-<component name="vgi" long-name="VGI" origin-model="foundation">
- <unit bldFile="/sf/os/graphics/graphicsaccelaration/vgi/group"/>
-</component>
-</collection>
-<collection name="m3g_core_api" long-name="M3G_core_api">
-<component name="m3g_core_api" long-name="M3G Core API" origin-model="foundation">
- <unit bldFile="sf/os/graphics/graphics_plat/m3g_core_api/group"/>
-</component>
-</collection>
-<collection name="m3g" long-name="M3G" level="internal-adaptations">
-<component name="m3gcore11" long-name="M3G Core 11" origin-model="foundation">
- <unit bldFile="/sf/os/graphics/m3g/m3gcore11/group"/>
-</component>
-</collection>
-<collection name="openWF" long-name="OpenWF" > <!-- for NGA graphics drop -->
-<component name="openwfcinterface" long-name="openwfcinterface">
- <unit bldFile="/sf/os/graphics/graphicscomposition/openwfcinterface/group" /> <!-- OpenWF header files -->
-</component>
-<component name="openwfcompositionengine" long-name="openwfcompositionengine">
- <unit bldFile="/sf/os/graphics/graphicscomposition/openwfcompositionengine/group" /> <!-- OpenWF composition engine implementation -->
-</component>
-<component name="openwfsupport" long-name="openwfsupport">
- <unit bldFile="/sf/os/graphics/graphicscomposition/openwfsupport/group" /> <!-- OpenWF Adaptation features specific to the Symbian architecture -->
-</component>
-<component name="surfaceupdate" long-name="surfaceupdate">
- <unit bldFile="/sf/os/graphics/graphicscomposition/surfaceupdate/group" /> <!-- Surface content changes server -->
-</component>
-</collection>
-<collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines">
-<component name="graphicsresource" long-name="Graphics Resource" introduced="tb92" purpose="optional">
-<unit bldFile="os\graphics\graphicsresourceservices\graphicsresource\group" mrp="os\graphics\graphicsresourceservices\graphicsresource\group\graphics_graphicsresource.mrp"/>
-</component>
-<component name="graphicsresourceadaptation" long-name="Graphics Resource Adaptation" introduced="tb92" purpose="optional">
-<unit bldFile="os\graphics\graphicsresourceservices\graphicsresourceadaptation\group" mrp="os\graphics\graphicsresourceservices\graphicsresourceadaptation\group\graphics_graphicsresourceadapter.mrp"/>
-</component>
-</collection>
-<collection name="graphicsutils" long-name="Graphics Utils" level="engines">
-<component name="commongraphicsheaders" long-name="Common Graphics Headers" introduced="tb92" purpose="mandatory">
-<unit bldFile="os\graphics\graphicsutils\commongraphicsheaders\group" mrp="os\graphics\graphicsutils\commongraphicsheaders\group\graphics_commonheader.mrp"/>
-</component>
-</collection>
-<collection name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
-<component name="surfacemgr" long-name="Surface Manager" introduced="tb92" purpose="optional">
-<unit bldFile="os\graphics\graphicshwdrivers\surfacemgr\group" mrp="os\graphics\graphicshwdrivers\surfacemgr\group\graphics_surfacemanager.mrp"/>
-</component>
-</collection>
-<collection name="graphicstest" long-name="Graphics Test" level="app-if">
-<component name="graphicstestharness" long-name="Graphics Test Harness" introduced="8.1" purpose="development">
-<unit mrp="os\graphics\graphicstest\graphicstestharness\group\graphics_testharness.mrp"/>
-</component>
-<component name="uibench" long-name="UI Bench" introduced="9.2" purpose="development">
-<unit bldFile="os\graphics\graphicstest\uibench\group" mrp="os\graphics\graphicstest\uibench\group\graphics_ui_bench.mrp"/>
-</component>
-</collection>
-<collection name="graphics_info" long-name="Graphics Info" level="app-if">
-<component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc">
-<unit mrp="os\graphics\graphics_info\graphicsdocs\graphics_documentation.mrp"/>
-</component>
-<component name="graphics_metadata" long-name="Graphics Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os\graphics\graphics_info\graphics_metadata\graphics_metadata.mrp"/>
-</component>
-</collection>
-<collection name="windowing" long-name="Windowing" level="app-if">
-<component name="n:windowserver" long-name="Window Server" purpose="mandatory">
-<!-- intentionally not for the foundation despite being a mandatory component -->
-<unit bldFile="os\graphics\windowing\windowserver\group" mrp="os\graphics\windowing\windowserver\group\graphics_wserv.mrp"/>
-</component>
- <component name="windowserverplugins" long-name="Window Server Plugins" purpose="mandatory" plugin="Y" origin-model="Symbian">
- <unit bldFile="/sf/os/graphics/windowing/windowserverplugins/group" /> <!--Added for NGA - Plugins for the windowserver -->
- </component>
-</collection>
-<collection name="printingservices" long-name="Printing Services" level="app-if">
-<component name="printerdriversupport" long-name="Printer Driver Support" purpose="optional">
-<unit bldFile="os\graphics\printingservices\printerdriversupport\group" mrp="os\graphics\printingservices\printerdriversupport\group\graphics_pdrstore.mrp"/>
-</component>
-<component name="printerdrivers" long-name="Printer Drivers" purpose="optional" plugin="Y">
-<unit bldFile="os\graphics\printingservices\printerdrivers\group" mrp="os\graphics\printingservices\printerdrivers\group\graphics_printdrv.mrp"/>
-</component>
-</collection>
-<collection name="fbs" long-name="Font and Bitmap Server" level="device-interface">
-<component name="fontandbitmapserver" long-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 name="opengles" long-name="OpenGLES" level="internal-adaptations">
-<component name="openglesinterface" long-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"/>
-<unit bldFile="os\graphics\opengles\openglesinterface\group\opengles_stub" /> <!-- MattD 20091124 - stub implementation that we need to rename this afterwards -->
-</component>
-</collection>
-<collection name="openvg" long-name="OpenVG" level="internal-adaptations">
-<component name="openvginterface" long-name="OpenVG Interface" introduced="tb91" purpose="optional">
-<unit bldFile="os\graphics\openvg\openvginterface\group" mrp="os\graphics\openvg\openvginterface\group\graphics_openvgheaders.mrp"/>
-</component>
-<component name="openvg11" long-name="OpenVG11" level="internal-adaptations">
- <unit bldFile="/sf/os/graphics/openvg/openvginterface/group/openvg11"/> <!-- possibly should not be building this every time? -->
-</component>
-</collection>
-<collection name="egl" long-name="EGL" level="internal-adaptations">
-<component name="eglinterface" long-name="EGL Interface" introduced="tb91" purpose="optional">
-<unit bldFile="os\graphics\egl\eglinterface\group" mrp="os\graphics\egl\eglinterface\group\graphics_eglheaders.mrp"/>
-</component>
-<component name="n:eglimplementation" long-name="EGL Implementation" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
- <unit bldFile="/sf/os/graphics/egl/eglrefimpl/group/" /> <!-- for NGA graphics drop -->
-</component>
-<component name="n:eglswitch" long-name="EGL Emulator Switch">
- <unit bldFile="/sf/os/graphics/egl/eglswitch/group/" /> <!-- for NGA graphics drop -->
-</component>
-</collection>
-<collection name="KhronosReferenceImplementation" long-name="Khronos Reference Implementation" level="device-interface" >
-<component name="sfopenvg" long-name="sfopenvg" purpose="optional" origin-model="foundation">
-<!-- MattD - Moved KhronosRI into S60 model, as it depends on stdlib which isn't here in the GT part of the build -->
-<!--<unit bldFile="os/graphics/openvg/openvgrefimplementation/sfopenvg/group" /> -->
-</component>
-</collection>
-<collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
-<component name="gdi" long-name="GDI" purpose="mandatory">
-<unit bldFile="os\graphics\graphicsdeviceinterface\gdi\group" mrp="os\graphics\graphicsdeviceinterface\gdi\group\graphics_gdi.mrp"/>
-</component>
-<component name="bitgdi" long-name="BitGDI" purpose="mandatory">
-<unit bldFile="os\graphics\graphicsdeviceinterface\bitgdi\group" mrp="os\graphics\graphicsdeviceinterface\bitgdi\group\graphics_bitgdi.mrp"/>
-</component>
-<component name="colourpalette" long-name="Colour Palette" introduced="7.0s" purpose="optional">
-<unit bldFile="os\graphics\graphicsdeviceinterface\colourpalette\group" mrp="os\graphics\graphicsdeviceinterface\colourpalette\group\graphics_palette.mrp"/>
-</component>
-<component name="screendriver" long-name="Screen Driver" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os\graphics\graphicsdeviceinterface\screendriver\group" mrp="os\graphics\graphicsdeviceinterface\screendriver\group\graphics_screendriver.mrp"/>
-</component>
-<component name="directgdi" long-name="DirectGDI" introduced="tb92" purpose="optional">
-<unit bldFile="os\graphics\graphicsdeviceinterface\directgdi\group" mrp="os\graphics\graphicsdeviceinterface\directgdi\group\graphics_directgdi.mrp"/>
-</component>
-<component name="directgdiinterface" long-name="DirectGDI Interface" introduced="tb92" purpose="optional">
-<unit bldFile="os\graphics\graphicsdeviceinterface\directgdiinterface\group" mrp="os\graphics\graphicsdeviceinterface\directgdiinterface\group\graphics_directgdiheaders.mrp"/>
-</component>
-<component name="directgdiadaptation" long-name="DirectGDI Adaptation" introduced="tb92" purpose="optional">
-<unit bldFile="os\graphics\graphicsdeviceinterface\directgdiadaptation\group" mrp="os\graphics\graphicsdeviceinterface\directgdiadaptation\group\graphics_directgdiadapter.mrp"/>
-</component>
-</collection>
-<collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
-<component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC">
-<unit bldFile="os\graphics\graphicstools\gdi_tools\group" mrp="os\graphics\graphicstools\gdi_tools\group\graphics_gditools.mrp"/>
-</component>
-</collection>
-<collection name="graphicsapitest" long-name="Graphics API Tests" level="app-if">
-<component name="graphicssvs" long-name="Graphics Verification Suite" introduced="tb91" purpose="development">
-<unit mrp="os\graphics\graphicsapitest\graphicssvs\group\graphicssvs.mrp"/>
-</component>
-<component name="screendriverhaitest" long-name="Screen Driver HAI Tests" introduced="tb91" purpose="development">
-<unit mrp="os\graphics\graphicsapitest\screendriverhaitest\group\screendriverhaitest.mrp"/>
-</component>
-</collection>
-</block>
-<block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
-<collection name="charconvfw" long-name="Character Conversion" level="encoding">
-<component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional">
-<unit bldFile="os\textandloc\charconvfw\charconv_fw\group" mrp="os\textandloc\charconvfw\charconv_fw\group\syslibs_charconv.mrp"/>
-</component>
-<component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" plugin="Y">
-<unit bldFile="os\textandloc\charconvfw\charconvplugins\group" mrp="os\textandloc\charconvfw\charconvplugins\group\syslibs_charconv_plugins.mrp"/>
-</component>
-<component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y">
-<unit bldFile="os\textandloc\charconvfw\fatfilenameconversionplugins\group" mrp="textandloc/charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
-</component>
-</collection>
-<collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
-<component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os\textandloc\fontservices\textshaperplugin\group" mrp="os\textandloc\fontservices\textshaperplugin\group\graphics_iculayoutengine.mrp"/>
-</component>
-<component name="fontstore" long-name="Font Store" purpose="mandatory">
-<unit bldFile="os\textandloc\fontservices\fontstore\group" mrp="os\textandloc\fontservices\fontstore\group\graphics_fntstore.mrp"/>
-</component>
-<component name="textrendering" long-name="Text Rendering" purpose="mandatory" class="placeholder">
-<!-- placeholder for text code from GDI -->
-</component>
-<component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y">
-<unit bldFile="os\textandloc\fontservices\freetypefontrasteriser\group" mrp="os\textandloc\fontservices\freetypefontrasteriser\group\graphics_freetype.mrp"/>
-</component>
-<component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional">
-<unit bldFile="os\textandloc\fontservices\referencefonts\group" mrp="os\textandloc\fontservices\referencefonts\group\graphics_fonts.mrp"/>
-</component>
-</collection>
-<collection name="textlayout" long-name="Text Layout" level="text">
-<component name="texthandling" long-name="Text Handling" purpose="optional">
-<unit bldFile="os\textandloc\textrendering\texthandling\group" mrp="os\textandloc\textrendering\texthandling\group\app-framework_etext.mrp"/>
-</component>
-<component name="textformatting" long-name="Text Formatting" purpose="optional">
-<unit bldFile="os\textandloc\textrendering\textformatting\group" mrp="os\textandloc\textrendering\textformatting\group\app-framework_form.mrp"/>
-</component>
-<component name="word" long-name="Word" purpose="development">
-<unit mrp="os\textandloc\textrendering\word\group\app-framework_word.mrp"/>
-</component>
-</collection>
-<collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
-<component name="nearestlangutil" long-name="Nearest Language Util" introduced="tb91" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-<component name="numberformatting" long-name="Number Formatting" introduced="7.0s" purpose="optional">
-<unit bldFile="os\textandloc\textrendering\numberformatting\group" mrp="os\textandloc\textrendering\numberformatting\group\app-framework_numberconversion.mrp"/>
-</component>
-</collection>
-<collection name="localesupport" long-name="Locale Support" level="util">
-<component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y">
-<unit bldFile="os\textandloc\localisation\localesupport" mrp="textandloc/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
-</component>
-<component name="initlocale" long-name="Initialise Locale" introduced="tb91" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-</collection>
-<collection name="textandloctools" long-name="Text and Localisation Tools" level="tools">
-<component name="fontcompiler" long-name="Font Compiler" purpose="development" class="placeholder PC">
-<!-- placeholder for split from GDI Tools -->
-</component>
-<component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC">
-<unit bldFile="os\graphics\graphicstools\bitmapfonttools\group" mrp="os\graphics\graphicstools\bitmapfonttools\group\graphics_gdtran.mrp"/>
-</component>
-</collection>
-<collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
-<component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os\textandloc\textandloc_info\textandloc_metadata\textandloc_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
-<collection name="xml" long-name="XML" level="generic">
-<component name="xmlfw" long-name="XML Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os\xmlsrv\xml\xmlfw\group" mrp="os\xmlsrv\xml\xmlfw\group\syslibs_xml.mrp"/>
-</component>
-<component name="libxml2libs" long-name="Libxml2 Libraries" introduced="tb92" purpose="optional">
-<unit bldFile="os\xmlsrv\xml\libxml2libs\group" mrp="os\xmlsrv\xml\libxml2libs\group\syslibs_libxml2.mrp"/>
-</component>
-<component name="legacyminidomparser" introduced="7.0s" purpose="optional" plugin="N">
-<unit bldFile="os\xmlsrv\xml\legacyminidomparser\GROUP" mrp="xmlsrv/xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp"/>
-</component>
-<component name="xmldomandxpath" long-name="XML DOM and XPath" introduced="tb92" purpose="optional">
-<unit bldFile="os\xmlsrv\xml\xmldomandxpath\group" mrp="os\xmlsrv\xml\xmldomandxpath\group\syslibs_xmldom.mrp"/>
-</component>
-<component name="xmlexpatparser" long-name="XML Expat Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os\xmlsrv\xml\xmlexpatparser\group" mrp="os\xmlsrv\xml\xmlexpatparser\group\syslibs_xmlparser.mrp"/>
-</component>
-<component name="xmllibxml2parser" long-name="XML Libxml2 Parser" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="os\xmlsrv\xml\xmllibxml2parser\group" mrp="os\xmlsrv\xml\xmllibxml2parser\group\syslibs_xmlparser2.mrp"/>
-</component>
-<component name="wbxmlparser" long-name="WBXML Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os\xmlsrv\xml\wbxmlparser\group" mrp="os\xmlsrv\xml\wbxmlparser\group\syslibs_wbxmlparser.mrp"/>
-</component>
-</collection>
-<collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
-<component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os\xmlsrv\xmlsrv_info\xmlsrv_metadata\xmlsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="deviceplatformrelease" level="services" long-name="Device Platform Release" levels="bld mid top">
-<collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
-<component name="cedarutils" long-name="Cedar Utils" purpose="development">
-<unit mrp="os\deviceplatformrelease\symbianosbld\cedarutils\tools_utils_cedar.mrp"/>
-</component>
-<component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt" purpose="development" class="config">
-<unit mrp="os\deviceplatformrelease\symbianosbld\productionbldcbrconfig\product_cbr_config.mrp"/>
-</component>
-</collection>
-<collection name="foundation_system" long-name="Foundation System" level="top">
-<component name="system_model" long-name="System Model" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os\deviceplatformrelease\foundation_system\system_model\system_model.mrp"/>
-</component>
-</collection>
-<collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
-<component name="deviceplatformrelease_metadata" long-name="Device Platform Release Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os\deviceplatformrelease\deviceplatformrelease_info\deviceplatformrelease_metadata\deviceplatformrelease_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="osrndtools" level="services" long-name="OS R&D tools" levels="fw trace">
-<collection name="testexecfw1" long-name="Test Execution Framework v1" level="fw">
-<component name="cinidata" long-name="CINI Data" purpose="development">
-<unit bldFile="os\osrndtools\testexecfw1\cinidata" mrp="os\osrndtools\testexecfw1\cinidata\tools_cinidata.mrp"/>
-</component>
-<component name="testexecute" long-name="Test Execute" deprecated="tb91" purpose="development">
-<unit bldFile="os\osrndtools\testexecfw1\testexecute\Group" mrp="os\osrndtools\testexecfw1\testexecute\Group\tools_testexecute.mrp"/>
-</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="tb91" 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">
-<block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
-<collection name="filehandling" long-name="File Handling" level="server">
-<component name="fileconverterfw" long-name="File Converter Framework" purpose="optional">
-<unit bldFile="mw\appsupport\filehandling\fileconverterfw\group" mrp="mw\appsupport\filehandling\fileconverterfw\group\app-framework_conarc.mrp"/>
-</component>
-<component name="htmltorichtextconverter" long-name="HTML to RichText Converter" introduced="7.0" purpose="optional" plugin="Y">
-<unit bldFile="mw\appsupport\filehandling\htmltorichtextconverter\group" mrp="mw\appsupport\filehandling\htmltorichtextconverter\group\app-services_chtmltocrtconv.mrp"/>
-</component>
-<component name="richtexttohtmlconverter" long-name="RichText to HTML Converter" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="mw\appsupport\filehandling\richtexttohtmlconverter\Group" mrp="mw\appsupport\filehandling\richtexttohtmlconverter\Group\app-services_richtexttohtmlconv.mrp"/>
-</component>
-</collection>
-<collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
-<component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="mw\appsupport\hwresourceadaptation\hwresourcemgruiplugin\group" mrp="mw\appsupport\hwresourceadaptation\hwresourcemgruiplugin\group\telephony_hwrmuiplugin.mrp"/>
-</component>
-</collection>
-<collection name="commonappservices" long-name="Common Application Services" level="framework">
-<component name="alarmserver" long-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"/>
-</component>
-<component name="alarmservertest" long-name="Alarm Server Test" deprecated="tb92" introduced="8.1" purpose="development">
-<unit bldFile="mw\appsupport\commonappservices\alarmservertest\TestAlarmSrv" mrp="mw\appsupport\commonappservices\alarmservertest\TestAlarmSrv\app-services_testalarmsrv.mrp"/>
-</component>
-<component name="coreappstest" long-name="Core Apps Test" introduced="8.1" purpose="development">
-<unit mrp="mw\appsupport\commonappservices\coreappstest\Group\app-services_CoreAppsTest.mrp"/>
-</component>
-<component name="appservicesdocs" long-name="Application Services Documentation" purpose="development" class="doc">
-<unit mrp="mw\appsupport\commonappservices\appservicesdocs\app-services_documentation.mrp"/>
-</component>
-<component name="backuprestorenotification" long-name="Backup Restore Notification" introduced="8.1" purpose="optional">
-<unit bldFile="mw\appsupport\commonappservices\backuprestorenotification\group" mrp="mw\appsupport\commonappservices\backuprestorenotification\group\app-services_BackupRestoreNotification.mrp"/>
-</component>
-</collection>
-<collection name="tzservices" long-name="Time Zone Services" level="plugin">
-<component name="tzserver" long-name="Time Zone Server" introduced="9.1" purpose="optional">
-<unit bldFile="mw\appsupport\tzservices\tzserver\group" mrp="mw\appsupport\tzservices\tzserver\group\app-services_tz.mrp"/>
-</component>
-<component name="tzloc" long-name="Time Zone Localization" introduced="9.1" purpose="optional">
-<unit bldFile="mw\appsupport\tzservices\tzloc\group" mrp="mw\appsupport\tzservices\tzloc\group\app-services_timezonelocalization.mrp"/>
-</component>
-<component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw\appsupport\tzservices\tzlocrscfactory\group" mrp="mw\appsupport\tzservices\tzlocrscfactory\group\app-services_tzlocalizationrscfactory.mrp"/>
-</component>
-<!-- MattD: 20091124 - Dropping out the GT timezone DB to hopefully stop the ADTupdater crash. Note that Symbian2 does this by changing the bld.inf -->
-<!--
-<component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw\appsupport\tzservices\tzdatabase\group" mrp="mw\appsupport\tzservices\tzdatabase\group\app-services_tzdb.mrp"/>
-</component>
--->
-</collection>
-<collection name="contenthandling" long-name="Content Handling" level="plugin">
-<component name="webrecognisers" long-name="Web Recognisers" purpose="optional" plugin="Y">
-<unit bldFile="mw\appsupport\contenthandling\webrecognisers\group" mrp="mw\appsupport\contenthandling\webrecognisers\group\application-protocols_recognisers.mrp"/>
-</component>
-</collection>
-<collection name="openenvutils" long-name="Open Environment Utilities" level="specific">
-<component name="commandshell" long-name="Command Shell" introduced="tb92" purpose="development">
-<unit bldFile="mw\appsupport\openenvutils\commandshell\group" mrp="mw\appsupport\openenvutils\commandshell\group\oetools_zsh.mrp"/>
-</component>
-<component name="telnetserver" long-name="Telnet Server" introduced="tb92" purpose="development">
-<unit bldFile="mw\appsupport\openenvutils\telnetserver\group" mrp="mw\appsupport\openenvutils\telnetserver\group\oetools_telnetd.mrp"/>
-</component>
-</collection>
-<collection name="printingsupport" long-name="Printing Support" level="generic">
-<component name="printinguisupport" long-name="Printing UI Support" purpose="optional">
-<unit bldFile="mw\appsupport\printingsupport\printinguisupport\group" mrp="mw\appsupport\printingsupport\printinguisupport\group\app-framework_print.mrp"/>
-</component>
-</collection>
-<collection name="appfw" long-name="Application Framework" level="framework">
-<component name="apparchitecture" long-name="Application Architecture" purpose="mandatory">
-<unit bldFile="mw\appsupport\appfw\apparchitecture\group" mrp="mw\appsupport\appfw\apparchitecture\group\app-framework_apparc.mrp"/>
-</component>
-<component name="viewserver" long-name="View Server" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw\appsupport\appfw\viewserver\group" mrp="mw\appsupport\appfw\viewserver\group\app-framework_viewsrv.mrp"/>
-</component>
-<component name="uiftestfw" long-name="UIF Test Framework" introduced="9.2" purpose="development">
-<unit mrp="mw\appsupport\appfw\uiftestfw\group\app-framework_testframework.mrp"/>
-</component>
-</collection>
-<collection name="applaunchservices" long-name="Application Launch Services" level="generic">
-<component name="aftermarketappstarter" long-name="After Market Application Starter" introduced="tb92" purpose="optional">
-<unit bldFile="mw\appsupport\applaunchservices\aftermarketappstarter\group" mrp="mw\appsupport\applaunchservices\aftermarketappstarter\group\app-framework_amastart.mrp"/>
-</component>
-<component name="applaunchplugins" long-name="Application Launch Plugins" introduced="tb92" purpose="optional">
-<unit bldFile="mw\appsupport\applaunchservices\applaunchplugins\group" mrp="mw\appsupport\applaunchservices\applaunchplugins\group\app-framework_aplp.mrp"/>
-</component>
-</collection>
-<collection name="tzpcside" long-name="Time Zone PC Side" level="plugin">
-<component name="tzcompiler" long-name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config PC">
-<unit bldFile="mw\appsupport\tzpcside\tzcompiler\group" mrp="mw\appsupport\tzpcside\tzcompiler\group\app-services_tzcompiler.mrp"/>
-</component>
-</collection>
-<collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
-<component name="appsupport_metadata" long-name="Generic Application Support Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="mw\appsupport\appsupport_info\appsupport_metadata\appsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="securitysrv" level="generic" long-name="Security Services" levels="plugin framework server generic specific">
-<collection name="pkiutilities" long-name="PKI Utilities" level="plugin">
-<component name="ocsp" long-name="Online Certificate Status Protocol" introduced="tb91" purpose="optional">
-<unit bldFile="mw\securitysrv\pkiutilities\ocsp\group" mrp="mw\securitysrv\pkiutilities\ocsp\group\securitysrv_ocsp.mrp"/>
-</component>
-</collection>
-<collection name="securitysrv_info" long-name="Security Services Info" level="specific">
-<component name="securitysrv_metadata" long-name="Security Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="mw\securitysrv\securitysrv_info\securitysrv_metadata\securitysrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="netprotocols" level="generic" long-name="High-level Internet Protocols" levels="plugin framework server generic specific">
-<collection name="applayerprotocols" long-name="Application Layer Protocols" level="server">
-<component name="httptransportfw" long-name="HTTP Transport Framework" introduced="6.2" purpose="optional">
-<unit bldFile="mw\netprotocols\applayerprotocols\httptransportfw\group" mrp="mw\netprotocols\applayerprotocols\httptransportfw\group\http_transport-framework.mrp"/>
-</component>
-<component name="httpexamples" long-name="HTTP Examples" introduced="6.2" purpose="development">
-<unit bldFile="mw\netprotocols\applayerprotocols\httpexamples\group" mrp="mw\netprotocols\applayerprotocols\httpexamples\group\http_examples.mrp"/>
-</component>
-<component name="wappushsupport" long-name="WAP Push Support" introduced="6.2" purpose="optional">
-<unit bldFile="mw\netprotocols\applayerprotocols\wappushsupport\Group" mrp="mw\netprotocols\applayerprotocols\wappushsupport\Group\wap-browser_wappushsupport.mrp"/>
-</component>
-<component name="wapbase" long-name="WAP Base" introduced="6.0" purpose="optional">
-<unit bldFile="mw\netprotocols\applayerprotocols\wapbase\Group" mrp="mw\netprotocols\applayerprotocols\wapbase\Group\wap-browser_wapbase.mrp"/>
-</component>
-<component name="ftpengine" long-name="FTP Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw\netprotocols\applayerprotocols\ftpengine\group" mrp="mw\netprotocols\applayerprotocols\ftpengine\group\networking_ftp_e.mrp"/>
-</component>
-<component name="telnetengine" long-name="Telnet Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw\netprotocols\applayerprotocols\telnetengine\group" mrp="mw\netprotocols\applayerprotocols\telnetengine\group\networking_telnet_e.mrp"/>
-</component>
-<component name="httpserviceapi" long-name="HTTP Service API" introduced="TB9.2" purpose="optional" plugin="N">
-<unit bldFile="mw\netprotocols\applayerprotocols\httpservice\group" mrp="netprotocols/applayerprotocols/httpservice/group/http_service.mrp"/>
-</component>
-</collection>
-<collection name="applayerpluginsandutils" long-name="Application Layer Plugins and Utils" level="framework">
-<component name="uripermissionservices" long-name="URI Permission Services" introduced="tb91" purpose="optional">
-<unit bldFile="mw\netprotocols\applayerpluginsandutils\uripermissionservices\group" mrp="mw\netprotocols\applayerpluginsandutils\uripermissionservices\group\application-protocols_ineturilist.mrp"/>
-</component>
-<component name="bookmarksupport" long-name="Bookmark Support" introduced="9.1" purpose="optional">
-<unit bldFile="mw\netprotocols\applayerpluginsandutils\bookmarksupport\group" mrp="mw\netprotocols\applayerpluginsandutils\bookmarksupport\group\application-protocols_bookmarks.mrp"/>
-</component>
-<component name="httpprotocolplugins" long-name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw\netprotocols\applayerpluginsandutils\httpprotocolplugins\group" mrp="mw\netprotocols\applayerpluginsandutils\httpprotocolplugins\group\http_protocol-plugin.mrp"/>
-</component>
-<component name="httptransportplugins" long-name="HTTP Transport Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw\netprotocols\applayerpluginsandutils\httptransportplugins\group" mrp="mw\netprotocols\applayerpluginsandutils\httptransportplugins\group\http_transport-plugin.mrp"/>
-</component>
-</collection>
-<collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
-<component name="netprotocols_metadata" long-name="High-level Internet Protocols Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="mw\netprotocols\netprotocols_info\netprotocols_metadata\netprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ipappprotocols" level="generic" long-name="IP App Protocols" levels="plugin conn server if">
-<collection name="realtimenetprots" long-name="Real-time Internet Protocols" level="server">
-<component name="symrtp" long-name="RTP" introduced="9.0" purpose="optional">
-<!-- Real Time Data Protocol -->
-<unit bldFile="mw\ipappprotocols\realtimenetprots\rtp\group" mrp="mw\ipappprotocols\realtimenetprots\rtp\group\mm-protocols_rtp.mrp"/>
-</component>
-<component name="sipfw" long-name="SIP Framework" introduced="9.2" purpose="optional">
-<unit bldFile="mw\ipappprotocols\realtimenetprots\sipfw\Group" mrp="mw\ipappprotocols\realtimenetprots\sipfw\Group\mm-protocols_SIP2_Com.mrp" version="2"/>
-</component>
-</collection>
-<collection name="sipproviderplugins" long-name="SIP Provider Plugins" level="conn">
-<component name="sipprovider" long-name="SIP Provider" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="mw\ipappprotocols\sipproviderplugins\sipprovider\group" mrp="mw\ipappprotocols\sipproviderplugins\sipprovider\group\mm-protocols_SipProvider.mrp"/>
-</component>
-</collection>
-<collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="if">
-<component name="ipappprotocols_metadata" long-name="IP App Protocols Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="mw\ipappprotocols\ipappprotocols_info\ipappprotocols_metadata\ipappprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="conntools" level="generic" long-name="Connectivity Tools"/>
-<block name="ipappsrv" level="specific" long-name="IP App Services" levels="framework generic server conn plugin">
-<collection name="multimediacommscontroller" long-name="Multimedia Comms Controller" level="conn">
-</collection>
-<collection name="ipappsrv_info" long-name="IP App Services Info" level="plugin">
-<component name="ipappsrv_metadata" long-name="IP App Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="mw\ipappsrv\ipappsrv_info\ipappsrv_metadata\ipappsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="messagingmw" level="specific" long-name="Messaging Middleware" levels="stack fw api">
-<collection name="messagingfw" long-name="Messaging Framework" level="fw">
-<component name="scheduledsendmtm" long-name="Scheduled Send MTM" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="mw\messagingmw\messagingfw\scheduledsendmtm\group" mrp="mw\messagingmw\messagingfw\scheduledsendmtm\group\messaging_schedulesend.mrp"/>
-</component>
-<component name="msgsrvnstore" long-name="Message Server and Store" purpose="optional">
-<unit bldFile="mw\messagingmw\messagingfw\msgsrvnstore\group" mrp="mw\messagingmw\messagingfw\msgsrvnstore\group\messaging_framework.mrp"/>
-</component>
-<component name="biomsgfw" long-name="BIO Messaging Framework" introduced="6.0" purpose="optional">
-<unit bldFile="mw\messagingmw\messagingfw\biomsgfw\group" mrp="mw\messagingmw\messagingfw\biomsgfw\group\messaging_biomsg.mrp"/>
-</component>
-<component name="msgconf" long-name="Messaging Config" introduced="tb91" purpose="optional" class="config">
-<unit bldFile="mw\messagingmw\messagingfw\msgconf\group" mrp="mw\messagingmw\messagingfw\msgconf\group\messaging_config.mrp"/>
-</component>
-<component name="watcherfw" long-name="Watcher Framework" purpose="optional">
-<unit bldFile="mw\messagingmw\messagingfw\watcherfw\group" mrp="mw\messagingmw\messagingfw\watcherfw\group\messaging_watcher.mrp"/>
-</component>
-<component name="msgtest" long-name="Messaging Test" purpose="development">
-<unit bldFile="mw\messagingmw\messagingfw\msgtest\group" mrp="mw\messagingmw\messagingfw\msgtest\group\messaging_test.mrp"/>
-</component>
-<component name="msgtests" long-name="Messaging Tests" purpose="development">
-<unit mrp="mw\messagingmw\messagingfw\msgtests\group\messaging.mrp"/>
-</component>
-<component name="msgtestfw" long-name="Messaging Test Framework" deprecated="tb92" purpose="development">
-<unit mrp="mw\messagingmw\messagingfw\msgtestfw\group\messaging_testframework.mrp"/>
-</component>
-<component name="msgtestproduct" long-name="Messaging Test Product" purpose="development">
-<unit mrp="mw\messagingmw\messagingfw\msgtestproduct\group\messaging_testproduct.mrp"/>
-</component>
-<component name="sendas" long-name="Send As" purpose="optional">
-<unit bldFile="mw\messagingmw\messagingfw\sendas\group" mrp="mw\messagingmw\messagingfw\sendas\group\messaging_sendas2.mrp"/>
-</component>
-<component name="msgurlhandler" long-name="Message URL Handler" introduced="7.0" purpose="optional">
-<unit bldFile="mw\messagingmw\messagingfw\msgurlhandler\group" mrp="mw\messagingmw\messagingfw\msgurlhandler\group\messaging_urlhandler.mrp"/>
-</component>
-<component name="wappushfw" long-name="WAP Push Framework" introduced="6.1" purpose="optional">
-<unit bldFile="mw\messagingmw\messagingfw\wappushfw\group" mrp="mw\messagingmw\messagingfw\wappushfw\group\wap-browser_wappush.mrp"/>
-</component>
-<component name="suplsmshandler" long-name="SUPL SMS Handler" introduced="tb91" purpose="development" plugin="Y">
-<unit bldFile="mw\messagingmw\messagingfw\suplsmshandler\group" mrp="mw\messagingmw\messagingfw\suplsmshandler\group\lbs_suplsmstrigger.mrp"/>
-</component>
-<component name="suplwappushhandler" long-name="SUPL WAP Push Handler" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="mw\messagingmw\messagingfw\suplwappushhandler\group" mrp="mw\messagingmw\messagingfw\suplwappushhandler\group\lbs_suplwappush.mrp"/>
-</component>
-</collection>
-<collection name="messagingmw_info" long-name="Messaging Middleware Info" level="api">
-<component name="messagingmw_metadata" long-name="Messaging Middleware Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="mw\messagingmw\messagingmw_info\messagingmw_metadata\messagingmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="remoteconn" level="generic" long-name="Remote Connectivity" levels="plugin framework server generic specific">
-<collection name="remoteconn_info" long-name="Remote Connectivity Info" level="specific">
-<component name="remoteconn_metadata" long-name="Remote Connectivity Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="mw\remoteconn\remoteconn_info\remoteconn_metadata\remoteconn_metadata.mrp"/>
-</component>
-</collection>
-<collection name="usbfunctiondrivers" long-name="USB Function Drivers" level="server">
-</collection>
-<collection name="connectivitytransports" long-name="Connectivity Transports" level="plugin">
-<component name="plpremotelink" long-name="PLP Remote Link" deprecated="9.0" purpose="optional">
-<unit bldFile="mw\remoteconn\connectivitytransports\plpremotelink\group" mrp="mw\remoteconn\connectivitytransports\plpremotelink\group\connectivity_legacy_plp_plpremotelink.mrp"/>
-</component>
-<component name="plpvariant" long-name="PLP Variant" deprecated="9.0" purpose="optional">
-<unit bldFile="mw\remoteconn\connectivitytransports\plpvariant\group" mrp="mw\remoteconn\connectivitytransports\plpvariant\group\connectivity_legacy_plp_plpvariant.mrp"/>
-</component>
-</collection>
-<collection name="mtptransports" long-name="MTP Transports" level="plugin">
-<component name="mtpusbtransport" long-name="MTP USB Transport" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="mw\remoteconn\mtptransports\mtpusbtransport\group" mrp="mw\remoteconn\mtptransports\mtpusbtransport\group\mtp_usbsic.mrp"/>
-</component>
-<component name="mtpptpiptransport" long-name="MTP PTP-IP Transport" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="mw\remoteconn\mtptransports\mtpptpiptransport\group" mrp="mw\remoteconn\mtptransports\mtpptpiptransport\group\mtp_ptpip.mrp"/>
-</component>
-<component name="mtpcontroller" long-name="MTP Controller" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw\remoteconn\mtptransports\mtpcontroller\group" mrp="remoteconn/mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
-</component>
-</collection>
-<collection name="mtpfws" long-name="MTP Frameworks" level="framework">
-<component name="mtpfw" long-name="MTP Framework" introduced="tb91" purpose="optional">
-<unit bldFile="mw\remoteconn\mtpfws\mtpfw\group" mrp="mw\remoteconn\mtpfws\mtpfw\group\mtp_framework.mrp"/>
-</component>
-</collection>
-<collection name="mtpdataproviders" long-name="MTP Data Providers" level="generic">
-<component name="mtpfileandfolderdp" long-name="MTP File and Folder Provider" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="mw\remoteconn\mtpdataproviders\mtpfileandfolderdp\group" mrp="mw\remoteconn\mtpdataproviders\mtpfileandfolderdp\group\mtp_filedp.mrp"/>
-</component>
-</collection>
-<collection name="backupandrestore" long-name="Backup and Restore" level="specific">
-<component name="backupengine" long-name="Backup Engine" introduced="9.0" purpose="optional">
-<unit bldFile="mw\remoteconn\backupandrestore\backupengine\group" mrp="mw\remoteconn\backupandrestore\backupengine\group\connectivity_backupengine.mrp"/>
-</component>
-<component name="backuptest" long-name="Backup Test" introduced="tb91" purpose="development">
-<unit bldFile="mw\remoteconn\backupandrestore\backuptest\group" mrp="mw\remoteconn\backupandrestore\backuptest\group\connectivity_backuptest.mrp"/>
-</component>
-</collection>
-<collection name="obex" long-name="OBEX" level="generic">
-<component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1" purpose="optional">
-<unit bldFile="mw\remoteconn\obex\obexprotocol\group" mrp="mw\remoteconn\obex\obexprotocol\group\obex.mrp"/>
-</component>
-<component name="obexextensionapi" long-name="OBEX Extension API" introduced="9.2" purpose="optional">
-<unit bldFile="mw\remoteconn\obex\obexextensionapi\group" mrp="mw\remoteconn\obex\obexextensionapi\group\obex_extensionapis.mrp"/>
-</component>
-</collection>
-</block>
-<block name="srvdiscovery" level="generic" long-name="Service Discovery and Usage" levels="plugin framework server generic specific">
-<collection name="servicediscoveryandcontrol" long-name="Service Discovery and Control" level="framework">
-<component name="servicediscoveryfw" long-name="Service Discovery Framework" introduced="tb92" purpose="optional">
-<unit bldFile="mw\srvdiscovery\servicediscoveryandcontrol\pnp\group" mrp="mw\srvdiscovery\servicediscoveryandcontrol\pnp\group\servicediscoveryframework.mrp"/>
-</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="tb91" purpose="development" class="config PC">
-<unit mrp="mw\srvdiscovery\srvdiscovery_info\srvdiscovery_metadata\srvdiscovery_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="btservices" level="generic" long-name="Bluetooth Services" levels="framework server generic specific plugin">
-<collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
-<component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
-<unit bldFile="mw\btservices\bluetoothappprofiles\avrcp" mrp="mw\btservices\bluetoothappprofiles\avrcp\bluetooth_avrcp.mrp"/>
-</component>
-</collection>
-<collection name="btservices_info" long-name="BT Services Info" level="plugin">
-<component name="btservices_metadata" long-name="BT Services Metadata" introduced="tb92" purpose="development" class="config PC">
-<unit mrp="mw\btservices\btservices_info\btservices_metadata\btservices_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="mmmw" level="generic" long-name="Multimedia Middleware" levels="plugin framework server generic specific">
-<collection name="mmmiddlewarefws" long-name="Multimedia Middleware Frameworks" level="server">
-</collection>
-<collection name="mmfwtest" long-name="Multimedia Framework Test" level="server">
-<component name="mmfunittest" long-name="MMF Unit Tests" introduced="7.0s" purpose="development">
-<unit mrp="mw\mmmw\mmfwtest\mmfunittest\group\multimedia_unittest_mmf_source.mrp"/>
-</component>
-<component name="mmfintegrationtest" long-name="MMF Integration Tests" introduced="7.0s" purpose="development">
-<unit mrp="mw\mmmw\mmfwtest\mmfintegrationtest\group\multimedia_inttest_mmf_source.mrp"/>
-</component>
-</collection>
-<collection name="mmvalidationsuite" long-name="Multimedia Validation Suite" level="specific">
-<component name="mvsintegrationtest" long-name="MVS Integration Tests" introduced="tb91" purpose="development">
-<unit mrp="mw\mmmw\mmvalidationsuite\mvsintegrationtest\group\multimedia_inttest_mvs_source.mrp"/>
-</component>
-</collection>
-<collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
-<component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="mw\mmmw\mmmw_info\mmmw_metadata\mmmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework">
-<collection name="fep" long-name="FEP" level="engine">
-<component name="frontendprocessor" long-name="Front End Processor" purpose="mandatory">
-<unit bldFile="mw\inputmethods\fep\frontendprocessor\group" mrp="mw\inputmethods\fep\frontendprocessor\group\app-framework_fepbase.mrp"/>
-</component>
-</collection>
-<collection name="inputmethods_info" long-name="Input Methods Info" level="framework">
-<component name="inputmethods_metadata" long-name="Input Methods Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="mw\inputmethods\inputmethods_info\inputmethods_metadata\inputmethods_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
-<collection name="commonuisupport" long-name="Common UI Support" level="support">
-<component name="uikon" long-name="Uikon" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw\classicui\commonuisupport\uikon\group" mrp="mw\classicui\commonuisupport\uikon\group\app-framework_uikon.mrp"/>
-</component>
-<component name="errorresolverdata" long-name="Error Resolver Data" purpose="mandatory">
-<unit bldFile="mw\classicui\commonuisupport\errorresolverdata\group" mrp="mw\classicui\commonuisupport\errorresolverdata\group\app-framework_errorresgt.mrp"/>
-</component>
-<component name="uilaf" long-name="UI Look and Feel" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw\classicui\commonuisupport\uilaf\GROUP" mrp="mw\classicui\commonuisupport\uilaf\GROUP\app-framework_uiklafgt.mrp"/>
-</component>
-<component name="grid" long-name="Grid" purpose="optional">
-<unit bldFile="mw\classicui\commonuisupport\grid\group" mrp="mw\classicui\commonuisupport\grid\group\app-framework_grid.mrp"/>
-</component>
-<component name="uifwsdocs" long-name="UI Frameworks Documentation" purpose="development" class="doc">
-<unit mrp="mw\classicui\commonuisupport\uifwsdocs\app-framework_documentation.mrp"/>
-</component>
-</collection>
-<collection name="lafagnosticuifoundation" long-name="Look-and-Feel Agnostic UI Foundation" level="base">
-<component name="cone" long-name="Control Environment" purpose="mandatory">
-<unit bldFile="mw\classicui\lafagnosticuifoundation\cone\group" mrp="mw\classicui\lafagnosticuifoundation\cone\group\app-framework_cone.mrp"/>
-</component>
-<component name="graphicseffects" long-name="Graphics Effects" introduced="9.2" purpose="optional">
-<unit bldFile="mw\classicui\lafagnosticuifoundation\graphicseffects\group" mrp="mw\classicui\lafagnosticuifoundation\graphicseffects\group\app-framework_gfxtranseffect.mrp"/>
-</component>
-<component name="uigraphicsutils" long-name="UI Graphics Utilities" purpose="mandatory">
-<unit bldFile="mw\classicui\lafagnosticuifoundation\uigraphicsutils\group" mrp="mw\classicui\lafagnosticuifoundation\uigraphicsutils\group\app-framework_egul.mrp"/>
-</component>
-<component name="clockanim" long-name="Clock" purpose="optional" plugin="Y">
-<unit bldFile="mw\classicui\lafagnosticuifoundation\clockanim\group" mrp="mw\classicui\lafagnosticuifoundation\clockanim\group\app-framework_clock.mrp"/>
-</component>
-<component name="bmpanimation" long-name="BMP Animation" introduced="6.0" purpose="optional">
-<unit bldFile="mw\classicui\lafagnosticuifoundation\bmpanimation\group" mrp="mw\classicui\lafagnosticuifoundation\bmpanimation\group\app-framework_bmpanim.mrp"/>
-</component>
-<component name="animation" long-name="Animation" introduced="9.1" purpose="optional">
-<unit bldFile="mw\classicui\lafagnosticuifoundation\animation\group" mrp="mw\classicui\lafagnosticuifoundation\animation\group\app-framework_animation.mrp"/>
-</component>
-</collection>
-<collection name="classicui_info" long-name="Classic UI Info" level="specific">
-<!-- the multiple units in the API components need to be resolved -->
-<component name="classicui_metadata" long-name="Classic UI Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="mw\classicui\classicui_info\classicui_metadata\classicui_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
-<collection name="installationservices" long-name="Installation Services" level="generic">
-<component name="swi" long-name="Secure Software Install" purpose="optional">
-<unit bldFile="mw\appinstall\installationservices\swi\group" mrp="mw\appinstall\installationservices\swi\group\security_swi.mrp"/>
-</component>
-<component name="swidevicetools" long-name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
-<unit bldFile="mw\appinstall\installationservices\swidevicetools\group" mrp="mw\appinstall\installationservices\swidevicetools\group\security_switools_device.mrp"/>
-</component>
-<component name="switestfw" long-name="Software Install Test Framework" deprecated="tb92" introduced="7.0" purpose="development">
-<unit mrp="mw\appinstall\installationservices\switestfw\group\install_testframework.mrp"/>
-</component>
-<component name="swiconfig" long-name="Software Install Config" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw\appinstall\installationservices\swiconfig\group" mrp="mw\appinstall\installationservices\swiconfig\group\install_config.mrp"/>
-</component>
-</collection>
-<collection name="secureswitools" long-name="Secure Software Install Tools" level="tool">
-<component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" class="PC">
-<unit bldFile="mw\appinstall\secureswitools\makekeys\group" mrp="mw\appinstall\secureswitools\makekeys\group\security_makekeys.mrp"/>
-</component>
-<component name="swianalysistoolkit" long-name="SWI Analysis Toolkit" purpose="development" class="PC">
-<unit bldFile="mw\appinstall\secureswitools\swianalysistoolkit\group" mrp="mw\appinstall\secureswitools\swianalysistoolkit\group\security_switools.mrp"/>
-</component>
-<component name="openssllib" long-name="OpenSSL Library" purpose="optional" class="PC">
-<unit mrp="mw\appinstall\secureswitools\openssllib\security_openssl.mrp"/>
-</component>
-<component name="swisistools" long-name="Secure Software Install SIS Tools" purpose="optional" class="PC">
-<unit bldFile="mw\appinstall\secureswitools\swisistools\group" mrp="mw\appinstall\secureswitools\swisistools\group\security_sistools.mrp"/>
-</component>
-</collection>
-<collection name="appinstall_info" long-name="Application Installation Info" level="api">
-<component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="mw\appinstall\appinstall_info\appinstall_metadata\appinstall_metadata.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="location" level="apps" long-name="Location Apps"/>
-<block name="mmsharinguis" level="services" long-name="Multimedia Sharing UIs"/>
-<block name="phone" level="apps" span="2" long-name="Phone Apps"/>
-<block name="videotelephony" level="apps" long-name="Video Telephony Apps"/>
-<block name="poc" level="apps" long-name="PoC"/>
-<block name="iptelephony" level="apps" long-name="IP Telephony"/>
-<block name="settingsuis" level="services" long-name="Settings UIs"/>
-<block name="contentcontrol" level="services" long-name="Content Control Daemons"/>
-<block name="devicecontrol" level="services" long-name="Device Control Daemons"/>
-<block name="printing" level="services" long-name="Printing"/>
-<block name="files" level="apps" long-name="File Manager Apps"/>
-<block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
-<collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
-<component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
-<unit bldFile="app\contacts\phonebookengines\contactsmodel\groupsql" mrp="app\contacts\phonebookengines\contactsmodel\groupsql\app-engines_cntmodel.mrp" version="2"/>
-</component>
-</collection>
-<collection name="pimprotocols" long-name="PIM Protocols" level="services">
-<component name="phonebooksync" long-name="Phonebook Sync" purpose="optional" plugin="Y">
-<unit bldFile="app\contacts\pimprotocols\phonebooksync\group" mrp="app\contacts\pimprotocols\phonebooksync\group\telephony_phbksync.mrp"/>
-</component>
-<component name="pbap" long-name="Bluetooth PBAP" introduced="9.2" purpose="optional">
-<unit bldFile="app\contacts\pimprotocols\pbap\group" mrp="app\contacts\pimprotocols\pbap\group\bluetooth_accesshost.mrp"/>
-</component>
-</collection>
-<collection name="contacts_info" long-name="Contacts Apps Info" level="ui">
-<component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="app\contacts\contacts_info\contacts_metadata\contacts_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="organizer" level="apps" span="2" long-name="Organizer Application Suite" levels="support services engine ui app">
-<collection name="pimappservices" long-name="PIM App Services" level="services">
-<component name="calendar" long-name="Calendar" introduced="9.2" purpose="optional">
-<unit bldFile="app\organizer\pimappservices\calendar\group" mrp="app\organizer\pimappservices\calendar\group\app-engines_calendar.mrp" version="2"/>
-</component>
-<component name="calendarvcalplugin" long-name="Calendar vCal Plugin" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="app\organizer\pimappservices\calendarvcalplugin\group" mrp="app\organizer\pimappservices\calendarvcalplugin\group\app-engines_agnversit2.mrp" version="2"/>
-</component>
-<component name="appenginesdocs" long-name="Application Engines Documentation" purpose="development" class="doc">
-<unit mrp="app\organizer\pimappservices\appenginesdocs\app-engines_documentation.mrp"/>
-</component>
-</collection>
-<collection name="pimappsupport" long-name="PIM Application Support" level="support">
-<component name="vcardandvcal" long-name="vCard and vCal" introduced="ER5" purpose="optional">
-<unit bldFile="app\organizer\pimappsupport\vcardandvcal\group" mrp="app\organizer\pimappsupport\vcardandvcal\group\app-services_versit.mrp"/>
-</component>
-<component name="chinesecalendarconverter" long-name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
-<unit bldFile="app\organizer\pimappsupport\chinesecalendarconverter\group" mrp="app\organizer\pimappsupport\chinesecalendarconverter\group\app-services_calcon.mrp"/>
-</component>
-</collection>
-<collection name="organizer_info" long-name="Organizer Application Suite Info" level="app">
-<component name="organizer_metadata" long-name="Organizer Application Suite Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="app\organizer\organizer_info\organizer_metadata\organizer_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="mail eng base ui">
-<collection name="mobilemessaging" long-name="Mobile Messaging" level="ui">
-<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
-<unit bldFile="app\messaging\mobilemessaging\smsmtm\group" mrp="app\messaging\mobilemessaging\smsmtm\group\messaging_sms.mrp"/>
-</component>
-</collection>
-<collection name="mmsengine" long-name="MMS Engine" level="eng">
-<component name="mmssettings" long-name="MMS Settings" introduced="9.2" purpose="optional">
-<unit bldFile="app\messaging\mmsengine\mmssettings\group" mrp="app\messaging\mmsengine\mmssettings\group\messaging_mmssettings.mrp"/>
-</component>
-<component name="mmsconf" long-name="MMS Configuration" purpose="optional">
-<unit bldFile="app\messaging\mmsengine\mmsconf" mrp="app\messaging\mmsengine\mmsconf\messaging_mmssettings-config.mrp"/>
-</component>
-</collection>
-<collection name="messagingappbase" long-name="Messaging App Base" level="base">
-<component name="smilparser" long-name="SMIL Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="app\messaging\messagingappbase\smilparser\GROUP" mrp="app\messaging\messagingappbase\smilparser\GROUP\messaging_gmxml.mrp"/>
-</component>
-<component name="obexmtms" long-name="OBEX MTMs" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="app\messaging\messagingappbase\obexmtms\Group" mrp="app\messaging\messagingappbase\obexmtms\Group\messaging_obex.mrp"/>
-</component>
-</collection>
-<collection name="email" long-name="Email" level="mail">
-<component name="pop3andsmtpmtm" long-name="POP3 and SMTP MTM" purpose="optional" plugin="Y">
-<unit bldFile="app\messaging\email\pop3andsmtpmtm\group" mrp="app\messaging\email\pop3andsmtpmtm\group\messaging_email.mrp"/>
-</component>
-<component name="imap4mtm" long-name="IMAP4 MTM" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="app\messaging\email\imap4mtm\group" mrp="app\messaging\email\imap4mtm\group\messaging_email_imap.mrp"/>
-</component>
-</collection>
-<collection name="messaging_info" long-name="Messaging Apps Info" level="ui">
-<component name="messaging_metadata" long-name="Messaging Apps Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="app\messaging\messaging_info\messaging_metadata\messaging_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commonemail" level="apps" long-name="Email Apps"/>
-<block name="conversations" level="apps" long-name="Conversation Apps"/>
-<block name="im" level="apps" long-name="Instant Messaging Apps"/>
-<block name="utils" level="apps" long-name="Utility Apps"/>
-<block name="dictionary" level="services" long-name="Dictionary"/>
-<block name="camera" level="apps" long-name="Camera Apps"/>
-<block name="imgeditor" level="apps" long-name="Image Editor Apps"/>
-<block name="videoeditor" level="apps" long-name="Video Editor Apps"/>
-<block name="gallery" level="apps" long-name="Gallery Apps"/>
-<block name="videoplayer" level="apps" long-name="Video Player Apps"/>
-<block name="photos" level="apps" long-name="Photos"/>
-<block name="tv" level="apps" long-name="TV Apps"/>
-<block name="videocenter" level="apps" long-name="Video Center"/>
-<block name="musicplayer" level="apps" long-name="Music Player Apps"/>
-<block name="radio" level="apps" long-name="Radio Apps"/>
-<block name="internetradio" level="apps" long-name="Internet Radio Apps"/>
-<block name="voicerec" level="apps" long-name="Voice Recorder Apps"/>
-<block name="imgvieweruis" level="services" long-name="Image Viewer UIs"/>
-<block name="screensaver" level="apps" long-name="Screen Saver Apps"/>
-<block name="homescreen" level="apps" long-name="Home Screen Apps"/>
-<block name="graphicsuis" level="services" long-name="Graphics UIs"/>
-<block name="profile" level="apps" long-name="Profile"/>
-<block name="speechsrv" level="services" long-name="Speech Recognition UIs"/>
-<block name="homescreentools" level="services" long-name="Home Screen Tools"/>
-<block name="webuis" level="services" long-name="Web UIs"/>
-<block name="jrt" level="services" long-name="JRT"/>
-<block name="rndtools" level="services" long-name="RD tools"/>
-<block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools if ui">
-<collection name="helps_info" long-name="Help Apps Info" level="ui">
-<component name="helps_metadata" long-name="Help Apps Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="app\helps\helps_info\helps_metadata\helps_metadata.mrp"/>
-</component>
-</collection>
-<!-- MattD 20091102 - Adding to fix build failures -->
- <collection name="symhelp" long-name="Symbian Help" level="eng">
- <component name="helpmodel" long-name="Help" introduced="6.0" purpose="optional">
- <unit bldFile="app\helps\symhelp\helpmodel\group" mrp="app\helps\symhelp\helpmodel\group\app-services_hlpmodel.mrp"/>
- </component>
- </collection>
-
-</block>
-<block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
-<collection name="buildverification" long-name="Build Verification" level="services">
-<component name="autosmoketest" long-name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
-<unit bldFile="app\techview\buildverification\autosmoketest\Group" mrp="app\techview\buildverification\autosmoketest\Group\testtools_autosmoketest.mrp"/>
-</component>
-<component name="smoketest" long-name="Smoke Test" filter="gt" purpose="development">
-<unit bldFile="app\techview\buildverification\smoketest\Group" mrp="app\techview\buildverification\smoketest\Group\testtools_smoketest.mrp"/>
-</component>
-</collection>
-<collection name="networkingutils" long-name="Networking Utils" level="utils">
-<component name="ipadministrationtool" long-name="IP Administration Tool" introduced="7.0" purpose="development">
-<unit mrp="app\techview\networkingutils\ipadministrationtool\group\networking_ipadm.mrp"/>
-</component>
-<component name="nameresolverutility" long-name="Name Resolver Utility" introduced="7.0s" purpose="development">
-<unit mrp="app\techview\networkingutils\nameresolverutility\group\networking_nslookup.mrp"/>
-</component>
-</collection>
-<collection name="testapps" long-name="Test Apps" level="utils">
-<component name="rschandler" long-name="Resource Handler" deprecated="tb92" purpose="development">
-<unit mrp="app\techview\testapps\rschandler\TVResourceHandler\group\Testtools_ResourceHandler_gt.mrp"/>
-</component>
-</collection>
-<collection name="techview_info" long-name="Techview Info" level="apps3">
-<component name="techview_metadata" long-name="Techview Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="app\techview\techview_info\techview_metadata\techview_metadata.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-<layer name="adaptation" long-name="Adaptation" levels="hw-if">
-<block name="syborg_adaptation" level="hw-if" long-name="Syborg Adaptation" levels="hw-if">
-<collection id="baseport" name="Baseport" level="hw-if">
-<component id="syborg" name="Syborg" introduced="symbian^2" purpose="optional">
-<unit bldFile="adaptation\QEMU\baseport\syborg" mrp="baseport/syborg/syborg.mrp"/>
-</component>
-</collection>
-</block>
-<block name="beagleboard" long-name="Beagle Board" levels="hw-if">
-<collection name="omap3530" long-name="OMAP 3530" level="hw-if">
-<component name="omap3530" long-name="Beagle Board common" introduced="symbian^3" purpose="optional">
-<unit bldFile="/sf/adaptation/beagleboard/omap3530" mrp="/sf/adaptation/beagleboard/omap3530/base_beagle.mrp"/>
-</component>
-<component name="kernel" long-name="Beagle Board kernel" introduced="symbian^3" purpose="optional">
-<unit bldFile="/sf/adaptation/beagleboard/omap3530/kernel"/>
-</component>
-<component name="beagleboard" long-name="Beagle Board baseport" introduced="symbian^3" purpose="optional">
-<unit bldFile="/sf/adaptation/beagleboard/omap3530/beagleboard"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-<SystemBuild schema="1.0.0">
- <option name="KEEPGOING" abldOption="-keepgoing" description="Causes make to keepgoing on errors" enable="Y"/>
- <option name="SAVESPACE" abldOption="-savespace" description="Causes the removal of intermediate files" enable="Y"/>
- <option name="NO_DEBUG" abldOption="-no_debug" description="Causes the toolchain not to generate debug tables" enable="N"/>
- <target name="WINS" abldTarget="wins" description="MSVC Compiler"/>
- <target name="WINS_REL" abldTarget="wins urel" description="MSVC Compiler"/>
- <target name="WINS_DEB" abldTarget="wins udeb" description="MSVC Compiler"/>
- <target name="WINSCW" abldTarget="winscw" description="CodeWarrior Compiler"/>
- <target name="WINSCW_REL" abldTarget="winscw urel" description="CodeWarrior Compiler"/>
- <target name="WINSCW_DEB" abldTarget="winscw udeb" description="CodeWarrior Compiler"/>
- <target name="TOOLS" abldTarget="tools" description="MSVC Compiler for Tools"/>
- <target name="TOOLS_REL" abldTarget="tools rel" description="MSVC Compiler for Tools Release mode only"/>
- <target name="TOOLS2" abldTarget="tools2" description="MinGW GCC Compiler for Tools"/>
- <target name="TOOLS2_REL" abldTarget="tools2 rel" description="MinGW GCC Compiler for Tools Release mode only"/>
- <target name="ARMV5" abldTarget="armv5" description="RVCT Compiler"/>
- <target name="ARMV5_REL" abldTarget="armv5 urel" description="RVCT Compiler"/>
- <target name="ARMV5_DEB" abldTarget="armv5 udeb" description="RVCT Compiler"/>
- <target name="ARMV7" abldTarget="armv7" description="RVCT Compiler"/>
- <target name="ARMV7_REL" abldTarget="armv7 urel" description="RVCT Compiler"/>
- <target name="ARMV7_DEB" abldTarget="armv7 udeb" description="RVCT Compiler"/>
- <target name="ARMV5SMP" abldTarget="armv5smp" description="RVCT Compiler for SMP"/>
- <target name="ARMV5SMP_REL" abldTarget="armv5smp urel" description="RVCT Compiler for SMP"/>
- <target name="ARMV5SMP_DEB" abldTarget="armv5smp udeb" description="RVCT Compiler for SMP"/>
- <!-- Aditional Targets -->
- <target name="CWTOOLS" abldTarget="cwtools" description="CodeWarrior Compiler for Tools"/> <!-- Not supported -->
- <target name="CWTOOLS_REL" abldTarget="cwtools rel" description="CodeWarrior Compiler for Tools Release mode only"/> <!-- Not supported -->
- <target name="GCCXML" abldTarget="gccxml" description="GCCXML for Code comparision tools"/>
- <target name="GCCXML_REL" abldTarget="gccxml urel" description="GCCXML for Code comparision tools release mode only"/>
- <targetList name="default_9.0" description="Main Targets for 9.0" target="WINSCW ARMV5"/>
- <targetList name="default_9.0_rel" description="Main Targets for 9.0_rel" target="WINSCW_REL ARMV5_REL"/>
- <targetList name="default_9.0_deb" description="Main Targets for 9.0_deb" target="WINSCW_DEB ARMV5_DEB"/>
- <targetList name="tools" description="tools Targets" target="TOOLS"/>
- <targetList name="tools_rel" description="tools Release Targets" target="TOOLS_REL"/>
- <targetList name="tools2" description="tools Targets" target="TOOLS2"/>
- <targetList name="tools2_rel" description="tools Release Targets" target="TOOLS2_REL"/>
- <targetList name="gccxml" description="tools Targets" target="GCCXML"/>
- <targetList name="gccxml_rel" description="tools Release Targets" target="GCCXML_REL"/>
- <targetList name="armv5smp" description="Separate ARMV5 SMP target" target="ARMV5SMP"/>
- <targetList name="armv5smp_rel" description="Separate ARMV5 SMP release target" target="ARMV5SMP_REL"/>
- <targetList name="armv5smp_deb" description="Separate ARMV5 SMP debug target" target="ARMV5SMP_DEB"/>
- <targetList name="default_9.0_armv7" description="Main targets and ARMV7 target" target="WINSCW ARMV5 ARMV7"/>
- <targetList name="default_9.0_rel_armv7" description="Main targets and ARMV7 release target" target="WINSCW_REL ARMV5_REL ARMV7_REL"/>
- <targetList name="default_9.0_deb_armv7" description="Main targets and ARMV7 debug target" target="WINSCW_DEB ARMV5_DEB ARMV7_DEB"/>
- <!-- 9.5 configuration -->
- <!-- 9.6 configuration -->
- <!-- Future configuration -->
- <!-- tb92 configuration -->
- <!-- tb92sf configuration -->
- <configuration name="GT_tb92sf" description="tb92sf GT build" filter="tb92sf,gt">
- <ref item="os"/>
- <ref item="mw"/>
- <ref item="app"/>
- <task><specialInstructions name="BootStrap1" cwd="os\buildtools\sbsv1_os\e32toolp\group" command="setupprj.bat secure"/></task>
- <task><specialInstructions name="BootStrap2" cwd="os\buildtools\sbsv1_os\e32toolp\group" command="bld.bat rel"/></task>
- <task><buildLayer command="bldmake bldfiles" unitParallel="Y"/></task>
- <task><buildLayer command="abld export" unitParallel="Y"/></task>
- <task><buildLayer command="abld makefile" targetList="tools" unitParallel="Y" targetParallel="N"/></task>
- <task><buildLayer command="abld library" targetList="tools" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld target" targetList="tools_rel" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld final" targetList="tools_rel" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld -what build" targetList="tools_rel" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld -check build" targetList="tools_rel" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld makefile" targetList="tools2" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld library" targetList="tools2" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld target" targetList="tools2_rel" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld final" targetList="tools2_rel" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld -what build" targetList="tools2_rel" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld -check build" targetList="tools2_rel" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld makefile" targetList="default_9.0" unitParallel="Y" targetParallel="N"/></task>
- <task><buildLayer command="abld resource" targetList="default_9.0" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld library" targetList="default_9.0" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld target" targetList="default_9.0" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld final" targetList="default_9.0" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld -what export" unitParallel="Y"/></task>
- <task><buildLayer command="abld -what target" targetList="default_9.0_rel" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld -what target" targetList="default_9.0_deb" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld help" unitParallel="Y"/></task>
- <task><buildLayer command="abld -check build" targetList="default_9.0" unitParallel="Y" targetParallel="Y"/></task>
- </configuration>
- <configuration name="GT_tb92sf_ARMV5SMP" description="tb92sf ARMV5SMP build" filter="tb92sf,gt">
- <ref item="os"/>
- <ref item="mw"/>
- <ref item="app"/>
- <task><buildLayer command="bldmake bldfiles" unitParallel="Y"/></task>
- <task><buildLayer command="abld export" unitParallel="Y"/></task>
- <task><buildLayer command="abld makefile" targetList="armv5smp" unitParallel="Y" targetParallel="N"/></task>
- <task><buildLayer command="abld resource" targetList="armv5smp" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld library" targetList="armv5smp" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld target" targetList="armv5smp" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld final" targetList="armv5smp" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld -what export" unitParallel="Y"/></task>
- <task><buildLayer command="abld -what target" targetList="armv5smp_rel" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld -what target" targetList="armv5smp_deb" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld help" unitParallel="Y"/></task>
- <task><buildLayer command="abld -check build" targetList="armv5smp" unitParallel="Y" targetParallel="Y"/></task>
- </configuration>
-<!-- tb101sf configuration -->
-</SystemBuild></SystemDefinition>
--- a/symbian3/split/sysdefs/system_model_s60.xml Wed May 05 12:21:47 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,588 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?, build?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (logicalset* | module*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- levels CDATA #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT logicalset (logicalsubset* | module* | unit* | package* | prebuilt*)*>
- <!ATTLIST logicalset
- name CDATA #REQUIRED
- levels CDATA #IMPLIED
- span CDATA #IMPLIED
- level CDATA #IMPLIED>
- <!ELEMENT logicalsubset (module* | unit* | package* | prebuilt*)*>
- <!ATTLIST logicalsubset name CDATA #REQUIRED>
- <!ELEMENT module (component* | unit* | package* | prebuilt*)*>
- <!ATTLIST module
- name CDATA #REQUIRED
- level CDATA #IMPLIED>
- <!ELEMENT component (unit* | package* | prebuilt*)*>
- <!ATTLIST component name CDATA #REQUIRED>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- unitID ID #REQUIRED
- name CDATA #REQUIRED
- mrp CDATA #REQUIRED
- filter CDATA #IMPLIED
- bldFile CDATA #REQUIRED
- priority CDATA #IMPLIED
- contract CDATA #IMPLIED>
- <!ELEMENT package EMPTY>
- <!ATTLIST package
- name CDATA #REQUIRED
- mrp CDATA #REQUIRED
- filter CDATA #IMPLIED
- contract CDATA #IMPLIED>
- <!ELEMENT prebuilt EMPTY>
- <!ATTLIST prebuilt
- name CDATA #REQUIRED
- version CDATA #REQUIRED
- late (Y|N) #IMPLIED
- filter CDATA #IMPLIED
- contract CDATA #IMPLIED>
- <!ELEMENT build (option* | target+ | targetList+ | unitList+ | configuration+)*>
- <!ELEMENT unitList (unitRef+)>
- <!ATTLIST unitList
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT unitRef EMPTY>
- <!ATTLIST unitRef unit IDREF #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y | N | y | n) #REQUIRED>
- <!ELEMENT configuration (unitListRef+ | layerRef+ | task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task ( unitListRef* , (buildLayer | specialInstructions))>
- <!ELEMENT unitListRef EMPTY>
- <!ATTLIST unitListRef unitList IDREF #REQUIRED>
- <!ELEMENT layerRef EMPTY>
- <!ATTLIST layerRef layerName CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y | N | y | n) #REQUIRED
- targetParallel (Y | N | y | n) #IMPLIED>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition name="S60_SystemBuild + sysdef_dtd_1_4_0_xml + QuickOffice + adobereader + webvideo + wmdrmkeystorage_dist + wmdrmpd_dist + zipviewer + s60platformrelease + oemrndtools + swconfigapps + avdomain + btaudioadaptation_stub + drm_stub + ocrsrv_stub + omasuplasnconverterstubimpl + posmsgpluginreferenceimpl + power_save_display_mode_stub + srsfenginestub + systemswstubs + tactileclickplugin_stub + wlanhwinit_stub + camera + commonemail + conntools + contacts + contentcontrol + conversations + devicecontrol + systemswextensions + files + gallery + graphicsuis + helps + homescreen + im + imgvieweruis + iptelephony + jrt + location + messaging + mmsharinguis + avdomain + organizer + phone + photos + printing + profile + radio + rndtools + screensaver + settingsuis + speechsrv + graphics + utils + video + videotelephony + avdomain + webuis + accesssec + appinstall + appsupport + btservices + camerasrv + classicui + dlnasrv + drm + gsprofilesrv + hapticsservices + avdomain + homescreensrv + imghandling + imsrv + inputmethods + ipappprotocols + ipappservices + ipconnmgmt + legacypresence + locationsrv + mds + messagingmw + metadatasrv + avdomain + avdomain + mmuifw + netprotocols + networkingdm + opensrv + phonesrv + platformtools + remoteconn + remotemgmt + remotestorage + securitysrv + serviceapi + serviceapifw + shortlinkconn + ossrv + svgt + uiaccelerator + uiresources + uitools + usbservices + videoutils + vpnclient + web + websrv + wirelessacc + bt + cellularsrv + deviceplatformrelease + devicesrv + graphics + imagingext + lbs + avdomainosext + networkingsrv + osrndtools + ossrv + systemswextensions + usb + wlan + xmlsrv + buildplatforms + homescreentools + swconfigtools" schema="1.4.0">
-<systemModel>
- <layer name="os_layer">
-<module name="bt">
- <unit unitID="lcdo.bt" mrp="" bldFile="sf/os/bt/group" name="bt"/>
- </module>
-<module name="cellularsrv">
- <unit name="cellularsrv" unitID="tsydo.cellularsrv" bldFile="sf/os/cellularsrv/group" mrp=""/>
- </module>
-<module name="S60Extras">
- <unit unitID="platform.S60Extras" mrp="" bldFile="sf/os/deviceplatformrelease/S60Extras/group" name="S60Extras"/>
- </module>
-<module name="version">
- <unit unitID="platform.version" mrp="" bldFile="sf/os/deviceplatformrelease/Version/group" name="version"/>
- </module>
-<module name="sf_cenrep">
- <unit unitID="platform.cenrep" mrp="" bldFile="sf/os/deviceplatformrelease/sf_config/cenrep/group" name="sf_cenrep"/>
- </module>
-<module name="devicesrv">
- <unit unitID="sydo.devicesrv" mrp="" bldFile="sf/os/devicesrv/group" name="devicesrv"/>
- </module>
-<module name="">
-<unit unitID="AudioEqualizerUtility" mrp="" bldFile="sf/os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build" name="AudioEqualizerUtility"/>
-<unit unitID="EnvironmentalReverbUtility" mrp="" bldFile="sf/os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build" name="EnvironmentalReverbUtility"/>
-<unit unitID="StereoWideningUtility" mrp="" bldFile="sf/os/mm/devsoundextensions/effectspresets/StereoWideningUtility/group" filter="!dfs_build" name="StereoWideningUtility"/>
-</module>
-<module name="graphics">
- <unit unitID="abs.graphics" mrp="" bldFile="sf/os/graphics/group" name="graphics"/>
- <!-- MattD: graphics/group is missing, as are various subdirs...lets cobble something together... -->
- <unit unitID="abs.graphics.plat" mrp="" bldFile="sf/os/graphics/group/../graphics_plat/group" name="graphics_plat"/>
- <unit unitID="abs.graphics.m3gcoreapi" mrp="" bldFile="sf/os/graphics/group/../graphics_plat/m3g_core_api/group" name="graphics_m3g_api"/>
- <unit unitID="abs.graphics.m3gcore" mrp="" bldFile="sf/os/graphics/group/../m3g/m3gcore11/group" name="graphics_m3g"/>
- <unit unitID="abs.graphics.acceleration_vgi" mrp="" bldFile="sf/os/graphics/group/../graphicsaccelaration/vgi/group" name="graphics_acceleration_vgi"/>
- </module>
-<module name="imagingext">
- <unit unitID="imm.imagingext" mrp="" bldFile="sf/os/imagingext/group" name="imagingext"/>
- </module>
-<module name="lbs">
- <unit unitID="lodo.lbs" mrp="" bldFile="sf/os/lbs/group" name="lodo.lbs"/>
- </module>
-<module name="mm">
- <unit unitID="mm" mrp="" bldFile="sf/os/mm/group" name="mm"/>
- </module>
-<module name="osrndtools">
- <unit unitID="tools.osrndtools" mrp="" bldFile="sf/os/osrndtools/group" name="osrndtools"/>
- </module>
-<module name="usb">
- <unit unitID="lcdo.usb" mrp="" bldFile="sf/os/usb/group" name="usb"/>
- </module>
-<module name="wlan">
- <unit unitID="netdo.wlan" mrp="" bldFile="sf/os/wlan/group" name="wlan"/>
- </module>
-<module name="sf_common_tsy">
- <component name="sf_common_tsy">
- <unit unitID="symbian.common_tsy" name="sf_common_tsy" bldFile="sf/os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="" filter=""/>
- </component>
- </module>
-<module name="sf_openvg11">
- <component name="sf_openvg11">
- <unit unitID="symbian.openvg11" name="sf_openvg11" bldFile="\sf\os\graphics\openvg\openvginterface\group\openvg11" mrp="" filter="sf_build"/>
- <unit unitID="symbian.openvg11_KhronosRI" name="sf_openvg11_KhronosRI" bldFile="\sf\os\graphics\openvg\openvgrefimplementation\sfopenvg\group" mrp="" filter="sf_build"/>
- </component>
- </module></layer>
- <layer name="bldfirst_mw_layer">
-<module name="classicui">
- <unit unitID="abs.classicui" mrp="" bldFile="sf/mw/classicui/group" name="classicui"/>
- </module>
-<module name="gsprofilesrv">
- <unit name="gsprofilesrv" unitID="presdo.gsprofilesrv" bldFile="sf/mw/gsprofilesrv/group" mrp=""/>
- </module></layer>
- <layer name="mw_layer">
-<module name="accesssec">
- <unit unitID="netdo.accesssec" mrp="" bldFile="sf/mw/accesssec/group" name="accesssec"/>
- </module>
-<module name="appinstall">
- <unit unitID="sedo.appinstall" mrp="" bldFile="sf/mw/appinstall/group" name="appinstall"/>
- </module>
-<module name="appsupport">
- <unit unitID="sydo.appsupport" name="appsupport" bldFile="sf/mw/appsupport/group" mrp=""/>
- </module>
-<module name="">
-<unit unitID="sedo.securitysrv.pkiutilities.Certificates" bldFile="sf/mw/securitysrv/pkiutilities/Certificates/group" mrp="" filter="sf_build" name="sedo_securitysrv_pkiutilities_Certificates"/>
-</module>
-<module name="btservices">
- <unit unitID="lcdo.btservices" mrp="" bldFile="sf/mw/btservices/group" name="btservices"/>
- </module>
-<module name="camerasrv">
- <unit unitID="imm.camerasrv" mrp="" bldFile="sf/mw/camerasrv/group" name="camerasrv"/>
- </module>
-<module name="dlnasrv">
- <unit name="dlnasrv" unitID="hcdo.dlnasrv" bldFile="sf/mw/dlnasrv/group" mrp=""/>
- </module>
-<module name="drm">
- <unit unitID="sedo.drm" mrp="" bldFile="sf/mw/drm/group" name="drm"/>
- </module>
-<module name="hapticsservices">
- <unit unitID="abs.hapticsservices" mrp="" bldFile="sf/mw/hapticsservices/group" name="hapticsservices"/>
- </module>
-<module name="helix">
- <unit unitID="helix_stub" mrp="" bldFile="sf/mw/helix/helix_ren/helix_stub/group" filter="sf_build" name="helix_stub"/>
- </module>
-<module name="homescreensrv">
- <unit unitID="hs.homescreensrv" mrp="" bldFile="sf/mw/homescreensrv/group" name="homescreensrv"/>
- </module>
-<module name="imghandling">
- <unit unitID="imm.imghandling" mrp="" bldFile="sf/mw/imghandling/group" name="imghandling"/>
- </module>
-<module name="imsrv">
- <unit unitID="MeCodo.imsrv" mrp="" bldFile="sf/mw/imsrv/group" name="imsrv"/>
- </module>
-<module name="inputmethods">
- <unit unitID="abs.inputmethods" mrp="" bldFile="sf/mw/inputmethods/group" name="inputmethods"/>
- </module>
-<module name="ipappprotocols">
- <unit unitID="ipapdo.ipappprotocols" name="ipappprotocols" bldFile="sf/mw/ipappprotocols/group" mrp=""/>
- </module>
-<module name="ipappsrv">
- <unit unitID="ipasdo.ipappsrv" name="ipappsrv" bldFile="sf/mw/ipappsrv/group" mrp=""/>
- </module>
-<module name="ipconnmgmt">
- <unit unitID="netdo.ipconnmgmt" mrp="" bldFile="sf/mw/ipconnmgmt/group" name="ipconnmgmt"/>
- </module>
-<module name="legacypresence">
- <unit unitID="presdo.legacypresence" mrp="" bldFile="sf/mw/legacypresence/group" name="legacypresence"/>
- </module>
-<module name="locationsrv">
- <unit unitID="lodo.locationsrv" mrp="" bldFile="sf/mw/locationsrv/group" name="locationsrv"/>
- </module>
-<module name="mds">
- <unit unitID="imm.mds" mrp="" bldFile="sf/mw/mds/group" name="mds"/>
- </module>
-<module name="messagingmw">
- <unit unitID="Medo.messagingmw" mrp="" bldFile="sf/mw/messagingmw/group" name="messagingmw"/>
- </module>
-<module name="metadatasrv">
- <unit unitID="imm.metadatasrv" mrp="" bldFile="sf/mw/metadatasrv/group" name="metadatasrv"/>
- </module>
-<module name="mmappfw">
- <unit unitID="mmappfw" mrp="" bldFile="sf/mw/mmappfw/group" name="mmappfw"/>
- </module>
-<module name="mmmw">
- <unit unitID="mmmw" mrp="" bldFile="sf/mw/mmmw/group" name="mmmw"/>
- <!-- MattD 20100205 - This stub is needed for metadatautility (see Bug 1529) -->
- <unit unitID="mmmw_3GPExtParserLib_stub" mrp="" bldFile="sf/mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group" name="mmmw_3GPExtParserLib_stub"/>
- </module>
-<module name="mmuifw">
- <unit unitID="uxdo.mmuifw" mrp="" bldFile="sf/mw/mmuifw/group" name="mmuifw"/>
- </module>
-<module name="netprotocols">
- <unit unitID="browsing_domain.netprotocols" mrp="" bldFile="sf/mw/netprotocols/group" name="netprotocols"/>
- </module>
-<module name="opensrv">
- <unit unitID="MeCodo.opensrv" mrp="" bldFile="sf/mw/opensrv/group" name="opensrv"/>
- </module>
-<module name="phonesrv">
- <unit name="phonesrv" unitID="tedo.phonesrv" bldFile="sf/mw/phonesrv/group" mrp=""/>
- </module>
-<module name="platformtools">
- <unit unitID="tools.platformtools" mrp="" bldFile="sf/mw/platformtools/group" name="platformtools"/>
- </module>
-<module name="ptihangulcore">
- <unit unitID="abs.ptihangulcore" mrp="" bldFile="sf/mw/ptihangulcore/group" name="ptihangulcore"/>
- </module>
-<module name="ptikoreanqwertycore">
- <unit unitID="abs.ptikoreanqwertycore" mrp="" bldFile="sf/mw/ptikoreanqwertycore/group" name="ptikoreanqwertycore"/>
- </module>
-<module name="qt">
- <unit unitID="qtdo.qt" mrp="" bldFile="sf/mw/qt" name="qt"/>
- </module>
-<module name="remoteconn">
- <unit name="remoteconn" unitID="sydo.remoteconn" bldFile="sf/mw/remoteconn/group" mrp=""/>
- </module>
-<module name="remotemgmt">
- <unit unitID="spdo.remotemgmt" mrp="" bldFile="sf/mw/remotemgmt/group" name="remotemgmt"/>
- </module>
-<module name="remotestorage">
- <unit unitID="presdo.remotestorage" mrp="" bldFile="sf/mw/remotestorage/group" name="remotestorage"/>
- </module>
-<module name="securitysrv">
- <unit name="securitysrv" unitID="sedo.securitysrv" bldFile="sf/mw/securitysrv/group" mrp=""/>
- </module>
-<module name="serviceapi">
-<unit name="serviceapi" unitID="sapido.serviceapi" bldFile="sf/mw/serviceapi/group" mrp=""/>
-</module>
-<module name="serviceapifw">
-<unit name="serviceapifw" unitID="sapido.serviceapifw" bldFile="sf/mw/serviceapifw/group" mrp=""/>
-</module>
-<module name="shortlinkconn">
- <unit unitID="lcdo.shortlinkconn" mrp="" bldFile="sf/mw/shortlinkconn/group" name="shortlinkconn"/>
- </module>
-<module name="upnp">
-<unit name="upnp" unitID="mrtdo.upnp" bldFile="sf/mw/srvdiscovery/upnp/group" mrp=""/>
-</module>
-<module name="svgt">
- <unit unitID="abs.svgt" mrp="" bldFile="sf/mw/svgt/group" name="svgt"/>
- </module>
-<module name="uiaccelerator">
- <unit unitID="abs.uiaccelerator" mrp="" bldFile="sf/mw/uiaccelerator/group" name="uiaccelerator"/>
- </module>
-<module name="uiresources">
- <unit unitID="abs.uiresources" mrp="" bldFile="sf/mw/uiresources/group" name="uiresources"/>
- <unit unitID="abs.uiresources_nvgrender" mrp="" bldFile="sf/mw/uiresources/uigraphics/nvgrenderstage/group" name="uiresources_nvgrender"/>
- </module>
-<module name="usbservices">
- <unit unitID="lcdo.usbservices" mrp="" bldFile="sf/mw/usbservices/group" name="usbservices"/>
- <!-- MattD: I really need to FCL the component to Add in a couple of null bld.inf files, but I'll push it a bit further by doing this -->
- <unit unitID="more.usbservices" mrp="" bldFile="sf/mw/usbservices/usbservices_plat/group" name="usbservices_API"/>
- </module>
-<module name="videoutils">
- <unit unitID="vado.videoutils" mrp="" bldFile="sf/mw/videoutils/group" name="videoutils"/>
- </module>
-<module name="vpnclient">
- <unit unitID="netdo.vpnclient" mrp="" bldFile="sf/mw/vpnclient/group" filter="!oem_build" name="vpnclient"/>
- </module>
-<module name="web">
- <unit unitID="browsing_domain.web" mrp="" bldFile="sf/mw/web/group" name="web"/>
- </module>
-<module name="websrv">
- <unit unitID="WSDo.websrv" mrp="" bldFile="sf/mw/websrv/group" name="websrv"/>
- </module>
-<module name="wirelessacc">
- <unit unitID="netdo.wirelessacc" mrp="" bldFile="sf/mw/wirelessacc/group" name="wirelessacc"/>
- </module>
-<module name="ossrv">
-<unit name="ossrv" unitID="mrtdo.ossrv" bldFile="sf/os/ossrv/group" mrp=""/>
-</module>
-<module name="textandloc">
- <unit unitID="abs.textandloc" mrp="" bldFile="sf/os/textandloc/group" name="textandloc"/>
- </module>
-<module name="xmlsrv">
- <unit unitID="WSDo.xmlsrv" mrp="" bldFile="sf/os/xmlsrv/group" name="xmlsrv"/>
- </module></layer>
- <layer name="bldfirst_app_layer">
-<module name="contacts">
- <unit unitID="contacts" mrp="" bldFile="sf/app/contacts/group" name="contacts"/>
- </module></layer>
- <layer name="app_layer">
-<module name="oemrndtools">
- <unit unitID="tools.oemrndtools" mrp="" bldFile="ext/tools/oemrndtools/group" name="oemrndtools"/>
- </module>
-<module name="camera">
- <unit unitID="imm.camera" mrp="" bldFile="sf/app/camera/group" name="camera"/>
- <unit unitID="imm.camera.help" mrp="" bldFile="sf/app/camera/camerauis/cameraapp/help/group" name="camera_help"/>
- </module>
-<module name="commonemail">
- <unit unitID="EDo.commonemail" mrp="" bldFile="sf/app/commonemail/group" name="commonemail"/>
- </module>
-<module name="conntools">
- <unit unitID="netdo.conntools" mrp="" bldFile="sf/app/conntools/group" name="conntools"/>
- </module>
-<module name="contentcontrol">
- <unit unitID="spdo.contentcontrol" mrp="" bldFile="sf/app/contentcontrol/group" name="contentcontrol"/>
- </module>
-<module name="conversations">
- <unit unitID="MeCodo.conversations" mrp="" bldFile="sf/app/conversations/group" name="conversations"/>
- </module>
-<module name="devicecontrol">
- <unit unitID="spdo.devicecontrol" mrp="" bldFile="sf/app/devicecontrol/group" name="devicecontrol"/>
- </module>
-<module name="dictionary">
- <unit unitID="abs.dictionary" mrp="" bldFile="sf/app/dictionary/group" name="dictionary"/>
- </module>
-<module name="files">
- <unit name="files" unitID="presdo.files" bldFile="sf/app/files/group" mrp=""/>
- </module>
-<module name="graphicsuis">
- <unit unitID="abs.graphicsuis" mrp="" bldFile="sf/app/graphicsuis/group" name="graphicsuis"/>
- </module>
-<module name="helps">
- <unit unitID="abs.helps" mrp="" bldFile="sf/app/helps/group" name="helps"/>
- </module>
-<module name="homescreen">
- <unit unitID="abs.homescreen" mrp="" bldFile="sf/app/homescreen/group" name="homescreen"/>
- </module>
-<module name="im">
- <unit unitID="impp.im" mrp="" bldFile="sf/app/im/group" name="im"/>
- </module>
-<module name="iptelephony">
- <unit name="iptelephony" unitID="te.iptelephony" bldFile="sf/app/iptelephony/group" mrp=""/>
- </module>
-<module name="jrt">
-<unit unitID="jrt.jrt.jrt_plat" mrp="" bldFile="sf/app/jrt/jrt_plat/group" filter="sf_build" name="jrt_jrt_plat"/>
-<unit unitID="jrt.jrt.java_stubs" mrp="" bldFile="sf/app/jrt/java_stubs/group" filter="sf_build" name="jrt_jrt_stubs"/></module>
-<module name="location">
- <unit unitID="lodo.location" mrp="" bldFile="sf/app/location/group" name="location"/>
- </module>
-<module name="messaging">
- <unit unitID="Medo.messaging" mrp="" bldFile="sf/app/messaging/group" name="messaging"/>
- </module>
-<module name="mmsharinguis">
- <unit unitID="msdo.mmsharinguis" name="mmsharinguis" bldFile="sf/app/mmsharinguis/group" mrp=""/>
- </module>
-<module name="musicplayer">
- <unit unitID="musicplayer" mrp="" bldFile="sf/app/musicplayer/group" name="musicplayer"/>
- </module>
-<module name="organizer">
- <unit unitID="orgdo.organizer" mrp="" bldFile="sf/app/organizer/group" name="organizer"/>
- </module>
-<module name="phone">
- <unit name="phone" unitID="tedo.phone" bldFile="sf/app/phone/group" mrp=""/>
- </module>
-<module name="photos">
- <unit unitID="uxdo.photos" mrp="" bldFile="sf/app/photos/group" name="photos"/>
- </module>
-<module name="printing">
- <unit unitID="lcdo.printing" mrp="" bldFile="sf/app/printing/group" name="printing"/>
- </module>
-<module name="profile">
- <unit name="profile" unitID="presdo.profile" bldFile="sf/app/profile/group" mrp=""/>
- </module>
-<module name="radio">
- <unit unitID="vado.radio" mrp="" bldFile="sf/app/radio/group" name="radio"/>
- </module>
-<module name="rndtools">
- <unit unitID="tools.rndtools" mrp="" bldFile="sf/app/rndtools/group" name="rndtools"/>
- </module>
-<module name="screensaver">
- <unit unitID="abs.screensaver" mrp="" bldFile="sf/app/screensaver/group" name="screensaver"/>
- </module>
-<module name="settingsuis">
- <unit name="settingsuis" unitID="presdo.settingsuis" bldFile="sf/app/settingsuis/group" mrp=""/>
- </module>
-<module name="speechsrv">
- <unit unitID="MuiDo.speechsrv" mrp="" bldFile="sf/app/speechsrv/group" name="speechsrv"/>
- </module>
-<module name="utils">
- <unit unitID="orgdo.utils" mrp="" bldFile="sf/app/utils/group" name="utils"/>
- </module>
-<module name="videoplayer">
- <unit unitID="vado.videoplayer" mrp="" bldFile="sf/app/videoplayer/group" name="videoplayer"/>
- </module>
-<module name="videotelephony">
- <unit name="videotelephony_plat" unitID="tedo.videotelephony_plat" bldFile="sf/app/videotelephony/videotelephony_plat/group" mrp=""/>
- <unit name="vtprotocolsstub" unitID="tedo.vtprotocolsstub" bldFile="sf/app/videotelephony/vtprotocolsstub/group" mrp="" filter="sf_build"/>
- <unit name="DisplaySink" unitID="tedo.DisplaySink" bldFile="sf/app/videotelephony/vtprotocolplugins/DisplaySink/group" mrp=""/>
- <unit name="VideoSource" unitID="tedo.VideoSource" bldFile="sf/app/videotelephony/vtprotocolplugins/VideoSource/group" mrp=""/>
- <unit name="videoteleng" unitID="tedo.videoteleng" bldFile="sf/app/videotelephony/vtengines/videoteleng/Group" mrp=""/>
- <unit name="videotelui" unitID="tedo.videotelui" bldFile="sf/app/videotelephony/vtuis/videotelui/group" mrp=""/>
- <unit name="vtmediatorplugin" unitID="tedo.vtmediatorplugin" bldFile="sf/app/videotelephony/vtengines/vtmediatorplugin/group" mrp=""/>
- </module>
-<module name="voicerec">
- <unit unitID="voicerec" mrp="" bldFile="sf/app/voicerec/group" name="voicerec"/>
- </module>
-<module name="webuis">
- <unit unitID="browsing_domain.webuis" mrp="" bldFile="sf/app/webuis/group" name="webuis"/>
- </module>
-<module name="locfiles">
- <unit unitID="platform.locfiles" mrp="" bldFile="sf/os/deviceplatformrelease/locfiles/group" filter="" name="locfiles"/>
- <unit unitID="platform.locfiles.set1" mrp="" bldFile="sf/os/deviceplatformrelease/locfiles/group/set1" filter="" name="locfiles_set1"/>
- <unit unitID="platform.locfiles.set2" mrp="" bldFile="sf/os/deviceplatformrelease/locfiles/group/set2" filter="" name="locfiles_set2"/>
- <unit unitID="platform.locfiles.set3" mrp="" bldFile="sf/os/deviceplatformrelease/locfiles/group/set3" filter="" name="locfiles_set3"/>
- <unit unitID="platform.locfiles.set4" mrp="" bldFile="sf/os/deviceplatformrelease/locfiles/group/set4" filter="" name="locfiles_set4"/>
- <unit unitID="platform.locfiles.set5" mrp="" bldFile="sf/os/deviceplatformrelease/locfiles/group/set5" filter="" name="locfiles_set5"/>
- <unit unitID="platform.locfiles.set6" mrp="" bldFile="sf/os/deviceplatformrelease/locfiles/group/set6" filter="" name="locfiles_set6"/>
- <unit unitID="platform.locfiles.set7" mrp="" bldFile="sf/os/deviceplatformrelease/locfiles/group/set7" filter="" name="locfiles_set7"/>
- <unit unitID="platform.locfiles.set8" mrp="" bldFile="sf/os/deviceplatformrelease/locfiles/group/set8" filter="" name="locfiles_set8"/>
- <unit unitID="platform.locfiles.set9" mrp="" bldFile="sf/os/deviceplatformrelease/locfiles/group/set9" filter="" name="locfiles_set9"/>
- <unit unitID="platform.locfiles.set10" mrp="" bldFile="sf/os/deviceplatformrelease/locfiles/group/set10" filter="" name="locfiles_set10"/>
- <unit unitID="platform.locfiles.set11" mrp="" bldFile="sf/os/deviceplatformrelease/locfiles/group/set11" filter="" name="locfiles_set11"/>
- <unit unitID="platform.locfiles.set12" mrp="" bldFile="sf/os/deviceplatformrelease/locfiles/group/set12" filter="" name="locfiles_set12"/>
- <unit unitID="platform.locfiles.set13" mrp="" bldFile="sf/os/deviceplatformrelease/locfiles/group/set13" filter="" name="locfiles_set13"/>
- <unit unitID="platform.locfiles.set14" mrp="" bldFile="sf/os/deviceplatformrelease/locfiles/group/set14" filter="" name="locfiles_set14"/>
- <unit unitID="platform.locfiles.set15" mrp="" bldFile="sf/os/deviceplatformrelease/locfiles/group/set15" filter="" name="locfiles_set15"/>
- <unit unitID="platform.locfiles.set16" mrp="" bldFile="sf/os/deviceplatformrelease/locfiles/group/set16" filter="" name="locfiles_set16"/>
- </module>
-<module name="helps_loc2">
- <unit unitID="platform.helps_loc2" mrp="" bldFile="sf/os/deviceplatformrelease/helps_loc2/group" name="helps_loc2"/>
- </module>
- </layer>
- <layer name="tools_layer">
-<module name="qtconf">
- <unit unitID="qtdo.qt.qtconf" mrp="" bldFile="sf/mw/qt/group" name="qtconf"/>
- </module>
-<module name="uitools">
- <unit unitID="abs.uitools" mrp="" bldFile="sf/mw/uitools/group" name="uitools"/>
- </module>
-<module name="homescreentools">
- <unit unitID="hsdo.themeinstaller" mrp="" bldFile="sf/tools/homescreentools/themeinstaller/group" name="themeinstaller"/>
-<unit unitID="abs.homescreentools" mrp="" bldFile="sf/tools/homescreentools/group" name="homescreentools"/>
- <unit unitID="hsdo.widgettools" mrp="" bldFile="sf/tools/homescreentools/widgettools/group" name="widgettools"/>
- </module>
-<module name="buildplatforms">
- <unit unitID="sf_tools_buildplatforms" name="buildplatforms" bldFile="\sf\tools\buildplatforms\group" mrp=""/>
-</module>
-<module name="swconfigtools">
- <unit name="swconfigtools" unitID="sydo.swconfigtools" bldFile="sf/tools/swconfigtools/group" mrp=""/>
- </module></layer>
- <layer name="stubs_layer">
-<module name="audiostubs">
- <unit unitID="audiostubs" mrp="" bldFile="sf/adaptation/stubs/audiostubs/group" name="audiostubs"/>
- </module>
-<module name="drm_stubs">
- <unit name="drm_stubs" unitID="sedo.drm_stubs" bldFile="sf/adaptation/stubs/drm_stubs/group" mrp=""/>
- </module>
-<module name="ocrsrv_stub">
- <unit unitID="abs.ocrsrv_stub" mrp="" bldFile="sf/adaptation/stubs/ocrsrv_stub/group" filter="!dfs_build" name="ocrsrv_stub"/>
- </module>
-<module name="omasuplasnconverterstubimpl">
- <unit unitID="lodo.omasuplasnconverterstubimpl" mrp="" bldFile="sf/adaptation/stubs/omasuplasnconverterstubimpl/group" filter="!dfs_build" name="omasuplasnconverterstubimpl"/>
- </module>
-<module name="posmsgpluginreferenceimpl">
- <unit unitID="lodo.posmsgpluginreferenceimpl" mrp="" bldFile="sf/adaptation/stubs/posmsgpluginreferenceimpl/group" name="posmsgpluginreferenceimpl"/>
- </module>
-<module name="power_save_display_mode_stub">
- <unit unitID="abs.power_save_display_mode_stub" mrp="" bldFile="sf/adaptation/stubs/power_save_display_mode_stub/group" name="power_save_display_mode_stub"/>
- </module>
-<module name="systemswstubs">
- <unit name="systemswstubs" unitID="sydo.systemswstubs" bldFile="sf/adaptation/stubs/systemswstubs/group" mrp=""/>
- </module>
-<module name="tactileclickplugin_stub">
- <unit unitID="abs.tactileclickplugin_stub" mrp="" bldFile="sf/adaptation/stubs/tactileclickplugin_stub/group" name="tactileclickplugin_stub"/>
- </module>
-<module name="wlanhwinit_stub">
- <unit unitID="netdo.wlanhwinit_stub" mrp="" bldFile="sf/adaptation/stubs/wlanhwinit_stub/group" name="wlanhwinit_stub"/>
- </module>
-<module name="sf_licenseetsystub">
- <component name="sf_licenseetsystub">
- <unit unitID="symbian.licenseetsystub" name="sf_licenseetsystub" bldFile="sf/os/cellularsrv/telephonyserverplugins/licenseetsystub/group" mrp="" filter=""/>
- </component>
- </module></layer>
-<layer name="unit_test_layer">
- <module name="camera_unit_tests">
- </module>
-<module name="camerasrv_unit_tests">
- </module>
-<module name="imagehandling_unit_tests">
- </module>
-<module name="mds_unit_tests">
- </module>
-<module name="metadatasrv_unit_tests">
- </module></layer>
-</systemModel>
- <build>
- <option name="KEEPGOING" abldOption="-keepgoing" description="Causes make to keepgoing on errors" enable="Y"/>
-<!-- <option name="SAVESPACE" abldOption="-savespace" description="Causes the removal of intermediate files" enable="Y"/> -->
- <target name="WINS" abldTarget="wins" description="MSVC Compiler"/>
- <target name="WINS_REL" abldTarget="wins urel" description="MSVC Compiler"/>
- <target name="WINS_DEB" abldTarget="wins udeb" description="MSVC Compiler"/>
- <target name="WINSCW" abldTarget="winscw" description="CodeWarrior Compiler"/>
- <target name="WINSCW_REL" abldTarget="winscw urel" description="CodeWarrior Compiler"/>
- <target name="WINSCW_DEB" abldTarget="winscw udeb" description="CodeWarrior Compiler"/>
- <target name="TOOLS" abldTarget="tools" description="MSVC Compiler for Tools"/>
- <target name="TOOLS_REL" abldTarget="tools rel" description="MSVC Compiler for Tools Release mode only"/>
- <target name="ARMV5" abldTarget="armv5" description="RVCT Compiler"/>
- <target name="ARMV5_REL" abldTarget="armv5 urel" description="RVCT Compiler"/>
- <target name="ARMV5_DEB" abldTarget="armv5 udeb" description="RVCT Compiler"/>
- <target name="ARM9E" abldTarget="arm9e" description="RVCT Compiler"/>
- <!-- Aditional Targets -->
- <target name="CWTOOLS" abldTarget="cwtools" description="CodeWarrior Compiler for Tools"/> <!-- Not supported -->
- <target name="CWTOOLS_REL" abldTarget="cwtools rel" description="CodeWarrior Compiler for Tools Release mode only"/> <!-- Not supported -->
- <targetList name="default" description="Main Targets" target="WINSCW ARMV5"/>
- <targetList name="default_winscw" description="Main Targets" target="WINSCW"/>
- <targetList name="default_armv5" description="Main Targets" target="ARMV5"/>
- <targetList name="default_rel" description="Main Targets for rel" target="WINSCW_REL ARMV5_REL"/>
- <targetList name="default_deb" description="Main Targets for deb" target="WINSCW_DEB ARMV5_DEB"/>
- <targetList name="default_debrel" description="Main Targets for WINSCW deb and ARMV5 urel" target="WINSCW_DEB ARMV5_REL"/>
- <targetList name="default_tools" description="tools Targets" target="TOOLS"/>
- <targetList name="tools_rel" description="tools Release Targets" target="TOOLS_REL"/>
- <targetList name="cwtools" description="cwtools Targets" target="CWTOOLS"/>
- <targetList name="cwtools_rel" description="cwtools Release Targets" target="CWTOOLS_REL"/>
- <targetList name="arm9e" description="arm9e Release Targets" target="ARM9E"/>
- <configuration name="S60_sf" description="S60 sf build" filter="raptor_S60_sf,sf_build">
- <layerRef layerName="os_layer"/>
- <layerRef layerName="bldfirst_mw_layer"/>
- <layerRef layerName="mw_layer"/>
- <layerRef layerName="bldfirst_app_layer"/>
- <layerRef layerName="app_layer"/>
- <layerRef layerName="tools_layer"/>
- <layerRef layerName="stubs_layer"/>
- <task><buildLayer command="bldmake bldfiles" unitParallel="Y"/></task>
- <task><buildLayer command="abld export" unitParallel="Y"/></task>
- <task><buildLayer command="abld makefile" targetList="default_tools" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld library" targetList="default_tools" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld target" targetList="tools_rel" unitParallel="N" targetParallel="Y"/></task>
- <task><buildLayer command="abld final" targetList="tools_rel" unitParallel="N" targetParallel="Y"/></task>
- <task><buildLayer command="abld -what build" targetList="tools_rel" unitParallel="N" targetParallel="Y"/></task>
- <task><buildLayer command="abld -check build" targetList="tools_rel" unitParallel="N" targetParallel="Y"/></task>
- <task><buildLayer command="abld makefile" targetList="default_winscw" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld resource" targetList="default_winscw" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld library" targetList="default_winscw" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld makefile" targetList="default_armv5" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld resource" targetList="default_armv5" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld library" targetList="default_armv5" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld target" targetList="default" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld final" targetList="default" unitParallel="N" targetParallel="N"/></task>
- <task><buildLayer command="abld -what build" targetList="default" unitParallel="Y" targetParallel="Y"/></task>
- <task><buildLayer command="abld -check build" targetList="default" unitParallel="Y" targetParallel="Y"/></task>
- </configuration>
-<!--
-launch -what command for binary only component so thosa can be zipped
-this configuration can be used only when those components has built among normal build
--->
-<!-- OS Extension build configurations start -->
- </build>
-</SystemDefinition>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian4/prebuilt_excludelist.txt Tue Jul 13 12:21:44 2010 +0100
@@ -0,0 +1,218 @@
+epoc32\data\z\system\data\testexecute.ini
+epoc32\engineeringtools\plugins\tef.vp
+epoc32\engineeringtools\tefutilities\eventlogserver\data\eventlogcontroler.ini
+epoc32\engineeringtools\tefutilities\eventlogserver\scripts\example.script
+epoc32\engineeringtools\tefutilities\eventlogserver\xml\eventlogserver.xml
+epoc32\engineeringtools\tefutilities\eventlogserver\xml\eventlogserver\example.xml
+epoc32\engineeringtools\tefutilities\platsec\data\capabilitypolicing.ini
+epoc32\engineeringtools\tefutilities\platsec\scripts\capabilitypolicing.script
+epoc32\engineeringtools\tefutilities\platsec\scripts\cleanup.script
+epoc32\engineeringtools\tefutilities\platsec\xml\platsecserver.xml
+epoc32\engineeringtools\tefutilities\platsec\xml\platsecserver\capabilitypolicing.xml
+epoc32\engineeringtools\tefutilities\platsec\xml\platsecserver\cleanup.xml
+epoc32\engineeringtools\tefutilities\tefutilityserver\data\formatdrivetest.ini
+epoc32\engineeringtools\tefutilities\tefutilityserver\scripts\buildinfologtest.script
+epoc32\engineeringtools\tefutilities\tefutilityserver\scripts\formatdrivetest.script
+epoc32\engineeringtools\tefutilities\tefutilityserver\xml\tefutilityserver.xml
+epoc32\engineeringtools\tefutilities\tefutilityserver\xml\tefutilityserver\buildinfologtest.xml
+epoc32\engineeringtools\tefutilities\tefutilityserver\xml\tefutilityserver\formatdrivetest.xml
+epoc32\include\iniparser.h
+epoc32\include\test\activecallback.h
+epoc32\include\test\blockitems.h
+epoc32\include\test\commandprocessor.h
+epoc32\include\test\cteflogger.h
+epoc32\include\test\ctefunitserver.h
+epoc32\include\test\dataaccess.h
+epoc32\include\test\datadictionary.h
+epoc32\include\test\datawrapper.h
+epoc32\include\test\datawrapper.inl
+epoc32\include\test\fileservplugin.h
+epoc32\include\test\rfilelogger.h
+epoc32\include\test\rfileloggermacro.h
+epoc32\include\test\sysstartplugin.h
+epoc32\include\test\tefexportconst.h
+epoc32\include\test\tefresult.h
+epoc32\include\test\tefscriptutils.h
+epoc32\include\test\tefshareddata.h
+epoc32\include\test\tefshareddata.inl
+epoc32\include\test\teftimer.h
+epoc32\include\test\tefunit.h
+epoc32\include\test\tefunit.inl
+epoc32\include\test\TEFUtils.h
+epoc32\include\test\testblockcontroller.h
+epoc32\include\test\testblockcontroller.inl
+epoc32\include\test\testexecuteclient.h
+epoc32\include\test\testexecutelog.h
+epoc32\include\test\testexecutelogbase.h
+epoc32\include\test\testexecutelogger.h
+epoc32\include\test\testexecutepipslog.h
+epoc32\include\test\testexecuteserverbase.h
+epoc32\include\test\testexecuteserverutils.h
+epoc32\include\test\testexecuteserverutils.inl
+epoc32\include\test\testexecutestepbase.h
+epoc32\include\test\testserver2.h
+epoc32\include\test\testshareddata.h
+epoc32\include\test\testshareddata.inl
+epoc32\include\test\wrapperutilsplugin.h
+epoc32\release\armv5\lib\IniParser.dso
+epoc32\release\armv5\lib\IniParser.lib
+epoc32\release\armv5\lib\IniParser{000a0000}.dso
+epoc32\release\armv5\lib\IniParser{000a0000}.lib
+epoc32\release\armv5\lib\rfileloggerclient.dso
+epoc32\release\armv5\lib\rfileloggerclient.lib
+epoc32\release\armv5\lib\rfileloggerclient{000a0000}.dso
+epoc32\release\armv5\lib\rfileloggerclient{000a0000}.lib
+epoc32\release\armv5\lib\testexecutelogclient.dso
+epoc32\release\armv5\lib\testexecutelogclient.lib
+epoc32\release\armv5\lib\testexecutelogclient{000a0000}.dso
+epoc32\release\armv5\lib\testexecutelogclient{000a0000}.lib
+epoc32\release\armv5\lib\testexecutepipslogclient.dso
+epoc32\release\armv5\lib\testexecutepipslogclient.lib
+epoc32\release\armv5\lib\testexecutepipslogclient{000a0000}.dso
+epoc32\release\armv5\lib\testexecutepipslogclient{000a0000}.lib
+epoc32\release\armv5\lib\testexecuteutils.dso
+epoc32\release\armv5\lib\testexecuteutils.lib
+epoc32\release\armv5\lib\testexecuteutils{000a0000}.dso
+epoc32\release\armv5\lib\testexecuteutils{000a0000}.lib
+epoc32\release\armv5\lib\WrapperUtilsPlugin1.dso
+epoc32\release\armv5\lib\WrapperUtilsPlugin1.lib
+epoc32\release\armv5\lib\WrapperUtilsPlugin1{000a0000}.dso
+epoc32\release\armv5\lib\WrapperUtilsPlugin1{000a0000}.lib
+epoc32\release\armv5\udeb\gwstestexecute.exe
+epoc32\release\armv5\udeb\gwstestexecute.exe.map
+epoc32\release\armv5\udeb\IniParser.dll
+epoc32\release\armv5\udeb\IniParser.dll.map
+epoc32\release\armv5\udeb\rfileloggerclient.dll
+epoc32\release\armv5\udeb\rfileloggerclient.dll.map
+epoc32\release\armv5\udeb\rfileloggerserver.exe
+epoc32\release\armv5\udeb\rfileloggerserver.exe.map
+epoc32\release\armv5\udeb\tefcleanup.exe
+epoc32\release\armv5\udeb\tefcleanup.exe.map
+epoc32\release\armv5\udeb\tefplatsec.exe
+epoc32\release\armv5\udeb\tefplatsec.exe.map
+epoc32\release\armv5\udeb\tefunit.lib
+epoc32\release\armv5\udeb\tefutilityserver.exe
+epoc32\release\armv5\udeb\tefutilityserver.exe.map
+epoc32\release\armv5\udeb\tefutilityserverlite.exe
+epoc32\release\armv5\udeb\tefutilityserverlite.exe.map
+epoc32\release\armv5\udeb\testexecute.exe
+epoc32\release\armv5\udeb\testexecute.exe.map
+epoc32\release\armv5\udeb\testexecutelite.exe
+epoc32\release\armv5\udeb\testexecutelite.exe.map
+epoc32\release\armv5\udeb\testexecutelogclient.dll
+epoc32\release\armv5\udeb\testexecutelogclient.dll.map
+epoc32\release\armv5\udeb\testexecutelogengine.exe
+epoc32\release\armv5\udeb\testexecutelogengine.exe.map
+epoc32\release\armv5\udeb\testexecutepipslogclient.dll
+epoc32\release\armv5\udeb\testexecutepipslogclient.dll.map
+epoc32\release\armv5\udeb\testexecutepipslogengine.exe
+epoc32\release\armv5\udeb\testexecutepipslogengine.exe.map
+epoc32\release\armv5\udeb\testexecuteutils.dll
+epoc32\release\armv5\udeb\testexecuteutils.dll.map
+epoc32\release\armv5\udeb\WrapperUtilsPlugin1.dll
+epoc32\release\armv5\udeb\WrapperUtilsPlugin1.dll.map
+epoc32\release\armv5\urel\gwstestexecute.exe
+epoc32\release\armv5\urel\gwstestexecute.exe.map
+epoc32\release\armv5\urel\IniParser.dll
+epoc32\release\armv5\urel\IniParser.dll.map
+epoc32\release\armv5\urel\rfileloggerclient.dll
+epoc32\release\armv5\urel\rfileloggerclient.dll.map
+epoc32\release\armv5\urel\rfileloggerserver.exe
+epoc32\release\armv5\urel\rfileloggerserver.exe.map
+epoc32\release\armv5\urel\tefcleanup.exe
+epoc32\release\armv5\urel\tefcleanup.exe.map
+epoc32\release\armv5\urel\tefplatsec.exe
+epoc32\release\armv5\urel\tefplatsec.exe.map
+epoc32\release\armv5\urel\tefunit.lib
+epoc32\release\armv5\urel\tefutilityserver.exe
+epoc32\release\armv5\urel\tefutilityserver.exe.map
+epoc32\release\armv5\urel\tefutilityserverlite.exe
+epoc32\release\armv5\urel\tefutilityserverlite.exe.map
+epoc32\release\armv5\urel\testexecute.exe
+epoc32\release\armv5\urel\testexecute.exe.map
+epoc32\release\armv5\urel\testexecutelite.exe
+epoc32\release\armv5\urel\testexecutelite.exe.map
+epoc32\release\armv5\urel\testexecutelogclient.dll
+epoc32\release\armv5\urel\testexecutelogclient.dll.map
+epoc32\release\armv5\urel\testexecutelogengine.exe
+epoc32\release\armv5\urel\testexecutelogengine.exe.map
+epoc32\release\armv5\urel\testexecutepipslogclient.dll
+epoc32\release\armv5\urel\testexecutepipslogclient.dll.map
+epoc32\release\armv5\urel\testexecutepipslogengine.exe
+epoc32\release\armv5\urel\testexecutepipslogengine.exe.map
+epoc32\release\armv5\urel\testexecuteutils.dll
+epoc32\release\armv5\urel\testexecuteutils.dll.map
+epoc32\release\armv5\urel\WrapperUtilsPlugin1.dll
+epoc32\release\armv5\urel\WrapperUtilsPlugin1.dll.map
+epoc32\release\winscw\udeb\gwstestexecute.exe
+epoc32\release\winscw\udeb\IniParser.dll
+epoc32\release\winscw\udeb\IniParser.lib
+epoc32\release\winscw\udeb\rfileloggerclient.dll
+epoc32\release\winscw\udeb\rfileloggerclient.lib
+epoc32\release\winscw\udeb\rfileloggerserver.exe
+epoc32\release\winscw\udeb\tefcleanup.exe
+epoc32\release\winscw\udeb\tefplatsec.exe
+epoc32\release\winscw\udeb\tefunit.lib
+epoc32\release\winscw\udeb\tefutilityserver.exe
+epoc32\release\winscw\udeb\tefutilityserverlite.exe
+epoc32\release\winscw\udeb\testexecute.exe
+epoc32\release\winscw\udeb\testexecutelite.exe
+epoc32\release\winscw\udeb\testexecutelogclient.dll
+epoc32\release\winscw\udeb\testexecutelogclient.lib
+epoc32\release\winscw\udeb\testexecutelogengine.exe
+epoc32\release\winscw\udeb\testexecutepipslogclient.dll
+epoc32\release\winscw\udeb\testexecutepipslogclient.lib
+epoc32\release\winscw\udeb\testexecutepipslogengine.exe
+epoc32\release\winscw\udeb\testexecuteutils.dll
+epoc32\release\winscw\udeb\testexecuteutils.lib
+epoc32\release\winscw\udeb\WrapperUtilsPlugin1.dll
+epoc32\release\winscw\udeb\WrapperUtilsPlugin1.lib
+epoc32\release\winscw\urel\gwstestexecute.exe
+epoc32\release\winscw\urel\gwstestexecute.exe.map
+epoc32\release\winscw\urel\IniParser.dll
+epoc32\release\winscw\urel\IniParser.dll.map
+epoc32\release\winscw\urel\rfileloggerclient.dll
+epoc32\release\winscw\urel\rfileloggerclient.dll.map
+epoc32\release\winscw\urel\rfileloggerserver.exe
+epoc32\release\winscw\urel\rfileloggerserver.exe.map
+epoc32\release\winscw\urel\tefcleanup.exe
+epoc32\release\winscw\urel\tefcleanup.exe.map
+epoc32\release\winscw\urel\tefplatsec.exe
+epoc32\release\winscw\urel\tefplatsec.exe.map
+epoc32\release\winscw\urel\tefunit.lib
+epoc32\release\winscw\urel\tefutilityserver.exe
+epoc32\release\winscw\urel\tefutilityserver.exe.map
+epoc32\release\winscw\urel\tefutilityserverlite.exe
+epoc32\release\winscw\urel\tefutilityserverlite.exe.map
+epoc32\release\winscw\urel\testexecute.exe
+epoc32\release\winscw\urel\testexecute.exe.map
+epoc32\release\winscw\urel\testexecutelite.exe
+epoc32\release\winscw\urel\testexecutelite.exe.map
+epoc32\release\winscw\urel\testexecutelogclient.dll
+epoc32\release\winscw\urel\testexecutelogclient.dll.map
+epoc32\release\winscw\urel\testexecutelogengine.exe
+epoc32\release\winscw\urel\testexecutelogengine.exe.map
+epoc32\release\winscw\urel\testexecutepipslogclient.dll
+epoc32\release\winscw\urel\testexecutepipslogclient.dll.map
+epoc32\release\winscw\urel\testexecutepipslogengine.exe
+epoc32\release\winscw\urel\testexecutepipslogengine.exe.map
+epoc32\release\winscw\urel\testexecuteutils.dll
+epoc32\release\winscw\urel\testexecuteutils.dll.map
+epoc32\release\winscw\urel\WrapperUtilsPlugin1.dll
+epoc32\release\winscw\urel\WrapperUtilsPlugin1.dll.map
+epoc32\rom\include\base_testexecutelite.iby
+epoc32\rom\include\iniparser.iby
+epoc32\rom\include\rfilelogger.iby
+epoc32\rom\include\tefcleanup.iby
+epoc32\rom\include\tefplatsec.iby
+epoc32\rom\include\tefutilityserver.iby
+epoc32\rom\include\testexecute.iby
+epoc32\rom\include\testexecutelogger.iby
+epoc32\rom\include\testexecutepipslogger.iby
+epoc32\rom\include\testexecutepipsloggerclient.iby
+epoc32\rom\include\wrapperutilsplugin.iby
+epoc32\winscw\c\system\data\testexecute.ini
+epoc32\include\testconfigfileparser.h
+epoc32\include\testconfigfileparser.inl
+epoc32\release\winscw\udeb\testconfigfileparser.dll
+epoc32\release\winscw\udeb\testconfigfileparser.lib
\ No newline at end of file
--- a/symbian4/single/job_props.ant.xml Wed May 05 12:21:47 2010 +0100
+++ b/symbian4/single/job_props.ant.xml Tue Jul 13 12:21:44 2010 +0100
@@ -22,9 +22,10 @@
<!-- Location of Symbian_OS.hrh changed for Symbian3 to an inc directory -->
<property name="sf.spec.bldmefirst.gt.hrh.os" value="sf/os/deviceplatformrelease/symbianosbld/cedarutils/inc/Symbian_OS_${sf.spec.sbs.variant}.hrh" />
<property name="sf.spec.bldmefirst.gt.hrh" value="sf/os/deviceplatformrelease/symbianosbld/cedarutils/" />
+ <property name="sf.spec.bldmefirst.sbs.config.xml" value="sf/os/deviceplatformrelease/foundation_system/sf_config/sbs/s60_sbs_config.xml" />
<property name="sf.spec.bldmefirst.s60.variant" value="western" /> <!-- western|apac|japan but only western is used at the moment -->
- <property name="sf.spec.bldmefirst.s60.config.root" value="sf/os/deviceplatformrelease/sf_config/config" />
+ <property name="sf.spec.bldmefirst.s60.config.root" value="sf/os/deviceplatformrelease/foundation_system/sf_config/config" />
<property name="sf.spec.bldmefirst.s60.sbs.variant.cfg" value="${sf.spec.bldmefirst.s60.config.root}/inc/variant.cfg" /> <!-- currently needed for touching -->
<property name="sf.spec.bldmefirst.s60.exports" value="${sf.spec.bldmefirst.s60.config.root}/${sf.spec.bldmefirst.s60.variant}/group,${sf.spec.bldmefirst.s60.config.root}/group,sf/os/devicesrv/devicesrv_pub/platform_path_definitions_api/group,sf/os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group,sf/os/devicesrv/commonservices/commonengine/group,sf/mw/web/web_plat/browser_platform_api/group"/>
@@ -33,8 +34,8 @@
<!-- and set sf.spec.baseline.enable to 'true' -->
<!-- get full source env and binaries from pdk -->
- <property name="sf.spec.baseline.location" value="\\v800008\Builds01\Releases\${sf.previous.pdk.tag}" />
- <property name="sf.spec.toolsbaseline.location" value="\\v800008\Builds01\PDT\PDT_1.6" /> <!-- for TEF etc -->
+ <property name="sf.spec.baseline.location" value="\\v800008\PDT\prebuilt_default.41" />
+ <property name="sf.spec.toolsbaseline.location" value="\\v800008\Builds01\Releases\${sf.previous.pdk.tag}_custom" /> <!-- for TEF,Qmake etc -->
<!-- platform build specific properties -->
<property name="sf.spec.s60.sysdef.clean.configurations.list" value="S60_5_2_sf" />
@@ -78,7 +79,4 @@
<!-- Build ROMs from iMaker config defined in job_refs.ant.xml -->
<property name="sf.spec.referenceroms.createimages.enable" value="false"/>
- <!-- run qmake for anything units with proFile attribs -->
- <property name="qmake.enabled" value="true"/>
-
</project>
--- a/symbian4/single/job_refs.ant.xml Wed May 05 12:21:47 2010 +0100
+++ b/symbian4/single/job_refs.ant.xml Tue Jul 13 12:21:44 2010 +0100
@@ -4,16 +4,10 @@
<!-- For a combined model GT+S60, sf.spec.os.system.definition.files must be used -->
<path id="sf.spec.os.system.definition.files">
- <fileset dir="${sf.project.location}/" casesensitive="false">
- <include name="sysdefs/system_model.xml" />
+ <fileset dir="${sf.spec.systemdefinition.location}/" casesensitive="false">
+ <include name="${sf.spec.systemdefinition.filename}" />
</fileset>
</path>
-
- <path id="sf.spec.s60.system.definition.files">
- <fileset dir="${sf.project.location}/" casesensitive="false">
- <include name="sysdefs/system_model_s60.xml" />
- </fileset>
- </path>
<!-- iMaker config to be used by build-roms Helium target -->
<hlm:imakerconfigurationset id="imaker.rom.config">
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian4/single/public_override_props.ant.xml Tue Jul 13 12:21:44 2010 +0100
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+
+<project name="SF-PUBLIC-PROPS">
+
+ <dirname property="sf.spec.job.dir" file="${ant.file.SF-PUBLIC-PROPS}"/>
+ <property name="sf.suppress.buildenv.check" value="true" />
+ <property name="sf.suppress.drive.space.check" value="true" />
+ <property name="sf.drive.space.needed" value="40G"/>
+ <property name="sf.spec.job.drive" value="M:"/>
+
+ <!-- unpack prebuilt binaries and bom? if so from where? -->
+ <property name="sf.spec.baseline.enable" value="true" />
+ <property name="sf.spec.baseline.location" value="C:\PDK" />
+ <property name="sf.spec.baseline.getenv_options" value="-i emu -i prebuilt -i info -k" />
+
+ <!-- unpack tools? if so, from same location as baseline? -->
+ <property name="sf.spec.toolsbaseline.enable" value="true" />
+ <property name="sf.spec.toolsbaseline.location" value="${sf.spec.baseline.location}" />
+ <property name="sf.spec.toolsbaseline.getenv_options" value="-i tools -k" />
+
+ <!-- packaging options -->
+ <property name="sf.spec.package.src.enable" value="false" />
+ <property name="sf.spec.package.bin.enable" value="false" />
+
+ <!-- default build configurations -->
+ <property name="sf.spec.sbs.config" value="winscw_udeb.whatlog" />
+ <property name="sf.spec.sbs.tools.config" value="tools2.whatlog" />
+
+ <!-- default localisation variant -->
+ <property name="sf.spec.bldmefirst.s60.variant" value="engineering" />
+
+ <!-- prevent trying to access default SF servers -->
+ <property name="sf.spec.publish.enable" value="false" />
+ <property name="sf.spec.smoketest.enable" value="false" />
+ <property name="sf.spec.test.sendpkg.enable" value="false" />
+
+ <!-- public rnd binaries are in baseline.location, not from mercurial -->
+ <property name="sf.spec.sourcesync.sourcespecfile.rnd" value="nul:"/>
+
+ <!-- use sources defined in BOM as this will rebuild that PDK -->
+ <property name="sf.spec.sourcesync.sourcespecdir" value="${sf.spec.job.drive}\build_info\logs\BOM"/>
+ <property name="sf.spec.systemdefinition.location" value="${sf.spec.job.drive}\build_info\logs\BOM"/>
+</project>
--- a/symbian4/single/sources.csv Wed May 05 12:21:47 2010 +0100
+++ b/symbian4/single/sources.csv Tue Jul 13 12:21:44 2010 +0100
@@ -1,11 +1,5 @@
source,dst,type,pattern,sysdef
http://developer.symbian.org/oss/FCL/sftools/fbf/utilities/,/utilities,branch,default,
-//v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,default,
-//v800008/Builds01/mercurial_internal/rnd/rndonly/aricent/,/rnd/rndonly/aricent,branch,default,
-//v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,
-//v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,branch,default,
-//v800008/Builds01/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,branch,default,
-//v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,branch,default,
http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/app/browserui/,/sf/app/browserui,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/app/camera/,/sf/app/camera,branch,default,layers.sysdef.xml
@@ -18,8 +12,8 @@
http://developer.symbian.org/oss/FCL/sf/app/firsttimeuse/,/sf/app/firsttimeuse,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/app/helps/,/sf/app/helps,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/app/homescreen/,/sf/app/homescreen,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/app/imgeditor/,/sf/app/imgeditor,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/app/jrt/,/sf/app/jrt,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/internetradio/,/sf/app/internetradio,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/app/location/,/sf/app/location,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/app/messaging/,/sf/app/messaging,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/app/mmsharinguis/,/sf/app/mmsharinguis,branch,default,layers.sysdef.xml
@@ -27,17 +21,17 @@
http://developer.symbian.org/oss/FCL/sf/app/organizer/,/sf/app/organizer,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/app/phone/,/sf/app/phone,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/app/photos/,/sf/app/photos,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/podcatcher/,/sf/app/podcatcher,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/app/printing/,/sf/app/printing,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/app/radio/,/sf/app/radio,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/app/recents/,/sf/app/recents,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/app/settingsuis/,/sf/app/settingsuis,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/app/search/,/sf/app/search,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/app/techview/,/sf/app/techview,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/app/videoeditor/,/sf/app/videoeditor,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/app/videoplayer/,/sf/app/videoplayer,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/app/videotelephony/,/sf/app/videotelephony,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/app/webuis/,/sf/app/webuis,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/accesssec/,/sf/mw/accesssec,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/accesssec/,/sf/mw/accesssec,changeset,093cf0757204,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/mw/appinstall/,/sf/mw/appinstall,branch,default,modified-FCL
http://developer.symbian.org/oss/FCL/sf/mw/appsupport/,/sf/mw/appsupport,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/mw/browser/,/sf/mw/browser,branch,default,layers.sysdef.xml
@@ -47,6 +41,7 @@
http://developer.symbian.org/oss/FCL/sf/mw/dlnasrv/,/sf/mw/dlnasrv,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/mw/drm/,/sf/mw/drm,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/mw/gsprofilesrv/,/sf/mw/gsprofilesrv,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/gstreamer/,/sf/mw/gstreamer,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/mw/hapticsservices/,/sf/mw/hapticsservices,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/mw/hb/,/sf/mw/hb,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/mw/helix/,/sf/mw/helix,branch,default,layers.sysdef.xml
@@ -54,7 +49,7 @@
http://developer.symbian.org/oss/FCL/sf/mw/homescreensrv/,/sf/mw/homescreensrv,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/mw/homescreensrvlegacy/,/sf/mw/homescreensrvlegacy,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/mw/imghandling/,/sf/mw/imghandling,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/imsrv/,/sf/mw/imsrv,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/imsrv/,/sf/mw/imsrv,changeset,f4f0635530ce,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/mw/inputmethods/,/sf/mw/inputmethods,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/mw/ipappprotocols/,/sf/mw/ipappprotocols,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/mw/ipappsrv/,/sf/mw/ipappsrv,branch,default,layers.sysdef.xml
@@ -65,11 +60,9 @@
http://developer.symbian.org/oss/FCL/sf/mw/messagingmw/,/sf/mw/messagingmw,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/mw/metadatasrv/,/sf/mw/metadatasrv,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/mw/mmappfw/,/sf/mw/mmappfw,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/mmmw/,/sf/mw/mmmw,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/mmmw/,/sf/mw/mmmw,changeset,6f7ceef7b1d1,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/mw/netprotocols/,/sf/mw/netprotocols,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/networkingdm/,/sf/mw/networkingdm,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/opensrv/,/sf/mw/opensrv,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/platformthemes/,/sf/mw/platformthemes,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/platformthemes/,/sf/mw/platformthemes,changeset,28e8d4c0e55e,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/mw/phonesrv/,/sf/mw/phonesrv,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/mw/qt/,/sf/mw/qt,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/mw/qtextensions/,/sf/mw/qtextensions,branch,default,layers.sysdef.xml
@@ -90,6 +83,7 @@
http://developer.symbian.org/oss/FCL/sf/mw/videoutils/,/sf/mw/videoutils,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/mw/vpnclient/,/sf/mw/vpnclient,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/mw/web/,/sf/mw/web,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/webruntime/,/sf/mw/webruntime,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/mw/websrv/,/sf/mw/websrv,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/mw/wirelessacc/,/sf/mw/wirelessacc,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/os/boardsupport/,/sf/os/boardsupport,branch,default,layers.sysdef.xml
@@ -102,12 +96,12 @@
http://developer.symbian.org/oss/FCL/sf/os/graphics/,/sf/os/graphics,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/os/imagingext/,/sf/os/imagingext,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,default,modified-FCL
-http://developer.symbian.org/oss/FCL/sf/os/lbs/,/sf/os/lbs,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/lbs/,/sf/os/lbs,branch,default,modified-FCL
http://developer.symbian.org/oss/FCL/sf/os/mm/,/sf/os/mm,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/os/networkingsrv/,/sf/os/networkingsrv,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/os/ossrv/,/sf/os/ossrv,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/os/persistentdata/,/sf/os/persistentdata,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/security/,/sf/os/security,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/security/,/sf/os/security,changeset,dd83586b62d6,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/os/textandloc/,/sf/os/textandloc,branch,default,modified-FCL
http://developer.symbian.org/oss/FCL/sf/os/usb/,/sf/os/usb,branch,default,
http://developer.symbian.org/oss/FCL/sf/os/wlan/,/sf/os/wlan,branch,default,layers.sysdef.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian4/single/sources_bulk.csv Tue Jul 13 12:21:44 2010 +0100
@@ -0,0 +1,115 @@
+source,dst,type,pattern,sysdef
+http://developer.symbian.org/oss/FCL/sftools/fbf/utilities/,/utilities,branch,default,NON-NOKIA
+http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,branch,default,NON-NOKIA
+http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,branch,default,NON-NOKIA
+http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/browserui/,/sf/app/browserui,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/camera/,/sf/app/camera,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/commonemail/,/sf/app/commonemail,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/conntools/,/sf/app/conntools,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/contacts/,/sf/app/contacts,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/contentcontrol/,/sf/app/contentcontrol,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/devicecontrol/,/sf/app/devicecontrol,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/files/,/sf/app/files,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/firsttimeuse/,/sf/app/firsttimeuse,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/helps/,/sf/app/helps,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/homescreen/,/sf/app/homescreen,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/homescreentools/,/sf/app/homescreentools,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/jrt/,/sf/app/jrt,tag,S4_PDK_FIX,
+http://developer.symbian.org/oss/FCL/sf/app/internetradio/,/sf/app/internetradio,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/location/,/sf/app/location,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/messaging/,/sf/app/messaging,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/mmsharinguis/,/sf/app/mmsharinguis,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/musicplayer/,/sf/app/musicplayer,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/organizer/,/sf/app/organizer,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/phone/,/sf/app/phone,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/photos/,/sf/app/photos,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/podcatcher/,/sf/app/podcatcher,branch,default,NON-NOKIA
+http://developer.symbian.org/oss/FCL/sf/app/printing/,/sf/app/printing,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/radio/,/sf/app/radio,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/recents/,/sf/app/recents,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/rndtools/,/sf/app/rndtools,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/settingsuis/,/sf/app/settingsuis,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/search/,/sf/app/search,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/techview/,/sf/app/techview,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/videoplayer/,/sf/app/videoplayer,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/videotelephony/,/sf/app/videotelephony,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/webuis/,/sf/app/webuis,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/accesssec/,/sf/mw/accesssec,changeset,093cf0757204,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/appinstall/,/sf/mw/appinstall,tag,S4_PDK_FIX,
+http://developer.symbian.org/oss/FCL/sf/mw/appsupport/,/sf/mw/appsupport,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/browser/,/sf/mw/browser,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/btservices/,/sf/mw/btservices,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/camerasrv/,/sf/mw/camerasrv,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/classicui/,/sf/mw/classicui,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/dlnasrv/,/sf/mw/dlnasrv,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/drm/,/sf/mw/drm,tag,S4_PDK_FIX,
+http://developer.symbian.org/oss/FCL/sf/mw/gsprofilesrv/,/sf/mw/gsprofilesrv,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/gstreamer/,/sf/mw/gstreamer,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/hapticsservices/,/sf/mw/hapticsservices,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/hb/,/sf/mw/hb,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/helix/,/sf/mw/helix,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/hgwidgets/,/sf/mw/hgwidgets,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/homescreensrv/,/sf/mw/homescreensrv,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/homescreensrvlegacy/,/sf/mw/homescreensrvlegacy,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/imghandling/,/sf/mw/imghandling,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/imsrv/,/sf/mw/imsrv,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/inputmethods/,/sf/mw/inputmethods,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/ipappprotocols/,/sf/mw/ipappprotocols,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/ipappsrv/,/sf/mw/ipappsrv,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/ipconnmgmt/,/sf/mw/ipconnmgmt,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/legacypresence/,/sf/mw/legacypresence,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/locationsrv/,/sf/mw/locationsrv,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/mds/,/sf/mw/mds,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/messagingmw/,/sf/mw/messagingmw,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/metadatasrv/,/sf/mw/metadatasrv,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/mmappfw/,/sf/mw/mmappfw,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/mmmw/,/sf/mw/mmmw,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/netprotocols/,/sf/mw/netprotocols,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/networkingdm/,/sf/mw/networkingdm,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/platformthemes/,/sf/mw/platformthemes,changeset,28e8d4c0e55e,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/platformtools/,/sf/mw/platformtools,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/phonesrv/,/sf/mw/phonesrv,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/qt/,/sf/mw/qt,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/qtextensions/,/sf/mw/qtextensions,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/remoteconn/,/sf/mw/remoteconn,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/remotemgmt/,/sf/mw/remotemgmt,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/searchsrv/,/sf/mw/searchsrv,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/securitysrv/,/sf/mw/securitysrv,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/serviceapi/,/sf/mw/serviceapi,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/serviceapifw/,/sf/mw/serviceapifw,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/shortlinkconn/,/sf/mw/shortlinkconn,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/srvdiscovery/,/sf/mw/srvdiscovery,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/svgt/,/sf/mw/svgt,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/uiaccelerator/,/sf/mw/uiaccelerator,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/uiresources/,/sf/mw/uiresources,tag,S4_PDK_FIX,
+http://developer.symbian.org/oss/FCL/sf/mw/uitools/,/sf/mw/uitools,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/usbservices/,/sf/mw/usbservices,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/videoutils/,/sf/mw/videoutils,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/vpnclient/,/sf/mw/vpnclient,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/web/,/sf/mw/web,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/webruntime/,/sf/mw/webruntime,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/websrv/,/sf/mw/websrv,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/wirelessacc/,/sf/mw/wirelessacc,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/boardsupport/,/sf/os/boardsupport,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/bt/,/sf/os/bt,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/buildtools/,/sf/os/buildtools,tag,S4_PDK_FIX,
+http://developer.symbian.org/oss/FCL/sf/os/cellularsrv/,/sf/os/cellularsrv,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/commsfw/,/sf/os/commsfw,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,tag,S4_PDK_FIX,
+http://developer.symbian.org/oss/FCL/sf/os/devicesrv/,/sf/os/devicesrv,tag,tip_bulk,modified-FCL
+http://developer.symbian.org/oss/FCL/sf/os/graphics/,/sf/os/graphics,tag,S4_PDK_FIX,
+http://developer.symbian.org/oss/FCL/sf/os/imagingext/,/sf/os/imagingext,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,tag,tip_bulk,modified-FCL
+http://developer.symbian.org/oss/FCL/sf/os/lbs/,/sf/os/lbs,tag,S4_PDK_FIX,
+http://developer.symbian.org/oss/FCL/sf/os/mm/,/sf/os/mm,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/networkingsrv/,/sf/os/networkingsrv,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/ossrv/,/sf/os/ossrv,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/persistentdata/,/sf/os/persistentdata,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/security/,/sf/os/security,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/textandloc/,/sf/os/textandloc,tag,S4_PDK_FIX,
+http://developer.symbian.org/oss/FCL/sf/os/usb/,/sf/os/usb,tag,tip_bulk,
+http://developer.symbian.org/oss/FCL/sf/os/wlan/,/sf/os/wlan,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/xmlsrv/,/sf/os/xmlsrv,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/osrndtools/,/sf/os/osrndtools,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,tag,tip_bulk,layers.sysdef.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian4/single/sources_good.csv Tue Jul 13 12:21:44 2010 +0100
@@ -0,0 +1,115 @@
+source,dst,type,pattern,sysdef
+http://developer.symbian.org/oss/FCL/sftools/fbf/utilities/,/utilities,branch,default,
+http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,changeset,eea8496efb72,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/browserui/,/sf/app/browserui,changeset,b0dd75e285d2,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/camera/,/sf/app/camera,changeset,3075d9b614e6,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/commonemail/,/sf/app/commonemail,changeset,61b206842ac4,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/conntools/,/sf/app/conntools,changeset,e2b83f60b858,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/contacts/,/sf/app/contacts,changeset,e1c7b0febd15,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/contentcontrol/,/sf/app/contentcontrol,changeset,1a3f0bca12c6,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/devicecontrol/,/sf/app/devicecontrol,changeset,54ba37861e52,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/files/,/sf/app/files,changeset,edd66bde63a4,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/firsttimeuse/,/sf/app/firsttimeuse,changeset,de24d9012ff7,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/helps/,/sf/app/helps,changeset,d67f854a44b4,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/homescreen/,/sf/app/homescreen,changeset,11a8fa9275d5,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/jrt/,/sf/app/jrt,changeset,98ccebc37403,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/internetradio/,/sf/app/internetradio,changeset,3f2d53f144fe,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/location/,/sf/app/location,changeset,0ff2917a90c9,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/messaging/,/sf/app/messaging,changeset,e4592d119491,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/mmsharinguis/,/sf/app/mmsharinguis,changeset,ccd8e69b5392,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/musicplayer/,/sf/app/musicplayer,changeset,13da8b4dd996,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/organizer/,/sf/app/organizer,changeset,c690c592b381,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/phone/,/sf/app/phone,changeset,14cdbae33453,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/photos/,/sf/app/photos,changeset,e7ef9a1d6228,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/podcatcher/,/sf/app/podcatcher,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/printing/,/sf/app/printing,changeset,2275db202402,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/radio/,/sf/app/radio,changeset,6bac020dcc51,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/recents/,/sf/app/recents,changeset,7a485daed50d,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/settingsuis/,/sf/app/settingsuis,changeset,23411a3be0db,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/search/,/sf/app/search,changeset,6396153a6cef,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/techview/,/sf/app/techview,changeset,8b7f4ea6a3e2,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/videoplayer/,/sf/app/videoplayer,changeset,9b6761e5bd30,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/videotelephony/,/sf/app/videotelephony,changeset,d9b6a8729acd,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/webuis/,/sf/app/webuis,changeset,f427d27b98d8,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/accesssec/,/sf/mw/accesssec,changeset,093cf0757204,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/appinstall/,/sf/mw/appinstall,changeset,4a49a8c90306,modified-FCL
+http://developer.symbian.org/oss/FCL/sf/mw/appsupport/,/sf/mw/appsupport,changeset,b3552d9d77dd,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/browser/,/sf/mw/browser,changeset,fa475d6462b2,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/btservices/,/sf/mw/btservices,changeset,19bd632b5100,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/camerasrv/,/sf/mw/camerasrv,changeset,69c8bb60738b,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/classicui/,/sf/mw/classicui,changeset,75713bee6484,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/dlnasrv/,/sf/mw/dlnasrv,changeset,b39000d0fc2e,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/drm/,/sf/mw/drm,changeset,d52881f84eaa,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/gsprofilesrv/,/sf/mw/gsprofilesrv,changeset,7e4c5a2ff1a2,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/gstreamer/,/sf/mw/gstreamer,changeset,6f340f756486,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/hapticsservices/,/sf/mw/hapticsservices,changeset,8e4f1d643852,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/hb/,/sf/mw/hb,changeset,06ff229162e9,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/helix/,/sf/mw/helix,changeset,97fc67555abc,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/hgwidgets/,/sf/mw/hgwidgets,changeset,49c70dcc3f17,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/homescreensrv/,/sf/mw/homescreensrv,changeset,4bc7b118b3df,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/homescreensrvlegacy/,/sf/mw/homescreensrvlegacy,changeset,d98565035bbe,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/imghandling/,/sf/mw/imghandling,changeset,b790c5b3d11f,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/imsrv/,/sf/mw/imsrv,changeset,56a17d4c96b8,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/inputmethods/,/sf/mw/inputmethods,changeset,9ee990de1aa7,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/ipappprotocols/,/sf/mw/ipappprotocols,changeset,bfe1f539b721,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/ipappsrv/,/sf/mw/ipappsrv,changeset,b25d6a5c0a63,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/ipconnmgmt/,/sf/mw/ipconnmgmt,changeset,d840bfde7d40,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/legacypresence/,/sf/mw/legacypresence,changeset,4fbcea97e97b,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/locationsrv/,/sf/mw/locationsrv,changeset,4c4ed41530db,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/mds/,/sf/mw/mds,changeset,8e4539ab1889,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/messagingmw/,/sf/mw/messagingmw,changeset,d6ba66e59a81,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/metadatasrv/,/sf/mw/metadatasrv,changeset,2f3d90acec5a,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/mmappfw/,/sf/mw/mmappfw,changeset,cbb1bfb7ebfb,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/mmmw/,/sf/mw/mmmw,changeset,2ed61feeead6,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/netprotocols/,/sf/mw/netprotocols,changeset,cb0c8a2aff2d,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/networkingdm/,/sf/mw/networkingdm,changeset,3dc1d4daf349,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/platformthemes/,/sf/mw/platformthemes,changeset,28e8d4c0e55e,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/phonesrv/,/sf/mw/phonesrv,changeset,5c9f230baf1b,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/qt/,/sf/mw/qt,changeset,79de32ba3296,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/qtextensions/,/sf/mw/qtextensions,changeset,453da2cfceef,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/remoteconn/,/sf/mw/remoteconn,changeset,a5c0bb5018eb,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/remotemgmt/,/sf/mw/remotemgmt,changeset,2c8580950a26,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/searchsrv/,/sf/mw/searchsrv,changeset,6c1a2771f4b7,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/securitysrv/,/sf/mw/securitysrv,changeset,098e361762d2,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/serviceapi/,/sf/mw/serviceapi,changeset,eaf3908907b6,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/serviceapifw/,/sf/mw/serviceapifw,changeset,7aa6007702af,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/shortlinkconn/,/sf/mw/shortlinkconn,changeset,6743bfee309e,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/srvdiscovery/,/sf/mw/srvdiscovery,changeset,e84a4b44b2e8,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/svgt/,/sf/mw/svgt,changeset,4c62338e03c8,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/uiaccelerator/,/sf/mw/uiaccelerator,changeset,6ce30188c5bf,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/uiresources/,/sf/mw/uiresources,changeset,06048d7260fc,modified-FCL
+http://developer.symbian.org/oss/FCL/sf/mw/uitools/,/sf/mw/uitools,changeset,eb091c0ad3c1,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/usbservices/,/sf/mw/usbservices,changeset,e96dd2dcf774,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/videoutils/,/sf/mw/videoutils,changeset,fbe6578feb8b,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/vpnclient/,/sf/mw/vpnclient,changeset,5aacbb121f34,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/web/,/sf/mw/web,changeset,92a765b5b3e7,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/webruntime/,/sf/mw/webruntime,changeset,36b93dc584b9,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/websrv/,/sf/mw/websrv,changeset,abb636afedf7,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/wirelessacc/,/sf/mw/wirelessacc,changeset,6480c77e38d0,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/boardsupport/,/sf/os/boardsupport,changeset,cf4c5641c6dd,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/bt/,/sf/os/bt,changeset,5e5528a288fe,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/buildtools/,/sf/os/buildtools,changeset,e04be45adff8,modified-FCL
+http://developer.symbian.org/oss/FCL/sf/os/cellularsrv/,/sf/os/cellularsrv,changeset,8767c6acf334,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/commsfw/,/sf/os/commsfw,changeset,8fc8de15e664,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,changeset,cf2e20ee4073,modified-FCL
+http://developer.symbian.org/oss/FCL/sf/os/devicesrv/,/sf/os/devicesrv,changeset,bc3132b47c8e,modified-FCL
+http://developer.symbian.org/oss/FCL/sf/os/graphics/,/sf/os/graphics,changeset,511d0a99d8bd,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/imagingext/,/sf/os/imagingext,changeset,2a4841e86abf,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,changeset,57eea1054f46,modified-FCL
+http://developer.symbian.org/oss/FCL/sf/os/lbs/,/sf/os/lbs,changeset,1ed175a5c849,modified-FCL
+http://developer.symbian.org/oss/FCL/sf/os/mm/,/sf/os/mm,changeset,72dc595b34a8,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/networkingsrv/,/sf/os/networkingsrv,changeset,e8d041006974,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/ossrv/,/sf/os/ossrv,changeset,8aa38fd255c2,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/persistentdata/,/sf/os/persistentdata,changeset,d6ef85bc5971,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/security/,/sf/os/security,changeset,970c0057d9bc,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/textandloc/,/sf/os/textandloc,changeset,ca9e7f922e8b,modified-FCL
+http://developer.symbian.org/oss/FCL/sf/os/usb/,/sf/os/usb,changeset,7f84d52cdf22,
+http://developer.symbian.org/oss/FCL/sf/os/wlan/,/sf/os/wlan,changeset,629e60dfa279,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/xmlsrv/,/sf/os/xmlsrv,changeset,ed3155dbd163,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/osrndtools/,/sf/os/osrndtools,changeset,67c6ff54ec25,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,changeset,2905910218db,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,changeset,bb16bb5b2818,modified-FCL
+http://developer.symbian.org/oss/FCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,changeset,d04d7e544e14,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/homescreentools/,/sf/app/homescreentools,changeset,4b17811f5f53,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/platformtools/,/sf/mw/platformtools,changeset,fb7380a082a0,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/rndtools/,/sf/app/rndtools,changeset,4f2773374eff,layers.sysdef.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian4/single/sources_rnd.csv Tue Jul 13 12:21:44 2010 +0100
@@ -0,0 +1,7 @@
+source,dst,type,pattern,sysdef
+//v800008/Builds01/mercurial_internal/rnd/rndonly/aricent/,/rnd/rndonly/aricent,branch,default,
+//v800008/Builds01/mercurial_internal/rnd/rndonly/ibm/,/rnd/rndonly/ibm,branch,default,
+//v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,
+//v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,branch,default,
+//v800008/Builds01/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,branch,default,
+//v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,branch,default,
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian4/single/sources_surge.csv Tue Jul 13 12:21:44 2010 +0100
@@ -0,0 +1,115 @@
+source,dst,type,pattern,sysdef
+http://developer.symbian.org/oss/FCL/sftools/fbf/utilities/,/utilities,branch,default,
+http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,branch,GCC_SURGE,modified-FCL
+http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/browserui/,/sf/app/browserui,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/camera/,/sf/app/camera,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/commonemail/,/sf/app/commonemail,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/conntools/,/sf/app/conntools,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/contacts/,/sf/app/contacts,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/contentcontrol/,/sf/app/contentcontrol,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/devicecontrol/,/sf/app/devicecontrol,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/files/,/sf/app/files,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/firsttimeuse/,/sf/app/firsttimeuse,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/helps/,/sf/app/helps,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/homescreen/,/sf/app/homescreen,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/homescreentools/,/sf/app/homescreentools,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/jrt/,/sf/app/jrt,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/internetradio/,/sf/app/internetradio,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/location/,/sf/app/location,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/messaging/,/sf/app/messaging,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/mmsharinguis/,/sf/app/mmsharinguis,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/musicplayer/,/sf/app/musicplayer,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/organizer/,/sf/app/organizer,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/phone/,/sf/app/phone,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/photos/,/sf/app/photos,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/podcatcher/,/sf/app/podcatcher,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/printing/,/sf/app/printing,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/radio/,/sf/app/radio,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/recents/,/sf/app/recents,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/rndtools/,/sf/app/rndtools,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/settingsuis/,/sf/app/settingsuis,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/search/,/sf/app/search,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/techview/,/sf/app/techview,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/videoplayer/,/sf/app/videoplayer,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/videotelephony/,/sf/app/videotelephony,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/webuis/,/sf/app/webuis,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/accesssec/,/sf/mw/accesssec,changeset,093cf0757204,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/appinstall/,/sf/mw/appinstall,branch,GCC_SURGE,modified-FCL
+http://developer.symbian.org/oss/FCL/sf/mw/appsupport/,/sf/mw/appsupport,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/browser/,/sf/mw/browser,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/btservices/,/sf/mw/btservices,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/camerasrv/,/sf/mw/camerasrv,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/classicui/,/sf/mw/classicui,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/dlnasrv/,/sf/mw/dlnasrv,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/drm/,/sf/mw/drm,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/gsprofilesrv/,/sf/mw/gsprofilesrv,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/gstreamer/,/sf/mw/gstreamer,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/hapticsservices/,/sf/mw/hapticsservices,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/hb/,/sf/mw/hb,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/helix/,/sf/mw/helix,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/hgwidgets/,/sf/mw/hgwidgets,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/homescreensrv/,/sf/mw/homescreensrv,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/homescreensrvlegacy/,/sf/mw/homescreensrvlegacy,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/imghandling/,/sf/mw/imghandling,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/imsrv/,/sf/mw/imsrv,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/inputmethods/,/sf/mw/inputmethods,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/ipappprotocols/,/sf/mw/ipappprotocols,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/ipappsrv/,/sf/mw/ipappsrv,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/ipconnmgmt/,/sf/mw/ipconnmgmt,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/legacypresence/,/sf/mw/legacypresence,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/locationsrv/,/sf/mw/locationsrv,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/mds/,/sf/mw/mds,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/messagingmw/,/sf/mw/messagingmw,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/metadatasrv/,/sf/mw/metadatasrv,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/mmappfw/,/sf/mw/mmappfw,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/mmmw/,/sf/mw/mmmw,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/netprotocols/,/sf/mw/netprotocols,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/networkingdm/,/sf/mw/networkingdm,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/platformthemes/,/sf/mw/platformthemes,changeset,28e8d4c0e55e,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/platformtools/,/sf/mw/platformtools,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/phonesrv/,/sf/mw/phonesrv,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/qt/,/sf/mw/qt,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/qtextensions/,/sf/mw/qtextensions,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/remoteconn/,/sf/mw/remoteconn,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/remotemgmt/,/sf/mw/remotemgmt,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/searchsrv/,/sf/mw/searchsrv,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/securitysrv/,/sf/mw/securitysrv,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/serviceapi/,/sf/mw/serviceapi,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/serviceapifw/,/sf/mw/serviceapifw,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/shortlinkconn/,/sf/mw/shortlinkconn,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/srvdiscovery/,/sf/mw/srvdiscovery,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/svgt/,/sf/mw/svgt,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/uiaccelerator/,/sf/mw/uiaccelerator,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/uiresources/,/sf/mw/uiresources,branch,GCC_SURGE,modified-FCL
+http://developer.symbian.org/oss/FCL/sf/mw/uitools/,/sf/mw/uitools,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/usbservices/,/sf/mw/usbservices,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/videoutils/,/sf/mw/videoutils,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/vpnclient/,/sf/mw/vpnclient,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/web/,/sf/mw/web,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/webruntime/,/sf/mw/webruntime,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/websrv/,/sf/mw/websrv,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/wirelessacc/,/sf/mw/wirelessacc,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/boardsupport/,/sf/os/boardsupport,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/bt/,/sf/os/bt,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/buildtools/,/sf/os/buildtools,branch,GCC_SURGE,modified-FCL
+http://developer.symbian.org/oss/FCL/sf/os/cellularsrv/,/sf/os/cellularsrv,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/commsfw/,/sf/os/commsfw,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,GCC_SURGE,modified-FCL
+http://developer.symbian.org/oss/FCL/sf/os/devicesrv/,/sf/os/devicesrv,branch,GCC_SURGE,modified-FCL
+http://developer.symbian.org/oss/FCL/sf/os/graphics/,/sf/os/graphics,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/imagingext/,/sf/os/imagingext,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,GCC_SURGE,modified-FCL
+http://developer.symbian.org/oss/FCL/sf/os/lbs/,/sf/os/lbs,branch,GCC_SURGE,modified-FCL
+http://developer.symbian.org/oss/FCL/sf/os/mm/,/sf/os/mm,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/networkingsrv/,/sf/os/networkingsrv,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/osrndtools/,/sf/os/osrndtools,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/ossrv/,/sf/os/ossrv,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/persistentdata/,/sf/os/persistentdata,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/security/,/sf/os/security,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/textandloc/,/sf/os/textandloc,branch,GCC_SURGE,modified-FCL
+http://developer.symbian.org/oss/FCL/sf/os/usb/,/sf/os/usb,branch,GCC_SURGE,
+http://developer.symbian.org/oss/FCL/sf/os/wlan/,/sf/os/wlan,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/xmlsrv/,/sf/os/xmlsrv,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,branch,GCC_SURGE,layers.sysdef.xml
--- a/symbian4/single/sysdefs/auto/model_20100407133037_5ae8e73210e8.xml Wed May 05 12:21:47 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9276 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a package or prebuilt -->
-<!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) "N"
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile may someday be removed in favour of mrp -->
-<!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="low mw high">
-<block name="stubs" level="high" long-name="Stubs" levels="stub">
-<collection name="s60_stubs" level="stub">
-<component name="audiostubs" long-name="Audio Stubs">
-<unit bldFile="adaptation/stubs/audiostubs/group"/>
-</component>
-<component name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaptation Stub">
-<unit bldFile="adaptation/stubs/btaudioadaptation_stub/group"/>
-</component>
-<component name="drm_stubs" long-name="DRM Stubs">
-<unit bldFile="adaptation/stubs/drm_stubs/group"/>
-</component>
-<component name="ocrsrv_stub" long-name="OCR Services Stub">
-<unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
-</component>
-<component name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation">
-<unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
-</component>
-<component name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" plugin="Y">
-<unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
-</component>
-<component name="srsfenginestub" long-name="SRSF Engine Stub">
-<unit bldFile="adaptation/stubs/srsfenginestub/group"/>
-</component>
-<component name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub">
-<unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
-</component>
-<component name="systemswstubs" long-name="System Software Stubs">
-<unit bldFile="adaptation/stubs/systemswstubs/group"/>
-</component>
-<component name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" plugin="Y">
-<unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
-</component>
-<component name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub">
-<unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
-<collection name="omap3530" long-name="OMAP 3530" level="hw-if">
-<component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530" mrp="adaptation/beagleboard/omap3530/base_beagle.mrp"/>
-</component>
-<component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/kernel"/>
-</component>
-<component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/beagleboard"/>
-</component>
-</collection>
-</block>
-<block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
-<collection name="qemu_baseport" long-name="Baseport" level="hw-if">
-<component name="syborg" long-name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/qemu/baseport/syborg" mrp="adaptation/qemu/baseport/syborg/syborg.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
-<collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
-<component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
-<unit bldFile="os/kernelhwsrv/brdbootldr/ubootldr" mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
-</component>
-</collection>
-<collection name="bsptemplate" long-name="Board Support Package Template" level="hw-if">
-<component name="asspandvariant" long-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 name="kernel" long-name="Kernel Architecture" level="adaptation">
-<component name="eka" long-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 name="kerneltest" long-name="Kernel Test" level="hw-if">
-<component name="e32utils" long-name="E32 Utilities" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32utils/group" mrp="os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/>
-</component>
-<component name="e32test" long-name="E32 Tests" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32test/group" mrp="os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
-</component>
-<component name="f32test" long-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 name="ldds" long-name="Logical Device Drivers" level="adaptation">
-<component name="ethernetldd" long-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 name="audioldd" long-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>
-<component name="serialldd" long-name="Serial Port Drivers" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
-</component>
-<component name="legacydrivers" long-name="Legacy Drivers" purpose="optional">
-<unit mrp="os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
-</component>
-<component name="locmedia" long-name="Local Media Subsystem" introduced="8.1b" purpose="mandatory">
-<!-- these are LDDs for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
-</component>
-<component name="runmodedebugger" long-name="Run Mode Debugger" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/debug/group" mrp="os/kernelhwsrv/kernel/eka/drivers/debug/group/base_e32_drivers_debug.mrp"/>
-</component>
-<component name="btrace" long-name="Kernel Trace Tool" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/trace" mrp="os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
-</component>
-<component name="cameraldd" long-name="Camera Drivers" introduced="^3" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/camerasc" mrp="os/kernelhwsrv/kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
-</component>
-<component name="displayldd" long-name="Display Drivers" introduced="^3" purpose="optional">
-<!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/display" mrp="os/kernelhwsrv/kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
-</component>
-<component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
-</component>
-<component name="usbdescriptors" long-name="USB Descriptors" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors" mrp="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors/base_drivers_usbdescriptors.mrp"/>
-</component>
-<component name="usbdi_utils" long-name="USB DI Utils" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils" mrp="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils/base_drivers_usbdi_utils.mrp"/>
-</component>
-</collection>
-<collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
-<component name="mediadrivers" long-name="Media Drivers" purpose="optional">
-<!-- these are for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/media" mrp="os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
-</component>
-<component name="genericboardsupport" long-name="Generic Board Support" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
-</component>
-</collection>
-<collection name="userlibandfileserver" long-name="User Library and File Server" level="framework">
-<component name="euser" long-name="User Library" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/euser" mrp="os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
-</component>
-<component name="compsupp" long-name="Compiler Runtime Support" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/compsupp" mrp="os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
-</component>
-<component name="fileserver" long-name="File Server" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
-</component>
-<component name="estart" long-name="Base Starter" filter="gt" purpose="optional">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
-</component>
-<component name="domainmgr" long-name="Domain Manager" introduced="8.1b" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
-</component>
-</collection>
-<collection name="filesystems" long-name="File Systems" level="framework">
-<component name="romfs" long-name="ROM File System" filter="gt" purpose="optional" plugin="Y">
-<unit mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
-</component>
-<component name="rofs" long-name="ROFS" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
-</component>
-<component name="usbmsfs" long-name="USB Mass Storage File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
-</component>
-<component name="usbhostmssrv" long-name="USB Host Mass Storage Server" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage/base_f32_shostmassstorage.mrp"/>
-</component>
-<component name="fat32fs" long-name="FAT32 File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
-</component>
-<component name="fatfs" long-name="FAT File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
-</component>
-<component name="compfs" long-name="Composite File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
-</component>
-</collection>
-<collection name="halservices" long-name="HAL Services" level="framework">
-<component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
-<unit bldFile="os/kernelhwsrv/halservices/hal" mrp="os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
-</component>
-</collection>
-<collection name="textmodeshell" long-name="Text Mode Shell" level="test">
-<component name="e32wsrv" long-name="Text Window Server" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/ewsrv" mrp="os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
-</component>
-<component name="textshell" long-name="Text Shell" filter="gt" purpose="development">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
-</component>
-</collection>
-<collection name="baseapitest" long-name="Base API Tests" level="test"/>
-<collection name="kernelhwsrv_info" long-name="Kernel and Hardware Services Info" level="test">
-<component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 config">
-<collection name="emulator" long-name="Emulator" level="bsp">
-<component name="emulatorbsp" long-name="Emulator BSP" purpose="optional">
-<unit bldFile="os/boardsupport/emulator/emulatorbsp" mrp="os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
-</component>
-</collection>
-<collection name="haitest" long-name="HAI Test Suites" level="test">
-<component name="bspsvs" long-name="BSP Verification Suite" introduced="^2" purpose="development">
-<unit mrp="os/boardsupport/haitest/bspsvs/group/bspsvs.mrp"/>
-</component>
-</collection>
-<collection name="boardsupport_info" long-name="Board Support Info" level="config">
-<component name="boardsupport_metadata" long-name="Board Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/boardsupport/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
-<collection name="bldsystemtools" long-name="Build System Tools" level="bld">
-<component name="sysdeftools" long-name="System Definition Tools" purpose="development" introduced="^2">
-<unit mrp="os/buildtools/bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
-</component>
-<component name="commonbldutils" long-name="Common Utils" purpose="development">
-<unit mrp="os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
-</component>
-</collection>
-<collection name="toolsandutils" long-name="Tools and Utils" level="mw">
-<component name="productionbldtools" long-name="Production Build Tools" filter="gt" purpose="development">
-<unit mrp="os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
-</component>
-<component name="e32tools" long-name="E32 Tools" deprecated="^2" purpose="development" class="PC">
-<unit bldFile="os/buildtools/toolsandutils/e32tools/group" mrp="os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
-</component>
-<component name="autotest" long-name="Autotest" purpose="development">
-<unit bldFile="os/buildtools/toolsandutils/autotest/group" mrp="os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
-</component>
-</collection>
-<collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
-<component name="e32toolp" long-name="E32 Perl Tools" purpose="development" filter="sf_build" class="PC">
-<unit mrp="os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="os/buildtools/sbsv1_os/e32toolp/group"/>
-</component>
-</collection>
-<collection name="imgtools_os" long-name="Image Tools" level="fw">
-<component name="romkiteka2" long-name="ROMKIT EKA2" deprecated="^2" purpose="development">
-<unit bldFile="os/buildtools/imgtools_os/romkiteka2/group" mrp="os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
-</component>
-</collection>
-<collection name="misccomponents" long-name="Misc Components" level="mw">
-<component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt" purpose="development">
-<unit bldFile="os/buildtools/misccomponents/emulatorlauncher/group" mrp="os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
-</component>
-</collection>
-<collection name="buildtools_info" long-name="Build Tools Info" level="ui">
-<component name="buildtools_metadata" long-name="Build Tools Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/buildtools/buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
-<collection name="ossrv_pub" long-name="Generic OS Services Public Interfaces" level="utilities">
-<component name="boost_apis" long-name="Boost APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/boost_apis/group"/>
-</component>
-<component name="cpp_wrappers" long-name="Cpp wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cpp_wrappers/group"/>
-</component>
-<component name="character_type_apis" long-name="Character Type APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/character_type_apis/group"/>
-</component>
-<component name="compiler_specific_runtime_support" long-name="Compiler Specific Runtime Support" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/compiler_specific_runtime_support/group"/>
-</component>
-<component name="ossrv_configuration_api" long-name="Generic OS Services Configuration API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/configuration/group"/>
-</component>
-<component name="crypto_authentication_codes_and_hash_functions_api" long-name="Crypto Authentication Codes and Hash Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
-</component>
-<component name="crypto_auxillary_functions_api" long-name="Crypto Auxillary Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_auxillary_functions_api/group"/>
-</component>
-<component name="crypto_certificates_api" long-name="Crypto Certificates API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_certificates_api/group"/>
-</component>
-<component name="crypto_inputoutput_and_data_encoding_api" long-name="Crypto Input/Output and Data Encoding API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
-</component>
-<component name="crypto_public_key_cryptography_and_key_agreement_api" long-name="Crypto Public Key Cryptography and Key Agreement API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
-</component>
-<component name="crypto_symmetric_ciphers_api" long-name="Crypto Symmetric Ciphers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_symmetric_ciphers_api/group"/>
-</component>
-<component name="crypto_utility_functions_api" long-name="Crypto Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_utility_functions_api/group"/>
-</component>
-<component name="cryptogaphy_related_api" long-name="Cryptogaphy Related API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cryptogaphy_related_api/group"/>
-</component>
-<component name="ossrv_debug_api" long-name="Generic OS Services Debug API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/debug/group"/>
-</component>
-<component name="ossrv_exceptions_api" long-name="Generic OS Services Exceptions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/exceptions/group"/>
-</component>
-<component name="gboxed" long-name="GBoxed API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gboxed/group"/>
-</component>
-<component name="glib_arrays" long-name="Glib Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_arrays/group"/>
-</component>
-<component name="glib_asynchronous_queues" long-name="Glib Asynchronous Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_asynchronous_queues/group"/>
-</component>
-<component name="glib_atomic_operations" long-name="Glib Atomic Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_atomic_operations/group"/>
-</component>
-<component name="glib_automatic_string_completion" long-name="Glib Automatic String Completion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_automatic_string_completion/group"/>
-</component>
-<component name="glib_balanced_binary_trees" long-name="Glib Balanced Binary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_balanced_binary_trees/group"/>
-</component>
-<component name="glib_basic_types" long-name="Glib Basic Types API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_basic_types/group"/>
-</component>
-<component name="glib_caches" long-name="Glib Caches API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_caches/group"/>
-</component>
-<component name="glib_character_set_conversion" long-name="Glib Character Set Conversion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_character_set_conversion/group"/>
-</component>
-<component name="glib_closures" long-name="Glib Closures API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_closures/group"/>
-</component>
-<component name="glib_commandline_option_parser" long-name="Glib Command Line Option Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_commandline_option_parser/group"/>
-</component>
-<component name="glib_datasets" long-name="Glib Datasets API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_datasets/group"/>
-</component>
-<component name="glib_date_and_time_functions" long-name="Glib Date and Time Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_date_and_time_functions/group"/>
-</component>
-<component name="glib_doubleended_queues" long-name="Glib Double-ended Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doubleended_queues/group"/>
-</component>
-<component name="glib_doublylinked_lists" long-name="Glib Doubly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doublylinked_lists/group"/>
-</component>
-<component name="glib_dynamic_loading_of_modules" long-name="Glib Dynamic Loading of Modules API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_dynamic_loading_of_modules/group"/>
-</component>
-<component name="glib_enums_and_flags" long-name="Glib Enums and Flags API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_enums_and_flags/group"/>
-</component>
-<component name="glib_error_reporting" long-name="Glib Error Reporting API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_error_reporting/group"/>
-</component>
-<component name="glib_file_utilities" long-name="Glib File Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_file_utilities/group"/>
-</component>
-<component name="glib_generic_values" long-name="Glib Generic Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_generic_values/group"/>
-</component>
-<component name="glib_globstyle_pattern_matching" long-name="Glib Glob-Style Pattern Matching API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_globstyle_pattern_matching/group"/>
-</component>
-<component name="glib_hash_tables" long-name="Glib Hash Tables API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hash_tables/group"/>
-</component>
-<component name="glib_hook_functions" long-name="Glib Hook Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hook_functions/group"/>
-</component>
-<component name="glib_internationalization" long-name="Glib Internationalization API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_internationalization/group"/>
-</component>
-<component name="glib_io_channels" long-name="Glib I/O Channels API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_io_channels/group"/>
-</component>
-<component name="glib_keyvalue_file_parser" long-name="Glib Key-Value File Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_keyvalue_file_parser/group"/>
-</component>
-<component name="glib_lexical_scanner" long-name="Glib Lexical Scanner API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_lexical_scanner/group"/>
-</component>
-<component name="glib_main_event_loop" long-name="Glib Main Event Loop API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_main_event_loop/group"/>
-</component>
-<component name="glib_memory_allocation" long-name="Glib Memory Allocation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_allocation/group"/>
-</component>
-<component name="glib_memory_slices" long-name="Glib Memory Slices API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_slices/group"/>
-</component>
-<component name="glib_message_logging" long-name="Glib Message Logging API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_message_logging/group"/>
-</component>
-<component name="glib_miscellaneous_utility_functions" long-name="Glib Miscellaneous Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_miscellaneous_utility_functions/group"/>
-</component>
-<component name="glib_nary_trees" long-name="Glib N-ary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_nary_trees/group"/>
-</component>
-<component name="glib_parameters_and_values" long-name="Glib Parameters and Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_parameters_and_values/group"/>
-</component>
-<component name="glib_quarks" long-name="Glib Quarks API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_quarks/group"/>
-</component>
-<component name="glib_random_numbers" long-name="Glib Random Numbers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_random_numbers/group"/>
-</component>
-<component name="glib_relations_and_tuples" long-name="Glib Relations and Tuples API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_relations_and_tuples/group"/>
-</component>
-<component name="glib_shellrelated_utilities" long-name="Glib Shell-related Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_shellrelated_utilities/group"/>
-</component>
-<component name="glib_signals" long-name="Glib Signals API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_signals/group"/>
-</component>
-<component name="glib_simple_xml_subset_parser" long-name="Glib Simple XML Subset Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_simple_xml_subset_parser/group"/>
-</component>
-<component name="glib_singlylinked_lists" long-name="Glib Singly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_singlylinked_lists/group"/>
-</component>
-<component name="glib_spawning_processes" long-name="Glib Spawning Processes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_spawning_processes/group"/>
-</component>
-<component name="glib_standard_macros" long-name="Glib Standard Macros API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_standard_macros/group"/>
-</component>
-<component name="glib_string_utility_functions" long-name="Glib String Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_string_utility_functions/group"/>
-</component>
-<component name="glib_strings" long-name="Glib Strings API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_strings/group"/>
-</component>
-<component name="glib_thread_pools" long-name="Glib Thread Pools API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_thread_pools/group"/>
-</component>
-<component name="glib_threads" long-name="Glib Threads API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_threads/group"/>
-</component>
-<component name="glib_timers" long-name="Glib Timers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_timers/group"/>
-</component>
-<component name="glib_unicode_manipulation" long-name="Glib Unicode Manipulation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_unicode_manipulation/group"/>
-</component>
-<component name="glib_value_arrays" long-name="Glib Value Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_value_arrays/group"/>
-</component>
-<component name="glib_varargs_value_collection" long-name="Glib Varargs Value Collection API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_varargs_value_collection/group"/>
-</component>
-<component name="gobject" long-name="GObject API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gobject/group"/>
-</component>
-<component name="gparamspec" long-name="GParamSpec API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gparamspec/group"/>
-</component>
-<component name="gtype" long-name="GType API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtype/group"/>
-</component>
-<component name="gtypemodule" long-name="GTypeModule API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypemodule/group"/>
-</component>
-<component name="gtypeplugin" long-name="GTypePlugin API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypeplugin/group"/>
-</component>
-<component name="io_stream_api" long-name="I/O stream API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/io_stream_api/group"/>
-</component>
-<component name="localization_function_api" long-name="Localization Function API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/localization_function_api/group"/>
-</component>
-<component name="math_operations_api" long-name="Math Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/math_operations_api/group"/>
-</component>
-<component name="ossrv_memory_api" long-name="Generic OS Services Memory API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/memory/group"/>
-</component>
-<component name="no_namespace_headers" long-name="No Namespace Headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/no_namespace_headers/group"/>
-</component>
-<component name="openc_headers" long-name="OpenC headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_headers/group"/>
-</component>
-<component name="openc_wrappers" long-name="OpenC wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_wrappers/group"/>
-</component>
-<component name="ssl_general_api" long-name="SSL General API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_general_api/group"/>
-</component>
-<component name="ssl_protocol_methods_api" long-name="SSL Protocol Methods API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_protocol_methods_api/group"/>
-</component>
-<component name="standard_compressiondecompression_api" long-name="Standard Compression/Decompression API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/standard_compressiondecompression_api/group"/>
-</component>
-<component name="stl" long-name="STL API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/stl/group"/>
-</component>
-<component name="thread_api" long-name="Thread API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/thread_api/group"/>
-</component>
-<component name="type_attributes" long-name="Type Attributes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/type_attributes/group"/>
-</component>
-<component name="typeinfo" long-name="Type Info API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/typeinfo/group"/>
-</component>
-<component name="utility_apis" long-name="Utility APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/utility_apis/group"/>
-</component>
-<component name="wide_character_classapis" long-name="Wide character class/apis" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/wide_character_classapis/group"/>
-</component>
-<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">
-<unit bldFile="os/ossrv/ossrv_pub/dbus-glib/group"/>
-</component>
-</collection>
-<collection name="ossrv_plat" long-name="Generic OS Services Platform Interfaces" level="utilities">
-<component name="libutils_apis" long-name="Utility Library APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_plat/libutils/group"/>
-</component>
-</collection>
-<collection name="stdlibs" long-name="Standard Libraries" level="translation">
-<component name="libz" filter="s60" long-name="Z Compression Library">
-<unit bldFile="os/ossrv/stdlibs/libz/group"/>
-</component>
-<component name="libcrypt" filter="s60" long-name="Crypt Library">
-<unit bldFile="os/ossrv/stdlibs/libcrypt/group"/>
-</component>
-</collection>
-<collection name="ssl" long-name="SSL" level="data-services">
-<component name="libcrypto" filter="s60" long-name="Crypto Library">
-<unit bldFile="os/ossrv/ssl/libcrypto/group"/>
-</component>
-<component name="libssl" filter="s60" purpose="development" long-name="SSL Library">
-<unit bldFile="os/ossrv/ssl/libssl/group"/>
-</component>
-</collection>
-<collection name="glib" long-name="GLib" level="utilities">
-<component name="glibbackend" filter="s60" long-name="GLib Backend">
-<unit bldFile="os/ossrv/glib/build/symbian/glibbackend/group"/>
-<!-- Move to here: <unit bldFile="glib/glibbackend/group"/> -->
-</component>
-<component name="libglib" filter="s60" long-name="GLib Library">
-<unit bldFile="os/ossrv/glib/build/symbian/glib/group"/>
-<!-- Move to here: <unit bldFile="glib/libglib/group"/> -->
-</component>
-<component name="libgthread" filter="s60" long-name="Libg Thread">
-<unit bldFile="os/ossrv/glib/build/symbian/gthread/group"/>
-<!-- Move to here: <unit bldFile="glib/libgthread/group"/> -->
-</component>
-<component name="libgmodule" filter="s60" long-name="Libg Module">
-<unit bldFile="os/ossrv/glib/build/symbian/gmodule/group"/>
-<!-- Move to here: <unit bldFile="glib/libgmodule/group"/> -->
-</component>
-<component name="libgobject" filter="s60" long-name="Libg Object">
-<unit bldFile="os/ossrv/glib/build/symbian/gobject/group"/>
-<!-- Move to here: <unit bldFile="glib/libgobject/group"/> -->
-</component>
-</collection>
-<collection name="stdcpp" long-name="C++ Standard Library" level="translation">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="stdcpp_build" filter="s60" long-name="Stdcpp">
-<unit bldFile="os/ossrv/stdcpp/group"/>
-</component>
-</collection>
-<collection name="ofdbus" long-name="Open Foundation D-Bus" level="utilities">
-<component name="dbus" filter="s60" long-name="D-Bus">
-<unit bldFile="os/ossrv/ofdbus/dbus/group"/>
-</component>
-<component name="dbus-glib" filter="s60" long-name="D-Bus GLib">
-<unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
-</component>
-<component name="ofdbus_rom" filter="s60" long-name="D-Bus ROM">
-<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory
- Consider moving IBY file to one of the above as well and removing this component entirely -->
-<unit bldFile="os/ossrv/ofdbus/group"/>
-</component>
-</collection>
-<collection name="utilitylibraries" long-name="Utility Libraries" level="encoding">
-<component name="libutils" filter="s60" long-name="Utility Library">
-<unit bldFile="os/ossrv/utilitylibraries/libutils/group"/>
-</component>
-</collection>
-<collection name="genericservices" long-name="Generic Services" level="utilities">
-<component name="s60compatibilityheaders" long-name="S60 Compatibility Headers" filter="gt" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp" version="tb101sf"/>
-</component>
-<component name="mimerecognitionfw" long-name="MIME Recognition Framework" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/mimerecognitionfw/group" mrp="os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
-</component>
-<component name="systemagent" long-name="System Agent" introduced="9.0" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/systemagent/group" mrp="os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
-</component>
-<component name="taskscheduler" long-name="Task Scheduler" introduced="6.0" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/taskscheduler/group" mrp="os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
-</component>
-<component name="activebackupclient" long-name="Active Backup Client" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/activebackupclient/group" mrp="os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
-</component>
-<component name="syslibsdocs" long-name="Syslibs Documentation" purpose="development" class="doc">
-<unit mrp="os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
-</component>
-<component name="httputils" long-name="HTTP Utilities Library" introduced="6.2" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/httputils/group" mrp="os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
-</component>
-</collection>
-<collection name="syslibsapitest" long-name="SysLibs API Tests" level="utilities"/>
-<collection name="compressionlibs" long-name="Compression Libraries" level="data-services">
-<component name="ziplib" long-name="Zip Compression Library" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/ossrv/compressionlibs/ziplib/group" mrp="os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
-</component>
-</collection>
-<collection name="genericopenlibs" long-name="Generic Open Libraries" level="translation">
-<component name="cstdlib" long-name="C Standard Library" introduced="ER5" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/cstdlib/group" mrp="os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
-</component>
-<component name="cppstdlib" long-name="C++ Standard Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/cppstdlib/group" mrp="os/ossrv/genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
-</component>
-<component name="openenvcore" long-name="Open Environment Core" introduced="^2" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/openenvcore/group" mrp="os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
-</component>
-<component name="pluggableauthenticationmodulefw" long-name="Pluggable Authentication Module Framework" introduced="^4" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/pluggableauthenticationmodulefw/group" mrp="os/ossrv/genericopenlibs/pluggableauthenticationmodulefw/group/oeaddons_libpam.mrp"/>
-</component>
-<component name="posixrealtimeextensions" long-name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/posixrealtimeextensions/group" mrp="os/ossrv/genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
-</component>
-<component name="liboil" long-name="Liboil" introduced="^4" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/liboil/group" mrp="os/ossrv/genericopenlibs/liboil/group/oeaddons_liboil.mrp"/>
-</component>
-</collection>
-<collection name="lowlevellibsandfws" long-name="Low Level Libraries and Frameworks" level="app-libs">
-<component name="pluginfw" long-name="Plugin Framework" introduced="6.2" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp" version="3"/>
-</component>
-<component name="apputils" long-name="Application Utilities" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/apputils/group" mrp="os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
-</component>
-<component name="genericusabilitylib" long-name="Generic Usability Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/genericusabilitylib/group" mrp="os/ossrv/lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
-</component>
-</collection>
-<collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
-<component name="ossrv_build" filter="s60" long-name="Generic OS Services Build">
-<!-- exports should be moved to individual components -->
-<unit bldFile="os/ossrv/group"/>
-</component>
-<component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="featuremgmt" long-name="Feature Management" level="framework">
-<component name="featuremgr" long-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 name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/persistentdata/featuremgmt/featureregistry/group" mrp="os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
-</component>
-</collection>
-<collection name="loggingservices" long-name="Logging Services" level="server">
-<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">
-<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">
-<unit bldFile="os/persistentdata/loggingservices/rfilelogger/group" mrp="os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
-</component>
-</collection>
-<collection name="traceservices" long-name="Trace Services" level="server">
-<component name="commsdebugutility" long-name="Comms Debug Utility" introduced="7.0s" purpose="optional">
-<unit bldFile="os/persistentdata/traceservices/commsdebugutility/group" mrp="os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
-</component>
-<component name="tracefw" long-name="Trace Framework" introduced="9.2" purpose="development">
-<unit bldFile="os/persistentdata/traceservices/tracefw/ulogger/group" mrp="os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
-</component>
-</collection>
-<collection name="persistentstorage" long-name="Persistent Storage" level="framework">
-<component name="store" long-name="Store" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/store/group" mrp="os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
-</component>
-<component name="dbms" long-name="DBMS" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/dbms/group" mrp="os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
-</component>
-<component name="centralrepository" long-name="Central Repository" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/persistentdata/persistentstorage/centralrepository/group" mrp="os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
-</component>
-<component name="sql" long-name="SQL" introduced="9.3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sql/GROUP" mrp="os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
-</component>
-<component name="sqlite3api" long-name="SQLite 3 API" introduced="^3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sqlite3api/GROUP" mrp="os/persistentdata/persistentstorage/sqlite3api/GROUP/syslibs_sqlite3.mrp"/>
-</component>
-</collection>
-<collection name="persistentdata_info" long-name="Persistent Data Services Info" level="app-if">
-<component name="persistentdata_metadata" long-name="Persistent Data Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/persistentdata/persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
-<component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
-</component>
-<component name="common_platform_security_definitions_api" long-name="Common Platform Security Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group"/>
-</component>
-<component name="feature_discovery_api" long-name="Feature Discovery API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/group"/>
-</component>
-<component name="platform_environment_api" long-name="Platform Environment API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_environment_api/group"/>
-</component>
-<component name="sensor_channel_api" long-name="Sensor Channel API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_channel_api/group"/>
-</component>
-<component name="sensor_definitions_api" long-name="Sensor Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_definitions_api/group"/>
-</component>
-<component name="version_info_api" long-name="Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/group"/>
-</component>
-<component name="accessory_monitoring_api" long-name="Accessory Monitoring API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/group"/>
-</component>
-<component name="haptics_api" long-name="Haptics API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/haptics_api/group"/>
-</component>
-<component name="sensor_data_compensator_api" long-name="Sensor Data Compensator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
-</component>
-</collection>
-<collection name="devicesrv_plat" long-name="Device Services Platform Interfaces" level="app-if">
-<component name="configuration_file_parser_api" long-name="Configuration File Parser API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/configuration_file_parser_api/group"/>
-</component>
-<component name="dos_extension_plugin_api" long-name="DOS Extension Plug-In API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_plugin_api/group"/>
-</component>
-<component name="mediator_command_initiator_api" long-name="Mediator Command Initiator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_initiator_api/group"/>
-</component>
-<component name="syslangutil_api" long-name="SysLangUtil API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/syslangutil_api/group"/>
-</component>
-<component name="wakeup_alarm_api" long-name="Wakeup Alarm API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/wakeup_alarm_api/group"/>
-</component>
-<component name="disk_and_memory_level_keys_api" long-name="Disk and Memory Level Keys API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_and_memory_level_keys_api/group"/>
-</component>
-<component name="mediator_plugin_api" long-name="Mediator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_plugin_api/group"/>
-</component>
-<component name="headset_status_api" long-name="Headset Status API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/headset_status_api/group"/>
-</component>
-<component name="system_startup_extension_plugin_api" long-name="System Startup Extension Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/system_startup_extension_plugin_api/group"/>
-</component>
-<component name="sensor_plugin_api" long-name="Sensor Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_plugin_api/group"/>
-</component>
-<component name="accessory_api" long-name="Accessory API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_api/group"/>
-</component>
-<component name="display_language_definition_api" long-name="Display Language Definition API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/display_language_definition_api/group"/>
-</component>
-<component name="mediator_command_responder_api" long-name="Mediator Command Responder API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_responder_api/group"/>
-</component>
-<component name="accessory_policy_definitions_api" long-name="Accessory Policy Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_definitions_api/group"/>
-</component>
-<component name="hw_settings_api" long-name="Hardware Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/hw_settings_api/group"/>
-</component>
-<component name="mediator_domain_definitions_api" long-name="Mediator Domain Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_domain_definitions_api/group"/>
-</component>
-<component name="sensor_extension_api" long-name="Sensor Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_extension_api/group"/>
-</component>
-<component name="accessory_plugin_api" long-name="Accessory Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_plugin_api/group"/>
-</component>
-<component name="sae_api" long-name="SAE API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sae_api/group"/>
-</component>
-<component name="accessory_control_api" long-name="Accessory Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_control_api/group"/>
-</component>
-<component name="mediator_static_registration_api" long-name="Mediator Static Registration API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_static_registration_api/group"/>
-</component>
-<component name="accessory_key_event_handling_api" long-name="Accessory Key Event Handling API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_key_event_handling_api/group"/>
-</component>
-<component name="mediator_notification_api" long-name="Mediator Notification API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_notification_api/group"/>
-</component>
-<component name="accessory_policy_utility_api" long-name="Accessory Policy Utility API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_utility_api/group"/>
-</component>
-<component name="common_dsy_plugin_api" long-name="Common DSY Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/common_dsy_plugin_api/group"/>
-</component>
-<component name="remote_control_extension_api" long-name="Remote Control Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/remote_control_extension_api/group"/>
-</component>
-<component name="sensor_channel_filter_api" long-name="Sensor Channel Filter API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_channel_filter_api/group"/>
-</component>
-<component name="dos_extension_api" long-name="DOS Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_api/group"/>
-</component>
-<component name="accessory_audio_control_api" long-name="Accessory Audio Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_audio_control_api/group"/>
-</component>
-<component name="mediator_event_consumer_api" long-name="Mediator Event Consumer API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_consumer_api/group"/>
-</component>
-<component name="shared_data_api" long-name="Shared Data API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/shared_data_api/group"/>
-</component>
-<component name="accessory_settings_api" long-name="Accessory Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_settings_api/group"/>
-</component>
-<component name="accessory_bluetooth_control_api" long-name="Accessory Bluetooth Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_bluetooth_control_api/group"/>
-</component>
-<component name="extended_version_info_api" long-name="Extended Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_api/group"/>
-</component>
-<component name="mediator_event_provider_api" long-name="Mediator Event Provider API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_provider_api/group"/>
-</component>
-<component name="tv_out_config_api" long-name="TV Out Config API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_config_api/group"/>
-</component>
-<component name="tspclientmapper_api" long-name="TSP Client Mapper API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tspclientmapper_api/group"/>
-</component>
-<component name="powersave_api" long-name="Power Save API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_api/group"/>
-</component>
-<component name="powersave_definitions_api" long-name="Power Save Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_definitions_api/group"/>
-</component>
-<component name="powersave_plugin_api" long-name="Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_plugin_api/group"/>
-</component>
-<component name="extended_version_info_plugin_api" long-name="Extended Version Info Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_plugin_api/group"/>
-</component>
-<component name="haptics_plugin_api" long-name="Haptics Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_plugin_api/group"/>
-</component>
-<component name="haptics_effect_data_getter_plugin_api" long-name="Haptics Effect Data Getter Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
-</component>
-<component name="haptics_packetizer_plugin_api" long-name="Haptics Packetizer Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_packetizer_plugin_api/group"/>
-</component>
-<component name="tiltcompensation_api" long-name="Tilt Compensation API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tiltcompensation_api/group"/>
-</component>
-<component name="disk_notification_handler_api" long-name="Disk Notification Handler API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_notification_handler_api/group"/>
-</component>
-<component name="accessory_policy_usb_audio_api" long-name="Accessory Policy USB Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_usb_audio_api/group"/>
-</component>
-<component name="accessory_policy_hdmi_audio_api" long-name="Accessory Policy HDMI Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_hdmi_audio_api/group"/>
-</component>
-<component name="sensor_data_compensator_plugin_api" long-name="Sensor Data Compensator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
-</component>
-<component name="ddc_access_api" long-name="DDC Access API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/ddc_access_api/group"/>
-</component>
-<component name="tv_out_behaviour_api" long-name="TV Out Behaviour API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_behaviour_api/group"/>
-</component>
-</collection>
-<collection name="accessoryservices" long-name="Accessory Services" level="framework">
-<component name="accessorymonitor" filter="s60" long-name="Accessory Monitor">
-<unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/group"/>
-</component>
-<component name="accessoryremotecontrol" filter="s60" long-name="Accessory Remote Control">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
-</component>
-<component name="accessoryserver" filter="s60" long-name="Accessory Server">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryserver/group"/>
-</component>
-<component name="pluggeddisplay" filter="s60" long-name="Plugged Display" introduced="^3">
-<unit bldFile="os/devicesrv/accessoryservices/pluggeddisplay/group"/>
-</component>
-<component name="headsetstatusapi" filter="s60" long-name="Headset Status API">
-<unit bldFile="os/devicesrv/accessoryservices/headsetstatusapi/group"/>
-</component>
-<component name="tspclientmapper" filter="s60" long-name="TSP Client Mapper">
-<unit bldFile="os/devicesrv/accessoryservices/tspclientmapper/group"/>
-</component>
-<component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional">
-<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
-</component>
-<component name="gid_pc_tool" filter="s60" long-name="Generic ID PC Tool" class="tool PC">
-<unit bldFile="os/devicesrv/accessoryservices/gid_pc_tool/group"/>
-</component>
-</collection>
-<collection name="commonservices" long-name="Common Services" level="app-if">
-<component name="commonengine" filter="s60" long-name="Common Engine">
-<unit bldFile="os/devicesrv/commonservices/commonengine/group"/>
-</component>
-<component name="commonengineresources" filter="s60" long-name="Common Engine Resources" class="config">
-<unit bldFile="os/devicesrv/commonservices/commonengineresources/group"/>
-</component>
-<component name="platformenv" filter="s60" long-name="Platform Environment">
-<unit bldFile="os/devicesrv/commonservices/platformenv/group"/>
-</component>
-<component name="sysutil" long-name="System Utilities" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/sysutil/group" mrp="os/devicesrv/commonservices/sysutil/group/sysutil.mrp"/>
-</component>
-<component name="activitymanager" long-name="Activity Manager" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/activitymanager/group" mrp="os/devicesrv/commonservices/activitymanager/group/activitymanager.mrp"/>
-</component>
-</collection>
-<collection name="dosservices" long-name="Domestic Operating System Services" level="hw-if">
-<component name="commondsy" filter="s60" long-name="Common DSY" plugin="Y">
-<unit bldFile="os/devicesrv/dosservices/commondsy/group"/>
-</component>
-<component name="dosserver" filter="s60" long-name="Domestic OS Server">
-<unit bldFile="os/devicesrv/dosservices/dosserver/group"/>
-</component>
-</collection>
-<collection name="sensorservices" long-name="Sensor Services" level="framework">
-<component name="sensorserver" filter="s60" long-name="Sensor Server">
-<unit bldFile="os/devicesrv/sensorservices/sensorserver/group"/>
-</component>
-<component name="orientationssy" filter="s60" long-name="Orientation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/orientationssy/group"/>
-</component>
-<component name="tiltcompensationssy" filter="s60" long-name="Tilt Compensation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/tiltcompensationssy/group"/>
-</component>
-<component name="sensordatacompensator" filter="s60" long-name="Sensor Data Compensator">
-<unit bldFile="os/devicesrv/sensorservices/sensordatacompensator/group"/>
-</component>
-</collection>
-<collection name="hwrmhaptics" long-name="HWRM Haptics" level="plugin">
-<component name="hapticseffectdatagetterfw" filter="s60" long-name="Haptics Effect Data Getter Framework">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
-</component>
-<component name="hapticspluginservice" filter="s60" long-name="Haptics Plugin Service">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
-</component>
-<component name="hapticspacketizer" filter="s60" long-name="Haptics Packetizer">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
-</component>
-<component name="hapticspluginmanager" filter="s60" long-name="Haptics Plugin Manager">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
-</component>
-<component name="hapticsserver" filter="s60" long-name="Haptics Server">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsserver/group"/>
-</component>
-<component name="hapticsclient" filter="s60" long-name="Haptics Client">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsclient/group"/>
-</component>
-<component name="hwrmhaptics_build" filter="s60" long-name="HWRM Haptics Build">
-<!-- move these exports into the appropriate above components and delete this component-->
-<unit bldFile="os/devicesrv/hwrmhaptics/group"/>
-</component>
-</collection>
-<collection name="mediator" long-name="Mediator" level="app-if">
-<!--collection is really a component. Move it down a directory -->
-<component name="mediator_build" filter="s60" long-name="Mediator Build">
-<unit bldFile="os/devicesrv/mediator/group"/>
-</component>
-</collection>
-<collection name="psmservices" long-name="Power Save Mode Services" level="app-if">
-<component name="psmserver" filter="s60" long-name="PSM Server">
-<unit bldFile="os/devicesrv/psmservices/psmserver/group"/>
-</component>
-</collection>
-<collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
-<component name="hwrmfmtxwatcherplugin" filter="s60" long-name="HWRM FM Transmitter Watcher Plugin" plugin="Y">
-<unit bldFile="os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
-</component>
-<component name="hwrmtargetmodifierplugin" filter="s60" long-name="HWRM Target Modifier Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build,
- may need to -->
-<!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
-</component>
-<component name="vibractrl" filter="s60" long-name="Vibra Control" deprecated="9.1">
-<unit bldFile="os/devicesrv/resourcemgmt/vibractrl/group"/>
-</component>
-<component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="^2" purpose="optional">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
-</component>
-<component name="hwresourcesmgrconfig" long-name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
-</component>
-<component name="resourcemgmt_build" filter="s60" long-name="Resource Management Build">
-<!-- Move exports to a self-contained component.
- This needs to be kept around until configuration is in place -->
-<unit bldFile="os/devicesrv/resourcemgmt/group"/>
-</component>
-<component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
-</component>
-</collection>
-<collection name="sysstatemgmt" long-name="System State Management" level="server">
-<component name="ssmmapperutility" filter="s60" long-name="SSM Mapper Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmmapperutility/group"/>
-</component>
-<component name="ssmpolicyplugins" filter="s60" long-name="SSM Policy Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmpolicyplugins/group"/>
-</component>
-<component name="ssmutilityplugins" filter="s60" long-name="SSM Utility Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmutilityplugins/group"/>
-</component>
-<component name="ssmcmdlists" filter="s60" long-name="SSM Command Lists" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcmdlists/group"/>
-</component>
-<component name="ssmcustcmds" filter="s60" long-name="SSM Custom Commands" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcustcmds/group"/>
-</component>
-<component name="syslangutil" filter="s60" long-name="System Language Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/syslangutil/group"/>
-</component>
-<component name="sysrestart" filter="s60" long-name="System Restart" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysrestart/group"/>
-</component>
-<component name="sysuiprovider" filter="s60" long-name="System UI Provider" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysuiprovider/group"/>
-</component>
-<component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/group" mrp="os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
-</component>
-<component name="systemstatemgr" long-name="System State Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
-</component>
-<component name="systemstateplugins" long-name="System State Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
-</component>
-<component name="systemstatereferenceplugins" long-name="System State Reference Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
-</component>
-</collection>
-<collection name="resourceinterfaces" long-name="Resource Interfaces" level="hw-if">
-<component name="fmtransmittercontrol" long-name="FM Transmitter Control" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group" mrp="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
-</component>
-</collection>
-<collection name="systemhealthmanagement" long-name="System Health Management" level="server">
-<component name="systemhealthmgr" long-name="System Health Manager" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
-</component>
-</collection>
-<collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if"/>
-<collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
-<component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
-<collection name="authorisation" long-name="Authorisation" level="utilities">
-<component name="userpromptservice" long-name="User Prompt Service" introduced="^3" purpose="mandatory">
-<unit bldFile="os/security/authorisation/userpromptservice/group" mrp="os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
-</component>
-<component name="userpromptutils" long-name="User Prompt Utils" introduced="^3" purpose="optional">
-<unit bldFile="os/security/authorisation/userpromptutils/group" mrp="os/security/authorisation/userpromptutils/group/security_ups_utils.mrp"/>
-</component>
-</collection>
-<collection name="contentmgmt" long-name="Content Management" level="utilities">
-<component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
-<unit bldFile="os/security/contentmgmt/contentaccessfwfordrm/group" mrp="os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
-</component>
-<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">
-<unit bldFile="os/security/crypto/weakcryptospi/group" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
-</component>
-<component name="strongcryptospi" long-name="Strong Crypto SPI" filter="gt" introduced="^3" purpose="optional">
-<unit bldFile="os/security/crypto/weakcryptospi/strong" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
-</component>
-</collection>
-<collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
-<component name="securityutils" long-name="Security Utils" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/securityutils/group" mrp="os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
-</component>
-<component name="securitydocs" long-name="Security Documentation" purpose="development" class="doc">
-<unit mrp="os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
-</component>
-<component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
-</component>
-<component name="securitycommonutils" long-name="Security Common Utils" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/security/cryptomgmtlibs/securitycommonutils/group" mrp="os/security/cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
-</component>
-</collection>
-<collection name="securityanddataprivacytools" long-name="Security and Data Privacy Tools" level="services">
-<component name="securityconfig" long-name="Security Config" introduced="9.1" purpose="optional">
-<unit bldFile="os/security/securityanddataprivacytools/securityconfig/group" mrp="os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
-</component>
-<component name="securitytools" long-name="Security Tools" introduced="^3" purpose="optional" class="PC">
-<unit bldFile="os/security/securityanddataprivacytools/securitytools/group" mrp="os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
-</component>
-</collection>
-<collection name="cryptoplugins" long-name="Crypto Plugins" level="plugins">
-<component name="cryptospiplugins" long-name="Crypto SPI Plugins" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/security/cryptoplugins/cryptospiplugins/group" mrp="os/security/cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
-</component>
-</collection>
-<collection name="cryptoservices" long-name="Crypto Services" level="plugins">
-<component name="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/certificateandkeymgmt/group" mrp="os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
-</component>
-<component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
-</component>
-<component name="browserrootcertificates" long-name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
-<unit mrp="os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
-</component>
-<component name="rootcertificates" filter="sf_build" long-name="Root Certificates" introduced="7.0s" purpose="optional">
-<!-- not in S60 codebase -->
-<unit bldFile="os/security/cryptoservices/rootcertificates/group" mrp="os/security/cryptoservices/rootcertificates/group/rootcerts.mrp"/>
-</component>
-<component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/asnpkcs/group" mrp="os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
-</component>
-</collection>
-<collection name="security_info" long-name="OS Security Info" level="utilities">
-<component name="security_metadata" long-name="OS Security Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/security/security_info/security_metadata/security_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
-<collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
-<component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
-</component>
-<component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
-</component>
-<component name="simulationpositioningmodule" long-name="Simulation Positioning Module" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
-</component>
-<component name="gpspositioningmodule" long-name="GPS/A-GPS Positioning Module" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/gpspositioningmodule/group" mrp="os/lbs/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
-</component>
-<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>
-</collection>
-<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
-<component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
-</component>
-</collection>
-<collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
-<component name="locationserver" long-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 name="networkrequesthandler" long-name="Network Request Handler" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
-</component>
-</collection>
-<collection name="lbstest" long-name="Locating Services Tests" level="application-interface">
-<component name="locationprotocoltest" long-name="Location Protocol Tests" introduced="9.2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/lbstest/locationprotocoltest/group" mrp="os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
-</component>
-</collection>
-<collection name="locationmgmt" long-name="Location Management" level="management">
-<component name="locmonitor" long-name="Location Monitor" introduced="^3" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
-</component>
-<component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/agpslocationmgr/group" mrp="os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
-</component>
-<component name="networklocationmgr" long-name="Network Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/networklocationmgr/group" mrp="os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
-</component>
-<component name="locationcore" long-name="Location Core" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locationcore/group" mrp="os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
-</component>
-<component name="networkgateway" long-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 name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
-<component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
-</component>
-<component name="suplproxyprotocolmodule" long-name="SUPL Proxy Protocol Module" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
-</component>
-<component name="suplprotocolmodule" long-name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/networkprotocolmodules/suplprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
-</component>
-<component name="suplrrlpasn1" filter="sf_build" long-name="SUPL RRLP ASN1 Parser">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
-</component>
-<component name="suplrrlpprotocol" filter="sf_build" long-name="SUPL RRLP Protocol Module">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/group"/>
-</component>
-</collection>
-<collection name="lbsapitest" long-name="Location API Tests" level="application-interface"/>
-<collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
-<component name="lbs_metadata" long-name="Locating Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commsfw" level="services" long-name="Communications Framework" levels="server support framework process app-if">
-<collection name="commsprocess" long-name="Comms Process" level="process">
-<component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/commsfw/commsprocess/commsrootserverconfig/group" mrp="os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
-</component>
-</collection>
-<collection name="commsconfig" long-name="Comms Config" level="process">
-<component name="commsdatabase" long-name="Comms Database" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
-</component>
-<component name="commsdatabaseshim" long-name="Comms Database Shim" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/commsfw/commsconfig/commsdatabaseshim/group" mrp="os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
-</component>
-</collection>
-<collection name="datacommsserver" long-name="Data Comms Server" level="framework">
-<component name="esockserver" long-name="ESock Server" purpose="mandatory">
-<unit bldFile="os/commsfw/datacommsserver/esockserver/group" mrp="os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp" version="3"/>
-</component>
-<component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/group" mrp="os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
-</component>
-<component name="networkingdialogstub" long-name="Networking Dialog Stub" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/default" mrp="os/commsfw/datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
-</component>
-<component name="networkcontroller" long-name="Network Controller" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/datacommsserver/networkcontroller/group" mrp="os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
-</component>
-</collection>
-<collection name="serialserver" long-name="Serial Server" level="server">
-<component name="serialportcsy" long-name="Serial Port CSY" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/serialserver/serialportcsy" mrp="os/commsfw/serialserver/serialportcsy/ser-comms_serialportcsy.mrp"/>
-</component>
-<component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" purpose="development">
-<unit bldFile="os/commsfw/serialserver/packetloopbackcsy/group" mrp="os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
-</component>
-<component name="c32serialserver" long-name="C32 Serial Server" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/commsfw/serialserver/c32serialserver/group" mrp="os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
-</component>
-<component name="c32serialserverconfig" long-name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config">
-<unit bldFile="os/commsfw/serialserver/c32serialserverconfig" mrp="os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
-</component>
-<component name="c32serialserverdocs" long-name="C32 Serial Server Documentation" purpose="development" class="doc">
-<unit mrp="os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
-</component>
-</collection>
-<collection name="commsfwutils" long-name="Comms Framework Utilities" level="framework">
-<component name="commsbufs" long-name="Comms Buffers" introduced="^3" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwutils/commsbufs/group" mrp="os/commsfw/commsfwutils/commsbufs/group/comms-infras_commsbufs.mrp"/>
-</component>
-</collection>
-<collection name="commsfw_info" long-name="Comms Framework Info" level="app-if">
-<component name="commsinfrastructuredocs" long-name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
-<unit mrp="os/commsfw/commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
-</component>
-<component name="commsfw_metadata" long-name="Communications Framework Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/commsfw/commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
-</component>
-</collection>
-<collection name="commsfwsupport" long-name="Comms Framework Support" level="support">
-<component name="commselements" long-name="Comms Elements" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwsupport/commselements/group" mrp="os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
-</component>
-</collection>
-<collection name="commsinfrastructureapitest" long-name="Comms-Infras API Tests" level="app-if">
-<component name="commsinfrastructuresvs" long-name="Comms Infrastructure Verification Suite" introduced="^3" purpose="development">
-<unit mrp="os/commsfw/commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
-</component>
-</collection>
-<collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
-<component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
-</component>
-<component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" purpose="mandatory" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
-</component>
-<component name="commstools" long-name="Comms Tools" introduced="^3" purpose="development" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/commstools/group" mrp="os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
-</component>
-</collection>
-</block>
-<block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
-<component name="internetsockets" long-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>
-<collection name="tcpiputils" long-name="TCP/IP Utilities" level="plugin">
-<component name="dnd" long-name="DND" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/dnd/group" mrp="os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
-</component>
-<component name="dhcp" long-name="DHCP" introduced="8.0" purpose="optional">
-<unit bldFile="os/networkingsrv/tcpiputils/dhcp/group" mrp="os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
-</component>
-<component name="networkaddressandporttranslation" long-name="Network Address and Port Translation" introduced="^2" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
-</component>
-<component name="punycodeconv" long-name="Punycode Converter" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/punycodeconv/group" mrp="os/networkingsrv/tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
-</component>
-</collection>
-<collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
-<component name="nullagt" long-name="NULL AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/nullagt/group" mrp="os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
-</component>
-<component name="genericscprparameters" long-name="Generic SCPR Parameters" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/linklayercontrol/genericscprparameters/group" mrp="os/networkingsrv/linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
-</component>
-<component name="mbmsparameters" long-name="MBMS Parameters" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/mbmsparameters/group" mrp="os/networkingsrv/linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
-</component>
-<component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
-<unit bldFile="os/networkingsrv/linklayercontrol/networkinterfacemgr/group" mrp="os/networkingsrv/linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp" version="2"/>
-</component>
-</collection>
-<collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
-<component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
-</component>
-<component name="pppnif" long-name="PPP NIF" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/pppnif/group" mrp="os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp" version="2"/>
-</component>
-<component name="slipnif" long-name="SLIP NIF" purpose="development" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/slipnif/group" mrp="os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
-</component>
-<component name="tunnelnif" long-name="Tunnel NIF" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
-</component>
-</collection>
-<collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
-<component name="packetlogger" long-name="Packet Logger" introduced="8.1" purpose="development">
-<unit bldFile="os/networkingsrv/linklayerutils/packetlogger/group" mrp="os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
-</component>
-</collection>
-<collection name="networkcontrol" long-name="Network Control" level="plugin">
-<component name="qoslib" long-name="QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/qoslib/group" mrp="os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
-</component>
-<component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/pfqoslib/group" mrp="os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
-</component>
-<component name="qosfwprt" long-name="QoS Framework PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
-</component>
-<component name="qosipscpr" long-name="QoS IP SCPR" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosipscpr/group" mrp="os/networkingsrv/networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
-</component>
-<component name="ipnetworklayer" long-name="IP Network Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/ipnetworklayer/group" mrp="os/networkingsrv/networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
-</component>
-<component name="iptransportlayer" long-name="IP Transport Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/iptransportlayer/group" mrp="os/networkingsrv/networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
-</component>
-<component name="commsuserpromptmgr" long-name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkcontrol/commsuserpromptmgr/group" mrp="os/networkingsrv/networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
-</component>
-</collection>
-<collection name="networkprotocols" long-name="Network Protocols" level="plugin">
-<component name="ipeventnotifier" long-name="IP Event Notifier" introduced="8.1" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
-</component>
-<component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
-</component>
-<component name="iphook" long-name="IP Hook" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
-</component>
-<component name="mobileip" long-name="Mobile IP" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/mobileip/group" mrp="os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
-</component>
-<component name="dnsproxy" long-name="DNS Proxy" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/networkprotocols/dnsproxy/group" mrp="os/networkingsrv/networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
-</component>
-</collection>
-<collection name="networksecurity" long-name="Network Security" level="framework">
-<component name="tls" long-name="TLS" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tls/group" mrp="os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
-</component>
-<component name="tlsprovider" long-name="TLS Provider" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tlsprovider/group" mrp="os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
-</component>
-<component name="ipsec" long-name="IPsec" introduced="7.0" purpose="optional">
-<unit bldFile="os/networkingsrv/networksecurity/ipsec/group" mrp="os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
-</component>
-</collection>
-<collection name="networkingtestandutils" long-name="Networking Test and Utils" level="app-if">
-<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">
-<!-- production component: contains the IBY files -->
-<unit bldFile="os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
-</component>
-<component name="networkingdocs" long-name="Networking Documentation" purpose="development" class="doc">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
-</component>
-<component name="networkingsrv_metadata" long-name="Networking Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
-<component name="predictorcompression" long-name="Predictor Compression" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wlan" level="services" long-name="WLAN" levels="hw low mid high tools test">
-<collection name="wlan_plat" long-name="WLAN Platform Interfaces" level="test">
-<component name="wlan_dbif_api" long-name="WLAN DBIF API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_dbif_api/group"/>
-</component>
-<component name="wlan_hal_api" long-name="WLAN HAL API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hal_api/group"/>
-</component>
-<component name="wlan_management_api" long-name="WLAN Management API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_management_api/group"/>
-</component>
-<component name="wlan_device_settings_api" long-name="WLAN Device Settings API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_device_settings_api/group"/>
-</component>
-<component name="wlan_control_api" long-name="WLAN Control API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_control_api/group"/>
-</component>
-<component name="wlan_hw_initialization_data_api" long-name="WLAN Hardware Initialization Data API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hw_initialization_data_api/group"/>
-</component>
-<component name="wlan_power_save_plugin_api" long-name="WLAN Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_power_save_plugin_api/group"/>
-</component>
-<component name="wlan_info_api" long-name="WLAN Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_info_api/group"/>
-</component>
-<component name="wlan_agent_hotspot_plugin_api" long-name="WLAN Agent Hotspot Plug-in API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
-</component>
-<component name="wlan_osa_api" long-name="WLAN OSA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_osa_api/group"/>
-</component>
-<component name="wlan_spia_api" long-name="WLAN SPIA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_spia_api/group"/>
-</component>
-<component name="wlan_hpa_api" long-name="WLAN HPA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hpa_api/group"/>
-</component>
-<component name="wlan_eapol_plugin_api" long-name="WLAN EAPOL Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_eapol_plugin_api/group"/>
-</component>
-<component name="wlan_generic_plugin_api" long-name="WLAN Generic Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_generic_plugin_api/group"/>
-</component>
-<component name="wlan_aws_plugin_api" long-name="WLAN AWS Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_aws_plugin_api/group"/>
-</component>
-</collection>
-<collection name="wlan_pub" long-name="WLAN Public Interfaces" level="test">
-<component name="wlan_sdk_info_api" long-name="WLAN SDK Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_pub/wlan_sdk_info_api/group"/>
-</component>
-</collection>
-<collection name="wlan_bearer" long-name="WLAN Bearer" level="hw">
-<component name="wlanpsmplugin" filter="s60" long-name="WLAN PSM Plugin" plugin="Y">
-<unit bldFile="os/wlan/wlan_bearer/wlanpsmplugin/group"/>
-</component>
-<component name="wlanagent" filter="s60" long-name="WLAN Agent">
-<unit bldFile="os/wlan/wlan_bearer/wlanagent/group"/>
-</component>
-<component name="wlandbif_cd" filter="s60" long-name="WLAN CommsDat interface">
-<unit bldFile="os/wlan/wlan_bearer/wlandbif_cd/group"/>
-</component>
-<!-- should follow component directory rules for stuff in wlan_symbian/ and put in a single component or split up properly -->
-<component name="wlanengine" filter="s60" long-name="WLAN Engine">
-<unit bldFile="os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
-</component>
-<component name="wlanldd" filter="s60" long-name="WLAN LDD">
-<unit bldFile="os/wlan/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
-</component>
-<component name="wlannwif" filter="s60" long-name="WLAN Network Interface">
-<unit bldFile="os/wlan/wlan_bearer/wlannwif/group"/>
-</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="adaptation hw-if plugin framework server app-if">
-<collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
-<component name="basebandchanneladaptor" long-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 name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
-<component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
-</component>
-</collection>
-<collection name="fax" long-name="Fax" level="server">
-<component name="faxclientandserver" long-name="Fax Client and Server" purpose="optional">
-<unit bldFile="os/cellularsrv/fax/faxclientandserver/Group" mrp="os/cellularsrv/fax/faxclientandserver/Group/telephony_fax.mrp"/>
-</component>
-</collection>
-<collection name="smsprotocols" long-name="SMS Protocols" level="framework">
-<component name="smsstack" long-name="SMS Stack" introduced="6.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/cellularsrv/smsprotocols/smsstack/group" mrp="os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
-</component>
-</collection>
-<collection name="telephonyprotocols" long-name="Telephony Protocols" level="framework">
-<component name="csdagt" long-name="CSD AGT" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/csdagt/group" mrp="os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
-</component>
-<component name="psdagt" long-name="PSD AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/psdagt/group" mrp="os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
-</component>
-<component name="gprsumtsqosprt" long-name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
-</component>
-<component name="gprsumtsqosinterface" long-name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
-</component>
-<component name="qosextnapi" long-name="QoS Extn API" introduced="9.2" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
-</component>
-<component name="secondarypdpcontextumtsdriver" long-name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
-</component>
-<component name="qos3gppcpr" long-name="QoS 3GPP CPR" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
-</component>
-<component name="pdplayer" long-name="PDP Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/pdplayer/group" mrp="os/cellularsrv/telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
-</component>
-<component name="rawipnif" long-name="Raw IP NIF" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserver" long-name="Telephony Server" level="server">
-<component name="etelserverandcore" long-name="ETel Server and Core" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
-</component>
-<component name="etelmultimode" long-name="ETel Multimode" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelmultimode/group" mrp="os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
-</component>
-<component name="etelpacketdata" long-name="ETel Packet Data" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
-</component>
-<component name="etelsimtoolkit" long-name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
-<component name="common_tsy" long-name="Common TSY" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
-</component>
-<component name="licenseetsystub" long-name="Licensee TSY Stub" introduced="^2" purpose="development" filter="sf_build" plugin="Y">
-<unit mrp="os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="os/cellularsrv/telephonyserverplugins/licenseetsystub/group"/>
-</component>
-<component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
-</component>
-<component name="simtsy" long-name="SIM TSY" introduced="7.0" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
-</component>
-<component name="ctsydispatchlayer" long-name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
-</component>
-<component name="simatktsy" long-name="SIMATK TSY" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simatktsy/group" mrp="os/cellularsrv/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
-</component>
-</collection>
-<collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
-<component name="dial" long-name="Dial" deprecated="9.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyutils/dial/group" mrp="os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
-</component>
-<component name="telephonywatchers" long-name="Telephony Watchers" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
-</component>
-<component name="etel3rdpartyapi" long-name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrv_info" long-name="Cellular Baseband Services Info" level="app-if">
-<component name="telephonyconfidentialdocs" long-name="Telephony Confidential Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
-</component>
-<component name="telephonydocs" long-name="Telephony Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
-</component>
-<component name="cellularsrv_metadata" long-name="Cellular Baseband Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
-<component name="mocksy" long-name="MockSY" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if"/>
-</block>
-<block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
-<collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
-<component name="bluetooth_audio_adaptation_api" long-name="Bluetooth Audio Adaptation API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
-</component>
-<component name="bluetooth_power_management_api" long-name="Bluetooth Power Management API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_power_management_api/group"/>
-</component>
-<component name="at_command_handler_plugin_api" long-name="AT Command Handler Plugin API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/at_command_handler_plugin_api/group"/>
-</component>
-</collection>
-<collection name="bluetooth" long-name="Bluetooth Core" level="framework">
-<component name="btstack" long-name="Bluetooth Stack" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btstack" mrp="os/bt/bluetooth/btstack/bluetooth_stack.mrp"/>
-</component>
-<component name="btcomm" long-name="Bluetooth CSY" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetooth/btcomm" mrp="os/bt/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
-</component>
-<component name="btsdp" long-name="Bluetooth SDP" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btsdp" mrp="os/bt/bluetooth/btsdp/bluetooth_sdp.mrp"/>
-</component>
-<component name="btextnotifiers" long-name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btextnotifiers" mrp="os/bt/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
-</component>
-<component name="gavdp" long-name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/gavdp/group" mrp="os/bt/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
-</component>
-<component name="btlogger" long-name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btlogger/group" mrp="os/bt/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
-</component>
-<component name="btdocs" long-name="Bluetooth Documentation" purpose="development" class="doc">
-<unit mrp="os/bt/bluetooth/btdocs/bluetooth_documentation.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothmgmt" long-name="Bluetooth Management" level="plugin">
-<component name="btmgr" long-name="Bluetooth Manager" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btmgr" mrp="os/bt/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
-</component>
-<component name="btconfig" long-name="Bluetooth Config" purpose="optional" class="config">
-<unit bldFile="os/bt/bluetoothmgmt/btconfig" mrp="os/bt/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
-</component>
-<component name="btrom" long-name="Bluetooth ROM" introduced="9.1" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btrom" mrp="os/bt/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
-</component>
-<component name="bluetoothclientlib" long-name="Bluetooth Client Library" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/bluetoothclientlib" mrp="os/bt/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothcommsprofiles" long-name="Bluetooth Comms Profiles" level="app-if">
-<component name="btpan" long-name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetoothcommsprofiles/btpan/group" mrp="os/bt/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
-</component>
-</collection>
-<collection name="bthci" long-name="Host Controller Interface" level="server">
-<component name="bthci2" long-name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bthci/bthci2/group" mrp="os/bt/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
-</component>
-<component name="hciextensioninterface" long-name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bthci/hciextensioninterface" mrp="os/bt/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
-</component>
-<component name="hci2implementations" long-name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bthci/hci2implementations/group" mrp="os/bt/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
-</component>
-</collection>
-<collection name="irda" long-name="IrDA" level="plugin">
-<component name="irdastack" long-name="IrDA Stack" purpose="optional">
-<unit bldFile="os/bt/irda/irdastack/group" mrp="os/bt/irda/irdastack/group/infra-red_irda.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if"/>
-<collection name="atext" long-name="AT Extensions" level="server">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="atext_build" long-name="AT Extension Build" introduced="^3" purpose="optional" filter="s60">
-<unit bldFile="os/bt/atext/group"/>
-</component>
-</collection>
-<collection name="bt_info" long-name="Bluetooth Info" level="app-if">
-<component name="bt_metadata" long-name="Bluetooth Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/bt/bt_info/bt_metadata/bt_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
-<collection name="usb_plat" long-name="USB Platform Interfaces" level="app-if">
-<component name="usb_audio_stream_plugin_api" long-name="USB Audio Stream Plugin API" filter="s60" class="api">
-<unit bldFile="os/usb/usb_plat/usb_audio_stream_plugin_api/group"/>
-</component>
-</collection>
-<collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
-<!-- usbclientdrivers to be moved here from kernelhwsrv-->
-</collection>
-<collection name="usbmgmt" long-name="USB Management" level="server">
-<component name="usbmgr" long-name="USB Manager" purpose="optional">
-<unit bldFile="os/usb/usbmgmt/usbmgr/group" mrp="os/usb/usbmgmt/usbmgr/group/usb_manager.mrp" version="2"/>
-</component>
-<component name="usbclassandmgrdocs" long-name="USB Class and Manager Documentation" purpose="development" class="doc">
-<unit mrp="os/usb/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
-</component>
-</collection>
-<collection name="usb_info" long-name="USB Info" level="app-if">
-<component name="usb_metadata" long-name="USB Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/usb/usb_info/usb_metadata/usb_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="mm" level="services" long-name="Multimedia" levels="adaptation 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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-</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"/>
-</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"/>
-</component>
-<component name="aac_decoder_config_proxy_api" long-name="AAC Decoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/aac_decoder_config_proxy_api/group"/>
-</component>
-<component name="added_devsound_control_api" long-name="Added DevSound Control API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_api/group"/>
-</component>
-<component name="added_devsound_control_msg_hdlr_api" long-name="Added DevSound Control Msg Hdlr API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_msg_hdlr_api/group"/>
-</component>
-<component name="added_devsound_control_proxy_api" long-name="Added DevSound Control Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_proxy_api/group"/>
-</component>
-<component name="audio_effects_msg_hdlr_api" long-name="Audio Effects Message Handler API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_msg_hdlr_api/group"/>
-</component>
-<component name="audio_effects_proxy_api" long-name="Audio Effects Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_proxy_api/group"/>
-</component>
-<component name="audio_policy_header_api" long-name="Audio Policy Header API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="audio_routing_proxy_api" long-name="Audio Routing Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_routing_proxy_api/group"/>
-</component>
-<component name="custom_interface_builder_api" long-name="Custom Interface Builder API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_builder_api/group"/>
-</component>
-<component name="custom_interface_message_handler_factory_api" long-name="Custom Interface Message Handler Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_message_handler_factory_api/group"/>
-</component>
-<component name="custom_interface_proxy_factory_api" long-name="Custom Interface Proxy Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_proxy_factory_api/group"/>
-</component>
-<component name="custom_interface_utility_api" long-name="Custom Interface Utility API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_utility_api/group"/>
-</component>
-<component name="devsound_adaptation_api" long-name="DevSound Adaptation API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/devsound_adaptation_api/group"/>
-</component>
-<component name="display_posting_api" long-name="Display Posting API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="eaac_plus_decoder_interface_proxy_api" long-name="eAAC Plus Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="error_concealment_interface_proxy_api" long-name="Error Concealment Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
-</component>
-<component name="fm_radio_adaptation_api" long-name="FM Radio Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_decoder_interface_proxy_api" long-name="G711 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_encoder_interface_proxy_api" long-name="G711 Encoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_decoder_interface_proxy_api" long-name="G729 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_encoder_interface_msg_hdlr_api" long-name="G729 Encoder Interface Message Handler API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</component>
-<component name="ilbc_decoder_interface_proxy_api" long-name="Ilbc Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ilbc_encoder_interface_proxy_api" long-name="Ilbc Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="mdf_plugin_uids" long-name="MDF Plug-in UIDs" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/mdf_plugin_uids/group"/>
-</component>
-<component name="multimedia_fourcc_definitions_api" long-name="Multimedia FourCC Definitions API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/multimedia_fourcc_definitions_api/group"/>
-</component>
-<component name="nokia_audio_policy_header_api" long-name="Nokia Audio Policy Header API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/nokia_audio_policy_header_api/group"/>
-</component>
-<component name="nokia_multimedia_fourcc_definitions_api" long-name="Nokia Multimedia Fourcc Definitions API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ra8_decoder_interface_proxy_api" long-name="RA8 Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
-</component>
-<component name="rds_adaptation_api" long-name="RDS Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="restricted_audio_output_proxy_api" long-name="Restricted Audio Output Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="sbc_encoder_interface_proxy_api" long-name="SBC Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/sbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="secure_output_mdf_custom_interface" long-name="Secure Output MDF Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="speech_encoder_config_proxy_api" long-name="Speech Encoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/speech_encoder_config_proxy_api/group"/>
-</component>
-<component name="telephony_audio_routing_client_api" long-name="Telephony Audio Routing Client API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_client_api/group"/>
-</component>
-<component name="telephony_audio_routing_manager_api" long-name="Telephony Audio Routing Manager API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_manager_api/group"/>
-</component>
-<component name="video_buffer_management_mdf_custom_interface" long-name="Video Buffer Management MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_buffer_management_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_rotation_mdf_custom_interface" long-name="Video Decoder Rotation MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_scaling_mdf_custom_interface" long-name="Video Decoder Scaling MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
-</component>
-<component name="video_reclaim_extbuffers_ci" long-name="Video Reclaim Extbuffers Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_reclaim_extbuffers_ci/group"/>
-</component>
-<component name="video_window_control_custom_interface" long-name="Video Window Control Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="wma_decoder_interface_proxy_api" long-name="WMA Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/wma_decoder_interface_proxy_api/group"/>
-</component>
-<component name="eaacplusutil_api" long-name="EAac Plus Util API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/eaacplusutil_api/group"/>
-</component>
-<component name="frametable_api" long-name="Frametable API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/frametable_api/group"/>
-</component>
-</collection>
-<collection name="devsoundextensions" long-name="Devsound Extensions" level="device-fw">
-<component name="drmaudioplayer" filter="s60" long-name="DRM Audio Player">
-<unit bldFile="os/mm/devsoundextensions/drmaudioplayer/group"/>
-</component>
-<component name="mmextfw" filter="s60" long-name="Multimedia Extension Framework">
-<unit bldFile="os/mm/devsoundextensions/mmextfw/group"/>
-</component>
-<component name="audiorouting" filter="s60" long-name="Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/audiorouting/group"/>
-</component>
-<component name="effects" filter="s60" long-name="Effects">
-<unit bldFile="os/mm/devsoundextensions/effects/group"/>
-</component>
-<component name="effectspresets" filter="s60" long-name="Effects Presets">
-<unit bldFile="os/mm/devsoundextensions/effectspresets/group"/>
-</component>
-<component name="effectspresets_utils" filter="s60" long-name="Effects Presets Utils">
-<!-- need to #include the lot from a single bld.inf
- Also move to a standard component location, not under effectspresets -->
-<unit bldFile="os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
-<unit bldFile="os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
-<unit bldFile="os/mm/devsoundextensions/effectspresets/StereoWideningUtility/group" filter="!dfs_build"/>
-</component>
-<component name="telephonyaudiorouting" filter="s60" long-name="Telephony Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/group"/>
-</component>
-<component name="mmfcustominterfaces" filter="s60" long-name="MMF Custom Interfaces">
-<unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/group"/>
-</component>
-<component name="addeddevsoundcontrol" filter="s60" long-name="Added DevSound Control">
-<unit bldFile="os/mm/devsoundextensions/addeddevsoundcontrol/group"/>
-</component>
-<component name="globalaudiosettings" filter="s60" long-name="Global Audio Settings">
-<unit bldFile="os/mm/devsoundextensions/globalaudiosettings/group"/>
-</component>
-<component name="restrictedaudiooutput" filter="s60" long-name="Restricted Audio Output">
-<unit bldFile="os/mm/devsoundextensions/restrictedaudiooutput/group"/>
-</component>
-<component name="ciextnfactoryplugins" filter="s60" long-name="Custom Interface Extension Factory Plugins" plugin="Y">
-<unit bldFile="os/mm/devsoundextensions/ciextnfactoryplugins/group"/>
-</component>
-</collection>
-<collection name="mdfdevvideoextensions" long-name="MDF Dev Video Extensions" level="device-fw">
-<component name="nga_mdf_postprocessor" long-name="NGA MDF Postprocessor" filter="s60">
-<unit bldFile="os/mm/mdfdevvideoextensions/nga_mdf_postprocessor/group"/>
-</component>
-</collection>
-<collection name="audio" long-name="Audio Codecs" level="middleware">
-<component name="arm_cmmf_codecs" filter="s60" long-name="ARM CMMF Codecs" plugin="Y">
-<unit bldFile="os/mm/audio/arm_cmmf_codecs/group"/>
-</component>
-</collection>
-<collection name="video" long-name="Video Codecs" level="middleware">
-<!-- empty -->
-</collection>
-<collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
-<component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/imagingandcamerafws/imagingfws/group" mrp="os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
-</component>
-<component name="camerafw" long-name="Camera Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/imagingandcamerafws/camerafw/group" mrp="os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
-</component>
-</collection>
-<collection name="mmlibs" long-name="Multimedia Libraries" level="middleware">
-<component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmutilitylib/group" mrp="os/mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
-</component>
-<component name="mmfw" long-name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmfw/group" mrp="os/mm/mmlibs/mmfw/group/multimedia_mmf.mrp"/>
-</component>
-</collection>
-<collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
-<component name="imagingplugins" long-name="Imaging Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/imagingplugins/group" mrp="os/mm/mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
-</component>
-<component name="cameraplugins" long-name="Camera Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/cameraplugins/group" mrp="os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
-</component>
-<component name="lib3gp" long-name="3GP Library" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/mmplugins/lib3gp/group" mrp="os/mm/mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
-</component>
-<component name="mmfwplugins" long-name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/mmfwplugins/group" mrp="os/mm/mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
-</component>
-</collection>
-<collection name="mm_info" long-name="Multimedia Info" level="app-if">
-<component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc">
-<unit mrp="os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
-</component>
-<component name="mm_metadata" long-name="Multimedia Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
-<component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="^2" purpose="development">
-<unit bldFile="os/mm/mmresourcemgmt/mmresctrl/group" mrp="os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
-</component>
-</collection>
-<collection name="mmdevicefw" long-name="Multimedia Device Framework" level="device-fw">
-<component name="mdf" long-name="Media Device Framework" introduced="9.2" purpose="mandatory">
-<unit bldFile="os/mm/mmdevicefw/mdf/group" mrp="os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
-</component>
-<component name="speechrecogsupport" long-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 name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
-<component name="videorenderer" long-name="Video Renderer" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/mmswadaptation/videorenderer/group" mrp="os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
-</component>
-</collection>
-<collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw"/>
-<collection name="omxil" long-name="OpenMAX IL" level="hw-if">
-<component name="omxilapi" long-name="OpenMAX IL API" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilapi/group" mrp="os/mm/omxil/omxilapi/group/multimedia_omx_il_api.mrp" version="1"/>
-</component>
-<component name="omxilcore" long-name="OpenMAX IL Core" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcore/group" mrp="os/mm/omxil/omxilcore/group/multimedia_omx_il_core.mrp" version="1"/>
-</component>
-<component name="omxilcomponentcommon" long-name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcomponentcommon/group" mrp="os/mm/omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp" version="1"/>
-</component>
-<component name="omxilrefcomps" long-name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilrefcomps/ref_components/group" mrp="os/mm/omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp" version="1"/>
-</component>
-<component name="mmilapi" long-name="Multimedia Integration Layer API" introduced="^3" purpose="development">
-<unit bldFile="os/mm/omxil/mmilapi/group" mrp="os/mm/omxil/mmilapi/group/multimedia_il_api.mrp"/>
-</component>
-</collection>
-<collection name="devsound" long-name="Sound Device" level="devices">
-<component name="devsoundapi" long-name="DevSound API" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/devsound/devsoundapi/group" mrp="os/mm/devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
-</component>
-<component name="a3fdevsound" long-name="A3F DevSound" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3fdevsound/group" mrp="os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
-</component>
-<component name="a3facf" long-name="A3F Audio Component Framework" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3facf/group" mrp="os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
-</component>
-<component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/devsound/devsoundpluginsupport/group" mrp="os/mm/devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
-</component>
-<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">
-<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">
-<unit bldFile="os/mm/devsound/a3ftrace/group" mrp="os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
-</component>
-<component name="a3fsrvstart" long-name="A3F Server Start" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
-</component>
-</collection>
-<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
-<component name="devsoundhwdeviceapi" long-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 name="a3facl" long-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 name="a3fdevsoundcustomisation" long-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"/>
-</component>
-<component name="refacladapt" long-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"/>
-</component>
-<component name="videohai" long-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 name="dvbhreceiverhai" long-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>
-</block>
-<block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
-<collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
-<component name="exif_api" long-name="Exif API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagingext_plat" long-name="Imaging Extensions Platform Interfaces" level="app-if">
-<component name="jpeg2000_icl_plugin_api" long-name="JPEG2000 ICL plugin API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/jpeg2000_icl_plugin_api/group"/>
-</component>
-<component name="extended_icl_jpeg_api" long-name="Extended ICL Jpeg API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
-</component>
-<component name="h324_annex_k_custom_api" long-name="H324 Annex K Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/h324_annex_k_custom_api/group"/>
-</component>
-<component name="ecam_orientation_custom_api" long-name="ECam Orientation Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_orientation_custom_api/group"/>
-</component>
-<component name="ecam_ui_orientation_override_custom_api" long-name="ECam UI Orientation Override Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
-</component>
-<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>
-</collection>
-<collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
-<component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
-<unit bldFile="os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
-</component>
-<component name="imageadaptationextensions_build" filter="s60" long-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"/>
-</component>
-</collection>
-<collection name="imagingmodules" long-name="Imaging Modules" level="hw-if">
-<component name="exiflib" filter="s60" long-name="Exif Library">
-<unit bldFile="os/imagingext/imagingmodules/exiflib/group"/>
-</component>
-<component name="jp2kcodec" filter="s60" long-name="JPEG2000 Decoder Plugin" plugin="Y">
-<unit bldFile="os/imagingext/imagingmodules/jp2kcodec/group"/>
-</component>
-</collection>
-</block>
-<block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
-<component name="vgi" filter="s60" long-name="VGI">
-<unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
-</component>
-</collection>
-<collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adaptations">
-<component name="m3gcore11" filter="s60" long-name="M3G Core 1.1">
-<unit bldFile="os/graphics/m3g/m3gcore11/group"/>
-</component>
-</collection>
-<collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines">
-<component name="graphicsresource" long-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 name="graphicsresourceadaptation" long-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"/>
-</component>
-<component name="graphicsresourceimplementation" long-name="Graphics Resource Implementation" introduced="^4" purpose="optional">
-<unit bldFile="os/graphics/graphicsresourceservices/graphicsresourceimplementation/group" mrp="os/graphics/graphicsresourceservices/graphicsresourceimplementation/group/graphics_graphicsresourceimplementation.mrp"/>
-</component>
-<component name="graphicsresourceinterface" long-name="Graphics Resource Interface" introduced="^4" purpose="optional">
-<unit bldFile="os/graphics/graphicsresourceservices/graphicsresourceinterface/group" mrp="os/graphics/graphicsresourceservices/graphicsresourceinterface/group/graphics_graphicsresourceinterface.mrp"/>
-</component>
-</collection>
-<collection name="graphicsutils" long-name="Graphics Utils" level="engines">
-<component name="commongraphicsheaders" long-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 name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
-<!-- displayldd to be moved here -->
-<component name="surfacemgr" long-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 name="graphicscomposition" long-name="Graphics Composition" level="engines">
-<component name="openwfcinterface" long-name="OpenWF Composition Interface" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfcinterface/group" mrp="os/graphics/graphicscomposition/openwfcinterface/group/graphics_openwfcinterface.mrp"/>
-</component>
-<component name="openwfcompositionengine" long-name="OpenWF Composition Engine" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/graphicscomposition/openwfcompositionengine/group" mrp="os/graphics/graphicscomposition/openwfcompositionengine/group/graphics_openwfcompositionengine.mrp"/>
-</component>
-<component name="openwfsupport" long-name="OpenWF Support" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfsupport/group" mrp="os/graphics/graphicscomposition/openwfsupport/group/graphics_openwfsupport.mrp"/>
-</component>
-<component name="surfaceupdate" long-name="Surface Update" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/surfaceupdate/group" mrp="os/graphics/graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
-</component>
-</collection>
-<collection name="graphicstest" long-name="Graphics Test" level="app-if">
-<component name="uibench" long-name="UI Bench" introduced="9.2" purpose="development">
-<unit bldFile="os/graphics/graphicstest/uibench/group" mrp="os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
-</component>
-</collection>
-<collection name="graphics_plat" long-name="Graphics Platform Interfaces" level="app-if">
-<component name="m3g_core_api" filter="sf_build" long-name="M3G Core API" class="api">
-<unit bldFile="os/graphics/graphics_plat/m3g_core_api/group"/>
-</component>
-</collection>
-<collection name="graphics_info" long-name="Graphics Info" level="app-if">
-<component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc">
-<unit mrp="os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
-</component>
-<component name="graphics_metadata" long-name="Graphics Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
-</component>
-</collection>
-<collection name="windowing" long-name="Windowing" level="app-if">
-<component name="windowserver" long-name="Window Server" purpose="mandatory">
-<unit bldFile="os/graphics/windowing/windowserver/group" mrp="os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
-</component>
-<component name="windowserverplugins" long-name="Window Server Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/windowing/windowserverplugins/group" mrp="os/graphics/windowing/windowserverplugins/group/graphics_wserv_std_plugins.mrp"/>
-</component>
-</collection>
-<collection name="printingservices" long-name="Printing Services" level="app-if">
-<component name="printerdriversupport" long-name="Printer Driver Support" purpose="optional">
-<unit bldFile="os/graphics/printingservices/printerdriversupport/group" mrp="os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
-</component>
-<component name="printerdrivers" long-name="Printer Drivers" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/printingservices/printerdrivers/group" mrp="os/graphics/printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
-</component>
-</collection>
-<collection name="fbs" long-name="Font and Bitmap Server" level="device-interface">
-<component name="fontandbitmapserver" long-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 name="opengles" long-name="OpenGLES" level="internal-adaptations">
-<component name="openglesinterface" long-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 name="opengles_stub" filter="sf_build" long-name="OpenGL ES Stub" purpose="optional" introduced="^2">
-<unit bldFile="os/graphics/opengles/openglesinterface/group/opengles_stub"/>
-</component>
-</collection>
-<collection name="openvg" long-name="OpenVG" level="internal-adaptations">
-<component name="openvginterface" long-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 name="openvg11" filter="s60" long-name="OpenVG 1.1">
-<!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
-<unit bldFile="os/graphics/openvg/openvginterface/group/openvg11"/>
-</component>
-<component name="sfopenvg" filter="sf_build" long-name="Khronos OpenVG Reference Implementation" introduced="^2" purpose="optional">
-<unit bldFile="os/graphics/openvg/openvgrefimplementation/sfopenvg/group"/>
-</component>
-</collection>
-<collection name="egl" long-name="EGL" level="internal-adaptations">
-<component name="eglinterface" long-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 name="eglswitch" long-name="EGL Switch" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglswitch/group" mrp="os/graphics/egl/eglswitch/group/graphics_eglswitch.mrp"/>
-</component>
-<component name="eglrefimpl" long-name="EGL Reference Implementation" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglrefimpl/group" mrp="os/graphics/egl/eglrefimpl/group/graphics_eglrefimpl.mrp"/>
-</component>
-<component name="egltest" long-name="EGL Tests" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/egl/egltest/group" mrp="os/graphics/egl/egltest/group/graphics_egltest.mrp"/>
-</component>
-</collection>
-<collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
-<component name="gdi" long-name="GDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/gdi/group" mrp="os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
-</component>
-<component name="bitgdi" long-name="BitGDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
-</component>
-<component name="colourpalette" long-name="Colour Palette" introduced="7.0s" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
-</component>
-<component name="screendriver" long-name="Screen Driver" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/graphicsdeviceinterface/screendriver/group" mrp="os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
-</component>
-<component name="directgdi" long-name="DirectGDI" introduced="^3" deprecated="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/directgdi/group" mrp="os/graphics/graphicsdeviceinterface/directgdi/group/graphics_directgdi.mrp"/>
-</component>
-<component name="directgdiinterface" long-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 name="directgdiadaptation" long-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"/>
-</component>
-</collection>
-<collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
-<component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/gdi_tools/group" mrp="os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
-</component>
-</collection>
-<collection name="graphicsapitest" long-name="Graphics API Tests" level="app-if"/>
-</block>
-<block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
-<collection name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" level="text">
-<component name="findutil_api" long-name="Find Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/findutil_api/group"/>
-</component>
-<component name="japanese_language_utilities_api" long-name="Japanese Language Utilities API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
-</component>
-<component name="sortutil_api" long-name="Sorting Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/sortutil_api/group"/>
-</component>
-</collection>
-<collection name="textandloc_pub" long-name="Text and Localisation Public Interfaces" level="text">
-<component name="directory_localizer_api" long-name="Directory Localizer API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_pub/directory_localizer_api/group"/>
-</component>
-</collection>
-<collection name="charconvfw" long-name="Character Conversion" level="encoding">
-<component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional">
-<unit bldFile="os/textandloc/charconvfw/charconv_fw/group" mrp="os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
-</component>
-<component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/charconvplugins/group" mrp="os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
-</component>
-<component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/fatfilenameconversionplugins/group" mrp="os/textandloc/charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
-</component>
-</collection>
-<collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
-<component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/textshaperplugin/group" mrp="os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
-</component>
-<component name="fontstore" long-name="Font Store" purpose="mandatory">
-<unit bldFile="os/textandloc/fontservices/fontstore/group" mrp="os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
-</component>
-<component name="textrendering" long-name="Text Rendering" purpose="mandatory" class="placeholder">
-<!-- placeholder for text code from GDI -->
-</component>
-<component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/freetypefontrasteriser/group" mrp="os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
-</component>
-<component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional">
-<unit bldFile="os/textandloc/fontservices/referencefonts/group" mrp="os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
-</component>
-</collection>
-<collection name="textlayout" long-name="Text Layout" level="text">
-<component name="texthandling" long-name="Text Handling" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/texthandling/group" mrp="os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
-</component>
-<component name="textformatting" long-name="Text Formatting" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/textformatting/group" mrp="os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
-</component>
-</collection>
-<collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
-<!-- components in this collection need to be moved to the right collection.
- Either move into the units' directories, or create a new textandlocutils directory -->
-<component name="numbergrouping" filter="s60" long-name="Number Grouping">
-<unit bldFile="os/textandloc/charconvfw/numbergrouping/group"/>
-</component>
-<component name="jplangutil" filter="s60" long-name="Japanese Language Utilities">
-<unit bldFile="os/textandloc/charconvfw/jplangutil/group"/>
-</component>
-<component name="sortutil" filter="s60" long-name="Sorting Utility">
-<unit bldFile="os/textandloc/charconvfw/sortutil/group"/>
-</component>
-<component name="inlinetext" filter="s60" long-name="Inline Text">
-<unit bldFile="os/textandloc/charconvfw/inlinetext/group"/>
-</component>
-<component name="nearestlangutil" long-name="Nearest Language Util" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-<component name="numberformatting" long-name="Number Formatting" introduced="7.0s" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/numberformatting/group" mrp="os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
-</component>
-</collection>
-<collection name="localesupport" long-name="Locale Support" level="util">
-<component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/localisation/localesupport" mrp="os/textandloc/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
-</component>
-<component name="initlocale" long-name="Initialise Locale" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-</collection>
-<collection name="textandloctools" long-name="Text and Localisation Tools" level="tools">
-<component name="fontcompiler" long-name="Font Compiler" purpose="development" class="placeholder PC">
-<!-- placeholder for split from GDI Tools -->
-</component>
-<component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/bitmapfonttools/group" mrp="os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
-</component>
-</collection>
-<collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
-<component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
-<collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
-<component name="xmlsrv_plat_build" long-name="XML Services Platform Interface Build" filter="s60" class="api">
-<!-- need to fix the configuration used here.
- Either destribute to other components or use the new feature flags confguration mechanisms.
- Remove this component and uncomment the other units when fixed-->
-<unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
-</component>
-<component name="xml_encryption_api" long-name="XML Encryption API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/> -->
-</component>
-<component name="xml_signature_api" long-name="XML Signature API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_signature_api/group"/> -->
-</component>
-<component name="xml_security_engine_utils_api" long-name="XML Security Engine Utils API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/> -->
-</component>
-</collection>
-<collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
-<component name="xmlseccertman" filter="s60" long-name="XML Security Certificate Manager">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
-</component>
-<component name="xmlsec" filter="s60" long-name="XML Security">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsec/group"/>
-</component>
-<component name="xmlseccrypto" filter="s60" long-name="XML Security Crypto">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccrypto/group"/>
-</component>
-<component name="xmlsecwrapper" filter="s60" long-name="XML Security Wrapper">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsecwrapper/group"/>
-</component>
-</collection>
-<collection name="xml" long-name="XML" level="generic">
-<component name="xmlfw" long-name="XML Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmlfw/group" mrp="os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
-</component>
-<component name="libxml2libs" long-name="Libxml2 Libraries" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/libxml2libs/group" mrp="os/xmlsrv/xml/libxml2libs/group/syslibs_libxml2.mrp"/>
-</component>
-<component name="legacyminidomparser" long-name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/legacyminidomparser/GROUP" mrp="os/xmlsrv/xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp"/>
-</component>
-<component name="xmldomandxpath" long-name="XML DOM and XPath" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmldomandxpath/group" mrp="os/xmlsrv/xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
-</component>
-<component name="xmlexpatparser" long-name="XML Expat Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmlexpatparser/group" mrp="os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
-</component>
-<component name="xmllibxml2parser" long-name="XML Libxml2 Parser" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmllibxml2parser/group" mrp="os/xmlsrv/xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
-</component>
-<component name="wbxmlparser" long-name="WBXML Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/wbxmlparser/group" mrp="os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
-</component>
-</collection>
-<collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
-<component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="deviceplatformrelease" level="services" long-name="Device Platform Release" levels="bld mid top">
-<collection name="s60extras" long-name="S60 Extras" level="mid">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="s60extras_build" filter="s60" long-name="S60 Extras Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/S60Extras/group"/>
-</component>
-</collection>
-<collection name="locfiles" long-name="Locale Files" level="mid">
-<component name="locfiles_build" filter="s60" long-name="S60 Locale Files Build" purpose="development" class="config">
-<!-- need to move component down a directory -->
-<unit bldFile="os/deviceplatformrelease/locfiles/group"/>
-</component>
-<component name="locfiles_set1" long-name="Locale Files Set 1" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set1"/>
-</component>
-<component name="locfiles_set2" long-name="Locale Files Set 2" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set2"/>
-</component>
-<component name="locfiles_set3" long-name="Locale Files Set 3" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set3"/>
-</component>
-<component name="locfiles_set4" long-name="Locale Files Set 4" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set4"/>
-</component>
-<component name="locfiles_set5" long-name="Locale Files Set 5" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set5"/>
-</component>
-<component name="locfiles_set6" long-name="Locale Files Set 6" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set6"/>
-</component>
-<!-- is the a problem with SF builds with the following? -->
-<component name="locfiles_set7" long-name="Locale Files Set 7" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set7"/>
-</component>
-<component name="locfiles_set8" long-name="Locale Files Set 8" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set8"/>
-</component>
-<component name="locfiles_set9" long-name="Locale Files Set 9" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set9"/>
-</component>
-<component name="locfiles_set10" long-name="Locale Files Set 10" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set10"/>
-</component>
-<component name="locfiles_set11" long-name="Locale Files Set 11" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set11"/>
-</component>
-<component name="locfiles_set12" long-name="Locale Files Set 12" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set12"/>
-</component>
-<component name="locfiles_set13" long-name="Locale Files Set 13" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set13"/>
-</component>
-<component name="locfiles_set14" long-name="Locale Files Set 14" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set14"/>
-</component>
-<component name="locfiles_set15" long-name="Locale Files Set 15" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set15"/>
-</component>
-<component name="locfiles_set16" long-name="Locale Files Set 16" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set16"/>
-</component>
-</collection>
-<collection name="version" long-name="Version" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="version_build" filter="s60" long-name="Version Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/Version/group"/>
-</component>
-</collection>
-<collection name="helps_loc2" long-name="Helps Locale 2" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helps_loc2_build" long-name="Helps Locale 2 Build" filter="s60">
-<unit bldFile="os/deviceplatformrelease/helps_loc2/group"/>
-</component>
-</collection>
-<collection name="sf_config" long-name="SF Config" level="mid">
-<component name="config" filter="s60" long-name="Config" purpose="development" class="config"/>
-<component name="cenrep" filter="sf_build" long-name="ConE Central Repository Config" purpose="development" class="config">
-<!-- will shoudl give the id/path something more unique than cenrep -->
-<unit bldFile="os/deviceplatformrelease/sf_config/cenrep/group"/>
-</component>
-</collection>
-<!-- should be located locally in buildplatforms/group
- <collection id="s60bld" name="S60 Build">
- <component id="buildplatforms" filter="s60" name="Build Platforms">
- <unit bldFile="/tools/buildplatforms/group"/>
- </component>
- </collection>-->
-<collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
-<component name="cedarutils" long-name="Cedar Utils" purpose="development">
-<unit mrp="os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
-</component>
-<component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt" purpose="development" class="config">
-<unit mrp="os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
-</component>
-<component name="foundation_s60_packages" long-name="Foundation S60 Packages" introduced="^3" deprecated="^3" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/symbianosbld/foundation_s60_packages/foundation_s60_packages.mrp"/>
-</component>
-</collection>
-<collection name="foundation_system" long-name="Foundation System" level="top">
-<component name="system_model" long-name="System Model" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
-</component>
-</collection>
-<collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
-<component name="deviceplatformrelease_metadata" long-name="Device Platform Release Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="osrndtools" level="services" long-name="OS R&D tools" levels="fw trace">
-<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"/>
-</component>
-<component name="testinterface" filter="s60" long-name="Test Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/testinterface/group"/>
-</component>
-<component name="testserver" filter="s60" long-name="Test Server" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserver/group"/>
-</component>
-<component name="testengine" filter="s60" long-name="Test Engine" purpose="development">
-<unit bldFile="os/osrndtools/stif/testengine/group"/>
-</component>
-<component name="testserverstarter" filter="s60" long-name="Test Server Starter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserverstarter/group"/>
-</component>
-<component name="stiftfwif" filter="s60" long-name="STIF Test Framework Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/stiftfwif/group"/>
-</component>
-<component name="consoleui" filter="s60" long-name="Console UI" purpose="development">
-<unit bldFile="os/osrndtools/stif/consoleui/group"/>
-</component>
-<component name="testcombiner" filter="s60" long-name="Test Combiner" purpose="development">
-<unit bldFile="os/osrndtools/stif/testcombiner/group"/>
-</component>
-<component name="demomodule" filter="s60" long-name="Demo Module" purpose="development">
-<unit bldFile="os/osrndtools/stif/demomodule/group"/>
-</component>
-<component name="atslogger" filter="s60" long-name="ATS Logger" purpose="development">
-<unit bldFile="os/osrndtools/stif/atslogger/group"/>
-</component>
-<component name="atsinterface" filter="s60" long-name="ATS Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/atsinterface/group"/>
-</component>
-<component name="testscripter" filter="s60" long-name="Test Scripter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testscripter/group"/>
-</component>
-<component name="suevent" filter="s60" long-name="SU Event" purpose="development">
-<unit bldFile="os/osrndtools/stif/suevent/group"/>
-</component>
-<component name="stifkerneltestclassbase" filter="s60" long-name="STIF Kernel Test Class Base" purpose="development">
-<!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
-<!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
-</component>
-<component name="stif_build" filter="s60" long-name="STIF Build" purpose="development">
-<!-- move exports into self-contained component. Remove this when configuration is in place-->
-<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">
-<unit bldFile="os/osrndtools/memspy/memspy_plat/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/engine/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/console/group"/>
-</component>
-<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>
-</collection>
-<collection name="hti" long-name="Harmonized Test Interface" level="trace">
-<component name="hti_plat" filter="s60" long-name="HTI Platform Interfaces" purpose="development" class="api">
-<unit bldFile="os/osrndtools/hti/hti_plat/group"/>
-</component>
-<component name="hticfg" filter="s60" long-name="HTI Config" purpose="development">
-<unit bldFile="os/osrndtools/hti/hticfg/group"/>
-</component>
-<component name="htiautostart" filter="s60" long-name="HTI Autostart" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiautostart/group"/>
-</component>
-<component name="htiframework" filter="s60" long-name="HTI Framework" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiframework/group"/>
-</component>
-<component name="hticommplugins" filter="s60" long-name="HTI Communication Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
-</component>
-<component name="htiserviceplugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
-</component>
-<component name="htifilehlp" filter="s60" long-name="HTI File Help" purpose="development">
-<unit bldFile="os/osrndtools/hti/htifilehlp/group"/>
-</component>
-<component name="htiwatchdog" filter="s60" long-name="HTI Watchdog" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiwatchdog/group"/>
-</component>
-<component name="hti_build" filter="s60" long-name="HTI Build" purpose="development">
-<!-- move exports into self-contained component.-->
-<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">
-<block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
-<collection name="appsupport_pub" long-name="Generic Application Support Public Interfaces" level="specific">
-<component name="flash_viewer_framework_api" long-name="Flash Viewer Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
-</component>
-<component name="network_status_api" long-name="Network Status API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/network_status_api/group"/>
-</component>
-</collection>
-<collection name="appsupport_plat" long-name="Generic Application Support Platform Interfaces" level="specific">
-<component name="action_plugin_api" long-name="Action Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/action_plugin_api/group"/>
-</component>
-<component name="application_orientation_api" long-name="Application Orientation API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/application_orientation_api/group"/>
-</component>
-<component name="context_access_api" long-name="Context Access API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_access_api/group"/>
-</component>
-<component name="context_framework_services_api" long-name="Context Framework Services API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_services_api/group"/>
-</component>
-<component name="context_framework_client_api" long-name="Context Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_client_api/group"/>
-</component>
-<component name="context_framework_listener_api" long-name="Context Framework Listener API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_listener_api/group"/>
-</component>
-<component name="context_framework_version_api" long-name="Context Framework Version API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_version_api/group"/>
-</component>
-<component name="context_source_plugin_api" long-name="Context Source Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_plugin_api/group"/>
-</component>
-<component name="context_source_settings_manager_api" long-name="Context Source Settings Manager API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_settings_manager_api/group"/>
-</component>
-<component name="context_subscription_api" long-name="Context Subscription API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_subscription_api/group"/>
-</component>
-<component name="key_event_framework_api" long-name="Key Event Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_api/group"/>
-</component>
-<component name="key_event_framework_mapper_api" long-name="Key Event Framework Mapper API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_mapper_api/group"/>
-</component>
-<component name="media_keys_definition_api" long-name="Media Keys Definition API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/media_keys_definition_api/group"/>
-</component>
-<component name="ood_threshold_api" long-name="OOD Threshold API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/ood_threshold_api/group"/>
-</component>
-<component name="oom_monitor_api" long-name="OOM Monitor API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_api/group"/>
-</component>
-<component name="oom_monitor_plugin_api" long-name="OOM Monitor Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_plugin_api/group"/>
-</component>
-<component name="operation_provider_api" long-name="Operation Provider API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/operation_provider_api/group"/>
-</component>
-<component name="phonecmdhandler_api" long-name="Phone Command Handler API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/phonecmdhandler_api/group"/>
-</component>
-<component name="restore_factory_settings_api" long-name="Restore Factory Settings API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_api/group"/>
-</component>
-<component name="restore_factory_settings_plugin_api" long-name="Restore Factory Settings Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_plugin_api/group"/>
-</component>
-<component name="secondary_display_accfw_api" long-name="Secondary Display Accessory Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_accfw_api/group"/>
-</component>
-<component name="secondary_display_startup_api" long-name="Secondary Display Startup API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_startup_api/group"/>
-</component>
-<component name="secondary_display_sysap_api" long-name="Secondary Display System Application API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_sysap_api/group"/>
-</component>
-<component name="secondary_display_system_state_api" long-name="Secondary Display System State API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_system_state_api/group"/>
-</component>
-<component name="sensor_user_setting_api" long-name="Sensor User Setting API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/sensor_user_setting_api/group"/>
-</component>
-<component name="startup_configuration_api" long-name="Startup Configuration API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/startup_configuration_api/group"/>
-</component>
-<component name="system_application_key_handler_plugin_api" long-name="System Application Key Handler Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_key_handler_plugin_api/group"/>
-</component>
-<component name="system_application_light_control_plugin_api" long-name="System Application Light Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_light_control_plugin_api/group"/>
-</component>
-<component name="system_application_notification_api" long-name="System Application Notification API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_notification_api/group"/>
-</component>
-<component name="system_application_plugin_callback_api" long-name="System Application Plug-in Callback API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
-</component>
-<component name="flash_mmi_service_interface_custom_api" long-name="Flash MMI Service Interface Custom API" filter="s60,!sf_build" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/flash_mmi_service_interface_custom_api/group"/>
-</component>
-<component name="flash_netscape_plugin_command_api" long-name="Flash Netscape Plugin Command API" filter="s60,!sf_build" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/flash_netscape_plugin_command_api/group"/>
-</component>
-</collection>
-<collection name="contextframework" long-name="Context Framework" level="framework">
-<!-- the units that are commented out need to be put back when configuration is in place.
- They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
-<component name="cfw" filter="s60" long-name="Context Framework">
-<!--<unit bldFile="contextframework/cfw/group"/> -->
-</component>
-<component name="cfwplugins" filter="s60" long-name="Context Framework Plugins" plugin="Y">
-<!--<unit bldFile="contextframework/cfwplugins/group"/>-->
-</component>
-<component name="contextframework_build" filter="s60" long-name="Context Framework Build">
-<unit bldFile="mw/appsupport/contextframework/group"/>
-</component>
-</collection>
-<collection name="coreapplicationuis" long-name="Core Application UIs" level="server">
-<component name="dbrecovery" filter="s60" long-name="Database Recovery">
-<unit bldFile="mw/appsupport/coreapplicationuis/dbrecovery/group"/>
-</component>
-<component name="nspswsplugin" filter="s60" long-name="NSPS WS Plugin" plugin="Y">
-<!-- No Service Power Save? Window Server? Please elaborate-->
-<unit bldFile="mw/appsupport/coreapplicationuis/nspswsplugin/group"/>
-</component>
-<component name="rfs" filter="s60" long-name="Restore Factory Settings">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfs/group"/>
-</component>
-<component name="rfsplugins" filter="s60" long-name="Restore Factory Settings Plugins" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/group"/>
-</component>
-<component name="sysap" filter="s60" long-name="System Application">
-<unit bldFile="mw/appsupport/coreapplicationuis/sysap/group"/>
-</component>
-<component name="variatedsettings" filter="s60" long-name="Variated Settings" class="config">
-<unit bldFile="mw/appsupport/coreapplicationuis/variatedsettings/group"/>
-</component>
-<component name="accfwuinotifier" filter="s60" long-name="Accessory Framework UI Notifier" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/accfwuinotifier/group"/>
-</component>
-<component name="kefmapper" filter="s60" long-name="Key Event Framework">
-<unit bldFile="mw/appsupport/coreapplicationuis/kefmapper/group"/>
-</component>
-<component name="advancedtspcontroller" filter="s60" long-name="Advanced TSP Controller">
-<unit bldFile="mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
-</component>
-<component name="powersaveutilities" filter="s60" long-name="Power Save Utilities">
-<unit bldFile="mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
-</component>
-<component name="gsserverenginestub" filter="s60" long-name="GS Server Engine Stub">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
-</component>
-<component name="gsserverengine" filter="s60" long-name="GS Server Engine">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverengine/group"/>
-</component>
-<component name="sensordatacompensatorplugin" filter="s60" long-name="Sensor Data Compensator Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/group"/>
-</component>
-<component name="atcmdplugin" long-name="AT Command Plugin" filter="s60,!oem_build" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/atcmdplugin/group"/>
-</component>
-</collection>
-<collection name="flashliteapi_3_1" long-name="Flash Lite API 3.1" level="specific">
-<!-- collection is really a component. Move down a directory -->
-<component name="flashliteapi_3_1_build" long-name="Flash Lite API Build" filter="s60" introduced="^2"/>
-</collection>
-<collection name="mediakeys" long-name="Media Keys" level="plugin">
-<!-- collection is really a component. Move down a directory -->
-<component name="mediakeys_build" filter="s60" long-name="Media Keys Build">
-<unit bldFile="mw/appsupport/mediakeys/group"/>
-</component>
-</collection>
-<collection name="startupservices" long-name="Startup Services" level="system">
-<component name="splashscreen" filter="s60" long-name="Splash Screen">
-<unit bldFile="mw/appsupport/startupservices/splashscreen/group"/>
-</component>
-<component name="startupanimation" filter="s60" long-name="Startup Animation">
-<unit bldFile="mw/appsupport/startupservices/startupanimation/group"/>
-</component>
-<component name="startup" long-name="Startup Application" filter="s60">
-<unit bldFile="mw/appsupport/startupservices/startup/group"/>
-</component>
-</collection>
-<collection name="sysresmonitoring" long-name="System Resource Monitoring" level="system">
-<component name="oodmonitor" filter="s60" long-name="OOD Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oodmonitor/group"/>
-</component>
-<component name="oommonitor" filter="s60" long-name="OOM Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oommonitor/group"/>
-</component>
-</collection>
-<collection name="systemsettings" long-name="System Settings" level="system">
-<component name="gssensorplugin" filter="s60" long-name="GS Sensor Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gssensorplugin/group"/>
-</component>
-<component name="gsaccessoryplugin" filter="s60" long-name="GS Accessory Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gsaccessoryplugin/group"/>
-</component>
-</collection>
-<collection name="filehandling" long-name="File Handling" level="server">
-<component name="fileconverterfw" long-name="File Converter Framework" purpose="optional">
-<unit bldFile="mw/appsupport/filehandling/fileconverterfw/group" mrp="mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
-</component>
-<component name="htmltorichtextconverter" long-name="HTML to RichText Converter" introduced="7.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/htmltorichtextconverter/group" mrp="mw/appsupport/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
-</component>
-<component name="richtexttohtmlconverter" long-name="RichText to HTML Converter" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
-</component>
-</collection>
-<collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
-<component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
-</component>
-</collection>
-<collection name="commonappservices" long-name="Common Application Services" level="framework">
-<component name="alarmserver" long-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"/>
-</component>
-<component name="alarmservertest" long-name="Alarm Server Test" deprecated="^3" introduced="8.1" purpose="development">
-<unit bldFile="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
-</component>
-<component name="appservicesdocs" long-name="Application Services Documentation" purpose="development" class="doc">
-<unit mrp="mw/appsupport/commonappservices/appservicesdocs/app-services_documentation.mrp"/>
-</component>
-<component name="backuprestorenotification" long-name="Backup Restore Notification" introduced="8.1" purpose="optional">
-<unit bldFile="mw/appsupport/commonappservices/backuprestorenotification/group" mrp="mw/appsupport/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
-</component>
-</collection>
-<collection name="tzservices" long-name="Time Zone Services" level="plugin">
-<component name="tzserver" long-name="Time Zone Server" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzserver/group" mrp="mw/appsupport/tzservices/tzserver/group/app-services_tz.mrp"/>
-</component>
-<component name="tzloc" long-name="Time Zone Localization" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzloc/group" mrp="mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
-</component>
-<component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzlocrscfactory/group" mrp="mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
-</component>
-<component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzdatabase/group" mrp="mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
-</component>
-</collection>
-<collection name="contenthandling" long-name="Content Handling" level="plugin">
-<component name="webrecognisers" long-name="Web Recognisers" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/contenthandling/webrecognisers/group" mrp="mw/appsupport/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
-</component>
-</collection>
-<collection name="openenvutils" long-name="Open Environment Utilities" level="specific">
-<component name="commandshell" long-name="Command Shell" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/commandshell/group" mrp="mw/appsupport/openenvutils/commandshell/group/oetools_zsh.mrp"/>
-</component>
-<component name="telnetserver" long-name="Telnet Server" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/telnetserver/group" mrp="mw/appsupport/openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
-</component>
-</collection>
-<collection name="printingsupport" long-name="Printing Support" level="generic">
-<component name="printinguisupport" long-name="Printing UI Support" purpose="optional" introduced="^2" deprecated="^3">
-<unit bldFile="mw/appsupport/printingsupport/printinguisupport/group" mrp="mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
-</component>
-</collection>
-<collection name="appfw" long-name="Application Framework" level="framework">
-<component name="apparchitecture" long-name="Application Architecture" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/apparchitecture/group" mrp="mw/appsupport/appfw/apparchitecture/group/app-framework_apparc.mrp"/>
-</component>
-<component name="viewserver" long-name="View Server" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/viewserver/group" mrp="mw/appsupport/appfw/viewserver/group/app-framework_viewsrv.mrp"/>
-</component>
-</collection>
-<collection name="applaunchservices" long-name="Application Launch Services" level="generic">
-<component name="aftermarketappstarter" long-name="After Market Application Starter" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/aftermarketappstarter/group" mrp="mw/appsupport/applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
-</component>
-<component name="applaunchplugins" long-name="Application Launch Plugins" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/applaunchplugins/group" mrp="mw/appsupport/applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
-</component>
-</collection>
-<collection name="tzpcside" long-name="Time Zone PC Side" level="plugin">
-<component name="tzcompiler" long-name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config PC">
-<unit bldFile="mw/appsupport/tzpcside/tzcompiler/group" mrp="mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
-</component>
-</collection>
-<collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
-<component name="appsupport_metadata" long-name="Generic Application Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="securitysrv" level="generic" long-name="Security Services" levels="plugin framework server generic specific">
-<collection name="secsrv_plat" long-name="Security Services Platform Interfaces" level="specific">
-<component name="cms_api" long-name="CMS API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/cms_api/group"/>
-</component>
-<component name="pkcs12_parser_api" long-name="PKCS12 Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkcs12_parser_api/group"/>
-</component>
-<component name="java_utils_api" long-name="Java Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/java_utils_api/group"/>
-</component>
-<component name="wim_cert_api" long-name="WIM Cert API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/wim_cert_api/group"/>
-</component>
-<component name="device_key_store_encryption_plugin_api" long-name="Device Key Store Encryption Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/device_key_store_encryption_plugin_api/group"/>
-</component>
-<component name="x509certnameparser_api" long-name="X.509 Certificate Name Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
-</component>
-<component name="remote_lock_api" long-name="Remote Lock API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
-</component>
-<component name="pkidialog_api" long-name="PKI Dialog API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
-</component>
-<component name="provisioning_api" long-name="Provisioning API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/provisioning_api/group"/>
-</component>
-<component name="keyguard_configuration_api" long-name="Keyguard Configuration API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_configuration_api/group"/>
-</component>
-<component name="keylock_policy_api" long-name="Keylock Policy API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keylock_policy_api/group"/>
-</component>
-<component name="security_code_ui_api" long-name="Security Code UI API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
-</component>
-<component name="gba_api" long-name="GBA API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/gba_api/group"/>
-</component>
-<component name="keyguard_access_api" long-name="Keyguard Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_access_api/group"/>
-</component>
-<component name="devicelock_access_api" long-name="Device Lock Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devicelock_access_api/group"/>
-</component>
-<component name="lockapp_server_api" long-name="Lock Application Server API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
-</component>
-<component name="devencadaptation_api" long-name="Device Encryption Adaptation API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
-</component>
-<component name="devenccommonutils_api" long-name="Device Encryption Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
-</component>
-</collection>
-<collection name="cms" long-name="Certificate Management Service" level="server">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="cms_build" filter="s60" long-name="CMS" introduced="^3">
-<unit bldFile="mw/securitysrv/cms/group"/>
-</component>
-</collection>
-<collection name="pkiutilities" long-name="PKI Utilities" level="plugin">
-<component name="x509certnameparser" filter="s60" long-name="X.509 Certificate Name Parser">
-<unit bldFile="mw/securitysrv/pkiutilities/x509certnameparser/group"/>
-</component>
-<component name="pkcs12" filter="s60" long-name="PKCS #12">
-<unit bldFile="mw/securitysrv/pkiutilities/pkcs12/group"/>
-</component>
-<component name="certmanui" filter="s60" long-name="Certificate Management UI">
-<unit bldFile="mw/securitysrv/pkiutilities/certmanui/group"/>
-</component>
-<component name="ctsecuritydialogs" filter="s60" long-name="Crypto Token Security Dialogs">
-<unit bldFile="mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
-</component>
-<component name="certsaver" filter="s60" long-name="Certificate Saver">
-<unit bldFile="mw/securitysrv/pkiutilities/certsaver/group"/>
-</component>
-<component name="secmodui" filter="s60" long-name="Security Module UI">
-<unit bldFile="mw/securitysrv/pkiutilities/secmodui/group"/>
-</component>
-<component name="devicetoken" filter="s60" long-name="Device Token">
-<unit bldFile="mw/securitysrv/pkiutilities/devicetoken/group"/>
-</component>
-<component name="certificates" filter="s60" long-name="Certificates">
-<unit bldFile="mw/securitysrv/pkiutilities/Certificates/group" filter="sf_build"/>
-</component>
-<component name="pkiutilities_build" filter="s60" long-name="PKI Utilities Build">
-<!-- need to split this into the above components -->
-<unit bldFile="mw/securitysrv/pkiutilities/group"/>
-</component>
-<component name="ocsp" long-name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
-<unit bldFile="mw/securitysrv/pkiutilities/ocsp/group" mrp="mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
-</component>
-</collection>
-<collection name="wim" long-name="Wireless Identity Module " level="framework">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="wim_build" filter="s60" long-name="WIM Build">
-<unit bldFile="mw/securitysrv/wim/group"/>
-</component>
-</collection>
-<collection name="remotelock" long-name="Remote Lock" level="generic">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="remotelock_build" filter="s60" long-name="Remote Lock Build">
-<unit bldFile="mw/securitysrv/remotelock/group"/>
-</component>
-</collection>
-<collection name="securitydialogs" long-name="Security Dialogs" level="specific">
-<component name="keylockpolicyapi" filter="s60" long-name="Keylock Policy API">
-<unit bldFile="mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
-</component>
-<component name="autolock" long-name="Autolock" filter="s60">
-<unit bldFile="mw/securitysrv/securitydialogs/autolock/group"/>
-</component>
-<component name="secui" filter="s60" long-name="Security UI">
-<unit bldFile="mw/securitysrv/securitydialogs/secui/group"/>
-</component>
-<component name="securitynotifier" filter="s60" long-name="Security Notifier">
-<unit bldFile="mw/securitysrv/securitydialogs/securitynotifier/group"/>
-</component>
-<component name="lockclient" filter="s60" long-name="Lock Client" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockclient/group"/>
-</component>
-<component name="lockapp" filter="s60" long-name="Lock Application" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockapp/group"/>
-</component>
-<component name="secuinotifications" long-name="Security UI Notifications" introduced="^4" filter="s60">
-<unit bldFile="mw/securitysrv/securitydialogs/secuinotifications"/>
-</component>
-</collection>
-<collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="boottimeintegritycheck_build" filter="s60" long-name="Boot Time Integrity Check Build">
-<unit bldFile="mw/securitysrv/boottimeintegritycheck/group"/>
-</component>
-</collection>
-<collection name="gba" long-name="Generic Bootstrapping Architecture" level="server">
-<component name="uicc" filter="s60" long-name="UICC" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/uicc/group"/>
-</component>
-<component name="gbaserver" filter="s60" long-name="GBA Server" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaserver/group"/>
-</component>
-<component name="gbaapi" filter="s60" long-name="GBA API" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaapi/group"/>
-</component>
-<component name="gbafilter" filter="s60" long-name="GBA HTTP Filter" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/gbafilter/group"/>
-</component>
-<component name="gba_build" filter="s60" long-name="Generic Boot Architecture Build" introduced="^2">
-<!-- need to split this into the above components, or remove #includes and make this GBA ROM -->
-<unit bldFile="mw/securitysrv/gba/group"/>
-</component>
-</collection>
-<collection name="devencdiskutils" long-name="Device Encryption Disk Utils" level="server">
-<component name="devenccommonutils" filter="s60" long-name="Device Encryption Common Utils" introduced="^3">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncCommonUtils/group"/>
-</component>
-<component name="devencrfsplugin" filter="s60" long-name="Device Encryption RFS Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncRfsPlugin/group"/>
-</component>
-<component name="pk5recognizer" filter="s60" long-name="Device Encryption Pk5 Recognizer" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/Pk5Recognizer/group"/>
-</component>
-<component name="devencstarter" filter="s60" long-name="Device Encryption Starter" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncStarter/group"/>
-</component>
-<component name="devencdiskutils" filter="s60" long-name="Device Encryption Disk Utils Build" introduced="^3">
-<!-- need to split this into the above components, or remove #includes and make this a ROM component-->
-<unit bldFile="mw/securitysrv/devencdiskutils/group"/>
-</component>
-</collection>
-<collection name="securitysrv_info" long-name="Security Services Info" level="specific">
-<component name="securitysrv_metadata" long-name="Security Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="drm" level="generic" long-name="DRM" levels="plugin framework server generic specific">
-<collection name="drm_plat" long-name="DRM Platform Interfaces" level="specific">
-<component name="roap_api" long-name="ROAP API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/roap_api/group"/>
-</component>
-<component name="drm_common_api" long-name="DRM Common API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_common_api/group"/>
-</component>
-<component name="drm_rights_api" long-name="DRM Rights API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_rights_api/group"/>
-</component>
-<component name="drm_legacy_api" long-name="DRM Legacy API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_legacy_api/group"/>
-</component>
-<component name="dcf_repository_api" long-name="DCF Repository API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/dcf_repository_api/group"/>
-</component>
-<component name="drm_service_api" long-name="DRM Service API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_service_api/group"/>
-</component>
-<component name="drm_secondary_display_api" long-name="DRM Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_secondary_display_api/group"/>
-</component>
-<component name="drm_license_manager_api" long-name="DRM License Manager API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_license_manager_api/group"/>
-</component>
-<component name="drm_utility_api" long-name="DRM Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_utility_api/group"/>
-</component>
-<component name="drm_agents_api" long-name="DRM Agents API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_agents_api/group"/>
-</component>
-<component name="wmdrm_core_api" long-name="WM DRM Core API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_core_api/group"/>
-</component>
-<component name="wmdrm_access_api" long-name="WMDRM Access API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_access_api/group"/>
-</component>
-<component name="camese_utility_api" long-name="Camese Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_utility_api/group"/>
-</component>
-<component name="camese_framework_api" long-name="Camese Framework API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_framework_api/group"/>
-</component>
-</collection>
-<collection name="drm_pub" long-name="DRM Public Interfaces" level="specific">
-<component name="drm_helper_api" long-name="DRM Helper API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_helper_api/group"/>
-</component>
-<component name="oma_drm_caf_agent_api" long-name="OMA DRM CAF Agent API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/group"/>
-</component>
-<component name="drm_license_checker_api" long-name="DRM License Checker API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_license_checker_api/group"/>
-</component>
-</collection>
-<collection name="commondrm" long-name="Common DRM" level="generic">
-<!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
-<component name="drmencryptor" filter="s60" long-name="DRM Encryptor" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmsettingsplugin" filter="s60" long-name="DRM Settings Plugin" plugin="Y" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmrightsmanagerui" filter="s60" long-name="DRM Rights Manager UI">
-<unit bldFile="mw/drm/commondrm/drmrightsmanagerui/help/group"/>
-</component>
-<component name="drmutility" filter="s60" long-name="DRM Utility">
-<!-- Uncomment unit when configuration is in place. Currently #included from commondrm_build -->
-<!--<unit bldFile="commondrm/drmutility/group"/>-->
-</component>
-<component name="drmserviceapiwrapper" filter="s60" long-name="DRM Service API Wrapper">
-<unit bldFile="mw/drm/commondrm/drmserviceapiwrapper/group"/>
-</component>
-<component name="drmrightsstoringlocation" filter="s60" long-name="DRM Rights Storing Location">
-<unit bldFile="mw/drm/commondrm/drmrightsstoringlocation/group"/>
-</component>
-<component name="commondrm_build" filter="s60" long-name="Common DRM Build">
-<!-- should be split into the above files, or them collapsed into a single component -->
-<unit bldFile="mw/drm/commondrm/group"/>
-</component>
-</collection>
-<collection name="omadrm" long-name="OMA DRM" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="omadrm_build" filter="s60" long-name="OMA DRM Build">
-<unit bldFile="mw/drm/omadrm/group"/>
-</component>
-<component name="foundationcerts" filter="sf_build" long-name="Foundation Certificates">
-<unit bldFile="mw/drm/omadrm/foundationcerts/group"/>
-</component>
-</collection>
-<collection name="wmdrm" long-name="Windows Media DRM" level="framework">
-<!-- collection is really a component. Move down a directory -->
-<component name="wmdrm_build" filter="s60" long-name="WM DRM Build">
-<unit bldFile="mw/drm/wmdrm/group"/>
-</component>
-</collection>
-<collection name="drm_info" long-name="DRM Info" level="specific"/>
-</block>
-<block name="locationsrv" level="specific" long-name="Location Services" levels="plugin fw server if">
-<collection name="locsrv_pub" long-name="Location Services Public Interfaces" level="if">
-<component name="landmarks_search_api" long-name="Landmarks Search API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
-</component>
-<component name="landmarks_api" long-name="Landmarks API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/group"/>
-</component>
-<component name="landmarks_database_management_api" long-name="Landmarks Database Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/group"/>
-</component>
-<component name="location_triggering_api" long-name="Location Triggering API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/location_triggering_api/group"/>
-</component>
-<component name="blid_application_satellite_info_api" long-name="BLID Application Satellite Info API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/group"/>
-</component>
-</collection>
-<collection name="locsrv_plat" long-name="Location Services Platform Interfaces" level="if">
-<component name="map_and_navigation_api" long-name="Map and Navigation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/group"/>
-</component>
-<component name="map_and_navigation_provider_discovery_api" long-name="Map and Navigation Provider Discovery API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/group"/>
-</component>
-<component name="geocoding_api" long-name="Geocoding API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
-</component>
-<component name="map_image_api" long-name="Map Image API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/group"/>
-</component>
-<component name="map_and_navigation_aiw_api" long-name="Map and Navigation AIW API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_aiw_api/group"/>
-</component>
-<component name="map_and_navigation_provider_api" long-name="Map and Navigation Provider API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_api/group"/>
-</component>
-<component name="landmarks_category_definition_api" long-name="Landmarks Category Definition API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
-</component>
-<component name="supl_settings_api" long-name="SUPL Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
-</component>
-<component name="location_settings_launch_api" long-name="Location Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/group"/>
-</component>
-<component name="map_image_conversion_plugin_api" long-name="Map Image Conversion Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/group"/>
-</component>
-<component name="psy_configuration_ui_plugin_api" long-name="PSY Configuration UI Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/psy_configuration_ui_plugin_api/group"/>
-</component>
-<component name="np_proxy_configuration_api" long-name="NP Proxy Configuration API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/np_proxy_configuration_api/group"/>
-</component>
-<component name="supl_terminal_initiation_api" long-name="SUPL Terminal Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/group"/>
-</component>
-<component name="location_notation_preferences_settings_api" long-name="Location Notation Preferences Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_notation_preferences_settings_api/group"/>
-</component>
-<component name="supl_settings_notifier_secondary_display_api" long-name="SUPL Settings Notifier Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_notifier_secondary_display_api/group"/>
-</component>
-<component name="supl_network_initiation_api" long-name="SUPL Network Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/group"/>
-</component>
-<component name="privacy_notifiers_secondary_display_api" long-name="Privacy Notifiers Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/privacy_notifiers_secondary_display_api/group"/>
-</component>
-<component name="oma_supl_configuration_parameter_api" long-name="OMA SUPL Configuration Parameter API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_configuration_parameter_api/group"/>
-</component>
-<component name="supl_query_secondary_display_api" long-name="SUPL Query Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_query_secondary_display_api/group"/>
-</component>
-<component name="location_triggering_management_api" long-name="Location Triggering Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_management_api/group"/>
-</component>
-<component name="location_triggering_status_information_api" long-name="Location Triggering Status Information API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_status_information_api/group"/>
-</component>
-<component name="oma_supl_asn_codec_plugin_api" long-name="OMA SUPL ASN Codec Plugin API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
-</component>
-<component name="query_and_notification_api" long-name="Query and Notification API" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/query_and_notification_api/group"/>
-</component>
-<component name="location_local_variation_api" long-name="Location Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_local_variation_api/group"/>
-</component>
-</collection>
-<collection name="genericpositioningplugins" long-name="Generic Positioning Plugins" level="plugin">
-<component name="locationnpppsy" filter="s60" long-name="Location Positioning Proxy PSY" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
-</component>
-<component name="locationsuplpsy" filter="s60" long-name="Location SUPL PSY" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationsuplpsy/group"/>
-</component>
-<component name="genericpositioningplugins_build" filter="s60" long-name="Generic Positioning Plugins Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/genericpositioningplugins/group"/>
-</component>
-</collection>
-<collection name="landmarks" long-name="Landmarks" level="server">
-<component name="locationlandmarks" filter="s60" long-name="Location Landmarks">
-<unit bldFile="mw/locationsrv/landmarks/locationlandmarks/group"/>
-</component>
-</collection>
-<collection name="locationmapnavfw" long-name="Location Map and Navigation Framework" level="fw">
-<component name="mnlibrary" filter="s60" long-name="Map and Navigation Library">
-<unit bldFile="mw/locationsrv/locationmapnavfw/library/group"/>
-</component>
-<component name="mnaiwprovider" filter="s60" long-name="Map and Navigation AIW Provider" plugin="Y">
-<unit bldFile="mw/locationsrv/locationmapnavfw/aiwprovider/group"/>
-</component>
-<component name="locationmapnavfw_build" filter="s60" long-name="Location Map and Navigation Framework Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/locationmapnavfw/group"/>
-</component>
-</collection>
-<collection name="locationsystemui" long-name="Location System UI" level="if">
-<component name="locationsysui" filter="s60" long-name="Location System UI">
-<unit bldFile="mw/locationsrv/locationsystemui/locationsysui/group"/>
-</component>
-</collection>
-<collection name="supl" long-name="SUPL" level="fw">
-<component name="locationsuplfw" filter="s60" long-name="Location SUPL Framework">
-<unit bldFile="mw/locationsrv/supl/locationsuplfw/group"/>
-</component>
-<component name="locationomasuplprotocolhandler" filter="s60" long-name="OMA SUPL Protocol Handler">
-<unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/group"/>
-</component>
-<component name="supltiapiimplementation" filter="s60" long-name="SUPL TI API Implementation" introduced="^3">
-<unit bldFile="mw/locationsrv/supl/supltiapiimplementation/group"/>
-</component>
-</collection>
-<collection name="locationtriggering" long-name="Location Triggering" level="server">
-<component name="ltlogger" filter="s60" long-name="LT Logger">
-<unit bldFile="mw/locationsrv/locationtriggering/ltlogger/group"/>
-</component>
-<component name="ltclientlib" filter="s60" long-name="LT Client Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltclientlib/group"/>
-</component>
-<component name="ltmanagementlib" filter="s60" long-name="LT Management Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmanagementlib/group"/>
-</component>
-<component name="ltcontainer" filter="s60" long-name="LT Container">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontainer/group"/>
-</component>
-<component name="ltserver" filter="s60" long-name="LT Server">
-<unit bldFile="mw/locationsrv/locationtriggering/ltserver/group"/>
-</component>
-<component name="ltstrategypluginapi" filter="s60" long-name="LT Strategy Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategypluginapi/group"/>
-</component>
-<component name="ltstrategyengine" filter="s60" long-name="LT Strategy Engine">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategyengine/group"/>
-</component>
-<component name="ltmovementdetectionpluginapi" filter="s60" long-name="Movement Detection Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmovementdetectionpluginapi/group"/>
-</component>
-<component name="ltcellidmovementdetector" filter="s60" long-name="Cell ID Movement Detector">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/>
-</component>
-<component name="lbtmgmtui" filter="s60" long-name="LBT Management UI" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/lbtmgmtui/group"/>
-</component>
-<component name="ltcontextsourceplugin" filter="s60" long-name="LT Context Source Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontextsourceplugin/group"/>
-</component>
-<component name="locationtriggering_build" filter="s60" long-name="Location Triggering Build">
-<!-- should remove #include from this and maybe put exports in the above components -->
-<unit bldFile="mw/locationsrv/locationtriggering/group"/>
-</component>
-</collection>
-</block>
-<block name="accesssec" level="generic" long-name="Access Security" levels="plugin framework server generic specific">
-<collection name="accesssec_plat" long-name="Access Security Platform Interfaces" level="specific">
-<component name="wapi_security_settings_ui_api" long-name="WAPI Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_security_settings_ui_api/group"/>
-</component>
-<component name="wep_security_settings_ui_api" long-name="WEP Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wep_security_settings_ui_api/group"/>
-</component>
-<component name="wi-fi_protected_setup_ui_api" long-name="Wi-Fi Protected Setup UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
-</component>
-<component name="wlan_eap_settings_ui_api" long-name="WLAN EAP Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wlan_eap_settings_ui_api/group"/>
-</component>
-<component name="wpa_security_settings_ui_api" long-name="WPA Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wpa_security_settings_ui_api/group"/>
-</component>
-<component name="eap_vpn_api" long-name="EAP VPN API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
-</component>
-<component name="eapsim_db_api" long-name="EAP-SIM DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapsim_db_api/group"/>
-</component>
-<component name="eap_type_api" long-name="EAP Type API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_type_api/group"/>
-</component>
-<component name="eaptlspeap_db_api" long-name="EAP-TLS-PEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eaptlspeap_db_api/group"/>
-</component>
-<component name="eapleap_db_api" long-name="LEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapleap_db_api/group"/>
-</component>
-<component name="eapgtc_db_api" long-name="EAP-GTC DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapgtc_db_api/group"/>
-</component>
-<component name="eapmschapv2_db_api" long-name="EAP-MSCHAPV2 DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapmschapv2_db_api/group"/>
-</component>
-<component name="eapaka_db_api" long-name="EAP-AKA DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapaka_db_api/group"/>
-</component>
-<component name="wapi_db_api" long-name="WAPI DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_db_api/group"/>
-</component>
-</collection>
-<collection name="wlansecuritysettings" long-name="WLAN Security Settings" level="specific">
-<component name="wapisecuritysettingsui" filter="s60" long-name="WAPI Security Settings UI" introduced="9.1">
-<!-- the directory for this needs to be moved up to the right level -->
-<unit bldFile="mw/accesssec/wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
-</component>
-<component name="wepsecuritysettingsui" filter="s60" long-name="WEP Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wepsecuritysettingsui/group"/>
-</component>
-<component name="wifiprotectedsetup" filter="s60" long-name="WIFI Protected Setup" introduced="^1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wifiprotectedsetup/group"/>
-</component>
-<component name="wlaneapsettingsui" filter="s60" long-name="WLAN EAP Settings UI" introduced="9.3">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wlaneapsettingsui/group"/>
-</component>
-<component name="wpasecuritysettingsui" filter="s60" long-name="WPA Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wpasecuritysettingsui/group"/>
-</component>
-</collection>
-<collection name="eapol" long-name="EAPOL" level="framework">
-<component name="eapol_framework" filter="s60" long-name="EAPOL Framework" introduced="9.2">
-<unit bldFile="mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
-</component>
-</collection>
-</block>
-<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>
-<component name="bearer_settings_plugin_api" long-name="Bearer Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/bearer_settings_plugin_api/group"/>
-</component>
-<component name="commsdat_wlan_api" long-name="CommsDat WLAN API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/commsdat_wlan_api/group"/>
-</component>
-<component name="connection_monitor_extension_api" long-name="Connection Monitor Extension API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_monitor_extension_api/group"/>
-</component>
-<component name="connection_ui_utilities_api" long-name="Connection UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_ui_utilities_api/group"/>
-</component>
-<component name="disconnect_dialog_api" long-name="Disconnect Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_api/group"/>
-</component>
-<component name="disconnect_dialog_disable_api" long-name="Disconnect Dialog Disable API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_disable_api/group"/>
-</component>
-<component name="extended_connection_settings_api" long-name="Extended Connection Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/extended_connection_settings_api/group"/>
-</component>
-<component name="mpm_default_connection_api" long-name="MPM Default Connection API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_default_connection_api/group"/>
-</component>
-<component name="pdpcontextmanager2_reset_factory_settings_api" long-name="PDP Context Manager 2 Reset Factory Settings API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_settings_api/group"/>
-</component>
-<component name="mpm_connect_screen_api" long-name="MPM Connect Screen API" filter="s60" class="api">
-<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="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>
-<component name="access_point_engine_api" long-name="Access Point Engine API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_monitor_server_api/group"/>
-</component>
-<component name="connection_settings_ui_api" long-name="Connection Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_ui_api/group"/>
-</component>
-<component name="agent_dialog_api" long-name="Agent Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/agent_dialog_api/group"/>
-</component>
-<component name="extendedconnpref_api" long-name="Extended Connection Preferences API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/extendedconnpref_api/group"/>
-</component>
-</collection>
-<collection name="accesspointcontrol" long-name="Access Point Control" level="plugin">
-<component name="apcontrollistplugin" filter="s60" long-name="Access Point Control List Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
-</component>
-</collection>
-<collection name="alwayson_net_plugin" long-name="Always Online Net Plugin" level="server">
-<component name="pdpcontextmanager2" filter="s60" long-name="PDP Context Manager 2">
-<unit bldFile="mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
-</component>
-</collection>
-<collection name="apengine" long-name="Access Point Engine" level="framework">
-<component name="apeng" filter="s60" long-name="Access Point Engine">
-<unit bldFile="mw/ipconnmgmt/apengine/apeng/group"/>
-</component>
-<component name="apsettingshandlerui" filter="s60" long-name="Access Point Settings Handler UI">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingshandlerui/group"/>
-</component>
-<component name="apsettingsplugin" filter="s60" long-name="Access Point Settings Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="bearermanagement" long-name="Bearer Management" level="framework">
-<component name="mpm" filter="s60" long-name="Mobility Policy Manager">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/mpm/group"/>
-</component>
-<component name="extendedconnpref" filter="s60" long-name="Extended Connection Preferences">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/extendedconnpref/group"/>
-</component>
-<component name="s60mcpr" filter="s60" long-name="S60 Meta-Connection Provider" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/S60MCPR/group"/>
-</component>
-</collection>
-<collection name="cmmanager" long-name="Connection Method Manager" level="framework">
-<component name="cmmgr" filter="s60" long-name="CM Manager">
-<unit bldFile="mw/ipconnmgmt/cmmanager/cmmgr/group"/>
-</component>
-<component name="gsconnsettingsplugin" filter="s60" long-name="GS Connection Settings Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/cmmanager/gsconnsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="connectionmonitoring" long-name="Connection Monitoring" level="server">
-<component name="connectionmonitorplugin" filter="s60" long-name="Connection Monitor Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorplugin/group"/>
-</component>
-<component name="connectionmonitorui" filter="s60" long-name="Connection Monitor UI">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorui/group"/>
-</component>
-<component name="connmon" filter="s60" long-name="Connection Monitor">
-<!-- either split into two components, or #include from a common bld.inf -->
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/connectionmonitor/group"/>
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/dataconnectionlogger/group"/>
-</component>
-<component name="connmonext" filter="s60" long-name="Connection Monitor Extension API">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmonext/group"/>
-</component>
-</collection>
-<collection name="connectionutilities" long-name="Connection Utilities" level="utils">
-<component name="connectiondialogs" filter="s60" long-name="Connection Dialogs">
-<unit bldFile="mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/>
-</component>
-</collection>
-<collection name="dbcreator" long-name="DB Creator" level="utils">
-<component name="commsdatcreator" filter="s60" long-name="Comms Database Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
-</component>
-<component name="commsdatcreatorrfsplugin" filter="s60" long-name="Comms Database Creator RFS Plugin" introduced="9.3" plugin="Y">
-<!-- uncomment when config is turned on -->
-<!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
-</component>
-<component name="commsdatstartup" filter="s60" long-name="Comms Database Startup" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
-</component>
-<component name="dbcreatorexe" filter="s60" long-name="DB Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
-</component>
-<component name="dbcreator_build" filter="s60" long-name="DB Creator Build" introduced="9.3">
-<!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
-<unit bldFile="mw/ipconnmgmt/dbcreator/group"/>
-</component>
-</collection>
-<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"/>
-</component>
-<component name="ipcm_qt_build" long-name="IP Connectivity Management Qt Build" introduced="^4">
-<unit bldFile="mw/ipconnmgmt"/>
-</component>
-</collection>
-</block>
-<block name="netprotocols" level="generic" long-name="High-level Internet Protocols" levels="plugin framework server generic specific">
-<collection name="netprotocols_plat" long-name="High-level Internet Protocols Platform Interfaces" level="specific">
-<component name="cookie_manager_api" long-name="Cookie Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/cookie_manager_api/group"/>
-</component>
-<component name="http_cache_mgr_api" long-name="HTTP Cache Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_cache_mgr_api/group"/>
-</component>
-<component name="http_filters_api" long-name="HTTP Filters API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_filters_api/group"/>
-</component>
-</collection>
-<collection name="httpfilters" long-name="HTTP Filters" level="plugin">
-<component name="httpfiltercommon" filter="s60" long-name="HTTP Filter Common">
-<unit bldFile="mw/netprotocols/httpfilters/httpfiltercommon/group"/>
-</component>
-<component name="cookie" filter="s60" long-name="Cookie Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/cookie/group"/>
-</component>
-<component name="deflatefilter" filter="s60" long-name="Deflate Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/deflatefilter/group"/>
-</component>
-<component name="httpfilteracceptheader" filter="s60" long-name="Accept Header Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteracceptheader/group"/>
-</component>
-<component name="httpfilterauthentication" filter="s60" long-name="Authentication Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterauthentication/group"/>
-</component>
-<component name="httpfilterconnhandler" filter="s60" long-name="Connection Handler Fitler" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterconnhandler/group"/>
-</component>
-<component name="httpfilteriop" filter="s60" long-name="HTTP IOP Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteriop/group"/>
-</component>
-<component name="httpfilterproxy" filter="s60" long-name="HTTP Proxy Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterproxy/group"/>
-</component>
-<component name="uaproffilter" filter="s60" long-name="UAProf Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/uaproffilter/group"/>
-</component>
-</collection>
-<collection name="applayerprotocols" long-name="Application Layer Protocols" level="server">
-<component name="httptransportfw" long-name="HTTP Transport Framework" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
-</component>
-<component name="httpexamples" long-name="HTTP Examples" introduced="6.2" purpose="development">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpexamples/group" mrp="mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
-</component>
-<component name="wappushsupport" long-name="WAP Push Support" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
-</component>
-<component name="wapbase" long-name="WAP Base" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wapbase/Group" mrp="mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
-</component>
-<component name="ftpengine" long-name="FTP Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/ftpengine/group" mrp="mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
-</component>
-<component name="telnetengine" long-name="Telnet Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/telnetengine/group" mrp="mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
-</component>
-<component name="httpserviceapi" long-name="HTTP Service API" introduced="TB9.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpservice/group" mrp="mw/netprotocols/applayerprotocols/httpservice/group/http_service.mrp"/>
-</component>
-</collection>
-<collection name="applayerpluginsandutils" long-name="Application Layer Plugins and Utils" level="framework">
-<component name="uripermissionservices" long-name="URI Permission Services" introduced="^2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
-</component>
-<component name="bookmarksupport" long-name="Bookmark Support" introduced="9.1" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
-</component>
-<component name="httpprotocolplugins" long-name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
-</component>
-<component name="httptransportplugins" long-name="HTTP Transport Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
-</component>
-</collection>
-<collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
-<component name="netprotocols_metadata" long-name="High-level Internet Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ipappprotocols" level="generic" long-name="IP App Protocols" levels="plugin conn server if">
-<collection name="ipappprotocols_plat" long-name="IP App Protocols Platform Interfaces" level="if">
-<component name="srtp_api" long-name="SRTP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/srtp_api/group"/>
-</component>
-<component name="rtprtcp_api" long-name="RTP/RTCP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/rtprtcp_api/group"/>
-</component>
-</collection>
-<collection name="rtp" long-name="RTP" level="server">
-<component name="srtpstack" filter="s60" long-name="SRTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/srtpstack/group"/>
-</component>
-<component name="rtpstack" filter="s60" long-name="RTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/rtpstack/group"/>
-</component>
-</collection>
-<collection name="realtimenetprots" long-name="Real Time Net Protocols" level="server">
-<component name="symrtp" long-name="RTP" introduced="9.0" purpose="optional">
-<!-- Real Time Data Protocol -->
-<unit bldFile="mw/ipappprotocols/realtimenetprots/rtp/group" mrp="mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
-</component>
-<component name="srtp" long-name="Secure RTP" introduced="^4" purpose="optional">
-<unit bldFile="mw/ipappprotocols/realtimenetprots/srtp/group" mrp="mw/ipappprotocols/realtimenetprots/srtp/group/mm-protocols_srtp.mrp"/>
-</component>
-<component name="sipfw" long-name="SIP Framework" introduced="9.2" purpose="optional">
-<unit bldFile="mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp" version="2"/>
-</component>
-</collection>
-<collection name="sipplugins" long-name="SIP Plugins" level="plugin">
-<component name="sippwlanplugin" filter="s60" long-name="SIP WLAN Plugin" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
-</component>
-<component name="sippsipsettingsui" filter="s60" long-name="SIP Settings UI" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
-</component>
-<component name="sippdevmgmtsipadapter" filter="s60" long-name="Device Management SIP Settings Adapter" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
-</component>
-<component name="sippsystemstatemonitor" filter="s60" long-name="SIP System State Monitor" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsystemstatemonitor/group"/>
-</component>
-<component name="sippsipadapter" filter="s60" long-name="SIP Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipadapter/group"/>
-</component>
-</collection>
-<collection name="sipproviderplugins" long-name="SIP Provider Plugins" level="conn">
-<component name="sipprovider" long-name="SIP Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipproviderplugins/sipprovider/group" mrp="mw/ipappprotocols/sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
-</component>
-</collection>
-<collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="if">
-<component name="ipappprotocols_metadata" long-name="IP App Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wirelessacc" level="specific" long-name="Wireless Access" levels="framework generic ui">
-<collection name="hsfw_plat" long-name="HotSpot Framework Platform Interfaces" level="ui">
-<component name="hotspot_framework_client_api" long-name="HotSpot Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_api" long-name="Internet Connectivity Test Service API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_settings_api" long-name="Internet Connectivity Test Service Settings API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
-</component>
-<component name="hotspot_framework_client_plugin_api" long-name="HotSpot Framework Client Plugin API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
-</component>
-</collection>
-<collection name="hotspotfw" long-name="HotSpot Framework" level="framework">
-<component name="hsserver" filter="s60" long-name="HotSpot Server" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="hsclient" filter="s60" long-name="HotSpot Client" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="internetconnectivitytestservice" filter="s60" long-name="Internet Connectivity Test Service" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
-</component>
-<component name="ictsdialogs" filter="s60" long-name="Internet Connectivity Test Service Dialogs" deprecated="^3" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
-</component>
-<component name="hspluginforagent" filter="s60" long-name="HotSpot Plugin for Agent" plugin="Y" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
-</component>
-<component name="hsbrowser" filter="s60" long-name="HotSpot Browser" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
-</component>
-<component name="hotspotfw_build" filter="s60" long-name="Hotspot Framework Build">
-<!-- should break up this bld.inf into the above components, or collapse them all into a single component -->
-<unit bldFile="mw/wirelessacc/hotspotfw/group"/>
-</component>
-</collection>
-<collection name="wlanutilities" long-name="WLAN Utilities" level="generic">
-<component name="wlanutilities_build" long-name="WLAN Utilities Qt" introduced="^4" filter="s60">
-<!-- is this uinit needed, or is it sufficient to uncomment the units in the below components? -->
-<unit bldFile="mw/wirelessacc/wlanutilities"/>
-</component>
-<component name="wlanqtutilities" filter="s60" long-name="WLAN Qt Utilities" introduced="^4" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlanplugin/group" qt:proFile="wlanqtutilities.pro"/>-->
-</component>
-<component name="wlansniffer" filter="s60" long-name="WLAN Sniffer" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlansettingsui/group" qt:proFile="wlansniffer.pro"/>-->
-</component>
-<component name="wlanentryplugin" filter="s60" long-name="WLAN Entry Plugin" plugin="Y" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlansniffer/group" qt:proFile="wlanentryplugin.pro"/>-->
-</component>
-<component name="wlanindicatorplugin" filter="s60" long-name="WLAN Indicator Plugin" plugin="Y" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlanindicatorplugin/group" qt:proFile="wlanindicatorplugin.pro"/>-->
-</component>
-</collection>
-</block>
-<block name="vpnclient" level="specific" long-name="VPN Client" levels="engine ui api">
-<!-- is the !oem_build filter needed? -->
-<collection name="vpnc_plat" long-name="VPN Client Platform Interfaces" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API" class="api">
-<unit bldFile="mw/vpnclient/vpnc_plat/vpnapi/group"/>
-</component>
-</collection>
-<collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API">
-<unit bldFile="mw/vpnclient/vpnapiimpl/group"/>
-</component>
-</collection>
-<collection name="vpnengine" long-name="VPN Engine" level="engine">
-<!-- too many components in this collection.
- Probably best to group the binaries together into larger components
- or maybe split the collection into more reasonable groups -->
-<component name="eventmediatorapi" filter="s60" long-name="Event Mediator API">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediatorapi/group"/>
-</component>
-<component name="eventviewer" filter="s60" long-name="Event Viewer">
-<unit bldFile="mw/vpnclient/vpnengine/eventviewer/group"/>
-</component>
-<component name="vpnins" filter="s60" long-name="VPN Installer">
-<unit bldFile="mw/vpnclient/vpnengine/vpnins/group"/>
-</component>
-<component name="ikepolparser" filter="s60" long-name="IKE Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/ikepolparser/group"/>
-</component>
-<component name="utlbase64" filter="s60" long-name="Base64 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlbase64/group"/>
-</component>
-<component name="utlcrypto" filter="s60" long-name="Crypto Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlcrypto/group"/>
-</component>
-<component name="utlxml" filter="s60" long-name="XML Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlxml/group"/>
-</component>
-<component name="utlpkcs10" filter="s60" long-name="PKCS#10 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs10/group"/>
-</component>
-<component name="pkiserviceapi" filter="s60" long-name="PKI Service API">
-<unit bldFile="mw/vpnclient/vpnengine/pkiserviceapi/group"/>
-</component>
-<component name="ikecert" filter="s60" long-name="IKE Certificate Management">
-<unit bldFile="mw/vpnclient/vpnengine/ikecert/group"/>
-</component>
-<component name="kmdapi" filter="s60" long-name="Key Management Daemon API">
-<unit bldFile="mw/vpnclient/vpnengine/kmdapi/group"/>
-</component>
-<component name="kmdserver" filter="s60" long-name="Key Management Daemon Server">
-<unit bldFile="mw/vpnclient/vpnengine/kmdserver/group"/>
-</component>
-<component name="ikeutils" filter="s60" long-name="Internet Key Exchange Utils">
-<unit bldFile="mw/vpnclient/vpnengine/ikeutils/group"/>
-</component>
-<component name="ikev1lib" filter="s60" long-name="IKEv1 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev1lib/group"/>
-</component>
-<component name="ikev2lib" filter="s60" long-name="IKEv2 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev2lib/group"/>
-</component>
-<component name="vpnipsecpolparser" filter="s60" long-name="VPN IPsec Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/vpnipsecpolparser/group"/>
-</component>
-<component name="sit" filter="s60" long-name="Socket Interaction Thread">
-<unit bldFile="mw/vpnclient/vpnengine/sit/group"/>
-</component>
-<component name="vpntcwrapper" filter="s60" long-name="VPN Terminal Control Wrapper">
-<unit bldFile="mw/vpnclient/vpnengine/vpntcwrapper/group"/>
-</component>
-<component name="eventmediator" filter="s60" long-name="Event Mediator">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediator/group"/>
-</component>
-<component name="pkiservice" filter="s60" long-name="PKI Service">
-<unit bldFile="mw/vpnclient/vpnengine/pkiservice/group"/>
-</component>
-<component name="vpnconnagt" filter="s60" long-name="VPN Connection Agent">
-<unit bldFile="mw/vpnclient/vpnengine/vpnconnagt/group"/>
-</component>
-<component name="vpnmanager" filter="s60" long-name="VPN Manager">
-<unit bldFile="mw/vpnclient/vpnengine/vpnmanager/group"/>
-</component>
-<component name="vpncleaner" filter="s60" long-name="VPN Cleaner">
-<unit bldFile="mw/vpnclient/vpnengine/vpncleaner/group"/>
-</component>
-<component name="utlpkcs12" filter="s60" long-name="PKCS#12 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs12/group"/>
-</component>
-<component name="dmadengine" filter="s60" long-name="DM Adapter Engine">
-<unit bldFile="mw/vpnclient/vpnengine/dmadengine/group"/>
-</component>
-<component name="dmadipsecvpn" filter="s60" long-name="IPsec VPN DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadipsecvpn/group"/>
-</component>
-<component name="dmadpki" filter="s60" long-name="PKI DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadpki/group"/>
-</component>
-<component name="ikesocket" filter="s60" long-name="IKE Socket" introduced="^3">
-<unit bldFile="mw/vpnclient/vpnengine/ikesocket/group"/>
-</component>
-</collection>
-<collection name="vpnui" long-name="VPN UI" level="ui">
-<component name="vpnecomnotifier" filter="s60" long-name="VPN ECOM Notifier" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnecomnotifier/group"/>
-</component>
-<component name="vpndialogmanager" filter="s60" long-name="VPN Dialog Manager">
-<unit bldFile="mw/vpnclient/vpnui/vpndialogmanager/group"/>
-</component>
-<component name="vpnmanagementui" filter="s60" long-name="VPN Management UI" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnmanagementui/group"/>
-</component>
-<component name="vpnpolins" filter="s60" long-name="VPN Policy Installer">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolins/group"/>
-</component>
-<component name="vpnpolicyrecognizer" filter="s60" long-name="VPN Policy Recognizer" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolicyrecognizer/group"/>
-</component>
-</collection>
-<collection name="vpnclient_info" long-name="VPN Client Info" level="api">
-<component name="vpnclient_help" filter="s60" long-name="VPN Client Help">
-<unit bldFile="mw/vpnclient/help/group"/>
-</component>
-<component name="vpnclient_build" filter="s60" long-name="VPN Client Build">
-<!-- should split this up into the other components and remove this-->
-<unit bldFile="mw/vpnclient/group"/>
-</component>
-</collection>
-</block>
-<block name="ipappsrv" level="specific" long-name="IP App Services" levels="framework generic server conn plugin">
-<collection name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" level="plugin">
-<component name="transcoder_api" long-name="Transcoder API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
-</component>
-<component name="comms_event_api" long-name="Comms Event API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/comms_event_api/group"/>
-</component>
-<component name="floor_control_api" long-name="Floor Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/floor_control_api/group"/>
-</component>
-<component name="media_control_api" long-name="Media Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/media_control_api/group"/>
-</component>
-<component name="multimedia_comms_api" long-name="Multimedia Comms API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/multimedia_comms_api/group"/>
-</component>
-<component name="nat_settings_api" long-name="NAT Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/nat_settings_api/group"/>
-</component>
-</collection>
-<collection name="natfw" long-name="NAT Framework" level="framework">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="natfw_build" filter="s60" long-name="NAT Framework Build" introduced="^2">
-<unit bldFile="mw/ipappsrv/natfw/group"/>
-</component>
-</collection>
-<collection name="multimediacommscontroller" long-name="Multimedia Comms Controller" level="conn">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommscontroller_build" filter="s60" long-name="Multimedia Comms Controller Build">
-<unit bldFile="mw/ipappsrv/multimediacommscontroller/group"/>
-</component>
-</collection>
-<collection name="multimediacommsengine" long-name="Multimedia Comms Engine" level="generic">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommsengine_build" filter="s60" long-name="Multimedia Comms Engine Build">
-<unit bldFile="mw/ipappsrv/multimediacommsengine/group"/>
-</component>
-</collection>
-<collection name="natplugins" long-name="NAT Plugins" level="plugin">
-<component name="natpcliprovisioningnatfwadapter" filter="s60" long-name="Client Provisioning NAT Framework Traversal Adapter" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/group"/>
-</component>
-<component name="natpdevmgmtnatfwadapter" filter="s60" long-name="Device Management NAT Framework Traversal Adapter" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/group"/>
-</component>
-<component name="natptraversalcontroller" filter="s60" long-name="NAT Traversal Controller" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natptraversalcontroller/group"/>
-</component>
-<component name="natpnatfwsdpprovider" filter="s60" long-name="NAT Framework SDP Provider" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpnatfwsdpprovider/group"/>
-</component>
-</collection>
-<collection name="ipappsrv_info" long-name="IP App Services Info" level="plugin">
-<component name="ipappsrv_build" long-name="IP App Services Build" filter="s60">
-<!-- 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">
-<collection name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" level="specific">
-<component name="sat_refresh_api" long-name="SAT Refresh API" filter="s60" class="api"/>
-<component name="sat_client_api" long-name="SAT Client API" filter="s60" class="api"/>
-<component name="sat_service_api" long-name="SAT Service API" filter="s60" class="api"/>
-<component name="call_information_api" long-name="Call Information API" filter="s60" class="api"/>
-<component name="call_remote_party_information_api" long-name="Call Remote Party Information API" filter="s60" class="api"/>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api"/>
-</collection>
-<collection name="cellular" long-name="Cellular" level="server">
-<component name="telephonysettings" filter="s60" long-name="Telephony Settings" purpose="development"/>
-<component name="sssettings" filter="s60" long-name="Supplementary Service Settings" purpose="development"/>
-<component name="psetnotesui" filter="s60" long-name="Phone Settings Notes UI" purpose="development"/>
-</collection>
-<collection name="convergedcallengine" long-name="Converged Call Engine" level="framework">
-<component name="cce" filter="s60" long-name="CCE" purpose="development"/>
-<component name="spsettings" filter="s60" long-name="Service Provider Settings" purpose="development"/>
-</collection>
-<collection name="phoneclientserver" long-name="Phone Client/Server" level="server">
-<component name="aiwdialdata" filter="s60" long-name="AIW Dial Data" purpose="development"/>
-<component name="dialutils" filter="s60" long-name="Dial Utils" purpose="development"/>
-<component name="phoneclient" filter="s60" long-name="Phone Client" purpose="development"/>
-</collection>
-<collection name="phonesrv_info" long-name="Phone Server Info" level="generic">
-<component name="phonesrv_build" long-name="Phone Server Build" filter="s60">
-<unit bldFile="mw/phonesrv"/>
-</component>
-</collection>
-</block>
-<block name="messagingmw" level="specific" long-name="Messaging Middleware" levels="stack support fw api">
-<collection name="msgfw_plat" long-name="Messaging Middleware Platform Interfaces" level="api">
-<component name="always_online_plugin_api" long-name="Always Online Plugin API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_plugin_api/group"/>
-</component>
-<component name="always_online_client_api" long-name="Always Online Client API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_client_api/group"/>
-</component>
-<component name="msg_common_utils_api" long-name="Messaging Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/msg_common_utils_api/group"/>
-</component>
-<component name="muiu_utils_api" long-name="Messaging Center UI Utilities API" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/muiu_utils_api/group"/>
-</component>
-</collection>
-<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" class="config">
-<unit bldFile="mw/messagingmw/msgbranched/group"/>
-</component>
-</collection>
-<collection name="messagingfw" long-name="Messaging Framework" level="fw">
-<!-- should break this collection up into smaller related collections -->
-<component name="send_ui_api" long-name="Send UI API" filter="s60" deprecated="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/send_ui_api/group"/>
-</component>
-<component name="send_ui_plugin_api" long-name="Send UI Plug-in API" filter="s60" deprecated="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/send_ui_plugin_api/group"/>
-</component>
-<component name="send_ui_datautils_api" long-name="Send UI Data Utils API" filter="s60" deprecated="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/send_ui_datautils_api/group"/>
-</component>
-<component name="alwaysonline" filter="s60" long-name="Always Online Server" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/alwaysonline/group"/>
-</component>
-<component name="msgcommonutils" filter="s60" long-name="Messaging Common Utils" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/msgcommonutils/group"/>
-</component>
-<component name="senduiservices" filter="s60" long-name="Send UI Services" introduced="^2" deprecated="^4">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/senduiservices/group"/>
-</component>
-<component name="muiuutils" long-name="Messaging Center UI Utilities" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/muiuutils/group"/>
-</component>
-<component name="scheduledsendmtm" long-name="Scheduled Send MTM" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/group" mrp="mw/messagingmw/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
-</component>
-<component name="msgsrvnstore" long-name="Message Server and Store" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/group" mrp="mw/messagingmw/messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
-</component>
-<component name="biomsgfw" long-name="BIO Messaging Framework" introduced="6.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/group" mrp="mw/messagingmw/messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
-</component>
-<component name="msgconf" long-name="Messaging Config" introduced="^2" purpose="optional" class="config">
-<unit bldFile="mw/messagingmw/messagingfw/msgconf/group" mrp="mw/messagingmw/messagingfw/msgconf/group/messaging_config.mrp"/>
-</component>
-<component name="watcherfw" long-name="Watcher Framework" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/watcherfw/group" mrp="mw/messagingmw/messagingfw/watcherfw/group/messaging_watcher.mrp"/>
-</component>
-<component name="msgtest" long-name="Messaging Test" purpose="development">
-<unit bldFile="mw/messagingmw/messagingfw/msgtest/group" mrp="mw/messagingmw/messagingfw/msgtest/group/messaging_test.mrp"/>
-</component>
-<component name="sendas" long-name="Send As" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/sendas/group" mrp="mw/messagingmw/messagingfw/sendas/group/messaging_sendas2.mrp"/>
-</component>
-<component name="msgurlhandler" long-name="Message URL Handler" introduced="7.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/group" mrp="mw/messagingmw/messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
-</component>
-<component name="wappushfw" long-name="WAP Push Framework" introduced="6.1" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/wappushfw/group" mrp="mw/messagingmw/messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
-</component>
-<component name="suplsmshandler" long-name="SUPL SMS Handler" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplsmshandler/group" mrp="mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/>
-</component>
-<component name="suplwappushhandler" long-name="SUPL WAP Push Handler" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
-</component>
-</collection>
-<collection name="messagingmw_info" long-name="Messaging Middleware Info" level="api">
-<component name="messagingmw_metadata" long-name="Messaging Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="imsrv" level="specific" long-name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
-<collection name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" level="specific">
-<component name="ximp_core_data_model_api" long-name="XIMP Core Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_host_api" long-name="XIMP Presence Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_presence_data_model_api" long-name="XIMP Presence Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_api" long-name="XIMP Presence Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_presence_management_api" long-name="XIMP Presence Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_management_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_host_api" long-name="XIMP Core Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_core_management_api" long-name="XIMP Core Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_management_api/group"/>
-</component>
-<component name="ximp_presence_base_api" long-name="XIMP Presence Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_base_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_api" long-name="XIMP Core Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_core_base_api" long-name="XIMP Core Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_base_api/group"/>
-</component>
-<component name="ximp_presence_cache_api" long-name="XIMP Presence Cache API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_cache_api/group"/>
-</component>
-<component name="ximp_core_feature_plugin_api" long-name="XIMP Core Feature Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_host_api" long-name="XIMP IM Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_im_data_model_api" long-name="XIMP IM Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_data_model_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_api" long-name="XIMP IM Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_im_management_api" long-name="XIMP IM Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_management_api/group"/>
-</component>
-<component name="ximp_im_base_api" long-name="XIMP IM Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_base_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_host_api" long-name="XIMP Search Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_search_data_model_api" long-name="XIMP Search Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_data_model_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_api" long-name="XIMP search Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_search_management_api" long-name="XIMP Search Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_management_api/group"/>
-</component>
-<component name="ximp_search_base_api" long-name="XIMP Search Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_base_api/group"/>
-</component>
-<component name="xmpp_settings_api" long-name="XMPP Settings API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/group"/>
-</component>
-<component name="im_cache_client_api" long-name="IM Cache Client API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/im_cache_client_api/group"/>
-</component>
-<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 Avability Text" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
-</component>
-</collection>
-<collection name="ximpfw" long-name="XIMP Framework" level="framework">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="ximpfw_build" filter="s60" long-name="XIMP Framework Build">
-<unit bldFile="mw/imsrv/ximpfw/group"/>
-</component>
-</collection>
-<collection name="imservices" long-name="IM Services" level="generic">
-<component name="imfeatureplugin" filter="s60" long-name="IM Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/imfeatureplugin/group"/>
-</component>
-<component name="searchfeatureplugin" filter="s60" long-name="Search Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/searchfeatureplugin/group"/>
-</component>
-<component name="xmppsettingsapi" filter="s60" long-name="XMPP Settings API" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsapi/group"/>
-</component>
-<component name="xmppsettingsfetcher" filter="s60" long-name="XMPP Settings Fetcher" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/group"/>
-</component>
-<component name="instantmessagingcache" filter="s60" long-name="Instant Messaging Cache" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/instantmessagingcache/group"/>
-</component>
-</collection>
-<collection name="brandingserver" long-name="Branding Server" level="specific">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="brandingserver_build" filter="s60" long-name="Branding Server Build">
-<unit bldFile="mw/imsrv/brandingserver/group"/>
-</component>
-</collection>
-</block>
-<block name="legacypresence" level="specific" long-name="Legacy Presence Services" levels="engine fw ui">
-<collection name="pressrv_plat" long-name="Legacy Presence Services Platform Interfaces" level="ui">
-<component name="presence_list_api" long-name="Presence List API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/presence_list_api/group"/>
-</component>
-<component name="watcher_info_api" long-name="Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_info_api/group"/>
-</component>
-<component name="simple_documents_api" long-name="SIMPLE Documents API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_documents_api/group"/>
-</component>
-<component name="authorization_api" long-name="Authorization API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/authorization_api/group"/>
-</component>
-<component name="xdm_protocol_plugin_api" long-name="XDM Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_protocol_plugin_api/group"/>
-</component>
-<component name="watcher_api" long-name="Watcher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_api/group"/>
-</component>
-<component name="xdm_api" long-name="XDM API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_api/group"/>
-</component>
-<component name="registration_api" long-name="Registration API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/registration_api/group"/>
-</component>
-<component name="publisher_api" long-name="Publisher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/publisher_api/group"/>
-</component>
-<component name="messaging_connection_manager_api" long-name="Messaging Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/messaging_connection_manager_api/group"/>
-</component>
-<component name="xdm_settings_api" long-name="XDM Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_settings_api/group"/>
-</component>
-<component name="simple_settings_api" long-name="SIMPLE Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_settings_api/group"/>
-</component>
-<component name="simple_instant_msg_api" long-name="Simple Instant Msg API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_instant_msg_api/group"/>
-</component>
-</collection>
-<collection name="xdmengine" long-name="XDM Engine" level="engine">
-<!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
-<component name="xdmengine_build" filter="s60" long-name="XDM Engine Build">
-<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">
-<unit bldFile="mw/legacypresence/xdmprotocols/group"/>
-</component>
-</collection>
-<collection name="msgconnmanager" long-name="Messaging Connection Manager" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="msgconnmanager_build" filter="s60" long-name="Messaging Connection Manager Build">
-<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">
-<unit bldFile="mw/legacypresence/simpleengine/group"/>
-</component>
-</collection>
-<collection name="presencefwsimpleadpt" long-name="Presence Framework SIMPLE Adaptation" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="simpleplugin" filter="s60" long-name="SIMPLE Plugin" plugin="Y">
-<unit bldFile="mw/legacypresence/presencefwsimpleadpt/group"/>
-</component>
-</collection>
-<collection name="simpledatamodeladapter" long-name="SIMPLE Data Model Adapter" level="fw">
-<component name="presenceplugin" filter="s60" long-name="Presence Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/legacypresence/simpledatamodeladapter/group"/>
-</component>
-</collection>
-</block>
-<block name="opensrv" level="specific" long-name="Open Services" levels="prt lib server eng">
-<collection name="opensrv_plat" long-name="Open Services Platform Interfaces" level="eng">
-<component name="messagequeue_api" long-name="Message Queue API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/opensrv/opensrv_plat/messagequeue_api/group"/>
-</component>
-</collection>
-<collection name="loudmouth" long-name="Loudmouth" level="prt">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="loudmouth_build" filter="s60" long-name="Loudmouth Build" introduced="^2">
-<unit bldFile="mw/opensrv/loudmouth/group"/>
-</component>
-</collection>
-<collection name="libtelepathy" long-name="Telepathy Library" level="lib">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="libtelepathy_build" filter="s60" long-name="Telepathy Library Build" introduced="^2">
-<unit bldFile="mw/opensrv/libtelepathy/group"/>
-</component>
-</collection>
-<collection name="telepathygabble" long-name="Telepathy Gabble" level="eng">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="telepathygabble_build" filter="s60" long-name="Telepathy Gabble Build" introduced="^2">
-<unit bldFile="mw/opensrv/telepathygabble/group"/>
-</component>
-</collection>
-<collection name="isolationserver" long-name="Isolation Server" level="server">
-<component name="messagequeue" filter="s60" long-name="Message Queue" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/messagequeue/group"/>
-</component>
-<component name="isoserver" filter="s60" long-name="ISO Server" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/isoserver/group"/>
-</component>
-<component name="isolationserver_build" filter="s60" long-name="Isloation Server Build" introduced="^2">
-<!-- needs #includes removed. either move the exports to another component or make this a ROM component -->
-<unit bldFile="mw/opensrv/isolationserver/group"/>
-</component>
-</collection>
-</block>
-<block name="searchsrv" level="specific" long-name="Search Services" levels="services engine generic api">
-<collection name="searchsrv_plat" long-name="Search Services Platform Interfaces" level="api">
-<component name="cpix_utility_api" long-name="CPIX Utility API" filter="s60" class="api">
-<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_utility_api/group"/>
-</component>
-<component name="cpix_framework_api" long-name="CPIX Framework API" filter="s60" class="api">
-<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_framework_api/group"/>
-</component>
-<component name="cpix_search_api" long-name="CPIX Search API" filter="s60" class="api">
-<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_search_api/group"/>
-</component>
-</collection>
-<collection name="searchengine" long-name="Search Engine" level="engine">
-<component name="searchengine_util" long-name="Search Engine Utils" filter="s60">
-<unit bldFile="mw/searchsrv/searchengine/util/group"/>
-</component>
-<component name="searchengine_oss" long-name="Search Engine OSS" filter="s60">
-<unit bldFile="mw/searchsrv/searchengine/oss/group"/>
-</component>
-<component name="cpix" long-name="Cross Platform Indexing Engine" filter="s60">
-<unit bldFile="mw/searchsrv/searchengine/cpix/group"/>
-</component>
-</collection>
-<collection name="searcher" long-name="Searcher" level="generic">
-<component name="searchclient" long-name="Search Client" filter="s60">
-<unit bldFile="mw/searchsrv/searcher/SearchClient/group"/>
-</component>
-<component name="searchserver" long-name="Search Server" filter="s60">
-<unit bldFile="mw/searchsrv/searcher/SearchServer/group"/>
-</component>
-<component name="searcher_test" long-name="Searcher Tests" filter="s60" purpose="development">
-<!-- #include from common bld.inf or split into two components -->
-<unit bldFile="mw/searchsrv/searcher/tsrc/RobustnessTest/group"/>
-<unit bldFile="mw/searchsrv/searcher/tsrc/LogPlayer/group"/>
-</component>
-</collection>
-<collection name="searchsrv_harvester" long-name="Search Services Harvester" level="services">
-<component name="searchsrv_pluginfw" long-name="Search Server" filter="s60">
-<unit bldFile="mw/searchsrv/harvester/pluginfw/group"/>
-</component>
-<component name="searchsrv_harvesterserver" long-name="Search Harvester Server" filter="s60">
-<unit bldFile="mw/searchsrv/harvester/HarvesterServer/group"/>
-</component>
-</collection>
-<collection name="searchsrv_watchdog" long-name="Search Services Watch Dog" level="services">
-<component name="searchsrv_watchdog_build" long-name="Search Services Watch Dog Build" filter="s60">
-<unit bldFile="mw/searchsrv/WatchDog/group"/>
-</component>
-</collection>
-<collection name="qcpix" long-name="Qt CPIX" level="engine">
-<component name="qcpix_build" long-name="Qt CPIX Build">
-<unit bldFile="mw/searchsrv/qcpix"/>
-</component>
-</collection>
-<collection name="searchsrv_info" long-name="Search Services Info">
-<component name="searchsrv_build" long-name="Search Services Build">
-<!-- move exports to own component and remove this -->
-<unit bldFile="mw/searchsrv/group"/>
-</component>
-</collection>
-</block>
-<block name="remotemgmt" level="specific" long-name="Remote Management" levels="plugin framework server generic specific">
-<collection name="remotemgmt_pub" long-name="Remote Management Public Interfaces" level="specific">
-<component name="synchronization_capability_api" long-name="Synchronization Capability API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
-</component>
-</collection>
-<collection name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" level="specific">
-<component name="common_agent_util_and_definitions_api" long-name="Common Agent util and definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
-</component>
-<component name="policy_management_certificate_api" long-name="Policy Management Certificate API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/group"/>
-</component>
-<component name="oma_provisioning_adapter_api" long-name="OMA Provisioning Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_adapter_api/group"/>
-</component>
-<component name="device_management_parameter_api" long-name="Device Management Parameter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_parameter_api/group"/>
-</component>
-<component name="data_synchronization_plugin_api" long-name="Data Synchronization Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/group"/>
-</component>
-<component name="sync_alert_handler_api" long-name="Sync Alert Handler API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
-</component>
-<component name="syncml_notifier_api" long-name="SyncML Notifier API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
-</component>
-<component name="syncml_client_api" long-name="SyncML Client API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
-</component>
-<component name="device_management_plugin_api" long-name="Device Management plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_plugin_api/group"/>
-</component>
-<component name="dm_tree_apis" long-name="DM Tree APIs" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
-</component>
-<component name="terminal_security_device_lock_api" long-name="Terminal Security Device Lock API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/group"/>
-</component>
-<component name="policy_management_request_api" long-name="Policy Management Request API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/group"/>
-</component>
-<component name="ds_constant_definitions_api" long-name="DS Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_constant_definitions_api/group"/>
-</component>
-<component name="scp_server_api" long-name="SCP Server API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/group"/>
-</component>
-<component name="data_synchronization_notification_api" long-name="Data Synchronization Notification API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_notification_api/group"/>
-</component>
-<component name="oma_provisioning_engine_api" long-name="OMA Provisioning Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/group"/>
-</component>
-<component name="dm_utils_api" long-name="DM Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/group"/>
-</component>
-<component name="syncml_alert_api" long-name="SyncML Alert API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/group"/>
-</component>
-<component name="obex_client_session_api" long-name="OBEX Client session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/obex_client_session_api/group"/>
-</component>
-<component name="setting_enforcement_info_api" long-name="Setting Enforcement Info API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/group"/>
-</component>
-<component name="dm_constant_definitions_api" long-name="DM Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
-</component>
-<component name="oma_ds_extensions_api" long-name="OMA DS Extensions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
-</component>
-<component name="pnpms_utils_api" long-name="PNPMS Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
-</component>
-<component name="diagnostics_plugin_utility_api" long-name="Diagnostics Plugin Utility API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
-</component>
-<component name="diagnostics_plugin_api" long-name="Diagnostics Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
-</component>
-<component name="diagnostics_framework_api" long-name="Diagnostics Framework API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
-</component>
-<component name="diagnostics_results_api" long-name="Diagnostics Results API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
-</component>
-<component name="diagnostics_plugin_pool_api" long-name="Diagnostics Plugin Pool API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
-</component>
-<component name="adaptive_history_list_api" long-name="Adaptive History List API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
-</component>
-<component name="adaptive_history_list_session_api" long-name="Adaptive History List Session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
-</component>
-<component name="fota_engine_api" long-name="FOTA Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
-</component>
-<component name="update_package_storage_plugin_api" long-name="Update Package Storage Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
-</component>
-<component name="syncml_notifier_roaming_api" long-name="SyncML Notifier Roaming API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
-</component>
-<component name="sync_service_api" long-name="Sync Service API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_service_api/group"/>
-</component>
-<component name="dcmo_adapter_api" long-name="DCMO Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_adapter_api/group"/>
-</component>
-<component name="dcmo_control_api" long-name="DCMO Control API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_control_api/group"/>
-</component>
-<component name="ds_capability_mgmt_plugin_api" long-name="DS Capability Management Plugin API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
-</component>
-<component name="dm_native_notifier_api" long-name="DM Native Notifier API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_native_notifier_api/group"/>
-</component>
-</collection>
-<collection name="policymanagement" long-name="Policy Management" level="generic">
-<component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">
-<unit bldFile="mw/remotemgmt/policymanagement/pmdmadapter/group"/>
-</component>
-<component name="dmutilserver" filter="s60" long-name="DM Util Server">
-<unit bldFile="mw/remotemgmt/policymanagement/dmutilserver/group"/>
-</component>
-<component name="policyengine" filter="s60" long-name="Policy Engine">
-<unit bldFile="mw/remotemgmt/policymanagement/policyengine/group" filter="!dfs_build"/>
-</component>
-<component name="policymanagement_build" filter="s60" long-name="Policy Management Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/policymanagement/group"/>
-</component>
-</collection>
-<collection name="syncmlfw" long-name="SyncML Framework" level="server">
-<component name="syncmlfw_build" filter="s60" long-name="SyncML Framework Build">
-<!-- need to break this up into components. Too convoluted a structure to be in a single bld.inf-->
-<unit bldFile="mw/remotemgmt/syncmlfw/group"/>
-</component>
-</collection>
-<collection name="terminalsecurity" long-name="Terminal Security" level="specific">
-<component name="scp" filter="s60" long-name="Security Code Proxy">
-<!-- can only have one unit, need to have these #included from a single bld.inf -->
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpdatabase/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpserver/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scppatternplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scphistoryplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scptimestampplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpeventhandler/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/dmeventnotifier/group"/>
-</component>
-<component name="terminalsecurity_client" filter="s60" long-name="Terminal Control Client">
-<unit bldFile="mw/remotemgmt/terminalsecurity/client/group"/>
-</component>
-<component name="terminalsecurity_server" filter="s60" long-name="Terminal Control Server">
-<unit bldFile="mw/remotemgmt/terminalsecurity/server/group"/>
-</component>
-<component name="tcadapter" filter="s60" long-name="Terminal Control Adapter">
-<unit bldFile="mw/remotemgmt/terminalsecurity/tcadapter/bld"/>
-</component>
-<component name="terminalsecurity_build" filter="s60" long-name="Terminal Security Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/terminalsecurity/group"/>
-</component>
-</collection>
-<collection name="omaprovisioning" long-name="OMA Provisioning" level="specific">
-<component name="pnputil" filter="s60" long-name="PnP Util">
-<unit bldFile="mw/remotemgmt/omaprovisioning/pnputil/group"/>
-</component>
-<component name="provisioning" filter="s60" long-name="Provisioning">
-<unit bldFile="mw/remotemgmt/omaprovisioning/provisioning/group"/>
-</component>
-</collection>
-<collection name="devicediagnosticsfw" long-name="Device Diagnostics Framework" level="framework">
-<component name="diagframework" filter="s60" long-name="Diagnostics Framework">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
-</component>
-<component name="diagpluginbase" filter="s60" long-name="Diagnostics Plugin Base">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
-</component>
-<component name="diagresultsdb" filter="s60" long-name="Diagnostics Results Database">
-<!-- can only have one unit, merge or split into two components -->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
-</component>
-<component name="devicediagnosticsfw_build" filter="s60" long-name="Device Diagnostics Framework Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/group"/>
-</component>
-</collection>
-<collection name="dcmofw" long-name="Device Capability Management Object Framework" level="framework">
-<component name="dcmoclient" filter="s60" long-name="DCMO Client">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoclient/group"/>
-</component>
-<component name="dcmoserver" filter="s60" long-name="DCMO Server">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoserver/group"/>
-</component>
-<component name="dcmocustcmd" filter="s60" long-name="DCMO Custom Commands">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmocustcmd/group"/>
-</component>
-<component name="dcmofw_build" filter="s60" long-name="DCMO Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/dcmofw/group"/>
-</component>
-</collection>
-<collection name="fotaapplication" long-name="FOTA Application" level="generic">
-<component name="fotaapplication_build" filter="s60" long-name="FOTA Application Build">
-<!-- remove this component when configuration is in place and the #ifdefs have been worked out -->
-<unit bldFile="mw/remotemgmt/fotaapplication/group"/>
-</component>
-<component name="fotaserver" filter="s60" long-name="FOTA Server">
-<!-- uncomment when #ifdefs are resolved -->
-<!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
-</component>
-<component name="fotacustcmds" filter="s60" long-name="FOTA Custom Commands" class="placeholder">
-<!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
-<!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
-</component>
-</collection>
-</block>
-<block name="remoteconn" level="generic" long-name="Remote Connectivity" levels="plugin framework server generic specific">
-<collection name="remoteconn_info" long-name="Remote Connectivity Info" level="specific">
-<component name="remoteconn_metadata" long-name="Remote Connectivity Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mtptransports" long-name="MTP Transports" level="plugin">
-<component name="mtpusbtransport" long-name="MTP USB Transport" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpusbtransport/group" mrp="mw/remoteconn/mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
-</component>
-<component name="mtpptpiptransport" long-name="MTP PTP-IP Transport" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpptpiptransport/group" mrp="mw/remoteconn/mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
-</component>
-<component name="mtpcontroller" long-name="MTP Controller" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpcontroller/group" mrp="mw/remoteconn/mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
-</component>
-</collection>
-<collection name="mtpfws" long-name="MTP Frameworks" level="framework">
-<component name="mtpfw" long-name="MTP Framework" introduced="^2" purpose="optional">
-<unit bldFile="mw/remoteconn/mtpfws/mtpfw/group" mrp="mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/>
-</component>
-</collection>
-<collection name="mtpdataproviders" long-name="MTP Data Providers" level="generic">
-<component name="mtpfileandfolderdp" long-name="MTP File and Folder Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group" mrp="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
-</component>
-<component name="mtpimagedp" long-name="MTP Image Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpimagedp/group" mrp="mw/remoteconn/mtpdataproviders/mtpimagedp/group/mtp_imagedp.mrp"/>
-</component>
-<component name="mtppictbridgedp" long-name="MTP PictBridge Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group" mrp="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group/mtp_pictbridgedp.mrp"/>
-</component>
-</collection>
-<collection name="backupandrestore" long-name="Backup and Restore" level="specific">
-<component name="backupengine" long-name="Backup Engine" introduced="9.0" purpose="optional">
-<unit bldFile="mw/remoteconn/backupandrestore/backupengine/group" mrp="mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
-</component>
-<component name="backuptest" long-name="Backup Test" introduced="^2" purpose="development">
-<unit bldFile="mw/remoteconn/backupandrestore/backuptest/group" mrp="mw/remoteconn/backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
-</component>
-</collection>
-<collection name="obex" long-name="OBEX" level="generic">
-<component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexprotocol/group" mrp="mw/remoteconn/obex/obexprotocol/group/obex.mrp"/>
-</component>
-<component name="obexextensionapi" long-name="OBEX Extension API" introduced="9.2" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexextensionapi/group" mrp="mw/remoteconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
-</component>
-</collection>
-</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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<unit mrp="mw/srvdiscovery/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="dlnasrv" level="specific" long-name="DLNA Services" levels="stack server ctrl framework plugin">
-<!-- uncomment all the units when configuration is in place, they're currently #included from other xxx_build components -->
-<collection name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" level="plugin">
-<component name="upnp_media_server_settings_api" long-name="UPnP Media Server Settings API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_settings_api/group"/>
-</component>
-<component name="upnp_av_objects_api" long-name="UPnP A/V Objects API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_av_objects_api/group"/>
-</component>
-<component name="upnp_media_server_api" long-name="UPnP Media Server API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_api/group"/>
-</component>
-<component name="upnp_security_plugin_api" long-name="UPnP Security Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_security_plugin_api/group"/>
-</component>
-<component name="upnp_avcp_api" long-name="UPnP AVCP API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_avcp_api/group"/>
-</component>
-<component name="upnp_media_server_metadata_api" long-name="UPnP Media Server Metadata API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_metadata_api/group"/>
-</component>
-<component name="upnp_command_api" long-name="UPnP Command API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_command_api/group"/>
-</component>
-<component name="upnp_plugin_api" long-name="UPnP Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_plugin_api/group"/>
-</component>
-</collection>
-<collection name="upnpavcontrolpoint" long-name="UPnP A/V Control Point" level="plugin">
-<component name="avcontrolframework" filter="s60" long-name="A/V Control Famework" introduced="9.1" deprecated="^3">
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
-</component>
-<component name="upnpavcontrolpoint_build" filter="s60" long-name="UPnP A/V Control Point Build" introduced="9.1" deprecated="^3">
-<!-- put exports in other component instead -->
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/group"/>
-</component>
-</collection>
-<collection name="upnpmediaserver" long-name="UPnP Media Server" level="server">
-<component name="avobjects" filter="s60" long-name="A/V Objects">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/avobjects/group"/>
-</component>
-<component name="mediaserverclient" filter="s60" long-name="Media Server Client">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverclient/group"/>
-</component>
-<component name="connectionmanagerservice" filter="s60" long-name="Connection Manager Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/connectionmanagerservice/group"/>
-</component>
-<component name="contentdirectoryservice" filter="s60" long-name="Content Directory Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/contentdirectoryservice/group"/>
-</component>
-<component name="mediaserverengine" filter="s60" long-name="Media Server Engine">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverengine/group"/>
-</component>
-<component name="upnpmediaserver_build" filter="s60" long-name="UPnP Media Server Build">
-<!-- move exports into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpmediaserver/group"/>
-</component>
-</collection>
-<collection name="upnpavcontroller" long-name="UPnP A/V Controller" level="ctrl">
-<component name="upnpxmlparser" filter="s60" long-name="UPnP XML Parser" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpxmlparser/group"/>
-</component>
-<component name="upnpavcontrollerserver" filter="s60" long-name="UPnP A/V Controller Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerserver/group"/>
-</component>
-<component name="upnpavcontrollerclient" filter="s60" long-name="UPnP A/V Ccontroller Client" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerclient/group"/>
-</component>
-<component name="upnpavcontrollerhelper" filter="s60" long-name="UPnP A/V Controller Helper" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerhelper/group"/>
-</component>
-<component name="upnpavcontroller_build" filter="s60" long-name="UPnP A/V Controller Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpavcontroller/group"/>
-</component>
-</collection>
-<collection name="upnpframework" long-name="UPnP Framework" level="framework">
-<component name="upnputilities" filter="s60" long-name="UPnP Utilities" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnputilities/group"/>
-</component>
-<component name="upnpextensionpluginif" filter="s60" long-name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpextensionpluginif/group"/> -->
-</component>
-<component name="upnpfiletransferengine" filter="s60" long-name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>-->
-</component>
-<component name="upnpcommonui" filter="s60" long-name="UPnP Common UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpcommonui/group"/>-->
-</component>
-<component name="upnpaiwengine" filter="s60" long-name="UPnP AIW Engine" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpaiwengine/group"/> -->
-</component>
-<component name="upnpaiwprovider" filter="s60" long-name="UPnP AIW Provider" introduced="^2" deprecated="^3" plugin="Y">
-<!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
-</component>
-<component name="upnpmusicadapter" filter="s60" long-name="UPnP Music Adapter" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
-</component>
-<component name="upnpcommand" filter="s60" long-name="UPnP Command" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpcommand/group"/>
-</component>
-<component name="upnpframework_build" filter="s60" long-name="UPnP Framework Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpframework/group"/>
-</component>
-</collection>
-<collection name="upnpsettings" long-name="UPnP Settings" level="framework">
-<component name="upnpsettingsengine" filter="s60" long-name="UPnP Settings Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
-</component>
-<component name="multiselectionui" filter="s60" long-name="Multi-Selection UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/multiselectionui/group"/>-->
-</component>
-<component name="appwizard" filter="s60" long-name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/appwizard/group"/>-->
-</component>
-<component name="upnpsharingui" filter="s60" long-name="UPnP Sharing UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
-</component>
-<component name="upnpgsplugin" filter="s60" long-name="UPnP GS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
-</component>
-<component name="upnpsettings_build" filter="s60" long-name="UPnP Settings Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsettings/group"/>
-</component>
-</collection>
-<collection name="upnpsharing" long-name="UPnP Sharing" level="server">
-<component name="upnpdlnaprofiler" filter="s60" long-name="UPnP DLNA Profiler" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpdlnaprofiler/group"/>
-</component>
-<component name="upnpsecurity" filter="s60" long-name="UPnP Security" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpsecurity/group"/>
-</component>
-<component name="upnpcontentserver" filter="s60" long-name="UPnP Content Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpcontentserver/group"/>
-</component>
-<component name="applicationengine" filter="s60" long-name="UPnP Application Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/applicationengine/group"/>
-</component>
-<component name="upnpsharing_build" filter="s60" long-name="UPnP Sharing Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsharing/group"/>
-</component>
-</collection>
-<collection name="upnpmpxplugins" long-name="UPnP MPX Plugins" level="plugin">
-<component name="upnpplaybackplugins" filter="s60" long-name="UPnP Playback Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/upnpplaybackplugins/group"/>
-</component>
-<component name="upnpmpxplugins_build" filter="s60" long-name="UPnP MPX Plugins Build" introduced="^2">
-<!-- move exports content into other component? -->
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/group"/>
-</component>
-</collection>
-<collection name="upnpharvester" long-name="UPnP Harvester" level="ctrl">
-<component name="upnpharvester_common" filter="s60" long-name="UPnP Harvester Common" introduced="^2" deprecated="^3" class="placeholder">
-<!-- need to merge or #include these to a single bld.inf -->
-<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
- <unit bldFile="upnpharvester/common/cmsettings/group"/>
- <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
- <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
-</component>
-<component name="cdssync" filter="s60" long-name="CDS Sync" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
-</component>
-<component name="mdhserver" filter="s60" long-name="Metadata Harvester Server" introduced="^2" deprecated="^3" class="placeholder">
-<!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
-</component>
-<component name="upnpharvester_build" filter="s60" long-name="UPnP Harvester Build" introduced="^2" deprecated="^3" class="placeholder">
-<!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
-<!--<unit bldFile="upnpharvester/group"/>-->
-</component>
-</collection>
-<collection name="homesync" long-name="Home Sync" level="plugin">
-<component name="contentmanager" filter="s60" long-name="Content Manager" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homesync/group"/>-->
-<!-- move bld.inf into contentmanager dir -->
-</component>
-</collection>
-<collection name="homemedia" long-name="Home Media" level="framework">
-<!-- collection is really just a component. Move down a directory -->
-<component name="homemedia_build" filter="s60" long-name="Home Media" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homemedia/group"/> -->
-</component>
-</collection>
-<collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin">
-<component name="dlnasrv_build" filter="s60" long-name="DLNA Services Build">
-<!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed -->
-<unit bldFile="mw/dlnasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="btservices" level="generic" long-name="Bluetooth Services" levels="framework server generic specific plugin">
-<collection name="btservices_pub" long-name="BT Services Public Interfaces" level="plugin">
-<component name="bluetooth_power_state_api" long-name="Bluetooth Power State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_power_state_api/group"/>
-</component>
-<component name="bluetooth_notifier_api" long-name="Bluetooth Notifier API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_notifier_api/group"/>
-</component>
-</collection>
-<collection name="btservices_plat" long-name="BT Services Platform Interfaces" level="plugin">
-<component name="bluetooth_dosserver_audio_api" long-name="Bluetooth DOS Server Audio API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dosserver_audio_api/group"/>
-</component>
-<component name="bluetooth_dut_mode_api" long-name="Bluetooth DUT Mode API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dut_mode_api/group"/>
-</component>
-<component name="bluetooth_engine_api" long-name="Bluetooth Engine API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-<component name="bluetooth_local_variation_api" long-name="Bluetooth Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_local_variation_api/group"/>
-</component>
-<component name="bluetooth_notifier_internal_api" long-name="Bluetooth Notifier internal API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_notifier_internal_api/group"/>
-</component>
-<component name="bluetooth_sap_connection_state_api" long-name="Bluetooth SAP Connection State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_sap_connection_state_api/group"/>
-</component>
-<component name="bluetooth_secondary_display_notification_api" long-name="Bluetooth Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_secondary_display_notification_api/group"/>
-</component>
-</collection>
-<collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
-<component name="bteng" filter="s60" long-name="Bluetooth Engine">
-<unit bldFile="mw/btservices/bluetoothengine/bteng/group"/>
-</component>
-<component name="btnotif" filter="s60" long-name="Bluetooth Notifier">
-<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"/>
-</component>
-<component name="btmac" filter="s60" long-name="Bluetooth Mono Audio Controller" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btmac/group"/>
-</component>
-<component name="btsac" filter="s60" long-name="Bluetooth Stereo Audio Controller" plugin="Y">
-<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"/>
-</component>
-<component name="btsap" filter="s60" long-name="Bluetooth SIM Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btsap/group"/>
-</component>
-<component name="btui" filter="s60" long-name="Bluetooth UI">
-<unit bldFile="mw/btservices/bluetoothengine/btui/group"/>
-</component>
-<component name="btpbap" filter="s60" long-name="Bluetooth Phonebook Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btpbap/group"/>
-</component>
-<component name="bthid" filter="s60" long-name="Bluetooth HID">
-<unit bldFile="mw/btservices/bluetoothengine/bthid/group"/>
-</component>
-<component name="btctrldcmoadapter" filter="s60" long-name="Bluetooth Control DCMO Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btctrldcmoadapter/group"/>
-</component>
-</collection>
-<collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
-<component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
-<unit bldFile="mw/btservices/bluetoothappprofiles/avrcp" mrp="mw/btservices/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
-</component>
-</collection>
-<collection name="btservices_info" long-name="BT Services Info" level="plugin">
-<component name="btservices_metadata" long-name="BT Services Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usbservices" level="generic" long-name="USB Services" levels="framework server generic specific plugin">
-<collection name="usbservices_plat" long-name="USB Services Platform Interfaces" level="plugin">
-<component name="pictbridge_api" long-name="PictBridge API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/pictbridge_api/group"/>
-</component>
-<component name="ptp_responder_api" long-name="PTP Responder API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_responder_api/group"/>
-</component>
-<component name="ptp_transport_api" long-name="PTP Transport API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_transport_api/group"/>
-</component>
-<component name="usb_device_control_plugin_api" long-name="USB Device Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_device_control_plugin_api/group"/>
-</component>
-<component name="usb_notifier_api" long-name="USB Notifier API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_notifier_api/group"/>
-</component>
-<component name="usb_personality_api_header" long-name="USB Personality API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_api_header/group"/>
-</component>
-<component name="usb_personality_plugin_api" long-name="USB Personality Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_plugin_api/group"/>
-</component>
-<component name="usb_secondary_display_api" long-name="USB Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_secondary_display_api/group"/>
-</component>
-<component name="usb_watcher_api" long-name="USB Watcher API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_api/group"/>
-</component>
-<component name="usb_watcher_info_api_header" long-name="USB Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_info_api_header/group"/>
-</component>
-</collection>
-<collection name="usbengines" long-name="USB Engines" level="generic">
-<component name="usbotgwatcher" filter="s60" long-name="USB OTG Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbotgwatcher/group"/>
-</component>
-<component name="usbwatcher" filter="s60" long-name="USB Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbwatcher/group"/>
-</component>
-<component name="usblocodplugin" filter="s60" long-name="USB Local Connectivity Domain Plugin" plugin="Y">
-<unit bldFile="mw/usbservices/usbengines/usblocodplugin/group"/>
-</component>
-<component name="usbdevcon" filter="s60" long-name="USB Device Control">
-<unit bldFile="mw/usbservices/usbengines/usbdevcon/group"/>
-</component>
-<component name="usbremotepersonality" filter="s60" long-name="USB Remote Personality">
-<unit bldFile="mw/usbservices/usbengines/usbremotepersonality/group"/>
-</component>
-</collection>
-<collection name="usbclasses" long-name="USB Classes" level="framework">
-<component name="usbobexclasscontroller" filter="s60" long-name="USB OBEX Class Controller" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbobexclasscontroller/group"/>
-</component>
-<component name="usbbasicpersonality" filter="s60" long-name="USB Basic Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbbasicpersonality/group"/>
-</component>
-<component name="usbmscpersonality" filter="s60" long-name="USB MSC Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbmscpersonality/group"/>
-</component>
-<!-- commented out in bld.inf. Should this be deleted?
- <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
- <unit bldFile="usbclasses/ptpstack/group"/>
- </component>
- <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
- <unit bldFile="usbclasses/sicdusbplugin/group"/>
- </component>
- <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
- <unit bldFile="usbclasses/ptpserver/group"/>
- </component>-->
-<component name="pictbridgeengine" filter="s60" long-name="PictBridge Engine">
-<unit bldFile="mw/usbservices/usbclasses/pictbridgeengine/group"/>
-</component>
-<component name="usbphoneasmodem" filter="s60" long-name="USB Phone as Modem" introduced="^3">
-<unit bldFile="mw/usbservices/usbclasses/usbphoneasmodem/group"/>
-</component>
-</collection>
-<collection name="usbuis" long-name="USB UIs" level="specific">
-<component name="usbui" filter="s60" long-name="USB UI">
-<unit bldFile="mw/usbservices/usbuis/usbui/group"/>
-</component>
-<component name="usbuinotif" filter="s60" long-name="USB UI Notifiers">
-<unit bldFile="mw/usbservices/usbuis/usbuinotif/group"/>
-</component>
-<component name="imageprintuiprovider" filter="s60" long-name="ImagePrint UI Provider" plugin="Y">
-<unit bldFile="mw/usbservices/usbuis/imageprintuiprovider/group"/>
-</component>
-<component name="usbimageprintui" filter="s60" long-name="ImagePrint UI">
-<unit bldFile="mw/usbservices/usbuis/imageprintui/group"/>
-</component>
-<component name="usbuiqt" long-name="USB UI Qt" introduced="^4" filter="s60">
-<unit bldFile="mw/usbservices/usbuis/usbuiqt"/>
-</component>
-</collection>
-</block>
-<block name="shortlinkconn" level="generic" long-name="Shortlink Connectivity" levels="framework server generic specific plugin">
-<!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
-<collection name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" level="plugin">
-<component name="obex_service_utils_api" long-name="OBEX Service Utils API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_utils_api/group"/>
-</component>
-<component name="obex_service_plugin_api" long-name="OBEX Service Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_plugin_api/group"/>
-</component>
-<component name="dialup_connection_status_api" long-name="Dial-up Connection Status API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dialup_connection_status_api/group"/>
-</component>
-<component name="dun_secondary_display_notification_api" long-name="DUN Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
-</component>
-<component name="obex_secondary_display_notification_api" long-name="OBEX Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
-</component>
-<component name="generic_hid_api" long-name="Generic HID API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/generic_hid_api/group"/>
-</component>
-<component name="locod_bearer_plugin_api" long-name="Locod Bearer Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/locod_bearer_plugin_api/group"/>
-</component>
-<component name="usb_obexservicemanager_client_api" long-name="USB OBEX Service Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_obexservicemanager_client_api/group"/>
-</component>
-</collection>
-<collection name="localconnectivityservice" long-name="Local Connectivity Service" level="server">
-<component name="locod" long-name="Local Connectivity Daemon">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/locod/group"/>
-</component>
-<component name="obexserviceman" long-name="OBEX Service Managar">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
-</component>
-<component name="obexsendservices" long-name="OBEX Send Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
-</component>
-<component name="obexreceiveservices" long-name="OBEX Receive Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
-</component>
-<component name="dun" long-name="Dial Up Networking">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/dun/group"/>
-</component>
-<component name="lccustomplugin" long-name="LC Custom Plugins" plugin="Y">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/lccustomplugin/group"/>
-</component>
-<component name="lcstylustap" long-name="LC Stylus Tap Plugins" plugin="Y">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/lcstylustap/group"/>
-</component>
-<component name="legacymodemplugin" long-name="Legacy Modem Plugin" plugin="Y">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/legacymodemplugin/group"/>
-</component>
-<component name="modematplugin" long-name="Modem AT Plugin" plugin="Y">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/modematplugin/group"/>
-</component>
-<component name="generichid" long-name="Generic HID">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/generichid/group"/>
-</component>
-<component name="headset" long-name="Headset">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/headset/group"/>
-</component>
-</collection>
-</block>
-<block name="imghandling" level="specific" long-name="Image Handling" levels="lib util if">
-<collection name="imagehandling_plat" long-name="Image Handling Platform Interfaces" level="if">
-<component name="image_handling_library_api" long-name="Image Handling Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
-</component>
-<component name="3gp_library_api" long-name="3GP Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
-</component>
-<component name="thumbnailmanager_api" long-name="Thumbnail Manager API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagehandlinglib" long-name="Image Handling Library" level="lib">
-<!-- collection is really a component, need to move down a directory -->
-<component name="ihl" filter="s60" long-name="IHL">
-<unit bldFile="mw/imghandling/imagehandlinglib/group"/>
-</component>
-</collection>
-<collection name="imagehandlingutilities" long-name="Image Handling Utilities" level="util">
-<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager">
-<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
-</component>
-<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager Qt" introduced="^4">
-<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt"/>
-</component>
-</collection>
-</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">
-<unit bldFile="mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
-</component>
-</collection>
-</block>
-<block name="mds" level="specific" long-name="Metadata Services" levels="mgr eng server int">
-<collection name="mds_plat" long-name="Metadata Services Platform Interfaces" level="int">
-<component name="context_engine_plugin_api" long-name="Context Engine Plugin API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/group" filter="!test"/>
-</component>
-<component name="harvester_framework_api" long-name="Harvester Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/harvester_framework_api/group" filter="!test"/>
-<!-- can only have one unit with the same filter, #include the following from the previous unit -->
-</component>
-<component name="location_manager_api" long-name="Location Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/location_manager_api/group" filter="!test"/>
-</component>
-<component name="metadata_engine_api" long-name="Metadata Engine API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/metadata_engine_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_collection_manager_api" long-name="Content Listing Framework Collection Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_extended_api" long-name="Content Listing Framework Extended API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_extended_api/group"/>
-</component>
-</collection>
-<collection name="mds_pub" long-name="Metadata Services Public Interfaces" level="int">
-<component name="content_listing_framework_api" long-name="Content Listing Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_pub/content_listing_framework_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="metadataengine" long-name="Metadata Engine" level="eng">
-<component name="metadataengine_common" filter="s60" long-name="Metadata Engine Common" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/common/group"/>
-</component>
-<component name="metadataengine_server" filter="s60" long-name="Metadata Engine Server" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/server/group"/>
-</component>
-<component name="metadataengine_client" filter="s60" long-name="Metadata Engine Client" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/client/group"/>
-</component>
-<component name="metadataengine_build" filter="s60" long-name="Metadata Engine Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/metadataengine/group"/>
-</component>
-</collection>
-<collection name="locationmanager" long-name="Location Manager" level="mgr">
-<component name="locationtrail" filter="s60" long-name="Location Trail" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/locationtrail/group"/>
-</component>
-<component name="locationmanager_server" filter="s60" long-name="Location Manager Server" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/server/group"/>
-</component>
-<component name="locationmanager_client" filter="s60" long-name="Location Manager Client" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/client/group"/>
-</component>
-<component name="locationmanager_build" filter="s60" long-name="Location Manager Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/locationmanager/group"/>
-</component>
-</collection>
-<collection name="contextengine" long-name="Context Engine" level="eng">
-<component name="contextengine_plugins" filter="s60" long-name="Context Engine Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/contextengine/plugins/group"/>
-</component>
-<component name="contextengine_build" filter="s60" long-name="Context Engine Build" introduced="^2">
-<!--make this collection a single component, or make this unit self-contained -->
-<unit bldFile="mw/mds/contextengine/group"/>
-</component>
-</collection>
-<collection name="harvester" long-name="Harvester" level="eng">
-<component name="blacklistclient" filter="s60" long-name="Blacklist Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistclient/group"/>
-</component>
-<component name="blacklistserver" filter="s60" long-name="Blacklist Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistserver/group"/>
-</component>
-<component name="harvester_common" filter="s60" long-name="Harvester Common" introduced="^2">
-<unit bldFile="mw/mds/harvester/common/group"/>
-</component>
-<component name="composerplugins" filter="s60" long-name="Composer Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/composerplugins/group"/>
-</component>
-<component name="harvesterplugins" filter="s60" long-name="Harvester Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/harvesterplugins/group"/>
-</component>
-<component name="monitorplugins" filter="s60" long-name="Monitor Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/monitorplugins/group"/>
-</component>
-<component name="harvester_server" filter="s60" long-name="Harvester Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/server/group"/>
-</component>
-<component name="harvester_client" filter="s60" long-name="Harvester Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/client/group"/>
-</component>
-<component name="harvester_build" filter="s60" long-name="Harvester Build" introduced="^2">
-<!-- split these exports into the other components -->
-<unit bldFile="mw/mds/harvester/group"/>
-</component>
-</collection>
-<collection name="watchdog" long-name="Watchdog" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="mdswatchdog" filter="s60" long-name="Metadata Watchdog" introduced="^2">
-<unit bldFile="mw/mds/watchdog/group"/>
-</component>
-</collection>
-<collection name="clfwrapper" long-name="Content Listing Framework Wrapper" level="int">
-<!-- collection is really a component. Move down a directory -->
-<component name="clfwrapper_build" filter="s60" long-name="CLF Wrapper Build" introduced="^2" class="placeholder">
-<!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
-<!--<unit bldFile="clfwrapper/group"/>-->
-</component>
-</collection>
-<collection name="mds_info" long-name="Metadata Services Info" level="int">
-<component name="mds_build" filter="s60" long-name="Metadata Services Build" introduced="^2">
-<!-- consider distributiing this into the rest of the components in the package -->
-<unit bldFile="mw/mds/group"/>
-</component>
-</collection>
-</block>
-<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"/>
-</component>
-<component name="videoconnutility_api" long-name="Video Connection Utility API" filter="s60" class="api">
-<unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/group"/>
-</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"/>
-</component>
-</collection>
-<collection name="videoscheduler" long-name="Video Scheduler" level="util">
-<component name="schedulerclient" filter="s60" long-name="Video Scheduler Client">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerclient/group"/>
-</component>
-<component name="schedulerserver" filter="s60" long-name="Video Scheduler Server">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerserver/group"/>
-</component>
-</collection>
-<collection name="videoconnutility" long-name="Video Connection Utility" level="util">
-<component name="connutilpsworker" filter="s60" long-name="Connection Utility Publish and Subscribe Worker">
-<unit bldFile="mw/videoutils/videoconnutility/connutilpsworker/group"/>
-</component>
-<component name="video_connutility" filter="s60" long-name="Video Connection Utility">
-<unit bldFile="mw/videoutils/videoconnutility/connutility/group"/>
-</component>
-</collection>
-<collection name="videoutils_info" long-name="Video Utils Info" level="if"/>
-</block>
-<block name="mmmw" level="generic" long-name="Multimedia Middleware" levels="plugin framework server generic specific">
-<collection name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" level="specific">
-<component name="multimedia_data_source_api" long-name="Multimedia Data Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
-</component>
-<component name="progressive_download_api" long-name="Progressive Download API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/progressive_download_api/group"/>
-</component>
-<component name="equalizer_ui_api" long-name="Equalizer UI API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
-</component>
-<component name="enhanced_media_client_api" long-name="Enhanced Media Client API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
-</component>
-<component name="stream_control_custom_command_api" long-name="Stream Control Custom Command API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
-</component>
-<component name="emc_buffer_source_api" long-name="EMC Buffer Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_buffer_source_api/group"/>
-</component>
-<component name="emc_file_source_api" long-name="EMC File Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
-</component>
-<component name="audio_metadata_reader_api" long-name="Audio MetaData Reader API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
-</component>
-<component name="emc_progressive_download_source_api" long-name="EMC Progressive Download Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
-</component>
-<component name="emc_volume_effect_api" long-name="EMC Volume Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
-</component>
-<component name="emc_balance_effect_api" long-name="EMC Balance Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_balance_effect_api/group"/>
-</component>
-<component name="emc_descriptor_source_api" long-name="EMC Descriptor Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_descriptor_source_api/group"/>
-</component>
-<component name="emc_drm_config_intfc_api" long-name="EMC DRM Config Intfc API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
-</component>
-<component name="voip_audio_services_api" long-name="VoIP Audio Services" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/group"/>
-</component>
-<component name="configuration_components_factory_api" long-name="Configuration Components Factory API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
-</component>
-<component name="audio_output_control_utility_api" long-name="Audio Output Control Utility API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/group"/>
-</component>
-<component name="audio_output_control_utility_proxy_api" long-name="Audio Output Control Utility Proxy API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
-</component>
-<component name="emc_audio_effects_api" long-name="EMC Audio Effects API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
-</component>
-<component name="call_audio_control_api" long-name="Call AudioControl API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/group"/>
-</component>
-<component name="radio_utilities_api" long-name="Radio Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/group"/>
-</component>
-<component name="radio_preset_utilities_api" long-name="Radio Preset Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
-</component>
-<component name="radio_monitor_api" long-name="Radio Monitor API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
-</component>
-<component name="thumbnail_engine_api" long-name="Thumbnail Engine API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/thumbnail_engine_api/group"/>
-</component>
-<component name="telephony_multimedia_service_api" long-name="Telephony Multimedia Service API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
-</component>
-<component name="openmax_al_api" long-name="OpenMAX AL API" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/openmax_al_api/group"/>
-</component>
-</collection>
-<collection name="mmfenh" long-name="MMF Enhancements" level="generic">
-<component name="advancedaudiocontroller" filter="s60" long-name="Advanced Audio Controllers" plugin="Y">
-<unit bldFile="mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
-</component>
-<component name="audiooutputcontrolutility" filter="s60" long-name="Audio Output Control Utility">
-<unit bldFile="mw/mmmw/mmfenh/audiooutputcontrolutility/group"/>
-</component>
-<component name="configurationcomponentsfactory" filter="s60" long-name="Configuration Components Factory">
-<unit bldFile="mw/mmmw/mmfenh/configurationcomponentsfactory/group"/>
-</component>
-<component name="enhancedaudioplayerutility" filter="s60" long-name="Enhanced Audio Player Utility">
-<unit bldFile="mw/mmmw/mmfenh/enhancedaudioplayerutility/group"/>
-</component>
-<component name="enhancedmediaclient" filter="s60" long-name="Enhanced Media Client">
-<unit bldFile="mw/mmmw/mmfenh/enhancedmediaclient/group"/>
-</component>
-<component name="profilesettingsmonitor" filter="s60" long-name="Profile Settings Monitor">
-<unit bldFile="mw/mmmw/mmfenh/profilesettingsmonitor/group"/>
-</component>
-<component name="progressivedownload" filter="s60" long-name="Progressive Download">
-<unit bldFile="mw/mmmw/mmfenh/progressivedownload/group"/>
-</component>
-</collection>
-<collection name="mm_fw" long-name="Multimedia Frameworks" level="framework">
-<!-- Id needs to be unique, mmfw already in use -->
-<!-- Placeholder for OpenAX AL and other stuff -->
-</collection>
-<collection name="mmserv" long-name="Multimedia Services" level="specific">
-<component name="audioeffectsui" filter="s60" long-name="Audio Effects UI">
-<unit bldFile="mw/mmmw/mmserv/audioeffectsui/group"/>
-</component>
-<component name="callaudiocontrol" filter="s60" long-name="Call Audio Control">
-<unit bldFile="mw/mmmw/mmserv/callaudiocontrol/group"/>
-</component>
-<component name="metadatautility" filter="s60" long-name="Metadata Utility">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/group"/>
-</component>
-<component name="radioutility" filter="s60" long-name="Radio Utility">
-<unit bldFile="mw/mmmw/mmserv/radioutility/group"/>
-</component>
-<component name="thumbnailengine" filter="s60" long-name="Thumbnail Engine" introduced="^2">
-<unit bldFile="mw/mmmw/mmserv/thumbnailengine/group"/>
-</component>
-<component name="tms" filter="s60" long-name="Telephony Multimedia Service" introduced="^3">
-<unit bldFile="mw/mmmw/mmserv/tms/group"/>
-</component>
-<component name="voipaudioservices" filter="s60" long-name="VoIP Audio Services">
-<unit bldFile="mw/mmmw/mmserv/voipaudioservices/group"/>
-</component>
-<component name="lib3gpextparser" filter="s60" long-name="3GP Extension Metadata Parser Library">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group" filter="sf_build"/>
-</component>
-</collection>
-<collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
-<component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="helix" level="generic" long-name="Helix" levels="plugin framework server generic specific">
-<collection name="helix_ren" long-name="Helix Engine" level="framework">
-<!-- what does "ren" stand for? -->
-<component name="helix_stub" filter="s60" long-name="Helix Stub" introduced="^2" class="api">
-<unit bldFile="mw/helix/helix_ren/helix_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="camerasrv" level="specific" long-name="Camera Services" levels="plugin fw api">
-<collection name="camerasrv_plat" long-name="Camera Services Platform Interfaces" level="api">
-<component name="media_recorder_sink_api" long-name="Media Recorder Sink API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
-</component>
-<component name="cae_extentension_api" long-name="CAE Extension API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/cae_extentension_api/group"/>
-</component>
-<component name="camera_application_engine_api" long-name="Camera Application Engine API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/camera_application_engine_api/group" filter="!test"/>
-</component>
-<component name="custom_onboard_camera_api" long-name="Custom Onboard Camera API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
-</component>
-<component name="imaging_configuration_manager_api" long-name="Imaging Configuration Manager API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
-</component>
-<component name="media_recorder_api" long-name="Media Recorder API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_api/group" filter="!test"/>
-</component>
-<component name="3gp_file_composer_api" long-name="3GP File Composer API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
-</component>
-</collection>
-<collection name="camcordermmfplugin" long-name="Camcorder MMF Plugin" level="plugin">
-<!-- collection is really a component. Should move down a directory -->
-<component name="camcordermmfplugin_build" filter="s60" long-name="Camcorder MMF Plugin Build" plugin="Y">
-<unit bldFile="mw/camerasrv/camcordermmfplugin/build"/>
-</component>
-</collection>
-<collection name="configmanagers" long-name="Config Managers" level="api">
-<component name="imagingconfigmanager" filter="s60" long-name="Imaging Config Manager">
-<unit bldFile="mw/camerasrv/configmanagers/imagingconfigmanager/group"/>
-</component>
-</collection>
-<collection name="camerasrv_info" long-name="Camera Services Info" level="api">
-<component name="camerasrv_build" filter="s60" long-name="Camera Services Build">
-<!-- should split into individual bld.infs -->
-<unit bldFile="mw/camerasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="mmappfw" level="specific" long-name="Multimedia App Framework" levels="fw utils if">
-<collection name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" level="if">
-<component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interfaces Build" introduced="^1" filter="s60">
-<!-- this is no longer necessary when confguration is put in place -->
-<unit bldFile="mw/mmappfw/mmappfw_plat"/>
-</component>
-<component name="collection_helper_api" long-name="Collection Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
-</component>
-<component name="harvester_collection_mediator_api" long-name="Harvester Collection Mediator API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/group"/>
-</component>
-<component name="harvester_metadata_extractor_api" long-name="Harvester Metadata Extractor API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/group"/>
-</component>
-<component name="harvester_server_api" long-name="Harvester Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_server_api/group"/>
-</component>
-<component name="harvester_utility_api" long-name="Harvester Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_utility_api/group"/>
-</component>
-<component name="playlist_engine_api" long-name="Playlist Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playlist_engine_api/group"/>
-</component>
-<component name="mtp_keys_api" long-name="MTP Keys API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mtp_keys_api/group"/>
-</component>
-<component name="mpx_collection_common_definition_api" long-name="MPX Collection Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_common_definition_api/group"/>
-</component>
-<component name="mpx_collection_utility_api" long-name="MPX Collection Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/group"/>
-</component>
-<component name="mpx_common_api" long-name="MPX Common API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_api/group"/>
-</component>
-<component name="mpx_common_definition_api" long-name="MPX Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_common_definition_api" long-name="MPX Playback Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_utility_api" long-name="MPX Playback Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/group"/>
-</component>
-<component name="mpx_base_view_plugins_api" long-name="MPX Base View Plugins API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/group"/>
-</component>
-<component name="mpx_view_utility_api" long-name="MPX View Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_view_utility_api/group"/>
-</component>
-<component name="mpx_albumart_utility_api" long-name="MPX Album Art Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/group"/>
-</component>
-<component name="media_player_settings_engine_api" long-name="Media Player Settings Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
-</component>
-<component name="mpx_backstepping_utility_api" long-name="MPX Backstepping Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_backstepping_utility_api/group"/>
-</component>
-<component name="asx_parser_api" long-name="ASX Parser API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/asx_parser_api/group"/>
-</component>
-<component name="playback_helper_api" long-name="Playback Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playback_helper_api/group"/>
-</component>
-<component name="videoplaylist_utility_api" long-name="Video Playlist Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/videoplaylist_utility_api/group"/>
-</component>
-</collection>
-<collection name="mpx" long-name="Multimedia Player" level="fw">
-<component name="commonframework" filter="s60" long-name="MPX Common Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/commonframework/group"/>
-</component>
-<component name="playbackframework" filter="s60" long-name="MPX Playback Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/playbackframework/group"/>
-</component>
-<component name="mpxcollectionfw" filter="s60" long-name="MPX Collection Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/collectionframework/group"/>
-</component>
-<component name="mpxviewfw" filter="s60" long-name="MPX View Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/viewframework/group"/>
-</component>
-<component name="mpxviewframeworkqt" long-name="MPX View Framework Qt" filter="s60">
-<unit bldFile="mw/mmappfw/mpx/mpxviewframeworkqt"/>
-</component>
-<component name="mpx_build" filter="s60" long-name="MPX Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/mpx/group"/>
-</component>
-</collection>
-<collection name="mmappcomponents" long-name="Multimedia App Components" level="utils">
-<component name="mmappcomponents_build" filter="s60" long-name="Multimedia App Components Build" introduced="^1">
-<!-- needed for #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
- Can remove this once configuration is in place-->
-<unit bldFile="mw/mmappfw/mmappcomponents/group"/>
-</component>
-<component name="collectionhelper" filter="s60" long-name="Media Player Collection Helper" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/collectionhelper/group"/>
-</component>
-<component name="playlistengine" filter="s60" long-name="Playlist Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/playlistengine/group"/>
-</component>
-<component name="mpxharvester" filter="s60" long-name="Media Player Harvester" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/harvester/group"/>
-</component>
-<component name="mmappcommonui" filter="s60" long-name="Multimedia App Common UI" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmappcommonui/group"/>
-</component>
-<component name="mediaplayersettingsengine" filter="s60" long-name="Media Player Settings Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
-</component>
-<component name="audiofetcher" filter="s60" long-name="Audio Fetcher" introduced="^1" plugin="Y">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
-</component>
-<component name="asxparser" filter="s60" long-name="ASX Parser" introduced="^1">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
-</component>
-<component name="playbackhelper" filter="s60" long-name="Playback Helper" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/playbackhelper/group"/>
-</component>
-<component name="videoplaylistutility" filter="s60" long-name="Video Playlist Utility" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/videoplaylistutility/group"/>
-</component>
-<component name="mmmtpdataprovider" filter="s60" long-name="Multimedia MTP Data Provider" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmmtpdataprovider/group"/>
-</component>
-</collection>
-<collection name="mmappfw_info" long-name="Multimedia App Framework Info" level="if">
-<component name="mmappfw_build" filter="s60" long-name="Multimedia App Framework Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/group"/>
-</component>
-<component name="mmappfw_test" filter="s60,test,api_test,pref_test" long-name="Multimedia App Framework Test" purpose="development" introduced="^1"/>
-</collection>
-</block>
-<block name="hgwidgets" level="specific" long-name="HG Widgets" levels="framework service api">
-<collection name="hgwidgets_pub" long-name="HG Widgets Platform Interfaces" level="api">
-<component name="ganeswidgets_api" long-name="Ganes Widgets API" introduced="^4" class="api placeholder">
-<!-- should separate out unit -->
-</component>
-</collection>
-<collection name="hgwidgets_pub" long-name="HG Widgets Public Interfaces" level="api"/>
-<collection name="ganeswidgets" long-name="Ganes Widgets" level="service">
-<!-- really a component, should move down a dir level and have a unit -->
-<component name="ganeswidgets_build" long-name="Ganes Widgets Build" introduced="^4" class="placeholder">
-<!-- should separate out unit -->
-</component>
-</collection>
-<collection name="hgwidgets_info" long-name="HG Widgets Info" level="framework">
-<component name="hgwidgets_build" long-name="HG Widgets Build" introduced="^4">
-<unit bldFile="mw/hgwidgets"/>
-</component>
-</collection>
-</block>
-<block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework api">
-<collection name="inputmethods_pub" long-name="Input Methods Public Interfaces" level="api">
-<component name="ptiengine_iti_api" long-name="PTI Engine API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
-</component>
-<component name="optical_character_recognition_api" long-name="Optical Character Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
-</component>
-<component name="input_language_info_api" long-name="Input Language Info API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
-</component>
-</collection>
-<collection name="inputmethods_plat" long-name="Input Methods Platform Interfaces" level="api">
-<component name="pen_input_server_api" long-name="Pen Input Server API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/group" filter="!test"/>
-</component>
-<component name="ptiengine_hwr_api" long-name="PTI Engine Handwriting Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group" filter="!test"/>
-</component>
-<component name="aknfep_settings_api" long-name="Avkon FEP Settings API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
-</component>
-<component name="aknfep_status_api" long-name="Avkon FEP Status API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
-</component>
-<component name="ptiengine_key_definations_api" long-name="PTI Engine Key Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
-</component>
-<component name="aknfep_definitions_api" long-name="Avkon FEP Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
-</component>
-<component name="aknfep_pen_support_api" long-name="Avkon FEP Pen Support API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
-</component>
-<component name="ptiengine_indic_definitions_api" long-name="PTI Engine Indic Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
-</component>
-<component name="aknfep_uiinterface_api" long-name="Avkon FEP UI Interface API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="textinput" long-name="Text Input" level="framework">
-<component name="ptienginev2" filter="s60" long-name="Predictive Text Input Engine">
-<!--uncomment when configuration is turned on and textinput_build is removed-->
-<!-- <unit bldFile="textinput/ptienginev2/group"/>-->
-</component>
-<component name="akninputlanguage" filter="s60" long-name="Avkon Input Language">
-<unit bldFile="mw/inputmethods/textinput/akninputlanguage/group"/>
-</component>
-<component name="ptihangulcore" filter="s60" long-name="PIT Hangul Core" introduced="^3">
-<unit bldFile="mw/inputmethods/textinput/ptihangulcore/group"/>
-</component>
-<component name="ptikoreanqwertycore" filter="s60" long-name="PTI Korean QWERTY Core" introduced="^3">
-<unit bldFile="mw/inputmethods/textinput/ptikoreanqwertycore/group"/>
-</component>
-<component name="peninputarc" filter="s60" long-name="Pen Input Arc">
-<unit bldFile="mw/inputmethods/textinput/peninputarc/group"/>
-</component>
-<component name="peninputcommonctrls" filter="s60" long-name="Pen Input Common Controls">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonctrls/group"/>
-</component>
-<component name="peninputcommonlayout" filter="s60" long-name="Pen Input Common Layout">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonlayout/group"/>
-</component>
-<component name="peninputhwrtrui" filter="s60" long-name="Pen Input Handwriting Recognition Training UI" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrtrui/group"/>
-</component>
-<component name="textinput_build" filter="s60" long-name="Text Input Build">
-<!--needed for #ifdef, can be removed when configuration is implemented -->
-<unit bldFile="mw/inputmethods/textinput/group"/>
-</component>
-</collection>
-<collection name="fep" long-name="FEP" level="engine">
-<component name="aknfep" filter="s60" long-name="Avkon FEP" plugin="Y">
-<unit bldFile="mw/inputmethods/fep/aknfep/group"/>
-</component>
-<component name="frontendprocessor" long-name="Front End Processor" purpose="mandatory">
-<unit bldFile="mw/inputmethods/fep/frontendprocessor/group" mrp="mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
-</component>
-</collection>
-<collection name="inputmethods_info" long-name="Input Methods Info" level="api">
-<component name="inputmethods_metadata" long-name="Input Methods Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="qt" level="generic" long-name="Qt" levels="tool mw app">
-<collection name="qtconf" long-name="Qt Config" level="tool">
-<component name="qt_deviceconfiguration" long-name="Qt Device Configuration" introduced="^2" class="config tool">
-<unit bldFile="mw/qt/src/s60installs/deviceconfiguration"/>
-</component>
-</collection>
-<collection name="qt_info" long-name="Qt Info" level="mw">
-<component name="qt_build" long-name="Qt Build" introduced="^2">
-<unit bldFile="mw/qt"/>
-</component>
-</collection>
-<collection name="qtdemos" long-name="Qt Demos" level="app">
-<component name="qtdemos_build" long-name="Qt Demos Build" introduced="^2" filter="qtdemos">
-<unit bldFile="mw/qt/demos"/>
-</component>
-</collection>
-<collection name="qtexamples" long-name="Qt Examples" level="app">
-<component name="qtexamples_build" long-name="Qt Examples Build" introduced="^2" filter="qtexamples">
-<unit bldFile="mw/qt/examples"/>
-</component>
-</collection>
-<collection name="qt_tests" long-name="Qt Tests" level="app">
-<component name="qttestsauto" long-name="Qt Automated Tests" introduced="^2" filter="qttestsauto">
-<unit bldFile="mw/qt/tests/auto"/>
-</component>
-<component name="qttestsbenchmarks" long-name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks">
-<unit bldFile="mw/qt/tests/benchmarks"/>
-</component>
-</collection>
-</block>
-<block name="qtextensions" level="generic" long-name="Qt Extensions" levels="tool mw app">
-<collection name="qtecomplugins" long-name="Qt ECom Plugins" level="app">
-<component name="qtextensions_examples" filter="qtextensionsexamples" long-name="Qt ECom Plugin Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtecomplugins/examples"/>
-</component>
-</collection>
-<collection name="qthighway" long-name="Qt Highway" level="app">
-<component name="qthighway_examples" filter="qtextensionsexamples" long-name="Qt Highway Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qthighway/examples"/>
-</component>
-<component name="qthighwaytests" filter="qtextensionstests" long-name="Qt Highway Tests" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qthighway/tests"/>
-</component>
-</collection>
-<collection name="qtmobileextensions" long-name="Qt Mobile Extensions" level="app">
-<component name="qtmobileextensions_examples" filter="qtextensionsexamples" long-name="Qt Mobile Extensions Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtmobileextensions/examples"/>
-</component>
-</collection>
-<collection name="qtmobility" long-name="Qt Mobility">
-<component name="qtmobility_examples" filter="qtextensionsexamples" long-name="Qt Mobility Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtmobility/examples"/>
-</component>
-<component name="qtmobilitytests" filter="qtextensionstests" long-name="Qt Extensions Tests" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtmobility/tests"/>
-</component>
-</collection>
-<collection name="qtextensions_info">
-<component name="qtextensions_build" long-name="Qt Extensions Confgure" introduced="^4" class="conf">
-<unit bldFile="mw/qtextensions/group"/>
-</component>
-<component name="qtextensions_build" long-name="Qt Extensions Build" introduced="^4">
-<!-- break this up into the above collections-->
-<unit bldFile="mw/qtextensions"/>
-</component>
-</collection>
-</block>
-<block name="hb" level="generic" long-name="Orbit"/>
-<block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
-<collection name="classicui_plat" long-name="Classic UI Platform Interfaces" level="specific">
-<component name="personalisation_framework_api" long-name="Personalisation Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_framework_api/group" filter="!test"/>
-</component>
-<component name="signal_pane_api" long-name="Signal Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
-</component>
-<component name="japanese_reading_api" long-name="Japanese Reading API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/japanese_reading_api/group" filter="!test"/>
-</component>
-<component name="global_popup_priority_controller_api" long-name="Global Popup Priority Controller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
-</component>
-<component name="item_finder_api" long-name="Item Finder API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/item_finder_api/group" filter="!test"/>
-</component>
-<component name="avkon_fonts_api" long-name="Avkon Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_fonts_api/group" filter="!test"/>
-</component>
-<component name="extended_utilities_api" long-name="Extended Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
-</component>
-<component name="personalisation_plugin_api" long-name="Personalisation Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
-</component>
-<component name="extended_aiw_criteria_api" long-name="Extended AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="personalisation_application_api" long-name="Personalisation Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_application_api/group"/>
-</component>
-<component name="volume_popup_api" long-name="Volume Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
-</component>
-<component name="avkon_secondary_display_support_api" long-name="AVKON Secondary Display Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_support_api/group" filter="!test"/>
-</component>
-<component name="extended_setting_pages_api" long-name="Extended Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_setting_pages_api/group" filter="!test"/>
-</component>
-<component name="extended_lists_api" long-name="Extended Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_lists_api/group" filter="!test"/>
-</component>
-<component name="input_block_api" long-name="Input Block API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/input_block_api/group" filter="!test"/>
-</component>
-<component name="avkon_ui_server_api" long-name="AVKON UI Server API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_ui_server_api/group" filter="!test"/>
-</component>
-<component name="number_grouping_api" long-name="Number Grouping API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/number_grouping_api/group" filter="!test"/>
-</component>
-<component name="extended_status_pane_api" long-name="Extended Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_status_pane_api/group" filter="!test"/>
-</component>
-<component name="extended_notifiers_api" long-name="Extended Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notifiers_api/group" filter="!test"/>
-</component>
-<component name="task_list_api" long-name="Task List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
-</component>
-<component name="personalisation_slide_show_dialog_api" long-name="Personalisation Slide Show Dialog API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
-</component>
-<component name="key_event_utilities_api" long-name="Key Event Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_event_utilities_api/group"/>
-</component>
-<component name="emergency_call_support_api" long-name="Emergency Call Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/emergency_call_support_api/group" filter="!test"/>
-</component>
-<component name="extended_dialogs_api" long-name="Extended Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_dialogs_api/group"/>
-</component>
-<component name="legacy_ui_framework_headers_api" long-name="Legacy UI Framework Headers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/legacy_ui_framework_headers_api/group"/>
-</component>
-<component name="extended_editors_api" long-name="Extended Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_editors_api/group" filter="!test"/>
-</component>
-<component name="alarm_api" long-name="Alarm API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alarm_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_interface_base_api" long-name="AIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_base_api/group" filter="!test"/>
-</component>
-<component name="list_effects_api" long-name="List Effects API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/list_effects_api/group" filter="!test"/>
-</component>
-<component name="find_item_ui_api" long-name="Find Item UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/find_item_ui_api/group" filter="!test"/>
-</component>
-<component name="server_application_services_api" long-name="Server Application Services API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/server_application_services_api/group" filter="!test"/>
-</component>
-<component name="common_ui_settings_api" long-name="Common UI Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_ui_settings_api/group"/>
-</component>
-<component name="aiw_service_interface_menu_api" long-name="AIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_menu_api/group" filter="!test"/>
-</component>
-<component name="eikon_server_extension_client_api" long-name="EIKON Server Extension Client API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/eikon_server_extension_client_api/group" filter="!test"/>
-</component>
-<component name="skinnable_clock_api" long-name="Skinnable Clock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/skinnable_clock_api/group" filter="!test"/>
-</component>
-<component name="battery_pane_api" long-name="Battery Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/battery_pane_api/group" filter="!test"/>
-</component>
-<component name="fep_document_navigation_api" long-name="FEP Document Navigation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
-</component>
-<component name="personalisation_localised_texts_api" long-name="Personalisation Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
-</component>
-<component name="memory_card_ui_api" long-name="Memory Card UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
-</component>
-<component name="avkon_status_api" long-name="AVKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_status_api/group"/>
-</component>
-<component name="application_switching_api" long-name="Application Switching API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/application_switching_api/group" filter="!test"/>
-</component>
-<component name="avkon_localised_texts_api" long-name="AVKON Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_localised_texts_api/group"/>
-</component>
-<component name="avkon_secondary_display_api" long-name="AVKON Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_api/group"/>
-</component>
-<component name="extended_animation_api" long-name="Extended Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_notes_api" long-name="Extended Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notes_api/group" filter="!test"/>
-</component>
-<component name="screensaver_animation_plugin_definitions_api" long-name="Screensaver Animation Plugin Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/screensaver_animation_plugin_definitions_api/group"/>
-</component>
-<component name="text_scroller_api" long-name="Text Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/text_scroller_api/group" filter="!test"/>
-</component>
-<component name="custom_cursors_api" long-name="Custom Cursors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/custom_cursors_api/group" filter="!test"/>
-</component>
-<component name="screensaver_settings_api" long-name="Screensaver Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/screensaver_settings_api/group"/>
-</component>
-<component name="global_window_priorities_api" long-name="Global Window Priorities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_window_priorities_api/group"/>
-</component>
-<component name="extended_indicators_api" long-name="Extended Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_indicators_api/group" filter="!test"/>
-</component>
-<component name="special_character_table_api" long-name="Special Character Table API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/special_character_table_api/group" filter="!test"/>
-</component>
-<component name="avkon_settings_api" long-name="AVKON Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_settings_api/group"/>
-</component>
-<component name="extended_sounds_api" long-name="Extended Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_sounds_api/group"/>
-</component>
-<component name="themes_settings_api" long-name="Themes Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/themes_settings_api/group"/>
-</component>
-<component name="media_shared_document_api" long-name="Media Shared Document API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/media_shared_document_api/group" filter="!test"/>
-</component>
-<component name="extended_queries_api" long-name="Extended Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_queries_api/group"/>
-</component>
-<component name="phone_number_text_utilities_api" long-name="Phone Number Text Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
-</component>
-<component name="screensaver_runtime_api" long-name="Screensaver Runtime API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/screensaver_runtime_api/group"/>
-</component>
-<component name="extended_scroller_api" long-name="Extended Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_scroller_api/group"/>
-</component>
-<component name="key_rotator_api" long-name="Key Rotator API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_rotator_api/group" filter="!test"/>
-</component>
-<component name="extended_grids_api" long-name="Extended Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_grids_api/group" filter="!test"/>
-</component>
-<component name="generic_parameter_api" long-name="Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="indicator_touch_observer_api" long-name="Indicator Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_touch_observer_api/group"/>
-</component>
-<component name="popup_form_api" long-name="Popup Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/popup_form_api/group" filter="!test"/>
-</component>
-<component name="stylus_activated_popup_api" long-name="Stylus Activated Pop-up API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/stylus_activated_popup_api/group" filter="!test"/>
-</component>
-<component name="indicator_plugin_api" long-name="Indicator Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_plugin_api/group" filter="!test"/>
-</component>
-<component name="layout_configuration_api" long-name="Layout Configuration API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/layout_configuration_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_filter_factory_api" long-name="Common File Dialogs Filter Factory API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group" filter="!test"/>
-</component>
-<component name="avkon_anim_dll_api" long-name="AVKON Anim DLL API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_anim_dll_api/group"/>
-</component>
-<component name="extended_initialization_api" long-name="Extended Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_initialization_api/group" filter="!test"/>
-</component>
-<component name="long_tap_animation_api" long-name="Long Tap Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/long_tap_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_ui_framework_definitions_api" long-name="Extended UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_ui_framework_definitions_api/group"/>
-</component>
-<component name="extended_buttons_api" long-name="Extended Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_buttons_api/group" filter="!test"/>
-</component>
-<component name="aiw_provider_utility_api" long-name="AIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_provider_utility_api/group" filter="!test"/>
-</component>
-<component name="transition_effect_parameters_api" long-name="Transition Effect Parameters API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_parameters_api/group" filter="!test"/>
-</component>
-<component name="extended_input_capabilities_api" long-name="Extended Input Capabilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_input_capabilities_api/group" filter="!test"/>
-</component>
-<component name="uikon_status_api" long-name="UIKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/uikon_status_api/group"/>
-</component>
-<component name="transition_effect_utilities_api" long-name="Transition Effect Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_utilities_api/group" filter="!test"/>
-</component>
-<component name="pointer_event_modifier_api" long-name="Pointer Event Modifier API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/pointer_event_modifier_api/group" filter="!test"/>
-</component>
-<component name="avkon_testability_api" long-name="AVKON Testability API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_testability_api/group"/>
-</component>
-<component name="ganes_api" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ganes_api/group"/>
-</component>
-<component name="ode_api" long-name="Ode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ode_api/group"/>
-</component>
-<component name="physics_api" long-name="Physics API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/physics_api/group"/>
-</component>
-<component name="touch_pane_api" long-name="Touch Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_api/group" filter="!test"/>
-</component>
-<component name="touch_pane_observer_api" long-name="Touch Pane Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_observer_api/group"/>
-</component>
-<component name="alternate_fs_api" long-name="Alternate FS API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alternate_fs_api/group"/>
-</component>
-<component name="discreet_popup_api" long-name="Discreet Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/discreet_popup_api/group"/>
-</component>
-<component name="touch_gesture_framework_api" long-name="Touch Gesture Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_gesture_framework_api/group"/>
-<!-- should this be commented out? -->
-<!--<unit bldFile="classicui_plat/touch_gesture_framework_api/tsrc/group" filter="test,api_test"/> -->
-</component>
-<component name="extended_options_menu_api" long-name="Extended Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="classicui_pub" long-name="Classic UI Public Interfaces" level="specific">
-<component name="input_frame_api" long-name="Input Frame API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/input_frame_api/group" filter="!test"/>
-</component>
-<component name="window_server_event_observer_api" long-name="Window Server Event Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/window_server_event_observer_api/group" filter="!test"/>
-</component>
-<component name="application_framework_api" long-name="Application Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/application_framework_api/group" filter="!test"/>
-</component>
-<component name="scroller_api" long-name="Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/scroller_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_utilities_api" long-name="UI Framework Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_utilities_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_definitions_api" long-name="UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_definitions_api/group" filter="!test"/>
-</component>
-<component name="buttons_api" long-name="Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/buttons_api/group" filter="!test"/>
-</component>
-<component name="queries_api" long-name="Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/queries_api/group" filter="!test"/>
-</component>
-<component name="aiw_generic_parameter_api" long-name="AIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="editors_api" long-name="Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/editors_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_api" long-name="Common File Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/common_file_dialogs_api/group" filter="!test"/>
-</component>
-<component name="dialog_shutter_api" long-name="Dialog Shutter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialog_shutter_api/group" filter="!test"/>
-</component>
-<component name="fonts_api" long-name="Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/fonts_api/group" filter="!test"/>
-</component>
-<component name="screen_clearer_api" long-name="Screen Clearer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_clearer_api/group" filter="!test"/>
-</component>
-<component name="notifiers_api" long-name="Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notifiers_api/group" filter="!test"/>
-</component>
-<component name="notes_api" long-name="Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notes_api/group" filter="!test"/>
-</component>
-<component name="screen_saver_api" long-name="Screen Saver API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_saver_api/group" filter="!test"/>
-</component>
-<component name="status_pane_api" long-name="Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/status_pane_api/group" filter="!test"/>
-</component>
-<component name="base_controls_api" long-name="Base Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/base_controls_api/group" filter="!test"/>
-</component>
-<component name="grids_api" long-name="Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/grids_api/group" filter="!test"/>
-</component>
-<component name="context_pane_api" long-name="Context Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/context_pane_api/group" filter="!test"/>
-</component>
-<component name="lists_api" long-name="Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/lists_api/group" filter="!test"/>
-</component>
-<component name="popups_api" long-name="Popups API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/popups_api/group" filter="!test"/>
-</component>
-<component name="misc_controls_api" long-name="Misc Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/misc_controls_api/group" filter="!test"/>
-</component>
-<component name="keylock_api" long-name="Keylock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/keylock_api/group" filter="!test"/>
-</component>
-<component name="options_menu_api" long-name="Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/options_menu_api/group" filter="!test"/>
-</component>
-<component name="hierarchical_lists_api" long-name="Hierarchical Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hierarchical_lists_api/group" filter="!test"/>
-</component>
-<component name="navigation_pane_api" long-name="Navigation Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/navigation_pane_api/group" filter="!test"/>
-</component>
-<component name="tabs_api" long-name="Tabs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/tabs_api/group" filter="!test"/>
-</component>
-<component name="title_pane_touch_observer_api" long-name="Title Pane Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_touch_observer_api/group"/>
-</component>
-<component name="choice_list_api" long-name="Choice List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/choice_list_api/group" filter="!test"/>
-</component>
-<component name="info_popup_note_api" long-name="Info Popup Note API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/info_popup_note_api/group" filter="!test"/>
-</component>
-<component name="setting_pages_api" long-name="Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/setting_pages_api/group" filter="!test"/>
-</component>
-<component name="screen_mode_api" long-name="Screen Mode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_mode_api/group" filter="!test"/>
-</component>
-<component name="indicators_api" long-name="Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/indicators_api/group" filter="!test"/>
-</component>
-<component name="error_ui_api" long-name="Error UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/error_ui_api/group" filter="!test"/>
-</component>
-<component name="animation_api" long-name="Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/animation_api/group" filter="!test"/>
-</component>
-<component name="searchfield_api" long-name="Searchfield API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/searchfield_api/group" filter="!test"/>
-</component>
-<component name="labels_api" long-name="Labels API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/labels_api/group" filter="!test"/>
-</component>
-<component name="hotkeys_api" long-name="Hotkeys API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hotkeys_api/group" filter="!test"/>
-</component>
-<component name="initialization_api" long-name="Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/initialization_api/group" filter="!test"/>
-</component>
-<component name="volume_control_api" long-name="Volume Control API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/volume_control_api/group" filter="!test"/>
-</component>
-<component name="title_pane_api" long-name="Title Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_api/group" filter="!test"/>
-</component>
-<component name="sounds_api" long-name="Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/sounds_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_handler_api" long-name="AIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_service_handler_api/group" filter="!test"/>
-</component>
-<component name="aiw_criteria_api" long-name="AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="touch_ui_utilities_api" long-name="Touch UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/touch_ui_utilities_api/group" filter="!test"/>
-</component>
-<component name="generic_button_api" long-name="Generic Button API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/generic_button_api/group" filter="!test"/>
-</component>
-<component name="form_api" long-name="Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/form_api/group" filter="!test"/>
-</component>
-<component name="uikon_core_controls" long-name="Uikon Core Controls" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/uikon_core_controls/group" filter="!test"/>
-</component>
-<component name="calendar_api" long-name="Calendar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/calendar_api/group"/>
-</component>
-<component name="toolbar_api" long-name="Toolbar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/toolbar_api/group" filter="!test"/>
-</component>
-<component name="server_application_api" long-name="Server Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/server_application_api/group"/>
-</component>
-<component name="slider_api" long-name="Slider API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/slider_api/group" filter="!test"/>
-</component>
-<component name="private_ui_framework_api" long-name="Private UI Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/private_ui_framework_api/group" filter="!test"/>
-</component>
-<component name="dialogs_api" long-name="Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialogs_api/group" filter="!test"/>
-</component>
-<component name="document_handler_api" long-name="Document handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/document_handler_api/group"/>
-</component>
-<component name="images_api" long-name="Images API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/images_api/group" filter="!test"/>
-</component>
-<component name="stylus_popup_menu_api" long-name="Stylus Pop-up Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/stylus_popup_menu_api/group" filter="!test"/>
-</component>
-<component name="information_preview_popup_api" long-name="Information Preview Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/information_preview_popup_api/group" filter="!test"/>
-</component>
-<component name="intermediate_state_api" long-name="Intermediate State API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/intermediate_state_api/group"/>
-</component>
-<component name="help_launcher_api" long-name="Help Launcher API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/help_launcher_api/group"/>
-</component>
-</collection>
-<collection name="ode" long-name="Open Dynamics Engine" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="ode_build" filter="s60" long-name="ODE">
-<unit bldFile="mw/classicui/ode/group"/>
-</component>
-</collection>
-<collection name="uifw" long-name="UI Framework" level="server">
-<component name="uiklaf" filter="s60" long-name="Uikon Look-and-Feel">
-<unit bldFile="mw/classicui/uifw/uiklaf/group"/>
-</component>
-<component name="eikctl" filter="s60" long-name="Eikon Controls">
-<unit bldFile="mw/classicui/uifw/eikctl/group"/>
-</component>
-<component name="avkon" filter="s60" long-name="Avkon">
-<!-- can only have one unit. Split into 3 components, or #include all from same bld.inf -->
-<unit bldFile="mw/classicui/uifw/avkon/aknphysics/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/aknconf/group"/>
-</component>
-<component name="eikstd" filter="s60" long-name="Eikon Standard">
-<unit bldFile="mw/classicui/uifw/eikstd/group"/>
-</component>
-<component name="aknglobalui" filter="s60" long-name="Avkon Global UI">
-<unit bldFile="mw/classicui/uifw/aknglobalui/group"/>
-</component>
-<component name="ganes" filter="s60" long-name="Ganes">
-<unit bldFile="mw/classicui/uifw/ganes/group"/>
-</component>
-</collection>
-<collection name="commonuis" long-name="Common UIs" level="specific">
-<component name="commonui" filter="s60" long-name="Common UI">
-<unit bldFile="mw/classicui/commonuis/commonui/group"/>
-</component>
-<component name="commondialogs" filter="s60" long-name="Common Dialogs">
-<unit bldFile="mw/classicui/commonuis/commondialogs/group"/>
-</component>
-</collection>
-<collection name="applicationinterworkingfw" long-name="Application Interworking Framework" level="generic">
-<component name="aifwservicehandler" filter="s60" long-name="Application Interworking Service Handler">
-<unit bldFile="mw/classicui/applicationinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-<collection name="psln" long-name="Personalization" level="specific">
-<!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
-<component name="psln_build" filter="s60" long-name="Personalization Build">
-<unit bldFile="mw/classicui/psln/group"/>
-</component>
-</collection>
-<collection name="commonadapter" long-name="Common Adapter" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="commonadapter_build" filter="s60" long-name="Common Adapter Build">
-<unit bldFile="mw/classicui/commonadapter/group"/>
-</component>
-</collection>
-<collection name="akntouchgesturefw" long-name="Avkon Touch Gesture Framework" level="generic">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="akntouchgesturefw_build" filter="s60" long-name="Avkon Touch Gesture Framework Build" introduced="^3">
-<unit bldFile="mw/classicui/akntouchgesturefw/group"/>
-</component>
-</collection>
-<collection name="uiutils" long-name="UI Utils" level="specific">
-<component name="localizer" filter="s60" long-name="Directory Localizer">
-<unit bldFile="mw/classicui/uiutils/localizer/group"/>
-</component>
-<component name="findutil" filter="s60" long-name="Find Utility">
-<unit bldFile="mw/classicui/uiutils/findutil/group"/>
-</component>
-<component name="gamerecognizer" filter="s60" long-name="Game Recognizer" plugin="Y">
-<unit bldFile="mw/classicui/uiutils/gamerecognizer/group"/>
-</component>
-<component name="aknjapanesereading" filter="s60" long-name="Avkon Japanese Reading">
-<unit bldFile="mw/classicui/uiutils/aknjapanesereading/group"/>
-</component>
-<component name="hlplch" long-name="Help Launcher" filter="s60,bldfirst">
-<unit bldFile="mw/classicui/uiutils/hlplch/group"/>
-</component>
-</collection>
-<collection name="commonuisupport" long-name="Common UI Support" level="support">
-<component name="uikon" long-name="Uikon" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uikon/group" mrp="mw/classicui/commonuisupport/uikon/group/app-framework_uikon.mrp"/>
-</component>
-<component name="errorresolverdata" long-name="Error Resolver Data" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/errorresolverdata/group" mrp="mw/classicui/commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
-</component>
-<component name="uilaf" long-name="UI Look and Feel" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uilaf/GROUP" mrp="mw/classicui/commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
-</component>
-<component name="grid" long-name="Grid" purpose="optional">
-<unit bldFile="mw/classicui/commonuisupport/grid/group" mrp="mw/classicui/commonuisupport/grid/group/app-framework_grid.mrp"/>
-</component>
-<component name="uifwsdocs" long-name="UI Frameworks Documentation" purpose="development" class="doc">
-<unit mrp="mw/classicui/commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
-</component>
-</collection>
-<collection name="lafagnosticuifoundation" long-name="Look-and-Feel Agnostic UI Foundation" level="base">
-<component name="cone" long-name="Control Environment" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/cone/group" mrp="mw/classicui/lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
-</component>
-<component name="graphicseffects" long-name="Graphics Effects" introduced="9.2" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/graphicseffects/group" mrp="mw/classicui/lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
-</component>
-<component name="uigraphicsutils" long-name="UI Graphics Utilities" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group" mrp="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
-</component>
-<component name="clockanim" long-name="Clock" purpose="optional" plugin="Y">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/clockanim/group" mrp="mw/classicui/lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
-</component>
-<component name="bmpanimation" long-name="BMP Animation" introduced="6.0" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/bmpanimation/group" mrp="mw/classicui/lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
-</component>
-<component name="animation" long-name="Animation" introduced="9.1" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/animation/group" mrp="mw/classicui/lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
-</component>
-</collection>
-<collection name="classicui_info" long-name="Classic UI Info" level="specific">
-<!-- the multiple units in the API test components need to be resolved -->
-<component name="classicui_metadata" long-name="Classic UI Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/classicui/classicui_info/classicui_metadata/classicui_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="svgt" level="generic" long-name="SVG Tiny" levels="util ui">
-<collection name="svgt_plat" long-name="SVG Tiny Platform Interfaces" level="ui">
-<component name="svgt_api" long-name="SVGT API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/svgt_api/group"/>
-</component>
-<component name="nvg_api" long-name="NVG API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/nvg_api/group"/>
-</component>
-</collection>
-<collection name="svgtopt" long-name="SVG-T Engine" level="util">
-<component name="svgtopt_build" filter="s60" long-name="SVG Engine" introduced="9.2">
-<!-- component is at collection level. Needs to be moved down a directory -->
-<unit bldFile="mw/svgt/svgtopt/group"/>
-</component>
-<component name="svgtplugin" filter="s60" long-name="SVG Plugin" introduced="9.2" plugin="Y">
-<unit bldFile="mw/svgt/svgtopt/svgtplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="uiaccelerator" level="generic" long-name="UI Accelerator" levels="plugin framework server ex if">
-<collection name="uiaccelerator_plat" long-name="UI Accelerator Platform Interfaces" level="if">
-<component name="alf_core_toolkit_api" long-name="ALF Core Toolkit API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/group"/>
-</component>
-<component name="alf_visual_api" long-name="ALF Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/group"/>
-</component>
-<component name="alf_extended_visual_api" long-name="ALF Extended Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/group"/>
-</component>
-<component name="alf_extension_api" long-name="ALF Extension API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/group"/>
-</component>
-<component name="alf_tracing_api" long-name="ALF Tracing API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/group"/>
-</component>
-<component name="alf_client_server_api" long-name="ALF Client Server API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/group"/>
-</component>
-</collection>
-<collection name="uiacceltk" long-name="UI Accelerator Toolkit" level="framework">
-<component name="hitchcock" filter="s60" long-name="Hitchcock">
-<unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/group"/>
-</component>
-<component name="uiacceltk_build" filter="s60" long-name="UI Accelerator Toolkit Build">
-<!-- move into the other component, or remove the #include and make this UI Accelerator Toolkit ROM-->
-<unit bldFile="mw/uiaccelerator/uiacceltk/group"/>
-</component>
-</collection>
-<collection name="uiaccelerator_test" long-name="UI Accelerator Test" level="ex"/>
-</block>
-<block name="uiresources" level="generic" long-name="UI Resources" levels="compile plugin framework server generic data">
-<!-- are the custom filters below needed? -->
-<collection name="uiresources_pub" long-name="UI Resources Public Interfaces" level="data">
-<component name="pictograph_api" long-name="Pictograph API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/pictograph_api/group" filter="!test"/>
-</component>
-<component name="skins_api" long-name="Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/skins_api/group" filter="!test"/>
-</component>
-<component name="font_definition_api" long-name="Font Definition API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/font_definition_api/group" filter="!test"/>
-</component>
-<component name="graphics_api" long-name="Graphics API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/graphics_api/group" filter="!test"/>
-</component>
-<component name="scalable_icons_api" long-name="Scalable Icons API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/scalable_icons_api/group"/>
-</component>
-<component name="layout_id_definitions_api" long-name="Layout ID Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/layout_id_definitions_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_plat" long-name="UI Resources Platform Interfaces" level="data">
-<component name="layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_system_private_api/group" filter="!test"/>
-</component>
-<component name="layout_data_api" long-name="Layout Data API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_data_api/group" filter="!test"/>
-</component>
-<component name="cdl_api" long-name="CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/cdl_api/group" filter="!test"/>
-</component>
-<component name="extended_skins_api" long-name="Extended Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_skins_api/group" filter="!test"/>
-</component>
-<component name="tfx_server_controller_plugin_api" long-name="TFX Server Controller Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_controller_plugin_api/group"/>
-</component>
-<component name="extended_fonts_api" long-name="Extended Fonts API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_fonts_api/group" filter="!test"/>
-</component>
-<component name="graphic_configuration_api" long-name="Graphic Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/graphic_configuration_api/group" filter="!test"/>
-</component>
-<component name="mif_header_cdl_api" long-name="MIF Header CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mif_header_cdl_api/group"/>
-</component>
-<component name="personalisation_and_skins_settings_api" long-name="Personalisation and Skins Settings API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/personalisation_and_skins_settings_api/group"/>
-</component>
-<component name="tfx_effect_setup_plugin_api" long-name="TFX Effect Setup Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_effect_setup_plugin_api/group"/>
-</component>
-<component name="mifconv_definitions_api" long-name="Mifconv Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mifconv_definitions_api/group"/>
-</component>
-<component name="wallpaper_configuration_api" long-name="Wallpaper Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/wallpaper_configuration_api/group"/>
-</component>
-<component name="language_code_definitions_api" long-name="Language Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/language_code_definitions_api/group"/>
-</component>
-<component name="skins_image_attributes_api" long-name="Skins Image Attributes API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
-</component>
-<component name="private_user_area_code_definitions_api" long-name="Private User Area Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/private_user_area_code_definitions_api/group"/>
-</component>
-<component name="tfx_server_plugin_ids_api" long-name="TFX Server Plug-in IDs API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_plugin_ids_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_info" long-name="UI Resources Info" level="data">
-<component name="uiresources_test" filter="s60,test,api_test" long-name="UI Resources Tests" purpose="development"/>
-</collection>
-<collection name="uigraphics" long-name="UI Graphics" level="generic">
-<component name="bitmaps2" filter="s60" long-name="Bitmaps 2" class="config">
-<unit bldFile="mw/uiresources/uigraphics/bitmaps2/group"/>
-</component>
-<component name="icons" filter="s60" long-name="Icons" class="config">
-<unit bldFile="mw/uiresources/uigraphics/icons/group"/>
-</component>
-<component name="variatedbitmaps" filter="s60" long-name="Variated Bitmaps" class="config">
-<unit bldFile="mw/uiresources/uigraphics/variatedbitmaps/group"/>
-</component>
-<component name="aknicon" filter="s60" long-name="Avkon Icon Framework">
-<unit bldFile="mw/uiresources/uigraphics/aknicon/group"/>
-</component>
-<component name="nvgrenderstage" filter="sf_build" long-name="NVG Render Stage">
-<unit bldFile="mw/uiresources/uigraphics/nvgrenderstage/group"/>
-</component>
-</collection>
-<collection name="layouts" long-name="Layouts" level="plugin">
-<component name="cdl" filter="s60" long-name="Customization Definition Language">
-<!-- can only have one unit. Need to #include them or split into multiple components -->
-<unit bldFile="mw/uiresources/layouts/cdl/cdlengine/group"/>
-<unit bldFile="mw/uiresources/layouts/cdl/cdlserver/group"/>
-</component>
-<component name="aknlayout2" filter="s60" long-name="Avkon Layout 2">
-<unit bldFile="mw/uiresources/layouts/aknlayout2/group"/>
-</component>
-</collection>
-<collection name="skins" long-name="Skins" level="data">
-<component name="aknskincontent" filter="s60" long-name="Avkon Skin Content" class="config">
-<unit bldFile="mw/uiresources/skins/aknskincontent/group"/>
-</component>
-<component name="aknskins" filter="s60" long-name="Avkon Skin Compiler">
-<unit bldFile="mw/uiresources/skins/aknskins/group"/>
-</component>
-</collection>
-<collection name="pictographs" long-name="Pictographs" level="data">
-<component name="aknpictograph" filter="s60" long-name="Avkon Pictograph">
-<unit bldFile="mw/uiresources/pictographs/aknpictograph/group"/>
-</component>
-</collection>
-<collection name="locales" long-name="Locales" level="framework">
-<component name="locales_build" filter="s60" long-name="Locales Build">
-<unit bldFile="mw/uiresources/locales/loce32"/>
-</component>
-</collection>
-<collection name="uiconfig" long-name="UI Config" level="server">
-<component name="s60config" filter="s60" long-name="S60 UI Config">
-<unit bldFile="mw/uiresources/uiconfig/s60config/group"/>
-</component>
-</collection>
-<collection name="fontsupport" long-name="Font Support" level="generic">
-<component name="fontprovider" filter="s60" long-name="Font Provider">
-<unit bldFile="mw/uiresources/fontsupport/fontprovider/group"/>
-</component>
-<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
- <component id="s60_fonts" filter="s60" name="S60 Fonts">
- <unit bldFile="fontsupport/fontutils/group"/>
- </component>
--->
-<component name="fontutils" filter="sf_build" long-name="Font Utils">
-<unit bldFile="mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
-</component>
-</collection>
-<collection name="helpthemes" long-name="Help Themes" level="data">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helpthemes_build" filter="s60" long-name="Help Themes Build" class="config">
-<unit bldFile="mw/uiresources/helpthemes/group"/>
-</component>
-</collection>
-</block>
-<block name="hapticsservices" level="generic" long-name="Haptics Services" levels="fw server api">
-<collection name="hapticsservices_plat" long-name="Haptics Services Platform Interfaces" level="api">
-<component name="tacticon_api" long-name="Tacticon API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tacticon_api/group"/>
-</component>
-<component name="tactile_feedback_core_api" long-name="Tactile Feedback Core API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_core_api/group"/>
-</component>
-<component name="tactile_feedback_server_api" long-name="Tactile Feedback Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_server_api/group"/>
-</component>
-</collection>
-<collection name="hapticsservices_pub" long-name="Haptics Services Public Interfaces" level="api">
-<component name="tactile_feedback_client_api" long-name="Tactile Feedback Client API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_pub/tactile_feedback_client_api/group"/>
-</component>
-</collection>
-<collection name="tacticonserver" long-name="Tacticon Server" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="tacticonserver_build" filter="s60" long-name="Tacticon Server Build" introduced="^3">
-<unit bldFile="mw/hapticsservices/tacticonserver/group"/>
-<!-- clients and servers are suauly the same component. Consider moving pluign to a separate component if needed -->
-</component>
-</collection>
-<collection name="tactilefeedback" long-name="Tactile Feedback" level="fw">
-<component name="tactilearearegistry" filter="s60" long-name="Tactile Area Registry" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilearearegistry/group"/>
-</component>
-<component name="tactilefeedbackresolver" filter="s60" long-name="Tactile Feedback Resolver" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackresolver/group"/>
-</component>
-<component name="tactileclickplugin" filter="s60" long-name="Tactile Click Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileclickplugin/group"/>
-</component>
-<component name="tactilefeedbackclient" filter="s60" long-name="Tactile Feedback Client" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackclient/group"/>
-</component>
-<component name="tactileactionplugin" filter="s60" long-name="Tactile Action Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileactionplugin/group"/>
-</component>
-<component name="tactilefeedback_build" filter="s60" long-name="Tactile Feedback Build" introduced="^1">
-<!-- consider moving IBY to one fo the above components -->
-<unit bldFile="mw/hapticsservices/tactilefeedback/group"/>
-</component>
-</collection>
-</block>
-<block name="platformthemes" level="specific" long-name="Platform Themes" levels="framework generic ui">
-<collection name="platformthemes_info" long-name="Platform Themes Info">
-<component name="platformthemes_build" long-name="Platform Themes Build">
-<!-- no real structure in this package. Should break into collections / components -->
-<unit bldFile="mw/platformthemes"/>
-</component>
-</collection>
-</block>
-<block name="gsprofilesrv" level="generic" long-name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
-<collection name="gsprofilesrv_pub" long-name="GS and Profiles Services Public Interfaces" level="specific">
-<component name="profiles_engine_active_profile_settings_api" long-name="Profiles Engine Active Profile Settings API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_active_profile_settings_api/group"/>
-</component>
-<component name="profiles_engine_wrapper_api" long-name="Profiles Engine Wrapper API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_wrapper_api/group"/>
-</component>
-</collection>
-<collection name="gsprofilesrv_plat" long-name="GS and Profiles Services Platform Interfaces" level="specific">
-<component name="ftuwizardmodel_api" long-name="FTU Wizard Model API" filter="bldfirst,s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/ftuwizardmodel_api"/>
-</component>
-<component name="profiles_engine_api" long-name="Profiles Engine API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_engine_api/group"/>
-</component>
-<component name="settings_backgroundimage_api" long-name="Settings Background Image API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_backgroundimage_api/group"/>
-</component>
-<component name="settings_framework_api" long-name="Settings Framework API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_framework_api/group"/>
-</component>
-<component name="settings_launch_api" long-name="Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_launch_api/group"/>
-</component>
-<component name="settings_listbox_api" long-name="Settings List Box API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_listbox_api/group"/>
-</component>
-<component name="settings_plugin_api" long-name="Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_plugin_api/group"/>
-</component>
-<component name="settings_uis_cenrep_collection_api" long-name="Settings UIs CenRep Collection API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
-</component>
-</collection>
-<collection name="gssettingsuis" long-name="General Settings UIs" level="framework">
-<component name="gs" filter="s60" long-name="General Settings" introduced="9.2">
-<unit bldFile="mw/gsprofilesrv/gssettingsuis/gs/group"/>
-</component>
-</collection>
-<collection name="ftuwizardmodel" long-name="FTU Wizard Model" level="generic">
-<component name="ftuwizardmodel_build" long-name="FTU Wizardmodel Build" filter="bldfirst">
-<unit bldFile="mw/gsprofilesrv/ftuwizardmodel"/>
-</component>
-</collection>
-<collection name="controlpanel" long-name="Control Panel" level="generic">
-<component name="controlpanel_build" long-name="Control Panel Build">
-<unit bldFile="mw/gsprofilesrv/controlpanel"/>
-</component>
-</collection>
-<collection name="profilesservices" long-name="Profiles Services" level="server">
-<component name="profileengine" filter="s60" long-name="Profile Engine" introduced="9.1">
-<unit bldFile="mw/gsprofilesrv/profilesservices/profileengine/group"/>
-</component>
-<component name="ringingtone3dplugin" filter="s60" long-name="Ringing Tone 3D Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/gsprofilesrv/profilesservices/ringingtone3dplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreensrv" level="specific" long-name="Home Screen Services" levels="plugin framework server generic specific">
-<collection name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" level="specific">
-<component name="ai_content_model_api" long-name="AI Content Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_content_model_api/group"/>
-</component>
-<component name="ai_utilities_api" long-name="AI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_utilities_api/group" filter="!test"/>
-</component>
-<component name="ai_plugin_management_api" long-name="AI Plug-in Management API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_management_api/group"/>
-</component>
-<component name="ai_plugin_information_api" long-name="AI Plug-in Information API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_information_api/group"/>
-</component>
-<component name="ai_variation_api" long-name="AI Variation API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_variation_api/group"/>
-</component>
-<component name="action_handler_plugin_api" long-name="Action Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/group" filter="!test"/>
-</component>
-<component name="content_harvester_plugin_api" long-name="Content Harvester Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/group" filter="!test"/>
-</component>
-<component name="menu_model_api" long-name="Menu Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_model_api/group"/>
-</component>
-<component name="menu_sat_interface_api" long-name="Menu SAT Interface API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/group" filter="!test"/>
-</component>
-<component name="external_home_screen_api" long-name="External Home Screen API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/external_home_screen_api/group"/>
-</component>
-<component name="menu_content_service_api" long-name="Menu Content Service API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_content_service_api/group" filter="!test"/>
-</component>
-<component name="sapi_contentpublishing" long-name="SAPI Content Publishing" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing/group"/>
-</component>
-<component name="sapi_backstepping" long-name="SAPI Backstepping" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_backstepping/group"/>
-</component>
-<component name="sapi_actionhandler" long-name="SAPI Action Handler" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_actionhandler/group"/>
-</component>
-<component name="sapi_homescreenplugin" long-name="SAPI Homescreen Plugin" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_homescreenplugin/group" filter="!test"/>
-</component>
-<component name="sapi_menucontent" long-name="SAPI Menu Content" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_menucontent/group"/>
-</component>
-<component name="xcfw_api" long-name="XCFW API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/xcfw_api/group"/>
-</component>
-<component name="idlefw_api" long-name="Idle Framework API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/idlefw_api/group"/>
-</component>
-<component name="hs_widget_publisher_api" long-name="Home Screen Publishing API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_widget_publisher_api/group"/>
-</component>
-<component name="context_utility_api" long-name="UI Context Utility API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/context_utility_api/group"/>
-</component>
-<component name="hs_settings_api" long-name="HS Settings API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_settings_api/group"/>
-</component>
-<component name="hs_content_control_api" long-name="HS Content Control API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_content_control_api/group"/>
-</component>
-</collection>
-<collection name="xcfw" long-name="XML Content Framework" level="framework">
-<!-- collection is really a component, needs to be moved down a directory -->
-<component name="xcfw_build" filter="s60" long-name="XML Content Framework Build">
-<unit bldFile="mw/homescreensrv/xcfw/group"/>
-</component>
-</collection>
-<collection name="homescreenpluginsrv" long-name="Home Screen Plugin Service" level="plugin">
-<component name="hspsdefinitionengine" filter="s60" long-name="HS Plugin Service Definition Engine" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsdefinitionengine/group"/> -->
-</component>
-<component name="hspsdom" filter="s60" long-name="HS Plugin Service DOM" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsdom/group"/> -->
-</component>
-<component name="hspstools" filter="s60" long-name="HS Server Tools">
-<!-- <unit bldFile="homescreenpluginsrv/hspstools/group"/> -->
-</component>
-<component name="hspspluginregistry" filter="s60" long-name="HS Plugin Registry" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspspluginregistry/group"/>-->
-</component>
-<component name="hspsmanager" filter="s60" long-name="HSPS Manager" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsmanager/group"/>-->
-</component>
-<component name="hspsodt" filter="s60" long-name="HSPS Object Description Tree" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsodt/group"/>-->
-</component>
-<component name="hspsresource" filter="s60" long-name="HS Plugin Server Resource" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresource/group"/>-->
-</component>
-<component name="hspsresult" filter="s60" long-name="HS Plugin Server Result" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
-</component>
-<component name="homescreen_settings_api" filter="s60" long-name="HS Settings API" class="api placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
-</component>
-<component name="homescreenpluginsrv_build" filter="s60" long-name="HSPS Build">
-<!-- need to break this up into the self-contained components above and uncomment them -->
-<unit bldFile="mw/homescreensrv/homescreenpluginsrv/group"/>
-</component>
-</collection>
-<collection name="idlefw" long-name="Idle Framework" level="framework">
-<!-- Uncomment all units when configuration is in place. All currently #included from idlefw_build -->
-<component name="idlefw_plugins" filter="s60" long-name="Idle Framework Plugins" plugin="Y" class="placeholder">
-<!--<unit bldFile="idlefw/plugins/group"/>-->
-</component>
-<component name="hslaunch" filter="s60" long-name="Home Screen Launch" class="placeholder">
-<!--<unit bldFile="idlefw/plugins/group"/>-->
-</component>
-<component name="idlefw_build" filter="s60" long-name="Idle Framework Build">
-<!--split this into components, or separate from the above components and move this down a directory -->
-<unit bldFile="mw/homescreensrv/idlefw/group"/>
-</component>
-</collection>
-<collection name="menucontentsrv" long-name="Menu Content Service" level="generic">
-<component name="menusatinterface" filter="s60" long-name="Menu SAT Interface">
-<unit bldFile="mw/homescreensrv/menucontentsrv/menusatinterface/group"/>
-</component>
-<component name="menucontentsrv_build" filter="s60" long-name="Menu Content Service Build">
-<!--split this into components, or separate from the above component and move this down a directory -->
-<unit bldFile="mw/homescreensrv/menucontentsrv/group"/>
-</component>
-</collection>
-<collection name="backsteppingsrv" long-name="Back Stepping Service" level="server">
-<!-- collection is really a component, needs to be moved down a directory -->
-<component name="bsengine" long-name="Back Stepping Engine" filter="s60">
-<unit bldFile="mw/homescreensrv/backsteppingsrv/group"/>
-</component>
-</collection>
-<collection name="contentpublishingsrv" long-name="Content Publishing Service" level="server">
-<component name="contentpublishingdebug" filter="s60" long-name="Content Publishing Debug">
-<!-- need to move this component outside of contentpublishingutils and into separate component directory -->
-<!-- <unit bldFile="contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/> -->
-</component>
-<component name="contentpublishingutils" filter="s60" long-name="Content Publishing Utils">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingutils/group"/>
-</component>
-<component name="contentpublishingserver" filter="s60" long-name="Content Publishing Server">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingserver/group"/>
-</component>
-<component name="contentharvester" filter="s60" long-name="Content Harvester">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
-</component>
-<component name="contentpublishingsrv_build" filter="s60" long-name="Content Publishing Service Build">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/group"/>
-</component>
-</collection>
-<collection name="contextutility" long-name="Context Utility" level="generic">
-<!-- collection is really a component, needs to be moved down a directory -->
-<component name="contextutility_build" long-name="Context Utility Build" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contextutility/group"/>
-</component>
-</collection>
-<collection name="contentcontrolsrv" long-name="Content Control Service" level="server">
-<component name="ccsrv" long-name="Content Control Service" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccsrv/group"/>
-</component>
-<component name="ccsrvapi" long-name="Content Control Service API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccsrvapi/group"/>
-</component>
-<component name="ccclientsession" long-name="Content Control Client Session" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccclientsession/group"/>
-</component>
-<component name="hsccclient" long-name="HS Content Control Client" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/hsccclient/group"/>
-</component>
-<component name="hscontentinfo" long-name="Home Screen Content Info" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/hscontentinfo/group"/>
-</component>
-<component name="contentcontrolsrv_build" long-name="Content Control Service Build" filter="s60" introduced="^3">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreensrvlegacy" level="generic" long-name="Legacy Home Screen Services" levels="plugin framework server generic specific">
-<collection name="homescreensrvlegacy_plat" long-name="Legacy Home Screen Services Platform Interfaces" level="specific">
-<component name="ai_content_model_api" long-name="AI Content Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrvlegacy/ai_content_model_api/group"/>
-</component>
-<component name="ai_plugin_information_api" long-name="AI Plug-in Information API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrvlegacy/ai_plugin_information_api/group"/>
-</component>
-</collection>
-</block>
-<block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
-<collection name="appinstall_plat" long-name="Application Installation Platform Interfaces" level="api">
-<component name="iaupdate_api" long-name="IA Update API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/iaupdate_api/group"/>
-</component>
-<component name="task_plugin_api" long-name="Task Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_plugin_api/group"/>
-</component>
-<component name="sw_installer_common_ui_api" long-name="SW Installer Common UI API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_common_ui_api/group"/>
-</component>
-<component name="sw_installer_launcher_api" long-name="SW Installer Launcher API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_launcher_api/group"/>
-</component>
-<component name="task_management_api" long-name="Task Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_management_api/group"/>
-</component>
-<component name="sw_installer_ui_plugin_api" long-name="SW Installer UI Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ui_plugin_api/group"/>
-</component>
-<component name="sw_installer_cr_keys" long-name="SW Installer CR Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_cr_keys/group"/>
-</component>
-<component name="sw_installer_ps_keys" long-name="SW Installer PS Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
-</component>
-<component name="appmngr2runtimeapi" long-name="Application Manager 2 Runtime Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
-</component>
-<component name="sifui_api" long-name="STIF UI API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sifui_api/group"/>
-</component>
-</collection>
-<collection name="appinstall_pub" long-name="Application Installation Public Interfaces" level="api">
-<component name="startup_list_management_api" long-name="Startup List Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
-</component>
-</collection>
-<collection name="ncdengine" long-name="Nokia Content Discover" level="framework">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="ncdengine_engine" filter="s60" long-name="NCD Engine" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/engine/group"/>
-</component>
-<component name="debuglogger" filter="s60" long-name="NCD Debug Logger" introduced="^1" class="placeholder">
-<!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
-</component>
-<component name="ncdengine_build" filter="s60" long-name="NCD Build" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/group"/>
-</component>
-</collection>
-<collection name="appinstaller" long-name="Application Installer" level="generic">
-<component name="appmngr2" filter="s60" long-name="Application Manager 2" introduced="^2">
-<unit bldFile="mw/appinstall/appinstaller/appmngr2/group"/>
-</component>
-<component name="appinstui" filter="s60" long-name="Application Installer UI" introduced="^2">
-<unit bldFile="mw/appinstall/appinstaller/appinstui/group"/>
-</component>
-</collection>
-<collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="api">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="iaupdateapi_stub_build" long-name="IA Update API Stub Build" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdateapi_stub/group"/>
-</component>
-</collection>
-<collection name="iaupdate" long-name="Independent Apps Update" level="api">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="iad" long-name="Software Update" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/iad/group"/>
-</component>
-<component name="iaupdate_help" filter="s60" long-name="IA Update Help" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/help/group"/>
-</component>
-<component name="iaupdate_build" filter="s60" long-name="IA Update Build" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/group"/>
-</component>
-</collection>
-<collection name="installationservices" long-name="Installation Services" level="generic">
-<component name="swi" long-name="Secure Software Install" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swi/group" mrp="mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
-</component>
-<component name="swidevicetools" long-name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
-<unit bldFile="mw/appinstall/installationservices/swidevicetools/group" mrp="mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
-</component>
-<component name="swcomponentregistry" long-name="Software Component Registry" introduced="^4" purpose="mandatory">
-<unit bldFile="mw/appinstall/installationservices/swcomponentregistry/group" mrp="mw/appinstall/installationservices/swcomponentregistry/group/security_softwarecomponentregistry.mrp"/>
-</component>
-<component name="swinstallationfw" long-name="Software Installation Framework" introduced="^4" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swinstallationfw/group" mrp="mw/appinstall/installationservices/swinstallationfw/group/security_softwareinstallframework.mrp"/>
-</component>
-<component name="swtransactionservices" long-name="Software Transaction Services" introduced="^4" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swtransactionservices/group" mrp="mw/appinstall/installationservices/swtransactionservices/group/security_softwaretransactionservices.mrp"/>
-</component>
-<component name="refswinstallationplugin" long-name="Reference Software Installation Plugin" introduced="^4" purpose="development" plugin="Y">
-<unit bldFile="mw/appinstall/installationservices/refswinstallationplugin/group" mrp="mw/appinstall/installationservices/refswinstallationplugin/group/security_sifrefplugin.mrp"/>
-</component>
-<component name="refsoftwareappmgr" long-name="Reference Software Application Manager" introduced="^4" purpose="development">
-<unit bldFile="mw/appinstall/installationservices/refsoftwareappmgr/group" mrp="mw/appinstall/installationservices/refsoftwareappmgr/group/security_referenceapplicationmanager.mrp"/>
-</component>
-<component name="swiconfig" long-name="Software Install Config" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appinstall/installationservices/swiconfig/group" mrp="mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
-</component>
-</collection>
-<collection name="secureswitools" long-name="Secure Software Install Tools" level="tool">
-<component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/makekeys/group" mrp="mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
-</component>
-<component name="swianalysistoolkit" long-name="SWI Analysis Toolkit" purpose="development" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
-</component>
-<component name="openssllib" long-name="OpenSSL Library" purpose="optional" class="PC">
-<unit mrp="mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
-</component>
-<component name="swisistools" long-name="Secure Software Install SIS Tools" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swisistools/group" mrp="mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
-</component>
-</collection>
-<collection name="appinstall_info" long-name="Application Installation Info" level="api">
-<component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="serviceapifw" level="specific" long-name="Service API Framework" levels="plugin framework server generic specific">
-<collection name="serviceapifw_pub" long-name="Service API Framework Public Interfaces" level="specific"/>
-<collection name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" level="specific">
-<component name="rtsecuritymanager_common_api" long-name="Runtime Security Manager Common API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/group"/>
-</component>
-<component name="rtsecuritymanager_utility_api" long-name="Runtime Security Manager Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
-</component>
-<component name="rtsecuritymanager_client_api" long-name="Runtime Security Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/group"/>
-</component>
-<component name="liw_provider_utility_api" long-name="LIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_provider_utility_api/group"/>
-</component>
-<component name="liw_service_interface_base_api" long-name="LIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_base_api/group"/>
-</component>
-<component name="liw_service_interface_menu_api" long-name="LIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_menu_api/group"/>
-</component>
-<component name="liw_criteria_api" long-name="LIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_criteria_api/group"/>
-</component>
-<component name="liw_generic_parameter_api" long-name="LIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_generic_parameter_api/group"/>
-</component>
-<component name="liw_service_handler_api" long-name="LIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_handler_api/group"/>
-</component>
-</collection>
-<collection name="rtsecuritymanager" long-name="Runtime Security Manager" level="server">
-<component name="rtsecuritymanagerutil" filter="s60" long-name="Runtime Security Manager Util">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
-</component>
-<component name="rtsecuritymanagerserver" filter="s60" long-name="Runtime Security Manager Server">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/>
-</component>
-<component name="rtsecuritymanagerclient" filter="s60" long-name="Runtime Security Manager Client">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/>
-</component>
-<component name="rtsecuritymanager_build" filter="s60" long-name="Runtime Security Manager Build">
-<!-- Move the export to the appropriate components, or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/group"/>
-</component>
-</collection>
-<collection name="languageinterworkingfw" long-name="Language Interworking Framework" level="framework">
-<component name="lifwservicehandler" filter="s60" long-name="Service Handler">
-<unit bldFile="mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-</block>
-<block name="serviceapi" level="specific" long-name="Service API" levels="os mw1 mw2 app">
-<!-- should break up this collection into something meaningful -->
-<collection name="serviceproviders" long-name="Service Providers" level="mw1">
-<component name="sapi_contacts_vpbk" long-name="Contacts Phonebook SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
-</component>
-<component name="sapi_location" long-name="Location SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_location/group"/>
-</component>
-<component name="sapi_mediamanagement" long-name="Media Management SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/group"/>
-</component>
-<component name="sapi_landmarks" long-name="Landmarks SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
-</component>
-<component name="sapi_messaging" long-name="Messaging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/group"/>
-</component>
-<component name="sapi_applicationmanager" long-name="Application Manager SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
-</component>
-<component name="sapi_calendar" long-name="Calendar SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_calendar/group"/>
-</component>
-<component name="sapi_logging" long-name="Logging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_logging/group"/>
-</component>
-<component name="sapi_sensor" long-name="Sensor SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sensor/group"/>
-</component>
-<component name="sapi_sysinfo" long-name="Sysinfo SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sysinfo/group"/>
-</component>
-<component name="sapi_serviceregistry" long-name="Service Registry SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
-</component>
-<component name="jsapi" long-name="Javascript API" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/jsapi/group"/>
-</component>
-<component name="serviceproviders_build" filter="s60" long-name="Service API Build">
-<!-- distribute the exports or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapi/serviceproviders/group"/>
-</component>
-</collection>
-</block>
-<block name="web" level="specific" long-name="Web" levels="plugin utils server generic specific">
-<collection name="web_pub" long-name="Web Public Interfaces" level="specific">
-<component name="browser_control_api" long-name="Browser Control API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_control_api/group"/>
-</component>
-<component name="download_mgr_client_api" long-name="Download Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_client_api/group"/>
-</component>
-<component name="download_mgr_ui_api" long-name="Download Manager UI Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_ui_api/group"/>
-</component>
-<component name="favourites_engine_api" long-name="Favourites Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/favourites_engine_api/group"/>
-</component>
-<component name="browser_plugin_api" long-name="Browser Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_plugin_api/group"/>
-</component>
-<component name="settings_api" long-name="Settings API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/settings_api/group"/>
-</component>
-</collection>
-<collection name="web_plat" long-name="Web Platform Interfaces" level="specific">
-<component name="aiw_browser_provider_api" long-name="AIW Browser Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/aiw_browser_provider_api/group"/>
-</component>
-<component name="browser_dialogs_provider_api" long-name="Browser Dialogs Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_dialogs_provider_api/group"/>
-</component>
-<component name="browser_platform_api" long-name="Browser Platform API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_platform_api/group"/>
-</component>
-<component name="cod_handler_api" long-name="COD Handler API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cod_handler_api/group"/>
-</component>
-<component name="connection_manager_api" long-name="Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/connection_manager_api/group"/>
-</component>
-<component name="cxml_library_api" long-name="cXml Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cxml_library_api/group"/>
-</component>
-<component name="download_mgr_client_api_extn" long-name="Download Manager Client API Extension" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/download_mgr_client_api_extn/group"/>
-</component>
-<component name="feeds_engine_api" long-name="Feeds Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/feeds_engine_api/group"/>
-</component>
-<component name="launcher_api" long-name="Launcher API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/launcher_api/group"/>
-</component>
-<component name="multipart_parser_api" long-name="Multipart Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/multipart_parser_api/group"/>
-</component>
-<component name="recent_url_store_api" long-name="Recent URL Store API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/recent_url_store_api/group"/>
-</component>
-<component name="scheme_handler_plugin_api" long-name="Scheme Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scheme_handler_plugin_api/group"/>
-</component>
-<component name="scriptable_plugin_api" long-name="Scriptable Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scriptable_plugin_api/group"/>
-</component>
-<component name="webutils_api" long-name="Web Utils API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/webutils_api/group"/>
-</component>
-<component name="widget_registry_api" long-name="Widget Registry API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/widget_registry_api/group"/>
-</component>
-<component name="xml_parser_api" long-name="XML Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/xml_parser_api/group"/>
-</component>
-<component name="stmgesturefw_api" long-name="State Machine Gesture Framework API " filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/stmgesturefw_api/group"/>
-</component>
-</collection>
-<collection name="web_info" long-name="Web Info" level="specific">
-<component name="web_build" filter="s60" long-name="Web Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/group"/>
-</component>
-</collection>
-<collection name="browserutilities" long-name="Browser Utilities" level="utils">
-<component name="browserdialogsprovider" filter="s60" long-name="Browser Dialogs Provider">
-<unit bldFile="mw/web/browserutilities/browserdialogsprovider/group"/>
-</component>
-<component name="recenturlstore" filter="s60" long-name="Recent URL Store">
-<unit bldFile="mw/web/browserutilities/recenturlstore/group"/>
-</component>
-<component name="xmlparser" filter="s60" long-name="XML Interface">
-<unit bldFile="mw/web/browserutilities/xmlparser/group"/>
-</component>
-<component name="cxmllibrary" filter="s60" long-name="XML Parser Implementation">
-<unit bldFile="mw/web/browserutilities/cxmllibrary/group"/>
-</component>
-<component name="downloadmgr" filter="s60" long-name="Download Manager">
-<unit bldFile="mw/web/browserutilities/downloadmgr/group"/>
-</component>
-<component name="connectionmanager" filter="s60" long-name="Connection Manager">
-<unit bldFile="mw/web/browserutilities/connectionmanager/group"/>
-</component>
-<component name="browsertelservice" filter="s60" long-name="Browser Telephony Service">
-<unit bldFile="mw/web/browserutilities/browsertelservice/group"/>
-</component>
-<component name="favouritesengine" filter="s60" long-name="Favourites Engine">
-<unit bldFile="mw/web/browserutilities/favouritesengine/group"/>
-</component>
-<component name="feedsengine" filter="s60" long-name="Feeds Engine">
-<unit bldFile="mw/web/browserutilities/feedsengine/group"/>
-</component>
-<component name="multipartparser" filter="s60" long-name="Multipart Parser">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
-<!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
-</component>
-<component name="schemehandler" filter="s60" long-name="Scheme Handler">
-<unit bldFile="mw/web/browserutilities/schemehandler/group"/>
-</component>
-<component name="webutils" filter="s60" long-name="Web Utils">
-<unit bldFile="mw/web/browserutilities/webutils/group"/>
-</component>
-<component name="aiwbrowserprovider" filter="s60" long-name="AIW Browser Provider" plugin="Y">
-<unit bldFile="mw/web/browserutilities/aiwbrowserprovider/group"/>
-</component>
-<component name="browserutilities_build" filter="s60" long-name="Browser Utilities Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/browserutilities/group"/>
-</component>
-</collection>
-<collection name="webengine" long-name="Web Engine" level="server">
-<component name="osswebengine" filter="s60" long-name="OSS Web Engine">
-<!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
-<unit bldFile="mw/web/webengine/osswebengine/cache/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/memorymanager/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/npscript/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group/javascriptcore"/>
-</component>
-<component name="webkitutils" filter="s60" long-name="WebKit Utils">
-<unit bldFile="mw/web/webengine/webkitutils/group"/>
-</component>
-<component name="pagescaler" filter="s60" long-name="Page Scaler">
-<unit bldFile="mw/web/webengine/pagescaler/group"/>
-</component>
-<component name="webwidgetinstaller" filter="s60" long-name="Widget Installer">
-<unit bldFile="mw/web/webengine/widgetinstaller/group"/>
-</component>
-<component name="widgetregistry" filter="s60" long-name="Widget Registry">
-<unit bldFile="mw/web/webengine/widgetregistry/group"/>
-</component>
-<component name="wmlengine" filter="s60" long-name="WML Engine">
-<unit bldFile="mw/web/webengine/wmlengine/group"/>
-</component>
-<component name="device" filter="s60" long-name="Device">
-<!-- this needs a more meaningful name -->
-<unit bldFile="mw/web/webengine/device/group"/>
-</component>
-<component name="widgetengine" filter="s60" long-name="Widget Engine">
-<unit bldFile="mw/web/webengine/widgetengine/group"/>
-</component>
-<component name="web_memoryplugin" long-name="Memory Plugin" filter="s60" plugin="Y">
-<unit bldFile="mw/web/webengine/memoryplugin/group"/>
-</component>
-<component name="widgetmemoryplugin" filter="s60" long-name="Widget Memory Plugin" plugin="Y">
-<unit bldFile="mw/web/webengine/widgetmemoryplugin/group"/>
-</component>
-<component name="widgetbackuprestore" filter="s60" long-name="Widget Backup and Restore">
-<unit bldFile="mw/web/webengine/widgetbackuprestore/group"/>
-</component>
-<component name="browserrecognizers" filter="s60" long-name="Browser Recognizers" plugin="Y">
-<unit bldFile="mw/web/webengine/browserrecognizers/group"/>
-</component>
-<component name="wrtharvester" filter="s60" long-name="Web Runtime Harvester" plugin="Y">
-<unit bldFile="mw/web/webengine/wrtharvester/group"/>
-</component>
-</collection>
-<collection name="codhandler" long-name="Content Object Descriptor Handler" level="specific">
-<component name="codeng" filter="s60" long-name="COD Engine">
-<unit bldFile="mw/web/codhandler/codeng/group"/>
-</component>
-<component name="codui" filter="s60" long-name="COD UI">
-<unit bldFile="mw/web/codhandler/codui/group"/>
-</component>
-<component name="codrecog" filter="s60" long-name="COD Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/codrecog/group"/>
-</component>
-<component name="codviewer" filter="s60" long-name="COD Viewer">
-<unit bldFile="mw/web/codhandler/codviewer/group"/>
-</component>
-<component name="ddrecog" filter="s60" long-name="Download Descriptor Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/ddrecog/group"/>
-</component>
-<component name="ddviewer" filter="s60" long-name="Download Descriptor Viewer">
-<unit bldFile="mw/web/codhandler/ddviewer/group"/>
-</component>
-<component name="coddownload" filter="s60" long-name="COD Download">
-<unit bldFile="mw/web/codhandler/coddownload/group"/>
-</component>
-<component name="roapapp" filter="s60" long-name="ROAP Application">
-<unit bldFile="mw/web/codhandler/roapapp/group"/>
-</component>
-<component name="codhandler_build" filter="s60" long-name="COD Handler Build">
-<!-- Exports need to go into another component or make this self-contained.
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/codhandler/group"/>
-</component>
-</collection>
-<collection name="widgets" long-name="Web Widget Framework" level="generic">
-<!-- the following units can be uncommented when configuration is put in place -->
-<component name="widgetrecognizer" filter="s60" long-name="Widget Recognizer" plugin="Y">
-<!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
-</component>
-<component name="widgetinstaller" filter="s60" long-name="Widget Installer UI" plugin="Y">
-<!--<unit bldFile="widgets/widgetinstaller/group"/>-->
-</component>
-<component name="widgetlauncher" filter="s60" long-name="Widget Launcher">
-<!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
-</component>
-<component name="widgetapp" filter="s60" long-name="Widget UI">
-<!--<unit bldFile="widgets/widgetapp/group"/>-->
-</component>
-<component name="widgetsidchecker" filter="s60" long-name="Widget SID Checker" introduced="^3">
-<!--<unit bldFile="widgets/widgetsidchecker/group"/>-->
-</component>
-<component name="widgetpreinstaller" filter="s60" long-name="Widget Pre-Installer">
-<!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
-</component>
-<component name="widgetstartup" filter="s60" long-name="Widget Startup">
-<!--<unit bldFile="widgets/widgetstartup/group"/>-->
-</component>
-<component name="widgets_build" filter="s60" long-name="Widgets Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/widgets/group"/>
-</component>
-</collection>
-</block>
-<block name="websrv" level="generic" long-name="Web Services" levels="plugin framework server generic specific">
-<collection name="websrv_pub" long-name="Web Services Public Interfaces" level="specific">
-<component name="web_service_description_api" long-name="Web Service Description API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_description_api/group"/>
-</component>
-<component name="web_service_connection_api" long-name="Web Service Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/group"/>
-</component>
-<component name="web_service_manager_api" long-name="Web Service Manager API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/group"/>
-</component>
-<component name="hostlet_connection_api" long-name="Hostlet Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/group"/>
-</component>
-<component name="web_service_messaging_api" long-name="Web Service Messaging API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/group"/>
-</component>
-<component name="xml_extensions_api" long-name="XML Extensions API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/group"/>
-</component>
-<component name="xml_fragment_api" long-name="XML Fragment API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/group"/>
-</component>
-</collection>
-<collection name="webservices" long-name="Web Services Framework" level="generic">
-<!-- consider breaking this collection into more meaningful subsets -->
-<component name="wsnotifierplugins" filter="s60" long-name="WS Notifier Plugins" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsnotifierplugins/group"/>
-</component>
-<component name="wslogger" filter="s60" long-name="WS Logger">
-<unit bldFile="mw/websrv/webservices/wslogger/group"/>
-</component>
-<component name="wsxml" filter="s60" long-name="WS XML Extensions">
-<unit bldFile="mw/websrv/webservices/wsxml/group"/>
-</component>
-<component name="wsutils" filter="s60" long-name="WS Utils">
-<unit bldFile="mw/websrv/webservices/wsutils/group"/>
-</component>
-<component name="wsfragment" filter="s60" long-name="WS Fragment">
-<unit bldFile="mw/websrv/webservices/wsfragment/group"/>
-</component>
-<component name="wsdescription" filter="s60" long-name="WS Service Description">
-<unit bldFile="mw/websrv/webservices/wsdescription/group"/>
-</component>
-<component name="wsconnection" filter="s60" long-name="WS Service Connection">
-<unit bldFile="mw/websrv/webservices/wsconnection/group"/>
-</component>
-<component name="wsmessages" filter="s60" long-name="WS Messages">
-<unit bldFile="mw/websrv/webservices/wsmessages/group"/>
-</component>
-<component name="wscredentialmanager" filter="s60" long-name="WS Credential Manager">
-<unit bldFile="mw/websrv/webservices/wscredentialmanager/group"/>
-</component>
-<component name="wsframework" filter="s60" long-name="WS Framework">
-<unit bldFile="mw/websrv/webservices/wsframework/group"/>
-</component>
-<component name="wshttpchanneltransportplugin" filter="s60" long-name="WS HTTP Channel Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshttpchanneltransportplugin/group"/>
-</component>
-<component name="wsconnectionagent" filter="s60" long-name="WS Connection Agent">
-<unit bldFile="mw/websrv/webservices/wsconnectionagent/group"/>
-</component>
-<component name="wsprovider" filter="s60" long-name="WS Provider">
-<unit bldFile="mw/websrv/webservices/wsprovider/group"/>
-</component>
-<component name="wshostletconnection" filter="s60" long-name="WS Hostlet Connection">
-<unit bldFile="mw/websrv/webservices/wshostletconnection/group"/>
-</component>
-<component name="wsmanager" filter="s60" long-name="WS Service Manager">
-<unit bldFile="mw/websrv/webservices/wsmanager/group"/>
-</component>
-<component name="wsidentitymanager" filter="s60" long-name="WS Identity Manager">
-<unit bldFile="mw/websrv/webservices/wsidentitymanager/group"/>
-</component>
-<component name="idwsfplugin" filter="s60" long-name="ID-WSF Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/idwsfplugin/group"/>
-</component>
-<component name="wsibasicplugin" filter="s60" long-name="WS-I Basic Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsibasicplugin/group"/>
-</component>
-<component name="wsrestplugin" filter="s60" long-name="WS REST Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsrestplugin/group"/>
-</component>
-<component name="idwsfsecuritymechanism" filter="s60" long-name="ID-WSF Security Mechanism">
-<unit bldFile="mw/websrv/webservices/idwsfsecuritymechanism/group"/>
-</component>
-<component name="wspasswordtransforms" filter="s60" long-name="WS Password Transforms">
-<unit bldFile="mw/websrv/webservices/wspasswordtransforms/group"/>
-</component>
-<component name="wscore" filter="s60" long-name="WS Core Service Manager">
-<unit bldFile="mw/websrv/webservices/wscore/group"/>
-</component>
-<component name="wslocaltransportplugin" filter="s60" long-name="WS Local Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wslocaltransportplugin/group"/>
-</component>
-<component name="wshostlettransportplugin" filter="s60" long-name="WS Hostlet Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshostlettransportplugin/group"/>
-</component>
-<component name="wsstar" filter="s60" long-name="WS Star">
-<!-- can only have one unit. Need to split into separate components or #include from a single bld.inf -->
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarpolicy/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarplugin/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarmessagehandlers/group"/>
-</component>
-<component name="wsoviplugin" filter="s60" long-name="WS Ovi Plugin">
-<unit bldFile="mw/websrv/webservices/wsoviplugin/group"/>
-</component>
-<component name="webservices_build" filter="s60" long-name="Web Services Build">
-<!-- need to split into self-contained components -->
-<unit bldFile="mw/websrv/webservices/group"/>
-</component>
-</collection>
-<collection name="websrv_info" long-name="Web Services Info" level="specific">
-<component name="websrv_bld" filter="s60" long-name="Web Services Build">
-<!-- need to include common .hrh in each unit -->
-<unit bldFile="mw/websrv/group"/>
-</component>
-</collection>
-</block>
-<block name="platformtools" level="generic" long-name="Platform Tools">
-<collection name="gfxconversion" long-name="Graphics Conversion">
-<component name="bmconv_s60" filter="s60" long-name="S60 Bitmap Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/bmconv_s60/group"/>
-</component>
-<component name="mifconv" filter="s60" long-name="Multi Icon File Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/mifconv/group"/>
-</component>
-</collection>
-</block>
-<block name="uitools" level="specific" long-name="UI Tools" levels="compile encode tool if">
-<collection name="uitools_pub" long-name="UI Tools Public Interfaces" level="if">
-<component name="third_party_bitmap_palette_api" long-name="Third Party Bitmap Palette API" filter="s60" class="api">
-<unit bldFile="mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
-</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">
-<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">
-<unit bldFile="mw/uitools/uitools_plat/layout_system_private_api/group"/>
-</component>
-</collection>
-<collection name="cdlcompilertoolkit" long-name="CDL Compiler Toolkit" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompilertoolkit_build" filter="s60" long-name="CDL Compiler Toolkit Build">
-<unit bldFile="mw/uitools/cdlcompilertoolkit/group"/>
-</component>
-</collection>
-<collection name="cdlcompiler" long-name="CDL Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompiler_build" filter="s60" long-name="CDL Compiler Build">
-<unit bldFile="mw/uitools/cdlcompiler/group"/>
-</component>
-</collection>
-<collection name="gfxtools" long-name="Graphics Tools" level="tool">
-<component name="gditools" filter="s60" long-name="GDI Tools" class="PC">
-<unit bldFile="mw/uitools/gfxtools/gditools/group"/>
-</component>
-<component name="color" filter="s60" long-name="Bitmap Colour Palette" class="PC">
-<unit bldFile="mw/uitools/gfxtools/color/group"/>
-</component>
-</collection>
-<collection name="aknlayoutcompiler" long-name="Avkon Layout Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="aknlayoutcompiler_build" filter="s60" long-name="Avkon Layout Compiler Build">
-<unit bldFile="mw/uitools/aknlayoutcompiler/group"/>
-</component>
-</collection>
-<collection name="skincompiler" long-name="Skin Compiler" level="compile">
-<component name="aknskindesccompiler" filter="s60" long-name="Avkon Skin Descriptor Compiler">
-<unit bldFile="mw/uitools/skincompiler/AknSkinDescCompiler/group"/>
-</component>
-</collection>
-<collection name="reszip" long-name="Resource Zip" level="encode">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="reszip_build" filter="s60" long-name="Resource Zip Build">
-<unit bldFile="mw/uitools/reszip/group"/>
-</component>
-</collection>
-<collection name="toollibraries" long-name="Tool Libraries" level="tool"/>
-<collection name="svgtencoder" long-name="SVGT Encoder" level="encode">
-<component name="svgtenc" filter="s60" long-name="Standalone SVGT Encoder" class="PC">
-<unit bldFile="mw/uitools/svgtencoder/svgtenc/standalone/group"/>
-</component>
-</collection>
-</block>
-</layer>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="location" level="apps" long-name="Location Apps" levels="ui events loc api">
-<collection name="loc_plat" long-name="Location Apps Platform Interfaces" level="api">
-<component name="location_picker_service_api" long-name="Location Picker Service API" introduced="^4" filter="s60" class="api">
-<unit bldFile="app/location/loc_plat"/>
-</component>
-</collection>
-<collection name="locationpickerservice" long-name="Location Picker Service" level="loc">
-<!--collection is really a component. Should move down a directory -->
-<component name="locationpickerservice_build" filter="s60" long-name="Location Picker Service Build" introduced="^4">
-<unit bldFile="app/location/locationpickerservice"/>
-</component>
-</collection>
-</block>
-<!-- pending removal -->
-<block name="mmsharinguis" level="services" long-name="Multimedia Sharing UIs" levels="base plugin if">
-<collection name="mmsharinguis_plat" long-name="Multimedia Sharing UIs Platform Interfaces" level="if">
-<component name="multimedia_sharing_settings_api" long-name="Multimedia Sharing Settings API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_settings_api/group"/>
-</component>
-<component name="multimedia_sharing_resource_api" long-name="Multimedia Sharing Resource API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_resource_api/group"/>
-</component>
-<component name="multimedia_sharing_manager_api" long-name="Multimedia Sharing Manager API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/group"/>
-</component>
-</collection>
-<collection name="mmsharing" long-name="Multimedia Sharing" level="base">
-<component name="mmshavailability" filter="s60" long-name="Multimedia Sharing Availability">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshavailability/group"/>
-</component>
-<component name="mmshindicator" filter="s60" long-name="Multimedia Sharing Indicator">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshindicator/group"/>
-</component>
-<!-- consider putting client and server in the same component -->
-<component name="mmshmanagercli" filter="s60" long-name="Multimedia Sharing Manager Client">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshmanagercli/group" filter="!test"/>
-</component>
-<component name="mmshmanagersrv" filter="s60" long-name="Multimedia Sharing Manager Server">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshmanagersrv/group"/>
-</component>
-<component name="mmshengine" filter="s60" long-name="Multimedia Sharing Engine">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshengine/group"/>
-</component>
-<component name="mmshui" filter="s60" long-name="Multimedia Sharing UI">
-<!-- can only have one unit: need to #include one from the other if it's needed -->
-<unit bldFile="app/mmsharinguis/mmsharing/mmshui/group"/>
-<unit bldFile="app/mmsharinguis/mmsharing/mmshui/help/group"/>
-</component>
-<component name="mmsharing_build" filter="s60" long-name="MM Sharing Build">
-<unit bldFile="app/mmsharinguis/mmsharing/group"/>
-</component>
-</collection>
-<collection name="mmshplugins" long-name="Multimedia Sharing Plugins" level="plugin">
-<component name="mmshaoplugin" filter="s60" long-name="Multimedia Sharing Always Online Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshaoplugin/group"/>
-</component>
-<component name="mmshaiwplugin" filter="s60" long-name="Multimedia Sharing AIW Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshaiwplugin/group"/>
-</component>
-<component name="mmshsipcrplugin" filter="s60" long-name="Multimedia Sharing SIP Client Resolver Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshsipcrplugin/group"/>
-</component>
-<component name="mmshsettingsuiplugin" filter="s60" long-name="Multimedia Sharing Settings UI Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshsettingsuiplugin/group"/>
-</component>
-<component name="mmshwpadapterplugin" filter="s60" long-name="Multimedia Sharing WAP Provisioning Adapter" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshwpadapterplugin/group"/>
-</component>
-</collection>
-<collection name="mmsharinguis_info" long-name="Multimedia Sharing UIs Info" level="if">
-<component name="mmsharinguis_build" filter="s60" long-name="Multimedia Sharing UIs Build">
-<!-- consider distributing to other components -->
-<unit bldFile="app/mmsharinguis/group"/>
-</component>
-</collection>
-</block>
-<block name="phone" level="apps" span="2" long-name="Phone Apps" levels="engine plugin ui app">
-<collection name="phoneapp" long-name="Phone Application" level="app">
-<component name="blacklist" filter="s60" long-name="Phone Blacklist Clearing" plugin="Y">
-<unit bldFile="app/phone/phoneapp/blacklist/group"/>
-</component>
-<component name="phoneuicontrol" filter="s60" long-name="Phone UI Control">
-<unit bldFile="app/phone/phoneapp/phoneuicontrol/group"/>
-</component>
-<component name="phoneuistates" filter="s60" long-name="Phone UI States">
-<unit bldFile="app/phone/phoneapp/phoneuistates/group"/>
-</component>
-<component name="phoneuiutils" filter="s60" long-name="Phone UI Utils">
-<unit bldFile="app/phone/phoneapp/phoneuiutils/group"/>
-</component>
-<component name="silenceactionplugin" filter="s60" long-name="Silence Action Plugin" plugin="Y">
-<unit bldFile="app/phone/phoneapp/silenceactionplugin/group"/>
-</component>
-<component name="phonemediatorcenter" filter="s60" long-name="Phone Mediator Center">
-<unit bldFile="app/phone/phoneapp/phonemediatorcenter/group"/>
-</component>
-<component name="phoneuiview2" filter="s60" long-name="Phone UI View">
-<unit bldFile="app/phone/phoneapp/phoneuiview2"/>
-</component>
-<component name="phoneuiqtviewadapter" filter="s60" long-name="Phone UI Qt View Adapter" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneapp/phoneuiqtviewadapter"/>
-</component>
-<component name="phonestringloader" filter="s60" long-name="Phone String Loader" introduced="^4">
-<unit bldFile="app/phone/phoneapp/phonestringloader"/>
-</component>
-<component name="phoneui2" filter="s60" long-name="Phone UI">
-<unit bldFile="app/phone/phoneapp/phoneui2"/>
-</component>
-</collection>
-<collection name="phoneengine" long-name="Phone Engine" level="engine">
-<component name="phonecntfinder2" filter="s60" long-name="Phone Contact Finder">
-<unit bldFile="app/phone/phoneengine/phonecntfinder2"/>
-</component>
-<component name="audiohandling" filter="s60" long-name="Phone Audio Handling">
-<unit bldFile="app/phone/phoneengine/audiohandling/group"/>
-</component>
-<component name="callhandling" filter="s60" long-name="Call Handling">
-<unit bldFile="app/phone/phoneengine/callhandling/group"/>
-</component>
-<component name="contacthandling2" filter="s60" long-name="Phone Contact Handling">
-<unit bldFile="app/phone/phoneengine/contacthandling2/group"/>
-</component>
-<component name="loghandling" filter="s60" long-name="Phone Log Handling">
-<unit bldFile="app/phone/phoneengine/loghandling/group"/>
-</component>
-<component name="engineinfo" filter="s60" long-name="Phone Engine Info">
-<unit bldFile="app/phone/phoneengine/engineinfo/group"/>
-</component>
-<component name="phonemodel" filter="s60" long-name="Phone Model">
-<unit bldFile="app/phone/phoneengine/phonemodel"/>
-</component>
-<component name="servicehandling" filter="s60" long-name="Phone Service Handling">
-<unit bldFile="app/phone/phoneengine/servicehandling/group"/>
-</component>
-<component name="phoneservices" filter="s60" long-name="Phone Server" introduced="^4">
-<unit bldFile="app/phone/phoneengine/phoneservices"/>
-</component>
-<component name="parserrecognizer" filter="s60" long-name="Parser Recognizer" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneengine/parserrecognizer"/>
-</component>
-</collection>
-<collection name="phoneuis" long-name="Phone UIs" level="ui">
-<component name="bubblemanager2" filter="s60" long-name="Phone Bubble Manager">
-<unit bldFile="app/phone/phoneuis/bubblemanager2"/>
-</component>
-<component name="telephonydevicemode" filter="s60" long-name="Telephony Device Mode">
-<unit bldFile="app/phone/phoneuis/telephonydevicemode/group"/>
-</component>
-</collection>
-<collection name="phone_plat" long-name="Phone Apps Platform Interfaces" level="app">
-<component name="3d_ringing_tone_enabler_api" long-name="3D Ringing Tone Enabler API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
-</component>
-<component name="telephony_comms_information_api" long-name="Telephony Comms Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_comms_information_api/group"/>
-</component>
-<component name="telephony_information_api" long-name="Telephony Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_information_api/group"/>
-</component>
-<component name="telephony_device_mode_api" long-name="Telephony Device Mode API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_device_mode_api/group"/>
-</component>
-<component name="telephony_remote_party_information_api" long-name="Telephony Remote Party Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_remote_party_information_api/group"/>
-</component>
-<component name="telephony_video_mailbox_settings_api" long-name="Telephony Video Mailbox Settings API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_video_mailbox_settings_api/group"/>
-</component>
-<component name="telephony_microphone_mute_status_api" long-name="Telephony Microphone Mute Status API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_microphone_mute_status_api/group"/>
-</component>
-<component name="telephony_logging_extension_api" long-name="Telephony Logging Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_logging_extension_api/group"/>
-</component>
-<component name="telephony_matching_extension_api" long-name="Telephony Matching Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_matching_extension_api/group"/>
-</component>
-<component name="phone_application_commands_api" long-name="Phone Application Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_commands_api/group"/>
-</component>
-<component name="phone_application_voip_commands_api" long-name="Phone Application VOIP Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_voip_commands_api/group"/>
-</component>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_mediator_api/group"/>
-</component>
-<component name="video_telephony_mediator_api" long-name="Video Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/video_telephony_mediator_api/group"/>
-</component>
-<component name="video_telephony_control_mediator_api" long-name="Video Telephony Control Mediator API" filter="s60" introduced="^4" class="api">
-<unit bldFile="app/phone/phone_plat/video_telephony_control_mediator_api/group"/>
-</component>
-</collection>
-<collection name="phoneplugins" long-name="Phone Plugins" level="plugin">
-<component name="csplugin" filter="s60" long-name="Circuit Switched Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/csplugin/group"/>
-</component>
-<component name="hsdialerwidgetplugin" filter="s60" long-name="Home Screen Dialer Widget Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/hsdialerwidgetplugin"/>
-</component>
-<component name="infowidgetplugin" filter="s60" long-name="Info Widget Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/infowidgetplugin"/>
-</component>
-</collection>
-<collection name="phonesettings" long-name="Phone Settings" level="plugin">
-<component name="cpphonesettingsplugins" filter="s60" long-name="CP Phone Settings Plugins" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phonesettings/cpphonesettingsplugins"/>
-</component>
-</collection>
-</block>
-<block name="videotelephony" level="apps" long-name="Video Telephony Apps" levels="engine plugin prot ui">
-<collection name="videotelephony_plat" long-name="VT Apps Platform Interfaces" level="ui">
-<component name="video_telephony_control_mediator_api" long-name="Video Telephony Control Mediator API" filter="s60" class="api">
-<unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_control_mediator_api/group"/>
-</component>
-<component name="video_telephony_media_configuration_api" long-name="Video Telephony Media Configuration API" filter="s60" class="api">
-<unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_media_configuration_api/group"/>
-</component>
-</collection>
-<collection name="vtengines" long-name="Video Telephony Engines" level="engine">
-<component name="videoteleng" filter="s60" long-name="Video Telephony Engine">
-<unit bldFile="app/videotelephony/vtengines/videoteleng/Group"/>
-</component>
-<component name="vtmediatorplugin" filter="s60" long-name="VT Mediator Plugin" plugin="Y">
-<unit bldFile="app/videotelephony/vtengines/vtmediatorplugin/group"/>
-</component>
-</collection>
-<collection name="vtuis" long-name="Video Telephony UIs" level="ui">
-<component name="videotelui" filter="s60" long-name="Video Telephony UI">
-<unit bldFile="app/videotelephony/vtuis/videotelui/group"/>
-</component>
-</collection>
-<collection name="vtprotocolplugins" long-name="VT Protocol Plugins" level="plugin">
-<component name="displaysink" filter="s60" long-name="Display Sink" introduced="^2">
-<unit bldFile="app/videotelephony/vtprotocolplugins/DisplaySink/group"/>
-</component>
-<component name="videosource" filter="s60" long-name="Video Source" introduced="^2">
-<unit bldFile="app/videotelephony/vtprotocolplugins/VideoSource/group"/>
-</component>
-</collection>
-<collection name="vtprotocolsstub" long-name="VT Protocols Stub" level="prot">
-<!-- this collection is really a component, move down a directory -->
-<component name="videotelproto" filter="s60" long-name="Video Telephony Protocol">
-<unit bldFile="app/videotelephony/vtprotocolsstub/group" filter="sf_build"/>
-</component>
-</collection>
-</block>
-<block name="settingsuis" level="services" long-name="Settings UIs" levels="plugin ui">
-<collection name="controlpanelplugins" long-name="Control Panel Plugins" level="plugin">
-<component name="themeplugin" filter="s60" long-name="Theme Plugin" introduced="^4">
-<unit bldFile="app/settingsuis/controlpanelplugins/themeplugin"/>
-</component>
-</collection>
-<collection name="controlpanelui" long-name="Control Panel UI" level="ui">
-<!-- collection is really a component, move down a dir -->
-<component name="controlpanelui_build" filter="s60" long-name="Control Panel UI Build" introduced="^4">
-<unit bldFile="app/settingsuis/controlpanelui"/>
-</component>
-</collection>
-</block>
-<block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin framework app">
-<collection name="contentctrl_plat" long-name="Content Control Daemons Platforn Interfaces" level="app">
-<component name="ds_contactsdatastoreextension_api" long-name="Adapter Customization API" filter="s60" introduced="^4" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_contactsdatastoreextension_api/group"/>
-</component>
-<component name="ds_data_modification_api" long-name="DS Data Modification API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_data_modification_api/group"/>
-</component>
-</collection>
-<collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
-<component name="secon" filter="s60" long-name="Service Controllers">
-<unit bldFile="app/contentcontrol/connectivitymodules/secon/group"/>
-</component>
-</collection>
-<collection name="dsdcmoadapter" long-name="Data Sync DCMO Adapter" level="plugin">
-<!-- Component at wrong rank, should move down a directory -->
-<component name="dsdcmoadapter_build" filter="s60" long-name="Data Sync Control DCMO Adapter">
-<unit bldFile="app/contentcontrol/dsdcmoadapter/group"/>
-</component>
-</collection>
-<collection name="omads" long-name="OMA Data Sync" level="app">
-<component name="omads_build" filter="s60" long-name="OMA DS Build">
-<unit bldFile="app/contentcontrol/omads/group"/>
-<!-- need to remove #include and rename and OMA DS ROM -->
-</component>
-<component name="omadsextensions" filter="s60" long-name="OMA DS Extensions" plugin="Y">
-<unit bldFile="app/contentcontrol/omads/omadsextensions/group"/>
-</component>
-<component name="omadsextensions" filter="s60" long-name="OMA DS Qt Extensions" plugin="Y">
-<unit bldFile="app/contentcontrol/omads/omadsextensions"/>
-</component>
-</collection>
-</block>
-<block name="firsttimeuse" level="apps" long-name="First Time Use" levels="support services ui app">
-<!-- these empty collections are really components. Move down a directory and supply units -->
-<collection name="ftuapplication" long-name="First Time Use Application" level="app"/>
-<collection name="fturuntimeservices" long-name="First Time Use Runtime Services" level="services"/>
-<collection name="wizardproviders" long-name="Wizard Providers" level="support"/>
-<collection name="stateproviders" long-name="State Providers" level="support"/>
-<collection name="runtimeproviders" long-name="Runtime Providers" level="support"/>
-<collection name="firsttimeuse_info" long-name="First Time Use Info" level="ui">
-<component name="firsttimeuse_build" long-name="First Time Use Build">
-<unit bldFile="app/firsttimeuse"/>
-</component>
-</collection>
-<collection name="firsttimeuse_test" long-name="First Time Use Test" level="support"/>
-</block>
-<block name="devicecontrol" level="services" long-name="Device Control Daemons" levels="oma mid app">
-<collection name="deviceupdatesui" long-name="Device Updates UI" level="app">
-<component name="deviceupdatesui_adapters" long-name="Device Updates Adapters" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/devicecontrol/deviceupdatesui/adapters/bld"/>
-</component>
-<component name="deviceupdates" long-name="Device Updates" filter="s60" introduced="^4">
-<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdates"/>
-</component>
-<component name="deviceupdatesplugin" long-name="Device Updates Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdatesplugin"/>
-</component>
-<component name="deviceupdatesqtsp" long-name="Device Updates Qt Service Provider" filter="s60" introduced="^4">
-<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdatesqtsp"/>
-</component>
-<component name="cpqtsp" long-name="Client Provisioning Qt Service Provider" filter="s60" introduced="^4">
-<unit bldFile="app/devicecontrol/deviceupdatesui/cpqtsp"/>
-</component>
-<component name="devicemanagementnotifiersplugin" long-name="Device Management Notifiers Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/devicecontrol/deviceupdatesui/devicemanagementnotifiersplugin"/>
-</component>
-</collection>
-</block>
-<block name="printing" level="services" long-name="Printing"/>
-<block name="files" level="apps" long-name="File Manager Apps" levels="support apps">
-<collection name="filemanager" long-name="File Manager" level="apps">
-<component name="filemanager_plat" long-name="File Manager Platform Interfaces" filter="s60" introduced="^4" class="api"/>
-<component name="fmbkupengine" filter="s60" long-name="File Manager Backup Engine" introduced="^4">
-<unit bldFile="app/files/filemanager/src/fmbkupengine/group"/>
-</component>
-<component name="filemanager_build" filter="s60" long-name="File Manager Build">
-<!-- break this up into components or move down a directory -->
-<unit bldFile="app/files/filemanager"/>
-</component>
-</collection>
-</block>
-<block name="search" level="apps" long-name="Search Apps" levels="eng base app api">
-<collection name="search_info" long-name="Search Info">
-<component name="search_build" long-name="Search Build">
-<unit bldFile="app/search/group"/>
-</component>
-</collection>
-<collection name="searchui" long-name="Search UI">
-<component name="searchui_build" long-name="Search UI Build">
-<unit bldFile="app/search/searchui"/>
-</component>
-</collection>
-</block>
-<block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
-<collection name="contacts_plat" long-name="Contacts Apps Platform Interfaces" level="ui">
-<component name="logs_engine_api" long-name="Logs Engine API" filter="s60" introduced="^4" class="api"/>
-<component name="logs_engine_api_extensions" long-name="Logs Engine API Extensions" filter="s60" class="api"/>
-<component name="logs_services_api" long-name="Logs Services API" filter="s60" introduced="^4" class="api"/>
-<component name="logs_timers_api" long-name="Logs Timers API" filter="s60" class="api"/>
-<component name="qt_mobility_contacts_api" long-name="Qt Mobility Contacts API" filter="s60" introduced="^4" class="api"/>
-</collection>
-<collection name="logsui" long-name="Logs UI" level="ui">
-<component name="logsui_build" filter="s60" long-name="Logs UI Build">
-<!-- component at too high a rank, should move down one directory -->
-<unit bldFile="app/contacts/logsui"/>
-</component>
-</collection>
-<collection name="phonebookui" long-name="Phonebook UI" level="ui">
-<component name="mobhistorymodel" filter="s60" long-name="Mobile History Model" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/mobhistorymodel" qt:proFile="mobhistorymodel.pro"/> -->
-</component>
-<component name="pbkcommonui" filter="s60" long-name="Phonebook Common UI" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/pbkcommonui" qt:proFile="pbkcommonui.pro"/> -->
-</component>
-<component name="phonebookapp" filter="s60" long-name="Phonebook Application" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/phonebookapp" qt:proFile="phonebookapp.pro"/> -->
-</component>
-<component name="phonebookservices" filter="s60" long-name="Phonebook Services" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/phonebookservices" qt:proFile="phonebookservices.pro"/> -->
-</component>
-<component name="phonebookui_build" filter="s60" long-name="Phonebook UI Build" introduced="^4">
-<!-- break up into components -->
-<unit bldFile="app/contacts/phonebookui"/>
-</component>
-</collection>
-<collection name="qtcontactsmobility" long-name="Qt Contacts Mobility" level="support">
-<component name="qtcontactsmobility_build" filter="s60" long-name="Qt Contacts Mobility Build" introduced="^4" plugin="Y">
-<!-- not really a component, move down a dir? Break up into compnents? -->
-<unit bldFile="app/contacts/qtcontactsmobility"/>
-</component>
-</collection>
-<collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
-<component name="cntfindplugin" filter="s60" long-name="Contacts Find Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntfindplugin"/>
-</component>
-<component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
-<unit bldFile="app/contacts/phonebookengines/contactsmodel/groupsql" mrp="app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
-</component>
-<component name="cntsortplugin" filter="s60" long-name="Contacts Sort Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntsortplugin"/>
-</component>
-<component name="mobcntmodel" filter="s60" long-name="Mobile Contacts Model" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/mobcntmodel"/>
-</component>
-<component name="mobcntactions" filter="s60" long-name="Mobile Contacts Actions" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/cntmaptileservice"/>
-</component>
-<component name="cntmaptileservice" filter="s60" long-name="Contacts Map Tile Service" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/cntmaptileservice"/>
-</component>
-<component name="simutility" filter="s60" long-name="SIM Utility" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/simutility"/>
-</component>
-</collection>
-<collection name="pimprotocols" long-name="PIM Protocols" level="services">
-<component name="phonebooksync" long-name="Phonebook Sync" purpose="optional" plugin="Y">
-<unit bldFile="app/contacts/pimprotocols/phonebooksync/group" mrp="app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
-</component>
-<component name="pbap" long-name="Bluetooth PBAP" introduced="9.2" purpose="optional">
-<unit bldFile="app/contacts/pimprotocols/pbap/group" mrp="app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
-</component>
-</collection>
-<collection name="contacts_info" long-name="Contacts Apps Info" level="ui">
-<component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="organizer" level="apps" span="2" long-name="Organizer Application Suite" levels="support services engine ui app">
-<collection name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" level="app">
-<component name="calendar_interim_utils2_api" long-name="Calendar Interim Utils 2 API" filter="s60" class="api">
-<!-- move into own .pro file -->
-<unit bldFile="app/organizer/organizer_pub"/>
-</component>
-</collection>
-<collection name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" level="app">
-<component name="organizer_plat_build" long-name="Organizer Application Suite Platform Interface Build" filter="s60" class="api">
-<!-- break up into individual .pro files -->
-<unit bldFile="app/organizer/organizer_plat"/>
-</component>
-<component name="agenda_versit_2_api" long-name="Agenda Versit 2 API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="organizer_plat/agenda_versit_2_api/group"/>-->
-</component>
-<component name="calendar_exporter_api" long-name="Calendar Exporter API" filter="s60" class="api placeholder">
-<!--<unit bldFile="organizer_plat/calendar_exporter_api/group"/>-->
-</component>
-<component name="calendar_importer_api" long-name="Calendar Importer API" filter="s60" class="api placeholder">
-<!--<unit bldFile="organizer_plat/calendar_importer_api/group"/>-->
-</component>
-<component name="calendar_launcher_api" long-name="Calendar Launcher API" filter="s60" class="api placeholder">
-<!--<unit bldFile="organizer_plat/calendar_launcher_api/group"/> -->
-</component>
-<component name="agenda_interface_api" long-name="Agenda Interface API" filter="s60" introduced="^4" class="api"/>
-<component name="calendar_editor_api" long-name="Calendar Editor API" filter="s60" introduced="^4" class="api"/>
-<component name="notes_editor_api" long-name="Notes Editor API" filter="s60" introduced="^4" class="api"/>
-<component name="agenda_eventviewer_api" long-name="Agenda Event Viewer API" filter="s60" introduced="^4" class="api"/>
-</collection>
-<collection name="agendainterface" long-name="Agenda Interface" level="services">
-<!-- collection is really a component, should move down a directory -->
-<component name="agendainterface_build" filter="s60" long-name="Agenda Interface Build">
-<unit bldFile="app/organizer/agendainterface"/>
-</component>
-</collection>
-<collection name="calendarui" long-name="Calendar UI" level="ui">
-<component name="commonutils" filter="s60" long-name="Calendar Common Utils">
-<unit bldFile="app/organizer/calendarui/commonutils"/>
-</component>
-<component name="calenlauncher" filter="s60" long-name="Calendar Launcher">
-<unit bldFile="app/organizer/calendarui/calenlauncher/group"/>
-</component>
-<component name="caleneditor" filter="s60" long-name="Calendar Editor" introduced="^4">
-<unit bldFile="app/organizer/calendarui/caleneditor"/>
-</component>
-<component name="globaldata" filter="s60" long-name="Calendar Global Data">
-<unit bldFile="app/organizer/calendarui/globaldata"/>
-</component>
-<component name="settings" filter="s60" long-name="Calendar Settings">
-<unit bldFile="app/organizer/calendarui/settings"/>
-</component>
-<component name="calenplugins" filter="s60" long-name="Calendar Plugins" introduced="^4" plugin="Y">
-<unit bldFile="app/organizer/calendarui/calenplugins"/>
-</component>
-<component name="customisationmanager" filter="s60" long-name="Calendar Customisation Manager">
-<unit bldFile="app/organizer/calendarui/customisationmanager"/>
-</component>
-<component name="agendaeventviewer" filter="s60" long-name="Agenda Event Viewer" introduced="^4">
-<unit bldFile="app/organizer/calendarui/agendaeventviewer"/>
-</component>
-<component name="views" filter="s60" long-name="Calendar Views">
-<unit bldFile="app/organizer/calendarui/views"/>
-</component>
-<component name="calengriditemstyleplugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/organizer/calendarui/styleplugins/calengriditemstyleplugin"/>
-</component>
-<component name="calendarui_controller" filter="s60" long-name="Calendar Controller">
-<unit bldFile="app/organizer/calendarui/controller"/>
-</component>
-<component name="calendarui_application" filter="s60" long-name="Calendar Application">
-<unit bldFile="app/organizer/calendarui/application"/>
-</component>
-<component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y">
-<unit bldFile="app/organizer/calendarui/caldav/group"/>
-</component>
-</collection>
-<collection name="notes" long-name="Notes" level="ui">
-<component name="noteseditor" filter="s60" long-name="Notes Editor" introduced="^4">
-<unit bldFile="app/organizer/notes/notesui/noteseditor"/>
-</component>
-<component name="notes_build" filter="s60" long-name="Notes Build" introduced="^4">
-<unit bldFile="app/organizer/notes"/>
-</component>
-</collection>
-<collection name="calendarengines" long-name="Calendar Engines" level="engine">
-<component name="versit2" filter="s60" long-name="Versit 2 iCal Parser" introduced="9.2">
-<unit bldFile="app/organizer/calendarengines/versit2/group"/>
-</component>
-<component name="agnversit2" filter="s60" long-name="Versit 2 Agenda Interface" introduced="9.2" plugin="Y">
-<unit bldFile="app/organizer/calendarengines/agnversit2/group"/>
-</component>
-<component name="caleninterimutils" filter="s60" long-name="Calendar Interim Utils" introduced="9.1">
-<unit bldFile="app/organizer/calendarengines/caleninterimutils/group"/>
-</component>
-<component name="calenimp" filter="s60" long-name="Calendar Import Wrapper" introduced="7.0s">
-<unit bldFile="app/organizer/calendarengines/calenimp/group"/>
-</component>
-<component name="caldavsrv" filter="sf_build" long-name="CalDAV Server" introduced="^3">
-<unit bldFile="app/organizer/calendarengines/caldav/group"/>
-</component>
-</collection>
-<collection name="clock" long-name="Clock" level="app">
-<!-- uncomment unit when block_build is split up-->
-<component name="clockengines" filter="s60" long-name="Clock Engines" class="placeholder">
-<!--<unit bldFile="clock/clockengines" qt:proFile="clockengines.pro"/> -->
-</component>
-<component name="clockmw" filter="s60" long-name="Clock Middleware" introduced="^4" class="placeholder">
-<!--<unit bldFile="clock/clockmw" qt:proFile="clockmw.pro"/>-->
-</component>
-<component name="clockui" filter="s60" long-name="Clock UI" class="placeholder">
-<!--<unit bldFile="clock/clockui" qt:proFile="clockui.pro"/>-->
-</component>
-<component name="ftudatetimewizard" filter="s60" long-name="First Time Use Date/Time Wizard" introduced="^4" class="placeholder">
-<!--<unit bldFile="clock/ftudatetimewizard" qt:proFile="ftudatetimewizard.pro"/>-->
-</component>
-<component name="clock_build" filter="s60" long-name="Clock Build">
-<!-- make exports into a component, or just move to one of the above components, then remove this and uncomment the above -->
-<unit bldFile="app/organizer/clock"/>
-</component>
-</collection>
-<collection name="pimappservices" long-name="PIM Application Services" level="services">
-<component name="calendar" long-name="Calendar" introduced="9.2" purpose="optional">
-<unit bldFile="app/organizer/pimappservices/calendar/group" mrp="app/organizer/pimappservices/calendar/group/app-engines_calendar.mrp" version="2"/>
-</component>
-<component name="calendarvcalplugin" long-name="Calendar vCal Plugin" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="app/organizer/pimappservices/calendarvcalplugin/group" mrp="app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp" version="2"/>
-</component>
-<component name="appenginesdocs" long-name="Application Engines Documentation" purpose="development" class="doc">
-<unit mrp="app/organizer/pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
-</component>
-</collection>
-<collection name="pimappsupport" long-name="PIM Application Support" level="support">
-<component name="vcardandvcal" long-name="vCard and vCal" introduced="ER5" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/vcardandvcal/group" mrp="app/organizer/pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
-</component>
-<component name="chinesecalendarconverter" long-name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
-</component>
-</collection>
-<collection name="alarmui" long-name="Alarm UI" level="app">
-<!-- collection is really a component, should move down a directory -->
-<component name="alarmui_build" filter="s60" long-name="Alarm UI Build">
-<unit bldFile="app/organizer/alarmui"/>
-</component>
-</collection>
-<collection name="organizer_info" long-name="Organizer Application Suite Info" level="app">
-<component name="organizer_metadata" long-name="Organizer Application Suite Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="plugin eng base app api">
-<collection name="msg_plat" long-name="Messaging Apps Platform APIs" level="api">
-<component name="messaging_media_resolver_api" long-name="Messaging Media Resolver API" filter="s60" class="api"/>
-<component name="mms_application_api" long-name="MMS Application API" filter="s60" class="api"/>
-<component name="mms_codec_client_api" long-name="MMS Codec Client API" filter="s60" class="api"/>
-<component name="mms_conformance_api" long-name="MMS Conformance API" filter="s60" class="api"/>
-<component name="mms_engine_settings_api" long-name="MMS Engine Settings API" filter="s60" class="api"/>
-<component name="mms_server_settings_api" long-name="MMS Server Settings API" filter="s60" class="api"/>
-<component name="conversation_services_client_api" long-name="Conversation Services Client API" filter="s60" introduced="^4" class="api"/>
-<component name="conversation_services_plugin_api" long-name="Conversation Services Plugin API" filter="s60" introduced="^4" class="api"/>
-<component name="conversation_services_utilities_api" long-name="Conversation Services Utilities API" filter="s60" introduced="^4" class="api"/>
-<component name="shareui_api" long-name="Share UI API" filter="s60" introduced="^4" class="api"/>
-<component name="messaging_history_api" long-name="Messaging History API" filter="s60" introduced="^4" class="api"/>
-<component name="msg_plat_build" long-name="Messaging Apps Platform APIs Build" filter="s60" introduced="^4" class="api">
-<!-- break this up into the above units and replace their base attributes with bldFile, etc -->
-</component>
-</collection>
-<collection name="msg_pub" long-name="Messaging Apps Public APIs" level="api">
-<component name="mms_client_mtm_api" long-name="MMS Client MTM API" filter="s60" class="api"/>
-<component name="msg_smil_dtd_api" long-name="Messaging SMIL DTD API" filter="s60" introduced="^4" class="api"/>
-<component name="msg_pub_build" long-name="Messaging Apps Public APIs Build" filter="s60" introduced="^4" class="api">
-<!-- break this up into the above units and replace their base attributes with bldFile, etc -->
-</component>
-</collection>
-<collection name="mobilemessaging" long-name="Mobile Messaging" level="plugin">
-<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/mobilemessaging/smsmtm/group" mrp="app/messaging/mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
-</component>
-</collection>
-<collection name="messagingappbase" long-name="Messaging App Base" level="base">
-<component name="messagingappbase_build" filter="s60" long-name="Messaging App Base Build" introduced="^4">
-<!-- break this up into the below components -->
-<unit bldFile="app/messaging/messagingappbase"/>
-</component>
-<component name="msgmedia" filter="s60" long-name="Message Media"/>
-<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
-<unit mrp="app/messaging/messagingappbase/smsmtm/group/messaging_sms.mrp"/>
-</component>
-<component name="smilparser" long-name="SMIL Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="app/messaging/messagingappbase/smilparser/GROUP" mrp="app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
-</component>
-<component name="obexmtms" long-name="OBEX MTMs" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/obexmtms/Group" mrp="app/messaging/messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
-</component>
-</collection>
-<collection name="mmsengine" long-name="MMS Engine" level="eng">
-<component name="mmsconninit" filter="s60" long-name="MMS Connection Initiator" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsconninit/bld"/> -->
-</component>
-<component name="genutils" filter="s60" long-name="General Utils" class="placeholder">
-<!-- <unit bldFile="mmsengine/genutils/bld"/> -->
-</component>
-<component name="mmsserversettings" filter="s60" long-name="MMS Server Settings" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserversettings/bld"/> -->
-</component>
-<component name="mmsmessage" filter="s60" long-name="MMS Message" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsmessage/bld"/> -->
-</component>
-<component name="mmshttptransport" filter="s60" long-name="MMS HTTP Transport" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmshttptransport/bld"/> -->
-</component>
-<component name="mmscodec" filter="s60" long-name="MMS Codec" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodec/bld"/> -->
-</component>
-<component name="mmsserver" filter="s60" long-name="MMS Server" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserver/bld"/> -->
-</component>
-<component name="clientmtm" filter="s60" long-name="MMS Client MTM" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/clientmtm/bld"/> -->
-</component>
-<component name="mmswatcher" filter="s60" long-name="MMS Watcher" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmswatcher/bld"/> -->
-</component>
-<component name="mmspushhandler" filter="s60" long-name="MMS Push Handler" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmspushhandler/bld"/> -->
-</component>
-<component name="applicationadapter" filter="s60" long-name="MMS Application Adapter" class="placeholder">
-<!-- <unit bldFile="mmsengine/applicationadapter/bld"/> -->
-</component>
-<component name="mmscodecclient" filter="s60" long-name="MMS Codec Client" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodecclient/bld"/> -->
-</component>
-<component name="mmssettings" long-name="MMS Settings" introduced="9.2" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmssettings/group" mrp="app/messaging/mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
-</component>
-<component name="mmsconf" long-name="MMS Configuration" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmsconf" mrp="app/messaging/mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
-</component>
-<component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
-<!-- this should be broken up into the individual other components -->
-<unit bldFile="app/messaging/mmsengine"/>
-</component>
-</collection>
-<collection name="messagingapp" long-name="Messaging Application" level="app">
-<component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
-<!-- this should be broken up into the individual other components -->
-<unit bldFile="app/messaging/mmsengine"/>
-</component>
-<component name="msgutils" filter="s60" long-name="Messaging Utils" introduced="^4">
-<unit bldFile="app/messaging/msgutils"/>
-</component>
-<component name="msgappfw" filter="s60" long-name="Messaging Application Framework" introduced="^4">
-<unit bldFile="app/messaging/msgappfw"/>
-</component>
-<component name="msgsettings" filter="s60" long-name="Messaging Settings" introduced="^4">
-<unit bldFile="app/messaging/msgsettings"/>
-</component>
-<component name="msgnotifications" filter="s60" long-name="Messaging Notifications" introduced="^4">
-<unit bldFile="app/messaging/msgnotifications"/>
-</component>
-<component name="smartmessaging" filter="s60" long-name="Smart Messaging">
-<unit bldFile="app/messaging/messagingapp/smartmessaging"/>
-</component>
-<component name="shareui" filter="s60" long-name="Shared UI" introduced="^4">
-<unit bldFile="app/messaging/shareui"/>
-</component>
-<component name="msgui" filter="s60" long-name="Messaging UI" introduced="^4">
-<unit bldFile="app/messaging/msgui"/>
-</component>
-</collection>
-<collection name="email" long-name="Email" level="plugin">
-<!-- use commonemail instead -->
-<component name="pop3andsmtpmtm" long-name="POP3 and SMTP MTM" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/pop3andsmtpmtm/group" mrp="app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
-</component>
-<component name="imap4mtm" long-name="IMAP4 MTM" introduced="9.2" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/imap4mtm/group" mrp="app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
-</component>
-</collection>
-<collection name="messaging_info" long-name="Messaging Apps Info" level="api">
-<component name="messaging_metadata" long-name="Messaging Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commonemail" level="apps" span="2" long-name="Email Apps" levels="service support ui app">
-<!-- need to resolve the qt parts into proper components, then uncomment the units -->
-<collection name="email_plat" long-name="Email Apps Platform Interfaces" level="app">
-<component name="nmail_client_api" long-name="NMail Client API" filter="s60" introduced="^4" class="api placeholder">
-<!--<unit bldFile="email_plat" qt:proFile="email_plat.pro"/> -->
-</component>
-</collection>
-<collection name="emailservices" long-name="Email Services" level="service">
-<component name="nmailbase" filter="s60" long-name="NMail Base" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/nmailbase" qt:proFile="nmailbase.pro"/> -->
-</component>
-<component name="emailcommon" filter="s60" long-name="Email Common" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/emailcommon" qt:proFile="emailcommon.pro"/>-->
-</component>
-<component name="emailframework" filter="s60" long-name="Email Framework" introduced="^2" class="placeholder">
-<!-- <unit bldFile="emailservices/emailframework" qt:proFile="emailframework.pro"/>-->
-</component>
-<component name="emailstore" filter="s60" long-name="Email Store" introduced="^2" class="placeholder">
-<!-- <unit bldFile="emailservices/emailstore" qt:proFile="emailstore.pro"/>-->
-</component>
-<component name="nmclientapi" filter="s60" long-name="Nmail Client API" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/nmclientapi" qt:proFile="nmclientapi.pro"/>-->
-</component>
-</collection>
-<collection name="ipsservices" long-name="IMAP/POP/SMTP Services" level="service">
-<component name="ipssosplugin" filter="s60" long-name="IPS SOS Plugin" introduced="^2" plugin="Y" class="placeholder">
-<!-- SOS? Consider spelling it out since the abbreviation is ambiguous -->
-<!--<unit bldFile="ipsservices/ipssosplugin" qt:proFile="ipssosplugin.pro" />-->
-</component>
-<component name="nmimapclientplugin" filter="s60" long-name="NM IMAP Client Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="ipsservices/nmimapclientplugin" qt:proFile="nmimapclientplugin.pro"/>-->
-</component>
-<component name="nmipsmtms" filter="s60" long-name="NM IPS Client Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="ipsservices/nmipsmtms" qt:proFile="nmipsmtms.pro"/>-->
-</component>
-<component name="nmipssettings" filter="s60" long-name="NM IPS Settings" introduced="^4" class="placeholder">
-<!-- <unit bldFile="ipsservices/nmipssettings" qt:proFile="nmipssettings.pro"/>-->
-</component>
-<component name="ipsservices_build" filter="s60" long-name="IPS Services Build" introduced="^2" class="placeholder">
-<!--<unit bldFile="ipsservices" qt:proFile="ipsservices.pro"/> -->
-<!-- can the exports be broken up into the other components or made a config component?-->
-</component>
-</collection>
-<collection name="emailuis" long-name="Email UIs" level="app">
-<component name="nmailuiengine" filter="s60" long-name="Nmail UI Engine" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailuiengine" qt:proFile="nmailuiengine.pro"/> -->
-</component>
-<component name="nmailuiwidgets" filter="s60" long-name="Nmail UI Widgets" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailuiwidgets" qt:proFile="nmailuiwidgets.pro"/> -->
-</component>
-<component name="nmailuiwidgetsplugin" filter="s60" long-name="Nmail UI Widgets Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailuiwidgetsplugin" qt:proFile="nmailuiwidgetsplugin.pro"/> -->
-</component>
-<component name="nmsettingui" filter="s60" long-name="Nmail Setting UI" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmsettingui" qt:proFile="nmsettingui.pro"/> -->
-</component>
-<component name="nmailcpplugin" filter="s60" long-name="Nmail CP Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailcpplugin" qt:proFile="nmailcpplugin.pro"/> -->
-</component>
-<component name="nmailui" filter="s60" long-name="Nmail UI" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailui" qt:proFile="nmailui.pro"/> -->
-</component>
-<component name="nmframeworkadapter" filter="s60" long-name="Nmail Framework Adapter" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmframeworkadapter" qt:proFile="nmframeworkadapter.pro"/> -->
-</component>
-</collection>
-<collection name="commonemail_info" long-name="Email Apps Info" level="app">
-<component name="commonemail_build" long-name="Email Apps Build" introduced="^4">
-<!-- split into actual components -->
-<unit bldFile="app/commonemail"/>
-</component>
-</collection>
-</block>
-<block name="camera" level="apps" long-name="Camera Apps">
-<collection name="camerauis" long-name="Camera UIs">
-<component name="cameraxui" filter="s60" long-name="CameraX UIs">
-<unit bldFile="app/camera/camerauis/cameraxui" filter="!test"/>
-</component>
-</collection>
-</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">
-<component name="image_editor_debug_utilities_api" long-name="Image Editor Debug Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
-</component>
-<component name="image_editor_utilities_api" long-name="Image Editor Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_utilities_api/group"/>
-</component>
-<component name="image_editor_definitions_api" long-name="Image Editor Definitions API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_definitions_api/group"/>
-</component>
-<component name="image_editor_system_parameters_api" long-name="Image Editor System Parameters API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_system_parameters_api/group"/>
-</component>
-<component name="image_processing_engine_api" long-name="Image Processing Engine API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_processing_engine_api/group"/>
-</component>
-</collection>
-<collection name="imageeditor" long-name="Image Editor UI" level="ui">
-<component name="pb" filter="s60" long-name="Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/pb/group"/>
-</component>
-<component name="iepb" filter="s60" long-name="Image Editor Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/iepb/group"/>
-</component>
-<component name="imageeditorui" filter="s60" long-name="Image Editor UI">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorui/group"/>
-</component>
-<component name="imageeditormanager" filter="s60" long-name="Image Editor Manager">
-<unit bldFile="app/imgeditor/imageeditor/imageeditormanager/group"/>
-</component>
-<component name="imageeditorapp" filter="s60" long-name="Image Editor Application">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorapp/group"/>
-</component>
-<component name="imageeditor_plugins" filter="s60" long-name="Image Editor Plugins" plugin="Y">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditor/plugins/blackwhiteplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/brightnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/bubbleplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cartoonizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/clipartplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/contrastplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cropplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/drawplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/frameplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/negativeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/redeyeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/resizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotatelplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotaterplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/textplugin/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditor/plugins/drawplugin/group"/>
- -->
-</component>
-<component name="editorprovider" filter="s60" long-name="Image Editor Provider">
-<unit bldFile="app/imgeditor/imageeditor/editorprovider/group"/>
-</component>
-<component name="imageeditor_build" filter="s60" long-name="Image Editor Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditor/group"/>
-</component>
-</collection>
-<collection name="imageeditorengine" long-name="Image Editor Engine" level="engine">
-<component name="filters" filter="s60" long-name="Image Editor Filters">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbrightness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbubble/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbuffer/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercartoon/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterclipart/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercontrast/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercrop/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterdraw/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterframe/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtergrayscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtericlsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegtarget/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filternegate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterredeye/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterrotate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtertext/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
- -->
-</component>
-<component name="imageeditorutils" filter="s60" long-name="Image Editor Utilities">
-<unit bldFile="app/imgeditor/imageeditorengine/imageeditorutils/group"/>
-</component>
-<component name="systemparameters" filter="s60" long-name="System Parameters">
-<unit bldFile="app/imgeditor/imageeditorengine/systemparameters/group"/>
-</component>
-<component name="enginewrapper" filter="s60" long-name="Image Editor Engine Wrapper">
-<unit bldFile="app/imgeditor/imageeditorengine/enginewrapper/group"/>
-</component>
-<component name="imageeditorengine_build" filter="s60" long-name="Image Editor Engine Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoeditor" level="apps" long-name="Video Editor Apps" levels="engine ui">
-<collection name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" level="ui">
-<component name="video_editor_engine_api" long-name="Video Editor Engine API" introduced="^2" class="api">
-<unit bldFile="app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
-</component>
-</collection>
-<collection name="videditor" long-name="Video Editor" level="ui">
-<component name="videoeditorcommon" filter="s60" long-name="Video Editor Common" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditorcommon/group"/>
-</component>
-<component name="videoeditoruicomponents" filter="s60" long-name="Video Editor UI Components" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditoruicomponents/group"/>
-</component>
-<component name="simplevideoeditor" filter="s60" long-name="Simple Video Editor" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplevideoeditor/group"/>
-</component>
-<component name="simplecutvideo" filter="s60" long-name="Simple Cut Video" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplecutvideo/group"/>
-</component>
-<component name="videoprovider" filter="s60" long-name="Video Provider" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoprovider/group"/>
-</component>
-<component name="manualvideoeditor" filter="s60" long-name="Manual Video Editor" introduced="^2" class="placeholder">
-<!-- uncomment when supported
- <meta rel="config">
- <defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
- </meta>
- <unit bldFile="videditor/manualvideoeditor/group"/> -->
-</component>
-<component name="videditor_build" filter="s60" long-name="Video Editor Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videditor/group"/>
-</component>
-</collection>
-<collection name="videoeditorengine" long-name="Video Editor Engine" level="engine">
-<component name="audioeditorengine" filter="s60" long-name="Audio Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/audioeditorengine/group"/>
-</component>
-<component name="avcedit" filter="s60" long-name="AVC Editing" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/avcedit/group"/>
-</component>
-<component name="h263decoder" filter="s60" long-name="H.263 Decoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/h263decoder/group"/>
-</component>
-<component name="mp3aacmaniplib" filter="s60" long-name="MP3 and AAC Manipulation Library" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
-</component>
-<component name="vedtranscoder" filter="s60" long-name="Video Editor Transcoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedtranscoder/group"/>
-</component>
-<component name="vedengine" filter="s60" long-name="Video Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedengine/group"/>
-</component>
-<component name="videoeditorengine_build" filter="s60" long-name="Video Editor Engine Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videoeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
-<collection name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" level="apps">
-<component name="videoplayer_startup_api" long-name="Video Player Startup API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videoplayer_startup_api/group" filter="!test"/>
-</component>
-<component name="videocollection_api" long-name="Video Collection API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videocollection_api/group"/>
-</component>
-</collection>
-<collection name="videocollection" long-name="Video Collection" level="util">
-<component name="mpxmyvideoscollection" filter="s60" long-name="MPX My Videos Collection" introduced="^3">
-<unit bldFile="app/videoplayer/videocollection/mpxmyvideoscollection/group"/>
-</component>
-<component name="videocollectionwrapper" filter="s60" long-name="Video Collection Wrapper" introduced="^4">
-<unit bldFile="app/videoplayer/videocollection/videocollectionwrapper"/>
-</component>
-<component name="videocollectionview" filter="s60" long-name="Video Collection View" introduced="^4">
-<unit bldFile="app/videoplayer/videocollection/videocollectionview"/>
-</component>
-<component name="videofiledetailsview" filter="s60" long-name="Video File Details View" introduced="^4">
-<unit bldFile="app/videoplayer/videocollection/videofiledetailsview"/>
-</component>
-</collection>
-<collection name="mediasettings" long-name="Media Settings" level="support">
-<!-- this is really a component. Should be moved down a directory -->
-<component name="mediasettings_build" filter="s60" long-name="Media Settings Build">
-<unit bldFile="app/videoplayer/mediasettings/group"/>
-</component>
-</collection>
-<collection name="videoplayerapp" long-name="Video Player App" level="apps">
-<component name="videoplayerengine" long-name="Video Player Engine" filter="s60" introduced="^4">
-<unit bldFile="app/videoplayer/videoplayerapp/videoplayerengine"/>
-</component>
-<component name="hbvideoplayer" filter="s60" long-name="HB Video Player" introduced="^4">
-<unit bldFile="app/videoplayer/videoplayerapp/hbvideoplayer"/>
-</component>
-</collection>
-<collection name="videoplayback" long-name="Video Playback Plugins" level="plugin">
-<component name="hbvideoplaybackview" filter="s60" long-name="HB Video Playback View" introduced="^4" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/hbvideoplaybackview"/>
-</component>
-<component name="hbvideoplaybackviewplugin" filter="s60" long-name="HB Video Playback View Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/hbvideoplaybackviewplugin"/>
-</component>
-<component name="videohelix" long-name="Video Helix" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videohelix/group"/>
-</component>
-</collection>
-</block>
-<block name="photos" level="apps" long-name="Photos" levels="util support ui app">
-<collection name="photos_group" long-name="Photos Group" level="support">
-<component name="photos_group_build" filter="s60" long-name="Photos Group Build" introduced="^4" class="placeholder">
-<!--<unit bldFile="group" qt:proFile="group.pro"/> -->
-</component>
-</collection>
-<collection name="photos_loggers" long-name="Photos Loggers" level="util">
-<component name="photos_loggerqt" filter="s60" long-name="Photos Logger Qt" introduced="^4" class="placeholder">
-<!--<unit bldFile="loggers/loggerqt" qt:proFile="loggerqt.pro"/> -->
-</component>
-</collection>
-<collection name="photos_commonutilities" long-name="Photos Common Utilities" level="util">
-<component name="photos_externalutility" filter="s60" long-name="Photos External Utility" introduced="^4" class="placeholder">
-<!--<unit bldFile="commonutilities/externalutility" qt:proFile="externalutility.pro"/> -->
-</component>
-<component name="imagedecoderwrapper" filter="s60" long-name="Image Decoder Wrapper" introduced="^4" class="placeholder">
-<!--<unit bldFile="commonutilities/imagedecoderwrapper" qt:proFile="imagedecoderwrapper.pro"/> -->
-</component>
-</collection>
-<collection name="photos_ui" long-name="Photos UI" level="ui">
-<component name="photos_uiengine" filter="s60" long-name="Photos UI Engine" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/uiengine" qt:proFile="uiengine.pro"/> -->
-</component>
-<component name="photos_commandhandlers" filter="s60" long-name="Photos Command Handlers" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/commandhandlers" qt:proFile="commandhandlers.pro"/> -->
-</component>
-<component name="photos_views" filter="s60" long-name="Photos Views" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/views" qt:proFile="views.pro"/> -->
-</component>
-<component name="photos_viewmanagement" filter="s60" long-name="Photos View Management" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/viewmanagement" qt:proFile="viewmanagement.pro"/> -->
-</component>
-</collection>
-<collection name="photos_main" long-name="Photos Main" level="support">
-<component name="photos_main_build" filter="s60" long-name="Photos Main Build" introduced="^4" class="placeholder">
-<!--<unit bldFile="main" qt:proFile="main.pro"/> -->
-</component>
-</collection>
-<collection name="imageviewerapp" long-name="Image Viewer App" level="support">
-<component name="imageviewerapp_build" filter="s60" long-name="Image Viewer App Build" introduced="^4" class="placeholder">
-<!--<unit bldFile="imageviewerapp" qt:proFile="imageviewerapp.pro"/> -->
-</component>
-</collection>
-<collection name="photos_info" long-name="Photos Info" level="support">
-<component name="photos_build" filter="s60" long-name="Photos Build" introduced="^4">
-<!-- split this up into the above components -->
-<unit bldFile="app/photos/photosgallery"/>
-</component>
-</collection>
-</block>
-<block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support hs app">
-<!-- move the export .pri files into their components and uncomment the units -->
-<collection name="musicplayer_utilities " long-name="Music Player Utilities" level="support">
-<component name="mpnowplayingbanner" filter="s60" long-name="MP Now Playing Banner" introduced="^4" class="placeholder">
-<!-- <unit bldFile="utilities/mpnowplayingbanner" qt:proFile="mpnowplayingbanner.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-<component name="mpsettingsmanager" filter="s60" long-name="MP Settings Manager" introduced="^4" class="placeholder">
-<!-- <unit bldFile="utilities/mpsettingsmanager" qt:proFile="mpsettingsmanager.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-</collection>
-<collection name="musicfetcher " long-name="Music Fetcher" level="support">
-<!-- collection is really a component, move down a directory -->
-<component name="musicfetcher_buld" filter="s60" long-name="Music Fetcher Build" introduced="^4" class="placeholder">
-<!-- <unit bldFile="musicfetcher" qt:proFile="musicfetcher.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-</collection>
-<collection name="musicplayer_app " long-name="Music Player Application" level="app">
-<!-- collection is really a component, move down a directory -->
-<component name="musicplayer_app_build" filter="s60" long-name="Music Player Application Build" introduced="^4" class="placeholder">
-<!-- <unit bldFile="app" qt:proFile="app.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-</collection>
-<collection name="mpviewplugins " long-name="Music Player View Plugins" level="plugins">
-<component name="mpcollectionviewplugin" filter="s60" long-name="MP Collection View Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpviewplugins/mpcollectionviewplugin/group"/>-->
-</component>
-<component name="mpplaybackviewplugin" filter="s60" long-name="MP Playback View Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpviewplugins/mpplaybackviewplugin/group"/>-->
-</component>
-</collection>
-<collection name="mpserviceplugins" long-name="Music Player Service Plugins" level="plugins">
-<component name="audioeffects" filter="s60" long-name="Audio Effects" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/audioeffects/group"/>-->
-</component>
-<component name="localaudio" filter="s60" long-name="Local Audio" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/localaudio/group"/>-->
-</component>
-<!-- Note: it's called SQLite, not SQLLite, just the one "L" -->
-<component name="mpxsqlitedbcommon" filter="s60" long-name="MPX SQLite Database Common" introduced="^4" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitedbcommon/group"/>-->
-</component>
-<component name="mpxsqlitedbplugin" filter="s60" long-name="MPX SQLite Database Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitedbplugin/group"/>-->
-</component>
-<component name="mpxsqlitepodcastdbplugin" filter="s60" long-name="MPX SQLlite Podcast Database Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
-</component>
-<component name="m3uplaylistplugin" filter="s60" long-name="M3U Playlist Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
-</component>
-</collection>
-<collection name="musicplayer_info" long-name="Music Player Apps Info" level="app">
-<component name="musicplayer_build" filter="s60" long-name="Music Player Build">
-<!-- should brak up into individual components -->
-<unit bldFile="app/musicplayer"/>
-</component>
-</collection>
-</block>
-<block name="radio" level="apps" long-name="Radio Apps" levels="engine ui">
-<collection name="radioengine" long-name="Radio Engine" level="engine">
-<component name="radioengineutils" filter="s60" long-name="Radio Engine Utils" introduced="^4">
-<unit bldFile="app/radio/radioengine/utils/group"/>
-</component>
-<component name="radioenginesettings" filter="s60" long-name="Radio Engine Settings" introduced="^4">
-<unit bldFile="app/radio/radioengine/settings/group"/>
-</component>
-<component name="radioengine_engine" filter="s60" long-name="Radio Engine" introduced="^4">
-<unit bldFile="app/radio/radioengine/engine/group"/>
-</component>
-</collection>
-<collection name="radioapp" long-name="Radio App" level="ui">
-<component name="radioenginewrapper" filter="s60" long-name="Radio Engine Wrapper" introduced="^4">
-<unit bldFile="app/radio/radioapp/radioenginewrapper"/>
-</component>
-<component name="radiopresetstorage" filter="s60" long-name="Radio Preset Storage" introduced="^4">
-<unit bldFile="app/radio/radioapp/radiopresetstorage"/>
-</component>
-<component name="radiouiengine" filter="s60" long-name="Radio UI Engine" introduced="^4">
-<unit bldFile="app/radio/radioapp/radiouiengine"/>
-</component>
-<component name="radiowidgets" filter="s60" long-name="Radio Widgets" introduced="^4">
-<unit bldFile="app/radio/radioapp/radiowidgets"/>
-</component>
-<component name="radioapplication" filter="s60" long-name="Radio Application" introduced="^4">
-<unit bldFile="app/radio/radioapp/radioapplication"/>
-</component>
-<component name="radio_rom" filter="s60" long-name="Radio ROM" introduced="^4">
-<unit bldFile="app/radio/rom/group"/>
-</component>
-</collection>
-</block>
-<block name="internetradio" level="apps" long-name="Internet Radio Apps" levels="engine server ui">
-<collection name="internetradio2_0" long-name="Internet Radio 2.0" level="ui">
-<!-- collection is really a component. Move down a dir -->
-<component name="internetradio2_0_build" long-name="Internet Radio 2.0 Build">
-<unit bldFile="app/internetradio/internetradio2.0/group"/>
-</component>
-</collection>
-<collection name="presetserver" long-name="Preset Server" level="server">
-<!-- collection is really a component. Move down a dir -->
-<component name="presetserver_build" long-name="Preset Server Build">
-<unit bldFile="app/internetradio/presetserver/group"/>
-</component>
-</collection>
-<collection name="qtinternetradio" long-name="Qt Internet Radio">
-<component name="qtinternetradio_build" long-name="Qt Internet Radio Build">
-<!-- Move down a dir or break into components-->
-<unit bldFile="app/internetradio/qtinternetradio"/>
-</component>
-</collection>
-</block>
-<block name="homescreen" level="apps" long-name="Home Screen Apps" levels="support task ss hs">
-<collection name="homescreen_info" long-name="Home Screen Info" level="support">
-<component name="homescreen_build" long-name="Homescreen Build">
-<!-- break this up properly into components -->
-<unit bldFile="app/homescreen"/>
-</component>
-</collection>
-<collection name="homescreen_test" long-name="Home Screen Test" level="support"/>
-<!-- fiill in details with broken up homescreen_build -->
-<collection name="homescreenapp" long-name="Home Screen Application" level="hs">
-<component name="hsutils" long-name="Home Screen Utils" introduced="^4"/>
-<component name="hsdomainmodel" long-name="HS Domain Model" introduced="^4"/>
-<component name="hs_runtimeplugins" long-name="HS Runtime Plugins" introduced="^4" plugin="Y"/>
-<component name="hs_serviceproviders" long-name="HS Service Providers" introduced="^4" plugin="Y"/>
-<component name="hs_stateplugins" long-name="HS State Plugins" introduced="^4" plugin="Y"/>
-<component name="hs_widgetplugins" long-name="HS Widget Plugins" introduced="^4" plugin="Y"/>
-<component name="hsapplication" long-name="Home Screen Application" introduced="^4"/>
-<component name="hshomescreenclientplugin" long-name="Home Screen Client Plugin" introduced="^4" plugin="Y"/>
-<component name="hsmenucontentpublish" long-name="HS Menu Content Publish" introduced="^4"/>
-</collection>
-<collection name="screensaverapp" long-name="Screen Saver Application" level="ss">
-<component name="snsrutils" long-name="Screen Saver Utils" introduced="^4"/>
-<component name="snsr_serviceproviders" long-name="Screen Saver Service Providers" introduced="^4" plugin="Y"/>
-<component name="snsr_stateproviders" long-name="Screen Saver State Providers" introduced="^4" plugin="Y"/>
-<component name="snsr_runtimeproviders" long-name="Screen Saver Runtime Providers" introduced="^4" plugin="Y"/>
-<component name="snsrapplication" long-name="Screen Saver Application" introduced="^4"/>
-<component name="screensaverproviders" long-name="Screen Saver Providers" introduced="^4" plugin="Y"/>
-</collection>
-<collection name="taskswitcherapp" long-name="Task Switcher Application" level="task">
-<component name="taskswitcherappecom" long-name="Task Switcher Application ECom" introduced="^4"/>
-<component name="tsserviceplugin" long-name="Task Switcher Service Plugin" introduced="^4" plugin="Y"/>
-<component name="ts_runtimeplugins" long-name="TS Runtime Plugins" introduced="^4" plugin="Y"/>
-<component name="tsapplication" long-name="Task Switcher Application" introduced="^4"/>
-</collection>
-</block>
-<block name="homescreentools" level="services" long-name="Home Screen Tools" levels="tool install">
-<collection name="dtdinstaller" long-name="DTD Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<!-- this needs to be built first, does build order need to be forced with filters? -->
-<component name="dtdinstaller_build" filter="s60,bldmefirst" long-name="DTD Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/dtdinstaller/group"/>
-</component>
-</collection>
-<collection name="themeinstaller" long-name="Theme Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="themeinstaller_build" filter="s60" long-name="Theme Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/themeinstaller/group"/>
-</component>
-</collection>
-<collection name="widgettools" long-name="Widget Tools" level="install">
-<component name="hspluginpreinstaller" filter="s60" long-name="HS Plugin Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/hspluginspreinstaller/group"/>
-</component>
-<component name="wrtwidgetpreinstaller" filter="s60" long-name="WRT Widget Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
-</component>
-</collection>
-</block>
-<block name="webuis" level="services" long-name="Web UIs" levels="plugin app">
-<collection name="browserui" long-name="Browser UI" level="app">
-<component name="browser" filter="s60" long-name="Browser">
-<unit bldFile="app/webuis/browserui/browser/group"/>
-</component>
-<component name="operatormenu" filter="s60" long-name="Browser Operator Menu">
-<unit bldFile="app/webuis/browserui/operatormenu/group"/>
-</component>
-<component name="videoservices" filter="s60" long-name="Browser Video Services">
-<unit bldFile="app/webuis/browserui/videoservices/group"/>
-</component>
-</collection>
-<collection name="browserplugins" long-name="Browser Plugins" level="plugin">
-<component name="browsersysteminfoplugin" filter="s60" long-name="Browser System Info Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsersysteminfoplugin/group"/>-->
-</component>
-<component name="browsergpsplugin" filter="s60" long-name="Browser GPS Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsergpsplugin/group"/>-->
-</component>
-<component name="browseraudiovideoplugin" filter="s60" long-name="Browser Audio Video Plugin" plugin="Y">
-<unit bldFile="app/webuis/browserplugins/browseraudiovideoplugin/group"/>
-</component>
-<component name="browserplugins_build" filter="s60" long-name="Browser Plugins Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="app/webuis/browserplugins/group"/>
-</component>
-</collection>
-<collection name="pushmtm" long-name="Push MTM" level="plugin">
-<component name="pushmtm_help" filter="s60" long-name="Push MTM Help">
-<unit bldFile="app/webuis/pushmtm/help/group"/>
-</component>
-<component name="plugins" filter="s60" long-name="Push MTM Plugins" plugin="Y">
-<unit bldFile="app/webuis/pushmtm/plugins/group"/>
-</component>
-<component name="pushmtm_build" filter="s60" long-name="Push MTM Build">
-<!-- Some content is at collection level and some is at comopnent level. Either make this a single
- component and move it down a diretcory, or make separate independent components in this collection -->
-<unit bldFile="app/webuis/pushmtm/group"/>
-</component>
-</collection>
-</block>
-<block name="jrt" level="services" long-name="Java Runtime" levels="util generic rt ui">
-<collection name="jrt_plat" long-name="JRT Platform Interfaces" level="ui">
-<component name="java_registry_api" long-name="Java Registry API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_registry_api/build"/>
-</component>
-<component name="java_env_info_api" long-name="Java Environment Info API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_env_info_api/build"/>
-</component>
-<component name="java_debug_api" long-name="Java Debug API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_debug_api/build"/>
-</component>
-</collection>
-<collection name="java_stubs" long-name="Java Stubs" level="util">
-<!-- uncomment all components when configuration is in place. Currently #included from jrt_build -->
-<component name="javadrmutils" long-name="Java DRM Utils" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtdrmutils/group"/>-->
-</component>
-<component name="javaenvinfo" long-name="Java Environment Info" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtenvinfo/group"/>-->
-</component>
-<component name="javaregistry" filter="s60,sf_build" long-name="Java Registry" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtregistry/clientserver/client/group"/>-->
-</component>
-<component name="java_stubs_build" filter="s60,sf_build" long-name="Java Stubs ROM" class="placeholder">
-<!-- Remove the #includes and rename JRT ROM-->
-<!--<unit bldFile="java_stubs/group"/>-->
-</component>
-</collection>
-<collection name="jrt_info" long-name="JRT Info" level="rt">
-<component name="jrt_build" filter="s60" long-name="JRT Build">
-<!-- needed for __JAVA_STUBS condition -->
-<unit bldFile="app/jrt/group"/>
-</component>
-</collection>
-</block>
-<block name="conntools" level="services" long-name="Connectivity Tools" levels="config app">
-<collection name="nettools" long-name="Net Tools" level="app">
-<component name="conntest" filter="s60" long-name="Connection Test" purpose="development">
-<unit bldFile="app/conntools/nettools/conntest/group"/>
-</component>
-</collection>
-<collection name="emulatorlan" long-name="Emulator LAN" level="config">
-<!-- component is actually a colleciton, should be moved down a directory -->
-<component name="emulatorlan_build" filter="s60" long-name="Emulator LAN Build" purpose="development" class="config">
-<unit bldFile="app/conntools/emulatorlan/group"/>
-</component>
-</collection>
-</block>
-<block name="rndtools" level="services" long-name="R&D tools" levels="support generic test util">
-<collection name="creator" long-name="Creator" level="support">
-<!-- collection is really a component. Should move down a directory -->
-<component name="creator_build" filter="s60" long-name="Creator Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/creator/group"/>
-</component>
-</collection>
-<collection name="filebrowser" long-name="File Browser" level="util">
-<!-- consider collapsing into a single component -->
-<component name="fileopserver" filter="s60" long-name="File Operations Server" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
-</component>
-<component name="fileopclient" filter="s60" long-name="File Operations Client" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!--<unit bldFile="filebrowser/fileopclient/group"/>-->
-</component>
-<component name="filebrowser_build" filter="s60" long-name="File Browser Application" purpose="development" class="tool">
-<!-- Need to make this a self-contained component by removing #includes. Can only do when configuration is in place-->
-<unit bldFile="app/rndtools/filebrowser/group"/>
-</component>
-</collection>
-<collection name="launcher" long-name="Launcher" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="launcher_build" filter="s60" long-name="Launcher Utility" purpose="development" class="tool">
-<unit bldFile="app/rndtools/launcher/group"/>
-</component>
-</collection>
-<collection name="loadgen" long-name="Load Generator" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="loadgen_build" filter="s60" long-name="Load Generator Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/loadgen/group"/>
-</component>
-</collection>
-<collection name="perfmon" long-name="Performance Monitor" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="perfmon_build" filter="s60" long-name="Performance Monitor Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/perfmon/group"/>
-</component>
-</collection>
-<collection name="screengrabber" long-name="Screen Grabber" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="screengrabber_build" filter="s60" long-name="ScreenGrabber" purpose="development" class="tool">
-<unit bldFile="app/rndtools/screengrabber/group"/>
-</component>
-</collection>
-<collection name="stifui" long-name="STIF UI" level="generic">
-<component name="stifui_stifui" filter="s60" long-name="STIF UI" purpose="development">
-<unit bldFile="app/rndtools/stifui/stifui/group"/>
-</component>
-<component name="uitestserverstarter" filter="s60" long-name="UI Test Server Starter" purpose="development">
-<unit bldFile="app/rndtools/stifui/uitestserverstarter/group"/>
-</component>
-<component name="stifui_build" filter="s60" long-name="STIF UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/stifui/group"/>
-</component>
-</collection>
-<collection name="memspyui" long-name="Memspy UI" level="generic">
-<!-- collection is really a component. Should move down a directory -->
-<component name="memspyui_build" filter="s60" long-name="Memspy UI Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/memspyui/group"/>
-</component>
-</collection>
-<collection name="htiui" long-name="Harmonized Test Interface UI" level="generic">
-<component name="HtiCommPlugins" filter="s60" long-name="HTI Comm Plugins" purpose="development" plugin="Y">
-<unit bldFile="app/rndtools/htiui/HtiCommPlugins/HtiBtCommPlugin/group"/>
-</component>
-<component name="HtiServicePlugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- can only have a single unit. Should #include from a common bld.inf file -->
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiFtpBackupFake/group"/>
-</component>
-<component name="htidevicereboot" filter="s60" long-name="HTI Device Reboot" purpose="development">
-<unit bldFile="app/rndtools/htiui/htidevicereboot/group"/>
-</component>
-<component name="htistartupwait" filter="s60" long-name="HTI Startup Wait" purpose="development">
-<unit bldFile="app/rndtools/htiui/htistartupwait/group"/>
-</component>
-<component name="htiadmin" filter="s60" long-name="HTI Admin" purpose="development">
-<unit bldFile="app/rndtools/htiui/htiadmin/group"/>
-</component>
-<component name="htiui_build" filter="s60" long-name="HTI UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/htiui/group"/>
-</component>
-</collection>
-</block>
-<block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools if ui">
-<collection name="csxhelp" long-name="Context Sensitive Extended Help" level="if">
-<!-- this is really a component. Should move it down a directory -->
-<component name="csxhelp_build" filter="s60" long-name="Context Sensitive Extended Help Build">
-<unit bldFile="app/helps/csxhelp/group"/>
-</component>
-</collection>
-<collection name="symhelp" long-name="Symbian Help" level="eng">
-<component name="helpmodel" long-name="Help" introduced="6.0" purpose="optional">
-<unit bldFile="app/helps/symhelp/helpmodel/group" mrp="app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
-</component>
-</collection>
-<collection name="helps_info" long-name="Help Apps Info" level="ui">
-<component name="helps_metadata" long-name="Help Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/helps/helps_info/helps_metadata/helps_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
-<collection name="buildverification" long-name="Build Verification" level="services">
-<component name="autosmoketest" long-name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
-<unit bldFile="app/techview/buildverification/autosmoketest/Group" mrp="app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
-</component>
-<component name="smoketest" long-name="Smoke Test" filter="gt" purpose="development">
-<unit bldFile="app/techview/buildverification/smoketest/Group" mrp="app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
-</component>
-</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="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"/>
-<collection name="installationapps" long-name="Installation Apps" level="apps2"/>
-<collection name="messagingapps" long-name="Messaging Apps" level="apps2"/>
-<collection name="telephonyapps" long-name="Telephony Apps" level="apps1"/>
-<collection name="networkingapps" long-name="Networking Apps" level="apps1"/>
-<collection name="networkingutils" long-name="Networking Utils" level="utils"/>
-<collection name="shortlinkapps" long-name="Shortlink Apps" level="apps1"/>
-<collection name="testapps" long-name="Test Apps" level="utils"/>
-<collection name="avapps" long-name="A/V Apps" level="apps3"/>
-<collection name="toolkit" long-name="Toolkit" level="utils"/>
-<collection name="techview_info" long-name="Techview Info" level="apps3">
-<component name="techview_metadata" long-name="Techview Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/techview/techview_info/techview_metadata/techview_metadata.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
--- a/symbian4/single/sysdefs/auto/model_20100413110255_709e3d74b072.xml Wed May 05 12:21:47 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9240 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a package or prebuilt -->
-<!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) "N"
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile may someday be removed in favour of mrp -->
-<!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="low mw high">
-<block name="stubs" level="high" long-name="Stubs" levels="stub">
-<collection name="s60_stubs" level="stub">
-<component name="audiostubs" long-name="Audio Stubs">
-<unit bldFile="adaptation/stubs/audiostubs/group"/>
-</component>
-<component name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaptation Stub">
-<unit bldFile="adaptation/stubs/btaudioadaptation_stub/group"/>
-</component>
-<component name="drm_stubs" long-name="DRM Stubs">
-<unit bldFile="adaptation/stubs/drm_stubs/group"/>
-</component>
-<component name="ocrsrv_stub" long-name="OCR Services Stub">
-<unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
-</component>
-<component name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation">
-<unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
-</component>
-<component name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" plugin="Y">
-<unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
-</component>
-<component name="srsfenginestub" long-name="SRSF Engine Stub">
-<unit bldFile="adaptation/stubs/srsfenginestub/group"/>
-</component>
-<component name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub">
-<unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
-</component>
-<component name="systemswstubs" long-name="System Software Stubs">
-<unit bldFile="adaptation/stubs/systemswstubs/group"/>
-</component>
-<component name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" plugin="Y">
-<unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
-</component>
-<component name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub">
-<unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
-<collection name="omap3530" long-name="OMAP 3530" level="hw-if">
-<component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530" mrp="adaptation/beagleboard/omap3530/base_beagle.mrp"/>
-</component>
-<component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/kernel"/>
-</component>
-<component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/beagleboard"/>
-</component>
-</collection>
-</block>
-<block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
-<collection name="qemu_baseport" long-name="Baseport" level="hw-if">
-<component name="syborg" long-name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/qemu/baseport/syborg" mrp="adaptation/qemu/baseport/syborg/syborg.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
-<collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
-<component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
-<unit bldFile="os/kernelhwsrv/brdbootldr/ubootldr" mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
-</component>
-</collection>
-<collection name="bsptemplate" long-name="Board Support Package Template" level="hw-if">
-<component name="asspandvariant" long-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 name="kernel" long-name="Kernel Architecture" level="adaptation">
-<component name="eka" long-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 name="kerneltest" long-name="Kernel Test" level="hw-if">
-<component name="e32utils" long-name="E32 Utilities" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32utils/group" mrp="os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/>
-</component>
-<component name="e32test" long-name="E32 Tests" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32test/group" mrp="os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
-</component>
-<component name="f32test" long-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 name="ldds" long-name="Logical Device Drivers" level="adaptation">
-<component name="ethernetldd" long-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 name="audioldd" long-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>
-<component name="serialldd" long-name="Serial Port Drivers" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
-</component>
-<component name="legacydrivers" long-name="Legacy Drivers" purpose="optional">
-<unit mrp="os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
-</component>
-<component name="locmedia" long-name="Local Media Subsystem" introduced="8.1b" purpose="mandatory">
-<!-- these are LDDs for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
-</component>
-<component name="runmodedebugger" long-name="Run Mode Debugger" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/debug/group" mrp="os/kernelhwsrv/kernel/eka/drivers/debug/group/base_e32_drivers_debug.mrp"/>
-</component>
-<component name="btrace" long-name="Kernel Trace Tool" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/trace" mrp="os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
-</component>
-<component name="cameraldd" long-name="Camera Drivers" introduced="^3" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/camerasc" mrp="os/kernelhwsrv/kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
-</component>
-<component name="displayldd" long-name="Display Drivers" introduced="^3" purpose="optional">
-<!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/display" mrp="os/kernelhwsrv/kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
-</component>
-<component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
-</component>
-<component name="usbdescriptors" long-name="USB Descriptors" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors" mrp="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors/base_drivers_usbdescriptors.mrp"/>
-</component>
-<component name="usbdi_utils" long-name="USB DI Utils" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils" mrp="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils/base_drivers_usbdi_utils.mrp"/>
-</component>
-</collection>
-<collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
-<component name="mediadrivers" long-name="Media Drivers" purpose="optional">
-<!-- these are for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/media" mrp="os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
-</component>
-<component name="genericboardsupport" long-name="Generic Board Support" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
-</component>
-</collection>
-<collection name="userlibandfileserver" long-name="User Library and File Server" level="framework">
-<component name="euser" long-name="User Library" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/euser" mrp="os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
-</component>
-<component name="compsupp" long-name="Compiler Runtime Support" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/compsupp" mrp="os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
-</component>
-<component name="fileserver" long-name="File Server" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
-</component>
-<component name="estart" long-name="Base Starter" filter="gt" purpose="optional">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
-</component>
-<component name="domainmgr" long-name="Domain Manager" introduced="8.1b" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
-</component>
-</collection>
-<collection name="filesystems" long-name="File Systems" level="framework">
-<component name="romfs" long-name="ROM File System" filter="gt" purpose="optional" plugin="Y">
-<unit mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
-</component>
-<component name="rofs" long-name="ROFS" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
-</component>
-<component name="usbmsfs" long-name="USB Mass Storage File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
-</component>
-<component name="usbhostmssrv" long-name="USB Host Mass Storage Server" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage/base_f32_shostmassstorage.mrp"/>
-</component>
-<component name="fat32fs" long-name="FAT32 File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
-</component>
-<component name="fatfs" long-name="FAT File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
-</component>
-<component name="compfs" long-name="Composite File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
-</component>
-</collection>
-<collection name="halservices" long-name="HAL Services" level="framework">
-<component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
-<unit bldFile="os/kernelhwsrv/halservices/hal" mrp="os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
-</component>
-</collection>
-<collection name="textmodeshell" long-name="Text Mode Shell" level="test">
-<component name="e32wsrv" long-name="Text Window Server" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/ewsrv" mrp="os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
-</component>
-<component name="textshell" long-name="Text Shell" filter="gt" purpose="development">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
-</component>
-</collection>
-<collection name="baseapitest" long-name="Base API Tests" level="test"/>
-<collection name="kernelhwsrv_info" long-name="Kernel and Hardware Services Info" level="test">
-<component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 config">
-<collection name="emulator" long-name="Emulator" level="bsp">
-<component name="emulatorbsp" long-name="Emulator BSP" purpose="optional">
-<unit bldFile="os/boardsupport/emulator/emulatorbsp" mrp="os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
-</component>
-</collection>
-<collection name="haitest" long-name="HAI Test Suites" level="test">
-<component name="bspsvs" long-name="BSP Verification Suite" introduced="^2" purpose="development">
-<unit mrp="os/boardsupport/haitest/bspsvs/group/bspsvs.mrp"/>
-</component>
-</collection>
-<collection name="boardsupport_info" long-name="Board Support Info" level="config">
-<component name="boardsupport_metadata" long-name="Board Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/boardsupport/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
-<collection name="bldsystemtools" long-name="Build System Tools" level="bld">
-<component name="sysdeftools" long-name="System Definition Tools" purpose="development" introduced="^2">
-<unit mrp="os/buildtools/bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
-</component>
-<component name="commonbldutils" long-name="Common Utils" purpose="development">
-<unit mrp="os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
-</component>
-</collection>
-<collection name="toolsandutils" long-name="Tools and Utils" level="mw">
-<component name="productionbldtools" long-name="Production Build Tools" filter="gt" purpose="development">
-<unit mrp="os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
-</component>
-<component name="e32tools" long-name="E32 Tools" deprecated="^2" purpose="development" class="PC">
-<unit bldFile="os/buildtools/toolsandutils/e32tools/group" mrp="os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
-</component>
-<component name="autotest" long-name="Autotest" purpose="development">
-<unit bldFile="os/buildtools/toolsandutils/autotest/group" mrp="os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
-</component>
-</collection>
-<collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
-<component name="e32toolp" long-name="E32 Perl Tools" purpose="development" filter="sf_build" class="PC">
-<unit mrp="os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="os/buildtools/sbsv1_os/e32toolp/group"/>
-</component>
-</collection>
-<collection name="imgtools_os" long-name="Image Tools" level="fw">
-<component name="romkiteka2" long-name="ROMKIT EKA2" deprecated="^2" purpose="development">
-<unit bldFile="os/buildtools/imgtools_os/romkiteka2/group" mrp="os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
-</component>
-</collection>
-<collection name="misccomponents" long-name="Misc Components" level="mw">
-<component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt" purpose="development">
-<unit bldFile="os/buildtools/misccomponents/emulatorlauncher/group" mrp="os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
-</component>
-</collection>
-<collection name="buildtools_info" long-name="Build Tools Info" level="ui">
-<component name="buildtools_metadata" long-name="Build Tools Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/buildtools/buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
-<collection name="ossrv_pub" long-name="Generic OS Services Public Interfaces" level="utilities">
-<component name="boost_apis" long-name="Boost APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/boost_apis/group"/>
-</component>
-<component name="cpp_wrappers" long-name="Cpp wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cpp_wrappers/group"/>
-</component>
-<component name="character_type_apis" long-name="Character Type APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/character_type_apis/group"/>
-</component>
-<component name="compiler_specific_runtime_support" long-name="Compiler Specific Runtime Support" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/compiler_specific_runtime_support/group"/>
-</component>
-<component name="ossrv_configuration_api" long-name="Generic OS Services Configuration API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/configuration/group"/>
-</component>
-<component name="crypto_authentication_codes_and_hash_functions_api" long-name="Crypto Authentication Codes and Hash Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
-</component>
-<component name="crypto_auxillary_functions_api" long-name="Crypto Auxillary Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_auxillary_functions_api/group"/>
-</component>
-<component name="crypto_certificates_api" long-name="Crypto Certificates API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_certificates_api/group"/>
-</component>
-<component name="crypto_inputoutput_and_data_encoding_api" long-name="Crypto Input/Output and Data Encoding API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
-</component>
-<component name="crypto_public_key_cryptography_and_key_agreement_api" long-name="Crypto Public Key Cryptography and Key Agreement API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
-</component>
-<component name="crypto_symmetric_ciphers_api" long-name="Crypto Symmetric Ciphers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_symmetric_ciphers_api/group"/>
-</component>
-<component name="crypto_utility_functions_api" long-name="Crypto Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_utility_functions_api/group"/>
-</component>
-<component name="cryptogaphy_related_api" long-name="Cryptogaphy Related API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cryptogaphy_related_api/group"/>
-</component>
-<component name="ossrv_debug_api" long-name="Generic OS Services Debug API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/debug/group"/>
-</component>
-<component name="ossrv_exceptions_api" long-name="Generic OS Services Exceptions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/exceptions/group"/>
-</component>
-<component name="gboxed" long-name="GBoxed API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gboxed/group"/>
-</component>
-<component name="glib_arrays" long-name="Glib Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_arrays/group"/>
-</component>
-<component name="glib_asynchronous_queues" long-name="Glib Asynchronous Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_asynchronous_queues/group"/>
-</component>
-<component name="glib_atomic_operations" long-name="Glib Atomic Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_atomic_operations/group"/>
-</component>
-<component name="glib_automatic_string_completion" long-name="Glib Automatic String Completion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_automatic_string_completion/group"/>
-</component>
-<component name="glib_balanced_binary_trees" long-name="Glib Balanced Binary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_balanced_binary_trees/group"/>
-</component>
-<component name="glib_basic_types" long-name="Glib Basic Types API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_basic_types/group"/>
-</component>
-<component name="glib_caches" long-name="Glib Caches API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_caches/group"/>
-</component>
-<component name="glib_character_set_conversion" long-name="Glib Character Set Conversion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_character_set_conversion/group"/>
-</component>
-<component name="glib_closures" long-name="Glib Closures API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_closures/group"/>
-</component>
-<component name="glib_commandline_option_parser" long-name="Glib Command Line Option Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_commandline_option_parser/group"/>
-</component>
-<component name="glib_datasets" long-name="Glib Datasets API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_datasets/group"/>
-</component>
-<component name="glib_date_and_time_functions" long-name="Glib Date and Time Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_date_and_time_functions/group"/>
-</component>
-<component name="glib_doubleended_queues" long-name="Glib Double-ended Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doubleended_queues/group"/>
-</component>
-<component name="glib_doublylinked_lists" long-name="Glib Doubly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doublylinked_lists/group"/>
-</component>
-<component name="glib_dynamic_loading_of_modules" long-name="Glib Dynamic Loading of Modules API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_dynamic_loading_of_modules/group"/>
-</component>
-<component name="glib_enums_and_flags" long-name="Glib Enums and Flags API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_enums_and_flags/group"/>
-</component>
-<component name="glib_error_reporting" long-name="Glib Error Reporting API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_error_reporting/group"/>
-</component>
-<component name="glib_file_utilities" long-name="Glib File Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_file_utilities/group"/>
-</component>
-<component name="glib_generic_values" long-name="Glib Generic Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_generic_values/group"/>
-</component>
-<component name="glib_globstyle_pattern_matching" long-name="Glib Glob-Style Pattern Matching API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_globstyle_pattern_matching/group"/>
-</component>
-<component name="glib_hash_tables" long-name="Glib Hash Tables API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hash_tables/group"/>
-</component>
-<component name="glib_hook_functions" long-name="Glib Hook Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hook_functions/group"/>
-</component>
-<component name="glib_internationalization" long-name="Glib Internationalization API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_internationalization/group"/>
-</component>
-<component name="glib_io_channels" long-name="Glib I/O Channels API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_io_channels/group"/>
-</component>
-<component name="glib_keyvalue_file_parser" long-name="Glib Key-Value File Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_keyvalue_file_parser/group"/>
-</component>
-<component name="glib_lexical_scanner" long-name="Glib Lexical Scanner API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_lexical_scanner/group"/>
-</component>
-<component name="glib_main_event_loop" long-name="Glib Main Event Loop API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_main_event_loop/group"/>
-</component>
-<component name="glib_memory_allocation" long-name="Glib Memory Allocation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_allocation/group"/>
-</component>
-<component name="glib_memory_slices" long-name="Glib Memory Slices API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_slices/group"/>
-</component>
-<component name="glib_message_logging" long-name="Glib Message Logging API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_message_logging/group"/>
-</component>
-<component name="glib_miscellaneous_utility_functions" long-name="Glib Miscellaneous Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_miscellaneous_utility_functions/group"/>
-</component>
-<component name="glib_nary_trees" long-name="Glib N-ary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_nary_trees/group"/>
-</component>
-<component name="glib_parameters_and_values" long-name="Glib Parameters and Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_parameters_and_values/group"/>
-</component>
-<component name="glib_quarks" long-name="Glib Quarks API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_quarks/group"/>
-</component>
-<component name="glib_random_numbers" long-name="Glib Random Numbers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_random_numbers/group"/>
-</component>
-<component name="glib_relations_and_tuples" long-name="Glib Relations and Tuples API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_relations_and_tuples/group"/>
-</component>
-<component name="glib_shellrelated_utilities" long-name="Glib Shell-related Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_shellrelated_utilities/group"/>
-</component>
-<component name="glib_signals" long-name="Glib Signals API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_signals/group"/>
-</component>
-<component name="glib_simple_xml_subset_parser" long-name="Glib Simple XML Subset Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_simple_xml_subset_parser/group"/>
-</component>
-<component name="glib_singlylinked_lists" long-name="Glib Singly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_singlylinked_lists/group"/>
-</component>
-<component name="glib_spawning_processes" long-name="Glib Spawning Processes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_spawning_processes/group"/>
-</component>
-<component name="glib_standard_macros" long-name="Glib Standard Macros API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_standard_macros/group"/>
-</component>
-<component name="glib_string_utility_functions" long-name="Glib String Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_string_utility_functions/group"/>
-</component>
-<component name="glib_strings" long-name="Glib Strings API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_strings/group"/>
-</component>
-<component name="glib_thread_pools" long-name="Glib Thread Pools API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_thread_pools/group"/>
-</component>
-<component name="glib_threads" long-name="Glib Threads API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_threads/group"/>
-</component>
-<component name="glib_timers" long-name="Glib Timers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_timers/group"/>
-</component>
-<component name="glib_unicode_manipulation" long-name="Glib Unicode Manipulation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_unicode_manipulation/group"/>
-</component>
-<component name="glib_value_arrays" long-name="Glib Value Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_value_arrays/group"/>
-</component>
-<component name="glib_varargs_value_collection" long-name="Glib Varargs Value Collection API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_varargs_value_collection/group"/>
-</component>
-<component name="gobject" long-name="GObject API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gobject/group"/>
-</component>
-<component name="gparamspec" long-name="GParamSpec API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gparamspec/group"/>
-</component>
-<component name="gtype" long-name="GType API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtype/group"/>
-</component>
-<component name="gtypemodule" long-name="GTypeModule API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypemodule/group"/>
-</component>
-<component name="gtypeplugin" long-name="GTypePlugin API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypeplugin/group"/>
-</component>
-<component name="io_stream_api" long-name="I/O stream API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/io_stream_api/group"/>
-</component>
-<component name="localization_function_api" long-name="Localization Function API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/localization_function_api/group"/>
-</component>
-<component name="math_operations_api" long-name="Math Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/math_operations_api/group"/>
-</component>
-<component name="ossrv_memory_api" long-name="Generic OS Services Memory API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/memory/group"/>
-</component>
-<component name="no_namespace_headers" long-name="No Namespace Headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/no_namespace_headers/group"/>
-</component>
-<component name="openc_headers" long-name="OpenC headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_headers/group"/>
-</component>
-<component name="openc_wrappers" long-name="OpenC wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_wrappers/group"/>
-</component>
-<component name="ssl_general_api" long-name="SSL General API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_general_api/group"/>
-</component>
-<component name="ssl_protocol_methods_api" long-name="SSL Protocol Methods API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_protocol_methods_api/group"/>
-</component>
-<component name="standard_compressiondecompression_api" long-name="Standard Compression/Decompression API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/standard_compressiondecompression_api/group"/>
-</component>
-<component name="stl" long-name="STL API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/stl/group"/>
-</component>
-<component name="thread_api" long-name="Thread API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/thread_api/group"/>
-</component>
-<component name="type_attributes" long-name="Type Attributes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/type_attributes/group"/>
-</component>
-<component name="typeinfo" long-name="Type Info API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/typeinfo/group"/>
-</component>
-<component name="utility_apis" long-name="Utility APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/utility_apis/group"/>
-</component>
-<component name="wide_character_classapis" long-name="Wide character class/apis" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/wide_character_classapis/group"/>
-</component>
-<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">
-<unit bldFile="os/ossrv/ossrv_pub/dbus-glib/group"/>
-</component>
-</collection>
-<collection name="ossrv_plat" long-name="Generic OS Services Platform Interfaces" level="utilities">
-<component name="libutils_apis" long-name="Utility Library APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_plat/libutils/group"/>
-</component>
-</collection>
-<collection name="stdlibs" long-name="Standard Libraries" level="translation">
-<component name="libz" filter="s60" long-name="Z Compression Library">
-<unit bldFile="os/ossrv/stdlibs/libz/group"/>
-</component>
-<component name="libcrypt" filter="s60" long-name="Crypt Library">
-<unit bldFile="os/ossrv/stdlibs/libcrypt/group"/>
-</component>
-</collection>
-<collection name="ssl" long-name="SSL" level="data-services">
-<component name="libcrypto" filter="s60" long-name="Crypto Library">
-<unit bldFile="os/ossrv/ssl/libcrypto/group"/>
-</component>
-<component name="libssl" filter="s60" purpose="development" long-name="SSL Library">
-<unit bldFile="os/ossrv/ssl/libssl/group"/>
-</component>
-</collection>
-<collection name="glib" long-name="GLib" level="utilities">
-<component name="glibbackend" filter="s60" long-name="GLib Backend">
-<unit bldFile="os/ossrv/glib/build/symbian/glibbackend/group"/>
-<!-- Move to here: <unit bldFile="glib/glibbackend/group"/> -->
-</component>
-<component name="libglib" filter="s60" long-name="GLib Library">
-<unit bldFile="os/ossrv/glib/build/symbian/glib/group"/>
-<!-- Move to here: <unit bldFile="glib/libglib/group"/> -->
-</component>
-<component name="libgthread" filter="s60" long-name="Libg Thread">
-<unit bldFile="os/ossrv/glib/build/symbian/gthread/group"/>
-<!-- Move to here: <unit bldFile="glib/libgthread/group"/> -->
-</component>
-<component name="libgmodule" filter="s60" long-name="Libg Module">
-<unit bldFile="os/ossrv/glib/build/symbian/gmodule/group"/>
-<!-- Move to here: <unit bldFile="glib/libgmodule/group"/> -->
-</component>
-<component name="libgobject" filter="s60" long-name="Libg Object">
-<unit bldFile="os/ossrv/glib/build/symbian/gobject/group"/>
-<!-- Move to here: <unit bldFile="glib/libgobject/group"/> -->
-</component>
-</collection>
-<collection name="stdcpp" long-name="C++ Standard Library" level="translation">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="stdcpp_build" filter="s60" long-name="Stdcpp">
-<unit bldFile="os/ossrv/stdcpp/group"/>
-</component>
-</collection>
-<collection name="ofdbus" long-name="Open Foundation D-Bus" level="utilities">
-<component name="dbus" filter="s60" long-name="D-Bus">
-<unit bldFile="os/ossrv/ofdbus/dbus/group"/>
-</component>
-<component name="dbus-glib" filter="s60" long-name="D-Bus GLib">
-<unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
-</component>
-<component name="ofdbus_rom" filter="s60" long-name="D-Bus ROM">
-<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory
- Consider moving IBY file to one of the above as well and removing this component entirely -->
-<unit bldFile="os/ossrv/ofdbus/group"/>
-</component>
-</collection>
-<collection name="utilitylibraries" long-name="Utility Libraries" level="encoding">
-<component name="libutils" filter="s60" long-name="Utility Library">
-<unit bldFile="os/ossrv/utilitylibraries/libutils/group"/>
-</component>
-</collection>
-<collection name="genericservices" long-name="Generic Services" level="utilities">
-<component name="s60compatibilityheaders" long-name="S60 Compatibility Headers" filter="gt" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp" version="tb101sf"/>
-</component>
-<component name="mimerecognitionfw" long-name="MIME Recognition Framework" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/mimerecognitionfw/group" mrp="os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
-</component>
-<component name="systemagent" long-name="System Agent" introduced="9.0" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/systemagent/group" mrp="os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
-</component>
-<component name="taskscheduler" long-name="Task Scheduler" introduced="6.0" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/taskscheduler/group" mrp="os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
-</component>
-<component name="activebackupclient" long-name="Active Backup Client" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/activebackupclient/group" mrp="os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
-</component>
-<component name="syslibsdocs" long-name="Syslibs Documentation" purpose="development" class="doc">
-<unit mrp="os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
-</component>
-<component name="httputils" long-name="HTTP Utilities Library" introduced="6.2" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/httputils/group" mrp="os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
-</component>
-</collection>
-<collection name="syslibsapitest" long-name="SysLibs API Tests" level="utilities"/>
-<collection name="compressionlibs" long-name="Compression Libraries" level="data-services">
-<component name="ziplib" long-name="Zip Compression Library" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/ossrv/compressionlibs/ziplib/group" mrp="os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
-</component>
-</collection>
-<collection name="genericopenlibs" long-name="Generic Open Libraries" level="translation">
-<component name="cstdlib" long-name="C Standard Library" introduced="ER5" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/cstdlib/group" mrp="os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
-</component>
-<component name="cppstdlib" long-name="C++ Standard Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/cppstdlib/group" mrp="os/ossrv/genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
-</component>
-<component name="openenvcore" long-name="Open Environment Core" introduced="^2" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/openenvcore/group" mrp="os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
-</component>
-<component name="pluggableauthenticationmodulefw" long-name="Pluggable Authentication Module Framework" introduced="^4" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/pluggableauthenticationmodulefw/group" mrp="os/ossrv/genericopenlibs/pluggableauthenticationmodulefw/group/oeaddons_libpam.mrp"/>
-</component>
-<component name="posixrealtimeextensions" long-name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/posixrealtimeextensions/group" mrp="os/ossrv/genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
-</component>
-<component name="liboil" long-name="Liboil" introduced="^4" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/liboil/group" mrp="os/ossrv/genericopenlibs/liboil/group/oeaddons_liboil.mrp"/>
-</component>
-</collection>
-<collection name="lowlevellibsandfws" long-name="Low Level Libraries and Frameworks" level="app-libs">
-<component name="pluginfw" long-name="Plugin Framework" introduced="6.2" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp" version="3"/>
-</component>
-<component name="apputils" long-name="Application Utilities" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/apputils/group" mrp="os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
-</component>
-<component name="genericusabilitylib" long-name="Generic Usability Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/genericusabilitylib/group" mrp="os/ossrv/lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
-</component>
-</collection>
-<collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
-<component name="ossrv_build" filter="s60" long-name="Generic OS Services Build">
-<!-- exports should be moved to individual components -->
-<unit bldFile="os/ossrv/group"/>
-</component>
-<component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="featuremgmt" long-name="Feature Management" level="framework">
-<component name="featuremgr" long-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 name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/persistentdata/featuremgmt/featureregistry/group" mrp="os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
-</component>
-</collection>
-<collection name="loggingservices" long-name="Logging Services" level="server">
-<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">
-<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">
-<unit bldFile="os/persistentdata/loggingservices/rfilelogger/group" mrp="os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
-</component>
-</collection>
-<collection name="traceservices" long-name="Trace Services" level="server">
-<component name="commsdebugutility" long-name="Comms Debug Utility" introduced="7.0s" purpose="optional">
-<unit bldFile="os/persistentdata/traceservices/commsdebugutility/group" mrp="os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
-</component>
-<component name="tracefw" long-name="Trace Framework" introduced="9.2" purpose="development">
-<unit bldFile="os/persistentdata/traceservices/tracefw/ulogger/group" mrp="os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
-</component>
-</collection>
-<collection name="persistentstorage" long-name="Persistent Storage" level="framework">
-<component name="store" long-name="Store" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/store/group" mrp="os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
-</component>
-<component name="dbms" long-name="DBMS" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/dbms/group" mrp="os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
-</component>
-<component name="centralrepository" long-name="Central Repository" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/persistentdata/persistentstorage/centralrepository/group" mrp="os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
-</component>
-<component name="sql" long-name="SQL" introduced="9.3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sql/GROUP" mrp="os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
-</component>
-<component name="sqlite3api" long-name="SQLite 3 API" introduced="^3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sqlite3api/GROUP" mrp="os/persistentdata/persistentstorage/sqlite3api/GROUP/syslibs_sqlite3.mrp"/>
-</component>
-</collection>
-<collection name="persistentdata_info" long-name="Persistent Data Services Info" level="app-if">
-<component name="persistentdata_metadata" long-name="Persistent Data Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/persistentdata/persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
-<component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
-</component>
-<component name="common_platform_security_definitions_api" long-name="Common Platform Security Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group"/>
-</component>
-<component name="feature_discovery_api" long-name="Feature Discovery API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/group"/>
-</component>
-<component name="platform_environment_api" long-name="Platform Environment API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_environment_api/group"/>
-</component>
-<component name="sensor_channel_api" long-name="Sensor Channel API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_channel_api/group"/>
-</component>
-<component name="sensor_definitions_api" long-name="Sensor Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_definitions_api/group"/>
-</component>
-<component name="version_info_api" long-name="Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/group"/>
-</component>
-<component name="accessory_monitoring_api" long-name="Accessory Monitoring API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/group"/>
-</component>
-<component name="haptics_api" long-name="Haptics API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/haptics_api/group"/>
-</component>
-<component name="sensor_data_compensator_api" long-name="Sensor Data Compensator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
-</component>
-</collection>
-<collection name="devicesrv_plat" long-name="Device Services Platform Interfaces" level="app-if">
-<component name="configuration_file_parser_api" long-name="Configuration File Parser API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/configuration_file_parser_api/group"/>
-</component>
-<component name="dos_extension_plugin_api" long-name="DOS Extension Plug-In API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_plugin_api/group"/>
-</component>
-<component name="mediator_command_initiator_api" long-name="Mediator Command Initiator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_initiator_api/group"/>
-</component>
-<component name="syslangutil_api" long-name="SysLangUtil API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/syslangutil_api/group"/>
-</component>
-<component name="wakeup_alarm_api" long-name="Wakeup Alarm API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/wakeup_alarm_api/group"/>
-</component>
-<component name="disk_and_memory_level_keys_api" long-name="Disk and Memory Level Keys API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_and_memory_level_keys_api/group"/>
-</component>
-<component name="mediator_plugin_api" long-name="Mediator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_plugin_api/group"/>
-</component>
-<component name="headset_status_api" long-name="Headset Status API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/headset_status_api/group"/>
-</component>
-<component name="system_startup_extension_plugin_api" long-name="System Startup Extension Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/system_startup_extension_plugin_api/group"/>
-</component>
-<component name="sensor_plugin_api" long-name="Sensor Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_plugin_api/group"/>
-</component>
-<component name="accessory_api" long-name="Accessory API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_api/group"/>
-</component>
-<component name="display_language_definition_api" long-name="Display Language Definition API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/display_language_definition_api/group"/>
-</component>
-<component name="mediator_command_responder_api" long-name="Mediator Command Responder API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_responder_api/group"/>
-</component>
-<component name="accessory_policy_definitions_api" long-name="Accessory Policy Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_definitions_api/group"/>
-</component>
-<component name="hw_settings_api" long-name="Hardware Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/hw_settings_api/group"/>
-</component>
-<component name="mediator_domain_definitions_api" long-name="Mediator Domain Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_domain_definitions_api/group"/>
-</component>
-<component name="sensor_extension_api" long-name="Sensor Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_extension_api/group"/>
-</component>
-<component name="accessory_plugin_api" long-name="Accessory Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_plugin_api/group"/>
-</component>
-<component name="sae_api" long-name="SAE API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sae_api/group"/>
-</component>
-<component name="accessory_control_api" long-name="Accessory Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_control_api/group"/>
-</component>
-<component name="mediator_static_registration_api" long-name="Mediator Static Registration API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_static_registration_api/group"/>
-</component>
-<component name="accessory_key_event_handling_api" long-name="Accessory Key Event Handling API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_key_event_handling_api/group"/>
-</component>
-<component name="mediator_notification_api" long-name="Mediator Notification API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_notification_api/group"/>
-</component>
-<component name="accessory_policy_utility_api" long-name="Accessory Policy Utility API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_utility_api/group"/>
-</component>
-<component name="common_dsy_plugin_api" long-name="Common DSY Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/common_dsy_plugin_api/group"/>
-</component>
-<component name="remote_control_extension_api" long-name="Remote Control Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/remote_control_extension_api/group"/>
-</component>
-<component name="sensor_channel_filter_api" long-name="Sensor Channel Filter API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_channel_filter_api/group"/>
-</component>
-<component name="dos_extension_api" long-name="DOS Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_api/group"/>
-</component>
-<component name="accessory_audio_control_api" long-name="Accessory Audio Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_audio_control_api/group"/>
-</component>
-<component name="mediator_event_consumer_api" long-name="Mediator Event Consumer API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_consumer_api/group"/>
-</component>
-<component name="shared_data_api" long-name="Shared Data API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/shared_data_api/group"/>
-</component>
-<component name="accessory_settings_api" long-name="Accessory Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_settings_api/group"/>
-</component>
-<component name="accessory_bluetooth_control_api" long-name="Accessory Bluetooth Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_bluetooth_control_api/group"/>
-</component>
-<component name="extended_version_info_api" long-name="Extended Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_api/group"/>
-</component>
-<component name="mediator_event_provider_api" long-name="Mediator Event Provider API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_provider_api/group"/>
-</component>
-<component name="tv_out_config_api" long-name="TV Out Config API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_config_api/group"/>
-</component>
-<component name="tspclientmapper_api" long-name="TSP Client Mapper API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tspclientmapper_api/group"/>
-</component>
-<component name="powersave_api" long-name="Power Save API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_api/group"/>
-</component>
-<component name="powersave_definitions_api" long-name="Power Save Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_definitions_api/group"/>
-</component>
-<component name="powersave_plugin_api" long-name="Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_plugin_api/group"/>
-</component>
-<component name="extended_version_info_plugin_api" long-name="Extended Version Info Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_plugin_api/group"/>
-</component>
-<component name="haptics_plugin_api" long-name="Haptics Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_plugin_api/group"/>
-</component>
-<component name="haptics_effect_data_getter_plugin_api" long-name="Haptics Effect Data Getter Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
-</component>
-<component name="haptics_packetizer_plugin_api" long-name="Haptics Packetizer Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_packetizer_plugin_api/group"/>
-</component>
-<component name="tiltcompensation_api" long-name="Tilt Compensation API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tiltcompensation_api/group"/>
-</component>
-<component name="disk_notification_handler_api" long-name="Disk Notification Handler API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_notification_handler_api/group"/>
-</component>
-<component name="accessory_policy_usb_audio_api" long-name="Accessory Policy USB Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_usb_audio_api/group"/>
-</component>
-<component name="accessory_policy_hdmi_audio_api" long-name="Accessory Policy HDMI Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_hdmi_audio_api/group"/>
-</component>
-<component name="sensor_data_compensator_plugin_api" long-name="Sensor Data Compensator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
-</component>
-<component name="ddc_access_api" long-name="DDC Access API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/ddc_access_api/group"/>
-</component>
-<component name="tv_out_behaviour_api" long-name="TV Out Behaviour API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_behaviour_api/group"/>
-</component>
-</collection>
-<collection name="accessoryservices" long-name="Accessory Services" level="framework">
-<component name="accessorymonitor" filter="s60" long-name="Accessory Monitor">
-<unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/group"/>
-</component>
-<component name="accessoryremotecontrol" filter="s60" long-name="Accessory Remote Control">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
-</component>
-<component name="accessoryserver" filter="s60" long-name="Accessory Server">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryserver/group"/>
-</component>
-<component name="pluggeddisplay" filter="s60" long-name="Plugged Display" introduced="^3">
-<unit bldFile="os/devicesrv/accessoryservices/pluggeddisplay/group"/>
-</component>
-<component name="headsetstatusapi" filter="s60" long-name="Headset Status API">
-<unit bldFile="os/devicesrv/accessoryservices/headsetstatusapi/group"/>
-</component>
-<component name="tspclientmapper" filter="s60" long-name="TSP Client Mapper">
-<unit bldFile="os/devicesrv/accessoryservices/tspclientmapper/group"/>
-</component>
-<component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional">
-<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
-</component>
-<component name="gid_pc_tool" filter="s60" long-name="Generic ID PC Tool" class="tool PC">
-<unit bldFile="os/devicesrv/accessoryservices/gid_pc_tool/group"/>
-</component>
-</collection>
-<collection name="commonservices" long-name="Common Services" level="app-if">
-<component name="commonengine" filter="s60" long-name="Common Engine">
-<unit bldFile="os/devicesrv/commonservices/commonengine/group"/>
-</component>
-<component name="commonengineresources" filter="s60" long-name="Common Engine Resources" class="config">
-<unit bldFile="os/devicesrv/commonservices/commonengineresources/group"/>
-</component>
-<component name="platformenv" filter="s60" long-name="Platform Environment">
-<unit bldFile="os/devicesrv/commonservices/platformenv/group"/>
-</component>
-<component name="sysutil" long-name="System Utilities" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/sysutil/group" mrp="os/devicesrv/commonservices/sysutil/group/sysutil.mrp"/>
-</component>
-<component name="activitymanager" long-name="Activity Manager" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/activitymanager/group" mrp="os/devicesrv/commonservices/activitymanager/group/activitymanager.mrp"/>
-</component>
-</collection>
-<collection name="dosservices" long-name="Domestic Operating System Services" level="hw-if">
-<component name="commondsy" filter="s60" long-name="Common DSY" plugin="Y">
-<unit bldFile="os/devicesrv/dosservices/commondsy/group"/>
-</component>
-<component name="dosserver" filter="s60" long-name="Domestic OS Server">
-<unit bldFile="os/devicesrv/dosservices/dosserver/group"/>
-</component>
-</collection>
-<collection name="sensorservices" long-name="Sensor Services" level="framework">
-<component name="sensorserver" filter="s60" long-name="Sensor Server">
-<unit bldFile="os/devicesrv/sensorservices/sensorserver/group"/>
-</component>
-<component name="orientationssy" filter="s60" long-name="Orientation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/orientationssy/group"/>
-</component>
-<component name="tiltcompensationssy" filter="s60" long-name="Tilt Compensation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/tiltcompensationssy/group"/>
-</component>
-<component name="sensordatacompensator" filter="s60" long-name="Sensor Data Compensator">
-<unit bldFile="os/devicesrv/sensorservices/sensordatacompensator/group"/>
-</component>
-</collection>
-<collection name="hwrmhaptics" long-name="HWRM Haptics" level="plugin">
-<component name="hapticseffectdatagetterfw" filter="s60" long-name="Haptics Effect Data Getter Framework">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
-</component>
-<component name="hapticspluginservice" filter="s60" long-name="Haptics Plugin Service">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
-</component>
-<component name="hapticspacketizer" filter="s60" long-name="Haptics Packetizer">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
-</component>
-<component name="hapticspluginmanager" filter="s60" long-name="Haptics Plugin Manager">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
-</component>
-<component name="hapticsserver" filter="s60" long-name="Haptics Server">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsserver/group"/>
-</component>
-<component name="hapticsclient" filter="s60" long-name="Haptics Client">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsclient/group"/>
-</component>
-<component name="hwrmhaptics_build" filter="s60" long-name="HWRM Haptics Build">
-<!-- move these exports into the appropriate above components and delete this component-->
-<unit bldFile="os/devicesrv/hwrmhaptics/group"/>
-</component>
-</collection>
-<collection name="mediator" long-name="Mediator" level="app-if">
-<!--collection is really a component. Move it down a directory -->
-<component name="mediator_build" filter="s60" long-name="Mediator Build">
-<unit bldFile="os/devicesrv/mediator/group"/>
-</component>
-</collection>
-<collection name="psmservices" long-name="Power Save Mode Services" level="app-if">
-<component name="psmserver" filter="s60" long-name="PSM Server">
-<unit bldFile="os/devicesrv/psmservices/psmserver/group"/>
-</component>
-</collection>
-<collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
-<component name="hwrmfmtxwatcherplugin" filter="s60" long-name="HWRM FM Transmitter Watcher Plugin" plugin="Y">
-<unit bldFile="os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
-</component>
-<component name="hwrmtargetmodifierplugin" filter="s60" long-name="HWRM Target Modifier Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build,
- may need to -->
-<!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
-</component>
-<component name="vibractrl" filter="s60" long-name="Vibra Control" deprecated="9.1">
-<unit bldFile="os/devicesrv/resourcemgmt/vibractrl/group"/>
-</component>
-<component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="^2" purpose="optional">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
-</component>
-<component name="hwresourcesmgrconfig" long-name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
-</component>
-<component name="resourcemgmt_build" filter="s60" long-name="Resource Management Build">
-<!-- Move exports to a self-contained component.
- This needs to be kept around until configuration is in place -->
-<unit bldFile="os/devicesrv/resourcemgmt/group"/>
-</component>
-<component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
-</component>
-</collection>
-<collection name="sysstatemgmt" long-name="System State Management" level="server">
-<component name="ssmmapperutility" filter="s60" long-name="SSM Mapper Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmmapperutility/group"/>
-</component>
-<component name="ssmpolicyplugins" filter="s60" long-name="SSM Policy Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmpolicyplugins/group"/>
-</component>
-<component name="ssmutilityplugins" filter="s60" long-name="SSM Utility Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmutilityplugins/group"/>
-</component>
-<component name="ssmcmdlists" filter="s60" long-name="SSM Command Lists" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcmdlists/group"/>
-</component>
-<component name="ssmcustcmds" filter="s60" long-name="SSM Custom Commands" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcustcmds/group"/>
-</component>
-<component name="syslangutil" filter="s60" long-name="System Language Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/syslangutil/group"/>
-</component>
-<component name="sysrestart" filter="s60" long-name="System Restart" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysrestart/group"/>
-</component>
-<component name="sysuiprovider" filter="s60" long-name="System UI Provider" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysuiprovider/group"/>
-</component>
-<component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/group" mrp="os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
-</component>
-<component name="systemstatemgr" long-name="System State Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
-</component>
-<component name="systemstateplugins" long-name="System State Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
-</component>
-<component name="systemstatereferenceplugins" long-name="System State Reference Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
-</component>
-</collection>
-<collection name="resourceinterfaces" long-name="Resource Interfaces" level="hw-if">
-<component name="fmtransmittercontrol" long-name="FM Transmitter Control" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group" mrp="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
-</component>
-</collection>
-<collection name="systemhealthmanagement" long-name="System Health Management" level="server">
-<component name="systemhealthmgr" long-name="System Health Manager" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
-</component>
-</collection>
-<collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if"/>
-<collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
-<component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
-<collection name="authorisation" long-name="Authorisation" level="utilities">
-<component name="userpromptservice" long-name="User Prompt Service" introduced="^3" purpose="mandatory">
-<unit bldFile="os/security/authorisation/userpromptservice/group" mrp="os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
-</component>
-<component name="userpromptutils" long-name="User Prompt Utils" introduced="^3" purpose="optional">
-<unit bldFile="os/security/authorisation/userpromptutils/group" mrp="os/security/authorisation/userpromptutils/group/security_ups_utils.mrp"/>
-</component>
-</collection>
-<collection name="contentmgmt" long-name="Content Management" level="utilities">
-<component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
-<unit bldFile="os/security/contentmgmt/contentaccessfwfordrm/group" mrp="os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
-</component>
-<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">
-<unit bldFile="os/security/crypto/weakcryptospi/group" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
-</component>
-<component name="strongcryptospi" long-name="Strong Crypto SPI" filter="gt" introduced="^3" purpose="optional">
-<unit bldFile="os/security/crypto/weakcryptospi/strong" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
-</component>
-</collection>
-<collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
-<component name="securityutils" long-name="Security Utils" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/securityutils/group" mrp="os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
-</component>
-<component name="securitydocs" long-name="Security Documentation" purpose="development" class="doc">
-<unit mrp="os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
-</component>
-<component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
-</component>
-<component name="securitycommonutils" long-name="Security Common Utils" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/security/cryptomgmtlibs/securitycommonutils/group" mrp="os/security/cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
-</component>
-</collection>
-<collection name="securityanddataprivacytools" long-name="Security and Data Privacy Tools" level="services">
-<component name="securityconfig" long-name="Security Config" introduced="9.1" purpose="optional">
-<unit bldFile="os/security/securityanddataprivacytools/securityconfig/group" mrp="os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
-</component>
-<component name="securitytools" long-name="Security Tools" introduced="^3" purpose="optional" class="PC">
-<unit bldFile="os/security/securityanddataprivacytools/securitytools/group" mrp="os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
-</component>
-</collection>
-<collection name="cryptoplugins" long-name="Crypto Plugins" level="plugins">
-<component name="cryptospiplugins" long-name="Crypto SPI Plugins" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/security/cryptoplugins/cryptospiplugins/group" mrp="os/security/cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
-</component>
-</collection>
-<collection name="cryptoservices" long-name="Crypto Services" level="plugins">
-<component name="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/certificateandkeymgmt/group" mrp="os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
-</component>
-<component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
-</component>
-<component name="browserrootcertificates" long-name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
-<unit mrp="os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
-</component>
-<component name="rootcertificates" filter="sf_build" long-name="Root Certificates" introduced="7.0s" purpose="optional">
-<!-- not in S60 codebase -->
-<unit bldFile="os/security/cryptoservices/rootcertificates/group" mrp="os/security/cryptoservices/rootcertificates/group/rootcerts.mrp"/>
-</component>
-<component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/asnpkcs/group" mrp="os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
-</component>
-</collection>
-<collection name="security_info" long-name="OS Security Info" level="utilities">
-<component name="security_metadata" long-name="OS Security Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/security/security_info/security_metadata/security_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
-<collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
-<component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
-</component>
-<component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
-</component>
-<component name="simulationpositioningmodule" long-name="Simulation Positioning Module" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
-</component>
-<component name="gpspositioningmodule" long-name="GPS/A-GPS Positioning Module" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/gpspositioningmodule/group" mrp="os/lbs/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
-</component>
-<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>
-</collection>
-<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
-<component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
-</component>
-</collection>
-<collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
-<component name="locationserver" long-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 name="networkrequesthandler" long-name="Network Request Handler" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
-</component>
-</collection>
-<collection name="lbstest" long-name="Locating Services Tests" level="application-interface">
-<component name="locationprotocoltest" long-name="Location Protocol Tests" introduced="9.2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/lbstest/locationprotocoltest/group" mrp="os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
-</component>
-</collection>
-<collection name="locationmgmt" long-name="Location Management" level="management">
-<component name="locmonitor" long-name="Location Monitor" introduced="^3" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
-</component>
-<component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/agpslocationmgr/group" mrp="os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
-</component>
-<component name="networklocationmgr" long-name="Network Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/networklocationmgr/group" mrp="os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
-</component>
-<component name="locationcore" long-name="Location Core" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locationcore/group" mrp="os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
-</component>
-<component name="networkgateway" long-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 name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
-<component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
-</component>
-<component name="suplrrlpasn1" filter="sf_build" long-name="SUPL RRLP ASN1 Parser">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
-</component>
-</collection>
-<collection name="lbsapitest" long-name="Location API Tests" level="application-interface"/>
-<collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
-<component name="lbs_metadata" long-name="Locating Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commsfw" level="services" long-name="Communications Framework" levels="server support framework process app-if">
-<collection name="commsprocess" long-name="Comms Process" level="process">
-<component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/commsfw/commsprocess/commsrootserverconfig/group" mrp="os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
-</component>
-</collection>
-<collection name="commsconfig" long-name="Comms Config" level="process">
-<component name="commsdatabase" long-name="Comms Database" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
-</component>
-<component name="commsdatabaseshim" long-name="Comms Database Shim" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/commsfw/commsconfig/commsdatabaseshim/group" mrp="os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
-</component>
-</collection>
-<collection name="datacommsserver" long-name="Data Comms Server" level="framework">
-<component name="esockserver" long-name="ESock Server" purpose="mandatory">
-<unit bldFile="os/commsfw/datacommsserver/esockserver/group" mrp="os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp" version="3"/>
-</component>
-<component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/group" mrp="os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
-</component>
-<component name="networkingdialogstub" long-name="Networking Dialog Stub" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/default" mrp="os/commsfw/datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
-</component>
-<component name="networkcontroller" long-name="Network Controller" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/datacommsserver/networkcontroller/group" mrp="os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
-</component>
-</collection>
-<collection name="serialserver" long-name="Serial Server" level="server">
-<component name="serialportcsy" long-name="Serial Port CSY" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/serialserver/serialportcsy" mrp="os/commsfw/serialserver/serialportcsy/ser-comms_serialportcsy.mrp"/>
-</component>
-<component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" purpose="development">
-<unit bldFile="os/commsfw/serialserver/packetloopbackcsy/group" mrp="os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
-</component>
-<component name="c32serialserver" long-name="C32 Serial Server" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/commsfw/serialserver/c32serialserver/group" mrp="os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
-</component>
-<component name="c32serialserverconfig" long-name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config">
-<unit bldFile="os/commsfw/serialserver/c32serialserverconfig" mrp="os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
-</component>
-<component name="c32serialserverdocs" long-name="C32 Serial Server Documentation" purpose="development" class="doc">
-<unit mrp="os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
-</component>
-</collection>
-<collection name="commsfwutils" long-name="Comms Framework Utilities" level="framework">
-<component name="commsbufs" long-name="Comms Buffers" introduced="^3" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwutils/commsbufs/group" mrp="os/commsfw/commsfwutils/commsbufs/group/comms-infras_commsbufs.mrp"/>
-</component>
-</collection>
-<collection name="commsfw_info" long-name="Comms Framework Info" level="app-if">
-<component name="commsinfrastructuredocs" long-name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
-<unit mrp="os/commsfw/commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
-</component>
-<component name="commsfw_metadata" long-name="Communications Framework Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/commsfw/commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
-</component>
-</collection>
-<collection name="commsfwsupport" long-name="Comms Framework Support" level="support">
-<component name="commselements" long-name="Comms Elements" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwsupport/commselements/group" mrp="os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
-</component>
-</collection>
-<collection name="commsinfrastructureapitest" long-name="Comms-Infras API Tests" level="app-if">
-<component name="commsinfrastructuresvs" long-name="Comms Infrastructure Verification Suite" introduced="^3" purpose="development">
-<unit mrp="os/commsfw/commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
-</component>
-</collection>
-<collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
-<component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
-</component>
-<component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" purpose="mandatory" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
-</component>
-<component name="commstools" long-name="Comms Tools" introduced="^3" purpose="development" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/commstools/group" mrp="os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
-</component>
-</collection>
-</block>
-<block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
-<component name="internetsockets" long-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>
-<collection name="tcpiputils" long-name="TCP/IP Utilities" level="plugin">
-<component name="dnd" long-name="DND" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/dnd/group" mrp="os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
-</component>
-<component name="dhcp" long-name="DHCP" introduced="8.0" purpose="optional">
-<unit bldFile="os/networkingsrv/tcpiputils/dhcp/group" mrp="os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
-</component>
-<component name="networkaddressandporttranslation" long-name="Network Address and Port Translation" introduced="^2" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
-</component>
-<component name="punycodeconv" long-name="Punycode Converter" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/punycodeconv/group" mrp="os/networkingsrv/tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
-</component>
-</collection>
-<collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
-<component name="nullagt" long-name="NULL AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/nullagt/group" mrp="os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
-</component>
-<component name="genericscprparameters" long-name="Generic SCPR Parameters" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/linklayercontrol/genericscprparameters/group" mrp="os/networkingsrv/linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
-</component>
-<component name="mbmsparameters" long-name="MBMS Parameters" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/mbmsparameters/group" mrp="os/networkingsrv/linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
-</component>
-<component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
-<unit bldFile="os/networkingsrv/linklayercontrol/networkinterfacemgr/group" mrp="os/networkingsrv/linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp" version="2"/>
-</component>
-</collection>
-<collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
-<component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
-</component>
-<component name="pppnif" long-name="PPP NIF" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/pppnif/group" mrp="os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp" version="2"/>
-</component>
-<component name="slipnif" long-name="SLIP NIF" purpose="development" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/slipnif/group" mrp="os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
-</component>
-<component name="tunnelnif" long-name="Tunnel NIF" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
-</component>
-</collection>
-<collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
-<component name="packetlogger" long-name="Packet Logger" introduced="8.1" purpose="development">
-<unit bldFile="os/networkingsrv/linklayerutils/packetlogger/group" mrp="os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
-</component>
-</collection>
-<collection name="networkcontrol" long-name="Network Control" level="plugin">
-<component name="qoslib" long-name="QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/qoslib/group" mrp="os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
-</component>
-<component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/pfqoslib/group" mrp="os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
-</component>
-<component name="qosfwprt" long-name="QoS Framework PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
-</component>
-<component name="qosipscpr" long-name="QoS IP SCPR" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosipscpr/group" mrp="os/networkingsrv/networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
-</component>
-<component name="ipnetworklayer" long-name="IP Network Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/ipnetworklayer/group" mrp="os/networkingsrv/networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
-</component>
-<component name="iptransportlayer" long-name="IP Transport Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/iptransportlayer/group" mrp="os/networkingsrv/networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
-</component>
-<component name="commsuserpromptmgr" long-name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkcontrol/commsuserpromptmgr/group" mrp="os/networkingsrv/networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
-</component>
-</collection>
-<collection name="networkprotocols" long-name="Network Protocols" level="plugin">
-<component name="ipeventnotifier" long-name="IP Event Notifier" introduced="8.1" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
-</component>
-<component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
-</component>
-<component name="iphook" long-name="IP Hook" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
-</component>
-<component name="mobileip" long-name="Mobile IP" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/mobileip/group" mrp="os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
-</component>
-<component name="dnsproxy" long-name="DNS Proxy" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/networkprotocols/dnsproxy/group" mrp="os/networkingsrv/networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
-</component>
-</collection>
-<collection name="networksecurity" long-name="Network Security" level="framework">
-<component name="tls" long-name="TLS" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tls/group" mrp="os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
-</component>
-<component name="tlsprovider" long-name="TLS Provider" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tlsprovider/group" mrp="os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
-</component>
-<component name="ipsec" long-name="IPsec" introduced="7.0" purpose="optional">
-<unit bldFile="os/networkingsrv/networksecurity/ipsec/group" mrp="os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
-</component>
-</collection>
-<collection name="networkingtestandutils" long-name="Networking Test and Utils" level="app-if">
-<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">
-<!-- production component: contains the IBY files -->
-<unit bldFile="os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
-</component>
-<component name="networkingdocs" long-name="Networking Documentation" purpose="development" class="doc">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
-</component>
-<component name="networkingsrv_metadata" long-name="Networking Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
-<component name="predictorcompression" long-name="Predictor Compression" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wlan" level="services" long-name="WLAN" levels="hw low mid high tools test">
-<collection name="wlan_plat" long-name="WLAN Platform Interfaces" level="test">
-<component name="wlan_dbif_api" long-name="WLAN DBIF API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_dbif_api/group"/>
-</component>
-<component name="wlan_hal_api" long-name="WLAN HAL API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hal_api/group"/>
-</component>
-<component name="wlan_management_api" long-name="WLAN Management API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_management_api/group"/>
-</component>
-<component name="wlan_device_settings_api" long-name="WLAN Device Settings API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_device_settings_api/group"/>
-</component>
-<component name="wlan_control_api" long-name="WLAN Control API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_control_api/group"/>
-</component>
-<component name="wlan_hw_initialization_data_api" long-name="WLAN Hardware Initialization Data API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hw_initialization_data_api/group"/>
-</component>
-<component name="wlan_power_save_plugin_api" long-name="WLAN Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_power_save_plugin_api/group"/>
-</component>
-<component name="wlan_info_api" long-name="WLAN Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_info_api/group"/>
-</component>
-<component name="wlan_agent_hotspot_plugin_api" long-name="WLAN Agent Hotspot Plug-in API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
-</component>
-<component name="wlan_osa_api" long-name="WLAN OSA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_osa_api/group"/>
-</component>
-<component name="wlan_spia_api" long-name="WLAN SPIA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_spia_api/group"/>
-</component>
-<component name="wlan_hpa_api" long-name="WLAN HPA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hpa_api/group"/>
-</component>
-<component name="wlan_eapol_plugin_api" long-name="WLAN EAPOL Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_eapol_plugin_api/group"/>
-</component>
-<component name="wlan_generic_plugin_api" long-name="WLAN Generic Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_generic_plugin_api/group"/>
-</component>
-<component name="wlan_aws_plugin_api" long-name="WLAN AWS Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_aws_plugin_api/group"/>
-</component>
-</collection>
-<collection name="wlan_pub" long-name="WLAN Public Interfaces" level="test">
-<component name="wlan_sdk_info_api" long-name="WLAN SDK Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_pub/wlan_sdk_info_api/group"/>
-</component>
-</collection>
-<collection name="wlan_bearer" long-name="WLAN Bearer" level="hw">
-<component name="wlanpsmplugin" filter="s60" long-name="WLAN PSM Plugin" plugin="Y">
-<unit bldFile="os/wlan/wlan_bearer/wlanpsmplugin/group"/>
-</component>
-<component name="wlanagent" filter="s60" long-name="WLAN Agent">
-<unit bldFile="os/wlan/wlan_bearer/wlanagent/group"/>
-</component>
-<component name="wlandbif_cd" filter="s60" long-name="WLAN CommsDat interface">
-<unit bldFile="os/wlan/wlan_bearer/wlandbif_cd/group"/>
-</component>
-<!-- should follow component directory rules for stuff in wlan_symbian/ and put in a single component or split up properly -->
-<component name="wlanengine" filter="s60" long-name="WLAN Engine">
-<unit bldFile="os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
-</component>
-<component name="wlanldd" filter="s60" long-name="WLAN LDD">
-<unit bldFile="os/wlan/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
-</component>
-<component name="wlannwif" filter="s60" long-name="WLAN Network Interface">
-<unit bldFile="os/wlan/wlan_bearer/wlannwif/group"/>
-</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="adaptation hw-if plugin framework server app-if">
-<collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
-<component name="basebandchanneladaptor" long-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 name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
-<component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
-</component>
-</collection>
-<collection name="fax" long-name="Fax" level="server">
-<component name="faxclientandserver" long-name="Fax Client and Server" purpose="optional">
-<unit bldFile="os/cellularsrv/fax/faxclientandserver/Group" mrp="os/cellularsrv/fax/faxclientandserver/Group/telephony_fax.mrp"/>
-</component>
-</collection>
-<collection name="smsprotocols" long-name="SMS Protocols" level="framework">
-<component name="smsstack" long-name="SMS Stack" introduced="6.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/cellularsrv/smsprotocols/smsstack/group" mrp="os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
-</component>
-</collection>
-<collection name="telephonyprotocols" long-name="Telephony Protocols" level="framework">
-<component name="csdagt" long-name="CSD AGT" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/csdagt/group" mrp="os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
-</component>
-<component name="psdagt" long-name="PSD AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/psdagt/group" mrp="os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
-</component>
-<component name="gprsumtsqosprt" long-name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
-</component>
-<component name="gprsumtsqosinterface" long-name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
-</component>
-<component name="qosextnapi" long-name="QoS Extn API" introduced="9.2" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
-</component>
-<component name="secondarypdpcontextumtsdriver" long-name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
-</component>
-<component name="qos3gppcpr" long-name="QoS 3GPP CPR" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
-</component>
-<component name="pdplayer" long-name="PDP Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/pdplayer/group" mrp="os/cellularsrv/telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
-</component>
-<component name="rawipnif" long-name="Raw IP NIF" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserver" long-name="Telephony Server" level="server">
-<component name="etelserverandcore" long-name="ETel Server and Core" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
-</component>
-<component name="etelmultimode" long-name="ETel Multimode" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelmultimode/group" mrp="os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
-</component>
-<component name="etelpacketdata" long-name="ETel Packet Data" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
-</component>
-<component name="etelsimtoolkit" long-name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
-<component name="common_tsy" long-name="Common TSY" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
-</component>
-<component name="licenseetsystub" long-name="Licensee TSY Stub" introduced="^2" purpose="development" filter="sf_build" plugin="Y">
-<unit mrp="os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="os/cellularsrv/telephonyserverplugins/licenseetsystub/group"/>
-</component>
-<component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
-</component>
-<component name="simtsy" long-name="SIM TSY" introduced="7.0" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
-</component>
-<component name="ctsydispatchlayer" long-name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
-</component>
-<component name="simatktsy" long-name="SIMATK TSY" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simatktsy/group" mrp="os/cellularsrv/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
-</component>
-</collection>
-<collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
-<component name="dial" long-name="Dial" deprecated="9.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyutils/dial/group" mrp="os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
-</component>
-<component name="telephonywatchers" long-name="Telephony Watchers" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
-</component>
-<component name="etel3rdpartyapi" long-name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrv_info" long-name="Cellular Baseband Services Info" level="app-if">
-<component name="telephonyconfidentialdocs" long-name="Telephony Confidential Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
-</component>
-<component name="telephonydocs" long-name="Telephony Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
-</component>
-<component name="cellularsrv_metadata" long-name="Cellular Baseband Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
-<component name="mocksy" long-name="MockSY" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if"/>
-</block>
-<block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
-<collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
-<component name="bluetooth_audio_adaptation_api" long-name="Bluetooth Audio Adaptation API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
-</component>
-<component name="bluetooth_power_management_api" long-name="Bluetooth Power Management API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_power_management_api/group"/>
-</component>
-<component name="at_command_handler_plugin_api" long-name="AT Command Handler Plugin API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/at_command_handler_plugin_api/group"/>
-</component>
-</collection>
-<collection name="bluetooth" long-name="Bluetooth Core" level="framework">
-<component name="btstack" long-name="Bluetooth Stack" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btstack" mrp="os/bt/bluetooth/btstack/bluetooth_stack.mrp"/>
-</component>
-<component name="btcomm" long-name="Bluetooth CSY" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetooth/btcomm" mrp="os/bt/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
-</component>
-<component name="btsdp" long-name="Bluetooth SDP" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btsdp" mrp="os/bt/bluetooth/btsdp/bluetooth_sdp.mrp"/>
-</component>
-<component name="btextnotifiers" long-name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btextnotifiers" mrp="os/bt/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
-</component>
-<component name="gavdp" long-name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/gavdp/group" mrp="os/bt/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
-</component>
-<component name="btlogger" long-name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btlogger/group" mrp="os/bt/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
-</component>
-<component name="btdocs" long-name="Bluetooth Documentation" purpose="development" class="doc">
-<unit mrp="os/bt/bluetooth/btdocs/bluetooth_documentation.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothmgmt" long-name="Bluetooth Management" level="plugin">
-<component name="btmgr" long-name="Bluetooth Manager" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btmgr" mrp="os/bt/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
-</component>
-<component name="btconfig" long-name="Bluetooth Config" purpose="optional" class="config">
-<unit bldFile="os/bt/bluetoothmgmt/btconfig" mrp="os/bt/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
-</component>
-<component name="btrom" long-name="Bluetooth ROM" introduced="9.1" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btrom" mrp="os/bt/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
-</component>
-<component name="bluetoothclientlib" long-name="Bluetooth Client Library" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/bluetoothclientlib" mrp="os/bt/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothcommsprofiles" long-name="Bluetooth Comms Profiles" level="app-if">
-<component name="btpan" long-name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetoothcommsprofiles/btpan/group" mrp="os/bt/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
-</component>
-</collection>
-<collection name="bthci" long-name="Host Controller Interface" level="server">
-<component name="bthci2" long-name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bthci/bthci2/group" mrp="os/bt/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
-</component>
-<component name="hciextensioninterface" long-name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bthci/hciextensioninterface" mrp="os/bt/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
-</component>
-<component name="hci2implementations" long-name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bthci/hci2implementations/group" mrp="os/bt/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
-</component>
-</collection>
-<collection name="irda" long-name="IrDA" level="plugin">
-<component name="irdastack" long-name="IrDA Stack" purpose="optional">
-<unit bldFile="os/bt/irda/irdastack/group" mrp="os/bt/irda/irdastack/group/infra-red_irda.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if"/>
-<collection name="atext" long-name="AT Extensions" level="server">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="atext_build" long-name="AT Extension Build" introduced="^3" purpose="optional" filter="s60">
-<unit bldFile="os/bt/atext/group"/>
-</component>
-</collection>
-<collection name="bt_info" long-name="Bluetooth Info" level="app-if">
-<component name="bt_metadata" long-name="Bluetooth Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/bt/bt_info/bt_metadata/bt_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
-<collection name="usb_plat" long-name="USB Platform Interfaces" level="app-if">
-<component name="usb_audio_stream_plugin_api" long-name="USB Audio Stream Plugin API" filter="s60" class="api">
-<unit bldFile="os/usb/usb_plat/usb_audio_stream_plugin_api/group"/>
-</component>
-</collection>
-<collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
-<!-- usbclientdrivers to be moved here from kernelhwsrv-->
-</collection>
-<collection name="usbmgmt" long-name="USB Management" level="server">
-<component name="usbmgr" long-name="USB Manager" purpose="optional">
-<unit bldFile="os/usb/usbmgmt/usbmgr/group" mrp="os/usb/usbmgmt/usbmgr/group/usb_manager.mrp" version="2"/>
-</component>
-<component name="usbclassandmgrdocs" long-name="USB Class and Manager Documentation" purpose="development" class="doc">
-<unit mrp="os/usb/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
-</component>
-</collection>
-<collection name="usb_info" long-name="USB Info" level="app-if">
-<component name="usb_metadata" long-name="USB Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/usb/usb_info/usb_metadata/usb_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="mm" level="services" long-name="Multimedia" levels="adaptation 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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-</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"/>
-</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"/>
-</component>
-<component name="aac_decoder_config_proxy_api" long-name="AAC Decoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/aac_decoder_config_proxy_api/group"/>
-</component>
-<component name="added_devsound_control_api" long-name="Added DevSound Control API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_api/group"/>
-</component>
-<component name="added_devsound_control_msg_hdlr_api" long-name="Added DevSound Control Msg Hdlr API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_msg_hdlr_api/group"/>
-</component>
-<component name="added_devsound_control_proxy_api" long-name="Added DevSound Control Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_proxy_api/group"/>
-</component>
-<component name="audio_effects_msg_hdlr_api" long-name="Audio Effects Message Handler API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_msg_hdlr_api/group"/>
-</component>
-<component name="audio_effects_proxy_api" long-name="Audio Effects Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_proxy_api/group"/>
-</component>
-<component name="audio_policy_header_api" long-name="Audio Policy Header API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="audio_routing_proxy_api" long-name="Audio Routing Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_routing_proxy_api/group"/>
-</component>
-<component name="custom_interface_builder_api" long-name="Custom Interface Builder API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_builder_api/group"/>
-</component>
-<component name="custom_interface_message_handler_factory_api" long-name="Custom Interface Message Handler Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_message_handler_factory_api/group"/>
-</component>
-<component name="custom_interface_proxy_factory_api" long-name="Custom Interface Proxy Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_proxy_factory_api/group"/>
-</component>
-<component name="custom_interface_utility_api" long-name="Custom Interface Utility API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_utility_api/group"/>
-</component>
-<component name="devsound_adaptation_api" long-name="DevSound Adaptation API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/devsound_adaptation_api/group"/>
-</component>
-<component name="display_posting_api" long-name="Display Posting API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="eaac_plus_decoder_interface_proxy_api" long-name="eAAC Plus Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="error_concealment_interface_proxy_api" long-name="Error Concealment Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
-</component>
-<component name="fm_radio_adaptation_api" long-name="FM Radio Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_decoder_interface_proxy_api" long-name="G711 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_encoder_interface_proxy_api" long-name="G711 Encoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_decoder_interface_proxy_api" long-name="G729 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_encoder_interface_msg_hdlr_api" long-name="G729 Encoder Interface Message Handler API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</component>
-<component name="ilbc_decoder_interface_proxy_api" long-name="Ilbc Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ilbc_encoder_interface_proxy_api" long-name="Ilbc Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="mdf_plugin_uids" long-name="MDF Plug-in UIDs" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/mdf_plugin_uids/group"/>
-</component>
-<component name="multimedia_fourcc_definitions_api" long-name="Multimedia FourCC Definitions API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/multimedia_fourcc_definitions_api/group"/>
-</component>
-<component name="nokia_audio_policy_header_api" long-name="Nokia Audio Policy Header API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/nokia_audio_policy_header_api/group"/>
-</component>
-<component name="nokia_multimedia_fourcc_definitions_api" long-name="Nokia Multimedia Fourcc Definitions API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ra8_decoder_interface_proxy_api" long-name="RA8 Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
-</component>
-<component name="rds_adaptation_api" long-name="RDS Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="restricted_audio_output_proxy_api" long-name="Restricted Audio Output Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="sbc_encoder_interface_proxy_api" long-name="SBC Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/sbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="secure_output_mdf_custom_interface" long-name="Secure Output MDF Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="speech_encoder_config_proxy_api" long-name="Speech Encoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/speech_encoder_config_proxy_api/group"/>
-</component>
-<component name="telephony_audio_routing_client_api" long-name="Telephony Audio Routing Client API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_client_api/group"/>
-</component>
-<component name="telephony_audio_routing_manager_api" long-name="Telephony Audio Routing Manager API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_manager_api/group"/>
-</component>
-<component name="video_buffer_management_mdf_custom_interface" long-name="Video Buffer Management MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_buffer_management_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_rotation_mdf_custom_interface" long-name="Video Decoder Rotation MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_scaling_mdf_custom_interface" long-name="Video Decoder Scaling MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
-</component>
-<component name="video_reclaim_extbuffers_ci" long-name="Video Reclaim Extbuffers Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_reclaim_extbuffers_ci/group"/>
-</component>
-<component name="video_window_control_custom_interface" long-name="Video Window Control Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="wma_decoder_interface_proxy_api" long-name="WMA Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/wma_decoder_interface_proxy_api/group"/>
-</component>
-<component name="eaacplusutil_api" long-name="EAac Plus Util API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/eaacplusutil_api/group"/>
-</component>
-<component name="frametable_api" long-name="Frametable API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/frametable_api/group"/>
-</component>
-</collection>
-<collection name="devsoundextensions" long-name="Devsound Extensions" level="device-fw">
-<component name="drmaudioplayer" filter="s60" long-name="DRM Audio Player">
-<unit bldFile="os/mm/devsoundextensions/drmaudioplayer/group"/>
-</component>
-<component name="mmextfw" filter="s60" long-name="Multimedia Extension Framework">
-<unit bldFile="os/mm/devsoundextensions/mmextfw/group"/>
-</component>
-<component name="audiorouting" filter="s60" long-name="Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/audiorouting/group"/>
-</component>
-<component name="effects" filter="s60" long-name="Effects">
-<unit bldFile="os/mm/devsoundextensions/effects/group"/>
-</component>
-<component name="effectspresets" filter="s60" long-name="Effects Presets">
-<unit bldFile="os/mm/devsoundextensions/effectspresets/group"/>
-</component>
-<component name="effectspresets_utils" filter="s60" long-name="Effects Presets Utils">
-<!-- need to #include the lot from a single bld.inf
- Also move to a standard component location, not under effectspresets -->
-<unit bldFile="os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
-<unit bldFile="os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
-</component>
-<component name="telephonyaudiorouting" filter="s60" long-name="Telephony Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/group"/>
-</component>
-<component name="mmfcustominterfaces" filter="s60" long-name="MMF Custom Interfaces">
-<unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/group"/>
-</component>
-<component name="addeddevsoundcontrol" filter="s60" long-name="Added DevSound Control">
-<unit bldFile="os/mm/devsoundextensions/addeddevsoundcontrol/group"/>
-</component>
-<component name="globalaudiosettings" filter="s60" long-name="Global Audio Settings">
-<unit bldFile="os/mm/devsoundextensions/globalaudiosettings/group"/>
-</component>
-<component name="restrictedaudiooutput" filter="s60" long-name="Restricted Audio Output">
-<unit bldFile="os/mm/devsoundextensions/restrictedaudiooutput/group"/>
-</component>
-<component name="ciextnfactoryplugins" filter="s60" long-name="Custom Interface Extension Factory Plugins" plugin="Y">
-<unit bldFile="os/mm/devsoundextensions/ciextnfactoryplugins/group"/>
-</component>
-</collection>
-<collection name="mdfdevvideoextensions" long-name="MDF Dev Video Extensions" level="device-fw">
-<component name="nga_mdf_postprocessor" long-name="NGA MDF Postprocessor" filter="s60">
-<unit bldFile="os/mm/mdfdevvideoextensions/nga_mdf_postprocessor/group"/>
-</component>
-</collection>
-<collection name="audio" long-name="Audio Codecs" level="middleware">
-<component name="arm_cmmf_codecs" filter="s60" long-name="ARM CMMF Codecs" plugin="Y">
-<unit bldFile="os/mm/audio/arm_cmmf_codecs/group"/>
-</component>
-</collection>
-<collection name="video" long-name="Video Codecs" level="middleware">
-<!-- empty -->
-</collection>
-<collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
-<component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/imagingandcamerafws/imagingfws/group" mrp="os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
-</component>
-<component name="camerafw" long-name="Camera Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/imagingandcamerafws/camerafw/group" mrp="os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
-</component>
-</collection>
-<collection name="mmlibs" long-name="Multimedia Libraries" level="middleware">
-<component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmutilitylib/group" mrp="os/mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
-</component>
-<component name="mmfw" long-name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmfw/group" mrp="os/mm/mmlibs/mmfw/group/multimedia_mmf.mrp"/>
-</component>
-</collection>
-<collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
-<component name="imagingplugins" long-name="Imaging Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/imagingplugins/group" mrp="os/mm/mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
-</component>
-<component name="cameraplugins" long-name="Camera Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/cameraplugins/group" mrp="os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
-</component>
-<component name="lib3gp" long-name="3GP Library" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/mmplugins/lib3gp/group" mrp="os/mm/mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
-</component>
-<component name="mmfwplugins" long-name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/mmfwplugins/group" mrp="os/mm/mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
-</component>
-</collection>
-<collection name="mm_info" long-name="Multimedia Info" level="app-if">
-<component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc">
-<unit mrp="os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
-</component>
-<component name="mm_metadata" long-name="Multimedia Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
-<component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="^2" purpose="development">
-<unit bldFile="os/mm/mmresourcemgmt/mmresctrl/group" mrp="os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
-</component>
-</collection>
-<collection name="mmdevicefw" long-name="Multimedia Device Framework" level="device-fw">
-<component name="mdf" long-name="Media Device Framework" introduced="9.2" purpose="mandatory">
-<unit bldFile="os/mm/mmdevicefw/mdf/group" mrp="os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
-</component>
-<component name="speechrecogsupport" long-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 name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
-<component name="videorenderer" long-name="Video Renderer" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/mmswadaptation/videorenderer/group" mrp="os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
-</component>
-</collection>
-<collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw"/>
-<collection name="omxil" long-name="OpenMAX IL" level="hw-if">
-<component name="omxilapi" long-name="OpenMAX IL API" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilapi/group" mrp="os/mm/omxil/omxilapi/group/multimedia_omx_il_api.mrp" version="1"/>
-</component>
-<component name="omxilcore" long-name="OpenMAX IL Core" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcore/group" mrp="os/mm/omxil/omxilcore/group/multimedia_omx_il_core.mrp" version="1"/>
-</component>
-<component name="omxilcomponentcommon" long-name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcomponentcommon/group" mrp="os/mm/omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp" version="1"/>
-</component>
-<component name="omxilrefcomps" long-name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilrefcomps/ref_components/group" mrp="os/mm/omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp" version="1"/>
-</component>
-<component name="mmilapi" long-name="Multimedia Integration Layer API" introduced="^3" purpose="development">
-<unit bldFile="os/mm/omxil/mmilapi/group" mrp="os/mm/omxil/mmilapi/group/multimedia_il_api.mrp"/>
-</component>
-</collection>
-<collection name="devsound" long-name="Sound Device" level="devices">
-<component name="devsoundapi" long-name="DevSound API" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/devsound/devsoundapi/group" mrp="os/mm/devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
-</component>
-<component name="a3fdevsound" long-name="A3F DevSound" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3fdevsound/group" mrp="os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
-</component>
-<component name="a3facf" long-name="A3F Audio Component Framework" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3facf/group" mrp="os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
-</component>
-<component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/devsound/devsoundpluginsupport/group" mrp="os/mm/devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
-</component>
-<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">
-<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">
-<unit bldFile="os/mm/devsound/a3ftrace/group" mrp="os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
-</component>
-<component name="a3fsrvstart" long-name="A3F Server Start" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
-</component>
-</collection>
-<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
-<component name="devsoundhwdeviceapi" long-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 name="a3facl" long-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 name="a3fdevsoundcustomisation" long-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"/>
-</component>
-<component name="refacladapt" long-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"/>
-</component>
-<component name="videohai" long-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 name="dvbhreceiverhai" long-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>
-</block>
-<block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
-<collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
-<component name="exif_api" long-name="Exif API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagingext_plat" long-name="Imaging Extensions Platform Interfaces" level="app-if">
-<component name="jpeg2000_icl_plugin_api" long-name="JPEG2000 ICL plugin API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/jpeg2000_icl_plugin_api/group"/>
-</component>
-<component name="extended_icl_jpeg_api" long-name="Extended ICL Jpeg API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
-</component>
-<component name="h324_annex_k_custom_api" long-name="H324 Annex K Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/h324_annex_k_custom_api/group"/>
-</component>
-<component name="ecam_orientation_custom_api" long-name="ECam Orientation Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_orientation_custom_api/group"/>
-</component>
-<component name="ecam_ui_orientation_override_custom_api" long-name="ECam UI Orientation Override Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
-</component>
-<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>
-</collection>
-<collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
-<component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
-<unit bldFile="os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
-</component>
-<component name="imageadaptationextensions_build" filter="s60" long-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"/>
-</component>
-</collection>
-<collection name="imagingmodules" long-name="Imaging Modules" level="hw-if">
-<component name="exiflib" filter="s60" long-name="Exif Library">
-<unit bldFile="os/imagingext/imagingmodules/exiflib/group"/>
-</component>
-<component name="jp2kcodec" filter="s60" long-name="JPEG2000 Decoder Plugin" plugin="Y">
-<unit bldFile="os/imagingext/imagingmodules/jp2kcodec/group"/>
-</component>
-</collection>
-</block>
-<block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
-<component name="vgi" filter="s60" long-name="VGI">
-<unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
-</component>
-</collection>
-<collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adaptations">
-<component name="m3gcore11" filter="s60" long-name="M3G Core 1.1">
-<unit bldFile="os/graphics/m3g/m3gcore11/group"/>
-</component>
-</collection>
-<collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines">
-<component name="graphicsresource" long-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 name="graphicsresourceadaptation" long-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"/>
-</component>
-<component name="graphicsresourceimplementation" long-name="Graphics Resource Implementation" introduced="^4" purpose="optional">
-<unit bldFile="os/graphics/graphicsresourceservices/graphicsresourceimplementation/group" mrp="os/graphics/graphicsresourceservices/graphicsresourceimplementation/group/graphics_graphicsresourceimplementation.mrp"/>
-</component>
-<component name="graphicsresourceinterface" long-name="Graphics Resource Interface" introduced="^4" purpose="optional">
-<unit bldFile="os/graphics/graphicsresourceservices/graphicsresourceinterface/group" mrp="os/graphics/graphicsresourceservices/graphicsresourceinterface/group/graphics_graphicsresourceinterface.mrp"/>
-</component>
-</collection>
-<collection name="graphicsutils" long-name="Graphics Utils" level="engines">
-<component name="commongraphicsheaders" long-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 name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
-<!-- displayldd to be moved here -->
-<component name="surfacemgr" long-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 name="graphicscomposition" long-name="Graphics Composition" level="engines">
-<component name="openwfcinterface" long-name="OpenWF Composition Interface" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfcinterface/group" mrp="os/graphics/graphicscomposition/openwfcinterface/group/graphics_openwfcinterface.mrp"/>
-</component>
-<component name="openwfcompositionengine" long-name="OpenWF Composition Engine" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/graphicscomposition/openwfcompositionengine/group" mrp="os/graphics/graphicscomposition/openwfcompositionengine/group/graphics_openwfcompositionengine.mrp"/>
-</component>
-<component name="openwfsupport" long-name="OpenWF Support" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfsupport/group" mrp="os/graphics/graphicscomposition/openwfsupport/group/graphics_openwfsupport.mrp"/>
-</component>
-<component name="surfaceupdate" long-name="Surface Update" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/surfaceupdate/group" mrp="os/graphics/graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
-</component>
-</collection>
-<collection name="graphicstest" long-name="Graphics Test" level="app-if">
-<component name="uibench" long-name="UI Bench" introduced="9.2" purpose="development">
-<unit bldFile="os/graphics/graphicstest/uibench/group" mrp="os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
-</component>
-</collection>
-<collection name="graphics_plat" long-name="Graphics Platform Interfaces" level="app-if">
-<component name="m3g_core_api" filter="sf_build" long-name="M3G Core API" class="api">
-<unit bldFile="os/graphics/graphics_plat/m3g_core_api/group"/>
-</component>
-</collection>
-<collection name="graphics_info" long-name="Graphics Info" level="app-if">
-<component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc">
-<unit mrp="os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
-</component>
-<component name="graphics_metadata" long-name="Graphics Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
-</component>
-</collection>
-<collection name="windowing" long-name="Windowing" level="app-if">
-<component name="windowserver" long-name="Window Server" purpose="mandatory">
-<unit bldFile="os/graphics/windowing/windowserver/group" mrp="os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
-</component>
-<component name="windowserverplugins" long-name="Window Server Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/windowing/windowserverplugins/group" mrp="os/graphics/windowing/windowserverplugins/group/graphics_wserv_std_plugins.mrp"/>
-</component>
-</collection>
-<collection name="printingservices" long-name="Printing Services" level="app-if">
-<component name="printerdriversupport" long-name="Printer Driver Support" purpose="optional">
-<unit bldFile="os/graphics/printingservices/printerdriversupport/group" mrp="os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
-</component>
-<component name="printerdrivers" long-name="Printer Drivers" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/printingservices/printerdrivers/group" mrp="os/graphics/printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
-</component>
-</collection>
-<collection name="fbs" long-name="Font and Bitmap Server" level="device-interface">
-<component name="fontandbitmapserver" long-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 name="opengles" long-name="OpenGLES" level="internal-adaptations">
-<component name="openglesinterface" long-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 name="opengles_stub" filter="sf_build" long-name="OpenGL ES Stub" purpose="optional" introduced="^2">
-<unit bldFile="os/graphics/opengles/openglesinterface/group/opengles_stub"/>
-</component>
-</collection>
-<collection name="openvg" long-name="OpenVG" level="internal-adaptations">
-<component name="openvginterface" long-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 name="openvg11" filter="s60" long-name="OpenVG 1.1">
-<!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
-<unit bldFile="os/graphics/openvg/openvginterface/group/openvg11"/>
-</component>
-<component name="sfopenvg" filter="sf_build" long-name="Khronos OpenVG Reference Implementation" introduced="^2" purpose="optional">
-<unit bldFile="os/graphics/openvg/openvgrefimplementation/sfopenvg/group"/>
-</component>
-</collection>
-<collection name="egl" long-name="EGL" level="internal-adaptations">
-<component name="eglinterface" long-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 name="eglswitch" long-name="EGL Switch" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglswitch/group" mrp="os/graphics/egl/eglswitch/group/graphics_eglswitch.mrp"/>
-</component>
-<component name="eglrefimpl" long-name="EGL Reference Implementation" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglrefimpl/group" mrp="os/graphics/egl/eglrefimpl/group/graphics_eglrefimpl.mrp"/>
-</component>
-<component name="egltest" long-name="EGL Tests" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/egl/egltest/group" mrp="os/graphics/egl/egltest/group/graphics_egltest.mrp"/>
-</component>
-</collection>
-<collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
-<component name="gdi" long-name="GDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/gdi/group" mrp="os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
-</component>
-<component name="bitgdi" long-name="BitGDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
-</component>
-<component name="colourpalette" long-name="Colour Palette" introduced="7.0s" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
-</component>
-<component name="screendriver" long-name="Screen Driver" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/graphicsdeviceinterface/screendriver/group" mrp="os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
-</component>
-<component name="directgdi" long-name="DirectGDI" introduced="^3" deprecated="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/directgdi/group" mrp="os/graphics/graphicsdeviceinterface/directgdi/group/graphics_directgdi.mrp"/>
-</component>
-<component name="directgdiinterface" long-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 name="directgdiadaptation" long-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"/>
-</component>
-</collection>
-<collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
-<component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/gdi_tools/group" mrp="os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
-</component>
-</collection>
-<collection name="graphicsapitest" long-name="Graphics API Tests" level="app-if"/>
-</block>
-<block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
-<collection name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" level="text">
-<component name="findutil_api" long-name="Find Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/findutil_api/group"/>
-</component>
-<component name="japanese_language_utilities_api" long-name="Japanese Language Utilities API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
-</component>
-<component name="sortutil_api" long-name="Sorting Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/sortutil_api/group"/>
-</component>
-</collection>
-<collection name="textandloc_pub" long-name="Text and Localisation Public Interfaces" level="text">
-<component name="directory_localizer_api" long-name="Directory Localizer API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_pub/directory_localizer_api/group"/>
-</component>
-</collection>
-<collection name="charconvfw" long-name="Character Conversion" level="encoding">
-<component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional">
-<unit bldFile="os/textandloc/charconvfw/charconv_fw/group" mrp="os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
-</component>
-<component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/charconvplugins/group" mrp="os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
-</component>
-<component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/fatfilenameconversionplugins/group" mrp="os/textandloc/charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
-</component>
-</collection>
-<collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
-<component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/textshaperplugin/group" mrp="os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
-</component>
-<component name="fontstore" long-name="Font Store" purpose="mandatory">
-<unit bldFile="os/textandloc/fontservices/fontstore/group" mrp="os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
-</component>
-<component name="textrendering" long-name="Text Rendering" purpose="mandatory" class="placeholder">
-<!-- placeholder for text code from GDI -->
-</component>
-<component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/freetypefontrasteriser/group" mrp="os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
-</component>
-<component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional">
-<unit bldFile="os/textandloc/fontservices/referencefonts/group" mrp="os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
-</component>
-</collection>
-<collection name="textlayout" long-name="Text Layout" level="text">
-<component name="texthandling" long-name="Text Handling" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/texthandling/group" mrp="os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
-</component>
-<component name="textformatting" long-name="Text Formatting" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/textformatting/group" mrp="os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
-</component>
-</collection>
-<collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
-<!-- components in this collection need to be moved to the right collection.
- Either move into the units' directories, or create a new textandlocutils directory -->
-<component name="numbergrouping" filter="s60" long-name="Number Grouping">
-<unit bldFile="os/textandloc/charconvfw/numbergrouping/group"/>
-</component>
-<component name="jplangutil" filter="s60" long-name="Japanese Language Utilities">
-<unit bldFile="os/textandloc/charconvfw/jplangutil/group"/>
-</component>
-<component name="sortutil" filter="s60" long-name="Sorting Utility">
-<unit bldFile="os/textandloc/charconvfw/sortutil/group"/>
-</component>
-<component name="inlinetext" filter="s60" long-name="Inline Text">
-<unit bldFile="os/textandloc/charconvfw/inlinetext/group"/>
-</component>
-<component name="nearestlangutil" long-name="Nearest Language Util" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-<component name="numberformatting" long-name="Number Formatting" introduced="7.0s" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/numberformatting/group" mrp="os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
-</component>
-</collection>
-<collection name="localesupport" long-name="Locale Support" level="util">
-<component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/localisation/localesupport" mrp="os/textandloc/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
-</component>
-<component name="initlocale" long-name="Initialise Locale" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-</collection>
-<collection name="textandloctools" long-name="Text and Localisation Tools" level="tools">
-<component name="fontcompiler" long-name="Font Compiler" purpose="development" class="placeholder PC">
-<!-- placeholder for split from GDI Tools -->
-</component>
-<component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/bitmapfonttools/group" mrp="os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
-</component>
-</collection>
-<collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
-<component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
-<collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
-<component name="xmlsrv_plat_build" long-name="XML Services Platform Interface Build" filter="s60" class="api">
-<!-- need to fix the configuration used here.
- Either destribute to other components or use the new feature flags confguration mechanisms.
- Remove this component and uncomment the other units when fixed-->
-<unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
-</component>
-<component name="xml_encryption_api" long-name="XML Encryption API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/> -->
-</component>
-<component name="xml_signature_api" long-name="XML Signature API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_signature_api/group"/> -->
-</component>
-<component name="xml_security_engine_utils_api" long-name="XML Security Engine Utils API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/> -->
-</component>
-</collection>
-<collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
-<component name="xmlseccertman" filter="s60" long-name="XML Security Certificate Manager">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
-</component>
-<component name="xmlsec" filter="s60" long-name="XML Security">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsec/group"/>
-</component>
-<component name="xmlseccrypto" filter="s60" long-name="XML Security Crypto">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccrypto/group"/>
-</component>
-<component name="xmlsecwrapper" filter="s60" long-name="XML Security Wrapper">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsecwrapper/group"/>
-</component>
-</collection>
-<collection name="xml" long-name="XML" level="generic">
-<component name="xmlfw" long-name="XML Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmlfw/group" mrp="os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
-</component>
-<component name="libxml2libs" long-name="Libxml2 Libraries" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/libxml2libs/group" mrp="os/xmlsrv/xml/libxml2libs/group/syslibs_libxml2.mrp"/>
-</component>
-<component name="legacyminidomparser" long-name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/legacyminidomparser/GROUP" mrp="os/xmlsrv/xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp"/>
-</component>
-<component name="xmldomandxpath" long-name="XML DOM and XPath" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmldomandxpath/group" mrp="os/xmlsrv/xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
-</component>
-<component name="xmlexpatparser" long-name="XML Expat Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmlexpatparser/group" mrp="os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
-</component>
-<component name="xmllibxml2parser" long-name="XML Libxml2 Parser" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmllibxml2parser/group" mrp="os/xmlsrv/xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
-</component>
-<component name="wbxmlparser" long-name="WBXML Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/wbxmlparser/group" mrp="os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
-</component>
-</collection>
-<collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
-<component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="deviceplatformrelease" level="services" long-name="Device Platform Release" levels="bld mid top">
-<collection name="s60extras" long-name="S60 Extras" level="mid">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="s60extras_build" filter="s60" long-name="S60 Extras Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/S60Extras/group"/>
-</component>
-</collection>
-<collection name="locfiles" long-name="Locale Files" level="mid">
-<component name="locfiles_build" filter="s60" long-name="S60 Locale Files Build" purpose="development" class="config">
-<!-- need to move component down a directory -->
-<unit bldFile="os/deviceplatformrelease/locfiles/group"/>
-</component>
-<component name="locfiles_set1" long-name="Locale Files Set 1" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set1"/>
-</component>
-<component name="locfiles_set2" long-name="Locale Files Set 2" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set2"/>
-</component>
-<component name="locfiles_set3" long-name="Locale Files Set 3" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set3"/>
-</component>
-<component name="locfiles_set4" long-name="Locale Files Set 4" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set4"/>
-</component>
-<component name="locfiles_set5" long-name="Locale Files Set 5" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set5"/>
-</component>
-<component name="locfiles_set6" long-name="Locale Files Set 6" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set6"/>
-</component>
-<!-- is the a problem with SF builds with the following? -->
-<component name="locfiles_set7" long-name="Locale Files Set 7" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set7"/>
-</component>
-<component name="locfiles_set8" long-name="Locale Files Set 8" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set8"/>
-</component>
-<component name="locfiles_set9" long-name="Locale Files Set 9" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set9"/>
-</component>
-<component name="locfiles_set10" long-name="Locale Files Set 10" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set10"/>
-</component>
-<component name="locfiles_set11" long-name="Locale Files Set 11" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set11"/>
-</component>
-<component name="locfiles_set12" long-name="Locale Files Set 12" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set12"/>
-</component>
-<component name="locfiles_set13" long-name="Locale Files Set 13" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set13"/>
-</component>
-<component name="locfiles_set14" long-name="Locale Files Set 14" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set14"/>
-</component>
-<component name="locfiles_set15" long-name="Locale Files Set 15" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set15"/>
-</component>
-<component name="locfiles_set16" long-name="Locale Files Set 16" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set16"/>
-</component>
-</collection>
-<collection name="version" long-name="Version" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="version_build" filter="s60" long-name="Version Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/Version/group"/>
-</component>
-</collection>
-<collection name="helps_loc2" long-name="Helps Locale 2" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helps_loc2_build" long-name="Helps Locale 2 Build" filter="s60">
-<unit bldFile="os/deviceplatformrelease/helps_loc2/group"/>
-</component>
-</collection>
-<collection name="sf_config" long-name="SF Config" level="mid">
-<component name="config" filter="s60" long-name="Config" purpose="development" class="config"/>
-<component name="cenrep" filter="sf_build" long-name="ConE Central Repository Config" purpose="development" class="config">
-<!-- will shoudl give the id/path something more unique than cenrep -->
-<unit bldFile="os/deviceplatformrelease/sf_config/cenrep/group"/>
-</component>
-</collection>
-<!-- should be located locally in buildplatforms/group
- <collection id="s60bld" name="S60 Build">
- <component id="buildplatforms" filter="s60" name="Build Platforms">
- <unit bldFile="/tools/buildplatforms/group"/>
- </component>
- </collection>-->
-<collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
-<component name="cedarutils" long-name="Cedar Utils" purpose="development">
-<unit mrp="os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
-</component>
-<component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt" purpose="development" class="config">
-<unit mrp="os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
-</component>
-<component name="foundation_s60_packages" long-name="Foundation S60 Packages" introduced="^3" deprecated="^3" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/symbianosbld/foundation_s60_packages/foundation_s60_packages.mrp"/>
-</component>
-</collection>
-<collection name="foundation_system" long-name="Foundation System" level="top">
-<component name="system_model" long-name="System Model" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
-</component>
-</collection>
-<collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
-<component name="deviceplatformrelease_metadata" long-name="Device Platform Release Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="osrndtools" level="services" long-name="OS R&D tools" levels="fw trace">
-<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"/>
-</component>
-<component name="testinterface" filter="s60" long-name="Test Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/testinterface/group"/>
-</component>
-<component name="testserver" filter="s60" long-name="Test Server" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserver/group"/>
-</component>
-<component name="testengine" filter="s60" long-name="Test Engine" purpose="development">
-<unit bldFile="os/osrndtools/stif/testengine/group"/>
-</component>
-<component name="testserverstarter" filter="s60" long-name="Test Server Starter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserverstarter/group"/>
-</component>
-<component name="stiftfwif" filter="s60" long-name="STIF Test Framework Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/stiftfwif/group"/>
-</component>
-<component name="consoleui" filter="s60" long-name="Console UI" purpose="development">
-<unit bldFile="os/osrndtools/stif/consoleui/group"/>
-</component>
-<component name="testcombiner" filter="s60" long-name="Test Combiner" purpose="development">
-<unit bldFile="os/osrndtools/stif/testcombiner/group"/>
-</component>
-<component name="demomodule" filter="s60" long-name="Demo Module" purpose="development">
-<unit bldFile="os/osrndtools/stif/demomodule/group"/>
-</component>
-<component name="atslogger" filter="s60" long-name="ATS Logger" purpose="development">
-<unit bldFile="os/osrndtools/stif/atslogger/group"/>
-</component>
-<component name="atsinterface" filter="s60" long-name="ATS Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/atsinterface/group"/>
-</component>
-<component name="testscripter" filter="s60" long-name="Test Scripter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testscripter/group"/>
-</component>
-<component name="suevent" filter="s60" long-name="SU Event" purpose="development">
-<unit bldFile="os/osrndtools/stif/suevent/group"/>
-</component>
-<component name="stifkerneltestclassbase" filter="s60" long-name="STIF Kernel Test Class Base" purpose="development">
-<!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
-<!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
-</component>
-<component name="stif_build" filter="s60" long-name="STIF Build" purpose="development">
-<!-- move exports into self-contained component. Remove this when configuration is in place-->
-<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">
-<unit bldFile="os/osrndtools/memspy/memspy_plat/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/engine/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/console/group"/>
-</component>
-<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>
-</collection>
-<collection name="hti" long-name="Harmonized Test Interface" level="trace">
-<component name="hti_plat" filter="s60" long-name="HTI Platform Interfaces" purpose="development" class="api">
-<unit bldFile="os/osrndtools/hti/hti_plat/group"/>
-</component>
-<component name="hticfg" filter="s60" long-name="HTI Config" purpose="development">
-<unit bldFile="os/osrndtools/hti/hticfg/group"/>
-</component>
-<component name="htiautostart" filter="s60" long-name="HTI Autostart" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiautostart/group"/>
-</component>
-<component name="htiframework" filter="s60" long-name="HTI Framework" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiframework/group"/>
-</component>
-<component name="hticommplugins" filter="s60" long-name="HTI Communication Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
-</component>
-<component name="htiserviceplugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
-</component>
-<component name="htifilehlp" filter="s60" long-name="HTI File Help" purpose="development">
-<unit bldFile="os/osrndtools/hti/htifilehlp/group"/>
-</component>
-<component name="htiwatchdog" filter="s60" long-name="HTI Watchdog" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiwatchdog/group"/>
-</component>
-<component name="hti_build" filter="s60" long-name="HTI Build" purpose="development">
-<!-- move exports into self-contained component.-->
-<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">
-<block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
-<collection name="appsupport_pub" long-name="Generic Application Support Public Interfaces" level="specific">
-<component name="flash_viewer_framework_api" long-name="Flash Viewer Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
-</component>
-<component name="network_status_api" long-name="Network Status API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/network_status_api/group"/>
-</component>
-</collection>
-<collection name="appsupport_plat" long-name="Generic Application Support Platform Interfaces" level="specific">
-<component name="action_plugin_api" long-name="Action Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/action_plugin_api/group"/>
-</component>
-<component name="application_orientation_api" long-name="Application Orientation API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/application_orientation_api/group"/>
-</component>
-<component name="context_access_api" long-name="Context Access API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_access_api/group"/>
-</component>
-<component name="context_framework_services_api" long-name="Context Framework Services API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_services_api/group"/>
-</component>
-<component name="context_framework_client_api" long-name="Context Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_client_api/group"/>
-</component>
-<component name="context_framework_listener_api" long-name="Context Framework Listener API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_listener_api/group"/>
-</component>
-<component name="context_framework_version_api" long-name="Context Framework Version API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_version_api/group"/>
-</component>
-<component name="context_source_plugin_api" long-name="Context Source Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_plugin_api/group"/>
-</component>
-<component name="context_source_settings_manager_api" long-name="Context Source Settings Manager API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_settings_manager_api/group"/>
-</component>
-<component name="context_subscription_api" long-name="Context Subscription API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_subscription_api/group"/>
-</component>
-<component name="key_event_framework_api" long-name="Key Event Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_api/group"/>
-</component>
-<component name="key_event_framework_mapper_api" long-name="Key Event Framework Mapper API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_mapper_api/group"/>
-</component>
-<component name="media_keys_definition_api" long-name="Media Keys Definition API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/media_keys_definition_api/group"/>
-</component>
-<component name="ood_threshold_api" long-name="OOD Threshold API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/ood_threshold_api/group"/>
-</component>
-<component name="oom_monitor_api" long-name="OOM Monitor API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_api/group"/>
-</component>
-<component name="oom_monitor_plugin_api" long-name="OOM Monitor Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_plugin_api/group"/>
-</component>
-<component name="operation_provider_api" long-name="Operation Provider API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/operation_provider_api/group"/>
-</component>
-<component name="phonecmdhandler_api" long-name="Phone Command Handler API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/phonecmdhandler_api/group"/>
-</component>
-<component name="restore_factory_settings_api" long-name="Restore Factory Settings API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_api/group"/>
-</component>
-<component name="restore_factory_settings_plugin_api" long-name="Restore Factory Settings Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_plugin_api/group"/>
-</component>
-<component name="secondary_display_accfw_api" long-name="Secondary Display Accessory Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_accfw_api/group"/>
-</component>
-<component name="secondary_display_startup_api" long-name="Secondary Display Startup API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_startup_api/group"/>
-</component>
-<component name="secondary_display_sysap_api" long-name="Secondary Display System Application API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_sysap_api/group"/>
-</component>
-<component name="secondary_display_system_state_api" long-name="Secondary Display System State API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_system_state_api/group"/>
-</component>
-<component name="sensor_user_setting_api" long-name="Sensor User Setting API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/sensor_user_setting_api/group"/>
-</component>
-<component name="startup_configuration_api" long-name="Startup Configuration API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/startup_configuration_api/group"/>
-</component>
-<component name="system_application_key_handler_plugin_api" long-name="System Application Key Handler Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_key_handler_plugin_api/group"/>
-</component>
-<component name="system_application_light_control_plugin_api" long-name="System Application Light Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_light_control_plugin_api/group"/>
-</component>
-<component name="system_application_notification_api" long-name="System Application Notification API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_notification_api/group"/>
-</component>
-<component name="system_application_plugin_callback_api" long-name="System Application Plug-in Callback API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
-</component>
-<component name="flash_mmi_service_interface_custom_api" long-name="Flash MMI Service Interface Custom API" filter="s60,!sf_build" introduced="^2" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/flash_mmi_service_interface_custom_api/group"/>
-</component>
-<component name="flash_netscape_plugin_command_api" long-name="Flash Netscape Plugin Command API" filter="s60,!sf_build" introduced="^2" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/flash_netscape_plugin_command_api/group"/>
-</component>
-</collection>
-<collection name="contextframework" long-name="Context Framework" level="framework">
-<!-- the units that are commented out need to be put back when configuration is in place.
- They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
-<component name="cfw" filter="s60" long-name="Context Framework">
-<!--<unit bldFile="contextframework/cfw/group"/> -->
-</component>
-<component name="cfwplugins" filter="s60" long-name="Context Framework Plugins" plugin="Y">
-<!--<unit bldFile="contextframework/cfwplugins/group"/>-->
-</component>
-<component name="contextframework_build" filter="s60" long-name="Context Framework Build">
-<unit bldFile="mw/appsupport/contextframework/group"/>
-</component>
-</collection>
-<collection name="coreapplicationuis" long-name="Core Application UIs" level="server">
-<component name="dbrecovery" filter="s60" long-name="Database Recovery">
-<unit bldFile="mw/appsupport/coreapplicationuis/dbrecovery/group"/>
-</component>
-<component name="nspswsplugin" filter="s60" long-name="NSPS WS Plugin" plugin="Y">
-<!-- No Service Power Save? Window Server? Please elaborate-->
-<unit bldFile="mw/appsupport/coreapplicationuis/nspswsplugin/group"/>
-</component>
-<component name="rfs" filter="s60" long-name="Restore Factory Settings">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfs/group"/>
-</component>
-<component name="rfsplugins" filter="s60" long-name="Restore Factory Settings Plugins" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/group"/>
-</component>
-<component name="sysap" filter="s60" long-name="System Application">
-<unit bldFile="mw/appsupport/coreapplicationuis/sysap/group"/>
-</component>
-<component name="variatedsettings" filter="s60" long-name="Variated Settings" class="config">
-<unit bldFile="mw/appsupport/coreapplicationuis/variatedsettings/group"/>
-</component>
-<component name="accfwuinotifier" filter="s60" long-name="Accessory Framework UI Notifier" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/accfwuinotifier/group"/>
-</component>
-<component name="kefmapper" filter="s60" long-name="Key Event Framework">
-<unit bldFile="mw/appsupport/coreapplicationuis/kefmapper/group"/>
-</component>
-<component name="advancedtspcontroller" filter="s60" long-name="Advanced TSP Controller">
-<unit bldFile="mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
-</component>
-<component name="powersaveutilities" filter="s60" long-name="Power Save Utilities">
-<unit bldFile="mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
-</component>
-<component name="gsserverenginestub" filter="s60" long-name="GS Server Engine Stub">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
-</component>
-<component name="gsserverengine" filter="s60" long-name="GS Server Engine">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverengine/group"/>
-</component>
-<component name="sensordatacompensatorplugin" filter="s60" long-name="Sensor Data Compensator Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/group"/>
-</component>
-<component name="atcmdplugin" long-name="AT Command Plugin" filter="s60,!oem_build" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/atcmdplugin/group"/>
-</component>
-</collection>
-<collection name="flashliteapi_3_1" long-name="Flash Lite API 3.1" level="specific">
-<!-- collection is really a component. Move down a directory -->
-<component name="flashliteapi_3_1_build" long-name="Flash Lite API Build" filter="s60" introduced="^2"/>
-</collection>
-<collection name="mediakeys" long-name="Media Keys" level="plugin">
-<!-- collection is really a component. Move down a directory -->
-<component name="mediakeys_build" filter="s60" long-name="Media Keys Build">
-<unit bldFile="mw/appsupport/mediakeys/group"/>
-</component>
-</collection>
-<collection name="startupservices" long-name="Startup Services" level="system">
-<component name="splashscreen" filter="s60" long-name="Splash Screen">
-<unit bldFile="mw/appsupport/startupservices/splashscreen/group"/>
-</component>
-<component name="startupanimation" filter="s60" long-name="Startup Animation">
-<unit bldFile="mw/appsupport/startupservices/startupanimation/group"/>
-</component>
-<component name="startup" long-name="Startup Application" filter="s60">
-<unit bldFile="mw/appsupport/startupservices/startup/group"/>
-</component>
-</collection>
-<collection name="sysresmonitoring" long-name="System Resource Monitoring" level="system">
-<component name="oodmonitor" filter="s60" long-name="OOD Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oodmonitor/group"/>
-</component>
-<component name="oommonitor" filter="s60" long-name="OOM Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oommonitor/group"/>
-</component>
-</collection>
-<collection name="systemsettings" long-name="System Settings" level="system">
-<component name="gssensorplugin" filter="s60" long-name="GS Sensor Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gssensorplugin/group"/>
-</component>
-<component name="gsaccessoryplugin" filter="s60" long-name="GS Accessory Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gsaccessoryplugin/group"/>
-</component>
-</collection>
-<collection name="filehandling" long-name="File Handling" level="server">
-<component name="fileconverterfw" long-name="File Converter Framework" purpose="optional">
-<unit bldFile="mw/appsupport/filehandling/fileconverterfw/group" mrp="mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
-</component>
-<component name="htmltorichtextconverter" long-name="HTML to RichText Converter" introduced="7.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/htmltorichtextconverter/group" mrp="mw/appsupport/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
-</component>
-<component name="richtexttohtmlconverter" long-name="RichText to HTML Converter" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
-</component>
-</collection>
-<collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
-<component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
-</component>
-</collection>
-<collection name="commonappservices" long-name="Common Application Services" level="framework">
-<component name="alarmserver" long-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"/>
-</component>
-<component name="alarmservertest" long-name="Alarm Server Test" deprecated="^3" introduced="8.1" purpose="development">
-<unit bldFile="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
-</component>
-<component name="appservicesdocs" long-name="Application Services Documentation" purpose="development" class="doc">
-<unit mrp="mw/appsupport/commonappservices/appservicesdocs/app-services_documentation.mrp"/>
-</component>
-<component name="backuprestorenotification" long-name="Backup Restore Notification" introduced="8.1" purpose="optional">
-<unit bldFile="mw/appsupport/commonappservices/backuprestorenotification/group" mrp="mw/appsupport/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
-</component>
-</collection>
-<collection name="tzservices" long-name="Time Zone Services" level="plugin">
-<component name="tzserver" long-name="Time Zone Server" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzserver/group" mrp="mw/appsupport/tzservices/tzserver/group/app-services_tz.mrp"/>
-</component>
-<component name="tzloc" long-name="Time Zone Localization" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzloc/group" mrp="mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
-</component>
-<component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzlocrscfactory/group" mrp="mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
-</component>
-<component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzdatabase/group" mrp="mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
-</component>
-</collection>
-<collection name="contenthandling" long-name="Content Handling" level="plugin">
-<component name="webrecognisers" long-name="Web Recognisers" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/contenthandling/webrecognisers/group" mrp="mw/appsupport/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
-</component>
-</collection>
-<collection name="openenvutils" long-name="Open Environment Utilities" level="specific">
-<component name="commandshell" long-name="Command Shell" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/commandshell/group" mrp="mw/appsupport/openenvutils/commandshell/group/oetools_zsh.mrp"/>
-</component>
-<component name="telnetserver" long-name="Telnet Server" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/telnetserver/group" mrp="mw/appsupport/openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
-</component>
-</collection>
-<collection name="printingsupport" long-name="Printing Support" level="generic">
-<component name="printinguisupport" long-name="Printing UI Support" purpose="optional" introduced="^2" deprecated="^3">
-<unit bldFile="mw/appsupport/printingsupport/printinguisupport/group" mrp="mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
-</component>
-</collection>
-<collection name="appfw" long-name="Application Framework" level="framework">
-<component name="apparchitecture" long-name="Application Architecture" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/apparchitecture/group" mrp="mw/appsupport/appfw/apparchitecture/group/app-framework_apparc.mrp"/>
-</component>
-<component name="viewserver" long-name="View Server" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/viewserver/group" mrp="mw/appsupport/appfw/viewserver/group/app-framework_viewsrv.mrp"/>
-</component>
-</collection>
-<collection name="applaunchservices" long-name="Application Launch Services" level="generic">
-<component name="aftermarketappstarter" long-name="After Market Application Starter" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/aftermarketappstarter/group" mrp="mw/appsupport/applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
-</component>
-<component name="applaunchplugins" long-name="Application Launch Plugins" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/applaunchplugins/group" mrp="mw/appsupport/applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
-</component>
-</collection>
-<collection name="tzpcside" long-name="Time Zone PC Side" level="plugin">
-<component name="tzcompiler" long-name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config PC">
-<unit bldFile="mw/appsupport/tzpcside/tzcompiler/group" mrp="mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
-</component>
-</collection>
-<collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
-<component name="appsupport_metadata" long-name="Generic Application Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="securitysrv" level="generic" long-name="Security Services" levels="plugin framework server generic specific">
-<collection name="secsrv_plat" long-name="Security Services Platform Interfaces" level="specific">
-<component name="cms_api" long-name="CMS API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/cms_api/group"/>
-</component>
-<component name="pkcs12_parser_api" long-name="PKCS12 Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkcs12_parser_api/group"/>
-</component>
-<component name="java_utils_api" long-name="Java Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/java_utils_api/group"/>
-</component>
-<component name="wim_cert_api" long-name="WIM Cert API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/wim_cert_api/group"/>
-</component>
-<component name="device_key_store_encryption_plugin_api" long-name="Device Key Store Encryption Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/device_key_store_encryption_plugin_api/group"/>
-</component>
-<component name="x509certnameparser_api" long-name="X.509 Certificate Name Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
-</component>
-<component name="remote_lock_api" long-name="Remote Lock API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
-</component>
-<component name="pkidialog_api" long-name="PKI Dialog API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
-</component>
-<component name="provisioning_api" long-name="Provisioning API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/provisioning_api/group"/>
-</component>
-<component name="keyguard_configuration_api" long-name="Keyguard Configuration API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_configuration_api/group"/>
-</component>
-<component name="keylock_policy_api" long-name="Keylock Policy API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keylock_policy_api/group"/>
-</component>
-<component name="security_code_ui_api" long-name="Security Code UI API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
-</component>
-<component name="gba_api" long-name="GBA API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/gba_api/group"/>
-</component>
-<component name="keyguard_access_api" long-name="Keyguard Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_access_api/group"/>
-</component>
-<component name="devicelock_access_api" long-name="Device Lock Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devicelock_access_api/group"/>
-</component>
-<component name="lockapp_server_api" long-name="Lock Application Server API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
-</component>
-<component name="devencadaptation_api" long-name="Device Encryption Adaptation API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
-</component>
-<component name="devenccommonutils_api" long-name="Device Encryption Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
-</component>
-</collection>
-<collection name="cms" long-name="Certificate Management Service" level="server">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="cms_build" filter="s60" long-name="CMS" introduced="^3">
-<unit bldFile="mw/securitysrv/cms/group"/>
-</component>
-</collection>
-<collection name="pkiutilities" long-name="PKI Utilities" level="plugin">
-<component name="x509certnameparser" filter="s60" long-name="X.509 Certificate Name Parser">
-<unit bldFile="mw/securitysrv/pkiutilities/x509certnameparser/group"/>
-</component>
-<component name="pkcs12" filter="s60" long-name="PKCS #12">
-<unit bldFile="mw/securitysrv/pkiutilities/pkcs12/group"/>
-</component>
-<component name="certmanui" filter="s60" long-name="Certificate Management UI">
-<unit bldFile="mw/securitysrv/pkiutilities/certmanui/group"/>
-</component>
-<component name="ctsecuritydialogs" filter="s60" long-name="Crypto Token Security Dialogs">
-<unit bldFile="mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
-</component>
-<component name="certsaver" filter="s60" long-name="Certificate Saver">
-<unit bldFile="mw/securitysrv/pkiutilities/certsaver/group"/>
-</component>
-<component name="secmodui" filter="s60" long-name="Security Module UI">
-<unit bldFile="mw/securitysrv/pkiutilities/secmodui/group"/>
-</component>
-<component name="devicetoken" filter="s60" long-name="Device Token">
-<unit bldFile="mw/securitysrv/pkiutilities/devicetoken/group"/>
-</component>
-<component name="certificates" filter="s60" long-name="Certificates">
-<unit bldFile="mw/securitysrv/pkiutilities/Certificates/group" filter="sf_build"/>
-</component>
-<component name="pkiutilities_build" filter="s60" long-name="PKI Utilities Build">
-<!-- need to split this into the above components -->
-<unit bldFile="mw/securitysrv/pkiutilities/group"/>
-</component>
-<component name="ocsp" long-name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
-<unit bldFile="mw/securitysrv/pkiutilities/ocsp/group" mrp="mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
-</component>
-</collection>
-<collection name="wim" long-name="Wireless Identity Module " level="framework">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="wim_build" filter="s60" long-name="WIM Build">
-<unit bldFile="mw/securitysrv/wim/group"/>
-</component>
-</collection>
-<collection name="remotelock" long-name="Remote Lock" level="generic">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="remotelock_build" filter="s60" long-name="Remote Lock Build">
-<unit bldFile="mw/securitysrv/remotelock/group"/>
-</component>
-</collection>
-<collection name="securitydialogs" long-name="Security Dialogs" level="specific">
-<component name="keylockpolicyapi" filter="s60" long-name="Keylock Policy API">
-<unit bldFile="mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
-</component>
-<component name="autolock" long-name="Autolock" filter="s60">
-<unit bldFile="mw/securitysrv/securitydialogs/autolock/group"/>
-</component>
-<component name="secui" filter="s60" long-name="Security UI">
-<unit bldFile="mw/securitysrv/securitydialogs/secui/group"/>
-</component>
-<component name="securitynotifier" filter="s60" long-name="Security Notifier">
-<unit bldFile="mw/securitysrv/securitydialogs/securitynotifier/group"/>
-</component>
-<component name="lockclient" filter="s60" long-name="Lock Client" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockclient/group"/>
-</component>
-<component name="lockapp" filter="s60" long-name="Lock Application" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockapp/group"/>
-</component>
-<component name="secuinotifications" long-name="Security UI Notifications" introduced="^4" filter="s60">
-<unit bldFile="mw/securitysrv/securitydialogs/secuinotifications"/>
-</component>
-</collection>
-<collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="boottimeintegritycheck_build" filter="s60" long-name="Boot Time Integrity Check Build">
-<unit bldFile="mw/securitysrv/boottimeintegritycheck/group"/>
-</component>
-</collection>
-<collection name="gba" long-name="Generic Bootstrapping Architecture" level="server">
-<component name="uicc" filter="s60" long-name="UICC" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/uicc/group"/>
-</component>
-<component name="gbaserver" filter="s60" long-name="GBA Server" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaserver/group"/>
-</component>
-<component name="gbaapi" filter="s60" long-name="GBA API" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaapi/group"/>
-</component>
-<component name="gbafilter" filter="s60" long-name="GBA HTTP Filter" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/gbafilter/group"/>
-</component>
-<component name="gba_build" filter="s60" long-name="Generic Boot Architecture Build" introduced="^2">
-<!-- need to split this into the above components, or remove #includes and make this GBA ROM -->
-<unit bldFile="mw/securitysrv/gba/group"/>
-</component>
-</collection>
-<collection name="devencdiskutils" long-name="Device Encryption Disk Utils" level="server">
-<component name="devenccommonutils" filter="s60" long-name="Device Encryption Common Utils" introduced="^3">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncCommonUtils/group"/>
-</component>
-<component name="devencrfsplugin" filter="s60" long-name="Device Encryption RFS Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncRfsPlugin/group"/>
-</component>
-<component name="pk5recognizer" filter="s60" long-name="Device Encryption Pk5 Recognizer" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/Pk5Recognizer/group"/>
-</component>
-<component name="devencstarter" filter="s60" long-name="Device Encryption Starter" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncStarter/group"/>
-</component>
-<component name="devencdiskutils" filter="s60" long-name="Device Encryption Disk Utils Build" introduced="^3">
-<!-- need to split this into the above components, or remove #includes and make this a ROM component-->
-<unit bldFile="mw/securitysrv/devencdiskutils/group"/>
-</component>
-</collection>
-<collection name="securitysrv_info" long-name="Security Services Info" level="specific">
-<component name="securitysrv_metadata" long-name="Security Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="drm" level="generic" long-name="DRM" levels="plugin framework server generic specific">
-<collection name="drm_plat" long-name="DRM Platform Interfaces" level="specific">
-<component name="roap_api" long-name="ROAP API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/roap_api/group"/>
-</component>
-<component name="drm_common_api" long-name="DRM Common API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_common_api/group"/>
-</component>
-<component name="drm_rights_api" long-name="DRM Rights API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_rights_api/group"/>
-</component>
-<component name="drm_legacy_api" long-name="DRM Legacy API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_legacy_api/group"/>
-</component>
-<component name="dcf_repository_api" long-name="DCF Repository API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/dcf_repository_api/group"/>
-</component>
-<component name="drm_service_api" long-name="DRM Service API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_service_api/group"/>
-</component>
-<component name="drm_secondary_display_api" long-name="DRM Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_secondary_display_api/group"/>
-</component>
-<component name="drm_license_manager_api" long-name="DRM License Manager API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_license_manager_api/group"/>
-</component>
-<component name="drm_utility_api" long-name="DRM Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_utility_api/group"/>
-</component>
-<component name="drm_agents_api" long-name="DRM Agents API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_agents_api/group"/>
-</component>
-<component name="wmdrm_core_api" long-name="WM DRM Core API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_core_api/group"/>
-</component>
-<component name="wmdrm_access_api" long-name="WMDRM Access API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_access_api/group"/>
-</component>
-<component name="camese_utility_api" long-name="Camese Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_utility_api/group"/>
-</component>
-<component name="camese_framework_api" long-name="Camese Framework API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_framework_api/group"/>
-</component>
-</collection>
-<collection name="drm_pub" long-name="DRM Public Interfaces" level="specific">
-<component name="drm_helper_api" long-name="DRM Helper API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_helper_api/group"/>
-</component>
-<component name="oma_drm_caf_agent_api" long-name="OMA DRM CAF Agent API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/group"/>
-</component>
-<component name="drm_license_checker_api" long-name="DRM License Checker API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_license_checker_api/group"/>
-</component>
-</collection>
-<collection name="commondrm" long-name="Common DRM" level="generic">
-<!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
-<component name="drmencryptor" filter="s60" long-name="DRM Encryptor" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmsettingsplugin" filter="s60" long-name="DRM Settings Plugin" plugin="Y" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmrightsmanagerui" filter="s60" long-name="DRM Rights Manager UI">
-<unit bldFile="mw/drm/commondrm/drmrightsmanagerui/help/group"/>
-</component>
-<component name="drmutility" filter="s60" long-name="DRM Utility">
-<!-- Uncomment unit when configuration is in place. Currently #included from commondrm_build -->
-<!--<unit bldFile="commondrm/drmutility/group"/>-->
-</component>
-<component name="drmserviceapiwrapper" filter="s60" long-name="DRM Service API Wrapper">
-<unit bldFile="mw/drm/commondrm/drmserviceapiwrapper/group"/>
-</component>
-<component name="drmrightsstoringlocation" filter="s60" long-name="DRM Rights Storing Location">
-<unit bldFile="mw/drm/commondrm/drmrightsstoringlocation/group"/>
-</component>
-<component name="commondrm_build" filter="s60" long-name="Common DRM Build">
-<!-- should be split into the above files, or them collapsed into a single component -->
-<unit bldFile="mw/drm/commondrm/group"/>
-</component>
-</collection>
-<collection name="omadrm" long-name="OMA DRM" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="omadrm_build" filter="s60" long-name="OMA DRM Build">
-<unit bldFile="mw/drm/omadrm/group"/>
-</component>
-<component name="foundationcerts" filter="sf_build" long-name="Foundation Certificates">
-<unit bldFile="mw/drm/omadrm/foundationcerts/group"/>
-</component>
-</collection>
-<collection name="wmdrm" long-name="Windows Media DRM" level="framework">
-<!-- collection is really a component. Move down a directory -->
-<component name="wmdrm_build" filter="s60" long-name="WM DRM Build">
-<unit bldFile="mw/drm/wmdrm/group"/>
-</component>
-</collection>
-<collection name="drm_info" long-name="DRM Info" level="specific"/>
-</block>
-<block name="locationsrv" level="specific" long-name="Location Services" levels="plugin fw server if">
-<collection name="locsrv_pub" long-name="Location Services Public Interfaces" level="if">
-<component name="landmarks_search_api" long-name="Landmarks Search API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
-</component>
-<component name="landmarks_api" long-name="Landmarks API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/group"/>
-</component>
-<component name="landmarks_database_management_api" long-name="Landmarks Database Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/group"/>
-</component>
-<component name="location_triggering_api" long-name="Location Triggering API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/location_triggering_api/group"/>
-</component>
-<component name="blid_application_satellite_info_api" long-name="BLID Application Satellite Info API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/group"/>
-</component>
-</collection>
-<collection name="locsrv_plat" long-name="Location Services Platform Interfaces" level="if">
-<component name="map_and_navigation_api" long-name="Map and Navigation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/group"/>
-</component>
-<component name="map_and_navigation_provider_discovery_api" long-name="Map and Navigation Provider Discovery API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/group"/>
-</component>
-<component name="geocoding_api" long-name="Geocoding API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
-</component>
-<component name="map_image_api" long-name="Map Image API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/group"/>
-</component>
-<component name="map_and_navigation_aiw_api" long-name="Map and Navigation AIW API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_aiw_api/group"/>
-</component>
-<component name="map_and_navigation_provider_api" long-name="Map and Navigation Provider API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_api/group"/>
-</component>
-<component name="landmarks_category_definition_api" long-name="Landmarks Category Definition API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
-</component>
-<component name="supl_settings_api" long-name="SUPL Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
-</component>
-<component name="location_settings_launch_api" long-name="Location Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/group"/>
-</component>
-<component name="map_image_conversion_plugin_api" long-name="Map Image Conversion Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/group"/>
-</component>
-<component name="psy_configuration_ui_plugin_api" long-name="PSY Configuration UI Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/psy_configuration_ui_plugin_api/group"/>
-</component>
-<component name="np_proxy_configuration_api" long-name="NP Proxy Configuration API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/np_proxy_configuration_api/group"/>
-</component>
-<component name="supl_terminal_initiation_api" long-name="SUPL Terminal Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/group"/>
-</component>
-<component name="location_notation_preferences_settings_api" long-name="Location Notation Preferences Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_notation_preferences_settings_api/group"/>
-</component>
-<component name="supl_settings_notifier_secondary_display_api" long-name="SUPL Settings Notifier Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_notifier_secondary_display_api/group"/>
-</component>
-<component name="supl_network_initiation_api" long-name="SUPL Network Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/group"/>
-</component>
-<component name="privacy_notifiers_secondary_display_api" long-name="Privacy Notifiers Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/privacy_notifiers_secondary_display_api/group"/>
-</component>
-<component name="oma_supl_configuration_parameter_api" long-name="OMA SUPL Configuration Parameter API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_configuration_parameter_api/group"/>
-</component>
-<component name="supl_query_secondary_display_api" long-name="SUPL Query Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_query_secondary_display_api/group"/>
-</component>
-<component name="location_triggering_management_api" long-name="Location Triggering Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_management_api/group"/>
-</component>
-<component name="location_triggering_status_information_api" long-name="Location Triggering Status Information API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_status_information_api/group"/>
-</component>
-<component name="oma_supl_asn_codec_plugin_api" long-name="OMA SUPL ASN Codec Plugin API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
-</component>
-<component name="query_and_notification_api" long-name="Query and Notification API" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/query_and_notification_api/group"/>
-</component>
-<component name="location_local_variation_api" long-name="Location Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_local_variation_api/group"/>
-</component>
-</collection>
-<collection name="genericpositioningplugins" long-name="Generic Positioning Plugins" level="plugin">
-<component name="locationnpppsy" filter="s60" long-name="Location Positioning Proxy PSY" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
-</component>
-<component name="locationsuplpsy" filter="s60" long-name="Location SUPL PSY" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationsuplpsy/group"/>
-</component>
-<component name="genericpositioningplugins_build" filter="s60" long-name="Generic Positioning Plugins Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/genericpositioningplugins/group"/>
-</component>
-</collection>
-<collection name="landmarks" long-name="Landmarks" level="server">
-<component name="locationlandmarks" filter="s60" long-name="Location Landmarks">
-<unit bldFile="mw/locationsrv/landmarks/locationlandmarks/group"/>
-</component>
-</collection>
-<collection name="locationmapnavfw" long-name="Location Map and Navigation Framework" level="fw">
-<component name="mnlibrary" filter="s60" long-name="Map and Navigation Library">
-<unit bldFile="mw/locationsrv/locationmapnavfw/library/group"/>
-</component>
-<component name="mnaiwprovider" filter="s60" long-name="Map and Navigation AIW Provider" plugin="Y">
-<unit bldFile="mw/locationsrv/locationmapnavfw/aiwprovider/group"/>
-</component>
-<component name="locationmapnavfw_build" filter="s60" long-name="Location Map and Navigation Framework Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/locationmapnavfw/group"/>
-</component>
-</collection>
-<collection name="locationsystemui" long-name="Location System UI" level="if">
-<component name="locationsysui" filter="s60" long-name="Location System UI">
-<unit bldFile="mw/locationsrv/locationsystemui/locationsysui/group"/>
-</component>
-</collection>
-<collection name="supl" long-name="SUPL" level="fw">
-<component name="locationsuplfw" filter="s60" long-name="Location SUPL Framework">
-<unit bldFile="mw/locationsrv/supl/locationsuplfw/group"/>
-</component>
-<component name="locationomasuplprotocolhandler" filter="s60" long-name="OMA SUPL Protocol Handler">
-<unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/group"/>
-</component>
-<component name="supltiapiimplementation" filter="s60" long-name="SUPL TI API Implementation" introduced="^3">
-<unit bldFile="mw/locationsrv/supl/supltiapiimplementation/group"/>
-</component>
-</collection>
-<collection name="locationtriggering" long-name="Location Triggering" level="server">
-<component name="ltlogger" filter="s60" long-name="LT Logger">
-<unit bldFile="mw/locationsrv/locationtriggering/ltlogger/group"/>
-</component>
-<component name="ltclientlib" filter="s60" long-name="LT Client Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltclientlib/group"/>
-</component>
-<component name="ltmanagementlib" filter="s60" long-name="LT Management Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmanagementlib/group"/>
-</component>
-<component name="ltcontainer" filter="s60" long-name="LT Container">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontainer/group"/>
-</component>
-<component name="ltserver" filter="s60" long-name="LT Server">
-<unit bldFile="mw/locationsrv/locationtriggering/ltserver/group"/>
-</component>
-<component name="ltstrategypluginapi" filter="s60" long-name="LT Strategy Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategypluginapi/group"/>
-</component>
-<component name="ltstrategyengine" filter="s60" long-name="LT Strategy Engine">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategyengine/group"/>
-</component>
-<component name="ltmovementdetectionpluginapi" filter="s60" long-name="Movement Detection Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmovementdetectionpluginapi/group"/>
-</component>
-<component name="ltcellidmovementdetector" filter="s60" long-name="Cell ID Movement Detector">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/>
-</component>
-<component name="lbtmgmtui" filter="s60" long-name="LBT Management UI" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/lbtmgmtui/group"/>
-</component>
-<component name="ltcontextsourceplugin" filter="s60" long-name="LT Context Source Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontextsourceplugin/group"/>
-</component>
-<component name="locationtriggering_build" filter="s60" long-name="Location Triggering Build">
-<!-- should remove #include from this and maybe put exports in the above components -->
-<unit bldFile="mw/locationsrv/locationtriggering/group"/>
-</component>
-</collection>
-</block>
-<block name="accesssec" level="generic" long-name="Access Security" levels="plugin framework server generic specific">
-<collection name="accesssec_plat" long-name="Access Security Platform Interfaces" level="specific">
-<component name="wapi_security_settings_ui_api" long-name="WAPI Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_security_settings_ui_api/group"/>
-</component>
-<component name="wep_security_settings_ui_api" long-name="WEP Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wep_security_settings_ui_api/group"/>
-</component>
-<component name="wi-fi_protected_setup_ui_api" long-name="Wi-Fi Protected Setup UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
-</component>
-<component name="wlan_eap_settings_ui_api" long-name="WLAN EAP Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wlan_eap_settings_ui_api/group"/>
-</component>
-<component name="wpa_security_settings_ui_api" long-name="WPA Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wpa_security_settings_ui_api/group"/>
-</component>
-<component name="eap_vpn_api" long-name="EAP VPN API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
-</component>
-<component name="eapsim_db_api" long-name="EAP-SIM DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapsim_db_api/group"/>
-</component>
-<component name="eap_type_api" long-name="EAP Type API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_type_api/group"/>
-</component>
-<component name="eaptlspeap_db_api" long-name="EAP-TLS-PEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eaptlspeap_db_api/group"/>
-</component>
-<component name="eapleap_db_api" long-name="LEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapleap_db_api/group"/>
-</component>
-<component name="eapgtc_db_api" long-name="EAP-GTC DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapgtc_db_api/group"/>
-</component>
-<component name="eapmschapv2_db_api" long-name="EAP-MSCHAPV2 DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapmschapv2_db_api/group"/>
-</component>
-<component name="eapaka_db_api" long-name="EAP-AKA DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapaka_db_api/group"/>
-</component>
-<component name="wapi_db_api" long-name="WAPI DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_db_api/group"/>
-</component>
-</collection>
-<collection name="wlansecuritysettings" long-name="WLAN Security Settings" level="specific">
-<component name="wapisecuritysettingsui" filter="s60" long-name="WAPI Security Settings UI" introduced="9.1">
-<!-- the directory for this needs to be moved up to the right level -->
-<unit bldFile="mw/accesssec/wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
-</component>
-<component name="wepsecuritysettingsui" filter="s60" long-name="WEP Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wepsecuritysettingsui/group"/>
-</component>
-<component name="wifiprotectedsetup" filter="s60" long-name="WIFI Protected Setup" introduced="^1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wifiprotectedsetup/group"/>
-</component>
-<component name="wlaneapsettingsui" filter="s60" long-name="WLAN EAP Settings UI" introduced="9.3">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wlaneapsettingsui/group"/>
-</component>
-<component name="wpasecuritysettingsui" filter="s60" long-name="WPA Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wpasecuritysettingsui/group"/>
-</component>
-</collection>
-<collection name="eapol" long-name="EAPOL" level="framework">
-<component name="eapol_framework" filter="s60" long-name="EAPOL Framework" introduced="9.2">
-<unit bldFile="mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
-</component>
-</collection>
-</block>
-<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>
-<component name="bearer_settings_plugin_api" long-name="Bearer Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/bearer_settings_plugin_api/group"/>
-</component>
-<component name="commsdat_wlan_api" long-name="CommsDat WLAN API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/commsdat_wlan_api/group"/>
-</component>
-<component name="connection_monitor_extension_api" long-name="Connection Monitor Extension API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_monitor_extension_api/group"/>
-</component>
-<component name="connection_ui_utilities_api" long-name="Connection UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_ui_utilities_api/group"/>
-</component>
-<component name="disconnect_dialog_api" long-name="Disconnect Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_api/group"/>
-</component>
-<component name="disconnect_dialog_disable_api" long-name="Disconnect Dialog Disable API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_disable_api/group"/>
-</component>
-<component name="extended_connection_settings_api" long-name="Extended Connection Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/extended_connection_settings_api/group"/>
-</component>
-<component name="mpm_default_connection_api" long-name="MPM Default Connection API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_default_connection_api/group"/>
-</component>
-<component name="pdpcontextmanager2_reset_factory_settings_api" long-name="PDP Context Manager 2 Reset Factory Settings API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_settings_api/group"/>
-</component>
-<component name="mpm_connect_screen_api" long-name="MPM Connect Screen API" filter="s60" class="api">
-<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="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>
-<component name="access_point_engine_api" long-name="Access Point Engine API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_monitor_server_api/group"/>
-</component>
-<component name="connection_settings_ui_api" long-name="Connection Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_ui_api/group"/>
-</component>
-<component name="agent_dialog_api" long-name="Agent Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/agent_dialog_api/group"/>
-</component>
-<component name="extendedconnpref_api" long-name="Extended Connection Preferences API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/extendedconnpref_api/group"/>
-</component>
-</collection>
-<collection name="accesspointcontrol" long-name="Access Point Control" level="plugin">
-<component name="apcontrollistplugin" filter="s60" long-name="Access Point Control List Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
-</component>
-</collection>
-<collection name="alwayson_net_plugin" long-name="Always Online Net Plugin" level="server">
-<component name="pdpcontextmanager2" filter="s60" long-name="PDP Context Manager 2">
-<unit bldFile="mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
-</component>
-</collection>
-<collection name="apengine" long-name="Access Point Engine" level="framework">
-<component name="apeng" filter="s60" long-name="Access Point Engine">
-<unit bldFile="mw/ipconnmgmt/apengine/apeng/group"/>
-</component>
-<component name="apsettingshandlerui" filter="s60" long-name="Access Point Settings Handler UI">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingshandlerui/group"/>
-</component>
-<component name="apsettingsplugin" filter="s60" long-name="Access Point Settings Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="bearermanagement" long-name="Bearer Management" level="framework">
-<component name="mpm" filter="s60" long-name="Mobility Policy Manager">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/mpm/group"/>
-</component>
-<component name="extendedconnpref" filter="s60" long-name="Extended Connection Preferences">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/extendedconnpref/group"/>
-</component>
-<component name="s60mcpr" filter="s60" long-name="S60 Meta-Connection Provider" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/S60MCPR/group"/>
-</component>
-</collection>
-<collection name="cmmanager" long-name="Connection Method Manager" level="framework">
-<component name="cmmgr" filter="s60" long-name="CM Manager">
-<unit bldFile="mw/ipconnmgmt/cmmanager/cmmgr/group"/>
-</component>
-<component name="gsconnsettingsplugin" filter="s60" long-name="GS Connection Settings Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/cmmanager/gsconnsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="connectionmonitoring" long-name="Connection Monitoring" level="server">
-<component name="connectionmonitorplugin" filter="s60" long-name="Connection Monitor Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorplugin/group"/>
-</component>
-<component name="connectionmonitorui" filter="s60" long-name="Connection Monitor UI">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorui/group"/>
-</component>
-<component name="connmon" filter="s60" long-name="Connection Monitor">
-<!-- either split into two components, or #include from a common bld.inf -->
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/connectionmonitor/group"/>
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/dataconnectionlogger/group"/>
-</component>
-<component name="connmonext" filter="s60" long-name="Connection Monitor Extension API">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmonext/group"/>
-</component>
-</collection>
-<collection name="connectionutilities" long-name="Connection Utilities" level="utils">
-<component name="connectiondialogs" filter="s60" long-name="Connection Dialogs">
-<unit bldFile="mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/>
-</component>
-</collection>
-<collection name="dbcreator" long-name="DB Creator" level="utils">
-<component name="commsdatcreator" filter="s60" long-name="Comms Database Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
-</component>
-<component name="commsdatcreatorrfsplugin" filter="s60" long-name="Comms Database Creator RFS Plugin" introduced="9.3" plugin="Y">
-<!-- uncomment when config is turned on -->
-<!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
-</component>
-<component name="commsdatstartup" filter="s60" long-name="Comms Database Startup" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
-</component>
-<component name="dbcreatorexe" filter="s60" long-name="DB Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
-</component>
-<component name="dbcreator_build" filter="s60" long-name="DB Creator Build" introduced="9.3">
-<!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
-<unit bldFile="mw/ipconnmgmt/dbcreator/group"/>
-</component>
-</collection>
-<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"/>
-</component>
-<component name="ipcm_qt_build" long-name="IP Connectivity Management Qt Build" introduced="^4">
-<unit bldFile="mw/ipconnmgmt"/>
-</component>
-</collection>
-</block>
-<block name="netprotocols" level="generic" long-name="High-level Internet Protocols" levels="plugin framework server generic specific">
-<collection name="netprotocols_plat" long-name="High-level Internet Protocols Platform Interfaces" level="specific">
-<component name="cookie_manager_api" long-name="Cookie Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/cookie_manager_api/group"/>
-</component>
-<component name="http_cache_mgr_api" long-name="HTTP Cache Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_cache_mgr_api/group"/>
-</component>
-<component name="http_filters_api" long-name="HTTP Filters API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_filters_api/group"/>
-</component>
-</collection>
-<collection name="httpfilters" long-name="HTTP Filters" level="plugin">
-<component name="httpfiltercommon" filter="s60" long-name="HTTP Filter Common">
-<unit bldFile="mw/netprotocols/httpfilters/httpfiltercommon/group"/>
-</component>
-<component name="cookie" filter="s60" long-name="Cookie Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/cookie/group"/>
-</component>
-<component name="deflatefilter" filter="s60" long-name="Deflate Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/deflatefilter/group"/>
-</component>
-<component name="httpfilteracceptheader" filter="s60" long-name="Accept Header Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteracceptheader/group"/>
-</component>
-<component name="httpfilterauthentication" filter="s60" long-name="Authentication Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterauthentication/group"/>
-</component>
-<component name="httpfilterconnhandler" filter="s60" long-name="Connection Handler Fitler" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterconnhandler/group"/>
-</component>
-<component name="httpfilteriop" filter="s60" long-name="HTTP IOP Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteriop/group"/>
-</component>
-<component name="httpfilterproxy" filter="s60" long-name="HTTP Proxy Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterproxy/group"/>
-</component>
-<component name="uaproffilter" filter="s60" long-name="UAProf Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/uaproffilter/group"/>
-</component>
-</collection>
-<collection name="applayerprotocols" long-name="Application Layer Protocols" level="server">
-<component name="httptransportfw" long-name="HTTP Transport Framework" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
-</component>
-<component name="httpexamples" long-name="HTTP Examples" introduced="6.2" purpose="development">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpexamples/group" mrp="mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
-</component>
-<component name="wappushsupport" long-name="WAP Push Support" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
-</component>
-<component name="wapbase" long-name="WAP Base" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wapbase/Group" mrp="mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
-</component>
-<component name="ftpengine" long-name="FTP Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/ftpengine/group" mrp="mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
-</component>
-<component name="telnetengine" long-name="Telnet Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/telnetengine/group" mrp="mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
-</component>
-<component name="httpserviceapi" long-name="HTTP Service API" introduced="TB9.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpservice/group" mrp="mw/netprotocols/applayerprotocols/httpservice/group/http_service.mrp"/>
-</component>
-</collection>
-<collection name="applayerpluginsandutils" long-name="Application Layer Plugins and Utils" level="framework">
-<component name="uripermissionservices" long-name="URI Permission Services" introduced="^2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
-</component>
-<component name="bookmarksupport" long-name="Bookmark Support" introduced="9.1" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
-</component>
-<component name="httpprotocolplugins" long-name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
-</component>
-<component name="httptransportplugins" long-name="HTTP Transport Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
-</component>
-</collection>
-<collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
-<component name="netprotocols_metadata" long-name="High-level Internet Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ipappprotocols" level="generic" long-name="IP App Protocols" levels="plugin conn server if">
-<collection name="ipappprotocols_plat" long-name="IP App Protocols Platform Interfaces" level="if">
-<component name="srtp_api" long-name="SRTP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/srtp_api/group"/>
-</component>
-<component name="rtprtcp_api" long-name="RTP/RTCP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/rtprtcp_api/group"/>
-</component>
-</collection>
-<collection name="rtp" long-name="RTP" level="server">
-<component name="srtpstack" filter="s60" long-name="SRTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/srtpstack/group"/>
-</component>
-<component name="rtpstack" filter="s60" long-name="RTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/rtpstack/group"/>
-</component>
-</collection>
-<collection name="realtimenetprots" long-name="Real Time Net Protocols" level="server">
-<component name="symrtp" long-name="RTP" introduced="9.0" purpose="optional">
-<!-- Real Time Data Protocol -->
-<unit bldFile="mw/ipappprotocols/realtimenetprots/rtp/group" mrp="mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
-</component>
-<component name="srtp" long-name="Secure RTP" introduced="^4" purpose="optional">
-<unit bldFile="mw/ipappprotocols/realtimenetprots/srtp/group" mrp="mw/ipappprotocols/realtimenetprots/srtp/group/mm-protocols_srtp.mrp"/>
-</component>
-<component name="sipfw" long-name="SIP Framework" introduced="9.2" purpose="optional">
-<unit bldFile="mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp" version="2"/>
-</component>
-</collection>
-<collection name="sipplugins" long-name="SIP Plugins" level="plugin">
-<component name="sippwlanplugin" filter="s60" long-name="SIP WLAN Plugin" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
-</component>
-<component name="sippsipsettingsui" filter="s60" long-name="SIP Settings UI" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
-</component>
-<component name="sippdevmgmtsipadapter" filter="s60" long-name="Device Management SIP Settings Adapter" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
-</component>
-<component name="sippsystemstatemonitor" filter="s60" long-name="SIP System State Monitor" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsystemstatemonitor/group"/>
-</component>
-<component name="sippsipadapter" filter="s60" long-name="SIP Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipadapter/group"/>
-</component>
-</collection>
-<collection name="sipproviderplugins" long-name="SIP Provider Plugins" level="conn">
-<component name="sipprovider" long-name="SIP Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipproviderplugins/sipprovider/group" mrp="mw/ipappprotocols/sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
-</component>
-</collection>
-<collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="if">
-<component name="ipappprotocols_metadata" long-name="IP App Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wirelessacc" level="specific" long-name="Wireless Access" levels="framework generic ui">
-<collection name="hsfw_plat" long-name="HotSpot Framework Platform Interfaces" level="ui">
-<component name="hotspot_framework_client_api" long-name="HotSpot Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_api" long-name="Internet Connectivity Test Service API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_settings_api" long-name="Internet Connectivity Test Service Settings API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
-</component>
-<component name="hotspot_framework_client_plugin_api" long-name="HotSpot Framework Client Plugin API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
-</component>
-</collection>
-<collection name="hotspotfw" long-name="HotSpot Framework" level="framework">
-<component name="hsserver" filter="s60" long-name="HotSpot Server" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="hsclient" filter="s60" long-name="HotSpot Client" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="internetconnectivitytestservice" filter="s60" long-name="Internet Connectivity Test Service" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
-</component>
-<component name="ictsdialogs" filter="s60" long-name="Internet Connectivity Test Service Dialogs" deprecated="^3" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
-</component>
-<component name="hspluginforagent" filter="s60" long-name="HotSpot Plugin for Agent" plugin="Y" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
-</component>
-<component name="hsbrowser" filter="s60" long-name="HotSpot Browser" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
-</component>
-<component name="hotspotfw_build" filter="s60" long-name="Hotspot Framework Build">
-<!-- should break up this bld.inf into the above components, or collapse them all into a single component -->
-<unit bldFile="mw/wirelessacc/hotspotfw/group"/>
-</component>
-</collection>
-<collection name="wlanutilities" long-name="WLAN Utilities" level="generic">
-<component name="wlanutilities_build" long-name="WLAN Utilities Qt" introduced="^4" filter="s60">
-<!-- is this uinit needed, or is it sufficient to uncomment the units in the below components? -->
-<unit bldFile="mw/wirelessacc/wlanutilities"/>
-</component>
-<component name="wlanqtutilities" filter="s60" long-name="WLAN Qt Utilities" introduced="^4" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlanplugin/group" qt:proFile="wlanqtutilities.pro"/>-->
-</component>
-<component name="wlansniffer" filter="s60" long-name="WLAN Sniffer" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlansettingsui/group" qt:proFile="wlansniffer.pro"/>-->
-</component>
-<component name="wlanentryplugin" filter="s60" long-name="WLAN Entry Plugin" plugin="Y" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlansniffer/group" qt:proFile="wlanentryplugin.pro"/>-->
-</component>
-<component name="wlanindicatorplugin" filter="s60" long-name="WLAN Indicator Plugin" plugin="Y" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlanindicatorplugin/group" qt:proFile="wlanindicatorplugin.pro"/>-->
-</component>
-</collection>
-</block>
-<block name="vpnclient" level="specific" long-name="VPN Client" levels="engine ui api">
-<!-- is the !oem_build filter needed? -->
-<collection name="vpnc_plat" long-name="VPN Client Platform Interfaces" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API" class="api">
-<unit bldFile="mw/vpnclient/vpnc_plat/vpnapi/group"/>
-</component>
-</collection>
-<collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API">
-<unit bldFile="mw/vpnclient/vpnapiimpl/group"/>
-</component>
-</collection>
-<collection name="vpnengine" long-name="VPN Engine" level="engine">
-<!-- too many components in this collection.
- Probably best to group the binaries together into larger components
- or maybe split the collection into more reasonable groups -->
-<component name="eventmediatorapi" filter="s60" long-name="Event Mediator API">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediatorapi/group"/>
-</component>
-<component name="eventviewer" filter="s60" long-name="Event Viewer">
-<unit bldFile="mw/vpnclient/vpnengine/eventviewer/group"/>
-</component>
-<component name="vpnins" filter="s60" long-name="VPN Installer">
-<unit bldFile="mw/vpnclient/vpnengine/vpnins/group"/>
-</component>
-<component name="ikepolparser" filter="s60" long-name="IKE Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/ikepolparser/group"/>
-</component>
-<component name="utlbase64" filter="s60" long-name="Base64 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlbase64/group"/>
-</component>
-<component name="utlcrypto" filter="s60" long-name="Crypto Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlcrypto/group"/>
-</component>
-<component name="utlxml" filter="s60" long-name="XML Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlxml/group"/>
-</component>
-<component name="utlpkcs10" filter="s60" long-name="PKCS#10 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs10/group"/>
-</component>
-<component name="pkiserviceapi" filter="s60" long-name="PKI Service API">
-<unit bldFile="mw/vpnclient/vpnengine/pkiserviceapi/group"/>
-</component>
-<component name="ikecert" filter="s60" long-name="IKE Certificate Management">
-<unit bldFile="mw/vpnclient/vpnengine/ikecert/group"/>
-</component>
-<component name="kmdapi" filter="s60" long-name="Key Management Daemon API">
-<unit bldFile="mw/vpnclient/vpnengine/kmdapi/group"/>
-</component>
-<component name="kmdserver" filter="s60" long-name="Key Management Daemon Server">
-<unit bldFile="mw/vpnclient/vpnengine/kmdserver/group"/>
-</component>
-<component name="ikeutils" filter="s60" long-name="Internet Key Exchange Utils">
-<unit bldFile="mw/vpnclient/vpnengine/ikeutils/group"/>
-</component>
-<component name="ikev1lib" filter="s60" long-name="IKEv1 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev1lib/group"/>
-</component>
-<component name="ikev2lib" filter="s60" long-name="IKEv2 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev2lib/group"/>
-</component>
-<component name="vpnipsecpolparser" filter="s60" long-name="VPN IPsec Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/vpnipsecpolparser/group"/>
-</component>
-<component name="sit" filter="s60" long-name="Socket Interaction Thread">
-<unit bldFile="mw/vpnclient/vpnengine/sit/group"/>
-</component>
-<component name="vpntcwrapper" filter="s60" long-name="VPN Terminal Control Wrapper">
-<unit bldFile="mw/vpnclient/vpnengine/vpntcwrapper/group"/>
-</component>
-<component name="eventmediator" filter="s60" long-name="Event Mediator">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediator/group"/>
-</component>
-<component name="pkiservice" filter="s60" long-name="PKI Service">
-<unit bldFile="mw/vpnclient/vpnengine/pkiservice/group"/>
-</component>
-<component name="vpnconnagt" filter="s60" long-name="VPN Connection Agent">
-<unit bldFile="mw/vpnclient/vpnengine/vpnconnagt/group"/>
-</component>
-<component name="vpnmanager" filter="s60" long-name="VPN Manager">
-<unit bldFile="mw/vpnclient/vpnengine/vpnmanager/group"/>
-</component>
-<component name="vpncleaner" filter="s60" long-name="VPN Cleaner">
-<unit bldFile="mw/vpnclient/vpnengine/vpncleaner/group"/>
-</component>
-<component name="utlpkcs12" filter="s60" long-name="PKCS#12 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs12/group"/>
-</component>
-<component name="dmadengine" filter="s60" long-name="DM Adapter Engine">
-<unit bldFile="mw/vpnclient/vpnengine/dmadengine/group"/>
-</component>
-<component name="dmadipsecvpn" filter="s60" long-name="IPsec VPN DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadipsecvpn/group"/>
-</component>
-<component name="dmadpki" filter="s60" long-name="PKI DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadpki/group"/>
-</component>
-<component name="ikesocket" filter="s60" long-name="IKE Socket" introduced="^3">
-<unit bldFile="mw/vpnclient/vpnengine/ikesocket/group"/>
-</component>
-</collection>
-<collection name="vpnui" long-name="VPN UI" level="ui">
-<component name="vpnecomnotifier" filter="s60" long-name="VPN ECOM Notifier" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnecomnotifier/group"/>
-</component>
-<component name="vpndialogmanager" filter="s60" long-name="VPN Dialog Manager">
-<unit bldFile="mw/vpnclient/vpnui/vpndialogmanager/group"/>
-</component>
-<component name="vpnmanagementui" filter="s60" long-name="VPN Management UI" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnmanagementui/group"/>
-</component>
-<component name="vpnpolins" filter="s60" long-name="VPN Policy Installer">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolins/group"/>
-</component>
-<component name="vpnpolicyrecognizer" filter="s60" long-name="VPN Policy Recognizer" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolicyrecognizer/group"/>
-</component>
-</collection>
-<collection name="vpnclient_info" long-name="VPN Client Info" level="api">
-<component name="vpnclient_help" filter="s60" long-name="VPN Client Help">
-<unit bldFile="mw/vpnclient/help/group"/>
-</component>
-<component name="vpnclient_build" filter="s60" long-name="VPN Client Build">
-<!-- should split this up into the other components and remove this-->
-<unit bldFile="mw/vpnclient/group"/>
-</component>
-</collection>
-</block>
-<block name="ipappsrv" level="specific" long-name="IP App Services" levels="framework generic server conn plugin">
-<collection name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" level="plugin">
-<component name="transcoder_api" long-name="Transcoder API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
-</component>
-<component name="comms_event_api" long-name="Comms Event API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/comms_event_api/group"/>
-</component>
-<component name="floor_control_api" long-name="Floor Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/floor_control_api/group"/>
-</component>
-<component name="media_control_api" long-name="Media Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/media_control_api/group"/>
-</component>
-<component name="multimedia_comms_api" long-name="Multimedia Comms API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/multimedia_comms_api/group"/>
-</component>
-<component name="nat_settings_api" long-name="NAT Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/nat_settings_api/group"/>
-</component>
-</collection>
-<collection name="natfw" long-name="NAT Framework" level="framework">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="natfw_build" filter="s60" long-name="NAT Framework Build" introduced="^2">
-<unit bldFile="mw/ipappsrv/natfw/group"/>
-</component>
-</collection>
-<collection name="multimediacommscontroller" long-name="Multimedia Comms Controller" level="conn">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommscontroller_build" filter="s60" long-name="Multimedia Comms Controller Build">
-<unit bldFile="mw/ipappsrv/multimediacommscontroller/group"/>
-</component>
-</collection>
-<collection name="multimediacommsengine" long-name="Multimedia Comms Engine" level="generic">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommsengine_build" filter="s60" long-name="Multimedia Comms Engine Build">
-<unit bldFile="mw/ipappsrv/multimediacommsengine/group"/>
-</component>
-</collection>
-<collection name="natplugins" long-name="NAT Plugins" level="plugin">
-<component name="natpcliprovisioningnatfwadapter" filter="s60" long-name="Client Provisioning NAT Framework Traversal Adapter" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/group"/>
-</component>
-<component name="natpdevmgmtnatfwadapter" filter="s60" long-name="Device Management NAT Framework Traversal Adapter" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/group"/>
-</component>
-<component name="natptraversalcontroller" filter="s60" long-name="NAT Traversal Controller" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natptraversalcontroller/group"/>
-</component>
-<component name="natpnatfwsdpprovider" filter="s60" long-name="NAT Framework SDP Provider" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpnatfwsdpprovider/group"/>
-</component>
-</collection>
-<collection name="ipappsrv_info" long-name="IP App Services Info" level="plugin">
-<component name="ipappsrv_build" long-name="IP App Services Build" filter="s60">
-<!-- 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">
-<collection name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" level="specific">
-<component name="sat_refresh_api" long-name="SAT Refresh API" filter="s60" class="api"/>
-<component name="sat_client_api" long-name="SAT Client API" filter="s60" class="api"/>
-<component name="sat_service_api" long-name="SAT Service API" filter="s60" class="api"/>
-<component name="call_information_api" long-name="Call Information API" filter="s60" class="api"/>
-<component name="call_remote_party_information_api" long-name="Call Remote Party Information API" filter="s60" class="api"/>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api"/>
-</collection>
-<collection name="cellular" long-name="Cellular" level="server">
-<component name="telephonysettings" filter="s60" long-name="Telephony Settings" purpose="development"/>
-<component name="sssettings" filter="s60" long-name="Supplementary Service Settings" purpose="development"/>
-<component name="psetnotesui" filter="s60" long-name="Phone Settings Notes UI" purpose="development"/>
-</collection>
-<collection name="convergedcallengine" long-name="Converged Call Engine" level="framework">
-<component name="cce" filter="s60" long-name="CCE" purpose="development"/>
-<component name="spsettings" filter="s60" long-name="Service Provider Settings" purpose="development"/>
-</collection>
-<collection name="phoneclientserver" long-name="Phone Client/Server" level="server">
-<component name="aiwdialdata" filter="s60" long-name="AIW Dial Data" purpose="development"/>
-<component name="dialutils" filter="s60" long-name="Dial Utils" purpose="development"/>
-<component name="phoneclient" filter="s60" long-name="Phone Client" purpose="development"/>
-</collection>
-<collection name="phonesrv_info" long-name="Phone Server Info" level="generic">
-<component name="phonesrv_build" long-name="Phone Server Build" filter="s60">
-<unit bldFile="mw/phonesrv"/>
-</component>
-</collection>
-</block>
-<block name="messagingmw" level="specific" long-name="Messaging Middleware" levels="stack support fw api">
-<collection name="msgfw_plat" long-name="Messaging Middleware Platform Interfaces" level="api">
-<component name="always_online_plugin_api" long-name="Always Online Plugin API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_plugin_api/group"/>
-</component>
-<component name="always_online_client_api" long-name="Always Online Client API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_client_api/group"/>
-</component>
-<component name="msg_common_utils_api" long-name="Messaging Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/msg_common_utils_api/group"/>
-</component>
-<component name="muiu_utils_api" long-name="Messaging Center UI Utilities API" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/muiu_utils_api/group"/>
-</component>
-</collection>
-<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" class="config">
-<unit bldFile="mw/messagingmw/msgbranched/group"/>
-</component>
-</collection>
-<collection name="messagingfw" long-name="Messaging Framework" level="fw">
-<!-- should break this collection up into smaller related collections -->
-<component name="send_ui_api" long-name="Send UI API" filter="s60" deprecated="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/send_ui_api/group"/>
-</component>
-<component name="send_ui_plugin_api" long-name="Send UI Plug-in API" filter="s60" deprecated="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/send_ui_plugin_api/group"/>
-</component>
-<component name="send_ui_datautils_api" long-name="Send UI Data Utils API" filter="s60" deprecated="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/send_ui_datautils_api/group"/>
-</component>
-<component name="alwaysonline" filter="s60" long-name="Always Online Server" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/alwaysonline/group"/>
-</component>
-<component name="msgcommonutils" filter="s60" long-name="Messaging Common Utils" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/msgcommonutils/group"/>
-</component>
-<component name="senduiservices" filter="s60" long-name="Send UI Services" introduced="^2" deprecated="^4">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/senduiservices/group"/>
-</component>
-<component name="muiuutils" long-name="Messaging Center UI Utilities" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/muiuutils/group"/>
-</component>
-<component name="scheduledsendmtm" long-name="Scheduled Send MTM" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/group" mrp="mw/messagingmw/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
-</component>
-<component name="msgsrvnstore" long-name="Message Server and Store" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/group" mrp="mw/messagingmw/messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
-</component>
-<component name="biomsgfw" long-name="BIO Messaging Framework" introduced="6.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/group" mrp="mw/messagingmw/messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
-</component>
-<component name="msgconf" long-name="Messaging Config" introduced="^2" purpose="optional" class="config">
-<unit bldFile="mw/messagingmw/messagingfw/msgconf/group" mrp="mw/messagingmw/messagingfw/msgconf/group/messaging_config.mrp"/>
-</component>
-<component name="watcherfw" long-name="Watcher Framework" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/watcherfw/group" mrp="mw/messagingmw/messagingfw/watcherfw/group/messaging_watcher.mrp"/>
-</component>
-<component name="msgtest" long-name="Messaging Test" purpose="development">
-<unit bldFile="mw/messagingmw/messagingfw/msgtest/group" mrp="mw/messagingmw/messagingfw/msgtest/group/messaging_test.mrp"/>
-</component>
-<component name="sendas" long-name="Send As" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/sendas/group" mrp="mw/messagingmw/messagingfw/sendas/group/messaging_sendas2.mrp"/>
-</component>
-<component name="msgurlhandler" long-name="Message URL Handler" introduced="7.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/group" mrp="mw/messagingmw/messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
-</component>
-<component name="wappushfw" long-name="WAP Push Framework" introduced="6.1" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/wappushfw/group" mrp="mw/messagingmw/messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
-</component>
-<component name="suplsmshandler" long-name="SUPL SMS Handler" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplsmshandler/group" mrp="mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/>
-</component>
-<component name="suplwappushhandler" long-name="SUPL WAP Push Handler" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
-</component>
-</collection>
-<collection name="messagingmw_info" long-name="Messaging Middleware Info" level="api">
-<component name="messagingmw_metadata" long-name="Messaging Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="imsrv" level="specific" long-name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
-<collection name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" level="specific">
-<component name="ximp_core_data_model_api" long-name="XIMP Core Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_host_api" long-name="XIMP Presence Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_presence_data_model_api" long-name="XIMP Presence Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_api" long-name="XIMP Presence Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_presence_management_api" long-name="XIMP Presence Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_management_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_host_api" long-name="XIMP Core Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_core_management_api" long-name="XIMP Core Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_management_api/group"/>
-</component>
-<component name="ximp_presence_base_api" long-name="XIMP Presence Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_base_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_api" long-name="XIMP Core Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_core_base_api" long-name="XIMP Core Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_base_api/group"/>
-</component>
-<component name="ximp_presence_cache_api" long-name="XIMP Presence Cache API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_cache_api/group"/>
-</component>
-<component name="ximp_core_feature_plugin_api" long-name="XIMP Core Feature Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_host_api" long-name="XIMP IM Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_im_data_model_api" long-name="XIMP IM Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_data_model_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_api" long-name="XIMP IM Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_im_management_api" long-name="XIMP IM Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_management_api/group"/>
-</component>
-<component name="ximp_im_base_api" long-name="XIMP IM Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_base_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_host_api" long-name="XIMP Search Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_search_data_model_api" long-name="XIMP Search Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_data_model_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_api" long-name="XIMP search Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_search_management_api" long-name="XIMP Search Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_management_api/group"/>
-</component>
-<component name="ximp_search_base_api" long-name="XIMP Search Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_base_api/group"/>
-</component>
-<component name="xmpp_settings_api" long-name="XMPP Settings API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/group"/>
-</component>
-<component name="im_cache_client_api" long-name="IM Cache Client API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/im_cache_client_api/group"/>
-</component>
-<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 Avability Text" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
-</component>
-</collection>
-<collection name="ximpfw" long-name="XIMP Framework" level="framework">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="ximpfw_build" filter="s60" long-name="XIMP Framework Build">
-<unit bldFile="mw/imsrv/ximpfw/group"/>
-</component>
-</collection>
-<collection name="imservices" long-name="IM Services" level="generic">
-<component name="imfeatureplugin" filter="s60" long-name="IM Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/imfeatureplugin/group"/>
-</component>
-<component name="searchfeatureplugin" filter="s60" long-name="Search Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/searchfeatureplugin/group"/>
-</component>
-<component name="xmppsettingsapi" filter="s60" long-name="XMPP Settings API" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsapi/group"/>
-</component>
-<component name="xmppsettingsfetcher" filter="s60" long-name="XMPP Settings Fetcher" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/group"/>
-</component>
-<component name="instantmessagingcache" filter="s60" long-name="Instant Messaging Cache" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/instantmessagingcache/group"/>
-</component>
-</collection>
-<collection name="brandingserver" long-name="Branding Server" level="specific">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="brandingserver_build" filter="s60" long-name="Branding Server Build">
-<unit bldFile="mw/imsrv/brandingserver/group"/>
-</component>
-</collection>
-</block>
-<block name="legacypresence" level="specific" long-name="Legacy Presence Services" levels="engine fw ui">
-<collection name="pressrv_plat" long-name="Legacy Presence Services Platform Interfaces" level="ui">
-<component name="presence_list_api" long-name="Presence List API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/presence_list_api/group"/>
-</component>
-<component name="watcher_info_api" long-name="Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_info_api/group"/>
-</component>
-<component name="simple_documents_api" long-name="SIMPLE Documents API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_documents_api/group"/>
-</component>
-<component name="authorization_api" long-name="Authorization API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/authorization_api/group"/>
-</component>
-<component name="xdm_protocol_plugin_api" long-name="XDM Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_protocol_plugin_api/group"/>
-</component>
-<component name="watcher_api" long-name="Watcher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_api/group"/>
-</component>
-<component name="xdm_api" long-name="XDM API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_api/group"/>
-</component>
-<component name="registration_api" long-name="Registration API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/registration_api/group"/>
-</component>
-<component name="publisher_api" long-name="Publisher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/publisher_api/group"/>
-</component>
-<component name="messaging_connection_manager_api" long-name="Messaging Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/messaging_connection_manager_api/group"/>
-</component>
-<component name="xdm_settings_api" long-name="XDM Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_settings_api/group"/>
-</component>
-<component name="simple_settings_api" long-name="SIMPLE Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_settings_api/group"/>
-</component>
-<component name="simple_instant_msg_api" long-name="Simple Instant Msg API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_instant_msg_api/group"/>
-</component>
-</collection>
-<collection name="xdmengine" long-name="XDM Engine" level="engine">
-<!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
-<component name="xdmengine_build" filter="s60" long-name="XDM Engine Build">
-<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">
-<unit bldFile="mw/legacypresence/xdmprotocols/group"/>
-</component>
-</collection>
-<collection name="msgconnmanager" long-name="Messaging Connection Manager" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="msgconnmanager_build" filter="s60" long-name="Messaging Connection Manager Build">
-<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">
-<unit bldFile="mw/legacypresence/simpleengine/group"/>
-</component>
-</collection>
-<collection name="presencefwsimpleadpt" long-name="Presence Framework SIMPLE Adaptation" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="simpleplugin" filter="s60" long-name="SIMPLE Plugin" plugin="Y">
-<unit bldFile="mw/legacypresence/presencefwsimpleadpt/group"/>
-</component>
-</collection>
-<collection name="simpledatamodeladapter" long-name="SIMPLE Data Model Adapter" level="fw">
-<component name="presenceplugin" filter="s60" long-name="Presence Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/legacypresence/simpledatamodeladapter/group"/>
-</component>
-</collection>
-</block>
-<block name="opensrv" level="specific" long-name="Open Services" levels="prt lib server eng">
-<collection name="opensrv_plat" long-name="Open Services Platform Interfaces" level="eng">
-<component name="messagequeue_api" long-name="Message Queue API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/opensrv/opensrv_plat/messagequeue_api/group"/>
-</component>
-</collection>
-<collection name="loudmouth" long-name="Loudmouth" level="prt">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="loudmouth_build" filter="s60" long-name="Loudmouth Build" introduced="^2">
-<unit bldFile="mw/opensrv/loudmouth/group"/>
-</component>
-</collection>
-<collection name="libtelepathy" long-name="Telepathy Library" level="lib">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="libtelepathy_build" filter="s60" long-name="Telepathy Library Build" introduced="^2">
-<unit bldFile="mw/opensrv/libtelepathy/group"/>
-</component>
-</collection>
-<collection name="telepathygabble" long-name="Telepathy Gabble" level="eng">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="telepathygabble_build" filter="s60" long-name="Telepathy Gabble Build" introduced="^2">
-<unit bldFile="mw/opensrv/telepathygabble/group"/>
-</component>
-</collection>
-<collection name="isolationserver" long-name="Isolation Server" level="server">
-<component name="messagequeue" filter="s60" long-name="Message Queue" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/messagequeue/group"/>
-</component>
-<component name="isoserver" filter="s60" long-name="ISO Server" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/isoserver/group"/>
-</component>
-<component name="isolationserver_build" filter="s60" long-name="Isloation Server Build" introduced="^2">
-<!-- needs #includes removed. either move the exports to another component or make this a ROM component -->
-<unit bldFile="mw/opensrv/isolationserver/group"/>
-</component>
-</collection>
-</block>
-<block name="searchsrv" level="specific" long-name="Search Services" levels="services engine generic api">
-<collection name="searchsrv_plat" long-name="Search Services Platform Interfaces" level="api">
-<component name="cpix_utility_api" long-name="CPIX Utility API" filter="s60" class="api">
-<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_utility_api/group"/>
-</component>
-<component name="cpix_framework_api" long-name="CPIX Framework API" filter="s60" class="api">
-<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_framework_api/group"/>
-</component>
-<component name="cpix_search_api" long-name="CPIX Search API" filter="s60" class="api">
-<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_search_api/group"/>
-</component>
-</collection>
-<collection name="searchengine" long-name="Search Engine" level="engine">
-<component name="searchengine_util" long-name="Search Engine Utils" filter="s60">
-<unit bldFile="mw/searchsrv/searchengine/util/group"/>
-</component>
-<component name="searchengine_oss" long-name="Search Engine OSS" filter="s60">
-<unit bldFile="mw/searchsrv/searchengine/oss/group"/>
-</component>
-<component name="cpix" long-name="Cross Platform Indexing Engine" filter="s60">
-<unit bldFile="mw/searchsrv/searchengine/cpix/group"/>
-</component>
-</collection>
-<collection name="searcher" long-name="Searcher" level="generic">
-<component name="searchclient" long-name="Search Client" filter="s60">
-<unit bldFile="mw/searchsrv/searcher/SearchClient/group"/>
-</component>
-<component name="searchserver" long-name="Search Server" filter="s60">
-<unit bldFile="mw/searchsrv/searcher/SearchServer/group"/>
-</component>
-<component name="searcher_test" long-name="Searcher Tests" filter="s60" purpose="development">
-<!-- #include from common bld.inf or split into two components -->
-<unit bldFile="mw/searchsrv/searcher/tsrc/RobustnessTest/group"/>
-<unit bldFile="mw/searchsrv/searcher/tsrc/LogPlayer/group"/>
-</component>
-</collection>
-<collection name="searchsrv_harvester" long-name="Search Services Harvester" level="services">
-<component name="searchsrv_pluginfw" long-name="Search Server" filter="s60">
-<unit bldFile="mw/searchsrv/harvester/pluginfw/group"/>
-</component>
-<component name="searchsrv_harvesterserver" long-name="Search Harvester Server" filter="s60">
-<unit bldFile="mw/searchsrv/harvester/HarvesterServer/group"/>
-</component>
-</collection>
-<collection name="searchsrv_watchdog" long-name="Search Services Watch Dog" level="services">
-<component name="searchsrv_watchdog_build" long-name="Search Services Watch Dog Build" filter="s60">
-<unit bldFile="mw/searchsrv/WatchDog/group"/>
-</component>
-</collection>
-<collection name="qcpix" long-name="Qt CPIX" level="engine">
-<component name="qcpix_build" long-name="Qt CPIX Build">
-<unit bldFile="mw/searchsrv/qcpix"/>
-</component>
-</collection>
-<collection name="searchsrv_info" long-name="Search Services Info">
-<component name="searchsrv_build" long-name="Search Services Build">
-<!-- move exports to own component and remove this -->
-<unit bldFile="mw/searchsrv/group"/>
-</component>
-</collection>
-</block>
-<block name="remotemgmt" level="specific" long-name="Remote Management" levels="plugin framework server generic specific">
-<collection name="remotemgmt_pub" long-name="Remote Management Public Interfaces" level="specific">
-<component name="synchronization_capability_api" long-name="Synchronization Capability API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
-</component>
-</collection>
-<collection name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" level="specific">
-<component name="common_agent_util_and_definitions_api" long-name="Common Agent util and definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
-</component>
-<component name="policy_management_certificate_api" long-name="Policy Management Certificate API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/group"/>
-</component>
-<component name="oma_provisioning_adapter_api" long-name="OMA Provisioning Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_adapter_api/group"/>
-</component>
-<component name="device_management_parameter_api" long-name="Device Management Parameter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_parameter_api/group"/>
-</component>
-<component name="data_synchronization_plugin_api" long-name="Data Synchronization Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/group"/>
-</component>
-<component name="sync_alert_handler_api" long-name="Sync Alert Handler API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
-</component>
-<component name="syncml_notifier_api" long-name="SyncML Notifier API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
-</component>
-<component name="syncml_client_api" long-name="SyncML Client API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
-</component>
-<component name="device_management_plugin_api" long-name="Device Management plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_plugin_api/group"/>
-</component>
-<component name="dm_tree_apis" long-name="DM Tree APIs" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
-</component>
-<component name="terminal_security_device_lock_api" long-name="Terminal Security Device Lock API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/group"/>
-</component>
-<component name="policy_management_request_api" long-name="Policy Management Request API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/group"/>
-</component>
-<component name="ds_constant_definitions_api" long-name="DS Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_constant_definitions_api/group"/>
-</component>
-<component name="scp_server_api" long-name="SCP Server API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/group"/>
-</component>
-<component name="data_synchronization_notification_api" long-name="Data Synchronization Notification API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_notification_api/group"/>
-</component>
-<component name="oma_provisioning_engine_api" long-name="OMA Provisioning Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/group"/>
-</component>
-<component name="dm_utils_api" long-name="DM Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/group"/>
-</component>
-<component name="syncml_alert_api" long-name="SyncML Alert API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/group"/>
-</component>
-<component name="obex_client_session_api" long-name="OBEX Client session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/obex_client_session_api/group"/>
-</component>
-<component name="setting_enforcement_info_api" long-name="Setting Enforcement Info API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/group"/>
-</component>
-<component name="dm_constant_definitions_api" long-name="DM Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
-</component>
-<component name="oma_ds_extensions_api" long-name="OMA DS Extensions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
-</component>
-<component name="pnpms_utils_api" long-name="PNPMS Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
-</component>
-<component name="diagnostics_plugin_utility_api" long-name="Diagnostics Plugin Utility API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
-</component>
-<component name="diagnostics_plugin_api" long-name="Diagnostics Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
-</component>
-<component name="diagnostics_framework_api" long-name="Diagnostics Framework API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
-</component>
-<component name="diagnostics_results_api" long-name="Diagnostics Results API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
-</component>
-<component name="diagnostics_plugin_pool_api" long-name="Diagnostics Plugin Pool API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
-</component>
-<component name="adaptive_history_list_api" long-name="Adaptive History List API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
-</component>
-<component name="adaptive_history_list_session_api" long-name="Adaptive History List Session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
-</component>
-<component name="fota_engine_api" long-name="FOTA Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
-</component>
-<component name="update_package_storage_plugin_api" long-name="Update Package Storage Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
-</component>
-<component name="syncml_notifier_roaming_api" long-name="SyncML Notifier Roaming API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
-</component>
-<component name="sync_service_api" long-name="Sync Service API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_service_api/group"/>
-</component>
-<component name="dcmo_adapter_api" long-name="DCMO Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_adapter_api/group"/>
-</component>
-<component name="dcmo_control_api" long-name="DCMO Control API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_control_api/group"/>
-</component>
-<component name="ds_capability_mgmt_plugin_api" long-name="DS Capability Management Plugin API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
-</component>
-<component name="dm_native_notifier_api" long-name="DM Native Notifier API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_native_notifier_api/group"/>
-</component>
-</collection>
-<collection name="policymanagement" long-name="Policy Management" level="generic">
-<component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">
-<unit bldFile="mw/remotemgmt/policymanagement/pmdmadapter/group"/>
-</component>
-<component name="dmutilserver" filter="s60" long-name="DM Util Server">
-<unit bldFile="mw/remotemgmt/policymanagement/dmutilserver/group"/>
-</component>
-<component name="policyengine" filter="s60" long-name="Policy Engine">
-<unit bldFile="mw/remotemgmt/policymanagement/policyengine/group" filter="!dfs_build"/>
-</component>
-<component name="policymanagement_build" filter="s60" long-name="Policy Management Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/policymanagement/group"/>
-</component>
-</collection>
-<collection name="syncmlfw" long-name="SyncML Framework" level="server">
-<component name="syncmlfw_build" filter="s60" long-name="SyncML Framework Build">
-<!-- need to break this up into components. Too convoluted a structure to be in a single bld.inf-->
-<unit bldFile="mw/remotemgmt/syncmlfw/group"/>
-</component>
-</collection>
-<collection name="terminalsecurity" long-name="Terminal Security" level="specific">
-<component name="scp" filter="s60" long-name="Security Code Proxy">
-<!-- can only have one unit, need to have these #included from a single bld.inf -->
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpdatabase/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpserver/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scppatternplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scphistoryplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scptimestampplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpeventhandler/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/dmeventnotifier/group"/>
-</component>
-<component name="terminalsecurity_client" filter="s60" long-name="Terminal Control Client">
-<unit bldFile="mw/remotemgmt/terminalsecurity/client/group"/>
-</component>
-<component name="terminalsecurity_server" filter="s60" long-name="Terminal Control Server">
-<unit bldFile="mw/remotemgmt/terminalsecurity/server/group"/>
-</component>
-<component name="tcadapter" filter="s60" long-name="Terminal Control Adapter">
-<unit bldFile="mw/remotemgmt/terminalsecurity/tcadapter/bld"/>
-</component>
-<component name="terminalsecurity_build" filter="s60" long-name="Terminal Security Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/terminalsecurity/group"/>
-</component>
-</collection>
-<collection name="omaprovisioning" long-name="OMA Provisioning" level="specific">
-<component name="pnputil" filter="s60" long-name="PnP Util">
-<unit bldFile="mw/remotemgmt/omaprovisioning/pnputil/group"/>
-</component>
-<component name="provisioning" filter="s60" long-name="Provisioning">
-<unit bldFile="mw/remotemgmt/omaprovisioning/provisioning/group"/>
-</component>
-</collection>
-<collection name="devicediagnosticsfw" long-name="Device Diagnostics Framework" level="framework">
-<component name="diagframework" filter="s60" long-name="Diagnostics Framework">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
-</component>
-<component name="diagpluginbase" filter="s60" long-name="Diagnostics Plugin Base">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
-</component>
-<component name="diagresultsdb" filter="s60" long-name="Diagnostics Results Database">
-<!-- can only have one unit, merge or split into two components -->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
-</component>
-<component name="devicediagnosticsfw_build" filter="s60" long-name="Device Diagnostics Framework Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/group"/>
-</component>
-</collection>
-<collection name="dcmofw" long-name="Device Capability Management Object Framework" level="framework">
-<component name="dcmoclient" filter="s60" long-name="DCMO Client">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoclient/group"/>
-</component>
-<component name="dcmoserver" filter="s60" long-name="DCMO Server">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoserver/group"/>
-</component>
-<component name="dcmocustcmd" filter="s60" long-name="DCMO Custom Commands">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmocustcmd/group"/>
-</component>
-<component name="dcmofw_build" filter="s60" long-name="DCMO Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/dcmofw/group"/>
-</component>
-</collection>
-<collection name="fotaapplication" long-name="FOTA Application" level="generic">
-<component name="fotaapplication_build" filter="s60" long-name="FOTA Application Build">
-<!-- remove this component when configuration is in place and the #ifdefs have been worked out -->
-<unit bldFile="mw/remotemgmt/fotaapplication/group"/>
-</component>
-<component name="fotaserver" filter="s60" long-name="FOTA Server">
-<!-- uncomment when #ifdefs are resolved -->
-<!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
-</component>
-<component name="fotacustcmds" filter="s60" long-name="FOTA Custom Commands" class="placeholder">
-<!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
-<!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
-</component>
-</collection>
-</block>
-<block name="remoteconn" level="generic" long-name="Remote Connectivity" levels="plugin framework server generic specific">
-<collection name="remoteconn_info" long-name="Remote Connectivity Info" level="specific">
-<component name="remoteconn_metadata" long-name="Remote Connectivity Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mtptransports" long-name="MTP Transports" level="plugin">
-<component name="mtpusbtransport" long-name="MTP USB Transport" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpusbtransport/group" mrp="mw/remoteconn/mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
-</component>
-<component name="mtpptpiptransport" long-name="MTP PTP-IP Transport" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpptpiptransport/group" mrp="mw/remoteconn/mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
-</component>
-<component name="mtpcontroller" long-name="MTP Controller" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpcontroller/group" mrp="mw/remoteconn/mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
-</component>
-</collection>
-<collection name="mtpfws" long-name="MTP Frameworks" level="framework">
-<component name="mtpfw" long-name="MTP Framework" introduced="^2" purpose="optional">
-<unit bldFile="mw/remoteconn/mtpfws/mtpfw/group" mrp="mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/>
-</component>
-</collection>
-<collection name="mtpdataproviders" long-name="MTP Data Providers" level="generic">
-<component name="mtpfileandfolderdp" long-name="MTP File and Folder Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group" mrp="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
-</component>
-<component name="mtpimagedp" long-name="MTP Image Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpimagedp/group" mrp="mw/remoteconn/mtpdataproviders/mtpimagedp/group/mtp_imagedp.mrp"/>
-</component>
-<component name="mtppictbridgedp" long-name="MTP PictBridge Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group" mrp="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group/mtp_pictbridgedp.mrp"/>
-</component>
-</collection>
-<collection name="backupandrestore" long-name="Backup and Restore" level="specific">
-<component name="backupengine" long-name="Backup Engine" introduced="9.0" purpose="optional">
-<unit bldFile="mw/remoteconn/backupandrestore/backupengine/group" mrp="mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
-</component>
-<component name="backuptest" long-name="Backup Test" introduced="^2" purpose="development">
-<unit bldFile="mw/remoteconn/backupandrestore/backuptest/group" mrp="mw/remoteconn/backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
-</component>
-</collection>
-<collection name="obex" long-name="OBEX" level="generic">
-<component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexprotocol/group" mrp="mw/remoteconn/obex/obexprotocol/group/obex.mrp"/>
-</component>
-<component name="obexextensionapi" long-name="OBEX Extension API" introduced="9.2" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexextensionapi/group" mrp="mw/remoteconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
-</component>
-</collection>
-</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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<unit mrp="mw/srvdiscovery/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="dlnasrv" level="specific" long-name="DLNA Services" levels="stack server ctrl framework plugin">
-<!-- uncomment all the units when configuration is in place, they're currently #included from other xxx_build components -->
-<collection name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" level="plugin">
-<component name="upnp_media_server_settings_api" long-name="UPnP Media Server Settings API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_settings_api/group"/>
-</component>
-<component name="upnp_av_objects_api" long-name="UPnP A/V Objects API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_av_objects_api/group"/>
-</component>
-<component name="upnp_media_server_api" long-name="UPnP Media Server API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_api/group"/>
-</component>
-<component name="upnp_security_plugin_api" long-name="UPnP Security Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_security_plugin_api/group"/>
-</component>
-<component name="upnp_avcp_api" long-name="UPnP AVCP API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_avcp_api/group"/>
-</component>
-<component name="upnp_media_server_metadata_api" long-name="UPnP Media Server Metadata API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_metadata_api/group"/>
-</component>
-<component name="upnp_command_api" long-name="UPnP Command API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_command_api/group"/>
-</component>
-<component name="upnp_plugin_api" long-name="UPnP Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_plugin_api/group"/>
-</component>
-</collection>
-<collection name="upnpavcontrolpoint" long-name="UPnP A/V Control Point" level="plugin">
-<component name="avcontrolframework" filter="s60" long-name="A/V Control Famework" introduced="9.1" deprecated="^3">
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
-</component>
-<component name="upnpavcontrolpoint_build" filter="s60" long-name="UPnP A/V Control Point Build" introduced="9.1" deprecated="^3">
-<!-- put exports in other component instead -->
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/group"/>
-</component>
-</collection>
-<collection name="upnpmediaserver" long-name="UPnP Media Server" level="server">
-<component name="avobjects" filter="s60" long-name="A/V Objects">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/avobjects/group"/>
-</component>
-<component name="mediaserverclient" filter="s60" long-name="Media Server Client">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverclient/group"/>
-</component>
-<component name="connectionmanagerservice" filter="s60" long-name="Connection Manager Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/connectionmanagerservice/group"/>
-</component>
-<component name="contentdirectoryservice" filter="s60" long-name="Content Directory Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/contentdirectoryservice/group"/>
-</component>
-<component name="mediaserverengine" filter="s60" long-name="Media Server Engine">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverengine/group"/>
-</component>
-<component name="upnpmediaserver_build" filter="s60" long-name="UPnP Media Server Build">
-<!-- move exports into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpmediaserver/group"/>
-</component>
-</collection>
-<collection name="upnpavcontroller" long-name="UPnP A/V Controller" level="ctrl">
-<component name="upnpxmlparser" filter="s60" long-name="UPnP XML Parser" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpxmlparser/group"/>
-</component>
-<component name="upnpavcontrollerserver" filter="s60" long-name="UPnP A/V Controller Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerserver/group"/>
-</component>
-<component name="upnpavcontrollerclient" filter="s60" long-name="UPnP A/V Ccontroller Client" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerclient/group"/>
-</component>
-<component name="upnpavcontrollerhelper" filter="s60" long-name="UPnP A/V Controller Helper" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerhelper/group"/>
-</component>
-<component name="upnpavcontroller_build" filter="s60" long-name="UPnP A/V Controller Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpavcontroller/group"/>
-</component>
-</collection>
-<collection name="upnpframework" long-name="UPnP Framework" level="framework">
-<component name="upnputilities" filter="s60" long-name="UPnP Utilities" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnputilities/group"/>
-</component>
-<component name="upnpextensionpluginif" filter="s60" long-name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpextensionpluginif/group"/> -->
-</component>
-<component name="upnpfiletransferengine" filter="s60" long-name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>-->
-</component>
-<component name="upnpcommonui" filter="s60" long-name="UPnP Common UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpcommonui/group"/>-->
-</component>
-<component name="upnpaiwengine" filter="s60" long-name="UPnP AIW Engine" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpaiwengine/group"/> -->
-</component>
-<component name="upnpaiwprovider" filter="s60" long-name="UPnP AIW Provider" introduced="^2" deprecated="^3" plugin="Y">
-<!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
-</component>
-<component name="upnpmusicadapter" filter="s60" long-name="UPnP Music Adapter" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
-</component>
-<component name="upnpcommand" filter="s60" long-name="UPnP Command" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpcommand/group"/>
-</component>
-<component name="upnpframework_build" filter="s60" long-name="UPnP Framework Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpframework/group"/>
-</component>
-</collection>
-<collection name="upnpsettings" long-name="UPnP Settings" level="framework">
-<component name="upnpsettingsengine" filter="s60" long-name="UPnP Settings Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
-</component>
-<component name="multiselectionui" filter="s60" long-name="Multi-Selection UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/multiselectionui/group"/>-->
-</component>
-<component name="appwizard" filter="s60" long-name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/appwizard/group"/>-->
-</component>
-<component name="upnpsharingui" filter="s60" long-name="UPnP Sharing UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
-</component>
-<component name="upnpgsplugin" filter="s60" long-name="UPnP GS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
-</component>
-<component name="upnpsettings_build" filter="s60" long-name="UPnP Settings Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsettings/group"/>
-</component>
-</collection>
-<collection name="upnpsharing" long-name="UPnP Sharing" level="server">
-<component name="upnpdlnaprofiler" filter="s60" long-name="UPnP DLNA Profiler" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpdlnaprofiler/group"/>
-</component>
-<component name="upnpsecurity" filter="s60" long-name="UPnP Security" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpsecurity/group"/>
-</component>
-<component name="upnpcontentserver" filter="s60" long-name="UPnP Content Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpcontentserver/group"/>
-</component>
-<component name="applicationengine" filter="s60" long-name="UPnP Application Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/applicationengine/group"/>
-</component>
-<component name="upnpsharing_build" filter="s60" long-name="UPnP Sharing Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsharing/group"/>
-</component>
-</collection>
-<collection name="upnpmpxplugins" long-name="UPnP MPX Plugins" level="plugin">
-<component name="upnpplaybackplugins" filter="s60" long-name="UPnP Playback Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/upnpplaybackplugins/group"/>
-</component>
-<component name="upnpmpxplugins_build" filter="s60" long-name="UPnP MPX Plugins Build" introduced="^2">
-<!-- move exports content into other component? -->
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/group"/>
-</component>
-</collection>
-<collection name="upnpharvester" long-name="UPnP Harvester" level="ctrl">
-<component name="upnpharvester_common" filter="s60" long-name="UPnP Harvester Common" introduced="^2" deprecated="^3" class="placeholder">
-<!-- need to merge or #include these to a single bld.inf -->
-<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
- <unit bldFile="upnpharvester/common/cmsettings/group"/>
- <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
- <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
-</component>
-<component name="cdssync" filter="s60" long-name="CDS Sync" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
-</component>
-<component name="mdhserver" filter="s60" long-name="Metadata Harvester Server" introduced="^2" deprecated="^3" class="placeholder">
-<!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
-</component>
-<component name="upnpharvester_build" filter="s60" long-name="UPnP Harvester Build" introduced="^2" deprecated="^3" class="placeholder">
-<!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
-<!--<unit bldFile="upnpharvester/group"/>-->
-</component>
-</collection>
-<collection name="homesync" long-name="Home Sync" level="plugin">
-<component name="contentmanager" filter="s60" long-name="Content Manager" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homesync/group"/>-->
-<!-- move bld.inf into contentmanager dir -->
-</component>
-</collection>
-<collection name="homemedia" long-name="Home Media" level="framework">
-<!-- collection is really just a component. Move down a directory -->
-<component name="homemedia_build" filter="s60" long-name="Home Media" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homemedia/group"/> -->
-</component>
-</collection>
-<collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin">
-<component name="dlnasrv_build" filter="s60" long-name="DLNA Services Build">
-<!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed -->
-<unit bldFile="mw/dlnasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="btservices" level="generic" long-name="Bluetooth Services" levels="framework server generic specific plugin">
-<collection name="btservices_pub" long-name="BT Services Public Interfaces" level="plugin">
-<component name="bluetooth_power_state_api" long-name="Bluetooth Power State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_power_state_api/group"/>
-</component>
-<component name="bluetooth_notifier_api" long-name="Bluetooth Notifier API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_notifier_api/group"/>
-</component>
-</collection>
-<collection name="btservices_plat" long-name="BT Services Platform Interfaces" level="plugin">
-<component name="bluetooth_dosserver_audio_api" long-name="Bluetooth DOS Server Audio API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dosserver_audio_api/group"/>
-</component>
-<component name="bluetooth_dut_mode_api" long-name="Bluetooth DUT Mode API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dut_mode_api/group"/>
-</component>
-<component name="bluetooth_engine_api" long-name="Bluetooth Engine API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-<component name="bluetooth_local_variation_api" long-name="Bluetooth Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_local_variation_api/group"/>
-</component>
-<component name="bluetooth_notifier_internal_api" long-name="Bluetooth Notifier internal API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_notifier_internal_api/group"/>
-</component>
-<component name="bluetooth_sap_connection_state_api" long-name="Bluetooth SAP Connection State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_sap_connection_state_api/group"/>
-</component>
-<component name="bluetooth_secondary_display_notification_api" long-name="Bluetooth Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_secondary_display_notification_api/group"/>
-</component>
-</collection>
-<collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
-<component name="bteng" filter="s60" long-name="Bluetooth Engine">
-<unit bldFile="mw/btservices/bluetoothengine/bteng/group"/>
-</component>
-<component name="btnotif" filter="s60" long-name="Bluetooth Notifier">
-<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"/>
-</component>
-<component name="btmac" filter="s60" long-name="Bluetooth Mono Audio Controller" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btmac/group"/>
-</component>
-<component name="btsac" filter="s60" long-name="Bluetooth Stereo Audio Controller" plugin="Y">
-<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"/>
-</component>
-<component name="btsap" filter="s60" long-name="Bluetooth SIM Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btsap/group"/>
-</component>
-<component name="btui" filter="s60" long-name="Bluetooth UI">
-<unit bldFile="mw/btservices/bluetoothengine/btui/group"/>
-</component>
-<component name="btpbap" filter="s60" long-name="Bluetooth Phonebook Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btpbap/group"/>
-</component>
-<component name="bthid" filter="s60" long-name="Bluetooth HID">
-<unit bldFile="mw/btservices/bluetoothengine/bthid/group"/>
-</component>
-<component name="btctrldcmoadapter" filter="s60" long-name="Bluetooth Control DCMO Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btctrldcmoadapter/group"/>
-</component>
-</collection>
-<collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
-<component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
-<unit bldFile="mw/btservices/bluetoothappprofiles/avrcp" mrp="mw/btservices/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
-</component>
-</collection>
-<collection name="atcommands" long-name="AT Commands" level="generic">
-<component name="modematplugin" long-name="Modem AT Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/modematplugin/group"/>
-</component>
-<component name="lccustomplugin" long-name="LC Custom Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/lccustomplugin/group"/>
-</component>
-</collection>
-<collection name="btservices_info" long-name="BT Services Info" level="plugin">
-<component name="btservices_metadata" long-name="BT Services Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usbservices" level="generic" long-name="USB Services" levels="framework server generic specific plugin">
-<collection name="usbservices_plat" long-name="USB Services Platform Interfaces" level="plugin">
-<component name="pictbridge_api" long-name="PictBridge API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/pictbridge_api/group"/>
-</component>
-<component name="ptp_responder_api" long-name="PTP Responder API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_responder_api/group"/>
-</component>
-<component name="ptp_transport_api" long-name="PTP Transport API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_transport_api/group"/>
-</component>
-<component name="usb_device_control_plugin_api" long-name="USB Device Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_device_control_plugin_api/group"/>
-</component>
-<component name="usb_notifier_api" long-name="USB Notifier API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_notifier_api/group"/>
-</component>
-<component name="usb_personality_api_header" long-name="USB Personality API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_api_header/group"/>
-</component>
-<component name="usb_personality_plugin_api" long-name="USB Personality Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_plugin_api/group"/>
-</component>
-<component name="usb_secondary_display_api" long-name="USB Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_secondary_display_api/group"/>
-</component>
-<component name="usb_watcher_api" long-name="USB Watcher API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_api/group"/>
-</component>
-<component name="usb_watcher_info_api_header" long-name="USB Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_info_api_header/group"/>
-</component>
-</collection>
-<collection name="usbengines" long-name="USB Engines" level="generic">
-<component name="usbotgwatcher" filter="s60" long-name="USB OTG Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbotgwatcher/group"/>
-</component>
-<component name="usbwatcher" filter="s60" long-name="USB Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbwatcher/group"/>
-</component>
-<component name="usblocodplugin" filter="s60" long-name="USB Local Connectivity Domain Plugin" plugin="Y">
-<unit bldFile="mw/usbservices/usbengines/usblocodplugin/group"/>
-</component>
-<component name="usbdevcon" filter="s60" long-name="USB Device Control">
-<unit bldFile="mw/usbservices/usbengines/usbdevcon/group"/>
-</component>
-<component name="usbremotepersonality" filter="s60" long-name="USB Remote Personality">
-<unit bldFile="mw/usbservices/usbengines/usbremotepersonality/group"/>
-</component>
-</collection>
-<collection name="usbclasses" long-name="USB Classes" level="framework">
-<component name="usbobexclasscontroller" filter="s60" long-name="USB OBEX Class Controller" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbobexclasscontroller/group"/>
-</component>
-<component name="usbbasicpersonality" filter="s60" long-name="USB Basic Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbbasicpersonality/group"/>
-</component>
-<component name="usbmscpersonality" filter="s60" long-name="USB MSC Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbmscpersonality/group"/>
-</component>
-<!-- commented out in bld.inf. Should this be deleted?
- <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
- <unit bldFile="usbclasses/ptpstack/group"/>
- </component>
- <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
- <unit bldFile="usbclasses/sicdusbplugin/group"/>
- </component>
- <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
- <unit bldFile="usbclasses/ptpserver/group"/>
- </component>-->
-<component name="pictbridgeengine" filter="s60" long-name="PictBridge Engine">
-<unit bldFile="mw/usbservices/usbclasses/pictbridgeengine/group"/>
-</component>
-<component name="usbphoneasmodem" filter="s60" long-name="USB Phone as Modem" introduced="^3">
-<unit bldFile="mw/usbservices/usbclasses/usbphoneasmodem/group"/>
-</component>
-</collection>
-<collection name="usbuis" long-name="USB UIs" level="specific">
-<component name="usbui" filter="s60" long-name="USB UI">
-<unit bldFile="mw/usbservices/usbuis/usbui/group"/>
-</component>
-<component name="usbuinotif" filter="s60" long-name="USB UI Notifiers">
-<unit bldFile="mw/usbservices/usbuis/usbuinotif/group"/>
-</component>
-<component name="imageprintuiprovider" filter="s60" long-name="ImagePrint UI Provider" plugin="Y">
-<unit bldFile="mw/usbservices/usbuis/imageprintuiprovider/group"/>
-</component>
-<component name="usbimageprintui" filter="s60" long-name="ImagePrint UI">
-<unit bldFile="mw/usbservices/usbuis/imageprintui/group"/>
-</component>
-<component name="usbuiqt" long-name="USB UI Qt" introduced="^4" filter="s60">
-<unit bldFile="mw/usbservices/usbuis/usbuiqt"/>
-</component>
-</collection>
-<collection name="usbservices_test" long-name="USB Services Test" level="server"/>
-</block>
-<block name="shortlinkconn" level="generic" long-name="Shortlink Connectivity" levels="framework server generic specific plugin">
-<!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
-<collection name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" level="plugin">
-<component name="obex_service_utils_api" long-name="OBEX Service Utils API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_utils_api/group"/>
-</component>
-<component name="obex_service_plugin_api" long-name="OBEX Service Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_plugin_api/group"/>
-</component>
-<component name="dialup_connection_status_api" long-name="Dial-up Connection Status API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dialup_connection_status_api/group"/>
-</component>
-<component name="dun_secondary_display_notification_api" long-name="DUN Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
-</component>
-<component name="obex_secondary_display_notification_api" long-name="OBEX Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
-</component>
-<component name="generic_hid_api" long-name="Generic HID API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/generic_hid_api/group"/>
-</component>
-<component name="locod_bearer_plugin_api" long-name="Locod Bearer Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/locod_bearer_plugin_api/group"/>
-</component>
-<component name="usb_obexservicemanager_client_api" long-name="USB OBEX Service Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_obexservicemanager_client_api/group"/>
-</component>
-</collection>
-<collection name="localconnectivityservice" long-name="Local Connectivity Service" level="server">
-<component name="locod" long-name="Local Connectivity Daemon">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/locod/group"/>
-</component>
-<component name="obexserviceman" long-name="OBEX Service Managar">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
-</component>
-<component name="obexsendservices" long-name="OBEX Send Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
-</component>
-<component name="obexreceiveservices" long-name="OBEX Receive Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
-</component>
-<component name="dun" long-name="Dial Up Networking">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/dun/group"/>
-</component>
-<component name="lcstylustap" long-name="LC Stylus Tap Plugins" plugin="Y">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/lcstylustap/group"/>
-</component>
-<component name="generichid" long-name="Generic HID">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/generichid/group"/>
-</component>
-<component name="headset" long-name="Headset">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/headset/group"/>
-</component>
-</collection>
-</block>
-<block name="imghandling" level="specific" long-name="Image Handling" levels="lib util if">
-<collection name="imagehandling_plat" long-name="Image Handling Platform Interfaces" level="if">
-<component name="image_handling_library_api" long-name="Image Handling Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
-</component>
-<component name="3gp_library_api" long-name="3GP Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
-</component>
-<component name="thumbnailmanager_api" long-name="Thumbnail Manager API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagehandlinglib" long-name="Image Handling Library" level="lib">
-<!-- collection is really a component, need to move down a directory -->
-<component name="ihl" filter="s60" long-name="IHL">
-<unit bldFile="mw/imghandling/imagehandlinglib/group"/>
-</component>
-</collection>
-<collection name="imagehandlingutilities" long-name="Image Handling Utilities" level="util">
-<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager">
-<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
-</component>
-<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager Qt" introduced="^4">
-<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt" filter="!test"/>
-</component>
-</collection>
-</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">
-<unit bldFile="mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
-</component>
-</collection>
-</block>
-<block name="mds" level="specific" long-name="Metadata Services" levels="mgr eng server int">
-<collection name="mds_plat" long-name="Metadata Services Platform Interfaces" level="int">
-<component name="context_engine_plugin_api" long-name="Context Engine Plugin API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/group" filter="!test"/>
-</component>
-<component name="harvester_framework_api" long-name="Harvester Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/harvester_framework_api/group" filter="!test"/>
-<!-- can only have one unit with the same filter, #include the following from the previous unit -->
-</component>
-<component name="location_manager_api" long-name="Location Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/location_manager_api/group" filter="!test"/>
-</component>
-<component name="metadata_engine_api" long-name="Metadata Engine API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/metadata_engine_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_collection_manager_api" long-name="Content Listing Framework Collection Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_extended_api" long-name="Content Listing Framework Extended API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_extended_api/group"/>
-</component>
-</collection>
-<collection name="mds_pub" long-name="Metadata Services Public Interfaces" level="int">
-<component name="content_listing_framework_api" long-name="Content Listing Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_pub/content_listing_framework_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="metadataengine" long-name="Metadata Engine" level="eng">
-<component name="metadataengine_common" filter="s60" long-name="Metadata Engine Common" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/common/group"/>
-</component>
-<component name="metadataengine_server" filter="s60" long-name="Metadata Engine Server" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/server/group"/>
-</component>
-<component name="metadataengine_client" filter="s60" long-name="Metadata Engine Client" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/client/group"/>
-</component>
-<component name="metadataengine_build" filter="s60" long-name="Metadata Engine Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/metadataengine/group"/>
-</component>
-</collection>
-<collection name="locationmanager" long-name="Location Manager" level="mgr">
-<component name="locationtrail" filter="s60" long-name="Location Trail" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/locationtrail/group"/>
-</component>
-<component name="locationmanager_server" filter="s60" long-name="Location Manager Server" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/server/group"/>
-</component>
-<component name="locationmanager_client" filter="s60" long-name="Location Manager Client" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/client/group"/>
-</component>
-<component name="locationmanager_build" filter="s60" long-name="Location Manager Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/locationmanager/group"/>
-</component>
-</collection>
-<collection name="contextengine" long-name="Context Engine" level="eng">
-<component name="contextengine_plugins" filter="s60" long-name="Context Engine Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/contextengine/plugins/group"/>
-</component>
-<component name="contextengine_build" filter="s60" long-name="Context Engine Build" introduced="^2">
-<!--make this collection a single component, or make this unit self-contained -->
-<unit bldFile="mw/mds/contextengine/group"/>
-</component>
-</collection>
-<collection name="harvester" long-name="Harvester" level="eng">
-<component name="blacklistclient" filter="s60" long-name="Blacklist Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistclient/group"/>
-</component>
-<component name="blacklistserver" filter="s60" long-name="Blacklist Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistserver/group"/>
-</component>
-<component name="harvester_common" filter="s60" long-name="Harvester Common" introduced="^2">
-<unit bldFile="mw/mds/harvester/common/group"/>
-</component>
-<component name="composerplugins" filter="s60" long-name="Composer Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/composerplugins/group"/>
-</component>
-<component name="harvesterplugins" filter="s60" long-name="Harvester Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/harvesterplugins/group"/>
-</component>
-<component name="monitorplugins" filter="s60" long-name="Monitor Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/monitorplugins/group"/>
-</component>
-<component name="harvester_server" filter="s60" long-name="Harvester Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/server/group"/>
-</component>
-<component name="harvester_client" filter="s60" long-name="Harvester Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/client/group"/>
-</component>
-<component name="harvester_build" filter="s60" long-name="Harvester Build" introduced="^2">
-<!-- split these exports into the other components -->
-<unit bldFile="mw/mds/harvester/group"/>
-</component>
-</collection>
-<collection name="watchdog" long-name="Watchdog" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="mdswatchdog" filter="s60" long-name="Metadata Watchdog" introduced="^2">
-<unit bldFile="mw/mds/watchdog/group"/>
-</component>
-</collection>
-<collection name="clfwrapper" long-name="Content Listing Framework Wrapper" level="int">
-<!-- collection is really a component. Move down a directory -->
-<component name="clfwrapper_build" filter="s60" long-name="CLF Wrapper Build" introduced="^2" class="placeholder">
-<!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
-<!--<unit bldFile="clfwrapper/group"/>-->
-</component>
-</collection>
-<collection name="mds_info" long-name="Metadata Services Info" level="int">
-<component name="mds_build" filter="s60" long-name="Metadata Services Build" introduced="^2">
-<!-- consider distributiing this into the rest of the components in the package -->
-<unit bldFile="mw/mds/group"/>
-</component>
-</collection>
-</block>
-<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"/>
-</component>
-<component name="videoconnutility_api" long-name="Video Connection Utility API" filter="s60" class="api">
-<unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/group"/>
-</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"/>
-</component>
-</collection>
-<collection name="videoscheduler" long-name="Video Scheduler" level="util">
-<component name="schedulerclient" filter="s60" long-name="Video Scheduler Client">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerclient/group"/>
-</component>
-<component name="schedulerserver" filter="s60" long-name="Video Scheduler Server">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerserver/group"/>
-</component>
-</collection>
-<collection name="videoconnutility" long-name="Video Connection Utility" level="util">
-<component name="connutilpsworker" filter="s60" long-name="Connection Utility Publish and Subscribe Worker">
-<unit bldFile="mw/videoutils/videoconnutility/connutilpsworker/group"/>
-</component>
-<component name="video_connutility" filter="s60" long-name="Video Connection Utility">
-<unit bldFile="mw/videoutils/videoconnutility/connutility/group"/>
-</component>
-</collection>
-<collection name="videoutils_info" long-name="Video Utils Info" level="if"/>
-</block>
-<block name="mmmw" level="generic" long-name="Multimedia Middleware" levels="plugin framework server generic specific">
-<collection name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" level="specific">
-<component name="multimedia_data_source_api" long-name="Multimedia Data Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
-</component>
-<component name="progressive_download_api" long-name="Progressive Download API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/progressive_download_api/group"/>
-</component>
-<component name="equalizer_ui_api" long-name="Equalizer UI API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
-</component>
-<component name="enhanced_media_client_api" long-name="Enhanced Media Client API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
-</component>
-<component name="stream_control_custom_command_api" long-name="Stream Control Custom Command API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
-</component>
-<component name="emc_buffer_source_api" long-name="EMC Buffer Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_buffer_source_api/group"/>
-</component>
-<component name="emc_file_source_api" long-name="EMC File Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
-</component>
-<component name="audio_metadata_reader_api" long-name="Audio MetaData Reader API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
-</component>
-<component name="emc_progressive_download_source_api" long-name="EMC Progressive Download Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
-</component>
-<component name="emc_volume_effect_api" long-name="EMC Volume Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
-</component>
-<component name="emc_balance_effect_api" long-name="EMC Balance Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_balance_effect_api/group"/>
-</component>
-<component name="emc_descriptor_source_api" long-name="EMC Descriptor Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_descriptor_source_api/group"/>
-</component>
-<component name="emc_drm_config_intfc_api" long-name="EMC DRM Config Intfc API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
-</component>
-<component name="voip_audio_services_api" long-name="VoIP Audio Services" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/group"/>
-</component>
-<component name="configuration_components_factory_api" long-name="Configuration Components Factory API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
-</component>
-<component name="audio_output_control_utility_api" long-name="Audio Output Control Utility API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/group"/>
-</component>
-<component name="audio_output_control_utility_proxy_api" long-name="Audio Output Control Utility Proxy API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
-</component>
-<component name="emc_audio_effects_api" long-name="EMC Audio Effects API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
-</component>
-<component name="call_audio_control_api" long-name="Call AudioControl API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/group"/>
-</component>
-<component name="radio_utilities_api" long-name="Radio Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/group"/>
-</component>
-<component name="radio_preset_utilities_api" long-name="Radio Preset Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
-</component>
-<component name="radio_monitor_api" long-name="Radio Monitor API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
-</component>
-<component name="thumbnail_engine_api" long-name="Thumbnail Engine API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/thumbnail_engine_api/group"/>
-</component>
-<component name="telephony_multimedia_service_api" long-name="Telephony Multimedia Service API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
-</component>
-<component name="openmax_al_api" long-name="OpenMAX AL API" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/openmax_al_api/group"/>
-</component>
-</collection>
-<collection name="mmfenh" long-name="MMF Enhancements" level="generic">
-<component name="advancedaudiocontroller" filter="s60" long-name="Advanced Audio Controllers" plugin="Y">
-<unit bldFile="mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
-</component>
-<component name="audiooutputcontrolutility" filter="s60" long-name="Audio Output Control Utility">
-<unit bldFile="mw/mmmw/mmfenh/audiooutputcontrolutility/group"/>
-</component>
-<component name="configurationcomponentsfactory" filter="s60" long-name="Configuration Components Factory">
-<unit bldFile="mw/mmmw/mmfenh/configurationcomponentsfactory/group"/>
-</component>
-<component name="enhancedaudioplayerutility" filter="s60" long-name="Enhanced Audio Player Utility">
-<unit bldFile="mw/mmmw/mmfenh/enhancedaudioplayerutility/group"/>
-</component>
-<component name="enhancedmediaclient" filter="s60" long-name="Enhanced Media Client">
-<unit bldFile="mw/mmmw/mmfenh/enhancedmediaclient/group"/>
-</component>
-<component name="profilesettingsmonitor" filter="s60" long-name="Profile Settings Monitor">
-<unit bldFile="mw/mmmw/mmfenh/profilesettingsmonitor/group"/>
-</component>
-<component name="progressivedownload" filter="s60" long-name="Progressive Download">
-<unit bldFile="mw/mmmw/mmfenh/progressivedownload/group"/>
-</component>
-</collection>
-<collection name="mm_fw" long-name="Multimedia Frameworks" level="framework">
-<!-- Id needs to be unique, mmfw already in use -->
-<!-- Placeholder for OpenAX AL and other stuff -->
-</collection>
-<collection name="mmserv" long-name="Multimedia Services" level="specific">
-<component name="audioeffectsui" filter="s60" long-name="Audio Effects UI">
-<unit bldFile="mw/mmmw/mmserv/audioeffectsui/group"/>
-</component>
-<component name="callaudiocontrol" filter="s60" long-name="Call Audio Control">
-<unit bldFile="mw/mmmw/mmserv/callaudiocontrol/group"/>
-</component>
-<component name="metadatautility" filter="s60" long-name="Metadata Utility">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/group"/>
-</component>
-<component name="radioutility" filter="s60" long-name="Radio Utility">
-<unit bldFile="mw/mmmw/mmserv/radioutility/group"/>
-</component>
-<component name="thumbnailengine" filter="s60" long-name="Thumbnail Engine" introduced="^2">
-<unit bldFile="mw/mmmw/mmserv/thumbnailengine/group"/>
-</component>
-<component name="tms" filter="s60" long-name="Telephony Multimedia Service" introduced="^3">
-<unit bldFile="mw/mmmw/mmserv/tms/group"/>
-</component>
-<component name="voipaudioservices" filter="s60" long-name="VoIP Audio Services">
-<unit bldFile="mw/mmmw/mmserv/voipaudioservices/group"/>
-</component>
-<component name="lib3gpextparser" filter="s60" long-name="3GP Extension Metadata Parser Library">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group" filter="sf_build"/>
-</component>
-</collection>
-<collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
-<component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="helix" level="generic" long-name="Helix" levels="plugin framework server generic specific">
-<collection name="helix_ren" long-name="Helix Engine" level="framework">
-<!-- what does "ren" stand for? -->
-<component name="helix_stub" filter="s60" long-name="Helix Stub" introduced="^2" class="api">
-<unit bldFile="mw/helix/helix_ren/helix_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="camerasrv" level="specific" long-name="Camera Services" levels="plugin fw api">
-<collection name="camerasrv_plat" long-name="Camera Services Platform Interfaces" level="api">
-<component name="media_recorder_sink_api" long-name="Media Recorder Sink API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
-</component>
-<component name="cae_extentension_api" long-name="CAE Extension API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/cae_extentension_api/group"/>
-</component>
-<component name="camera_application_engine_api" long-name="Camera Application Engine API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/camera_application_engine_api/group" filter="!test"/>
-</component>
-<component name="custom_onboard_camera_api" long-name="Custom Onboard Camera API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
-</component>
-<component name="imaging_configuration_manager_api" long-name="Imaging Configuration Manager API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
-</component>
-<component name="media_recorder_api" long-name="Media Recorder API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_api/group" filter="!test"/>
-</component>
-<component name="3gp_file_composer_api" long-name="3GP File Composer API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
-</component>
-</collection>
-<collection name="camcordermmfplugin" long-name="Camcorder MMF Plugin" level="plugin">
-<!-- collection is really a component. Should move down a directory -->
-<component name="camcordermmfplugin_build" filter="s60" long-name="Camcorder MMF Plugin Build" plugin="Y">
-<unit bldFile="mw/camerasrv/camcordermmfplugin/build"/>
-</component>
-</collection>
-<collection name="configmanagers" long-name="Config Managers" level="api">
-<component name="imagingconfigmanager" filter="s60" long-name="Imaging Config Manager">
-<unit bldFile="mw/camerasrv/configmanagers/imagingconfigmanager/group"/>
-</component>
-</collection>
-<collection name="camerasrv_info" long-name="Camera Services Info" level="api">
-<component name="camerasrv_build" filter="s60" long-name="Camera Services Build">
-<!-- should split into individual bld.infs -->
-<unit bldFile="mw/camerasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="mmappfw" level="specific" long-name="Multimedia App Framework" levels="fw utils if">
-<collection name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" level="if">
-<component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interfaces Build" introduced="^1" filter="s60">
-<!-- this is no longer necessary when confguration is put in place -->
-<unit bldFile="mw/mmappfw/mmappfw_plat"/>
-</component>
-<component name="collection_helper_api" long-name="Collection Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
-</component>
-<component name="harvester_collection_mediator_api" long-name="Harvester Collection Mediator API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/group"/>
-</component>
-<component name="harvester_metadata_extractor_api" long-name="Harvester Metadata Extractor API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/group"/>
-</component>
-<component name="harvester_server_api" long-name="Harvester Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_server_api/group"/>
-</component>
-<component name="harvester_utility_api" long-name="Harvester Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_utility_api/group"/>
-</component>
-<component name="playlist_engine_api" long-name="Playlist Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playlist_engine_api/group"/>
-</component>
-<component name="mtp_keys_api" long-name="MTP Keys API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mtp_keys_api/group"/>
-</component>
-<component name="mpx_collection_common_definition_api" long-name="MPX Collection Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_common_definition_api/group"/>
-</component>
-<component name="mpx_collection_utility_api" long-name="MPX Collection Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/group"/>
-</component>
-<component name="mpx_common_api" long-name="MPX Common API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_api/group"/>
-</component>
-<component name="mpx_common_definition_api" long-name="MPX Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_common_definition_api" long-name="MPX Playback Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_utility_api" long-name="MPX Playback Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/group"/>
-</component>
-<component name="mpx_base_view_plugins_api" long-name="MPX Base View Plugins API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/group"/>
-</component>
-<component name="mpx_view_utility_api" long-name="MPX View Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_view_utility_api/group"/>
-</component>
-<component name="mpx_albumart_utility_api" long-name="MPX Album Art Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/group"/>
-</component>
-<component name="media_player_settings_engine_api" long-name="Media Player Settings Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
-</component>
-<component name="mpx_backstepping_utility_api" long-name="MPX Backstepping Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_backstepping_utility_api/group"/>
-</component>
-<component name="asx_parser_api" long-name="ASX Parser API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/asx_parser_api/group"/>
-</component>
-<component name="playback_helper_api" long-name="Playback Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playback_helper_api/group"/>
-</component>
-<component name="videoplaylist_utility_api" long-name="Video Playlist Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/videoplaylist_utility_api/group"/>
-</component>
-</collection>
-<collection name="mpx" long-name="Multimedia Player" level="fw">
-<component name="commonframework" filter="s60" long-name="MPX Common Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/commonframework/group"/>
-</component>
-<component name="playbackframework" filter="s60" long-name="MPX Playback Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/playbackframework/group"/>
-</component>
-<component name="mpxcollectionfw" filter="s60" long-name="MPX Collection Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/collectionframework/group"/>
-</component>
-<component name="mpxviewfw" filter="s60" long-name="MPX View Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/viewframework/group"/>
-</component>
-<component name="mpxviewframeworkqt" long-name="MPX View Framework Qt" filter="s60">
-<unit bldFile="mw/mmappfw/mpx/mpxviewframeworkqt"/>
-</component>
-<component name="mpx_build" filter="s60" long-name="MPX Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/mpx/group"/>
-</component>
-</collection>
-<collection name="mmappcomponents" long-name="Multimedia App Components" level="utils">
-<component name="mmappcomponents_build" filter="s60" long-name="Multimedia App Components Build" introduced="^1">
-<!-- needed for #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
- Can remove this once configuration is in place-->
-<unit bldFile="mw/mmappfw/mmappcomponents/group"/>
-</component>
-<component name="collectionhelper" filter="s60" long-name="Media Player Collection Helper" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/collectionhelper/group"/>
-</component>
-<component name="playlistengine" filter="s60" long-name="Playlist Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/playlistengine/group"/>
-</component>
-<component name="mpxharvester" filter="s60" long-name="Media Player Harvester" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/harvester/group"/>
-</component>
-<component name="mmappcommonui" filter="s60" long-name="Multimedia App Common UI" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmappcommonui/group"/>
-</component>
-<component name="mediaplayersettingsengine" filter="s60" long-name="Media Player Settings Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
-</component>
-<component name="audiofetcher" filter="s60" long-name="Audio Fetcher" introduced="^1" plugin="Y">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
-</component>
-<component name="asxparser" filter="s60" long-name="ASX Parser" introduced="^1">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
-</component>
-<component name="playbackhelper" filter="s60" long-name="Playback Helper" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/playbackhelper/group"/>
-</component>
-<component name="videoplaylistutility" filter="s60" long-name="Video Playlist Utility" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/videoplaylistutility/group"/>
-</component>
-<component name="mmmtpdataprovider" filter="s60" long-name="Multimedia MTP Data Provider" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmmtpdataprovider/group"/>
-</component>
-</collection>
-<collection name="mmappfw_info" long-name="Multimedia App Framework Info" level="if">
-<component name="mmappfw_build" filter="s60" long-name="Multimedia App Framework Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/group"/>
-</component>
-<component name="mmappfw_test" filter="s60,test,api_test,pref_test" long-name="Multimedia App Framework Test" purpose="development" introduced="^1"/>
-</collection>
-</block>
-<block name="hgwidgets" level="specific" long-name="HG Widgets" levels="framework service api">
-<collection name="hgwidgets_pub" long-name="HG Widgets Platform Interfaces" level="api">
-<component name="ganeswidgets_api" long-name="Ganes Widgets API" introduced="^4" class="api placeholder">
-<!-- should separate out unit -->
-</component>
-</collection>
-<collection name="hgwidgets_pub" long-name="HG Widgets Public Interfaces" level="api"/>
-<collection name="ganeswidgets" long-name="Ganes Widgets" level="service">
-<!-- really a component, should move down a dir level and have a unit -->
-<component name="ganeswidgets_build" long-name="Ganes Widgets Build" introduced="^4" class="placeholder">
-<!-- should separate out unit -->
-</component>
-</collection>
-<collection name="hgwidgets_info" long-name="HG Widgets Info" level="framework">
-<component name="hgwidgets_build" long-name="HG Widgets Build" introduced="^4">
-<unit bldFile="mw/hgwidgets"/>
-</component>
-</collection>
-</block>
-<block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework api">
-<collection name="inputmethods_pub" long-name="Input Methods Public Interfaces" level="api">
-<component name="ptiengine_iti_api" long-name="PTI Engine API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
-</component>
-<component name="optical_character_recognition_api" long-name="Optical Character Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
-</component>
-<component name="input_language_info_api" long-name="Input Language Info API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
-</component>
-</collection>
-<collection name="inputmethods_plat" long-name="Input Methods Platform Interfaces" level="api">
-<component name="pen_input_server_api" long-name="Pen Input Server API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/group" filter="!test"/>
-</component>
-<component name="ptiengine_hwr_api" long-name="PTI Engine Handwriting Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group" filter="!test"/>
-</component>
-<component name="aknfep_settings_api" long-name="Avkon FEP Settings API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
-</component>
-<component name="aknfep_status_api" long-name="Avkon FEP Status API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
-</component>
-<component name="ptiengine_key_definations_api" long-name="PTI Engine Key Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
-</component>
-<component name="aknfep_definitions_api" long-name="Avkon FEP Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
-</component>
-<component name="aknfep_pen_support_api" long-name="Avkon FEP Pen Support API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
-</component>
-<component name="ptiengine_indic_definitions_api" long-name="PTI Engine Indic Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
-</component>
-<component name="aknfep_uiinterface_api" long-name="Avkon FEP UI Interface API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="textinput" long-name="Text Input" level="framework">
-<component name="ptienginev2" filter="s60" long-name="Predictive Text Input Engine">
-<!--uncomment when configuration is turned on and textinput_build is removed-->
-<!-- <unit bldFile="textinput/ptienginev2/group"/>-->
-</component>
-<component name="akninputlanguage" filter="s60" long-name="Avkon Input Language">
-<unit bldFile="mw/inputmethods/textinput/akninputlanguage/group"/>
-</component>
-<component name="peninputarc" filter="s60" long-name="Pen Input Arc">
-<unit bldFile="mw/inputmethods/textinput/peninputarc/group"/>
-</component>
-<component name="peninputcommonctrls" filter="s60" long-name="Pen Input Common Controls">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonctrls/group"/>
-</component>
-<component name="peninputcommonlayout" filter="s60" long-name="Pen Input Common Layout">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonlayout/group"/>
-</component>
-<component name="peninputhwrtrui" filter="s60" long-name="Pen Input Handwriting Recognition Training UI" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrtrui/group"/>
-</component>
-<component name="textinput_build" filter="s60" long-name="Text Input Build">
-<!--needed for #ifdef, can be removed when configuration is implemented -->
-<unit bldFile="mw/inputmethods/textinput/group"/>
-</component>
-</collection>
-<collection name="fep" long-name="FEP" level="engine">
-<component name="aknfep" filter="s60" long-name="Avkon FEP" plugin="Y">
-<unit bldFile="mw/inputmethods/fep/aknfep/group"/>
-</component>
-<component name="frontendprocessor" long-name="Front End Processor" purpose="mandatory">
-<unit bldFile="mw/inputmethods/fep/frontendprocessor/group" mrp="mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
-</component>
-</collection>
-<collection name="inputmethods_info" long-name="Input Methods Info" level="api">
-<component name="inputmethods_metadata" long-name="Input Methods Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="qt" level="generic" long-name="Qt" levels="tool mw app">
-<collection name="qtconf" long-name="Qt Config" level="tool">
-<component name="qt_deviceconfiguration" long-name="Qt Device Configuration" introduced="^2" class="config tool">
-<unit bldFile="mw/qt/src/s60installs/deviceconfiguration"/>
-</component>
-</collection>
-<collection name="qt_info" long-name="Qt Info" level="mw">
-<component name="qt_build" long-name="Qt Build" introduced="^2">
-<unit bldFile="mw/qt"/>
-</component>
-</collection>
-<collection name="qtdemos" long-name="Qt Demos" level="app">
-<component name="qtdemos_build" long-name="Qt Demos Build" introduced="^2" filter="qtdemos">
-<unit bldFile="mw/qt/demos"/>
-</component>
-</collection>
-<collection name="qtexamples" long-name="Qt Examples" level="app">
-<component name="qtexamples_build" long-name="Qt Examples Build" introduced="^2" filter="qtexamples">
-<unit bldFile="mw/qt/examples"/>
-</component>
-</collection>
-<collection name="qt_tests" long-name="Qt Tests" level="app">
-<component name="qttestsauto" long-name="Qt Automated Tests" introduced="^2" filter="qttestsauto">
-<unit bldFile="mw/qt/tests/auto"/>
-</component>
-<component name="qttestsbenchmarks" long-name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks">
-<unit bldFile="mw/qt/tests/benchmarks"/>
-</component>
-</collection>
-</block>
-<block name="qtextensions" level="generic" long-name="Qt Extensions" levels="tool mw app">
-<collection name="qtecomplugins" long-name="Qt ECom Plugins" level="app">
-<component name="qtextensions_examples" filter="qtextensionsexamples" long-name="Qt ECom Plugin Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtecomplugins/examples"/>
-</component>
-</collection>
-<collection name="qthighway" long-name="Qt Highway" level="app">
-<component name="qthighway_examples" filter="qtextensionsexamples" long-name="Qt Highway Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qthighway/examples"/>
-</component>
-<component name="qthighwaytests" filter="qtextensionstests" long-name="Qt Highway Tests" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qthighway/tests"/>
-</component>
-</collection>
-<collection name="qtmobileextensions" long-name="Qt Mobile Extensions" level="app">
-<component name="qtmobileextensions_examples" filter="qtextensionsexamples" long-name="Qt Mobile Extensions Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtmobileextensions/examples"/>
-</component>
-</collection>
-<collection name="qtmobility" long-name="Qt Mobility">
-<component name="qtmobility_examples" filter="qtextensionsexamples" long-name="Qt Mobility Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtmobility/examples"/>
-</component>
-<component name="qtmobilitytests" filter="qtextensionstests" long-name="Qt Extensions Tests" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtmobility/tests"/>
-</component>
-</collection>
-<collection name="qtextensions_info">
-<component name="qtextensions_build" long-name="Qt Extensions Confgure" introduced="^4" class="conf">
-<unit bldFile="mw/qtextensions/group"/>
-</component>
-<component name="qtextensions_build" long-name="Qt Extensions Build" introduced="^4">
-<!-- break this up into the above collections-->
-<unit bldFile="mw/qtextensions"/>
-</component>
-</collection>
-</block>
-<block name="hb" level="generic" long-name="Orbit"/>
-<block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
-<collection name="classicui_plat" long-name="Classic UI Platform Interfaces" level="specific">
-<component name="personalisation_framework_api" long-name="Personalisation Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_framework_api/group" filter="!test"/>
-</component>
-<component name="signal_pane_api" long-name="Signal Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
-</component>
-<component name="japanese_reading_api" long-name="Japanese Reading API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/japanese_reading_api/group" filter="!test"/>
-</component>
-<component name="global_popup_priority_controller_api" long-name="Global Popup Priority Controller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
-</component>
-<component name="item_finder_api" long-name="Item Finder API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/item_finder_api/group" filter="!test"/>
-</component>
-<component name="avkon_fonts_api" long-name="Avkon Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_fonts_api/group" filter="!test"/>
-</component>
-<component name="extended_utilities_api" long-name="Extended Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
-</component>
-<component name="personalisation_plugin_api" long-name="Personalisation Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
-</component>
-<component name="extended_aiw_criteria_api" long-name="Extended AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="personalisation_application_api" long-name="Personalisation Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_application_api/group"/>
-</component>
-<component name="volume_popup_api" long-name="Volume Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
-</component>
-<component name="avkon_secondary_display_support_api" long-name="AVKON Secondary Display Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_support_api/group" filter="!test"/>
-</component>
-<component name="extended_setting_pages_api" long-name="Extended Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_setting_pages_api/group" filter="!test"/>
-</component>
-<component name="extended_lists_api" long-name="Extended Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_lists_api/group" filter="!test"/>
-</component>
-<component name="input_block_api" long-name="Input Block API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/input_block_api/group" filter="!test"/>
-</component>
-<component name="avkon_ui_server_api" long-name="AVKON UI Server API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_ui_server_api/group" filter="!test"/>
-</component>
-<component name="number_grouping_api" long-name="Number Grouping API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/number_grouping_api/group" filter="!test"/>
-</component>
-<component name="extended_status_pane_api" long-name="Extended Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_status_pane_api/group" filter="!test"/>
-</component>
-<component name="extended_notifiers_api" long-name="Extended Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notifiers_api/group" filter="!test"/>
-</component>
-<component name="task_list_api" long-name="Task List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
-</component>
-<component name="personalisation_slide_show_dialog_api" long-name="Personalisation Slide Show Dialog API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
-</component>
-<component name="key_event_utilities_api" long-name="Key Event Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_event_utilities_api/group"/>
-</component>
-<component name="emergency_call_support_api" long-name="Emergency Call Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/emergency_call_support_api/group" filter="!test"/>
-</component>
-<component name="extended_dialogs_api" long-name="Extended Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_dialogs_api/group"/>
-</component>
-<component name="legacy_ui_framework_headers_api" long-name="Legacy UI Framework Headers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/legacy_ui_framework_headers_api/group"/>
-</component>
-<component name="extended_editors_api" long-name="Extended Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_editors_api/group" filter="!test"/>
-</component>
-<component name="alarm_api" long-name="Alarm API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alarm_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_interface_base_api" long-name="AIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_base_api/group" filter="!test"/>
-</component>
-<component name="list_effects_api" long-name="List Effects API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/list_effects_api/group" filter="!test"/>
-</component>
-<component name="find_item_ui_api" long-name="Find Item UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/find_item_ui_api/group" filter="!test"/>
-</component>
-<component name="server_application_services_api" long-name="Server Application Services API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/server_application_services_api/group" filter="!test"/>
-</component>
-<component name="common_ui_settings_api" long-name="Common UI Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_ui_settings_api/group"/>
-</component>
-<component name="aiw_service_interface_menu_api" long-name="AIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_menu_api/group" filter="!test"/>
-</component>
-<component name="eikon_server_extension_client_api" long-name="EIKON Server Extension Client API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/eikon_server_extension_client_api/group" filter="!test"/>
-</component>
-<component name="skinnable_clock_api" long-name="Skinnable Clock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/skinnable_clock_api/group" filter="!test"/>
-</component>
-<component name="battery_pane_api" long-name="Battery Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/battery_pane_api/group" filter="!test"/>
-</component>
-<component name="fep_document_navigation_api" long-name="FEP Document Navigation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
-</component>
-<component name="personalisation_localised_texts_api" long-name="Personalisation Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
-</component>
-<component name="memory_card_ui_api" long-name="Memory Card UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
-</component>
-<component name="avkon_status_api" long-name="AVKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_status_api/group"/>
-</component>
-<component name="application_switching_api" long-name="Application Switching API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/application_switching_api/group" filter="!test"/>
-</component>
-<component name="avkon_localised_texts_api" long-name="AVKON Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_localised_texts_api/group"/>
-</component>
-<component name="avkon_secondary_display_api" long-name="AVKON Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_api/group"/>
-</component>
-<component name="extended_animation_api" long-name="Extended Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_notes_api" long-name="Extended Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notes_api/group" filter="!test"/>
-</component>
-<component name="text_scroller_api" long-name="Text Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/text_scroller_api/group" filter="!test"/>
-</component>
-<component name="custom_cursors_api" long-name="Custom Cursors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/custom_cursors_api/group" filter="!test"/>
-</component>
-<component name="global_window_priorities_api" long-name="Global Window Priorities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_window_priorities_api/group"/>
-</component>
-<component name="extended_indicators_api" long-name="Extended Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_indicators_api/group" filter="!test"/>
-</component>
-<component name="special_character_table_api" long-name="Special Character Table API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/special_character_table_api/group" filter="!test"/>
-</component>
-<component name="avkon_settings_api" long-name="AVKON Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_settings_api/group"/>
-</component>
-<component name="extended_sounds_api" long-name="Extended Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_sounds_api/group"/>
-</component>
-<component name="themes_settings_api" long-name="Themes Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/themes_settings_api/group"/>
-</component>
-<component name="media_shared_document_api" long-name="Media Shared Document API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/media_shared_document_api/group" filter="!test"/>
-</component>
-<component name="extended_queries_api" long-name="Extended Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_queries_api/group"/>
-</component>
-<component name="phone_number_text_utilities_api" long-name="Phone Number Text Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
-</component>
-<component name="extended_scroller_api" long-name="Extended Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_scroller_api/group"/>
-</component>
-<component name="key_rotator_api" long-name="Key Rotator API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_rotator_api/group" filter="!test"/>
-</component>
-<component name="extended_grids_api" long-name="Extended Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_grids_api/group" filter="!test"/>
-</component>
-<component name="generic_parameter_api" long-name="Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="indicator_touch_observer_api" long-name="Indicator Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_touch_observer_api/group"/>
-</component>
-<component name="popup_form_api" long-name="Popup Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/popup_form_api/group" filter="!test"/>
-</component>
-<component name="stylus_activated_popup_api" long-name="Stylus Activated Pop-up API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/stylus_activated_popup_api/group" filter="!test"/>
-</component>
-<component name="indicator_plugin_api" long-name="Indicator Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_plugin_api/group" filter="!test"/>
-</component>
-<component name="layout_configuration_api" long-name="Layout Configuration API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/layout_configuration_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_filter_factory_api" long-name="Common File Dialogs Filter Factory API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group" filter="!test"/>
-</component>
-<component name="avkon_anim_dll_api" long-name="AVKON Anim DLL API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_anim_dll_api/group"/>
-</component>
-<component name="extended_initialization_api" long-name="Extended Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_initialization_api/group" filter="!test"/>
-</component>
-<component name="long_tap_animation_api" long-name="Long Tap Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/long_tap_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_ui_framework_definitions_api" long-name="Extended UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_ui_framework_definitions_api/group"/>
-</component>
-<component name="extended_buttons_api" long-name="Extended Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_buttons_api/group" filter="!test"/>
-</component>
-<component name="aiw_provider_utility_api" long-name="AIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_provider_utility_api/group" filter="!test"/>
-</component>
-<component name="transition_effect_parameters_api" long-name="Transition Effect Parameters API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_parameters_api/group" filter="!test"/>
-</component>
-<component name="extended_input_capabilities_api" long-name="Extended Input Capabilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_input_capabilities_api/group" filter="!test"/>
-</component>
-<component name="uikon_status_api" long-name="UIKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/uikon_status_api/group"/>
-</component>
-<component name="transition_effect_utilities_api" long-name="Transition Effect Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_utilities_api/group" filter="!test"/>
-</component>
-<component name="pointer_event_modifier_api" long-name="Pointer Event Modifier API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/pointer_event_modifier_api/group" filter="!test"/>
-</component>
-<component name="avkon_testability_api" long-name="AVKON Testability API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_testability_api/group"/>
-</component>
-<component name="ganes_api" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ganes_api/group"/>
-</component>
-<component name="ode_api" long-name="Ode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ode_api/group"/>
-</component>
-<component name="physics_api" long-name="Physics API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/physics_api/group"/>
-</component>
-<component name="touch_pane_api" long-name="Touch Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_api/group" filter="!test"/>
-</component>
-<component name="touch_pane_observer_api" long-name="Touch Pane Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_observer_api/group"/>
-</component>
-<component name="alternate_fs_api" long-name="Alternate FS API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alternate_fs_api/group"/>
-</component>
-<component name="discreet_popup_api" long-name="Discreet Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/discreet_popup_api/group"/>
-</component>
-<component name="touch_gesture_framework_api" long-name="Touch Gesture Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_gesture_framework_api/group"/>
-<!-- should this be commented out? -->
-<!--<unit bldFile="classicui_plat/touch_gesture_framework_api/tsrc/group" filter="test,api_test"/> -->
-</component>
-<component name="extended_options_menu_api" long-name="Extended Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="classicui_pub" long-name="Classic UI Public Interfaces" level="specific">
-<component name="input_frame_api" long-name="Input Frame API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/input_frame_api/group" filter="!test"/>
-</component>
-<component name="window_server_event_observer_api" long-name="Window Server Event Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/window_server_event_observer_api/group" filter="!test"/>
-</component>
-<component name="application_framework_api" long-name="Application Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/application_framework_api/group" filter="!test"/>
-</component>
-<component name="scroller_api" long-name="Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/scroller_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_utilities_api" long-name="UI Framework Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_utilities_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_definitions_api" long-name="UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_definitions_api/group" filter="!test"/>
-</component>
-<component name="buttons_api" long-name="Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/buttons_api/group" filter="!test"/>
-</component>
-<component name="queries_api" long-name="Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/queries_api/group" filter="!test"/>
-</component>
-<component name="aiw_generic_parameter_api" long-name="AIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="editors_api" long-name="Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/editors_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_api" long-name="Common File Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/common_file_dialogs_api/group" filter="!test"/>
-</component>
-<component name="dialog_shutter_api" long-name="Dialog Shutter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialog_shutter_api/group" filter="!test"/>
-</component>
-<component name="fonts_api" long-name="Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/fonts_api/group" filter="!test"/>
-</component>
-<component name="screen_clearer_api" long-name="Screen Clearer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_clearer_api/group" filter="!test"/>
-</component>
-<component name="notifiers_api" long-name="Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notifiers_api/group" filter="!test"/>
-</component>
-<component name="notes_api" long-name="Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notes_api/group" filter="!test"/>
-</component>
-<component name="status_pane_api" long-name="Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/status_pane_api/group" filter="!test"/>
-</component>
-<component name="base_controls_api" long-name="Base Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/base_controls_api/group" filter="!test"/>
-</component>
-<component name="grids_api" long-name="Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/grids_api/group" filter="!test"/>
-</component>
-<component name="context_pane_api" long-name="Context Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/context_pane_api/group" filter="!test"/>
-</component>
-<component name="lists_api" long-name="Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/lists_api/group" filter="!test"/>
-</component>
-<component name="popups_api" long-name="Popups API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/popups_api/group" filter="!test"/>
-</component>
-<component name="misc_controls_api" long-name="Misc Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/misc_controls_api/group" filter="!test"/>
-</component>
-<component name="keylock_api" long-name="Keylock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/keylock_api/group" filter="!test"/>
-</component>
-<component name="options_menu_api" long-name="Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/options_menu_api/group" filter="!test"/>
-</component>
-<component name="hierarchical_lists_api" long-name="Hierarchical Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hierarchical_lists_api/group" filter="!test"/>
-</component>
-<component name="navigation_pane_api" long-name="Navigation Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/navigation_pane_api/group" filter="!test"/>
-</component>
-<component name="tabs_api" long-name="Tabs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/tabs_api/group" filter="!test"/>
-</component>
-<component name="title_pane_touch_observer_api" long-name="Title Pane Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_touch_observer_api/group"/>
-</component>
-<component name="choice_list_api" long-name="Choice List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/choice_list_api/group" filter="!test"/>
-</component>
-<component name="info_popup_note_api" long-name="Info Popup Note API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/info_popup_note_api/group" filter="!test"/>
-</component>
-<component name="setting_pages_api" long-name="Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/setting_pages_api/group" filter="!test"/>
-</component>
-<component name="screen_mode_api" long-name="Screen Mode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_mode_api/group" filter="!test"/>
-</component>
-<component name="indicators_api" long-name="Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/indicators_api/group" filter="!test"/>
-</component>
-<component name="error_ui_api" long-name="Error UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/error_ui_api/group" filter="!test"/>
-</component>
-<component name="animation_api" long-name="Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/animation_api/group" filter="!test"/>
-</component>
-<component name="searchfield_api" long-name="Searchfield API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/searchfield_api/group" filter="!test"/>
-</component>
-<component name="labels_api" long-name="Labels API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/labels_api/group" filter="!test"/>
-</component>
-<component name="hotkeys_api" long-name="Hotkeys API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hotkeys_api/group" filter="!test"/>
-</component>
-<component name="initialization_api" long-name="Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/initialization_api/group" filter="!test"/>
-</component>
-<component name="volume_control_api" long-name="Volume Control API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/volume_control_api/group" filter="!test"/>
-</component>
-<component name="title_pane_api" long-name="Title Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_api/group" filter="!test"/>
-</component>
-<component name="sounds_api" long-name="Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/sounds_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_handler_api" long-name="AIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_service_handler_api/group" filter="!test"/>
-</component>
-<component name="aiw_criteria_api" long-name="AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="touch_ui_utilities_api" long-name="Touch UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/touch_ui_utilities_api/group" filter="!test"/>
-</component>
-<component name="generic_button_api" long-name="Generic Button API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/generic_button_api/group" filter="!test"/>
-</component>
-<component name="form_api" long-name="Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/form_api/group" filter="!test"/>
-</component>
-<component name="uikon_core_controls" long-name="Uikon Core Controls" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/uikon_core_controls/group" filter="!test"/>
-</component>
-<component name="calendar_api" long-name="Calendar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/calendar_api/group"/>
-</component>
-<component name="toolbar_api" long-name="Toolbar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/toolbar_api/group" filter="!test"/>
-</component>
-<component name="server_application_api" long-name="Server Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/server_application_api/group"/>
-</component>
-<component name="slider_api" long-name="Slider API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/slider_api/group" filter="!test"/>
-</component>
-<component name="private_ui_framework_api" long-name="Private UI Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/private_ui_framework_api/group" filter="!test"/>
-</component>
-<component name="dialogs_api" long-name="Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialogs_api/group" filter="!test"/>
-</component>
-<component name="document_handler_api" long-name="Document handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/document_handler_api/group"/>
-</component>
-<component name="images_api" long-name="Images API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/images_api/group" filter="!test"/>
-</component>
-<component name="stylus_popup_menu_api" long-name="Stylus Pop-up Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/stylus_popup_menu_api/group" filter="!test"/>
-</component>
-<component name="information_preview_popup_api" long-name="Information Preview Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/information_preview_popup_api/group" filter="!test"/>
-</component>
-<component name="intermediate_state_api" long-name="Intermediate State API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/intermediate_state_api/group"/>
-</component>
-<component name="help_launcher_api" long-name="Help Launcher API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/help_launcher_api/group"/>
-</component>
-</collection>
-<collection name="ode" long-name="Open Dynamics Engine" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="ode_build" filter="s60" long-name="ODE">
-<unit bldFile="mw/classicui/ode/group"/>
-</component>
-</collection>
-<collection name="uifw" long-name="UI Framework" level="server">
-<component name="uiklaf" filter="s60" long-name="Uikon Look-and-Feel">
-<unit bldFile="mw/classicui/uifw/uiklaf/group"/>
-</component>
-<component name="eikctl" filter="s60" long-name="Eikon Controls">
-<unit bldFile="mw/classicui/uifw/eikctl/group"/>
-</component>
-<component name="avkon" filter="s60" long-name="Avkon">
-<!-- can only have one unit. Split into 3 components, or #include all from same bld.inf -->
-<unit bldFile="mw/classicui/uifw/avkon/aknphysics/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/aknconf/group"/>
-</component>
-<component name="eikstd" filter="s60" long-name="Eikon Standard">
-<unit bldFile="mw/classicui/uifw/eikstd/group"/>
-</component>
-<component name="aknglobalui" filter="s60" long-name="Avkon Global UI">
-<unit bldFile="mw/classicui/uifw/aknglobalui/group"/>
-</component>
-<component name="ganes" filter="s60" long-name="Ganes">
-<unit bldFile="mw/classicui/uifw/ganes/group"/>
-</component>
-</collection>
-<collection name="commonuis" long-name="Common UIs" level="specific">
-<component name="commonui" filter="s60" long-name="Common UI">
-<unit bldFile="mw/classicui/commonuis/commonui/group"/>
-</component>
-<component name="commondialogs" filter="s60" long-name="Common Dialogs">
-<unit bldFile="mw/classicui/commonuis/commondialogs/group"/>
-</component>
-</collection>
-<collection name="applicationinterworkingfw" long-name="Application Interworking Framework" level="generic">
-<component name="aifwservicehandler" filter="s60" long-name="Application Interworking Service Handler">
-<unit bldFile="mw/classicui/applicationinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-<collection name="psln" long-name="Personalization" level="specific">
-<!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
-<component name="psln_build" filter="s60" long-name="Personalization Build">
-<unit bldFile="mw/classicui/psln/group"/>
-</component>
-</collection>
-<collection name="commonadapter" long-name="Common Adapter" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="commonadapter_build" filter="s60" long-name="Common Adapter Build">
-<unit bldFile="mw/classicui/commonadapter/group"/>
-</component>
-</collection>
-<collection name="akntouchgesturefw" long-name="Avkon Touch Gesture Framework" level="generic">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="akntouchgesturefw_build" filter="s60" long-name="Avkon Touch Gesture Framework Build" introduced="^3">
-<unit bldFile="mw/classicui/akntouchgesturefw/group"/>
-</component>
-</collection>
-<collection name="uiutils" long-name="UI Utils" level="specific">
-<component name="localizer" filter="s60" long-name="Directory Localizer">
-<unit bldFile="mw/classicui/uiutils/localizer/group"/>
-</component>
-<component name="findutil" filter="s60" long-name="Find Utility">
-<unit bldFile="mw/classicui/uiutils/findutil/group"/>
-</component>
-<component name="gamerecognizer" filter="s60" long-name="Game Recognizer" plugin="Y">
-<unit bldFile="mw/classicui/uiutils/gamerecognizer/group"/>
-</component>
-<component name="aknjapanesereading" filter="s60" long-name="Avkon Japanese Reading">
-<unit bldFile="mw/classicui/uiutils/aknjapanesereading/group"/>
-</component>
-<component name="hlplch" long-name="Help Launcher" filter="s60,bldfirst">
-<unit bldFile="mw/classicui/uiutils/hlplch/group"/>
-</component>
-</collection>
-<collection name="commonuisupport" long-name="Common UI Support" level="support">
-<component name="uikon" long-name="Uikon" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uikon/group" mrp="mw/classicui/commonuisupport/uikon/group/app-framework_uikon.mrp"/>
-</component>
-<component name="errorresolverdata" long-name="Error Resolver Data" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/errorresolverdata/group" mrp="mw/classicui/commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
-</component>
-<component name="uilaf" long-name="UI Look and Feel" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uilaf/GROUP" mrp="mw/classicui/commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
-</component>
-<component name="grid" long-name="Grid" purpose="optional">
-<unit bldFile="mw/classicui/commonuisupport/grid/group" mrp="mw/classicui/commonuisupport/grid/group/app-framework_grid.mrp"/>
-</component>
-<component name="uifwsdocs" long-name="UI Frameworks Documentation" purpose="development" class="doc">
-<unit mrp="mw/classicui/commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
-</component>
-</collection>
-<collection name="lafagnosticuifoundation" long-name="Look-and-Feel Agnostic UI Foundation" level="base">
-<component name="cone" long-name="Control Environment" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/cone/group" mrp="mw/classicui/lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
-</component>
-<component name="graphicseffects" long-name="Graphics Effects" introduced="9.2" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/graphicseffects/group" mrp="mw/classicui/lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
-</component>
-<component name="uigraphicsutils" long-name="UI Graphics Utilities" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group" mrp="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
-</component>
-<component name="clockanim" long-name="Clock" purpose="optional" plugin="Y">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/clockanim/group" mrp="mw/classicui/lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
-</component>
-<component name="bmpanimation" long-name="BMP Animation" introduced="6.0" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/bmpanimation/group" mrp="mw/classicui/lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
-</component>
-<component name="animation" long-name="Animation" introduced="9.1" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/animation/group" mrp="mw/classicui/lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
-</component>
-</collection>
-<collection name="classicui_info" long-name="Classic UI Info" level="specific">
-<!-- the multiple units in the API test components need to be resolved -->
-<component name="classicui_metadata" long-name="Classic UI Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/classicui/classicui_info/classicui_metadata/classicui_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="svgt" level="generic" long-name="SVG Tiny" levels="util ui">
-<collection name="svgt_plat" long-name="SVG Tiny Platform Interfaces" level="ui">
-<component name="svgt_api" long-name="SVGT API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/svgt_api/group"/>
-</component>
-<component name="nvg_api" long-name="NVG API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/nvg_api/group"/>
-</component>
-</collection>
-<collection name="svgtopt" long-name="SVG-T Engine" level="util">
-<component name="svgtopt_build" filter="s60" long-name="SVG Engine" introduced="9.2">
-<!-- component is at collection level. Needs to be moved down a directory -->
-<unit bldFile="mw/svgt/svgtopt/group"/>
-</component>
-<component name="svgtplugin" filter="s60" long-name="SVG Plugin" introduced="9.2" plugin="Y">
-<unit bldFile="mw/svgt/svgtopt/svgtplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="uiaccelerator" level="generic" long-name="UI Accelerator" levels="plugin framework server ex if">
-<collection name="uiaccelerator_plat" long-name="UI Accelerator Platform Interfaces" level="if">
-<component name="alf_core_toolkit_api" long-name="ALF Core Toolkit API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/group"/>
-</component>
-<component name="alf_visual_api" long-name="ALF Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/group"/>
-</component>
-<component name="alf_extended_visual_api" long-name="ALF Extended Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/group"/>
-</component>
-<component name="alf_extension_api" long-name="ALF Extension API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/group"/>
-</component>
-<component name="alf_tracing_api" long-name="ALF Tracing API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/group"/>
-</component>
-<component name="alf_client_server_api" long-name="ALF Client Server API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/group"/>
-</component>
-</collection>
-<collection name="uiacceltk" long-name="UI Accelerator Toolkit" level="framework">
-<component name="hitchcock" filter="s60" long-name="Hitchcock">
-<unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/group"/>
-</component>
-<component name="uiacceltk_build" filter="s60" long-name="UI Accelerator Toolkit Build">
-<!-- move into the other component, or remove the #include and make this UI Accelerator Toolkit ROM-->
-<unit bldFile="mw/uiaccelerator/uiacceltk/group"/>
-</component>
-</collection>
-<collection name="uiaccelerator_test" long-name="UI Accelerator Test" level="ex"/>
-</block>
-<block name="uiresources" level="generic" long-name="UI Resources" levels="compile plugin framework server generic data">
-<!-- are the custom filters below needed? -->
-<collection name="uiresources_pub" long-name="UI Resources Public Interfaces" level="data">
-<component name="pictograph_api" long-name="Pictograph API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/pictograph_api/group" filter="!test"/>
-</component>
-<component name="skins_api" long-name="Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/skins_api/group" filter="!test"/>
-</component>
-<component name="font_definition_api" long-name="Font Definition API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/font_definition_api/group" filter="!test"/>
-</component>
-<component name="graphics_api" long-name="Graphics API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/graphics_api/group" filter="!test"/>
-</component>
-<component name="scalable_icons_api" long-name="Scalable Icons API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/scalable_icons_api/group"/>
-</component>
-<component name="layout_id_definitions_api" long-name="Layout ID Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/layout_id_definitions_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_plat" long-name="UI Resources Platform Interfaces" level="data">
-<component name="layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_system_private_api/group" filter="!test"/>
-</component>
-<component name="layout_data_api" long-name="Layout Data API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_data_api/group" filter="!test"/>
-</component>
-<component name="cdl_api" long-name="CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/cdl_api/group" filter="!test"/>
-</component>
-<component name="extended_skins_api" long-name="Extended Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_skins_api/group" filter="!test"/>
-</component>
-<component name="tfx_server_controller_plugin_api" long-name="TFX Server Controller Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_controller_plugin_api/group"/>
-</component>
-<component name="extended_fonts_api" long-name="Extended Fonts API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_fonts_api/group" filter="!test"/>
-</component>
-<component name="graphic_configuration_api" long-name="Graphic Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/graphic_configuration_api/group" filter="!test"/>
-</component>
-<component name="mif_header_cdl_api" long-name="MIF Header CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mif_header_cdl_api/group"/>
-</component>
-<component name="personalisation_and_skins_settings_api" long-name="Personalisation and Skins Settings API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/personalisation_and_skins_settings_api/group"/>
-</component>
-<component name="tfx_effect_setup_plugin_api" long-name="TFX Effect Setup Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_effect_setup_plugin_api/group"/>
-</component>
-<component name="mifconv_definitions_api" long-name="Mifconv Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mifconv_definitions_api/group"/>
-</component>
-<component name="wallpaper_configuration_api" long-name="Wallpaper Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/wallpaper_configuration_api/group"/>
-</component>
-<component name="language_code_definitions_api" long-name="Language Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/language_code_definitions_api/group"/>
-</component>
-<component name="skins_image_attributes_api" long-name="Skins Image Attributes API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
-</component>
-<component name="private_user_area_code_definitions_api" long-name="Private User Area Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/private_user_area_code_definitions_api/group"/>
-</component>
-<component name="tfx_server_plugin_ids_api" long-name="TFX Server Plug-in IDs API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_plugin_ids_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_info" long-name="UI Resources Info" level="data">
-<component name="uiresources_test" filter="s60,test,api_test" long-name="UI Resources Tests" purpose="development"/>
-</collection>
-<collection name="uigraphics" long-name="UI Graphics" level="generic">
-<component name="bitmaps2" filter="s60" long-name="Bitmaps 2" class="config">
-<unit bldFile="mw/uiresources/uigraphics/bitmaps2/group"/>
-</component>
-<component name="icons" filter="s60" long-name="Icons" class="config">
-<unit bldFile="mw/uiresources/uigraphics/icons/group"/>
-</component>
-<component name="variatedbitmaps" filter="s60" long-name="Variated Bitmaps" class="config">
-<unit bldFile="mw/uiresources/uigraphics/variatedbitmaps/group"/>
-</component>
-<component name="aknicon" filter="s60" long-name="Avkon Icon Framework">
-<unit bldFile="mw/uiresources/uigraphics/aknicon/group"/>
-</component>
-<component name="nvgrenderstage" filter="sf_build" long-name="NVG Render Stage">
-<unit bldFile="mw/uiresources/uigraphics/nvgrenderstage/group"/>
-</component>
-</collection>
-<collection name="layouts" long-name="Layouts" level="plugin">
-<component name="cdl" filter="s60" long-name="Customization Definition Language">
-<!-- can only have one unit. Need to #include them or split into multiple components -->
-<unit bldFile="mw/uiresources/layouts/cdl/cdlengine/group"/>
-<unit bldFile="mw/uiresources/layouts/cdl/cdlserver/group"/>
-</component>
-<component name="aknlayout2" filter="s60" long-name="Avkon Layout 2">
-<unit bldFile="mw/uiresources/layouts/aknlayout2/group"/>
-</component>
-</collection>
-<collection name="skins" long-name="Skins" level="data">
-<component name="aknskincontent" filter="s60" long-name="Avkon Skin Content" class="config">
-<unit bldFile="mw/uiresources/skins/aknskincontent/group"/>
-</component>
-<component name="aknskins" filter="s60" long-name="Avkon Skin Compiler">
-<unit bldFile="mw/uiresources/skins/aknskins/group"/>
-</component>
-</collection>
-<collection name="pictographs" long-name="Pictographs" level="data">
-<component name="aknpictograph" filter="s60" long-name="Avkon Pictograph">
-<unit bldFile="mw/uiresources/pictographs/aknpictograph/group"/>
-</component>
-</collection>
-<collection name="locales" long-name="Locales" level="framework">
-<component name="locales_build" filter="s60" long-name="Locales Build">
-<unit bldFile="mw/uiresources/locales/loce32"/>
-</component>
-</collection>
-<collection name="uiconfig" long-name="UI Config" level="server">
-<component name="s60config" filter="s60" long-name="S60 UI Config">
-<unit bldFile="mw/uiresources/uiconfig/s60config/group"/>
-</component>
-</collection>
-<collection name="fontsupport" long-name="Font Support" level="generic">
-<component name="fontprovider" filter="s60" long-name="Font Provider">
-<unit bldFile="mw/uiresources/fontsupport/fontprovider/group"/>
-</component>
-<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
- <component id="s60_fonts" filter="s60" name="S60 Fonts">
- <unit bldFile="fontsupport/fontutils/group"/>
- </component>
--->
-<component name="fontutils" filter="sf_build" long-name="Font Utils">
-<unit bldFile="mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
-</component>
-</collection>
-<collection name="helpthemes" long-name="Help Themes" level="data">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helpthemes_build" filter="s60" long-name="Help Themes Build" class="config">
-<unit bldFile="mw/uiresources/helpthemes/group"/>
-</component>
-</collection>
-</block>
-<block name="hapticsservices" level="generic" long-name="Haptics Services" levels="fw server api">
-<collection name="hapticsservices_plat" long-name="Haptics Services Platform Interfaces" level="api">
-<component name="tacticon_api" long-name="Tacticon API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tacticon_api/group"/>
-</component>
-<component name="tactile_feedback_core_api" long-name="Tactile Feedback Core API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_core_api/group"/>
-</component>
-<component name="tactile_feedback_server_api" long-name="Tactile Feedback Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_server_api/group"/>
-</component>
-</collection>
-<collection name="hapticsservices_pub" long-name="Haptics Services Public Interfaces" level="api">
-<component name="tactile_feedback_client_api" long-name="Tactile Feedback Client API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_pub/tactile_feedback_client_api/group"/>
-</component>
-</collection>
-<collection name="tacticonserver" long-name="Tacticon Server" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="tacticonserver_build" filter="s60" long-name="Tacticon Server Build" introduced="^3">
-<unit bldFile="mw/hapticsservices/tacticonserver/group"/>
-<!-- clients and servers are suauly the same component. Consider moving pluign to a separate component if needed -->
-</component>
-</collection>
-<collection name="tactilefeedback" long-name="Tactile Feedback" level="fw">
-<component name="tactilearearegistry" filter="s60" long-name="Tactile Area Registry" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilearearegistry/group"/>
-</component>
-<component name="tactilefeedbackresolver" filter="s60" long-name="Tactile Feedback Resolver" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackresolver/group"/>
-</component>
-<component name="tactileclickplugin" filter="s60" long-name="Tactile Click Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileclickplugin/group"/>
-</component>
-<component name="tactilefeedbackclient" filter="s60" long-name="Tactile Feedback Client" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackclient/group"/>
-</component>
-<component name="tactileactionplugin" filter="s60" long-name="Tactile Action Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileactionplugin/group"/>
-</component>
-<component name="tactilefeedback_build" filter="s60" long-name="Tactile Feedback Build" introduced="^1">
-<!-- consider moving IBY to one fo the above components -->
-<unit bldFile="mw/hapticsservices/tactilefeedback/group"/>
-</component>
-</collection>
-</block>
-<block name="platformthemes" level="specific" long-name="Platform Themes" levels="framework generic ui">
-<collection name="platformthemes_info" long-name="Platform Themes Info">
-<component name="platformthemes_build" long-name="Platform Themes Build">
-<!-- no real structure in this package. Should break into collections / components -->
-<unit bldFile="mw/platformthemes"/>
-</component>
-</collection>
-</block>
-<block name="gsprofilesrv" level="generic" long-name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
-<collection name="gsprofilesrv_pub" long-name="GS and Profiles Services Public Interfaces" level="specific">
-<component name="profiles_engine_active_profile_settings_api" long-name="Profiles Engine Active Profile Settings API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_active_profile_settings_api/group"/>
-</component>
-<component name="profiles_engine_wrapper_api" long-name="Profiles Engine Wrapper API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_wrapper_api/group"/>
-</component>
-</collection>
-<collection name="gsprofilesrv_plat" long-name="GS and Profiles Services Platform Interfaces" level="specific">
-<component name="ftuwizardmodel_api" long-name="FTU Wizard Model API" filter="bldfirst,s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/ftuwizardmodel_api"/>
-</component>
-<component name="profiles_engine_api" long-name="Profiles Engine API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_engine_api/group"/>
-</component>
-<component name="settings_backgroundimage_api" long-name="Settings Background Image API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_backgroundimage_api/group"/>
-</component>
-<component name="settings_framework_api" long-name="Settings Framework API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_framework_api/group"/>
-</component>
-<component name="settings_launch_api" long-name="Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_launch_api/group"/>
-</component>
-<component name="settings_listbox_api" long-name="Settings List Box API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_listbox_api/group"/>
-</component>
-<component name="settings_plugin_api" long-name="Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_plugin_api/group"/>
-</component>
-<component name="settings_uis_cenrep_collection_api" long-name="Settings UIs CenRep Collection API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
-</component>
-</collection>
-<collection name="gssettingsuis" long-name="General Settings UIs" level="framework">
-<component name="gs" filter="s60" long-name="General Settings" introduced="9.2">
-<unit bldFile="mw/gsprofilesrv/gssettingsuis/gs/group"/>
-</component>
-</collection>
-<collection name="ftuwizardmodel" long-name="FTU Wizard Model" level="generic">
-<component name="ftuwizardmodel_build" long-name="FTU Wizardmodel Build" filter="bldfirst">
-<unit bldFile="mw/gsprofilesrv/ftuwizardmodel"/>
-</component>
-</collection>
-<collection name="controlpanel" long-name="Control Panel" level="generic">
-<component name="controlpanel_build" long-name="Control Panel Build">
-<unit bldFile="mw/gsprofilesrv/controlpanel"/>
-</component>
-</collection>
-<collection name="profilesservices" long-name="Profiles Services" level="server">
-<component name="profileengine" filter="s60" long-name="Profile Engine" introduced="9.1">
-<unit bldFile="mw/gsprofilesrv/profilesservices/profileengine/group"/>
-</component>
-<component name="ringingtone3dplugin" filter="s60" long-name="Ringing Tone 3D Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/gsprofilesrv/profilesservices/ringingtone3dplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreensrv" level="specific" long-name="Home Screen Services" levels="plugin framework server generic specific">
-<collection name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" level="specific">
-<component name="ai_content_model_api" long-name="AI Content Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_content_model_api/group"/>
-</component>
-<component name="ai_utilities_api" long-name="AI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_utilities_api/group" filter="!test"/>
-</component>
-<component name="ai_plugin_management_api" long-name="AI Plug-in Management API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_management_api/group"/>
-</component>
-<component name="ai_plugin_information_api" long-name="AI Plug-in Information API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_information_api/group"/>
-</component>
-<component name="ai_variation_api" long-name="AI Variation API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_variation_api/group"/>
-</component>
-<component name="action_handler_plugin_api" long-name="Action Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/group" filter="!test"/>
-</component>
-<component name="content_harvester_plugin_api" long-name="Content Harvester Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/group" filter="!test"/>
-</component>
-<component name="menu_model_api" long-name="Menu Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_model_api/group"/>
-</component>
-<component name="menu_sat_interface_api" long-name="Menu SAT Interface API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/group" filter="!test"/>
-</component>
-<component name="external_home_screen_api" long-name="External Home Screen API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/external_home_screen_api/group"/>
-</component>
-<component name="menu_content_service_api" long-name="Menu Content Service API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_content_service_api/group" filter="!test"/>
-</component>
-<component name="sapi_contentpublishing" long-name="SAPI Content Publishing" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing/group"/>
-</component>
-<component name="sapi_backstepping" long-name="SAPI Backstepping" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_backstepping/group"/>
-</component>
-<component name="sapi_actionhandler" long-name="SAPI Action Handler" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_actionhandler/group"/>
-</component>
-<component name="sapi_homescreenplugin" long-name="SAPI Homescreen Plugin" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_homescreenplugin/group" filter="!test"/>
-</component>
-<component name="sapi_menucontent" long-name="SAPI Menu Content" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_menucontent/group"/>
-</component>
-<component name="xcfw_api" long-name="XCFW API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/xcfw_api/group"/>
-</component>
-<component name="idlefw_api" long-name="Idle Framework API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/idlefw_api/group"/>
-</component>
-<component name="hs_widget_publisher_api" long-name="Home Screen Publishing API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_widget_publisher_api/group"/>
-</component>
-<component name="hs_settings_api" long-name="HS Settings API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_settings_api/group"/>
-</component>
-<component name="hs_content_control_api" long-name="HS Content Control API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_content_control_api/group"/>
-</component>
-</collection>
-<collection name="xcfw" long-name="XML Content Framework" level="framework">
-<!-- collection is really a component, needs to be moved down a directory -->
-<component name="xcfw_build" filter="s60" long-name="XML Content Framework Build">
-<unit bldFile="mw/homescreensrv/xcfw/group"/>
-</component>
-</collection>
-<collection name="homescreenpluginsrv" long-name="Home Screen Plugin Service" level="plugin">
-<component name="hspsdefinitionengine" filter="s60" long-name="HS Plugin Service Definition Engine" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsdefinitionengine/group"/> -->
-</component>
-<component name="hspsdom" filter="s60" long-name="HS Plugin Service DOM" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsdom/group"/> -->
-</component>
-<component name="hspstools" filter="s60" long-name="HS Server Tools">
-<!-- <unit bldFile="homescreenpluginsrv/hspstools/group"/> -->
-</component>
-<component name="hspspluginregistry" filter="s60" long-name="HS Plugin Registry" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspspluginregistry/group"/>-->
-</component>
-<component name="hspsmanager" filter="s60" long-name="HSPS Manager" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsmanager/group"/>-->
-</component>
-<component name="hspsodt" filter="s60" long-name="HSPS Object Description Tree" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsodt/group"/>-->
-</component>
-<component name="hspsresource" filter="s60" long-name="HS Plugin Server Resource" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresource/group"/>-->
-</component>
-<component name="hspsresult" filter="s60" long-name="HS Plugin Server Result" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
-</component>
-<component name="homescreen_settings_api" filter="s60" long-name="HS Settings API" class="api placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
-</component>
-<component name="homescreenpluginsrv_build" filter="s60" long-name="HSPS Build">
-<!-- need to break this up into the self-contained components above and uncomment them -->
-<unit bldFile="mw/homescreensrv/homescreenpluginsrv/group"/>
-</component>
-</collection>
-<collection name="idlefw" long-name="Idle Framework" level="framework">
-<!-- Uncomment all units when configuration is in place. All currently #included from idlefw_build -->
-<component name="idlefw_plugins" filter="s60" long-name="Idle Framework Plugins" plugin="Y" class="placeholder">
-<!--<unit bldFile="idlefw/plugins/group"/>-->
-</component>
-<component name="hslaunch" filter="s60" long-name="Home Screen Launch" class="placeholder">
-<!--<unit bldFile="idlefw/plugins/group"/>-->
-</component>
-<component name="idlefw_build" filter="s60" long-name="Idle Framework Build">
-<!--split this into components, or separate from the above components and move this down a directory -->
-<unit bldFile="mw/homescreensrv/idlefw/group"/>
-</component>
-</collection>
-<collection name="menucontentsrv" long-name="Menu Content Service" level="generic">
-<component name="menusatinterface" filter="s60" long-name="Menu SAT Interface">
-<unit bldFile="mw/homescreensrv/menucontentsrv/menusatinterface/group"/>
-</component>
-<component name="menucontentsrv_build" filter="s60" long-name="Menu Content Service Build">
-<!--split this into components, or separate from the above component and move this down a directory -->
-<unit bldFile="mw/homescreensrv/menucontentsrv/group"/>
-</component>
-</collection>
-<collection name="backsteppingsrv" long-name="Back Stepping Service" level="server">
-<!-- collection is really a component, needs to be moved down a directory -->
-<component name="bsengine" long-name="Back Stepping Engine" filter="s60">
-<unit bldFile="mw/homescreensrv/backsteppingsrv/group"/>
-</component>
-</collection>
-<collection name="contentpublishingsrv" long-name="Content Publishing Service" level="server">
-<component name="contentpublishingdebug" filter="s60" long-name="Content Publishing Debug">
-<!-- need to move this component outside of contentpublishingutils and into separate component directory -->
-<!-- <unit bldFile="contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/> -->
-</component>
-<component name="contentpublishingutils" filter="s60" long-name="Content Publishing Utils">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingutils/group"/>
-</component>
-<component name="contentpublishingserver" filter="s60" long-name="Content Publishing Server">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingserver/group"/>
-</component>
-<component name="contentharvester" filter="s60" long-name="Content Harvester">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
-</component>
-<component name="contentpublishingsrv_build" filter="s60" long-name="Content Publishing Service Build">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/group"/>
-</component>
-</collection>
-<collection name="contentcontrolsrv" long-name="Content Control Service" level="server">
-<component name="ccsrv" long-name="Content Control Service" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccsrv/group"/>
-</component>
-<component name="ccsrvapi" long-name="Content Control Service API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccsrvapi/group"/>
-</component>
-<component name="ccclientsession" long-name="Content Control Client Session" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccclientsession/group"/>
-</component>
-<component name="hsccclient" long-name="HS Content Control Client" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/hsccclient/group"/>
-</component>
-<component name="hscontentinfo" long-name="Home Screen Content Info" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/hscontentinfo/group"/>
-</component>
-<component name="contentcontrolsrv_build" long-name="Content Control Service Build" filter="s60" introduced="^3">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreensrvlegacy" level="generic" long-name="Legacy Home Screen Services" levels="plugin framework server generic specific">
-<collection name="homescreensrvlegacy_plat" long-name="Legacy Home Screen Services Platform Interfaces" level="specific">
-<component name="ai_content_model_api" long-name="AI Content Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrvlegacy/ai_content_model_api/group"/>
-</component>
-<component name="ai_plugin_information_api" long-name="AI Plug-in Information API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrvlegacy/ai_plugin_information_api/group"/>
-</component>
-</collection>
-</block>
-<block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
-<collection name="appinstall_plat" long-name="Application Installation Platform Interfaces" level="api">
-<component name="iaupdate_api" long-name="IA Update API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/iaupdate_api/group"/>
-</component>
-<component name="task_plugin_api" long-name="Task Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_plugin_api/group"/>
-</component>
-<component name="sw_installer_common_ui_api" long-name="SW Installer Common UI API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_common_ui_api/group"/>
-</component>
-<component name="sw_installer_launcher_api" long-name="SW Installer Launcher API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_launcher_api/group"/>
-</component>
-<component name="task_management_api" long-name="Task Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_management_api/group"/>
-</component>
-<component name="sw_installer_ui_plugin_api" long-name="SW Installer UI Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ui_plugin_api/group"/>
-</component>
-<component name="sw_installer_cr_keys" long-name="SW Installer CR Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_cr_keys/group"/>
-</component>
-<component name="sw_installer_ps_keys" long-name="SW Installer PS Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
-</component>
-<component name="appmngr2runtimeapi" long-name="Application Manager 2 Runtime Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
-</component>
-<component name="sifui_api" long-name="STIF UI API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sifui_api/group"/>
-</component>
-</collection>
-<collection name="appinstall_pub" long-name="Application Installation Public Interfaces" level="api">
-<component name="startup_list_management_api" long-name="Startup List Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
-</component>
-</collection>
-<collection name="ncdengine" long-name="Nokia Content Discover" level="framework">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="ncdengine_engine" filter="s60" long-name="NCD Engine" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/engine/group"/>
-</component>
-<component name="debuglogger" filter="s60" long-name="NCD Debug Logger" introduced="^1" class="placeholder">
-<!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
-</component>
-<component name="ncdengine_build" filter="s60" long-name="NCD Build" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/group"/>
-</component>
-</collection>
-<collection name="appinstaller" long-name="Application Installer" level="generic">
-<component name="appinstui" filter="s60" long-name="Application Installer UI" introduced="^2">
-<unit bldFile="mw/appinstall/appinstaller/appinstui/group"/>
-</component>
-</collection>
-<collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="api">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="iaupdateapi_stub_build" long-name="IA Update API Stub Build" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdateapi_stub/group"/>
-</component>
-</collection>
-<collection name="iaupdate" long-name="Independent Apps Update" level="api">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="iad" long-name="Software Update" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/iad/group"/>
-</component>
-<component name="iaupdate_help" filter="s60" long-name="IA Update Help" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/help/group"/>
-</component>
-<component name="iaupdate_build" filter="s60" long-name="IA Update Build" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/group"/>
-</component>
-</collection>
-<collection name="installationservices" long-name="Installation Services" level="generic">
-<component name="swi" long-name="Secure Software Install" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swi/group" mrp="mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
-</component>
-<component name="swidevicetools" long-name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
-<unit bldFile="mw/appinstall/installationservices/swidevicetools/group" mrp="mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
-</component>
-<component name="swcomponentregistry" long-name="Software Component Registry" introduced="^4" purpose="mandatory">
-<unit bldFile="mw/appinstall/installationservices/swcomponentregistry/group" mrp="mw/appinstall/installationservices/swcomponentregistry/group/security_softwarecomponentregistry.mrp"/>
-</component>
-<component name="swinstallationfw" long-name="Software Installation Framework" introduced="^4" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swinstallationfw/group" mrp="mw/appinstall/installationservices/swinstallationfw/group/security_softwareinstallframework.mrp"/>
-</component>
-<component name="swtransactionservices" long-name="Software Transaction Services" introduced="^4" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swtransactionservices/group" mrp="mw/appinstall/installationservices/swtransactionservices/group/security_softwaretransactionservices.mrp"/>
-</component>
-<component name="refswinstallationplugin" long-name="Reference Software Installation Plugin" introduced="^4" purpose="development" plugin="Y">
-<unit bldFile="mw/appinstall/installationservices/refswinstallationplugin/group" mrp="mw/appinstall/installationservices/refswinstallationplugin/group/security_sifrefplugin.mrp"/>
-</component>
-<component name="refsoftwareappmgr" long-name="Reference Software Application Manager" introduced="^4" purpose="development">
-<unit bldFile="mw/appinstall/installationservices/refsoftwareappmgr/group" mrp="mw/appinstall/installationservices/refsoftwareappmgr/group/security_referenceapplicationmanager.mrp"/>
-</component>
-<component name="swiconfig" long-name="Software Install Config" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appinstall/installationservices/swiconfig/group" mrp="mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
-</component>
-</collection>
-<collection name="secureswitools" long-name="Secure Software Install Tools" level="tool">
-<component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/makekeys/group" mrp="mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
-</component>
-<component name="swianalysistoolkit" long-name="SWI Analysis Toolkit" purpose="development" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
-</component>
-<component name="openssllib" long-name="OpenSSL Library" purpose="optional" class="PC">
-<unit mrp="mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
-</component>
-<component name="swisistools" long-name="Secure Software Install SIS Tools" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swisistools/group" mrp="mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
-</component>
-</collection>
-<collection name="appinstall_info" long-name="Application Installation Info" level="api">
-<component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="serviceapifw" level="specific" long-name="Service API Framework" levels="plugin framework server generic specific">
-<collection name="serviceapifw_pub" long-name="Service API Framework Public Interfaces" level="specific"/>
-<collection name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" level="specific">
-<component name="rtsecuritymanager_common_api" long-name="Runtime Security Manager Common API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/group"/>
-</component>
-<component name="rtsecuritymanager_utility_api" long-name="Runtime Security Manager Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
-</component>
-<component name="rtsecuritymanager_client_api" long-name="Runtime Security Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/group"/>
-</component>
-<component name="liw_provider_utility_api" long-name="LIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_provider_utility_api/group"/>
-</component>
-<component name="liw_service_interface_base_api" long-name="LIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_base_api/group"/>
-</component>
-<component name="liw_service_interface_menu_api" long-name="LIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_menu_api/group"/>
-</component>
-<component name="liw_criteria_api" long-name="LIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_criteria_api/group"/>
-</component>
-<component name="liw_generic_parameter_api" long-name="LIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_generic_parameter_api/group"/>
-</component>
-<component name="liw_service_handler_api" long-name="LIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_handler_api/group"/>
-</component>
-</collection>
-<collection name="rtsecuritymanager" long-name="Runtime Security Manager" level="server">
-<component name="rtsecuritymanagerutil" filter="s60" long-name="Runtime Security Manager Util">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
-</component>
-<component name="rtsecuritymanagerserver" filter="s60" long-name="Runtime Security Manager Server">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/>
-</component>
-<component name="rtsecuritymanagerclient" filter="s60" long-name="Runtime Security Manager Client">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/>
-</component>
-<component name="rtsecuritymanager_build" filter="s60" long-name="Runtime Security Manager Build">
-<!-- Move the export to the appropriate components, or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/group"/>
-</component>
-</collection>
-<collection name="languageinterworkingfw" long-name="Language Interworking Framework" level="framework">
-<component name="lifwservicehandler" filter="s60" long-name="Service Handler">
-<unit bldFile="mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-</block>
-<block name="serviceapi" level="specific" long-name="Service API" levels="os mw1 mw2 app">
-<!-- should break up this collection into something meaningful -->
-<collection name="serviceproviders" long-name="Service Providers" level="mw1">
-<component name="sapi_contacts_vpbk" long-name="Contacts Phonebook SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
-</component>
-<component name="sapi_location" long-name="Location SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_location/group"/>
-</component>
-<component name="sapi_mediamanagement" long-name="Media Management SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/group"/>
-</component>
-<component name="sapi_landmarks" long-name="Landmarks SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
-</component>
-<component name="sapi_messaging" long-name="Messaging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/group"/>
-</component>
-<component name="sapi_applicationmanager" long-name="Application Manager SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
-</component>
-<component name="sapi_calendar" long-name="Calendar SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_calendar/group"/>
-</component>
-<component name="sapi_logging" long-name="Logging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_logging/group"/>
-</component>
-<component name="sapi_sensor" long-name="Sensor SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sensor/group"/>
-</component>
-<component name="sapi_sysinfo" long-name="Sysinfo SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sysinfo/group"/>
-</component>
-<component name="sapi_serviceregistry" long-name="Service Registry SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
-</component>
-<component name="jsapi" long-name="Javascript API" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/jsapi/group"/>
-</component>
-<component name="serviceproviders_build" filter="s60" long-name="Service API Build">
-<!-- distribute the exports or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapi/serviceproviders/group"/>
-</component>
-</collection>
-</block>
-<block name="web" level="specific" long-name="Web" levels="plugin utils server generic specific">
-<collection name="web_pub" long-name="Web Public Interfaces" level="specific">
-<component name="browser_control_api" long-name="Browser Control API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_control_api/group"/>
-</component>
-<component name="download_mgr_client_api" long-name="Download Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_client_api/group"/>
-</component>
-<component name="download_mgr_ui_api" long-name="Download Manager UI Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_ui_api/group"/>
-</component>
-<component name="favourites_engine_api" long-name="Favourites Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/favourites_engine_api/group"/>
-</component>
-<component name="browser_plugin_api" long-name="Browser Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_plugin_api/group"/>
-</component>
-<component name="settings_api" long-name="Settings API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/settings_api/group"/>
-</component>
-</collection>
-<collection name="web_plat" long-name="Web Platform Interfaces" level="specific">
-<component name="aiw_browser_provider_api" long-name="AIW Browser Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/aiw_browser_provider_api/group"/>
-</component>
-<component name="browser_dialogs_provider_api" long-name="Browser Dialogs Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_dialogs_provider_api/group"/>
-</component>
-<component name="browser_platform_api" long-name="Browser Platform API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_platform_api/group"/>
-</component>
-<component name="cod_handler_api" long-name="COD Handler API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cod_handler_api/group"/>
-</component>
-<component name="connection_manager_api" long-name="Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/connection_manager_api/group"/>
-</component>
-<component name="cxml_library_api" long-name="cXml Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cxml_library_api/group"/>
-</component>
-<component name="download_mgr_client_api_extn" long-name="Download Manager Client API Extension" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/download_mgr_client_api_extn/group"/>
-</component>
-<component name="feeds_engine_api" long-name="Feeds Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/feeds_engine_api/group"/>
-</component>
-<component name="launcher_api" long-name="Launcher API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/launcher_api/group"/>
-</component>
-<component name="multipart_parser_api" long-name="Multipart Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/multipart_parser_api/group"/>
-</component>
-<component name="recent_url_store_api" long-name="Recent URL Store API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/recent_url_store_api/group"/>
-</component>
-<component name="scheme_handler_plugin_api" long-name="Scheme Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scheme_handler_plugin_api/group"/>
-</component>
-<component name="scriptable_plugin_api" long-name="Scriptable Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scriptable_plugin_api/group"/>
-</component>
-<component name="webutils_api" long-name="Web Utils API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/webutils_api/group"/>
-</component>
-<component name="widget_registry_api" long-name="Widget Registry API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/widget_registry_api/group"/>
-</component>
-<component name="xml_parser_api" long-name="XML Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/xml_parser_api/group"/>
-</component>
-<component name="stmgesturefw_api" long-name="State Machine Gesture Framework API " filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/stmgesturefw_api/group"/>
-</component>
-</collection>
-<collection name="web_info" long-name="Web Info" level="specific">
-<component name="web_build" filter="s60" long-name="Web Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/group"/>
-</component>
-</collection>
-<collection name="browserutilities" long-name="Browser Utilities" level="utils">
-<component name="browserdialogsprovider" filter="s60" long-name="Browser Dialogs Provider">
-<unit bldFile="mw/web/browserutilities/browserdialogsprovider/group"/>
-</component>
-<component name="recenturlstore" filter="s60" long-name="Recent URL Store">
-<unit bldFile="mw/web/browserutilities/recenturlstore/group"/>
-</component>
-<component name="xmlparser" filter="s60" long-name="XML Interface">
-<unit bldFile="mw/web/browserutilities/xmlparser/group"/>
-</component>
-<component name="cxmllibrary" filter="s60" long-name="XML Parser Implementation">
-<unit bldFile="mw/web/browserutilities/cxmllibrary/group"/>
-</component>
-<component name="downloadmgr" filter="s60" long-name="Download Manager">
-<unit bldFile="mw/web/browserutilities/downloadmgr/group"/>
-</component>
-<component name="connectionmanager" filter="s60" long-name="Connection Manager">
-<unit bldFile="mw/web/browserutilities/connectionmanager/group"/>
-</component>
-<component name="browsertelservice" filter="s60" long-name="Browser Telephony Service">
-<unit bldFile="mw/web/browserutilities/browsertelservice/group"/>
-</component>
-<component name="favouritesengine" filter="s60" long-name="Favourites Engine">
-<unit bldFile="mw/web/browserutilities/favouritesengine/group"/>
-</component>
-<component name="feedsengine" filter="s60" long-name="Feeds Engine">
-<unit bldFile="mw/web/browserutilities/feedsengine/group"/>
-</component>
-<component name="multipartparser" filter="s60" long-name="Multipart Parser">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
-<!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
-</component>
-<component name="schemehandler" filter="s60" long-name="Scheme Handler">
-<unit bldFile="mw/web/browserutilities/schemehandler/group"/>
-</component>
-<component name="webutils" filter="s60" long-name="Web Utils">
-<unit bldFile="mw/web/browserutilities/webutils/group"/>
-</component>
-<component name="aiwbrowserprovider" filter="s60" long-name="AIW Browser Provider" plugin="Y">
-<unit bldFile="mw/web/browserutilities/aiwbrowserprovider/group"/>
-</component>
-<component name="browserutilities_build" filter="s60" long-name="Browser Utilities Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/browserutilities/group"/>
-</component>
-</collection>
-<collection name="webengine" long-name="Web Engine" level="server">
-<component name="osswebengine" filter="s60" long-name="OSS Web Engine">
-<!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
-<unit bldFile="mw/web/webengine/osswebengine/cache/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/memorymanager/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/npscript/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group/javascriptcore"/>
-</component>
-<component name="webkitutils" filter="s60" long-name="WebKit Utils">
-<unit bldFile="mw/web/webengine/webkitutils/group"/>
-</component>
-<component name="pagescaler" filter="s60" long-name="Page Scaler">
-<unit bldFile="mw/web/webengine/pagescaler/group"/>
-</component>
-<component name="webwidgetinstaller" filter="s60" long-name="Widget Installer">
-<unit bldFile="mw/web/webengine/widgetinstaller/group"/>
-</component>
-<component name="widgetregistry" filter="s60" long-name="Widget Registry">
-<unit bldFile="mw/web/webengine/widgetregistry/group"/>
-</component>
-<component name="wmlengine" filter="s60" long-name="WML Engine">
-<unit bldFile="mw/web/webengine/wmlengine/group"/>
-</component>
-<component name="device" filter="s60" long-name="Device">
-<!-- this needs a more meaningful name -->
-<unit bldFile="mw/web/webengine/device/group"/>
-</component>
-<component name="widgetengine" filter="s60" long-name="Widget Engine">
-<unit bldFile="mw/web/webengine/widgetengine/group"/>
-</component>
-<component name="web_memoryplugin" long-name="Memory Plugin" filter="s60" plugin="Y">
-<unit bldFile="mw/web/webengine/memoryplugin/group"/>
-</component>
-<component name="widgetmemoryplugin" filter="s60" long-name="Widget Memory Plugin" plugin="Y">
-<unit bldFile="mw/web/webengine/widgetmemoryplugin/group"/>
-</component>
-<component name="widgetbackuprestore" filter="s60" long-name="Widget Backup and Restore">
-<unit bldFile="mw/web/webengine/widgetbackuprestore/group"/>
-</component>
-<component name="browserrecognizers" filter="s60" long-name="Browser Recognizers" plugin="Y">
-<unit bldFile="mw/web/webengine/browserrecognizers/group"/>
-</component>
-<component name="wrtharvester" filter="s60" long-name="Web Runtime Harvester" plugin="Y">
-<unit bldFile="mw/web/webengine/wrtharvester/group"/>
-</component>
-</collection>
-<collection name="codhandler" long-name="Content Object Descriptor Handler" level="specific">
-<component name="codeng" filter="s60" long-name="COD Engine">
-<unit bldFile="mw/web/codhandler/codeng/group"/>
-</component>
-<component name="codui" filter="s60" long-name="COD UI">
-<unit bldFile="mw/web/codhandler/codui/group"/>
-</component>
-<component name="codrecog" filter="s60" long-name="COD Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/codrecog/group"/>
-</component>
-<component name="codviewer" filter="s60" long-name="COD Viewer">
-<unit bldFile="mw/web/codhandler/codviewer/group"/>
-</component>
-<component name="ddrecog" filter="s60" long-name="Download Descriptor Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/ddrecog/group"/>
-</component>
-<component name="ddviewer" filter="s60" long-name="Download Descriptor Viewer">
-<unit bldFile="mw/web/codhandler/ddviewer/group"/>
-</component>
-<component name="coddownload" filter="s60" long-name="COD Download">
-<unit bldFile="mw/web/codhandler/coddownload/group"/>
-</component>
-<component name="roapapp" filter="s60" long-name="ROAP Application">
-<unit bldFile="mw/web/codhandler/roapapp/group"/>
-</component>
-<component name="codhandler_build" filter="s60" long-name="COD Handler Build">
-<!-- Exports need to go into another component or make this self-contained.
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/codhandler/group"/>
-</component>
-</collection>
-<collection name="widgets" long-name="Web Widget Framework" level="generic">
-<!-- the following units can be uncommented when configuration is put in place -->
-<component name="widgetrecognizer" filter="s60" long-name="Widget Recognizer" plugin="Y">
-<!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
-</component>
-<component name="widgetinstaller" filter="s60" long-name="Widget Installer UI" plugin="Y">
-<!--<unit bldFile="widgets/widgetinstaller/group"/>-->
-</component>
-<component name="widgetlauncher" filter="s60" long-name="Widget Launcher">
-<!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
-</component>
-<component name="widgetapp" filter="s60" long-name="Widget UI">
-<!--<unit bldFile="widgets/widgetapp/group"/>-->
-</component>
-<component name="widgetsidchecker" filter="s60" long-name="Widget SID Checker" introduced="^3">
-<!--<unit bldFile="widgets/widgetsidchecker/group"/>-->
-</component>
-<component name="widgetpreinstaller" filter="s60" long-name="Widget Pre-Installer">
-<!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
-</component>
-<component name="widgetstartup" filter="s60" long-name="Widget Startup">
-<!--<unit bldFile="widgets/widgetstartup/group"/>-->
-</component>
-<component name="widgets_build" filter="s60" long-name="Widgets Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/widgets/group"/>
-</component>
-</collection>
-</block>
-<block name="websrv" level="generic" long-name="Web Services" levels="plugin framework server generic specific">
-<collection name="websrv_pub" long-name="Web Services Public Interfaces" level="specific">
-<component name="web_service_description_api" long-name="Web Service Description API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_description_api/group"/>
-</component>
-<component name="web_service_connection_api" long-name="Web Service Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/group"/>
-</component>
-<component name="web_service_manager_api" long-name="Web Service Manager API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/group"/>
-</component>
-<component name="hostlet_connection_api" long-name="Hostlet Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/group"/>
-</component>
-<component name="web_service_messaging_api" long-name="Web Service Messaging API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/group"/>
-</component>
-<component name="xml_extensions_api" long-name="XML Extensions API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/group"/>
-</component>
-<component name="xml_fragment_api" long-name="XML Fragment API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/group"/>
-</component>
-</collection>
-<collection name="webservices" long-name="Web Services Framework" level="generic">
-<!-- consider breaking this collection into more meaningful subsets -->
-<component name="wsnotifierplugins" filter="s60" long-name="WS Notifier Plugins" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsnotifierplugins/group"/>
-</component>
-<component name="wslogger" filter="s60" long-name="WS Logger">
-<unit bldFile="mw/websrv/webservices/wslogger/group"/>
-</component>
-<component name="wsxml" filter="s60" long-name="WS XML Extensions">
-<unit bldFile="mw/websrv/webservices/wsxml/group"/>
-</component>
-<component name="wsutils" filter="s60" long-name="WS Utils">
-<unit bldFile="mw/websrv/webservices/wsutils/group"/>
-</component>
-<component name="wsfragment" filter="s60" long-name="WS Fragment">
-<unit bldFile="mw/websrv/webservices/wsfragment/group"/>
-</component>
-<component name="wsdescription" filter="s60" long-name="WS Service Description">
-<unit bldFile="mw/websrv/webservices/wsdescription/group"/>
-</component>
-<component name="wsconnection" filter="s60" long-name="WS Service Connection">
-<unit bldFile="mw/websrv/webservices/wsconnection/group"/>
-</component>
-<component name="wsmessages" filter="s60" long-name="WS Messages">
-<unit bldFile="mw/websrv/webservices/wsmessages/group"/>
-</component>
-<component name="wscredentialmanager" filter="s60" long-name="WS Credential Manager">
-<unit bldFile="mw/websrv/webservices/wscredentialmanager/group"/>
-</component>
-<component name="wsframework" filter="s60" long-name="WS Framework">
-<unit bldFile="mw/websrv/webservices/wsframework/group"/>
-</component>
-<component name="wshttpchanneltransportplugin" filter="s60" long-name="WS HTTP Channel Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshttpchanneltransportplugin/group"/>
-</component>
-<component name="wsconnectionagent" filter="s60" long-name="WS Connection Agent">
-<unit bldFile="mw/websrv/webservices/wsconnectionagent/group"/>
-</component>
-<component name="wsprovider" filter="s60" long-name="WS Provider">
-<unit bldFile="mw/websrv/webservices/wsprovider/group"/>
-</component>
-<component name="wshostletconnection" filter="s60" long-name="WS Hostlet Connection">
-<unit bldFile="mw/websrv/webservices/wshostletconnection/group"/>
-</component>
-<component name="wsmanager" filter="s60" long-name="WS Service Manager">
-<unit bldFile="mw/websrv/webservices/wsmanager/group"/>
-</component>
-<component name="wsidentitymanager" filter="s60" long-name="WS Identity Manager">
-<unit bldFile="mw/websrv/webservices/wsidentitymanager/group"/>
-</component>
-<component name="idwsfplugin" filter="s60" long-name="ID-WSF Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/idwsfplugin/group"/>
-</component>
-<component name="wsibasicplugin" filter="s60" long-name="WS-I Basic Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsibasicplugin/group"/>
-</component>
-<component name="wsrestplugin" filter="s60" long-name="WS REST Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsrestplugin/group"/>
-</component>
-<component name="idwsfsecuritymechanism" filter="s60" long-name="ID-WSF Security Mechanism">
-<unit bldFile="mw/websrv/webservices/idwsfsecuritymechanism/group"/>
-</component>
-<component name="wspasswordtransforms" filter="s60" long-name="WS Password Transforms">
-<unit bldFile="mw/websrv/webservices/wspasswordtransforms/group"/>
-</component>
-<component name="wscore" filter="s60" long-name="WS Core Service Manager">
-<unit bldFile="mw/websrv/webservices/wscore/group"/>
-</component>
-<component name="wslocaltransportplugin" filter="s60" long-name="WS Local Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wslocaltransportplugin/group"/>
-</component>
-<component name="wshostlettransportplugin" filter="s60" long-name="WS Hostlet Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshostlettransportplugin/group"/>
-</component>
-<component name="wsstar" filter="s60" long-name="WS Star">
-<!-- can only have one unit. Need to split into separate components or #include from a single bld.inf -->
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarpolicy/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarplugin/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarmessagehandlers/group"/>
-</component>
-<component name="wsoviplugin" filter="s60" long-name="WS Ovi Plugin">
-<unit bldFile="mw/websrv/webservices/wsoviplugin/group"/>
-</component>
-<component name="webservices_build" filter="s60" long-name="Web Services Build">
-<!-- need to split into self-contained components -->
-<unit bldFile="mw/websrv/webservices/group"/>
-</component>
-</collection>
-<collection name="websrv_info" long-name="Web Services Info" level="specific">
-<component name="websrv_bld" filter="s60" long-name="Web Services Build">
-<!-- need to include common .hrh in each unit -->
-<unit bldFile="mw/websrv/group"/>
-</component>
-</collection>
-</block>
-<block name="platformtools" level="generic" long-name="Platform Tools">
-<collection name="gfxconversion" long-name="Graphics Conversion">
-<component name="bmconv_s60" filter="s60" long-name="S60 Bitmap Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/bmconv_s60/group"/>
-</component>
-<component name="mifconv" filter="s60" long-name="Multi Icon File Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/mifconv/group"/>
-</component>
-</collection>
-</block>
-<block name="uitools" level="specific" long-name="UI Tools" levels="compile encode tool if">
-<collection name="uitools_pub" long-name="UI Tools Public Interfaces" level="if">
-<component name="third_party_bitmap_palette_api" long-name="Third Party Bitmap Palette API" filter="s60" class="api">
-<unit bldFile="mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
-</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">
-<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">
-<unit bldFile="mw/uitools/uitools_plat/layout_system_private_api/group"/>
-</component>
-</collection>
-<collection name="cdlcompilertoolkit" long-name="CDL Compiler Toolkit" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompilertoolkit_build" filter="s60" long-name="CDL Compiler Toolkit Build">
-<unit bldFile="mw/uitools/cdlcompilertoolkit/group"/>
-</component>
-</collection>
-<collection name="cdlcompiler" long-name="CDL Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompiler_build" filter="s60" long-name="CDL Compiler Build">
-<unit bldFile="mw/uitools/cdlcompiler/group"/>
-</component>
-</collection>
-<collection name="gfxtools" long-name="Graphics Tools" level="tool">
-<component name="gditools" filter="s60" long-name="GDI Tools" class="PC">
-<unit bldFile="mw/uitools/gfxtools/gditools/group"/>
-</component>
-<component name="color" filter="s60" long-name="Bitmap Colour Palette" class="PC">
-<unit bldFile="mw/uitools/gfxtools/color/group"/>
-</component>
-</collection>
-<collection name="aknlayoutcompiler" long-name="Avkon Layout Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="aknlayoutcompiler_build" filter="s60" long-name="Avkon Layout Compiler Build">
-<unit bldFile="mw/uitools/aknlayoutcompiler/group"/>
-</component>
-</collection>
-<collection name="skincompiler" long-name="Skin Compiler" level="compile">
-<component name="aknskindesccompiler" filter="s60" long-name="Avkon Skin Descriptor Compiler">
-<unit bldFile="mw/uitools/skincompiler/AknSkinDescCompiler/group"/>
-</component>
-</collection>
-<collection name="reszip" long-name="Resource Zip" level="encode">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="reszip_build" filter="s60" long-name="Resource Zip Build">
-<unit bldFile="mw/uitools/reszip/group"/>
-</component>
-</collection>
-<collection name="toollibraries" long-name="Tool Libraries" level="tool"/>
-<collection name="svgtencoder" long-name="SVGT Encoder" level="encode">
-<component name="svgtenc" filter="s60" long-name="Standalone SVGT Encoder" class="PC">
-<unit bldFile="mw/uitools/svgtencoder/svgtenc/standalone/group"/>
-</component>
-</collection>
-</block>
-</layer>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="location" level="apps" long-name="Location Apps" levels="ui events loc api">
-<collection name="loc_plat" long-name="Location Apps Platform Interfaces" level="api">
-<component name="location_picker_service_api" long-name="Location Picker Service API" introduced="^4" filter="s60" class="api">
-<unit bldFile="app/location/loc_plat"/>
-</component>
-</collection>
-<collection name="locationpickerservice" long-name="Location Picker Service" level="loc">
-<!--collection is really a component. Should move down a directory -->
-<component name="locationpickerservice_build" filter="s60" long-name="Location Picker Service Build" introduced="^4">
-<unit bldFile="app/location/locationpickerservice"/>
-</component>
-</collection>
-</block>
-<!-- pending removal -->
-<block name="mmsharinguis" level="services" long-name="Multimedia Sharing UIs" levels="base plugin if">
-<collection name="mmsharinguis_plat" long-name="Multimedia Sharing UIs Platform Interfaces" level="if">
-<component name="multimedia_sharing_settings_api" long-name="Multimedia Sharing Settings API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_settings_api/group"/>
-</component>
-<component name="multimedia_sharing_resource_api" long-name="Multimedia Sharing Resource API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_resource_api/group"/>
-</component>
-<component name="multimedia_sharing_manager_api" long-name="Multimedia Sharing Manager API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/group"/>
-</component>
-</collection>
-<collection name="mmsharing" long-name="Multimedia Sharing" level="base">
-<component name="mmshavailability" filter="s60" long-name="Multimedia Sharing Availability">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshavailability/group"/>
-</component>
-<component name="mmshindicator" filter="s60" long-name="Multimedia Sharing Indicator">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshindicator/group"/>
-</component>
-<!-- consider putting client and server in the same component -->
-<component name="mmshmanagercli" filter="s60" long-name="Multimedia Sharing Manager Client">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshmanagercli/group" filter="!test"/>
-</component>
-<component name="mmshmanagersrv" filter="s60" long-name="Multimedia Sharing Manager Server">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshmanagersrv/group"/>
-</component>
-<component name="mmshengine" filter="s60" long-name="Multimedia Sharing Engine">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshengine/group"/>
-</component>
-<component name="mmshui" filter="s60" long-name="Multimedia Sharing UI">
-<!-- can only have one unit: need to #include one from the other if it's needed -->
-<unit bldFile="app/mmsharinguis/mmsharing/mmshui/group"/>
-<unit bldFile="app/mmsharinguis/mmsharing/mmshui/help/group"/>
-</component>
-<component name="mmsharing_build" filter="s60" long-name="MM Sharing Build">
-<unit bldFile="app/mmsharinguis/mmsharing/group"/>
-</component>
-</collection>
-<collection name="mmshplugins" long-name="Multimedia Sharing Plugins" level="plugin">
-<component name="mmshaoplugin" filter="s60" long-name="Multimedia Sharing Always Online Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshaoplugin/group"/>
-</component>
-<component name="mmshaiwplugin" filter="s60" long-name="Multimedia Sharing AIW Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshaiwplugin/group"/>
-</component>
-<component name="mmshsipcrplugin" filter="s60" long-name="Multimedia Sharing SIP Client Resolver Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshsipcrplugin/group"/>
-</component>
-<component name="mmshsettingsuiplugin" filter="s60" long-name="Multimedia Sharing Settings UI Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshsettingsuiplugin/group"/>
-</component>
-<component name="mmshwpadapterplugin" filter="s60" long-name="Multimedia Sharing WAP Provisioning Adapter" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshwpadapterplugin/group"/>
-</component>
-</collection>
-<collection name="mmsharinguis_info" long-name="Multimedia Sharing UIs Info" level="if">
-<component name="mmsharinguis_build" filter="s60" long-name="Multimedia Sharing UIs Build">
-<!-- consider distributing to other components -->
-<unit bldFile="app/mmsharinguis/group"/>
-</component>
-</collection>
-</block>
-<block name="phone" level="apps" span="2" long-name="Phone Apps" levels="engine plugin ui app">
-<collection name="phoneapp" long-name="Phone Application" level="app">
-<component name="blacklist" filter="s60" long-name="Phone Blacklist Clearing" plugin="Y">
-<unit bldFile="app/phone/phoneapp/blacklist/group"/>
-</component>
-<component name="phoneuicontrol" filter="s60" long-name="Phone UI Control">
-<unit bldFile="app/phone/phoneapp/phoneuicontrol/group"/>
-</component>
-<component name="phoneuistates" filter="s60" long-name="Phone UI States">
-<unit bldFile="app/phone/phoneapp/phoneuistates/group"/>
-</component>
-<component name="phoneuiutils" filter="s60" long-name="Phone UI Utils">
-<unit bldFile="app/phone/phoneapp/phoneuiutils/group"/>
-</component>
-<component name="silenceactionplugin" filter="s60" long-name="Silence Action Plugin" plugin="Y">
-<unit bldFile="app/phone/phoneapp/silenceactionplugin/group"/>
-</component>
-<component name="phonemediatorcenter" filter="s60" long-name="Phone Mediator Center">
-<unit bldFile="app/phone/phoneapp/phonemediatorcenter/group"/>
-</component>
-<component name="phoneuiview2" filter="s60" long-name="Phone UI View">
-<unit bldFile="app/phone/phoneapp/phoneuiview2"/>
-</component>
-<component name="phoneuiqtviewadapter" filter="s60" long-name="Phone UI Qt View Adapter" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneapp/phoneuiqtviewadapter"/>
-</component>
-<component name="phonestringloader" filter="s60" long-name="Phone String Loader" introduced="^4">
-<unit bldFile="app/phone/phoneapp/phonestringloader"/>
-</component>
-<component name="phoneui2" filter="s60" long-name="Phone UI">
-<unit bldFile="app/phone/phoneapp/phoneui2"/>
-</component>
-</collection>
-<collection name="phoneengine" long-name="Phone Engine" level="engine">
-<component name="phonecntfinder2" filter="s60" long-name="Phone Contact Finder">
-<unit bldFile="app/phone/phoneengine/phonecntfinder2"/>
-</component>
-<component name="audiohandling" filter="s60" long-name="Phone Audio Handling">
-<unit bldFile="app/phone/phoneengine/audiohandling/group"/>
-</component>
-<component name="callhandling" filter="s60" long-name="Call Handling">
-<unit bldFile="app/phone/phoneengine/callhandling/group"/>
-</component>
-<component name="contacthandling2" filter="s60" long-name="Phone Contact Handling">
-<unit bldFile="app/phone/phoneengine/contacthandling2/group"/>
-</component>
-<component name="loghandling" filter="s60" long-name="Phone Log Handling">
-<unit bldFile="app/phone/phoneengine/loghandling/group"/>
-</component>
-<component name="engineinfo" filter="s60" long-name="Phone Engine Info">
-<unit bldFile="app/phone/phoneengine/engineinfo/group"/>
-</component>
-<component name="phonemodel" filter="s60" long-name="Phone Model">
-<unit bldFile="app/phone/phoneengine/phonemodel"/>
-</component>
-<component name="servicehandling" filter="s60" long-name="Phone Service Handling">
-<unit bldFile="app/phone/phoneengine/servicehandling/group"/>
-</component>
-<component name="phoneservices" filter="s60" long-name="Phone Server" introduced="^4">
-<unit bldFile="app/phone/phoneengine/phoneservices"/>
-</component>
-<component name="parserrecognizer" filter="s60" long-name="Parser Recognizer" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneengine/parserrecognizer"/>
-</component>
-</collection>
-<collection name="phoneuis" long-name="Phone UIs" level="ui">
-<component name="bubblemanager2" filter="s60" long-name="Phone Bubble Manager">
-<unit bldFile="app/phone/phoneuis/bubblemanager2"/>
-</component>
-<component name="telephonydevicemode" filter="s60" long-name="Telephony Device Mode">
-<unit bldFile="app/phone/phoneuis/telephonydevicemode/group"/>
-</component>
-</collection>
-<collection name="phone_plat" long-name="Phone Apps Platform Interfaces" level="app">
-<component name="3d_ringing_tone_enabler_api" long-name="3D Ringing Tone Enabler API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
-</component>
-<component name="telephony_comms_information_api" long-name="Telephony Comms Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_comms_information_api/group"/>
-</component>
-<component name="telephony_information_api" long-name="Telephony Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_information_api/group"/>
-</component>
-<component name="telephony_device_mode_api" long-name="Telephony Device Mode API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_device_mode_api/group"/>
-</component>
-<component name="telephony_remote_party_information_api" long-name="Telephony Remote Party Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_remote_party_information_api/group"/>
-</component>
-<component name="telephony_video_mailbox_settings_api" long-name="Telephony Video Mailbox Settings API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_video_mailbox_settings_api/group"/>
-</component>
-<component name="telephony_microphone_mute_status_api" long-name="Telephony Microphone Mute Status API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_microphone_mute_status_api/group"/>
-</component>
-<component name="telephony_logging_extension_api" long-name="Telephony Logging Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_logging_extension_api/group"/>
-</component>
-<component name="telephony_matching_extension_api" long-name="Telephony Matching Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_matching_extension_api/group"/>
-</component>
-<component name="phone_application_commands_api" long-name="Phone Application Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_commands_api/group"/>
-</component>
-<component name="phone_application_voip_commands_api" long-name="Phone Application VOIP Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_voip_commands_api/group"/>
-</component>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_mediator_api/group"/>
-</component>
-<component name="video_telephony_mediator_api" long-name="Video Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/video_telephony_mediator_api/group"/>
-</component>
-<component name="video_telephony_control_mediator_api" long-name="Video Telephony Control Mediator API" filter="s60" introduced="^4" class="api">
-<unit bldFile="app/phone/phone_plat/video_telephony_control_mediator_api/group"/>
-</component>
-</collection>
-<collection name="phoneplugins" long-name="Phone Plugins" level="plugin">
-<component name="csplugin" filter="s60" long-name="Circuit Switched Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/csplugin/group"/>
-</component>
-<component name="hsdialerwidgetplugin" filter="s60" long-name="Home Screen Dialer Widget Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/hsdialerwidgetplugin"/>
-</component>
-<component name="infowidgetplugin" filter="s60" long-name="Info Widget Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/infowidgetplugin"/>
-</component>
-</collection>
-<collection name="phonesettings" long-name="Phone Settings" level="plugin">
-<component name="cpphonesettingsplugins" filter="s60" long-name="CP Phone Settings Plugins" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phonesettings/cpphonesettingsplugins"/>
-</component>
-</collection>
-</block>
-<block name="videotelephony" level="apps" long-name="Video Telephony Apps" levels="engine plugin prot ui">
-<collection name="videotelephony_plat" long-name="VT Apps Platform Interfaces" level="ui">
-<component name="video_telephony_control_mediator_api" long-name="Video Telephony Control Mediator API" filter="s60" class="api">
-<unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_control_mediator_api/group"/>
-</component>
-<component name="video_telephony_media_configuration_api" long-name="Video Telephony Media Configuration API" filter="s60" class="api">
-<unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_media_configuration_api/group"/>
-</component>
-</collection>
-<collection name="vtengines" long-name="Video Telephony Engines" level="engine">
-<component name="videoteleng" filter="s60" long-name="Video Telephony Engine">
-<unit bldFile="app/videotelephony/vtengines/videoteleng/Group"/>
-</component>
-<component name="vtmediatorplugin" filter="s60" long-name="VT Mediator Plugin" plugin="Y">
-<unit bldFile="app/videotelephony/vtengines/vtmediatorplugin/group"/>
-</component>
-</collection>
-<collection name="vtuis" long-name="Video Telephony UIs" level="ui">
-<component name="videotelui" filter="s60" long-name="Video Telephony UI">
-<unit bldFile="app/videotelephony/vtuis/videotelui/group"/>
-</component>
-</collection>
-<collection name="vtprotocolplugins" long-name="VT Protocol Plugins" level="plugin">
-<component name="displaysink" filter="s60" long-name="Display Sink" introduced="^2">
-<unit bldFile="app/videotelephony/vtprotocolplugins/DisplaySink/group"/>
-</component>
-<component name="videosource" filter="s60" long-name="Video Source" introduced="^2">
-<unit bldFile="app/videotelephony/vtprotocolplugins/VideoSource/group"/>
-</component>
-</collection>
-<collection name="vtprotocolsstub" long-name="VT Protocols Stub" level="prot">
-<!-- this collection is really a component, move down a directory -->
-<component name="videotelproto" filter="s60" long-name="Video Telephony Protocol">
-<unit bldFile="app/videotelephony/vtprotocolsstub/group" filter="sf_build"/>
-</component>
-</collection>
-</block>
-<block name="settingsuis" level="services" long-name="Settings UIs" levels="plugin ui">
-<collection name="controlpanelplugins" long-name="Control Panel Plugins" level="plugin">
-<component name="themeplugin" filter="s60" long-name="Theme Plugin" introduced="^4">
-<unit bldFile="app/settingsuis/controlpanelplugins/themeplugin"/>
-</component>
-</collection>
-<collection name="controlpanelui" long-name="Control Panel UI" level="ui">
-<!-- collection is really a component, move down a dir -->
-<component name="controlpanelui_build" filter="s60" long-name="Control Panel UI Build" introduced="^4">
-<unit bldFile="app/settingsuis/controlpanelui"/>
-</component>
-</collection>
-</block>
-<block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin framework app">
-<collection name="contentctrl_plat" long-name="Content Control Daemons Platforn Interfaces" level="app">
-<component name="ds_contactsdatastoreextension_api" long-name="Adapter Customization API" filter="s60" introduced="^4" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_contactsdatastoreextension_api/group"/>
-</component>
-<component name="ds_data_modification_api" long-name="DS Data Modification API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_data_modification_api/group"/>
-</component>
-</collection>
-<collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
-<component name="secon" filter="s60" long-name="Service Controllers">
-<unit bldFile="app/contentcontrol/connectivitymodules/secon/group"/>
-</component>
-</collection>
-<collection name="dsdcmoadapter" long-name="Data Sync DCMO Adapter" level="plugin">
-<!-- Component at wrong rank, should move down a directory -->
-<component name="dsdcmoadapter_build" filter="s60" long-name="Data Sync Control DCMO Adapter">
-<unit bldFile="app/contentcontrol/dsdcmoadapter/group"/>
-</component>
-</collection>
-<collection name="omads" long-name="OMA Data Sync" level="app">
-<component name="omads_build" filter="s60" long-name="OMA DS Build">
-<unit bldFile="app/contentcontrol/omads/group"/>
-<!-- need to remove #include and rename and OMA DS ROM -->
-</component>
-<component name="omadsextensions" filter="s60" long-name="OMA DS Extensions" plugin="Y">
-<unit bldFile="app/contentcontrol/omads/omadsextensions/group"/>
-</component>
-<component name="omadsextensions" filter="s60" long-name="OMA DS Qt Extensions" plugin="Y">
-<unit bldFile="app/contentcontrol/omads/omadsextensions"/>
-</component>
-</collection>
-</block>
-<block name="firsttimeuse" level="apps" long-name="First Time Use" levels="support services ui app">
-<!-- these empty collections are really components. Move down a directory and supply units -->
-<collection name="ftuapplication" long-name="First Time Use Application" level="app"/>
-<collection name="fturuntimeservices" long-name="First Time Use Runtime Services" level="services"/>
-<collection name="wizardproviders" long-name="Wizard Providers" level="support"/>
-<collection name="stateproviders" long-name="State Providers" level="support"/>
-<collection name="runtimeproviders" long-name="Runtime Providers" level="support"/>
-<collection name="firsttimeuse_info" long-name="First Time Use Info" level="ui">
-<component name="firsttimeuse_build" long-name="First Time Use Build">
-<unit bldFile="app/firsttimeuse"/>
-</component>
-</collection>
-</block>
-<block name="devicecontrol" level="services" long-name="Device Control Daemons" levels="oma mid app">
-<collection name="deviceupdatesui" long-name="Device Updates UI" level="app">
-<component name="deviceupdatesui_adapters" long-name="Device Updates Adapters" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/devicecontrol/deviceupdatesui/adapters/bld"/>
-</component>
-<component name="deviceupdates" long-name="Device Updates" filter="s60" introduced="^4">
-<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdates"/>
-</component>
-<component name="deviceupdatesplugin" long-name="Device Updates Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdatesplugin"/>
-</component>
-<component name="deviceupdatesqtsp" long-name="Device Updates Qt Service Provider" filter="s60" introduced="^4">
-<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdatesqtsp"/>
-</component>
-<component name="cpqtsp" long-name="Client Provisioning Qt Service Provider" filter="s60" introduced="^4">
-<unit bldFile="app/devicecontrol/deviceupdatesui/cpqtsp"/>
-</component>
-<component name="devicemanagementnotifiersplugin" long-name="Device Management Notifiers Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/devicecontrol/deviceupdatesui/devicemanagementnotifiersplugin"/>
-</component>
-</collection>
-</block>
-<block name="printing" level="services" long-name="Printing"/>
-<block name="files" level="apps" long-name="File Manager Apps" levels="support apps">
-<collection name="filemanager" long-name="File Manager" level="apps">
-<component name="filemanager_plat" long-name="File Manager Platform Interfaces" filter="s60" introduced="^4" class="api"/>
-<component name="fmbkupengine" filter="s60" long-name="File Manager Backup Engine" introduced="^4">
-<unit bldFile="app/files/filemanager/src/fmbkupengine/group"/>
-</component>
-<component name="filemanager_build" filter="s60" long-name="File Manager Build">
-<!-- break this up into components or move down a directory -->
-<unit bldFile="app/files/filemanager"/>
-</component>
-</collection>
-</block>
-<block name="search" level="apps" long-name="Search Apps" levels="eng base app api">
-<collection name="search_info" long-name="Search Info">
-<component name="search_build" long-name="Search Build">
-<unit bldFile="app/search/group"/>
-</component>
-</collection>
-<collection name="searchui" long-name="Search UI">
-<component name="searchui_build" long-name="Search UI Build">
-<unit bldFile="app/search/searchui"/>
-</component>
-</collection>
-</block>
-<block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
-<collection name="contacts_plat" long-name="Contacts Apps Platform Interfaces" level="ui">
-<component name="logs_engine_api" long-name="Logs Engine API" filter="s60" introduced="^4" class="api"/>
-<component name="logs_engine_api_extensions" long-name="Logs Engine API Extensions" filter="s60" class="api"/>
-<component name="logs_services_api" long-name="Logs Services API" filter="s60" introduced="^4" class="api"/>
-<component name="logs_timers_api" long-name="Logs Timers API" filter="s60" class="api"/>
-<component name="qt_mobility_contacts_api" long-name="Qt Mobility Contacts API" filter="s60" introduced="^4" class="api"/>
-</collection>
-<collection name="logsui" long-name="Logs UI" level="ui">
-<component name="logsui_build" filter="s60" long-name="Logs UI Build">
-<!-- component at too high a rank, should move down one directory -->
-<unit bldFile="app/contacts/logsui"/>
-</component>
-</collection>
-<collection name="phonebookui" long-name="Phonebook UI" level="ui">
-<component name="mobhistorymodel" filter="s60" long-name="Mobile History Model" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/mobhistorymodel" qt:proFile="mobhistorymodel.pro"/> -->
-</component>
-<component name="pbkcommonui" filter="s60" long-name="Phonebook Common UI" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/pbkcommonui" qt:proFile="pbkcommonui.pro"/> -->
-</component>
-<component name="phonebookapp" filter="s60" long-name="Phonebook Application" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/phonebookapp" qt:proFile="phonebookapp.pro"/> -->
-</component>
-<component name="phonebookservices" filter="s60" long-name="Phonebook Services" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/phonebookservices" qt:proFile="phonebookservices.pro"/> -->
-</component>
-<component name="phonebookui_build" filter="s60" long-name="Phonebook UI Build" introduced="^4">
-<!-- break up into components -->
-<unit bldFile="app/contacts/phonebookui"/>
-</component>
-</collection>
-<collection name="qtcontactsmobility" long-name="Qt Contacts Mobility" level="support">
-<component name="qtcontactsmobility_build" filter="s60" long-name="Qt Contacts Mobility Build" introduced="^4" plugin="Y">
-<!-- not really a component, move down a dir? Break up into compnents? -->
-<unit bldFile="app/contacts/qtcontactsmobility"/>
-</component>
-</collection>
-<collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
-<component name="cntfindplugin" filter="s60" long-name="Contacts Find Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntfindplugin"/>
-</component>
-<component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
-<unit bldFile="app/contacts/phonebookengines/contactsmodel/groupsql" mrp="app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
-</component>
-<component name="cntsortplugin" filter="s60" long-name="Contacts Sort Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntsortplugin"/>
-</component>
-<component name="mobcntmodel" filter="s60" long-name="Mobile Contacts Model" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/mobcntmodel"/>
-</component>
-<component name="mobcntactions" filter="s60" long-name="Mobile Contacts Actions" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/cntmaptileservice"/>
-</component>
-<component name="cntmaptileservice" filter="s60" long-name="Contacts Map Tile Service" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/cntmaptileservice"/>
-</component>
-<component name="simutility" filter="s60" long-name="SIM Utility" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/simutility"/>
-</component>
-</collection>
-<collection name="pimprotocols" long-name="PIM Protocols" level="services">
-<component name="phonebooksync" long-name="Phonebook Sync" purpose="optional" plugin="Y">
-<unit bldFile="app/contacts/pimprotocols/phonebooksync/group" mrp="app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
-</component>
-<component name="pbap" long-name="Bluetooth PBAP" introduced="9.2" purpose="optional">
-<unit bldFile="app/contacts/pimprotocols/pbap/group" mrp="app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
-</component>
-</collection>
-<collection name="contacts_info" long-name="Contacts Apps Info" level="ui">
-<component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="organizer" level="apps" span="2" long-name="Organizer Application Suite" levels="support services engine ui app">
-<collection name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" level="app">
-<component name="calendar_interim_utils2_api" long-name="Calendar Interim Utils 2 API" filter="s60" class="api">
-<!-- move into own .pro file -->
-<unit bldFile="app/organizer/organizer_pub"/>
-</component>
-</collection>
-<collection name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" level="app">
-<component name="organizer_plat_build" long-name="Organizer Application Suite Platform Interface Build" filter="s60" class="api">
-<!-- break up into individual .pro files -->
-<unit bldFile="app/organizer/organizer_plat"/>
-</component>
-<component name="agenda_versit_2_api" long-name="Agenda Versit 2 API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="organizer_plat/agenda_versit_2_api/group"/>-->
-</component>
-<component name="calendar_exporter_api" long-name="Calendar Exporter API" filter="s60" class="api placeholder">
-<!--<unit bldFile="organizer_plat/calendar_exporter_api/group"/>-->
-</component>
-<component name="calendar_importer_api" long-name="Calendar Importer API" filter="s60" class="api placeholder">
-<!--<unit bldFile="organizer_plat/calendar_importer_api/group"/>-->
-</component>
-<component name="calendar_launcher_api" long-name="Calendar Launcher API" filter="s60" class="api placeholder">
-<!--<unit bldFile="organizer_plat/calendar_launcher_api/group"/> -->
-</component>
-<component name="agenda_interface_api" long-name="Agenda Interface API" filter="s60" introduced="^4" class="api"/>
-<component name="calendar_editor_api" long-name="Calendar Editor API" filter="s60" introduced="^4" class="api"/>
-<component name="notes_editor_api" long-name="Notes Editor API" filter="s60" introduced="^4" class="api"/>
-<component name="agenda_eventviewer_api" long-name="Agenda Event Viewer API" filter="s60" introduced="^4" class="api"/>
-</collection>
-<collection name="agendainterface" long-name="Agenda Interface" level="services">
-<!-- collection is really a component, should move down a directory -->
-<component name="agendainterface_build" filter="s60" long-name="Agenda Interface Build">
-<unit bldFile="app/organizer/agendainterface"/>
-</component>
-</collection>
-<collection name="calendarui" long-name="Calendar UI" level="ui">
-<component name="commonutils" filter="s60" long-name="Calendar Common Utils">
-<unit bldFile="app/organizer/calendarui/commonutils"/>
-</component>
-<component name="calenlauncher" filter="s60" long-name="Calendar Launcher">
-<unit bldFile="app/organizer/calendarui/calenlauncher/group"/>
-</component>
-<component name="caleneditor" filter="s60" long-name="Calendar Editor" introduced="^4">
-<unit bldFile="app/organizer/calendarui/caleneditor"/>
-</component>
-<component name="agendaeventviewer" filter="s60" long-name="Agenda Event Viewer" introduced="^4">
-<unit bldFile="app/organizer/calendarui/agendaeventviewer"/>
-</component>
-<component name="globaldata" filter="s60" long-name="Calendar Global Data">
-<unit bldFile="app/organizer/calendarui/globaldata"/>
-</component>
-<component name="settings" filter="s60" long-name="Calendar Settings">
-<unit bldFile="app/organizer/calendarui/settings"/>
-</component>
-<component name="calenplugins" filter="s60" long-name="Calendar Plugins" introduced="^4" plugin="Y">
-<unit bldFile="app/organizer/calendarui/calenplugins"/>
-</component>
-<component name="customisationmanager" filter="s60" long-name="Calendar Customisation Manager">
-<unit bldFile="app/organizer/calendarui/customisationmanager"/>
-</component>
-<component name="views" filter="s60" long-name="Calendar Views">
-<unit bldFile="app/organizer/calendarui/views"/>
-</component>
-<component name="calengriditemstyleplugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/organizer/calendarui/styleplugins/calengriditemstyleplugin"/>
-</component>
-<component name="calendarui_controller" filter="s60" long-name="Calendar Controller">
-<unit bldFile="app/organizer/calendarui/controller"/>
-</component>
-<component name="calendarui_application" filter="s60" long-name="Calendar Application">
-<unit bldFile="app/organizer/calendarui/application"/>
-</component>
-<component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y">
-<unit bldFile="app/organizer/calendarui/caldav/group"/>
-</component>
-</collection>
-<collection name="notes" long-name="Notes" level="ui">
-<component name="noteseditor" filter="s60" long-name="Notes Editor" introduced="^4">
-<unit bldFile="app/organizer/notes/notesui/noteseditor"/>
-</component>
-<component name="notes_build" filter="s60" long-name="Notes Build" introduced="^4">
-<unit bldFile="app/organizer/notes"/>
-</component>
-</collection>
-<collection name="calendarengines" long-name="Calendar Engines" level="engine">
-<component name="versit2" filter="s60" long-name="Versit 2 iCal Parser" introduced="9.2">
-<unit bldFile="app/organizer/calendarengines/versit2/group"/>
-</component>
-<component name="agnversit2" filter="s60" long-name="Versit 2 Agenda Interface" introduced="9.2" plugin="Y">
-<unit bldFile="app/organizer/calendarengines/agnversit2/group"/>
-</component>
-<component name="caleninterimutils" filter="s60" long-name="Calendar Interim Utils" introduced="9.1">
-<unit bldFile="app/organizer/calendarengines/caleninterimutils/group"/>
-</component>
-<component name="calenimp" filter="s60" long-name="Calendar Import Wrapper" introduced="7.0s">
-<unit bldFile="app/organizer/calendarengines/calenimp/group"/>
-</component>
-<component name="caldavsrv" filter="sf_build" long-name="CalDAV Server" introduced="^3">
-<unit bldFile="app/organizer/calendarengines/caldav/group"/>
-</component>
-</collection>
-<collection name="clock" long-name="Clock" level="app">
-<!-- uncomment unit when block_build is split up-->
-<component name="clockengines" filter="s60" long-name="Clock Engines" class="placeholder">
-<!--<unit bldFile="clock/clockengines" qt:proFile="clockengines.pro"/> -->
-</component>
-<component name="clockmw" filter="s60" long-name="Clock Middleware" introduced="^4" class="placeholder">
-<!--<unit bldFile="clock/clockmw" qt:proFile="clockmw.pro"/>-->
-</component>
-<component name="clockui" filter="s60" long-name="Clock UI" class="placeholder">
-<!--<unit bldFile="clock/clockui" qt:proFile="clockui.pro"/>-->
-</component>
-<component name="ftudatetimewizard" filter="s60" long-name="First Time Use Date/Time Wizard" introduced="^4" class="placeholder">
-<!--<unit bldFile="clock/ftudatetimewizard" qt:proFile="ftudatetimewizard.pro"/>-->
-</component>
-<component name="clock_build" filter="s60" long-name="Clock Build">
-<!-- make exports into a component, or just move to one of the above components, then remove this and uncomment the above -->
-<unit bldFile="app/organizer/clock"/>
-</component>
-</collection>
-<collection name="pimappservices" long-name="PIM Application Services" level="services">
-<component name="calendar" long-name="Calendar" introduced="9.2" purpose="optional">
-<unit bldFile="app/organizer/pimappservices/calendar/group" mrp="app/organizer/pimappservices/calendar/group/app-engines_calendar.mrp" version="2"/>
-</component>
-<component name="calendarvcalplugin" long-name="Calendar vCal Plugin" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="app/organizer/pimappservices/calendarvcalplugin/group" mrp="app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp" version="2"/>
-</component>
-<component name="appenginesdocs" long-name="Application Engines Documentation" purpose="development" class="doc">
-<unit mrp="app/organizer/pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
-</component>
-</collection>
-<collection name="pimappsupport" long-name="PIM Application Support" level="support">
-<component name="vcardandvcal" long-name="vCard and vCal" introduced="ER5" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/vcardandvcal/group" mrp="app/organizer/pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
-</component>
-<component name="chinesecalendarconverter" long-name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
-</component>
-</collection>
-<collection name="alarmui" long-name="Alarm UI" level="app">
-<!-- collection is really a component, should move down a directory -->
-<component name="alarmui_build" filter="s60" long-name="Alarm UI Build">
-<unit bldFile="app/organizer/alarmui"/>
-</component>
-</collection>
-<collection name="organizer_info" long-name="Organizer Application Suite Info" level="app">
-<component name="organizer_metadata" long-name="Organizer Application Suite Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="plugin eng base app api">
-<collection name="msg_plat" long-name="Messaging Apps Platform APIs" level="api">
-<component name="messaging_media_resolver_api" long-name="Messaging Media Resolver API" filter="s60" class="api"/>
-<component name="mms_application_api" long-name="MMS Application API" filter="s60" class="api"/>
-<component name="mms_codec_client_api" long-name="MMS Codec Client API" filter="s60" class="api"/>
-<component name="mms_conformance_api" long-name="MMS Conformance API" filter="s60" class="api"/>
-<component name="mms_engine_settings_api" long-name="MMS Engine Settings API" filter="s60" class="api"/>
-<component name="mms_server_settings_api" long-name="MMS Server Settings API" filter="s60" class="api"/>
-<component name="conversation_services_client_api" long-name="Conversation Services Client API" filter="s60" introduced="^4" class="api"/>
-<component name="conversation_services_plugin_api" long-name="Conversation Services Plugin API" filter="s60" introduced="^4" class="api"/>
-<component name="conversation_services_utilities_api" long-name="Conversation Services Utilities API" filter="s60" introduced="^4" class="api"/>
-<component name="shareui_api" long-name="Share UI API" filter="s60" introduced="^4" class="api"/>
-<component name="messaging_history_api" long-name="Messaging History API" filter="s60" introduced="^4" class="api"/>
-<component name="msg_plat_build" long-name="Messaging Apps Platform APIs Build" filter="s60" introduced="^4" class="api">
-<!-- break this up into the above units and replace their base attributes with bldFile, etc -->
-</component>
-</collection>
-<collection name="msg_pub" long-name="Messaging Apps Public APIs" level="api">
-<component name="mms_client_mtm_api" long-name="MMS Client MTM API" filter="s60" class="api"/>
-<component name="msg_smil_dtd_api" long-name="Messaging SMIL DTD API" filter="s60" introduced="^4" class="api"/>
-<component name="msg_pub_build" long-name="Messaging Apps Public APIs Build" filter="s60" introduced="^4" class="api">
-<!-- break this up into the above units and replace their base attributes with bldFile, etc -->
-</component>
-</collection>
-<collection name="mobilemessaging" long-name="Mobile Messaging" level="plugin">
-<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/mobilemessaging/smsmtm/group" mrp="app/messaging/mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
-</component>
-</collection>
-<collection name="messagingappbase" long-name="Messaging App Base" level="base">
-<component name="messagingappbase_build" filter="s60" long-name="Messaging App Base Build" introduced="^4">
-<!-- break this up into the below components -->
-<unit bldFile="app/messaging/messagingappbase"/>
-</component>
-<component name="msgmedia" filter="s60" long-name="Message Media"/>
-<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
-<unit mrp="app/messaging/messagingappbase/smsmtm/group/messaging_sms.mrp"/>
-</component>
-<component name="smilparser" long-name="SMIL Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="app/messaging/messagingappbase/smilparser/GROUP" mrp="app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
-</component>
-<component name="obexmtms" long-name="OBEX MTMs" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/obexmtms/Group" mrp="app/messaging/messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
-</component>
-</collection>
-<collection name="mmsengine" long-name="MMS Engine" level="eng">
-<component name="mmsconninit" filter="s60" long-name="MMS Connection Initiator" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsconninit/bld"/> -->
-</component>
-<component name="genutils" filter="s60" long-name="General Utils" class="placeholder">
-<!-- <unit bldFile="mmsengine/genutils/bld"/> -->
-</component>
-<component name="mmsserversettings" filter="s60" long-name="MMS Server Settings" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserversettings/bld"/> -->
-</component>
-<component name="mmsmessage" filter="s60" long-name="MMS Message" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsmessage/bld"/> -->
-</component>
-<component name="mmshttptransport" filter="s60" long-name="MMS HTTP Transport" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmshttptransport/bld"/> -->
-</component>
-<component name="mmscodec" filter="s60" long-name="MMS Codec" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodec/bld"/> -->
-</component>
-<component name="mmsserver" filter="s60" long-name="MMS Server" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserver/bld"/> -->
-</component>
-<component name="clientmtm" filter="s60" long-name="MMS Client MTM" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/clientmtm/bld"/> -->
-</component>
-<component name="mmswatcher" filter="s60" long-name="MMS Watcher" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmswatcher/bld"/> -->
-</component>
-<component name="mmspushhandler" filter="s60" long-name="MMS Push Handler" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmspushhandler/bld"/> -->
-</component>
-<component name="applicationadapter" filter="s60" long-name="MMS Application Adapter" class="placeholder">
-<!-- <unit bldFile="mmsengine/applicationadapter/bld"/> -->
-</component>
-<component name="mmscodecclient" filter="s60" long-name="MMS Codec Client" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodecclient/bld"/> -->
-</component>
-<component name="mmssettings" long-name="MMS Settings" introduced="9.2" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmssettings/group" mrp="app/messaging/mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
-</component>
-<component name="mmsconf" long-name="MMS Configuration" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmsconf" mrp="app/messaging/mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
-</component>
-<component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
-<!-- this should be broken up into the individual other components -->
-<unit bldFile="app/messaging/mmsengine"/>
-</component>
-</collection>
-<collection name="messagingapp" long-name="Messaging Application" level="app">
-<component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
-<!-- this should be broken up into the individual other components -->
-<unit bldFile="app/messaging/mmsengine"/>
-</component>
-<component name="msgutils" filter="s60" long-name="Messaging Utils" introduced="^4">
-<unit bldFile="app/messaging/msgutils"/>
-</component>
-<component name="msgappfw" filter="s60" long-name="Messaging Application Framework" introduced="^4">
-<unit bldFile="app/messaging/msgappfw"/>
-</component>
-<component name="msgsettings" filter="s60" long-name="Messaging Settings" introduced="^4">
-<unit bldFile="app/messaging/msgsettings"/>
-</component>
-<component name="msgnotifications" filter="s60" long-name="Messaging Notifications" introduced="^4">
-<unit bldFile="app/messaging/msgnotifications"/>
-</component>
-<component name="smartmessaging" filter="s60" long-name="Smart Messaging">
-<unit bldFile="app/messaging/messagingapp/smartmessaging"/>
-</component>
-<component name="shareui" filter="s60" long-name="Shared UI" introduced="^4">
-<unit bldFile="app/messaging/shareui"/>
-</component>
-<component name="msgui" filter="s60" long-name="Messaging UI" introduced="^4">
-<unit bldFile="app/messaging/msgui"/>
-</component>
-</collection>
-<collection name="email" long-name="Email" level="plugin">
-<!-- use commonemail instead -->
-<component name="pop3andsmtpmtm" long-name="POP3 and SMTP MTM" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/pop3andsmtpmtm/group" mrp="app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
-</component>
-<component name="imap4mtm" long-name="IMAP4 MTM" introduced="9.2" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/imap4mtm/group" mrp="app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
-</component>
-</collection>
-<collection name="messaging_info" long-name="Messaging Apps Info" level="api">
-<component name="messaging_metadata" long-name="Messaging Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commonemail" level="apps" span="2" long-name="Email Apps" levels="service support ui app">
-<!-- need to resolve the qt parts into proper components, then uncomment the units -->
-<collection name="email_plat" long-name="Email Apps Platform Interfaces" level="app">
-<component name="nmail_client_api" long-name="NMail Client API" filter="s60" introduced="^4" class="api placeholder">
-<!--<unit bldFile="email_plat" qt:proFile="email_plat.pro"/> -->
-</component>
-</collection>
-<collection name="emailservices" long-name="Email Services" level="service">
-<component name="nmailbase" filter="s60" long-name="NMail Base" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/nmailbase" qt:proFile="nmailbase.pro"/> -->
-</component>
-<component name="emailcommon" filter="s60" long-name="Email Common" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/emailcommon" qt:proFile="emailcommon.pro"/>-->
-</component>
-<component name="emailframework" filter="s60" long-name="Email Framework" introduced="^2" class="placeholder">
-<!-- <unit bldFile="emailservices/emailframework" qt:proFile="emailframework.pro"/>-->
-</component>
-<component name="emailstore" filter="s60" long-name="Email Store" introduced="^2" class="placeholder">
-<!-- <unit bldFile="emailservices/emailstore" qt:proFile="emailstore.pro"/>-->
-</component>
-<component name="nmclientapi" filter="s60" long-name="Nmail Client API" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/nmclientapi" qt:proFile="nmclientapi.pro"/>-->
-</component>
-<component name="nmailagent" filter="s60" long-name="Nmail Agent" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/nmailagent" qt:proFile="nmailagent.pro"/>-->
-</component>
-</collection>
-<collection name="ipsservices" long-name="IMAP/POP/SMTP Services" level="service">
-<component name="ipssosplugin" filter="s60" long-name="IPS SOS Plugin" introduced="^2" plugin="Y" class="placeholder">
-<!-- SOS? Consider spelling it out since the abbreviation is ambiguous -->
-<!--<unit bldFile="ipsservices/ipssosplugin" qt:proFile="ipssosplugin.pro" />-->
-</component>
-<component name="nmimapclientplugin" filter="s60" long-name="NM IMAP Client Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="ipsservices/nmimapclientplugin" qt:proFile="nmimapclientplugin.pro"/>-->
-</component>
-<component name="nmipsmtms" filter="s60" long-name="NM IPS Client Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="ipsservices/nmipsmtms" qt:proFile="nmipsmtms.pro"/>-->
-</component>
-<component name="nmipssettings" filter="s60" long-name="NM IPS Settings" introduced="^4" class="placeholder">
-<!-- <unit bldFile="ipsservices/nmipssettings" qt:proFile="nmipssettings.pro"/>-->
-</component>
-<component name="ipsservices_build" filter="s60" long-name="IPS Services Build" introduced="^2" class="placeholder">
-<!--<unit bldFile="ipsservices" qt:proFile="ipsservices.pro"/> -->
-<!-- can the exports be broken up into the other components or made a config component?-->
-</component>
-</collection>
-<collection name="emailuis" long-name="Email UIs" level="app">
-<component name="nmailuiengine" filter="s60" long-name="Nmail UI Engine" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailuiengine" qt:proFile="nmailuiengine.pro"/> -->
-</component>
-<component name="nmailuiwidgets" filter="s60" long-name="Nmail UI Widgets" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailuiwidgets" qt:proFile="nmailuiwidgets.pro"/> -->
-</component>
-<component name="nmailuiwidgetsplugin" filter="s60" long-name="Nmail UI Widgets Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailuiwidgetsplugin" qt:proFile="nmailuiwidgetsplugin.pro"/> -->
-</component>
-<component name="nmsettingui" filter="s60" long-name="Nmail Setting UI" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmsettingui" qt:proFile="nmsettingui.pro"/> -->
-</component>
-<component name="nmailcpplugin" filter="s60" long-name="Nmail CP Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailcpplugin" qt:proFile="nmailcpplugin.pro"/> -->
-</component>
-<component name="nmailui" filter="s60" long-name="Nmail UI" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailui" qt:proFile="nmailui.pro"/> -->
-</component>
-<component name="nmindicatorplugin" filter="s60" long-name="Nmail Indicator Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmindicatorplugin" qt:proFile="nmindicatorplugin.pro"/> -->
-</component>
-<component name="nmframeworkadapter" filter="s60" long-name="Nmail Framework Adapter" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmframeworkadapter" qt:proFile="nmframeworkadapter.pro"/> -->
-</component>
-</collection>
-<collection name="commonemail_info" long-name="Email Apps Info" level="app">
-<component name="commonemail_build" long-name="Email Apps Build" introduced="^4">
-<!-- split into actual components -->
-<unit bldFile="app/commonemail"/>
-</component>
-</collection>
-</block>
-<block name="camera" level="apps" long-name="Camera Apps">
-<collection name="camerauis" long-name="Camera UIs">
-<component name="cameraxui" filter="s60" long-name="CameraX UIs">
-<unit bldFile="app/camera/camerauis/cameraxui" filter="!test"/>
-</component>
-</collection>
-</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">
-<component name="image_editor_debug_utilities_api" long-name="Image Editor Debug Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
-</component>
-<component name="image_editor_utilities_api" long-name="Image Editor Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_utilities_api/group"/>
-</component>
-<component name="image_editor_definitions_api" long-name="Image Editor Definitions API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_definitions_api/group"/>
-</component>
-<component name="image_editor_system_parameters_api" long-name="Image Editor System Parameters API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_system_parameters_api/group"/>
-</component>
-<component name="image_processing_engine_api" long-name="Image Processing Engine API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_processing_engine_api/group"/>
-</component>
-</collection>
-<collection name="imageeditor" long-name="Image Editor UI" level="ui">
-<component name="pb" filter="s60" long-name="Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/pb/group"/>
-</component>
-<component name="iepb" filter="s60" long-name="Image Editor Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/iepb/group"/>
-</component>
-<component name="imageeditorui" filter="s60" long-name="Image Editor UI">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorui/group"/>
-</component>
-<component name="imageeditormanager" filter="s60" long-name="Image Editor Manager">
-<unit bldFile="app/imgeditor/imageeditor/imageeditormanager/group"/>
-</component>
-<component name="imageeditorapp" filter="s60" long-name="Image Editor Application">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorapp/group"/>
-</component>
-<component name="imageeditor_plugins" filter="s60" long-name="Image Editor Plugins" plugin="Y">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditor/plugins/blackwhiteplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/brightnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/bubbleplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cartoonizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/clipartplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/contrastplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cropplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/drawplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/frameplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/negativeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/redeyeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/resizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotatelplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotaterplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/textplugin/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditor/plugins/drawplugin/group"/>
- -->
-</component>
-<component name="editorprovider" filter="s60" long-name="Image Editor Provider">
-<unit bldFile="app/imgeditor/imageeditor/editorprovider/group"/>
-</component>
-<component name="imageeditor_build" filter="s60" long-name="Image Editor Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditor/group"/>
-</component>
-</collection>
-<collection name="imageeditorengine" long-name="Image Editor Engine" level="engine">
-<component name="filters" filter="s60" long-name="Image Editor Filters">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbrightness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbubble/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbuffer/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercartoon/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterclipart/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercontrast/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercrop/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterdraw/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterframe/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtergrayscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtericlsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegtarget/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filternegate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterredeye/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterrotate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtertext/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
- -->
-</component>
-<component name="imageeditorutils" filter="s60" long-name="Image Editor Utilities">
-<unit bldFile="app/imgeditor/imageeditorengine/imageeditorutils/group"/>
-</component>
-<component name="systemparameters" filter="s60" long-name="System Parameters">
-<unit bldFile="app/imgeditor/imageeditorengine/systemparameters/group"/>
-</component>
-<component name="enginewrapper" filter="s60" long-name="Image Editor Engine Wrapper">
-<unit bldFile="app/imgeditor/imageeditorengine/enginewrapper/group"/>
-</component>
-<component name="imageeditorengine_build" filter="s60" long-name="Image Editor Engine Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoeditor" level="apps" long-name="Video Editor Apps" levels="engine ui">
-<collection name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" level="ui">
-<component name="video_editor_engine_api" long-name="Video Editor Engine API" introduced="^2" class="api">
-<unit bldFile="app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
-</component>
-</collection>
-<collection name="videditor" long-name="Video Editor" level="ui">
-<component name="videoeditorcommon" filter="s60" long-name="Video Editor Common" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditorcommon/group"/>
-</component>
-<component name="videoeditoruicomponents" filter="s60" long-name="Video Editor UI Components" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditoruicomponents/group"/>
-</component>
-<component name="simplevideoeditor" filter="s60" long-name="Simple Video Editor" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplevideoeditor/group"/>
-</component>
-<component name="simplecutvideo" filter="s60" long-name="Simple Cut Video" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplecutvideo/group"/>
-</component>
-<component name="videoprovider" filter="s60" long-name="Video Provider" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoprovider/group"/>
-</component>
-<component name="manualvideoeditor" filter="s60" long-name="Manual Video Editor" introduced="^2" class="placeholder">
-<!-- uncomment when supported
- <meta rel="config">
- <defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
- </meta>
- <unit bldFile="videditor/manualvideoeditor/group"/> -->
-</component>
-<component name="videditor_build" filter="s60" long-name="Video Editor Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videditor/group"/>
-</component>
-</collection>
-<collection name="videoeditorengine" long-name="Video Editor Engine" level="engine">
-<component name="audioeditorengine" filter="s60" long-name="Audio Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/audioeditorengine/group"/>
-</component>
-<component name="avcedit" filter="s60" long-name="AVC Editing" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/avcedit/group"/>
-</component>
-<component name="h263decoder" filter="s60" long-name="H.263 Decoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/h263decoder/group"/>
-</component>
-<component name="mp3aacmaniplib" filter="s60" long-name="MP3 and AAC Manipulation Library" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
-</component>
-<component name="vedtranscoder" filter="s60" long-name="Video Editor Transcoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedtranscoder/group"/>
-</component>
-<component name="vedengine" filter="s60" long-name="Video Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedengine/group"/>
-</component>
-<component name="videoeditorengine_build" filter="s60" long-name="Video Editor Engine Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videoeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
-<collection name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" level="apps">
-<component name="videoplayer_startup_api" long-name="Video Player Startup API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videoplayer_startup_api/group" filter="!test"/>
-</component>
-<component name="videocollection_api" long-name="Video Collection API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videocollection_api/group"/>
-</component>
-</collection>
-<collection name="videocollection" long-name="Video Collection" level="util">
-<component name="mpxmyvideoscollection" filter="s60" long-name="MPX My Videos Collection" introduced="^3">
-<unit bldFile="app/videoplayer/videocollection/mpxmyvideoscollection/group"/>
-</component>
-<component name="videocollectionwrapper" filter="s60" long-name="Video Collection Wrapper" introduced="^4">
-<unit bldFile="app/videoplayer/videocollection/videocollectionwrapper"/>
-</component>
-<component name="videocollectionview" filter="s60" long-name="Video Collection View" introduced="^4">
-<unit bldFile="app/videoplayer/videocollection/videocollectionview"/>
-</component>
-<component name="videofiledetailsview" filter="s60" long-name="Video File Details View" introduced="^4">
-<unit bldFile="app/videoplayer/videocollection/videofiledetailsview"/>
-</component>
-</collection>
-<collection name="mediasettings" long-name="Media Settings" level="support">
-<!-- this is really a component. Should be moved down a directory -->
-<component name="mediasettings_build" filter="s60" long-name="Media Settings Build">
-<unit bldFile="app/videoplayer/mediasettings/group"/>
-</component>
-</collection>
-<collection name="videoplayerapp" long-name="Video Player App" level="apps">
-<component name="videoplayerengine" long-name="Video Player Engine" filter="s60" introduced="^4">
-<unit bldFile="app/videoplayer/videoplayerapp/videoplayerengine"/>
-</component>
-<component name="hbvideoplayer" filter="s60" long-name="HB Video Player" introduced="^4">
-<unit bldFile="app/videoplayer/videoplayerapp/hbvideoplayer"/>
-</component>
-</collection>
-<collection name="videoplayback" long-name="Video Playback Plugins" level="plugin">
-<component name="hbvideoplaybackview" filter="s60" long-name="HB Video Playback View" introduced="^4" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/hbvideoplaybackview"/>
-</component>
-<component name="hbvideoplaybackviewplugin" filter="s60" long-name="HB Video Playback View Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/hbvideoplaybackviewplugin"/>
-</component>
-<component name="videohelix" long-name="Video Helix" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videohelix/group"/>
-</component>
-</collection>
-</block>
-<block name="photos" level="apps" long-name="Photos" levels="util support ui app">
-<collection name="photos_group" long-name="Photos Group" level="support">
-<component name="photos_group_build" filter="s60" long-name="Photos Group Build" introduced="^4" class="placeholder">
-<!--<unit bldFile="group" qt:proFile="group.pro"/> -->
-</component>
-</collection>
-<collection name="photos_loggers" long-name="Photos Loggers" level="util">
-<component name="photos_loggerqt" filter="s60" long-name="Photos Logger Qt" introduced="^4" class="placeholder">
-<!--<unit bldFile="loggers/loggerqt" qt:proFile="loggerqt.pro"/> -->
-</component>
-</collection>
-<collection name="photos_commonutilities" long-name="Photos Common Utilities" level="util">
-<component name="photos_externalutility" filter="s60" long-name="Photos External Utility" introduced="^4" class="placeholder">
-<!--<unit bldFile="commonutilities/externalutility" qt:proFile="externalutility.pro"/> -->
-</component>
-<component name="imagedecoderwrapper" filter="s60" long-name="Image Decoder Wrapper" introduced="^4" class="placeholder">
-<!--<unit bldFile="commonutilities/imagedecoderwrapper" qt:proFile="imagedecoderwrapper.pro"/> -->
-</component>
-</collection>
-<collection name="photos_ui" long-name="Photos UI" level="ui">
-<component name="photos_uiengine" filter="s60" long-name="Photos UI Engine" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/uiengine" qt:proFile="uiengine.pro"/> -->
-</component>
-<component name="photos_commandhandlers" filter="s60" long-name="Photos Command Handlers" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/commandhandlers" qt:proFile="commandhandlers.pro"/> -->
-</component>
-<component name="photos_views" filter="s60" long-name="Photos Views" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/views" qt:proFile="views.pro"/> -->
-</component>
-<component name="photos_viewmanagement" filter="s60" long-name="Photos View Management" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/viewmanagement" qt:proFile="viewmanagement.pro"/> -->
-</component>
-</collection>
-<collection name="photos_main" long-name="Photos Main" level="support">
-<component name="photos_main_build" filter="s60" long-name="Photos Main Build" introduced="^4" class="placeholder">
-<!--<unit bldFile="main" qt:proFile="main.pro"/> -->
-</component>
-</collection>
-<collection name="imageviewerapp" long-name="Image Viewer App" level="support">
-<component name="imageviewerapp_build" filter="s60" long-name="Image Viewer App Build" introduced="^4" class="placeholder">
-<!--<unit bldFile="imageviewerapp" qt:proFile="imageviewerapp.pro"/> -->
-</component>
-</collection>
-<collection name="photos_info" long-name="Photos Info" level="support">
-<component name="photos_build" filter="s60" long-name="Photos Build" introduced="^4">
-<!-- split this up into the above components -->
-<unit bldFile="app/photos/photosgallery"/>
-</component>
-</collection>
-</block>
-<block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support hs app">
-<!-- move the export .pri files into their components and uncomment the units -->
-<collection name="musicplayer_utilities " long-name="Music Player Utilities" level="support">
-<component name="mpnowplayingbanner" filter="s60" long-name="MP Now Playing Banner" introduced="^4" class="placeholder">
-<!-- <unit bldFile="utilities/mpnowplayingbanner" qt:proFile="mpnowplayingbanner.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-<component name="mpsettingsmanager" filter="s60" long-name="MP Settings Manager" introduced="^4" class="placeholder">
-<!-- <unit bldFile="utilities/mpsettingsmanager" qt:proFile="mpsettingsmanager.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-</collection>
-<collection name="musicfetcher " long-name="Music Fetcher" level="support">
-<!-- collection is really a component, move down a directory -->
-<component name="musicfetcher_buld" filter="s60" long-name="Music Fetcher Build" introduced="^4" class="placeholder">
-<!-- <unit bldFile="musicfetcher" qt:proFile="musicfetcher.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-</collection>
-<collection name="musicplayer_app " long-name="Music Player Application" level="app">
-<!-- collection is really a component, move down a directory -->
-<component name="musicplayer_app_build" filter="s60" long-name="Music Player Application Build" introduced="^4" class="placeholder">
-<!-- <unit bldFile="app" qt:proFile="app.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-</collection>
-<collection name="mpviewplugins " long-name="Music Player View Plugins" level="plugins">
-<component name="mpcollectionviewplugin" filter="s60" long-name="MP Collection View Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpviewplugins/mpcollectionviewplugin/group"/>-->
-</component>
-<component name="mpplaybackviewplugin" filter="s60" long-name="MP Playback View Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpviewplugins/mpplaybackviewplugin/group"/>-->
-</component>
-</collection>
-<collection name="mpserviceplugins" long-name="Music Player Service Plugins" level="plugins">
-<component name="audioeffects" filter="s60" long-name="Audio Effects" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/audioeffects/group"/>-->
-</component>
-<component name="localaudio" filter="s60" long-name="Local Audio" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/localaudio/group"/>-->
-</component>
-<!-- Note: it's called SQLite, not SQLLite, just the one "L" -->
-<component name="mpxsqlitedbcommon" filter="s60" long-name="MPX SQLite Database Common" introduced="^4" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitedbcommon/group"/>-->
-</component>
-<component name="mpxsqlitedbplugin" filter="s60" long-name="MPX SQLite Database Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitedbplugin/group"/>-->
-</component>
-<component name="mpxsqlitepodcastdbplugin" filter="s60" long-name="MPX SQLlite Podcast Database Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
-</component>
-<component name="m3uplaylistplugin" filter="s60" long-name="M3U Playlist Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
-</component>
-</collection>
-<collection name="musicplayer_info" long-name="Music Player Apps Info" level="app">
-<component name="musicplayer_build" filter="s60" long-name="Music Player Build">
-<!-- should brak up into individual components -->
-<unit bldFile="app/musicplayer"/>
-</component>
-</collection>
-</block>
-<block name="radio" level="apps" long-name="Radio Apps" levels="engine ui">
-<collection name="radioengine" long-name="Radio Engine" level="engine">
-<component name="radioengineutils" filter="s60" long-name="Radio Engine Utils" introduced="^4">
-<unit bldFile="app/radio/radioengine/utils/group"/>
-</component>
-<component name="radioenginesettings" filter="s60" long-name="Radio Engine Settings" introduced="^4">
-<unit bldFile="app/radio/radioengine/settings/group"/>
-</component>
-<component name="radioengine_engine" filter="s60" long-name="Radio Engine" introduced="^4">
-<unit bldFile="app/radio/radioengine/engine/group"/>
-</component>
-</collection>
-<collection name="radioapp" long-name="Radio App" level="ui">
-<component name="radioenginewrapper" filter="s60" long-name="Radio Engine Wrapper" introduced="^4">
-<unit bldFile="app/radio/radioapp/radioenginewrapper"/>
-</component>
-<component name="radiopresetstorage" filter="s60" long-name="Radio Preset Storage" introduced="^4">
-<unit bldFile="app/radio/radioapp/radiopresetstorage"/>
-</component>
-<component name="radiouiengine" filter="s60" long-name="Radio UI Engine" introduced="^4">
-<unit bldFile="app/radio/radioapp/radiouiengine"/>
-</component>
-<component name="radiowidgets" filter="s60" long-name="Radio Widgets" introduced="^4">
-<unit bldFile="app/radio/radioapp/radiowidgets"/>
-</component>
-<component name="radioapplication" filter="s60" long-name="Radio Application" introduced="^4">
-<unit bldFile="app/radio/radioapp/radioapplication"/>
-</component>
-<component name="radio_rom" filter="s60" long-name="Radio ROM" introduced="^4">
-<unit bldFile="app/radio/rom/group"/>
-</component>
-</collection>
-</block>
-<block name="internetradio" level="apps" long-name="Internet Radio Apps" levels="engine server ui">
-<collection name="internetradio2_0" long-name="Internet Radio 2.0" level="ui">
-<!-- collection is really a component. Move down a dir -->
-<component name="internetradio2_0_build" long-name="Internet Radio 2.0 Build">
-<unit bldFile="app/internetradio/internetradio2.0/group"/>
-</component>
-</collection>
-<collection name="presetserver" long-name="Preset Server" level="server">
-<!-- collection is really a component. Move down a dir -->
-<component name="presetserver_build" long-name="Preset Server Build">
-<unit bldFile="app/internetradio/presetserver/group"/>
-</component>
-</collection>
-<collection name="qtinternetradio" long-name="Qt Internet Radio">
-<component name="qtinternetradio_build" long-name="Qt Internet Radio Build">
-<!-- Move down a dir or break into components-->
-<unit bldFile="app/internetradio/qtinternetradio"/>
-</component>
-</collection>
-</block>
-<block name="homescreen" level="apps" long-name="Home Screen Apps" levels="support task ss hs">
-<collection name="homescreen_info" long-name="Home Screen Info" level="support">
-<component name="homescreen_build" long-name="Homescreen Build">
-<!-- break this up properly into components -->
-<unit bldFile="app/homescreen"/>
-</component>
-</collection>
-<collection name="homescreen_test" long-name="Home Screen Test" level="support"/>
-<!-- fiill in details with broken up homescreen_build -->
-<collection name="homescreenapp" long-name="Home Screen Application" level="hs">
-<component name="hsutils" long-name="Home Screen Utils" introduced="^4"/>
-<component name="hsdomainmodel" long-name="HS Domain Model" introduced="^4"/>
-<component name="hs_runtimeplugins" long-name="HS Runtime Plugins" introduced="^4" plugin="Y"/>
-<component name="hs_serviceproviders" long-name="HS Service Providers" introduced="^4" plugin="Y"/>
-<component name="hs_stateplugins" long-name="HS State Plugins" introduced="^4" plugin="Y"/>
-<component name="hs_widgetplugins" long-name="HS Widget Plugins" introduced="^4" plugin="Y"/>
-<component name="hsapplication" long-name="Home Screen Application" introduced="^4"/>
-<component name="hshomescreenclientplugin" long-name="Home Screen Client Plugin" introduced="^4" plugin="Y"/>
-<component name="hsmenucontentpublish" long-name="HS Menu Content Publish" introduced="^4"/>
-</collection>
-<collection name="screensaverapp" long-name="Screen Saver Application" level="ss">
-<component name="snsrutils" long-name="Screen Saver Utils" introduced="^4"/>
-<component name="snsr_serviceproviders" long-name="Screen Saver Service Providers" introduced="^4" plugin="Y"/>
-<component name="snsr_stateproviders" long-name="Screen Saver State Providers" introduced="^4" plugin="Y"/>
-<component name="snsr_runtimeproviders" long-name="Screen Saver Runtime Providers" introduced="^4" plugin="Y"/>
-<component name="snsrapplication" long-name="Screen Saver Application" introduced="^4"/>
-<component name="screensaverproviders" long-name="Screen Saver Providers" introduced="^4" plugin="Y"/>
-</collection>
-<collection name="taskswitcherapp" long-name="Task Switcher Application" level="task">
-<component name="taskswitcherappecom" long-name="Task Switcher Application ECom" introduced="^4"/>
-<component name="tsserviceplugin" long-name="Task Switcher Service Plugin" introduced="^4" plugin="Y"/>
-<component name="ts_runtimeplugins" long-name="TS Runtime Plugins" introduced="^4" plugin="Y"/>
-<component name="tsapplication" long-name="Task Switcher Application" introduced="^4"/>
-</collection>
-</block>
-<block name="homescreentools" level="services" long-name="Home Screen Tools" levels="tool install">
-<collection name="dtdinstaller" long-name="DTD Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<!-- this needs to be built first, does build order need to be forced with filters? -->
-<component name="dtdinstaller_build" filter="s60,bldmefirst" long-name="DTD Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/dtdinstaller/group"/>
-</component>
-</collection>
-<collection name="themeinstaller" long-name="Theme Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="themeinstaller_build" filter="s60" long-name="Theme Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/themeinstaller/group"/>
-</component>
-</collection>
-<collection name="widgettools" long-name="Widget Tools" level="install">
-<component name="hspluginpreinstaller" filter="s60" long-name="HS Plugin Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/hspluginspreinstaller/group"/>
-</component>
-<component name="wrtwidgetpreinstaller" filter="s60" long-name="WRT Widget Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
-</component>
-</collection>
-</block>
-<block name="webuis" level="services" long-name="Web UIs" levels="plugin app">
-<collection name="browserui" long-name="Browser UI" level="app">
-<component name="browser" filter="s60" long-name="Browser">
-<unit bldFile="app/webuis/browserui/browser/group"/>
-</component>
-<component name="operatormenu" filter="s60" long-name="Browser Operator Menu">
-<unit bldFile="app/webuis/browserui/operatormenu/group"/>
-</component>
-<component name="videoservices" filter="s60" long-name="Browser Video Services">
-<unit bldFile="app/webuis/browserui/videoservices/group"/>
-</component>
-</collection>
-<collection name="browserplugins" long-name="Browser Plugins" level="plugin">
-<component name="browsersysteminfoplugin" filter="s60" long-name="Browser System Info Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsersysteminfoplugin/group"/>-->
-</component>
-<component name="browsergpsplugin" filter="s60" long-name="Browser GPS Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsergpsplugin/group"/>-->
-</component>
-<component name="browseraudiovideoplugin" filter="s60" long-name="Browser Audio Video Plugin" plugin="Y">
-<unit bldFile="app/webuis/browserplugins/browseraudiovideoplugin/group"/>
-</component>
-<component name="browserplugins_build" filter="s60" long-name="Browser Plugins Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="app/webuis/browserplugins/group"/>
-</component>
-</collection>
-<collection name="pushmtm" long-name="Push MTM" level="plugin">
-<component name="pushmtm_help" filter="s60" long-name="Push MTM Help">
-<unit bldFile="app/webuis/pushmtm/help/group"/>
-</component>
-<component name="plugins" filter="s60" long-name="Push MTM Plugins" plugin="Y">
-<unit bldFile="app/webuis/pushmtm/plugins/group"/>
-</component>
-<component name="pushmtm_build" filter="s60" long-name="Push MTM Build">
-<!-- Some content is at collection level and some is at comopnent level. Either make this a single
- component and move it down a diretcory, or make separate independent components in this collection -->
-<unit bldFile="app/webuis/pushmtm/group"/>
-</component>
-</collection>
-</block>
-<block name="jrt" level="services" long-name="Java Runtime" levels="util generic rt ui">
-<collection name="jrt_plat" long-name="JRT Platform Interfaces" level="ui">
-<component name="java_registry_api" long-name="Java Registry API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_registry_api/build"/>
-</component>
-<component name="java_env_info_api" long-name="Java Environment Info API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_env_info_api/build"/>
-</component>
-<component name="java_debug_api" long-name="Java Debug API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_debug_api/build"/>
-</component>
-</collection>
-<collection name="java_stubs" long-name="Java Stubs" level="util">
-<!-- uncomment all components when configuration is in place. Currently #included from jrt_build -->
-<component name="javadrmutils" long-name="Java DRM Utils" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtdrmutils/group"/>-->
-</component>
-<component name="javaenvinfo" long-name="Java Environment Info" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtenvinfo/group"/>-->
-</component>
-<component name="javaregistry" filter="s60,sf_build" long-name="Java Registry" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtregistry/clientserver/client/group"/>-->
-</component>
-<component name="java_stubs_build" filter="s60,sf_build" long-name="Java Stubs ROM" class="placeholder">
-<!-- Remove the #includes and rename JRT ROM-->
-<!--<unit bldFile="java_stubs/group"/>-->
-</component>
-</collection>
-<collection name="jrt_info" long-name="JRT Info" level="rt">
-<component name="jrt_build" filter="s60" long-name="JRT Build">
-<!-- needed for __JAVA_STUBS condition -->
-<unit bldFile="app/jrt/group"/>
-</component>
-</collection>
-</block>
-<block name="conntools" level="services" long-name="Connectivity Tools" levels="config app">
-<collection name="nettools" long-name="Net Tools" level="app">
-<component name="conntest" filter="s60" long-name="Connection Test" purpose="development">
-<unit bldFile="app/conntools/nettools/conntest/group"/>
-</component>
-</collection>
-<collection name="emulatorlan" long-name="Emulator LAN" level="config">
-<!-- component is actually a colleciton, should be moved down a directory -->
-<component name="emulatorlan_build" filter="s60" long-name="Emulator LAN Build" purpose="development" class="config">
-<unit bldFile="app/conntools/emulatorlan/group"/>
-</component>
-</collection>
-</block>
-<block name="rndtools" level="services" long-name="R&D tools" levels="support generic test util">
-<collection name="creator" long-name="Creator" level="support">
-<!-- collection is really a component. Should move down a directory -->
-<component name="creator_build" filter="s60" long-name="Creator Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/creator/group"/>
-</component>
-</collection>
-<collection name="filebrowser" long-name="File Browser" level="util">
-<!-- consider collapsing into a single component -->
-<component name="fileopserver" filter="s60" long-name="File Operations Server" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
-</component>
-<component name="fileopclient" filter="s60" long-name="File Operations Client" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!--<unit bldFile="filebrowser/fileopclient/group"/>-->
-</component>
-<component name="filebrowser_build" filter="s60" long-name="File Browser Application" purpose="development" class="tool">
-<!-- Need to make this a self-contained component by removing #includes. Can only do when configuration is in place-->
-<unit bldFile="app/rndtools/filebrowser/group"/>
-</component>
-</collection>
-<collection name="launcher" long-name="Launcher" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="launcher_build" filter="s60" long-name="Launcher Utility" purpose="development" class="tool">
-<unit bldFile="app/rndtools/launcher/group"/>
-</component>
-</collection>
-<collection name="loadgen" long-name="Load Generator" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="loadgen_build" filter="s60" long-name="Load Generator Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/loadgen/group"/>
-</component>
-</collection>
-<collection name="perfmon" long-name="Performance Monitor" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="perfmon_build" filter="s60" long-name="Performance Monitor Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/perfmon/group"/>
-</component>
-</collection>
-<collection name="screengrabber" long-name="Screen Grabber" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="screengrabber_build" filter="s60" long-name="ScreenGrabber" purpose="development" class="tool">
-<unit bldFile="app/rndtools/screengrabber/group"/>
-</component>
-</collection>
-<collection name="stifui" long-name="STIF UI" level="generic">
-<component name="stifui_stifui" filter="s60" long-name="STIF UI" purpose="development">
-<unit bldFile="app/rndtools/stifui/stifui/group"/>
-</component>
-<component name="uitestserverstarter" filter="s60" long-name="UI Test Server Starter" purpose="development">
-<unit bldFile="app/rndtools/stifui/uitestserverstarter/group"/>
-</component>
-<component name="stifui_build" filter="s60" long-name="STIF UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/stifui/group"/>
-</component>
-</collection>
-<collection name="memspyui" long-name="Memspy UI" level="generic">
-<!-- collection is really a component. Should move down a directory -->
-<component name="memspyui_build" filter="s60" long-name="Memspy UI Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/memspyui/group"/>
-</component>
-</collection>
-<collection name="htiui" long-name="Harmonized Test Interface UI" level="generic">
-<component name="HtiCommPlugins" filter="s60" long-name="HTI Comm Plugins" purpose="development" plugin="Y">
-<unit bldFile="app/rndtools/htiui/HtiCommPlugins/HtiBtCommPlugin/group"/>
-</component>
-<component name="HtiServicePlugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- can only have a single unit. Should #include from a common bld.inf file -->
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiFtpBackupFake/group"/>
-</component>
-<component name="htidevicereboot" filter="s60" long-name="HTI Device Reboot" purpose="development">
-<unit bldFile="app/rndtools/htiui/htidevicereboot/group"/>
-</component>
-<component name="htistartupwait" filter="s60" long-name="HTI Startup Wait" purpose="development">
-<unit bldFile="app/rndtools/htiui/htistartupwait/group"/>
-</component>
-<component name="htiadmin" filter="s60" long-name="HTI Admin" purpose="development">
-<unit bldFile="app/rndtools/htiui/htiadmin/group"/>
-</component>
-<component name="htiui_build" filter="s60" long-name="HTI UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/htiui/group"/>
-</component>
-</collection>
-</block>
-<block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools if ui">
-<collection name="csxhelp" long-name="Context Sensitive Extended Help" level="if">
-<!-- this is really a component. Should move it down a directory -->
-<component name="csxhelp_build" filter="s60" long-name="Context Sensitive Extended Help Build">
-<unit bldFile="app/helps/csxhelp/group"/>
-</component>
-</collection>
-<collection name="symhelp" long-name="Symbian Help" level="eng">
-<component name="helpmodel" long-name="Help" introduced="6.0" purpose="optional">
-<unit bldFile="app/helps/symhelp/helpmodel/group" mrp="app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
-</component>
-</collection>
-<collection name="helps_info" long-name="Help Apps Info" level="ui">
-<component name="helps_metadata" long-name="Help Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/helps/helps_info/helps_metadata/helps_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
-<collection name="buildverification" long-name="Build Verification" level="services">
-<component name="autosmoketest" long-name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
-<unit bldFile="app/techview/buildverification/autosmoketest/Group" mrp="app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
-</component>
-<component name="smoketest" long-name="Smoke Test" filter="gt" purpose="development">
-<unit bldFile="app/techview/buildverification/smoketest/Group" mrp="app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
-</component>
-</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="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"/>
-<collection name="installationapps" long-name="Installation Apps" level="apps2"/>
-<collection name="messagingapps" long-name="Messaging Apps" level="apps2"/>
-<collection name="telephonyapps" long-name="Telephony Apps" level="apps1"/>
-<collection name="networkingapps" long-name="Networking Apps" level="apps1"/>
-<collection name="networkingutils" long-name="Networking Utils" level="utils"/>
-<collection name="shortlinkapps" long-name="Shortlink Apps" level="apps1"/>
-<collection name="testapps" long-name="Test Apps" level="utils"/>
-<collection name="avapps" long-name="A/V Apps" level="apps3"/>
-<collection name="toolkit" long-name="Toolkit" level="utils"/>
-<collection name="techview_info" long-name="Techview Info" level="apps3">
-<component name="techview_metadata" long-name="Techview Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/techview/techview_info/techview_metadata/techview_metadata.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
--- a/symbian4/single/sysdefs/auto/model_20100415171308_c004c9299c6f.xml Wed May 05 12:21:47 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9240 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a package or prebuilt -->
-<!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) "N"
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile may someday be removed in favour of mrp -->
-<!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="low mw high">
-<block name="stubs" level="high" long-name="Stubs" levels="stub">
-<collection name="s60_stubs" level="stub">
-<component name="audiostubs" long-name="Audio Stubs">
-<unit bldFile="adaptation/stubs/audiostubs/group"/>
-</component>
-<component name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaptation Stub">
-<unit bldFile="adaptation/stubs/btaudioadaptation_stub/group"/>
-</component>
-<component name="drm_stubs" long-name="DRM Stubs">
-<unit bldFile="adaptation/stubs/drm_stubs/group"/>
-</component>
-<component name="ocrsrv_stub" long-name="OCR Services Stub">
-<unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
-</component>
-<component name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation">
-<unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
-</component>
-<component name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" plugin="Y">
-<unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
-</component>
-<component name="srsfenginestub" long-name="SRSF Engine Stub">
-<unit bldFile="adaptation/stubs/srsfenginestub/group"/>
-</component>
-<component name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub">
-<unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
-</component>
-<component name="systemswstubs" long-name="System Software Stubs">
-<unit bldFile="adaptation/stubs/systemswstubs/group"/>
-</component>
-<component name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" plugin="Y">
-<unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
-</component>
-<component name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub">
-<unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
-<collection name="omap3530" long-name="OMAP 3530" level="hw-if">
-<component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530" mrp="adaptation/beagleboard/omap3530/base_beagle.mrp"/>
-</component>
-<component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/kernel"/>
-</component>
-<component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/beagleboard"/>
-</component>
-</collection>
-</block>
-<block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
-<collection name="qemu_baseport" long-name="Baseport" level="hw-if">
-<component name="syborg" long-name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/qemu/baseport/syborg" mrp="adaptation/qemu/baseport/syborg/syborg.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
-<collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
-<component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
-<unit bldFile="os/kernelhwsrv/brdbootldr/ubootldr" mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
-</component>
-</collection>
-<collection name="bsptemplate" long-name="Board Support Package Template" level="hw-if">
-<component name="asspandvariant" long-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 name="kernel" long-name="Kernel Architecture" level="adaptation">
-<component name="eka" long-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 name="kerneltest" long-name="Kernel Test" level="hw-if">
-<component name="e32utils" long-name="E32 Utilities" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32utils/group" mrp="os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/>
-</component>
-<component name="e32test" long-name="E32 Tests" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32test/group" mrp="os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
-</component>
-<component name="f32test" long-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 name="ldds" long-name="Logical Device Drivers" level="adaptation">
-<component name="ethernetldd" long-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 name="audioldd" long-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>
-<component name="serialldd" long-name="Serial Port Drivers" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
-</component>
-<component name="legacydrivers" long-name="Legacy Drivers" purpose="optional">
-<unit mrp="os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
-</component>
-<component name="locmedia" long-name="Local Media Subsystem" introduced="8.1b" purpose="mandatory">
-<!-- these are LDDs for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
-</component>
-<component name="runmodedebugger" long-name="Run Mode Debugger" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/debug/group" mrp="os/kernelhwsrv/kernel/eka/drivers/debug/group/base_e32_drivers_debug.mrp"/>
-</component>
-<component name="btrace" long-name="Kernel Trace Tool" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/trace" mrp="os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
-</component>
-<component name="cameraldd" long-name="Camera Drivers" introduced="^3" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/camerasc" mrp="os/kernelhwsrv/kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
-</component>
-<component name="displayldd" long-name="Display Drivers" introduced="^3" purpose="optional">
-<!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/display" mrp="os/kernelhwsrv/kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
-</component>
-<component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
-</component>
-<component name="usbdescriptors" long-name="USB Descriptors" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors" mrp="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors/base_drivers_usbdescriptors.mrp"/>
-</component>
-<component name="usbdi_utils" long-name="USB DI Utils" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils" mrp="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils/base_drivers_usbdi_utils.mrp"/>
-</component>
-</collection>
-<collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
-<component name="mediadrivers" long-name="Media Drivers" purpose="optional">
-<!-- these are for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/media" mrp="os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
-</component>
-<component name="genericboardsupport" long-name="Generic Board Support" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
-</component>
-</collection>
-<collection name="userlibandfileserver" long-name="User Library and File Server" level="framework">
-<component name="euser" long-name="User Library" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/euser" mrp="os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
-</component>
-<component name="compsupp" long-name="Compiler Runtime Support" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/compsupp" mrp="os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
-</component>
-<component name="fileserver" long-name="File Server" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
-</component>
-<component name="estart" long-name="Base Starter" filter="gt" purpose="optional">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
-</component>
-<component name="domainmgr" long-name="Domain Manager" introduced="8.1b" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
-</component>
-</collection>
-<collection name="filesystems" long-name="File Systems" level="framework">
-<component name="romfs" long-name="ROM File System" filter="gt" purpose="optional" plugin="Y">
-<unit mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
-</component>
-<component name="rofs" long-name="ROFS" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
-</component>
-<component name="usbmsfs" long-name="USB Mass Storage File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
-</component>
-<component name="usbhostmssrv" long-name="USB Host Mass Storage Server" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage/base_f32_shostmassstorage.mrp"/>
-</component>
-<component name="fat32fs" long-name="FAT32 File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
-</component>
-<component name="fatfs" long-name="FAT File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
-</component>
-<component name="compfs" long-name="Composite File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
-</component>
-</collection>
-<collection name="halservices" long-name="HAL Services" level="framework">
-<component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
-<unit bldFile="os/kernelhwsrv/halservices/hal" mrp="os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
-</component>
-</collection>
-<collection name="textmodeshell" long-name="Text Mode Shell" level="test">
-<component name="e32wsrv" long-name="Text Window Server" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/ewsrv" mrp="os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
-</component>
-<component name="textshell" long-name="Text Shell" filter="gt" purpose="development">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
-</component>
-</collection>
-<collection name="baseapitest" long-name="Base API Tests" level="test"/>
-<collection name="kernelhwsrv_info" long-name="Kernel and Hardware Services Info" level="test">
-<component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 config">
-<collection name="emulator" long-name="Emulator" level="bsp">
-<component name="emulatorbsp" long-name="Emulator BSP" purpose="optional">
-<unit bldFile="os/boardsupport/emulator/emulatorbsp" mrp="os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
-</component>
-</collection>
-<collection name="haitest" long-name="HAI Test Suites" level="test">
-<component name="bspsvs" long-name="BSP Verification Suite" introduced="^2" purpose="development">
-<unit mrp="os/boardsupport/haitest/bspsvs/group/bspsvs.mrp"/>
-</component>
-</collection>
-<collection name="boardsupport_info" long-name="Board Support Info" level="config">
-<component name="boardsupport_metadata" long-name="Board Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/boardsupport/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
-<collection name="bldsystemtools" long-name="Build System Tools" level="bld">
-<component name="sysdeftools" long-name="System Definition Tools" purpose="development" introduced="^2">
-<unit mrp="os/buildtools/bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
-</component>
-<component name="commonbldutils" long-name="Common Utils" purpose="development">
-<unit mrp="os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
-</component>
-</collection>
-<collection name="toolsandutils" long-name="Tools and Utils" level="mw">
-<component name="productionbldtools" long-name="Production Build Tools" filter="gt" purpose="development">
-<unit mrp="os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
-</component>
-<component name="e32tools" long-name="E32 Tools" deprecated="^2" purpose="development" class="PC">
-<unit bldFile="os/buildtools/toolsandutils/e32tools/group" mrp="os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
-</component>
-<component name="autotest" long-name="Autotest" purpose="development">
-<unit bldFile="os/buildtools/toolsandutils/autotest/group" mrp="os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
-</component>
-</collection>
-<collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
-<component name="e32toolp" long-name="E32 Perl Tools" purpose="development" filter="sf_build" class="PC">
-<unit mrp="os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="os/buildtools/sbsv1_os/e32toolp/group"/>
-</component>
-</collection>
-<collection name="imgtools_os" long-name="Image Tools" level="fw">
-<component name="romkiteka2" long-name="ROMKIT EKA2" deprecated="^2" purpose="development">
-<unit bldFile="os/buildtools/imgtools_os/romkiteka2/group" mrp="os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
-</component>
-</collection>
-<collection name="misccomponents" long-name="Misc Components" level="mw">
-<component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt" purpose="development">
-<unit bldFile="os/buildtools/misccomponents/emulatorlauncher/group" mrp="os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
-</component>
-</collection>
-<collection name="buildtools_info" long-name="Build Tools Info" level="ui">
-<component name="buildtools_metadata" long-name="Build Tools Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/buildtools/buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
-<collection name="ossrv_pub" long-name="Generic OS Services Public Interfaces" level="utilities">
-<component name="boost_apis" long-name="Boost APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/boost_apis/group"/>
-</component>
-<component name="cpp_wrappers" long-name="Cpp wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cpp_wrappers/group"/>
-</component>
-<component name="character_type_apis" long-name="Character Type APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/character_type_apis/group"/>
-</component>
-<component name="compiler_specific_runtime_support" long-name="Compiler Specific Runtime Support" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/compiler_specific_runtime_support/group"/>
-</component>
-<component name="ossrv_configuration_api" long-name="Generic OS Services Configuration API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/configuration/group"/>
-</component>
-<component name="crypto_authentication_codes_and_hash_functions_api" long-name="Crypto Authentication Codes and Hash Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
-</component>
-<component name="crypto_auxillary_functions_api" long-name="Crypto Auxillary Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_auxillary_functions_api/group"/>
-</component>
-<component name="crypto_certificates_api" long-name="Crypto Certificates API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_certificates_api/group"/>
-</component>
-<component name="crypto_inputoutput_and_data_encoding_api" long-name="Crypto Input/Output and Data Encoding API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
-</component>
-<component name="crypto_public_key_cryptography_and_key_agreement_api" long-name="Crypto Public Key Cryptography and Key Agreement API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
-</component>
-<component name="crypto_symmetric_ciphers_api" long-name="Crypto Symmetric Ciphers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_symmetric_ciphers_api/group"/>
-</component>
-<component name="crypto_utility_functions_api" long-name="Crypto Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_utility_functions_api/group"/>
-</component>
-<component name="cryptogaphy_related_api" long-name="Cryptogaphy Related API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cryptogaphy_related_api/group"/>
-</component>
-<component name="ossrv_debug_api" long-name="Generic OS Services Debug API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/debug/group"/>
-</component>
-<component name="ossrv_exceptions_api" long-name="Generic OS Services Exceptions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/exceptions/group"/>
-</component>
-<component name="gboxed" long-name="GBoxed API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gboxed/group"/>
-</component>
-<component name="glib_arrays" long-name="Glib Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_arrays/group"/>
-</component>
-<component name="glib_asynchronous_queues" long-name="Glib Asynchronous Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_asynchronous_queues/group"/>
-</component>
-<component name="glib_atomic_operations" long-name="Glib Atomic Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_atomic_operations/group"/>
-</component>
-<component name="glib_automatic_string_completion" long-name="Glib Automatic String Completion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_automatic_string_completion/group"/>
-</component>
-<component name="glib_balanced_binary_trees" long-name="Glib Balanced Binary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_balanced_binary_trees/group"/>
-</component>
-<component name="glib_basic_types" long-name="Glib Basic Types API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_basic_types/group"/>
-</component>
-<component name="glib_caches" long-name="Glib Caches API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_caches/group"/>
-</component>
-<component name="glib_character_set_conversion" long-name="Glib Character Set Conversion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_character_set_conversion/group"/>
-</component>
-<component name="glib_closures" long-name="Glib Closures API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_closures/group"/>
-</component>
-<component name="glib_commandline_option_parser" long-name="Glib Command Line Option Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_commandline_option_parser/group"/>
-</component>
-<component name="glib_datasets" long-name="Glib Datasets API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_datasets/group"/>
-</component>
-<component name="glib_date_and_time_functions" long-name="Glib Date and Time Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_date_and_time_functions/group"/>
-</component>
-<component name="glib_doubleended_queues" long-name="Glib Double-ended Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doubleended_queues/group"/>
-</component>
-<component name="glib_doublylinked_lists" long-name="Glib Doubly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doublylinked_lists/group"/>
-</component>
-<component name="glib_dynamic_loading_of_modules" long-name="Glib Dynamic Loading of Modules API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_dynamic_loading_of_modules/group"/>
-</component>
-<component name="glib_enums_and_flags" long-name="Glib Enums and Flags API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_enums_and_flags/group"/>
-</component>
-<component name="glib_error_reporting" long-name="Glib Error Reporting API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_error_reporting/group"/>
-</component>
-<component name="glib_file_utilities" long-name="Glib File Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_file_utilities/group"/>
-</component>
-<component name="glib_generic_values" long-name="Glib Generic Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_generic_values/group"/>
-</component>
-<component name="glib_globstyle_pattern_matching" long-name="Glib Glob-Style Pattern Matching API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_globstyle_pattern_matching/group"/>
-</component>
-<component name="glib_hash_tables" long-name="Glib Hash Tables API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hash_tables/group"/>
-</component>
-<component name="glib_hook_functions" long-name="Glib Hook Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hook_functions/group"/>
-</component>
-<component name="glib_internationalization" long-name="Glib Internationalization API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_internationalization/group"/>
-</component>
-<component name="glib_io_channels" long-name="Glib I/O Channels API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_io_channels/group"/>
-</component>
-<component name="glib_keyvalue_file_parser" long-name="Glib Key-Value File Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_keyvalue_file_parser/group"/>
-</component>
-<component name="glib_lexical_scanner" long-name="Glib Lexical Scanner API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_lexical_scanner/group"/>
-</component>
-<component name="glib_main_event_loop" long-name="Glib Main Event Loop API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_main_event_loop/group"/>
-</component>
-<component name="glib_memory_allocation" long-name="Glib Memory Allocation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_allocation/group"/>
-</component>
-<component name="glib_memory_slices" long-name="Glib Memory Slices API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_slices/group"/>
-</component>
-<component name="glib_message_logging" long-name="Glib Message Logging API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_message_logging/group"/>
-</component>
-<component name="glib_miscellaneous_utility_functions" long-name="Glib Miscellaneous Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_miscellaneous_utility_functions/group"/>
-</component>
-<component name="glib_nary_trees" long-name="Glib N-ary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_nary_trees/group"/>
-</component>
-<component name="glib_parameters_and_values" long-name="Glib Parameters and Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_parameters_and_values/group"/>
-</component>
-<component name="glib_quarks" long-name="Glib Quarks API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_quarks/group"/>
-</component>
-<component name="glib_random_numbers" long-name="Glib Random Numbers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_random_numbers/group"/>
-</component>
-<component name="glib_relations_and_tuples" long-name="Glib Relations and Tuples API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_relations_and_tuples/group"/>
-</component>
-<component name="glib_shellrelated_utilities" long-name="Glib Shell-related Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_shellrelated_utilities/group"/>
-</component>
-<component name="glib_signals" long-name="Glib Signals API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_signals/group"/>
-</component>
-<component name="glib_simple_xml_subset_parser" long-name="Glib Simple XML Subset Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_simple_xml_subset_parser/group"/>
-</component>
-<component name="glib_singlylinked_lists" long-name="Glib Singly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_singlylinked_lists/group"/>
-</component>
-<component name="glib_spawning_processes" long-name="Glib Spawning Processes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_spawning_processes/group"/>
-</component>
-<component name="glib_standard_macros" long-name="Glib Standard Macros API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_standard_macros/group"/>
-</component>
-<component name="glib_string_utility_functions" long-name="Glib String Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_string_utility_functions/group"/>
-</component>
-<component name="glib_strings" long-name="Glib Strings API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_strings/group"/>
-</component>
-<component name="glib_thread_pools" long-name="Glib Thread Pools API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_thread_pools/group"/>
-</component>
-<component name="glib_threads" long-name="Glib Threads API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_threads/group"/>
-</component>
-<component name="glib_timers" long-name="Glib Timers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_timers/group"/>
-</component>
-<component name="glib_unicode_manipulation" long-name="Glib Unicode Manipulation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_unicode_manipulation/group"/>
-</component>
-<component name="glib_value_arrays" long-name="Glib Value Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_value_arrays/group"/>
-</component>
-<component name="glib_varargs_value_collection" long-name="Glib Varargs Value Collection API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_varargs_value_collection/group"/>
-</component>
-<component name="gobject" long-name="GObject API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gobject/group"/>
-</component>
-<component name="gparamspec" long-name="GParamSpec API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gparamspec/group"/>
-</component>
-<component name="gtype" long-name="GType API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtype/group"/>
-</component>
-<component name="gtypemodule" long-name="GTypeModule API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypemodule/group"/>
-</component>
-<component name="gtypeplugin" long-name="GTypePlugin API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypeplugin/group"/>
-</component>
-<component name="io_stream_api" long-name="I/O stream API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/io_stream_api/group"/>
-</component>
-<component name="localization_function_api" long-name="Localization Function API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/localization_function_api/group"/>
-</component>
-<component name="math_operations_api" long-name="Math Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/math_operations_api/group"/>
-</component>
-<component name="ossrv_memory_api" long-name="Generic OS Services Memory API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/memory/group"/>
-</component>
-<component name="no_namespace_headers" long-name="No Namespace Headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/no_namespace_headers/group"/>
-</component>
-<component name="openc_headers" long-name="OpenC headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_headers/group"/>
-</component>
-<component name="openc_wrappers" long-name="OpenC wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_wrappers/group"/>
-</component>
-<component name="ssl_general_api" long-name="SSL General API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_general_api/group"/>
-</component>
-<component name="ssl_protocol_methods_api" long-name="SSL Protocol Methods API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_protocol_methods_api/group"/>
-</component>
-<component name="standard_compressiondecompression_api" long-name="Standard Compression/Decompression API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/standard_compressiondecompression_api/group"/>
-</component>
-<component name="stl" long-name="STL API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/stl/group"/>
-</component>
-<component name="thread_api" long-name="Thread API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/thread_api/group"/>
-</component>
-<component name="type_attributes" long-name="Type Attributes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/type_attributes/group"/>
-</component>
-<component name="typeinfo" long-name="Type Info API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/typeinfo/group"/>
-</component>
-<component name="utility_apis" long-name="Utility APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/utility_apis/group"/>
-</component>
-<component name="wide_character_classapis" long-name="Wide character class/apis" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/wide_character_classapis/group"/>
-</component>
-<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">
-<unit bldFile="os/ossrv/ossrv_pub/dbus-glib/group"/>
-</component>
-</collection>
-<collection name="ossrv_plat" long-name="Generic OS Services Platform Interfaces" level="utilities">
-<component name="libutils_apis" long-name="Utility Library APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_plat/libutils/group"/>
-</component>
-</collection>
-<collection name="stdlibs" long-name="Standard Libraries" level="translation">
-<component name="libz" filter="s60" long-name="Z Compression Library">
-<unit bldFile="os/ossrv/stdlibs/libz/group"/>
-</component>
-<component name="libcrypt" filter="s60" long-name="Crypt Library">
-<unit bldFile="os/ossrv/stdlibs/libcrypt/group"/>
-</component>
-</collection>
-<collection name="ssl" long-name="SSL" level="data-services">
-<component name="libcrypto" filter="s60" long-name="Crypto Library">
-<unit bldFile="os/ossrv/ssl/libcrypto/group"/>
-</component>
-<component name="libssl" filter="s60" purpose="development" long-name="SSL Library">
-<unit bldFile="os/ossrv/ssl/libssl/group"/>
-</component>
-</collection>
-<collection name="glib" long-name="GLib" level="utilities">
-<component name="glibbackend" filter="s60" long-name="GLib Backend">
-<unit bldFile="os/ossrv/glib/build/symbian/glibbackend/group"/>
-<!-- Move to here: <unit bldFile="glib/glibbackend/group"/> -->
-</component>
-<component name="libglib" filter="s60" long-name="GLib Library">
-<unit bldFile="os/ossrv/glib/build/symbian/glib/group"/>
-<!-- Move to here: <unit bldFile="glib/libglib/group"/> -->
-</component>
-<component name="libgthread" filter="s60" long-name="Libg Thread">
-<unit bldFile="os/ossrv/glib/build/symbian/gthread/group"/>
-<!-- Move to here: <unit bldFile="glib/libgthread/group"/> -->
-</component>
-<component name="libgmodule" filter="s60" long-name="Libg Module">
-<unit bldFile="os/ossrv/glib/build/symbian/gmodule/group"/>
-<!-- Move to here: <unit bldFile="glib/libgmodule/group"/> -->
-</component>
-<component name="libgobject" filter="s60" long-name="Libg Object">
-<unit bldFile="os/ossrv/glib/build/symbian/gobject/group"/>
-<!-- Move to here: <unit bldFile="glib/libgobject/group"/> -->
-</component>
-</collection>
-<collection name="stdcpp" long-name="C++ Standard Library" level="translation">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="stdcpp_build" filter="s60" long-name="Stdcpp">
-<unit bldFile="os/ossrv/stdcpp/group"/>
-</component>
-</collection>
-<collection name="ofdbus" long-name="Open Foundation D-Bus" level="utilities">
-<component name="dbus" filter="s60" long-name="D-Bus">
-<unit bldFile="os/ossrv/ofdbus/dbus/group"/>
-</component>
-<component name="dbus-glib" filter="s60" long-name="D-Bus GLib">
-<unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
-</component>
-<component name="ofdbus_rom" filter="s60" long-name="D-Bus ROM">
-<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory
- Consider moving IBY file to one of the above as well and removing this component entirely -->
-<unit bldFile="os/ossrv/ofdbus/group"/>
-</component>
-</collection>
-<collection name="utilitylibraries" long-name="Utility Libraries" level="encoding">
-<component name="libutils" filter="s60" long-name="Utility Library">
-<unit bldFile="os/ossrv/utilitylibraries/libutils/group"/>
-</component>
-</collection>
-<collection name="genericservices" long-name="Generic Services" level="utilities">
-<component name="s60compatibilityheaders" long-name="S60 Compatibility Headers" filter="gt" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp" version="tb101sf"/>
-</component>
-<component name="mimerecognitionfw" long-name="MIME Recognition Framework" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/mimerecognitionfw/group" mrp="os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
-</component>
-<component name="systemagent" long-name="System Agent" introduced="9.0" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/systemagent/group" mrp="os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
-</component>
-<component name="taskscheduler" long-name="Task Scheduler" introduced="6.0" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/taskscheduler/group" mrp="os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
-</component>
-<component name="activebackupclient" long-name="Active Backup Client" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/activebackupclient/group" mrp="os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
-</component>
-<component name="syslibsdocs" long-name="Syslibs Documentation" purpose="development" class="doc">
-<unit mrp="os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
-</component>
-<component name="httputils" long-name="HTTP Utilities Library" introduced="6.2" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/httputils/group" mrp="os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
-</component>
-</collection>
-<collection name="syslibsapitest" long-name="SysLibs API Tests" level="utilities"/>
-<collection name="compressionlibs" long-name="Compression Libraries" level="data-services">
-<component name="ziplib" long-name="Zip Compression Library" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/ossrv/compressionlibs/ziplib/group" mrp="os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
-</component>
-</collection>
-<collection name="genericopenlibs" long-name="Generic Open Libraries" level="translation">
-<component name="cstdlib" long-name="C Standard Library" introduced="ER5" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/cstdlib/group" mrp="os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
-</component>
-<component name="cppstdlib" long-name="C++ Standard Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/cppstdlib/group" mrp="os/ossrv/genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
-</component>
-<component name="openenvcore" long-name="Open Environment Core" introduced="^2" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/openenvcore/group" mrp="os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
-</component>
-<component name="pluggableauthenticationmodulefw" long-name="Pluggable Authentication Module Framework" introduced="^4" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/pluggableauthenticationmodulefw/group" mrp="os/ossrv/genericopenlibs/pluggableauthenticationmodulefw/group/oeaddons_libpam.mrp"/>
-</component>
-<component name="posixrealtimeextensions" long-name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/posixrealtimeextensions/group" mrp="os/ossrv/genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
-</component>
-<component name="liboil" long-name="Liboil" introduced="^4" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/liboil/group" mrp="os/ossrv/genericopenlibs/liboil/group/oeaddons_liboil.mrp"/>
-</component>
-</collection>
-<collection name="lowlevellibsandfws" long-name="Low Level Libraries and Frameworks" level="app-libs">
-<component name="pluginfw" long-name="Plugin Framework" introduced="6.2" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp" version="3"/>
-</component>
-<component name="apputils" long-name="Application Utilities" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/apputils/group" mrp="os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
-</component>
-<component name="genericusabilitylib" long-name="Generic Usability Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/genericusabilitylib/group" mrp="os/ossrv/lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
-</component>
-</collection>
-<collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
-<component name="ossrv_build" filter="s60" long-name="Generic OS Services Build">
-<!-- exports should be moved to individual components -->
-<unit bldFile="os/ossrv/group"/>
-</component>
-<component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="featuremgmt" long-name="Feature Management" level="framework">
-<component name="featuremgr" long-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 name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/persistentdata/featuremgmt/featureregistry/group" mrp="os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
-</component>
-</collection>
-<collection name="loggingservices" long-name="Logging Services" level="server">
-<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">
-<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">
-<unit bldFile="os/persistentdata/loggingservices/rfilelogger/group" mrp="os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
-</component>
-</collection>
-<collection name="traceservices" long-name="Trace Services" level="server">
-<component name="commsdebugutility" long-name="Comms Debug Utility" introduced="7.0s" purpose="optional">
-<unit bldFile="os/persistentdata/traceservices/commsdebugutility/group" mrp="os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
-</component>
-<component name="tracefw" long-name="Trace Framework" introduced="9.2" purpose="development">
-<unit bldFile="os/persistentdata/traceservices/tracefw/ulogger/group" mrp="os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
-</component>
-</collection>
-<collection name="persistentstorage" long-name="Persistent Storage" level="framework">
-<component name="store" long-name="Store" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/store/group" mrp="os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
-</component>
-<component name="dbms" long-name="DBMS" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/dbms/group" mrp="os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
-</component>
-<component name="centralrepository" long-name="Central Repository" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/persistentdata/persistentstorage/centralrepository/group" mrp="os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
-</component>
-<component name="sql" long-name="SQL" introduced="9.3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sql/GROUP" mrp="os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
-</component>
-<component name="sqlite3api" long-name="SQLite 3 API" introduced="^3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sqlite3api/GROUP" mrp="os/persistentdata/persistentstorage/sqlite3api/GROUP/syslibs_sqlite3.mrp"/>
-</component>
-</collection>
-<collection name="persistentdata_info" long-name="Persistent Data Services Info" level="app-if">
-<component name="persistentdata_metadata" long-name="Persistent Data Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/persistentdata/persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
-<component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
-</component>
-<component name="common_platform_security_definitions_api" long-name="Common Platform Security Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group"/>
-</component>
-<component name="feature_discovery_api" long-name="Feature Discovery API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/group"/>
-</component>
-<component name="platform_environment_api" long-name="Platform Environment API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_environment_api/group"/>
-</component>
-<component name="sensor_channel_api" long-name="Sensor Channel API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_channel_api/group"/>
-</component>
-<component name="sensor_definitions_api" long-name="Sensor Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_definitions_api/group"/>
-</component>
-<component name="version_info_api" long-name="Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/group"/>
-</component>
-<component name="accessory_monitoring_api" long-name="Accessory Monitoring API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/group"/>
-</component>
-<component name="haptics_api" long-name="Haptics API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/haptics_api/group"/>
-</component>
-<component name="sensor_data_compensator_api" long-name="Sensor Data Compensator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
-</component>
-</collection>
-<collection name="devicesrv_plat" long-name="Device Services Platform Interfaces" level="app-if">
-<component name="configuration_file_parser_api" long-name="Configuration File Parser API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/configuration_file_parser_api/group"/>
-</component>
-<component name="dos_extension_plugin_api" long-name="DOS Extension Plug-In API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_plugin_api/group"/>
-</component>
-<component name="mediator_command_initiator_api" long-name="Mediator Command Initiator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_initiator_api/group"/>
-</component>
-<component name="syslangutil_api" long-name="SysLangUtil API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/syslangutil_api/group"/>
-</component>
-<component name="wakeup_alarm_api" long-name="Wakeup Alarm API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/wakeup_alarm_api/group"/>
-</component>
-<component name="disk_and_memory_level_keys_api" long-name="Disk and Memory Level Keys API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_and_memory_level_keys_api/group"/>
-</component>
-<component name="mediator_plugin_api" long-name="Mediator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_plugin_api/group"/>
-</component>
-<component name="headset_status_api" long-name="Headset Status API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/headset_status_api/group"/>
-</component>
-<component name="system_startup_extension_plugin_api" long-name="System Startup Extension Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/system_startup_extension_plugin_api/group"/>
-</component>
-<component name="sensor_plugin_api" long-name="Sensor Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_plugin_api/group"/>
-</component>
-<component name="accessory_api" long-name="Accessory API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_api/group"/>
-</component>
-<component name="display_language_definition_api" long-name="Display Language Definition API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/display_language_definition_api/group"/>
-</component>
-<component name="mediator_command_responder_api" long-name="Mediator Command Responder API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_responder_api/group"/>
-</component>
-<component name="accessory_policy_definitions_api" long-name="Accessory Policy Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_definitions_api/group"/>
-</component>
-<component name="hw_settings_api" long-name="Hardware Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/hw_settings_api/group"/>
-</component>
-<component name="mediator_domain_definitions_api" long-name="Mediator Domain Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_domain_definitions_api/group"/>
-</component>
-<component name="sensor_extension_api" long-name="Sensor Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_extension_api/group"/>
-</component>
-<component name="accessory_plugin_api" long-name="Accessory Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_plugin_api/group"/>
-</component>
-<component name="sae_api" long-name="SAE API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sae_api/group"/>
-</component>
-<component name="accessory_control_api" long-name="Accessory Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_control_api/group"/>
-</component>
-<component name="mediator_static_registration_api" long-name="Mediator Static Registration API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_static_registration_api/group"/>
-</component>
-<component name="accessory_key_event_handling_api" long-name="Accessory Key Event Handling API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_key_event_handling_api/group"/>
-</component>
-<component name="mediator_notification_api" long-name="Mediator Notification API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_notification_api/group"/>
-</component>
-<component name="accessory_policy_utility_api" long-name="Accessory Policy Utility API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_utility_api/group"/>
-</component>
-<component name="common_dsy_plugin_api" long-name="Common DSY Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/common_dsy_plugin_api/group"/>
-</component>
-<component name="remote_control_extension_api" long-name="Remote Control Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/remote_control_extension_api/group"/>
-</component>
-<component name="sensor_channel_filter_api" long-name="Sensor Channel Filter API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_channel_filter_api/group"/>
-</component>
-<component name="dos_extension_api" long-name="DOS Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_api/group"/>
-</component>
-<component name="accessory_audio_control_api" long-name="Accessory Audio Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_audio_control_api/group"/>
-</component>
-<component name="mediator_event_consumer_api" long-name="Mediator Event Consumer API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_consumer_api/group"/>
-</component>
-<component name="shared_data_api" long-name="Shared Data API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/shared_data_api/group"/>
-</component>
-<component name="accessory_settings_api" long-name="Accessory Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_settings_api/group"/>
-</component>
-<component name="accessory_bluetooth_control_api" long-name="Accessory Bluetooth Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_bluetooth_control_api/group"/>
-</component>
-<component name="extended_version_info_api" long-name="Extended Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_api/group"/>
-</component>
-<component name="mediator_event_provider_api" long-name="Mediator Event Provider API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_provider_api/group"/>
-</component>
-<component name="tv_out_config_api" long-name="TV Out Config API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_config_api/group"/>
-</component>
-<component name="tspclientmapper_api" long-name="TSP Client Mapper API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tspclientmapper_api/group"/>
-</component>
-<component name="powersave_api" long-name="Power Save API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_api/group"/>
-</component>
-<component name="powersave_definitions_api" long-name="Power Save Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_definitions_api/group"/>
-</component>
-<component name="powersave_plugin_api" long-name="Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_plugin_api/group"/>
-</component>
-<component name="extended_version_info_plugin_api" long-name="Extended Version Info Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_plugin_api/group"/>
-</component>
-<component name="haptics_plugin_api" long-name="Haptics Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_plugin_api/group"/>
-</component>
-<component name="haptics_effect_data_getter_plugin_api" long-name="Haptics Effect Data Getter Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
-</component>
-<component name="haptics_packetizer_plugin_api" long-name="Haptics Packetizer Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_packetizer_plugin_api/group"/>
-</component>
-<component name="tiltcompensation_api" long-name="Tilt Compensation API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tiltcompensation_api/group"/>
-</component>
-<component name="disk_notification_handler_api" long-name="Disk Notification Handler API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_notification_handler_api/group"/>
-</component>
-<component name="accessory_policy_usb_audio_api" long-name="Accessory Policy USB Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_usb_audio_api/group"/>
-</component>
-<component name="accessory_policy_hdmi_audio_api" long-name="Accessory Policy HDMI Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_hdmi_audio_api/group"/>
-</component>
-<component name="sensor_data_compensator_plugin_api" long-name="Sensor Data Compensator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
-</component>
-<component name="ddc_access_api" long-name="DDC Access API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/ddc_access_api/group"/>
-</component>
-<component name="tv_out_behaviour_api" long-name="TV Out Behaviour API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_behaviour_api/group"/>
-</component>
-</collection>
-<collection name="accessoryservices" long-name="Accessory Services" level="framework">
-<component name="accessorymonitor" filter="s60" long-name="Accessory Monitor">
-<unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/group"/>
-</component>
-<component name="accessoryremotecontrol" filter="s60" long-name="Accessory Remote Control">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
-</component>
-<component name="accessoryserver" filter="s60" long-name="Accessory Server">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryserver/group"/>
-</component>
-<component name="pluggeddisplay" filter="s60" long-name="Plugged Display" introduced="^3">
-<unit bldFile="os/devicesrv/accessoryservices/pluggeddisplay/group"/>
-</component>
-<component name="headsetstatusapi" filter="s60" long-name="Headset Status API">
-<unit bldFile="os/devicesrv/accessoryservices/headsetstatusapi/group"/>
-</component>
-<component name="tspclientmapper" filter="s60" long-name="TSP Client Mapper">
-<unit bldFile="os/devicesrv/accessoryservices/tspclientmapper/group"/>
-</component>
-<component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional">
-<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
-</component>
-<component name="gid_pc_tool" filter="s60" long-name="Generic ID PC Tool" class="tool PC">
-<unit bldFile="os/devicesrv/accessoryservices/gid_pc_tool/group"/>
-</component>
-</collection>
-<collection name="commonservices" long-name="Common Services" level="app-if">
-<component name="commonengine" filter="s60" long-name="Common Engine">
-<unit bldFile="os/devicesrv/commonservices/commonengine/group"/>
-</component>
-<component name="commonengineresources" filter="s60" long-name="Common Engine Resources" class="config">
-<unit bldFile="os/devicesrv/commonservices/commonengineresources/group"/>
-</component>
-<component name="platformenv" filter="s60" long-name="Platform Environment">
-<unit bldFile="os/devicesrv/commonservices/platformenv/group"/>
-</component>
-<component name="sysutil" long-name="System Utilities" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/sysutil/group" mrp="os/devicesrv/commonservices/sysutil/group/sysutil.mrp"/>
-</component>
-<component name="activitymanager" long-name="Activity Manager" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/activitymanager/group" mrp="os/devicesrv/commonservices/activitymanager/group/activitymanager.mrp"/>
-</component>
-</collection>
-<collection name="dosservices" long-name="Domestic Operating System Services" level="hw-if">
-<component name="commondsy" filter="s60" long-name="Common DSY" plugin="Y">
-<unit bldFile="os/devicesrv/dosservices/commondsy/group"/>
-</component>
-<component name="dosserver" filter="s60" long-name="Domestic OS Server">
-<unit bldFile="os/devicesrv/dosservices/dosserver/group"/>
-</component>
-</collection>
-<collection name="sensorservices" long-name="Sensor Services" level="framework">
-<component name="sensorserver" filter="s60" long-name="Sensor Server">
-<unit bldFile="os/devicesrv/sensorservices/sensorserver/group"/>
-</component>
-<component name="orientationssy" filter="s60" long-name="Orientation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/orientationssy/group"/>
-</component>
-<component name="tiltcompensationssy" filter="s60" long-name="Tilt Compensation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/tiltcompensationssy/group"/>
-</component>
-<component name="sensordatacompensator" filter="s60" long-name="Sensor Data Compensator">
-<unit bldFile="os/devicesrv/sensorservices/sensordatacompensator/group"/>
-</component>
-</collection>
-<collection name="hwrmhaptics" long-name="HWRM Haptics" level="plugin">
-<component name="hapticseffectdatagetterfw" filter="s60" long-name="Haptics Effect Data Getter Framework">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
-</component>
-<component name="hapticspluginservice" filter="s60" long-name="Haptics Plugin Service">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
-</component>
-<component name="hapticspacketizer" filter="s60" long-name="Haptics Packetizer">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
-</component>
-<component name="hapticspluginmanager" filter="s60" long-name="Haptics Plugin Manager">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
-</component>
-<component name="hapticsserver" filter="s60" long-name="Haptics Server">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsserver/group"/>
-</component>
-<component name="hapticsclient" filter="s60" long-name="Haptics Client">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsclient/group"/>
-</component>
-<component name="hwrmhaptics_build" filter="s60" long-name="HWRM Haptics Build">
-<!-- move these exports into the appropriate above components and delete this component-->
-<unit bldFile="os/devicesrv/hwrmhaptics/group"/>
-</component>
-</collection>
-<collection name="mediator" long-name="Mediator" level="app-if">
-<!--collection is really a component. Move it down a directory -->
-<component name="mediator_build" filter="s60" long-name="Mediator Build">
-<unit bldFile="os/devicesrv/mediator/group"/>
-</component>
-</collection>
-<collection name="psmservices" long-name="Power Save Mode Services" level="app-if">
-<component name="psmserver" filter="s60" long-name="PSM Server">
-<unit bldFile="os/devicesrv/psmservices/psmserver/group"/>
-</component>
-</collection>
-<collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
-<component name="hwrmfmtxwatcherplugin" filter="s60" long-name="HWRM FM Transmitter Watcher Plugin" plugin="Y">
-<unit bldFile="os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
-</component>
-<component name="hwrmtargetmodifierplugin" filter="s60" long-name="HWRM Target Modifier Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build,
- may need to -->
-<!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
-</component>
-<component name="vibractrl" filter="s60" long-name="Vibra Control" deprecated="9.1">
-<unit bldFile="os/devicesrv/resourcemgmt/vibractrl/group"/>
-</component>
-<component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="^2" purpose="optional">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
-</component>
-<component name="hwresourcesmgrconfig" long-name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
-</component>
-<component name="resourcemgmt_build" filter="s60" long-name="Resource Management Build">
-<!-- Move exports to a self-contained component.
- This needs to be kept around until configuration is in place -->
-<unit bldFile="os/devicesrv/resourcemgmt/group"/>
-</component>
-<component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
-</component>
-</collection>
-<collection name="sysstatemgmt" long-name="System State Management" level="server">
-<component name="ssmmapperutility" filter="s60" long-name="SSM Mapper Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmmapperutility/group"/>
-</component>
-<component name="ssmpolicyplugins" filter="s60" long-name="SSM Policy Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmpolicyplugins/group"/>
-</component>
-<component name="ssmutilityplugins" filter="s60" long-name="SSM Utility Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmutilityplugins/group"/>
-</component>
-<component name="ssmcmdlists" filter="s60" long-name="SSM Command Lists" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcmdlists/group"/>
-</component>
-<component name="ssmcustcmds" filter="s60" long-name="SSM Custom Commands" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcustcmds/group"/>
-</component>
-<component name="syslangutil" filter="s60" long-name="System Language Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/syslangutil/group"/>
-</component>
-<component name="sysrestart" filter="s60" long-name="System Restart" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysrestart/group"/>
-</component>
-<component name="sysuiprovider" filter="s60" long-name="System UI Provider" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysuiprovider/group"/>
-</component>
-<component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/group" mrp="os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
-</component>
-<component name="systemstatemgr" long-name="System State Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
-</component>
-<component name="systemstateplugins" long-name="System State Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
-</component>
-<component name="systemstatereferenceplugins" long-name="System State Reference Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
-</component>
-</collection>
-<collection name="resourceinterfaces" long-name="Resource Interfaces" level="hw-if">
-<component name="fmtransmittercontrol" long-name="FM Transmitter Control" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group" mrp="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
-</component>
-</collection>
-<collection name="systemhealthmanagement" long-name="System Health Management" level="server">
-<component name="systemhealthmgr" long-name="System Health Manager" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
-</component>
-</collection>
-<collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if"/>
-<collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
-<component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
-<collection name="authorisation" long-name="Authorisation" level="utilities">
-<component name="userpromptservice" long-name="User Prompt Service" introduced="^3" purpose="mandatory">
-<unit bldFile="os/security/authorisation/userpromptservice/group" mrp="os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
-</component>
-<component name="userpromptutils" long-name="User Prompt Utils" introduced="^3" purpose="optional">
-<unit bldFile="os/security/authorisation/userpromptutils/group" mrp="os/security/authorisation/userpromptutils/group/security_ups_utils.mrp"/>
-</component>
-</collection>
-<collection name="contentmgmt" long-name="Content Management" level="utilities">
-<component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
-<unit bldFile="os/security/contentmgmt/contentaccessfwfordrm/group" mrp="os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
-</component>
-<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">
-<unit bldFile="os/security/crypto/weakcryptospi/group" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
-</component>
-<component name="strongcryptospi" long-name="Strong Crypto SPI" filter="gt" introduced="^3" purpose="optional">
-<unit bldFile="os/security/crypto/weakcryptospi/strong" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
-</component>
-</collection>
-<collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
-<component name="securityutils" long-name="Security Utils" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/securityutils/group" mrp="os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
-</component>
-<component name="securitydocs" long-name="Security Documentation" purpose="development" class="doc">
-<unit mrp="os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
-</component>
-<component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
-</component>
-<component name="securitycommonutils" long-name="Security Common Utils" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/security/cryptomgmtlibs/securitycommonutils/group" mrp="os/security/cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
-</component>
-</collection>
-<collection name="securityanddataprivacytools" long-name="Security and Data Privacy Tools" level="services">
-<component name="securityconfig" long-name="Security Config" introduced="9.1" purpose="optional">
-<unit bldFile="os/security/securityanddataprivacytools/securityconfig/group" mrp="os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
-</component>
-<component name="securitytools" long-name="Security Tools" introduced="^3" purpose="optional" class="PC">
-<unit bldFile="os/security/securityanddataprivacytools/securitytools/group" mrp="os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
-</component>
-</collection>
-<collection name="cryptoplugins" long-name="Crypto Plugins" level="plugins">
-<component name="cryptospiplugins" long-name="Crypto SPI Plugins" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/security/cryptoplugins/cryptospiplugins/group" mrp="os/security/cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
-</component>
-</collection>
-<collection name="cryptoservices" long-name="Crypto Services" level="plugins">
-<component name="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/certificateandkeymgmt/group" mrp="os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
-</component>
-<component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
-</component>
-<component name="browserrootcertificates" long-name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
-<unit mrp="os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
-</component>
-<component name="rootcertificates" filter="sf_build" long-name="Root Certificates" introduced="7.0s" purpose="optional">
-<!-- not in S60 codebase -->
-<unit bldFile="os/security/cryptoservices/rootcertificates/group" mrp="os/security/cryptoservices/rootcertificates/group/rootcerts.mrp"/>
-</component>
-<component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/asnpkcs/group" mrp="os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
-</component>
-</collection>
-<collection name="security_info" long-name="OS Security Info" level="utilities">
-<component name="security_metadata" long-name="OS Security Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/security/security_info/security_metadata/security_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
-<collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
-<component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
-</component>
-<component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
-</component>
-<component name="simulationpositioningmodule" long-name="Simulation Positioning Module" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
-</component>
-<component name="gpspositioningmodule" long-name="GPS/A-GPS Positioning Module" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/gpspositioningmodule/group" mrp="os/lbs/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
-</component>
-<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>
-</collection>
-<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
-<component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
-</component>
-</collection>
-<collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
-<component name="locationserver" long-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 name="networkrequesthandler" long-name="Network Request Handler" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
-</component>
-</collection>
-<collection name="lbstest" long-name="Locating Services Tests" level="application-interface">
-<component name="locationprotocoltest" long-name="Location Protocol Tests" introduced="9.2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/lbstest/locationprotocoltest/group" mrp="os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
-</component>
-</collection>
-<collection name="locationmgmt" long-name="Location Management" level="management">
-<component name="locmonitor" long-name="Location Monitor" introduced="^3" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
-</component>
-<component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/agpslocationmgr/group" mrp="os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
-</component>
-<component name="networklocationmgr" long-name="Network Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/networklocationmgr/group" mrp="os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
-</component>
-<component name="locationcore" long-name="Location Core" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locationcore/group" mrp="os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
-</component>
-<component name="networkgateway" long-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 name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
-<component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
-</component>
-<component name="suplrrlpasn1" filter="sf_build" long-name="SUPL RRLP ASN1 Parser">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
-</component>
-</collection>
-<collection name="lbsapitest" long-name="Location API Tests" level="application-interface"/>
-<collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
-<component name="lbs_metadata" long-name="Locating Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commsfw" level="services" long-name="Communications Framework" levels="server support framework process app-if">
-<collection name="commsprocess" long-name="Comms Process" level="process">
-<component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/commsfw/commsprocess/commsrootserverconfig/group" mrp="os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
-</component>
-</collection>
-<collection name="commsconfig" long-name="Comms Config" level="process">
-<component name="commsdatabase" long-name="Comms Database" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
-</component>
-<component name="commsdatabaseshim" long-name="Comms Database Shim" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/commsfw/commsconfig/commsdatabaseshim/group" mrp="os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
-</component>
-</collection>
-<collection name="datacommsserver" long-name="Data Comms Server" level="framework">
-<component name="esockserver" long-name="ESock Server" purpose="mandatory">
-<unit bldFile="os/commsfw/datacommsserver/esockserver/group" mrp="os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp" version="3"/>
-</component>
-<component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/group" mrp="os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
-</component>
-<component name="networkingdialogstub" long-name="Networking Dialog Stub" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/default" mrp="os/commsfw/datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
-</component>
-<component name="networkcontroller" long-name="Network Controller" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/datacommsserver/networkcontroller/group" mrp="os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
-</component>
-</collection>
-<collection name="serialserver" long-name="Serial Server" level="server">
-<component name="serialportcsy" long-name="Serial Port CSY" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/serialserver/serialportcsy" mrp="os/commsfw/serialserver/serialportcsy/ser-comms_serialportcsy.mrp"/>
-</component>
-<component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" purpose="development">
-<unit bldFile="os/commsfw/serialserver/packetloopbackcsy/group" mrp="os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
-</component>
-<component name="c32serialserver" long-name="C32 Serial Server" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/commsfw/serialserver/c32serialserver/group" mrp="os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
-</component>
-<component name="c32serialserverconfig" long-name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config">
-<unit bldFile="os/commsfw/serialserver/c32serialserverconfig" mrp="os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
-</component>
-<component name="c32serialserverdocs" long-name="C32 Serial Server Documentation" purpose="development" class="doc">
-<unit mrp="os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
-</component>
-</collection>
-<collection name="commsfwutils" long-name="Comms Framework Utilities" level="framework">
-<component name="commsbufs" long-name="Comms Buffers" introduced="^3" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwutils/commsbufs/group" mrp="os/commsfw/commsfwutils/commsbufs/group/comms-infras_commsbufs.mrp"/>
-</component>
-</collection>
-<collection name="commsfw_info" long-name="Comms Framework Info" level="app-if">
-<component name="commsinfrastructuredocs" long-name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
-<unit mrp="os/commsfw/commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
-</component>
-<component name="commsfw_metadata" long-name="Communications Framework Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/commsfw/commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
-</component>
-</collection>
-<collection name="commsfwsupport" long-name="Comms Framework Support" level="support">
-<component name="commselements" long-name="Comms Elements" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwsupport/commselements/group" mrp="os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
-</component>
-</collection>
-<collection name="commsinfrastructureapitest" long-name="Comms-Infras API Tests" level="app-if">
-<component name="commsinfrastructuresvs" long-name="Comms Infrastructure Verification Suite" introduced="^3" purpose="development">
-<unit mrp="os/commsfw/commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
-</component>
-</collection>
-<collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
-<component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
-</component>
-<component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" purpose="mandatory" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
-</component>
-<component name="commstools" long-name="Comms Tools" introduced="^3" purpose="development" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/commstools/group" mrp="os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
-</component>
-</collection>
-</block>
-<block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
-<component name="internetsockets" long-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>
-<collection name="tcpiputils" long-name="TCP/IP Utilities" level="plugin">
-<component name="dnd" long-name="DND" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/dnd/group" mrp="os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
-</component>
-<component name="dhcp" long-name="DHCP" introduced="8.0" purpose="optional">
-<unit bldFile="os/networkingsrv/tcpiputils/dhcp/group" mrp="os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
-</component>
-<component name="networkaddressandporttranslation" long-name="Network Address and Port Translation" introduced="^2" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
-</component>
-<component name="punycodeconv" long-name="Punycode Converter" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/punycodeconv/group" mrp="os/networkingsrv/tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
-</component>
-</collection>
-<collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
-<component name="nullagt" long-name="NULL AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/nullagt/group" mrp="os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
-</component>
-<component name="genericscprparameters" long-name="Generic SCPR Parameters" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/linklayercontrol/genericscprparameters/group" mrp="os/networkingsrv/linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
-</component>
-<component name="mbmsparameters" long-name="MBMS Parameters" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/mbmsparameters/group" mrp="os/networkingsrv/linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
-</component>
-<component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
-<unit bldFile="os/networkingsrv/linklayercontrol/networkinterfacemgr/group" mrp="os/networkingsrv/linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp" version="2"/>
-</component>
-</collection>
-<collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
-<component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
-</component>
-<component name="pppnif" long-name="PPP NIF" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/pppnif/group" mrp="os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp" version="2"/>
-</component>
-<component name="slipnif" long-name="SLIP NIF" purpose="development" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/slipnif/group" mrp="os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
-</component>
-<component name="tunnelnif" long-name="Tunnel NIF" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
-</component>
-</collection>
-<collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
-<component name="packetlogger" long-name="Packet Logger" introduced="8.1" purpose="development">
-<unit bldFile="os/networkingsrv/linklayerutils/packetlogger/group" mrp="os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
-</component>
-</collection>
-<collection name="networkcontrol" long-name="Network Control" level="plugin">
-<component name="qoslib" long-name="QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/qoslib/group" mrp="os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
-</component>
-<component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/pfqoslib/group" mrp="os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
-</component>
-<component name="qosfwprt" long-name="QoS Framework PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
-</component>
-<component name="qosipscpr" long-name="QoS IP SCPR" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosipscpr/group" mrp="os/networkingsrv/networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
-</component>
-<component name="ipnetworklayer" long-name="IP Network Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/ipnetworklayer/group" mrp="os/networkingsrv/networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
-</component>
-<component name="iptransportlayer" long-name="IP Transport Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/iptransportlayer/group" mrp="os/networkingsrv/networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
-</component>
-<component name="commsuserpromptmgr" long-name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkcontrol/commsuserpromptmgr/group" mrp="os/networkingsrv/networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
-</component>
-</collection>
-<collection name="networkprotocols" long-name="Network Protocols" level="plugin">
-<component name="ipeventnotifier" long-name="IP Event Notifier" introduced="8.1" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
-</component>
-<component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
-</component>
-<component name="iphook" long-name="IP Hook" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
-</component>
-<component name="mobileip" long-name="Mobile IP" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/mobileip/group" mrp="os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
-</component>
-<component name="dnsproxy" long-name="DNS Proxy" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/networkprotocols/dnsproxy/group" mrp="os/networkingsrv/networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
-</component>
-</collection>
-<collection name="networksecurity" long-name="Network Security" level="framework">
-<component name="tls" long-name="TLS" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tls/group" mrp="os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
-</component>
-<component name="tlsprovider" long-name="TLS Provider" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tlsprovider/group" mrp="os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
-</component>
-<component name="ipsec" long-name="IPsec" introduced="7.0" purpose="optional">
-<unit bldFile="os/networkingsrv/networksecurity/ipsec/group" mrp="os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
-</component>
-</collection>
-<collection name="networkingtestandutils" long-name="Networking Test and Utils" level="app-if">
-<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">
-<!-- production component: contains the IBY files -->
-<unit bldFile="os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
-</component>
-<component name="networkingdocs" long-name="Networking Documentation" purpose="development" class="doc">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
-</component>
-<component name="networkingsrv_metadata" long-name="Networking Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
-<component name="predictorcompression" long-name="Predictor Compression" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wlan" level="services" long-name="WLAN" levels="hw low mid high tools test">
-<collection name="wlan_plat" long-name="WLAN Platform Interfaces" level="test">
-<component name="wlan_dbif_api" long-name="WLAN DBIF API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_dbif_api/group"/>
-</component>
-<component name="wlan_hal_api" long-name="WLAN HAL API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hal_api/group"/>
-</component>
-<component name="wlan_management_api" long-name="WLAN Management API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_management_api/group"/>
-</component>
-<component name="wlan_device_settings_api" long-name="WLAN Device Settings API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_device_settings_api/group"/>
-</component>
-<component name="wlan_control_api" long-name="WLAN Control API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_control_api/group"/>
-</component>
-<component name="wlan_hw_initialization_data_api" long-name="WLAN Hardware Initialization Data API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hw_initialization_data_api/group"/>
-</component>
-<component name="wlan_power_save_plugin_api" long-name="WLAN Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_power_save_plugin_api/group"/>
-</component>
-<component name="wlan_info_api" long-name="WLAN Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_info_api/group"/>
-</component>
-<component name="wlan_agent_hotspot_plugin_api" long-name="WLAN Agent Hotspot Plug-in API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
-</component>
-<component name="wlan_osa_api" long-name="WLAN OSA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_osa_api/group"/>
-</component>
-<component name="wlan_spia_api" long-name="WLAN SPIA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_spia_api/group"/>
-</component>
-<component name="wlan_hpa_api" long-name="WLAN HPA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hpa_api/group"/>
-</component>
-<component name="wlan_eapol_plugin_api" long-name="WLAN EAPOL Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_eapol_plugin_api/group"/>
-</component>
-<component name="wlan_generic_plugin_api" long-name="WLAN Generic Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_generic_plugin_api/group"/>
-</component>
-<component name="wlan_aws_plugin_api" long-name="WLAN AWS Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_aws_plugin_api/group"/>
-</component>
-</collection>
-<collection name="wlan_pub" long-name="WLAN Public Interfaces" level="test">
-<component name="wlan_sdk_info_api" long-name="WLAN SDK Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_pub/wlan_sdk_info_api/group"/>
-</component>
-</collection>
-<collection name="wlan_bearer" long-name="WLAN Bearer" level="hw">
-<component name="wlanpsmplugin" filter="s60" long-name="WLAN PSM Plugin" plugin="Y">
-<unit bldFile="os/wlan/wlan_bearer/wlanpsmplugin/group"/>
-</component>
-<component name="wlanagent" filter="s60" long-name="WLAN Agent">
-<unit bldFile="os/wlan/wlan_bearer/wlanagent/group"/>
-</component>
-<component name="wlandbif_cd" filter="s60" long-name="WLAN CommsDat interface">
-<unit bldFile="os/wlan/wlan_bearer/wlandbif_cd/group"/>
-</component>
-<!-- should follow component directory rules for stuff in wlan_symbian/ and put in a single component or split up properly -->
-<component name="wlanengine" filter="s60" long-name="WLAN Engine">
-<unit bldFile="os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
-</component>
-<component name="wlanldd" filter="s60" long-name="WLAN LDD">
-<unit bldFile="os/wlan/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
-</component>
-<component name="wlannwif" filter="s60" long-name="WLAN Network Interface">
-<unit bldFile="os/wlan/wlan_bearer/wlannwif/group"/>
-</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="adaptation hw-if plugin framework server app-if">
-<collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
-<component name="basebandchanneladaptor" long-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 name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
-<component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
-</component>
-</collection>
-<collection name="fax" long-name="Fax" level="server">
-<component name="faxclientandserver" long-name="Fax Client and Server" purpose="optional">
-<unit bldFile="os/cellularsrv/fax/faxclientandserver/Group" mrp="os/cellularsrv/fax/faxclientandserver/Group/telephony_fax.mrp"/>
-</component>
-</collection>
-<collection name="smsprotocols" long-name="SMS Protocols" level="framework">
-<component name="smsstack" long-name="SMS Stack" introduced="6.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/cellularsrv/smsprotocols/smsstack/group" mrp="os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
-</component>
-</collection>
-<collection name="telephonyprotocols" long-name="Telephony Protocols" level="framework">
-<component name="csdagt" long-name="CSD AGT" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/csdagt/group" mrp="os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
-</component>
-<component name="psdagt" long-name="PSD AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/psdagt/group" mrp="os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
-</component>
-<component name="gprsumtsqosprt" long-name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
-</component>
-<component name="gprsumtsqosinterface" long-name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
-</component>
-<component name="qosextnapi" long-name="QoS Extn API" introduced="9.2" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
-</component>
-<component name="secondarypdpcontextumtsdriver" long-name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
-</component>
-<component name="qos3gppcpr" long-name="QoS 3GPP CPR" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
-</component>
-<component name="pdplayer" long-name="PDP Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/pdplayer/group" mrp="os/cellularsrv/telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
-</component>
-<component name="rawipnif" long-name="Raw IP NIF" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserver" long-name="Telephony Server" level="server">
-<component name="etelserverandcore" long-name="ETel Server and Core" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
-</component>
-<component name="etelmultimode" long-name="ETel Multimode" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelmultimode/group" mrp="os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
-</component>
-<component name="etelpacketdata" long-name="ETel Packet Data" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
-</component>
-<component name="etelsimtoolkit" long-name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
-<component name="common_tsy" long-name="Common TSY" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
-</component>
-<component name="licenseetsystub" long-name="Licensee TSY Stub" introduced="^2" purpose="development" filter="sf_build" plugin="Y">
-<unit mrp="os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="os/cellularsrv/telephonyserverplugins/licenseetsystub/group"/>
-</component>
-<component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
-</component>
-<component name="simtsy" long-name="SIM TSY" introduced="7.0" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
-</component>
-<component name="ctsydispatchlayer" long-name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
-</component>
-<component name="simatktsy" long-name="SIMATK TSY" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simatktsy/group" mrp="os/cellularsrv/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
-</component>
-</collection>
-<collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
-<component name="dial" long-name="Dial" deprecated="9.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyutils/dial/group" mrp="os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
-</component>
-<component name="telephonywatchers" long-name="Telephony Watchers" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
-</component>
-<component name="etel3rdpartyapi" long-name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrv_info" long-name="Cellular Baseband Services Info" level="app-if">
-<component name="telephonyconfidentialdocs" long-name="Telephony Confidential Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
-</component>
-<component name="telephonydocs" long-name="Telephony Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
-</component>
-<component name="cellularsrv_metadata" long-name="Cellular Baseband Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
-<component name="mocksy" long-name="MockSY" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if"/>
-</block>
-<block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
-<collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
-<component name="bluetooth_audio_adaptation_api" long-name="Bluetooth Audio Adaptation API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
-</component>
-<component name="bluetooth_power_management_api" long-name="Bluetooth Power Management API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_power_management_api/group"/>
-</component>
-<component name="at_command_handler_plugin_api" long-name="AT Command Handler Plugin API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/at_command_handler_plugin_api/group"/>
-</component>
-</collection>
-<collection name="bluetooth" long-name="Bluetooth Core" level="framework">
-<component name="btstack" long-name="Bluetooth Stack" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btstack" mrp="os/bt/bluetooth/btstack/bluetooth_stack.mrp"/>
-</component>
-<component name="btcomm" long-name="Bluetooth CSY" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetooth/btcomm" mrp="os/bt/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
-</component>
-<component name="btsdp" long-name="Bluetooth SDP" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btsdp" mrp="os/bt/bluetooth/btsdp/bluetooth_sdp.mrp"/>
-</component>
-<component name="btextnotifiers" long-name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btextnotifiers" mrp="os/bt/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
-</component>
-<component name="gavdp" long-name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/gavdp/group" mrp="os/bt/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
-</component>
-<component name="btlogger" long-name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btlogger/group" mrp="os/bt/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
-</component>
-<component name="btdocs" long-name="Bluetooth Documentation" purpose="development" class="doc">
-<unit mrp="os/bt/bluetooth/btdocs/bluetooth_documentation.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothmgmt" long-name="Bluetooth Management" level="plugin">
-<component name="btmgr" long-name="Bluetooth Manager" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btmgr" mrp="os/bt/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
-</component>
-<component name="btconfig" long-name="Bluetooth Config" purpose="optional" class="config">
-<unit bldFile="os/bt/bluetoothmgmt/btconfig" mrp="os/bt/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
-</component>
-<component name="btrom" long-name="Bluetooth ROM" introduced="9.1" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btrom" mrp="os/bt/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
-</component>
-<component name="bluetoothclientlib" long-name="Bluetooth Client Library" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/bluetoothclientlib" mrp="os/bt/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothcommsprofiles" long-name="Bluetooth Comms Profiles" level="app-if">
-<component name="btpan" long-name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetoothcommsprofiles/btpan/group" mrp="os/bt/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
-</component>
-</collection>
-<collection name="bthci" long-name="Host Controller Interface" level="server">
-<component name="bthci2" long-name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bthci/bthci2/group" mrp="os/bt/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
-</component>
-<component name="hciextensioninterface" long-name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bthci/hciextensioninterface" mrp="os/bt/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
-</component>
-<component name="hci2implementations" long-name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bthci/hci2implementations/group" mrp="os/bt/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
-</component>
-</collection>
-<collection name="irda" long-name="IrDA" level="plugin">
-<component name="irdastack" long-name="IrDA Stack" purpose="optional">
-<unit bldFile="os/bt/irda/irdastack/group" mrp="os/bt/irda/irdastack/group/infra-red_irda.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if"/>
-<collection name="atext" long-name="AT Extensions" level="server">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="atext_build" long-name="AT Extension Build" introduced="^3" purpose="optional" filter="s60">
-<unit bldFile="os/bt/atext/group"/>
-</component>
-</collection>
-<collection name="bt_info" long-name="Bluetooth Info" level="app-if">
-<component name="bt_metadata" long-name="Bluetooth Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/bt/bt_info/bt_metadata/bt_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
-<collection name="usb_plat" long-name="USB Platform Interfaces" level="app-if">
-<component name="usb_audio_stream_plugin_api" long-name="USB Audio Stream Plugin API" filter="s60" class="api">
-<unit bldFile="os/usb/usb_plat/usb_audio_stream_plugin_api/group"/>
-</component>
-</collection>
-<collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
-<!-- usbclientdrivers to be moved here from kernelhwsrv-->
-</collection>
-<collection name="usbmgmt" long-name="USB Management" level="server">
-<component name="usbmgr" long-name="USB Manager" purpose="optional">
-<unit bldFile="os/usb/usbmgmt/usbmgr/group" mrp="os/usb/usbmgmt/usbmgr/group/usb_manager.mrp" version="2"/>
-</component>
-<component name="usbclassandmgrdocs" long-name="USB Class and Manager Documentation" purpose="development" class="doc">
-<unit mrp="os/usb/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
-</component>
-</collection>
-<collection name="usb_info" long-name="USB Info" level="app-if">
-<component name="usb_metadata" long-name="USB Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/usb/usb_info/usb_metadata/usb_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="mm" level="services" long-name="Multimedia" levels="adaptation 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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-</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"/>
-</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"/>
-</component>
-<component name="aac_decoder_config_proxy_api" long-name="AAC Decoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/aac_decoder_config_proxy_api/group"/>
-</component>
-<component name="added_devsound_control_api" long-name="Added DevSound Control API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_api/group"/>
-</component>
-<component name="added_devsound_control_msg_hdlr_api" long-name="Added DevSound Control Msg Hdlr API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_msg_hdlr_api/group"/>
-</component>
-<component name="added_devsound_control_proxy_api" long-name="Added DevSound Control Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_proxy_api/group"/>
-</component>
-<component name="audio_effects_msg_hdlr_api" long-name="Audio Effects Message Handler API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_msg_hdlr_api/group"/>
-</component>
-<component name="audio_effects_proxy_api" long-name="Audio Effects Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_proxy_api/group"/>
-</component>
-<component name="audio_policy_header_api" long-name="Audio Policy Header API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="audio_routing_proxy_api" long-name="Audio Routing Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_routing_proxy_api/group"/>
-</component>
-<component name="custom_interface_builder_api" long-name="Custom Interface Builder API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_builder_api/group"/>
-</component>
-<component name="custom_interface_message_handler_factory_api" long-name="Custom Interface Message Handler Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_message_handler_factory_api/group"/>
-</component>
-<component name="custom_interface_proxy_factory_api" long-name="Custom Interface Proxy Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_proxy_factory_api/group"/>
-</component>
-<component name="custom_interface_utility_api" long-name="Custom Interface Utility API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_utility_api/group"/>
-</component>
-<component name="devsound_adaptation_api" long-name="DevSound Adaptation API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/devsound_adaptation_api/group"/>
-</component>
-<component name="display_posting_api" long-name="Display Posting API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="eaac_plus_decoder_interface_proxy_api" long-name="eAAC Plus Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="error_concealment_interface_proxy_api" long-name="Error Concealment Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
-</component>
-<component name="fm_radio_adaptation_api" long-name="FM Radio Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_decoder_interface_proxy_api" long-name="G711 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_encoder_interface_proxy_api" long-name="G711 Encoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_decoder_interface_proxy_api" long-name="G729 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_encoder_interface_msg_hdlr_api" long-name="G729 Encoder Interface Message Handler API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</component>
-<component name="ilbc_decoder_interface_proxy_api" long-name="Ilbc Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ilbc_encoder_interface_proxy_api" long-name="Ilbc Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="mdf_plugin_uids" long-name="MDF Plug-in UIDs" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/mdf_plugin_uids/group"/>
-</component>
-<component name="multimedia_fourcc_definitions_api" long-name="Multimedia FourCC Definitions API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/multimedia_fourcc_definitions_api/group"/>
-</component>
-<component name="nokia_audio_policy_header_api" long-name="Nokia Audio Policy Header API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/nokia_audio_policy_header_api/group"/>
-</component>
-<component name="nokia_multimedia_fourcc_definitions_api" long-name="Nokia Multimedia Fourcc Definitions API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ra8_decoder_interface_proxy_api" long-name="RA8 Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
-</component>
-<component name="rds_adaptation_api" long-name="RDS Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="restricted_audio_output_proxy_api" long-name="Restricted Audio Output Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="sbc_encoder_interface_proxy_api" long-name="SBC Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/sbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="secure_output_mdf_custom_interface" long-name="Secure Output MDF Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="speech_encoder_config_proxy_api" long-name="Speech Encoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/speech_encoder_config_proxy_api/group"/>
-</component>
-<component name="telephony_audio_routing_client_api" long-name="Telephony Audio Routing Client API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_client_api/group"/>
-</component>
-<component name="telephony_audio_routing_manager_api" long-name="Telephony Audio Routing Manager API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_manager_api/group"/>
-</component>
-<component name="video_buffer_management_mdf_custom_interface" long-name="Video Buffer Management MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_buffer_management_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_rotation_mdf_custom_interface" long-name="Video Decoder Rotation MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_scaling_mdf_custom_interface" long-name="Video Decoder Scaling MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
-</component>
-<component name="video_reclaim_extbuffers_ci" long-name="Video Reclaim Extbuffers Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_reclaim_extbuffers_ci/group"/>
-</component>
-<component name="video_window_control_custom_interface" long-name="Video Window Control Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="wma_decoder_interface_proxy_api" long-name="WMA Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/wma_decoder_interface_proxy_api/group"/>
-</component>
-<component name="eaacplusutil_api" long-name="EAac Plus Util API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/eaacplusutil_api/group"/>
-</component>
-<component name="frametable_api" long-name="Frametable API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/frametable_api/group"/>
-</component>
-</collection>
-<collection name="devsoundextensions" long-name="Devsound Extensions" level="device-fw">
-<component name="drmaudioplayer" filter="s60" long-name="DRM Audio Player">
-<unit bldFile="os/mm/devsoundextensions/drmaudioplayer/group"/>
-</component>
-<component name="mmextfw" filter="s60" long-name="Multimedia Extension Framework">
-<unit bldFile="os/mm/devsoundextensions/mmextfw/group"/>
-</component>
-<component name="audiorouting" filter="s60" long-name="Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/audiorouting/group"/>
-</component>
-<component name="effects" filter="s60" long-name="Effects">
-<unit bldFile="os/mm/devsoundextensions/effects/group"/>
-</component>
-<component name="effectspresets" filter="s60" long-name="Effects Presets">
-<unit bldFile="os/mm/devsoundextensions/effectspresets/group"/>
-</component>
-<component name="effectspresets_utils" filter="s60" long-name="Effects Presets Utils">
-<!-- need to #include the lot from a single bld.inf
- Also move to a standard component location, not under effectspresets -->
-<unit bldFile="os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
-<unit bldFile="os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
-</component>
-<component name="telephonyaudiorouting" filter="s60" long-name="Telephony Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/group"/>
-</component>
-<component name="mmfcustominterfaces" filter="s60" long-name="MMF Custom Interfaces">
-<unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/group"/>
-</component>
-<component name="addeddevsoundcontrol" filter="s60" long-name="Added DevSound Control">
-<unit bldFile="os/mm/devsoundextensions/addeddevsoundcontrol/group"/>
-</component>
-<component name="globalaudiosettings" filter="s60" long-name="Global Audio Settings">
-<unit bldFile="os/mm/devsoundextensions/globalaudiosettings/group"/>
-</component>
-<component name="restrictedaudiooutput" filter="s60" long-name="Restricted Audio Output">
-<unit bldFile="os/mm/devsoundextensions/restrictedaudiooutput/group"/>
-</component>
-<component name="ciextnfactoryplugins" filter="s60" long-name="Custom Interface Extension Factory Plugins" plugin="Y">
-<unit bldFile="os/mm/devsoundextensions/ciextnfactoryplugins/group"/>
-</component>
-</collection>
-<collection name="mdfdevvideoextensions" long-name="MDF Dev Video Extensions" level="device-fw">
-<component name="nga_mdf_postprocessor" long-name="NGA MDF Postprocessor" filter="s60">
-<unit bldFile="os/mm/mdfdevvideoextensions/nga_mdf_postprocessor/group"/>
-</component>
-</collection>
-<collection name="audio" long-name="Audio Codecs" level="middleware">
-<component name="arm_cmmf_codecs" filter="s60" long-name="ARM CMMF Codecs" plugin="Y">
-<unit bldFile="os/mm/audio/arm_cmmf_codecs/group"/>
-</component>
-</collection>
-<collection name="video" long-name="Video Codecs" level="middleware">
-<!-- empty -->
-</collection>
-<collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
-<component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/imagingandcamerafws/imagingfws/group" mrp="os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
-</component>
-<component name="camerafw" long-name="Camera Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/imagingandcamerafws/camerafw/group" mrp="os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
-</component>
-</collection>
-<collection name="mmlibs" long-name="Multimedia Libraries" level="middleware">
-<component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmutilitylib/group" mrp="os/mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
-</component>
-<component name="mmfw" long-name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmfw/group" mrp="os/mm/mmlibs/mmfw/group/multimedia_mmf.mrp"/>
-</component>
-</collection>
-<collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
-<component name="imagingplugins" long-name="Imaging Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/imagingplugins/group" mrp="os/mm/mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
-</component>
-<component name="cameraplugins" long-name="Camera Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/cameraplugins/group" mrp="os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
-</component>
-<component name="lib3gp" long-name="3GP Library" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/mmplugins/lib3gp/group" mrp="os/mm/mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
-</component>
-<component name="mmfwplugins" long-name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/mmfwplugins/group" mrp="os/mm/mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
-</component>
-</collection>
-<collection name="mm_info" long-name="Multimedia Info" level="app-if">
-<component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc">
-<unit mrp="os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
-</component>
-<component name="mm_metadata" long-name="Multimedia Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
-<component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="^2" purpose="development">
-<unit bldFile="os/mm/mmresourcemgmt/mmresctrl/group" mrp="os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
-</component>
-</collection>
-<collection name="mmdevicefw" long-name="Multimedia Device Framework" level="device-fw">
-<component name="mdf" long-name="Media Device Framework" introduced="9.2" purpose="mandatory">
-<unit bldFile="os/mm/mmdevicefw/mdf/group" mrp="os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
-</component>
-<component name="speechrecogsupport" long-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 name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
-<component name="videorenderer" long-name="Video Renderer" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/mmswadaptation/videorenderer/group" mrp="os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
-</component>
-</collection>
-<collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw"/>
-<collection name="omxil" long-name="OpenMAX IL" level="hw-if">
-<component name="omxilapi" long-name="OpenMAX IL API" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilapi/group" mrp="os/mm/omxil/omxilapi/group/multimedia_omx_il_api.mrp" version="1"/>
-</component>
-<component name="omxilcore" long-name="OpenMAX IL Core" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcore/group" mrp="os/mm/omxil/omxilcore/group/multimedia_omx_il_core.mrp" version="1"/>
-</component>
-<component name="omxilcomponentcommon" long-name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcomponentcommon/group" mrp="os/mm/omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp" version="1"/>
-</component>
-<component name="omxilrefcomps" long-name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilrefcomps/ref_components/group" mrp="os/mm/omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp" version="1"/>
-</component>
-<component name="mmilapi" long-name="Multimedia Integration Layer API" introduced="^3" purpose="development">
-<unit bldFile="os/mm/omxil/mmilapi/group" mrp="os/mm/omxil/mmilapi/group/multimedia_il_api.mrp"/>
-</component>
-</collection>
-<collection name="devsound" long-name="Sound Device" level="devices">
-<component name="devsoundapi" long-name="DevSound API" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/devsound/devsoundapi/group" mrp="os/mm/devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
-</component>
-<component name="a3fdevsound" long-name="A3F DevSound" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3fdevsound/group" mrp="os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
-</component>
-<component name="a3facf" long-name="A3F Audio Component Framework" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3facf/group" mrp="os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
-</component>
-<component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/devsound/devsoundpluginsupport/group" mrp="os/mm/devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
-</component>
-<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">
-<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">
-<unit bldFile="os/mm/devsound/a3ftrace/group" mrp="os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
-</component>
-<component name="a3fsrvstart" long-name="A3F Server Start" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
-</component>
-</collection>
-<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
-<component name="devsoundhwdeviceapi" long-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 name="a3facl" long-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 name="a3fdevsoundcustomisation" long-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"/>
-</component>
-<component name="refacladapt" long-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"/>
-</component>
-<component name="videohai" long-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 name="dvbhreceiverhai" long-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>
-</block>
-<block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
-<collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
-<component name="exif_api" long-name="Exif API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagingext_plat" long-name="Imaging Extensions Platform Interfaces" level="app-if">
-<component name="jpeg2000_icl_plugin_api" long-name="JPEG2000 ICL plugin API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/jpeg2000_icl_plugin_api/group"/>
-</component>
-<component name="extended_icl_jpeg_api" long-name="Extended ICL Jpeg API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
-</component>
-<component name="h324_annex_k_custom_api" long-name="H324 Annex K Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/h324_annex_k_custom_api/group"/>
-</component>
-<component name="ecam_orientation_custom_api" long-name="ECam Orientation Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_orientation_custom_api/group"/>
-</component>
-<component name="ecam_ui_orientation_override_custom_api" long-name="ECam UI Orientation Override Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
-</component>
-<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>
-</collection>
-<collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
-<component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
-<unit bldFile="os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
-</component>
-<component name="imageadaptationextensions_build" filter="s60" long-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"/>
-</component>
-</collection>
-<collection name="imagingmodules" long-name="Imaging Modules" level="hw-if">
-<component name="exiflib" filter="s60" long-name="Exif Library">
-<unit bldFile="os/imagingext/imagingmodules/exiflib/group"/>
-</component>
-<component name="jp2kcodec" filter="s60" long-name="JPEG2000 Decoder Plugin" plugin="Y">
-<unit bldFile="os/imagingext/imagingmodules/jp2kcodec/group"/>
-</component>
-</collection>
-</block>
-<block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
-<component name="vgi" filter="s60" long-name="VGI">
-<unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
-</component>
-</collection>
-<collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adaptations">
-<component name="m3gcore11" filter="s60" long-name="M3G Core 1.1">
-<unit bldFile="os/graphics/m3g/m3gcore11/group"/>
-</component>
-</collection>
-<collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines">
-<component name="graphicsresource" long-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 name="graphicsresourceadaptation" long-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"/>
-</component>
-<component name="graphicsresourceimplementation" long-name="Graphics Resource Implementation" introduced="^4" purpose="optional">
-<unit bldFile="os/graphics/graphicsresourceservices/graphicsresourceimplementation/group" mrp="os/graphics/graphicsresourceservices/graphicsresourceimplementation/group/graphics_graphicsresourceimplementation.mrp"/>
-</component>
-<component name="graphicsresourceinterface" long-name="Graphics Resource Interface" introduced="^4" purpose="optional">
-<unit bldFile="os/graphics/graphicsresourceservices/graphicsresourceinterface/group" mrp="os/graphics/graphicsresourceservices/graphicsresourceinterface/group/graphics_graphicsresourceinterface.mrp"/>
-</component>
-</collection>
-<collection name="graphicsutils" long-name="Graphics Utils" level="engines">
-<component name="commongraphicsheaders" long-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 name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
-<!-- displayldd to be moved here -->
-<component name="surfacemgr" long-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 name="graphicscomposition" long-name="Graphics Composition" level="engines">
-<component name="openwfcinterface" long-name="OpenWF Composition Interface" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfcinterface/group" mrp="os/graphics/graphicscomposition/openwfcinterface/group/graphics_openwfcinterface.mrp"/>
-</component>
-<component name="openwfcompositionengine" long-name="OpenWF Composition Engine" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/graphicscomposition/openwfcompositionengine/group" mrp="os/graphics/graphicscomposition/openwfcompositionengine/group/graphics_openwfcompositionengine.mrp"/>
-</component>
-<component name="openwfsupport" long-name="OpenWF Support" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfsupport/group" mrp="os/graphics/graphicscomposition/openwfsupport/group/graphics_openwfsupport.mrp"/>
-</component>
-<component name="surfaceupdate" long-name="Surface Update" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/surfaceupdate/group" mrp="os/graphics/graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
-</component>
-</collection>
-<collection name="graphicstest" long-name="Graphics Test" level="app-if">
-<component name="uibench" long-name="UI Bench" introduced="9.2" purpose="development">
-<unit bldFile="os/graphics/graphicstest/uibench/group" mrp="os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
-</component>
-</collection>
-<collection name="graphics_plat" long-name="Graphics Platform Interfaces" level="app-if">
-<component name="m3g_core_api" filter="sf_build" long-name="M3G Core API" class="api">
-<unit bldFile="os/graphics/graphics_plat/m3g_core_api/group"/>
-</component>
-</collection>
-<collection name="graphics_info" long-name="Graphics Info" level="app-if">
-<component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc">
-<unit mrp="os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
-</component>
-<component name="graphics_metadata" long-name="Graphics Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
-</component>
-</collection>
-<collection name="windowing" long-name="Windowing" level="app-if">
-<component name="windowserver" long-name="Window Server" purpose="mandatory">
-<unit bldFile="os/graphics/windowing/windowserver/group" mrp="os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
-</component>
-<component name="windowserverplugins" long-name="Window Server Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/windowing/windowserverplugins/group" mrp="os/graphics/windowing/windowserverplugins/group/graphics_wserv_std_plugins.mrp"/>
-</component>
-</collection>
-<collection name="printingservices" long-name="Printing Services" level="app-if">
-<component name="printerdriversupport" long-name="Printer Driver Support" purpose="optional">
-<unit bldFile="os/graphics/printingservices/printerdriversupport/group" mrp="os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
-</component>
-<component name="printerdrivers" long-name="Printer Drivers" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/printingservices/printerdrivers/group" mrp="os/graphics/printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
-</component>
-</collection>
-<collection name="fbs" long-name="Font and Bitmap Server" level="device-interface">
-<component name="fontandbitmapserver" long-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 name="opengles" long-name="OpenGLES" level="internal-adaptations">
-<component name="openglesinterface" long-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 name="opengles_stub" filter="sf_build" long-name="OpenGL ES Stub" purpose="optional" introduced="^2">
-<unit bldFile="os/graphics/opengles/openglesinterface/group/opengles_stub"/>
-</component>
-</collection>
-<collection name="openvg" long-name="OpenVG" level="internal-adaptations">
-<component name="openvginterface" long-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 name="openvg11" filter="s60" long-name="OpenVG 1.1">
-<!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
-<unit bldFile="os/graphics/openvg/openvginterface/group/openvg11"/>
-</component>
-<component name="sfopenvg" filter="sf_build" long-name="Khronos OpenVG Reference Implementation" introduced="^2" purpose="optional">
-<unit bldFile="os/graphics/openvg/openvgrefimplementation/sfopenvg/group"/>
-</component>
-</collection>
-<collection name="egl" long-name="EGL" level="internal-adaptations">
-<component name="eglinterface" long-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 name="eglswitch" long-name="EGL Switch" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglswitch/group" mrp="os/graphics/egl/eglswitch/group/graphics_eglswitch.mrp"/>
-</component>
-<component name="eglrefimpl" long-name="EGL Reference Implementation" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglrefimpl/group" mrp="os/graphics/egl/eglrefimpl/group/graphics_eglrefimpl.mrp"/>
-</component>
-<component name="egltest" long-name="EGL Tests" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/egl/egltest/group" mrp="os/graphics/egl/egltest/group/graphics_egltest.mrp"/>
-</component>
-</collection>
-<collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
-<component name="gdi" long-name="GDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/gdi/group" mrp="os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
-</component>
-<component name="bitgdi" long-name="BitGDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
-</component>
-<component name="colourpalette" long-name="Colour Palette" introduced="7.0s" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
-</component>
-<component name="screendriver" long-name="Screen Driver" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/graphicsdeviceinterface/screendriver/group" mrp="os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
-</component>
-<component name="directgdi" long-name="DirectGDI" introduced="^3" deprecated="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/directgdi/group" mrp="os/graphics/graphicsdeviceinterface/directgdi/group/graphics_directgdi.mrp"/>
-</component>
-<component name="directgdiinterface" long-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 name="directgdiadaptation" long-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"/>
-</component>
-</collection>
-<collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
-<component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/gdi_tools/group" mrp="os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
-</component>
-</collection>
-<collection name="graphicsapitest" long-name="Graphics API Tests" level="app-if"/>
-</block>
-<block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
-<collection name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" level="text">
-<component name="findutil_api" long-name="Find Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/findutil_api/group"/>
-</component>
-<component name="japanese_language_utilities_api" long-name="Japanese Language Utilities API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
-</component>
-<component name="sortutil_api" long-name="Sorting Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/sortutil_api/group"/>
-</component>
-</collection>
-<collection name="textandloc_pub" long-name="Text and Localisation Public Interfaces" level="text">
-<component name="directory_localizer_api" long-name="Directory Localizer API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_pub/directory_localizer_api/group"/>
-</component>
-</collection>
-<collection name="charconvfw" long-name="Character Conversion" level="encoding">
-<component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional">
-<unit bldFile="os/textandloc/charconvfw/charconv_fw/group" mrp="os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
-</component>
-<component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/charconvplugins/group" mrp="os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
-</component>
-<component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/fatfilenameconversionplugins/group" mrp="os/textandloc/charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
-</component>
-</collection>
-<collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
-<component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/textshaperplugin/group" mrp="os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
-</component>
-<component name="fontstore" long-name="Font Store" purpose="mandatory">
-<unit bldFile="os/textandloc/fontservices/fontstore/group" mrp="os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
-</component>
-<component name="textrendering" long-name="Text Rendering" purpose="mandatory" class="placeholder">
-<!-- placeholder for text code from GDI -->
-</component>
-<component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/freetypefontrasteriser/group" mrp="os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
-</component>
-<component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional">
-<unit bldFile="os/textandloc/fontservices/referencefonts/group" mrp="os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
-</component>
-</collection>
-<collection name="textlayout" long-name="Text Layout" level="text">
-<component name="texthandling" long-name="Text Handling" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/texthandling/group" mrp="os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
-</component>
-<component name="textformatting" long-name="Text Formatting" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/textformatting/group" mrp="os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
-</component>
-</collection>
-<collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
-<!-- components in this collection need to be moved to the right collection.
- Either move into the units' directories, or create a new textandlocutils directory -->
-<component name="numbergrouping" filter="s60" long-name="Number Grouping">
-<unit bldFile="os/textandloc/charconvfw/numbergrouping/group"/>
-</component>
-<component name="jplangutil" filter="s60" long-name="Japanese Language Utilities">
-<unit bldFile="os/textandloc/charconvfw/jplangutil/group"/>
-</component>
-<component name="sortutil" filter="s60" long-name="Sorting Utility">
-<unit bldFile="os/textandloc/charconvfw/sortutil/group"/>
-</component>
-<component name="inlinetext" filter="s60" long-name="Inline Text">
-<unit bldFile="os/textandloc/charconvfw/inlinetext/group"/>
-</component>
-<component name="nearestlangutil" long-name="Nearest Language Util" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-<component name="numberformatting" long-name="Number Formatting" introduced="7.0s" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/numberformatting/group" mrp="os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
-</component>
-</collection>
-<collection name="localesupport" long-name="Locale Support" level="util">
-<component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/localisation/localesupport" mrp="os/textandloc/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
-</component>
-<component name="initlocale" long-name="Initialise Locale" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-</collection>
-<collection name="textandloctools" long-name="Text and Localisation Tools" level="tools">
-<component name="fontcompiler" long-name="Font Compiler" purpose="development" class="placeholder PC">
-<!-- placeholder for split from GDI Tools -->
-</component>
-<component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/bitmapfonttools/group" mrp="os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
-</component>
-</collection>
-<collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
-<component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
-<collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
-<component name="xmlsrv_plat_build" long-name="XML Services Platform Interface Build" filter="s60" class="api">
-<!-- need to fix the configuration used here.
- Either destribute to other components or use the new feature flags confguration mechanisms.
- Remove this component and uncomment the other units when fixed-->
-<unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
-</component>
-<component name="xml_encryption_api" long-name="XML Encryption API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/> -->
-</component>
-<component name="xml_signature_api" long-name="XML Signature API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_signature_api/group"/> -->
-</component>
-<component name="xml_security_engine_utils_api" long-name="XML Security Engine Utils API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/> -->
-</component>
-</collection>
-<collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
-<component name="xmlseccertman" filter="s60" long-name="XML Security Certificate Manager">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
-</component>
-<component name="xmlsec" filter="s60" long-name="XML Security">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsec/group"/>
-</component>
-<component name="xmlseccrypto" filter="s60" long-name="XML Security Crypto">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccrypto/group"/>
-</component>
-<component name="xmlsecwrapper" filter="s60" long-name="XML Security Wrapper">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsecwrapper/group"/>
-</component>
-</collection>
-<collection name="xml" long-name="XML" level="generic">
-<component name="xmlfw" long-name="XML Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmlfw/group" mrp="os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
-</component>
-<component name="libxml2libs" long-name="Libxml2 Libraries" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/libxml2libs/group" mrp="os/xmlsrv/xml/libxml2libs/group/syslibs_libxml2.mrp"/>
-</component>
-<component name="legacyminidomparser" long-name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/legacyminidomparser/GROUP" mrp="os/xmlsrv/xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp"/>
-</component>
-<component name="xmldomandxpath" long-name="XML DOM and XPath" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmldomandxpath/group" mrp="os/xmlsrv/xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
-</component>
-<component name="xmlexpatparser" long-name="XML Expat Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmlexpatparser/group" mrp="os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
-</component>
-<component name="xmllibxml2parser" long-name="XML Libxml2 Parser" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmllibxml2parser/group" mrp="os/xmlsrv/xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
-</component>
-<component name="wbxmlparser" long-name="WBXML Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/wbxmlparser/group" mrp="os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
-</component>
-</collection>
-<collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
-<component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="deviceplatformrelease" level="services" long-name="Device Platform Release" levels="bld mid top">
-<collection name="s60extras" long-name="S60 Extras" level="mid">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="s60extras_build" filter="s60" long-name="S60 Extras Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/S60Extras/group"/>
-</component>
-</collection>
-<collection name="locfiles" long-name="Locale Files" level="mid">
-<component name="locfiles_build" filter="s60" long-name="S60 Locale Files Build" purpose="development" class="config">
-<!-- need to move component down a directory -->
-<unit bldFile="os/deviceplatformrelease/locfiles/group"/>
-</component>
-<component name="locfiles_set1" long-name="Locale Files Set 1" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set1"/>
-</component>
-<component name="locfiles_set2" long-name="Locale Files Set 2" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set2"/>
-</component>
-<component name="locfiles_set3" long-name="Locale Files Set 3" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set3"/>
-</component>
-<component name="locfiles_set4" long-name="Locale Files Set 4" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set4"/>
-</component>
-<component name="locfiles_set5" long-name="Locale Files Set 5" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set5"/>
-</component>
-<component name="locfiles_set6" long-name="Locale Files Set 6" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set6"/>
-</component>
-<!-- is the a problem with SF builds with the following? -->
-<component name="locfiles_set7" long-name="Locale Files Set 7" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set7"/>
-</component>
-<component name="locfiles_set8" long-name="Locale Files Set 8" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set8"/>
-</component>
-<component name="locfiles_set9" long-name="Locale Files Set 9" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set9"/>
-</component>
-<component name="locfiles_set10" long-name="Locale Files Set 10" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set10"/>
-</component>
-<component name="locfiles_set11" long-name="Locale Files Set 11" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set11"/>
-</component>
-<component name="locfiles_set12" long-name="Locale Files Set 12" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set12"/>
-</component>
-<component name="locfiles_set13" long-name="Locale Files Set 13" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set13"/>
-</component>
-<component name="locfiles_set14" long-name="Locale Files Set 14" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set14"/>
-</component>
-<component name="locfiles_set15" long-name="Locale Files Set 15" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set15"/>
-</component>
-<component name="locfiles_set16" long-name="Locale Files Set 16" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set16"/>
-</component>
-</collection>
-<collection name="version" long-name="Version" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="version_build" filter="s60" long-name="Version Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/Version/group"/>
-</component>
-</collection>
-<collection name="helps_loc2" long-name="Helps Locale 2" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helps_loc2_build" long-name="Helps Locale 2 Build" filter="s60">
-<unit bldFile="os/deviceplatformrelease/helps_loc2/group"/>
-</component>
-</collection>
-<collection name="sf_config" long-name="SF Config" level="mid">
-<component name="config" filter="s60" long-name="Config" purpose="development" class="config"/>
-<component name="cenrep" filter="sf_build" long-name="ConE Central Repository Config" purpose="development" class="config">
-<!-- will shoudl give the id/path something more unique than cenrep -->
-<unit bldFile="os/deviceplatformrelease/sf_config/cenrep/group"/>
-</component>
-</collection>
-<!-- should be located locally in buildplatforms/group
- <collection id="s60bld" name="S60 Build">
- <component id="buildplatforms" filter="s60" name="Build Platforms">
- <unit bldFile="/tools/buildplatforms/group"/>
- </component>
- </collection>-->
-<collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
-<component name="cedarutils" long-name="Cedar Utils" purpose="development">
-<unit mrp="os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
-</component>
-<component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt" purpose="development" class="config">
-<unit mrp="os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
-</component>
-<component name="foundation_s60_packages" long-name="Foundation S60 Packages" introduced="^3" deprecated="^3" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/symbianosbld/foundation_s60_packages/foundation_s60_packages.mrp"/>
-</component>
-</collection>
-<collection name="foundation_system" long-name="Foundation System" level="top">
-<component name="system_model" long-name="System Model" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
-</component>
-</collection>
-<collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
-<component name="deviceplatformrelease_metadata" long-name="Device Platform Release Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="osrndtools" level="services" long-name="OS R&D tools" levels="fw trace">
-<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"/>
-</component>
-<component name="testinterface" filter="s60" long-name="Test Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/testinterface/group"/>
-</component>
-<component name="testserver" filter="s60" long-name="Test Server" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserver/group"/>
-</component>
-<component name="testengine" filter="s60" long-name="Test Engine" purpose="development">
-<unit bldFile="os/osrndtools/stif/testengine/group"/>
-</component>
-<component name="testserverstarter" filter="s60" long-name="Test Server Starter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserverstarter/group"/>
-</component>
-<component name="stiftfwif" filter="s60" long-name="STIF Test Framework Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/stiftfwif/group"/>
-</component>
-<component name="consoleui" filter="s60" long-name="Console UI" purpose="development">
-<unit bldFile="os/osrndtools/stif/consoleui/group"/>
-</component>
-<component name="testcombiner" filter="s60" long-name="Test Combiner" purpose="development">
-<unit bldFile="os/osrndtools/stif/testcombiner/group"/>
-</component>
-<component name="demomodule" filter="s60" long-name="Demo Module" purpose="development">
-<unit bldFile="os/osrndtools/stif/demomodule/group"/>
-</component>
-<component name="atslogger" filter="s60" long-name="ATS Logger" purpose="development">
-<unit bldFile="os/osrndtools/stif/atslogger/group"/>
-</component>
-<component name="atsinterface" filter="s60" long-name="ATS Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/atsinterface/group"/>
-</component>
-<component name="testscripter" filter="s60" long-name="Test Scripter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testscripter/group"/>
-</component>
-<component name="suevent" filter="s60" long-name="SU Event" purpose="development">
-<unit bldFile="os/osrndtools/stif/suevent/group"/>
-</component>
-<component name="stifkerneltestclassbase" filter="s60" long-name="STIF Kernel Test Class Base" purpose="development">
-<!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
-<!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
-</component>
-<component name="stif_build" filter="s60" long-name="STIF Build" purpose="development">
-<!-- move exports into self-contained component. Remove this when configuration is in place-->
-<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">
-<unit bldFile="os/osrndtools/memspy/memspy_plat/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/engine/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/console/group"/>
-</component>
-<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>
-</collection>
-<collection name="hti" long-name="Harmonized Test Interface" level="trace">
-<component name="hti_plat" filter="s60" long-name="HTI Platform Interfaces" purpose="development" class="api">
-<unit bldFile="os/osrndtools/hti/hti_plat/group"/>
-</component>
-<component name="hticfg" filter="s60" long-name="HTI Config" purpose="development">
-<unit bldFile="os/osrndtools/hti/hticfg/group"/>
-</component>
-<component name="htiautostart" filter="s60" long-name="HTI Autostart" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiautostart/group"/>
-</component>
-<component name="htiframework" filter="s60" long-name="HTI Framework" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiframework/group"/>
-</component>
-<component name="hticommplugins" filter="s60" long-name="HTI Communication Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
-</component>
-<component name="htiserviceplugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
-</component>
-<component name="htifilehlp" filter="s60" long-name="HTI File Help" purpose="development">
-<unit bldFile="os/osrndtools/hti/htifilehlp/group"/>
-</component>
-<component name="htiwatchdog" filter="s60" long-name="HTI Watchdog" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiwatchdog/group"/>
-</component>
-<component name="hti_build" filter="s60" long-name="HTI Build" purpose="development">
-<!-- move exports into self-contained component.-->
-<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">
-<block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
-<collection name="appsupport_pub" long-name="Generic Application Support Public Interfaces" level="specific">
-<component name="flash_viewer_framework_api" long-name="Flash Viewer Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
-</component>
-<component name="network_status_api" long-name="Network Status API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/network_status_api/group"/>
-</component>
-</collection>
-<collection name="appsupport_plat" long-name="Generic Application Support Platform Interfaces" level="specific">
-<component name="action_plugin_api" long-name="Action Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/action_plugin_api/group"/>
-</component>
-<component name="application_orientation_api" long-name="Application Orientation API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/application_orientation_api/group"/>
-</component>
-<component name="context_access_api" long-name="Context Access API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_access_api/group"/>
-</component>
-<component name="context_framework_services_api" long-name="Context Framework Services API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_services_api/group"/>
-</component>
-<component name="context_framework_client_api" long-name="Context Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_client_api/group"/>
-</component>
-<component name="context_framework_listener_api" long-name="Context Framework Listener API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_listener_api/group"/>
-</component>
-<component name="context_framework_version_api" long-name="Context Framework Version API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_version_api/group"/>
-</component>
-<component name="context_source_plugin_api" long-name="Context Source Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_plugin_api/group"/>
-</component>
-<component name="context_source_settings_manager_api" long-name="Context Source Settings Manager API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_settings_manager_api/group"/>
-</component>
-<component name="context_subscription_api" long-name="Context Subscription API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_subscription_api/group"/>
-</component>
-<component name="key_event_framework_api" long-name="Key Event Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_api/group"/>
-</component>
-<component name="key_event_framework_mapper_api" long-name="Key Event Framework Mapper API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_mapper_api/group"/>
-</component>
-<component name="media_keys_definition_api" long-name="Media Keys Definition API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/media_keys_definition_api/group"/>
-</component>
-<component name="ood_threshold_api" long-name="OOD Threshold API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/ood_threshold_api/group"/>
-</component>
-<component name="oom_monitor_api" long-name="OOM Monitor API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_api/group"/>
-</component>
-<component name="oom_monitor_plugin_api" long-name="OOM Monitor Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_plugin_api/group"/>
-</component>
-<component name="operation_provider_api" long-name="Operation Provider API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/operation_provider_api/group"/>
-</component>
-<component name="phonecmdhandler_api" long-name="Phone Command Handler API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/phonecmdhandler_api/group"/>
-</component>
-<component name="restore_factory_settings_api" long-name="Restore Factory Settings API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_api/group"/>
-</component>
-<component name="restore_factory_settings_plugin_api" long-name="Restore Factory Settings Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_plugin_api/group"/>
-</component>
-<component name="secondary_display_accfw_api" long-name="Secondary Display Accessory Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_accfw_api/group"/>
-</component>
-<component name="secondary_display_startup_api" long-name="Secondary Display Startup API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_startup_api/group"/>
-</component>
-<component name="secondary_display_sysap_api" long-name="Secondary Display System Application API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_sysap_api/group"/>
-</component>
-<component name="secondary_display_system_state_api" long-name="Secondary Display System State API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_system_state_api/group"/>
-</component>
-<component name="sensor_user_setting_api" long-name="Sensor User Setting API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/sensor_user_setting_api/group"/>
-</component>
-<component name="startup_configuration_api" long-name="Startup Configuration API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/startup_configuration_api/group"/>
-</component>
-<component name="system_application_key_handler_plugin_api" long-name="System Application Key Handler Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_key_handler_plugin_api/group"/>
-</component>
-<component name="system_application_light_control_plugin_api" long-name="System Application Light Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_light_control_plugin_api/group"/>
-</component>
-<component name="system_application_notification_api" long-name="System Application Notification API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_notification_api/group"/>
-</component>
-<component name="system_application_plugin_callback_api" long-name="System Application Plug-in Callback API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
-</component>
-<component name="flash_mmi_service_interface_custom_api" long-name="Flash MMI Service Interface Custom API" filter="s60,!sf_build" introduced="^2" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/flash_mmi_service_interface_custom_api/group"/>
-</component>
-<component name="flash_netscape_plugin_command_api" long-name="Flash Netscape Plugin Command API" filter="s60,!sf_build" introduced="^2" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/flash_netscape_plugin_command_api/group"/>
-</component>
-</collection>
-<collection name="contextframework" long-name="Context Framework" level="framework">
-<!-- the units that are commented out need to be put back when configuration is in place.
- They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
-<component name="cfw" filter="s60" long-name="Context Framework">
-<!--<unit bldFile="contextframework/cfw/group"/> -->
-</component>
-<component name="cfwplugins" filter="s60" long-name="Context Framework Plugins" plugin="Y">
-<!--<unit bldFile="contextframework/cfwplugins/group"/>-->
-</component>
-<component name="contextframework_build" filter="s60" long-name="Context Framework Build">
-<unit bldFile="mw/appsupport/contextframework/group"/>
-</component>
-</collection>
-<collection name="coreapplicationuis" long-name="Core Application UIs" level="server">
-<component name="dbrecovery" filter="s60" long-name="Database Recovery">
-<unit bldFile="mw/appsupport/coreapplicationuis/dbrecovery/group"/>
-</component>
-<component name="nspswsplugin" filter="s60" long-name="NSPS WS Plugin" plugin="Y">
-<!-- No Service Power Save? Window Server? Please elaborate-->
-<unit bldFile="mw/appsupport/coreapplicationuis/nspswsplugin/group"/>
-</component>
-<component name="rfs" filter="s60" long-name="Restore Factory Settings">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfs/group"/>
-</component>
-<component name="rfsplugins" filter="s60" long-name="Restore Factory Settings Plugins" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/group"/>
-</component>
-<component name="sysap" filter="s60" long-name="System Application">
-<unit bldFile="mw/appsupport/coreapplicationuis/sysap/group"/>
-</component>
-<component name="variatedsettings" filter="s60" long-name="Variated Settings" class="config">
-<unit bldFile="mw/appsupport/coreapplicationuis/variatedsettings/group"/>
-</component>
-<component name="accfwuinotifier" filter="s60" long-name="Accessory Framework UI Notifier" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/accfwuinotifier/group"/>
-</component>
-<component name="kefmapper" filter="s60" long-name="Key Event Framework">
-<unit bldFile="mw/appsupport/coreapplicationuis/kefmapper/group"/>
-</component>
-<component name="advancedtspcontroller" filter="s60" long-name="Advanced TSP Controller">
-<unit bldFile="mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
-</component>
-<component name="powersaveutilities" filter="s60" long-name="Power Save Utilities">
-<unit bldFile="mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
-</component>
-<component name="gsserverenginestub" filter="s60" long-name="GS Server Engine Stub">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
-</component>
-<component name="gsserverengine" filter="s60" long-name="GS Server Engine">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverengine/group"/>
-</component>
-<component name="sensordatacompensatorplugin" filter="s60" long-name="Sensor Data Compensator Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/group"/>
-</component>
-<component name="atcmdplugin" long-name="AT Command Plugin" filter="s60,!oem_build" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/atcmdplugin/group"/>
-</component>
-</collection>
-<collection name="flashliteapi_3_1" long-name="Flash Lite API 3.1" level="specific">
-<!-- collection is really a component. Move down a directory -->
-<component name="flashliteapi_3_1_build" long-name="Flash Lite API Build" filter="s60" introduced="^2"/>
-</collection>
-<collection name="mediakeys" long-name="Media Keys" level="plugin">
-<!-- collection is really a component. Move down a directory -->
-<component name="mediakeys_build" filter="s60" long-name="Media Keys Build">
-<unit bldFile="mw/appsupport/mediakeys/group"/>
-</component>
-</collection>
-<collection name="startupservices" long-name="Startup Services" level="system">
-<component name="splashscreen" filter="s60" long-name="Splash Screen">
-<unit bldFile="mw/appsupport/startupservices/splashscreen/group"/>
-</component>
-<component name="startupanimation" filter="s60" long-name="Startup Animation">
-<unit bldFile="mw/appsupport/startupservices/startupanimation/group"/>
-</component>
-<component name="startup" long-name="Startup Application" filter="s60">
-<unit bldFile="mw/appsupport/startupservices/startup/group"/>
-</component>
-</collection>
-<collection name="sysresmonitoring" long-name="System Resource Monitoring" level="system">
-<component name="oodmonitor" filter="s60" long-name="OOD Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oodmonitor/group"/>
-</component>
-<component name="oommonitor" filter="s60" long-name="OOM Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oommonitor/group"/>
-</component>
-</collection>
-<collection name="systemsettings" long-name="System Settings" level="system">
-<component name="gssensorplugin" filter="s60" long-name="GS Sensor Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gssensorplugin/group"/>
-</component>
-<component name="gsaccessoryplugin" filter="s60" long-name="GS Accessory Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gsaccessoryplugin/group"/>
-</component>
-</collection>
-<collection name="filehandling" long-name="File Handling" level="server">
-<component name="fileconverterfw" long-name="File Converter Framework" purpose="optional">
-<unit bldFile="mw/appsupport/filehandling/fileconverterfw/group" mrp="mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
-</component>
-<component name="htmltorichtextconverter" long-name="HTML to RichText Converter" introduced="7.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/htmltorichtextconverter/group" mrp="mw/appsupport/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
-</component>
-<component name="richtexttohtmlconverter" long-name="RichText to HTML Converter" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
-</component>
-</collection>
-<collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
-<component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
-</component>
-</collection>
-<collection name="commonappservices" long-name="Common Application Services" level="framework">
-<component name="alarmserver" long-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"/>
-</component>
-<component name="alarmservertest" long-name="Alarm Server Test" deprecated="^3" introduced="8.1" purpose="development">
-<unit bldFile="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
-</component>
-<component name="appservicesdocs" long-name="Application Services Documentation" purpose="development" class="doc">
-<unit mrp="mw/appsupport/commonappservices/appservicesdocs/app-services_documentation.mrp"/>
-</component>
-<component name="backuprestorenotification" long-name="Backup Restore Notification" introduced="8.1" purpose="optional">
-<unit bldFile="mw/appsupport/commonappservices/backuprestorenotification/group" mrp="mw/appsupport/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
-</component>
-</collection>
-<collection name="tzservices" long-name="Time Zone Services" level="plugin">
-<component name="tzserver" long-name="Time Zone Server" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzserver/group" mrp="mw/appsupport/tzservices/tzserver/group/app-services_tz.mrp"/>
-</component>
-<component name="tzloc" long-name="Time Zone Localization" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzloc/group" mrp="mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
-</component>
-<component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzlocrscfactory/group" mrp="mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
-</component>
-<component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzdatabase/group" mrp="mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
-</component>
-</collection>
-<collection name="contenthandling" long-name="Content Handling" level="plugin">
-<component name="webrecognisers" long-name="Web Recognisers" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/contenthandling/webrecognisers/group" mrp="mw/appsupport/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
-</component>
-</collection>
-<collection name="openenvutils" long-name="Open Environment Utilities" level="specific">
-<component name="commandshell" long-name="Command Shell" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/commandshell/group" mrp="mw/appsupport/openenvutils/commandshell/group/oetools_zsh.mrp"/>
-</component>
-<component name="telnetserver" long-name="Telnet Server" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/telnetserver/group" mrp="mw/appsupport/openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
-</component>
-</collection>
-<collection name="printingsupport" long-name="Printing Support" level="generic">
-<component name="printinguisupport" long-name="Printing UI Support" purpose="optional" introduced="^2" deprecated="^3">
-<unit bldFile="mw/appsupport/printingsupport/printinguisupport/group" mrp="mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
-</component>
-</collection>
-<collection name="appfw" long-name="Application Framework" level="framework">
-<component name="apparchitecture" long-name="Application Architecture" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/apparchitecture/group" mrp="mw/appsupport/appfw/apparchitecture/group/app-framework_apparc.mrp"/>
-</component>
-<component name="viewserver" long-name="View Server" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/viewserver/group" mrp="mw/appsupport/appfw/viewserver/group/app-framework_viewsrv.mrp"/>
-</component>
-</collection>
-<collection name="applaunchservices" long-name="Application Launch Services" level="generic">
-<component name="aftermarketappstarter" long-name="After Market Application Starter" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/aftermarketappstarter/group" mrp="mw/appsupport/applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
-</component>
-<component name="applaunchplugins" long-name="Application Launch Plugins" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/applaunchplugins/group" mrp="mw/appsupport/applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
-</component>
-</collection>
-<collection name="tzpcside" long-name="Time Zone PC Side" level="plugin">
-<component name="tzcompiler" long-name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config PC">
-<unit bldFile="mw/appsupport/tzpcside/tzcompiler/group" mrp="mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
-</component>
-</collection>
-<collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
-<component name="appsupport_metadata" long-name="Generic Application Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="securitysrv" level="generic" long-name="Security Services" levels="plugin framework server generic specific">
-<collection name="secsrv_plat" long-name="Security Services Platform Interfaces" level="specific">
-<component name="cms_api" long-name="CMS API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/cms_api/group"/>
-</component>
-<component name="pkcs12_parser_api" long-name="PKCS12 Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkcs12_parser_api/group"/>
-</component>
-<component name="java_utils_api" long-name="Java Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/java_utils_api/group"/>
-</component>
-<component name="wim_cert_api" long-name="WIM Cert API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/wim_cert_api/group"/>
-</component>
-<component name="device_key_store_encryption_plugin_api" long-name="Device Key Store Encryption Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/device_key_store_encryption_plugin_api/group"/>
-</component>
-<component name="x509certnameparser_api" long-name="X.509 Certificate Name Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
-</component>
-<component name="remote_lock_api" long-name="Remote Lock API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
-</component>
-<component name="pkidialog_api" long-name="PKI Dialog API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
-</component>
-<component name="provisioning_api" long-name="Provisioning API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/provisioning_api/group"/>
-</component>
-<component name="keyguard_configuration_api" long-name="Keyguard Configuration API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_configuration_api/group"/>
-</component>
-<component name="keylock_policy_api" long-name="Keylock Policy API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keylock_policy_api/group"/>
-</component>
-<component name="security_code_ui_api" long-name="Security Code UI API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
-</component>
-<component name="gba_api" long-name="GBA API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/gba_api/group"/>
-</component>
-<component name="keyguard_access_api" long-name="Keyguard Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_access_api/group"/>
-</component>
-<component name="devicelock_access_api" long-name="Device Lock Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devicelock_access_api/group"/>
-</component>
-<component name="lockapp_server_api" long-name="Lock Application Server API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
-</component>
-<component name="devencadaptation_api" long-name="Device Encryption Adaptation API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
-</component>
-<component name="devenccommonutils_api" long-name="Device Encryption Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
-</component>
-</collection>
-<collection name="cms" long-name="Certificate Management Service" level="server">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="cms_build" filter="s60" long-name="CMS" introduced="^3">
-<unit bldFile="mw/securitysrv/cms/group"/>
-</component>
-</collection>
-<collection name="pkiutilities" long-name="PKI Utilities" level="plugin">
-<component name="x509certnameparser" filter="s60" long-name="X.509 Certificate Name Parser">
-<unit bldFile="mw/securitysrv/pkiutilities/x509certnameparser/group"/>
-</component>
-<component name="pkcs12" filter="s60" long-name="PKCS #12">
-<unit bldFile="mw/securitysrv/pkiutilities/pkcs12/group"/>
-</component>
-<component name="certmanui" filter="s60" long-name="Certificate Management UI">
-<unit bldFile="mw/securitysrv/pkiutilities/certmanui/group"/>
-</component>
-<component name="ctsecuritydialogs" filter="s60" long-name="Crypto Token Security Dialogs">
-<unit bldFile="mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
-</component>
-<component name="certsaver" filter="s60" long-name="Certificate Saver">
-<unit bldFile="mw/securitysrv/pkiutilities/certsaver/group"/>
-</component>
-<component name="secmodui" filter="s60" long-name="Security Module UI">
-<unit bldFile="mw/securitysrv/pkiutilities/secmodui/group"/>
-</component>
-<component name="devicetoken" filter="s60" long-name="Device Token">
-<unit bldFile="mw/securitysrv/pkiutilities/devicetoken/group"/>
-</component>
-<component name="certificates" filter="s60" long-name="Certificates">
-<unit bldFile="mw/securitysrv/pkiutilities/Certificates/group" filter="sf_build"/>
-</component>
-<component name="pkiutilities_build" filter="s60" long-name="PKI Utilities Build">
-<!-- need to split this into the above components -->
-<unit bldFile="mw/securitysrv/pkiutilities/group"/>
-</component>
-<component name="ocsp" long-name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
-<unit bldFile="mw/securitysrv/pkiutilities/ocsp/group" mrp="mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
-</component>
-</collection>
-<collection name="wim" long-name="Wireless Identity Module " level="framework">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="wim_build" filter="s60" long-name="WIM Build">
-<unit bldFile="mw/securitysrv/wim/group"/>
-</component>
-</collection>
-<collection name="remotelock" long-name="Remote Lock" level="generic">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="remotelock_build" filter="s60" long-name="Remote Lock Build">
-<unit bldFile="mw/securitysrv/remotelock/group"/>
-</component>
-</collection>
-<collection name="securitydialogs" long-name="Security Dialogs" level="specific">
-<component name="keylockpolicyapi" filter="s60" long-name="Keylock Policy API">
-<unit bldFile="mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
-</component>
-<component name="autolock" long-name="Autolock" filter="s60">
-<unit bldFile="mw/securitysrv/securitydialogs/autolock/group"/>
-</component>
-<component name="secui" filter="s60" long-name="Security UI">
-<unit bldFile="mw/securitysrv/securitydialogs/secui/group"/>
-</component>
-<component name="securitynotifier" filter="s60" long-name="Security Notifier">
-<unit bldFile="mw/securitysrv/securitydialogs/securitynotifier/group"/>
-</component>
-<component name="lockclient" filter="s60" long-name="Lock Client" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockclient/group"/>
-</component>
-<component name="lockapp" filter="s60" long-name="Lock Application" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockapp/group"/>
-</component>
-<component name="secuinotifications" long-name="Security UI Notifications" introduced="^4" filter="s60">
-<unit bldFile="mw/securitysrv/securitydialogs/secuinotifications" proFile="secuinotifications.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="boottimeintegritycheck_build" filter="s60" long-name="Boot Time Integrity Check Build">
-<unit bldFile="mw/securitysrv/boottimeintegritycheck/group"/>
-</component>
-</collection>
-<collection name="gba" long-name="Generic Bootstrapping Architecture" level="server">
-<component name="uicc" filter="s60" long-name="UICC" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/uicc/group"/>
-</component>
-<component name="gbaserver" filter="s60" long-name="GBA Server" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaserver/group"/>
-</component>
-<component name="gbaapi" filter="s60" long-name="GBA API" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaapi/group"/>
-</component>
-<component name="gbafilter" filter="s60" long-name="GBA HTTP Filter" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/gbafilter/group"/>
-</component>
-<component name="gba_build" filter="s60" long-name="Generic Boot Architecture Build" introduced="^2">
-<!-- need to split this into the above components, or remove #includes and make this GBA ROM -->
-<unit bldFile="mw/securitysrv/gba/group"/>
-</component>
-</collection>
-<collection name="devencdiskutils" long-name="Device Encryption Disk Utils" level="server">
-<component name="devenccommonutils" filter="s60" long-name="Device Encryption Common Utils" introduced="^3">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncCommonUtils/group"/>
-</component>
-<component name="devencrfsplugin" filter="s60" long-name="Device Encryption RFS Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncRfsPlugin/group"/>
-</component>
-<component name="pk5recognizer" filter="s60" long-name="Device Encryption Pk5 Recognizer" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/Pk5Recognizer/group"/>
-</component>
-<component name="devencstarter" filter="s60" long-name="Device Encryption Starter" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncStarter/group"/>
-</component>
-<component name="devencdiskutils" filter="s60" long-name="Device Encryption Disk Utils Build" introduced="^3">
-<!-- need to split this into the above components, or remove #includes and make this a ROM component-->
-<unit bldFile="mw/securitysrv/devencdiskutils/group"/>
-</component>
-</collection>
-<collection name="securitysrv_info" long-name="Security Services Info" level="specific">
-<component name="securitysrv_metadata" long-name="Security Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="drm" level="generic" long-name="DRM" levels="plugin framework server generic specific">
-<collection name="drm_plat" long-name="DRM Platform Interfaces" level="specific">
-<component name="roap_api" long-name="ROAP API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/roap_api/group"/>
-</component>
-<component name="drm_common_api" long-name="DRM Common API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_common_api/group"/>
-</component>
-<component name="drm_rights_api" long-name="DRM Rights API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_rights_api/group"/>
-</component>
-<component name="drm_legacy_api" long-name="DRM Legacy API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_legacy_api/group"/>
-</component>
-<component name="dcf_repository_api" long-name="DCF Repository API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/dcf_repository_api/group"/>
-</component>
-<component name="drm_service_api" long-name="DRM Service API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_service_api/group"/>
-</component>
-<component name="drm_secondary_display_api" long-name="DRM Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_secondary_display_api/group"/>
-</component>
-<component name="drm_license_manager_api" long-name="DRM License Manager API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_license_manager_api/group"/>
-</component>
-<component name="drm_utility_api" long-name="DRM Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_utility_api/group"/>
-</component>
-<component name="drm_agents_api" long-name="DRM Agents API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_agents_api/group"/>
-</component>
-<component name="wmdrm_core_api" long-name="WM DRM Core API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_core_api/group"/>
-</component>
-<component name="wmdrm_access_api" long-name="WMDRM Access API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_access_api/group"/>
-</component>
-<component name="camese_utility_api" long-name="Camese Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_utility_api/group"/>
-</component>
-<component name="camese_framework_api" long-name="Camese Framework API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_framework_api/group"/>
-</component>
-</collection>
-<collection name="drm_pub" long-name="DRM Public Interfaces" level="specific">
-<component name="drm_helper_api" long-name="DRM Helper API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_helper_api/group"/>
-</component>
-<component name="oma_drm_caf_agent_api" long-name="OMA DRM CAF Agent API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/group"/>
-</component>
-<component name="drm_license_checker_api" long-name="DRM License Checker API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_license_checker_api/group"/>
-</component>
-</collection>
-<collection name="commondrm" long-name="Common DRM" level="generic">
-<!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
-<component name="drmencryptor" filter="s60" long-name="DRM Encryptor" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmsettingsplugin" filter="s60" long-name="DRM Settings Plugin" plugin="Y" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmrightsmanagerui" filter="s60" long-name="DRM Rights Manager UI">
-<unit bldFile="mw/drm/commondrm/drmrightsmanagerui/help/group"/>
-</component>
-<component name="drmutility" filter="s60" long-name="DRM Utility">
-<!-- Uncomment unit when configuration is in place. Currently #included from commondrm_build -->
-<!--<unit bldFile="commondrm/drmutility/group"/>-->
-</component>
-<component name="drmserviceapiwrapper" filter="s60" long-name="DRM Service API Wrapper">
-<unit bldFile="mw/drm/commondrm/drmserviceapiwrapper/group"/>
-</component>
-<component name="drmrightsstoringlocation" filter="s60" long-name="DRM Rights Storing Location">
-<unit bldFile="mw/drm/commondrm/drmrightsstoringlocation/group"/>
-</component>
-<component name="commondrm_build" filter="s60" long-name="Common DRM Build">
-<!-- should be split into the above files, or them collapsed into a single component -->
-<unit bldFile="mw/drm/commondrm/group"/>
-</component>
-</collection>
-<collection name="omadrm" long-name="OMA DRM" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="omadrm_build" filter="s60" long-name="OMA DRM Build">
-<unit bldFile="mw/drm/omadrm/group"/>
-</component>
-<component name="foundationcerts" filter="sf_build" long-name="Foundation Certificates">
-<unit bldFile="mw/drm/omadrm/foundationcerts/group"/>
-</component>
-</collection>
-<collection name="wmdrm" long-name="Windows Media DRM" level="framework">
-<!-- collection is really a component. Move down a directory -->
-<component name="wmdrm_build" filter="s60" long-name="WM DRM Build">
-<unit bldFile="mw/drm/wmdrm/group"/>
-</component>
-</collection>
-<collection name="drm_info" long-name="DRM Info" level="specific"/>
-</block>
-<block name="locationsrv" level="specific" long-name="Location Services" levels="plugin fw server if">
-<collection name="locsrv_pub" long-name="Location Services Public Interfaces" level="if">
-<component name="landmarks_search_api" long-name="Landmarks Search API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
-</component>
-<component name="landmarks_api" long-name="Landmarks API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/group"/>
-</component>
-<component name="landmarks_database_management_api" long-name="Landmarks Database Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/group"/>
-</component>
-<component name="location_triggering_api" long-name="Location Triggering API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/location_triggering_api/group"/>
-</component>
-<component name="blid_application_satellite_info_api" long-name="BLID Application Satellite Info API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/group"/>
-</component>
-</collection>
-<collection name="locsrv_plat" long-name="Location Services Platform Interfaces" level="if">
-<component name="map_and_navigation_api" long-name="Map and Navigation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/group"/>
-</component>
-<component name="map_and_navigation_provider_discovery_api" long-name="Map and Navigation Provider Discovery API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/group"/>
-</component>
-<component name="geocoding_api" long-name="Geocoding API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
-</component>
-<component name="map_image_api" long-name="Map Image API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/group"/>
-</component>
-<component name="map_and_navigation_aiw_api" long-name="Map and Navigation AIW API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_aiw_api/group"/>
-</component>
-<component name="map_and_navigation_provider_api" long-name="Map and Navigation Provider API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_api/group"/>
-</component>
-<component name="landmarks_category_definition_api" long-name="Landmarks Category Definition API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
-</component>
-<component name="supl_settings_api" long-name="SUPL Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
-</component>
-<component name="location_settings_launch_api" long-name="Location Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/group"/>
-</component>
-<component name="map_image_conversion_plugin_api" long-name="Map Image Conversion Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/group"/>
-</component>
-<component name="psy_configuration_ui_plugin_api" long-name="PSY Configuration UI Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/psy_configuration_ui_plugin_api/group"/>
-</component>
-<component name="np_proxy_configuration_api" long-name="NP Proxy Configuration API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/np_proxy_configuration_api/group"/>
-</component>
-<component name="supl_terminal_initiation_api" long-name="SUPL Terminal Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/group"/>
-</component>
-<component name="location_notation_preferences_settings_api" long-name="Location Notation Preferences Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_notation_preferences_settings_api/group"/>
-</component>
-<component name="supl_settings_notifier_secondary_display_api" long-name="SUPL Settings Notifier Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_notifier_secondary_display_api/group"/>
-</component>
-<component name="supl_network_initiation_api" long-name="SUPL Network Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/group"/>
-</component>
-<component name="privacy_notifiers_secondary_display_api" long-name="Privacy Notifiers Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/privacy_notifiers_secondary_display_api/group"/>
-</component>
-<component name="oma_supl_configuration_parameter_api" long-name="OMA SUPL Configuration Parameter API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_configuration_parameter_api/group"/>
-</component>
-<component name="supl_query_secondary_display_api" long-name="SUPL Query Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_query_secondary_display_api/group"/>
-</component>
-<component name="location_triggering_management_api" long-name="Location Triggering Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_management_api/group"/>
-</component>
-<component name="location_triggering_status_information_api" long-name="Location Triggering Status Information API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_status_information_api/group"/>
-</component>
-<component name="oma_supl_asn_codec_plugin_api" long-name="OMA SUPL ASN Codec Plugin API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
-</component>
-<component name="query_and_notification_api" long-name="Query and Notification API" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/query_and_notification_api/group"/>
-</component>
-<component name="location_local_variation_api" long-name="Location Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_local_variation_api/group"/>
-</component>
-</collection>
-<collection name="genericpositioningplugins" long-name="Generic Positioning Plugins" level="plugin">
-<component name="locationnpppsy" filter="s60" long-name="Location Positioning Proxy PSY" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
-</component>
-<component name="locationsuplpsy" filter="s60" long-name="Location SUPL PSY" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationsuplpsy/group"/>
-</component>
-<component name="genericpositioningplugins_build" filter="s60" long-name="Generic Positioning Plugins Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/genericpositioningplugins/group"/>
-</component>
-</collection>
-<collection name="landmarks" long-name="Landmarks" level="server">
-<component name="locationlandmarks" filter="s60" long-name="Location Landmarks">
-<unit bldFile="mw/locationsrv/landmarks/locationlandmarks/group"/>
-</component>
-</collection>
-<collection name="locationmapnavfw" long-name="Location Map and Navigation Framework" level="fw">
-<component name="mnlibrary" filter="s60" long-name="Map and Navigation Library">
-<unit bldFile="mw/locationsrv/locationmapnavfw/library/group"/>
-</component>
-<component name="mnaiwprovider" filter="s60" long-name="Map and Navigation AIW Provider" plugin="Y">
-<unit bldFile="mw/locationsrv/locationmapnavfw/aiwprovider/group"/>
-</component>
-<component name="locationmapnavfw_build" filter="s60" long-name="Location Map and Navigation Framework Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/locationmapnavfw/group"/>
-</component>
-</collection>
-<collection name="locationsystemui" long-name="Location System UI" level="if">
-<component name="locationsysui" filter="s60" long-name="Location System UI">
-<unit bldFile="mw/locationsrv/locationsystemui/locationsysui/group"/>
-</component>
-</collection>
-<collection name="supl" long-name="SUPL" level="fw">
-<component name="locationsuplfw" filter="s60" long-name="Location SUPL Framework">
-<unit bldFile="mw/locationsrv/supl/locationsuplfw/group"/>
-</component>
-<component name="locationomasuplprotocolhandler" filter="s60" long-name="OMA SUPL Protocol Handler">
-<unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/group"/>
-</component>
-<component name="supltiapiimplementation" filter="s60" long-name="SUPL TI API Implementation" introduced="^3">
-<unit bldFile="mw/locationsrv/supl/supltiapiimplementation/group"/>
-</component>
-</collection>
-<collection name="locationtriggering" long-name="Location Triggering" level="server">
-<component name="ltlogger" filter="s60" long-name="LT Logger">
-<unit bldFile="mw/locationsrv/locationtriggering/ltlogger/group"/>
-</component>
-<component name="ltclientlib" filter="s60" long-name="LT Client Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltclientlib/group"/>
-</component>
-<component name="ltmanagementlib" filter="s60" long-name="LT Management Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmanagementlib/group"/>
-</component>
-<component name="ltcontainer" filter="s60" long-name="LT Container">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontainer/group"/>
-</component>
-<component name="ltserver" filter="s60" long-name="LT Server">
-<unit bldFile="mw/locationsrv/locationtriggering/ltserver/group"/>
-</component>
-<component name="ltstrategypluginapi" filter="s60" long-name="LT Strategy Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategypluginapi/group"/>
-</component>
-<component name="ltstrategyengine" filter="s60" long-name="LT Strategy Engine">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategyengine/group"/>
-</component>
-<component name="ltmovementdetectionpluginapi" filter="s60" long-name="Movement Detection Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmovementdetectionpluginapi/group"/>
-</component>
-<component name="ltcellidmovementdetector" filter="s60" long-name="Cell ID Movement Detector">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/>
-</component>
-<component name="lbtmgmtui" filter="s60" long-name="LBT Management UI" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/lbtmgmtui/group"/>
-</component>
-<component name="ltcontextsourceplugin" filter="s60" long-name="LT Context Source Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontextsourceplugin/group"/>
-</component>
-<component name="locationtriggering_build" filter="s60" long-name="Location Triggering Build">
-<!-- should remove #include from this and maybe put exports in the above components -->
-<unit bldFile="mw/locationsrv/locationtriggering/group"/>
-</component>
-</collection>
-</block>
-<block name="accesssec" level="generic" long-name="Access Security" levels="plugin framework server generic specific">
-<collection name="accesssec_plat" long-name="Access Security Platform Interfaces" level="specific">
-<component name="wapi_security_settings_ui_api" long-name="WAPI Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_security_settings_ui_api/group"/>
-</component>
-<component name="wep_security_settings_ui_api" long-name="WEP Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wep_security_settings_ui_api/group"/>
-</component>
-<component name="wi-fi_protected_setup_ui_api" long-name="Wi-Fi Protected Setup UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
-</component>
-<component name="wlan_eap_settings_ui_api" long-name="WLAN EAP Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wlan_eap_settings_ui_api/group"/>
-</component>
-<component name="wpa_security_settings_ui_api" long-name="WPA Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wpa_security_settings_ui_api/group"/>
-</component>
-<component name="eap_vpn_api" long-name="EAP VPN API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
-</component>
-<component name="eapsim_db_api" long-name="EAP-SIM DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapsim_db_api/group"/>
-</component>
-<component name="eap_type_api" long-name="EAP Type API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_type_api/group"/>
-</component>
-<component name="eaptlspeap_db_api" long-name="EAP-TLS-PEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eaptlspeap_db_api/group"/>
-</component>
-<component name="eapleap_db_api" long-name="LEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapleap_db_api/group"/>
-</component>
-<component name="eapgtc_db_api" long-name="EAP-GTC DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapgtc_db_api/group"/>
-</component>
-<component name="eapmschapv2_db_api" long-name="EAP-MSCHAPV2 DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapmschapv2_db_api/group"/>
-</component>
-<component name="eapaka_db_api" long-name="EAP-AKA DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapaka_db_api/group"/>
-</component>
-<component name="wapi_db_api" long-name="WAPI DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_db_api/group"/>
-</component>
-</collection>
-<collection name="wlansecuritysettings" long-name="WLAN Security Settings" level="specific">
-<component name="wapisecuritysettingsui" filter="s60" long-name="WAPI Security Settings UI" introduced="9.1">
-<!-- the directory for this needs to be moved up to the right level -->
-<unit bldFile="mw/accesssec/wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
-</component>
-<component name="wepsecuritysettingsui" filter="s60" long-name="WEP Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wepsecuritysettingsui/group"/>
-</component>
-<component name="wifiprotectedsetup" filter="s60" long-name="WIFI Protected Setup" introduced="^1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wifiprotectedsetup/group"/>
-</component>
-<component name="wlaneapsettingsui" filter="s60" long-name="WLAN EAP Settings UI" introduced="9.3">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wlaneapsettingsui/group"/>
-</component>
-<component name="wpasecuritysettingsui" filter="s60" long-name="WPA Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wpasecuritysettingsui/group"/>
-</component>
-</collection>
-<collection name="eapol" long-name="EAPOL" level="framework">
-<component name="eapol_framework" filter="s60" long-name="EAPOL Framework" introduced="9.2">
-<unit bldFile="mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
-</component>
-</collection>
-</block>
-<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>
-<component name="bearer_settings_plugin_api" long-name="Bearer Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/bearer_settings_plugin_api/group"/>
-</component>
-<component name="commsdat_wlan_api" long-name="CommsDat WLAN API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/commsdat_wlan_api/group"/>
-</component>
-<component name="connection_monitor_extension_api" long-name="Connection Monitor Extension API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_monitor_extension_api/group"/>
-</component>
-<component name="connection_ui_utilities_api" long-name="Connection UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_ui_utilities_api/group"/>
-</component>
-<component name="disconnect_dialog_api" long-name="Disconnect Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_api/group"/>
-</component>
-<component name="disconnect_dialog_disable_api" long-name="Disconnect Dialog Disable API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_disable_api/group"/>
-</component>
-<component name="extended_connection_settings_api" long-name="Extended Connection Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/extended_connection_settings_api/group"/>
-</component>
-<component name="mpm_default_connection_api" long-name="MPM Default Connection API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_default_connection_api/group"/>
-</component>
-<component name="pdpcontextmanager2_reset_factory_settings_api" long-name="PDP Context Manager 2 Reset Factory Settings API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_settings_api/group"/>
-</component>
-<component name="mpm_connect_screen_api" long-name="MPM Connect Screen API" filter="s60" class="api">
-<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="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>
-<component name="access_point_engine_api" long-name="Access Point Engine API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_monitor_server_api/group"/>
-</component>
-<component name="connection_settings_ui_api" long-name="Connection Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_ui_api/group"/>
-</component>
-<component name="agent_dialog_api" long-name="Agent Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/agent_dialog_api/group"/>
-</component>
-<component name="extendedconnpref_api" long-name="Extended Connection Preferences API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/extendedconnpref_api/group"/>
-</component>
-</collection>
-<collection name="accesspointcontrol" long-name="Access Point Control" level="plugin">
-<component name="apcontrollistplugin" filter="s60" long-name="Access Point Control List Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
-</component>
-</collection>
-<collection name="alwayson_net_plugin" long-name="Always Online Net Plugin" level="server">
-<component name="pdpcontextmanager2" filter="s60" long-name="PDP Context Manager 2">
-<unit bldFile="mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
-</component>
-</collection>
-<collection name="apengine" long-name="Access Point Engine" level="framework">
-<component name="apeng" filter="s60" long-name="Access Point Engine">
-<unit bldFile="mw/ipconnmgmt/apengine/apeng/group"/>
-</component>
-<component name="apsettingshandlerui" filter="s60" long-name="Access Point Settings Handler UI">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingshandlerui/group"/>
-</component>
-<component name="apsettingsplugin" filter="s60" long-name="Access Point Settings Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="bearermanagement" long-name="Bearer Management" level="framework">
-<component name="mpm" filter="s60" long-name="Mobility Policy Manager">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/mpm/group"/>
-</component>
-<component name="extendedconnpref" filter="s60" long-name="Extended Connection Preferences">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/extendedconnpref/group"/>
-</component>
-<component name="s60mcpr" filter="s60" long-name="S60 Meta-Connection Provider" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/S60MCPR/group"/>
-</component>
-</collection>
-<collection name="cmmanager" long-name="Connection Method Manager" level="framework">
-<component name="cmmgr" filter="s60" long-name="CM Manager">
-<unit bldFile="mw/ipconnmgmt/cmmanager/cmmgr/group"/>
-</component>
-<component name="gsconnsettingsplugin" filter="s60" long-name="GS Connection Settings Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/cmmanager/gsconnsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="connectionmonitoring" long-name="Connection Monitoring" level="server">
-<component name="connectionmonitorplugin" filter="s60" long-name="Connection Monitor Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorplugin/group"/>
-</component>
-<component name="connectionmonitorui" filter="s60" long-name="Connection Monitor UI">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorui/group"/>
-</component>
-<component name="connmon" filter="s60" long-name="Connection Monitor">
-<!-- either split into two components, or #include from a common bld.inf -->
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/connectionmonitor/group"/>
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/dataconnectionlogger/group"/>
-</component>
-<component name="connmonext" filter="s60" long-name="Connection Monitor Extension API">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmonext/group"/>
-</component>
-</collection>
-<collection name="connectionutilities" long-name="Connection Utilities" level="utils">
-<component name="connectiondialogs" filter="s60" long-name="Connection Dialogs">
-<unit bldFile="mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/>
-</component>
-</collection>
-<collection name="dbcreator" long-name="DB Creator" level="utils">
-<component name="commsdatcreator" filter="s60" long-name="Comms Database Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
-</component>
-<component name="commsdatcreatorrfsplugin" filter="s60" long-name="Comms Database Creator RFS Plugin" introduced="9.3" plugin="Y">
-<!-- uncomment when config is turned on -->
-<!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
-</component>
-<component name="commsdatstartup" filter="s60" long-name="Comms Database Startup" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
-</component>
-<component name="dbcreatorexe" filter="s60" long-name="DB Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
-</component>
-<component name="dbcreator_build" filter="s60" long-name="DB Creator Build" introduced="9.3">
-<!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
-<unit bldFile="mw/ipconnmgmt/dbcreator/group"/>
-</component>
-</collection>
-<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"/>
-</component>
-<component name="ipcm_qt_build" long-name="IP Connectivity Management Qt Build" introduced="^4">
-<unit bldFile="mw/ipconnmgmt" proFile="ipconnmgmt.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</block>
-<block name="netprotocols" level="generic" long-name="High-level Internet Protocols" levels="plugin framework server generic specific">
-<collection name="netprotocols_plat" long-name="High-level Internet Protocols Platform Interfaces" level="specific">
-<component name="cookie_manager_api" long-name="Cookie Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/cookie_manager_api/group"/>
-</component>
-<component name="http_cache_mgr_api" long-name="HTTP Cache Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_cache_mgr_api/group"/>
-</component>
-<component name="http_filters_api" long-name="HTTP Filters API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_filters_api/group"/>
-</component>
-</collection>
-<collection name="httpfilters" long-name="HTTP Filters" level="plugin">
-<component name="httpfiltercommon" filter="s60" long-name="HTTP Filter Common">
-<unit bldFile="mw/netprotocols/httpfilters/httpfiltercommon/group"/>
-</component>
-<component name="cookie" filter="s60" long-name="Cookie Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/cookie/group"/>
-</component>
-<component name="deflatefilter" filter="s60" long-name="Deflate Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/deflatefilter/group"/>
-</component>
-<component name="httpfilteracceptheader" filter="s60" long-name="Accept Header Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteracceptheader/group"/>
-</component>
-<component name="httpfilterauthentication" filter="s60" long-name="Authentication Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterauthentication/group"/>
-</component>
-<component name="httpfilterconnhandler" filter="s60" long-name="Connection Handler Fitler" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterconnhandler/group"/>
-</component>
-<component name="httpfilteriop" filter="s60" long-name="HTTP IOP Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteriop/group"/>
-</component>
-<component name="httpfilterproxy" filter="s60" long-name="HTTP Proxy Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterproxy/group"/>
-</component>
-<component name="uaproffilter" filter="s60" long-name="UAProf Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/uaproffilter/group"/>
-</component>
-</collection>
-<collection name="applayerprotocols" long-name="Application Layer Protocols" level="server">
-<component name="httptransportfw" long-name="HTTP Transport Framework" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
-</component>
-<component name="httpexamples" long-name="HTTP Examples" introduced="6.2" purpose="development">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpexamples/group" mrp="mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
-</component>
-<component name="wappushsupport" long-name="WAP Push Support" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
-</component>
-<component name="wapbase" long-name="WAP Base" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wapbase/Group" mrp="mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
-</component>
-<component name="ftpengine" long-name="FTP Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/ftpengine/group" mrp="mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
-</component>
-<component name="telnetengine" long-name="Telnet Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/telnetengine/group" mrp="mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
-</component>
-<component name="httpserviceapi" long-name="HTTP Service API" introduced="TB9.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpservice/group" mrp="mw/netprotocols/applayerprotocols/httpservice/group/http_service.mrp"/>
-</component>
-</collection>
-<collection name="applayerpluginsandutils" long-name="Application Layer Plugins and Utils" level="framework">
-<component name="uripermissionservices" long-name="URI Permission Services" introduced="^2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
-</component>
-<component name="bookmarksupport" long-name="Bookmark Support" introduced="9.1" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
-</component>
-<component name="httpprotocolplugins" long-name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
-</component>
-<component name="httptransportplugins" long-name="HTTP Transport Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
-</component>
-</collection>
-<collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
-<component name="netprotocols_metadata" long-name="High-level Internet Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ipappprotocols" level="generic" long-name="IP App Protocols" levels="plugin conn server if">
-<collection name="ipappprotocols_plat" long-name="IP App Protocols Platform Interfaces" level="if">
-<component name="srtp_api" long-name="SRTP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/srtp_api/group"/>
-</component>
-<component name="rtprtcp_api" long-name="RTP/RTCP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/rtprtcp_api/group"/>
-</component>
-</collection>
-<collection name="rtp" long-name="RTP" level="server">
-<component name="srtpstack" filter="s60" long-name="SRTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/srtpstack/group"/>
-</component>
-<component name="rtpstack" filter="s60" long-name="RTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/rtpstack/group"/>
-</component>
-</collection>
-<collection name="realtimenetprots" long-name="Real Time Net Protocols" level="server">
-<component name="symrtp" long-name="RTP" introduced="9.0" purpose="optional">
-<!-- Real Time Data Protocol -->
-<unit bldFile="mw/ipappprotocols/realtimenetprots/rtp/group" mrp="mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
-</component>
-<component name="srtp" long-name="Secure RTP" introduced="^4" purpose="optional">
-<unit bldFile="mw/ipappprotocols/realtimenetprots/srtp/group" mrp="mw/ipappprotocols/realtimenetprots/srtp/group/mm-protocols_srtp.mrp"/>
-</component>
-<component name="sipfw" long-name="SIP Framework" introduced="9.2" purpose="optional">
-<unit bldFile="mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp" version="2"/>
-</component>
-</collection>
-<collection name="sipplugins" long-name="SIP Plugins" level="plugin">
-<component name="sippwlanplugin" filter="s60" long-name="SIP WLAN Plugin" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
-</component>
-<component name="sippsipsettingsui" filter="s60" long-name="SIP Settings UI" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
-</component>
-<component name="sippdevmgmtsipadapter" filter="s60" long-name="Device Management SIP Settings Adapter" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
-</component>
-<component name="sippsystemstatemonitor" filter="s60" long-name="SIP System State Monitor" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsystemstatemonitor/group"/>
-</component>
-<component name="sippsipadapter" filter="s60" long-name="SIP Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipadapter/group"/>
-</component>
-</collection>
-<collection name="sipproviderplugins" long-name="SIP Provider Plugins" level="conn">
-<component name="sipprovider" long-name="SIP Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipproviderplugins/sipprovider/group" mrp="mw/ipappprotocols/sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
-</component>
-</collection>
-<collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="if">
-<component name="ipappprotocols_metadata" long-name="IP App Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wirelessacc" level="specific" long-name="Wireless Access" levels="framework generic ui">
-<collection name="hsfw_plat" long-name="HotSpot Framework Platform Interfaces" level="ui">
-<component name="hotspot_framework_client_api" long-name="HotSpot Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_api" long-name="Internet Connectivity Test Service API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_settings_api" long-name="Internet Connectivity Test Service Settings API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
-</component>
-<component name="hotspot_framework_client_plugin_api" long-name="HotSpot Framework Client Plugin API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
-</component>
-</collection>
-<collection name="hotspotfw" long-name="HotSpot Framework" level="framework">
-<component name="hsserver" filter="s60" long-name="HotSpot Server" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="hsclient" filter="s60" long-name="HotSpot Client" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="internetconnectivitytestservice" filter="s60" long-name="Internet Connectivity Test Service" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
-</component>
-<component name="ictsdialogs" filter="s60" long-name="Internet Connectivity Test Service Dialogs" deprecated="^3" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
-</component>
-<component name="hspluginforagent" filter="s60" long-name="HotSpot Plugin for Agent" plugin="Y" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
-</component>
-<component name="hsbrowser" filter="s60" long-name="HotSpot Browser" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
-</component>
-<component name="hotspotfw_build" filter="s60" long-name="Hotspot Framework Build">
-<!-- should break up this bld.inf into the above components, or collapse them all into a single component -->
-<unit bldFile="mw/wirelessacc/hotspotfw/group"/>
-</component>
-</collection>
-<collection name="wlanutilities" long-name="WLAN Utilities" level="generic">
-<component name="wlanutilities_build" long-name="WLAN Utilities Qt" introduced="^4" filter="s60">
-<!-- is this uinit needed, or is it sufficient to uncomment the units in the below components? -->
-<unit bldFile="mw/wirelessacc/wlanutilities" proFile="wirelessacc.pro" qmakeArgs="-r"/>
-</component>
-<component name="wlanqtutilities" filter="s60" long-name="WLAN Qt Utilities" introduced="^4" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlanplugin/group" qt:proFile="wlanqtutilities.pro"/>-->
-</component>
-<component name="wlansniffer" filter="s60" long-name="WLAN Sniffer" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlansettingsui/group" qt:proFile="wlansniffer.pro"/>-->
-</component>
-<component name="wlanentryplugin" filter="s60" long-name="WLAN Entry Plugin" plugin="Y" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlansniffer/group" qt:proFile="wlanentryplugin.pro"/>-->
-</component>
-<component name="wlanindicatorplugin" filter="s60" long-name="WLAN Indicator Plugin" plugin="Y" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlanindicatorplugin/group" qt:proFile="wlanindicatorplugin.pro"/>-->
-</component>
-</collection>
-</block>
-<block name="vpnclient" level="specific" long-name="VPN Client" levels="engine ui api">
-<!-- is the !oem_build filter needed? -->
-<collection name="vpnc_plat" long-name="VPN Client Platform Interfaces" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API" class="api">
-<unit bldFile="mw/vpnclient/vpnc_plat/vpnapi/group"/>
-</component>
-</collection>
-<collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API">
-<unit bldFile="mw/vpnclient/vpnapiimpl/group"/>
-</component>
-</collection>
-<collection name="vpnengine" long-name="VPN Engine" level="engine">
-<!-- too many components in this collection.
- Probably best to group the binaries together into larger components
- or maybe split the collection into more reasonable groups -->
-<component name="eventmediatorapi" filter="s60" long-name="Event Mediator API">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediatorapi/group"/>
-</component>
-<component name="eventviewer" filter="s60" long-name="Event Viewer">
-<unit bldFile="mw/vpnclient/vpnengine/eventviewer/group"/>
-</component>
-<component name="vpnins" filter="s60" long-name="VPN Installer">
-<unit bldFile="mw/vpnclient/vpnengine/vpnins/group"/>
-</component>
-<component name="ikepolparser" filter="s60" long-name="IKE Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/ikepolparser/group"/>
-</component>
-<component name="utlbase64" filter="s60" long-name="Base64 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlbase64/group"/>
-</component>
-<component name="utlcrypto" filter="s60" long-name="Crypto Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlcrypto/group"/>
-</component>
-<component name="utlxml" filter="s60" long-name="XML Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlxml/group"/>
-</component>
-<component name="utlpkcs10" filter="s60" long-name="PKCS#10 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs10/group"/>
-</component>
-<component name="pkiserviceapi" filter="s60" long-name="PKI Service API">
-<unit bldFile="mw/vpnclient/vpnengine/pkiserviceapi/group"/>
-</component>
-<component name="ikecert" filter="s60" long-name="IKE Certificate Management">
-<unit bldFile="mw/vpnclient/vpnengine/ikecert/group"/>
-</component>
-<component name="kmdapi" filter="s60" long-name="Key Management Daemon API">
-<unit bldFile="mw/vpnclient/vpnengine/kmdapi/group"/>
-</component>
-<component name="kmdserver" filter="s60" long-name="Key Management Daemon Server">
-<unit bldFile="mw/vpnclient/vpnengine/kmdserver/group"/>
-</component>
-<component name="ikeutils" filter="s60" long-name="Internet Key Exchange Utils">
-<unit bldFile="mw/vpnclient/vpnengine/ikeutils/group"/>
-</component>
-<component name="ikev1lib" filter="s60" long-name="IKEv1 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev1lib/group"/>
-</component>
-<component name="ikev2lib" filter="s60" long-name="IKEv2 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev2lib/group"/>
-</component>
-<component name="vpnipsecpolparser" filter="s60" long-name="VPN IPsec Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/vpnipsecpolparser/group"/>
-</component>
-<component name="sit" filter="s60" long-name="Socket Interaction Thread">
-<unit bldFile="mw/vpnclient/vpnengine/sit/group"/>
-</component>
-<component name="vpntcwrapper" filter="s60" long-name="VPN Terminal Control Wrapper">
-<unit bldFile="mw/vpnclient/vpnengine/vpntcwrapper/group"/>
-</component>
-<component name="eventmediator" filter="s60" long-name="Event Mediator">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediator/group"/>
-</component>
-<component name="pkiservice" filter="s60" long-name="PKI Service">
-<unit bldFile="mw/vpnclient/vpnengine/pkiservice/group"/>
-</component>
-<component name="vpnconnagt" filter="s60" long-name="VPN Connection Agent">
-<unit bldFile="mw/vpnclient/vpnengine/vpnconnagt/group"/>
-</component>
-<component name="vpnmanager" filter="s60" long-name="VPN Manager">
-<unit bldFile="mw/vpnclient/vpnengine/vpnmanager/group"/>
-</component>
-<component name="vpncleaner" filter="s60" long-name="VPN Cleaner">
-<unit bldFile="mw/vpnclient/vpnengine/vpncleaner/group"/>
-</component>
-<component name="utlpkcs12" filter="s60" long-name="PKCS#12 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs12/group"/>
-</component>
-<component name="dmadengine" filter="s60" long-name="DM Adapter Engine">
-<unit bldFile="mw/vpnclient/vpnengine/dmadengine/group"/>
-</component>
-<component name="dmadipsecvpn" filter="s60" long-name="IPsec VPN DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadipsecvpn/group"/>
-</component>
-<component name="dmadpki" filter="s60" long-name="PKI DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadpki/group"/>
-</component>
-<component name="ikesocket" filter="s60" long-name="IKE Socket" introduced="^3">
-<unit bldFile="mw/vpnclient/vpnengine/ikesocket/group"/>
-</component>
-</collection>
-<collection name="vpnui" long-name="VPN UI" level="ui">
-<component name="vpnecomnotifier" filter="s60" long-name="VPN ECOM Notifier" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnecomnotifier/group"/>
-</component>
-<component name="vpndialogmanager" filter="s60" long-name="VPN Dialog Manager">
-<unit bldFile="mw/vpnclient/vpnui/vpndialogmanager/group"/>
-</component>
-<component name="vpnmanagementui" filter="s60" long-name="VPN Management UI" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnmanagementui/group"/>
-</component>
-<component name="vpnpolins" filter="s60" long-name="VPN Policy Installer">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolins/group"/>
-</component>
-<component name="vpnpolicyrecognizer" filter="s60" long-name="VPN Policy Recognizer" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolicyrecognizer/group"/>
-</component>
-</collection>
-<collection name="vpnclient_info" long-name="VPN Client Info" level="api">
-<component name="vpnclient_help" filter="s60" long-name="VPN Client Help">
-<unit bldFile="mw/vpnclient/help/group"/>
-</component>
-<component name="vpnclient_build" filter="s60" long-name="VPN Client Build">
-<!-- should split this up into the other components and remove this-->
-<unit bldFile="mw/vpnclient/group"/>
-</component>
-</collection>
-</block>
-<block name="ipappsrv" level="specific" long-name="IP App Services" levels="framework generic server conn plugin">
-<collection name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" level="plugin">
-<component name="transcoder_api" long-name="Transcoder API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
-</component>
-<component name="comms_event_api" long-name="Comms Event API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/comms_event_api/group"/>
-</component>
-<component name="floor_control_api" long-name="Floor Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/floor_control_api/group"/>
-</component>
-<component name="media_control_api" long-name="Media Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/media_control_api/group"/>
-</component>
-<component name="multimedia_comms_api" long-name="Multimedia Comms API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/multimedia_comms_api/group"/>
-</component>
-<component name="nat_settings_api" long-name="NAT Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/nat_settings_api/group"/>
-</component>
-</collection>
-<collection name="natfw" long-name="NAT Framework" level="framework">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="natfw_build" filter="s60" long-name="NAT Framework Build" introduced="^2">
-<unit bldFile="mw/ipappsrv/natfw/group"/>
-</component>
-</collection>
-<collection name="multimediacommscontroller" long-name="Multimedia Comms Controller" level="conn">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommscontroller_build" filter="s60" long-name="Multimedia Comms Controller Build">
-<unit bldFile="mw/ipappsrv/multimediacommscontroller/group"/>
-</component>
-</collection>
-<collection name="multimediacommsengine" long-name="Multimedia Comms Engine" level="generic">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommsengine_build" filter="s60" long-name="Multimedia Comms Engine Build">
-<unit bldFile="mw/ipappsrv/multimediacommsengine/group"/>
-</component>
-</collection>
-<collection name="natplugins" long-name="NAT Plugins" level="plugin">
-<component name="natpcliprovisioningnatfwadapter" filter="s60" long-name="Client Provisioning NAT Framework Traversal Adapter" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/group"/>
-</component>
-<component name="natpdevmgmtnatfwadapter" filter="s60" long-name="Device Management NAT Framework Traversal Adapter" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/group"/>
-</component>
-<component name="natptraversalcontroller" filter="s60" long-name="NAT Traversal Controller" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natptraversalcontroller/group"/>
-</component>
-<component name="natpnatfwsdpprovider" filter="s60" long-name="NAT Framework SDP Provider" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpnatfwsdpprovider/group"/>
-</component>
-</collection>
-<collection name="ipappsrv_info" long-name="IP App Services Info" level="plugin">
-<component name="ipappsrv_build" long-name="IP App Services Build" filter="s60">
-<!-- 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">
-<collection name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" level="specific">
-<component name="sat_refresh_api" long-name="SAT Refresh API" filter="s60" class="api"/>
-<component name="sat_client_api" long-name="SAT Client API" filter="s60" class="api"/>
-<component name="sat_service_api" long-name="SAT Service API" filter="s60" class="api"/>
-<component name="call_information_api" long-name="Call Information API" filter="s60" class="api"/>
-<component name="call_remote_party_information_api" long-name="Call Remote Party Information API" filter="s60" class="api"/>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api"/>
-</collection>
-<collection name="cellular" long-name="Cellular" level="server">
-<component name="telephonysettings" filter="s60" long-name="Telephony Settings" purpose="development"/>
-<component name="sssettings" filter="s60" long-name="Supplementary Service Settings" purpose="development"/>
-<component name="psetnotesui" filter="s60" long-name="Phone Settings Notes UI" purpose="development"/>
-</collection>
-<collection name="convergedcallengine" long-name="Converged Call Engine" level="framework">
-<component name="cce" filter="s60" long-name="CCE" purpose="development"/>
-<component name="spsettings" filter="s60" long-name="Service Provider Settings" purpose="development"/>
-</collection>
-<collection name="phoneclientserver" long-name="Phone Client/Server" level="server">
-<component name="aiwdialdata" filter="s60" long-name="AIW Dial Data" purpose="development"/>
-<component name="dialutils" filter="s60" long-name="Dial Utils" purpose="development"/>
-<component name="phoneclient" filter="s60" long-name="Phone Client" purpose="development"/>
-</collection>
-<collection name="phonesrv_info" long-name="Phone Server Info" level="generic">
-<component name="phonesrv_build" long-name="Phone Server Build" filter="s60">
-<unit bldFile="mw/phonesrv" proFile="phonesrv.pro"/>
-</component>
-</collection>
-</block>
-<block name="messagingmw" level="specific" long-name="Messaging Middleware" levels="stack support fw api">
-<collection name="msgfw_plat" long-name="Messaging Middleware Platform Interfaces" level="api">
-<component name="always_online_plugin_api" long-name="Always Online Plugin API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_plugin_api/group"/>
-</component>
-<component name="always_online_client_api" long-name="Always Online Client API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_client_api/group"/>
-</component>
-<component name="msg_common_utils_api" long-name="Messaging Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/msg_common_utils_api/group"/>
-</component>
-<component name="muiu_utils_api" long-name="Messaging Center UI Utilities API" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/muiu_utils_api/group"/>
-</component>
-</collection>
-<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" class="config">
-<unit bldFile="mw/messagingmw/msgbranched/group"/>
-</component>
-</collection>
-<collection name="messagingfw" long-name="Messaging Framework" level="fw">
-<!-- should break this collection up into smaller related collections -->
-<component name="send_ui_api" long-name="Send UI API" filter="s60" deprecated="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/send_ui_api/group"/>
-</component>
-<component name="send_ui_plugin_api" long-name="Send UI Plug-in API" filter="s60" deprecated="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/send_ui_plugin_api/group"/>
-</component>
-<component name="send_ui_datautils_api" long-name="Send UI Data Utils API" filter="s60" deprecated="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/send_ui_datautils_api/group"/>
-</component>
-<component name="alwaysonline" filter="s60" long-name="Always Online Server" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/alwaysonline/group"/>
-</component>
-<component name="msgcommonutils" filter="s60" long-name="Messaging Common Utils" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/msgcommonutils/group"/>
-</component>
-<component name="senduiservices" filter="s60" long-name="Send UI Services" introduced="^2" deprecated="^4">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/senduiservices/group"/>
-</component>
-<component name="muiuutils" long-name="Messaging Center UI Utilities" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/muiuutils/group"/>
-</component>
-<component name="scheduledsendmtm" long-name="Scheduled Send MTM" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/group" mrp="mw/messagingmw/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
-</component>
-<component name="msgsrvnstore" long-name="Message Server and Store" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/group" mrp="mw/messagingmw/messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
-</component>
-<component name="biomsgfw" long-name="BIO Messaging Framework" introduced="6.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/group" mrp="mw/messagingmw/messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
-</component>
-<component name="msgconf" long-name="Messaging Config" introduced="^2" purpose="optional" class="config">
-<unit bldFile="mw/messagingmw/messagingfw/msgconf/group" mrp="mw/messagingmw/messagingfw/msgconf/group/messaging_config.mrp"/>
-</component>
-<component name="watcherfw" long-name="Watcher Framework" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/watcherfw/group" mrp="mw/messagingmw/messagingfw/watcherfw/group/messaging_watcher.mrp"/>
-</component>
-<component name="msgtest" long-name="Messaging Test" purpose="development">
-<unit bldFile="mw/messagingmw/messagingfw/msgtest/group" mrp="mw/messagingmw/messagingfw/msgtest/group/messaging_test.mrp"/>
-</component>
-<component name="sendas" long-name="Send As" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/sendas/group" mrp="mw/messagingmw/messagingfw/sendas/group/messaging_sendas2.mrp"/>
-</component>
-<component name="msgurlhandler" long-name="Message URL Handler" introduced="7.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/group" mrp="mw/messagingmw/messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
-</component>
-<component name="wappushfw" long-name="WAP Push Framework" introduced="6.1" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/wappushfw/group" mrp="mw/messagingmw/messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
-</component>
-<component name="suplsmshandler" long-name="SUPL SMS Handler" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplsmshandler/group" mrp="mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/>
-</component>
-<component name="suplwappushhandler" long-name="SUPL WAP Push Handler" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
-</component>
-</collection>
-<collection name="messagingmw_info" long-name="Messaging Middleware Info" level="api">
-<component name="messagingmw_metadata" long-name="Messaging Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="imsrv" level="specific" long-name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
-<collection name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" level="specific">
-<component name="ximp_core_data_model_api" long-name="XIMP Core Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_host_api" long-name="XIMP Presence Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_presence_data_model_api" long-name="XIMP Presence Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_api" long-name="XIMP Presence Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_presence_management_api" long-name="XIMP Presence Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_management_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_host_api" long-name="XIMP Core Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_core_management_api" long-name="XIMP Core Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_management_api/group"/>
-</component>
-<component name="ximp_presence_base_api" long-name="XIMP Presence Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_base_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_api" long-name="XIMP Core Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_core_base_api" long-name="XIMP Core Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_base_api/group"/>
-</component>
-<component name="ximp_presence_cache_api" long-name="XIMP Presence Cache API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_cache_api/group"/>
-</component>
-<component name="ximp_core_feature_plugin_api" long-name="XIMP Core Feature Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_host_api" long-name="XIMP IM Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_im_data_model_api" long-name="XIMP IM Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_data_model_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_api" long-name="XIMP IM Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_im_management_api" long-name="XIMP IM Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_management_api/group"/>
-</component>
-<component name="ximp_im_base_api" long-name="XIMP IM Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_base_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_host_api" long-name="XIMP Search Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_search_data_model_api" long-name="XIMP Search Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_data_model_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_api" long-name="XIMP search Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_search_management_api" long-name="XIMP Search Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_management_api/group"/>
-</component>
-<component name="ximp_search_base_api" long-name="XIMP Search Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_base_api/group"/>
-</component>
-<component name="xmpp_settings_api" long-name="XMPP Settings API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/group"/>
-</component>
-<component name="im_cache_client_api" long-name="IM Cache Client API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/im_cache_client_api/group"/>
-</component>
-<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 Avability Text" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
-</component>
-</collection>
-<collection name="ximpfw" long-name="XIMP Framework" level="framework">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="ximpfw_build" filter="s60" long-name="XIMP Framework Build">
-<unit bldFile="mw/imsrv/ximpfw/group"/>
-</component>
-</collection>
-<collection name="imservices" long-name="IM Services" level="generic">
-<component name="imfeatureplugin" filter="s60" long-name="IM Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/imfeatureplugin/group"/>
-</component>
-<component name="searchfeatureplugin" filter="s60" long-name="Search Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/searchfeatureplugin/group"/>
-</component>
-<component name="xmppsettingsapi" filter="s60" long-name="XMPP Settings API" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsapi/group"/>
-</component>
-<component name="xmppsettingsfetcher" filter="s60" long-name="XMPP Settings Fetcher" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/group"/>
-</component>
-<component name="instantmessagingcache" filter="s60" long-name="Instant Messaging Cache" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/instantmessagingcache/group"/>
-</component>
-</collection>
-<collection name="brandingserver" long-name="Branding Server" level="specific">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="brandingserver_build" filter="s60" long-name="Branding Server Build">
-<unit bldFile="mw/imsrv/brandingserver/group"/>
-</component>
-</collection>
-</block>
-<block name="legacypresence" level="specific" long-name="Legacy Presence Services" levels="engine fw ui">
-<collection name="pressrv_plat" long-name="Legacy Presence Services Platform Interfaces" level="ui">
-<component name="presence_list_api" long-name="Presence List API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/presence_list_api/group"/>
-</component>
-<component name="watcher_info_api" long-name="Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_info_api/group"/>
-</component>
-<component name="simple_documents_api" long-name="SIMPLE Documents API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_documents_api/group"/>
-</component>
-<component name="authorization_api" long-name="Authorization API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/authorization_api/group"/>
-</component>
-<component name="xdm_protocol_plugin_api" long-name="XDM Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_protocol_plugin_api/group"/>
-</component>
-<component name="watcher_api" long-name="Watcher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_api/group"/>
-</component>
-<component name="xdm_api" long-name="XDM API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_api/group"/>
-</component>
-<component name="registration_api" long-name="Registration API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/registration_api/group"/>
-</component>
-<component name="publisher_api" long-name="Publisher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/publisher_api/group"/>
-</component>
-<component name="messaging_connection_manager_api" long-name="Messaging Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/messaging_connection_manager_api/group"/>
-</component>
-<component name="xdm_settings_api" long-name="XDM Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_settings_api/group"/>
-</component>
-<component name="simple_settings_api" long-name="SIMPLE Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_settings_api/group"/>
-</component>
-<component name="simple_instant_msg_api" long-name="Simple Instant Msg API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_instant_msg_api/group"/>
-</component>
-</collection>
-<collection name="xdmengine" long-name="XDM Engine" level="engine">
-<!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
-<component name="xdmengine_build" filter="s60" long-name="XDM Engine Build">
-<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">
-<unit bldFile="mw/legacypresence/xdmprotocols/group"/>
-</component>
-</collection>
-<collection name="msgconnmanager" long-name="Messaging Connection Manager" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="msgconnmanager_build" filter="s60" long-name="Messaging Connection Manager Build">
-<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">
-<unit bldFile="mw/legacypresence/simpleengine/group"/>
-</component>
-</collection>
-<collection name="presencefwsimpleadpt" long-name="Presence Framework SIMPLE Adaptation" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="simpleplugin" filter="s60" long-name="SIMPLE Plugin" plugin="Y">
-<unit bldFile="mw/legacypresence/presencefwsimpleadpt/group"/>
-</component>
-</collection>
-<collection name="simpledatamodeladapter" long-name="SIMPLE Data Model Adapter" level="fw">
-<component name="presenceplugin" filter="s60" long-name="Presence Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/legacypresence/simpledatamodeladapter/group"/>
-</component>
-</collection>
-</block>
-<block name="opensrv" level="specific" long-name="Open Services" levels="prt lib server eng">
-<collection name="opensrv_plat" long-name="Open Services Platform Interfaces" level="eng">
-<component name="messagequeue_api" long-name="Message Queue API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/opensrv/opensrv_plat/messagequeue_api/group"/>
-</component>
-</collection>
-<collection name="loudmouth" long-name="Loudmouth" level="prt">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="loudmouth_build" filter="s60" long-name="Loudmouth Build" introduced="^2">
-<unit bldFile="mw/opensrv/loudmouth/group"/>
-</component>
-</collection>
-<collection name="libtelepathy" long-name="Telepathy Library" level="lib">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="libtelepathy_build" filter="s60" long-name="Telepathy Library Build" introduced="^2">
-<unit bldFile="mw/opensrv/libtelepathy/group"/>
-</component>
-</collection>
-<collection name="telepathygabble" long-name="Telepathy Gabble" level="eng">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="telepathygabble_build" filter="s60" long-name="Telepathy Gabble Build" introduced="^2">
-<unit bldFile="mw/opensrv/telepathygabble/group"/>
-</component>
-</collection>
-<collection name="isolationserver" long-name="Isolation Server" level="server">
-<component name="messagequeue" filter="s60" long-name="Message Queue" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/messagequeue/group"/>
-</component>
-<component name="isoserver" filter="s60" long-name="ISO Server" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/isoserver/group"/>
-</component>
-<component name="isolationserver_build" filter="s60" long-name="Isloation Server Build" introduced="^2">
-<!-- needs #includes removed. either move the exports to another component or make this a ROM component -->
-<unit bldFile="mw/opensrv/isolationserver/group"/>
-</component>
-</collection>
-</block>
-<block name="searchsrv" level="specific" long-name="Search Services" levels="services engine generic api">
-<collection name="searchsrv_plat" long-name="Search Services Platform Interfaces" level="api">
-<component name="cpix_utility_api" long-name="CPIX Utility API" filter="s60" class="api">
-<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_utility_api/group"/>
-</component>
-<component name="cpix_framework_api" long-name="CPIX Framework API" filter="s60" class="api">
-<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_framework_api/group"/>
-</component>
-<component name="cpix_search_api" long-name="CPIX Search API" filter="s60" class="api">
-<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_search_api/group"/>
-</component>
-</collection>
-<collection name="searchengine" long-name="Search Engine" level="engine">
-<component name="searchengine_util" long-name="Search Engine Utils" filter="s60">
-<unit bldFile="mw/searchsrv/searchengine/util/group"/>
-</component>
-<component name="searchengine_oss" long-name="Search Engine OSS" filter="s60">
-<unit bldFile="mw/searchsrv/searchengine/oss/group"/>
-</component>
-<component name="cpix" long-name="Cross Platform Indexing Engine" filter="s60">
-<unit bldFile="mw/searchsrv/searchengine/cpix/group"/>
-</component>
-</collection>
-<collection name="searcher" long-name="Searcher" level="generic">
-<component name="searchclient" long-name="Search Client" filter="s60">
-<unit bldFile="mw/searchsrv/searcher/SearchClient/group"/>
-</component>
-<component name="searchserver" long-name="Search Server" filter="s60">
-<unit bldFile="mw/searchsrv/searcher/SearchServer/group"/>
-</component>
-<component name="searcher_test" long-name="Searcher Tests" filter="s60" purpose="development">
-<!-- #include from common bld.inf or split into two components -->
-<unit bldFile="mw/searchsrv/searcher/tsrc/RobustnessTest/group"/>
-<unit bldFile="mw/searchsrv/searcher/tsrc/LogPlayer/group"/>
-</component>
-</collection>
-<collection name="searchsrv_harvester" long-name="Search Services Harvester" level="services">
-<component name="searchsrv_pluginfw" long-name="Search Server" filter="s60">
-<unit bldFile="mw/searchsrv/harvester/pluginfw/group"/>
-</component>
-<component name="searchsrv_harvesterserver" long-name="Search Harvester Server" filter="s60">
-<unit bldFile="mw/searchsrv/harvester/HarvesterServer/group"/>
-</component>
-</collection>
-<collection name="searchsrv_watchdog" long-name="Search Services Watch Dog" level="services">
-<component name="searchsrv_watchdog_build" long-name="Search Services Watch Dog Build" filter="s60">
-<unit bldFile="mw/searchsrv/WatchDog/group"/>
-</component>
-</collection>
-<collection name="qcpix" long-name="Qt CPIX" level="engine">
-<component name="qcpix_build" long-name="Qt CPIX Build">
-<unit bldFile="mw/searchsrv/qcpix" proFile="qcpix.pro"/>
-</component>
-</collection>
-<collection name="searchsrv_info" long-name="Search Services Info">
-<component name="searchsrv_build" long-name="Search Services Build">
-<!-- move exports to own component and remove this -->
-<unit bldFile="mw/searchsrv/group"/>
-</component>
-</collection>
-</block>
-<block name="remotemgmt" level="specific" long-name="Remote Management" levels="plugin framework server generic specific">
-<collection name="remotemgmt_pub" long-name="Remote Management Public Interfaces" level="specific">
-<component name="synchronization_capability_api" long-name="Synchronization Capability API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
-</component>
-</collection>
-<collection name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" level="specific">
-<component name="common_agent_util_and_definitions_api" long-name="Common Agent util and definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
-</component>
-<component name="policy_management_certificate_api" long-name="Policy Management Certificate API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/group"/>
-</component>
-<component name="oma_provisioning_adapter_api" long-name="OMA Provisioning Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_adapter_api/group"/>
-</component>
-<component name="device_management_parameter_api" long-name="Device Management Parameter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_parameter_api/group"/>
-</component>
-<component name="data_synchronization_plugin_api" long-name="Data Synchronization Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/group"/>
-</component>
-<component name="sync_alert_handler_api" long-name="Sync Alert Handler API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
-</component>
-<component name="syncml_notifier_api" long-name="SyncML Notifier API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
-</component>
-<component name="syncml_client_api" long-name="SyncML Client API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
-</component>
-<component name="device_management_plugin_api" long-name="Device Management plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_plugin_api/group"/>
-</component>
-<component name="dm_tree_apis" long-name="DM Tree APIs" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
-</component>
-<component name="terminal_security_device_lock_api" long-name="Terminal Security Device Lock API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/group"/>
-</component>
-<component name="policy_management_request_api" long-name="Policy Management Request API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/group"/>
-</component>
-<component name="ds_constant_definitions_api" long-name="DS Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_constant_definitions_api/group"/>
-</component>
-<component name="scp_server_api" long-name="SCP Server API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/group"/>
-</component>
-<component name="data_synchronization_notification_api" long-name="Data Synchronization Notification API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_notification_api/group"/>
-</component>
-<component name="oma_provisioning_engine_api" long-name="OMA Provisioning Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/group"/>
-</component>
-<component name="dm_utils_api" long-name="DM Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/group"/>
-</component>
-<component name="syncml_alert_api" long-name="SyncML Alert API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/group"/>
-</component>
-<component name="obex_client_session_api" long-name="OBEX Client session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/obex_client_session_api/group"/>
-</component>
-<component name="setting_enforcement_info_api" long-name="Setting Enforcement Info API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/group"/>
-</component>
-<component name="dm_constant_definitions_api" long-name="DM Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
-</component>
-<component name="oma_ds_extensions_api" long-name="OMA DS Extensions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
-</component>
-<component name="pnpms_utils_api" long-name="PNPMS Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
-</component>
-<component name="diagnostics_plugin_utility_api" long-name="Diagnostics Plugin Utility API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
-</component>
-<component name="diagnostics_plugin_api" long-name="Diagnostics Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
-</component>
-<component name="diagnostics_framework_api" long-name="Diagnostics Framework API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
-</component>
-<component name="diagnostics_results_api" long-name="Diagnostics Results API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
-</component>
-<component name="diagnostics_plugin_pool_api" long-name="Diagnostics Plugin Pool API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
-</component>
-<component name="adaptive_history_list_api" long-name="Adaptive History List API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
-</component>
-<component name="adaptive_history_list_session_api" long-name="Adaptive History List Session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
-</component>
-<component name="fota_engine_api" long-name="FOTA Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
-</component>
-<component name="update_package_storage_plugin_api" long-name="Update Package Storage Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
-</component>
-<component name="syncml_notifier_roaming_api" long-name="SyncML Notifier Roaming API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
-</component>
-<component name="sync_service_api" long-name="Sync Service API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_service_api/group"/>
-</component>
-<component name="dcmo_adapter_api" long-name="DCMO Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_adapter_api/group"/>
-</component>
-<component name="dcmo_control_api" long-name="DCMO Control API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_control_api/group"/>
-</component>
-<component name="ds_capability_mgmt_plugin_api" long-name="DS Capability Management Plugin API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
-</component>
-<component name="dm_native_notifier_api" long-name="DM Native Notifier API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_native_notifier_api/group"/>
-</component>
-</collection>
-<collection name="policymanagement" long-name="Policy Management" level="generic">
-<component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">
-<unit bldFile="mw/remotemgmt/policymanagement/pmdmadapter/group"/>
-</component>
-<component name="dmutilserver" filter="s60" long-name="DM Util Server">
-<unit bldFile="mw/remotemgmt/policymanagement/dmutilserver/group"/>
-</component>
-<component name="policyengine" filter="s60" long-name="Policy Engine">
-<unit bldFile="mw/remotemgmt/policymanagement/policyengine/group" filter="!dfs_build"/>
-</component>
-<component name="policymanagement_build" filter="s60" long-name="Policy Management Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/policymanagement/group"/>
-</component>
-</collection>
-<collection name="syncmlfw" long-name="SyncML Framework" level="server">
-<component name="syncmlfw_build" filter="s60" long-name="SyncML Framework Build">
-<!-- need to break this up into components. Too convoluted a structure to be in a single bld.inf-->
-<unit bldFile="mw/remotemgmt/syncmlfw/group"/>
-</component>
-</collection>
-<collection name="terminalsecurity" long-name="Terminal Security" level="specific">
-<component name="scp" filter="s60" long-name="Security Code Proxy">
-<!-- can only have one unit, need to have these #included from a single bld.inf -->
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpdatabase/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpserver/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scppatternplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scphistoryplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scptimestampplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpeventhandler/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/dmeventnotifier/group"/>
-</component>
-<component name="terminalsecurity_client" filter="s60" long-name="Terminal Control Client">
-<unit bldFile="mw/remotemgmt/terminalsecurity/client/group"/>
-</component>
-<component name="terminalsecurity_server" filter="s60" long-name="Terminal Control Server">
-<unit bldFile="mw/remotemgmt/terminalsecurity/server/group"/>
-</component>
-<component name="tcadapter" filter="s60" long-name="Terminal Control Adapter">
-<unit bldFile="mw/remotemgmt/terminalsecurity/tcadapter/bld"/>
-</component>
-<component name="terminalsecurity_build" filter="s60" long-name="Terminal Security Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/terminalsecurity/group"/>
-</component>
-</collection>
-<collection name="omaprovisioning" long-name="OMA Provisioning" level="specific">
-<component name="pnputil" filter="s60" long-name="PnP Util">
-<unit bldFile="mw/remotemgmt/omaprovisioning/pnputil/group"/>
-</component>
-<component name="provisioning" filter="s60" long-name="Provisioning">
-<unit bldFile="mw/remotemgmt/omaprovisioning/provisioning/group"/>
-</component>
-</collection>
-<collection name="devicediagnosticsfw" long-name="Device Diagnostics Framework" level="framework">
-<component name="diagframework" filter="s60" long-name="Diagnostics Framework">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
-</component>
-<component name="diagpluginbase" filter="s60" long-name="Diagnostics Plugin Base">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
-</component>
-<component name="diagresultsdb" filter="s60" long-name="Diagnostics Results Database">
-<!-- can only have one unit, merge or split into two components -->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
-</component>
-<component name="devicediagnosticsfw_build" filter="s60" long-name="Device Diagnostics Framework Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/group"/>
-</component>
-</collection>
-<collection name="dcmofw" long-name="Device Capability Management Object Framework" level="framework">
-<component name="dcmoclient" filter="s60" long-name="DCMO Client">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoclient/group"/>
-</component>
-<component name="dcmoserver" filter="s60" long-name="DCMO Server">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoserver/group"/>
-</component>
-<component name="dcmocustcmd" filter="s60" long-name="DCMO Custom Commands">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmocustcmd/group"/>
-</component>
-<component name="dcmofw_build" filter="s60" long-name="DCMO Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/dcmofw/group"/>
-</component>
-</collection>
-<collection name="fotaapplication" long-name="FOTA Application" level="generic">
-<component name="fotaapplication_build" filter="s60" long-name="FOTA Application Build">
-<!-- remove this component when configuration is in place and the #ifdefs have been worked out -->
-<unit bldFile="mw/remotemgmt/fotaapplication/group"/>
-</component>
-<component name="fotaserver" filter="s60" long-name="FOTA Server">
-<!-- uncomment when #ifdefs are resolved -->
-<!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
-</component>
-<component name="fotacustcmds" filter="s60" long-name="FOTA Custom Commands" class="placeholder">
-<!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
-<!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
-</component>
-</collection>
-</block>
-<block name="remoteconn" level="generic" long-name="Remote Connectivity" levels="plugin framework server generic specific">
-<collection name="remoteconn_info" long-name="Remote Connectivity Info" level="specific">
-<component name="remoteconn_metadata" long-name="Remote Connectivity Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mtptransports" long-name="MTP Transports" level="plugin">
-<component name="mtpusbtransport" long-name="MTP USB Transport" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpusbtransport/group" mrp="mw/remoteconn/mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
-</component>
-<component name="mtpptpiptransport" long-name="MTP PTP-IP Transport" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpptpiptransport/group" mrp="mw/remoteconn/mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
-</component>
-<component name="mtpcontroller" long-name="MTP Controller" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpcontroller/group" mrp="mw/remoteconn/mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
-</component>
-</collection>
-<collection name="mtpfws" long-name="MTP Frameworks" level="framework">
-<component name="mtpfw" long-name="MTP Framework" introduced="^2" purpose="optional">
-<unit bldFile="mw/remoteconn/mtpfws/mtpfw/group" mrp="mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/>
-</component>
-</collection>
-<collection name="mtpdataproviders" long-name="MTP Data Providers" level="generic">
-<component name="mtpfileandfolderdp" long-name="MTP File and Folder Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group" mrp="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
-</component>
-<component name="mtpimagedp" long-name="MTP Image Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpimagedp/group" mrp="mw/remoteconn/mtpdataproviders/mtpimagedp/group/mtp_imagedp.mrp"/>
-</component>
-<component name="mtppictbridgedp" long-name="MTP PictBridge Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group" mrp="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group/mtp_pictbridgedp.mrp"/>
-</component>
-</collection>
-<collection name="backupandrestore" long-name="Backup and Restore" level="specific">
-<component name="backupengine" long-name="Backup Engine" introduced="9.0" purpose="optional">
-<unit bldFile="mw/remoteconn/backupandrestore/backupengine/group" mrp="mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
-</component>
-<component name="backuptest" long-name="Backup Test" introduced="^2" purpose="development">
-<unit bldFile="mw/remoteconn/backupandrestore/backuptest/group" mrp="mw/remoteconn/backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
-</component>
-</collection>
-<collection name="obex" long-name="OBEX" level="generic">
-<component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexprotocol/group" mrp="mw/remoteconn/obex/obexprotocol/group/obex.mrp"/>
-</component>
-<component name="obexextensionapi" long-name="OBEX Extension API" introduced="9.2" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexextensionapi/group" mrp="mw/remoteconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
-</component>
-</collection>
-</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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<unit mrp="mw/srvdiscovery/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="dlnasrv" level="specific" long-name="DLNA Services" levels="stack server ctrl framework plugin">
-<!-- uncomment all the units when configuration is in place, they're currently #included from other xxx_build components -->
-<collection name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" level="plugin">
-<component name="upnp_media_server_settings_api" long-name="UPnP Media Server Settings API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_settings_api/group"/>
-</component>
-<component name="upnp_av_objects_api" long-name="UPnP A/V Objects API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_av_objects_api/group"/>
-</component>
-<component name="upnp_media_server_api" long-name="UPnP Media Server API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_api/group"/>
-</component>
-<component name="upnp_security_plugin_api" long-name="UPnP Security Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_security_plugin_api/group"/>
-</component>
-<component name="upnp_avcp_api" long-name="UPnP AVCP API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_avcp_api/group"/>
-</component>
-<component name="upnp_media_server_metadata_api" long-name="UPnP Media Server Metadata API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_metadata_api/group"/>
-</component>
-<component name="upnp_command_api" long-name="UPnP Command API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_command_api/group"/>
-</component>
-<component name="upnp_plugin_api" long-name="UPnP Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_plugin_api/group"/>
-</component>
-</collection>
-<collection name="upnpavcontrolpoint" long-name="UPnP A/V Control Point" level="plugin">
-<component name="avcontrolframework" filter="s60" long-name="A/V Control Famework" introduced="9.1" deprecated="^3">
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
-</component>
-<component name="upnpavcontrolpoint_build" filter="s60" long-name="UPnP A/V Control Point Build" introduced="9.1" deprecated="^3">
-<!-- put exports in other component instead -->
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/group"/>
-</component>
-</collection>
-<collection name="upnpmediaserver" long-name="UPnP Media Server" level="server">
-<component name="avobjects" filter="s60" long-name="A/V Objects">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/avobjects/group"/>
-</component>
-<component name="mediaserverclient" filter="s60" long-name="Media Server Client">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverclient/group"/>
-</component>
-<component name="connectionmanagerservice" filter="s60" long-name="Connection Manager Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/connectionmanagerservice/group"/>
-</component>
-<component name="contentdirectoryservice" filter="s60" long-name="Content Directory Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/contentdirectoryservice/group"/>
-</component>
-<component name="mediaserverengine" filter="s60" long-name="Media Server Engine">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverengine/group"/>
-</component>
-<component name="upnpmediaserver_build" filter="s60" long-name="UPnP Media Server Build">
-<!-- move exports into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpmediaserver/group"/>
-</component>
-</collection>
-<collection name="upnpavcontroller" long-name="UPnP A/V Controller" level="ctrl">
-<component name="upnpxmlparser" filter="s60" long-name="UPnP XML Parser" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpxmlparser/group"/>
-</component>
-<component name="upnpavcontrollerserver" filter="s60" long-name="UPnP A/V Controller Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerserver/group"/>
-</component>
-<component name="upnpavcontrollerclient" filter="s60" long-name="UPnP A/V Ccontroller Client" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerclient/group"/>
-</component>
-<component name="upnpavcontrollerhelper" filter="s60" long-name="UPnP A/V Controller Helper" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerhelper/group"/>
-</component>
-<component name="upnpavcontroller_build" filter="s60" long-name="UPnP A/V Controller Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpavcontroller/group"/>
-</component>
-</collection>
-<collection name="upnpframework" long-name="UPnP Framework" level="framework">
-<component name="upnputilities" filter="s60" long-name="UPnP Utilities" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnputilities/group"/>
-</component>
-<component name="upnpextensionpluginif" filter="s60" long-name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpextensionpluginif/group"/> -->
-</component>
-<component name="upnpfiletransferengine" filter="s60" long-name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>-->
-</component>
-<component name="upnpcommonui" filter="s60" long-name="UPnP Common UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpcommonui/group"/>-->
-</component>
-<component name="upnpaiwengine" filter="s60" long-name="UPnP AIW Engine" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpaiwengine/group"/> -->
-</component>
-<component name="upnpaiwprovider" filter="s60" long-name="UPnP AIW Provider" introduced="^2" deprecated="^3" plugin="Y">
-<!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
-</component>
-<component name="upnpmusicadapter" filter="s60" long-name="UPnP Music Adapter" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
-</component>
-<component name="upnpcommand" filter="s60" long-name="UPnP Command" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpcommand/group"/>
-</component>
-<component name="upnpframework_build" filter="s60" long-name="UPnP Framework Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpframework/group"/>
-</component>
-</collection>
-<collection name="upnpsettings" long-name="UPnP Settings" level="framework">
-<component name="upnpsettingsengine" filter="s60" long-name="UPnP Settings Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
-</component>
-<component name="multiselectionui" filter="s60" long-name="Multi-Selection UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/multiselectionui/group"/>-->
-</component>
-<component name="appwizard" filter="s60" long-name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/appwizard/group"/>-->
-</component>
-<component name="upnpsharingui" filter="s60" long-name="UPnP Sharing UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
-</component>
-<component name="upnpgsplugin" filter="s60" long-name="UPnP GS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
-</component>
-<component name="upnpsettings_build" filter="s60" long-name="UPnP Settings Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsettings/group"/>
-</component>
-</collection>
-<collection name="upnpsharing" long-name="UPnP Sharing" level="server">
-<component name="upnpdlnaprofiler" filter="s60" long-name="UPnP DLNA Profiler" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpdlnaprofiler/group"/>
-</component>
-<component name="upnpsecurity" filter="s60" long-name="UPnP Security" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpsecurity/group"/>
-</component>
-<component name="upnpcontentserver" filter="s60" long-name="UPnP Content Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpcontentserver/group"/>
-</component>
-<component name="applicationengine" filter="s60" long-name="UPnP Application Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/applicationengine/group"/>
-</component>
-<component name="upnpsharing_build" filter="s60" long-name="UPnP Sharing Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsharing/group"/>
-</component>
-</collection>
-<collection name="upnpmpxplugins" long-name="UPnP MPX Plugins" level="plugin">
-<component name="upnpplaybackplugins" filter="s60" long-name="UPnP Playback Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/upnpplaybackplugins/group"/>
-</component>
-<component name="upnpmpxplugins_build" filter="s60" long-name="UPnP MPX Plugins Build" introduced="^2">
-<!-- move exports content into other component? -->
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/group"/>
-</component>
-</collection>
-<collection name="upnpharvester" long-name="UPnP Harvester" level="ctrl">
-<component name="upnpharvester_common" filter="s60" long-name="UPnP Harvester Common" introduced="^2" deprecated="^3" class="placeholder">
-<!-- need to merge or #include these to a single bld.inf -->
-<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
- <unit bldFile="upnpharvester/common/cmsettings/group"/>
- <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
- <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
-</component>
-<component name="cdssync" filter="s60" long-name="CDS Sync" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
-</component>
-<component name="mdhserver" filter="s60" long-name="Metadata Harvester Server" introduced="^2" deprecated="^3" class="placeholder">
-<!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
-</component>
-<component name="upnpharvester_build" filter="s60" long-name="UPnP Harvester Build" introduced="^2" deprecated="^3" class="placeholder">
-<!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
-<!--<unit bldFile="upnpharvester/group"/>-->
-</component>
-</collection>
-<collection name="homesync" long-name="Home Sync" level="plugin">
-<component name="contentmanager" filter="s60" long-name="Content Manager" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homesync/group"/>-->
-<!-- move bld.inf into contentmanager dir -->
-</component>
-</collection>
-<collection name="homemedia" long-name="Home Media" level="framework">
-<!-- collection is really just a component. Move down a directory -->
-<component name="homemedia_build" filter="s60" long-name="Home Media" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homemedia/group"/> -->
-</component>
-</collection>
-<collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin">
-<component name="dlnasrv_build" filter="s60" long-name="DLNA Services Build">
-<!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed -->
-<unit bldFile="mw/dlnasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="btservices" level="generic" long-name="Bluetooth Services" levels="framework server generic specific plugin">
-<collection name="btservices_pub" long-name="BT Services Public Interfaces" level="plugin">
-<component name="bluetooth_power_state_api" long-name="Bluetooth Power State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_power_state_api/group"/>
-</component>
-<component name="bluetooth_notifier_api" long-name="Bluetooth Notifier API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_notifier_api/group"/>
-</component>
-</collection>
-<collection name="btservices_plat" long-name="BT Services Platform Interfaces" level="plugin">
-<component name="bluetooth_dosserver_audio_api" long-name="Bluetooth DOS Server Audio API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dosserver_audio_api/group"/>
-</component>
-<component name="bluetooth_dut_mode_api" long-name="Bluetooth DUT Mode API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dut_mode_api/group"/>
-</component>
-<component name="bluetooth_engine_api" long-name="Bluetooth Engine API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-<component name="bluetooth_local_variation_api" long-name="Bluetooth Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_local_variation_api/group"/>
-</component>
-<component name="bluetooth_notifier_internal_api" long-name="Bluetooth Notifier internal API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_notifier_internal_api/group"/>
-</component>
-<component name="bluetooth_sap_connection_state_api" long-name="Bluetooth SAP Connection State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_sap_connection_state_api/group"/>
-</component>
-<component name="bluetooth_secondary_display_notification_api" long-name="Bluetooth Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_secondary_display_notification_api/group"/>
-</component>
-</collection>
-<collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
-<component name="bteng" filter="s60" long-name="Bluetooth Engine">
-<unit bldFile="mw/btservices/bluetoothengine/bteng/group"/>
-</component>
-<component name="btnotif" filter="s60" long-name="Bluetooth Notifier">
-<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"/>
-</component>
-<component name="btmac" filter="s60" long-name="Bluetooth Mono Audio Controller" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btmac/group"/>
-</component>
-<component name="btsac" filter="s60" long-name="Bluetooth Stereo Audio Controller" plugin="Y">
-<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"/>
-</component>
-<component name="btsap" filter="s60" long-name="Bluetooth SIM Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btsap/group"/>
-</component>
-<component name="btui" filter="s60" long-name="Bluetooth UI">
-<unit bldFile="mw/btservices/bluetoothengine/btui/group"/>
-</component>
-<component name="btpbap" filter="s60" long-name="Bluetooth Phonebook Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btpbap/group"/>
-</component>
-<component name="bthid" filter="s60" long-name="Bluetooth HID">
-<unit bldFile="mw/btservices/bluetoothengine/bthid/group"/>
-</component>
-<component name="btctrldcmoadapter" filter="s60" long-name="Bluetooth Control DCMO Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btctrldcmoadapter/group"/>
-</component>
-</collection>
-<collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
-<component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
-<unit bldFile="mw/btservices/bluetoothappprofiles/avrcp" mrp="mw/btservices/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
-</component>
-</collection>
-<collection name="atcommands" long-name="AT Commands" level="generic">
-<component name="modematplugin" long-name="Modem AT Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/modematplugin/group"/>
-</component>
-<component name="lccustomplugin" long-name="LC Custom Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/lccustomplugin/group"/>
-</component>
-</collection>
-<collection name="btservices_info" long-name="BT Services Info" level="plugin">
-<component name="btservices_metadata" long-name="BT Services Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usbservices" level="generic" long-name="USB Services" levels="framework server generic specific plugin">
-<collection name="usbservices_plat" long-name="USB Services Platform Interfaces" level="plugin">
-<component name="pictbridge_api" long-name="PictBridge API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/pictbridge_api/group"/>
-</component>
-<component name="ptp_responder_api" long-name="PTP Responder API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_responder_api/group"/>
-</component>
-<component name="ptp_transport_api" long-name="PTP Transport API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_transport_api/group"/>
-</component>
-<component name="usb_device_control_plugin_api" long-name="USB Device Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_device_control_plugin_api/group"/>
-</component>
-<component name="usb_notifier_api" long-name="USB Notifier API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_notifier_api/group"/>
-</component>
-<component name="usb_personality_api_header" long-name="USB Personality API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_api_header/group"/>
-</component>
-<component name="usb_personality_plugin_api" long-name="USB Personality Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_plugin_api/group"/>
-</component>
-<component name="usb_secondary_display_api" long-name="USB Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_secondary_display_api/group"/>
-</component>
-<component name="usb_watcher_api" long-name="USB Watcher API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_api/group"/>
-</component>
-<component name="usb_watcher_info_api_header" long-name="USB Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_info_api_header/group"/>
-</component>
-</collection>
-<collection name="usbengines" long-name="USB Engines" level="generic">
-<component name="usbotgwatcher" filter="s60" long-name="USB OTG Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbotgwatcher/group"/>
-</component>
-<component name="usbwatcher" filter="s60" long-name="USB Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbwatcher/group"/>
-</component>
-<component name="usblocodplugin" filter="s60" long-name="USB Local Connectivity Domain Plugin" plugin="Y">
-<unit bldFile="mw/usbservices/usbengines/usblocodplugin/group"/>
-</component>
-<component name="usbdevcon" filter="s60" long-name="USB Device Control">
-<unit bldFile="mw/usbservices/usbengines/usbdevcon/group"/>
-</component>
-<component name="usbremotepersonality" filter="s60" long-name="USB Remote Personality">
-<unit bldFile="mw/usbservices/usbengines/usbremotepersonality/group"/>
-</component>
-</collection>
-<collection name="usbclasses" long-name="USB Classes" level="framework">
-<component name="usbobexclasscontroller" filter="s60" long-name="USB OBEX Class Controller" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbobexclasscontroller/group"/>
-</component>
-<component name="usbbasicpersonality" filter="s60" long-name="USB Basic Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbbasicpersonality/group"/>
-</component>
-<component name="usbmscpersonality" filter="s60" long-name="USB MSC Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbmscpersonality/group"/>
-</component>
-<!-- commented out in bld.inf. Should this be deleted?
- <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
- <unit bldFile="usbclasses/ptpstack/group"/>
- </component>
- <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
- <unit bldFile="usbclasses/sicdusbplugin/group"/>
- </component>
- <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
- <unit bldFile="usbclasses/ptpserver/group"/>
- </component>-->
-<component name="pictbridgeengine" filter="s60" long-name="PictBridge Engine">
-<unit bldFile="mw/usbservices/usbclasses/pictbridgeengine/group"/>
-</component>
-<component name="usbphoneasmodem" filter="s60" long-name="USB Phone as Modem" introduced="^3">
-<unit bldFile="mw/usbservices/usbclasses/usbphoneasmodem/group"/>
-</component>
-</collection>
-<collection name="usbuis" long-name="USB UIs" level="specific">
-<component name="usbui" filter="s60" long-name="USB UI">
-<unit bldFile="mw/usbservices/usbuis/usbui/group"/>
-</component>
-<component name="usbuinotif" filter="s60" long-name="USB UI Notifiers">
-<unit bldFile="mw/usbservices/usbuis/usbuinotif/group"/>
-</component>
-<component name="imageprintuiprovider" filter="s60" long-name="ImagePrint UI Provider" plugin="Y">
-<unit bldFile="mw/usbservices/usbuis/imageprintuiprovider/group"/>
-</component>
-<component name="usbimageprintui" filter="s60" long-name="ImagePrint UI">
-<unit bldFile="mw/usbservices/usbuis/imageprintui/group"/>
-</component>
-<component name="usbuiqt" long-name="USB UI Qt" introduced="^4" filter="s60">
-<unit bldFile="mw/usbservices/usbuis/usbuiqt" proFile="usbapplication.pro"/>
-</component>
-</collection>
-<collection name="usbservices_test" long-name="USB Services Test" level="server"/>
-</block>
-<block name="shortlinkconn" level="generic" long-name="Shortlink Connectivity" levels="framework server generic specific plugin">
-<!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
-<collection name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" level="plugin">
-<component name="obex_service_utils_api" long-name="OBEX Service Utils API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_utils_api/group"/>
-</component>
-<component name="obex_service_plugin_api" long-name="OBEX Service Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_plugin_api/group"/>
-</component>
-<component name="dialup_connection_status_api" long-name="Dial-up Connection Status API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dialup_connection_status_api/group"/>
-</component>
-<component name="dun_secondary_display_notification_api" long-name="DUN Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
-</component>
-<component name="obex_secondary_display_notification_api" long-name="OBEX Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
-</component>
-<component name="generic_hid_api" long-name="Generic HID API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/generic_hid_api/group"/>
-</component>
-<component name="locod_bearer_plugin_api" long-name="Locod Bearer Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/locod_bearer_plugin_api/group"/>
-</component>
-<component name="usb_obexservicemanager_client_api" long-name="USB OBEX Service Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_obexservicemanager_client_api/group"/>
-</component>
-</collection>
-<collection name="localconnectivityservice" long-name="Local Connectivity Service" level="server">
-<component name="locod" long-name="Local Connectivity Daemon">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/locod/group"/>
-</component>
-<component name="obexserviceman" long-name="OBEX Service Managar">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
-</component>
-<component name="obexsendservices" long-name="OBEX Send Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
-</component>
-<component name="obexreceiveservices" long-name="OBEX Receive Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
-</component>
-<component name="dun" long-name="Dial Up Networking">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/dun/group"/>
-</component>
-<component name="lcstylustap" long-name="LC Stylus Tap Plugins" plugin="Y">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/lcstylustap/group"/>
-</component>
-<component name="generichid" long-name="Generic HID">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/generichid/group"/>
-</component>
-<component name="headset" long-name="Headset">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/headset/group"/>
-</component>
-</collection>
-</block>
-<block name="imghandling" level="specific" long-name="Image Handling" levels="lib util if">
-<collection name="imagehandling_plat" long-name="Image Handling Platform Interfaces" level="if">
-<component name="image_handling_library_api" long-name="Image Handling Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
-</component>
-<component name="3gp_library_api" long-name="3GP Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
-</component>
-<component name="thumbnailmanager_api" long-name="Thumbnail Manager API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagehandlinglib" long-name="Image Handling Library" level="lib">
-<!-- collection is really a component, need to move down a directory -->
-<component name="ihl" filter="s60" long-name="IHL">
-<unit bldFile="mw/imghandling/imagehandlinglib/group"/>
-</component>
-</collection>
-<collection name="imagehandlingutilities" long-name="Image Handling Utilities" level="util">
-<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager">
-<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
-</component>
-<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager Qt" introduced="^4">
-<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt" filter="!test" proFile="thumbnailmanagerqt.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</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">
-<unit bldFile="mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
-</component>
-</collection>
-</block>
-<block name="mds" level="specific" long-name="Metadata Services" levels="mgr eng server int">
-<collection name="mds_plat" long-name="Metadata Services Platform Interfaces" level="int">
-<component name="context_engine_plugin_api" long-name="Context Engine Plugin API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/group" filter="!test"/>
-</component>
-<component name="harvester_framework_api" long-name="Harvester Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/harvester_framework_api/group" filter="!test"/>
-<!-- can only have one unit with the same filter, #include the following from the previous unit -->
-</component>
-<component name="location_manager_api" long-name="Location Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/location_manager_api/group" filter="!test"/>
-</component>
-<component name="metadata_engine_api" long-name="Metadata Engine API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/metadata_engine_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_collection_manager_api" long-name="Content Listing Framework Collection Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_extended_api" long-name="Content Listing Framework Extended API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_extended_api/group"/>
-</component>
-</collection>
-<collection name="mds_pub" long-name="Metadata Services Public Interfaces" level="int">
-<component name="content_listing_framework_api" long-name="Content Listing Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_pub/content_listing_framework_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="metadataengine" long-name="Metadata Engine" level="eng">
-<component name="metadataengine_common" filter="s60" long-name="Metadata Engine Common" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/common/group"/>
-</component>
-<component name="metadataengine_server" filter="s60" long-name="Metadata Engine Server" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/server/group"/>
-</component>
-<component name="metadataengine_client" filter="s60" long-name="Metadata Engine Client" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/client/group"/>
-</component>
-<component name="metadataengine_build" filter="s60" long-name="Metadata Engine Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/metadataengine/group"/>
-</component>
-</collection>
-<collection name="locationmanager" long-name="Location Manager" level="mgr">
-<component name="locationtrail" filter="s60" long-name="Location Trail" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/locationtrail/group"/>
-</component>
-<component name="locationmanager_server" filter="s60" long-name="Location Manager Server" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/server/group"/>
-</component>
-<component name="locationmanager_client" filter="s60" long-name="Location Manager Client" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/client/group"/>
-</component>
-<component name="locationmanager_build" filter="s60" long-name="Location Manager Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/locationmanager/group"/>
-</component>
-</collection>
-<collection name="contextengine" long-name="Context Engine" level="eng">
-<component name="contextengine_plugins" filter="s60" long-name="Context Engine Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/contextengine/plugins/group"/>
-</component>
-<component name="contextengine_build" filter="s60" long-name="Context Engine Build" introduced="^2">
-<!--make this collection a single component, or make this unit self-contained -->
-<unit bldFile="mw/mds/contextengine/group"/>
-</component>
-</collection>
-<collection name="harvester" long-name="Harvester" level="eng">
-<component name="blacklistclient" filter="s60" long-name="Blacklist Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistclient/group"/>
-</component>
-<component name="blacklistserver" filter="s60" long-name="Blacklist Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistserver/group"/>
-</component>
-<component name="harvester_common" filter="s60" long-name="Harvester Common" introduced="^2">
-<unit bldFile="mw/mds/harvester/common/group"/>
-</component>
-<component name="composerplugins" filter="s60" long-name="Composer Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/composerplugins/group"/>
-</component>
-<component name="harvesterplugins" filter="s60" long-name="Harvester Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/harvesterplugins/group"/>
-</component>
-<component name="monitorplugins" filter="s60" long-name="Monitor Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/monitorplugins/group"/>
-</component>
-<component name="harvester_server" filter="s60" long-name="Harvester Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/server/group"/>
-</component>
-<component name="harvester_client" filter="s60" long-name="Harvester Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/client/group"/>
-</component>
-<component name="harvester_build" filter="s60" long-name="Harvester Build" introduced="^2">
-<!-- split these exports into the other components -->
-<unit bldFile="mw/mds/harvester/group"/>
-</component>
-</collection>
-<collection name="watchdog" long-name="Watchdog" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="mdswatchdog" filter="s60" long-name="Metadata Watchdog" introduced="^2">
-<unit bldFile="mw/mds/watchdog/group"/>
-</component>
-</collection>
-<collection name="clfwrapper" long-name="Content Listing Framework Wrapper" level="int">
-<!-- collection is really a component. Move down a directory -->
-<component name="clfwrapper_build" filter="s60" long-name="CLF Wrapper Build" introduced="^2" class="placeholder">
-<!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
-<!--<unit bldFile="clfwrapper/group"/>-->
-</component>
-</collection>
-<collection name="mds_info" long-name="Metadata Services Info" level="int">
-<component name="mds_build" filter="s60" long-name="Metadata Services Build" introduced="^2">
-<!-- consider distributiing this into the rest of the components in the package -->
-<unit bldFile="mw/mds/group"/>
-</component>
-</collection>
-</block>
-<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"/>
-</component>
-<component name="videoconnutility_api" long-name="Video Connection Utility API" filter="s60" class="api">
-<unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/group"/>
-</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"/>
-</component>
-</collection>
-<collection name="videoscheduler" long-name="Video Scheduler" level="util">
-<component name="schedulerclient" filter="s60" long-name="Video Scheduler Client">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerclient/group"/>
-</component>
-<component name="schedulerserver" filter="s60" long-name="Video Scheduler Server">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerserver/group"/>
-</component>
-</collection>
-<collection name="videoconnutility" long-name="Video Connection Utility" level="util">
-<component name="connutilpsworker" filter="s60" long-name="Connection Utility Publish and Subscribe Worker">
-<unit bldFile="mw/videoutils/videoconnutility/connutilpsworker/group"/>
-</component>
-<component name="video_connutility" filter="s60" long-name="Video Connection Utility">
-<unit bldFile="mw/videoutils/videoconnutility/connutility/group"/>
-</component>
-</collection>
-<collection name="videoutils_info" long-name="Video Utils Info" level="if"/>
-</block>
-<block name="mmmw" level="generic" long-name="Multimedia Middleware" levels="plugin framework server generic specific">
-<collection name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" level="specific">
-<component name="multimedia_data_source_api" long-name="Multimedia Data Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
-</component>
-<component name="progressive_download_api" long-name="Progressive Download API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/progressive_download_api/group"/>
-</component>
-<component name="equalizer_ui_api" long-name="Equalizer UI API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
-</component>
-<component name="enhanced_media_client_api" long-name="Enhanced Media Client API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
-</component>
-<component name="stream_control_custom_command_api" long-name="Stream Control Custom Command API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
-</component>
-<component name="emc_buffer_source_api" long-name="EMC Buffer Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_buffer_source_api/group"/>
-</component>
-<component name="emc_file_source_api" long-name="EMC File Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
-</component>
-<component name="audio_metadata_reader_api" long-name="Audio MetaData Reader API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
-</component>
-<component name="emc_progressive_download_source_api" long-name="EMC Progressive Download Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
-</component>
-<component name="emc_volume_effect_api" long-name="EMC Volume Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
-</component>
-<component name="emc_balance_effect_api" long-name="EMC Balance Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_balance_effect_api/group"/>
-</component>
-<component name="emc_descriptor_source_api" long-name="EMC Descriptor Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_descriptor_source_api/group"/>
-</component>
-<component name="emc_drm_config_intfc_api" long-name="EMC DRM Config Intfc API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
-</component>
-<component name="voip_audio_services_api" long-name="VoIP Audio Services" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/group"/>
-</component>
-<component name="configuration_components_factory_api" long-name="Configuration Components Factory API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
-</component>
-<component name="audio_output_control_utility_api" long-name="Audio Output Control Utility API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/group"/>
-</component>
-<component name="audio_output_control_utility_proxy_api" long-name="Audio Output Control Utility Proxy API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
-</component>
-<component name="emc_audio_effects_api" long-name="EMC Audio Effects API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
-</component>
-<component name="call_audio_control_api" long-name="Call AudioControl API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/group"/>
-</component>
-<component name="radio_utilities_api" long-name="Radio Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/group"/>
-</component>
-<component name="radio_preset_utilities_api" long-name="Radio Preset Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
-</component>
-<component name="radio_monitor_api" long-name="Radio Monitor API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
-</component>
-<component name="thumbnail_engine_api" long-name="Thumbnail Engine API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/thumbnail_engine_api/group"/>
-</component>
-<component name="telephony_multimedia_service_api" long-name="Telephony Multimedia Service API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
-</component>
-<component name="openmax_al_api" long-name="OpenMAX AL API" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/openmax_al_api/group"/>
-</component>
-</collection>
-<collection name="mmfenh" long-name="MMF Enhancements" level="generic">
-<component name="advancedaudiocontroller" filter="s60" long-name="Advanced Audio Controllers" plugin="Y">
-<unit bldFile="mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
-</component>
-<component name="audiooutputcontrolutility" filter="s60" long-name="Audio Output Control Utility">
-<unit bldFile="mw/mmmw/mmfenh/audiooutputcontrolutility/group"/>
-</component>
-<component name="configurationcomponentsfactory" filter="s60" long-name="Configuration Components Factory">
-<unit bldFile="mw/mmmw/mmfenh/configurationcomponentsfactory/group"/>
-</component>
-<component name="enhancedaudioplayerutility" filter="s60" long-name="Enhanced Audio Player Utility">
-<unit bldFile="mw/mmmw/mmfenh/enhancedaudioplayerutility/group"/>
-</component>
-<component name="enhancedmediaclient" filter="s60" long-name="Enhanced Media Client">
-<unit bldFile="mw/mmmw/mmfenh/enhancedmediaclient/group"/>
-</component>
-<component name="profilesettingsmonitor" filter="s60" long-name="Profile Settings Monitor">
-<unit bldFile="mw/mmmw/mmfenh/profilesettingsmonitor/group"/>
-</component>
-<component name="progressivedownload" filter="s60" long-name="Progressive Download">
-<unit bldFile="mw/mmmw/mmfenh/progressivedownload/group"/>
-</component>
-</collection>
-<collection name="mm_fw" long-name="Multimedia Frameworks" level="framework">
-<!-- Id needs to be unique, mmfw already in use -->
-<!-- Placeholder for OpenAX AL and other stuff -->
-</collection>
-<collection name="mmserv" long-name="Multimedia Services" level="specific">
-<component name="audioeffectsui" filter="s60" long-name="Audio Effects UI">
-<unit bldFile="mw/mmmw/mmserv/audioeffectsui/group"/>
-</component>
-<component name="callaudiocontrol" filter="s60" long-name="Call Audio Control">
-<unit bldFile="mw/mmmw/mmserv/callaudiocontrol/group"/>
-</component>
-<component name="metadatautility" filter="s60" long-name="Metadata Utility">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/group"/>
-</component>
-<component name="radioutility" filter="s60" long-name="Radio Utility">
-<unit bldFile="mw/mmmw/mmserv/radioutility/group"/>
-</component>
-<component name="thumbnailengine" filter="s60" long-name="Thumbnail Engine" introduced="^2">
-<unit bldFile="mw/mmmw/mmserv/thumbnailengine/group"/>
-</component>
-<component name="tms" filter="s60" long-name="Telephony Multimedia Service" introduced="^3">
-<unit bldFile="mw/mmmw/mmserv/tms/group"/>
-</component>
-<component name="voipaudioservices" filter="s60" long-name="VoIP Audio Services">
-<unit bldFile="mw/mmmw/mmserv/voipaudioservices/group"/>
-</component>
-<component name="lib3gpextparser" filter="s60" long-name="3GP Extension Metadata Parser Library">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group" filter="sf_build"/>
-</component>
-</collection>
-<collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
-<component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="helix" level="generic" long-name="Helix" levels="plugin framework server generic specific">
-<collection name="helix_ren" long-name="Helix Engine" level="framework">
-<!-- what does "ren" stand for? -->
-<component name="helix_stub" filter="s60" long-name="Helix Stub" introduced="^2" class="api">
-<unit bldFile="mw/helix/helix_ren/helix_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="camerasrv" level="specific" long-name="Camera Services" levels="plugin fw api">
-<collection name="camerasrv_plat" long-name="Camera Services Platform Interfaces" level="api">
-<component name="media_recorder_sink_api" long-name="Media Recorder Sink API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
-</component>
-<component name="cae_extentension_api" long-name="CAE Extension API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/cae_extentension_api/group"/>
-</component>
-<component name="camera_application_engine_api" long-name="Camera Application Engine API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/camera_application_engine_api/group" filter="!test"/>
-</component>
-<component name="custom_onboard_camera_api" long-name="Custom Onboard Camera API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
-</component>
-<component name="imaging_configuration_manager_api" long-name="Imaging Configuration Manager API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
-</component>
-<component name="media_recorder_api" long-name="Media Recorder API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_api/group" filter="!test"/>
-</component>
-<component name="3gp_file_composer_api" long-name="3GP File Composer API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
-</component>
-</collection>
-<collection name="camcordermmfplugin" long-name="Camcorder MMF Plugin" level="plugin">
-<!-- collection is really a component. Should move down a directory -->
-<component name="camcordermmfplugin_build" filter="s60" long-name="Camcorder MMF Plugin Build" plugin="Y">
-<unit bldFile="mw/camerasrv/camcordermmfplugin/build"/>
-</component>
-</collection>
-<collection name="configmanagers" long-name="Config Managers" level="api">
-<component name="imagingconfigmanager" filter="s60" long-name="Imaging Config Manager">
-<unit bldFile="mw/camerasrv/configmanagers/imagingconfigmanager/group"/>
-</component>
-</collection>
-<collection name="camerasrv_info" long-name="Camera Services Info" level="api">
-<component name="camerasrv_build" filter="s60" long-name="Camera Services Build">
-<!-- should split into individual bld.infs -->
-<unit bldFile="mw/camerasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="mmappfw" level="specific" long-name="Multimedia App Framework" levels="fw utils if">
-<collection name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" level="if">
-<component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interfaces Build" introduced="^1" filter="s60">
-<!-- this is no longer necessary when confguration is put in place -->
-<unit bldFile="mw/mmappfw/mmappfw_plat"/>
-</component>
-<component name="collection_helper_api" long-name="Collection Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
-</component>
-<component name="harvester_collection_mediator_api" long-name="Harvester Collection Mediator API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/group"/>
-</component>
-<component name="harvester_metadata_extractor_api" long-name="Harvester Metadata Extractor API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/group"/>
-</component>
-<component name="harvester_server_api" long-name="Harvester Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_server_api/group"/>
-</component>
-<component name="harvester_utility_api" long-name="Harvester Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_utility_api/group"/>
-</component>
-<component name="playlist_engine_api" long-name="Playlist Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playlist_engine_api/group"/>
-</component>
-<component name="mtp_keys_api" long-name="MTP Keys API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mtp_keys_api/group"/>
-</component>
-<component name="mpx_collection_common_definition_api" long-name="MPX Collection Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_common_definition_api/group"/>
-</component>
-<component name="mpx_collection_utility_api" long-name="MPX Collection Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/group"/>
-</component>
-<component name="mpx_common_api" long-name="MPX Common API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_api/group"/>
-</component>
-<component name="mpx_common_definition_api" long-name="MPX Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_common_definition_api" long-name="MPX Playback Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_utility_api" long-name="MPX Playback Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/group"/>
-</component>
-<component name="mpx_base_view_plugins_api" long-name="MPX Base View Plugins API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/group"/>
-</component>
-<component name="mpx_view_utility_api" long-name="MPX View Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_view_utility_api/group"/>
-</component>
-<component name="mpx_albumart_utility_api" long-name="MPX Album Art Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/group"/>
-</component>
-<component name="media_player_settings_engine_api" long-name="Media Player Settings Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
-</component>
-<component name="mpx_backstepping_utility_api" long-name="MPX Backstepping Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_backstepping_utility_api/group"/>
-</component>
-<component name="asx_parser_api" long-name="ASX Parser API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/asx_parser_api/group"/>
-</component>
-<component name="playback_helper_api" long-name="Playback Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playback_helper_api/group"/>
-</component>
-<component name="videoplaylist_utility_api" long-name="Video Playlist Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/videoplaylist_utility_api/group"/>
-</component>
-</collection>
-<collection name="mpx" long-name="Multimedia Player" level="fw">
-<component name="commonframework" filter="s60" long-name="MPX Common Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/commonframework/group"/>
-</component>
-<component name="playbackframework" filter="s60" long-name="MPX Playback Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/playbackframework/group"/>
-</component>
-<component name="mpxcollectionfw" filter="s60" long-name="MPX Collection Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/collectionframework/group"/>
-</component>
-<component name="mpxviewfw" filter="s60" long-name="MPX View Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/viewframework/group"/>
-</component>
-<component name="mpxviewframeworkqt" long-name="MPX View Framework Qt" filter="s60">
-<unit bldFile="mw/mmappfw/mpx/mpxviewframeworkqt" proFile="mpxviewframeworkqt.pro" qmakeArgs="-r -config rom"/>
-</component>
-<component name="mpx_build" filter="s60" long-name="MPX Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/mpx/group"/>
-</component>
-</collection>
-<collection name="mmappcomponents" long-name="Multimedia App Components" level="utils">
-<component name="mmappcomponents_build" filter="s60" long-name="Multimedia App Components Build" introduced="^1">
-<!-- needed for #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
- Can remove this once configuration is in place-->
-<unit bldFile="mw/mmappfw/mmappcomponents/group"/>
-</component>
-<component name="collectionhelper" filter="s60" long-name="Media Player Collection Helper" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/collectionhelper/group"/>
-</component>
-<component name="playlistengine" filter="s60" long-name="Playlist Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/playlistengine/group"/>
-</component>
-<component name="mpxharvester" filter="s60" long-name="Media Player Harvester" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/harvester/group"/>
-</component>
-<component name="mmappcommonui" filter="s60" long-name="Multimedia App Common UI" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmappcommonui/group"/>
-</component>
-<component name="mediaplayersettingsengine" filter="s60" long-name="Media Player Settings Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
-</component>
-<component name="audiofetcher" filter="s60" long-name="Audio Fetcher" introduced="^1" plugin="Y">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
-</component>
-<component name="asxparser" filter="s60" long-name="ASX Parser" introduced="^1">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
-</component>
-<component name="playbackhelper" filter="s60" long-name="Playback Helper" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/playbackhelper/group"/>
-</component>
-<component name="videoplaylistutility" filter="s60" long-name="Video Playlist Utility" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/videoplaylistutility/group"/>
-</component>
-<component name="mmmtpdataprovider" filter="s60" long-name="Multimedia MTP Data Provider" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmmtpdataprovider/group"/>
-</component>
-</collection>
-<collection name="mmappfw_info" long-name="Multimedia App Framework Info" level="if">
-<component name="mmappfw_build" filter="s60" long-name="Multimedia App Framework Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/group"/>
-</component>
-<component name="mmappfw_test" filter="s60,test,api_test,pref_test" long-name="Multimedia App Framework Test" purpose="development" introduced="^1"/>
-</collection>
-</block>
-<block name="hgwidgets" level="specific" long-name="HG Widgets" levels="framework service api">
-<collection name="hgwidgets_pub" long-name="HG Widgets Platform Interfaces" level="api">
-<component name="ganeswidgets_api" long-name="Ganes Widgets API" introduced="^4" class="api placeholder">
-<!-- should separate out unit -->
-</component>
-</collection>
-<collection name="hgwidgets_pub" long-name="HG Widgets Public Interfaces" level="api"/>
-<collection name="ganeswidgets" long-name="Ganes Widgets" level="service">
-<!-- really a component, should move down a dir level and have a unit -->
-<component name="ganeswidgets_build" long-name="Ganes Widgets Build" introduced="^4" class="placeholder">
-<!-- should separate out unit -->
-</component>
-</collection>
-<collection name="hgwidgets_info" long-name="HG Widgets Info" level="framework">
-<component name="hgwidgets_build" long-name="HG Widgets Build" introduced="^4">
-<unit bldFile="mw/hgwidgets" proFile="hgwidgets.pro"/>
-</component>
-</collection>
-</block>
-<block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework api">
-<collection name="inputmethods_pub" long-name="Input Methods Public Interfaces" level="api">
-<component name="ptiengine_iti_api" long-name="PTI Engine API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
-</component>
-<component name="optical_character_recognition_api" long-name="Optical Character Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
-</component>
-<component name="input_language_info_api" long-name="Input Language Info API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
-</component>
-</collection>
-<collection name="inputmethods_plat" long-name="Input Methods Platform Interfaces" level="api">
-<component name="pen_input_server_api" long-name="Pen Input Server API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/group" filter="!test"/>
-</component>
-<component name="ptiengine_hwr_api" long-name="PTI Engine Handwriting Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group" filter="!test"/>
-</component>
-<component name="aknfep_settings_api" long-name="Avkon FEP Settings API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
-</component>
-<component name="aknfep_status_api" long-name="Avkon FEP Status API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
-</component>
-<component name="ptiengine_key_definations_api" long-name="PTI Engine Key Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
-</component>
-<component name="aknfep_definitions_api" long-name="Avkon FEP Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
-</component>
-<component name="aknfep_pen_support_api" long-name="Avkon FEP Pen Support API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
-</component>
-<component name="ptiengine_indic_definitions_api" long-name="PTI Engine Indic Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
-</component>
-<component name="aknfep_uiinterface_api" long-name="Avkon FEP UI Interface API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="textinput" long-name="Text Input" level="framework">
-<component name="ptienginev2" filter="s60" long-name="Predictive Text Input Engine">
-<!--uncomment when configuration is turned on and textinput_build is removed-->
-<!-- <unit bldFile="textinput/ptienginev2/group"/>-->
-</component>
-<component name="akninputlanguage" filter="s60" long-name="Avkon Input Language">
-<unit bldFile="mw/inputmethods/textinput/akninputlanguage/group"/>
-</component>
-<component name="peninputarc" filter="s60" long-name="Pen Input Arc">
-<unit bldFile="mw/inputmethods/textinput/peninputarc/group"/>
-</component>
-<component name="peninputcommonctrls" filter="s60" long-name="Pen Input Common Controls">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonctrls/group"/>
-</component>
-<component name="peninputcommonlayout" filter="s60" long-name="Pen Input Common Layout">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonlayout/group"/>
-</component>
-<component name="peninputhwrtrui" filter="s60" long-name="Pen Input Handwriting Recognition Training UI" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrtrui/group"/>
-</component>
-<component name="textinput_build" filter="s60" long-name="Text Input Build">
-<!--needed for #ifdef, can be removed when configuration is implemented -->
-<unit bldFile="mw/inputmethods/textinput/group"/>
-</component>
-</collection>
-<collection name="fep" long-name="FEP" level="engine">
-<component name="aknfep" filter="s60" long-name="Avkon FEP" plugin="Y">
-<unit bldFile="mw/inputmethods/fep/aknfep/group"/>
-</component>
-<component name="frontendprocessor" long-name="Front End Processor" purpose="mandatory">
-<unit bldFile="mw/inputmethods/fep/frontendprocessor/group" mrp="mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
-</component>
-</collection>
-<collection name="inputmethods_info" long-name="Input Methods Info" level="api">
-<component name="inputmethods_metadata" long-name="Input Methods Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="qt" level="generic" long-name="Qt" levels="tool mw app">
-<collection name="qtconf" long-name="Qt Config" level="tool">
-<component name="qt_deviceconfiguration" long-name="Qt Device Configuration" introduced="^2" class="config tool">
-<unit bldFile="mw/qt/src/s60installs/deviceconfiguration"/>
-</component>
-</collection>
-<collection name="qt_info" long-name="Qt Info" level="mw">
-<component name="qt_build" long-name="Qt Build" introduced="^2">
-<unit bldFile="mw/qt" proFile="projects.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-<collection name="qtdemos" long-name="Qt Demos" level="app">
-<component name="qtdemos_build" long-name="Qt Demos Build" introduced="^2" filter="qtdemos">
-<unit bldFile="mw/qt/demos" proFile="demos.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-<collection name="qtexamples" long-name="Qt Examples" level="app">
-<component name="qtexamples_build" long-name="Qt Examples Build" introduced="^2" filter="qtexamples">
-<unit bldFile="mw/qt/examples" proFile="examples.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-<collection name="qt_tests" long-name="Qt Tests" level="app">
-<component name="qttestsauto" long-name="Qt Automated Tests" introduced="^2" filter="qttestsauto">
-<unit bldFile="mw/qt/tests/auto" proFile="qtpauto.pro"/>
-</component>
-<component name="qttestsbenchmarks" long-name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks">
-<unit bldFile="mw/qt/tests/benchmarks" proFile="benchmarks.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-</block>
-<block name="qtextensions" level="generic" long-name="Qt Extensions" levels="tool mw app">
-<collection name="qtecomplugins" long-name="Qt ECom Plugins" level="app">
-<component name="qtextensions_examples" filter="qtextensionsexamples" long-name="Qt ECom Plugin Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtecomplugins/examples" proFile="examples.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qthighway" long-name="Qt Highway" level="app">
-<component name="qthighway_examples" filter="qtextensionsexamples" long-name="Qt Highway Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qthighway/examples" qmakeArgs="-r"/>
-</component>
-<component name="qthighwaytests" filter="qtextensionstests" long-name="Qt Highway Tests" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qthighway/tests" proFile="tests.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qtmobileextensions" long-name="Qt Mobile Extensions" level="app">
-<component name="qtmobileextensions_examples" filter="qtextensionsexamples" long-name="Qt Mobile Extensions Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtmobileextensions/examples" proFile="examples.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qtmobility" long-name="Qt Mobility">
-<component name="qtmobility_examples" filter="qtextensionsexamples" long-name="Qt Mobility Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtmobility/examples" proFile="examples.pro" qmakeArgs="-r"/>
-</component>
-<component name="qtmobilitytests" filter="qtextensionstests" long-name="Qt Extensions Tests" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtmobility/tests" proFile="tests.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qtextensions_info">
-<component name="qtextensions_build" long-name="Qt Extensions Confgure" introduced="^4" class="conf">
-<unit bldFile="mw/qtextensions/group"/>
-</component>
-<component name="qtextensions_build" long-name="Qt Extensions Build" introduced="^4">
-<!-- break this up into the above collections-->
-<unit bldFile="mw/qtextensions" proFile="qtextensions.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</block>
-<block name="hb" level="generic" long-name="Orbit"/>
-<block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
-<collection name="classicui_plat" long-name="Classic UI Platform Interfaces" level="specific">
-<component name="personalisation_framework_api" long-name="Personalisation Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_framework_api/group" filter="!test"/>
-</component>
-<component name="signal_pane_api" long-name="Signal Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
-</component>
-<component name="japanese_reading_api" long-name="Japanese Reading API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/japanese_reading_api/group" filter="!test"/>
-</component>
-<component name="global_popup_priority_controller_api" long-name="Global Popup Priority Controller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
-</component>
-<component name="item_finder_api" long-name="Item Finder API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/item_finder_api/group" filter="!test"/>
-</component>
-<component name="avkon_fonts_api" long-name="Avkon Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_fonts_api/group" filter="!test"/>
-</component>
-<component name="extended_utilities_api" long-name="Extended Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
-</component>
-<component name="personalisation_plugin_api" long-name="Personalisation Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
-</component>
-<component name="extended_aiw_criteria_api" long-name="Extended AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="personalisation_application_api" long-name="Personalisation Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_application_api/group"/>
-</component>
-<component name="volume_popup_api" long-name="Volume Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
-</component>
-<component name="avkon_secondary_display_support_api" long-name="AVKON Secondary Display Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_support_api/group" filter="!test"/>
-</component>
-<component name="extended_setting_pages_api" long-name="Extended Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_setting_pages_api/group" filter="!test"/>
-</component>
-<component name="extended_lists_api" long-name="Extended Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_lists_api/group" filter="!test"/>
-</component>
-<component name="input_block_api" long-name="Input Block API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/input_block_api/group" filter="!test"/>
-</component>
-<component name="avkon_ui_server_api" long-name="AVKON UI Server API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_ui_server_api/group" filter="!test"/>
-</component>
-<component name="number_grouping_api" long-name="Number Grouping API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/number_grouping_api/group" filter="!test"/>
-</component>
-<component name="extended_status_pane_api" long-name="Extended Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_status_pane_api/group" filter="!test"/>
-</component>
-<component name="extended_notifiers_api" long-name="Extended Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notifiers_api/group" filter="!test"/>
-</component>
-<component name="task_list_api" long-name="Task List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
-</component>
-<component name="personalisation_slide_show_dialog_api" long-name="Personalisation Slide Show Dialog API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
-</component>
-<component name="key_event_utilities_api" long-name="Key Event Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_event_utilities_api/group"/>
-</component>
-<component name="emergency_call_support_api" long-name="Emergency Call Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/emergency_call_support_api/group" filter="!test"/>
-</component>
-<component name="extended_dialogs_api" long-name="Extended Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_dialogs_api/group"/>
-</component>
-<component name="legacy_ui_framework_headers_api" long-name="Legacy UI Framework Headers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/legacy_ui_framework_headers_api/group"/>
-</component>
-<component name="extended_editors_api" long-name="Extended Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_editors_api/group" filter="!test"/>
-</component>
-<component name="alarm_api" long-name="Alarm API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alarm_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_interface_base_api" long-name="AIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_base_api/group" filter="!test"/>
-</component>
-<component name="list_effects_api" long-name="List Effects API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/list_effects_api/group" filter="!test"/>
-</component>
-<component name="find_item_ui_api" long-name="Find Item UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/find_item_ui_api/group" filter="!test"/>
-</component>
-<component name="server_application_services_api" long-name="Server Application Services API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/server_application_services_api/group" filter="!test"/>
-</component>
-<component name="common_ui_settings_api" long-name="Common UI Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_ui_settings_api/group"/>
-</component>
-<component name="aiw_service_interface_menu_api" long-name="AIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_menu_api/group" filter="!test"/>
-</component>
-<component name="eikon_server_extension_client_api" long-name="EIKON Server Extension Client API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/eikon_server_extension_client_api/group" filter="!test"/>
-</component>
-<component name="skinnable_clock_api" long-name="Skinnable Clock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/skinnable_clock_api/group" filter="!test"/>
-</component>
-<component name="battery_pane_api" long-name="Battery Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/battery_pane_api/group" filter="!test"/>
-</component>
-<component name="fep_document_navigation_api" long-name="FEP Document Navigation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
-</component>
-<component name="personalisation_localised_texts_api" long-name="Personalisation Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
-</component>
-<component name="memory_card_ui_api" long-name="Memory Card UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
-</component>
-<component name="avkon_status_api" long-name="AVKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_status_api/group"/>
-</component>
-<component name="application_switching_api" long-name="Application Switching API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/application_switching_api/group" filter="!test"/>
-</component>
-<component name="avkon_localised_texts_api" long-name="AVKON Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_localised_texts_api/group"/>
-</component>
-<component name="avkon_secondary_display_api" long-name="AVKON Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_api/group"/>
-</component>
-<component name="extended_animation_api" long-name="Extended Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_notes_api" long-name="Extended Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notes_api/group" filter="!test"/>
-</component>
-<component name="text_scroller_api" long-name="Text Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/text_scroller_api/group" filter="!test"/>
-</component>
-<component name="custom_cursors_api" long-name="Custom Cursors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/custom_cursors_api/group" filter="!test"/>
-</component>
-<component name="global_window_priorities_api" long-name="Global Window Priorities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_window_priorities_api/group"/>
-</component>
-<component name="extended_indicators_api" long-name="Extended Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_indicators_api/group" filter="!test"/>
-</component>
-<component name="special_character_table_api" long-name="Special Character Table API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/special_character_table_api/group" filter="!test"/>
-</component>
-<component name="avkon_settings_api" long-name="AVKON Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_settings_api/group"/>
-</component>
-<component name="extended_sounds_api" long-name="Extended Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_sounds_api/group"/>
-</component>
-<component name="themes_settings_api" long-name="Themes Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/themes_settings_api/group"/>
-</component>
-<component name="media_shared_document_api" long-name="Media Shared Document API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/media_shared_document_api/group" filter="!test"/>
-</component>
-<component name="extended_queries_api" long-name="Extended Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_queries_api/group"/>
-</component>
-<component name="phone_number_text_utilities_api" long-name="Phone Number Text Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
-</component>
-<component name="extended_scroller_api" long-name="Extended Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_scroller_api/group"/>
-</component>
-<component name="key_rotator_api" long-name="Key Rotator API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_rotator_api/group" filter="!test"/>
-</component>
-<component name="extended_grids_api" long-name="Extended Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_grids_api/group" filter="!test"/>
-</component>
-<component name="generic_parameter_api" long-name="Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="indicator_touch_observer_api" long-name="Indicator Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_touch_observer_api/group"/>
-</component>
-<component name="popup_form_api" long-name="Popup Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/popup_form_api/group" filter="!test"/>
-</component>
-<component name="stylus_activated_popup_api" long-name="Stylus Activated Pop-up API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/stylus_activated_popup_api/group" filter="!test"/>
-</component>
-<component name="indicator_plugin_api" long-name="Indicator Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_plugin_api/group" filter="!test"/>
-</component>
-<component name="layout_configuration_api" long-name="Layout Configuration API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/layout_configuration_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_filter_factory_api" long-name="Common File Dialogs Filter Factory API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group" filter="!test"/>
-</component>
-<component name="avkon_anim_dll_api" long-name="AVKON Anim DLL API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_anim_dll_api/group"/>
-</component>
-<component name="extended_initialization_api" long-name="Extended Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_initialization_api/group" filter="!test"/>
-</component>
-<component name="long_tap_animation_api" long-name="Long Tap Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/long_tap_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_ui_framework_definitions_api" long-name="Extended UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_ui_framework_definitions_api/group"/>
-</component>
-<component name="extended_buttons_api" long-name="Extended Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_buttons_api/group" filter="!test"/>
-</component>
-<component name="aiw_provider_utility_api" long-name="AIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_provider_utility_api/group" filter="!test"/>
-</component>
-<component name="transition_effect_parameters_api" long-name="Transition Effect Parameters API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_parameters_api/group" filter="!test"/>
-</component>
-<component name="extended_input_capabilities_api" long-name="Extended Input Capabilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_input_capabilities_api/group" filter="!test"/>
-</component>
-<component name="uikon_status_api" long-name="UIKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/uikon_status_api/group"/>
-</component>
-<component name="transition_effect_utilities_api" long-name="Transition Effect Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_utilities_api/group" filter="!test"/>
-</component>
-<component name="pointer_event_modifier_api" long-name="Pointer Event Modifier API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/pointer_event_modifier_api/group" filter="!test"/>
-</component>
-<component name="avkon_testability_api" long-name="AVKON Testability API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_testability_api/group"/>
-</component>
-<component name="ganes_api" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ganes_api/group"/>
-</component>
-<component name="ode_api" long-name="Ode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ode_api/group"/>
-</component>
-<component name="physics_api" long-name="Physics API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/physics_api/group"/>
-</component>
-<component name="touch_pane_api" long-name="Touch Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_api/group" filter="!test"/>
-</component>
-<component name="touch_pane_observer_api" long-name="Touch Pane Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_observer_api/group"/>
-</component>
-<component name="alternate_fs_api" long-name="Alternate FS API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alternate_fs_api/group"/>
-</component>
-<component name="discreet_popup_api" long-name="Discreet Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/discreet_popup_api/group"/>
-</component>
-<component name="touch_gesture_framework_api" long-name="Touch Gesture Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_gesture_framework_api/group"/>
-<!-- should this be commented out? -->
-<!--<unit bldFile="classicui_plat/touch_gesture_framework_api/tsrc/group" filter="test,api_test"/> -->
-</component>
-<component name="extended_options_menu_api" long-name="Extended Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="classicui_pub" long-name="Classic UI Public Interfaces" level="specific">
-<component name="input_frame_api" long-name="Input Frame API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/input_frame_api/group" filter="!test"/>
-</component>
-<component name="window_server_event_observer_api" long-name="Window Server Event Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/window_server_event_observer_api/group" filter="!test"/>
-</component>
-<component name="application_framework_api" long-name="Application Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/application_framework_api/group" filter="!test"/>
-</component>
-<component name="scroller_api" long-name="Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/scroller_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_utilities_api" long-name="UI Framework Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_utilities_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_definitions_api" long-name="UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_definitions_api/group" filter="!test"/>
-</component>
-<component name="buttons_api" long-name="Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/buttons_api/group" filter="!test"/>
-</component>
-<component name="queries_api" long-name="Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/queries_api/group" filter="!test"/>
-</component>
-<component name="aiw_generic_parameter_api" long-name="AIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="editors_api" long-name="Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/editors_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_api" long-name="Common File Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/common_file_dialogs_api/group" filter="!test"/>
-</component>
-<component name="dialog_shutter_api" long-name="Dialog Shutter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialog_shutter_api/group" filter="!test"/>
-</component>
-<component name="fonts_api" long-name="Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/fonts_api/group" filter="!test"/>
-</component>
-<component name="screen_clearer_api" long-name="Screen Clearer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_clearer_api/group" filter="!test"/>
-</component>
-<component name="notifiers_api" long-name="Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notifiers_api/group" filter="!test"/>
-</component>
-<component name="notes_api" long-name="Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notes_api/group" filter="!test"/>
-</component>
-<component name="status_pane_api" long-name="Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/status_pane_api/group" filter="!test"/>
-</component>
-<component name="base_controls_api" long-name="Base Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/base_controls_api/group" filter="!test"/>
-</component>
-<component name="grids_api" long-name="Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/grids_api/group" filter="!test"/>
-</component>
-<component name="context_pane_api" long-name="Context Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/context_pane_api/group" filter="!test"/>
-</component>
-<component name="lists_api" long-name="Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/lists_api/group" filter="!test"/>
-</component>
-<component name="popups_api" long-name="Popups API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/popups_api/group" filter="!test"/>
-</component>
-<component name="misc_controls_api" long-name="Misc Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/misc_controls_api/group" filter="!test"/>
-</component>
-<component name="keylock_api" long-name="Keylock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/keylock_api/group" filter="!test"/>
-</component>
-<component name="options_menu_api" long-name="Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/options_menu_api/group" filter="!test"/>
-</component>
-<component name="hierarchical_lists_api" long-name="Hierarchical Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hierarchical_lists_api/group" filter="!test"/>
-</component>
-<component name="navigation_pane_api" long-name="Navigation Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/navigation_pane_api/group" filter="!test"/>
-</component>
-<component name="tabs_api" long-name="Tabs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/tabs_api/group" filter="!test"/>
-</component>
-<component name="title_pane_touch_observer_api" long-name="Title Pane Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_touch_observer_api/group"/>
-</component>
-<component name="choice_list_api" long-name="Choice List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/choice_list_api/group" filter="!test"/>
-</component>
-<component name="info_popup_note_api" long-name="Info Popup Note API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/info_popup_note_api/group" filter="!test"/>
-</component>
-<component name="setting_pages_api" long-name="Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/setting_pages_api/group" filter="!test"/>
-</component>
-<component name="screen_mode_api" long-name="Screen Mode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_mode_api/group" filter="!test"/>
-</component>
-<component name="indicators_api" long-name="Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/indicators_api/group" filter="!test"/>
-</component>
-<component name="error_ui_api" long-name="Error UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/error_ui_api/group" filter="!test"/>
-</component>
-<component name="animation_api" long-name="Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/animation_api/group" filter="!test"/>
-</component>
-<component name="searchfield_api" long-name="Searchfield API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/searchfield_api/group" filter="!test"/>
-</component>
-<component name="labels_api" long-name="Labels API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/labels_api/group" filter="!test"/>
-</component>
-<component name="hotkeys_api" long-name="Hotkeys API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hotkeys_api/group" filter="!test"/>
-</component>
-<component name="initialization_api" long-name="Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/initialization_api/group" filter="!test"/>
-</component>
-<component name="volume_control_api" long-name="Volume Control API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/volume_control_api/group" filter="!test"/>
-</component>
-<component name="title_pane_api" long-name="Title Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_api/group" filter="!test"/>
-</component>
-<component name="sounds_api" long-name="Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/sounds_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_handler_api" long-name="AIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_service_handler_api/group" filter="!test"/>
-</component>
-<component name="aiw_criteria_api" long-name="AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="touch_ui_utilities_api" long-name="Touch UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/touch_ui_utilities_api/group" filter="!test"/>
-</component>
-<component name="generic_button_api" long-name="Generic Button API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/generic_button_api/group" filter="!test"/>
-</component>
-<component name="form_api" long-name="Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/form_api/group" filter="!test"/>
-</component>
-<component name="uikon_core_controls" long-name="Uikon Core Controls" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/uikon_core_controls/group" filter="!test"/>
-</component>
-<component name="calendar_api" long-name="Calendar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/calendar_api/group"/>
-</component>
-<component name="toolbar_api" long-name="Toolbar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/toolbar_api/group" filter="!test"/>
-</component>
-<component name="server_application_api" long-name="Server Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/server_application_api/group"/>
-</component>
-<component name="slider_api" long-name="Slider API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/slider_api/group" filter="!test"/>
-</component>
-<component name="private_ui_framework_api" long-name="Private UI Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/private_ui_framework_api/group" filter="!test"/>
-</component>
-<component name="dialogs_api" long-name="Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialogs_api/group" filter="!test"/>
-</component>
-<component name="document_handler_api" long-name="Document handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/document_handler_api/group"/>
-</component>
-<component name="images_api" long-name="Images API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/images_api/group" filter="!test"/>
-</component>
-<component name="stylus_popup_menu_api" long-name="Stylus Pop-up Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/stylus_popup_menu_api/group" filter="!test"/>
-</component>
-<component name="information_preview_popup_api" long-name="Information Preview Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/information_preview_popup_api/group" filter="!test"/>
-</component>
-<component name="intermediate_state_api" long-name="Intermediate State API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/intermediate_state_api/group"/>
-</component>
-<component name="help_launcher_api" long-name="Help Launcher API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/help_launcher_api/group"/>
-</component>
-</collection>
-<collection name="ode" long-name="Open Dynamics Engine" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="ode_build" filter="s60" long-name="ODE">
-<unit bldFile="mw/classicui/ode/group"/>
-</component>
-</collection>
-<collection name="uifw" long-name="UI Framework" level="server">
-<component name="uiklaf" filter="s60" long-name="Uikon Look-and-Feel">
-<unit bldFile="mw/classicui/uifw/uiklaf/group"/>
-</component>
-<component name="eikctl" filter="s60" long-name="Eikon Controls">
-<unit bldFile="mw/classicui/uifw/eikctl/group"/>
-</component>
-<component name="avkon" filter="s60" long-name="Avkon">
-<!-- can only have one unit. Split into 3 components, or #include all from same bld.inf -->
-<unit bldFile="mw/classicui/uifw/avkon/aknphysics/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/aknconf/group"/>
-</component>
-<component name="eikstd" filter="s60" long-name="Eikon Standard">
-<unit bldFile="mw/classicui/uifw/eikstd/group"/>
-</component>
-<component name="aknglobalui" filter="s60" long-name="Avkon Global UI">
-<unit bldFile="mw/classicui/uifw/aknglobalui/group"/>
-</component>
-<component name="ganes" filter="s60" long-name="Ganes">
-<unit bldFile="mw/classicui/uifw/ganes/group"/>
-</component>
-</collection>
-<collection name="commonuis" long-name="Common UIs" level="specific">
-<component name="commonui" filter="s60" long-name="Common UI">
-<unit bldFile="mw/classicui/commonuis/commonui/group"/>
-</component>
-<component name="commondialogs" filter="s60" long-name="Common Dialogs">
-<unit bldFile="mw/classicui/commonuis/commondialogs/group"/>
-</component>
-</collection>
-<collection name="applicationinterworkingfw" long-name="Application Interworking Framework" level="generic">
-<component name="aifwservicehandler" filter="s60" long-name="Application Interworking Service Handler">
-<unit bldFile="mw/classicui/applicationinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-<collection name="psln" long-name="Personalization" level="specific">
-<!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
-<component name="psln_build" filter="s60" long-name="Personalization Build">
-<unit bldFile="mw/classicui/psln/group"/>
-</component>
-</collection>
-<collection name="commonadapter" long-name="Common Adapter" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="commonadapter_build" filter="s60" long-name="Common Adapter Build">
-<unit bldFile="mw/classicui/commonadapter/group"/>
-</component>
-</collection>
-<collection name="akntouchgesturefw" long-name="Avkon Touch Gesture Framework" level="generic">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="akntouchgesturefw_build" filter="s60" long-name="Avkon Touch Gesture Framework Build" introduced="^3">
-<unit bldFile="mw/classicui/akntouchgesturefw/group"/>
-</component>
-</collection>
-<collection name="uiutils" long-name="UI Utils" level="specific">
-<component name="localizer" filter="s60" long-name="Directory Localizer">
-<unit bldFile="mw/classicui/uiutils/localizer/group"/>
-</component>
-<component name="findutil" filter="s60" long-name="Find Utility">
-<unit bldFile="mw/classicui/uiutils/findutil/group"/>
-</component>
-<component name="gamerecognizer" filter="s60" long-name="Game Recognizer" plugin="Y">
-<unit bldFile="mw/classicui/uiutils/gamerecognizer/group"/>
-</component>
-<component name="aknjapanesereading" filter="s60" long-name="Avkon Japanese Reading">
-<unit bldFile="mw/classicui/uiutils/aknjapanesereading/group"/>
-</component>
-<component name="hlplch" long-name="Help Launcher" filter="s60,bldfirst">
-<unit bldFile="mw/classicui/uiutils/hlplch/group"/>
-</component>
-</collection>
-<collection name="commonuisupport" long-name="Common UI Support" level="support">
-<component name="uikon" long-name="Uikon" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uikon/group" mrp="mw/classicui/commonuisupport/uikon/group/app-framework_uikon.mrp"/>
-</component>
-<component name="errorresolverdata" long-name="Error Resolver Data" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/errorresolverdata/group" mrp="mw/classicui/commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
-</component>
-<component name="uilaf" long-name="UI Look and Feel" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uilaf/GROUP" mrp="mw/classicui/commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
-</component>
-<component name="grid" long-name="Grid" purpose="optional">
-<unit bldFile="mw/classicui/commonuisupport/grid/group" mrp="mw/classicui/commonuisupport/grid/group/app-framework_grid.mrp"/>
-</component>
-<component name="uifwsdocs" long-name="UI Frameworks Documentation" purpose="development" class="doc">
-<unit mrp="mw/classicui/commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
-</component>
-</collection>
-<collection name="lafagnosticuifoundation" long-name="Look-and-Feel Agnostic UI Foundation" level="base">
-<component name="cone" long-name="Control Environment" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/cone/group" mrp="mw/classicui/lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
-</component>
-<component name="graphicseffects" long-name="Graphics Effects" introduced="9.2" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/graphicseffects/group" mrp="mw/classicui/lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
-</component>
-<component name="uigraphicsutils" long-name="UI Graphics Utilities" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group" mrp="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
-</component>
-<component name="clockanim" long-name="Clock" purpose="optional" plugin="Y">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/clockanim/group" mrp="mw/classicui/lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
-</component>
-<component name="bmpanimation" long-name="BMP Animation" introduced="6.0" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/bmpanimation/group" mrp="mw/classicui/lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
-</component>
-<component name="animation" long-name="Animation" introduced="9.1" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/animation/group" mrp="mw/classicui/lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
-</component>
-</collection>
-<collection name="classicui_info" long-name="Classic UI Info" level="specific">
-<!-- the multiple units in the API test components need to be resolved -->
-<component name="classicui_metadata" long-name="Classic UI Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/classicui/classicui_info/classicui_metadata/classicui_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="svgt" level="generic" long-name="SVG Tiny" levels="util ui">
-<collection name="svgt_plat" long-name="SVG Tiny Platform Interfaces" level="ui">
-<component name="svgt_api" long-name="SVGT API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/svgt_api/group"/>
-</component>
-<component name="nvg_api" long-name="NVG API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/nvg_api/group"/>
-</component>
-</collection>
-<collection name="svgtopt" long-name="SVG-T Engine" level="util">
-<component name="svgtopt_build" filter="s60" long-name="SVG Engine" introduced="9.2">
-<!-- component is at collection level. Needs to be moved down a directory -->
-<unit bldFile="mw/svgt/svgtopt/group"/>
-</component>
-<component name="svgtplugin" filter="s60" long-name="SVG Plugin" introduced="9.2" plugin="Y">
-<unit bldFile="mw/svgt/svgtopt/svgtplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="uiaccelerator" level="generic" long-name="UI Accelerator" levels="plugin framework server ex if">
-<collection name="uiaccelerator_plat" long-name="UI Accelerator Platform Interfaces" level="if">
-<component name="alf_core_toolkit_api" long-name="ALF Core Toolkit API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/group"/>
-</component>
-<component name="alf_visual_api" long-name="ALF Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/group"/>
-</component>
-<component name="alf_extended_visual_api" long-name="ALF Extended Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/group"/>
-</component>
-<component name="alf_extension_api" long-name="ALF Extension API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/group"/>
-</component>
-<component name="alf_tracing_api" long-name="ALF Tracing API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/group"/>
-</component>
-<component name="alf_client_server_api" long-name="ALF Client Server API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/group"/>
-</component>
-</collection>
-<collection name="uiacceltk" long-name="UI Accelerator Toolkit" level="framework">
-<component name="hitchcock" filter="s60" long-name="Hitchcock">
-<unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/group"/>
-</component>
-<component name="uiacceltk_build" filter="s60" long-name="UI Accelerator Toolkit Build">
-<!-- move into the other component, or remove the #include and make this UI Accelerator Toolkit ROM-->
-<unit bldFile="mw/uiaccelerator/uiacceltk/group"/>
-</component>
-</collection>
-<collection name="uiaccelerator_test" long-name="UI Accelerator Test" level="ex"/>
-</block>
-<block name="uiresources" level="generic" long-name="UI Resources" levels="compile plugin framework server generic data">
-<!-- are the custom filters below needed? -->
-<collection name="uiresources_pub" long-name="UI Resources Public Interfaces" level="data">
-<component name="pictograph_api" long-name="Pictograph API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/pictograph_api/group" filter="!test"/>
-</component>
-<component name="skins_api" long-name="Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/skins_api/group" filter="!test"/>
-</component>
-<component name="font_definition_api" long-name="Font Definition API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/font_definition_api/group" filter="!test"/>
-</component>
-<component name="graphics_api" long-name="Graphics API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/graphics_api/group" filter="!test"/>
-</component>
-<component name="scalable_icons_api" long-name="Scalable Icons API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/scalable_icons_api/group"/>
-</component>
-<component name="layout_id_definitions_api" long-name="Layout ID Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/layout_id_definitions_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_plat" long-name="UI Resources Platform Interfaces" level="data">
-<component name="layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_system_private_api/group" filter="!test"/>
-</component>
-<component name="layout_data_api" long-name="Layout Data API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_data_api/group" filter="!test"/>
-</component>
-<component name="cdl_api" long-name="CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/cdl_api/group" filter="!test"/>
-</component>
-<component name="extended_skins_api" long-name="Extended Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_skins_api/group" filter="!test"/>
-</component>
-<component name="tfx_server_controller_plugin_api" long-name="TFX Server Controller Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_controller_plugin_api/group"/>
-</component>
-<component name="extended_fonts_api" long-name="Extended Fonts API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_fonts_api/group" filter="!test"/>
-</component>
-<component name="graphic_configuration_api" long-name="Graphic Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/graphic_configuration_api/group" filter="!test"/>
-</component>
-<component name="mif_header_cdl_api" long-name="MIF Header CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mif_header_cdl_api/group"/>
-</component>
-<component name="personalisation_and_skins_settings_api" long-name="Personalisation and Skins Settings API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/personalisation_and_skins_settings_api/group"/>
-</component>
-<component name="tfx_effect_setup_plugin_api" long-name="TFX Effect Setup Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_effect_setup_plugin_api/group"/>
-</component>
-<component name="mifconv_definitions_api" long-name="Mifconv Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mifconv_definitions_api/group"/>
-</component>
-<component name="wallpaper_configuration_api" long-name="Wallpaper Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/wallpaper_configuration_api/group"/>
-</component>
-<component name="language_code_definitions_api" long-name="Language Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/language_code_definitions_api/group"/>
-</component>
-<component name="skins_image_attributes_api" long-name="Skins Image Attributes API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
-</component>
-<component name="private_user_area_code_definitions_api" long-name="Private User Area Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/private_user_area_code_definitions_api/group"/>
-</component>
-<component name="tfx_server_plugin_ids_api" long-name="TFX Server Plug-in IDs API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_plugin_ids_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_info" long-name="UI Resources Info" level="data">
-<component name="uiresources_test" filter="s60,test,api_test" long-name="UI Resources Tests" purpose="development"/>
-</collection>
-<collection name="uigraphics" long-name="UI Graphics" level="generic">
-<component name="bitmaps2" filter="s60" long-name="Bitmaps 2" class="config">
-<unit bldFile="mw/uiresources/uigraphics/bitmaps2/group"/>
-</component>
-<component name="icons" filter="s60" long-name="Icons" class="config">
-<unit bldFile="mw/uiresources/uigraphics/icons/group"/>
-</component>
-<component name="variatedbitmaps" filter="s60" long-name="Variated Bitmaps" class="config">
-<unit bldFile="mw/uiresources/uigraphics/variatedbitmaps/group"/>
-</component>
-<component name="aknicon" filter="s60" long-name="Avkon Icon Framework">
-<unit bldFile="mw/uiresources/uigraphics/aknicon/group"/>
-</component>
-<component name="nvgrenderstage" filter="sf_build" long-name="NVG Render Stage">
-<unit bldFile="mw/uiresources/uigraphics/nvgrenderstage/group"/>
-</component>
-</collection>
-<collection name="layouts" long-name="Layouts" level="plugin">
-<component name="cdl" filter="s60" long-name="Customization Definition Language">
-<!-- can only have one unit. Need to #include them or split into multiple components -->
-<unit bldFile="mw/uiresources/layouts/cdl/cdlengine/group"/>
-<unit bldFile="mw/uiresources/layouts/cdl/cdlserver/group"/>
-</component>
-<component name="aknlayout2" filter="s60" long-name="Avkon Layout 2">
-<unit bldFile="mw/uiresources/layouts/aknlayout2/group"/>
-</component>
-</collection>
-<collection name="skins" long-name="Skins" level="data">
-<component name="aknskincontent" filter="s60" long-name="Avkon Skin Content" class="config">
-<unit bldFile="mw/uiresources/skins/aknskincontent/group"/>
-</component>
-<component name="aknskins" filter="s60" long-name="Avkon Skin Compiler">
-<unit bldFile="mw/uiresources/skins/aknskins/group"/>
-</component>
-</collection>
-<collection name="pictographs" long-name="Pictographs" level="data">
-<component name="aknpictograph" filter="s60" long-name="Avkon Pictograph">
-<unit bldFile="mw/uiresources/pictographs/aknpictograph/group"/>
-</component>
-</collection>
-<collection name="locales" long-name="Locales" level="framework">
-<component name="locales_build" filter="s60" long-name="Locales Build">
-<unit bldFile="mw/uiresources/locales/loce32"/>
-</component>
-</collection>
-<collection name="uiconfig" long-name="UI Config" level="server">
-<component name="s60config" filter="s60" long-name="S60 UI Config">
-<unit bldFile="mw/uiresources/uiconfig/s60config/group"/>
-</component>
-</collection>
-<collection name="fontsupport" long-name="Font Support" level="generic">
-<component name="fontprovider" filter="s60" long-name="Font Provider">
-<unit bldFile="mw/uiresources/fontsupport/fontprovider/group"/>
-</component>
-<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
- <component id="s60_fonts" filter="s60" name="S60 Fonts">
- <unit bldFile="fontsupport/fontutils/group"/>
- </component>
--->
-<component name="fontutils" filter="sf_build" long-name="Font Utils">
-<unit bldFile="mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
-</component>
-</collection>
-<collection name="helpthemes" long-name="Help Themes" level="data">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helpthemes_build" filter="s60" long-name="Help Themes Build" class="config">
-<unit bldFile="mw/uiresources/helpthemes/group"/>
-</component>
-</collection>
-</block>
-<block name="hapticsservices" level="generic" long-name="Haptics Services" levels="fw server api">
-<collection name="hapticsservices_plat" long-name="Haptics Services Platform Interfaces" level="api">
-<component name="tacticon_api" long-name="Tacticon API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tacticon_api/group"/>
-</component>
-<component name="tactile_feedback_core_api" long-name="Tactile Feedback Core API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_core_api/group"/>
-</component>
-<component name="tactile_feedback_server_api" long-name="Tactile Feedback Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_server_api/group"/>
-</component>
-</collection>
-<collection name="hapticsservices_pub" long-name="Haptics Services Public Interfaces" level="api">
-<component name="tactile_feedback_client_api" long-name="Tactile Feedback Client API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_pub/tactile_feedback_client_api/group"/>
-</component>
-</collection>
-<collection name="tacticonserver" long-name="Tacticon Server" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="tacticonserver_build" filter="s60" long-name="Tacticon Server Build" introduced="^3">
-<unit bldFile="mw/hapticsservices/tacticonserver/group"/>
-<!-- clients and servers are suauly the same component. Consider moving pluign to a separate component if needed -->
-</component>
-</collection>
-<collection name="tactilefeedback" long-name="Tactile Feedback" level="fw">
-<component name="tactilearearegistry" filter="s60" long-name="Tactile Area Registry" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilearearegistry/group"/>
-</component>
-<component name="tactilefeedbackresolver" filter="s60" long-name="Tactile Feedback Resolver" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackresolver/group"/>
-</component>
-<component name="tactileclickplugin" filter="s60" long-name="Tactile Click Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileclickplugin/group"/>
-</component>
-<component name="tactilefeedbackclient" filter="s60" long-name="Tactile Feedback Client" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackclient/group"/>
-</component>
-<component name="tactileactionplugin" filter="s60" long-name="Tactile Action Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileactionplugin/group"/>
-</component>
-<component name="tactilefeedback_build" filter="s60" long-name="Tactile Feedback Build" introduced="^1">
-<!-- consider moving IBY to one fo the above components -->
-<unit bldFile="mw/hapticsservices/tactilefeedback/group"/>
-</component>
-</collection>
-</block>
-<block name="platformthemes" level="specific" long-name="Platform Themes" levels="framework generic ui">
-<collection name="platformthemes_info" long-name="Platform Themes Info">
-<component name="platformthemes_build" long-name="Platform Themes Build">
-<!-- no real structure in this package. Should break into collections / components -->
-<unit bldFile="mw/platformthemes" proFile="platformthemes.pro"/>
-</component>
-</collection>
-</block>
-<block name="gsprofilesrv" level="generic" long-name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
-<collection name="gsprofilesrv_pub" long-name="GS and Profiles Services Public Interfaces" level="specific">
-<component name="profiles_engine_active_profile_settings_api" long-name="Profiles Engine Active Profile Settings API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_active_profile_settings_api/group"/>
-</component>
-<component name="profiles_engine_wrapper_api" long-name="Profiles Engine Wrapper API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_wrapper_api/group"/>
-</component>
-</collection>
-<collection name="gsprofilesrv_plat" long-name="GS and Profiles Services Platform Interfaces" level="specific">
-<component name="ftuwizardmodel_api" long-name="FTU Wizard Model API" filter="bldfirst,s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/ftuwizardmodel_api" proFile="ftuwizardmodel_api.pro" qmakeArgs="-r -config rom"/>
-</component>
-<component name="profiles_engine_api" long-name="Profiles Engine API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_engine_api/group"/>
-</component>
-<component name="settings_backgroundimage_api" long-name="Settings Background Image API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_backgroundimage_api/group"/>
-</component>
-<component name="settings_framework_api" long-name="Settings Framework API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_framework_api/group"/>
-</component>
-<component name="settings_launch_api" long-name="Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_launch_api/group"/>
-</component>
-<component name="settings_listbox_api" long-name="Settings List Box API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_listbox_api/group"/>
-</component>
-<component name="settings_plugin_api" long-name="Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_plugin_api/group"/>
-</component>
-<component name="settings_uis_cenrep_collection_api" long-name="Settings UIs CenRep Collection API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
-</component>
-</collection>
-<collection name="gssettingsuis" long-name="General Settings UIs" level="framework">
-<component name="gs" filter="s60" long-name="General Settings" introduced="9.2">
-<unit bldFile="mw/gsprofilesrv/gssettingsuis/gs/group"/>
-</component>
-</collection>
-<collection name="ftuwizardmodel" long-name="FTU Wizard Model" level="generic">
-<component name="ftuwizardmodel_build" long-name="FTU Wizardmodel Build" filter="bldfirst">
-<unit bldFile="mw/gsprofilesrv/ftuwizardmodel" proFile="ftuwizardmodel.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-<collection name="controlpanel" long-name="Control Panel" level="generic">
-<component name="controlpanel_build" long-name="Control Panel Build">
-<unit bldFile="mw/gsprofilesrv/controlpanel" proFile="controlpanel.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-<collection name="profilesservices" long-name="Profiles Services" level="server">
-<component name="profileengine" filter="s60" long-name="Profile Engine" introduced="9.1">
-<unit bldFile="mw/gsprofilesrv/profilesservices/profileengine/group"/>
-</component>
-<component name="ringingtone3dplugin" filter="s60" long-name="Ringing Tone 3D Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/gsprofilesrv/profilesservices/ringingtone3dplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreensrv" level="specific" long-name="Home Screen Services" levels="plugin framework server generic specific">
-<collection name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" level="specific">
-<component name="ai_content_model_api" long-name="AI Content Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_content_model_api/group"/>
-</component>
-<component name="ai_utilities_api" long-name="AI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_utilities_api/group" filter="!test"/>
-</component>
-<component name="ai_plugin_management_api" long-name="AI Plug-in Management API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_management_api/group"/>
-</component>
-<component name="ai_plugin_information_api" long-name="AI Plug-in Information API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_information_api/group"/>
-</component>
-<component name="ai_variation_api" long-name="AI Variation API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_variation_api/group"/>
-</component>
-<component name="action_handler_plugin_api" long-name="Action Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/group" filter="!test"/>
-</component>
-<component name="content_harvester_plugin_api" long-name="Content Harvester Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/group" filter="!test"/>
-</component>
-<component name="menu_model_api" long-name="Menu Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_model_api/group"/>
-</component>
-<component name="menu_sat_interface_api" long-name="Menu SAT Interface API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/group" filter="!test"/>
-</component>
-<component name="external_home_screen_api" long-name="External Home Screen API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/external_home_screen_api/group"/>
-</component>
-<component name="menu_content_service_api" long-name="Menu Content Service API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_content_service_api/group" filter="!test"/>
-</component>
-<component name="sapi_contentpublishing" long-name="SAPI Content Publishing" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing/group"/>
-</component>
-<component name="sapi_backstepping" long-name="SAPI Backstepping" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_backstepping/group"/>
-</component>
-<component name="sapi_actionhandler" long-name="SAPI Action Handler" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_actionhandler/group"/>
-</component>
-<component name="sapi_homescreenplugin" long-name="SAPI Homescreen Plugin" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_homescreenplugin/group" filter="!test"/>
-</component>
-<component name="sapi_menucontent" long-name="SAPI Menu Content" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_menucontent/group"/>
-</component>
-<component name="xcfw_api" long-name="XCFW API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/xcfw_api/group"/>
-</component>
-<component name="idlefw_api" long-name="Idle Framework API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/idlefw_api/group"/>
-</component>
-<component name="hs_widget_publisher_api" long-name="Home Screen Publishing API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_widget_publisher_api/group"/>
-</component>
-<component name="hs_settings_api" long-name="HS Settings API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_settings_api/group"/>
-</component>
-<component name="hs_content_control_api" long-name="HS Content Control API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_content_control_api/group"/>
-</component>
-</collection>
-<collection name="xcfw" long-name="XML Content Framework" level="framework">
-<!-- collection is really a component, needs to be moved down a directory -->
-<component name="xcfw_build" filter="s60" long-name="XML Content Framework Build">
-<unit bldFile="mw/homescreensrv/xcfw/group"/>
-</component>
-</collection>
-<collection name="homescreenpluginsrv" long-name="Home Screen Plugin Service" level="plugin">
-<component name="hspsdefinitionengine" filter="s60" long-name="HS Plugin Service Definition Engine" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsdefinitionengine/group"/> -->
-</component>
-<component name="hspsdom" filter="s60" long-name="HS Plugin Service DOM" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsdom/group"/> -->
-</component>
-<component name="hspstools" filter="s60" long-name="HS Server Tools">
-<!-- <unit bldFile="homescreenpluginsrv/hspstools/group"/> -->
-</component>
-<component name="hspspluginregistry" filter="s60" long-name="HS Plugin Registry" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspspluginregistry/group"/>-->
-</component>
-<component name="hspsmanager" filter="s60" long-name="HSPS Manager" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsmanager/group"/>-->
-</component>
-<component name="hspsodt" filter="s60" long-name="HSPS Object Description Tree" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsodt/group"/>-->
-</component>
-<component name="hspsresource" filter="s60" long-name="HS Plugin Server Resource" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresource/group"/>-->
-</component>
-<component name="hspsresult" filter="s60" long-name="HS Plugin Server Result" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
-</component>
-<component name="homescreen_settings_api" filter="s60" long-name="HS Settings API" class="api placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
-</component>
-<component name="homescreenpluginsrv_build" filter="s60" long-name="HSPS Build">
-<!-- need to break this up into the self-contained components above and uncomment them -->
-<unit bldFile="mw/homescreensrv/homescreenpluginsrv/group"/>
-</component>
-</collection>
-<collection name="idlefw" long-name="Idle Framework" level="framework">
-<!-- Uncomment all units when configuration is in place. All currently #included from idlefw_build -->
-<component name="idlefw_plugins" filter="s60" long-name="Idle Framework Plugins" plugin="Y" class="placeholder">
-<!--<unit bldFile="idlefw/plugins/group"/>-->
-</component>
-<component name="hslaunch" filter="s60" long-name="Home Screen Launch" class="placeholder">
-<!--<unit bldFile="idlefw/plugins/group"/>-->
-</component>
-<component name="idlefw_build" filter="s60" long-name="Idle Framework Build">
-<!--split this into components, or separate from the above components and move this down a directory -->
-<unit bldFile="mw/homescreensrv/idlefw/group"/>
-</component>
-</collection>
-<collection name="menucontentsrv" long-name="Menu Content Service" level="generic">
-<component name="menusatinterface" filter="s60" long-name="Menu SAT Interface">
-<unit bldFile="mw/homescreensrv/menucontentsrv/menusatinterface/group"/>
-</component>
-<component name="menucontentsrv_build" filter="s60" long-name="Menu Content Service Build">
-<!--split this into components, or separate from the above component and move this down a directory -->
-<unit bldFile="mw/homescreensrv/menucontentsrv/group"/>
-</component>
-</collection>
-<collection name="backsteppingsrv" long-name="Back Stepping Service" level="server">
-<!-- collection is really a component, needs to be moved down a directory -->
-<component name="bsengine" long-name="Back Stepping Engine" filter="s60">
-<unit bldFile="mw/homescreensrv/backsteppingsrv/group"/>
-</component>
-</collection>
-<collection name="contentpublishingsrv" long-name="Content Publishing Service" level="server">
-<component name="contentpublishingdebug" filter="s60" long-name="Content Publishing Debug">
-<!-- need to move this component outside of contentpublishingutils and into separate component directory -->
-<!-- <unit bldFile="contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/> -->
-</component>
-<component name="contentpublishingutils" filter="s60" long-name="Content Publishing Utils">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingutils/group"/>
-</component>
-<component name="contentpublishingserver" filter="s60" long-name="Content Publishing Server">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingserver/group"/>
-</component>
-<component name="contentharvester" filter="s60" long-name="Content Harvester">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
-</component>
-<component name="contentpublishingsrv_build" filter="s60" long-name="Content Publishing Service Build">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/group"/>
-</component>
-</collection>
-<collection name="contentcontrolsrv" long-name="Content Control Service" level="server">
-<component name="ccsrv" long-name="Content Control Service" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccsrv/group"/>
-</component>
-<component name="ccsrvapi" long-name="Content Control Service API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccsrvapi/group"/>
-</component>
-<component name="ccclientsession" long-name="Content Control Client Session" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccclientsession/group"/>
-</component>
-<component name="hsccclient" long-name="HS Content Control Client" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/hsccclient/group"/>
-</component>
-<component name="hscontentinfo" long-name="Home Screen Content Info" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/hscontentinfo/group"/>
-</component>
-<component name="contentcontrolsrv_build" long-name="Content Control Service Build" filter="s60" introduced="^3">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreensrvlegacy" level="generic" long-name="Legacy Home Screen Services" levels="plugin framework server generic specific">
-<collection name="homescreensrvlegacy_plat" long-name="Legacy Home Screen Services Platform Interfaces" level="specific">
-<component name="ai_content_model_api" long-name="AI Content Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrvlegacy/ai_content_model_api/group" proFile="group.pro"/>
-</component>
-<component name="ai_plugin_information_api" long-name="AI Plug-in Information API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrvlegacy/ai_plugin_information_api/group" proFile="group.pro"/>
-</component>
-</collection>
-</block>
-<block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
-<collection name="appinstall_plat" long-name="Application Installation Platform Interfaces" level="api">
-<component name="iaupdate_api" long-name="IA Update API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/iaupdate_api/group"/>
-</component>
-<component name="task_plugin_api" long-name="Task Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_plugin_api/group"/>
-</component>
-<component name="sw_installer_common_ui_api" long-name="SW Installer Common UI API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_common_ui_api/group"/>
-</component>
-<component name="sw_installer_launcher_api" long-name="SW Installer Launcher API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_launcher_api/group"/>
-</component>
-<component name="task_management_api" long-name="Task Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_management_api/group"/>
-</component>
-<component name="sw_installer_ui_plugin_api" long-name="SW Installer UI Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ui_plugin_api/group"/>
-</component>
-<component name="sw_installer_cr_keys" long-name="SW Installer CR Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_cr_keys/group"/>
-</component>
-<component name="sw_installer_ps_keys" long-name="SW Installer PS Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
-</component>
-<component name="appmngr2runtimeapi" long-name="Application Manager 2 Runtime Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
-</component>
-<component name="sifui_api" long-name="STIF UI API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sifui_api/group"/>
-</component>
-</collection>
-<collection name="appinstall_pub" long-name="Application Installation Public Interfaces" level="api">
-<component name="startup_list_management_api" long-name="Startup List Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
-</component>
-</collection>
-<collection name="ncdengine" long-name="Nokia Content Discover" level="framework">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="ncdengine_engine" filter="s60" long-name="NCD Engine" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/engine/group"/>
-</component>
-<component name="debuglogger" filter="s60" long-name="NCD Debug Logger" introduced="^1" class="placeholder">
-<!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
-</component>
-<component name="ncdengine_build" filter="s60" long-name="NCD Build" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/group"/>
-</component>
-</collection>
-<collection name="appinstaller" long-name="Application Installer" level="generic">
-<component name="appinstui" filter="s60" long-name="Application Installer UI" introduced="^2">
-<unit bldFile="mw/appinstall/appinstaller/appinstui/group"/>
-</component>
-</collection>
-<collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="api">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="iaupdateapi_stub_build" long-name="IA Update API Stub Build" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdateapi_stub/group"/>
-</component>
-</collection>
-<collection name="iaupdate" long-name="Independent Apps Update" level="api">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="iad" long-name="Software Update" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/iad/group"/>
-</component>
-<component name="iaupdate_help" filter="s60" long-name="IA Update Help" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/help/group"/>
-</component>
-<component name="iaupdate_build" filter="s60" long-name="IA Update Build" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/group"/>
-</component>
-</collection>
-<collection name="installationservices" long-name="Installation Services" level="generic">
-<component name="swi" long-name="Secure Software Install" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swi/group" mrp="mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
-</component>
-<component name="swidevicetools" long-name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
-<unit bldFile="mw/appinstall/installationservices/swidevicetools/group" mrp="mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
-</component>
-<component name="swcomponentregistry" long-name="Software Component Registry" introduced="^4" purpose="mandatory">
-<unit bldFile="mw/appinstall/installationservices/swcomponentregistry/group" mrp="mw/appinstall/installationservices/swcomponentregistry/group/security_softwarecomponentregistry.mrp"/>
-</component>
-<component name="swinstallationfw" long-name="Software Installation Framework" introduced="^4" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swinstallationfw/group" mrp="mw/appinstall/installationservices/swinstallationfw/group/security_softwareinstallframework.mrp"/>
-</component>
-<component name="swtransactionservices" long-name="Software Transaction Services" introduced="^4" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swtransactionservices/group" mrp="mw/appinstall/installationservices/swtransactionservices/group/security_softwaretransactionservices.mrp"/>
-</component>
-<component name="refswinstallationplugin" long-name="Reference Software Installation Plugin" introduced="^4" purpose="development" plugin="Y">
-<unit bldFile="mw/appinstall/installationservices/refswinstallationplugin/group" mrp="mw/appinstall/installationservices/refswinstallationplugin/group/security_sifrefplugin.mrp"/>
-</component>
-<component name="refsoftwareappmgr" long-name="Reference Software Application Manager" introduced="^4" purpose="development">
-<unit bldFile="mw/appinstall/installationservices/refsoftwareappmgr/group" mrp="mw/appinstall/installationservices/refsoftwareappmgr/group/security_referenceapplicationmanager.mrp"/>
-</component>
-<component name="swiconfig" long-name="Software Install Config" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appinstall/installationservices/swiconfig/group" mrp="mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
-</component>
-</collection>
-<collection name="secureswitools" long-name="Secure Software Install Tools" level="tool">
-<component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/makekeys/group" mrp="mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
-</component>
-<component name="swianalysistoolkit" long-name="SWI Analysis Toolkit" purpose="development" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
-</component>
-<component name="openssllib" long-name="OpenSSL Library" purpose="optional" class="PC">
-<unit mrp="mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
-</component>
-<component name="swisistools" long-name="Secure Software Install SIS Tools" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swisistools/group" mrp="mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
-</component>
-</collection>
-<collection name="appinstall_info" long-name="Application Installation Info" level="api">
-<component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="serviceapifw" level="specific" long-name="Service API Framework" levels="plugin framework server generic specific">
-<collection name="serviceapifw_pub" long-name="Service API Framework Public Interfaces" level="specific"/>
-<collection name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" level="specific">
-<component name="rtsecuritymanager_common_api" long-name="Runtime Security Manager Common API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/group"/>
-</component>
-<component name="rtsecuritymanager_utility_api" long-name="Runtime Security Manager Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
-</component>
-<component name="rtsecuritymanager_client_api" long-name="Runtime Security Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/group"/>
-</component>
-<component name="liw_provider_utility_api" long-name="LIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_provider_utility_api/group"/>
-</component>
-<component name="liw_service_interface_base_api" long-name="LIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_base_api/group"/>
-</component>
-<component name="liw_service_interface_menu_api" long-name="LIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_menu_api/group"/>
-</component>
-<component name="liw_criteria_api" long-name="LIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_criteria_api/group"/>
-</component>
-<component name="liw_generic_parameter_api" long-name="LIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_generic_parameter_api/group"/>
-</component>
-<component name="liw_service_handler_api" long-name="LIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_handler_api/group"/>
-</component>
-</collection>
-<collection name="rtsecuritymanager" long-name="Runtime Security Manager" level="server">
-<component name="rtsecuritymanagerutil" filter="s60" long-name="Runtime Security Manager Util">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
-</component>
-<component name="rtsecuritymanagerserver" filter="s60" long-name="Runtime Security Manager Server">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/>
-</component>
-<component name="rtsecuritymanagerclient" filter="s60" long-name="Runtime Security Manager Client">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/>
-</component>
-<component name="rtsecuritymanager_build" filter="s60" long-name="Runtime Security Manager Build">
-<!-- Move the export to the appropriate components, or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/group"/>
-</component>
-</collection>
-<collection name="languageinterworkingfw" long-name="Language Interworking Framework" level="framework">
-<component name="lifwservicehandler" filter="s60" long-name="Service Handler">
-<unit bldFile="mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-</block>
-<block name="serviceapi" level="specific" long-name="Service API" levels="os mw1 mw2 app">
-<!-- should break up this collection into something meaningful -->
-<collection name="serviceproviders" long-name="Service Providers" level="mw1">
-<component name="sapi_contacts_vpbk" long-name="Contacts Phonebook SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
-</component>
-<component name="sapi_location" long-name="Location SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_location/group"/>
-</component>
-<component name="sapi_mediamanagement" long-name="Media Management SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/group"/>
-</component>
-<component name="sapi_landmarks" long-name="Landmarks SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
-</component>
-<component name="sapi_messaging" long-name="Messaging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/group"/>
-</component>
-<component name="sapi_applicationmanager" long-name="Application Manager SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
-</component>
-<component name="sapi_calendar" long-name="Calendar SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_calendar/group"/>
-</component>
-<component name="sapi_logging" long-name="Logging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_logging/group"/>
-</component>
-<component name="sapi_sensor" long-name="Sensor SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sensor/group"/>
-</component>
-<component name="sapi_sysinfo" long-name="Sysinfo SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sysinfo/group"/>
-</component>
-<component name="sapi_serviceregistry" long-name="Service Registry SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
-</component>
-<component name="jsapi" long-name="Javascript API" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/jsapi/group"/>
-</component>
-<component name="serviceproviders_build" filter="s60" long-name="Service API Build">
-<!-- distribute the exports or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapi/serviceproviders/group"/>
-</component>
-</collection>
-</block>
-<block name="web" level="specific" long-name="Web" levels="plugin utils server generic specific">
-<collection name="web_pub" long-name="Web Public Interfaces" level="specific">
-<component name="browser_control_api" long-name="Browser Control API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_control_api/group"/>
-</component>
-<component name="download_mgr_client_api" long-name="Download Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_client_api/group"/>
-</component>
-<component name="download_mgr_ui_api" long-name="Download Manager UI Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_ui_api/group"/>
-</component>
-<component name="favourites_engine_api" long-name="Favourites Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/favourites_engine_api/group"/>
-</component>
-<component name="browser_plugin_api" long-name="Browser Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_plugin_api/group"/>
-</component>
-<component name="settings_api" long-name="Settings API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/settings_api/group"/>
-</component>
-</collection>
-<collection name="web_plat" long-name="Web Platform Interfaces" level="specific">
-<component name="aiw_browser_provider_api" long-name="AIW Browser Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/aiw_browser_provider_api/group"/>
-</component>
-<component name="browser_dialogs_provider_api" long-name="Browser Dialogs Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_dialogs_provider_api/group"/>
-</component>
-<component name="browser_platform_api" long-name="Browser Platform API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_platform_api/group"/>
-</component>
-<component name="cod_handler_api" long-name="COD Handler API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cod_handler_api/group"/>
-</component>
-<component name="connection_manager_api" long-name="Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/connection_manager_api/group"/>
-</component>
-<component name="cxml_library_api" long-name="cXml Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cxml_library_api/group"/>
-</component>
-<component name="download_mgr_client_api_extn" long-name="Download Manager Client API Extension" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/download_mgr_client_api_extn/group"/>
-</component>
-<component name="feeds_engine_api" long-name="Feeds Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/feeds_engine_api/group"/>
-</component>
-<component name="launcher_api" long-name="Launcher API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/launcher_api/group"/>
-</component>
-<component name="multipart_parser_api" long-name="Multipart Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/multipart_parser_api/group"/>
-</component>
-<component name="recent_url_store_api" long-name="Recent URL Store API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/recent_url_store_api/group"/>
-</component>
-<component name="scheme_handler_plugin_api" long-name="Scheme Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scheme_handler_plugin_api/group"/>
-</component>
-<component name="scriptable_plugin_api" long-name="Scriptable Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scriptable_plugin_api/group"/>
-</component>
-<component name="webutils_api" long-name="Web Utils API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/webutils_api/group"/>
-</component>
-<component name="widget_registry_api" long-name="Widget Registry API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/widget_registry_api/group"/>
-</component>
-<component name="xml_parser_api" long-name="XML Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/xml_parser_api/group"/>
-</component>
-<component name="stmgesturefw_api" long-name="State Machine Gesture Framework API " filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/stmgesturefw_api/group"/>
-</component>
-</collection>
-<collection name="web_info" long-name="Web Info" level="specific">
-<component name="web_build" filter="s60" long-name="Web Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/group"/>
-</component>
-</collection>
-<collection name="browserutilities" long-name="Browser Utilities" level="utils">
-<component name="browserdialogsprovider" filter="s60" long-name="Browser Dialogs Provider">
-<unit bldFile="mw/web/browserutilities/browserdialogsprovider/group"/>
-</component>
-<component name="recenturlstore" filter="s60" long-name="Recent URL Store">
-<unit bldFile="mw/web/browserutilities/recenturlstore/group"/>
-</component>
-<component name="xmlparser" filter="s60" long-name="XML Interface">
-<unit bldFile="mw/web/browserutilities/xmlparser/group"/>
-</component>
-<component name="cxmllibrary" filter="s60" long-name="XML Parser Implementation">
-<unit bldFile="mw/web/browserutilities/cxmllibrary/group"/>
-</component>
-<component name="downloadmgr" filter="s60" long-name="Download Manager">
-<unit bldFile="mw/web/browserutilities/downloadmgr/group"/>
-</component>
-<component name="connectionmanager" filter="s60" long-name="Connection Manager">
-<unit bldFile="mw/web/browserutilities/connectionmanager/group"/>
-</component>
-<component name="browsertelservice" filter="s60" long-name="Browser Telephony Service">
-<unit bldFile="mw/web/browserutilities/browsertelservice/group"/>
-</component>
-<component name="favouritesengine" filter="s60" long-name="Favourites Engine">
-<unit bldFile="mw/web/browserutilities/favouritesengine/group"/>
-</component>
-<component name="feedsengine" filter="s60" long-name="Feeds Engine">
-<unit bldFile="mw/web/browserutilities/feedsengine/group"/>
-</component>
-<component name="multipartparser" filter="s60" long-name="Multipart Parser">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
-<!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
-</component>
-<component name="schemehandler" filter="s60" long-name="Scheme Handler">
-<unit bldFile="mw/web/browserutilities/schemehandler/group"/>
-</component>
-<component name="webutils" filter="s60" long-name="Web Utils">
-<unit bldFile="mw/web/browserutilities/webutils/group"/>
-</component>
-<component name="aiwbrowserprovider" filter="s60" long-name="AIW Browser Provider" plugin="Y">
-<unit bldFile="mw/web/browserutilities/aiwbrowserprovider/group"/>
-</component>
-<component name="browserutilities_build" filter="s60" long-name="Browser Utilities Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/browserutilities/group"/>
-</component>
-</collection>
-<collection name="webengine" long-name="Web Engine" level="server">
-<component name="osswebengine" filter="s60" long-name="OSS Web Engine">
-<!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
-<unit bldFile="mw/web/webengine/osswebengine/cache/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/memorymanager/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/npscript/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group/javascriptcore"/>
-</component>
-<component name="webkitutils" filter="s60" long-name="WebKit Utils">
-<unit bldFile="mw/web/webengine/webkitutils/group"/>
-</component>
-<component name="pagescaler" filter="s60" long-name="Page Scaler">
-<unit bldFile="mw/web/webengine/pagescaler/group"/>
-</component>
-<component name="webwidgetinstaller" filter="s60" long-name="Widget Installer">
-<unit bldFile="mw/web/webengine/widgetinstaller/group"/>
-</component>
-<component name="widgetregistry" filter="s60" long-name="Widget Registry">
-<unit bldFile="mw/web/webengine/widgetregistry/group"/>
-</component>
-<component name="wmlengine" filter="s60" long-name="WML Engine">
-<unit bldFile="mw/web/webengine/wmlengine/group"/>
-</component>
-<component name="device" filter="s60" long-name="Device">
-<!-- this needs a more meaningful name -->
-<unit bldFile="mw/web/webengine/device/group"/>
-</component>
-<component name="widgetengine" filter="s60" long-name="Widget Engine">
-<unit bldFile="mw/web/webengine/widgetengine/group"/>
-</component>
-<component name="web_memoryplugin" long-name="Memory Plugin" filter="s60" plugin="Y">
-<unit bldFile="mw/web/webengine/memoryplugin/group"/>
-</component>
-<component name="widgetmemoryplugin" filter="s60" long-name="Widget Memory Plugin" plugin="Y">
-<unit bldFile="mw/web/webengine/widgetmemoryplugin/group"/>
-</component>
-<component name="widgetbackuprestore" filter="s60" long-name="Widget Backup and Restore">
-<unit bldFile="mw/web/webengine/widgetbackuprestore/group"/>
-</component>
-<component name="browserrecognizers" filter="s60" long-name="Browser Recognizers" plugin="Y">
-<unit bldFile="mw/web/webengine/browserrecognizers/group"/>
-</component>
-<component name="wrtharvester" filter="s60" long-name="Web Runtime Harvester" plugin="Y">
-<unit bldFile="mw/web/webengine/wrtharvester/group"/>
-</component>
-</collection>
-<collection name="codhandler" long-name="Content Object Descriptor Handler" level="specific">
-<component name="codeng" filter="s60" long-name="COD Engine">
-<unit bldFile="mw/web/codhandler/codeng/group"/>
-</component>
-<component name="codui" filter="s60" long-name="COD UI">
-<unit bldFile="mw/web/codhandler/codui/group"/>
-</component>
-<component name="codrecog" filter="s60" long-name="COD Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/codrecog/group"/>
-</component>
-<component name="codviewer" filter="s60" long-name="COD Viewer">
-<unit bldFile="mw/web/codhandler/codviewer/group"/>
-</component>
-<component name="ddrecog" filter="s60" long-name="Download Descriptor Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/ddrecog/group"/>
-</component>
-<component name="ddviewer" filter="s60" long-name="Download Descriptor Viewer">
-<unit bldFile="mw/web/codhandler/ddviewer/group"/>
-</component>
-<component name="coddownload" filter="s60" long-name="COD Download">
-<unit bldFile="mw/web/codhandler/coddownload/group"/>
-</component>
-<component name="roapapp" filter="s60" long-name="ROAP Application">
-<unit bldFile="mw/web/codhandler/roapapp/group"/>
-</component>
-<component name="codhandler_build" filter="s60" long-name="COD Handler Build">
-<!-- Exports need to go into another component or make this self-contained.
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/codhandler/group"/>
-</component>
-</collection>
-<collection name="widgets" long-name="Web Widget Framework" level="generic">
-<!-- the following units can be uncommented when configuration is put in place -->
-<component name="widgetrecognizer" filter="s60" long-name="Widget Recognizer" plugin="Y">
-<!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
-</component>
-<component name="widgetinstaller" filter="s60" long-name="Widget Installer UI" plugin="Y">
-<!--<unit bldFile="widgets/widgetinstaller/group"/>-->
-</component>
-<component name="widgetlauncher" filter="s60" long-name="Widget Launcher">
-<!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
-</component>
-<component name="widgetapp" filter="s60" long-name="Widget UI">
-<!--<unit bldFile="widgets/widgetapp/group"/>-->
-</component>
-<component name="widgetsidchecker" filter="s60" long-name="Widget SID Checker" introduced="^3">
-<!--<unit bldFile="widgets/widgetsidchecker/group"/>-->
-</component>
-<component name="widgetpreinstaller" filter="s60" long-name="Widget Pre-Installer">
-<!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
-</component>
-<component name="widgetstartup" filter="s60" long-name="Widget Startup">
-<!--<unit bldFile="widgets/widgetstartup/group"/>-->
-</component>
-<component name="widgets_build" filter="s60" long-name="Widgets Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/widgets/group"/>
-</component>
-</collection>
-</block>
-<block name="websrv" level="generic" long-name="Web Services" levels="plugin framework server generic specific">
-<collection name="websrv_pub" long-name="Web Services Public Interfaces" level="specific">
-<component name="web_service_description_api" long-name="Web Service Description API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_description_api/group"/>
-</component>
-<component name="web_service_connection_api" long-name="Web Service Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/group"/>
-</component>
-<component name="web_service_manager_api" long-name="Web Service Manager API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/group"/>
-</component>
-<component name="hostlet_connection_api" long-name="Hostlet Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/group"/>
-</component>
-<component name="web_service_messaging_api" long-name="Web Service Messaging API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/group"/>
-</component>
-<component name="xml_extensions_api" long-name="XML Extensions API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/group"/>
-</component>
-<component name="xml_fragment_api" long-name="XML Fragment API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/group"/>
-</component>
-</collection>
-<collection name="webservices" long-name="Web Services Framework" level="generic">
-<!-- consider breaking this collection into more meaningful subsets -->
-<component name="wsnotifierplugins" filter="s60" long-name="WS Notifier Plugins" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsnotifierplugins/group"/>
-</component>
-<component name="wslogger" filter="s60" long-name="WS Logger">
-<unit bldFile="mw/websrv/webservices/wslogger/group"/>
-</component>
-<component name="wsxml" filter="s60" long-name="WS XML Extensions">
-<unit bldFile="mw/websrv/webservices/wsxml/group"/>
-</component>
-<component name="wsutils" filter="s60" long-name="WS Utils">
-<unit bldFile="mw/websrv/webservices/wsutils/group"/>
-</component>
-<component name="wsfragment" filter="s60" long-name="WS Fragment">
-<unit bldFile="mw/websrv/webservices/wsfragment/group"/>
-</component>
-<component name="wsdescription" filter="s60" long-name="WS Service Description">
-<unit bldFile="mw/websrv/webservices/wsdescription/group"/>
-</component>
-<component name="wsconnection" filter="s60" long-name="WS Service Connection">
-<unit bldFile="mw/websrv/webservices/wsconnection/group"/>
-</component>
-<component name="wsmessages" filter="s60" long-name="WS Messages">
-<unit bldFile="mw/websrv/webservices/wsmessages/group"/>
-</component>
-<component name="wscredentialmanager" filter="s60" long-name="WS Credential Manager">
-<unit bldFile="mw/websrv/webservices/wscredentialmanager/group"/>
-</component>
-<component name="wsframework" filter="s60" long-name="WS Framework">
-<unit bldFile="mw/websrv/webservices/wsframework/group"/>
-</component>
-<component name="wshttpchanneltransportplugin" filter="s60" long-name="WS HTTP Channel Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshttpchanneltransportplugin/group"/>
-</component>
-<component name="wsconnectionagent" filter="s60" long-name="WS Connection Agent">
-<unit bldFile="mw/websrv/webservices/wsconnectionagent/group"/>
-</component>
-<component name="wsprovider" filter="s60" long-name="WS Provider">
-<unit bldFile="mw/websrv/webservices/wsprovider/group"/>
-</component>
-<component name="wshostletconnection" filter="s60" long-name="WS Hostlet Connection">
-<unit bldFile="mw/websrv/webservices/wshostletconnection/group"/>
-</component>
-<component name="wsmanager" filter="s60" long-name="WS Service Manager">
-<unit bldFile="mw/websrv/webservices/wsmanager/group"/>
-</component>
-<component name="wsidentitymanager" filter="s60" long-name="WS Identity Manager">
-<unit bldFile="mw/websrv/webservices/wsidentitymanager/group"/>
-</component>
-<component name="idwsfplugin" filter="s60" long-name="ID-WSF Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/idwsfplugin/group"/>
-</component>
-<component name="wsibasicplugin" filter="s60" long-name="WS-I Basic Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsibasicplugin/group"/>
-</component>
-<component name="wsrestplugin" filter="s60" long-name="WS REST Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsrestplugin/group"/>
-</component>
-<component name="idwsfsecuritymechanism" filter="s60" long-name="ID-WSF Security Mechanism">
-<unit bldFile="mw/websrv/webservices/idwsfsecuritymechanism/group"/>
-</component>
-<component name="wspasswordtransforms" filter="s60" long-name="WS Password Transforms">
-<unit bldFile="mw/websrv/webservices/wspasswordtransforms/group"/>
-</component>
-<component name="wscore" filter="s60" long-name="WS Core Service Manager">
-<unit bldFile="mw/websrv/webservices/wscore/group"/>
-</component>
-<component name="wslocaltransportplugin" filter="s60" long-name="WS Local Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wslocaltransportplugin/group"/>
-</component>
-<component name="wshostlettransportplugin" filter="s60" long-name="WS Hostlet Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshostlettransportplugin/group"/>
-</component>
-<component name="wsstar" filter="s60" long-name="WS Star">
-<!-- can only have one unit. Need to split into separate components or #include from a single bld.inf -->
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarpolicy/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarplugin/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarmessagehandlers/group"/>
-</component>
-<component name="wsoviplugin" filter="s60" long-name="WS Ovi Plugin">
-<unit bldFile="mw/websrv/webservices/wsoviplugin/group"/>
-</component>
-<component name="webservices_build" filter="s60" long-name="Web Services Build">
-<!-- need to split into self-contained components -->
-<unit bldFile="mw/websrv/webservices/group"/>
-</component>
-</collection>
-<collection name="websrv_info" long-name="Web Services Info" level="specific">
-<component name="websrv_bld" filter="s60" long-name="Web Services Build">
-<!-- need to include common .hrh in each unit -->
-<unit bldFile="mw/websrv/group"/>
-</component>
-</collection>
-</block>
-<block name="platformtools" level="generic" long-name="Platform Tools">
-<collection name="gfxconversion" long-name="Graphics Conversion">
-<component name="bmconv_s60" filter="s60" long-name="S60 Bitmap Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/bmconv_s60/group"/>
-</component>
-<component name="mifconv" filter="s60" long-name="Multi Icon File Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/mifconv/group"/>
-</component>
-</collection>
-</block>
-<block name="uitools" level="specific" long-name="UI Tools" levels="compile encode tool if">
-<collection name="uitools_pub" long-name="UI Tools Public Interfaces" level="if">
-<component name="third_party_bitmap_palette_api" long-name="Third Party Bitmap Palette API" filter="s60" class="api">
-<unit bldFile="mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
-</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">
-<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">
-<unit bldFile="mw/uitools/uitools_plat/layout_system_private_api/group"/>
-</component>
-</collection>
-<collection name="cdlcompilertoolkit" long-name="CDL Compiler Toolkit" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompilertoolkit_build" filter="s60" long-name="CDL Compiler Toolkit Build">
-<unit bldFile="mw/uitools/cdlcompilertoolkit/group"/>
-</component>
-</collection>
-<collection name="cdlcompiler" long-name="CDL Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompiler_build" filter="s60" long-name="CDL Compiler Build">
-<unit bldFile="mw/uitools/cdlcompiler/group"/>
-</component>
-</collection>
-<collection name="gfxtools" long-name="Graphics Tools" level="tool">
-<component name="gditools" filter="s60" long-name="GDI Tools" class="PC">
-<unit bldFile="mw/uitools/gfxtools/gditools/group"/>
-</component>
-<component name="color" filter="s60" long-name="Bitmap Colour Palette" class="PC">
-<unit bldFile="mw/uitools/gfxtools/color/group"/>
-</component>
-</collection>
-<collection name="aknlayoutcompiler" long-name="Avkon Layout Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="aknlayoutcompiler_build" filter="s60" long-name="Avkon Layout Compiler Build">
-<unit bldFile="mw/uitools/aknlayoutcompiler/group"/>
-</component>
-</collection>
-<collection name="skincompiler" long-name="Skin Compiler" level="compile">
-<component name="aknskindesccompiler" filter="s60" long-name="Avkon Skin Descriptor Compiler">
-<unit bldFile="mw/uitools/skincompiler/AknSkinDescCompiler/group"/>
-</component>
-</collection>
-<collection name="reszip" long-name="Resource Zip" level="encode">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="reszip_build" filter="s60" long-name="Resource Zip Build">
-<unit bldFile="mw/uitools/reszip/group"/>
-</component>
-</collection>
-<collection name="toollibraries" long-name="Tool Libraries" level="tool"/>
-<collection name="svgtencoder" long-name="SVGT Encoder" level="encode">
-<component name="svgtenc" filter="s60" long-name="Standalone SVGT Encoder" class="PC">
-<unit bldFile="mw/uitools/svgtencoder/svgtenc/standalone/group"/>
-</component>
-</collection>
-</block>
-</layer>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="location" level="apps" long-name="Location Apps" levels="ui events loc api">
-<collection name="loc_plat" long-name="Location Apps Platform Interfaces" level="api">
-<component name="location_picker_service_api" long-name="Location Picker Service API" introduced="^4" filter="s60" class="api">
-<unit bldFile="app/location/loc_plat" proFile="location_plat.pro"/>
-</component>
-</collection>
-<collection name="locationpickerservice" long-name="Location Picker Service" level="loc">
-<!--collection is really a component. Should move down a directory -->
-<component name="locationpickerservice_build" filter="s60" long-name="Location Picker Service Build" introduced="^4">
-<unit bldFile="app/location/locationpickerservice" proFile="locationpickerservice.pro"/>
-</component>
-</collection>
-</block>
-<!-- pending removal -->
-<block name="mmsharinguis" level="services" long-name="Multimedia Sharing UIs" levels="base plugin if">
-<collection name="mmsharinguis_plat" long-name="Multimedia Sharing UIs Platform Interfaces" level="if">
-<component name="multimedia_sharing_settings_api" long-name="Multimedia Sharing Settings API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_settings_api/group"/>
-</component>
-<component name="multimedia_sharing_resource_api" long-name="Multimedia Sharing Resource API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_resource_api/group"/>
-</component>
-<component name="multimedia_sharing_manager_api" long-name="Multimedia Sharing Manager API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/group"/>
-</component>
-</collection>
-<collection name="mmsharing" long-name="Multimedia Sharing" level="base">
-<component name="mmshavailability" filter="s60" long-name="Multimedia Sharing Availability">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshavailability/group"/>
-</component>
-<component name="mmshindicator" filter="s60" long-name="Multimedia Sharing Indicator">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshindicator/group"/>
-</component>
-<!-- consider putting client and server in the same component -->
-<component name="mmshmanagercli" filter="s60" long-name="Multimedia Sharing Manager Client">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshmanagercli/group" filter="!test"/>
-</component>
-<component name="mmshmanagersrv" filter="s60" long-name="Multimedia Sharing Manager Server">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshmanagersrv/group"/>
-</component>
-<component name="mmshengine" filter="s60" long-name="Multimedia Sharing Engine">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshengine/group"/>
-</component>
-<component name="mmshui" filter="s60" long-name="Multimedia Sharing UI">
-<!-- can only have one unit: need to #include one from the other if it's needed -->
-<unit bldFile="app/mmsharinguis/mmsharing/mmshui/group"/>
-<unit bldFile="app/mmsharinguis/mmsharing/mmshui/help/group"/>
-</component>
-<component name="mmsharing_build" filter="s60" long-name="MM Sharing Build">
-<unit bldFile="app/mmsharinguis/mmsharing/group"/>
-</component>
-</collection>
-<collection name="mmshplugins" long-name="Multimedia Sharing Plugins" level="plugin">
-<component name="mmshaoplugin" filter="s60" long-name="Multimedia Sharing Always Online Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshaoplugin/group"/>
-</component>
-<component name="mmshaiwplugin" filter="s60" long-name="Multimedia Sharing AIW Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshaiwplugin/group"/>
-</component>
-<component name="mmshsipcrplugin" filter="s60" long-name="Multimedia Sharing SIP Client Resolver Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshsipcrplugin/group"/>
-</component>
-<component name="mmshsettingsuiplugin" filter="s60" long-name="Multimedia Sharing Settings UI Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshsettingsuiplugin/group"/>
-</component>
-<component name="mmshwpadapterplugin" filter="s60" long-name="Multimedia Sharing WAP Provisioning Adapter" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshwpadapterplugin/group"/>
-</component>
-</collection>
-<collection name="mmsharinguis_info" long-name="Multimedia Sharing UIs Info" level="if">
-<component name="mmsharinguis_build" filter="s60" long-name="Multimedia Sharing UIs Build">
-<!-- consider distributing to other components -->
-<unit bldFile="app/mmsharinguis/group"/>
-</component>
-</collection>
-</block>
-<block name="phone" level="apps" span="2" long-name="Phone Apps" levels="engine plugin ui app">
-<collection name="phoneapp" long-name="Phone Application" level="app">
-<component name="blacklist" filter="s60" long-name="Phone Blacklist Clearing" plugin="Y">
-<unit bldFile="app/phone/phoneapp/blacklist/group"/>
-</component>
-<component name="phoneuicontrol" filter="s60" long-name="Phone UI Control">
-<unit bldFile="app/phone/phoneapp/phoneuicontrol/group"/>
-</component>
-<component name="phoneuistates" filter="s60" long-name="Phone UI States">
-<unit bldFile="app/phone/phoneapp/phoneuistates/group"/>
-</component>
-<component name="phoneuiutils" filter="s60" long-name="Phone UI Utils">
-<unit bldFile="app/phone/phoneapp/phoneuiutils/group"/>
-</component>
-<component name="silenceactionplugin" filter="s60" long-name="Silence Action Plugin" plugin="Y">
-<unit bldFile="app/phone/phoneapp/silenceactionplugin/group"/>
-</component>
-<component name="phonemediatorcenter" filter="s60" long-name="Phone Mediator Center">
-<unit bldFile="app/phone/phoneapp/phonemediatorcenter/group"/>
-</component>
-<component name="phoneuiview2" filter="s60" long-name="Phone UI View">
-<unit bldFile="app/phone/phoneapp/phoneuiview2" proFile="phoneuiview2.pro"/>
-</component>
-<component name="phoneuiqtviewadapter" filter="s60" long-name="Phone UI Qt View Adapter" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneapp/phoneuiqtviewadapter" proFile="phoneuiqtviewadapter.pro"/>
-</component>
-<component name="phonestringloader" filter="s60" long-name="Phone String Loader" introduced="^4">
-<unit bldFile="app/phone/phoneapp/phonestringloader" proFile="phonestringloader.pro"/>
-</component>
-<component name="phoneui2" filter="s60" long-name="Phone UI">
-<unit bldFile="app/phone/phoneapp/phoneui2" proFile="phoneui2.pro"/>
-</component>
-</collection>
-<collection name="phoneengine" long-name="Phone Engine" level="engine">
-<component name="phonecntfinder2" filter="s60" long-name="Phone Contact Finder">
-<unit bldFile="app/phone/phoneengine/phonecntfinder2" proFile="phonecntfinder2.pro"/>
-</component>
-<component name="audiohandling" filter="s60" long-name="Phone Audio Handling">
-<unit bldFile="app/phone/phoneengine/audiohandling/group"/>
-</component>
-<component name="callhandling" filter="s60" long-name="Call Handling">
-<unit bldFile="app/phone/phoneengine/callhandling/group"/>
-</component>
-<component name="contacthandling2" filter="s60" long-name="Phone Contact Handling">
-<unit bldFile="app/phone/phoneengine/contacthandling2/group"/>
-</component>
-<component name="loghandling" filter="s60" long-name="Phone Log Handling">
-<unit bldFile="app/phone/phoneengine/loghandling/group"/>
-</component>
-<component name="engineinfo" filter="s60" long-name="Phone Engine Info">
-<unit bldFile="app/phone/phoneengine/engineinfo/group"/>
-</component>
-<component name="phonemodel" filter="s60" long-name="Phone Model">
-<unit bldFile="app/phone/phoneengine/phonemodel" proFile="phonemodel.pro"/>
-</component>
-<component name="servicehandling" filter="s60" long-name="Phone Service Handling">
-<unit bldFile="app/phone/phoneengine/servicehandling/group"/>
-</component>
-<component name="phoneservices" filter="s60" long-name="Phone Server" introduced="^4">
-<unit bldFile="app/phone/phoneengine/phoneservices" proFile="phoneservices.pro"/>
-</component>
-<component name="parserrecognizer" filter="s60" long-name="Parser Recognizer" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneengine/parserrecognizer" proFile="parserrecognizer.pro"/>
-</component>
-</collection>
-<collection name="phoneuis" long-name="Phone UIs" level="ui">
-<component name="bubblemanager2" filter="s60" long-name="Phone Bubble Manager">
-<unit bldFile="app/phone/phoneuis/bubblemanager2" proFile="bubblemanager2.pro"/>
-</component>
-<component name="telephonydevicemode" filter="s60" long-name="Telephony Device Mode">
-<unit bldFile="app/phone/phoneuis/telephonydevicemode/group"/>
-</component>
-</collection>
-<collection name="phone_plat" long-name="Phone Apps Platform Interfaces" level="app">
-<component name="3d_ringing_tone_enabler_api" long-name="3D Ringing Tone Enabler API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
-</component>
-<component name="telephony_comms_information_api" long-name="Telephony Comms Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_comms_information_api/group"/>
-</component>
-<component name="telephony_information_api" long-name="Telephony Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_information_api/group"/>
-</component>
-<component name="telephony_device_mode_api" long-name="Telephony Device Mode API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_device_mode_api/group"/>
-</component>
-<component name="telephony_remote_party_information_api" long-name="Telephony Remote Party Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_remote_party_information_api/group"/>
-</component>
-<component name="telephony_video_mailbox_settings_api" long-name="Telephony Video Mailbox Settings API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_video_mailbox_settings_api/group"/>
-</component>
-<component name="telephony_microphone_mute_status_api" long-name="Telephony Microphone Mute Status API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_microphone_mute_status_api/group"/>
-</component>
-<component name="telephony_logging_extension_api" long-name="Telephony Logging Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_logging_extension_api/group"/>
-</component>
-<component name="telephony_matching_extension_api" long-name="Telephony Matching Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_matching_extension_api/group"/>
-</component>
-<component name="phone_application_commands_api" long-name="Phone Application Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_commands_api/group"/>
-</component>
-<component name="phone_application_voip_commands_api" long-name="Phone Application VOIP Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_voip_commands_api/group"/>
-</component>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_mediator_api/group"/>
-</component>
-<component name="video_telephony_mediator_api" long-name="Video Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/video_telephony_mediator_api/group"/>
-</component>
-<component name="video_telephony_control_mediator_api" long-name="Video Telephony Control Mediator API" filter="s60" introduced="^4" class="api">
-<unit bldFile="app/phone/phone_plat/video_telephony_control_mediator_api/group"/>
-</component>
-</collection>
-<collection name="phoneplugins" long-name="Phone Plugins" level="plugin">
-<component name="csplugin" filter="s60" long-name="Circuit Switched Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/csplugin/group"/>
-</component>
-<component name="hsdialerwidgetplugin" filter="s60" long-name="Home Screen Dialer Widget Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/hsdialerwidgetplugin" proFile="hsdialerwidgetplugin.pro"/>
-</component>
-<component name="infowidgetplugin" filter="s60" long-name="Info Widget Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/infowidgetplugin" proFile=""/>
-</component>
-</collection>
-<collection name="phonesettings" long-name="Phone Settings" level="plugin">
-<component name="cpphonesettingsplugins" filter="s60" long-name="CP Phone Settings Plugins" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phonesettings/cpphonesettingsplugins" proFile="cpphonesettingsplugins.pro"/>
-</component>
-</collection>
-</block>
-<block name="videotelephony" level="apps" long-name="Video Telephony Apps" levels="engine plugin prot ui">
-<collection name="videotelephony_plat" long-name="VT Apps Platform Interfaces" level="ui">
-<component name="video_telephony_control_mediator_api" long-name="Video Telephony Control Mediator API" filter="s60" class="api">
-<unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_control_mediator_api/group"/>
-</component>
-<component name="video_telephony_media_configuration_api" long-name="Video Telephony Media Configuration API" filter="s60" class="api">
-<unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_media_configuration_api/group"/>
-</component>
-</collection>
-<collection name="vtengines" long-name="Video Telephony Engines" level="engine">
-<component name="videoteleng" filter="s60" long-name="Video Telephony Engine">
-<unit bldFile="app/videotelephony/vtengines/videoteleng/Group"/>
-</component>
-<component name="vtmediatorplugin" filter="s60" long-name="VT Mediator Plugin" plugin="Y">
-<unit bldFile="app/videotelephony/vtengines/vtmediatorplugin/group"/>
-</component>
-</collection>
-<collection name="vtuis" long-name="Video Telephony UIs" level="ui">
-<component name="videotelui" filter="s60" long-name="Video Telephony UI">
-<unit bldFile="app/videotelephony/vtuis/videotelui/group"/>
-</component>
-</collection>
-<collection name="vtprotocolplugins" long-name="VT Protocol Plugins" level="plugin">
-<component name="displaysink" filter="s60" long-name="Display Sink" introduced="^2">
-<unit bldFile="app/videotelephony/vtprotocolplugins/DisplaySink/group"/>
-</component>
-<component name="videosource" filter="s60" long-name="Video Source" introduced="^2">
-<unit bldFile="app/videotelephony/vtprotocolplugins/VideoSource/group"/>
-</component>
-</collection>
-<collection name="vtprotocolsstub" long-name="VT Protocols Stub" level="prot">
-<!-- this collection is really a component, move down a directory -->
-<component name="videotelproto" filter="s60" long-name="Video Telephony Protocol">
-<unit bldFile="app/videotelephony/vtprotocolsstub/group" filter="sf_build"/>
-</component>
-</collection>
-</block>
-<block name="settingsuis" level="services" long-name="Settings UIs" levels="plugin ui">
-<collection name="controlpanelplugins" long-name="Control Panel Plugins" level="plugin">
-<component name="themeplugin" filter="s60" long-name="Theme Plugin" introduced="^4">
-<unit bldFile="app/settingsuis/controlpanelplugins/themeplugin" proFile="themeplugin.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-<collection name="controlpanelui" long-name="Control Panel UI" level="ui">
-<!-- collection is really a component, move down a dir -->
-<component name="controlpanelui_build" filter="s60" long-name="Control Panel UI Build" introduced="^4">
-<unit bldFile="app/settingsuis/controlpanelui" proFile="controlpanelui.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-</block>
-<block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin framework app">
-<collection name="contentctrl_plat" long-name="Content Control Daemons Platforn Interfaces" level="app">
-<component name="ds_contactsdatastoreextension_api" long-name="Adapter Customization API" filter="s60" introduced="^4" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_contactsdatastoreextension_api/group"/>
-</component>
-<component name="ds_data_modification_api" long-name="DS Data Modification API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_data_modification_api/group"/>
-</component>
-</collection>
-<collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
-<component name="secon" filter="s60" long-name="Service Controllers">
-<unit bldFile="app/contentcontrol/connectivitymodules/secon/group"/>
-</component>
-</collection>
-<collection name="dsdcmoadapter" long-name="Data Sync DCMO Adapter" level="plugin">
-<!-- Component at wrong rank, should move down a directory -->
-<component name="dsdcmoadapter_build" filter="s60" long-name="Data Sync Control DCMO Adapter">
-<unit bldFile="app/contentcontrol/dsdcmoadapter/group"/>
-</component>
-</collection>
-<collection name="omads" long-name="OMA Data Sync" level="app">
-<component name="omads_build" filter="s60" long-name="OMA DS Build">
-<unit bldFile="app/contentcontrol/omads/group"/>
-<!-- need to remove #include and rename and OMA DS ROM -->
-</component>
-<component name="omadsextensions" filter="s60" long-name="OMA DS Extensions" plugin="Y">
-<unit bldFile="app/contentcontrol/omads/omadsextensions/group"/>
-</component>
-<component name="omadsextensions" filter="s60" long-name="OMA DS Qt Extensions" plugin="Y">
-<unit bldFile="app/contentcontrol/omads/omadsextensions" proFile="omadsextensions.pro"/>
-</component>
-</collection>
-</block>
-<block name="firsttimeuse" level="apps" long-name="First Time Use" levels="support services ui app">
-<!-- these empty collections are really components. Move down a directory and supply units -->
-<collection name="ftuapplication" long-name="First Time Use Application" level="app"/>
-<collection name="fturuntimeservices" long-name="First Time Use Runtime Services" level="services"/>
-<collection name="wizardproviders" long-name="Wizard Providers" level="support"/>
-<collection name="stateproviders" long-name="State Providers" level="support"/>
-<collection name="runtimeproviders" long-name="Runtime Providers" level="support"/>
-<collection name="firsttimeuse_info" long-name="First Time Use Info" level="ui">
-<component name="firsttimeuse_build" long-name="First Time Use Build">
-<unit bldFile="app/firsttimeuse" proFile="ftu.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-</block>
-<block name="devicecontrol" level="services" long-name="Device Control Daemons" levels="oma mid app">
-<collection name="deviceupdatesui" long-name="Device Updates UI" level="app">
-<component name="deviceupdatesui_adapters" long-name="Device Updates Adapters" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/devicecontrol/deviceupdatesui/adapters/bld"/>
-</component>
-<component name="deviceupdates" long-name="Device Updates" filter="s60" introduced="^4">
-<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdates" proFile="deviceupdates.pro"/>
-</component>
-<component name="deviceupdatesplugin" long-name="Device Updates Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdatesplugin" proFile="deviceupdatesplugin.pro"/>
-</component>
-<component name="deviceupdatesqtsp" long-name="Device Updates Qt Service Provider" filter="s60" introduced="^4">
-<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdatesqtsp" proFile="deviceupdatesqtsp.pro"/>
-</component>
-<component name="cpqtsp" long-name="Client Provisioning Qt Service Provider" filter="s60" introduced="^4">
-<unit bldFile="app/devicecontrol/deviceupdatesui/cpqtsp" proFile="cpqtsp.pro"/>
-</component>
-<component name="devicemanagementnotifiersplugin" long-name="Device Management Notifiers Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/devicecontrol/deviceupdatesui/devicemanagementnotifiersplugin" proFile="devicemanagementnotifiersplugin.pro"/>
-</component>
-</collection>
-</block>
-<block name="printing" level="services" long-name="Printing"/>
-<block name="files" level="apps" long-name="File Manager Apps" levels="support apps">
-<collection name="filemanager" long-name="File Manager" level="apps">
-<component name="filemanager_plat" long-name="File Manager Platform Interfaces" filter="s60" introduced="^4" class="api"/>
-<component name="fmbkupengine" filter="s60" long-name="File Manager Backup Engine" introduced="^4">
-<unit bldFile="app/files/filemanager/src/fmbkupengine/group"/>
-</component>
-<component name="filemanager_build" filter="s60" long-name="File Manager Build">
-<!-- break this up into components or move down a directory -->
-<unit bldFile="app/files/filemanager" proFile="filemanager.pro"/>
-</component>
-</collection>
-</block>
-<block name="search" level="apps" long-name="Search Apps" levels="eng base app api">
-<collection name="search_info" long-name="Search Info">
-<component name="search_build" long-name="Search Build">
-<unit bldFile="app/search/group"/>
-</component>
-</collection>
-<collection name="searchui" long-name="Search UI">
-<component name="searchui_build" long-name="Search UI Build">
-<unit bldFile="app/search/searchui" proFile="searchui.pro"/>
-</component>
-</collection>
-</block>
-<block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
-<collection name="contacts_plat" long-name="Contacts Apps Platform Interfaces" level="ui">
-<component name="logs_engine_api" long-name="Logs Engine API" filter="s60" introduced="^4" class="api"/>
-<component name="logs_engine_api_extensions" long-name="Logs Engine API Extensions" filter="s60" class="api"/>
-<component name="logs_services_api" long-name="Logs Services API" filter="s60" introduced="^4" class="api"/>
-<component name="logs_timers_api" long-name="Logs Timers API" filter="s60" class="api"/>
-<component name="qt_mobility_contacts_api" long-name="Qt Mobility Contacts API" filter="s60" introduced="^4" class="api"/>
-</collection>
-<collection name="logsui" long-name="Logs UI" level="ui">
-<component name="logsui_build" filter="s60" long-name="Logs UI Build">
-<!-- component at too high a rank, should move down one directory -->
-<unit bldFile="app/contacts/logsui" proFile="logsui.pro"/>
-</component>
-</collection>
-<collection name="phonebookui" long-name="Phonebook UI" level="ui">
-<component name="mobhistorymodel" filter="s60" long-name="Mobile History Model" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/mobhistorymodel" qt:proFile="mobhistorymodel.pro"/> -->
-</component>
-<component name="pbkcommonui" filter="s60" long-name="Phonebook Common UI" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/pbkcommonui" qt:proFile="pbkcommonui.pro"/> -->
-</component>
-<component name="phonebookapp" filter="s60" long-name="Phonebook Application" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/phonebookapp" qt:proFile="phonebookapp.pro"/> -->
-</component>
-<component name="phonebookservices" filter="s60" long-name="Phonebook Services" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/phonebookservices" qt:proFile="phonebookservices.pro"/> -->
-</component>
-<component name="phonebookui_build" filter="s60" long-name="Phonebook UI Build" introduced="^4">
-<!-- break up into components -->
-<unit bldFile="app/contacts/phonebookui" proFile="phonebookui.pro"/>
-</component>
-</collection>
-<collection name="qtcontactsmobility" long-name="Qt Contacts Mobility" level="support">
-<component name="qtcontactsmobility_build" filter="s60" long-name="Qt Contacts Mobility Build" introduced="^4" plugin="Y">
-<!-- not really a component, move down a dir? Break up into compnents? -->
-<unit bldFile="app/contacts/qtcontactsmobility" proFile="qtcontactsmobility.pro"/>
-</component>
-</collection>
-<collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
-<component name="cntfindplugin" filter="s60" long-name="Contacts Find Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntfindplugin" proFile="cntfindplugin.pro"/>
-</component>
-<component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
-<unit bldFile="app/contacts/phonebookengines/contactsmodel/groupsql" mrp="app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
-</component>
-<component name="cntsortplugin" filter="s60" long-name="Contacts Sort Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntsortplugin" proFile="cntsortplugin.pro"/>
-</component>
-<component name="mobcntmodel" filter="s60" long-name="Mobile Contacts Model" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/mobcntmodel" proFile="mobcntmodel.pro"/>
-</component>
-<component name="mobcntactions" filter="s60" long-name="Mobile Contacts Actions" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/cntmaptileservice" proFile="cntmaptileservice.pro"/>
-</component>
-<component name="cntmaptileservice" filter="s60" long-name="Contacts Map Tile Service" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/cntmaptileservice" proFile="cntmaptileservice.pro"/>
-</component>
-<component name="simutility" filter="s60" long-name="SIM Utility" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/simutility" proFile="simutility.pro"/>
-</component>
-</collection>
-<collection name="pimprotocols" long-name="PIM Protocols" level="services">
-<component name="phonebooksync" long-name="Phonebook Sync" purpose="optional" plugin="Y">
-<unit bldFile="app/contacts/pimprotocols/phonebooksync/group" mrp="app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
-</component>
-<component name="pbap" long-name="Bluetooth PBAP" introduced="9.2" purpose="optional">
-<unit bldFile="app/contacts/pimprotocols/pbap/group" mrp="app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
-</component>
-</collection>
-<collection name="contacts_info" long-name="Contacts Apps Info" level="ui">
-<component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="organizer" level="apps" span="2" long-name="Organizer Application Suite" levels="support services engine ui app">
-<collection name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" level="app">
-<component name="calendar_interim_utils2_api" long-name="Calendar Interim Utils 2 API" filter="s60" class="api">
-<!-- move into own .pro file -->
-<unit bldFile="app/organizer/organizer_pub" proFile="organizer_pub.pro"/>
-</component>
-</collection>
-<collection name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" level="app">
-<component name="organizer_plat_build" long-name="Organizer Application Suite Platform Interface Build" filter="s60" class="api">
-<!-- break up into individual .pro files -->
-<unit bldFile="app/organizer/organizer_plat" proFile="organizer_plat.pro"/>
-</component>
-<component name="agenda_versit_2_api" long-name="Agenda Versit 2 API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="organizer_plat/agenda_versit_2_api/group"/>-->
-</component>
-<component name="calendar_exporter_api" long-name="Calendar Exporter API" filter="s60" class="api placeholder">
-<!--<unit bldFile="organizer_plat/calendar_exporter_api/group"/>-->
-</component>
-<component name="calendar_importer_api" long-name="Calendar Importer API" filter="s60" class="api placeholder">
-<!--<unit bldFile="organizer_plat/calendar_importer_api/group"/>-->
-</component>
-<component name="calendar_launcher_api" long-name="Calendar Launcher API" filter="s60" class="api placeholder">
-<!--<unit bldFile="organizer_plat/calendar_launcher_api/group"/> -->
-</component>
-<component name="agenda_interface_api" long-name="Agenda Interface API" filter="s60" introduced="^4" class="api"/>
-<component name="calendar_editor_api" long-name="Calendar Editor API" filter="s60" introduced="^4" class="api"/>
-<component name="notes_editor_api" long-name="Notes Editor API" filter="s60" introduced="^4" class="api"/>
-<component name="agenda_eventviewer_api" long-name="Agenda Event Viewer API" filter="s60" introduced="^4" class="api"/>
-</collection>
-<collection name="agendainterface" long-name="Agenda Interface" level="services">
-<!-- collection is really a component, should move down a directory -->
-<component name="agendainterface_build" filter="s60" long-name="Agenda Interface Build">
-<unit bldFile="app/organizer/agendainterface" proFile="agendainterface.pro"/>
-</component>
-</collection>
-<collection name="calendarui" long-name="Calendar UI" level="ui">
-<component name="commonutils" filter="s60" long-name="Calendar Common Utils">
-<unit bldFile="app/organizer/calendarui/commonutils" proFile="commonutils.pro"/>
-</component>
-<component name="calenlauncher" filter="s60" long-name="Calendar Launcher">
-<unit bldFile="app/organizer/calendarui/calenlauncher/group" proFile="calenlauncher.pro"/>
-</component>
-<component name="caleneditor" filter="s60" long-name="Calendar Editor" introduced="^4">
-<unit bldFile="app/organizer/calendarui/caleneditor" proFile="caleneditor.pro"/>
-</component>
-<component name="agendaeventviewer" filter="s60" long-name="Agenda Event Viewer" introduced="^4">
-<unit bldFile="app/organizer/calendarui/agendaeventviewer" proFile="agendaeventviewer.pro"/>
-</component>
-<component name="globaldata" filter="s60" long-name="Calendar Global Data">
-<unit bldFile="app/organizer/calendarui/globaldata" proFile="globaldata.pro"/>
-</component>
-<component name="settings" filter="s60" long-name="Calendar Settings">
-<unit bldFile="app/organizer/calendarui/settings" proFile="settings.pro"/>
-</component>
-<component name="calenplugins" filter="s60" long-name="Calendar Plugins" introduced="^4" plugin="Y">
-<unit bldFile="app/organizer/calendarui/calenplugins" proFile="calenplugins.pro"/>
-</component>
-<component name="customisationmanager" filter="s60" long-name="Calendar Customisation Manager">
-<unit bldFile="app/organizer/calendarui/customisationmanager" proFile="customisationmanager.pro"/>
-</component>
-<component name="views" filter="s60" long-name="Calendar Views">
-<unit bldFile="app/organizer/calendarui/views" proFile="views.pro"/>
-</component>
-<component name="calengriditemstyleplugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/organizer/calendarui/styleplugins/calengriditemstyleplugin" proFile="calengriditemstyleplugin.pro"/>
-</component>
-<component name="calendarui_controller" filter="s60" long-name="Calendar Controller">
-<unit bldFile="app/organizer/calendarui/controller" proFile="controller.pro"/>
-</component>
-<component name="calendarui_application" filter="s60" long-name="Calendar Application">
-<unit bldFile="app/organizer/calendarui/application" proFile="application.pro"/>
-</component>
-<component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y">
-<unit bldFile="app/organizer/calendarui/caldav/group"/>
-</component>
-</collection>
-<collection name="notes" long-name="Notes" level="ui">
-<component name="noteseditor" filter="s60" long-name="Notes Editor" introduced="^4">
-<unit bldFile="app/organizer/notes/notesui/noteseditor" proFile="noteseditor.pro"/>
-</component>
-<component name="notes_build" filter="s60" long-name="Notes Build" introduced="^4">
-<unit bldFile="app/organizer/notes" proFile="notes.pro"/>
-</component>
-</collection>
-<collection name="calendarengines" long-name="Calendar Engines" level="engine">
-<component name="versit2" filter="s60" long-name="Versit 2 iCal Parser" introduced="9.2">
-<unit bldFile="app/organizer/calendarengines/versit2/group"/>
-</component>
-<component name="agnversit2" filter="s60" long-name="Versit 2 Agenda Interface" introduced="9.2" plugin="Y">
-<unit bldFile="app/organizer/calendarengines/agnversit2/group"/>
-</component>
-<component name="caleninterimutils" filter="s60" long-name="Calendar Interim Utils" introduced="9.1">
-<unit bldFile="app/organizer/calendarengines/caleninterimutils/group"/>
-</component>
-<component name="calenimp" filter="s60" long-name="Calendar Import Wrapper" introduced="7.0s">
-<unit bldFile="app/organizer/calendarengines/calenimp/group"/>
-</component>
-<component name="caldavsrv" filter="sf_build" long-name="CalDAV Server" introduced="^3">
-<unit bldFile="app/organizer/calendarengines/caldav/group"/>
-</component>
-</collection>
-<collection name="clock" long-name="Clock" level="app">
-<!-- uncomment unit when block_build is split up-->
-<component name="clockengines" filter="s60" long-name="Clock Engines" class="placeholder">
-<!--<unit bldFile="clock/clockengines" qt:proFile="clockengines.pro"/> -->
-</component>
-<component name="clockmw" filter="s60" long-name="Clock Middleware" introduced="^4" class="placeholder">
-<!--<unit bldFile="clock/clockmw" qt:proFile="clockmw.pro"/>-->
-</component>
-<component name="clockui" filter="s60" long-name="Clock UI" class="placeholder">
-<!--<unit bldFile="clock/clockui" qt:proFile="clockui.pro"/>-->
-</component>
-<component name="ftudatetimewizard" filter="s60" long-name="First Time Use Date/Time Wizard" introduced="^4" class="placeholder">
-<!--<unit bldFile="clock/ftudatetimewizard" qt:proFile="ftudatetimewizard.pro"/>-->
-</component>
-<component name="clock_build" filter="s60" long-name="Clock Build">
-<!-- make exports into a component, or just move to one of the above components, then remove this and uncomment the above -->
-<unit bldFile="app/organizer/clock" proFile="clock.pro"/>
-</component>
-</collection>
-<collection name="pimappservices" long-name="PIM Application Services" level="services">
-<component name="calendar" long-name="Calendar" introduced="9.2" purpose="optional">
-<unit bldFile="app/organizer/pimappservices/calendar/group" mrp="app/organizer/pimappservices/calendar/group/app-engines_calendar.mrp" version="2"/>
-</component>
-<component name="calendarvcalplugin" long-name="Calendar vCal Plugin" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="app/organizer/pimappservices/calendarvcalplugin/group" mrp="app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp" version="2"/>
-</component>
-<component name="appenginesdocs" long-name="Application Engines Documentation" purpose="development" class="doc">
-<unit mrp="app/organizer/pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
-</component>
-</collection>
-<collection name="pimappsupport" long-name="PIM Application Support" level="support">
-<component name="vcardandvcal" long-name="vCard and vCal" introduced="ER5" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/vcardandvcal/group" mrp="app/organizer/pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
-</component>
-<component name="chinesecalendarconverter" long-name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
-</component>
-</collection>
-<collection name="alarmui" long-name="Alarm UI" level="app">
-<!-- collection is really a component, should move down a directory -->
-<component name="alarmui_build" filter="s60" long-name="Alarm UI Build">
-<unit bldFile="app/organizer/alarmui" proFile="alarmui.pro"/>
-</component>
-</collection>
-<collection name="organizer_info" long-name="Organizer Application Suite Info" level="app">
-<component name="organizer_metadata" long-name="Organizer Application Suite Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="plugin eng base app api">
-<collection name="msg_plat" long-name="Messaging Apps Platform APIs" level="api">
-<component name="messaging_media_resolver_api" long-name="Messaging Media Resolver API" filter="s60" class="api"/>
-<component name="mms_application_api" long-name="MMS Application API" filter="s60" class="api"/>
-<component name="mms_codec_client_api" long-name="MMS Codec Client API" filter="s60" class="api"/>
-<component name="mms_conformance_api" long-name="MMS Conformance API" filter="s60" class="api"/>
-<component name="mms_engine_settings_api" long-name="MMS Engine Settings API" filter="s60" class="api"/>
-<component name="mms_server_settings_api" long-name="MMS Server Settings API" filter="s60" class="api"/>
-<component name="conversation_services_client_api" long-name="Conversation Services Client API" filter="s60" introduced="^4" class="api"/>
-<component name="conversation_services_plugin_api" long-name="Conversation Services Plugin API" filter="s60" introduced="^4" class="api"/>
-<component name="conversation_services_utilities_api" long-name="Conversation Services Utilities API" filter="s60" introduced="^4" class="api"/>
-<component name="shareui_api" long-name="Share UI API" filter="s60" introduced="^4" class="api"/>
-<component name="messaging_history_api" long-name="Messaging History API" filter="s60" introduced="^4" class="api"/>
-<component name="msg_plat_build" long-name="Messaging Apps Platform APIs Build" filter="s60" introduced="^4" class="api">
-<!-- break this up into the above units and replace their base attributes with bldFile, etc -->
-</component>
-</collection>
-<collection name="msg_pub" long-name="Messaging Apps Public APIs" level="api">
-<component name="mms_client_mtm_api" long-name="MMS Client MTM API" filter="s60" class="api"/>
-<component name="msg_smil_dtd_api" long-name="Messaging SMIL DTD API" filter="s60" introduced="^4" class="api"/>
-<component name="msg_pub_build" long-name="Messaging Apps Public APIs Build" filter="s60" introduced="^4" class="api">
-<!-- break this up into the above units and replace their base attributes with bldFile, etc -->
-</component>
-</collection>
-<collection name="mobilemessaging" long-name="Mobile Messaging" level="plugin">
-<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/mobilemessaging/smsmtm/group" mrp="app/messaging/mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
-</component>
-</collection>
-<collection name="messagingappbase" long-name="Messaging App Base" level="base">
-<component name="messagingappbase_build" filter="s60" long-name="Messaging App Base Build" introduced="^4">
-<!-- break this up into the below components -->
-<unit bldFile="app/messaging/messagingappbase" proFile="messagingappbase/messagingappbase.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgmedia" filter="s60" long-name="Message Media"/>
-<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
-<unit mrp="app/messaging/messagingappbase/smsmtm/group/messaging_sms.mrp"/>
-</component>
-<component name="smilparser" long-name="SMIL Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="app/messaging/messagingappbase/smilparser/GROUP" mrp="app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
-</component>
-<component name="obexmtms" long-name="OBEX MTMs" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/obexmtms/Group" mrp="app/messaging/messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
-</component>
-</collection>
-<collection name="mmsengine" long-name="MMS Engine" level="eng">
-<component name="mmsconninit" filter="s60" long-name="MMS Connection Initiator" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsconninit/bld"/> -->
-</component>
-<component name="genutils" filter="s60" long-name="General Utils" class="placeholder">
-<!-- <unit bldFile="mmsengine/genutils/bld"/> -->
-</component>
-<component name="mmsserversettings" filter="s60" long-name="MMS Server Settings" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserversettings/bld"/> -->
-</component>
-<component name="mmsmessage" filter="s60" long-name="MMS Message" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsmessage/bld"/> -->
-</component>
-<component name="mmshttptransport" filter="s60" long-name="MMS HTTP Transport" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmshttptransport/bld"/> -->
-</component>
-<component name="mmscodec" filter="s60" long-name="MMS Codec" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodec/bld"/> -->
-</component>
-<component name="mmsserver" filter="s60" long-name="MMS Server" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserver/bld"/> -->
-</component>
-<component name="clientmtm" filter="s60" long-name="MMS Client MTM" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/clientmtm/bld"/> -->
-</component>
-<component name="mmswatcher" filter="s60" long-name="MMS Watcher" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmswatcher/bld"/> -->
-</component>
-<component name="mmspushhandler" filter="s60" long-name="MMS Push Handler" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmspushhandler/bld"/> -->
-</component>
-<component name="applicationadapter" filter="s60" long-name="MMS Application Adapter" class="placeholder">
-<!-- <unit bldFile="mmsengine/applicationadapter/bld"/> -->
-</component>
-<component name="mmscodecclient" filter="s60" long-name="MMS Codec Client" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodecclient/bld"/> -->
-</component>
-<component name="mmssettings" long-name="MMS Settings" introduced="9.2" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmssettings/group" mrp="app/messaging/mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
-</component>
-<component name="mmsconf" long-name="MMS Configuration" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmsconf" mrp="app/messaging/mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
-</component>
-<component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
-<!-- this should be broken up into the individual other components -->
-<unit bldFile="app/messaging/mmsengine" proFile="mmsengine/mmsengine.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="messagingapp" long-name="Messaging Application" level="app">
-<component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
-<!-- this should be broken up into the individual other components -->
-<unit bldFile="app/messaging/mmsengine" proFile="mmsengine/mmsengine.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgutils" filter="s60" long-name="Messaging Utils" introduced="^4">
-<unit bldFile="app/messaging/msgutils" proFile="msgutils.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgappfw" filter="s60" long-name="Messaging Application Framework" introduced="^4">
-<unit bldFile="app/messaging/msgappfw" proFile="msgappfw.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgsettings" filter="s60" long-name="Messaging Settings" introduced="^4">
-<unit bldFile="app/messaging/msgsettings" proFile="msgsettings.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgnotifications" filter="s60" long-name="Messaging Notifications" introduced="^4">
-<unit bldFile="app/messaging/msgnotifications" proFile="msgnotifications.pro" qmakeArgs="-r"/>
-</component>
-<component name="smartmessaging" filter="s60" long-name="Smart Messaging">
-<unit bldFile="app/messaging/messagingapp/smartmessaging" proFile="smartmessaging.pro" qmakeArgs="-r"/>
-</component>
-<component name="shareui" filter="s60" long-name="Shared UI" introduced="^4">
-<unit bldFile="app/messaging/shareui" proFile="shareui.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgui" filter="s60" long-name="Messaging UI" introduced="^4">
-<unit bldFile="app/messaging/msgui" proFile="msgui.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="email" long-name="Email" level="plugin">
-<!-- use commonemail instead -->
-<component name="pop3andsmtpmtm" long-name="POP3 and SMTP MTM" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/pop3andsmtpmtm/group" mrp="app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
-</component>
-<component name="imap4mtm" long-name="IMAP4 MTM" introduced="9.2" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/imap4mtm/group" mrp="app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
-</component>
-</collection>
-<collection name="messaging_info" long-name="Messaging Apps Info" level="api">
-<component name="messaging_metadata" long-name="Messaging Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commonemail" level="apps" span="2" long-name="Email Apps" levels="service support ui app">
-<!-- need to resolve the qt parts into proper components, then uncomment the units -->
-<collection name="email_plat" long-name="Email Apps Platform Interfaces" level="app">
-<component name="nmail_client_api" long-name="NMail Client API" filter="s60" introduced="^4" class="api placeholder">
-<!--<unit bldFile="email_plat" qt:proFile="email_plat.pro"/> -->
-</component>
-</collection>
-<collection name="emailservices" long-name="Email Services" level="service">
-<component name="nmailbase" filter="s60" long-name="NMail Base" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/nmailbase" qt:proFile="nmailbase.pro"/> -->
-</component>
-<component name="emailcommon" filter="s60" long-name="Email Common" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/emailcommon" qt:proFile="emailcommon.pro"/>-->
-</component>
-<component name="emailframework" filter="s60" long-name="Email Framework" introduced="^2" class="placeholder">
-<!-- <unit bldFile="emailservices/emailframework" qt:proFile="emailframework.pro"/>-->
-</component>
-<component name="emailstore" filter="s60" long-name="Email Store" introduced="^2" class="placeholder">
-<!-- <unit bldFile="emailservices/emailstore" qt:proFile="emailstore.pro"/>-->
-</component>
-<component name="nmclientapi" filter="s60" long-name="Nmail Client API" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/nmclientapi" qt:proFile="nmclientapi.pro"/>-->
-</component>
-<component name="nmailagent" filter="s60" long-name="Nmail Agent" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/nmailagent" qt:proFile="nmailagent.pro"/>-->
-</component>
-</collection>
-<collection name="ipsservices" long-name="IMAP/POP/SMTP Services" level="service">
-<component name="ipssosplugin" filter="s60" long-name="IPS SOS Plugin" introduced="^2" plugin="Y" class="placeholder">
-<!-- SOS? Consider spelling it out since the abbreviation is ambiguous -->
-<!--<unit bldFile="ipsservices/ipssosplugin" qt:proFile="ipssosplugin.pro" />-->
-</component>
-<component name="nmimapclientplugin" filter="s60" long-name="NM IMAP Client Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="ipsservices/nmimapclientplugin" qt:proFile="nmimapclientplugin.pro"/>-->
-</component>
-<component name="nmipsmtms" filter="s60" long-name="NM IPS Client Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="ipsservices/nmipsmtms" qt:proFile="nmipsmtms.pro"/>-->
-</component>
-<component name="nmipssettings" filter="s60" long-name="NM IPS Settings" introduced="^4" class="placeholder">
-<!-- <unit bldFile="ipsservices/nmipssettings" qt:proFile="nmipssettings.pro"/>-->
-</component>
-<component name="ipsservices_build" filter="s60" long-name="IPS Services Build" introduced="^2" class="placeholder">
-<!--<unit bldFile="ipsservices" qt:proFile="ipsservices.pro"/> -->
-<!-- can the exports be broken up into the other components or made a config component?-->
-</component>
-</collection>
-<collection name="emailuis" long-name="Email UIs" level="app">
-<component name="nmailuiengine" filter="s60" long-name="Nmail UI Engine" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailuiengine" qt:proFile="nmailuiengine.pro"/> -->
-</component>
-<component name="nmailuiwidgets" filter="s60" long-name="Nmail UI Widgets" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailuiwidgets" qt:proFile="nmailuiwidgets.pro"/> -->
-</component>
-<component name="nmailuiwidgetsplugin" filter="s60" long-name="Nmail UI Widgets Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailuiwidgetsplugin" qt:proFile="nmailuiwidgetsplugin.pro"/> -->
-</component>
-<component name="nmsettingui" filter="s60" long-name="Nmail Setting UI" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmsettingui" qt:proFile="nmsettingui.pro"/> -->
-</component>
-<component name="nmailcpplugin" filter="s60" long-name="Nmail CP Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailcpplugin" qt:proFile="nmailcpplugin.pro"/> -->
-</component>
-<component name="nmailui" filter="s60" long-name="Nmail UI" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailui" qt:proFile="nmailui.pro"/> -->
-</component>
-<component name="nmindicatorplugin" filter="s60" long-name="Nmail Indicator Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmindicatorplugin" qt:proFile="nmindicatorplugin.pro"/> -->
-</component>
-<component name="nmframeworkadapter" filter="s60" long-name="Nmail Framework Adapter" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmframeworkadapter" qt:proFile="nmframeworkadapter.pro"/> -->
-</component>
-</collection>
-<collection name="commonemail_info" long-name="Email Apps Info" level="app">
-<component name="commonemail_build" long-name="Email Apps Build" introduced="^4">
-<!-- split into actual components -->
-<unit bldFile="app/commonemail" proFile="nmail.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</block>
-<block name="camera" level="apps" long-name="Camera Apps">
-<collection name="camerauis" long-name="Camera UIs">
-<component name="cameraxui" filter="s60" long-name="CameraX UIs">
-<unit bldFile="app/camera/camerauis/cameraxui" filter="!test" proFile="camerax.pro"/>
-</component>
-</collection>
-</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">
-<component name="image_editor_debug_utilities_api" long-name="Image Editor Debug Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
-</component>
-<component name="image_editor_utilities_api" long-name="Image Editor Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_utilities_api/group"/>
-</component>
-<component name="image_editor_definitions_api" long-name="Image Editor Definitions API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_definitions_api/group"/>
-</component>
-<component name="image_editor_system_parameters_api" long-name="Image Editor System Parameters API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_system_parameters_api/group"/>
-</component>
-<component name="image_processing_engine_api" long-name="Image Processing Engine API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_processing_engine_api/group"/>
-</component>
-</collection>
-<collection name="imageeditor" long-name="Image Editor UI" level="ui">
-<component name="pb" filter="s60" long-name="Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/pb/group"/>
-</component>
-<component name="iepb" filter="s60" long-name="Image Editor Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/iepb/group"/>
-</component>
-<component name="imageeditorui" filter="s60" long-name="Image Editor UI">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorui/group"/>
-</component>
-<component name="imageeditormanager" filter="s60" long-name="Image Editor Manager">
-<unit bldFile="app/imgeditor/imageeditor/imageeditormanager/group"/>
-</component>
-<component name="imageeditorapp" filter="s60" long-name="Image Editor Application">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorapp/group"/>
-</component>
-<component name="imageeditor_plugins" filter="s60" long-name="Image Editor Plugins" plugin="Y">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditor/plugins/blackwhiteplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/brightnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/bubbleplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cartoonizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/clipartplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/contrastplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cropplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/drawplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/frameplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/negativeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/redeyeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/resizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotatelplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotaterplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/textplugin/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditor/plugins/drawplugin/group"/>
- -->
-</component>
-<component name="editorprovider" filter="s60" long-name="Image Editor Provider">
-<unit bldFile="app/imgeditor/imageeditor/editorprovider/group"/>
-</component>
-<component name="imageeditor_build" filter="s60" long-name="Image Editor Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditor/group"/>
-</component>
-</collection>
-<collection name="imageeditorengine" long-name="Image Editor Engine" level="engine">
-<component name="filters" filter="s60" long-name="Image Editor Filters">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbrightness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbubble/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbuffer/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercartoon/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterclipart/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercontrast/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercrop/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterdraw/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterframe/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtergrayscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtericlsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegtarget/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filternegate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterredeye/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterrotate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtertext/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
- -->
-</component>
-<component name="imageeditorutils" filter="s60" long-name="Image Editor Utilities">
-<unit bldFile="app/imgeditor/imageeditorengine/imageeditorutils/group"/>
-</component>
-<component name="systemparameters" filter="s60" long-name="System Parameters">
-<unit bldFile="app/imgeditor/imageeditorengine/systemparameters/group"/>
-</component>
-<component name="enginewrapper" filter="s60" long-name="Image Editor Engine Wrapper">
-<unit bldFile="app/imgeditor/imageeditorengine/enginewrapper/group"/>
-</component>
-<component name="imageeditorengine_build" filter="s60" long-name="Image Editor Engine Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoeditor" level="apps" long-name="Video Editor Apps" levels="engine ui">
-<collection name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" level="ui">
-<component name="video_editor_engine_api" long-name="Video Editor Engine API" introduced="^2" class="api">
-<unit bldFile="app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
-</component>
-</collection>
-<collection name="videditor" long-name="Video Editor" level="ui">
-<component name="videoeditorcommon" filter="s60" long-name="Video Editor Common" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditorcommon/group"/>
-</component>
-<component name="videoeditoruicomponents" filter="s60" long-name="Video Editor UI Components" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditoruicomponents/group"/>
-</component>
-<component name="simplevideoeditor" filter="s60" long-name="Simple Video Editor" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplevideoeditor/group"/>
-</component>
-<component name="simplecutvideo" filter="s60" long-name="Simple Cut Video" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplecutvideo/group"/>
-</component>
-<component name="videoprovider" filter="s60" long-name="Video Provider" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoprovider/group"/>
-</component>
-<component name="manualvideoeditor" filter="s60" long-name="Manual Video Editor" introduced="^2" class="placeholder">
-<!-- uncomment when supported
- <meta rel="config">
- <defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
- </meta>
- <unit bldFile="videditor/manualvideoeditor/group"/> -->
-</component>
-<component name="videditor_build" filter="s60" long-name="Video Editor Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videditor/group"/>
-</component>
-</collection>
-<collection name="videoeditorengine" long-name="Video Editor Engine" level="engine">
-<component name="audioeditorengine" filter="s60" long-name="Audio Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/audioeditorengine/group"/>
-</component>
-<component name="avcedit" filter="s60" long-name="AVC Editing" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/avcedit/group"/>
-</component>
-<component name="h263decoder" filter="s60" long-name="H.263 Decoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/h263decoder/group"/>
-</component>
-<component name="mp3aacmaniplib" filter="s60" long-name="MP3 and AAC Manipulation Library" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
-</component>
-<component name="vedtranscoder" filter="s60" long-name="Video Editor Transcoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedtranscoder/group"/>
-</component>
-<component name="vedengine" filter="s60" long-name="Video Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedengine/group"/>
-</component>
-<component name="videoeditorengine_build" filter="s60" long-name="Video Editor Engine Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videoeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
-<collection name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" level="apps">
-<component name="videoplayer_startup_api" long-name="Video Player Startup API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videoplayer_startup_api/group" filter="!test"/>
-</component>
-<component name="videocollection_api" long-name="Video Collection API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videocollection_api/group"/>
-</component>
-</collection>
-<collection name="videocollection" long-name="Video Collection" level="util">
-<component name="mpxmyvideoscollection" filter="s60" long-name="MPX My Videos Collection" introduced="^3">
-<unit bldFile="app/videoplayer/videocollection/mpxmyvideoscollection/group"/>
-</component>
-<component name="videocollectionwrapper" filter="s60" long-name="Video Collection Wrapper" introduced="^4">
-<unit bldFile="app/videoplayer/videocollection/videocollectionwrapper" proFile="videocollectionwrapper.pro" qmakeArgs="-r"/>
-</component>
-<component name="videocollectionview" filter="s60" long-name="Video Collection View" introduced="^4">
-<unit bldFile="app/videoplayer/videocollection/videocollectionview" proFile="videocollectionview.pro" qmakeArgs="-r"/>
-</component>
-<component name="videofiledetailsview" filter="s60" long-name="Video File Details View" introduced="^4">
-<unit bldFile="app/videoplayer/videocollection/videofiledetailsview" proFile="videofiledetailsview.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="mediasettings" long-name="Media Settings" level="support">
-<!-- this is really a component. Should be moved down a directory -->
-<component name="mediasettings_build" filter="s60" long-name="Media Settings Build">
-<unit bldFile="app/videoplayer/mediasettings/group"/>
-</component>
-</collection>
-<collection name="videoplayerapp" long-name="Video Player App" level="apps">
-<component name="videoplayerengine" long-name="Video Player Engine" filter="s60" introduced="^4">
-<unit bldFile="app/videoplayer/videoplayerapp/videoplayerengine" proFile="videoplayerengine.pro" qmakeArgs="-r"/>
-</component>
-<component name="hbvideoplayer" filter="s60" long-name="HB Video Player" introduced="^4">
-<unit bldFile="app/videoplayer/videoplayerapp/hbvideoplayer" proFile="hbvideoplayer.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="videoplayback" long-name="Video Playback Plugins" level="plugin">
-<component name="hbvideoplaybackview" filter="s60" long-name="HB Video Playback View" introduced="^4" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/hbvideoplaybackview" proFile="hbvideoplaybackview.pro" qmakeArgs="-r"/>
-</component>
-<component name="hbvideoplaybackviewplugin" filter="s60" long-name="HB Video Playback View Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/hbvideoplaybackviewplugin" proFile="hbvideoplaybackviewplugin.pro" qmakeArgs="-r"/>
-</component>
-<component name="videohelix" long-name="Video Helix" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videohelix/group"/>
-</component>
-</collection>
-</block>
-<block name="photos" level="apps" long-name="Photos" levels="util support ui app">
-<collection name="photos_group" long-name="Photos Group" level="support">
-<component name="photos_group_build" filter="s60" long-name="Photos Group Build" introduced="^4" class="placeholder">
-<!--<unit bldFile="group" qt:proFile="group.pro"/> -->
-</component>
-</collection>
-<collection name="photos_loggers" long-name="Photos Loggers" level="util">
-<component name="photos_loggerqt" filter="s60" long-name="Photos Logger Qt" introduced="^4" class="placeholder">
-<!--<unit bldFile="loggers/loggerqt" qt:proFile="loggerqt.pro"/> -->
-</component>
-</collection>
-<collection name="photos_commonutilities" long-name="Photos Common Utilities" level="util">
-<component name="photos_externalutility" filter="s60" long-name="Photos External Utility" introduced="^4" class="placeholder">
-<!--<unit bldFile="commonutilities/externalutility" qt:proFile="externalutility.pro"/> -->
-</component>
-<component name="imagedecoderwrapper" filter="s60" long-name="Image Decoder Wrapper" introduced="^4" class="placeholder">
-<!--<unit bldFile="commonutilities/imagedecoderwrapper" qt:proFile="imagedecoderwrapper.pro"/> -->
-</component>
-</collection>
-<collection name="photos_ui" long-name="Photos UI" level="ui">
-<component name="photos_uiengine" filter="s60" long-name="Photos UI Engine" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/uiengine" qt:proFile="uiengine.pro"/> -->
-</component>
-<component name="photos_commandhandlers" filter="s60" long-name="Photos Command Handlers" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/commandhandlers" qt:proFile="commandhandlers.pro"/> -->
-</component>
-<component name="photos_views" filter="s60" long-name="Photos Views" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/views" qt:proFile="views.pro"/> -->
-</component>
-<component name="photos_viewmanagement" filter="s60" long-name="Photos View Management" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/viewmanagement" qt:proFile="viewmanagement.pro"/> -->
-</component>
-</collection>
-<collection name="photos_main" long-name="Photos Main" level="support">
-<component name="photos_main_build" filter="s60" long-name="Photos Main Build" introduced="^4" class="placeholder">
-<!--<unit bldFile="main" qt:proFile="main.pro"/> -->
-</component>
-</collection>
-<collection name="imageviewerapp" long-name="Image Viewer App" level="support">
-<component name="imageviewerapp_build" filter="s60" long-name="Image Viewer App Build" introduced="^4" class="placeholder">
-<!--<unit bldFile="imageviewerapp" qt:proFile="imageviewerapp.pro"/> -->
-</component>
-</collection>
-<collection name="photos_info" long-name="Photos Info" level="support">
-<component name="photos_build" filter="s60" long-name="Photos Build" introduced="^4">
-<!-- split this up into the above components -->
-<unit bldFile="app/photos/photosgallery" proFile="photos.pro"/>
-</component>
-</collection>
-</block>
-<block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support hs app">
-<!-- move the export .pri files into their components and uncomment the units -->
-<collection name="musicplayer_utilities " long-name="Music Player Utilities" level="support">
-<component name="mpnowplayingbanner" filter="s60" long-name="MP Now Playing Banner" introduced="^4" class="placeholder">
-<!-- <unit bldFile="utilities/mpnowplayingbanner" qt:proFile="mpnowplayingbanner.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-<component name="mpsettingsmanager" filter="s60" long-name="MP Settings Manager" introduced="^4" class="placeholder">
-<!-- <unit bldFile="utilities/mpsettingsmanager" qt:proFile="mpsettingsmanager.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-</collection>
-<collection name="musicfetcher " long-name="Music Fetcher" level="support">
-<!-- collection is really a component, move down a directory -->
-<component name="musicfetcher_buld" filter="s60" long-name="Music Fetcher Build" introduced="^4" class="placeholder">
-<!-- <unit bldFile="musicfetcher" qt:proFile="musicfetcher.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-</collection>
-<collection name="musicplayer_app " long-name="Music Player Application" level="app">
-<!-- collection is really a component, move down a directory -->
-<component name="musicplayer_app_build" filter="s60" long-name="Music Player Application Build" introduced="^4" class="placeholder">
-<!-- <unit bldFile="app" qt:proFile="app.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-</collection>
-<collection name="mpviewplugins " long-name="Music Player View Plugins" level="plugins">
-<component name="mpcollectionviewplugin" filter="s60" long-name="MP Collection View Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpviewplugins/mpcollectionviewplugin/group"/>-->
-</component>
-<component name="mpplaybackviewplugin" filter="s60" long-name="MP Playback View Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpviewplugins/mpplaybackviewplugin/group"/>-->
-</component>
-</collection>
-<collection name="mpserviceplugins" long-name="Music Player Service Plugins" level="plugins">
-<component name="audioeffects" filter="s60" long-name="Audio Effects" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/audioeffects/group"/>-->
-</component>
-<component name="localaudio" filter="s60" long-name="Local Audio" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/localaudio/group"/>-->
-</component>
-<!-- Note: it's called SQLite, not SQLLite, just the one "L" -->
-<component name="mpxsqlitedbcommon" filter="s60" long-name="MPX SQLite Database Common" introduced="^4" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitedbcommon/group"/>-->
-</component>
-<component name="mpxsqlitedbplugin" filter="s60" long-name="MPX SQLite Database Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitedbplugin/group"/>-->
-</component>
-<component name="mpxsqlitepodcastdbplugin" filter="s60" long-name="MPX SQLlite Podcast Database Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
-</component>
-<component name="m3uplaylistplugin" filter="s60" long-name="M3U Playlist Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
-</component>
-</collection>
-<collection name="musicplayer_info" long-name="Music Player Apps Info" level="app">
-<component name="musicplayer_build" filter="s60" long-name="Music Player Build">
-<!-- should brak up into individual components -->
-<unit bldFile="app/musicplayer" proFile="qtmusicplayer.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-</block>
-<block name="radio" level="apps" long-name="Radio Apps" levels="engine ui">
-<collection name="radioengine" long-name="Radio Engine" level="engine">
-<component name="radioengineutils" filter="s60" long-name="Radio Engine Utils" introduced="^4">
-<unit bldFile="app/radio/radioengine/utils/group"/>
-</component>
-<component name="radioenginesettings" filter="s60" long-name="Radio Engine Settings" introduced="^4">
-<unit bldFile="app/radio/radioengine/settings/group"/>
-</component>
-<component name="radioengine_engine" filter="s60" long-name="Radio Engine" introduced="^4">
-<unit bldFile="app/radio/radioengine/engine/group"/>
-</component>
-</collection>
-<collection name="radioapp" long-name="Radio App" level="ui">
-<component name="radioenginewrapper" filter="s60" long-name="Radio Engine Wrapper" introduced="^4">
-<unit bldFile="app/radio/radioapp/radioenginewrapper" proFile="radioenginewrapper.pro"/>
-</component>
-<component name="radiopresetstorage" filter="s60" long-name="Radio Preset Storage" introduced="^4">
-<unit bldFile="app/radio/radioapp/radiopresetstorage" proFile="radiopresetstorage.pro"/>
-</component>
-<component name="radiouiengine" filter="s60" long-name="Radio UI Engine" introduced="^4">
-<unit bldFile="app/radio/radioapp/radiouiengine" proFile="radiouiengine.pro"/>
-</component>
-<component name="radiowidgets" filter="s60" long-name="Radio Widgets" introduced="^4">
-<unit bldFile="app/radio/radioapp/radiowidgets" proFile="radiowidgets.pro"/>
-</component>
-<component name="radioapplication" filter="s60" long-name="Radio Application" introduced="^4">
-<unit bldFile="app/radio/radioapp/radioapplication" proFile="radioapplication.pro"/>
-</component>
-<component name="radio_rom" filter="s60" long-name="Radio ROM" introduced="^4">
-<unit bldFile="app/radio/rom/group"/>
-</component>
-</collection>
-</block>
-<block name="internetradio" level="apps" long-name="Internet Radio Apps" levels="engine server ui">
-<collection name="internetradio2_0" long-name="Internet Radio 2.0" level="ui">
-<!-- collection is really a component. Move down a dir -->
-<component name="internetradio2_0_build" long-name="Internet Radio 2.0 Build">
-<unit bldFile="app/internetradio/internetradio2.0/group"/>
-</component>
-</collection>
-<collection name="presetserver" long-name="Preset Server" level="server">
-<!-- collection is really a component. Move down a dir -->
-<component name="presetserver_build" long-name="Preset Server Build">
-<unit bldFile="app/internetradio/presetserver/group"/>
-</component>
-</collection>
-<collection name="qtinternetradio" long-name="Qt Internet Radio">
-<component name="qtinternetradio_build" long-name="Qt Internet Radio Build">
-<!-- Move down a dir or break into components-->
-<unit bldFile="app/internetradio/qtinternetradio" proFile="all.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-</block>
-<block name="homescreen" level="apps" long-name="Home Screen Apps" levels="support task ss hs">
-<collection name="homescreen_info" long-name="Home Screen Info" level="support">
-<component name="homescreen_build" long-name="Homescreen Build">
-<!-- break this up properly into components -->
-<unit bldFile="app/homescreen" proFile="homescreen.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-<collection name="homescreen_test" long-name="Home Screen Test" level="support"/>
-<!-- fiill in details with broken up homescreen_build -->
-<collection name="homescreenapp" long-name="Home Screen Application" level="hs">
-<component name="hsutils" long-name="Home Screen Utils" introduced="^4"/>
-<component name="hsdomainmodel" long-name="HS Domain Model" introduced="^4"/>
-<component name="hs_runtimeplugins" long-name="HS Runtime Plugins" introduced="^4" plugin="Y"/>
-<component name="hs_serviceproviders" long-name="HS Service Providers" introduced="^4" plugin="Y"/>
-<component name="hs_stateplugins" long-name="HS State Plugins" introduced="^4" plugin="Y"/>
-<component name="hs_widgetplugins" long-name="HS Widget Plugins" introduced="^4" plugin="Y"/>
-<component name="hsapplication" long-name="Home Screen Application" introduced="^4"/>
-<component name="hshomescreenclientplugin" long-name="Home Screen Client Plugin" introduced="^4" plugin="Y"/>
-<component name="hsmenucontentpublish" long-name="HS Menu Content Publish" introduced="^4"/>
-</collection>
-<collection name="screensaverapp" long-name="Screen Saver Application" level="ss">
-<component name="snsrutils" long-name="Screen Saver Utils" introduced="^4"/>
-<component name="snsr_serviceproviders" long-name="Screen Saver Service Providers" introduced="^4" plugin="Y"/>
-<component name="snsr_stateproviders" long-name="Screen Saver State Providers" introduced="^4" plugin="Y"/>
-<component name="snsr_runtimeproviders" long-name="Screen Saver Runtime Providers" introduced="^4" plugin="Y"/>
-<component name="snsrapplication" long-name="Screen Saver Application" introduced="^4"/>
-<component name="screensaverproviders" long-name="Screen Saver Providers" introduced="^4" plugin="Y"/>
-</collection>
-<collection name="taskswitcherapp" long-name="Task Switcher Application" level="task">
-<component name="taskswitcherappecom" long-name="Task Switcher Application ECom" introduced="^4"/>
-<component name="tsserviceplugin" long-name="Task Switcher Service Plugin" introduced="^4" plugin="Y"/>
-<component name="ts_runtimeplugins" long-name="TS Runtime Plugins" introduced="^4" plugin="Y"/>
-<component name="tsapplication" long-name="Task Switcher Application" introduced="^4"/>
-</collection>
-</block>
-<block name="homescreentools" level="services" long-name="Home Screen Tools" levels="tool install">
-<collection name="dtdinstaller" long-name="DTD Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<!-- this needs to be built first, does build order need to be forced with filters? -->
-<component name="dtdinstaller_build" filter="s60,bldmefirst" long-name="DTD Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/dtdinstaller/group"/>
-</component>
-</collection>
-<collection name="themeinstaller" long-name="Theme Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="themeinstaller_build" filter="s60" long-name="Theme Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/themeinstaller/group"/>
-</component>
-</collection>
-<collection name="widgettools" long-name="Widget Tools" level="install">
-<component name="hspluginpreinstaller" filter="s60" long-name="HS Plugin Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/hspluginspreinstaller/group"/>
-</component>
-<component name="wrtwidgetpreinstaller" filter="s60" long-name="WRT Widget Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
-</component>
-</collection>
-</block>
-<block name="webuis" level="services" long-name="Web UIs" levels="plugin app">
-<collection name="browserui" long-name="Browser UI" level="app">
-<component name="browser" filter="s60" long-name="Browser">
-<unit bldFile="app/webuis/browserui/browser/group"/>
-</component>
-<component name="operatormenu" filter="s60" long-name="Browser Operator Menu">
-<unit bldFile="app/webuis/browserui/operatormenu/group"/>
-</component>
-<component name="videoservices" filter="s60" long-name="Browser Video Services">
-<unit bldFile="app/webuis/browserui/videoservices/group"/>
-</component>
-</collection>
-<collection name="browserplugins" long-name="Browser Plugins" level="plugin">
-<component name="browsersysteminfoplugin" filter="s60" long-name="Browser System Info Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsersysteminfoplugin/group"/>-->
-</component>
-<component name="browsergpsplugin" filter="s60" long-name="Browser GPS Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsergpsplugin/group"/>-->
-</component>
-<component name="browseraudiovideoplugin" filter="s60" long-name="Browser Audio Video Plugin" plugin="Y">
-<unit bldFile="app/webuis/browserplugins/browseraudiovideoplugin/group"/>
-</component>
-<component name="browserplugins_build" filter="s60" long-name="Browser Plugins Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="app/webuis/browserplugins/group"/>
-</component>
-</collection>
-<collection name="pushmtm" long-name="Push MTM" level="plugin">
-<component name="pushmtm_help" filter="s60" long-name="Push MTM Help">
-<unit bldFile="app/webuis/pushmtm/help/group"/>
-</component>
-<component name="plugins" filter="s60" long-name="Push MTM Plugins" plugin="Y">
-<unit bldFile="app/webuis/pushmtm/plugins/group"/>
-</component>
-<component name="pushmtm_build" filter="s60" long-name="Push MTM Build">
-<!-- Some content is at collection level and some is at comopnent level. Either make this a single
- component and move it down a diretcory, or make separate independent components in this collection -->
-<unit bldFile="app/webuis/pushmtm/group"/>
-</component>
-</collection>
-</block>
-<block name="jrt" level="services" long-name="Java Runtime" levels="util generic rt ui">
-<collection name="jrt_plat" long-name="JRT Platform Interfaces" level="ui">
-<component name="java_registry_api" long-name="Java Registry API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_registry_api/build"/>
-</component>
-<component name="java_env_info_api" long-name="Java Environment Info API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_env_info_api/build"/>
-</component>
-<component name="java_debug_api" long-name="Java Debug API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_debug_api/build"/>
-</component>
-</collection>
-<collection name="java_stubs" long-name="Java Stubs" level="util">
-<!-- uncomment all components when configuration is in place. Currently #included from jrt_build -->
-<component name="javadrmutils" long-name="Java DRM Utils" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtdrmutils/group"/>-->
-</component>
-<component name="javaenvinfo" long-name="Java Environment Info" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtenvinfo/group"/>-->
-</component>
-<component name="javaregistry" filter="s60,sf_build" long-name="Java Registry" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtregistry/clientserver/client/group"/>-->
-</component>
-<component name="java_stubs_build" filter="s60,sf_build" long-name="Java Stubs ROM" class="placeholder">
-<!-- Remove the #includes and rename JRT ROM-->
-<!--<unit bldFile="java_stubs/group"/>-->
-</component>
-</collection>
-<collection name="jrt_info" long-name="JRT Info" level="rt">
-<component name="jrt_build" filter="s60" long-name="JRT Build">
-<!-- needed for __JAVA_STUBS condition -->
-<unit bldFile="app/jrt/group"/>
-</component>
-</collection>
-</block>
-<block name="conntools" level="services" long-name="Connectivity Tools" levels="config app">
-<collection name="nettools" long-name="Net Tools" level="app">
-<component name="conntest" filter="s60" long-name="Connection Test" purpose="development">
-<unit bldFile="app/conntools/nettools/conntest/group"/>
-</component>
-</collection>
-<collection name="emulatorlan" long-name="Emulator LAN" level="config">
-<!-- component is actually a colleciton, should be moved down a directory -->
-<component name="emulatorlan_build" filter="s60" long-name="Emulator LAN Build" purpose="development" class="config">
-<unit bldFile="app/conntools/emulatorlan/group"/>
-</component>
-</collection>
-</block>
-<block name="rndtools" level="services" long-name="R&D tools" levels="support generic test util">
-<collection name="creator" long-name="Creator" level="support">
-<!-- collection is really a component. Should move down a directory -->
-<component name="creator_build" filter="s60" long-name="Creator Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/creator/group"/>
-</component>
-</collection>
-<collection name="filebrowser" long-name="File Browser" level="util">
-<!-- consider collapsing into a single component -->
-<component name="fileopserver" filter="s60" long-name="File Operations Server" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
-</component>
-<component name="fileopclient" filter="s60" long-name="File Operations Client" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!--<unit bldFile="filebrowser/fileopclient/group"/>-->
-</component>
-<component name="filebrowser_build" filter="s60" long-name="File Browser Application" purpose="development" class="tool">
-<!-- Need to make this a self-contained component by removing #includes. Can only do when configuration is in place-->
-<unit bldFile="app/rndtools/filebrowser/group"/>
-</component>
-</collection>
-<collection name="launcher" long-name="Launcher" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="launcher_build" filter="s60" long-name="Launcher Utility" purpose="development" class="tool">
-<unit bldFile="app/rndtools/launcher/group"/>
-</component>
-</collection>
-<collection name="loadgen" long-name="Load Generator" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="loadgen_build" filter="s60" long-name="Load Generator Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/loadgen/group"/>
-</component>
-</collection>
-<collection name="perfmon" long-name="Performance Monitor" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="perfmon_build" filter="s60" long-name="Performance Monitor Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/perfmon/group"/>
-</component>
-</collection>
-<collection name="screengrabber" long-name="Screen Grabber" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="screengrabber_build" filter="s60" long-name="ScreenGrabber" purpose="development" class="tool">
-<unit bldFile="app/rndtools/screengrabber/group"/>
-</component>
-</collection>
-<collection name="stifui" long-name="STIF UI" level="generic">
-<component name="stifui_stifui" filter="s60" long-name="STIF UI" purpose="development">
-<unit bldFile="app/rndtools/stifui/stifui/group"/>
-</component>
-<component name="uitestserverstarter" filter="s60" long-name="UI Test Server Starter" purpose="development">
-<unit bldFile="app/rndtools/stifui/uitestserverstarter/group"/>
-</component>
-<component name="stifui_build" filter="s60" long-name="STIF UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/stifui/group"/>
-</component>
-</collection>
-<collection name="memspyui" long-name="Memspy UI" level="generic">
-<!-- collection is really a component. Should move down a directory -->
-<component name="memspyui_build" filter="s60" long-name="Memspy UI Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/memspyui/group"/>
-</component>
-</collection>
-<collection name="htiui" long-name="Harmonized Test Interface UI" level="generic">
-<component name="HtiCommPlugins" filter="s60" long-name="HTI Comm Plugins" purpose="development" plugin="Y">
-<unit bldFile="app/rndtools/htiui/HtiCommPlugins/HtiBtCommPlugin/group"/>
-</component>
-<component name="HtiServicePlugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- can only have a single unit. Should #include from a common bld.inf file -->
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiFtpBackupFake/group"/>
-</component>
-<component name="htidevicereboot" filter="s60" long-name="HTI Device Reboot" purpose="development">
-<unit bldFile="app/rndtools/htiui/htidevicereboot/group"/>
-</component>
-<component name="htistartupwait" filter="s60" long-name="HTI Startup Wait" purpose="development">
-<unit bldFile="app/rndtools/htiui/htistartupwait/group"/>
-</component>
-<component name="htiadmin" filter="s60" long-name="HTI Admin" purpose="development">
-<unit bldFile="app/rndtools/htiui/htiadmin/group"/>
-</component>
-<component name="htiui_build" filter="s60" long-name="HTI UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/htiui/group"/>
-</component>
-</collection>
-</block>
-<block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools if ui">
-<collection name="csxhelp" long-name="Context Sensitive Extended Help" level="if">
-<!-- this is really a component. Should move it down a directory -->
-<component name="csxhelp_build" filter="s60" long-name="Context Sensitive Extended Help Build">
-<unit bldFile="app/helps/csxhelp/group"/>
-</component>
-</collection>
-<collection name="symhelp" long-name="Symbian Help" level="eng">
-<component name="helpmodel" long-name="Help" introduced="6.0" purpose="optional">
-<unit bldFile="app/helps/symhelp/helpmodel/group" mrp="app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
-</component>
-</collection>
-<collection name="helps_info" long-name="Help Apps Info" level="ui">
-<component name="helps_metadata" long-name="Help Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/helps/helps_info/helps_metadata/helps_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
-<collection name="buildverification" long-name="Build Verification" level="services">
-<component name="autosmoketest" long-name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
-<unit bldFile="app/techview/buildverification/autosmoketest/Group" mrp="app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
-</component>
-<component name="smoketest" long-name="Smoke Test" filter="gt" purpose="development">
-<unit bldFile="app/techview/buildverification/smoketest/Group" mrp="app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
-</component>
-</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="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"/>
-<collection name="installationapps" long-name="Installation Apps" level="apps2"/>
-<collection name="messagingapps" long-name="Messaging Apps" level="apps2"/>
-<collection name="telephonyapps" long-name="Telephony Apps" level="apps1"/>
-<collection name="networkingapps" long-name="Networking Apps" level="apps1"/>
-<collection name="networkingutils" long-name="Networking Utils" level="utils"/>
-<collection name="shortlinkapps" long-name="Shortlink Apps" level="apps1"/>
-<collection name="testapps" long-name="Test Apps" level="utils"/>
-<collection name="avapps" long-name="A/V Apps" level="apps3"/>
-<collection name="toolkit" long-name="Toolkit" level="utils"/>
-<collection name="techview_info" long-name="Techview Info" level="apps3">
-<component name="techview_metadata" long-name="Techview Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/techview/techview_info/techview_metadata/techview_metadata.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
--- a/symbian4/single/sysdefs/auto/model_20100420113209_207111115051.xml Wed May 05 12:21:47 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9240 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a package or prebuilt -->
-<!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) "N"
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile may someday be removed in favour of mrp -->
-<!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="low mw high">
-<block name="stubs" level="high" long-name="Stubs" levels="stub">
-<collection name="s60_stubs" level="stub">
-<component name="audiostubs" long-name="Audio Stubs">
-<unit bldFile="adaptation/stubs/audiostubs/group"/>
-</component>
-<component name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaptation Stub">
-<unit bldFile="adaptation/stubs/btaudioadaptation_stub/group"/>
-</component>
-<component name="drm_stubs" long-name="DRM Stubs">
-<unit bldFile="adaptation/stubs/drm_stubs/group"/>
-</component>
-<component name="ocrsrv_stub" long-name="OCR Services Stub">
-<unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
-</component>
-<component name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation">
-<unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
-</component>
-<component name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" plugin="Y">
-<unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
-</component>
-<component name="srsfenginestub" long-name="SRSF Engine Stub">
-<unit bldFile="adaptation/stubs/srsfenginestub/group"/>
-</component>
-<component name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub">
-<unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
-</component>
-<component name="systemswstubs" long-name="System Software Stubs">
-<unit bldFile="adaptation/stubs/systemswstubs/group"/>
-</component>
-<component name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" plugin="Y">
-<unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
-</component>
-<component name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub">
-<unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
-<collection name="omap3530" long-name="OMAP 3530" level="hw-if">
-<component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530" mrp="adaptation/beagleboard/omap3530/base_beagle.mrp"/>
-</component>
-<component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/kernel"/>
-</component>
-<component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/beagleboard"/>
-</component>
-</collection>
-</block>
-<block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
-<collection name="qemu_baseport" long-name="Baseport" level="hw-if">
-<component name="syborg" long-name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/qemu/baseport/syborg" mrp="adaptation/qemu/baseport/syborg/syborg.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
-<collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
-<component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
-<unit bldFile="os/kernelhwsrv/brdbootldr/ubootldr" mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
-</component>
-</collection>
-<collection name="bsptemplate" long-name="Board Support Package Template" level="hw-if">
-<component name="asspandvariant" long-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 name="kernel" long-name="Kernel Architecture" level="adaptation">
-<component name="eka" long-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 name="kerneltest" long-name="Kernel Test" level="hw-if">
-<component name="e32utils" long-name="E32 Utilities" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32utils/group" mrp="os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/>
-</component>
-<component name="e32test" long-name="E32 Tests" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32test/group" mrp="os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
-</component>
-<component name="f32test" long-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 name="ldds" long-name="Logical Device Drivers" level="adaptation">
-<component name="ethernetldd" long-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 name="audioldd" long-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>
-<component name="serialldd" long-name="Serial Port Drivers" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
-</component>
-<component name="legacydrivers" long-name="Legacy Drivers" purpose="optional">
-<unit mrp="os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
-</component>
-<component name="locmedia" long-name="Local Media Subsystem" introduced="8.1b" purpose="mandatory">
-<!-- these are LDDs for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
-</component>
-<component name="runmodedebugger" long-name="Run Mode Debugger" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/debug/group" mrp="os/kernelhwsrv/kernel/eka/drivers/debug/group/base_e32_drivers_debug.mrp"/>
-</component>
-<component name="btrace" long-name="Kernel Trace Tool" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/trace" mrp="os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
-</component>
-<component name="cameraldd" long-name="Camera Drivers" introduced="^3" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/camerasc" mrp="os/kernelhwsrv/kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
-</component>
-<component name="displayldd" long-name="Display Drivers" introduced="^3" purpose="optional">
-<!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/display" mrp="os/kernelhwsrv/kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
-</component>
-<component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
-</component>
-<component name="usbdescriptors" long-name="USB Descriptors" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors" mrp="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors/base_drivers_usbdescriptors.mrp"/>
-</component>
-<component name="usbdi_utils" long-name="USB DI Utils" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils" mrp="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils/base_drivers_usbdi_utils.mrp"/>
-</component>
-</collection>
-<collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
-<component name="mediadrivers" long-name="Media Drivers" purpose="optional">
-<!-- these are for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/media" mrp="os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
-</component>
-<component name="genericboardsupport" long-name="Generic Board Support" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
-</component>
-</collection>
-<collection name="userlibandfileserver" long-name="User Library and File Server" level="framework">
-<component name="euser" long-name="User Library" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/euser" mrp="os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
-</component>
-<component name="compsupp" long-name="Compiler Runtime Support" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/compsupp" mrp="os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
-</component>
-<component name="fileserver" long-name="File Server" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
-</component>
-<component name="estart" long-name="Base Starter" filter="gt" purpose="optional">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
-</component>
-<component name="domainmgr" long-name="Domain Manager" introduced="8.1b" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
-</component>
-</collection>
-<collection name="filesystems" long-name="File Systems" level="framework">
-<component name="romfs" long-name="ROM File System" filter="gt" purpose="optional" plugin="Y">
-<unit mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
-</component>
-<component name="rofs" long-name="ROFS" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
-</component>
-<component name="usbmsfs" long-name="USB Mass Storage File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
-</component>
-<component name="usbhostmssrv" long-name="USB Host Mass Storage Server" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage/base_f32_shostmassstorage.mrp"/>
-</component>
-<component name="fat32fs" long-name="FAT32 File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
-</component>
-<component name="fatfs" long-name="FAT File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
-</component>
-<component name="compfs" long-name="Composite File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
-</component>
-</collection>
-<collection name="halservices" long-name="HAL Services" level="framework">
-<component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
-<unit bldFile="os/kernelhwsrv/halservices/hal" mrp="os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
-</component>
-</collection>
-<collection name="textmodeshell" long-name="Text Mode Shell" level="test">
-<component name="e32wsrv" long-name="Text Window Server" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/ewsrv" mrp="os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
-</component>
-<component name="textshell" long-name="Text Shell" filter="gt" purpose="development">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
-</component>
-</collection>
-<collection name="baseapitest" long-name="Base API Tests" level="test"/>
-<collection name="kernelhwsrv_info" long-name="Kernel and Hardware Services Info" level="test">
-<component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 config">
-<collection name="emulator" long-name="Emulator" level="bsp">
-<component name="emulatorbsp" long-name="Emulator BSP" purpose="optional">
-<unit bldFile="os/boardsupport/emulator/emulatorbsp" mrp="os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
-</component>
-</collection>
-<collection name="haitest" long-name="HAI Test Suites" level="test">
-<component name="bspsvs" long-name="BSP Verification Suite" introduced="^2" purpose="development">
-<unit mrp="os/boardsupport/haitest/bspsvs/group/bspsvs.mrp"/>
-</component>
-</collection>
-<collection name="boardsupport_info" long-name="Board Support Info" level="config">
-<component name="boardsupport_metadata" long-name="Board Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/boardsupport/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
-<collection name="bldsystemtools" long-name="Build System Tools" level="bld">
-<component name="sysdeftools" long-name="System Definition Tools" purpose="development" introduced="^2">
-<unit mrp="os/buildtools/bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
-</component>
-<component name="commonbldutils" long-name="Common Utils" purpose="development">
-<unit mrp="os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
-</component>
-</collection>
-<collection name="toolsandutils" long-name="Tools and Utils" level="mw">
-<component name="productionbldtools" long-name="Production Build Tools" filter="gt" purpose="development">
-<unit mrp="os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
-</component>
-<component name="e32tools" long-name="E32 Tools" deprecated="^2" purpose="development" class="PC">
-<unit bldFile="os/buildtools/toolsandutils/e32tools/group" mrp="os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
-</component>
-<component name="autotest" long-name="Autotest" purpose="development">
-<unit bldFile="os/buildtools/toolsandutils/autotest/group" mrp="os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
-</component>
-</collection>
-<collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
-<component name="e32toolp" long-name="E32 Perl Tools" purpose="development" filter="sf_build" class="PC">
-<unit mrp="os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="os/buildtools/sbsv1_os/e32toolp/group"/>
-</component>
-</collection>
-<collection name="imgtools_os" long-name="Image Tools" level="fw">
-<component name="romkiteka2" long-name="ROMKIT EKA2" deprecated="^2" purpose="development">
-<unit bldFile="os/buildtools/imgtools_os/romkiteka2/group" mrp="os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
-</component>
-</collection>
-<collection name="misccomponents" long-name="Misc Components" level="mw">
-<component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt" purpose="development">
-<unit bldFile="os/buildtools/misccomponents/emulatorlauncher/group" mrp="os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
-</component>
-</collection>
-<collection name="buildtools_info" long-name="Build Tools Info" level="ui">
-<component name="buildtools_metadata" long-name="Build Tools Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/buildtools/buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
-<collection name="ossrv_pub" long-name="Generic OS Services Public Interfaces" level="utilities">
-<component name="boost_apis" long-name="Boost APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/boost_apis/group"/>
-</component>
-<component name="cpp_wrappers" long-name="Cpp wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cpp_wrappers/group"/>
-</component>
-<component name="character_type_apis" long-name="Character Type APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/character_type_apis/group"/>
-</component>
-<component name="compiler_specific_runtime_support" long-name="Compiler Specific Runtime Support" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/compiler_specific_runtime_support/group"/>
-</component>
-<component name="ossrv_configuration_api" long-name="Generic OS Services Configuration API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/configuration/group"/>
-</component>
-<component name="crypto_authentication_codes_and_hash_functions_api" long-name="Crypto Authentication Codes and Hash Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
-</component>
-<component name="crypto_auxillary_functions_api" long-name="Crypto Auxillary Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_auxillary_functions_api/group"/>
-</component>
-<component name="crypto_certificates_api" long-name="Crypto Certificates API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_certificates_api/group"/>
-</component>
-<component name="crypto_inputoutput_and_data_encoding_api" long-name="Crypto Input/Output and Data Encoding API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
-</component>
-<component name="crypto_public_key_cryptography_and_key_agreement_api" long-name="Crypto Public Key Cryptography and Key Agreement API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
-</component>
-<component name="crypto_symmetric_ciphers_api" long-name="Crypto Symmetric Ciphers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_symmetric_ciphers_api/group"/>
-</component>
-<component name="crypto_utility_functions_api" long-name="Crypto Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_utility_functions_api/group"/>
-</component>
-<component name="cryptogaphy_related_api" long-name="Cryptogaphy Related API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cryptogaphy_related_api/group"/>
-</component>
-<component name="ossrv_debug_api" long-name="Generic OS Services Debug API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/debug/group"/>
-</component>
-<component name="ossrv_exceptions_api" long-name="Generic OS Services Exceptions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/exceptions/group"/>
-</component>
-<component name="gboxed" long-name="GBoxed API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gboxed/group"/>
-</component>
-<component name="glib_arrays" long-name="Glib Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_arrays/group"/>
-</component>
-<component name="glib_asynchronous_queues" long-name="Glib Asynchronous Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_asynchronous_queues/group"/>
-</component>
-<component name="glib_atomic_operations" long-name="Glib Atomic Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_atomic_operations/group"/>
-</component>
-<component name="glib_automatic_string_completion" long-name="Glib Automatic String Completion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_automatic_string_completion/group"/>
-</component>
-<component name="glib_balanced_binary_trees" long-name="Glib Balanced Binary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_balanced_binary_trees/group"/>
-</component>
-<component name="glib_basic_types" long-name="Glib Basic Types API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_basic_types/group"/>
-</component>
-<component name="glib_caches" long-name="Glib Caches API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_caches/group"/>
-</component>
-<component name="glib_character_set_conversion" long-name="Glib Character Set Conversion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_character_set_conversion/group"/>
-</component>
-<component name="glib_closures" long-name="Glib Closures API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_closures/group"/>
-</component>
-<component name="glib_commandline_option_parser" long-name="Glib Command Line Option Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_commandline_option_parser/group"/>
-</component>
-<component name="glib_datasets" long-name="Glib Datasets API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_datasets/group"/>
-</component>
-<component name="glib_date_and_time_functions" long-name="Glib Date and Time Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_date_and_time_functions/group"/>
-</component>
-<component name="glib_doubleended_queues" long-name="Glib Double-ended Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doubleended_queues/group"/>
-</component>
-<component name="glib_doublylinked_lists" long-name="Glib Doubly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doublylinked_lists/group"/>
-</component>
-<component name="glib_dynamic_loading_of_modules" long-name="Glib Dynamic Loading of Modules API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_dynamic_loading_of_modules/group"/>
-</component>
-<component name="glib_enums_and_flags" long-name="Glib Enums and Flags API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_enums_and_flags/group"/>
-</component>
-<component name="glib_error_reporting" long-name="Glib Error Reporting API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_error_reporting/group"/>
-</component>
-<component name="glib_file_utilities" long-name="Glib File Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_file_utilities/group"/>
-</component>
-<component name="glib_generic_values" long-name="Glib Generic Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_generic_values/group"/>
-</component>
-<component name="glib_globstyle_pattern_matching" long-name="Glib Glob-Style Pattern Matching API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_globstyle_pattern_matching/group"/>
-</component>
-<component name="glib_hash_tables" long-name="Glib Hash Tables API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hash_tables/group"/>
-</component>
-<component name="glib_hook_functions" long-name="Glib Hook Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hook_functions/group"/>
-</component>
-<component name="glib_internationalization" long-name="Glib Internationalization API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_internationalization/group"/>
-</component>
-<component name="glib_io_channels" long-name="Glib I/O Channels API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_io_channels/group"/>
-</component>
-<component name="glib_keyvalue_file_parser" long-name="Glib Key-Value File Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_keyvalue_file_parser/group"/>
-</component>
-<component name="glib_lexical_scanner" long-name="Glib Lexical Scanner API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_lexical_scanner/group"/>
-</component>
-<component name="glib_main_event_loop" long-name="Glib Main Event Loop API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_main_event_loop/group"/>
-</component>
-<component name="glib_memory_allocation" long-name="Glib Memory Allocation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_allocation/group"/>
-</component>
-<component name="glib_memory_slices" long-name="Glib Memory Slices API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_slices/group"/>
-</component>
-<component name="glib_message_logging" long-name="Glib Message Logging API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_message_logging/group"/>
-</component>
-<component name="glib_miscellaneous_utility_functions" long-name="Glib Miscellaneous Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_miscellaneous_utility_functions/group"/>
-</component>
-<component name="glib_nary_trees" long-name="Glib N-ary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_nary_trees/group"/>
-</component>
-<component name="glib_parameters_and_values" long-name="Glib Parameters and Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_parameters_and_values/group"/>
-</component>
-<component name="glib_quarks" long-name="Glib Quarks API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_quarks/group"/>
-</component>
-<component name="glib_random_numbers" long-name="Glib Random Numbers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_random_numbers/group"/>
-</component>
-<component name="glib_relations_and_tuples" long-name="Glib Relations and Tuples API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_relations_and_tuples/group"/>
-</component>
-<component name="glib_shellrelated_utilities" long-name="Glib Shell-related Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_shellrelated_utilities/group"/>
-</component>
-<component name="glib_signals" long-name="Glib Signals API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_signals/group"/>
-</component>
-<component name="glib_simple_xml_subset_parser" long-name="Glib Simple XML Subset Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_simple_xml_subset_parser/group"/>
-</component>
-<component name="glib_singlylinked_lists" long-name="Glib Singly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_singlylinked_lists/group"/>
-</component>
-<component name="glib_spawning_processes" long-name="Glib Spawning Processes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_spawning_processes/group"/>
-</component>
-<component name="glib_standard_macros" long-name="Glib Standard Macros API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_standard_macros/group"/>
-</component>
-<component name="glib_string_utility_functions" long-name="Glib String Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_string_utility_functions/group"/>
-</component>
-<component name="glib_strings" long-name="Glib Strings API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_strings/group"/>
-</component>
-<component name="glib_thread_pools" long-name="Glib Thread Pools API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_thread_pools/group"/>
-</component>
-<component name="glib_threads" long-name="Glib Threads API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_threads/group"/>
-</component>
-<component name="glib_timers" long-name="Glib Timers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_timers/group"/>
-</component>
-<component name="glib_unicode_manipulation" long-name="Glib Unicode Manipulation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_unicode_manipulation/group"/>
-</component>
-<component name="glib_value_arrays" long-name="Glib Value Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_value_arrays/group"/>
-</component>
-<component name="glib_varargs_value_collection" long-name="Glib Varargs Value Collection API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_varargs_value_collection/group"/>
-</component>
-<component name="gobject" long-name="GObject API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gobject/group"/>
-</component>
-<component name="gparamspec" long-name="GParamSpec API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gparamspec/group"/>
-</component>
-<component name="gtype" long-name="GType API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtype/group"/>
-</component>
-<component name="gtypemodule" long-name="GTypeModule API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypemodule/group"/>
-</component>
-<component name="gtypeplugin" long-name="GTypePlugin API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypeplugin/group"/>
-</component>
-<component name="io_stream_api" long-name="I/O stream API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/io_stream_api/group"/>
-</component>
-<component name="localization_function_api" long-name="Localization Function API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/localization_function_api/group"/>
-</component>
-<component name="math_operations_api" long-name="Math Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/math_operations_api/group"/>
-</component>
-<component name="ossrv_memory_api" long-name="Generic OS Services Memory API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/memory/group"/>
-</component>
-<component name="no_namespace_headers" long-name="No Namespace Headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/no_namespace_headers/group"/>
-</component>
-<component name="openc_headers" long-name="OpenC headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_headers/group"/>
-</component>
-<component name="openc_wrappers" long-name="OpenC wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_wrappers/group"/>
-</component>
-<component name="ssl_general_api" long-name="SSL General API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_general_api/group"/>
-</component>
-<component name="ssl_protocol_methods_api" long-name="SSL Protocol Methods API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_protocol_methods_api/group"/>
-</component>
-<component name="standard_compressiondecompression_api" long-name="Standard Compression/Decompression API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/standard_compressiondecompression_api/group"/>
-</component>
-<component name="stl" long-name="STL API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/stl/group"/>
-</component>
-<component name="thread_api" long-name="Thread API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/thread_api/group"/>
-</component>
-<component name="type_attributes" long-name="Type Attributes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/type_attributes/group"/>
-</component>
-<component name="typeinfo" long-name="Type Info API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/typeinfo/group"/>
-</component>
-<component name="utility_apis" long-name="Utility APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/utility_apis/group"/>
-</component>
-<component name="wide_character_classapis" long-name="Wide character class/apis" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/wide_character_classapis/group"/>
-</component>
-<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">
-<unit bldFile="os/ossrv/ossrv_pub/dbus-glib/group"/>
-</component>
-</collection>
-<collection name="ossrv_plat" long-name="Generic OS Services Platform Interfaces" level="utilities">
-<component name="libutils_apis" long-name="Utility Library APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_plat/libutils/group"/>
-</component>
-</collection>
-<collection name="stdlibs" long-name="Standard Libraries" level="translation">
-<component name="libz" filter="s60" long-name="Z Compression Library">
-<unit bldFile="os/ossrv/stdlibs/libz/group"/>
-</component>
-<component name="libcrypt" filter="s60" long-name="Crypt Library">
-<unit bldFile="os/ossrv/stdlibs/libcrypt/group"/>
-</component>
-</collection>
-<collection name="ssl" long-name="SSL" level="data-services">
-<component name="libcrypto" filter="s60" long-name="Crypto Library">
-<unit bldFile="os/ossrv/ssl/libcrypto/group"/>
-</component>
-<component name="libssl" filter="s60" purpose="development" long-name="SSL Library">
-<unit bldFile="os/ossrv/ssl/libssl/group"/>
-</component>
-</collection>
-<collection name="glib" long-name="GLib" level="utilities">
-<component name="glibbackend" filter="s60" long-name="GLib Backend">
-<unit bldFile="os/ossrv/glib/build/symbian/glibbackend/group"/>
-<!-- Move to here: <unit bldFile="glib/glibbackend/group"/> -->
-</component>
-<component name="libglib" filter="s60" long-name="GLib Library">
-<unit bldFile="os/ossrv/glib/build/symbian/glib/group"/>
-<!-- Move to here: <unit bldFile="glib/libglib/group"/> -->
-</component>
-<component name="libgthread" filter="s60" long-name="Libg Thread">
-<unit bldFile="os/ossrv/glib/build/symbian/gthread/group"/>
-<!-- Move to here: <unit bldFile="glib/libgthread/group"/> -->
-</component>
-<component name="libgmodule" filter="s60" long-name="Libg Module">
-<unit bldFile="os/ossrv/glib/build/symbian/gmodule/group"/>
-<!-- Move to here: <unit bldFile="glib/libgmodule/group"/> -->
-</component>
-<component name="libgobject" filter="s60" long-name="Libg Object">
-<unit bldFile="os/ossrv/glib/build/symbian/gobject/group"/>
-<!-- Move to here: <unit bldFile="glib/libgobject/group"/> -->
-</component>
-</collection>
-<collection name="stdcpp" long-name="C++ Standard Library" level="translation">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="stdcpp_build" filter="s60" long-name="Stdcpp">
-<unit bldFile="os/ossrv/stdcpp/group"/>
-</component>
-</collection>
-<collection name="ofdbus" long-name="Open Foundation D-Bus" level="utilities">
-<component name="dbus" filter="s60" long-name="D-Bus">
-<unit bldFile="os/ossrv/ofdbus/dbus/group"/>
-</component>
-<component name="dbus-glib" filter="s60" long-name="D-Bus GLib">
-<unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
-</component>
-<component name="ofdbus_rom" filter="s60" long-name="D-Bus ROM">
-<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory
- Consider moving IBY file to one of the above as well and removing this component entirely -->
-<unit bldFile="os/ossrv/ofdbus/group"/>
-</component>
-</collection>
-<collection name="utilitylibraries" long-name="Utility Libraries" level="encoding">
-<component name="libutils" filter="s60" long-name="Utility Library">
-<unit bldFile="os/ossrv/utilitylibraries/libutils/group"/>
-</component>
-</collection>
-<collection name="genericservices" long-name="Generic Services" level="utilities">
-<component name="s60compatibilityheaders" long-name="S60 Compatibility Headers" filter="gt" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp" version="tb101sf"/>
-</component>
-<component name="mimerecognitionfw" long-name="MIME Recognition Framework" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/mimerecognitionfw/group" mrp="os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
-</component>
-<component name="systemagent" long-name="System Agent" introduced="9.0" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/systemagent/group" mrp="os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
-</component>
-<component name="taskscheduler" long-name="Task Scheduler" introduced="6.0" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/taskscheduler/group" mrp="os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
-</component>
-<component name="activebackupclient" long-name="Active Backup Client" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/activebackupclient/group" mrp="os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
-</component>
-<component name="syslibsdocs" long-name="Syslibs Documentation" purpose="development" class="doc">
-<unit mrp="os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
-</component>
-<component name="httputils" long-name="HTTP Utilities Library" introduced="6.2" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/httputils/group" mrp="os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
-</component>
-</collection>
-<collection name="syslibsapitest" long-name="SysLibs API Tests" level="utilities"/>
-<collection name="compressionlibs" long-name="Compression Libraries" level="data-services">
-<component name="ziplib" long-name="Zip Compression Library" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/ossrv/compressionlibs/ziplib/group" mrp="os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
-</component>
-</collection>
-<collection name="genericopenlibs" long-name="Generic Open Libraries" level="translation">
-<component name="cstdlib" long-name="C Standard Library" introduced="ER5" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/cstdlib/group" mrp="os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
-</component>
-<component name="cppstdlib" long-name="C++ Standard Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/cppstdlib/group" mrp="os/ossrv/genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
-</component>
-<component name="openenvcore" long-name="Open Environment Core" introduced="^2" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/openenvcore/group" mrp="os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
-</component>
-<component name="pluggableauthenticationmodulefw" long-name="Pluggable Authentication Module Framework" introduced="^4" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/pluggableauthenticationmodulefw/group" mrp="os/ossrv/genericopenlibs/pluggableauthenticationmodulefw/group/oeaddons_libpam.mrp"/>
-</component>
-<component name="posixrealtimeextensions" long-name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/posixrealtimeextensions/group" mrp="os/ossrv/genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
-</component>
-<component name="liboil" long-name="Liboil" introduced="^4" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/liboil/group" mrp="os/ossrv/genericopenlibs/liboil/group/oeaddons_liboil.mrp"/>
-</component>
-</collection>
-<collection name="lowlevellibsandfws" long-name="Low Level Libraries and Frameworks" level="app-libs">
-<component name="pluginfw" long-name="Plugin Framework" introduced="6.2" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp" version="3"/>
-</component>
-<component name="apputils" long-name="Application Utilities" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/apputils/group" mrp="os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
-</component>
-<component name="genericusabilitylib" long-name="Generic Usability Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/genericusabilitylib/group" mrp="os/ossrv/lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
-</component>
-</collection>
-<collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
-<component name="ossrv_build" filter="s60" long-name="Generic OS Services Build">
-<!-- exports should be moved to individual components -->
-<unit bldFile="os/ossrv/group"/>
-</component>
-<component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="featuremgmt" long-name="Feature Management" level="framework">
-<component name="featuremgr" long-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 name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/persistentdata/featuremgmt/featureregistry/group" mrp="os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
-</component>
-</collection>
-<collection name="loggingservices" long-name="Logging Services" level="server">
-<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">
-<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">
-<unit bldFile="os/persistentdata/loggingservices/rfilelogger/group" mrp="os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
-</component>
-</collection>
-<collection name="traceservices" long-name="Trace Services" level="server">
-<component name="commsdebugutility" long-name="Comms Debug Utility" introduced="7.0s" purpose="optional">
-<unit bldFile="os/persistentdata/traceservices/commsdebugutility/group" mrp="os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
-</component>
-<component name="tracefw" long-name="Trace Framework" introduced="9.2" purpose="development">
-<unit bldFile="os/persistentdata/traceservices/tracefw/ulogger/group" mrp="os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
-</component>
-</collection>
-<collection name="persistentstorage" long-name="Persistent Storage" level="framework">
-<component name="store" long-name="Store" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/store/group" mrp="os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
-</component>
-<component name="dbms" long-name="DBMS" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/dbms/group" mrp="os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
-</component>
-<component name="centralrepository" long-name="Central Repository" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/persistentdata/persistentstorage/centralrepository/group" mrp="os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
-</component>
-<component name="sql" long-name="SQL" introduced="9.3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sql/GROUP" mrp="os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
-</component>
-<component name="sqlite3api" long-name="SQLite 3 API" introduced="^3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sqlite3api/GROUP" mrp="os/persistentdata/persistentstorage/sqlite3api/GROUP/syslibs_sqlite3.mrp"/>
-</component>
-</collection>
-<collection name="persistentdata_info" long-name="Persistent Data Services Info" level="app-if">
-<component name="persistentdata_metadata" long-name="Persistent Data Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/persistentdata/persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
-<component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
-</component>
-<component name="common_platform_security_definitions_api" long-name="Common Platform Security Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group"/>
-</component>
-<component name="feature_discovery_api" long-name="Feature Discovery API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/group"/>
-</component>
-<component name="platform_environment_api" long-name="Platform Environment API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_environment_api/group"/>
-</component>
-<component name="sensor_channel_api" long-name="Sensor Channel API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_channel_api/group"/>
-</component>
-<component name="sensor_definitions_api" long-name="Sensor Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_definitions_api/group"/>
-</component>
-<component name="version_info_api" long-name="Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/group"/>
-</component>
-<component name="accessory_monitoring_api" long-name="Accessory Monitoring API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/group"/>
-</component>
-<component name="haptics_api" long-name="Haptics API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/haptics_api/group"/>
-</component>
-<component name="sensor_data_compensator_api" long-name="Sensor Data Compensator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
-</component>
-</collection>
-<collection name="devicesrv_plat" long-name="Device Services Platform Interfaces" level="app-if">
-<component name="configuration_file_parser_api" long-name="Configuration File Parser API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/configuration_file_parser_api/group"/>
-</component>
-<component name="dos_extension_plugin_api" long-name="DOS Extension Plug-In API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_plugin_api/group"/>
-</component>
-<component name="mediator_command_initiator_api" long-name="Mediator Command Initiator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_initiator_api/group"/>
-</component>
-<component name="syslangutil_api" long-name="SysLangUtil API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/syslangutil_api/group"/>
-</component>
-<component name="wakeup_alarm_api" long-name="Wakeup Alarm API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/wakeup_alarm_api/group"/>
-</component>
-<component name="disk_and_memory_level_keys_api" long-name="Disk and Memory Level Keys API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_and_memory_level_keys_api/group"/>
-</component>
-<component name="mediator_plugin_api" long-name="Mediator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_plugin_api/group"/>
-</component>
-<component name="headset_status_api" long-name="Headset Status API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/headset_status_api/group"/>
-</component>
-<component name="system_startup_extension_plugin_api" long-name="System Startup Extension Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/system_startup_extension_plugin_api/group"/>
-</component>
-<component name="sensor_plugin_api" long-name="Sensor Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_plugin_api/group"/>
-</component>
-<component name="accessory_api" long-name="Accessory API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_api/group"/>
-</component>
-<component name="display_language_definition_api" long-name="Display Language Definition API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/display_language_definition_api/group"/>
-</component>
-<component name="mediator_command_responder_api" long-name="Mediator Command Responder API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_responder_api/group"/>
-</component>
-<component name="accessory_policy_definitions_api" long-name="Accessory Policy Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_definitions_api/group"/>
-</component>
-<component name="hw_settings_api" long-name="Hardware Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/hw_settings_api/group"/>
-</component>
-<component name="mediator_domain_definitions_api" long-name="Mediator Domain Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_domain_definitions_api/group"/>
-</component>
-<component name="sensor_extension_api" long-name="Sensor Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_extension_api/group"/>
-</component>
-<component name="accessory_plugin_api" long-name="Accessory Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_plugin_api/group"/>
-</component>
-<component name="sae_api" long-name="SAE API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sae_api/group"/>
-</component>
-<component name="accessory_control_api" long-name="Accessory Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_control_api/group"/>
-</component>
-<component name="mediator_static_registration_api" long-name="Mediator Static Registration API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_static_registration_api/group"/>
-</component>
-<component name="accessory_key_event_handling_api" long-name="Accessory Key Event Handling API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_key_event_handling_api/group"/>
-</component>
-<component name="mediator_notification_api" long-name="Mediator Notification API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_notification_api/group"/>
-</component>
-<component name="accessory_policy_utility_api" long-name="Accessory Policy Utility API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_utility_api/group"/>
-</component>
-<component name="common_dsy_plugin_api" long-name="Common DSY Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/common_dsy_plugin_api/group"/>
-</component>
-<component name="remote_control_extension_api" long-name="Remote Control Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/remote_control_extension_api/group"/>
-</component>
-<component name="sensor_channel_filter_api" long-name="Sensor Channel Filter API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_channel_filter_api/group"/>
-</component>
-<component name="dos_extension_api" long-name="DOS Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_api/group"/>
-</component>
-<component name="accessory_audio_control_api" long-name="Accessory Audio Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_audio_control_api/group"/>
-</component>
-<component name="mediator_event_consumer_api" long-name="Mediator Event Consumer API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_consumer_api/group"/>
-</component>
-<component name="shared_data_api" long-name="Shared Data API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/shared_data_api/group"/>
-</component>
-<component name="accessory_settings_api" long-name="Accessory Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_settings_api/group"/>
-</component>
-<component name="accessory_bluetooth_control_api" long-name="Accessory Bluetooth Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_bluetooth_control_api/group"/>
-</component>
-<component name="extended_version_info_api" long-name="Extended Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_api/group"/>
-</component>
-<component name="mediator_event_provider_api" long-name="Mediator Event Provider API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_provider_api/group"/>
-</component>
-<component name="tv_out_config_api" long-name="TV Out Config API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_config_api/group"/>
-</component>
-<component name="tspclientmapper_api" long-name="TSP Client Mapper API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tspclientmapper_api/group"/>
-</component>
-<component name="powersave_api" long-name="Power Save API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_api/group"/>
-</component>
-<component name="powersave_definitions_api" long-name="Power Save Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_definitions_api/group"/>
-</component>
-<component name="powersave_plugin_api" long-name="Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_plugin_api/group"/>
-</component>
-<component name="extended_version_info_plugin_api" long-name="Extended Version Info Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_plugin_api/group"/>
-</component>
-<component name="haptics_plugin_api" long-name="Haptics Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_plugin_api/group"/>
-</component>
-<component name="haptics_effect_data_getter_plugin_api" long-name="Haptics Effect Data Getter Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
-</component>
-<component name="haptics_packetizer_plugin_api" long-name="Haptics Packetizer Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_packetizer_plugin_api/group"/>
-</component>
-<component name="tiltcompensation_api" long-name="Tilt Compensation API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tiltcompensation_api/group"/>
-</component>
-<component name="disk_notification_handler_api" long-name="Disk Notification Handler API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_notification_handler_api/group"/>
-</component>
-<component name="accessory_policy_usb_audio_api" long-name="Accessory Policy USB Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_usb_audio_api/group"/>
-</component>
-<component name="accessory_policy_hdmi_audio_api" long-name="Accessory Policy HDMI Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_hdmi_audio_api/group"/>
-</component>
-<component name="sensor_data_compensator_plugin_api" long-name="Sensor Data Compensator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
-</component>
-<component name="ddc_access_api" long-name="DDC Access API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/ddc_access_api/group"/>
-</component>
-<component name="tv_out_behaviour_api" long-name="TV Out Behaviour API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_behaviour_api/group"/>
-</component>
-</collection>
-<collection name="accessoryservices" long-name="Accessory Services" level="framework">
-<component name="accessorymonitor" filter="s60" long-name="Accessory Monitor">
-<unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/group"/>
-</component>
-<component name="accessoryremotecontrol" filter="s60" long-name="Accessory Remote Control">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
-</component>
-<component name="accessoryserver" filter="s60" long-name="Accessory Server">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryserver/group"/>
-</component>
-<component name="pluggeddisplay" filter="s60" long-name="Plugged Display" introduced="^3">
-<unit bldFile="os/devicesrv/accessoryservices/pluggeddisplay/group"/>
-</component>
-<component name="headsetstatusapi" filter="s60" long-name="Headset Status API">
-<unit bldFile="os/devicesrv/accessoryservices/headsetstatusapi/group"/>
-</component>
-<component name="tspclientmapper" filter="s60" long-name="TSP Client Mapper">
-<unit bldFile="os/devicesrv/accessoryservices/tspclientmapper/group"/>
-</component>
-<component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional">
-<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
-</component>
-<component name="gid_pc_tool" filter="s60" long-name="Generic ID PC Tool" class="tool PC">
-<unit bldFile="os/devicesrv/accessoryservices/gid_pc_tool/group"/>
-</component>
-</collection>
-<collection name="commonservices" long-name="Common Services" level="app-if">
-<component name="commonengine" filter="s60" long-name="Common Engine">
-<unit bldFile="os/devicesrv/commonservices/commonengine/group"/>
-</component>
-<component name="commonengineresources" filter="s60" long-name="Common Engine Resources" class="config">
-<unit bldFile="os/devicesrv/commonservices/commonengineresources/group"/>
-</component>
-<component name="platformenv" filter="s60" long-name="Platform Environment">
-<unit bldFile="os/devicesrv/commonservices/platformenv/group"/>
-</component>
-<component name="sysutil" long-name="System Utilities" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/sysutil/group" mrp="os/devicesrv/commonservices/sysutil/group/sysutil.mrp"/>
-</component>
-<component name="activitymanager" long-name="Activity Manager" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/activitymanager/group" mrp="os/devicesrv/commonservices/activitymanager/group/activitymanager.mrp"/>
-</component>
-</collection>
-<collection name="dosservices" long-name="Domestic Operating System Services" level="hw-if">
-<component name="commondsy" filter="s60" long-name="Common DSY" plugin="Y">
-<unit bldFile="os/devicesrv/dosservices/commondsy/group"/>
-</component>
-<component name="dosserver" filter="s60" long-name="Domestic OS Server">
-<unit bldFile="os/devicesrv/dosservices/dosserver/group"/>
-</component>
-</collection>
-<collection name="sensorservices" long-name="Sensor Services" level="framework">
-<component name="sensorserver" filter="s60" long-name="Sensor Server">
-<unit bldFile="os/devicesrv/sensorservices/sensorserver/group"/>
-</component>
-<component name="orientationssy" filter="s60" long-name="Orientation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/orientationssy/group"/>
-</component>
-<component name="tiltcompensationssy" filter="s60" long-name="Tilt Compensation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/tiltcompensationssy/group"/>
-</component>
-<component name="sensordatacompensator" filter="s60" long-name="Sensor Data Compensator">
-<unit bldFile="os/devicesrv/sensorservices/sensordatacompensator/group"/>
-</component>
-</collection>
-<collection name="hwrmhaptics" long-name="HWRM Haptics" level="plugin">
-<component name="hapticseffectdatagetterfw" filter="s60" long-name="Haptics Effect Data Getter Framework">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
-</component>
-<component name="hapticspluginservice" filter="s60" long-name="Haptics Plugin Service">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
-</component>
-<component name="hapticspacketizer" filter="s60" long-name="Haptics Packetizer">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
-</component>
-<component name="hapticspluginmanager" filter="s60" long-name="Haptics Plugin Manager">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
-</component>
-<component name="hapticsserver" filter="s60" long-name="Haptics Server">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsserver/group"/>
-</component>
-<component name="hapticsclient" filter="s60" long-name="Haptics Client">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsclient/group"/>
-</component>
-<component name="hwrmhaptics_build" filter="s60" long-name="HWRM Haptics Build">
-<!-- move these exports into the appropriate above components and delete this component-->
-<unit bldFile="os/devicesrv/hwrmhaptics/group"/>
-</component>
-</collection>
-<collection name="mediator" long-name="Mediator" level="app-if">
-<!--collection is really a component. Move it down a directory -->
-<component name="mediator_build" filter="s60" long-name="Mediator Build">
-<unit bldFile="os/devicesrv/mediator/group"/>
-</component>
-</collection>
-<collection name="psmservices" long-name="Power Save Mode Services" level="app-if">
-<component name="psmserver" filter="s60" long-name="PSM Server">
-<unit bldFile="os/devicesrv/psmservices/psmserver/group"/>
-</component>
-</collection>
-<collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
-<component name="hwrmfmtxwatcherplugin" filter="s60" long-name="HWRM FM Transmitter Watcher Plugin" plugin="Y">
-<unit bldFile="os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
-</component>
-<component name="hwrmtargetmodifierplugin" filter="s60" long-name="HWRM Target Modifier Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build,
- may need to -->
-<!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
-</component>
-<component name="vibractrl" filter="s60" long-name="Vibra Control" deprecated="9.1">
-<unit bldFile="os/devicesrv/resourcemgmt/vibractrl/group"/>
-</component>
-<component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="^2" purpose="optional">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
-</component>
-<component name="hwresourcesmgrconfig" long-name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
-</component>
-<component name="resourcemgmt_build" filter="s60" long-name="Resource Management Build">
-<!-- Move exports to a self-contained component.
- This needs to be kept around until configuration is in place -->
-<unit bldFile="os/devicesrv/resourcemgmt/group"/>
-</component>
-<component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
-</component>
-</collection>
-<collection name="sysstatemgmt" long-name="System State Management" level="server">
-<component name="ssmmapperutility" filter="s60" long-name="SSM Mapper Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmmapperutility/group"/>
-</component>
-<component name="ssmpolicyplugins" filter="s60" long-name="SSM Policy Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmpolicyplugins/group"/>
-</component>
-<component name="ssmutilityplugins" filter="s60" long-name="SSM Utility Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmutilityplugins/group"/>
-</component>
-<component name="ssmcmdlists" filter="s60" long-name="SSM Command Lists" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcmdlists/group"/>
-</component>
-<component name="ssmcustcmds" filter="s60" long-name="SSM Custom Commands" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcustcmds/group"/>
-</component>
-<component name="syslangutil" filter="s60" long-name="System Language Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/syslangutil/group"/>
-</component>
-<component name="sysrestart" filter="s60" long-name="System Restart" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysrestart/group"/>
-</component>
-<component name="sysuiprovider" filter="s60" long-name="System UI Provider" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysuiprovider/group"/>
-</component>
-<component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/group" mrp="os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
-</component>
-<component name="systemstatemgr" long-name="System State Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
-</component>
-<component name="systemstateplugins" long-name="System State Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
-</component>
-<component name="systemstatereferenceplugins" long-name="System State Reference Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
-</component>
-</collection>
-<collection name="resourceinterfaces" long-name="Resource Interfaces" level="hw-if">
-<component name="fmtransmittercontrol" long-name="FM Transmitter Control" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group" mrp="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
-</component>
-</collection>
-<collection name="systemhealthmanagement" long-name="System Health Management" level="server">
-<component name="systemhealthmgr" long-name="System Health Manager" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
-</component>
-</collection>
-<collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if"/>
-<collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
-<component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
-<collection name="authorisation" long-name="Authorisation" level="utilities">
-<component name="userpromptservice" long-name="User Prompt Service" introduced="^3" purpose="mandatory">
-<unit bldFile="os/security/authorisation/userpromptservice/group" mrp="os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
-</component>
-<component name="userpromptutils" long-name="User Prompt Utils" introduced="^3" purpose="optional">
-<unit bldFile="os/security/authorisation/userpromptutils/group" mrp="os/security/authorisation/userpromptutils/group/security_ups_utils.mrp"/>
-</component>
-</collection>
-<collection name="contentmgmt" long-name="Content Management" level="utilities">
-<component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
-<unit bldFile="os/security/contentmgmt/contentaccessfwfordrm/group" mrp="os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
-</component>
-<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">
-<unit bldFile="os/security/crypto/weakcryptospi/group" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
-</component>
-<component name="strongcryptospi" long-name="Strong Crypto SPI" filter="gt" introduced="^3" purpose="optional">
-<unit bldFile="os/security/crypto/weakcryptospi/strong" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
-</component>
-</collection>
-<collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
-<component name="securityutils" long-name="Security Utils" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/securityutils/group" mrp="os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
-</component>
-<component name="securitydocs" long-name="Security Documentation" purpose="development" class="doc">
-<unit mrp="os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
-</component>
-<component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
-</component>
-<component name="securitycommonutils" long-name="Security Common Utils" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/security/cryptomgmtlibs/securitycommonutils/group" mrp="os/security/cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
-</component>
-</collection>
-<collection name="securityanddataprivacytools" long-name="Security and Data Privacy Tools" level="services">
-<component name="securityconfig" long-name="Security Config" introduced="9.1" purpose="optional">
-<unit bldFile="os/security/securityanddataprivacytools/securityconfig/group" mrp="os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
-</component>
-<component name="securitytools" long-name="Security Tools" introduced="^3" purpose="optional" class="PC">
-<unit bldFile="os/security/securityanddataprivacytools/securitytools/group" mrp="os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
-</component>
-</collection>
-<collection name="cryptoplugins" long-name="Crypto Plugins" level="plugins">
-<component name="cryptospiplugins" long-name="Crypto SPI Plugins" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/security/cryptoplugins/cryptospiplugins/group" mrp="os/security/cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
-</component>
-</collection>
-<collection name="cryptoservices" long-name="Crypto Services" level="plugins">
-<component name="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/certificateandkeymgmt/group" mrp="os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
-</component>
-<component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
-</component>
-<component name="browserrootcertificates" long-name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
-<unit mrp="os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
-</component>
-<component name="rootcertificates" filter="sf_build" long-name="Root Certificates" introduced="7.0s" purpose="optional">
-<!-- not in S60 codebase -->
-<unit bldFile="os/security/cryptoservices/rootcertificates/group" mrp="os/security/cryptoservices/rootcertificates/group/rootcerts.mrp"/>
-</component>
-<component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/asnpkcs/group" mrp="os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
-</component>
-</collection>
-<collection name="security_info" long-name="OS Security Info" level="utilities">
-<component name="security_metadata" long-name="OS Security Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/security/security_info/security_metadata/security_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
-<collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
-<component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
-</component>
-<component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
-</component>
-<component name="simulationpositioningmodule" long-name="Simulation Positioning Module" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
-</component>
-<component name="gpspositioningmodule" long-name="GPS/A-GPS Positioning Module" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/gpspositioningmodule/group" mrp="os/lbs/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
-</component>
-<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>
-</collection>
-<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
-<component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
-</component>
-</collection>
-<collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
-<component name="locationserver" long-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 name="networkrequesthandler" long-name="Network Request Handler" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
-</component>
-</collection>
-<collection name="lbstest" long-name="Locating Services Tests" level="application-interface">
-<component name="locationprotocoltest" long-name="Location Protocol Tests" introduced="9.2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/lbstest/locationprotocoltest/group" mrp="os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
-</component>
-</collection>
-<collection name="locationmgmt" long-name="Location Management" level="management">
-<component name="locmonitor" long-name="Location Monitor" introduced="^3" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
-</component>
-<component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/agpslocationmgr/group" mrp="os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
-</component>
-<component name="networklocationmgr" long-name="Network Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/networklocationmgr/group" mrp="os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
-</component>
-<component name="locationcore" long-name="Location Core" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locationcore/group" mrp="os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
-</component>
-<component name="networkgateway" long-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 name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
-<component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
-</component>
-<component name="suplrrlpasn1" filter="sf_build" long-name="SUPL RRLP ASN1 Parser">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
-</component>
-</collection>
-<collection name="lbsapitest" long-name="Location API Tests" level="application-interface"/>
-<collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
-<component name="lbs_metadata" long-name="Locating Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commsfw" level="services" long-name="Communications Framework" levels="server support framework process app-if">
-<collection name="commsprocess" long-name="Comms Process" level="process">
-<component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/commsfw/commsprocess/commsrootserverconfig/group" mrp="os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
-</component>
-</collection>
-<collection name="commsconfig" long-name="Comms Config" level="process">
-<component name="commsdatabase" long-name="Comms Database" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
-</component>
-<component name="commsdatabaseshim" long-name="Comms Database Shim" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/commsfw/commsconfig/commsdatabaseshim/group" mrp="os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
-</component>
-</collection>
-<collection name="datacommsserver" long-name="Data Comms Server" level="framework">
-<component name="esockserver" long-name="ESock Server" purpose="mandatory">
-<unit bldFile="os/commsfw/datacommsserver/esockserver/group" mrp="os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp" version="3"/>
-</component>
-<component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/group" mrp="os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
-</component>
-<component name="networkingdialogstub" long-name="Networking Dialog Stub" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/default" mrp="os/commsfw/datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
-</component>
-<component name="networkcontroller" long-name="Network Controller" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/datacommsserver/networkcontroller/group" mrp="os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
-</component>
-</collection>
-<collection name="serialserver" long-name="Serial Server" level="server">
-<component name="serialportcsy" long-name="Serial Port CSY" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/serialserver/serialportcsy" mrp="os/commsfw/serialserver/serialportcsy/ser-comms_serialportcsy.mrp"/>
-</component>
-<component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" purpose="development">
-<unit bldFile="os/commsfw/serialserver/packetloopbackcsy/group" mrp="os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
-</component>
-<component name="c32serialserver" long-name="C32 Serial Server" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/commsfw/serialserver/c32serialserver/group" mrp="os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
-</component>
-<component name="c32serialserverconfig" long-name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config">
-<unit bldFile="os/commsfw/serialserver/c32serialserverconfig" mrp="os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
-</component>
-<component name="c32serialserverdocs" long-name="C32 Serial Server Documentation" purpose="development" class="doc">
-<unit mrp="os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
-</component>
-</collection>
-<collection name="commsfwutils" long-name="Comms Framework Utilities" level="framework">
-<component name="commsbufs" long-name="Comms Buffers" introduced="^3" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwutils/commsbufs/group" mrp="os/commsfw/commsfwutils/commsbufs/group/comms-infras_commsbufs.mrp"/>
-</component>
-</collection>
-<collection name="commsfw_info" long-name="Comms Framework Info" level="app-if">
-<component name="commsinfrastructuredocs" long-name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
-<unit mrp="os/commsfw/commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
-</component>
-<component name="commsfw_metadata" long-name="Communications Framework Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/commsfw/commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
-</component>
-</collection>
-<collection name="commsfwsupport" long-name="Comms Framework Support" level="support">
-<component name="commselements" long-name="Comms Elements" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwsupport/commselements/group" mrp="os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
-</component>
-</collection>
-<collection name="commsinfrastructureapitest" long-name="Comms-Infras API Tests" level="app-if">
-<component name="commsinfrastructuresvs" long-name="Comms Infrastructure Verification Suite" introduced="^3" purpose="development">
-<unit mrp="os/commsfw/commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
-</component>
-</collection>
-<collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
-<component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
-</component>
-<component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" purpose="mandatory" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
-</component>
-<component name="commstools" long-name="Comms Tools" introduced="^3" purpose="development" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/commstools/group" mrp="os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
-</component>
-</collection>
-</block>
-<block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
-<component name="internetsockets" long-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>
-<collection name="tcpiputils" long-name="TCP/IP Utilities" level="plugin">
-<component name="dnd" long-name="DND" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/dnd/group" mrp="os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
-</component>
-<component name="dhcp" long-name="DHCP" introduced="8.0" purpose="optional">
-<unit bldFile="os/networkingsrv/tcpiputils/dhcp/group" mrp="os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
-</component>
-<component name="networkaddressandporttranslation" long-name="Network Address and Port Translation" introduced="^2" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
-</component>
-<component name="punycodeconv" long-name="Punycode Converter" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/punycodeconv/group" mrp="os/networkingsrv/tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
-</component>
-</collection>
-<collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
-<component name="nullagt" long-name="NULL AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/nullagt/group" mrp="os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
-</component>
-<component name="genericscprparameters" long-name="Generic SCPR Parameters" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/linklayercontrol/genericscprparameters/group" mrp="os/networkingsrv/linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
-</component>
-<component name="mbmsparameters" long-name="MBMS Parameters" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/mbmsparameters/group" mrp="os/networkingsrv/linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
-</component>
-<component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
-<unit bldFile="os/networkingsrv/linklayercontrol/networkinterfacemgr/group" mrp="os/networkingsrv/linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp" version="2"/>
-</component>
-</collection>
-<collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
-<component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
-</component>
-<component name="pppnif" long-name="PPP NIF" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/pppnif/group" mrp="os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp" version="2"/>
-</component>
-<component name="slipnif" long-name="SLIP NIF" purpose="development" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/slipnif/group" mrp="os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
-</component>
-<component name="tunnelnif" long-name="Tunnel NIF" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
-</component>
-</collection>
-<collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
-<component name="packetlogger" long-name="Packet Logger" introduced="8.1" purpose="development">
-<unit bldFile="os/networkingsrv/linklayerutils/packetlogger/group" mrp="os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
-</component>
-</collection>
-<collection name="networkcontrol" long-name="Network Control" level="plugin">
-<component name="qoslib" long-name="QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/qoslib/group" mrp="os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
-</component>
-<component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/pfqoslib/group" mrp="os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
-</component>
-<component name="qosfwprt" long-name="QoS Framework PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
-</component>
-<component name="qosipscpr" long-name="QoS IP SCPR" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosipscpr/group" mrp="os/networkingsrv/networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
-</component>
-<component name="ipnetworklayer" long-name="IP Network Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/ipnetworklayer/group" mrp="os/networkingsrv/networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
-</component>
-<component name="iptransportlayer" long-name="IP Transport Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/iptransportlayer/group" mrp="os/networkingsrv/networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
-</component>
-<component name="commsuserpromptmgr" long-name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkcontrol/commsuserpromptmgr/group" mrp="os/networkingsrv/networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
-</component>
-</collection>
-<collection name="networkprotocols" long-name="Network Protocols" level="plugin">
-<component name="ipeventnotifier" long-name="IP Event Notifier" introduced="8.1" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
-</component>
-<component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
-</component>
-<component name="iphook" long-name="IP Hook" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
-</component>
-<component name="mobileip" long-name="Mobile IP" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/mobileip/group" mrp="os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
-</component>
-<component name="dnsproxy" long-name="DNS Proxy" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/networkprotocols/dnsproxy/group" mrp="os/networkingsrv/networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
-</component>
-</collection>
-<collection name="networksecurity" long-name="Network Security" level="framework">
-<component name="tls" long-name="TLS" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tls/group" mrp="os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
-</component>
-<component name="tlsprovider" long-name="TLS Provider" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tlsprovider/group" mrp="os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
-</component>
-<component name="ipsec" long-name="IPsec" introduced="7.0" purpose="optional">
-<unit bldFile="os/networkingsrv/networksecurity/ipsec/group" mrp="os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
-</component>
-</collection>
-<collection name="networkingtestandutils" long-name="Networking Test and Utils" level="app-if">
-<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">
-<!-- production component: contains the IBY files -->
-<unit bldFile="os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
-</component>
-<component name="networkingdocs" long-name="Networking Documentation" purpose="development" class="doc">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
-</component>
-<component name="networkingsrv_metadata" long-name="Networking Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
-<component name="predictorcompression" long-name="Predictor Compression" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wlan" level="services" long-name="WLAN" levels="hw low mid high tools test">
-<collection name="wlan_plat" long-name="WLAN Platform Interfaces" level="test">
-<component name="wlan_dbif_api" long-name="WLAN DBIF API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_dbif_api/group"/>
-</component>
-<component name="wlan_hal_api" long-name="WLAN HAL API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hal_api/group"/>
-</component>
-<component name="wlan_management_api" long-name="WLAN Management API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_management_api/group"/>
-</component>
-<component name="wlan_device_settings_api" long-name="WLAN Device Settings API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_device_settings_api/group"/>
-</component>
-<component name="wlan_control_api" long-name="WLAN Control API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_control_api/group"/>
-</component>
-<component name="wlan_hw_initialization_data_api" long-name="WLAN Hardware Initialization Data API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hw_initialization_data_api/group"/>
-</component>
-<component name="wlan_power_save_plugin_api" long-name="WLAN Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_power_save_plugin_api/group"/>
-</component>
-<component name="wlan_info_api" long-name="WLAN Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_info_api/group"/>
-</component>
-<component name="wlan_agent_hotspot_plugin_api" long-name="WLAN Agent Hotspot Plug-in API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
-</component>
-<component name="wlan_osa_api" long-name="WLAN OSA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_osa_api/group"/>
-</component>
-<component name="wlan_spia_api" long-name="WLAN SPIA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_spia_api/group"/>
-</component>
-<component name="wlan_hpa_api" long-name="WLAN HPA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hpa_api/group"/>
-</component>
-<component name="wlan_eapol_plugin_api" long-name="WLAN EAPOL Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_eapol_plugin_api/group"/>
-</component>
-<component name="wlan_generic_plugin_api" long-name="WLAN Generic Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_generic_plugin_api/group"/>
-</component>
-<component name="wlan_aws_plugin_api" long-name="WLAN AWS Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_aws_plugin_api/group"/>
-</component>
-</collection>
-<collection name="wlan_pub" long-name="WLAN Public Interfaces" level="test">
-<component name="wlan_sdk_info_api" long-name="WLAN SDK Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_pub/wlan_sdk_info_api/group"/>
-</component>
-</collection>
-<collection name="wlan_bearer" long-name="WLAN Bearer" level="hw">
-<component name="wlanpsmplugin" filter="s60" long-name="WLAN PSM Plugin" plugin="Y">
-<unit bldFile="os/wlan/wlan_bearer/wlanpsmplugin/group"/>
-</component>
-<component name="wlanagent" filter="s60" long-name="WLAN Agent">
-<unit bldFile="os/wlan/wlan_bearer/wlanagent/group"/>
-</component>
-<component name="wlandbif_cd" filter="s60" long-name="WLAN CommsDat interface">
-<unit bldFile="os/wlan/wlan_bearer/wlandbif_cd/group"/>
-</component>
-<!-- should follow component directory rules for stuff in wlan_symbian/ and put in a single component or split up properly -->
-<component name="wlanengine" filter="s60" long-name="WLAN Engine">
-<unit bldFile="os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
-</component>
-<component name="wlanldd" filter="s60" long-name="WLAN LDD">
-<unit bldFile="os/wlan/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
-</component>
-<component name="wlannwif" filter="s60" long-name="WLAN Network Interface">
-<unit bldFile="os/wlan/wlan_bearer/wlannwif/group"/>
-</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="adaptation hw-if plugin framework server app-if">
-<collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
-<component name="basebandchanneladaptor" long-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 name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
-<component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
-</component>
-</collection>
-<collection name="fax" long-name="Fax" level="server">
-<component name="faxclientandserver" long-name="Fax Client and Server" purpose="optional">
-<unit bldFile="os/cellularsrv/fax/faxclientandserver/Group" mrp="os/cellularsrv/fax/faxclientandserver/Group/telephony_fax.mrp"/>
-</component>
-</collection>
-<collection name="smsprotocols" long-name="SMS Protocols" level="framework">
-<component name="smsstack" long-name="SMS Stack" introduced="6.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/cellularsrv/smsprotocols/smsstack/group" mrp="os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
-</component>
-</collection>
-<collection name="telephonyprotocols" long-name="Telephony Protocols" level="framework">
-<component name="csdagt" long-name="CSD AGT" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/csdagt/group" mrp="os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
-</component>
-<component name="psdagt" long-name="PSD AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/psdagt/group" mrp="os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
-</component>
-<component name="gprsumtsqosprt" long-name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
-</component>
-<component name="gprsumtsqosinterface" long-name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
-</component>
-<component name="qosextnapi" long-name="QoS Extn API" introduced="9.2" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
-</component>
-<component name="secondarypdpcontextumtsdriver" long-name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
-</component>
-<component name="qos3gppcpr" long-name="QoS 3GPP CPR" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
-</component>
-<component name="pdplayer" long-name="PDP Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/pdplayer/group" mrp="os/cellularsrv/telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
-</component>
-<component name="rawipnif" long-name="Raw IP NIF" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserver" long-name="Telephony Server" level="server">
-<component name="etelserverandcore" long-name="ETel Server and Core" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
-</component>
-<component name="etelmultimode" long-name="ETel Multimode" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelmultimode/group" mrp="os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
-</component>
-<component name="etelpacketdata" long-name="ETel Packet Data" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
-</component>
-<component name="etelsimtoolkit" long-name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
-<component name="common_tsy" long-name="Common TSY" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
-</component>
-<component name="licenseetsystub" long-name="Licensee TSY Stub" introduced="^2" purpose="development" filter="sf_build" plugin="Y">
-<unit mrp="os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="os/cellularsrv/telephonyserverplugins/licenseetsystub/group"/>
-</component>
-<component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
-</component>
-<component name="simtsy" long-name="SIM TSY" introduced="7.0" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
-</component>
-<component name="ctsydispatchlayer" long-name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
-</component>
-<component name="simatktsy" long-name="SIMATK TSY" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simatktsy/group" mrp="os/cellularsrv/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
-</component>
-</collection>
-<collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
-<component name="dial" long-name="Dial" deprecated="9.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyutils/dial/group" mrp="os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
-</component>
-<component name="telephonywatchers" long-name="Telephony Watchers" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
-</component>
-<component name="etel3rdpartyapi" long-name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrv_info" long-name="Cellular Baseband Services Info" level="app-if">
-<component name="telephonyconfidentialdocs" long-name="Telephony Confidential Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
-</component>
-<component name="telephonydocs" long-name="Telephony Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
-</component>
-<component name="cellularsrv_metadata" long-name="Cellular Baseband Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
-<component name="mocksy" long-name="MockSY" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if"/>
-</block>
-<block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
-<collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
-<component name="bluetooth_audio_adaptation_api" long-name="Bluetooth Audio Adaptation API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
-</component>
-<component name="bluetooth_power_management_api" long-name="Bluetooth Power Management API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_power_management_api/group"/>
-</component>
-<component name="at_command_handler_plugin_api" long-name="AT Command Handler Plugin API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/at_command_handler_plugin_api/group"/>
-</component>
-</collection>
-<collection name="bluetooth" long-name="Bluetooth Core" level="framework">
-<component name="btstack" long-name="Bluetooth Stack" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btstack" mrp="os/bt/bluetooth/btstack/bluetooth_stack.mrp"/>
-</component>
-<component name="btcomm" long-name="Bluetooth CSY" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetooth/btcomm" mrp="os/bt/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
-</component>
-<component name="btsdp" long-name="Bluetooth SDP" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btsdp" mrp="os/bt/bluetooth/btsdp/bluetooth_sdp.mrp"/>
-</component>
-<component name="btextnotifiers" long-name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btextnotifiers" mrp="os/bt/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
-</component>
-<component name="gavdp" long-name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/gavdp/group" mrp="os/bt/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
-</component>
-<component name="btlogger" long-name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btlogger/group" mrp="os/bt/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
-</component>
-<component name="btdocs" long-name="Bluetooth Documentation" purpose="development" class="doc">
-<unit mrp="os/bt/bluetooth/btdocs/bluetooth_documentation.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothmgmt" long-name="Bluetooth Management" level="plugin">
-<component name="btmgr" long-name="Bluetooth Manager" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btmgr" mrp="os/bt/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
-</component>
-<component name="btconfig" long-name="Bluetooth Config" purpose="optional" class="config">
-<unit bldFile="os/bt/bluetoothmgmt/btconfig" mrp="os/bt/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
-</component>
-<component name="btrom" long-name="Bluetooth ROM" introduced="9.1" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btrom" mrp="os/bt/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
-</component>
-<component name="bluetoothclientlib" long-name="Bluetooth Client Library" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/bluetoothclientlib" mrp="os/bt/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothcommsprofiles" long-name="Bluetooth Comms Profiles" level="app-if">
-<component name="btpan" long-name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetoothcommsprofiles/btpan/group" mrp="os/bt/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
-</component>
-</collection>
-<collection name="bthci" long-name="Host Controller Interface" level="server">
-<component name="bthci2" long-name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bthci/bthci2/group" mrp="os/bt/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
-</component>
-<component name="hciextensioninterface" long-name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bthci/hciextensioninterface" mrp="os/bt/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
-</component>
-<component name="hci2implementations" long-name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bthci/hci2implementations/group" mrp="os/bt/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
-</component>
-</collection>
-<collection name="irda" long-name="IrDA" level="plugin">
-<component name="irdastack" long-name="IrDA Stack" purpose="optional">
-<unit bldFile="os/bt/irda/irdastack/group" mrp="os/bt/irda/irdastack/group/infra-red_irda.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if"/>
-<collection name="atext" long-name="AT Extensions" level="server">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="atext_build" long-name="AT Extension Build" introduced="^3" purpose="optional" filter="s60">
-<unit bldFile="os/bt/atext/group"/>
-</component>
-</collection>
-<collection name="bt_info" long-name="Bluetooth Info" level="app-if">
-<component name="bt_metadata" long-name="Bluetooth Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/bt/bt_info/bt_metadata/bt_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
-<collection name="usb_plat" long-name="USB Platform Interfaces" level="app-if">
-<component name="usb_audio_stream_plugin_api" long-name="USB Audio Stream Plugin API" filter="s60" class="api">
-<unit bldFile="os/usb/usb_plat/usb_audio_stream_plugin_api/group"/>
-</component>
-</collection>
-<collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
-<!-- usbclientdrivers to be moved here from kernelhwsrv-->
-</collection>
-<collection name="usbmgmt" long-name="USB Management" level="server">
-<component name="usbmgr" long-name="USB Manager" purpose="optional">
-<unit bldFile="os/usb/usbmgmt/usbmgr/group" mrp="os/usb/usbmgmt/usbmgr/group/usb_manager.mrp" version="2"/>
-</component>
-<component name="usbclassandmgrdocs" long-name="USB Class and Manager Documentation" purpose="development" class="doc">
-<unit mrp="os/usb/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
-</component>
-</collection>
-<collection name="usb_info" long-name="USB Info" level="app-if">
-<component name="usb_metadata" long-name="USB Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/usb/usb_info/usb_metadata/usb_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="mm" level="services" long-name="Multimedia" levels="adaptation 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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-</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"/>
-</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"/>
-</component>
-<component name="aac_decoder_config_proxy_api" long-name="AAC Decoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/aac_decoder_config_proxy_api/group"/>
-</component>
-<component name="added_devsound_control_api" long-name="Added DevSound Control API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_api/group"/>
-</component>
-<component name="added_devsound_control_msg_hdlr_api" long-name="Added DevSound Control Msg Hdlr API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_msg_hdlr_api/group"/>
-</component>
-<component name="added_devsound_control_proxy_api" long-name="Added DevSound Control Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_proxy_api/group"/>
-</component>
-<component name="audio_effects_msg_hdlr_api" long-name="Audio Effects Message Handler API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_msg_hdlr_api/group"/>
-</component>
-<component name="audio_effects_proxy_api" long-name="Audio Effects Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_proxy_api/group"/>
-</component>
-<component name="audio_policy_header_api" long-name="Audio Policy Header API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="audio_routing_proxy_api" long-name="Audio Routing Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_routing_proxy_api/group"/>
-</component>
-<component name="custom_interface_builder_api" long-name="Custom Interface Builder API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_builder_api/group"/>
-</component>
-<component name="custom_interface_message_handler_factory_api" long-name="Custom Interface Message Handler Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_message_handler_factory_api/group"/>
-</component>
-<component name="custom_interface_proxy_factory_api" long-name="Custom Interface Proxy Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_proxy_factory_api/group"/>
-</component>
-<component name="custom_interface_utility_api" long-name="Custom Interface Utility API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_utility_api/group"/>
-</component>
-<component name="devsound_adaptation_api" long-name="DevSound Adaptation API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/devsound_adaptation_api/group"/>
-</component>
-<component name="display_posting_api" long-name="Display Posting API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="eaac_plus_decoder_interface_proxy_api" long-name="eAAC Plus Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="error_concealment_interface_proxy_api" long-name="Error Concealment Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
-</component>
-<component name="fm_radio_adaptation_api" long-name="FM Radio Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_decoder_interface_proxy_api" long-name="G711 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_encoder_interface_proxy_api" long-name="G711 Encoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_decoder_interface_proxy_api" long-name="G729 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_encoder_interface_msg_hdlr_api" long-name="G729 Encoder Interface Message Handler API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</component>
-<component name="ilbc_decoder_interface_proxy_api" long-name="Ilbc Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ilbc_encoder_interface_proxy_api" long-name="Ilbc Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="mdf_plugin_uids" long-name="MDF Plug-in UIDs" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/mdf_plugin_uids/group"/>
-</component>
-<component name="multimedia_fourcc_definitions_api" long-name="Multimedia FourCC Definitions API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/multimedia_fourcc_definitions_api/group"/>
-</component>
-<component name="nokia_audio_policy_header_api" long-name="Nokia Audio Policy Header API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/nokia_audio_policy_header_api/group"/>
-</component>
-<component name="nokia_multimedia_fourcc_definitions_api" long-name="Nokia Multimedia Fourcc Definitions API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ra8_decoder_interface_proxy_api" long-name="RA8 Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
-</component>
-<component name="rds_adaptation_api" long-name="RDS Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="restricted_audio_output_proxy_api" long-name="Restricted Audio Output Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="sbc_encoder_interface_proxy_api" long-name="SBC Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/sbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="secure_output_mdf_custom_interface" long-name="Secure Output MDF Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="speech_encoder_config_proxy_api" long-name="Speech Encoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/speech_encoder_config_proxy_api/group"/>
-</component>
-<component name="telephony_audio_routing_client_api" long-name="Telephony Audio Routing Client API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_client_api/group"/>
-</component>
-<component name="telephony_audio_routing_manager_api" long-name="Telephony Audio Routing Manager API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_manager_api/group"/>
-</component>
-<component name="video_buffer_management_mdf_custom_interface" long-name="Video Buffer Management MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_buffer_management_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_rotation_mdf_custom_interface" long-name="Video Decoder Rotation MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_scaling_mdf_custom_interface" long-name="Video Decoder Scaling MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
-</component>
-<component name="video_reclaim_extbuffers_ci" long-name="Video Reclaim Extbuffers Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_reclaim_extbuffers_ci/group"/>
-</component>
-<component name="video_window_control_custom_interface" long-name="Video Window Control Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="wma_decoder_interface_proxy_api" long-name="WMA Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/wma_decoder_interface_proxy_api/group"/>
-</component>
-<component name="eaacplusutil_api" long-name="EAac Plus Util API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/eaacplusutil_api/group"/>
-</component>
-<component name="frametable_api" long-name="Frametable API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/frametable_api/group"/>
-</component>
-</collection>
-<collection name="devsoundextensions" long-name="Devsound Extensions" level="device-fw">
-<component name="drmaudioplayer" filter="s60" long-name="DRM Audio Player">
-<unit bldFile="os/mm/devsoundextensions/drmaudioplayer/group"/>
-</component>
-<component name="mmextfw" filter="s60" long-name="Multimedia Extension Framework">
-<unit bldFile="os/mm/devsoundextensions/mmextfw/group"/>
-</component>
-<component name="audiorouting" filter="s60" long-name="Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/audiorouting/group"/>
-</component>
-<component name="effects" filter="s60" long-name="Effects">
-<unit bldFile="os/mm/devsoundextensions/effects/group"/>
-</component>
-<component name="effectspresets" filter="s60" long-name="Effects Presets">
-<unit bldFile="os/mm/devsoundextensions/effectspresets/group"/>
-</component>
-<component name="effectspresets_utils" filter="s60" long-name="Effects Presets Utils">
-<!-- need to #include the lot from a single bld.inf
- Also move to a standard component location, not under effectspresets -->
-<unit bldFile="os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
-<unit bldFile="os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
-</component>
-<component name="telephonyaudiorouting" filter="s60" long-name="Telephony Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/group"/>
-</component>
-<component name="mmfcustominterfaces" filter="s60" long-name="MMF Custom Interfaces">
-<unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/group"/>
-</component>
-<component name="addeddevsoundcontrol" filter="s60" long-name="Added DevSound Control">
-<unit bldFile="os/mm/devsoundextensions/addeddevsoundcontrol/group"/>
-</component>
-<component name="globalaudiosettings" filter="s60" long-name="Global Audio Settings">
-<unit bldFile="os/mm/devsoundextensions/globalaudiosettings/group"/>
-</component>
-<component name="restrictedaudiooutput" filter="s60" long-name="Restricted Audio Output">
-<unit bldFile="os/mm/devsoundextensions/restrictedaudiooutput/group"/>
-</component>
-<component name="ciextnfactoryplugins" filter="s60" long-name="Custom Interface Extension Factory Plugins" plugin="Y">
-<unit bldFile="os/mm/devsoundextensions/ciextnfactoryplugins/group"/>
-</component>
-</collection>
-<collection name="mdfdevvideoextensions" long-name="MDF Dev Video Extensions" level="device-fw">
-<component name="nga_mdf_postprocessor" long-name="NGA MDF Postprocessor" filter="s60">
-<unit bldFile="os/mm/mdfdevvideoextensions/nga_mdf_postprocessor/group"/>
-</component>
-</collection>
-<collection name="audio" long-name="Audio Codecs" level="middleware">
-<component name="arm_cmmf_codecs" filter="s60" long-name="ARM CMMF Codecs" plugin="Y">
-<unit bldFile="os/mm/audio/arm_cmmf_codecs/group"/>
-</component>
-</collection>
-<collection name="video" long-name="Video Codecs" level="middleware">
-<!-- empty -->
-</collection>
-<collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
-<component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/imagingandcamerafws/imagingfws/group" mrp="os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
-</component>
-<component name="camerafw" long-name="Camera Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/imagingandcamerafws/camerafw/group" mrp="os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
-</component>
-</collection>
-<collection name="mmlibs" long-name="Multimedia Libraries" level="middleware">
-<component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmutilitylib/group" mrp="os/mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
-</component>
-<component name="mmfw" long-name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmfw/group" mrp="os/mm/mmlibs/mmfw/group/multimedia_mmf.mrp"/>
-</component>
-</collection>
-<collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
-<component name="imagingplugins" long-name="Imaging Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/imagingplugins/group" mrp="os/mm/mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
-</component>
-<component name="cameraplugins" long-name="Camera Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/cameraplugins/group" mrp="os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
-</component>
-<component name="lib3gp" long-name="3GP Library" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/mmplugins/lib3gp/group" mrp="os/mm/mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
-</component>
-<component name="mmfwplugins" long-name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/mmfwplugins/group" mrp="os/mm/mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
-</component>
-</collection>
-<collection name="mm_info" long-name="Multimedia Info" level="app-if">
-<component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc">
-<unit mrp="os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
-</component>
-<component name="mm_metadata" long-name="Multimedia Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
-<component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="^2" purpose="development">
-<unit bldFile="os/mm/mmresourcemgmt/mmresctrl/group" mrp="os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
-</component>
-</collection>
-<collection name="mmdevicefw" long-name="Multimedia Device Framework" level="device-fw">
-<component name="mdf" long-name="Media Device Framework" introduced="9.2" purpose="mandatory">
-<unit bldFile="os/mm/mmdevicefw/mdf/group" mrp="os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
-</component>
-<component name="speechrecogsupport" long-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 name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
-<component name="videorenderer" long-name="Video Renderer" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/mmswadaptation/videorenderer/group" mrp="os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
-</component>
-</collection>
-<collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw"/>
-<collection name="omxil" long-name="OpenMAX IL" level="hw-if">
-<component name="omxilapi" long-name="OpenMAX IL API" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilapi/group" mrp="os/mm/omxil/omxilapi/group/multimedia_omx_il_api.mrp" version="1"/>
-</component>
-<component name="omxilcore" long-name="OpenMAX IL Core" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcore/group" mrp="os/mm/omxil/omxilcore/group/multimedia_omx_il_core.mrp" version="1"/>
-</component>
-<component name="omxilcomponentcommon" long-name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcomponentcommon/group" mrp="os/mm/omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp" version="1"/>
-</component>
-<component name="omxilrefcomps" long-name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilrefcomps/ref_components/group" mrp="os/mm/omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp" version="1"/>
-</component>
-<component name="mmilapi" long-name="Multimedia Integration Layer API" introduced="^3" purpose="development">
-<unit bldFile="os/mm/omxil/mmilapi/group" mrp="os/mm/omxil/mmilapi/group/multimedia_il_api.mrp"/>
-</component>
-</collection>
-<collection name="devsound" long-name="Sound Device" level="devices">
-<component name="devsoundapi" long-name="DevSound API" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/devsound/devsoundapi/group" mrp="os/mm/devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
-</component>
-<component name="a3fdevsound" long-name="A3F DevSound" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3fdevsound/group" mrp="os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
-</component>
-<component name="a3facf" long-name="A3F Audio Component Framework" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3facf/group" mrp="os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
-</component>
-<component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/devsound/devsoundpluginsupport/group" mrp="os/mm/devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
-</component>
-<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">
-<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">
-<unit bldFile="os/mm/devsound/a3ftrace/group" mrp="os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
-</component>
-<component name="a3fsrvstart" long-name="A3F Server Start" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
-</component>
-</collection>
-<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
-<component name="devsoundhwdeviceapi" long-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 name="a3facl" long-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 name="a3fdevsoundcustomisation" long-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"/>
-</component>
-<component name="refacladapt" long-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"/>
-</component>
-<component name="videohai" long-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 name="dvbhreceiverhai" long-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>
-</block>
-<block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
-<collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
-<component name="exif_api" long-name="Exif API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagingext_plat" long-name="Imaging Extensions Platform Interfaces" level="app-if">
-<component name="jpeg2000_icl_plugin_api" long-name="JPEG2000 ICL plugin API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/jpeg2000_icl_plugin_api/group"/>
-</component>
-<component name="extended_icl_jpeg_api" long-name="Extended ICL Jpeg API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
-</component>
-<component name="h324_annex_k_custom_api" long-name="H324 Annex K Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/h324_annex_k_custom_api/group"/>
-</component>
-<component name="ecam_orientation_custom_api" long-name="ECam Orientation Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_orientation_custom_api/group"/>
-</component>
-<component name="ecam_ui_orientation_override_custom_api" long-name="ECam UI Orientation Override Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
-</component>
-<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>
-</collection>
-<collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
-<component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
-<unit bldFile="os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
-</component>
-<component name="imageadaptationextensions_build" filter="s60" long-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"/>
-</component>
-</collection>
-<collection name="imagingmodules" long-name="Imaging Modules" level="hw-if">
-<component name="exiflib" filter="s60" long-name="Exif Library">
-<unit bldFile="os/imagingext/imagingmodules/exiflib/group"/>
-</component>
-<component name="jp2kcodec" filter="s60" long-name="JPEG2000 Decoder Plugin" plugin="Y">
-<unit bldFile="os/imagingext/imagingmodules/jp2kcodec/group"/>
-</component>
-</collection>
-</block>
-<block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
-<component name="vgi" filter="s60" long-name="VGI">
-<unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
-</component>
-</collection>
-<collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adaptations">
-<component name="m3gcore11" filter="s60" long-name="M3G Core 1.1">
-<unit bldFile="os/graphics/m3g/m3gcore11/group"/>
-</component>
-</collection>
-<collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines">
-<component name="graphicsresource" long-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 name="graphicsresourceadaptation" long-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"/>
-</component>
-<component name="graphicsresourceimplementation" long-name="Graphics Resource Implementation" introduced="^4" purpose="optional">
-<unit bldFile="os/graphics/graphicsresourceservices/graphicsresourceimplementation/group" mrp="os/graphics/graphicsresourceservices/graphicsresourceimplementation/group/graphics_graphicsresourceimplementation.mrp"/>
-</component>
-<component name="graphicsresourceinterface" long-name="Graphics Resource Interface" introduced="^4" purpose="optional">
-<unit bldFile="os/graphics/graphicsresourceservices/graphicsresourceinterface/group" mrp="os/graphics/graphicsresourceservices/graphicsresourceinterface/group/graphics_graphicsresourceinterface.mrp"/>
-</component>
-</collection>
-<collection name="graphicsutils" long-name="Graphics Utils" level="engines">
-<component name="commongraphicsheaders" long-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 name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
-<!-- displayldd to be moved here -->
-<component name="surfacemgr" long-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 name="graphicscomposition" long-name="Graphics Composition" level="engines">
-<component name="openwfcinterface" long-name="OpenWF Composition Interface" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfcinterface/group" mrp="os/graphics/graphicscomposition/openwfcinterface/group/graphics_openwfcinterface.mrp"/>
-</component>
-<component name="openwfcompositionengine" long-name="OpenWF Composition Engine" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/graphicscomposition/openwfcompositionengine/group" mrp="os/graphics/graphicscomposition/openwfcompositionengine/group/graphics_openwfcompositionengine.mrp"/>
-</component>
-<component name="openwfsupport" long-name="OpenWF Support" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfsupport/group" mrp="os/graphics/graphicscomposition/openwfsupport/group/graphics_openwfsupport.mrp"/>
-</component>
-<component name="surfaceupdate" long-name="Surface Update" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/surfaceupdate/group" mrp="os/graphics/graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
-</component>
-</collection>
-<collection name="graphicstest" long-name="Graphics Test" level="app-if">
-<component name="uibench" long-name="UI Bench" introduced="9.2" purpose="development">
-<unit bldFile="os/graphics/graphicstest/uibench/group" mrp="os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
-</component>
-</collection>
-<collection name="graphics_plat" long-name="Graphics Platform Interfaces" level="app-if">
-<component name="m3g_core_api" filter="sf_build" long-name="M3G Core API" class="api">
-<unit bldFile="os/graphics/graphics_plat/m3g_core_api/group"/>
-</component>
-</collection>
-<collection name="graphics_info" long-name="Graphics Info" level="app-if">
-<component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc">
-<unit mrp="os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
-</component>
-<component name="graphics_metadata" long-name="Graphics Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
-</component>
-</collection>
-<collection name="windowing" long-name="Windowing" level="app-if">
-<component name="windowserver" long-name="Window Server" purpose="mandatory">
-<unit bldFile="os/graphics/windowing/windowserver/group" mrp="os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
-</component>
-<component name="windowserverplugins" long-name="Window Server Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/windowing/windowserverplugins/group" mrp="os/graphics/windowing/windowserverplugins/group/graphics_wserv_std_plugins.mrp"/>
-</component>
-</collection>
-<collection name="printingservices" long-name="Printing Services" level="app-if">
-<component name="printerdriversupport" long-name="Printer Driver Support" purpose="optional">
-<unit bldFile="os/graphics/printingservices/printerdriversupport/group" mrp="os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
-</component>
-<component name="printerdrivers" long-name="Printer Drivers" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/printingservices/printerdrivers/group" mrp="os/graphics/printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
-</component>
-</collection>
-<collection name="fbs" long-name="Font and Bitmap Server" level="device-interface">
-<component name="fontandbitmapserver" long-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 name="opengles" long-name="OpenGLES" level="internal-adaptations">
-<component name="openglesinterface" long-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 name="opengles_stub" filter="sf_build" long-name="OpenGL ES Stub" purpose="optional" introduced="^2">
-<unit bldFile="os/graphics/opengles/openglesinterface/group/opengles_stub"/>
-</component>
-</collection>
-<collection name="openvg" long-name="OpenVG" level="internal-adaptations">
-<component name="openvginterface" long-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 name="openvg11" filter="s60" long-name="OpenVG 1.1">
-<!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
-<unit bldFile="os/graphics/openvg/openvginterface/group/openvg11"/>
-</component>
-<component name="sfopenvg" filter="sf_build" long-name="Khronos OpenVG Reference Implementation" introduced="^2" purpose="optional">
-<unit bldFile="os/graphics/openvg/openvgrefimplementation/sfopenvg/group"/>
-</component>
-</collection>
-<collection name="egl" long-name="EGL" level="internal-adaptations">
-<component name="eglinterface" long-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 name="eglswitch" long-name="EGL Switch" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglswitch/group" mrp="os/graphics/egl/eglswitch/group/graphics_eglswitch.mrp"/>
-</component>
-<component name="eglrefimpl" long-name="EGL Reference Implementation" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglrefimpl/group" mrp="os/graphics/egl/eglrefimpl/group/graphics_eglrefimpl.mrp"/>
-</component>
-<component name="egltest" long-name="EGL Tests" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/egl/egltest/group" mrp="os/graphics/egl/egltest/group/graphics_egltest.mrp"/>
-</component>
-</collection>
-<collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
-<component name="gdi" long-name="GDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/gdi/group" mrp="os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
-</component>
-<component name="bitgdi" long-name="BitGDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
-</component>
-<component name="colourpalette" long-name="Colour Palette" introduced="7.0s" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
-</component>
-<component name="screendriver" long-name="Screen Driver" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/graphicsdeviceinterface/screendriver/group" mrp="os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
-</component>
-<component name="directgdi" long-name="DirectGDI" introduced="^3" deprecated="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/directgdi/group" mrp="os/graphics/graphicsdeviceinterface/directgdi/group/graphics_directgdi.mrp"/>
-</component>
-<component name="directgdiinterface" long-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 name="directgdiadaptation" long-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"/>
-</component>
-</collection>
-<collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
-<component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/gdi_tools/group" mrp="os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
-</component>
-</collection>
-<collection name="graphicsapitest" long-name="Graphics API Tests" level="app-if"/>
-</block>
-<block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
-<collection name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" level="text">
-<component name="findutil_api" long-name="Find Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/findutil_api/group"/>
-</component>
-<component name="japanese_language_utilities_api" long-name="Japanese Language Utilities API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
-</component>
-<component name="sortutil_api" long-name="Sorting Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/sortutil_api/group"/>
-</component>
-</collection>
-<collection name="textandloc_pub" long-name="Text and Localisation Public Interfaces" level="text">
-<component name="directory_localizer_api" long-name="Directory Localizer API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_pub/directory_localizer_api/group"/>
-</component>
-</collection>
-<collection name="charconvfw" long-name="Character Conversion" level="encoding">
-<component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional">
-<unit bldFile="os/textandloc/charconvfw/charconv_fw/group" mrp="os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
-</component>
-<component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/charconvplugins/group" mrp="os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
-</component>
-<component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/fatfilenameconversionplugins/group" mrp="os/textandloc/charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
-</component>
-</collection>
-<collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
-<component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/textshaperplugin/group" mrp="os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
-</component>
-<component name="fontstore" long-name="Font Store" purpose="mandatory">
-<unit bldFile="os/textandloc/fontservices/fontstore/group" mrp="os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
-</component>
-<component name="textrendering" long-name="Text Rendering" purpose="mandatory" class="placeholder">
-<!-- placeholder for text code from GDI -->
-</component>
-<component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/freetypefontrasteriser/group" mrp="os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
-</component>
-<component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional">
-<unit bldFile="os/textandloc/fontservices/referencefonts/group" mrp="os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
-</component>
-</collection>
-<collection name="textlayout" long-name="Text Layout" level="text">
-<component name="texthandling" long-name="Text Handling" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/texthandling/group" mrp="os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
-</component>
-<component name="textformatting" long-name="Text Formatting" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/textformatting/group" mrp="os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
-</component>
-</collection>
-<collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
-<!-- components in this collection need to be moved to the right collection.
- Either move into the units' directories, or create a new textandlocutils directory -->
-<component name="numbergrouping" filter="s60" long-name="Number Grouping">
-<unit bldFile="os/textandloc/charconvfw/numbergrouping/group"/>
-</component>
-<component name="jplangutil" filter="s60" long-name="Japanese Language Utilities">
-<unit bldFile="os/textandloc/charconvfw/jplangutil/group"/>
-</component>
-<component name="sortutil" filter="s60" long-name="Sorting Utility">
-<unit bldFile="os/textandloc/charconvfw/sortutil/group"/>
-</component>
-<component name="inlinetext" filter="s60" long-name="Inline Text">
-<unit bldFile="os/textandloc/charconvfw/inlinetext/group"/>
-</component>
-<component name="nearestlangutil" long-name="Nearest Language Util" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-<component name="numberformatting" long-name="Number Formatting" introduced="7.0s" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/numberformatting/group" mrp="os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
-</component>
-</collection>
-<collection name="localesupport" long-name="Locale Support" level="util">
-<component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/localisation/localesupport" mrp="os/textandloc/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
-</component>
-<component name="initlocale" long-name="Initialise Locale" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-</collection>
-<collection name="textandloctools" long-name="Text and Localisation Tools" level="tools">
-<component name="fontcompiler" long-name="Font Compiler" purpose="development" class="placeholder PC">
-<!-- placeholder for split from GDI Tools -->
-</component>
-<component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/bitmapfonttools/group" mrp="os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
-</component>
-</collection>
-<collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
-<component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
-<collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
-<component name="xmlsrv_plat_build" long-name="XML Services Platform Interface Build" filter="s60" class="api">
-<!-- need to fix the configuration used here.
- Either destribute to other components or use the new feature flags confguration mechanisms.
- Remove this component and uncomment the other units when fixed-->
-<unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
-</component>
-<component name="xml_encryption_api" long-name="XML Encryption API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/> -->
-</component>
-<component name="xml_signature_api" long-name="XML Signature API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_signature_api/group"/> -->
-</component>
-<component name="xml_security_engine_utils_api" long-name="XML Security Engine Utils API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/> -->
-</component>
-</collection>
-<collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
-<component name="xmlseccertman" filter="s60" long-name="XML Security Certificate Manager">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
-</component>
-<component name="xmlsec" filter="s60" long-name="XML Security">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsec/group"/>
-</component>
-<component name="xmlseccrypto" filter="s60" long-name="XML Security Crypto">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccrypto/group"/>
-</component>
-<component name="xmlsecwrapper" filter="s60" long-name="XML Security Wrapper">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsecwrapper/group"/>
-</component>
-</collection>
-<collection name="xml" long-name="XML" level="generic">
-<component name="xmlfw" long-name="XML Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmlfw/group" mrp="os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
-</component>
-<component name="libxml2libs" long-name="Libxml2 Libraries" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/libxml2libs/group" mrp="os/xmlsrv/xml/libxml2libs/group/syslibs_libxml2.mrp"/>
-</component>
-<component name="legacyminidomparser" long-name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/legacyminidomparser/GROUP" mrp="os/xmlsrv/xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp"/>
-</component>
-<component name="xmldomandxpath" long-name="XML DOM and XPath" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmldomandxpath/group" mrp="os/xmlsrv/xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
-</component>
-<component name="xmlexpatparser" long-name="XML Expat Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmlexpatparser/group" mrp="os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
-</component>
-<component name="xmllibxml2parser" long-name="XML Libxml2 Parser" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmllibxml2parser/group" mrp="os/xmlsrv/xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
-</component>
-<component name="wbxmlparser" long-name="WBXML Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/wbxmlparser/group" mrp="os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
-</component>
-</collection>
-<collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
-<component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="deviceplatformrelease" level="services" long-name="Device Platform Release" levels="bld mid top">
-<collection name="s60extras" long-name="S60 Extras" level="mid">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="s60extras_build" filter="s60" long-name="S60 Extras Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/S60Extras/group"/>
-</component>
-</collection>
-<collection name="locfiles" long-name="Locale Files" level="mid">
-<component name="locfiles_build" filter="s60" long-name="S60 Locale Files Build" purpose="development" class="config">
-<!-- need to move component down a directory -->
-<unit bldFile="os/deviceplatformrelease/locfiles/group"/>
-</component>
-<component name="locfiles_set1" long-name="Locale Files Set 1" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set1"/>
-</component>
-<component name="locfiles_set2" long-name="Locale Files Set 2" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set2"/>
-</component>
-<component name="locfiles_set3" long-name="Locale Files Set 3" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set3"/>
-</component>
-<component name="locfiles_set4" long-name="Locale Files Set 4" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set4"/>
-</component>
-<component name="locfiles_set5" long-name="Locale Files Set 5" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set5"/>
-</component>
-<component name="locfiles_set6" long-name="Locale Files Set 6" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set6"/>
-</component>
-<!-- is the a problem with SF builds with the following? -->
-<component name="locfiles_set7" long-name="Locale Files Set 7" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set7"/>
-</component>
-<component name="locfiles_set8" long-name="Locale Files Set 8" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set8"/>
-</component>
-<component name="locfiles_set9" long-name="Locale Files Set 9" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set9"/>
-</component>
-<component name="locfiles_set10" long-name="Locale Files Set 10" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set10"/>
-</component>
-<component name="locfiles_set11" long-name="Locale Files Set 11" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set11"/>
-</component>
-<component name="locfiles_set12" long-name="Locale Files Set 12" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set12"/>
-</component>
-<component name="locfiles_set13" long-name="Locale Files Set 13" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set13"/>
-</component>
-<component name="locfiles_set14" long-name="Locale Files Set 14" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set14"/>
-</component>
-<component name="locfiles_set15" long-name="Locale Files Set 15" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set15"/>
-</component>
-<component name="locfiles_set16" long-name="Locale Files Set 16" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set16"/>
-</component>
-</collection>
-<collection name="version" long-name="Version" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="version_build" filter="s60" long-name="Version Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/Version/group"/>
-</component>
-</collection>
-<collection name="helps_loc2" long-name="Helps Locale 2" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helps_loc2_build" long-name="Helps Locale 2 Build" filter="s60">
-<unit bldFile="os/deviceplatformrelease/helps_loc2/group"/>
-</component>
-</collection>
-<collection name="sf_config" long-name="SF Config" level="mid">
-<component name="config" filter="s60" long-name="Config" purpose="development" class="config"/>
-<component name="cenrep" filter="sf_build" long-name="ConE Central Repository Config" purpose="development" class="config">
-<!-- will shoudl give the id/path something more unique than cenrep -->
-<unit bldFile="os/deviceplatformrelease/sf_config/cenrep/group"/>
-</component>
-</collection>
-<!-- should be located locally in buildplatforms/group
- <collection id="s60bld" name="S60 Build">
- <component id="buildplatforms" filter="s60" name="Build Platforms">
- <unit bldFile="/tools/buildplatforms/group"/>
- </component>
- </collection>-->
-<collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
-<component name="cedarutils" long-name="Cedar Utils" purpose="development">
-<unit mrp="os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
-</component>
-<component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt" purpose="development" class="config">
-<unit mrp="os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
-</component>
-<component name="foundation_s60_packages" long-name="Foundation S60 Packages" introduced="^3" deprecated="^3" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/symbianosbld/foundation_s60_packages/foundation_s60_packages.mrp"/>
-</component>
-</collection>
-<collection name="foundation_system" long-name="Foundation System" level="top">
-<component name="system_model" long-name="System Model" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
-</component>
-</collection>
-<collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
-<component name="deviceplatformrelease_metadata" long-name="Device Platform Release Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="osrndtools" level="services" long-name="OS R&D tools" levels="fw trace">
-<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"/>
-</component>
-<component name="testinterface" filter="s60" long-name="Test Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/testinterface/group"/>
-</component>
-<component name="testserver" filter="s60" long-name="Test Server" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserver/group"/>
-</component>
-<component name="testengine" filter="s60" long-name="Test Engine" purpose="development">
-<unit bldFile="os/osrndtools/stif/testengine/group"/>
-</component>
-<component name="testserverstarter" filter="s60" long-name="Test Server Starter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserverstarter/group"/>
-</component>
-<component name="stiftfwif" filter="s60" long-name="STIF Test Framework Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/stiftfwif/group"/>
-</component>
-<component name="consoleui" filter="s60" long-name="Console UI" purpose="development">
-<unit bldFile="os/osrndtools/stif/consoleui/group"/>
-</component>
-<component name="testcombiner" filter="s60" long-name="Test Combiner" purpose="development">
-<unit bldFile="os/osrndtools/stif/testcombiner/group"/>
-</component>
-<component name="demomodule" filter="s60" long-name="Demo Module" purpose="development">
-<unit bldFile="os/osrndtools/stif/demomodule/group"/>
-</component>
-<component name="atslogger" filter="s60" long-name="ATS Logger" purpose="development">
-<unit bldFile="os/osrndtools/stif/atslogger/group"/>
-</component>
-<component name="atsinterface" filter="s60" long-name="ATS Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/atsinterface/group"/>
-</component>
-<component name="testscripter" filter="s60" long-name="Test Scripter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testscripter/group"/>
-</component>
-<component name="suevent" filter="s60" long-name="SU Event" purpose="development">
-<unit bldFile="os/osrndtools/stif/suevent/group"/>
-</component>
-<component name="stifkerneltestclassbase" filter="s60" long-name="STIF Kernel Test Class Base" purpose="development">
-<!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
-<!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
-</component>
-<component name="stif_build" filter="s60" long-name="STIF Build" purpose="development">
-<!-- move exports into self-contained component. Remove this when configuration is in place-->
-<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">
-<unit bldFile="os/osrndtools/memspy/memspy_plat/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/engine/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/console/group"/>
-</component>
-<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>
-</collection>
-<collection name="hti" long-name="Harmonized Test Interface" level="trace">
-<component name="hti_plat" filter="s60" long-name="HTI Platform Interfaces" purpose="development" class="api">
-<unit bldFile="os/osrndtools/hti/hti_plat/group"/>
-</component>
-<component name="hticfg" filter="s60" long-name="HTI Config" purpose="development">
-<unit bldFile="os/osrndtools/hti/hticfg/group"/>
-</component>
-<component name="htiautostart" filter="s60" long-name="HTI Autostart" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiautostart/group"/>
-</component>
-<component name="htiframework" filter="s60" long-name="HTI Framework" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiframework/group"/>
-</component>
-<component name="hticommplugins" filter="s60" long-name="HTI Communication Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
-</component>
-<component name="htiserviceplugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
-</component>
-<component name="htifilehlp" filter="s60" long-name="HTI File Help" purpose="development">
-<unit bldFile="os/osrndtools/hti/htifilehlp/group"/>
-</component>
-<component name="htiwatchdog" filter="s60" long-name="HTI Watchdog" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiwatchdog/group"/>
-</component>
-<component name="hti_build" filter="s60" long-name="HTI Build" purpose="development">
-<!-- move exports into self-contained component.-->
-<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">
-<block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
-<collection name="appsupport_pub" long-name="Generic Application Support Public Interfaces" level="specific">
-<component name="flash_viewer_framework_api" long-name="Flash Viewer Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
-</component>
-<component name="network_status_api" long-name="Network Status API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/network_status_api/group"/>
-</component>
-</collection>
-<collection name="appsupport_plat" long-name="Generic Application Support Platform Interfaces" level="specific">
-<component name="action_plugin_api" long-name="Action Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/action_plugin_api/group"/>
-</component>
-<component name="application_orientation_api" long-name="Application Orientation API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/application_orientation_api/group"/>
-</component>
-<component name="context_access_api" long-name="Context Access API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_access_api/group"/>
-</component>
-<component name="context_framework_services_api" long-name="Context Framework Services API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_services_api/group"/>
-</component>
-<component name="context_framework_client_api" long-name="Context Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_client_api/group"/>
-</component>
-<component name="context_framework_listener_api" long-name="Context Framework Listener API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_listener_api/group"/>
-</component>
-<component name="context_framework_version_api" long-name="Context Framework Version API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_version_api/group"/>
-</component>
-<component name="context_source_plugin_api" long-name="Context Source Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_plugin_api/group"/>
-</component>
-<component name="context_source_settings_manager_api" long-name="Context Source Settings Manager API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_settings_manager_api/group"/>
-</component>
-<component name="context_subscription_api" long-name="Context Subscription API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_subscription_api/group"/>
-</component>
-<component name="key_event_framework_api" long-name="Key Event Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_api/group"/>
-</component>
-<component name="key_event_framework_mapper_api" long-name="Key Event Framework Mapper API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_mapper_api/group"/>
-</component>
-<component name="media_keys_definition_api" long-name="Media Keys Definition API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/media_keys_definition_api/group"/>
-</component>
-<component name="ood_threshold_api" long-name="OOD Threshold API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/ood_threshold_api/group"/>
-</component>
-<component name="oom_monitor_api" long-name="OOM Monitor API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_api/group"/>
-</component>
-<component name="oom_monitor_plugin_api" long-name="OOM Monitor Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_plugin_api/group"/>
-</component>
-<component name="operation_provider_api" long-name="Operation Provider API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/operation_provider_api/group"/>
-</component>
-<component name="phonecmdhandler_api" long-name="Phone Command Handler API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/phonecmdhandler_api/group"/>
-</component>
-<component name="restore_factory_settings_api" long-name="Restore Factory Settings API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_api/group"/>
-</component>
-<component name="restore_factory_settings_plugin_api" long-name="Restore Factory Settings Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_plugin_api/group"/>
-</component>
-<component name="secondary_display_accfw_api" long-name="Secondary Display Accessory Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_accfw_api/group"/>
-</component>
-<component name="secondary_display_startup_api" long-name="Secondary Display Startup API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_startup_api/group"/>
-</component>
-<component name="secondary_display_sysap_api" long-name="Secondary Display System Application API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_sysap_api/group"/>
-</component>
-<component name="secondary_display_system_state_api" long-name="Secondary Display System State API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_system_state_api/group"/>
-</component>
-<component name="sensor_user_setting_api" long-name="Sensor User Setting API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/sensor_user_setting_api/group"/>
-</component>
-<component name="startup_configuration_api" long-name="Startup Configuration API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/startup_configuration_api/group"/>
-</component>
-<component name="system_application_key_handler_plugin_api" long-name="System Application Key Handler Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_key_handler_plugin_api/group"/>
-</component>
-<component name="system_application_light_control_plugin_api" long-name="System Application Light Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_light_control_plugin_api/group"/>
-</component>
-<component name="system_application_notification_api" long-name="System Application Notification API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_notification_api/group"/>
-</component>
-<component name="system_application_plugin_callback_api" long-name="System Application Plug-in Callback API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
-</component>
-<component name="flash_mmi_service_interface_custom_api" long-name="Flash MMI Service Interface Custom API" filter="s60,!sf_build" introduced="^2" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/flash_mmi_service_interface_custom_api/group"/>
-</component>
-<component name="flash_netscape_plugin_command_api" long-name="Flash Netscape Plugin Command API" filter="s60,!sf_build" introduced="^2" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/flash_netscape_plugin_command_api/group"/>
-</component>
-</collection>
-<collection name="contextframework" long-name="Context Framework" level="framework">
-<!-- the units that are commented out need to be put back when configuration is in place.
- They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
-<component name="cfw" filter="s60" long-name="Context Framework">
-<!--<unit bldFile="contextframework/cfw/group"/> -->
-</component>
-<component name="cfwplugins" filter="s60" long-name="Context Framework Plugins" plugin="Y">
-<!--<unit bldFile="contextframework/cfwplugins/group"/>-->
-</component>
-<component name="contextframework_build" filter="s60" long-name="Context Framework Build">
-<unit bldFile="mw/appsupport/contextframework/group"/>
-</component>
-</collection>
-<collection name="coreapplicationuis" long-name="Core Application UIs" level="server">
-<component name="dbrecovery" filter="s60" long-name="Database Recovery">
-<unit bldFile="mw/appsupport/coreapplicationuis/dbrecovery/group"/>
-</component>
-<component name="nspswsplugin" filter="s60" long-name="NSPS WS Plugin" plugin="Y">
-<!-- No Service Power Save? Window Server? Please elaborate-->
-<unit bldFile="mw/appsupport/coreapplicationuis/nspswsplugin/group"/>
-</component>
-<component name="rfs" filter="s60" long-name="Restore Factory Settings">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfs/group"/>
-</component>
-<component name="rfsplugins" filter="s60" long-name="Restore Factory Settings Plugins" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/group"/>
-</component>
-<component name="sysap" filter="s60" long-name="System Application">
-<unit bldFile="mw/appsupport/coreapplicationuis/sysap/group"/>
-</component>
-<component name="variatedsettings" filter="s60" long-name="Variated Settings" class="config">
-<unit bldFile="mw/appsupport/coreapplicationuis/variatedsettings/group"/>
-</component>
-<component name="accfwuinotifier" filter="s60" long-name="Accessory Framework UI Notifier" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/accfwuinotifier/group"/>
-</component>
-<component name="kefmapper" filter="s60" long-name="Key Event Framework">
-<unit bldFile="mw/appsupport/coreapplicationuis/kefmapper/group"/>
-</component>
-<component name="advancedtspcontroller" filter="s60" long-name="Advanced TSP Controller">
-<unit bldFile="mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
-</component>
-<component name="powersaveutilities" filter="s60" long-name="Power Save Utilities">
-<unit bldFile="mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
-</component>
-<component name="gsserverenginestub" filter="s60" long-name="GS Server Engine Stub">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
-</component>
-<component name="gsserverengine" filter="s60" long-name="GS Server Engine">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverengine/group"/>
-</component>
-<component name="sensordatacompensatorplugin" filter="s60" long-name="Sensor Data Compensator Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/group"/>
-</component>
-<component name="atcmdplugin" long-name="AT Command Plugin" filter="s60,!oem_build" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/atcmdplugin/group"/>
-</component>
-</collection>
-<collection name="flashliteapi_3_1" long-name="Flash Lite API 3.1" level="specific">
-<!-- collection is really a component. Move down a directory -->
-<component name="flashliteapi_3_1_build" long-name="Flash Lite API Build" filter="s60" introduced="^2"/>
-</collection>
-<collection name="mediakeys" long-name="Media Keys" level="plugin">
-<!-- collection is really a component. Move down a directory -->
-<component name="mediakeys_build" filter="s60" long-name="Media Keys Build">
-<unit bldFile="mw/appsupport/mediakeys/group"/>
-</component>
-</collection>
-<collection name="startupservices" long-name="Startup Services" level="system">
-<component name="splashscreen" filter="s60" long-name="Splash Screen">
-<unit bldFile="mw/appsupport/startupservices/splashscreen/group"/>
-</component>
-<component name="startupanimation" filter="s60" long-name="Startup Animation">
-<unit bldFile="mw/appsupport/startupservices/startupanimation/group"/>
-</component>
-<component name="startup" long-name="Startup Application" filter="s60">
-<unit bldFile="mw/appsupport/startupservices/startup/group"/>
-</component>
-</collection>
-<collection name="sysresmonitoring" long-name="System Resource Monitoring" level="system">
-<component name="oodmonitor" filter="s60" long-name="OOD Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oodmonitor/group"/>
-</component>
-<component name="oommonitor" filter="s60" long-name="OOM Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oommonitor/group"/>
-</component>
-</collection>
-<collection name="systemsettings" long-name="System Settings" level="system">
-<component name="gssensorplugin" filter="s60" long-name="GS Sensor Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gssensorplugin/group"/>
-</component>
-<component name="gsaccessoryplugin" filter="s60" long-name="GS Accessory Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gsaccessoryplugin/group"/>
-</component>
-</collection>
-<collection name="filehandling" long-name="File Handling" level="server">
-<component name="fileconverterfw" long-name="File Converter Framework" purpose="optional">
-<unit bldFile="mw/appsupport/filehandling/fileconverterfw/group" mrp="mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
-</component>
-<component name="htmltorichtextconverter" long-name="HTML to RichText Converter" introduced="7.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/htmltorichtextconverter/group" mrp="mw/appsupport/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
-</component>
-<component name="richtexttohtmlconverter" long-name="RichText to HTML Converter" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
-</component>
-</collection>
-<collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
-<component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
-</component>
-</collection>
-<collection name="commonappservices" long-name="Common Application Services" level="framework">
-<component name="alarmserver" long-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"/>
-</component>
-<component name="alarmservertest" long-name="Alarm Server Test" deprecated="^3" introduced="8.1" purpose="development">
-<unit bldFile="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
-</component>
-<component name="appservicesdocs" long-name="Application Services Documentation" purpose="development" class="doc">
-<unit mrp="mw/appsupport/commonappservices/appservicesdocs/app-services_documentation.mrp"/>
-</component>
-<component name="backuprestorenotification" long-name="Backup Restore Notification" introduced="8.1" purpose="optional">
-<unit bldFile="mw/appsupport/commonappservices/backuprestorenotification/group" mrp="mw/appsupport/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
-</component>
-</collection>
-<collection name="tzservices" long-name="Time Zone Services" level="plugin">
-<component name="tzserver" long-name="Time Zone Server" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzserver/group" mrp="mw/appsupport/tzservices/tzserver/group/app-services_tz.mrp"/>
-</component>
-<component name="tzloc" long-name="Time Zone Localization" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzloc/group" mrp="mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
-</component>
-<component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzlocrscfactory/group" mrp="mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
-</component>
-<component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzdatabase/group" mrp="mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
-</component>
-</collection>
-<collection name="contenthandling" long-name="Content Handling" level="plugin">
-<component name="webrecognisers" long-name="Web Recognisers" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/contenthandling/webrecognisers/group" mrp="mw/appsupport/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
-</component>
-</collection>
-<collection name="openenvutils" long-name="Open Environment Utilities" level="specific">
-<component name="commandshell" long-name="Command Shell" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/commandshell/group" mrp="mw/appsupport/openenvutils/commandshell/group/oetools_zsh.mrp"/>
-</component>
-<component name="telnetserver" long-name="Telnet Server" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/telnetserver/group" mrp="mw/appsupport/openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
-</component>
-</collection>
-<collection name="printingsupport" long-name="Printing Support" level="generic">
-<component name="printinguisupport" long-name="Printing UI Support" purpose="optional" introduced="^2" deprecated="^3">
-<unit bldFile="mw/appsupport/printingsupport/printinguisupport/group" mrp="mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
-</component>
-</collection>
-<collection name="appfw" long-name="Application Framework" level="framework">
-<component name="apparchitecture" long-name="Application Architecture" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/apparchitecture/group" mrp="mw/appsupport/appfw/apparchitecture/group/app-framework_apparc.mrp"/>
-</component>
-<component name="viewserver" long-name="View Server" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/viewserver/group" mrp="mw/appsupport/appfw/viewserver/group/app-framework_viewsrv.mrp"/>
-</component>
-</collection>
-<collection name="applaunchservices" long-name="Application Launch Services" level="generic">
-<component name="aftermarketappstarter" long-name="After Market Application Starter" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/aftermarketappstarter/group" mrp="mw/appsupport/applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
-</component>
-<component name="applaunchplugins" long-name="Application Launch Plugins" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/applaunchplugins/group" mrp="mw/appsupport/applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
-</component>
-</collection>
-<collection name="tzpcside" long-name="Time Zone PC Side" level="plugin">
-<component name="tzcompiler" long-name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config PC">
-<unit bldFile="mw/appsupport/tzpcside/tzcompiler/group" mrp="mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
-</component>
-</collection>
-<collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
-<component name="appsupport_metadata" long-name="Generic Application Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="securitysrv" level="generic" long-name="Security Services" levels="plugin framework server generic specific">
-<collection name="secsrv_plat" long-name="Security Services Platform Interfaces" level="specific">
-<component name="cms_api" long-name="CMS API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/cms_api/group"/>
-</component>
-<component name="pkcs12_parser_api" long-name="PKCS12 Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkcs12_parser_api/group"/>
-</component>
-<component name="java_utils_api" long-name="Java Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/java_utils_api/group"/>
-</component>
-<component name="wim_cert_api" long-name="WIM Cert API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/wim_cert_api/group"/>
-</component>
-<component name="device_key_store_encryption_plugin_api" long-name="Device Key Store Encryption Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/device_key_store_encryption_plugin_api/group"/>
-</component>
-<component name="x509certnameparser_api" long-name="X.509 Certificate Name Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
-</component>
-<component name="remote_lock_api" long-name="Remote Lock API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
-</component>
-<component name="pkidialog_api" long-name="PKI Dialog API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
-</component>
-<component name="provisioning_api" long-name="Provisioning API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/provisioning_api/group"/>
-</component>
-<component name="keyguard_configuration_api" long-name="Keyguard Configuration API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_configuration_api/group"/>
-</component>
-<component name="keylock_policy_api" long-name="Keylock Policy API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keylock_policy_api/group"/>
-</component>
-<component name="security_code_ui_api" long-name="Security Code UI API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
-</component>
-<component name="gba_api" long-name="GBA API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/gba_api/group"/>
-</component>
-<component name="keyguard_access_api" long-name="Keyguard Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_access_api/group"/>
-</component>
-<component name="devicelock_access_api" long-name="Device Lock Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devicelock_access_api/group"/>
-</component>
-<component name="lockapp_server_api" long-name="Lock Application Server API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
-</component>
-<component name="devencadaptation_api" long-name="Device Encryption Adaptation API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
-</component>
-<component name="devenccommonutils_api" long-name="Device Encryption Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
-</component>
-</collection>
-<collection name="cms" long-name="Certificate Management Service" level="server">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="cms_build" filter="s60" long-name="CMS" introduced="^3">
-<unit bldFile="mw/securitysrv/cms/group"/>
-</component>
-</collection>
-<collection name="pkiutilities" long-name="PKI Utilities" level="plugin">
-<component name="x509certnameparser" filter="s60" long-name="X.509 Certificate Name Parser">
-<unit bldFile="mw/securitysrv/pkiutilities/x509certnameparser/group"/>
-</component>
-<component name="pkcs12" filter="s60" long-name="PKCS #12">
-<unit bldFile="mw/securitysrv/pkiutilities/pkcs12/group"/>
-</component>
-<component name="certmanui" filter="s60" long-name="Certificate Management UI">
-<unit bldFile="mw/securitysrv/pkiutilities/certmanui/group"/>
-</component>
-<component name="ctsecuritydialogs" filter="s60" long-name="Crypto Token Security Dialogs">
-<unit bldFile="mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
-</component>
-<component name="certsaver" filter="s60" long-name="Certificate Saver">
-<unit bldFile="mw/securitysrv/pkiutilities/certsaver/group"/>
-</component>
-<component name="secmodui" filter="s60" long-name="Security Module UI">
-<unit bldFile="mw/securitysrv/pkiutilities/secmodui/group"/>
-</component>
-<component name="devicetoken" filter="s60" long-name="Device Token">
-<unit bldFile="mw/securitysrv/pkiutilities/devicetoken/group"/>
-</component>
-<component name="certificates" filter="s60" long-name="Certificates">
-<unit bldFile="mw/securitysrv/pkiutilities/Certificates/group" filter="sf_build"/>
-</component>
-<component name="pkiutilities_build" filter="s60" long-name="PKI Utilities Build">
-<!-- need to split this into the above components -->
-<unit bldFile="mw/securitysrv/pkiutilities/group"/>
-</component>
-<component name="ocsp" long-name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
-<unit bldFile="mw/securitysrv/pkiutilities/ocsp/group" mrp="mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
-</component>
-</collection>
-<collection name="wim" long-name="Wireless Identity Module " level="framework">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="wim_build" filter="s60" long-name="WIM Build">
-<unit bldFile="mw/securitysrv/wim/group"/>
-</component>
-</collection>
-<collection name="remotelock" long-name="Remote Lock" level="generic">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="remotelock_build" filter="s60" long-name="Remote Lock Build">
-<unit bldFile="mw/securitysrv/remotelock/group"/>
-</component>
-</collection>
-<collection name="securitydialogs" long-name="Security Dialogs" level="specific">
-<component name="keylockpolicyapi" filter="s60" long-name="Keylock Policy API">
-<unit bldFile="mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
-</component>
-<component name="autolock" long-name="Autolock" filter="s60">
-<unit bldFile="mw/securitysrv/securitydialogs/autolock/group"/>
-</component>
-<component name="secui" filter="s60" long-name="Security UI">
-<unit bldFile="mw/securitysrv/securitydialogs/secui/group"/>
-</component>
-<component name="securitynotifier" filter="s60" long-name="Security Notifier">
-<unit bldFile="mw/securitysrv/securitydialogs/securitynotifier/group"/>
-</component>
-<component name="lockclient" filter="s60" long-name="Lock Client" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockclient/group"/>
-</component>
-<component name="lockapp" filter="s60" long-name="Lock Application" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockapp/group"/>
-</component>
-<component name="secuinotifications" long-name="Security UI Notifications" introduced="^4" filter="s60">
-<unit bldFile="mw/securitysrv/securitydialogs/secuinotifications" proFile="secuinotifications.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="boottimeintegritycheck_build" filter="s60" long-name="Boot Time Integrity Check Build">
-<unit bldFile="mw/securitysrv/boottimeintegritycheck/group"/>
-</component>
-</collection>
-<collection name="gba" long-name="Generic Bootstrapping Architecture" level="server">
-<component name="uicc" filter="s60" long-name="UICC" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/uicc/group"/>
-</component>
-<component name="gbaserver" filter="s60" long-name="GBA Server" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaserver/group"/>
-</component>
-<component name="gbaapi" filter="s60" long-name="GBA API" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaapi/group"/>
-</component>
-<component name="gbafilter" filter="s60" long-name="GBA HTTP Filter" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/gbafilter/group"/>
-</component>
-<component name="gba_build" filter="s60" long-name="Generic Boot Architecture Build" introduced="^2">
-<!-- need to split this into the above components, or remove #includes and make this GBA ROM -->
-<unit bldFile="mw/securitysrv/gba/group"/>
-</component>
-</collection>
-<collection name="devencdiskutils" long-name="Device Encryption Disk Utils" level="server">
-<component name="devenccommonutils" filter="s60" long-name="Device Encryption Common Utils" introduced="^3">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncCommonUtils/group"/>
-</component>
-<component name="devencrfsplugin" filter="s60" long-name="Device Encryption RFS Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncRfsPlugin/group"/>
-</component>
-<component name="pk5recognizer" filter="s60" long-name="Device Encryption Pk5 Recognizer" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/Pk5Recognizer/group"/>
-</component>
-<component name="devencstarter" filter="s60" long-name="Device Encryption Starter" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncStarter/group"/>
-</component>
-<component name="devencdiskutils" filter="s60" long-name="Device Encryption Disk Utils Build" introduced="^3">
-<!-- need to split this into the above components, or remove #includes and make this a ROM component-->
-<unit bldFile="mw/securitysrv/devencdiskutils/group"/>
-</component>
-</collection>
-<collection name="securitysrv_info" long-name="Security Services Info" level="specific">
-<component name="securitysrv_metadata" long-name="Security Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="drm" level="generic" long-name="DRM" levels="plugin framework server generic specific">
-<collection name="drm_plat" long-name="DRM Platform Interfaces" level="specific">
-<component name="roap_api" long-name="ROAP API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/roap_api/group"/>
-</component>
-<component name="drm_common_api" long-name="DRM Common API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_common_api/group"/>
-</component>
-<component name="drm_rights_api" long-name="DRM Rights API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_rights_api/group"/>
-</component>
-<component name="drm_legacy_api" long-name="DRM Legacy API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_legacy_api/group"/>
-</component>
-<component name="dcf_repository_api" long-name="DCF Repository API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/dcf_repository_api/group"/>
-</component>
-<component name="drm_service_api" long-name="DRM Service API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_service_api/group"/>
-</component>
-<component name="drm_secondary_display_api" long-name="DRM Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_secondary_display_api/group"/>
-</component>
-<component name="drm_license_manager_api" long-name="DRM License Manager API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_license_manager_api/group"/>
-</component>
-<component name="drm_utility_api" long-name="DRM Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_utility_api/group"/>
-</component>
-<component name="drm_agents_api" long-name="DRM Agents API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_agents_api/group"/>
-</component>
-<component name="wmdrm_core_api" long-name="WM DRM Core API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_core_api/group"/>
-</component>
-<component name="wmdrm_access_api" long-name="WMDRM Access API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_access_api/group"/>
-</component>
-<component name="camese_utility_api" long-name="Camese Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_utility_api/group"/>
-</component>
-<component name="camese_framework_api" long-name="Camese Framework API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_framework_api/group"/>
-</component>
-</collection>
-<collection name="drm_pub" long-name="DRM Public Interfaces" level="specific">
-<component name="drm_helper_api" long-name="DRM Helper API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_helper_api/group"/>
-</component>
-<component name="oma_drm_caf_agent_api" long-name="OMA DRM CAF Agent API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/group"/>
-</component>
-<component name="drm_license_checker_api" long-name="DRM License Checker API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_license_checker_api/group"/>
-</component>
-</collection>
-<collection name="commondrm" long-name="Common DRM" level="generic">
-<!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
-<component name="drmencryptor" filter="s60" long-name="DRM Encryptor" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmsettingsplugin" filter="s60" long-name="DRM Settings Plugin" plugin="Y" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmrightsmanagerui" filter="s60" long-name="DRM Rights Manager UI">
-<unit bldFile="mw/drm/commondrm/drmrightsmanagerui/help/group"/>
-</component>
-<component name="drmutility" filter="s60" long-name="DRM Utility">
-<!-- Uncomment unit when configuration is in place. Currently #included from commondrm_build -->
-<!--<unit bldFile="commondrm/drmutility/group"/>-->
-</component>
-<component name="drmserviceapiwrapper" filter="s60" long-name="DRM Service API Wrapper">
-<unit bldFile="mw/drm/commondrm/drmserviceapiwrapper/group"/>
-</component>
-<component name="drmrightsstoringlocation" filter="s60" long-name="DRM Rights Storing Location">
-<unit bldFile="mw/drm/commondrm/drmrightsstoringlocation/group"/>
-</component>
-<component name="commondrm_build" filter="s60" long-name="Common DRM Build">
-<!-- should be split into the above files, or them collapsed into a single component -->
-<unit bldFile="mw/drm/commondrm/group"/>
-</component>
-</collection>
-<collection name="omadrm" long-name="OMA DRM" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="omadrm_build" filter="s60" long-name="OMA DRM Build">
-<unit bldFile="mw/drm/omadrm/group"/>
-</component>
-<component name="foundationcerts" filter="sf_build" long-name="Foundation Certificates">
-<unit bldFile="mw/drm/omadrm/foundationcerts/group"/>
-</component>
-</collection>
-<collection name="wmdrm" long-name="Windows Media DRM" level="framework">
-<!-- collection is really a component. Move down a directory -->
-<component name="wmdrm_build" filter="s60" long-name="WM DRM Build">
-<unit bldFile="mw/drm/wmdrm/group"/>
-</component>
-</collection>
-<collection name="drm_info" long-name="DRM Info" level="specific"/>
-</block>
-<block name="locationsrv" level="specific" long-name="Location Services" levels="plugin fw server if">
-<collection name="locsrv_pub" long-name="Location Services Public Interfaces" level="if">
-<component name="landmarks_search_api" long-name="Landmarks Search API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
-</component>
-<component name="landmarks_api" long-name="Landmarks API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/group"/>
-</component>
-<component name="landmarks_database_management_api" long-name="Landmarks Database Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/group"/>
-</component>
-<component name="location_triggering_api" long-name="Location Triggering API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/location_triggering_api/group"/>
-</component>
-<component name="blid_application_satellite_info_api" long-name="BLID Application Satellite Info API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/group"/>
-</component>
-</collection>
-<collection name="locsrv_plat" long-name="Location Services Platform Interfaces" level="if">
-<component name="map_and_navigation_api" long-name="Map and Navigation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/group"/>
-</component>
-<component name="map_and_navigation_provider_discovery_api" long-name="Map and Navigation Provider Discovery API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/group"/>
-</component>
-<component name="geocoding_api" long-name="Geocoding API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
-</component>
-<component name="map_image_api" long-name="Map Image API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/group"/>
-</component>
-<component name="map_and_navigation_aiw_api" long-name="Map and Navigation AIW API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_aiw_api/group"/>
-</component>
-<component name="map_and_navigation_provider_api" long-name="Map and Navigation Provider API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_api/group"/>
-</component>
-<component name="landmarks_category_definition_api" long-name="Landmarks Category Definition API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
-</component>
-<component name="supl_settings_api" long-name="SUPL Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
-</component>
-<component name="location_settings_launch_api" long-name="Location Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/group"/>
-</component>
-<component name="map_image_conversion_plugin_api" long-name="Map Image Conversion Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/group"/>
-</component>
-<component name="psy_configuration_ui_plugin_api" long-name="PSY Configuration UI Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/psy_configuration_ui_plugin_api/group"/>
-</component>
-<component name="np_proxy_configuration_api" long-name="NP Proxy Configuration API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/np_proxy_configuration_api/group"/>
-</component>
-<component name="supl_terminal_initiation_api" long-name="SUPL Terminal Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/group"/>
-</component>
-<component name="location_notation_preferences_settings_api" long-name="Location Notation Preferences Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_notation_preferences_settings_api/group"/>
-</component>
-<component name="supl_settings_notifier_secondary_display_api" long-name="SUPL Settings Notifier Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_notifier_secondary_display_api/group"/>
-</component>
-<component name="supl_network_initiation_api" long-name="SUPL Network Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/group"/>
-</component>
-<component name="privacy_notifiers_secondary_display_api" long-name="Privacy Notifiers Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/privacy_notifiers_secondary_display_api/group"/>
-</component>
-<component name="oma_supl_configuration_parameter_api" long-name="OMA SUPL Configuration Parameter API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_configuration_parameter_api/group"/>
-</component>
-<component name="supl_query_secondary_display_api" long-name="SUPL Query Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_query_secondary_display_api/group"/>
-</component>
-<component name="location_triggering_management_api" long-name="Location Triggering Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_management_api/group"/>
-</component>
-<component name="location_triggering_status_information_api" long-name="Location Triggering Status Information API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_status_information_api/group"/>
-</component>
-<component name="oma_supl_asn_codec_plugin_api" long-name="OMA SUPL ASN Codec Plugin API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
-</component>
-<component name="query_and_notification_api" long-name="Query and Notification API" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/query_and_notification_api/group"/>
-</component>
-<component name="location_local_variation_api" long-name="Location Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_local_variation_api/group"/>
-</component>
-</collection>
-<collection name="genericpositioningplugins" long-name="Generic Positioning Plugins" level="plugin">
-<component name="locationnpppsy" filter="s60" long-name="Location Positioning Proxy PSY" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
-</component>
-<component name="locationsuplpsy" filter="s60" long-name="Location SUPL PSY" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationsuplpsy/group"/>
-</component>
-<component name="genericpositioningplugins_build" filter="s60" long-name="Generic Positioning Plugins Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/genericpositioningplugins/group"/>
-</component>
-</collection>
-<collection name="landmarks" long-name="Landmarks" level="server">
-<component name="locationlandmarks" filter="s60" long-name="Location Landmarks">
-<unit bldFile="mw/locationsrv/landmarks/locationlandmarks/group"/>
-</component>
-</collection>
-<collection name="locationmapnavfw" long-name="Location Map and Navigation Framework" level="fw">
-<component name="mnlibrary" filter="s60" long-name="Map and Navigation Library">
-<unit bldFile="mw/locationsrv/locationmapnavfw/library/group"/>
-</component>
-<component name="mnaiwprovider" filter="s60" long-name="Map and Navigation AIW Provider" plugin="Y">
-<unit bldFile="mw/locationsrv/locationmapnavfw/aiwprovider/group"/>
-</component>
-<component name="locationmapnavfw_build" filter="s60" long-name="Location Map and Navigation Framework Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/locationmapnavfw/group"/>
-</component>
-</collection>
-<collection name="locationsystemui" long-name="Location System UI" level="if">
-<component name="locationsysui" filter="s60" long-name="Location System UI">
-<unit bldFile="mw/locationsrv/locationsystemui/locationsysui/group"/>
-</component>
-</collection>
-<collection name="supl" long-name="SUPL" level="fw">
-<component name="locationsuplfw" filter="s60" long-name="Location SUPL Framework">
-<unit bldFile="mw/locationsrv/supl/locationsuplfw/group"/>
-</component>
-<component name="locationomasuplprotocolhandler" filter="s60" long-name="OMA SUPL Protocol Handler">
-<unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/group"/>
-</component>
-<component name="supltiapiimplementation" filter="s60" long-name="SUPL TI API Implementation" introduced="^3">
-<unit bldFile="mw/locationsrv/supl/supltiapiimplementation/group"/>
-</component>
-</collection>
-<collection name="locationtriggering" long-name="Location Triggering" level="server">
-<component name="ltlogger" filter="s60" long-name="LT Logger">
-<unit bldFile="mw/locationsrv/locationtriggering/ltlogger/group"/>
-</component>
-<component name="ltclientlib" filter="s60" long-name="LT Client Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltclientlib/group"/>
-</component>
-<component name="ltmanagementlib" filter="s60" long-name="LT Management Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmanagementlib/group"/>
-</component>
-<component name="ltcontainer" filter="s60" long-name="LT Container">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontainer/group"/>
-</component>
-<component name="ltserver" filter="s60" long-name="LT Server">
-<unit bldFile="mw/locationsrv/locationtriggering/ltserver/group"/>
-</component>
-<component name="ltstrategypluginapi" filter="s60" long-name="LT Strategy Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategypluginapi/group"/>
-</component>
-<component name="ltstrategyengine" filter="s60" long-name="LT Strategy Engine">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategyengine/group"/>
-</component>
-<component name="ltmovementdetectionpluginapi" filter="s60" long-name="Movement Detection Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmovementdetectionpluginapi/group"/>
-</component>
-<component name="ltcellidmovementdetector" filter="s60" long-name="Cell ID Movement Detector">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/>
-</component>
-<component name="lbtmgmtui" filter="s60" long-name="LBT Management UI" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/lbtmgmtui/group"/>
-</component>
-<component name="ltcontextsourceplugin" filter="s60" long-name="LT Context Source Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontextsourceplugin/group"/>
-</component>
-<component name="locationtriggering_build" filter="s60" long-name="Location Triggering Build">
-<!-- should remove #include from this and maybe put exports in the above components -->
-<unit bldFile="mw/locationsrv/locationtriggering/group"/>
-</component>
-</collection>
-</block>
-<block name="accesssec" level="generic" long-name="Access Security" levels="plugin framework server generic specific">
-<collection name="accesssec_plat" long-name="Access Security Platform Interfaces" level="specific">
-<component name="wapi_security_settings_ui_api" long-name="WAPI Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_security_settings_ui_api/group"/>
-</component>
-<component name="wep_security_settings_ui_api" long-name="WEP Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wep_security_settings_ui_api/group"/>
-</component>
-<component name="wi-fi_protected_setup_ui_api" long-name="Wi-Fi Protected Setup UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
-</component>
-<component name="wlan_eap_settings_ui_api" long-name="WLAN EAP Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wlan_eap_settings_ui_api/group"/>
-</component>
-<component name="wpa_security_settings_ui_api" long-name="WPA Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wpa_security_settings_ui_api/group"/>
-</component>
-<component name="eap_vpn_api" long-name="EAP VPN API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
-</component>
-<component name="eapsim_db_api" long-name="EAP-SIM DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapsim_db_api/group"/>
-</component>
-<component name="eap_type_api" long-name="EAP Type API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_type_api/group"/>
-</component>
-<component name="eaptlspeap_db_api" long-name="EAP-TLS-PEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eaptlspeap_db_api/group"/>
-</component>
-<component name="eapleap_db_api" long-name="LEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapleap_db_api/group"/>
-</component>
-<component name="eapgtc_db_api" long-name="EAP-GTC DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapgtc_db_api/group"/>
-</component>
-<component name="eapmschapv2_db_api" long-name="EAP-MSCHAPV2 DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapmschapv2_db_api/group"/>
-</component>
-<component name="eapaka_db_api" long-name="EAP-AKA DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapaka_db_api/group"/>
-</component>
-<component name="wapi_db_api" long-name="WAPI DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_db_api/group"/>
-</component>
-</collection>
-<collection name="wlansecuritysettings" long-name="WLAN Security Settings" level="specific">
-<component name="wapisecuritysettingsui" filter="s60" long-name="WAPI Security Settings UI" introduced="9.1">
-<!-- the directory for this needs to be moved up to the right level -->
-<unit bldFile="mw/accesssec/wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
-</component>
-<component name="wepsecuritysettingsui" filter="s60" long-name="WEP Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wepsecuritysettingsui/group"/>
-</component>
-<component name="wifiprotectedsetup" filter="s60" long-name="WIFI Protected Setup" introduced="^1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wifiprotectedsetup/group"/>
-</component>
-<component name="wlaneapsettingsui" filter="s60" long-name="WLAN EAP Settings UI" introduced="9.3">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wlaneapsettingsui/group"/>
-</component>
-<component name="wpasecuritysettingsui" filter="s60" long-name="WPA Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wpasecuritysettingsui/group"/>
-</component>
-</collection>
-<collection name="eapol" long-name="EAPOL" level="framework">
-<component name="eapol_framework" filter="s60" long-name="EAPOL Framework" introduced="9.2">
-<unit bldFile="mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
-</component>
-</collection>
-</block>
-<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>
-<component name="bearer_settings_plugin_api" long-name="Bearer Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/bearer_settings_plugin_api/group"/>
-</component>
-<component name="commsdat_wlan_api" long-name="CommsDat WLAN API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/commsdat_wlan_api/group"/>
-</component>
-<component name="connection_monitor_extension_api" long-name="Connection Monitor Extension API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_monitor_extension_api/group"/>
-</component>
-<component name="connection_ui_utilities_api" long-name="Connection UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_ui_utilities_api/group"/>
-</component>
-<component name="disconnect_dialog_api" long-name="Disconnect Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_api/group"/>
-</component>
-<component name="disconnect_dialog_disable_api" long-name="Disconnect Dialog Disable API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_disable_api/group"/>
-</component>
-<component name="extended_connection_settings_api" long-name="Extended Connection Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/extended_connection_settings_api/group"/>
-</component>
-<component name="mpm_default_connection_api" long-name="MPM Default Connection API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_default_connection_api/group"/>
-</component>
-<component name="pdpcontextmanager2_reset_factory_settings_api" long-name="PDP Context Manager 2 Reset Factory Settings API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_settings_api/group"/>
-</component>
-<component name="mpm_connect_screen_api" long-name="MPM Connect Screen API" filter="s60" class="api">
-<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="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>
-<component name="access_point_engine_api" long-name="Access Point Engine API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_monitor_server_api/group"/>
-</component>
-<component name="connection_settings_ui_api" long-name="Connection Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_ui_api/group"/>
-</component>
-<component name="agent_dialog_api" long-name="Agent Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/agent_dialog_api/group"/>
-</component>
-<component name="extendedconnpref_api" long-name="Extended Connection Preferences API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/extendedconnpref_api/group"/>
-</component>
-</collection>
-<collection name="accesspointcontrol" long-name="Access Point Control" level="plugin">
-<component name="apcontrollistplugin" filter="s60" long-name="Access Point Control List Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
-</component>
-</collection>
-<collection name="alwayson_net_plugin" long-name="Always Online Net Plugin" level="server">
-<component name="pdpcontextmanager2" filter="s60" long-name="PDP Context Manager 2">
-<unit bldFile="mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
-</component>
-</collection>
-<collection name="apengine" long-name="Access Point Engine" level="framework">
-<component name="apeng" filter="s60" long-name="Access Point Engine">
-<unit bldFile="mw/ipconnmgmt/apengine/apeng/group"/>
-</component>
-<component name="apsettingshandlerui" filter="s60" long-name="Access Point Settings Handler UI">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingshandlerui/group"/>
-</component>
-<component name="apsettingsplugin" filter="s60" long-name="Access Point Settings Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="bearermanagement" long-name="Bearer Management" level="framework">
-<component name="mpm" filter="s60" long-name="Mobility Policy Manager">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/mpm/group"/>
-</component>
-<component name="extendedconnpref" filter="s60" long-name="Extended Connection Preferences">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/extendedconnpref/group"/>
-</component>
-<component name="s60mcpr" filter="s60" long-name="S60 Meta-Connection Provider" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/S60MCPR/group"/>
-</component>
-</collection>
-<collection name="cmmanager" long-name="Connection Method Manager" level="framework">
-<component name="cmmgr" filter="s60" long-name="CM Manager">
-<unit bldFile="mw/ipconnmgmt/cmmanager/cmmgr/group"/>
-</component>
-<component name="gsconnsettingsplugin" filter="s60" long-name="GS Connection Settings Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/cmmanager/gsconnsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="connectionmonitoring" long-name="Connection Monitoring" level="server">
-<component name="connectionmonitorplugin" filter="s60" long-name="Connection Monitor Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorplugin/group"/>
-</component>
-<component name="connectionmonitorui" filter="s60" long-name="Connection Monitor UI">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorui/group"/>
-</component>
-<component name="connmon" filter="s60" long-name="Connection Monitor">
-<!-- either split into two components, or #include from a common bld.inf -->
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/connectionmonitor/group"/>
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/dataconnectionlogger/group"/>
-</component>
-<component name="connmonext" filter="s60" long-name="Connection Monitor Extension API">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmonext/group"/>
-</component>
-</collection>
-<collection name="connectionutilities" long-name="Connection Utilities" level="utils">
-<component name="connectiondialogs" filter="s60" long-name="Connection Dialogs">
-<unit bldFile="mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/>
-</component>
-</collection>
-<collection name="dbcreator" long-name="DB Creator" level="utils">
-<component name="commsdatcreator" filter="s60" long-name="Comms Database Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
-</component>
-<component name="commsdatcreatorrfsplugin" filter="s60" long-name="Comms Database Creator RFS Plugin" introduced="9.3" plugin="Y">
-<!-- uncomment when config is turned on -->
-<!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
-</component>
-<component name="commsdatstartup" filter="s60" long-name="Comms Database Startup" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
-</component>
-<component name="dbcreatorexe" filter="s60" long-name="DB Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
-</component>
-<component name="dbcreator_build" filter="s60" long-name="DB Creator Build" introduced="9.3">
-<!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
-<unit bldFile="mw/ipconnmgmt/dbcreator/group"/>
-</component>
-</collection>
-<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"/>
-</component>
-<component name="ipcm_qt_build" long-name="IP Connectivity Management Qt Build" introduced="^4">
-<unit bldFile="mw/ipconnmgmt" proFile="ipconnmgmt.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</block>
-<block name="netprotocols" level="generic" long-name="High-level Internet Protocols" levels="plugin framework server generic specific">
-<collection name="netprotocols_plat" long-name="High-level Internet Protocols Platform Interfaces" level="specific">
-<component name="cookie_manager_api" long-name="Cookie Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/cookie_manager_api/group"/>
-</component>
-<component name="http_cache_mgr_api" long-name="HTTP Cache Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_cache_mgr_api/group"/>
-</component>
-<component name="http_filters_api" long-name="HTTP Filters API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_filters_api/group"/>
-</component>
-</collection>
-<collection name="httpfilters" long-name="HTTP Filters" level="plugin">
-<component name="httpfiltercommon" filter="s60" long-name="HTTP Filter Common">
-<unit bldFile="mw/netprotocols/httpfilters/httpfiltercommon/group"/>
-</component>
-<component name="cookie" filter="s60" long-name="Cookie Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/cookie/group"/>
-</component>
-<component name="deflatefilter" filter="s60" long-name="Deflate Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/deflatefilter/group"/>
-</component>
-<component name="httpfilteracceptheader" filter="s60" long-name="Accept Header Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteracceptheader/group"/>
-</component>
-<component name="httpfilterauthentication" filter="s60" long-name="Authentication Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterauthentication/group"/>
-</component>
-<component name="httpfilterconnhandler" filter="s60" long-name="Connection Handler Fitler" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterconnhandler/group"/>
-</component>
-<component name="httpfilteriop" filter="s60" long-name="HTTP IOP Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteriop/group"/>
-</component>
-<component name="httpfilterproxy" filter="s60" long-name="HTTP Proxy Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterproxy/group"/>
-</component>
-<component name="uaproffilter" filter="s60" long-name="UAProf Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/uaproffilter/group"/>
-</component>
-</collection>
-<collection name="applayerprotocols" long-name="Application Layer Protocols" level="server">
-<component name="httptransportfw" long-name="HTTP Transport Framework" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
-</component>
-<component name="httpexamples" long-name="HTTP Examples" introduced="6.2" purpose="development">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpexamples/group" mrp="mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
-</component>
-<component name="wappushsupport" long-name="WAP Push Support" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
-</component>
-<component name="wapbase" long-name="WAP Base" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wapbase/Group" mrp="mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
-</component>
-<component name="ftpengine" long-name="FTP Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/ftpengine/group" mrp="mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
-</component>
-<component name="telnetengine" long-name="Telnet Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/telnetengine/group" mrp="mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
-</component>
-<component name="httpserviceapi" long-name="HTTP Service API" introduced="TB9.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpservice/group" mrp="mw/netprotocols/applayerprotocols/httpservice/group/http_service.mrp"/>
-</component>
-</collection>
-<collection name="applayerpluginsandutils" long-name="Application Layer Plugins and Utils" level="framework">
-<component name="uripermissionservices" long-name="URI Permission Services" introduced="^2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
-</component>
-<component name="bookmarksupport" long-name="Bookmark Support" introduced="9.1" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
-</component>
-<component name="httpprotocolplugins" long-name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
-</component>
-<component name="httptransportplugins" long-name="HTTP Transport Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
-</component>
-</collection>
-<collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
-<component name="netprotocols_metadata" long-name="High-level Internet Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ipappprotocols" level="generic" long-name="IP App Protocols" levels="plugin conn server if">
-<collection name="ipappprotocols_plat" long-name="IP App Protocols Platform Interfaces" level="if">
-<component name="srtp_api" long-name="SRTP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/srtp_api/group"/>
-</component>
-<component name="rtprtcp_api" long-name="RTP/RTCP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/rtprtcp_api/group"/>
-</component>
-</collection>
-<collection name="rtp" long-name="RTP" level="server">
-<component name="srtpstack" filter="s60" long-name="SRTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/srtpstack/group"/>
-</component>
-<component name="rtpstack" filter="s60" long-name="RTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/rtpstack/group"/>
-</component>
-</collection>
-<collection name="realtimenetprots" long-name="Real Time Net Protocols" level="server">
-<component name="symrtp" long-name="RTP" introduced="9.0" purpose="optional">
-<!-- Real Time Data Protocol -->
-<unit bldFile="mw/ipappprotocols/realtimenetprots/rtp/group" mrp="mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
-</component>
-<component name="srtp" long-name="Secure RTP" introduced="^4" purpose="optional">
-<unit bldFile="mw/ipappprotocols/realtimenetprots/srtp/group" mrp="mw/ipappprotocols/realtimenetprots/srtp/group/mm-protocols_srtp.mrp"/>
-</component>
-<component name="sipfw" long-name="SIP Framework" introduced="9.2" purpose="optional">
-<unit bldFile="mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp" version="2"/>
-</component>
-</collection>
-<collection name="sipplugins" long-name="SIP Plugins" level="plugin">
-<component name="sippwlanplugin" filter="s60" long-name="SIP WLAN Plugin" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
-</component>
-<component name="sippsipsettingsui" filter="s60" long-name="SIP Settings UI" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
-</component>
-<component name="sippdevmgmtsipadapter" filter="s60" long-name="Device Management SIP Settings Adapter" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
-</component>
-<component name="sippsystemstatemonitor" filter="s60" long-name="SIP System State Monitor" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsystemstatemonitor/group"/>
-</component>
-<component name="sippsipadapter" filter="s60" long-name="SIP Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipadapter/group"/>
-</component>
-</collection>
-<collection name="sipproviderplugins" long-name="SIP Provider Plugins" level="conn">
-<component name="sipprovider" long-name="SIP Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipproviderplugins/sipprovider/group" mrp="mw/ipappprotocols/sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
-</component>
-</collection>
-<collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="if">
-<component name="ipappprotocols_metadata" long-name="IP App Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wirelessacc" level="specific" long-name="Wireless Access" levels="framework generic ui">
-<collection name="hsfw_plat" long-name="HotSpot Framework Platform Interfaces" level="ui">
-<component name="hotspot_framework_client_api" long-name="HotSpot Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_api" long-name="Internet Connectivity Test Service API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_settings_api" long-name="Internet Connectivity Test Service Settings API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
-</component>
-<component name="hotspot_framework_client_plugin_api" long-name="HotSpot Framework Client Plugin API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
-</component>
-</collection>
-<collection name="hotspotfw" long-name="HotSpot Framework" level="framework">
-<component name="hsserver" filter="s60" long-name="HotSpot Server" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="hsclient" filter="s60" long-name="HotSpot Client" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="internetconnectivitytestservice" filter="s60" long-name="Internet Connectivity Test Service" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
-</component>
-<component name="ictsdialogs" filter="s60" long-name="Internet Connectivity Test Service Dialogs" deprecated="^3" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
-</component>
-<component name="hspluginforagent" filter="s60" long-name="HotSpot Plugin for Agent" plugin="Y" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
-</component>
-<component name="hsbrowser" filter="s60" long-name="HotSpot Browser" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
-</component>
-<component name="hotspotfw_build" filter="s60" long-name="Hotspot Framework Build">
-<!-- should break up this bld.inf into the above components, or collapse them all into a single component -->
-<unit bldFile="mw/wirelessacc/hotspotfw/group"/>
-</component>
-</collection>
-<collection name="wlanutilities" long-name="WLAN Utilities" level="generic">
-<component name="wlanutilities_build" long-name="WLAN Utilities Qt" introduced="^4" filter="s60">
-<!-- is this uinit needed, or is it sufficient to uncomment the units in the below components? -->
-<unit bldFile="mw/wirelessacc/wlanutilities" proFile="wirelessacc.pro" qmakeArgs="-r"/>
-</component>
-<component name="wlanqtutilities" filter="s60" long-name="WLAN Qt Utilities" introduced="^4" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlanplugin/group" qt:proFile="wlanqtutilities.pro"/>-->
-</component>
-<component name="wlansniffer" filter="s60" long-name="WLAN Sniffer" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlansettingsui/group" qt:proFile="wlansniffer.pro"/>-->
-</component>
-<component name="wlanentryplugin" filter="s60" long-name="WLAN Entry Plugin" plugin="Y" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlansniffer/group" qt:proFile="wlanentryplugin.pro"/>-->
-</component>
-<component name="wlanindicatorplugin" filter="s60" long-name="WLAN Indicator Plugin" plugin="Y" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlanindicatorplugin/group" qt:proFile="wlanindicatorplugin.pro"/>-->
-</component>
-</collection>
-</block>
-<block name="vpnclient" level="specific" long-name="VPN Client" levels="engine ui api">
-<!-- is the !oem_build filter needed? -->
-<collection name="vpnc_plat" long-name="VPN Client Platform Interfaces" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API" class="api">
-<unit bldFile="mw/vpnclient/vpnc_plat/vpnapi/group"/>
-</component>
-</collection>
-<collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API">
-<unit bldFile="mw/vpnclient/vpnapiimpl/group"/>
-</component>
-</collection>
-<collection name="vpnengine" long-name="VPN Engine" level="engine">
-<!-- too many components in this collection.
- Probably best to group the binaries together into larger components
- or maybe split the collection into more reasonable groups -->
-<component name="eventmediatorapi" filter="s60" long-name="Event Mediator API">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediatorapi/group"/>
-</component>
-<component name="eventviewer" filter="s60" long-name="Event Viewer">
-<unit bldFile="mw/vpnclient/vpnengine/eventviewer/group"/>
-</component>
-<component name="vpnins" filter="s60" long-name="VPN Installer">
-<unit bldFile="mw/vpnclient/vpnengine/vpnins/group"/>
-</component>
-<component name="ikepolparser" filter="s60" long-name="IKE Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/ikepolparser/group"/>
-</component>
-<component name="utlbase64" filter="s60" long-name="Base64 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlbase64/group"/>
-</component>
-<component name="utlcrypto" filter="s60" long-name="Crypto Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlcrypto/group"/>
-</component>
-<component name="utlxml" filter="s60" long-name="XML Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlxml/group"/>
-</component>
-<component name="utlpkcs10" filter="s60" long-name="PKCS#10 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs10/group"/>
-</component>
-<component name="pkiserviceapi" filter="s60" long-name="PKI Service API">
-<unit bldFile="mw/vpnclient/vpnengine/pkiserviceapi/group"/>
-</component>
-<component name="ikecert" filter="s60" long-name="IKE Certificate Management">
-<unit bldFile="mw/vpnclient/vpnengine/ikecert/group"/>
-</component>
-<component name="kmdapi" filter="s60" long-name="Key Management Daemon API">
-<unit bldFile="mw/vpnclient/vpnengine/kmdapi/group"/>
-</component>
-<component name="kmdserver" filter="s60" long-name="Key Management Daemon Server">
-<unit bldFile="mw/vpnclient/vpnengine/kmdserver/group"/>
-</component>
-<component name="ikeutils" filter="s60" long-name="Internet Key Exchange Utils">
-<unit bldFile="mw/vpnclient/vpnengine/ikeutils/group"/>
-</component>
-<component name="ikev1lib" filter="s60" long-name="IKEv1 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev1lib/group"/>
-</component>
-<component name="ikev2lib" filter="s60" long-name="IKEv2 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev2lib/group"/>
-</component>
-<component name="vpnipsecpolparser" filter="s60" long-name="VPN IPsec Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/vpnipsecpolparser/group"/>
-</component>
-<component name="sit" filter="s60" long-name="Socket Interaction Thread">
-<unit bldFile="mw/vpnclient/vpnengine/sit/group"/>
-</component>
-<component name="vpntcwrapper" filter="s60" long-name="VPN Terminal Control Wrapper">
-<unit bldFile="mw/vpnclient/vpnengine/vpntcwrapper/group"/>
-</component>
-<component name="eventmediator" filter="s60" long-name="Event Mediator">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediator/group"/>
-</component>
-<component name="pkiservice" filter="s60" long-name="PKI Service">
-<unit bldFile="mw/vpnclient/vpnengine/pkiservice/group"/>
-</component>
-<component name="vpnconnagt" filter="s60" long-name="VPN Connection Agent">
-<unit bldFile="mw/vpnclient/vpnengine/vpnconnagt/group"/>
-</component>
-<component name="vpnmanager" filter="s60" long-name="VPN Manager">
-<unit bldFile="mw/vpnclient/vpnengine/vpnmanager/group"/>
-</component>
-<component name="vpncleaner" filter="s60" long-name="VPN Cleaner">
-<unit bldFile="mw/vpnclient/vpnengine/vpncleaner/group"/>
-</component>
-<component name="utlpkcs12" filter="s60" long-name="PKCS#12 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs12/group"/>
-</component>
-<component name="dmadengine" filter="s60" long-name="DM Adapter Engine">
-<unit bldFile="mw/vpnclient/vpnengine/dmadengine/group"/>
-</component>
-<component name="dmadipsecvpn" filter="s60" long-name="IPsec VPN DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadipsecvpn/group"/>
-</component>
-<component name="dmadpki" filter="s60" long-name="PKI DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadpki/group"/>
-</component>
-<component name="ikesocket" filter="s60" long-name="IKE Socket" introduced="^3">
-<unit bldFile="mw/vpnclient/vpnengine/ikesocket/group"/>
-</component>
-</collection>
-<collection name="vpnui" long-name="VPN UI" level="ui">
-<component name="vpnecomnotifier" filter="s60" long-name="VPN ECOM Notifier" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnecomnotifier/group"/>
-</component>
-<component name="vpndialogmanager" filter="s60" long-name="VPN Dialog Manager">
-<unit bldFile="mw/vpnclient/vpnui/vpndialogmanager/group"/>
-</component>
-<component name="vpnmanagementui" filter="s60" long-name="VPN Management UI" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnmanagementui/group"/>
-</component>
-<component name="vpnpolins" filter="s60" long-name="VPN Policy Installer">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolins/group"/>
-</component>
-<component name="vpnpolicyrecognizer" filter="s60" long-name="VPN Policy Recognizer" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolicyrecognizer/group"/>
-</component>
-</collection>
-<collection name="vpnclient_info" long-name="VPN Client Info" level="api">
-<component name="vpnclient_help" filter="s60" long-name="VPN Client Help">
-<unit bldFile="mw/vpnclient/help/group"/>
-</component>
-<component name="vpnclient_build" filter="s60" long-name="VPN Client Build">
-<!-- should split this up into the other components and remove this-->
-<unit bldFile="mw/vpnclient/group"/>
-</component>
-</collection>
-</block>
-<block name="ipappsrv" level="specific" long-name="IP App Services" levels="framework generic server conn plugin">
-<collection name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" level="plugin">
-<component name="transcoder_api" long-name="Transcoder API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
-</component>
-<component name="comms_event_api" long-name="Comms Event API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/comms_event_api/group"/>
-</component>
-<component name="floor_control_api" long-name="Floor Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/floor_control_api/group"/>
-</component>
-<component name="media_control_api" long-name="Media Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/media_control_api/group"/>
-</component>
-<component name="multimedia_comms_api" long-name="Multimedia Comms API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/multimedia_comms_api/group"/>
-</component>
-<component name="nat_settings_api" long-name="NAT Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/nat_settings_api/group"/>
-</component>
-</collection>
-<collection name="natfw" long-name="NAT Framework" level="framework">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="natfw_build" filter="s60" long-name="NAT Framework Build" introduced="^2">
-<unit bldFile="mw/ipappsrv/natfw/group"/>
-</component>
-</collection>
-<collection name="multimediacommscontroller" long-name="Multimedia Comms Controller" level="conn">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommscontroller_build" filter="s60" long-name="Multimedia Comms Controller Build">
-<unit bldFile="mw/ipappsrv/multimediacommscontroller/group"/>
-</component>
-</collection>
-<collection name="multimediacommsengine" long-name="Multimedia Comms Engine" level="generic">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommsengine_build" filter="s60" long-name="Multimedia Comms Engine Build">
-<unit bldFile="mw/ipappsrv/multimediacommsengine/group"/>
-</component>
-</collection>
-<collection name="natplugins" long-name="NAT Plugins" level="plugin">
-<component name="natpcliprovisioningnatfwadapter" filter="s60" long-name="Client Provisioning NAT Framework Traversal Adapter" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/group"/>
-</component>
-<component name="natpdevmgmtnatfwadapter" filter="s60" long-name="Device Management NAT Framework Traversal Adapter" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/group"/>
-</component>
-<component name="natptraversalcontroller" filter="s60" long-name="NAT Traversal Controller" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natptraversalcontroller/group"/>
-</component>
-<component name="natpnatfwsdpprovider" filter="s60" long-name="NAT Framework SDP Provider" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpnatfwsdpprovider/group"/>
-</component>
-</collection>
-<collection name="ipappsrv_info" long-name="IP App Services Info" level="plugin">
-<component name="ipappsrv_build" long-name="IP App Services Build" filter="s60">
-<!-- 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">
-<collection name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" level="specific">
-<component name="sat_refresh_api" long-name="SAT Refresh API" filter="s60" class="api"/>
-<component name="sat_client_api" long-name="SAT Client API" filter="s60" class="api"/>
-<component name="sat_service_api" long-name="SAT Service API" filter="s60" class="api"/>
-<component name="call_information_api" long-name="Call Information API" filter="s60" class="api"/>
-<component name="call_remote_party_information_api" long-name="Call Remote Party Information API" filter="s60" class="api"/>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api"/>
-</collection>
-<collection name="cellular" long-name="Cellular" level="server">
-<component name="telephonysettings" filter="s60" long-name="Telephony Settings" purpose="development"/>
-<component name="sssettings" filter="s60" long-name="Supplementary Service Settings" purpose="development"/>
-<component name="psetnotesui" filter="s60" long-name="Phone Settings Notes UI" purpose="development"/>
-</collection>
-<collection name="convergedcallengine" long-name="Converged Call Engine" level="framework">
-<component name="cce" filter="s60" long-name="CCE" purpose="development"/>
-<component name="spsettings" filter="s60" long-name="Service Provider Settings" purpose="development"/>
-</collection>
-<collection name="phoneclientserver" long-name="Phone Client/Server" level="server">
-<component name="aiwdialdata" filter="s60" long-name="AIW Dial Data" purpose="development"/>
-<component name="dialutils" filter="s60" long-name="Dial Utils" purpose="development"/>
-<component name="phoneclient" filter="s60" long-name="Phone Client" purpose="development"/>
-</collection>
-<collection name="phonesrv_info" long-name="Phone Server Info" level="generic">
-<component name="phonesrv_build" long-name="Phone Server Build" filter="s60">
-<unit bldFile="mw/phonesrv" proFile="phonesrv.pro"/>
-</component>
-</collection>
-</block>
-<block name="messagingmw" level="specific" long-name="Messaging Middleware" levels="stack support fw api">
-<collection name="msgfw_plat" long-name="Messaging Middleware Platform Interfaces" level="api">
-<component name="always_online_plugin_api" long-name="Always Online Plugin API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_plugin_api/group"/>
-</component>
-<component name="always_online_client_api" long-name="Always Online Client API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_client_api/group"/>
-</component>
-<component name="msg_common_utils_api" long-name="Messaging Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/msg_common_utils_api/group"/>
-</component>
-<component name="muiu_utils_api" long-name="Messaging Center UI Utilities API" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/muiu_utils_api/group"/>
-</component>
-</collection>
-<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" class="config">
-<unit bldFile="mw/messagingmw/msgbranched/group"/>
-</component>
-</collection>
-<collection name="messagingfw" long-name="Messaging Framework" level="fw">
-<!-- should break this collection up into smaller related collections -->
-<component name="send_ui_api" long-name="Send UI API" filter="s60" deprecated="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/send_ui_api/group"/>
-</component>
-<component name="send_ui_plugin_api" long-name="Send UI Plug-in API" filter="s60" deprecated="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/send_ui_plugin_api/group"/>
-</component>
-<component name="send_ui_datautils_api" long-name="Send UI Data Utils API" filter="s60" deprecated="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/send_ui_datautils_api/group"/>
-</component>
-<component name="alwaysonline" filter="s60" long-name="Always Online Server" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/alwaysonline/group"/>
-</component>
-<component name="msgcommonutils" filter="s60" long-name="Messaging Common Utils" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/msgcommonutils/group"/>
-</component>
-<component name="senduiservices" filter="s60" long-name="Send UI Services" introduced="^2" deprecated="^4">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/senduiservices/group"/>
-</component>
-<component name="muiuutils" long-name="Messaging Center UI Utilities" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/muiuutils/group"/>
-</component>
-<component name="scheduledsendmtm" long-name="Scheduled Send MTM" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/group" mrp="mw/messagingmw/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
-</component>
-<component name="msgsrvnstore" long-name="Message Server and Store" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/group" mrp="mw/messagingmw/messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
-</component>
-<component name="biomsgfw" long-name="BIO Messaging Framework" introduced="6.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/group" mrp="mw/messagingmw/messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
-</component>
-<component name="msgconf" long-name="Messaging Config" introduced="^2" purpose="optional" class="config">
-<unit bldFile="mw/messagingmw/messagingfw/msgconf/group" mrp="mw/messagingmw/messagingfw/msgconf/group/messaging_config.mrp"/>
-</component>
-<component name="watcherfw" long-name="Watcher Framework" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/watcherfw/group" mrp="mw/messagingmw/messagingfw/watcherfw/group/messaging_watcher.mrp"/>
-</component>
-<component name="msgtest" long-name="Messaging Test" purpose="development">
-<unit bldFile="mw/messagingmw/messagingfw/msgtest/group" mrp="mw/messagingmw/messagingfw/msgtest/group/messaging_test.mrp"/>
-</component>
-<component name="sendas" long-name="Send As" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/sendas/group" mrp="mw/messagingmw/messagingfw/sendas/group/messaging_sendas2.mrp"/>
-</component>
-<component name="msgurlhandler" long-name="Message URL Handler" introduced="7.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/group" mrp="mw/messagingmw/messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
-</component>
-<component name="wappushfw" long-name="WAP Push Framework" introduced="6.1" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/wappushfw/group" mrp="mw/messagingmw/messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
-</component>
-<component name="suplsmshandler" long-name="SUPL SMS Handler" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplsmshandler/group" mrp="mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/>
-</component>
-<component name="suplwappushhandler" long-name="SUPL WAP Push Handler" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
-</component>
-</collection>
-<collection name="messagingmw_info" long-name="Messaging Middleware Info" level="api">
-<component name="messagingmw_metadata" long-name="Messaging Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="imsrv" level="specific" long-name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
-<collection name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" level="specific">
-<component name="ximp_core_data_model_api" long-name="XIMP Core Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_host_api" long-name="XIMP Presence Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_presence_data_model_api" long-name="XIMP Presence Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_api" long-name="XIMP Presence Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_presence_management_api" long-name="XIMP Presence Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_management_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_host_api" long-name="XIMP Core Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_core_management_api" long-name="XIMP Core Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_management_api/group"/>
-</component>
-<component name="ximp_presence_base_api" long-name="XIMP Presence Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_base_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_api" long-name="XIMP Core Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_core_base_api" long-name="XIMP Core Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_base_api/group"/>
-</component>
-<component name="ximp_presence_cache_api" long-name="XIMP Presence Cache API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_cache_api/group"/>
-</component>
-<component name="ximp_core_feature_plugin_api" long-name="XIMP Core Feature Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_host_api" long-name="XIMP IM Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_im_data_model_api" long-name="XIMP IM Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_data_model_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_api" long-name="XIMP IM Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_im_management_api" long-name="XIMP IM Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_management_api/group"/>
-</component>
-<component name="ximp_im_base_api" long-name="XIMP IM Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_base_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_host_api" long-name="XIMP Search Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_search_data_model_api" long-name="XIMP Search Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_data_model_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_api" long-name="XIMP search Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_search_management_api" long-name="XIMP Search Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_management_api/group"/>
-</component>
-<component name="ximp_search_base_api" long-name="XIMP Search Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_base_api/group"/>
-</component>
-<component name="xmpp_settings_api" long-name="XMPP Settings API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/group"/>
-</component>
-<component name="im_cache_client_api" long-name="IM Cache Client API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/im_cache_client_api/group"/>
-</component>
-<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 Avability Text" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
-</component>
-</collection>
-<collection name="ximpfw" long-name="XIMP Framework" level="framework">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="ximpfw_build" filter="s60" long-name="XIMP Framework Build">
-<unit bldFile="mw/imsrv/ximpfw/group"/>
-</component>
-</collection>
-<collection name="imservices" long-name="IM Services" level="generic">
-<component name="imfeatureplugin" filter="s60" long-name="IM Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/imfeatureplugin/group"/>
-</component>
-<component name="searchfeatureplugin" filter="s60" long-name="Search Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/searchfeatureplugin/group"/>
-</component>
-<component name="xmppsettingsapi" filter="s60" long-name="XMPP Settings API" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsapi/group"/>
-</component>
-<component name="xmppsettingsfetcher" filter="s60" long-name="XMPP Settings Fetcher" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/group"/>
-</component>
-<component name="instantmessagingcache" filter="s60" long-name="Instant Messaging Cache" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/instantmessagingcache/group"/>
-</component>
-</collection>
-<collection name="brandingserver" long-name="Branding Server" level="specific">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="brandingserver_build" filter="s60" long-name="Branding Server Build">
-<unit bldFile="mw/imsrv/brandingserver/group"/>
-</component>
-</collection>
-</block>
-<block name="legacypresence" level="specific" long-name="Legacy Presence Services" levels="engine fw ui">
-<collection name="pressrv_plat" long-name="Legacy Presence Services Platform Interfaces" level="ui">
-<component name="presence_list_api" long-name="Presence List API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/presence_list_api/group"/>
-</component>
-<component name="watcher_info_api" long-name="Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_info_api/group"/>
-</component>
-<component name="simple_documents_api" long-name="SIMPLE Documents API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_documents_api/group"/>
-</component>
-<component name="authorization_api" long-name="Authorization API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/authorization_api/group"/>
-</component>
-<component name="xdm_protocol_plugin_api" long-name="XDM Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_protocol_plugin_api/group"/>
-</component>
-<component name="watcher_api" long-name="Watcher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_api/group"/>
-</component>
-<component name="xdm_api" long-name="XDM API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_api/group"/>
-</component>
-<component name="registration_api" long-name="Registration API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/registration_api/group"/>
-</component>
-<component name="publisher_api" long-name="Publisher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/publisher_api/group"/>
-</component>
-<component name="messaging_connection_manager_api" long-name="Messaging Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/messaging_connection_manager_api/group"/>
-</component>
-<component name="xdm_settings_api" long-name="XDM Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_settings_api/group"/>
-</component>
-<component name="simple_settings_api" long-name="SIMPLE Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_settings_api/group"/>
-</component>
-<component name="simple_instant_msg_api" long-name="Simple Instant Msg API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_instant_msg_api/group"/>
-</component>
-</collection>
-<collection name="xdmengine" long-name="XDM Engine" level="engine">
-<!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
-<component name="xdmengine_build" filter="s60" long-name="XDM Engine Build">
-<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">
-<unit bldFile="mw/legacypresence/xdmprotocols/group"/>
-</component>
-</collection>
-<collection name="msgconnmanager" long-name="Messaging Connection Manager" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="msgconnmanager_build" filter="s60" long-name="Messaging Connection Manager Build">
-<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">
-<unit bldFile="mw/legacypresence/simpleengine/group"/>
-</component>
-</collection>
-<collection name="presencefwsimpleadpt" long-name="Presence Framework SIMPLE Adaptation" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="simpleplugin" filter="s60" long-name="SIMPLE Plugin" plugin="Y">
-<unit bldFile="mw/legacypresence/presencefwsimpleadpt/group"/>
-</component>
-</collection>
-<collection name="simpledatamodeladapter" long-name="SIMPLE Data Model Adapter" level="fw">
-<component name="presenceplugin" filter="s60" long-name="Presence Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/legacypresence/simpledatamodeladapter/group"/>
-</component>
-</collection>
-</block>
-<block name="opensrv" level="specific" long-name="Open Services" levels="prt lib server eng">
-<collection name="opensrv_plat" long-name="Open Services Platform Interfaces" level="eng">
-<component name="messagequeue_api" long-name="Message Queue API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/opensrv/opensrv_plat/messagequeue_api/group"/>
-</component>
-</collection>
-<collection name="loudmouth" long-name="Loudmouth" level="prt">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="loudmouth_build" filter="s60" long-name="Loudmouth Build" introduced="^2">
-<unit bldFile="mw/opensrv/loudmouth/group"/>
-</component>
-</collection>
-<collection name="libtelepathy" long-name="Telepathy Library" level="lib">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="libtelepathy_build" filter="s60" long-name="Telepathy Library Build" introduced="^2">
-<unit bldFile="mw/opensrv/libtelepathy/group"/>
-</component>
-</collection>
-<collection name="telepathygabble" long-name="Telepathy Gabble" level="eng">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="telepathygabble_build" filter="s60" long-name="Telepathy Gabble Build" introduced="^2">
-<unit bldFile="mw/opensrv/telepathygabble/group"/>
-</component>
-</collection>
-<collection name="isolationserver" long-name="Isolation Server" level="server">
-<component name="messagequeue" filter="s60" long-name="Message Queue" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/messagequeue/group"/>
-</component>
-<component name="isoserver" filter="s60" long-name="ISO Server" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/isoserver/group"/>
-</component>
-<component name="isolationserver_build" filter="s60" long-name="Isloation Server Build" introduced="^2">
-<!-- needs #includes removed. either move the exports to another component or make this a ROM component -->
-<unit bldFile="mw/opensrv/isolationserver/group"/>
-</component>
-</collection>
-</block>
-<block name="searchsrv" level="specific" long-name="Search Services" levels="services engine generic api">
-<collection name="searchsrv_plat" long-name="Search Services Platform Interfaces" level="api">
-<component name="cpix_utility_api" long-name="CPIX Utility API" filter="s60" class="api">
-<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_utility_api/group"/>
-</component>
-<component name="cpix_framework_api" long-name="CPIX Framework API" filter="s60" class="api">
-<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_framework_api/group"/>
-</component>
-<component name="cpix_search_api" long-name="CPIX Search API" filter="s60" class="api">
-<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_search_api/group"/>
-</component>
-</collection>
-<collection name="searchengine" long-name="Search Engine" level="engine">
-<component name="searchengine_util" long-name="Search Engine Utils" filter="s60">
-<unit bldFile="mw/searchsrv/searchengine/util/group"/>
-</component>
-<component name="searchengine_oss" long-name="Search Engine OSS" filter="s60">
-<unit bldFile="mw/searchsrv/searchengine/oss/group"/>
-</component>
-<component name="cpix" long-name="Cross Platform Indexing Engine" filter="s60">
-<unit bldFile="mw/searchsrv/searchengine/cpix/group"/>
-</component>
-</collection>
-<collection name="searcher" long-name="Searcher" level="generic">
-<component name="searchclient" long-name="Search Client" filter="s60">
-<unit bldFile="mw/searchsrv/searcher/SearchClient/group"/>
-</component>
-<component name="searchserver" long-name="Search Server" filter="s60">
-<unit bldFile="mw/searchsrv/searcher/SearchServer/group"/>
-</component>
-<component name="searcher_test" long-name="Searcher Tests" filter="s60" purpose="development">
-<!-- #include from common bld.inf or split into two components -->
-<unit bldFile="mw/searchsrv/searcher/tsrc/RobustnessTest/group"/>
-<unit bldFile="mw/searchsrv/searcher/tsrc/LogPlayer/group"/>
-</component>
-</collection>
-<collection name="searchsrv_harvester" long-name="Search Services Harvester" level="services">
-<component name="searchsrv_pluginfw" long-name="Search Server" filter="s60">
-<unit bldFile="mw/searchsrv/harvester/pluginfw/group"/>
-</component>
-<component name="searchsrv_harvesterserver" long-name="Search Harvester Server" filter="s60">
-<unit bldFile="mw/searchsrv/harvester/HarvesterServer/group"/>
-</component>
-</collection>
-<collection name="searchsrv_watchdog" long-name="Search Services Watch Dog" level="services">
-<component name="searchsrv_watchdog_build" long-name="Search Services Watch Dog Build" filter="s60">
-<unit bldFile="mw/searchsrv/WatchDog/group"/>
-</component>
-</collection>
-<collection name="qcpix" long-name="Qt CPIX" level="engine">
-<component name="qcpix_build" long-name="Qt CPIX Build">
-<unit bldFile="mw/searchsrv/qcpix" proFile="qcpix.pro"/>
-</component>
-</collection>
-<collection name="searchsrv_info" long-name="Search Services Info">
-<component name="searchsrv_build" long-name="Search Services Build">
-<!-- move exports to own component and remove this -->
-<unit bldFile="mw/searchsrv/group"/>
-</component>
-</collection>
-</block>
-<block name="remotemgmt" level="specific" long-name="Remote Management" levels="plugin framework server generic specific">
-<collection name="remotemgmt_pub" long-name="Remote Management Public Interfaces" level="specific">
-<component name="synchronization_capability_api" long-name="Synchronization Capability API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
-</component>
-</collection>
-<collection name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" level="specific">
-<component name="common_agent_util_and_definitions_api" long-name="Common Agent util and definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
-</component>
-<component name="policy_management_certificate_api" long-name="Policy Management Certificate API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/group"/>
-</component>
-<component name="oma_provisioning_adapter_api" long-name="OMA Provisioning Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_adapter_api/group"/>
-</component>
-<component name="device_management_parameter_api" long-name="Device Management Parameter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_parameter_api/group"/>
-</component>
-<component name="data_synchronization_plugin_api" long-name="Data Synchronization Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/group"/>
-</component>
-<component name="sync_alert_handler_api" long-name="Sync Alert Handler API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
-</component>
-<component name="syncml_notifier_api" long-name="SyncML Notifier API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
-</component>
-<component name="syncml_client_api" long-name="SyncML Client API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
-</component>
-<component name="device_management_plugin_api" long-name="Device Management plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_plugin_api/group"/>
-</component>
-<component name="dm_tree_apis" long-name="DM Tree APIs" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
-</component>
-<component name="terminal_security_device_lock_api" long-name="Terminal Security Device Lock API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/group"/>
-</component>
-<component name="policy_management_request_api" long-name="Policy Management Request API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/group"/>
-</component>
-<component name="ds_constant_definitions_api" long-name="DS Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_constant_definitions_api/group"/>
-</component>
-<component name="scp_server_api" long-name="SCP Server API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/group"/>
-</component>
-<component name="data_synchronization_notification_api" long-name="Data Synchronization Notification API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_notification_api/group"/>
-</component>
-<component name="oma_provisioning_engine_api" long-name="OMA Provisioning Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/group"/>
-</component>
-<component name="dm_utils_api" long-name="DM Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/group"/>
-</component>
-<component name="syncml_alert_api" long-name="SyncML Alert API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/group"/>
-</component>
-<component name="obex_client_session_api" long-name="OBEX Client session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/obex_client_session_api/group"/>
-</component>
-<component name="setting_enforcement_info_api" long-name="Setting Enforcement Info API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/group"/>
-</component>
-<component name="dm_constant_definitions_api" long-name="DM Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
-</component>
-<component name="oma_ds_extensions_api" long-name="OMA DS Extensions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
-</component>
-<component name="pnpms_utils_api" long-name="PNPMS Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
-</component>
-<component name="diagnostics_plugin_utility_api" long-name="Diagnostics Plugin Utility API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
-</component>
-<component name="diagnostics_plugin_api" long-name="Diagnostics Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
-</component>
-<component name="diagnostics_framework_api" long-name="Diagnostics Framework API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
-</component>
-<component name="diagnostics_results_api" long-name="Diagnostics Results API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
-</component>
-<component name="diagnostics_plugin_pool_api" long-name="Diagnostics Plugin Pool API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
-</component>
-<component name="adaptive_history_list_api" long-name="Adaptive History List API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
-</component>
-<component name="adaptive_history_list_session_api" long-name="Adaptive History List Session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
-</component>
-<component name="fota_engine_api" long-name="FOTA Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
-</component>
-<component name="update_package_storage_plugin_api" long-name="Update Package Storage Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
-</component>
-<component name="syncml_notifier_roaming_api" long-name="SyncML Notifier Roaming API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
-</component>
-<component name="sync_service_api" long-name="Sync Service API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_service_api/group"/>
-</component>
-<component name="dcmo_adapter_api" long-name="DCMO Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_adapter_api/group"/>
-</component>
-<component name="dcmo_control_api" long-name="DCMO Control API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_control_api/group"/>
-</component>
-<component name="ds_capability_mgmt_plugin_api" long-name="DS Capability Management Plugin API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
-</component>
-<component name="dm_native_notifier_api" long-name="DM Native Notifier API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_native_notifier_api/group"/>
-</component>
-</collection>
-<collection name="policymanagement" long-name="Policy Management" level="generic">
-<component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">
-<unit bldFile="mw/remotemgmt/policymanagement/pmdmadapter/group"/>
-</component>
-<component name="dmutilserver" filter="s60" long-name="DM Util Server">
-<unit bldFile="mw/remotemgmt/policymanagement/dmutilserver/group"/>
-</component>
-<component name="policyengine" filter="s60" long-name="Policy Engine">
-<unit bldFile="mw/remotemgmt/policymanagement/policyengine/group" filter="!dfs_build"/>
-</component>
-<component name="policymanagement_build" filter="s60" long-name="Policy Management Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/policymanagement/group"/>
-</component>
-</collection>
-<collection name="syncmlfw" long-name="SyncML Framework" level="server">
-<component name="syncmlfw_build" filter="s60" long-name="SyncML Framework Build">
-<!-- need to break this up into components. Too convoluted a structure to be in a single bld.inf-->
-<unit bldFile="mw/remotemgmt/syncmlfw/group"/>
-</component>
-</collection>
-<collection name="terminalsecurity" long-name="Terminal Security" level="specific">
-<component name="scp" filter="s60" long-name="Security Code Proxy">
-<!-- can only have one unit, need to have these #included from a single bld.inf -->
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpdatabase/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpserver/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scppatternplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scphistoryplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scptimestampplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpeventhandler/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/dmeventnotifier/group"/>
-</component>
-<component name="terminalsecurity_client" filter="s60" long-name="Terminal Control Client">
-<unit bldFile="mw/remotemgmt/terminalsecurity/client/group"/>
-</component>
-<component name="terminalsecurity_server" filter="s60" long-name="Terminal Control Server">
-<unit bldFile="mw/remotemgmt/terminalsecurity/server/group"/>
-</component>
-<component name="tcadapter" filter="s60" long-name="Terminal Control Adapter">
-<unit bldFile="mw/remotemgmt/terminalsecurity/tcadapter/bld"/>
-</component>
-<component name="terminalsecurity_build" filter="s60" long-name="Terminal Security Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/terminalsecurity/group"/>
-</component>
-</collection>
-<collection name="omaprovisioning" long-name="OMA Provisioning" level="specific">
-<component name="pnputil" filter="s60" long-name="PnP Util">
-<unit bldFile="mw/remotemgmt/omaprovisioning/pnputil/group"/>
-</component>
-<component name="provisioning" filter="s60" long-name="Provisioning">
-<unit bldFile="mw/remotemgmt/omaprovisioning/provisioning/group"/>
-</component>
-</collection>
-<collection name="devicediagnosticsfw" long-name="Device Diagnostics Framework" level="framework">
-<component name="diagframework" filter="s60" long-name="Diagnostics Framework">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
-</component>
-<component name="diagpluginbase" filter="s60" long-name="Diagnostics Plugin Base">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
-</component>
-<component name="diagresultsdb" filter="s60" long-name="Diagnostics Results Database">
-<!-- can only have one unit, merge or split into two components -->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
-</component>
-<component name="devicediagnosticsfw_build" filter="s60" long-name="Device Diagnostics Framework Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/group"/>
-</component>
-</collection>
-<collection name="dcmofw" long-name="Device Capability Management Object Framework" level="framework">
-<component name="dcmoclient" filter="s60" long-name="DCMO Client">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoclient/group"/>
-</component>
-<component name="dcmoserver" filter="s60" long-name="DCMO Server">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoserver/group"/>
-</component>
-<component name="dcmocustcmd" filter="s60" long-name="DCMO Custom Commands">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmocustcmd/group"/>
-</component>
-<component name="dcmofw_build" filter="s60" long-name="DCMO Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/dcmofw/group"/>
-</component>
-</collection>
-<collection name="fotaapplication" long-name="FOTA Application" level="generic">
-<component name="fotaapplication_build" filter="s60" long-name="FOTA Application Build">
-<!-- remove this component when configuration is in place and the #ifdefs have been worked out -->
-<unit bldFile="mw/remotemgmt/fotaapplication/group"/>
-</component>
-<component name="fotaserver" filter="s60" long-name="FOTA Server">
-<!-- uncomment when #ifdefs are resolved -->
-<!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
-</component>
-<component name="fotacustcmds" filter="s60" long-name="FOTA Custom Commands" class="placeholder">
-<!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
-<!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
-</component>
-</collection>
-</block>
-<block name="remoteconn" level="generic" long-name="Remote Connectivity" levels="plugin framework server generic specific">
-<collection name="remoteconn_info" long-name="Remote Connectivity Info" level="specific">
-<component name="remoteconn_metadata" long-name="Remote Connectivity Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mtptransports" long-name="MTP Transports" level="plugin">
-<component name="mtpusbtransport" long-name="MTP USB Transport" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpusbtransport/group" mrp="mw/remoteconn/mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
-</component>
-<component name="mtpptpiptransport" long-name="MTP PTP-IP Transport" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpptpiptransport/group" mrp="mw/remoteconn/mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
-</component>
-<component name="mtpcontroller" long-name="MTP Controller" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpcontroller/group" mrp="mw/remoteconn/mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
-</component>
-</collection>
-<collection name="mtpfws" long-name="MTP Frameworks" level="framework">
-<component name="mtpfw" long-name="MTP Framework" introduced="^2" purpose="optional">
-<unit bldFile="mw/remoteconn/mtpfws/mtpfw/group" mrp="mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/>
-</component>
-</collection>
-<collection name="mtpdataproviders" long-name="MTP Data Providers" level="generic">
-<component name="mtpfileandfolderdp" long-name="MTP File and Folder Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group" mrp="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
-</component>
-<component name="mtpimagedp" long-name="MTP Image Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpimagedp/group" mrp="mw/remoteconn/mtpdataproviders/mtpimagedp/group/mtp_imagedp.mrp"/>
-</component>
-<component name="mtppictbridgedp" long-name="MTP PictBridge Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group" mrp="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group/mtp_pictbridgedp.mrp"/>
-</component>
-</collection>
-<collection name="backupandrestore" long-name="Backup and Restore" level="specific">
-<component name="backupengine" long-name="Backup Engine" introduced="9.0" purpose="optional">
-<unit bldFile="mw/remoteconn/backupandrestore/backupengine/group" mrp="mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
-</component>
-<component name="backuptest" long-name="Backup Test" introduced="^2" purpose="development">
-<unit bldFile="mw/remoteconn/backupandrestore/backuptest/group" mrp="mw/remoteconn/backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
-</component>
-</collection>
-<collection name="obex" long-name="OBEX" level="generic">
-<component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexprotocol/group" mrp="mw/remoteconn/obex/obexprotocol/group/obex.mrp"/>
-</component>
-<component name="obexextensionapi" long-name="OBEX Extension API" introduced="9.2" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexextensionapi/group" mrp="mw/remoteconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
-</component>
-</collection>
-</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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<unit mrp="mw/srvdiscovery/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="dlnasrv" level="specific" long-name="DLNA Services" levels="stack server ctrl framework plugin">
-<!-- uncomment all the units when configuration is in place, they're currently #included from other xxx_build components -->
-<collection name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" level="plugin">
-<component name="upnp_media_server_settings_api" long-name="UPnP Media Server Settings API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_settings_api/group"/>
-</component>
-<component name="upnp_av_objects_api" long-name="UPnP A/V Objects API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_av_objects_api/group"/>
-</component>
-<component name="upnp_media_server_api" long-name="UPnP Media Server API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_api/group"/>
-</component>
-<component name="upnp_security_plugin_api" long-name="UPnP Security Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_security_plugin_api/group"/>
-</component>
-<component name="upnp_avcp_api" long-name="UPnP AVCP API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_avcp_api/group"/>
-</component>
-<component name="upnp_media_server_metadata_api" long-name="UPnP Media Server Metadata API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_metadata_api/group"/>
-</component>
-<component name="upnp_command_api" long-name="UPnP Command API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_command_api/group"/>
-</component>
-<component name="upnp_plugin_api" long-name="UPnP Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_plugin_api/group"/>
-</component>
-</collection>
-<collection name="upnpavcontrolpoint" long-name="UPnP A/V Control Point" level="plugin">
-<component name="avcontrolframework" filter="s60" long-name="A/V Control Famework" introduced="9.1" deprecated="^3">
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
-</component>
-<component name="upnpavcontrolpoint_build" filter="s60" long-name="UPnP A/V Control Point Build" introduced="9.1" deprecated="^3">
-<!-- put exports in other component instead -->
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/group"/>
-</component>
-</collection>
-<collection name="upnpmediaserver" long-name="UPnP Media Server" level="server">
-<component name="avobjects" filter="s60" long-name="A/V Objects">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/avobjects/group"/>
-</component>
-<component name="mediaserverclient" filter="s60" long-name="Media Server Client">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverclient/group"/>
-</component>
-<component name="connectionmanagerservice" filter="s60" long-name="Connection Manager Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/connectionmanagerservice/group"/>
-</component>
-<component name="contentdirectoryservice" filter="s60" long-name="Content Directory Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/contentdirectoryservice/group"/>
-</component>
-<component name="mediaserverengine" filter="s60" long-name="Media Server Engine">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverengine/group"/>
-</component>
-<component name="upnpmediaserver_build" filter="s60" long-name="UPnP Media Server Build">
-<!-- move exports into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpmediaserver/group"/>
-</component>
-</collection>
-<collection name="upnpavcontroller" long-name="UPnP A/V Controller" level="ctrl">
-<component name="upnpxmlparser" filter="s60" long-name="UPnP XML Parser" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpxmlparser/group"/>
-</component>
-<component name="upnpavcontrollerserver" filter="s60" long-name="UPnP A/V Controller Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerserver/group"/>
-</component>
-<component name="upnpavcontrollerclient" filter="s60" long-name="UPnP A/V Ccontroller Client" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerclient/group"/>
-</component>
-<component name="upnpavcontrollerhelper" filter="s60" long-name="UPnP A/V Controller Helper" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerhelper/group"/>
-</component>
-<component name="upnpavcontroller_build" filter="s60" long-name="UPnP A/V Controller Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpavcontroller/group"/>
-</component>
-</collection>
-<collection name="upnpframework" long-name="UPnP Framework" level="framework">
-<component name="upnputilities" filter="s60" long-name="UPnP Utilities" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnputilities/group"/>
-</component>
-<component name="upnpextensionpluginif" filter="s60" long-name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpextensionpluginif/group"/> -->
-</component>
-<component name="upnpfiletransferengine" filter="s60" long-name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>-->
-</component>
-<component name="upnpcommonui" filter="s60" long-name="UPnP Common UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpcommonui/group"/>-->
-</component>
-<component name="upnpaiwengine" filter="s60" long-name="UPnP AIW Engine" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpaiwengine/group"/> -->
-</component>
-<component name="upnpaiwprovider" filter="s60" long-name="UPnP AIW Provider" introduced="^2" deprecated="^3" plugin="Y">
-<!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
-</component>
-<component name="upnpmusicadapter" filter="s60" long-name="UPnP Music Adapter" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
-</component>
-<component name="upnpcommand" filter="s60" long-name="UPnP Command" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpcommand/group"/>
-</component>
-<component name="upnpframework_build" filter="s60" long-name="UPnP Framework Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpframework/group"/>
-</component>
-</collection>
-<collection name="upnpsettings" long-name="UPnP Settings" level="framework">
-<component name="upnpsettingsengine" filter="s60" long-name="UPnP Settings Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
-</component>
-<component name="multiselectionui" filter="s60" long-name="Multi-Selection UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/multiselectionui/group"/>-->
-</component>
-<component name="appwizard" filter="s60" long-name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/appwizard/group"/>-->
-</component>
-<component name="upnpsharingui" filter="s60" long-name="UPnP Sharing UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
-</component>
-<component name="upnpgsplugin" filter="s60" long-name="UPnP GS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
-</component>
-<component name="upnpsettings_build" filter="s60" long-name="UPnP Settings Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsettings/group"/>
-</component>
-</collection>
-<collection name="upnpsharing" long-name="UPnP Sharing" level="server">
-<component name="upnpdlnaprofiler" filter="s60" long-name="UPnP DLNA Profiler" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpdlnaprofiler/group"/>
-</component>
-<component name="upnpsecurity" filter="s60" long-name="UPnP Security" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpsecurity/group"/>
-</component>
-<component name="upnpcontentserver" filter="s60" long-name="UPnP Content Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpcontentserver/group"/>
-</component>
-<component name="applicationengine" filter="s60" long-name="UPnP Application Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/applicationengine/group"/>
-</component>
-<component name="upnpsharing_build" filter="s60" long-name="UPnP Sharing Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsharing/group"/>
-</component>
-</collection>
-<collection name="upnpmpxplugins" long-name="UPnP MPX Plugins" level="plugin">
-<component name="upnpplaybackplugins" filter="s60" long-name="UPnP Playback Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/upnpplaybackplugins/group"/>
-</component>
-<component name="upnpmpxplugins_build" filter="s60" long-name="UPnP MPX Plugins Build" introduced="^2">
-<!-- move exports content into other component? -->
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/group"/>
-</component>
-</collection>
-<collection name="upnpharvester" long-name="UPnP Harvester" level="ctrl">
-<component name="upnpharvester_common" filter="s60" long-name="UPnP Harvester Common" introduced="^2" deprecated="^3" class="placeholder">
-<!-- need to merge or #include these to a single bld.inf -->
-<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
- <unit bldFile="upnpharvester/common/cmsettings/group"/>
- <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
- <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
-</component>
-<component name="cdssync" filter="s60" long-name="CDS Sync" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
-</component>
-<component name="mdhserver" filter="s60" long-name="Metadata Harvester Server" introduced="^2" deprecated="^3" class="placeholder">
-<!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
-</component>
-<component name="upnpharvester_build" filter="s60" long-name="UPnP Harvester Build" introduced="^2" deprecated="^3" class="placeholder">
-<!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
-<!--<unit bldFile="upnpharvester/group"/>-->
-</component>
-</collection>
-<collection name="homesync" long-name="Home Sync" level="plugin">
-<component name="contentmanager" filter="s60" long-name="Content Manager" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homesync/group"/>-->
-<!-- move bld.inf into contentmanager dir -->
-</component>
-</collection>
-<collection name="homemedia" long-name="Home Media" level="framework">
-<!-- collection is really just a component. Move down a directory -->
-<component name="homemedia_build" filter="s60" long-name="Home Media" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homemedia/group"/> -->
-</component>
-</collection>
-<collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin">
-<component name="dlnasrv_build" filter="s60" long-name="DLNA Services Build">
-<!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed -->
-<unit bldFile="mw/dlnasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="btservices" level="generic" long-name="Bluetooth Services" levels="framework server generic specific plugin">
-<collection name="btservices_pub" long-name="BT Services Public Interfaces" level="plugin">
-<component name="bluetooth_power_state_api" long-name="Bluetooth Power State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_power_state_api/group"/>
-</component>
-<component name="bluetooth_notifier_api" long-name="Bluetooth Notifier API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_notifier_api/group"/>
-</component>
-</collection>
-<collection name="btservices_plat" long-name="BT Services Platform Interfaces" level="plugin">
-<component name="bluetooth_dosserver_audio_api" long-name="Bluetooth DOS Server Audio API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dosserver_audio_api/group"/>
-</component>
-<component name="bluetooth_dut_mode_api" long-name="Bluetooth DUT Mode API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dut_mode_api/group"/>
-</component>
-<component name="bluetooth_engine_api" long-name="Bluetooth Engine API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-<component name="bluetooth_local_variation_api" long-name="Bluetooth Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_local_variation_api/group"/>
-</component>
-<component name="bluetooth_notifier_internal_api" long-name="Bluetooth Notifier internal API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_notifier_internal_api/group"/>
-</component>
-<component name="bluetooth_sap_connection_state_api" long-name="Bluetooth SAP Connection State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_sap_connection_state_api/group"/>
-</component>
-<component name="bluetooth_secondary_display_notification_api" long-name="Bluetooth Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_secondary_display_notification_api/group"/>
-</component>
-</collection>
-<collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
-<component name="bteng" filter="s60" long-name="Bluetooth Engine">
-<unit bldFile="mw/btservices/bluetoothengine/bteng/group"/>
-</component>
-<component name="btnotif" filter="s60" long-name="Bluetooth Notifier">
-<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"/>
-</component>
-<component name="btmac" filter="s60" long-name="Bluetooth Mono Audio Controller" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btmac/group"/>
-</component>
-<component name="btsac" filter="s60" long-name="Bluetooth Stereo Audio Controller" plugin="Y">
-<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"/>
-</component>
-<component name="btsap" filter="s60" long-name="Bluetooth SIM Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btsap/group"/>
-</component>
-<component name="btui" filter="s60" long-name="Bluetooth UI">
-<unit bldFile="mw/btservices/bluetoothengine/btui/group"/>
-</component>
-<component name="btpbap" filter="s60" long-name="Bluetooth Phonebook Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btpbap/group"/>
-</component>
-<component name="bthid" filter="s60" long-name="Bluetooth HID">
-<unit bldFile="mw/btservices/bluetoothengine/bthid/group"/>
-</component>
-<component name="btctrldcmoadapter" filter="s60" long-name="Bluetooth Control DCMO Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btctrldcmoadapter/group"/>
-</component>
-</collection>
-<collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
-<component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
-<unit bldFile="mw/btservices/bluetoothappprofiles/avrcp" mrp="mw/btservices/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
-</component>
-</collection>
-<collection name="atcommands" long-name="AT Commands" level="generic">
-<component name="modematplugin" long-name="Modem AT Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/modematplugin/group"/>
-</component>
-<component name="lccustomplugin" long-name="LC Custom Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/lccustomplugin/group"/>
-</component>
-</collection>
-<collection name="btservices_info" long-name="BT Services Info" level="plugin">
-<component name="btservices_metadata" long-name="BT Services Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usbservices" level="generic" long-name="USB Services" levels="framework server generic specific plugin">
-<collection name="usbservices_plat" long-name="USB Services Platform Interfaces" level="plugin">
-<component name="pictbridge_api" long-name="PictBridge API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/pictbridge_api/group"/>
-</component>
-<component name="ptp_responder_api" long-name="PTP Responder API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_responder_api/group"/>
-</component>
-<component name="ptp_transport_api" long-name="PTP Transport API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_transport_api/group"/>
-</component>
-<component name="usb_device_control_plugin_api" long-name="USB Device Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_device_control_plugin_api/group"/>
-</component>
-<component name="usb_notifier_api" long-name="USB Notifier API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_notifier_api/group"/>
-</component>
-<component name="usb_personality_api_header" long-name="USB Personality API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_api_header/group"/>
-</component>
-<component name="usb_personality_plugin_api" long-name="USB Personality Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_plugin_api/group"/>
-</component>
-<component name="usb_secondary_display_api" long-name="USB Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_secondary_display_api/group"/>
-</component>
-<component name="usb_watcher_api" long-name="USB Watcher API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_api/group"/>
-</component>
-<component name="usb_watcher_info_api_header" long-name="USB Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_info_api_header/group"/>
-</component>
-</collection>
-<collection name="usbengines" long-name="USB Engines" level="generic">
-<component name="usbotgwatcher" filter="s60" long-name="USB OTG Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbotgwatcher/group"/>
-</component>
-<component name="usbwatcher" filter="s60" long-name="USB Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbwatcher/group"/>
-</component>
-<component name="usblocodplugin" filter="s60" long-name="USB Local Connectivity Domain Plugin" plugin="Y">
-<unit bldFile="mw/usbservices/usbengines/usblocodplugin/group"/>
-</component>
-<component name="usbdevcon" filter="s60" long-name="USB Device Control">
-<unit bldFile="mw/usbservices/usbengines/usbdevcon/group"/>
-</component>
-<component name="usbremotepersonality" filter="s60" long-name="USB Remote Personality">
-<unit bldFile="mw/usbservices/usbengines/usbremotepersonality/group"/>
-</component>
-</collection>
-<collection name="usbclasses" long-name="USB Classes" level="framework">
-<component name="usbobexclasscontroller" filter="s60" long-name="USB OBEX Class Controller" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbobexclasscontroller/group"/>
-</component>
-<component name="usbbasicpersonality" filter="s60" long-name="USB Basic Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbbasicpersonality/group"/>
-</component>
-<component name="usbmscpersonality" filter="s60" long-name="USB MSC Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbmscpersonality/group"/>
-</component>
-<!-- commented out in bld.inf. Should this be deleted?
- <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
- <unit bldFile="usbclasses/ptpstack/group"/>
- </component>
- <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
- <unit bldFile="usbclasses/sicdusbplugin/group"/>
- </component>
- <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
- <unit bldFile="usbclasses/ptpserver/group"/>
- </component>-->
-<component name="pictbridgeengine" filter="s60" long-name="PictBridge Engine">
-<unit bldFile="mw/usbservices/usbclasses/pictbridgeengine/group"/>
-</component>
-<component name="usbphoneasmodem" filter="s60" long-name="USB Phone as Modem" introduced="^3">
-<unit bldFile="mw/usbservices/usbclasses/usbphoneasmodem/group"/>
-</component>
-</collection>
-<collection name="usbuis" long-name="USB UIs" level="specific">
-<component name="usbui" filter="s60" long-name="USB UI">
-<unit bldFile="mw/usbservices/usbuis/usbui/group"/>
-</component>
-<component name="usbuinotif" filter="s60" long-name="USB UI Notifiers">
-<unit bldFile="mw/usbservices/usbuis/usbuinotif/group"/>
-</component>
-<component name="imageprintuiprovider" filter="s60" long-name="ImagePrint UI Provider" plugin="Y">
-<unit bldFile="mw/usbservices/usbuis/imageprintuiprovider/group"/>
-</component>
-<component name="usbimageprintui" filter="s60" long-name="ImagePrint UI">
-<unit bldFile="mw/usbservices/usbuis/imageprintui/group"/>
-</component>
-<component name="usbuiqt" long-name="USB UI Qt" introduced="^4" filter="s60">
-<unit bldFile="mw/usbservices/usbuis/usbuiqt" proFile="usbapplication.pro"/>
-</component>
-</collection>
-<collection name="usbservices_test" long-name="USB Services Test" level="server"/>
-</block>
-<block name="shortlinkconn" level="generic" long-name="Shortlink Connectivity" levels="framework server generic specific plugin">
-<!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
-<collection name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" level="plugin">
-<component name="obex_service_utils_api" long-name="OBEX Service Utils API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_utils_api/group"/>
-</component>
-<component name="obex_service_plugin_api" long-name="OBEX Service Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_plugin_api/group"/>
-</component>
-<component name="dialup_connection_status_api" long-name="Dial-up Connection Status API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dialup_connection_status_api/group"/>
-</component>
-<component name="dun_secondary_display_notification_api" long-name="DUN Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
-</component>
-<component name="obex_secondary_display_notification_api" long-name="OBEX Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
-</component>
-<component name="generic_hid_api" long-name="Generic HID API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/generic_hid_api/group"/>
-</component>
-<component name="locod_bearer_plugin_api" long-name="Locod Bearer Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/locod_bearer_plugin_api/group"/>
-</component>
-<component name="usb_obexservicemanager_client_api" long-name="USB OBEX Service Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_obexservicemanager_client_api/group"/>
-</component>
-</collection>
-<collection name="localconnectivityservice" long-name="Local Connectivity Service" level="server">
-<component name="locod" long-name="Local Connectivity Daemon">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/locod/group"/>
-</component>
-<component name="obexserviceman" long-name="OBEX Service Managar">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
-</component>
-<component name="obexsendservices" long-name="OBEX Send Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
-</component>
-<component name="obexreceiveservices" long-name="OBEX Receive Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
-</component>
-<component name="dun" long-name="Dial Up Networking">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/dun/group"/>
-</component>
-<component name="lcstylustap" long-name="LC Stylus Tap Plugins" plugin="Y">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/lcstylustap/group"/>
-</component>
-<component name="generichid" long-name="Generic HID">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/generichid/group"/>
-</component>
-<component name="headset" long-name="Headset">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/headset/group"/>
-</component>
-</collection>
-</block>
-<block name="imghandling" level="specific" long-name="Image Handling" levels="lib util if">
-<collection name="imagehandling_plat" long-name="Image Handling Platform Interfaces" level="if">
-<component name="image_handling_library_api" long-name="Image Handling Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
-</component>
-<component name="3gp_library_api" long-name="3GP Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
-</component>
-<component name="thumbnailmanager_api" long-name="Thumbnail Manager API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagehandlinglib" long-name="Image Handling Library" level="lib">
-<!-- collection is really a component, need to move down a directory -->
-<component name="ihl" filter="s60" long-name="IHL">
-<unit bldFile="mw/imghandling/imagehandlinglib/group"/>
-</component>
-</collection>
-<collection name="imagehandlingutilities" long-name="Image Handling Utilities" level="util">
-<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager">
-<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
-</component>
-<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager Qt" introduced="^4">
-<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt" filter="!test" proFile="thumbnailmanagerqt.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</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">
-<unit bldFile="mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
-</component>
-</collection>
-</block>
-<block name="mds" level="specific" long-name="Metadata Services" levels="mgr eng server int">
-<collection name="mds_plat" long-name="Metadata Services Platform Interfaces" level="int">
-<component name="context_engine_plugin_api" long-name="Context Engine Plugin API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/group" filter="!test"/>
-</component>
-<component name="harvester_framework_api" long-name="Harvester Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/harvester_framework_api/group" filter="!test"/>
-<!-- can only have one unit with the same filter, #include the following from the previous unit -->
-</component>
-<component name="location_manager_api" long-name="Location Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/location_manager_api/group" filter="!test"/>
-</component>
-<component name="metadata_engine_api" long-name="Metadata Engine API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/metadata_engine_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_collection_manager_api" long-name="Content Listing Framework Collection Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_extended_api" long-name="Content Listing Framework Extended API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_extended_api/group"/>
-</component>
-</collection>
-<collection name="mds_pub" long-name="Metadata Services Public Interfaces" level="int">
-<component name="content_listing_framework_api" long-name="Content Listing Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_pub/content_listing_framework_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="metadataengine" long-name="Metadata Engine" level="eng">
-<component name="metadataengine_common" filter="s60" long-name="Metadata Engine Common" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/common/group"/>
-</component>
-<component name="metadataengine_server" filter="s60" long-name="Metadata Engine Server" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/server/group"/>
-</component>
-<component name="metadataengine_client" filter="s60" long-name="Metadata Engine Client" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/client/group"/>
-</component>
-<component name="metadataengine_build" filter="s60" long-name="Metadata Engine Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/metadataengine/group"/>
-</component>
-</collection>
-<collection name="locationmanager" long-name="Location Manager" level="mgr">
-<component name="locationtrail" filter="s60" long-name="Location Trail" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/locationtrail/group"/>
-</component>
-<component name="locationmanager_server" filter="s60" long-name="Location Manager Server" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/server/group"/>
-</component>
-<component name="locationmanager_client" filter="s60" long-name="Location Manager Client" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/client/group"/>
-</component>
-<component name="locationmanager_build" filter="s60" long-name="Location Manager Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/locationmanager/group"/>
-</component>
-</collection>
-<collection name="contextengine" long-name="Context Engine" level="eng">
-<component name="contextengine_plugins" filter="s60" long-name="Context Engine Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/contextengine/plugins/group"/>
-</component>
-<component name="contextengine_build" filter="s60" long-name="Context Engine Build" introduced="^2">
-<!--make this collection a single component, or make this unit self-contained -->
-<unit bldFile="mw/mds/contextengine/group"/>
-</component>
-</collection>
-<collection name="harvester" long-name="Harvester" level="eng">
-<component name="blacklistclient" filter="s60" long-name="Blacklist Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistclient/group"/>
-</component>
-<component name="blacklistserver" filter="s60" long-name="Blacklist Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistserver/group"/>
-</component>
-<component name="harvester_common" filter="s60" long-name="Harvester Common" introduced="^2">
-<unit bldFile="mw/mds/harvester/common/group"/>
-</component>
-<component name="composerplugins" filter="s60" long-name="Composer Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/composerplugins/group"/>
-</component>
-<component name="harvesterplugins" filter="s60" long-name="Harvester Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/harvesterplugins/group"/>
-</component>
-<component name="monitorplugins" filter="s60" long-name="Monitor Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/monitorplugins/group"/>
-</component>
-<component name="harvester_server" filter="s60" long-name="Harvester Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/server/group"/>
-</component>
-<component name="harvester_client" filter="s60" long-name="Harvester Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/client/group"/>
-</component>
-<component name="harvester_build" filter="s60" long-name="Harvester Build" introduced="^2">
-<!-- split these exports into the other components -->
-<unit bldFile="mw/mds/harvester/group"/>
-</component>
-</collection>
-<collection name="watchdog" long-name="Watchdog" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="mdswatchdog" filter="s60" long-name="Metadata Watchdog" introduced="^2">
-<unit bldFile="mw/mds/watchdog/group"/>
-</component>
-</collection>
-<collection name="clfwrapper" long-name="Content Listing Framework Wrapper" level="int">
-<!-- collection is really a component. Move down a directory -->
-<component name="clfwrapper_build" filter="s60" long-name="CLF Wrapper Build" introduced="^2" class="placeholder">
-<!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
-<!--<unit bldFile="clfwrapper/group"/>-->
-</component>
-</collection>
-<collection name="mds_info" long-name="Metadata Services Info" level="int">
-<component name="mds_build" filter="s60" long-name="Metadata Services Build" introduced="^2">
-<!-- consider distributiing this into the rest of the components in the package -->
-<unit bldFile="mw/mds/group"/>
-</component>
-</collection>
-</block>
-<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"/>
-</component>
-<component name="videoconnutility_api" long-name="Video Connection Utility API" filter="s60" class="api">
-<unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/group"/>
-</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"/>
-</component>
-</collection>
-<collection name="videoscheduler" long-name="Video Scheduler" level="util">
-<component name="schedulerclient" filter="s60" long-name="Video Scheduler Client">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerclient/group"/>
-</component>
-<component name="schedulerserver" filter="s60" long-name="Video Scheduler Server">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerserver/group"/>
-</component>
-</collection>
-<collection name="videoconnutility" long-name="Video Connection Utility" level="util">
-<component name="connutilpsworker" filter="s60" long-name="Connection Utility Publish and Subscribe Worker">
-<unit bldFile="mw/videoutils/videoconnutility/connutilpsworker/group"/>
-</component>
-<component name="video_connutility" filter="s60" long-name="Video Connection Utility">
-<unit bldFile="mw/videoutils/videoconnutility/connutility/group"/>
-</component>
-</collection>
-<collection name="videoutils_info" long-name="Video Utils Info" level="if"/>
-</block>
-<block name="mmmw" level="generic" long-name="Multimedia Middleware" levels="plugin framework server generic specific">
-<collection name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" level="specific">
-<component name="multimedia_data_source_api" long-name="Multimedia Data Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
-</component>
-<component name="progressive_download_api" long-name="Progressive Download API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/progressive_download_api/group"/>
-</component>
-<component name="equalizer_ui_api" long-name="Equalizer UI API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
-</component>
-<component name="enhanced_media_client_api" long-name="Enhanced Media Client API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
-</component>
-<component name="stream_control_custom_command_api" long-name="Stream Control Custom Command API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
-</component>
-<component name="emc_buffer_source_api" long-name="EMC Buffer Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_buffer_source_api/group"/>
-</component>
-<component name="emc_file_source_api" long-name="EMC File Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
-</component>
-<component name="audio_metadata_reader_api" long-name="Audio MetaData Reader API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
-</component>
-<component name="emc_progressive_download_source_api" long-name="EMC Progressive Download Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
-</component>
-<component name="emc_volume_effect_api" long-name="EMC Volume Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
-</component>
-<component name="emc_balance_effect_api" long-name="EMC Balance Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_balance_effect_api/group"/>
-</component>
-<component name="emc_descriptor_source_api" long-name="EMC Descriptor Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_descriptor_source_api/group"/>
-</component>
-<component name="emc_drm_config_intfc_api" long-name="EMC DRM Config Intfc API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
-</component>
-<component name="voip_audio_services_api" long-name="VoIP Audio Services" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/group"/>
-</component>
-<component name="configuration_components_factory_api" long-name="Configuration Components Factory API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
-</component>
-<component name="audio_output_control_utility_api" long-name="Audio Output Control Utility API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/group"/>
-</component>
-<component name="audio_output_control_utility_proxy_api" long-name="Audio Output Control Utility Proxy API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
-</component>
-<component name="emc_audio_effects_api" long-name="EMC Audio Effects API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
-</component>
-<component name="call_audio_control_api" long-name="Call AudioControl API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/group"/>
-</component>
-<component name="radio_utilities_api" long-name="Radio Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/group"/>
-</component>
-<component name="radio_preset_utilities_api" long-name="Radio Preset Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
-</component>
-<component name="radio_monitor_api" long-name="Radio Monitor API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
-</component>
-<component name="thumbnail_engine_api" long-name="Thumbnail Engine API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/thumbnail_engine_api/group"/>
-</component>
-<component name="telephony_multimedia_service_api" long-name="Telephony Multimedia Service API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
-</component>
-<component name="openmax_al_api" long-name="OpenMAX AL API" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/openmax_al_api/group"/>
-</component>
-</collection>
-<collection name="mmfenh" long-name="MMF Enhancements" level="generic">
-<component name="advancedaudiocontroller" filter="s60" long-name="Advanced Audio Controllers" plugin="Y">
-<unit bldFile="mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
-</component>
-<component name="audiooutputcontrolutility" filter="s60" long-name="Audio Output Control Utility">
-<unit bldFile="mw/mmmw/mmfenh/audiooutputcontrolutility/group"/>
-</component>
-<component name="configurationcomponentsfactory" filter="s60" long-name="Configuration Components Factory">
-<unit bldFile="mw/mmmw/mmfenh/configurationcomponentsfactory/group"/>
-</component>
-<component name="enhancedaudioplayerutility" filter="s60" long-name="Enhanced Audio Player Utility">
-<unit bldFile="mw/mmmw/mmfenh/enhancedaudioplayerutility/group"/>
-</component>
-<component name="enhancedmediaclient" filter="s60" long-name="Enhanced Media Client">
-<unit bldFile="mw/mmmw/mmfenh/enhancedmediaclient/group"/>
-</component>
-<component name="profilesettingsmonitor" filter="s60" long-name="Profile Settings Monitor">
-<unit bldFile="mw/mmmw/mmfenh/profilesettingsmonitor/group"/>
-</component>
-<component name="progressivedownload" filter="s60" long-name="Progressive Download">
-<unit bldFile="mw/mmmw/mmfenh/progressivedownload/group"/>
-</component>
-</collection>
-<collection name="mm_fw" long-name="Multimedia Frameworks" level="framework">
-<!-- Id needs to be unique, mmfw already in use -->
-<!-- Placeholder for OpenAX AL and other stuff -->
-</collection>
-<collection name="mmserv" long-name="Multimedia Services" level="specific">
-<component name="audioeffectsui" filter="s60" long-name="Audio Effects UI">
-<unit bldFile="mw/mmmw/mmserv/audioeffectsui/group"/>
-</component>
-<component name="callaudiocontrol" filter="s60" long-name="Call Audio Control">
-<unit bldFile="mw/mmmw/mmserv/callaudiocontrol/group"/>
-</component>
-<component name="metadatautility" filter="s60" long-name="Metadata Utility">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/group"/>
-</component>
-<component name="radioutility" filter="s60" long-name="Radio Utility">
-<unit bldFile="mw/mmmw/mmserv/radioutility/group"/>
-</component>
-<component name="thumbnailengine" filter="s60" long-name="Thumbnail Engine" introduced="^2">
-<unit bldFile="mw/mmmw/mmserv/thumbnailengine/group"/>
-</component>
-<component name="tms" filter="s60" long-name="Telephony Multimedia Service" introduced="^3">
-<unit bldFile="mw/mmmw/mmserv/tms/group"/>
-</component>
-<component name="voipaudioservices" filter="s60" long-name="VoIP Audio Services">
-<unit bldFile="mw/mmmw/mmserv/voipaudioservices/group"/>
-</component>
-<component name="lib3gpextparser" filter="s60" long-name="3GP Extension Metadata Parser Library">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group" filter="sf_build"/>
-</component>
-</collection>
-<collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
-<component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="helix" level="generic" long-name="Helix" levels="plugin framework server generic specific">
-<collection name="helix_ren" long-name="Helix Engine" level="framework">
-<!-- what does "ren" stand for? -->
-<component name="helix_stub" filter="s60" long-name="Helix Stub" introduced="^2" class="api">
-<unit bldFile="mw/helix/helix_ren/helix_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="camerasrv" level="specific" long-name="Camera Services" levels="plugin fw api">
-<collection name="camerasrv_plat" long-name="Camera Services Platform Interfaces" level="api">
-<component name="media_recorder_sink_api" long-name="Media Recorder Sink API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
-</component>
-<component name="cae_extentension_api" long-name="CAE Extension API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/cae_extentension_api/group"/>
-</component>
-<component name="camera_application_engine_api" long-name="Camera Application Engine API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/camera_application_engine_api/group" filter="!test"/>
-</component>
-<component name="custom_onboard_camera_api" long-name="Custom Onboard Camera API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
-</component>
-<component name="imaging_configuration_manager_api" long-name="Imaging Configuration Manager API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
-</component>
-<component name="media_recorder_api" long-name="Media Recorder API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_api/group" filter="!test"/>
-</component>
-<component name="3gp_file_composer_api" long-name="3GP File Composer API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
-</component>
-</collection>
-<collection name="camcordermmfplugin" long-name="Camcorder MMF Plugin" level="plugin">
-<!-- collection is really a component. Should move down a directory -->
-<component name="camcordermmfplugin_build" filter="s60" long-name="Camcorder MMF Plugin Build" plugin="Y">
-<unit bldFile="mw/camerasrv/camcordermmfplugin/build"/>
-</component>
-</collection>
-<collection name="configmanagers" long-name="Config Managers" level="api">
-<component name="imagingconfigmanager" filter="s60" long-name="Imaging Config Manager">
-<unit bldFile="mw/camerasrv/configmanagers/imagingconfigmanager/group"/>
-</component>
-</collection>
-<collection name="camerasrv_info" long-name="Camera Services Info" level="api">
-<component name="camerasrv_build" filter="s60" long-name="Camera Services Build">
-<!-- should split into individual bld.infs -->
-<unit bldFile="mw/camerasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="mmappfw" level="specific" long-name="Multimedia App Framework" levels="fw utils if">
-<collection name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" level="if">
-<component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interfaces Build" introduced="^1" filter="s60">
-<!-- this is no longer necessary when confguration is put in place -->
-<unit bldFile="mw/mmappfw/mmappfw_plat"/>
-</component>
-<component name="collection_helper_api" long-name="Collection Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
-</component>
-<component name="harvester_collection_mediator_api" long-name="Harvester Collection Mediator API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/group"/>
-</component>
-<component name="harvester_metadata_extractor_api" long-name="Harvester Metadata Extractor API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/group"/>
-</component>
-<component name="harvester_server_api" long-name="Harvester Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_server_api/group"/>
-</component>
-<component name="harvester_utility_api" long-name="Harvester Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_utility_api/group"/>
-</component>
-<component name="playlist_engine_api" long-name="Playlist Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playlist_engine_api/group"/>
-</component>
-<component name="mtp_keys_api" long-name="MTP Keys API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mtp_keys_api/group"/>
-</component>
-<component name="mpx_collection_common_definition_api" long-name="MPX Collection Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_common_definition_api/group"/>
-</component>
-<component name="mpx_collection_utility_api" long-name="MPX Collection Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/group"/>
-</component>
-<component name="mpx_common_api" long-name="MPX Common API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_api/group"/>
-</component>
-<component name="mpx_common_definition_api" long-name="MPX Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_common_definition_api" long-name="MPX Playback Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_utility_api" long-name="MPX Playback Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/group"/>
-</component>
-<component name="mpx_base_view_plugins_api" long-name="MPX Base View Plugins API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/group"/>
-</component>
-<component name="mpx_view_utility_api" long-name="MPX View Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_view_utility_api/group"/>
-</component>
-<component name="mpx_albumart_utility_api" long-name="MPX Album Art Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/group"/>
-</component>
-<component name="media_player_settings_engine_api" long-name="Media Player Settings Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
-</component>
-<component name="mpx_backstepping_utility_api" long-name="MPX Backstepping Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_backstepping_utility_api/group"/>
-</component>
-<component name="asx_parser_api" long-name="ASX Parser API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/asx_parser_api/group"/>
-</component>
-<component name="playback_helper_api" long-name="Playback Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playback_helper_api/group"/>
-</component>
-<component name="videoplaylist_utility_api" long-name="Video Playlist Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/videoplaylist_utility_api/group"/>
-</component>
-</collection>
-<collection name="mpx" long-name="Multimedia Player" level="fw">
-<component name="commonframework" filter="s60" long-name="MPX Common Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/commonframework/group"/>
-</component>
-<component name="playbackframework" filter="s60" long-name="MPX Playback Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/playbackframework/group"/>
-</component>
-<component name="mpxcollectionfw" filter="s60" long-name="MPX Collection Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/collectionframework/group"/>
-</component>
-<component name="mpxviewfw" filter="s60" long-name="MPX View Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/viewframework/group"/>
-</component>
-<component name="mpxviewframeworkqt" long-name="MPX View Framework Qt" filter="s60">
-<unit bldFile="mw/mmappfw/mpx/mpxviewframeworkqt" proFile="mpxviewframeworkqt.pro" qmakeArgs="-r -config rom"/>
-</component>
-<component name="mpx_build" filter="s60" long-name="MPX Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/mpx/group"/>
-</component>
-</collection>
-<collection name="mmappcomponents" long-name="Multimedia App Components" level="utils">
-<component name="mmappcomponents_build" filter="s60" long-name="Multimedia App Components Build" introduced="^1">
-<!-- needed for #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
- Can remove this once configuration is in place-->
-<unit bldFile="mw/mmappfw/mmappcomponents/group"/>
-</component>
-<component name="collectionhelper" filter="s60" long-name="Media Player Collection Helper" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/collectionhelper/group"/>
-</component>
-<component name="playlistengine" filter="s60" long-name="Playlist Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/playlistengine/group"/>
-</component>
-<component name="mpxharvester" filter="s60" long-name="Media Player Harvester" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/harvester/group"/>
-</component>
-<component name="mmappcommonui" filter="s60" long-name="Multimedia App Common UI" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmappcommonui/group"/>
-</component>
-<component name="mediaplayersettingsengine" filter="s60" long-name="Media Player Settings Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
-</component>
-<component name="audiofetcher" filter="s60" long-name="Audio Fetcher" introduced="^1" plugin="Y">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
-</component>
-<component name="asxparser" filter="s60" long-name="ASX Parser" introduced="^1">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
-</component>
-<component name="playbackhelper" filter="s60" long-name="Playback Helper" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/playbackhelper/group"/>
-</component>
-<component name="videoplaylistutility" filter="s60" long-name="Video Playlist Utility" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/videoplaylistutility/group"/>
-</component>
-<component name="mmmtpdataprovider" filter="s60" long-name="Multimedia MTP Data Provider" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmmtpdataprovider/group"/>
-</component>
-</collection>
-<collection name="mmappfw_info" long-name="Multimedia App Framework Info" level="if">
-<component name="mmappfw_build" filter="s60" long-name="Multimedia App Framework Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/group"/>
-</component>
-<component name="mmappfw_test" filter="s60,test,api_test,pref_test" long-name="Multimedia App Framework Test" purpose="development" introduced="^1"/>
-</collection>
-</block>
-<block name="hgwidgets" level="specific" long-name="HG Widgets" levels="framework service api">
-<collection name="hgwidgets_pub" long-name="HG Widgets Platform Interfaces" level="api">
-<component name="ganeswidgets_api" long-name="Ganes Widgets API" introduced="^4" class="api placeholder">
-<!-- should separate out unit -->
-</component>
-</collection>
-<collection name="hgwidgets_pub" long-name="HG Widgets Public Interfaces" level="api"/>
-<collection name="ganeswidgets" long-name="Ganes Widgets" level="service">
-<!-- really a component, should move down a dir level and have a unit -->
-<component name="ganeswidgets_build" long-name="Ganes Widgets Build" introduced="^4" class="placeholder">
-<!-- should separate out unit -->
-</component>
-</collection>
-<collection name="hgwidgets_info" long-name="HG Widgets Info" level="framework">
-<component name="hgwidgets_build" long-name="HG Widgets Build" introduced="^4">
-<unit bldFile="mw/hgwidgets" proFile="hgwidgets.pro"/>
-</component>
-</collection>
-</block>
-<block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework api">
-<collection name="inputmethods_pub" long-name="Input Methods Public Interfaces" level="api">
-<component name="ptiengine_iti_api" long-name="PTI Engine API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
-</component>
-<component name="optical_character_recognition_api" long-name="Optical Character Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
-</component>
-<component name="input_language_info_api" long-name="Input Language Info API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
-</component>
-</collection>
-<collection name="inputmethods_plat" long-name="Input Methods Platform Interfaces" level="api">
-<component name="pen_input_server_api" long-name="Pen Input Server API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/group" filter="!test"/>
-</component>
-<component name="ptiengine_hwr_api" long-name="PTI Engine Handwriting Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group" filter="!test"/>
-</component>
-<component name="aknfep_settings_api" long-name="Avkon FEP Settings API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
-</component>
-<component name="aknfep_status_api" long-name="Avkon FEP Status API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
-</component>
-<component name="ptiengine_key_definations_api" long-name="PTI Engine Key Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
-</component>
-<component name="aknfep_definitions_api" long-name="Avkon FEP Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
-</component>
-<component name="aknfep_pen_support_api" long-name="Avkon FEP Pen Support API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
-</component>
-<component name="ptiengine_indic_definitions_api" long-name="PTI Engine Indic Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
-</component>
-<component name="aknfep_uiinterface_api" long-name="Avkon FEP UI Interface API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="textinput" long-name="Text Input" level="framework">
-<component name="ptienginev2" filter="s60" long-name="Predictive Text Input Engine">
-<!--uncomment when configuration is turned on and textinput_build is removed-->
-<!-- <unit bldFile="textinput/ptienginev2/group"/>-->
-</component>
-<component name="akninputlanguage" filter="s60" long-name="Avkon Input Language">
-<unit bldFile="mw/inputmethods/textinput/akninputlanguage/group"/>
-</component>
-<component name="peninputarc" filter="s60" long-name="Pen Input Arc">
-<unit bldFile="mw/inputmethods/textinput/peninputarc/group"/>
-</component>
-<component name="peninputcommonctrls" filter="s60" long-name="Pen Input Common Controls">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonctrls/group"/>
-</component>
-<component name="peninputcommonlayout" filter="s60" long-name="Pen Input Common Layout">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonlayout/group"/>
-</component>
-<component name="peninputhwrtrui" filter="s60" long-name="Pen Input Handwriting Recognition Training UI" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrtrui/group"/>
-</component>
-<component name="textinput_build" filter="s60" long-name="Text Input Build">
-<!--needed for #ifdef, can be removed when configuration is implemented -->
-<unit bldFile="mw/inputmethods/textinput/group"/>
-</component>
-</collection>
-<collection name="fep" long-name="FEP" level="engine">
-<component name="aknfep" filter="s60" long-name="Avkon FEP" plugin="Y">
-<unit bldFile="mw/inputmethods/fep/aknfep/group"/>
-</component>
-<component name="frontendprocessor" long-name="Front End Processor" purpose="mandatory">
-<unit bldFile="mw/inputmethods/fep/frontendprocessor/group" mrp="mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
-</component>
-</collection>
-<collection name="inputmethods_info" long-name="Input Methods Info" level="api">
-<component name="inputmethods_metadata" long-name="Input Methods Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="qt" level="generic" long-name="Qt" levels="tool mw app">
-<collection name="qtconf" long-name="Qt Config" level="tool">
-<component name="qt_deviceconfiguration" long-name="Qt Device Configuration" introduced="^2" class="config tool">
-<unit bldFile="mw/qt/src/s60installs/deviceconfiguration"/>
-</component>
-</collection>
-<collection name="qt_info" long-name="Qt Info" level="mw">
-<component name="qt_build" long-name="Qt Build" introduced="^2">
-<unit bldFile="mw/qt" proFile="projects.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-<collection name="qtdemos" long-name="Qt Demos" level="app">
-<component name="qtdemos_build" long-name="Qt Demos Build" introduced="^2" filter="qtdemos">
-<unit bldFile="mw/qt/demos" proFile="demos.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-<collection name="qtexamples" long-name="Qt Examples" level="app">
-<component name="qtexamples_build" long-name="Qt Examples Build" introduced="^2" filter="qtexamples">
-<unit bldFile="mw/qt/examples" proFile="examples.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-<collection name="qt_tests" long-name="Qt Tests" level="app">
-<component name="qttestsauto" long-name="Qt Automated Tests" introduced="^2" filter="qttestsauto">
-<unit bldFile="mw/qt/tests/auto" proFile="qtpauto.pro"/>
-</component>
-<component name="qttestsbenchmarks" long-name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks">
-<unit bldFile="mw/qt/tests/benchmarks" proFile="benchmarks.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-</block>
-<block name="qtextensions" level="generic" long-name="Qt Extensions" levels="tool mw app">
-<collection name="qtecomplugins" long-name="Qt ECom Plugins" level="app">
-<component name="qtextensions_examples" filter="qtextensionsexamples" long-name="Qt ECom Plugin Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtecomplugins/examples" proFile="examples.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qthighway" long-name="Qt Highway" level="app">
-<component name="qthighway_examples" filter="qtextensionsexamples" long-name="Qt Highway Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qthighway/examples" qmakeArgs="-r"/>
-</component>
-<component name="qthighwaytests" filter="qtextensionstests" long-name="Qt Highway Tests" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qthighway/tests" proFile="tests.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qtmobileextensions" long-name="Qt Mobile Extensions" level="app">
-<component name="qtmobileextensions_examples" filter="qtextensionsexamples" long-name="Qt Mobile Extensions Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtmobileextensions/examples" proFile="examples.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qtmobility" long-name="Qt Mobility">
-<component name="qtmobility_examples" filter="qtextensionsexamples" long-name="Qt Mobility Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtmobility/examples" proFile="examples.pro" qmakeArgs="-r"/>
-</component>
-<component name="qtmobilitytests" filter="qtextensionstests" long-name="Qt Extensions Tests" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtmobility/tests" proFile="tests.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qtextensions_info">
-<component name="qtextensions_build" long-name="Qt Extensions Confgure" introduced="^4" class="conf">
-<unit bldFile="mw/qtextensions/group"/>
-</component>
-<component name="qtextensions_build" long-name="Qt Extensions Build" introduced="^4">
-<!-- break this up into the above collections-->
-<unit bldFile="mw/qtextensions" proFile="qtextensions.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</block>
-<block name="hb" level="generic" long-name="Orbit"/>
-<block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
-<collection name="classicui_plat" long-name="Classic UI Platform Interfaces" level="specific">
-<component name="personalisation_framework_api" long-name="Personalisation Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_framework_api/group" filter="!test"/>
-</component>
-<component name="signal_pane_api" long-name="Signal Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
-</component>
-<component name="japanese_reading_api" long-name="Japanese Reading API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/japanese_reading_api/group" filter="!test"/>
-</component>
-<component name="global_popup_priority_controller_api" long-name="Global Popup Priority Controller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
-</component>
-<component name="item_finder_api" long-name="Item Finder API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/item_finder_api/group" filter="!test"/>
-</component>
-<component name="avkon_fonts_api" long-name="Avkon Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_fonts_api/group" filter="!test"/>
-</component>
-<component name="extended_utilities_api" long-name="Extended Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
-</component>
-<component name="personalisation_plugin_api" long-name="Personalisation Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
-</component>
-<component name="extended_aiw_criteria_api" long-name="Extended AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="personalisation_application_api" long-name="Personalisation Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_application_api/group"/>
-</component>
-<component name="volume_popup_api" long-name="Volume Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
-</component>
-<component name="avkon_secondary_display_support_api" long-name="AVKON Secondary Display Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_support_api/group" filter="!test"/>
-</component>
-<component name="extended_setting_pages_api" long-name="Extended Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_setting_pages_api/group" filter="!test"/>
-</component>
-<component name="extended_lists_api" long-name="Extended Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_lists_api/group" filter="!test"/>
-</component>
-<component name="input_block_api" long-name="Input Block API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/input_block_api/group" filter="!test"/>
-</component>
-<component name="avkon_ui_server_api" long-name="AVKON UI Server API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_ui_server_api/group" filter="!test"/>
-</component>
-<component name="number_grouping_api" long-name="Number Grouping API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/number_grouping_api/group" filter="!test"/>
-</component>
-<component name="extended_status_pane_api" long-name="Extended Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_status_pane_api/group" filter="!test"/>
-</component>
-<component name="extended_notifiers_api" long-name="Extended Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notifiers_api/group" filter="!test"/>
-</component>
-<component name="task_list_api" long-name="Task List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
-</component>
-<component name="personalisation_slide_show_dialog_api" long-name="Personalisation Slide Show Dialog API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
-</component>
-<component name="key_event_utilities_api" long-name="Key Event Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_event_utilities_api/group"/>
-</component>
-<component name="emergency_call_support_api" long-name="Emergency Call Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/emergency_call_support_api/group" filter="!test"/>
-</component>
-<component name="extended_dialogs_api" long-name="Extended Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_dialogs_api/group"/>
-</component>
-<component name="legacy_ui_framework_headers_api" long-name="Legacy UI Framework Headers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/legacy_ui_framework_headers_api/group"/>
-</component>
-<component name="extended_editors_api" long-name="Extended Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_editors_api/group" filter="!test"/>
-</component>
-<component name="alarm_api" long-name="Alarm API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alarm_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_interface_base_api" long-name="AIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_base_api/group" filter="!test"/>
-</component>
-<component name="list_effects_api" long-name="List Effects API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/list_effects_api/group" filter="!test"/>
-</component>
-<component name="find_item_ui_api" long-name="Find Item UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/find_item_ui_api/group" filter="!test"/>
-</component>
-<component name="server_application_services_api" long-name="Server Application Services API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/server_application_services_api/group" filter="!test"/>
-</component>
-<component name="common_ui_settings_api" long-name="Common UI Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_ui_settings_api/group"/>
-</component>
-<component name="aiw_service_interface_menu_api" long-name="AIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_menu_api/group" filter="!test"/>
-</component>
-<component name="eikon_server_extension_client_api" long-name="EIKON Server Extension Client API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/eikon_server_extension_client_api/group" filter="!test"/>
-</component>
-<component name="skinnable_clock_api" long-name="Skinnable Clock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/skinnable_clock_api/group" filter="!test"/>
-</component>
-<component name="battery_pane_api" long-name="Battery Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/battery_pane_api/group" filter="!test"/>
-</component>
-<component name="fep_document_navigation_api" long-name="FEP Document Navigation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
-</component>
-<component name="personalisation_localised_texts_api" long-name="Personalisation Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
-</component>
-<component name="memory_card_ui_api" long-name="Memory Card UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
-</component>
-<component name="avkon_status_api" long-name="AVKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_status_api/group"/>
-</component>
-<component name="application_switching_api" long-name="Application Switching API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/application_switching_api/group" filter="!test"/>
-</component>
-<component name="avkon_localised_texts_api" long-name="AVKON Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_localised_texts_api/group"/>
-</component>
-<component name="avkon_secondary_display_api" long-name="AVKON Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_api/group"/>
-</component>
-<component name="extended_animation_api" long-name="Extended Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_notes_api" long-name="Extended Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notes_api/group" filter="!test"/>
-</component>
-<component name="text_scroller_api" long-name="Text Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/text_scroller_api/group" filter="!test"/>
-</component>
-<component name="custom_cursors_api" long-name="Custom Cursors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/custom_cursors_api/group" filter="!test"/>
-</component>
-<component name="global_window_priorities_api" long-name="Global Window Priorities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_window_priorities_api/group"/>
-</component>
-<component name="extended_indicators_api" long-name="Extended Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_indicators_api/group" filter="!test"/>
-</component>
-<component name="special_character_table_api" long-name="Special Character Table API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/special_character_table_api/group" filter="!test"/>
-</component>
-<component name="avkon_settings_api" long-name="AVKON Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_settings_api/group"/>
-</component>
-<component name="extended_sounds_api" long-name="Extended Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_sounds_api/group"/>
-</component>
-<component name="themes_settings_api" long-name="Themes Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/themes_settings_api/group"/>
-</component>
-<component name="media_shared_document_api" long-name="Media Shared Document API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/media_shared_document_api/group" filter="!test"/>
-</component>
-<component name="extended_queries_api" long-name="Extended Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_queries_api/group"/>
-</component>
-<component name="phone_number_text_utilities_api" long-name="Phone Number Text Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
-</component>
-<component name="extended_scroller_api" long-name="Extended Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_scroller_api/group"/>
-</component>
-<component name="key_rotator_api" long-name="Key Rotator API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_rotator_api/group" filter="!test"/>
-</component>
-<component name="extended_grids_api" long-name="Extended Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_grids_api/group" filter="!test"/>
-</component>
-<component name="generic_parameter_api" long-name="Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="indicator_touch_observer_api" long-name="Indicator Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_touch_observer_api/group"/>
-</component>
-<component name="popup_form_api" long-name="Popup Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/popup_form_api/group" filter="!test"/>
-</component>
-<component name="stylus_activated_popup_api" long-name="Stylus Activated Pop-up API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/stylus_activated_popup_api/group" filter="!test"/>
-</component>
-<component name="indicator_plugin_api" long-name="Indicator Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_plugin_api/group" filter="!test"/>
-</component>
-<component name="layout_configuration_api" long-name="Layout Configuration API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/layout_configuration_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_filter_factory_api" long-name="Common File Dialogs Filter Factory API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group" filter="!test"/>
-</component>
-<component name="avkon_anim_dll_api" long-name="AVKON Anim DLL API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_anim_dll_api/group"/>
-</component>
-<component name="extended_initialization_api" long-name="Extended Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_initialization_api/group" filter="!test"/>
-</component>
-<component name="long_tap_animation_api" long-name="Long Tap Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/long_tap_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_ui_framework_definitions_api" long-name="Extended UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_ui_framework_definitions_api/group"/>
-</component>
-<component name="extended_buttons_api" long-name="Extended Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_buttons_api/group" filter="!test"/>
-</component>
-<component name="aiw_provider_utility_api" long-name="AIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_provider_utility_api/group" filter="!test"/>
-</component>
-<component name="transition_effect_parameters_api" long-name="Transition Effect Parameters API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_parameters_api/group" filter="!test"/>
-</component>
-<component name="extended_input_capabilities_api" long-name="Extended Input Capabilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_input_capabilities_api/group" filter="!test"/>
-</component>
-<component name="uikon_status_api" long-name="UIKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/uikon_status_api/group"/>
-</component>
-<component name="transition_effect_utilities_api" long-name="Transition Effect Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_utilities_api/group" filter="!test"/>
-</component>
-<component name="pointer_event_modifier_api" long-name="Pointer Event Modifier API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/pointer_event_modifier_api/group" filter="!test"/>
-</component>
-<component name="avkon_testability_api" long-name="AVKON Testability API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_testability_api/group"/>
-</component>
-<component name="ganes_api" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ganes_api/group"/>
-</component>
-<component name="ode_api" long-name="Ode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ode_api/group"/>
-</component>
-<component name="physics_api" long-name="Physics API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/physics_api/group"/>
-</component>
-<component name="touch_pane_api" long-name="Touch Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_api/group" filter="!test"/>
-</component>
-<component name="touch_pane_observer_api" long-name="Touch Pane Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_observer_api/group"/>
-</component>
-<component name="alternate_fs_api" long-name="Alternate FS API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alternate_fs_api/group"/>
-</component>
-<component name="discreet_popup_api" long-name="Discreet Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/discreet_popup_api/group"/>
-</component>
-<component name="touch_gesture_framework_api" long-name="Touch Gesture Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_gesture_framework_api/group"/>
-<!-- should this be commented out? -->
-<!--<unit bldFile="classicui_plat/touch_gesture_framework_api/tsrc/group" filter="test,api_test"/> -->
-</component>
-<component name="extended_options_menu_api" long-name="Extended Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="classicui_pub" long-name="Classic UI Public Interfaces" level="specific">
-<component name="input_frame_api" long-name="Input Frame API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/input_frame_api/group" filter="!test"/>
-</component>
-<component name="window_server_event_observer_api" long-name="Window Server Event Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/window_server_event_observer_api/group" filter="!test"/>
-</component>
-<component name="application_framework_api" long-name="Application Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/application_framework_api/group" filter="!test"/>
-</component>
-<component name="scroller_api" long-name="Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/scroller_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_utilities_api" long-name="UI Framework Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_utilities_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_definitions_api" long-name="UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_definitions_api/group" filter="!test"/>
-</component>
-<component name="buttons_api" long-name="Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/buttons_api/group" filter="!test"/>
-</component>
-<component name="queries_api" long-name="Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/queries_api/group" filter="!test"/>
-</component>
-<component name="aiw_generic_parameter_api" long-name="AIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="editors_api" long-name="Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/editors_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_api" long-name="Common File Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/common_file_dialogs_api/group" filter="!test"/>
-</component>
-<component name="dialog_shutter_api" long-name="Dialog Shutter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialog_shutter_api/group" filter="!test"/>
-</component>
-<component name="fonts_api" long-name="Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/fonts_api/group" filter="!test"/>
-</component>
-<component name="screen_clearer_api" long-name="Screen Clearer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_clearer_api/group" filter="!test"/>
-</component>
-<component name="notifiers_api" long-name="Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notifiers_api/group" filter="!test"/>
-</component>
-<component name="notes_api" long-name="Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notes_api/group" filter="!test"/>
-</component>
-<component name="status_pane_api" long-name="Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/status_pane_api/group" filter="!test"/>
-</component>
-<component name="base_controls_api" long-name="Base Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/base_controls_api/group" filter="!test"/>
-</component>
-<component name="grids_api" long-name="Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/grids_api/group" filter="!test"/>
-</component>
-<component name="context_pane_api" long-name="Context Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/context_pane_api/group" filter="!test"/>
-</component>
-<component name="lists_api" long-name="Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/lists_api/group" filter="!test"/>
-</component>
-<component name="popups_api" long-name="Popups API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/popups_api/group" filter="!test"/>
-</component>
-<component name="misc_controls_api" long-name="Misc Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/misc_controls_api/group" filter="!test"/>
-</component>
-<component name="keylock_api" long-name="Keylock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/keylock_api/group" filter="!test"/>
-</component>
-<component name="options_menu_api" long-name="Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/options_menu_api/group" filter="!test"/>
-</component>
-<component name="hierarchical_lists_api" long-name="Hierarchical Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hierarchical_lists_api/group" filter="!test"/>
-</component>
-<component name="navigation_pane_api" long-name="Navigation Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/navigation_pane_api/group" filter="!test"/>
-</component>
-<component name="tabs_api" long-name="Tabs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/tabs_api/group" filter="!test"/>
-</component>
-<component name="title_pane_touch_observer_api" long-name="Title Pane Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_touch_observer_api/group"/>
-</component>
-<component name="choice_list_api" long-name="Choice List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/choice_list_api/group" filter="!test"/>
-</component>
-<component name="info_popup_note_api" long-name="Info Popup Note API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/info_popup_note_api/group" filter="!test"/>
-</component>
-<component name="setting_pages_api" long-name="Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/setting_pages_api/group" filter="!test"/>
-</component>
-<component name="screen_mode_api" long-name="Screen Mode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_mode_api/group" filter="!test"/>
-</component>
-<component name="indicators_api" long-name="Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/indicators_api/group" filter="!test"/>
-</component>
-<component name="error_ui_api" long-name="Error UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/error_ui_api/group" filter="!test"/>
-</component>
-<component name="animation_api" long-name="Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/animation_api/group" filter="!test"/>
-</component>
-<component name="searchfield_api" long-name="Searchfield API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/searchfield_api/group" filter="!test"/>
-</component>
-<component name="labels_api" long-name="Labels API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/labels_api/group" filter="!test"/>
-</component>
-<component name="hotkeys_api" long-name="Hotkeys API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hotkeys_api/group" filter="!test"/>
-</component>
-<component name="initialization_api" long-name="Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/initialization_api/group" filter="!test"/>
-</component>
-<component name="volume_control_api" long-name="Volume Control API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/volume_control_api/group" filter="!test"/>
-</component>
-<component name="title_pane_api" long-name="Title Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_api/group" filter="!test"/>
-</component>
-<component name="sounds_api" long-name="Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/sounds_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_handler_api" long-name="AIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_service_handler_api/group" filter="!test"/>
-</component>
-<component name="aiw_criteria_api" long-name="AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="touch_ui_utilities_api" long-name="Touch UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/touch_ui_utilities_api/group" filter="!test"/>
-</component>
-<component name="generic_button_api" long-name="Generic Button API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/generic_button_api/group" filter="!test"/>
-</component>
-<component name="form_api" long-name="Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/form_api/group" filter="!test"/>
-</component>
-<component name="uikon_core_controls" long-name="Uikon Core Controls" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/uikon_core_controls/group" filter="!test"/>
-</component>
-<component name="calendar_api" long-name="Calendar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/calendar_api/group"/>
-</component>
-<component name="toolbar_api" long-name="Toolbar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/toolbar_api/group" filter="!test"/>
-</component>
-<component name="server_application_api" long-name="Server Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/server_application_api/group"/>
-</component>
-<component name="slider_api" long-name="Slider API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/slider_api/group" filter="!test"/>
-</component>
-<component name="private_ui_framework_api" long-name="Private UI Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/private_ui_framework_api/group" filter="!test"/>
-</component>
-<component name="dialogs_api" long-name="Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialogs_api/group" filter="!test"/>
-</component>
-<component name="document_handler_api" long-name="Document handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/document_handler_api/group"/>
-</component>
-<component name="images_api" long-name="Images API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/images_api/group" filter="!test"/>
-</component>
-<component name="stylus_popup_menu_api" long-name="Stylus Pop-up Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/stylus_popup_menu_api/group" filter="!test"/>
-</component>
-<component name="information_preview_popup_api" long-name="Information Preview Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/information_preview_popup_api/group" filter="!test"/>
-</component>
-<component name="intermediate_state_api" long-name="Intermediate State API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/intermediate_state_api/group"/>
-</component>
-<component name="help_launcher_api" long-name="Help Launcher API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/help_launcher_api/group"/>
-</component>
-</collection>
-<collection name="ode" long-name="Open Dynamics Engine" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="ode_build" filter="s60" long-name="ODE">
-<unit bldFile="mw/classicui/ode/group"/>
-</component>
-</collection>
-<collection name="uifw" long-name="UI Framework" level="server">
-<component name="uiklaf" filter="s60" long-name="Uikon Look-and-Feel">
-<unit bldFile="mw/classicui/uifw/uiklaf/group"/>
-</component>
-<component name="eikctl" filter="s60" long-name="Eikon Controls">
-<unit bldFile="mw/classicui/uifw/eikctl/group"/>
-</component>
-<component name="avkon" filter="s60" long-name="Avkon">
-<!-- can only have one unit. Split into 3 components, or #include all from same bld.inf -->
-<unit bldFile="mw/classicui/uifw/avkon/aknphysics/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/aknconf/group"/>
-</component>
-<component name="eikstd" filter="s60" long-name="Eikon Standard">
-<unit bldFile="mw/classicui/uifw/eikstd/group"/>
-</component>
-<component name="aknglobalui" filter="s60" long-name="Avkon Global UI">
-<unit bldFile="mw/classicui/uifw/aknglobalui/group"/>
-</component>
-<component name="ganes" filter="s60" long-name="Ganes">
-<unit bldFile="mw/classicui/uifw/ganes/group"/>
-</component>
-</collection>
-<collection name="commonuis" long-name="Common UIs" level="specific">
-<component name="commonui" filter="s60" long-name="Common UI">
-<unit bldFile="mw/classicui/commonuis/commonui/group"/>
-</component>
-<component name="commondialogs" filter="s60" long-name="Common Dialogs">
-<unit bldFile="mw/classicui/commonuis/commondialogs/group"/>
-</component>
-</collection>
-<collection name="applicationinterworkingfw" long-name="Application Interworking Framework" level="generic">
-<component name="aifwservicehandler" filter="s60" long-name="Application Interworking Service Handler">
-<unit bldFile="mw/classicui/applicationinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-<collection name="psln" long-name="Personalization" level="specific">
-<!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
-<component name="psln_build" filter="s60" long-name="Personalization Build">
-<unit bldFile="mw/classicui/psln/group"/>
-</component>
-</collection>
-<collection name="commonadapter" long-name="Common Adapter" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="commonadapter_build" filter="s60" long-name="Common Adapter Build">
-<unit bldFile="mw/classicui/commonadapter/group"/>
-</component>
-</collection>
-<collection name="akntouchgesturefw" long-name="Avkon Touch Gesture Framework" level="generic">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="akntouchgesturefw_build" filter="s60" long-name="Avkon Touch Gesture Framework Build" introduced="^3">
-<unit bldFile="mw/classicui/akntouchgesturefw/group"/>
-</component>
-</collection>
-<collection name="uiutils" long-name="UI Utils" level="specific">
-<component name="localizer" filter="s60" long-name="Directory Localizer">
-<unit bldFile="mw/classicui/uiutils/localizer/group"/>
-</component>
-<component name="findutil" filter="s60" long-name="Find Utility">
-<unit bldFile="mw/classicui/uiutils/findutil/group"/>
-</component>
-<component name="gamerecognizer" filter="s60" long-name="Game Recognizer" plugin="Y">
-<unit bldFile="mw/classicui/uiutils/gamerecognizer/group"/>
-</component>
-<component name="aknjapanesereading" filter="s60" long-name="Avkon Japanese Reading">
-<unit bldFile="mw/classicui/uiutils/aknjapanesereading/group"/>
-</component>
-<component name="hlplch" long-name="Help Launcher" filter="s60,bldfirst">
-<unit bldFile="mw/classicui/uiutils/hlplch/group"/>
-</component>
-</collection>
-<collection name="commonuisupport" long-name="Common UI Support" level="support">
-<component name="uikon" long-name="Uikon" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uikon/group" mrp="mw/classicui/commonuisupport/uikon/group/app-framework_uikon.mrp"/>
-</component>
-<component name="errorresolverdata" long-name="Error Resolver Data" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/errorresolverdata/group" mrp="mw/classicui/commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
-</component>
-<component name="uilaf" long-name="UI Look and Feel" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uilaf/GROUP" mrp="mw/classicui/commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
-</component>
-<component name="grid" long-name="Grid" purpose="optional">
-<unit bldFile="mw/classicui/commonuisupport/grid/group" mrp="mw/classicui/commonuisupport/grid/group/app-framework_grid.mrp"/>
-</component>
-<component name="uifwsdocs" long-name="UI Frameworks Documentation" purpose="development" class="doc">
-<unit mrp="mw/classicui/commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
-</component>
-</collection>
-<collection name="lafagnosticuifoundation" long-name="Look-and-Feel Agnostic UI Foundation" level="base">
-<component name="cone" long-name="Control Environment" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/cone/group" mrp="mw/classicui/lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
-</component>
-<component name="graphicseffects" long-name="Graphics Effects" introduced="9.2" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/graphicseffects/group" mrp="mw/classicui/lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
-</component>
-<component name="uigraphicsutils" long-name="UI Graphics Utilities" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group" mrp="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
-</component>
-<component name="clockanim" long-name="Clock" purpose="optional" plugin="Y">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/clockanim/group" mrp="mw/classicui/lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
-</component>
-<component name="bmpanimation" long-name="BMP Animation" introduced="6.0" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/bmpanimation/group" mrp="mw/classicui/lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
-</component>
-<component name="animation" long-name="Animation" introduced="9.1" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/animation/group" mrp="mw/classicui/lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
-</component>
-</collection>
-<collection name="classicui_info" long-name="Classic UI Info" level="specific">
-<!-- the multiple units in the API test components need to be resolved -->
-<component name="classicui_metadata" long-name="Classic UI Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/classicui/classicui_info/classicui_metadata/classicui_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="svgt" level="generic" long-name="SVG Tiny" levels="util ui">
-<collection name="svgt_plat" long-name="SVG Tiny Platform Interfaces" level="ui">
-<component name="svgt_api" long-name="SVGT API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/svgt_api/group"/>
-</component>
-<component name="nvg_api" long-name="NVG API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/nvg_api/group"/>
-</component>
-</collection>
-<collection name="svgtopt" long-name="SVG-T Engine" level="util">
-<component name="svgtopt_build" filter="s60" long-name="SVG Engine" introduced="9.2">
-<!-- component is at collection level. Needs to be moved down a directory -->
-<unit bldFile="mw/svgt/svgtopt/group"/>
-</component>
-<component name="svgtplugin" filter="s60" long-name="SVG Plugin" introduced="9.2" plugin="Y">
-<unit bldFile="mw/svgt/svgtopt/svgtplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="uiaccelerator" level="generic" long-name="UI Accelerator" levels="plugin framework server ex if">
-<collection name="uiaccelerator_plat" long-name="UI Accelerator Platform Interfaces" level="if">
-<component name="alf_core_toolkit_api" long-name="ALF Core Toolkit API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/group"/>
-</component>
-<component name="alf_visual_api" long-name="ALF Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/group"/>
-</component>
-<component name="alf_extended_visual_api" long-name="ALF Extended Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/group"/>
-</component>
-<component name="alf_extension_api" long-name="ALF Extension API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/group"/>
-</component>
-<component name="alf_tracing_api" long-name="ALF Tracing API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/group"/>
-</component>
-<component name="alf_client_server_api" long-name="ALF Client Server API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/group"/>
-</component>
-</collection>
-<collection name="uiacceltk" long-name="UI Accelerator Toolkit" level="framework">
-<component name="hitchcock" filter="s60" long-name="Hitchcock">
-<unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/group"/>
-</component>
-<component name="uiacceltk_build" filter="s60" long-name="UI Accelerator Toolkit Build">
-<!-- move into the other component, or remove the #include and make this UI Accelerator Toolkit ROM-->
-<unit bldFile="mw/uiaccelerator/uiacceltk/group"/>
-</component>
-</collection>
-<collection name="uiaccelerator_test" long-name="UI Accelerator Test" level="ex"/>
-</block>
-<block name="uiresources" level="generic" long-name="UI Resources" levels="compile plugin framework server generic data">
-<!-- are the custom filters below needed? -->
-<collection name="uiresources_pub" long-name="UI Resources Public Interfaces" level="data">
-<component name="pictograph_api" long-name="Pictograph API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/pictograph_api/group" filter="!test"/>
-</component>
-<component name="skins_api" long-name="Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/skins_api/group" filter="!test"/>
-</component>
-<component name="font_definition_api" long-name="Font Definition API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/font_definition_api/group" filter="!test"/>
-</component>
-<component name="graphics_api" long-name="Graphics API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/graphics_api/group" filter="!test"/>
-</component>
-<component name="scalable_icons_api" long-name="Scalable Icons API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/scalable_icons_api/group"/>
-</component>
-<component name="layout_id_definitions_api" long-name="Layout ID Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/layout_id_definitions_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_plat" long-name="UI Resources Platform Interfaces" level="data">
-<component name="layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_system_private_api/group" filter="!test"/>
-</component>
-<component name="layout_data_api" long-name="Layout Data API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_data_api/group" filter="!test"/>
-</component>
-<component name="cdl_api" long-name="CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/cdl_api/group" filter="!test"/>
-</component>
-<component name="extended_skins_api" long-name="Extended Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_skins_api/group" filter="!test"/>
-</component>
-<component name="tfx_server_controller_plugin_api" long-name="TFX Server Controller Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_controller_plugin_api/group"/>
-</component>
-<component name="extended_fonts_api" long-name="Extended Fonts API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_fonts_api/group" filter="!test"/>
-</component>
-<component name="graphic_configuration_api" long-name="Graphic Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/graphic_configuration_api/group" filter="!test"/>
-</component>
-<component name="mif_header_cdl_api" long-name="MIF Header CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mif_header_cdl_api/group"/>
-</component>
-<component name="personalisation_and_skins_settings_api" long-name="Personalisation and Skins Settings API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/personalisation_and_skins_settings_api/group"/>
-</component>
-<component name="tfx_effect_setup_plugin_api" long-name="TFX Effect Setup Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_effect_setup_plugin_api/group"/>
-</component>
-<component name="mifconv_definitions_api" long-name="Mifconv Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mifconv_definitions_api/group"/>
-</component>
-<component name="wallpaper_configuration_api" long-name="Wallpaper Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/wallpaper_configuration_api/group"/>
-</component>
-<component name="language_code_definitions_api" long-name="Language Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/language_code_definitions_api/group"/>
-</component>
-<component name="skins_image_attributes_api" long-name="Skins Image Attributes API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
-</component>
-<component name="private_user_area_code_definitions_api" long-name="Private User Area Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/private_user_area_code_definitions_api/group"/>
-</component>
-<component name="tfx_server_plugin_ids_api" long-name="TFX Server Plug-in IDs API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_plugin_ids_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_info" long-name="UI Resources Info" level="data">
-<component name="uiresources_test" filter="s60,test,api_test" long-name="UI Resources Tests" purpose="development"/>
-</collection>
-<collection name="uigraphics" long-name="UI Graphics" level="generic">
-<component name="bitmaps2" filter="s60" long-name="Bitmaps 2" class="config">
-<unit bldFile="mw/uiresources/uigraphics/bitmaps2/group"/>
-</component>
-<component name="icons" filter="s60" long-name="Icons" class="config">
-<unit bldFile="mw/uiresources/uigraphics/icons/group"/>
-</component>
-<component name="variatedbitmaps" filter="s60" long-name="Variated Bitmaps" class="config">
-<unit bldFile="mw/uiresources/uigraphics/variatedbitmaps/group"/>
-</component>
-<component name="aknicon" filter="s60" long-name="Avkon Icon Framework">
-<unit bldFile="mw/uiresources/uigraphics/aknicon/group"/>
-</component>
-<component name="nvgrenderstage" filter="sf_build" long-name="NVG Render Stage">
-<unit bldFile="mw/uiresources/uigraphics/nvgrenderstage/group"/>
-</component>
-</collection>
-<collection name="layouts" long-name="Layouts" level="plugin">
-<component name="cdl" filter="s60" long-name="Customization Definition Language">
-<!-- can only have one unit. Need to #include them or split into multiple components -->
-<unit bldFile="mw/uiresources/layouts/cdl/cdlengine/group"/>
-<unit bldFile="mw/uiresources/layouts/cdl/cdlserver/group"/>
-</component>
-<component name="aknlayout2" filter="s60" long-name="Avkon Layout 2">
-<unit bldFile="mw/uiresources/layouts/aknlayout2/group"/>
-</component>
-</collection>
-<collection name="skins" long-name="Skins" level="data">
-<component name="aknskincontent" filter="s60" long-name="Avkon Skin Content" class="config">
-<unit bldFile="mw/uiresources/skins/aknskincontent/group"/>
-</component>
-<component name="aknskins" filter="s60" long-name="Avkon Skin Compiler">
-<unit bldFile="mw/uiresources/skins/aknskins/group"/>
-</component>
-</collection>
-<collection name="pictographs" long-name="Pictographs" level="data">
-<component name="aknpictograph" filter="s60" long-name="Avkon Pictograph">
-<unit bldFile="mw/uiresources/pictographs/aknpictograph/group"/>
-</component>
-</collection>
-<collection name="locales" long-name="Locales" level="framework">
-<component name="locales_build" filter="s60" long-name="Locales Build">
-<unit bldFile="mw/uiresources/locales/loce32"/>
-</component>
-</collection>
-<collection name="uiconfig" long-name="UI Config" level="server">
-<component name="s60config" filter="s60" long-name="S60 UI Config">
-<unit bldFile="mw/uiresources/uiconfig/s60config/group"/>
-</component>
-</collection>
-<collection name="fontsupport" long-name="Font Support" level="generic">
-<component name="fontprovider" filter="s60" long-name="Font Provider">
-<unit bldFile="mw/uiresources/fontsupport/fontprovider/group"/>
-</component>
-<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
- <component id="s60_fonts" filter="s60" name="S60 Fonts">
- <unit bldFile="fontsupport/fontutils/group"/>
- </component>
--->
-<component name="fontutils" filter="sf_build" long-name="Font Utils">
-<unit bldFile="mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
-</component>
-</collection>
-<collection name="helpthemes" long-name="Help Themes" level="data">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helpthemes_build" filter="s60" long-name="Help Themes Build" class="config">
-<unit bldFile="mw/uiresources/helpthemes/group"/>
-</component>
-</collection>
-</block>
-<block name="hapticsservices" level="generic" long-name="Haptics Services" levels="fw server api">
-<collection name="hapticsservices_plat" long-name="Haptics Services Platform Interfaces" level="api">
-<component name="tacticon_api" long-name="Tacticon API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tacticon_api/group"/>
-</component>
-<component name="tactile_feedback_core_api" long-name="Tactile Feedback Core API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_core_api/group"/>
-</component>
-<component name="tactile_feedback_server_api" long-name="Tactile Feedback Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_server_api/group"/>
-</component>
-</collection>
-<collection name="hapticsservices_pub" long-name="Haptics Services Public Interfaces" level="api">
-<component name="tactile_feedback_client_api" long-name="Tactile Feedback Client API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_pub/tactile_feedback_client_api/group"/>
-</component>
-</collection>
-<collection name="tacticonserver" long-name="Tacticon Server" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="tacticonserver_build" filter="s60" long-name="Tacticon Server Build" introduced="^3">
-<unit bldFile="mw/hapticsservices/tacticonserver/group"/>
-<!-- clients and servers are suauly the same component. Consider moving pluign to a separate component if needed -->
-</component>
-</collection>
-<collection name="tactilefeedback" long-name="Tactile Feedback" level="fw">
-<component name="tactilearearegistry" filter="s60" long-name="Tactile Area Registry" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilearearegistry/group"/>
-</component>
-<component name="tactilefeedbackresolver" filter="s60" long-name="Tactile Feedback Resolver" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackresolver/group"/>
-</component>
-<component name="tactileclickplugin" filter="s60" long-name="Tactile Click Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileclickplugin/group"/>
-</component>
-<component name="tactilefeedbackclient" filter="s60" long-name="Tactile Feedback Client" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackclient/group"/>
-</component>
-<component name="tactileactionplugin" filter="s60" long-name="Tactile Action Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileactionplugin/group"/>
-</component>
-<component name="tactilefeedback_build" filter="s60" long-name="Tactile Feedback Build" introduced="^1">
-<!-- consider moving IBY to one fo the above components -->
-<unit bldFile="mw/hapticsservices/tactilefeedback/group"/>
-</component>
-</collection>
-</block>
-<block name="platformthemes" level="specific" long-name="Platform Themes" levels="framework generic ui">
-<collection name="platformthemes_info" long-name="Platform Themes Info">
-<component name="platformthemes_build" long-name="Platform Themes Build">
-<!-- no real structure in this package. Should break into collections / components -->
-<unit bldFile="mw/platformthemes" proFile="platformthemes.pro"/>
-</component>
-</collection>
-</block>
-<block name="gsprofilesrv" level="generic" long-name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
-<collection name="gsprofilesrv_pub" long-name="GS and Profiles Services Public Interfaces" level="specific">
-<component name="profiles_engine_active_profile_settings_api" long-name="Profiles Engine Active Profile Settings API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_active_profile_settings_api/group"/>
-</component>
-<component name="profiles_engine_wrapper_api" long-name="Profiles Engine Wrapper API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_wrapper_api/group"/>
-</component>
-</collection>
-<collection name="gsprofilesrv_plat" long-name="GS and Profiles Services Platform Interfaces" level="specific">
-<component name="ftuwizardmodel_api" long-name="FTU Wizard Model API" filter="bldfirst,s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/ftuwizardmodel_api" proFile="ftuwizardmodel_api.pro" qmakeArgs="-r -config rom"/>
-</component>
-<component name="profiles_engine_api" long-name="Profiles Engine API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_engine_api/group"/>
-</component>
-<component name="settings_backgroundimage_api" long-name="Settings Background Image API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_backgroundimage_api/group"/>
-</component>
-<component name="settings_framework_api" long-name="Settings Framework API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_framework_api/group"/>
-</component>
-<component name="settings_launch_api" long-name="Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_launch_api/group"/>
-</component>
-<component name="settings_listbox_api" long-name="Settings List Box API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_listbox_api/group"/>
-</component>
-<component name="settings_plugin_api" long-name="Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_plugin_api/group"/>
-</component>
-<component name="settings_uis_cenrep_collection_api" long-name="Settings UIs CenRep Collection API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
-</component>
-</collection>
-<collection name="gssettingsuis" long-name="General Settings UIs" level="framework">
-<component name="gs" filter="s60" long-name="General Settings" introduced="9.2">
-<unit bldFile="mw/gsprofilesrv/gssettingsuis/gs/group"/>
-</component>
-</collection>
-<collection name="ftuwizardmodel" long-name="FTU Wizard Model" level="generic">
-<component name="ftuwizardmodel_build" long-name="FTU Wizardmodel Build" filter="bldfirst">
-<unit bldFile="mw/gsprofilesrv/ftuwizardmodel" proFile="ftuwizardmodel.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-<collection name="controlpanel" long-name="Control Panel" level="generic">
-<component name="controlpanel_build" long-name="Control Panel Build">
-<unit bldFile="mw/gsprofilesrv/controlpanel" proFile="controlpanel.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-<collection name="profilesservices" long-name="Profiles Services" level="server">
-<component name="profileengine" filter="s60" long-name="Profile Engine" introduced="9.1">
-<unit bldFile="mw/gsprofilesrv/profilesservices/profileengine/group"/>
-</component>
-<component name="ringingtone3dplugin" filter="s60" long-name="Ringing Tone 3D Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/gsprofilesrv/profilesservices/ringingtone3dplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreensrv" level="specific" long-name="Home Screen Services" levels="plugin framework server generic specific">
-<collection name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" level="specific">
-<component name="ai_content_model_api" long-name="AI Content Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_content_model_api/group"/>
-</component>
-<component name="ai_utilities_api" long-name="AI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_utilities_api/group" filter="!test"/>
-</component>
-<component name="ai_plugin_management_api" long-name="AI Plug-in Management API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_management_api/group"/>
-</component>
-<component name="ai_plugin_information_api" long-name="AI Plug-in Information API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_information_api/group"/>
-</component>
-<component name="ai_variation_api" long-name="AI Variation API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_variation_api/group"/>
-</component>
-<component name="action_handler_plugin_api" long-name="Action Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/group" filter="!test"/>
-</component>
-<component name="content_harvester_plugin_api" long-name="Content Harvester Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/group" filter="!test"/>
-</component>
-<component name="menu_model_api" long-name="Menu Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_model_api/group"/>
-</component>
-<component name="menu_sat_interface_api" long-name="Menu SAT Interface API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/group" filter="!test"/>
-</component>
-<component name="external_home_screen_api" long-name="External Home Screen API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/external_home_screen_api/group"/>
-</component>
-<component name="menu_content_service_api" long-name="Menu Content Service API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_content_service_api/group" filter="!test"/>
-</component>
-<component name="sapi_contentpublishing" long-name="SAPI Content Publishing" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing/group"/>
-</component>
-<component name="sapi_backstepping" long-name="SAPI Backstepping" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_backstepping/group"/>
-</component>
-<component name="sapi_actionhandler" long-name="SAPI Action Handler" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_actionhandler/group"/>
-</component>
-<component name="sapi_homescreenplugin" long-name="SAPI Homescreen Plugin" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_homescreenplugin/group" filter="!test"/>
-</component>
-<component name="sapi_menucontent" long-name="SAPI Menu Content" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_menucontent/group"/>
-</component>
-<component name="xcfw_api" long-name="XCFW API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/xcfw_api/group"/>
-</component>
-<component name="idlefw_api" long-name="Idle Framework API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/idlefw_api/group"/>
-</component>
-<component name="hs_widget_publisher_api" long-name="Home Screen Publishing API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_widget_publisher_api/group"/>
-</component>
-<component name="hs_settings_api" long-name="HS Settings API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_settings_api/group"/>
-</component>
-<component name="hs_content_control_api" long-name="HS Content Control API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_content_control_api/group"/>
-</component>
-</collection>
-<collection name="xcfw" long-name="XML Content Framework" level="framework">
-<!-- collection is really a component, needs to be moved down a directory -->
-<component name="xcfw_build" filter="s60" long-name="XML Content Framework Build">
-<unit bldFile="mw/homescreensrv/xcfw/group"/>
-</component>
-</collection>
-<collection name="homescreenpluginsrv" long-name="Home Screen Plugin Service" level="plugin">
-<component name="hspsdefinitionengine" filter="s60" long-name="HS Plugin Service Definition Engine" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsdefinitionengine/group"/> -->
-</component>
-<component name="hspsdom" filter="s60" long-name="HS Plugin Service DOM" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsdom/group"/> -->
-</component>
-<component name="hspstools" filter="s60" long-name="HS Server Tools">
-<!-- <unit bldFile="homescreenpluginsrv/hspstools/group"/> -->
-</component>
-<component name="hspspluginregistry" filter="s60" long-name="HS Plugin Registry" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspspluginregistry/group"/>-->
-</component>
-<component name="hspsmanager" filter="s60" long-name="HSPS Manager" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsmanager/group"/>-->
-</component>
-<component name="hspsodt" filter="s60" long-name="HSPS Object Description Tree" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsodt/group"/>-->
-</component>
-<component name="hspsresource" filter="s60" long-name="HS Plugin Server Resource" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresource/group"/>-->
-</component>
-<component name="hspsresult" filter="s60" long-name="HS Plugin Server Result" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
-</component>
-<component name="homescreen_settings_api" filter="s60" long-name="HS Settings API" class="api placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
-</component>
-<component name="homescreenpluginsrv_build" filter="s60" long-name="HSPS Build">
-<!-- need to break this up into the self-contained components above and uncomment them -->
-<unit bldFile="mw/homescreensrv/homescreenpluginsrv/group"/>
-</component>
-</collection>
-<collection name="idlefw" long-name="Idle Framework" level="framework">
-<!-- Uncomment all units when configuration is in place. All currently #included from idlefw_build -->
-<component name="idlefw_plugins" filter="s60" long-name="Idle Framework Plugins" plugin="Y" class="placeholder">
-<!--<unit bldFile="idlefw/plugins/group"/>-->
-</component>
-<component name="hslaunch" filter="s60" long-name="Home Screen Launch" class="placeholder">
-<!--<unit bldFile="idlefw/plugins/group"/>-->
-</component>
-<component name="idlefw_build" filter="s60" long-name="Idle Framework Build">
-<!--split this into components, or separate from the above components and move this down a directory -->
-<unit bldFile="mw/homescreensrv/idlefw/group"/>
-</component>
-</collection>
-<collection name="menucontentsrv" long-name="Menu Content Service" level="generic">
-<component name="menusatinterface" filter="s60" long-name="Menu SAT Interface">
-<unit bldFile="mw/homescreensrv/menucontentsrv/menusatinterface/group"/>
-</component>
-<component name="menucontentsrv_build" filter="s60" long-name="Menu Content Service Build">
-<!--split this into components, or separate from the above component and move this down a directory -->
-<unit bldFile="mw/homescreensrv/menucontentsrv/group"/>
-</component>
-</collection>
-<collection name="backsteppingsrv" long-name="Back Stepping Service" level="server">
-<!-- collection is really a component, needs to be moved down a directory -->
-<component name="bsengine" long-name="Back Stepping Engine" filter="s60">
-<unit bldFile="mw/homescreensrv/backsteppingsrv/group"/>
-</component>
-</collection>
-<collection name="contentpublishingsrv" long-name="Content Publishing Service" level="server">
-<component name="contentpublishingdebug" filter="s60" long-name="Content Publishing Debug">
-<!-- need to move this component outside of contentpublishingutils and into separate component directory -->
-<!-- <unit bldFile="contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/> -->
-</component>
-<component name="contentpublishingutils" filter="s60" long-name="Content Publishing Utils">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingutils/group"/>
-</component>
-<component name="contentpublishingserver" filter="s60" long-name="Content Publishing Server">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingserver/group"/>
-</component>
-<component name="contentharvester" filter="s60" long-name="Content Harvester">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
-</component>
-<component name="contentpublishingsrv_build" filter="s60" long-name="Content Publishing Service Build">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/group"/>
-</component>
-</collection>
-<collection name="contentcontrolsrv" long-name="Content Control Service" level="server">
-<component name="ccsrv" long-name="Content Control Service" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccsrv/group"/>
-</component>
-<component name="ccsrvapi" long-name="Content Control Service API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccsrvapi/group"/>
-</component>
-<component name="ccclientsession" long-name="Content Control Client Session" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccclientsession/group"/>
-</component>
-<component name="hsccclient" long-name="HS Content Control Client" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/hsccclient/group"/>
-</component>
-<component name="hscontentinfo" long-name="Home Screen Content Info" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/hscontentinfo/group"/>
-</component>
-<component name="contentcontrolsrv_build" long-name="Content Control Service Build" filter="s60" introduced="^3">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreensrvlegacy" level="generic" long-name="Legacy Home Screen Services" levels="plugin framework server generic specific">
-<collection name="homescreensrvlegacy_plat" long-name="Legacy Home Screen Services Platform Interfaces" level="specific">
-<component name="ai_content_model_api" long-name="AI Content Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrvlegacy/ai_content_model_api/group" proFile="group.pro"/>
-</component>
-<component name="ai_plugin_information_api" long-name="AI Plug-in Information API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrvlegacy/ai_plugin_information_api/group" proFile="group.pro"/>
-</component>
-</collection>
-</block>
-<block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
-<collection name="appinstall_plat" long-name="Application Installation Platform Interfaces" level="api">
-<component name="iaupdate_api" long-name="IA Update API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/iaupdate_api/group"/>
-</component>
-<component name="task_plugin_api" long-name="Task Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_plugin_api/group"/>
-</component>
-<component name="sw_installer_common_ui_api" long-name="SW Installer Common UI API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_common_ui_api/group"/>
-</component>
-<component name="sw_installer_launcher_api" long-name="SW Installer Launcher API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_launcher_api/group"/>
-</component>
-<component name="task_management_api" long-name="Task Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_management_api/group"/>
-</component>
-<component name="sw_installer_ui_plugin_api" long-name="SW Installer UI Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ui_plugin_api/group"/>
-</component>
-<component name="sw_installer_cr_keys" long-name="SW Installer CR Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_cr_keys/group"/>
-</component>
-<component name="sw_installer_ps_keys" long-name="SW Installer PS Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
-</component>
-<component name="appmngr2runtimeapi" long-name="Application Manager 2 Runtime Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
-</component>
-<component name="sifui_api" long-name="STIF UI API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sifui_api/group"/>
-</component>
-</collection>
-<collection name="appinstall_pub" long-name="Application Installation Public Interfaces" level="api">
-<component name="startup_list_management_api" long-name="Startup List Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
-</component>
-</collection>
-<collection name="ncdengine" long-name="Nokia Content Discover" level="framework">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="ncdengine_engine" filter="s60" long-name="NCD Engine" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/engine/group"/>
-</component>
-<component name="debuglogger" filter="s60" long-name="NCD Debug Logger" introduced="^1" class="placeholder">
-<!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
-</component>
-<component name="ncdengine_build" filter="s60" long-name="NCD Build" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/group"/>
-</component>
-</collection>
-<collection name="appinstaller" long-name="Application Installer" level="generic">
-<component name="appinstui" filter="s60" long-name="Application Installer UI" introduced="^2">
-<unit bldFile="mw/appinstall/appinstaller/appinstui/group"/>
-</component>
-</collection>
-<collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="api">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="iaupdateapi_stub_build" long-name="IA Update API Stub Build" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdateapi_stub/group"/>
-</component>
-</collection>
-<collection name="iaupdate" long-name="Independent Apps Update" level="api">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="iad" long-name="Software Update" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/iad/group"/>
-</component>
-<component name="iaupdate_help" filter="s60" long-name="IA Update Help" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/help/group"/>
-</component>
-<component name="iaupdate_build" filter="s60" long-name="IA Update Build" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/group"/>
-</component>
-</collection>
-<collection name="installationservices" long-name="Installation Services" level="generic">
-<component name="swi" long-name="Secure Software Install" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swi/group" mrp="mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
-</component>
-<component name="swidevicetools" long-name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
-<unit bldFile="mw/appinstall/installationservices/swidevicetools/group" mrp="mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
-</component>
-<component name="swcomponentregistry" long-name="Software Component Registry" introduced="^4" purpose="mandatory">
-<unit bldFile="mw/appinstall/installationservices/swcomponentregistry/group" mrp="mw/appinstall/installationservices/swcomponentregistry/group/security_softwarecomponentregistry.mrp"/>
-</component>
-<component name="swinstallationfw" long-name="Software Installation Framework" introduced="^4" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swinstallationfw/group" mrp="mw/appinstall/installationservices/swinstallationfw/group/security_softwareinstallframework.mrp"/>
-</component>
-<component name="swtransactionservices" long-name="Software Transaction Services" introduced="^4" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swtransactionservices/group" mrp="mw/appinstall/installationservices/swtransactionservices/group/security_softwaretransactionservices.mrp"/>
-</component>
-<component name="refswinstallationplugin" long-name="Reference Software Installation Plugin" introduced="^4" purpose="development" plugin="Y">
-<unit bldFile="mw/appinstall/installationservices/refswinstallationplugin/group" mrp="mw/appinstall/installationservices/refswinstallationplugin/group/security_sifrefplugin.mrp"/>
-</component>
-<component name="refsoftwareappmgr" long-name="Reference Software Application Manager" introduced="^4" purpose="development">
-<unit bldFile="mw/appinstall/installationservices/refsoftwareappmgr/group" mrp="mw/appinstall/installationservices/refsoftwareappmgr/group/security_referenceapplicationmanager.mrp"/>
-</component>
-<component name="swiconfig" long-name="Software Install Config" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appinstall/installationservices/swiconfig/group" mrp="mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
-</component>
-</collection>
-<collection name="secureswitools" long-name="Secure Software Install Tools" level="tool">
-<component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/makekeys/group" mrp="mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
-</component>
-<component name="swianalysistoolkit" long-name="SWI Analysis Toolkit" purpose="development" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
-</component>
-<component name="openssllib" long-name="OpenSSL Library" purpose="optional" class="PC">
-<unit mrp="mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
-</component>
-<component name="swisistools" long-name="Secure Software Install SIS Tools" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swisistools/group" mrp="mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
-</component>
-</collection>
-<collection name="appinstall_info" long-name="Application Installation Info" level="api">
-<component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="serviceapifw" level="specific" long-name="Service API Framework" levels="plugin framework server generic specific">
-<collection name="serviceapifw_pub" long-name="Service API Framework Public Interfaces" level="specific"/>
-<collection name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" level="specific">
-<component name="rtsecuritymanager_common_api" long-name="Runtime Security Manager Common API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/group"/>
-</component>
-<component name="rtsecuritymanager_utility_api" long-name="Runtime Security Manager Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
-</component>
-<component name="rtsecuritymanager_client_api" long-name="Runtime Security Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/group"/>
-</component>
-<component name="liw_provider_utility_api" long-name="LIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_provider_utility_api/group"/>
-</component>
-<component name="liw_service_interface_base_api" long-name="LIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_base_api/group"/>
-</component>
-<component name="liw_service_interface_menu_api" long-name="LIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_menu_api/group"/>
-</component>
-<component name="liw_criteria_api" long-name="LIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_criteria_api/group"/>
-</component>
-<component name="liw_generic_parameter_api" long-name="LIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_generic_parameter_api/group"/>
-</component>
-<component name="liw_service_handler_api" long-name="LIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_handler_api/group"/>
-</component>
-</collection>
-<collection name="rtsecuritymanager" long-name="Runtime Security Manager" level="server">
-<component name="rtsecuritymanagerutil" filter="s60" long-name="Runtime Security Manager Util">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
-</component>
-<component name="rtsecuritymanagerserver" filter="s60" long-name="Runtime Security Manager Server">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/>
-</component>
-<component name="rtsecuritymanagerclient" filter="s60" long-name="Runtime Security Manager Client">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/>
-</component>
-<component name="rtsecuritymanager_build" filter="s60" long-name="Runtime Security Manager Build">
-<!-- Move the export to the appropriate components, or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/group"/>
-</component>
-</collection>
-<collection name="languageinterworkingfw" long-name="Language Interworking Framework" level="framework">
-<component name="lifwservicehandler" filter="s60" long-name="Service Handler">
-<unit bldFile="mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-</block>
-<block name="serviceapi" level="specific" long-name="Service API" levels="os mw1 mw2 app">
-<!-- should break up this collection into something meaningful -->
-<collection name="serviceproviders" long-name="Service Providers" level="mw1">
-<component name="sapi_contacts_vpbk" long-name="Contacts Phonebook SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
-</component>
-<component name="sapi_location" long-name="Location SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_location/group"/>
-</component>
-<component name="sapi_mediamanagement" long-name="Media Management SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/group"/>
-</component>
-<component name="sapi_landmarks" long-name="Landmarks SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
-</component>
-<component name="sapi_messaging" long-name="Messaging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/group"/>
-</component>
-<component name="sapi_applicationmanager" long-name="Application Manager SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
-</component>
-<component name="sapi_calendar" long-name="Calendar SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_calendar/group"/>
-</component>
-<component name="sapi_logging" long-name="Logging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_logging/group"/>
-</component>
-<component name="sapi_sensor" long-name="Sensor SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sensor/group"/>
-</component>
-<component name="sapi_sysinfo" long-name="Sysinfo SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sysinfo/group"/>
-</component>
-<component name="sapi_serviceregistry" long-name="Service Registry SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
-</component>
-<component name="jsapi" long-name="Javascript API" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/jsapi/group"/>
-</component>
-<component name="serviceproviders_build" filter="s60" long-name="Service API Build">
-<!-- distribute the exports or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapi/serviceproviders/group"/>
-</component>
-</collection>
-</block>
-<block name="web" level="specific" long-name="Web" levels="plugin utils server generic specific">
-<collection name="web_pub" long-name="Web Public Interfaces" level="specific">
-<component name="browser_control_api" long-name="Browser Control API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_control_api/group"/>
-</component>
-<component name="download_mgr_client_api" long-name="Download Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_client_api/group"/>
-</component>
-<component name="download_mgr_ui_api" long-name="Download Manager UI Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_ui_api/group"/>
-</component>
-<component name="favourites_engine_api" long-name="Favourites Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/favourites_engine_api/group"/>
-</component>
-<component name="browser_plugin_api" long-name="Browser Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_plugin_api/group"/>
-</component>
-<component name="settings_api" long-name="Settings API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/settings_api/group"/>
-</component>
-</collection>
-<collection name="web_plat" long-name="Web Platform Interfaces" level="specific">
-<component name="aiw_browser_provider_api" long-name="AIW Browser Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/aiw_browser_provider_api/group"/>
-</component>
-<component name="browser_dialogs_provider_api" long-name="Browser Dialogs Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_dialogs_provider_api/group"/>
-</component>
-<component name="browser_platform_api" long-name="Browser Platform API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_platform_api/group"/>
-</component>
-<component name="cod_handler_api" long-name="COD Handler API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cod_handler_api/group"/>
-</component>
-<component name="connection_manager_api" long-name="Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/connection_manager_api/group"/>
-</component>
-<component name="cxml_library_api" long-name="cXml Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cxml_library_api/group"/>
-</component>
-<component name="download_mgr_client_api_extn" long-name="Download Manager Client API Extension" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/download_mgr_client_api_extn/group"/>
-</component>
-<component name="feeds_engine_api" long-name="Feeds Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/feeds_engine_api/group"/>
-</component>
-<component name="launcher_api" long-name="Launcher API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/launcher_api/group"/>
-</component>
-<component name="multipart_parser_api" long-name="Multipart Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/multipart_parser_api/group"/>
-</component>
-<component name="recent_url_store_api" long-name="Recent URL Store API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/recent_url_store_api/group"/>
-</component>
-<component name="scheme_handler_plugin_api" long-name="Scheme Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scheme_handler_plugin_api/group"/>
-</component>
-<component name="scriptable_plugin_api" long-name="Scriptable Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scriptable_plugin_api/group"/>
-</component>
-<component name="webutils_api" long-name="Web Utils API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/webutils_api/group"/>
-</component>
-<component name="widget_registry_api" long-name="Widget Registry API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/widget_registry_api/group"/>
-</component>
-<component name="xml_parser_api" long-name="XML Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/xml_parser_api/group"/>
-</component>
-<component name="stmgesturefw_api" long-name="State Machine Gesture Framework API " filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/stmgesturefw_api/group"/>
-</component>
-</collection>
-<collection name="web_info" long-name="Web Info" level="specific">
-<component name="web_build" filter="s60" long-name="Web Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/group"/>
-</component>
-</collection>
-<collection name="browserutilities" long-name="Browser Utilities" level="utils">
-<component name="browserdialogsprovider" filter="s60" long-name="Browser Dialogs Provider">
-<unit bldFile="mw/web/browserutilities/browserdialogsprovider/group"/>
-</component>
-<component name="recenturlstore" filter="s60" long-name="Recent URL Store">
-<unit bldFile="mw/web/browserutilities/recenturlstore/group"/>
-</component>
-<component name="xmlparser" filter="s60" long-name="XML Interface">
-<unit bldFile="mw/web/browserutilities/xmlparser/group"/>
-</component>
-<component name="cxmllibrary" filter="s60" long-name="XML Parser Implementation">
-<unit bldFile="mw/web/browserutilities/cxmllibrary/group"/>
-</component>
-<component name="downloadmgr" filter="s60" long-name="Download Manager">
-<unit bldFile="mw/web/browserutilities/downloadmgr/group"/>
-</component>
-<component name="connectionmanager" filter="s60" long-name="Connection Manager">
-<unit bldFile="mw/web/browserutilities/connectionmanager/group"/>
-</component>
-<component name="browsertelservice" filter="s60" long-name="Browser Telephony Service">
-<unit bldFile="mw/web/browserutilities/browsertelservice/group"/>
-</component>
-<component name="favouritesengine" filter="s60" long-name="Favourites Engine">
-<unit bldFile="mw/web/browserutilities/favouritesengine/group"/>
-</component>
-<component name="feedsengine" filter="s60" long-name="Feeds Engine">
-<unit bldFile="mw/web/browserutilities/feedsengine/group"/>
-</component>
-<component name="multipartparser" filter="s60" long-name="Multipart Parser">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
-<!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
-</component>
-<component name="schemehandler" filter="s60" long-name="Scheme Handler">
-<unit bldFile="mw/web/browserutilities/schemehandler/group"/>
-</component>
-<component name="webutils" filter="s60" long-name="Web Utils">
-<unit bldFile="mw/web/browserutilities/webutils/group"/>
-</component>
-<component name="aiwbrowserprovider" filter="s60" long-name="AIW Browser Provider" plugin="Y">
-<unit bldFile="mw/web/browserutilities/aiwbrowserprovider/group"/>
-</component>
-<component name="browserutilities_build" filter="s60" long-name="Browser Utilities Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/browserutilities/group"/>
-</component>
-</collection>
-<collection name="webengine" long-name="Web Engine" level="server">
-<component name="osswebengine" filter="s60" long-name="OSS Web Engine">
-<!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
-<unit bldFile="mw/web/webengine/osswebengine/cache/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/memorymanager/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/npscript/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group/javascriptcore"/>
-</component>
-<component name="webkitutils" filter="s60" long-name="WebKit Utils">
-<unit bldFile="mw/web/webengine/webkitutils/group"/>
-</component>
-<component name="pagescaler" filter="s60" long-name="Page Scaler">
-<unit bldFile="mw/web/webengine/pagescaler/group"/>
-</component>
-<component name="webwidgetinstaller" filter="s60" long-name="Widget Installer">
-<unit bldFile="mw/web/webengine/widgetinstaller/group"/>
-</component>
-<component name="widgetregistry" filter="s60" long-name="Widget Registry">
-<unit bldFile="mw/web/webengine/widgetregistry/group"/>
-</component>
-<component name="wmlengine" filter="s60" long-name="WML Engine">
-<unit bldFile="mw/web/webengine/wmlengine/group"/>
-</component>
-<component name="device" filter="s60" long-name="Device">
-<!-- this needs a more meaningful name -->
-<unit bldFile="mw/web/webengine/device/group"/>
-</component>
-<component name="widgetengine" filter="s60" long-name="Widget Engine">
-<unit bldFile="mw/web/webengine/widgetengine/group"/>
-</component>
-<component name="web_memoryplugin" long-name="Memory Plugin" filter="s60" plugin="Y">
-<unit bldFile="mw/web/webengine/memoryplugin/group"/>
-</component>
-<component name="widgetmemoryplugin" filter="s60" long-name="Widget Memory Plugin" plugin="Y">
-<unit bldFile="mw/web/webengine/widgetmemoryplugin/group"/>
-</component>
-<component name="widgetbackuprestore" filter="s60" long-name="Widget Backup and Restore">
-<unit bldFile="mw/web/webengine/widgetbackuprestore/group"/>
-</component>
-<component name="browserrecognizers" filter="s60" long-name="Browser Recognizers" plugin="Y">
-<unit bldFile="mw/web/webengine/browserrecognizers/group"/>
-</component>
-<component name="wrtharvester" filter="s60" long-name="Web Runtime Harvester" plugin="Y">
-<unit bldFile="mw/web/webengine/wrtharvester/group"/>
-</component>
-</collection>
-<collection name="codhandler" long-name="Content Object Descriptor Handler" level="specific">
-<component name="codeng" filter="s60" long-name="COD Engine">
-<unit bldFile="mw/web/codhandler/codeng/group"/>
-</component>
-<component name="codui" filter="s60" long-name="COD UI">
-<unit bldFile="mw/web/codhandler/codui/group"/>
-</component>
-<component name="codrecog" filter="s60" long-name="COD Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/codrecog/group"/>
-</component>
-<component name="codviewer" filter="s60" long-name="COD Viewer">
-<unit bldFile="mw/web/codhandler/codviewer/group"/>
-</component>
-<component name="ddrecog" filter="s60" long-name="Download Descriptor Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/ddrecog/group"/>
-</component>
-<component name="ddviewer" filter="s60" long-name="Download Descriptor Viewer">
-<unit bldFile="mw/web/codhandler/ddviewer/group"/>
-</component>
-<component name="coddownload" filter="s60" long-name="COD Download">
-<unit bldFile="mw/web/codhandler/coddownload/group"/>
-</component>
-<component name="roapapp" filter="s60" long-name="ROAP Application">
-<unit bldFile="mw/web/codhandler/roapapp/group"/>
-</component>
-<component name="codhandler_build" filter="s60" long-name="COD Handler Build">
-<!-- Exports need to go into another component or make this self-contained.
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/codhandler/group"/>
-</component>
-</collection>
-<collection name="widgets" long-name="Web Widget Framework" level="generic">
-<!-- the following units can be uncommented when configuration is put in place -->
-<component name="widgetrecognizer" filter="s60" long-name="Widget Recognizer" plugin="Y">
-<!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
-</component>
-<component name="widgetinstaller" filter="s60" long-name="Widget Installer UI" plugin="Y">
-<!--<unit bldFile="widgets/widgetinstaller/group"/>-->
-</component>
-<component name="widgetlauncher" filter="s60" long-name="Widget Launcher">
-<!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
-</component>
-<component name="widgetapp" filter="s60" long-name="Widget UI">
-<!--<unit bldFile="widgets/widgetapp/group"/>-->
-</component>
-<component name="widgetsidchecker" filter="s60" long-name="Widget SID Checker" introduced="^3">
-<!--<unit bldFile="widgets/widgetsidchecker/group"/>-->
-</component>
-<component name="widgetpreinstaller" filter="s60" long-name="Widget Pre-Installer">
-<!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
-</component>
-<component name="widgetstartup" filter="s60" long-name="Widget Startup">
-<!--<unit bldFile="widgets/widgetstartup/group"/>-->
-</component>
-<component name="widgets_build" filter="s60" long-name="Widgets Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/widgets/group"/>
-</component>
-</collection>
-</block>
-<block name="websrv" level="generic" long-name="Web Services" levels="plugin framework server generic specific">
-<collection name="websrv_pub" long-name="Web Services Public Interfaces" level="specific">
-<component name="web_service_description_api" long-name="Web Service Description API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_description_api/group"/>
-</component>
-<component name="web_service_connection_api" long-name="Web Service Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/group"/>
-</component>
-<component name="web_service_manager_api" long-name="Web Service Manager API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/group"/>
-</component>
-<component name="hostlet_connection_api" long-name="Hostlet Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/group"/>
-</component>
-<component name="web_service_messaging_api" long-name="Web Service Messaging API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/group"/>
-</component>
-<component name="xml_extensions_api" long-name="XML Extensions API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/group"/>
-</component>
-<component name="xml_fragment_api" long-name="XML Fragment API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/group"/>
-</component>
-</collection>
-<collection name="webservices" long-name="Web Services Framework" level="generic">
-<!-- consider breaking this collection into more meaningful subsets -->
-<component name="wsnotifierplugins" filter="s60" long-name="WS Notifier Plugins" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsnotifierplugins/group"/>
-</component>
-<component name="wslogger" filter="s60" long-name="WS Logger">
-<unit bldFile="mw/websrv/webservices/wslogger/group"/>
-</component>
-<component name="wsxml" filter="s60" long-name="WS XML Extensions">
-<unit bldFile="mw/websrv/webservices/wsxml/group"/>
-</component>
-<component name="wsutils" filter="s60" long-name="WS Utils">
-<unit bldFile="mw/websrv/webservices/wsutils/group"/>
-</component>
-<component name="wsfragment" filter="s60" long-name="WS Fragment">
-<unit bldFile="mw/websrv/webservices/wsfragment/group"/>
-</component>
-<component name="wsdescription" filter="s60" long-name="WS Service Description">
-<unit bldFile="mw/websrv/webservices/wsdescription/group"/>
-</component>
-<component name="wsconnection" filter="s60" long-name="WS Service Connection">
-<unit bldFile="mw/websrv/webservices/wsconnection/group"/>
-</component>
-<component name="wsmessages" filter="s60" long-name="WS Messages">
-<unit bldFile="mw/websrv/webservices/wsmessages/group"/>
-</component>
-<component name="wscredentialmanager" filter="s60" long-name="WS Credential Manager">
-<unit bldFile="mw/websrv/webservices/wscredentialmanager/group"/>
-</component>
-<component name="wsframework" filter="s60" long-name="WS Framework">
-<unit bldFile="mw/websrv/webservices/wsframework/group"/>
-</component>
-<component name="wshttpchanneltransportplugin" filter="s60" long-name="WS HTTP Channel Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshttpchanneltransportplugin/group"/>
-</component>
-<component name="wsconnectionagent" filter="s60" long-name="WS Connection Agent">
-<unit bldFile="mw/websrv/webservices/wsconnectionagent/group"/>
-</component>
-<component name="wsprovider" filter="s60" long-name="WS Provider">
-<unit bldFile="mw/websrv/webservices/wsprovider/group"/>
-</component>
-<component name="wshostletconnection" filter="s60" long-name="WS Hostlet Connection">
-<unit bldFile="mw/websrv/webservices/wshostletconnection/group"/>
-</component>
-<component name="wsmanager" filter="s60" long-name="WS Service Manager">
-<unit bldFile="mw/websrv/webservices/wsmanager/group"/>
-</component>
-<component name="wsidentitymanager" filter="s60" long-name="WS Identity Manager">
-<unit bldFile="mw/websrv/webservices/wsidentitymanager/group"/>
-</component>
-<component name="idwsfplugin" filter="s60" long-name="ID-WSF Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/idwsfplugin/group"/>
-</component>
-<component name="wsibasicplugin" filter="s60" long-name="WS-I Basic Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsibasicplugin/group"/>
-</component>
-<component name="wsrestplugin" filter="s60" long-name="WS REST Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsrestplugin/group"/>
-</component>
-<component name="idwsfsecuritymechanism" filter="s60" long-name="ID-WSF Security Mechanism">
-<unit bldFile="mw/websrv/webservices/idwsfsecuritymechanism/group"/>
-</component>
-<component name="wspasswordtransforms" filter="s60" long-name="WS Password Transforms">
-<unit bldFile="mw/websrv/webservices/wspasswordtransforms/group"/>
-</component>
-<component name="wscore" filter="s60" long-name="WS Core Service Manager">
-<unit bldFile="mw/websrv/webservices/wscore/group"/>
-</component>
-<component name="wslocaltransportplugin" filter="s60" long-name="WS Local Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wslocaltransportplugin/group"/>
-</component>
-<component name="wshostlettransportplugin" filter="s60" long-name="WS Hostlet Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshostlettransportplugin/group"/>
-</component>
-<component name="wsstar" filter="s60" long-name="WS Star">
-<!-- can only have one unit. Need to split into separate components or #include from a single bld.inf -->
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarpolicy/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarplugin/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarmessagehandlers/group"/>
-</component>
-<component name="wsoviplugin" filter="s60" long-name="WS Ovi Plugin">
-<unit bldFile="mw/websrv/webservices/wsoviplugin/group"/>
-</component>
-<component name="webservices_build" filter="s60" long-name="Web Services Build">
-<!-- need to split into self-contained components -->
-<unit bldFile="mw/websrv/webservices/group"/>
-</component>
-</collection>
-<collection name="websrv_info" long-name="Web Services Info" level="specific">
-<component name="websrv_bld" filter="s60" long-name="Web Services Build">
-<!-- need to include common .hrh in each unit -->
-<unit bldFile="mw/websrv/group"/>
-</component>
-</collection>
-</block>
-<block name="platformtools" level="generic" long-name="Platform Tools">
-<collection name="gfxconversion" long-name="Graphics Conversion">
-<component name="bmconv_s60" filter="s60" long-name="S60 Bitmap Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/bmconv_s60/group"/>
-</component>
-<component name="mifconv" filter="s60" long-name="Multi Icon File Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/mifconv/group"/>
-</component>
-</collection>
-</block>
-<block name="uitools" level="specific" long-name="UI Tools" levels="compile encode tool if">
-<collection name="uitools_pub" long-name="UI Tools Public Interfaces" level="if">
-<component name="third_party_bitmap_palette_api" long-name="Third Party Bitmap Palette API" filter="s60" class="api">
-<unit bldFile="mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
-</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">
-<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">
-<unit bldFile="mw/uitools/uitools_plat/layout_system_private_api/group"/>
-</component>
-</collection>
-<collection name="cdlcompilertoolkit" long-name="CDL Compiler Toolkit" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompilertoolkit_build" filter="s60" long-name="CDL Compiler Toolkit Build">
-<unit bldFile="mw/uitools/cdlcompilertoolkit/group"/>
-</component>
-</collection>
-<collection name="cdlcompiler" long-name="CDL Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompiler_build" filter="s60" long-name="CDL Compiler Build">
-<unit bldFile="mw/uitools/cdlcompiler/group"/>
-</component>
-</collection>
-<collection name="gfxtools" long-name="Graphics Tools" level="tool">
-<component name="gditools" filter="s60" long-name="GDI Tools" class="PC">
-<unit bldFile="mw/uitools/gfxtools/gditools/group"/>
-</component>
-<component name="color" filter="s60" long-name="Bitmap Colour Palette" class="PC">
-<unit bldFile="mw/uitools/gfxtools/color/group"/>
-</component>
-</collection>
-<collection name="aknlayoutcompiler" long-name="Avkon Layout Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="aknlayoutcompiler_build" filter="s60" long-name="Avkon Layout Compiler Build">
-<unit bldFile="mw/uitools/aknlayoutcompiler/group"/>
-</component>
-</collection>
-<collection name="skincompiler" long-name="Skin Compiler" level="compile">
-<component name="aknskindesccompiler" filter="s60" long-name="Avkon Skin Descriptor Compiler">
-<unit bldFile="mw/uitools/skincompiler/AknSkinDescCompiler/group"/>
-</component>
-</collection>
-<collection name="reszip" long-name="Resource Zip" level="encode">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="reszip_build" filter="s60" long-name="Resource Zip Build">
-<unit bldFile="mw/uitools/reszip/group"/>
-</component>
-</collection>
-<collection name="toollibraries" long-name="Tool Libraries" level="tool"/>
-<collection name="svgtencoder" long-name="SVGT Encoder" level="encode">
-<component name="svgtenc" filter="s60" long-name="Standalone SVGT Encoder" class="PC">
-<unit bldFile="mw/uitools/svgtencoder/svgtenc/standalone/group"/>
-</component>
-</collection>
-</block>
-</layer>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="location" level="apps" long-name="Location Apps" levels="ui events loc api">
-<collection name="loc_plat" long-name="Location Apps Platform Interfaces" level="api">
-<component name="location_picker_service_api" long-name="Location Picker Service API" introduced="^4" filter="s60" class="api">
-<unit bldFile="app/location/loc_plat" proFile="location_plat.pro"/>
-</component>
-</collection>
-<collection name="locationpickerservice" long-name="Location Picker Service" level="loc">
-<!--collection is really a component. Should move down a directory -->
-<component name="locationpickerservice_build" filter="s60" long-name="Location Picker Service Build" introduced="^4">
-<unit bldFile="app/location/locationpickerservice" proFile="locationpickerservice.pro"/>
-</component>
-</collection>
-</block>
-<!-- pending removal -->
-<block name="mmsharinguis" level="services" long-name="Multimedia Sharing UIs" levels="base plugin if">
-<collection name="mmsharinguis_plat" long-name="Multimedia Sharing UIs Platform Interfaces" level="if">
-<component name="multimedia_sharing_settings_api" long-name="Multimedia Sharing Settings API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_settings_api/group"/>
-</component>
-<component name="multimedia_sharing_resource_api" long-name="Multimedia Sharing Resource API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_resource_api/group"/>
-</component>
-<component name="multimedia_sharing_manager_api" long-name="Multimedia Sharing Manager API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/group"/>
-</component>
-</collection>
-<collection name="mmsharing" long-name="Multimedia Sharing" level="base">
-<component name="mmshavailability" filter="s60" long-name="Multimedia Sharing Availability">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshavailability/group"/>
-</component>
-<component name="mmshindicator" filter="s60" long-name="Multimedia Sharing Indicator">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshindicator/group"/>
-</component>
-<!-- consider putting client and server in the same component -->
-<component name="mmshmanagercli" filter="s60" long-name="Multimedia Sharing Manager Client">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshmanagercli/group" filter="!test"/>
-</component>
-<component name="mmshmanagersrv" filter="s60" long-name="Multimedia Sharing Manager Server">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshmanagersrv/group"/>
-</component>
-<component name="mmshengine" filter="s60" long-name="Multimedia Sharing Engine">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshengine/group"/>
-</component>
-<component name="mmshui" filter="s60" long-name="Multimedia Sharing UI">
-<!-- can only have one unit: need to #include one from the other if it's needed -->
-<unit bldFile="app/mmsharinguis/mmsharing/mmshui/group"/>
-<unit bldFile="app/mmsharinguis/mmsharing/mmshui/help/group"/>
-</component>
-<component name="mmsharing_build" filter="s60" long-name="MM Sharing Build">
-<unit bldFile="app/mmsharinguis/mmsharing/group"/>
-</component>
-</collection>
-<collection name="mmshplugins" long-name="Multimedia Sharing Plugins" level="plugin">
-<component name="mmshaoplugin" filter="s60" long-name="Multimedia Sharing Always Online Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshaoplugin/group"/>
-</component>
-<component name="mmshaiwplugin" filter="s60" long-name="Multimedia Sharing AIW Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshaiwplugin/group"/>
-</component>
-<component name="mmshsipcrplugin" filter="s60" long-name="Multimedia Sharing SIP Client Resolver Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshsipcrplugin/group"/>
-</component>
-<component name="mmshsettingsuiplugin" filter="s60" long-name="Multimedia Sharing Settings UI Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshsettingsuiplugin/group"/>
-</component>
-<component name="mmshwpadapterplugin" filter="s60" long-name="Multimedia Sharing WAP Provisioning Adapter" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshwpadapterplugin/group"/>
-</component>
-</collection>
-<collection name="mmsharinguis_info" long-name="Multimedia Sharing UIs Info" level="if">
-<component name="mmsharinguis_build" filter="s60" long-name="Multimedia Sharing UIs Build">
-<!-- consider distributing to other components -->
-<unit bldFile="app/mmsharinguis/group"/>
-</component>
-</collection>
-</block>
-<block name="phone" level="apps" span="2" long-name="Phone Apps" levels="engine plugin ui app">
-<collection name="phoneapp" long-name="Phone Application" level="app">
-<component name="blacklist" filter="s60" long-name="Phone Blacklist Clearing" plugin="Y">
-<unit bldFile="app/phone/phoneapp/blacklist/group"/>
-</component>
-<component name="phoneuicontrol" filter="s60" long-name="Phone UI Control">
-<unit bldFile="app/phone/phoneapp/phoneuicontrol/group"/>
-</component>
-<component name="phoneuistates" filter="s60" long-name="Phone UI States">
-<unit bldFile="app/phone/phoneapp/phoneuistates/group"/>
-</component>
-<component name="phoneuiutils" filter="s60" long-name="Phone UI Utils">
-<unit bldFile="app/phone/phoneapp/phoneuiutils/group"/>
-</component>
-<component name="silenceactionplugin" filter="s60" long-name="Silence Action Plugin" plugin="Y">
-<unit bldFile="app/phone/phoneapp/silenceactionplugin/group"/>
-</component>
-<component name="phonemediatorcenter" filter="s60" long-name="Phone Mediator Center">
-<unit bldFile="app/phone/phoneapp/phonemediatorcenter/group"/>
-</component>
-<component name="phoneuiview2" filter="s60" long-name="Phone UI View">
-<unit bldFile="app/phone/phoneapp/phoneuiview2" proFile="phoneuiview2.pro"/>
-</component>
-<component name="phoneuiqtviewadapter" filter="s60" long-name="Phone UI Qt View Adapter" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneapp/phoneuiqtviewadapter" proFile="phoneuiqtviewadapter.pro"/>
-</component>
-<component name="phonestringloader" filter="s60" long-name="Phone String Loader" introduced="^4">
-<unit bldFile="app/phone/phoneapp/phonestringloader" proFile="phonestringloader.pro"/>
-</component>
-<component name="phoneui2" filter="s60" long-name="Phone UI">
-<unit bldFile="app/phone/phoneapp/phoneui2" proFile="phoneui2.pro"/>
-</component>
-</collection>
-<collection name="phoneengine" long-name="Phone Engine" level="engine">
-<component name="phonecntfinder2" filter="s60" long-name="Phone Contact Finder">
-<unit bldFile="app/phone/phoneengine/phonecntfinder2" proFile="phonecntfinder2.pro"/>
-</component>
-<component name="audiohandling" filter="s60" long-name="Phone Audio Handling">
-<unit bldFile="app/phone/phoneengine/audiohandling/group"/>
-</component>
-<component name="callhandling" filter="s60" long-name="Call Handling">
-<unit bldFile="app/phone/phoneengine/callhandling/group"/>
-</component>
-<component name="contacthandling2" filter="s60" long-name="Phone Contact Handling">
-<unit bldFile="app/phone/phoneengine/contacthandling2/group"/>
-</component>
-<component name="loghandling" filter="s60" long-name="Phone Log Handling">
-<unit bldFile="app/phone/phoneengine/loghandling/group"/>
-</component>
-<component name="engineinfo" filter="s60" long-name="Phone Engine Info">
-<unit bldFile="app/phone/phoneengine/engineinfo/group"/>
-</component>
-<component name="phonemodel" filter="s60" long-name="Phone Model">
-<unit bldFile="app/phone/phoneengine/phonemodel" proFile="phonemodel.pro"/>
-</component>
-<component name="servicehandling" filter="s60" long-name="Phone Service Handling">
-<unit bldFile="app/phone/phoneengine/servicehandling/group"/>
-</component>
-<component name="phoneservices" filter="s60" long-name="Phone Server" introduced="^4">
-<unit bldFile="app/phone/phoneengine/phoneservices" proFile="phoneservices.pro"/>
-</component>
-<component name="parserrecognizer" filter="s60" long-name="Parser Recognizer" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneengine/parserrecognizer" proFile="parserrecognizer.pro"/>
-</component>
-</collection>
-<collection name="phoneuis" long-name="Phone UIs" level="ui">
-<component name="bubblemanager2" filter="s60" long-name="Phone Bubble Manager">
-<unit bldFile="app/phone/phoneuis/bubblemanager2" proFile="bubblemanager2.pro"/>
-</component>
-<component name="telephonydevicemode" filter="s60" long-name="Telephony Device Mode">
-<unit bldFile="app/phone/phoneuis/telephonydevicemode/group"/>
-</component>
-</collection>
-<collection name="phone_plat" long-name="Phone Apps Platform Interfaces" level="app">
-<component name="3d_ringing_tone_enabler_api" long-name="3D Ringing Tone Enabler API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
-</component>
-<component name="telephony_comms_information_api" long-name="Telephony Comms Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_comms_information_api/group"/>
-</component>
-<component name="telephony_information_api" long-name="Telephony Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_information_api/group"/>
-</component>
-<component name="telephony_device_mode_api" long-name="Telephony Device Mode API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_device_mode_api/group"/>
-</component>
-<component name="telephony_remote_party_information_api" long-name="Telephony Remote Party Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_remote_party_information_api/group"/>
-</component>
-<component name="telephony_video_mailbox_settings_api" long-name="Telephony Video Mailbox Settings API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_video_mailbox_settings_api/group"/>
-</component>
-<component name="telephony_microphone_mute_status_api" long-name="Telephony Microphone Mute Status API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_microphone_mute_status_api/group"/>
-</component>
-<component name="telephony_logging_extension_api" long-name="Telephony Logging Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_logging_extension_api/group"/>
-</component>
-<component name="telephony_matching_extension_api" long-name="Telephony Matching Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_matching_extension_api/group"/>
-</component>
-<component name="phone_application_commands_api" long-name="Phone Application Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_commands_api/group"/>
-</component>
-<component name="phone_application_voip_commands_api" long-name="Phone Application VOIP Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_voip_commands_api/group"/>
-</component>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_mediator_api/group"/>
-</component>
-<component name="video_telephony_mediator_api" long-name="Video Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/video_telephony_mediator_api/group"/>
-</component>
-<component name="video_telephony_control_mediator_api" long-name="Video Telephony Control Mediator API" filter="s60" introduced="^4" class="api">
-<unit bldFile="app/phone/phone_plat/video_telephony_control_mediator_api/group"/>
-</component>
-</collection>
-<collection name="phoneplugins" long-name="Phone Plugins" level="plugin">
-<component name="csplugin" filter="s60" long-name="Circuit Switched Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/csplugin/group"/>
-</component>
-<component name="hsdialerwidgetplugin" filter="s60" long-name="Home Screen Dialer Widget Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/hsdialerwidgetplugin" proFile="hsdialerwidgetplugin.pro"/>
-</component>
-<component name="infowidgetplugin" filter="s60" long-name="Info Widget Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/infowidgetplugin" proFile=""/>
-</component>
-</collection>
-<collection name="phonesettings" long-name="Phone Settings" level="plugin">
-<component name="cpphonesettingsplugins" filter="s60" long-name="CP Phone Settings Plugins" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phonesettings/cpphonesettingsplugins" proFile="cpphonesettingsplugins.pro"/>
-</component>
-</collection>
-</block>
-<block name="videotelephony" level="apps" long-name="Video Telephony Apps" levels="engine plugin prot ui">
-<collection name="videotelephony_plat" long-name="VT Apps Platform Interfaces" level="ui">
-<component name="video_telephony_control_mediator_api" long-name="Video Telephony Control Mediator API" filter="s60" class="api">
-<unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_control_mediator_api/group"/>
-</component>
-<component name="video_telephony_media_configuration_api" long-name="Video Telephony Media Configuration API" filter="s60" class="api">
-<unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_media_configuration_api/group"/>
-</component>
-</collection>
-<collection name="vtengines" long-name="Video Telephony Engines" level="engine">
-<component name="videoteleng" filter="s60" long-name="Video Telephony Engine">
-<unit bldFile="app/videotelephony/vtengines/videoteleng/Group"/>
-</component>
-<component name="vtmediatorplugin" filter="s60" long-name="VT Mediator Plugin" plugin="Y">
-<unit bldFile="app/videotelephony/vtengines/vtmediatorplugin/group"/>
-</component>
-</collection>
-<collection name="vtuis" long-name="Video Telephony UIs" level="ui">
-<component name="videotelui" filter="s60" long-name="Video Telephony UI">
-<unit bldFile="app/videotelephony/vtuis/videotelui/group"/>
-</component>
-</collection>
-<collection name="vtprotocolplugins" long-name="VT Protocol Plugins" level="plugin">
-<component name="displaysink" filter="s60" long-name="Display Sink" introduced="^2">
-<unit bldFile="app/videotelephony/vtprotocolplugins/DisplaySink/group"/>
-</component>
-<component name="videosource" filter="s60" long-name="Video Source" introduced="^2">
-<unit bldFile="app/videotelephony/vtprotocolplugins/VideoSource/group"/>
-</component>
-</collection>
-<collection name="vtprotocolsstub" long-name="VT Protocols Stub" level="prot">
-<!-- this collection is really a component, move down a directory -->
-<component name="videotelproto" filter="s60" long-name="Video Telephony Protocol">
-<unit bldFile="app/videotelephony/vtprotocolsstub/group" filter="sf_build"/>
-</component>
-</collection>
-</block>
-<block name="settingsuis" level="services" long-name="Settings UIs" levels="plugin ui">
-<collection name="controlpanelplugins" long-name="Control Panel Plugins" level="plugin">
-<component name="themeplugin" filter="s60" long-name="Theme Plugin" introduced="^4">
-<unit bldFile="app/settingsuis/controlpanelplugins/themeplugin" proFile="themeplugin.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-<collection name="controlpanelui" long-name="Control Panel UI" level="ui">
-<!-- collection is really a component, move down a dir -->
-<component name="controlpanelui_build" filter="s60" long-name="Control Panel UI Build" introduced="^4">
-<unit bldFile="app/settingsuis/controlpanelui" proFile="controlpanelui.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-</block>
-<block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin framework app">
-<collection name="contentctrl_plat" long-name="Content Control Daemons Platforn Interfaces" level="app">
-<component name="ds_contactsdatastoreextension_api" long-name="Adapter Customization API" filter="s60" introduced="^4" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_contactsdatastoreextension_api/group"/>
-</component>
-<component name="ds_data_modification_api" long-name="DS Data Modification API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_data_modification_api/group"/>
-</component>
-</collection>
-<collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
-<component name="secon" filter="s60" long-name="Service Controllers">
-<unit bldFile="app/contentcontrol/connectivitymodules/secon/group"/>
-</component>
-</collection>
-<collection name="dsdcmoadapter" long-name="Data Sync DCMO Adapter" level="plugin">
-<!-- Component at wrong rank, should move down a directory -->
-<component name="dsdcmoadapter_build" filter="s60" long-name="Data Sync Control DCMO Adapter">
-<unit bldFile="app/contentcontrol/dsdcmoadapter/group"/>
-</component>
-</collection>
-<collection name="omads" long-name="OMA Data Sync" level="app">
-<component name="omads_build" filter="s60" long-name="OMA DS Build">
-<unit bldFile="app/contentcontrol/omads/group"/>
-<!-- need to remove #include and rename and OMA DS ROM -->
-</component>
-<component name="omadsextensions" filter="s60" long-name="OMA DS Extensions" plugin="Y">
-<unit bldFile="app/contentcontrol/omads/omadsextensions/group"/>
-</component>
-<component name="omadsextensions" filter="s60" long-name="OMA DS Qt Extensions" plugin="Y">
-<unit bldFile="app/contentcontrol/omads/omadsextensions" proFile="omadsextensions.pro"/>
-</component>
-</collection>
-</block>
-<block name="firsttimeuse" level="apps" long-name="First Time Use" levels="support services ui app">
-<!-- these empty collections are really components. Move down a directory and supply units -->
-<collection name="ftuapplication" long-name="First Time Use Application" level="app"/>
-<collection name="fturuntimeservices" long-name="First Time Use Runtime Services" level="services"/>
-<collection name="wizardproviders" long-name="Wizard Providers" level="support"/>
-<collection name="stateproviders" long-name="State Providers" level="support"/>
-<collection name="runtimeproviders" long-name="Runtime Providers" level="support"/>
-<collection name="firsttimeuse_info" long-name="First Time Use Info" level="ui">
-<component name="firsttimeuse_build" long-name="First Time Use Build">
-<unit bldFile="app/firsttimeuse" proFile="ftu.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-</block>
-<block name="devicecontrol" level="services" long-name="Device Control Daemons" levels="oma mid app">
-<collection name="deviceupdatesui" long-name="Device Updates UI" level="app">
-<component name="deviceupdatesui_adapters" long-name="Device Updates Adapters" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/devicecontrol/deviceupdatesui/adapters/bld"/>
-</component>
-<component name="deviceupdates" long-name="Device Updates" filter="s60" introduced="^4">
-<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdates" proFile="deviceupdates.pro"/>
-</component>
-<component name="deviceupdatesplugin" long-name="Device Updates Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdatesplugin" proFile="deviceupdatesplugin.pro"/>
-</component>
-<component name="deviceupdatesqtsp" long-name="Device Updates Qt Service Provider" filter="s60" introduced="^4">
-<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdatesqtsp" proFile="deviceupdatesqtsp.pro"/>
-</component>
-<component name="cpqtsp" long-name="Client Provisioning Qt Service Provider" filter="s60" introduced="^4">
-<unit bldFile="app/devicecontrol/deviceupdatesui/cpqtsp" proFile="cpqtsp.pro"/>
-</component>
-<component name="devicemanagementnotifiersplugin" long-name="Device Management Notifiers Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/devicecontrol/deviceupdatesui/devicemanagementnotifiersplugin" proFile="devicemanagementnotifiersplugin.pro"/>
-</component>
-</collection>
-</block>
-<block name="printing" level="services" long-name="Printing"/>
-<block name="files" level="apps" long-name="File Manager Apps" levels="support apps">
-<collection name="filemanager" long-name="File Manager" level="apps">
-<component name="filemanager_plat" long-name="File Manager Platform Interfaces" filter="s60" introduced="^4" class="api"/>
-<component name="fmbkupengine" filter="s60" long-name="File Manager Backup Engine" introduced="^4">
-<unit bldFile="app/files/filemanager/src/fmbkupengine/group"/>
-</component>
-<component name="filemanager_build" filter="s60" long-name="File Manager Build">
-<!-- break this up into components or move down a directory -->
-<unit bldFile="app/files/filemanager" proFile="filemanager.pro"/>
-</component>
-</collection>
-</block>
-<block name="search" level="apps" long-name="Search Apps" levels="eng base app api">
-<collection name="search_info" long-name="Search Info">
-<component name="search_build" long-name="Search Build">
-<unit bldFile="app/search/group"/>
-</component>
-</collection>
-<collection name="searchui" long-name="Search UI">
-<component name="searchui_build" long-name="Search UI Build">
-<unit bldFile="app/search/searchui" proFile="searchui.pro"/>
-</component>
-</collection>
-</block>
-<block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
-<collection name="contacts_plat" long-name="Contacts Apps Platform Interfaces" level="ui">
-<component name="logs_engine_api" long-name="Logs Engine API" filter="s60" introduced="^4" class="api"/>
-<component name="logs_engine_api_extensions" long-name="Logs Engine API Extensions" filter="s60" class="api"/>
-<component name="logs_services_api" long-name="Logs Services API" filter="s60" introduced="^4" class="api"/>
-<component name="logs_timers_api" long-name="Logs Timers API" filter="s60" class="api"/>
-<component name="qt_mobility_contacts_api" long-name="Qt Mobility Contacts API" filter="s60" introduced="^4" class="api"/>
-</collection>
-<collection name="logsui" long-name="Logs UI" level="ui">
-<component name="logsui_build" filter="s60" long-name="Logs UI Build">
-<!-- component at too high a rank, should move down one directory -->
-<unit bldFile="app/contacts/logsui" proFile="logsui.pro"/>
-</component>
-</collection>
-<collection name="phonebookui" long-name="Phonebook UI" level="ui">
-<component name="mobhistorymodel" filter="s60" long-name="Mobile History Model" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/mobhistorymodel" qt:proFile="mobhistorymodel.pro"/> -->
-</component>
-<component name="pbkcommonui" filter="s60" long-name="Phonebook Common UI" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/pbkcommonui" qt:proFile="pbkcommonui.pro"/> -->
-</component>
-<component name="phonebookapp" filter="s60" long-name="Phonebook Application" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/phonebookapp" qt:proFile="phonebookapp.pro"/> -->
-</component>
-<component name="phonebookservices" filter="s60" long-name="Phonebook Services" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/phonebookservices" qt:proFile="phonebookservices.pro"/> -->
-</component>
-<component name="phonebookui_build" filter="s60" long-name="Phonebook UI Build" introduced="^4">
-<!-- break up into components -->
-<unit bldFile="app/contacts/phonebookui" proFile="phonebookui.pro"/>
-</component>
-</collection>
-<collection name="qtcontactsmobility" long-name="Qt Contacts Mobility" level="support">
-<component name="qtcontactsmobility_build" filter="s60" long-name="Qt Contacts Mobility Build" introduced="^4" plugin="Y">
-<!-- not really a component, move down a dir? Break up into compnents? -->
-<unit bldFile="app/contacts/qtcontactsmobility" proFile="qtcontactsmobility.pro"/>
-</component>
-</collection>
-<collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
-<component name="cntfindplugin" filter="s60" long-name="Contacts Find Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntfindplugin" proFile="cntfindplugin.pro"/>
-</component>
-<component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
-<unit bldFile="app/contacts/phonebookengines/contactsmodel/groupsql" mrp="app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
-</component>
-<component name="cntsortplugin" filter="s60" long-name="Contacts Sort Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntsortplugin" proFile="cntsortplugin.pro"/>
-</component>
-<component name="mobcntmodel" filter="s60" long-name="Mobile Contacts Model" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/mobcntmodel" proFile="mobcntmodel.pro"/>
-</component>
-<component name="mobcntactions" filter="s60" long-name="Mobile Contacts Actions" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/mobcntactions" proFile="mobcntactions.pro"/>
-</component>
-<component name="cntmaptileservice" filter="s60" long-name="Contacts Map Tile Service" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/cntmaptileservice" proFile="cntmaptileservice.pro"/>
-</component>
-<component name="simutility" filter="s60" long-name="SIM Utility" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/simutility" proFile="simutility.pro"/>
-</component>
-</collection>
-<collection name="pimprotocols" long-name="PIM Protocols" level="services">
-<component name="phonebooksync" long-name="Phonebook Sync" purpose="optional" plugin="Y">
-<unit bldFile="app/contacts/pimprotocols/phonebooksync/group" mrp="app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
-</component>
-<component name="pbap" long-name="Bluetooth PBAP" introduced="9.2" purpose="optional">
-<unit bldFile="app/contacts/pimprotocols/pbap/group" mrp="app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
-</component>
-</collection>
-<collection name="contacts_info" long-name="Contacts Apps Info" level="ui">
-<component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="organizer" level="apps" span="2" long-name="Organizer Application Suite" levels="support services engine ui app">
-<collection name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" level="app">
-<component name="calendar_interim_utils2_api" long-name="Calendar Interim Utils 2 API" filter="s60" class="api">
-<!-- move into own .pro file -->
-<unit bldFile="app/organizer/organizer_pub" proFile="organizer_pub.pro"/>
-</component>
-</collection>
-<collection name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" level="app">
-<component name="organizer_plat_build" long-name="Organizer Application Suite Platform Interface Build" filter="s60" class="api">
-<!-- break up into individual .pro files -->
-<unit bldFile="app/organizer/organizer_plat" proFile="organizer_plat.pro"/>
-</component>
-<component name="agenda_versit_2_api" long-name="Agenda Versit 2 API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="organizer_plat/agenda_versit_2_api/group"/>-->
-</component>
-<component name="calendar_exporter_api" long-name="Calendar Exporter API" filter="s60" class="api placeholder">
-<!--<unit bldFile="organizer_plat/calendar_exporter_api/group"/>-->
-</component>
-<component name="calendar_importer_api" long-name="Calendar Importer API" filter="s60" class="api placeholder">
-<!--<unit bldFile="organizer_plat/calendar_importer_api/group"/>-->
-</component>
-<component name="calendar_launcher_api" long-name="Calendar Launcher API" filter="s60" class="api placeholder">
-<!--<unit bldFile="organizer_plat/calendar_launcher_api/group"/> -->
-</component>
-<component name="agenda_interface_api" long-name="Agenda Interface API" filter="s60" introduced="^4" class="api"/>
-<component name="calendar_editor_api" long-name="Calendar Editor API" filter="s60" introduced="^4" class="api"/>
-<component name="notes_editor_api" long-name="Notes Editor API" filter="s60" introduced="^4" class="api"/>
-<component name="agenda_eventviewer_api" long-name="Agenda Event Viewer API" filter="s60" introduced="^4" class="api"/>
-</collection>
-<collection name="agendainterface" long-name="Agenda Interface" level="services">
-<!-- collection is really a component, should move down a directory -->
-<component name="agendainterface_build" filter="s60" long-name="Agenda Interface Build">
-<unit bldFile="app/organizer/agendainterface" proFile="agendainterface.pro"/>
-</component>
-</collection>
-<collection name="calendarui" long-name="Calendar UI" level="ui">
-<component name="commonutils" filter="s60" long-name="Calendar Common Utils">
-<unit bldFile="app/organizer/calendarui/commonutils" proFile="commonutils.pro"/>
-</component>
-<component name="calenlauncher" filter="s60" long-name="Calendar Launcher">
-<unit bldFile="app/organizer/calendarui/calenlauncher/group" proFile="calenlauncher.pro"/>
-</component>
-<component name="caleneditor" filter="s60" long-name="Calendar Editor" introduced="^4">
-<unit bldFile="app/organizer/calendarui/caleneditor" proFile="caleneditor.pro"/>
-</component>
-<component name="agendaeventviewer" filter="s60" long-name="Agenda Event Viewer" introduced="^4">
-<unit bldFile="app/organizer/calendarui/agendaeventviewer" proFile="agendaeventviewer.pro"/>
-</component>
-<component name="globaldata" filter="s60" long-name="Calendar Global Data">
-<unit bldFile="app/organizer/calendarui/globaldata" proFile="globaldata.pro"/>
-</component>
-<component name="settings" filter="s60" long-name="Calendar Settings">
-<unit bldFile="app/organizer/calendarui/settings" proFile="settings.pro"/>
-</component>
-<component name="calenplugins" filter="s60" long-name="Calendar Plugins" introduced="^4" plugin="Y">
-<unit bldFile="app/organizer/calendarui/calenplugins" proFile="calenplugins.pro"/>
-</component>
-<component name="customisationmanager" filter="s60" long-name="Calendar Customisation Manager">
-<unit bldFile="app/organizer/calendarui/customisationmanager" proFile="customisationmanager.pro"/>
-</component>
-<component name="views" filter="s60" long-name="Calendar Views">
-<unit bldFile="app/organizer/calendarui/views" proFile="views.pro"/>
-</component>
-<component name="calengriditemstyleplugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/organizer/calendarui/styleplugins/calengriditemstyleplugin" proFile="calengriditemstyleplugin.pro"/>
-</component>
-<component name="calendarui_controller" filter="s60" long-name="Calendar Controller">
-<unit bldFile="app/organizer/calendarui/controller" proFile="controller.pro"/>
-</component>
-<component name="calendarui_application" filter="s60" long-name="Calendar Application">
-<unit bldFile="app/organizer/calendarui/application" proFile="application.pro"/>
-</component>
-<component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y">
-<unit bldFile="app/organizer/calendarui/caldav/group"/>
-</component>
-</collection>
-<collection name="notes" long-name="Notes" level="ui">
-<component name="noteseditor" filter="s60" long-name="Notes Editor" introduced="^4">
-<unit bldFile="app/organizer/notes/notesui/noteseditor" proFile="noteseditor.pro"/>
-</component>
-<component name="notes_build" filter="s60" long-name="Notes Build" introduced="^4">
-<unit bldFile="app/organizer/notes" proFile="notes.pro"/>
-</component>
-</collection>
-<collection name="calendarengines" long-name="Calendar Engines" level="engine">
-<component name="versit2" filter="s60" long-name="Versit 2 iCal Parser" introduced="9.2">
-<unit bldFile="app/organizer/calendarengines/versit2/group"/>
-</component>
-<component name="agnversit2" filter="s60" long-name="Versit 2 Agenda Interface" introduced="9.2" plugin="Y">
-<unit bldFile="app/organizer/calendarengines/agnversit2/group"/>
-</component>
-<component name="caleninterimutils" filter="s60" long-name="Calendar Interim Utils" introduced="9.1">
-<unit bldFile="app/organizer/calendarengines/caleninterimutils/group"/>
-</component>
-<component name="calenimp" filter="s60" long-name="Calendar Import Wrapper" introduced="7.0s">
-<unit bldFile="app/organizer/calendarengines/calenimp/group"/>
-</component>
-<component name="caldavsrv" filter="sf_build" long-name="CalDAV Server" introduced="^3">
-<unit bldFile="app/organizer/calendarengines/caldav/group"/>
-</component>
-</collection>
-<collection name="clock" long-name="Clock" level="app">
-<!-- uncomment unit when block_build is split up-->
-<component name="clockengines" filter="s60" long-name="Clock Engines" class="placeholder">
-<!--<unit bldFile="clock/clockengines" qt:proFile="clockengines.pro"/> -->
-</component>
-<component name="clockmw" filter="s60" long-name="Clock Middleware" introduced="^4" class="placeholder">
-<!--<unit bldFile="clock/clockmw" qt:proFile="clockmw.pro"/>-->
-</component>
-<component name="clockui" filter="s60" long-name="Clock UI" class="placeholder">
-<!--<unit bldFile="clock/clockui" qt:proFile="clockui.pro"/>-->
-</component>
-<component name="ftudatetimewizard" filter="s60" long-name="First Time Use Date/Time Wizard" introduced="^4" class="placeholder">
-<!--<unit bldFile="clock/ftudatetimewizard" qt:proFile="ftudatetimewizard.pro"/>-->
-</component>
-<component name="clock_build" filter="s60" long-name="Clock Build">
-<!-- make exports into a component, or just move to one of the above components, then remove this and uncomment the above -->
-<unit bldFile="app/organizer/clock" proFile="clock.pro"/>
-</component>
-</collection>
-<collection name="pimappservices" long-name="PIM Application Services" level="services">
-<component name="calendar" long-name="Calendar" introduced="9.2" purpose="optional">
-<unit bldFile="app/organizer/pimappservices/calendar/group" mrp="app/organizer/pimappservices/calendar/group/app-engines_calendar.mrp" version="2"/>
-</component>
-<component name="calendarvcalplugin" long-name="Calendar vCal Plugin" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="app/organizer/pimappservices/calendarvcalplugin/group" mrp="app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp" version="2"/>
-</component>
-<component name="appenginesdocs" long-name="Application Engines Documentation" purpose="development" class="doc">
-<unit mrp="app/organizer/pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
-</component>
-</collection>
-<collection name="pimappsupport" long-name="PIM Application Support" level="support">
-<component name="vcardandvcal" long-name="vCard and vCal" introduced="ER5" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/vcardandvcal/group" mrp="app/organizer/pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
-</component>
-<component name="chinesecalendarconverter" long-name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
-</component>
-</collection>
-<collection name="alarmui" long-name="Alarm UI" level="app">
-<!-- collection is really a component, should move down a directory -->
-<component name="alarmui_build" filter="s60" long-name="Alarm UI Build">
-<unit bldFile="app/organizer/alarmui" proFile="alarmui.pro"/>
-</component>
-</collection>
-<collection name="organizer_info" long-name="Organizer Application Suite Info" level="app">
-<component name="organizer_metadata" long-name="Organizer Application Suite Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="plugin eng base app api">
-<collection name="msg_plat" long-name="Messaging Apps Platform APIs" level="api">
-<component name="messaging_media_resolver_api" long-name="Messaging Media Resolver API" filter="s60" class="api"/>
-<component name="mms_application_api" long-name="MMS Application API" filter="s60" class="api"/>
-<component name="mms_codec_client_api" long-name="MMS Codec Client API" filter="s60" class="api"/>
-<component name="mms_conformance_api" long-name="MMS Conformance API" filter="s60" class="api"/>
-<component name="mms_engine_settings_api" long-name="MMS Engine Settings API" filter="s60" class="api"/>
-<component name="mms_server_settings_api" long-name="MMS Server Settings API" filter="s60" class="api"/>
-<component name="conversation_services_client_api" long-name="Conversation Services Client API" filter="s60" introduced="^4" class="api"/>
-<component name="conversation_services_plugin_api" long-name="Conversation Services Plugin API" filter="s60" introduced="^4" class="api"/>
-<component name="conversation_services_utilities_api" long-name="Conversation Services Utilities API" filter="s60" introduced="^4" class="api"/>
-<component name="shareui_api" long-name="Share UI API" filter="s60" introduced="^4" class="api"/>
-<component name="messaging_history_api" long-name="Messaging History API" filter="s60" introduced="^4" class="api"/>
-<component name="msg_plat_build" long-name="Messaging Apps Platform APIs Build" filter="s60" introduced="^4" class="api">
-<!-- break this up into the above units and replace their base attributes with bldFile, etc -->
-</component>
-</collection>
-<collection name="msg_pub" long-name="Messaging Apps Public APIs" level="api">
-<component name="mms_client_mtm_api" long-name="MMS Client MTM API" filter="s60" class="api"/>
-<component name="msg_smil_dtd_api" long-name="Messaging SMIL DTD API" filter="s60" introduced="^4" class="api"/>
-<component name="msg_pub_build" long-name="Messaging Apps Public APIs Build" filter="s60" introduced="^4" class="api">
-<!-- break this up into the above units and replace their base attributes with bldFile, etc -->
-</component>
-</collection>
-<collection name="mobilemessaging" long-name="Mobile Messaging" level="plugin">
-<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/mobilemessaging/smsmtm/group" mrp="app/messaging/mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
-</component>
-</collection>
-<collection name="messagingappbase" long-name="Messaging App Base" level="base">
-<component name="messagingappbase_build" filter="s60" long-name="Messaging App Base Build" introduced="^4">
-<!-- break this up into the below components -->
-<unit bldFile="app/messaging/messagingappbase" proFile="messagingappbase/messagingappbase.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgmedia" filter="s60" long-name="Message Media"/>
-<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
-<unit mrp="app/messaging/messagingappbase/smsmtm/group/messaging_sms.mrp"/>
-</component>
-<component name="smilparser" long-name="SMIL Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="app/messaging/messagingappbase/smilparser/GROUP" mrp="app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
-</component>
-<component name="obexmtms" long-name="OBEX MTMs" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/obexmtms/Group" mrp="app/messaging/messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
-</component>
-</collection>
-<collection name="mmsengine" long-name="MMS Engine" level="eng">
-<component name="mmsconninit" filter="s60" long-name="MMS Connection Initiator" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsconninit/bld"/> -->
-</component>
-<component name="genutils" filter="s60" long-name="General Utils" class="placeholder">
-<!-- <unit bldFile="mmsengine/genutils/bld"/> -->
-</component>
-<component name="mmsserversettings" filter="s60" long-name="MMS Server Settings" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserversettings/bld"/> -->
-</component>
-<component name="mmsmessage" filter="s60" long-name="MMS Message" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsmessage/bld"/> -->
-</component>
-<component name="mmshttptransport" filter="s60" long-name="MMS HTTP Transport" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmshttptransport/bld"/> -->
-</component>
-<component name="mmscodec" filter="s60" long-name="MMS Codec" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodec/bld"/> -->
-</component>
-<component name="mmsserver" filter="s60" long-name="MMS Server" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserver/bld"/> -->
-</component>
-<component name="clientmtm" filter="s60" long-name="MMS Client MTM" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/clientmtm/bld"/> -->
-</component>
-<component name="mmswatcher" filter="s60" long-name="MMS Watcher" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmswatcher/bld"/> -->
-</component>
-<component name="mmspushhandler" filter="s60" long-name="MMS Push Handler" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmspushhandler/bld"/> -->
-</component>
-<component name="applicationadapter" filter="s60" long-name="MMS Application Adapter" class="placeholder">
-<!-- <unit bldFile="mmsengine/applicationadapter/bld"/> -->
-</component>
-<component name="mmscodecclient" filter="s60" long-name="MMS Codec Client" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodecclient/bld"/> -->
-</component>
-<component name="mmssettings" long-name="MMS Settings" introduced="9.2" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmssettings/group" mrp="app/messaging/mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
-</component>
-<component name="mmsconf" long-name="MMS Configuration" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmsconf" mrp="app/messaging/mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
-</component>
-<component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
-<!-- this should be broken up into the individual other components -->
-<unit bldFile="app/messaging/mmsengine" proFile="mmsengine/mmsengine.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="messagingapp" long-name="Messaging Application" level="app">
-<component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
-<!-- this should be broken up into the individual other components -->
-<unit bldFile="app/messaging/mmsengine" proFile="mmsengine/mmsengine.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgutils" filter="s60" long-name="Messaging Utils" introduced="^4">
-<unit bldFile="app/messaging/msgutils" proFile="msgutils.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgappfw" filter="s60" long-name="Messaging Application Framework" introduced="^4">
-<unit bldFile="app/messaging/msgappfw" proFile="msgappfw.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgsettings" filter="s60" long-name="Messaging Settings" introduced="^4">
-<unit bldFile="app/messaging/msgsettings" proFile="msgsettings.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgnotifications" filter="s60" long-name="Messaging Notifications" introduced="^4">
-<unit bldFile="app/messaging/msgnotifications" proFile="msgnotifications.pro" qmakeArgs="-r"/>
-</component>
-<component name="smartmessaging" filter="s60" long-name="Smart Messaging">
-<unit bldFile="app/messaging/messagingapp/smartmessaging" proFile="smartmessaging.pro" qmakeArgs="-r"/>
-</component>
-<component name="shareui" filter="s60" long-name="Shared UI" introduced="^4">
-<unit bldFile="app/messaging/shareui" proFile="shareui.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgui" filter="s60" long-name="Messaging UI" introduced="^4">
-<unit bldFile="app/messaging/msgui" proFile="msgui.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="email" long-name="Email" level="plugin">
-<!-- use commonemail instead -->
-<component name="pop3andsmtpmtm" long-name="POP3 and SMTP MTM" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/pop3andsmtpmtm/group" mrp="app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
-</component>
-<component name="imap4mtm" long-name="IMAP4 MTM" introduced="9.2" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/imap4mtm/group" mrp="app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
-</component>
-</collection>
-<collection name="messaging_info" long-name="Messaging Apps Info" level="api">
-<component name="messaging_metadata" long-name="Messaging Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commonemail" level="apps" span="2" long-name="Email Apps" levels="service support ui app">
-<!-- need to resolve the qt parts into proper components, then uncomment the units -->
-<collection name="email_plat" long-name="Email Apps Platform Interfaces" level="app">
-<component name="nmail_client_api" long-name="NMail Client API" filter="s60" introduced="^4" class="api placeholder">
-<!--<unit bldFile="email_plat" qt:proFile="email_plat.pro"/> -->
-</component>
-</collection>
-<collection name="emailservices" long-name="Email Services" level="service">
-<component name="nmailbase" filter="s60" long-name="NMail Base" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/nmailbase" qt:proFile="nmailbase.pro"/> -->
-</component>
-<component name="emailcommon" filter="s60" long-name="Email Common" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/emailcommon" qt:proFile="emailcommon.pro"/>-->
-</component>
-<component name="emailframework" filter="s60" long-name="Email Framework" introduced="^2" class="placeholder">
-<!-- <unit bldFile="emailservices/emailframework" qt:proFile="emailframework.pro"/>-->
-</component>
-<component name="emailstore" filter="s60" long-name="Email Store" introduced="^2" class="placeholder">
-<!-- <unit bldFile="emailservices/emailstore" qt:proFile="emailstore.pro"/>-->
-</component>
-<component name="nmclientapi" filter="s60" long-name="Nmail Client API" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/nmclientapi" qt:proFile="nmclientapi.pro"/>-->
-</component>
-<component name="nmailagent" filter="s60" long-name="Nmail Agent" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/nmailagent" qt:proFile="nmailagent.pro"/>-->
-</component>
-</collection>
-<collection name="ipsservices" long-name="IMAP/POP/SMTP Services" level="service">
-<component name="ipssosplugin" filter="s60" long-name="IPS SOS Plugin" introduced="^2" plugin="Y" class="placeholder">
-<!-- SOS? Consider spelling it out since the abbreviation is ambiguous -->
-<!--<unit bldFile="ipsservices/ipssosplugin" qt:proFile="ipssosplugin.pro" />-->
-</component>
-<component name="nmimapclientplugin" filter="s60" long-name="NM IMAP Client Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="ipsservices/nmimapclientplugin" qt:proFile="nmimapclientplugin.pro"/>-->
-</component>
-<component name="nmipsmtms" filter="s60" long-name="NM IPS Client Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="ipsservices/nmipsmtms" qt:proFile="nmipsmtms.pro"/>-->
-</component>
-<component name="nmipssettings" filter="s60" long-name="NM IPS Settings" introduced="^4" class="placeholder">
-<!-- <unit bldFile="ipsservices/nmipssettings" qt:proFile="nmipssettings.pro"/>-->
-</component>
-<component name="ipsservices_build" filter="s60" long-name="IPS Services Build" introduced="^2" class="placeholder">
-<!--<unit bldFile="ipsservices" qt:proFile="ipsservices.pro"/> -->
-<!-- can the exports be broken up into the other components or made a config component?-->
-</component>
-</collection>
-<collection name="emailuis" long-name="Email UIs" level="app">
-<component name="nmailuiengine" filter="s60" long-name="Nmail UI Engine" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailuiengine" qt:proFile="nmailuiengine.pro"/> -->
-</component>
-<component name="nmailuiwidgets" filter="s60" long-name="Nmail UI Widgets" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailuiwidgets" qt:proFile="nmailuiwidgets.pro"/> -->
-</component>
-<component name="nmailuiwidgetsplugin" filter="s60" long-name="Nmail UI Widgets Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailuiwidgetsplugin" qt:proFile="nmailuiwidgetsplugin.pro"/> -->
-</component>
-<component name="nmsettingui" filter="s60" long-name="Nmail Setting UI" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmsettingui" qt:proFile="nmsettingui.pro"/> -->
-</component>
-<component name="nmailcpplugin" filter="s60" long-name="Nmail CP Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailcpplugin" qt:proFile="nmailcpplugin.pro"/> -->
-</component>
-<component name="nmailui" filter="s60" long-name="Nmail UI" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailui" qt:proFile="nmailui.pro"/> -->
-</component>
-<component name="nmindicatorplugin" filter="s60" long-name="Nmail Indicator Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmindicatorplugin" qt:proFile="nmindicatorplugin.pro"/> -->
-</component>
-<component name="nmframeworkadapter" filter="s60" long-name="Nmail Framework Adapter" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmframeworkadapter" qt:proFile="nmframeworkadapter.pro"/> -->
-</component>
-</collection>
-<collection name="commonemail_info" long-name="Email Apps Info" level="app">
-<component name="commonemail_build" long-name="Email Apps Build" introduced="^4">
-<!-- split into actual components -->
-<unit bldFile="app/commonemail" proFile="nmail.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</block>
-<block name="camera" level="apps" long-name="Camera Apps">
-<collection name="camerauis" long-name="Camera UIs">
-<component name="cameraxui" filter="s60" long-name="CameraX UIs">
-<unit bldFile="app/camera/camerauis/cameraxui" filter="!test" proFile="camerax.pro"/>
-</component>
-</collection>
-</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">
-<component name="image_editor_debug_utilities_api" long-name="Image Editor Debug Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
-</component>
-<component name="image_editor_utilities_api" long-name="Image Editor Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_utilities_api/group"/>
-</component>
-<component name="image_editor_definitions_api" long-name="Image Editor Definitions API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_definitions_api/group"/>
-</component>
-<component name="image_editor_system_parameters_api" long-name="Image Editor System Parameters API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_system_parameters_api/group"/>
-</component>
-<component name="image_processing_engine_api" long-name="Image Processing Engine API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_processing_engine_api/group"/>
-</component>
-</collection>
-<collection name="imageeditor" long-name="Image Editor UI" level="ui">
-<component name="pb" filter="s60" long-name="Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/pb/group"/>
-</component>
-<component name="iepb" filter="s60" long-name="Image Editor Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/iepb/group"/>
-</component>
-<component name="imageeditorui" filter="s60" long-name="Image Editor UI">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorui/group"/>
-</component>
-<component name="imageeditormanager" filter="s60" long-name="Image Editor Manager">
-<unit bldFile="app/imgeditor/imageeditor/imageeditormanager/group"/>
-</component>
-<component name="imageeditorapp" filter="s60" long-name="Image Editor Application">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorapp/group"/>
-</component>
-<component name="imageeditor_plugins" filter="s60" long-name="Image Editor Plugins" plugin="Y">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditor/plugins/blackwhiteplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/brightnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/bubbleplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cartoonizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/clipartplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/contrastplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cropplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/drawplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/frameplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/negativeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/redeyeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/resizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotatelplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotaterplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/textplugin/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditor/plugins/drawplugin/group"/>
- -->
-</component>
-<component name="editorprovider" filter="s60" long-name="Image Editor Provider">
-<unit bldFile="app/imgeditor/imageeditor/editorprovider/group"/>
-</component>
-<component name="imageeditor_build" filter="s60" long-name="Image Editor Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditor/group"/>
-</component>
-</collection>
-<collection name="imageeditorengine" long-name="Image Editor Engine" level="engine">
-<component name="filters" filter="s60" long-name="Image Editor Filters">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbrightness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbubble/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbuffer/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercartoon/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterclipart/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercontrast/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercrop/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterdraw/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterframe/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtergrayscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtericlsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegtarget/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filternegate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterredeye/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterrotate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtertext/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
- -->
-</component>
-<component name="imageeditorutils" filter="s60" long-name="Image Editor Utilities">
-<unit bldFile="app/imgeditor/imageeditorengine/imageeditorutils/group"/>
-</component>
-<component name="systemparameters" filter="s60" long-name="System Parameters">
-<unit bldFile="app/imgeditor/imageeditorengine/systemparameters/group"/>
-</component>
-<component name="enginewrapper" filter="s60" long-name="Image Editor Engine Wrapper">
-<unit bldFile="app/imgeditor/imageeditorengine/enginewrapper/group"/>
-</component>
-<component name="imageeditorengine_build" filter="s60" long-name="Image Editor Engine Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoeditor" level="apps" long-name="Video Editor Apps" levels="engine ui">
-<collection name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" level="ui">
-<component name="video_editor_engine_api" long-name="Video Editor Engine API" introduced="^2" class="api">
-<unit bldFile="app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
-</component>
-</collection>
-<collection name="videditor" long-name="Video Editor" level="ui">
-<component name="videoeditorcommon" filter="s60" long-name="Video Editor Common" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditorcommon/group"/>
-</component>
-<component name="videoeditoruicomponents" filter="s60" long-name="Video Editor UI Components" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditoruicomponents/group"/>
-</component>
-<component name="simplevideoeditor" filter="s60" long-name="Simple Video Editor" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplevideoeditor/group"/>
-</component>
-<component name="simplecutvideo" filter="s60" long-name="Simple Cut Video" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplecutvideo/group"/>
-</component>
-<component name="videoprovider" filter="s60" long-name="Video Provider" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoprovider/group"/>
-</component>
-<component name="manualvideoeditor" filter="s60" long-name="Manual Video Editor" introduced="^2" class="placeholder">
-<!-- uncomment when supported
- <meta rel="config">
- <defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
- </meta>
- <unit bldFile="videditor/manualvideoeditor/group"/> -->
-</component>
-<component name="videditor_build" filter="s60" long-name="Video Editor Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videditor/group"/>
-</component>
-</collection>
-<collection name="videoeditorengine" long-name="Video Editor Engine" level="engine">
-<component name="audioeditorengine" filter="s60" long-name="Audio Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/audioeditorengine/group"/>
-</component>
-<component name="avcedit" filter="s60" long-name="AVC Editing" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/avcedit/group"/>
-</component>
-<component name="h263decoder" filter="s60" long-name="H.263 Decoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/h263decoder/group"/>
-</component>
-<component name="mp3aacmaniplib" filter="s60" long-name="MP3 and AAC Manipulation Library" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
-</component>
-<component name="vedtranscoder" filter="s60" long-name="Video Editor Transcoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedtranscoder/group"/>
-</component>
-<component name="vedengine" filter="s60" long-name="Video Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedengine/group"/>
-</component>
-<component name="videoeditorengine_build" filter="s60" long-name="Video Editor Engine Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videoeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
-<collection name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" level="apps">
-<component name="videoplayer_startup_api" long-name="Video Player Startup API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videoplayer_startup_api/group" filter="!test"/>
-</component>
-<component name="videocollection_api" long-name="Video Collection API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videocollection_api/group"/>
-</component>
-</collection>
-<collection name="videocollection" long-name="Video Collection" level="util">
-<component name="mpxmyvideoscollection" filter="s60" long-name="MPX My Videos Collection" introduced="^3">
-<unit bldFile="app/videoplayer/videocollection/mpxmyvideoscollection/group"/>
-</component>
-<component name="videocollectionwrapper" filter="s60" long-name="Video Collection Wrapper" introduced="^4">
-<unit bldFile="app/videoplayer/videocollection/videocollectionwrapper" proFile="videocollectionwrapper.pro" qmakeArgs="-r"/>
-</component>
-<component name="videocollectionview" filter="s60" long-name="Video Collection View" introduced="^4">
-<unit bldFile="app/videoplayer/videocollection/videocollectionview" proFile="videocollectionview.pro" qmakeArgs="-r"/>
-</component>
-<component name="videofiledetailsview" filter="s60" long-name="Video File Details View" introduced="^4">
-<unit bldFile="app/videoplayer/videocollection/videofiledetailsview" proFile="videofiledetailsview.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="mediasettings" long-name="Media Settings" level="support">
-<!-- this is really a component. Should be moved down a directory -->
-<component name="mediasettings_build" filter="s60" long-name="Media Settings Build">
-<unit bldFile="app/videoplayer/mediasettings/group"/>
-</component>
-</collection>
-<collection name="videoplayerapp" long-name="Video Player App" level="apps">
-<component name="videoplayerengine" long-name="Video Player Engine" filter="s60" introduced="^4">
-<unit bldFile="app/videoplayer/videoplayerapp/videoplayerengine" proFile="videoplayerengine.pro" qmakeArgs="-r"/>
-</component>
-<component name="hbvideoplayer" filter="s60" long-name="HB Video Player" introduced="^4">
-<unit bldFile="app/videoplayer/videoplayerapp/hbvideoplayer" proFile="hbvideoplayer.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="videoplayback" long-name="Video Playback Plugins" level="plugin">
-<component name="hbvideoplaybackview" filter="s60" long-name="HB Video Playback View" introduced="^4" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/hbvideoplaybackview" proFile="hbvideoplaybackview.pro" qmakeArgs="-r"/>
-</component>
-<component name="hbvideoplaybackviewplugin" filter="s60" long-name="HB Video Playback View Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/hbvideoplaybackviewplugin" proFile="hbvideoplaybackviewplugin.pro" qmakeArgs="-r"/>
-</component>
-<component name="videohelix" long-name="Video Helix" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videohelix/group"/>
-</component>
-</collection>
-</block>
-<block name="photos" level="apps" long-name="Photos" levels="util support ui app">
-<collection name="photos_group" long-name="Photos Group" level="support">
-<component name="photos_group_build" filter="s60" long-name="Photos Group Build" introduced="^4" class="placeholder">
-<!--<unit bldFile="group" qt:proFile="group.pro"/> -->
-</component>
-</collection>
-<collection name="photos_loggers" long-name="Photos Loggers" level="util">
-<component name="photos_loggerqt" filter="s60" long-name="Photos Logger Qt" introduced="^4" class="placeholder">
-<!--<unit bldFile="loggers/loggerqt" qt:proFile="loggerqt.pro"/> -->
-</component>
-</collection>
-<collection name="photos_commonutilities" long-name="Photos Common Utilities" level="util">
-<component name="photos_externalutility" filter="s60" long-name="Photos External Utility" introduced="^4" class="placeholder">
-<!--<unit bldFile="commonutilities/externalutility" qt:proFile="externalutility.pro"/> -->
-</component>
-<component name="imagedecoderwrapper" filter="s60" long-name="Image Decoder Wrapper" introduced="^4" class="placeholder">
-<!--<unit bldFile="commonutilities/imagedecoderwrapper" qt:proFile="imagedecoderwrapper.pro"/> -->
-</component>
-</collection>
-<collection name="photos_ui" long-name="Photos UI" level="ui">
-<component name="photos_uiengine" filter="s60" long-name="Photos UI Engine" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/uiengine" qt:proFile="uiengine.pro"/> -->
-</component>
-<component name="photos_commandhandlers" filter="s60" long-name="Photos Command Handlers" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/commandhandlers" qt:proFile="commandhandlers.pro"/> -->
-</component>
-<component name="photos_views" filter="s60" long-name="Photos Views" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/views" qt:proFile="views.pro"/> -->
-</component>
-<component name="photos_viewmanagement" filter="s60" long-name="Photos View Management" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/viewmanagement" qt:proFile="viewmanagement.pro"/> -->
-</component>
-</collection>
-<collection name="photos_main" long-name="Photos Main" level="support">
-<component name="photos_main_build" filter="s60" long-name="Photos Main Build" introduced="^4" class="placeholder">
-<!--<unit bldFile="main" qt:proFile="main.pro"/> -->
-</component>
-</collection>
-<collection name="imageviewerapp" long-name="Image Viewer App" level="support">
-<component name="imageviewerapp_build" filter="s60" long-name="Image Viewer App Build" introduced="^4" class="placeholder">
-<!--<unit bldFile="imageviewerapp" qt:proFile="imageviewerapp.pro"/> -->
-</component>
-</collection>
-<collection name="photos_info" long-name="Photos Info" level="support">
-<component name="photos_build" filter="s60" long-name="Photos Build" introduced="^4">
-<!-- split this up into the above components -->
-<unit bldFile="app/photos/photosgallery" proFile="photos.pro"/>
-</component>
-</collection>
-</block>
-<block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support hs app">
-<!-- move the export .pri files into their components and uncomment the units -->
-<collection name="musicplayer_utilities " long-name="Music Player Utilities" level="support">
-<component name="mpnowplayingbanner" filter="s60" long-name="MP Now Playing Banner" introduced="^4" class="placeholder">
-<!-- <unit bldFile="utilities/mpnowplayingbanner" qt:proFile="mpnowplayingbanner.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-<component name="mpsettingsmanager" filter="s60" long-name="MP Settings Manager" introduced="^4" class="placeholder">
-<!-- <unit bldFile="utilities/mpsettingsmanager" qt:proFile="mpsettingsmanager.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-</collection>
-<collection name="musicfetcher " long-name="Music Fetcher" level="support">
-<!-- collection is really a component, move down a directory -->
-<component name="musicfetcher_buld" filter="s60" long-name="Music Fetcher Build" introduced="^4" class="placeholder">
-<!-- <unit bldFile="musicfetcher" qt:proFile="musicfetcher.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-</collection>
-<collection name="musicplayer_app " long-name="Music Player Application" level="app">
-<!-- collection is really a component, move down a directory -->
-<component name="musicplayer_app_build" filter="s60" long-name="Music Player Application Build" introduced="^4" class="placeholder">
-<!-- <unit bldFile="app" qt:proFile="app.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-</collection>
-<collection name="mpviewplugins " long-name="Music Player View Plugins" level="plugins">
-<component name="mpcollectionviewplugin" filter="s60" long-name="MP Collection View Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpviewplugins/mpcollectionviewplugin/group"/>-->
-</component>
-<component name="mpplaybackviewplugin" filter="s60" long-name="MP Playback View Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpviewplugins/mpplaybackviewplugin/group"/>-->
-</component>
-</collection>
-<collection name="mpserviceplugins" long-name="Music Player Service Plugins" level="plugins">
-<component name="audioeffects" filter="s60" long-name="Audio Effects" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/audioeffects/group"/>-->
-</component>
-<component name="localaudio" filter="s60" long-name="Local Audio" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/localaudio/group"/>-->
-</component>
-<!-- Note: it's called SQLite, not SQLLite, just the one "L" -->
-<component name="mpxsqlitedbcommon" filter="s60" long-name="MPX SQLite Database Common" introduced="^4" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitedbcommon/group"/>-->
-</component>
-<component name="mpxsqlitedbplugin" filter="s60" long-name="MPX SQLite Database Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitedbplugin/group"/>-->
-</component>
-<component name="mpxsqlitepodcastdbplugin" filter="s60" long-name="MPX SQLlite Podcast Database Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
-</component>
-<component name="m3uplaylistplugin" filter="s60" long-name="M3U Playlist Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
-</component>
-</collection>
-<collection name="musicplayer_info" long-name="Music Player Apps Info" level="app">
-<component name="musicplayer_build" filter="s60" long-name="Music Player Build">
-<!-- should brak up into individual components -->
-<unit bldFile="app/musicplayer" proFile="qtmusicplayer.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-</block>
-<block name="radio" level="apps" long-name="Radio Apps" levels="engine ui">
-<collection name="radioengine" long-name="Radio Engine" level="engine">
-<component name="radioengineutils" filter="s60" long-name="Radio Engine Utils" introduced="^4">
-<unit bldFile="app/radio/radioengine/utils/group"/>
-</component>
-<component name="radioenginesettings" filter="s60" long-name="Radio Engine Settings" introduced="^4">
-<unit bldFile="app/radio/radioengine/settings/group"/>
-</component>
-<component name="radioengine_engine" filter="s60" long-name="Radio Engine" introduced="^4">
-<unit bldFile="app/radio/radioengine/engine/group"/>
-</component>
-</collection>
-<collection name="radioapp" long-name="Radio App" level="ui">
-<component name="radioenginewrapper" filter="s60" long-name="Radio Engine Wrapper" introduced="^4">
-<unit bldFile="app/radio/radioapp/radioenginewrapper" proFile="radioenginewrapper.pro"/>
-</component>
-<component name="radiopresetstorage" filter="s60" long-name="Radio Preset Storage" introduced="^4">
-<unit bldFile="app/radio/radioapp/radiopresetstorage" proFile="radiopresetstorage.pro"/>
-</component>
-<component name="radiouiengine" filter="s60" long-name="Radio UI Engine" introduced="^4">
-<unit bldFile="app/radio/radioapp/radiouiengine" proFile="radiouiengine.pro"/>
-</component>
-<component name="radiowidgets" filter="s60" long-name="Radio Widgets" introduced="^4">
-<unit bldFile="app/radio/radioapp/radiowidgets" proFile="radiowidgets.pro"/>
-</component>
-<component name="radioapplication" filter="s60" long-name="Radio Application" introduced="^4">
-<unit bldFile="app/radio/radioapp/radioapplication" proFile="radioapplication.pro"/>
-</component>
-<component name="radio_rom" filter="s60" long-name="Radio ROM" introduced="^4">
-<unit bldFile="app/radio/rom/group"/>
-</component>
-</collection>
-</block>
-<block name="internetradio" level="apps" long-name="Internet Radio Apps" levels="engine server ui">
-<collection name="internetradio2_0" long-name="Internet Radio 2.0" level="ui">
-<!-- collection is really a component. Move down a dir -->
-<component name="internetradio2_0_build" long-name="Internet Radio 2.0 Build">
-<unit bldFile="app/internetradio/internetradio2.0/group"/>
-</component>
-</collection>
-<collection name="presetserver" long-name="Preset Server" level="server">
-<!-- collection is really a component. Move down a dir -->
-<component name="presetserver_build" long-name="Preset Server Build">
-<unit bldFile="app/internetradio/presetserver/group"/>
-</component>
-</collection>
-<collection name="qtinternetradio" long-name="Qt Internet Radio">
-<component name="qtinternetradio_build" long-name="Qt Internet Radio Build">
-<!-- Move down a dir or break into components-->
-<unit bldFile="app/internetradio/qtinternetradio" proFile="all.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-</block>
-<block name="homescreen" level="apps" long-name="Home Screen Apps" levels="support task ss hs">
-<collection name="homescreen_info" long-name="Home Screen Info" level="support">
-<component name="homescreen_build" long-name="Homescreen Build">
-<!-- break this up properly into components -->
-<unit bldFile="app/homescreen" proFile="homescreen.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-<collection name="homescreen_test" long-name="Home Screen Test" level="support"/>
-<!-- fiill in details with broken up homescreen_build -->
-<collection name="homescreenapp" long-name="Home Screen Application" level="hs">
-<component name="hsutils" long-name="Home Screen Utils" introduced="^4"/>
-<component name="hsdomainmodel" long-name="HS Domain Model" introduced="^4"/>
-<component name="hs_runtimeplugins" long-name="HS Runtime Plugins" introduced="^4" plugin="Y"/>
-<component name="hs_serviceproviders" long-name="HS Service Providers" introduced="^4" plugin="Y"/>
-<component name="hs_stateplugins" long-name="HS State Plugins" introduced="^4" plugin="Y"/>
-<component name="hs_widgetplugins" long-name="HS Widget Plugins" introduced="^4" plugin="Y"/>
-<component name="hsapplication" long-name="Home Screen Application" introduced="^4"/>
-<component name="hshomescreenclientplugin" long-name="Home Screen Client Plugin" introduced="^4" plugin="Y"/>
-<component name="hsmenucontentpublish" long-name="HS Menu Content Publish" introduced="^4"/>
-</collection>
-<collection name="screensaverapp" long-name="Screen Saver Application" level="ss">
-<component name="snsrutils" long-name="Screen Saver Utils" introduced="^4"/>
-<component name="snsr_serviceproviders" long-name="Screen Saver Service Providers" introduced="^4" plugin="Y"/>
-<component name="snsr_stateproviders" long-name="Screen Saver State Providers" introduced="^4" plugin="Y"/>
-<component name="snsr_runtimeproviders" long-name="Screen Saver Runtime Providers" introduced="^4" plugin="Y"/>
-<component name="snsrapplication" long-name="Screen Saver Application" introduced="^4"/>
-<component name="screensaverproviders" long-name="Screen Saver Providers" introduced="^4" plugin="Y"/>
-</collection>
-<collection name="taskswitcherapp" long-name="Task Switcher Application" level="task">
-<component name="taskswitcherappecom" long-name="Task Switcher Application ECom" introduced="^4"/>
-<component name="tsserviceplugin" long-name="Task Switcher Service Plugin" introduced="^4" plugin="Y"/>
-<component name="ts_runtimeplugins" long-name="TS Runtime Plugins" introduced="^4" plugin="Y"/>
-<component name="tsapplication" long-name="Task Switcher Application" introduced="^4"/>
-</collection>
-</block>
-<block name="homescreentools" level="services" long-name="Home Screen Tools" levels="tool install">
-<collection name="dtdinstaller" long-name="DTD Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<!-- this needs to be built first, does build order need to be forced with filters? -->
-<component name="dtdinstaller_build" filter="s60,bldmefirst" long-name="DTD Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/dtdinstaller/group"/>
-</component>
-</collection>
-<collection name="themeinstaller" long-name="Theme Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="themeinstaller_build" filter="s60" long-name="Theme Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/themeinstaller/group"/>
-</component>
-</collection>
-<collection name="widgettools" long-name="Widget Tools" level="install">
-<component name="hspluginpreinstaller" filter="s60" long-name="HS Plugin Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/hspluginspreinstaller/group"/>
-</component>
-<component name="wrtwidgetpreinstaller" filter="s60" long-name="WRT Widget Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
-</component>
-</collection>
-</block>
-<block name="webuis" level="services" long-name="Web UIs" levels="plugin app">
-<collection name="browserui" long-name="Browser UI" level="app">
-<component name="browser" filter="s60" long-name="Browser">
-<unit bldFile="app/webuis/browserui/browser/group"/>
-</component>
-<component name="operatormenu" filter="s60" long-name="Browser Operator Menu">
-<unit bldFile="app/webuis/browserui/operatormenu/group"/>
-</component>
-<component name="videoservices" filter="s60" long-name="Browser Video Services">
-<unit bldFile="app/webuis/browserui/videoservices/group"/>
-</component>
-</collection>
-<collection name="browserplugins" long-name="Browser Plugins" level="plugin">
-<component name="browsersysteminfoplugin" filter="s60" long-name="Browser System Info Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsersysteminfoplugin/group"/>-->
-</component>
-<component name="browsergpsplugin" filter="s60" long-name="Browser GPS Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsergpsplugin/group"/>-->
-</component>
-<component name="browseraudiovideoplugin" filter="s60" long-name="Browser Audio Video Plugin" plugin="Y">
-<unit bldFile="app/webuis/browserplugins/browseraudiovideoplugin/group"/>
-</component>
-<component name="browserplugins_build" filter="s60" long-name="Browser Plugins Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="app/webuis/browserplugins/group"/>
-</component>
-</collection>
-<collection name="pushmtm" long-name="Push MTM" level="plugin">
-<component name="pushmtm_help" filter="s60" long-name="Push MTM Help">
-<unit bldFile="app/webuis/pushmtm/help/group"/>
-</component>
-<component name="plugins" filter="s60" long-name="Push MTM Plugins" plugin="Y">
-<unit bldFile="app/webuis/pushmtm/plugins/group"/>
-</component>
-<component name="pushmtm_build" filter="s60" long-name="Push MTM Build">
-<!-- Some content is at collection level and some is at comopnent level. Either make this a single
- component and move it down a diretcory, or make separate independent components in this collection -->
-<unit bldFile="app/webuis/pushmtm/group"/>
-</component>
-</collection>
-</block>
-<block name="jrt" level="services" long-name="Java Runtime" levels="util generic rt ui">
-<collection name="jrt_plat" long-name="JRT Platform Interfaces" level="ui">
-<component name="java_registry_api" long-name="Java Registry API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_registry_api/build"/>
-</component>
-<component name="java_env_info_api" long-name="Java Environment Info API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_env_info_api/build"/>
-</component>
-<component name="java_debug_api" long-name="Java Debug API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_debug_api/build"/>
-</component>
-</collection>
-<collection name="java_stubs" long-name="Java Stubs" level="util">
-<!-- uncomment all components when configuration is in place. Currently #included from jrt_build -->
-<component name="javadrmutils" long-name="Java DRM Utils" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtdrmutils/group"/>-->
-</component>
-<component name="javaenvinfo" long-name="Java Environment Info" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtenvinfo/group"/>-->
-</component>
-<component name="javaregistry" filter="s60,sf_build" long-name="Java Registry" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtregistry/clientserver/client/group"/>-->
-</component>
-<component name="java_stubs_build" filter="s60,sf_build" long-name="Java Stubs ROM" class="placeholder">
-<!-- Remove the #includes and rename JRT ROM-->
-<!--<unit bldFile="java_stubs/group"/>-->
-</component>
-</collection>
-<collection name="jrt_info" long-name="JRT Info" level="rt">
-<component name="jrt_build" filter="s60" long-name="JRT Build">
-<!-- needed for __JAVA_STUBS condition -->
-<unit bldFile="app/jrt/group"/>
-</component>
-</collection>
-</block>
-<block name="conntools" level="services" long-name="Connectivity Tools" levels="config app">
-<collection name="nettools" long-name="Net Tools" level="app">
-<component name="conntest" filter="s60" long-name="Connection Test" purpose="development">
-<unit bldFile="app/conntools/nettools/conntest/group"/>
-</component>
-</collection>
-<collection name="emulatorlan" long-name="Emulator LAN" level="config">
-<!-- component is actually a colleciton, should be moved down a directory -->
-<component name="emulatorlan_build" filter="s60" long-name="Emulator LAN Build" purpose="development" class="config">
-<unit bldFile="app/conntools/emulatorlan/group"/>
-</component>
-</collection>
-</block>
-<block name="rndtools" level="services" long-name="R&D tools" levels="support generic test util">
-<collection name="creator" long-name="Creator" level="support">
-<!-- collection is really a component. Should move down a directory -->
-<component name="creator_build" filter="s60" long-name="Creator Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/creator/group"/>
-</component>
-</collection>
-<collection name="filebrowser" long-name="File Browser" level="util">
-<!-- consider collapsing into a single component -->
-<component name="fileopserver" filter="s60" long-name="File Operations Server" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
-</component>
-<component name="fileopclient" filter="s60" long-name="File Operations Client" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!--<unit bldFile="filebrowser/fileopclient/group"/>-->
-</component>
-<component name="filebrowser_build" filter="s60" long-name="File Browser Application" purpose="development" class="tool">
-<!-- Need to make this a self-contained component by removing #includes. Can only do when configuration is in place-->
-<unit bldFile="app/rndtools/filebrowser/group"/>
-</component>
-</collection>
-<collection name="launcher" long-name="Launcher" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="launcher_build" filter="s60" long-name="Launcher Utility" purpose="development" class="tool">
-<unit bldFile="app/rndtools/launcher/group"/>
-</component>
-</collection>
-<collection name="loadgen" long-name="Load Generator" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="loadgen_build" filter="s60" long-name="Load Generator Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/loadgen/group"/>
-</component>
-</collection>
-<collection name="perfmon" long-name="Performance Monitor" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="perfmon_build" filter="s60" long-name="Performance Monitor Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/perfmon/group"/>
-</component>
-</collection>
-<collection name="screengrabber" long-name="Screen Grabber" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="screengrabber_build" filter="s60" long-name="ScreenGrabber" purpose="development" class="tool">
-<unit bldFile="app/rndtools/screengrabber/group"/>
-</component>
-</collection>
-<collection name="stifui" long-name="STIF UI" level="generic">
-<component name="stifui_stifui" filter="s60" long-name="STIF UI" purpose="development">
-<unit bldFile="app/rndtools/stifui/stifui/group"/>
-</component>
-<component name="uitestserverstarter" filter="s60" long-name="UI Test Server Starter" purpose="development">
-<unit bldFile="app/rndtools/stifui/uitestserverstarter/group"/>
-</component>
-<component name="stifui_build" filter="s60" long-name="STIF UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/stifui/group"/>
-</component>
-</collection>
-<collection name="memspyui" long-name="Memspy UI" level="generic">
-<!-- collection is really a component. Should move down a directory -->
-<component name="memspyui_build" filter="s60" long-name="Memspy UI Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/memspyui/group"/>
-</component>
-</collection>
-<collection name="htiui" long-name="Harmonized Test Interface UI" level="generic">
-<component name="HtiCommPlugins" filter="s60" long-name="HTI Comm Plugins" purpose="development" plugin="Y">
-<unit bldFile="app/rndtools/htiui/HtiCommPlugins/HtiBtCommPlugin/group"/>
-</component>
-<component name="HtiServicePlugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- can only have a single unit. Should #include from a common bld.inf file -->
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiFtpBackupFake/group"/>
-</component>
-<component name="htidevicereboot" filter="s60" long-name="HTI Device Reboot" purpose="development">
-<unit bldFile="app/rndtools/htiui/htidevicereboot/group"/>
-</component>
-<component name="htistartupwait" filter="s60" long-name="HTI Startup Wait" purpose="development">
-<unit bldFile="app/rndtools/htiui/htistartupwait/group"/>
-</component>
-<component name="htiadmin" filter="s60" long-name="HTI Admin" purpose="development">
-<unit bldFile="app/rndtools/htiui/htiadmin/group"/>
-</component>
-<component name="htiui_build" filter="s60" long-name="HTI UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/htiui/group"/>
-</component>
-</collection>
-</block>
-<block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools if ui">
-<collection name="csxhelp" long-name="Context Sensitive Extended Help" level="if">
-<!-- this is really a component. Should move it down a directory -->
-<component name="csxhelp_build" filter="s60" long-name="Context Sensitive Extended Help Build">
-<unit bldFile="app/helps/csxhelp/group"/>
-</component>
-</collection>
-<collection name="symhelp" long-name="Symbian Help" level="eng">
-<component name="helpmodel" long-name="Help" introduced="6.0" purpose="optional">
-<unit bldFile="app/helps/symhelp/helpmodel/group" mrp="app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
-</component>
-</collection>
-<collection name="helps_info" long-name="Help Apps Info" level="ui">
-<component name="helps_metadata" long-name="Help Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/helps/helps_info/helps_metadata/helps_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
-<collection name="buildverification" long-name="Build Verification" level="services">
-<component name="autosmoketest" long-name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
-<unit bldFile="app/techview/buildverification/autosmoketest/Group" mrp="app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
-</component>
-<component name="smoketest" long-name="Smoke Test" filter="gt" purpose="development">
-<unit bldFile="app/techview/buildverification/smoketest/Group" mrp="app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
-</component>
-</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="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"/>
-<collection name="installationapps" long-name="Installation Apps" level="apps2"/>
-<collection name="messagingapps" long-name="Messaging Apps" level="apps2"/>
-<collection name="telephonyapps" long-name="Telephony Apps" level="apps1"/>
-<collection name="networkingapps" long-name="Networking Apps" level="apps1"/>
-<collection name="networkingutils" long-name="Networking Utils" level="utils"/>
-<collection name="shortlinkapps" long-name="Shortlink Apps" level="apps1"/>
-<collection name="testapps" long-name="Test Apps" level="utils"/>
-<collection name="avapps" long-name="A/V Apps" level="apps3"/>
-<collection name="toolkit" long-name="Toolkit" level="utils"/>
-<collection name="techview_info" long-name="Techview Info" level="apps3">
-<component name="techview_metadata" long-name="Techview Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/techview/techview_info/techview_metadata/techview_metadata.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
--- a/symbian4/single/sysdefs/auto/model_20100420123200_d580c54fc444.xml Wed May 05 12:21:47 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9252 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a package or prebuilt -->
-<!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) "N"
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile may someday be removed in favour of mrp -->
-<!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="low mw high">
-<block name="stubs" level="high" long-name="Stubs" levels="stub">
-<collection name="s60_stubs" level="stub">
-<component name="audiostubs" long-name="Audio Stubs">
-<unit bldFile="adaptation/stubs/audiostubs/group"/>
-</component>
-<component name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaptation Stub">
-<unit bldFile="adaptation/stubs/btaudioadaptation_stub/group"/>
-</component>
-<component name="drm_stubs" long-name="DRM Stubs">
-<unit bldFile="adaptation/stubs/drm_stubs/group"/>
-</component>
-<component name="ocrsrv_stub" long-name="OCR Services Stub">
-<unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
-</component>
-<component name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation">
-<unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
-</component>
-<component name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" plugin="Y">
-<unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
-</component>
-<component name="srsfenginestub" long-name="SRSF Engine Stub">
-<unit bldFile="adaptation/stubs/srsfenginestub/group"/>
-</component>
-<component name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub">
-<unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
-</component>
-<component name="systemswstubs" long-name="System Software Stubs">
-<unit bldFile="adaptation/stubs/systemswstubs/group"/>
-</component>
-<component name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" plugin="Y">
-<unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
-</component>
-<component name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub">
-<unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
-<collection name="omap3530" long-name="OMAP 3530" level="hw-if">
-<component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530" mrp="adaptation/beagleboard/omap3530/base_beagle.mrp"/>
-</component>
-<component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/kernel"/>
-</component>
-<component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/beagleboard"/>
-</component>
-</collection>
-</block>
-<block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
-<collection name="qemu_baseport" long-name="Baseport" level="hw-if">
-<component name="syborg" long-name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/qemu/baseport/syborg" mrp="adaptation/qemu/baseport/syborg/syborg.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
-<collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
-<component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
-<unit bldFile="os/kernelhwsrv/brdbootldr/ubootldr" mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
-</component>
-</collection>
-<collection name="bsptemplate" long-name="Board Support Package Template" level="hw-if">
-<component name="asspandvariant" long-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 name="kernel" long-name="Kernel Architecture" level="adaptation">
-<component name="eka" long-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 name="kerneltest" long-name="Kernel Test" level="hw-if">
-<component name="e32utils" long-name="E32 Utilities" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32utils/group" mrp="os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/>
-</component>
-<component name="e32test" long-name="E32 Tests" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32test/group" mrp="os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
-</component>
-<component name="f32test" long-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 name="ldds" long-name="Logical Device Drivers" level="adaptation">
-<component name="ethernetldd" long-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 name="audioldd" long-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>
-<component name="serialldd" long-name="Serial Port Drivers" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
-</component>
-<component name="legacydrivers" long-name="Legacy Drivers" purpose="optional">
-<unit mrp="os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
-</component>
-<component name="locmedia" long-name="Local Media Subsystem" introduced="8.1b" purpose="mandatory">
-<!-- these are LDDs for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
-</component>
-<component name="runmodedebugger" long-name="Run Mode Debugger" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/debug/group" mrp="os/kernelhwsrv/kernel/eka/drivers/debug/group/base_e32_drivers_debug.mrp"/>
-</component>
-<component name="btrace" long-name="Kernel Trace Tool" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/trace" mrp="os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
-</component>
-<component name="cameraldd" long-name="Camera Drivers" introduced="^3" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/camerasc" mrp="os/kernelhwsrv/kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
-</component>
-<component name="displayldd" long-name="Display Drivers" introduced="^3" purpose="optional">
-<!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/display" mrp="os/kernelhwsrv/kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
-</component>
-<component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
-</component>
-<component name="usbdescriptors" long-name="USB Descriptors" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors" mrp="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors/base_drivers_usbdescriptors.mrp"/>
-</component>
-<component name="usbdi_utils" long-name="USB DI Utils" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils" mrp="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils/base_drivers_usbdi_utils.mrp"/>
-</component>
-</collection>
-<collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
-<component name="mediadrivers" long-name="Media Drivers" purpose="optional">
-<!-- these are for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/media" mrp="os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
-</component>
-<component name="genericboardsupport" long-name="Generic Board Support" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
-</component>
-</collection>
-<collection name="userlibandfileserver" long-name="User Library and File Server" level="framework">
-<component name="euser" long-name="User Library" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/euser" mrp="os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
-</component>
-<component name="compsupp" long-name="Compiler Runtime Support" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/compsupp" mrp="os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
-</component>
-<component name="fileserver" long-name="File Server" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
-</component>
-<component name="estart" long-name="Base Starter" filter="gt" purpose="optional">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
-</component>
-<component name="domainmgr" long-name="Domain Manager" introduced="8.1b" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
-</component>
-</collection>
-<collection name="filesystems" long-name="File Systems" level="framework">
-<component name="romfs" long-name="ROM File System" filter="gt" purpose="optional" plugin="Y">
-<unit mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
-</component>
-<component name="rofs" long-name="ROFS" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
-</component>
-<component name="usbmsfs" long-name="USB Mass Storage File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
-</component>
-<component name="usbhostmssrv" long-name="USB Host Mass Storage Server" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage/base_f32_shostmassstorage.mrp"/>
-</component>
-<component name="fat32fs" long-name="FAT32 File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
-</component>
-<component name="fatfs" long-name="FAT File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
-</component>
-<component name="compfs" long-name="Composite File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
-</component>
-</collection>
-<collection name="halservices" long-name="HAL Services" level="framework">
-<component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
-<unit bldFile="os/kernelhwsrv/halservices/hal" mrp="os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
-</component>
-</collection>
-<collection name="textmodeshell" long-name="Text Mode Shell" level="test">
-<component name="e32wsrv" long-name="Text Window Server" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/ewsrv" mrp="os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
-</component>
-<component name="textshell" long-name="Text Shell" filter="gt" purpose="development">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
-</component>
-</collection>
-<collection name="baseapitest" long-name="Base API Tests" level="test"/>
-<collection name="kernelhwsrv_info" long-name="Kernel and Hardware Services Info" level="test">
-<component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 config">
-<collection name="emulator" long-name="Emulator" level="bsp">
-<component name="emulatorbsp" long-name="Emulator BSP" purpose="optional">
-<unit bldFile="os/boardsupport/emulator/emulatorbsp" mrp="os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
-</component>
-</collection>
-<collection name="haitest" long-name="HAI Test Suites" level="test">
-<component name="bspsvs" long-name="BSP Verification Suite" introduced="^2" purpose="development">
-<unit mrp="os/boardsupport/haitest/bspsvs/group/bspsvs.mrp"/>
-</component>
-</collection>
-<collection name="boardsupport_info" long-name="Board Support Info" level="config">
-<component name="boardsupport_metadata" long-name="Board Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/boardsupport/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
-<collection name="bldsystemtools" long-name="Build System Tools" level="bld">
-<component name="sysdeftools" long-name="System Definition Tools" purpose="development" introduced="^2">
-<unit mrp="os/buildtools/bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
-</component>
-<component name="commonbldutils" long-name="Common Utils" purpose="development">
-<unit mrp="os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
-</component>
-</collection>
-<collection name="toolsandutils" long-name="Tools and Utils" level="mw">
-<component name="productionbldtools" long-name="Production Build Tools" filter="gt" purpose="development">
-<unit mrp="os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
-</component>
-<component name="e32tools" long-name="E32 Tools" deprecated="^2" purpose="development" class="PC">
-<unit bldFile="os/buildtools/toolsandutils/e32tools/group" mrp="os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
-</component>
-<component name="autotest" long-name="Autotest" purpose="development">
-<unit bldFile="os/buildtools/toolsandutils/autotest/group" mrp="os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
-</component>
-</collection>
-<collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
-<component name="e32toolp" long-name="E32 Perl Tools" purpose="development" filter="sf_build" class="PC">
-<unit mrp="os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="os/buildtools/sbsv1_os/e32toolp/group"/>
-</component>
-</collection>
-<collection name="imgtools_os" long-name="Image Tools" level="fw">
-<component name="romkiteka2" long-name="ROMKIT EKA2" deprecated="^2" purpose="development">
-<unit bldFile="os/buildtools/imgtools_os/romkiteka2/group" mrp="os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
-</component>
-</collection>
-<collection name="misccomponents" long-name="Misc Components" level="mw">
-<component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt" purpose="development">
-<unit bldFile="os/buildtools/misccomponents/emulatorlauncher/group" mrp="os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
-</component>
-</collection>
-<collection name="buildtools_info" long-name="Build Tools Info" level="ui">
-<component name="buildtools_metadata" long-name="Build Tools Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/buildtools/buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
-<collection name="ossrv_pub" long-name="Generic OS Services Public Interfaces" level="utilities">
-<component name="boost_apis" long-name="Boost APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/boost_apis/group"/>
-</component>
-<component name="cpp_wrappers" long-name="Cpp wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cpp_wrappers/group"/>
-</component>
-<component name="character_type_apis" long-name="Character Type APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/character_type_apis/group"/>
-</component>
-<component name="compiler_specific_runtime_support" long-name="Compiler Specific Runtime Support" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/compiler_specific_runtime_support/group"/>
-</component>
-<component name="ossrv_configuration_api" long-name="Generic OS Services Configuration API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/configuration/group"/>
-</component>
-<component name="crypto_authentication_codes_and_hash_functions_api" long-name="Crypto Authentication Codes and Hash Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
-</component>
-<component name="crypto_auxillary_functions_api" long-name="Crypto Auxillary Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_auxillary_functions_api/group"/>
-</component>
-<component name="crypto_certificates_api" long-name="Crypto Certificates API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_certificates_api/group"/>
-</component>
-<component name="crypto_inputoutput_and_data_encoding_api" long-name="Crypto Input/Output and Data Encoding API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
-</component>
-<component name="crypto_public_key_cryptography_and_key_agreement_api" long-name="Crypto Public Key Cryptography and Key Agreement API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
-</component>
-<component name="crypto_symmetric_ciphers_api" long-name="Crypto Symmetric Ciphers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_symmetric_ciphers_api/group"/>
-</component>
-<component name="crypto_utility_functions_api" long-name="Crypto Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_utility_functions_api/group"/>
-</component>
-<component name="cryptogaphy_related_api" long-name="Cryptogaphy Related API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cryptogaphy_related_api/group"/>
-</component>
-<component name="ossrv_debug_api" long-name="Generic OS Services Debug API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/debug/group"/>
-</component>
-<component name="ossrv_exceptions_api" long-name="Generic OS Services Exceptions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/exceptions/group"/>
-</component>
-<component name="gboxed" long-name="GBoxed API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gboxed/group"/>
-</component>
-<component name="glib_arrays" long-name="Glib Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_arrays/group"/>
-</component>
-<component name="glib_asynchronous_queues" long-name="Glib Asynchronous Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_asynchronous_queues/group"/>
-</component>
-<component name="glib_atomic_operations" long-name="Glib Atomic Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_atomic_operations/group"/>
-</component>
-<component name="glib_automatic_string_completion" long-name="Glib Automatic String Completion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_automatic_string_completion/group"/>
-</component>
-<component name="glib_balanced_binary_trees" long-name="Glib Balanced Binary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_balanced_binary_trees/group"/>
-</component>
-<component name="glib_basic_types" long-name="Glib Basic Types API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_basic_types/group"/>
-</component>
-<component name="glib_caches" long-name="Glib Caches API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_caches/group"/>
-</component>
-<component name="glib_character_set_conversion" long-name="Glib Character Set Conversion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_character_set_conversion/group"/>
-</component>
-<component name="glib_closures" long-name="Glib Closures API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_closures/group"/>
-</component>
-<component name="glib_commandline_option_parser" long-name="Glib Command Line Option Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_commandline_option_parser/group"/>
-</component>
-<component name="glib_datasets" long-name="Glib Datasets API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_datasets/group"/>
-</component>
-<component name="glib_date_and_time_functions" long-name="Glib Date and Time Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_date_and_time_functions/group"/>
-</component>
-<component name="glib_doubleended_queues" long-name="Glib Double-ended Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doubleended_queues/group"/>
-</component>
-<component name="glib_doublylinked_lists" long-name="Glib Doubly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doublylinked_lists/group"/>
-</component>
-<component name="glib_dynamic_loading_of_modules" long-name="Glib Dynamic Loading of Modules API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_dynamic_loading_of_modules/group"/>
-</component>
-<component name="glib_enums_and_flags" long-name="Glib Enums and Flags API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_enums_and_flags/group"/>
-</component>
-<component name="glib_error_reporting" long-name="Glib Error Reporting API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_error_reporting/group"/>
-</component>
-<component name="glib_file_utilities" long-name="Glib File Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_file_utilities/group"/>
-</component>
-<component name="glib_generic_values" long-name="Glib Generic Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_generic_values/group"/>
-</component>
-<component name="glib_globstyle_pattern_matching" long-name="Glib Glob-Style Pattern Matching API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_globstyle_pattern_matching/group"/>
-</component>
-<component name="glib_hash_tables" long-name="Glib Hash Tables API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hash_tables/group"/>
-</component>
-<component name="glib_hook_functions" long-name="Glib Hook Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hook_functions/group"/>
-</component>
-<component name="glib_internationalization" long-name="Glib Internationalization API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_internationalization/group"/>
-</component>
-<component name="glib_io_channels" long-name="Glib I/O Channels API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_io_channels/group"/>
-</component>
-<component name="glib_keyvalue_file_parser" long-name="Glib Key-Value File Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_keyvalue_file_parser/group"/>
-</component>
-<component name="glib_lexical_scanner" long-name="Glib Lexical Scanner API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_lexical_scanner/group"/>
-</component>
-<component name="glib_main_event_loop" long-name="Glib Main Event Loop API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_main_event_loop/group"/>
-</component>
-<component name="glib_memory_allocation" long-name="Glib Memory Allocation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_allocation/group"/>
-</component>
-<component name="glib_memory_slices" long-name="Glib Memory Slices API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_slices/group"/>
-</component>
-<component name="glib_message_logging" long-name="Glib Message Logging API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_message_logging/group"/>
-</component>
-<component name="glib_miscellaneous_utility_functions" long-name="Glib Miscellaneous Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_miscellaneous_utility_functions/group"/>
-</component>
-<component name="glib_nary_trees" long-name="Glib N-ary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_nary_trees/group"/>
-</component>
-<component name="glib_parameters_and_values" long-name="Glib Parameters and Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_parameters_and_values/group"/>
-</component>
-<component name="glib_quarks" long-name="Glib Quarks API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_quarks/group"/>
-</component>
-<component name="glib_random_numbers" long-name="Glib Random Numbers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_random_numbers/group"/>
-</component>
-<component name="glib_relations_and_tuples" long-name="Glib Relations and Tuples API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_relations_and_tuples/group"/>
-</component>
-<component name="glib_shellrelated_utilities" long-name="Glib Shell-related Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_shellrelated_utilities/group"/>
-</component>
-<component name="glib_signals" long-name="Glib Signals API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_signals/group"/>
-</component>
-<component name="glib_simple_xml_subset_parser" long-name="Glib Simple XML Subset Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_simple_xml_subset_parser/group"/>
-</component>
-<component name="glib_singlylinked_lists" long-name="Glib Singly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_singlylinked_lists/group"/>
-</component>
-<component name="glib_spawning_processes" long-name="Glib Spawning Processes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_spawning_processes/group"/>
-</component>
-<component name="glib_standard_macros" long-name="Glib Standard Macros API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_standard_macros/group"/>
-</component>
-<component name="glib_string_utility_functions" long-name="Glib String Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_string_utility_functions/group"/>
-</component>
-<component name="glib_strings" long-name="Glib Strings API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_strings/group"/>
-</component>
-<component name="glib_thread_pools" long-name="Glib Thread Pools API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_thread_pools/group"/>
-</component>
-<component name="glib_threads" long-name="Glib Threads API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_threads/group"/>
-</component>
-<component name="glib_timers" long-name="Glib Timers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_timers/group"/>
-</component>
-<component name="glib_unicode_manipulation" long-name="Glib Unicode Manipulation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_unicode_manipulation/group"/>
-</component>
-<component name="glib_value_arrays" long-name="Glib Value Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_value_arrays/group"/>
-</component>
-<component name="glib_varargs_value_collection" long-name="Glib Varargs Value Collection API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_varargs_value_collection/group"/>
-</component>
-<component name="gobject" long-name="GObject API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gobject/group"/>
-</component>
-<component name="gparamspec" long-name="GParamSpec API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gparamspec/group"/>
-</component>
-<component name="gtype" long-name="GType API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtype/group"/>
-</component>
-<component name="gtypemodule" long-name="GTypeModule API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypemodule/group"/>
-</component>
-<component name="gtypeplugin" long-name="GTypePlugin API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypeplugin/group"/>
-</component>
-<component name="io_stream_api" long-name="I/O stream API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/io_stream_api/group"/>
-</component>
-<component name="localization_function_api" long-name="Localization Function API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/localization_function_api/group"/>
-</component>
-<component name="math_operations_api" long-name="Math Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/math_operations_api/group"/>
-</component>
-<component name="ossrv_memory_api" long-name="Generic OS Services Memory API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/memory/group"/>
-</component>
-<component name="no_namespace_headers" long-name="No Namespace Headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/no_namespace_headers/group"/>
-</component>
-<component name="openc_headers" long-name="OpenC headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_headers/group"/>
-</component>
-<component name="openc_wrappers" long-name="OpenC wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_wrappers/group"/>
-</component>
-<component name="ssl_general_api" long-name="SSL General API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_general_api/group"/>
-</component>
-<component name="ssl_protocol_methods_api" long-name="SSL Protocol Methods API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_protocol_methods_api/group"/>
-</component>
-<component name="standard_compressiondecompression_api" long-name="Standard Compression/Decompression API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/standard_compressiondecompression_api/group"/>
-</component>
-<component name="stl" long-name="STL API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/stl/group"/>
-</component>
-<component name="thread_api" long-name="Thread API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/thread_api/group"/>
-</component>
-<component name="type_attributes" long-name="Type Attributes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/type_attributes/group"/>
-</component>
-<component name="typeinfo" long-name="Type Info API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/typeinfo/group"/>
-</component>
-<component name="utility_apis" long-name="Utility APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/utility_apis/group"/>
-</component>
-<component name="wide_character_classapis" long-name="Wide character class/apis" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/wide_character_classapis/group"/>
-</component>
-<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">
-<unit bldFile="os/ossrv/ossrv_pub/dbus-glib/group"/>
-</component>
-</collection>
-<collection name="ossrv_plat" long-name="Generic OS Services Platform Interfaces" level="utilities">
-<component name="libutils_apis" long-name="Utility Library APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_plat/libutils/group"/>
-</component>
-</collection>
-<collection name="stdlibs" long-name="Standard Libraries" level="translation">
-<component name="libz" filter="s60" long-name="Z Compression Library">
-<unit bldFile="os/ossrv/stdlibs/libz/group"/>
-</component>
-<component name="libcrypt" filter="s60" long-name="Crypt Library">
-<unit bldFile="os/ossrv/stdlibs/libcrypt/group"/>
-</component>
-</collection>
-<collection name="ssl" long-name="SSL" level="data-services">
-<component name="libcrypto" filter="s60" long-name="Crypto Library">
-<unit bldFile="os/ossrv/ssl/libcrypto/group"/>
-</component>
-<component name="libssl" filter="s60" purpose="development" long-name="SSL Library">
-<unit bldFile="os/ossrv/ssl/libssl/group"/>
-</component>
-</collection>
-<collection name="glib" long-name="GLib" level="utilities">
-<component name="glibbackend" filter="s60" long-name="GLib Backend">
-<unit bldFile="os/ossrv/glib/build/symbian/glibbackend/group"/>
-<!-- Move to here: <unit bldFile="glib/glibbackend/group"/> -->
-</component>
-<component name="libglib" filter="s60" long-name="GLib Library">
-<unit bldFile="os/ossrv/glib/build/symbian/glib/group"/>
-<!-- Move to here: <unit bldFile="glib/libglib/group"/> -->
-</component>
-<component name="libgthread" filter="s60" long-name="Libg Thread">
-<unit bldFile="os/ossrv/glib/build/symbian/gthread/group"/>
-<!-- Move to here: <unit bldFile="glib/libgthread/group"/> -->
-</component>
-<component name="libgmodule" filter="s60" long-name="Libg Module">
-<unit bldFile="os/ossrv/glib/build/symbian/gmodule/group"/>
-<!-- Move to here: <unit bldFile="glib/libgmodule/group"/> -->
-</component>
-<component name="libgobject" filter="s60" long-name="Libg Object">
-<unit bldFile="os/ossrv/glib/build/symbian/gobject/group"/>
-<!-- Move to here: <unit bldFile="glib/libgobject/group"/> -->
-</component>
-</collection>
-<collection name="stdcpp" long-name="C++ Standard Library" level="translation">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="stdcpp_build" filter="s60" long-name="Stdcpp">
-<unit bldFile="os/ossrv/stdcpp/group"/>
-</component>
-</collection>
-<collection name="ofdbus" long-name="Open Foundation D-Bus" level="utilities">
-<component name="dbus" filter="s60" long-name="D-Bus">
-<unit bldFile="os/ossrv/ofdbus/dbus/group"/>
-</component>
-<component name="dbus-glib" filter="s60" long-name="D-Bus GLib">
-<unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
-</component>
-<component name="ofdbus_rom" filter="s60" long-name="D-Bus ROM">
-<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory
- Consider moving IBY file to one of the above as well and removing this component entirely -->
-<unit bldFile="os/ossrv/ofdbus/group"/>
-</component>
-</collection>
-<collection name="utilitylibraries" long-name="Utility Libraries" level="encoding">
-<component name="libutils" filter="s60" long-name="Utility Library">
-<unit bldFile="os/ossrv/utilitylibraries/libutils/group"/>
-</component>
-</collection>
-<collection name="genericservices" long-name="Generic Services" level="utilities">
-<component name="s60compatibilityheaders" long-name="S60 Compatibility Headers" filter="gt" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp" version="tb101sf"/>
-</component>
-<component name="mimerecognitionfw" long-name="MIME Recognition Framework" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/mimerecognitionfw/group" mrp="os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
-</component>
-<component name="systemagent" long-name="System Agent" introduced="9.0" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/systemagent/group" mrp="os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
-</component>
-<component name="taskscheduler" long-name="Task Scheduler" introduced="6.0" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/taskscheduler/group" mrp="os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
-</component>
-<component name="activebackupclient" long-name="Active Backup Client" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/activebackupclient/group" mrp="os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
-</component>
-<component name="syslibsdocs" long-name="Syslibs Documentation" purpose="development" class="doc">
-<unit mrp="os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
-</component>
-<component name="httputils" long-name="HTTP Utilities Library" introduced="6.2" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/httputils/group" mrp="os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
-</component>
-</collection>
-<collection name="syslibsapitest" long-name="SysLibs API Tests" level="utilities"/>
-<collection name="compressionlibs" long-name="Compression Libraries" level="data-services">
-<component name="ziplib" long-name="Zip Compression Library" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/ossrv/compressionlibs/ziplib/group" mrp="os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
-</component>
-</collection>
-<collection name="genericopenlibs" long-name="Generic Open Libraries" level="translation">
-<component name="cstdlib" long-name="C Standard Library" introduced="ER5" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/cstdlib/group" mrp="os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
-</component>
-<component name="cppstdlib" long-name="C++ Standard Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/cppstdlib/group" mrp="os/ossrv/genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
-</component>
-<component name="openenvcore" long-name="Open Environment Core" introduced="^2" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/openenvcore/group" mrp="os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
-</component>
-<component name="pluggableauthenticationmodulefw" long-name="Pluggable Authentication Module Framework" introduced="^4" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/pluggableauthenticationmodulefw/group" mrp="os/ossrv/genericopenlibs/pluggableauthenticationmodulefw/group/oeaddons_libpam.mrp"/>
-</component>
-<component name="posixrealtimeextensions" long-name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/posixrealtimeextensions/group" mrp="os/ossrv/genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
-</component>
-<component name="liboil" long-name="Liboil" introduced="^4" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/liboil/group" mrp="os/ossrv/genericopenlibs/liboil/group/oeaddons_liboil.mrp"/>
-</component>
-</collection>
-<collection name="lowlevellibsandfws" long-name="Low Level Libraries and Frameworks" level="app-libs">
-<component name="pluginfw" long-name="Plugin Framework" introduced="6.2" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp" version="3"/>
-</component>
-<component name="apputils" long-name="Application Utilities" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/apputils/group" mrp="os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
-</component>
-<component name="genericusabilitylib" long-name="Generic Usability Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/genericusabilitylib/group" mrp="os/ossrv/lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
-</component>
-</collection>
-<collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
-<component name="ossrv_build" filter="s60" long-name="Generic OS Services Build">
-<!-- exports should be moved to individual components -->
-<unit bldFile="os/ossrv/group"/>
-</component>
-<component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="featuremgmt" long-name="Feature Management" level="framework">
-<component name="featuremgr" long-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 name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/persistentdata/featuremgmt/featureregistry/group" mrp="os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
-</component>
-</collection>
-<collection name="loggingservices" long-name="Logging Services" level="server">
-<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">
-<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">
-<unit bldFile="os/persistentdata/loggingservices/rfilelogger/group" mrp="os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
-</component>
-</collection>
-<collection name="traceservices" long-name="Trace Services" level="server">
-<component name="commsdebugutility" long-name="Comms Debug Utility" introduced="7.0s" purpose="optional">
-<unit bldFile="os/persistentdata/traceservices/commsdebugutility/group" mrp="os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
-</component>
-<component name="tracefw" long-name="Trace Framework" introduced="9.2" purpose="development">
-<unit bldFile="os/persistentdata/traceservices/tracefw/ulogger/group" mrp="os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
-</component>
-</collection>
-<collection name="persistentstorage" long-name="Persistent Storage" level="framework">
-<component name="store" long-name="Store" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/store/group" mrp="os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
-</component>
-<component name="dbms" long-name="DBMS" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/dbms/group" mrp="os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
-</component>
-<component name="centralrepository" long-name="Central Repository" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/persistentdata/persistentstorage/centralrepository/group" mrp="os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
-</component>
-<component name="sql" long-name="SQL" introduced="9.3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sql/GROUP" mrp="os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
-</component>
-<component name="sqlite3api" long-name="SQLite 3 API" introduced="^3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sqlite3api/GROUP" mrp="os/persistentdata/persistentstorage/sqlite3api/GROUP/syslibs_sqlite3.mrp"/>
-</component>
-</collection>
-<collection name="persistentdata_info" long-name="Persistent Data Services Info" level="app-if">
-<component name="persistentdata_metadata" long-name="Persistent Data Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/persistentdata/persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
-<component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
-</component>
-<component name="common_platform_security_definitions_api" long-name="Common Platform Security Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group"/>
-</component>
-<component name="feature_discovery_api" long-name="Feature Discovery API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/group"/>
-</component>
-<component name="platform_environment_api" long-name="Platform Environment API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_environment_api/group"/>
-</component>
-<component name="sensor_channel_api" long-name="Sensor Channel API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_channel_api/group"/>
-</component>
-<component name="sensor_definitions_api" long-name="Sensor Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_definitions_api/group"/>
-</component>
-<component name="version_info_api" long-name="Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/group"/>
-</component>
-<component name="accessory_monitoring_api" long-name="Accessory Monitoring API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/group"/>
-</component>
-<component name="haptics_api" long-name="Haptics API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/haptics_api/group"/>
-</component>
-<component name="sensor_data_compensator_api" long-name="Sensor Data Compensator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
-</component>
-</collection>
-<collection name="devicesrv_plat" long-name="Device Services Platform Interfaces" level="app-if">
-<component name="configuration_file_parser_api" long-name="Configuration File Parser API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/configuration_file_parser_api/group"/>
-</component>
-<component name="dos_extension_plugin_api" long-name="DOS Extension Plug-In API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_plugin_api/group"/>
-</component>
-<component name="mediator_command_initiator_api" long-name="Mediator Command Initiator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_initiator_api/group"/>
-</component>
-<component name="syslangutil_api" long-name="SysLangUtil API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/syslangutil_api/group"/>
-</component>
-<component name="wakeup_alarm_api" long-name="Wakeup Alarm API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/wakeup_alarm_api/group"/>
-</component>
-<component name="disk_and_memory_level_keys_api" long-name="Disk and Memory Level Keys API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_and_memory_level_keys_api/group"/>
-</component>
-<component name="mediator_plugin_api" long-name="Mediator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_plugin_api/group"/>
-</component>
-<component name="headset_status_api" long-name="Headset Status API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/headset_status_api/group"/>
-</component>
-<component name="system_startup_extension_plugin_api" long-name="System Startup Extension Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/system_startup_extension_plugin_api/group"/>
-</component>
-<component name="sensor_plugin_api" long-name="Sensor Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_plugin_api/group"/>
-</component>
-<component name="accessory_api" long-name="Accessory API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_api/group"/>
-</component>
-<component name="display_language_definition_api" long-name="Display Language Definition API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/display_language_definition_api/group"/>
-</component>
-<component name="mediator_command_responder_api" long-name="Mediator Command Responder API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_responder_api/group"/>
-</component>
-<component name="accessory_policy_definitions_api" long-name="Accessory Policy Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_definitions_api/group"/>
-</component>
-<component name="hw_settings_api" long-name="Hardware Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/hw_settings_api/group"/>
-</component>
-<component name="mediator_domain_definitions_api" long-name="Mediator Domain Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_domain_definitions_api/group"/>
-</component>
-<component name="sensor_extension_api" long-name="Sensor Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_extension_api/group"/>
-</component>
-<component name="accessory_plugin_api" long-name="Accessory Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_plugin_api/group"/>
-</component>
-<component name="sae_api" long-name="SAE API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sae_api/group"/>
-</component>
-<component name="accessory_control_api" long-name="Accessory Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_control_api/group"/>
-</component>
-<component name="mediator_static_registration_api" long-name="Mediator Static Registration API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_static_registration_api/group"/>
-</component>
-<component name="accessory_key_event_handling_api" long-name="Accessory Key Event Handling API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_key_event_handling_api/group"/>
-</component>
-<component name="mediator_notification_api" long-name="Mediator Notification API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_notification_api/group"/>
-</component>
-<component name="accessory_policy_utility_api" long-name="Accessory Policy Utility API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_utility_api/group"/>
-</component>
-<component name="common_dsy_plugin_api" long-name="Common DSY Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/common_dsy_plugin_api/group"/>
-</component>
-<component name="remote_control_extension_api" long-name="Remote Control Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/remote_control_extension_api/group"/>
-</component>
-<component name="sensor_channel_filter_api" long-name="Sensor Channel Filter API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_channel_filter_api/group"/>
-</component>
-<component name="dos_extension_api" long-name="DOS Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_api/group"/>
-</component>
-<component name="accessory_audio_control_api" long-name="Accessory Audio Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_audio_control_api/group"/>
-</component>
-<component name="mediator_event_consumer_api" long-name="Mediator Event Consumer API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_consumer_api/group"/>
-</component>
-<component name="shared_data_api" long-name="Shared Data API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/shared_data_api/group"/>
-</component>
-<component name="accessory_settings_api" long-name="Accessory Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_settings_api/group"/>
-</component>
-<component name="accessory_bluetooth_control_api" long-name="Accessory Bluetooth Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_bluetooth_control_api/group"/>
-</component>
-<component name="extended_version_info_api" long-name="Extended Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_api/group"/>
-</component>
-<component name="mediator_event_provider_api" long-name="Mediator Event Provider API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_provider_api/group"/>
-</component>
-<component name="tv_out_config_api" long-name="TV Out Config API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_config_api/group"/>
-</component>
-<component name="tspclientmapper_api" long-name="TSP Client Mapper API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tspclientmapper_api/group"/>
-</component>
-<component name="powersave_api" long-name="Power Save API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_api/group"/>
-</component>
-<component name="powersave_definitions_api" long-name="Power Save Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_definitions_api/group"/>
-</component>
-<component name="powersave_plugin_api" long-name="Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_plugin_api/group"/>
-</component>
-<component name="extended_version_info_plugin_api" long-name="Extended Version Info Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_plugin_api/group"/>
-</component>
-<component name="haptics_plugin_api" long-name="Haptics Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_plugin_api/group"/>
-</component>
-<component name="haptics_effect_data_getter_plugin_api" long-name="Haptics Effect Data Getter Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
-</component>
-<component name="haptics_packetizer_plugin_api" long-name="Haptics Packetizer Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_packetizer_plugin_api/group"/>
-</component>
-<component name="tiltcompensation_api" long-name="Tilt Compensation API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tiltcompensation_api/group"/>
-</component>
-<component name="disk_notification_handler_api" long-name="Disk Notification Handler API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_notification_handler_api/group"/>
-</component>
-<component name="accessory_policy_usb_audio_api" long-name="Accessory Policy USB Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_usb_audio_api/group"/>
-</component>
-<component name="accessory_policy_hdmi_audio_api" long-name="Accessory Policy HDMI Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_hdmi_audio_api/group"/>
-</component>
-<component name="sensor_data_compensator_plugin_api" long-name="Sensor Data Compensator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
-</component>
-<component name="ddc_access_api" long-name="DDC Access API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/ddc_access_api/group"/>
-</component>
-<component name="tv_out_behaviour_api" long-name="TV Out Behaviour API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_behaviour_api/group"/>
-</component>
-</collection>
-<collection name="accessoryservices" long-name="Accessory Services" level="framework">
-<component name="accessorymonitor" filter="s60" long-name="Accessory Monitor">
-<unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/group"/>
-</component>
-<component name="accessoryremotecontrol" filter="s60" long-name="Accessory Remote Control">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
-</component>
-<component name="accessoryserver" filter="s60" long-name="Accessory Server">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryserver/group"/>
-</component>
-<component name="pluggeddisplay" filter="s60" long-name="Plugged Display" introduced="^3">
-<unit bldFile="os/devicesrv/accessoryservices/pluggeddisplay/group"/>
-</component>
-<component name="headsetstatusapi" filter="s60" long-name="Headset Status API">
-<unit bldFile="os/devicesrv/accessoryservices/headsetstatusapi/group"/>
-</component>
-<component name="tspclientmapper" filter="s60" long-name="TSP Client Mapper">
-<unit bldFile="os/devicesrv/accessoryservices/tspclientmapper/group"/>
-</component>
-<component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional">
-<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
-</component>
-<component name="gid_pc_tool" filter="s60" long-name="Generic ID PC Tool" class="tool PC">
-<unit bldFile="os/devicesrv/accessoryservices/gid_pc_tool/group"/>
-</component>
-</collection>
-<collection name="commonservices" long-name="Common Services" level="app-if">
-<component name="commonengine" filter="s60" long-name="Common Engine">
-<unit bldFile="os/devicesrv/commonservices/commonengine/group"/>
-</component>
-<component name="commonengineresources" filter="s60" long-name="Common Engine Resources" class="config">
-<unit bldFile="os/devicesrv/commonservices/commonengineresources/group"/>
-</component>
-<component name="platformenv" filter="s60" long-name="Platform Environment">
-<unit bldFile="os/devicesrv/commonservices/platformenv/group"/>
-</component>
-<component name="sysutil" long-name="System Utilities" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/sysutil/group" mrp="os/devicesrv/commonservices/sysutil/group/sysutil.mrp"/>
-</component>
-<component name="activitymanager" long-name="Activity Manager" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/activitymanager/group" mrp="os/devicesrv/commonservices/activitymanager/group/activitymanager.mrp"/>
-</component>
-</collection>
-<collection name="dosservices" long-name="Domestic Operating System Services" level="hw-if">
-<component name="commondsy" filter="s60" long-name="Common DSY" plugin="Y">
-<unit bldFile="os/devicesrv/dosservices/commondsy/group"/>
-</component>
-<component name="dosserver" filter="s60" long-name="Domestic OS Server">
-<unit bldFile="os/devicesrv/dosservices/dosserver/group"/>
-</component>
-</collection>
-<collection name="sensorservices" long-name="Sensor Services" level="framework">
-<component name="sensorserver" filter="s60" long-name="Sensor Server">
-<unit bldFile="os/devicesrv/sensorservices/sensorserver/group"/>
-</component>
-<component name="orientationssy" filter="s60" long-name="Orientation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/orientationssy/group"/>
-</component>
-<component name="tiltcompensationssy" filter="s60" long-name="Tilt Compensation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/tiltcompensationssy/group"/>
-</component>
-<component name="sensordatacompensator" filter="s60" long-name="Sensor Data Compensator">
-<unit bldFile="os/devicesrv/sensorservices/sensordatacompensator/group"/>
-</component>
-</collection>
-<collection name="hwrmhaptics" long-name="HWRM Haptics" level="plugin">
-<component name="hapticseffectdatagetterfw" filter="s60" long-name="Haptics Effect Data Getter Framework">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
-</component>
-<component name="hapticspluginservice" filter="s60" long-name="Haptics Plugin Service">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
-</component>
-<component name="hapticspacketizer" filter="s60" long-name="Haptics Packetizer">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
-</component>
-<component name="hapticspluginmanager" filter="s60" long-name="Haptics Plugin Manager">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
-</component>
-<component name="hapticsserver" filter="s60" long-name="Haptics Server">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsserver/group"/>
-</component>
-<component name="hapticsclient" filter="s60" long-name="Haptics Client">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsclient/group"/>
-</component>
-<component name="hwrmhaptics_build" filter="s60" long-name="HWRM Haptics Build">
-<!-- move these exports into the appropriate above components and delete this component-->
-<unit bldFile="os/devicesrv/hwrmhaptics/group"/>
-</component>
-</collection>
-<collection name="mediator" long-name="Mediator" level="app-if">
-<!--collection is really a component. Move it down a directory -->
-<component name="mediator_build" filter="s60" long-name="Mediator Build">
-<unit bldFile="os/devicesrv/mediator/group"/>
-</component>
-</collection>
-<collection name="psmservices" long-name="Power Save Mode Services" level="app-if">
-<component name="psmserver" filter="s60" long-name="PSM Server">
-<unit bldFile="os/devicesrv/psmservices/psmserver/group"/>
-</component>
-</collection>
-<collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
-<component name="hwrmfmtxwatcherplugin" filter="s60" long-name="HWRM FM Transmitter Watcher Plugin" plugin="Y">
-<unit bldFile="os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
-</component>
-<component name="hwrmtargetmodifierplugin" filter="s60" long-name="HWRM Target Modifier Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build,
- may need to -->
-<!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
-</component>
-<component name="vibractrl" filter="s60" long-name="Vibra Control" deprecated="9.1">
-<unit bldFile="os/devicesrv/resourcemgmt/vibractrl/group"/>
-</component>
-<component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="^2" purpose="optional">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
-</component>
-<component name="hwresourcesmgrconfig" long-name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
-</component>
-<component name="resourcemgmt_build" filter="s60" long-name="Resource Management Build">
-<!-- Move exports to a self-contained component.
- This needs to be kept around until configuration is in place -->
-<unit bldFile="os/devicesrv/resourcemgmt/group"/>
-</component>
-<component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
-</component>
-</collection>
-<collection name="sysstatemgmt" long-name="System State Management" level="server">
-<component name="ssmmapperutility" filter="s60" long-name="SSM Mapper Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmmapperutility/group"/>
-</component>
-<component name="ssmpolicyplugins" filter="s60" long-name="SSM Policy Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmpolicyplugins/group"/>
-</component>
-<component name="ssmutilityplugins" filter="s60" long-name="SSM Utility Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmutilityplugins/group"/>
-</component>
-<component name="ssmcmdlists" filter="s60" long-name="SSM Command Lists" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcmdlists/group"/>
-</component>
-<component name="ssmcustcmds" filter="s60" long-name="SSM Custom Commands" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcustcmds/group"/>
-</component>
-<component name="syslangutil" filter="s60" long-name="System Language Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/syslangutil/group"/>
-</component>
-<component name="sysrestart" filter="s60" long-name="System Restart" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysrestart/group"/>
-</component>
-<component name="sysuiprovider" filter="s60" long-name="System UI Provider" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysuiprovider/group"/>
-</component>
-<component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/group" mrp="os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
-</component>
-<component name="systemstatemgr" long-name="System State Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
-</component>
-<component name="systemstateplugins" long-name="System State Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
-</component>
-<component name="systemstatereferenceplugins" long-name="System State Reference Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
-</component>
-</collection>
-<collection name="resourceinterfaces" long-name="Resource Interfaces" level="hw-if">
-<component name="fmtransmittercontrol" long-name="FM Transmitter Control" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group" mrp="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
-</component>
-</collection>
-<collection name="systemhealthmanagement" long-name="System Health Management" level="server">
-<component name="systemhealthmgr" long-name="System Health Manager" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
-</component>
-</collection>
-<collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if"/>
-<collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
-<component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
-<collection name="authorisation" long-name="Authorisation" level="utilities">
-<component name="userpromptservice" long-name="User Prompt Service" introduced="^3" purpose="mandatory">
-<unit bldFile="os/security/authorisation/userpromptservice/group" mrp="os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
-</component>
-<component name="userpromptutils" long-name="User Prompt Utils" introduced="^3" purpose="optional">
-<unit bldFile="os/security/authorisation/userpromptutils/group" mrp="os/security/authorisation/userpromptutils/group/security_ups_utils.mrp"/>
-</component>
-</collection>
-<collection name="contentmgmt" long-name="Content Management" level="utilities">
-<component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
-<unit bldFile="os/security/contentmgmt/contentaccessfwfordrm/group" mrp="os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
-</component>
-<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">
-<unit bldFile="os/security/crypto/weakcryptospi/group" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
-</component>
-<component name="strongcryptospi" long-name="Strong Crypto SPI" filter="gt" introduced="^3" purpose="optional">
-<unit bldFile="os/security/crypto/weakcryptospi/strong" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
-</component>
-</collection>
-<collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
-<component name="securityutils" long-name="Security Utils" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/securityutils/group" mrp="os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
-</component>
-<component name="securitydocs" long-name="Security Documentation" purpose="development" class="doc">
-<unit mrp="os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
-</component>
-<component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
-</component>
-<component name="securitycommonutils" long-name="Security Common Utils" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/security/cryptomgmtlibs/securitycommonutils/group" mrp="os/security/cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
-</component>
-</collection>
-<collection name="securityanddataprivacytools" long-name="Security and Data Privacy Tools" level="services">
-<component name="securityconfig" long-name="Security Config" introduced="9.1" purpose="optional">
-<unit bldFile="os/security/securityanddataprivacytools/securityconfig/group" mrp="os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
-</component>
-<component name="securitytools" long-name="Security Tools" introduced="^3" purpose="optional" class="PC">
-<unit bldFile="os/security/securityanddataprivacytools/securitytools/group" mrp="os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
-</component>
-</collection>
-<collection name="cryptoplugins" long-name="Crypto Plugins" level="plugins">
-<component name="cryptospiplugins" long-name="Crypto SPI Plugins" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/security/cryptoplugins/cryptospiplugins/group" mrp="os/security/cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
-</component>
-</collection>
-<collection name="cryptoservices" long-name="Crypto Services" level="plugins">
-<component name="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/certificateandkeymgmt/group" mrp="os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
-</component>
-<component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
-</component>
-<component name="browserrootcertificates" long-name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
-<unit mrp="os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
-</component>
-<component name="rootcertificates" filter="sf_build" long-name="Root Certificates" introduced="7.0s" purpose="optional">
-<!-- not in S60 codebase -->
-<unit bldFile="os/security/cryptoservices/rootcertificates/group" mrp="os/security/cryptoservices/rootcertificates/group/rootcerts.mrp"/>
-</component>
-<component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/asnpkcs/group" mrp="os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
-</component>
-</collection>
-<collection name="security_info" long-name="OS Security Info" level="utilities">
-<component name="security_metadata" long-name="OS Security Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/security/security_info/security_metadata/security_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
-<collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
-<component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
-</component>
-<component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
-</component>
-<component name="simulationpositioningmodule" long-name="Simulation Positioning Module" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
-</component>
-<component name="gpspositioningmodule" long-name="GPS/A-GPS Positioning Module" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/gpspositioningmodule/group" mrp="os/lbs/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
-</component>
-<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>
-</collection>
-<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
-<component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
-</component>
-</collection>
-<collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
-<component name="locationserver" long-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 name="networkrequesthandler" long-name="Network Request Handler" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
-</component>
-</collection>
-<collection name="lbstest" long-name="Locating Services Tests" level="application-interface">
-<component name="locationprotocoltest" long-name="Location Protocol Tests" introduced="9.2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/lbstest/locationprotocoltest/group" mrp="os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
-</component>
-</collection>
-<collection name="locationmgmt" long-name="Location Management" level="management">
-<component name="locmonitor" long-name="Location Monitor" introduced="^3" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
-</component>
-<component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/agpslocationmgr/group" mrp="os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
-</component>
-<component name="networklocationmgr" long-name="Network Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/networklocationmgr/group" mrp="os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
-</component>
-<component name="locationcore" long-name="Location Core" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locationcore/group" mrp="os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
-</component>
-<component name="networkgateway" long-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 name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
-<component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
-</component>
-<component name="suplrrlpasn1" filter="sf_build" long-name="SUPL RRLP ASN1 Parser">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
-</component>
-</collection>
-<collection name="lbsapitest" long-name="Location API Tests" level="application-interface"/>
-<collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
-<component name="lbs_metadata" long-name="Locating Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commsfw" level="services" long-name="Communications Framework" levels="server support framework process app-if">
-<collection name="commsprocess" long-name="Comms Process" level="process">
-<component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/commsfw/commsprocess/commsrootserverconfig/group" mrp="os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
-</component>
-</collection>
-<collection name="commsconfig" long-name="Comms Config" level="process">
-<component name="commsdatabase" long-name="Comms Database" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
-</component>
-<component name="commsdatabaseshim" long-name="Comms Database Shim" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/commsfw/commsconfig/commsdatabaseshim/group" mrp="os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
-</component>
-</collection>
-<collection name="datacommsserver" long-name="Data Comms Server" level="framework">
-<component name="esockserver" long-name="ESock Server" purpose="mandatory">
-<unit bldFile="os/commsfw/datacommsserver/esockserver/group" mrp="os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp" version="3"/>
-</component>
-<component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/group" mrp="os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
-</component>
-<component name="networkingdialogstub" long-name="Networking Dialog Stub" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/default" mrp="os/commsfw/datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
-</component>
-<component name="networkcontroller" long-name="Network Controller" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/datacommsserver/networkcontroller/group" mrp="os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
-</component>
-</collection>
-<collection name="serialserver" long-name="Serial Server" level="server">
-<component name="serialportcsy" long-name="Serial Port CSY" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/serialserver/serialportcsy" mrp="os/commsfw/serialserver/serialportcsy/ser-comms_serialportcsy.mrp"/>
-</component>
-<component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" purpose="development">
-<unit bldFile="os/commsfw/serialserver/packetloopbackcsy/group" mrp="os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
-</component>
-<component name="c32serialserver" long-name="C32 Serial Server" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/commsfw/serialserver/c32serialserver/group" mrp="os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
-</component>
-<component name="c32serialserverconfig" long-name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config">
-<unit bldFile="os/commsfw/serialserver/c32serialserverconfig" mrp="os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
-</component>
-<component name="c32serialserverdocs" long-name="C32 Serial Server Documentation" purpose="development" class="doc">
-<unit mrp="os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
-</component>
-</collection>
-<collection name="commsfwutils" long-name="Comms Framework Utilities" level="framework">
-<component name="commsbufs" long-name="Comms Buffers" introduced="^3" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwutils/commsbufs/group" mrp="os/commsfw/commsfwutils/commsbufs/group/comms-infras_commsbufs.mrp"/>
-</component>
-</collection>
-<collection name="commsfw_info" long-name="Comms Framework Info" level="app-if">
-<component name="commsinfrastructuredocs" long-name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
-<unit mrp="os/commsfw/commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
-</component>
-<component name="commsfw_metadata" long-name="Communications Framework Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/commsfw/commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
-</component>
-</collection>
-<collection name="commsfwsupport" long-name="Comms Framework Support" level="support">
-<component name="commselements" long-name="Comms Elements" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwsupport/commselements/group" mrp="os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
-</component>
-</collection>
-<collection name="commsinfrastructureapitest" long-name="Comms-Infras API Tests" level="app-if">
-<component name="commsinfrastructuresvs" long-name="Comms Infrastructure Verification Suite" introduced="^3" purpose="development">
-<unit mrp="os/commsfw/commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
-</component>
-</collection>
-<collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
-<component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
-</component>
-<component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" purpose="mandatory" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
-</component>
-<component name="commstools" long-name="Comms Tools" introduced="^3" purpose="development" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/commstools/group" mrp="os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
-</component>
-</collection>
-</block>
-<block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
-<component name="internetsockets" long-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>
-<collection name="tcpiputils" long-name="TCP/IP Utilities" level="plugin">
-<component name="dnd" long-name="DND" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/dnd/group" mrp="os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
-</component>
-<component name="dhcp" long-name="DHCP" introduced="8.0" purpose="optional">
-<unit bldFile="os/networkingsrv/tcpiputils/dhcp/group" mrp="os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
-</component>
-<component name="networkaddressandporttranslation" long-name="Network Address and Port Translation" introduced="^2" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
-</component>
-<component name="punycodeconv" long-name="Punycode Converter" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/punycodeconv/group" mrp="os/networkingsrv/tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
-</component>
-</collection>
-<collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
-<component name="nullagt" long-name="NULL AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/nullagt/group" mrp="os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
-</component>
-<component name="genericscprparameters" long-name="Generic SCPR Parameters" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/linklayercontrol/genericscprparameters/group" mrp="os/networkingsrv/linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
-</component>
-<component name="mbmsparameters" long-name="MBMS Parameters" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/mbmsparameters/group" mrp="os/networkingsrv/linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
-</component>
-<component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
-<unit bldFile="os/networkingsrv/linklayercontrol/networkinterfacemgr/group" mrp="os/networkingsrv/linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp" version="2"/>
-</component>
-</collection>
-<collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
-<component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
-</component>
-<component name="pppnif" long-name="PPP NIF" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/pppnif/group" mrp="os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp" version="2"/>
-</component>
-<component name="slipnif" long-name="SLIP NIF" purpose="development" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/slipnif/group" mrp="os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
-</component>
-<component name="tunnelnif" long-name="Tunnel NIF" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
-</component>
-</collection>
-<collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
-<component name="packetlogger" long-name="Packet Logger" introduced="8.1" purpose="development">
-<unit bldFile="os/networkingsrv/linklayerutils/packetlogger/group" mrp="os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
-</component>
-</collection>
-<collection name="networkcontrol" long-name="Network Control" level="plugin">
-<component name="qoslib" long-name="QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/qoslib/group" mrp="os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
-</component>
-<component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/pfqoslib/group" mrp="os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
-</component>
-<component name="qosfwprt" long-name="QoS Framework PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
-</component>
-<component name="qosipscpr" long-name="QoS IP SCPR" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosipscpr/group" mrp="os/networkingsrv/networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
-</component>
-<component name="ipnetworklayer" long-name="IP Network Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/ipnetworklayer/group" mrp="os/networkingsrv/networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
-</component>
-<component name="iptransportlayer" long-name="IP Transport Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/iptransportlayer/group" mrp="os/networkingsrv/networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
-</component>
-<component name="commsuserpromptmgr" long-name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkcontrol/commsuserpromptmgr/group" mrp="os/networkingsrv/networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
-</component>
-</collection>
-<collection name="networkprotocols" long-name="Network Protocols" level="plugin">
-<component name="ipeventnotifier" long-name="IP Event Notifier" introduced="8.1" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
-</component>
-<component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
-</component>
-<component name="iphook" long-name="IP Hook" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
-</component>
-<component name="mobileip" long-name="Mobile IP" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/mobileip/group" mrp="os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
-</component>
-<component name="dnsproxy" long-name="DNS Proxy" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/networkprotocols/dnsproxy/group" mrp="os/networkingsrv/networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
-</component>
-</collection>
-<collection name="networksecurity" long-name="Network Security" level="framework">
-<component name="tls" long-name="TLS" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tls/group" mrp="os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
-</component>
-<component name="tlsprovider" long-name="TLS Provider" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tlsprovider/group" mrp="os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
-</component>
-<component name="ipsec" long-name="IPsec" introduced="7.0" purpose="optional">
-<unit bldFile="os/networkingsrv/networksecurity/ipsec/group" mrp="os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
-</component>
-</collection>
-<collection name="networkingtestandutils" long-name="Networking Test and Utils" level="app-if">
-<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">
-<!-- production component: contains the IBY files -->
-<unit bldFile="os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
-</component>
-<component name="networkingdocs" long-name="Networking Documentation" purpose="development" class="doc">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
-</component>
-<component name="networkingsrv_metadata" long-name="Networking Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
-<component name="predictorcompression" long-name="Predictor Compression" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wlan" level="services" long-name="WLAN" levels="hw low mid high tools test">
-<collection name="wlan_plat" long-name="WLAN Platform Interfaces" level="test">
-<component name="wlan_dbif_api" long-name="WLAN DBIF API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_dbif_api/group"/>
-</component>
-<component name="wlan_hal_api" long-name="WLAN HAL API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hal_api/group"/>
-</component>
-<component name="wlan_management_api" long-name="WLAN Management API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_management_api/group"/>
-</component>
-<component name="wlan_device_settings_api" long-name="WLAN Device Settings API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_device_settings_api/group"/>
-</component>
-<component name="wlan_control_api" long-name="WLAN Control API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_control_api/group"/>
-</component>
-<component name="wlan_hw_initialization_data_api" long-name="WLAN Hardware Initialization Data API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hw_initialization_data_api/group"/>
-</component>
-<component name="wlan_power_save_plugin_api" long-name="WLAN Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_power_save_plugin_api/group"/>
-</component>
-<component name="wlan_info_api" long-name="WLAN Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_info_api/group"/>
-</component>
-<component name="wlan_agent_hotspot_plugin_api" long-name="WLAN Agent Hotspot Plug-in API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
-</component>
-<component name="wlan_osa_api" long-name="WLAN OSA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_osa_api/group"/>
-</component>
-<component name="wlan_spia_api" long-name="WLAN SPIA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_spia_api/group"/>
-</component>
-<component name="wlan_hpa_api" long-name="WLAN HPA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hpa_api/group"/>
-</component>
-<component name="wlan_eapol_plugin_api" long-name="WLAN EAPOL Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_eapol_plugin_api/group"/>
-</component>
-<component name="wlan_generic_plugin_api" long-name="WLAN Generic Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_generic_plugin_api/group"/>
-</component>
-<component name="wlan_aws_plugin_api" long-name="WLAN AWS Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_aws_plugin_api/group"/>
-</component>
-</collection>
-<collection name="wlan_pub" long-name="WLAN Public Interfaces" level="test">
-<component name="wlan_sdk_info_api" long-name="WLAN SDK Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_pub/wlan_sdk_info_api/group"/>
-</component>
-</collection>
-<collection name="wlan_bearer" long-name="WLAN Bearer" level="hw">
-<component name="wlanpsmplugin" filter="s60" long-name="WLAN PSM Plugin" plugin="Y">
-<unit bldFile="os/wlan/wlan_bearer/wlanpsmplugin/group"/>
-</component>
-<component name="wlanagent" filter="s60" long-name="WLAN Agent">
-<unit bldFile="os/wlan/wlan_bearer/wlanagent/group"/>
-</component>
-<component name="wlandbif_cd" filter="s60" long-name="WLAN CommsDat interface">
-<unit bldFile="os/wlan/wlan_bearer/wlandbif_cd/group"/>
-</component>
-<!-- should follow component directory rules for stuff in wlan_symbian/ and put in a single component or split up properly -->
-<component name="wlanengine" filter="s60" long-name="WLAN Engine">
-<unit bldFile="os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
-</component>
-<component name="wlanldd" filter="s60" long-name="WLAN LDD">
-<unit bldFile="os/wlan/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
-</component>
-<component name="wlannwif" filter="s60" long-name="WLAN Network Interface">
-<unit bldFile="os/wlan/wlan_bearer/wlannwif/group"/>
-</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="adaptation hw-if plugin framework server app-if">
-<collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
-<component name="basebandchanneladaptor" long-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 name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
-<component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
-</component>
-</collection>
-<collection name="fax" long-name="Fax" level="server">
-<component name="faxclientandserver" long-name="Fax Client and Server" purpose="optional">
-<unit bldFile="os/cellularsrv/fax/faxclientandserver/Group" mrp="os/cellularsrv/fax/faxclientandserver/Group/telephony_fax.mrp"/>
-</component>
-</collection>
-<collection name="smsprotocols" long-name="SMS Protocols" level="framework">
-<component name="smsstack" long-name="SMS Stack" introduced="6.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/cellularsrv/smsprotocols/smsstack/group" mrp="os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
-</component>
-</collection>
-<collection name="telephonyprotocols" long-name="Telephony Protocols" level="framework">
-<component name="csdagt" long-name="CSD AGT" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/csdagt/group" mrp="os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
-</component>
-<component name="psdagt" long-name="PSD AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/psdagt/group" mrp="os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
-</component>
-<component name="gprsumtsqosprt" long-name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
-</component>
-<component name="gprsumtsqosinterface" long-name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
-</component>
-<component name="qosextnapi" long-name="QoS Extn API" introduced="9.2" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
-</component>
-<component name="secondarypdpcontextumtsdriver" long-name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
-</component>
-<component name="qos3gppcpr" long-name="QoS 3GPP CPR" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
-</component>
-<component name="pdplayer" long-name="PDP Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/pdplayer/group" mrp="os/cellularsrv/telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
-</component>
-<component name="rawipnif" long-name="Raw IP NIF" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserver" long-name="Telephony Server" level="server">
-<component name="etelserverandcore" long-name="ETel Server and Core" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
-</component>
-<component name="etelmultimode" long-name="ETel Multimode" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelmultimode/group" mrp="os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
-</component>
-<component name="etelpacketdata" long-name="ETel Packet Data" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
-</component>
-<component name="etelsimtoolkit" long-name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
-<component name="common_tsy" long-name="Common TSY" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
-</component>
-<component name="licenseetsystub" long-name="Licensee TSY Stub" introduced="^2" purpose="development" filter="sf_build" plugin="Y">
-<unit mrp="os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="os/cellularsrv/telephonyserverplugins/licenseetsystub/group"/>
-</component>
-<component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
-</component>
-<component name="simtsy" long-name="SIM TSY" introduced="7.0" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
-</component>
-<component name="ctsydispatchlayer" long-name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
-</component>
-<component name="simatktsy" long-name="SIMATK TSY" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simatktsy/group" mrp="os/cellularsrv/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
-</component>
-</collection>
-<collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
-<component name="dial" long-name="Dial" deprecated="9.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyutils/dial/group" mrp="os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
-</component>
-<component name="telephonywatchers" long-name="Telephony Watchers" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
-</component>
-<component name="etel3rdpartyapi" long-name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrv_info" long-name="Cellular Baseband Services Info" level="app-if">
-<component name="telephonyconfidentialdocs" long-name="Telephony Confidential Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
-</component>
-<component name="telephonydocs" long-name="Telephony Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
-</component>
-<component name="cellularsrv_metadata" long-name="Cellular Baseband Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
-<component name="mocksy" long-name="MockSY" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if"/>
-</block>
-<block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
-<collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
-<component name="bluetooth_audio_adaptation_api" long-name="Bluetooth Audio Adaptation API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
-</component>
-<component name="bluetooth_power_management_api" long-name="Bluetooth Power Management API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_power_management_api/group"/>
-</component>
-<component name="at_command_handler_plugin_api" long-name="AT Command Handler Plugin API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/at_command_handler_plugin_api/group"/>
-</component>
-</collection>
-<collection name="bluetooth" long-name="Bluetooth Core" level="framework">
-<component name="btstack" long-name="Bluetooth Stack" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btstack" mrp="os/bt/bluetooth/btstack/bluetooth_stack.mrp"/>
-</component>
-<component name="btcomm" long-name="Bluetooth CSY" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetooth/btcomm" mrp="os/bt/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
-</component>
-<component name="btsdp" long-name="Bluetooth SDP" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btsdp" mrp="os/bt/bluetooth/btsdp/bluetooth_sdp.mrp"/>
-</component>
-<component name="btextnotifiers" long-name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btextnotifiers" mrp="os/bt/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
-</component>
-<component name="gavdp" long-name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/gavdp/group" mrp="os/bt/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
-</component>
-<component name="btlogger" long-name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btlogger/group" mrp="os/bt/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
-</component>
-<component name="btdocs" long-name="Bluetooth Documentation" purpose="development" class="doc">
-<unit mrp="os/bt/bluetooth/btdocs/bluetooth_documentation.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothmgmt" long-name="Bluetooth Management" level="plugin">
-<component name="btmgr" long-name="Bluetooth Manager" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btmgr" mrp="os/bt/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
-</component>
-<component name="btconfig" long-name="Bluetooth Config" purpose="optional" class="config">
-<unit bldFile="os/bt/bluetoothmgmt/btconfig" mrp="os/bt/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
-</component>
-<component name="btrom" long-name="Bluetooth ROM" introduced="9.1" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btrom" mrp="os/bt/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
-</component>
-<component name="bluetoothclientlib" long-name="Bluetooth Client Library" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/bluetoothclientlib" mrp="os/bt/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothcommsprofiles" long-name="Bluetooth Comms Profiles" level="app-if">
-<component name="btpan" long-name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetoothcommsprofiles/btpan/group" mrp="os/bt/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
-</component>
-</collection>
-<collection name="bthci" long-name="Host Controller Interface" level="server">
-<component name="bthci2" long-name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bthci/bthci2/group" mrp="os/bt/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
-</component>
-<component name="hciextensioninterface" long-name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bthci/hciextensioninterface" mrp="os/bt/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
-</component>
-<component name="hci2implementations" long-name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bthci/hci2implementations/group" mrp="os/bt/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
-</component>
-</collection>
-<collection name="irda" long-name="IrDA" level="plugin">
-<component name="irdastack" long-name="IrDA Stack" purpose="optional">
-<unit bldFile="os/bt/irda/irdastack/group" mrp="os/bt/irda/irdastack/group/infra-red_irda.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if"/>
-<collection name="atext" long-name="AT Extensions" level="server">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="atext_build" long-name="AT Extension Build" introduced="^3" purpose="optional" filter="s60">
-<unit bldFile="os/bt/atext/group"/>
-</component>
-</collection>
-<collection name="bt_info" long-name="Bluetooth Info" level="app-if">
-<component name="bt_metadata" long-name="Bluetooth Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/bt/bt_info/bt_metadata/bt_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
-<collection name="usb_plat" long-name="USB Platform Interfaces" level="app-if">
-<component name="usb_audio_stream_plugin_api" long-name="USB Audio Stream Plugin API" filter="s60" class="api">
-<unit bldFile="os/usb/usb_plat/usb_audio_stream_plugin_api/group"/>
-</component>
-</collection>
-<collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
-<!-- usbclientdrivers to be moved here from kernelhwsrv-->
-</collection>
-<collection name="usbmgmt" long-name="USB Management" level="server">
-<component name="usbmgr" long-name="USB Manager" purpose="optional">
-<unit bldFile="os/usb/usbmgmt/usbmgr/group" mrp="os/usb/usbmgmt/usbmgr/group/usb_manager.mrp" version="2"/>
-</component>
-<component name="usbclassandmgrdocs" long-name="USB Class and Manager Documentation" purpose="development" class="doc">
-<unit mrp="os/usb/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
-</component>
-</collection>
-<collection name="usb_info" long-name="USB Info" level="app-if">
-<component name="usb_metadata" long-name="USB Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/usb/usb_info/usb_metadata/usb_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="mm" level="services" long-name="Multimedia" levels="adaptation 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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-</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"/>
-</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"/>
-</component>
-<component name="aac_decoder_config_proxy_api" long-name="AAC Decoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/aac_decoder_config_proxy_api/group"/>
-</component>
-<component name="added_devsound_control_api" long-name="Added DevSound Control API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_api/group"/>
-</component>
-<component name="added_devsound_control_msg_hdlr_api" long-name="Added DevSound Control Msg Hdlr API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_msg_hdlr_api/group"/>
-</component>
-<component name="added_devsound_control_proxy_api" long-name="Added DevSound Control Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_proxy_api/group"/>
-</component>
-<component name="audio_effects_msg_hdlr_api" long-name="Audio Effects Message Handler API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_msg_hdlr_api/group"/>
-</component>
-<component name="audio_effects_proxy_api" long-name="Audio Effects Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_proxy_api/group"/>
-</component>
-<component name="audio_policy_header_api" long-name="Audio Policy Header API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="audio_routing_proxy_api" long-name="Audio Routing Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_routing_proxy_api/group"/>
-</component>
-<component name="custom_interface_builder_api" long-name="Custom Interface Builder API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_builder_api/group"/>
-</component>
-<component name="custom_interface_message_handler_factory_api" long-name="Custom Interface Message Handler Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_message_handler_factory_api/group"/>
-</component>
-<component name="custom_interface_proxy_factory_api" long-name="Custom Interface Proxy Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_proxy_factory_api/group"/>
-</component>
-<component name="custom_interface_utility_api" long-name="Custom Interface Utility API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_utility_api/group"/>
-</component>
-<component name="devsound_adaptation_api" long-name="DevSound Adaptation API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/devsound_adaptation_api/group"/>
-</component>
-<component name="display_posting_api" long-name="Display Posting API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="eaac_plus_decoder_interface_proxy_api" long-name="eAAC Plus Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="error_concealment_interface_proxy_api" long-name="Error Concealment Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
-</component>
-<component name="fm_radio_adaptation_api" long-name="FM Radio Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_decoder_interface_proxy_api" long-name="G711 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_encoder_interface_proxy_api" long-name="G711 Encoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_decoder_interface_proxy_api" long-name="G729 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_encoder_interface_msg_hdlr_api" long-name="G729 Encoder Interface Message Handler API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</component>
-<component name="ilbc_decoder_interface_proxy_api" long-name="Ilbc Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ilbc_encoder_interface_proxy_api" long-name="Ilbc Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="mdf_plugin_uids" long-name="MDF Plug-in UIDs" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/mdf_plugin_uids/group"/>
-</component>
-<component name="multimedia_fourcc_definitions_api" long-name="Multimedia FourCC Definitions API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/multimedia_fourcc_definitions_api/group"/>
-</component>
-<component name="nokia_audio_policy_header_api" long-name="Nokia Audio Policy Header API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/nokia_audio_policy_header_api/group"/>
-</component>
-<component name="nokia_multimedia_fourcc_definitions_api" long-name="Nokia Multimedia Fourcc Definitions API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ra8_decoder_interface_proxy_api" long-name="RA8 Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
-</component>
-<component name="rds_adaptation_api" long-name="RDS Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="restricted_audio_output_proxy_api" long-name="Restricted Audio Output Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="sbc_encoder_interface_proxy_api" long-name="SBC Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/sbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="secure_output_mdf_custom_interface" long-name="Secure Output MDF Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="speech_encoder_config_proxy_api" long-name="Speech Encoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/speech_encoder_config_proxy_api/group"/>
-</component>
-<component name="telephony_audio_routing_client_api" long-name="Telephony Audio Routing Client API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_client_api/group"/>
-</component>
-<component name="telephony_audio_routing_manager_api" long-name="Telephony Audio Routing Manager API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_manager_api/group"/>
-</component>
-<component name="video_buffer_management_mdf_custom_interface" long-name="Video Buffer Management MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_buffer_management_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_rotation_mdf_custom_interface" long-name="Video Decoder Rotation MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_scaling_mdf_custom_interface" long-name="Video Decoder Scaling MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
-</component>
-<component name="video_reclaim_extbuffers_ci" long-name="Video Reclaim Extbuffers Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_reclaim_extbuffers_ci/group"/>
-</component>
-<component name="video_window_control_custom_interface" long-name="Video Window Control Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="wma_decoder_interface_proxy_api" long-name="WMA Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/wma_decoder_interface_proxy_api/group"/>
-</component>
-<component name="eaacplusutil_api" long-name="EAac Plus Util API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/eaacplusutil_api/group"/>
-</component>
-<component name="frametable_api" long-name="Frametable API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/frametable_api/group"/>
-</component>
-</collection>
-<collection name="devsoundextensions" long-name="Devsound Extensions" level="device-fw">
-<component name="drmaudioplayer" filter="s60" long-name="DRM Audio Player">
-<unit bldFile="os/mm/devsoundextensions/drmaudioplayer/group"/>
-</component>
-<component name="mmextfw" filter="s60" long-name="Multimedia Extension Framework">
-<unit bldFile="os/mm/devsoundextensions/mmextfw/group"/>
-</component>
-<component name="audiorouting" filter="s60" long-name="Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/audiorouting/group"/>
-</component>
-<component name="effects" filter="s60" long-name="Effects">
-<unit bldFile="os/mm/devsoundextensions/effects/group"/>
-</component>
-<component name="effectspresets" filter="s60" long-name="Effects Presets">
-<unit bldFile="os/mm/devsoundextensions/effectspresets/group"/>
-</component>
-<component name="effectspresets_utils" filter="s60" long-name="Effects Presets Utils">
-<!-- need to #include the lot from a single bld.inf
- Also move to a standard component location, not under effectspresets -->
-<unit bldFile="os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
-<unit bldFile="os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
-</component>
-<component name="telephonyaudiorouting" filter="s60" long-name="Telephony Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/group"/>
-</component>
-<component name="mmfcustominterfaces" filter="s60" long-name="MMF Custom Interfaces">
-<unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/group"/>
-</component>
-<component name="addeddevsoundcontrol" filter="s60" long-name="Added DevSound Control">
-<unit bldFile="os/mm/devsoundextensions/addeddevsoundcontrol/group"/>
-</component>
-<component name="globalaudiosettings" filter="s60" long-name="Global Audio Settings">
-<unit bldFile="os/mm/devsoundextensions/globalaudiosettings/group"/>
-</component>
-<component name="restrictedaudiooutput" filter="s60" long-name="Restricted Audio Output">
-<unit bldFile="os/mm/devsoundextensions/restrictedaudiooutput/group"/>
-</component>
-<component name="ciextnfactoryplugins" filter="s60" long-name="Custom Interface Extension Factory Plugins" plugin="Y">
-<unit bldFile="os/mm/devsoundextensions/ciextnfactoryplugins/group"/>
-</component>
-</collection>
-<collection name="mdfdevvideoextensions" long-name="MDF Dev Video Extensions" level="device-fw">
-<component name="nga_mdf_postprocessor" long-name="NGA MDF Postprocessor" filter="s60">
-<unit bldFile="os/mm/mdfdevvideoextensions/nga_mdf_postprocessor/group"/>
-</component>
-</collection>
-<collection name="audio" long-name="Audio Codecs" level="middleware">
-<component name="arm_cmmf_codecs" filter="s60" long-name="ARM CMMF Codecs" plugin="Y">
-<unit bldFile="os/mm/audio/arm_cmmf_codecs/group"/>
-</component>
-</collection>
-<collection name="video" long-name="Video Codecs" level="middleware">
-<!-- empty -->
-</collection>
-<collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
-<component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/imagingandcamerafws/imagingfws/group" mrp="os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
-</component>
-<component name="camerafw" long-name="Camera Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/imagingandcamerafws/camerafw/group" mrp="os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
-</component>
-</collection>
-<collection name="mmlibs" long-name="Multimedia Libraries" level="middleware">
-<component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmutilitylib/group" mrp="os/mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
-</component>
-<component name="mmfw" long-name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmfw/group" mrp="os/mm/mmlibs/mmfw/group/multimedia_mmf.mrp"/>
-</component>
-</collection>
-<collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
-<component name="imagingplugins" long-name="Imaging Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/imagingplugins/group" mrp="os/mm/mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
-</component>
-<component name="cameraplugins" long-name="Camera Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/cameraplugins/group" mrp="os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
-</component>
-<component name="lib3gp" long-name="3GP Library" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/mmplugins/lib3gp/group" mrp="os/mm/mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
-</component>
-<component name="mmfwplugins" long-name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/mmfwplugins/group" mrp="os/mm/mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
-</component>
-</collection>
-<collection name="mm_info" long-name="Multimedia Info" level="app-if">
-<component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc">
-<unit mrp="os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
-</component>
-<component name="mm_metadata" long-name="Multimedia Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
-<component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="^2" purpose="development">
-<unit bldFile="os/mm/mmresourcemgmt/mmresctrl/group" mrp="os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
-</component>
-</collection>
-<collection name="mmdevicefw" long-name="Multimedia Device Framework" level="device-fw">
-<component name="mdf" long-name="Media Device Framework" introduced="9.2" purpose="mandatory">
-<unit bldFile="os/mm/mmdevicefw/mdf/group" mrp="os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
-</component>
-<component name="speechrecogsupport" long-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 name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
-<component name="videorenderer" long-name="Video Renderer" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/mmswadaptation/videorenderer/group" mrp="os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
-</component>
-</collection>
-<collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw"/>
-<collection name="omxil" long-name="OpenMAX IL" level="hw-if">
-<component name="omxilapi" long-name="OpenMAX IL API" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilapi/group" mrp="os/mm/omxil/omxilapi/group/multimedia_omx_il_api.mrp" version="1"/>
-</component>
-<component name="omxilcore" long-name="OpenMAX IL Core" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcore/group" mrp="os/mm/omxil/omxilcore/group/multimedia_omx_il_core.mrp" version="1"/>
-</component>
-<component name="omxilcomponentcommon" long-name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcomponentcommon/group" mrp="os/mm/omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp" version="1"/>
-</component>
-<component name="omxilrefcomps" long-name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilrefcomps/ref_components/group" mrp="os/mm/omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp" version="1"/>
-</component>
-<component name="mmilapi" long-name="Multimedia Integration Layer API" introduced="^3" purpose="development">
-<unit bldFile="os/mm/omxil/mmilapi/group" mrp="os/mm/omxil/mmilapi/group/multimedia_il_api.mrp"/>
-</component>
-</collection>
-<collection name="devsound" long-name="Sound Device" level="devices">
-<component name="devsoundapi" long-name="DevSound API" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/devsound/devsoundapi/group" mrp="os/mm/devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
-</component>
-<component name="a3fdevsound" long-name="A3F DevSound" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3fdevsound/group" mrp="os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
-</component>
-<component name="a3facf" long-name="A3F Audio Component Framework" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3facf/group" mrp="os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
-</component>
-<component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/devsound/devsoundpluginsupport/group" mrp="os/mm/devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
-</component>
-<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">
-<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">
-<unit bldFile="os/mm/devsound/a3ftrace/group" mrp="os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
-</component>
-<component name="a3fsrvstart" long-name="A3F Server Start" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
-</component>
-</collection>
-<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
-<component name="devsoundhwdeviceapi" long-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 name="a3facl" long-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 name="a3fdevsoundcustomisation" long-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"/>
-</component>
-<component name="refacladapt" long-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"/>
-</component>
-<component name="videohai" long-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 name="dvbhreceiverhai" long-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>
-</block>
-<block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
-<collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
-<component name="exif_api" long-name="Exif API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagingext_plat" long-name="Imaging Extensions Platform Interfaces" level="app-if">
-<component name="jpeg2000_icl_plugin_api" long-name="JPEG2000 ICL plugin API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/jpeg2000_icl_plugin_api/group"/>
-</component>
-<component name="extended_icl_jpeg_api" long-name="Extended ICL Jpeg API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
-</component>
-<component name="h324_annex_k_custom_api" long-name="H324 Annex K Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/h324_annex_k_custom_api/group"/>
-</component>
-<component name="ecam_orientation_custom_api" long-name="ECam Orientation Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_orientation_custom_api/group"/>
-</component>
-<component name="ecam_ui_orientation_override_custom_api" long-name="ECam UI Orientation Override Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
-</component>
-<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>
-</collection>
-<collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
-<component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
-<unit bldFile="os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
-</component>
-<component name="imageadaptationextensions_build" filter="s60" long-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"/>
-</component>
-</collection>
-<collection name="imagingmodules" long-name="Imaging Modules" level="hw-if">
-<component name="exiflib" filter="s60" long-name="Exif Library">
-<unit bldFile="os/imagingext/imagingmodules/exiflib/group"/>
-</component>
-<component name="jp2kcodec" filter="s60" long-name="JPEG2000 Decoder Plugin" plugin="Y">
-<unit bldFile="os/imagingext/imagingmodules/jp2kcodec/group"/>
-</component>
-</collection>
-</block>
-<block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
-<component name="vgi" filter="s60" long-name="VGI">
-<unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
-</component>
-</collection>
-<collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adaptations">
-<component name="m3gcore11" filter="s60" long-name="M3G Core 1.1">
-<unit bldFile="os/graphics/m3g/m3gcore11/group"/>
-</component>
-</collection>
-<collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines">
-<component name="graphicsresource" long-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 name="graphicsresourceadaptation" long-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"/>
-</component>
-<component name="graphicsresourceimplementation" long-name="Graphics Resource Implementation" introduced="^4" purpose="optional">
-<unit bldFile="os/graphics/graphicsresourceservices/graphicsresourceimplementation/group" mrp="os/graphics/graphicsresourceservices/graphicsresourceimplementation/group/graphics_graphicsresourceimplementation.mrp"/>
-</component>
-<component name="graphicsresourceinterface" long-name="Graphics Resource Interface" introduced="^4" purpose="optional">
-<unit bldFile="os/graphics/graphicsresourceservices/graphicsresourceinterface/group" mrp="os/graphics/graphicsresourceservices/graphicsresourceinterface/group/graphics_graphicsresourceinterface.mrp"/>
-</component>
-</collection>
-<collection name="graphicsutils" long-name="Graphics Utils" level="engines">
-<component name="commongraphicsheaders" long-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 name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
-<!-- displayldd to be moved here -->
-<component name="surfacemgr" long-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 name="graphicscomposition" long-name="Graphics Composition" level="engines">
-<component name="openwfcinterface" long-name="OpenWF Composition Interface" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfcinterface/group" mrp="os/graphics/graphicscomposition/openwfcinterface/group/graphics_openwfcinterface.mrp"/>
-</component>
-<component name="openwfcompositionengine" long-name="OpenWF Composition Engine" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/graphicscomposition/openwfcompositionengine/group" mrp="os/graphics/graphicscomposition/openwfcompositionengine/group/graphics_openwfcompositionengine.mrp"/>
-</component>
-<component name="openwfsupport" long-name="OpenWF Support" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfsupport/group" mrp="os/graphics/graphicscomposition/openwfsupport/group/graphics_openwfsupport.mrp"/>
-</component>
-<component name="surfaceupdate" long-name="Surface Update" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/surfaceupdate/group" mrp="os/graphics/graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
-</component>
-</collection>
-<collection name="graphicstest" long-name="Graphics Test" level="app-if">
-<component name="uibench" long-name="UI Bench" introduced="9.2" purpose="development">
-<unit bldFile="os/graphics/graphicstest/uibench/group" mrp="os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
-</component>
-</collection>
-<collection name="graphics_plat" long-name="Graphics Platform Interfaces" level="app-if">
-<component name="m3g_core_api" filter="sf_build" long-name="M3G Core API" class="api">
-<unit bldFile="os/graphics/graphics_plat/m3g_core_api/group"/>
-</component>
-</collection>
-<collection name="graphics_info" long-name="Graphics Info" level="app-if">
-<component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc">
-<unit mrp="os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
-</component>
-<component name="graphics_metadata" long-name="Graphics Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
-</component>
-</collection>
-<collection name="windowing" long-name="Windowing" level="app-if">
-<component name="windowserver" long-name="Window Server" purpose="mandatory">
-<unit bldFile="os/graphics/windowing/windowserver/group" mrp="os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
-</component>
-<component name="windowserverplugins" long-name="Window Server Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/windowing/windowserverplugins/group" mrp="os/graphics/windowing/windowserverplugins/group/graphics_wserv_std_plugins.mrp"/>
-</component>
-</collection>
-<collection name="printingservices" long-name="Printing Services" level="app-if">
-<component name="printerdriversupport" long-name="Printer Driver Support" purpose="optional">
-<unit bldFile="os/graphics/printingservices/printerdriversupport/group" mrp="os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
-</component>
-<component name="printerdrivers" long-name="Printer Drivers" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/printingservices/printerdrivers/group" mrp="os/graphics/printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
-</component>
-</collection>
-<collection name="fbs" long-name="Font and Bitmap Server" level="device-interface">
-<component name="fontandbitmapserver" long-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 name="opengles" long-name="OpenGLES" level="internal-adaptations">
-<component name="openglesinterface" long-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 name="opengles_stub" filter="sf_build" long-name="OpenGL ES Stub" purpose="optional" introduced="^2">
-<unit bldFile="os/graphics/opengles/openglesinterface/group/opengles_stub"/>
-</component>
-</collection>
-<collection name="openvg" long-name="OpenVG" level="internal-adaptations">
-<component name="openvginterface" long-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 name="openvg11" filter="s60" long-name="OpenVG 1.1">
-<!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
-<unit bldFile="os/graphics/openvg/openvginterface/group/openvg11"/>
-</component>
-<component name="sfopenvg" filter="sf_build" long-name="Khronos OpenVG Reference Implementation" introduced="^2" purpose="optional">
-<unit bldFile="os/graphics/openvg/openvgrefimplementation/sfopenvg/group"/>
-</component>
-</collection>
-<collection name="egl" long-name="EGL" level="internal-adaptations">
-<component name="eglinterface" long-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 name="eglswitch" long-name="EGL Switch" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglswitch/group" mrp="os/graphics/egl/eglswitch/group/graphics_eglswitch.mrp"/>
-</component>
-<component name="eglrefimpl" long-name="EGL Reference Implementation" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglrefimpl/group" mrp="os/graphics/egl/eglrefimpl/group/graphics_eglrefimpl.mrp"/>
-</component>
-<component name="egltest" long-name="EGL Tests" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/egl/egltest/group" mrp="os/graphics/egl/egltest/group/graphics_egltest.mrp"/>
-</component>
-</collection>
-<collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
-<component name="gdi" long-name="GDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/gdi/group" mrp="os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
-</component>
-<component name="bitgdi" long-name="BitGDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
-</component>
-<component name="colourpalette" long-name="Colour Palette" introduced="7.0s" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
-</component>
-<component name="screendriver" long-name="Screen Driver" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/graphicsdeviceinterface/screendriver/group" mrp="os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
-</component>
-<component name="directgdi" long-name="DirectGDI" introduced="^3" deprecated="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/directgdi/group" mrp="os/graphics/graphicsdeviceinterface/directgdi/group/graphics_directgdi.mrp"/>
-</component>
-<component name="directgdiinterface" long-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 name="directgdiadaptation" long-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"/>
-</component>
-</collection>
-<collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
-<component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/gdi_tools/group" mrp="os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
-</component>
-</collection>
-<collection name="graphicsapitest" long-name="Graphics API Tests" level="app-if"/>
-</block>
-<block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
-<collection name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" level="text">
-<component name="findutil_api" long-name="Find Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/findutil_api/group"/>
-</component>
-<component name="japanese_language_utilities_api" long-name="Japanese Language Utilities API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
-</component>
-<component name="sortutil_api" long-name="Sorting Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/sortutil_api/group"/>
-</component>
-</collection>
-<collection name="textandloc_pub" long-name="Text and Localisation Public Interfaces" level="text">
-<component name="directory_localizer_api" long-name="Directory Localizer API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_pub/directory_localizer_api/group"/>
-</component>
-</collection>
-<collection name="charconvfw" long-name="Character Conversion" level="encoding">
-<component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional">
-<unit bldFile="os/textandloc/charconvfw/charconv_fw/group" mrp="os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
-</component>
-<component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/charconvplugins/group" mrp="os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
-</component>
-<component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/fatfilenameconversionplugins/group" mrp="os/textandloc/charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
-</component>
-</collection>
-<collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
-<component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/textshaperplugin/group" mrp="os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
-</component>
-<component name="fontstore" long-name="Font Store" purpose="mandatory">
-<unit bldFile="os/textandloc/fontservices/fontstore/group" mrp="os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
-</component>
-<component name="textrendering" long-name="Text Rendering" purpose="mandatory" class="placeholder">
-<!-- placeholder for text code from GDI -->
-</component>
-<component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/freetypefontrasteriser/group" mrp="os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
-</component>
-<component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional">
-<unit bldFile="os/textandloc/fontservices/referencefonts/group" mrp="os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
-</component>
-</collection>
-<collection name="textlayout" long-name="Text Layout" level="text">
-<component name="texthandling" long-name="Text Handling" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/texthandling/group" mrp="os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
-</component>
-<component name="textformatting" long-name="Text Formatting" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/textformatting/group" mrp="os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
-</component>
-</collection>
-<collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
-<!-- components in this collection need to be moved to the right collection.
- Either move into the units' directories, or create a new textandlocutils directory -->
-<component name="numbergrouping" filter="s60" long-name="Number Grouping">
-<unit bldFile="os/textandloc/charconvfw/numbergrouping/group"/>
-</component>
-<component name="jplangutil" filter="s60" long-name="Japanese Language Utilities">
-<unit bldFile="os/textandloc/charconvfw/jplangutil/group"/>
-</component>
-<component name="sortutil" filter="s60" long-name="Sorting Utility">
-<unit bldFile="os/textandloc/charconvfw/sortutil/group"/>
-</component>
-<component name="inlinetext" filter="s60" long-name="Inline Text">
-<unit bldFile="os/textandloc/charconvfw/inlinetext/group"/>
-</component>
-<component name="nearestlangutil" long-name="Nearest Language Util" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-<component name="numberformatting" long-name="Number Formatting" introduced="7.0s" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/numberformatting/group" mrp="os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
-</component>
-</collection>
-<collection name="localesupport" long-name="Locale Support" level="util">
-<component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/localisation/localesupport" mrp="os/textandloc/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
-</component>
-<component name="initlocale" long-name="Initialise Locale" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-</collection>
-<collection name="textandloctools" long-name="Text and Localisation Tools" level="tools">
-<component name="fontcompiler" long-name="Font Compiler" purpose="development" class="placeholder PC">
-<!-- placeholder for split from GDI Tools -->
-</component>
-<component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/bitmapfonttools/group" mrp="os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
-</component>
-</collection>
-<collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
-<component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
-<collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
-<component name="xmlsrv_plat_build" long-name="XML Services Platform Interface Build" filter="s60" class="api">
-<!-- need to fix the configuration used here.
- Either destribute to other components or use the new feature flags confguration mechanisms.
- Remove this component and uncomment the other units when fixed-->
-<unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
-</component>
-<component name="xml_encryption_api" long-name="XML Encryption API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/> -->
-</component>
-<component name="xml_signature_api" long-name="XML Signature API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_signature_api/group"/> -->
-</component>
-<component name="xml_security_engine_utils_api" long-name="XML Security Engine Utils API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/> -->
-</component>
-</collection>
-<collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
-<component name="xmlseccertman" filter="s60" long-name="XML Security Certificate Manager">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
-</component>
-<component name="xmlsec" filter="s60" long-name="XML Security">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsec/group"/>
-</component>
-<component name="xmlseccrypto" filter="s60" long-name="XML Security Crypto">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccrypto/group"/>
-</component>
-<component name="xmlsecwrapper" filter="s60" long-name="XML Security Wrapper">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsecwrapper/group"/>
-</component>
-</collection>
-<collection name="xml" long-name="XML" level="generic">
-<component name="xmlfw" long-name="XML Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmlfw/group" mrp="os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
-</component>
-<component name="libxml2libs" long-name="Libxml2 Libraries" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/libxml2libs/group" mrp="os/xmlsrv/xml/libxml2libs/group/syslibs_libxml2.mrp"/>
-</component>
-<component name="legacyminidomparser" long-name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/legacyminidomparser/GROUP" mrp="os/xmlsrv/xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp"/>
-</component>
-<component name="xmldomandxpath" long-name="XML DOM and XPath" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmldomandxpath/group" mrp="os/xmlsrv/xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
-</component>
-<component name="xmlexpatparser" long-name="XML Expat Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmlexpatparser/group" mrp="os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
-</component>
-<component name="xmllibxml2parser" long-name="XML Libxml2 Parser" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmllibxml2parser/group" mrp="os/xmlsrv/xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
-</component>
-<component name="wbxmlparser" long-name="WBXML Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/wbxmlparser/group" mrp="os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
-</component>
-</collection>
-<collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
-<component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="deviceplatformrelease" level="services" long-name="Device Platform Release" levels="bld mid top">
-<collection name="s60extras" long-name="S60 Extras" level="mid">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="s60extras_build" filter="s60" long-name="S60 Extras Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/S60Extras/group"/>
-</component>
-</collection>
-<collection name="locfiles" long-name="Locale Files" level="mid">
-<component name="locfiles_build" filter="s60" long-name="S60 Locale Files Build" purpose="development" class="config">
-<!-- need to move component down a directory -->
-<unit bldFile="os/deviceplatformrelease/locfiles/group"/>
-</component>
-<component name="locfiles_set1" long-name="Locale Files Set 1" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set1"/>
-</component>
-<component name="locfiles_set2" long-name="Locale Files Set 2" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set2"/>
-</component>
-<component name="locfiles_set3" long-name="Locale Files Set 3" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set3"/>
-</component>
-<component name="locfiles_set4" long-name="Locale Files Set 4" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set4"/>
-</component>
-<component name="locfiles_set5" long-name="Locale Files Set 5" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set5"/>
-</component>
-<component name="locfiles_set6" long-name="Locale Files Set 6" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set6"/>
-</component>
-<!-- is the a problem with SF builds with the following? -->
-<component name="locfiles_set7" long-name="Locale Files Set 7" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set7"/>
-</component>
-<component name="locfiles_set8" long-name="Locale Files Set 8" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set8"/>
-</component>
-<component name="locfiles_set9" long-name="Locale Files Set 9" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set9"/>
-</component>
-<component name="locfiles_set10" long-name="Locale Files Set 10" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set10"/>
-</component>
-<component name="locfiles_set11" long-name="Locale Files Set 11" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set11"/>
-</component>
-<component name="locfiles_set12" long-name="Locale Files Set 12" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set12"/>
-</component>
-<component name="locfiles_set13" long-name="Locale Files Set 13" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set13"/>
-</component>
-<component name="locfiles_set14" long-name="Locale Files Set 14" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set14"/>
-</component>
-<component name="locfiles_set15" long-name="Locale Files Set 15" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set15"/>
-</component>
-<component name="locfiles_set16" long-name="Locale Files Set 16" filter="s60" class="config">
-<unit bldFile="os/deviceplatformrelease/locfiles/group/set16"/>
-</component>
-</collection>
-<collection name="version" long-name="Version" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="version_build" filter="s60" long-name="Version Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/Version/group"/>
-</component>
-</collection>
-<collection name="helps_loc2" long-name="Helps Locale 2" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helps_loc2_build" long-name="Helps Locale 2 Build" filter="s60">
-<unit bldFile="os/deviceplatformrelease/helps_loc2/group"/>
-</component>
-</collection>
-<collection name="sf_config" long-name="SF Config" level="mid">
-<component name="config" filter="s60" long-name="Config" purpose="development" class="config"/>
-<component name="cenrep" filter="sf_build" long-name="ConE Central Repository Config" purpose="development" class="config">
-<!-- will shoudl give the id/path something more unique than cenrep -->
-<unit bldFile="os/deviceplatformrelease/sf_config/cenrep/group"/>
-</component>
-</collection>
-<!-- should be located locally in buildplatforms/group
- <collection id="s60bld" name="S60 Build">
- <component id="buildplatforms" filter="s60" name="Build Platforms">
- <unit bldFile="/tools/buildplatforms/group"/>
- </component>
- </collection>-->
-<collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
-<component name="cedarutils" long-name="Cedar Utils" purpose="development">
-<unit mrp="os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
-</component>
-<component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt" purpose="development" class="config">
-<unit mrp="os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
-</component>
-<component name="foundation_s60_packages" long-name="Foundation S60 Packages" introduced="^3" deprecated="^3" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/symbianosbld/foundation_s60_packages/foundation_s60_packages.mrp"/>
-</component>
-</collection>
-<collection name="foundation_system" long-name="Foundation System" level="top">
-<component name="system_model" long-name="System Model" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
-</component>
-</collection>
-<collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
-<component name="deviceplatformrelease_metadata" long-name="Device Platform Release Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="osrndtools" level="services" long-name="OS R&D tools" levels="fw trace">
-<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"/>
-</component>
-<component name="testinterface" filter="s60" long-name="Test Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/testinterface/group"/>
-</component>
-<component name="testserver" filter="s60" long-name="Test Server" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserver/group"/>
-</component>
-<component name="testengine" filter="s60" long-name="Test Engine" purpose="development">
-<unit bldFile="os/osrndtools/stif/testengine/group"/>
-</component>
-<component name="testserverstarter" filter="s60" long-name="Test Server Starter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserverstarter/group"/>
-</component>
-<component name="stiftfwif" filter="s60" long-name="STIF Test Framework Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/stiftfwif/group"/>
-</component>
-<component name="consoleui" filter="s60" long-name="Console UI" purpose="development">
-<unit bldFile="os/osrndtools/stif/consoleui/group"/>
-</component>
-<component name="testcombiner" filter="s60" long-name="Test Combiner" purpose="development">
-<unit bldFile="os/osrndtools/stif/testcombiner/group"/>
-</component>
-<component name="demomodule" filter="s60" long-name="Demo Module" purpose="development">
-<unit bldFile="os/osrndtools/stif/demomodule/group"/>
-</component>
-<component name="atslogger" filter="s60" long-name="ATS Logger" purpose="development">
-<unit bldFile="os/osrndtools/stif/atslogger/group"/>
-</component>
-<component name="atsinterface" filter="s60" long-name="ATS Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/atsinterface/group"/>
-</component>
-<component name="testscripter" filter="s60" long-name="Test Scripter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testscripter/group"/>
-</component>
-<component name="suevent" filter="s60" long-name="SU Event" purpose="development">
-<unit bldFile="os/osrndtools/stif/suevent/group"/>
-</component>
-<component name="stifkerneltestclassbase" filter="s60" long-name="STIF Kernel Test Class Base" purpose="development">
-<!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
-<!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
-</component>
-<component name="stif_build" filter="s60" long-name="STIF Build" purpose="development">
-<!-- move exports into self-contained component. Remove this when configuration is in place-->
-<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">
-<unit bldFile="os/osrndtools/memspy/memspy_plat/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/engine/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/console/group"/>
-</component>
-<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>
-</collection>
-<collection name="hti" long-name="Harmonized Test Interface" level="trace">
-<component name="hti_plat" filter="s60" long-name="HTI Platform Interfaces" purpose="development" class="api">
-<unit bldFile="os/osrndtools/hti/hti_plat/group"/>
-</component>
-<component name="hticfg" filter="s60" long-name="HTI Config" purpose="development">
-<unit bldFile="os/osrndtools/hti/hticfg/group"/>
-</component>
-<component name="htiautostart" filter="s60" long-name="HTI Autostart" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiautostart/group"/>
-</component>
-<component name="htiframework" filter="s60" long-name="HTI Framework" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiframework/group"/>
-</component>
-<component name="hticommplugins" filter="s60" long-name="HTI Communication Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
-</component>
-<component name="htiserviceplugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
-</component>
-<component name="htifilehlp" filter="s60" long-name="HTI File Help" purpose="development">
-<unit bldFile="os/osrndtools/hti/htifilehlp/group"/>
-</component>
-<component name="htiwatchdog" filter="s60" long-name="HTI Watchdog" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiwatchdog/group"/>
-</component>
-<component name="hti_build" filter="s60" long-name="HTI Build" purpose="development">
-<!-- move exports into self-contained component.-->
-<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">
-<block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
-<collection name="appsupport_pub" long-name="Generic Application Support Public Interfaces" level="specific">
-<component name="flash_viewer_framework_api" long-name="Flash Viewer Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
-</component>
-<component name="network_status_api" long-name="Network Status API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/network_status_api/group"/>
-</component>
-</collection>
-<collection name="appsupport_plat" long-name="Generic Application Support Platform Interfaces" level="specific">
-<component name="action_plugin_api" long-name="Action Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/action_plugin_api/group"/>
-</component>
-<component name="application_orientation_api" long-name="Application Orientation API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/application_orientation_api/group"/>
-</component>
-<component name="context_access_api" long-name="Context Access API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_access_api/group"/>
-</component>
-<component name="context_framework_services_api" long-name="Context Framework Services API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_services_api/group"/>
-</component>
-<component name="context_framework_client_api" long-name="Context Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_client_api/group"/>
-</component>
-<component name="context_framework_listener_api" long-name="Context Framework Listener API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_listener_api/group"/>
-</component>
-<component name="context_framework_version_api" long-name="Context Framework Version API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_version_api/group"/>
-</component>
-<component name="context_source_plugin_api" long-name="Context Source Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_plugin_api/group"/>
-</component>
-<component name="context_source_settings_manager_api" long-name="Context Source Settings Manager API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_settings_manager_api/group"/>
-</component>
-<component name="context_subscription_api" long-name="Context Subscription API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_subscription_api/group"/>
-</component>
-<component name="key_event_framework_api" long-name="Key Event Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_api/group"/>
-</component>
-<component name="key_event_framework_mapper_api" long-name="Key Event Framework Mapper API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_mapper_api/group"/>
-</component>
-<component name="media_keys_definition_api" long-name="Media Keys Definition API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/media_keys_definition_api/group"/>
-</component>
-<component name="ood_threshold_api" long-name="OOD Threshold API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/ood_threshold_api/group"/>
-</component>
-<component name="oom_monitor_api" long-name="OOM Monitor API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_api/group"/>
-</component>
-<component name="oom_monitor_plugin_api" long-name="OOM Monitor Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_plugin_api/group"/>
-</component>
-<component name="operation_provider_api" long-name="Operation Provider API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/operation_provider_api/group"/>
-</component>
-<component name="phonecmdhandler_api" long-name="Phone Command Handler API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/phonecmdhandler_api/group"/>
-</component>
-<component name="restore_factory_settings_api" long-name="Restore Factory Settings API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_api/group"/>
-</component>
-<component name="restore_factory_settings_plugin_api" long-name="Restore Factory Settings Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_plugin_api/group"/>
-</component>
-<component name="secondary_display_accfw_api" long-name="Secondary Display Accessory Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_accfw_api/group"/>
-</component>
-<component name="secondary_display_startup_api" long-name="Secondary Display Startup API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_startup_api/group"/>
-</component>
-<component name="secondary_display_sysap_api" long-name="Secondary Display System Application API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_sysap_api/group"/>
-</component>
-<component name="secondary_display_system_state_api" long-name="Secondary Display System State API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_system_state_api/group"/>
-</component>
-<component name="sensor_user_setting_api" long-name="Sensor User Setting API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/sensor_user_setting_api/group"/>
-</component>
-<component name="startup_configuration_api" long-name="Startup Configuration API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/startup_configuration_api/group"/>
-</component>
-<component name="system_application_key_handler_plugin_api" long-name="System Application Key Handler Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_key_handler_plugin_api/group"/>
-</component>
-<component name="system_application_light_control_plugin_api" long-name="System Application Light Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_light_control_plugin_api/group"/>
-</component>
-<component name="system_application_notification_api" long-name="System Application Notification API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_notification_api/group"/>
-</component>
-<component name="system_application_plugin_callback_api" long-name="System Application Plug-in Callback API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
-</component>
-<component name="flash_mmi_service_interface_custom_api" long-name="Flash MMI Service Interface Custom API" filter="s60,!sf_build" introduced="^2" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/flash_mmi_service_interface_custom_api/group"/>
-</component>
-<component name="flash_netscape_plugin_command_api" long-name="Flash Netscape Plugin Command API" filter="s60,!sf_build" introduced="^2" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/flash_netscape_plugin_command_api/group"/>
-</component>
-</collection>
-<collection name="contextframework" long-name="Context Framework" level="framework">
-<!-- the units that are commented out need to be put back when configuration is in place.
- They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
-<component name="cfw" filter="s60" long-name="Context Framework">
-<!--<unit bldFile="contextframework/cfw/group"/> -->
-</component>
-<component name="cfwplugins" filter="s60" long-name="Context Framework Plugins" plugin="Y">
-<!--<unit bldFile="contextframework/cfwplugins/group"/>-->
-</component>
-<component name="contextframework_build" filter="s60" long-name="Context Framework Build">
-<unit bldFile="mw/appsupport/contextframework/group"/>
-</component>
-</collection>
-<collection name="coreapplicationuis" long-name="Core Application UIs" level="server">
-<component name="dbrecovery" filter="s60" long-name="Database Recovery">
-<unit bldFile="mw/appsupport/coreapplicationuis/dbrecovery/group"/>
-</component>
-<component name="nspswsplugin" filter="s60" long-name="NSPS WS Plugin" plugin="Y">
-<!-- No Service Power Save? Window Server? Please elaborate-->
-<unit bldFile="mw/appsupport/coreapplicationuis/nspswsplugin/group"/>
-</component>
-<component name="rfs" filter="s60" long-name="Restore Factory Settings">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfs/group"/>
-</component>
-<component name="rfsplugins" filter="s60" long-name="Restore Factory Settings Plugins" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/group"/>
-</component>
-<component name="sysap" filter="s60" long-name="System Application">
-<unit bldFile="mw/appsupport/coreapplicationuis/sysap/group"/>
-</component>
-<component name="variatedsettings" filter="s60" long-name="Variated Settings" class="config">
-<unit bldFile="mw/appsupport/coreapplicationuis/variatedsettings/group"/>
-</component>
-<component name="accfwuinotifier" filter="s60" long-name="Accessory Framework UI Notifier" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/accfwuinotifier/group"/>
-</component>
-<component name="kefmapper" filter="s60" long-name="Key Event Framework">
-<unit bldFile="mw/appsupport/coreapplicationuis/kefmapper/group"/>
-</component>
-<component name="advancedtspcontroller" filter="s60" long-name="Advanced TSP Controller">
-<unit bldFile="mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
-</component>
-<component name="powersaveutilities" filter="s60" long-name="Power Save Utilities">
-<unit bldFile="mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
-</component>
-<component name="gsserverenginestub" filter="s60" long-name="GS Server Engine Stub">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
-</component>
-<component name="gsserverengine" filter="s60" long-name="GS Server Engine">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverengine/group"/>
-</component>
-<component name="sensordatacompensatorplugin" filter="s60" long-name="Sensor Data Compensator Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/group"/>
-</component>
-<component name="atcmdplugin" long-name="AT Command Plugin" filter="s60,!oem_build" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/atcmdplugin/group"/>
-</component>
-</collection>
-<collection name="flashliteapi_3_1" long-name="Flash Lite API 3.1" level="specific">
-<!-- collection is really a component. Move down a directory -->
-<component name="flashliteapi_3_1_build" long-name="Flash Lite API Build" filter="s60" introduced="^2"/>
-</collection>
-<collection name="mediakeys" long-name="Media Keys" level="plugin">
-<!-- collection is really a component. Move down a directory -->
-<component name="mediakeys_build" filter="s60" long-name="Media Keys Build">
-<unit bldFile="mw/appsupport/mediakeys/group"/>
-</component>
-</collection>
-<collection name="startupservices" long-name="Startup Services" level="system">
-<component name="splashscreen" filter="s60" long-name="Splash Screen">
-<unit bldFile="mw/appsupport/startupservices/splashscreen/group"/>
-</component>
-<component name="startupanimation" filter="s60" long-name="Startup Animation">
-<unit bldFile="mw/appsupport/startupservices/startupanimation/group"/>
-</component>
-<component name="startup" long-name="Startup Application" filter="s60">
-<unit bldFile="mw/appsupport/startupservices/startup/group"/>
-</component>
-</collection>
-<collection name="sysresmonitoring" long-name="System Resource Monitoring" level="system">
-<component name="oodmonitor" filter="s60" long-name="OOD Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oodmonitor/group"/>
-</component>
-<component name="oommonitor" filter="s60" long-name="OOM Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oommonitor/group"/>
-</component>
-</collection>
-<collection name="systemsettings" long-name="System Settings" level="system">
-<component name="gssensorplugin" filter="s60" long-name="GS Sensor Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gssensorplugin/group"/>
-</component>
-<component name="gsaccessoryplugin" filter="s60" long-name="GS Accessory Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gsaccessoryplugin/group"/>
-</component>
-</collection>
-<collection name="filehandling" long-name="File Handling" level="server">
-<component name="fileconverterfw" long-name="File Converter Framework" purpose="optional">
-<unit bldFile="mw/appsupport/filehandling/fileconverterfw/group" mrp="mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
-</component>
-<component name="htmltorichtextconverter" long-name="HTML to RichText Converter" introduced="7.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/htmltorichtextconverter/group" mrp="mw/appsupport/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
-</component>
-<component name="richtexttohtmlconverter" long-name="RichText to HTML Converter" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
-</component>
-</collection>
-<collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
-<component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
-</component>
-</collection>
-<collection name="commonappservices" long-name="Common Application Services" level="framework">
-<component name="alarmserver" long-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"/>
-</component>
-<component name="alarmservertest" long-name="Alarm Server Test" deprecated="^3" introduced="8.1" purpose="development">
-<unit bldFile="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
-</component>
-<component name="appservicesdocs" long-name="Application Services Documentation" purpose="development" class="doc">
-<unit mrp="mw/appsupport/commonappservices/appservicesdocs/app-services_documentation.mrp"/>
-</component>
-<component name="backuprestorenotification" long-name="Backup Restore Notification" introduced="8.1" purpose="optional">
-<unit bldFile="mw/appsupport/commonappservices/backuprestorenotification/group" mrp="mw/appsupport/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
-</component>
-</collection>
-<collection name="tzservices" long-name="Time Zone Services" level="plugin">
-<component name="tzserver" long-name="Time Zone Server" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzserver/group" mrp="mw/appsupport/tzservices/tzserver/group/app-services_tz.mrp"/>
-</component>
-<component name="tzloc" long-name="Time Zone Localization" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzloc/group" mrp="mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
-</component>
-<component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzlocrscfactory/group" mrp="mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
-</component>
-<component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzdatabase/group" mrp="mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
-</component>
-</collection>
-<collection name="contenthandling" long-name="Content Handling" level="plugin">
-<component name="webrecognisers" long-name="Web Recognisers" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/contenthandling/webrecognisers/group" mrp="mw/appsupport/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
-</component>
-</collection>
-<collection name="openenvutils" long-name="Open Environment Utilities" level="specific">
-<component name="commandshell" long-name="Command Shell" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/commandshell/group" mrp="mw/appsupport/openenvutils/commandshell/group/oetools_zsh.mrp"/>
-</component>
-<component name="telnetserver" long-name="Telnet Server" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/telnetserver/group" mrp="mw/appsupport/openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
-</component>
-</collection>
-<collection name="printingsupport" long-name="Printing Support" level="generic">
-<component name="printinguisupport" long-name="Printing UI Support" purpose="optional" introduced="^2" deprecated="^3">
-<unit bldFile="mw/appsupport/printingsupport/printinguisupport/group" mrp="mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
-</component>
-</collection>
-<collection name="appfw" long-name="Application Framework" level="framework">
-<component name="apparchitecture" long-name="Application Architecture" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/apparchitecture/group" mrp="mw/appsupport/appfw/apparchitecture/group/app-framework_apparc.mrp"/>
-</component>
-<component name="viewserver" long-name="View Server" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/viewserver/group" mrp="mw/appsupport/appfw/viewserver/group/app-framework_viewsrv.mrp"/>
-</component>
-</collection>
-<collection name="applaunchservices" long-name="Application Launch Services" level="generic">
-<component name="aftermarketappstarter" long-name="After Market Application Starter" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/aftermarketappstarter/group" mrp="mw/appsupport/applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
-</component>
-<component name="applaunchplugins" long-name="Application Launch Plugins" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/applaunchplugins/group" mrp="mw/appsupport/applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
-</component>
-</collection>
-<collection name="tzpcside" long-name="Time Zone PC Side" level="plugin">
-<component name="tzcompiler" long-name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config PC">
-<unit bldFile="mw/appsupport/tzpcside/tzcompiler/group" mrp="mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
-</component>
-</collection>
-<collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
-<component name="appsupport_metadata" long-name="Generic Application Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="securitysrv" level="generic" long-name="Security Services" levels="plugin framework server generic specific">
-<collection name="secsrv_plat" long-name="Security Services Platform Interfaces" level="specific">
-<component name="cms_api" long-name="CMS API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/cms_api/group"/>
-</component>
-<component name="pkcs12_parser_api" long-name="PKCS12 Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkcs12_parser_api/group"/>
-</component>
-<component name="java_utils_api" long-name="Java Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/java_utils_api/group"/>
-</component>
-<component name="wim_cert_api" long-name="WIM Cert API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/wim_cert_api/group"/>
-</component>
-<component name="device_key_store_encryption_plugin_api" long-name="Device Key Store Encryption Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/device_key_store_encryption_plugin_api/group"/>
-</component>
-<component name="x509certnameparser_api" long-name="X.509 Certificate Name Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
-</component>
-<component name="remote_lock_api" long-name="Remote Lock API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
-</component>
-<component name="pkidialog_api" long-name="PKI Dialog API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
-</component>
-<component name="provisioning_api" long-name="Provisioning API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/provisioning_api/group"/>
-</component>
-<component name="keyguard_configuration_api" long-name="Keyguard Configuration API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_configuration_api/group"/>
-</component>
-<component name="keylock_policy_api" long-name="Keylock Policy API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keylock_policy_api/group"/>
-</component>
-<component name="security_code_ui_api" long-name="Security Code UI API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
-</component>
-<component name="gba_api" long-name="GBA API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/gba_api/group"/>
-</component>
-<component name="keyguard_access_api" long-name="Keyguard Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_access_api/group"/>
-</component>
-<component name="devicelock_access_api" long-name="Device Lock Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devicelock_access_api/group"/>
-</component>
-<component name="lockapp_server_api" long-name="Lock Application Server API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
-</component>
-<component name="devencadaptation_api" long-name="Device Encryption Adaptation API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
-</component>
-<component name="devenccommonutils_api" long-name="Device Encryption Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
-</component>
-</collection>
-<collection name="cms" long-name="Certificate Management Service" level="server">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="cms_build" filter="s60" long-name="CMS" introduced="^3">
-<unit bldFile="mw/securitysrv/cms/group"/>
-</component>
-</collection>
-<collection name="pkiutilities" long-name="PKI Utilities" level="plugin">
-<component name="x509certnameparser" filter="s60" long-name="X.509 Certificate Name Parser">
-<unit bldFile="mw/securitysrv/pkiutilities/x509certnameparser/group"/>
-</component>
-<component name="pkcs12" filter="s60" long-name="PKCS #12">
-<unit bldFile="mw/securitysrv/pkiutilities/pkcs12/group"/>
-</component>
-<component name="certmanui" filter="s60" long-name="Certificate Management UI">
-<unit bldFile="mw/securitysrv/pkiutilities/certmanui/group"/>
-</component>
-<component name="ctsecuritydialogs" filter="s60" long-name="Crypto Token Security Dialogs">
-<unit bldFile="mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
-</component>
-<component name="certsaver" filter="s60" long-name="Certificate Saver">
-<unit bldFile="mw/securitysrv/pkiutilities/certsaver/group"/>
-</component>
-<component name="secmodui" filter="s60" long-name="Security Module UI">
-<unit bldFile="mw/securitysrv/pkiutilities/secmodui/group"/>
-</component>
-<component name="devicetoken" filter="s60" long-name="Device Token">
-<unit bldFile="mw/securitysrv/pkiutilities/devicetoken/group"/>
-</component>
-<component name="certificates" filter="s60" long-name="Certificates">
-<unit bldFile="mw/securitysrv/pkiutilities/Certificates/group" filter="sf_build"/>
-</component>
-<component name="pkiutilities_build" filter="s60" long-name="PKI Utilities Build">
-<!-- need to split this into the above components -->
-<unit bldFile="mw/securitysrv/pkiutilities/group"/>
-</component>
-<component name="ocsp" long-name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
-<unit bldFile="mw/securitysrv/pkiutilities/ocsp/group" mrp="mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
-</component>
-</collection>
-<collection name="wim" long-name="Wireless Identity Module " level="framework">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="wim_build" filter="s60" long-name="WIM Build">
-<unit bldFile="mw/securitysrv/wim/group"/>
-</component>
-</collection>
-<collection name="remotelock" long-name="Remote Lock" level="generic">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="remotelock_build" filter="s60" long-name="Remote Lock Build">
-<unit bldFile="mw/securitysrv/remotelock/group"/>
-</component>
-</collection>
-<collection name="securitydialogs" long-name="Security Dialogs" level="specific">
-<component name="keylockpolicyapi" filter="s60" long-name="Keylock Policy API">
-<unit bldFile="mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
-</component>
-<component name="autolock" long-name="Autolock" filter="s60">
-<unit bldFile="mw/securitysrv/securitydialogs/autolock/group"/>
-</component>
-<component name="secui" filter="s60" long-name="Security UI">
-<unit bldFile="mw/securitysrv/securitydialogs/secui/group"/>
-</component>
-<component name="securitynotifier" filter="s60" long-name="Security Notifier">
-<unit bldFile="mw/securitysrv/securitydialogs/securitynotifier/group"/>
-</component>
-<component name="lockclient" filter="s60" long-name="Lock Client" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockclient/group"/>
-</component>
-<component name="lockapp" filter="s60" long-name="Lock Application" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockapp/group"/>
-</component>
-<component name="secuinotifications" long-name="Security UI Notifications" introduced="^4" filter="s60">
-<unit bldFile="mw/securitysrv/securitydialogs/secuinotifications" proFile="secuinotifications.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="boottimeintegritycheck_build" filter="s60" long-name="Boot Time Integrity Check Build">
-<unit bldFile="mw/securitysrv/boottimeintegritycheck/group"/>
-</component>
-</collection>
-<collection name="gba" long-name="Generic Bootstrapping Architecture" level="server">
-<component name="uicc" filter="s60" long-name="UICC" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/uicc/group"/>
-</component>
-<component name="gbaserver" filter="s60" long-name="GBA Server" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaserver/group"/>
-</component>
-<component name="gbaapi" filter="s60" long-name="GBA API" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaapi/group"/>
-</component>
-<component name="gbafilter" filter="s60" long-name="GBA HTTP Filter" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/gbafilter/group"/>
-</component>
-<component name="gba_build" filter="s60" long-name="Generic Boot Architecture Build" introduced="^2">
-<!-- need to split this into the above components, or remove #includes and make this GBA ROM -->
-<unit bldFile="mw/securitysrv/gba/group"/>
-</component>
-</collection>
-<collection name="devencdiskutils" long-name="Device Encryption Disk Utils" level="server">
-<component name="devenccommonutils" filter="s60" long-name="Device Encryption Common Utils" introduced="^3">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncCommonUtils/group"/>
-</component>
-<component name="devencrfsplugin" filter="s60" long-name="Device Encryption RFS Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncRfsPlugin/group"/>
-</component>
-<component name="pk5recognizer" filter="s60" long-name="Device Encryption Pk5 Recognizer" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/Pk5Recognizer/group"/>
-</component>
-<component name="devencstarter" filter="s60" long-name="Device Encryption Starter" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncStarter/group"/>
-</component>
-<component name="devencdiskutils" filter="s60" long-name="Device Encryption Disk Utils Build" introduced="^3">
-<!-- need to split this into the above components, or remove #includes and make this a ROM component-->
-<unit bldFile="mw/securitysrv/devencdiskutils/group"/>
-</component>
-</collection>
-<collection name="securitysrv_info" long-name="Security Services Info" level="specific">
-<component name="securitysrv_metadata" long-name="Security Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="drm" level="generic" long-name="DRM" levels="plugin framework server generic specific">
-<collection name="drm_plat" long-name="DRM Platform Interfaces" level="specific">
-<component name="roap_api" long-name="ROAP API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/roap_api/group"/>
-</component>
-<component name="drm_common_api" long-name="DRM Common API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_common_api/group"/>
-</component>
-<component name="drm_rights_api" long-name="DRM Rights API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_rights_api/group"/>
-</component>
-<component name="drm_legacy_api" long-name="DRM Legacy API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_legacy_api/group"/>
-</component>
-<component name="dcf_repository_api" long-name="DCF Repository API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/dcf_repository_api/group"/>
-</component>
-<component name="drm_service_api" long-name="DRM Service API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_service_api/group"/>
-</component>
-<component name="drm_secondary_display_api" long-name="DRM Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_secondary_display_api/group"/>
-</component>
-<component name="drm_license_manager_api" long-name="DRM License Manager API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_license_manager_api/group"/>
-</component>
-<component name="drm_utility_api" long-name="DRM Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_utility_api/group"/>
-</component>
-<component name="drm_agents_api" long-name="DRM Agents API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_agents_api/group"/>
-</component>
-<component name="wmdrm_core_api" long-name="WM DRM Core API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_core_api/group"/>
-</component>
-<component name="wmdrm_access_api" long-name="WMDRM Access API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_access_api/group"/>
-</component>
-<component name="camese_utility_api" long-name="Camese Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_utility_api/group"/>
-</component>
-<component name="camese_framework_api" long-name="Camese Framework API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_framework_api/group"/>
-</component>
-</collection>
-<collection name="drm_pub" long-name="DRM Public Interfaces" level="specific">
-<component name="drm_helper_api" long-name="DRM Helper API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_helper_api/group"/>
-</component>
-<component name="oma_drm_caf_agent_api" long-name="OMA DRM CAF Agent API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/group"/>
-</component>
-<component name="drm_license_checker_api" long-name="DRM License Checker API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_license_checker_api/group"/>
-</component>
-</collection>
-<collection name="commondrm" long-name="Common DRM" level="generic">
-<!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
-<component name="drmencryptor" filter="s60" long-name="DRM Encryptor" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmsettingsplugin" filter="s60" long-name="DRM Settings Plugin" plugin="Y" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmrightsmanagerui" filter="s60" long-name="DRM Rights Manager UI">
-<unit bldFile="mw/drm/commondrm/drmrightsmanagerui/help/group"/>
-</component>
-<component name="drmutility" filter="s60" long-name="DRM Utility">
-<!-- Uncomment unit when configuration is in place. Currently #included from commondrm_build -->
-<!--<unit bldFile="commondrm/drmutility/group"/>-->
-</component>
-<component name="drmserviceapiwrapper" filter="s60" long-name="DRM Service API Wrapper">
-<unit bldFile="mw/drm/commondrm/drmserviceapiwrapper/group"/>
-</component>
-<component name="drmrightsstoringlocation" filter="s60" long-name="DRM Rights Storing Location">
-<unit bldFile="mw/drm/commondrm/drmrightsstoringlocation/group"/>
-</component>
-<component name="commondrm_build" filter="s60" long-name="Common DRM Build">
-<!-- should be split into the above files, or them collapsed into a single component -->
-<unit bldFile="mw/drm/commondrm/group"/>
-</component>
-</collection>
-<collection name="omadrm" long-name="OMA DRM" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="omadrm_build" filter="s60" long-name="OMA DRM Build">
-<unit bldFile="mw/drm/omadrm/group"/>
-</component>
-<component name="foundationcerts" filter="sf_build" long-name="Foundation Certificates">
-<unit bldFile="mw/drm/omadrm/foundationcerts/group"/>
-</component>
-</collection>
-<collection name="wmdrm" long-name="Windows Media DRM" level="framework">
-<!-- collection is really a component. Move down a directory -->
-<component name="wmdrm_build" filter="s60" long-name="WM DRM Build">
-<unit bldFile="mw/drm/wmdrm/group"/>
-</component>
-</collection>
-<collection name="drm_info" long-name="DRM Info" level="specific"/>
-</block>
-<block name="locationsrv" level="specific" long-name="Location Services" levels="plugin fw server if">
-<collection name="locsrv_pub" long-name="Location Services Public Interfaces" level="if">
-<component name="landmarks_search_api" long-name="Landmarks Search API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
-</component>
-<component name="landmarks_api" long-name="Landmarks API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/group"/>
-</component>
-<component name="landmarks_database_management_api" long-name="Landmarks Database Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/group"/>
-</component>
-<component name="location_triggering_api" long-name="Location Triggering API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/location_triggering_api/group"/>
-</component>
-<component name="blid_application_satellite_info_api" long-name="BLID Application Satellite Info API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/group"/>
-</component>
-</collection>
-<collection name="locsrv_plat" long-name="Location Services Platform Interfaces" level="if">
-<component name="map_and_navigation_api" long-name="Map and Navigation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/group"/>
-</component>
-<component name="map_and_navigation_provider_discovery_api" long-name="Map and Navigation Provider Discovery API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/group"/>
-</component>
-<component name="geocoding_api" long-name="Geocoding API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
-</component>
-<component name="map_image_api" long-name="Map Image API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/group"/>
-</component>
-<component name="map_and_navigation_aiw_api" long-name="Map and Navigation AIW API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_aiw_api/group"/>
-</component>
-<component name="map_and_navigation_provider_api" long-name="Map and Navigation Provider API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_api/group"/>
-</component>
-<component name="landmarks_category_definition_api" long-name="Landmarks Category Definition API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
-</component>
-<component name="supl_settings_api" long-name="SUPL Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
-</component>
-<component name="location_settings_launch_api" long-name="Location Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/group"/>
-</component>
-<component name="map_image_conversion_plugin_api" long-name="Map Image Conversion Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/group"/>
-</component>
-<component name="psy_configuration_ui_plugin_api" long-name="PSY Configuration UI Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/psy_configuration_ui_plugin_api/group"/>
-</component>
-<component name="np_proxy_configuration_api" long-name="NP Proxy Configuration API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/np_proxy_configuration_api/group"/>
-</component>
-<component name="supl_terminal_initiation_api" long-name="SUPL Terminal Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/group"/>
-</component>
-<component name="location_notation_preferences_settings_api" long-name="Location Notation Preferences Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_notation_preferences_settings_api/group"/>
-</component>
-<component name="supl_settings_notifier_secondary_display_api" long-name="SUPL Settings Notifier Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_notifier_secondary_display_api/group"/>
-</component>
-<component name="supl_network_initiation_api" long-name="SUPL Network Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/group"/>
-</component>
-<component name="privacy_notifiers_secondary_display_api" long-name="Privacy Notifiers Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/privacy_notifiers_secondary_display_api/group"/>
-</component>
-<component name="oma_supl_configuration_parameter_api" long-name="OMA SUPL Configuration Parameter API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_configuration_parameter_api/group"/>
-</component>
-<component name="supl_query_secondary_display_api" long-name="SUPL Query Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_query_secondary_display_api/group"/>
-</component>
-<component name="location_triggering_management_api" long-name="Location Triggering Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_management_api/group"/>
-</component>
-<component name="location_triggering_status_information_api" long-name="Location Triggering Status Information API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_status_information_api/group"/>
-</component>
-<component name="oma_supl_asn_codec_plugin_api" long-name="OMA SUPL ASN Codec Plugin API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
-</component>
-<component name="query_and_notification_api" long-name="Query and Notification API" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/query_and_notification_api/group"/>
-</component>
-<component name="location_local_variation_api" long-name="Location Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_local_variation_api/group"/>
-</component>
-</collection>
-<collection name="genericpositioningplugins" long-name="Generic Positioning Plugins" level="plugin">
-<component name="locationnpppsy" filter="s60" long-name="Location Positioning Proxy PSY" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
-</component>
-<component name="locationsuplpsy" filter="s60" long-name="Location SUPL PSY" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationsuplpsy/group"/>
-</component>
-<component name="genericpositioningplugins_build" filter="s60" long-name="Generic Positioning Plugins Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/genericpositioningplugins/group"/>
-</component>
-</collection>
-<collection name="landmarks" long-name="Landmarks" level="server">
-<component name="locationlandmarks" filter="s60" long-name="Location Landmarks">
-<unit bldFile="mw/locationsrv/landmarks/locationlandmarks/group"/>
-</component>
-</collection>
-<collection name="locationmapnavfw" long-name="Location Map and Navigation Framework" level="fw">
-<component name="mnlibrary" filter="s60" long-name="Map and Navigation Library">
-<unit bldFile="mw/locationsrv/locationmapnavfw/library/group"/>
-</component>
-<component name="mnaiwprovider" filter="s60" long-name="Map and Navigation AIW Provider" plugin="Y">
-<unit bldFile="mw/locationsrv/locationmapnavfw/aiwprovider/group"/>
-</component>
-<component name="locationmapnavfw_build" filter="s60" long-name="Location Map and Navigation Framework Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/locationmapnavfw/group"/>
-</component>
-</collection>
-<collection name="locationsystemui" long-name="Location System UI" level="if">
-<component name="locationsysui" filter="s60" long-name="Location System UI">
-<unit bldFile="mw/locationsrv/locationsystemui/locationsysui/group"/>
-</component>
-</collection>
-<collection name="supl" long-name="SUPL" level="fw">
-<component name="locationsuplfw" filter="s60" long-name="Location SUPL Framework">
-<unit bldFile="mw/locationsrv/supl/locationsuplfw/group"/>
-</component>
-<component name="locationomasuplprotocolhandler" filter="s60" long-name="OMA SUPL Protocol Handler">
-<unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/group"/>
-</component>
-<component name="supltiapiimplementation" filter="s60" long-name="SUPL TI API Implementation" introduced="^3">
-<unit bldFile="mw/locationsrv/supl/supltiapiimplementation/group"/>
-</component>
-</collection>
-<collection name="locationtriggering" long-name="Location Triggering" level="server">
-<component name="ltlogger" filter="s60" long-name="LT Logger">
-<unit bldFile="mw/locationsrv/locationtriggering/ltlogger/group"/>
-</component>
-<component name="ltclientlib" filter="s60" long-name="LT Client Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltclientlib/group"/>
-</component>
-<component name="ltmanagementlib" filter="s60" long-name="LT Management Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmanagementlib/group"/>
-</component>
-<component name="ltcontainer" filter="s60" long-name="LT Container">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontainer/group"/>
-</component>
-<component name="ltserver" filter="s60" long-name="LT Server">
-<unit bldFile="mw/locationsrv/locationtriggering/ltserver/group"/>
-</component>
-<component name="ltstrategypluginapi" filter="s60" long-name="LT Strategy Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategypluginapi/group"/>
-</component>
-<component name="ltstrategyengine" filter="s60" long-name="LT Strategy Engine">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategyengine/group"/>
-</component>
-<component name="ltmovementdetectionpluginapi" filter="s60" long-name="Movement Detection Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmovementdetectionpluginapi/group"/>
-</component>
-<component name="ltcellidmovementdetector" filter="s60" long-name="Cell ID Movement Detector">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/>
-</component>
-<component name="lbtmgmtui" filter="s60" long-name="LBT Management UI" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/lbtmgmtui/group"/>
-</component>
-<component name="ltcontextsourceplugin" filter="s60" long-name="LT Context Source Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontextsourceplugin/group"/>
-</component>
-<component name="locationtriggering_build" filter="s60" long-name="Location Triggering Build">
-<!-- should remove #include from this and maybe put exports in the above components -->
-<unit bldFile="mw/locationsrv/locationtriggering/group"/>
-</component>
-</collection>
-</block>
-<block name="accesssec" level="generic" long-name="Access Security" levels="plugin framework server generic specific">
-<collection name="accesssec_plat" long-name="Access Security Platform Interfaces" level="specific">
-<component name="wapi_security_settings_ui_api" long-name="WAPI Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_security_settings_ui_api/group"/>
-</component>
-<component name="wep_security_settings_ui_api" long-name="WEP Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wep_security_settings_ui_api/group"/>
-</component>
-<component name="wi-fi_protected_setup_ui_api" long-name="Wi-Fi Protected Setup UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
-</component>
-<component name="wlan_eap_settings_ui_api" long-name="WLAN EAP Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wlan_eap_settings_ui_api/group"/>
-</component>
-<component name="wpa_security_settings_ui_api" long-name="WPA Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wpa_security_settings_ui_api/group"/>
-</component>
-<component name="eap_vpn_api" long-name="EAP VPN API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
-</component>
-<component name="eapsim_db_api" long-name="EAP-SIM DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapsim_db_api/group"/>
-</component>
-<component name="eap_type_api" long-name="EAP Type API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_type_api/group"/>
-</component>
-<component name="eaptlspeap_db_api" long-name="EAP-TLS-PEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eaptlspeap_db_api/group"/>
-</component>
-<component name="eapleap_db_api" long-name="LEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapleap_db_api/group"/>
-</component>
-<component name="eapgtc_db_api" long-name="EAP-GTC DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapgtc_db_api/group"/>
-</component>
-<component name="eapmschapv2_db_api" long-name="EAP-MSCHAPV2 DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapmschapv2_db_api/group"/>
-</component>
-<component name="eapaka_db_api" long-name="EAP-AKA DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapaka_db_api/group"/>
-</component>
-<component name="wapi_db_api" long-name="WAPI DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_db_api/group"/>
-</component>
-</collection>
-<collection name="wlansecuritysettings" long-name="WLAN Security Settings" level="specific">
-<component name="wapisecuritysettingsui" filter="s60" long-name="WAPI Security Settings UI" introduced="9.1">
-<!-- the directory for this needs to be moved up to the right level -->
-<unit bldFile="mw/accesssec/wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
-</component>
-<component name="wepsecuritysettingsui" filter="s60" long-name="WEP Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wepsecuritysettingsui/group"/>
-</component>
-<component name="wifiprotectedsetup" filter="s60" long-name="WIFI Protected Setup" introduced="^1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wifiprotectedsetup/group"/>
-</component>
-<component name="wlaneapsettingsui" filter="s60" long-name="WLAN EAP Settings UI" introduced="9.3">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wlaneapsettingsui/group"/>
-</component>
-<component name="wpasecuritysettingsui" filter="s60" long-name="WPA Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wpasecuritysettingsui/group"/>
-</component>
-</collection>
-<collection name="eapol" long-name="EAPOL" level="framework">
-<component name="eapol_framework" filter="s60" long-name="EAPOL Framework" introduced="9.2">
-<unit bldFile="mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
-</component>
-</collection>
-</block>
-<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>
-<component name="bearer_settings_plugin_api" long-name="Bearer Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/bearer_settings_plugin_api/group"/>
-</component>
-<component name="commsdat_wlan_api" long-name="CommsDat WLAN API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/commsdat_wlan_api/group"/>
-</component>
-<component name="connection_monitor_extension_api" long-name="Connection Monitor Extension API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_monitor_extension_api/group"/>
-</component>
-<component name="connection_ui_utilities_api" long-name="Connection UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_ui_utilities_api/group"/>
-</component>
-<component name="disconnect_dialog_api" long-name="Disconnect Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_api/group"/>
-</component>
-<component name="disconnect_dialog_disable_api" long-name="Disconnect Dialog Disable API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_disable_api/group"/>
-</component>
-<component name="extended_connection_settings_api" long-name="Extended Connection Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/extended_connection_settings_api/group"/>
-</component>
-<component name="mpm_default_connection_api" long-name="MPM Default Connection API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_default_connection_api/group"/>
-</component>
-<component name="pdpcontextmanager2_reset_factory_settings_api" long-name="PDP Context Manager 2 Reset Factory Settings API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_settings_api/group"/>
-</component>
-<component name="mpm_connect_screen_api" long-name="MPM Connect Screen API" filter="s60" class="api">
-<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="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>
-<component name="access_point_engine_api" long-name="Access Point Engine API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_monitor_server_api/group"/>
-</component>
-<component name="connection_settings_ui_api" long-name="Connection Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_ui_api/group"/>
-</component>
-<component name="agent_dialog_api" long-name="Agent Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/agent_dialog_api/group"/>
-</component>
-<component name="extendedconnpref_api" long-name="Extended Connection Preferences API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/extendedconnpref_api/group"/>
-</component>
-</collection>
-<collection name="accesspointcontrol" long-name="Access Point Control" level="plugin">
-<component name="apcontrollistplugin" filter="s60" long-name="Access Point Control List Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
-</component>
-</collection>
-<collection name="alwayson_net_plugin" long-name="Always Online Net Plugin" level="server">
-<component name="pdpcontextmanager2" filter="s60" long-name="PDP Context Manager 2">
-<unit bldFile="mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
-</component>
-</collection>
-<collection name="apengine" long-name="Access Point Engine" level="framework">
-<component name="apeng" filter="s60" long-name="Access Point Engine">
-<unit bldFile="mw/ipconnmgmt/apengine/apeng/group"/>
-</component>
-<component name="apsettingshandlerui" filter="s60" long-name="Access Point Settings Handler UI">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingshandlerui/group"/>
-</component>
-<component name="apsettingsplugin" filter="s60" long-name="Access Point Settings Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="bearermanagement" long-name="Bearer Management" level="framework">
-<component name="mpm" filter="s60" long-name="Mobility Policy Manager">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/mpm/group"/>
-</component>
-<component name="extendedconnpref" filter="s60" long-name="Extended Connection Preferences">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/extendedconnpref/group"/>
-</component>
-<component name="s60mcpr" filter="s60" long-name="S60 Meta-Connection Provider" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/S60MCPR/group"/>
-</component>
-</collection>
-<collection name="cmmanager" long-name="Connection Method Manager" level="framework">
-<component name="cmmgr" filter="s60" long-name="CM Manager">
-<unit bldFile="mw/ipconnmgmt/cmmanager/cmmgr/group"/>
-</component>
-<component name="gsconnsettingsplugin" filter="s60" long-name="GS Connection Settings Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/cmmanager/gsconnsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="connectionmonitoring" long-name="Connection Monitoring" level="server">
-<component name="connectionmonitorplugin" filter="s60" long-name="Connection Monitor Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorplugin/group"/>
-</component>
-<component name="connectionmonitorui" filter="s60" long-name="Connection Monitor UI">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorui/group"/>
-</component>
-<component name="connmon" filter="s60" long-name="Connection Monitor">
-<!-- either split into two components, or #include from a common bld.inf -->
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/connectionmonitor/group"/>
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/dataconnectionlogger/group"/>
-</component>
-<component name="connmonext" filter="s60" long-name="Connection Monitor Extension API">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmonext/group"/>
-</component>
-</collection>
-<collection name="connectionutilities" long-name="Connection Utilities" level="utils">
-<component name="connectiondialogs" filter="s60" long-name="Connection Dialogs">
-<unit bldFile="mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/>
-</component>
-</collection>
-<collection name="dbcreator" long-name="DB Creator" level="utils">
-<component name="commsdatcreator" filter="s60" long-name="Comms Database Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
-</component>
-<component name="commsdatcreatorrfsplugin" filter="s60" long-name="Comms Database Creator RFS Plugin" introduced="9.3" plugin="Y">
-<!-- uncomment when config is turned on -->
-<!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
-</component>
-<component name="commsdatstartup" filter="s60" long-name="Comms Database Startup" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
-</component>
-<component name="dbcreatorexe" filter="s60" long-name="DB Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
-</component>
-<component name="dbcreator_build" filter="s60" long-name="DB Creator Build" introduced="9.3">
-<!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
-<unit bldFile="mw/ipconnmgmt/dbcreator/group"/>
-</component>
-</collection>
-<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"/>
-</component>
-<component name="ipcm_qt_build" long-name="IP Connectivity Management Qt Build" introduced="^4">
-<unit bldFile="mw/ipconnmgmt" proFile="ipconnmgmt.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</block>
-<block name="netprotocols" level="generic" long-name="High-level Internet Protocols" levels="plugin framework server generic specific">
-<collection name="netprotocols_plat" long-name="High-level Internet Protocols Platform Interfaces" level="specific">
-<component name="cookie_manager_api" long-name="Cookie Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/cookie_manager_api/group"/>
-</component>
-<component name="http_cache_mgr_api" long-name="HTTP Cache Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_cache_mgr_api/group"/>
-</component>
-<component name="http_filters_api" long-name="HTTP Filters API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_filters_api/group"/>
-</component>
-</collection>
-<collection name="httpfilters" long-name="HTTP Filters" level="plugin">
-<component name="httpfiltercommon" filter="s60" long-name="HTTP Filter Common">
-<unit bldFile="mw/netprotocols/httpfilters/httpfiltercommon/group"/>
-</component>
-<component name="cookie" filter="s60" long-name="Cookie Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/cookie/group"/>
-</component>
-<component name="deflatefilter" filter="s60" long-name="Deflate Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/deflatefilter/group"/>
-</component>
-<component name="httpfilteracceptheader" filter="s60" long-name="Accept Header Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteracceptheader/group"/>
-</component>
-<component name="httpfilterauthentication" filter="s60" long-name="Authentication Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterauthentication/group"/>
-</component>
-<component name="httpfilterconnhandler" filter="s60" long-name="Connection Handler Fitler" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterconnhandler/group"/>
-</component>
-<component name="httpfilteriop" filter="s60" long-name="HTTP IOP Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteriop/group"/>
-</component>
-<component name="httpfilterproxy" filter="s60" long-name="HTTP Proxy Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterproxy/group"/>
-</component>
-<component name="uaproffilter" filter="s60" long-name="UAProf Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/uaproffilter/group"/>
-</component>
-</collection>
-<collection name="applayerprotocols" long-name="Application Layer Protocols" level="server">
-<component name="httptransportfw" long-name="HTTP Transport Framework" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
-</component>
-<component name="httpexamples" long-name="HTTP Examples" introduced="6.2" purpose="development">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpexamples/group" mrp="mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
-</component>
-<component name="wappushsupport" long-name="WAP Push Support" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
-</component>
-<component name="wapbase" long-name="WAP Base" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wapbase/Group" mrp="mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
-</component>
-<component name="ftpengine" long-name="FTP Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/ftpengine/group" mrp="mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
-</component>
-<component name="telnetengine" long-name="Telnet Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/telnetengine/group" mrp="mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
-</component>
-<component name="httpserviceapi" long-name="HTTP Service API" introduced="TB9.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpservice/group" mrp="mw/netprotocols/applayerprotocols/httpservice/group/http_service.mrp"/>
-</component>
-</collection>
-<collection name="applayerpluginsandutils" long-name="Application Layer Plugins and Utils" level="framework">
-<component name="uripermissionservices" long-name="URI Permission Services" introduced="^2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
-</component>
-<component name="bookmarksupport" long-name="Bookmark Support" introduced="9.1" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
-</component>
-<component name="httpprotocolplugins" long-name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
-</component>
-<component name="httptransportplugins" long-name="HTTP Transport Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
-</component>
-</collection>
-<collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
-<component name="netprotocols_metadata" long-name="High-level Internet Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ipappprotocols" level="generic" long-name="IP App Protocols" levels="plugin conn server if">
-<collection name="ipappprotocols_plat" long-name="IP App Protocols Platform Interfaces" level="if">
-<component name="srtp_api" long-name="SRTP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/srtp_api/group"/>
-</component>
-<component name="rtprtcp_api" long-name="RTP/RTCP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/rtprtcp_api/group"/>
-</component>
-</collection>
-<collection name="rtp" long-name="RTP" level="server">
-<component name="srtpstack" filter="s60" long-name="SRTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/srtpstack/group"/>
-</component>
-<component name="rtpstack" filter="s60" long-name="RTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/rtpstack/group"/>
-</component>
-</collection>
-<collection name="realtimenetprots" long-name="Real Time Net Protocols" level="server">
-<component name="symrtp" long-name="RTP" introduced="9.0" purpose="optional">
-<!-- Real Time Data Protocol -->
-<unit bldFile="mw/ipappprotocols/realtimenetprots/rtp/group" mrp="mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
-</component>
-<component name="srtp" long-name="Secure RTP" introduced="^4" purpose="optional">
-<unit bldFile="mw/ipappprotocols/realtimenetprots/srtp/group" mrp="mw/ipappprotocols/realtimenetprots/srtp/group/mm-protocols_srtp.mrp"/>
-</component>
-<component name="sipfw" long-name="SIP Framework" introduced="9.2" purpose="optional">
-<unit bldFile="mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp" version="2"/>
-</component>
-</collection>
-<collection name="sipplugins" long-name="SIP Plugins" level="plugin">
-<component name="sippwlanplugin" filter="s60" long-name="SIP WLAN Plugin" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
-</component>
-<component name="sippsipsettingsui" filter="s60" long-name="SIP Settings UI" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
-</component>
-<component name="sippdevmgmtsipadapter" filter="s60" long-name="Device Management SIP Settings Adapter" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
-</component>
-<component name="sippsystemstatemonitor" filter="s60" long-name="SIP System State Monitor" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsystemstatemonitor/group"/>
-</component>
-<component name="sippsipadapter" filter="s60" long-name="SIP Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipadapter/group"/>
-</component>
-</collection>
-<collection name="sipproviderplugins" long-name="SIP Provider Plugins" level="conn">
-<component name="sipprovider" long-name="SIP Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipproviderplugins/sipprovider/group" mrp="mw/ipappprotocols/sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
-</component>
-</collection>
-<collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="if">
-<component name="ipappprotocols_metadata" long-name="IP App Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wirelessacc" level="specific" long-name="Wireless Access" levels="framework generic ui">
-<collection name="hsfw_plat" long-name="HotSpot Framework Platform Interfaces" level="ui">
-<component name="hotspot_framework_client_api" long-name="HotSpot Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_api" long-name="Internet Connectivity Test Service API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_settings_api" long-name="Internet Connectivity Test Service Settings API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
-</component>
-<component name="hotspot_framework_client_plugin_api" long-name="HotSpot Framework Client Plugin API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
-</component>
-</collection>
-<collection name="hotspotfw" long-name="HotSpot Framework" level="framework">
-<component name="hsserver" filter="s60" long-name="HotSpot Server" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="hsclient" filter="s60" long-name="HotSpot Client" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="internetconnectivitytestservice" filter="s60" long-name="Internet Connectivity Test Service" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
-</component>
-<component name="ictsdialogs" filter="s60" long-name="Internet Connectivity Test Service Dialogs" deprecated="^3" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
-</component>
-<component name="hspluginforagent" filter="s60" long-name="HotSpot Plugin for Agent" plugin="Y" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
-</component>
-<component name="hsbrowser" filter="s60" long-name="HotSpot Browser" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
-</component>
-<component name="hotspotfw_build" filter="s60" long-name="Hotspot Framework Build">
-<!-- should break up this bld.inf into the above components, or collapse them all into a single component -->
-<unit bldFile="mw/wirelessacc/hotspotfw/group"/>
-</component>
-</collection>
-<collection name="wlanutilities" long-name="WLAN Utilities" level="generic">
-<component name="wlanutilities_build" long-name="WLAN Utilities Qt" introduced="^4" filter="s60">
-<!-- is this uinit needed, or is it sufficient to uncomment the units in the below components? -->
-<unit bldFile="mw/wirelessacc/wlanutilities" proFile="wirelessacc.pro" qmakeArgs="-r"/>
-</component>
-<component name="wlanqtutilities" filter="s60" long-name="WLAN Qt Utilities" introduced="^4" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlanplugin/group" qt:proFile="wlanqtutilities.pro"/>-->
-</component>
-<component name="wlansniffer" filter="s60" long-name="WLAN Sniffer" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlansettingsui/group" qt:proFile="wlansniffer.pro"/>-->
-</component>
-<component name="wlanentryplugin" filter="s60" long-name="WLAN Entry Plugin" plugin="Y" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlansniffer/group" qt:proFile="wlanentryplugin.pro"/>-->
-</component>
-<component name="wlanindicatorplugin" filter="s60" long-name="WLAN Indicator Plugin" plugin="Y" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlanindicatorplugin/group" qt:proFile="wlanindicatorplugin.pro"/>-->
-</component>
-</collection>
-</block>
-<block name="vpnclient" level="specific" long-name="VPN Client" levels="engine ui api">
-<!-- is the !oem_build filter needed? -->
-<collection name="vpnc_plat" long-name="VPN Client Platform Interfaces" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API" class="api">
-<unit bldFile="mw/vpnclient/vpnc_plat/vpnapi/group"/>
-</component>
-</collection>
-<collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API">
-<unit bldFile="mw/vpnclient/vpnapiimpl/group"/>
-</component>
-</collection>
-<collection name="vpnengine" long-name="VPN Engine" level="engine">
-<!-- too many components in this collection.
- Probably best to group the binaries together into larger components
- or maybe split the collection into more reasonable groups -->
-<component name="eventmediatorapi" filter="s60" long-name="Event Mediator API">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediatorapi/group"/>
-</component>
-<component name="eventviewer" filter="s60" long-name="Event Viewer">
-<unit bldFile="mw/vpnclient/vpnengine/eventviewer/group"/>
-</component>
-<component name="vpnins" filter="s60" long-name="VPN Installer">
-<unit bldFile="mw/vpnclient/vpnengine/vpnins/group"/>
-</component>
-<component name="ikepolparser" filter="s60" long-name="IKE Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/ikepolparser/group"/>
-</component>
-<component name="utlbase64" filter="s60" long-name="Base64 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlbase64/group"/>
-</component>
-<component name="utlcrypto" filter="s60" long-name="Crypto Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlcrypto/group"/>
-</component>
-<component name="utlxml" filter="s60" long-name="XML Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlxml/group"/>
-</component>
-<component name="utlpkcs10" filter="s60" long-name="PKCS#10 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs10/group"/>
-</component>
-<component name="pkiserviceapi" filter="s60" long-name="PKI Service API">
-<unit bldFile="mw/vpnclient/vpnengine/pkiserviceapi/group"/>
-</component>
-<component name="ikecert" filter="s60" long-name="IKE Certificate Management">
-<unit bldFile="mw/vpnclient/vpnengine/ikecert/group"/>
-</component>
-<component name="kmdapi" filter="s60" long-name="Key Management Daemon API">
-<unit bldFile="mw/vpnclient/vpnengine/kmdapi/group"/>
-</component>
-<component name="kmdserver" filter="s60" long-name="Key Management Daemon Server">
-<unit bldFile="mw/vpnclient/vpnengine/kmdserver/group"/>
-</component>
-<component name="ikeutils" filter="s60" long-name="Internet Key Exchange Utils">
-<unit bldFile="mw/vpnclient/vpnengine/ikeutils/group"/>
-</component>
-<component name="ikev1lib" filter="s60" long-name="IKEv1 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev1lib/group"/>
-</component>
-<component name="ikev2lib" filter="s60" long-name="IKEv2 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev2lib/group"/>
-</component>
-<component name="vpnipsecpolparser" filter="s60" long-name="VPN IPsec Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/vpnipsecpolparser/group"/>
-</component>
-<component name="sit" filter="s60" long-name="Socket Interaction Thread">
-<unit bldFile="mw/vpnclient/vpnengine/sit/group"/>
-</component>
-<component name="vpntcwrapper" filter="s60" long-name="VPN Terminal Control Wrapper">
-<unit bldFile="mw/vpnclient/vpnengine/vpntcwrapper/group"/>
-</component>
-<component name="eventmediator" filter="s60" long-name="Event Mediator">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediator/group"/>
-</component>
-<component name="pkiservice" filter="s60" long-name="PKI Service">
-<unit bldFile="mw/vpnclient/vpnengine/pkiservice/group"/>
-</component>
-<component name="vpnconnagt" filter="s60" long-name="VPN Connection Agent">
-<unit bldFile="mw/vpnclient/vpnengine/vpnconnagt/group"/>
-</component>
-<component name="vpnmanager" filter="s60" long-name="VPN Manager">
-<unit bldFile="mw/vpnclient/vpnengine/vpnmanager/group"/>
-</component>
-<component name="vpncleaner" filter="s60" long-name="VPN Cleaner">
-<unit bldFile="mw/vpnclient/vpnengine/vpncleaner/group"/>
-</component>
-<component name="utlpkcs12" filter="s60" long-name="PKCS#12 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs12/group"/>
-</component>
-<component name="dmadengine" filter="s60" long-name="DM Adapter Engine">
-<unit bldFile="mw/vpnclient/vpnengine/dmadengine/group"/>
-</component>
-<component name="dmadipsecvpn" filter="s60" long-name="IPsec VPN DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadipsecvpn/group"/>
-</component>
-<component name="dmadpki" filter="s60" long-name="PKI DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadpki/group"/>
-</component>
-<component name="ikesocket" filter="s60" long-name="IKE Socket" introduced="^3">
-<unit bldFile="mw/vpnclient/vpnengine/ikesocket/group"/>
-</component>
-</collection>
-<collection name="vpnui" long-name="VPN UI" level="ui">
-<component name="vpnecomnotifier" filter="s60" long-name="VPN ECOM Notifier" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnecomnotifier/group"/>
-</component>
-<component name="vpndialogmanager" filter="s60" long-name="VPN Dialog Manager">
-<unit bldFile="mw/vpnclient/vpnui/vpndialogmanager/group"/>
-</component>
-<component name="vpnmanagementui" filter="s60" long-name="VPN Management UI" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnmanagementui/group"/>
-</component>
-<component name="vpnpolins" filter="s60" long-name="VPN Policy Installer">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolins/group"/>
-</component>
-<component name="vpnpolicyrecognizer" filter="s60" long-name="VPN Policy Recognizer" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolicyrecognizer/group"/>
-</component>
-</collection>
-<collection name="vpnclient_info" long-name="VPN Client Info" level="api">
-<component name="vpnclient_help" filter="s60" long-name="VPN Client Help">
-<unit bldFile="mw/vpnclient/help/group"/>
-</component>
-<component name="vpnclient_build" filter="s60" long-name="VPN Client Build">
-<!-- should split this up into the other components and remove this-->
-<unit bldFile="mw/vpnclient/group"/>
-</component>
-</collection>
-</block>
-<block name="ipappsrv" level="specific" long-name="IP App Services" levels="framework generic server conn plugin">
-<collection name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" level="plugin">
-<component name="transcoder_api" long-name="Transcoder API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
-</component>
-<component name="comms_event_api" long-name="Comms Event API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/comms_event_api/group"/>
-</component>
-<component name="floor_control_api" long-name="Floor Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/floor_control_api/group"/>
-</component>
-<component name="media_control_api" long-name="Media Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/media_control_api/group"/>
-</component>
-<component name="multimedia_comms_api" long-name="Multimedia Comms API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/multimedia_comms_api/group"/>
-</component>
-<component name="nat_settings_api" long-name="NAT Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/nat_settings_api/group"/>
-</component>
-</collection>
-<collection name="natfw" long-name="NAT Framework" level="framework">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="natfw_build" filter="s60" long-name="NAT Framework Build" introduced="^2">
-<unit bldFile="mw/ipappsrv/natfw/group"/>
-</component>
-</collection>
-<collection name="multimediacommscontroller" long-name="Multimedia Comms Controller" level="conn">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommscontroller_build" filter="s60" long-name="Multimedia Comms Controller Build">
-<unit bldFile="mw/ipappsrv/multimediacommscontroller/group"/>
-</component>
-</collection>
-<collection name="multimediacommsengine" long-name="Multimedia Comms Engine" level="generic">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommsengine_build" filter="s60" long-name="Multimedia Comms Engine Build">
-<unit bldFile="mw/ipappsrv/multimediacommsengine/group"/>
-</component>
-</collection>
-<collection name="natplugins" long-name="NAT Plugins" level="plugin">
-<component name="natpcliprovisioningnatfwadapter" filter="s60" long-name="Client Provisioning NAT Framework Traversal Adapter" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/group"/>
-</component>
-<component name="natpdevmgmtnatfwadapter" filter="s60" long-name="Device Management NAT Framework Traversal Adapter" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/group"/>
-</component>
-<component name="natptraversalcontroller" filter="s60" long-name="NAT Traversal Controller" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natptraversalcontroller/group"/>
-</component>
-<component name="natpnatfwsdpprovider" filter="s60" long-name="NAT Framework SDP Provider" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpnatfwsdpprovider/group"/>
-</component>
-</collection>
-<collection name="ipappsrv_info" long-name="IP App Services Info" level="plugin">
-<component name="ipappsrv_build" long-name="IP App Services Build" filter="s60">
-<!-- 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">
-<collection name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" level="specific">
-<component name="sat_refresh_api" long-name="SAT Refresh API" filter="s60" class="api"/>
-<component name="sat_client_api" long-name="SAT Client API" filter="s60" class="api"/>
-<component name="sat_service_api" long-name="SAT Service API" filter="s60" class="api"/>
-<component name="call_information_api" long-name="Call Information API" filter="s60" class="api"/>
-<component name="call_remote_party_information_api" long-name="Call Remote Party Information API" filter="s60" class="api"/>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api"/>
-</collection>
-<collection name="cellular" long-name="Cellular" level="server">
-<component name="telephonysettings" filter="s60" long-name="Telephony Settings" purpose="development"/>
-<component name="sssettings" filter="s60" long-name="Supplementary Service Settings" purpose="development"/>
-<component name="psetnotesui" filter="s60" long-name="Phone Settings Notes UI" purpose="development"/>
-</collection>
-<collection name="convergedcallengine" long-name="Converged Call Engine" level="framework">
-<component name="cce" filter="s60" long-name="CCE" purpose="development"/>
-<component name="spsettings" filter="s60" long-name="Service Provider Settings" purpose="development"/>
-</collection>
-<collection name="phoneclientserver" long-name="Phone Client/Server" level="server">
-<component name="aiwdialdata" filter="s60" long-name="AIW Dial Data" purpose="development"/>
-<component name="dialutils" filter="s60" long-name="Dial Utils" purpose="development"/>
-<component name="phoneclient" filter="s60" long-name="Phone Client" purpose="development"/>
-</collection>
-<collection name="phonesrv_info" long-name="Phone Server Info" level="generic">
-<component name="phonesrv_build" long-name="Phone Server Build" filter="s60">
-<unit bldFile="mw/phonesrv" proFile="phonesrv.pro"/>
-</component>
-</collection>
-</block>
-<block name="messagingmw" level="specific" long-name="Messaging Middleware" levels="stack support fw api">
-<collection name="msgfw_plat" long-name="Messaging Middleware Platform Interfaces" level="api">
-<component name="always_online_plugin_api" long-name="Always Online Plugin API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_plugin_api/group"/>
-</component>
-<component name="always_online_client_api" long-name="Always Online Client API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_client_api/group"/>
-</component>
-<component name="msg_common_utils_api" long-name="Messaging Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/msg_common_utils_api/group"/>
-</component>
-<component name="muiu_utils_api" long-name="Messaging Center UI Utilities API" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/muiu_utils_api/group"/>
-</component>
-</collection>
-<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" class="config">
-<unit bldFile="mw/messagingmw/msgbranched/group"/>
-</component>
-</collection>
-<collection name="messagingfw" long-name="Messaging Framework" level="fw">
-<!-- should break this collection up into smaller related collections -->
-<component name="send_ui_api" long-name="Send UI API" filter="s60" deprecated="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/send_ui_api/group"/>
-</component>
-<component name="send_ui_plugin_api" long-name="Send UI Plug-in API" filter="s60" deprecated="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/send_ui_plugin_api/group"/>
-</component>
-<component name="send_ui_datautils_api" long-name="Send UI Data Utils API" filter="s60" deprecated="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/send_ui_datautils_api/group"/>
-</component>
-<component name="alwaysonline" filter="s60" long-name="Always Online Server" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/alwaysonline/group"/>
-</component>
-<component name="msgcommonutils" filter="s60" long-name="Messaging Common Utils" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/msgcommonutils/group"/>
-</component>
-<component name="senduiservices" filter="s60" long-name="Send UI Services" introduced="^2" deprecated="^4">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/senduiservices/group"/>
-</component>
-<component name="muiuutils" long-name="Messaging Center UI Utilities" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/muiuutils/group"/>
-</component>
-<component name="scheduledsendmtm" long-name="Scheduled Send MTM" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/group" mrp="mw/messagingmw/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
-</component>
-<component name="msgsrvnstore" long-name="Message Server and Store" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/group" mrp="mw/messagingmw/messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
-</component>
-<component name="biomsgfw" long-name="BIO Messaging Framework" introduced="6.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/group" mrp="mw/messagingmw/messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
-</component>
-<component name="msgconf" long-name="Messaging Config" introduced="^2" purpose="optional" class="config">
-<unit bldFile="mw/messagingmw/messagingfw/msgconf/group" mrp="mw/messagingmw/messagingfw/msgconf/group/messaging_config.mrp"/>
-</component>
-<component name="watcherfw" long-name="Watcher Framework" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/watcherfw/group" mrp="mw/messagingmw/messagingfw/watcherfw/group/messaging_watcher.mrp"/>
-</component>
-<component name="msgtest" long-name="Messaging Test" purpose="development">
-<unit bldFile="mw/messagingmw/messagingfw/msgtest/group" mrp="mw/messagingmw/messagingfw/msgtest/group/messaging_test.mrp"/>
-</component>
-<component name="sendas" long-name="Send As" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/sendas/group" mrp="mw/messagingmw/messagingfw/sendas/group/messaging_sendas2.mrp"/>
-</component>
-<component name="msgurlhandler" long-name="Message URL Handler" introduced="7.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/group" mrp="mw/messagingmw/messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
-</component>
-<component name="wappushfw" long-name="WAP Push Framework" introduced="6.1" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/wappushfw/group" mrp="mw/messagingmw/messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
-</component>
-<component name="suplsmshandler" long-name="SUPL SMS Handler" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplsmshandler/group" mrp="mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/>
-</component>
-<component name="suplwappushhandler" long-name="SUPL WAP Push Handler" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
-</component>
-</collection>
-<collection name="messagingmw_info" long-name="Messaging Middleware Info" level="api">
-<component name="messagingmw_metadata" long-name="Messaging Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="imsrv" level="specific" long-name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
-<collection name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" level="specific">
-<component name="ximp_core_data_model_api" long-name="XIMP Core Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_host_api" long-name="XIMP Presence Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_presence_data_model_api" long-name="XIMP Presence Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_api" long-name="XIMP Presence Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_presence_management_api" long-name="XIMP Presence Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_management_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_host_api" long-name="XIMP Core Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_core_management_api" long-name="XIMP Core Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_management_api/group"/>
-</component>
-<component name="ximp_presence_base_api" long-name="XIMP Presence Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_base_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_api" long-name="XIMP Core Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_core_base_api" long-name="XIMP Core Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_base_api/group"/>
-</component>
-<component name="ximp_presence_cache_api" long-name="XIMP Presence Cache API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_cache_api/group"/>
-</component>
-<component name="ximp_core_feature_plugin_api" long-name="XIMP Core Feature Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_host_api" long-name="XIMP IM Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_im_data_model_api" long-name="XIMP IM Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_data_model_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_api" long-name="XIMP IM Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_im_management_api" long-name="XIMP IM Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_management_api/group"/>
-</component>
-<component name="ximp_im_base_api" long-name="XIMP IM Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_base_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_host_api" long-name="XIMP Search Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_search_data_model_api" long-name="XIMP Search Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_data_model_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_api" long-name="XIMP search Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_search_management_api" long-name="XIMP Search Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_management_api/group"/>
-</component>
-<component name="ximp_search_base_api" long-name="XIMP Search Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_base_api/group"/>
-</component>
-<component name="xmpp_settings_api" long-name="XMPP Settings API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/group"/>
-</component>
-<component name="im_cache_client_api" long-name="IM Cache Client API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/im_cache_client_api/group"/>
-</component>
-<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 Avability Text" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
-</component>
-</collection>
-<collection name="ximpfw" long-name="XIMP Framework" level="framework">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="ximpfw_build" filter="s60" long-name="XIMP Framework Build">
-<unit bldFile="mw/imsrv/ximpfw/group"/>
-</component>
-</collection>
-<collection name="imservices" long-name="IM Services" level="generic">
-<component name="imfeatureplugin" filter="s60" long-name="IM Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/imfeatureplugin/group"/>
-</component>
-<component name="searchfeatureplugin" filter="s60" long-name="Search Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/searchfeatureplugin/group"/>
-</component>
-<component name="xmppsettingsapi" filter="s60" long-name="XMPP Settings API" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsapi/group"/>
-</component>
-<component name="xmppsettingsfetcher" filter="s60" long-name="XMPP Settings Fetcher" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/group"/>
-</component>
-<component name="instantmessagingcache" filter="s60" long-name="Instant Messaging Cache" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/instantmessagingcache/group"/>
-</component>
-</collection>
-<collection name="brandingserver" long-name="Branding Server" level="specific">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="brandingserver_build" filter="s60" long-name="Branding Server Build">
-<unit bldFile="mw/imsrv/brandingserver/group"/>
-</component>
-</collection>
-</block>
-<block name="legacypresence" level="specific" long-name="Legacy Presence Services" levels="engine fw ui">
-<collection name="pressrv_plat" long-name="Legacy Presence Services Platform Interfaces" level="ui">
-<component name="presence_list_api" long-name="Presence List API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/presence_list_api/group"/>
-</component>
-<component name="watcher_info_api" long-name="Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_info_api/group"/>
-</component>
-<component name="simple_documents_api" long-name="SIMPLE Documents API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_documents_api/group"/>
-</component>
-<component name="authorization_api" long-name="Authorization API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/authorization_api/group"/>
-</component>
-<component name="xdm_protocol_plugin_api" long-name="XDM Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_protocol_plugin_api/group"/>
-</component>
-<component name="watcher_api" long-name="Watcher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_api/group"/>
-</component>
-<component name="xdm_api" long-name="XDM API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_api/group"/>
-</component>
-<component name="registration_api" long-name="Registration API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/registration_api/group"/>
-</component>
-<component name="publisher_api" long-name="Publisher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/publisher_api/group"/>
-</component>
-<component name="messaging_connection_manager_api" long-name="Messaging Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/messaging_connection_manager_api/group"/>
-</component>
-<component name="xdm_settings_api" long-name="XDM Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_settings_api/group"/>
-</component>
-<component name="simple_settings_api" long-name="SIMPLE Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_settings_api/group"/>
-</component>
-<component name="simple_instant_msg_api" long-name="Simple Instant Msg API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_instant_msg_api/group"/>
-</component>
-</collection>
-<collection name="xdmengine" long-name="XDM Engine" level="engine">
-<!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
-<component name="xdmengine_build" filter="s60" long-name="XDM Engine Build">
-<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">
-<unit bldFile="mw/legacypresence/xdmprotocols/group"/>
-</component>
-</collection>
-<collection name="msgconnmanager" long-name="Messaging Connection Manager" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="msgconnmanager_build" filter="s60" long-name="Messaging Connection Manager Build">
-<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">
-<unit bldFile="mw/legacypresence/simpleengine/group"/>
-</component>
-</collection>
-<collection name="presencefwsimpleadpt" long-name="Presence Framework SIMPLE Adaptation" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="simpleplugin" filter="s60" long-name="SIMPLE Plugin" plugin="Y">
-<unit bldFile="mw/legacypresence/presencefwsimpleadpt/group"/>
-</component>
-</collection>
-<collection name="simpledatamodeladapter" long-name="SIMPLE Data Model Adapter" level="fw">
-<component name="presenceplugin" filter="s60" long-name="Presence Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/legacypresence/simpledatamodeladapter/group"/>
-</component>
-</collection>
-</block>
-<block name="opensrv" level="specific" long-name="Open Services" levels="prt lib server eng">
-<collection name="opensrv_plat" long-name="Open Services Platform Interfaces" level="eng">
-<component name="messagequeue_api" long-name="Message Queue API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/opensrv/opensrv_plat/messagequeue_api/group"/>
-</component>
-</collection>
-<collection name="loudmouth" long-name="Loudmouth" level="prt">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="loudmouth_build" filter="s60" long-name="Loudmouth Build" introduced="^2">
-<unit bldFile="mw/opensrv/loudmouth/group"/>
-</component>
-</collection>
-<collection name="libtelepathy" long-name="Telepathy Library" level="lib">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="libtelepathy_build" filter="s60" long-name="Telepathy Library Build" introduced="^2">
-<unit bldFile="mw/opensrv/libtelepathy/group"/>
-</component>
-</collection>
-<collection name="telepathygabble" long-name="Telepathy Gabble" level="eng">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="telepathygabble_build" filter="s60" long-name="Telepathy Gabble Build" introduced="^2">
-<unit bldFile="mw/opensrv/telepathygabble/group"/>
-</component>
-</collection>
-<collection name="isolationserver" long-name="Isolation Server" level="server">
-<component name="messagequeue" filter="s60" long-name="Message Queue" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/messagequeue/group"/>
-</component>
-<component name="isoserver" filter="s60" long-name="ISO Server" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/isoserver/group"/>
-</component>
-<component name="isolationserver_build" filter="s60" long-name="Isloation Server Build" introduced="^2">
-<!-- needs #includes removed. either move the exports to another component or make this a ROM component -->
-<unit bldFile="mw/opensrv/isolationserver/group"/>
-</component>
-</collection>
-</block>
-<block name="searchsrv" level="specific" long-name="Search Services" levels="services engine generic api">
-<collection name="searchsrv_plat" long-name="Search Services Platform Interfaces" level="api">
-<component name="cpix_utility_api" long-name="CPIX Utility API" filter="s60" class="api">
-<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_utility_api/group"/>
-</component>
-<component name="cpix_framework_api" long-name="CPIX Framework API" filter="s60" class="api">
-<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_framework_api/group"/>
-</component>
-<component name="cpix_search_api" long-name="CPIX Search API" filter="s60" class="api">
-<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_search_api/group"/>
-</component>
-</collection>
-<collection name="searchengine" long-name="Search Engine" level="engine">
-<component name="searchengine_util" long-name="Search Engine Utils" filter="s60">
-<unit bldFile="mw/searchsrv/searchengine/util/group"/>
-</component>
-<component name="searchengine_oss" long-name="Search Engine OSS" filter="s60">
-<unit bldFile="mw/searchsrv/searchengine/oss/group"/>
-</component>
-<component name="cpix" long-name="Cross Platform Indexing Engine" filter="s60">
-<unit bldFile="mw/searchsrv/searchengine/cpix/group"/>
-</component>
-</collection>
-<collection name="searcher" long-name="Searcher" level="generic">
-<component name="searchclient" long-name="Search Client" filter="s60">
-<unit bldFile="mw/searchsrv/searcher/SearchClient/group"/>
-</component>
-<component name="searchserver" long-name="Search Server" filter="s60">
-<unit bldFile="mw/searchsrv/searcher/SearchServer/group"/>
-</component>
-<component name="searcher_test" long-name="Searcher Tests" filter="s60" purpose="development">
-<!-- #include from common bld.inf or split into two components -->
-<unit bldFile="mw/searchsrv/searcher/tsrc/RobustnessTest/group"/>
-<unit bldFile="mw/searchsrv/searcher/tsrc/LogPlayer/group"/>
-</component>
-</collection>
-<collection name="searchsrv_harvester" long-name="Search Services Harvester" level="services">
-<component name="searchsrv_pluginfw" long-name="Search Server" filter="s60">
-<unit bldFile="mw/searchsrv/harvester/pluginfw/group"/>
-</component>
-<component name="searchsrv_harvesterserver" long-name="Search Harvester Server" filter="s60">
-<unit bldFile="mw/searchsrv/harvester/HarvesterServer/group"/>
-</component>
-</collection>
-<collection name="searchsrv_watchdog" long-name="Search Services Watch Dog" level="services">
-<component name="searchsrv_watchdog_build" long-name="Search Services Watch Dog Build" filter="s60">
-<unit bldFile="mw/searchsrv/WatchDog/group"/>
-</component>
-</collection>
-<collection name="qcpix" long-name="Qt CPIX" level="engine">
-<component name="qcpix_build" long-name="Qt CPIX Build">
-<unit bldFile="mw/searchsrv/qcpix" proFile="qcpix.pro"/>
-</component>
-</collection>
-<collection name="searchsrv_info" long-name="Search Services Info">
-<component name="searchsrv_build" long-name="Search Services Build">
-<!-- move exports to own component and remove this -->
-<unit bldFile="mw/searchsrv/group"/>
-</component>
-</collection>
-</block>
-<block name="remotemgmt" level="specific" long-name="Remote Management" levels="plugin framework server generic specific">
-<collection name="remotemgmt_pub" long-name="Remote Management Public Interfaces" level="specific">
-<component name="synchronization_capability_api" long-name="Synchronization Capability API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
-</component>
-</collection>
-<collection name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" level="specific">
-<component name="common_agent_util_and_definitions_api" long-name="Common Agent util and definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
-</component>
-<component name="policy_management_certificate_api" long-name="Policy Management Certificate API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/group"/>
-</component>
-<component name="oma_provisioning_adapter_api" long-name="OMA Provisioning Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_adapter_api/group"/>
-</component>
-<component name="device_management_parameter_api" long-name="Device Management Parameter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_parameter_api/group"/>
-</component>
-<component name="data_synchronization_plugin_api" long-name="Data Synchronization Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/group"/>
-</component>
-<component name="sync_alert_handler_api" long-name="Sync Alert Handler API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
-</component>
-<component name="syncml_notifier_api" long-name="SyncML Notifier API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
-</component>
-<component name="syncml_client_api" long-name="SyncML Client API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
-</component>
-<component name="device_management_plugin_api" long-name="Device Management plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_plugin_api/group"/>
-</component>
-<component name="dm_tree_apis" long-name="DM Tree APIs" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
-</component>
-<component name="terminal_security_device_lock_api" long-name="Terminal Security Device Lock API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/group"/>
-</component>
-<component name="policy_management_request_api" long-name="Policy Management Request API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/group"/>
-</component>
-<component name="ds_constant_definitions_api" long-name="DS Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_constant_definitions_api/group"/>
-</component>
-<component name="scp_server_api" long-name="SCP Server API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/group"/>
-</component>
-<component name="data_synchronization_notification_api" long-name="Data Synchronization Notification API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_notification_api/group"/>
-</component>
-<component name="oma_provisioning_engine_api" long-name="OMA Provisioning Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/group"/>
-</component>
-<component name="dm_utils_api" long-name="DM Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/group"/>
-</component>
-<component name="syncml_alert_api" long-name="SyncML Alert API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/group"/>
-</component>
-<component name="obex_client_session_api" long-name="OBEX Client session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/obex_client_session_api/group"/>
-</component>
-<component name="setting_enforcement_info_api" long-name="Setting Enforcement Info API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/group"/>
-</component>
-<component name="dm_constant_definitions_api" long-name="DM Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
-</component>
-<component name="oma_ds_extensions_api" long-name="OMA DS Extensions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
-</component>
-<component name="pnpms_utils_api" long-name="PNPMS Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
-</component>
-<component name="diagnostics_plugin_utility_api" long-name="Diagnostics Plugin Utility API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
-</component>
-<component name="diagnostics_plugin_api" long-name="Diagnostics Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
-</component>
-<component name="diagnostics_framework_api" long-name="Diagnostics Framework API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
-</component>
-<component name="diagnostics_results_api" long-name="Diagnostics Results API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
-</component>
-<component name="diagnostics_plugin_pool_api" long-name="Diagnostics Plugin Pool API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
-</component>
-<component name="adaptive_history_list_api" long-name="Adaptive History List API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
-</component>
-<component name="adaptive_history_list_session_api" long-name="Adaptive History List Session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
-</component>
-<component name="fota_engine_api" long-name="FOTA Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
-</component>
-<component name="update_package_storage_plugin_api" long-name="Update Package Storage Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
-</component>
-<component name="syncml_notifier_roaming_api" long-name="SyncML Notifier Roaming API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
-</component>
-<component name="sync_service_api" long-name="Sync Service API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_service_api/group"/>
-</component>
-<component name="dcmo_adapter_api" long-name="DCMO Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_adapter_api/group"/>
-</component>
-<component name="dcmo_control_api" long-name="DCMO Control API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_control_api/group"/>
-</component>
-<component name="ds_capability_mgmt_plugin_api" long-name="DS Capability Management Plugin API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
-</component>
-<component name="dm_native_notifier_api" long-name="DM Native Notifier API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_native_notifier_api/group"/>
-</component>
-</collection>
-<collection name="policymanagement" long-name="Policy Management" level="generic">
-<component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">
-<unit bldFile="mw/remotemgmt/policymanagement/pmdmadapter/group"/>
-</component>
-<component name="dmutilserver" filter="s60" long-name="DM Util Server">
-<unit bldFile="mw/remotemgmt/policymanagement/dmutilserver/group"/>
-</component>
-<component name="policyengine" filter="s60" long-name="Policy Engine">
-<unit bldFile="mw/remotemgmt/policymanagement/policyengine/group" filter="!dfs_build"/>
-</component>
-<component name="policymanagement_build" filter="s60" long-name="Policy Management Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/policymanagement/group"/>
-</component>
-</collection>
-<collection name="syncmlfw" long-name="SyncML Framework" level="server">
-<component name="syncmlfw_build" filter="s60" long-name="SyncML Framework Build">
-<!-- need to break this up into components. Too convoluted a structure to be in a single bld.inf-->
-<unit bldFile="mw/remotemgmt/syncmlfw/group"/>
-</component>
-</collection>
-<collection name="terminalsecurity" long-name="Terminal Security" level="specific">
-<component name="scp" filter="s60" long-name="Security Code Proxy">
-<!-- can only have one unit, need to have these #included from a single bld.inf -->
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpdatabase/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpserver/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scppatternplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scphistoryplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scptimestampplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpeventhandler/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/dmeventnotifier/group"/>
-</component>
-<component name="terminalsecurity_client" filter="s60" long-name="Terminal Control Client">
-<unit bldFile="mw/remotemgmt/terminalsecurity/client/group"/>
-</component>
-<component name="terminalsecurity_server" filter="s60" long-name="Terminal Control Server">
-<unit bldFile="mw/remotemgmt/terminalsecurity/server/group"/>
-</component>
-<component name="tcadapter" filter="s60" long-name="Terminal Control Adapter">
-<unit bldFile="mw/remotemgmt/terminalsecurity/tcadapter/bld"/>
-</component>
-<component name="terminalsecurity_build" filter="s60" long-name="Terminal Security Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/terminalsecurity/group"/>
-</component>
-</collection>
-<collection name="omaprovisioning" long-name="OMA Provisioning" level="specific">
-<component name="pnputil" filter="s60" long-name="PnP Util">
-<unit bldFile="mw/remotemgmt/omaprovisioning/pnputil/group"/>
-</component>
-<component name="provisioning" filter="s60" long-name="Provisioning">
-<unit bldFile="mw/remotemgmt/omaprovisioning/provisioning/group"/>
-</component>
-</collection>
-<collection name="devicediagnosticsfw" long-name="Device Diagnostics Framework" level="framework">
-<component name="diagframework" filter="s60" long-name="Diagnostics Framework">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
-</component>
-<component name="diagpluginbase" filter="s60" long-name="Diagnostics Plugin Base">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
-</component>
-<component name="diagresultsdb" filter="s60" long-name="Diagnostics Results Database">
-<!-- can only have one unit, merge or split into two components -->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
-</component>
-<component name="devicediagnosticsfw_build" filter="s60" long-name="Device Diagnostics Framework Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/group"/>
-</component>
-</collection>
-<collection name="dcmofw" long-name="Device Capability Management Object Framework" level="framework">
-<component name="dcmoclient" filter="s60" long-name="DCMO Client">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoclient/group"/>
-</component>
-<component name="dcmoserver" filter="s60" long-name="DCMO Server">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoserver/group"/>
-</component>
-<component name="dcmocustcmd" filter="s60" long-name="DCMO Custom Commands">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmocustcmd/group"/>
-</component>
-<component name="dcmofw_build" filter="s60" long-name="DCMO Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/dcmofw/group"/>
-</component>
-</collection>
-<collection name="fotaapplication" long-name="FOTA Application" level="generic">
-<component name="fotaapplication_build" filter="s60" long-name="FOTA Application Build">
-<!-- remove this component when configuration is in place and the #ifdefs have been worked out -->
-<unit bldFile="mw/remotemgmt/fotaapplication/group"/>
-</component>
-<component name="fotaserver" filter="s60" long-name="FOTA Server">
-<!-- uncomment when #ifdefs are resolved -->
-<!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
-</component>
-<component name="fotacustcmds" filter="s60" long-name="FOTA Custom Commands" class="placeholder">
-<!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
-<!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
-</component>
-</collection>
-</block>
-<block name="remoteconn" level="generic" long-name="Remote Connectivity" levels="plugin framework server generic specific">
-<collection name="remoteconn_info" long-name="Remote Connectivity Info" level="specific">
-<component name="remoteconn_metadata" long-name="Remote Connectivity Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mtptransports" long-name="MTP Transports" level="plugin">
-<component name="mtpusbtransport" long-name="MTP USB Transport" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpusbtransport/group" mrp="mw/remoteconn/mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
-</component>
-<component name="mtpptpiptransport" long-name="MTP PTP-IP Transport" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpptpiptransport/group" mrp="mw/remoteconn/mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
-</component>
-<component name="mtpcontroller" long-name="MTP Controller" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpcontroller/group" mrp="mw/remoteconn/mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
-</component>
-</collection>
-<collection name="mtpfws" long-name="MTP Frameworks" level="framework">
-<component name="mtpfw" long-name="MTP Framework" introduced="^2" purpose="optional">
-<unit bldFile="mw/remoteconn/mtpfws/mtpfw/group" mrp="mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/>
-</component>
-</collection>
-<collection name="mtpdataproviders" long-name="MTP Data Providers" level="generic">
-<component name="mtpfileandfolderdp" long-name="MTP File and Folder Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group" mrp="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
-</component>
-<component name="mtpimagedp" long-name="MTP Image Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpimagedp/group" mrp="mw/remoteconn/mtpdataproviders/mtpimagedp/group/mtp_imagedp.mrp"/>
-</component>
-<component name="mtppictbridgedp" long-name="MTP PictBridge Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group" mrp="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group/mtp_pictbridgedp.mrp"/>
-</component>
-</collection>
-<collection name="backupandrestore" long-name="Backup and Restore" level="specific">
-<component name="backupengine" long-name="Backup Engine" introduced="9.0" purpose="optional">
-<unit bldFile="mw/remoteconn/backupandrestore/backupengine/group" mrp="mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
-</component>
-<component name="backuptest" long-name="Backup Test" introduced="^2" purpose="development">
-<unit bldFile="mw/remoteconn/backupandrestore/backuptest/group" mrp="mw/remoteconn/backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
-</component>
-</collection>
-<collection name="obex" long-name="OBEX" level="generic">
-<component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexprotocol/group" mrp="mw/remoteconn/obex/obexprotocol/group/obex.mrp"/>
-</component>
-<component name="obexextensionapi" long-name="OBEX Extension API" introduced="9.2" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexextensionapi/group" mrp="mw/remoteconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
-</component>
-</collection>
-</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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<unit mrp="mw/srvdiscovery/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="dlnasrv" level="specific" long-name="DLNA Services" levels="stack server ctrl framework plugin">
-<!-- uncomment all the units when configuration is in place, they're currently #included from other xxx_build components -->
-<collection name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" level="plugin">
-<component name="upnp_media_server_settings_api" long-name="UPnP Media Server Settings API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_settings_api/group"/>
-</component>
-<component name="upnp_av_objects_api" long-name="UPnP A/V Objects API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_av_objects_api/group"/>
-</component>
-<component name="upnp_media_server_api" long-name="UPnP Media Server API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_api/group"/>
-</component>
-<component name="upnp_security_plugin_api" long-name="UPnP Security Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_security_plugin_api/group"/>
-</component>
-<component name="upnp_avcp_api" long-name="UPnP AVCP API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_avcp_api/group"/>
-</component>
-<component name="upnp_media_server_metadata_api" long-name="UPnP Media Server Metadata API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_metadata_api/group"/>
-</component>
-<component name="upnp_command_api" long-name="UPnP Command API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_command_api/group"/>
-</component>
-<component name="upnp_plugin_api" long-name="UPnP Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_plugin_api/group"/>
-</component>
-</collection>
-<collection name="upnpavcontrolpoint" long-name="UPnP A/V Control Point" level="plugin">
-<component name="avcontrolframework" filter="s60" long-name="A/V Control Famework" introduced="9.1" deprecated="^3">
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
-</component>
-<component name="upnpavcontrolpoint_build" filter="s60" long-name="UPnP A/V Control Point Build" introduced="9.1" deprecated="^3">
-<!-- put exports in other component instead -->
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/group"/>
-</component>
-</collection>
-<collection name="upnpmediaserver" long-name="UPnP Media Server" level="server">
-<component name="avobjects" filter="s60" long-name="A/V Objects">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/avobjects/group"/>
-</component>
-<component name="mediaserverclient" filter="s60" long-name="Media Server Client">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverclient/group"/>
-</component>
-<component name="connectionmanagerservice" filter="s60" long-name="Connection Manager Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/connectionmanagerservice/group"/>
-</component>
-<component name="contentdirectoryservice" filter="s60" long-name="Content Directory Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/contentdirectoryservice/group"/>
-</component>
-<component name="mediaserverengine" filter="s60" long-name="Media Server Engine">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverengine/group"/>
-</component>
-<component name="upnpmediaserver_build" filter="s60" long-name="UPnP Media Server Build">
-<!-- move exports into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpmediaserver/group"/>
-</component>
-</collection>
-<collection name="upnpavcontroller" long-name="UPnP A/V Controller" level="ctrl">
-<component name="upnpxmlparser" filter="s60" long-name="UPnP XML Parser" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpxmlparser/group"/>
-</component>
-<component name="upnpavcontrollerserver" filter="s60" long-name="UPnP A/V Controller Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerserver/group"/>
-</component>
-<component name="upnpavcontrollerclient" filter="s60" long-name="UPnP A/V Ccontroller Client" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerclient/group"/>
-</component>
-<component name="upnpavcontrollerhelper" filter="s60" long-name="UPnP A/V Controller Helper" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerhelper/group"/>
-</component>
-<component name="upnpavcontroller_build" filter="s60" long-name="UPnP A/V Controller Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpavcontroller/group"/>
-</component>
-</collection>
-<collection name="upnpframework" long-name="UPnP Framework" level="framework">
-<component name="upnputilities" filter="s60" long-name="UPnP Utilities" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnputilities/group"/>
-</component>
-<component name="upnpextensionpluginif" filter="s60" long-name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpextensionpluginif/group"/> -->
-</component>
-<component name="upnpfiletransferengine" filter="s60" long-name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>-->
-</component>
-<component name="upnpcommonui" filter="s60" long-name="UPnP Common UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpcommonui/group"/>-->
-</component>
-<component name="upnpaiwengine" filter="s60" long-name="UPnP AIW Engine" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpaiwengine/group"/> -->
-</component>
-<component name="upnpaiwprovider" filter="s60" long-name="UPnP AIW Provider" introduced="^2" deprecated="^3" plugin="Y">
-<!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
-</component>
-<component name="upnpmusicadapter" filter="s60" long-name="UPnP Music Adapter" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
-</component>
-<component name="upnpcommand" filter="s60" long-name="UPnP Command" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpcommand/group"/>
-</component>
-<component name="upnpframework_build" filter="s60" long-name="UPnP Framework Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpframework/group"/>
-</component>
-</collection>
-<collection name="upnpsettings" long-name="UPnP Settings" level="framework">
-<component name="upnpsettingsengine" filter="s60" long-name="UPnP Settings Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
-</component>
-<component name="multiselectionui" filter="s60" long-name="Multi-Selection UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/multiselectionui/group"/>-->
-</component>
-<component name="appwizard" filter="s60" long-name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/appwizard/group"/>-->
-</component>
-<component name="upnpsharingui" filter="s60" long-name="UPnP Sharing UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
-</component>
-<component name="upnpgsplugin" filter="s60" long-name="UPnP GS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
-</component>
-<component name="upnpsettings_build" filter="s60" long-name="UPnP Settings Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsettings/group"/>
-</component>
-</collection>
-<collection name="upnpsharing" long-name="UPnP Sharing" level="server">
-<component name="upnpdlnaprofiler" filter="s60" long-name="UPnP DLNA Profiler" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpdlnaprofiler/group"/>
-</component>
-<component name="upnpsecurity" filter="s60" long-name="UPnP Security" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpsecurity/group"/>
-</component>
-<component name="upnpcontentserver" filter="s60" long-name="UPnP Content Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpcontentserver/group"/>
-</component>
-<component name="applicationengine" filter="s60" long-name="UPnP Application Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/applicationengine/group"/>
-</component>
-<component name="upnpsharing_build" filter="s60" long-name="UPnP Sharing Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsharing/group"/>
-</component>
-</collection>
-<collection name="upnpmpxplugins" long-name="UPnP MPX Plugins" level="plugin">
-<component name="upnpplaybackplugins" filter="s60" long-name="UPnP Playback Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/upnpplaybackplugins/group"/>
-</component>
-<component name="upnpmpxplugins_build" filter="s60" long-name="UPnP MPX Plugins Build" introduced="^2">
-<!-- move exports content into other component? -->
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/group"/>
-</component>
-</collection>
-<collection name="upnpharvester" long-name="UPnP Harvester" level="ctrl">
-<component name="upnpharvester_common" filter="s60" long-name="UPnP Harvester Common" introduced="^2" deprecated="^3" class="placeholder">
-<!-- need to merge or #include these to a single bld.inf -->
-<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
- <unit bldFile="upnpharvester/common/cmsettings/group"/>
- <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
- <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
-</component>
-<component name="cdssync" filter="s60" long-name="CDS Sync" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
-</component>
-<component name="mdhserver" filter="s60" long-name="Metadata Harvester Server" introduced="^2" deprecated="^3" class="placeholder">
-<!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
-</component>
-<component name="upnpharvester_build" filter="s60" long-name="UPnP Harvester Build" introduced="^2" deprecated="^3" class="placeholder">
-<!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
-<!--<unit bldFile="upnpharvester/group"/>-->
-</component>
-</collection>
-<collection name="homesync" long-name="Home Sync" level="plugin">
-<component name="contentmanager" filter="s60" long-name="Content Manager" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homesync/group"/>-->
-<!-- move bld.inf into contentmanager dir -->
-</component>
-</collection>
-<collection name="homemedia" long-name="Home Media" level="framework">
-<!-- collection is really just a component. Move down a directory -->
-<component name="homemedia_build" filter="s60" long-name="Home Media" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homemedia/group"/> -->
-</component>
-</collection>
-<collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin">
-<component name="dlnasrv_build" filter="s60" long-name="DLNA Services Build">
-<!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed -->
-<unit bldFile="mw/dlnasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="btservices" level="generic" long-name="Bluetooth Services" levels="framework server generic specific plugin">
-<collection name="btservices_pub" long-name="BT Services Public Interfaces" level="plugin">
-<component name="bluetooth_power_state_api" long-name="Bluetooth Power State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_power_state_api/group"/>
-</component>
-<component name="bluetooth_notifier_api" long-name="Bluetooth Notifier API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_notifier_api/group"/>
-</component>
-</collection>
-<collection name="btservices_plat" long-name="BT Services Platform Interfaces" level="plugin">
-<component name="bluetooth_dosserver_audio_api" long-name="Bluetooth DOS Server Audio API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dosserver_audio_api/group"/>
-</component>
-<component name="bluetooth_dut_mode_api" long-name="Bluetooth DUT Mode API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dut_mode_api/group"/>
-</component>
-<component name="bluetooth_engine_api" long-name="Bluetooth Engine API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-<component name="bluetooth_local_variation_api" long-name="Bluetooth Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_local_variation_api/group"/>
-</component>
-<component name="bluetooth_notifier_internal_api" long-name="Bluetooth Notifier internal API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_notifier_internal_api/group"/>
-</component>
-<component name="bluetooth_sap_connection_state_api" long-name="Bluetooth SAP Connection State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_sap_connection_state_api/group"/>
-</component>
-<component name="bluetooth_secondary_display_notification_api" long-name="Bluetooth Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_secondary_display_notification_api/group"/>
-</component>
-</collection>
-<collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
-<component name="bteng" filter="s60" long-name="Bluetooth Engine">
-<unit bldFile="mw/btservices/bluetoothengine/bteng/group"/>
-</component>
-<component name="btnotif" filter="s60" long-name="Bluetooth Notifier">
-<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"/>
-</component>
-<component name="btmac" filter="s60" long-name="Bluetooth Mono Audio Controller" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btmac/group"/>
-</component>
-<component name="btsac" filter="s60" long-name="Bluetooth Stereo Audio Controller" plugin="Y">
-<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"/>
-</component>
-<component name="btsap" filter="s60" long-name="Bluetooth SIM Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btsap/group"/>
-</component>
-<component name="btui" filter="s60" long-name="Bluetooth UI">
-<unit bldFile="mw/btservices/bluetoothengine/btui/group"/>
-</component>
-<component name="btpbap" filter="s60" long-name="Bluetooth Phonebook Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btpbap/group"/>
-</component>
-<component name="bthid" filter="s60" long-name="Bluetooth HID">
-<unit bldFile="mw/btservices/bluetoothengine/bthid/group"/>
-</component>
-<component name="btctrldcmoadapter" filter="s60" long-name="Bluetooth Control DCMO Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btctrldcmoadapter/group"/>
-</component>
-</collection>
-<collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
-<component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
-<unit bldFile="mw/btservices/bluetoothappprofiles/avrcp" mrp="mw/btservices/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
-</component>
-</collection>
-<collection name="atcommands" long-name="AT Commands" level="generic">
-<component name="modematplugin" long-name="Modem AT Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/modematplugin/group"/>
-</component>
-<component name="lccustomplugin" long-name="LC Custom Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/lccustomplugin/group"/>
-</component>
-</collection>
-<collection name="btservices_info" long-name="BT Services Info" level="plugin">
-<component name="btservices_metadata" long-name="BT Services Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usbservices" level="generic" long-name="USB Services" levels="framework server generic specific plugin">
-<collection name="usbservices_plat" long-name="USB Services Platform Interfaces" level="plugin">
-<component name="pictbridge_api" long-name="PictBridge API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/pictbridge_api/group"/>
-</component>
-<component name="ptp_responder_api" long-name="PTP Responder API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_responder_api/group"/>
-</component>
-<component name="ptp_transport_api" long-name="PTP Transport API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_transport_api/group"/>
-</component>
-<component name="usb_device_control_plugin_api" long-name="USB Device Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_device_control_plugin_api/group"/>
-</component>
-<component name="usb_notifier_api" long-name="USB Notifier API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_notifier_api/group"/>
-</component>
-<component name="usb_personality_api_header" long-name="USB Personality API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_api_header/group"/>
-</component>
-<component name="usb_personality_plugin_api" long-name="USB Personality Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_plugin_api/group"/>
-</component>
-<component name="usb_secondary_display_api" long-name="USB Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_secondary_display_api/group"/>
-</component>
-<component name="usb_watcher_api" long-name="USB Watcher API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_api/group"/>
-</component>
-<component name="usb_watcher_info_api_header" long-name="USB Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_info_api_header/group"/>
-</component>
-</collection>
-<collection name="usbengines" long-name="USB Engines" level="generic">
-<component name="usbotgwatcher" filter="s60" long-name="USB OTG Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbotgwatcher/group"/>
-</component>
-<component name="usbwatcher" filter="s60" long-name="USB Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbwatcher/group"/>
-</component>
-<component name="usblocodplugin" filter="s60" long-name="USB Local Connectivity Domain Plugin" plugin="Y">
-<unit bldFile="mw/usbservices/usbengines/usblocodplugin/group"/>
-</component>
-<component name="usbdevcon" filter="s60" long-name="USB Device Control">
-<unit bldFile="mw/usbservices/usbengines/usbdevcon/group"/>
-</component>
-<component name="usbremotepersonality" filter="s60" long-name="USB Remote Personality">
-<unit bldFile="mw/usbservices/usbengines/usbremotepersonality/group"/>
-</component>
-</collection>
-<collection name="usbclasses" long-name="USB Classes" level="framework">
-<component name="usbobexclasscontroller" filter="s60" long-name="USB OBEX Class Controller" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbobexclasscontroller/group"/>
-</component>
-<component name="usbbasicpersonality" filter="s60" long-name="USB Basic Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbbasicpersonality/group"/>
-</component>
-<component name="usbmscpersonality" filter="s60" long-name="USB MSC Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbmscpersonality/group"/>
-</component>
-<!-- commented out in bld.inf. Should this be deleted?
- <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
- <unit bldFile="usbclasses/ptpstack/group"/>
- </component>
- <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
- <unit bldFile="usbclasses/sicdusbplugin/group"/>
- </component>
- <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
- <unit bldFile="usbclasses/ptpserver/group"/>
- </component>-->
-<component name="pictbridgeengine" filter="s60" long-name="PictBridge Engine">
-<unit bldFile="mw/usbservices/usbclasses/pictbridgeengine/group"/>
-</component>
-<component name="usbphoneasmodem" filter="s60" long-name="USB Phone as Modem" introduced="^3">
-<unit bldFile="mw/usbservices/usbclasses/usbphoneasmodem/group"/>
-</component>
-</collection>
-<collection name="usbuis" long-name="USB UIs" level="specific">
-<component name="usbui" filter="s60" long-name="USB UI">
-<unit bldFile="mw/usbservices/usbuis/usbui/group"/>
-</component>
-<component name="usbuinotif" filter="s60" long-name="USB UI Notifiers">
-<unit bldFile="mw/usbservices/usbuis/usbuinotif/group"/>
-</component>
-<component name="imageprintuiprovider" filter="s60" long-name="ImagePrint UI Provider" plugin="Y">
-<unit bldFile="mw/usbservices/usbuis/imageprintuiprovider/group"/>
-</component>
-<component name="usbimageprintui" filter="s60" long-name="ImagePrint UI">
-<unit bldFile="mw/usbservices/usbuis/imageprintui/group"/>
-</component>
-<component name="usbuiqt" long-name="USB UI Qt" introduced="^4" filter="s60">
-<unit bldFile="mw/usbservices/usbuis/usbuiqt" proFile="usbapplication.pro"/>
-</component>
-</collection>
-<collection name="usbservices_test" long-name="USB Services Test" level="server"/>
-</block>
-<block name="shortlinkconn" level="generic" long-name="Shortlink Connectivity" levels="framework server generic specific plugin">
-<!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
-<collection name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" level="plugin">
-<component name="obex_service_utils_api" long-name="OBEX Service Utils API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_utils_api/group"/>
-</component>
-<component name="obex_service_plugin_api" long-name="OBEX Service Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_plugin_api/group"/>
-</component>
-<component name="dialup_connection_status_api" long-name="Dial-up Connection Status API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dialup_connection_status_api/group"/>
-</component>
-<component name="dun_secondary_display_notification_api" long-name="DUN Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
-</component>
-<component name="obex_secondary_display_notification_api" long-name="OBEX Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
-</component>
-<component name="generic_hid_api" long-name="Generic HID API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/generic_hid_api/group"/>
-</component>
-<component name="locod_bearer_plugin_api" long-name="Locod Bearer Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/locod_bearer_plugin_api/group"/>
-</component>
-<component name="usb_obexservicemanager_client_api" long-name="USB OBEX Service Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_obexservicemanager_client_api/group"/>
-</component>
-</collection>
-<collection name="localconnectivityservice" long-name="Local Connectivity Service" level="server">
-<component name="locod" long-name="Local Connectivity Daemon">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/locod/group"/>
-</component>
-<component name="obexserviceman" long-name="OBEX Service Managar">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
-</component>
-<component name="obexsendservices" long-name="OBEX Send Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
-</component>
-<component name="obexreceiveservices" long-name="OBEX Receive Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
-</component>
-<component name="dun" long-name="Dial Up Networking">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/dun/group"/>
-</component>
-<component name="lcstylustap" long-name="LC Stylus Tap Plugins" plugin="Y">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/lcstylustap/group"/>
-</component>
-<component name="generichid" long-name="Generic HID">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/generichid/group"/>
-</component>
-<component name="headset" long-name="Headset">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/headset/group"/>
-</component>
-</collection>
-</block>
-<block name="imghandling" level="specific" long-name="Image Handling" levels="lib util if">
-<collection name="imagehandling_plat" long-name="Image Handling Platform Interfaces" level="if">
-<component name="image_handling_library_api" long-name="Image Handling Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
-</component>
-<component name="3gp_library_api" long-name="3GP Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
-</component>
-<component name="thumbnailmanager_api" long-name="Thumbnail Manager API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagehandlinglib" long-name="Image Handling Library" level="lib">
-<!-- collection is really a component, need to move down a directory -->
-<component name="ihl" filter="s60" long-name="IHL">
-<unit bldFile="mw/imghandling/imagehandlinglib/group"/>
-</component>
-</collection>
-<collection name="imagehandlingutilities" long-name="Image Handling Utilities" level="util">
-<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager">
-<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
-</component>
-<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager Qt" introduced="^4">
-<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt" filter="!test" proFile="thumbnailmanagerqt.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</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">
-<unit bldFile="mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
-</component>
-</collection>
-</block>
-<block name="mds" level="specific" long-name="Metadata Services" levels="mgr eng server int">
-<collection name="mds_plat" long-name="Metadata Services Platform Interfaces" level="int">
-<component name="context_engine_plugin_api" long-name="Context Engine Plugin API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/group" filter="!test"/>
-</component>
-<component name="harvester_framework_api" long-name="Harvester Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/harvester_framework_api/group" filter="!test"/>
-<!-- can only have one unit with the same filter, #include the following from the previous unit -->
-</component>
-<component name="location_manager_api" long-name="Location Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/location_manager_api/group" filter="!test"/>
-</component>
-<component name="metadata_engine_api" long-name="Metadata Engine API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/metadata_engine_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_collection_manager_api" long-name="Content Listing Framework Collection Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_extended_api" long-name="Content Listing Framework Extended API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_extended_api/group"/>
-</component>
-</collection>
-<collection name="mds_pub" long-name="Metadata Services Public Interfaces" level="int">
-<component name="content_listing_framework_api" long-name="Content Listing Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_pub/content_listing_framework_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="metadataengine" long-name="Metadata Engine" level="eng">
-<component name="metadataengine_common" filter="s60" long-name="Metadata Engine Common" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/common/group"/>
-</component>
-<component name="metadataengine_server" filter="s60" long-name="Metadata Engine Server" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/server/group"/>
-</component>
-<component name="metadataengine_client" filter="s60" long-name="Metadata Engine Client" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/client/group"/>
-</component>
-<component name="metadataengine_build" filter="s60" long-name="Metadata Engine Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/metadataengine/group"/>
-</component>
-</collection>
-<collection name="locationmanager" long-name="Location Manager" level="mgr">
-<component name="locationtrail" filter="s60" long-name="Location Trail" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/locationtrail/group"/>
-</component>
-<component name="locationmanager_server" filter="s60" long-name="Location Manager Server" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/server/group"/>
-</component>
-<component name="locationmanager_client" filter="s60" long-name="Location Manager Client" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/client/group"/>
-</component>
-<component name="locationmanager_build" filter="s60" long-name="Location Manager Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/locationmanager/group"/>
-</component>
-</collection>
-<collection name="contextengine" long-name="Context Engine" level="eng">
-<component name="contextengine_plugins" filter="s60" long-name="Context Engine Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/contextengine/plugins/group"/>
-</component>
-<component name="contextengine_build" filter="s60" long-name="Context Engine Build" introduced="^2">
-<!--make this collection a single component, or make this unit self-contained -->
-<unit bldFile="mw/mds/contextengine/group"/>
-</component>
-</collection>
-<collection name="harvester" long-name="Harvester" level="eng">
-<component name="blacklistclient" filter="s60" long-name="Blacklist Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistclient/group"/>
-</component>
-<component name="blacklistserver" filter="s60" long-name="Blacklist Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistserver/group"/>
-</component>
-<component name="harvester_common" filter="s60" long-name="Harvester Common" introduced="^2">
-<unit bldFile="mw/mds/harvester/common/group"/>
-</component>
-<component name="composerplugins" filter="s60" long-name="Composer Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/composerplugins/group"/>
-</component>
-<component name="harvesterplugins" filter="s60" long-name="Harvester Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/harvesterplugins/group"/>
-</component>
-<component name="monitorplugins" filter="s60" long-name="Monitor Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/monitorplugins/group"/>
-</component>
-<component name="harvester_server" filter="s60" long-name="Harvester Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/server/group"/>
-</component>
-<component name="harvester_client" filter="s60" long-name="Harvester Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/client/group"/>
-</component>
-<component name="harvester_build" filter="s60" long-name="Harvester Build" introduced="^2">
-<!-- split these exports into the other components -->
-<unit bldFile="mw/mds/harvester/group"/>
-</component>
-</collection>
-<collection name="watchdog" long-name="Watchdog" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="mdswatchdog" filter="s60" long-name="Metadata Watchdog" introduced="^2">
-<unit bldFile="mw/mds/watchdog/group"/>
-</component>
-</collection>
-<collection name="clfwrapper" long-name="Content Listing Framework Wrapper" level="int">
-<!-- collection is really a component. Move down a directory -->
-<component name="clfwrapper_build" filter="s60" long-name="CLF Wrapper Build" introduced="^2" class="placeholder">
-<!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
-<!--<unit bldFile="clfwrapper/group"/>-->
-</component>
-</collection>
-<collection name="mds_info" long-name="Metadata Services Info" level="int">
-<component name="mds_build" filter="s60" long-name="Metadata Services Build" introduced="^2">
-<!-- consider distributiing this into the rest of the components in the package -->
-<unit bldFile="mw/mds/group"/>
-</component>
-</collection>
-</block>
-<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"/>
-</component>
-<component name="videoconnutility_api" long-name="Video Connection Utility API" filter="s60" class="api">
-<unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/group"/>
-</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"/>
-</component>
-</collection>
-<collection name="videoscheduler" long-name="Video Scheduler" level="util">
-<component name="schedulerclient" filter="s60" long-name="Video Scheduler Client">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerclient/group"/>
-</component>
-<component name="schedulerserver" filter="s60" long-name="Video Scheduler Server">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerserver/group"/>
-</component>
-</collection>
-<collection name="videoconnutility" long-name="Video Connection Utility" level="util">
-<component name="connutilpsworker" filter="s60" long-name="Connection Utility Publish and Subscribe Worker">
-<unit bldFile="mw/videoutils/videoconnutility/connutilpsworker/group"/>
-</component>
-<component name="video_connutility" filter="s60" long-name="Video Connection Utility">
-<unit bldFile="mw/videoutils/videoconnutility/connutility/group"/>
-</component>
-</collection>
-<collection name="videoutils_info" long-name="Video Utils Info" level="if"/>
-</block>
-<block name="mmmw" level="generic" long-name="Multimedia Middleware" levels="plugin framework server generic specific">
-<collection name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" level="specific">
-<component name="multimedia_data_source_api" long-name="Multimedia Data Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
-</component>
-<component name="progressive_download_api" long-name="Progressive Download API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/progressive_download_api/group"/>
-</component>
-<component name="equalizer_ui_api" long-name="Equalizer UI API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
-</component>
-<component name="enhanced_media_client_api" long-name="Enhanced Media Client API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
-</component>
-<component name="stream_control_custom_command_api" long-name="Stream Control Custom Command API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
-</component>
-<component name="emc_buffer_source_api" long-name="EMC Buffer Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_buffer_source_api/group"/>
-</component>
-<component name="emc_file_source_api" long-name="EMC File Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
-</component>
-<component name="audio_metadata_reader_api" long-name="Audio MetaData Reader API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
-</component>
-<component name="emc_progressive_download_source_api" long-name="EMC Progressive Download Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
-</component>
-<component name="emc_volume_effect_api" long-name="EMC Volume Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
-</component>
-<component name="emc_balance_effect_api" long-name="EMC Balance Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_balance_effect_api/group"/>
-</component>
-<component name="emc_descriptor_source_api" long-name="EMC Descriptor Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_descriptor_source_api/group"/>
-</component>
-<component name="emc_drm_config_intfc_api" long-name="EMC DRM Config Intfc API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
-</component>
-<component name="voip_audio_services_api" long-name="VoIP Audio Services" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/group"/>
-</component>
-<component name="configuration_components_factory_api" long-name="Configuration Components Factory API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
-</component>
-<component name="audio_output_control_utility_api" long-name="Audio Output Control Utility API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/group"/>
-</component>
-<component name="audio_output_control_utility_proxy_api" long-name="Audio Output Control Utility Proxy API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
-</component>
-<component name="emc_audio_effects_api" long-name="EMC Audio Effects API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
-</component>
-<component name="call_audio_control_api" long-name="Call AudioControl API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/group"/>
-</component>
-<component name="radio_utilities_api" long-name="Radio Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/group"/>
-</component>
-<component name="radio_preset_utilities_api" long-name="Radio Preset Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
-</component>
-<component name="radio_monitor_api" long-name="Radio Monitor API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
-</component>
-<component name="thumbnail_engine_api" long-name="Thumbnail Engine API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/thumbnail_engine_api/group"/>
-</component>
-<component name="telephony_multimedia_service_api" long-name="Telephony Multimedia Service API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
-</component>
-<component name="openmax_al_api" long-name="OpenMAX AL API" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/openmax_al_api/group"/>
-</component>
-</collection>
-<collection name="mmfenh" long-name="MMF Enhancements" level="generic">
-<component name="advancedaudiocontroller" filter="s60" long-name="Advanced Audio Controllers" plugin="Y">
-<unit bldFile="mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
-</component>
-<component name="audiooutputcontrolutility" filter="s60" long-name="Audio Output Control Utility">
-<unit bldFile="mw/mmmw/mmfenh/audiooutputcontrolutility/group"/>
-</component>
-<component name="configurationcomponentsfactory" filter="s60" long-name="Configuration Components Factory">
-<unit bldFile="mw/mmmw/mmfenh/configurationcomponentsfactory/group"/>
-</component>
-<component name="enhancedaudioplayerutility" filter="s60" long-name="Enhanced Audio Player Utility">
-<unit bldFile="mw/mmmw/mmfenh/enhancedaudioplayerutility/group"/>
-</component>
-<component name="enhancedmediaclient" filter="s60" long-name="Enhanced Media Client">
-<unit bldFile="mw/mmmw/mmfenh/enhancedmediaclient/group"/>
-</component>
-<component name="profilesettingsmonitor" filter="s60" long-name="Profile Settings Monitor">
-<unit bldFile="mw/mmmw/mmfenh/profilesettingsmonitor/group"/>
-</component>
-<component name="progressivedownload" filter="s60" long-name="Progressive Download">
-<unit bldFile="mw/mmmw/mmfenh/progressivedownload/group"/>
-</component>
-</collection>
-<collection name="mm_fw" long-name="Multimedia Frameworks" level="framework">
-<!-- Id needs to be unique, mmfw already in use -->
-<!-- Placeholder for OpenAX AL and other stuff -->
-</collection>
-<collection name="mmserv" long-name="Multimedia Services" level="specific">
-<component name="audioeffectsui" filter="s60" long-name="Audio Effects UI">
-<unit bldFile="mw/mmmw/mmserv/audioeffectsui/group"/>
-</component>
-<component name="callaudiocontrol" filter="s60" long-name="Call Audio Control">
-<unit bldFile="mw/mmmw/mmserv/callaudiocontrol/group"/>
-</component>
-<component name="metadatautility" filter="s60" long-name="Metadata Utility">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/group"/>
-</component>
-<component name="radioutility" filter="s60" long-name="Radio Utility">
-<unit bldFile="mw/mmmw/mmserv/radioutility/group"/>
-</component>
-<component name="thumbnailengine" filter="s60" long-name="Thumbnail Engine" introduced="^2">
-<unit bldFile="mw/mmmw/mmserv/thumbnailengine/group"/>
-</component>
-<component name="tms" filter="s60" long-name="Telephony Multimedia Service" introduced="^3">
-<unit bldFile="mw/mmmw/mmserv/tms/group"/>
-</component>
-<component name="voipaudioservices" filter="s60" long-name="VoIP Audio Services">
-<unit bldFile="mw/mmmw/mmserv/voipaudioservices/group"/>
-</component>
-<component name="lib3gpextparser" filter="s60" long-name="3GP Extension Metadata Parser Library">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group" filter="sf_build"/>
-</component>
-</collection>
-<collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
-<component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="helix" level="generic" long-name="Helix" levels="plugin framework server generic specific">
-<collection name="helix_ren" long-name="Helix Engine" level="framework">
-<!-- what does "ren" stand for? -->
-<component name="helix_stub" filter="s60" long-name="Helix Stub" introduced="^2" class="api">
-<unit bldFile="mw/helix/helix_ren/helix_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="camerasrv" level="specific" long-name="Camera Services" levels="plugin fw api">
-<collection name="camerasrv_plat" long-name="Camera Services Platform Interfaces" level="api">
-<component name="media_recorder_sink_api" long-name="Media Recorder Sink API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
-</component>
-<component name="cae_extentension_api" long-name="CAE Extension API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/cae_extentension_api/group"/>
-</component>
-<component name="camera_application_engine_api" long-name="Camera Application Engine API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/camera_application_engine_api/group" filter="!test"/>
-</component>
-<component name="custom_onboard_camera_api" long-name="Custom Onboard Camera API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
-</component>
-<component name="imaging_configuration_manager_api" long-name="Imaging Configuration Manager API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
-</component>
-<component name="media_recorder_api" long-name="Media Recorder API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_api/group" filter="!test"/>
-</component>
-<component name="3gp_file_composer_api" long-name="3GP File Composer API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
-</component>
-</collection>
-<collection name="camcordermmfplugin" long-name="Camcorder MMF Plugin" level="plugin">
-<!-- collection is really a component. Should move down a directory -->
-<component name="camcordermmfplugin_build" filter="s60" long-name="Camcorder MMF Plugin Build" plugin="Y">
-<unit bldFile="mw/camerasrv/camcordermmfplugin/build"/>
-</component>
-</collection>
-<collection name="configmanagers" long-name="Config Managers" level="api">
-<component name="imagingconfigmanager" filter="s60" long-name="Imaging Config Manager">
-<unit bldFile="mw/camerasrv/configmanagers/imagingconfigmanager/group"/>
-</component>
-</collection>
-<collection name="camerasrv_info" long-name="Camera Services Info" level="api">
-<component name="camerasrv_build" filter="s60" long-name="Camera Services Build">
-<!-- should split into individual bld.infs -->
-<unit bldFile="mw/camerasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="mmappfw" level="specific" long-name="Multimedia App Framework" levels="fw utils if">
-<collection name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" level="if">
-<component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interfaces Build" introduced="^1" filter="s60">
-<!-- this is no longer necessary when confguration is put in place -->
-<unit bldFile="mw/mmappfw/mmappfw_plat"/>
-</component>
-<component name="collection_helper_api" long-name="Collection Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
-</component>
-<component name="harvester_collection_mediator_api" long-name="Harvester Collection Mediator API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/group"/>
-</component>
-<component name="harvester_metadata_extractor_api" long-name="Harvester Metadata Extractor API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/group"/>
-</component>
-<component name="harvester_server_api" long-name="Harvester Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_server_api/group"/>
-</component>
-<component name="harvester_utility_api" long-name="Harvester Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_utility_api/group"/>
-</component>
-<component name="playlist_engine_api" long-name="Playlist Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playlist_engine_api/group"/>
-</component>
-<component name="mtp_keys_api" long-name="MTP Keys API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mtp_keys_api/group"/>
-</component>
-<component name="mpx_collection_common_definition_api" long-name="MPX Collection Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_common_definition_api/group"/>
-</component>
-<component name="mpx_collection_utility_api" long-name="MPX Collection Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/group"/>
-</component>
-<component name="mpx_common_api" long-name="MPX Common API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_api/group"/>
-</component>
-<component name="mpx_common_definition_api" long-name="MPX Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_common_definition_api" long-name="MPX Playback Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_utility_api" long-name="MPX Playback Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/group"/>
-</component>
-<component name="mpx_base_view_plugins_api" long-name="MPX Base View Plugins API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/group"/>
-</component>
-<component name="mpx_view_utility_api" long-name="MPX View Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_view_utility_api/group"/>
-</component>
-<component name="mpx_albumart_utility_api" long-name="MPX Album Art Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/group"/>
-</component>
-<component name="media_player_settings_engine_api" long-name="Media Player Settings Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
-</component>
-<component name="mpx_backstepping_utility_api" long-name="MPX Backstepping Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_backstepping_utility_api/group"/>
-</component>
-<component name="asx_parser_api" long-name="ASX Parser API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/asx_parser_api/group"/>
-</component>
-<component name="playback_helper_api" long-name="Playback Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playback_helper_api/group"/>
-</component>
-<component name="videoplaylist_utility_api" long-name="Video Playlist Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/videoplaylist_utility_api/group"/>
-</component>
-</collection>
-<collection name="mpx" long-name="Multimedia Player" level="fw">
-<component name="commonframework" filter="s60" long-name="MPX Common Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/commonframework/group"/>
-</component>
-<component name="playbackframework" filter="s60" long-name="MPX Playback Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/playbackframework/group"/>
-</component>
-<component name="mpxcollectionfw" filter="s60" long-name="MPX Collection Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/collectionframework/group"/>
-</component>
-<component name="mpxviewfw" filter="s60" long-name="MPX View Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/viewframework/group"/>
-</component>
-<component name="mpxviewframeworkqt" long-name="MPX View Framework Qt" filter="s60">
-<unit bldFile="mw/mmappfw/mpx/mpxviewframeworkqt" proFile="mpxviewframeworkqt.pro" qmakeArgs="-r -config rom"/>
-</component>
-<component name="mpx_build" filter="s60" long-name="MPX Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/mpx/group"/>
-</component>
-</collection>
-<collection name="mmappcomponents" long-name="Multimedia App Components" level="utils">
-<component name="mmappcomponents_build" filter="s60" long-name="Multimedia App Components Build" introduced="^1">
-<!-- needed for #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
- Can remove this once configuration is in place-->
-<unit bldFile="mw/mmappfw/mmappcomponents/group"/>
-</component>
-<component name="collectionhelper" filter="s60" long-name="Media Player Collection Helper" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/collectionhelper/group"/>
-</component>
-<component name="playlistengine" filter="s60" long-name="Playlist Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/playlistengine/group"/>
-</component>
-<component name="mpxharvester" filter="s60" long-name="Media Player Harvester" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/harvester/group"/>
-</component>
-<component name="mmappcommonui" filter="s60" long-name="Multimedia App Common UI" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmappcommonui/group"/>
-</component>
-<component name="mediaplayersettingsengine" filter="s60" long-name="Media Player Settings Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
-</component>
-<component name="audiofetcher" filter="s60" long-name="Audio Fetcher" introduced="^1" plugin="Y">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
-</component>
-<component name="asxparser" filter="s60" long-name="ASX Parser" introduced="^1">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
-</component>
-<component name="playbackhelper" filter="s60" long-name="Playback Helper" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/playbackhelper/group"/>
-</component>
-<component name="videoplaylistutility" filter="s60" long-name="Video Playlist Utility" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/videoplaylistutility/group"/>
-</component>
-<component name="mmmtpdataprovider" filter="s60" long-name="Multimedia MTP Data Provider" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmmtpdataprovider/group"/>
-</component>
-</collection>
-<collection name="mmappfw_info" long-name="Multimedia App Framework Info" level="if">
-<component name="mmappfw_build" filter="s60" long-name="Multimedia App Framework Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/group"/>
-</component>
-<component name="mmappfw_test" filter="s60,test,api_test,pref_test" long-name="Multimedia App Framework Test" purpose="development" introduced="^1"/>
-</collection>
-</block>
-<block name="hgwidgets" level="specific" long-name="HG Widgets" levels="framework service api">
-<collection name="hgwidgets_pub" long-name="HG Widgets Platform Interfaces" level="api">
-<component name="ganeswidgets_api" long-name="Ganes Widgets API" introduced="^4" class="api placeholder">
-<!-- should separate out unit -->
-</component>
-</collection>
-<collection name="hgwidgets_pub" long-name="HG Widgets Public Interfaces" level="api"/>
-<collection name="ganeswidgets" long-name="Ganes Widgets" level="service">
-<!-- really a component, should move down a dir level and have a unit -->
-<component name="ganeswidgets_build" long-name="Ganes Widgets Build" introduced="^4" class="placeholder">
-<!-- should separate out unit -->
-</component>
-</collection>
-<collection name="hgwidgets_info" long-name="HG Widgets Info" level="framework">
-<component name="hgwidgets_build" long-name="HG Widgets Build" introduced="^4">
-<unit bldFile="mw/hgwidgets" proFile="hgwidgets.pro"/>
-</component>
-</collection>
-</block>
-<block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework api">
-<collection name="inputmethods_pub" long-name="Input Methods Public Interfaces" level="api">
-<component name="ptiengine_iti_api" long-name="PTI Engine API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
-</component>
-<component name="optical_character_recognition_api" long-name="Optical Character Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
-</component>
-<component name="input_language_info_api" long-name="Input Language Info API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
-</component>
-</collection>
-<collection name="inputmethods_plat" long-name="Input Methods Platform Interfaces" level="api">
-<component name="pen_input_server_api" long-name="Pen Input Server API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/group" filter="!test"/>
-</component>
-<component name="ptiengine_hwr_api" long-name="PTI Engine Handwriting Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group" filter="!test"/>
-</component>
-<component name="aknfep_settings_api" long-name="Avkon FEP Settings API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
-</component>
-<component name="aknfep_status_api" long-name="Avkon FEP Status API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
-</component>
-<component name="ptiengine_key_definations_api" long-name="PTI Engine Key Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
-</component>
-<component name="aknfep_definitions_api" long-name="Avkon FEP Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
-</component>
-<component name="aknfep_pen_support_api" long-name="Avkon FEP Pen Support API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
-</component>
-<component name="ptiengine_indic_definitions_api" long-name="PTI Engine Indic Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
-</component>
-<component name="aknfep_uiinterface_api" long-name="Avkon FEP UI Interface API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="textinput" long-name="Text Input" level="framework">
-<component name="ptienginev2" filter="s60" long-name="Predictive Text Input Engine">
-<!--uncomment when configuration is turned on and textinput_build is removed-->
-<!-- <unit bldFile="textinput/ptienginev2/group"/>-->
-</component>
-<component name="akninputlanguage" filter="s60" long-name="Avkon Input Language">
-<unit bldFile="mw/inputmethods/textinput/akninputlanguage/group"/>
-</component>
-<component name="peninputarc" filter="s60" long-name="Pen Input Arc">
-<unit bldFile="mw/inputmethods/textinput/peninputarc/group"/>
-</component>
-<component name="peninputcommonctrls" filter="s60" long-name="Pen Input Common Controls">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonctrls/group"/>
-</component>
-<component name="peninputcommonlayout" filter="s60" long-name="Pen Input Common Layout">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonlayout/group"/>
-</component>
-<component name="peninputhwrtrui" filter="s60" long-name="Pen Input Handwriting Recognition Training UI" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrtrui/group"/>
-</component>
-<component name="textinput_build" filter="s60" long-name="Text Input Build">
-<!--needed for #ifdef, can be removed when configuration is implemented -->
-<unit bldFile="mw/inputmethods/textinput/group"/>
-</component>
-</collection>
-<collection name="fep" long-name="FEP" level="engine">
-<component name="aknfep" filter="s60" long-name="Avkon FEP" plugin="Y">
-<unit bldFile="mw/inputmethods/fep/aknfep/group"/>
-</component>
-<component name="frontendprocessor" long-name="Front End Processor" purpose="mandatory">
-<unit bldFile="mw/inputmethods/fep/frontendprocessor/group" mrp="mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
-</component>
-</collection>
-<collection name="inputmethods_info" long-name="Input Methods Info" level="api">
-<component name="inputmethods_metadata" long-name="Input Methods Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="qt" level="generic" long-name="Qt" levels="tool mw app">
-<collection name="qtconf" long-name="Qt Config" level="tool">
-<component name="qt_deviceconfiguration" long-name="Qt Device Configuration" introduced="^2" class="config tool">
-<unit bldFile="mw/qt/src/s60installs/deviceconfiguration"/>
-</component>
-</collection>
-<collection name="qt_info" long-name="Qt Info" level="mw">
-<component name="qt_build" long-name="Qt Build" introduced="^2">
-<unit bldFile="mw/qt" proFile="projects.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-<collection name="qtdemos" long-name="Qt Demos" level="app">
-<component name="qtdemos_build" long-name="Qt Demos Build" introduced="^2" filter="qtdemos">
-<unit bldFile="mw/qt/demos" proFile="demos.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-<collection name="qtexamples" long-name="Qt Examples" level="app">
-<component name="qtexamples_build" long-name="Qt Examples Build" introduced="^2" filter="qtexamples">
-<unit bldFile="mw/qt/examples" proFile="examples.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-<collection name="qt_tests" long-name="Qt Tests" level="app">
-<component name="qttestsauto" long-name="Qt Automated Tests" introduced="^2" filter="qttestsauto">
-<unit bldFile="mw/qt/tests/auto" proFile="qtpauto.pro"/>
-</component>
-<component name="qttestsbenchmarks" long-name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks">
-<unit bldFile="mw/qt/tests/benchmarks" proFile="benchmarks.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-</block>
-<block name="qtextensions" level="generic" long-name="Qt Extensions" levels="tool mw app">
-<collection name="qtecomplugins" long-name="Qt ECom Plugins" level="app">
-<component name="qtextensions_examples" filter="qtextensionsexamples" long-name="Qt ECom Plugin Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtecomplugins/examples" proFile="examples.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qthighway" long-name="Qt Highway" level="app">
-<component name="qthighway_examples" filter="qtextensionsexamples" long-name="Qt Highway Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qthighway/examples" qmakeArgs="-r"/>
-</component>
-<component name="qthighwaytests" filter="qtextensionstests" long-name="Qt Highway Tests" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qthighway/tests" proFile="tests.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qtmobileextensions" long-name="Qt Mobile Extensions" level="app">
-<component name="qtmobileextensions_examples" filter="qtextensionsexamples" long-name="Qt Mobile Extensions Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtmobileextensions/examples" proFile="examples.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qtmobility" long-name="Qt Mobility">
-<component name="qtmobility_examples" filter="qtextensionsexamples" long-name="Qt Mobility Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtmobility/examples" proFile="examples.pro" qmakeArgs="-r"/>
-</component>
-<component name="qtmobilitytests" filter="qtextensionstests" long-name="Qt Extensions Tests" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtmobility/tests" proFile="tests.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qtextensions_info">
-<component name="qtextensions_build" long-name="Qt Extensions Confgure" introduced="^4" class="conf">
-<unit bldFile="mw/qtextensions/group"/>
-</component>
-<component name="qtextensions_build" long-name="Qt Extensions Build" introduced="^4">
-<!-- break this up into the above collections-->
-<unit bldFile="mw/qtextensions" proFile="qtextensions.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</block>
-<block name="hb" level="generic" long-name="Orbit" levels="engine test api">
-<collection name="n:hb_info" long-name="Orbit Info" level="api">
-<component name="n:hb_build" long-name="Orbit Build" introduced="^4">
-<!-- should break this down into actual components -->
-<unit bldFile="mw/hb" proFile="hb.pro"/>
-</component>
-</collection>
-<collection name="n:hb_test" long-name="Orbit Test" level="test">
-<component name="n:hb_fute" filter="hb_fute_app" long-name="Fute" introduced="^4">
-<unit bldFile="mw/hb/tsrc/fute" proFile="fute.pro" qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
-</component>
-</collection>
-</block>
-<block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
-<collection name="classicui_plat" long-name="Classic UI Platform Interfaces" level="specific">
-<component name="personalisation_framework_api" long-name="Personalisation Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_framework_api/group" filter="!test"/>
-</component>
-<component name="signal_pane_api" long-name="Signal Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
-</component>
-<component name="japanese_reading_api" long-name="Japanese Reading API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/japanese_reading_api/group" filter="!test"/>
-</component>
-<component name="global_popup_priority_controller_api" long-name="Global Popup Priority Controller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
-</component>
-<component name="item_finder_api" long-name="Item Finder API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/item_finder_api/group" filter="!test"/>
-</component>
-<component name="avkon_fonts_api" long-name="Avkon Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_fonts_api/group" filter="!test"/>
-</component>
-<component name="extended_utilities_api" long-name="Extended Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
-</component>
-<component name="personalisation_plugin_api" long-name="Personalisation Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
-</component>
-<component name="extended_aiw_criteria_api" long-name="Extended AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="personalisation_application_api" long-name="Personalisation Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_application_api/group"/>
-</component>
-<component name="volume_popup_api" long-name="Volume Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
-</component>
-<component name="avkon_secondary_display_support_api" long-name="AVKON Secondary Display Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_support_api/group" filter="!test"/>
-</component>
-<component name="extended_setting_pages_api" long-name="Extended Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_setting_pages_api/group" filter="!test"/>
-</component>
-<component name="extended_lists_api" long-name="Extended Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_lists_api/group" filter="!test"/>
-</component>
-<component name="input_block_api" long-name="Input Block API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/input_block_api/group" filter="!test"/>
-</component>
-<component name="avkon_ui_server_api" long-name="AVKON UI Server API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_ui_server_api/group" filter="!test"/>
-</component>
-<component name="number_grouping_api" long-name="Number Grouping API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/number_grouping_api/group" filter="!test"/>
-</component>
-<component name="extended_status_pane_api" long-name="Extended Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_status_pane_api/group" filter="!test"/>
-</component>
-<component name="extended_notifiers_api" long-name="Extended Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notifiers_api/group" filter="!test"/>
-</component>
-<component name="task_list_api" long-name="Task List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
-</component>
-<component name="personalisation_slide_show_dialog_api" long-name="Personalisation Slide Show Dialog API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
-</component>
-<component name="key_event_utilities_api" long-name="Key Event Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_event_utilities_api/group"/>
-</component>
-<component name="emergency_call_support_api" long-name="Emergency Call Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/emergency_call_support_api/group" filter="!test"/>
-</component>
-<component name="extended_dialogs_api" long-name="Extended Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_dialogs_api/group"/>
-</component>
-<component name="legacy_ui_framework_headers_api" long-name="Legacy UI Framework Headers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/legacy_ui_framework_headers_api/group"/>
-</component>
-<component name="extended_editors_api" long-name="Extended Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_editors_api/group" filter="!test"/>
-</component>
-<component name="alarm_api" long-name="Alarm API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alarm_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_interface_base_api" long-name="AIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_base_api/group" filter="!test"/>
-</component>
-<component name="list_effects_api" long-name="List Effects API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/list_effects_api/group" filter="!test"/>
-</component>
-<component name="find_item_ui_api" long-name="Find Item UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/find_item_ui_api/group" filter="!test"/>
-</component>
-<component name="server_application_services_api" long-name="Server Application Services API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/server_application_services_api/group" filter="!test"/>
-</component>
-<component name="common_ui_settings_api" long-name="Common UI Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_ui_settings_api/group"/>
-</component>
-<component name="aiw_service_interface_menu_api" long-name="AIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_menu_api/group" filter="!test"/>
-</component>
-<component name="eikon_server_extension_client_api" long-name="EIKON Server Extension Client API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/eikon_server_extension_client_api/group" filter="!test"/>
-</component>
-<component name="skinnable_clock_api" long-name="Skinnable Clock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/skinnable_clock_api/group" filter="!test"/>
-</component>
-<component name="battery_pane_api" long-name="Battery Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/battery_pane_api/group" filter="!test"/>
-</component>
-<component name="fep_document_navigation_api" long-name="FEP Document Navigation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
-</component>
-<component name="personalisation_localised_texts_api" long-name="Personalisation Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
-</component>
-<component name="memory_card_ui_api" long-name="Memory Card UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
-</component>
-<component name="avkon_status_api" long-name="AVKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_status_api/group"/>
-</component>
-<component name="application_switching_api" long-name="Application Switching API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/application_switching_api/group" filter="!test"/>
-</component>
-<component name="avkon_localised_texts_api" long-name="AVKON Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_localised_texts_api/group"/>
-</component>
-<component name="avkon_secondary_display_api" long-name="AVKON Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_api/group"/>
-</component>
-<component name="extended_animation_api" long-name="Extended Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_notes_api" long-name="Extended Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notes_api/group" filter="!test"/>
-</component>
-<component name="text_scroller_api" long-name="Text Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/text_scroller_api/group" filter="!test"/>
-</component>
-<component name="custom_cursors_api" long-name="Custom Cursors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/custom_cursors_api/group" filter="!test"/>
-</component>
-<component name="global_window_priorities_api" long-name="Global Window Priorities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_window_priorities_api/group"/>
-</component>
-<component name="extended_indicators_api" long-name="Extended Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_indicators_api/group" filter="!test"/>
-</component>
-<component name="special_character_table_api" long-name="Special Character Table API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/special_character_table_api/group" filter="!test"/>
-</component>
-<component name="avkon_settings_api" long-name="AVKON Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_settings_api/group"/>
-</component>
-<component name="extended_sounds_api" long-name="Extended Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_sounds_api/group"/>
-</component>
-<component name="themes_settings_api" long-name="Themes Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/themes_settings_api/group"/>
-</component>
-<component name="media_shared_document_api" long-name="Media Shared Document API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/media_shared_document_api/group" filter="!test"/>
-</component>
-<component name="extended_queries_api" long-name="Extended Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_queries_api/group"/>
-</component>
-<component name="phone_number_text_utilities_api" long-name="Phone Number Text Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
-</component>
-<component name="extended_scroller_api" long-name="Extended Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_scroller_api/group"/>
-</component>
-<component name="key_rotator_api" long-name="Key Rotator API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_rotator_api/group" filter="!test"/>
-</component>
-<component name="extended_grids_api" long-name="Extended Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_grids_api/group" filter="!test"/>
-</component>
-<component name="generic_parameter_api" long-name="Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="indicator_touch_observer_api" long-name="Indicator Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_touch_observer_api/group"/>
-</component>
-<component name="popup_form_api" long-name="Popup Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/popup_form_api/group" filter="!test"/>
-</component>
-<component name="stylus_activated_popup_api" long-name="Stylus Activated Pop-up API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/stylus_activated_popup_api/group" filter="!test"/>
-</component>
-<component name="indicator_plugin_api" long-name="Indicator Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_plugin_api/group" filter="!test"/>
-</component>
-<component name="layout_configuration_api" long-name="Layout Configuration API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/layout_configuration_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_filter_factory_api" long-name="Common File Dialogs Filter Factory API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group" filter="!test"/>
-</component>
-<component name="avkon_anim_dll_api" long-name="AVKON Anim DLL API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_anim_dll_api/group"/>
-</component>
-<component name="extended_initialization_api" long-name="Extended Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_initialization_api/group" filter="!test"/>
-</component>
-<component name="long_tap_animation_api" long-name="Long Tap Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/long_tap_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_ui_framework_definitions_api" long-name="Extended UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_ui_framework_definitions_api/group"/>
-</component>
-<component name="extended_buttons_api" long-name="Extended Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_buttons_api/group" filter="!test"/>
-</component>
-<component name="aiw_provider_utility_api" long-name="AIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_provider_utility_api/group" filter="!test"/>
-</component>
-<component name="transition_effect_parameters_api" long-name="Transition Effect Parameters API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_parameters_api/group" filter="!test"/>
-</component>
-<component name="extended_input_capabilities_api" long-name="Extended Input Capabilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_input_capabilities_api/group" filter="!test"/>
-</component>
-<component name="uikon_status_api" long-name="UIKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/uikon_status_api/group"/>
-</component>
-<component name="transition_effect_utilities_api" long-name="Transition Effect Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_utilities_api/group" filter="!test"/>
-</component>
-<component name="pointer_event_modifier_api" long-name="Pointer Event Modifier API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/pointer_event_modifier_api/group" filter="!test"/>
-</component>
-<component name="avkon_testability_api" long-name="AVKON Testability API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_testability_api/group"/>
-</component>
-<component name="ganes_api" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ganes_api/group"/>
-</component>
-<component name="ode_api" long-name="Ode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ode_api/group"/>
-</component>
-<component name="physics_api" long-name="Physics API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/physics_api/group"/>
-</component>
-<component name="touch_pane_api" long-name="Touch Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_api/group" filter="!test"/>
-</component>
-<component name="touch_pane_observer_api" long-name="Touch Pane Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_observer_api/group"/>
-</component>
-<component name="alternate_fs_api" long-name="Alternate FS API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alternate_fs_api/group"/>
-</component>
-<component name="discreet_popup_api" long-name="Discreet Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/discreet_popup_api/group"/>
-</component>
-<component name="touch_gesture_framework_api" long-name="Touch Gesture Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_gesture_framework_api/group"/>
-<!-- should this be commented out? -->
-<!--<unit bldFile="classicui_plat/touch_gesture_framework_api/tsrc/group" filter="test,api_test"/> -->
-</component>
-<component name="extended_options_menu_api" long-name="Extended Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="classicui_pub" long-name="Classic UI Public Interfaces" level="specific">
-<component name="input_frame_api" long-name="Input Frame API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/input_frame_api/group" filter="!test"/>
-</component>
-<component name="window_server_event_observer_api" long-name="Window Server Event Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/window_server_event_observer_api/group" filter="!test"/>
-</component>
-<component name="application_framework_api" long-name="Application Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/application_framework_api/group" filter="!test"/>
-</component>
-<component name="scroller_api" long-name="Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/scroller_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_utilities_api" long-name="UI Framework Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_utilities_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_definitions_api" long-name="UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_definitions_api/group" filter="!test"/>
-</component>
-<component name="buttons_api" long-name="Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/buttons_api/group" filter="!test"/>
-</component>
-<component name="queries_api" long-name="Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/queries_api/group" filter="!test"/>
-</component>
-<component name="aiw_generic_parameter_api" long-name="AIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="editors_api" long-name="Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/editors_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_api" long-name="Common File Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/common_file_dialogs_api/group" filter="!test"/>
-</component>
-<component name="dialog_shutter_api" long-name="Dialog Shutter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialog_shutter_api/group" filter="!test"/>
-</component>
-<component name="fonts_api" long-name="Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/fonts_api/group" filter="!test"/>
-</component>
-<component name="screen_clearer_api" long-name="Screen Clearer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_clearer_api/group" filter="!test"/>
-</component>
-<component name="notifiers_api" long-name="Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notifiers_api/group" filter="!test"/>
-</component>
-<component name="notes_api" long-name="Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notes_api/group" filter="!test"/>
-</component>
-<component name="status_pane_api" long-name="Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/status_pane_api/group" filter="!test"/>
-</component>
-<component name="base_controls_api" long-name="Base Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/base_controls_api/group" filter="!test"/>
-</component>
-<component name="grids_api" long-name="Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/grids_api/group" filter="!test"/>
-</component>
-<component name="context_pane_api" long-name="Context Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/context_pane_api/group" filter="!test"/>
-</component>
-<component name="lists_api" long-name="Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/lists_api/group" filter="!test"/>
-</component>
-<component name="popups_api" long-name="Popups API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/popups_api/group" filter="!test"/>
-</component>
-<component name="misc_controls_api" long-name="Misc Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/misc_controls_api/group" filter="!test"/>
-</component>
-<component name="keylock_api" long-name="Keylock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/keylock_api/group" filter="!test"/>
-</component>
-<component name="options_menu_api" long-name="Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/options_menu_api/group" filter="!test"/>
-</component>
-<component name="hierarchical_lists_api" long-name="Hierarchical Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hierarchical_lists_api/group" filter="!test"/>
-</component>
-<component name="navigation_pane_api" long-name="Navigation Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/navigation_pane_api/group" filter="!test"/>
-</component>
-<component name="tabs_api" long-name="Tabs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/tabs_api/group" filter="!test"/>
-</component>
-<component name="title_pane_touch_observer_api" long-name="Title Pane Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_touch_observer_api/group"/>
-</component>
-<component name="choice_list_api" long-name="Choice List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/choice_list_api/group" filter="!test"/>
-</component>
-<component name="info_popup_note_api" long-name="Info Popup Note API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/info_popup_note_api/group" filter="!test"/>
-</component>
-<component name="setting_pages_api" long-name="Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/setting_pages_api/group" filter="!test"/>
-</component>
-<component name="screen_mode_api" long-name="Screen Mode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_mode_api/group" filter="!test"/>
-</component>
-<component name="indicators_api" long-name="Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/indicators_api/group" filter="!test"/>
-</component>
-<component name="error_ui_api" long-name="Error UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/error_ui_api/group" filter="!test"/>
-</component>
-<component name="animation_api" long-name="Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/animation_api/group" filter="!test"/>
-</component>
-<component name="searchfield_api" long-name="Searchfield API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/searchfield_api/group" filter="!test"/>
-</component>
-<component name="labels_api" long-name="Labels API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/labels_api/group" filter="!test"/>
-</component>
-<component name="hotkeys_api" long-name="Hotkeys API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hotkeys_api/group" filter="!test"/>
-</component>
-<component name="initialization_api" long-name="Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/initialization_api/group" filter="!test"/>
-</component>
-<component name="volume_control_api" long-name="Volume Control API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/volume_control_api/group" filter="!test"/>
-</component>
-<component name="title_pane_api" long-name="Title Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_api/group" filter="!test"/>
-</component>
-<component name="sounds_api" long-name="Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/sounds_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_handler_api" long-name="AIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_service_handler_api/group" filter="!test"/>
-</component>
-<component name="aiw_criteria_api" long-name="AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="touch_ui_utilities_api" long-name="Touch UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/touch_ui_utilities_api/group" filter="!test"/>
-</component>
-<component name="generic_button_api" long-name="Generic Button API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/generic_button_api/group" filter="!test"/>
-</component>
-<component name="form_api" long-name="Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/form_api/group" filter="!test"/>
-</component>
-<component name="uikon_core_controls" long-name="Uikon Core Controls" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/uikon_core_controls/group" filter="!test"/>
-</component>
-<component name="calendar_api" long-name="Calendar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/calendar_api/group"/>
-</component>
-<component name="toolbar_api" long-name="Toolbar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/toolbar_api/group" filter="!test"/>
-</component>
-<component name="server_application_api" long-name="Server Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/server_application_api/group"/>
-</component>
-<component name="slider_api" long-name="Slider API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/slider_api/group" filter="!test"/>
-</component>
-<component name="private_ui_framework_api" long-name="Private UI Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/private_ui_framework_api/group" filter="!test"/>
-</component>
-<component name="dialogs_api" long-name="Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialogs_api/group" filter="!test"/>
-</component>
-<component name="document_handler_api" long-name="Document handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/document_handler_api/group"/>
-</component>
-<component name="images_api" long-name="Images API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/images_api/group" filter="!test"/>
-</component>
-<component name="stylus_popup_menu_api" long-name="Stylus Pop-up Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/stylus_popup_menu_api/group" filter="!test"/>
-</component>
-<component name="information_preview_popup_api" long-name="Information Preview Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/information_preview_popup_api/group" filter="!test"/>
-</component>
-<component name="intermediate_state_api" long-name="Intermediate State API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/intermediate_state_api/group"/>
-</component>
-<component name="help_launcher_api" long-name="Help Launcher API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/help_launcher_api/group"/>
-</component>
-</collection>
-<collection name="ode" long-name="Open Dynamics Engine" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="ode_build" filter="s60" long-name="ODE">
-<unit bldFile="mw/classicui/ode/group"/>
-</component>
-</collection>
-<collection name="uifw" long-name="UI Framework" level="server">
-<component name="uiklaf" filter="s60" long-name="Uikon Look-and-Feel">
-<unit bldFile="mw/classicui/uifw/uiklaf/group"/>
-</component>
-<component name="eikctl" filter="s60" long-name="Eikon Controls">
-<unit bldFile="mw/classicui/uifw/eikctl/group"/>
-</component>
-<component name="avkon" filter="s60" long-name="Avkon">
-<!-- can only have one unit. Split into 3 components, or #include all from same bld.inf -->
-<unit bldFile="mw/classicui/uifw/avkon/aknphysics/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/aknconf/group"/>
-</component>
-<component name="eikstd" filter="s60" long-name="Eikon Standard">
-<unit bldFile="mw/classicui/uifw/eikstd/group"/>
-</component>
-<component name="aknglobalui" filter="s60" long-name="Avkon Global UI">
-<unit bldFile="mw/classicui/uifw/aknglobalui/group"/>
-</component>
-<component name="ganes" filter="s60" long-name="Ganes">
-<unit bldFile="mw/classicui/uifw/ganes/group"/>
-</component>
-</collection>
-<collection name="commonuis" long-name="Common UIs" level="specific">
-<component name="commonui" filter="s60" long-name="Common UI">
-<unit bldFile="mw/classicui/commonuis/commonui/group"/>
-</component>
-<component name="commondialogs" filter="s60" long-name="Common Dialogs">
-<unit bldFile="mw/classicui/commonuis/commondialogs/group"/>
-</component>
-</collection>
-<collection name="applicationinterworkingfw" long-name="Application Interworking Framework" level="generic">
-<component name="aifwservicehandler" filter="s60" long-name="Application Interworking Service Handler">
-<unit bldFile="mw/classicui/applicationinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-<collection name="psln" long-name="Personalization" level="specific">
-<!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
-<component name="psln_build" filter="s60" long-name="Personalization Build">
-<unit bldFile="mw/classicui/psln/group"/>
-</component>
-</collection>
-<collection name="commonadapter" long-name="Common Adapter" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="commonadapter_build" filter="s60" long-name="Common Adapter Build">
-<unit bldFile="mw/classicui/commonadapter/group"/>
-</component>
-</collection>
-<collection name="akntouchgesturefw" long-name="Avkon Touch Gesture Framework" level="generic">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="akntouchgesturefw_build" filter="s60" long-name="Avkon Touch Gesture Framework Build" introduced="^3">
-<unit bldFile="mw/classicui/akntouchgesturefw/group"/>
-</component>
-</collection>
-<collection name="uiutils" long-name="UI Utils" level="specific">
-<component name="localizer" filter="s60" long-name="Directory Localizer">
-<unit bldFile="mw/classicui/uiutils/localizer/group"/>
-</component>
-<component name="findutil" filter="s60" long-name="Find Utility">
-<unit bldFile="mw/classicui/uiutils/findutil/group"/>
-</component>
-<component name="gamerecognizer" filter="s60" long-name="Game Recognizer" plugin="Y">
-<unit bldFile="mw/classicui/uiutils/gamerecognizer/group"/>
-</component>
-<component name="aknjapanesereading" filter="s60" long-name="Avkon Japanese Reading">
-<unit bldFile="mw/classicui/uiutils/aknjapanesereading/group"/>
-</component>
-<component name="hlplch" long-name="Help Launcher" filter="s60,bldfirst">
-<unit bldFile="mw/classicui/uiutils/hlplch/group"/>
-</component>
-</collection>
-<collection name="commonuisupport" long-name="Common UI Support" level="support">
-<component name="uikon" long-name="Uikon" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uikon/group" mrp="mw/classicui/commonuisupport/uikon/group/app-framework_uikon.mrp"/>
-</component>
-<component name="errorresolverdata" long-name="Error Resolver Data" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/errorresolverdata/group" mrp="mw/classicui/commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
-</component>
-<component name="uilaf" long-name="UI Look and Feel" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uilaf/GROUP" mrp="mw/classicui/commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
-</component>
-<component name="grid" long-name="Grid" purpose="optional">
-<unit bldFile="mw/classicui/commonuisupport/grid/group" mrp="mw/classicui/commonuisupport/grid/group/app-framework_grid.mrp"/>
-</component>
-<component name="uifwsdocs" long-name="UI Frameworks Documentation" purpose="development" class="doc">
-<unit mrp="mw/classicui/commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
-</component>
-</collection>
-<collection name="lafagnosticuifoundation" long-name="Look-and-Feel Agnostic UI Foundation" level="base">
-<component name="cone" long-name="Control Environment" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/cone/group" mrp="mw/classicui/lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
-</component>
-<component name="graphicseffects" long-name="Graphics Effects" introduced="9.2" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/graphicseffects/group" mrp="mw/classicui/lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
-</component>
-<component name="uigraphicsutils" long-name="UI Graphics Utilities" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group" mrp="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
-</component>
-<component name="clockanim" long-name="Clock" purpose="optional" plugin="Y">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/clockanim/group" mrp="mw/classicui/lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
-</component>
-<component name="bmpanimation" long-name="BMP Animation" introduced="6.0" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/bmpanimation/group" mrp="mw/classicui/lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
-</component>
-<component name="animation" long-name="Animation" introduced="9.1" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/animation/group" mrp="mw/classicui/lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
-</component>
-</collection>
-<collection name="classicui_info" long-name="Classic UI Info" level="specific">
-<!-- the multiple units in the API test components need to be resolved -->
-<component name="classicui_metadata" long-name="Classic UI Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/classicui/classicui_info/classicui_metadata/classicui_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="svgt" level="generic" long-name="SVG Tiny" levels="util ui">
-<collection name="svgt_plat" long-name="SVG Tiny Platform Interfaces" level="ui">
-<component name="svgt_api" long-name="SVGT API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/svgt_api/group"/>
-</component>
-<component name="nvg_api" long-name="NVG API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/nvg_api/group"/>
-</component>
-</collection>
-<collection name="svgtopt" long-name="SVG-T Engine" level="util">
-<component name="svgtopt_build" filter="s60" long-name="SVG Engine" introduced="9.2">
-<!-- component is at collection level. Needs to be moved down a directory -->
-<unit bldFile="mw/svgt/svgtopt/group"/>
-</component>
-<component name="svgtplugin" filter="s60" long-name="SVG Plugin" introduced="9.2" plugin="Y">
-<unit bldFile="mw/svgt/svgtopt/svgtplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="uiaccelerator" level="generic" long-name="UI Accelerator" levels="plugin framework server ex if">
-<collection name="uiaccelerator_plat" long-name="UI Accelerator Platform Interfaces" level="if">
-<component name="alf_core_toolkit_api" long-name="ALF Core Toolkit API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/group"/>
-</component>
-<component name="alf_visual_api" long-name="ALF Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/group"/>
-</component>
-<component name="alf_extended_visual_api" long-name="ALF Extended Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/group"/>
-</component>
-<component name="alf_extension_api" long-name="ALF Extension API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/group"/>
-</component>
-<component name="alf_tracing_api" long-name="ALF Tracing API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/group"/>
-</component>
-<component name="alf_client_server_api" long-name="ALF Client Server API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/group"/>
-</component>
-</collection>
-<collection name="uiacceltk" long-name="UI Accelerator Toolkit" level="framework">
-<component name="hitchcock" filter="s60" long-name="Hitchcock">
-<unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/group"/>
-</component>
-<component name="uiacceltk_build" filter="s60" long-name="UI Accelerator Toolkit Build">
-<!-- move into the other component, or remove the #include and make this UI Accelerator Toolkit ROM-->
-<unit bldFile="mw/uiaccelerator/uiacceltk/group"/>
-</component>
-</collection>
-<collection name="uiaccelerator_test" long-name="UI Accelerator Test" level="ex"/>
-</block>
-<block name="uiresources" level="generic" long-name="UI Resources" levels="compile plugin framework server generic data">
-<!-- are the custom filters below needed? -->
-<collection name="uiresources_pub" long-name="UI Resources Public Interfaces" level="data">
-<component name="pictograph_api" long-name="Pictograph API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/pictograph_api/group" filter="!test"/>
-</component>
-<component name="skins_api" long-name="Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/skins_api/group" filter="!test"/>
-</component>
-<component name="font_definition_api" long-name="Font Definition API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/font_definition_api/group" filter="!test"/>
-</component>
-<component name="graphics_api" long-name="Graphics API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/graphics_api/group" filter="!test"/>
-</component>
-<component name="scalable_icons_api" long-name="Scalable Icons API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/scalable_icons_api/group"/>
-</component>
-<component name="layout_id_definitions_api" long-name="Layout ID Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/layout_id_definitions_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_plat" long-name="UI Resources Platform Interfaces" level="data">
-<component name="layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_system_private_api/group" filter="!test"/>
-</component>
-<component name="layout_data_api" long-name="Layout Data API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_data_api/group" filter="!test"/>
-</component>
-<component name="cdl_api" long-name="CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/cdl_api/group" filter="!test"/>
-</component>
-<component name="extended_skins_api" long-name="Extended Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_skins_api/group" filter="!test"/>
-</component>
-<component name="tfx_server_controller_plugin_api" long-name="TFX Server Controller Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_controller_plugin_api/group"/>
-</component>
-<component name="extended_fonts_api" long-name="Extended Fonts API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_fonts_api/group" filter="!test"/>
-</component>
-<component name="graphic_configuration_api" long-name="Graphic Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/graphic_configuration_api/group" filter="!test"/>
-</component>
-<component name="mif_header_cdl_api" long-name="MIF Header CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mif_header_cdl_api/group"/>
-</component>
-<component name="personalisation_and_skins_settings_api" long-name="Personalisation and Skins Settings API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/personalisation_and_skins_settings_api/group"/>
-</component>
-<component name="tfx_effect_setup_plugin_api" long-name="TFX Effect Setup Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_effect_setup_plugin_api/group"/>
-</component>
-<component name="mifconv_definitions_api" long-name="Mifconv Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mifconv_definitions_api/group"/>
-</component>
-<component name="wallpaper_configuration_api" long-name="Wallpaper Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/wallpaper_configuration_api/group"/>
-</component>
-<component name="language_code_definitions_api" long-name="Language Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/language_code_definitions_api/group"/>
-</component>
-<component name="skins_image_attributes_api" long-name="Skins Image Attributes API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
-</component>
-<component name="private_user_area_code_definitions_api" long-name="Private User Area Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/private_user_area_code_definitions_api/group"/>
-</component>
-<component name="tfx_server_plugin_ids_api" long-name="TFX Server Plug-in IDs API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_plugin_ids_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_info" long-name="UI Resources Info" level="data">
-<component name="uiresources_test" filter="s60,test,api_test" long-name="UI Resources Tests" purpose="development"/>
-</collection>
-<collection name="uigraphics" long-name="UI Graphics" level="generic">
-<component name="bitmaps2" filter="s60" long-name="Bitmaps 2" class="config">
-<unit bldFile="mw/uiresources/uigraphics/bitmaps2/group"/>
-</component>
-<component name="icons" filter="s60" long-name="Icons" class="config">
-<unit bldFile="mw/uiresources/uigraphics/icons/group"/>
-</component>
-<component name="variatedbitmaps" filter="s60" long-name="Variated Bitmaps" class="config">
-<unit bldFile="mw/uiresources/uigraphics/variatedbitmaps/group"/>
-</component>
-<component name="aknicon" filter="s60" long-name="Avkon Icon Framework">
-<unit bldFile="mw/uiresources/uigraphics/aknicon/group"/>
-</component>
-<component name="nvgrenderstage" filter="sf_build" long-name="NVG Render Stage">
-<unit bldFile="mw/uiresources/uigraphics/nvgrenderstage/group"/>
-</component>
-</collection>
-<collection name="layouts" long-name="Layouts" level="plugin">
-<component name="cdl" filter="s60" long-name="Customization Definition Language">
-<!-- can only have one unit. Need to #include them or split into multiple components -->
-<unit bldFile="mw/uiresources/layouts/cdl/cdlengine/group"/>
-<unit bldFile="mw/uiresources/layouts/cdl/cdlserver/group"/>
-</component>
-<component name="aknlayout2" filter="s60" long-name="Avkon Layout 2">
-<unit bldFile="mw/uiresources/layouts/aknlayout2/group"/>
-</component>
-</collection>
-<collection name="skins" long-name="Skins" level="data">
-<component name="aknskincontent" filter="s60" long-name="Avkon Skin Content" class="config">
-<unit bldFile="mw/uiresources/skins/aknskincontent/group"/>
-</component>
-<component name="aknskins" filter="s60" long-name="Avkon Skin Compiler">
-<unit bldFile="mw/uiresources/skins/aknskins/group"/>
-</component>
-</collection>
-<collection name="pictographs" long-name="Pictographs" level="data">
-<component name="aknpictograph" filter="s60" long-name="Avkon Pictograph">
-<unit bldFile="mw/uiresources/pictographs/aknpictograph/group"/>
-</component>
-</collection>
-<collection name="locales" long-name="Locales" level="framework">
-<component name="locales_build" filter="s60" long-name="Locales Build">
-<unit bldFile="mw/uiresources/locales/loce32"/>
-</component>
-</collection>
-<collection name="uiconfig" long-name="UI Config" level="server">
-<component name="s60config" filter="s60" long-name="S60 UI Config">
-<unit bldFile="mw/uiresources/uiconfig/s60config/group"/>
-</component>
-</collection>
-<collection name="fontsupport" long-name="Font Support" level="generic">
-<component name="fontprovider" filter="s60" long-name="Font Provider">
-<unit bldFile="mw/uiresources/fontsupport/fontprovider/group"/>
-</component>
-<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
- <component id="s60_fonts" filter="s60" name="S60 Fonts">
- <unit bldFile="fontsupport/fontutils/group"/>
- </component>
--->
-<component name="fontutils" filter="sf_build" long-name="Font Utils">
-<unit bldFile="mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
-</component>
-</collection>
-<collection name="helpthemes" long-name="Help Themes" level="data">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helpthemes_build" filter="s60" long-name="Help Themes Build" class="config">
-<unit bldFile="mw/uiresources/helpthemes/group"/>
-</component>
-</collection>
-</block>
-<block name="hapticsservices" level="generic" long-name="Haptics Services" levels="fw server api">
-<collection name="hapticsservices_plat" long-name="Haptics Services Platform Interfaces" level="api">
-<component name="tacticon_api" long-name="Tacticon API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tacticon_api/group"/>
-</component>
-<component name="tactile_feedback_core_api" long-name="Tactile Feedback Core API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_core_api/group"/>
-</component>
-<component name="tactile_feedback_server_api" long-name="Tactile Feedback Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_server_api/group"/>
-</component>
-</collection>
-<collection name="hapticsservices_pub" long-name="Haptics Services Public Interfaces" level="api">
-<component name="tactile_feedback_client_api" long-name="Tactile Feedback Client API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_pub/tactile_feedback_client_api/group"/>
-</component>
-</collection>
-<collection name="tacticonserver" long-name="Tacticon Server" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="tacticonserver_build" filter="s60" long-name="Tacticon Server Build" introduced="^3">
-<unit bldFile="mw/hapticsservices/tacticonserver/group"/>
-<!-- clients and servers are suauly the same component. Consider moving pluign to a separate component if needed -->
-</component>
-</collection>
-<collection name="tactilefeedback" long-name="Tactile Feedback" level="fw">
-<component name="tactilearearegistry" filter="s60" long-name="Tactile Area Registry" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilearearegistry/group"/>
-</component>
-<component name="tactilefeedbackresolver" filter="s60" long-name="Tactile Feedback Resolver" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackresolver/group"/>
-</component>
-<component name="tactileclickplugin" filter="s60" long-name="Tactile Click Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileclickplugin/group"/>
-</component>
-<component name="tactilefeedbackclient" filter="s60" long-name="Tactile Feedback Client" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackclient/group"/>
-</component>
-<component name="tactileactionplugin" filter="s60" long-name="Tactile Action Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileactionplugin/group"/>
-</component>
-<component name="tactilefeedback_build" filter="s60" long-name="Tactile Feedback Build" introduced="^1">
-<!-- consider moving IBY to one fo the above components -->
-<unit bldFile="mw/hapticsservices/tactilefeedback/group"/>
-</component>
-</collection>
-</block>
-<block name="platformthemes" level="specific" long-name="Platform Themes" levels="framework generic ui">
-<collection name="platformthemes_info" long-name="Platform Themes Info">
-<component name="platformthemes_build" long-name="Platform Themes Build">
-<!-- no real structure in this package. Should break into collections / components -->
-<unit bldFile="mw/platformthemes" proFile="platformthemes.pro"/>
-</component>
-</collection>
-</block>
-<block name="gsprofilesrv" level="generic" long-name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
-<collection name="gsprofilesrv_pub" long-name="GS and Profiles Services Public Interfaces" level="specific">
-<component name="profiles_engine_active_profile_settings_api" long-name="Profiles Engine Active Profile Settings API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_active_profile_settings_api/group"/>
-</component>
-<component name="profiles_engine_wrapper_api" long-name="Profiles Engine Wrapper API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_wrapper_api/group"/>
-</component>
-</collection>
-<collection name="gsprofilesrv_plat" long-name="GS and Profiles Services Platform Interfaces" level="specific">
-<component name="ftuwizardmodel_api" long-name="FTU Wizard Model API" filter="bldfirst,s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/ftuwizardmodel_api" proFile="ftuwizardmodel_api.pro" qmakeArgs="-r -config rom"/>
-</component>
-<component name="profiles_engine_api" long-name="Profiles Engine API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_engine_api/group"/>
-</component>
-<component name="settings_backgroundimage_api" long-name="Settings Background Image API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_backgroundimage_api/group"/>
-</component>
-<component name="settings_framework_api" long-name="Settings Framework API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_framework_api/group"/>
-</component>
-<component name="settings_launch_api" long-name="Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_launch_api/group"/>
-</component>
-<component name="settings_listbox_api" long-name="Settings List Box API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_listbox_api/group"/>
-</component>
-<component name="settings_plugin_api" long-name="Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_plugin_api/group"/>
-</component>
-<component name="settings_uis_cenrep_collection_api" long-name="Settings UIs CenRep Collection API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
-</component>
-</collection>
-<collection name="gssettingsuis" long-name="General Settings UIs" level="framework">
-<component name="gs" filter="s60" long-name="General Settings" introduced="9.2">
-<unit bldFile="mw/gsprofilesrv/gssettingsuis/gs/group"/>
-</component>
-</collection>
-<collection name="ftuwizardmodel" long-name="FTU Wizard Model" level="generic">
-<component name="ftuwizardmodel_build" long-name="FTU Wizardmodel Build" filter="bldfirst">
-<unit bldFile="mw/gsprofilesrv/ftuwizardmodel" proFile="ftuwizardmodel.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-<collection name="controlpanel" long-name="Control Panel" level="generic">
-<component name="controlpanel_build" long-name="Control Panel Build">
-<unit bldFile="mw/gsprofilesrv/controlpanel" proFile="controlpanel.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-<collection name="profilesservices" long-name="Profiles Services" level="server">
-<component name="profileengine" filter="s60" long-name="Profile Engine" introduced="9.1">
-<unit bldFile="mw/gsprofilesrv/profilesservices/profileengine/group"/>
-</component>
-<component name="ringingtone3dplugin" filter="s60" long-name="Ringing Tone 3D Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/gsprofilesrv/profilesservices/ringingtone3dplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreensrv" level="specific" long-name="Home Screen Services" levels="plugin framework server generic specific">
-<collection name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" level="specific">
-<component name="ai_content_model_api" long-name="AI Content Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_content_model_api/group"/>
-</component>
-<component name="ai_utilities_api" long-name="AI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_utilities_api/group" filter="!test"/>
-</component>
-<component name="ai_plugin_management_api" long-name="AI Plug-in Management API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_management_api/group"/>
-</component>
-<component name="ai_plugin_information_api" long-name="AI Plug-in Information API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_information_api/group"/>
-</component>
-<component name="ai_variation_api" long-name="AI Variation API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_variation_api/group"/>
-</component>
-<component name="action_handler_plugin_api" long-name="Action Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/group" filter="!test"/>
-</component>
-<component name="content_harvester_plugin_api" long-name="Content Harvester Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/group" filter="!test"/>
-</component>
-<component name="menu_model_api" long-name="Menu Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_model_api/group"/>
-</component>
-<component name="menu_sat_interface_api" long-name="Menu SAT Interface API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/group" filter="!test"/>
-</component>
-<component name="external_home_screen_api" long-name="External Home Screen API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/external_home_screen_api/group"/>
-</component>
-<component name="menu_content_service_api" long-name="Menu Content Service API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_content_service_api/group" filter="!test"/>
-</component>
-<component name="sapi_contentpublishing" long-name="SAPI Content Publishing" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing/group"/>
-</component>
-<component name="sapi_backstepping" long-name="SAPI Backstepping" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_backstepping/group"/>
-</component>
-<component name="sapi_actionhandler" long-name="SAPI Action Handler" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_actionhandler/group"/>
-</component>
-<component name="sapi_homescreenplugin" long-name="SAPI Homescreen Plugin" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_homescreenplugin/group" filter="!test"/>
-</component>
-<component name="sapi_menucontent" long-name="SAPI Menu Content" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_menucontent/group"/>
-</component>
-<component name="xcfw_api" long-name="XCFW API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/xcfw_api/group"/>
-</component>
-<component name="idlefw_api" long-name="Idle Framework API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/idlefw_api/group"/>
-</component>
-<component name="hs_widget_publisher_api" long-name="Home Screen Publishing API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_widget_publisher_api/group"/>
-</component>
-<component name="hs_settings_api" long-name="HS Settings API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_settings_api/group"/>
-</component>
-<component name="hs_content_control_api" long-name="HS Content Control API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_content_control_api/group"/>
-</component>
-</collection>
-<collection name="xcfw" long-name="XML Content Framework" level="framework">
-<!-- collection is really a component, needs to be moved down a directory -->
-<component name="xcfw_build" filter="s60" long-name="XML Content Framework Build">
-<unit bldFile="mw/homescreensrv/xcfw/group"/>
-</component>
-</collection>
-<collection name="homescreenpluginsrv" long-name="Home Screen Plugin Service" level="plugin">
-<component name="hspsdefinitionengine" filter="s60" long-name="HS Plugin Service Definition Engine" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsdefinitionengine/group"/> -->
-</component>
-<component name="hspsdom" filter="s60" long-name="HS Plugin Service DOM" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsdom/group"/> -->
-</component>
-<component name="hspstools" filter="s60" long-name="HS Server Tools">
-<!-- <unit bldFile="homescreenpluginsrv/hspstools/group"/> -->
-</component>
-<component name="hspspluginregistry" filter="s60" long-name="HS Plugin Registry" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspspluginregistry/group"/>-->
-</component>
-<component name="hspsmanager" filter="s60" long-name="HSPS Manager" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsmanager/group"/>-->
-</component>
-<component name="hspsodt" filter="s60" long-name="HSPS Object Description Tree" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsodt/group"/>-->
-</component>
-<component name="hspsresource" filter="s60" long-name="HS Plugin Server Resource" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresource/group"/>-->
-</component>
-<component name="hspsresult" filter="s60" long-name="HS Plugin Server Result" class="placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
-</component>
-<component name="homescreen_settings_api" filter="s60" long-name="HS Settings API" class="api placeholder">
-<!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
-</component>
-<component name="homescreenpluginsrv_build" filter="s60" long-name="HSPS Build">
-<!-- need to break this up into the self-contained components above and uncomment them -->
-<unit bldFile="mw/homescreensrv/homescreenpluginsrv/group"/>
-</component>
-</collection>
-<collection name="idlefw" long-name="Idle Framework" level="framework">
-<!-- Uncomment all units when configuration is in place. All currently #included from idlefw_build -->
-<component name="idlefw_plugins" filter="s60" long-name="Idle Framework Plugins" plugin="Y" class="placeholder">
-<!--<unit bldFile="idlefw/plugins/group"/>-->
-</component>
-<component name="hslaunch" filter="s60" long-name="Home Screen Launch" class="placeholder">
-<!--<unit bldFile="idlefw/plugins/group"/>-->
-</component>
-<component name="idlefw_build" filter="s60" long-name="Idle Framework Build">
-<!--split this into components, or separate from the above components and move this down a directory -->
-<unit bldFile="mw/homescreensrv/idlefw/group"/>
-</component>
-</collection>
-<collection name="menucontentsrv" long-name="Menu Content Service" level="generic">
-<component name="menusatinterface" filter="s60" long-name="Menu SAT Interface">
-<unit bldFile="mw/homescreensrv/menucontentsrv/menusatinterface/group"/>
-</component>
-<component name="menucontentsrv_build" filter="s60" long-name="Menu Content Service Build">
-<!--split this into components, or separate from the above component and move this down a directory -->
-<unit bldFile="mw/homescreensrv/menucontentsrv/group"/>
-</component>
-</collection>
-<collection name="backsteppingsrv" long-name="Back Stepping Service" level="server">
-<!-- collection is really a component, needs to be moved down a directory -->
-<component name="bsengine" long-name="Back Stepping Engine" filter="s60">
-<unit bldFile="mw/homescreensrv/backsteppingsrv/group"/>
-</component>
-</collection>
-<collection name="contentpublishingsrv" long-name="Content Publishing Service" level="server">
-<component name="contentpublishingdebug" filter="s60" long-name="Content Publishing Debug">
-<!-- need to move this component outside of contentpublishingutils and into separate component directory -->
-<!-- <unit bldFile="contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/> -->
-</component>
-<component name="contentpublishingutils" filter="s60" long-name="Content Publishing Utils">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingutils/group"/>
-</component>
-<component name="contentpublishingserver" filter="s60" long-name="Content Publishing Server">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingserver/group"/>
-</component>
-<component name="contentharvester" filter="s60" long-name="Content Harvester">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
-</component>
-<component name="contentpublishingsrv_build" filter="s60" long-name="Content Publishing Service Build">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/group"/>
-</component>
-</collection>
-<collection name="contentcontrolsrv" long-name="Content Control Service" level="server">
-<component name="ccsrv" long-name="Content Control Service" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccsrv/group"/>
-</component>
-<component name="ccsrvapi" long-name="Content Control Service API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccsrvapi/group"/>
-</component>
-<component name="ccclientsession" long-name="Content Control Client Session" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/ccclientsession/group"/>
-</component>
-<component name="hsccclient" long-name="HS Content Control Client" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/hsccclient/group"/>
-</component>
-<component name="hscontentinfo" long-name="Home Screen Content Info" filter="s60" introduced="^3">
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/hscontentinfo/group"/>
-</component>
-<component name="contentcontrolsrv_build" long-name="Content Control Service Build" filter="s60" introduced="^3">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentcontrolsrv/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreensrvlegacy" level="generic" long-name="Legacy Home Screen Services" levels="plugin framework server generic specific">
-<collection name="homescreensrvlegacy_plat" long-name="Legacy Home Screen Services Platform Interfaces" level="specific">
-<component name="ai_content_model_api" long-name="AI Content Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrvlegacy/ai_content_model_api/group" proFile="group.pro"/>
-</component>
-<component name="ai_plugin_information_api" long-name="AI Plug-in Information API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrvlegacy/ai_plugin_information_api/group" proFile="group.pro"/>
-</component>
-</collection>
-</block>
-<block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
-<collection name="appinstall_plat" long-name="Application Installation Platform Interfaces" level="api">
-<component name="iaupdate_api" long-name="IA Update API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/iaupdate_api/group"/>
-</component>
-<component name="task_plugin_api" long-name="Task Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_plugin_api/group"/>
-</component>
-<component name="sw_installer_common_ui_api" long-name="SW Installer Common UI API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_common_ui_api/group"/>
-</component>
-<component name="sw_installer_launcher_api" long-name="SW Installer Launcher API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_launcher_api/group"/>
-</component>
-<component name="task_management_api" long-name="Task Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_management_api/group"/>
-</component>
-<component name="sw_installer_ui_plugin_api" long-name="SW Installer UI Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ui_plugin_api/group"/>
-</component>
-<component name="sw_installer_cr_keys" long-name="SW Installer CR Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_cr_keys/group"/>
-</component>
-<component name="sw_installer_ps_keys" long-name="SW Installer PS Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
-</component>
-<component name="appmngr2runtimeapi" long-name="Application Manager 2 Runtime Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
-</component>
-<component name="sifui_api" long-name="STIF UI API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sifui_api/group"/>
-</component>
-</collection>
-<collection name="appinstall_pub" long-name="Application Installation Public Interfaces" level="api">
-<component name="startup_list_management_api" long-name="Startup List Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
-</component>
-</collection>
-<collection name="ncdengine" long-name="Nokia Content Discover" level="framework">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="ncdengine_engine" filter="s60" long-name="NCD Engine" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/engine/group"/>
-</component>
-<component name="debuglogger" filter="s60" long-name="NCD Debug Logger" introduced="^1" class="placeholder">
-<!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
-</component>
-<component name="ncdengine_build" filter="s60" long-name="NCD Build" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/group"/>
-</component>
-</collection>
-<collection name="appinstaller" long-name="Application Installer" level="generic">
-<component name="appinstui" filter="s60" long-name="Application Installer UI" introduced="^2">
-<unit bldFile="mw/appinstall/appinstaller/appinstui/group"/>
-</component>
-</collection>
-<collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="api">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="iaupdateapi_stub_build" long-name="IA Update API Stub Build" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdateapi_stub/group"/>
-</component>
-</collection>
-<collection name="iaupdate" long-name="Independent Apps Update" level="api">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="iad" long-name="Software Update" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/iad/group"/>
-</component>
-<component name="iaupdate_help" filter="s60" long-name="IA Update Help" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/help/group"/>
-</component>
-<component name="iaupdate_build" filter="s60" long-name="IA Update Build" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/group"/>
-</component>
-</collection>
-<collection name="installationservices" long-name="Installation Services" level="generic">
-<component name="swi" long-name="Secure Software Install" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swi/group" mrp="mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
-</component>
-<component name="swidevicetools" long-name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
-<unit bldFile="mw/appinstall/installationservices/swidevicetools/group" mrp="mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
-</component>
-<component name="swcomponentregistry" long-name="Software Component Registry" introduced="^4" purpose="mandatory">
-<unit bldFile="mw/appinstall/installationservices/swcomponentregistry/group" mrp="mw/appinstall/installationservices/swcomponentregistry/group/security_softwarecomponentregistry.mrp"/>
-</component>
-<component name="swinstallationfw" long-name="Software Installation Framework" introduced="^4" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swinstallationfw/group" mrp="mw/appinstall/installationservices/swinstallationfw/group/security_softwareinstallframework.mrp"/>
-</component>
-<component name="swtransactionservices" long-name="Software Transaction Services" introduced="^4" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swtransactionservices/group" mrp="mw/appinstall/installationservices/swtransactionservices/group/security_softwaretransactionservices.mrp"/>
-</component>
-<component name="refswinstallationplugin" long-name="Reference Software Installation Plugin" introduced="^4" purpose="development" plugin="Y">
-<unit bldFile="mw/appinstall/installationservices/refswinstallationplugin/group" mrp="mw/appinstall/installationservices/refswinstallationplugin/group/security_sifrefplugin.mrp"/>
-</component>
-<component name="refsoftwareappmgr" long-name="Reference Software Application Manager" introduced="^4" purpose="development">
-<unit bldFile="mw/appinstall/installationservices/refsoftwareappmgr/group" mrp="mw/appinstall/installationservices/refsoftwareappmgr/group/security_referenceapplicationmanager.mrp"/>
-</component>
-<component name="swiconfig" long-name="Software Install Config" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appinstall/installationservices/swiconfig/group" mrp="mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
-</component>
-</collection>
-<collection name="secureswitools" long-name="Secure Software Install Tools" level="tool">
-<component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/makekeys/group" mrp="mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
-</component>
-<component name="swianalysistoolkit" long-name="SWI Analysis Toolkit" purpose="development" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
-</component>
-<component name="openssllib" long-name="OpenSSL Library" purpose="optional" class="PC">
-<unit mrp="mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
-</component>
-<component name="swisistools" long-name="Secure Software Install SIS Tools" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swisistools/group" mrp="mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
-</component>
-</collection>
-<collection name="appinstall_info" long-name="Application Installation Info" level="api">
-<component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="serviceapifw" level="specific" long-name="Service API Framework" levels="plugin framework server generic specific">
-<collection name="serviceapifw_pub" long-name="Service API Framework Public Interfaces" level="specific"/>
-<collection name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" level="specific">
-<component name="rtsecuritymanager_common_api" long-name="Runtime Security Manager Common API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/group"/>
-</component>
-<component name="rtsecuritymanager_utility_api" long-name="Runtime Security Manager Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
-</component>
-<component name="rtsecuritymanager_client_api" long-name="Runtime Security Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/group"/>
-</component>
-<component name="liw_provider_utility_api" long-name="LIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_provider_utility_api/group"/>
-</component>
-<component name="liw_service_interface_base_api" long-name="LIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_base_api/group"/>
-</component>
-<component name="liw_service_interface_menu_api" long-name="LIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_menu_api/group"/>
-</component>
-<component name="liw_criteria_api" long-name="LIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_criteria_api/group"/>
-</component>
-<component name="liw_generic_parameter_api" long-name="LIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_generic_parameter_api/group"/>
-</component>
-<component name="liw_service_handler_api" long-name="LIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_handler_api/group"/>
-</component>
-</collection>
-<collection name="rtsecuritymanager" long-name="Runtime Security Manager" level="server">
-<component name="rtsecuritymanagerutil" filter="s60" long-name="Runtime Security Manager Util">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
-</component>
-<component name="rtsecuritymanagerserver" filter="s60" long-name="Runtime Security Manager Server">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/>
-</component>
-<component name="rtsecuritymanagerclient" filter="s60" long-name="Runtime Security Manager Client">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/>
-</component>
-<component name="rtsecuritymanager_build" filter="s60" long-name="Runtime Security Manager Build">
-<!-- Move the export to the appropriate components, or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/group"/>
-</component>
-</collection>
-<collection name="languageinterworkingfw" long-name="Language Interworking Framework" level="framework">
-<component name="lifwservicehandler" filter="s60" long-name="Service Handler">
-<unit bldFile="mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-</block>
-<block name="serviceapi" level="specific" long-name="Service API" levels="os mw1 mw2 app">
-<!-- should break up this collection into something meaningful -->
-<collection name="serviceproviders" long-name="Service Providers" level="mw1">
-<component name="sapi_contacts_vpbk" long-name="Contacts Phonebook SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
-</component>
-<component name="sapi_location" long-name="Location SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_location/group"/>
-</component>
-<component name="sapi_mediamanagement" long-name="Media Management SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/group"/>
-</component>
-<component name="sapi_landmarks" long-name="Landmarks SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
-</component>
-<component name="sapi_messaging" long-name="Messaging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/group"/>
-</component>
-<component name="sapi_applicationmanager" long-name="Application Manager SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
-</component>
-<component name="sapi_calendar" long-name="Calendar SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_calendar/group"/>
-</component>
-<component name="sapi_logging" long-name="Logging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_logging/group"/>
-</component>
-<component name="sapi_sensor" long-name="Sensor SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sensor/group"/>
-</component>
-<component name="sapi_sysinfo" long-name="Sysinfo SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sysinfo/group"/>
-</component>
-<component name="sapi_serviceregistry" long-name="Service Registry SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
-</component>
-<component name="jsapi" long-name="Javascript API" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/jsapi/group"/>
-</component>
-<component name="serviceproviders_build" filter="s60" long-name="Service API Build">
-<!-- distribute the exports or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapi/serviceproviders/group"/>
-</component>
-</collection>
-</block>
-<block name="web" level="specific" long-name="Web" levels="plugin utils server generic specific">
-<collection name="web_pub" long-name="Web Public Interfaces" level="specific">
-<component name="browser_control_api" long-name="Browser Control API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_control_api/group"/>
-</component>
-<component name="download_mgr_client_api" long-name="Download Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_client_api/group"/>
-</component>
-<component name="download_mgr_ui_api" long-name="Download Manager UI Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_ui_api/group"/>
-</component>
-<component name="favourites_engine_api" long-name="Favourites Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/favourites_engine_api/group"/>
-</component>
-<component name="browser_plugin_api" long-name="Browser Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_plugin_api/group"/>
-</component>
-<component name="settings_api" long-name="Settings API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/settings_api/group"/>
-</component>
-</collection>
-<collection name="web_plat" long-name="Web Platform Interfaces" level="specific">
-<component name="aiw_browser_provider_api" long-name="AIW Browser Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/aiw_browser_provider_api/group"/>
-</component>
-<component name="browser_dialogs_provider_api" long-name="Browser Dialogs Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_dialogs_provider_api/group"/>
-</component>
-<component name="browser_platform_api" long-name="Browser Platform API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_platform_api/group"/>
-</component>
-<component name="cod_handler_api" long-name="COD Handler API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cod_handler_api/group"/>
-</component>
-<component name="connection_manager_api" long-name="Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/connection_manager_api/group"/>
-</component>
-<component name="cxml_library_api" long-name="cXml Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cxml_library_api/group"/>
-</component>
-<component name="download_mgr_client_api_extn" long-name="Download Manager Client API Extension" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/download_mgr_client_api_extn/group"/>
-</component>
-<component name="feeds_engine_api" long-name="Feeds Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/feeds_engine_api/group"/>
-</component>
-<component name="launcher_api" long-name="Launcher API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/launcher_api/group"/>
-</component>
-<component name="multipart_parser_api" long-name="Multipart Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/multipart_parser_api/group"/>
-</component>
-<component name="recent_url_store_api" long-name="Recent URL Store API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/recent_url_store_api/group"/>
-</component>
-<component name="scheme_handler_plugin_api" long-name="Scheme Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scheme_handler_plugin_api/group"/>
-</component>
-<component name="scriptable_plugin_api" long-name="Scriptable Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scriptable_plugin_api/group"/>
-</component>
-<component name="webutils_api" long-name="Web Utils API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/webutils_api/group"/>
-</component>
-<component name="widget_registry_api" long-name="Widget Registry API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/widget_registry_api/group"/>
-</component>
-<component name="xml_parser_api" long-name="XML Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/xml_parser_api/group"/>
-</component>
-<component name="stmgesturefw_api" long-name="State Machine Gesture Framework API " filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/stmgesturefw_api/group"/>
-</component>
-</collection>
-<collection name="web_info" long-name="Web Info" level="specific">
-<component name="web_build" filter="s60" long-name="Web Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/group"/>
-</component>
-</collection>
-<collection name="browserutilities" long-name="Browser Utilities" level="utils">
-<component name="browserdialogsprovider" filter="s60" long-name="Browser Dialogs Provider">
-<unit bldFile="mw/web/browserutilities/browserdialogsprovider/group"/>
-</component>
-<component name="recenturlstore" filter="s60" long-name="Recent URL Store">
-<unit bldFile="mw/web/browserutilities/recenturlstore/group"/>
-</component>
-<component name="xmlparser" filter="s60" long-name="XML Interface">
-<unit bldFile="mw/web/browserutilities/xmlparser/group"/>
-</component>
-<component name="cxmllibrary" filter="s60" long-name="XML Parser Implementation">
-<unit bldFile="mw/web/browserutilities/cxmllibrary/group"/>
-</component>
-<component name="downloadmgr" filter="s60" long-name="Download Manager">
-<unit bldFile="mw/web/browserutilities/downloadmgr/group"/>
-</component>
-<component name="connectionmanager" filter="s60" long-name="Connection Manager">
-<unit bldFile="mw/web/browserutilities/connectionmanager/group"/>
-</component>
-<component name="browsertelservice" filter="s60" long-name="Browser Telephony Service">
-<unit bldFile="mw/web/browserutilities/browsertelservice/group"/>
-</component>
-<component name="favouritesengine" filter="s60" long-name="Favourites Engine">
-<unit bldFile="mw/web/browserutilities/favouritesengine/group"/>
-</component>
-<component name="feedsengine" filter="s60" long-name="Feeds Engine">
-<unit bldFile="mw/web/browserutilities/feedsengine/group"/>
-</component>
-<component name="multipartparser" filter="s60" long-name="Multipart Parser">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
-<!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
-</component>
-<component name="schemehandler" filter="s60" long-name="Scheme Handler">
-<unit bldFile="mw/web/browserutilities/schemehandler/group"/>
-</component>
-<component name="webutils" filter="s60" long-name="Web Utils">
-<unit bldFile="mw/web/browserutilities/webutils/group"/>
-</component>
-<component name="aiwbrowserprovider" filter="s60" long-name="AIW Browser Provider" plugin="Y">
-<unit bldFile="mw/web/browserutilities/aiwbrowserprovider/group"/>
-</component>
-<component name="browserutilities_build" filter="s60" long-name="Browser Utilities Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/browserutilities/group"/>
-</component>
-</collection>
-<collection name="webengine" long-name="Web Engine" level="server">
-<component name="osswebengine" filter="s60" long-name="OSS Web Engine">
-<!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
-<unit bldFile="mw/web/webengine/osswebengine/cache/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/memorymanager/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/npscript/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group/javascriptcore"/>
-</component>
-<component name="webkitutils" filter="s60" long-name="WebKit Utils">
-<unit bldFile="mw/web/webengine/webkitutils/group"/>
-</component>
-<component name="pagescaler" filter="s60" long-name="Page Scaler">
-<unit bldFile="mw/web/webengine/pagescaler/group"/>
-</component>
-<component name="webwidgetinstaller" filter="s60" long-name="Widget Installer">
-<unit bldFile="mw/web/webengine/widgetinstaller/group"/>
-</component>
-<component name="widgetregistry" filter="s60" long-name="Widget Registry">
-<unit bldFile="mw/web/webengine/widgetregistry/group"/>
-</component>
-<component name="wmlengine" filter="s60" long-name="WML Engine">
-<unit bldFile="mw/web/webengine/wmlengine/group"/>
-</component>
-<component name="device" filter="s60" long-name="Device">
-<!-- this needs a more meaningful name -->
-<unit bldFile="mw/web/webengine/device/group"/>
-</component>
-<component name="widgetengine" filter="s60" long-name="Widget Engine">
-<unit bldFile="mw/web/webengine/widgetengine/group"/>
-</component>
-<component name="web_memoryplugin" long-name="Memory Plugin" filter="s60" plugin="Y">
-<unit bldFile="mw/web/webengine/memoryplugin/group"/>
-</component>
-<component name="widgetmemoryplugin" filter="s60" long-name="Widget Memory Plugin" plugin="Y">
-<unit bldFile="mw/web/webengine/widgetmemoryplugin/group"/>
-</component>
-<component name="widgetbackuprestore" filter="s60" long-name="Widget Backup and Restore">
-<unit bldFile="mw/web/webengine/widgetbackuprestore/group"/>
-</component>
-<component name="browserrecognizers" filter="s60" long-name="Browser Recognizers" plugin="Y">
-<unit bldFile="mw/web/webengine/browserrecognizers/group"/>
-</component>
-<component name="wrtharvester" filter="s60" long-name="Web Runtime Harvester" plugin="Y">
-<unit bldFile="mw/web/webengine/wrtharvester/group"/>
-</component>
-</collection>
-<collection name="codhandler" long-name="Content Object Descriptor Handler" level="specific">
-<component name="codeng" filter="s60" long-name="COD Engine">
-<unit bldFile="mw/web/codhandler/codeng/group"/>
-</component>
-<component name="codui" filter="s60" long-name="COD UI">
-<unit bldFile="mw/web/codhandler/codui/group"/>
-</component>
-<component name="codrecog" filter="s60" long-name="COD Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/codrecog/group"/>
-</component>
-<component name="codviewer" filter="s60" long-name="COD Viewer">
-<unit bldFile="mw/web/codhandler/codviewer/group"/>
-</component>
-<component name="ddrecog" filter="s60" long-name="Download Descriptor Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/ddrecog/group"/>
-</component>
-<component name="ddviewer" filter="s60" long-name="Download Descriptor Viewer">
-<unit bldFile="mw/web/codhandler/ddviewer/group"/>
-</component>
-<component name="coddownload" filter="s60" long-name="COD Download">
-<unit bldFile="mw/web/codhandler/coddownload/group"/>
-</component>
-<component name="roapapp" filter="s60" long-name="ROAP Application">
-<unit bldFile="mw/web/codhandler/roapapp/group"/>
-</component>
-<component name="codhandler_build" filter="s60" long-name="COD Handler Build">
-<!-- Exports need to go into another component or make this self-contained.
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/codhandler/group"/>
-</component>
-</collection>
-<collection name="widgets" long-name="Web Widget Framework" level="generic">
-<!-- the following units can be uncommented when configuration is put in place -->
-<component name="widgetrecognizer" filter="s60" long-name="Widget Recognizer" plugin="Y">
-<!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
-</component>
-<component name="widgetinstaller" filter="s60" long-name="Widget Installer UI" plugin="Y">
-<!--<unit bldFile="widgets/widgetinstaller/group"/>-->
-</component>
-<component name="widgetlauncher" filter="s60" long-name="Widget Launcher">
-<!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
-</component>
-<component name="widgetapp" filter="s60" long-name="Widget UI">
-<!--<unit bldFile="widgets/widgetapp/group"/>-->
-</component>
-<component name="widgetsidchecker" filter="s60" long-name="Widget SID Checker" introduced="^3">
-<!--<unit bldFile="widgets/widgetsidchecker/group"/>-->
-</component>
-<component name="widgetpreinstaller" filter="s60" long-name="Widget Pre-Installer">
-<!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
-</component>
-<component name="widgetstartup" filter="s60" long-name="Widget Startup">
-<!--<unit bldFile="widgets/widgetstartup/group"/>-->
-</component>
-<component name="widgets_build" filter="s60" long-name="Widgets Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/widgets/group"/>
-</component>
-</collection>
-</block>
-<block name="websrv" level="generic" long-name="Web Services" levels="plugin framework server generic specific">
-<collection name="websrv_pub" long-name="Web Services Public Interfaces" level="specific">
-<component name="web_service_description_api" long-name="Web Service Description API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_description_api/group"/>
-</component>
-<component name="web_service_connection_api" long-name="Web Service Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/group"/>
-</component>
-<component name="web_service_manager_api" long-name="Web Service Manager API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/group"/>
-</component>
-<component name="hostlet_connection_api" long-name="Hostlet Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/group"/>
-</component>
-<component name="web_service_messaging_api" long-name="Web Service Messaging API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/group"/>
-</component>
-<component name="xml_extensions_api" long-name="XML Extensions API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/group"/>
-</component>
-<component name="xml_fragment_api" long-name="XML Fragment API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/group"/>
-</component>
-</collection>
-<collection name="webservices" long-name="Web Services Framework" level="generic">
-<!-- consider breaking this collection into more meaningful subsets -->
-<component name="wsnotifierplugins" filter="s60" long-name="WS Notifier Plugins" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsnotifierplugins/group"/>
-</component>
-<component name="wslogger" filter="s60" long-name="WS Logger">
-<unit bldFile="mw/websrv/webservices/wslogger/group"/>
-</component>
-<component name="wsxml" filter="s60" long-name="WS XML Extensions">
-<unit bldFile="mw/websrv/webservices/wsxml/group"/>
-</component>
-<component name="wsutils" filter="s60" long-name="WS Utils">
-<unit bldFile="mw/websrv/webservices/wsutils/group"/>
-</component>
-<component name="wsfragment" filter="s60" long-name="WS Fragment">
-<unit bldFile="mw/websrv/webservices/wsfragment/group"/>
-</component>
-<component name="wsdescription" filter="s60" long-name="WS Service Description">
-<unit bldFile="mw/websrv/webservices/wsdescription/group"/>
-</component>
-<component name="wsconnection" filter="s60" long-name="WS Service Connection">
-<unit bldFile="mw/websrv/webservices/wsconnection/group"/>
-</component>
-<component name="wsmessages" filter="s60" long-name="WS Messages">
-<unit bldFile="mw/websrv/webservices/wsmessages/group"/>
-</component>
-<component name="wscredentialmanager" filter="s60" long-name="WS Credential Manager">
-<unit bldFile="mw/websrv/webservices/wscredentialmanager/group"/>
-</component>
-<component name="wsframework" filter="s60" long-name="WS Framework">
-<unit bldFile="mw/websrv/webservices/wsframework/group"/>
-</component>
-<component name="wshttpchanneltransportplugin" filter="s60" long-name="WS HTTP Channel Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshttpchanneltransportplugin/group"/>
-</component>
-<component name="wsconnectionagent" filter="s60" long-name="WS Connection Agent">
-<unit bldFile="mw/websrv/webservices/wsconnectionagent/group"/>
-</component>
-<component name="wsprovider" filter="s60" long-name="WS Provider">
-<unit bldFile="mw/websrv/webservices/wsprovider/group"/>
-</component>
-<component name="wshostletconnection" filter="s60" long-name="WS Hostlet Connection">
-<unit bldFile="mw/websrv/webservices/wshostletconnection/group"/>
-</component>
-<component name="wsmanager" filter="s60" long-name="WS Service Manager">
-<unit bldFile="mw/websrv/webservices/wsmanager/group"/>
-</component>
-<component name="wsidentitymanager" filter="s60" long-name="WS Identity Manager">
-<unit bldFile="mw/websrv/webservices/wsidentitymanager/group"/>
-</component>
-<component name="idwsfplugin" filter="s60" long-name="ID-WSF Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/idwsfplugin/group"/>
-</component>
-<component name="wsibasicplugin" filter="s60" long-name="WS-I Basic Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsibasicplugin/group"/>
-</component>
-<component name="wsrestplugin" filter="s60" long-name="WS REST Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsrestplugin/group"/>
-</component>
-<component name="idwsfsecuritymechanism" filter="s60" long-name="ID-WSF Security Mechanism">
-<unit bldFile="mw/websrv/webservices/idwsfsecuritymechanism/group"/>
-</component>
-<component name="wspasswordtransforms" filter="s60" long-name="WS Password Transforms">
-<unit bldFile="mw/websrv/webservices/wspasswordtransforms/group"/>
-</component>
-<component name="wscore" filter="s60" long-name="WS Core Service Manager">
-<unit bldFile="mw/websrv/webservices/wscore/group"/>
-</component>
-<component name="wslocaltransportplugin" filter="s60" long-name="WS Local Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wslocaltransportplugin/group"/>
-</component>
-<component name="wshostlettransportplugin" filter="s60" long-name="WS Hostlet Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshostlettransportplugin/group"/>
-</component>
-<component name="wsstar" filter="s60" long-name="WS Star">
-<!-- can only have one unit. Need to split into separate components or #include from a single bld.inf -->
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarpolicy/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarplugin/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarmessagehandlers/group"/>
-</component>
-<component name="wsoviplugin" filter="s60" long-name="WS Ovi Plugin">
-<unit bldFile="mw/websrv/webservices/wsoviplugin/group"/>
-</component>
-<component name="webservices_build" filter="s60" long-name="Web Services Build">
-<!-- need to split into self-contained components -->
-<unit bldFile="mw/websrv/webservices/group"/>
-</component>
-</collection>
-<collection name="websrv_info" long-name="Web Services Info" level="specific">
-<component name="websrv_bld" filter="s60" long-name="Web Services Build">
-<!-- need to include common .hrh in each unit -->
-<unit bldFile="mw/websrv/group"/>
-</component>
-</collection>
-</block>
-<block name="platformtools" level="generic" long-name="Platform Tools">
-<collection name="gfxconversion" long-name="Graphics Conversion">
-<component name="bmconv_s60" filter="s60" long-name="S60 Bitmap Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/bmconv_s60/group"/>
-</component>
-<component name="mifconv" filter="s60" long-name="Multi Icon File Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/mifconv/group"/>
-</component>
-</collection>
-</block>
-<block name="uitools" level="specific" long-name="UI Tools" levels="compile encode tool if">
-<collection name="uitools_pub" long-name="UI Tools Public Interfaces" level="if">
-<component name="third_party_bitmap_palette_api" long-name="Third Party Bitmap Palette API" filter="s60" class="api">
-<unit bldFile="mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
-</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">
-<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">
-<unit bldFile="mw/uitools/uitools_plat/layout_system_private_api/group"/>
-</component>
-</collection>
-<collection name="cdlcompilertoolkit" long-name="CDL Compiler Toolkit" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompilertoolkit_build" filter="s60" long-name="CDL Compiler Toolkit Build">
-<unit bldFile="mw/uitools/cdlcompilertoolkit/group"/>
-</component>
-</collection>
-<collection name="cdlcompiler" long-name="CDL Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompiler_build" filter="s60" long-name="CDL Compiler Build">
-<unit bldFile="mw/uitools/cdlcompiler/group"/>
-</component>
-</collection>
-<collection name="gfxtools" long-name="Graphics Tools" level="tool">
-<component name="gditools" filter="s60" long-name="GDI Tools" class="PC">
-<unit bldFile="mw/uitools/gfxtools/gditools/group"/>
-</component>
-<component name="color" filter="s60" long-name="Bitmap Colour Palette" class="PC">
-<unit bldFile="mw/uitools/gfxtools/color/group"/>
-</component>
-</collection>
-<collection name="aknlayoutcompiler" long-name="Avkon Layout Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="aknlayoutcompiler_build" filter="s60" long-name="Avkon Layout Compiler Build">
-<unit bldFile="mw/uitools/aknlayoutcompiler/group"/>
-</component>
-</collection>
-<collection name="skincompiler" long-name="Skin Compiler" level="compile">
-<component name="aknskindesccompiler" filter="s60" long-name="Avkon Skin Descriptor Compiler">
-<unit bldFile="mw/uitools/skincompiler/AknSkinDescCompiler/group"/>
-</component>
-</collection>
-<collection name="reszip" long-name="Resource Zip" level="encode">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="reszip_build" filter="s60" long-name="Resource Zip Build">
-<unit bldFile="mw/uitools/reszip/group"/>
-</component>
-</collection>
-<collection name="toollibraries" long-name="Tool Libraries" level="tool"/>
-<collection name="svgtencoder" long-name="SVGT Encoder" level="encode">
-<component name="svgtenc" filter="s60" long-name="Standalone SVGT Encoder" class="PC">
-<unit bldFile="mw/uitools/svgtencoder/svgtenc/standalone/group"/>
-</component>
-</collection>
-</block>
-</layer>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="location" level="apps" long-name="Location Apps" levels="ui events loc api">
-<collection name="loc_plat" long-name="Location Apps Platform Interfaces" level="api">
-<component name="location_picker_service_api" long-name="Location Picker Service API" introduced="^4" filter="s60" class="api">
-<unit bldFile="app/location/loc_plat" proFile="location_plat.pro"/>
-</component>
-</collection>
-<collection name="locationpickerservice" long-name="Location Picker Service" level="loc">
-<!--collection is really a component. Should move down a directory -->
-<component name="locationpickerservice_build" filter="s60" long-name="Location Picker Service Build" introduced="^4">
-<unit bldFile="app/location/locationpickerservice" proFile="locationpickerservice.pro"/>
-</component>
-</collection>
-</block>
-<!-- pending removal -->
-<block name="mmsharinguis" level="services" long-name="Multimedia Sharing UIs" levels="base plugin if">
-<collection name="mmsharinguis_plat" long-name="Multimedia Sharing UIs Platform Interfaces" level="if">
-<component name="multimedia_sharing_settings_api" long-name="Multimedia Sharing Settings API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_settings_api/group"/>
-</component>
-<component name="multimedia_sharing_resource_api" long-name="Multimedia Sharing Resource API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_resource_api/group"/>
-</component>
-<component name="multimedia_sharing_manager_api" long-name="Multimedia Sharing Manager API" filter="s60" class="api">
-<unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/group"/>
-</component>
-</collection>
-<collection name="mmsharing" long-name="Multimedia Sharing" level="base">
-<component name="mmshavailability" filter="s60" long-name="Multimedia Sharing Availability">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshavailability/group"/>
-</component>
-<component name="mmshindicator" filter="s60" long-name="Multimedia Sharing Indicator">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshindicator/group"/>
-</component>
-<!-- consider putting client and server in the same component -->
-<component name="mmshmanagercli" filter="s60" long-name="Multimedia Sharing Manager Client">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshmanagercli/group" filter="!test"/>
-</component>
-<component name="mmshmanagersrv" filter="s60" long-name="Multimedia Sharing Manager Server">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshmanagersrv/group"/>
-</component>
-<component name="mmshengine" filter="s60" long-name="Multimedia Sharing Engine">
-<unit bldFile="app/mmsharinguis/mmsharing/mmshengine/group"/>
-</component>
-<component name="mmshui" filter="s60" long-name="Multimedia Sharing UI">
-<!-- can only have one unit: need to #include one from the other if it's needed -->
-<unit bldFile="app/mmsharinguis/mmsharing/mmshui/group"/>
-<unit bldFile="app/mmsharinguis/mmsharing/mmshui/help/group"/>
-</component>
-<component name="mmsharing_build" filter="s60" long-name="MM Sharing Build">
-<unit bldFile="app/mmsharinguis/mmsharing/group"/>
-</component>
-</collection>
-<collection name="mmshplugins" long-name="Multimedia Sharing Plugins" level="plugin">
-<component name="mmshaoplugin" filter="s60" long-name="Multimedia Sharing Always Online Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshaoplugin/group"/>
-</component>
-<component name="mmshaiwplugin" filter="s60" long-name="Multimedia Sharing AIW Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshaiwplugin/group"/>
-</component>
-<component name="mmshsipcrplugin" filter="s60" long-name="Multimedia Sharing SIP Client Resolver Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshsipcrplugin/group"/>
-</component>
-<component name="mmshsettingsuiplugin" filter="s60" long-name="Multimedia Sharing Settings UI Plugin" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshsettingsuiplugin/group"/>
-</component>
-<component name="mmshwpadapterplugin" filter="s60" long-name="Multimedia Sharing WAP Provisioning Adapter" plugin="Y">
-<unit bldFile="app/mmsharinguis/mmshplugins/mmshwpadapterplugin/group"/>
-</component>
-</collection>
-<collection name="mmsharinguis_info" long-name="Multimedia Sharing UIs Info" level="if">
-<component name="mmsharinguis_build" filter="s60" long-name="Multimedia Sharing UIs Build">
-<!-- consider distributing to other components -->
-<unit bldFile="app/mmsharinguis/group"/>
-</component>
-</collection>
-</block>
-<block name="phone" level="apps" span="2" long-name="Phone Apps" levels="engine plugin ui app">
-<collection name="phoneapp" long-name="Phone Application" level="app">
-<component name="blacklist" filter="s60" long-name="Phone Blacklist Clearing" plugin="Y">
-<unit bldFile="app/phone/phoneapp/blacklist/group"/>
-</component>
-<component name="phoneuicontrol" filter="s60" long-name="Phone UI Control">
-<unit bldFile="app/phone/phoneapp/phoneuicontrol/group"/>
-</component>
-<component name="phoneuistates" filter="s60" long-name="Phone UI States">
-<unit bldFile="app/phone/phoneapp/phoneuistates/group"/>
-</component>
-<component name="phoneuiutils" filter="s60" long-name="Phone UI Utils">
-<unit bldFile="app/phone/phoneapp/phoneuiutils/group"/>
-</component>
-<component name="silenceactionplugin" filter="s60" long-name="Silence Action Plugin" plugin="Y">
-<unit bldFile="app/phone/phoneapp/silenceactionplugin/group"/>
-</component>
-<component name="phonemediatorcenter" filter="s60" long-name="Phone Mediator Center">
-<unit bldFile="app/phone/phoneapp/phonemediatorcenter/group"/>
-</component>
-<component name="phoneuiview2" filter="s60" long-name="Phone UI View">
-<unit bldFile="app/phone/phoneapp/phoneuiview2" proFile="phoneuiview2.pro"/>
-</component>
-<component name="phoneuiqtviewadapter" filter="s60" long-name="Phone UI Qt View Adapter" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneapp/phoneuiqtviewadapter" proFile="phoneuiqtviewadapter.pro"/>
-</component>
-<component name="phonestringloader" filter="s60" long-name="Phone String Loader" introduced="^4">
-<unit bldFile="app/phone/phoneapp/phonestringloader" proFile="phonestringloader.pro"/>
-</component>
-<component name="phoneui2" filter="s60" long-name="Phone UI">
-<unit bldFile="app/phone/phoneapp/phoneui2" proFile="phoneui2.pro"/>
-</component>
-</collection>
-<collection name="phoneengine" long-name="Phone Engine" level="engine">
-<component name="phonecntfinder2" filter="s60" long-name="Phone Contact Finder">
-<unit bldFile="app/phone/phoneengine/phonecntfinder2" proFile="phonecntfinder2.pro"/>
-</component>
-<component name="audiohandling" filter="s60" long-name="Phone Audio Handling">
-<unit bldFile="app/phone/phoneengine/audiohandling/group"/>
-</component>
-<component name="callhandling" filter="s60" long-name="Call Handling">
-<unit bldFile="app/phone/phoneengine/callhandling/group"/>
-</component>
-<component name="contacthandling2" filter="s60" long-name="Phone Contact Handling">
-<unit bldFile="app/phone/phoneengine/contacthandling2/group"/>
-</component>
-<component name="loghandling" filter="s60" long-name="Phone Log Handling">
-<unit bldFile="app/phone/phoneengine/loghandling/group"/>
-</component>
-<component name="engineinfo" filter="s60" long-name="Phone Engine Info">
-<unit bldFile="app/phone/phoneengine/engineinfo/group"/>
-</component>
-<component name="phonemodel" filter="s60" long-name="Phone Model">
-<unit bldFile="app/phone/phoneengine/phonemodel" proFile="phonemodel.pro"/>
-</component>
-<component name="servicehandling" filter="s60" long-name="Phone Service Handling">
-<unit bldFile="app/phone/phoneengine/servicehandling/group"/>
-</component>
-<component name="phoneservices" filter="s60" long-name="Phone Server" introduced="^4">
-<unit bldFile="app/phone/phoneengine/phoneservices" proFile="phoneservices.pro"/>
-</component>
-<component name="parserrecognizer" filter="s60" long-name="Parser Recognizer" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneengine/parserrecognizer" proFile="parserrecognizer.pro"/>
-</component>
-</collection>
-<collection name="phoneuis" long-name="Phone UIs" level="ui">
-<component name="bubblemanager2" filter="s60" long-name="Phone Bubble Manager">
-<unit bldFile="app/phone/phoneuis/bubblemanager2" proFile="bubblemanager2.pro"/>
-</component>
-<component name="telephonydevicemode" filter="s60" long-name="Telephony Device Mode">
-<unit bldFile="app/phone/phoneuis/telephonydevicemode/group"/>
-</component>
-</collection>
-<collection name="phone_plat" long-name="Phone Apps Platform Interfaces" level="app">
-<component name="3d_ringing_tone_enabler_api" long-name="3D Ringing Tone Enabler API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
-</component>
-<component name="telephony_comms_information_api" long-name="Telephony Comms Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_comms_information_api/group"/>
-</component>
-<component name="telephony_information_api" long-name="Telephony Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_information_api/group"/>
-</component>
-<component name="telephony_device_mode_api" long-name="Telephony Device Mode API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_device_mode_api/group"/>
-</component>
-<component name="telephony_remote_party_information_api" long-name="Telephony Remote Party Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_remote_party_information_api/group"/>
-</component>
-<component name="telephony_video_mailbox_settings_api" long-name="Telephony Video Mailbox Settings API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_video_mailbox_settings_api/group"/>
-</component>
-<component name="telephony_microphone_mute_status_api" long-name="Telephony Microphone Mute Status API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_microphone_mute_status_api/group"/>
-</component>
-<component name="telephony_logging_extension_api" long-name="Telephony Logging Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_logging_extension_api/group"/>
-</component>
-<component name="telephony_matching_extension_api" long-name="Telephony Matching Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_matching_extension_api/group"/>
-</component>
-<component name="phone_application_commands_api" long-name="Phone Application Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_commands_api/group"/>
-</component>
-<component name="phone_application_voip_commands_api" long-name="Phone Application VOIP Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_voip_commands_api/group"/>
-</component>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_mediator_api/group"/>
-</component>
-<component name="video_telephony_mediator_api" long-name="Video Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/video_telephony_mediator_api/group"/>
-</component>
-<component name="video_telephony_control_mediator_api" long-name="Video Telephony Control Mediator API" filter="s60" introduced="^4" class="api">
-<unit bldFile="app/phone/phone_plat/video_telephony_control_mediator_api/group"/>
-</component>
-</collection>
-<collection name="phoneplugins" long-name="Phone Plugins" level="plugin">
-<component name="csplugin" filter="s60" long-name="Circuit Switched Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/csplugin/group"/>
-</component>
-<component name="hsdialerwidgetplugin" filter="s60" long-name="Home Screen Dialer Widget Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/hsdialerwidgetplugin" proFile="hsdialerwidgetplugin.pro"/>
-</component>
-<component name="infowidgetplugin" filter="s60" long-name="Info Widget Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/infowidgetplugin" proFile=""/>
-</component>
-</collection>
-<collection name="phonesettings" long-name="Phone Settings" level="plugin">
-<component name="cpphonesettingsplugins" filter="s60" long-name="CP Phone Settings Plugins" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phonesettings/cpphonesettingsplugins" proFile="cpphonesettingsplugins.pro"/>
-</component>
-</collection>
-</block>
-<block name="videotelephony" level="apps" long-name="Video Telephony Apps" levels="engine plugin prot ui">
-<collection name="videotelephony_plat" long-name="VT Apps Platform Interfaces" level="ui">
-<component name="video_telephony_control_mediator_api" long-name="Video Telephony Control Mediator API" filter="s60" class="api">
-<unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_control_mediator_api/group"/>
-</component>
-<component name="video_telephony_media_configuration_api" long-name="Video Telephony Media Configuration API" filter="s60" class="api">
-<unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_media_configuration_api/group"/>
-</component>
-</collection>
-<collection name="vtengines" long-name="Video Telephony Engines" level="engine">
-<component name="videoteleng" filter="s60" long-name="Video Telephony Engine">
-<unit bldFile="app/videotelephony/vtengines/videoteleng/Group"/>
-</component>
-<component name="vtmediatorplugin" filter="s60" long-name="VT Mediator Plugin" plugin="Y">
-<unit bldFile="app/videotelephony/vtengines/vtmediatorplugin/group"/>
-</component>
-</collection>
-<collection name="vtuis" long-name="Video Telephony UIs" level="ui">
-<component name="videotelui" filter="s60" long-name="Video Telephony UI">
-<unit bldFile="app/videotelephony/vtuis/videotelui/group"/>
-</component>
-</collection>
-<collection name="vtprotocolplugins" long-name="VT Protocol Plugins" level="plugin">
-<component name="displaysink" filter="s60" long-name="Display Sink" introduced="^2">
-<unit bldFile="app/videotelephony/vtprotocolplugins/DisplaySink/group"/>
-</component>
-<component name="videosource" filter="s60" long-name="Video Source" introduced="^2">
-<unit bldFile="app/videotelephony/vtprotocolplugins/VideoSource/group"/>
-</component>
-</collection>
-<collection name="vtprotocolsstub" long-name="VT Protocols Stub" level="prot">
-<!-- this collection is really a component, move down a directory -->
-<component name="videotelproto" filter="s60" long-name="Video Telephony Protocol">
-<unit bldFile="app/videotelephony/vtprotocolsstub/group" filter="sf_build"/>
-</component>
-</collection>
-</block>
-<block name="settingsuis" level="services" long-name="Settings UIs" levels="plugin ui">
-<collection name="controlpanelplugins" long-name="Control Panel Plugins" level="plugin">
-<component name="themeplugin" filter="s60" long-name="Theme Plugin" introduced="^4">
-<unit bldFile="app/settingsuis/controlpanelplugins/themeplugin" proFile="themeplugin.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-<collection name="controlpanelui" long-name="Control Panel UI" level="ui">
-<!-- collection is really a component, move down a dir -->
-<component name="controlpanelui_build" filter="s60" long-name="Control Panel UI Build" introduced="^4">
-<unit bldFile="app/settingsuis/controlpanelui" proFile="controlpanelui.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-</block>
-<block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin framework app">
-<collection name="contentctrl_plat" long-name="Content Control Daemons Platforn Interfaces" level="app">
-<component name="ds_contactsdatastoreextension_api" long-name="Adapter Customization API" filter="s60" introduced="^4" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_contactsdatastoreextension_api/group"/>
-</component>
-<component name="ds_data_modification_api" long-name="DS Data Modification API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_data_modification_api/group"/>
-</component>
-</collection>
-<collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
-<component name="secon" filter="s60" long-name="Service Controllers">
-<unit bldFile="app/contentcontrol/connectivitymodules/secon/group"/>
-</component>
-</collection>
-<collection name="dsdcmoadapter" long-name="Data Sync DCMO Adapter" level="plugin">
-<!-- Component at wrong rank, should move down a directory -->
-<component name="dsdcmoadapter_build" filter="s60" long-name="Data Sync Control DCMO Adapter">
-<unit bldFile="app/contentcontrol/dsdcmoadapter/group"/>
-</component>
-</collection>
-<collection name="omads" long-name="OMA Data Sync" level="app">
-<component name="omads_build" filter="s60" long-name="OMA DS Build">
-<unit bldFile="app/contentcontrol/omads/group"/>
-<!-- need to remove #include and rename and OMA DS ROM -->
-</component>
-<component name="omadsextensions" filter="s60" long-name="OMA DS Extensions" plugin="Y">
-<unit bldFile="app/contentcontrol/omads/omadsextensions/group"/>
-</component>
-<component name="omadsextensions" filter="s60" long-name="OMA DS Qt Extensions" plugin="Y">
-<unit bldFile="app/contentcontrol/omads/omadsextensions" proFile="omadsextensions.pro"/>
-</component>
-</collection>
-</block>
-<block name="firsttimeuse" level="apps" long-name="First Time Use" levels="support services ui app">
-<!-- these empty collections are really components. Move down a directory and supply units -->
-<collection name="ftuapplication" long-name="First Time Use Application" level="app"/>
-<collection name="fturuntimeservices" long-name="First Time Use Runtime Services" level="services"/>
-<collection name="wizardproviders" long-name="Wizard Providers" level="support"/>
-<collection name="stateproviders" long-name="State Providers" level="support"/>
-<collection name="runtimeproviders" long-name="Runtime Providers" level="support"/>
-<collection name="firsttimeuse_info" long-name="First Time Use Info" level="ui">
-<component name="firsttimeuse_build" long-name="First Time Use Build">
-<unit bldFile="app/firsttimeuse" proFile="ftu.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-</block>
-<block name="devicecontrol" level="services" long-name="Device Control Daemons" levels="oma mid app">
-<collection name="deviceupdatesui" long-name="Device Updates UI" level="app">
-<component name="deviceupdatesui_adapters" long-name="Device Updates Adapters" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/devicecontrol/deviceupdatesui/adapters/bld"/>
-</component>
-<component name="deviceupdates" long-name="Device Updates" filter="s60" introduced="^4">
-<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdates" proFile="deviceupdates.pro"/>
-</component>
-<component name="deviceupdatesplugin" long-name="Device Updates Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdatesplugin" proFile="deviceupdatesplugin.pro"/>
-</component>
-<component name="deviceupdatesqtsp" long-name="Device Updates Qt Service Provider" filter="s60" introduced="^4">
-<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdatesqtsp" proFile="deviceupdatesqtsp.pro"/>
-</component>
-<component name="cpqtsp" long-name="Client Provisioning Qt Service Provider" filter="s60" introduced="^4">
-<unit bldFile="app/devicecontrol/deviceupdatesui/cpqtsp" proFile="cpqtsp.pro"/>
-</component>
-<component name="devicemanagementnotifiersplugin" long-name="Device Management Notifiers Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/devicecontrol/deviceupdatesui/devicemanagementnotifiersplugin" proFile="devicemanagementnotifiersplugin.pro"/>
-</component>
-</collection>
-</block>
-<block name="printing" level="services" long-name="Printing"/>
-<block name="files" level="apps" long-name="File Manager Apps" levels="support apps">
-<collection name="filemanager" long-name="File Manager" level="apps">
-<component name="filemanager_plat" long-name="File Manager Platform Interfaces" filter="s60" introduced="^4" class="api"/>
-<component name="fmbkupengine" filter="s60" long-name="File Manager Backup Engine" introduced="^4">
-<unit bldFile="app/files/filemanager/src/fmbkupengine/group"/>
-</component>
-<component name="filemanager_build" filter="s60" long-name="File Manager Build">
-<!-- break this up into components or move down a directory -->
-<unit bldFile="app/files/filemanager" proFile="filemanager.pro"/>
-</component>
-</collection>
-</block>
-<block name="search" level="apps" long-name="Search Apps" levels="eng base app api">
-<collection name="search_info" long-name="Search Info">
-<component name="search_build" long-name="Search Build">
-<unit bldFile="app/search/group"/>
-</component>
-</collection>
-<collection name="searchui" long-name="Search UI">
-<component name="searchui_build" long-name="Search UI Build">
-<unit bldFile="app/search/searchui" proFile="searchui.pro"/>
-</component>
-</collection>
-</block>
-<block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
-<collection name="contacts_plat" long-name="Contacts Apps Platform Interfaces" level="ui">
-<component name="logs_engine_api" long-name="Logs Engine API" filter="s60" introduced="^4" class="api"/>
-<component name="logs_engine_api_extensions" long-name="Logs Engine API Extensions" filter="s60" class="api"/>
-<component name="logs_services_api" long-name="Logs Services API" filter="s60" introduced="^4" class="api"/>
-<component name="logs_timers_api" long-name="Logs Timers API" filter="s60" class="api"/>
-<component name="qt_mobility_contacts_api" long-name="Qt Mobility Contacts API" filter="s60" introduced="^4" class="api"/>
-</collection>
-<collection name="logsui" long-name="Logs UI" level="ui">
-<component name="logsui_build" filter="s60" long-name="Logs UI Build">
-<!-- component at too high a rank, should move down one directory -->
-<unit bldFile="app/contacts/logsui" proFile="logsui.pro"/>
-</component>
-</collection>
-<collection name="phonebookui" long-name="Phonebook UI" level="ui">
-<component name="mobhistorymodel" filter="s60" long-name="Mobile History Model" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/mobhistorymodel" qt:proFile="mobhistorymodel.pro"/> -->
-</component>
-<component name="pbkcommonui" filter="s60" long-name="Phonebook Common UI" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/pbkcommonui" qt:proFile="pbkcommonui.pro"/> -->
-</component>
-<component name="phonebookapp" filter="s60" long-name="Phonebook Application" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/phonebookapp" qt:proFile="phonebookapp.pro"/> -->
-</component>
-<component name="phonebookservices" filter="s60" long-name="Phonebook Services" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/phonebookservices" qt:proFile="phonebookservices.pro"/> -->
-</component>
-<component name="phonebookui_build" filter="s60" long-name="Phonebook UI Build" introduced="^4">
-<!-- break up into components -->
-<unit bldFile="app/contacts/phonebookui" proFile="phonebookui.pro"/>
-</component>
-</collection>
-<collection name="qtcontactsmobility" long-name="Qt Contacts Mobility" level="support">
-<component name="qtcontactsmobility_build" filter="s60" long-name="Qt Contacts Mobility Build" introduced="^4" plugin="Y">
-<!-- not really a component, move down a dir? Break up into compnents? -->
-<unit bldFile="app/contacts/qtcontactsmobility" proFile="qtcontactsmobility.pro"/>
-</component>
-</collection>
-<collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
-<component name="cntfindplugin" filter="s60" long-name="Contacts Find Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntfindplugin" proFile="cntfindplugin.pro"/>
-</component>
-<component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
-<unit bldFile="app/contacts/phonebookengines/contactsmodel/groupsql" mrp="app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
-</component>
-<component name="cntsortplugin" filter="s60" long-name="Contacts Sort Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntsortplugin" proFile="cntsortplugin.pro"/>
-</component>
-<component name="mobcntmodel" filter="s60" long-name="Mobile Contacts Model" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/mobcntmodel" proFile="mobcntmodel.pro"/>
-</component>
-<component name="mobcntactions" filter="s60" long-name="Mobile Contacts Actions" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/mobcntactions" proFile="mobcntactions.pro"/>
-</component>
-<component name="cntmaptileservice" filter="s60" long-name="Contacts Map Tile Service" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/cntmaptileservice" proFile="cntmaptileservice.pro"/>
-</component>
-<component name="simutility" filter="s60" long-name="SIM Utility" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/simutility" proFile="simutility.pro"/>
-</component>
-</collection>
-<collection name="pimprotocols" long-name="PIM Protocols" level="services">
-<component name="phonebooksync" long-name="Phonebook Sync" purpose="optional" plugin="Y">
-<unit bldFile="app/contacts/pimprotocols/phonebooksync/group" mrp="app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
-</component>
-<component name="pbap" long-name="Bluetooth PBAP" introduced="9.2" purpose="optional">
-<unit bldFile="app/contacts/pimprotocols/pbap/group" mrp="app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
-</component>
-</collection>
-<collection name="contacts_info" long-name="Contacts Apps Info" level="ui">
-<component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="organizer" level="apps" span="2" long-name="Organizer Application Suite" levels="support services engine ui app">
-<collection name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" level="app">
-<component name="calendar_interim_utils2_api" long-name="Calendar Interim Utils 2 API" filter="s60" class="api">
-<!-- move into own .pro file -->
-<unit bldFile="app/organizer/organizer_pub" proFile="organizer_pub.pro"/>
-</component>
-</collection>
-<collection name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" level="app">
-<component name="organizer_plat_build" long-name="Organizer Application Suite Platform Interface Build" filter="s60" class="api">
-<!-- break up into individual .pro files -->
-<unit bldFile="app/organizer/organizer_plat" proFile="organizer_plat.pro"/>
-</component>
-<component name="agenda_versit_2_api" long-name="Agenda Versit 2 API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="organizer_plat/agenda_versit_2_api/group"/>-->
-</component>
-<component name="calendar_exporter_api" long-name="Calendar Exporter API" filter="s60" class="api placeholder">
-<!--<unit bldFile="organizer_plat/calendar_exporter_api/group"/>-->
-</component>
-<component name="calendar_importer_api" long-name="Calendar Importer API" filter="s60" class="api placeholder">
-<!--<unit bldFile="organizer_plat/calendar_importer_api/group"/>-->
-</component>
-<component name="calendar_launcher_api" long-name="Calendar Launcher API" filter="s60" class="api placeholder">
-<!--<unit bldFile="organizer_plat/calendar_launcher_api/group"/> -->
-</component>
-<component name="agenda_interface_api" long-name="Agenda Interface API" filter="s60" introduced="^4" class="api"/>
-<component name="calendar_editor_api" long-name="Calendar Editor API" filter="s60" introduced="^4" class="api"/>
-<component name="notes_editor_api" long-name="Notes Editor API" filter="s60" introduced="^4" class="api"/>
-<component name="agenda_eventviewer_api" long-name="Agenda Event Viewer API" filter="s60" introduced="^4" class="api"/>
-</collection>
-<collection name="agendainterface" long-name="Agenda Interface" level="services">
-<!-- collection is really a component, should move down a directory -->
-<component name="agendainterface_build" filter="s60" long-name="Agenda Interface Build">
-<unit bldFile="app/organizer/agendainterface" proFile="agendainterface.pro"/>
-</component>
-</collection>
-<collection name="calendarui" long-name="Calendar UI" level="ui">
-<component name="commonutils" filter="s60" long-name="Calendar Common Utils">
-<unit bldFile="app/organizer/calendarui/commonutils" proFile="commonutils.pro"/>
-</component>
-<component name="calenlauncher" filter="s60" long-name="Calendar Launcher">
-<unit bldFile="app/organizer/calendarui/calenlauncher/group" proFile="calenlauncher.pro"/>
-</component>
-<component name="caleneditor" filter="s60" long-name="Calendar Editor" introduced="^4">
-<unit bldFile="app/organizer/calendarui/caleneditor" proFile="caleneditor.pro"/>
-</component>
-<component name="agendaeventviewer" filter="s60" long-name="Agenda Event Viewer" introduced="^4">
-<unit bldFile="app/organizer/calendarui/agendaeventviewer" proFile="agendaeventviewer.pro"/>
-</component>
-<component name="globaldata" filter="s60" long-name="Calendar Global Data">
-<unit bldFile="app/organizer/calendarui/globaldata" proFile="globaldata.pro"/>
-</component>
-<component name="settings" filter="s60" long-name="Calendar Settings">
-<unit bldFile="app/organizer/calendarui/settings" proFile="settings.pro"/>
-</component>
-<component name="calenplugins" filter="s60" long-name="Calendar Plugins" introduced="^4" plugin="Y">
-<unit bldFile="app/organizer/calendarui/calenplugins" proFile="calenplugins.pro"/>
-</component>
-<component name="customisationmanager" filter="s60" long-name="Calendar Customisation Manager">
-<unit bldFile="app/organizer/calendarui/customisationmanager" proFile="customisationmanager.pro"/>
-</component>
-<component name="views" filter="s60" long-name="Calendar Views">
-<unit bldFile="app/organizer/calendarui/views" proFile="views.pro"/>
-</component>
-<component name="calengriditemstyleplugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/organizer/calendarui/styleplugins/calengriditemstyleplugin" proFile="calengriditemstyleplugin.pro"/>
-</component>
-<component name="calendarui_controller" filter="s60" long-name="Calendar Controller">
-<unit bldFile="app/organizer/calendarui/controller" proFile="controller.pro"/>
-</component>
-<component name="calendarui_application" filter="s60" long-name="Calendar Application">
-<unit bldFile="app/organizer/calendarui/application" proFile="application.pro"/>
-</component>
-<component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y">
-<unit bldFile="app/organizer/calendarui/caldav/group"/>
-</component>
-</collection>
-<collection name="notes" long-name="Notes" level="ui">
-<component name="noteseditor" filter="s60" long-name="Notes Editor" introduced="^4">
-<unit bldFile="app/organizer/notes/notesui/noteseditor" proFile="noteseditor.pro"/>
-</component>
-<component name="notes_build" filter="s60" long-name="Notes Build" introduced="^4">
-<unit bldFile="app/organizer/notes" proFile="notes.pro"/>
-</component>
-</collection>
-<collection name="calendarengines" long-name="Calendar Engines" level="engine">
-<component name="versit2" filter="s60" long-name="Versit 2 iCal Parser" introduced="9.2">
-<unit bldFile="app/organizer/calendarengines/versit2/group"/>
-</component>
-<component name="agnversit2" filter="s60" long-name="Versit 2 Agenda Interface" introduced="9.2" plugin="Y">
-<unit bldFile="app/organizer/calendarengines/agnversit2/group"/>
-</component>
-<component name="caleninterimutils" filter="s60" long-name="Calendar Interim Utils" introduced="9.1">
-<unit bldFile="app/organizer/calendarengines/caleninterimutils/group"/>
-</component>
-<component name="calenimp" filter="s60" long-name="Calendar Import Wrapper" introduced="7.0s">
-<unit bldFile="app/organizer/calendarengines/calenimp/group"/>
-</component>
-<component name="caldavsrv" filter="sf_build" long-name="CalDAV Server" introduced="^3">
-<unit bldFile="app/organizer/calendarengines/caldav/group"/>
-</component>
-</collection>
-<collection name="clock" long-name="Clock" level="app">
-<!-- uncomment unit when block_build is split up-->
-<component name="clockengines" filter="s60" long-name="Clock Engines" class="placeholder">
-<!--<unit bldFile="clock/clockengines" qt:proFile="clockengines.pro"/> -->
-</component>
-<component name="clockmw" filter="s60" long-name="Clock Middleware" introduced="^4" class="placeholder">
-<!--<unit bldFile="clock/clockmw" qt:proFile="clockmw.pro"/>-->
-</component>
-<component name="clockui" filter="s60" long-name="Clock UI" class="placeholder">
-<!--<unit bldFile="clock/clockui" qt:proFile="clockui.pro"/>-->
-</component>
-<component name="ftudatetimewizard" filter="s60" long-name="First Time Use Date/Time Wizard" introduced="^4" class="placeholder">
-<!--<unit bldFile="clock/ftudatetimewizard" qt:proFile="ftudatetimewizard.pro"/>-->
-</component>
-<component name="clock_build" filter="s60" long-name="Clock Build">
-<!-- make exports into a component, or just move to one of the above components, then remove this and uncomment the above -->
-<unit bldFile="app/organizer/clock" proFile="clock.pro"/>
-</component>
-</collection>
-<collection name="pimappservices" long-name="PIM Application Services" level="services">
-<component name="calendar" long-name="Calendar" introduced="9.2" purpose="optional">
-<unit bldFile="app/organizer/pimappservices/calendar/group" mrp="app/organizer/pimappservices/calendar/group/app-engines_calendar.mrp" version="2"/>
-</component>
-<component name="calendarvcalplugin" long-name="Calendar vCal Plugin" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="app/organizer/pimappservices/calendarvcalplugin/group" mrp="app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp" version="2"/>
-</component>
-<component name="appenginesdocs" long-name="Application Engines Documentation" purpose="development" class="doc">
-<unit mrp="app/organizer/pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
-</component>
-</collection>
-<collection name="pimappsupport" long-name="PIM Application Support" level="support">
-<component name="vcardandvcal" long-name="vCard and vCal" introduced="ER5" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/vcardandvcal/group" mrp="app/organizer/pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
-</component>
-<component name="chinesecalendarconverter" long-name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
-</component>
-</collection>
-<collection name="alarmui" long-name="Alarm UI" level="app">
-<!-- collection is really a component, should move down a directory -->
-<component name="alarmui_build" filter="s60" long-name="Alarm UI Build">
-<unit bldFile="app/organizer/alarmui" proFile="alarmui.pro"/>
-</component>
-</collection>
-<collection name="organizer_info" long-name="Organizer Application Suite Info" level="app">
-<component name="organizer_metadata" long-name="Organizer Application Suite Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="plugin eng base app api">
-<collection name="msg_plat" long-name="Messaging Apps Platform APIs" level="api">
-<component name="messaging_media_resolver_api" long-name="Messaging Media Resolver API" filter="s60" class="api"/>
-<component name="mms_application_api" long-name="MMS Application API" filter="s60" class="api"/>
-<component name="mms_codec_client_api" long-name="MMS Codec Client API" filter="s60" class="api"/>
-<component name="mms_conformance_api" long-name="MMS Conformance API" filter="s60" class="api"/>
-<component name="mms_engine_settings_api" long-name="MMS Engine Settings API" filter="s60" class="api"/>
-<component name="mms_server_settings_api" long-name="MMS Server Settings API" filter="s60" class="api"/>
-<component name="conversation_services_client_api" long-name="Conversation Services Client API" filter="s60" introduced="^4" class="api"/>
-<component name="conversation_services_plugin_api" long-name="Conversation Services Plugin API" filter="s60" introduced="^4" class="api"/>
-<component name="conversation_services_utilities_api" long-name="Conversation Services Utilities API" filter="s60" introduced="^4" class="api"/>
-<component name="shareui_api" long-name="Share UI API" filter="s60" introduced="^4" class="api"/>
-<component name="messaging_history_api" long-name="Messaging History API" filter="s60" introduced="^4" class="api"/>
-<component name="msg_plat_build" long-name="Messaging Apps Platform APIs Build" filter="s60" introduced="^4" class="api">
-<!-- break this up into the above units and replace their base attributes with bldFile, etc -->
-</component>
-</collection>
-<collection name="msg_pub" long-name="Messaging Apps Public APIs" level="api">
-<component name="mms_client_mtm_api" long-name="MMS Client MTM API" filter="s60" class="api"/>
-<component name="msg_smil_dtd_api" long-name="Messaging SMIL DTD API" filter="s60" introduced="^4" class="api"/>
-<component name="msg_pub_build" long-name="Messaging Apps Public APIs Build" filter="s60" introduced="^4" class="api">
-<!-- break this up into the above units and replace their base attributes with bldFile, etc -->
-</component>
-</collection>
-<collection name="mobilemessaging" long-name="Mobile Messaging" level="plugin">
-<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/mobilemessaging/smsmtm/group" mrp="app/messaging/mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
-</component>
-</collection>
-<collection name="messagingappbase" long-name="Messaging App Base" level="base">
-<component name="messagingappbase_build" filter="s60" long-name="Messaging App Base Build" introduced="^4">
-<!-- break this up into the below components -->
-<unit bldFile="app/messaging/messagingappbase" proFile="messagingappbase/messagingappbase.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgmedia" filter="s60" long-name="Message Media"/>
-<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
-<unit mrp="app/messaging/messagingappbase/smsmtm/group/messaging_sms.mrp"/>
-</component>
-<component name="smilparser" long-name="SMIL Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="app/messaging/messagingappbase/smilparser/GROUP" mrp="app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
-</component>
-<component name="obexmtms" long-name="OBEX MTMs" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/obexmtms/Group" mrp="app/messaging/messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
-</component>
-</collection>
-<collection name="mmsengine" long-name="MMS Engine" level="eng">
-<component name="mmsconninit" filter="s60" long-name="MMS Connection Initiator" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsconninit/bld"/> -->
-</component>
-<component name="genutils" filter="s60" long-name="General Utils" class="placeholder">
-<!-- <unit bldFile="mmsengine/genutils/bld"/> -->
-</component>
-<component name="mmsserversettings" filter="s60" long-name="MMS Server Settings" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserversettings/bld"/> -->
-</component>
-<component name="mmsmessage" filter="s60" long-name="MMS Message" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsmessage/bld"/> -->
-</component>
-<component name="mmshttptransport" filter="s60" long-name="MMS HTTP Transport" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmshttptransport/bld"/> -->
-</component>
-<component name="mmscodec" filter="s60" long-name="MMS Codec" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodec/bld"/> -->
-</component>
-<component name="mmsserver" filter="s60" long-name="MMS Server" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserver/bld"/> -->
-</component>
-<component name="clientmtm" filter="s60" long-name="MMS Client MTM" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/clientmtm/bld"/> -->
-</component>
-<component name="mmswatcher" filter="s60" long-name="MMS Watcher" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmswatcher/bld"/> -->
-</component>
-<component name="mmspushhandler" filter="s60" long-name="MMS Push Handler" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmspushhandler/bld"/> -->
-</component>
-<component name="applicationadapter" filter="s60" long-name="MMS Application Adapter" class="placeholder">
-<!-- <unit bldFile="mmsengine/applicationadapter/bld"/> -->
-</component>
-<component name="mmscodecclient" filter="s60" long-name="MMS Codec Client" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodecclient/bld"/> -->
-</component>
-<component name="mmssettings" long-name="MMS Settings" introduced="9.2" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmssettings/group" mrp="app/messaging/mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
-</component>
-<component name="mmsconf" long-name="MMS Configuration" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmsconf" mrp="app/messaging/mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
-</component>
-<component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
-<!-- this should be broken up into the individual other components -->
-<unit bldFile="app/messaging/mmsengine" proFile="mmsengine/mmsengine.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="messagingapp" long-name="Messaging Application" level="app">
-<component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
-<!-- this should be broken up into the individual other components -->
-<unit bldFile="app/messaging/mmsengine" proFile="mmsengine/mmsengine.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgutils" filter="s60" long-name="Messaging Utils" introduced="^4">
-<unit bldFile="app/messaging/msgutils" proFile="msgutils.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgappfw" filter="s60" long-name="Messaging Application Framework" introduced="^4">
-<unit bldFile="app/messaging/msgappfw" proFile="msgappfw.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgsettings" filter="s60" long-name="Messaging Settings" introduced="^4">
-<unit bldFile="app/messaging/msgsettings" proFile="msgsettings.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgnotifications" filter="s60" long-name="Messaging Notifications" introduced="^4">
-<unit bldFile="app/messaging/msgnotifications" proFile="msgnotifications.pro" qmakeArgs="-r"/>
-</component>
-<component name="smartmessaging" filter="s60" long-name="Smart Messaging">
-<unit bldFile="app/messaging/messagingapp/smartmessaging" proFile="smartmessaging.pro" qmakeArgs="-r"/>
-</component>
-<component name="shareui" filter="s60" long-name="Shared UI" introduced="^4">
-<unit bldFile="app/messaging/shareui" proFile="shareui.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgui" filter="s60" long-name="Messaging UI" introduced="^4">
-<unit bldFile="app/messaging/msgui" proFile="msgui.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="email" long-name="Email" level="plugin">
-<!-- use commonemail instead -->
-<component name="pop3andsmtpmtm" long-name="POP3 and SMTP MTM" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/pop3andsmtpmtm/group" mrp="app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
-</component>
-<component name="imap4mtm" long-name="IMAP4 MTM" introduced="9.2" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/imap4mtm/group" mrp="app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
-</component>
-</collection>
-<collection name="messaging_info" long-name="Messaging Apps Info" level="api">
-<component name="messaging_metadata" long-name="Messaging Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commonemail" level="apps" span="2" long-name="Email Apps" levels="service support ui app">
-<!-- need to resolve the qt parts into proper components, then uncomment the units -->
-<collection name="email_plat" long-name="Email Apps Platform Interfaces" level="app">
-<component name="nmail_client_api" long-name="NMail Client API" filter="s60" introduced="^4" class="api placeholder">
-<!--<unit bldFile="email_plat" qt:proFile="email_plat.pro"/> -->
-</component>
-</collection>
-<collection name="emailservices" long-name="Email Services" level="service">
-<component name="nmailbase" filter="s60" long-name="NMail Base" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/nmailbase" qt:proFile="nmailbase.pro"/> -->
-</component>
-<component name="emailcommon" filter="s60" long-name="Email Common" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/emailcommon" qt:proFile="emailcommon.pro"/>-->
-</component>
-<component name="emailframework" filter="s60" long-name="Email Framework" introduced="^2" class="placeholder">
-<!-- <unit bldFile="emailservices/emailframework" qt:proFile="emailframework.pro"/>-->
-</component>
-<component name="emailstore" filter="s60" long-name="Email Store" introduced="^2" class="placeholder">
-<!-- <unit bldFile="emailservices/emailstore" qt:proFile="emailstore.pro"/>-->
-</component>
-<component name="nmclientapi" filter="s60" long-name="Nmail Client API" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/nmclientapi" qt:proFile="nmclientapi.pro"/>-->
-</component>
-<component name="nmailagent" filter="s60" long-name="Nmail Agent" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/nmailagent" qt:proFile="nmailagent.pro"/>-->
-</component>
-</collection>
-<collection name="ipsservices" long-name="IMAP/POP/SMTP Services" level="service">
-<component name="ipssosplugin" filter="s60" long-name="IPS SOS Plugin" introduced="^2" plugin="Y" class="placeholder">
-<!-- SOS? Consider spelling it out since the abbreviation is ambiguous -->
-<!--<unit bldFile="ipsservices/ipssosplugin" qt:proFile="ipssosplugin.pro" />-->
-</component>
-<component name="nmimapclientplugin" filter="s60" long-name="NM IMAP Client Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="ipsservices/nmimapclientplugin" qt:proFile="nmimapclientplugin.pro"/>-->
-</component>
-<component name="nmipsmtms" filter="s60" long-name="NM IPS Client Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="ipsservices/nmipsmtms" qt:proFile="nmipsmtms.pro"/>-->
-</component>
-<component name="nmipssettings" filter="s60" long-name="NM IPS Settings" introduced="^4" class="placeholder">
-<!-- <unit bldFile="ipsservices/nmipssettings" qt:proFile="nmipssettings.pro"/>-->
-</component>
-<component name="ipsservices_build" filter="s60" long-name="IPS Services Build" introduced="^2" class="placeholder">
-<!--<unit bldFile="ipsservices" qt:proFile="ipsservices.pro"/> -->
-<!-- can the exports be broken up into the other components or made a config component?-->
-</component>
-</collection>
-<collection name="emailuis" long-name="Email UIs" level="app">
-<component name="nmailuiengine" filter="s60" long-name="Nmail UI Engine" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailuiengine" qt:proFile="nmailuiengine.pro"/> -->
-</component>
-<component name="nmailuiwidgets" filter="s60" long-name="Nmail UI Widgets" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailuiwidgets" qt:proFile="nmailuiwidgets.pro"/> -->
-</component>
-<component name="nmailuiwidgetsplugin" filter="s60" long-name="Nmail UI Widgets Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailuiwidgetsplugin" qt:proFile="nmailuiwidgetsplugin.pro"/> -->
-</component>
-<component name="nmsettingui" filter="s60" long-name="Nmail Setting UI" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmsettingui" qt:proFile="nmsettingui.pro"/> -->
-</component>
-<component name="nmailcpplugin" filter="s60" long-name="Nmail CP Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailcpplugin" qt:proFile="nmailcpplugin.pro"/> -->
-</component>
-<component name="nmailui" filter="s60" long-name="Nmail UI" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailui" qt:proFile="nmailui.pro"/> -->
-</component>
-<component name="nmindicatorplugin" filter="s60" long-name="Nmail Indicator Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmindicatorplugin" qt:proFile="nmindicatorplugin.pro"/> -->
-</component>
-<component name="nmframeworkadapter" filter="s60" long-name="Nmail Framework Adapter" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmframeworkadapter" qt:proFile="nmframeworkadapter.pro"/> -->
-</component>
-</collection>
-<collection name="commonemail_info" long-name="Email Apps Info" level="app">
-<component name="commonemail_build" long-name="Email Apps Build" introduced="^4">
-<!-- split into actual components -->
-<unit bldFile="app/commonemail" proFile="nmail.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</block>
-<block name="camera" level="apps" long-name="Camera Apps">
-<collection name="camerauis" long-name="Camera UIs">
-<component name="cameraxui" filter="s60" long-name="CameraX UIs">
-<unit bldFile="app/camera/camerauis/cameraxui" filter="!test" proFile="camerax.pro"/>
-</component>
-</collection>
-</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">
-<component name="image_editor_debug_utilities_api" long-name="Image Editor Debug Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
-</component>
-<component name="image_editor_utilities_api" long-name="Image Editor Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_utilities_api/group"/>
-</component>
-<component name="image_editor_definitions_api" long-name="Image Editor Definitions API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_definitions_api/group"/>
-</component>
-<component name="image_editor_system_parameters_api" long-name="Image Editor System Parameters API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_system_parameters_api/group"/>
-</component>
-<component name="image_processing_engine_api" long-name="Image Processing Engine API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_processing_engine_api/group"/>
-</component>
-</collection>
-<collection name="imageeditor" long-name="Image Editor UI" level="ui">
-<component name="pb" filter="s60" long-name="Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/pb/group"/>
-</component>
-<component name="iepb" filter="s60" long-name="Image Editor Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/iepb/group"/>
-</component>
-<component name="imageeditorui" filter="s60" long-name="Image Editor UI">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorui/group"/>
-</component>
-<component name="imageeditormanager" filter="s60" long-name="Image Editor Manager">
-<unit bldFile="app/imgeditor/imageeditor/imageeditormanager/group"/>
-</component>
-<component name="imageeditorapp" filter="s60" long-name="Image Editor Application">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorapp/group"/>
-</component>
-<component name="imageeditor_plugins" filter="s60" long-name="Image Editor Plugins" plugin="Y">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditor/plugins/blackwhiteplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/brightnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/bubbleplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cartoonizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/clipartplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/contrastplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cropplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/drawplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/frameplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/negativeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/redeyeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/resizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotatelplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotaterplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/textplugin/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditor/plugins/drawplugin/group"/>
- -->
-</component>
-<component name="editorprovider" filter="s60" long-name="Image Editor Provider">
-<unit bldFile="app/imgeditor/imageeditor/editorprovider/group"/>
-</component>
-<component name="imageeditor_build" filter="s60" long-name="Image Editor Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditor/group"/>
-</component>
-</collection>
-<collection name="imageeditorengine" long-name="Image Editor Engine" level="engine">
-<component name="filters" filter="s60" long-name="Image Editor Filters">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbrightness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbubble/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbuffer/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercartoon/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterclipart/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercontrast/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercrop/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterdraw/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterframe/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtergrayscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtericlsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegtarget/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filternegate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterredeye/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterrotate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtertext/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
- -->
-</component>
-<component name="imageeditorutils" filter="s60" long-name="Image Editor Utilities">
-<unit bldFile="app/imgeditor/imageeditorengine/imageeditorutils/group"/>
-</component>
-<component name="systemparameters" filter="s60" long-name="System Parameters">
-<unit bldFile="app/imgeditor/imageeditorengine/systemparameters/group"/>
-</component>
-<component name="enginewrapper" filter="s60" long-name="Image Editor Engine Wrapper">
-<unit bldFile="app/imgeditor/imageeditorengine/enginewrapper/group"/>
-</component>
-<component name="imageeditorengine_build" filter="s60" long-name="Image Editor Engine Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoeditor" level="apps" long-name="Video Editor Apps" levels="engine ui">
-<collection name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" level="ui">
-<component name="video_editor_engine_api" long-name="Video Editor Engine API" introduced="^2" class="api">
-<unit bldFile="app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
-</component>
-</collection>
-<collection name="videditor" long-name="Video Editor" level="ui">
-<component name="videoeditorcommon" filter="s60" long-name="Video Editor Common" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditorcommon/group"/>
-</component>
-<component name="videoeditoruicomponents" filter="s60" long-name="Video Editor UI Components" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditoruicomponents/group"/>
-</component>
-<component name="simplevideoeditor" filter="s60" long-name="Simple Video Editor" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplevideoeditor/group"/>
-</component>
-<component name="simplecutvideo" filter="s60" long-name="Simple Cut Video" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplecutvideo/group"/>
-</component>
-<component name="videoprovider" filter="s60" long-name="Video Provider" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoprovider/group"/>
-</component>
-<component name="manualvideoeditor" filter="s60" long-name="Manual Video Editor" introduced="^2" class="placeholder">
-<!-- uncomment when supported
- <meta rel="config">
- <defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
- </meta>
- <unit bldFile="videditor/manualvideoeditor/group"/> -->
-</component>
-<component name="videditor_build" filter="s60" long-name="Video Editor Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videditor/group"/>
-</component>
-</collection>
-<collection name="videoeditorengine" long-name="Video Editor Engine" level="engine">
-<component name="audioeditorengine" filter="s60" long-name="Audio Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/audioeditorengine/group"/>
-</component>
-<component name="avcedit" filter="s60" long-name="AVC Editing" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/avcedit/group"/>
-</component>
-<component name="h263decoder" filter="s60" long-name="H.263 Decoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/h263decoder/group"/>
-</component>
-<component name="mp3aacmaniplib" filter="s60" long-name="MP3 and AAC Manipulation Library" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
-</component>
-<component name="vedtranscoder" filter="s60" long-name="Video Editor Transcoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedtranscoder/group"/>
-</component>
-<component name="vedengine" filter="s60" long-name="Video Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedengine/group"/>
-</component>
-<component name="videoeditorengine_build" filter="s60" long-name="Video Editor Engine Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videoeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
-<collection name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" level="apps">
-<component name="videoplayer_startup_api" long-name="Video Player Startup API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videoplayer_startup_api/group" filter="!test"/>
-</component>
-<component name="videocollection_api" long-name="Video Collection API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videocollection_api/group"/>
-</component>
-</collection>
-<collection name="videocollection" long-name="Video Collection" level="util">
-<component name="mpxmyvideoscollection" filter="s60" long-name="MPX My Videos Collection" introduced="^3">
-<unit bldFile="app/videoplayer/videocollection/mpxmyvideoscollection/group"/>
-</component>
-<component name="videocollectionwrapper" filter="s60" long-name="Video Collection Wrapper" introduced="^4">
-<unit bldFile="app/videoplayer/videocollection/videocollectionwrapper" proFile="videocollectionwrapper.pro" qmakeArgs="-r"/>
-</component>
-<component name="videocollectionview" filter="s60" long-name="Video Collection View" introduced="^4">
-<unit bldFile="app/videoplayer/videocollection/videocollectionview" proFile="videocollectionview.pro" qmakeArgs="-r"/>
-</component>
-<component name="videofiledetailsview" filter="s60" long-name="Video File Details View" introduced="^4">
-<unit bldFile="app/videoplayer/videocollection/videofiledetailsview" proFile="videofiledetailsview.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="mediasettings" long-name="Media Settings" level="support">
-<!-- this is really a component. Should be moved down a directory -->
-<component name="mediasettings_build" filter="s60" long-name="Media Settings Build">
-<unit bldFile="app/videoplayer/mediasettings/group"/>
-</component>
-</collection>
-<collection name="videoplayerapp" long-name="Video Player App" level="apps">
-<component name="videoplayerengine" long-name="Video Player Engine" filter="s60" introduced="^4">
-<unit bldFile="app/videoplayer/videoplayerapp/videoplayerengine" proFile="videoplayerengine.pro" qmakeArgs="-r"/>
-</component>
-<component name="hbvideoplayer" filter="s60" long-name="HB Video Player" introduced="^4">
-<unit bldFile="app/videoplayer/videoplayerapp/hbvideoplayer" proFile="hbvideoplayer.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="videoplayback" long-name="Video Playback Plugins" level="plugin">
-<component name="hbvideoplaybackview" filter="s60" long-name="HB Video Playback View" introduced="^4" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/hbvideoplaybackview" proFile="hbvideoplaybackview.pro" qmakeArgs="-r"/>
-</component>
-<component name="hbvideoplaybackviewplugin" filter="s60" long-name="HB Video Playback View Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/hbvideoplaybackviewplugin" proFile="hbvideoplaybackviewplugin.pro" qmakeArgs="-r"/>
-</component>
-<component name="videohelix" long-name="Video Helix" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videohelix/group"/>
-</component>
-</collection>
-</block>
-<block name="photos" level="apps" long-name="Photos" levels="util support ui app">
-<collection name="photos_group" long-name="Photos Group" level="support">
-<component name="photos_group_build" filter="s60" long-name="Photos Group Build" introduced="^4" class="placeholder">
-<!--<unit bldFile="group" qt:proFile="group.pro"/> -->
-</component>
-</collection>
-<collection name="photos_loggers" long-name="Photos Loggers" level="util">
-<component name="photos_loggerqt" filter="s60" long-name="Photos Logger Qt" introduced="^4" class="placeholder">
-<!--<unit bldFile="loggers/loggerqt" qt:proFile="loggerqt.pro"/> -->
-</component>
-</collection>
-<collection name="photos_commonutilities" long-name="Photos Common Utilities" level="util">
-<component name="photos_externalutility" filter="s60" long-name="Photos External Utility" introduced="^4" class="placeholder">
-<!--<unit bldFile="commonutilities/externalutility" qt:proFile="externalutility.pro"/> -->
-</component>
-<component name="imagedecoderwrapper" filter="s60" long-name="Image Decoder Wrapper" introduced="^4" class="placeholder">
-<!--<unit bldFile="commonutilities/imagedecoderwrapper" qt:proFile="imagedecoderwrapper.pro"/> -->
-</component>
-</collection>
-<collection name="photos_ui" long-name="Photos UI" level="ui">
-<component name="photos_uiengine" filter="s60" long-name="Photos UI Engine" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/uiengine" qt:proFile="uiengine.pro"/> -->
-</component>
-<component name="photos_commandhandlers" filter="s60" long-name="Photos Command Handlers" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/commandhandlers" qt:proFile="commandhandlers.pro"/> -->
-</component>
-<component name="photos_views" filter="s60" long-name="Photos Views" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/views" qt:proFile="views.pro"/> -->
-</component>
-<component name="photos_viewmanagement" filter="s60" long-name="Photos View Management" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/viewmanagement" qt:proFile="viewmanagement.pro"/> -->
-</component>
-</collection>
-<collection name="photos_main" long-name="Photos Main" level="support">
-<component name="photos_main_build" filter="s60" long-name="Photos Main Build" introduced="^4" class="placeholder">
-<!--<unit bldFile="main" qt:proFile="main.pro"/> -->
-</component>
-</collection>
-<collection name="imageviewerapp" long-name="Image Viewer App" level="support">
-<component name="imageviewerapp_build" filter="s60" long-name="Image Viewer App Build" introduced="^4" class="placeholder">
-<!--<unit bldFile="imageviewerapp" qt:proFile="imageviewerapp.pro"/> -->
-</component>
-</collection>
-<collection name="photos_info" long-name="Photos Info" level="support">
-<component name="photos_build" filter="s60" long-name="Photos Build" introduced="^4">
-<!-- split this up into the above components -->
-<unit bldFile="app/photos/photosgallery" proFile="photos.pro"/>
-</component>
-</collection>
-</block>
-<block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support hs app">
-<!-- move the export .pri files into their components and uncomment the units -->
-<collection name="musicplayer_utilities " long-name="Music Player Utilities" level="support">
-<component name="mpnowplayingbanner" filter="s60" long-name="MP Now Playing Banner" introduced="^4" class="placeholder">
-<!-- <unit bldFile="utilities/mpnowplayingbanner" qt:proFile="mpnowplayingbanner.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-<component name="mpsettingsmanager" filter="s60" long-name="MP Settings Manager" introduced="^4" class="placeholder">
-<!-- <unit bldFile="utilities/mpsettingsmanager" qt:proFile="mpsettingsmanager.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-</collection>
-<collection name="musicfetcher " long-name="Music Fetcher" level="support">
-<!-- collection is really a component, move down a directory -->
-<component name="musicfetcher_buld" filter="s60" long-name="Music Fetcher Build" introduced="^4" class="placeholder">
-<!-- <unit bldFile="musicfetcher" qt:proFile="musicfetcher.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-</collection>
-<collection name="musicplayer_app " long-name="Music Player Application" level="app">
-<!-- collection is really a component, move down a directory -->
-<component name="musicplayer_app_build" filter="s60" long-name="Music Player Application Build" introduced="^4" class="placeholder">
-<!-- <unit bldFile="app" qt:proFile="app.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-</collection>
-<collection name="mpviewplugins " long-name="Music Player View Plugins" level="plugins">
-<component name="mpcollectionviewplugin" filter="s60" long-name="MP Collection View Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpviewplugins/mpcollectionviewplugin/group"/>-->
-</component>
-<component name="mpplaybackviewplugin" filter="s60" long-name="MP Playback View Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpviewplugins/mpplaybackviewplugin/group"/>-->
-</component>
-</collection>
-<collection name="mpserviceplugins" long-name="Music Player Service Plugins" level="plugins">
-<component name="audioeffects" filter="s60" long-name="Audio Effects" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/audioeffects/group"/>-->
-</component>
-<component name="localaudio" filter="s60" long-name="Local Audio" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/localaudio/group"/>-->
-</component>
-<!-- Note: it's called SQLite, not SQLLite, just the one "L" -->
-<component name="mpxsqlitedbcommon" filter="s60" long-name="MPX SQLite Database Common" introduced="^4" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitedbcommon/group"/>-->
-</component>
-<component name="mpxsqlitedbplugin" filter="s60" long-name="MPX SQLite Database Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitedbplugin/group"/>-->
-</component>
-<component name="mpxsqlitepodcastdbplugin" filter="s60" long-name="MPX SQLlite Podcast Database Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
-</component>
-<component name="m3uplaylistplugin" filter="s60" long-name="M3U Playlist Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
-</component>
-</collection>
-<collection name="musicplayer_info" long-name="Music Player Apps Info" level="app">
-<component name="musicplayer_build" filter="s60" long-name="Music Player Build">
-<!-- should brak up into individual components -->
-<unit bldFile="app/musicplayer" proFile="qtmusicplayer.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-</block>
-<block name="radio" level="apps" long-name="Radio Apps" levels="engine ui">
-<collection name="radioengine" long-name="Radio Engine" level="engine">
-<component name="radioengineutils" filter="s60" long-name="Radio Engine Utils" introduced="^4">
-<unit bldFile="app/radio/radioengine/utils/group"/>
-</component>
-<component name="radioenginesettings" filter="s60" long-name="Radio Engine Settings" introduced="^4">
-<unit bldFile="app/radio/radioengine/settings/group"/>
-</component>
-<component name="radioengine_engine" filter="s60" long-name="Radio Engine" introduced="^4">
-<unit bldFile="app/radio/radioengine/engine/group"/>
-</component>
-</collection>
-<collection name="radioapp" long-name="Radio App" level="ui">
-<component name="radioenginewrapper" filter="s60" long-name="Radio Engine Wrapper" introduced="^4">
-<unit bldFile="app/radio/radioapp/radioenginewrapper" proFile="radioenginewrapper.pro"/>
-</component>
-<component name="radiopresetstorage" filter="s60" long-name="Radio Preset Storage" introduced="^4">
-<unit bldFile="app/radio/radioapp/radiopresetstorage" proFile="radiopresetstorage.pro"/>
-</component>
-<component name="radiouiengine" filter="s60" long-name="Radio UI Engine" introduced="^4">
-<unit bldFile="app/radio/radioapp/radiouiengine" proFile="radiouiengine.pro"/>
-</component>
-<component name="radiowidgets" filter="s60" long-name="Radio Widgets" introduced="^4">
-<unit bldFile="app/radio/radioapp/radiowidgets" proFile="radiowidgets.pro"/>
-</component>
-<component name="radioapplication" filter="s60" long-name="Radio Application" introduced="^4">
-<unit bldFile="app/radio/radioapp/radioapplication" proFile="radioapplication.pro"/>
-</component>
-<component name="radio_rom" filter="s60" long-name="Radio ROM" introduced="^4">
-<unit bldFile="app/radio/rom/group"/>
-</component>
-</collection>
-</block>
-<block name="internetradio" level="apps" long-name="Internet Radio Apps" levels="engine server ui">
-<collection name="internetradio2_0" long-name="Internet Radio 2.0" level="ui">
-<!-- collection is really a component. Move down a dir -->
-<component name="internetradio2_0_build" long-name="Internet Radio 2.0 Build">
-<unit bldFile="app/internetradio/internetradio2.0/group"/>
-</component>
-</collection>
-<collection name="presetserver" long-name="Preset Server" level="server">
-<!-- collection is really a component. Move down a dir -->
-<component name="presetserver_build" long-name="Preset Server Build">
-<unit bldFile="app/internetradio/presetserver/group"/>
-</component>
-</collection>
-<collection name="qtinternetradio" long-name="Qt Internet Radio">
-<component name="qtinternetradio_build" long-name="Qt Internet Radio Build">
-<!-- Move down a dir or break into components-->
-<unit bldFile="app/internetradio/qtinternetradio" proFile="all.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-</block>
-<block name="homescreen" level="apps" long-name="Home Screen Apps" levels="support task ss hs">
-<collection name="homescreen_info" long-name="Home Screen Info" level="support">
-<component name="homescreen_build" long-name="Homescreen Build">
-<!-- break this up properly into components -->
-<unit bldFile="app/homescreen" proFile="homescreen.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-<collection name="homescreen_test" long-name="Home Screen Test" level="support"/>
-<!-- fiill in details with broken up homescreen_build -->
-<collection name="homescreenapp" long-name="Home Screen Application" level="hs">
-<component name="hsutils" long-name="Home Screen Utils" introduced="^4"/>
-<component name="hsdomainmodel" long-name="HS Domain Model" introduced="^4"/>
-<component name="hs_runtimeplugins" long-name="HS Runtime Plugins" introduced="^4" plugin="Y"/>
-<component name="hs_serviceproviders" long-name="HS Service Providers" introduced="^4" plugin="Y"/>
-<component name="hs_stateplugins" long-name="HS State Plugins" introduced="^4" plugin="Y"/>
-<component name="hs_widgetplugins" long-name="HS Widget Plugins" introduced="^4" plugin="Y"/>
-<component name="hsapplication" long-name="Home Screen Application" introduced="^4"/>
-<component name="hshomescreenclientplugin" long-name="Home Screen Client Plugin" introduced="^4" plugin="Y"/>
-<component name="hsmenucontentpublish" long-name="HS Menu Content Publish" introduced="^4"/>
-</collection>
-<collection name="screensaverapp" long-name="Screen Saver Application" level="ss">
-<component name="snsrutils" long-name="Screen Saver Utils" introduced="^4"/>
-<component name="snsr_serviceproviders" long-name="Screen Saver Service Providers" introduced="^4" plugin="Y"/>
-<component name="snsr_stateproviders" long-name="Screen Saver State Providers" introduced="^4" plugin="Y"/>
-<component name="snsr_runtimeproviders" long-name="Screen Saver Runtime Providers" introduced="^4" plugin="Y"/>
-<component name="snsrapplication" long-name="Screen Saver Application" introduced="^4"/>
-<component name="screensaverproviders" long-name="Screen Saver Providers" introduced="^4" plugin="Y"/>
-</collection>
-<collection name="taskswitcherapp" long-name="Task Switcher Application" level="task">
-<component name="taskswitcherappecom" long-name="Task Switcher Application ECom" introduced="^4"/>
-<component name="tsserviceplugin" long-name="Task Switcher Service Plugin" introduced="^4" plugin="Y"/>
-<component name="ts_runtimeplugins" long-name="TS Runtime Plugins" introduced="^4" plugin="Y"/>
-<component name="tsapplication" long-name="Task Switcher Application" introduced="^4"/>
-</collection>
-</block>
-<block name="homescreentools" level="services" long-name="Home Screen Tools" levels="tool install">
-<collection name="dtdinstaller" long-name="DTD Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<!-- this needs to be built first, does build order need to be forced with filters? -->
-<component name="dtdinstaller_build" filter="s60,bldmefirst" long-name="DTD Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/dtdinstaller/group"/>
-</component>
-</collection>
-<collection name="themeinstaller" long-name="Theme Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="themeinstaller_build" filter="s60" long-name="Theme Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/themeinstaller/group"/>
-</component>
-</collection>
-<collection name="widgettools" long-name="Widget Tools" level="install">
-<component name="hspluginpreinstaller" filter="s60" long-name="HS Plugin Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/hspluginspreinstaller/group"/>
-</component>
-<component name="wrtwidgetpreinstaller" filter="s60" long-name="WRT Widget Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
-</component>
-</collection>
-</block>
-<block name="webuis" level="services" long-name="Web UIs" levels="plugin app">
-<collection name="browserui" long-name="Browser UI" level="app">
-<component name="browser" filter="s60" long-name="Browser">
-<unit bldFile="app/webuis/browserui/browser/group"/>
-</component>
-<component name="operatormenu" filter="s60" long-name="Browser Operator Menu">
-<unit bldFile="app/webuis/browserui/operatormenu/group"/>
-</component>
-<component name="videoservices" filter="s60" long-name="Browser Video Services">
-<unit bldFile="app/webuis/browserui/videoservices/group"/>
-</component>
-</collection>
-<collection name="browserplugins" long-name="Browser Plugins" level="plugin">
-<component name="browsersysteminfoplugin" filter="s60" long-name="Browser System Info Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsersysteminfoplugin/group"/>-->
-</component>
-<component name="browsergpsplugin" filter="s60" long-name="Browser GPS Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsergpsplugin/group"/>-->
-</component>
-<component name="browseraudiovideoplugin" filter="s60" long-name="Browser Audio Video Plugin" plugin="Y">
-<unit bldFile="app/webuis/browserplugins/browseraudiovideoplugin/group"/>
-</component>
-<component name="browserplugins_build" filter="s60" long-name="Browser Plugins Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="app/webuis/browserplugins/group"/>
-</component>
-</collection>
-<collection name="pushmtm" long-name="Push MTM" level="plugin">
-<component name="pushmtm_help" filter="s60" long-name="Push MTM Help">
-<unit bldFile="app/webuis/pushmtm/help/group"/>
-</component>
-<component name="plugins" filter="s60" long-name="Push MTM Plugins" plugin="Y">
-<unit bldFile="app/webuis/pushmtm/plugins/group"/>
-</component>
-<component name="pushmtm_build" filter="s60" long-name="Push MTM Build">
-<!-- Some content is at collection level and some is at comopnent level. Either make this a single
- component and move it down a diretcory, or make separate independent components in this collection -->
-<unit bldFile="app/webuis/pushmtm/group"/>
-</component>
-</collection>
-</block>
-<block name="jrt" level="services" long-name="Java Runtime" levels="util generic rt ui">
-<collection name="jrt_plat" long-name="JRT Platform Interfaces" level="ui">
-<component name="java_registry_api" long-name="Java Registry API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_registry_api/build"/>
-</component>
-<component name="java_env_info_api" long-name="Java Environment Info API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_env_info_api/build"/>
-</component>
-<component name="java_debug_api" long-name="Java Debug API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_debug_api/build"/>
-</component>
-</collection>
-<collection name="java_stubs" long-name="Java Stubs" level="util">
-<!-- uncomment all components when configuration is in place. Currently #included from jrt_build -->
-<component name="javadrmutils" long-name="Java DRM Utils" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtdrmutils/group"/>-->
-</component>
-<component name="javaenvinfo" long-name="Java Environment Info" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtenvinfo/group"/>-->
-</component>
-<component name="javaregistry" filter="s60,sf_build" long-name="Java Registry" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtregistry/clientserver/client/group"/>-->
-</component>
-<component name="java_stubs_build" filter="s60,sf_build" long-name="Java Stubs ROM" class="placeholder">
-<!-- Remove the #includes and rename JRT ROM-->
-<!--<unit bldFile="java_stubs/group"/>-->
-</component>
-</collection>
-<collection name="jrt_info" long-name="JRT Info" level="rt">
-<component name="jrt_build" filter="s60" long-name="JRT Build">
-<!-- needed for __JAVA_STUBS condition -->
-<unit bldFile="app/jrt/group"/>
-</component>
-</collection>
-</block>
-<block name="conntools" level="services" long-name="Connectivity Tools" levels="config app">
-<collection name="nettools" long-name="Net Tools" level="app">
-<component name="conntest" filter="s60" long-name="Connection Test" purpose="development">
-<unit bldFile="app/conntools/nettools/conntest/group"/>
-</component>
-</collection>
-<collection name="emulatorlan" long-name="Emulator LAN" level="config">
-<!-- component is actually a colleciton, should be moved down a directory -->
-<component name="emulatorlan_build" filter="s60" long-name="Emulator LAN Build" purpose="development" class="config">
-<unit bldFile="app/conntools/emulatorlan/group"/>
-</component>
-</collection>
-</block>
-<block name="rndtools" level="services" long-name="R&D tools" levels="support generic test util">
-<collection name="creator" long-name="Creator" level="support">
-<!-- collection is really a component. Should move down a directory -->
-<component name="creator_build" filter="s60" long-name="Creator Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/creator/group"/>
-</component>
-</collection>
-<collection name="filebrowser" long-name="File Browser" level="util">
-<!-- consider collapsing into a single component -->
-<component name="fileopserver" filter="s60" long-name="File Operations Server" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
-</component>
-<component name="fileopclient" filter="s60" long-name="File Operations Client" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!--<unit bldFile="filebrowser/fileopclient/group"/>-->
-</component>
-<component name="filebrowser_build" filter="s60" long-name="File Browser Application" purpose="development" class="tool">
-<!-- Need to make this a self-contained component by removing #includes. Can only do when configuration is in place-->
-<unit bldFile="app/rndtools/filebrowser/group"/>
-</component>
-</collection>
-<collection name="launcher" long-name="Launcher" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="launcher_build" filter="s60" long-name="Launcher Utility" purpose="development" class="tool">
-<unit bldFile="app/rndtools/launcher/group"/>
-</component>
-</collection>
-<collection name="loadgen" long-name="Load Generator" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="loadgen_build" filter="s60" long-name="Load Generator Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/loadgen/group"/>
-</component>
-</collection>
-<collection name="perfmon" long-name="Performance Monitor" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="perfmon_build" filter="s60" long-name="Performance Monitor Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/perfmon/group"/>
-</component>
-</collection>
-<collection name="screengrabber" long-name="Screen Grabber" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="screengrabber_build" filter="s60" long-name="ScreenGrabber" purpose="development" class="tool">
-<unit bldFile="app/rndtools/screengrabber/group"/>
-</component>
-</collection>
-<collection name="stifui" long-name="STIF UI" level="generic">
-<component name="stifui_stifui" filter="s60" long-name="STIF UI" purpose="development">
-<unit bldFile="app/rndtools/stifui/stifui/group"/>
-</component>
-<component name="uitestserverstarter" filter="s60" long-name="UI Test Server Starter" purpose="development">
-<unit bldFile="app/rndtools/stifui/uitestserverstarter/group"/>
-</component>
-<component name="stifui_build" filter="s60" long-name="STIF UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/stifui/group"/>
-</component>
-</collection>
-<collection name="memspyui" long-name="Memspy UI" level="generic">
-<!-- collection is really a component. Should move down a directory -->
-<component name="memspyui_build" filter="s60" long-name="Memspy UI Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/memspyui/group"/>
-</component>
-</collection>
-<collection name="htiui" long-name="Harmonized Test Interface UI" level="generic">
-<component name="HtiCommPlugins" filter="s60" long-name="HTI Comm Plugins" purpose="development" plugin="Y">
-<unit bldFile="app/rndtools/htiui/HtiCommPlugins/HtiBtCommPlugin/group"/>
-</component>
-<component name="HtiServicePlugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- can only have a single unit. Should #include from a common bld.inf file -->
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiFtpBackupFake/group"/>
-</component>
-<component name="htidevicereboot" filter="s60" long-name="HTI Device Reboot" purpose="development">
-<unit bldFile="app/rndtools/htiui/htidevicereboot/group"/>
-</component>
-<component name="htistartupwait" filter="s60" long-name="HTI Startup Wait" purpose="development">
-<unit bldFile="app/rndtools/htiui/htistartupwait/group"/>
-</component>
-<component name="htiadmin" filter="s60" long-name="HTI Admin" purpose="development">
-<unit bldFile="app/rndtools/htiui/htiadmin/group"/>
-</component>
-<component name="htiui_build" filter="s60" long-name="HTI UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/htiui/group"/>
-</component>
-</collection>
-</block>
-<block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools if ui">
-<collection name="csxhelp" long-name="Context Sensitive Extended Help" level="if">
-<!-- this is really a component. Should move it down a directory -->
-<component name="csxhelp_build" filter="s60" long-name="Context Sensitive Extended Help Build">
-<unit bldFile="app/helps/csxhelp/group"/>
-</component>
-</collection>
-<collection name="symhelp" long-name="Symbian Help" level="eng">
-<component name="helpmodel" long-name="Help" introduced="6.0" purpose="optional">
-<unit bldFile="app/helps/symhelp/helpmodel/group" mrp="app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
-</component>
-</collection>
-<collection name="helps_info" long-name="Help Apps Info" level="ui">
-<component name="helps_metadata" long-name="Help Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/helps/helps_info/helps_metadata/helps_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
-<collection name="buildverification" long-name="Build Verification" level="services">
-<component name="autosmoketest" long-name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
-<unit bldFile="app/techview/buildverification/autosmoketest/Group" mrp="app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
-</component>
-<component name="smoketest" long-name="Smoke Test" filter="gt" purpose="development">
-<unit bldFile="app/techview/buildverification/smoketest/Group" mrp="app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
-</component>
-</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="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"/>
-<collection name="installationapps" long-name="Installation Apps" level="apps2"/>
-<collection name="messagingapps" long-name="Messaging Apps" level="apps2"/>
-<collection name="telephonyapps" long-name="Telephony Apps" level="apps1"/>
-<collection name="networkingapps" long-name="Networking Apps" level="apps1"/>
-<collection name="networkingutils" long-name="Networking Utils" level="utils"/>
-<collection name="shortlinkapps" long-name="Shortlink Apps" level="apps1"/>
-<collection name="testapps" long-name="Test Apps" level="utils"/>
-<collection name="avapps" long-name="A/V Apps" level="apps3"/>
-<collection name="toolkit" long-name="Toolkit" level="utils"/>
-<collection name="techview_info" long-name="Techview Info" level="apps3">
-<component name="techview_metadata" long-name="Techview Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/techview/techview_info/techview_metadata/techview_metadata.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
--- a/symbian4/single/sysdefs/auto/model_20100420173642_100065a6e06e.xml Wed May 05 12:21:47 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8957 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a package or prebuilt -->
-<!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) "N"
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile may someday be removed in favour of mrp -->
-<!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="low mw high">
-<block name="stubs" level="high" span="2" long-name="Stubs" levels="adaptation plugin mid engine">
-<collection name="audiostubs" long-name="Audio Stubs" level="adaptation">
-<component name="devsoundextensions_stubs" long-name="Devsound Extensions Stubs">
-<unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/group"/>
-</component>
-<component name="fmradiotunercontrolstub" long-name="FM Radio Tuner Control Stub">
-<unit bldFile="adaptation/stubs/audiostubs/fmradiotunercontrolstub/group"/>
-</component>
-</collection>
-<collection name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaptation Stub" level="adaptation">
-<component name="btaudioadaptation_stub_build" long-name="Bluetooth Audio Adaptation Stub Build" filter="oem_build">
-<unit bldFile="adaptation/stubs/btaudioadaptation_stub/group"/>
-</component>
-</collection>
-<collection name="drm_stubs" long-name="DRM Stubs" level="plugin">
-<component name="drm_stubs_build" long-name="DRM Stubs Build">
-<unit bldFile="adaptation/stubs/drm_stubs/group"/>
-</component>
-</collection>
-<collection name="ocrsrv_stub" long-name="OCR Services Stub" level="mid">
-<component name="ocrsrv_stub_build" long-name="OCR Services Stub Build" filter="!dfs_build">
-<unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
-</component>
-</collection>
-<collection name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
-<component name="omasuplasnconverterstubimpl_build" long-name="OMA SUPL ASN Converter Stub Implementation Build" filter="!dfs_build">
-<unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
-</component>
-</collection>
-<collection name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" level="plugin">
-<component name="posmsgpluginreferenceimpl_build" long-name="POS Message Plugin Reference Implementation Build" plugin="Y">
-<unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
-</component>
-</collection>
-<collection name="srsfenginestub" long-name="SRSF Engine Stub" level="engine">
-<component name="srsfenginestub_build" long-name="SRSF Engine Stub Build" filter="stubs">
-<unit bldFile="adaptation/stubs/srsfenginestub/group"/>
-</component>
-</collection>
-<collection name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub" level="plugin">
-<component name="power_save_display_mode_stub_build" long-name="Power Save Display Mode Stub Build">
-<unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
-</component>
-</collection>
-<collection name="systemswstubs" long-name="System Software Stubs" level="adaptation">
-<component name="ddcaccessstub" long-name="DDC Access Stub">
-<unit bldFile="adaptation/stubs/systemswstubs/ddcaccessstub/group"/>
-</component>
-<component name="tvoutconfig" long-name="TV Out Config">
-<unit bldFile="adaptation/stubs/systemswstubs/TVOutConfig/group" filter="oem_build"/>
-</component>
-<component name="accessorypolicyreference" long-name="Accessory Policy Reference">
-<unit bldFile="adaptation/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
-</component>
-<component name="asyreference" long-name="ASY Reference" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
-</component>
-<component name="examplecommonisc" long-name="Example Common ISC">
-<unit bldFile="adaptation/stubs/systemswstubs/examplecommonisc/group" filter="oem_build"/>
-</component>
-<component name="exampledsy" long-name="Example DSY">
-<unit bldFile="adaptation/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
-</component>
-<component name="featuremanagerstub" long-name="Feature Manager Stub">
-<unit bldFile="adaptation/stubs/systemswstubs/featuremanagerstub/group" filter="oem_build"/>
-</component>
-<component name="hwrmstubplugins" long-name="Hardware Resource Manager Stub Plugins" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
-</component>
-<component name="hwrmhapticsstubplugin" long-name="Hardware Resource Manager Haptics Stub Plugin" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
-</component>
-<component name="sensorchannelsreference" long-name="Sensor Channels Reference">
-<unit bldFile="adaptation/stubs/systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
-</component>
-<component name="ssyreference" long-name="SSY Reference" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
-</component>
-<component name="startupadaptationstub" long-name="Startup Adaptation Stub" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/startupadaptationstub/group" filter="oem_build"/>
-</component>
-<component name="tiltcompensationstub" long-name="Tilt Compensation Stub">
-<unit bldFile="adaptation/stubs/systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
-</component>
-<component name="tvoutbehaviour" long-name="TV Out Behaviour">
-<unit bldFile="adaptation/stubs/systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
-</component>
-<component name="wiredbearerreference" long-name="Wired Bearer Reference" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
-</component>
-</collection>
-<collection name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" level="engine">
-<component name="tactileclickplugin_stub_build" long-name="Tactile Click Plugin Stub Build" plugin="Y">
-<unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
-</component>
-</collection>
-<collection name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub" level="mid">
-<component name="wlanhwinit_stub_build" long-name="WLAN Hardware Init Stub Build">
-<unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
-<collection name="omap3530" long-name="OMAP 3530" level="hw-if">
-<component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530" mrp="adaptation/beagleboard/omap3530/base_beagle.mrp"/>
-</component>
-<component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/kernel"/>
-</component>
-<component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/beagleboard"/>
-</component>
-</collection>
-</block>
-<block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
-<collection name="qemu_baseport" long-name="Baseport" level="hw-if">
-<component name="syborg" long-name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/qemu/baseport/syborg" mrp="adaptation/qemu/baseport/syborg/syborg.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
-<collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
-<component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
-<unit bldFile="os/kernelhwsrv/brdbootldr/ubootldr" mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
-</component>
-</collection>
-<collection name="bsptemplate" long-name="Board Support Package Template" level="hw-if">
-<component name="asspandvariant" long-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 name="kernel" long-name="Kernel Architecture" level="adaptation">
-<component name="eka" long-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 name="kerneltest" long-name="Kernel Test" level="hw-if">
-<component name="e32utils" long-name="E32 Utilities" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32utils/group" mrp="os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/>
-</component>
-<component name="e32test" long-name="E32 Tests" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32test/group" mrp="os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
-</component>
-<component name="f32test" long-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 name="ldds" long-name="Logical Device Drivers" level="adaptation">
-<component name="ethernetldd" long-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 name="audioldd" long-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>
-<component name="serialldd" long-name="Serial Port Drivers" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
-</component>
-<component name="legacydrivers" long-name="Legacy Drivers" purpose="optional">
-<unit mrp="os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
-</component>
-<component name="locmedia" long-name="Local Media Subsystem" introduced="8.1b" purpose="mandatory">
-<!-- these are LDDs for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
-</component>
-<component name="runmodedebugger" long-name="Run Mode Debugger" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/debug/group" mrp="os/kernelhwsrv/kernel/eka/drivers/debug/group/base_e32_drivers_debug.mrp"/>
-</component>
-<component name="btrace" long-name="Kernel Trace Tool" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/trace" mrp="os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
-</component>
-<component name="cameraldd" long-name="Camera Drivers" introduced="^3" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/camerasc" mrp="os/kernelhwsrv/kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
-</component>
-<component name="displayldd" long-name="Display Drivers" introduced="^3" purpose="optional">
-<!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/display" mrp="os/kernelhwsrv/kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
-</component>
-<component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
-</component>
-</collection>
-<collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
-<component name="mediadrivers" long-name="Media Drivers" purpose="optional">
-<!-- these are for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/media" mrp="os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
-</component>
-<component name="genericboardsupport" long-name="Generic Board Support" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
-</component>
-</collection>
-<collection name="userlibandfileserver" long-name="User Library and File Server" level="framework">
-<component name="euser" long-name="User Library" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/euser" mrp="os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
-</component>
-<component name="compsupp" long-name="Compiler Runtime Support" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/compsupp" mrp="os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
-</component>
-<component name="fileserver" long-name="File Server" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
-</component>
-<component name="estart" long-name="Base Starter" filter="gt" purpose="optional">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
-</component>
-<component name="domainmgr" long-name="Domain Manager" introduced="8.1b" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
-</component>
-</collection>
-<collection name="filesystems" long-name="File Systems" level="framework">
-<component name="romfs" long-name="ROM File System" filter="gt" purpose="optional" plugin="Y">
-<unit mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
-</component>
-<component name="rofs" long-name="ROFS" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
-</component>
-<component name="usbmsfs" long-name="USB Mass Storage File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
-</component>
-<component name="usbhostmssrv" long-name="USB Host Mass Storage Server" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage/base_f32_shostmassstorage.mrp"/>
-</component>
-<component name="fat32fs" long-name="FAT32 File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
-</component>
-<component name="fatfs" long-name="FAT File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
-</component>
-<component name="compfs" long-name="Composite File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
-</component>
-</collection>
-<collection name="halservices" long-name="HAL Services" level="framework">
-<component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
-<unit bldFile="os/kernelhwsrv/halservices/hal" mrp="os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
-</component>
-</collection>
-<collection name="textmodeshell" long-name="Text Mode Shell" level="test">
-<component name="e32wsrv" long-name="Text Window Server" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/ewsrv" mrp="os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
-</component>
-<component name="textshell" long-name="Text Shell" filter="gt" purpose="development">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
-</component>
-</collection>
-<collection name="baseapitest" long-name="Base API Tests" level="test"/>
-<collection name="kernelhwsrv_info" long-name="Kernel and Hardware Services Info" level="test">
-<component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 config">
-<collection name="emulator" long-name="Emulator" level="bsp">
-<component name="emulatorbsp" long-name="Emulator BSP" purpose="optional">
-<unit bldFile="os/boardsupport/emulator/emulatorbsp" mrp="os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
-</component>
-</collection>
-<collection name="haitest" long-name="HAI Test Suites" level="test">
-<component name="bspsvs" long-name="BSP Verification Suite" introduced="^2" purpose="development">
-<unit mrp="os/boardsupport/haitest/bspsvs/group/bspsvs.mrp"/>
-</component>
-</collection>
-<collection name="boardsupport_info" long-name="Board Support Info" level="config">
-<component name="boardsupport_metadata" long-name="Board Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/boardsupport/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
-<collection name="bldsystemtools" long-name="Build System Tools" level="bld">
-<component name="sysdeftools" long-name="System Definition Tools" purpose="development" introduced="^2">
-<unit mrp="os/buildtools/bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
-</component>
-<component name="commonbldutils" long-name="Common Utils" purpose="development">
-<unit mrp="os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
-</component>
-</collection>
-<collection name="toolsandutils" long-name="Tools and Utils" level="mw">
-<component name="productionbldtools" long-name="Production Build Tools" filter="gt" purpose="development">
-<unit mrp="os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
-</component>
-<component name="e32tools" long-name="E32 Tools" deprecated="^2" purpose="development" class="PC">
-<unit bldFile="os/buildtools/toolsandutils/e32tools/group" mrp="os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
-</component>
-<component name="autotest" long-name="Autotest" purpose="development">
-<unit bldFile="os/buildtools/toolsandutils/autotest/group" mrp="os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
-</component>
-</collection>
-<collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
-<component name="e32toolp" long-name="E32 Perl Tools" purpose="development" filter="sf_build" class="PC">
-<unit mrp="os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="os/buildtools/sbsv1_os/e32toolp/group"/>
-</component>
-</collection>
-<collection name="imgtools_os" long-name="Image Tools" level="fw">
-<component name="romkiteka2" long-name="ROMKIT EKA2" deprecated="^2" purpose="development">
-<unit bldFile="os/buildtools/imgtools_os/romkiteka2/group" mrp="os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
-</component>
-</collection>
-<collection name="misccomponents" long-name="Misc Components" level="mw">
-<component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt" purpose="development">
-<unit bldFile="os/buildtools/misccomponents/emulatorlauncher/group" mrp="os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
-</component>
-</collection>
-<collection name="buildtools_info" long-name="Build Tools Info" level="ui">
-<component name="buildtools_metadata" long-name="Build Tools Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/buildtools/buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
-<collection name="ossrv_pub" long-name="Generic OS Services Public Interfaces" level="utilities">
-<component name="boost_apis" long-name="Boost APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/boost_apis/group"/>
-</component>
-<component name="cpp_wrappers" long-name="Cpp wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cpp_wrappers/group"/>
-</component>
-<component name="character_type_apis" long-name="Character Type APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/character_type_apis/group"/>
-</component>
-<component name="compiler_specific_runtime_support" long-name="Compiler Specific Runtime Support" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/compiler_specific_runtime_support/group"/>
-</component>
-<component name="ossrv_configuration_api" long-name="Generic OS Services Configuration API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/configuration/group"/>
-</component>
-<component name="crypto_authentication_codes_and_hash_functions_api" long-name="Crypto Authentication Codes and Hash Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
-</component>
-<component name="crypto_auxillary_functions_api" long-name="Crypto Auxillary Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_auxillary_functions_api/group"/>
-</component>
-<component name="crypto_certificates_api" long-name="Crypto Certificates API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_certificates_api/group"/>
-</component>
-<component name="crypto_inputoutput_and_data_encoding_api" long-name="Crypto Input/Output and Data Encoding API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
-</component>
-<component name="crypto_public_key_cryptography_and_key_agreement_api" long-name="Crypto Public Key Cryptography and Key Agreement API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
-</component>
-<component name="crypto_symmetric_ciphers_api" long-name="Crypto Symmetric Ciphers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_symmetric_ciphers_api/group"/>
-</component>
-<component name="crypto_utility_functions_api" long-name="Crypto Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_utility_functions_api/group"/>
-</component>
-<component name="cryptogaphy_related_api" long-name="Cryptogaphy Related API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cryptogaphy_related_api/group"/>
-</component>
-<component name="ossrv_debug_api" long-name="Generic OS Services Debug API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/debug/group"/>
-</component>
-<component name="ossrv_exceptions_api" long-name="Generic OS Services Exceptions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/exceptions/group"/>
-</component>
-<component name="gboxed" long-name="GBoxed API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gboxed/group"/>
-</component>
-<component name="glib_arrays" long-name="Glib Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_arrays/group"/>
-</component>
-<component name="glib_asynchronous_queues" long-name="Glib Asynchronous Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_asynchronous_queues/group"/>
-</component>
-<component name="glib_atomic_operations" long-name="Glib Atomic Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_atomic_operations/group"/>
-</component>
-<component name="glib_automatic_string_completion" long-name="Glib Automatic String Completion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_automatic_string_completion/group"/>
-</component>
-<component name="glib_balanced_binary_trees" long-name="Glib Balanced Binary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_balanced_binary_trees/group"/>
-</component>
-<component name="glib_basic_types" long-name="Glib Basic Types API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_basic_types/group"/>
-</component>
-<component name="glib_caches" long-name="Glib Caches API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_caches/group"/>
-</component>
-<component name="glib_character_set_conversion" long-name="Glib Character Set Conversion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_character_set_conversion/group"/>
-</component>
-<component name="glib_closures" long-name="Glib Closures API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_closures/group"/>
-</component>
-<component name="glib_commandline_option_parser" long-name="Glib Command Line Option Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_commandline_option_parser/group"/>
-</component>
-<component name="glib_datasets" long-name="Glib Datasets API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_datasets/group"/>
-</component>
-<component name="glib_date_and_time_functions" long-name="Glib Date and Time Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_date_and_time_functions/group"/>
-</component>
-<component name="glib_doubleended_queues" long-name="Glib Double-ended Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doubleended_queues/group"/>
-</component>
-<component name="glib_doublylinked_lists" long-name="Glib Doubly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doublylinked_lists/group"/>
-</component>
-<component name="glib_dynamic_loading_of_modules" long-name="Glib Dynamic Loading of Modules API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_dynamic_loading_of_modules/group"/>
-</component>
-<component name="glib_enums_and_flags" long-name="Glib Enums and Flags API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_enums_and_flags/group"/>
-</component>
-<component name="glib_error_reporting" long-name="Glib Error Reporting API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_error_reporting/group"/>
-</component>
-<component name="glib_file_utilities" long-name="Glib File Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_file_utilities/group"/>
-</component>
-<component name="glib_generic_values" long-name="Glib Generic Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_generic_values/group"/>
-</component>
-<component name="glib_globstyle_pattern_matching" long-name="Glib Glob-Style Pattern Matching API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_globstyle_pattern_matching/group"/>
-</component>
-<component name="glib_hash_tables" long-name="Glib Hash Tables API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hash_tables/group"/>
-</component>
-<component name="glib_hook_functions" long-name="Glib Hook Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hook_functions/group"/>
-</component>
-<component name="glib_internationalization" long-name="Glib Internationalization API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_internationalization/group"/>
-</component>
-<component name="glib_io_channels" long-name="Glib I/O Channels API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_io_channels/group"/>
-</component>
-<component name="glib_keyvalue_file_parser" long-name="Glib Key-Value File Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_keyvalue_file_parser/group"/>
-</component>
-<component name="glib_lexical_scanner" long-name="Glib Lexical Scanner API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_lexical_scanner/group"/>
-</component>
-<component name="glib_main_event_loop" long-name="Glib Main Event Loop API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_main_event_loop/group"/>
-</component>
-<component name="glib_memory_allocation" long-name="Glib Memory Allocation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_allocation/group"/>
-</component>
-<component name="glib_memory_slices" long-name="Glib Memory Slices API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_slices/group"/>
-</component>
-<component name="glib_message_logging" long-name="Glib Message Logging API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_message_logging/group"/>
-</component>
-<component name="glib_miscellaneous_utility_functions" long-name="Glib Miscellaneous Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_miscellaneous_utility_functions/group"/>
-</component>
-<component name="glib_nary_trees" long-name="Glib N-ary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_nary_trees/group"/>
-</component>
-<component name="glib_parameters_and_values" long-name="Glib Parameters and Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_parameters_and_values/group"/>
-</component>
-<component name="glib_quarks" long-name="Glib Quarks API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_quarks/group"/>
-</component>
-<component name="glib_random_numbers" long-name="Glib Random Numbers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_random_numbers/group"/>
-</component>
-<component name="glib_relations_and_tuples" long-name="Glib Relations and Tuples API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_relations_and_tuples/group"/>
-</component>
-<component name="glib_shellrelated_utilities" long-name="Glib Shell-related Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_shellrelated_utilities/group"/>
-</component>
-<component name="glib_signals" long-name="Glib Signals API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_signals/group"/>
-</component>
-<component name="glib_simple_xml_subset_parser" long-name="Glib Simple XML Subset Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_simple_xml_subset_parser/group"/>
-</component>
-<component name="glib_singlylinked_lists" long-name="Glib Singly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_singlylinked_lists/group"/>
-</component>
-<component name="glib_spawning_processes" long-name="Glib Spawning Processes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_spawning_processes/group"/>
-</component>
-<component name="glib_standard_macros" long-name="Glib Standard Macros API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_standard_macros/group"/>
-</component>
-<component name="glib_string_utility_functions" long-name="Glib String Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_string_utility_functions/group"/>
-</component>
-<component name="glib_strings" long-name="Glib Strings API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_strings/group"/>
-</component>
-<component name="glib_thread_pools" long-name="Glib Thread Pools API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_thread_pools/group"/>
-</component>
-<component name="glib_threads" long-name="Glib Threads API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_threads/group"/>
-</component>
-<component name="glib_timers" long-name="Glib Timers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_timers/group"/>
-</component>
-<component name="glib_unicode_manipulation" long-name="Glib Unicode Manipulation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_unicode_manipulation/group"/>
-</component>
-<component name="glib_value_arrays" long-name="Glib Value Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_value_arrays/group"/>
-</component>
-<component name="glib_varargs_value_collection" long-name="Glib Varargs Value Collection API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_varargs_value_collection/group"/>
-</component>
-<component name="gobject" long-name="GObject API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gobject/group"/>
-</component>
-<component name="gparamspec" long-name="GParamSpec API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gparamspec/group"/>
-</component>
-<component name="gtype" long-name="GType API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtype/group"/>
-</component>
-<component name="gtypemodule" long-name="GTypeModule API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypemodule/group"/>
-</component>
-<component name="gtypeplugin" long-name="GTypePlugin API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypeplugin/group"/>
-</component>
-<component name="io_stream_api" long-name="I/O stream API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/io_stream_api/group"/>
-</component>
-<component name="localization_function_api" long-name="Localization Function API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/localization_function_api/group"/>
-</component>
-<component name="math_operations_api" long-name="Math Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/math_operations_api/group"/>
-</component>
-<component name="ossrv_memory_api" long-name="Generic OS Services Memory API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/memory/group"/>
-</component>
-<component name="no_namespace_headers" long-name="No Namespace Headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/no_namespace_headers/group"/>
-</component>
-<component name="openc_headers" long-name="OpenC headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_headers/group"/>
-</component>
-<component name="openc_wrappers" long-name="OpenC wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_wrappers/group"/>
-</component>
-<component name="ssl_general_api" long-name="SSL General API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_general_api/group"/>
-</component>
-<component name="ssl_protocol_methods_api" long-name="SSL Protocol Methods API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_protocol_methods_api/group"/>
-</component>
-<component name="standard_compressiondecompression_api" long-name="Standard Compression/Decompression API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/standard_compressiondecompression_api/group"/>
-</component>
-<component name="stl" long-name="STL API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/stl/group"/>
-</component>
-<component name="thread_api" long-name="Thread API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/thread_api/group"/>
-</component>
-<component name="type_attributes" long-name="Type Attributes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/type_attributes/group"/>
-</component>
-<component name="typeinfo" long-name="Type Info API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/typeinfo/group"/>
-</component>
-<component name="utility_apis" long-name="Utility APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/utility_apis/group"/>
-</component>
-<component name="wide_character_classapis" long-name="Wide character class/apis" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/wide_character_classapis/group"/>
-</component>
-<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">
-<unit bldFile="os/ossrv/ossrv_pub/dbus-glib/group"/>
-</component>
-</collection>
-<collection name="ossrv_plat" long-name="Generic OS Services Platform Interfaces" level="utilities">
-<component name="libutils_apis" long-name="Utility Library APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_plat/libutils/group"/>
-</component>
-</collection>
-<collection name="stdlibs" long-name="Standard Libraries" level="translation">
-<component name="libz" filter="s60" long-name="Z Compression Library">
-<unit bldFile="os/ossrv/stdlibs/libz/group"/>
-</component>
-<component name="libcrypt" filter="s60" long-name="Crypt Library">
-<unit bldFile="os/ossrv/stdlibs/libcrypt/group"/>
-</component>
-</collection>
-<collection name="ssl" long-name="SSL" level="data-services">
-<component name="libcrypto" filter="s60" long-name="Crypto Library">
-<unit bldFile="os/ossrv/ssl/libcrypto/group"/>
-</component>
-<component name="libssl" filter="s60" purpose="development" long-name="SSL Library">
-<unit bldFile="os/ossrv/ssl/libssl/group"/>
-</component>
-</collection>
-<collection name="glib" long-name="GLib" level="utilities">
-<component name="glibbackend" filter="s60" long-name="GLib Backend">
-<unit bldFile="os/ossrv/glib/build/symbian/glibbackend/group"/>
-<!-- Move to here: <unit bldFile="glib/glibbackend/group"/> -->
-</component>
-<component name="libglib" filter="s60" long-name="GLib Library">
-<unit bldFile="os/ossrv/glib/build/symbian/glib/group"/>
-<!-- Move to here: <unit bldFile="glib/libglib/group"/> -->
-</component>
-<component name="libgthread" filter="s60" long-name="Libg Thread">
-<unit bldFile="os/ossrv/glib/build/symbian/gthread/group"/>
-<!-- Move to here: <unit bldFile="glib/libgthread/group"/> -->
-</component>
-<component name="libgmodule" filter="s60" long-name="Libg Module">
-<unit bldFile="os/ossrv/glib/build/symbian/gmodule/group"/>
-<!-- Move to here: <unit bldFile="glib/libgmodule/group"/> -->
-</component>
-<component name="libgobject" filter="s60" long-name="Libg Object">
-<unit bldFile="os/ossrv/glib/build/symbian/gobject/group"/>
-<!-- Move to here: <unit bldFile="glib/libgobject/group"/> -->
-</component>
-</collection>
-<collection name="stdcpp" long-name="C++ Standard Library" level="translation">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="stdcpp_build" filter="s60" long-name="Stdcpp">
-<unit bldFile="os/ossrv/stdcpp/group"/>
-</component>
-</collection>
-<collection name="ofdbus" long-name="Open Foundation D-Bus" level="utilities">
-<component name="dbus" filter="s60" long-name="D-Bus">
-<unit bldFile="os/ossrv/ofdbus/dbus/group"/>
-</component>
-<component name="dbus-glib" filter="s60" long-name="D-Bus GLib">
-<unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
-</component>
-<component name="ofdbus_rom" filter="s60" long-name="D-Bus ROM">
-<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory
- Consider moving IBY file to one of the above as well and removing this component entirely -->
-<unit bldFile="os/ossrv/ofdbus/group"/>
-</component>
-</collection>
-<collection name="utilitylibraries" long-name="Utility Libraries" level="encoding">
-<component name="libutils" filter="s60" long-name="Utility Library">
-<unit bldFile="os/ossrv/utilitylibraries/libutils/group"/>
-</component>
-</collection>
-<collection name="genericservices" long-name="Generic Services" level="utilities">
-<component name="s60compatibilityheaders" long-name="S60 Compatibility Headers" filter="gt" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp" version="tb101sf"/>
-</component>
-<component name="mimerecognitionfw" long-name="MIME Recognition Framework" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/mimerecognitionfw/group" mrp="os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
-</component>
-<component name="systemagent" long-name="System Agent" introduced="9.0" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/systemagent/group" mrp="os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
-</component>
-<component name="taskscheduler" long-name="Task Scheduler" introduced="6.0" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/taskscheduler/group" mrp="os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
-</component>
-<component name="activebackupclient" long-name="Active Backup Client" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/activebackupclient/group" mrp="os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
-</component>
-<component name="syslibsdocs" long-name="Syslibs Documentation" purpose="development" class="doc">
-<unit mrp="os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
-</component>
-<component name="httputils" long-name="HTTP Utilities Library" introduced="6.2" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/httputils/group" mrp="os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
-</component>
-</collection>
-<collection name="syslibsapitest" long-name="SysLibs API Tests" level="utilities"/>
-<collection name="compressionlibs" long-name="Compression Libraries" level="data-services">
-<component name="ziplib" long-name="Zip Compression Library" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/ossrv/compressionlibs/ziplib/group" mrp="os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
-</component>
-</collection>
-<collection name="genericopenlibs" long-name="Generic Open Libraries" level="translation">
-<component name="cstdlib" long-name="C Standard Library" introduced="ER5" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/cstdlib/group" mrp="os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
-</component>
-<component name="cppstdlib" long-name="C++ Standard Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/cppstdlib/group" mrp="os/ossrv/genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
-</component>
-<component name="openenvcore" long-name="Open Environment Core" introduced="^2" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/openenvcore/group" mrp="os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
-</component>
-<component name="posixrealtimeextensions" long-name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/posixrealtimeextensions/group" mrp="os/ossrv/genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
-</component>
-<component name="liboil" long-name="Liboil" introduced="^4" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/liboil/group" mrp="os/ossrv/genericopenlibs/liboil/group/oeaddons_liboil.mrp"/>
-</component>
-</collection>
-<collection name="lowlevellibsandfws" long-name="Low Level Libraries and Frameworks" level="app-libs">
-<component name="pluginfw" long-name="Plugin Framework" introduced="6.2" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp" version="3"/>
-</component>
-<component name="apputils" long-name="Application Utilities" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/apputils/group" mrp="os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
-</component>
-<component name="genericusabilitylib" long-name="Generic Usability Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/genericusabilitylib/group" mrp="os/ossrv/lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
-</component>
-</collection>
-<collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
-<component name="ossrv_build" filter="s60" long-name="Generic OS Services Build">
-<!-- exports should be moved to individual components -->
-<unit bldFile="os/ossrv/group"/>
-</component>
-<component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="featuremgmt" long-name="Feature Management" level="framework">
-<component name="featuremgr" long-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 name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/persistentdata/featuremgmt/featureregistry/group" mrp="os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
-</component>
-</collection>
-<collection name="loggingservices" long-name="Logging Services" level="server">
-<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">
-<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">
-<unit bldFile="os/persistentdata/loggingservices/rfilelogger/group" mrp="os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
-</component>
-</collection>
-<collection name="traceservices" long-name="Trace Services" level="server">
-<component name="commsdebugutility" long-name="Comms Debug Utility" introduced="7.0s" purpose="optional">
-<unit bldFile="os/persistentdata/traceservices/commsdebugutility/group" mrp="os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
-</component>
-<component name="tracefw" long-name="Trace Framework" introduced="9.2" purpose="development">
-<unit bldFile="os/persistentdata/traceservices/tracefw/ulogger/group" mrp="os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
-</component>
-</collection>
-<collection name="persistentstorage" long-name="Persistent Storage" level="framework">
-<component name="store" long-name="Store" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/store/group" mrp="os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
-</component>
-<component name="dbms" long-name="DBMS" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/dbms/group" mrp="os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
-</component>
-<component name="centralrepository" long-name="Central Repository" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/persistentdata/persistentstorage/centralrepository/group" mrp="os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
-</component>
-<component name="sql" long-name="SQL" introduced="9.3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sql/GROUP" mrp="os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
-</component>
-<component name="sqlite3api" long-name="SQLite 3 API" introduced="^3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sqlite3api/GROUP" mrp="os/persistentdata/persistentstorage/sqlite3api/GROUP/syslibs_sqlite3.mrp"/>
-</component>
-</collection>
-<collection name="persistentdata_info" long-name="Persistent Data Services Info" level="app-if">
-<component name="persistentdata_metadata" long-name="Persistent Data Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/persistentdata/persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
-<component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
-</component>
-<component name="common_platform_security_definitions_api" long-name="Common Platform Security Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group"/>
-</component>
-<component name="feature_discovery_api" long-name="Feature Discovery API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/group"/>
-</component>
-<component name="platform_environment_api" long-name="Platform Environment API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_environment_api/group"/>
-</component>
-<component name="sensor_channel_api" long-name="Sensor Channel API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_channel_api/group"/>
-</component>
-<component name="sensor_definitions_api" long-name="Sensor Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_definitions_api/group"/>
-</component>
-<component name="version_info_api" long-name="Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/group"/>
-</component>
-<component name="accessory_monitoring_api" long-name="Accessory Monitoring API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/group"/>
-</component>
-<component name="haptics_api" long-name="Haptics API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/haptics_api/group"/>
-</component>
-<component name="sensor_data_compensator_api" long-name="Sensor Data Compensator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
-</component>
-</collection>
-<collection name="devicesrv_plat" long-name="Device Services Platform Interfaces" level="app-if">
-<component name="configuration_file_parser_api" long-name="Configuration File Parser API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/configuration_file_parser_api/group"/>
-</component>
-<component name="dos_extension_plugin_api" long-name="DOS Extension Plug-In API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_plugin_api/group"/>
-</component>
-<component name="mediator_command_initiator_api" long-name="Mediator Command Initiator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_initiator_api/group"/>
-</component>
-<component name="syslangutil_api" long-name="SysLangUtil API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/syslangutil_api/group"/>
-</component>
-<component name="wakeup_alarm_api" long-name="Wakeup Alarm API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/wakeup_alarm_api/group"/>
-</component>
-<component name="disk_and_memory_level_keys_api" long-name="Disk and Memory Level Keys API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_and_memory_level_keys_api/group"/>
-</component>
-<component name="mediator_plugin_api" long-name="Mediator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_plugin_api/group"/>
-</component>
-<component name="headset_status_api" long-name="Headset Status API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/headset_status_api/group"/>
-</component>
-<component name="system_startup_extension_plugin_api" long-name="System Startup Extension Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/system_startup_extension_plugin_api/group"/>
-</component>
-<component name="sensor_plugin_api" long-name="Sensor Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_plugin_api/group"/>
-</component>
-<component name="accessory_api" long-name="Accessory API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_api/group"/>
-</component>
-<component name="display_language_definition_api" long-name="Display Language Definition API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/display_language_definition_api/group"/>
-</component>
-<component name="mediator_command_responder_api" long-name="Mediator Command Responder API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_responder_api/group"/>
-</component>
-<component name="accessory_policy_definitions_api" long-name="Accessory Policy Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_definitions_api/group"/>
-</component>
-<component name="hw_settings_api" long-name="Hardware Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/hw_settings_api/group"/>
-</component>
-<component name="mediator_domain_definitions_api" long-name="Mediator Domain Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_domain_definitions_api/group"/>
-</component>
-<component name="sensor_extension_api" long-name="Sensor Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_extension_api/group"/>
-</component>
-<component name="accessory_plugin_api" long-name="Accessory Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_plugin_api/group"/>
-</component>
-<component name="sae_api" long-name="SAE API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sae_api/group"/>
-</component>
-<component name="accessory_control_api" long-name="Accessory Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_control_api/group"/>
-</component>
-<component name="mediator_static_registration_api" long-name="Mediator Static Registration API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_static_registration_api/group"/>
-</component>
-<component name="accessory_key_event_handling_api" long-name="Accessory Key Event Handling API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_key_event_handling_api/group"/>
-</component>
-<component name="mediator_notification_api" long-name="Mediator Notification API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_notification_api/group"/>
-</component>
-<component name="accessory_policy_utility_api" long-name="Accessory Policy Utility API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_utility_api/group"/>
-</component>
-<component name="common_dsy_plugin_api" long-name="Common DSY Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/common_dsy_plugin_api/group"/>
-</component>
-<component name="remote_control_extension_api" long-name="Remote Control Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/remote_control_extension_api/group"/>
-</component>
-<component name="sensor_channel_filter_api" long-name="Sensor Channel Filter API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_channel_filter_api/group"/>
-</component>
-<component name="dos_extension_api" long-name="DOS Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_api/group"/>
-</component>
-<component name="accessory_audio_control_api" long-name="Accessory Audio Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_audio_control_api/group"/>
-</component>
-<component name="mediator_event_consumer_api" long-name="Mediator Event Consumer API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_consumer_api/group"/>
-</component>
-<component name="shared_data_api" long-name="Shared Data API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/shared_data_api/group"/>
-</component>
-<component name="accessory_settings_api" long-name="Accessory Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_settings_api/group"/>
-</component>
-<component name="accessory_bluetooth_control_api" long-name="Accessory Bluetooth Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_bluetooth_control_api/group"/>
-</component>
-<component name="extended_version_info_api" long-name="Extended Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_api/group"/>
-</component>
-<component name="mediator_event_provider_api" long-name="Mediator Event Provider API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_provider_api/group"/>
-</component>
-<component name="tv_out_config_api" long-name="TV Out Config API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_config_api/group"/>
-</component>
-<component name="tspclientmapper_api" long-name="TSP Client Mapper API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tspclientmapper_api/group"/>
-</component>
-<component name="powersave_api" long-name="Power Save API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_api/group"/>
-</component>
-<component name="powersave_definitions_api" long-name="Power Save Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_definitions_api/group"/>
-</component>
-<component name="powersave_plugin_api" long-name="Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_plugin_api/group"/>
-</component>
-<component name="extended_version_info_plugin_api" long-name="Extended Version Info Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_plugin_api/group"/>
-</component>
-<component name="haptics_plugin_api" long-name="Haptics Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_plugin_api/group"/>
-</component>
-<component name="haptics_effect_data_getter_plugin_api" long-name="Haptics Effect Data Getter Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
-</component>
-<component name="haptics_packetizer_plugin_api" long-name="Haptics Packetizer Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_packetizer_plugin_api/group"/>
-</component>
-<component name="tiltcompensation_api" long-name="Tilt Compensation API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tiltcompensation_api/group"/>
-</component>
-<component name="disk_notification_handler_api" long-name="Disk Notification Handler API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_notification_handler_api/group"/>
-</component>
-<component name="accessory_policy_usb_audio_api" long-name="Accessory Policy USB Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_usb_audio_api/group"/>
-</component>
-<component name="accessory_policy_hdmi_audio_api" long-name="Accessory Policy HDMI Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_hdmi_audio_api/group"/>
-</component>
-<component name="sensor_data_compensator_plugin_api" long-name="Sensor Data Compensator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
-</component>
-<component name="ddc_access_api" long-name="DDC Access API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/ddc_access_api/group"/>
-</component>
-<component name="tv_out_behaviour_api" long-name="TV Out Behaviour API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_behaviour_api/group"/>
-</component>
-</collection>
-<collection name="accessoryservices" long-name="Accessory Services" level="framework">
-<component name="accessorymonitor" filter="s60" long-name="Accessory Monitor">
-<unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/group"/>
-</component>
-<component name="accessoryremotecontrol" filter="s60" long-name="Accessory Remote Control">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
-</component>
-<component name="accessoryserver" filter="s60" long-name="Accessory Server">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryserver/group"/>
-</component>
-<component name="pluggeddisplay" filter="s60" long-name="Plugged Display" introduced="^3">
-<unit bldFile="os/devicesrv/accessoryservices/pluggeddisplay/group"/>
-</component>
-<component name="headsetstatusapi" filter="s60" long-name="Headset Status API">
-<unit bldFile="os/devicesrv/accessoryservices/headsetstatusapi/group"/>
-</component>
-<component name="tspclientmapper" filter="s60" long-name="TSP Client Mapper">
-<unit bldFile="os/devicesrv/accessoryservices/tspclientmapper/group"/>
-</component>
-<component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional">
-<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
-</component>
-<component name="gid_pc_tool" filter="s60" long-name="Generic ID PC Tool" class="tool PC">
-<unit bldFile="os/devicesrv/accessoryservices/gid_pc_tool/group"/>
-</component>
-</collection>
-<collection name="commonservices" long-name="Common Services" level="app-if">
-<component name="commonengine" filter="s60" long-name="Common Engine">
-<unit bldFile="os/devicesrv/commonservices/commonengine/group"/>
-</component>
-<component name="commonengineresources" filter="s60" long-name="Common Engine Resources" class="config">
-<unit bldFile="os/devicesrv/commonservices/commonengineresources/group"/>
-</component>
-<component name="platformenv" filter="s60" long-name="Platform Environment">
-<unit bldFile="os/devicesrv/commonservices/platformenv/group"/>
-</component>
-<component name="sysutil" long-name="System Utilities" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/sysutil/group" mrp="os/devicesrv/commonservices/sysutil/group/sysutil.mrp"/>
-</component>
-<component name="activitymanager" long-name="Activity Manager" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/activitymanager/group" mrp="os/devicesrv/commonservices/activitymanager/group/activitymanager.mrp"/>
-</component>
-</collection>
-<collection name="dosservices" long-name="Domestic Operating System Services" level="hw-if">
-<component name="commondsy" filter="s60" long-name="Common DSY" plugin="Y">
-<unit bldFile="os/devicesrv/dosservices/commondsy/group"/>
-</component>
-<component name="dosserver" filter="s60" long-name="Domestic OS Server">
-<unit bldFile="os/devicesrv/dosservices/dosserver/group"/>
-</component>
-</collection>
-<collection name="sensorservices" long-name="Sensor Services" level="framework">
-<component name="sensorserver" filter="s60" long-name="Sensor Server">
-<unit bldFile="os/devicesrv/sensorservices/sensorserver/group"/>
-</component>
-<component name="orientationssy" filter="s60" long-name="Orientation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/orientationssy/group"/>
-</component>
-<component name="tiltcompensationssy" filter="s60" long-name="Tilt Compensation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/tiltcompensationssy/group"/>
-</component>
-<component name="sensordatacompensator" filter="s60" long-name="Sensor Data Compensator">
-<unit bldFile="os/devicesrv/sensorservices/sensordatacompensator/group"/>
-</component>
-</collection>
-<collection name="hwrmhaptics" long-name="HWRM Haptics" level="plugin">
-<component name="hapticseffectdatagetterfw" filter="s60" long-name="Haptics Effect Data Getter Framework">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
-</component>
-<component name="hapticspluginservice" filter="s60" long-name="Haptics Plugin Service">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
-</component>
-<component name="hapticspacketizer" filter="s60" long-name="Haptics Packetizer">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
-</component>
-<component name="hapticspluginmanager" filter="s60" long-name="Haptics Plugin Manager">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
-</component>
-<component name="hapticsserver" filter="s60" long-name="Haptics Server">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsserver/group"/>
-</component>
-<component name="hapticsclient" filter="s60" long-name="Haptics Client">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsclient/group"/>
-</component>
-<component name="hwrmhaptics_build" filter="s60" long-name="HWRM Haptics Build">
-<!-- move these exports into the appropriate above components and delete this component-->
-<unit bldFile="os/devicesrv/hwrmhaptics/group"/>
-</component>
-</collection>
-<collection name="mediator" long-name="Mediator" level="app-if">
-<!--collection is really a component. Move it down a directory -->
-<component name="mediator_build" filter="s60" long-name="Mediator Build">
-<unit bldFile="os/devicesrv/mediator/group"/>
-</component>
-</collection>
-<collection name="psmservices" long-name="Power Save Mode Services" level="app-if">
-<component name="psmserver" filter="s60" long-name="PSM Server">
-<unit bldFile="os/devicesrv/psmservices/psmserver/group"/>
-</component>
-</collection>
-<collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
-<component name="hwrmfmtxwatcherplugin" filter="s60" long-name="HWRM FM Transmitter Watcher Plugin" plugin="Y">
-<unit bldFile="os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
-</component>
-<component name="hwrmtargetmodifierplugin" filter="s60" long-name="HWRM Target Modifier Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build,
- may need to -->
-<!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
-</component>
-<component name="vibractrl" filter="s60" long-name="Vibra Control" deprecated="9.1">
-<unit bldFile="os/devicesrv/resourcemgmt/vibractrl/group"/>
-</component>
-<component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="^2" purpose="optional">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
-</component>
-<component name="hwresourcesmgrconfig" long-name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
-</component>
-<component name="resourcemgmt_build" filter="s60" long-name="Resource Management Build">
-<!-- Move exports to a self-contained component.
- This needs to be kept around until configuration is in place -->
-<unit bldFile="os/devicesrv/resourcemgmt/group"/>
-</component>
-<component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
-</component>
-</collection>
-<collection name="sysstatemgmt" long-name="System State Management" level="server">
-<component name="ssmmapperutility" filter="s60" long-name="SSM Mapper Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmmapperutility/group"/>
-</component>
-<component name="ssmpolicyplugins" filter="s60" long-name="SSM Policy Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmpolicyplugins/group"/>
-</component>
-<component name="ssmutilityplugins" filter="s60" long-name="SSM Utility Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmutilityplugins/group"/>
-</component>
-<component name="ssmcmdlists" filter="s60" long-name="SSM Command Lists" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcmdlists/group"/>
-</component>
-<component name="ssmcustcmds" filter="s60" long-name="SSM Custom Commands" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcustcmds/group"/>
-</component>
-<component name="syslangutil" filter="s60" long-name="System Language Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/syslangutil/group"/>
-</component>
-<component name="sysrestart" filter="s60" long-name="System Restart" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysrestart/group"/>
-</component>
-<component name="sysuiprovider" filter="s60" long-name="System UI Provider" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysuiprovider/group"/>
-</component>
-<component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/group" mrp="os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
-</component>
-<component name="systemstatemgr" long-name="System State Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
-</component>
-<component name="systemstateplugins" long-name="System State Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
-</component>
-<component name="systemstatereferenceplugins" long-name="System State Reference Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
-</component>
-</collection>
-<collection name="resourceinterfaces" long-name="Resource Interfaces" level="hw-if">
-<component name="fmtransmittercontrol" long-name="FM Transmitter Control" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group" mrp="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
-</component>
-</collection>
-<collection name="systemhealthmanagement" long-name="System Health Management" level="server">
-<component name="systemhealthmgr" long-name="System Health Manager" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
-</component>
-</collection>
-<collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if"/>
-<collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
-<component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
-<collection name="authorisation" long-name="Authorisation" level="utilities">
-<component name="userpromptservice" long-name="User Prompt Service" introduced="^3" purpose="mandatory">
-<unit bldFile="os/security/authorisation/userpromptservice/group" mrp="os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
-</component>
-<component name="userpromptutils" long-name="User Prompt Utils" introduced="^3" purpose="optional">
-<unit bldFile="os/security/authorisation/userpromptutils/group" mrp="os/security/authorisation/userpromptutils/group/security_ups_utils.mrp"/>
-</component>
-</collection>
-<collection name="contentmgmt" long-name="Content Management" level="utilities">
-<component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
-<unit bldFile="os/security/contentmgmt/contentaccessfwfordrm/group" mrp="os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
-</component>
-<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">
-<unit bldFile="os/security/crypto/weakcryptospi/group" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
-</component>
-<component name="strongcryptospi" long-name="Strong Crypto SPI" filter="gt" introduced="^3" purpose="optional">
-<unit bldFile="os/security/crypto/weakcryptospi/strong" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
-</component>
-</collection>
-<collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
-<component name="securityutils" long-name="Security Utils" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/securityutils/group" mrp="os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
-</component>
-<component name="securitydocs" long-name="Security Documentation" purpose="development" class="doc">
-<unit mrp="os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
-</component>
-<component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
-</component>
-<component name="securitycommonutils" long-name="Security Common Utils" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/security/cryptomgmtlibs/securitycommonutils/group" mrp="os/security/cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
-</component>
-</collection>
-<collection name="securityanddataprivacytools" long-name="Security and Data Privacy Tools" level="services">
-<component name="securityconfig" long-name="Security Config" introduced="9.1" purpose="optional">
-<unit bldFile="os/security/securityanddataprivacytools/securityconfig/group" mrp="os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
-</component>
-<component name="securitytools" long-name="Security Tools" introduced="^3" purpose="optional" class="PC">
-<unit bldFile="os/security/securityanddataprivacytools/securitytools/group" mrp="os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
-</component>
-</collection>
-<collection name="cryptoplugins" long-name="Crypto Plugins" level="plugins">
-<component name="cryptospiplugins" long-name="Crypto SPI Plugins" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/security/cryptoplugins/cryptospiplugins/group" mrp="os/security/cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
-</component>
-</collection>
-<collection name="cryptoservices" long-name="Crypto Services" level="plugins">
-<component name="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/certificateandkeymgmt/group" mrp="os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
-</component>
-<component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
-</component>
-<component name="browserrootcertificates" long-name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
-<unit mrp="os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
-</component>
-<component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/asnpkcs/group" mrp="os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
-</component>
-</collection>
-<collection name="security_info" long-name="OS Security Info" level="utilities">
-<component name="security_metadata" long-name="OS Security Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/security/security_info/security_metadata/security_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
-<collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
-<component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
-</component>
-<component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
-</component>
-<component name="simulationpositioningmodule" long-name="Simulation Positioning Module" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
-</component>
-<component name="gpspositioningmodule" long-name="GPS/A-GPS Positioning Module" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/gpspositioningmodule/group" mrp="os/lbs/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
-</component>
-<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>
-</collection>
-<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
-<component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
-</component>
-</collection>
-<collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
-<component name="locationserver" long-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 name="networkrequesthandler" long-name="Network Request Handler" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
-</component>
-</collection>
-<collection name="lbstest" long-name="Locating Services Tests" level="application-interface">
-<component name="locationprotocoltest" long-name="Location Protocol Tests" introduced="9.2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/lbstest/locationprotocoltest/group" mrp="os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
-</component>
-</collection>
-<collection name="locationmgmt" long-name="Location Management" level="management">
-<component name="locmonitor" long-name="Location Monitor" introduced="^3" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
-</component>
-<component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/agpslocationmgr/group" mrp="os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
-</component>
-<component name="networklocationmgr" long-name="Network Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/networklocationmgr/group" mrp="os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
-</component>
-<component name="locationcore" long-name="Location Core" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locationcore/group" mrp="os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
-</component>
-<component name="networkgateway" long-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 name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
-<component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
-</component>
-<component name="suplrrlpasn1" filter="sf_build" long-name="SUPL RRLP ASN1 Parser">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
-</component>
-</collection>
-<collection name="lbsapitest" long-name="Location API Tests" level="application-interface"/>
-<collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
-<component name="lbs_metadata" long-name="Locating Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commsfw" level="services" long-name="Communications Framework" levels="server support framework process app-if">
-<collection name="commsprocess" long-name="Comms Process" level="process">
-<component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/commsfw/commsprocess/commsrootserverconfig/group" mrp="os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
-</component>
-</collection>
-<collection name="commsconfig" long-name="Comms Config" level="process">
-<component name="commsdatabase" long-name="Comms Database" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
-</component>
-<component name="commsdatabaseshim" long-name="Comms Database Shim" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/commsfw/commsconfig/commsdatabaseshim/group" mrp="os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
-</component>
-</collection>
-<collection name="datacommsserver" long-name="Data Comms Server" level="framework">
-<component name="esockserver" long-name="ESock Server" purpose="mandatory">
-<unit bldFile="os/commsfw/datacommsserver/esockserver/group" mrp="os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp" version="3"/>
-</component>
-<component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/group" mrp="os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
-</component>
-<component name="networkingdialogstub" long-name="Networking Dialog Stub" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/default" mrp="os/commsfw/datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
-</component>
-<component name="networkcontroller" long-name="Network Controller" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/datacommsserver/networkcontroller/group" mrp="os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
-</component>
-</collection>
-<collection name="serialserver" long-name="Serial Server" level="server">
-<component name="serialportcsy" long-name="Serial Port CSY" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/serialserver/serialportcsy" mrp="os/commsfw/serialserver/serialportcsy/ser-comms_serialportcsy.mrp"/>
-</component>
-<component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" purpose="development">
-<unit bldFile="os/commsfw/serialserver/packetloopbackcsy/group" mrp="os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
-</component>
-<component name="c32serialserver" long-name="C32 Serial Server" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/commsfw/serialserver/c32serialserver/group" mrp="os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
-</component>
-<component name="c32serialserverconfig" long-name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config">
-<unit bldFile="os/commsfw/serialserver/c32serialserverconfig" mrp="os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
-</component>
-<component name="c32serialserverdocs" long-name="C32 Serial Server Documentation" purpose="development" class="doc">
-<unit mrp="os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
-</component>
-</collection>
-<collection name="commsfwutils" long-name="Comms Framework Utilities" level="framework">
-<component name="commsbufs" long-name="Comms Buffers" introduced="^3" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwutils/commsbufs/group" mrp="os/commsfw/commsfwutils/commsbufs/group/comms-infras_commsbufs.mrp"/>
-</component>
-</collection>
-<collection name="commsfw_info" long-name="Comms Framework Info" level="app-if">
-<component name="commsinfrastructuredocs" long-name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
-<unit mrp="os/commsfw/commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
-</component>
-<component name="commsfw_metadata" long-name="Communications Framework Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/commsfw/commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
-</component>
-</collection>
-<collection name="commsfwsupport" long-name="Comms Framework Support" level="support">
-<component name="commselements" long-name="Comms Elements" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwsupport/commselements/group" mrp="os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
-</component>
-</collection>
-<collection name="commsinfrastructureapitest" long-name="Comms-Infras API Tests" level="app-if">
-<component name="commsinfrastructuresvs" long-name="Comms Infrastructure Verification Suite" introduced="^3" purpose="development">
-<unit mrp="os/commsfw/commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
-</component>
-</collection>
-<collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
-<component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
-</component>
-<component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" purpose="mandatory" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
-</component>
-<component name="commstools" long-name="Comms Tools" introduced="^3" purpose="development" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/commstools/group" mrp="os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
-</component>
-</collection>
-</block>
-<block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
-<component name="internetsockets" long-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>
-<collection name="tcpiputils" long-name="TCP/IP Utilities" level="plugin">
-<component name="dnd" long-name="DND" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/dnd/group" mrp="os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
-</component>
-<component name="dhcp" long-name="DHCP" introduced="8.0" purpose="optional">
-<unit bldFile="os/networkingsrv/tcpiputils/dhcp/group" mrp="os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
-</component>
-<component name="networkaddressandporttranslation" long-name="Network Address and Port Translation" introduced="^2" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
-</component>
-<component name="punycodeconv" long-name="Punycode Converter" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/punycodeconv/group" mrp="os/networkingsrv/tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
-</component>
-</collection>
-<collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
-<component name="nullagt" long-name="NULL AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/nullagt/group" mrp="os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
-</component>
-<component name="genericscprparameters" long-name="Generic SCPR Parameters" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/linklayercontrol/genericscprparameters/group" mrp="os/networkingsrv/linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
-</component>
-<component name="mbmsparameters" long-name="MBMS Parameters" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/mbmsparameters/group" mrp="os/networkingsrv/linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
-</component>
-<component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
-<unit bldFile="os/networkingsrv/linklayercontrol/networkinterfacemgr/group" mrp="os/networkingsrv/linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp" version="2"/>
-</component>
-</collection>
-<collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
-<component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
-</component>
-<component name="pppnif" long-name="PPP NIF" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/pppnif/group" mrp="os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp" version="2"/>
-</component>
-<component name="slipnif" long-name="SLIP NIF" purpose="development" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/slipnif/group" mrp="os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
-</component>
-<component name="tunnelnif" long-name="Tunnel NIF" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
-</component>
-</collection>
-<collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
-<component name="packetlogger" long-name="Packet Logger" introduced="8.1" purpose="development">
-<unit bldFile="os/networkingsrv/linklayerutils/packetlogger/group" mrp="os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
-</component>
-</collection>
-<collection name="networkcontrol" long-name="Network Control" level="plugin">
-<component name="qoslib" long-name="QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/qoslib/group" mrp="os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
-</component>
-<component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/pfqoslib/group" mrp="os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
-</component>
-<component name="qosfwprt" long-name="QoS Framework PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
-</component>
-<component name="qosipscpr" long-name="QoS IP SCPR" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosipscpr/group" mrp="os/networkingsrv/networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
-</component>
-<component name="ipnetworklayer" long-name="IP Network Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/ipnetworklayer/group" mrp="os/networkingsrv/networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
-</component>
-<component name="iptransportlayer" long-name="IP Transport Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/iptransportlayer/group" mrp="os/networkingsrv/networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
-</component>
-<component name="commsuserpromptmgr" long-name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkcontrol/commsuserpromptmgr/group" mrp="os/networkingsrv/networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
-</component>
-</collection>
-<collection name="networkprotocols" long-name="Network Protocols" level="plugin">
-<component name="ipeventnotifier" long-name="IP Event Notifier" introduced="8.1" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
-</component>
-<component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
-</component>
-<component name="iphook" long-name="IP Hook" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
-</component>
-<component name="mobileip" long-name="Mobile IP" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/mobileip/group" mrp="os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
-</component>
-<component name="dnsproxy" long-name="DNS Proxy" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/networkprotocols/dnsproxy/group" mrp="os/networkingsrv/networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
-</component>
-</collection>
-<collection name="networksecurity" long-name="Network Security" level="framework">
-<component name="tls" long-name="TLS" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tls/group" mrp="os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
-</component>
-<component name="tlsprovider" long-name="TLS Provider" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tlsprovider/group" mrp="os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
-</component>
-<component name="ipsec" long-name="IPsec" introduced="7.0" purpose="optional">
-<unit bldFile="os/networkingsrv/networksecurity/ipsec/group" mrp="os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
-</component>
-</collection>
-<collection name="networkingtestandutils" long-name="Networking Test and Utils" level="app-if">
-<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">
-<!-- production component: contains the IBY files -->
-<unit bldFile="os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
-</component>
-<component name="networkingdocs" long-name="Networking Documentation" purpose="development" class="doc">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
-</component>
-<component name="networkingsrv_metadata" long-name="Networking Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
-<component name="predictorcompression" long-name="Predictor Compression" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wlan" level="services" long-name="WLAN" levels="hw low mid high tools test">
-<collection name="wlan_plat" long-name="WLAN Platform Interfaces" level="test">
-<component name="wlan_dbif_api" long-name="WLAN DBIF API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_dbif_api/group"/>
-</component>
-<component name="wlan_hal_api" long-name="WLAN HAL API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hal_api/group"/>
-</component>
-<component name="wlan_management_api" long-name="WLAN Management API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_management_api/group"/>
-</component>
-<component name="wlan_device_settings_api" long-name="WLAN Device Settings API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_device_settings_api/group"/>
-</component>
-<component name="wlan_control_api" long-name="WLAN Control API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_control_api/group"/>
-</component>
-<component name="wlan_hw_initialization_data_api" long-name="WLAN Hardware Initialization Data API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hw_initialization_data_api/group"/>
-</component>
-<component name="wlan_power_save_plugin_api" long-name="WLAN Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_power_save_plugin_api/group"/>
-</component>
-<component name="wlan_info_api" long-name="WLAN Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_info_api/group"/>
-</component>
-<component name="wlan_agent_hotspot_plugin_api" long-name="WLAN Agent Hotspot Plug-in API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
-</component>
-<component name="wlan_osa_api" long-name="WLAN OSA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_osa_api/group"/>
-</component>
-<component name="wlan_spia_api" long-name="WLAN SPIA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_spia_api/group"/>
-</component>
-<component name="wlan_hpa_api" long-name="WLAN HPA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hpa_api/group"/>
-</component>
-<component name="wlan_eapol_plugin_api" long-name="WLAN EAPOL Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_eapol_plugin_api/group"/>
-</component>
-<component name="wlan_generic_plugin_api" long-name="WLAN Generic Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_generic_plugin_api/group"/>
-</component>
-<component name="wlan_aws_plugin_api" long-name="WLAN AWS Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_aws_plugin_api/group"/>
-</component>
-</collection>
-<collection name="wlan_pub" long-name="WLAN Public Interfaces" level="test">
-<component name="wlan_sdk_info_api" long-name="WLAN SDK Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_pub/wlan_sdk_info_api/group"/>
-</component>
-</collection>
-<collection name="wlan_bearer" long-name="WLAN Bearer" level="hw">
-<component name="wlanpsmplugin" filter="s60" long-name="WLAN PSM Plugin" plugin="Y">
-<unit bldFile="os/wlan/wlan_bearer/wlanpsmplugin/group"/>
-</component>
-<component name="wlanagent" filter="s60" long-name="WLAN Agent">
-<unit bldFile="os/wlan/wlan_bearer/wlanagent/group"/>
-</component>
-<component name="wlandbif_cd" filter="s60" long-name="WLAN CommsDat interface">
-<unit bldFile="os/wlan/wlan_bearer/wlandbif_cd/group"/>
-</component>
-<!-- should follow component directory rules for stuff in wlan_symbian/ and put in a single component or split up properly -->
-<component name="wlanengine" filter="s60" long-name="WLAN Engine">
-<unit bldFile="os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
-</component>
-<component name="wlanldd" filter="s60" long-name="WLAN LDD">
-<unit bldFile="os/wlan/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
-</component>
-<component name="wlannwif" filter="s60" long-name="WLAN Network Interface">
-<unit bldFile="os/wlan/wlan_bearer/wlannwif/group"/>
-</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="adaptation hw-if plugin framework server app-if">
-<collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
-<component name="basebandchanneladaptor" long-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 name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
-<component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
-</component>
-</collection>
-<collection name="smsprotocols" long-name="SMS Protocols" level="framework">
-<component name="smsstack" long-name="SMS Stack" introduced="6.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/cellularsrv/smsprotocols/smsstack/group" mrp="os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
-</component>
-</collection>
-<collection name="telephonyprotocols" long-name="Telephony Protocols" level="framework">
-<component name="csdagt" long-name="CSD AGT" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/csdagt/group" mrp="os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
-</component>
-<component name="psdagt" long-name="PSD AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/psdagt/group" mrp="os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
-</component>
-<component name="gprsumtsqosprt" long-name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
-</component>
-<component name="gprsumtsqosinterface" long-name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
-</component>
-<component name="qosextnapi" long-name="QoS Extn API" introduced="9.2" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
-</component>
-<component name="secondarypdpcontextumtsdriver" long-name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
-</component>
-<component name="qos3gppcpr" long-name="QoS 3GPP CPR" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
-</component>
-<component name="pdplayer" long-name="PDP Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/pdplayer/group" mrp="os/cellularsrv/telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
-</component>
-<component name="rawipnif" long-name="Raw IP NIF" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserver" long-name="Telephony Server" level="server">
-<component name="etelserverandcore" long-name="ETel Server and Core" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
-</component>
-<component name="etelmultimode" long-name="ETel Multimode" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelmultimode/group" mrp="os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
-</component>
-<component name="etelpacketdata" long-name="ETel Packet Data" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
-</component>
-<component name="etelsimtoolkit" long-name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
-<component name="common_tsy" long-name="Common TSY" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
-</component>
-<component name="licenseetsystub" long-name="Licensee TSY Stub" introduced="^2" purpose="development" filter="sf_build" plugin="Y">
-<unit mrp="os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="os/cellularsrv/telephonyserverplugins/licenseetsystub/group"/>
-</component>
-<component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
-</component>
-<component name="simtsy" long-name="SIM TSY" introduced="7.0" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
-</component>
-<component name="ctsydispatchlayer" long-name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
-</component>
-<component name="simatktsy" long-name="SIMATK TSY" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simatktsy/group" mrp="os/cellularsrv/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
-</component>
-</collection>
-<collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
-<component name="dial" long-name="Dial" deprecated="9.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyutils/dial/group" mrp="os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
-</component>
-<component name="telephonywatchers" long-name="Telephony Watchers" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
-</component>
-<component name="etel3rdpartyapi" long-name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrv_info" long-name="Cellular Baseband Services Info" level="app-if">
-<component name="telephonyconfidentialdocs" long-name="Telephony Confidential Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
-</component>
-<component name="telephonydocs" long-name="Telephony Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
-</component>
-<component name="cellularsrv_metadata" long-name="Cellular Baseband Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
-<component name="mocksy" long-name="MockSY" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if"/>
-</block>
-<block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
-<collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
-<component name="bluetooth_audio_adaptation_api" long-name="Bluetooth Audio Adaptation API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
-</component>
-<component name="bluetooth_power_management_api" long-name="Bluetooth Power Management API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_power_management_api/group"/>
-</component>
-<component name="at_command_handler_plugin_api" long-name="AT Command Handler Plugin API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/at_command_handler_plugin_api/group"/>
-</component>
-</collection>
-<collection name="bluetooth" long-name="Bluetooth Core" level="framework">
-<component name="btstack" long-name="Bluetooth Stack" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btstack" mrp="os/bt/bluetooth/btstack/bluetooth_stack.mrp"/>
-</component>
-<component name="btcomm" long-name="Bluetooth CSY" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetooth/btcomm" mrp="os/bt/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
-</component>
-<component name="btsdp" long-name="Bluetooth SDP" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btsdp" mrp="os/bt/bluetooth/btsdp/bluetooth_sdp.mrp"/>
-</component>
-<component name="btextnotifiers" long-name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btextnotifiers" mrp="os/bt/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
-</component>
-<component name="gavdp" long-name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/gavdp/group" mrp="os/bt/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
-</component>
-<component name="btlogger" long-name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btlogger/group" mrp="os/bt/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
-</component>
-<component name="btdocs" long-name="Bluetooth Documentation" purpose="development" class="doc">
-<unit mrp="os/bt/bluetooth/btdocs/bluetooth_documentation.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothmgmt" long-name="Bluetooth Management" level="plugin">
-<component name="btmgr" long-name="Bluetooth Manager" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btmgr" mrp="os/bt/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
-</component>
-<component name="btconfig" long-name="Bluetooth Config" purpose="optional" class="config">
-<unit bldFile="os/bt/bluetoothmgmt/btconfig" mrp="os/bt/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
-</component>
-<component name="btrom" long-name="Bluetooth ROM" introduced="9.1" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btrom" mrp="os/bt/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
-</component>
-<component name="bluetoothclientlib" long-name="Bluetooth Client Library" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/bluetoothclientlib" mrp="os/bt/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothcommsprofiles" long-name="Bluetooth Comms Profiles" level="app-if">
-<component name="btpan" long-name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetoothcommsprofiles/btpan/group" mrp="os/bt/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
-</component>
-</collection>
-<collection name="bthci" long-name="Host Controller Interface" level="server">
-<component name="bthci2" long-name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bthci/bthci2/group" mrp="os/bt/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
-</component>
-<component name="hciextensioninterface" long-name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bthci/hciextensioninterface" mrp="os/bt/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
-</component>
-<component name="hci2implementations" long-name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bthci/hci2implementations/group" mrp="os/bt/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
-</component>
-</collection>
-<collection name="irda" long-name="IrDA" level="plugin">
-<component name="irdastack" long-name="IrDA Stack" purpose="optional">
-<unit bldFile="os/bt/irda/irdastack/group" mrp="os/bt/irda/irdastack/group/infra-red_irda.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if"/>
-<collection name="atext" long-name="AT Extensions" level="server">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="atext_build" long-name="AT Extension Build" introduced="^3" purpose="optional" filter="s60">
-<unit bldFile="os/bt/atext/group"/>
-</component>
-</collection>
-<collection name="bt_info" long-name="Bluetooth Info" level="app-if">
-<component name="bt_metadata" long-name="Bluetooth Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/bt/bt_info/bt_metadata/bt_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
-<collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
-<!-- usbclientdrivers to be moved here from kernelhwsrv-->
-</collection>
-<collection name="usbmgmt" long-name="USB Management" level="server">
-<component name="usbmgr" long-name="USB Manager" purpose="optional">
-<unit bldFile="os/usb/usbmgmt/usbmgr/group" mrp="os/usb/usbmgmt/usbmgr/group/usb_manager.mrp" version="2"/>
-</component>
-<component name="usbclassandmgrdocs" long-name="USB Class and Manager Documentation" purpose="development" class="doc">
-<unit mrp="os/usb/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
-</component>
-</collection>
-<collection name="usb_info" long-name="USB Info" level="app-if">
-<component name="usb_metadata" long-name="USB Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/usb/usb_info/usb_metadata/usb_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="mm" level="services" long-name="Multimedia" levels="adaptation 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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-</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"/>
-</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"/>
-</component>
-<component name="aac_decoder_config_proxy_api" long-name="AAC Decoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/aac_decoder_config_proxy_api/group"/>
-</component>
-<component name="added_devsound_control_api" long-name="Added DevSound Control API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_api/group"/>
-</component>
-<component name="added_devsound_control_msg_hdlr_api" long-name="Added DevSound Control Msg Hdlr API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_msg_hdlr_api/group"/>
-</component>
-<component name="added_devsound_control_proxy_api" long-name="Added DevSound Control Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_proxy_api/group"/>
-</component>
-<component name="audio_effects_msg_hdlr_api" long-name="Audio Effects Message Handler API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_msg_hdlr_api/group"/>
-</component>
-<component name="audio_effects_proxy_api" long-name="Audio Effects Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_proxy_api/group"/>
-</component>
-<component name="audio_policy_header_api" long-name="Audio Policy Header API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="audio_routing_proxy_api" long-name="Audio Routing Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_routing_proxy_api/group"/>
-</component>
-<component name="custom_interface_builder_api" long-name="Custom Interface Builder API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_builder_api/group"/>
-</component>
-<component name="custom_interface_message_handler_factory_api" long-name="Custom Interface Message Handler Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_message_handler_factory_api/group"/>
-</component>
-<component name="custom_interface_proxy_factory_api" long-name="Custom Interface Proxy Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_proxy_factory_api/group"/>
-</component>
-<component name="custom_interface_utility_api" long-name="Custom Interface Utility API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_utility_api/group"/>
-</component>
-<component name="devsound_adaptation_api" long-name="DevSound Adaptation API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/devsound_adaptation_api/group"/>
-</component>
-<component name="display_posting_api" long-name="Display Posting API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="eaac_plus_decoder_interface_proxy_api" long-name="eAAC Plus Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="error_concealment_interface_proxy_api" long-name="Error Concealment Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
-</component>
-<component name="fm_radio_adaptation_api" long-name="FM Radio Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_decoder_interface_proxy_api" long-name="G711 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_encoder_interface_proxy_api" long-name="G711 Encoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_decoder_interface_proxy_api" long-name="G729 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_encoder_interface_msg_hdlr_api" long-name="G729 Encoder Interface Message Handler API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</component>
-<component name="ilbc_decoder_interface_proxy_api" long-name="Ilbc Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ilbc_encoder_interface_proxy_api" long-name="Ilbc Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="mdf_plugin_uids" long-name="MDF Plug-in UIDs" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/mdf_plugin_uids/group"/>
-</component>
-<component name="multimedia_fourcc_definitions_api" long-name="Multimedia FourCC Definitions API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/multimedia_fourcc_definitions_api/group"/>
-</component>
-<component name="nokia_audio_policy_header_api" long-name="Nokia Audio Policy Header API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/nokia_audio_policy_header_api/group"/>
-</component>
-<component name="nokia_multimedia_fourcc_definitions_api" long-name="Nokia Multimedia Fourcc Definitions API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ra8_decoder_interface_proxy_api" long-name="RA8 Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
-</component>
-<component name="rds_adaptation_api" long-name="RDS Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="restricted_audio_output_proxy_api" long-name="Restricted Audio Output Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="sbc_encoder_interface_proxy_api" long-name="SBC Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/sbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="secure_output_mdf_custom_interface" long-name="Secure Output MDF Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="speech_encoder_config_proxy_api" long-name="Speech Encoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/speech_encoder_config_proxy_api/group"/>
-</component>
-<component name="telephony_audio_routing_client_api" long-name="Telephony Audio Routing Client API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_client_api/group"/>
-</component>
-<component name="telephony_audio_routing_manager_api" long-name="Telephony Audio Routing Manager API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_manager_api/group"/>
-</component>
-<component name="video_buffer_management_mdf_custom_interface" long-name="Video Buffer Management MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_buffer_management_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_rotation_mdf_custom_interface" long-name="Video Decoder Rotation MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_scaling_mdf_custom_interface" long-name="Video Decoder Scaling MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
-</component>
-<component name="video_reclaim_extbuffers_ci" long-name="Video Reclaim Extbuffers Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_reclaim_extbuffers_ci/group"/>
-</component>
-<component name="video_window_control_custom_interface" long-name="Video Window Control Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="wma_decoder_interface_proxy_api" long-name="WMA Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/wma_decoder_interface_proxy_api/group"/>
-</component>
-<component name="eaacplusutil_api" long-name="EAac Plus Util API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/eaacplusutil_api/group"/>
-</component>
-<component name="frametable_api" long-name="Frametable API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/frametable_api/group"/>
-</component>
-</collection>
-<collection name="devsoundextensions" long-name="Devsound Extensions" level="device-fw">
-<component name="drmaudioplayer" filter="s60" long-name="DRM Audio Player">
-<unit bldFile="os/mm/devsoundextensions/drmaudioplayer/group"/>
-</component>
-<component name="mmextfw" filter="s60" long-name="Multimedia Extension Framework">
-<unit bldFile="os/mm/devsoundextensions/mmextfw/group"/>
-</component>
-<component name="audiorouting" filter="s60" long-name="Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/audiorouting/group"/>
-</component>
-<component name="effects" filter="s60" long-name="Effects">
-<unit bldFile="os/mm/devsoundextensions/effects/group"/>
-</component>
-<component name="effectspresets" filter="s60" long-name="Effects Presets">
-<unit bldFile="os/mm/devsoundextensions/effectspresets/group"/>
-</component>
-<component name="effectspresets_utils" filter="s60" long-name="Effects Presets Utils">
-<!-- need to #include the lot from a single bld.inf
- Also move to a standard component location, not under effectspresets -->
-<unit bldFile="os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
-<unit bldFile="os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
-</component>
-<component name="telephonyaudiorouting" filter="s60" long-name="Telephony Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/group"/>
-</component>
-<component name="mmfcustominterfaces" filter="s60" long-name="MMF Custom Interfaces">
-<unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/group"/>
-</component>
-<component name="addeddevsoundcontrol" filter="s60" long-name="Added DevSound Control">
-<unit bldFile="os/mm/devsoundextensions/addeddevsoundcontrol/group"/>
-</component>
-<component name="globalaudiosettings" filter="s60" long-name="Global Audio Settings">
-<unit bldFile="os/mm/devsoundextensions/globalaudiosettings/group"/>
-</component>
-<component name="restrictedaudiooutput" filter="s60" long-name="Restricted Audio Output">
-<unit bldFile="os/mm/devsoundextensions/restrictedaudiooutput/group"/>
-</component>
-<component name="ciextnfactoryplugins" filter="s60" long-name="Custom Interface Extension Factory Plugins" plugin="Y">
-<unit bldFile="os/mm/devsoundextensions/ciextnfactoryplugins/group"/>
-</component>
-</collection>
-<collection name="mdfdevvideoextensions" long-name="MDF Dev Video Extensions" level="device-fw">
-<component name="nga_mdf_postprocessor" long-name="NGA MDF Postprocessor" filter="s60">
-<unit bldFile="os/mm/mdfdevvideoextensions/nga_mdf_postprocessor/group"/>
-</component>
-</collection>
-<collection name="audio" long-name="Audio Codecs" level="middleware">
-<component name="arm_cmmf_codecs" filter="s60" long-name="ARM CMMF Codecs" plugin="Y">
-<unit bldFile="os/mm/audio/arm_cmmf_codecs/group"/>
-</component>
-</collection>
-<collection name="video" long-name="Video Codecs" level="middleware">
-<!-- empty -->
-</collection>
-<collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
-<component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/imagingandcamerafws/imagingfws/group" mrp="os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
-</component>
-<component name="camerafw" long-name="Camera Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/imagingandcamerafws/camerafw/group" mrp="os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
-</component>
-</collection>
-<collection name="mmlibs" long-name="Multimedia Libraries" level="middleware">
-<component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmutilitylib/group" mrp="os/mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
-</component>
-<component name="mmfw" long-name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmfw/group" mrp="os/mm/mmlibs/mmfw/group/multimedia_mmf.mrp"/>
-</component>
-</collection>
-<collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
-<component name="imagingplugins" long-name="Imaging Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/imagingplugins/group" mrp="os/mm/mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
-</component>
-<component name="cameraplugins" long-name="Camera Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/cameraplugins/group" mrp="os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
-</component>
-<component name="lib3gp" long-name="3GP Library" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/mmplugins/lib3gp/group" mrp="os/mm/mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
-</component>
-<component name="mmfwplugins" long-name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/mmfwplugins/group" mrp="os/mm/mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
-</component>
-</collection>
-<collection name="mm_info" long-name="Multimedia Info" level="app-if">
-<component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc">
-<unit mrp="os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
-</component>
-<component name="mm_metadata" long-name="Multimedia Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
-<component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="^2" purpose="development">
-<unit bldFile="os/mm/mmresourcemgmt/mmresctrl/group" mrp="os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
-</component>
-</collection>
-<collection name="mmdevicefw" long-name="Multimedia Device Framework" level="device-fw">
-<component name="mdf" long-name="Media Device Framework" introduced="9.2" purpose="mandatory">
-<unit bldFile="os/mm/mmdevicefw/mdf/group" mrp="os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
-</component>
-<component name="speechrecogsupport" long-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 name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
-<component name="videorenderer" long-name="Video Renderer" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/mmswadaptation/videorenderer/group" mrp="os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
-</component>
-</collection>
-<collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw"/>
-<collection name="omxil" long-name="OpenMAX IL" level="hw-if">
-<component name="omxilapi" long-name="OpenMAX IL API" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilapi/group" mrp="os/mm/omxil/omxilapi/group/multimedia_omx_il_api.mrp" version="1"/>
-</component>
-<component name="omxilcore" long-name="OpenMAX IL Core" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcore/group" mrp="os/mm/omxil/omxilcore/group/multimedia_omx_il_core.mrp" version="1"/>
-</component>
-<component name="omxilcomponentcommon" long-name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcomponentcommon/group" mrp="os/mm/omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp" version="1"/>
-</component>
-<component name="omxilrefcomps" long-name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilrefcomps/ref_components/group" mrp="os/mm/omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp" version="1"/>
-</component>
-<component name="mmilapi" long-name="Multimedia Integration Layer API" introduced="^3" purpose="development">
-<unit bldFile="os/mm/omxil/mmilapi/group" mrp="os/mm/omxil/mmilapi/group/multimedia_il_api.mrp"/>
-</component>
-</collection>
-<collection name="devsound" long-name="Sound Device" level="devices">
-<component name="devsoundapi" long-name="DevSound API" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/devsound/devsoundapi/group" mrp="os/mm/devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
-</component>
-<component name="a3fdevsound" long-name="A3F DevSound" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3fdevsound/group" mrp="os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
-</component>
-<component name="a3facf" long-name="A3F Audio Component Framework" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3facf/group" mrp="os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
-</component>
-<component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/devsound/devsoundpluginsupport/group" mrp="os/mm/devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
-</component>
-<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">
-<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">
-<unit bldFile="os/mm/devsound/a3ftrace/group" mrp="os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
-</component>
-<component name="a3fsrvstart" long-name="A3F Server Start" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
-</component>
-</collection>
-<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
-<component name="devsoundhwdeviceapi" long-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 name="a3facl" long-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 name="a3fdevsoundcustomisation" long-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"/>
-</component>
-<component name="refacladapt" long-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"/>
-</component>
-<component name="videohai" long-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 name="dvbhreceiverhai" long-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>
-</block>
-<block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
-<collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
-<component name="exif_api" long-name="Exif API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagingext_plat" long-name="Imaging Extensions Platform Interfaces" level="app-if">
-<component name="jpeg2000_icl_plugin_api" long-name="JPEG2000 ICL plugin API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/jpeg2000_icl_plugin_api/group"/>
-</component>
-<component name="extended_icl_jpeg_api" long-name="Extended ICL Jpeg API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
-</component>
-<component name="h324_annex_k_custom_api" long-name="H324 Annex K Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/h324_annex_k_custom_api/group"/>
-</component>
-<component name="ecam_orientation_custom_api" long-name="ECam Orientation Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_orientation_custom_api/group"/>
-</component>
-<component name="ecam_ui_orientation_override_custom_api" long-name="ECam UI Orientation Override Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
-</component>
-<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>
-</collection>
-<collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
-<component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
-<unit bldFile="os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
-</component>
-<component name="imageadaptationextensions_build" filter="s60" long-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"/>
-</component>
-</collection>
-<collection name="imagingmodules" long-name="Imaging Modules" level="hw-if">
-<component name="exiflib" filter="s60" long-name="Exif Library">
-<unit bldFile="os/imagingext/imagingmodules/exiflib/group"/>
-</component>
-<component name="jp2kcodec" filter="s60" long-name="JPEG2000 Decoder Plugin" plugin="Y">
-<unit bldFile="os/imagingext/imagingmodules/jp2kcodec/group"/>
-</component>
-</collection>
-</block>
-<block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
-<component name="vgi" filter="s60" long-name="VGI">
-<unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
-</component>
-</collection>
-<collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adaptations">
-<component name="m3gcore11" filter="s60" long-name="M3G Core 1.1">
-<unit bldFile="os/graphics/m3g/m3gcore11/group"/>
-</component>
-</collection>
-<collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines">
-<component name="graphicsresource" long-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 name="graphicsresourceadaptation" long-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"/>
-</component>
-<component name="graphicsresourceimplementation" long-name="Graphics Resource Implementation" introduced="^4" purpose="optional">
-<unit bldFile="os/graphics/graphicsresourceservices/graphicsresourceimplementation/group" mrp="os/graphics/graphicsresourceservices/graphicsresourceimplementation/group/graphics_graphicsresourceimplementation.mrp"/>
-</component>
-<component name="graphicsresourceinterface" long-name="Graphics Resource Interface" introduced="^4" purpose="optional">
-<unit bldFile="os/graphics/graphicsresourceservices/graphicsresourceinterface/group" mrp="os/graphics/graphicsresourceservices/graphicsresourceinterface/group/graphics_graphicsresourceinterface.mrp"/>
-</component>
-</collection>
-<collection name="graphicsutils" long-name="Graphics Utils" level="engines">
-<component name="commongraphicsheaders" long-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 name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
-<!-- displayldd to be moved here -->
-<component name="surfacemgr" long-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 name="graphicscomposition" long-name="Graphics Composition" level="engines">
-<component name="openwfcinterface" long-name="OpenWF Composition Interface" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfcinterface/group" mrp="os/graphics/graphicscomposition/openwfcinterface/group/graphics_openwfcinterface.mrp"/>
-</component>
-<component name="openwfcompositionengine" long-name="OpenWF Composition Engine" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/graphicscomposition/openwfcompositionengine/group" mrp="os/graphics/graphicscomposition/openwfcompositionengine/group/graphics_openwfcompositionengine.mrp"/>
-</component>
-<component name="openwfsupport" long-name="OpenWF Support" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfsupport/group" mrp="os/graphics/graphicscomposition/openwfsupport/group/graphics_openwfsupport.mrp"/>
-</component>
-<component name="surfaceupdate" long-name="Surface Update" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/surfaceupdate/group" mrp="os/graphics/graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
-</component>
-</collection>
-<collection name="graphicstest" long-name="Graphics Test" level="app-if">
-<component name="uibench" long-name="UI Bench" introduced="9.2" purpose="development">
-<unit bldFile="os/graphics/graphicstest/uibench/group" mrp="os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
-</component>
-</collection>
-<collection name="graphics_plat" long-name="Graphics Platform Interfaces" level="app-if">
-<component name="m3g_core_api" filter="sf_build" long-name="M3G Core API" class="api">
-<unit bldFile="os/graphics/graphics_plat/m3g_core_api/group"/>
-</component>
-</collection>
-<collection name="graphics_info" long-name="Graphics Info" level="app-if">
-<component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc">
-<unit mrp="os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
-</component>
-<component name="graphics_metadata" long-name="Graphics Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
-</component>
-</collection>
-<collection name="windowing" long-name="Windowing" level="app-if">
-<component name="windowserver" long-name="Window Server" purpose="mandatory">
-<unit bldFile="os/graphics/windowing/windowserver/group" mrp="os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
-</component>
-<component name="windowserverplugins" long-name="Window Server Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/windowing/windowserverplugins/group" mrp="os/graphics/windowing/windowserverplugins/group/graphics_wserv_std_plugins.mrp"/>
-</component>
-</collection>
-<collection name="printingservices" long-name="Printing Services" level="app-if">
-<component name="printerdriversupport" long-name="Printer Driver Support" purpose="optional">
-<unit bldFile="os/graphics/printingservices/printerdriversupport/group" mrp="os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
-</component>
-<component name="printerdrivers" long-name="Printer Drivers" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/printingservices/printerdrivers/group" mrp="os/graphics/printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
-</component>
-</collection>
-<collection name="fbs" long-name="Font and Bitmap Server" level="device-interface">
-<component name="fontandbitmapserver" long-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 name="opengles" long-name="OpenGLES" level="internal-adaptations">
-<component name="openglesinterface" long-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 name="opengles_stub" filter="sf_build" long-name="OpenGL ES Stub" purpose="optional" introduced="^2">
-<unit bldFile="os/graphics/opengles/openglesinterface/group/opengles_stub"/>
-</component>
-</collection>
-<collection name="openvg" long-name="OpenVG" level="internal-adaptations">
-<component name="openvginterface" long-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 name="openvg11" filter="s60" long-name="OpenVG 1.1">
-<!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
-<unit bldFile="os/graphics/openvg/openvginterface/group/openvg11"/>
-</component>
-<component name="sfopenvg" filter="sf_build" long-name="Khronos OpenVG Reference Implementation" introduced="^2" purpose="optional">
-<unit bldFile="os/graphics/openvg/openvgrefimplementation/sfopenvg/group"/>
-</component>
-</collection>
-<collection name="egl" long-name="EGL" level="internal-adaptations">
-<component name="eglinterface" long-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 name="eglswitch" long-name="EGL Switch" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglswitch/group" mrp="os/graphics/egl/eglswitch/group/graphics_eglswitch.mrp"/>
-</component>
-<component name="eglrefimpl" long-name="EGL Reference Implementation" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglrefimpl/group" mrp="os/graphics/egl/eglrefimpl/group/graphics_eglrefimpl.mrp"/>
-</component>
-<component name="egltest" long-name="EGL Tests" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/egl/egltest/group" mrp="os/graphics/egl/egltest/group/graphics_egltest.mrp"/>
-</component>
-</collection>
-<collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
-<component name="gdi" long-name="GDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/gdi/group" mrp="os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
-</component>
-<component name="bitgdi" long-name="BitGDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
-</component>
-<component name="colourpalette" long-name="Colour Palette" introduced="7.0s" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
-</component>
-<component name="screendriver" long-name="Screen Driver" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/graphicsdeviceinterface/screendriver/group" mrp="os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
-</component>
-<component name="directgdi" long-name="DirectGDI" introduced="^3" deprecated="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/directgdi/group" mrp="os/graphics/graphicsdeviceinterface/directgdi/group/graphics_directgdi.mrp"/>
-</component>
-<component name="directgdiinterface" long-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 name="directgdiadaptation" long-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"/>
-</component>
-</collection>
-<collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
-<component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/gdi_tools/group" mrp="os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
-</component>
-</collection>
-<collection name="graphicsapitest" long-name="Graphics API Tests" level="app-if"/>
-</block>
-<block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
-<collection name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" level="text">
-<component name="findutil_api" long-name="Find Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/findutil_api/group"/>
-</component>
-<component name="japanese_language_utilities_api" long-name="Japanese Language Utilities API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
-</component>
-<component name="sortutil_api" long-name="Sorting Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/sortutil_api/group"/>
-</component>
-</collection>
-<collection name="textandloc_pub" long-name="Text and Localisation Public Interfaces" level="text">
-<component name="directory_localizer_api" long-name="Directory Localizer API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_pub/directory_localizer_api/group"/>
-</component>
-</collection>
-<collection name="charconvfw" long-name="Character Conversion" level="encoding">
-<component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional">
-<unit bldFile="os/textandloc/charconvfw/charconv_fw/group" mrp="os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
-</component>
-<component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/charconvplugins/group" mrp="os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
-</component>
-<component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/fatfilenameconversionplugins/group" mrp="os/textandloc/charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
-</component>
-</collection>
-<collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
-<component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/textshaperplugin/group" mrp="os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
-</component>
-<component name="fontstore" long-name="Font Store" purpose="mandatory">
-<unit bldFile="os/textandloc/fontservices/fontstore/group" mrp="os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
-</component>
-<component name="textrendering" long-name="Text Rendering" purpose="mandatory" class="placeholder">
-<!-- placeholder for text code from GDI -->
-</component>
-<component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/freetypefontrasteriser/group" mrp="os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
-</component>
-<component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional">
-<unit bldFile="os/textandloc/fontservices/referencefonts/group" mrp="os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
-</component>
-</collection>
-<collection name="textlayout" long-name="Text Layout" level="text">
-<component name="texthandling" long-name="Text Handling" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/texthandling/group" mrp="os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
-</component>
-<component name="textformatting" long-name="Text Formatting" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/textformatting/group" mrp="os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
-</component>
-</collection>
-<collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
-<!-- components in this collection need to be moved to the right collection.
- Either move into the units' directories, or create a new textandlocutils directory -->
-<component name="numbergrouping" filter="s60" long-name="Number Grouping">
-<unit bldFile="os/textandloc/charconvfw/numbergrouping/group"/>
-</component>
-<component name="jplangutil" filter="s60" long-name="Japanese Language Utilities">
-<unit bldFile="os/textandloc/charconvfw/jplangutil/group"/>
-</component>
-<component name="sortutil" filter="s60" long-name="Sorting Utility">
-<unit bldFile="os/textandloc/charconvfw/sortutil/group"/>
-</component>
-<component name="inlinetext" filter="s60" long-name="Inline Text">
-<unit bldFile="os/textandloc/charconvfw/inlinetext/group"/>
-</component>
-<component name="nearestlangutil" long-name="Nearest Language Util" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-<component name="numberformatting" long-name="Number Formatting" introduced="7.0s" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/numberformatting/group" mrp="os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
-</component>
-</collection>
-<collection name="localesupport" long-name="Locale Support" level="util">
-<component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/localisation/localesupport" mrp="os/textandloc/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
-</component>
-<component name="initlocale" long-name="Initialise Locale" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-</collection>
-<collection name="textandloctools" long-name="Text and Localisation Tools" level="tools">
-<component name="fontcompiler" long-name="Font Compiler" purpose="development" class="placeholder PC">
-<!-- placeholder for split from GDI Tools -->
-</component>
-<component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/bitmapfonttools/group" mrp="os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
-</component>
-</collection>
-<collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
-<component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
-<collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
-<component name="xmlsrv_plat_build" long-name="XML Services Platform Interface Build" filter="s60" class="api">
-<!-- need to fix the configuration used here.
- Either destribute to other components or use the new feature flags confguration mechanisms.
- Remove this component and uncomment the other units when fixed-->
-<unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
-</component>
-<component name="xml_encryption_api" long-name="XML Encryption API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/> -->
-</component>
-<component name="xml_signature_api" long-name="XML Signature API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_signature_api/group"/> -->
-</component>
-<component name="xml_security_engine_utils_api" long-name="XML Security Engine Utils API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/> -->
-</component>
-</collection>
-<collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
-<component name="xmlseccertman" filter="s60" long-name="XML Security Certificate Manager">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
-</component>
-<component name="xmlsec" filter="s60" long-name="XML Security">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsec/group"/>
-</component>
-<component name="xmlseccrypto" filter="s60" long-name="XML Security Crypto">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccrypto/group"/>
-</component>
-<component name="xmlsecwrapper" filter="s60" long-name="XML Security Wrapper">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsecwrapper/group"/>
-</component>
-</collection>
-<collection name="xml" long-name="XML" level="generic">
-<component name="xmlfw" long-name="XML Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmlfw/group" mrp="os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
-</component>
-<component name="libxml2libs" long-name="Libxml2 Libraries" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/libxml2libs/group" mrp="os/xmlsrv/xml/libxml2libs/group/syslibs_libxml2.mrp"/>
-</component>
-<component name="legacyminidomparser" long-name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/legacyminidomparser/GROUP" mrp="os/xmlsrv/xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp"/>
-</component>
-<component name="xmldomandxpath" long-name="XML DOM and XPath" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmldomandxpath/group" mrp="os/xmlsrv/xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
-</component>
-<component name="xmlexpatparser" long-name="XML Expat Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmlexpatparser/group" mrp="os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
-</component>
-<component name="xmllibxml2parser" long-name="XML Libxml2 Parser" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmllibxml2parser/group" mrp="os/xmlsrv/xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
-</component>
-<component name="wbxmlparser" long-name="WBXML Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/wbxmlparser/group" mrp="os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
-</component>
-</collection>
-<collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
-<component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="deviceplatformrelease" level="services" long-name="Device Platform Release" levels="bld mid top">
-<collection name="s60extras" long-name="S60 Extras" level="mid">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="s60extras_build" filter="s60" long-name="S60 Extras Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/S60Extras/group"/>
-</component>
-</collection>
-<collection name="version" long-name="Version" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="version_build" filter="s60" long-name="Version Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/Version/group"/>
-</component>
-</collection>
-<collection name="helps_loc2" long-name="Helps Locale 2" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helps_loc2_build" long-name="Helps Locale 2 Build" filter="s60">
-<unit bldFile="os/deviceplatformrelease/helps_loc2/group"/>
-</component>
-</collection>
-<collection name="sf_config" long-name="SF Config" level="mid">
-<component name="config" filter="s60" long-name="Config" purpose="development" class="config"/>
-<component name="cenrep" filter="sf_build" long-name="ConE Central Repository Config" purpose="development" class="config">
-<!-- will should give the id/path something more unique than cenrep -->
-<unit bldFile="os/deviceplatformrelease/sf_config/cenrep/group"/>
-</component>
-<component name="rombuild_syborg" filter="sf_build" long-name="Syborg iMaker Config" purpose="development" introduced="^3" class="config">
-<unit bldFile="os/deviceplatformrelease/sf_config/rombuild/syborg/group"/>
-</component>
-<component name="rombuild_zoom2" filter="sf_build" long-name="Zoom2 iMaker Config" purpose="development" introduced="^3" class="config">
-<unit bldFile="os/deviceplatformrelease/sf_config/rombuild/zoom2/group"/>
-</component>
-</collection>
-<!-- should be located locally in buildplatforms/group
- <collection id="s60bld" name="S60 Build">
- <component id="buildplatforms" filter="s60" name="Build Platforms">
- <unit bldFile="/tools/buildplatforms/group"/>
- </component>
- </collection>-->
-<collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
-<component name="cedarutils" long-name="Cedar Utils" purpose="development">
-<unit mrp="os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
-</component>
-<component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt" purpose="development" class="config">
-<unit mrp="os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
-</component>
-<component name="foundation_s60_packages" long-name="Foundation S60 Packages" introduced="^3" deprecated="^3" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/symbianosbld/foundation_s60_packages/foundation_s60_packages.mrp"/>
-</component>
-</collection>
-<collection name="foundation_system" long-name="Foundation System" level="top">
-<component name="system_model" long-name="System Model" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
-</component>
-</collection>
-<collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
-<component name="deviceplatformrelease_metadata" long-name="Device Platform Release Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="osrndtools" level="services" long-name="OS R&D tools" levels="fw trace">
-<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"/>
-</component>
-<component name="testinterface" filter="s60" long-name="Test Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/testinterface/group"/>
-</component>
-<component name="testserver" filter="s60" long-name="Test Server" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserver/group"/>
-</component>
-<component name="testengine" filter="s60" long-name="Test Engine" purpose="development">
-<unit bldFile="os/osrndtools/stif/testengine/group"/>
-</component>
-<component name="testserverstarter" filter="s60" long-name="Test Server Starter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserverstarter/group"/>
-</component>
-<component name="stiftfwif" filter="s60" long-name="STIF Test Framework Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/stiftfwif/group"/>
-</component>
-<component name="consoleui" filter="s60" long-name="Console UI" purpose="development">
-<unit bldFile="os/osrndtools/stif/consoleui/group"/>
-</component>
-<component name="testcombiner" filter="s60" long-name="Test Combiner" purpose="development">
-<unit bldFile="os/osrndtools/stif/testcombiner/group"/>
-</component>
-<component name="demomodule" filter="s60" long-name="Demo Module" purpose="development">
-<unit bldFile="os/osrndtools/stif/demomodule/group"/>
-</component>
-<component name="atslogger" filter="s60" long-name="ATS Logger" purpose="development">
-<unit bldFile="os/osrndtools/stif/atslogger/group"/>
-</component>
-<component name="atsinterface" filter="s60" long-name="ATS Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/atsinterface/group"/>
-</component>
-<component name="testscripter" filter="s60" long-name="Test Scripter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testscripter/group"/>
-</component>
-<component name="suevent" filter="s60" long-name="SU Event" purpose="development">
-<unit bldFile="os/osrndtools/stif/suevent/group"/>
-</component>
-<component name="stifkerneltestclassbase" filter="s60" long-name="STIF Kernel Test Class Base" purpose="development">
-<!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
-<!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
-</component>
-<component name="stif_build" filter="s60" long-name="STIF Build" purpose="development">
-<!-- move exports into self-contained component. Remove this when configuration is in place-->
-<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">
-<unit bldFile="os/osrndtools/memspy/memspy_plat/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/engine/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/console/group"/>
-</component>
-<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>
-</collection>
-<collection name="hti" long-name="Harmonized Test Interface" level="trace">
-<component name="hti_plat" filter="s60" long-name="HTI Platform Interfaces" purpose="development" class="api">
-<unit bldFile="os/osrndtools/hti/hti_plat/group"/>
-</component>
-<component name="hticfg" filter="s60" long-name="HTI Config" purpose="development">
-<unit bldFile="os/osrndtools/hti/hticfg/group"/>
-</component>
-<component name="htiautostart" filter="s60" long-name="HTI Autostart" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiautostart/group"/>
-</component>
-<component name="htiframework" filter="s60" long-name="HTI Framework" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiframework/group"/>
-</component>
-<component name="hticommplugins" filter="s60" long-name="HTI Communication Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
-</component>
-<component name="htiserviceplugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
-</component>
-<component name="htifilehlp" filter="s60" long-name="HTI File Help" purpose="development">
-<unit bldFile="os/osrndtools/hti/htifilehlp/group"/>
-</component>
-<component name="htiwatchdog" filter="s60" long-name="HTI Watchdog" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiwatchdog/group"/>
-</component>
-<component name="hti_build" filter="s60" long-name="HTI Build" purpose="development">
-<!-- move exports into self-contained component.-->
-<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">
-<block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
-<collection name="appsupport_pub" long-name="Generic Application Support Public Interfaces" level="specific">
-<component name="flash_viewer_framework_api" long-name="Flash Viewer Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
-</component>
-<component name="network_status_api" long-name="Network Status API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/network_status_api/group"/>
-</component>
-</collection>
-<collection name="appsupport_plat" long-name="Generic Application Support Platform Interfaces" level="specific">
-<component name="action_plugin_api" long-name="Action Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/action_plugin_api/group"/>
-</component>
-<component name="application_orientation_api" long-name="Application Orientation API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/application_orientation_api/group"/>
-</component>
-<component name="context_access_api" long-name="Context Access API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_access_api/group"/>
-</component>
-<component name="context_framework_services_api" long-name="Context Framework Services API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_services_api/group"/>
-</component>
-<component name="context_framework_client_api" long-name="Context Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_client_api/group"/>
-</component>
-<component name="context_framework_listener_api" long-name="Context Framework Listener API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_listener_api/group"/>
-</component>
-<component name="context_framework_version_api" long-name="Context Framework Version API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_version_api/group"/>
-</component>
-<component name="context_source_plugin_api" long-name="Context Source Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_plugin_api/group"/>
-</component>
-<component name="context_source_settings_manager_api" long-name="Context Source Settings Manager API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_settings_manager_api/group"/>
-</component>
-<component name="context_subscription_api" long-name="Context Subscription API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_subscription_api/group"/>
-</component>
-<component name="key_event_framework_api" long-name="Key Event Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_api/group"/>
-</component>
-<component name="key_event_framework_mapper_api" long-name="Key Event Framework Mapper API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_mapper_api/group"/>
-</component>
-<component name="media_keys_definition_api" long-name="Media Keys Definition API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/media_keys_definition_api/group"/>
-</component>
-<component name="ood_threshold_api" long-name="OOD Threshold API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/ood_threshold_api/group"/>
-</component>
-<component name="oom_monitor_api" long-name="OOM Monitor API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_api/group"/>
-</component>
-<component name="oom_monitor_plugin_api" long-name="OOM Monitor Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_plugin_api/group"/>
-</component>
-<component name="operation_provider_api" long-name="Operation Provider API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/operation_provider_api/group"/>
-</component>
-<component name="phonecmdhandler_api" long-name="Phone Command Handler API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/phonecmdhandler_api/group"/>
-</component>
-<component name="restore_factory_settings_api" long-name="Restore Factory Settings API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_api/group"/>
-</component>
-<component name="restore_factory_settings_plugin_api" long-name="Restore Factory Settings Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_plugin_api/group"/>
-</component>
-<component name="secondary_display_accfw_api" long-name="Secondary Display Accessory Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_accfw_api/group"/>
-</component>
-<component name="secondary_display_startup_api" long-name="Secondary Display Startup API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_startup_api/group"/>
-</component>
-<component name="secondary_display_sysap_api" long-name="Secondary Display System Application API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_sysap_api/group"/>
-</component>
-<component name="secondary_display_system_state_api" long-name="Secondary Display System State API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_system_state_api/group"/>
-</component>
-<component name="sensor_user_setting_api" long-name="Sensor User Setting API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/sensor_user_setting_api/group"/>
-</component>
-<component name="startup_configuration_api" long-name="Startup Configuration API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/startup_configuration_api/group"/>
-</component>
-<component name="system_application_key_handler_plugin_api" long-name="System Application Key Handler Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_key_handler_plugin_api/group"/>
-</component>
-<component name="system_application_light_control_plugin_api" long-name="System Application Light Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_light_control_plugin_api/group"/>
-</component>
-<component name="system_application_notification_api" long-name="System Application Notification API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_notification_api/group"/>
-</component>
-<component name="system_application_plugin_callback_api" long-name="System Application Plug-in Callback API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
-</component>
-<component name="flash_mmi_service_interface_custom_api" long-name="Flash MMI Service Interface Custom API" filter="s60,!sf_build" introduced="^2" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/flash_mmi_service_interface_custom_api/group"/>
-</component>
-<component name="flash_netscape_plugin_command_api" long-name="Flash Netscape Plugin Command API" filter="s60,!sf_build" introduced="^2" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/flash_netscape_plugin_command_api/group"/>
-</component>
-</collection>
-<collection name="contextframework" long-name="Context Framework" level="framework">
-<!-- the units that are commented out need to be put back when configuration is in place.
- They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
-<component name="cfw" filter="s60" long-name="Context Framework">
-<!--<unit bldFile="contextframework/cfw/group"/> -->
-</component>
-<component name="cfwplugins" filter="s60" long-name="Context Framework Plugins" plugin="Y">
-<!--<unit bldFile="contextframework/cfwplugins/group"/>-->
-</component>
-<component name="contextframework_build" filter="s60" long-name="Context Framework Build">
-<unit bldFile="mw/appsupport/contextframework/group"/>
-</component>
-</collection>
-<collection name="coreapplicationuis" long-name="Core Application UIs" level="server">
-<component name="dbrecovery" filter="s60" long-name="Database Recovery">
-<unit bldFile="mw/appsupport/coreapplicationuis/dbrecovery/group"/>
-</component>
-<component name="nspswsplugin" filter="s60" long-name="NSPS WS Plugin" plugin="Y">
-<!-- No Service Power Save? Window Server? Please elaborate-->
-<unit bldFile="mw/appsupport/coreapplicationuis/nspswsplugin/group"/>
-</component>
-<component name="rfs" filter="s60" long-name="Restore Factory Settings">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfs/group"/>
-</component>
-<component name="rfsplugins" filter="s60" long-name="Restore Factory Settings Plugins" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/group"/>
-</component>
-<component name="sysap" filter="s60" long-name="System Application">
-<unit bldFile="mw/appsupport/coreapplicationuis/sysap/group"/>
-</component>
-<component name="variatedsettings" filter="s60" long-name="Variated Settings" class="config">
-<unit bldFile="mw/appsupport/coreapplicationuis/variatedsettings/group"/>
-</component>
-<component name="accfwuinotifier" filter="s60" long-name="Accessory Framework UI Notifier" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/accfwuinotifier/group"/>
-</component>
-<component name="kefmapper" filter="s60" long-name="Key Event Framework">
-<unit bldFile="mw/appsupport/coreapplicationuis/kefmapper/group"/>
-</component>
-<component name="advancedtspcontroller" filter="s60" long-name="Advanced TSP Controller">
-<unit bldFile="mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
-</component>
-<component name="powersaveutilities" filter="s60" long-name="Power Save Utilities">
-<unit bldFile="mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
-</component>
-<component name="gsserverenginestub" filter="s60" long-name="GS Server Engine Stub">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
-</component>
-<component name="gsserverengine" filter="s60" long-name="GS Server Engine">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverengine/group"/>
-</component>
-<component name="sensordatacompensatorplugin" filter="s60" long-name="Sensor Data Compensator Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/group"/>
-</component>
-<component name="atcmdplugin" long-name="AT Command Plugin" filter="s60,!oem_build" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/atcmdplugin/group"/>
-</component>
-</collection>
-<collection name="flashliteapi_3_1" long-name="Flash Lite API 3.1" level="specific">
-<!-- collection is really a component. Move down a directory -->
-<component name="flashliteapi_3_1_build" long-name="Flash Lite API Build" filter="s60" introduced="^2"/>
-</collection>
-<collection name="mediakeys" long-name="Media Keys" level="plugin">
-<!-- collection is really a component. Move down a directory -->
-<component name="mediakeys_build" filter="s60" long-name="Media Keys Build">
-<unit bldFile="mw/appsupport/mediakeys/group"/>
-</component>
-</collection>
-<collection name="startupservices" long-name="Startup Services" level="system">
-<component name="splashscreen" filter="s60" long-name="Splash Screen">
-<unit bldFile="mw/appsupport/startupservices/splashscreen/group"/>
-</component>
-<component name="startupanimation" filter="s60" long-name="Startup Animation">
-<unit bldFile="mw/appsupport/startupservices/startupanimation/group"/>
-</component>
-<component name="startup" long-name="Startup Application" filter="s60">
-<unit bldFile="mw/appsupport/startupservices/startup/group"/>
-</component>
-</collection>
-<collection name="sysresmonitoring" long-name="System Resource Monitoring" level="system">
-<component name="oodmonitor" filter="s60" long-name="OOD Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oodmonitor/group"/>
-</component>
-<component name="oommonitor" filter="s60" long-name="OOM Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oommonitor/group"/>
-</component>
-</collection>
-<collection name="systemsettings" long-name="System Settings" level="system">
-<component name="gssensorplugin" filter="s60" long-name="GS Sensor Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gssensorplugin/group"/>
-</component>
-<component name="gsaccessoryplugin" filter="s60" long-name="GS Accessory Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gsaccessoryplugin/group"/>
-</component>
-</collection>
-<collection name="filehandling" long-name="File Handling" level="server">
-<component name="fileconverterfw" long-name="File Converter Framework" purpose="optional">
-<unit bldFile="mw/appsupport/filehandling/fileconverterfw/group" mrp="mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
-</component>
-<component name="htmltorichtextconverter" long-name="HTML to RichText Converter" introduced="7.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/htmltorichtextconverter/group" mrp="mw/appsupport/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
-</component>
-<component name="richtexttohtmlconverter" long-name="RichText to HTML Converter" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
-</component>
-</collection>
-<collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
-<component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
-</component>
-</collection>
-<collection name="commonappservices" long-name="Common Application Services" level="framework">
-<component name="alarmserver" long-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"/>
-</component>
-<component name="alarmservertest" long-name="Alarm Server Test" deprecated="^3" introduced="8.1" purpose="development">
-<unit bldFile="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
-</component>
-<component name="appservicesdocs" long-name="Application Services Documentation" purpose="development" class="doc">
-<unit mrp="mw/appsupport/commonappservices/appservicesdocs/app-services_documentation.mrp"/>
-</component>
-<component name="backuprestorenotification" long-name="Backup Restore Notification" introduced="8.1" purpose="optional">
-<unit bldFile="mw/appsupport/commonappservices/backuprestorenotification/group" mrp="mw/appsupport/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
-</component>
-</collection>
-<collection name="tzservices" long-name="Time Zone Services" level="plugin">
-<component name="tzserver" long-name="Time Zone Server" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzserver/group" mrp="mw/appsupport/tzservices/tzserver/group/app-services_tz.mrp"/>
-</component>
-<component name="tzloc" long-name="Time Zone Localization" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzloc/group" mrp="mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
-</component>
-<component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzlocrscfactory/group" mrp="mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
-</component>
-<component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzdatabase/group" mrp="mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
-</component>
-</collection>
-<collection name="contenthandling" long-name="Content Handling" level="plugin">
-<component name="webrecognisers" long-name="Web Recognisers" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/contenthandling/webrecognisers/group" mrp="mw/appsupport/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
-</component>
-</collection>
-<collection name="openenvutils" long-name="Open Environment Utilities" level="specific">
-<component name="commandshell" long-name="Command Shell" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/commandshell/group" mrp="mw/appsupport/openenvutils/commandshell/group/oetools_zsh.mrp"/>
-</component>
-<component name="telnetserver" long-name="Telnet Server" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/telnetserver/group" mrp="mw/appsupport/openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
-</component>
-</collection>
-<collection name="printingsupport" long-name="Printing Support" level="generic">
-<component name="printinguisupport" long-name="Printing UI Support" purpose="optional" introduced="^2" deprecated="^3">
-<unit bldFile="mw/appsupport/printingsupport/printinguisupport/group" mrp="mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
-</component>
-</collection>
-<collection name="appfw" long-name="Application Framework" level="framework">
-<component name="apparchitecture" long-name="Application Architecture" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/apparchitecture/group" mrp="mw/appsupport/appfw/apparchitecture/group/app-framework_apparc.mrp"/>
-</component>
-<component name="viewserver" long-name="View Server" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/viewserver/group" mrp="mw/appsupport/appfw/viewserver/group/app-framework_viewsrv.mrp"/>
-</component>
-</collection>
-<collection name="applaunchservices" long-name="Application Launch Services" level="generic">
-<component name="aftermarketappstarter" long-name="After Market Application Starter" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/aftermarketappstarter/group" mrp="mw/appsupport/applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
-</component>
-<component name="applaunchplugins" long-name="Application Launch Plugins" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/applaunchplugins/group" mrp="mw/appsupport/applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
-</component>
-</collection>
-<collection name="tzpcside" long-name="Time Zone PC Side" level="plugin">
-<component name="tzcompiler" long-name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config PC">
-<unit bldFile="mw/appsupport/tzpcside/tzcompiler/group" mrp="mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
-</component>
-</collection>
-<collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
-<component name="appsupport_metadata" long-name="Generic Application Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="securitysrv" level="generic" long-name="Security Services" levels="plugin framework server generic specific">
-<collection name="secsrv_plat" long-name="Security Services Platform Interfaces" level="specific">
-<component name="cms_api" long-name="CMS API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/cms_api/group"/>
-</component>
-<component name="pkcs12_parser_api" long-name="PKCS12 Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkcs12_parser_api/group"/>
-</component>
-<component name="java_utils_api" long-name="Java Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/java_utils_api/group"/>
-</component>
-<component name="wim_cert_api" long-name="WIM Cert API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/wim_cert_api/group"/>
-</component>
-<component name="device_key_store_encryption_plugin_api" long-name="Device Key Store Encryption Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/device_key_store_encryption_plugin_api/group"/>
-</component>
-<component name="x509certnameparser_api" long-name="X.509 Certificate Name Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
-</component>
-<component name="remote_lock_api" long-name="Remote Lock API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
-</component>
-<component name="pkidialog_api" long-name="PKI Dialog API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
-</component>
-<component name="provisioning_api" long-name="Provisioning API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/provisioning_api/group"/>
-</component>
-<component name="keyguard_configuration_api" long-name="Keyguard Configuration API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_configuration_api/group"/>
-</component>
-<component name="keylock_policy_api" long-name="Keylock Policy API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keylock_policy_api/group"/>
-</component>
-<component name="security_code_ui_api" long-name="Security Code UI API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
-</component>
-<component name="gba_api" long-name="GBA API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/gba_api/group"/>
-</component>
-<component name="keyguard_access_api" long-name="Keyguard Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_access_api/group"/>
-</component>
-<component name="devicelock_access_api" long-name="Device Lock Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devicelock_access_api/group"/>
-</component>
-<component name="lockapp_server_api" long-name="Lock Application Server API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
-</component>
-<component name="devencadaptation_api" long-name="Device Encryption Adaptation API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
-</component>
-<component name="devenccommonutils_api" long-name="Device Encryption Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
-</component>
-</collection>
-<collection name="cms" long-name="Certificate Management Service" level="server">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="cms_build" filter="s60" long-name="CMS" introduced="^3">
-<unit bldFile="mw/securitysrv/cms/group"/>
-</component>
-</collection>
-<collection name="pkiutilities" long-name="PKI Utilities" level="plugin">
-<component name="x509certnameparser" filter="s60" long-name="X.509 Certificate Name Parser">
-<unit bldFile="mw/securitysrv/pkiutilities/x509certnameparser/group"/>
-</component>
-<component name="pkcs12" filter="s60" long-name="PKCS #12">
-<unit bldFile="mw/securitysrv/pkiutilities/pkcs12/group"/>
-</component>
-<component name="certmanui" filter="s60" long-name="Certificate Management UI">
-<unit bldFile="mw/securitysrv/pkiutilities/certmanui/group"/>
-</component>
-<component name="ctsecuritydialogs" filter="s60" long-name="Crypto Token Security Dialogs">
-<unit bldFile="mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
-</component>
-<component name="certsaver" filter="s60" long-name="Certificate Saver">
-<unit bldFile="mw/securitysrv/pkiutilities/certsaver/group"/>
-</component>
-<component name="secmodui" filter="s60" long-name="Security Module UI">
-<unit bldFile="mw/securitysrv/pkiutilities/secmodui/group"/>
-</component>
-<component name="devicetoken" filter="s60" long-name="Device Token">
-<unit bldFile="mw/securitysrv/pkiutilities/devicetoken/group"/>
-</component>
-<component name="certificates" filter="s60" long-name="Certificates">
-<unit bldFile="mw/securitysrv/pkiutilities/Certificates/group" filter="sf_build"/>
-</component>
-<component name="pkiutilities_build" filter="s60" long-name="PKI Utilities Build">
-<!-- need to split this into the above components -->
-<unit bldFile="mw/securitysrv/pkiutilities/group"/>
-</component>
-<component name="ocsp" long-name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
-<unit bldFile="mw/securitysrv/pkiutilities/ocsp/group" mrp="mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
-</component>
-</collection>
-<collection name="wim" long-name="Wireless Identity Module " level="framework">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="wim_build" filter="s60" long-name="WIM Build">
-<unit bldFile="mw/securitysrv/wim/group"/>
-</component>
-</collection>
-<collection name="remotelock" long-name="Remote Lock" level="generic">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="remotelock_build" filter="s60" long-name="Remote Lock Build">
-<unit bldFile="mw/securitysrv/remotelock/group"/>
-</component>
-</collection>
-<collection name="securitydialogs" long-name="Security Dialogs" level="specific">
-<component name="keylockpolicyapi" filter="s60" long-name="Keylock Policy API">
-<unit bldFile="mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
-</component>
-<component name="autolock" long-name="Autolock" filter="s60">
-<unit bldFile="mw/securitysrv/securitydialogs/autolock/group"/>
-</component>
-<component name="secui" filter="s60" long-name="Security UI">
-<unit bldFile="mw/securitysrv/securitydialogs/secui/group"/>
-</component>
-<component name="securitynotifier" filter="s60" long-name="Security Notifier">
-<unit bldFile="mw/securitysrv/securitydialogs/securitynotifier/group"/>
-</component>
-<component name="lockclient" filter="s60" long-name="Lock Client" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockclient/group"/>
-</component>
-<component name="lockapp" filter="s60" long-name="Lock Application" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockapp/group"/>
-</component>
-<component name="secuinotifications" long-name="Security UI Notifications" introduced="^4" filter="s60">
-<unit bldFile="mw/securitysrv/securitydialogs/secuinotifications" proFile="secuinotifications.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="boottimeintegritycheck_build" filter="s60" long-name="Boot Time Integrity Check Build">
-<unit bldFile="mw/securitysrv/boottimeintegritycheck/group"/>
-</component>
-</collection>
-<collection name="gba" long-name="Generic Bootstrapping Architecture" level="server">
-<component name="uicc" filter="s60" long-name="UICC" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/uicc/group"/>
-</component>
-<component name="gbaserver" filter="s60" long-name="GBA Server" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaserver/group"/>
-</component>
-<component name="gbaapi" filter="s60" long-name="GBA API" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaapi/group"/>
-</component>
-<component name="gbafilter" filter="s60" long-name="GBA HTTP Filter" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/gbafilter/group"/>
-</component>
-<component name="gba_build" filter="s60" long-name="Generic Boot Architecture Build" introduced="^2">
-<!-- need to split this into the above components, or remove #includes and make this GBA ROM -->
-<unit bldFile="mw/securitysrv/gba/group"/>
-</component>
-</collection>
-<collection name="devencdiskutils" long-name="Device Encryption Disk Utils" level="server">
-<component name="devenccommonutils" filter="s60" long-name="Device Encryption Common Utils" introduced="^3">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncCommonUtils/group"/>
-</component>
-<component name="devencrfsplugin" filter="s60" long-name="Device Encryption RFS Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncRfsPlugin/group"/>
-</component>
-<component name="pk5recognizer" filter="s60" long-name="Device Encryption Pk5 Recognizer" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/Pk5Recognizer/group"/>
-</component>
-<component name="devencstarter" filter="s60" long-name="Device Encryption Starter" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncStarter/group"/>
-</component>
-<component name="devencdiskutils" filter="s60" long-name="Device Encryption Disk Utils Build" introduced="^3">
-<!-- need to split this into the above components, or remove #includes and make this a ROM component-->
-<unit bldFile="mw/securitysrv/devencdiskutils/group"/>
-</component>
-</collection>
-<collection name="securitysrv_info" long-name="Security Services Info" level="specific">
-<component name="securitysrv_metadata" long-name="Security Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="drm" level="generic" long-name="DRM" levels="plugin framework server generic specific">
-<collection name="drm_plat" long-name="DRM Platform Interfaces" level="specific">
-<component name="roap_api" long-name="ROAP API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/roap_api/group"/>
-</component>
-<component name="drm_common_api" long-name="DRM Common API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_common_api/group"/>
-</component>
-<component name="drm_rights_api" long-name="DRM Rights API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_rights_api/group"/>
-</component>
-<component name="drm_legacy_api" long-name="DRM Legacy API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_legacy_api/group"/>
-</component>
-<component name="dcf_repository_api" long-name="DCF Repository API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/dcf_repository_api/group"/>
-</component>
-<component name="drm_service_api" long-name="DRM Service API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_service_api/group"/>
-</component>
-<component name="drm_secondary_display_api" long-name="DRM Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_secondary_display_api/group"/>
-</component>
-<component name="drm_license_manager_api" long-name="DRM License Manager API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_license_manager_api/group"/>
-</component>
-<component name="drm_utility_api" long-name="DRM Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_utility_api/group"/>
-</component>
-<component name="drm_agents_api" long-name="DRM Agents API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_agents_api/group"/>
-</component>
-<component name="wmdrm_core_api" long-name="WM DRM Core API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_core_api/group"/>
-</component>
-<component name="wmdrm_access_api" long-name="WMDRM Access API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_access_api/group"/>
-</component>
-<component name="camese_utility_api" long-name="Camese Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_utility_api/group"/>
-</component>
-<component name="camese_framework_api" long-name="Camese Framework API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_framework_api/group"/>
-</component>
-</collection>
-<collection name="drm_pub" long-name="DRM Public Interfaces" level="specific">
-<component name="drm_helper_api" long-name="DRM Helper API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_helper_api/group"/>
-</component>
-<component name="oma_drm_caf_agent_api" long-name="OMA DRM CAF Agent API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/group"/>
-</component>
-<component name="drm_license_checker_api" long-name="DRM License Checker API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_license_checker_api/group"/>
-</component>
-</collection>
-<collection name="commondrm" long-name="Common DRM" level="generic">
-<!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
-<component name="drmencryptor" filter="s60" long-name="DRM Encryptor" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmsettingsplugin" filter="s60" long-name="DRM Settings Plugin" plugin="Y" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmrightsmanagerui" filter="s60" long-name="DRM Rights Manager UI">
-<unit bldFile="mw/drm/commondrm/drmrightsmanagerui/help/group"/>
-</component>
-<component name="drmutility" filter="s60" long-name="DRM Utility">
-<!-- Uncomment unit when configuration is in place. Currently #included from commondrm_build -->
-<!--<unit bldFile="commondrm/drmutility/group"/>-->
-</component>
-<component name="drmserviceapiwrapper" filter="s60" long-name="DRM Service API Wrapper">
-<unit bldFile="mw/drm/commondrm/drmserviceapiwrapper/group"/>
-</component>
-<component name="drmrightsstoringlocation" filter="s60" long-name="DRM Rights Storing Location">
-<unit bldFile="mw/drm/commondrm/drmrightsstoringlocation/group"/>
-</component>
-<component name="commondrm_build" filter="s60" long-name="Common DRM Build">
-<!-- should be split into the above files, or them collapsed into a single component -->
-<unit bldFile="mw/drm/commondrm/group"/>
-</component>
-</collection>
-<collection name="omadrm" long-name="OMA DRM" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="omadrm_build" filter="s60" long-name="OMA DRM Build">
-<unit bldFile="mw/drm/omadrm/group"/>
-</component>
-<component name="foundationcerts" filter="sf_build" long-name="Foundation Certificates">
-<unit bldFile="mw/drm/omadrm/foundationcerts/group"/>
-</component>
-</collection>
-<collection name="wmdrm" long-name="Windows Media DRM" level="framework">
-<!-- collection is really a component. Move down a directory -->
-<component name="wmdrm_build" filter="s60" long-name="WM DRM Build">
-<unit bldFile="mw/drm/wmdrm/group"/>
-</component>
-</collection>
-<collection name="drm_info" long-name="DRM Info" level="specific"/>
-</block>
-<block name="locationsrv" level="specific" long-name="Location Services" levels="plugin fw server if">
-<collection name="locsrv_pub" long-name="Location Services Public Interfaces" level="if">
-<component name="landmarks_search_api" long-name="Landmarks Search API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
-</component>
-<component name="landmarks_api" long-name="Landmarks API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/group"/>
-</component>
-<component name="landmarks_database_management_api" long-name="Landmarks Database Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/group"/>
-</component>
-<component name="location_triggering_api" long-name="Location Triggering API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/location_triggering_api/group"/>
-</component>
-<component name="blid_application_satellite_info_api" long-name="BLID Application Satellite Info API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/group"/>
-</component>
-</collection>
-<collection name="locsrv_plat" long-name="Location Services Platform Interfaces" level="if">
-<component name="map_and_navigation_api" long-name="Map and Navigation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/group"/>
-</component>
-<component name="map_and_navigation_provider_discovery_api" long-name="Map and Navigation Provider Discovery API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/group"/>
-</component>
-<component name="geocoding_api" long-name="Geocoding API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
-</component>
-<component name="map_image_api" long-name="Map Image API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/group"/>
-</component>
-<component name="map_and_navigation_aiw_api" long-name="Map and Navigation AIW API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_aiw_api/group"/>
-</component>
-<component name="map_and_navigation_provider_api" long-name="Map and Navigation Provider API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_api/group"/>
-</component>
-<component name="landmarks_category_definition_api" long-name="Landmarks Category Definition API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
-</component>
-<component name="supl_settings_api" long-name="SUPL Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
-</component>
-<component name="location_settings_launch_api" long-name="Location Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/group"/>
-</component>
-<component name="map_image_conversion_plugin_api" long-name="Map Image Conversion Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/group"/>
-</component>
-<component name="psy_configuration_ui_plugin_api" long-name="PSY Configuration UI Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/psy_configuration_ui_plugin_api/group"/>
-</component>
-<component name="np_proxy_configuration_api" long-name="NP Proxy Configuration API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/np_proxy_configuration_api/group"/>
-</component>
-<component name="supl_terminal_initiation_api" long-name="SUPL Terminal Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/group"/>
-</component>
-<component name="location_notation_preferences_settings_api" long-name="Location Notation Preferences Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_notation_preferences_settings_api/group"/>
-</component>
-<component name="supl_settings_notifier_secondary_display_api" long-name="SUPL Settings Notifier Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_notifier_secondary_display_api/group"/>
-</component>
-<component name="supl_network_initiation_api" long-name="SUPL Network Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/group"/>
-</component>
-<component name="privacy_notifiers_secondary_display_api" long-name="Privacy Notifiers Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/privacy_notifiers_secondary_display_api/group"/>
-</component>
-<component name="oma_supl_configuration_parameter_api" long-name="OMA SUPL Configuration Parameter API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_configuration_parameter_api/group"/>
-</component>
-<component name="supl_query_secondary_display_api" long-name="SUPL Query Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_query_secondary_display_api/group"/>
-</component>
-<component name="location_triggering_management_api" long-name="Location Triggering Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_management_api/group"/>
-</component>
-<component name="location_triggering_status_information_api" long-name="Location Triggering Status Information API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_status_information_api/group"/>
-</component>
-<component name="oma_supl_asn_codec_plugin_api" long-name="OMA SUPL ASN Codec Plugin API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
-</component>
-<component name="query_and_notification_api" long-name="Query and Notification API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/query_and_notification_api/group"/>
-</component>
-<component name="location_local_variation_api" long-name="Location Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_local_variation_api/group"/>
-</component>
-</collection>
-<collection name="genericpositioningplugins" long-name="Generic Positioning Plugins" level="plugin">
-<component name="locationnpppsy" filter="s60" long-name="Location Positioning Proxy PSY" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
-</component>
-<component name="locationsuplpsy" filter="s60" long-name="Location SUPL PSY" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationsuplpsy/group"/>
-</component>
-<component name="genericpositioningplugins_build" filter="s60" long-name="Generic Positioning Plugins Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/genericpositioningplugins/group"/>
-</component>
-</collection>
-<collection name="landmarks" long-name="Landmarks" level="server">
-<component name="locationlandmarks" filter="s60" long-name="Location Landmarks">
-<unit bldFile="mw/locationsrv/landmarks/locationlandmarks/group"/>
-</component>
-</collection>
-<collection name="locationmapnavfw" long-name="Location Map and Navigation Framework" level="fw">
-<component name="mnlibrary" filter="s60" long-name="Map and Navigation Library">
-<unit bldFile="mw/locationsrv/locationmapnavfw/library/group"/>
-</component>
-<component name="mnaiwprovider" filter="s60" long-name="Map and Navigation AIW Provider" plugin="Y">
-<unit bldFile="mw/locationsrv/locationmapnavfw/aiwprovider/group"/>
-</component>
-<component name="locationmapnavfw_build" filter="s60" long-name="Location Map and Navigation Framework Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/locationmapnavfw/group"/>
-</component>
-</collection>
-<collection name="locationsystemui" long-name="Location System UI" level="if">
-<component name="locationsysui" filter="s60" long-name="Location System UI">
-<unit bldFile="mw/locationsrv/locationsystemui/locationsysui/group"/>
-</component>
-</collection>
-<collection name="supl" long-name="SUPL" level="fw">
-<component name="locationsuplfw" filter="s60" long-name="Location SUPL Framework">
-<unit bldFile="mw/locationsrv/supl/locationsuplfw/group"/>
-</component>
-<component name="locationomasuplprotocolhandler" filter="s60" long-name="OMA SUPL Protocol Handler">
-<unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/group"/>
-</component>
-<component name="supltiapiimplementation" filter="s60" long-name="SUPL TI API Implementation" introduced="^3">
-<unit bldFile="mw/locationsrv/supl/supltiapiimplementation/group"/>
-</component>
-</collection>
-<collection name="locationtriggering" long-name="Location Triggering" level="server">
-<component name="ltlogger" filter="s60" long-name="LT Logger">
-<unit bldFile="mw/locationsrv/locationtriggering/ltlogger/group"/>
-</component>
-<component name="ltclientlib" filter="s60" long-name="LT Client Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltclientlib/group"/>
-</component>
-<component name="ltmanagementlib" filter="s60" long-name="LT Management Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmanagementlib/group"/>
-</component>
-<component name="ltcontainer" filter="s60" long-name="LT Container">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontainer/group"/>
-</component>
-<component name="ltserver" filter="s60" long-name="LT Server">
-<unit bldFile="mw/locationsrv/locationtriggering/ltserver/group"/>
-</component>
-<component name="ltstrategypluginapi" filter="s60" long-name="LT Strategy Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategypluginapi/group"/>
-</component>
-<component name="ltstrategyengine" filter="s60" long-name="LT Strategy Engine">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategyengine/group"/>
-</component>
-<component name="ltmovementdetectionpluginapi" filter="s60" long-name="Movement Detection Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmovementdetectionpluginapi/group"/>
-</component>
-<component name="ltcellidmovementdetector" filter="s60" long-name="Cell ID Movement Detector">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/>
-</component>
-<component name="lbtmgmtui" filter="s60" long-name="LBT Management UI" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/lbtmgmtui/group"/>
-</component>
-<component name="ltcontextsourceplugin" filter="s60" long-name="LT Context Source Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontextsourceplugin/group"/>
-</component>
-<component name="locationtriggering_build" filter="s60" long-name="Location Triggering Build">
-<!-- should remove #include from this and maybe put exports in the above components -->
-<unit bldFile="mw/locationsrv/locationtriggering/group"/>
-</component>
-</collection>
-</block>
-<block name="accesssec" level="generic" long-name="Access Security" levels="plugin framework server generic specific">
-<collection name="accesssec_plat" long-name="Access Security Platform Interfaces" level="specific">
-<component name="wapi_security_settings_ui_api" long-name="WAPI Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_security_settings_ui_api/group"/>
-</component>
-<component name="wep_security_settings_ui_api" long-name="WEP Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wep_security_settings_ui_api/group"/>
-</component>
-<component name="wi-fi_protected_setup_ui_api" long-name="Wi-Fi Protected Setup UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
-</component>
-<component name="wlan_eap_settings_ui_api" long-name="WLAN EAP Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wlan_eap_settings_ui_api/group"/>
-</component>
-<component name="wpa_security_settings_ui_api" long-name="WPA Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wpa_security_settings_ui_api/group"/>
-</component>
-<component name="eap_vpn_api" long-name="EAP VPN API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
-</component>
-<component name="eapsim_db_api" long-name="EAP-SIM DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapsim_db_api/group"/>
-</component>
-<component name="eap_type_api" long-name="EAP Type API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_type_api/group"/>
-</component>
-<component name="eaptlspeap_db_api" long-name="EAP-TLS-PEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eaptlspeap_db_api/group"/>
-</component>
-<component name="eapleap_db_api" long-name="LEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapleap_db_api/group"/>
-</component>
-<component name="eapgtc_db_api" long-name="EAP-GTC DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapgtc_db_api/group"/>
-</component>
-<component name="eapmschapv2_db_api" long-name="EAP-MSCHAPV2 DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapmschapv2_db_api/group"/>
-</component>
-<component name="eapaka_db_api" long-name="EAP-AKA DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapaka_db_api/group"/>
-</component>
-<component name="wapi_db_api" long-name="WAPI DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_db_api/group"/>
-</component>
-</collection>
-<collection name="wlansecuritysettings" long-name="WLAN Security Settings" level="specific">
-<component name="wapisecuritysettingsui" filter="s60" long-name="WAPI Security Settings UI" introduced="9.1">
-<!-- the directory for this needs to be moved up to the right level -->
-<unit bldFile="mw/accesssec/wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
-</component>
-<component name="wepsecuritysettingsui" filter="s60" long-name="WEP Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wepsecuritysettingsui/group"/>
-</component>
-<component name="wifiprotectedsetup" filter="s60" long-name="WIFI Protected Setup" introduced="^1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wifiprotectedsetup/group"/>
-</component>
-<component name="wlaneapsettingsui" filter="s60" long-name="WLAN EAP Settings UI" introduced="9.3">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wlaneapsettingsui/group"/>
-</component>
-<component name="wpasecuritysettingsui" filter="s60" long-name="WPA Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wpasecuritysettingsui/group"/>
-</component>
-</collection>
-<collection name="eapol" long-name="EAPOL" level="framework">
-<component name="eapol_framework" filter="s60" long-name="EAPOL Framework" introduced="9.2">
-<unit bldFile="mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
-</component>
-</collection>
-</block>
-<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>
-<component name="bearer_settings_plugin_api" long-name="Bearer Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/bearer_settings_plugin_api/group"/>
-</component>
-<component name="commsdat_wlan_api" long-name="CommsDat WLAN API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/commsdat_wlan_api/group"/>
-</component>
-<component name="connection_monitor_extension_api" long-name="Connection Monitor Extension API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_monitor_extension_api/group"/>
-</component>
-<component name="connection_ui_utilities_api" long-name="Connection UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_ui_utilities_api/group"/>
-</component>
-<component name="disconnect_dialog_api" long-name="Disconnect Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_api/group"/>
-</component>
-<component name="disconnect_dialog_disable_api" long-name="Disconnect Dialog Disable API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_disable_api/group"/>
-</component>
-<component name="extended_connection_settings_api" long-name="Extended Connection Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/extended_connection_settings_api/group"/>
-</component>
-<component name="mpm_default_connection_api" long-name="MPM Default Connection API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_default_connection_api/group"/>
-</component>
-<component name="pdpcontextmanager2_reset_factory_settings_api" long-name="PDP Context Manager 2 Reset Factory Settings API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_settings_api/group"/>
-</component>
-<component name="mpm_connect_screen_api" long-name="MPM Connect Screen API" filter="s60" class="api">
-<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="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>
-<component name="access_point_engine_api" long-name="Access Point Engine API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_monitor_server_api/group"/>
-</component>
-<component name="connection_settings_ui_api" long-name="Connection Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_ui_api/group"/>
-</component>
-<component name="agent_dialog_api" long-name="Agent Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/agent_dialog_api/group"/>
-</component>
-<component name="extendedconnpref_api" long-name="Extended Connection Preferences API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/extendedconnpref_api/group"/>
-</component>
-</collection>
-<collection name="accesspointcontrol" long-name="Access Point Control" level="plugin">
-<component name="apcontrollistplugin" filter="s60" long-name="Access Point Control List Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
-</component>
-</collection>
-<collection name="alwayson_net_plugin" long-name="Always Online Net Plugin" level="server">
-<component name="pdpcontextmanager2" filter="s60" long-name="PDP Context Manager 2">
-<unit bldFile="mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
-</component>
-</collection>
-<collection name="apengine" long-name="Access Point Engine" level="framework">
-<component name="apeng" filter="s60" long-name="Access Point Engine">
-<unit bldFile="mw/ipconnmgmt/apengine/apeng/group"/>
-</component>
-<component name="apsettingshandlerui" filter="s60" long-name="Access Point Settings Handler UI">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingshandlerui/group"/>
-</component>
-<component name="apsettingsplugin" filter="s60" long-name="Access Point Settings Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="bearermanagement" long-name="Bearer Management" level="framework">
-<component name="mpm" filter="s60" long-name="Mobility Policy Manager">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/mpm/group"/>
-</component>
-<component name="extendedconnpref" filter="s60" long-name="Extended Connection Preferences">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/extendedconnpref/group"/>
-</component>
-<component name="s60mcpr" filter="s60" long-name="S60 Meta-Connection Provider" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/S60MCPR/group"/>
-</component>
-</collection>
-<collection name="cmmanager" long-name="Connection Method Manager" level="framework">
-<component name="cmmgr" filter="s60" long-name="CM Manager">
-<unit bldFile="mw/ipconnmgmt/cmmanager/cmmgr/group"/>
-</component>
-<component name="gsconnsettingsplugin" filter="s60" long-name="GS Connection Settings Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/cmmanager/gsconnsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="connectionmonitoring" long-name="Connection Monitoring" level="server">
-<component name="connectionmonitorplugin" filter="s60" long-name="Connection Monitor Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorplugin/group"/>
-</component>
-<component name="connectionmonitorui" filter="s60" long-name="Connection Monitor UI">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorui/group"/>
-</component>
-<component name="connmon" filter="s60" long-name="Connection Monitor">
-<!-- either split into two components, or #include from a common bld.inf -->
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/connectionmonitor/group"/>
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/dataconnectionlogger/group"/>
-</component>
-<component name="connmonext" filter="s60" long-name="Connection Monitor Extension API">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmonext/group"/>
-</component>
-</collection>
-<collection name="connectionutilities" long-name="Connection Utilities" level="utils">
-<component name="connectiondialogs" filter="s60" long-name="Connection Dialogs">
-<unit bldFile="mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/>
-</component>
-</collection>
-<collection name="dbcreator" long-name="DB Creator" level="utils">
-<component name="commsdatcreator" filter="s60" long-name="Comms Database Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
-</component>
-<component name="commsdatcreatorrfsplugin" filter="s60" long-name="Comms Database Creator RFS Plugin" introduced="9.3" plugin="Y">
-<!-- uncomment when config is turned on -->
-<!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
-</component>
-<component name="commsdatstartup" filter="s60" long-name="Comms Database Startup" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
-</component>
-<component name="dbcreatorexe" filter="s60" long-name="DB Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
-</component>
-<component name="dbcreator_build" filter="s60" long-name="DB Creator Build" introduced="9.3">
-<!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
-<unit bldFile="mw/ipconnmgmt/dbcreator/group"/>
-</component>
-</collection>
-<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"/>
-</component>
-<component name="ipcm_qt_build" long-name="IP Connectivity Management Qt Build" introduced="^4">
-<unit bldFile="mw/ipconnmgmt" proFile="ipconnmgmt.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</block>
-<block name="netprotocols" level="generic" long-name="High-level Internet Protocols" levels="plugin framework server generic specific">
-<collection name="netprotocols_plat" long-name="High-level Internet Protocols Platform Interfaces" level="specific">
-<component name="cookie_manager_api" long-name="Cookie Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/cookie_manager_api/group"/>
-</component>
-<component name="http_cache_mgr_api" long-name="HTTP Cache Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_cache_mgr_api/group"/>
-</component>
-<component name="http_filters_api" long-name="HTTP Filters API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_filters_api/group"/>
-</component>
-</collection>
-<collection name="httpfilters" long-name="HTTP Filters" level="plugin">
-<component name="httpfiltercommon" filter="s60" long-name="HTTP Filter Common">
-<unit bldFile="mw/netprotocols/httpfilters/httpfiltercommon/group"/>
-</component>
-<component name="cookie" filter="s60" long-name="Cookie Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/cookie/group"/>
-</component>
-<component name="deflatefilter" filter="s60" long-name="Deflate Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/deflatefilter/group"/>
-</component>
-<component name="httpfilteracceptheader" filter="s60" long-name="Accept Header Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteracceptheader/group"/>
-</component>
-<component name="httpfilterauthentication" filter="s60" long-name="Authentication Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterauthentication/group"/>
-</component>
-<component name="httpfilterconnhandler" filter="s60" long-name="Connection Handler Fitler" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterconnhandler/group"/>
-</component>
-<component name="httpfilteriop" filter="s60" long-name="HTTP IOP Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteriop/group"/>
-</component>
-<component name="httpfilterproxy" filter="s60" long-name="HTTP Proxy Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterproxy/group"/>
-</component>
-<component name="uaproffilter" filter="s60" long-name="UAProf Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/uaproffilter/group"/>
-</component>
-</collection>
-<collection name="applayerprotocols" long-name="Application Layer Protocols" level="server">
-<component name="httptransportfw" long-name="HTTP Transport Framework" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
-</component>
-<component name="httpexamples" long-name="HTTP Examples" introduced="6.2" purpose="development">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpexamples/group" mrp="mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
-</component>
-<component name="wappushsupport" long-name="WAP Push Support" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
-</component>
-<component name="wapbase" long-name="WAP Base" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wapbase/Group" mrp="mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
-</component>
-<component name="ftpengine" long-name="FTP Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/ftpengine/group" mrp="mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
-</component>
-<component name="telnetengine" long-name="Telnet Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/telnetengine/group" mrp="mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
-</component>
-<component name="httpserviceapi" long-name="HTTP Service API" introduced="TB9.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpservice/group" mrp="mw/netprotocols/applayerprotocols/httpservice/group/http_service.mrp"/>
-</component>
-</collection>
-<collection name="applayerpluginsandutils" long-name="Application Layer Plugins and Utils" level="framework">
-<component name="uripermissionservices" long-name="URI Permission Services" introduced="^2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
-</component>
-<component name="bookmarksupport" long-name="Bookmark Support" introduced="9.1" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
-</component>
-<component name="httpprotocolplugins" long-name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
-</component>
-<component name="httptransportplugins" long-name="HTTP Transport Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
-</component>
-</collection>
-<collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
-<component name="netprotocols_metadata" long-name="High-level Internet Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ipappprotocols" level="generic" long-name="IP App Protocols" levels="plugin conn server if">
-<collection name="ipappprotocols_plat" long-name="IP App Protocols Platform Interfaces" level="if">
-<component name="srtp_api" long-name="SRTP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/srtp_api/group"/>
-</component>
-<component name="rtprtcp_api" long-name="RTP/RTCP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/rtprtcp_api/group"/>
-</component>
-</collection>
-<collection name="rtp" long-name="RTP" level="server">
-<component name="srtpstack" filter="s60" long-name="SRTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/srtpstack/group"/>
-</component>
-<component name="rtpstack" filter="s60" long-name="RTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/rtpstack/group"/>
-</component>
-</collection>
-<collection name="realtimenetprots" long-name="Real Time Net Protocols" level="server">
-<component name="symrtp" long-name="RTP" introduced="9.0" purpose="optional">
-<!-- Real Time Data Protocol -->
-<unit bldFile="mw/ipappprotocols/realtimenetprots/rtp/group" mrp="mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
-</component>
-<component name="sipfw" long-name="SIP Framework" introduced="9.2" purpose="optional">
-<unit bldFile="mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp" version="2"/>
-</component>
-</collection>
-<collection name="sipplugins" long-name="SIP Plugins" level="plugin">
-<component name="sippwlanplugin" filter="s60" long-name="SIP WLAN Plugin" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
-</component>
-<component name="sippsipsettingsui" filter="s60" long-name="SIP Settings UI" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
-</component>
-<component name="sippdevmgmtsipadapter" filter="s60" long-name="Device Management SIP Settings Adapter" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
-</component>
-<component name="sippsystemstatemonitor" filter="s60" long-name="SIP System State Monitor" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsystemstatemonitor/group"/>
-</component>
-<component name="sippsipadapter" filter="s60" long-name="SIP Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipadapter/group"/>
-</component>
-</collection>
-<collection name="sipproviderplugins" long-name="SIP Provider Plugins" level="conn">
-<component name="sipprovider" long-name="SIP Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipproviderplugins/sipprovider/group" mrp="mw/ipappprotocols/sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
-</component>
-</collection>
-<collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="if">
-<component name="ipappprotocols_metadata" long-name="IP App Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wirelessacc" level="specific" long-name="Wireless Access" levels="framework generic ui">
-<collection name="hsfw_plat" long-name="HotSpot Framework Platform Interfaces" level="ui">
-<component name="hotspot_framework_client_api" long-name="HotSpot Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_api" long-name="Internet Connectivity Test Service API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_settings_api" long-name="Internet Connectivity Test Service Settings API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
-</component>
-<component name="hotspot_framework_client_plugin_api" long-name="HotSpot Framework Client Plugin API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
-</component>
-</collection>
-<collection name="hotspotfw" long-name="HotSpot Framework" level="framework">
-<component name="hsserver" filter="s60" long-name="HotSpot Server" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="hsclient" filter="s60" long-name="HotSpot Client" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="internetconnectivitytestservice" filter="s60" long-name="Internet Connectivity Test Service" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
-</component>
-<component name="ictsdialogs" filter="s60" long-name="Internet Connectivity Test Service Dialogs" deprecated="^3" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
-</component>
-<component name="hspluginforagent" filter="s60" long-name="HotSpot Plugin for Agent" plugin="Y" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
-</component>
-<component name="hsbrowser" filter="s60" long-name="HotSpot Browser" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
-</component>
-<component name="hotspotfw_build" filter="s60" long-name="Hotspot Framework Build">
-<!-- should break up this bld.inf into the above components, or collapse them all into a single component -->
-<unit bldFile="mw/wirelessacc/hotspotfw/group"/>
-</component>
-</collection>
-<collection name="wlanutilities" long-name="WLAN Utilities" level="generic">
-<component name="wlanutilities_build" long-name="WLAN Utilities Qt" introduced="^4" filter="s60">
-<!-- is this uinit needed, or is it sufficient to uncomment the units in the below components? -->
-<unit bldFile="mw/wirelessacc/wlanutilities" proFile="wlanutilities.pro" qmakeArgs="-r"/>
-</component>
-<component name="wlanqtutilities" filter="s60" long-name="WLAN Qt Utilities" introduced="^4" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlanplugin/group" qt:proFile="wlanqtutilities.pro"/>-->
-</component>
-<component name="wlansniffer" filter="s60" long-name="WLAN Sniffer" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlansettingsui/group" qt:proFile="wlansniffer.pro"/>-->
-</component>
-<component name="wlanentryplugin" filter="s60" long-name="WLAN Entry Plugin" plugin="Y" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlansniffer/group" qt:proFile="wlanentryplugin.pro"/>-->
-</component>
-<component name="wlanindicatorplugin" filter="s60" long-name="WLAN Indicator Plugin" plugin="Y" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlanindicatorplugin/group" qt:proFile="wlanindicatorplugin.pro"/>-->
-</component>
-<component name="cpwlansettingsplugin" filter="s60" long-name="WLAN Settings Control Panel Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="wlanutilities/cpwlansettingsplugin/group" qt:proFile="cpwlansettingsplugin.pro"/>-->
-</component>
-</collection>
-</block>
-<block name="vpnclient" level="specific" long-name="VPN Client" levels="engine ui api">
-<!-- is the !oem_build filter needed? -->
-<collection name="vpnc_plat" long-name="VPN Client Platform Interfaces" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API" class="api">
-<unit bldFile="mw/vpnclient/vpnc_plat/vpnapi/group"/>
-</component>
-</collection>
-<collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API">
-<unit bldFile="mw/vpnclient/vpnapiimpl/group"/>
-</component>
-</collection>
-<collection name="vpnengine" long-name="VPN Engine" level="engine">
-<!-- too many components in this collection.
- Probably best to group the binaries together into larger components
- or maybe split the collection into more reasonable groups -->
-<component name="eventmediatorapi" filter="s60" long-name="Event Mediator API">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediatorapi/group"/>
-</component>
-<component name="eventviewer" filter="s60" long-name="Event Viewer">
-<unit bldFile="mw/vpnclient/vpnengine/eventviewer/group"/>
-</component>
-<component name="vpnins" filter="s60" long-name="VPN Installer">
-<unit bldFile="mw/vpnclient/vpnengine/vpnins/group"/>
-</component>
-<component name="ikepolparser" filter="s60" long-name="IKE Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/ikepolparser/group"/>
-</component>
-<component name="utlbase64" filter="s60" long-name="Base64 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlbase64/group"/>
-</component>
-<component name="utlcrypto" filter="s60" long-name="Crypto Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlcrypto/group"/>
-</component>
-<component name="utlxml" filter="s60" long-name="XML Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlxml/group"/>
-</component>
-<component name="utlpkcs10" filter="s60" long-name="PKCS#10 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs10/group"/>
-</component>
-<component name="pkiserviceapi" filter="s60" long-name="PKI Service API">
-<unit bldFile="mw/vpnclient/vpnengine/pkiserviceapi/group"/>
-</component>
-<component name="ikecert" filter="s60" long-name="IKE Certificate Management">
-<unit bldFile="mw/vpnclient/vpnengine/ikecert/group"/>
-</component>
-<component name="kmdapi" filter="s60" long-name="Key Management Daemon API">
-<unit bldFile="mw/vpnclient/vpnengine/kmdapi/group"/>
-</component>
-<component name="kmdserver" filter="s60" long-name="Key Management Daemon Server">
-<unit bldFile="mw/vpnclient/vpnengine/kmdserver/group"/>
-</component>
-<component name="ikeutils" filter="s60" long-name="Internet Key Exchange Utils">
-<unit bldFile="mw/vpnclient/vpnengine/ikeutils/group"/>
-</component>
-<component name="ikev1lib" filter="s60" long-name="IKEv1 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev1lib/group"/>
-</component>
-<component name="ikev2lib" filter="s60" long-name="IKEv2 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev2lib/group"/>
-</component>
-<component name="vpnipsecpolparser" filter="s60" long-name="VPN IPsec Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/vpnipsecpolparser/group"/>
-</component>
-<component name="sit" filter="s60" long-name="Socket Interaction Thread">
-<unit bldFile="mw/vpnclient/vpnengine/sit/group"/>
-</component>
-<component name="vpntcwrapper" filter="s60" long-name="VPN Terminal Control Wrapper">
-<unit bldFile="mw/vpnclient/vpnengine/vpntcwrapper/group"/>
-</component>
-<component name="eventmediator" filter="s60" long-name="Event Mediator">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediator/group"/>
-</component>
-<component name="pkiservice" filter="s60" long-name="PKI Service">
-<unit bldFile="mw/vpnclient/vpnengine/pkiservice/group"/>
-</component>
-<component name="vpnconnagt" filter="s60" long-name="VPN Connection Agent">
-<unit bldFile="mw/vpnclient/vpnengine/vpnconnagt/group"/>
-</component>
-<component name="vpnmanager" filter="s60" long-name="VPN Manager">
-<unit bldFile="mw/vpnclient/vpnengine/vpnmanager/group"/>
-</component>
-<component name="vpncleaner" filter="s60" long-name="VPN Cleaner">
-<unit bldFile="mw/vpnclient/vpnengine/vpncleaner/group"/>
-</component>
-<component name="utlpkcs12" filter="s60" long-name="PKCS#12 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs12/group"/>
-</component>
-<component name="dmadengine" filter="s60" long-name="DM Adapter Engine">
-<unit bldFile="mw/vpnclient/vpnengine/dmadengine/group"/>
-</component>
-<component name="dmadipsecvpn" filter="s60" long-name="IPsec VPN DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadipsecvpn/group"/>
-</component>
-<component name="dmadpki" filter="s60" long-name="PKI DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadpki/group"/>
-</component>
-<component name="ikesocket" filter="s60" long-name="IKE Socket" introduced="^3">
-<unit bldFile="mw/vpnclient/vpnengine/ikesocket/group"/>
-</component>
-</collection>
-<collection name="vpnui" long-name="VPN UI" level="ui">
-<component name="vpnecomnotifier" filter="s60" long-name="VPN ECOM Notifier" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnecomnotifier/group"/>
-</component>
-<component name="vpndialogmanager" filter="s60" long-name="VPN Dialog Manager">
-<unit bldFile="mw/vpnclient/vpnui/vpndialogmanager/group"/>
-</component>
-<component name="vpnpolins" filter="s60" long-name="VPN Policy Installer">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolins/group"/>
-</component>
-<component name="vpnpolicyrecognizer" filter="s60" long-name="VPN Policy Recognizer" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolicyrecognizer/group"/>
-</component>
-</collection>
-<collection name="vpnclient_info" long-name="VPN Client Info" level="api">
-<component name="vpnclient_help" filter="s60" long-name="VPN Client Help">
-<unit bldFile="mw/vpnclient/help/group"/>
-</component>
-<component name="vpnclient_build" filter="s60" long-name="VPN Client Build">
-<!-- should split this up into the other components and remove this-->
-<unit bldFile="mw/vpnclient/group"/>
-</component>
-</collection>
-</block>
-<block name="ipappsrv" level="specific" long-name="IP App Services" levels="framework generic server conn plugin">
-<collection name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" level="plugin">
-<component name="transcoder_api" long-name="Transcoder API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
-</component>
-<component name="comms_event_api" long-name="Comms Event API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/comms_event_api/group"/>
-</component>
-<component name="floor_control_api" long-name="Floor Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/floor_control_api/group"/>
-</component>
-<component name="media_control_api" long-name="Media Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/media_control_api/group"/>
-</component>
-<component name="multimedia_comms_api" long-name="Multimedia Comms API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/multimedia_comms_api/group"/>
-</component>
-<component name="nat_settings_api" long-name="NAT Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/nat_settings_api/group"/>
-</component>
-</collection>
-<collection name="natfw" long-name="NAT Framework" level="framework">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="natfw_build" filter="s60" long-name="NAT Framework Build" introduced="^2">
-<unit bldFile="mw/ipappsrv/natfw/group"/>
-</component>
-</collection>
-<collection name="multimediacommscontroller" long-name="Multimedia Comms Controller" level="conn">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommscontroller_build" filter="s60" long-name="Multimedia Comms Controller Build">
-<unit bldFile="mw/ipappsrv/multimediacommscontroller/group"/>
-</component>
-</collection>
-<collection name="multimediacommsengine" long-name="Multimedia Comms Engine" level="generic">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommsengine_build" filter="s60" long-name="Multimedia Comms Engine Build">
-<unit bldFile="mw/ipappsrv/multimediacommsengine/group"/>
-</component>
-</collection>
-<collection name="natplugins" long-name="NAT Plugins" level="plugin">
-<component name="natpcliprovisioningnatfwadapter" filter="s60" long-name="Client Provisioning NAT Framework Traversal Adapter" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/group"/>
-</component>
-<component name="natpdevmgmtnatfwadapter" filter="s60" long-name="Device Management NAT Framework Traversal Adapter" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/group"/>
-</component>
-<component name="natptraversalcontroller" filter="s60" long-name="NAT Traversal Controller" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natptraversalcontroller/group"/>
-</component>
-<component name="natpnatfwsdpprovider" filter="s60" long-name="NAT Framework SDP Provider" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpnatfwsdpprovider/group"/>
-</component>
-</collection>
-<collection name="ipappsrv_info" long-name="IP App Services Info" level="plugin">
-<component name="ipappsrv_build" long-name="IP App Services Build" filter="s60">
-<!-- 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">
-<collection name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" level="specific">
-<component name="sat_refresh_api" long-name="SAT Refresh API" filter="s60" class="api"/>
-<component name="sat_client_api" long-name="SAT Client API" filter="s60" class="api"/>
-<component name="sat_service_api" long-name="SAT Service API" filter="s60" class="api"/>
-<component name="call_information_api" long-name="Call Information API" filter="s60" class="api"/>
-<component name="call_remote_party_information_api" long-name="Call Remote Party Information API" filter="s60" class="api"/>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api"/>
-</collection>
-<collection name="cellular" long-name="Cellular" level="server">
-<component name="telephonysettings" filter="s60" long-name="Telephony Settings" purpose="development"/>
-<component name="sssettings" filter="s60" long-name="Supplementary Service Settings" purpose="development"/>
-<component name="psetnotesui" filter="s60" long-name="Phone Settings Notes UI" purpose="development"/>
-</collection>
-<collection name="convergedcallengine" long-name="Converged Call Engine" level="framework">
-<component name="cce" filter="s60" long-name="CCE" purpose="development"/>
-<component name="spsettings" filter="s60" long-name="Service Provider Settings" purpose="development"/>
-</collection>
-<collection name="phoneclientserver" long-name="Phone Client/Server" level="server">
-<component name="aiwdialdata" filter="s60" long-name="AIW Dial Data" purpose="development"/>
-<component name="dialutils" filter="s60" long-name="Dial Utils" purpose="development"/>
-<component name="phoneclient" filter="s60" long-name="Phone Client" purpose="development"/>
-</collection>
-<collection name="phonesrv_info" long-name="Phone Server Info" level="generic">
-<component name="phonesrv_build" long-name="Phone Server Build" filter="s60">
-<unit bldFile="mw/phonesrv" proFile="phonesrv.pro"/>
-</component>
-</collection>
-</block>
-<block name="messagingmw" level="specific" long-name="Messaging Middleware" levels="stack support fw api">
-<collection name="msgfw_plat" long-name="Messaging Middleware Platform Interfaces" level="api">
-<component name="always_online_plugin_api" long-name="Always Online Plugin API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_plugin_api/group"/>
-</component>
-<component name="always_online_client_api" long-name="Always Online Client API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_client_api/group"/>
-</component>
-<component name="msg_common_utils_api" long-name="Messaging Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/msg_common_utils_api/group"/>
-</component>
-<component name="muiu_utils_api" long-name="Messaging Center UI Utilities API" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/muiu_utils_api/group"/>
-</component>
-</collection>
-<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" class="config">
-<unit bldFile="mw/messagingmw/msgbranched/group"/>
-</component>
-</collection>
-<collection name="messagingfw" long-name="Messaging Framework" level="fw">
-<!-- should break this collection up into smaller related collections -->
-<component name="send_ui_api" long-name="Send UI API" filter="s60" deprecated="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/send_ui_api/group"/>
-</component>
-<component name="send_ui_plugin_api" long-name="Send UI Plug-in API" filter="s60" deprecated="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/send_ui_plugin_api/group"/>
-</component>
-<component name="send_ui_datautils_api" long-name="Send UI Data Utils API" filter="s60" deprecated="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/send_ui_datautils_api/group"/>
-</component>
-<component name="alwaysonline" filter="s60" long-name="Always Online Server" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/alwaysonline/group"/>
-</component>
-<component name="msgcommonutils" filter="s60" long-name="Messaging Common Utils" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/msgcommonutils/group"/>
-</component>
-<component name="senduiservices" filter="s60" long-name="Send UI Services" introduced="^2" deprecated="^4">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/senduiservices/group"/>
-</component>
-<component name="muiuutils" long-name="Messaging Center UI Utilities" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/muiuutils/group"/>
-</component>
-<component name="scheduledsendmtm" long-name="Scheduled Send MTM" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/group" mrp="mw/messagingmw/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
-</component>
-<component name="msgsrvnstore" long-name="Message Server and Store" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/group" mrp="mw/messagingmw/messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
-</component>
-<component name="biomsgfw" long-name="BIO Messaging Framework" introduced="6.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/group" mrp="mw/messagingmw/messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
-</component>
-<component name="msgconf" long-name="Messaging Config" introduced="^2" purpose="optional" class="config">
-<unit bldFile="mw/messagingmw/messagingfw/msgconf/group" mrp="mw/messagingmw/messagingfw/msgconf/group/messaging_config.mrp"/>
-</component>
-<component name="watcherfw" long-name="Watcher Framework" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/watcherfw/group" mrp="mw/messagingmw/messagingfw/watcherfw/group/messaging_watcher.mrp"/>
-</component>
-<component name="msgtest" long-name="Messaging Test" purpose="development">
-<unit bldFile="mw/messagingmw/messagingfw/msgtest/group" mrp="mw/messagingmw/messagingfw/msgtest/group/messaging_test.mrp"/>
-</component>
-<component name="sendas" long-name="Send As" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/sendas/group" mrp="mw/messagingmw/messagingfw/sendas/group/messaging_sendas2.mrp"/>
-</component>
-<component name="msgurlhandler" long-name="Message URL Handler" introduced="7.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/group" mrp="mw/messagingmw/messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
-</component>
-<component name="wappushfw" long-name="WAP Push Framework" introduced="6.1" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/wappushfw/group" mrp="mw/messagingmw/messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
-</component>
-<component name="suplsmshandler" long-name="SUPL SMS Handler" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplsmshandler/group" mrp="mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/>
-</component>
-<component name="suplwappushhandler" long-name="SUPL WAP Push Handler" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
-</component>
-</collection>
-<collection name="messagingmw_info" long-name="Messaging Middleware Info" level="api">
-<component name="messagingmw_metadata" long-name="Messaging Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="imsrv" level="specific" long-name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
-<collection name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" level="specific">
-<component name="ximp_core_data_model_api" long-name="XIMP Core Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_host_api" long-name="XIMP Presence Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_presence_data_model_api" long-name="XIMP Presence Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_api" long-name="XIMP Presence Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_presence_management_api" long-name="XIMP Presence Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_management_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_host_api" long-name="XIMP Core Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_core_management_api" long-name="XIMP Core Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_management_api/group"/>
-</component>
-<component name="ximp_presence_base_api" long-name="XIMP Presence Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_base_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_api" long-name="XIMP Core Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_core_base_api" long-name="XIMP Core Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_base_api/group"/>
-</component>
-<component name="ximp_presence_cache_api" long-name="XIMP Presence Cache API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_cache_api/group"/>
-</component>
-<component name="ximp_core_feature_plugin_api" long-name="XIMP Core Feature Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_host_api" long-name="XIMP IM Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_im_data_model_api" long-name="XIMP IM Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_data_model_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_api" long-name="XIMP IM Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_im_management_api" long-name="XIMP IM Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_management_api/group"/>
-</component>
-<component name="ximp_im_base_api" long-name="XIMP IM Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_base_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_host_api" long-name="XIMP Search Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_search_data_model_api" long-name="XIMP Search Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_data_model_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_api" long-name="XIMP search Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_search_management_api" long-name="XIMP Search Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_management_api/group"/>
-</component>
-<component name="ximp_search_base_api" long-name="XIMP Search Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_base_api/group"/>
-</component>
-<component name="xmpp_settings_api" long-name="XMPP Settings API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/group"/>
-</component>
-<component name="im_cache_client_api" long-name="IM Cache Client API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/im_cache_client_api/group"/>
-</component>
-<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 Avability Text" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
-</component>
-</collection>
-<collection name="ximpfw" long-name="XIMP Framework" level="framework">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="ximpfw_build" filter="s60" long-name="XIMP Framework Build">
-<unit bldFile="mw/imsrv/ximpfw/group"/>
-</component>
-</collection>
-<collection name="imservices" long-name="IM Services" level="generic">
-<component name="imfeatureplugin" filter="s60" long-name="IM Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/imfeatureplugin/group"/>
-</component>
-<component name="searchfeatureplugin" filter="s60" long-name="Search Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/searchfeatureplugin/group"/>
-</component>
-<component name="xmppsettingsapi" filter="s60" long-name="XMPP Settings API" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsapi/group"/>
-</component>
-<component name="xmppsettingsfetcher" filter="s60" long-name="XMPP Settings Fetcher" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/group"/>
-</component>
-<component name="instantmessagingcache" filter="s60" long-name="Instant Messaging Cache" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/instantmessagingcache/group"/>
-</component>
-</collection>
-<collection name="brandingserver" long-name="Branding Server" level="specific">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="brandingserver_build" filter="s60" long-name="Branding Server Build">
-<unit bldFile="mw/imsrv/brandingserver/group"/>
-</component>
-</collection>
-</block>
-<block name="legacypresence" level="specific" long-name="Legacy Presence Services" levels="engine fw ui">
-<collection name="pressrv_plat" long-name="Legacy Presence Services Platform Interfaces" level="ui">
-<component name="presence_list_api" long-name="Presence List API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/presence_list_api/group"/>
-</component>
-<component name="watcher_info_api" long-name="Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_info_api/group"/>
-</component>
-<component name="simple_documents_api" long-name="SIMPLE Documents API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_documents_api/group"/>
-</component>
-<component name="authorization_api" long-name="Authorization API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/authorization_api/group"/>
-</component>
-<component name="xdm_protocol_plugin_api" long-name="XDM Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_protocol_plugin_api/group"/>
-</component>
-<component name="watcher_api" long-name="Watcher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_api/group"/>
-</component>
-<component name="xdm_api" long-name="XDM API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_api/group"/>
-</component>
-<component name="registration_api" long-name="Registration API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/registration_api/group"/>
-</component>
-<component name="publisher_api" long-name="Publisher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/publisher_api/group"/>
-</component>
-<component name="messaging_connection_manager_api" long-name="Messaging Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/messaging_connection_manager_api/group"/>
-</component>
-<component name="xdm_settings_api" long-name="XDM Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_settings_api/group"/>
-</component>
-<component name="simple_settings_api" long-name="SIMPLE Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_settings_api/group"/>
-</component>
-<component name="simple_instant_msg_api" long-name="Simple Instant Msg API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_instant_msg_api/group"/>
-</component>
-</collection>
-<collection name="xdmengine" long-name="XDM Engine" level="engine">
-<!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
-<component name="xdmengine_build" filter="s60" long-name="XDM Engine Build">
-<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">
-<unit bldFile="mw/legacypresence/xdmprotocols/group"/>
-</component>
-</collection>
-<collection name="msgconnmanager" long-name="Messaging Connection Manager" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="msgconnmanager_build" filter="s60" long-name="Messaging Connection Manager Build">
-<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">
-<unit bldFile="mw/legacypresence/simpleengine/group"/>
-</component>
-</collection>
-<collection name="presencefwsimpleadpt" long-name="Presence Framework SIMPLE Adaptation" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="simpleplugin" filter="s60" long-name="SIMPLE Plugin" plugin="Y">
-<unit bldFile="mw/legacypresence/presencefwsimpleadpt/group"/>
-</component>
-</collection>
-<collection name="simpledatamodeladapter" long-name="SIMPLE Data Model Adapter" level="fw">
-<component name="presenceplugin" filter="s60" long-name="Presence Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/legacypresence/simpledatamodeladapter/group"/>
-</component>
-</collection>
-</block>
-<block name="opensrv" level="specific" long-name="Open Services" levels="prt lib server eng">
-<collection name="opensrv_plat" long-name="Open Services Platform Interfaces" level="eng">
-<component name="messagequeue_api" long-name="Message Queue API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/opensrv/opensrv_plat/messagequeue_api/group"/>
-</component>
-</collection>
-<collection name="loudmouth" long-name="Loudmouth" level="prt">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="loudmouth_build" filter="s60" long-name="Loudmouth Build" introduced="^2">
-<unit bldFile="mw/opensrv/loudmouth/group"/>
-</component>
-</collection>
-<collection name="libtelepathy" long-name="Telepathy Library" level="lib">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="libtelepathy_build" filter="s60" long-name="Telepathy Library Build" introduced="^2">
-<unit bldFile="mw/opensrv/libtelepathy/group"/>
-</component>
-</collection>
-<collection name="telepathygabble" long-name="Telepathy Gabble" level="eng">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="telepathygabble_build" filter="s60" long-name="Telepathy Gabble Build" introduced="^2">
-<unit bldFile="mw/opensrv/telepathygabble/group"/>
-</component>
-</collection>
-<collection name="isolationserver" long-name="Isolation Server" level="server">
-<component name="messagequeue" filter="s60" long-name="Message Queue" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/messagequeue/group"/>
-</component>
-<component name="isoserver" filter="s60" long-name="ISO Server" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/isoserver/group"/>
-</component>
-<component name="isolationserver_build" filter="s60" long-name="Isloation Server Build" introduced="^2">
-<!-- needs #includes removed. either move the exports to another component or make this a ROM component -->
-<unit bldFile="mw/opensrv/isolationserver/group"/>
-</component>
-</collection>
-</block>
-<block name="searchsrv" level="specific" long-name="Search Services" levels="services engine generic api">
-<collection name="searchsrv_plat" long-name="Search Services Platform Interfaces" level="api">
-<component name="cpix_utility_api" long-name="CPIX Utility API" filter="s60" class="api">
-<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_utility_api/group"/>
-</component>
-<component name="cpix_framework_api" long-name="CPIX Framework API" filter="s60" class="api">
-<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_framework_api/group"/>
-</component>
-<component name="cpix_search_api" long-name="CPIX Search API" filter="s60" class="api">
-<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_search_api/group"/>
-</component>
-</collection>
-<collection name="searchengine" long-name="Search Engine" level="engine">
-<component name="searchengine_util" long-name="Search Engine Utils" filter="s60">
-<unit bldFile="mw/searchsrv/searchengine/util/group"/>
-</component>
-<component name="searchengine_oss" long-name="Search Engine OSS" filter="s60">
-<unit bldFile="mw/searchsrv/searchengine/oss/group"/>
-</component>
-<component name="cpix" long-name="Cross Platform Indexing Engine" filter="s60">
-<unit bldFile="mw/searchsrv/searchengine/cpix/group"/>
-</component>
-</collection>
-<collection name="searcher" long-name="Searcher" level="generic">
-<component name="searchclient" long-name="Search Client" filter="s60">
-<unit bldFile="mw/searchsrv/searcher/SearchClient/group"/>
-</component>
-<component name="searchserver" long-name="Search Server" filter="s60">
-<unit bldFile="mw/searchsrv/searcher/SearchServer/group"/>
-</component>
-<component name="searcher_test" long-name="Searcher Tests" filter="s60" purpose="development">
-<!-- #include from common bld.inf or split into two components -->
-<unit bldFile="mw/searchsrv/searcher/tsrc/RobustnessTest/group"/>
-<unit bldFile="mw/searchsrv/searcher/tsrc/LogPlayer/group"/>
-</component>
-</collection>
-<collection name="searchsrv_harvester" long-name="Search Services Harvester" level="services">
-<component name="searchsrv_pluginfw" long-name="Search Server" filter="s60">
-<unit bldFile="mw/searchsrv/harvester/pluginfw/group"/>
-</component>
-<component name="searchsrv_harvesterserver" long-name="Search Harvester Server" filter="s60">
-<unit bldFile="mw/searchsrv/harvester/HarvesterServer/group"/>
-</component>
-</collection>
-<collection name="searchsrv_watchdog" long-name="Search Services Watch Dog" level="services">
-<component name="searchsrv_watchdog_build" long-name="Search Services Watch Dog Build" filter="s60">
-<unit bldFile="mw/searchsrv/WatchDog/group"/>
-</component>
-</collection>
-<collection name="qcpix" long-name="Qt CPIX" level="engine">
-<component name="qcpix_build" long-name="Qt CPIX Build">
-<unit bldFile="mw/searchsrv/qcpix" proFile="qcpix.pro"/>
-</component>
-</collection>
-<collection name="searchsrv_info" long-name="Search Services Info">
-<component name="searchsrv_build" long-name="Search Services Build">
-<!-- move exports to own component and remove this -->
-<unit bldFile="mw/searchsrv/group"/>
-</component>
-</collection>
-</block>
-<block name="remotemgmt" level="specific" long-name="Remote Management" levels="plugin framework server generic specific">
-<collection name="remotemgmt_pub" long-name="Remote Management Public Interfaces" level="specific">
-<component name="synchronization_capability_api" long-name="Synchronization Capability API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
-</component>
-</collection>
-<collection name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" level="specific">
-<component name="common_agent_util_and_definitions_api" long-name="Common Agent util and definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
-</component>
-<component name="policy_management_certificate_api" long-name="Policy Management Certificate API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/group"/>
-</component>
-<component name="oma_provisioning_adapter_api" long-name="OMA Provisioning Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_adapter_api/group"/>
-</component>
-<component name="device_management_parameter_api" long-name="Device Management Parameter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_parameter_api/group"/>
-</component>
-<component name="data_synchronization_plugin_api" long-name="Data Synchronization Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/group"/>
-</component>
-<component name="sync_alert_handler_api" long-name="Sync Alert Handler API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
-</component>
-<component name="syncml_notifier_api" long-name="SyncML Notifier API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
-</component>
-<component name="syncml_client_api" long-name="SyncML Client API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
-</component>
-<component name="device_management_plugin_api" long-name="Device Management plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_plugin_api/group"/>
-</component>
-<component name="dm_tree_apis" long-name="DM Tree APIs" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
-</component>
-<component name="terminal_security_device_lock_api" long-name="Terminal Security Device Lock API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/group"/>
-</component>
-<component name="policy_management_request_api" long-name="Policy Management Request API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/group"/>
-</component>
-<component name="ds_constant_definitions_api" long-name="DS Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_constant_definitions_api/group"/>
-</component>
-<component name="scp_server_api" long-name="SCP Server API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/group"/>
-</component>
-<component name="data_synchronization_notification_api" long-name="Data Synchronization Notification API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_notification_api/group"/>
-</component>
-<component name="oma_provisioning_engine_api" long-name="OMA Provisioning Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/group"/>
-</component>
-<component name="dm_utils_api" long-name="DM Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/group"/>
-</component>
-<component name="syncml_alert_api" long-name="SyncML Alert API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/group"/>
-</component>
-<component name="obex_client_session_api" long-name="OBEX Client session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/obex_client_session_api/group"/>
-</component>
-<component name="setting_enforcement_info_api" long-name="Setting Enforcement Info API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/group"/>
-</component>
-<component name="dm_constant_definitions_api" long-name="DM Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
-</component>
-<component name="oma_ds_extensions_api" long-name="OMA DS Extensions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
-</component>
-<component name="pnpms_utils_api" long-name="PNPMS Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
-</component>
-<component name="diagnostics_plugin_utility_api" long-name="Diagnostics Plugin Utility API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
-</component>
-<component name="diagnostics_plugin_api" long-name="Diagnostics Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
-</component>
-<component name="diagnostics_framework_api" long-name="Diagnostics Framework API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
-</component>
-<component name="diagnostics_results_api" long-name="Diagnostics Results API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
-</component>
-<component name="diagnostics_plugin_pool_api" long-name="Diagnostics Plugin Pool API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
-</component>
-<component name="adaptive_history_list_api" long-name="Adaptive History List API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
-</component>
-<component name="adaptive_history_list_session_api" long-name="Adaptive History List Session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
-</component>
-<component name="fota_engine_api" long-name="FOTA Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
-</component>
-<component name="update_package_storage_plugin_api" long-name="Update Package Storage Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
-</component>
-<component name="syncml_notifier_roaming_api" long-name="SyncML Notifier Roaming API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
-</component>
-<component name="sync_service_api" long-name="Sync Service API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_service_api/group"/>
-</component>
-<component name="dcmo_adapter_api" long-name="DCMO Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_adapter_api/group"/>
-</component>
-<component name="dcmo_control_api" long-name="DCMO Control API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_control_api/group"/>
-</component>
-<component name="ds_capability_mgmt_plugin_api" long-name="DS Capability Management Plugin API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
-</component>
-</collection>
-<collection name="policymanagement" long-name="Policy Management" level="generic">
-<component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">
-<unit bldFile="mw/remotemgmt/policymanagement/pmdmadapter/group"/>
-</component>
-<component name="dmutilserver" filter="s60" long-name="DM Util Server">
-<unit bldFile="mw/remotemgmt/policymanagement/dmutilserver/group"/>
-</component>
-<component name="policyengine" filter="s60" long-name="Policy Engine">
-<unit bldFile="mw/remotemgmt/policymanagement/policyengine/group" filter="!dfs_build"/>
-</component>
-<component name="policymanagement_build" filter="s60" long-name="Policy Management Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/policymanagement/group"/>
-</component>
-</collection>
-<collection name="syncmlfw" long-name="SyncML Framework" level="server">
-<component name="syncmlfw_build" filter="s60" long-name="SyncML Framework Build">
-<!-- need to break this up into components. Too convoluted a structure to be in a single bld.inf-->
-<unit bldFile="mw/remotemgmt/syncmlfw/group"/>
-</component>
-</collection>
-<collection name="terminalsecurity" long-name="Terminal Security" level="specific">
-<component name="scp" filter="s60" long-name="Security Code Proxy">
-<!-- can only have one unit, need to have these #included from a single bld.inf -->
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpdatabase/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpserver/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scppatternplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scphistoryplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scptimestampplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpeventhandler/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/dmeventnotifier/group"/>
-</component>
-<component name="terminalsecurity_client" filter="s60" long-name="Terminal Control Client">
-<unit bldFile="mw/remotemgmt/terminalsecurity/client/group"/>
-</component>
-<component name="terminalsecurity_server" filter="s60" long-name="Terminal Control Server">
-<unit bldFile="mw/remotemgmt/terminalsecurity/server/group"/>
-</component>
-<component name="tcadapter" filter="s60" long-name="Terminal Control Adapter">
-<unit bldFile="mw/remotemgmt/terminalsecurity/tcadapter/bld"/>
-</component>
-<component name="terminalsecurity_build" filter="s60" long-name="Terminal Security Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/terminalsecurity/group"/>
-</component>
-</collection>
-<collection name="omaprovisioning" long-name="OMA Provisioning" level="specific">
-<component name="pnputil" filter="s60" long-name="PnP Util">
-<unit bldFile="mw/remotemgmt/omaprovisioning/pnputil/group"/>
-</component>
-<component name="provisioning" filter="s60" long-name="Provisioning">
-<unit bldFile="mw/remotemgmt/omaprovisioning/provisioning/group"/>
-</component>
-</collection>
-<collection name="devicediagnosticsfw" long-name="Device Diagnostics Framework" level="framework">
-<component name="diagframework" filter="s60" long-name="Diagnostics Framework">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
-</component>
-<component name="diagpluginbase" filter="s60" long-name="Diagnostics Plugin Base">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
-</component>
-<component name="diagresultsdb" filter="s60" long-name="Diagnostics Results Database">
-<!-- can only have one unit, merge or split into two components -->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
-</component>
-<component name="devicediagnosticsfw_build" filter="s60" long-name="Device Diagnostics Framework Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/group"/>
-</component>
-</collection>
-<collection name="dcmofw" long-name="Device Capability Management Object Framework" level="framework">
-<component name="dcmoclient" filter="s60" long-name="DCMO Client">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoclient/group"/>
-</component>
-<component name="dcmoserver" filter="s60" long-name="DCMO Server">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoserver/group"/>
-</component>
-<component name="dcmocustcmd" filter="s60" long-name="DCMO Custom Commands">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmocustcmd/group"/>
-</component>
-<component name="dcmofw_build" filter="s60" long-name="DCMO Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/dcmofw/group"/>
-</component>
-</collection>
-<collection name="fotaapplication" long-name="FOTA Application" level="generic">
-<component name="fotaapplication_build" filter="s60" long-name="FOTA Application Build">
-<!-- remove this component when configuration is in place and the #ifdefs have been worked out -->
-<unit bldFile="mw/remotemgmt/fotaapplication/group"/>
-</component>
-<component name="fotaserver" filter="s60" long-name="FOTA Server">
-<!-- uncomment when #ifdefs are resolved -->
-<!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
-</component>
-<component name="fotacustcmds" filter="s60" long-name="FOTA Custom Commands" class="placeholder">
-<!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
-<!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
-</component>
-</collection>
-</block>
-<block name="remoteconn" level="generic" long-name="Remote Connectivity" levels="plugin framework server generic specific">
-<collection name="remoteconn_info" long-name="Remote Connectivity Info" level="specific">
-<component name="remoteconn_metadata" long-name="Remote Connectivity Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mtptransports" long-name="MTP Transports" level="plugin">
-<component name="mtpusbtransport" long-name="MTP USB Transport" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpusbtransport/group" mrp="mw/remoteconn/mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
-</component>
-<component name="mtpptpiptransport" long-name="MTP PTP-IP Transport" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpptpiptransport/group" mrp="mw/remoteconn/mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
-</component>
-<component name="mtpcontroller" long-name="MTP Controller" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpcontroller/group" mrp="mw/remoteconn/mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
-</component>
-</collection>
-<collection name="mtpfws" long-name="MTP Frameworks" level="framework">
-<component name="mtpfw" long-name="MTP Framework" introduced="^2" purpose="optional">
-<unit bldFile="mw/remoteconn/mtpfws/mtpfw/group" mrp="mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/>
-</component>
-</collection>
-<collection name="mtpdataproviders" long-name="MTP Data Providers" level="generic">
-<component name="mtpfileandfolderdp" long-name="MTP File and Folder Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group" mrp="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
-</component>
-<component name="mtpimagedp" long-name="MTP Image Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpimagedp/group" mrp="mw/remoteconn/mtpdataproviders/mtpimagedp/group/mtp_imagedp.mrp"/>
-</component>
-<component name="mtppictbridgedp" long-name="MTP PictBridge Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group" mrp="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group/mtp_pictbridgedp.mrp"/>
-</component>
-</collection>
-<collection name="backupandrestore" long-name="Backup and Restore" level="specific">
-<component name="backupengine" long-name="Backup Engine" introduced="9.0" purpose="optional">
-<unit bldFile="mw/remoteconn/backupandrestore/backupengine/group" mrp="mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
-</component>
-<component name="backuptest" long-name="Backup Test" introduced="^2" purpose="development">
-<unit bldFile="mw/remoteconn/backupandrestore/backuptest/group" mrp="mw/remoteconn/backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
-</component>
-</collection>
-<collection name="obex" long-name="OBEX" level="generic">
-<component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexprotocol/group" mrp="mw/remoteconn/obex/obexprotocol/group/obex.mrp"/>
-</component>
-<component name="obexextensionapi" long-name="OBEX Extension API" introduced="9.2" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexextensionapi/group" mrp="mw/remoteconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
-</component>
-</collection>
-</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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<unit mrp="mw/srvdiscovery/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="dlnasrv" level="specific" long-name="DLNA Services" levels="stack server ctrl framework plugin">
-<!-- uncomment all the units when configuration is in place, they're currently #included from other xxx_build components -->
-<collection name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" level="plugin">
-<component name="upnp_media_server_settings_api" long-name="UPnP Media Server Settings API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_settings_api/group"/>
-</component>
-<component name="upnp_av_objects_api" long-name="UPnP A/V Objects API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_av_objects_api/group"/>
-</component>
-<component name="upnp_media_server_api" long-name="UPnP Media Server API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_api/group"/>
-</component>
-<component name="upnp_security_plugin_api" long-name="UPnP Security Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_security_plugin_api/group"/>
-</component>
-<component name="upnp_avcp_api" long-name="UPnP AVCP API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_avcp_api/group"/>
-</component>
-<component name="upnp_media_server_metadata_api" long-name="UPnP Media Server Metadata API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_metadata_api/group"/>
-</component>
-<component name="upnp_command_api" long-name="UPnP Command API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_command_api/group"/>
-</component>
-<component name="upnp_plugin_api" long-name="UPnP Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_plugin_api/group"/>
-</component>
-</collection>
-<collection name="upnpavcontrolpoint" long-name="UPnP A/V Control Point" level="plugin">
-<component name="avcontrolframework" filter="s60" long-name="A/V Control Famework" introduced="9.1" deprecated="^3">
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
-</component>
-<component name="upnpavcontrolpoint_build" filter="s60" long-name="UPnP A/V Control Point Build" introduced="9.1" deprecated="^3">
-<!-- put exports in other component instead -->
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/group"/>
-</component>
-</collection>
-<collection name="upnpmediaserver" long-name="UPnP Media Server" level="server">
-<component name="avobjects" filter="s60" long-name="A/V Objects">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/avobjects/group"/>
-</component>
-<component name="mediaserverclient" filter="s60" long-name="Media Server Client">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverclient/group"/>
-</component>
-<component name="connectionmanagerservice" filter="s60" long-name="Connection Manager Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/connectionmanagerservice/group"/>
-</component>
-<component name="contentdirectoryservice" filter="s60" long-name="Content Directory Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/contentdirectoryservice/group"/>
-</component>
-<component name="mediaserverengine" filter="s60" long-name="Media Server Engine">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverengine/group"/>
-</component>
-<component name="upnpmediaserver_build" filter="s60" long-name="UPnP Media Server Build">
-<!-- move exports into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpmediaserver/group"/>
-</component>
-</collection>
-<collection name="upnpavcontroller" long-name="UPnP A/V Controller" level="ctrl">
-<component name="upnpxmlparser" filter="s60" long-name="UPnP XML Parser" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpxmlparser/group"/>
-</component>
-<component name="upnpavcontrollerserver" filter="s60" long-name="UPnP A/V Controller Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerserver/group"/>
-</component>
-<component name="upnpavcontrollerclient" filter="s60" long-name="UPnP A/V Ccontroller Client" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerclient/group"/>
-</component>
-<component name="upnpavcontrollerhelper" filter="s60" long-name="UPnP A/V Controller Helper" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerhelper/group"/>
-</component>
-<component name="upnpavcontroller_build" filter="s60" long-name="UPnP A/V Controller Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpavcontroller/group"/>
-</component>
-</collection>
-<collection name="upnpframework" long-name="UPnP Framework" level="framework">
-<component name="upnputilities" filter="s60" long-name="UPnP Utilities" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnputilities/group"/>
-</component>
-<component name="upnpextensionpluginif" filter="s60" long-name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpextensionpluginif/group"/> -->
-</component>
-<component name="upnpfiletransferengine" filter="s60" long-name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>-->
-</component>
-<component name="upnpcommonui" filter="s60" long-name="UPnP Common UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpcommonui/group"/>-->
-</component>
-<component name="upnpaiwengine" filter="s60" long-name="UPnP AIW Engine" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpaiwengine/group"/> -->
-</component>
-<component name="upnpaiwprovider" filter="s60" long-name="UPnP AIW Provider" introduced="^2" deprecated="^3" plugin="Y">
-<!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
-</component>
-<component name="upnpmusicadapter" filter="s60" long-name="UPnP Music Adapter" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
-</component>
-<component name="upnpcommand" filter="s60" long-name="UPnP Command" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpcommand/group"/>
-</component>
-<component name="upnpframework_build" filter="s60" long-name="UPnP Framework Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpframework/group"/>
-</component>
-</collection>
-<collection name="upnpsettings" long-name="UPnP Settings" level="framework">
-<component name="upnpsettingsengine" filter="s60" long-name="UPnP Settings Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
-</component>
-<component name="multiselectionui" filter="s60" long-name="Multi-Selection UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/multiselectionui/group"/>-->
-</component>
-<component name="appwizard" filter="s60" long-name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/appwizard/group"/>-->
-</component>
-<component name="upnpsharingui" filter="s60" long-name="UPnP Sharing UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
-</component>
-<component name="upnpgsplugin" filter="s60" long-name="UPnP GS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
-</component>
-<component name="upnpsettings_build" filter="s60" long-name="UPnP Settings Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsettings/group"/>
-</component>
-</collection>
-<collection name="upnpsharing" long-name="UPnP Sharing" level="server">
-<component name="upnpdlnaprofiler" filter="s60" long-name="UPnP DLNA Profiler" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpdlnaprofiler/group"/>
-</component>
-<component name="upnpsecurity" filter="s60" long-name="UPnP Security" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpsecurity/group"/>
-</component>
-<component name="upnpcontentserver" filter="s60" long-name="UPnP Content Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpcontentserver/group"/>
-</component>
-<component name="applicationengine" filter="s60" long-name="UPnP Application Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/applicationengine/group"/>
-</component>
-<component name="upnpsharing_build" filter="s60" long-name="UPnP Sharing Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsharing/group"/>
-</component>
-</collection>
-<collection name="upnpmpxplugins" long-name="UPnP MPX Plugins" level="plugin">
-<component name="upnpplaybackplugins" filter="s60" long-name="UPnP Playback Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/upnpplaybackplugins/group"/>
-</component>
-<component name="upnpmpxplugins_build" filter="s60" long-name="UPnP MPX Plugins Build" introduced="^2">
-<!-- move exports content into other component? -->
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/group"/>
-</component>
-</collection>
-<collection name="upnpharvester" long-name="UPnP Harvester" level="ctrl">
-<component name="upnpharvester_common" filter="s60" long-name="UPnP Harvester Common" introduced="^2" deprecated="^3" class="placeholder">
-<!-- need to merge or #include these to a single bld.inf -->
-<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
- <unit bldFile="upnpharvester/common/cmsettings/group"/>
- <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
- <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
-</component>
-<component name="cdssync" filter="s60" long-name="CDS Sync" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
-</component>
-<component name="mdhserver" filter="s60" long-name="Metadata Harvester Server" introduced="^2" deprecated="^3" class="placeholder">
-<!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
-</component>
-<component name="upnpharvester_build" filter="s60" long-name="UPnP Harvester Build" introduced="^2" deprecated="^3" class="placeholder">
-<!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
-<!--<unit bldFile="upnpharvester/group"/>-->
-</component>
-</collection>
-<collection name="homesync" long-name="Home Sync" level="plugin">
-<component name="contentmanager" filter="s60" long-name="Content Manager" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homesync/group"/>-->
-<!-- move bld.inf into contentmanager dir -->
-</component>
-</collection>
-<collection name="homemedia" long-name="Home Media" level="framework">
-<!-- collection is really just a component. Move down a directory -->
-<component name="homemedia_build" filter="s60" long-name="Home Media" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homemedia/group"/> -->
-</component>
-</collection>
-<collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin">
-<component name="dlnasrv_build" filter="s60" long-name="DLNA Services Build">
-<!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed -->
-<unit bldFile="mw/dlnasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="btservices" level="generic" long-name="Bluetooth Services" levels="framework server generic specific plugin">
-<collection name="btservices_pub" long-name="BT Services Public Interfaces" level="plugin">
-<component name="bluetooth_power_state_api" long-name="Bluetooth Power State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_power_state_api/group"/>
-</component>
-<component name="bluetooth_notifier_api" long-name="Bluetooth Notifier API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_notifier_api/group"/>
-</component>
-</collection>
-<collection name="btservices_plat" long-name="BT Services Platform Interfaces" level="plugin">
-<component name="bluetooth_dosserver_audio_api" long-name="Bluetooth DOS Server Audio API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dosserver_audio_api/group"/>
-</component>
-<component name="bluetooth_dut_mode_api" long-name="Bluetooth DUT Mode API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dut_mode_api/group"/>
-</component>
-<component name="bluetooth_engine_api" long-name="Bluetooth Engine API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-<component name="bluetooth_local_variation_api" long-name="Bluetooth Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_local_variation_api/group"/>
-</component>
-<component name="bluetooth_notifier_internal_api" long-name="Bluetooth Notifier internal API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_notifier_internal_api/group"/>
-</component>
-<component name="bluetooth_sap_connection_state_api" long-name="Bluetooth SAP Connection State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_sap_connection_state_api/group"/>
-</component>
-<component name="bluetooth_secondary_display_notification_api" long-name="Bluetooth Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_secondary_display_notification_api/group"/>
-</component>
-</collection>
-<collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
-<component name="bteng" filter="s60" long-name="Bluetooth Engine">
-<unit bldFile="mw/btservices/bluetoothengine/bteng/group"/>
-</component>
-<component name="btnotif" filter="s60" long-name="Bluetooth Notifier">
-<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"/>
-</component>
-<component name="btmac" filter="s60" long-name="Bluetooth Mono Audio Controller" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btmac/group"/>
-</component>
-<component name="btsac" filter="s60" long-name="Bluetooth Stereo Audio Controller" plugin="Y">
-<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"/>
-</component>
-<component name="btsap" filter="s60" long-name="Bluetooth SIM Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btsap/group"/>
-</component>
-<component name="btui" filter="s60" long-name="Bluetooth UI">
-<unit bldFile="mw/btservices/bluetoothengine/btui/group"/>
-</component>
-<component name="btpbap" filter="s60" long-name="Bluetooth Phonebook Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btpbap/group"/>
-</component>
-<component name="bthid" filter="s60" long-name="Bluetooth HID">
-<unit bldFile="mw/btservices/bluetoothengine/bthid/group"/>
-</component>
-<component name="btctrldcmoadapter" filter="s60" long-name="Bluetooth Control DCMO Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btctrldcmoadapter/group"/>
-</component>
-</collection>
-<collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
-<component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
-<unit bldFile="mw/btservices/bluetoothappprofiles/avrcp" mrp="mw/btservices/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
-</component>
-</collection>
-<collection name="atcommands" long-name="AT Commands" level="generic">
-<component name="modematplugin" long-name="Modem AT Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/modematplugin/group"/>
-</component>
-<component name="lccustomplugin" long-name="LC Custom Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/lccustomplugin/group"/>
-</component>
-</collection>
-<collection name="btservices_info" long-name="BT Services Info" level="plugin">
-<component name="btservices_metadata" long-name="BT Services Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usbservices" level="generic" long-name="USB Services" levels="framework server generic specific plugin">
-<collection name="usbservices_plat" long-name="USB Services Platform Interfaces" level="plugin">
-<component name="pictbridge_api" long-name="PictBridge API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/pictbridge_api/group"/>
-</component>
-<component name="ptp_responder_api" long-name="PTP Responder API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_responder_api/group"/>
-</component>
-<component name="ptp_transport_api" long-name="PTP Transport API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_transport_api/group"/>
-</component>
-<component name="usb_device_control_plugin_api" long-name="USB Device Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_device_control_plugin_api/group"/>
-</component>
-<component name="usb_notifier_api" long-name="USB Notifier API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_notifier_api/group"/>
-</component>
-<component name="usb_personality_api_header" long-name="USB Personality API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_api_header/group"/>
-</component>
-<component name="usb_personality_plugin_api" long-name="USB Personality Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_plugin_api/group"/>
-</component>
-<component name="usb_secondary_display_api" long-name="USB Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_secondary_display_api/group"/>
-</component>
-<component name="usb_watcher_api" long-name="USB Watcher API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_api/group"/>
-</component>
-<component name="usb_watcher_info_api_header" long-name="USB Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_info_api_header/group"/>
-</component>
-</collection>
-<collection name="usbengines" long-name="USB Engines" level="generic">
-<component name="usbotgwatcher" filter="s60" long-name="USB OTG Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbotgwatcher/group"/>
-</component>
-<component name="usbwatcher" filter="s60" long-name="USB Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbwatcher/group"/>
-</component>
-<component name="usblocodplugin" filter="s60" long-name="USB Local Connectivity Domain Plugin" plugin="Y">
-<unit bldFile="mw/usbservices/usbengines/usblocodplugin/group"/>
-</component>
-<component name="usbdevcon" filter="s60" long-name="USB Device Control">
-<unit bldFile="mw/usbservices/usbengines/usbdevcon/group"/>
-</component>
-<component name="usbremotepersonality" filter="s60" long-name="USB Remote Personality">
-<unit bldFile="mw/usbservices/usbengines/usbremotepersonality/group"/>
-</component>
-</collection>
-<collection name="usbclasses" long-name="USB Classes" level="framework">
-<component name="usbobexclasscontroller" filter="s60" long-name="USB OBEX Class Controller" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbobexclasscontroller/group"/>
-</component>
-<component name="usbbasicpersonality" filter="s60" long-name="USB Basic Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbbasicpersonality/group"/>
-</component>
-<component name="usbmscpersonality" filter="s60" long-name="USB MSC Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbmscpersonality/group"/>
-</component>
-<!-- commented out in bld.inf. Should this be deleted?
- <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
- <unit bldFile="usbclasses/ptpstack/group"/>
- </component>
- <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
- <unit bldFile="usbclasses/sicdusbplugin/group"/>
- </component>
- <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
- <unit bldFile="usbclasses/ptpserver/group"/>
- </component>-->
-<component name="pictbridgeengine" filter="s60" long-name="PictBridge Engine">
-<unit bldFile="mw/usbservices/usbclasses/pictbridgeengine/group"/>
-</component>
-<component name="usbphoneasmodem" filter="s60" long-name="USB Phone as Modem" introduced="^3">
-<unit bldFile="mw/usbservices/usbclasses/usbphoneasmodem/group"/>
-</component>
-</collection>
-<collection name="usbuis" long-name="USB UIs" level="specific">
-<component name="usbui" filter="s60" long-name="USB UI">
-<unit bldFile="mw/usbservices/usbuis/usbui/group"/>
-</component>
-<component name="usbuinotif" filter="s60" long-name="USB UI Notifiers">
-<unit bldFile="mw/usbservices/usbuis/usbuinotif/group"/>
-</component>
-<component name="imageprintuiprovider" filter="s60" long-name="ImagePrint UI Provider" plugin="Y">
-<unit bldFile="mw/usbservices/usbuis/imageprintuiprovider/group"/>
-</component>
-<component name="usbimageprintui" filter="s60" long-name="ImagePrint UI">
-<unit bldFile="mw/usbservices/usbuis/imageprintui/group"/>
-</component>
-<component name="usbuiqt" long-name="USB UI Qt" introduced="^4" filter="s60">
-<unit bldFile="mw/usbservices/usbuis/usbuiqt" proFile="usbapplication.pro"/>
-</component>
-</collection>
-<collection name="usbservices_test" long-name="USB Services Test" level="server"/>
-</block>
-<block name="shortlinkconn" level="generic" long-name="Shortlink Connectivity" levels="framework server generic specific plugin">
-<!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
-<collection name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" level="plugin">
-<component name="obex_service_utils_api" long-name="OBEX Service Utils API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_utils_api/group"/>
-</component>
-<component name="obex_service_plugin_api" long-name="OBEX Service Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_plugin_api/group"/>
-</component>
-<component name="dialup_connection_status_api" long-name="Dial-up Connection Status API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dialup_connection_status_api/group"/>
-</component>
-<component name="dun_secondary_display_notification_api" long-name="DUN Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
-</component>
-<component name="obex_secondary_display_notification_api" long-name="OBEX Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
-</component>
-<component name="generic_hid_api" long-name="Generic HID API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/generic_hid_api/group"/>
-</component>
-<component name="locod_bearer_plugin_api" long-name="Locod Bearer Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/locod_bearer_plugin_api/group"/>
-</component>
-<component name="usb_obexservicemanager_client_api" long-name="USB OBEX Service Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_obexservicemanager_client_api/group"/>
-</component>
-</collection>
-<collection name="localconnectivityservice" long-name="Local Connectivity Service" level="server">
-<component name="locod" long-name="Local Connectivity Daemon">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/locod/group"/>
-</component>
-<component name="obexserviceman" long-name="OBEX Service Managar">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
-</component>
-<component name="obexsendservices" long-name="OBEX Send Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
-</component>
-<component name="obexreceiveservices" long-name="OBEX Receive Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
-</component>
-<component name="dun" long-name="Dial Up Networking">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/dun/group"/>
-</component>
-<component name="lcstylustap" long-name="LC Stylus Tap Plugins" plugin="Y">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/lcstylustap/group"/>
-</component>
-<component name="generichid" long-name="Generic HID">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/generichid/group"/>
-</component>
-<component name="headset" long-name="Headset">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/headset/group"/>
-</component>
-</collection>
-</block>
-<block name="imghandling" level="specific" long-name="Image Handling" levels="lib util if">
-<collection name="imagehandling_plat" long-name="Image Handling Platform Interfaces" level="if">
-<component name="image_handling_library_api" long-name="Image Handling Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
-</component>
-<component name="3gp_library_api" long-name="3GP Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
-</component>
-<component name="thumbnailmanager_api" long-name="Thumbnail Manager API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagehandlinglib" long-name="Image Handling Library" level="lib">
-<!-- collection is really a component, need to move down a directory -->
-<component name="ihl" filter="s60" long-name="IHL">
-<unit bldFile="mw/imghandling/imagehandlinglib/group"/>
-</component>
-</collection>
-<collection name="imagehandlingutilities" long-name="Image Handling Utilities" level="util">
-<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager">
-<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
-</component>
-<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager Qt" introduced="^4">
-<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt" filter="!test" proFile="thumbnailmanagerqt.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</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">
-<unit bldFile="mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
-</component>
-</collection>
-</block>
-<block name="mds" level="specific" long-name="Metadata Services" levels="mgr eng server int">
-<collection name="mds_plat" long-name="Metadata Services Platform Interfaces" level="int">
-<component name="context_engine_plugin_api" long-name="Context Engine Plugin API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/group" filter="!test"/>
-</component>
-<component name="harvester_framework_api" long-name="Harvester Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/harvester_framework_api/group" filter="!test"/>
-<!-- can only have one unit with the same filter, #include the following from the previous unit -->
-</component>
-<component name="location_manager_api" long-name="Location Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/location_manager_api/group" filter="!test"/>
-</component>
-<component name="metadata_engine_api" long-name="Metadata Engine API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/metadata_engine_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_collection_manager_api" long-name="Content Listing Framework Collection Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_extended_api" long-name="Content Listing Framework Extended API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_extended_api/group"/>
-</component>
-</collection>
-<collection name="mds_pub" long-name="Metadata Services Public Interfaces" level="int">
-<component name="content_listing_framework_api" long-name="Content Listing Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_pub/content_listing_framework_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="metadataengine" long-name="Metadata Engine" level="eng">
-<component name="metadataengine_common" filter="s60" long-name="Metadata Engine Common" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/common/group"/>
-</component>
-<component name="metadataengine_server" filter="s60" long-name="Metadata Engine Server" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/server/group"/>
-</component>
-<component name="metadataengine_client" filter="s60" long-name="Metadata Engine Client" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/client/group"/>
-</component>
-<component name="metadataengine_build" filter="s60" long-name="Metadata Engine Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/metadataengine/group"/>
-</component>
-</collection>
-<collection name="locationmanager" long-name="Location Manager" level="mgr">
-<component name="locationtrail" filter="s60" long-name="Location Trail" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/locationtrail/group"/>
-</component>
-<component name="locationmanager_server" filter="s60" long-name="Location Manager Server" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/server/group"/>
-</component>
-<component name="locationmanager_client" filter="s60" long-name="Location Manager Client" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/client/group"/>
-</component>
-<component name="locationmanager_build" filter="s60" long-name="Location Manager Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/locationmanager/group"/>
-</component>
-</collection>
-<collection name="contextengine" long-name="Context Engine" level="eng">
-<component name="contextengine_plugins" filter="s60" long-name="Context Engine Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/contextengine/plugins/group"/>
-</component>
-<component name="contextengine_build" filter="s60" long-name="Context Engine Build" introduced="^2">
-<!--make this collection a single component, or make this unit self-contained -->
-<unit bldFile="mw/mds/contextengine/group"/>
-</component>
-</collection>
-<collection name="harvester" long-name="Harvester" level="eng">
-<component name="blacklistclient" filter="s60" long-name="Blacklist Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistclient/group"/>
-</component>
-<component name="blacklistserver" filter="s60" long-name="Blacklist Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistserver/group"/>
-</component>
-<component name="harvester_common" filter="s60" long-name="Harvester Common" introduced="^2">
-<unit bldFile="mw/mds/harvester/common/group"/>
-</component>
-<component name="composerplugins" filter="s60" long-name="Composer Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/composerplugins/group"/>
-</component>
-<component name="harvesterplugins" filter="s60" long-name="Harvester Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/harvesterplugins/group"/>
-</component>
-<component name="monitorplugins" filter="s60" long-name="Monitor Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/monitorplugins/group"/>
-</component>
-<component name="harvester_server" filter="s60" long-name="Harvester Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/server/group"/>
-</component>
-<component name="harvester_client" filter="s60" long-name="Harvester Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/client/group"/>
-</component>
-<component name="harvester_build" filter="s60" long-name="Harvester Build" introduced="^2">
-<!-- split these exports into the other components -->
-<unit bldFile="mw/mds/harvester/group"/>
-</component>
-</collection>
-<collection name="watchdog" long-name="Watchdog" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="mdswatchdog" filter="s60" long-name="Metadata Watchdog" introduced="^2">
-<unit bldFile="mw/mds/watchdog/group"/>
-</component>
-</collection>
-<collection name="clfwrapper" long-name="Content Listing Framework Wrapper" level="int">
-<!-- collection is really a component. Move down a directory -->
-<component name="clfwrapper_build" filter="s60" long-name="CLF Wrapper Build" introduced="^2" class="placeholder">
-<!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
-<!--<unit bldFile="clfwrapper/group"/>-->
-</component>
-</collection>
-<collection name="mds_info" long-name="Metadata Services Info" level="int">
-<component name="mds_build" filter="s60" long-name="Metadata Services Build" introduced="^2">
-<!-- consider distributiing this into the rest of the components in the package -->
-<unit bldFile="mw/mds/group"/>
-</component>
-</collection>
-</block>
-<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"/>
-</component>
-<component name="videoconnutility_api" long-name="Video Connection Utility API" filter="s60" class="api">
-<unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/group"/>
-</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"/>
-</component>
-</collection>
-<collection name="videoscheduler" long-name="Video Scheduler" level="util">
-<component name="schedulerclient" filter="s60" long-name="Video Scheduler Client">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerclient/group"/>
-</component>
-<component name="schedulerserver" filter="s60" long-name="Video Scheduler Server">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerserver/group"/>
-</component>
-</collection>
-<collection name="videoconnutility" long-name="Video Connection Utility" level="util">
-<component name="connutilpsworker" filter="s60" long-name="Connection Utility Publish and Subscribe Worker">
-<unit bldFile="mw/videoutils/videoconnutility/connutilpsworker/group"/>
-</component>
-<component name="video_connutility" filter="s60" long-name="Video Connection Utility">
-<unit bldFile="mw/videoutils/videoconnutility/connutility/group"/>
-</component>
-</collection>
-<collection name="videoutils_info" long-name="Video Utils Info" level="if"/>
-</block>
-<block name="mmmw" level="generic" long-name="Multimedia Middleware" levels="plugin framework server generic specific">
-<collection name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" level="specific">
-<component name="multimedia_data_source_api" long-name="Multimedia Data Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
-</component>
-<component name="progressive_download_api" long-name="Progressive Download API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/progressive_download_api/group"/>
-</component>
-<component name="equalizer_ui_api" long-name="Equalizer UI API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
-</component>
-<component name="enhanced_media_client_api" long-name="Enhanced Media Client API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
-</component>
-<component name="stream_control_custom_command_api" long-name="Stream Control Custom Command API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
-</component>
-<component name="emc_buffer_source_api" long-name="EMC Buffer Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_buffer_source_api/group"/>
-</component>
-<component name="emc_file_source_api" long-name="EMC File Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
-</component>
-<component name="audio_metadata_reader_api" long-name="Audio MetaData Reader API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
-</component>
-<component name="emc_progressive_download_source_api" long-name="EMC Progressive Download Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
-</component>
-<component name="emc_volume_effect_api" long-name="EMC Volume Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
-</component>
-<component name="emc_balance_effect_api" long-name="EMC Balance Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_balance_effect_api/group"/>
-</component>
-<component name="emc_descriptor_source_api" long-name="EMC Descriptor Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_descriptor_source_api/group"/>
-</component>
-<component name="emc_drm_config_intfc_api" long-name="EMC DRM Config Intfc API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
-</component>
-<component name="voip_audio_services_api" long-name="VoIP Audio Services" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/group"/>
-</component>
-<component name="configuration_components_factory_api" long-name="Configuration Components Factory API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
-</component>
-<component name="audio_output_control_utility_api" long-name="Audio Output Control Utility API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/group"/>
-</component>
-<component name="audio_output_control_utility_proxy_api" long-name="Audio Output Control Utility Proxy API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
-</component>
-<component name="emc_audio_effects_api" long-name="EMC Audio Effects API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
-</component>
-<component name="call_audio_control_api" long-name="Call AudioControl API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/group"/>
-</component>
-<component name="radio_utilities_api" long-name="Radio Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/group"/>
-</component>
-<component name="radio_preset_utilities_api" long-name="Radio Preset Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
-</component>
-<component name="radio_monitor_api" long-name="Radio Monitor API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
-</component>
-<component name="thumbnail_engine_api" long-name="Thumbnail Engine API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/thumbnail_engine_api/group"/>
-</component>
-<component name="telephony_multimedia_service_api" long-name="Telephony Multimedia Service API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
-</component>
-<component name="openmax_al_api" long-name="OpenMAX AL API" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/openmax_al_api/group"/>
-</component>
-</collection>
-<collection name="mmfenh" long-name="MMF Enhancements" level="generic">
-<component name="advancedaudiocontroller" filter="s60" long-name="Advanced Audio Controllers" plugin="Y">
-<unit bldFile="mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
-</component>
-<component name="audiooutputcontrolutility" filter="s60" long-name="Audio Output Control Utility">
-<unit bldFile="mw/mmmw/mmfenh/audiooutputcontrolutility/group"/>
-</component>
-<component name="configurationcomponentsfactory" filter="s60" long-name="Configuration Components Factory">
-<unit bldFile="mw/mmmw/mmfenh/configurationcomponentsfactory/group"/>
-</component>
-<component name="enhancedaudioplayerutility" filter="s60" long-name="Enhanced Audio Player Utility">
-<unit bldFile="mw/mmmw/mmfenh/enhancedaudioplayerutility/group"/>
-</component>
-<component name="enhancedmediaclient" filter="s60" long-name="Enhanced Media Client">
-<unit bldFile="mw/mmmw/mmfenh/enhancedmediaclient/group"/>
-</component>
-<component name="profilesettingsmonitor" filter="s60" long-name="Profile Settings Monitor">
-<unit bldFile="mw/mmmw/mmfenh/profilesettingsmonitor/group"/>
-</component>
-<component name="progressivedownload" filter="s60" long-name="Progressive Download">
-<unit bldFile="mw/mmmw/mmfenh/progressivedownload/group"/>
-</component>
-</collection>
-<collection name="mm_fw" long-name="Multimedia Frameworks" level="framework">
-<!-- Id needs to be unique, mmfw already in use -->
-<!-- Placeholder for OpenAX AL and other stuff -->
-</collection>
-<collection name="mmserv" long-name="Multimedia Services" level="specific">
-<component name="audioeffectsui" filter="s60" long-name="Audio Effects UI">
-<unit bldFile="mw/mmmw/mmserv/audioeffectsui/group"/>
-</component>
-<component name="callaudiocontrol" filter="s60" long-name="Call Audio Control">
-<unit bldFile="mw/mmmw/mmserv/callaudiocontrol/group"/>
-</component>
-<component name="metadatautility" filter="s60" long-name="Metadata Utility">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/group"/>
-</component>
-<component name="radioutility" filter="s60" long-name="Radio Utility">
-<unit bldFile="mw/mmmw/mmserv/radioutility/group"/>
-</component>
-<component name="thumbnailengine" filter="s60" long-name="Thumbnail Engine" introduced="^2">
-<unit bldFile="mw/mmmw/mmserv/thumbnailengine/group"/>
-</component>
-<component name="tms" filter="s60" long-name="Telephony Multimedia Service" introduced="^3">
-<unit bldFile="mw/mmmw/mmserv/tms/group"/>
-</component>
-<component name="voipaudioservices" filter="s60" long-name="VoIP Audio Services">
-<unit bldFile="mw/mmmw/mmserv/voipaudioservices/group"/>
-</component>
-<component name="lib3gpextparser" filter="s60" long-name="3GP Extension Metadata Parser Library">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group" filter="sf_build"/>
-</component>
-</collection>
-<collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
-<component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="helix" level="generic" long-name="Helix" levels="plugin framework server generic specific">
-<collection name="helix_ren" long-name="Helix Engine" level="framework">
-<!-- what does "ren" stand for? -->
-<component name="helix_stub" filter="s60" long-name="Helix Stub" introduced="^2" class="api">
-<unit bldFile="mw/helix/helix_ren/helix_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="camerasrv" level="specific" long-name="Camera Services" levels="plugin fw api">
-<collection name="camerasrv_plat" long-name="Camera Services Platform Interfaces" level="api">
-<component name="media_recorder_sink_api" long-name="Media Recorder Sink API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
-</component>
-<component name="custom_onboard_camera_api" long-name="Custom Onboard Camera API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
-</component>
-<component name="imaging_configuration_manager_api" long-name="Imaging Configuration Manager API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
-</component>
-<component name="media_recorder_api" long-name="Media Recorder API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_api/group" filter="!test"/>
-</component>
-<component name="3gp_file_composer_api" long-name="3GP File Composer API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
-</component>
-</collection>
-<collection name="camcordermmfplugin" long-name="Camcorder MMF Plugin" level="plugin">
-<!-- collection is really a component. Should move down a directory -->
-<component name="camcordermmfplugin_build" filter="s60" long-name="Camcorder MMF Plugin Build" plugin="Y">
-<unit bldFile="mw/camerasrv/camcordermmfplugin/build"/>
-</component>
-</collection>
-<collection name="configmanagers" long-name="Config Managers" level="api">
-<component name="imagingconfigmanager" filter="s60" long-name="Imaging Config Manager">
-<unit bldFile="mw/camerasrv/configmanagers/imagingconfigmanager/group"/>
-</component>
-</collection>
-<collection name="camerasrv_info" long-name="Camera Services Info" level="api">
-<component name="camerasrv_build" filter="s60" long-name="Camera Services Build">
-<!-- should split into individual bld.infs -->
-<unit bldFile="mw/camerasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="mmappfw" level="specific" long-name="Multimedia App Framework" levels="fw utils if">
-<collection name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" level="if">
-<component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interfaces Build" introduced="^1" filter="s60">
-<!-- this is no longer necessary when confguration is put in place -->
-<unit bldFile="mw/mmappfw/mmappfw_plat"/>
-</component>
-<component name="collection_helper_api" long-name="Collection Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
-</component>
-<component name="harvester_collection_mediator_api" long-name="Harvester Collection Mediator API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/group"/>
-</component>
-<component name="harvester_metadata_extractor_api" long-name="Harvester Metadata Extractor API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/group"/>
-</component>
-<component name="harvester_server_api" long-name="Harvester Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_server_api/group"/>
-</component>
-<component name="harvester_utility_api" long-name="Harvester Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_utility_api/group"/>
-</component>
-<component name="playlist_engine_api" long-name="Playlist Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playlist_engine_api/group"/>
-</component>
-<component name="mtp_keys_api" long-name="MTP Keys API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mtp_keys_api/group"/>
-</component>
-<component name="mpx_collection_common_definition_api" long-name="MPX Collection Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_common_definition_api/group"/>
-</component>
-<component name="mpx_collection_utility_api" long-name="MPX Collection Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/group"/>
-</component>
-<component name="mpx_common_api" long-name="MPX Common API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_api/group"/>
-</component>
-<component name="mpx_common_definition_api" long-name="MPX Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_common_definition_api" long-name="MPX Playback Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_utility_api" long-name="MPX Playback Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/group"/>
-</component>
-<component name="mpx_base_view_plugins_api" long-name="MPX Base View Plugins API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/group"/>
-</component>
-<component name="mpx_view_utility_api" long-name="MPX View Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_view_utility_api/group"/>
-</component>
-<component name="mpx_albumart_utility_api" long-name="MPX Album Art Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/group"/>
-</component>
-<component name="media_player_settings_engine_api" long-name="Media Player Settings Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
-</component>
-<component name="mpx_backstepping_utility_api" long-name="MPX Backstepping Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_backstepping_utility_api/group"/>
-</component>
-<component name="asx_parser_api" long-name="ASX Parser API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/asx_parser_api/group"/>
-</component>
-<component name="playback_helper_api" long-name="Playback Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playback_helper_api/group"/>
-</component>
-<component name="videoplaylist_utility_api" long-name="Video Playlist Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/videoplaylist_utility_api/group"/>
-</component>
-</collection>
-<collection name="mpx" long-name="Multimedia Player" level="fw">
-<component name="commonframework" filter="s60" long-name="MPX Common Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/commonframework/group"/>
-</component>
-<component name="playbackframework" filter="s60" long-name="MPX Playback Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/playbackframework/group"/>
-</component>
-<component name="mpxcollectionfw" filter="s60" long-name="MPX Collection Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/collectionframework/group"/>
-</component>
-<component name="mpxviewfw" filter="s60" long-name="MPX View Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/viewframework/group"/>
-</component>
-<component name="mpxviewframeworkqt" long-name="MPX View Framework Qt" filter="s60">
-<unit bldFile="mw/mmappfw/mpx/mpxviewframeworkqt" proFile="mpxviewframeworkqt.pro" qmakeArgs="-r -config rom"/>
-</component>
-<component name="mpx_build" filter="s60" long-name="MPX Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/mpx/group"/>
-</component>
-</collection>
-<collection name="mmappcomponents" long-name="Multimedia App Components" level="utils">
-<component name="mmappcomponents_build" filter="s60" long-name="Multimedia App Components Build" introduced="^1">
-<!-- needed for #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
- Can remove this once configuration is in place-->
-<unit bldFile="mw/mmappfw/mmappcomponents/group"/>
-</component>
-<component name="collectionhelper" filter="s60" long-name="Media Player Collection Helper" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/collectionhelper/group"/>
-</component>
-<component name="playlistengine" filter="s60" long-name="Playlist Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/playlistengine/group"/>
-</component>
-<component name="mpxharvester" filter="s60" long-name="Media Player Harvester" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/harvester/group"/>
-</component>
-<component name="mmappcommonui" filter="s60" long-name="Multimedia App Common UI" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmappcommonui/group"/>
-</component>
-<component name="mediaplayersettingsengine" filter="s60" long-name="Media Player Settings Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
-</component>
-<component name="audiofetcher" filter="s60" long-name="Audio Fetcher" introduced="^1" plugin="Y">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
-</component>
-<component name="asxparser" filter="s60" long-name="ASX Parser" introduced="^1">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
-</component>
-<component name="playbackhelper" filter="s60" long-name="Playback Helper" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/playbackhelper/group"/>
-</component>
-<component name="videoplaylistutility" filter="s60" long-name="Video Playlist Utility" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/videoplaylistutility/group"/>
-</component>
-<component name="mmmtpdataprovider" filter="s60" long-name="Multimedia MTP Data Provider" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmmtpdataprovider/group"/>
-</component>
-</collection>
-<collection name="mmappfw_info" long-name="Multimedia App Framework Info" level="if">
-<component name="mmappfw_build" filter="s60" long-name="Multimedia App Framework Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/group"/>
-</component>
-<component name="mmappfw_test" filter="s60,test,api_test,pref_test" long-name="Multimedia App Framework Test" purpose="development" introduced="^1"/>
-</collection>
-</block>
-<block name="hgwidgets" level="specific" long-name="HG Widgets" levels="framework service api">
-<collection name="hgwidgets_pub" long-name="HG Widgets Platform Interfaces" level="api">
-<component name="ganeswidgets_api" long-name="Ganes Widgets API" introduced="^4" class="api placeholder">
-<!-- should separate out unit -->
-</component>
-</collection>
-<collection name="hgwidgets_pub" long-name="HG Widgets Public Interfaces" level="api"/>
-<collection name="ganeswidgets" long-name="Ganes Widgets" level="service">
-<!-- really a component, should move down a dir level and have a unit -->
-<component name="ganeswidgets_build" long-name="Ganes Widgets Build" introduced="^4" class="placeholder">
-<!-- should separate out unit -->
-</component>
-</collection>
-<collection name="hgwidgets_info" long-name="HG Widgets Info" level="framework">
-<component name="hgwidgets_build" long-name="HG Widgets Build" introduced="^4">
-<unit bldFile="mw/hgwidgets" proFile="hgwidgets.pro"/>
-</component>
-</collection>
-</block>
-<block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework api">
-<collection name="inputmethods_pub" long-name="Input Methods Public Interfaces" level="api">
-<component name="ptiengine_iti_api" long-name="PTI Engine API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
-</component>
-<component name="optical_character_recognition_api" long-name="Optical Character Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
-</component>
-<component name="input_language_info_api" long-name="Input Language Info API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
-</component>
-</collection>
-<collection name="inputmethods_plat" long-name="Input Methods Platform Interfaces" level="api">
-<component name="pen_input_server_api" long-name="Pen Input Server API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/group" filter="!test"/>
-</component>
-<component name="ptiengine_hwr_api" long-name="PTI Engine Handwriting Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group" filter="!test"/>
-</component>
-<component name="aknfep_settings_api" long-name="Avkon FEP Settings API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
-</component>
-<component name="aknfep_status_api" long-name="Avkon FEP Status API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
-</component>
-<component name="ptiengine_key_definations_api" long-name="PTI Engine Key Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
-</component>
-<component name="aknfep_definitions_api" long-name="Avkon FEP Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
-</component>
-<component name="aknfep_pen_support_api" long-name="Avkon FEP Pen Support API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
-</component>
-<component name="ptiengine_indic_definitions_api" long-name="PTI Engine Indic Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
-</component>
-<component name="aknfep_uiinterface_api" long-name="Avkon FEP UI Interface API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="textinput" long-name="Text Input" level="framework">
-<component name="ptienginev2" filter="s60" long-name="Predictive Text Input Engine">
-<!--uncomment when configuration is turned on and textinput_build is removed-->
-<!-- <unit bldFile="textinput/ptienginev2/group"/>-->
-</component>
-<component name="akninputlanguage" filter="s60" long-name="Avkon Input Language">
-<unit bldFile="mw/inputmethods/textinput/akninputlanguage/group"/>
-</component>
-<component name="peninputarc" filter="s60" long-name="Pen Input Arc">
-<unit bldFile="mw/inputmethods/textinput/peninputarc/group"/>
-</component>
-<component name="peninputcommonctrls" filter="s60" long-name="Pen Input Common Controls">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonctrls/group"/>
-</component>
-<component name="peninputcommonlayout" filter="s60" long-name="Pen Input Common Layout">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonlayout/group"/>
-</component>
-<component name="peninputhwrtrui" filter="s60" long-name="Pen Input Handwriting Recognition Training UI" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrtrui/group"/>
-</component>
-<component name="textinput_build" filter="s60" long-name="Text Input Build">
-<!--needed for #ifdef, can be removed when configuration is implemented -->
-<unit bldFile="mw/inputmethods/textinput/group"/>
-</component>
-</collection>
-<collection name="fep" long-name="FEP" level="engine">
-<component name="aknfep" filter="s60" long-name="Avkon FEP" plugin="Y">
-<unit bldFile="mw/inputmethods/fep/aknfep/group"/>
-</component>
-<component name="frontendprocessor" long-name="Front End Processor" purpose="mandatory">
-<unit bldFile="mw/inputmethods/fep/frontendprocessor/group" mrp="mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
-</component>
-</collection>
-<collection name="inputmethods_info" long-name="Input Methods Info" level="api">
-<component name="inputmethods_metadata" long-name="Input Methods Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="qt" level="generic" long-name="Qt" levels="tool mw app">
-<collection name="qtconf" long-name="Qt Config" level="tool">
-<component name="qt_deviceconfiguration" long-name="Qt Device Configuration" introduced="^2" class="config tool">
-<unit bldFile="mw/qt/src/s60installs/deviceconfiguration"/>
-</component>
-</collection>
-<collection name="qt_info" long-name="Qt Info" level="mw">
-<component name="qt_build" long-name="Qt Build" introduced="^2">
-<unit bldFile="mw/qt" proFile="projects.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-<collection name="qtdemos" long-name="Qt Demos" level="app">
-<component name="qtdemos_build" long-name="Qt Demos Build" introduced="^2" filter="qtdemos">
-<unit bldFile="mw/qt/demos" proFile="demos.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-<collection name="qtexamples" long-name="Qt Examples" level="app">
-<component name="qtexamples_build" long-name="Qt Examples Build" introduced="^2" filter="qtexamples">
-<unit bldFile="mw/qt/examples" proFile="examples.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-<collection name="qt_tests" long-name="Qt Tests" level="app">
-<component name="qttestsauto" long-name="Qt Automated Tests" introduced="^2" filter="qttestsauto">
-<unit bldFile="mw/qt/tests/auto" proFile="qtpauto.pro"/>
-</component>
-<component name="qttestsbenchmarks" long-name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks">
-<unit bldFile="mw/qt/tests/benchmarks" proFile="benchmarks.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-</block>
-<block name="qtextensions" level="generic" long-name="Qt Extensions" levels="tool mw app">
-<collection name="qtecomplugins" long-name="Qt ECom Plugins" level="app">
-<component name="qtextensions_examples" filter="qtextensionsexamples" long-name="Qt ECom Plugin Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtecomplugins/examples" proFile="examples.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qthighway" long-name="Qt Highway" level="app">
-<component name="qthighway_examples" filter="qtextensionsexamples" long-name="Qt Highway Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qthighway/examples" qmakeArgs="-r"/>
-</component>
-<component name="qthighwaytests" filter="qtextensionstests" long-name="Qt Highway Tests" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qthighway/tests" proFile="tests.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qtmobileextensions" long-name="Qt Mobile Extensions" level="app">
-<component name="qtmobileextensions_examples" filter="qtextensionsexamples" long-name="Qt Mobile Extensions Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtmobileextensions/examples" proFile="examples.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qtmobility" long-name="Qt Mobility">
-<component name="qtmobility_examples" filter="qtextensionsexamples" long-name="Qt Mobility Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtmobility/examples" proFile="examples.pro" qmakeArgs="-r"/>
-</component>
-<component name="qtmobilitytests" filter="qtextensionstests" long-name="Qt Extensions Tests" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtmobility/tests" proFile="tests.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qtextensions_info">
-<component name="qtextensions_build" long-name="Qt Extensions Confgure" introduced="^4" class="conf">
-<unit bldFile="mw/qtextensions/group"/>
-</component>
-<component name="qtextensions_build" long-name="Qt Extensions Build" introduced="^4">
-<!-- break this up into the above collections-->
-<unit bldFile="mw/qtextensions" proFile="qtextensions.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</block>
-<block name="hb" level="generic" long-name="Orbit" levels="engine test api">
-<collection name="hb_info" long-name="Orbit Info" level="api">
-<component name="hb_build" long-name="Orbit Build" introduced="^4">
-<!-- should break this down into actual components -->
-<unit bldFile="mw/hb" proFile="hb.pro"/>
-</component>
-</collection>
-<collection name="hb_test" long-name="Orbit Test" level="test">
-<component name="hb_fute" filter="hb_fute_app" long-name="Fute" introduced="^4">
-<unit bldFile="mw/hb/tsrc/fute" proFile="fute.pro" qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
-</component>
-</collection>
-</block>
-<block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
-<collection name="classicui_plat" long-name="Classic UI Platform Interfaces" level="specific">
-<component name="personalisation_framework_api" long-name="Personalisation Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_framework_api/group" filter="!test"/>
-</component>
-<component name="signal_pane_api" long-name="Signal Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
-</component>
-<component name="japanese_reading_api" long-name="Japanese Reading API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/japanese_reading_api/group" filter="!test"/>
-</component>
-<component name="global_popup_priority_controller_api" long-name="Global Popup Priority Controller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
-</component>
-<component name="item_finder_api" long-name="Item Finder API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/item_finder_api/group" filter="!test"/>
-</component>
-<component name="avkon_fonts_api" long-name="Avkon Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_fonts_api/group" filter="!test"/>
-</component>
-<component name="extended_utilities_api" long-name="Extended Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
-</component>
-<component name="personalisation_plugin_api" long-name="Personalisation Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
-</component>
-<component name="extended_aiw_criteria_api" long-name="Extended AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="personalisation_application_api" long-name="Personalisation Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_application_api/group"/>
-</component>
-<component name="volume_popup_api" long-name="Volume Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
-</component>
-<component name="avkon_secondary_display_support_api" long-name="AVKON Secondary Display Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_support_api/group" filter="!test"/>
-</component>
-<component name="extended_setting_pages_api" long-name="Extended Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_setting_pages_api/group" filter="!test"/>
-</component>
-<component name="extended_lists_api" long-name="Extended Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_lists_api/group" filter="!test"/>
-</component>
-<component name="input_block_api" long-name="Input Block API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/input_block_api/group" filter="!test"/>
-</component>
-<component name="avkon_ui_server_api" long-name="AVKON UI Server API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_ui_server_api/group" filter="!test"/>
-</component>
-<component name="number_grouping_api" long-name="Number Grouping API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/number_grouping_api/group" filter="!test"/>
-</component>
-<component name="extended_status_pane_api" long-name="Extended Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_status_pane_api/group" filter="!test"/>
-</component>
-<component name="extended_notifiers_api" long-name="Extended Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notifiers_api/group" filter="!test"/>
-</component>
-<component name="task_list_api" long-name="Task List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
-</component>
-<component name="personalisation_slide_show_dialog_api" long-name="Personalisation Slide Show Dialog API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
-</component>
-<component name="key_event_utilities_api" long-name="Key Event Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_event_utilities_api/group"/>
-</component>
-<component name="emergency_call_support_api" long-name="Emergency Call Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/emergency_call_support_api/group" filter="!test"/>
-</component>
-<component name="extended_dialogs_api" long-name="Extended Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_dialogs_api/group"/>
-</component>
-<component name="legacy_ui_framework_headers_api" long-name="Legacy UI Framework Headers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/legacy_ui_framework_headers_api/group"/>
-</component>
-<component name="extended_editors_api" long-name="Extended Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_editors_api/group" filter="!test"/>
-</component>
-<component name="alarm_api" long-name="Alarm API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alarm_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_interface_base_api" long-name="AIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_base_api/group" filter="!test"/>
-</component>
-<component name="list_effects_api" long-name="List Effects API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/list_effects_api/group" filter="!test"/>
-</component>
-<component name="find_item_ui_api" long-name="Find Item UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/find_item_ui_api/group" filter="!test"/>
-</component>
-<component name="server_application_services_api" long-name="Server Application Services API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/server_application_services_api/group" filter="!test"/>
-</component>
-<component name="common_ui_settings_api" long-name="Common UI Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_ui_settings_api/group"/>
-</component>
-<component name="aiw_service_interface_menu_api" long-name="AIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_menu_api/group" filter="!test"/>
-</component>
-<component name="eikon_server_extension_client_api" long-name="EIKON Server Extension Client API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/eikon_server_extension_client_api/group" filter="!test"/>
-</component>
-<component name="skinnable_clock_api" long-name="Skinnable Clock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/skinnable_clock_api/group" filter="!test"/>
-</component>
-<component name="battery_pane_api" long-name="Battery Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/battery_pane_api/group" filter="!test"/>
-</component>
-<component name="fep_document_navigation_api" long-name="FEP Document Navigation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
-</component>
-<component name="personalisation_localised_texts_api" long-name="Personalisation Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
-</component>
-<component name="memory_card_ui_api" long-name="Memory Card UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
-</component>
-<component name="avkon_status_api" long-name="AVKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_status_api/group"/>
-</component>
-<component name="application_switching_api" long-name="Application Switching API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/application_switching_api/group" filter="!test"/>
-</component>
-<component name="avkon_localised_texts_api" long-name="AVKON Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_localised_texts_api/group"/>
-</component>
-<component name="avkon_secondary_display_api" long-name="AVKON Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_api/group"/>
-</component>
-<component name="extended_animation_api" long-name="Extended Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_notes_api" long-name="Extended Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notes_api/group" filter="!test"/>
-</component>
-<component name="text_scroller_api" long-name="Text Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/text_scroller_api/group" filter="!test"/>
-</component>
-<component name="custom_cursors_api" long-name="Custom Cursors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/custom_cursors_api/group" filter="!test"/>
-</component>
-<component name="global_window_priorities_api" long-name="Global Window Priorities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_window_priorities_api/group"/>
-</component>
-<component name="extended_indicators_api" long-name="Extended Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_indicators_api/group" filter="!test"/>
-</component>
-<component name="special_character_table_api" long-name="Special Character Table API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/special_character_table_api/group" filter="!test"/>
-</component>
-<component name="avkon_settings_api" long-name="AVKON Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_settings_api/group"/>
-</component>
-<component name="extended_sounds_api" long-name="Extended Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_sounds_api/group"/>
-</component>
-<component name="themes_settings_api" long-name="Themes Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/themes_settings_api/group"/>
-</component>
-<component name="media_shared_document_api" long-name="Media Shared Document API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/media_shared_document_api/group" filter="!test"/>
-</component>
-<component name="extended_queries_api" long-name="Extended Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_queries_api/group"/>
-</component>
-<component name="phone_number_text_utilities_api" long-name="Phone Number Text Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
-</component>
-<component name="extended_scroller_api" long-name="Extended Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_scroller_api/group"/>
-</component>
-<component name="key_rotator_api" long-name="Key Rotator API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_rotator_api/group" filter="!test"/>
-</component>
-<component name="extended_grids_api" long-name="Extended Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_grids_api/group" filter="!test"/>
-</component>
-<component name="generic_parameter_api" long-name="Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="indicator_touch_observer_api" long-name="Indicator Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_touch_observer_api/group"/>
-</component>
-<component name="popup_form_api" long-name="Popup Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/popup_form_api/group" filter="!test"/>
-</component>
-<component name="stylus_activated_popup_api" long-name="Stylus Activated Pop-up API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/stylus_activated_popup_api/group" filter="!test"/>
-</component>
-<component name="indicator_plugin_api" long-name="Indicator Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_plugin_api/group" filter="!test"/>
-</component>
-<component name="layout_configuration_api" long-name="Layout Configuration API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/layout_configuration_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_filter_factory_api" long-name="Common File Dialogs Filter Factory API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group" filter="!test"/>
-</component>
-<component name="avkon_anim_dll_api" long-name="AVKON Anim DLL API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_anim_dll_api/group"/>
-</component>
-<component name="extended_initialization_api" long-name="Extended Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_initialization_api/group" filter="!test"/>
-</component>
-<component name="long_tap_animation_api" long-name="Long Tap Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/long_tap_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_ui_framework_definitions_api" long-name="Extended UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_ui_framework_definitions_api/group"/>
-</component>
-<component name="extended_buttons_api" long-name="Extended Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_buttons_api/group" filter="!test"/>
-</component>
-<component name="aiw_provider_utility_api" long-name="AIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_provider_utility_api/group" filter="!test"/>
-</component>
-<component name="transition_effect_parameters_api" long-name="Transition Effect Parameters API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_parameters_api/group" filter="!test"/>
-</component>
-<component name="extended_input_capabilities_api" long-name="Extended Input Capabilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_input_capabilities_api/group" filter="!test"/>
-</component>
-<component name="uikon_status_api" long-name="UIKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/uikon_status_api/group"/>
-</component>
-<component name="transition_effect_utilities_api" long-name="Transition Effect Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_utilities_api/group" filter="!test"/>
-</component>
-<component name="pointer_event_modifier_api" long-name="Pointer Event Modifier API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/pointer_event_modifier_api/group" filter="!test"/>
-</component>
-<component name="avkon_testability_api" long-name="AVKON Testability API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_testability_api/group"/>
-</component>
-<component name="ganes_api" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ganes_api/group"/>
-</component>
-<component name="ode_api" long-name="Ode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ode_api/group"/>
-</component>
-<component name="physics_api" long-name="Physics API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/physics_api/group"/>
-</component>
-<component name="touch_pane_api" long-name="Touch Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_api/group" filter="!test"/>
-</component>
-<component name="touch_pane_observer_api" long-name="Touch Pane Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_observer_api/group"/>
-</component>
-<component name="alternate_fs_api" long-name="Alternate FS API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alternate_fs_api/group"/>
-</component>
-<component name="discreet_popup_api" long-name="Discreet Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/discreet_popup_api/group"/>
-</component>
-<component name="touch_gesture_framework_api" long-name="Touch Gesture Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_gesture_framework_api/group"/>
-<!-- should this be commented out? -->
-<!--<unit bldFile="classicui_plat/touch_gesture_framework_api/tsrc/group" filter="test,api_test"/> -->
-</component>
-<component name="extended_options_menu_api" long-name="Extended Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="classicui_pub" long-name="Classic UI Public Interfaces" level="specific">
-<component name="input_frame_api" long-name="Input Frame API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/input_frame_api/group" filter="!test"/>
-</component>
-<component name="window_server_event_observer_api" long-name="Window Server Event Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/window_server_event_observer_api/group" filter="!test"/>
-</component>
-<component name="application_framework_api" long-name="Application Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/application_framework_api/group" filter="!test"/>
-</component>
-<component name="scroller_api" long-name="Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/scroller_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_utilities_api" long-name="UI Framework Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_utilities_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_definitions_api" long-name="UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_definitions_api/group" filter="!test"/>
-</component>
-<component name="buttons_api" long-name="Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/buttons_api/group" filter="!test"/>
-</component>
-<component name="queries_api" long-name="Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/queries_api/group" filter="!test"/>
-</component>
-<component name="aiw_generic_parameter_api" long-name="AIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="editors_api" long-name="Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/editors_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_api" long-name="Common File Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/common_file_dialogs_api/group" filter="!test"/>
-</component>
-<component name="dialog_shutter_api" long-name="Dialog Shutter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialog_shutter_api/group" filter="!test"/>
-</component>
-<component name="fonts_api" long-name="Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/fonts_api/group" filter="!test"/>
-</component>
-<component name="screen_clearer_api" long-name="Screen Clearer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_clearer_api/group" filter="!test"/>
-</component>
-<component name="notifiers_api" long-name="Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notifiers_api/group" filter="!test"/>
-</component>
-<component name="notes_api" long-name="Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notes_api/group" filter="!test"/>
-</component>
-<component name="status_pane_api" long-name="Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/status_pane_api/group" filter="!test"/>
-</component>
-<component name="base_controls_api" long-name="Base Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/base_controls_api/group" filter="!test"/>
-</component>
-<component name="grids_api" long-name="Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/grids_api/group" filter="!test"/>
-</component>
-<component name="context_pane_api" long-name="Context Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/context_pane_api/group" filter="!test"/>
-</component>
-<component name="lists_api" long-name="Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/lists_api/group" filter="!test"/>
-</component>
-<component name="popups_api" long-name="Popups API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/popups_api/group" filter="!test"/>
-</component>
-<component name="misc_controls_api" long-name="Misc Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/misc_controls_api/group" filter="!test"/>
-</component>
-<component name="keylock_api" long-name="Keylock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/keylock_api/group" filter="!test"/>
-</component>
-<component name="options_menu_api" long-name="Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/options_menu_api/group" filter="!test"/>
-</component>
-<component name="hierarchical_lists_api" long-name="Hierarchical Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hierarchical_lists_api/group" filter="!test"/>
-</component>
-<component name="navigation_pane_api" long-name="Navigation Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/navigation_pane_api/group" filter="!test"/>
-</component>
-<component name="tabs_api" long-name="Tabs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/tabs_api/group" filter="!test"/>
-</component>
-<component name="title_pane_touch_observer_api" long-name="Title Pane Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_touch_observer_api/group"/>
-</component>
-<component name="choice_list_api" long-name="Choice List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/choice_list_api/group" filter="!test"/>
-</component>
-<component name="info_popup_note_api" long-name="Info Popup Note API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/info_popup_note_api/group" filter="!test"/>
-</component>
-<component name="setting_pages_api" long-name="Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/setting_pages_api/group" filter="!test"/>
-</component>
-<component name="screen_mode_api" long-name="Screen Mode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_mode_api/group" filter="!test"/>
-</component>
-<component name="indicators_api" long-name="Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/indicators_api/group" filter="!test"/>
-</component>
-<component name="error_ui_api" long-name="Error UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/error_ui_api/group" filter="!test"/>
-</component>
-<component name="animation_api" long-name="Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/animation_api/group" filter="!test"/>
-</component>
-<component name="searchfield_api" long-name="Searchfield API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/searchfield_api/group" filter="!test"/>
-</component>
-<component name="labels_api" long-name="Labels API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/labels_api/group" filter="!test"/>
-</component>
-<component name="hotkeys_api" long-name="Hotkeys API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hotkeys_api/group" filter="!test"/>
-</component>
-<component name="initialization_api" long-name="Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/initialization_api/group" filter="!test"/>
-</component>
-<component name="volume_control_api" long-name="Volume Control API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/volume_control_api/group" filter="!test"/>
-</component>
-<component name="title_pane_api" long-name="Title Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_api/group" filter="!test"/>
-</component>
-<component name="sounds_api" long-name="Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/sounds_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_handler_api" long-name="AIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_service_handler_api/group" filter="!test"/>
-</component>
-<component name="aiw_criteria_api" long-name="AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="touch_ui_utilities_api" long-name="Touch UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/touch_ui_utilities_api/group" filter="!test"/>
-</component>
-<component name="generic_button_api" long-name="Generic Button API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/generic_button_api/group" filter="!test"/>
-</component>
-<component name="form_api" long-name="Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/form_api/group" filter="!test"/>
-</component>
-<component name="uikon_core_controls" long-name="Uikon Core Controls" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/uikon_core_controls/group" filter="!test"/>
-</component>
-<component name="calendar_api" long-name="Calendar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/calendar_api/group"/>
-</component>
-<component name="toolbar_api" long-name="Toolbar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/toolbar_api/group" filter="!test"/>
-</component>
-<component name="server_application_api" long-name="Server Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/server_application_api/group"/>
-</component>
-<component name="slider_api" long-name="Slider API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/slider_api/group" filter="!test"/>
-</component>
-<component name="private_ui_framework_api" long-name="Private UI Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/private_ui_framework_api/group" filter="!test"/>
-</component>
-<component name="dialogs_api" long-name="Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialogs_api/group" filter="!test"/>
-</component>
-<component name="document_handler_api" long-name="Document handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/document_handler_api/group"/>
-</component>
-<component name="images_api" long-name="Images API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/images_api/group" filter="!test"/>
-</component>
-<component name="stylus_popup_menu_api" long-name="Stylus Pop-up Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/stylus_popup_menu_api/group" filter="!test"/>
-</component>
-<component name="information_preview_popup_api" long-name="Information Preview Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/information_preview_popup_api/group" filter="!test"/>
-</component>
-<component name="intermediate_state_api" long-name="Intermediate State API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/intermediate_state_api/group"/>
-</component>
-<component name="help_launcher_api" long-name="Help Launcher API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/help_launcher_api/group"/>
-</component>
-</collection>
-<collection name="ode" long-name="Open Dynamics Engine" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="ode_build" filter="s60" long-name="ODE">
-<unit bldFile="mw/classicui/ode/group"/>
-</component>
-</collection>
-<collection name="uifw" long-name="UI Framework" level="server">
-<component name="uiklaf" filter="s60" long-name="Uikon Look-and-Feel">
-<unit bldFile="mw/classicui/uifw/uiklaf/group"/>
-</component>
-<component name="eikctl" filter="s60" long-name="Eikon Controls">
-<unit bldFile="mw/classicui/uifw/eikctl/group"/>
-</component>
-<component name="avkon" filter="s60" long-name="Avkon">
-<!-- can only have one unit. Split into 3 components, or #include all from same bld.inf -->
-<unit bldFile="mw/classicui/uifw/avkon/aknphysics/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/aknconf/group"/>
-</component>
-<component name="eikstd" filter="s60" long-name="Eikon Standard">
-<unit bldFile="mw/classicui/uifw/eikstd/group"/>
-</component>
-<component name="aknglobalui" filter="s60" long-name="Avkon Global UI">
-<unit bldFile="mw/classicui/uifw/aknglobalui/group"/>
-</component>
-<component name="ganes" filter="s60" long-name="Ganes">
-<unit bldFile="mw/classicui/uifw/ganes/group"/>
-</component>
-</collection>
-<collection name="commonuis" long-name="Common UIs" level="specific">
-<component name="commonui" filter="s60" long-name="Common UI">
-<unit bldFile="mw/classicui/commonuis/commonui/group"/>
-</component>
-<component name="commondialogs" filter="s60" long-name="Common Dialogs">
-<unit bldFile="mw/classicui/commonuis/commondialogs/group"/>
-</component>
-</collection>
-<collection name="applicationinterworkingfw" long-name="Application Interworking Framework" level="generic">
-<component name="aifwservicehandler" filter="s60" long-name="Application Interworking Service Handler">
-<unit bldFile="mw/classicui/applicationinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-<collection name="psln" long-name="Personalization" level="specific">
-<!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
-<component name="psln_build" filter="s60" long-name="Personalization Build">
-<unit bldFile="mw/classicui/psln/group"/>
-</component>
-</collection>
-<collection name="commonadapter" long-name="Common Adapter" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="commonadapter_build" filter="s60" long-name="Common Adapter Build">
-<unit bldFile="mw/classicui/commonadapter/group"/>
-</component>
-</collection>
-<collection name="akntouchgesturefw" long-name="Avkon Touch Gesture Framework" level="generic">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="akntouchgesturefw_build" filter="s60" long-name="Avkon Touch Gesture Framework Build" introduced="^3">
-<unit bldFile="mw/classicui/akntouchgesturefw/group"/>
-</component>
-</collection>
-<collection name="uiutils" long-name="UI Utils" level="specific">
-<component name="localizer" filter="s60" long-name="Directory Localizer">
-<unit bldFile="mw/classicui/uiutils/localizer/group"/>
-</component>
-<component name="findutil" filter="s60" long-name="Find Utility">
-<unit bldFile="mw/classicui/uiutils/findutil/group"/>
-</component>
-<component name="gamerecognizer" filter="s60" long-name="Game Recognizer" plugin="Y">
-<unit bldFile="mw/classicui/uiutils/gamerecognizer/group"/>
-</component>
-<component name="aknjapanesereading" filter="s60" long-name="Avkon Japanese Reading">
-<unit bldFile="mw/classicui/uiutils/aknjapanesereading/group"/>
-</component>
-<component name="hlplch" long-name="Help Launcher" filter="s60,bldfirst">
-<unit bldFile="mw/classicui/uiutils/hlplch/group"/>
-</component>
-</collection>
-<collection name="commonuisupport" long-name="Common UI Support" level="support">
-<component name="uikon" long-name="Uikon" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uikon/group" mrp="mw/classicui/commonuisupport/uikon/group/app-framework_uikon.mrp"/>
-</component>
-<component name="errorresolverdata" long-name="Error Resolver Data" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/errorresolverdata/group" mrp="mw/classicui/commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
-</component>
-<component name="uilaf" long-name="UI Look and Feel" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uilaf/GROUP" mrp="mw/classicui/commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
-</component>
-<component name="grid" long-name="Grid" purpose="optional">
-<unit bldFile="mw/classicui/commonuisupport/grid/group" mrp="mw/classicui/commonuisupport/grid/group/app-framework_grid.mrp"/>
-</component>
-<component name="uifwsdocs" long-name="UI Frameworks Documentation" purpose="development" class="doc">
-<unit mrp="mw/classicui/commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
-</component>
-</collection>
-<collection name="lafagnosticuifoundation" long-name="Look-and-Feel Agnostic UI Foundation" level="base">
-<component name="cone" long-name="Control Environment" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/cone/group" mrp="mw/classicui/lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
-</component>
-<component name="graphicseffects" long-name="Graphics Effects" introduced="9.2" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/graphicseffects/group" mrp="mw/classicui/lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
-</component>
-<component name="uigraphicsutils" long-name="UI Graphics Utilities" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group" mrp="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
-</component>
-<component name="clockanim" long-name="Clock" purpose="optional" plugin="Y">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/clockanim/group" mrp="mw/classicui/lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
-</component>
-<component name="bmpanimation" long-name="BMP Animation" introduced="6.0" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/bmpanimation/group" mrp="mw/classicui/lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
-</component>
-<component name="animation" long-name="Animation" introduced="9.1" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/animation/group" mrp="mw/classicui/lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
-</component>
-</collection>
-<collection name="classicui_info" long-name="Classic UI Info" level="specific">
-<!-- the multiple units in the API test components need to be resolved -->
-<component name="classicui_metadata" long-name="Classic UI Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/classicui/classicui_info/classicui_metadata/classicui_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="svgt" level="generic" long-name="SVG Tiny" levels="util ui">
-<collection name="svgt_plat" long-name="SVG Tiny Platform Interfaces" level="ui">
-<component name="svgt_api" long-name="SVGT API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/svgt_api/group"/>
-</component>
-<component name="nvg_api" long-name="NVG API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/nvg_api/group"/>
-</component>
-</collection>
-<collection name="svgtopt" long-name="SVG-T Engine" level="util">
-<component name="svgtopt_build" filter="s60" long-name="SVG Engine" introduced="9.2">
-<!-- component is at collection level. Needs to be moved down a directory -->
-<unit bldFile="mw/svgt/svgtopt/group"/>
-</component>
-<component name="svgtplugin" filter="s60" long-name="SVG Plugin" introduced="9.2" plugin="Y">
-<unit bldFile="mw/svgt/svgtopt/svgtplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="uiaccelerator" level="generic" long-name="UI Accelerator" levels="plugin framework server ex if">
-<collection name="uiaccelerator_plat" long-name="UI Accelerator Platform Interfaces" level="if">
-<component name="alf_core_toolkit_api" long-name="ALF Core Toolkit API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/group"/>
-</component>
-<component name="alf_visual_api" long-name="ALF Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/group"/>
-</component>
-<component name="alf_extended_visual_api" long-name="ALF Extended Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/group"/>
-</component>
-<component name="alf_extension_api" long-name="ALF Extension API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/group"/>
-</component>
-<component name="alf_tracing_api" long-name="ALF Tracing API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/group"/>
-</component>
-<component name="alf_client_server_api" long-name="ALF Client Server API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/group"/>
-</component>
-</collection>
-<collection name="uiacceltk" long-name="UI Accelerator Toolkit" level="framework">
-<component name="hitchcock" filter="s60" long-name="Hitchcock">
-<unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/group"/>
-</component>
-<component name="uiacceltk_build" filter="s60" long-name="UI Accelerator Toolkit Build">
-<!-- move into the other component, or remove the #include and make this UI Accelerator Toolkit ROM-->
-<unit bldFile="mw/uiaccelerator/uiacceltk/group"/>
-</component>
-</collection>
-<collection name="uiaccelerator_test" long-name="UI Accelerator Test" level="ex"/>
-</block>
-<block name="uiresources" level="generic" long-name="UI Resources" levels="compile plugin framework server generic data">
-<!-- are the custom filters below needed? -->
-<collection name="uiresources_pub" long-name="UI Resources Public Interfaces" level="data">
-<component name="pictograph_api" long-name="Pictograph API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/pictograph_api/group" filter="!test"/>
-</component>
-<component name="skins_api" long-name="Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/skins_api/group" filter="!test"/>
-</component>
-<component name="font_definition_api" long-name="Font Definition API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/font_definition_api/group" filter="!test"/>
-</component>
-<component name="graphics_api" long-name="Graphics API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/graphics_api/group" filter="!test"/>
-</component>
-<component name="scalable_icons_api" long-name="Scalable Icons API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/scalable_icons_api/group"/>
-</component>
-<component name="layout_id_definitions_api" long-name="Layout ID Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/layout_id_definitions_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_plat" long-name="UI Resources Platform Interfaces" level="data">
-<component name="layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_system_private_api/group" filter="!test"/>
-</component>
-<component name="layout_data_api" long-name="Layout Data API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_data_api/group" filter="!test"/>
-</component>
-<component name="cdl_api" long-name="CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/cdl_api/group" filter="!test"/>
-</component>
-<component name="extended_skins_api" long-name="Extended Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_skins_api/group" filter="!test"/>
-</component>
-<component name="tfx_server_controller_plugin_api" long-name="TFX Server Controller Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_controller_plugin_api/group"/>
-</component>
-<component name="extended_fonts_api" long-name="Extended Fonts API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_fonts_api/group" filter="!test"/>
-</component>
-<component name="graphic_configuration_api" long-name="Graphic Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/graphic_configuration_api/group" filter="!test"/>
-</component>
-<component name="mif_header_cdl_api" long-name="MIF Header CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mif_header_cdl_api/group"/>
-</component>
-<component name="personalisation_and_skins_settings_api" long-name="Personalisation and Skins Settings API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/personalisation_and_skins_settings_api/group"/>
-</component>
-<component name="tfx_effect_setup_plugin_api" long-name="TFX Effect Setup Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_effect_setup_plugin_api/group"/>
-</component>
-<component name="mifconv_definitions_api" long-name="Mifconv Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mifconv_definitions_api/group"/>
-</component>
-<component name="wallpaper_configuration_api" long-name="Wallpaper Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/wallpaper_configuration_api/group"/>
-</component>
-<component name="language_code_definitions_api" long-name="Language Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/language_code_definitions_api/group"/>
-</component>
-<component name="skins_image_attributes_api" long-name="Skins Image Attributes API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
-</component>
-<component name="private_user_area_code_definitions_api" long-name="Private User Area Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/private_user_area_code_definitions_api/group"/>
-</component>
-<component name="tfx_server_plugin_ids_api" long-name="TFX Server Plug-in IDs API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_plugin_ids_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_info" long-name="UI Resources Info" level="data">
-<component name="uiresources_test" filter="s60,test,api_test" long-name="UI Resources Tests" purpose="development"/>
-</collection>
-<collection name="uigraphics" long-name="UI Graphics" level="generic">
-<component name="bitmaps2" filter="s60" long-name="Bitmaps 2" class="config">
-<unit bldFile="mw/uiresources/uigraphics/bitmaps2/group"/>
-</component>
-<component name="icons" filter="s60" long-name="Icons" class="config">
-<unit bldFile="mw/uiresources/uigraphics/icons/group"/>
-</component>
-<component name="variatedbitmaps" filter="s60" long-name="Variated Bitmaps" class="config">
-<unit bldFile="mw/uiresources/uigraphics/variatedbitmaps/group"/>
-</component>
-<component name="aknicon" filter="s60" long-name="Avkon Icon Framework">
-<unit bldFile="mw/uiresources/uigraphics/aknicon/group"/>
-</component>
-<component name="nvgrenderstage" filter="sf_build" long-name="NVG Render Stage">
-<unit bldFile="mw/uiresources/uigraphics/nvgrenderstage/group"/>
-</component>
-</collection>
-<collection name="layouts" long-name="Layouts" level="plugin">
-<component name="cdl" filter="s60" long-name="Customization Definition Language">
-<!-- can only have one unit. Need to #include them or split into multiple components -->
-<unit bldFile="mw/uiresources/layouts/cdl/cdlengine/group"/>
-<unit bldFile="mw/uiresources/layouts/cdl/cdlserver/group"/>
-</component>
-<component name="aknlayout2" filter="s60" long-name="Avkon Layout 2">
-<unit bldFile="mw/uiresources/layouts/aknlayout2/group"/>
-</component>
-</collection>
-<collection name="skins" long-name="Skins" level="data">
-<component name="aknskincontent" filter="s60" long-name="Avkon Skin Content" class="config">
-<unit bldFile="mw/uiresources/skins/aknskincontent/group"/>
-</component>
-<component name="aknskins" filter="s60" long-name="Avkon Skin Compiler">
-<unit bldFile="mw/uiresources/skins/aknskins/group"/>
-</component>
-</collection>
-<collection name="pictographs" long-name="Pictographs" level="data">
-<component name="aknpictograph" filter="s60" long-name="Avkon Pictograph">
-<unit bldFile="mw/uiresources/pictographs/aknpictograph/group"/>
-</component>
-</collection>
-<collection name="locales" long-name="Locales" level="framework">
-<component name="locales_build" filter="s60" long-name="Locales Build">
-<unit bldFile="mw/uiresources/locales/loce32"/>
-</component>
-</collection>
-<collection name="uiconfig" long-name="UI Config" level="server">
-<component name="s60config" filter="s60" long-name="S60 UI Config">
-<unit bldFile="mw/uiresources/uiconfig/s60config/group"/>
-</component>
-</collection>
-<collection name="fontsupport" long-name="Font Support" level="generic">
-<component name="fontprovider" filter="s60" long-name="Font Provider">
-<unit bldFile="mw/uiresources/fontsupport/fontprovider/group"/>
-</component>
-<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
- <component id="s60_fonts" filter="s60" name="S60 Fonts">
- <unit bldFile="fontsupport/fontutils/group"/>
- </component>
--->
-<component name="fontutils" filter="sf_build" long-name="Font Utils">
-<unit bldFile="mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
-</component>
-</collection>
-<collection name="helpthemes" long-name="Help Themes" level="data">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helpthemes_build" filter="s60" long-name="Help Themes Build" class="config">
-<unit bldFile="mw/uiresources/helpthemes/group"/>
-</component>
-</collection>
-</block>
-<block name="hapticsservices" level="generic" long-name="Haptics Services" levels="fw server api">
-<collection name="hapticsservices_plat" long-name="Haptics Services Platform Interfaces" level="api">
-<component name="tacticon_api" long-name="Tacticon API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tacticon_api/group"/>
-</component>
-<component name="tactile_feedback_core_api" long-name="Tactile Feedback Core API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_core_api/group"/>
-</component>
-<component name="tactile_feedback_server_api" long-name="Tactile Feedback Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_server_api/group"/>
-</component>
-</collection>
-<collection name="hapticsservices_pub" long-name="Haptics Services Public Interfaces" level="api">
-<component name="tactile_feedback_client_api" long-name="Tactile Feedback Client API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_pub/tactile_feedback_client_api/group"/>
-</component>
-</collection>
-<collection name="tacticonserver" long-name="Tacticon Server" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="tacticonserver_build" filter="s60" long-name="Tacticon Server Build" introduced="^3">
-<unit bldFile="mw/hapticsservices/tacticonserver/group"/>
-<!-- clients and servers are suauly the same component. Consider moving pluign to a separate component if needed -->
-</component>
-</collection>
-<collection name="tactilefeedback" long-name="Tactile Feedback" level="fw">
-<component name="tactilearearegistry" filter="s60" long-name="Tactile Area Registry" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilearearegistry/group"/>
-</component>
-<component name="tactilefeedbackresolver" filter="s60" long-name="Tactile Feedback Resolver" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackresolver/group"/>
-</component>
-<component name="tactileclickplugin" filter="s60" long-name="Tactile Click Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileclickplugin/group"/>
-</component>
-<component name="tactilefeedbackclient" filter="s60" long-name="Tactile Feedback Client" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackclient/group"/>
-</component>
-<component name="tactileactionplugin" filter="s60" long-name="Tactile Action Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileactionplugin/group"/>
-</component>
-<component name="tactilefeedback_build" filter="s60" long-name="Tactile Feedback Build" introduced="^1">
-<!-- consider moving IBY to one fo the above components -->
-<unit bldFile="mw/hapticsservices/tactilefeedback/group"/>
-</component>
-</collection>
-</block>
-<block name="platformthemes" level="specific" long-name="Platform Themes" levels="framework generic ui">
-<collection name="platformthemes_info" long-name="Platform Themes Info">
-<component name="platformthemes_build" long-name="Platform Themes Build">
-<!-- no real structure in this package. Should break into collections / components -->
-<unit bldFile="mw/platformthemes" proFile="platformthemes.pro"/>
-</component>
-</collection>
-</block>
-<block name="gsprofilesrv" level="generic" long-name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
-<collection name="gsprofilesrv_pub" long-name="GS and Profiles Services Public Interfaces" level="specific">
-<component name="profiles_engine_active_profile_settings_api" long-name="Profiles Engine Active Profile Settings API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_active_profile_settings_api/group"/>
-</component>
-<component name="profiles_engine_wrapper_api" long-name="Profiles Engine Wrapper API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_wrapper_api/group"/>
-</component>
-</collection>
-<collection name="gsprofilesrv_plat" long-name="GS and Profiles Services Platform Interfaces" level="specific">
-<component name="ftuwizardmodel_api" long-name="FTU Wizard Model API" filter="bldfirst,s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/ftuwizardmodel_api" proFile="ftuwizardmodel_api.pro" qmakeArgs="-r -config rom"/>
-</component>
-<component name="profiles_engine_api" long-name="Profiles Engine API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_engine_api/group"/>
-</component>
-<component name="settings_backgroundimage_api" long-name="Settings Background Image API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_backgroundimage_api/group"/>
-</component>
-<component name="settings_framework_api" long-name="Settings Framework API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_framework_api/group"/>
-</component>
-<component name="settings_launch_api" long-name="Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_launch_api/group"/>
-</component>
-<component name="settings_listbox_api" long-name="Settings List Box API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_listbox_api/group"/>
-</component>
-<component name="settings_plugin_api" long-name="Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_plugin_api/group"/>
-</component>
-<component name="settings_uis_cenrep_collection_api" long-name="Settings UIs CenRep Collection API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
-</component>
-</collection>
-<collection name="gssettingsuis" long-name="General Settings UIs" level="framework">
-<component name="gs" filter="s60" long-name="General Settings" introduced="9.2">
-<unit bldFile="mw/gsprofilesrv/gssettingsuis/gs/group"/>
-</component>
-</collection>
-<collection name="ftuwizardmodel" long-name="FTU Wizard Model" level="generic">
-<component name="ftuwizardmodel_build" long-name="FTU Wizardmodel Build" filter="bldfirst">
-<unit bldFile="mw/gsprofilesrv/ftuwizardmodel" proFile="ftuwizardmodel.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-<collection name="controlpanel" long-name="Control Panel" level="generic">
-<component name="controlpanel_build" long-name="Control Panel Build">
-<unit bldFile="mw/gsprofilesrv/controlpanel" proFile="controlpanel.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-<collection name="profilesservices" long-name="Profiles Services" level="server">
-<component name="profileengine" filter="s60" long-name="Profile Engine" introduced="9.1">
-<unit bldFile="mw/gsprofilesrv/profilesservices/profileengine/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreensrv" level="specific" long-name="Home Screen Services" levels="plugin framework server generic specific">
-<collection name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" level="specific">
-<component name="action_handler_plugin_api" long-name="Action Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/group" filter="!test"/>
-</component>
-<component name="content_harvester_plugin_api" long-name="Content Harvester Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/group" filter="!test"/>
-</component>
-<component name="menu_sat_interface_api" long-name="Menu SAT Interface API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/group" filter="!test"/>
-</component>
-<component name="sapi_contentpublishing" long-name="SAPI Content Publishing" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing/group"/>
-</component>
-<component name="sapi_actionhandler" long-name="SAPI Action Handler" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_actionhandler/group"/>
-</component>
-</collection>
-<collection name="contentpublishingsrv" long-name="Content Publishing Service" level="server">
-<component name="contentpublishingdebug" filter="s60" long-name="Content Publishing Debug">
-<!-- need to move this component outside of contentpublishingutils and into separate component directory -->
-<!-- <unit bldFile="contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/> -->
-</component>
-<component name="contentpublishingutils" filter="s60" long-name="Content Publishing Utils">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingutils/group"/>
-</component>
-<component name="contentpublishingserver" filter="s60" long-name="Content Publishing Server">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingserver/group"/>
-</component>
-<component name="contentharvester" filter="s60" long-name="Content Harvester">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
-</component>
-<component name="contentpublishingsrv_build" filter="s60" long-name="Content Publishing Service Build">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreensrvlegacy" level="generic" long-name="Legacy Home Screen Services" levels="plugin framework server generic specific">
-<collection name="homescreensrvlegacy_plat" long-name="Legacy Home Screen Services Platform Interfaces" level="specific">
-<component name="ai_content_model_api" long-name="AI Content Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrvlegacy/ai_content_model_api/group" proFile="group.pro"/>
-</component>
-<component name="ai_plugin_information_api" long-name="AI Plug-in Information API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrvlegacy/ai_plugin_information_api/group" proFile="group.pro"/>
-</component>
-</collection>
-</block>
-<block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
-<collection name="appinstall_plat" long-name="Application Installation Platform Interfaces" level="api">
-<component name="iaupdate_api" long-name="IA Update API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/iaupdate_api/group"/>
-</component>
-<component name="task_plugin_api" long-name="Task Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_plugin_api/group"/>
-</component>
-<component name="sw_installer_common_ui_api" long-name="SW Installer Common UI API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_common_ui_api/group"/>
-</component>
-<component name="sw_installer_launcher_api" long-name="SW Installer Launcher API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_launcher_api/group"/>
-</component>
-<component name="task_management_api" long-name="Task Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_management_api/group"/>
-</component>
-<component name="sw_installer_ui_plugin_api" long-name="SW Installer UI Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ui_plugin_api/group"/>
-</component>
-<component name="sw_installer_cr_keys" long-name="SW Installer CR Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_cr_keys/group"/>
-</component>
-<component name="sw_installer_ps_keys" long-name="SW Installer PS Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
-</component>
-<component name="appmngr2runtimeapi" long-name="Application Manager 2 Runtime Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
-</component>
-<component name="sifui_api" long-name="STIF UI API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sifui_api/group"/>
-</component>
-</collection>
-<collection name="appinstall_pub" long-name="Application Installation Public Interfaces" level="api">
-<component name="startup_list_management_api" long-name="Startup List Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
-</component>
-</collection>
-<collection name="ncdengine" long-name="Nokia Content Discover" level="framework">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="ncdengine_engine" filter="s60" long-name="NCD Engine" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/engine/group"/>
-</component>
-<component name="debuglogger" filter="s60" long-name="NCD Debug Logger" introduced="^1" class="placeholder">
-<!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
-</component>
-<component name="ncdengine_build" filter="s60" long-name="NCD Build" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/group"/>
-</component>
-</collection>
-<collection name="appinstaller" long-name="Application Installer" level="generic">
-<component name="appinstui" filter="s60" long-name="Application Installer UI" introduced="^2">
-<unit bldFile="mw/appinstall/appinstaller/appinstui/group"/>
-</component>
-</collection>
-<collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="api">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="iaupdateapi_stub_build" long-name="IA Update API Stub Build" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdateapi_stub/group"/>
-</component>
-</collection>
-<collection name="iaupdate" long-name="Independent Apps Update" level="api">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="iad" long-name="Software Update" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/iad/group"/>
-</component>
-<component name="iaupdate_help" filter="s60" long-name="IA Update Help" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/help/group"/>
-</component>
-<component name="iaupdate_build" filter="s60" long-name="IA Update Build" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/group"/>
-</component>
-</collection>
-<collection name="installationservices" long-name="Installation Services" level="generic">
-<component name="swi" long-name="Secure Software Install" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swi/group" mrp="mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
-</component>
-<component name="swidevicetools" long-name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
-<unit bldFile="mw/appinstall/installationservices/swidevicetools/group" mrp="mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
-</component>
-<component name="swcomponentregistry" long-name="Software Component Registry" introduced="^4" purpose="mandatory">
-<unit bldFile="mw/appinstall/installationservices/swcomponentregistry/group" mrp="mw/appinstall/installationservices/swcomponentregistry/group/security_softwarecomponentregistry.mrp"/>
-</component>
-<component name="swinstallationfw" long-name="Software Installation Framework" introduced="^4" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swinstallationfw/group" mrp="mw/appinstall/installationservices/swinstallationfw/group/security_softwareinstallframework.mrp"/>
-</component>
-<component name="swtransactionservices" long-name="Software Transaction Services" introduced="^4" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swtransactionservices/group" mrp="mw/appinstall/installationservices/swtransactionservices/group/security_softwaretransactionservices.mrp"/>
-</component>
-<component name="refswinstallationplugin" long-name="Reference Software Installation Plugin" introduced="^4" purpose="development" plugin="Y">
-<unit bldFile="mw/appinstall/installationservices/refswinstallationplugin/group" mrp="mw/appinstall/installationservices/refswinstallationplugin/group/security_sifrefplugin.mrp"/>
-</component>
-<component name="refsoftwareappmgr" long-name="Reference Software Application Manager" introduced="^4" purpose="development">
-<unit bldFile="mw/appinstall/installationservices/refsoftwareappmgr/group" mrp="mw/appinstall/installationservices/refsoftwareappmgr/group/security_referenceapplicationmanager.mrp"/>
-</component>
-<component name="swiconfig" long-name="Software Install Config" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appinstall/installationservices/swiconfig/group" mrp="mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
-</component>
-</collection>
-<collection name="secureswitools" long-name="Secure Software Install Tools" level="tool">
-<component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/makekeys/group" mrp="mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
-</component>
-<component name="swianalysistoolkit" long-name="SWI Analysis Toolkit" purpose="development" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
-</component>
-<component name="openssllib" long-name="OpenSSL Library" purpose="optional" class="PC">
-<unit mrp="mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
-</component>
-<component name="swisistools" long-name="Secure Software Install SIS Tools" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swisistools/group" mrp="mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
-</component>
-</collection>
-<collection name="appinstall_info" long-name="Application Installation Info" level="api">
-<component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="serviceapifw" level="specific" long-name="Service API Framework" levels="plugin framework server generic specific">
-<collection name="serviceapifw_pub" long-name="Service API Framework Public Interfaces" level="specific"/>
-<collection name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" level="specific">
-<component name="rtsecuritymanager_common_api" long-name="Runtime Security Manager Common API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/group"/>
-</component>
-<component name="rtsecuritymanager_utility_api" long-name="Runtime Security Manager Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
-</component>
-<component name="rtsecuritymanager_client_api" long-name="Runtime Security Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/group"/>
-</component>
-<component name="liw_provider_utility_api" long-name="LIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_provider_utility_api/group"/>
-</component>
-<component name="liw_service_interface_base_api" long-name="LIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_base_api/group"/>
-</component>
-<component name="liw_service_interface_menu_api" long-name="LIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_menu_api/group"/>
-</component>
-<component name="liw_criteria_api" long-name="LIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_criteria_api/group"/>
-</component>
-<component name="liw_generic_parameter_api" long-name="LIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_generic_parameter_api/group"/>
-</component>
-<component name="liw_service_handler_api" long-name="LIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_handler_api/group"/>
-</component>
-</collection>
-<collection name="rtsecuritymanager" long-name="Runtime Security Manager" level="server">
-<component name="rtsecuritymanagerutil" filter="s60" long-name="Runtime Security Manager Util">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
-</component>
-<component name="rtsecuritymanagerserver" filter="s60" long-name="Runtime Security Manager Server">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/>
-</component>
-<component name="rtsecuritymanagerclient" filter="s60" long-name="Runtime Security Manager Client">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/>
-</component>
-<component name="rtsecuritymanager_build" filter="s60" long-name="Runtime Security Manager Build">
-<!-- Move the export to the appropriate components, or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/group"/>
-</component>
-</collection>
-<collection name="languageinterworkingfw" long-name="Language Interworking Framework" level="framework">
-<component name="lifwservicehandler" filter="s60" long-name="Service Handler">
-<unit bldFile="mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-</block>
-<block name="serviceapi" level="specific" long-name="Service API" levels="os mw1 mw2 app">
-<!-- should break up this collection into something meaningful -->
-<collection name="serviceproviders" long-name="Service Providers" level="mw1">
-<component name="sapi_contacts_vpbk" long-name="Contacts Phonebook SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
-</component>
-<component name="sapi_location" long-name="Location SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_location/group"/>
-</component>
-<component name="sapi_mediamanagement" long-name="Media Management SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/group"/>
-</component>
-<component name="sapi_landmarks" long-name="Landmarks SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
-</component>
-<component name="sapi_messaging" long-name="Messaging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/group"/>
-</component>
-<component name="sapi_applicationmanager" long-name="Application Manager SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
-</component>
-<component name="sapi_calendar" long-name="Calendar SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_calendar/group"/>
-</component>
-<component name="sapi_logging" long-name="Logging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_logging/group"/>
-</component>
-<component name="sapi_sensor" long-name="Sensor SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sensor/group"/>
-</component>
-<component name="sapi_sysinfo" long-name="Sysinfo SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sysinfo/group"/>
-</component>
-<component name="sapi_serviceregistry" long-name="Service Registry SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
-</component>
-<component name="jsapi" long-name="Javascript API" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/jsapi/group"/>
-</component>
-<component name="serviceproviders_build" filter="s60" long-name="Service API Build">
-<!-- distribute the exports or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapi/serviceproviders/group"/>
-</component>
-</collection>
-</block>
-<block name="web" level="specific" long-name="Web" levels="plugin utils server generic specific">
-<collection name="web_pub" long-name="Web Public Interfaces" level="specific">
-<component name="browser_control_api" long-name="Browser Control API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_control_api/group"/>
-</component>
-<component name="download_mgr_client_api" long-name="Download Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_client_api/group"/>
-</component>
-<component name="download_mgr_ui_api" long-name="Download Manager UI Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_ui_api/group"/>
-</component>
-<component name="favourites_engine_api" long-name="Favourites Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/favourites_engine_api/group"/>
-</component>
-<component name="browser_plugin_api" long-name="Browser Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_plugin_api/group"/>
-</component>
-<component name="settings_api" long-name="Settings API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/settings_api/group"/>
-</component>
-</collection>
-<collection name="web_plat" long-name="Web Platform Interfaces" level="specific">
-<component name="aiw_browser_provider_api" long-name="AIW Browser Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/aiw_browser_provider_api/group"/>
-</component>
-<component name="browser_dialogs_provider_api" long-name="Browser Dialogs Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_dialogs_provider_api/group"/>
-</component>
-<component name="browser_platform_api" long-name="Browser Platform API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_platform_api/group"/>
-</component>
-<component name="cod_handler_api" long-name="COD Handler API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cod_handler_api/group"/>
-</component>
-<component name="connection_manager_api" long-name="Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/connection_manager_api/group"/>
-</component>
-<component name="cxml_library_api" long-name="cXml Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cxml_library_api/group"/>
-</component>
-<component name="download_mgr_client_api_extn" long-name="Download Manager Client API Extension" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/download_mgr_client_api_extn/group"/>
-</component>
-<component name="download_path_plugin_api" long-name="Download Path Plugin API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/web/web_plat/download_path_plugin_api/group"/>
-</component>
-<component name="feeds_engine_api" long-name="Feeds Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/feeds_engine_api/group"/>
-</component>
-<component name="launcher_api" long-name="Launcher API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/launcher_api/group"/>
-</component>
-<component name="multipart_parser_api" long-name="Multipart Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/multipart_parser_api/group"/>
-</component>
-<component name="recent_url_store_api" long-name="Recent URL Store API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/recent_url_store_api/group"/>
-</component>
-<component name="scheme_handler_plugin_api" long-name="Scheme Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scheme_handler_plugin_api/group"/>
-</component>
-<component name="scriptable_plugin_api" long-name="Scriptable Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scriptable_plugin_api/group"/>
-</component>
-<component name="webutils_api" long-name="Web Utils API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/webutils_api/group"/>
-</component>
-<component name="widget_registry_api" long-name="Widget Registry API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/widget_registry_api/group"/>
-</component>
-<component name="xml_parser_api" long-name="XML Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/xml_parser_api/group"/>
-</component>
-</collection>
-<collection name="web_info" long-name="Web Info" level="specific">
-<component name="web_build" filter="s60" long-name="Web Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/group"/>
-</component>
-</collection>
-<collection name="browserutilities" long-name="Browser Utilities" level="utils">
-<component name="browserdialogsprovider" filter="s60" long-name="Browser Dialogs Provider">
-<unit bldFile="mw/web/browserutilities/browserdialogsprovider/group"/>
-</component>
-<component name="recenturlstore" filter="s60" long-name="Recent URL Store">
-<unit bldFile="mw/web/browserutilities/recenturlstore/group"/>
-</component>
-<component name="xmlparser" filter="s60" long-name="XML Interface">
-<unit bldFile="mw/web/browserutilities/xmlparser/group"/>
-</component>
-<component name="cxmllibrary" filter="s60" long-name="XML Parser Implementation">
-<unit bldFile="mw/web/browserutilities/cxmllibrary/group"/>
-</component>
-<component name="downloadmgr" filter="s60" long-name="Download Manager">
-<unit bldFile="mw/web/browserutilities/downloadmgr/group"/>
-</component>
-<component name="connectionmanager" filter="s60" long-name="Connection Manager">
-<unit bldFile="mw/web/browserutilities/connectionmanager/group"/>
-</component>
-<component name="browsertelservice" filter="s60" long-name="Browser Telephony Service">
-<unit bldFile="mw/web/browserutilities/browsertelservice/group"/>
-</component>
-<component name="favouritesengine" filter="s60" long-name="Favourites Engine">
-<unit bldFile="mw/web/browserutilities/favouritesengine/group"/>
-</component>
-<component name="feedsengine" filter="s60" long-name="Feeds Engine">
-<unit bldFile="mw/web/browserutilities/feedsengine/group"/>
-</component>
-<component name="multipartparser" filter="s60" long-name="Multipart Parser">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
-<!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
-</component>
-<component name="schemehandler" filter="s60" long-name="Scheme Handler">
-<unit bldFile="mw/web/browserutilities/schemehandler/group"/>
-</component>
-<component name="webutils" filter="s60" long-name="Web Utils">
-<unit bldFile="mw/web/browserutilities/webutils/group"/>
-</component>
-<component name="aiwbrowserprovider" filter="s60" long-name="AIW Browser Provider" plugin="Y">
-<unit bldFile="mw/web/browserutilities/aiwbrowserprovider/group"/>
-</component>
-<component name="browserutilities_build" filter="s60" long-name="Browser Utilities Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/browserutilities/group"/>
-</component>
-</collection>
-<collection name="webengine" long-name="Web Engine" level="server">
-<component name="osswebengine" filter="s60" long-name="OSS Web Engine">
-<!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
-<unit bldFile="mw/web/webengine/osswebengine/cache/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/memorymanager/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/npscript/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group/javascriptcore"/>
-</component>
-<component name="webkitutils" filter="s60" long-name="WebKit Utils">
-<unit bldFile="mw/web/webengine/webkitutils/group"/>
-</component>
-<component name="pagescaler" filter="s60" long-name="Page Scaler">
-<unit bldFile="mw/web/webengine/pagescaler/group"/>
-</component>
-<component name="webwidgetinstaller" filter="s60" long-name="Widget Installer">
-<unit bldFile="mw/web/webengine/widgetinstaller/group"/>
-</component>
-<component name="widgetregistry" filter="s60" long-name="Widget Registry">
-<unit bldFile="mw/web/webengine/widgetregistry/group"/>
-</component>
-<component name="wmlengine" filter="s60" long-name="WML Engine">
-<unit bldFile="mw/web/webengine/wmlengine/group"/>
-</component>
-<component name="device" filter="s60" long-name="Device">
-<!-- this needs a more meaningful name -->
-<unit bldFile="mw/web/webengine/device/group"/>
-</component>
-<component name="widgetengine" filter="s60" long-name="Widget Engine">
-<unit bldFile="mw/web/webengine/widgetengine/group"/>
-</component>
-<component name="web_memoryplugin" long-name="Memory Plugin" filter="s60" plugin="Y">
-<unit bldFile="mw/web/webengine/memoryplugin/group"/>
-</component>
-<component name="widgetmemoryplugin" filter="s60" long-name="Widget Memory Plugin" plugin="Y">
-<unit bldFile="mw/web/webengine/widgetmemoryplugin/group"/>
-</component>
-<component name="widgetbackuprestore" filter="s60" long-name="Widget Backup and Restore">
-<unit bldFile="mw/web/webengine/widgetbackuprestore/group"/>
-</component>
-<component name="browserrecognizers" filter="s60" long-name="Browser Recognizers" plugin="Y">
-<unit bldFile="mw/web/webengine/browserrecognizers/group"/>
-</component>
-<component name="wrtharvester" filter="s60" long-name="Web Runtime Harvester" plugin="Y">
-<unit bldFile="mw/web/webengine/wrtharvester/group"/>
-</component>
-</collection>
-<collection name="codhandler" long-name="Content Object Descriptor Handler" level="specific">
-<component name="codeng" filter="s60" long-name="COD Engine">
-<unit bldFile="mw/web/codhandler/codeng/group"/>
-</component>
-<component name="codui" filter="s60" long-name="COD UI">
-<unit bldFile="mw/web/codhandler/codui/group"/>
-</component>
-<component name="codrecog" filter="s60" long-name="COD Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/codrecog/group"/>
-</component>
-<component name="codviewer" filter="s60" long-name="COD Viewer">
-<unit bldFile="mw/web/codhandler/codviewer/group"/>
-</component>
-<component name="ddrecog" filter="s60" long-name="Download Descriptor Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/ddrecog/group"/>
-</component>
-<component name="ddviewer" filter="s60" long-name="Download Descriptor Viewer">
-<unit bldFile="mw/web/codhandler/ddviewer/group"/>
-</component>
-<component name="coddownload" filter="s60" long-name="COD Download">
-<unit bldFile="mw/web/codhandler/coddownload/group"/>
-</component>
-<component name="roapapp" filter="s60" long-name="ROAP Application">
-<unit bldFile="mw/web/codhandler/roapapp/group"/>
-</component>
-<component name="codhandler_build" filter="s60" long-name="COD Handler Build">
-<!-- Exports need to go into another component or make this self-contained.
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/codhandler/group"/>
-</component>
-</collection>
-<collection name="widgets" long-name="Web Widget Framework" level="generic">
-<!-- the following units can be uncommented when configuration is put in place -->
-<component name="widgetrecognizer" filter="s60" long-name="Widget Recognizer" plugin="Y">
-<!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
-</component>
-<component name="widgetinstaller" filter="s60" long-name="Widget Installer UI" plugin="Y">
-<!--<unit bldFile="widgets/widgetinstaller/group"/>-->
-</component>
-<component name="widgetlauncher" filter="s60" long-name="Widget Launcher">
-<!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
-</component>
-<component name="widgetapp" filter="s60" long-name="Widget UI">
-<!--<unit bldFile="widgets/widgetapp/group"/>-->
-</component>
-<component name="widgetsidchecker" filter="s60" long-name="Widget SID Checker" introduced="^3">
-<!--<unit bldFile="widgets/widgetsidchecker/group"/>-->
-</component>
-<component name="widgetpreinstaller" filter="s60" long-name="Widget Pre-Installer">
-<!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
-</component>
-<component name="widgetstartup" filter="s60" long-name="Widget Startup">
-<!--<unit bldFile="widgets/widgetstartup/group"/>-->
-</component>
-<component name="widgets_build" filter="s60" long-name="Widgets Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/widgets/group"/>
-</component>
-</collection>
-</block>
-<block name="websrv" level="generic" long-name="Web Services" levels="plugin framework server generic specific">
-<collection name="websrv_pub" long-name="Web Services Public Interfaces" level="specific">
-<component name="web_service_description_api" long-name="Web Service Description API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_description_api/group"/>
-</component>
-<component name="web_service_connection_api" long-name="Web Service Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/group"/>
-</component>
-<component name="web_service_manager_api" long-name="Web Service Manager API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/group"/>
-</component>
-<component name="hostlet_connection_api" long-name="Hostlet Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/group"/>
-</component>
-<component name="web_service_messaging_api" long-name="Web Service Messaging API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/group"/>
-</component>
-<component name="xml_extensions_api" long-name="XML Extensions API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/group"/>
-</component>
-<component name="xml_fragment_api" long-name="XML Fragment API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/group"/>
-</component>
-</collection>
-<collection name="webservices" long-name="Web Services Framework" level="generic">
-<!-- consider breaking this collection into more meaningful subsets -->
-<component name="wsnotifierplugins" filter="s60" long-name="WS Notifier Plugins" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsnotifierplugins/group"/>
-</component>
-<component name="wslogger" filter="s60" long-name="WS Logger">
-<unit bldFile="mw/websrv/webservices/wslogger/group"/>
-</component>
-<component name="wsxml" filter="s60" long-name="WS XML Extensions">
-<unit bldFile="mw/websrv/webservices/wsxml/group"/>
-</component>
-<component name="wsutils" filter="s60" long-name="WS Utils">
-<unit bldFile="mw/websrv/webservices/wsutils/group"/>
-</component>
-<component name="wsfragment" filter="s60" long-name="WS Fragment">
-<unit bldFile="mw/websrv/webservices/wsfragment/group"/>
-</component>
-<component name="wsdescription" filter="s60" long-name="WS Service Description">
-<unit bldFile="mw/websrv/webservices/wsdescription/group"/>
-</component>
-<component name="wsconnection" filter="s60" long-name="WS Service Connection">
-<unit bldFile="mw/websrv/webservices/wsconnection/group"/>
-</component>
-<component name="wsmessages" filter="s60" long-name="WS Messages">
-<unit bldFile="mw/websrv/webservices/wsmessages/group"/>
-</component>
-<component name="wscredentialmanager" filter="s60" long-name="WS Credential Manager">
-<unit bldFile="mw/websrv/webservices/wscredentialmanager/group"/>
-</component>
-<component name="wsframework" filter="s60" long-name="WS Framework">
-<unit bldFile="mw/websrv/webservices/wsframework/group"/>
-</component>
-<component name="wshttpchanneltransportplugin" filter="s60" long-name="WS HTTP Channel Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshttpchanneltransportplugin/group"/>
-</component>
-<component name="wsconnectionagent" filter="s60" long-name="WS Connection Agent">
-<unit bldFile="mw/websrv/webservices/wsconnectionagent/group"/>
-</component>
-<component name="wsprovider" filter="s60" long-name="WS Provider">
-<unit bldFile="mw/websrv/webservices/wsprovider/group"/>
-</component>
-<component name="wshostletconnection" filter="s60" long-name="WS Hostlet Connection">
-<unit bldFile="mw/websrv/webservices/wshostletconnection/group"/>
-</component>
-<component name="wsmanager" filter="s60" long-name="WS Service Manager">
-<unit bldFile="mw/websrv/webservices/wsmanager/group"/>
-</component>
-<component name="wsidentitymanager" filter="s60" long-name="WS Identity Manager">
-<unit bldFile="mw/websrv/webservices/wsidentitymanager/group"/>
-</component>
-<component name="idwsfplugin" filter="s60" long-name="ID-WSF Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/idwsfplugin/group"/>
-</component>
-<component name="wsibasicplugin" filter="s60" long-name="WS-I Basic Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsibasicplugin/group"/>
-</component>
-<component name="wsrestplugin" filter="s60" long-name="WS REST Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsrestplugin/group"/>
-</component>
-<component name="idwsfsecuritymechanism" filter="s60" long-name="ID-WSF Security Mechanism">
-<unit bldFile="mw/websrv/webservices/idwsfsecuritymechanism/group"/>
-</component>
-<component name="wspasswordtransforms" filter="s60" long-name="WS Password Transforms">
-<unit bldFile="mw/websrv/webservices/wspasswordtransforms/group"/>
-</component>
-<component name="wscore" filter="s60" long-name="WS Core Service Manager">
-<unit bldFile="mw/websrv/webservices/wscore/group"/>
-</component>
-<component name="wslocaltransportplugin" filter="s60" long-name="WS Local Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wslocaltransportplugin/group"/>
-</component>
-<component name="wshostlettransportplugin" filter="s60" long-name="WS Hostlet Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshostlettransportplugin/group"/>
-</component>
-<component name="wsstar" filter="s60" long-name="WS Star">
-<!-- can only have one unit. Need to split into separate components or #include from a single bld.inf -->
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarpolicy/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarplugin/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarmessagehandlers/group"/>
-</component>
-<component name="wsoviplugin" filter="s60" long-name="WS Ovi Plugin">
-<unit bldFile="mw/websrv/webservices/wsoviplugin/group"/>
-</component>
-<component name="webservices_build" filter="s60" long-name="Web Services Build">
-<!-- need to split into self-contained components -->
-<unit bldFile="mw/websrv/webservices/group"/>
-</component>
-</collection>
-<collection name="websrv_info" long-name="Web Services Info" level="specific">
-<component name="websrv_bld" filter="s60" long-name="Web Services Build">
-<!-- need to include common .hrh in each unit -->
-<unit bldFile="mw/websrv/group"/>
-</component>
-</collection>
-</block>
-<block name="webruntime" level="specific" long-name="Web Runtime">
-<!-- need to break up this package nito collections and components -->
-<collection name="webruntime_info" long-name="Web Runtime Info">
-<component name="webruntime_build" long-name="Web Runtime Build" introduced="^4">
-<unit bldFile="mw/webruntime" proFile="cwrt.pro" qmakeArgs=""what+=ninetwo" "what+=tenone" "what+=qt_unstable" "what+=wrtlite" "what+=exportiby""/>
-</component>
-</collection>
-</block>
-<block name="platformtools" level="generic" long-name="Platform Tools">
-<collection name="gfxconversion" long-name="Graphics Conversion">
-<component name="bmconv_s60" filter="s60" long-name="S60 Bitmap Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/bmconv_s60/group"/>
-</component>
-<component name="mifconv" filter="s60" long-name="Multi Icon File Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/mifconv/group"/>
-</component>
-</collection>
-</block>
-<block name="uitools" level="specific" long-name="UI Tools" levels="compile encode tool if">
-<collection name="uitools_pub" long-name="UI Tools Public Interfaces" level="if">
-<component name="third_party_bitmap_palette_api" long-name="Third Party Bitmap Palette API" filter="s60" class="api">
-<unit bldFile="mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
-</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">
-<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">
-<unit bldFile="mw/uitools/uitools_plat/layout_system_private_api/group"/>
-</component>
-</collection>
-<collection name="cdlcompilertoolkit" long-name="CDL Compiler Toolkit" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompilertoolkit_build" filter="s60" long-name="CDL Compiler Toolkit Build">
-<unit bldFile="mw/uitools/cdlcompilertoolkit/group"/>
-</component>
-</collection>
-<collection name="cdlcompiler" long-name="CDL Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompiler_build" filter="s60" long-name="CDL Compiler Build">
-<unit bldFile="mw/uitools/cdlcompiler/group"/>
-</component>
-</collection>
-<collection name="gfxtools" long-name="Graphics Tools" level="tool">
-<component name="gditools" filter="s60" long-name="GDI Tools" class="PC">
-<unit bldFile="mw/uitools/gfxtools/gditools/group"/>
-</component>
-<component name="color" filter="s60" long-name="Bitmap Colour Palette" class="PC">
-<unit bldFile="mw/uitools/gfxtools/color/group"/>
-</component>
-</collection>
-<collection name="aknlayoutcompiler" long-name="Avkon Layout Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="aknlayoutcompiler_build" filter="s60" long-name="Avkon Layout Compiler Build">
-<unit bldFile="mw/uitools/aknlayoutcompiler/group"/>
-</component>
-</collection>
-<collection name="skincompiler" long-name="Skin Compiler" level="compile">
-<component name="aknskindesccompiler" filter="s60" long-name="Avkon Skin Descriptor Compiler">
-<unit bldFile="mw/uitools/skincompiler/AknSkinDescCompiler/group"/>
-</component>
-</collection>
-<collection name="reszip" long-name="Resource Zip" level="encode">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="reszip_build" filter="s60" long-name="Resource Zip Build">
-<unit bldFile="mw/uitools/reszip/group"/>
-</component>
-</collection>
-<collection name="toollibraries" long-name="Tool Libraries" level="tool"/>
-<collection name="svgtencoder" long-name="SVGT Encoder" level="encode">
-<component name="svgtenc" filter="s60" long-name="Standalone SVGT Encoder" class="PC">
-<unit bldFile="mw/uitools/svgtencoder/svgtenc/standalone/group"/>
-</component>
-</collection>
-</block>
-</layer>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="location" level="apps" long-name="Location Apps" levels="ui events loc api">
-<collection name="loc_plat" long-name="Location Apps Platform Interfaces" level="api">
-<component name="location_picker_service_api" long-name="Location Picker Service API" introduced="^4" filter="s60" class="api">
-<unit bldFile="app/location/loc_plat" proFile="location_plat.pro"/>
-</component>
-</collection>
-<collection name="locationpickerservice" long-name="Location Picker Service" level="loc">
-<!--collection is really a component. Should move down a directory -->
-<component name="locationpickerservice_build" filter="s60" long-name="Location Picker Service Build" introduced="^4">
-<unit bldFile="app/location/locationpickerservice" proFile="locationpickerservice.pro"/>
-</component>
-</collection>
-</block>
-<!-- pending removal -->
-<block name="phone" level="apps" span="2" long-name="Phone Apps" levels="engine plugin ui app">
-<collection name="phoneapp" long-name="Phone Application" level="app">
-<component name="blacklist" filter="s60" long-name="Phone Blacklist Clearing" plugin="Y">
-<unit bldFile="app/phone/phoneapp/blacklist/group"/>
-</component>
-<component name="phoneuicontrol" filter="s60" long-name="Phone UI Control">
-<unit bldFile="app/phone/phoneapp/phoneuicontrol/group"/>
-</component>
-<component name="phoneuistates" filter="s60" long-name="Phone UI States">
-<unit bldFile="app/phone/phoneapp/phoneuistates/group"/>
-</component>
-<component name="phoneuiutils" filter="s60" long-name="Phone UI Utils">
-<unit bldFile="app/phone/phoneapp/phoneuiutils/group"/>
-</component>
-<component name="silenceactionplugin" filter="s60" long-name="Silence Action Plugin" plugin="Y">
-<unit bldFile="app/phone/phoneapp/silenceactionplugin/group"/>
-</component>
-<component name="phonemediatorcenter" filter="s60" long-name="Phone Mediator Center">
-<unit bldFile="app/phone/phoneapp/phonemediatorcenter/group"/>
-</component>
-<component name="phoneuiview2" filter="s60" long-name="Phone UI View">
-<unit bldFile="app/phone/phoneapp/phoneuiview2" proFile="phoneuiview2.pro"/>
-</component>
-<component name="phoneuiqtviewadapter" filter="s60" long-name="Phone UI Qt View Adapter" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneapp/phoneuiqtviewadapter" proFile="phoneuiqtviewadapter.pro"/>
-</component>
-<component name="phonestringloader" filter="s60" long-name="Phone String Loader" introduced="^4">
-<unit bldFile="app/phone/phoneapp/phonestringloader" proFile="phonestringloader.pro"/>
-</component>
-<component name="phoneui2" filter="s60" long-name="Phone UI">
-<unit bldFile="app/phone/phoneapp/phoneui2" proFile="phoneui2.pro"/>
-</component>
-</collection>
-<collection name="phoneengine" long-name="Phone Engine" level="engine">
-<component name="phonecntfinder2" filter="s60" long-name="Phone Contact Finder">
-<unit bldFile="app/phone/phoneengine/phonecntfinder2" proFile="phonecntfinder2.pro"/>
-</component>
-<component name="audiohandling" filter="s60" long-name="Phone Audio Handling">
-<unit bldFile="app/phone/phoneengine/audiohandling/group"/>
-</component>
-<component name="callhandling" filter="s60" long-name="Call Handling">
-<unit bldFile="app/phone/phoneengine/callhandling/group"/>
-</component>
-<component name="contacthandling2" filter="s60" long-name="Phone Contact Handling">
-<unit bldFile="app/phone/phoneengine/contacthandling2/group"/>
-</component>
-<component name="loghandling" filter="s60" long-name="Phone Log Handling">
-<unit bldFile="app/phone/phoneengine/loghandling/group"/>
-</component>
-<component name="engineinfo" filter="s60" long-name="Phone Engine Info">
-<unit bldFile="app/phone/phoneengine/engineinfo/group"/>
-</component>
-<component name="phonemodel" filter="s60" long-name="Phone Model">
-<unit bldFile="app/phone/phoneengine/phonemodel" proFile="phonemodel.pro"/>
-</component>
-<component name="servicehandling" filter="s60" long-name="Phone Service Handling">
-<unit bldFile="app/phone/phoneengine/servicehandling/group"/>
-</component>
-<component name="phoneservices" filter="s60" long-name="Phone Server" introduced="^4">
-<unit bldFile="app/phone/phoneengine/phoneservices" proFile="phoneservices.pro"/>
-</component>
-<component name="parserrecognizer" filter="s60" long-name="Parser Recognizer" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneengine/parserrecognizer" proFile="parserrecognizer.pro"/>
-</component>
-</collection>
-<collection name="phoneuis" long-name="Phone UIs" level="ui">
-<component name="bubblemanager2" filter="s60" long-name="Phone Bubble Manager">
-<unit bldFile="app/phone/phoneuis/bubblemanager2" proFile="bubblemanager2.pro"/>
-</component>
-<component name="telephonydevicemode" filter="s60" long-name="Telephony Device Mode">
-<unit bldFile="app/phone/phoneuis/telephonydevicemode/group"/>
-</component>
-</collection>
-<collection name="phone_plat" long-name="Phone Apps Platform Interfaces" level="app">
-<component name="3d_ringing_tone_enabler_api" long-name="3D Ringing Tone Enabler API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
-</component>
-<component name="telephony_comms_information_api" long-name="Telephony Comms Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_comms_information_api/group"/>
-</component>
-<component name="telephony_information_api" long-name="Telephony Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_information_api/group"/>
-</component>
-<component name="telephony_device_mode_api" long-name="Telephony Device Mode API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_device_mode_api/group"/>
-</component>
-<component name="telephony_remote_party_information_api" long-name="Telephony Remote Party Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_remote_party_information_api/group"/>
-</component>
-<component name="telephony_video_mailbox_settings_api" long-name="Telephony Video Mailbox Settings API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_video_mailbox_settings_api/group"/>
-</component>
-<component name="telephony_microphone_mute_status_api" long-name="Telephony Microphone Mute Status API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_microphone_mute_status_api/group"/>
-</component>
-<component name="telephony_logging_extension_api" long-name="Telephony Logging Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_logging_extension_api/group"/>
-</component>
-<component name="telephony_matching_extension_api" long-name="Telephony Matching Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_matching_extension_api/group"/>
-</component>
-<component name="phone_application_commands_api" long-name="Phone Application Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_commands_api/group"/>
-</component>
-<component name="phone_application_voip_commands_api" long-name="Phone Application VOIP Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_voip_commands_api/group"/>
-</component>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_mediator_api/group"/>
-</component>
-<component name="video_telephony_mediator_api" long-name="Video Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/video_telephony_mediator_api/group"/>
-</component>
-<component name="video_telephony_control_mediator_api" long-name="Video Telephony Control Mediator API" filter="s60" introduced="^4" class="api">
-<unit bldFile="app/phone/phone_plat/video_telephony_control_mediator_api/group"/>
-</component>
-</collection>
-<collection name="phoneplugins" long-name="Phone Plugins" level="plugin">
-<component name="csplugin" filter="s60" long-name="Circuit Switched Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/csplugin/group"/>
-</component>
-<component name="hsdialerwidgetplugin" filter="s60" long-name="Home Screen Dialer Widget Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/hsdialerwidgetplugin" proFile="hsdialerwidgetplugin.pro"/>
-</component>
-<component name="infowidgetplugin" filter="s60" long-name="Info Widget Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/infowidgetplugin" proFile=""/>
-</component>
-</collection>
-<collection name="phonesettings" long-name="Phone Settings" level="plugin">
-<component name="cpphonesettingsplugins" filter="s60" long-name="CP Phone Settings Plugins" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phonesettings/cpphonesettingsplugins" proFile="cpphonesettingsplugins.pro"/>
-</component>
-</collection>
-</block>
-<block name="settingsuis" level="services" long-name="Settings UIs" levels="plugin ui">
-<collection name="controlpanelplugins" long-name="Control Panel Plugins" level="plugin">
-<component name="themeplugin" filter="s60" long-name="Theme Plugin" introduced="^4">
-<unit bldFile="app/settingsuis/controlpanelplugins/themeplugin" proFile="themeplugin.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-<collection name="controlpanelui" long-name="Control Panel UI" level="ui">
-<!-- collection is really a component, move down a dir -->
-<component name="controlpanelui_build" filter="s60" long-name="Control Panel UI Build" introduced="^4">
-<unit bldFile="app/settingsuis/controlpanelui" proFile="controlpanelui.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-</block>
-<block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin framework app">
-<collection name="contentctrl_plat" long-name="Content Control Daemons Platforn Interfaces" level="app">
-<component name="ds_contactsdatastoreextension_api" long-name="Adapter Customization API" filter="s60" introduced="^4" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_contactsdatastoreextension_api/group"/>
-</component>
-<component name="ds_data_modification_api" long-name="DS Data Modification API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_data_modification_api/group"/>
-</component>
-</collection>
-<collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
-<component name="secon" filter="s60" long-name="Service Controllers">
-<unit bldFile="app/contentcontrol/connectivitymodules/secon/group"/>
-</component>
-</collection>
-<collection name="dsdcmoadapter" long-name="Data Sync DCMO Adapter" level="plugin">
-<!-- Component at wrong rank, should move down a directory -->
-<component name="dsdcmoadapter_build" filter="s60" long-name="Data Sync Control DCMO Adapter">
-<unit bldFile="app/contentcontrol/dsdcmoadapter/group"/>
-</component>
-</collection>
-<collection name="omads" long-name="OMA Data Sync" level="app">
-<component name="omads_build" filter="s60" long-name="OMA DS Build">
-<unit bldFile="app/contentcontrol/omads/group"/>
-<!-- need to remove #include and rename and OMA DS ROM -->
-</component>
-<component name="omadsextensions" filter="s60" long-name="OMA DS Extensions" plugin="Y">
-<unit bldFile="app/contentcontrol/omads/omadsextensions/group"/>
-</component>
-<component name="omadsextensions" filter="s60" long-name="OMA DS Qt Extensions" plugin="Y">
-<unit bldFile="app/contentcontrol/omads/omadsextensions" proFile="omadsextensions.pro"/>
-</component>
-</collection>
-</block>
-<block name="firsttimeuse" level="apps" long-name="First Time Use" levels="support services ui app">
-<!-- these empty collections are really components. Move down a directory and supply units -->
-<collection name="ftuapplication" long-name="First Time Use Application" level="app"/>
-<collection name="fturuntimeservices" long-name="First Time Use Runtime Services" level="services"/>
-<collection name="wizardproviders" long-name="Wizard Providers" level="support"/>
-<collection name="stateproviders" long-name="State Providers" level="support"/>
-<collection name="runtimeproviders" long-name="Runtime Providers" level="support"/>
-<collection name="firsttimeuse_info" long-name="First Time Use Info" level="ui">
-<component name="firsttimeuse_build" long-name="First Time Use Build">
-<unit bldFile="app/firsttimeuse" proFile="ftu.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-</block>
-<block name="devicecontrol" level="services" long-name="Device Control Daemons" levels="oma mid app">
-<collection name="deviceupdatesui" long-name="Device Updates UI" level="app">
-<component name="deviceupdatesui_adapters" long-name="Device Updates Adapters" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/devicecontrol/deviceupdatesui/adapters/bld"/>
-</component>
-<component name="deviceupdates" long-name="Device Updates" filter="s60" introduced="^4">
-<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdates" proFile="deviceupdates.pro"/>
-</component>
-<component name="deviceupdatesplugin" long-name="Device Updates Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdatesplugin" proFile="deviceupdatesplugin.pro"/>
-</component>
-<component name="deviceupdatesqtsp" long-name="Device Updates Qt Service Provider" filter="s60" introduced="^4">
-<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdatesqtsp" proFile="deviceupdatesqtsp.pro"/>
-</component>
-<component name="cpqtsp" long-name="Client Provisioning Qt Service Provider" filter="s60" introduced="^4">
-<unit bldFile="app/devicecontrol/deviceupdatesui/cpqtsp" proFile="cpqtsp.pro"/>
-</component>
-<component name="devicemanagementnotifiersplugin" long-name="Device Management Notifiers Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/devicecontrol/deviceupdatesui/devicemanagementnotifiersplugin" proFile="devicemanagementnotifiersplugin.pro"/>
-</component>
-</collection>
-</block>
-<block name="printing" level="services" long-name="Printing"/>
-<block name="files" level="apps" long-name="File Manager Apps" levels="support apps">
-<collection name="filemanager" long-name="File Manager" level="apps">
-<component name="filemanager_plat" long-name="File Manager Platform Interfaces" filter="s60" introduced="^4" class="api"/>
-<component name="fmbkupengine" filter="s60" long-name="File Manager Backup Engine" introduced="^4">
-<unit bldFile="app/files/filemanager/src/fmbkupengine/group"/>
-</component>
-<component name="filemanager_build" filter="s60" long-name="File Manager Build">
-<!-- break this up into components or move down a directory -->
-<unit bldFile="app/files/filemanager" proFile="filemanager.pro"/>
-</component>
-</collection>
-</block>
-<block name="search" level="apps" long-name="Search Apps" levels="eng base app api">
-<collection name="search_info" long-name="Search Info">
-<component name="search_build" long-name="Search Build">
-<unit bldFile="app/search/group"/>
-</component>
-</collection>
-<collection name="searchui" long-name="Search UI">
-<component name="searchui_build" long-name="Search UI Build">
-<unit bldFile="app/search/searchui" proFile="searchui.pro"/>
-</component>
-</collection>
-</block>
-<block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
-<collection name="contacts_plat" long-name="Contacts Apps Platform Interfaces" level="ui">
-<component name="logs_engine_api" long-name="Logs Engine API" filter="s60" introduced="^4" class="api"/>
-<component name="logs_engine_api_extensions" long-name="Logs Engine API Extensions" filter="s60" class="api"/>
-<component name="logs_services_api" long-name="Logs Services API" filter="s60" introduced="^4" class="api"/>
-<component name="logs_timers_api" long-name="Logs Timers API" filter="s60" class="api"/>
-<component name="qt_mobility_contacts_api" long-name="Qt Mobility Contacts API" filter="s60" introduced="^4" class="api"/>
-</collection>
-<collection name="logsui" long-name="Logs UI" level="ui">
-<component name="logsui_build" filter="s60" long-name="Logs UI Build">
-<!-- component at too high a rank, should move down one directory -->
-<unit bldFile="app/contacts/logsui" proFile="logsui.pro"/>
-</component>
-</collection>
-<collection name="phonebookui" long-name="Phonebook UI" level="ui">
-<component name="mobhistorymodel" filter="s60" long-name="Mobile History Model" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/mobhistorymodel" qt:proFile="mobhistorymodel.pro"/> -->
-</component>
-<component name="pbkcommonui" filter="s60" long-name="Phonebook Common UI" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/pbkcommonui" qt:proFile="pbkcommonui.pro"/> -->
-</component>
-<component name="phonebookapp" filter="s60" long-name="Phonebook Application" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/phonebookapp" qt:proFile="phonebookapp.pro"/> -->
-</component>
-<component name="phonebookservices" filter="s60" long-name="Phonebook Services" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/phonebookservices" qt:proFile="phonebookservices.pro"/> -->
-</component>
-<component name="phonebookui_build" filter="s60" long-name="Phonebook UI Build" introduced="^4">
-<!-- break up into components -->
-<unit bldFile="app/contacts/phonebookui" proFile="phonebookui.pro"/>
-</component>
-</collection>
-<collection name="qtcontactsmobility" long-name="Qt Contacts Mobility" level="support">
-<component name="qtcontactsmobility_build" filter="s60" long-name="Qt Contacts Mobility Build" introduced="^4" plugin="Y">
-<!-- not really a component, move down a dir? Break up into compnents? -->
-<unit bldFile="app/contacts/qtcontactsmobility" proFile="qtcontactsmobility.pro"/>
-</component>
-</collection>
-<collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
-<component name="cntfindplugin" filter="s60" long-name="Contacts Find Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntfindplugin" proFile="cntfindplugin.pro"/>
-</component>
-<component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
-<unit bldFile="app/contacts/phonebookengines/contactsmodel/groupsql" mrp="app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
-</component>
-<component name="cntsortplugin" filter="s60" long-name="Contacts Sort Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntsortplugin" proFile="cntsortplugin.pro"/>
-</component>
-<component name="mobcntmodel" filter="s60" long-name="Mobile Contacts Model" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/mobcntmodel" proFile="mobcntmodel.pro"/>
-</component>
-<component name="mobcntactions" filter="s60" long-name="Mobile Contacts Actions" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/mobcntactions" proFile="mobcntactions.pro"/>
-</component>
-<component name="cntmaptileservice" filter="s60" long-name="Contacts Map Tile Service" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/cntmaptileservice" proFile="cntmaptileservice.pro"/>
-</component>
-<component name="simutility" filter="s60" long-name="SIM Utility" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/simutility" proFile="simutility.pro"/>
-</component>
-</collection>
-<collection name="pimprotocols" long-name="PIM Protocols" level="services">
-<component name="phonebooksync" long-name="Phonebook Sync" purpose="optional" plugin="Y">
-<unit bldFile="app/contacts/pimprotocols/phonebooksync/group" mrp="app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
-</component>
-<component name="pbap" long-name="Bluetooth PBAP" introduced="9.2" purpose="optional">
-<unit bldFile="app/contacts/pimprotocols/pbap/group" mrp="app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
-</component>
-</collection>
-<collection name="contacts_info" long-name="Contacts Apps Info" level="ui">
-<component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="organizer" level="apps" span="2" long-name="Organizer Application Suite" levels="support services engine ui app">
-<collection name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" level="app">
-<component name="calendar_interim_utils2_api" long-name="Calendar Interim Utils 2 API" filter="s60" class="api">
-<!-- move into own .pro file -->
-<unit bldFile="app/organizer/organizer_pub" proFile="organizer_pub.pro"/>
-</component>
-</collection>
-<collection name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" level="app">
-<component name="organizer_plat_build" long-name="Organizer Application Suite Platform Interface Build" filter="s60" class="api">
-<!-- break up into individual .pro files -->
-<unit bldFile="app/organizer/organizer_plat" proFile="organizer_plat.pro"/>
-</component>
-<component name="agenda_versit_2_api" long-name="Agenda Versit 2 API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="organizer_plat/agenda_versit_2_api/group"/>-->
-</component>
-<component name="calendar_exporter_api" long-name="Calendar Exporter API" filter="s60" class="api placeholder">
-<!--<unit bldFile="organizer_plat/calendar_exporter_api/group"/>-->
-</component>
-<component name="calendar_importer_api" long-name="Calendar Importer API" filter="s60" class="api placeholder">
-<!--<unit bldFile="organizer_plat/calendar_importer_api/group"/>-->
-</component>
-<component name="calendar_launcher_api" long-name="Calendar Launcher API" filter="s60" class="api placeholder">
-<!--<unit bldFile="organizer_plat/calendar_launcher_api/group"/> -->
-</component>
-<component name="agenda_interface_api" long-name="Agenda Interface API" filter="s60" introduced="^4" class="api"/>
-<component name="calendar_editor_api" long-name="Calendar Editor API" filter="s60" introduced="^4" class="api"/>
-<component name="notes_editor_api" long-name="Notes Editor API" filter="s60" introduced="^4" class="api"/>
-<component name="agenda_eventviewer_api" long-name="Agenda Event Viewer API" filter="s60" introduced="^4" class="api"/>
-</collection>
-<collection name="agendainterface" long-name="Agenda Interface" level="services">
-<!-- collection is really a component, should move down a directory -->
-<component name="agendainterface_build" filter="s60" long-name="Agenda Interface Build">
-<unit bldFile="app/organizer/agendainterface" proFile="agendainterface.pro"/>
-</component>
-</collection>
-<collection name="calendarui" long-name="Calendar UI" level="ui">
-<component name="commonutils" filter="s60" long-name="Calendar Common Utils">
-<unit bldFile="app/organizer/calendarui/commonutils" proFile="commonutils.pro"/>
-</component>
-<component name="calenlauncher" filter="s60" long-name="Calendar Launcher">
-<unit bldFile="app/organizer/calendarui/calenlauncher/group" proFile="calenlauncher.pro"/>
-</component>
-<component name="caleneditor" filter="s60" long-name="Calendar Editor" introduced="^4">
-<unit bldFile="app/organizer/calendarui/caleneditor" proFile="caleneditor.pro"/>
-</component>
-<component name="agendaeventviewer" filter="s60" long-name="Agenda Event Viewer" introduced="^4">
-<unit bldFile="app/organizer/calendarui/agendaeventviewer" proFile="agendaeventviewer.pro"/>
-</component>
-<component name="globaldata" filter="s60" long-name="Calendar Global Data">
-<unit bldFile="app/organizer/calendarui/globaldata" proFile="globaldata.pro"/>
-</component>
-<component name="settings" filter="s60" long-name="Calendar Settings">
-<unit bldFile="app/organizer/calendarui/settings" proFile="settings.pro"/>
-</component>
-<component name="calenplugins" filter="s60" long-name="Calendar Plugins" introduced="^4" plugin="Y">
-<unit bldFile="app/organizer/calendarui/calenplugins" proFile="calenplugins.pro"/>
-</component>
-<component name="customisationmanager" filter="s60" long-name="Calendar Customisation Manager">
-<unit bldFile="app/organizer/calendarui/customisationmanager" proFile="customisationmanager.pro"/>
-</component>
-<component name="views" filter="s60" long-name="Calendar Views">
-<unit bldFile="app/organizer/calendarui/views" proFile="views.pro"/>
-</component>
-<component name="calengriditemstyleplugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/organizer/calendarui/styleplugins/calengriditemstyleplugin" proFile="calengriditemstyleplugin.pro"/>
-</component>
-<component name="calendarui_controller" filter="s60" long-name="Calendar Controller">
-<unit bldFile="app/organizer/calendarui/controller" proFile="controller.pro"/>
-</component>
-<component name="calendarui_application" filter="s60" long-name="Calendar Application">
-<unit bldFile="app/organizer/calendarui/application" proFile="application.pro"/>
-</component>
-<component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y">
-<unit bldFile="app/organizer/calendarui/caldav/group"/>
-</component>
-</collection>
-<collection name="notes" long-name="Notes" level="ui">
-<component name="noteseditor" filter="s60" long-name="Notes Editor" introduced="^4">
-<unit bldFile="app/organizer/notes/notesui/noteseditor" proFile="noteseditor.pro"/>
-</component>
-<component name="notes_build" filter="s60" long-name="Notes Build" introduced="^4">
-<unit bldFile="app/organizer/notes" proFile="notes.pro"/>
-</component>
-</collection>
-<collection name="calendarengines" long-name="Calendar Engines" level="engine">
-<component name="versit2" filter="s60" long-name="Versit 2 iCal Parser" introduced="9.2">
-<unit bldFile="app/organizer/calendarengines/versit2/group"/>
-</component>
-<component name="agnversit2" filter="s60" long-name="Versit 2 Agenda Interface" introduced="9.2" plugin="Y">
-<unit bldFile="app/organizer/calendarengines/agnversit2/group"/>
-</component>
-<component name="caleninterimutils" filter="s60" long-name="Calendar Interim Utils" introduced="9.1">
-<unit bldFile="app/organizer/calendarengines/caleninterimutils/group"/>
-</component>
-<component name="calenimp" filter="s60" long-name="Calendar Import Wrapper" introduced="7.0s">
-<unit bldFile="app/organizer/calendarengines/calenimp/group"/>
-</component>
-<component name="caldavsrv" filter="sf_build" long-name="CalDAV Server" introduced="^3">
-<unit bldFile="app/organizer/calendarengines/caldav/group"/>
-</component>
-</collection>
-<collection name="clock" long-name="Clock" level="app">
-<!-- uncomment unit when block_build is split up-->
-<component name="clockengines" filter="s60" long-name="Clock Engines" class="placeholder">
-<!--<unit bldFile="clock/clockengines" qt:proFile="clockengines.pro"/> -->
-</component>
-<component name="clockmw" filter="s60" long-name="Clock Middleware" introduced="^4" class="placeholder">
-<!--<unit bldFile="clock/clockmw" qt:proFile="clockmw.pro"/>-->
-</component>
-<component name="clockui" filter="s60" long-name="Clock UI" class="placeholder">
-<!--<unit bldFile="clock/clockui" qt:proFile="clockui.pro"/>-->
-</component>
-<component name="ftudatetimewizard" filter="s60" long-name="First Time Use Date/Time Wizard" introduced="^4" class="placeholder">
-<!--<unit bldFile="clock/ftudatetimewizard" qt:proFile="ftudatetimewizard.pro"/>-->
-</component>
-<component name="clock_build" filter="s60" long-name="Clock Build">
-<!-- make exports into a component, or just move to one of the above components, then remove this and uncomment the above -->
-<unit bldFile="app/organizer/clock" proFile="clock.pro"/>
-</component>
-</collection>
-<collection name="pimappservices" long-name="PIM Application Services" level="services">
-<component name="calendar" long-name="Calendar" introduced="9.2" purpose="optional">
-<unit bldFile="app/organizer/pimappservices/calendar/group" mrp="app/organizer/pimappservices/calendar/group/app-engines_calendar.mrp" version="2"/>
-</component>
-<component name="calendarvcalplugin" long-name="Calendar vCal Plugin" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="app/organizer/pimappservices/calendarvcalplugin/group" mrp="app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp" version="2"/>
-</component>
-<component name="appenginesdocs" long-name="Application Engines Documentation" purpose="development" class="doc">
-<unit mrp="app/organizer/pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
-</component>
-</collection>
-<collection name="pimappsupport" long-name="PIM Application Support" level="support">
-<component name="vcardandvcal" long-name="vCard and vCal" introduced="ER5" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/vcardandvcal/group" mrp="app/organizer/pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
-</component>
-<component name="chinesecalendarconverter" long-name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
-</component>
-<component name="chinesecalendaralg" long-name="Chinese Calendar Algorithm" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendaralg/group" mrp="app/organizer/pimappsupport/chinesecalendaralg/group/app-services_chinesecalendaralgorithm.mrp"/>
-</component>
-</collection>
-<collection name="alarmui" long-name="Alarm UI" level="app">
-<!-- collection is really a component, should move down a directory -->
-<component name="alarmui_build" filter="s60" long-name="Alarm UI Build">
-<unit bldFile="app/organizer/alarmui" proFile="alarmui.pro"/>
-</component>
-</collection>
-<collection name="organizer_info" long-name="Organizer Application Suite Info" level="app">
-<component name="organizer_metadata" long-name="Organizer Application Suite Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="plugin eng base app api">
-<collection name="msg_plat" long-name="Messaging Apps Platform APIs" level="api">
-<component name="messaging_media_resolver_api" long-name="Messaging Media Resolver API" filter="s60" class="api"/>
-<component name="mms_application_api" long-name="MMS Application API" filter="s60" class="api"/>
-<component name="mms_codec_client_api" long-name="MMS Codec Client API" filter="s60" class="api"/>
-<component name="mms_conformance_api" long-name="MMS Conformance API" filter="s60" class="api"/>
-<component name="mms_engine_settings_api" long-name="MMS Engine Settings API" filter="s60" class="api"/>
-<component name="mms_server_settings_api" long-name="MMS Server Settings API" filter="s60" class="api"/>
-<component name="conversation_services_client_api" long-name="Conversation Services Client API" filter="s60" introduced="^4" class="api"/>
-<component name="conversation_services_plugin_api" long-name="Conversation Services Plugin API" filter="s60" introduced="^4" class="api"/>
-<component name="conversation_services_utilities_api" long-name="Conversation Services Utilities API" filter="s60" introduced="^4" class="api"/>
-<component name="shareui_api" long-name="Share UI API" filter="s60" introduced="^4" class="api"/>
-<component name="messaging_history_api" long-name="Messaging History API" filter="s60" introduced="^4" class="api"/>
-<component name="msg_plat_build" long-name="Messaging Apps Platform APIs Build" filter="s60" introduced="^4" class="api">
-<!-- break this up into the above units and replace their base attributes with bldFile, etc -->
-</component>
-</collection>
-<collection name="msg_pub" long-name="Messaging Apps Public APIs" level="api">
-<component name="mms_client_mtm_api" long-name="MMS Client MTM API" filter="s60" class="api"/>
-<component name="msg_smil_dtd_api" long-name="Messaging SMIL DTD API" filter="s60" introduced="^4" class="api"/>
-<component name="msg_pub_build" long-name="Messaging Apps Public APIs Build" filter="s60" introduced="^4" class="api">
-<!-- break this up into the above units and replace their base attributes with bldFile, etc -->
-</component>
-</collection>
-<collection name="mobilemessaging" long-name="Mobile Messaging" level="plugin">
-<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/mobilemessaging/smsmtm/group" mrp="app/messaging/mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
-</component>
-</collection>
-<collection name="messagingappbase" long-name="Messaging App Base" level="base">
-<component name="messagingappbase_build" filter="s60" long-name="Messaging App Base Build" introduced="^4">
-<!-- break this up into the below components -->
-<unit bldFile="app/messaging/messagingappbase" proFile="messagingappbase.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgmedia" filter="s60" long-name="Message Media"/>
-<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
-<unit mrp="app/messaging/messagingappbase/smsmtm/group/messaging_sms.mrp"/>
-</component>
-<component name="smilparser" long-name="SMIL Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="app/messaging/messagingappbase/smilparser/GROUP" mrp="app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
-</component>
-<component name="obexmtms" long-name="OBEX MTMs" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/obexmtms/Group" mrp="app/messaging/messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
-</component>
-</collection>
-<collection name="mmsengine" long-name="MMS Engine" level="eng">
-<component name="mmsconninit" filter="s60" long-name="MMS Connection Initiator" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsconninit/bld"/> -->
-</component>
-<component name="genutils" filter="s60" long-name="General Utils" class="placeholder">
-<!-- <unit bldFile="mmsengine/genutils/bld"/> -->
-</component>
-<component name="mmsserversettings" filter="s60" long-name="MMS Server Settings" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserversettings/bld"/> -->
-</component>
-<component name="mmsmessage" filter="s60" long-name="MMS Message" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsmessage/bld"/> -->
-</component>
-<component name="mmshttptransport" filter="s60" long-name="MMS HTTP Transport" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmshttptransport/bld"/> -->
-</component>
-<component name="mmscodec" filter="s60" long-name="MMS Codec" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodec/bld"/> -->
-</component>
-<component name="mmsserver" filter="s60" long-name="MMS Server" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserver/bld"/> -->
-</component>
-<component name="clientmtm" filter="s60" long-name="MMS Client MTM" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/clientmtm/bld"/> -->
-</component>
-<component name="mmswatcher" filter="s60" long-name="MMS Watcher" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmswatcher/bld"/> -->
-</component>
-<component name="mmspushhandler" filter="s60" long-name="MMS Push Handler" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmspushhandler/bld"/> -->
-</component>
-<component name="applicationadapter" filter="s60" long-name="MMS Application Adapter" class="placeholder">
-<!-- <unit bldFile="mmsengine/applicationadapter/bld"/> -->
-</component>
-<component name="mmscodecclient" filter="s60" long-name="MMS Codec Client" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodecclient/bld"/> -->
-</component>
-<component name="mmssettings" long-name="MMS Settings" introduced="9.2" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmssettings/group" mrp="app/messaging/mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
-</component>
-<component name="mmsconf" long-name="MMS Configuration" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmsconf" mrp="app/messaging/mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
-</component>
-<component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
-<!-- this should be broken up into the individual other components -->
-<unit bldFile="app/messaging/mmsengine" proFile="mmsengine.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="messagingapp" long-name="Messaging Application" level="app">
-<component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
-<!-- this should be broken up into the individual other components -->
-<unit bldFile="app/messaging/messagingapp" proFile="messagingapp.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgutils" filter="s60" long-name="Messaging Utils" introduced="^4">
-<unit bldFile="app/messaging/messagingapp/msgutils" proFile="msgutils.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgappfw" filter="s60" long-name="Messaging Application Framework" introduced="^4">
-<unit bldFile="app/messaging/messagingapp/msgappfw" proFile="msgappfw.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgsettings" filter="s60" long-name="Messaging Settings" introduced="^4">
-<unit bldFile="app/messaging/messagingapp/msgsettings" proFile="msgsettings.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgnotifications" filter="s60" long-name="Messaging Notifications" introduced="^4">
-<unit bldFile="app/messaging/messagingapp/msgnotifications" proFile="msgnotifications.pro" qmakeArgs="-r"/>
-</component>
-<component name="smartmessaging" filter="s60" long-name="Smart Messaging">
-<unit bldFile="app/messaging/messagingapp/smartmessaging" proFile="smartmessaging.pro" qmakeArgs="-r"/>
-</component>
-<component name="shareui" filter="s60" long-name="Shared UI" introduced="^4">
-<unit bldFile="app/messaging/messagingapp/shareui" proFile="shareui.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgui" filter="s60" long-name="Messaging UI" introduced="^4">
-<unit bldFile="app/messaging/messagingapp/msgui" proFile="msgui.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="email" long-name="Email" level="plugin">
-<!-- use commonemail instead -->
-<component name="pop3andsmtpmtm" long-name="POP3 and SMTP MTM" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/pop3andsmtpmtm/group" mrp="app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
-</component>
-<component name="imap4mtm" long-name="IMAP4 MTM" introduced="9.2" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/imap4mtm/group" mrp="app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
-</component>
-</collection>
-<collection name="messaging_info" long-name="Messaging Apps Info" level="api">
-<component name="messaging_metadata" long-name="Messaging Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commonemail" level="apps" span="2" long-name="Email Apps" levels="service support ui app">
-<!-- need to resolve the qt parts into proper components, then uncomment the units -->
-<collection name="email_plat" long-name="Email Apps Platform Interfaces" level="app">
-<component name="nmail_client_api" long-name="NMail Client API" filter="s60" introduced="^4" class="api placeholder">
-<!--<unit bldFile="email_plat" qt:proFile="email_plat.pro"/> -->
-</component>
-</collection>
-<collection name="emailservices" long-name="Email Services" level="service">
-<component name="nmailbase" filter="s60" long-name="NMail Base" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/nmailbase" qt:proFile="nmailbase.pro"/> -->
-</component>
-<component name="emailcommon" filter="s60" long-name="Email Common" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/emailcommon" qt:proFile="emailcommon.pro"/>-->
-</component>
-<component name="emailframework" filter="s60" long-name="Email Framework" introduced="^2" class="placeholder">
-<!-- <unit bldFile="emailservices/emailframework" qt:proFile="emailframework.pro"/>-->
-</component>
-<component name="emailstore" filter="s60" long-name="Email Store" introduced="^2" class="placeholder">
-<!-- <unit bldFile="emailservices/emailstore" qt:proFile="emailstore.pro"/>-->
-</component>
-<component name="nmclientapi" filter="s60" long-name="Nmail Client API" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/nmclientapi" qt:proFile="nmclientapi.pro"/>-->
-</component>
-<component name="nmailagent" filter="s60" long-name="Nmail Agent" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/nmailagent" qt:proFile="nmailagent.pro"/>-->
-</component>
-</collection>
-<collection name="ipsservices" long-name="IMAP/POP/SMTP Services" level="service">
-<component name="ipssosplugin" filter="s60" long-name="IPS SOS Plugin" introduced="^2" plugin="Y" class="placeholder">
-<!-- SOS? Consider spelling it out since the abbreviation is ambiguous -->
-<!--<unit bldFile="ipsservices/ipssosplugin" qt:proFile="ipssosplugin.pro" />-->
-</component>
-<component name="nmimapclientplugin" filter="s60" long-name="NM IMAP Client Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="ipsservices/nmimapclientplugin" qt:proFile="nmimapclientplugin.pro"/>-->
-</component>
-<component name="nmipsmtms" filter="s60" long-name="NM IPS Client Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="ipsservices/nmipsmtms" qt:proFile="nmipsmtms.pro"/>-->
-</component>
-<component name="nmipssettings" filter="s60" long-name="NM IPS Settings" introduced="^4" class="placeholder">
-<!-- <unit bldFile="ipsservices/nmipssettings" qt:proFile="nmipssettings.pro"/>-->
-</component>
-<component name="ipsservices_build" filter="s60" long-name="IPS Services Build" introduced="^2" class="placeholder">
-<!--<unit bldFile="ipsservices" qt:proFile="ipsservices.pro"/> -->
-<!-- can the exports be broken up into the other components or made a config component?-->
-</component>
-</collection>
-<collection name="emailuis" long-name="Email UIs" level="app">
-<component name="nmailuiengine" filter="s60" long-name="Nmail UI Engine" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailuiengine" qt:proFile="nmailuiengine.pro"/> -->
-</component>
-<component name="nmailuiwidgets" filter="s60" long-name="Nmail UI Widgets" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailuiwidgets" qt:proFile="nmailuiwidgets.pro"/> -->
-</component>
-<component name="nmailuiwidgetsplugin" filter="s60" long-name="Nmail UI Widgets Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailuiwidgetsplugin" qt:proFile="nmailuiwidgetsplugin.pro"/> -->
-</component>
-<component name="nmsettingui" filter="s60" long-name="Nmail Setting UI" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmsettingui" qt:proFile="nmsettingui.pro"/> -->
-</component>
-<component name="nmailcpplugin" filter="s60" long-name="Nmail CP Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailcpplugin" qt:proFile="nmailcpplugin.pro"/> -->
-</component>
-<component name="nmailui" filter="s60" long-name="Nmail UI" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailui" qt:proFile="nmailui.pro"/> -->
-</component>
-<component name="nmindicatorplugin" filter="s60" long-name="Nmail Indicator Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmindicatorplugin" qt:proFile="nmindicatorplugin.pro"/> -->
-</component>
-<component name="nmframeworkadapter" filter="s60" long-name="Nmail Framework Adapter" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmframeworkadapter" qt:proFile="nmframeworkadapter.pro"/> -->
-</component>
-</collection>
-<collection name="commonemail_info" long-name="Email Apps Info" level="app">
-<component name="commonemail_build" long-name="Email Apps Build" introduced="^4">
-<!-- split into actual components -->
-<unit bldFile="app/commonemail" proFile="nmail.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</block>
-<block name="camera" level="apps" long-name="Camera Apps">
-<collection name="camerauis" long-name="Camera UIs">
-<component name="cameraxui" filter="s60" long-name="CameraX UIs">
-<unit bldFile="app/camera/camerauis/cameraxui" filter="!test" proFile="camerax.pro"/>
-</component>
-</collection>
-</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">
-<component name="image_editor_debug_utilities_api" long-name="Image Editor Debug Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
-</component>
-<component name="image_editor_utilities_api" long-name="Image Editor Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_utilities_api/group"/>
-</component>
-<component name="image_editor_definitions_api" long-name="Image Editor Definitions API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_definitions_api/group"/>
-</component>
-<component name="image_editor_system_parameters_api" long-name="Image Editor System Parameters API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_system_parameters_api/group"/>
-</component>
-<component name="image_processing_engine_api" long-name="Image Processing Engine API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_processing_engine_api/group"/>
-</component>
-</collection>
-<collection name="imageeditor" long-name="Image Editor UI" level="ui">
-<component name="pb" filter="s60" long-name="Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/pb/group"/>
-</component>
-<component name="iepb" filter="s60" long-name="Image Editor Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/iepb/group"/>
-</component>
-<component name="imageeditorui" filter="s60" long-name="Image Editor UI">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorui/group"/>
-</component>
-<component name="imageeditormanager" filter="s60" long-name="Image Editor Manager">
-<unit bldFile="app/imgeditor/imageeditor/imageeditormanager/group"/>
-</component>
-<component name="imageeditorapp" filter="s60" long-name="Image Editor Application">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorapp/group"/>
-</component>
-<component name="imageeditor_plugins" filter="s60" long-name="Image Editor Plugins" plugin="Y">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditor/plugins/blackwhiteplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/brightnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/bubbleplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cartoonizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/clipartplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/contrastplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cropplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/drawplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/frameplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/negativeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/redeyeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/resizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotatelplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotaterplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/textplugin/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditor/plugins/drawplugin/group"/>
- -->
-</component>
-<component name="editorprovider" filter="s60" long-name="Image Editor Provider">
-<unit bldFile="app/imgeditor/imageeditor/editorprovider/group"/>
-</component>
-<component name="imageeditor_build" filter="s60" long-name="Image Editor Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditor/group"/>
-</component>
-</collection>
-<collection name="imageeditorengine" long-name="Image Editor Engine" level="engine">
-<component name="filters" filter="s60" long-name="Image Editor Filters">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbrightness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbubble/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbuffer/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercartoon/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterclipart/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercontrast/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercrop/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterdraw/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterframe/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtergrayscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtericlsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegtarget/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filternegate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterredeye/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterrotate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtertext/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
- -->
-</component>
-<component name="imageeditorutils" filter="s60" long-name="Image Editor Utilities">
-<unit bldFile="app/imgeditor/imageeditorengine/imageeditorutils/group"/>
-</component>
-<component name="systemparameters" filter="s60" long-name="System Parameters">
-<unit bldFile="app/imgeditor/imageeditorengine/systemparameters/group"/>
-</component>
-<component name="enginewrapper" filter="s60" long-name="Image Editor Engine Wrapper">
-<unit bldFile="app/imgeditor/imageeditorengine/enginewrapper/group"/>
-</component>
-<component name="imageeditorengine_build" filter="s60" long-name="Image Editor Engine Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoeditor" level="apps" long-name="Video Editor Apps" levels="engine ui">
-<collection name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" level="ui">
-<component name="video_editor_engine_api" long-name="Video Editor Engine API" introduced="^2" class="api">
-<unit bldFile="app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
-</component>
-</collection>
-<collection name="videditor" long-name="Video Editor" level="ui">
-<component name="videoeditorcommon" filter="s60" long-name="Video Editor Common" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditorcommon/group"/>
-</component>
-<component name="videoeditoruicomponents" filter="s60" long-name="Video Editor UI Components" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditoruicomponents/group"/>
-</component>
-<component name="simplevideoeditor" filter="s60" long-name="Simple Video Editor" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplevideoeditor/group"/>
-</component>
-<component name="simplecutvideo" filter="s60" long-name="Simple Cut Video" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplecutvideo/group"/>
-</component>
-<component name="videoprovider" filter="s60" long-name="Video Provider" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoprovider/group"/>
-</component>
-<component name="manualvideoeditor" filter="s60" long-name="Manual Video Editor" introduced="^2" class="placeholder">
-<!-- uncomment when supported
- <meta rel="config">
- <defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
- </meta>
- <unit bldFile="videditor/manualvideoeditor/group"/> -->
-</component>
-<component name="videditor_build" filter="s60" long-name="Video Editor Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videditor/group"/>
-</component>
-</collection>
-<collection name="videoeditorengine" long-name="Video Editor Engine" level="engine">
-<component name="audioeditorengine" filter="s60" long-name="Audio Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/audioeditorengine/group"/>
-</component>
-<component name="avcedit" filter="s60" long-name="AVC Editing" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/avcedit/group"/>
-</component>
-<component name="h263decoder" filter="s60" long-name="H.263 Decoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/h263decoder/group"/>
-</component>
-<component name="mp3aacmaniplib" filter="s60" long-name="MP3 and AAC Manipulation Library" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
-</component>
-<component name="vedtranscoder" filter="s60" long-name="Video Editor Transcoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedtranscoder/group"/>
-</component>
-<component name="vedengine" filter="s60" long-name="Video Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedengine/group"/>
-</component>
-<component name="videoeditorengine_build" filter="s60" long-name="Video Editor Engine Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videoeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
-<collection name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" level="apps">
-<component name="videoplayer_startup_api" long-name="Video Player Startup API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videoplayer_startup_api/group" filter="!test"/>
-</component>
-<component name="videocollection_api" long-name="Video Collection API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videocollection_api/group"/>
-</component>
-</collection>
-<collection name="videocollection" long-name="Video Collection" level="util">
-<component name="mpxmyvideoscollection" filter="s60" long-name="MPX My Videos Collection" introduced="^3">
-<unit bldFile="app/videoplayer/videocollection/mpxmyvideoscollection/group"/>
-</component>
-<component name="videocollectionwrapper" filter="s60" long-name="Video Collection Wrapper" introduced="^4">
-<unit bldFile="app/videoplayer/videocollection/videocollectionwrapper" proFile="videocollectionwrapper.pro" qmakeArgs="-r"/>
-</component>
-<component name="videocollectionview" filter="s60" long-name="Video Collection View" introduced="^4">
-<unit bldFile="app/videoplayer/videocollection/videocollectionview" proFile="videocollectionview.pro" qmakeArgs="-r"/>
-</component>
-<component name="videofiledetailsview" filter="s60" long-name="Video File Details View" introduced="^4">
-<unit bldFile="app/videoplayer/videocollection/videofiledetailsview" proFile="videofiledetailsview.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="mediasettings" long-name="Media Settings" level="support">
-<!-- this is really a component. Should be moved down a directory -->
-<component name="mediasettings_build" filter="s60" long-name="Media Settings Build">
-<unit bldFile="app/videoplayer/mediasettings/group"/>
-</component>
-</collection>
-<collection name="videoplayerapp" long-name="Video Player App" level="apps">
-<component name="videoplayerengine" long-name="Video Player Engine" filter="s60" introduced="^4">
-<unit bldFile="app/videoplayer/videoplayerapp/videoplayerengine" proFile="videoplayerengine.pro" qmakeArgs="-r"/>
-</component>
-<component name="hbvideoplayer" filter="s60" long-name="HB Video Player" introduced="^4">
-<unit bldFile="app/videoplayer/videoplayerapp/hbvideoplayer" proFile="hbvideoplayer.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="videoplayback" long-name="Video Playback Plugins" level="plugin">
-<component name="hbvideoplaybackview" filter="s60" long-name="HB Video Playback View" introduced="^4" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/hbvideoplaybackview" proFile="hbvideoplaybackview.pro" qmakeArgs="-r"/>
-</component>
-<component name="hbvideoplaybackviewplugin" filter="s60" long-name="HB Video Playback View Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/hbvideoplaybackviewplugin" proFile="hbvideoplaybackviewplugin.pro" qmakeArgs="-r"/>
-</component>
-<component name="videohelix" long-name="Video Helix" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videohelix/group"/>
-</component>
-</collection>
-</block>
-<block name="photos" level="apps" long-name="Photos" levels="util support ui app">
-<collection name="photos_group" long-name="Photos Group" level="support">
-<component name="photos_group_build" filter="s60" long-name="Photos Group Build" introduced="^4" class="placeholder">
-<!--<unit bldFile="group" qt:proFile="group.pro"/> -->
-</component>
-</collection>
-<collection name="photos_loggers" long-name="Photos Loggers" level="util">
-<component name="photos_loggerqt" filter="s60" long-name="Photos Logger Qt" introduced="^4" class="placeholder">
-<!--<unit bldFile="loggers/loggerqt" qt:proFile="loggerqt.pro"/> -->
-</component>
-</collection>
-<collection name="photos_commonutilities" long-name="Photos Common Utilities" level="util">
-<component name="photos_externalutility" filter="s60" long-name="Photos External Utility" introduced="^4" class="placeholder">
-<!--<unit bldFile="commonutilities/externalutility" qt:proFile="externalutility.pro"/> -->
-</component>
-<component name="imagedecoderwrapper" filter="s60" long-name="Image Decoder Wrapper" introduced="^4" class="placeholder">
-<!--<unit bldFile="commonutilities/imagedecoderwrapper" qt:proFile="imagedecoderwrapper.pro"/> -->
-</component>
-</collection>
-<collection name="photos_ui" long-name="Photos UI" level="ui">
-<component name="photos_uiengine" filter="s60" long-name="Photos UI Engine" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/uiengine" qt:proFile="uiengine.pro"/> -->
-</component>
-<component name="photos_commandhandlers" filter="s60" long-name="Photos Command Handlers" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/commandhandlers" qt:proFile="commandhandlers.pro"/> -->
-</component>
-<component name="photos_views" filter="s60" long-name="Photos Views" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/views" qt:proFile="views.pro"/> -->
-</component>
-<component name="photos_viewmanagement" filter="s60" long-name="Photos View Management" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/viewmanagement" qt:proFile="viewmanagement.pro"/> -->
-</component>
-</collection>
-<collection name="photos_main" long-name="Photos Main" level="support">
-<component name="photos_main_build" filter="s60" long-name="Photos Main Build" introduced="^4" class="placeholder">
-<!--<unit bldFile="main" qt:proFile="main.pro"/> -->
-</component>
-</collection>
-<collection name="imageviewerapp" long-name="Image Viewer App" level="support">
-<component name="imageviewerapp_build" filter="s60" long-name="Image Viewer App Build" introduced="^4" class="placeholder">
-<!--<unit bldFile="imageviewerapp" qt:proFile="imageviewerapp.pro"/> -->
-</component>
-</collection>
-<collection name="photos_info" long-name="Photos Info" level="support">
-<component name="photos_build" filter="s60" long-name="Photos Build" introduced="^4">
-<!-- split this up into the above components -->
-<unit bldFile="app/photos" proFile="photos.pro"/>
-</component>
-</collection>
-</block>
-<block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support hs app">
-<!-- move the export .pri files into their components and uncomment the units -->
-<collection name="musicplayer_utilities " long-name="Music Player Utilities" level="support">
-<component name="mpnowplayingbanner" filter="s60" long-name="MP Now Playing Banner" introduced="^4" class="placeholder">
-<!-- <unit bldFile="utilities/mpnowplayingbanner" qt:proFile="mpnowplayingbanner.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-<component name="mpsettingsmanager" filter="s60" long-name="MP Settings Manager" introduced="^4" class="placeholder">
-<!-- <unit bldFile="utilities/mpsettingsmanager" qt:proFile="mpsettingsmanager.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-</collection>
-<collection name="musicfetcher " long-name="Music Fetcher" level="support">
-<!-- collection is really a component, move down a directory -->
-<component name="musicfetcher_buld" filter="s60" long-name="Music Fetcher Build" introduced="^4" class="placeholder">
-<!-- <unit bldFile="musicfetcher" qt:proFile="musicfetcher.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-</collection>
-<collection name="musicplayer_app " long-name="Music Player Application" level="app">
-<!-- collection is really a component, move down a directory -->
-<component name="musicplayer_app_build" filter="s60" long-name="Music Player Application Build" introduced="^4" class="placeholder">
-<!-- <unit bldFile="app" qt:proFile="app.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-</collection>
-<collection name="mpviewplugins " long-name="Music Player View Plugins" level="plugins">
-<component name="mpcollectionviewplugin" filter="s60" long-name="MP Collection View Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpviewplugins/mpcollectionviewplugin/group"/>-->
-</component>
-<component name="mpplaybackviewplugin" filter="s60" long-name="MP Playback View Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpviewplugins/mpplaybackviewplugin/group"/>-->
-</component>
-</collection>
-<collection name="mpserviceplugins" long-name="Music Player Service Plugins" level="plugins">
-<component name="audioeffects" filter="s60" long-name="Audio Effects" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/audioeffects/group"/>-->
-</component>
-<component name="localaudio" filter="s60" long-name="Local Audio" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/localaudio/group"/>-->
-</component>
-<!-- Note: it's called SQLite, not SQLLite, just the one "L" -->
-<component name="mpxsqlitedbcommon" filter="s60" long-name="MPX SQLite Database Common" introduced="^4" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitedbcommon/group"/>-->
-</component>
-<component name="mpxsqlitedbplugin" filter="s60" long-name="MPX SQLite Database Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitedbplugin/group"/>-->
-</component>
-<component name="mpxsqlitepodcastdbplugin" filter="s60" long-name="MPX SQLlite Podcast Database Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
-</component>
-<component name="m3uplaylistplugin" filter="s60" long-name="M3U Playlist Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
-</component>
-</collection>
-<collection name="musicplayer_info" long-name="Music Player Apps Info" level="app">
-<component name="musicplayer_build" filter="s60" long-name="Music Player Build">
-<!-- should brak up into individual components -->
-<unit bldFile="app/musicplayer" proFile="qtmusicplayer.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-</block>
-<block name="radio" level="apps" long-name="Radio Apps" levels="engine ui">
-<collection name="radioengine" long-name="Radio Engine" level="engine">
-<component name="radioengineutils" filter="s60" long-name="Radio Engine Utils" introduced="^4">
-<unit bldFile="app/radio/radioengine/utils/group"/>
-</component>
-<component name="radioenginesettings" filter="s60" long-name="Radio Engine Settings" introduced="^4">
-<unit bldFile="app/radio/radioengine/settings/group"/>
-</component>
-<component name="radioengine_engine" filter="s60" long-name="Radio Engine" introduced="^4">
-<unit bldFile="app/radio/radioengine/engine/group"/>
-</component>
-</collection>
-<collection name="radioapp" long-name="Radio App" level="ui">
-<component name="radioenginewrapper" filter="s60" long-name="Radio Engine Wrapper" introduced="^4">
-<unit bldFile="app/radio/radioapp/radioenginewrapper" proFile="radioenginewrapper.pro"/>
-</component>
-<component name="radiopresetstorage" filter="s60" long-name="Radio Preset Storage" introduced="^4">
-<unit bldFile="app/radio/radioapp/radiopresetstorage" proFile="radiopresetstorage.pro"/>
-</component>
-<component name="radiouiengine" filter="s60" long-name="Radio UI Engine" introduced="^4">
-<unit bldFile="app/radio/radioapp/radiouiengine" proFile="radiouiengine.pro"/>
-</component>
-<component name="radiowidgets" filter="s60" long-name="Radio Widgets" introduced="^4">
-<unit bldFile="app/radio/radioapp/radiowidgets" proFile="radiowidgets.pro"/>
-</component>
-<component name="radioapplication" filter="s60" long-name="Radio Application" introduced="^4">
-<unit bldFile="app/radio/radioapp/radioapplication" proFile="radioapplication.pro"/>
-</component>
-<component name="radio_rom" filter="s60" long-name="Radio ROM" introduced="^4">
-<unit bldFile="app/radio/rom"/>
-</component>
-</collection>
-</block>
-<block name="internetradio" level="apps" long-name="Internet Radio Apps" levels="engine server ui">
-<collection name="internetradio2_0" long-name="Internet Radio 2.0" level="ui">
-<!-- collection is really a component. Move down a dir -->
-<component name="internetradio2_0_build" long-name="Internet Radio 2.0 Build">
-<unit bldFile="app/internetradio/internetradio2.0/group"/>
-</component>
-</collection>
-<collection name="presetserver" long-name="Preset Server" level="server">
-<!-- collection is really a component. Move down a dir -->
-<component name="presetserver_build" long-name="Preset Server Build">
-<unit bldFile="app/internetradio/presetserver/group"/>
-</component>
-</collection>
-<collection name="qtinternetradio" long-name="Qt Internet Radio">
-<component name="qtinternetradio_build" long-name="Qt Internet Radio Build">
-<!-- Move down a dir or break into components-->
-<unit bldFile="app/internetradio/qtinternetradio" proFile="all.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-</block>
-<block name="homescreen" level="apps" long-name="Home Screen Apps" levels="support task ss hs">
-<collection name="homescreen_info" long-name="Home Screen Info" level="support">
-<component name="homescreen_build" long-name="Homescreen Build">
-<!-- break this up properly into components -->
-<unit bldFile="app/homescreen" proFile="homescreen.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-<collection name="homescreen_test" long-name="Home Screen Test" level="support"/>
-<!-- fiill in details with broken up homescreen_build -->
-<collection name="homescreenapp" long-name="Home Screen Application" level="hs">
-<component name="hsutils" long-name="Home Screen Utils" introduced="^4"/>
-<component name="hsdomainmodel" long-name="HS Domain Model" introduced="^4"/>
-<component name="hs_runtimeplugins" long-name="HS Runtime Plugins" introduced="^4" plugin="Y"/>
-<component name="hs_serviceproviders" long-name="HS Service Providers" introduced="^4" plugin="Y"/>
-<component name="hs_stateplugins" long-name="HS State Plugins" introduced="^4" plugin="Y"/>
-<component name="hs_widgetplugins" long-name="HS Widget Plugins" introduced="^4" plugin="Y"/>
-<component name="hsapplication" long-name="Home Screen Application" introduced="^4"/>
-<component name="hshomescreenclientplugin" long-name="Home Screen Client Plugin" introduced="^4" plugin="Y"/>
-<component name="hsmenucontentpublish" long-name="HS Menu Content Publish" introduced="^4"/>
-</collection>
-<collection name="screensaverapp" long-name="Screen Saver Application" level="ss">
-<component name="snsrutils" long-name="Screen Saver Utils" introduced="^4"/>
-<component name="snsr_serviceproviders" long-name="Screen Saver Service Providers" introduced="^4" plugin="Y"/>
-<component name="snsr_stateproviders" long-name="Screen Saver State Providers" introduced="^4" plugin="Y"/>
-<component name="snsr_runtimeproviders" long-name="Screen Saver Runtime Providers" introduced="^4" plugin="Y"/>
-<component name="snsrapplication" long-name="Screen Saver Application" introduced="^4"/>
-<component name="screensaverproviders" long-name="Screen Saver Providers" introduced="^4" plugin="Y"/>
-</collection>
-<collection name="taskswitcherapp" long-name="Task Switcher Application" level="task">
-<component name="taskswitcherappecom" long-name="Task Switcher Application ECom" introduced="^4"/>
-<component name="tsserviceplugin" long-name="Task Switcher Service Plugin" introduced="^4" plugin="Y"/>
-<component name="ts_runtimeplugins" long-name="TS Runtime Plugins" introduced="^4" plugin="Y"/>
-<component name="tsapplication" long-name="Task Switcher Application" introduced="^4"/>
-</collection>
-</block>
-<block name="homescreentools" level="services" long-name="Home Screen Tools" levels="tool install">
-<collection name="dtdinstaller" long-name="DTD Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<!-- this needs to be built first, does build order need to be forced with filters? -->
-<component name="dtdinstaller_build" filter="s60,bldmefirst" long-name="DTD Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/dtdinstaller/group"/>
-</component>
-</collection>
-<collection name="themeinstaller" long-name="Theme Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="themeinstaller_build" filter="s60" long-name="Theme Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/themeinstaller/group"/>
-</component>
-</collection>
-<collection name="widgettools" long-name="Widget Tools" level="install">
-<component name="hspluginpreinstaller" filter="s60" long-name="HS Plugin Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/hspluginspreinstaller/group"/>
-</component>
-<component name="wrtwidgetpreinstaller" filter="s60" long-name="WRT Widget Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
-</component>
-</collection>
-</block>
-<block name="jrt" level="services" long-name="Java Runtime" levels="util generic rt ui">
-<collection name="jrt_plat" long-name="JRT Platform Interfaces" level="ui">
-<component name="java_registry_api" long-name="Java Registry API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_registry_api/build"/>
-</component>
-<component name="java_env_info_api" long-name="Java Environment Info API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_env_info_api/build"/>
-</component>
-<component name="java_debug_api" long-name="Java Debug API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_debug_api/build"/>
-</component>
-</collection>
-<collection name="java_stubs" long-name="Java Stubs" level="util">
-<!-- uncomment all components when configuration is in place. Currently #included from jrt_build -->
-<component name="javadrmutils" long-name="Java DRM Utils" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtdrmutils/group"/>-->
-</component>
-<component name="javaenvinfo" long-name="Java Environment Info" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtenvinfo/group"/>-->
-</component>
-<component name="javaregistry" filter="s60,sf_build" long-name="Java Registry" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtregistry/clientserver/client/group"/>-->
-</component>
-<component name="java_stubs_build" filter="s60,sf_build" long-name="Java Stubs ROM" class="placeholder">
-<!-- Remove the #includes and rename JRT ROM-->
-<!--<unit bldFile="java_stubs/group"/>-->
-</component>
-</collection>
-<collection name="jrt_info" long-name="JRT Info" level="rt">
-<component name="jrt_build" filter="s60" long-name="JRT Build">
-<!-- needed for __JAVA_STUBS condition -->
-<unit bldFile="app/jrt/group"/>
-</component>
-</collection>
-</block>
-<block name="conntools" level="services" long-name="Connectivity Tools" levels="config app">
-<collection name="nettools" long-name="Net Tools" level="app">
-<component name="conntest" filter="s60" long-name="Connection Test" purpose="development">
-<unit bldFile="app/conntools/nettools/conntest/group"/>
-</component>
-</collection>
-<collection name="emulatorlan" long-name="Emulator LAN" level="config">
-<!-- component is actually a colleciton, should be moved down a directory -->
-<component name="emulatorlan_build" filter="s60" long-name="Emulator LAN Build" purpose="development" class="config">
-<unit bldFile="app/conntools/emulatorlan/group"/>
-</component>
-</collection>
-</block>
-<block name="rndtools" level="services" long-name="R&D tools" levels="support generic test util">
-<collection name="creator" long-name="Creator" level="support">
-<!-- collection is really a component. Should move down a directory -->
-<component name="creator_build" filter="s60" long-name="Creator Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/creator/group"/>
-</component>
-</collection>
-<collection name="filebrowser" long-name="File Browser" level="util">
-<!-- consider collapsing into a single component -->
-<component name="fileopserver" filter="s60" long-name="File Operations Server" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
-</component>
-<component name="fileopclient" filter="s60" long-name="File Operations Client" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!--<unit bldFile="filebrowser/fileopclient/group"/>-->
-</component>
-<component name="filebrowser_build" filter="s60" long-name="File Browser Application" purpose="development" class="tool">
-<!-- Need to make this a self-contained component by removing #includes. Can only do when configuration is in place-->
-<unit bldFile="app/rndtools/filebrowser/group"/>
-</component>
-</collection>
-<collection name="launcher" long-name="Launcher" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="launcher_build" filter="s60" long-name="Launcher Utility" purpose="development" class="tool">
-<unit bldFile="app/rndtools/launcher/group"/>
-</component>
-</collection>
-<collection name="loadgen" long-name="Load Generator" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="loadgen_build" filter="s60" long-name="Load Generator Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/loadgen/group"/>
-</component>
-</collection>
-<collection name="perfmon" long-name="Performance Monitor" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="perfmon_build" filter="s60" long-name="Performance Monitor Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/perfmon/group"/>
-</component>
-</collection>
-<collection name="screengrabber" long-name="Screen Grabber" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="screengrabber_build" filter="s60" long-name="ScreenGrabber" purpose="development" class="tool">
-<unit bldFile="app/rndtools/screengrabber/group"/>
-</component>
-</collection>
-<collection name="stifui" long-name="STIF UI" level="generic">
-<component name="stifui_stifui" filter="s60" long-name="STIF UI" purpose="development">
-<unit bldFile="app/rndtools/stifui/stifui/group"/>
-</component>
-<component name="uitestserverstarter" filter="s60" long-name="UI Test Server Starter" purpose="development">
-<unit bldFile="app/rndtools/stifui/uitestserverstarter/group"/>
-</component>
-<component name="stifui_build" filter="s60" long-name="STIF UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/stifui/group"/>
-</component>
-</collection>
-<collection name="memspyui" long-name="Memspy UI" level="generic">
-<!-- collection is really a component. Should move down a directory -->
-<component name="memspyui_build" filter="s60" long-name="Memspy UI Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/memspyui/group"/>
-</component>
-</collection>
-<collection name="htiui" long-name="Harmonized Test Interface UI" level="generic">
-<component name="HtiServicePlugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- can only have a single unit. Should #include from a common bld.inf file -->
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiFtpBackupFake/group"/>
-</component>
-<component name="htidevicereboot" filter="s60" long-name="HTI Device Reboot" purpose="development">
-<unit bldFile="app/rndtools/htiui/htidevicereboot/group"/>
-</component>
-<component name="htistartupwait" filter="s60" long-name="HTI Startup Wait" purpose="development">
-<unit bldFile="app/rndtools/htiui/htistartupwait/group"/>
-</component>
-<component name="htiadmin" filter="s60" long-name="HTI Admin" purpose="development">
-<unit bldFile="app/rndtools/htiui/htiadmin/group"/>
-</component>
-<component name="htiui_build" filter="s60" long-name="HTI UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/htiui/group"/>
-</component>
-</collection>
-</block>
-<block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools if ui">
-<collection name="userguide" long-name="User Guide" level="if">
-<!-- collection is really a component. Move down a directory -->
-<component name="userguide_build" long-name="User Guide Build" filter="s60" introduced="^4">
-<unit bldFile="app/helps/userguide" proFile="Userguide.pro"/>
-</component>
-</collection>
-<collection name="symhelp" long-name="Symbian Help" level="eng">
-<component name="helpmodel" long-name="Help" introduced="6.0" purpose="optional">
-<unit bldFile="app/helps/symhelp/helpmodel/group" mrp="app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
-</component>
-</collection>
-<collection name="helps_info" long-name="Help Apps Info" level="ui">
-<component name="helps_metadata" long-name="Help Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/helps/helps_info/helps_metadata/helps_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
-<collection name="buildverification" long-name="Build Verification" level="services">
-<component name="autosmoketest" long-name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
-<unit bldFile="app/techview/buildverification/autosmoketest/Group" mrp="app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
-</component>
-<component name="smoketest" long-name="Smoke Test" filter="gt" purpose="development">
-<unit bldFile="app/techview/buildverification/smoketest/Group" mrp="app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
-</component>
-</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="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"/>
-<collection name="installationapps" long-name="Installation Apps" level="apps2"/>
-<collection name="messagingapps" long-name="Messaging Apps" level="apps2"/>
-<collection name="telephonyapps" long-name="Telephony Apps" level="apps1"/>
-<collection name="networkingapps" long-name="Networking Apps" level="apps1"/>
-<collection name="networkingutils" long-name="Networking Utils" level="utils"/>
-<collection name="shortlinkapps" long-name="Shortlink Apps" level="apps1"/>
-<collection name="testapps" long-name="Test Apps" level="utils"/>
-<collection name="avapps" long-name="A/V Apps" level="apps3"/>
-<collection name="toolkit" long-name="Toolkit" level="utils"/>
-<collection name="techview_info" long-name="Techview Info" level="apps3">
-<component name="techview_metadata" long-name="Techview Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/techview/techview_info/techview_metadata/techview_metadata.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
--- a/symbian4/single/sysdefs/auto/model_20100423114932_fde6a3ade6cf.xml Wed May 05 12:21:47 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8957 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a package or prebuilt -->
-<!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) "N"
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile may someday be removed in favour of mrp -->
-<!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="low mw high">
-<block name="stubs" level="high" span="2" long-name="Stubs" levels="adaptation plugin mid engine">
-<collection name="audiostubs" long-name="Audio Stubs" level="adaptation">
-<component name="devsoundextensions_stubs" long-name="Devsound Extensions Stubs">
-<unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/group"/>
-</component>
-<component name="fmradiotunercontrolstub" long-name="FM Radio Tuner Control Stub">
-<unit bldFile="adaptation/stubs/audiostubs/fmradiotunercontrolstub/group"/>
-</component>
-</collection>
-<collection name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaptation Stub" level="adaptation">
-<component name="btaudioadaptation_stub_build" long-name="Bluetooth Audio Adaptation Stub Build" filter="oem_build">
-<unit bldFile="adaptation/stubs/btaudioadaptation_stub/group"/>
-</component>
-</collection>
-<collection name="drm_stubs" long-name="DRM Stubs" level="plugin">
-<component name="drm_stubs_build" long-name="DRM Stubs Build">
-<unit bldFile="adaptation/stubs/drm_stubs/group"/>
-</component>
-</collection>
-<collection name="ocrsrv_stub" long-name="OCR Services Stub" level="mid">
-<component name="ocrsrv_stub_build" long-name="OCR Services Stub Build" filter="!dfs_build">
-<unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
-</component>
-</collection>
-<collection name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
-<component name="omasuplasnconverterstubimpl_build" long-name="OMA SUPL ASN Converter Stub Implementation Build" filter="!dfs_build">
-<unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
-</component>
-</collection>
-<collection name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" level="plugin">
-<component name="posmsgpluginreferenceimpl_build" long-name="POS Message Plugin Reference Implementation Build" plugin="Y">
-<unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
-</component>
-</collection>
-<collection name="srsfenginestub" long-name="SRSF Engine Stub" level="engine">
-<component name="srsfenginestub_build" long-name="SRSF Engine Stub Build" filter="stubs">
-<unit bldFile="adaptation/stubs/srsfenginestub/group"/>
-</component>
-</collection>
-<collection name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub" level="plugin">
-<component name="power_save_display_mode_stub_build" long-name="Power Save Display Mode Stub Build">
-<unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
-</component>
-</collection>
-<collection name="systemswstubs" long-name="System Software Stubs" level="adaptation">
-<component name="ddcaccessstub" long-name="DDC Access Stub">
-<unit bldFile="adaptation/stubs/systemswstubs/ddcaccessstub/group"/>
-</component>
-<component name="tvoutconfig" long-name="TV Out Config">
-<unit bldFile="adaptation/stubs/systemswstubs/TVOutConfig/group" filter="oem_build"/>
-</component>
-<component name="accessorypolicyreference" long-name="Accessory Policy Reference">
-<unit bldFile="adaptation/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
-</component>
-<component name="asyreference" long-name="ASY Reference" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
-</component>
-<component name="examplecommonisc" long-name="Example Common ISC">
-<unit bldFile="adaptation/stubs/systemswstubs/examplecommonisc/group" filter="oem_build"/>
-</component>
-<component name="exampledsy" long-name="Example DSY">
-<unit bldFile="adaptation/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
-</component>
-<component name="featuremanagerstub" long-name="Feature Manager Stub">
-<unit bldFile="adaptation/stubs/systemswstubs/featuremanagerstub/group" filter="oem_build"/>
-</component>
-<component name="hwrmstubplugins" long-name="Hardware Resource Manager Stub Plugins" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
-</component>
-<component name="hwrmhapticsstubplugin" long-name="Hardware Resource Manager Haptics Stub Plugin" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
-</component>
-<component name="sensorchannelsreference" long-name="Sensor Channels Reference">
-<unit bldFile="adaptation/stubs/systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
-</component>
-<component name="ssyreference" long-name="SSY Reference" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
-</component>
-<component name="startupadaptationstub" long-name="Startup Adaptation Stub" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/startupadaptationstub/group" filter="oem_build"/>
-</component>
-<component name="tiltcompensationstub" long-name="Tilt Compensation Stub">
-<unit bldFile="adaptation/stubs/systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
-</component>
-<component name="tvoutbehaviour" long-name="TV Out Behaviour">
-<unit bldFile="adaptation/stubs/systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
-</component>
-<component name="wiredbearerreference" long-name="Wired Bearer Reference" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
-</component>
-</collection>
-<collection name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" level="engine">
-<component name="tactileclickplugin_stub_build" long-name="Tactile Click Plugin Stub Build" plugin="Y">
-<unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
-</component>
-</collection>
-<collection name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub" level="mid">
-<component name="wlanhwinit_stub_build" long-name="WLAN Hardware Init Stub Build">
-<unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
-<collection name="omap3530" long-name="OMAP 3530" level="hw-if">
-<component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530" mrp="adaptation/beagleboard/omap3530/base_beagle.mrp"/>
-</component>
-<component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/kernel"/>
-</component>
-<component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/beagleboard"/>
-</component>
-</collection>
-</block>
-<block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
-<collection name="qemu_baseport" long-name="Baseport" level="hw-if">
-<component name="syborg" long-name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/qemu/baseport/syborg" mrp="adaptation/qemu/baseport/syborg/syborg.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
-<collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
-<component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
-<unit bldFile="os/kernelhwsrv/brdbootldr/ubootldr" mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
-</component>
-</collection>
-<collection name="bsptemplate" long-name="Board Support Package Template" level="hw-if">
-<component name="asspandvariant" long-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 name="kernel" long-name="Kernel Architecture" level="adaptation">
-<component name="eka" long-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 name="kerneltest" long-name="Kernel Test" level="hw-if">
-<component name="e32utils" long-name="E32 Utilities" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32utils/group" mrp="os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/>
-</component>
-<component name="e32test" long-name="E32 Tests" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32test/group" mrp="os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
-</component>
-<component name="f32test" long-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 name="ldds" long-name="Logical Device Drivers" level="adaptation">
-<component name="ethernetldd" long-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 name="audioldd" long-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>
-<component name="serialldd" long-name="Serial Port Drivers" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
-</component>
-<component name="legacydrivers" long-name="Legacy Drivers" purpose="optional">
-<unit mrp="os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
-</component>
-<component name="locmedia" long-name="Local Media Subsystem" introduced="8.1b" purpose="mandatory">
-<!-- these are LDDs for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
-</component>
-<component name="runmodedebugger" long-name="Run Mode Debugger" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/debug/group" mrp="os/kernelhwsrv/kernel/eka/drivers/debug/group/base_e32_drivers_debug.mrp"/>
-</component>
-<component name="btrace" long-name="Kernel Trace Tool" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/trace" mrp="os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
-</component>
-<component name="cameraldd" long-name="Camera Drivers" introduced="^3" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/camerasc" mrp="os/kernelhwsrv/kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
-</component>
-<component name="displayldd" long-name="Display Drivers" introduced="^3" purpose="optional">
-<!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/display" mrp="os/kernelhwsrv/kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
-</component>
-<component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
-</component>
-</collection>
-<collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
-<component name="mediadrivers" long-name="Media Drivers" purpose="optional">
-<!-- these are for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/media" mrp="os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
-</component>
-<component name="genericboardsupport" long-name="Generic Board Support" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
-</component>
-</collection>
-<collection name="userlibandfileserver" long-name="User Library and File Server" level="framework">
-<component name="euser" long-name="User Library" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/euser" mrp="os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
-</component>
-<component name="compsupp" long-name="Compiler Runtime Support" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/compsupp" mrp="os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
-</component>
-<component name="fileserver" long-name="File Server" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
-</component>
-<component name="estart" long-name="Base Starter" filter="gt" purpose="optional">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
-</component>
-<component name="domainmgr" long-name="Domain Manager" introduced="8.1b" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
-</component>
-</collection>
-<collection name="filesystems" long-name="File Systems" level="framework">
-<component name="romfs" long-name="ROM File System" filter="gt" purpose="optional" plugin="Y">
-<unit mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
-</component>
-<component name="rofs" long-name="ROFS" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
-</component>
-<component name="usbmsfs" long-name="USB Mass Storage File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
-</component>
-<component name="usbhostmssrv" long-name="USB Host Mass Storage Server" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage/base_f32_shostmassstorage.mrp"/>
-</component>
-<component name="fat32fs" long-name="FAT32 File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
-</component>
-<component name="fatfs" long-name="FAT File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
-</component>
-<component name="compfs" long-name="Composite File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
-</component>
-</collection>
-<collection name="halservices" long-name="HAL Services" level="framework">
-<component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
-<unit bldFile="os/kernelhwsrv/halservices/hal" mrp="os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
-</component>
-</collection>
-<collection name="textmodeshell" long-name="Text Mode Shell" level="test">
-<component name="e32wsrv" long-name="Text Window Server" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/ewsrv" mrp="os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
-</component>
-<component name="textshell" long-name="Text Shell" filter="gt" purpose="development">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
-</component>
-</collection>
-<collection name="baseapitest" long-name="Base API Tests" level="test"/>
-<collection name="kernelhwsrv_info" long-name="Kernel and Hardware Services Info" level="test">
-<component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 config">
-<collection name="emulator" long-name="Emulator" level="bsp">
-<component name="emulatorbsp" long-name="Emulator BSP" purpose="optional">
-<unit bldFile="os/boardsupport/emulator/emulatorbsp" mrp="os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
-</component>
-</collection>
-<collection name="haitest" long-name="HAI Test Suites" level="test">
-<component name="bspsvs" long-name="BSP Verification Suite" introduced="^2" purpose="development">
-<unit mrp="os/boardsupport/haitest/bspsvs/group/bspsvs.mrp"/>
-</component>
-</collection>
-<collection name="boardsupport_info" long-name="Board Support Info" level="config">
-<component name="boardsupport_metadata" long-name="Board Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/boardsupport/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
-<collection name="bldsystemtools" long-name="Build System Tools" level="bld">
-<component name="sysdeftools" long-name="System Definition Tools" purpose="development" introduced="^2">
-<unit mrp="os/buildtools/bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
-</component>
-<component name="commonbldutils" long-name="Common Utils" purpose="development">
-<unit mrp="os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
-</component>
-</collection>
-<collection name="toolsandutils" long-name="Tools and Utils" level="mw">
-<component name="productionbldtools" long-name="Production Build Tools" filter="gt" purpose="development">
-<unit mrp="os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
-</component>
-<component name="e32tools" long-name="E32 Tools" deprecated="^2" purpose="development" class="PC">
-<unit bldFile="os/buildtools/toolsandutils/e32tools/group" mrp="os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
-</component>
-<component name="autotest" long-name="Autotest" purpose="development">
-<unit bldFile="os/buildtools/toolsandutils/autotest/group" mrp="os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
-</component>
-</collection>
-<collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
-<component name="e32toolp" long-name="E32 Perl Tools" purpose="development" filter="sf_build" class="PC">
-<unit mrp="os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="os/buildtools/sbsv1_os/e32toolp/group"/>
-</component>
-</collection>
-<collection name="imgtools_os" long-name="Image Tools" level="fw">
-<component name="romkiteka2" long-name="ROMKIT EKA2" deprecated="^2" purpose="development">
-<unit bldFile="os/buildtools/imgtools_os/romkiteka2/group" mrp="os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
-</component>
-</collection>
-<collection name="misccomponents" long-name="Misc Components" level="mw">
-<component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt" purpose="development">
-<unit bldFile="os/buildtools/misccomponents/emulatorlauncher/group" mrp="os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
-</component>
-</collection>
-<collection name="buildtools_info" long-name="Build Tools Info" level="ui">
-<component name="buildtools_metadata" long-name="Build Tools Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/buildtools/buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
-<collection name="ossrv_pub" long-name="Generic OS Services Public Interfaces" level="utilities">
-<component name="boost_apis" long-name="Boost APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/boost_apis/group"/>
-</component>
-<component name="cpp_wrappers" long-name="Cpp wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cpp_wrappers/group"/>
-</component>
-<component name="character_type_apis" long-name="Character Type APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/character_type_apis/group"/>
-</component>
-<component name="compiler_specific_runtime_support" long-name="Compiler Specific Runtime Support" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/compiler_specific_runtime_support/group"/>
-</component>
-<component name="ossrv_configuration_api" long-name="Generic OS Services Configuration API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/configuration/group"/>
-</component>
-<component name="crypto_authentication_codes_and_hash_functions_api" long-name="Crypto Authentication Codes and Hash Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
-</component>
-<component name="crypto_auxillary_functions_api" long-name="Crypto Auxillary Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_auxillary_functions_api/group"/>
-</component>
-<component name="crypto_certificates_api" long-name="Crypto Certificates API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_certificates_api/group"/>
-</component>
-<component name="crypto_inputoutput_and_data_encoding_api" long-name="Crypto Input/Output and Data Encoding API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
-</component>
-<component name="crypto_public_key_cryptography_and_key_agreement_api" long-name="Crypto Public Key Cryptography and Key Agreement API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
-</component>
-<component name="crypto_symmetric_ciphers_api" long-name="Crypto Symmetric Ciphers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_symmetric_ciphers_api/group"/>
-</component>
-<component name="crypto_utility_functions_api" long-name="Crypto Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_utility_functions_api/group"/>
-</component>
-<component name="cryptogaphy_related_api" long-name="Cryptogaphy Related API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cryptogaphy_related_api/group"/>
-</component>
-<component name="ossrv_debug_api" long-name="Generic OS Services Debug API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/debug/group"/>
-</component>
-<component name="ossrv_exceptions_api" long-name="Generic OS Services Exceptions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/exceptions/group"/>
-</component>
-<component name="gboxed" long-name="GBoxed API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gboxed/group"/>
-</component>
-<component name="glib_arrays" long-name="Glib Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_arrays/group"/>
-</component>
-<component name="glib_asynchronous_queues" long-name="Glib Asynchronous Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_asynchronous_queues/group"/>
-</component>
-<component name="glib_atomic_operations" long-name="Glib Atomic Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_atomic_operations/group"/>
-</component>
-<component name="glib_automatic_string_completion" long-name="Glib Automatic String Completion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_automatic_string_completion/group"/>
-</component>
-<component name="glib_balanced_binary_trees" long-name="Glib Balanced Binary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_balanced_binary_trees/group"/>
-</component>
-<component name="glib_basic_types" long-name="Glib Basic Types API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_basic_types/group"/>
-</component>
-<component name="glib_caches" long-name="Glib Caches API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_caches/group"/>
-</component>
-<component name="glib_character_set_conversion" long-name="Glib Character Set Conversion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_character_set_conversion/group"/>
-</component>
-<component name="glib_closures" long-name="Glib Closures API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_closures/group"/>
-</component>
-<component name="glib_commandline_option_parser" long-name="Glib Command Line Option Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_commandline_option_parser/group"/>
-</component>
-<component name="glib_datasets" long-name="Glib Datasets API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_datasets/group"/>
-</component>
-<component name="glib_date_and_time_functions" long-name="Glib Date and Time Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_date_and_time_functions/group"/>
-</component>
-<component name="glib_doubleended_queues" long-name="Glib Double-ended Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doubleended_queues/group"/>
-</component>
-<component name="glib_doublylinked_lists" long-name="Glib Doubly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doublylinked_lists/group"/>
-</component>
-<component name="glib_dynamic_loading_of_modules" long-name="Glib Dynamic Loading of Modules API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_dynamic_loading_of_modules/group"/>
-</component>
-<component name="glib_enums_and_flags" long-name="Glib Enums and Flags API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_enums_and_flags/group"/>
-</component>
-<component name="glib_error_reporting" long-name="Glib Error Reporting API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_error_reporting/group"/>
-</component>
-<component name="glib_file_utilities" long-name="Glib File Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_file_utilities/group"/>
-</component>
-<component name="glib_generic_values" long-name="Glib Generic Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_generic_values/group"/>
-</component>
-<component name="glib_globstyle_pattern_matching" long-name="Glib Glob-Style Pattern Matching API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_globstyle_pattern_matching/group"/>
-</component>
-<component name="glib_hash_tables" long-name="Glib Hash Tables API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hash_tables/group"/>
-</component>
-<component name="glib_hook_functions" long-name="Glib Hook Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hook_functions/group"/>
-</component>
-<component name="glib_internationalization" long-name="Glib Internationalization API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_internationalization/group"/>
-</component>
-<component name="glib_io_channels" long-name="Glib I/O Channels API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_io_channels/group"/>
-</component>
-<component name="glib_keyvalue_file_parser" long-name="Glib Key-Value File Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_keyvalue_file_parser/group"/>
-</component>
-<component name="glib_lexical_scanner" long-name="Glib Lexical Scanner API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_lexical_scanner/group"/>
-</component>
-<component name="glib_main_event_loop" long-name="Glib Main Event Loop API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_main_event_loop/group"/>
-</component>
-<component name="glib_memory_allocation" long-name="Glib Memory Allocation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_allocation/group"/>
-</component>
-<component name="glib_memory_slices" long-name="Glib Memory Slices API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_slices/group"/>
-</component>
-<component name="glib_message_logging" long-name="Glib Message Logging API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_message_logging/group"/>
-</component>
-<component name="glib_miscellaneous_utility_functions" long-name="Glib Miscellaneous Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_miscellaneous_utility_functions/group"/>
-</component>
-<component name="glib_nary_trees" long-name="Glib N-ary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_nary_trees/group"/>
-</component>
-<component name="glib_parameters_and_values" long-name="Glib Parameters and Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_parameters_and_values/group"/>
-</component>
-<component name="glib_quarks" long-name="Glib Quarks API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_quarks/group"/>
-</component>
-<component name="glib_random_numbers" long-name="Glib Random Numbers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_random_numbers/group"/>
-</component>
-<component name="glib_relations_and_tuples" long-name="Glib Relations and Tuples API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_relations_and_tuples/group"/>
-</component>
-<component name="glib_shellrelated_utilities" long-name="Glib Shell-related Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_shellrelated_utilities/group"/>
-</component>
-<component name="glib_signals" long-name="Glib Signals API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_signals/group"/>
-</component>
-<component name="glib_simple_xml_subset_parser" long-name="Glib Simple XML Subset Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_simple_xml_subset_parser/group"/>
-</component>
-<component name="glib_singlylinked_lists" long-name="Glib Singly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_singlylinked_lists/group"/>
-</component>
-<component name="glib_spawning_processes" long-name="Glib Spawning Processes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_spawning_processes/group"/>
-</component>
-<component name="glib_standard_macros" long-name="Glib Standard Macros API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_standard_macros/group"/>
-</component>
-<component name="glib_string_utility_functions" long-name="Glib String Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_string_utility_functions/group"/>
-</component>
-<component name="glib_strings" long-name="Glib Strings API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_strings/group"/>
-</component>
-<component name="glib_thread_pools" long-name="Glib Thread Pools API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_thread_pools/group"/>
-</component>
-<component name="glib_threads" long-name="Glib Threads API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_threads/group"/>
-</component>
-<component name="glib_timers" long-name="Glib Timers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_timers/group"/>
-</component>
-<component name="glib_unicode_manipulation" long-name="Glib Unicode Manipulation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_unicode_manipulation/group"/>
-</component>
-<component name="glib_value_arrays" long-name="Glib Value Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_value_arrays/group"/>
-</component>
-<component name="glib_varargs_value_collection" long-name="Glib Varargs Value Collection API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_varargs_value_collection/group"/>
-</component>
-<component name="gobject" long-name="GObject API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gobject/group"/>
-</component>
-<component name="gparamspec" long-name="GParamSpec API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gparamspec/group"/>
-</component>
-<component name="gtype" long-name="GType API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtype/group"/>
-</component>
-<component name="gtypemodule" long-name="GTypeModule API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypemodule/group"/>
-</component>
-<component name="gtypeplugin" long-name="GTypePlugin API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypeplugin/group"/>
-</component>
-<component name="io_stream_api" long-name="I/O stream API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/io_stream_api/group"/>
-</component>
-<component name="localization_function_api" long-name="Localization Function API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/localization_function_api/group"/>
-</component>
-<component name="math_operations_api" long-name="Math Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/math_operations_api/group"/>
-</component>
-<component name="ossrv_memory_api" long-name="Generic OS Services Memory API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/memory/group"/>
-</component>
-<component name="no_namespace_headers" long-name="No Namespace Headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/no_namespace_headers/group"/>
-</component>
-<component name="openc_headers" long-name="OpenC headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_headers/group"/>
-</component>
-<component name="openc_wrappers" long-name="OpenC wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_wrappers/group"/>
-</component>
-<component name="ssl_general_api" long-name="SSL General API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_general_api/group"/>
-</component>
-<component name="ssl_protocol_methods_api" long-name="SSL Protocol Methods API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_protocol_methods_api/group"/>
-</component>
-<component name="standard_compressiondecompression_api" long-name="Standard Compression/Decompression API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/standard_compressiondecompression_api/group"/>
-</component>
-<component name="stl" long-name="STL API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/stl/group"/>
-</component>
-<component name="thread_api" long-name="Thread API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/thread_api/group"/>
-</component>
-<component name="type_attributes" long-name="Type Attributes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/type_attributes/group"/>
-</component>
-<component name="typeinfo" long-name="Type Info API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/typeinfo/group"/>
-</component>
-<component name="utility_apis" long-name="Utility APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/utility_apis/group"/>
-</component>
-<component name="wide_character_classapis" long-name="Wide character class/apis" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/wide_character_classapis/group"/>
-</component>
-<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">
-<unit bldFile="os/ossrv/ossrv_pub/dbus-glib/group"/>
-</component>
-</collection>
-<collection name="ossrv_plat" long-name="Generic OS Services Platform Interfaces" level="utilities">
-<component name="libutils_apis" long-name="Utility Library APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_plat/libutils/group"/>
-</component>
-</collection>
-<collection name="stdlibs" long-name="Standard Libraries" level="translation">
-<component name="libz" filter="s60" long-name="Z Compression Library">
-<unit bldFile="os/ossrv/stdlibs/libz/group"/>
-</component>
-<component name="libcrypt" filter="s60" long-name="Crypt Library">
-<unit bldFile="os/ossrv/stdlibs/libcrypt/group"/>
-</component>
-</collection>
-<collection name="ssl" long-name="SSL" level="data-services">
-<component name="libcrypto" filter="s60" long-name="Crypto Library">
-<unit bldFile="os/ossrv/ssl/libcrypto/group"/>
-</component>
-<component name="libssl" filter="s60" purpose="development" long-name="SSL Library">
-<unit bldFile="os/ossrv/ssl/libssl/group"/>
-</component>
-</collection>
-<collection name="glib" long-name="GLib" level="utilities">
-<component name="glibbackend" filter="s60" long-name="GLib Backend">
-<unit bldFile="os/ossrv/glib/build/symbian/glibbackend/group"/>
-<!-- Move to here: <unit bldFile="glib/glibbackend/group"/> -->
-</component>
-<component name="libglib" filter="s60" long-name="GLib Library">
-<unit bldFile="os/ossrv/glib/build/symbian/glib/group"/>
-<!-- Move to here: <unit bldFile="glib/libglib/group"/> -->
-</component>
-<component name="libgthread" filter="s60" long-name="Libg Thread">
-<unit bldFile="os/ossrv/glib/build/symbian/gthread/group"/>
-<!-- Move to here: <unit bldFile="glib/libgthread/group"/> -->
-</component>
-<component name="libgmodule" filter="s60" long-name="Libg Module">
-<unit bldFile="os/ossrv/glib/build/symbian/gmodule/group"/>
-<!-- Move to here: <unit bldFile="glib/libgmodule/group"/> -->
-</component>
-<component name="libgobject" filter="s60" long-name="Libg Object">
-<unit bldFile="os/ossrv/glib/build/symbian/gobject/group"/>
-<!-- Move to here: <unit bldFile="glib/libgobject/group"/> -->
-</component>
-</collection>
-<collection name="stdcpp" long-name="C++ Standard Library" level="translation">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="stdcpp_build" filter="s60" long-name="Stdcpp">
-<unit bldFile="os/ossrv/stdcpp/group"/>
-</component>
-</collection>
-<collection name="ofdbus" long-name="Open Foundation D-Bus" level="utilities">
-<component name="dbus" filter="s60" long-name="D-Bus">
-<unit bldFile="os/ossrv/ofdbus/dbus/group"/>
-</component>
-<component name="dbus-glib" filter="s60" long-name="D-Bus GLib">
-<unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
-</component>
-<component name="ofdbus_rom" filter="s60" long-name="D-Bus ROM">
-<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory
- Consider moving IBY file to one of the above as well and removing this component entirely -->
-<unit bldFile="os/ossrv/ofdbus/group"/>
-</component>
-</collection>
-<collection name="utilitylibraries" long-name="Utility Libraries" level="encoding">
-<component name="libutils" filter="s60" long-name="Utility Library">
-<unit bldFile="os/ossrv/utilitylibraries/libutils/group"/>
-</component>
-</collection>
-<collection name="genericservices" long-name="Generic Services" level="utilities">
-<component name="s60compatibilityheaders" long-name="S60 Compatibility Headers" filter="gt" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp" version="tb101sf"/>
-</component>
-<component name="mimerecognitionfw" long-name="MIME Recognition Framework" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/mimerecognitionfw/group" mrp="os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
-</component>
-<component name="systemagent" long-name="System Agent" introduced="9.0" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/systemagent/group" mrp="os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
-</component>
-<component name="taskscheduler" long-name="Task Scheduler" introduced="6.0" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/taskscheduler/group" mrp="os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
-</component>
-<component name="activebackupclient" long-name="Active Backup Client" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/activebackupclient/group" mrp="os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
-</component>
-<component name="syslibsdocs" long-name="Syslibs Documentation" purpose="development" class="doc">
-<unit mrp="os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
-</component>
-<component name="httputils" long-name="HTTP Utilities Library" introduced="6.2" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/httputils/group" mrp="os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
-</component>
-</collection>
-<collection name="syslibsapitest" long-name="SysLibs API Tests" level="utilities"/>
-<collection name="compressionlibs" long-name="Compression Libraries" level="data-services">
-<component name="ziplib" long-name="Zip Compression Library" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/ossrv/compressionlibs/ziplib/group" mrp="os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
-</component>
-</collection>
-<collection name="genericopenlibs" long-name="Generic Open Libraries" level="translation">
-<component name="cstdlib" long-name="C Standard Library" introduced="ER5" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/cstdlib/group" mrp="os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
-</component>
-<component name="cppstdlib" long-name="C++ Standard Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/cppstdlib/group" mrp="os/ossrv/genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
-</component>
-<component name="openenvcore" long-name="Open Environment Core" introduced="^2" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/openenvcore/group" mrp="os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
-</component>
-<component name="posixrealtimeextensions" long-name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/posixrealtimeextensions/group" mrp="os/ossrv/genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
-</component>
-<component name="liboil" long-name="Liboil" introduced="^4" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/liboil/group" mrp="os/ossrv/genericopenlibs/liboil/group/oeaddons_liboil.mrp"/>
-</component>
-</collection>
-<collection name="lowlevellibsandfws" long-name="Low Level Libraries and Frameworks" level="app-libs">
-<component name="pluginfw" long-name="Plugin Framework" introduced="6.2" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp" version="3"/>
-</component>
-<component name="apputils" long-name="Application Utilities" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/apputils/group" mrp="os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
-</component>
-<component name="genericusabilitylib" long-name="Generic Usability Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/genericusabilitylib/group" mrp="os/ossrv/lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
-</component>
-</collection>
-<collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
-<component name="ossrv_build" filter="s60" long-name="Generic OS Services Build">
-<!-- exports should be moved to individual components -->
-<unit bldFile="os/ossrv/group"/>
-</component>
-<component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="featuremgmt" long-name="Feature Management" level="framework">
-<component name="featuremgr" long-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 name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/persistentdata/featuremgmt/featureregistry/group" mrp="os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
-</component>
-</collection>
-<collection name="loggingservices" long-name="Logging Services" level="server">
-<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">
-<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">
-<unit bldFile="os/persistentdata/loggingservices/rfilelogger/group" mrp="os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
-</component>
-</collection>
-<collection name="traceservices" long-name="Trace Services" level="server">
-<component name="commsdebugutility" long-name="Comms Debug Utility" introduced="7.0s" purpose="optional">
-<unit bldFile="os/persistentdata/traceservices/commsdebugutility/group" mrp="os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
-</component>
-<component name="tracefw" long-name="Trace Framework" introduced="9.2" purpose="development">
-<unit bldFile="os/persistentdata/traceservices/tracefw/ulogger/group" mrp="os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
-</component>
-</collection>
-<collection name="persistentstorage" long-name="Persistent Storage" level="framework">
-<component name="store" long-name="Store" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/store/group" mrp="os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
-</component>
-<component name="dbms" long-name="DBMS" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/dbms/group" mrp="os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
-</component>
-<component name="centralrepository" long-name="Central Repository" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/persistentdata/persistentstorage/centralrepository/group" mrp="os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
-</component>
-<component name="sql" long-name="SQL" introduced="9.3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sql/GROUP" mrp="os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
-</component>
-<component name="sqlite3api" long-name="SQLite 3 API" introduced="^3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sqlite3api/GROUP" mrp="os/persistentdata/persistentstorage/sqlite3api/GROUP/syslibs_sqlite3.mrp"/>
-</component>
-</collection>
-<collection name="persistentdata_info" long-name="Persistent Data Services Info" level="app-if">
-<component name="persistentdata_metadata" long-name="Persistent Data Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/persistentdata/persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
-<component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
-</component>
-<component name="common_platform_security_definitions_api" long-name="Common Platform Security Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group"/>
-</component>
-<component name="feature_discovery_api" long-name="Feature Discovery API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/group"/>
-</component>
-<component name="platform_environment_api" long-name="Platform Environment API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_environment_api/group"/>
-</component>
-<component name="sensor_channel_api" long-name="Sensor Channel API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_channel_api/group"/>
-</component>
-<component name="sensor_definitions_api" long-name="Sensor Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_definitions_api/group"/>
-</component>
-<component name="version_info_api" long-name="Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/group"/>
-</component>
-<component name="accessory_monitoring_api" long-name="Accessory Monitoring API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/group"/>
-</component>
-<component name="haptics_api" long-name="Haptics API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/haptics_api/group"/>
-</component>
-<component name="sensor_data_compensator_api" long-name="Sensor Data Compensator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
-</component>
-</collection>
-<collection name="devicesrv_plat" long-name="Device Services Platform Interfaces" level="app-if">
-<component name="configuration_file_parser_api" long-name="Configuration File Parser API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/configuration_file_parser_api/group"/>
-</component>
-<component name="dos_extension_plugin_api" long-name="DOS Extension Plug-In API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_plugin_api/group"/>
-</component>
-<component name="mediator_command_initiator_api" long-name="Mediator Command Initiator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_initiator_api/group"/>
-</component>
-<component name="syslangutil_api" long-name="SysLangUtil API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/syslangutil_api/group"/>
-</component>
-<component name="wakeup_alarm_api" long-name="Wakeup Alarm API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/wakeup_alarm_api/group"/>
-</component>
-<component name="disk_and_memory_level_keys_api" long-name="Disk and Memory Level Keys API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_and_memory_level_keys_api/group"/>
-</component>
-<component name="mediator_plugin_api" long-name="Mediator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_plugin_api/group"/>
-</component>
-<component name="headset_status_api" long-name="Headset Status API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/headset_status_api/group"/>
-</component>
-<component name="system_startup_extension_plugin_api" long-name="System Startup Extension Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/system_startup_extension_plugin_api/group"/>
-</component>
-<component name="sensor_plugin_api" long-name="Sensor Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_plugin_api/group"/>
-</component>
-<component name="accessory_api" long-name="Accessory API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_api/group"/>
-</component>
-<component name="display_language_definition_api" long-name="Display Language Definition API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/display_language_definition_api/group"/>
-</component>
-<component name="mediator_command_responder_api" long-name="Mediator Command Responder API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_responder_api/group"/>
-</component>
-<component name="accessory_policy_definitions_api" long-name="Accessory Policy Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_definitions_api/group"/>
-</component>
-<component name="hw_settings_api" long-name="Hardware Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/hw_settings_api/group"/>
-</component>
-<component name="mediator_domain_definitions_api" long-name="Mediator Domain Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_domain_definitions_api/group"/>
-</component>
-<component name="sensor_extension_api" long-name="Sensor Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_extension_api/group"/>
-</component>
-<component name="accessory_plugin_api" long-name="Accessory Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_plugin_api/group"/>
-</component>
-<component name="sae_api" long-name="SAE API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sae_api/group"/>
-</component>
-<component name="accessory_control_api" long-name="Accessory Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_control_api/group"/>
-</component>
-<component name="mediator_static_registration_api" long-name="Mediator Static Registration API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_static_registration_api/group"/>
-</component>
-<component name="accessory_key_event_handling_api" long-name="Accessory Key Event Handling API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_key_event_handling_api/group"/>
-</component>
-<component name="mediator_notification_api" long-name="Mediator Notification API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_notification_api/group"/>
-</component>
-<component name="accessory_policy_utility_api" long-name="Accessory Policy Utility API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_utility_api/group"/>
-</component>
-<component name="common_dsy_plugin_api" long-name="Common DSY Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/common_dsy_plugin_api/group"/>
-</component>
-<component name="remote_control_extension_api" long-name="Remote Control Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/remote_control_extension_api/group"/>
-</component>
-<component name="sensor_channel_filter_api" long-name="Sensor Channel Filter API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_channel_filter_api/group"/>
-</component>
-<component name="dos_extension_api" long-name="DOS Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_api/group"/>
-</component>
-<component name="accessory_audio_control_api" long-name="Accessory Audio Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_audio_control_api/group"/>
-</component>
-<component name="mediator_event_consumer_api" long-name="Mediator Event Consumer API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_consumer_api/group"/>
-</component>
-<component name="shared_data_api" long-name="Shared Data API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/shared_data_api/group"/>
-</component>
-<component name="accessory_settings_api" long-name="Accessory Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_settings_api/group"/>
-</component>
-<component name="accessory_bluetooth_control_api" long-name="Accessory Bluetooth Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_bluetooth_control_api/group"/>
-</component>
-<component name="extended_version_info_api" long-name="Extended Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_api/group"/>
-</component>
-<component name="mediator_event_provider_api" long-name="Mediator Event Provider API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_provider_api/group"/>
-</component>
-<component name="tv_out_config_api" long-name="TV Out Config API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_config_api/group"/>
-</component>
-<component name="tspclientmapper_api" long-name="TSP Client Mapper API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tspclientmapper_api/group"/>
-</component>
-<component name="powersave_api" long-name="Power Save API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_api/group"/>
-</component>
-<component name="powersave_definitions_api" long-name="Power Save Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_definitions_api/group"/>
-</component>
-<component name="powersave_plugin_api" long-name="Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_plugin_api/group"/>
-</component>
-<component name="extended_version_info_plugin_api" long-name="Extended Version Info Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_plugin_api/group"/>
-</component>
-<component name="haptics_plugin_api" long-name="Haptics Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_plugin_api/group"/>
-</component>
-<component name="haptics_effect_data_getter_plugin_api" long-name="Haptics Effect Data Getter Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
-</component>
-<component name="haptics_packetizer_plugin_api" long-name="Haptics Packetizer Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_packetizer_plugin_api/group"/>
-</component>
-<component name="tiltcompensation_api" long-name="Tilt Compensation API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tiltcompensation_api/group"/>
-</component>
-<component name="disk_notification_handler_api" long-name="Disk Notification Handler API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_notification_handler_api/group"/>
-</component>
-<component name="accessory_policy_usb_audio_api" long-name="Accessory Policy USB Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_usb_audio_api/group"/>
-</component>
-<component name="accessory_policy_hdmi_audio_api" long-name="Accessory Policy HDMI Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_hdmi_audio_api/group"/>
-</component>
-<component name="sensor_data_compensator_plugin_api" long-name="Sensor Data Compensator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
-</component>
-<component name="ddc_access_api" long-name="DDC Access API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/ddc_access_api/group"/>
-</component>
-<component name="tv_out_behaviour_api" long-name="TV Out Behaviour API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_behaviour_api/group"/>
-</component>
-</collection>
-<collection name="accessoryservices" long-name="Accessory Services" level="framework">
-<component name="accessorymonitor" filter="s60" long-name="Accessory Monitor">
-<unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/group"/>
-</component>
-<component name="accessoryremotecontrol" filter="s60" long-name="Accessory Remote Control">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
-</component>
-<component name="accessoryserver" filter="s60" long-name="Accessory Server">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryserver/group"/>
-</component>
-<component name="pluggeddisplay" filter="s60" long-name="Plugged Display" introduced="^3">
-<unit bldFile="os/devicesrv/accessoryservices/pluggeddisplay/group"/>
-</component>
-<component name="headsetstatusapi" filter="s60" long-name="Headset Status API">
-<unit bldFile="os/devicesrv/accessoryservices/headsetstatusapi/group"/>
-</component>
-<component name="tspclientmapper" filter="s60" long-name="TSP Client Mapper">
-<unit bldFile="os/devicesrv/accessoryservices/tspclientmapper/group"/>
-</component>
-<component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional">
-<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
-</component>
-<component name="gid_pc_tool" filter="s60" long-name="Generic ID PC Tool" class="tool PC">
-<unit bldFile="os/devicesrv/accessoryservices/gid_pc_tool/group"/>
-</component>
-</collection>
-<collection name="commonservices" long-name="Common Services" level="app-if">
-<component name="commonengine" filter="s60" long-name="Common Engine">
-<unit bldFile="os/devicesrv/commonservices/commonengine/group"/>
-</component>
-<component name="commonengineresources" filter="s60" long-name="Common Engine Resources" class="config">
-<unit bldFile="os/devicesrv/commonservices/commonengineresources/group"/>
-</component>
-<component name="platformenv" filter="s60" long-name="Platform Environment">
-<unit bldFile="os/devicesrv/commonservices/platformenv/group"/>
-</component>
-<component name="sysutil" long-name="System Utilities" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/sysutil/group" mrp="os/devicesrv/commonservices/sysutil/group/sysutil.mrp"/>
-</component>
-<component name="activitymanager" long-name="Activity Manager" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/activitymanager/group" mrp="os/devicesrv/commonservices/activitymanager/group/activitymanager.mrp"/>
-</component>
-</collection>
-<collection name="dosservices" long-name="Domestic Operating System Services" level="hw-if">
-<component name="commondsy" filter="s60" long-name="Common DSY" plugin="Y">
-<unit bldFile="os/devicesrv/dosservices/commondsy/group"/>
-</component>
-<component name="dosserver" filter="s60" long-name="Domestic OS Server">
-<unit bldFile="os/devicesrv/dosservices/dosserver/group"/>
-</component>
-</collection>
-<collection name="sensorservices" long-name="Sensor Services" level="framework">
-<component name="sensorserver" filter="s60" long-name="Sensor Server">
-<unit bldFile="os/devicesrv/sensorservices/sensorserver/group"/>
-</component>
-<component name="orientationssy" filter="s60" long-name="Orientation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/orientationssy/group"/>
-</component>
-<component name="tiltcompensationssy" filter="s60" long-name="Tilt Compensation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/tiltcompensationssy/group"/>
-</component>
-<component name="sensordatacompensator" filter="s60" long-name="Sensor Data Compensator">
-<unit bldFile="os/devicesrv/sensorservices/sensordatacompensator/group"/>
-</component>
-</collection>
-<collection name="hwrmhaptics" long-name="HWRM Haptics" level="plugin">
-<component name="hapticseffectdatagetterfw" filter="s60" long-name="Haptics Effect Data Getter Framework">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
-</component>
-<component name="hapticspluginservice" filter="s60" long-name="Haptics Plugin Service">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
-</component>
-<component name="hapticspacketizer" filter="s60" long-name="Haptics Packetizer">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
-</component>
-<component name="hapticspluginmanager" filter="s60" long-name="Haptics Plugin Manager">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
-</component>
-<component name="hapticsserver" filter="s60" long-name="Haptics Server">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsserver/group"/>
-</component>
-<component name="hapticsclient" filter="s60" long-name="Haptics Client">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsclient/group"/>
-</component>
-<component name="hwrmhaptics_build" filter="s60" long-name="HWRM Haptics Build">
-<!-- move these exports into the appropriate above components and delete this component-->
-<unit bldFile="os/devicesrv/hwrmhaptics/group"/>
-</component>
-</collection>
-<collection name="mediator" long-name="Mediator" level="app-if">
-<!--collection is really a component. Move it down a directory -->
-<component name="mediator_build" filter="s60" long-name="Mediator Build">
-<unit bldFile="os/devicesrv/mediator/group"/>
-</component>
-</collection>
-<collection name="psmservices" long-name="Power Save Mode Services" level="app-if">
-<component name="psmserver" filter="s60" long-name="PSM Server">
-<unit bldFile="os/devicesrv/psmservices/psmserver/group"/>
-</component>
-</collection>
-<collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
-<component name="hwrmfmtxwatcherplugin" filter="s60" long-name="HWRM FM Transmitter Watcher Plugin" plugin="Y">
-<unit bldFile="os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
-</component>
-<component name="hwrmtargetmodifierplugin" filter="s60" long-name="HWRM Target Modifier Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build,
- may need to -->
-<!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
-</component>
-<component name="vibractrl" filter="s60" long-name="Vibra Control" deprecated="9.1">
-<unit bldFile="os/devicesrv/resourcemgmt/vibractrl/group"/>
-</component>
-<component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="^2" purpose="optional">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
-</component>
-<component name="hwresourcesmgrconfig" long-name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
-</component>
-<component name="resourcemgmt_build" filter="s60" long-name="Resource Management Build">
-<!-- Move exports to a self-contained component.
- This needs to be kept around until configuration is in place -->
-<unit bldFile="os/devicesrv/resourcemgmt/group"/>
-</component>
-<component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
-</component>
-</collection>
-<collection name="sysstatemgmt" long-name="System State Management" level="server">
-<component name="ssmmapperutility" filter="s60" long-name="SSM Mapper Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmmapperutility/group"/>
-</component>
-<component name="ssmpolicyplugins" filter="s60" long-name="SSM Policy Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmpolicyplugins/group"/>
-</component>
-<component name="ssmutilityplugins" filter="s60" long-name="SSM Utility Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmutilityplugins/group"/>
-</component>
-<component name="ssmcmdlists" filter="s60" long-name="SSM Command Lists" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcmdlists/group"/>
-</component>
-<component name="ssmcustcmds" filter="s60" long-name="SSM Custom Commands" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcustcmds/group"/>
-</component>
-<component name="syslangutil" filter="s60" long-name="System Language Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/syslangutil/group"/>
-</component>
-<component name="sysrestart" filter="s60" long-name="System Restart" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysrestart/group"/>
-</component>
-<component name="sysuiprovider" filter="s60" long-name="System UI Provider" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysuiprovider/group"/>
-</component>
-<component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/group" mrp="os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
-</component>
-<component name="systemstatemgr" long-name="System State Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
-</component>
-<component name="systemstateplugins" long-name="System State Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
-</component>
-<component name="systemstatereferenceplugins" long-name="System State Reference Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
-</component>
-</collection>
-<collection name="resourceinterfaces" long-name="Resource Interfaces" level="hw-if">
-<component name="fmtransmittercontrol" long-name="FM Transmitter Control" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group" mrp="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
-</component>
-</collection>
-<collection name="systemhealthmanagement" long-name="System Health Management" level="server">
-<component name="systemhealthmgr" long-name="System Health Manager" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
-</component>
-</collection>
-<collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if"/>
-<collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
-<component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
-<collection name="authorisation" long-name="Authorisation" level="utilities">
-<component name="userpromptservice" long-name="User Prompt Service" introduced="^3" purpose="mandatory">
-<unit bldFile="os/security/authorisation/userpromptservice/group" mrp="os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
-</component>
-<component name="userpromptutils" long-name="User Prompt Utils" introduced="^3" purpose="optional">
-<unit bldFile="os/security/authorisation/userpromptutils/group" mrp="os/security/authorisation/userpromptutils/group/security_ups_utils.mrp"/>
-</component>
-</collection>
-<collection name="contentmgmt" long-name="Content Management" level="utilities">
-<component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
-<unit bldFile="os/security/contentmgmt/contentaccessfwfordrm/group" mrp="os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
-</component>
-<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">
-<unit bldFile="os/security/crypto/weakcryptospi/group" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
-</component>
-<component name="strongcryptospi" long-name="Strong Crypto SPI" filter="gt" introduced="^3" purpose="optional">
-<unit bldFile="os/security/crypto/weakcryptospi/strong" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
-</component>
-</collection>
-<collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
-<component name="securityutils" long-name="Security Utils" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/securityutils/group" mrp="os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
-</component>
-<component name="securitydocs" long-name="Security Documentation" purpose="development" class="doc">
-<unit mrp="os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
-</component>
-<component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
-</component>
-<component name="securitycommonutils" long-name="Security Common Utils" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/security/cryptomgmtlibs/securitycommonutils/group" mrp="os/security/cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
-</component>
-</collection>
-<collection name="securityanddataprivacytools" long-name="Security and Data Privacy Tools" level="services">
-<component name="securityconfig" long-name="Security Config" introduced="9.1" purpose="optional">
-<unit bldFile="os/security/securityanddataprivacytools/securityconfig/group" mrp="os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
-</component>
-<component name="securitytools" long-name="Security Tools" introduced="^3" purpose="optional" class="PC">
-<unit bldFile="os/security/securityanddataprivacytools/securitytools/group" mrp="os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
-</component>
-</collection>
-<collection name="cryptoplugins" long-name="Crypto Plugins" level="plugins">
-<component name="cryptospiplugins" long-name="Crypto SPI Plugins" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/security/cryptoplugins/cryptospiplugins/group" mrp="os/security/cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
-</component>
-</collection>
-<collection name="cryptoservices" long-name="Crypto Services" level="plugins">
-<component name="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/certificateandkeymgmt/group" mrp="os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
-</component>
-<component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
-</component>
-<component name="browserrootcertificates" long-name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
-<unit mrp="os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
-</component>
-<component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/asnpkcs/group" mrp="os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
-</component>
-</collection>
-<collection name="security_info" long-name="OS Security Info" level="utilities">
-<component name="security_metadata" long-name="OS Security Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/security/security_info/security_metadata/security_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
-<collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
-<component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
-</component>
-<component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
-</component>
-<component name="simulationpositioningmodule" long-name="Simulation Positioning Module" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
-</component>
-<component name="gpspositioningmodule" long-name="GPS/A-GPS Positioning Module" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/gpspositioningmodule/group" mrp="os/lbs/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
-</component>
-<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>
-</collection>
-<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
-<component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
-</component>
-</collection>
-<collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
-<component name="locationserver" long-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 name="networkrequesthandler" long-name="Network Request Handler" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
-</component>
-</collection>
-<collection name="lbstest" long-name="Locating Services Tests" level="application-interface">
-<component name="locationprotocoltest" long-name="Location Protocol Tests" introduced="9.2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/lbstest/locationprotocoltest/group" mrp="os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
-</component>
-</collection>
-<collection name="locationmgmt" long-name="Location Management" level="management">
-<component name="locmonitor" long-name="Location Monitor" introduced="^3" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
-</component>
-<component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/agpslocationmgr/group" mrp="os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
-</component>
-<component name="networklocationmgr" long-name="Network Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/networklocationmgr/group" mrp="os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
-</component>
-<component name="locationcore" long-name="Location Core" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locationcore/group" mrp="os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
-</component>
-<component name="networkgateway" long-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 name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
-<component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
-</component>
-<component name="suplrrlpasn1" filter="sf_build" long-name="SUPL RRLP ASN1 Parser">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
-</component>
-</collection>
-<collection name="lbsapitest" long-name="Location API Tests" level="application-interface"/>
-<collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
-<component name="lbs_metadata" long-name="Locating Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commsfw" level="services" long-name="Communications Framework" levels="server support framework process app-if">
-<collection name="commsprocess" long-name="Comms Process" level="process">
-<component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/commsfw/commsprocess/commsrootserverconfig/group" mrp="os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
-</component>
-</collection>
-<collection name="commsconfig" long-name="Comms Config" level="process">
-<component name="commsdatabase" long-name="Comms Database" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
-</component>
-<component name="commsdatabaseshim" long-name="Comms Database Shim" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/commsfw/commsconfig/commsdatabaseshim/group" mrp="os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
-</component>
-</collection>
-<collection name="datacommsserver" long-name="Data Comms Server" level="framework">
-<component name="esockserver" long-name="ESock Server" purpose="mandatory">
-<unit bldFile="os/commsfw/datacommsserver/esockserver/group" mrp="os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp" version="3"/>
-</component>
-<component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/group" mrp="os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
-</component>
-<component name="networkingdialogstub" long-name="Networking Dialog Stub" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/default" mrp="os/commsfw/datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
-</component>
-<component name="networkcontroller" long-name="Network Controller" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/datacommsserver/networkcontroller/group" mrp="os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
-</component>
-</collection>
-<collection name="serialserver" long-name="Serial Server" level="server">
-<component name="serialportcsy" long-name="Serial Port CSY" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/serialserver/serialportcsy" mrp="os/commsfw/serialserver/serialportcsy/ser-comms_serialportcsy.mrp"/>
-</component>
-<component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" purpose="development">
-<unit bldFile="os/commsfw/serialserver/packetloopbackcsy/group" mrp="os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
-</component>
-<component name="c32serialserver" long-name="C32 Serial Server" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/commsfw/serialserver/c32serialserver/group" mrp="os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
-</component>
-<component name="c32serialserverconfig" long-name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config">
-<unit bldFile="os/commsfw/serialserver/c32serialserverconfig" mrp="os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
-</component>
-<component name="c32serialserverdocs" long-name="C32 Serial Server Documentation" purpose="development" class="doc">
-<unit mrp="os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
-</component>
-</collection>
-<collection name="commsfwutils" long-name="Comms Framework Utilities" level="framework">
-<component name="commsbufs" long-name="Comms Buffers" introduced="^3" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwutils/commsbufs/group" mrp="os/commsfw/commsfwutils/commsbufs/group/comms-infras_commsbufs.mrp"/>
-</component>
-</collection>
-<collection name="commsfw_info" long-name="Comms Framework Info" level="app-if">
-<component name="commsinfrastructuredocs" long-name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
-<unit mrp="os/commsfw/commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
-</component>
-<component name="commsfw_metadata" long-name="Communications Framework Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/commsfw/commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
-</component>
-</collection>
-<collection name="commsfwsupport" long-name="Comms Framework Support" level="support">
-<component name="commselements" long-name="Comms Elements" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwsupport/commselements/group" mrp="os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
-</component>
-</collection>
-<collection name="commsinfrastructureapitest" long-name="Comms-Infras API Tests" level="app-if">
-<component name="commsinfrastructuresvs" long-name="Comms Infrastructure Verification Suite" introduced="^3" purpose="development">
-<unit mrp="os/commsfw/commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
-</component>
-</collection>
-<collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
-<component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
-</component>
-<component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" purpose="mandatory" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
-</component>
-<component name="commstools" long-name="Comms Tools" introduced="^3" purpose="development" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/commstools/group" mrp="os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
-</component>
-</collection>
-</block>
-<block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
-<component name="internetsockets" long-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>
-<collection name="tcpiputils" long-name="TCP/IP Utilities" level="plugin">
-<component name="dnd" long-name="DND" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/dnd/group" mrp="os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
-</component>
-<component name="dhcp" long-name="DHCP" introduced="8.0" purpose="optional">
-<unit bldFile="os/networkingsrv/tcpiputils/dhcp/group" mrp="os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
-</component>
-<component name="networkaddressandporttranslation" long-name="Network Address and Port Translation" introduced="^2" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
-</component>
-<component name="punycodeconv" long-name="Punycode Converter" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/punycodeconv/group" mrp="os/networkingsrv/tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
-</component>
-</collection>
-<collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
-<component name="nullagt" long-name="NULL AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/nullagt/group" mrp="os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
-</component>
-<component name="genericscprparameters" long-name="Generic SCPR Parameters" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/linklayercontrol/genericscprparameters/group" mrp="os/networkingsrv/linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
-</component>
-<component name="mbmsparameters" long-name="MBMS Parameters" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/mbmsparameters/group" mrp="os/networkingsrv/linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
-</component>
-<component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
-<unit bldFile="os/networkingsrv/linklayercontrol/networkinterfacemgr/group" mrp="os/networkingsrv/linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp" version="2"/>
-</component>
-</collection>
-<collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
-<component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
-</component>
-<component name="pppnif" long-name="PPP NIF" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/pppnif/group" mrp="os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp" version="2"/>
-</component>
-<component name="slipnif" long-name="SLIP NIF" purpose="development" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/slipnif/group" mrp="os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
-</component>
-<component name="tunnelnif" long-name="Tunnel NIF" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
-</component>
-</collection>
-<collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
-<component name="packetlogger" long-name="Packet Logger" introduced="8.1" purpose="development">
-<unit bldFile="os/networkingsrv/linklayerutils/packetlogger/group" mrp="os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
-</component>
-</collection>
-<collection name="networkcontrol" long-name="Network Control" level="plugin">
-<component name="qoslib" long-name="QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/qoslib/group" mrp="os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
-</component>
-<component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/pfqoslib/group" mrp="os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
-</component>
-<component name="qosfwprt" long-name="QoS Framework PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
-</component>
-<component name="qosipscpr" long-name="QoS IP SCPR" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosipscpr/group" mrp="os/networkingsrv/networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
-</component>
-<component name="ipnetworklayer" long-name="IP Network Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/ipnetworklayer/group" mrp="os/networkingsrv/networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
-</component>
-<component name="iptransportlayer" long-name="IP Transport Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/iptransportlayer/group" mrp="os/networkingsrv/networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
-</component>
-<component name="commsuserpromptmgr" long-name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkcontrol/commsuserpromptmgr/group" mrp="os/networkingsrv/networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
-</component>
-</collection>
-<collection name="networkprotocols" long-name="Network Protocols" level="plugin">
-<component name="ipeventnotifier" long-name="IP Event Notifier" introduced="8.1" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
-</component>
-<component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
-</component>
-<component name="iphook" long-name="IP Hook" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
-</component>
-<component name="mobileip" long-name="Mobile IP" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/mobileip/group" mrp="os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
-</component>
-<component name="dnsproxy" long-name="DNS Proxy" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/networkprotocols/dnsproxy/group" mrp="os/networkingsrv/networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
-</component>
-</collection>
-<collection name="networksecurity" long-name="Network Security" level="framework">
-<component name="tls" long-name="TLS" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tls/group" mrp="os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
-</component>
-<component name="tlsprovider" long-name="TLS Provider" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tlsprovider/group" mrp="os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
-</component>
-<component name="ipsec" long-name="IPsec" introduced="7.0" purpose="optional">
-<unit bldFile="os/networkingsrv/networksecurity/ipsec/group" mrp="os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
-</component>
-</collection>
-<collection name="networkingtestandutils" long-name="Networking Test and Utils" level="app-if">
-<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">
-<!-- production component: contains the IBY files -->
-<unit bldFile="os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
-</component>
-<component name="networkingdocs" long-name="Networking Documentation" purpose="development" class="doc">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
-</component>
-<component name="networkingsrv_metadata" long-name="Networking Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
-<component name="predictorcompression" long-name="Predictor Compression" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wlan" level="services" long-name="WLAN" levels="hw low mid high tools test">
-<collection name="wlan_plat" long-name="WLAN Platform Interfaces" level="test">
-<component name="wlan_dbif_api" long-name="WLAN DBIF API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_dbif_api/group"/>
-</component>
-<component name="wlan_hal_api" long-name="WLAN HAL API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hal_api/group"/>
-</component>
-<component name="wlan_management_api" long-name="WLAN Management API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_management_api/group"/>
-</component>
-<component name="wlan_device_settings_api" long-name="WLAN Device Settings API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_device_settings_api/group"/>
-</component>
-<component name="wlan_control_api" long-name="WLAN Control API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_control_api/group"/>
-</component>
-<component name="wlan_hw_initialization_data_api" long-name="WLAN Hardware Initialization Data API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hw_initialization_data_api/group"/>
-</component>
-<component name="wlan_power_save_plugin_api" long-name="WLAN Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_power_save_plugin_api/group"/>
-</component>
-<component name="wlan_info_api" long-name="WLAN Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_info_api/group"/>
-</component>
-<component name="wlan_agent_hotspot_plugin_api" long-name="WLAN Agent Hotspot Plug-in API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
-</component>
-<component name="wlan_osa_api" long-name="WLAN OSA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_osa_api/group"/>
-</component>
-<component name="wlan_spia_api" long-name="WLAN SPIA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_spia_api/group"/>
-</component>
-<component name="wlan_hpa_api" long-name="WLAN HPA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hpa_api/group"/>
-</component>
-<component name="wlan_eapol_plugin_api" long-name="WLAN EAPOL Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_eapol_plugin_api/group"/>
-</component>
-<component name="wlan_generic_plugin_api" long-name="WLAN Generic Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_generic_plugin_api/group"/>
-</component>
-<component name="wlan_aws_plugin_api" long-name="WLAN AWS Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_aws_plugin_api/group"/>
-</component>
-</collection>
-<collection name="wlan_pub" long-name="WLAN Public Interfaces" level="test">
-<component name="wlan_sdk_info_api" long-name="WLAN SDK Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_pub/wlan_sdk_info_api/group"/>
-</component>
-</collection>
-<collection name="wlan_bearer" long-name="WLAN Bearer" level="hw">
-<component name="wlanpsmplugin" filter="s60" long-name="WLAN PSM Plugin" plugin="Y">
-<unit bldFile="os/wlan/wlan_bearer/wlanpsmplugin/group"/>
-</component>
-<component name="wlanagent" filter="s60" long-name="WLAN Agent">
-<unit bldFile="os/wlan/wlan_bearer/wlanagent/group"/>
-</component>
-<component name="wlandbif_cd" filter="s60" long-name="WLAN CommsDat interface">
-<unit bldFile="os/wlan/wlan_bearer/wlandbif_cd/group"/>
-</component>
-<!-- should follow component directory rules for stuff in wlan_symbian/ and put in a single component or split up properly -->
-<component name="wlanengine" filter="s60" long-name="WLAN Engine">
-<unit bldFile="os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
-</component>
-<component name="wlanldd" filter="s60" long-name="WLAN LDD">
-<unit bldFile="os/wlan/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
-</component>
-<component name="wlannwif" filter="s60" long-name="WLAN Network Interface">
-<unit bldFile="os/wlan/wlan_bearer/wlannwif/group"/>
-</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="adaptation hw-if plugin framework server app-if">
-<collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
-<component name="basebandchanneladaptor" long-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 name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
-<component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
-</component>
-</collection>
-<collection name="smsprotocols" long-name="SMS Protocols" level="framework">
-<component name="smsstack" long-name="SMS Stack" introduced="6.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/cellularsrv/smsprotocols/smsstack/group" mrp="os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
-</component>
-</collection>
-<collection name="telephonyprotocols" long-name="Telephony Protocols" level="framework">
-<component name="csdagt" long-name="CSD AGT" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/csdagt/group" mrp="os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
-</component>
-<component name="psdagt" long-name="PSD AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/psdagt/group" mrp="os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
-</component>
-<component name="gprsumtsqosprt" long-name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
-</component>
-<component name="gprsumtsqosinterface" long-name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
-</component>
-<component name="qosextnapi" long-name="QoS Extn API" introduced="9.2" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
-</component>
-<component name="secondarypdpcontextumtsdriver" long-name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
-</component>
-<component name="qos3gppcpr" long-name="QoS 3GPP CPR" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
-</component>
-<component name="pdplayer" long-name="PDP Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/pdplayer/group" mrp="os/cellularsrv/telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
-</component>
-<component name="rawipnif" long-name="Raw IP NIF" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserver" long-name="Telephony Server" level="server">
-<component name="etelserverandcore" long-name="ETel Server and Core" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
-</component>
-<component name="etelmultimode" long-name="ETel Multimode" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelmultimode/group" mrp="os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
-</component>
-<component name="etelpacketdata" long-name="ETel Packet Data" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
-</component>
-<component name="etelsimtoolkit" long-name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
-<component name="common_tsy" long-name="Common TSY" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
-</component>
-<component name="licenseetsystub" long-name="Licensee TSY Stub" introduced="^2" purpose="development" filter="sf_build" plugin="Y">
-<unit mrp="os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="os/cellularsrv/telephonyserverplugins/licenseetsystub/group"/>
-</component>
-<component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
-</component>
-<component name="simtsy" long-name="SIM TSY" introduced="7.0" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
-</component>
-<component name="ctsydispatchlayer" long-name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
-</component>
-<component name="simatktsy" long-name="SIMATK TSY" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simatktsy/group" mrp="os/cellularsrv/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
-</component>
-</collection>
-<collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
-<component name="dial" long-name="Dial" deprecated="9.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyutils/dial/group" mrp="os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
-</component>
-<component name="telephonywatchers" long-name="Telephony Watchers" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
-</component>
-<component name="etel3rdpartyapi" long-name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrv_info" long-name="Cellular Baseband Services Info" level="app-if">
-<component name="telephonyconfidentialdocs" long-name="Telephony Confidential Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
-</component>
-<component name="telephonydocs" long-name="Telephony Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
-</component>
-<component name="cellularsrv_metadata" long-name="Cellular Baseband Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
-<component name="mocksy" long-name="MockSY" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if"/>
-</block>
-<block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
-<collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
-<component name="bluetooth_audio_adaptation_api" long-name="Bluetooth Audio Adaptation API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
-</component>
-<component name="bluetooth_power_management_api" long-name="Bluetooth Power Management API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_power_management_api/group"/>
-</component>
-<component name="at_command_handler_plugin_api" long-name="AT Command Handler Plugin API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/at_command_handler_plugin_api/group"/>
-</component>
-</collection>
-<collection name="bluetooth" long-name="Bluetooth Core" level="framework">
-<component name="btstack" long-name="Bluetooth Stack" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btstack" mrp="os/bt/bluetooth/btstack/bluetooth_stack.mrp"/>
-</component>
-<component name="btcomm" long-name="Bluetooth CSY" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetooth/btcomm" mrp="os/bt/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
-</component>
-<component name="btsdp" long-name="Bluetooth SDP" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btsdp" mrp="os/bt/bluetooth/btsdp/bluetooth_sdp.mrp"/>
-</component>
-<component name="btextnotifiers" long-name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btextnotifiers" mrp="os/bt/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
-</component>
-<component name="gavdp" long-name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/gavdp/group" mrp="os/bt/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
-</component>
-<component name="btlogger" long-name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btlogger/group" mrp="os/bt/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
-</component>
-<component name="btdocs" long-name="Bluetooth Documentation" purpose="development" class="doc">
-<unit mrp="os/bt/bluetooth/btdocs/bluetooth_documentation.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothmgmt" long-name="Bluetooth Management" level="plugin">
-<component name="btmgr" long-name="Bluetooth Manager" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btmgr" mrp="os/bt/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
-</component>
-<component name="btconfig" long-name="Bluetooth Config" purpose="optional" class="config">
-<unit bldFile="os/bt/bluetoothmgmt/btconfig" mrp="os/bt/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
-</component>
-<component name="btrom" long-name="Bluetooth ROM" introduced="9.1" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btrom" mrp="os/bt/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
-</component>
-<component name="bluetoothclientlib" long-name="Bluetooth Client Library" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/bluetoothclientlib" mrp="os/bt/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothcommsprofiles" long-name="Bluetooth Comms Profiles" level="app-if">
-<component name="btpan" long-name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetoothcommsprofiles/btpan/group" mrp="os/bt/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
-</component>
-</collection>
-<collection name="bthci" long-name="Host Controller Interface" level="server">
-<component name="bthci2" long-name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bthci/bthci2/group" mrp="os/bt/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
-</component>
-<component name="hciextensioninterface" long-name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bthci/hciextensioninterface" mrp="os/bt/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
-</component>
-<component name="hci2implementations" long-name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bthci/hci2implementations/group" mrp="os/bt/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
-</component>
-</collection>
-<collection name="irda" long-name="IrDA" level="plugin">
-<component name="irdastack" long-name="IrDA Stack" purpose="optional">
-<unit bldFile="os/bt/irda/irdastack/group" mrp="os/bt/irda/irdastack/group/infra-red_irda.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if"/>
-<collection name="atext" long-name="AT Extensions" level="server">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="atext_build" long-name="AT Extension Build" introduced="^3" purpose="optional" filter="s60">
-<unit bldFile="os/bt/atext/group"/>
-</component>
-</collection>
-<collection name="bt_info" long-name="Bluetooth Info" level="app-if">
-<component name="bt_metadata" long-name="Bluetooth Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/bt/bt_info/bt_metadata/bt_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
-<collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
-<!-- usbclientdrivers to be moved here from kernelhwsrv-->
-</collection>
-<collection name="usbmgmt" long-name="USB Management" level="server">
-<component name="usbmgr" long-name="USB Manager" purpose="optional">
-<unit bldFile="os/usb/usbmgmt/usbmgr/group" mrp="os/usb/usbmgmt/usbmgr/group/usb_manager.mrp" version="2"/>
-</component>
-<component name="usbclassandmgrdocs" long-name="USB Class and Manager Documentation" purpose="development" class="doc">
-<unit mrp="os/usb/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
-</component>
-</collection>
-<collection name="usb_info" long-name="USB Info" level="app-if">
-<component name="usb_metadata" long-name="USB Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/usb/usb_info/usb_metadata/usb_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="mm" level="services" long-name="Multimedia" levels="adaptation 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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-</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"/>
-</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"/>
-</component>
-<component name="aac_decoder_config_proxy_api" long-name="AAC Decoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/aac_decoder_config_proxy_api/group"/>
-</component>
-<component name="added_devsound_control_api" long-name="Added DevSound Control API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_api/group"/>
-</component>
-<component name="added_devsound_control_msg_hdlr_api" long-name="Added DevSound Control Msg Hdlr API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_msg_hdlr_api/group"/>
-</component>
-<component name="added_devsound_control_proxy_api" long-name="Added DevSound Control Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_proxy_api/group"/>
-</component>
-<component name="audio_effects_msg_hdlr_api" long-name="Audio Effects Message Handler API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_msg_hdlr_api/group"/>
-</component>
-<component name="audio_effects_proxy_api" long-name="Audio Effects Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_proxy_api/group"/>
-</component>
-<component name="audio_policy_header_api" long-name="Audio Policy Header API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="audio_routing_proxy_api" long-name="Audio Routing Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_routing_proxy_api/group"/>
-</component>
-<component name="custom_interface_builder_api" long-name="Custom Interface Builder API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_builder_api/group"/>
-</component>
-<component name="custom_interface_message_handler_factory_api" long-name="Custom Interface Message Handler Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_message_handler_factory_api/group"/>
-</component>
-<component name="custom_interface_proxy_factory_api" long-name="Custom Interface Proxy Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_proxy_factory_api/group"/>
-</component>
-<component name="custom_interface_utility_api" long-name="Custom Interface Utility API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_utility_api/group"/>
-</component>
-<component name="devsound_adaptation_api" long-name="DevSound Adaptation API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/devsound_adaptation_api/group"/>
-</component>
-<component name="display_posting_api" long-name="Display Posting API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="eaac_plus_decoder_interface_proxy_api" long-name="eAAC Plus Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="error_concealment_interface_proxy_api" long-name="Error Concealment Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
-</component>
-<component name="fm_radio_adaptation_api" long-name="FM Radio Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_decoder_interface_proxy_api" long-name="G711 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_encoder_interface_proxy_api" long-name="G711 Encoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_decoder_interface_proxy_api" long-name="G729 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_encoder_interface_msg_hdlr_api" long-name="G729 Encoder Interface Message Handler API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</component>
-<component name="ilbc_decoder_interface_proxy_api" long-name="Ilbc Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ilbc_encoder_interface_proxy_api" long-name="Ilbc Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="mdf_plugin_uids" long-name="MDF Plug-in UIDs" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/mdf_plugin_uids/group"/>
-</component>
-<component name="multimedia_fourcc_definitions_api" long-name="Multimedia FourCC Definitions API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/multimedia_fourcc_definitions_api/group"/>
-</component>
-<component name="nokia_audio_policy_header_api" long-name="Nokia Audio Policy Header API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/nokia_audio_policy_header_api/group"/>
-</component>
-<component name="nokia_multimedia_fourcc_definitions_api" long-name="Nokia Multimedia Fourcc Definitions API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ra8_decoder_interface_proxy_api" long-name="RA8 Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
-</component>
-<component name="rds_adaptation_api" long-name="RDS Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="restricted_audio_output_proxy_api" long-name="Restricted Audio Output Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="sbc_encoder_interface_proxy_api" long-name="SBC Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/sbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="secure_output_mdf_custom_interface" long-name="Secure Output MDF Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="speech_encoder_config_proxy_api" long-name="Speech Encoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/speech_encoder_config_proxy_api/group"/>
-</component>
-<component name="telephony_audio_routing_client_api" long-name="Telephony Audio Routing Client API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_client_api/group"/>
-</component>
-<component name="telephony_audio_routing_manager_api" long-name="Telephony Audio Routing Manager API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_manager_api/group"/>
-</component>
-<component name="video_buffer_management_mdf_custom_interface" long-name="Video Buffer Management MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_buffer_management_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_rotation_mdf_custom_interface" long-name="Video Decoder Rotation MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_scaling_mdf_custom_interface" long-name="Video Decoder Scaling MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
-</component>
-<component name="video_reclaim_extbuffers_ci" long-name="Video Reclaim Extbuffers Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_reclaim_extbuffers_ci/group"/>
-</component>
-<component name="video_window_control_custom_interface" long-name="Video Window Control Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="wma_decoder_interface_proxy_api" long-name="WMA Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/wma_decoder_interface_proxy_api/group"/>
-</component>
-<component name="eaacplusutil_api" long-name="EAac Plus Util API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/eaacplusutil_api/group"/>
-</component>
-<component name="frametable_api" long-name="Frametable API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/frametable_api/group"/>
-</component>
-</collection>
-<collection name="devsoundextensions" long-name="Devsound Extensions" level="device-fw">
-<component name="drmaudioplayer" filter="s60" long-name="DRM Audio Player">
-<unit bldFile="os/mm/devsoundextensions/drmaudioplayer/group"/>
-</component>
-<component name="mmextfw" filter="s60" long-name="Multimedia Extension Framework">
-<unit bldFile="os/mm/devsoundextensions/mmextfw/group"/>
-</component>
-<component name="audiorouting" filter="s60" long-name="Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/audiorouting/group"/>
-</component>
-<component name="effects" filter="s60" long-name="Effects">
-<unit bldFile="os/mm/devsoundextensions/effects/group"/>
-</component>
-<component name="effectspresets" filter="s60" long-name="Effects Presets">
-<unit bldFile="os/mm/devsoundextensions/effectspresets/group"/>
-</component>
-<component name="effectspresets_utils" filter="s60" long-name="Effects Presets Utils">
-<!-- need to #include the lot from a single bld.inf
- Also move to a standard component location, not under effectspresets -->
-<unit bldFile="os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
-<unit bldFile="os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
-</component>
-<component name="telephonyaudiorouting" filter="s60" long-name="Telephony Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/group"/>
-</component>
-<component name="mmfcustominterfaces" filter="s60" long-name="MMF Custom Interfaces">
-<unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/group"/>
-</component>
-<component name="addeddevsoundcontrol" filter="s60" long-name="Added DevSound Control">
-<unit bldFile="os/mm/devsoundextensions/addeddevsoundcontrol/group"/>
-</component>
-<component name="globalaudiosettings" filter="s60" long-name="Global Audio Settings">
-<unit bldFile="os/mm/devsoundextensions/globalaudiosettings/group"/>
-</component>
-<component name="restrictedaudiooutput" filter="s60" long-name="Restricted Audio Output">
-<unit bldFile="os/mm/devsoundextensions/restrictedaudiooutput/group"/>
-</component>
-<component name="ciextnfactoryplugins" filter="s60" long-name="Custom Interface Extension Factory Plugins" plugin="Y">
-<unit bldFile="os/mm/devsoundextensions/ciextnfactoryplugins/group"/>
-</component>
-</collection>
-<collection name="mdfdevvideoextensions" long-name="MDF Dev Video Extensions" level="device-fw">
-<component name="nga_mdf_postprocessor" long-name="NGA MDF Postprocessor" filter="s60">
-<unit bldFile="os/mm/mdfdevvideoextensions/nga_mdf_postprocessor/group"/>
-</component>
-</collection>
-<collection name="audio" long-name="Audio Codecs" level="middleware">
-<component name="arm_cmmf_codecs" filter="s60" long-name="ARM CMMF Codecs" plugin="Y">
-<unit bldFile="os/mm/audio/arm_cmmf_codecs/group"/>
-</component>
-</collection>
-<collection name="video" long-name="Video Codecs" level="middleware">
-<!-- empty -->
-</collection>
-<collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
-<component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/imagingandcamerafws/imagingfws/group" mrp="os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
-</component>
-<component name="camerafw" long-name="Camera Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/imagingandcamerafws/camerafw/group" mrp="os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
-</component>
-</collection>
-<collection name="mmlibs" long-name="Multimedia Libraries" level="middleware">
-<component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmutilitylib/group" mrp="os/mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
-</component>
-<component name="mmfw" long-name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmfw/group" mrp="os/mm/mmlibs/mmfw/group/multimedia_mmf.mrp"/>
-</component>
-</collection>
-<collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
-<component name="imagingplugins" long-name="Imaging Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/imagingplugins/group" mrp="os/mm/mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
-</component>
-<component name="cameraplugins" long-name="Camera Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/cameraplugins/group" mrp="os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
-</component>
-<component name="lib3gp" long-name="3GP Library" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/mmplugins/lib3gp/group" mrp="os/mm/mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
-</component>
-<component name="mmfwplugins" long-name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/mmfwplugins/group" mrp="os/mm/mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
-</component>
-</collection>
-<collection name="mm_info" long-name="Multimedia Info" level="app-if">
-<component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc">
-<unit mrp="os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
-</component>
-<component name="mm_metadata" long-name="Multimedia Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
-<component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="^2" purpose="development">
-<unit bldFile="os/mm/mmresourcemgmt/mmresctrl/group" mrp="os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
-</component>
-</collection>
-<collection name="mmdevicefw" long-name="Multimedia Device Framework" level="device-fw">
-<component name="mdf" long-name="Media Device Framework" introduced="9.2" purpose="mandatory">
-<unit bldFile="os/mm/mmdevicefw/mdf/group" mrp="os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
-</component>
-<component name="speechrecogsupport" long-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 name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
-<component name="videorenderer" long-name="Video Renderer" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/mmswadaptation/videorenderer/group" mrp="os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
-</component>
-</collection>
-<collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw"/>
-<collection name="omxil" long-name="OpenMAX IL" level="hw-if">
-<component name="omxilapi" long-name="OpenMAX IL API" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilapi/group" mrp="os/mm/omxil/omxilapi/group/multimedia_omx_il_api.mrp" version="1"/>
-</component>
-<component name="omxilcore" long-name="OpenMAX IL Core" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcore/group" mrp="os/mm/omxil/omxilcore/group/multimedia_omx_il_core.mrp" version="1"/>
-</component>
-<component name="omxilcomponentcommon" long-name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcomponentcommon/group" mrp="os/mm/omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp" version="1"/>
-</component>
-<component name="omxilrefcomps" long-name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilrefcomps/ref_components/group" mrp="os/mm/omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp" version="1"/>
-</component>
-<component name="mmilapi" long-name="Multimedia Integration Layer API" introduced="^3" purpose="development">
-<unit bldFile="os/mm/omxil/mmilapi/group" mrp="os/mm/omxil/mmilapi/group/multimedia_il_api.mrp"/>
-</component>
-</collection>
-<collection name="devsound" long-name="Sound Device" level="devices">
-<component name="devsoundapi" long-name="DevSound API" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/devsound/devsoundapi/group" mrp="os/mm/devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
-</component>
-<component name="a3fdevsound" long-name="A3F DevSound" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3fdevsound/group" mrp="os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
-</component>
-<component name="a3facf" long-name="A3F Audio Component Framework" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3facf/group" mrp="os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
-</component>
-<component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/devsound/devsoundpluginsupport/group" mrp="os/mm/devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
-</component>
-<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">
-<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">
-<unit bldFile="os/mm/devsound/a3ftrace/group" mrp="os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
-</component>
-<component name="a3fsrvstart" long-name="A3F Server Start" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
-</component>
-</collection>
-<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
-<component name="devsoundhwdeviceapi" long-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 name="a3facl" long-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 name="a3fdevsoundcustomisation" long-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"/>
-</component>
-<component name="refacladapt" long-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"/>
-</component>
-<component name="videohai" long-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 name="dvbhreceiverhai" long-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>
-</block>
-<block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
-<collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
-<component name="exif_api" long-name="Exif API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagingext_plat" long-name="Imaging Extensions Platform Interfaces" level="app-if">
-<component name="jpeg2000_icl_plugin_api" long-name="JPEG2000 ICL plugin API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/jpeg2000_icl_plugin_api/group"/>
-</component>
-<component name="extended_icl_jpeg_api" long-name="Extended ICL Jpeg API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
-</component>
-<component name="h324_annex_k_custom_api" long-name="H324 Annex K Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/h324_annex_k_custom_api/group"/>
-</component>
-<component name="ecam_orientation_custom_api" long-name="ECam Orientation Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_orientation_custom_api/group"/>
-</component>
-<component name="ecam_ui_orientation_override_custom_api" long-name="ECam UI Orientation Override Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
-</component>
-<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>
-</collection>
-<collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
-<component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
-<unit bldFile="os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
-</component>
-<component name="imageadaptationextensions_build" filter="s60" long-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"/>
-</component>
-</collection>
-<collection name="imagingmodules" long-name="Imaging Modules" level="hw-if">
-<component name="exiflib" filter="s60" long-name="Exif Library">
-<unit bldFile="os/imagingext/imagingmodules/exiflib/group"/>
-</component>
-<component name="jp2kcodec" filter="s60" long-name="JPEG2000 Decoder Plugin" plugin="Y">
-<unit bldFile="os/imagingext/imagingmodules/jp2kcodec/group"/>
-</component>
-</collection>
-</block>
-<block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
-<component name="vgi" filter="s60" long-name="VGI">
-<unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
-</component>
-</collection>
-<collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adaptations">
-<component name="m3gcore11" filter="s60" long-name="M3G Core 1.1">
-<unit bldFile="os/graphics/m3g/m3gcore11/group"/>
-</component>
-</collection>
-<collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines">
-<component name="graphicsresource" long-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 name="graphicsresourceadaptation" long-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"/>
-</component>
-<component name="graphicsresourceimplementation" long-name="Graphics Resource Implementation" introduced="^4" purpose="optional">
-<unit bldFile="os/graphics/graphicsresourceservices/graphicsresourceimplementation/group" mrp="os/graphics/graphicsresourceservices/graphicsresourceimplementation/group/graphics_graphicsresourceimplementation.mrp"/>
-</component>
-<component name="graphicsresourceinterface" long-name="Graphics Resource Interface" introduced="^4" purpose="optional">
-<unit bldFile="os/graphics/graphicsresourceservices/graphicsresourceinterface/group" mrp="os/graphics/graphicsresourceservices/graphicsresourceinterface/group/graphics_graphicsresourceinterface.mrp"/>
-</component>
-</collection>
-<collection name="graphicsutils" long-name="Graphics Utils" level="engines">
-<component name="commongraphicsheaders" long-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 name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
-<!-- displayldd to be moved here -->
-<component name="surfacemgr" long-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 name="graphicscomposition" long-name="Graphics Composition" level="engines">
-<component name="openwfcinterface" long-name="OpenWF Composition Interface" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfcinterface/group" mrp="os/graphics/graphicscomposition/openwfcinterface/group/graphics_openwfcinterface.mrp"/>
-</component>
-<component name="openwfcompositionengine" long-name="OpenWF Composition Engine" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/graphicscomposition/openwfcompositionengine/group" mrp="os/graphics/graphicscomposition/openwfcompositionengine/group/graphics_openwfcompositionengine.mrp"/>
-</component>
-<component name="openwfsupport" long-name="OpenWF Support" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfsupport/group" mrp="os/graphics/graphicscomposition/openwfsupport/group/graphics_openwfsupport.mrp"/>
-</component>
-<component name="surfaceupdate" long-name="Surface Update" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/surfaceupdate/group" mrp="os/graphics/graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
-</component>
-</collection>
-<collection name="graphicstest" long-name="Graphics Test" level="app-if">
-<component name="uibench" long-name="UI Bench" introduced="9.2" purpose="development">
-<unit bldFile="os/graphics/graphicstest/uibench/group" mrp="os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
-</component>
-</collection>
-<collection name="graphics_plat" long-name="Graphics Platform Interfaces" level="app-if">
-<component name="m3g_core_api" filter="sf_build" long-name="M3G Core API" class="api">
-<unit bldFile="os/graphics/graphics_plat/m3g_core_api/group"/>
-</component>
-</collection>
-<collection name="graphics_info" long-name="Graphics Info" level="app-if">
-<component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc">
-<unit mrp="os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
-</component>
-<component name="graphics_metadata" long-name="Graphics Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
-</component>
-</collection>
-<collection name="windowing" long-name="Windowing" level="app-if">
-<component name="windowserver" long-name="Window Server" purpose="mandatory">
-<unit bldFile="os/graphics/windowing/windowserver/group" mrp="os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
-</component>
-<component name="windowserverplugins" long-name="Window Server Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/windowing/windowserverplugins/group" mrp="os/graphics/windowing/windowserverplugins/group/graphics_wserv_std_plugins.mrp"/>
-</component>
-</collection>
-<collection name="printingservices" long-name="Printing Services" level="app-if">
-<component name="printerdriversupport" long-name="Printer Driver Support" purpose="optional">
-<unit bldFile="os/graphics/printingservices/printerdriversupport/group" mrp="os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
-</component>
-<component name="printerdrivers" long-name="Printer Drivers" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/printingservices/printerdrivers/group" mrp="os/graphics/printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
-</component>
-</collection>
-<collection name="fbs" long-name="Font and Bitmap Server" level="device-interface">
-<component name="fontandbitmapserver" long-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 name="opengles" long-name="OpenGLES" level="internal-adaptations">
-<component name="openglesinterface" long-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 name="opengles_stub" filter="sf_build" long-name="OpenGL ES Stub" purpose="optional" introduced="^2">
-<unit bldFile="os/graphics/opengles/openglesinterface/group/opengles_stub"/>
-</component>
-</collection>
-<collection name="openvg" long-name="OpenVG" level="internal-adaptations">
-<component name="openvginterface" long-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 name="openvg11" filter="s60" long-name="OpenVG 1.1">
-<!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
-<unit bldFile="os/graphics/openvg/openvginterface/group/openvg11"/>
-</component>
-<component name="sfopenvg" filter="sf_build" long-name="Khronos OpenVG Reference Implementation" introduced="^2" purpose="optional">
-<unit bldFile="os/graphics/openvg/openvgrefimplementation/sfopenvg/group"/>
-</component>
-</collection>
-<collection name="egl" long-name="EGL" level="internal-adaptations">
-<component name="eglinterface" long-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 name="eglswitch" long-name="EGL Switch" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglswitch/group" mrp="os/graphics/egl/eglswitch/group/graphics_eglswitch.mrp"/>
-</component>
-<component name="eglrefimpl" long-name="EGL Reference Implementation" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglrefimpl/group" mrp="os/graphics/egl/eglrefimpl/group/graphics_eglrefimpl.mrp"/>
-</component>
-<component name="egltest" long-name="EGL Tests" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/egl/egltest/group" mrp="os/graphics/egl/egltest/group/graphics_egltest.mrp"/>
-</component>
-</collection>
-<collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
-<component name="gdi" long-name="GDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/gdi/group" mrp="os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
-</component>
-<component name="bitgdi" long-name="BitGDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
-</component>
-<component name="colourpalette" long-name="Colour Palette" introduced="7.0s" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
-</component>
-<component name="screendriver" long-name="Screen Driver" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/graphicsdeviceinterface/screendriver/group" mrp="os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
-</component>
-<component name="directgdi" long-name="DirectGDI" introduced="^3" deprecated="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/directgdi/group" mrp="os/graphics/graphicsdeviceinterface/directgdi/group/graphics_directgdi.mrp"/>
-</component>
-<component name="directgdiinterface" long-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 name="directgdiadaptation" long-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"/>
-</component>
-</collection>
-<collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
-<component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/gdi_tools/group" mrp="os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
-</component>
-</collection>
-<collection name="graphicsapitest" long-name="Graphics API Tests" level="app-if"/>
-</block>
-<block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
-<collection name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" level="text">
-<component name="findutil_api" long-name="Find Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/findutil_api/group"/>
-</component>
-<component name="japanese_language_utilities_api" long-name="Japanese Language Utilities API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
-</component>
-<component name="sortutil_api" long-name="Sorting Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/sortutil_api/group"/>
-</component>
-</collection>
-<collection name="textandloc_pub" long-name="Text and Localisation Public Interfaces" level="text">
-<component name="directory_localizer_api" long-name="Directory Localizer API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_pub/directory_localizer_api/group"/>
-</component>
-</collection>
-<collection name="charconvfw" long-name="Character Conversion" level="encoding">
-<component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional">
-<unit bldFile="os/textandloc/charconvfw/charconv_fw/group" mrp="os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
-</component>
-<component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/charconvplugins/group" mrp="os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
-</component>
-<component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/fatfilenameconversionplugins/group" mrp="os/textandloc/charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
-</component>
-</collection>
-<collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
-<component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/textshaperplugin/group" mrp="os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
-</component>
-<component name="fontstore" long-name="Font Store" purpose="mandatory">
-<unit bldFile="os/textandloc/fontservices/fontstore/group" mrp="os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
-</component>
-<component name="textrendering" long-name="Text Rendering" purpose="mandatory" class="placeholder">
-<!-- placeholder for text code from GDI -->
-</component>
-<component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/freetypefontrasteriser/group" mrp="os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
-</component>
-<component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional">
-<unit bldFile="os/textandloc/fontservices/referencefonts/group" mrp="os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
-</component>
-</collection>
-<collection name="textlayout" long-name="Text Layout" level="text">
-<component name="texthandling" long-name="Text Handling" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/texthandling/group" mrp="os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
-</component>
-<component name="textformatting" long-name="Text Formatting" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/textformatting/group" mrp="os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
-</component>
-</collection>
-<collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
-<!-- components in this collection need to be moved to the right collection.
- Either move into the units' directories, or create a new textandlocutils directory -->
-<component name="numbergrouping" filter="s60" long-name="Number Grouping">
-<unit bldFile="os/textandloc/charconvfw/numbergrouping/group"/>
-</component>
-<component name="jplangutil" filter="s60" long-name="Japanese Language Utilities">
-<unit bldFile="os/textandloc/charconvfw/jplangutil/group"/>
-</component>
-<component name="sortutil" filter="s60" long-name="Sorting Utility">
-<unit bldFile="os/textandloc/charconvfw/sortutil/group"/>
-</component>
-<component name="inlinetext" filter="s60" long-name="Inline Text">
-<unit bldFile="os/textandloc/charconvfw/inlinetext/group"/>
-</component>
-<component name="nearestlangutil" long-name="Nearest Language Util" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-<component name="numberformatting" long-name="Number Formatting" introduced="7.0s" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/numberformatting/group" mrp="os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
-</component>
-</collection>
-<collection name="localesupport" long-name="Locale Support" level="util">
-<component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/localisation/localesupport" mrp="os/textandloc/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
-</component>
-<component name="initlocale" long-name="Initialise Locale" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-</collection>
-<collection name="textandloctools" long-name="Text and Localisation Tools" level="tools">
-<component name="fontcompiler" long-name="Font Compiler" purpose="development" class="placeholder PC">
-<!-- placeholder for split from GDI Tools -->
-</component>
-<component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/bitmapfonttools/group" mrp="os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
-</component>
-</collection>
-<collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
-<component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
-<collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
-<component name="xmlsrv_plat_build" long-name="XML Services Platform Interface Build" filter="s60" class="api">
-<!-- need to fix the configuration used here.
- Either destribute to other components or use the new feature flags confguration mechanisms.
- Remove this component and uncomment the other units when fixed-->
-<unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
-</component>
-<component name="xml_encryption_api" long-name="XML Encryption API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/> -->
-</component>
-<component name="xml_signature_api" long-name="XML Signature API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_signature_api/group"/> -->
-</component>
-<component name="xml_security_engine_utils_api" long-name="XML Security Engine Utils API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/> -->
-</component>
-</collection>
-<collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
-<component name="xmlseccertman" filter="s60" long-name="XML Security Certificate Manager">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
-</component>
-<component name="xmlsec" filter="s60" long-name="XML Security">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsec/group"/>
-</component>
-<component name="xmlseccrypto" filter="s60" long-name="XML Security Crypto">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccrypto/group"/>
-</component>
-<component name="xmlsecwrapper" filter="s60" long-name="XML Security Wrapper">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsecwrapper/group"/>
-</component>
-</collection>
-<collection name="xml" long-name="XML" level="generic">
-<component name="xmlfw" long-name="XML Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmlfw/group" mrp="os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
-</component>
-<component name="libxml2libs" long-name="Libxml2 Libraries" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/libxml2libs/group" mrp="os/xmlsrv/xml/libxml2libs/group/syslibs_libxml2.mrp"/>
-</component>
-<component name="legacyminidomparser" long-name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/legacyminidomparser/GROUP" mrp="os/xmlsrv/xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp"/>
-</component>
-<component name="xmldomandxpath" long-name="XML DOM and XPath" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmldomandxpath/group" mrp="os/xmlsrv/xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
-</component>
-<component name="xmlexpatparser" long-name="XML Expat Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmlexpatparser/group" mrp="os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
-</component>
-<component name="xmllibxml2parser" long-name="XML Libxml2 Parser" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmllibxml2parser/group" mrp="os/xmlsrv/xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
-</component>
-<component name="wbxmlparser" long-name="WBXML Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/wbxmlparser/group" mrp="os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
-</component>
-</collection>
-<collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
-<component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="deviceplatformrelease" level="services" long-name="Device Platform Release" levels="bld mid top">
-<collection name="s60extras" long-name="S60 Extras" level="mid">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="s60extras_build" filter="s60" long-name="S60 Extras Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/S60Extras/group"/>
-</component>
-</collection>
-<collection name="version" long-name="Version" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="version_build" filter="s60" long-name="Version Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/Version/group"/>
-</component>
-</collection>
-<collection name="helps_loc2" long-name="Helps Locale 2" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helps_loc2_build" long-name="Helps Locale 2 Build" filter="s60">
-<unit bldFile="os/deviceplatformrelease/helps_loc2/group"/>
-</component>
-</collection>
-<collection name="sf_config" long-name="SF Config" level="mid">
-<component name="config" filter="s60" long-name="Config" purpose="development" class="config"/>
-<component name="cenrep" filter="sf_build" long-name="ConE Central Repository Config" purpose="development" class="config">
-<!-- will should give the id/path something more unique than cenrep -->
-<unit bldFile="os/deviceplatformrelease/sf_config/cenrep/group"/>
-</component>
-<component name="rombuild_syborg" filter="sf_build" long-name="Syborg iMaker Config" purpose="development" introduced="^3" class="config">
-<unit bldFile="os/deviceplatformrelease/sf_config/rombuild/syborg/group"/>
-</component>
-<component name="rombuild_zoom2" filter="sf_build" long-name="Zoom2 iMaker Config" purpose="development" introduced="^3" class="config">
-<unit bldFile="os/deviceplatformrelease/sf_config/rombuild/zoom2/group"/>
-</component>
-</collection>
-<!-- should be located locally in buildplatforms/group
- <collection id="s60bld" name="S60 Build">
- <component id="buildplatforms" filter="s60" name="Build Platforms">
- <unit bldFile="/tools/buildplatforms/group"/>
- </component>
- </collection>-->
-<collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
-<component name="cedarutils" long-name="Cedar Utils" purpose="development">
-<unit mrp="os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
-</component>
-<component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt" purpose="development" class="config">
-<unit mrp="os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
-</component>
-<component name="foundation_s60_packages" long-name="Foundation S60 Packages" introduced="^3" deprecated="^3" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/symbianosbld/foundation_s60_packages/foundation_s60_packages.mrp"/>
-</component>
-</collection>
-<collection name="foundation_system" long-name="Foundation System" level="top">
-<component name="system_model" long-name="System Model" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
-</component>
-</collection>
-<collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
-<component name="deviceplatformrelease_metadata" long-name="Device Platform Release Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="osrndtools" level="services" long-name="OS R&D tools" levels="fw trace">
-<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"/>
-</component>
-<component name="testinterface" filter="s60" long-name="Test Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/testinterface/group"/>
-</component>
-<component name="testserver" filter="s60" long-name="Test Server" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserver/group"/>
-</component>
-<component name="testengine" filter="s60" long-name="Test Engine" purpose="development">
-<unit bldFile="os/osrndtools/stif/testengine/group"/>
-</component>
-<component name="testserverstarter" filter="s60" long-name="Test Server Starter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserverstarter/group"/>
-</component>
-<component name="stiftfwif" filter="s60" long-name="STIF Test Framework Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/stiftfwif/group"/>
-</component>
-<component name="consoleui" filter="s60" long-name="Console UI" purpose="development">
-<unit bldFile="os/osrndtools/stif/consoleui/group"/>
-</component>
-<component name="testcombiner" filter="s60" long-name="Test Combiner" purpose="development">
-<unit bldFile="os/osrndtools/stif/testcombiner/group"/>
-</component>
-<component name="demomodule" filter="s60" long-name="Demo Module" purpose="development">
-<unit bldFile="os/osrndtools/stif/demomodule/group"/>
-</component>
-<component name="atslogger" filter="s60" long-name="ATS Logger" purpose="development">
-<unit bldFile="os/osrndtools/stif/atslogger/group"/>
-</component>
-<component name="atsinterface" filter="s60" long-name="ATS Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/atsinterface/group"/>
-</component>
-<component name="testscripter" filter="s60" long-name="Test Scripter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testscripter/group"/>
-</component>
-<component name="suevent" filter="s60" long-name="SU Event" purpose="development">
-<unit bldFile="os/osrndtools/stif/suevent/group"/>
-</component>
-<component name="stifkerneltestclassbase" filter="s60" long-name="STIF Kernel Test Class Base" purpose="development">
-<!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
-<!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
-</component>
-<component name="stif_build" filter="s60" long-name="STIF Build" purpose="development">
-<!-- move exports into self-contained component. Remove this when configuration is in place-->
-<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">
-<unit bldFile="os/osrndtools/memspy/memspy_plat/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/engine/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/console/group"/>
-</component>
-<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>
-</collection>
-<collection name="hti" long-name="Harmonized Test Interface" level="trace">
-<component name="hti_plat" filter="s60" long-name="HTI Platform Interfaces" purpose="development" class="api">
-<unit bldFile="os/osrndtools/hti/hti_plat/group"/>
-</component>
-<component name="hticfg" filter="s60" long-name="HTI Config" purpose="development">
-<unit bldFile="os/osrndtools/hti/hticfg/group"/>
-</component>
-<component name="htiautostart" filter="s60" long-name="HTI Autostart" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiautostart/group"/>
-</component>
-<component name="htiframework" filter="s60" long-name="HTI Framework" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiframework/group"/>
-</component>
-<component name="hticommplugins" filter="s60" long-name="HTI Communication Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
-</component>
-<component name="htiserviceplugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
-</component>
-<component name="htifilehlp" filter="s60" long-name="HTI File Help" purpose="development">
-<unit bldFile="os/osrndtools/hti/htifilehlp/group"/>
-</component>
-<component name="htiwatchdog" filter="s60" long-name="HTI Watchdog" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiwatchdog/group"/>
-</component>
-<component name="hti_build" filter="s60" long-name="HTI Build" purpose="development">
-<!-- move exports into self-contained component.-->
-<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">
-<block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
-<collection name="appsupport_pub" long-name="Generic Application Support Public Interfaces" level="specific">
-<component name="flash_viewer_framework_api" long-name="Flash Viewer Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
-</component>
-<component name="network_status_api" long-name="Network Status API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/network_status_api/group"/>
-</component>
-</collection>
-<collection name="appsupport_plat" long-name="Generic Application Support Platform Interfaces" level="specific">
-<component name="action_plugin_api" long-name="Action Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/action_plugin_api/group"/>
-</component>
-<component name="application_orientation_api" long-name="Application Orientation API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/application_orientation_api/group"/>
-</component>
-<component name="context_access_api" long-name="Context Access API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_access_api/group"/>
-</component>
-<component name="context_framework_services_api" long-name="Context Framework Services API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_services_api/group"/>
-</component>
-<component name="context_framework_client_api" long-name="Context Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_client_api/group"/>
-</component>
-<component name="context_framework_listener_api" long-name="Context Framework Listener API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_listener_api/group"/>
-</component>
-<component name="context_framework_version_api" long-name="Context Framework Version API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_version_api/group"/>
-</component>
-<component name="context_source_plugin_api" long-name="Context Source Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_plugin_api/group"/>
-</component>
-<component name="context_source_settings_manager_api" long-name="Context Source Settings Manager API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_settings_manager_api/group"/>
-</component>
-<component name="context_subscription_api" long-name="Context Subscription API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_subscription_api/group"/>
-</component>
-<component name="key_event_framework_api" long-name="Key Event Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_api/group"/>
-</component>
-<component name="key_event_framework_mapper_api" long-name="Key Event Framework Mapper API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_mapper_api/group"/>
-</component>
-<component name="media_keys_definition_api" long-name="Media Keys Definition API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/media_keys_definition_api/group"/>
-</component>
-<component name="ood_threshold_api" long-name="OOD Threshold API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/ood_threshold_api/group"/>
-</component>
-<component name="oom_monitor_api" long-name="OOM Monitor API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_api/group"/>
-</component>
-<component name="oom_monitor_plugin_api" long-name="OOM Monitor Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_plugin_api/group"/>
-</component>
-<component name="operation_provider_api" long-name="Operation Provider API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/operation_provider_api/group"/>
-</component>
-<component name="phonecmdhandler_api" long-name="Phone Command Handler API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/phonecmdhandler_api/group"/>
-</component>
-<component name="restore_factory_settings_api" long-name="Restore Factory Settings API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_api/group"/>
-</component>
-<component name="restore_factory_settings_plugin_api" long-name="Restore Factory Settings Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_plugin_api/group"/>
-</component>
-<component name="secondary_display_accfw_api" long-name="Secondary Display Accessory Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_accfw_api/group"/>
-</component>
-<component name="secondary_display_startup_api" long-name="Secondary Display Startup API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_startup_api/group"/>
-</component>
-<component name="secondary_display_sysap_api" long-name="Secondary Display System Application API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_sysap_api/group"/>
-</component>
-<component name="secondary_display_system_state_api" long-name="Secondary Display System State API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_system_state_api/group"/>
-</component>
-<component name="sensor_user_setting_api" long-name="Sensor User Setting API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/sensor_user_setting_api/group"/>
-</component>
-<component name="startup_configuration_api" long-name="Startup Configuration API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/startup_configuration_api/group"/>
-</component>
-<component name="system_application_key_handler_plugin_api" long-name="System Application Key Handler Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_key_handler_plugin_api/group"/>
-</component>
-<component name="system_application_light_control_plugin_api" long-name="System Application Light Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_light_control_plugin_api/group"/>
-</component>
-<component name="system_application_notification_api" long-name="System Application Notification API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_notification_api/group"/>
-</component>
-<component name="system_application_plugin_callback_api" long-name="System Application Plug-in Callback API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
-</component>
-<component name="flash_mmi_service_interface_custom_api" long-name="Flash MMI Service Interface Custom API" filter="s60,!sf_build" introduced="^2" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/flash_mmi_service_interface_custom_api/group"/>
-</component>
-<component name="flash_netscape_plugin_command_api" long-name="Flash Netscape Plugin Command API" filter="s60,!sf_build" introduced="^2" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/flash_netscape_plugin_command_api/group"/>
-</component>
-</collection>
-<collection name="contextframework" long-name="Context Framework" level="framework">
-<!-- the units that are commented out need to be put back when configuration is in place.
- They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
-<component name="cfw" filter="s60" long-name="Context Framework">
-<!--<unit bldFile="contextframework/cfw/group"/> -->
-</component>
-<component name="cfwplugins" filter="s60" long-name="Context Framework Plugins" plugin="Y">
-<!--<unit bldFile="contextframework/cfwplugins/group"/>-->
-</component>
-<component name="contextframework_build" filter="s60" long-name="Context Framework Build">
-<unit bldFile="mw/appsupport/contextframework/group"/>
-</component>
-</collection>
-<collection name="coreapplicationuis" long-name="Core Application UIs" level="server">
-<component name="dbrecovery" filter="s60" long-name="Database Recovery">
-<unit bldFile="mw/appsupport/coreapplicationuis/dbrecovery/group"/>
-</component>
-<component name="nspswsplugin" filter="s60" long-name="NSPS WS Plugin" plugin="Y">
-<!-- No Service Power Save? Window Server? Please elaborate-->
-<unit bldFile="mw/appsupport/coreapplicationuis/nspswsplugin/group"/>
-</component>
-<component name="rfs" filter="s60" long-name="Restore Factory Settings">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfs/group"/>
-</component>
-<component name="rfsplugins" filter="s60" long-name="Restore Factory Settings Plugins" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/group"/>
-</component>
-<component name="sysap" filter="s60" long-name="System Application">
-<unit bldFile="mw/appsupport/coreapplicationuis/sysap/group"/>
-</component>
-<component name="variatedsettings" filter="s60" long-name="Variated Settings" class="config">
-<unit bldFile="mw/appsupport/coreapplicationuis/variatedsettings/group"/>
-</component>
-<component name="accfwuinotifier" filter="s60" long-name="Accessory Framework UI Notifier" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/accfwuinotifier/group"/>
-</component>
-<component name="kefmapper" filter="s60" long-name="Key Event Framework">
-<unit bldFile="mw/appsupport/coreapplicationuis/kefmapper/group"/>
-</component>
-<component name="advancedtspcontroller" filter="s60" long-name="Advanced TSP Controller">
-<unit bldFile="mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
-</component>
-<component name="powersaveutilities" filter="s60" long-name="Power Save Utilities">
-<unit bldFile="mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
-</component>
-<component name="gsserverenginestub" filter="s60" long-name="GS Server Engine Stub">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
-</component>
-<component name="gsserverengine" filter="s60" long-name="GS Server Engine">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverengine/group"/>
-</component>
-<component name="sensordatacompensatorplugin" filter="s60" long-name="Sensor Data Compensator Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/group"/>
-</component>
-<component name="atcmdplugin" long-name="AT Command Plugin" filter="s60,!oem_build" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/atcmdplugin/group"/>
-</component>
-</collection>
-<collection name="flashliteapi_3_1" long-name="Flash Lite API 3.1" level="specific">
-<!-- collection is really a component. Move down a directory -->
-<component name="flashliteapi_3_1_build" long-name="Flash Lite API Build" filter="s60" introduced="^2"/>
-</collection>
-<collection name="mediakeys" long-name="Media Keys" level="plugin">
-<!-- collection is really a component. Move down a directory -->
-<component name="mediakeys_build" filter="s60" long-name="Media Keys Build">
-<unit bldFile="mw/appsupport/mediakeys/group"/>
-</component>
-</collection>
-<collection name="startupservices" long-name="Startup Services" level="system">
-<component name="splashscreen" filter="s60" long-name="Splash Screen">
-<unit bldFile="mw/appsupport/startupservices/splashscreen/group"/>
-</component>
-<component name="startupanimation" filter="s60" long-name="Startup Animation">
-<unit bldFile="mw/appsupport/startupservices/startupanimation/group"/>
-</component>
-<component name="startup" long-name="Startup Application" filter="s60">
-<unit bldFile="mw/appsupport/startupservices/startup/group"/>
-</component>
-</collection>
-<collection name="sysresmonitoring" long-name="System Resource Monitoring" level="system">
-<component name="oodmonitor" filter="s60" long-name="OOD Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oodmonitor/group"/>
-</component>
-<component name="oommonitor" filter="s60" long-name="OOM Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oommonitor/group"/>
-</component>
-</collection>
-<collection name="systemsettings" long-name="System Settings" level="system">
-<component name="gssensorplugin" filter="s60" long-name="GS Sensor Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gssensorplugin/group"/>
-</component>
-<component name="gsaccessoryplugin" filter="s60" long-name="GS Accessory Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gsaccessoryplugin/group"/>
-</component>
-</collection>
-<collection name="filehandling" long-name="File Handling" level="server">
-<component name="fileconverterfw" long-name="File Converter Framework" purpose="optional">
-<unit bldFile="mw/appsupport/filehandling/fileconverterfw/group" mrp="mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
-</component>
-<component name="htmltorichtextconverter" long-name="HTML to RichText Converter" introduced="7.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/htmltorichtextconverter/group" mrp="mw/appsupport/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
-</component>
-<component name="richtexttohtmlconverter" long-name="RichText to HTML Converter" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
-</component>
-</collection>
-<collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
-<component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
-</component>
-</collection>
-<collection name="commonappservices" long-name="Common Application Services" level="framework">
-<component name="alarmserver" long-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"/>
-</component>
-<component name="alarmservertest" long-name="Alarm Server Test" deprecated="^3" introduced="8.1" purpose="development">
-<unit bldFile="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
-</component>
-<component name="appservicesdocs" long-name="Application Services Documentation" purpose="development" class="doc">
-<unit mrp="mw/appsupport/commonappservices/appservicesdocs/app-services_documentation.mrp"/>
-</component>
-<component name="backuprestorenotification" long-name="Backup Restore Notification" introduced="8.1" purpose="optional">
-<unit bldFile="mw/appsupport/commonappservices/backuprestorenotification/group" mrp="mw/appsupport/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
-</component>
-</collection>
-<collection name="tzservices" long-name="Time Zone Services" level="plugin">
-<component name="tzserver" long-name="Time Zone Server" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzserver/group" mrp="mw/appsupport/tzservices/tzserver/group/app-services_tz.mrp"/>
-</component>
-<component name="tzloc" long-name="Time Zone Localization" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzloc/group" mrp="mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
-</component>
-<component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzlocrscfactory/group" mrp="mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
-</component>
-<component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzdatabase/group" mrp="mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
-</component>
-</collection>
-<collection name="contenthandling" long-name="Content Handling" level="plugin">
-<component name="webrecognisers" long-name="Web Recognisers" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/contenthandling/webrecognisers/group" mrp="mw/appsupport/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
-</component>
-</collection>
-<collection name="openenvutils" long-name="Open Environment Utilities" level="specific">
-<component name="commandshell" long-name="Command Shell" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/commandshell/group" mrp="mw/appsupport/openenvutils/commandshell/group/oetools_zsh.mrp"/>
-</component>
-<component name="telnetserver" long-name="Telnet Server" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/telnetserver/group" mrp="mw/appsupport/openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
-</component>
-</collection>
-<collection name="printingsupport" long-name="Printing Support" level="generic">
-<component name="printinguisupport" long-name="Printing UI Support" purpose="optional" introduced="^2" deprecated="^3">
-<unit bldFile="mw/appsupport/printingsupport/printinguisupport/group" mrp="mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
-</component>
-</collection>
-<collection name="appfw" long-name="Application Framework" level="framework">
-<component name="apparchitecture" long-name="Application Architecture" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/apparchitecture/group" mrp="mw/appsupport/appfw/apparchitecture/group/app-framework_apparc.mrp"/>
-</component>
-<component name="viewserver" long-name="View Server" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/viewserver/group" mrp="mw/appsupport/appfw/viewserver/group/app-framework_viewsrv.mrp"/>
-</component>
-</collection>
-<collection name="applaunchservices" long-name="Application Launch Services" level="generic">
-<component name="aftermarketappstarter" long-name="After Market Application Starter" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/aftermarketappstarter/group" mrp="mw/appsupport/applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
-</component>
-<component name="applaunchplugins" long-name="Application Launch Plugins" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/applaunchplugins/group" mrp="mw/appsupport/applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
-</component>
-</collection>
-<collection name="tzpcside" long-name="Time Zone PC Side" level="plugin">
-<component name="tzcompiler" long-name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config PC">
-<unit bldFile="mw/appsupport/tzpcside/tzcompiler/group" mrp="mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
-</component>
-</collection>
-<collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
-<component name="appsupport_metadata" long-name="Generic Application Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="securitysrv" level="generic" long-name="Security Services" levels="plugin framework server generic specific">
-<collection name="secsrv_plat" long-name="Security Services Platform Interfaces" level="specific">
-<component name="cms_api" long-name="CMS API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/cms_api/group"/>
-</component>
-<component name="pkcs12_parser_api" long-name="PKCS12 Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkcs12_parser_api/group"/>
-</component>
-<component name="java_utils_api" long-name="Java Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/java_utils_api/group"/>
-</component>
-<component name="wim_cert_api" long-name="WIM Cert API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/wim_cert_api/group"/>
-</component>
-<component name="device_key_store_encryption_plugin_api" long-name="Device Key Store Encryption Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/device_key_store_encryption_plugin_api/group"/>
-</component>
-<component name="x509certnameparser_api" long-name="X.509 Certificate Name Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
-</component>
-<component name="remote_lock_api" long-name="Remote Lock API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
-</component>
-<component name="pkidialog_api" long-name="PKI Dialog API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
-</component>
-<component name="provisioning_api" long-name="Provisioning API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/provisioning_api/group"/>
-</component>
-<component name="keyguard_configuration_api" long-name="Keyguard Configuration API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_configuration_api/group"/>
-</component>
-<component name="keylock_policy_api" long-name="Keylock Policy API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keylock_policy_api/group"/>
-</component>
-<component name="security_code_ui_api" long-name="Security Code UI API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
-</component>
-<component name="gba_api" long-name="GBA API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/gba_api/group"/>
-</component>
-<component name="keyguard_access_api" long-name="Keyguard Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_access_api/group"/>
-</component>
-<component name="devicelock_access_api" long-name="Device Lock Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devicelock_access_api/group"/>
-</component>
-<component name="lockapp_server_api" long-name="Lock Application Server API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
-</component>
-<component name="devencadaptation_api" long-name="Device Encryption Adaptation API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
-</component>
-<component name="devenccommonutils_api" long-name="Device Encryption Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
-</component>
-</collection>
-<collection name="cms" long-name="Certificate Management Service" level="server">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="cms_build" filter="s60" long-name="CMS" introduced="^3">
-<unit bldFile="mw/securitysrv/cms/group"/>
-</component>
-</collection>
-<collection name="pkiutilities" long-name="PKI Utilities" level="plugin">
-<component name="x509certnameparser" filter="s60" long-name="X.509 Certificate Name Parser">
-<unit bldFile="mw/securitysrv/pkiutilities/x509certnameparser/group"/>
-</component>
-<component name="pkcs12" filter="s60" long-name="PKCS #12">
-<unit bldFile="mw/securitysrv/pkiutilities/pkcs12/group"/>
-</component>
-<component name="certmanui" filter="s60" long-name="Certificate Management UI">
-<unit bldFile="mw/securitysrv/pkiutilities/certmanui/group"/>
-</component>
-<component name="ctsecuritydialogs" filter="s60" long-name="Crypto Token Security Dialogs">
-<unit bldFile="mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
-</component>
-<component name="certsaver" filter="s60" long-name="Certificate Saver">
-<unit bldFile="mw/securitysrv/pkiutilities/certsaver/group"/>
-</component>
-<component name="secmodui" filter="s60" long-name="Security Module UI">
-<unit bldFile="mw/securitysrv/pkiutilities/secmodui/group"/>
-</component>
-<component name="devicetoken" filter="s60" long-name="Device Token">
-<unit bldFile="mw/securitysrv/pkiutilities/devicetoken/group"/>
-</component>
-<component name="certificates" filter="s60" long-name="Certificates">
-<unit bldFile="mw/securitysrv/pkiutilities/Certificates/group" filter="sf_build"/>
-</component>
-<component name="pkiutilities_build" filter="s60" long-name="PKI Utilities Build">
-<!-- need to split this into the above components -->
-<unit bldFile="mw/securitysrv/pkiutilities/group"/>
-</component>
-<component name="ocsp" long-name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
-<unit bldFile="mw/securitysrv/pkiutilities/ocsp/group" mrp="mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
-</component>
-</collection>
-<collection name="wim" long-name="Wireless Identity Module " level="framework">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="wim_build" filter="s60" long-name="WIM Build">
-<unit bldFile="mw/securitysrv/wim/group"/>
-</component>
-</collection>
-<collection name="remotelock" long-name="Remote Lock" level="generic">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="remotelock_build" filter="s60" long-name="Remote Lock Build">
-<unit bldFile="mw/securitysrv/remotelock/group"/>
-</component>
-</collection>
-<collection name="securitydialogs" long-name="Security Dialogs" level="specific">
-<component name="keylockpolicyapi" filter="s60" long-name="Keylock Policy API">
-<unit bldFile="mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
-</component>
-<component name="autolock" long-name="Autolock" filter="s60">
-<unit bldFile="mw/securitysrv/securitydialogs/autolock/group"/>
-</component>
-<component name="secui" filter="s60" long-name="Security UI">
-<unit bldFile="mw/securitysrv/securitydialogs/secui/group"/>
-</component>
-<component name="securitynotifier" filter="s60" long-name="Security Notifier">
-<unit bldFile="mw/securitysrv/securitydialogs/securitynotifier/group"/>
-</component>
-<component name="lockclient" filter="s60" long-name="Lock Client" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockclient/group"/>
-</component>
-<component name="lockapp" filter="s60" long-name="Lock Application" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockapp/group"/>
-</component>
-<component name="secuinotifications" long-name="Security UI Notifications" introduced="^4" filter="s60">
-<unit bldFile="mw/securitysrv/securitydialogs/secuinotifications" proFile="secuinotifications.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="boottimeintegritycheck_build" filter="s60" long-name="Boot Time Integrity Check Build">
-<unit bldFile="mw/securitysrv/boottimeintegritycheck/group"/>
-</component>
-</collection>
-<collection name="gba" long-name="Generic Bootstrapping Architecture" level="server">
-<component name="uicc" filter="s60" long-name="UICC" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/uicc/group"/>
-</component>
-<component name="gbaserver" filter="s60" long-name="GBA Server" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaserver/group"/>
-</component>
-<component name="gbaapi" filter="s60" long-name="GBA API" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaapi/group"/>
-</component>
-<component name="gbafilter" filter="s60" long-name="GBA HTTP Filter" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/gbafilter/group"/>
-</component>
-<component name="gba_build" filter="s60" long-name="Generic Boot Architecture Build" introduced="^2">
-<!-- need to split this into the above components, or remove #includes and make this GBA ROM -->
-<unit bldFile="mw/securitysrv/gba/group"/>
-</component>
-</collection>
-<collection name="devencdiskutils" long-name="Device Encryption Disk Utils" level="server">
-<component name="devenccommonutils" filter="s60" long-name="Device Encryption Common Utils" introduced="^3">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncCommonUtils/group"/>
-</component>
-<component name="devencrfsplugin" filter="s60" long-name="Device Encryption RFS Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncRfsPlugin/group"/>
-</component>
-<component name="pk5recognizer" filter="s60" long-name="Device Encryption Pk5 Recognizer" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/Pk5Recognizer/group"/>
-</component>
-<component name="devencstarter" filter="s60" long-name="Device Encryption Starter" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncStarter/group"/>
-</component>
-<component name="devencdiskutils" filter="s60" long-name="Device Encryption Disk Utils Build" introduced="^3">
-<!-- need to split this into the above components, or remove #includes and make this a ROM component-->
-<unit bldFile="mw/securitysrv/devencdiskutils/group"/>
-</component>
-</collection>
-<collection name="securitysrv_info" long-name="Security Services Info" level="specific">
-<component name="securitysrv_metadata" long-name="Security Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="drm" level="generic" long-name="DRM" levels="plugin framework server generic specific">
-<collection name="drm_plat" long-name="DRM Platform Interfaces" level="specific">
-<component name="roap_api" long-name="ROAP API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/roap_api/group"/>
-</component>
-<component name="drm_common_api" long-name="DRM Common API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_common_api/group"/>
-</component>
-<component name="drm_rights_api" long-name="DRM Rights API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_rights_api/group"/>
-</component>
-<component name="drm_legacy_api" long-name="DRM Legacy API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_legacy_api/group"/>
-</component>
-<component name="dcf_repository_api" long-name="DCF Repository API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/dcf_repository_api/group"/>
-</component>
-<component name="drm_service_api" long-name="DRM Service API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_service_api/group"/>
-</component>
-<component name="drm_secondary_display_api" long-name="DRM Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_secondary_display_api/group"/>
-</component>
-<component name="drm_license_manager_api" long-name="DRM License Manager API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_license_manager_api/group"/>
-</component>
-<component name="drm_utility_api" long-name="DRM Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_utility_api/group"/>
-</component>
-<component name="drm_agents_api" long-name="DRM Agents API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_agents_api/group"/>
-</component>
-<component name="wmdrm_core_api" long-name="WM DRM Core API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_core_api/group"/>
-</component>
-<component name="wmdrm_access_api" long-name="WMDRM Access API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_access_api/group"/>
-</component>
-<component name="camese_utility_api" long-name="Camese Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_utility_api/group"/>
-</component>
-<component name="camese_framework_api" long-name="Camese Framework API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_framework_api/group"/>
-</component>
-</collection>
-<collection name="drm_pub" long-name="DRM Public Interfaces" level="specific">
-<component name="drm_helper_api" long-name="DRM Helper API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_helper_api/group"/>
-</component>
-<component name="oma_drm_caf_agent_api" long-name="OMA DRM CAF Agent API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/group"/>
-</component>
-<component name="drm_license_checker_api" long-name="DRM License Checker API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_license_checker_api/group"/>
-</component>
-</collection>
-<collection name="commondrm" long-name="Common DRM" level="generic">
-<!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
-<component name="drmencryptor" filter="s60" long-name="DRM Encryptor" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmsettingsplugin" filter="s60" long-name="DRM Settings Plugin" plugin="Y" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmrightsmanagerui" filter="s60" long-name="DRM Rights Manager UI">
-<unit bldFile="mw/drm/commondrm/drmrightsmanagerui/help/group"/>
-</component>
-<component name="drmutility" filter="s60" long-name="DRM Utility">
-<!-- Uncomment unit when configuration is in place. Currently #included from commondrm_build -->
-<!--<unit bldFile="commondrm/drmutility/group"/>-->
-</component>
-<component name="drmserviceapiwrapper" filter="s60" long-name="DRM Service API Wrapper">
-<unit bldFile="mw/drm/commondrm/drmserviceapiwrapper/group"/>
-</component>
-<component name="drmrightsstoringlocation" filter="s60" long-name="DRM Rights Storing Location">
-<unit bldFile="mw/drm/commondrm/drmrightsstoringlocation/group"/>
-</component>
-<component name="commondrm_build" filter="s60" long-name="Common DRM Build">
-<!-- should be split into the above files, or them collapsed into a single component -->
-<unit bldFile="mw/drm/commondrm/group"/>
-</component>
-</collection>
-<collection name="omadrm" long-name="OMA DRM" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="omadrm_build" filter="s60" long-name="OMA DRM Build">
-<unit bldFile="mw/drm/omadrm/group"/>
-</component>
-<component name="foundationcerts" filter="sf_build" long-name="Foundation Certificates">
-<unit bldFile="mw/drm/omadrm/foundationcerts/group"/>
-</component>
-</collection>
-<collection name="wmdrm" long-name="Windows Media DRM" level="framework">
-<!-- collection is really a component. Move down a directory -->
-<component name="wmdrm_build" filter="s60" long-name="WM DRM Build">
-<unit bldFile="mw/drm/wmdrm/group"/>
-</component>
-</collection>
-<collection name="drm_info" long-name="DRM Info" level="specific"/>
-</block>
-<block name="locationsrv" level="specific" long-name="Location Services" levels="plugin fw server if">
-<collection name="locsrv_pub" long-name="Location Services Public Interfaces" level="if">
-<component name="landmarks_search_api" long-name="Landmarks Search API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
-</component>
-<component name="landmarks_api" long-name="Landmarks API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/group"/>
-</component>
-<component name="landmarks_database_management_api" long-name="Landmarks Database Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/group"/>
-</component>
-<component name="location_triggering_api" long-name="Location Triggering API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/location_triggering_api/group"/>
-</component>
-<component name="blid_application_satellite_info_api" long-name="BLID Application Satellite Info API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/group"/>
-</component>
-</collection>
-<collection name="locsrv_plat" long-name="Location Services Platform Interfaces" level="if">
-<component name="map_and_navigation_api" long-name="Map and Navigation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/group"/>
-</component>
-<component name="map_and_navigation_provider_discovery_api" long-name="Map and Navigation Provider Discovery API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/group"/>
-</component>
-<component name="geocoding_api" long-name="Geocoding API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
-</component>
-<component name="map_image_api" long-name="Map Image API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/group"/>
-</component>
-<component name="map_and_navigation_aiw_api" long-name="Map and Navigation AIW API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_aiw_api/group"/>
-</component>
-<component name="map_and_navigation_provider_api" long-name="Map and Navigation Provider API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_api/group"/>
-</component>
-<component name="landmarks_category_definition_api" long-name="Landmarks Category Definition API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
-</component>
-<component name="supl_settings_api" long-name="SUPL Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
-</component>
-<component name="location_settings_launch_api" long-name="Location Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/group"/>
-</component>
-<component name="map_image_conversion_plugin_api" long-name="Map Image Conversion Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/group"/>
-</component>
-<component name="psy_configuration_ui_plugin_api" long-name="PSY Configuration UI Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/psy_configuration_ui_plugin_api/group"/>
-</component>
-<component name="np_proxy_configuration_api" long-name="NP Proxy Configuration API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/np_proxy_configuration_api/group"/>
-</component>
-<component name="supl_terminal_initiation_api" long-name="SUPL Terminal Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/group"/>
-</component>
-<component name="location_notation_preferences_settings_api" long-name="Location Notation Preferences Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_notation_preferences_settings_api/group"/>
-</component>
-<component name="supl_settings_notifier_secondary_display_api" long-name="SUPL Settings Notifier Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_notifier_secondary_display_api/group"/>
-</component>
-<component name="supl_network_initiation_api" long-name="SUPL Network Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/group"/>
-</component>
-<component name="privacy_notifiers_secondary_display_api" long-name="Privacy Notifiers Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/privacy_notifiers_secondary_display_api/group"/>
-</component>
-<component name="oma_supl_configuration_parameter_api" long-name="OMA SUPL Configuration Parameter API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_configuration_parameter_api/group"/>
-</component>
-<component name="supl_query_secondary_display_api" long-name="SUPL Query Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_query_secondary_display_api/group"/>
-</component>
-<component name="location_triggering_management_api" long-name="Location Triggering Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_management_api/group"/>
-</component>
-<component name="location_triggering_status_information_api" long-name="Location Triggering Status Information API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_status_information_api/group"/>
-</component>
-<component name="oma_supl_asn_codec_plugin_api" long-name="OMA SUPL ASN Codec Plugin API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
-</component>
-<component name="query_and_notification_api" long-name="Query and Notification API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/query_and_notification_api/group"/>
-</component>
-<component name="location_local_variation_api" long-name="Location Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_local_variation_api/group"/>
-</component>
-</collection>
-<collection name="genericpositioningplugins" long-name="Generic Positioning Plugins" level="plugin">
-<component name="locationnpppsy" filter="s60" long-name="Location Positioning Proxy PSY" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
-</component>
-<component name="locationsuplpsy" filter="s60" long-name="Location SUPL PSY" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationsuplpsy/group"/>
-</component>
-<component name="genericpositioningplugins_build" filter="s60" long-name="Generic Positioning Plugins Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/genericpositioningplugins/group"/>
-</component>
-</collection>
-<collection name="landmarks" long-name="Landmarks" level="server">
-<component name="locationlandmarks" filter="s60" long-name="Location Landmarks">
-<unit bldFile="mw/locationsrv/landmarks/locationlandmarks/group"/>
-</component>
-</collection>
-<collection name="locationmapnavfw" long-name="Location Map and Navigation Framework" level="fw">
-<component name="mnlibrary" filter="s60" long-name="Map and Navigation Library">
-<unit bldFile="mw/locationsrv/locationmapnavfw/library/group"/>
-</component>
-<component name="mnaiwprovider" filter="s60" long-name="Map and Navigation AIW Provider" plugin="Y">
-<unit bldFile="mw/locationsrv/locationmapnavfw/aiwprovider/group"/>
-</component>
-<component name="locationmapnavfw_build" filter="s60" long-name="Location Map and Navigation Framework Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/locationmapnavfw/group"/>
-</component>
-</collection>
-<collection name="locationsystemui" long-name="Location System UI" level="if">
-<component name="locationsysui" filter="s60" long-name="Location System UI">
-<unit bldFile="mw/locationsrv/locationsystemui/locationsysui/group"/>
-</component>
-</collection>
-<collection name="supl" long-name="SUPL" level="fw">
-<component name="locationsuplfw" filter="s60" long-name="Location SUPL Framework">
-<unit bldFile="mw/locationsrv/supl/locationsuplfw/group"/>
-</component>
-<component name="locationomasuplprotocolhandler" filter="s60" long-name="OMA SUPL Protocol Handler">
-<unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/group"/>
-</component>
-<component name="supltiapiimplementation" filter="s60" long-name="SUPL TI API Implementation" introduced="^3">
-<unit bldFile="mw/locationsrv/supl/supltiapiimplementation/group"/>
-</component>
-</collection>
-<collection name="locationtriggering" long-name="Location Triggering" level="server">
-<component name="ltlogger" filter="s60" long-name="LT Logger">
-<unit bldFile="mw/locationsrv/locationtriggering/ltlogger/group"/>
-</component>
-<component name="ltclientlib" filter="s60" long-name="LT Client Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltclientlib/group"/>
-</component>
-<component name="ltmanagementlib" filter="s60" long-name="LT Management Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmanagementlib/group"/>
-</component>
-<component name="ltcontainer" filter="s60" long-name="LT Container">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontainer/group"/>
-</component>
-<component name="ltserver" filter="s60" long-name="LT Server">
-<unit bldFile="mw/locationsrv/locationtriggering/ltserver/group"/>
-</component>
-<component name="ltstrategypluginapi" filter="s60" long-name="LT Strategy Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategypluginapi/group"/>
-</component>
-<component name="ltstrategyengine" filter="s60" long-name="LT Strategy Engine">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategyengine/group"/>
-</component>
-<component name="ltmovementdetectionpluginapi" filter="s60" long-name="Movement Detection Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmovementdetectionpluginapi/group"/>
-</component>
-<component name="ltcellidmovementdetector" filter="s60" long-name="Cell ID Movement Detector">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/>
-</component>
-<component name="lbtmgmtui" filter="s60" long-name="LBT Management UI" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/lbtmgmtui/group"/>
-</component>
-<component name="ltcontextsourceplugin" filter="s60" long-name="LT Context Source Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontextsourceplugin/group"/>
-</component>
-<component name="locationtriggering_build" filter="s60" long-name="Location Triggering Build">
-<!-- should remove #include from this and maybe put exports in the above components -->
-<unit bldFile="mw/locationsrv/locationtriggering/group"/>
-</component>
-</collection>
-</block>
-<block name="accesssec" level="generic" long-name="Access Security" levels="plugin framework server generic specific">
-<collection name="accesssec_plat" long-name="Access Security Platform Interfaces" level="specific">
-<component name="wapi_security_settings_ui_api" long-name="WAPI Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_security_settings_ui_api/group"/>
-</component>
-<component name="wep_security_settings_ui_api" long-name="WEP Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wep_security_settings_ui_api/group"/>
-</component>
-<component name="wi-fi_protected_setup_ui_api" long-name="Wi-Fi Protected Setup UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
-</component>
-<component name="wlan_eap_settings_ui_api" long-name="WLAN EAP Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wlan_eap_settings_ui_api/group"/>
-</component>
-<component name="wpa_security_settings_ui_api" long-name="WPA Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wpa_security_settings_ui_api/group"/>
-</component>
-<component name="eap_vpn_api" long-name="EAP VPN API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
-</component>
-<component name="eapsim_db_api" long-name="EAP-SIM DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapsim_db_api/group"/>
-</component>
-<component name="eap_type_api" long-name="EAP Type API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_type_api/group"/>
-</component>
-<component name="eaptlspeap_db_api" long-name="EAP-TLS-PEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eaptlspeap_db_api/group"/>
-</component>
-<component name="eapleap_db_api" long-name="LEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapleap_db_api/group"/>
-</component>
-<component name="eapgtc_db_api" long-name="EAP-GTC DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapgtc_db_api/group"/>
-</component>
-<component name="eapmschapv2_db_api" long-name="EAP-MSCHAPV2 DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapmschapv2_db_api/group"/>
-</component>
-<component name="eapaka_db_api" long-name="EAP-AKA DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapaka_db_api/group"/>
-</component>
-<component name="wapi_db_api" long-name="WAPI DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_db_api/group"/>
-</component>
-</collection>
-<collection name="wlansecuritysettings" long-name="WLAN Security Settings" level="specific">
-<component name="wapisecuritysettingsui" filter="s60" long-name="WAPI Security Settings UI" introduced="9.1">
-<!-- the directory for this needs to be moved up to the right level -->
-<unit bldFile="mw/accesssec/wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
-</component>
-<component name="wepsecuritysettingsui" filter="s60" long-name="WEP Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wepsecuritysettingsui/group"/>
-</component>
-<component name="wifiprotectedsetup" filter="s60" long-name="WIFI Protected Setup" introduced="^1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wifiprotectedsetup/group"/>
-</component>
-<component name="wlaneapsettingsui" filter="s60" long-name="WLAN EAP Settings UI" introduced="9.3">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wlaneapsettingsui/group"/>
-</component>
-<component name="wpasecuritysettingsui" filter="s60" long-name="WPA Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wpasecuritysettingsui/group"/>
-</component>
-</collection>
-<collection name="eapol" long-name="EAPOL" level="framework">
-<component name="eapol_framework" filter="s60" long-name="EAPOL Framework" introduced="9.2">
-<unit bldFile="mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
-</component>
-</collection>
-</block>
-<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>
-<component name="bearer_settings_plugin_api" long-name="Bearer Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/bearer_settings_plugin_api/group"/>
-</component>
-<component name="commsdat_wlan_api" long-name="CommsDat WLAN API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/commsdat_wlan_api/group"/>
-</component>
-<component name="connection_monitor_extension_api" long-name="Connection Monitor Extension API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_monitor_extension_api/group"/>
-</component>
-<component name="connection_ui_utilities_api" long-name="Connection UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_ui_utilities_api/group"/>
-</component>
-<component name="disconnect_dialog_api" long-name="Disconnect Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_api/group"/>
-</component>
-<component name="disconnect_dialog_disable_api" long-name="Disconnect Dialog Disable API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_disable_api/group"/>
-</component>
-<component name="extended_connection_settings_api" long-name="Extended Connection Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/extended_connection_settings_api/group"/>
-</component>
-<component name="mpm_default_connection_api" long-name="MPM Default Connection API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_default_connection_api/group"/>
-</component>
-<component name="pdpcontextmanager2_reset_factory_settings_api" long-name="PDP Context Manager 2 Reset Factory Settings API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_settings_api/group"/>
-</component>
-<component name="mpm_connect_screen_api" long-name="MPM Connect Screen API" filter="s60" class="api">
-<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="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>
-<component name="access_point_engine_api" long-name="Access Point Engine API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_monitor_server_api/group"/>
-</component>
-<component name="connection_settings_ui_api" long-name="Connection Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_ui_api/group"/>
-</component>
-<component name="agent_dialog_api" long-name="Agent Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/agent_dialog_api/group"/>
-</component>
-<component name="extendedconnpref_api" long-name="Extended Connection Preferences API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/extendedconnpref_api/group"/>
-</component>
-</collection>
-<collection name="accesspointcontrol" long-name="Access Point Control" level="plugin">
-<component name="apcontrollistplugin" filter="s60" long-name="Access Point Control List Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
-</component>
-</collection>
-<collection name="alwayson_net_plugin" long-name="Always Online Net Plugin" level="server">
-<component name="pdpcontextmanager2" filter="s60" long-name="PDP Context Manager 2">
-<unit bldFile="mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
-</component>
-</collection>
-<collection name="apengine" long-name="Access Point Engine" level="framework">
-<component name="apeng" filter="s60" long-name="Access Point Engine">
-<unit bldFile="mw/ipconnmgmt/apengine/apeng/group"/>
-</component>
-<component name="apsettingshandlerui" filter="s60" long-name="Access Point Settings Handler UI">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingshandlerui/group"/>
-</component>
-<component name="apsettingsplugin" filter="s60" long-name="Access Point Settings Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="bearermanagement" long-name="Bearer Management" level="framework">
-<component name="mpm" filter="s60" long-name="Mobility Policy Manager">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/mpm/group"/>
-</component>
-<component name="extendedconnpref" filter="s60" long-name="Extended Connection Preferences">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/extendedconnpref/group"/>
-</component>
-<component name="s60mcpr" filter="s60" long-name="S60 Meta-Connection Provider" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/S60MCPR/group"/>
-</component>
-</collection>
-<collection name="cmmanager" long-name="Connection Method Manager" level="framework">
-<component name="cmmgr" filter="s60" long-name="CM Manager">
-<unit bldFile="mw/ipconnmgmt/cmmanager/cmmgr/group"/>
-</component>
-<component name="gsconnsettingsplugin" filter="s60" long-name="GS Connection Settings Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/cmmanager/gsconnsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="connectionmonitoring" long-name="Connection Monitoring" level="server">
-<component name="connectionmonitorplugin" filter="s60" long-name="Connection Monitor Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorplugin/group"/>
-</component>
-<component name="connectionmonitorui" filter="s60" long-name="Connection Monitor UI">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorui/group"/>
-</component>
-<component name="connmon" filter="s60" long-name="Connection Monitor">
-<!-- either split into two components, or #include from a common bld.inf -->
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/connectionmonitor/group"/>
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/dataconnectionlogger/group"/>
-</component>
-<component name="connmonext" filter="s60" long-name="Connection Monitor Extension API">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmonext/group"/>
-</component>
-</collection>
-<collection name="connectionutilities" long-name="Connection Utilities" level="utils">
-<component name="connectiondialogs" filter="s60" long-name="Connection Dialogs">
-<unit bldFile="mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/>
-</component>
-</collection>
-<collection name="dbcreator" long-name="DB Creator" level="utils">
-<component name="commsdatcreator" filter="s60" long-name="Comms Database Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
-</component>
-<component name="commsdatcreatorrfsplugin" filter="s60" long-name="Comms Database Creator RFS Plugin" introduced="9.3" plugin="Y">
-<!-- uncomment when config is turned on -->
-<!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
-</component>
-<component name="commsdatstartup" filter="s60" long-name="Comms Database Startup" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
-</component>
-<component name="dbcreatorexe" filter="s60" long-name="DB Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
-</component>
-<component name="dbcreator_build" filter="s60" long-name="DB Creator Build" introduced="9.3">
-<!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
-<unit bldFile="mw/ipconnmgmt/dbcreator/group"/>
-</component>
-</collection>
-<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"/>
-</component>
-<component name="ipcm_qt_build" long-name="IP Connectivity Management Qt Build" introduced="^4">
-<unit bldFile="mw/ipconnmgmt" proFile="ipconnmgmt.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</block>
-<block name="netprotocols" level="generic" long-name="High-level Internet Protocols" levels="plugin framework server generic specific">
-<collection name="netprotocols_plat" long-name="High-level Internet Protocols Platform Interfaces" level="specific">
-<component name="cookie_manager_api" long-name="Cookie Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/cookie_manager_api/group"/>
-</component>
-<component name="http_cache_mgr_api" long-name="HTTP Cache Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_cache_mgr_api/group"/>
-</component>
-<component name="http_filters_api" long-name="HTTP Filters API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_filters_api/group"/>
-</component>
-</collection>
-<collection name="httpfilters" long-name="HTTP Filters" level="plugin">
-<component name="httpfiltercommon" filter="s60" long-name="HTTP Filter Common">
-<unit bldFile="mw/netprotocols/httpfilters/httpfiltercommon/group"/>
-</component>
-<component name="cookie" filter="s60" long-name="Cookie Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/cookie/group"/>
-</component>
-<component name="deflatefilter" filter="s60" long-name="Deflate Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/deflatefilter/group"/>
-</component>
-<component name="httpfilteracceptheader" filter="s60" long-name="Accept Header Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteracceptheader/group"/>
-</component>
-<component name="httpfilterauthentication" filter="s60" long-name="Authentication Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterauthentication/group"/>
-</component>
-<component name="httpfilterconnhandler" filter="s60" long-name="Connection Handler Fitler" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterconnhandler/group"/>
-</component>
-<component name="httpfilteriop" filter="s60" long-name="HTTP IOP Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteriop/group"/>
-</component>
-<component name="httpfilterproxy" filter="s60" long-name="HTTP Proxy Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterproxy/group"/>
-</component>
-<component name="uaproffilter" filter="s60" long-name="UAProf Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/uaproffilter/group"/>
-</component>
-</collection>
-<collection name="applayerprotocols" long-name="Application Layer Protocols" level="server">
-<component name="httptransportfw" long-name="HTTP Transport Framework" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
-</component>
-<component name="httpexamples" long-name="HTTP Examples" introduced="6.2" purpose="development">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpexamples/group" mrp="mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
-</component>
-<component name="wappushsupport" long-name="WAP Push Support" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
-</component>
-<component name="wapbase" long-name="WAP Base" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wapbase/Group" mrp="mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
-</component>
-<component name="ftpengine" long-name="FTP Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/ftpengine/group" mrp="mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
-</component>
-<component name="telnetengine" long-name="Telnet Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/telnetengine/group" mrp="mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
-</component>
-<component name="httpserviceapi" long-name="HTTP Service API" introduced="TB9.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpservice/group" mrp="mw/netprotocols/applayerprotocols/httpservice/group/http_service.mrp"/>
-</component>
-</collection>
-<collection name="applayerpluginsandutils" long-name="Application Layer Plugins and Utils" level="framework">
-<component name="uripermissionservices" long-name="URI Permission Services" introduced="^2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
-</component>
-<component name="bookmarksupport" long-name="Bookmark Support" introduced="9.1" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
-</component>
-<component name="httpprotocolplugins" long-name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
-</component>
-<component name="httptransportplugins" long-name="HTTP Transport Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
-</component>
-</collection>
-<collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
-<component name="netprotocols_metadata" long-name="High-level Internet Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ipappprotocols" level="generic" long-name="IP App Protocols" levels="plugin conn server if">
-<collection name="ipappprotocols_plat" long-name="IP App Protocols Platform Interfaces" level="if">
-<component name="srtp_api" long-name="SRTP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/srtp_api/group"/>
-</component>
-<component name="rtprtcp_api" long-name="RTP/RTCP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/rtprtcp_api/group"/>
-</component>
-</collection>
-<collection name="rtp" long-name="RTP" level="server">
-<component name="srtpstack" filter="s60" long-name="SRTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/srtpstack/group"/>
-</component>
-<component name="rtpstack" filter="s60" long-name="RTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/rtpstack/group"/>
-</component>
-</collection>
-<collection name="realtimenetprots" long-name="Real Time Net Protocols" level="server">
-<component name="symrtp" long-name="RTP" introduced="9.0" purpose="optional">
-<!-- Real Time Data Protocol -->
-<unit bldFile="mw/ipappprotocols/realtimenetprots/rtp/group" mrp="mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
-</component>
-<component name="sipfw" long-name="SIP Framework" introduced="9.2" purpose="optional">
-<unit bldFile="mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp" version="2"/>
-</component>
-</collection>
-<collection name="sipplugins" long-name="SIP Plugins" level="plugin">
-<component name="sippwlanplugin" filter="s60" long-name="SIP WLAN Plugin" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
-</component>
-<component name="sippsipsettingsui" filter="s60" long-name="SIP Settings UI" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
-</component>
-<component name="sippdevmgmtsipadapter" filter="s60" long-name="Device Management SIP Settings Adapter" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
-</component>
-<component name="sippsystemstatemonitor" filter="s60" long-name="SIP System State Monitor" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsystemstatemonitor/group"/>
-</component>
-<component name="sippsipadapter" filter="s60" long-name="SIP Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipadapter/group"/>
-</component>
-</collection>
-<collection name="sipproviderplugins" long-name="SIP Provider Plugins" level="conn">
-<component name="sipprovider" long-name="SIP Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipproviderplugins/sipprovider/group" mrp="mw/ipappprotocols/sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
-</component>
-</collection>
-<collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="if">
-<component name="ipappprotocols_metadata" long-name="IP App Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wirelessacc" level="specific" long-name="Wireless Access" levels="framework generic ui">
-<collection name="hsfw_plat" long-name="HotSpot Framework Platform Interfaces" level="ui">
-<component name="hotspot_framework_client_api" long-name="HotSpot Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_api" long-name="Internet Connectivity Test Service API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_settings_api" long-name="Internet Connectivity Test Service Settings API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
-</component>
-<component name="hotspot_framework_client_plugin_api" long-name="HotSpot Framework Client Plugin API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
-</component>
-</collection>
-<collection name="hotspotfw" long-name="HotSpot Framework" level="framework">
-<component name="hsserver" filter="s60" long-name="HotSpot Server" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="hsclient" filter="s60" long-name="HotSpot Client" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="internetconnectivitytestservice" filter="s60" long-name="Internet Connectivity Test Service" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
-</component>
-<component name="ictsdialogs" filter="s60" long-name="Internet Connectivity Test Service Dialogs" deprecated="^3" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
-</component>
-<component name="hspluginforagent" filter="s60" long-name="HotSpot Plugin for Agent" plugin="Y" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
-</component>
-<component name="hsbrowser" filter="s60" long-name="HotSpot Browser" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
-</component>
-<component name="hotspotfw_build" filter="s60" long-name="Hotspot Framework Build">
-<!-- should break up this bld.inf into the above components, or collapse them all into a single component -->
-<unit bldFile="mw/wirelessacc/hotspotfw/group"/>
-</component>
-</collection>
-<collection name="wlanutilities" long-name="WLAN Utilities" level="generic">
-<component name="wlanutilities_build" long-name="WLAN Utilities Qt" introduced="^4" filter="s60">
-<!-- is this uinit needed, or is it sufficient to uncomment the units in the below components? -->
-<unit bldFile="mw/wirelessacc/wlanutilities" proFile="wlanutilities.pro" qmakeArgs="-r"/>
-</component>
-<component name="wlanqtutilities" filter="s60" long-name="WLAN Qt Utilities" introduced="^4" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlanplugin/group" qt:proFile="wlanqtutilities.pro"/>-->
-</component>
-<component name="wlansniffer" filter="s60" long-name="WLAN Sniffer" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlansettingsui/group" qt:proFile="wlansniffer.pro"/>-->
-</component>
-<component name="wlanentryplugin" filter="s60" long-name="WLAN Entry Plugin" plugin="Y" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlansniffer/group" qt:proFile="wlanentryplugin.pro"/>-->
-</component>
-<component name="wlanindicatorplugin" filter="s60" long-name="WLAN Indicator Plugin" plugin="Y" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlanindicatorplugin/group" qt:proFile="wlanindicatorplugin.pro"/>-->
-</component>
-<component name="cpwlansettingsplugin" filter="s60" long-name="WLAN Settings Control Panel Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="wlanutilities/cpwlansettingsplugin/group" qt:proFile="cpwlansettingsplugin.pro"/>-->
-</component>
-</collection>
-</block>
-<block name="vpnclient" level="specific" long-name="VPN Client" levels="engine ui api">
-<!-- is the !oem_build filter needed? -->
-<collection name="vpnc_plat" long-name="VPN Client Platform Interfaces" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API" class="api">
-<unit bldFile="mw/vpnclient/vpnc_plat/vpnapi/group"/>
-</component>
-</collection>
-<collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API">
-<unit bldFile="mw/vpnclient/vpnapiimpl/group"/>
-</component>
-</collection>
-<collection name="vpnengine" long-name="VPN Engine" level="engine">
-<!-- too many components in this collection.
- Probably best to group the binaries together into larger components
- or maybe split the collection into more reasonable groups -->
-<component name="eventmediatorapi" filter="s60" long-name="Event Mediator API">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediatorapi/group"/>
-</component>
-<component name="eventviewer" filter="s60" long-name="Event Viewer">
-<unit bldFile="mw/vpnclient/vpnengine/eventviewer/group"/>
-</component>
-<component name="vpnins" filter="s60" long-name="VPN Installer">
-<unit bldFile="mw/vpnclient/vpnengine/vpnins/group"/>
-</component>
-<component name="ikepolparser" filter="s60" long-name="IKE Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/ikepolparser/group"/>
-</component>
-<component name="utlbase64" filter="s60" long-name="Base64 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlbase64/group"/>
-</component>
-<component name="utlcrypto" filter="s60" long-name="Crypto Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlcrypto/group"/>
-</component>
-<component name="utlxml" filter="s60" long-name="XML Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlxml/group"/>
-</component>
-<component name="utlpkcs10" filter="s60" long-name="PKCS#10 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs10/group"/>
-</component>
-<component name="pkiserviceapi" filter="s60" long-name="PKI Service API">
-<unit bldFile="mw/vpnclient/vpnengine/pkiserviceapi/group"/>
-</component>
-<component name="ikecert" filter="s60" long-name="IKE Certificate Management">
-<unit bldFile="mw/vpnclient/vpnengine/ikecert/group"/>
-</component>
-<component name="kmdapi" filter="s60" long-name="Key Management Daemon API">
-<unit bldFile="mw/vpnclient/vpnengine/kmdapi/group"/>
-</component>
-<component name="kmdserver" filter="s60" long-name="Key Management Daemon Server">
-<unit bldFile="mw/vpnclient/vpnengine/kmdserver/group"/>
-</component>
-<component name="ikeutils" filter="s60" long-name="Internet Key Exchange Utils">
-<unit bldFile="mw/vpnclient/vpnengine/ikeutils/group"/>
-</component>
-<component name="ikev1lib" filter="s60" long-name="IKEv1 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev1lib/group"/>
-</component>
-<component name="ikev2lib" filter="s60" long-name="IKEv2 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev2lib/group"/>
-</component>
-<component name="vpnipsecpolparser" filter="s60" long-name="VPN IPsec Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/vpnipsecpolparser/group"/>
-</component>
-<component name="sit" filter="s60" long-name="Socket Interaction Thread">
-<unit bldFile="mw/vpnclient/vpnengine/sit/group"/>
-</component>
-<component name="vpntcwrapper" filter="s60" long-name="VPN Terminal Control Wrapper">
-<unit bldFile="mw/vpnclient/vpnengine/vpntcwrapper/group"/>
-</component>
-<component name="eventmediator" filter="s60" long-name="Event Mediator">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediator/group"/>
-</component>
-<component name="pkiservice" filter="s60" long-name="PKI Service">
-<unit bldFile="mw/vpnclient/vpnengine/pkiservice/group"/>
-</component>
-<component name="vpnconnagt" filter="s60" long-name="VPN Connection Agent">
-<unit bldFile="mw/vpnclient/vpnengine/vpnconnagt/group"/>
-</component>
-<component name="vpnmanager" filter="s60" long-name="VPN Manager">
-<unit bldFile="mw/vpnclient/vpnengine/vpnmanager/group"/>
-</component>
-<component name="vpncleaner" filter="s60" long-name="VPN Cleaner">
-<unit bldFile="mw/vpnclient/vpnengine/vpncleaner/group"/>
-</component>
-<component name="utlpkcs12" filter="s60" long-name="PKCS#12 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs12/group"/>
-</component>
-<component name="dmadengine" filter="s60" long-name="DM Adapter Engine">
-<unit bldFile="mw/vpnclient/vpnengine/dmadengine/group"/>
-</component>
-<component name="dmadipsecvpn" filter="s60" long-name="IPsec VPN DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadipsecvpn/group"/>
-</component>
-<component name="dmadpki" filter="s60" long-name="PKI DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadpki/group"/>
-</component>
-<component name="ikesocket" filter="s60" long-name="IKE Socket" introduced="^3">
-<unit bldFile="mw/vpnclient/vpnengine/ikesocket/group"/>
-</component>
-</collection>
-<collection name="vpnui" long-name="VPN UI" level="ui">
-<component name="vpnecomnotifier" filter="s60" long-name="VPN ECOM Notifier" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnecomnotifier/group"/>
-</component>
-<component name="vpndialogmanager" filter="s60" long-name="VPN Dialog Manager">
-<unit bldFile="mw/vpnclient/vpnui/vpndialogmanager/group"/>
-</component>
-<component name="vpnpolins" filter="s60" long-name="VPN Policy Installer">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolins/group"/>
-</component>
-<component name="vpnpolicyrecognizer" filter="s60" long-name="VPN Policy Recognizer" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolicyrecognizer/group"/>
-</component>
-</collection>
-<collection name="vpnclient_info" long-name="VPN Client Info" level="api">
-<component name="vpnclient_help" filter="s60" long-name="VPN Client Help">
-<unit bldFile="mw/vpnclient/help/group"/>
-</component>
-<component name="vpnclient_build" filter="s60" long-name="VPN Client Build">
-<!-- should split this up into the other components and remove this-->
-<unit bldFile="mw/vpnclient/group"/>
-</component>
-</collection>
-</block>
-<block name="ipappsrv" level="specific" long-name="IP App Services" levels="framework generic server conn plugin">
-<collection name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" level="plugin">
-<component name="transcoder_api" long-name="Transcoder API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
-</component>
-<component name="comms_event_api" long-name="Comms Event API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/comms_event_api/group"/>
-</component>
-<component name="floor_control_api" long-name="Floor Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/floor_control_api/group"/>
-</component>
-<component name="media_control_api" long-name="Media Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/media_control_api/group"/>
-</component>
-<component name="multimedia_comms_api" long-name="Multimedia Comms API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/multimedia_comms_api/group"/>
-</component>
-<component name="nat_settings_api" long-name="NAT Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/nat_settings_api/group"/>
-</component>
-</collection>
-<collection name="natfw" long-name="NAT Framework" level="framework">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="natfw_build" filter="s60" long-name="NAT Framework Build" introduced="^2">
-<unit bldFile="mw/ipappsrv/natfw/group"/>
-</component>
-</collection>
-<collection name="multimediacommscontroller" long-name="Multimedia Comms Controller" level="conn">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommscontroller_build" filter="s60" long-name="Multimedia Comms Controller Build">
-<unit bldFile="mw/ipappsrv/multimediacommscontroller/group"/>
-</component>
-</collection>
-<collection name="multimediacommsengine" long-name="Multimedia Comms Engine" level="generic">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommsengine_build" filter="s60" long-name="Multimedia Comms Engine Build">
-<unit bldFile="mw/ipappsrv/multimediacommsengine/group"/>
-</component>
-</collection>
-<collection name="natplugins" long-name="NAT Plugins" level="plugin">
-<component name="natpcliprovisioningnatfwadapter" filter="s60" long-name="Client Provisioning NAT Framework Traversal Adapter" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/group"/>
-</component>
-<component name="natpdevmgmtnatfwadapter" filter="s60" long-name="Device Management NAT Framework Traversal Adapter" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/group"/>
-</component>
-<component name="natptraversalcontroller" filter="s60" long-name="NAT Traversal Controller" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natptraversalcontroller/group"/>
-</component>
-<component name="natpnatfwsdpprovider" filter="s60" long-name="NAT Framework SDP Provider" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpnatfwsdpprovider/group"/>
-</component>
-</collection>
-<collection name="ipappsrv_info" long-name="IP App Services Info" level="plugin">
-<component name="ipappsrv_build" long-name="IP App Services Build" filter="s60">
-<!-- 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">
-<collection name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" level="specific">
-<component name="sat_refresh_api" long-name="SAT Refresh API" filter="s60" class="api"/>
-<component name="sat_client_api" long-name="SAT Client API" filter="s60" class="api"/>
-<component name="sat_service_api" long-name="SAT Service API" filter="s60" class="api"/>
-<component name="call_information_api" long-name="Call Information API" filter="s60" class="api"/>
-<component name="call_remote_party_information_api" long-name="Call Remote Party Information API" filter="s60" class="api"/>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api"/>
-</collection>
-<collection name="cellular" long-name="Cellular" level="server">
-<component name="telephonysettings" filter="s60" long-name="Telephony Settings" purpose="development"/>
-<component name="sssettings" filter="s60" long-name="Supplementary Service Settings" purpose="development"/>
-<component name="psetnotesui" filter="s60" long-name="Phone Settings Notes UI" purpose="development"/>
-</collection>
-<collection name="convergedcallengine" long-name="Converged Call Engine" level="framework">
-<component name="cce" filter="s60" long-name="CCE" purpose="development"/>
-<component name="spsettings" filter="s60" long-name="Service Provider Settings" purpose="development"/>
-</collection>
-<collection name="phoneclientserver" long-name="Phone Client/Server" level="server">
-<component name="aiwdialdata" filter="s60" long-name="AIW Dial Data" purpose="development"/>
-<component name="dialutils" filter="s60" long-name="Dial Utils" purpose="development"/>
-<component name="phoneclient" filter="s60" long-name="Phone Client" purpose="development"/>
-</collection>
-<collection name="phonesrv_info" long-name="Phone Server Info" level="generic">
-<component name="phonesrv_build" long-name="Phone Server Build" filter="s60">
-<unit bldFile="mw/phonesrv" proFile="phonesrv.pro"/>
-</component>
-</collection>
-</block>
-<block name="messagingmw" level="specific" long-name="Messaging Middleware" levels="stack support fw api">
-<collection name="msgfw_plat" long-name="Messaging Middleware Platform Interfaces" level="api">
-<component name="always_online_plugin_api" long-name="Always Online Plugin API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_plugin_api/group"/>
-</component>
-<component name="always_online_client_api" long-name="Always Online Client API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_client_api/group"/>
-</component>
-<component name="msg_common_utils_api" long-name="Messaging Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/msg_common_utils_api/group"/>
-</component>
-<component name="muiu_utils_api" long-name="Messaging Center UI Utilities API" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/muiu_utils_api/group"/>
-</component>
-</collection>
-<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" class="config">
-<unit bldFile="mw/messagingmw/msgbranched/group"/>
-</component>
-</collection>
-<collection name="messagingfw" long-name="Messaging Framework" level="fw">
-<!-- should break this collection up into smaller related collections -->
-<component name="send_ui_api" long-name="Send UI API" filter="s60" deprecated="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/send_ui_api/group"/>
-</component>
-<component name="send_ui_plugin_api" long-name="Send UI Plug-in API" filter="s60" deprecated="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/send_ui_plugin_api/group"/>
-</component>
-<component name="send_ui_datautils_api" long-name="Send UI Data Utils API" filter="s60" deprecated="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/send_ui_datautils_api/group"/>
-</component>
-<component name="alwaysonline" filter="s60" long-name="Always Online Server" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/alwaysonline/group"/>
-</component>
-<component name="msgcommonutils" filter="s60" long-name="Messaging Common Utils" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/msgcommonutils/group"/>
-</component>
-<component name="senduiservices" filter="s60" long-name="Send UI Services" introduced="^2" deprecated="^4">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/senduiservices/group"/>
-</component>
-<component name="muiuutils" long-name="Messaging Center UI Utilities" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/muiuutils/group"/>
-</component>
-<component name="scheduledsendmtm" long-name="Scheduled Send MTM" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/group" mrp="mw/messagingmw/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
-</component>
-<component name="msgsrvnstore" long-name="Message Server and Store" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/group" mrp="mw/messagingmw/messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
-</component>
-<component name="biomsgfw" long-name="BIO Messaging Framework" introduced="6.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/group" mrp="mw/messagingmw/messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
-</component>
-<component name="msgconf" long-name="Messaging Config" introduced="^2" purpose="optional" class="config">
-<unit bldFile="mw/messagingmw/messagingfw/msgconf/group" mrp="mw/messagingmw/messagingfw/msgconf/group/messaging_config.mrp"/>
-</component>
-<component name="watcherfw" long-name="Watcher Framework" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/watcherfw/group" mrp="mw/messagingmw/messagingfw/watcherfw/group/messaging_watcher.mrp"/>
-</component>
-<component name="msgtest" long-name="Messaging Test" purpose="development">
-<unit bldFile="mw/messagingmw/messagingfw/msgtest/group" mrp="mw/messagingmw/messagingfw/msgtest/group/messaging_test.mrp"/>
-</component>
-<component name="sendas" long-name="Send As" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/sendas/group" mrp="mw/messagingmw/messagingfw/sendas/group/messaging_sendas2.mrp"/>
-</component>
-<component name="msgurlhandler" long-name="Message URL Handler" introduced="7.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/group" mrp="mw/messagingmw/messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
-</component>
-<component name="wappushfw" long-name="WAP Push Framework" introduced="6.1" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/wappushfw/group" mrp="mw/messagingmw/messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
-</component>
-<component name="suplsmshandler" long-name="SUPL SMS Handler" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplsmshandler/group" mrp="mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/>
-</component>
-<component name="suplwappushhandler" long-name="SUPL WAP Push Handler" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
-</component>
-</collection>
-<collection name="messagingmw_info" long-name="Messaging Middleware Info" level="api">
-<component name="messagingmw_metadata" long-name="Messaging Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="imsrv" level="specific" long-name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
-<collection name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" level="specific">
-<component name="ximp_core_data_model_api" long-name="XIMP Core Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_host_api" long-name="XIMP Presence Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_presence_data_model_api" long-name="XIMP Presence Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_api" long-name="XIMP Presence Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_presence_management_api" long-name="XIMP Presence Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_management_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_host_api" long-name="XIMP Core Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_core_management_api" long-name="XIMP Core Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_management_api/group"/>
-</component>
-<component name="ximp_presence_base_api" long-name="XIMP Presence Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_base_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_api" long-name="XIMP Core Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_core_base_api" long-name="XIMP Core Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_base_api/group"/>
-</component>
-<component name="ximp_presence_cache_api" long-name="XIMP Presence Cache API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_cache_api/group"/>
-</component>
-<component name="ximp_core_feature_plugin_api" long-name="XIMP Core Feature Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_host_api" long-name="XIMP IM Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_im_data_model_api" long-name="XIMP IM Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_data_model_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_api" long-name="XIMP IM Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_im_management_api" long-name="XIMP IM Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_management_api/group"/>
-</component>
-<component name="ximp_im_base_api" long-name="XIMP IM Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_base_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_host_api" long-name="XIMP Search Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_search_data_model_api" long-name="XIMP Search Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_data_model_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_api" long-name="XIMP search Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_search_management_api" long-name="XIMP Search Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_management_api/group"/>
-</component>
-<component name="ximp_search_base_api" long-name="XIMP Search Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_base_api/group"/>
-</component>
-<component name="xmpp_settings_api" long-name="XMPP Settings API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/group"/>
-</component>
-<component name="im_cache_client_api" long-name="IM Cache Client API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/im_cache_client_api/group"/>
-</component>
-<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 Avability Text" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
-</component>
-</collection>
-<collection name="ximpfw" long-name="XIMP Framework" level="framework">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="ximpfw_build" filter="s60" long-name="XIMP Framework Build">
-<unit bldFile="mw/imsrv/ximpfw/group"/>
-</component>
-</collection>
-<collection name="imservices" long-name="IM Services" level="generic">
-<component name="imfeatureplugin" filter="s60" long-name="IM Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/imfeatureplugin/group"/>
-</component>
-<component name="searchfeatureplugin" filter="s60" long-name="Search Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/searchfeatureplugin/group"/>
-</component>
-<component name="xmppsettingsapi" filter="s60" long-name="XMPP Settings API" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsapi/group"/>
-</component>
-<component name="xmppsettingsfetcher" filter="s60" long-name="XMPP Settings Fetcher" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/group"/>
-</component>
-<component name="instantmessagingcache" filter="s60" long-name="Instant Messaging Cache" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/instantmessagingcache/group"/>
-</component>
-</collection>
-<collection name="brandingserver" long-name="Branding Server" level="specific">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="brandingserver_build" filter="s60" long-name="Branding Server Build">
-<unit bldFile="mw/imsrv/brandingserver/group"/>
-</component>
-</collection>
-</block>
-<block name="legacypresence" level="specific" long-name="Legacy Presence Services" levels="engine fw ui">
-<collection name="pressrv_plat" long-name="Legacy Presence Services Platform Interfaces" level="ui">
-<component name="presence_list_api" long-name="Presence List API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/presence_list_api/group"/>
-</component>
-<component name="watcher_info_api" long-name="Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_info_api/group"/>
-</component>
-<component name="simple_documents_api" long-name="SIMPLE Documents API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_documents_api/group"/>
-</component>
-<component name="authorization_api" long-name="Authorization API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/authorization_api/group"/>
-</component>
-<component name="xdm_protocol_plugin_api" long-name="XDM Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_protocol_plugin_api/group"/>
-</component>
-<component name="watcher_api" long-name="Watcher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_api/group"/>
-</component>
-<component name="xdm_api" long-name="XDM API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_api/group"/>
-</component>
-<component name="registration_api" long-name="Registration API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/registration_api/group"/>
-</component>
-<component name="publisher_api" long-name="Publisher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/publisher_api/group"/>
-</component>
-<component name="messaging_connection_manager_api" long-name="Messaging Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/messaging_connection_manager_api/group"/>
-</component>
-<component name="xdm_settings_api" long-name="XDM Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_settings_api/group"/>
-</component>
-<component name="simple_settings_api" long-name="SIMPLE Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_settings_api/group"/>
-</component>
-<component name="simple_instant_msg_api" long-name="Simple Instant Msg API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_instant_msg_api/group"/>
-</component>
-</collection>
-<collection name="xdmengine" long-name="XDM Engine" level="engine">
-<!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
-<component name="xdmengine_build" filter="s60" long-name="XDM Engine Build">
-<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">
-<unit bldFile="mw/legacypresence/xdmprotocols/group"/>
-</component>
-</collection>
-<collection name="msgconnmanager" long-name="Messaging Connection Manager" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="msgconnmanager_build" filter="s60" long-name="Messaging Connection Manager Build">
-<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">
-<unit bldFile="mw/legacypresence/simpleengine/group"/>
-</component>
-</collection>
-<collection name="presencefwsimpleadpt" long-name="Presence Framework SIMPLE Adaptation" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="simpleplugin" filter="s60" long-name="SIMPLE Plugin" plugin="Y">
-<unit bldFile="mw/legacypresence/presencefwsimpleadpt/group"/>
-</component>
-</collection>
-<collection name="simpledatamodeladapter" long-name="SIMPLE Data Model Adapter" level="fw">
-<component name="presenceplugin" filter="s60" long-name="Presence Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/legacypresence/simpledatamodeladapter/group"/>
-</component>
-</collection>
-</block>
-<block name="opensrv" level="specific" long-name="Open Services" levels="prt lib server eng">
-<collection name="opensrv_plat" long-name="Open Services Platform Interfaces" level="eng">
-<component name="messagequeue_api" long-name="Message Queue API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/opensrv/opensrv_plat/messagequeue_api/group"/>
-</component>
-</collection>
-<collection name="loudmouth" long-name="Loudmouth" level="prt">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="loudmouth_build" filter="s60" long-name="Loudmouth Build" introduced="^2">
-<unit bldFile="mw/opensrv/loudmouth/group"/>
-</component>
-</collection>
-<collection name="libtelepathy" long-name="Telepathy Library" level="lib">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="libtelepathy_build" filter="s60" long-name="Telepathy Library Build" introduced="^2">
-<unit bldFile="mw/opensrv/libtelepathy/group"/>
-</component>
-</collection>
-<collection name="telepathygabble" long-name="Telepathy Gabble" level="eng">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="telepathygabble_build" filter="s60" long-name="Telepathy Gabble Build" introduced="^2">
-<unit bldFile="mw/opensrv/telepathygabble/group"/>
-</component>
-</collection>
-<collection name="isolationserver" long-name="Isolation Server" level="server">
-<component name="messagequeue" filter="s60" long-name="Message Queue" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/messagequeue/group"/>
-</component>
-<component name="isoserver" filter="s60" long-name="ISO Server" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/isoserver/group"/>
-</component>
-<component name="isolationserver_build" filter="s60" long-name="Isloation Server Build" introduced="^2">
-<!-- needs #includes removed. either move the exports to another component or make this a ROM component -->
-<unit bldFile="mw/opensrv/isolationserver/group"/>
-</component>
-</collection>
-</block>
-<block name="searchsrv" level="specific" long-name="Search Services" levels="services engine generic api">
-<collection name="searchsrv_plat" long-name="Search Services Platform Interfaces" level="api">
-<component name="cpix_utility_api" long-name="CPIX Utility API" filter="s60" class="api">
-<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_utility_api/group"/>
-</component>
-<component name="cpix_framework_api" long-name="CPIX Framework API" filter="s60" class="api">
-<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_framework_api/group"/>
-</component>
-<component name="cpix_search_api" long-name="CPIX Search API" filter="s60" class="api">
-<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_search_api/group"/>
-</component>
-</collection>
-<collection name="searchengine" long-name="Search Engine" level="engine">
-<component name="searchengine_util" long-name="Search Engine Utils" filter="s60">
-<unit bldFile="mw/searchsrv/searchengine/util/group"/>
-</component>
-<component name="searchengine_oss" long-name="Search Engine OSS" filter="s60">
-<unit bldFile="mw/searchsrv/searchengine/oss/group"/>
-</component>
-<component name="cpix" long-name="Cross Platform Indexing Engine" filter="s60">
-<unit bldFile="mw/searchsrv/searchengine/cpix/group"/>
-</component>
-</collection>
-<collection name="searcher" long-name="Searcher" level="generic">
-<component name="searchclient" long-name="Search Client" filter="s60">
-<unit bldFile="mw/searchsrv/searcher/SearchClient/group"/>
-</component>
-<component name="searchserver" long-name="Search Server" filter="s60">
-<unit bldFile="mw/searchsrv/searcher/SearchServer/group"/>
-</component>
-<component name="searcher_test" long-name="Searcher Tests" filter="s60" purpose="development">
-<!-- #include from common bld.inf or split into two components -->
-<unit bldFile="mw/searchsrv/searcher/tsrc/RobustnessTest/group"/>
-<unit bldFile="mw/searchsrv/searcher/tsrc/LogPlayer/group"/>
-</component>
-</collection>
-<collection name="searchsrv_harvester" long-name="Search Services Harvester" level="services">
-<component name="searchsrv_pluginfw" long-name="Search Server" filter="s60">
-<unit bldFile="mw/searchsrv/harvester/pluginfw/group"/>
-</component>
-<component name="searchsrv_harvesterserver" long-name="Search Harvester Server" filter="s60">
-<unit bldFile="mw/searchsrv/harvester/HarvesterServer/group"/>
-</component>
-</collection>
-<collection name="searchsrv_watchdog" long-name="Search Services Watch Dog" level="services">
-<component name="searchsrv_watchdog_build" long-name="Search Services Watch Dog Build" filter="s60">
-<unit bldFile="mw/searchsrv/WatchDog/group"/>
-</component>
-</collection>
-<collection name="qcpix" long-name="Qt CPIX" level="engine">
-<component name="qcpix_build" long-name="Qt CPIX Build">
-<unit bldFile="mw/searchsrv/qcpix" proFile="qcpix.pro"/>
-</component>
-</collection>
-<collection name="searchsrv_info" long-name="Search Services Info">
-<component name="searchsrv_build" long-name="Search Services Build">
-<!-- move exports to own component and remove this -->
-<unit bldFile="mw/searchsrv/group"/>
-</component>
-</collection>
-</block>
-<block name="remotemgmt" level="specific" long-name="Remote Management" levels="plugin framework server generic specific">
-<collection name="remotemgmt_pub" long-name="Remote Management Public Interfaces" level="specific">
-<component name="synchronization_capability_api" long-name="Synchronization Capability API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
-</component>
-</collection>
-<collection name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" level="specific">
-<component name="common_agent_util_and_definitions_api" long-name="Common Agent util and definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
-</component>
-<component name="policy_management_certificate_api" long-name="Policy Management Certificate API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/group"/>
-</component>
-<component name="oma_provisioning_adapter_api" long-name="OMA Provisioning Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_adapter_api/group"/>
-</component>
-<component name="device_management_parameter_api" long-name="Device Management Parameter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_parameter_api/group"/>
-</component>
-<component name="data_synchronization_plugin_api" long-name="Data Synchronization Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/group"/>
-</component>
-<component name="sync_alert_handler_api" long-name="Sync Alert Handler API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
-</component>
-<component name="syncml_notifier_api" long-name="SyncML Notifier API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
-</component>
-<component name="syncml_client_api" long-name="SyncML Client API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
-</component>
-<component name="device_management_plugin_api" long-name="Device Management plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_plugin_api/group"/>
-</component>
-<component name="dm_tree_apis" long-name="DM Tree APIs" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
-</component>
-<component name="terminal_security_device_lock_api" long-name="Terminal Security Device Lock API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/group"/>
-</component>
-<component name="policy_management_request_api" long-name="Policy Management Request API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/group"/>
-</component>
-<component name="ds_constant_definitions_api" long-name="DS Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_constant_definitions_api/group"/>
-</component>
-<component name="scp_server_api" long-name="SCP Server API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/group"/>
-</component>
-<component name="data_synchronization_notification_api" long-name="Data Synchronization Notification API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_notification_api/group"/>
-</component>
-<component name="oma_provisioning_engine_api" long-name="OMA Provisioning Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/group"/>
-</component>
-<component name="dm_utils_api" long-name="DM Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/group"/>
-</component>
-<component name="syncml_alert_api" long-name="SyncML Alert API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/group"/>
-</component>
-<component name="obex_client_session_api" long-name="OBEX Client session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/obex_client_session_api/group"/>
-</component>
-<component name="setting_enforcement_info_api" long-name="Setting Enforcement Info API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/group"/>
-</component>
-<component name="dm_constant_definitions_api" long-name="DM Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
-</component>
-<component name="oma_ds_extensions_api" long-name="OMA DS Extensions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
-</component>
-<component name="pnpms_utils_api" long-name="PNPMS Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
-</component>
-<component name="diagnostics_plugin_utility_api" long-name="Diagnostics Plugin Utility API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
-</component>
-<component name="diagnostics_plugin_api" long-name="Diagnostics Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
-</component>
-<component name="diagnostics_framework_api" long-name="Diagnostics Framework API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
-</component>
-<component name="diagnostics_results_api" long-name="Diagnostics Results API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
-</component>
-<component name="diagnostics_plugin_pool_api" long-name="Diagnostics Plugin Pool API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
-</component>
-<component name="adaptive_history_list_api" long-name="Adaptive History List API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
-</component>
-<component name="adaptive_history_list_session_api" long-name="Adaptive History List Session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
-</component>
-<component name="fota_engine_api" long-name="FOTA Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
-</component>
-<component name="update_package_storage_plugin_api" long-name="Update Package Storage Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
-</component>
-<component name="syncml_notifier_roaming_api" long-name="SyncML Notifier Roaming API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
-</component>
-<component name="sync_service_api" long-name="Sync Service API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_service_api/group"/>
-</component>
-<component name="dcmo_adapter_api" long-name="DCMO Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_adapter_api/group"/>
-</component>
-<component name="dcmo_control_api" long-name="DCMO Control API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_control_api/group"/>
-</component>
-<component name="ds_capability_mgmt_plugin_api" long-name="DS Capability Management Plugin API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
-</component>
-</collection>
-<collection name="policymanagement" long-name="Policy Management" level="generic">
-<component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">
-<unit bldFile="mw/remotemgmt/policymanagement/pmdmadapter/group"/>
-</component>
-<component name="dmutilserver" filter="s60" long-name="DM Util Server">
-<unit bldFile="mw/remotemgmt/policymanagement/dmutilserver/group"/>
-</component>
-<component name="policyengine" filter="s60" long-name="Policy Engine">
-<unit bldFile="mw/remotemgmt/policymanagement/policyengine/group" filter="!dfs_build"/>
-</component>
-<component name="policymanagement_build" filter="s60" long-name="Policy Management Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/policymanagement/group"/>
-</component>
-</collection>
-<collection name="syncmlfw" long-name="SyncML Framework" level="server">
-<component name="syncmlfw_build" filter="s60" long-name="SyncML Framework Build">
-<!-- need to break this up into components. Too convoluted a structure to be in a single bld.inf-->
-<unit bldFile="mw/remotemgmt/syncmlfw/group"/>
-</component>
-</collection>
-<collection name="terminalsecurity" long-name="Terminal Security" level="specific">
-<component name="scp" filter="s60" long-name="Security Code Proxy">
-<!-- can only have one unit, need to have these #included from a single bld.inf -->
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpdatabase/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpserver/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scppatternplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scphistoryplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scptimestampplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpeventhandler/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/dmeventnotifier/group"/>
-</component>
-<component name="terminalsecurity_client" filter="s60" long-name="Terminal Control Client">
-<unit bldFile="mw/remotemgmt/terminalsecurity/client/group"/>
-</component>
-<component name="terminalsecurity_server" filter="s60" long-name="Terminal Control Server">
-<unit bldFile="mw/remotemgmt/terminalsecurity/server/group"/>
-</component>
-<component name="tcadapter" filter="s60" long-name="Terminal Control Adapter">
-<unit bldFile="mw/remotemgmt/terminalsecurity/tcadapter/bld"/>
-</component>
-<component name="terminalsecurity_build" filter="s60" long-name="Terminal Security Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/terminalsecurity/group"/>
-</component>
-</collection>
-<collection name="omaprovisioning" long-name="OMA Provisioning" level="specific">
-<component name="pnputil" filter="s60" long-name="PnP Util">
-<unit bldFile="mw/remotemgmt/omaprovisioning/pnputil/group"/>
-</component>
-<component name="provisioning" filter="s60" long-name="Provisioning">
-<unit bldFile="mw/remotemgmt/omaprovisioning/provisioning/group"/>
-</component>
-</collection>
-<collection name="devicediagnosticsfw" long-name="Device Diagnostics Framework" level="framework">
-<component name="diagframework" filter="s60" long-name="Diagnostics Framework">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
-</component>
-<component name="diagpluginbase" filter="s60" long-name="Diagnostics Plugin Base">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
-</component>
-<component name="diagresultsdb" filter="s60" long-name="Diagnostics Results Database">
-<!-- can only have one unit, merge or split into two components -->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
-</component>
-<component name="devicediagnosticsfw_build" filter="s60" long-name="Device Diagnostics Framework Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/group"/>
-</component>
-</collection>
-<collection name="dcmofw" long-name="Device Capability Management Object Framework" level="framework">
-<component name="dcmoclient" filter="s60" long-name="DCMO Client">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoclient/group"/>
-</component>
-<component name="dcmoserver" filter="s60" long-name="DCMO Server">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoserver/group"/>
-</component>
-<component name="dcmocustcmd" filter="s60" long-name="DCMO Custom Commands">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmocustcmd/group"/>
-</component>
-<component name="dcmofw_build" filter="s60" long-name="DCMO Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/dcmofw/group"/>
-</component>
-</collection>
-<collection name="fotaapplication" long-name="FOTA Application" level="generic">
-<component name="fotaapplication_build" filter="s60" long-name="FOTA Application Build">
-<!-- remove this component when configuration is in place and the #ifdefs have been worked out -->
-<unit bldFile="mw/remotemgmt/fotaapplication/group"/>
-</component>
-<component name="fotaserver" filter="s60" long-name="FOTA Server">
-<!-- uncomment when #ifdefs are resolved -->
-<!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
-</component>
-<component name="fotacustcmds" filter="s60" long-name="FOTA Custom Commands" class="placeholder">
-<!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
-<!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
-</component>
-</collection>
-</block>
-<block name="remoteconn" level="generic" long-name="Remote Connectivity" levels="plugin framework server generic specific">
-<collection name="remoteconn_info" long-name="Remote Connectivity Info" level="specific">
-<component name="remoteconn_metadata" long-name="Remote Connectivity Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mtptransports" long-name="MTP Transports" level="plugin">
-<component name="mtpusbtransport" long-name="MTP USB Transport" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpusbtransport/group" mrp="mw/remoteconn/mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
-</component>
-<component name="mtpptpiptransport" long-name="MTP PTP-IP Transport" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpptpiptransport/group" mrp="mw/remoteconn/mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
-</component>
-<component name="mtpcontroller" long-name="MTP Controller" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpcontroller/group" mrp="mw/remoteconn/mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
-</component>
-</collection>
-<collection name="mtpfws" long-name="MTP Frameworks" level="framework">
-<component name="mtpfw" long-name="MTP Framework" introduced="^2" purpose="optional">
-<unit bldFile="mw/remoteconn/mtpfws/mtpfw/group" mrp="mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/>
-</component>
-</collection>
-<collection name="mtpdataproviders" long-name="MTP Data Providers" level="generic">
-<component name="mtpfileandfolderdp" long-name="MTP File and Folder Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group" mrp="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
-</component>
-<component name="mtpimagedp" long-name="MTP Image Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpimagedp/group" mrp="mw/remoteconn/mtpdataproviders/mtpimagedp/group/mtp_imagedp.mrp"/>
-</component>
-<component name="mtppictbridgedp" long-name="MTP PictBridge Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group" mrp="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group/mtp_pictbridgedp.mrp"/>
-</component>
-</collection>
-<collection name="backupandrestore" long-name="Backup and Restore" level="specific">
-<component name="backupengine" long-name="Backup Engine" introduced="9.0" purpose="optional">
-<unit bldFile="mw/remoteconn/backupandrestore/backupengine/group" mrp="mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
-</component>
-<component name="backuptest" long-name="Backup Test" introduced="^2" purpose="development">
-<unit bldFile="mw/remoteconn/backupandrestore/backuptest/group" mrp="mw/remoteconn/backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
-</component>
-</collection>
-<collection name="obex" long-name="OBEX" level="generic">
-<component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexprotocol/group" mrp="mw/remoteconn/obex/obexprotocol/group/obex.mrp"/>
-</component>
-<component name="obexextensionapi" long-name="OBEX Extension API" introduced="9.2" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexextensionapi/group" mrp="mw/remoteconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
-</component>
-</collection>
-</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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<unit mrp="mw/srvdiscovery/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="dlnasrv" level="specific" long-name="DLNA Services" levels="stack server ctrl framework plugin">
-<!-- uncomment all the units when configuration is in place, they're currently #included from other xxx_build components -->
-<collection name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" level="plugin">
-<component name="upnp_media_server_settings_api" long-name="UPnP Media Server Settings API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_settings_api/group"/>
-</component>
-<component name="upnp_av_objects_api" long-name="UPnP A/V Objects API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_av_objects_api/group"/>
-</component>
-<component name="upnp_media_server_api" long-name="UPnP Media Server API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_api/group"/>
-</component>
-<component name="upnp_security_plugin_api" long-name="UPnP Security Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_security_plugin_api/group"/>
-</component>
-<component name="upnp_avcp_api" long-name="UPnP AVCP API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_avcp_api/group"/>
-</component>
-<component name="upnp_media_server_metadata_api" long-name="UPnP Media Server Metadata API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_metadata_api/group"/>
-</component>
-<component name="upnp_command_api" long-name="UPnP Command API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_command_api/group"/>
-</component>
-<component name="upnp_plugin_api" long-name="UPnP Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_plugin_api/group"/>
-</component>
-</collection>
-<collection name="upnpavcontrolpoint" long-name="UPnP A/V Control Point" level="plugin">
-<component name="avcontrolframework" filter="s60" long-name="A/V Control Famework" introduced="9.1" deprecated="^3">
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
-</component>
-<component name="upnpavcontrolpoint_build" filter="s60" long-name="UPnP A/V Control Point Build" introduced="9.1" deprecated="^3">
-<!-- put exports in other component instead -->
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/group"/>
-</component>
-</collection>
-<collection name="upnpmediaserver" long-name="UPnP Media Server" level="server">
-<component name="avobjects" filter="s60" long-name="A/V Objects">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/avobjects/group"/>
-</component>
-<component name="mediaserverclient" filter="s60" long-name="Media Server Client">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverclient/group"/>
-</component>
-<component name="connectionmanagerservice" filter="s60" long-name="Connection Manager Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/connectionmanagerservice/group"/>
-</component>
-<component name="contentdirectoryservice" filter="s60" long-name="Content Directory Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/contentdirectoryservice/group"/>
-</component>
-<component name="mediaserverengine" filter="s60" long-name="Media Server Engine">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverengine/group"/>
-</component>
-<component name="upnpmediaserver_build" filter="s60" long-name="UPnP Media Server Build">
-<!-- move exports into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpmediaserver/group"/>
-</component>
-</collection>
-<collection name="upnpavcontroller" long-name="UPnP A/V Controller" level="ctrl">
-<component name="upnpxmlparser" filter="s60" long-name="UPnP XML Parser" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpxmlparser/group"/>
-</component>
-<component name="upnpavcontrollerserver" filter="s60" long-name="UPnP A/V Controller Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerserver/group"/>
-</component>
-<component name="upnpavcontrollerclient" filter="s60" long-name="UPnP A/V Ccontroller Client" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerclient/group"/>
-</component>
-<component name="upnpavcontrollerhelper" filter="s60" long-name="UPnP A/V Controller Helper" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerhelper/group"/>
-</component>
-<component name="upnpavcontroller_build" filter="s60" long-name="UPnP A/V Controller Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpavcontroller/group"/>
-</component>
-</collection>
-<collection name="upnpframework" long-name="UPnP Framework" level="framework">
-<component name="upnputilities" filter="s60" long-name="UPnP Utilities" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnputilities/group"/>
-</component>
-<component name="upnpextensionpluginif" filter="s60" long-name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpextensionpluginif/group"/> -->
-</component>
-<component name="upnpfiletransferengine" filter="s60" long-name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>-->
-</component>
-<component name="upnpcommonui" filter="s60" long-name="UPnP Common UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpcommonui/group"/>-->
-</component>
-<component name="upnpaiwengine" filter="s60" long-name="UPnP AIW Engine" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpaiwengine/group"/> -->
-</component>
-<component name="upnpaiwprovider" filter="s60" long-name="UPnP AIW Provider" introduced="^2" deprecated="^3" plugin="Y">
-<!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
-</component>
-<component name="upnpmusicadapter" filter="s60" long-name="UPnP Music Adapter" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
-</component>
-<component name="upnpcommand" filter="s60" long-name="UPnP Command" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpcommand/group"/>
-</component>
-<component name="upnpframework_build" filter="s60" long-name="UPnP Framework Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpframework/group"/>
-</component>
-</collection>
-<collection name="upnpsettings" long-name="UPnP Settings" level="framework">
-<component name="upnpsettingsengine" filter="s60" long-name="UPnP Settings Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
-</component>
-<component name="multiselectionui" filter="s60" long-name="Multi-Selection UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/multiselectionui/group"/>-->
-</component>
-<component name="appwizard" filter="s60" long-name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/appwizard/group"/>-->
-</component>
-<component name="upnpsharingui" filter="s60" long-name="UPnP Sharing UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
-</component>
-<component name="upnpgsplugin" filter="s60" long-name="UPnP GS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
-</component>
-<component name="upnpsettings_build" filter="s60" long-name="UPnP Settings Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsettings/group"/>
-</component>
-</collection>
-<collection name="upnpsharing" long-name="UPnP Sharing" level="server">
-<component name="upnpdlnaprofiler" filter="s60" long-name="UPnP DLNA Profiler" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpdlnaprofiler/group"/>
-</component>
-<component name="upnpsecurity" filter="s60" long-name="UPnP Security" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpsecurity/group"/>
-</component>
-<component name="upnpcontentserver" filter="s60" long-name="UPnP Content Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpcontentserver/group"/>
-</component>
-<component name="applicationengine" filter="s60" long-name="UPnP Application Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/applicationengine/group"/>
-</component>
-<component name="upnpsharing_build" filter="s60" long-name="UPnP Sharing Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsharing/group"/>
-</component>
-</collection>
-<collection name="upnpmpxplugins" long-name="UPnP MPX Plugins" level="plugin">
-<component name="upnpplaybackplugins" filter="s60" long-name="UPnP Playback Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/upnpplaybackplugins/group"/>
-</component>
-<component name="upnpmpxplugins_build" filter="s60" long-name="UPnP MPX Plugins Build" introduced="^2">
-<!-- move exports content into other component? -->
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/group"/>
-</component>
-</collection>
-<collection name="upnpharvester" long-name="UPnP Harvester" level="ctrl">
-<component name="upnpharvester_common" filter="s60" long-name="UPnP Harvester Common" introduced="^2" deprecated="^3" class="placeholder">
-<!-- need to merge or #include these to a single bld.inf -->
-<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
- <unit bldFile="upnpharvester/common/cmsettings/group"/>
- <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
- <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
-</component>
-<component name="cdssync" filter="s60" long-name="CDS Sync" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
-</component>
-<component name="mdhserver" filter="s60" long-name="Metadata Harvester Server" introduced="^2" deprecated="^3" class="placeholder">
-<!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
-</component>
-<component name="upnpharvester_build" filter="s60" long-name="UPnP Harvester Build" introduced="^2" deprecated="^3" class="placeholder">
-<!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
-<!--<unit bldFile="upnpharvester/group"/>-->
-</component>
-</collection>
-<collection name="homesync" long-name="Home Sync" level="plugin">
-<component name="contentmanager" filter="s60" long-name="Content Manager" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homesync/group"/>-->
-<!-- move bld.inf into contentmanager dir -->
-</component>
-</collection>
-<collection name="homemedia" long-name="Home Media" level="framework">
-<!-- collection is really just a component. Move down a directory -->
-<component name="homemedia_build" filter="s60" long-name="Home Media" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homemedia/group"/> -->
-</component>
-</collection>
-<collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin">
-<component name="dlnasrv_build" filter="s60" long-name="DLNA Services Build">
-<!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed -->
-<unit bldFile="mw/dlnasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="btservices" level="generic" long-name="Bluetooth Services" levels="framework server generic specific plugin">
-<collection name="btservices_pub" long-name="BT Services Public Interfaces" level="plugin">
-<component name="bluetooth_power_state_api" long-name="Bluetooth Power State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_power_state_api/group"/>
-</component>
-<component name="bluetooth_notifier_api" long-name="Bluetooth Notifier API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_notifier_api/group"/>
-</component>
-</collection>
-<collection name="btservices_plat" long-name="BT Services Platform Interfaces" level="plugin">
-<component name="bluetooth_dosserver_audio_api" long-name="Bluetooth DOS Server Audio API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dosserver_audio_api/group"/>
-</component>
-<component name="bluetooth_dut_mode_api" long-name="Bluetooth DUT Mode API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dut_mode_api/group"/>
-</component>
-<component name="bluetooth_engine_api" long-name="Bluetooth Engine API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-<component name="bluetooth_local_variation_api" long-name="Bluetooth Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_local_variation_api/group"/>
-</component>
-<component name="bluetooth_notifier_internal_api" long-name="Bluetooth Notifier internal API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_notifier_internal_api/group"/>
-</component>
-<component name="bluetooth_sap_connection_state_api" long-name="Bluetooth SAP Connection State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_sap_connection_state_api/group"/>
-</component>
-<component name="bluetooth_secondary_display_notification_api" long-name="Bluetooth Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_secondary_display_notification_api/group"/>
-</component>
-</collection>
-<collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
-<component name="bteng" filter="s60" long-name="Bluetooth Engine">
-<unit bldFile="mw/btservices/bluetoothengine/bteng/group"/>
-</component>
-<component name="btnotif" filter="s60" long-name="Bluetooth Notifier">
-<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"/>
-</component>
-<component name="btmac" filter="s60" long-name="Bluetooth Mono Audio Controller" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btmac/group"/>
-</component>
-<component name="btsac" filter="s60" long-name="Bluetooth Stereo Audio Controller" plugin="Y">
-<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"/>
-</component>
-<component name="btsap" filter="s60" long-name="Bluetooth SIM Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btsap/group"/>
-</component>
-<component name="btui" filter="s60" long-name="Bluetooth UI">
-<unit bldFile="mw/btservices/bluetoothengine/btui/group"/>
-</component>
-<component name="btpbap" filter="s60" long-name="Bluetooth Phonebook Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btpbap/group"/>
-</component>
-<component name="bthid" filter="s60" long-name="Bluetooth HID">
-<unit bldFile="mw/btservices/bluetoothengine/bthid/group"/>
-</component>
-<component name="btctrldcmoadapter" filter="s60" long-name="Bluetooth Control DCMO Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btctrldcmoadapter/group"/>
-</component>
-</collection>
-<collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
-<component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
-<unit bldFile="mw/btservices/bluetoothappprofiles/avrcp" mrp="mw/btservices/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
-</component>
-</collection>
-<collection name="atcommands" long-name="AT Commands" level="generic">
-<component name="modematplugin" long-name="Modem AT Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/modematplugin/group"/>
-</component>
-<component name="lccustomplugin" long-name="LC Custom Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/lccustomplugin/group"/>
-</component>
-</collection>
-<collection name="btservices_info" long-name="BT Services Info" level="plugin">
-<component name="btservices_metadata" long-name="BT Services Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usbservices" level="generic" long-name="USB Services" levels="framework server generic specific plugin">
-<collection name="usbservices_plat" long-name="USB Services Platform Interfaces" level="plugin">
-<component name="pictbridge_api" long-name="PictBridge API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/pictbridge_api/group"/>
-</component>
-<component name="ptp_responder_api" long-name="PTP Responder API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_responder_api/group"/>
-</component>
-<component name="ptp_transport_api" long-name="PTP Transport API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_transport_api/group"/>
-</component>
-<component name="usb_device_control_plugin_api" long-name="USB Device Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_device_control_plugin_api/group"/>
-</component>
-<component name="usb_notifier_api" long-name="USB Notifier API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_notifier_api/group"/>
-</component>
-<component name="usb_personality_api_header" long-name="USB Personality API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_api_header/group"/>
-</component>
-<component name="usb_personality_plugin_api" long-name="USB Personality Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_plugin_api/group"/>
-</component>
-<component name="usb_secondary_display_api" long-name="USB Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_secondary_display_api/group"/>
-</component>
-<component name="usb_watcher_api" long-name="USB Watcher API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_api/group"/>
-</component>
-<component name="usb_watcher_info_api_header" long-name="USB Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_info_api_header/group"/>
-</component>
-</collection>
-<collection name="usbengines" long-name="USB Engines" level="generic">
-<component name="usbotgwatcher" filter="s60" long-name="USB OTG Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbotgwatcher/group"/>
-</component>
-<component name="usbwatcher" filter="s60" long-name="USB Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbwatcher/group"/>
-</component>
-<component name="usblocodplugin" filter="s60" long-name="USB Local Connectivity Domain Plugin" plugin="Y">
-<unit bldFile="mw/usbservices/usbengines/usblocodplugin/group"/>
-</component>
-<component name="usbdevcon" filter="s60" long-name="USB Device Control">
-<unit bldFile="mw/usbservices/usbengines/usbdevcon/group"/>
-</component>
-<component name="usbremotepersonality" filter="s60" long-name="USB Remote Personality">
-<unit bldFile="mw/usbservices/usbengines/usbremotepersonality/group"/>
-</component>
-</collection>
-<collection name="usbclasses" long-name="USB Classes" level="framework">
-<component name="usbobexclasscontroller" filter="s60" long-name="USB OBEX Class Controller" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbobexclasscontroller/group"/>
-</component>
-<component name="usbbasicpersonality" filter="s60" long-name="USB Basic Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbbasicpersonality/group"/>
-</component>
-<component name="usbmscpersonality" filter="s60" long-name="USB MSC Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbmscpersonality/group"/>
-</component>
-<!-- commented out in bld.inf. Should this be deleted?
- <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
- <unit bldFile="usbclasses/ptpstack/group"/>
- </component>
- <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
- <unit bldFile="usbclasses/sicdusbplugin/group"/>
- </component>
- <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
- <unit bldFile="usbclasses/ptpserver/group"/>
- </component>-->
-<component name="pictbridgeengine" filter="s60" long-name="PictBridge Engine">
-<unit bldFile="mw/usbservices/usbclasses/pictbridgeengine/group"/>
-</component>
-<component name="usbphoneasmodem" filter="s60" long-name="USB Phone as Modem" introduced="^3">
-<unit bldFile="mw/usbservices/usbclasses/usbphoneasmodem/group"/>
-</component>
-</collection>
-<collection name="usbuis" long-name="USB UIs" level="specific">
-<component name="usbui" filter="s60" long-name="USB UI">
-<unit bldFile="mw/usbservices/usbuis/usbui/group"/>
-</component>
-<component name="usbuinotif" filter="s60" long-name="USB UI Notifiers">
-<unit bldFile="mw/usbservices/usbuis/usbuinotif/group"/>
-</component>
-<component name="imageprintuiprovider" filter="s60" long-name="ImagePrint UI Provider" plugin="Y">
-<unit bldFile="mw/usbservices/usbuis/imageprintuiprovider/group"/>
-</component>
-<component name="usbimageprintui" filter="s60" long-name="ImagePrint UI">
-<unit bldFile="mw/usbservices/usbuis/imageprintui/group"/>
-</component>
-<component name="usbuiqt" long-name="USB UI Qt" introduced="^4" filter="s60">
-<unit bldFile="mw/usbservices/usbuis/usbuiqt" proFile="usbapplication.pro"/>
-</component>
-</collection>
-<collection name="usbservices_test" long-name="USB Services Test" level="server"/>
-</block>
-<block name="shortlinkconn" level="generic" long-name="Shortlink Connectivity" levels="framework server generic specific plugin">
-<!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
-<collection name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" level="plugin">
-<component name="obex_service_utils_api" long-name="OBEX Service Utils API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_utils_api/group"/>
-</component>
-<component name="obex_service_plugin_api" long-name="OBEX Service Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_plugin_api/group"/>
-</component>
-<component name="dialup_connection_status_api" long-name="Dial-up Connection Status API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dialup_connection_status_api/group"/>
-</component>
-<component name="dun_secondary_display_notification_api" long-name="DUN Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
-</component>
-<component name="obex_secondary_display_notification_api" long-name="OBEX Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
-</component>
-<component name="generic_hid_api" long-name="Generic HID API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/generic_hid_api/group"/>
-</component>
-<component name="locod_bearer_plugin_api" long-name="Locod Bearer Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/locod_bearer_plugin_api/group"/>
-</component>
-<component name="usb_obexservicemanager_client_api" long-name="USB OBEX Service Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_obexservicemanager_client_api/group"/>
-</component>
-</collection>
-<collection name="localconnectivityservice" long-name="Local Connectivity Service" level="server">
-<component name="locod" long-name="Local Connectivity Daemon">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/locod/group"/>
-</component>
-<component name="obexserviceman" long-name="OBEX Service Managar">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
-</component>
-<component name="obexsendservices" long-name="OBEX Send Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
-</component>
-<component name="obexreceiveservices" long-name="OBEX Receive Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
-</component>
-<component name="dun" long-name="Dial Up Networking">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/dun/group"/>
-</component>
-<component name="lcstylustap" long-name="LC Stylus Tap Plugins" plugin="Y">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/lcstylustap/group"/>
-</component>
-<component name="generichid" long-name="Generic HID">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/generichid/group"/>
-</component>
-<component name="headset" long-name="Headset">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/headset/group"/>
-</component>
-</collection>
-</block>
-<block name="imghandling" level="specific" long-name="Image Handling" levels="lib util if">
-<collection name="imagehandling_plat" long-name="Image Handling Platform Interfaces" level="if">
-<component name="image_handling_library_api" long-name="Image Handling Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
-</component>
-<component name="3gp_library_api" long-name="3GP Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
-</component>
-<component name="thumbnailmanager_api" long-name="Thumbnail Manager API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagehandlinglib" long-name="Image Handling Library" level="lib">
-<!-- collection is really a component, need to move down a directory -->
-<component name="ihl" filter="s60" long-name="IHL">
-<unit bldFile="mw/imghandling/imagehandlinglib/group"/>
-</component>
-</collection>
-<collection name="imagehandlingutilities" long-name="Image Handling Utilities" level="util">
-<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager">
-<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
-</component>
-<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager Qt" introduced="^4">
-<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt" filter="!test" proFile="thumbnailmanagerqt.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</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">
-<unit bldFile="mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
-</component>
-</collection>
-</block>
-<block name="mds" level="specific" long-name="Metadata Services" levels="mgr eng server int">
-<collection name="mds_plat" long-name="Metadata Services Platform Interfaces" level="int">
-<component name="context_engine_plugin_api" long-name="Context Engine Plugin API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/group" filter="!test"/>
-</component>
-<component name="harvester_framework_api" long-name="Harvester Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/harvester_framework_api/group" filter="!test"/>
-<!-- can only have one unit with the same filter, #include the following from the previous unit -->
-</component>
-<component name="location_manager_api" long-name="Location Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/location_manager_api/group" filter="!test"/>
-</component>
-<component name="metadata_engine_api" long-name="Metadata Engine API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/metadata_engine_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_collection_manager_api" long-name="Content Listing Framework Collection Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_extended_api" long-name="Content Listing Framework Extended API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_extended_api/group"/>
-</component>
-</collection>
-<collection name="mds_pub" long-name="Metadata Services Public Interfaces" level="int">
-<component name="content_listing_framework_api" long-name="Content Listing Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_pub/content_listing_framework_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="metadataengine" long-name="Metadata Engine" level="eng">
-<component name="metadataengine_common" filter="s60" long-name="Metadata Engine Common" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/common/group"/>
-</component>
-<component name="metadataengine_server" filter="s60" long-name="Metadata Engine Server" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/server/group"/>
-</component>
-<component name="metadataengine_client" filter="s60" long-name="Metadata Engine Client" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/client/group"/>
-</component>
-<component name="metadataengine_build" filter="s60" long-name="Metadata Engine Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/metadataengine/group"/>
-</component>
-</collection>
-<collection name="locationmanager" long-name="Location Manager" level="mgr">
-<component name="locationtrail" filter="s60" long-name="Location Trail" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/locationtrail/group"/>
-</component>
-<component name="locationmanager_server" filter="s60" long-name="Location Manager Server" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/server/group"/>
-</component>
-<component name="locationmanager_client" filter="s60" long-name="Location Manager Client" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/client/group"/>
-</component>
-<component name="locationmanager_build" filter="s60" long-name="Location Manager Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/locationmanager/group"/>
-</component>
-</collection>
-<collection name="contextengine" long-name="Context Engine" level="eng">
-<component name="contextengine_plugins" filter="s60" long-name="Context Engine Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/contextengine/plugins/group"/>
-</component>
-<component name="contextengine_build" filter="s60" long-name="Context Engine Build" introduced="^2">
-<!--make this collection a single component, or make this unit self-contained -->
-<unit bldFile="mw/mds/contextengine/group"/>
-</component>
-</collection>
-<collection name="harvester" long-name="Harvester" level="eng">
-<component name="blacklistclient" filter="s60" long-name="Blacklist Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistclient/group"/>
-</component>
-<component name="blacklistserver" filter="s60" long-name="Blacklist Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistserver/group"/>
-</component>
-<component name="harvester_common" filter="s60" long-name="Harvester Common" introduced="^2">
-<unit bldFile="mw/mds/harvester/common/group"/>
-</component>
-<component name="composerplugins" filter="s60" long-name="Composer Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/composerplugins/group"/>
-</component>
-<component name="harvesterplugins" filter="s60" long-name="Harvester Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/harvesterplugins/group"/>
-</component>
-<component name="monitorplugins" filter="s60" long-name="Monitor Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/monitorplugins/group"/>
-</component>
-<component name="harvester_server" filter="s60" long-name="Harvester Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/server/group"/>
-</component>
-<component name="harvester_client" filter="s60" long-name="Harvester Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/client/group"/>
-</component>
-<component name="harvester_build" filter="s60" long-name="Harvester Build" introduced="^2">
-<!-- split these exports into the other components -->
-<unit bldFile="mw/mds/harvester/group"/>
-</component>
-</collection>
-<collection name="watchdog" long-name="Watchdog" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="mdswatchdog" filter="s60" long-name="Metadata Watchdog" introduced="^2">
-<unit bldFile="mw/mds/watchdog/group"/>
-</component>
-</collection>
-<collection name="clfwrapper" long-name="Content Listing Framework Wrapper" level="int">
-<!-- collection is really a component. Move down a directory -->
-<component name="clfwrapper_build" filter="s60" long-name="CLF Wrapper Build" introduced="^2" class="placeholder">
-<!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
-<!--<unit bldFile="clfwrapper/group"/>-->
-</component>
-</collection>
-<collection name="mds_info" long-name="Metadata Services Info" level="int">
-<component name="mds_build" filter="s60" long-name="Metadata Services Build" introduced="^2">
-<!-- consider distributiing this into the rest of the components in the package -->
-<unit bldFile="mw/mds/group"/>
-</component>
-</collection>
-</block>
-<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"/>
-</component>
-<component name="videoconnutility_api" long-name="Video Connection Utility API" filter="s60" class="api">
-<unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/group"/>
-</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"/>
-</component>
-</collection>
-<collection name="videoscheduler" long-name="Video Scheduler" level="util">
-<component name="schedulerclient" filter="s60" long-name="Video Scheduler Client">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerclient/group"/>
-</component>
-<component name="schedulerserver" filter="s60" long-name="Video Scheduler Server">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerserver/group"/>
-</component>
-</collection>
-<collection name="videoconnutility" long-name="Video Connection Utility" level="util">
-<component name="connutilpsworker" filter="s60" long-name="Connection Utility Publish and Subscribe Worker">
-<unit bldFile="mw/videoutils/videoconnutility/connutilpsworker/group"/>
-</component>
-<component name="video_connutility" filter="s60" long-name="Video Connection Utility">
-<unit bldFile="mw/videoutils/videoconnutility/connutility/group"/>
-</component>
-</collection>
-<collection name="videoutils_info" long-name="Video Utils Info" level="if"/>
-</block>
-<block name="mmmw" level="generic" long-name="Multimedia Middleware" levels="plugin framework server generic specific">
-<collection name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" level="specific">
-<component name="multimedia_data_source_api" long-name="Multimedia Data Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
-</component>
-<component name="progressive_download_api" long-name="Progressive Download API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/progressive_download_api/group"/>
-</component>
-<component name="equalizer_ui_api" long-name="Equalizer UI API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
-</component>
-<component name="enhanced_media_client_api" long-name="Enhanced Media Client API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
-</component>
-<component name="stream_control_custom_command_api" long-name="Stream Control Custom Command API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
-</component>
-<component name="emc_buffer_source_api" long-name="EMC Buffer Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_buffer_source_api/group"/>
-</component>
-<component name="emc_file_source_api" long-name="EMC File Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
-</component>
-<component name="audio_metadata_reader_api" long-name="Audio MetaData Reader API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
-</component>
-<component name="emc_progressive_download_source_api" long-name="EMC Progressive Download Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
-</component>
-<component name="emc_volume_effect_api" long-name="EMC Volume Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
-</component>
-<component name="emc_balance_effect_api" long-name="EMC Balance Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_balance_effect_api/group"/>
-</component>
-<component name="emc_descriptor_source_api" long-name="EMC Descriptor Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_descriptor_source_api/group"/>
-</component>
-<component name="emc_drm_config_intfc_api" long-name="EMC DRM Config Intfc API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
-</component>
-<component name="voip_audio_services_api" long-name="VoIP Audio Services" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/group"/>
-</component>
-<component name="configuration_components_factory_api" long-name="Configuration Components Factory API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
-</component>
-<component name="audio_output_control_utility_api" long-name="Audio Output Control Utility API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/group"/>
-</component>
-<component name="audio_output_control_utility_proxy_api" long-name="Audio Output Control Utility Proxy API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
-</component>
-<component name="emc_audio_effects_api" long-name="EMC Audio Effects API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
-</component>
-<component name="call_audio_control_api" long-name="Call AudioControl API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/group"/>
-</component>
-<component name="radio_utilities_api" long-name="Radio Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/group"/>
-</component>
-<component name="radio_preset_utilities_api" long-name="Radio Preset Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
-</component>
-<component name="radio_monitor_api" long-name="Radio Monitor API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
-</component>
-<component name="thumbnail_engine_api" long-name="Thumbnail Engine API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/thumbnail_engine_api/group"/>
-</component>
-<component name="telephony_multimedia_service_api" long-name="Telephony Multimedia Service API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
-</component>
-<component name="openmax_al_api" long-name="OpenMAX AL API" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/openmax_al_api/group"/>
-</component>
-</collection>
-<collection name="mmfenh" long-name="MMF Enhancements" level="generic">
-<component name="advancedaudiocontroller" filter="s60" long-name="Advanced Audio Controllers" plugin="Y">
-<unit bldFile="mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
-</component>
-<component name="audiooutputcontrolutility" filter="s60" long-name="Audio Output Control Utility">
-<unit bldFile="mw/mmmw/mmfenh/audiooutputcontrolutility/group"/>
-</component>
-<component name="configurationcomponentsfactory" filter="s60" long-name="Configuration Components Factory">
-<unit bldFile="mw/mmmw/mmfenh/configurationcomponentsfactory/group"/>
-</component>
-<component name="enhancedaudioplayerutility" filter="s60" long-name="Enhanced Audio Player Utility">
-<unit bldFile="mw/mmmw/mmfenh/enhancedaudioplayerutility/group"/>
-</component>
-<component name="enhancedmediaclient" filter="s60" long-name="Enhanced Media Client">
-<unit bldFile="mw/mmmw/mmfenh/enhancedmediaclient/group"/>
-</component>
-<component name="profilesettingsmonitor" filter="s60" long-name="Profile Settings Monitor">
-<unit bldFile="mw/mmmw/mmfenh/profilesettingsmonitor/group"/>
-</component>
-<component name="progressivedownload" filter="s60" long-name="Progressive Download">
-<unit bldFile="mw/mmmw/mmfenh/progressivedownload/group"/>
-</component>
-</collection>
-<collection name="mm_fw" long-name="Multimedia Frameworks" level="framework">
-<!-- Id needs to be unique, mmfw already in use -->
-<!-- Placeholder for OpenAX AL and other stuff -->
-</collection>
-<collection name="mmserv" long-name="Multimedia Services" level="specific">
-<component name="audioeffectsui" filter="s60" long-name="Audio Effects UI">
-<unit bldFile="mw/mmmw/mmserv/audioeffectsui/group"/>
-</component>
-<component name="callaudiocontrol" filter="s60" long-name="Call Audio Control">
-<unit bldFile="mw/mmmw/mmserv/callaudiocontrol/group"/>
-</component>
-<component name="metadatautility" filter="s60" long-name="Metadata Utility">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/group"/>
-</component>
-<component name="radioutility" filter="s60" long-name="Radio Utility">
-<unit bldFile="mw/mmmw/mmserv/radioutility/group"/>
-</component>
-<component name="thumbnailengine" filter="s60" long-name="Thumbnail Engine" introduced="^2">
-<unit bldFile="mw/mmmw/mmserv/thumbnailengine/group"/>
-</component>
-<component name="tms" filter="s60" long-name="Telephony Multimedia Service" introduced="^3">
-<unit bldFile="mw/mmmw/mmserv/tms/group"/>
-</component>
-<component name="voipaudioservices" filter="s60" long-name="VoIP Audio Services">
-<unit bldFile="mw/mmmw/mmserv/voipaudioservices/group"/>
-</component>
-<component name="lib3gpextparser" filter="s60" long-name="3GP Extension Metadata Parser Library">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group" filter="sf_build"/>
-</component>
-</collection>
-<collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
-<component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="helix" level="generic" long-name="Helix" levels="plugin framework server generic specific">
-<collection name="helix_ren" long-name="Helix Engine" level="framework">
-<!-- what does "ren" stand for? -->
-<component name="helix_stub" filter="s60" long-name="Helix Stub" introduced="^2" class="api">
-<unit bldFile="mw/helix/helix_ren/helix_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="camerasrv" level="specific" long-name="Camera Services" levels="plugin fw api">
-<collection name="camerasrv_plat" long-name="Camera Services Platform Interfaces" level="api">
-<component name="media_recorder_sink_api" long-name="Media Recorder Sink API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
-</component>
-<component name="custom_onboard_camera_api" long-name="Custom Onboard Camera API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
-</component>
-<component name="imaging_configuration_manager_api" long-name="Imaging Configuration Manager API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
-</component>
-<component name="media_recorder_api" long-name="Media Recorder API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_api/group" filter="!test"/>
-</component>
-<component name="3gp_file_composer_api" long-name="3GP File Composer API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
-</component>
-</collection>
-<collection name="camcordermmfplugin" long-name="Camcorder MMF Plugin" level="plugin">
-<!-- collection is really a component. Should move down a directory -->
-<component name="camcordermmfplugin_build" filter="s60" long-name="Camcorder MMF Plugin Build" plugin="Y">
-<unit bldFile="mw/camerasrv/camcordermmfplugin/build"/>
-</component>
-</collection>
-<collection name="configmanagers" long-name="Config Managers" level="api">
-<component name="imagingconfigmanager" filter="s60" long-name="Imaging Config Manager">
-<unit bldFile="mw/camerasrv/configmanagers/imagingconfigmanager/group"/>
-</component>
-</collection>
-<collection name="camerasrv_info" long-name="Camera Services Info" level="api">
-<component name="camerasrv_build" filter="s60" long-name="Camera Services Build">
-<!-- should split into individual bld.infs -->
-<unit bldFile="mw/camerasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="mmappfw" level="specific" long-name="Multimedia App Framework" levels="fw utils if">
-<collection name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" level="if">
-<component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interfaces Build" introduced="^1" filter="s60">
-<!-- this is no longer necessary when confguration is put in place -->
-<unit bldFile="mw/mmappfw/mmappfw_plat"/>
-</component>
-<component name="collection_helper_api" long-name="Collection Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
-</component>
-<component name="harvester_collection_mediator_api" long-name="Harvester Collection Mediator API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/group"/>
-</component>
-<component name="harvester_metadata_extractor_api" long-name="Harvester Metadata Extractor API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/group"/>
-</component>
-<component name="harvester_server_api" long-name="Harvester Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_server_api/group"/>
-</component>
-<component name="harvester_utility_api" long-name="Harvester Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_utility_api/group"/>
-</component>
-<component name="playlist_engine_api" long-name="Playlist Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playlist_engine_api/group"/>
-</component>
-<component name="mtp_keys_api" long-name="MTP Keys API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mtp_keys_api/group"/>
-</component>
-<component name="mpx_collection_common_definition_api" long-name="MPX Collection Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_common_definition_api/group"/>
-</component>
-<component name="mpx_collection_utility_api" long-name="MPX Collection Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/group"/>
-</component>
-<component name="mpx_common_api" long-name="MPX Common API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_api/group"/>
-</component>
-<component name="mpx_common_definition_api" long-name="MPX Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_common_definition_api" long-name="MPX Playback Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_utility_api" long-name="MPX Playback Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/group"/>
-</component>
-<component name="mpx_base_view_plugins_api" long-name="MPX Base View Plugins API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/group"/>
-</component>
-<component name="mpx_view_utility_api" long-name="MPX View Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_view_utility_api/group"/>
-</component>
-<component name="mpx_albumart_utility_api" long-name="MPX Album Art Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/group"/>
-</component>
-<component name="media_player_settings_engine_api" long-name="Media Player Settings Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
-</component>
-<component name="mpx_backstepping_utility_api" long-name="MPX Backstepping Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_backstepping_utility_api/group"/>
-</component>
-<component name="asx_parser_api" long-name="ASX Parser API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/asx_parser_api/group"/>
-</component>
-<component name="playback_helper_api" long-name="Playback Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playback_helper_api/group"/>
-</component>
-<component name="videoplaylist_utility_api" long-name="Video Playlist Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/videoplaylist_utility_api/group"/>
-</component>
-</collection>
-<collection name="mpx" long-name="Multimedia Player" level="fw">
-<component name="commonframework" filter="s60" long-name="MPX Common Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/commonframework/group"/>
-</component>
-<component name="playbackframework" filter="s60" long-name="MPX Playback Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/playbackframework/group"/>
-</component>
-<component name="mpxcollectionfw" filter="s60" long-name="MPX Collection Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/collectionframework/group"/>
-</component>
-<component name="mpxviewfw" filter="s60" long-name="MPX View Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/viewframework/group"/>
-</component>
-<component name="mpxviewframeworkqt" long-name="MPX View Framework Qt" filter="s60">
-<unit bldFile="mw/mmappfw/mpx/mpxviewframeworkqt" proFile="mpxviewframeworkqt.pro" qmakeArgs="-r -config rom"/>
-</component>
-<component name="mpx_build" filter="s60" long-name="MPX Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/mpx/group"/>
-</component>
-</collection>
-<collection name="mmappcomponents" long-name="Multimedia App Components" level="utils">
-<component name="mmappcomponents_build" filter="s60" long-name="Multimedia App Components Build" introduced="^1">
-<!-- needed for #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
- Can remove this once configuration is in place-->
-<unit bldFile="mw/mmappfw/mmappcomponents/group"/>
-</component>
-<component name="collectionhelper" filter="s60" long-name="Media Player Collection Helper" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/collectionhelper/group"/>
-</component>
-<component name="playlistengine" filter="s60" long-name="Playlist Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/playlistengine/group"/>
-</component>
-<component name="mpxharvester" filter="s60" long-name="Media Player Harvester" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/harvester/group"/>
-</component>
-<component name="mmappcommonui" filter="s60" long-name="Multimedia App Common UI" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmappcommonui/group"/>
-</component>
-<component name="mediaplayersettingsengine" filter="s60" long-name="Media Player Settings Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
-</component>
-<component name="audiofetcher" filter="s60" long-name="Audio Fetcher" introduced="^1" plugin="Y">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
-</component>
-<component name="asxparser" filter="s60" long-name="ASX Parser" introduced="^1">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
-</component>
-<component name="playbackhelper" filter="s60" long-name="Playback Helper" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/playbackhelper/group"/>
-</component>
-<component name="videoplaylistutility" filter="s60" long-name="Video Playlist Utility" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/videoplaylistutility/group"/>
-</component>
-<component name="mmmtpdataprovider" filter="s60" long-name="Multimedia MTP Data Provider" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmmtpdataprovider/group"/>
-</component>
-</collection>
-<collection name="mmappfw_info" long-name="Multimedia App Framework Info" level="if">
-<component name="mmappfw_build" filter="s60" long-name="Multimedia App Framework Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/group"/>
-</component>
-<component name="mmappfw_test" filter="s60,test,api_test,pref_test" long-name="Multimedia App Framework Test" purpose="development" introduced="^1"/>
-</collection>
-</block>
-<block name="hgwidgets" level="specific" long-name="HG Widgets" levels="framework service api">
-<collection name="hgwidgets_pub" long-name="HG Widgets Platform Interfaces" level="api">
-<component name="ganeswidgets_api" long-name="Ganes Widgets API" introduced="^4" class="api placeholder">
-<!-- should separate out unit -->
-</component>
-</collection>
-<collection name="hgwidgets_pub" long-name="HG Widgets Public Interfaces" level="api"/>
-<collection name="ganeswidgets" long-name="Ganes Widgets" level="service">
-<!-- really a component, should move down a dir level and have a unit -->
-<component name="ganeswidgets_build" long-name="Ganes Widgets Build" introduced="^4" class="placeholder">
-<!-- should separate out unit -->
-</component>
-</collection>
-<collection name="hgwidgets_info" long-name="HG Widgets Info" level="framework">
-<component name="hgwidgets_build" long-name="HG Widgets Build" introduced="^4">
-<unit bldFile="mw/hgwidgets" proFile="hgwidgets.pro"/>
-</component>
-</collection>
-</block>
-<block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework api">
-<collection name="inputmethods_pub" long-name="Input Methods Public Interfaces" level="api">
-<component name="ptiengine_iti_api" long-name="PTI Engine API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
-</component>
-<component name="optical_character_recognition_api" long-name="Optical Character Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
-</component>
-<component name="input_language_info_api" long-name="Input Language Info API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
-</component>
-</collection>
-<collection name="inputmethods_plat" long-name="Input Methods Platform Interfaces" level="api">
-<component name="pen_input_server_api" long-name="Pen Input Server API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/group" filter="!test"/>
-</component>
-<component name="ptiengine_hwr_api" long-name="PTI Engine Handwriting Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group" filter="!test"/>
-</component>
-<component name="aknfep_settings_api" long-name="Avkon FEP Settings API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
-</component>
-<component name="aknfep_status_api" long-name="Avkon FEP Status API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
-</component>
-<component name="ptiengine_key_definations_api" long-name="PTI Engine Key Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
-</component>
-<component name="aknfep_definitions_api" long-name="Avkon FEP Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
-</component>
-<component name="aknfep_pen_support_api" long-name="Avkon FEP Pen Support API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
-</component>
-<component name="ptiengine_indic_definitions_api" long-name="PTI Engine Indic Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
-</component>
-<component name="aknfep_uiinterface_api" long-name="Avkon FEP UI Interface API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="textinput" long-name="Text Input" level="framework">
-<component name="ptienginev2" filter="s60" long-name="Predictive Text Input Engine">
-<!--uncomment when configuration is turned on and textinput_build is removed-->
-<!-- <unit bldFile="textinput/ptienginev2/group"/>-->
-</component>
-<component name="akninputlanguage" filter="s60" long-name="Avkon Input Language">
-<unit bldFile="mw/inputmethods/textinput/akninputlanguage/group"/>
-</component>
-<component name="peninputarc" filter="s60" long-name="Pen Input Arc">
-<unit bldFile="mw/inputmethods/textinput/peninputarc/group"/>
-</component>
-<component name="peninputcommonctrls" filter="s60" long-name="Pen Input Common Controls">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonctrls/group"/>
-</component>
-<component name="peninputcommonlayout" filter="s60" long-name="Pen Input Common Layout">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonlayout/group"/>
-</component>
-<component name="peninputhwrtrui" filter="s60" long-name="Pen Input Handwriting Recognition Training UI" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrtrui/group"/>
-</component>
-<component name="textinput_build" filter="s60" long-name="Text Input Build">
-<!--needed for #ifdef, can be removed when configuration is implemented -->
-<unit bldFile="mw/inputmethods/textinput/group"/>
-</component>
-</collection>
-<collection name="fep" long-name="FEP" level="engine">
-<component name="aknfep" filter="s60" long-name="Avkon FEP" plugin="Y">
-<unit bldFile="mw/inputmethods/fep/aknfep/group"/>
-</component>
-<component name="frontendprocessor" long-name="Front End Processor" purpose="mandatory">
-<unit bldFile="mw/inputmethods/fep/frontendprocessor/group" mrp="mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
-</component>
-</collection>
-<collection name="inputmethods_info" long-name="Input Methods Info" level="api">
-<component name="inputmethods_metadata" long-name="Input Methods Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="qt" level="generic" long-name="Qt" levels="tool mw app">
-<collection name="qtconf" long-name="Qt Config" level="tool">
-<component name="qt_deviceconfiguration" long-name="Qt Device Configuration" introduced="^2" class="config tool">
-<unit bldFile="mw/qt/src/s60installs/deviceconfiguration"/>
-</component>
-</collection>
-<collection name="qt_info" long-name="Qt Info" level="mw">
-<component name="qt_build" long-name="Qt Build" introduced="^2">
-<unit bldFile="mw/qt" proFile="projects.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-<collection name="qtdemos" long-name="Qt Demos" level="app">
-<component name="qtdemos_build" long-name="Qt Demos Build" introduced="^2" filter="qtdemos">
-<unit bldFile="mw/qt/demos" proFile="demos.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-<collection name="qtexamples" long-name="Qt Examples" level="app">
-<component name="qtexamples_build" long-name="Qt Examples Build" introduced="^2" filter="qtexamples">
-<unit bldFile="mw/qt/examples" proFile="examples.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-<collection name="qt_tests" long-name="Qt Tests" level="app">
-<component name="qttestsauto" long-name="Qt Automated Tests" introduced="^2" filter="qttestsauto">
-<unit bldFile="mw/qt/tests/auto" proFile="qtpauto.pro"/>
-</component>
-<component name="qttestsbenchmarks" long-name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks">
-<unit bldFile="mw/qt/tests/benchmarks" proFile="benchmarks.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-</block>
-<block name="qtextensions" level="generic" long-name="Qt Extensions" levels="tool mw app">
-<collection name="qtecomplugins" long-name="Qt ECom Plugins" level="app">
-<component name="qtextensions_examples" filter="qtextensionsexamples" long-name="Qt ECom Plugin Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtecomplugins/examples" proFile="examples.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qthighway" long-name="Qt Highway" level="app">
-<component name="qthighway_examples" filter="qtextensionsexamples" long-name="Qt Highway Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qthighway/examples" qmakeArgs="-r"/>
-</component>
-<component name="qthighwaytests" filter="qtextensionstests" long-name="Qt Highway Tests" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qthighway/tests" proFile="tests.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qtmobileextensions" long-name="Qt Mobile Extensions" level="app">
-<component name="qtmobileextensions_examples" filter="qtextensionsexamples" long-name="Qt Mobile Extensions Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtmobileextensions/examples" proFile="examples.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qtmobility" long-name="Qt Mobility">
-<component name="qtmobility_examples" filter="qtextensionsexamples" long-name="Qt Mobility Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtmobility/examples" proFile="examples.pro" qmakeArgs="-r"/>
-</component>
-<component name="qtmobilitytests" filter="qtextensionstests" long-name="Qt Extensions Tests" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtmobility/tests" proFile="tests.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qtextensions_info">
-<component name="qtextensions_build" long-name="Qt Extensions Confgure" introduced="^4" class="conf">
-<unit bldFile="mw/qtextensions/group"/>
-</component>
-<component name="qtextensions_build" long-name="Qt Extensions Build" introduced="^4">
-<!-- break this up into the above collections-->
-<unit bldFile="mw/qtextensions" proFile="qtextensions.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</block>
-<block name="hb" level="generic" long-name="Orbit" levels="engine test api">
-<collection name="hb_info" long-name="Orbit Info" level="api">
-<component name="hb_build" long-name="Orbit Build" introduced="^4">
-<!-- should break this down into actual components -->
-<unit bldFile="mw/hb" proFile="hb.pro" qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
-</component>
-</collection>
-<collection name="hb_test" long-name="Orbit Test" level="test">
-<component name="hb_fute" filter="hb_fute_app" long-name="Fute" introduced="^4">
-<unit bldFile="mw/hb/tsrc/fute" proFile="fute.pro" qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
-</component>
-</collection>
-</block>
-<block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
-<collection name="classicui_plat" long-name="Classic UI Platform Interfaces" level="specific">
-<component name="personalisation_framework_api" long-name="Personalisation Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_framework_api/group" filter="!test"/>
-</component>
-<component name="signal_pane_api" long-name="Signal Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
-</component>
-<component name="japanese_reading_api" long-name="Japanese Reading API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/japanese_reading_api/group" filter="!test"/>
-</component>
-<component name="global_popup_priority_controller_api" long-name="Global Popup Priority Controller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
-</component>
-<component name="item_finder_api" long-name="Item Finder API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/item_finder_api/group" filter="!test"/>
-</component>
-<component name="avkon_fonts_api" long-name="Avkon Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_fonts_api/group" filter="!test"/>
-</component>
-<component name="extended_utilities_api" long-name="Extended Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
-</component>
-<component name="personalisation_plugin_api" long-name="Personalisation Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
-</component>
-<component name="extended_aiw_criteria_api" long-name="Extended AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="personalisation_application_api" long-name="Personalisation Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_application_api/group"/>
-</component>
-<component name="volume_popup_api" long-name="Volume Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
-</component>
-<component name="avkon_secondary_display_support_api" long-name="AVKON Secondary Display Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_support_api/group" filter="!test"/>
-</component>
-<component name="extended_setting_pages_api" long-name="Extended Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_setting_pages_api/group" filter="!test"/>
-</component>
-<component name="extended_lists_api" long-name="Extended Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_lists_api/group" filter="!test"/>
-</component>
-<component name="input_block_api" long-name="Input Block API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/input_block_api/group" filter="!test"/>
-</component>
-<component name="avkon_ui_server_api" long-name="AVKON UI Server API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_ui_server_api/group" filter="!test"/>
-</component>
-<component name="number_grouping_api" long-name="Number Grouping API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/number_grouping_api/group" filter="!test"/>
-</component>
-<component name="extended_status_pane_api" long-name="Extended Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_status_pane_api/group" filter="!test"/>
-</component>
-<component name="extended_notifiers_api" long-name="Extended Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notifiers_api/group" filter="!test"/>
-</component>
-<component name="task_list_api" long-name="Task List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
-</component>
-<component name="personalisation_slide_show_dialog_api" long-name="Personalisation Slide Show Dialog API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
-</component>
-<component name="key_event_utilities_api" long-name="Key Event Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_event_utilities_api/group"/>
-</component>
-<component name="emergency_call_support_api" long-name="Emergency Call Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/emergency_call_support_api/group" filter="!test"/>
-</component>
-<component name="extended_dialogs_api" long-name="Extended Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_dialogs_api/group"/>
-</component>
-<component name="legacy_ui_framework_headers_api" long-name="Legacy UI Framework Headers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/legacy_ui_framework_headers_api/group"/>
-</component>
-<component name="extended_editors_api" long-name="Extended Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_editors_api/group" filter="!test"/>
-</component>
-<component name="alarm_api" long-name="Alarm API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alarm_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_interface_base_api" long-name="AIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_base_api/group" filter="!test"/>
-</component>
-<component name="list_effects_api" long-name="List Effects API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/list_effects_api/group" filter="!test"/>
-</component>
-<component name="find_item_ui_api" long-name="Find Item UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/find_item_ui_api/group" filter="!test"/>
-</component>
-<component name="server_application_services_api" long-name="Server Application Services API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/server_application_services_api/group" filter="!test"/>
-</component>
-<component name="common_ui_settings_api" long-name="Common UI Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_ui_settings_api/group"/>
-</component>
-<component name="aiw_service_interface_menu_api" long-name="AIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_menu_api/group" filter="!test"/>
-</component>
-<component name="eikon_server_extension_client_api" long-name="EIKON Server Extension Client API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/eikon_server_extension_client_api/group" filter="!test"/>
-</component>
-<component name="skinnable_clock_api" long-name="Skinnable Clock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/skinnable_clock_api/group" filter="!test"/>
-</component>
-<component name="battery_pane_api" long-name="Battery Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/battery_pane_api/group" filter="!test"/>
-</component>
-<component name="fep_document_navigation_api" long-name="FEP Document Navigation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
-</component>
-<component name="personalisation_localised_texts_api" long-name="Personalisation Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
-</component>
-<component name="memory_card_ui_api" long-name="Memory Card UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
-</component>
-<component name="avkon_status_api" long-name="AVKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_status_api/group"/>
-</component>
-<component name="application_switching_api" long-name="Application Switching API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/application_switching_api/group" filter="!test"/>
-</component>
-<component name="avkon_localised_texts_api" long-name="AVKON Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_localised_texts_api/group"/>
-</component>
-<component name="avkon_secondary_display_api" long-name="AVKON Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_api/group"/>
-</component>
-<component name="extended_animation_api" long-name="Extended Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_notes_api" long-name="Extended Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notes_api/group" filter="!test"/>
-</component>
-<component name="text_scroller_api" long-name="Text Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/text_scroller_api/group" filter="!test"/>
-</component>
-<component name="custom_cursors_api" long-name="Custom Cursors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/custom_cursors_api/group" filter="!test"/>
-</component>
-<component name="global_window_priorities_api" long-name="Global Window Priorities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_window_priorities_api/group"/>
-</component>
-<component name="extended_indicators_api" long-name="Extended Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_indicators_api/group" filter="!test"/>
-</component>
-<component name="special_character_table_api" long-name="Special Character Table API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/special_character_table_api/group" filter="!test"/>
-</component>
-<component name="avkon_settings_api" long-name="AVKON Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_settings_api/group"/>
-</component>
-<component name="extended_sounds_api" long-name="Extended Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_sounds_api/group"/>
-</component>
-<component name="themes_settings_api" long-name="Themes Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/themes_settings_api/group"/>
-</component>
-<component name="media_shared_document_api" long-name="Media Shared Document API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/media_shared_document_api/group" filter="!test"/>
-</component>
-<component name="extended_queries_api" long-name="Extended Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_queries_api/group"/>
-</component>
-<component name="phone_number_text_utilities_api" long-name="Phone Number Text Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
-</component>
-<component name="extended_scroller_api" long-name="Extended Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_scroller_api/group"/>
-</component>
-<component name="key_rotator_api" long-name="Key Rotator API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_rotator_api/group" filter="!test"/>
-</component>
-<component name="extended_grids_api" long-name="Extended Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_grids_api/group" filter="!test"/>
-</component>
-<component name="generic_parameter_api" long-name="Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="indicator_touch_observer_api" long-name="Indicator Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_touch_observer_api/group"/>
-</component>
-<component name="popup_form_api" long-name="Popup Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/popup_form_api/group" filter="!test"/>
-</component>
-<component name="stylus_activated_popup_api" long-name="Stylus Activated Pop-up API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/stylus_activated_popup_api/group" filter="!test"/>
-</component>
-<component name="indicator_plugin_api" long-name="Indicator Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_plugin_api/group" filter="!test"/>
-</component>
-<component name="layout_configuration_api" long-name="Layout Configuration API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/layout_configuration_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_filter_factory_api" long-name="Common File Dialogs Filter Factory API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group" filter="!test"/>
-</component>
-<component name="avkon_anim_dll_api" long-name="AVKON Anim DLL API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_anim_dll_api/group"/>
-</component>
-<component name="extended_initialization_api" long-name="Extended Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_initialization_api/group" filter="!test"/>
-</component>
-<component name="long_tap_animation_api" long-name="Long Tap Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/long_tap_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_ui_framework_definitions_api" long-name="Extended UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_ui_framework_definitions_api/group"/>
-</component>
-<component name="extended_buttons_api" long-name="Extended Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_buttons_api/group" filter="!test"/>
-</component>
-<component name="aiw_provider_utility_api" long-name="AIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_provider_utility_api/group" filter="!test"/>
-</component>
-<component name="transition_effect_parameters_api" long-name="Transition Effect Parameters API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_parameters_api/group" filter="!test"/>
-</component>
-<component name="extended_input_capabilities_api" long-name="Extended Input Capabilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_input_capabilities_api/group" filter="!test"/>
-</component>
-<component name="uikon_status_api" long-name="UIKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/uikon_status_api/group"/>
-</component>
-<component name="transition_effect_utilities_api" long-name="Transition Effect Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_utilities_api/group" filter="!test"/>
-</component>
-<component name="pointer_event_modifier_api" long-name="Pointer Event Modifier API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/pointer_event_modifier_api/group" filter="!test"/>
-</component>
-<component name="avkon_testability_api" long-name="AVKON Testability API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_testability_api/group"/>
-</component>
-<component name="ganes_api" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ganes_api/group"/>
-</component>
-<component name="ode_api" long-name="Ode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ode_api/group"/>
-</component>
-<component name="physics_api" long-name="Physics API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/physics_api/group"/>
-</component>
-<component name="touch_pane_api" long-name="Touch Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_api/group" filter="!test"/>
-</component>
-<component name="touch_pane_observer_api" long-name="Touch Pane Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_observer_api/group"/>
-</component>
-<component name="alternate_fs_api" long-name="Alternate FS API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alternate_fs_api/group"/>
-</component>
-<component name="discreet_popup_api" long-name="Discreet Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/discreet_popup_api/group"/>
-</component>
-<component name="touch_gesture_framework_api" long-name="Touch Gesture Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_gesture_framework_api/group"/>
-<!-- should this be commented out? -->
-<!--<unit bldFile="classicui_plat/touch_gesture_framework_api/tsrc/group" filter="test,api_test"/> -->
-</component>
-<component name="extended_options_menu_api" long-name="Extended Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="classicui_pub" long-name="Classic UI Public Interfaces" level="specific">
-<component name="input_frame_api" long-name="Input Frame API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/input_frame_api/group" filter="!test"/>
-</component>
-<component name="window_server_event_observer_api" long-name="Window Server Event Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/window_server_event_observer_api/group" filter="!test"/>
-</component>
-<component name="application_framework_api" long-name="Application Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/application_framework_api/group" filter="!test"/>
-</component>
-<component name="scroller_api" long-name="Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/scroller_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_utilities_api" long-name="UI Framework Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_utilities_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_definitions_api" long-name="UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_definitions_api/group" filter="!test"/>
-</component>
-<component name="buttons_api" long-name="Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/buttons_api/group" filter="!test"/>
-</component>
-<component name="queries_api" long-name="Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/queries_api/group" filter="!test"/>
-</component>
-<component name="aiw_generic_parameter_api" long-name="AIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="editors_api" long-name="Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/editors_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_api" long-name="Common File Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/common_file_dialogs_api/group" filter="!test"/>
-</component>
-<component name="dialog_shutter_api" long-name="Dialog Shutter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialog_shutter_api/group" filter="!test"/>
-</component>
-<component name="fonts_api" long-name="Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/fonts_api/group" filter="!test"/>
-</component>
-<component name="screen_clearer_api" long-name="Screen Clearer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_clearer_api/group" filter="!test"/>
-</component>
-<component name="notifiers_api" long-name="Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notifiers_api/group" filter="!test"/>
-</component>
-<component name="notes_api" long-name="Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notes_api/group" filter="!test"/>
-</component>
-<component name="status_pane_api" long-name="Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/status_pane_api/group" filter="!test"/>
-</component>
-<component name="base_controls_api" long-name="Base Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/base_controls_api/group" filter="!test"/>
-</component>
-<component name="grids_api" long-name="Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/grids_api/group" filter="!test"/>
-</component>
-<component name="context_pane_api" long-name="Context Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/context_pane_api/group" filter="!test"/>
-</component>
-<component name="lists_api" long-name="Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/lists_api/group" filter="!test"/>
-</component>
-<component name="popups_api" long-name="Popups API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/popups_api/group" filter="!test"/>
-</component>
-<component name="misc_controls_api" long-name="Misc Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/misc_controls_api/group" filter="!test"/>
-</component>
-<component name="keylock_api" long-name="Keylock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/keylock_api/group" filter="!test"/>
-</component>
-<component name="options_menu_api" long-name="Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/options_menu_api/group" filter="!test"/>
-</component>
-<component name="hierarchical_lists_api" long-name="Hierarchical Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hierarchical_lists_api/group" filter="!test"/>
-</component>
-<component name="navigation_pane_api" long-name="Navigation Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/navigation_pane_api/group" filter="!test"/>
-</component>
-<component name="tabs_api" long-name="Tabs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/tabs_api/group" filter="!test"/>
-</component>
-<component name="title_pane_touch_observer_api" long-name="Title Pane Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_touch_observer_api/group"/>
-</component>
-<component name="choice_list_api" long-name="Choice List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/choice_list_api/group" filter="!test"/>
-</component>
-<component name="info_popup_note_api" long-name="Info Popup Note API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/info_popup_note_api/group" filter="!test"/>
-</component>
-<component name="setting_pages_api" long-name="Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/setting_pages_api/group" filter="!test"/>
-</component>
-<component name="screen_mode_api" long-name="Screen Mode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_mode_api/group" filter="!test"/>
-</component>
-<component name="indicators_api" long-name="Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/indicators_api/group" filter="!test"/>
-</component>
-<component name="error_ui_api" long-name="Error UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/error_ui_api/group" filter="!test"/>
-</component>
-<component name="animation_api" long-name="Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/animation_api/group" filter="!test"/>
-</component>
-<component name="searchfield_api" long-name="Searchfield API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/searchfield_api/group" filter="!test"/>
-</component>
-<component name="labels_api" long-name="Labels API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/labels_api/group" filter="!test"/>
-</component>
-<component name="hotkeys_api" long-name="Hotkeys API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hotkeys_api/group" filter="!test"/>
-</component>
-<component name="initialization_api" long-name="Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/initialization_api/group" filter="!test"/>
-</component>
-<component name="volume_control_api" long-name="Volume Control API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/volume_control_api/group" filter="!test"/>
-</component>
-<component name="title_pane_api" long-name="Title Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_api/group" filter="!test"/>
-</component>
-<component name="sounds_api" long-name="Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/sounds_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_handler_api" long-name="AIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_service_handler_api/group" filter="!test"/>
-</component>
-<component name="aiw_criteria_api" long-name="AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="touch_ui_utilities_api" long-name="Touch UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/touch_ui_utilities_api/group" filter="!test"/>
-</component>
-<component name="generic_button_api" long-name="Generic Button API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/generic_button_api/group" filter="!test"/>
-</component>
-<component name="form_api" long-name="Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/form_api/group" filter="!test"/>
-</component>
-<component name="uikon_core_controls" long-name="Uikon Core Controls" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/uikon_core_controls/group" filter="!test"/>
-</component>
-<component name="calendar_api" long-name="Calendar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/calendar_api/group"/>
-</component>
-<component name="toolbar_api" long-name="Toolbar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/toolbar_api/group" filter="!test"/>
-</component>
-<component name="server_application_api" long-name="Server Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/server_application_api/group"/>
-</component>
-<component name="slider_api" long-name="Slider API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/slider_api/group" filter="!test"/>
-</component>
-<component name="private_ui_framework_api" long-name="Private UI Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/private_ui_framework_api/group" filter="!test"/>
-</component>
-<component name="dialogs_api" long-name="Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialogs_api/group" filter="!test"/>
-</component>
-<component name="document_handler_api" long-name="Document handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/document_handler_api/group"/>
-</component>
-<component name="images_api" long-name="Images API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/images_api/group" filter="!test"/>
-</component>
-<component name="stylus_popup_menu_api" long-name="Stylus Pop-up Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/stylus_popup_menu_api/group" filter="!test"/>
-</component>
-<component name="information_preview_popup_api" long-name="Information Preview Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/information_preview_popup_api/group" filter="!test"/>
-</component>
-<component name="intermediate_state_api" long-name="Intermediate State API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/intermediate_state_api/group"/>
-</component>
-<component name="help_launcher_api" long-name="Help Launcher API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/help_launcher_api/group"/>
-</component>
-</collection>
-<collection name="ode" long-name="Open Dynamics Engine" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="ode_build" filter="s60" long-name="ODE">
-<unit bldFile="mw/classicui/ode/group"/>
-</component>
-</collection>
-<collection name="uifw" long-name="UI Framework" level="server">
-<component name="uiklaf" filter="s60" long-name="Uikon Look-and-Feel">
-<unit bldFile="mw/classicui/uifw/uiklaf/group"/>
-</component>
-<component name="eikctl" filter="s60" long-name="Eikon Controls">
-<unit bldFile="mw/classicui/uifw/eikctl/group"/>
-</component>
-<component name="avkon" filter="s60" long-name="Avkon">
-<!-- can only have one unit. Split into 3 components, or #include all from same bld.inf -->
-<unit bldFile="mw/classicui/uifw/avkon/aknphysics/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/aknconf/group"/>
-</component>
-<component name="eikstd" filter="s60" long-name="Eikon Standard">
-<unit bldFile="mw/classicui/uifw/eikstd/group"/>
-</component>
-<component name="aknglobalui" filter="s60" long-name="Avkon Global UI">
-<unit bldFile="mw/classicui/uifw/aknglobalui/group"/>
-</component>
-<component name="ganes" filter="s60" long-name="Ganes">
-<unit bldFile="mw/classicui/uifw/ganes/group"/>
-</component>
-</collection>
-<collection name="commonuis" long-name="Common UIs" level="specific">
-<component name="commonui" filter="s60" long-name="Common UI">
-<unit bldFile="mw/classicui/commonuis/commonui/group"/>
-</component>
-<component name="commondialogs" filter="s60" long-name="Common Dialogs">
-<unit bldFile="mw/classicui/commonuis/commondialogs/group"/>
-</component>
-</collection>
-<collection name="applicationinterworkingfw" long-name="Application Interworking Framework" level="generic">
-<component name="aifwservicehandler" filter="s60" long-name="Application Interworking Service Handler">
-<unit bldFile="mw/classicui/applicationinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-<collection name="psln" long-name="Personalization" level="specific">
-<!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
-<component name="psln_build" filter="s60" long-name="Personalization Build">
-<unit bldFile="mw/classicui/psln/group"/>
-</component>
-</collection>
-<collection name="commonadapter" long-name="Common Adapter" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="commonadapter_build" filter="s60" long-name="Common Adapter Build">
-<unit bldFile="mw/classicui/commonadapter/group"/>
-</component>
-</collection>
-<collection name="akntouchgesturefw" long-name="Avkon Touch Gesture Framework" level="generic">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="akntouchgesturefw_build" filter="s60" long-name="Avkon Touch Gesture Framework Build" introduced="^3">
-<unit bldFile="mw/classicui/akntouchgesturefw/group"/>
-</component>
-</collection>
-<collection name="uiutils" long-name="UI Utils" level="specific">
-<component name="localizer" filter="s60" long-name="Directory Localizer">
-<unit bldFile="mw/classicui/uiutils/localizer/group"/>
-</component>
-<component name="findutil" filter="s60" long-name="Find Utility">
-<unit bldFile="mw/classicui/uiutils/findutil/group"/>
-</component>
-<component name="gamerecognizer" filter="s60" long-name="Game Recognizer" plugin="Y">
-<unit bldFile="mw/classicui/uiutils/gamerecognizer/group"/>
-</component>
-<component name="aknjapanesereading" filter="s60" long-name="Avkon Japanese Reading">
-<unit bldFile="mw/classicui/uiutils/aknjapanesereading/group"/>
-</component>
-<component name="hlplch" long-name="Help Launcher" filter="s60,bldfirst">
-<unit bldFile="mw/classicui/uiutils/hlplch/group"/>
-</component>
-</collection>
-<collection name="commonuisupport" long-name="Common UI Support" level="support">
-<component name="uikon" long-name="Uikon" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uikon/group" mrp="mw/classicui/commonuisupport/uikon/group/app-framework_uikon.mrp"/>
-</component>
-<component name="errorresolverdata" long-name="Error Resolver Data" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/errorresolverdata/group" mrp="mw/classicui/commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
-</component>
-<component name="uilaf" long-name="UI Look and Feel" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uilaf/GROUP" mrp="mw/classicui/commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
-</component>
-<component name="grid" long-name="Grid" purpose="optional">
-<unit bldFile="mw/classicui/commonuisupport/grid/group" mrp="mw/classicui/commonuisupport/grid/group/app-framework_grid.mrp"/>
-</component>
-<component name="uifwsdocs" long-name="UI Frameworks Documentation" purpose="development" class="doc">
-<unit mrp="mw/classicui/commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
-</component>
-</collection>
-<collection name="lafagnosticuifoundation" long-name="Look-and-Feel Agnostic UI Foundation" level="base">
-<component name="cone" long-name="Control Environment" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/cone/group" mrp="mw/classicui/lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
-</component>
-<component name="graphicseffects" long-name="Graphics Effects" introduced="9.2" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/graphicseffects/group" mrp="mw/classicui/lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
-</component>
-<component name="uigraphicsutils" long-name="UI Graphics Utilities" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group" mrp="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
-</component>
-<component name="clockanim" long-name="Clock" purpose="optional" plugin="Y">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/clockanim/group" mrp="mw/classicui/lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
-</component>
-<component name="bmpanimation" long-name="BMP Animation" introduced="6.0" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/bmpanimation/group" mrp="mw/classicui/lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
-</component>
-<component name="animation" long-name="Animation" introduced="9.1" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/animation/group" mrp="mw/classicui/lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
-</component>
-</collection>
-<collection name="classicui_info" long-name="Classic UI Info" level="specific">
-<!-- the multiple units in the API test components need to be resolved -->
-<component name="classicui_metadata" long-name="Classic UI Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/classicui/classicui_info/classicui_metadata/classicui_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="svgt" level="generic" long-name="SVG Tiny" levels="util ui">
-<collection name="svgt_plat" long-name="SVG Tiny Platform Interfaces" level="ui">
-<component name="svgt_api" long-name="SVGT API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/svgt_api/group"/>
-</component>
-<component name="nvg_api" long-name="NVG API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/nvg_api/group"/>
-</component>
-</collection>
-<collection name="svgtopt" long-name="SVG-T Engine" level="util">
-<component name="svgtopt_build" filter="s60" long-name="SVG Engine" introduced="9.2">
-<!-- component is at collection level. Needs to be moved down a directory -->
-<unit bldFile="mw/svgt/svgtopt/group"/>
-</component>
-<component name="svgtplugin" filter="s60" long-name="SVG Plugin" introduced="9.2" plugin="Y">
-<unit bldFile="mw/svgt/svgtopt/svgtplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="uiaccelerator" level="generic" long-name="UI Accelerator" levels="plugin framework server ex if">
-<collection name="uiaccelerator_plat" long-name="UI Accelerator Platform Interfaces" level="if">
-<component name="alf_core_toolkit_api" long-name="ALF Core Toolkit API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/group"/>
-</component>
-<component name="alf_visual_api" long-name="ALF Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/group"/>
-</component>
-<component name="alf_extended_visual_api" long-name="ALF Extended Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/group"/>
-</component>
-<component name="alf_extension_api" long-name="ALF Extension API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/group"/>
-</component>
-<component name="alf_tracing_api" long-name="ALF Tracing API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/group"/>
-</component>
-<component name="alf_client_server_api" long-name="ALF Client Server API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/group"/>
-</component>
-</collection>
-<collection name="uiacceltk" long-name="UI Accelerator Toolkit" level="framework">
-<component name="hitchcock" filter="s60" long-name="Hitchcock">
-<unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/group"/>
-</component>
-<component name="uiacceltk_build" filter="s60" long-name="UI Accelerator Toolkit Build">
-<!-- move into the other component, or remove the #include and make this UI Accelerator Toolkit ROM-->
-<unit bldFile="mw/uiaccelerator/uiacceltk/group"/>
-</component>
-</collection>
-<collection name="uiaccelerator_test" long-name="UI Accelerator Test" level="ex"/>
-</block>
-<block name="uiresources" level="generic" long-name="UI Resources" levels="compile plugin framework server generic data">
-<!-- are the custom filters below needed? -->
-<collection name="uiresources_pub" long-name="UI Resources Public Interfaces" level="data">
-<component name="pictograph_api" long-name="Pictograph API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/pictograph_api/group" filter="!test"/>
-</component>
-<component name="skins_api" long-name="Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/skins_api/group" filter="!test"/>
-</component>
-<component name="font_definition_api" long-name="Font Definition API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/font_definition_api/group" filter="!test"/>
-</component>
-<component name="graphics_api" long-name="Graphics API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/graphics_api/group" filter="!test"/>
-</component>
-<component name="scalable_icons_api" long-name="Scalable Icons API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/scalable_icons_api/group"/>
-</component>
-<component name="layout_id_definitions_api" long-name="Layout ID Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/layout_id_definitions_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_plat" long-name="UI Resources Platform Interfaces" level="data">
-<component name="layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_system_private_api/group" filter="!test"/>
-</component>
-<component name="layout_data_api" long-name="Layout Data API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_data_api/group" filter="!test"/>
-</component>
-<component name="cdl_api" long-name="CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/cdl_api/group" filter="!test"/>
-</component>
-<component name="extended_skins_api" long-name="Extended Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_skins_api/group" filter="!test"/>
-</component>
-<component name="tfx_server_controller_plugin_api" long-name="TFX Server Controller Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_controller_plugin_api/group"/>
-</component>
-<component name="extended_fonts_api" long-name="Extended Fonts API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_fonts_api/group" filter="!test"/>
-</component>
-<component name="graphic_configuration_api" long-name="Graphic Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/graphic_configuration_api/group" filter="!test"/>
-</component>
-<component name="mif_header_cdl_api" long-name="MIF Header CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mif_header_cdl_api/group"/>
-</component>
-<component name="personalisation_and_skins_settings_api" long-name="Personalisation and Skins Settings API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/personalisation_and_skins_settings_api/group"/>
-</component>
-<component name="tfx_effect_setup_plugin_api" long-name="TFX Effect Setup Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_effect_setup_plugin_api/group"/>
-</component>
-<component name="mifconv_definitions_api" long-name="Mifconv Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mifconv_definitions_api/group"/>
-</component>
-<component name="wallpaper_configuration_api" long-name="Wallpaper Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/wallpaper_configuration_api/group"/>
-</component>
-<component name="language_code_definitions_api" long-name="Language Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/language_code_definitions_api/group"/>
-</component>
-<component name="skins_image_attributes_api" long-name="Skins Image Attributes API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
-</component>
-<component name="private_user_area_code_definitions_api" long-name="Private User Area Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/private_user_area_code_definitions_api/group"/>
-</component>
-<component name="tfx_server_plugin_ids_api" long-name="TFX Server Plug-in IDs API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_plugin_ids_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_info" long-name="UI Resources Info" level="data">
-<component name="uiresources_test" filter="s60,test,api_test" long-name="UI Resources Tests" purpose="development"/>
-</collection>
-<collection name="uigraphics" long-name="UI Graphics" level="generic">
-<component name="bitmaps2" filter="s60" long-name="Bitmaps 2" class="config">
-<unit bldFile="mw/uiresources/uigraphics/bitmaps2/group"/>
-</component>
-<component name="icons" filter="s60" long-name="Icons" class="config">
-<unit bldFile="mw/uiresources/uigraphics/icons/group"/>
-</component>
-<component name="variatedbitmaps" filter="s60" long-name="Variated Bitmaps" class="config">
-<unit bldFile="mw/uiresources/uigraphics/variatedbitmaps/group"/>
-</component>
-<component name="aknicon" filter="s60" long-name="Avkon Icon Framework">
-<unit bldFile="mw/uiresources/uigraphics/aknicon/group"/>
-</component>
-<component name="nvgrenderstage" filter="sf_build" long-name="NVG Render Stage">
-<unit bldFile="mw/uiresources/uigraphics/nvgrenderstage/group"/>
-</component>
-</collection>
-<collection name="layouts" long-name="Layouts" level="plugin">
-<component name="cdl" filter="s60" long-name="Customization Definition Language">
-<!-- can only have one unit. Need to #include them or split into multiple components -->
-<unit bldFile="mw/uiresources/layouts/cdl/cdlengine/group"/>
-<unit bldFile="mw/uiresources/layouts/cdl/cdlserver/group"/>
-</component>
-<component name="aknlayout2" filter="s60" long-name="Avkon Layout 2">
-<unit bldFile="mw/uiresources/layouts/aknlayout2/group"/>
-</component>
-</collection>
-<collection name="skins" long-name="Skins" level="data">
-<component name="aknskincontent" filter="s60" long-name="Avkon Skin Content" class="config">
-<unit bldFile="mw/uiresources/skins/aknskincontent/group"/>
-</component>
-<component name="aknskins" filter="s60" long-name="Avkon Skin Compiler">
-<unit bldFile="mw/uiresources/skins/aknskins/group"/>
-</component>
-</collection>
-<collection name="pictographs" long-name="Pictographs" level="data">
-<component name="aknpictograph" filter="s60" long-name="Avkon Pictograph">
-<unit bldFile="mw/uiresources/pictographs/aknpictograph/group"/>
-</component>
-</collection>
-<collection name="locales" long-name="Locales" level="framework">
-<component name="locales_build" filter="s60" long-name="Locales Build">
-<unit bldFile="mw/uiresources/locales/loce32"/>
-</component>
-</collection>
-<collection name="uiconfig" long-name="UI Config" level="server">
-<component name="s60config" filter="s60" long-name="S60 UI Config">
-<unit bldFile="mw/uiresources/uiconfig/s60config/group"/>
-</component>
-</collection>
-<collection name="fontsupport" long-name="Font Support" level="generic">
-<component name="fontprovider" filter="s60" long-name="Font Provider">
-<unit bldFile="mw/uiresources/fontsupport/fontprovider/group"/>
-</component>
-<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
- <component id="s60_fonts" filter="s60" name="S60 Fonts">
- <unit bldFile="fontsupport/fontutils/group"/>
- </component>
--->
-<component name="fontutils" filter="sf_build" long-name="Font Utils">
-<unit bldFile="mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
-</component>
-</collection>
-<collection name="helpthemes" long-name="Help Themes" level="data">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helpthemes_build" filter="s60" long-name="Help Themes Build" class="config">
-<unit bldFile="mw/uiresources/helpthemes/group"/>
-</component>
-</collection>
-</block>
-<block name="hapticsservices" level="generic" long-name="Haptics Services" levels="fw server api">
-<collection name="hapticsservices_plat" long-name="Haptics Services Platform Interfaces" level="api">
-<component name="tacticon_api" long-name="Tacticon API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tacticon_api/group"/>
-</component>
-<component name="tactile_feedback_core_api" long-name="Tactile Feedback Core API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_core_api/group"/>
-</component>
-<component name="tactile_feedback_server_api" long-name="Tactile Feedback Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_server_api/group"/>
-</component>
-</collection>
-<collection name="hapticsservices_pub" long-name="Haptics Services Public Interfaces" level="api">
-<component name="tactile_feedback_client_api" long-name="Tactile Feedback Client API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_pub/tactile_feedback_client_api/group"/>
-</component>
-</collection>
-<collection name="tacticonserver" long-name="Tacticon Server" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="tacticonserver_build" filter="s60" long-name="Tacticon Server Build" introduced="^3">
-<unit bldFile="mw/hapticsservices/tacticonserver/group"/>
-<!-- clients and servers are suauly the same component. Consider moving pluign to a separate component if needed -->
-</component>
-</collection>
-<collection name="tactilefeedback" long-name="Tactile Feedback" level="fw">
-<component name="tactilearearegistry" filter="s60" long-name="Tactile Area Registry" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilearearegistry/group"/>
-</component>
-<component name="tactilefeedbackresolver" filter="s60" long-name="Tactile Feedback Resolver" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackresolver/group"/>
-</component>
-<component name="tactileclickplugin" filter="s60" long-name="Tactile Click Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileclickplugin/group"/>
-</component>
-<component name="tactilefeedbackclient" filter="s60" long-name="Tactile Feedback Client" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackclient/group"/>
-</component>
-<component name="tactileactionplugin" filter="s60" long-name="Tactile Action Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileactionplugin/group"/>
-</component>
-<component name="tactilefeedback_build" filter="s60" long-name="Tactile Feedback Build" introduced="^1">
-<!-- consider moving IBY to one fo the above components -->
-<unit bldFile="mw/hapticsservices/tactilefeedback/group"/>
-</component>
-</collection>
-</block>
-<block name="platformthemes" level="specific" long-name="Platform Themes" levels="framework generic ui">
-<collection name="platformthemes_info" long-name="Platform Themes Info">
-<component name="platformthemes_build" long-name="Platform Themes Build">
-<!-- no real structure in this package. Should break into collections / components -->
-<unit bldFile="mw/platformthemes" proFile="platformthemes.pro"/>
-</component>
-</collection>
-</block>
-<block name="gsprofilesrv" level="generic" long-name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
-<collection name="gsprofilesrv_pub" long-name="GS and Profiles Services Public Interfaces" level="specific">
-<component name="profiles_engine_active_profile_settings_api" long-name="Profiles Engine Active Profile Settings API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_active_profile_settings_api/group"/>
-</component>
-<component name="profiles_engine_wrapper_api" long-name="Profiles Engine Wrapper API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_wrapper_api/group"/>
-</component>
-</collection>
-<collection name="gsprofilesrv_plat" long-name="GS and Profiles Services Platform Interfaces" level="specific">
-<component name="ftuwizardmodel_api" long-name="FTU Wizard Model API" filter="bldfirst,s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/ftuwizardmodel_api" proFile="ftuwizardmodel_api.pro" qmakeArgs="-r -config rom"/>
-</component>
-<component name="profiles_engine_api" long-name="Profiles Engine API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_engine_api/group"/>
-</component>
-<component name="settings_backgroundimage_api" long-name="Settings Background Image API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_backgroundimage_api/group"/>
-</component>
-<component name="settings_framework_api" long-name="Settings Framework API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_framework_api/group"/>
-</component>
-<component name="settings_launch_api" long-name="Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_launch_api/group"/>
-</component>
-<component name="settings_listbox_api" long-name="Settings List Box API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_listbox_api/group"/>
-</component>
-<component name="settings_plugin_api" long-name="Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_plugin_api/group"/>
-</component>
-<component name="settings_uis_cenrep_collection_api" long-name="Settings UIs CenRep Collection API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
-</component>
-</collection>
-<collection name="gssettingsuis" long-name="General Settings UIs" level="framework">
-<component name="gs" filter="s60" long-name="General Settings" introduced="9.2">
-<unit bldFile="mw/gsprofilesrv/gssettingsuis/gs/group"/>
-</component>
-</collection>
-<collection name="ftuwizardmodel" long-name="FTU Wizard Model" level="generic">
-<component name="ftuwizardmodel_build" long-name="FTU Wizardmodel Build" filter="bldfirst">
-<unit bldFile="mw/gsprofilesrv/ftuwizardmodel" proFile="ftuwizardmodel.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-<collection name="controlpanel" long-name="Control Panel" level="generic">
-<component name="controlpanel_build" long-name="Control Panel Build">
-<unit bldFile="mw/gsprofilesrv/controlpanel" proFile="controlpanel.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-<collection name="profilesservices" long-name="Profiles Services" level="server">
-<component name="profileengine" filter="s60" long-name="Profile Engine" introduced="9.1">
-<unit bldFile="mw/gsprofilesrv/profilesservices/profileengine/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreensrv" level="specific" long-name="Home Screen Services" levels="plugin framework server generic specific">
-<collection name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" level="specific">
-<component name="action_handler_plugin_api" long-name="Action Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/group" filter="!test"/>
-</component>
-<component name="content_harvester_plugin_api" long-name="Content Harvester Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/group" filter="!test"/>
-</component>
-<component name="menu_sat_interface_api" long-name="Menu SAT Interface API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/group" filter="!test"/>
-</component>
-<component name="sapi_contentpublishing" long-name="SAPI Content Publishing" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing/group"/>
-</component>
-<component name="sapi_actionhandler" long-name="SAPI Action Handler" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_actionhandler/group"/>
-</component>
-</collection>
-<collection name="contentpublishingsrv" long-name="Content Publishing Service" level="server">
-<component name="contentpublishingdebug" filter="s60" long-name="Content Publishing Debug">
-<!-- need to move this component outside of contentpublishingutils and into separate component directory -->
-<!-- <unit bldFile="contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/> -->
-</component>
-<component name="contentpublishingutils" filter="s60" long-name="Content Publishing Utils">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingutils/group"/>
-</component>
-<component name="contentpublishingserver" filter="s60" long-name="Content Publishing Server">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingserver/group"/>
-</component>
-<component name="contentharvester" filter="s60" long-name="Content Harvester">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
-</component>
-<component name="contentpublishingsrv_build" filter="s60" long-name="Content Publishing Service Build">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreensrvlegacy" level="generic" long-name="Legacy Home Screen Services" levels="plugin framework server generic specific">
-<collection name="homescreensrvlegacy_plat" long-name="Legacy Home Screen Services Platform Interfaces" level="specific">
-<component name="ai_content_model_api" long-name="AI Content Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrvlegacy/ai_content_model_api/group" proFile="group.pro"/>
-</component>
-<component name="ai_plugin_information_api" long-name="AI Plug-in Information API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrvlegacy/ai_plugin_information_api/group" proFile="group.pro"/>
-</component>
-</collection>
-</block>
-<block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
-<collection name="appinstall_plat" long-name="Application Installation Platform Interfaces" level="api">
-<component name="iaupdate_api" long-name="IA Update API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/iaupdate_api/group"/>
-</component>
-<component name="task_plugin_api" long-name="Task Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_plugin_api/group"/>
-</component>
-<component name="sw_installer_common_ui_api" long-name="SW Installer Common UI API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_common_ui_api/group"/>
-</component>
-<component name="sw_installer_launcher_api" long-name="SW Installer Launcher API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_launcher_api/group"/>
-</component>
-<component name="task_management_api" long-name="Task Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_management_api/group"/>
-</component>
-<component name="sw_installer_ui_plugin_api" long-name="SW Installer UI Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ui_plugin_api/group"/>
-</component>
-<component name="sw_installer_cr_keys" long-name="SW Installer CR Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_cr_keys/group"/>
-</component>
-<component name="sw_installer_ps_keys" long-name="SW Installer PS Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
-</component>
-<component name="appmngr2runtimeapi" long-name="Application Manager 2 Runtime Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
-</component>
-<component name="sifui_api" long-name="STIF UI API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sifui_api/group"/>
-</component>
-</collection>
-<collection name="appinstall_pub" long-name="Application Installation Public Interfaces" level="api">
-<component name="startup_list_management_api" long-name="Startup List Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
-</component>
-</collection>
-<collection name="ncdengine" long-name="Nokia Content Discover" level="framework">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="ncdengine_engine" filter="s60" long-name="NCD Engine" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/engine/group"/>
-</component>
-<component name="debuglogger" filter="s60" long-name="NCD Debug Logger" introduced="^1" class="placeholder">
-<!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
-</component>
-<component name="ncdengine_build" filter="s60" long-name="NCD Build" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/group"/>
-</component>
-</collection>
-<collection name="appinstaller" long-name="Application Installer" level="generic">
-<component name="appinstui" filter="s60" long-name="Application Installer UI" introduced="^2">
-<unit bldFile="mw/appinstall/appinstaller/appinstui/group"/>
-</component>
-</collection>
-<collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="api">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="iaupdateapi_stub_build" long-name="IA Update API Stub Build" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdateapi_stub/group"/>
-</component>
-</collection>
-<collection name="iaupdate" long-name="Independent Apps Update" level="api">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="iad" long-name="Software Update" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/iad/group"/>
-</component>
-<component name="iaupdate_help" filter="s60" long-name="IA Update Help" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/help/group"/>
-</component>
-<component name="iaupdate_build" filter="s60" long-name="IA Update Build" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/group"/>
-</component>
-</collection>
-<collection name="installationservices" long-name="Installation Services" level="generic">
-<component name="swi" long-name="Secure Software Install" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swi/group" mrp="mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
-</component>
-<component name="swidevicetools" long-name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
-<unit bldFile="mw/appinstall/installationservices/swidevicetools/group" mrp="mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
-</component>
-<component name="swcomponentregistry" long-name="Software Component Registry" introduced="^4" purpose="mandatory">
-<unit bldFile="mw/appinstall/installationservices/swcomponentregistry/group" mrp="mw/appinstall/installationservices/swcomponentregistry/group/security_softwarecomponentregistry.mrp"/>
-</component>
-<component name="swinstallationfw" long-name="Software Installation Framework" introduced="^4" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swinstallationfw/group" mrp="mw/appinstall/installationservices/swinstallationfw/group/security_softwareinstallframework.mrp"/>
-</component>
-<component name="swtransactionservices" long-name="Software Transaction Services" introduced="^4" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swtransactionservices/group" mrp="mw/appinstall/installationservices/swtransactionservices/group/security_softwaretransactionservices.mrp"/>
-</component>
-<component name="refswinstallationplugin" long-name="Reference Software Installation Plugin" introduced="^4" purpose="development" plugin="Y">
-<unit bldFile="mw/appinstall/installationservices/refswinstallationplugin/group" mrp="mw/appinstall/installationservices/refswinstallationplugin/group/security_sifrefplugin.mrp"/>
-</component>
-<component name="refsoftwareappmgr" long-name="Reference Software Application Manager" introduced="^4" purpose="development">
-<unit bldFile="mw/appinstall/installationservices/refsoftwareappmgr/group" mrp="mw/appinstall/installationservices/refsoftwareappmgr/group/security_referenceapplicationmanager.mrp"/>
-</component>
-<component name="swiconfig" long-name="Software Install Config" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appinstall/installationservices/swiconfig/group" mrp="mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
-</component>
-</collection>
-<collection name="secureswitools" long-name="Secure Software Install Tools" level="tool">
-<component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/makekeys/group" mrp="mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
-</component>
-<component name="swianalysistoolkit" long-name="SWI Analysis Toolkit" purpose="development" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
-</component>
-<component name="openssllib" long-name="OpenSSL Library" purpose="optional" class="PC">
-<unit mrp="mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
-</component>
-<component name="swisistools" long-name="Secure Software Install SIS Tools" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swisistools/group" mrp="mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
-</component>
-</collection>
-<collection name="appinstall_info" long-name="Application Installation Info" level="api">
-<component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="serviceapifw" level="specific" long-name="Service API Framework" levels="plugin framework server generic specific">
-<collection name="serviceapifw_pub" long-name="Service API Framework Public Interfaces" level="specific"/>
-<collection name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" level="specific">
-<component name="rtsecuritymanager_common_api" long-name="Runtime Security Manager Common API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/group"/>
-</component>
-<component name="rtsecuritymanager_utility_api" long-name="Runtime Security Manager Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
-</component>
-<component name="rtsecuritymanager_client_api" long-name="Runtime Security Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/group"/>
-</component>
-<component name="liw_provider_utility_api" long-name="LIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_provider_utility_api/group"/>
-</component>
-<component name="liw_service_interface_base_api" long-name="LIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_base_api/group"/>
-</component>
-<component name="liw_service_interface_menu_api" long-name="LIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_menu_api/group"/>
-</component>
-<component name="liw_criteria_api" long-name="LIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_criteria_api/group"/>
-</component>
-<component name="liw_generic_parameter_api" long-name="LIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_generic_parameter_api/group"/>
-</component>
-<component name="liw_service_handler_api" long-name="LIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_handler_api/group"/>
-</component>
-</collection>
-<collection name="rtsecuritymanager" long-name="Runtime Security Manager" level="server">
-<component name="rtsecuritymanagerutil" filter="s60" long-name="Runtime Security Manager Util">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
-</component>
-<component name="rtsecuritymanagerserver" filter="s60" long-name="Runtime Security Manager Server">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/>
-</component>
-<component name="rtsecuritymanagerclient" filter="s60" long-name="Runtime Security Manager Client">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/>
-</component>
-<component name="rtsecuritymanager_build" filter="s60" long-name="Runtime Security Manager Build">
-<!-- Move the export to the appropriate components, or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/group"/>
-</component>
-</collection>
-<collection name="languageinterworkingfw" long-name="Language Interworking Framework" level="framework">
-<component name="lifwservicehandler" filter="s60" long-name="Service Handler">
-<unit bldFile="mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-</block>
-<block name="serviceapi" level="specific" long-name="Service API" levels="os mw1 mw2 app">
-<!-- should break up this collection into something meaningful -->
-<collection name="serviceproviders" long-name="Service Providers" level="mw1">
-<component name="sapi_contacts_vpbk" long-name="Contacts Phonebook SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
-</component>
-<component name="sapi_location" long-name="Location SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_location/group"/>
-</component>
-<component name="sapi_mediamanagement" long-name="Media Management SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/group"/>
-</component>
-<component name="sapi_landmarks" long-name="Landmarks SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
-</component>
-<component name="sapi_messaging" long-name="Messaging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/group"/>
-</component>
-<component name="sapi_applicationmanager" long-name="Application Manager SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
-</component>
-<component name="sapi_calendar" long-name="Calendar SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_calendar/group"/>
-</component>
-<component name="sapi_logging" long-name="Logging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_logging/group"/>
-</component>
-<component name="sapi_sensor" long-name="Sensor SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sensor/group"/>
-</component>
-<component name="sapi_sysinfo" long-name="Sysinfo SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sysinfo/group"/>
-</component>
-<component name="sapi_serviceregistry" long-name="Service Registry SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
-</component>
-<component name="jsapi" long-name="Javascript API" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/jsapi/group"/>
-</component>
-<component name="serviceproviders_build" filter="s60" long-name="Service API Build">
-<!-- distribute the exports or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapi/serviceproviders/group"/>
-</component>
-</collection>
-</block>
-<block name="web" level="specific" long-name="Web" levels="plugin utils server generic specific">
-<collection name="web_pub" long-name="Web Public Interfaces" level="specific">
-<component name="browser_control_api" long-name="Browser Control API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_control_api/group"/>
-</component>
-<component name="download_mgr_client_api" long-name="Download Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_client_api/group"/>
-</component>
-<component name="download_mgr_ui_api" long-name="Download Manager UI Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_ui_api/group"/>
-</component>
-<component name="favourites_engine_api" long-name="Favourites Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/favourites_engine_api/group"/>
-</component>
-<component name="browser_plugin_api" long-name="Browser Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_plugin_api/group"/>
-</component>
-<component name="settings_api" long-name="Settings API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/settings_api/group"/>
-</component>
-</collection>
-<collection name="web_plat" long-name="Web Platform Interfaces" level="specific">
-<component name="aiw_browser_provider_api" long-name="AIW Browser Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/aiw_browser_provider_api/group"/>
-</component>
-<component name="browser_dialogs_provider_api" long-name="Browser Dialogs Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_dialogs_provider_api/group"/>
-</component>
-<component name="browser_platform_api" long-name="Browser Platform API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_platform_api/group"/>
-</component>
-<component name="cod_handler_api" long-name="COD Handler API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cod_handler_api/group"/>
-</component>
-<component name="connection_manager_api" long-name="Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/connection_manager_api/group"/>
-</component>
-<component name="cxml_library_api" long-name="cXml Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cxml_library_api/group"/>
-</component>
-<component name="download_mgr_client_api_extn" long-name="Download Manager Client API Extension" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/download_mgr_client_api_extn/group"/>
-</component>
-<component name="download_path_plugin_api" long-name="Download Path Plugin API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/web/web_plat/download_path_plugin_api/group"/>
-</component>
-<component name="feeds_engine_api" long-name="Feeds Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/feeds_engine_api/group"/>
-</component>
-<component name="launcher_api" long-name="Launcher API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/launcher_api/group"/>
-</component>
-<component name="multipart_parser_api" long-name="Multipart Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/multipart_parser_api/group"/>
-</component>
-<component name="recent_url_store_api" long-name="Recent URL Store API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/recent_url_store_api/group"/>
-</component>
-<component name="scheme_handler_plugin_api" long-name="Scheme Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scheme_handler_plugin_api/group"/>
-</component>
-<component name="scriptable_plugin_api" long-name="Scriptable Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scriptable_plugin_api/group"/>
-</component>
-<component name="webutils_api" long-name="Web Utils API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/webutils_api/group"/>
-</component>
-<component name="widget_registry_api" long-name="Widget Registry API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/widget_registry_api/group"/>
-</component>
-<component name="xml_parser_api" long-name="XML Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/xml_parser_api/group"/>
-</component>
-</collection>
-<collection name="web_info" long-name="Web Info" level="specific">
-<component name="web_build" filter="s60" long-name="Web Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/group"/>
-</component>
-</collection>
-<collection name="browserutilities" long-name="Browser Utilities" level="utils">
-<component name="browserdialogsprovider" filter="s60" long-name="Browser Dialogs Provider">
-<unit bldFile="mw/web/browserutilities/browserdialogsprovider/group"/>
-</component>
-<component name="recenturlstore" filter="s60" long-name="Recent URL Store">
-<unit bldFile="mw/web/browserutilities/recenturlstore/group"/>
-</component>
-<component name="xmlparser" filter="s60" long-name="XML Interface">
-<unit bldFile="mw/web/browserutilities/xmlparser/group"/>
-</component>
-<component name="cxmllibrary" filter="s60" long-name="XML Parser Implementation">
-<unit bldFile="mw/web/browserutilities/cxmllibrary/group"/>
-</component>
-<component name="downloadmgr" filter="s60" long-name="Download Manager">
-<unit bldFile="mw/web/browserutilities/downloadmgr/group"/>
-</component>
-<component name="connectionmanager" filter="s60" long-name="Connection Manager">
-<unit bldFile="mw/web/browserutilities/connectionmanager/group"/>
-</component>
-<component name="browsertelservice" filter="s60" long-name="Browser Telephony Service">
-<unit bldFile="mw/web/browserutilities/browsertelservice/group"/>
-</component>
-<component name="favouritesengine" filter="s60" long-name="Favourites Engine">
-<unit bldFile="mw/web/browserutilities/favouritesengine/group"/>
-</component>
-<component name="feedsengine" filter="s60" long-name="Feeds Engine">
-<unit bldFile="mw/web/browserutilities/feedsengine/group"/>
-</component>
-<component name="multipartparser" filter="s60" long-name="Multipart Parser">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
-<!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
-</component>
-<component name="schemehandler" filter="s60" long-name="Scheme Handler">
-<unit bldFile="mw/web/browserutilities/schemehandler/group"/>
-</component>
-<component name="webutils" filter="s60" long-name="Web Utils">
-<unit bldFile="mw/web/browserutilities/webutils/group"/>
-</component>
-<component name="aiwbrowserprovider" filter="s60" long-name="AIW Browser Provider" plugin="Y">
-<unit bldFile="mw/web/browserutilities/aiwbrowserprovider/group"/>
-</component>
-<component name="browserutilities_build" filter="s60" long-name="Browser Utilities Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/browserutilities/group"/>
-</component>
-</collection>
-<collection name="webengine" long-name="Web Engine" level="server">
-<component name="osswebengine" filter="s60" long-name="OSS Web Engine">
-<!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
-<unit bldFile="mw/web/webengine/osswebengine/cache/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/memorymanager/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/npscript/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group/javascriptcore"/>
-</component>
-<component name="webkitutils" filter="s60" long-name="WebKit Utils">
-<unit bldFile="mw/web/webengine/webkitutils/group"/>
-</component>
-<component name="pagescaler" filter="s60" long-name="Page Scaler">
-<unit bldFile="mw/web/webengine/pagescaler/group"/>
-</component>
-<component name="webwidgetinstaller" filter="s60" long-name="Widget Installer">
-<unit bldFile="mw/web/webengine/widgetinstaller/group"/>
-</component>
-<component name="widgetregistry" filter="s60" long-name="Widget Registry">
-<unit bldFile="mw/web/webengine/widgetregistry/group"/>
-</component>
-<component name="wmlengine" filter="s60" long-name="WML Engine">
-<unit bldFile="mw/web/webengine/wmlengine/group"/>
-</component>
-<component name="device" filter="s60" long-name="Device">
-<!-- this needs a more meaningful name -->
-<unit bldFile="mw/web/webengine/device/group"/>
-</component>
-<component name="widgetengine" filter="s60" long-name="Widget Engine">
-<unit bldFile="mw/web/webengine/widgetengine/group"/>
-</component>
-<component name="web_memoryplugin" long-name="Memory Plugin" filter="s60" plugin="Y">
-<unit bldFile="mw/web/webengine/memoryplugin/group"/>
-</component>
-<component name="widgetmemoryplugin" filter="s60" long-name="Widget Memory Plugin" plugin="Y">
-<unit bldFile="mw/web/webengine/widgetmemoryplugin/group"/>
-</component>
-<component name="widgetbackuprestore" filter="s60" long-name="Widget Backup and Restore">
-<unit bldFile="mw/web/webengine/widgetbackuprestore/group"/>
-</component>
-<component name="browserrecognizers" filter="s60" long-name="Browser Recognizers" plugin="Y">
-<unit bldFile="mw/web/webengine/browserrecognizers/group"/>
-</component>
-<component name="wrtharvester" filter="s60" long-name="Web Runtime Harvester" plugin="Y">
-<unit bldFile="mw/web/webengine/wrtharvester/group"/>
-</component>
-</collection>
-<collection name="codhandler" long-name="Content Object Descriptor Handler" level="specific">
-<component name="codeng" filter="s60" long-name="COD Engine">
-<unit bldFile="mw/web/codhandler/codeng/group"/>
-</component>
-<component name="codui" filter="s60" long-name="COD UI">
-<unit bldFile="mw/web/codhandler/codui/group"/>
-</component>
-<component name="codrecog" filter="s60" long-name="COD Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/codrecog/group"/>
-</component>
-<component name="codviewer" filter="s60" long-name="COD Viewer">
-<unit bldFile="mw/web/codhandler/codviewer/group"/>
-</component>
-<component name="ddrecog" filter="s60" long-name="Download Descriptor Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/ddrecog/group"/>
-</component>
-<component name="ddviewer" filter="s60" long-name="Download Descriptor Viewer">
-<unit bldFile="mw/web/codhandler/ddviewer/group"/>
-</component>
-<component name="coddownload" filter="s60" long-name="COD Download">
-<unit bldFile="mw/web/codhandler/coddownload/group"/>
-</component>
-<component name="roapapp" filter="s60" long-name="ROAP Application">
-<unit bldFile="mw/web/codhandler/roapapp/group"/>
-</component>
-<component name="codhandler_build" filter="s60" long-name="COD Handler Build">
-<!-- Exports need to go into another component or make this self-contained.
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/codhandler/group"/>
-</component>
-</collection>
-<collection name="widgets" long-name="Web Widget Framework" level="generic">
-<!-- the following units can be uncommented when configuration is put in place -->
-<component name="widgetrecognizer" filter="s60" long-name="Widget Recognizer" plugin="Y">
-<!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
-</component>
-<component name="widgetinstaller" filter="s60" long-name="Widget Installer UI" plugin="Y">
-<!--<unit bldFile="widgets/widgetinstaller/group"/>-->
-</component>
-<component name="widgetlauncher" filter="s60" long-name="Widget Launcher">
-<!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
-</component>
-<component name="widgetapp" filter="s60" long-name="Widget UI">
-<!--<unit bldFile="widgets/widgetapp/group"/>-->
-</component>
-<component name="widgetsidchecker" filter="s60" long-name="Widget SID Checker" introduced="^3">
-<!--<unit bldFile="widgets/widgetsidchecker/group"/>-->
-</component>
-<component name="widgetpreinstaller" filter="s60" long-name="Widget Pre-Installer">
-<!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
-</component>
-<component name="widgetstartup" filter="s60" long-name="Widget Startup">
-<!--<unit bldFile="widgets/widgetstartup/group"/>-->
-</component>
-<component name="widgets_build" filter="s60" long-name="Widgets Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/widgets/group"/>
-</component>
-</collection>
-</block>
-<block name="websrv" level="generic" long-name="Web Services" levels="plugin framework server generic specific">
-<collection name="websrv_pub" long-name="Web Services Public Interfaces" level="specific">
-<component name="web_service_description_api" long-name="Web Service Description API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_description_api/group"/>
-</component>
-<component name="web_service_connection_api" long-name="Web Service Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/group"/>
-</component>
-<component name="web_service_manager_api" long-name="Web Service Manager API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/group"/>
-</component>
-<component name="hostlet_connection_api" long-name="Hostlet Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/group"/>
-</component>
-<component name="web_service_messaging_api" long-name="Web Service Messaging API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/group"/>
-</component>
-<component name="xml_extensions_api" long-name="XML Extensions API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/group"/>
-</component>
-<component name="xml_fragment_api" long-name="XML Fragment API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/group"/>
-</component>
-</collection>
-<collection name="webservices" long-name="Web Services Framework" level="generic">
-<!-- consider breaking this collection into more meaningful subsets -->
-<component name="wsnotifierplugins" filter="s60" long-name="WS Notifier Plugins" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsnotifierplugins/group"/>
-</component>
-<component name="wslogger" filter="s60" long-name="WS Logger">
-<unit bldFile="mw/websrv/webservices/wslogger/group"/>
-</component>
-<component name="wsxml" filter="s60" long-name="WS XML Extensions">
-<unit bldFile="mw/websrv/webservices/wsxml/group"/>
-</component>
-<component name="wsutils" filter="s60" long-name="WS Utils">
-<unit bldFile="mw/websrv/webservices/wsutils/group"/>
-</component>
-<component name="wsfragment" filter="s60" long-name="WS Fragment">
-<unit bldFile="mw/websrv/webservices/wsfragment/group"/>
-</component>
-<component name="wsdescription" filter="s60" long-name="WS Service Description">
-<unit bldFile="mw/websrv/webservices/wsdescription/group"/>
-</component>
-<component name="wsconnection" filter="s60" long-name="WS Service Connection">
-<unit bldFile="mw/websrv/webservices/wsconnection/group"/>
-</component>
-<component name="wsmessages" filter="s60" long-name="WS Messages">
-<unit bldFile="mw/websrv/webservices/wsmessages/group"/>
-</component>
-<component name="wscredentialmanager" filter="s60" long-name="WS Credential Manager">
-<unit bldFile="mw/websrv/webservices/wscredentialmanager/group"/>
-</component>
-<component name="wsframework" filter="s60" long-name="WS Framework">
-<unit bldFile="mw/websrv/webservices/wsframework/group"/>
-</component>
-<component name="wshttpchanneltransportplugin" filter="s60" long-name="WS HTTP Channel Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshttpchanneltransportplugin/group"/>
-</component>
-<component name="wsconnectionagent" filter="s60" long-name="WS Connection Agent">
-<unit bldFile="mw/websrv/webservices/wsconnectionagent/group"/>
-</component>
-<component name="wsprovider" filter="s60" long-name="WS Provider">
-<unit bldFile="mw/websrv/webservices/wsprovider/group"/>
-</component>
-<component name="wshostletconnection" filter="s60" long-name="WS Hostlet Connection">
-<unit bldFile="mw/websrv/webservices/wshostletconnection/group"/>
-</component>
-<component name="wsmanager" filter="s60" long-name="WS Service Manager">
-<unit bldFile="mw/websrv/webservices/wsmanager/group"/>
-</component>
-<component name="wsidentitymanager" filter="s60" long-name="WS Identity Manager">
-<unit bldFile="mw/websrv/webservices/wsidentitymanager/group"/>
-</component>
-<component name="idwsfplugin" filter="s60" long-name="ID-WSF Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/idwsfplugin/group"/>
-</component>
-<component name="wsibasicplugin" filter="s60" long-name="WS-I Basic Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsibasicplugin/group"/>
-</component>
-<component name="wsrestplugin" filter="s60" long-name="WS REST Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsrestplugin/group"/>
-</component>
-<component name="idwsfsecuritymechanism" filter="s60" long-name="ID-WSF Security Mechanism">
-<unit bldFile="mw/websrv/webservices/idwsfsecuritymechanism/group"/>
-</component>
-<component name="wspasswordtransforms" filter="s60" long-name="WS Password Transforms">
-<unit bldFile="mw/websrv/webservices/wspasswordtransforms/group"/>
-</component>
-<component name="wscore" filter="s60" long-name="WS Core Service Manager">
-<unit bldFile="mw/websrv/webservices/wscore/group"/>
-</component>
-<component name="wslocaltransportplugin" filter="s60" long-name="WS Local Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wslocaltransportplugin/group"/>
-</component>
-<component name="wshostlettransportplugin" filter="s60" long-name="WS Hostlet Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshostlettransportplugin/group"/>
-</component>
-<component name="wsstar" filter="s60" long-name="WS Star">
-<!-- can only have one unit. Need to split into separate components or #include from a single bld.inf -->
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarpolicy/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarplugin/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarmessagehandlers/group"/>
-</component>
-<component name="wsoviplugin" filter="s60" long-name="WS Ovi Plugin">
-<unit bldFile="mw/websrv/webservices/wsoviplugin/group"/>
-</component>
-<component name="webservices_build" filter="s60" long-name="Web Services Build">
-<!-- need to split into self-contained components -->
-<unit bldFile="mw/websrv/webservices/group"/>
-</component>
-</collection>
-<collection name="websrv_info" long-name="Web Services Info" level="specific">
-<component name="websrv_bld" filter="s60" long-name="Web Services Build">
-<!-- need to include common .hrh in each unit -->
-<unit bldFile="mw/websrv/group"/>
-</component>
-</collection>
-</block>
-<block name="webruntime" level="specific" long-name="Web Runtime">
-<!-- need to break up this package nito collections and components -->
-<collection name="webruntime_info" long-name="Web Runtime Info">
-<component name="webruntime_build" long-name="Web Runtime Build" introduced="^4">
-<unit bldFile="mw/webruntime" proFile="cwrt.pro" qmakeArgs=""what+=ninetwo" "what+=tenone" "what+=qt_unstable" "what+=wrtlite" "what+=exportiby""/>
-</component>
-</collection>
-</block>
-<block name="platformtools" level="generic" long-name="Platform Tools">
-<collection name="gfxconversion" long-name="Graphics Conversion">
-<component name="bmconv_s60" filter="s60" long-name="S60 Bitmap Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/bmconv_s60/group"/>
-</component>
-<component name="mifconv" filter="s60" long-name="Multi Icon File Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/mifconv/group"/>
-</component>
-</collection>
-</block>
-<block name="uitools" level="specific" long-name="UI Tools" levels="compile encode tool if">
-<collection name="uitools_pub" long-name="UI Tools Public Interfaces" level="if">
-<component name="third_party_bitmap_palette_api" long-name="Third Party Bitmap Palette API" filter="s60" class="api">
-<unit bldFile="mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
-</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">
-<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">
-<unit bldFile="mw/uitools/uitools_plat/layout_system_private_api/group"/>
-</component>
-</collection>
-<collection name="cdlcompilertoolkit" long-name="CDL Compiler Toolkit" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompilertoolkit_build" filter="s60" long-name="CDL Compiler Toolkit Build">
-<unit bldFile="mw/uitools/cdlcompilertoolkit/group"/>
-</component>
-</collection>
-<collection name="cdlcompiler" long-name="CDL Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompiler_build" filter="s60" long-name="CDL Compiler Build">
-<unit bldFile="mw/uitools/cdlcompiler/group"/>
-</component>
-</collection>
-<collection name="gfxtools" long-name="Graphics Tools" level="tool">
-<component name="gditools" filter="s60" long-name="GDI Tools" class="PC">
-<unit bldFile="mw/uitools/gfxtools/gditools/group"/>
-</component>
-<component name="color" filter="s60" long-name="Bitmap Colour Palette" class="PC">
-<unit bldFile="mw/uitools/gfxtools/color/group"/>
-</component>
-</collection>
-<collection name="aknlayoutcompiler" long-name="Avkon Layout Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="aknlayoutcompiler_build" filter="s60" long-name="Avkon Layout Compiler Build">
-<unit bldFile="mw/uitools/aknlayoutcompiler/group"/>
-</component>
-</collection>
-<collection name="skincompiler" long-name="Skin Compiler" level="compile">
-<component name="aknskindesccompiler" filter="s60" long-name="Avkon Skin Descriptor Compiler">
-<unit bldFile="mw/uitools/skincompiler/AknSkinDescCompiler/group"/>
-</component>
-</collection>
-<collection name="reszip" long-name="Resource Zip" level="encode">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="reszip_build" filter="s60" long-name="Resource Zip Build">
-<unit bldFile="mw/uitools/reszip/group"/>
-</component>
-</collection>
-<collection name="toollibraries" long-name="Tool Libraries" level="tool"/>
-<collection name="svgtencoder" long-name="SVGT Encoder" level="encode">
-<component name="svgtenc" filter="s60" long-name="Standalone SVGT Encoder" class="PC">
-<unit bldFile="mw/uitools/svgtencoder/svgtenc/standalone/group"/>
-</component>
-</collection>
-</block>
-</layer>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="location" level="apps" long-name="Location Apps" levels="ui events loc api">
-<collection name="loc_plat" long-name="Location Apps Platform Interfaces" level="api">
-<component name="location_picker_service_api" long-name="Location Picker Service API" introduced="^4" filter="s60" class="api">
-<unit bldFile="app/location/loc_plat" proFile="location_plat.pro"/>
-</component>
-</collection>
-<collection name="locationpickerservice" long-name="Location Picker Service" level="loc">
-<!--collection is really a component. Should move down a directory -->
-<component name="locationpickerservice_build" filter="s60" long-name="Location Picker Service Build" introduced="^4">
-<unit bldFile="app/location/locationpickerservice" proFile="locationpickerservice.pro"/>
-</component>
-</collection>
-</block>
-<!-- pending removal -->
-<block name="phone" level="apps" span="2" long-name="Phone Apps" levels="engine plugin ui app">
-<collection name="phoneapp" long-name="Phone Application" level="app">
-<component name="blacklist" filter="s60" long-name="Phone Blacklist Clearing" plugin="Y">
-<unit bldFile="app/phone/phoneapp/blacklist/group"/>
-</component>
-<component name="phoneuicontrol" filter="s60" long-name="Phone UI Control">
-<unit bldFile="app/phone/phoneapp/phoneuicontrol/group"/>
-</component>
-<component name="phoneuistates" filter="s60" long-name="Phone UI States">
-<unit bldFile="app/phone/phoneapp/phoneuistates/group"/>
-</component>
-<component name="phoneuiutils" filter="s60" long-name="Phone UI Utils">
-<unit bldFile="app/phone/phoneapp/phoneuiutils/group"/>
-</component>
-<component name="silenceactionplugin" filter="s60" long-name="Silence Action Plugin" plugin="Y">
-<unit bldFile="app/phone/phoneapp/silenceactionplugin/group"/>
-</component>
-<component name="phonemediatorcenter" filter="s60" long-name="Phone Mediator Center">
-<unit bldFile="app/phone/phoneapp/phonemediatorcenter/group"/>
-</component>
-<component name="phoneuiview2" filter="s60" long-name="Phone UI View">
-<unit bldFile="app/phone/phoneapp/phoneuiview2" proFile="phoneuiview2.pro"/>
-</component>
-<component name="phoneuiqtviewadapter" filter="s60" long-name="Phone UI Qt View Adapter" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneapp/phoneuiqtviewadapter" proFile="phoneuiqtviewadapter.pro"/>
-</component>
-<component name="phonestringloader" filter="s60" long-name="Phone String Loader" introduced="^4">
-<unit bldFile="app/phone/phoneapp/phonestringloader" proFile="phonestringloader.pro"/>
-</component>
-<component name="phoneui2" filter="s60" long-name="Phone UI">
-<unit bldFile="app/phone/phoneapp/phoneui2" proFile="phoneui2.pro"/>
-</component>
-</collection>
-<collection name="phoneengine" long-name="Phone Engine" level="engine">
-<component name="phonecntfinder2" filter="s60" long-name="Phone Contact Finder">
-<unit bldFile="app/phone/phoneengine/phonecntfinder2" proFile="phonecntfinder2.pro"/>
-</component>
-<component name="audiohandling" filter="s60" long-name="Phone Audio Handling">
-<unit bldFile="app/phone/phoneengine/audiohandling/group"/>
-</component>
-<component name="callhandling" filter="s60" long-name="Call Handling">
-<unit bldFile="app/phone/phoneengine/callhandling/group"/>
-</component>
-<component name="contacthandling2" filter="s60" long-name="Phone Contact Handling">
-<unit bldFile="app/phone/phoneengine/contacthandling2/group"/>
-</component>
-<component name="loghandling" filter="s60" long-name="Phone Log Handling">
-<unit bldFile="app/phone/phoneengine/loghandling/group"/>
-</component>
-<component name="engineinfo" filter="s60" long-name="Phone Engine Info">
-<unit bldFile="app/phone/phoneengine/engineinfo/group"/>
-</component>
-<component name="phonemodel" filter="s60" long-name="Phone Model">
-<unit bldFile="app/phone/phoneengine/phonemodel" proFile="phonemodel.pro"/>
-</component>
-<component name="servicehandling" filter="s60" long-name="Phone Service Handling">
-<unit bldFile="app/phone/phoneengine/servicehandling/group"/>
-</component>
-<component name="phoneservices" filter="s60" long-name="Phone Server" introduced="^4">
-<unit bldFile="app/phone/phoneengine/phoneservices" proFile="phoneservices.pro"/>
-</component>
-<component name="parserrecognizer" filter="s60" long-name="Parser Recognizer" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneengine/parserrecognizer" proFile="parserrecognizer.pro"/>
-</component>
-</collection>
-<collection name="phoneuis" long-name="Phone UIs" level="ui">
-<component name="bubblemanager2" filter="s60" long-name="Phone Bubble Manager">
-<unit bldFile="app/phone/phoneuis/bubblemanager2" proFile="bubblemanager2.pro"/>
-</component>
-<component name="telephonydevicemode" filter="s60" long-name="Telephony Device Mode">
-<unit bldFile="app/phone/phoneuis/telephonydevicemode/group"/>
-</component>
-</collection>
-<collection name="phone_plat" long-name="Phone Apps Platform Interfaces" level="app">
-<component name="3d_ringing_tone_enabler_api" long-name="3D Ringing Tone Enabler API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
-</component>
-<component name="telephony_comms_information_api" long-name="Telephony Comms Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_comms_information_api/group"/>
-</component>
-<component name="telephony_information_api" long-name="Telephony Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_information_api/group"/>
-</component>
-<component name="telephony_device_mode_api" long-name="Telephony Device Mode API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_device_mode_api/group"/>
-</component>
-<component name="telephony_remote_party_information_api" long-name="Telephony Remote Party Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_remote_party_information_api/group"/>
-</component>
-<component name="telephony_video_mailbox_settings_api" long-name="Telephony Video Mailbox Settings API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_video_mailbox_settings_api/group"/>
-</component>
-<component name="telephony_microphone_mute_status_api" long-name="Telephony Microphone Mute Status API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_microphone_mute_status_api/group"/>
-</component>
-<component name="telephony_logging_extension_api" long-name="Telephony Logging Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_logging_extension_api/group"/>
-</component>
-<component name="telephony_matching_extension_api" long-name="Telephony Matching Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_matching_extension_api/group"/>
-</component>
-<component name="phone_application_commands_api" long-name="Phone Application Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_commands_api/group"/>
-</component>
-<component name="phone_application_voip_commands_api" long-name="Phone Application VOIP Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_voip_commands_api/group"/>
-</component>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_mediator_api/group"/>
-</component>
-<component name="video_telephony_mediator_api" long-name="Video Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/video_telephony_mediator_api/group"/>
-</component>
-<component name="video_telephony_control_mediator_api" long-name="Video Telephony Control Mediator API" filter="s60" introduced="^4" class="api">
-<unit bldFile="app/phone/phone_plat/video_telephony_control_mediator_api/group"/>
-</component>
-</collection>
-<collection name="phoneplugins" long-name="Phone Plugins" level="plugin">
-<component name="csplugin" filter="s60" long-name="Circuit Switched Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/csplugin/group"/>
-</component>
-<component name="hsdialerwidgetplugin" filter="s60" long-name="Home Screen Dialer Widget Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/hsdialerwidgetplugin" proFile="hsdialerwidgetplugin.pro"/>
-</component>
-<component name="infowidgetplugin" filter="s60" long-name="Info Widget Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/infowidgetplugin" proFile=""/>
-</component>
-</collection>
-<collection name="phonesettings" long-name="Phone Settings" level="plugin">
-<component name="cpphonesettingsplugins" filter="s60" long-name="CP Phone Settings Plugins" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phonesettings/cpphonesettingsplugins" proFile="cpphonesettingsplugins.pro"/>
-</component>
-</collection>
-</block>
-<block name="settingsuis" level="services" long-name="Settings UIs" levels="plugin ui">
-<collection name="controlpanelplugins" long-name="Control Panel Plugins" level="plugin">
-<component name="themeplugin" filter="s60" long-name="Theme Plugin" introduced="^4">
-<unit bldFile="app/settingsuis/controlpanelplugins/themeplugin" proFile="themeplugin.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-<collection name="controlpanelui" long-name="Control Panel UI" level="ui">
-<!-- collection is really a component, move down a dir -->
-<component name="controlpanelui_build" filter="s60" long-name="Control Panel UI Build" introduced="^4">
-<unit bldFile="app/settingsuis/controlpanelui" proFile="controlpanelui.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-</block>
-<block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin framework app">
-<collection name="contentctrl_plat" long-name="Content Control Daemons Platforn Interfaces" level="app">
-<component name="ds_contactsdatastoreextension_api" long-name="Adapter Customization API" filter="s60" introduced="^4" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_contactsdatastoreextension_api/group"/>
-</component>
-<component name="ds_data_modification_api" long-name="DS Data Modification API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_data_modification_api/group"/>
-</component>
-</collection>
-<collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
-<component name="secon" filter="s60" long-name="Service Controllers">
-<unit bldFile="app/contentcontrol/connectivitymodules/secon/group"/>
-</component>
-</collection>
-<collection name="dsdcmoadapter" long-name="Data Sync DCMO Adapter" level="plugin">
-<!-- Component at wrong rank, should move down a directory -->
-<component name="dsdcmoadapter_build" filter="s60" long-name="Data Sync Control DCMO Adapter">
-<unit bldFile="app/contentcontrol/dsdcmoadapter/group"/>
-</component>
-</collection>
-<collection name="omads" long-name="OMA Data Sync" level="app">
-<component name="omads_build" filter="s60" long-name="OMA DS Build">
-<unit bldFile="app/contentcontrol/omads/group"/>
-<!-- need to remove #include and rename and OMA DS ROM -->
-</component>
-<component name="omadsextensions" filter="s60" long-name="OMA DS Extensions" plugin="Y">
-<unit bldFile="app/contentcontrol/omads/omadsextensions/group"/>
-</component>
-<component name="omadsextensions" filter="s60" long-name="OMA DS Qt Extensions" plugin="Y">
-<unit bldFile="app/contentcontrol/omads/omadsextensions" proFile="omadsextensions.pro"/>
-</component>
-</collection>
-</block>
-<block name="firsttimeuse" level="apps" long-name="First Time Use" levels="support services ui app">
-<!-- these empty collections are really components. Move down a directory and supply units -->
-<collection name="ftuapplication" long-name="First Time Use Application" level="app"/>
-<collection name="fturuntimeservices" long-name="First Time Use Runtime Services" level="services"/>
-<collection name="wizardproviders" long-name="Wizard Providers" level="support"/>
-<collection name="stateproviders" long-name="State Providers" level="support"/>
-<collection name="runtimeproviders" long-name="Runtime Providers" level="support"/>
-<collection name="firsttimeuse_info" long-name="First Time Use Info" level="ui">
-<component name="firsttimeuse_build" long-name="First Time Use Build">
-<unit bldFile="app/firsttimeuse" proFile="ftu.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-</block>
-<block name="devicecontrol" level="services" long-name="Device Control Daemons" levels="oma mid app">
-<collection name="deviceupdatesui" long-name="Device Updates UI" level="app">
-<component name="deviceupdatesui_adapters" long-name="Device Updates Adapters" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/devicecontrol/deviceupdatesui/adapters/bld"/>
-</component>
-<component name="deviceupdates" long-name="Device Updates" filter="s60" introduced="^4">
-<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdates" proFile="deviceupdates.pro"/>
-</component>
-<component name="deviceupdatesplugin" long-name="Device Updates Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdatesplugin" proFile="deviceupdatesplugin.pro"/>
-</component>
-<component name="deviceupdatesqtsp" long-name="Device Updates Qt Service Provider" filter="s60" introduced="^4">
-<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdatesqtsp" proFile="deviceupdatesqtsp.pro"/>
-</component>
-<component name="cpqtsp" long-name="Client Provisioning Qt Service Provider" filter="s60" introduced="^4">
-<unit bldFile="app/devicecontrol/deviceupdatesui/cpqtsp" proFile="cpqtsp.pro"/>
-</component>
-<component name="devicemanagementnotifiersplugin" long-name="Device Management Notifiers Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/devicecontrol/deviceupdatesui/devicemanagementnotifiersplugin" proFile="devicemanagementnotifiersplugin.pro"/>
-</component>
-</collection>
-</block>
-<block name="printing" level="services" long-name="Printing"/>
-<block name="files" level="apps" long-name="File Manager Apps" levels="support apps">
-<collection name="filemanager" long-name="File Manager" level="apps">
-<component name="filemanager_plat" long-name="File Manager Platform Interfaces" filter="s60" introduced="^4" class="api"/>
-<component name="fmbkupengine" filter="s60" long-name="File Manager Backup Engine" introduced="^4">
-<unit bldFile="app/files/filemanager/src/fmbkupengine/group"/>
-</component>
-<component name="filemanager_build" filter="s60" long-name="File Manager Build">
-<!-- break this up into components or move down a directory -->
-<unit bldFile="app/files/filemanager" proFile="filemanager.pro"/>
-</component>
-</collection>
-</block>
-<block name="search" level="apps" long-name="Search Apps" levels="eng base app api">
-<collection name="search_info" long-name="Search Info">
-<component name="search_build" long-name="Search Build">
-<unit bldFile="app/search/group"/>
-</component>
-</collection>
-<collection name="searchui" long-name="Search UI">
-<component name="searchui_build" long-name="Search UI Build">
-<unit bldFile="app/search/searchui" proFile="searchui.pro"/>
-</component>
-</collection>
-</block>
-<block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
-<collection name="contacts_plat" long-name="Contacts Apps Platform Interfaces" level="ui">
-<component name="logs_engine_api" long-name="Logs Engine API" filter="s60" introduced="^4" class="api"/>
-<component name="logs_engine_api_extensions" long-name="Logs Engine API Extensions" filter="s60" class="api"/>
-<component name="logs_services_api" long-name="Logs Services API" filter="s60" introduced="^4" class="api"/>
-<component name="logs_timers_api" long-name="Logs Timers API" filter="s60" class="api"/>
-<component name="qt_mobility_contacts_api" long-name="Qt Mobility Contacts API" filter="s60" introduced="^4" class="api"/>
-</collection>
-<collection name="logsui" long-name="Logs UI" level="ui">
-<component name="logsui_build" filter="s60" long-name="Logs UI Build">
-<!-- component at too high a rank, should move down one directory -->
-<unit bldFile="app/contacts/logsui" proFile="logsui.pro"/>
-</component>
-</collection>
-<collection name="phonebookui" long-name="Phonebook UI" level="ui">
-<component name="mobhistorymodel" filter="s60" long-name="Mobile History Model" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/mobhistorymodel" qt:proFile="mobhistorymodel.pro"/> -->
-</component>
-<component name="pbkcommonui" filter="s60" long-name="Phonebook Common UI" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/pbkcommonui" qt:proFile="pbkcommonui.pro"/> -->
-</component>
-<component name="phonebookapp" filter="s60" long-name="Phonebook Application" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/phonebookapp" qt:proFile="phonebookapp.pro"/> -->
-</component>
-<component name="phonebookservices" filter="s60" long-name="Phonebook Services" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/phonebookservices" qt:proFile="phonebookservices.pro"/> -->
-</component>
-<component name="phonebookui_build" filter="s60" long-name="Phonebook UI Build" introduced="^4">
-<!-- break up into components -->
-<unit bldFile="app/contacts/phonebookui" proFile="phonebookui.pro"/>
-</component>
-</collection>
-<collection name="qtcontactsmobility" long-name="Qt Contacts Mobility" level="support">
-<component name="qtcontactsmobility_build" filter="s60" long-name="Qt Contacts Mobility Build" introduced="^4" plugin="Y">
-<!-- not really a component, move down a dir? Break up into compnents? -->
-<unit bldFile="app/contacts/qtcontactsmobility" proFile="qtcontactsmobility.pro"/>
-</component>
-</collection>
-<collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
-<component name="cntfindplugin" filter="s60" long-name="Contacts Find Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntfindplugin" proFile="cntfindplugin.pro"/>
-</component>
-<component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
-<unit bldFile="app/contacts/phonebookengines/contactsmodel/groupsql" mrp="app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
-</component>
-<component name="cntsortplugin" filter="s60" long-name="Contacts Sort Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntsortplugin" proFile="cntsortplugin.pro"/>
-</component>
-<component name="mobcntmodel" filter="s60" long-name="Mobile Contacts Model" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/mobcntmodel" proFile="mobcntmodel.pro"/>
-</component>
-<component name="mobcntactions" filter="s60" long-name="Mobile Contacts Actions" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/mobcntactions" proFile="mobcntactions.pro"/>
-</component>
-<component name="cntmaptileservice" filter="s60" long-name="Contacts Map Tile Service" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/cntmaptileservice" proFile="cntmaptileservice.pro"/>
-</component>
-<component name="simutility" filter="s60" long-name="SIM Utility" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/simutility" proFile="simutility.pro"/>
-</component>
-</collection>
-<collection name="pimprotocols" long-name="PIM Protocols" level="services">
-<component name="phonebooksync" long-name="Phonebook Sync" purpose="optional" plugin="Y">
-<unit bldFile="app/contacts/pimprotocols/phonebooksync/group" mrp="app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
-</component>
-<component name="pbap" long-name="Bluetooth PBAP" introduced="9.2" purpose="optional">
-<unit bldFile="app/contacts/pimprotocols/pbap/group" mrp="app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
-</component>
-</collection>
-<collection name="contacts_info" long-name="Contacts Apps Info" level="ui">
-<component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="organizer" level="apps" span="2" long-name="Organizer Application Suite" levels="support services engine ui app">
-<collection name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" level="app">
-<component name="calendar_interim_utils2_api" long-name="Calendar Interim Utils 2 API" filter="s60" class="api">
-<!-- move into own .pro file -->
-<unit bldFile="app/organizer/organizer_pub" proFile="organizer_pub.pro"/>
-</component>
-</collection>
-<collection name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" level="app">
-<component name="organizer_plat_build" long-name="Organizer Application Suite Platform Interface Build" filter="s60" class="api">
-<!-- break up into individual .pro files -->
-<unit bldFile="app/organizer/organizer_plat" proFile="organizer_plat.pro"/>
-</component>
-<component name="agenda_versit_2_api" long-name="Agenda Versit 2 API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="organizer_plat/agenda_versit_2_api/group"/>-->
-</component>
-<component name="calendar_exporter_api" long-name="Calendar Exporter API" filter="s60" class="api placeholder">
-<!--<unit bldFile="organizer_plat/calendar_exporter_api/group"/>-->
-</component>
-<component name="calendar_importer_api" long-name="Calendar Importer API" filter="s60" class="api placeholder">
-<!--<unit bldFile="organizer_plat/calendar_importer_api/group"/>-->
-</component>
-<component name="calendar_launcher_api" long-name="Calendar Launcher API" filter="s60" class="api placeholder">
-<!--<unit bldFile="organizer_plat/calendar_launcher_api/group"/> -->
-</component>
-<component name="agenda_interface_api" long-name="Agenda Interface API" filter="s60" introduced="^4" class="api"/>
-<component name="calendar_editor_api" long-name="Calendar Editor API" filter="s60" introduced="^4" class="api"/>
-<component name="notes_editor_api" long-name="Notes Editor API" filter="s60" introduced="^4" class="api"/>
-<component name="agenda_eventviewer_api" long-name="Agenda Event Viewer API" filter="s60" introduced="^4" class="api"/>
-</collection>
-<collection name="agendainterface" long-name="Agenda Interface" level="services">
-<!-- collection is really a component, should move down a directory -->
-<component name="agendainterface_build" filter="s60" long-name="Agenda Interface Build">
-<unit bldFile="app/organizer/agendainterface" proFile="agendainterface.pro"/>
-</component>
-</collection>
-<collection name="calendarui" long-name="Calendar UI" level="ui">
-<component name="commonutils" filter="s60" long-name="Calendar Common Utils">
-<unit bldFile="app/organizer/calendarui/commonutils" proFile="commonutils.pro"/>
-</component>
-<component name="calenlauncher" filter="s60" long-name="Calendar Launcher">
-<unit bldFile="app/organizer/calendarui/calenlauncher/group" proFile="calenlauncher.pro"/>
-</component>
-<component name="caleneditor" filter="s60" long-name="Calendar Editor" introduced="^4">
-<unit bldFile="app/organizer/calendarui/caleneditor" proFile="caleneditor.pro"/>
-</component>
-<component name="agendaeventviewer" filter="s60" long-name="Agenda Event Viewer" introduced="^4">
-<unit bldFile="app/organizer/calendarui/agendaeventviewer" proFile="agendaeventviewer.pro"/>
-</component>
-<component name="globaldata" filter="s60" long-name="Calendar Global Data">
-<unit bldFile="app/organizer/calendarui/globaldata" proFile="globaldata.pro"/>
-</component>
-<component name="settings" filter="s60" long-name="Calendar Settings">
-<unit bldFile="app/organizer/calendarui/settings" proFile="settings.pro"/>
-</component>
-<component name="calenplugins" filter="s60" long-name="Calendar Plugins" introduced="^4" plugin="Y">
-<unit bldFile="app/organizer/calendarui/calenplugins" proFile="calenplugins.pro"/>
-</component>
-<component name="customisationmanager" filter="s60" long-name="Calendar Customisation Manager">
-<unit bldFile="app/organizer/calendarui/customisationmanager" proFile="customisationmanager.pro"/>
-</component>
-<component name="views" filter="s60" long-name="Calendar Views">
-<unit bldFile="app/organizer/calendarui/views" proFile="views.pro"/>
-</component>
-<component name="calengriditemstyleplugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/organizer/calendarui/styleplugins/calengriditemstyleplugin" proFile="calengriditemstyleplugin.pro"/>
-</component>
-<component name="calendarui_controller" filter="s60" long-name="Calendar Controller">
-<unit bldFile="app/organizer/calendarui/controller" proFile="controller.pro"/>
-</component>
-<component name="calendarui_application" filter="s60" long-name="Calendar Application">
-<unit bldFile="app/organizer/calendarui/application" proFile="application.pro"/>
-</component>
-<component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y">
-<unit bldFile="app/organizer/calendarui/caldav/group"/>
-</component>
-</collection>
-<collection name="notes" long-name="Notes" level="ui">
-<component name="noteseditor" filter="s60" long-name="Notes Editor" introduced="^4">
-<unit bldFile="app/organizer/notes/notesui/noteseditor" proFile="noteseditor.pro"/>
-</component>
-<component name="notes_build" filter="s60" long-name="Notes Build" introduced="^4">
-<unit bldFile="app/organizer/notes" proFile="notes.pro"/>
-</component>
-</collection>
-<collection name="calendarengines" long-name="Calendar Engines" level="engine">
-<component name="versit2" filter="s60" long-name="Versit 2 iCal Parser" introduced="9.2">
-<unit bldFile="app/organizer/calendarengines/versit2/group"/>
-</component>
-<component name="agnversit2" filter="s60" long-name="Versit 2 Agenda Interface" introduced="9.2" plugin="Y">
-<unit bldFile="app/organizer/calendarengines/agnversit2/group"/>
-</component>
-<component name="caleninterimutils" filter="s60" long-name="Calendar Interim Utils" introduced="9.1">
-<unit bldFile="app/organizer/calendarengines/caleninterimutils/group"/>
-</component>
-<component name="calenimp" filter="s60" long-name="Calendar Import Wrapper" introduced="7.0s">
-<unit bldFile="app/organizer/calendarengines/calenimp/group"/>
-</component>
-<component name="caldavsrv" filter="sf_build" long-name="CalDAV Server" introduced="^3">
-<unit bldFile="app/organizer/calendarengines/caldav/group"/>
-</component>
-</collection>
-<collection name="clock" long-name="Clock" level="app">
-<!-- uncomment unit when block_build is split up-->
-<component name="clockengines" filter="s60" long-name="Clock Engines" class="placeholder">
-<!--<unit bldFile="clock/clockengines" qt:proFile="clockengines.pro"/> -->
-</component>
-<component name="clockmw" filter="s60" long-name="Clock Middleware" introduced="^4" class="placeholder">
-<!--<unit bldFile="clock/clockmw" qt:proFile="clockmw.pro"/>-->
-</component>
-<component name="clockui" filter="s60" long-name="Clock UI" class="placeholder">
-<!--<unit bldFile="clock/clockui" qt:proFile="clockui.pro"/>-->
-</component>
-<component name="ftudatetimewizard" filter="s60" long-name="First Time Use Date/Time Wizard" introduced="^4" class="placeholder">
-<!--<unit bldFile="clock/ftudatetimewizard" qt:proFile="ftudatetimewizard.pro"/>-->
-</component>
-<component name="clock_build" filter="s60" long-name="Clock Build">
-<!-- make exports into a component, or just move to one of the above components, then remove this and uncomment the above -->
-<unit bldFile="app/organizer/clock" proFile="clock.pro"/>
-</component>
-</collection>
-<collection name="pimappservices" long-name="PIM Application Services" level="services">
-<component name="calendar" long-name="Calendar" introduced="9.2" purpose="optional">
-<unit bldFile="app/organizer/pimappservices/calendar/group" mrp="app/organizer/pimappservices/calendar/group/app-engines_calendar.mrp" version="2"/>
-</component>
-<component name="calendarvcalplugin" long-name="Calendar vCal Plugin" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="app/organizer/pimappservices/calendarvcalplugin/group" mrp="app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp" version="2"/>
-</component>
-<component name="appenginesdocs" long-name="Application Engines Documentation" purpose="development" class="doc">
-<unit mrp="app/organizer/pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
-</component>
-</collection>
-<collection name="pimappsupport" long-name="PIM Application Support" level="support">
-<component name="vcardandvcal" long-name="vCard and vCal" introduced="ER5" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/vcardandvcal/group" mrp="app/organizer/pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
-</component>
-<component name="chinesecalendarconverter" long-name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
-</component>
-<component name="chinesecalendaralg" long-name="Chinese Calendar Algorithm" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendaralg/group" mrp="app/organizer/pimappsupport/chinesecalendaralg/group/app-services_chinesecalendaralgorithm.mrp"/>
-</component>
-</collection>
-<collection name="alarmui" long-name="Alarm UI" level="app">
-<!-- collection is really a component, should move down a directory -->
-<component name="alarmui_build" filter="s60" long-name="Alarm UI Build">
-<unit bldFile="app/organizer/alarmui" proFile="alarmui.pro"/>
-</component>
-</collection>
-<collection name="organizer_info" long-name="Organizer Application Suite Info" level="app">
-<component name="organizer_metadata" long-name="Organizer Application Suite Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="plugin eng base app api">
-<collection name="msg_plat" long-name="Messaging Apps Platform APIs" level="api">
-<component name="messaging_media_resolver_api" long-name="Messaging Media Resolver API" filter="s60" class="api"/>
-<component name="mms_application_api" long-name="MMS Application API" filter="s60" class="api"/>
-<component name="mms_codec_client_api" long-name="MMS Codec Client API" filter="s60" class="api"/>
-<component name="mms_conformance_api" long-name="MMS Conformance API" filter="s60" class="api"/>
-<component name="mms_engine_settings_api" long-name="MMS Engine Settings API" filter="s60" class="api"/>
-<component name="mms_server_settings_api" long-name="MMS Server Settings API" filter="s60" class="api"/>
-<component name="conversation_services_client_api" long-name="Conversation Services Client API" filter="s60" introduced="^4" class="api"/>
-<component name="conversation_services_plugin_api" long-name="Conversation Services Plugin API" filter="s60" introduced="^4" class="api"/>
-<component name="conversation_services_utilities_api" long-name="Conversation Services Utilities API" filter="s60" introduced="^4" class="api"/>
-<component name="shareui_api" long-name="Share UI API" filter="s60" introduced="^4" class="api"/>
-<component name="messaging_history_api" long-name="Messaging History API" filter="s60" introduced="^4" class="api"/>
-<component name="msg_plat_build" long-name="Messaging Apps Platform APIs Build" filter="s60" introduced="^4" class="api">
-<!-- break this up into the above units and replace their base attributes with bldFile, etc -->
-</component>
-</collection>
-<collection name="msg_pub" long-name="Messaging Apps Public APIs" level="api">
-<component name="mms_client_mtm_api" long-name="MMS Client MTM API" filter="s60" class="api"/>
-<component name="msg_smil_dtd_api" long-name="Messaging SMIL DTD API" filter="s60" introduced="^4" class="api"/>
-<component name="msg_pub_build" long-name="Messaging Apps Public APIs Build" filter="s60" introduced="^4" class="api">
-<!-- break this up into the above units and replace their base attributes with bldFile, etc -->
-</component>
-</collection>
-<collection name="mobilemessaging" long-name="Mobile Messaging" level="plugin">
-<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/mobilemessaging/smsmtm/group" mrp="app/messaging/mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
-</component>
-</collection>
-<collection name="messagingappbase" long-name="Messaging App Base" level="base">
-<component name="messagingappbase_build" filter="s60" long-name="Messaging App Base Build" introduced="^4">
-<!-- break this up into the below components -->
-<unit bldFile="app/messaging/messagingappbase" proFile="messagingappbase.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgmedia" filter="s60" long-name="Message Media"/>
-<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
-<unit mrp="app/messaging/messagingappbase/smsmtm/group/messaging_sms.mrp"/>
-</component>
-<component name="smilparser" long-name="SMIL Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="app/messaging/messagingappbase/smilparser/GROUP" mrp="app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
-</component>
-<component name="obexmtms" long-name="OBEX MTMs" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/obexmtms/Group" mrp="app/messaging/messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
-</component>
-</collection>
-<collection name="mmsengine" long-name="MMS Engine" level="eng">
-<component name="mmsconninit" filter="s60" long-name="MMS Connection Initiator" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsconninit/bld"/> -->
-</component>
-<component name="genutils" filter="s60" long-name="General Utils" class="placeholder">
-<!-- <unit bldFile="mmsengine/genutils/bld"/> -->
-</component>
-<component name="mmsserversettings" filter="s60" long-name="MMS Server Settings" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserversettings/bld"/> -->
-</component>
-<component name="mmsmessage" filter="s60" long-name="MMS Message" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsmessage/bld"/> -->
-</component>
-<component name="mmshttptransport" filter="s60" long-name="MMS HTTP Transport" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmshttptransport/bld"/> -->
-</component>
-<component name="mmscodec" filter="s60" long-name="MMS Codec" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodec/bld"/> -->
-</component>
-<component name="mmsserver" filter="s60" long-name="MMS Server" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserver/bld"/> -->
-</component>
-<component name="clientmtm" filter="s60" long-name="MMS Client MTM" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/clientmtm/bld"/> -->
-</component>
-<component name="mmswatcher" filter="s60" long-name="MMS Watcher" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmswatcher/bld"/> -->
-</component>
-<component name="mmspushhandler" filter="s60" long-name="MMS Push Handler" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmspushhandler/bld"/> -->
-</component>
-<component name="applicationadapter" filter="s60" long-name="MMS Application Adapter" class="placeholder">
-<!-- <unit bldFile="mmsengine/applicationadapter/bld"/> -->
-</component>
-<component name="mmscodecclient" filter="s60" long-name="MMS Codec Client" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodecclient/bld"/> -->
-</component>
-<component name="mmssettings" long-name="MMS Settings" introduced="9.2" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmssettings/group" mrp="app/messaging/mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
-</component>
-<component name="mmsconf" long-name="MMS Configuration" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmsconf" mrp="app/messaging/mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
-</component>
-<component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
-<!-- this should be broken up into the individual other components -->
-<unit bldFile="app/messaging/mmsengine" proFile="mmsengine.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="messagingapp" long-name="Messaging Application" level="app">
-<component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
-<!-- this should be broken up into the individual other components -->
-<unit bldFile="app/messaging/messagingapp" proFile="messagingapp.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgutils" filter="s60" long-name="Messaging Utils" introduced="^4">
-<unit bldFile="app/messaging/messagingapp/msgutils" proFile="msgutils.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgappfw" filter="s60" long-name="Messaging Application Framework" introduced="^4">
-<unit bldFile="app/messaging/messagingapp/msgappfw" proFile="msgappfw.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgsettings" filter="s60" long-name="Messaging Settings" introduced="^4">
-<unit bldFile="app/messaging/messagingapp/msgsettings" proFile="msgsettings.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgnotifications" filter="s60" long-name="Messaging Notifications" introduced="^4">
-<unit bldFile="app/messaging/messagingapp/msgnotifications" proFile="msgnotifications.pro" qmakeArgs="-r"/>
-</component>
-<component name="smartmessaging" filter="s60" long-name="Smart Messaging">
-<unit bldFile="app/messaging/messagingapp/smartmessaging" proFile="smartmessaging.pro" qmakeArgs="-r"/>
-</component>
-<component name="shareui" filter="s60" long-name="Shared UI" introduced="^4">
-<unit bldFile="app/messaging/messagingapp/shareui" proFile="shareui.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgui" filter="s60" long-name="Messaging UI" introduced="^4">
-<unit bldFile="app/messaging/messagingapp/msgui" proFile="msgui.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="email" long-name="Email" level="plugin">
-<!-- use commonemail instead -->
-<component name="pop3andsmtpmtm" long-name="POP3 and SMTP MTM" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/pop3andsmtpmtm/group" mrp="app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
-</component>
-<component name="imap4mtm" long-name="IMAP4 MTM" introduced="9.2" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/imap4mtm/group" mrp="app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
-</component>
-</collection>
-<collection name="messaging_info" long-name="Messaging Apps Info" level="api">
-<component name="messaging_metadata" long-name="Messaging Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commonemail" level="apps" span="2" long-name="Email Apps" levels="service support ui app">
-<!-- need to resolve the qt parts into proper components, then uncomment the units -->
-<collection name="email_plat" long-name="Email Apps Platform Interfaces" level="app">
-<component name="nmail_client_api" long-name="NMail Client API" filter="s60" introduced="^4" class="api placeholder">
-<!--<unit bldFile="email_plat" qt:proFile="email_plat.pro"/> -->
-</component>
-</collection>
-<collection name="emailservices" long-name="Email Services" level="service">
-<component name="nmailbase" filter="s60" long-name="NMail Base" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/nmailbase" qt:proFile="nmailbase.pro"/> -->
-</component>
-<component name="emailcommon" filter="s60" long-name="Email Common" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/emailcommon" qt:proFile="emailcommon.pro"/>-->
-</component>
-<component name="emailframework" filter="s60" long-name="Email Framework" introduced="^2" class="placeholder">
-<!-- <unit bldFile="emailservices/emailframework" qt:proFile="emailframework.pro"/>-->
-</component>
-<component name="emailstore" filter="s60" long-name="Email Store" introduced="^2" class="placeholder">
-<!-- <unit bldFile="emailservices/emailstore" qt:proFile="emailstore.pro"/>-->
-</component>
-<component name="nmclientapi" filter="s60" long-name="Nmail Client API" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/nmclientapi" qt:proFile="nmclientapi.pro"/>-->
-</component>
-<component name="nmailagent" filter="s60" long-name="Nmail Agent" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/nmailagent" qt:proFile="nmailagent.pro"/>-->
-</component>
-</collection>
-<collection name="ipsservices" long-name="IMAP/POP/SMTP Services" level="service">
-<component name="ipssosplugin" filter="s60" long-name="IPS SOS Plugin" introduced="^2" plugin="Y" class="placeholder">
-<!-- SOS? Consider spelling it out since the abbreviation is ambiguous -->
-<!--<unit bldFile="ipsservices/ipssosplugin" qt:proFile="ipssosplugin.pro" />-->
-</component>
-<component name="nmimapclientplugin" filter="s60" long-name="NM IMAP Client Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="ipsservices/nmimapclientplugin" qt:proFile="nmimapclientplugin.pro"/>-->
-</component>
-<component name="nmipsmtms" filter="s60" long-name="NM IPS Client Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="ipsservices/nmipsmtms" qt:proFile="nmipsmtms.pro"/>-->
-</component>
-<component name="nmipssettings" filter="s60" long-name="NM IPS Settings" introduced="^4" class="placeholder">
-<!-- <unit bldFile="ipsservices/nmipssettings" qt:proFile="nmipssettings.pro"/>-->
-</component>
-<component name="ipsservices_build" filter="s60" long-name="IPS Services Build" introduced="^2" class="placeholder">
-<!--<unit bldFile="ipsservices" qt:proFile="ipsservices.pro"/> -->
-<!-- can the exports be broken up into the other components or made a config component?-->
-</component>
-</collection>
-<collection name="emailuis" long-name="Email UIs" level="app">
-<component name="nmailuiengine" filter="s60" long-name="Nmail UI Engine" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailuiengine" qt:proFile="nmailuiengine.pro"/> -->
-</component>
-<component name="nmailuiwidgets" filter="s60" long-name="Nmail UI Widgets" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailuiwidgets" qt:proFile="nmailuiwidgets.pro"/> -->
-</component>
-<component name="nmailuiwidgetsplugin" filter="s60" long-name="Nmail UI Widgets Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailuiwidgetsplugin" qt:proFile="nmailuiwidgetsplugin.pro"/> -->
-</component>
-<component name="nmsettingui" filter="s60" long-name="Nmail Setting UI" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmsettingui" qt:proFile="nmsettingui.pro"/> -->
-</component>
-<component name="nmailcpplugin" filter="s60" long-name="Nmail CP Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailcpplugin" qt:proFile="nmailcpplugin.pro"/> -->
-</component>
-<component name="nmailui" filter="s60" long-name="Nmail UI" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailui" qt:proFile="nmailui.pro"/> -->
-</component>
-<component name="nmindicatorplugin" filter="s60" long-name="Nmail Indicator Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmindicatorplugin" qt:proFile="nmindicatorplugin.pro"/> -->
-</component>
-<component name="nmframeworkadapter" filter="s60" long-name="Nmail Framework Adapter" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmframeworkadapter" qt:proFile="nmframeworkadapter.pro"/> -->
-</component>
-</collection>
-<collection name="commonemail_info" long-name="Email Apps Info" level="app">
-<component name="commonemail_build" long-name="Email Apps Build" introduced="^4">
-<!-- split into actual components -->
-<unit bldFile="app/commonemail" proFile="nmail.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</block>
-<block name="camera" level="apps" long-name="Camera Apps">
-<collection name="camerauis" long-name="Camera UIs">
-<component name="cameraxui" filter="s60" long-name="CameraX UIs">
-<unit bldFile="app/camera/camerauis/cameraxui" filter="!test" proFile="camerax.pro"/>
-</component>
-</collection>
-</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">
-<component name="image_editor_debug_utilities_api" long-name="Image Editor Debug Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
-</component>
-<component name="image_editor_utilities_api" long-name="Image Editor Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_utilities_api/group"/>
-</component>
-<component name="image_editor_definitions_api" long-name="Image Editor Definitions API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_definitions_api/group"/>
-</component>
-<component name="image_editor_system_parameters_api" long-name="Image Editor System Parameters API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_system_parameters_api/group"/>
-</component>
-<component name="image_processing_engine_api" long-name="Image Processing Engine API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_processing_engine_api/group"/>
-</component>
-</collection>
-<collection name="imageeditor" long-name="Image Editor UI" level="ui">
-<component name="pb" filter="s60" long-name="Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/pb/group"/>
-</component>
-<component name="iepb" filter="s60" long-name="Image Editor Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/iepb/group"/>
-</component>
-<component name="imageeditorui" filter="s60" long-name="Image Editor UI">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorui/group"/>
-</component>
-<component name="imageeditormanager" filter="s60" long-name="Image Editor Manager">
-<unit bldFile="app/imgeditor/imageeditor/imageeditormanager/group"/>
-</component>
-<component name="imageeditorapp" filter="s60" long-name="Image Editor Application">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorapp/group"/>
-</component>
-<component name="imageeditor_plugins" filter="s60" long-name="Image Editor Plugins" plugin="Y">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditor/plugins/blackwhiteplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/brightnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/bubbleplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cartoonizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/clipartplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/contrastplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cropplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/drawplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/frameplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/negativeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/redeyeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/resizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotatelplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotaterplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/textplugin/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditor/plugins/drawplugin/group"/>
- -->
-</component>
-<component name="editorprovider" filter="s60" long-name="Image Editor Provider">
-<unit bldFile="app/imgeditor/imageeditor/editorprovider/group"/>
-</component>
-<component name="imageeditor_build" filter="s60" long-name="Image Editor Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditor/group"/>
-</component>
-</collection>
-<collection name="imageeditorengine" long-name="Image Editor Engine" level="engine">
-<component name="filters" filter="s60" long-name="Image Editor Filters">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbrightness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbubble/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbuffer/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercartoon/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterclipart/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercontrast/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercrop/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterdraw/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterframe/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtergrayscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtericlsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegtarget/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filternegate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterredeye/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterrotate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtertext/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
- -->
-</component>
-<component name="imageeditorutils" filter="s60" long-name="Image Editor Utilities">
-<unit bldFile="app/imgeditor/imageeditorengine/imageeditorutils/group"/>
-</component>
-<component name="systemparameters" filter="s60" long-name="System Parameters">
-<unit bldFile="app/imgeditor/imageeditorengine/systemparameters/group"/>
-</component>
-<component name="enginewrapper" filter="s60" long-name="Image Editor Engine Wrapper">
-<unit bldFile="app/imgeditor/imageeditorengine/enginewrapper/group"/>
-</component>
-<component name="imageeditorengine_build" filter="s60" long-name="Image Editor Engine Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoeditor" level="apps" long-name="Video Editor Apps" levels="engine ui">
-<collection name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" level="ui">
-<component name="video_editor_engine_api" long-name="Video Editor Engine API" introduced="^2" class="api">
-<unit bldFile="app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
-</component>
-</collection>
-<collection name="videditor" long-name="Video Editor" level="ui">
-<component name="videoeditorcommon" filter="s60" long-name="Video Editor Common" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditorcommon/group"/>
-</component>
-<component name="videoeditoruicomponents" filter="s60" long-name="Video Editor UI Components" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditoruicomponents/group"/>
-</component>
-<component name="simplevideoeditor" filter="s60" long-name="Simple Video Editor" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplevideoeditor/group"/>
-</component>
-<component name="simplecutvideo" filter="s60" long-name="Simple Cut Video" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplecutvideo/group"/>
-</component>
-<component name="videoprovider" filter="s60" long-name="Video Provider" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoprovider/group"/>
-</component>
-<component name="manualvideoeditor" filter="s60" long-name="Manual Video Editor" introduced="^2" class="placeholder">
-<!-- uncomment when supported
- <meta rel="config">
- <defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
- </meta>
- <unit bldFile="videditor/manualvideoeditor/group"/> -->
-</component>
-<component name="videditor_build" filter="s60" long-name="Video Editor Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videditor/group"/>
-</component>
-</collection>
-<collection name="videoeditorengine" long-name="Video Editor Engine" level="engine">
-<component name="audioeditorengine" filter="s60" long-name="Audio Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/audioeditorengine/group"/>
-</component>
-<component name="avcedit" filter="s60" long-name="AVC Editing" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/avcedit/group"/>
-</component>
-<component name="h263decoder" filter="s60" long-name="H.263 Decoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/h263decoder/group"/>
-</component>
-<component name="mp3aacmaniplib" filter="s60" long-name="MP3 and AAC Manipulation Library" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
-</component>
-<component name="vedtranscoder" filter="s60" long-name="Video Editor Transcoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedtranscoder/group"/>
-</component>
-<component name="vedengine" filter="s60" long-name="Video Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedengine/group"/>
-</component>
-<component name="videoeditorengine_build" filter="s60" long-name="Video Editor Engine Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videoeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
-<collection name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" level="apps">
-<component name="videoplayer_startup_api" long-name="Video Player Startup API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videoplayer_startup_api/group" filter="!test"/>
-</component>
-<component name="videocollection_api" long-name="Video Collection API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videocollection_api/group"/>
-</component>
-</collection>
-<collection name="videocollection" long-name="Video Collection" level="util">
-<component name="mpxmyvideoscollection" filter="s60" long-name="MPX My Videos Collection" introduced="^3">
-<unit bldFile="app/videoplayer/videocollection/mpxmyvideoscollection/group"/>
-</component>
-<component name="videocollectionwrapper" filter="s60" long-name="Video Collection Wrapper" introduced="^4">
-<unit bldFile="app/videoplayer/videocollection/videocollectionwrapper" proFile="videocollectionwrapper.pro" qmakeArgs="-r"/>
-</component>
-<component name="videocollectionview" filter="s60" long-name="Video Collection View" introduced="^4">
-<unit bldFile="app/videoplayer/videocollection/videocollectionview" proFile="videocollectionview.pro" qmakeArgs="-r"/>
-</component>
-<component name="videofiledetailsview" filter="s60" long-name="Video File Details View" introduced="^4">
-<unit bldFile="app/videoplayer/videocollection/videofiledetailsview" proFile="videofiledetailsview.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="mediasettings" long-name="Media Settings" level="support">
-<!-- this is really a component. Should be moved down a directory -->
-<component name="mediasettings_build" filter="s60" long-name="Media Settings Build">
-<unit bldFile="app/videoplayer/mediasettings/group"/>
-</component>
-</collection>
-<collection name="videoplayerapp" long-name="Video Player App" level="apps">
-<component name="videoplayerengine" long-name="Video Player Engine" filter="s60" introduced="^4">
-<unit bldFile="app/videoplayer/videoplayerapp/videoplayerengine" proFile="videoplayerengine.pro" qmakeArgs="-r"/>
-</component>
-<component name="hbvideoplayer" filter="s60" long-name="HB Video Player" introduced="^4">
-<unit bldFile="app/videoplayer/videoplayerapp/hbvideoplayer" proFile="hbvideoplayer.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="videoplayback" long-name="Video Playback Plugins" level="plugin">
-<component name="hbvideoplaybackview" filter="s60" long-name="HB Video Playback View" introduced="^4" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/hbvideoplaybackview" proFile="hbvideoplaybackview.pro" qmakeArgs="-r"/>
-</component>
-<component name="hbvideoplaybackviewplugin" filter="s60" long-name="HB Video Playback View Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/hbvideoplaybackviewplugin" proFile="hbvideoplaybackviewplugin.pro" qmakeArgs="-r"/>
-</component>
-<component name="videohelix" long-name="Video Helix" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videohelix/group"/>
-</component>
-</collection>
-</block>
-<block name="photos" level="apps" long-name="Photos" levels="util support ui app">
-<collection name="photos_group" long-name="Photos Group" level="support">
-<component name="photos_group_build" filter="s60" long-name="Photos Group Build" introduced="^4" class="placeholder">
-<!--<unit bldFile="group" qt:proFile="group.pro"/> -->
-</component>
-</collection>
-<collection name="photos_loggers" long-name="Photos Loggers" level="util">
-<component name="photos_loggerqt" filter="s60" long-name="Photos Logger Qt" introduced="^4" class="placeholder">
-<!--<unit bldFile="loggers/loggerqt" qt:proFile="loggerqt.pro"/> -->
-</component>
-</collection>
-<collection name="photos_commonutilities" long-name="Photos Common Utilities" level="util">
-<component name="photos_externalutility" filter="s60" long-name="Photos External Utility" introduced="^4" class="placeholder">
-<!--<unit bldFile="commonutilities/externalutility" qt:proFile="externalutility.pro"/> -->
-</component>
-<component name="imagedecoderwrapper" filter="s60" long-name="Image Decoder Wrapper" introduced="^4" class="placeholder">
-<!--<unit bldFile="commonutilities/imagedecoderwrapper" qt:proFile="imagedecoderwrapper.pro"/> -->
-</component>
-</collection>
-<collection name="photos_ui" long-name="Photos UI" level="ui">
-<component name="photos_uiengine" filter="s60" long-name="Photos UI Engine" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/uiengine" qt:proFile="uiengine.pro"/> -->
-</component>
-<component name="photos_commandhandlers" filter="s60" long-name="Photos Command Handlers" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/commandhandlers" qt:proFile="commandhandlers.pro"/> -->
-</component>
-<component name="photos_views" filter="s60" long-name="Photos Views" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/views" qt:proFile="views.pro"/> -->
-</component>
-<component name="photos_viewmanagement" filter="s60" long-name="Photos View Management" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/viewmanagement" qt:proFile="viewmanagement.pro"/> -->
-</component>
-</collection>
-<collection name="photos_main" long-name="Photos Main" level="support">
-<component name="photos_main_build" filter="s60" long-name="Photos Main Build" introduced="^4" class="placeholder">
-<!--<unit bldFile="main" qt:proFile="main.pro"/> -->
-</component>
-</collection>
-<collection name="imageviewerapp" long-name="Image Viewer App" level="support">
-<component name="imageviewerapp_build" filter="s60" long-name="Image Viewer App Build" introduced="^4" class="placeholder">
-<!--<unit bldFile="imageviewerapp" qt:proFile="imageviewerapp.pro"/> -->
-</component>
-</collection>
-<collection name="photos_info" long-name="Photos Info" level="support">
-<component name="photos_build" filter="s60" long-name="Photos Build" introduced="^4">
-<!-- split this up into the above components -->
-<unit bldFile="app/photos" proFile="photos.pro"/>
-</component>
-</collection>
-</block>
-<block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support hs app">
-<!-- move the export .pri files into their components and uncomment the units -->
-<collection name="musicplayer_utilities " long-name="Music Player Utilities" level="support">
-<component name="mpnowplayingbanner" filter="s60" long-name="MP Now Playing Banner" introduced="^4" class="placeholder">
-<!-- <unit bldFile="utilities/mpnowplayingbanner" qt:proFile="mpnowplayingbanner.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-<component name="mpsettingsmanager" filter="s60" long-name="MP Settings Manager" introduced="^4" class="placeholder">
-<!-- <unit bldFile="utilities/mpsettingsmanager" qt:proFile="mpsettingsmanager.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-</collection>
-<collection name="musicfetcher " long-name="Music Fetcher" level="support">
-<!-- collection is really a component, move down a directory -->
-<component name="musicfetcher_buld" filter="s60" long-name="Music Fetcher Build" introduced="^4" class="placeholder">
-<!-- <unit bldFile="musicfetcher" qt:proFile="musicfetcher.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-</collection>
-<collection name="musicplayer_app " long-name="Music Player Application" level="app">
-<!-- collection is really a component, move down a directory -->
-<component name="musicplayer_app_build" filter="s60" long-name="Music Player Application Build" introduced="^4" class="placeholder">
-<!-- <unit bldFile="app" qt:proFile="app.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-</collection>
-<collection name="mpviewplugins " long-name="Music Player View Plugins" level="plugins">
-<component name="mpcollectionviewplugin" filter="s60" long-name="MP Collection View Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpviewplugins/mpcollectionviewplugin/group"/>-->
-</component>
-<component name="mpplaybackviewplugin" filter="s60" long-name="MP Playback View Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpviewplugins/mpplaybackviewplugin/group"/>-->
-</component>
-</collection>
-<collection name="mpserviceplugins" long-name="Music Player Service Plugins" level="plugins">
-<component name="audioeffects" filter="s60" long-name="Audio Effects" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/audioeffects/group"/>-->
-</component>
-<component name="localaudio" filter="s60" long-name="Local Audio" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/localaudio/group"/>-->
-</component>
-<!-- Note: it's called SQLite, not SQLLite, just the one "L" -->
-<component name="mpxsqlitedbcommon" filter="s60" long-name="MPX SQLite Database Common" introduced="^4" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitedbcommon/group"/>-->
-</component>
-<component name="mpxsqlitedbplugin" filter="s60" long-name="MPX SQLite Database Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitedbplugin/group"/>-->
-</component>
-<component name="mpxsqlitepodcastdbplugin" filter="s60" long-name="MPX SQLlite Podcast Database Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
-</component>
-<component name="m3uplaylistplugin" filter="s60" long-name="M3U Playlist Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
-</component>
-</collection>
-<collection name="musicplayer_info" long-name="Music Player Apps Info" level="app">
-<component name="musicplayer_build" filter="s60" long-name="Music Player Build">
-<!-- should brak up into individual components -->
-<unit bldFile="app/musicplayer" proFile="qtmusicplayer.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-</block>
-<block name="radio" level="apps" long-name="Radio Apps" levels="engine ui">
-<collection name="radioengine" long-name="Radio Engine" level="engine">
-<component name="radioengineutils" filter="s60" long-name="Radio Engine Utils" introduced="^4">
-<unit bldFile="app/radio/radioengine/utils/group"/>
-</component>
-<component name="radioenginesettings" filter="s60" long-name="Radio Engine Settings" introduced="^4">
-<unit bldFile="app/radio/radioengine/settings/group"/>
-</component>
-<component name="radioengine_engine" filter="s60" long-name="Radio Engine" introduced="^4">
-<unit bldFile="app/radio/radioengine/engine/group"/>
-</component>
-</collection>
-<collection name="radioapp" long-name="Radio App" level="ui">
-<component name="radioenginewrapper" filter="s60" long-name="Radio Engine Wrapper" introduced="^4">
-<unit bldFile="app/radio/radioapp/radioenginewrapper" proFile="radioenginewrapper.pro"/>
-</component>
-<component name="radiopresetstorage" filter="s60" long-name="Radio Preset Storage" introduced="^4">
-<unit bldFile="app/radio/radioapp/radiopresetstorage" proFile="radiopresetstorage.pro"/>
-</component>
-<component name="radiouiengine" filter="s60" long-name="Radio UI Engine" introduced="^4">
-<unit bldFile="app/radio/radioapp/radiouiengine" proFile="radiouiengine.pro"/>
-</component>
-<component name="radiowidgets" filter="s60" long-name="Radio Widgets" introduced="^4">
-<unit bldFile="app/radio/radioapp/radiowidgets" proFile="radiowidgets.pro"/>
-</component>
-<component name="radioapplication" filter="s60" long-name="Radio Application" introduced="^4">
-<unit bldFile="app/radio/radioapp/radioapplication" proFile="radioapplication.pro"/>
-</component>
-<component name="radio_rom" filter="s60" long-name="Radio ROM" introduced="^4">
-<unit bldFile="app/radio/rom"/>
-</component>
-</collection>
-</block>
-<block name="internetradio" level="apps" long-name="Internet Radio Apps" levels="engine server ui">
-<collection name="internetradio2_0" long-name="Internet Radio 2.0" level="ui">
-<!-- collection is really a component. Move down a dir -->
-<component name="internetradio2_0_build" long-name="Internet Radio 2.0 Build">
-<unit bldFile="app/internetradio/internetradio2.0/group"/>
-</component>
-</collection>
-<collection name="presetserver" long-name="Preset Server" level="server">
-<!-- collection is really a component. Move down a dir -->
-<component name="presetserver_build" long-name="Preset Server Build">
-<unit bldFile="app/internetradio/presetserver/group"/>
-</component>
-</collection>
-<collection name="qtinternetradio" long-name="Qt Internet Radio">
-<component name="qtinternetradio_build" long-name="Qt Internet Radio Build">
-<!-- Move down a dir or break into components-->
-<unit bldFile="app/internetradio/qtinternetradio" proFile="all.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-</block>
-<block name="homescreen" level="apps" long-name="Home Screen Apps" levels="support task ss hs">
-<collection name="homescreen_info" long-name="Home Screen Info" level="support">
-<component name="homescreen_build" long-name="Homescreen Build">
-<!-- break this up properly into components -->
-<unit bldFile="app/homescreen" proFile="homescreen.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-<collection name="homescreen_test" long-name="Home Screen Test" level="support"/>
-<!-- fiill in details with broken up homescreen_build -->
-<collection name="homescreenapp" long-name="Home Screen Application" level="hs">
-<component name="hsutils" long-name="Home Screen Utils" introduced="^4"/>
-<component name="hsdomainmodel" long-name="HS Domain Model" introduced="^4"/>
-<component name="hs_runtimeplugins" long-name="HS Runtime Plugins" introduced="^4" plugin="Y"/>
-<component name="hs_serviceproviders" long-name="HS Service Providers" introduced="^4" plugin="Y"/>
-<component name="hs_stateplugins" long-name="HS State Plugins" introduced="^4" plugin="Y"/>
-<component name="hs_widgetplugins" long-name="HS Widget Plugins" introduced="^4" plugin="Y"/>
-<component name="hsapplication" long-name="Home Screen Application" introduced="^4"/>
-<component name="hshomescreenclientplugin" long-name="Home Screen Client Plugin" introduced="^4" plugin="Y"/>
-<component name="hsmenucontentpublish" long-name="HS Menu Content Publish" introduced="^4"/>
-</collection>
-<collection name="screensaverapp" long-name="Screen Saver Application" level="ss">
-<component name="snsrutils" long-name="Screen Saver Utils" introduced="^4"/>
-<component name="snsr_serviceproviders" long-name="Screen Saver Service Providers" introduced="^4" plugin="Y"/>
-<component name="snsr_stateproviders" long-name="Screen Saver State Providers" introduced="^4" plugin="Y"/>
-<component name="snsr_runtimeproviders" long-name="Screen Saver Runtime Providers" introduced="^4" plugin="Y"/>
-<component name="snsrapplication" long-name="Screen Saver Application" introduced="^4"/>
-<component name="screensaverproviders" long-name="Screen Saver Providers" introduced="^4" plugin="Y"/>
-</collection>
-<collection name="taskswitcherapp" long-name="Task Switcher Application" level="task">
-<component name="taskswitcherappecom" long-name="Task Switcher Application ECom" introduced="^4"/>
-<component name="tsserviceplugin" long-name="Task Switcher Service Plugin" introduced="^4" plugin="Y"/>
-<component name="ts_runtimeplugins" long-name="TS Runtime Plugins" introduced="^4" plugin="Y"/>
-<component name="tsapplication" long-name="Task Switcher Application" introduced="^4"/>
-</collection>
-</block>
-<block name="homescreentools" level="services" long-name="Home Screen Tools" levels="tool install">
-<collection name="dtdinstaller" long-name="DTD Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<!-- this needs to be built first, does build order need to be forced with filters? -->
-<component name="dtdinstaller_build" filter="s60,bldmefirst" long-name="DTD Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/dtdinstaller/group"/>
-</component>
-</collection>
-<collection name="themeinstaller" long-name="Theme Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="themeinstaller_build" filter="s60" long-name="Theme Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/themeinstaller/group"/>
-</component>
-</collection>
-<collection name="widgettools" long-name="Widget Tools" level="install">
-<component name="hspluginpreinstaller" filter="s60" long-name="HS Plugin Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/hspluginspreinstaller/group"/>
-</component>
-<component name="wrtwidgetpreinstaller" filter="s60" long-name="WRT Widget Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
-</component>
-</collection>
-</block>
-<block name="jrt" level="services" long-name="Java Runtime" levels="util generic rt ui">
-<collection name="jrt_plat" long-name="JRT Platform Interfaces" level="ui">
-<component name="java_registry_api" long-name="Java Registry API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_registry_api/build"/>
-</component>
-<component name="java_env_info_api" long-name="Java Environment Info API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_env_info_api/build"/>
-</component>
-<component name="java_debug_api" long-name="Java Debug API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_debug_api/build"/>
-</component>
-</collection>
-<collection name="java_stubs" long-name="Java Stubs" level="util">
-<!-- uncomment all components when configuration is in place. Currently #included from jrt_build -->
-<component name="javadrmutils" long-name="Java DRM Utils" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtdrmutils/group"/>-->
-</component>
-<component name="javaenvinfo" long-name="Java Environment Info" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtenvinfo/group"/>-->
-</component>
-<component name="javaregistry" filter="s60,sf_build" long-name="Java Registry" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtregistry/clientserver/client/group"/>-->
-</component>
-<component name="java_stubs_build" filter="s60,sf_build" long-name="Java Stubs ROM" class="placeholder">
-<!-- Remove the #includes and rename JRT ROM-->
-<!--<unit bldFile="java_stubs/group"/>-->
-</component>
-</collection>
-<collection name="jrt_info" long-name="JRT Info" level="rt">
-<component name="jrt_build" filter="s60" long-name="JRT Build">
-<!-- needed for __JAVA_STUBS condition -->
-<unit bldFile="app/jrt/group"/>
-</component>
-</collection>
-</block>
-<block name="conntools" level="services" long-name="Connectivity Tools" levels="config app">
-<collection name="nettools" long-name="Net Tools" level="app">
-<component name="conntest" filter="s60" long-name="Connection Test" purpose="development">
-<unit bldFile="app/conntools/nettools/conntest/group"/>
-</component>
-</collection>
-<collection name="emulatorlan" long-name="Emulator LAN" level="config">
-<!-- component is actually a colleciton, should be moved down a directory -->
-<component name="emulatorlan_build" filter="s60" long-name="Emulator LAN Build" purpose="development" class="config">
-<unit bldFile="app/conntools/emulatorlan/group"/>
-</component>
-</collection>
-</block>
-<block name="rndtools" level="services" long-name="R&D tools" levels="support generic test util">
-<collection name="creator" long-name="Creator" level="support">
-<!-- collection is really a component. Should move down a directory -->
-<component name="creator_build" filter="s60" long-name="Creator Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/creator/group"/>
-</component>
-</collection>
-<collection name="filebrowser" long-name="File Browser" level="util">
-<!-- consider collapsing into a single component -->
-<component name="fileopserver" filter="s60" long-name="File Operations Server" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
-</component>
-<component name="fileopclient" filter="s60" long-name="File Operations Client" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!--<unit bldFile="filebrowser/fileopclient/group"/>-->
-</component>
-<component name="filebrowser_build" filter="s60" long-name="File Browser Application" purpose="development" class="tool">
-<!-- Need to make this a self-contained component by removing #includes. Can only do when configuration is in place-->
-<unit bldFile="app/rndtools/filebrowser/group"/>
-</component>
-</collection>
-<collection name="launcher" long-name="Launcher" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="launcher_build" filter="s60" long-name="Launcher Utility" purpose="development" class="tool">
-<unit bldFile="app/rndtools/launcher/group"/>
-</component>
-</collection>
-<collection name="loadgen" long-name="Load Generator" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="loadgen_build" filter="s60" long-name="Load Generator Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/loadgen/group"/>
-</component>
-</collection>
-<collection name="perfmon" long-name="Performance Monitor" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="perfmon_build" filter="s60" long-name="Performance Monitor Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/perfmon/group"/>
-</component>
-</collection>
-<collection name="screengrabber" long-name="Screen Grabber" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="screengrabber_build" filter="s60" long-name="ScreenGrabber" purpose="development" class="tool">
-<unit bldFile="app/rndtools/screengrabber/group"/>
-</component>
-</collection>
-<collection name="stifui" long-name="STIF UI" level="generic">
-<component name="stifui_stifui" filter="s60" long-name="STIF UI" purpose="development">
-<unit bldFile="app/rndtools/stifui/stifui/group"/>
-</component>
-<component name="uitestserverstarter" filter="s60" long-name="UI Test Server Starter" purpose="development">
-<unit bldFile="app/rndtools/stifui/uitestserverstarter/group"/>
-</component>
-<component name="stifui_build" filter="s60" long-name="STIF UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/stifui/group"/>
-</component>
-</collection>
-<collection name="memspyui" long-name="Memspy UI" level="generic">
-<!-- collection is really a component. Should move down a directory -->
-<component name="memspyui_build" filter="s60" long-name="Memspy UI Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/memspyui/group"/>
-</component>
-</collection>
-<collection name="htiui" long-name="Harmonized Test Interface UI" level="generic">
-<component name="HtiServicePlugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- can only have a single unit. Should #include from a common bld.inf file -->
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiFtpBackupFake/group"/>
-</component>
-<component name="htidevicereboot" filter="s60" long-name="HTI Device Reboot" purpose="development">
-<unit bldFile="app/rndtools/htiui/htidevicereboot/group"/>
-</component>
-<component name="htistartupwait" filter="s60" long-name="HTI Startup Wait" purpose="development">
-<unit bldFile="app/rndtools/htiui/htistartupwait/group"/>
-</component>
-<component name="htiadmin" filter="s60" long-name="HTI Admin" purpose="development">
-<unit bldFile="app/rndtools/htiui/htiadmin/group"/>
-</component>
-<component name="htiui_build" filter="s60" long-name="HTI UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/htiui/group"/>
-</component>
-</collection>
-</block>
-<block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools if ui">
-<collection name="userguide" long-name="User Guide" level="if">
-<!-- collection is really a component. Move down a directory -->
-<component name="userguide_build" long-name="User Guide Build" filter="s60" introduced="^4">
-<unit bldFile="app/helps/userguide" proFile="Userguide.pro"/>
-</component>
-</collection>
-<collection name="symhelp" long-name="Symbian Help" level="eng">
-<component name="helpmodel" long-name="Help" introduced="6.0" purpose="optional">
-<unit bldFile="app/helps/symhelp/helpmodel/group" mrp="app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
-</component>
-</collection>
-<collection name="helps_info" long-name="Help Apps Info" level="ui">
-<component name="helps_metadata" long-name="Help Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/helps/helps_info/helps_metadata/helps_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
-<collection name="buildverification" long-name="Build Verification" level="services">
-<component name="autosmoketest" long-name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
-<unit bldFile="app/techview/buildverification/autosmoketest/Group" mrp="app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
-</component>
-<component name="smoketest" long-name="Smoke Test" filter="gt" purpose="development">
-<unit bldFile="app/techview/buildverification/smoketest/Group" mrp="app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
-</component>
-</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="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"/>
-<collection name="installationapps" long-name="Installation Apps" level="apps2"/>
-<collection name="messagingapps" long-name="Messaging Apps" level="apps2"/>
-<collection name="telephonyapps" long-name="Telephony Apps" level="apps1"/>
-<collection name="networkingapps" long-name="Networking Apps" level="apps1"/>
-<collection name="networkingutils" long-name="Networking Utils" level="utils"/>
-<collection name="shortlinkapps" long-name="Shortlink Apps" level="apps1"/>
-<collection name="testapps" long-name="Test Apps" level="utils"/>
-<collection name="avapps" long-name="A/V Apps" level="apps3"/>
-<collection name="toolkit" long-name="Toolkit" level="utils"/>
-<collection name="techview_info" long-name="Techview Info" level="apps3">
-<component name="techview_metadata" long-name="Techview Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/techview/techview_info/techview_metadata/techview_metadata.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
--- a/symbian4/single/sysdefs/auto/model_20100429125314_ca5a2c685f32.xml Wed May 05 12:21:47 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9076 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a package or prebuilt -->
-<!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) "N"
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile may someday be removed in favour of mrp -->
-<!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="low mw high">
-<block name="stubs" level="high" span="2" long-name="Stubs" levels="adaptation plugin mid engine">
-<collection name="audiostubs" long-name="Audio Stubs" level="adaptation">
-<component name="devsoundextensions_stubs" long-name="Devsound Extensions Stubs">
-<unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/group"/>
-</component>
-<component name="fmradiotunercontrolstub" long-name="FM Radio Tuner Control Stub">
-<unit bldFile="adaptation/stubs/audiostubs/fmradiotunercontrolstub/group"/>
-</component>
-</collection>
-<collection name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaptation Stub" level="adaptation">
-<component name="btaudioadaptation_stub_build" long-name="Bluetooth Audio Adaptation Stub Build" filter="oem_build">
-<unit bldFile="adaptation/stubs/btaudioadaptation_stub/group"/>
-</component>
-</collection>
-<collection name="drm_stubs" long-name="DRM Stubs" level="plugin">
-<component name="drm_stubs_build" long-name="DRM Stubs Build">
-<unit bldFile="adaptation/stubs/drm_stubs/group"/>
-</component>
-</collection>
-<collection name="ocrsrv_stub" long-name="OCR Services Stub" level="mid">
-<component name="ocrsrv_stub_build" long-name="OCR Services Stub Build" filter="!dfs_build">
-<unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
-</component>
-</collection>
-<collection name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
-<component name="omasuplasnconverterstubimpl_build" long-name="OMA SUPL ASN Converter Stub Implementation Build" filter="!dfs_build">
-<unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
-</component>
-</collection>
-<collection name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" level="plugin">
-<component name="posmsgpluginreferenceimpl_build" long-name="POS Message Plugin Reference Implementation Build" plugin="Y">
-<unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
-</component>
-</collection>
-<collection name="srsfenginestub" long-name="SRSF Engine Stub" level="engine">
-<component name="srsfenginestub_build" long-name="SRSF Engine Stub Build" filter="stubs">
-<unit bldFile="adaptation/stubs/srsfenginestub/group"/>
-</component>
-</collection>
-<collection name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub" level="plugin">
-<component name="power_save_display_mode_stub_build" long-name="Power Save Display Mode Stub Build">
-<unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
-</component>
-</collection>
-<collection name="systemswstubs" long-name="System Software Stubs" level="adaptation">
-<component name="ddcaccessstub" long-name="DDC Access Stub">
-<unit bldFile="adaptation/stubs/systemswstubs/ddcaccessstub/group"/>
-</component>
-<component name="tvoutconfig" long-name="TV Out Config">
-<unit bldFile="adaptation/stubs/systemswstubs/TVOutConfig/group" filter="oem_build"/>
-</component>
-<component name="accessorypolicyreference" long-name="Accessory Policy Reference">
-<unit bldFile="adaptation/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
-</component>
-<component name="asyreference" long-name="ASY Reference" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
-</component>
-<component name="examplecommonisc" long-name="Example Common ISC">
-<unit bldFile="adaptation/stubs/systemswstubs/examplecommonisc/group" filter="oem_build"/>
-</component>
-<component name="exampledsy" long-name="Example DSY">
-<unit bldFile="adaptation/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
-</component>
-<component name="featuremanagerstub" long-name="Feature Manager Stub">
-<unit bldFile="adaptation/stubs/systemswstubs/featuremanagerstub/group" filter="oem_build"/>
-</component>
-<component name="hwrmstubplugins" long-name="Hardware Resource Manager Stub Plugins" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
-</component>
-<component name="hwrmhapticsstubplugin" long-name="Hardware Resource Manager Haptics Stub Plugin" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
-</component>
-<component name="sensorchannelsreference" long-name="Sensor Channels Reference">
-<unit bldFile="adaptation/stubs/systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
-</component>
-<component name="ssyreference" long-name="SSY Reference" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
-</component>
-<component name="startupadaptationstub" long-name="Startup Adaptation Stub" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/startupadaptationstub/group" filter="oem_build"/>
-</component>
-<component name="tiltcompensationstub" long-name="Tilt Compensation Stub">
-<unit bldFile="adaptation/stubs/systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
-</component>
-<component name="tvoutbehaviour" long-name="TV Out Behaviour">
-<unit bldFile="adaptation/stubs/systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
-</component>
-<component name="wiredbearerreference" long-name="Wired Bearer Reference" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
-</component>
-</collection>
-<collection name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" level="engine">
-<component name="tactileclickplugin_stub_build" long-name="Tactile Click Plugin Stub Build" plugin="Y">
-<unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
-</component>
-</collection>
-<collection name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub" level="mid">
-<component name="wlanhwinit_stub_build" long-name="WLAN Hardware Init Stub Build">
-<unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
-<collection name="omap3530" long-name="OMAP 3530" level="hw-if">
-<component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530" mrp="adaptation/beagleboard/omap3530/base_beagle.mrp"/>
-</component>
-<component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/kernel"/>
-</component>
-<component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/beagleboard"/>
-</component>
-</collection>
-</block>
-<block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
-<collection name="qemu_baseport" long-name="Baseport" level="hw-if">
-<component name="syborg" long-name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/qemu/baseport/syborg" mrp="adaptation/qemu/baseport/syborg/syborg.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
-<collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
-<component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
-<unit bldFile="os/kernelhwsrv/brdbootldr/ubootldr" mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
-</component>
-</collection>
-<collection name="bsptemplate" long-name="Board Support Package Template" level="hw-if">
-<component name="asspandvariant" long-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 name="kernel" long-name="Kernel Architecture" level="adaptation">
-<component name="eka" long-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 name="kerneltest" long-name="Kernel Test" level="hw-if">
-<component name="e32utils" long-name="E32 Utilities" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32utils/group" mrp="os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/>
-</component>
-<component name="e32test" long-name="E32 Tests" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32test/group" mrp="os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
-</component>
-<component name="f32test" long-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 name="ldds" long-name="Logical Device Drivers" level="adaptation">
-<component name="ethernetldd" long-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 name="audioldd" long-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>
-<component name="serialldd" long-name="Serial Port Drivers" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
-</component>
-<component name="legacydrivers" long-name="Legacy Drivers" purpose="optional">
-<unit mrp="os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
-</component>
-<component name="locmedia" long-name="Local Media Subsystem" introduced="8.1b" purpose="mandatory">
-<!-- these are LDDs for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
-</component>
-<component name="runmodedebugger" long-name="Run Mode Debugger" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/debug/group" mrp="os/kernelhwsrv/kernel/eka/drivers/debug/group/base_e32_drivers_debug.mrp"/>
-</component>
-<component name="btrace" long-name="Kernel Trace Tool" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/trace" mrp="os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
-</component>
-<component name="cameraldd" long-name="Camera Drivers" introduced="^3" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/camerasc" mrp="os/kernelhwsrv/kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
-</component>
-<component name="displayldd" long-name="Display Drivers" introduced="^3" purpose="optional">
-<!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/display" mrp="os/kernelhwsrv/kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
-</component>
-<component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
-</component>
-<component name="usbdescriptors" long-name="USB Descriptors" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors" mrp="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors/base_drivers_usbdescriptors.mrp"/>
-</component>
-<component name="usbdi_utils" long-name="USB DI Utils" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils" mrp="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils/base_drivers_usbdi_utils.mrp"/>
-</component>
-</collection>
-<collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
-<component name="mediadrivers" long-name="Media Drivers" purpose="optional">
-<!-- these are for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/media" mrp="os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
-</component>
-<component name="genericboardsupport" long-name="Generic Board Support" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
-</component>
-</collection>
-<collection name="userlibandfileserver" long-name="User Library and File Server" level="framework">
-<component name="euser" long-name="User Library" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/euser" mrp="os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
-</component>
-<component name="compsupp" long-name="Compiler Runtime Support" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/compsupp" mrp="os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
-</component>
-<component name="fileserver" long-name="File Server" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
-</component>
-<component name="estart" long-name="Base Starter" filter="gt" purpose="optional">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
-</component>
-<component name="domainmgr" long-name="Domain Manager" introduced="8.1b" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
-</component>
-</collection>
-<collection name="filesystems" long-name="File Systems" level="framework">
-<component name="romfs" long-name="ROM File System" filter="gt" purpose="optional" plugin="Y">
-<unit mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
-</component>
-<component name="rofs" long-name="ROFS" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
-</component>
-<component name="usbmsfs" long-name="USB Mass Storage File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
-</component>
-<component name="usbhostmssrv" long-name="USB Host Mass Storage Server" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage/base_f32_shostmassstorage.mrp"/>
-</component>
-<component name="fat32fs" long-name="FAT32 File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
-</component>
-<component name="fatfs" long-name="FAT File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
-</component>
-<component name="compfs" long-name="Composite File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
-</component>
-</collection>
-<collection name="halservices" long-name="HAL Services" level="framework">
-<component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
-<unit bldFile="os/kernelhwsrv/halservices/hal" mrp="os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
-</component>
-</collection>
-<collection name="textmodeshell" long-name="Text Mode Shell" level="test">
-<component name="e32wsrv" long-name="Text Window Server" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/ewsrv" mrp="os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
-</component>
-<component name="textshell" long-name="Text Shell" filter="gt" purpose="development">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
-</component>
-</collection>
-<collection name="baseapitest" long-name="Base API Tests" level="test"/>
-<collection name="kernelhwsrv_info" long-name="Kernel and Hardware Services Info" level="test">
-<component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 config">
-<collection name="emulator" long-name="Emulator" level="bsp">
-<component name="emulatorbsp" long-name="Emulator BSP" purpose="optional">
-<unit bldFile="os/boardsupport/emulator/emulatorbsp" mrp="os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
-</component>
-</collection>
-<collection name="haitest" long-name="HAI Test Suites" level="test">
-<component name="bspsvs" long-name="BSP Verification Suite" introduced="^2" purpose="development">
-<unit mrp="os/boardsupport/haitest/bspsvs/group/bspsvs.mrp"/>
-</component>
-</collection>
-<collection name="boardsupport_info" long-name="Board Support Info" level="config">
-<component name="boardsupport_metadata" long-name="Board Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/boardsupport/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
-<collection name="bldsystemtools" long-name="Build System Tools" level="bld">
-<component name="sysdeftools" long-name="System Definition Tools" purpose="development" introduced="^2">
-<unit mrp="os/buildtools/bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
-</component>
-<component name="commonbldutils" long-name="Common Utils" purpose="development">
-<unit mrp="os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
-</component>
-</collection>
-<collection name="toolsandutils" long-name="Tools and Utils" level="mw">
-<component name="productionbldtools" long-name="Production Build Tools" filter="gt" purpose="development">
-<unit mrp="os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
-</component>
-<component name="e32tools" long-name="E32 Tools" deprecated="^2" purpose="development" class="PC">
-<unit bldFile="os/buildtools/toolsandutils/e32tools/group" mrp="os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
-</component>
-<component name="autotest" long-name="Autotest" purpose="development">
-<unit bldFile="os/buildtools/toolsandutils/autotest/group" mrp="os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
-</component>
-</collection>
-<collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
-<component name="e32toolp" long-name="E32 Perl Tools" purpose="development" filter="sf_build" class="PC">
-<unit mrp="os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="os/buildtools/sbsv1_os/e32toolp/group"/>
-</component>
-</collection>
-<collection name="imgtools_os" long-name="Image Tools" level="fw">
-<component name="romkiteka2" long-name="ROMKIT EKA2" deprecated="^2" purpose="development">
-<unit bldFile="os/buildtools/imgtools_os/romkiteka2/group" mrp="os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
-</component>
-</collection>
-<collection name="misccomponents" long-name="Misc Components" level="mw">
-<component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt" purpose="development">
-<unit bldFile="os/buildtools/misccomponents/emulatorlauncher/group" mrp="os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
-</component>
-</collection>
-<collection name="buildtools_info" long-name="Build Tools Info" level="ui">
-<component name="buildtools_metadata" long-name="Build Tools Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/buildtools/buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
-<collection name="ossrv_pub" long-name="Generic OS Services Public Interfaces" level="utilities">
-<component name="boost_apis" long-name="Boost APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/boost_apis/group"/>
-</component>
-<component name="cpp_wrappers" long-name="Cpp wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cpp_wrappers/group"/>
-</component>
-<component name="character_type_apis" long-name="Character Type APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/character_type_apis/group"/>
-</component>
-<component name="compiler_specific_runtime_support" long-name="Compiler Specific Runtime Support" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/compiler_specific_runtime_support/group"/>
-</component>
-<component name="ossrv_configuration_api" long-name="Generic OS Services Configuration API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/configuration/group"/>
-</component>
-<component name="crypto_authentication_codes_and_hash_functions_api" long-name="Crypto Authentication Codes and Hash Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
-</component>
-<component name="crypto_auxillary_functions_api" long-name="Crypto Auxillary Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_auxillary_functions_api/group"/>
-</component>
-<component name="crypto_certificates_api" long-name="Crypto Certificates API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_certificates_api/group"/>
-</component>
-<component name="crypto_inputoutput_and_data_encoding_api" long-name="Crypto Input/Output and Data Encoding API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
-</component>
-<component name="crypto_public_key_cryptography_and_key_agreement_api" long-name="Crypto Public Key Cryptography and Key Agreement API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
-</component>
-<component name="crypto_symmetric_ciphers_api" long-name="Crypto Symmetric Ciphers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_symmetric_ciphers_api/group"/>
-</component>
-<component name="crypto_utility_functions_api" long-name="Crypto Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_utility_functions_api/group"/>
-</component>
-<component name="cryptogaphy_related_api" long-name="Cryptogaphy Related API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cryptogaphy_related_api/group"/>
-</component>
-<component name="ossrv_debug_api" long-name="Generic OS Services Debug API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/debug/group"/>
-</component>
-<component name="ossrv_exceptions_api" long-name="Generic OS Services Exceptions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/exceptions/group"/>
-</component>
-<component name="gboxed" long-name="GBoxed API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gboxed/group"/>
-</component>
-<component name="glib_arrays" long-name="Glib Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_arrays/group"/>
-</component>
-<component name="glib_asynchronous_queues" long-name="Glib Asynchronous Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_asynchronous_queues/group"/>
-</component>
-<component name="glib_atomic_operations" long-name="Glib Atomic Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_atomic_operations/group"/>
-</component>
-<component name="glib_automatic_string_completion" long-name="Glib Automatic String Completion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_automatic_string_completion/group"/>
-</component>
-<component name="glib_balanced_binary_trees" long-name="Glib Balanced Binary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_balanced_binary_trees/group"/>
-</component>
-<component name="glib_basic_types" long-name="Glib Basic Types API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_basic_types/group"/>
-</component>
-<component name="glib_caches" long-name="Glib Caches API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_caches/group"/>
-</component>
-<component name="glib_character_set_conversion" long-name="Glib Character Set Conversion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_character_set_conversion/group"/>
-</component>
-<component name="glib_closures" long-name="Glib Closures API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_closures/group"/>
-</component>
-<component name="glib_commandline_option_parser" long-name="Glib Command Line Option Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_commandline_option_parser/group"/>
-</component>
-<component name="glib_datasets" long-name="Glib Datasets API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_datasets/group"/>
-</component>
-<component name="glib_date_and_time_functions" long-name="Glib Date and Time Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_date_and_time_functions/group"/>
-</component>
-<component name="glib_doubleended_queues" long-name="Glib Double-ended Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doubleended_queues/group"/>
-</component>
-<component name="glib_doublylinked_lists" long-name="Glib Doubly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doublylinked_lists/group"/>
-</component>
-<component name="glib_dynamic_loading_of_modules" long-name="Glib Dynamic Loading of Modules API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_dynamic_loading_of_modules/group"/>
-</component>
-<component name="glib_enums_and_flags" long-name="Glib Enums and Flags API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_enums_and_flags/group"/>
-</component>
-<component name="glib_error_reporting" long-name="Glib Error Reporting API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_error_reporting/group"/>
-</component>
-<component name="glib_file_utilities" long-name="Glib File Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_file_utilities/group"/>
-</component>
-<component name="glib_generic_values" long-name="Glib Generic Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_generic_values/group"/>
-</component>
-<component name="glib_globstyle_pattern_matching" long-name="Glib Glob-Style Pattern Matching API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_globstyle_pattern_matching/group"/>
-</component>
-<component name="glib_hash_tables" long-name="Glib Hash Tables API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hash_tables/group"/>
-</component>
-<component name="glib_hook_functions" long-name="Glib Hook Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hook_functions/group"/>
-</component>
-<component name="glib_internationalization" long-name="Glib Internationalization API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_internationalization/group"/>
-</component>
-<component name="glib_io_channels" long-name="Glib I/O Channels API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_io_channels/group"/>
-</component>
-<component name="glib_keyvalue_file_parser" long-name="Glib Key-Value File Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_keyvalue_file_parser/group"/>
-</component>
-<component name="glib_lexical_scanner" long-name="Glib Lexical Scanner API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_lexical_scanner/group"/>
-</component>
-<component name="glib_main_event_loop" long-name="Glib Main Event Loop API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_main_event_loop/group"/>
-</component>
-<component name="glib_memory_allocation" long-name="Glib Memory Allocation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_allocation/group"/>
-</component>
-<component name="glib_memory_slices" long-name="Glib Memory Slices API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_slices/group"/>
-</component>
-<component name="glib_message_logging" long-name="Glib Message Logging API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_message_logging/group"/>
-</component>
-<component name="glib_miscellaneous_utility_functions" long-name="Glib Miscellaneous Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_miscellaneous_utility_functions/group"/>
-</component>
-<component name="glib_nary_trees" long-name="Glib N-ary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_nary_trees/group"/>
-</component>
-<component name="glib_parameters_and_values" long-name="Glib Parameters and Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_parameters_and_values/group"/>
-</component>
-<component name="glib_quarks" long-name="Glib Quarks API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_quarks/group"/>
-</component>
-<component name="glib_random_numbers" long-name="Glib Random Numbers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_random_numbers/group"/>
-</component>
-<component name="glib_relations_and_tuples" long-name="Glib Relations and Tuples API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_relations_and_tuples/group"/>
-</component>
-<component name="glib_shellrelated_utilities" long-name="Glib Shell-related Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_shellrelated_utilities/group"/>
-</component>
-<component name="glib_signals" long-name="Glib Signals API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_signals/group"/>
-</component>
-<component name="glib_simple_xml_subset_parser" long-name="Glib Simple XML Subset Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_simple_xml_subset_parser/group"/>
-</component>
-<component name="glib_singlylinked_lists" long-name="Glib Singly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_singlylinked_lists/group"/>
-</component>
-<component name="glib_spawning_processes" long-name="Glib Spawning Processes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_spawning_processes/group"/>
-</component>
-<component name="glib_standard_macros" long-name="Glib Standard Macros API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_standard_macros/group"/>
-</component>
-<component name="glib_string_utility_functions" long-name="Glib String Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_string_utility_functions/group"/>
-</component>
-<component name="glib_strings" long-name="Glib Strings API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_strings/group"/>
-</component>
-<component name="glib_thread_pools" long-name="Glib Thread Pools API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_thread_pools/group"/>
-</component>
-<component name="glib_threads" long-name="Glib Threads API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_threads/group"/>
-</component>
-<component name="glib_timers" long-name="Glib Timers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_timers/group"/>
-</component>
-<component name="glib_unicode_manipulation" long-name="Glib Unicode Manipulation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_unicode_manipulation/group"/>
-</component>
-<component name="glib_value_arrays" long-name="Glib Value Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_value_arrays/group"/>
-</component>
-<component name="glib_varargs_value_collection" long-name="Glib Varargs Value Collection API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_varargs_value_collection/group"/>
-</component>
-<component name="gobject" long-name="GObject API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gobject/group"/>
-</component>
-<component name="gparamspec" long-name="GParamSpec API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gparamspec/group"/>
-</component>
-<component name="gtype" long-name="GType API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtype/group"/>
-</component>
-<component name="gtypemodule" long-name="GTypeModule API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypemodule/group"/>
-</component>
-<component name="gtypeplugin" long-name="GTypePlugin API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypeplugin/group"/>
-</component>
-<component name="io_stream_api" long-name="I/O stream API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/io_stream_api/group"/>
-</component>
-<component name="localization_function_api" long-name="Localization Function API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/localization_function_api/group"/>
-</component>
-<component name="math_operations_api" long-name="Math Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/math_operations_api/group"/>
-</component>
-<component name="ossrv_memory_api" long-name="Generic OS Services Memory API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/memory/group"/>
-</component>
-<component name="no_namespace_headers" long-name="No Namespace Headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/no_namespace_headers/group"/>
-</component>
-<component name="openc_headers" long-name="OpenC headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_headers/group"/>
-</component>
-<component name="openc_wrappers" long-name="OpenC wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_wrappers/group"/>
-</component>
-<component name="ssl_general_api" long-name="SSL General API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_general_api/group"/>
-</component>
-<component name="ssl_protocol_methods_api" long-name="SSL Protocol Methods API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_protocol_methods_api/group"/>
-</component>
-<component name="standard_compressiondecompression_api" long-name="Standard Compression/Decompression API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/standard_compressiondecompression_api/group"/>
-</component>
-<component name="stl" long-name="STL API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/stl/group"/>
-</component>
-<component name="thread_api" long-name="Thread API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/thread_api/group"/>
-</component>
-<component name="type_attributes" long-name="Type Attributes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/type_attributes/group"/>
-</component>
-<component name="typeinfo" long-name="Type Info API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/typeinfo/group"/>
-</component>
-<component name="utility_apis" long-name="Utility APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/utility_apis/group"/>
-</component>
-<component name="wide_character_classapis" long-name="Wide character class/apis" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/wide_character_classapis/group"/>
-</component>
-<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">
-<unit bldFile="os/ossrv/ossrv_pub/dbus-glib/group"/>
-</component>
-</collection>
-<collection name="ossrv_plat" long-name="Generic OS Services Platform Interfaces" level="utilities">
-<component name="libutils_apis" long-name="Utility Library APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_plat/libutils/group"/>
-</component>
-</collection>
-<collection name="stdlibs" long-name="Standard Libraries" level="translation">
-<component name="libz" filter="s60" long-name="Z Compression Library">
-<unit bldFile="os/ossrv/stdlibs/libz/group"/>
-</component>
-<component name="libcrypt" filter="s60" long-name="Crypt Library">
-<unit bldFile="os/ossrv/stdlibs/libcrypt/group"/>
-</component>
-</collection>
-<collection name="ssl" long-name="SSL" level="data-services">
-<component name="libcrypto" filter="s60" long-name="Crypto Library">
-<unit bldFile="os/ossrv/ssl/libcrypto/group"/>
-</component>
-<component name="libssl" filter="s60" purpose="development" long-name="SSL Library">
-<unit bldFile="os/ossrv/ssl/libssl/group"/>
-</component>
-</collection>
-<collection name="glib" long-name="GLib" level="utilities">
-<component name="glibbackend" filter="s60" long-name="GLib Backend">
-<unit bldFile="os/ossrv/glib/build/symbian/glibbackend/group"/>
-<!-- Move to here: <unit bldFile="glib/glibbackend/group"/> -->
-</component>
-<component name="libglib" filter="s60" long-name="GLib Library">
-<unit bldFile="os/ossrv/glib/build/symbian/glib/group"/>
-<!-- Move to here: <unit bldFile="glib/libglib/group"/> -->
-</component>
-<component name="libgthread" filter="s60" long-name="Libg Thread">
-<unit bldFile="os/ossrv/glib/build/symbian/gthread/group"/>
-<!-- Move to here: <unit bldFile="glib/libgthread/group"/> -->
-</component>
-<component name="libgmodule" filter="s60" long-name="Libg Module">
-<unit bldFile="os/ossrv/glib/build/symbian/gmodule/group"/>
-<!-- Move to here: <unit bldFile="glib/libgmodule/group"/> -->
-</component>
-<component name="libgobject" filter="s60" long-name="Libg Object">
-<unit bldFile="os/ossrv/glib/build/symbian/gobject/group"/>
-<!-- Move to here: <unit bldFile="glib/libgobject/group"/> -->
-</component>
-</collection>
-<collection name="stdcpp" long-name="C++ Standard Library" level="translation">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="stdcpp_build" filter="s60" long-name="Stdcpp">
-<unit bldFile="os/ossrv/stdcpp/group"/>
-</component>
-</collection>
-<collection name="ofdbus" long-name="Open Foundation D-Bus" level="utilities">
-<component name="dbus" filter="s60" long-name="D-Bus">
-<unit bldFile="os/ossrv/ofdbus/dbus/group"/>
-</component>
-<component name="dbus-glib" filter="s60" long-name="D-Bus GLib">
-<unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
-</component>
-<component name="ofdbus_rom" filter="s60" long-name="D-Bus ROM">
-<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory
- Consider moving IBY file to one of the above as well and removing this component entirely -->
-<unit bldFile="os/ossrv/ofdbus/group"/>
-</component>
-</collection>
-<collection name="utilitylibraries" long-name="Utility Libraries" level="encoding">
-<component name="libutils" filter="s60" long-name="Utility Library">
-<unit bldFile="os/ossrv/utilitylibraries/libutils/group"/>
-</component>
-</collection>
-<collection name="genericservices" long-name="Generic Services" level="utilities">
-<component name="s60compatibilityheaders" long-name="S60 Compatibility Headers" filter="gt" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp" version="tb101sf"/>
-</component>
-<component name="mimerecognitionfw" long-name="MIME Recognition Framework" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/mimerecognitionfw/group" mrp="os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
-</component>
-<component name="systemagent" long-name="System Agent" introduced="9.0" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/systemagent/group" mrp="os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
-</component>
-<component name="taskscheduler" long-name="Task Scheduler" introduced="6.0" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/taskscheduler/group" mrp="os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
-</component>
-<component name="activebackupclient" long-name="Active Backup Client" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/activebackupclient/group" mrp="os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
-</component>
-<component name="syslibsdocs" long-name="Syslibs Documentation" purpose="development" class="doc">
-<unit mrp="os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
-</component>
-<component name="httputils" long-name="HTTP Utilities Library" introduced="6.2" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/httputils/group" mrp="os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
-</component>
-</collection>
-<collection name="syslibsapitest" long-name="SysLibs API Tests" level="utilities"/>
-<collection name="compressionlibs" long-name="Compression Libraries" level="data-services">
-<component name="ziplib" long-name="Zip Compression Library" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/ossrv/compressionlibs/ziplib/group" mrp="os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
-</component>
-</collection>
-<collection name="genericopenlibs" long-name="Generic Open Libraries" level="translation">
-<component name="cstdlib" long-name="C Standard Library" introduced="ER5" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/cstdlib/group" mrp="os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
-</component>
-<component name="cppstdlib" long-name="C++ Standard Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/cppstdlib/group" mrp="os/ossrv/genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
-</component>
-<component name="openenvcore" long-name="Open Environment Core" introduced="^2" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/openenvcore/group" mrp="os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
-</component>
-<component name="posixrealtimeextensions" long-name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/posixrealtimeextensions/group" mrp="os/ossrv/genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
-</component>
-<component name="liboil" long-name="Liboil" introduced="^4" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/liboil/group" mrp="os/ossrv/genericopenlibs/liboil/group/oeaddons_liboil.mrp"/>
-</component>
-</collection>
-<collection name="lowlevellibsandfws" long-name="Low Level Libraries and Frameworks" level="app-libs">
-<component name="pluginfw" long-name="Plugin Framework" introduced="6.2" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp" version="3"/>
-</component>
-<component name="apputils" long-name="Application Utilities" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/apputils/group" mrp="os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
-</component>
-<component name="genericusabilitylib" long-name="Generic Usability Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/genericusabilitylib/group" mrp="os/ossrv/lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
-</component>
-</collection>
-<collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
-<component name="ossrv_build" filter="s60" long-name="Generic OS Services Build">
-<!-- exports should be moved to individual components -->
-<unit bldFile="os/ossrv/group"/>
-</component>
-<component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="featuremgmt" long-name="Feature Management" level="framework">
-<component name="featuremgr" long-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 name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/persistentdata/featuremgmt/featureregistry/group" mrp="os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
-</component>
-</collection>
-<collection name="loggingservices" long-name="Logging Services" level="server">
-<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">
-<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">
-<unit bldFile="os/persistentdata/loggingservices/rfilelogger/group" mrp="os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
-</component>
-</collection>
-<collection name="traceservices" long-name="Trace Services" level="server">
-<component name="commsdebugutility" long-name="Comms Debug Utility" introduced="7.0s" purpose="optional">
-<unit bldFile="os/persistentdata/traceservices/commsdebugutility/group" mrp="os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
-</component>
-<component name="tracefw" long-name="Trace Framework" introduced="9.2" purpose="development">
-<unit bldFile="os/persistentdata/traceservices/tracefw/ulogger/group" mrp="os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
-</component>
-</collection>
-<collection name="persistentstorage" long-name="Persistent Storage" level="framework">
-<component name="store" long-name="Store" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/store/group" mrp="os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
-</component>
-<component name="dbms" long-name="DBMS" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/dbms/group" mrp="os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
-</component>
-<component name="centralrepository" long-name="Central Repository" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/persistentdata/persistentstorage/centralrepository/group" mrp="os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
-</component>
-<component name="sql" long-name="SQL" introduced="9.3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sql/GROUP" mrp="os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
-</component>
-<component name="sqlite3api" long-name="SQLite 3 API" introduced="^3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sqlite3api/GROUP" mrp="os/persistentdata/persistentstorage/sqlite3api/GROUP/syslibs_sqlite3.mrp"/>
-</component>
-</collection>
-<collection name="persistentdata_info" long-name="Persistent Data Services Info" level="app-if">
-<component name="persistentdata_metadata" long-name="Persistent Data Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/persistentdata/persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
-<component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
-</component>
-<component name="common_platform_security_definitions_api" long-name="Common Platform Security Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group"/>
-</component>
-<component name="feature_discovery_api" long-name="Feature Discovery API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/group"/>
-</component>
-<component name="platform_environment_api" long-name="Platform Environment API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_environment_api/group"/>
-</component>
-<component name="sensor_channel_api" long-name="Sensor Channel API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_channel_api/group"/>
-</component>
-<component name="sensor_definitions_api" long-name="Sensor Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_definitions_api/group"/>
-</component>
-<component name="version_info_api" long-name="Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/group"/>
-</component>
-<component name="accessory_monitoring_api" long-name="Accessory Monitoring API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/group"/>
-</component>
-<component name="haptics_api" long-name="Haptics API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/haptics_api/group"/>
-</component>
-<component name="sensor_data_compensator_api" long-name="Sensor Data Compensator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
-</component>
-</collection>
-<collection name="devicesrv_plat" long-name="Device Services Platform Interfaces" level="app-if">
-<component name="configuration_file_parser_api" long-name="Configuration File Parser API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/configuration_file_parser_api/group"/>
-</component>
-<component name="dos_extension_plugin_api" long-name="DOS Extension Plug-In API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_plugin_api/group"/>
-</component>
-<component name="mediator_command_initiator_api" long-name="Mediator Command Initiator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_initiator_api/group"/>
-</component>
-<component name="syslangutil_api" long-name="SysLangUtil API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/syslangutil_api/group"/>
-</component>
-<component name="wakeup_alarm_api" long-name="Wakeup Alarm API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/wakeup_alarm_api/group"/>
-</component>
-<component name="disk_and_memory_level_keys_api" long-name="Disk and Memory Level Keys API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_and_memory_level_keys_api/group"/>
-</component>
-<component name="mediator_plugin_api" long-name="Mediator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_plugin_api/group"/>
-</component>
-<component name="headset_status_api" long-name="Headset Status API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/headset_status_api/group"/>
-</component>
-<component name="system_startup_extension_plugin_api" long-name="System Startup Extension Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/system_startup_extension_plugin_api/group"/>
-</component>
-<component name="sensor_plugin_api" long-name="Sensor Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_plugin_api/group"/>
-</component>
-<component name="accessory_api" long-name="Accessory API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_api/group"/>
-</component>
-<component name="display_language_definition_api" long-name="Display Language Definition API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/display_language_definition_api/group"/>
-</component>
-<component name="mediator_command_responder_api" long-name="Mediator Command Responder API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_responder_api/group"/>
-</component>
-<component name="accessory_policy_definitions_api" long-name="Accessory Policy Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_definitions_api/group"/>
-</component>
-<component name="hw_settings_api" long-name="Hardware Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/hw_settings_api/group"/>
-</component>
-<component name="mediator_domain_definitions_api" long-name="Mediator Domain Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_domain_definitions_api/group"/>
-</component>
-<component name="sensor_extension_api" long-name="Sensor Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_extension_api/group"/>
-</component>
-<component name="accessory_plugin_api" long-name="Accessory Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_plugin_api/group"/>
-</component>
-<component name="sae_api" long-name="SAE API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sae_api/group"/>
-</component>
-<component name="accessory_control_api" long-name="Accessory Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_control_api/group"/>
-</component>
-<component name="mediator_static_registration_api" long-name="Mediator Static Registration API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_static_registration_api/group"/>
-</component>
-<component name="accessory_key_event_handling_api" long-name="Accessory Key Event Handling API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_key_event_handling_api/group"/>
-</component>
-<component name="mediator_notification_api" long-name="Mediator Notification API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_notification_api/group"/>
-</component>
-<component name="accessory_policy_utility_api" long-name="Accessory Policy Utility API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_utility_api/group"/>
-</component>
-<component name="common_dsy_plugin_api" long-name="Common DSY Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/common_dsy_plugin_api/group"/>
-</component>
-<component name="remote_control_extension_api" long-name="Remote Control Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/remote_control_extension_api/group"/>
-</component>
-<component name="sensor_channel_filter_api" long-name="Sensor Channel Filter API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_channel_filter_api/group"/>
-</component>
-<component name="dos_extension_api" long-name="DOS Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_api/group"/>
-</component>
-<component name="accessory_audio_control_api" long-name="Accessory Audio Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_audio_control_api/group"/>
-</component>
-<component name="mediator_event_consumer_api" long-name="Mediator Event Consumer API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_consumer_api/group"/>
-</component>
-<component name="shared_data_api" long-name="Shared Data API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/shared_data_api/group"/>
-</component>
-<component name="accessory_settings_api" long-name="Accessory Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_settings_api/group"/>
-</component>
-<component name="accessory_bluetooth_control_api" long-name="Accessory Bluetooth Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_bluetooth_control_api/group"/>
-</component>
-<component name="extended_version_info_api" long-name="Extended Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_api/group"/>
-</component>
-<component name="mediator_event_provider_api" long-name="Mediator Event Provider API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_provider_api/group"/>
-</component>
-<component name="tv_out_config_api" long-name="TV Out Config API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_config_api/group"/>
-</component>
-<component name="tspclientmapper_api" long-name="TSP Client Mapper API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tspclientmapper_api/group"/>
-</component>
-<component name="powersave_api" long-name="Power Save API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_api/group"/>
-</component>
-<component name="powersave_definitions_api" long-name="Power Save Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_definitions_api/group"/>
-</component>
-<component name="powersave_plugin_api" long-name="Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_plugin_api/group"/>
-</component>
-<component name="extended_version_info_plugin_api" long-name="Extended Version Info Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_plugin_api/group"/>
-</component>
-<component name="haptics_plugin_api" long-name="Haptics Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_plugin_api/group"/>
-</component>
-<component name="haptics_effect_data_getter_plugin_api" long-name="Haptics Effect Data Getter Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
-</component>
-<component name="haptics_packetizer_plugin_api" long-name="Haptics Packetizer Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_packetizer_plugin_api/group"/>
-</component>
-<component name="tiltcompensation_api" long-name="Tilt Compensation API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tiltcompensation_api/group"/>
-</component>
-<component name="disk_notification_handler_api" long-name="Disk Notification Handler API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_notification_handler_api/group"/>
-</component>
-<component name="accessory_policy_usb_audio_api" long-name="Accessory Policy USB Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_usb_audio_api/group"/>
-</component>
-<component name="accessory_policy_hdmi_audio_api" long-name="Accessory Policy HDMI Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_hdmi_audio_api/group"/>
-</component>
-<component name="sensor_data_compensator_plugin_api" long-name="Sensor Data Compensator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
-</component>
-<component name="ddc_access_api" long-name="DDC Access API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/ddc_access_api/group"/>
-</component>
-<component name="tv_out_behaviour_api" long-name="TV Out Behaviour API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_behaviour_api/group"/>
-</component>
-</collection>
-<collection name="accessoryservices" long-name="Accessory Services" level="framework">
-<component name="accessorymonitor" filter="s60" long-name="Accessory Monitor">
-<unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/group"/>
-</component>
-<component name="accessoryremotecontrol" filter="s60" long-name="Accessory Remote Control">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
-</component>
-<component name="accessoryserver" filter="s60" long-name="Accessory Server">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryserver/group"/>
-</component>
-<component name="pluggeddisplay" filter="s60" long-name="Plugged Display" introduced="^3">
-<unit bldFile="os/devicesrv/accessoryservices/pluggeddisplay/group"/>
-</component>
-<component name="headsetstatusapi" filter="s60" long-name="Headset Status API">
-<unit bldFile="os/devicesrv/accessoryservices/headsetstatusapi/group"/>
-</component>
-<component name="tspclientmapper" filter="s60" long-name="TSP Client Mapper">
-<unit bldFile="os/devicesrv/accessoryservices/tspclientmapper/group"/>
-</component>
-<component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional">
-<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
-</component>
-<component name="gid_pc_tool" filter="s60" long-name="Generic ID PC Tool" class="tool PC">
-<unit bldFile="os/devicesrv/accessoryservices/gid_pc_tool/group"/>
-</component>
-</collection>
-<collection name="commonservices" long-name="Common Services" level="app-if">
-<component name="commonengine" filter="s60" long-name="Common Engine">
-<unit bldFile="os/devicesrv/commonservices/commonengine/group"/>
-</component>
-<component name="commonengineresources" filter="s60" long-name="Common Engine Resources" class="config">
-<unit bldFile="os/devicesrv/commonservices/commonengineresources/group"/>
-</component>
-<component name="platformenv" filter="s60" long-name="Platform Environment">
-<unit bldFile="os/devicesrv/commonservices/platformenv/group"/>
-</component>
-<component name="sysutil" long-name="System Utilities" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/sysutil/group" mrp="os/devicesrv/commonservices/sysutil/group/sysutil.mrp"/>
-</component>
-<component name="activitymanager" long-name="Activity Manager" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/activitymanager/group" mrp="os/devicesrv/commonservices/activitymanager/group/activitymanager.mrp"/>
-</component>
-</collection>
-<collection name="dosservices" long-name="Domestic Operating System Services" level="hw-if">
-<component name="commondsy" filter="s60" long-name="Common DSY" plugin="Y">
-<unit bldFile="os/devicesrv/dosservices/commondsy/group"/>
-</component>
-<component name="dosserver" filter="s60" long-name="Domestic OS Server">
-<unit bldFile="os/devicesrv/dosservices/dosserver/group"/>
-</component>
-</collection>
-<collection name="sensorservices" long-name="Sensor Services" level="framework">
-<component name="sensorserver" filter="s60" long-name="Sensor Server">
-<unit bldFile="os/devicesrv/sensorservices/sensorserver/group"/>
-</component>
-<component name="orientationssy" filter="s60" long-name="Orientation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/orientationssy/group"/>
-</component>
-<component name="tiltcompensationssy" filter="s60" long-name="Tilt Compensation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/tiltcompensationssy/group"/>
-</component>
-<component name="sensordatacompensator" filter="s60" long-name="Sensor Data Compensator">
-<unit bldFile="os/devicesrv/sensorservices/sensordatacompensator/group"/>
-</component>
-</collection>
-<collection name="hwrmhaptics" long-name="HWRM Haptics" level="plugin">
-<component name="hapticseffectdatagetterfw" filter="s60" long-name="Haptics Effect Data Getter Framework">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
-</component>
-<component name="hapticspluginservice" filter="s60" long-name="Haptics Plugin Service">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
-</component>
-<component name="hapticspacketizer" filter="s60" long-name="Haptics Packetizer">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
-</component>
-<component name="hapticspluginmanager" filter="s60" long-name="Haptics Plugin Manager">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
-</component>
-<component name="hapticsserver" filter="s60" long-name="Haptics Server">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsserver/group"/>
-</component>
-<component name="hapticsclient" filter="s60" long-name="Haptics Client">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsclient/group"/>
-</component>
-<component name="hwrmhaptics_build" filter="s60" long-name="HWRM Haptics Build">
-<!-- move these exports into the appropriate above components and delete this component-->
-<unit bldFile="os/devicesrv/hwrmhaptics/group"/>
-</component>
-</collection>
-<collection name="mediator" long-name="Mediator" level="app-if">
-<!--collection is really a component. Move it down a directory -->
-<component name="mediator_build" filter="s60" long-name="Mediator Build">
-<unit bldFile="os/devicesrv/mediator/group"/>
-</component>
-</collection>
-<collection name="psmservices" long-name="Power Save Mode Services" level="app-if">
-<component name="psmserver" filter="s60" long-name="PSM Server">
-<unit bldFile="os/devicesrv/psmservices/psmserver/group"/>
-</component>
-</collection>
-<collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
-<component name="hwrmfmtxwatcherplugin" filter="s60" long-name="HWRM FM Transmitter Watcher Plugin" plugin="Y">
-<unit bldFile="os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
-</component>
-<component name="hwrmtargetmodifierplugin" filter="s60" long-name="HWRM Target Modifier Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build,
- may need to -->
-<!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
-</component>
-<component name="vibractrl" filter="s60" long-name="Vibra Control" deprecated="9.1">
-<unit bldFile="os/devicesrv/resourcemgmt/vibractrl/group"/>
-</component>
-<component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="^2" purpose="optional">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
-</component>
-<component name="hwresourcesmgrconfig" long-name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
-</component>
-<component name="resourcemgmt_build" filter="s60" long-name="Resource Management Build">
-<!-- Move exports to a self-contained component.
- This needs to be kept around until configuration is in place -->
-<unit bldFile="os/devicesrv/resourcemgmt/group"/>
-</component>
-<component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
-</component>
-</collection>
-<collection name="sysstatemgmt" long-name="System State Management" level="server">
-<component name="ssmmapperutility" filter="s60" long-name="SSM Mapper Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmmapperutility/group"/>
-</component>
-<component name="ssmpolicyplugins" filter="s60" long-name="SSM Policy Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmpolicyplugins/group"/>
-</component>
-<component name="ssmutilityplugins" filter="s60" long-name="SSM Utility Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmutilityplugins/group"/>
-</component>
-<component name="ssmcmdlists" filter="s60" long-name="SSM Command Lists" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcmdlists/group"/>
-</component>
-<component name="ssmcustcmds" filter="s60" long-name="SSM Custom Commands" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcustcmds/group"/>
-</component>
-<component name="syslangutil" filter="s60" long-name="System Language Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/syslangutil/group"/>
-</component>
-<component name="sysrestart" filter="s60" long-name="System Restart" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysrestart/group"/>
-</component>
-<component name="sysuiprovider" filter="s60" long-name="System UI Provider" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysuiprovider/group"/>
-</component>
-<component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/group" mrp="os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
-</component>
-<component name="systemstatemgr" long-name="System State Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
-</component>
-<component name="systemstateplugins" long-name="System State Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
-</component>
-<component name="systemstatereferenceplugins" long-name="System State Reference Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
-</component>
-</collection>
-<collection name="resourceinterfaces" long-name="Resource Interfaces" level="hw-if">
-<component name="fmtransmittercontrol" long-name="FM Transmitter Control" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group" mrp="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
-</component>
-</collection>
-<collection name="systemhealthmanagement" long-name="System Health Management" level="server">
-<component name="systemhealthmgr" long-name="System Health Manager" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
-</component>
-</collection>
-<collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if"/>
-<collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
-<component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
-<collection name="authorisation" long-name="Authorisation" level="utilities">
-<component name="userpromptservice" long-name="User Prompt Service" introduced="^3" purpose="mandatory">
-<unit bldFile="os/security/authorisation/userpromptservice/group" mrp="os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
-</component>
-<component name="userpromptutils" long-name="User Prompt Utils" introduced="^3" purpose="optional">
-<unit bldFile="os/security/authorisation/userpromptutils/group" mrp="os/security/authorisation/userpromptutils/group/security_ups_utils.mrp"/>
-</component>
-</collection>
-<collection name="contentmgmt" long-name="Content Management" level="utilities">
-<component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
-<unit bldFile="os/security/contentmgmt/contentaccessfwfordrm/group" mrp="os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
-</component>
-<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">
-<unit bldFile="os/security/crypto/weakcryptospi/group" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
-</component>
-<component name="strongcryptospi" long-name="Strong Crypto SPI" filter="gt" introduced="^3" purpose="optional">
-<unit bldFile="os/security/crypto/weakcryptospi/strong" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
-</component>
-</collection>
-<collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
-<component name="securityutils" long-name="Security Utils" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/securityutils/group" mrp="os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
-</component>
-<component name="securitydocs" long-name="Security Documentation" purpose="development" class="doc">
-<unit mrp="os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
-</component>
-<component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
-</component>
-<component name="securitycommonutils" long-name="Security Common Utils" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/security/cryptomgmtlibs/securitycommonutils/group" mrp="os/security/cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
-</component>
-</collection>
-<collection name="securityanddataprivacytools" long-name="Security and Data Privacy Tools" level="services">
-<component name="securityconfig" long-name="Security Config" introduced="9.1" purpose="optional">
-<unit bldFile="os/security/securityanddataprivacytools/securityconfig/group" mrp="os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
-</component>
-<component name="securitytools" long-name="Security Tools" introduced="^3" purpose="optional" class="PC">
-<unit bldFile="os/security/securityanddataprivacytools/securitytools/group" mrp="os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
-</component>
-</collection>
-<collection name="cryptoplugins" long-name="Crypto Plugins" level="plugins">
-<component name="cryptospiplugins" long-name="Crypto SPI Plugins" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/security/cryptoplugins/cryptospiplugins/group" mrp="os/security/cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
-</component>
-</collection>
-<collection name="cryptoservices" long-name="Crypto Services" level="plugins">
-<component name="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/certificateandkeymgmt/group" mrp="os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
-</component>
-<component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
-</component>
-<component name="browserrootcertificates" long-name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
-<unit mrp="os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
-</component>
-<component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/asnpkcs/group" mrp="os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
-</component>
-</collection>
-<collection name="security_info" long-name="OS Security Info" level="utilities">
-<component name="security_metadata" long-name="OS Security Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/security/security_info/security_metadata/security_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
-<collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
-<component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
-</component>
-<component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
-</component>
-<component name="simulationpositioningmodule" long-name="Simulation Positioning Module" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
-</component>
-<component name="gpspositioningmodule" long-name="GPS/A-GPS Positioning Module" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/gpspositioningmodule/group" mrp="os/lbs/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
-</component>
-<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>
-</collection>
-<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
-<component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
-</component>
-</collection>
-<collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
-<component name="locationserver" long-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 name="networkrequesthandler" long-name="Network Request Handler" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
-</component>
-</collection>
-<collection name="lbstest" long-name="Locating Services Tests" level="application-interface">
-<component name="locationprotocoltest" long-name="Location Protocol Tests" introduced="9.2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/lbstest/locationprotocoltest/group" mrp="os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
-</component>
-</collection>
-<collection name="locationmgmt" long-name="Location Management" level="management">
-<component name="locmonitor" long-name="Location Monitor" introduced="^3" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
-</component>
-<component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/agpslocationmgr/group" mrp="os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
-</component>
-<component name="networklocationmgr" long-name="Network Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/networklocationmgr/group" mrp="os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
-</component>
-<component name="locationcore" long-name="Location Core" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locationcore/group" mrp="os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
-</component>
-<component name="networkgateway" long-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 name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
-<component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
-</component>
-<component name="suplrrlpasn1" filter="sf_build" long-name="SUPL RRLP ASN1 Parser">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
-</component>
-</collection>
-<collection name="lbsapitest" long-name="Location API Tests" level="application-interface"/>
-<collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
-<component name="lbs_metadata" long-name="Locating Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commsfw" level="services" long-name="Communications Framework" levels="server support framework process app-if">
-<collection name="commsprocess" long-name="Comms Process" level="process">
-<component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/commsfw/commsprocess/commsrootserverconfig/group" mrp="os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
-</component>
-</collection>
-<collection name="commsconfig" long-name="Comms Config" level="process">
-<component name="commsdatabase" long-name="Comms Database" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
-</component>
-<component name="commsdatabaseshim" long-name="Comms Database Shim" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/commsfw/commsconfig/commsdatabaseshim/group" mrp="os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
-</component>
-</collection>
-<collection name="datacommsserver" long-name="Data Comms Server" level="framework">
-<component name="esockserver" long-name="ESock Server" purpose="mandatory">
-<unit bldFile="os/commsfw/datacommsserver/esockserver/group" mrp="os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp" version="3"/>
-</component>
-<component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/group" mrp="os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
-</component>
-<component name="networkingdialogstub" long-name="Networking Dialog Stub" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/default" mrp="os/commsfw/datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
-</component>
-<component name="networkcontroller" long-name="Network Controller" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/datacommsserver/networkcontroller/group" mrp="os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
-</component>
-</collection>
-<collection name="serialserver" long-name="Serial Server" level="server">
-<component name="serialportcsy" long-name="Serial Port CSY" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/serialserver/serialportcsy" mrp="os/commsfw/serialserver/serialportcsy/ser-comms_serialportcsy.mrp"/>
-</component>
-<component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" purpose="development">
-<unit bldFile="os/commsfw/serialserver/packetloopbackcsy/group" mrp="os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
-</component>
-<component name="c32serialserver" long-name="C32 Serial Server" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/commsfw/serialserver/c32serialserver/group" mrp="os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
-</component>
-<component name="c32serialserverconfig" long-name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config">
-<unit bldFile="os/commsfw/serialserver/c32serialserverconfig" mrp="os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
-</component>
-<component name="c32serialserverdocs" long-name="C32 Serial Server Documentation" purpose="development" class="doc">
-<unit mrp="os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
-</component>
-</collection>
-<collection name="commsfwutils" long-name="Comms Framework Utilities" level="framework">
-<component name="commsbufs" long-name="Comms Buffers" introduced="^3" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwutils/commsbufs/group" mrp="os/commsfw/commsfwutils/commsbufs/group/comms-infras_commsbufs.mrp"/>
-</component>
-</collection>
-<collection name="commsfw_info" long-name="Comms Framework Info" level="app-if">
-<component name="commsinfrastructuredocs" long-name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
-<unit mrp="os/commsfw/commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
-</component>
-<component name="commsfw_metadata" long-name="Communications Framework Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/commsfw/commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
-</component>
-</collection>
-<collection name="commsfwsupport" long-name="Comms Framework Support" level="support">
-<component name="commselements" long-name="Comms Elements" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwsupport/commselements/group" mrp="os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
-</component>
-</collection>
-<collection name="commsinfrastructureapitest" long-name="Comms-Infras API Tests" level="app-if">
-<component name="commsinfrastructuresvs" long-name="Comms Infrastructure Verification Suite" introduced="^3" purpose="development">
-<unit mrp="os/commsfw/commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
-</component>
-</collection>
-<collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
-<component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
-</component>
-<component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" purpose="mandatory" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
-</component>
-<component name="commstools" long-name="Comms Tools" introduced="^3" purpose="development" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/commstools/group" mrp="os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
-</component>
-</collection>
-</block>
-<block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
-<component name="internetsockets" long-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>
-<collection name="tcpiputils" long-name="TCP/IP Utilities" level="plugin">
-<component name="dnd" long-name="DND" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/dnd/group" mrp="os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
-</component>
-<component name="dhcp" long-name="DHCP" introduced="8.0" purpose="optional">
-<unit bldFile="os/networkingsrv/tcpiputils/dhcp/group" mrp="os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
-</component>
-<component name="networkaddressandporttranslation" long-name="Network Address and Port Translation" introduced="^2" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
-</component>
-<component name="punycodeconv" long-name="Punycode Converter" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/punycodeconv/group" mrp="os/networkingsrv/tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
-</component>
-</collection>
-<collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
-<component name="nullagt" long-name="NULL AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/nullagt/group" mrp="os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
-</component>
-<component name="genericscprparameters" long-name="Generic SCPR Parameters" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/linklayercontrol/genericscprparameters/group" mrp="os/networkingsrv/linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
-</component>
-<component name="mbmsparameters" long-name="MBMS Parameters" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/mbmsparameters/group" mrp="os/networkingsrv/linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
-</component>
-<component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
-<unit bldFile="os/networkingsrv/linklayercontrol/networkinterfacemgr/group" mrp="os/networkingsrv/linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp" version="2"/>
-</component>
-</collection>
-<collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
-<component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
-</component>
-<component name="pppnif" long-name="PPP NIF" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/pppnif/group" mrp="os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp" version="2"/>
-</component>
-<component name="slipnif" long-name="SLIP NIF" purpose="development" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/slipnif/group" mrp="os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
-</component>
-<component name="tunnelnif" long-name="Tunnel NIF" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
-</component>
-</collection>
-<collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
-<component name="packetlogger" long-name="Packet Logger" introduced="8.1" purpose="development">
-<unit bldFile="os/networkingsrv/linklayerutils/packetlogger/group" mrp="os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
-</component>
-</collection>
-<collection name="networkcontrol" long-name="Network Control" level="plugin">
-<component name="qoslib" long-name="QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/qoslib/group" mrp="os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
-</component>
-<component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/pfqoslib/group" mrp="os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
-</component>
-<component name="qosfwprt" long-name="QoS Framework PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
-</component>
-<component name="qosipscpr" long-name="QoS IP SCPR" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosipscpr/group" mrp="os/networkingsrv/networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
-</component>
-<component name="ipnetworklayer" long-name="IP Network Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/ipnetworklayer/group" mrp="os/networkingsrv/networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
-</component>
-<component name="iptransportlayer" long-name="IP Transport Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/iptransportlayer/group" mrp="os/networkingsrv/networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
-</component>
-<component name="commsuserpromptmgr" long-name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkcontrol/commsuserpromptmgr/group" mrp="os/networkingsrv/networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
-</component>
-</collection>
-<collection name="networkprotocols" long-name="Network Protocols" level="plugin">
-<component name="ipeventnotifier" long-name="IP Event Notifier" introduced="8.1" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
-</component>
-<component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
-</component>
-<component name="iphook" long-name="IP Hook" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
-</component>
-<component name="mobileip" long-name="Mobile IP" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/mobileip/group" mrp="os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
-</component>
-<component name="dnsproxy" long-name="DNS Proxy" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/networkprotocols/dnsproxy/group" mrp="os/networkingsrv/networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
-</component>
-</collection>
-<collection name="networksecurity" long-name="Network Security" level="framework">
-<component name="tls" long-name="TLS" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tls/group" mrp="os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
-</component>
-<component name="tlsprovider" long-name="TLS Provider" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tlsprovider/group" mrp="os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
-</component>
-<component name="ipsec" long-name="IPsec" introduced="7.0" purpose="optional">
-<unit bldFile="os/networkingsrv/networksecurity/ipsec/group" mrp="os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
-</component>
-</collection>
-<collection name="networkingtestandutils" long-name="Networking Test and Utils" level="app-if">
-<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">
-<!-- production component: contains the IBY files -->
-<unit bldFile="os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
-</component>
-<component name="networkingdocs" long-name="Networking Documentation" purpose="development" class="doc">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
-</component>
-<component name="networkingsrv_metadata" long-name="Networking Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
-<component name="predictorcompression" long-name="Predictor Compression" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wlan" level="services" long-name="WLAN" levels="hw low mid high tools test">
-<collection name="wlan_plat" long-name="WLAN Platform Interfaces" level="test">
-<component name="wlan_dbif_api" long-name="WLAN DBIF API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_dbif_api/group"/>
-</component>
-<component name="wlan_hal_api" long-name="WLAN HAL API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hal_api/group"/>
-</component>
-<component name="wlan_management_api" long-name="WLAN Management API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_management_api/group"/>
-</component>
-<component name="wlan_device_settings_api" long-name="WLAN Device Settings API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_device_settings_api/group"/>
-</component>
-<component name="wlan_control_api" long-name="WLAN Control API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_control_api/group"/>
-</component>
-<component name="wlan_hw_initialization_data_api" long-name="WLAN Hardware Initialization Data API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hw_initialization_data_api/group"/>
-</component>
-<component name="wlan_power_save_plugin_api" long-name="WLAN Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_power_save_plugin_api/group"/>
-</component>
-<component name="wlan_info_api" long-name="WLAN Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_info_api/group"/>
-</component>
-<component name="wlan_agent_hotspot_plugin_api" long-name="WLAN Agent Hotspot Plug-in API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
-</component>
-<component name="wlan_osa_api" long-name="WLAN OSA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_osa_api/group"/>
-</component>
-<component name="wlan_spia_api" long-name="WLAN SPIA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_spia_api/group"/>
-</component>
-<component name="wlan_hpa_api" long-name="WLAN HPA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hpa_api/group"/>
-</component>
-<component name="wlan_eapol_plugin_api" long-name="WLAN EAPOL Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_eapol_plugin_api/group"/>
-</component>
-<component name="wlan_generic_plugin_api" long-name="WLAN Generic Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_generic_plugin_api/group"/>
-</component>
-<component name="wlan_aws_plugin_api" long-name="WLAN AWS Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_aws_plugin_api/group"/>
-</component>
-</collection>
-<collection name="wlan_pub" long-name="WLAN Public Interfaces" level="test">
-<component name="wlan_sdk_info_api" long-name="WLAN SDK Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_pub/wlan_sdk_info_api/group"/>
-</component>
-</collection>
-<collection name="wlan_bearer" long-name="WLAN Bearer" level="hw">
-<component name="wlanpsmplugin" filter="s60" long-name="WLAN PSM Plugin" plugin="Y">
-<unit bldFile="os/wlan/wlan_bearer/wlanpsmplugin/group"/>
-</component>
-<component name="wlanagent" filter="s60" long-name="WLAN Agent">
-<unit bldFile="os/wlan/wlan_bearer/wlanagent/group"/>
-</component>
-<component name="wlandbif_cd" filter="s60" long-name="WLAN CommsDat interface">
-<unit bldFile="os/wlan/wlan_bearer/wlandbif_cd/group"/>
-</component>
-<!-- should follow component directory rules for stuff in wlan_symbian/ and put in a single component or split up properly -->
-<component name="wlanengine" filter="s60" long-name="WLAN Engine">
-<unit bldFile="os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
-</component>
-<component name="wlanldd" filter="s60" long-name="WLAN LDD">
-<unit bldFile="os/wlan/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
-</component>
-<component name="wlannwif" filter="s60" long-name="WLAN Network Interface">
-<unit bldFile="os/wlan/wlan_bearer/wlannwif/group"/>
-</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="adaptation hw-if plugin framework server app-if">
-<collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
-<component name="basebandchanneladaptor" long-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 name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
-<component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
-</component>
-</collection>
-<collection name="smsprotocols" long-name="SMS Protocols" level="framework">
-<component name="smsstack" long-name="SMS Stack" introduced="6.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/cellularsrv/smsprotocols/smsstack/group" mrp="os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
-</component>
-</collection>
-<collection name="telephonyprotocols" long-name="Telephony Protocols" level="framework">
-<component name="csdagt" long-name="CSD AGT" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/csdagt/group" mrp="os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
-</component>
-<component name="psdagt" long-name="PSD AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/psdagt/group" mrp="os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
-</component>
-<component name="gprsumtsqosprt" long-name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
-</component>
-<component name="gprsumtsqosinterface" long-name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
-</component>
-<component name="qosextnapi" long-name="QoS Extn API" introduced="9.2" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
-</component>
-<component name="secondarypdpcontextumtsdriver" long-name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
-</component>
-<component name="qos3gppcpr" long-name="QoS 3GPP CPR" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
-</component>
-<component name="pdplayer" long-name="PDP Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/pdplayer/group" mrp="os/cellularsrv/telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
-</component>
-<component name="rawipnif" long-name="Raw IP NIF" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserver" long-name="Telephony Server" level="server">
-<component name="etelserverandcore" long-name="ETel Server and Core" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
-</component>
-<component name="etelmultimode" long-name="ETel Multimode" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelmultimode/group" mrp="os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
-</component>
-<component name="etelpacketdata" long-name="ETel Packet Data" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
-</component>
-<component name="etelsimtoolkit" long-name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
-<component name="common_tsy" long-name="Common TSY" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
-</component>
-<component name="licenseetsystub" long-name="Licensee TSY Stub" introduced="^2" purpose="development" filter="sf_build" plugin="Y">
-<unit mrp="os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="os/cellularsrv/telephonyserverplugins/licenseetsystub/group"/>
-</component>
-<component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
-</component>
-<component name="simtsy" long-name="SIM TSY" introduced="7.0" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
-</component>
-<component name="ctsydispatchlayer" long-name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
-</component>
-<component name="simatktsy" long-name="SIMATK TSY" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simatktsy/group" mrp="os/cellularsrv/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
-</component>
-</collection>
-<collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
-<component name="dial" long-name="Dial" deprecated="9.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyutils/dial/group" mrp="os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
-</component>
-<component name="telephonywatchers" long-name="Telephony Watchers" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
-</component>
-<component name="etel3rdpartyapi" long-name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrv_info" long-name="Cellular Baseband Services Info" level="app-if">
-<component name="telephonyconfidentialdocs" long-name="Telephony Confidential Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
-</component>
-<component name="telephonydocs" long-name="Telephony Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
-</component>
-<component name="cellularsrv_metadata" long-name="Cellular Baseband Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
-<component name="mocksy" long-name="MockSY" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if"/>
-</block>
-<block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
-<collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
-<component name="bluetooth_audio_adaptation_api" long-name="Bluetooth Audio Adaptation API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
-</component>
-<component name="bluetooth_power_management_api" long-name="Bluetooth Power Management API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_power_management_api/group"/>
-</component>
-<component name="at_command_handler_plugin_api" long-name="AT Command Handler Plugin API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/at_command_handler_plugin_api/group"/>
-</component>
-</collection>
-<collection name="bluetooth" long-name="Bluetooth Core" level="framework">
-<component name="btstack" long-name="Bluetooth Stack" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btstack" mrp="os/bt/bluetooth/btstack/bluetooth_stack.mrp"/>
-</component>
-<component name="btcomm" long-name="Bluetooth CSY" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetooth/btcomm" mrp="os/bt/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
-</component>
-<component name="btsdp" long-name="Bluetooth SDP" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btsdp" mrp="os/bt/bluetooth/btsdp/bluetooth_sdp.mrp"/>
-</component>
-<component name="btextnotifiers" long-name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btextnotifiers" mrp="os/bt/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
-</component>
-<component name="gavdp" long-name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/gavdp/group" mrp="os/bt/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
-</component>
-<component name="btlogger" long-name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btlogger/group" mrp="os/bt/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
-</component>
-<component name="btdocs" long-name="Bluetooth Documentation" purpose="development" class="doc">
-<unit mrp="os/bt/bluetooth/btdocs/bluetooth_documentation.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothmgmt" long-name="Bluetooth Management" level="plugin">
-<component name="btmgr" long-name="Bluetooth Manager" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btmgr" mrp="os/bt/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
-</component>
-<component name="btconfig" long-name="Bluetooth Config" purpose="optional" class="config">
-<unit bldFile="os/bt/bluetoothmgmt/btconfig" mrp="os/bt/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
-</component>
-<component name="btrom" long-name="Bluetooth ROM" introduced="9.1" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btrom" mrp="os/bt/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
-</component>
-<component name="bluetoothclientlib" long-name="Bluetooth Client Library" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/bluetoothclientlib" mrp="os/bt/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothcommsprofiles" long-name="Bluetooth Comms Profiles" level="app-if">
-<component name="btpan" long-name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetoothcommsprofiles/btpan/group" mrp="os/bt/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
-</component>
-</collection>
-<collection name="bthci" long-name="Host Controller Interface" level="server">
-<component name="bthci2" long-name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bthci/bthci2/group" mrp="os/bt/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
-</component>
-<component name="hciextensioninterface" long-name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bthci/hciextensioninterface" mrp="os/bt/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
-</component>
-<component name="hci2implementations" long-name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bthci/hci2implementations/group" mrp="os/bt/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
-</component>
-</collection>
-<collection name="irda" long-name="IrDA" level="plugin">
-<component name="irdastack" long-name="IrDA Stack" purpose="optional">
-<unit bldFile="os/bt/irda/irdastack/group" mrp="os/bt/irda/irdastack/group/infra-red_irda.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if"/>
-<collection name="atext" long-name="AT Extensions" level="server">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="atext_build" long-name="AT Extension Build" introduced="^3" purpose="optional" filter="s60">
-<unit bldFile="os/bt/atext/group"/>
-</component>
-</collection>
-<collection name="bt_info" long-name="Bluetooth Info" level="app-if">
-<component name="bt_metadata" long-name="Bluetooth Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/bt/bt_info/bt_metadata/bt_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
-<collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
-<!-- usbclientdrivers to be moved here from kernelhwsrv-->
-</collection>
-<collection name="usbmgmt" long-name="USB Management" level="server">
-<component name="usbmgr" long-name="USB Manager" purpose="optional">
-<unit bldFile="os/usb/usbmgmt/usbmgr/group" mrp="os/usb/usbmgmt/usbmgr/group/usb_manager.mrp" version="2"/>
-</component>
-<component name="usbclassandmgrdocs" long-name="USB Class and Manager Documentation" purpose="development" class="doc">
-<unit mrp="os/usb/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
-</component>
-</collection>
-<collection name="usb_info" long-name="USB Info" level="app-if">
-<component name="usb_metadata" long-name="USB Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/usb/usb_info/usb_metadata/usb_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="mm" level="services" long-name="Multimedia" levels="adaptation 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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-</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"/>
-</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"/>
-</component>
-<component name="aac_decoder_config_proxy_api" long-name="AAC Decoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/aac_decoder_config_proxy_api/group"/>
-</component>
-<component name="added_devsound_control_api" long-name="Added DevSound Control API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_api/group"/>
-</component>
-<component name="added_devsound_control_msg_hdlr_api" long-name="Added DevSound Control Msg Hdlr API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_msg_hdlr_api/group"/>
-</component>
-<component name="added_devsound_control_proxy_api" long-name="Added DevSound Control Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_proxy_api/group"/>
-</component>
-<component name="audio_effects_msg_hdlr_api" long-name="Audio Effects Message Handler API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_msg_hdlr_api/group"/>
-</component>
-<component name="audio_effects_proxy_api" long-name="Audio Effects Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_proxy_api/group"/>
-</component>
-<component name="audio_policy_header_api" long-name="Audio Policy Header API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="audio_routing_proxy_api" long-name="Audio Routing Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_routing_proxy_api/group"/>
-</component>
-<component name="custom_interface_builder_api" long-name="Custom Interface Builder API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_builder_api/group"/>
-</component>
-<component name="custom_interface_message_handler_factory_api" long-name="Custom Interface Message Handler Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_message_handler_factory_api/group"/>
-</component>
-<component name="custom_interface_proxy_factory_api" long-name="Custom Interface Proxy Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_proxy_factory_api/group"/>
-</component>
-<component name="custom_interface_utility_api" long-name="Custom Interface Utility API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_utility_api/group"/>
-</component>
-<component name="devsound_adaptation_api" long-name="DevSound Adaptation API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/devsound_adaptation_api/group"/>
-</component>
-<component name="display_posting_api" long-name="Display Posting API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="eaac_plus_decoder_interface_proxy_api" long-name="eAAC Plus Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="error_concealment_interface_proxy_api" long-name="Error Concealment Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
-</component>
-<component name="fm_radio_adaptation_api" long-name="FM Radio Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_decoder_interface_proxy_api" long-name="G711 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_encoder_interface_proxy_api" long-name="G711 Encoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_decoder_interface_proxy_api" long-name="G729 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_encoder_interface_msg_hdlr_api" long-name="G729 Encoder Interface Message Handler API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</component>
-<component name="ilbc_decoder_interface_proxy_api" long-name="Ilbc Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ilbc_encoder_interface_proxy_api" long-name="Ilbc Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="mdf_plugin_uids" long-name="MDF Plug-in UIDs" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/mdf_plugin_uids/group"/>
-</component>
-<component name="multimedia_fourcc_definitions_api" long-name="Multimedia FourCC Definitions API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/multimedia_fourcc_definitions_api/group"/>
-</component>
-<component name="nokia_audio_policy_header_api" long-name="Nokia Audio Policy Header API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/nokia_audio_policy_header_api/group"/>
-</component>
-<component name="nokia_multimedia_fourcc_definitions_api" long-name="Nokia Multimedia Fourcc Definitions API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ra8_decoder_interface_proxy_api" long-name="RA8 Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
-</component>
-<component name="rds_adaptation_api" long-name="RDS Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="restricted_audio_output_proxy_api" long-name="Restricted Audio Output Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="sbc_encoder_interface_proxy_api" long-name="SBC Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/sbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="secure_output_mdf_custom_interface" long-name="Secure Output MDF Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="speech_encoder_config_proxy_api" long-name="Speech Encoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/speech_encoder_config_proxy_api/group"/>
-</component>
-<component name="telephony_audio_routing_client_api" long-name="Telephony Audio Routing Client API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_client_api/group"/>
-</component>
-<component name="telephony_audio_routing_manager_api" long-name="Telephony Audio Routing Manager API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_manager_api/group"/>
-</component>
-<component name="video_buffer_management_mdf_custom_interface" long-name="Video Buffer Management MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_buffer_management_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_rotation_mdf_custom_interface" long-name="Video Decoder Rotation MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_scaling_mdf_custom_interface" long-name="Video Decoder Scaling MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
-</component>
-<component name="video_reclaim_extbuffers_ci" long-name="Video Reclaim Extbuffers Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_reclaim_extbuffers_ci/group"/>
-</component>
-<component name="video_window_control_custom_interface" long-name="Video Window Control Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="wma_decoder_interface_proxy_api" long-name="WMA Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/wma_decoder_interface_proxy_api/group"/>
-</component>
-<component name="eaacplusutil_api" long-name="EAac Plus Util API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/eaacplusutil_api/group"/>
-</component>
-<component name="frametable_api" long-name="Frametable API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/frametable_api/group"/>
-</component>
-</collection>
-<collection name="devsoundextensions" long-name="Devsound Extensions" level="device-fw">
-<component name="drmaudioplayer" filter="s60" long-name="DRM Audio Player">
-<unit bldFile="os/mm/devsoundextensions/drmaudioplayer/group"/>
-</component>
-<component name="mmextfw" filter="s60" long-name="Multimedia Extension Framework">
-<unit bldFile="os/mm/devsoundextensions/mmextfw/group"/>
-</component>
-<component name="audiorouting" filter="s60" long-name="Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/audiorouting/group"/>
-</component>
-<component name="effects" filter="s60" long-name="Effects">
-<unit bldFile="os/mm/devsoundextensions/effects/group"/>
-</component>
-<component name="effectspresets" filter="s60" long-name="Effects Presets">
-<unit bldFile="os/mm/devsoundextensions/effectspresets/group"/>
-</component>
-<component name="effectspresets_utils" filter="s60" long-name="Effects Presets Utils">
-<!-- need to #include the lot from a single bld.inf
- Also move to a standard component location, not under effectspresets -->
-<unit bldFile="os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
-<unit bldFile="os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
-</component>
-<component name="telephonyaudiorouting" filter="s60" long-name="Telephony Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/group"/>
-</component>
-<component name="mmfcustominterfaces" filter="s60" long-name="MMF Custom Interfaces">
-<unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/group"/>
-</component>
-<component name="addeddevsoundcontrol" filter="s60" long-name="Added DevSound Control">
-<unit bldFile="os/mm/devsoundextensions/addeddevsoundcontrol/group"/>
-</component>
-<component name="globalaudiosettings" filter="s60" long-name="Global Audio Settings">
-<unit bldFile="os/mm/devsoundextensions/globalaudiosettings/group"/>
-</component>
-<component name="restrictedaudiooutput" filter="s60" long-name="Restricted Audio Output">
-<unit bldFile="os/mm/devsoundextensions/restrictedaudiooutput/group"/>
-</component>
-<component name="ciextnfactoryplugins" filter="s60" long-name="Custom Interface Extension Factory Plugins" plugin="Y">
-<unit bldFile="os/mm/devsoundextensions/ciextnfactoryplugins/group"/>
-</component>
-</collection>
-<collection name="mdfdevvideoextensions" long-name="MDF Dev Video Extensions" level="device-fw">
-<component name="nga_mdf_postprocessor" long-name="NGA MDF Postprocessor" filter="s60">
-<unit bldFile="os/mm/mdfdevvideoextensions/nga_mdf_postprocessor/group"/>
-</component>
-</collection>
-<collection name="audio" long-name="Audio Codecs" level="middleware">
-<component name="arm_cmmf_codecs" filter="s60" long-name="ARM CMMF Codecs" plugin="Y">
-<unit bldFile="os/mm/audio/arm_cmmf_codecs/group"/>
-</component>
-</collection>
-<collection name="video" long-name="Video Codecs" level="middleware">
-<!-- empty -->
-</collection>
-<collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
-<component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/imagingandcamerafws/imagingfws/group" mrp="os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
-</component>
-<component name="camerafw" long-name="Camera Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/imagingandcamerafws/camerafw/group" mrp="os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
-</component>
-</collection>
-<collection name="mmlibs" long-name="Multimedia Libraries" level="middleware">
-<component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmutilitylib/group" mrp="os/mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
-</component>
-<component name="mmfw" long-name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmfw/group" mrp="os/mm/mmlibs/mmfw/group/multimedia_mmf.mrp"/>
-</component>
-</collection>
-<collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
-<component name="imagingplugins" long-name="Imaging Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/imagingplugins/group" mrp="os/mm/mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
-</component>
-<component name="cameraplugins" long-name="Camera Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/cameraplugins/group" mrp="os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
-</component>
-<component name="lib3gp" long-name="3GP Library" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/mmplugins/lib3gp/group" mrp="os/mm/mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
-</component>
-<component name="mmfwplugins" long-name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/mmfwplugins/group" mrp="os/mm/mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
-</component>
-</collection>
-<collection name="mm_info" long-name="Multimedia Info" level="app-if">
-<component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc">
-<unit mrp="os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
-</component>
-<component name="mm_metadata" long-name="Multimedia Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
-<component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="^2" purpose="development">
-<unit bldFile="os/mm/mmresourcemgmt/mmresctrl/group" mrp="os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
-</component>
-</collection>
-<collection name="mmdevicefw" long-name="Multimedia Device Framework" level="device-fw">
-<component name="mdf" long-name="Media Device Framework" introduced="9.2" purpose="mandatory">
-<unit bldFile="os/mm/mmdevicefw/mdf/group" mrp="os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
-</component>
-<component name="speechrecogsupport" long-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 name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
-<component name="videorenderer" long-name="Video Renderer" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/mmswadaptation/videorenderer/group" mrp="os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
-</component>
-</collection>
-<collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw"/>
-<collection name="omxil" long-name="OpenMAX IL" level="hw-if">
-<component name="omxilapi" long-name="OpenMAX IL API" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilapi/group" mrp="os/mm/omxil/omxilapi/group/multimedia_omx_il_api.mrp" version="1"/>
-</component>
-<component name="omxilcore" long-name="OpenMAX IL Core" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcore/group" mrp="os/mm/omxil/omxilcore/group/multimedia_omx_il_core.mrp" version="1"/>
-</component>
-<component name="omxilcomponentcommon" long-name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcomponentcommon/group" mrp="os/mm/omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp" version="1"/>
-</component>
-<component name="omxilrefcomps" long-name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilrefcomps/ref_components/group" mrp="os/mm/omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp" version="1"/>
-</component>
-<component name="mmilapi" long-name="Multimedia Integration Layer API" introduced="^3" purpose="development">
-<unit bldFile="os/mm/omxil/mmilapi/group" mrp="os/mm/omxil/mmilapi/group/multimedia_il_api.mrp"/>
-</component>
-</collection>
-<collection name="devsound" long-name="Sound Device" level="devices">
-<component name="devsoundapi" long-name="DevSound API" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/devsound/devsoundapi/group" mrp="os/mm/devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
-</component>
-<component name="a3fdevsound" long-name="A3F DevSound" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3fdevsound/group" mrp="os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
-</component>
-<component name="a3facf" long-name="A3F Audio Component Framework" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3facf/group" mrp="os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
-</component>
-<component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/devsound/devsoundpluginsupport/group" mrp="os/mm/devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
-</component>
-<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">
-<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">
-<unit bldFile="os/mm/devsound/a3ftrace/group" mrp="os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
-</component>
-<component name="a3fsrvstart" long-name="A3F Server Start" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
-</component>
-</collection>
-<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
-<component name="devsoundhwdeviceapi" long-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 name="a3facl" long-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 name="a3fdevsoundcustomisation" long-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"/>
-</component>
-<component name="refacladapt" long-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"/>
-</component>
-<component name="videohai" long-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 name="dvbhreceiverhai" long-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>
-</block>
-<block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
-<collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
-<component name="exif_api" long-name="Exif API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagingext_plat" long-name="Imaging Extensions Platform Interfaces" level="app-if">
-<component name="jpeg2000_icl_plugin_api" long-name="JPEG2000 ICL plugin API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/jpeg2000_icl_plugin_api/group"/>
-</component>
-<component name="extended_icl_jpeg_api" long-name="Extended ICL Jpeg API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
-</component>
-<component name="h324_annex_k_custom_api" long-name="H324 Annex K Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/h324_annex_k_custom_api/group"/>
-</component>
-<component name="ecam_orientation_custom_api" long-name="ECam Orientation Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_orientation_custom_api/group"/>
-</component>
-<component name="ecam_ui_orientation_override_custom_api" long-name="ECam UI Orientation Override Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
-</component>
-<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>
-</collection>
-<collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
-<component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
-<unit bldFile="os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
-</component>
-<component name="imageadaptationextensions_build" filter="s60" long-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"/>
-</component>
-</collection>
-<collection name="imagingmodules" long-name="Imaging Modules" level="hw-if">
-<component name="exiflib" filter="s60" long-name="Exif Library">
-<unit bldFile="os/imagingext/imagingmodules/exiflib/group"/>
-</component>
-<component name="jp2kcodec" filter="s60" long-name="JPEG2000 Decoder Plugin" plugin="Y">
-<unit bldFile="os/imagingext/imagingmodules/jp2kcodec/group"/>
-</component>
-</collection>
-</block>
-<block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
-<component name="vgi" filter="s60" long-name="VGI">
-<unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
-</component>
-</collection>
-<collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adaptations">
-<component name="m3gcore11" filter="s60" long-name="M3G Core 1.1">
-<unit bldFile="os/graphics/m3g/m3gcore11/group"/>
-</component>
-</collection>
-<collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines">
-<component name="graphicsresource" long-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 name="graphicsresourceadaptation" long-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"/>
-</component>
-<component name="graphicsresourceimplementation" long-name="Graphics Resource Implementation" introduced="^4" purpose="optional">
-<unit bldFile="os/graphics/graphicsresourceservices/graphicsresourceimplementation/group" mrp="os/graphics/graphicsresourceservices/graphicsresourceimplementation/group/graphics_graphicsresourceimplementation.mrp"/>
-</component>
-<component name="graphicsresourceinterface" long-name="Graphics Resource Interface" introduced="^4" purpose="optional">
-<unit bldFile="os/graphics/graphicsresourceservices/graphicsresourceinterface/group" mrp="os/graphics/graphicsresourceservices/graphicsresourceinterface/group/graphics_graphicsresourceinterface.mrp"/>
-</component>
-</collection>
-<collection name="graphicsutils" long-name="Graphics Utils" level="engines">
-<component name="commongraphicsheaders" long-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 name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
-<!-- displayldd to be moved here -->
-<component name="surfacemgr" long-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 name="graphicscomposition" long-name="Graphics Composition" level="engines">
-<component name="openwfcinterface" long-name="OpenWF Composition Interface" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfcinterface/group" mrp="os/graphics/graphicscomposition/openwfcinterface/group/graphics_openwfcinterface.mrp"/>
-</component>
-<component name="openwfcompositionengine" long-name="OpenWF Composition Engine" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/graphicscomposition/openwfcompositionengine/group" mrp="os/graphics/graphicscomposition/openwfcompositionengine/group/graphics_openwfcompositionengine.mrp"/>
-</component>
-<component name="openwfsupport" long-name="OpenWF Support" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfsupport/group" mrp="os/graphics/graphicscomposition/openwfsupport/group/graphics_openwfsupport.mrp"/>
-</component>
-<component name="surfaceupdate" long-name="Surface Update" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/surfaceupdate/group" mrp="os/graphics/graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
-</component>
-</collection>
-<collection name="graphicstest" long-name="Graphics Test" level="app-if">
-<component name="uibench" long-name="UI Bench" introduced="9.2" purpose="development">
-<unit bldFile="os/graphics/graphicstest/uibench/group" mrp="os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
-</component>
-</collection>
-<collection name="graphics_plat" long-name="Graphics Platform Interfaces" level="app-if">
-<component name="m3g_core_api" filter="sf_build" long-name="M3G Core API" class="api">
-<unit bldFile="os/graphics/graphics_plat/m3g_core_api/group"/>
-</component>
-</collection>
-<collection name="graphics_info" long-name="Graphics Info" level="app-if">
-<component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc">
-<unit mrp="os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
-</component>
-<component name="graphics_metadata" long-name="Graphics Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
-</component>
-</collection>
-<collection name="windowing" long-name="Windowing" level="app-if">
-<component name="windowserver" long-name="Window Server" purpose="mandatory">
-<unit bldFile="os/graphics/windowing/windowserver/group" mrp="os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
-</component>
-<component name="windowserverplugins" long-name="Window Server Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/windowing/windowserverplugins/group" mrp="os/graphics/windowing/windowserverplugins/group/graphics_wserv_std_plugins.mrp"/>
-</component>
-</collection>
-<collection name="printingservices" long-name="Printing Services" level="app-if">
-<component name="printerdriversupport" long-name="Printer Driver Support" purpose="optional">
-<unit bldFile="os/graphics/printingservices/printerdriversupport/group" mrp="os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
-</component>
-<component name="printerdrivers" long-name="Printer Drivers" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/printingservices/printerdrivers/group" mrp="os/graphics/printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
-</component>
-</collection>
-<collection name="fbs" long-name="Font and Bitmap Server" level="device-interface">
-<component name="fontandbitmapserver" long-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 name="opengles" long-name="OpenGLES" level="internal-adaptations">
-<component name="openglesinterface" long-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 name="opengles_stub" filter="sf_build" long-name="OpenGL ES Stub" purpose="optional" introduced="^2">
-<unit bldFile="os/graphics/opengles/openglesinterface/group/opengles_stub"/>
-</component>
-</collection>
-<collection name="openvg" long-name="OpenVG" level="internal-adaptations">
-<component name="openvginterface" long-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 name="openvg11" filter="s60" long-name="OpenVG 1.1">
-<!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
-<unit bldFile="os/graphics/openvg/openvginterface/group/openvg11"/>
-</component>
-<component name="sfopenvg" filter="sf_build" long-name="Khronos OpenVG Reference Implementation" introduced="^2" purpose="optional">
-<unit bldFile="os/graphics/openvg/openvgrefimplementation/sfopenvg/group"/>
-</component>
-</collection>
-<collection name="egl" long-name="EGL" level="internal-adaptations">
-<component name="eglinterface" long-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 name="eglswitch" long-name="EGL Switch" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglswitch/group" mrp="os/graphics/egl/eglswitch/group/graphics_eglswitch.mrp"/>
-</component>
-<component name="eglrefimpl" long-name="EGL Reference Implementation" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglrefimpl/group" mrp="os/graphics/egl/eglrefimpl/group/graphics_eglrefimpl.mrp"/>
-</component>
-<component name="egltest" long-name="EGL Tests" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/egl/egltest/group" mrp="os/graphics/egl/egltest/group/graphics_egltest.mrp"/>
-</component>
-</collection>
-<collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
-<component name="gdi" long-name="GDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/gdi/group" mrp="os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
-</component>
-<component name="bitgdi" long-name="BitGDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
-</component>
-<component name="colourpalette" long-name="Colour Palette" introduced="7.0s" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
-</component>
-<component name="screendriver" long-name="Screen Driver" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/graphicsdeviceinterface/screendriver/group" mrp="os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
-</component>
-<component name="directgdi" long-name="DirectGDI" introduced="^3" deprecated="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/directgdi/group" mrp="os/graphics/graphicsdeviceinterface/directgdi/group/graphics_directgdi.mrp"/>
-</component>
-<component name="directgdiinterface" long-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 name="directgdiadaptation" long-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"/>
-</component>
-</collection>
-<collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
-<component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/gdi_tools/group" mrp="os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
-</component>
-</collection>
-<collection name="graphicsapitest" long-name="Graphics API Tests" level="app-if"/>
-</block>
-<block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
-<collection name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" level="text">
-<component name="findutil_api" long-name="Find Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/findutil_api/group"/>
-</component>
-<component name="japanese_language_utilities_api" long-name="Japanese Language Utilities API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
-</component>
-<component name="sortutil_api" long-name="Sorting Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/sortutil_api/group"/>
-</component>
-</collection>
-<collection name="textandloc_pub" long-name="Text and Localisation Public Interfaces" level="text">
-<component name="directory_localizer_api" long-name="Directory Localizer API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_pub/directory_localizer_api/group"/>
-</component>
-</collection>
-<collection name="charconvfw" long-name="Character Conversion" level="encoding">
-<component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional">
-<unit bldFile="os/textandloc/charconvfw/charconv_fw/group" mrp="os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
-</component>
-<component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/charconvplugins/group" mrp="os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
-</component>
-<component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/fatfilenameconversionplugins/group" mrp="os/textandloc/charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
-</component>
-</collection>
-<collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
-<component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/textshaperplugin/group" mrp="os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
-</component>
-<component name="fontstore" long-name="Font Store" purpose="mandatory">
-<unit bldFile="os/textandloc/fontservices/fontstore/group" mrp="os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
-</component>
-<component name="textrendering" long-name="Text Rendering" purpose="mandatory" class="placeholder">
-<!-- placeholder for text code from GDI -->
-</component>
-<component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/freetypefontrasteriser/group" mrp="os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
-</component>
-<component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional">
-<unit bldFile="os/textandloc/fontservices/referencefonts/group" mrp="os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
-</component>
-</collection>
-<collection name="textlayout" long-name="Text Layout" level="text">
-<component name="texthandling" long-name="Text Handling" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/texthandling/group" mrp="os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
-</component>
-<component name="textformatting" long-name="Text Formatting" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/textformatting/group" mrp="os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
-</component>
-</collection>
-<collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
-<!-- components in this collection need to be moved to the right collection.
- Either move into the units' directories, or create a new textandlocutils directory -->
-<component name="numbergrouping" filter="s60" long-name="Number Grouping">
-<unit bldFile="os/textandloc/charconvfw/numbergrouping/group"/>
-</component>
-<component name="jplangutil" filter="s60" long-name="Japanese Language Utilities">
-<unit bldFile="os/textandloc/charconvfw/jplangutil/group"/>
-</component>
-<component name="sortutil" filter="s60" long-name="Sorting Utility">
-<unit bldFile="os/textandloc/charconvfw/sortutil/group"/>
-</component>
-<component name="inlinetext" filter="s60" long-name="Inline Text">
-<unit bldFile="os/textandloc/charconvfw/inlinetext/group"/>
-</component>
-<component name="nearestlangutil" long-name="Nearest Language Util" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-<component name="numberformatting" long-name="Number Formatting" introduced="7.0s" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/numberformatting/group" mrp="os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
-</component>
-</collection>
-<collection name="localesupport" long-name="Locale Support" level="util">
-<component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/localisation/localesupport" mrp="os/textandloc/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
-</component>
-<component name="initlocale" long-name="Initialise Locale" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-</collection>
-<collection name="textandloctools" long-name="Text and Localisation Tools" level="tools">
-<component name="fontcompiler" long-name="Font Compiler" purpose="development" class="placeholder PC">
-<!-- placeholder for split from GDI Tools -->
-</component>
-<component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/bitmapfonttools/group" mrp="os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
-</component>
-</collection>
-<collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
-<component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
-<collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
-<component name="xmlsrv_plat_build" long-name="XML Services Platform Interface Build" filter="s60" class="api">
-<!-- need to fix the configuration used here.
- Either destribute to other components or use the new feature flags confguration mechanisms.
- Remove this component and uncomment the other units when fixed-->
-<unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
-</component>
-<component name="xml_encryption_api" long-name="XML Encryption API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/> -->
-</component>
-<component name="xml_signature_api" long-name="XML Signature API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_signature_api/group"/> -->
-</component>
-<component name="xml_security_engine_utils_api" long-name="XML Security Engine Utils API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/> -->
-</component>
-</collection>
-<collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
-<component name="xmlseccertman" filter="s60" long-name="XML Security Certificate Manager">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
-</component>
-<component name="xmlsec" filter="s60" long-name="XML Security">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsec/group"/>
-</component>
-<component name="xmlseccrypto" filter="s60" long-name="XML Security Crypto">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccrypto/group"/>
-</component>
-<component name="xmlsecwrapper" filter="s60" long-name="XML Security Wrapper">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsecwrapper/group"/>
-</component>
-</collection>
-<collection name="xml" long-name="XML" level="generic">
-<component name="xmlfw" long-name="XML Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmlfw/group" mrp="os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
-</component>
-<component name="libxml2libs" long-name="Libxml2 Libraries" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/libxml2libs/group" mrp="os/xmlsrv/xml/libxml2libs/group/syslibs_libxml2.mrp"/>
-</component>
-<component name="legacyminidomparser" long-name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/legacyminidomparser/GROUP" mrp="os/xmlsrv/xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp"/>
-</component>
-<component name="xmldomandxpath" long-name="XML DOM and XPath" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmldomandxpath/group" mrp="os/xmlsrv/xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
-</component>
-<component name="xmlexpatparser" long-name="XML Expat Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmlexpatparser/group" mrp="os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
-</component>
-<component name="xmllibxml2parser" long-name="XML Libxml2 Parser" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmllibxml2parser/group" mrp="os/xmlsrv/xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
-</component>
-<component name="wbxmlparser" long-name="WBXML Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/wbxmlparser/group" mrp="os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
-</component>
-</collection>
-<collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
-<component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="deviceplatformrelease" level="services" long-name="Device Platform Release" levels="bld mid top">
-<collection name="s60extras" long-name="S60 Extras" level="mid">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="s60extras_build" filter="s60" long-name="S60 Extras Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/S60Extras/group"/>
-</component>
-</collection>
-<collection name="version" long-name="Version" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="version_build" filter="s60" long-name="Version Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/Version/group"/>
-</component>
-</collection>
-<collection name="helps_loc2" long-name="Helps Locale 2" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helps_loc2_build" long-name="Helps Locale 2 Build" filter="s60">
-<unit bldFile="os/deviceplatformrelease/helps_loc2/group"/>
-</component>
-</collection>
-<collection name="sf_config" long-name="SF Config" level="mid">
-<component name="config" filter="s60" long-name="Config" purpose="development" class="config"/>
-<component name="cenrep" filter="sf_build" long-name="ConE Central Repository Config" purpose="development" class="config">
-<!-- will should give the id/path something more unique than cenrep -->
-<unit bldFile="os/deviceplatformrelease/sf_config/cenrep/group"/>
-</component>
-<component name="rombuild_syborg" filter="sf_build" long-name="Syborg iMaker Config" purpose="development" introduced="^3" class="config">
-<unit bldFile="os/deviceplatformrelease/sf_config/rombuild/syborg/group"/>
-</component>
-<component name="rombuild_zoom2" filter="sf_build" long-name="Zoom2 iMaker Config" purpose="development" introduced="^3" class="config">
-<unit bldFile="os/deviceplatformrelease/sf_config/rombuild/zoom2/group"/>
-</component>
-</collection>
-<!-- should be located locally in buildplatforms/group
- <collection id="s60bld" name="S60 Build">
- <component id="buildplatforms" filter="s60" name="Build Platforms">
- <unit bldFile="/tools/buildplatforms/group"/>
- </component>
- </collection>-->
-<collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
-<component name="cedarutils" long-name="Cedar Utils" purpose="development">
-<unit mrp="os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
-</component>
-<component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt" purpose="development" class="config">
-<unit mrp="os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
-</component>
-<component name="foundation_s60_packages" long-name="Foundation S60 Packages" introduced="^3" deprecated="^3" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/symbianosbld/foundation_s60_packages/foundation_s60_packages.mrp"/>
-</component>
-</collection>
-<collection name="foundation_system" long-name="Foundation System" level="top">
-<component name="system_model" long-name="System Model" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
-</component>
-</collection>
-<collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
-<component name="deviceplatformrelease_metadata" long-name="Device Platform Release Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="osrndtools" level="services" long-name="OS R&D tools" levels="fw trace">
-<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"/>
-</component>
-<component name="testinterface" filter="s60" long-name="Test Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/testinterface/group"/>
-</component>
-<component name="testserver" filter="s60" long-name="Test Server" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserver/group"/>
-</component>
-<component name="testengine" filter="s60" long-name="Test Engine" purpose="development">
-<unit bldFile="os/osrndtools/stif/testengine/group"/>
-</component>
-<component name="testserverstarter" filter="s60" long-name="Test Server Starter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserverstarter/group"/>
-</component>
-<component name="stiftfwif" filter="s60" long-name="STIF Test Framework Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/stiftfwif/group"/>
-</component>
-<component name="consoleui" filter="s60" long-name="Console UI" purpose="development">
-<unit bldFile="os/osrndtools/stif/consoleui/group"/>
-</component>
-<component name="testcombiner" filter="s60" long-name="Test Combiner" purpose="development">
-<unit bldFile="os/osrndtools/stif/testcombiner/group"/>
-</component>
-<component name="demomodule" filter="s60" long-name="Demo Module" purpose="development">
-<unit bldFile="os/osrndtools/stif/demomodule/group"/>
-</component>
-<component name="atslogger" filter="s60" long-name="ATS Logger" purpose="development">
-<unit bldFile="os/osrndtools/stif/atslogger/group"/>
-</component>
-<component name="atsinterface" filter="s60" long-name="ATS Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/atsinterface/group"/>
-</component>
-<component name="testscripter" filter="s60" long-name="Test Scripter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testscripter/group"/>
-</component>
-<component name="suevent" filter="s60" long-name="SU Event" purpose="development">
-<unit bldFile="os/osrndtools/stif/suevent/group"/>
-</component>
-<component name="stifkerneltestclassbase" filter="s60" long-name="STIF Kernel Test Class Base" purpose="development">
-<!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
-<!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
-</component>
-<component name="stif_build" filter="s60" long-name="STIF Build" purpose="development">
-<!-- move exports into self-contained component. Remove this when configuration is in place-->
-<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">
-<unit bldFile="os/osrndtools/memspy/memspy_plat/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/engine/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/console/group"/>
-</component>
-<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>
-</collection>
-<collection name="hti" long-name="Harmonized Test Interface" level="trace">
-<component name="hti_plat" filter="s60" long-name="HTI Platform Interfaces" purpose="development" class="api">
-<unit bldFile="os/osrndtools/hti/hti_plat/group"/>
-</component>
-<component name="hticfg" filter="s60" long-name="HTI Config" purpose="development">
-<unit bldFile="os/osrndtools/hti/hticfg/group"/>
-</component>
-<component name="htiautostart" filter="s60" long-name="HTI Autostart" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiautostart/group"/>
-</component>
-<component name="htiframework" filter="s60" long-name="HTI Framework" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiframework/group"/>
-</component>
-<component name="hticommplugins" filter="s60" long-name="HTI Communication Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
-</component>
-<component name="htiserviceplugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
-</component>
-<component name="htifilehlp" filter="s60" long-name="HTI File Help" purpose="development">
-<unit bldFile="os/osrndtools/hti/htifilehlp/group"/>
-</component>
-<component name="htiwatchdog" filter="s60" long-name="HTI Watchdog" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiwatchdog/group"/>
-</component>
-<component name="hti_build" filter="s60" long-name="HTI Build" purpose="development">
-<!-- move exports into self-contained component.-->
-<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">
-<block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
-<collection name="appsupport_pub" long-name="Generic Application Support Public Interfaces" level="specific">
-<component name="flash_viewer_framework_api" long-name="Flash Viewer Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
-</component>
-<component name="network_status_api" long-name="Network Status API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/network_status_api/group"/>
-</component>
-</collection>
-<collection name="appsupport_plat" long-name="Generic Application Support Platform Interfaces" level="specific">
-<component name="action_plugin_api" long-name="Action Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/action_plugin_api/group"/>
-</component>
-<component name="application_orientation_api" long-name="Application Orientation API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/application_orientation_api/group"/>
-</component>
-<component name="context_access_api" long-name="Context Access API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_access_api/group"/>
-</component>
-<component name="context_framework_services_api" long-name="Context Framework Services API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_services_api/group"/>
-</component>
-<component name="context_framework_client_api" long-name="Context Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_client_api/group"/>
-</component>
-<component name="context_framework_listener_api" long-name="Context Framework Listener API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_listener_api/group"/>
-</component>
-<component name="context_framework_version_api" long-name="Context Framework Version API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_version_api/group"/>
-</component>
-<component name="context_source_plugin_api" long-name="Context Source Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_plugin_api/group"/>
-</component>
-<component name="context_source_settings_manager_api" long-name="Context Source Settings Manager API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_settings_manager_api/group"/>
-</component>
-<component name="context_subscription_api" long-name="Context Subscription API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_subscription_api/group"/>
-</component>
-<component name="key_event_framework_api" long-name="Key Event Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_api/group"/>
-</component>
-<component name="key_event_framework_mapper_api" long-name="Key Event Framework Mapper API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_mapper_api/group"/>
-</component>
-<component name="media_keys_definition_api" long-name="Media Keys Definition API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/media_keys_definition_api/group"/>
-</component>
-<component name="ood_threshold_api" long-name="OOD Threshold API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/ood_threshold_api/group"/>
-</component>
-<component name="oom_monitor_api" long-name="OOM Monitor API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_api/group"/>
-</component>
-<component name="oom_monitor_plugin_api" long-name="OOM Monitor Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_plugin_api/group"/>
-</component>
-<component name="operation_provider_api" long-name="Operation Provider API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/operation_provider_api/group"/>
-</component>
-<component name="phonecmdhandler_api" long-name="Phone Command Handler API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/phonecmdhandler_api/group"/>
-</component>
-<component name="restore_factory_settings_api" long-name="Restore Factory Settings API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_api/group"/>
-</component>
-<component name="restore_factory_settings_plugin_api" long-name="Restore Factory Settings Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_plugin_api/group"/>
-</component>
-<component name="secondary_display_accfw_api" long-name="Secondary Display Accessory Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_accfw_api/group"/>
-</component>
-<component name="secondary_display_startup_api" long-name="Secondary Display Startup API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_startup_api/group"/>
-</component>
-<component name="secondary_display_sysap_api" long-name="Secondary Display System Application API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_sysap_api/group"/>
-</component>
-<component name="secondary_display_system_state_api" long-name="Secondary Display System State API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_system_state_api/group"/>
-</component>
-<component name="sensor_user_setting_api" long-name="Sensor User Setting API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/sensor_user_setting_api/group"/>
-</component>
-<component name="startup_configuration_api" long-name="Startup Configuration API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/startup_configuration_api/group"/>
-</component>
-<component name="system_application_key_handler_plugin_api" long-name="System Application Key Handler Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_key_handler_plugin_api/group"/>
-</component>
-<component name="system_application_light_control_plugin_api" long-name="System Application Light Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_light_control_plugin_api/group"/>
-</component>
-<component name="system_application_notification_api" long-name="System Application Notification API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_notification_api/group"/>
-</component>
-<component name="system_application_plugin_callback_api" long-name="System Application Plug-in Callback API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
-</component>
-<component name="flash_mmi_service_interface_custom_api" long-name="Flash MMI Service Interface Custom API" filter="s60,!sf_build" introduced="^2" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/flash_mmi_service_interface_custom_api/group"/>
-</component>
-<component name="flash_netscape_plugin_command_api" long-name="Flash Netscape Plugin Command API" filter="s60,!sf_build" introduced="^2" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/flash_netscape_plugin_command_api/group"/>
-</component>
-</collection>
-<collection name="contextframework" long-name="Context Framework" level="framework">
-<!-- the units that are commented out need to be put back when configuration is in place.
- They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
-<component name="cfw" filter="s60" long-name="Context Framework">
-<!--<unit bldFile="contextframework/cfw/group"/> -->
-</component>
-<component name="cfwplugins" filter="s60" long-name="Context Framework Plugins" plugin="Y">
-<!--<unit bldFile="contextframework/cfwplugins/group"/>-->
-</component>
-<component name="contextframework_build" filter="s60" long-name="Context Framework Build">
-<unit bldFile="mw/appsupport/contextframework/group"/>
-</component>
-</collection>
-<collection name="coreapplicationuis" long-name="Core Application UIs" level="server">
-<component name="dbrecovery" filter="s60" long-name="Database Recovery">
-<unit bldFile="mw/appsupport/coreapplicationuis/dbrecovery/group"/>
-</component>
-<component name="nspswsplugin" filter="s60" long-name="NSPS WS Plugin" plugin="Y">
-<!-- No Service Power Save? Window Server? Please elaborate-->
-<unit bldFile="mw/appsupport/coreapplicationuis/nspswsplugin/group"/>
-</component>
-<component name="rfs" filter="s60" long-name="Restore Factory Settings">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfs/group"/>
-</component>
-<component name="rfsplugins" filter="s60" long-name="Restore Factory Settings Plugins" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/group"/>
-</component>
-<component name="sysap" filter="s60" long-name="System Application">
-<unit bldFile="mw/appsupport/coreapplicationuis/sysap/group"/>
-</component>
-<component name="variatedsettings" filter="s60" long-name="Variated Settings" class="config">
-<unit bldFile="mw/appsupport/coreapplicationuis/variatedsettings/group"/>
-</component>
-<component name="accfwuinotifier" filter="s60" long-name="Accessory Framework UI Notifier" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/accfwuinotifier/group"/>
-</component>
-<component name="kefmapper" filter="s60" long-name="Key Event Framework">
-<unit bldFile="mw/appsupport/coreapplicationuis/kefmapper/group"/>
-</component>
-<component name="advancedtspcontroller" filter="s60" long-name="Advanced TSP Controller">
-<unit bldFile="mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
-</component>
-<component name="powersaveutilities" filter="s60" long-name="Power Save Utilities">
-<unit bldFile="mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
-</component>
-<component name="gsserverenginestub" filter="s60" long-name="GS Server Engine Stub">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
-</component>
-<component name="gsserverengine" filter="s60" long-name="GS Server Engine">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverengine/group"/>
-</component>
-<component name="sensordatacompensatorplugin" filter="s60" long-name="Sensor Data Compensator Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/group"/>
-</component>
-<component name="atcmdplugin" long-name="AT Command Plugin" filter="s60,!oem_build" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/atcmdplugin/group"/>
-</component>
-</collection>
-<collection name="flashliteapi_3_1" long-name="Flash Lite API 3.1" level="specific">
-<!-- collection is really a component. Move down a directory -->
-<component name="flashliteapi_3_1_build" long-name="Flash Lite API Build" filter="s60" introduced="^2"/>
-</collection>
-<collection name="mediakeys" long-name="Media Keys" level="plugin">
-<!-- collection is really a component. Move down a directory -->
-<component name="mediakeys_build" filter="s60" long-name="Media Keys Build">
-<unit bldFile="mw/appsupport/mediakeys/group"/>
-</component>
-</collection>
-<collection name="startupservices" long-name="Startup Services" level="system">
-<component name="splashscreen" filter="s60" long-name="Splash Screen">
-<unit bldFile="mw/appsupport/startupservices/splashscreen/group"/>
-</component>
-<component name="startupanimation" filter="s60" long-name="Startup Animation">
-<unit bldFile="mw/appsupport/startupservices/startupanimation/group"/>
-</component>
-<component name="startup" long-name="Startup Application" filter="s60">
-<unit bldFile="mw/appsupport/startupservices/startup/group"/>
-</component>
-</collection>
-<collection name="sysresmonitoring" long-name="System Resource Monitoring" level="system">
-<component name="oodmonitor" filter="s60" long-name="OOD Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oodmonitor/group"/>
-</component>
-<component name="oommonitor" filter="s60" long-name="OOM Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oommonitor/group"/>
-</component>
-</collection>
-<collection name="systemsettings" long-name="System Settings" level="system">
-<component name="gssensorplugin" filter="s60" long-name="GS Sensor Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gssensorplugin/group"/>
-</component>
-<component name="gsaccessoryplugin" filter="s60" long-name="GS Accessory Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gsaccessoryplugin/group"/>
-</component>
-</collection>
-<collection name="filehandling" long-name="File Handling" level="server">
-<component name="fileconverterfw" long-name="File Converter Framework" purpose="optional">
-<unit bldFile="mw/appsupport/filehandling/fileconverterfw/group" mrp="mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
-</component>
-<component name="htmltorichtextconverter" long-name="HTML to RichText Converter" introduced="7.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/htmltorichtextconverter/group" mrp="mw/appsupport/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
-</component>
-<component name="richtexttohtmlconverter" long-name="RichText to HTML Converter" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
-</component>
-</collection>
-<collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
-<component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
-</component>
-</collection>
-<collection name="commonappservices" long-name="Common Application Services" level="framework">
-<component name="alarmserver" long-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"/>
-</component>
-<component name="alarmservertest" long-name="Alarm Server Test" deprecated="^3" introduced="8.1" purpose="development">
-<unit bldFile="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
-</component>
-<component name="appservicesdocs" long-name="Application Services Documentation" purpose="development" class="doc">
-<unit mrp="mw/appsupport/commonappservices/appservicesdocs/app-services_documentation.mrp"/>
-</component>
-<component name="backuprestorenotification" long-name="Backup Restore Notification" introduced="8.1" purpose="optional">
-<unit bldFile="mw/appsupport/commonappservices/backuprestorenotification/group" mrp="mw/appsupport/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
-</component>
-</collection>
-<collection name="tzservices" long-name="Time Zone Services" level="plugin">
-<component name="tzserver" long-name="Time Zone Server" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzserver/group" mrp="mw/appsupport/tzservices/tzserver/group/app-services_tz.mrp"/>
-</component>
-<component name="tzloc" long-name="Time Zone Localization" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzloc/group" mrp="mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
-</component>
-<component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzlocrscfactory/group" mrp="mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
-</component>
-<component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzdatabase/group" mrp="mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
-</component>
-</collection>
-<collection name="contenthandling" long-name="Content Handling" level="plugin">
-<component name="webrecognisers" long-name="Web Recognisers" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/contenthandling/webrecognisers/group" mrp="mw/appsupport/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
-</component>
-</collection>
-<collection name="openenvutils" long-name="Open Environment Utilities" level="specific">
-<component name="commandshell" long-name="Command Shell" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/commandshell/group" mrp="mw/appsupport/openenvutils/commandshell/group/oetools_zsh.mrp"/>
-</component>
-<component name="telnetserver" long-name="Telnet Server" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/telnetserver/group" mrp="mw/appsupport/openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
-</component>
-</collection>
-<collection name="printingsupport" long-name="Printing Support" level="generic">
-<component name="printinguisupport" long-name="Printing UI Support" purpose="optional" introduced="^2" deprecated="^3">
-<unit bldFile="mw/appsupport/printingsupport/printinguisupport/group" mrp="mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
-</component>
-</collection>
-<collection name="appfw" long-name="Application Framework" level="framework">
-<component name="apparchitecture" long-name="Application Architecture" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/apparchitecture/group" mrp="mw/appsupport/appfw/apparchitecture/group/app-framework_apparc.mrp"/>
-</component>
-<component name="viewserver" long-name="View Server" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/viewserver/group" mrp="mw/appsupport/appfw/viewserver/group/app-framework_viewsrv.mrp"/>
-</component>
-</collection>
-<collection name="applaunchservices" long-name="Application Launch Services" level="generic">
-<component name="aftermarketappstarter" long-name="After Market Application Starter" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/aftermarketappstarter/group" mrp="mw/appsupport/applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
-</component>
-<component name="applaunchplugins" long-name="Application Launch Plugins" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/applaunchplugins/group" mrp="mw/appsupport/applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
-</component>
-</collection>
-<collection name="tzpcside" long-name="Time Zone PC Side" level="plugin">
-<component name="tzcompiler" long-name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config PC">
-<unit bldFile="mw/appsupport/tzpcside/tzcompiler/group" mrp="mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
-</component>
-</collection>
-<collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
-<component name="appsupport_metadata" long-name="Generic Application Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="securitysrv" level="generic" long-name="Security Services" levels="plugin framework server generic specific">
-<collection name="secsrv_plat" long-name="Security Services Platform Interfaces" level="specific">
-<component name="cms_api" long-name="CMS API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/cms_api/group"/>
-</component>
-<component name="pkcs12_parser_api" long-name="PKCS12 Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkcs12_parser_api/group"/>
-</component>
-<component name="java_utils_api" long-name="Java Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/java_utils_api/group"/>
-</component>
-<component name="wim_cert_api" long-name="WIM Cert API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/wim_cert_api/group"/>
-</component>
-<component name="device_key_store_encryption_plugin_api" long-name="Device Key Store Encryption Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/device_key_store_encryption_plugin_api/group"/>
-</component>
-<component name="x509certnameparser_api" long-name="X.509 Certificate Name Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
-</component>
-<component name="remote_lock_api" long-name="Remote Lock API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
-</component>
-<component name="pkidialog_api" long-name="PKI Dialog API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
-</component>
-<component name="provisioning_api" long-name="Provisioning API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/provisioning_api/group"/>
-</component>
-<component name="keyguard_configuration_api" long-name="Keyguard Configuration API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_configuration_api/group"/>
-</component>
-<component name="keylock_policy_api" long-name="Keylock Policy API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keylock_policy_api/group"/>
-</component>
-<component name="security_code_ui_api" long-name="Security Code UI API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
-</component>
-<component name="gba_api" long-name="GBA API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/gba_api/group"/>
-</component>
-<component name="keyguard_access_api" long-name="Keyguard Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_access_api/group"/>
-</component>
-<component name="devicelock_access_api" long-name="Device Lock Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devicelock_access_api/group"/>
-</component>
-<component name="lockapp_server_api" long-name="Lock Application Server API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
-</component>
-<component name="devencadaptation_api" long-name="Device Encryption Adaptation API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
-</component>
-<component name="devenccommonutils_api" long-name="Device Encryption Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
-</component>
-</collection>
-<collection name="cms" long-name="Certificate Management Service" level="server">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="cms_build" filter="s60" long-name="CMS" introduced="^3">
-<unit bldFile="mw/securitysrv/cms/group"/>
-</component>
-</collection>
-<collection name="pkiutilities" long-name="PKI Utilities" level="plugin">
-<component name="x509certnameparser" filter="s60" long-name="X.509 Certificate Name Parser">
-<unit bldFile="mw/securitysrv/pkiutilities/x509certnameparser/group"/>
-</component>
-<component name="pkcs12" filter="s60" long-name="PKCS #12">
-<unit bldFile="mw/securitysrv/pkiutilities/pkcs12/group"/>
-</component>
-<component name="certmanui" filter="s60" long-name="Certificate Management UI">
-<unit bldFile="mw/securitysrv/pkiutilities/certmanui/group"/>
-</component>
-<component name="ctsecuritydialogs" filter="s60" long-name="Crypto Token Security Dialogs">
-<unit bldFile="mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
-</component>
-<component name="certsaver" filter="s60" long-name="Certificate Saver">
-<unit bldFile="mw/securitysrv/pkiutilities/certsaver/group"/>
-</component>
-<component name="secmodui" filter="s60" long-name="Security Module UI">
-<unit bldFile="mw/securitysrv/pkiutilities/secmodui/group"/>
-</component>
-<component name="devicetoken" filter="s60" long-name="Device Token">
-<unit bldFile="mw/securitysrv/pkiutilities/devicetoken/group"/>
-</component>
-<component name="certificates" filter="s60" long-name="Certificates">
-<unit bldFile="mw/securitysrv/pkiutilities/Certificates/group" filter="sf_build"/>
-</component>
-<component name="pkiutilities_build" filter="s60" long-name="PKI Utilities Build">
-<!-- need to split this into the above components -->
-<unit bldFile="mw/securitysrv/pkiutilities/group"/>
-</component>
-<component name="ocsp" long-name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
-<unit bldFile="mw/securitysrv/pkiutilities/ocsp/group" mrp="mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
-</component>
-</collection>
-<collection name="wim" long-name="Wireless Identity Module " level="framework">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="wim_build" filter="s60" long-name="WIM Build">
-<unit bldFile="mw/securitysrv/wim/group"/>
-</component>
-</collection>
-<collection name="remotelock" long-name="Remote Lock" level="generic">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="remotelock_build" filter="s60" long-name="Remote Lock Build">
-<unit bldFile="mw/securitysrv/remotelock/group"/>
-</component>
-</collection>
-<collection name="securitydialogs" long-name="Security Dialogs" level="specific">
-<component name="keylockpolicyapi" filter="s60" long-name="Keylock Policy API">
-<unit bldFile="mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
-</component>
-<component name="autolock" long-name="Autolock" filter="s60">
-<unit bldFile="mw/securitysrv/securitydialogs/autolock/group"/>
-</component>
-<component name="secui" filter="s60" long-name="Security UI">
-<unit bldFile="mw/securitysrv/securitydialogs/secui/group"/>
-</component>
-<component name="securitynotifier" filter="s60" long-name="Security Notifier">
-<unit bldFile="mw/securitysrv/securitydialogs/securitynotifier/group"/>
-</component>
-<component name="lockclient" filter="s60" long-name="Lock Client" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockclient/group"/>
-</component>
-<component name="lockapp" filter="s60" long-name="Lock Application" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockapp/group"/>
-</component>
-<component name="secuinotifications" long-name="Security UI Notifications" introduced="^4" filter="s60">
-<unit bldFile="mw/securitysrv/securitydialogs/secuinotifications" proFile="secuinotifications.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="boottimeintegritycheck_build" filter="s60" long-name="Boot Time Integrity Check Build">
-<unit bldFile="mw/securitysrv/boottimeintegritycheck/group"/>
-</component>
-</collection>
-<collection name="gba" long-name="Generic Bootstrapping Architecture" level="server">
-<component name="uicc" filter="s60" long-name="UICC" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/uicc/group"/>
-</component>
-<component name="gbaserver" filter="s60" long-name="GBA Server" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaserver/group"/>
-</component>
-<component name="gbaapi" filter="s60" long-name="GBA API" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaapi/group"/>
-</component>
-<component name="gbafilter" filter="s60" long-name="GBA HTTP Filter" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/gbafilter/group"/>
-</component>
-<component name="gba_build" filter="s60" long-name="Generic Boot Architecture Build" introduced="^2">
-<!-- need to split this into the above components, or remove #includes and make this GBA ROM -->
-<unit bldFile="mw/securitysrv/gba/group"/>
-</component>
-</collection>
-<collection name="devencdiskutils" long-name="Device Encryption Disk Utils" level="server">
-<component name="devenccommonutils" filter="s60" long-name="Device Encryption Common Utils" introduced="^3">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncCommonUtils/group"/>
-</component>
-<component name="devencrfsplugin" filter="s60" long-name="Device Encryption RFS Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncRfsPlugin/group"/>
-</component>
-<component name="pk5recognizer" filter="s60" long-name="Device Encryption Pk5 Recognizer" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/Pk5Recognizer/group"/>
-</component>
-<component name="devencstarter" filter="s60" long-name="Device Encryption Starter" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncStarter/group"/>
-</component>
-<component name="devencdiskutils" filter="s60" long-name="Device Encryption Disk Utils Build" introduced="^3">
-<!-- need to split this into the above components, or remove #includes and make this a ROM component-->
-<unit bldFile="mw/securitysrv/devencdiskutils/group"/>
-</component>
-</collection>
-<collection name="securitysrv_info" long-name="Security Services Info" level="specific">
-<component name="securitysrv_metadata" long-name="Security Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="drm" level="generic" long-name="DRM" levels="plugin framework server generic specific">
-<collection name="drm_plat" long-name="DRM Platform Interfaces" level="specific">
-<component name="roap_api" long-name="ROAP API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/roap_api/group"/>
-</component>
-<component name="drm_common_api" long-name="DRM Common API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_common_api/group"/>
-</component>
-<component name="drm_rights_api" long-name="DRM Rights API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_rights_api/group"/>
-</component>
-<component name="drm_legacy_api" long-name="DRM Legacy API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_legacy_api/group"/>
-</component>
-<component name="dcf_repository_api" long-name="DCF Repository API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/dcf_repository_api/group"/>
-</component>
-<component name="drm_service_api" long-name="DRM Service API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_service_api/group"/>
-</component>
-<component name="drm_secondary_display_api" long-name="DRM Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_secondary_display_api/group"/>
-</component>
-<component name="drm_license_manager_api" long-name="DRM License Manager API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_license_manager_api/group"/>
-</component>
-<component name="drm_utility_api" long-name="DRM Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_utility_api/group"/>
-</component>
-<component name="drm_agents_api" long-name="DRM Agents API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_agents_api/group"/>
-</component>
-<component name="wmdrm_core_api" long-name="WM DRM Core API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_core_api/group"/>
-</component>
-<component name="wmdrm_access_api" long-name="WMDRM Access API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_access_api/group"/>
-</component>
-<component name="camese_utility_api" long-name="Camese Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_utility_api/group"/>
-</component>
-<component name="camese_framework_api" long-name="Camese Framework API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_framework_api/group"/>
-</component>
-</collection>
-<collection name="drm_pub" long-name="DRM Public Interfaces" level="specific">
-<component name="drm_helper_api" long-name="DRM Helper API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_helper_api/group"/>
-</component>
-<component name="oma_drm_caf_agent_api" long-name="OMA DRM CAF Agent API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/group"/>
-</component>
-<component name="drm_license_checker_api" long-name="DRM License Checker API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_license_checker_api/group"/>
-</component>
-</collection>
-<collection name="commondrm" long-name="Common DRM" level="generic">
-<!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
-<component name="drmencryptor" filter="s60" long-name="DRM Encryptor" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmsettingsplugin" filter="s60" long-name="DRM Settings Plugin" plugin="Y" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmrightsmanagerui" filter="s60" long-name="DRM Rights Manager UI">
-<unit bldFile="mw/drm/commondrm/drmrightsmanagerui/help/group"/>
-</component>
-<component name="drmutility" filter="s60" long-name="DRM Utility">
-<!-- Uncomment unit when configuration is in place. Currently #included from commondrm_build -->
-<!--<unit bldFile="commondrm/drmutility/group"/>-->
-</component>
-<component name="drmserviceapiwrapper" filter="s60" long-name="DRM Service API Wrapper">
-<unit bldFile="mw/drm/commondrm/drmserviceapiwrapper/group"/>
-</component>
-<component name="drmrightsstoringlocation" filter="s60" long-name="DRM Rights Storing Location">
-<unit bldFile="mw/drm/commondrm/drmrightsstoringlocation/group"/>
-</component>
-<component name="commondrm_build" filter="s60" long-name="Common DRM Build">
-<!-- should be split into the above files, or them collapsed into a single component -->
-<unit bldFile="mw/drm/commondrm/group"/>
-</component>
-</collection>
-<collection name="omadrm" long-name="OMA DRM" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="omadrm_build" filter="s60" long-name="OMA DRM Build">
-<unit bldFile="mw/drm/omadrm/group"/>
-</component>
-<component name="foundationcerts" filter="sf_build" long-name="Foundation Certificates">
-<unit bldFile="mw/drm/omadrm/foundationcerts/group"/>
-</component>
-</collection>
-<collection name="wmdrm" long-name="Windows Media DRM" level="framework">
-<!-- collection is really a component. Move down a directory -->
-<component name="wmdrm_build" filter="s60" long-name="WM DRM Build">
-<unit bldFile="mw/drm/wmdrm/group"/>
-</component>
-</collection>
-<collection name="drm_info" long-name="DRM Info" level="specific"/>
-</block>
-<block name="locationsrv" level="specific" long-name="Location Services" levels="plugin fw server if">
-<collection name="locsrv_pub" long-name="Location Services Public Interfaces" level="if">
-<component name="landmarks_search_api" long-name="Landmarks Search API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
-</component>
-<component name="landmarks_api" long-name="Landmarks API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/group"/>
-</component>
-<component name="landmarks_database_management_api" long-name="Landmarks Database Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/group"/>
-</component>
-<component name="location_triggering_api" long-name="Location Triggering API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/location_triggering_api/group"/>
-</component>
-<component name="blid_application_satellite_info_api" long-name="BLID Application Satellite Info API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/group"/>
-</component>
-</collection>
-<collection name="locsrv_plat" long-name="Location Services Platform Interfaces" level="if">
-<component name="map_and_navigation_api" long-name="Map and Navigation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/group"/>
-</component>
-<component name="map_and_navigation_provider_discovery_api" long-name="Map and Navigation Provider Discovery API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/group"/>
-</component>
-<component name="geocoding_api" long-name="Geocoding API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
-</component>
-<component name="map_image_api" long-name="Map Image API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/group"/>
-</component>
-<component name="map_and_navigation_aiw_api" long-name="Map and Navigation AIW API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_aiw_api/group"/>
-</component>
-<component name="map_and_navigation_provider_api" long-name="Map and Navigation Provider API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_api/group"/>
-</component>
-<component name="landmarks_category_definition_api" long-name="Landmarks Category Definition API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
-</component>
-<component name="supl_settings_api" long-name="SUPL Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
-</component>
-<component name="location_settings_launch_api" long-name="Location Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/group"/>
-</component>
-<component name="map_image_conversion_plugin_api" long-name="Map Image Conversion Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/group"/>
-</component>
-<component name="psy_configuration_ui_plugin_api" long-name="PSY Configuration UI Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/psy_configuration_ui_plugin_api/group"/>
-</component>
-<component name="np_proxy_configuration_api" long-name="NP Proxy Configuration API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/np_proxy_configuration_api/group"/>
-</component>
-<component name="supl_terminal_initiation_api" long-name="SUPL Terminal Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/group"/>
-</component>
-<component name="location_notation_preferences_settings_api" long-name="Location Notation Preferences Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_notation_preferences_settings_api/group"/>
-</component>
-<component name="supl_settings_notifier_secondary_display_api" long-name="SUPL Settings Notifier Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_notifier_secondary_display_api/group"/>
-</component>
-<component name="supl_network_initiation_api" long-name="SUPL Network Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/group"/>
-</component>
-<component name="privacy_notifiers_secondary_display_api" long-name="Privacy Notifiers Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/privacy_notifiers_secondary_display_api/group"/>
-</component>
-<component name="oma_supl_configuration_parameter_api" long-name="OMA SUPL Configuration Parameter API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_configuration_parameter_api/group"/>
-</component>
-<component name="supl_query_secondary_display_api" long-name="SUPL Query Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_query_secondary_display_api/group"/>
-</component>
-<component name="location_triggering_management_api" long-name="Location Triggering Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_management_api/group"/>
-</component>
-<component name="location_triggering_status_information_api" long-name="Location Triggering Status Information API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_status_information_api/group"/>
-</component>
-<component name="oma_supl_asn_codec_plugin_api" long-name="OMA SUPL ASN Codec Plugin API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
-</component>
-<component name="query_and_notification_api" long-name="Query and Notification API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/query_and_notification_api/group"/>
-</component>
-<component name="location_local_variation_api" long-name="Location Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_local_variation_api/group"/>
-</component>
-</collection>
-<collection name="genericpositioningplugins" long-name="Generic Positioning Plugins" level="plugin">
-<component name="locationnpppsy" filter="s60" long-name="Location Positioning Proxy PSY" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
-</component>
-<component name="locationsuplpsy" filter="s60" long-name="Location SUPL PSY" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationsuplpsy/group"/>
-</component>
-<component name="genericpositioningplugins_build" filter="s60" long-name="Generic Positioning Plugins Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/genericpositioningplugins/group"/>
-</component>
-</collection>
-<collection name="landmarks" long-name="Landmarks" level="server">
-<component name="locationlandmarks" filter="s60" long-name="Location Landmarks">
-<unit bldFile="mw/locationsrv/landmarks/locationlandmarks/group"/>
-</component>
-</collection>
-<collection name="locationmapnavfw" long-name="Location Map and Navigation Framework" level="fw">
-<component name="mnlibrary" filter="s60" long-name="Map and Navigation Library">
-<unit bldFile="mw/locationsrv/locationmapnavfw/library/group"/>
-</component>
-<component name="mnaiwprovider" filter="s60" long-name="Map and Navigation AIW Provider" plugin="Y">
-<unit bldFile="mw/locationsrv/locationmapnavfw/aiwprovider/group"/>
-</component>
-<component name="locationmapnavfw_build" filter="s60" long-name="Location Map and Navigation Framework Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/locationmapnavfw/group"/>
-</component>
-</collection>
-<collection name="locationsystemui" long-name="Location System UI" level="if">
-<component name="locationsysui" filter="s60" long-name="Location System UI">
-<unit bldFile="mw/locationsrv/locationsystemui/locationsysui/group"/>
-</component>
-</collection>
-<collection name="supl" long-name="SUPL" level="fw">
-<component name="locationsuplfw" filter="s60" long-name="Location SUPL Framework">
-<unit bldFile="mw/locationsrv/supl/locationsuplfw/group"/>
-</component>
-<component name="locationomasuplprotocolhandler" filter="s60" long-name="OMA SUPL Protocol Handler">
-<unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/group"/>
-</component>
-<component name="supltiapiimplementation" filter="s60" long-name="SUPL TI API Implementation" introduced="^3">
-<unit bldFile="mw/locationsrv/supl/supltiapiimplementation/group"/>
-</component>
-</collection>
-<collection name="locationtriggering" long-name="Location Triggering" level="server">
-<component name="ltlogger" filter="s60" long-name="LT Logger">
-<unit bldFile="mw/locationsrv/locationtriggering/ltlogger/group"/>
-</component>
-<component name="ltclientlib" filter="s60" long-name="LT Client Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltclientlib/group"/>
-</component>
-<component name="ltmanagementlib" filter="s60" long-name="LT Management Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmanagementlib/group"/>
-</component>
-<component name="ltcontainer" filter="s60" long-name="LT Container">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontainer/group"/>
-</component>
-<component name="ltserver" filter="s60" long-name="LT Server">
-<unit bldFile="mw/locationsrv/locationtriggering/ltserver/group"/>
-</component>
-<component name="ltstrategypluginapi" filter="s60" long-name="LT Strategy Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategypluginapi/group"/>
-</component>
-<component name="ltstrategyengine" filter="s60" long-name="LT Strategy Engine">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategyengine/group"/>
-</component>
-<component name="ltmovementdetectionpluginapi" filter="s60" long-name="Movement Detection Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmovementdetectionpluginapi/group"/>
-</component>
-<component name="ltcellidmovementdetector" filter="s60" long-name="Cell ID Movement Detector">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/>
-</component>
-<component name="lbtmgmtui" filter="s60" long-name="LBT Management UI" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/lbtmgmtui/group"/>
-</component>
-<component name="ltcontextsourceplugin" filter="s60" long-name="LT Context Source Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontextsourceplugin/group"/>
-</component>
-<component name="locationtriggering_build" filter="s60" long-name="Location Triggering Build">
-<!-- should remove #include from this and maybe put exports in the above components -->
-<unit bldFile="mw/locationsrv/locationtriggering/group"/>
-</component>
-</collection>
-</block>
-<block name="accesssec" level="generic" long-name="Access Security" levels="plugin framework server generic specific">
-<collection name="accesssec_plat" long-name="Access Security Platform Interfaces" level="specific">
-<component name="wapi_security_settings_ui_api" long-name="WAPI Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_security_settings_ui_api/group"/>
-</component>
-<component name="wep_security_settings_ui_api" long-name="WEP Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wep_security_settings_ui_api/group"/>
-</component>
-<component name="wi-fi_protected_setup_ui_api" long-name="Wi-Fi Protected Setup UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
-</component>
-<component name="wlan_eap_settings_ui_api" long-name="WLAN EAP Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wlan_eap_settings_ui_api/group"/>
-</component>
-<component name="wpa_security_settings_ui_api" long-name="WPA Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wpa_security_settings_ui_api/group"/>
-</component>
-<component name="eap_vpn_api" long-name="EAP VPN API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
-</component>
-<component name="eapsim_db_api" long-name="EAP-SIM DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapsim_db_api/group"/>
-</component>
-<component name="eap_type_api" long-name="EAP Type API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_type_api/group"/>
-</component>
-<component name="eaptlspeap_db_api" long-name="EAP-TLS-PEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eaptlspeap_db_api/group"/>
-</component>
-<component name="eapleap_db_api" long-name="LEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapleap_db_api/group"/>
-</component>
-<component name="eapgtc_db_api" long-name="EAP-GTC DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapgtc_db_api/group"/>
-</component>
-<component name="eapmschapv2_db_api" long-name="EAP-MSCHAPV2 DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapmschapv2_db_api/group"/>
-</component>
-<component name="eapaka_db_api" long-name="EAP-AKA DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapaka_db_api/group"/>
-</component>
-<component name="wapi_db_api" long-name="WAPI DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_db_api/group"/>
-</component>
-</collection>
-<collection name="wlansecuritysettings" long-name="WLAN Security Settings" level="specific">
-<component name="wapisecuritysettingsui" filter="s60" long-name="WAPI Security Settings UI" introduced="9.1">
-<!-- the directory for this needs to be moved up to the right level -->
-<unit bldFile="mw/accesssec/wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
-</component>
-<component name="wepsecuritysettingsui" filter="s60" long-name="WEP Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wepsecuritysettingsui/group"/>
-</component>
-<component name="wifiprotectedsetup" filter="s60" long-name="WIFI Protected Setup" introduced="^1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wifiprotectedsetup/group"/>
-</component>
-<component name="wlaneapsettingsui" filter="s60" long-name="WLAN EAP Settings UI" introduced="9.3">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wlaneapsettingsui/group"/>
-</component>
-<component name="wpasecuritysettingsui" filter="s60" long-name="WPA Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wpasecuritysettingsui/group"/>
-</component>
-</collection>
-<collection name="eapol" long-name="EAPOL" level="framework">
-<component name="eapol_framework" filter="s60" long-name="EAPOL Framework" introduced="9.2">
-<unit bldFile="mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
-</component>
-</collection>
-</block>
-<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>
-<component name="bearer_settings_plugin_api" long-name="Bearer Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/bearer_settings_plugin_api/group"/>
-</component>
-<component name="commsdat_wlan_api" long-name="CommsDat WLAN API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/commsdat_wlan_api/group"/>
-</component>
-<component name="connection_monitor_extension_api" long-name="Connection Monitor Extension API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_monitor_extension_api/group"/>
-</component>
-<component name="connection_ui_utilities_api" long-name="Connection UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_ui_utilities_api/group"/>
-</component>
-<component name="disconnect_dialog_api" long-name="Disconnect Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_api/group"/>
-</component>
-<component name="disconnect_dialog_disable_api" long-name="Disconnect Dialog Disable API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_disable_api/group"/>
-</component>
-<component name="extended_connection_settings_api" long-name="Extended Connection Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/extended_connection_settings_api/group"/>
-</component>
-<component name="mpm_default_connection_api" long-name="MPM Default Connection API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_default_connection_api/group"/>
-</component>
-<component name="pdpcontextmanager2_reset_factory_settings_api" long-name="PDP Context Manager 2 Reset Factory Settings API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_settings_api/group"/>
-</component>
-<component name="mpm_connect_screen_api" long-name="MPM Connect Screen API" filter="s60" class="api">
-<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="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>
-<component name="access_point_engine_api" long-name="Access Point Engine API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_monitor_server_api/group"/>
-</component>
-<component name="connection_settings_ui_api" long-name="Connection Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_ui_api/group"/>
-</component>
-<component name="agent_dialog_api" long-name="Agent Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/agent_dialog_api/group"/>
-</component>
-<component name="extendedconnpref_api" long-name="Extended Connection Preferences API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/extendedconnpref_api/group"/>
-</component>
-</collection>
-<collection name="accesspointcontrol" long-name="Access Point Control" level="plugin">
-<component name="apcontrollistplugin" filter="s60" long-name="Access Point Control List Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
-</component>
-</collection>
-<collection name="alwayson_net_plugin" long-name="Always Online Net Plugin" level="server">
-<component name="pdpcontextmanager2" filter="s60" long-name="PDP Context Manager 2">
-<unit bldFile="mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
-</component>
-</collection>
-<collection name="apengine" long-name="Access Point Engine" level="framework">
-<component name="apeng" filter="s60" long-name="Access Point Engine">
-<unit bldFile="mw/ipconnmgmt/apengine/apeng/group"/>
-</component>
-<component name="apsettingshandlerui" filter="s60" long-name="Access Point Settings Handler UI">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingshandlerui/group"/>
-</component>
-<component name="apsettingsplugin" filter="s60" long-name="Access Point Settings Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="bearermanagement" long-name="Bearer Management" level="framework">
-<component name="mpm" filter="s60" long-name="Mobility Policy Manager">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/mpm/group"/>
-</component>
-<component name="extendedconnpref" filter="s60" long-name="Extended Connection Preferences">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/extendedconnpref/group"/>
-</component>
-<component name="s60mcpr" filter="s60" long-name="S60 Meta-Connection Provider" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/S60MCPR/group"/>
-</component>
-</collection>
-<collection name="cmmanager" long-name="Connection Method Manager" level="framework">
-<component name="cmmgr" filter="s60" long-name="CM Manager">
-<unit bldFile="mw/ipconnmgmt/cmmanager/cmmgr/group"/>
-</component>
-<component name="gsconnsettingsplugin" filter="s60" long-name="GS Connection Settings Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/cmmanager/gsconnsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="connectionmonitoring" long-name="Connection Monitoring" level="server">
-<component name="connectionmonitorplugin" filter="s60" long-name="Connection Monitor Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorplugin/group"/>
-</component>
-<component name="connectionmonitorui" filter="s60" long-name="Connection Monitor UI">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorui/group"/>
-</component>
-<component name="connmon" filter="s60" long-name="Connection Monitor">
-<!-- either split into two components, or #include from a common bld.inf -->
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/connectionmonitor/group"/>
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/dataconnectionlogger/group"/>
-</component>
-<component name="connmonext" filter="s60" long-name="Connection Monitor Extension API">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmonext/group"/>
-</component>
-</collection>
-<collection name="connectionutilities" long-name="Connection Utilities" level="utils">
-<component name="connectiondialogs" filter="s60" long-name="Connection Dialogs">
-<unit bldFile="mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/>
-</component>
-</collection>
-<collection name="dbcreator" long-name="DB Creator" level="utils">
-<component name="commsdatcreator" filter="s60" long-name="Comms Database Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
-</component>
-<component name="commsdatcreatorrfsplugin" filter="s60" long-name="Comms Database Creator RFS Plugin" introduced="9.3" plugin="Y">
-<!-- uncomment when config is turned on -->
-<!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
-</component>
-<component name="commsdatstartup" filter="s60" long-name="Comms Database Startup" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
-</component>
-<component name="dbcreatorexe" filter="s60" long-name="DB Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
-</component>
-<component name="dbcreator_build" filter="s60" long-name="DB Creator Build" introduced="9.3">
-<!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
-<unit bldFile="mw/ipconnmgmt/dbcreator/group"/>
-</component>
-</collection>
-<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"/>
-</component>
-<component name="ipcm_qt_build" long-name="IP Connectivity Management Qt Build" introduced="^4">
-<unit bldFile="mw/ipconnmgmt" proFile="ipconnmgmt.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</block>
-<block name="netprotocols" level="generic" long-name="High-level Internet Protocols" levels="plugin framework server generic specific">
-<collection name="netprotocols_plat" long-name="High-level Internet Protocols Platform Interfaces" level="specific">
-<component name="cookie_manager_api" long-name="Cookie Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/cookie_manager_api/group"/>
-</component>
-<component name="http_cache_mgr_api" long-name="HTTP Cache Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_cache_mgr_api/group"/>
-</component>
-<component name="http_filters_api" long-name="HTTP Filters API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_filters_api/group"/>
-</component>
-</collection>
-<collection name="httpfilters" long-name="HTTP Filters" level="plugin">
-<component name="httpfiltercommon" filter="s60" long-name="HTTP Filter Common">
-<unit bldFile="mw/netprotocols/httpfilters/httpfiltercommon/group"/>
-</component>
-<component name="cookie" filter="s60" long-name="Cookie Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/cookie/group"/>
-</component>
-<component name="deflatefilter" filter="s60" long-name="Deflate Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/deflatefilter/group"/>
-</component>
-<component name="httpfilteracceptheader" filter="s60" long-name="Accept Header Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteracceptheader/group"/>
-</component>
-<component name="httpfilterauthentication" filter="s60" long-name="Authentication Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterauthentication/group"/>
-</component>
-<component name="httpfilterconnhandler" filter="s60" long-name="Connection Handler Fitler" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterconnhandler/group"/>
-</component>
-<component name="httpfilteriop" filter="s60" long-name="HTTP IOP Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteriop/group"/>
-</component>
-<component name="httpfilterproxy" filter="s60" long-name="HTTP Proxy Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterproxy/group"/>
-</component>
-<component name="uaproffilter" filter="s60" long-name="UAProf Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/uaproffilter/group"/>
-</component>
-</collection>
-<collection name="applayerprotocols" long-name="Application Layer Protocols" level="server">
-<component name="httptransportfw" long-name="HTTP Transport Framework" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
-</component>
-<component name="httpexamples" long-name="HTTP Examples" introduced="6.2" purpose="development">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpexamples/group" mrp="mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
-</component>
-<component name="wappushsupport" long-name="WAP Push Support" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
-</component>
-<component name="wapbase" long-name="WAP Base" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wapbase/Group" mrp="mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
-</component>
-<component name="ftpengine" long-name="FTP Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/ftpengine/group" mrp="mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
-</component>
-<component name="telnetengine" long-name="Telnet Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/telnetengine/group" mrp="mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
-</component>
-<component name="httpserviceapi" long-name="HTTP Service API" introduced="TB9.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpservice/group" mrp="mw/netprotocols/applayerprotocols/httpservice/group/http_service.mrp"/>
-</component>
-</collection>
-<collection name="applayerpluginsandutils" long-name="Application Layer Plugins and Utils" level="framework">
-<component name="uripermissionservices" long-name="URI Permission Services" introduced="^2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
-</component>
-<component name="bookmarksupport" long-name="Bookmark Support" introduced="9.1" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
-</component>
-<component name="httpprotocolplugins" long-name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
-</component>
-<component name="httptransportplugins" long-name="HTTP Transport Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
-</component>
-</collection>
-<collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
-<component name="netprotocols_metadata" long-name="High-level Internet Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ipappprotocols" level="generic" long-name="IP App Protocols" levels="plugin conn server if">
-<collection name="ipappprotocols_plat" long-name="IP App Protocols Platform Interfaces" level="if">
-<component name="srtp_api" long-name="SRTP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/srtp_api/group"/>
-</component>
-<component name="rtprtcp_api" long-name="RTP/RTCP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/rtprtcp_api/group"/>
-</component>
-</collection>
-<collection name="rtp" long-name="RTP" level="server">
-<component name="srtpstack" filter="s60" long-name="SRTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/srtpstack/group"/>
-</component>
-<component name="rtpstack" filter="s60" long-name="RTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/rtpstack/group"/>
-</component>
-</collection>
-<collection name="realtimenetprots" long-name="Real Time Net Protocols" level="server">
-<component name="symrtp" long-name="RTP" introduced="9.0" purpose="optional">
-<!-- Real Time Data Protocol -->
-<unit bldFile="mw/ipappprotocols/realtimenetprots/rtp/group" mrp="mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
-</component>
-<component name="sipfw" long-name="SIP Framework" introduced="9.2" purpose="optional">
-<unit bldFile="mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp" version="2"/>
-</component>
-</collection>
-<collection name="sipplugins" long-name="SIP Plugins" level="plugin">
-<component name="sippwlanplugin" filter="s60" long-name="SIP WLAN Plugin" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
-</component>
-<component name="sippsipsettingsui" filter="s60" long-name="SIP Settings UI" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
-</component>
-<component name="sippdevmgmtsipadapter" filter="s60" long-name="Device Management SIP Settings Adapter" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
-</component>
-<component name="sippsystemstatemonitor" filter="s60" long-name="SIP System State Monitor" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsystemstatemonitor/group"/>
-</component>
-<component name="sippsipadapter" filter="s60" long-name="SIP Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipadapter/group"/>
-</component>
-</collection>
-<collection name="sipproviderplugins" long-name="SIP Provider Plugins" level="conn">
-<component name="sipprovider" long-name="SIP Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipproviderplugins/sipprovider/group" mrp="mw/ipappprotocols/sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
-</component>
-</collection>
-<collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="if">
-<component name="ipappprotocols_metadata" long-name="IP App Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wirelessacc" level="specific" long-name="Wireless Access" levels="framework generic ui">
-<collection name="hsfw_plat" long-name="HotSpot Framework Platform Interfaces" level="ui">
-<component name="hotspot_framework_client_api" long-name="HotSpot Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_api" long-name="Internet Connectivity Test Service API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_settings_api" long-name="Internet Connectivity Test Service Settings API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
-</component>
-<component name="hotspot_framework_client_plugin_api" long-name="HotSpot Framework Client Plugin API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
-</component>
-</collection>
-<collection name="hotspotfw" long-name="HotSpot Framework" level="framework">
-<component name="hsserver" filter="s60" long-name="HotSpot Server" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="hsclient" filter="s60" long-name="HotSpot Client" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="internetconnectivitytestservice" filter="s60" long-name="Internet Connectivity Test Service" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
-</component>
-<component name="ictsdialogs" filter="s60" long-name="Internet Connectivity Test Service Dialogs" deprecated="^3" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
-</component>
-<component name="hspluginforagent" filter="s60" long-name="HotSpot Plugin for Agent" plugin="Y" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
-</component>
-<component name="hsbrowser" filter="s60" long-name="HotSpot Browser" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
-</component>
-<component name="hotspotfw_build" filter="s60" long-name="Hotspot Framework Build">
-<!-- should break up this bld.inf into the above components, or collapse them all into a single component -->
-<unit bldFile="mw/wirelessacc/hotspotfw/group"/>
-</component>
-</collection>
-<collection name="wlanutilities" long-name="WLAN Utilities" level="generic">
-<component name="wlanutilities_build" long-name="WLAN Utilities Qt" introduced="^4" filter="s60">
-<!-- is this uinit needed, or is it sufficient to uncomment the units in the below components? -->
-<unit bldFile="mw/wirelessacc/wlanutilities" proFile="wlanutilities.pro" qmakeArgs="-r"/>
-</component>
-<component name="wlanqtutilities" filter="s60" long-name="WLAN Qt Utilities" introduced="^4" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlanplugin/group" qt:proFile="wlanqtutilities.pro"/>-->
-</component>
-<component name="wlansniffer" filter="s60" long-name="WLAN Sniffer" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlansettingsui/group" qt:proFile="wlansniffer.pro"/>-->
-</component>
-<component name="wlanentryplugin" filter="s60" long-name="WLAN Entry Plugin" plugin="Y" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlansniffer/group" qt:proFile="wlanentryplugin.pro"/>-->
-</component>
-<component name="wlanindicatorplugin" filter="s60" long-name="WLAN Indicator Plugin" plugin="Y" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlanindicatorplugin/group" qt:proFile="wlanindicatorplugin.pro"/>-->
-</component>
-<component name="cpwlansettingsplugin" filter="s60" long-name="WLAN Settings Control Panel Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="wlanutilities/cpwlansettingsplugin/group" qt:proFile="cpwlansettingsplugin.pro"/>-->
-</component>
-</collection>
-</block>
-<block name="vpnclient" level="specific" long-name="VPN Client" levels="engine ui api">
-<!-- is the !oem_build filter needed? -->
-<collection name="vpnc_plat" long-name="VPN Client Platform Interfaces" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API" class="api">
-<unit bldFile="mw/vpnclient/vpnc_plat/vpnapi/group"/>
-</component>
-</collection>
-<collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API">
-<unit bldFile="mw/vpnclient/vpnapiimpl/group"/>
-</component>
-</collection>
-<collection name="vpnengine" long-name="VPN Engine" level="engine">
-<!-- too many components in this collection.
- Probably best to group the binaries together into larger components
- or maybe split the collection into more reasonable groups -->
-<component name="eventmediatorapi" filter="s60" long-name="Event Mediator API">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediatorapi/group"/>
-</component>
-<component name="eventviewer" filter="s60" long-name="Event Viewer">
-<unit bldFile="mw/vpnclient/vpnengine/eventviewer/group"/>
-</component>
-<component name="vpnins" filter="s60" long-name="VPN Installer">
-<unit bldFile="mw/vpnclient/vpnengine/vpnins/group"/>
-</component>
-<component name="ikepolparser" filter="s60" long-name="IKE Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/ikepolparser/group"/>
-</component>
-<component name="utlbase64" filter="s60" long-name="Base64 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlbase64/group"/>
-</component>
-<component name="utlcrypto" filter="s60" long-name="Crypto Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlcrypto/group"/>
-</component>
-<component name="utlxml" filter="s60" long-name="XML Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlxml/group"/>
-</component>
-<component name="utlpkcs10" filter="s60" long-name="PKCS#10 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs10/group"/>
-</component>
-<component name="pkiserviceapi" filter="s60" long-name="PKI Service API">
-<unit bldFile="mw/vpnclient/vpnengine/pkiserviceapi/group"/>
-</component>
-<component name="ikecert" filter="s60" long-name="IKE Certificate Management">
-<unit bldFile="mw/vpnclient/vpnengine/ikecert/group"/>
-</component>
-<component name="kmdapi" filter="s60" long-name="Key Management Daemon API">
-<unit bldFile="mw/vpnclient/vpnengine/kmdapi/group"/>
-</component>
-<component name="kmdserver" filter="s60" long-name="Key Management Daemon Server">
-<unit bldFile="mw/vpnclient/vpnengine/kmdserver/group"/>
-</component>
-<component name="ikeutils" filter="s60" long-name="Internet Key Exchange Utils">
-<unit bldFile="mw/vpnclient/vpnengine/ikeutils/group"/>
-</component>
-<component name="ikev1lib" filter="s60" long-name="IKEv1 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev1lib/group"/>
-</component>
-<component name="ikev2lib" filter="s60" long-name="IKEv2 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev2lib/group"/>
-</component>
-<component name="vpnipsecpolparser" filter="s60" long-name="VPN IPsec Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/vpnipsecpolparser/group"/>
-</component>
-<component name="sit" filter="s60" long-name="Socket Interaction Thread">
-<unit bldFile="mw/vpnclient/vpnengine/sit/group"/>
-</component>
-<component name="vpntcwrapper" filter="s60" long-name="VPN Terminal Control Wrapper">
-<unit bldFile="mw/vpnclient/vpnengine/vpntcwrapper/group"/>
-</component>
-<component name="eventmediator" filter="s60" long-name="Event Mediator">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediator/group"/>
-</component>
-<component name="pkiservice" filter="s60" long-name="PKI Service">
-<unit bldFile="mw/vpnclient/vpnengine/pkiservice/group"/>
-</component>
-<component name="vpnconnagt" filter="s60" long-name="VPN Connection Agent">
-<unit bldFile="mw/vpnclient/vpnengine/vpnconnagt/group"/>
-</component>
-<component name="vpnmanager" filter="s60" long-name="VPN Manager">
-<unit bldFile="mw/vpnclient/vpnengine/vpnmanager/group"/>
-</component>
-<component name="vpncleaner" filter="s60" long-name="VPN Cleaner">
-<unit bldFile="mw/vpnclient/vpnengine/vpncleaner/group"/>
-</component>
-<component name="utlpkcs12" filter="s60" long-name="PKCS#12 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs12/group"/>
-</component>
-<component name="dmadengine" filter="s60" long-name="DM Adapter Engine">
-<unit bldFile="mw/vpnclient/vpnengine/dmadengine/group"/>
-</component>
-<component name="dmadipsecvpn" filter="s60" long-name="IPsec VPN DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadipsecvpn/group"/>
-</component>
-<component name="dmadpki" filter="s60" long-name="PKI DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadpki/group"/>
-</component>
-<component name="ikesocket" filter="s60" long-name="IKE Socket" introduced="^3">
-<unit bldFile="mw/vpnclient/vpnengine/ikesocket/group"/>
-</component>
-</collection>
-<collection name="vpnui" long-name="VPN UI" level="ui">
-<component name="vpnecomnotifier" filter="s60" long-name="VPN ECOM Notifier" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnecomnotifier/group"/>
-</component>
-<component name="vpndialogmanager" filter="s60" long-name="VPN Dialog Manager">
-<unit bldFile="mw/vpnclient/vpnui/vpndialogmanager/group"/>
-</component>
-<component name="vpnpolins" filter="s60" long-name="VPN Policy Installer">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolins/group"/>
-</component>
-<component name="vpnpolicyrecognizer" filter="s60" long-name="VPN Policy Recognizer" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolicyrecognizer/group"/>
-</component>
-</collection>
-<collection name="vpnclient_info" long-name="VPN Client Info" level="api">
-<component name="vpnclient_help" filter="s60" long-name="VPN Client Help">
-<unit bldFile="mw/vpnclient/help/group"/>
-</component>
-<component name="vpnclient_build" filter="s60" long-name="VPN Client Build">
-<!-- should split this up into the other components and remove this-->
-<unit bldFile="mw/vpnclient/group"/>
-</component>
-</collection>
-</block>
-<block name="ipappsrv" level="specific" long-name="IP App Services" levels="framework generic server conn plugin">
-<collection name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" level="plugin">
-<component name="transcoder_api" long-name="Transcoder API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
-</component>
-<component name="comms_event_api" long-name="Comms Event API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/comms_event_api/group"/>
-</component>
-<component name="floor_control_api" long-name="Floor Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/floor_control_api/group"/>
-</component>
-<component name="media_control_api" long-name="Media Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/media_control_api/group"/>
-</component>
-<component name="multimedia_comms_api" long-name="Multimedia Comms API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/multimedia_comms_api/group"/>
-</component>
-<component name="nat_settings_api" long-name="NAT Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/nat_settings_api/group"/>
-</component>
-</collection>
-<collection name="natfw" long-name="NAT Framework" level="framework">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="natfw_build" filter="s60" long-name="NAT Framework Build" introduced="^2">
-<unit bldFile="mw/ipappsrv/natfw/group"/>
-</component>
-</collection>
-<collection name="multimediacommscontroller" long-name="Multimedia Comms Controller" level="conn">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommscontroller_build" filter="s60" long-name="Multimedia Comms Controller Build">
-<unit bldFile="mw/ipappsrv/multimediacommscontroller/group"/>
-</component>
-</collection>
-<collection name="multimediacommsengine" long-name="Multimedia Comms Engine" level="generic">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommsengine_build" filter="s60" long-name="Multimedia Comms Engine Build">
-<unit bldFile="mw/ipappsrv/multimediacommsengine/group"/>
-</component>
-</collection>
-<collection name="natplugins" long-name="NAT Plugins" level="plugin">
-<component name="natpcliprovisioningnatfwadapter" filter="s60" long-name="Client Provisioning NAT Framework Traversal Adapter" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/group"/>
-</component>
-<component name="natpdevmgmtnatfwadapter" filter="s60" long-name="Device Management NAT Framework Traversal Adapter" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/group"/>
-</component>
-<component name="natptraversalcontroller" filter="s60" long-name="NAT Traversal Controller" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natptraversalcontroller/group"/>
-</component>
-<component name="natpnatfwsdpprovider" filter="s60" long-name="NAT Framework SDP Provider" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpnatfwsdpprovider/group"/>
-</component>
-</collection>
-<collection name="ipappsrv_info" long-name="IP App Services Info" level="plugin">
-<component name="ipappsrv_build" long-name="IP App Services Build" filter="s60">
-<!-- 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">
-<collection name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" level="specific">
-<component name="string_parser_api" long-name="String Parser API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/string_parser_api/group"/>
-</component>
-<component name="cbs_mcn_client_api" long-name="CBS MCN Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cbs_mcn_client_api/group"/>
-</component>
-<component name="converged_call_engine_api" long-name="Converged Call Engine API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_engine_api/group"/>
-</component>
-<component name="aiw_dial_data_consumer_api" long-name="AIW Dial Data Consumer API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/aiw_dial_data_consumer_api/group"/>
-</component>
-<component name="phone_client_ussd_api" long-name="Phone Client USSD API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_api/group"/>
-</component>
-<component name="sat_refresh_api" long-name="SAT Refresh API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_refresh_api/group" filter="!test"/>
-</component>
-<component name="network_handling_engine_api" long-name="Network Handling Engine API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/network_handling_engine_api/group"/>
-</component>
-<component name="phone_client_emergency_call_api" long-name="Phone Client Emergency Call API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/group"/>
-</component>
-<component name="sat_configuration_api" long-name="SAT Configuration API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_configuration_api/group"/>
-</component>
-<component name="dial_utils_api" long-name="Dial Utils API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/dial_utils_api/group"/>
-</component>
-<component name="phone_client_image_handler_api" long-name="Phone Client Image Handler API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_image_handler_api/group"/>
-</component>
-<component name="phone_client_messenger_api" long-name="Phone Client Messenger API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_messenger_api/group"/>
-</component>
-<component name="sat_client_api" long-name="SAT Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_client_api/group" filter="!test"/>
-</component>
-<component name="phone_client_api" long-name="Phone Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_api/group"/>
-</component>
-<component name="sat_service_api" long-name="SAT Service API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_service_api/group" filter="!test"/>
-</component>
-<component name="cbs_message_api" long-name="CBS Message API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cbs_message_api/group"/>
-</component>
-<component name="phone_client_server_information_api" long-name="Phone Client Server Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_server_information_api/group"/>
-</component>
-<component name="phone_client_ussd_internal_api" long-name="Phone Client USSD Internal API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_internal_api/group"/>
-</component>
-<component name="phone_client_command_handler_api" long-name="Phone Client Command Handler API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_command_handler_api/group"/>
-</component>
-<component name="phone_client_notify_api" long-name="Phone Client Notify API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_notify_api/group"/>
-</component>
-<component name="phone_client_utility_api" long-name="Phone Client Utility API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_utility_api/group"/>
-</component>
-<component name="telephony_network_information_api" long-name="Telephony Network Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_network_information_api/group"/>
-</component>
-<component name="secondary_display_sat_api" long-name="Secondary Display SAT API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/secondary_display_sat_api/group"/>
-</component>
-<component name="callui_reconnect_query_api" long-name="CallUI Reconnect Query API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/callui_reconnect_query_api/group"/>
-</component>
-<component name="service_provider_settings_api" long-name="Service Provider Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/service_provider_settings_api/group"/>
-</component>
-<component name="converged_call_provider_api" long-name="Converged Call Provider API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_provider_api/group"/>
-</component>
-<component name="incoming_call_monitor_api" long-name="Incoming Call Monitor API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/incoming_call_monitor_api/group"/>
-</component>
-<component name="default_emergency_numbers_api" long-name="Default Emergency Numbers API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/default_emergency_numbers_api/group"/>
-</component>
-<component name="cenrep_database_api" long-name="Central Repository Database API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cenrep_database_api/group"/>
-</component>
-<component name="ss_settings_api" long-name="SS Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/ss_settings_api/group"/>
-</component>
-<component name="phone_settings_observer_api" long-name="Phone Settings Observer API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_observer_api/group"/>
-</component>
-<component name="phone_settings_notes_ui_api" long-name="Phone Settings Notes UI API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_notes_ui_api/group"/>
-</component>
-<component name="phone_settings_api" long-name="Phone Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_api/group"/>
-</component>
-<component name="voice_mailbox_number_api" long-name="Voice Mailbox Number API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_number_api/group"/>
-</component>
-<component name="voice_mailbox_settings_api" long-name="Voice Mailbox Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_settings_api/group"/>
-</component>
-<component name="call_information_api" long-name="Call Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/call_information_api/group" filter="!test"/>
-</component>
-<component name="call_remote_party_information_api" long-name="Call Remote Party Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/call_remote_party_information_api/group" filter="!test"/>
-</component>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_mediator_api/group" filter="!test"/>
-</component>
-<component name="dialpad_api" long-name="Dialpad API" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/dialpad_api/group"/>
-</component>
-</collection>
-<collection name="cellular" long-name="Cellular" level="server">
-<component name="telephonysettings" filter="s60" long-name="Telephony Settings" purpose="development"/>
-<component name="sssettings" filter="s60" long-name="Supplementary Service Settings" purpose="development"/>
-<component name="psetnotesui" filter="s60" long-name="Phone Settings Notes UI" purpose="development"/>
-</collection>
-<collection name="convergedcallengine" long-name="Converged Call Engine" level="framework">
-<component name="cce" filter="s60" long-name="CCE" purpose="development"/>
-<component name="spsettings" filter="s60" long-name="Service Provider Settings" purpose="development"/>
-</collection>
-<collection name="phoneclientserver" long-name="Phone Client/Server" level="server">
-<component name="aiwdialdata" filter="s60" long-name="AIW Dial Data" purpose="development"/>
-<component name="dialutils" filter="s60" long-name="Dial Utils" purpose="development"/>
-<component name="phoneclient" filter="s60" long-name="Phone Client" purpose="development"/>
-</collection>
-<collection name="phonesrv_info" long-name="Phone Server Info" level="generic">
-<component name="phonesrv_build" long-name="Phone Server Build" filter="s60">
-<unit bldFile="mw/phonesrv" proFile="phonesrv.pro"/>
-</component>
-</collection>
-</block>
-<block name="messagingmw" level="specific" long-name="Messaging Middleware" levels="stack support fw api">
-<collection name="msgfw_plat" long-name="Messaging Middleware Platform Interfaces" level="api">
-<component name="always_online_plugin_api" long-name="Always Online Plugin API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_plugin_api/group"/>
-</component>
-<component name="always_online_client_api" long-name="Always Online Client API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_client_api/group"/>
-</component>
-<component name="msg_common_utils_api" long-name="Messaging Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/msg_common_utils_api/group"/>
-</component>
-<component name="muiu_utils_api" long-name="Messaging Center UI Utilities API" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/muiu_utils_api/group"/>
-</component>
-</collection>
-<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" class="config">
-<unit bldFile="mw/messagingmw/msgbranched/group"/>
-</component>
-</collection>
-<collection name="messagingfw" long-name="Messaging Framework" level="fw">
-<!-- should break this collection up into smaller related collections -->
-<component name="send_ui_api" long-name="Send UI API" filter="s60" deprecated="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/send_ui_api/group"/>
-</component>
-<component name="send_ui_plugin_api" long-name="Send UI Plug-in API" filter="s60" deprecated="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/send_ui_plugin_api/group"/>
-</component>
-<component name="send_ui_datautils_api" long-name="Send UI Data Utils API" filter="s60" deprecated="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/send_ui_datautils_api/group"/>
-</component>
-<component name="alwaysonline" filter="s60" long-name="Always Online Server" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/alwaysonline/group"/>
-</component>
-<component name="msgcommonutils" filter="s60" long-name="Messaging Common Utils" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/msgcommonutils/group"/>
-</component>
-<component name="senduiservices" filter="s60" long-name="Send UI Services" introduced="^2" deprecated="^4">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/senduiservices/group"/>
-</component>
-<component name="muiuutils" long-name="Messaging Center UI Utilities" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/muiuutils/group"/>
-</component>
-<component name="scheduledsendmtm" long-name="Scheduled Send MTM" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/group" mrp="mw/messagingmw/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
-</component>
-<component name="msgsrvnstore" long-name="Message Server and Store" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/group" mrp="mw/messagingmw/messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
-</component>
-<component name="biomsgfw" long-name="BIO Messaging Framework" introduced="6.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/group" mrp="mw/messagingmw/messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
-</component>
-<component name="msgconf" long-name="Messaging Config" introduced="^2" purpose="optional" class="config">
-<unit bldFile="mw/messagingmw/messagingfw/msgconf/group" mrp="mw/messagingmw/messagingfw/msgconf/group/messaging_config.mrp"/>
-</component>
-<component name="watcherfw" long-name="Watcher Framework" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/watcherfw/group" mrp="mw/messagingmw/messagingfw/watcherfw/group/messaging_watcher.mrp"/>
-</component>
-<component name="msgtest" long-name="Messaging Test" purpose="development">
-<unit bldFile="mw/messagingmw/messagingfw/msgtest/group" mrp="mw/messagingmw/messagingfw/msgtest/group/messaging_test.mrp"/>
-</component>
-<component name="sendas" long-name="Send As" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/sendas/group" mrp="mw/messagingmw/messagingfw/sendas/group/messaging_sendas2.mrp"/>
-</component>
-<component name="msgurlhandler" long-name="Message URL Handler" introduced="7.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/group" mrp="mw/messagingmw/messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
-</component>
-<component name="wappushfw" long-name="WAP Push Framework" introduced="6.1" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/wappushfw/group" mrp="mw/messagingmw/messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
-</component>
-<component name="suplsmshandler" long-name="SUPL SMS Handler" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplsmshandler/group" mrp="mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/>
-</component>
-<component name="suplwappushhandler" long-name="SUPL WAP Push Handler" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
-</component>
-</collection>
-<collection name="messagingmw_info" long-name="Messaging Middleware Info" level="api">
-<component name="messagingmw_metadata" long-name="Messaging Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="imsrv" level="specific" long-name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
-<collection name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" level="specific">
-<component name="ximp_core_data_model_api" long-name="XIMP Core Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_host_api" long-name="XIMP Presence Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_presence_data_model_api" long-name="XIMP Presence Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_api" long-name="XIMP Presence Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_presence_management_api" long-name="XIMP Presence Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_management_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_host_api" long-name="XIMP Core Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_core_management_api" long-name="XIMP Core Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_management_api/group"/>
-</component>
-<component name="ximp_presence_base_api" long-name="XIMP Presence Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_base_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_api" long-name="XIMP Core Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_core_base_api" long-name="XIMP Core Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_base_api/group"/>
-</component>
-<component name="ximp_presence_cache_api" long-name="XIMP Presence Cache API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_cache_api/group"/>
-</component>
-<component name="ximp_core_feature_plugin_api" long-name="XIMP Core Feature Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_host_api" long-name="XIMP IM Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_im_data_model_api" long-name="XIMP IM Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_data_model_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_api" long-name="XIMP IM Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_im_management_api" long-name="XIMP IM Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_management_api/group"/>
-</component>
-<component name="ximp_im_base_api" long-name="XIMP IM Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_base_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_host_api" long-name="XIMP Search Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_search_data_model_api" long-name="XIMP Search Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_data_model_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_api" long-name="XIMP search Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_search_management_api" long-name="XIMP Search Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_management_api/group"/>
-</component>
-<component name="ximp_search_base_api" long-name="XIMP Search Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_base_api/group"/>
-</component>
-<component name="xmpp_settings_api" long-name="XMPP Settings API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/group"/>
-</component>
-<component name="im_cache_client_api" long-name="IM Cache Client API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/im_cache_client_api/group"/>
-</component>
-<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 Avability Text" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
-</component>
-</collection>
-<collection name="ximpfw" long-name="XIMP Framework" level="framework">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="ximpfw_build" filter="s60" long-name="XIMP Framework Build">
-<unit bldFile="mw/imsrv/ximpfw/group"/>
-</component>
-</collection>
-<collection name="imservices" long-name="IM Services" level="generic">
-<component name="imfeatureplugin" filter="s60" long-name="IM Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/imfeatureplugin/group"/>
-</component>
-<component name="searchfeatureplugin" filter="s60" long-name="Search Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/searchfeatureplugin/group"/>
-</component>
-<component name="xmppsettingsapi" filter="s60" long-name="XMPP Settings API" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsapi/group"/>
-</component>
-<component name="xmppsettingsfetcher" filter="s60" long-name="XMPP Settings Fetcher" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/group"/>
-</component>
-<component name="instantmessagingcache" filter="s60" long-name="Instant Messaging Cache" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/instantmessagingcache/group"/>
-</component>
-</collection>
-<collection name="brandingserver" long-name="Branding Server" level="specific">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="brandingserver_build" filter="s60" long-name="Branding Server Build">
-<unit bldFile="mw/imsrv/brandingserver/group"/>
-</component>
-</collection>
-</block>
-<block name="legacypresence" level="specific" long-name="Legacy Presence Services" levels="engine fw ui">
-<collection name="pressrv_plat" long-name="Legacy Presence Services Platform Interfaces" level="ui">
-<component name="presence_list_api" long-name="Presence List API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/presence_list_api/group"/>
-</component>
-<component name="watcher_info_api" long-name="Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_info_api/group"/>
-</component>
-<component name="simple_documents_api" long-name="SIMPLE Documents API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_documents_api/group"/>
-</component>
-<component name="authorization_api" long-name="Authorization API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/authorization_api/group"/>
-</component>
-<component name="xdm_protocol_plugin_api" long-name="XDM Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_protocol_plugin_api/group"/>
-</component>
-<component name="watcher_api" long-name="Watcher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_api/group"/>
-</component>
-<component name="xdm_api" long-name="XDM API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_api/group"/>
-</component>
-<component name="registration_api" long-name="Registration API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/registration_api/group"/>
-</component>
-<component name="publisher_api" long-name="Publisher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/publisher_api/group"/>
-</component>
-<component name="messaging_connection_manager_api" long-name="Messaging Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/messaging_connection_manager_api/group"/>
-</component>
-<component name="xdm_settings_api" long-name="XDM Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_settings_api/group"/>
-</component>
-<component name="simple_settings_api" long-name="SIMPLE Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_settings_api/group"/>
-</component>
-<component name="simple_instant_msg_api" long-name="Simple Instant Msg API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_instant_msg_api/group"/>
-</component>
-</collection>
-<collection name="xdmengine" long-name="XDM Engine" level="engine">
-<!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
-<component name="xdmengine_build" filter="s60" long-name="XDM Engine Build">
-<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">
-<unit bldFile="mw/legacypresence/xdmprotocols/group"/>
-</component>
-</collection>
-<collection name="msgconnmanager" long-name="Messaging Connection Manager" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="msgconnmanager_build" filter="s60" long-name="Messaging Connection Manager Build">
-<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">
-<unit bldFile="mw/legacypresence/simpleengine/group"/>
-</component>
-</collection>
-<collection name="presencefwsimpleadpt" long-name="Presence Framework SIMPLE Adaptation" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="simpleplugin" filter="s60" long-name="SIMPLE Plugin" plugin="Y">
-<unit bldFile="mw/legacypresence/presencefwsimpleadpt/group"/>
-</component>
-</collection>
-<collection name="simpledatamodeladapter" long-name="SIMPLE Data Model Adapter" level="fw">
-<component name="presenceplugin" filter="s60" long-name="Presence Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/legacypresence/simpledatamodeladapter/group"/>
-</component>
-</collection>
-</block>
-<block name="opensrv" level="specific" long-name="Open Services" levels="prt lib server eng">
-<collection name="opensrv_plat" long-name="Open Services Platform Interfaces" level="eng">
-<component name="messagequeue_api" long-name="Message Queue API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/opensrv/opensrv_plat/messagequeue_api/group"/>
-</component>
-</collection>
-<collection name="loudmouth" long-name="Loudmouth" level="prt">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="loudmouth_build" filter="s60" long-name="Loudmouth Build" introduced="^2">
-<unit bldFile="mw/opensrv/loudmouth/group"/>
-</component>
-</collection>
-<collection name="libtelepathy" long-name="Telepathy Library" level="lib">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="libtelepathy_build" filter="s60" long-name="Telepathy Library Build" introduced="^2">
-<unit bldFile="mw/opensrv/libtelepathy/group"/>
-</component>
-</collection>
-<collection name="telepathygabble" long-name="Telepathy Gabble" level="eng">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="telepathygabble_build" filter="s60" long-name="Telepathy Gabble Build" introduced="^2">
-<unit bldFile="mw/opensrv/telepathygabble/group"/>
-</component>
-</collection>
-<collection name="isolationserver" long-name="Isolation Server" level="server">
-<component name="messagequeue" filter="s60" long-name="Message Queue" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/messagequeue/group"/>
-</component>
-<component name="isoserver" filter="s60" long-name="ISO Server" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/isoserver/group"/>
-</component>
-<component name="isolationserver_build" filter="s60" long-name="Isloation Server Build" introduced="^2">
-<!-- needs #includes removed. either move the exports to another component or make this a ROM component -->
-<unit bldFile="mw/opensrv/isolationserver/group"/>
-</component>
-</collection>
-</block>
-<block name="searchsrv" level="specific" long-name="Search Services" levels="services engine generic api">
-<collection name="searchsrv_plat" long-name="Search Services Platform Interfaces" level="api">
-<component name="cpix_utility_api" long-name="CPIX Utility API" filter="s60" class="api">
-<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_utility_api/group"/>
-</component>
-<component name="cpix_framework_api" long-name="CPIX Framework API" filter="s60" class="api">
-<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_framework_api/group"/>
-</component>
-<component name="cpix_search_api" long-name="CPIX Search API" filter="s60" class="api">
-<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_search_api/group"/>
-</component>
-</collection>
-<collection name="searchengine" long-name="Search Engine" level="engine">
-<component name="searchengine_util" long-name="Search Engine Utils" filter="s60">
-<unit bldFile="mw/searchsrv/searchengine/util/group"/>
-</component>
-<component name="searchengine_oss" long-name="Search Engine OSS" filter="s60">
-<unit bldFile="mw/searchsrv/searchengine/oss/group"/>
-</component>
-<component name="cpix" long-name="Cross Platform Indexing Engine" filter="s60">
-<unit bldFile="mw/searchsrv/searchengine/cpix/group"/>
-</component>
-</collection>
-<collection name="searcher" long-name="Searcher" level="generic">
-<component name="searchclient" long-name="Search Client" filter="s60">
-<unit bldFile="mw/searchsrv/searcher/SearchClient/group"/>
-</component>
-<component name="searchserver" long-name="Search Server" filter="s60">
-<unit bldFile="mw/searchsrv/searcher/SearchServer/group"/>
-</component>
-<component name="searcher_test" long-name="Searcher Tests" filter="s60" purpose="development">
-<!-- #include from common bld.inf or split into two components -->
-<unit bldFile="mw/searchsrv/searcher/tsrc/RobustnessTest/group"/>
-<unit bldFile="mw/searchsrv/searcher/tsrc/LogPlayer/group"/>
-</component>
-</collection>
-<collection name="searchsrv_harvester" long-name="Search Services Harvester" level="services">
-<component name="searchsrv_pluginfw" long-name="Search Server" filter="s60">
-<unit bldFile="mw/searchsrv/harvester/pluginfw/group"/>
-</component>
-<component name="searchsrv_harvesterserver" long-name="Search Harvester Server" filter="s60">
-<unit bldFile="mw/searchsrv/harvester/HarvesterServer/group"/>
-</component>
-</collection>
-<collection name="searchsrv_watchdog" long-name="Search Services Watch Dog" level="services">
-<component name="searchsrv_watchdog_build" long-name="Search Services Watch Dog Build" filter="s60">
-<unit bldFile="mw/searchsrv/WatchDog/group"/>
-</component>
-</collection>
-<collection name="qcpix" long-name="Qt CPIX" level="engine">
-<component name="qcpix_build" long-name="Qt CPIX Build">
-<unit bldFile="mw/searchsrv/qcpix" proFile="qcpix.pro"/>
-</component>
-</collection>
-<collection name="searchsrv_info" long-name="Search Services Info">
-<component name="searchsrv_build" long-name="Search Services Build">
-<!-- move exports to own component and remove this -->
-<unit bldFile="mw/searchsrv/group"/>
-</component>
-</collection>
-</block>
-<block name="remotemgmt" level="specific" long-name="Remote Management" levels="plugin framework server generic specific">
-<collection name="remotemgmt_pub" long-name="Remote Management Public Interfaces" level="specific">
-<component name="synchronization_capability_api" long-name="Synchronization Capability API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
-</component>
-</collection>
-<collection name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" level="specific">
-<component name="common_agent_util_and_definitions_api" long-name="Common Agent util and definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
-</component>
-<component name="policy_management_certificate_api" long-name="Policy Management Certificate API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/group"/>
-</component>
-<component name="oma_provisioning_adapter_api" long-name="OMA Provisioning Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_adapter_api/group"/>
-</component>
-<component name="device_management_parameter_api" long-name="Device Management Parameter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_parameter_api/group"/>
-</component>
-<component name="data_synchronization_plugin_api" long-name="Data Synchronization Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/group"/>
-</component>
-<component name="sync_alert_handler_api" long-name="Sync Alert Handler API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
-</component>
-<component name="syncml_notifier_api" long-name="SyncML Notifier API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
-</component>
-<component name="syncml_client_api" long-name="SyncML Client API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
-</component>
-<component name="device_management_plugin_api" long-name="Device Management plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_plugin_api/group"/>
-</component>
-<component name="dm_tree_apis" long-name="DM Tree APIs" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
-</component>
-<component name="terminal_security_device_lock_api" long-name="Terminal Security Device Lock API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/group"/>
-</component>
-<component name="policy_management_request_api" long-name="Policy Management Request API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/group"/>
-</component>
-<component name="ds_constant_definitions_api" long-name="DS Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_constant_definitions_api/group"/>
-</component>
-<component name="scp_server_api" long-name="SCP Server API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/group"/>
-</component>
-<component name="data_synchronization_notification_api" long-name="Data Synchronization Notification API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_notification_api/group"/>
-</component>
-<component name="oma_provisioning_engine_api" long-name="OMA Provisioning Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/group"/>
-</component>
-<component name="dm_utils_api" long-name="DM Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/group"/>
-</component>
-<component name="syncml_alert_api" long-name="SyncML Alert API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/group"/>
-</component>
-<component name="obex_client_session_api" long-name="OBEX Client session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/obex_client_session_api/group"/>
-</component>
-<component name="setting_enforcement_info_api" long-name="Setting Enforcement Info API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/group"/>
-</component>
-<component name="dm_constant_definitions_api" long-name="DM Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
-</component>
-<component name="oma_ds_extensions_api" long-name="OMA DS Extensions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
-</component>
-<component name="pnpms_utils_api" long-name="PNPMS Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
-</component>
-<component name="diagnostics_plugin_utility_api" long-name="Diagnostics Plugin Utility API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
-</component>
-<component name="diagnostics_plugin_api" long-name="Diagnostics Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
-</component>
-<component name="diagnostics_framework_api" long-name="Diagnostics Framework API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
-</component>
-<component name="diagnostics_results_api" long-name="Diagnostics Results API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
-</component>
-<component name="diagnostics_plugin_pool_api" long-name="Diagnostics Plugin Pool API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
-</component>
-<component name="adaptive_history_list_api" long-name="Adaptive History List API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
-</component>
-<component name="adaptive_history_list_session_api" long-name="Adaptive History List Session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
-</component>
-<component name="fota_engine_api" long-name="FOTA Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
-</component>
-<component name="update_package_storage_plugin_api" long-name="Update Package Storage Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
-</component>
-<component name="syncml_notifier_roaming_api" long-name="SyncML Notifier Roaming API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
-</component>
-<component name="sync_service_api" long-name="Sync Service API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_service_api/group"/>
-</component>
-<component name="dcmo_adapter_api" long-name="DCMO Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_adapter_api/group"/>
-</component>
-<component name="dcmo_control_api" long-name="DCMO Control API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_control_api/group"/>
-</component>
-<component name="ds_capability_mgmt_plugin_api" long-name="DS Capability Management Plugin API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
-</component>
-</collection>
-<collection name="policymanagement" long-name="Policy Management" level="generic">
-<component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">
-<unit bldFile="mw/remotemgmt/policymanagement/pmdmadapter/group"/>
-</component>
-<component name="dmutilserver" filter="s60" long-name="DM Util Server">
-<unit bldFile="mw/remotemgmt/policymanagement/dmutilserver/group"/>
-</component>
-<component name="policyengine" filter="s60" long-name="Policy Engine">
-<unit bldFile="mw/remotemgmt/policymanagement/policyengine/group" filter="!dfs_build"/>
-</component>
-<component name="policymanagement_build" filter="s60" long-name="Policy Management Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/policymanagement/group"/>
-</component>
-</collection>
-<collection name="syncmlfw" long-name="SyncML Framework" level="server">
-<component name="syncmlfw_build" filter="s60" long-name="SyncML Framework Build">
-<!-- need to break this up into components. Too convoluted a structure to be in a single bld.inf-->
-<unit bldFile="mw/remotemgmt/syncmlfw/group"/>
-</component>
-</collection>
-<collection name="terminalsecurity" long-name="Terminal Security" level="specific">
-<component name="scp" filter="s60" long-name="Security Code Proxy">
-<!-- can only have one unit, need to have these #included from a single bld.inf -->
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpdatabase/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpserver/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scppatternplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scphistoryplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scptimestampplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpeventhandler/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/dmeventnotifier/group"/>
-</component>
-<component name="terminalsecurity_client" filter="s60" long-name="Terminal Control Client">
-<unit bldFile="mw/remotemgmt/terminalsecurity/client/group"/>
-</component>
-<component name="terminalsecurity_server" filter="s60" long-name="Terminal Control Server">
-<unit bldFile="mw/remotemgmt/terminalsecurity/server/group"/>
-</component>
-<component name="tcadapter" filter="s60" long-name="Terminal Control Adapter">
-<unit bldFile="mw/remotemgmt/terminalsecurity/tcadapter/bld"/>
-</component>
-<component name="terminalsecurity_build" filter="s60" long-name="Terminal Security Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/terminalsecurity/group"/>
-</component>
-</collection>
-<collection name="omaprovisioning" long-name="OMA Provisioning" level="specific">
-<component name="pnputil" filter="s60" long-name="PnP Util">
-<unit bldFile="mw/remotemgmt/omaprovisioning/pnputil/group"/>
-</component>
-<component name="provisioning" filter="s60" long-name="Provisioning">
-<unit bldFile="mw/remotemgmt/omaprovisioning/provisioning/group"/>
-</component>
-</collection>
-<collection name="devicediagnosticsfw" long-name="Device Diagnostics Framework" level="framework">
-<component name="diagframework" filter="s60" long-name="Diagnostics Framework">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
-</component>
-<component name="diagpluginbase" filter="s60" long-name="Diagnostics Plugin Base">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
-</component>
-<component name="diagresultsdb" filter="s60" long-name="Diagnostics Results Database">
-<!-- can only have one unit, merge or split into two components -->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
-</component>
-<component name="devicediagnosticsfw_build" filter="s60" long-name="Device Diagnostics Framework Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/group"/>
-</component>
-</collection>
-<collection name="dcmofw" long-name="Device Capability Management Object Framework" level="framework">
-<component name="dcmoclient" filter="s60" long-name="DCMO Client">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoclient/group"/>
-</component>
-<component name="dcmoserver" filter="s60" long-name="DCMO Server">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoserver/group"/>
-</component>
-<component name="dcmocustcmd" filter="s60" long-name="DCMO Custom Commands">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmocustcmd/group"/>
-</component>
-<component name="dcmofw_build" filter="s60" long-name="DCMO Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/dcmofw/group"/>
-</component>
-</collection>
-<collection name="fotaapplication" long-name="FOTA Application" level="generic">
-<component name="fotaapplication_build" filter="s60" long-name="FOTA Application Build">
-<!-- remove this component when configuration is in place and the #ifdefs have been worked out -->
-<unit bldFile="mw/remotemgmt/fotaapplication/group"/>
-</component>
-<component name="fotaserver" filter="s60" long-name="FOTA Server">
-<!-- uncomment when #ifdefs are resolved -->
-<!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
-</component>
-<component name="fotacustcmds" filter="s60" long-name="FOTA Custom Commands" class="placeholder">
-<!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
-<!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
-</component>
-</collection>
-</block>
-<block name="remoteconn" level="generic" long-name="Remote Connectivity" levels="plugin framework server generic specific">
-<collection name="remoteconn_info" long-name="Remote Connectivity Info" level="specific">
-<component name="remoteconn_metadata" long-name="Remote Connectivity Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mtptransports" long-name="MTP Transports" level="plugin">
-<component name="mtpusbtransport" long-name="MTP USB Transport" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpusbtransport/group" mrp="mw/remoteconn/mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
-</component>
-<component name="mtpptpiptransport" long-name="MTP PTP-IP Transport" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpptpiptransport/group" mrp="mw/remoteconn/mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
-</component>
-<component name="mtpcontroller" long-name="MTP Controller" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpcontroller/group" mrp="mw/remoteconn/mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
-</component>
-</collection>
-<collection name="mtpfws" long-name="MTP Frameworks" level="framework">
-<component name="mtpfw" long-name="MTP Framework" introduced="^2" purpose="optional">
-<unit bldFile="mw/remoteconn/mtpfws/mtpfw/group" mrp="mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/>
-</component>
-</collection>
-<collection name="mtpdataproviders" long-name="MTP Data Providers" level="generic">
-<component name="mtpfileandfolderdp" long-name="MTP File and Folder Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group" mrp="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
-</component>
-<component name="mtpimagedp" long-name="MTP Image Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpimagedp/group" mrp="mw/remoteconn/mtpdataproviders/mtpimagedp/group/mtp_imagedp.mrp"/>
-</component>
-<component name="mtppictbridgedp" long-name="MTP PictBridge Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group" mrp="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group/mtp_pictbridgedp.mrp"/>
-</component>
-</collection>
-<collection name="backupandrestore" long-name="Backup and Restore" level="specific">
-<component name="backupengine" long-name="Backup Engine" introduced="9.0" purpose="optional">
-<unit bldFile="mw/remoteconn/backupandrestore/backupengine/group" mrp="mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
-</component>
-<component name="backuptest" long-name="Backup Test" introduced="^2" purpose="development">
-<unit bldFile="mw/remoteconn/backupandrestore/backuptest/group" mrp="mw/remoteconn/backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
-</component>
-</collection>
-<collection name="obex" long-name="OBEX" level="generic">
-<component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexprotocol/group" mrp="mw/remoteconn/obex/obexprotocol/group/obex.mrp"/>
-</component>
-<component name="obexextensionapi" long-name="OBEX Extension API" introduced="9.2" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexextensionapi/group" mrp="mw/remoteconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
-</component>
-</collection>
-</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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<unit mrp="mw/srvdiscovery/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="dlnasrv" level="specific" long-name="DLNA Services" levels="stack server ctrl framework plugin">
-<!-- uncomment all the units when configuration is in place, they're currently #included from other xxx_build components -->
-<collection name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" level="plugin">
-<component name="upnp_media_server_settings_api" long-name="UPnP Media Server Settings API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_settings_api/group"/>
-</component>
-<component name="upnp_av_objects_api" long-name="UPnP A/V Objects API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_av_objects_api/group"/>
-</component>
-<component name="upnp_media_server_api" long-name="UPnP Media Server API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_api/group"/>
-</component>
-<component name="upnp_security_plugin_api" long-name="UPnP Security Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_security_plugin_api/group"/>
-</component>
-<component name="upnp_avcp_api" long-name="UPnP AVCP API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_avcp_api/group"/>
-</component>
-<component name="upnp_media_server_metadata_api" long-name="UPnP Media Server Metadata API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_metadata_api/group"/>
-</component>
-<component name="upnp_command_api" long-name="UPnP Command API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_command_api/group"/>
-</component>
-<component name="upnp_plugin_api" long-name="UPnP Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_plugin_api/group"/>
-</component>
-</collection>
-<collection name="upnpavcontrolpoint" long-name="UPnP A/V Control Point" level="plugin">
-<component name="avcontrolframework" filter="s60" long-name="A/V Control Famework" introduced="9.1" deprecated="^3">
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
-</component>
-<component name="upnpavcontrolpoint_build" filter="s60" long-name="UPnP A/V Control Point Build" introduced="9.1" deprecated="^3">
-<!-- put exports in other component instead -->
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/group"/>
-</component>
-</collection>
-<collection name="upnpmediaserver" long-name="UPnP Media Server" level="server">
-<component name="avobjects" filter="s60" long-name="A/V Objects">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/avobjects/group"/>
-</component>
-<component name="mediaserverclient" filter="s60" long-name="Media Server Client">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverclient/group"/>
-</component>
-<component name="connectionmanagerservice" filter="s60" long-name="Connection Manager Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/connectionmanagerservice/group"/>
-</component>
-<component name="contentdirectoryservice" filter="s60" long-name="Content Directory Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/contentdirectoryservice/group"/>
-</component>
-<component name="mediaserverengine" filter="s60" long-name="Media Server Engine">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverengine/group"/>
-</component>
-<component name="upnpmediaserver_build" filter="s60" long-name="UPnP Media Server Build">
-<!-- move exports into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpmediaserver/group"/>
-</component>
-</collection>
-<collection name="upnpavcontroller" long-name="UPnP A/V Controller" level="ctrl">
-<component name="upnpxmlparser" filter="s60" long-name="UPnP XML Parser" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpxmlparser/group"/>
-</component>
-<component name="upnpavcontrollerserver" filter="s60" long-name="UPnP A/V Controller Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerserver/group"/>
-</component>
-<component name="upnpavcontrollerclient" filter="s60" long-name="UPnP A/V Ccontroller Client" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerclient/group"/>
-</component>
-<component name="upnpavcontrollerhelper" filter="s60" long-name="UPnP A/V Controller Helper" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerhelper/group"/>
-</component>
-<component name="upnpavcontroller_build" filter="s60" long-name="UPnP A/V Controller Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpavcontroller/group"/>
-</component>
-</collection>
-<collection name="upnpframework" long-name="UPnP Framework" level="framework">
-<component name="upnputilities" filter="s60" long-name="UPnP Utilities" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnputilities/group"/>
-</component>
-<component name="upnpextensionpluginif" filter="s60" long-name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpextensionpluginif/group"/> -->
-</component>
-<component name="upnpfiletransferengine" filter="s60" long-name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>-->
-</component>
-<component name="upnpcommonui" filter="s60" long-name="UPnP Common UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpcommonui/group"/>-->
-</component>
-<component name="upnpaiwengine" filter="s60" long-name="UPnP AIW Engine" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpaiwengine/group"/> -->
-</component>
-<component name="upnpaiwprovider" filter="s60" long-name="UPnP AIW Provider" introduced="^2" deprecated="^3" plugin="Y">
-<!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
-</component>
-<component name="upnpmusicadapter" filter="s60" long-name="UPnP Music Adapter" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
-</component>
-<component name="upnpcommand" filter="s60" long-name="UPnP Command" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpcommand/group"/>
-</component>
-<component name="upnpframework_build" filter="s60" long-name="UPnP Framework Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpframework/group"/>
-</component>
-</collection>
-<collection name="upnpsettings" long-name="UPnP Settings" level="framework">
-<component name="upnpsettingsengine" filter="s60" long-name="UPnP Settings Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
-</component>
-<component name="multiselectionui" filter="s60" long-name="Multi-Selection UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/multiselectionui/group"/>-->
-</component>
-<component name="appwizard" filter="s60" long-name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/appwizard/group"/>-->
-</component>
-<component name="upnpsharingui" filter="s60" long-name="UPnP Sharing UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
-</component>
-<component name="upnpgsplugin" filter="s60" long-name="UPnP GS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
-</component>
-<component name="upnpsettings_build" filter="s60" long-name="UPnP Settings Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsettings/group"/>
-</component>
-</collection>
-<collection name="upnpsharing" long-name="UPnP Sharing" level="server">
-<component name="upnpdlnaprofiler" filter="s60" long-name="UPnP DLNA Profiler" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpdlnaprofiler/group"/>
-</component>
-<component name="upnpsecurity" filter="s60" long-name="UPnP Security" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpsecurity/group"/>
-</component>
-<component name="upnpcontentserver" filter="s60" long-name="UPnP Content Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpcontentserver/group"/>
-</component>
-<component name="applicationengine" filter="s60" long-name="UPnP Application Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/applicationengine/group"/>
-</component>
-<component name="upnpsharing_build" filter="s60" long-name="UPnP Sharing Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsharing/group"/>
-</component>
-</collection>
-<collection name="upnpmpxplugins" long-name="UPnP MPX Plugins" level="plugin">
-<component name="upnpplaybackplugins" filter="s60" long-name="UPnP Playback Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/upnpplaybackplugins/group"/>
-</component>
-<component name="upnpmpxplugins_build" filter="s60" long-name="UPnP MPX Plugins Build" introduced="^2">
-<!-- move exports content into other component? -->
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/group"/>
-</component>
-</collection>
-<collection name="upnpharvester" long-name="UPnP Harvester" level="ctrl">
-<component name="upnpharvester_common" filter="s60" long-name="UPnP Harvester Common" introduced="^2" deprecated="^3" class="placeholder">
-<!-- need to merge or #include these to a single bld.inf -->
-<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
- <unit bldFile="upnpharvester/common/cmsettings/group"/>
- <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
- <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
-</component>
-<component name="cdssync" filter="s60" long-name="CDS Sync" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
-</component>
-<component name="mdhserver" filter="s60" long-name="Metadata Harvester Server" introduced="^2" deprecated="^3" class="placeholder">
-<!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
-</component>
-<component name="upnpharvester_build" filter="s60" long-name="UPnP Harvester Build" introduced="^2" deprecated="^3" class="placeholder">
-<!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
-<!--<unit bldFile="upnpharvester/group"/>-->
-</component>
-</collection>
-<collection name="homesync" long-name="Home Sync" level="plugin">
-<component name="contentmanager" filter="s60" long-name="Content Manager" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homesync/group"/>-->
-<!-- move bld.inf into contentmanager dir -->
-</component>
-</collection>
-<collection name="homemedia" long-name="Home Media" level="framework">
-<!-- collection is really just a component. Move down a directory -->
-<component name="homemedia_build" filter="s60" long-name="Home Media" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homemedia/group"/> -->
-</component>
-</collection>
-<collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin">
-<component name="dlnasrv_build" filter="s60" long-name="DLNA Services Build">
-<!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed -->
-<unit bldFile="mw/dlnasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="btservices" level="generic" long-name="Bluetooth Services" levels="framework server generic specific plugin">
-<collection name="btservices_pub" long-name="BT Services Public Interfaces" level="plugin">
-<component name="bluetooth_power_state_api" long-name="Bluetooth Power State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_power_state_api/group"/>
-</component>
-<component name="bluetooth_notifier_api" long-name="Bluetooth Notifier API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_notifier_api/group"/>
-</component>
-</collection>
-<collection name="btservices_plat" long-name="BT Services Platform Interfaces" level="plugin">
-<component name="bluetooth_dosserver_audio_api" long-name="Bluetooth DOS Server Audio API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dosserver_audio_api/group"/>
-</component>
-<component name="bluetooth_dut_mode_api" long-name="Bluetooth DUT Mode API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dut_mode_api/group"/>
-</component>
-<component name="bluetooth_engine_api" long-name="Bluetooth Engine API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-<component name="bluetooth_local_variation_api" long-name="Bluetooth Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_local_variation_api/group"/>
-</component>
-<component name="bluetooth_notifier_internal_api" long-name="Bluetooth Notifier internal API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_notifier_internal_api/group"/>
-</component>
-<component name="bluetooth_sap_connection_state_api" long-name="Bluetooth SAP Connection State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_sap_connection_state_api/group"/>
-</component>
-<component name="bluetooth_secondary_display_notification_api" long-name="Bluetooth Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_secondary_display_notification_api/group"/>
-</component>
-</collection>
-<collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
-<component name="bteng" filter="s60" long-name="Bluetooth Engine">
-<unit bldFile="mw/btservices/bluetoothengine/bteng/group"/>
-</component>
-<component name="btnotif" filter="s60" long-name="Bluetooth Notifier">
-<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"/>
-</component>
-<component name="btmac" filter="s60" long-name="Bluetooth Mono Audio Controller" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btmac/group"/>
-</component>
-<component name="btsac" filter="s60" long-name="Bluetooth Stereo Audio Controller" plugin="Y">
-<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"/>
-</component>
-<component name="btsap" filter="s60" long-name="Bluetooth SIM Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btsap/group"/>
-</component>
-<component name="btui" filter="s60" long-name="Bluetooth UI">
-<unit bldFile="mw/btservices/bluetoothengine/btui/group"/>
-</component>
-<component name="btpbap" filter="s60" long-name="Bluetooth Phonebook Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btpbap/group"/>
-</component>
-<component name="bthid" filter="s60" long-name="Bluetooth HID">
-<unit bldFile="mw/btservices/bluetoothengine/bthid/group"/>
-</component>
-<component name="btctrldcmoadapter" filter="s60" long-name="Bluetooth Control DCMO Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btctrldcmoadapter/group"/>
-</component>
-</collection>
-<collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
-<component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
-<unit bldFile="mw/btservices/bluetoothappprofiles/avrcp" mrp="mw/btservices/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
-</component>
-</collection>
-<collection name="atcommands" long-name="AT Commands" level="generic">
-<component name="modematplugin" long-name="Modem AT Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/modematplugin/group"/>
-</component>
-<component name="lccustomplugin" long-name="LC Custom Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/lccustomplugin/group"/>
-</component>
-</collection>
-<collection name="btservices_info" long-name="BT Services Info" level="plugin">
-<component name="btservices_metadata" long-name="BT Services Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usbservices" level="generic" long-name="USB Services" levels="framework server generic specific plugin">
-<collection name="usbservices_plat" long-name="USB Services Platform Interfaces" level="plugin">
-<component name="pictbridge_api" long-name="PictBridge API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/pictbridge_api/group"/>
-</component>
-<component name="ptp_responder_api" long-name="PTP Responder API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_responder_api/group"/>
-</component>
-<component name="ptp_transport_api" long-name="PTP Transport API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_transport_api/group"/>
-</component>
-<component name="usb_device_control_plugin_api" long-name="USB Device Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_device_control_plugin_api/group"/>
-</component>
-<component name="usb_notifier_api" long-name="USB Notifier API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_notifier_api/group"/>
-</component>
-<component name="usb_personality_api_header" long-name="USB Personality API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_api_header/group"/>
-</component>
-<component name="usb_personality_plugin_api" long-name="USB Personality Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_plugin_api/group"/>
-</component>
-<component name="usb_secondary_display_api" long-name="USB Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_secondary_display_api/group"/>
-</component>
-<component name="usb_watcher_api" long-name="USB Watcher API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_api/group"/>
-</component>
-<component name="usb_watcher_info_api_header" long-name="USB Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_info_api_header/group"/>
-</component>
-</collection>
-<collection name="usbengines" long-name="USB Engines" level="generic">
-<component name="usbotgwatcher" filter="s60" long-name="USB OTG Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbotgwatcher/group"/>
-</component>
-<component name="usbwatcher" filter="s60" long-name="USB Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbwatcher/group"/>
-</component>
-<component name="usblocodplugin" filter="s60" long-name="USB Local Connectivity Domain Plugin" plugin="Y">
-<unit bldFile="mw/usbservices/usbengines/usblocodplugin/group"/>
-</component>
-<component name="usbdevcon" filter="s60" long-name="USB Device Control">
-<unit bldFile="mw/usbservices/usbengines/usbdevcon/group"/>
-</component>
-<component name="usbremotepersonality" filter="s60" long-name="USB Remote Personality">
-<unit bldFile="mw/usbservices/usbengines/usbremotepersonality/group"/>
-</component>
-</collection>
-<collection name="usbclasses" long-name="USB Classes" level="framework">
-<component name="usbobexclasscontroller" filter="s60" long-name="USB OBEX Class Controller" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbobexclasscontroller/group"/>
-</component>
-<component name="usbbasicpersonality" filter="s60" long-name="USB Basic Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbbasicpersonality/group"/>
-</component>
-<component name="usbmscpersonality" filter="s60" long-name="USB MSC Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbmscpersonality/group"/>
-</component>
-<!-- commented out in bld.inf. Should this be deleted?
- <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
- <unit bldFile="usbclasses/ptpstack/group"/>
- </component>
- <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
- <unit bldFile="usbclasses/sicdusbplugin/group"/>
- </component>
- <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
- <unit bldFile="usbclasses/ptpserver/group"/>
- </component>-->
-<component name="pictbridgeengine" filter="s60" long-name="PictBridge Engine">
-<unit bldFile="mw/usbservices/usbclasses/pictbridgeengine/group"/>
-</component>
-<component name="usbphoneasmodem" filter="s60" long-name="USB Phone as Modem" introduced="^3">
-<unit bldFile="mw/usbservices/usbclasses/usbphoneasmodem/group"/>
-</component>
-</collection>
-<collection name="usbuis" long-name="USB UIs" level="specific">
-<component name="usbui" filter="s60" long-name="USB UI">
-<unit bldFile="mw/usbservices/usbuis/usbui/group"/>
-</component>
-<component name="usbuinotif" filter="s60" long-name="USB UI Notifiers">
-<unit bldFile="mw/usbservices/usbuis/usbuinotif/group"/>
-</component>
-<component name="imageprintuiprovider" filter="s60" long-name="ImagePrint UI Provider" plugin="Y">
-<unit bldFile="mw/usbservices/usbuis/imageprintuiprovider/group"/>
-</component>
-<component name="usbimageprintui" filter="s60" long-name="ImagePrint UI">
-<unit bldFile="mw/usbservices/usbuis/imageprintui/group"/>
-</component>
-<component name="usbuiqt" long-name="USB UI Qt" introduced="^4" filter="s60">
-<unit bldFile="mw/usbservices/usbuis/usbuiqt" proFile="usbapplication.pro"/>
-</component>
-</collection>
-<collection name="usbservices_test" long-name="USB Services Test" level="server"/>
-</block>
-<block name="shortlinkconn" level="generic" long-name="Shortlink Connectivity" levels="framework server generic specific plugin">
-<!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
-<collection name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" level="plugin">
-<component name="obex_service_utils_api" long-name="OBEX Service Utils API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_utils_api/group"/>
-</component>
-<component name="obex_service_plugin_api" long-name="OBEX Service Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_plugin_api/group"/>
-</component>
-<component name="dialup_connection_status_api" long-name="Dial-up Connection Status API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dialup_connection_status_api/group"/>
-</component>
-<component name="dun_secondary_display_notification_api" long-name="DUN Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
-</component>
-<component name="obex_secondary_display_notification_api" long-name="OBEX Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
-</component>
-<component name="generic_hid_api" long-name="Generic HID API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/generic_hid_api/group"/>
-</component>
-<component name="locod_bearer_plugin_api" long-name="Locod Bearer Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/locod_bearer_plugin_api/group"/>
-</component>
-<component name="usb_obexservicemanager_client_api" long-name="USB OBEX Service Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_obexservicemanager_client_api/group"/>
-</component>
-</collection>
-<collection name="localconnectivityservice" long-name="Local Connectivity Service" level="server">
-<component name="locod" long-name="Local Connectivity Daemon">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/locod/group"/>
-</component>
-<component name="obexserviceman" long-name="OBEX Service Managar">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
-</component>
-<component name="obexsendservices" long-name="OBEX Send Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
-</component>
-<component name="obexreceiveservices" long-name="OBEX Receive Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
-</component>
-<component name="dun" long-name="Dial Up Networking">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/dun/group"/>
-</component>
-<component name="lcstylustap" long-name="LC Stylus Tap Plugins" plugin="Y">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/lcstylustap/group"/>
-</component>
-<component name="generichid" long-name="Generic HID">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/generichid/group"/>
-</component>
-<component name="headset" long-name="Headset">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/headset/group"/>
-</component>
-</collection>
-</block>
-<block name="imghandling" level="specific" long-name="Image Handling" levels="lib util if">
-<collection name="imagehandling_plat" long-name="Image Handling Platform Interfaces" level="if">
-<component name="image_handling_library_api" long-name="Image Handling Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
-</component>
-<component name="3gp_library_api" long-name="3GP Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
-</component>
-<component name="thumbnailmanager_api" long-name="Thumbnail Manager API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagehandlinglib" long-name="Image Handling Library" level="lib">
-<!-- collection is really a component, need to move down a directory -->
-<component name="ihl" filter="s60" long-name="IHL">
-<unit bldFile="mw/imghandling/imagehandlinglib/group"/>
-</component>
-</collection>
-<collection name="imagehandlingutilities" long-name="Image Handling Utilities" level="util">
-<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager">
-<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
-</component>
-<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager Qt" introduced="^4">
-<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt" filter="!test" proFile="thumbnailmanagerqt.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</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">
-<unit bldFile="mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
-</component>
-</collection>
-</block>
-<block name="mds" level="specific" long-name="Metadata Services" levels="mgr eng server int">
-<collection name="mds_plat" long-name="Metadata Services Platform Interfaces" level="int">
-<component name="context_engine_plugin_api" long-name="Context Engine Plugin API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/group" filter="!test"/>
-</component>
-<component name="harvester_framework_api" long-name="Harvester Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/harvester_framework_api/group" filter="!test"/>
-<!-- can only have one unit with the same filter, #include the following from the previous unit -->
-</component>
-<component name="location_manager_api" long-name="Location Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/location_manager_api/group" filter="!test"/>
-</component>
-<component name="metadata_engine_api" long-name="Metadata Engine API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/metadata_engine_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_collection_manager_api" long-name="Content Listing Framework Collection Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_extended_api" long-name="Content Listing Framework Extended API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_extended_api/group"/>
-</component>
-</collection>
-<collection name="mds_pub" long-name="Metadata Services Public Interfaces" level="int">
-<component name="content_listing_framework_api" long-name="Content Listing Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_pub/content_listing_framework_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="metadataengine" long-name="Metadata Engine" level="eng">
-<component name="metadataengine_common" filter="s60" long-name="Metadata Engine Common" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/common/group"/>
-</component>
-<component name="metadataengine_server" filter="s60" long-name="Metadata Engine Server" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/server/group"/>
-</component>
-<component name="metadataengine_client" filter="s60" long-name="Metadata Engine Client" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/client/group"/>
-</component>
-<component name="metadataengine_build" filter="s60" long-name="Metadata Engine Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/metadataengine/group"/>
-</component>
-</collection>
-<collection name="locationmanager" long-name="Location Manager" level="mgr">
-<component name="locationtrail" filter="s60" long-name="Location Trail" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/locationtrail/group"/>
-</component>
-<component name="locationmanager_server" filter="s60" long-name="Location Manager Server" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/server/group"/>
-</component>
-<component name="locationmanager_client" filter="s60" long-name="Location Manager Client" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/client/group"/>
-</component>
-<component name="locationmanager_build" filter="s60" long-name="Location Manager Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/locationmanager/group"/>
-</component>
-</collection>
-<collection name="contextengine" long-name="Context Engine" level="eng">
-<component name="contextengine_plugins" filter="s60" long-name="Context Engine Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/contextengine/plugins/group"/>
-</component>
-<component name="contextengine_build" filter="s60" long-name="Context Engine Build" introduced="^2">
-<!--make this collection a single component, or make this unit self-contained -->
-<unit bldFile="mw/mds/contextengine/group"/>
-</component>
-</collection>
-<collection name="harvester" long-name="Harvester" level="eng">
-<component name="blacklistclient" filter="s60" long-name="Blacklist Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistclient/group"/>
-</component>
-<component name="blacklistserver" filter="s60" long-name="Blacklist Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistserver/group"/>
-</component>
-<component name="harvester_common" filter="s60" long-name="Harvester Common" introduced="^2">
-<unit bldFile="mw/mds/harvester/common/group"/>
-</component>
-<component name="composerplugins" filter="s60" long-name="Composer Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/composerplugins/group"/>
-</component>
-<component name="harvesterplugins" filter="s60" long-name="Harvester Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/harvesterplugins/group"/>
-</component>
-<component name="monitorplugins" filter="s60" long-name="Monitor Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/monitorplugins/group"/>
-</component>
-<component name="harvester_server" filter="s60" long-name="Harvester Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/server/group"/>
-</component>
-<component name="harvester_client" filter="s60" long-name="Harvester Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/client/group"/>
-</component>
-<component name="harvester_build" filter="s60" long-name="Harvester Build" introduced="^2">
-<!-- split these exports into the other components -->
-<unit bldFile="mw/mds/harvester/group"/>
-</component>
-</collection>
-<collection name="watchdog" long-name="Watchdog" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="mdswatchdog" filter="s60" long-name="Metadata Watchdog" introduced="^2">
-<unit bldFile="mw/mds/watchdog/group"/>
-</component>
-</collection>
-<collection name="clfwrapper" long-name="Content Listing Framework Wrapper" level="int">
-<!-- collection is really a component. Move down a directory -->
-<component name="clfwrapper_build" filter="s60" long-name="CLF Wrapper Build" introduced="^2" class="placeholder">
-<!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
-<!--<unit bldFile="clfwrapper/group"/>-->
-</component>
-</collection>
-<collection name="mds_info" long-name="Metadata Services Info" level="int">
-<component name="mds_build" filter="s60" long-name="Metadata Services Build" introduced="^2">
-<!-- consider distributiing this into the rest of the components in the package -->
-<unit bldFile="mw/mds/group"/>
-</component>
-</collection>
-</block>
-<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"/>
-</component>
-<component name="videoconnutility_api" long-name="Video Connection Utility API" filter="s60" class="api">
-<unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/group"/>
-</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"/>
-</component>
-</collection>
-<collection name="videoscheduler" long-name="Video Scheduler" level="util">
-<component name="schedulerclient" filter="s60" long-name="Video Scheduler Client">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerclient/group"/>
-</component>
-<component name="schedulerserver" filter="s60" long-name="Video Scheduler Server">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerserver/group"/>
-</component>
-</collection>
-<collection name="videoconnutility" long-name="Video Connection Utility" level="util">
-<component name="connutilpsworker" filter="s60" long-name="Connection Utility Publish and Subscribe Worker">
-<unit bldFile="mw/videoutils/videoconnutility/connutilpsworker/group"/>
-</component>
-<component name="video_connutility" filter="s60" long-name="Video Connection Utility">
-<unit bldFile="mw/videoutils/videoconnutility/connutility/group"/>
-</component>
-</collection>
-<collection name="videoutils_info" long-name="Video Utils Info" level="if"/>
-</block>
-<block name="mmmw" level="generic" long-name="Multimedia Middleware" levels="plugin framework server generic specific">
-<collection name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" level="specific">
-<component name="multimedia_data_source_api" long-name="Multimedia Data Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
-</component>
-<component name="progressive_download_api" long-name="Progressive Download API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/progressive_download_api/group"/>
-</component>
-<component name="equalizer_ui_api" long-name="Equalizer UI API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
-</component>
-<component name="enhanced_media_client_api" long-name="Enhanced Media Client API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
-</component>
-<component name="stream_control_custom_command_api" long-name="Stream Control Custom Command API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
-</component>
-<component name="emc_buffer_source_api" long-name="EMC Buffer Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_buffer_source_api/group"/>
-</component>
-<component name="emc_file_source_api" long-name="EMC File Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
-</component>
-<component name="audio_metadata_reader_api" long-name="Audio MetaData Reader API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
-</component>
-<component name="emc_progressive_download_source_api" long-name="EMC Progressive Download Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
-</component>
-<component name="emc_volume_effect_api" long-name="EMC Volume Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
-</component>
-<component name="emc_balance_effect_api" long-name="EMC Balance Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_balance_effect_api/group"/>
-</component>
-<component name="emc_descriptor_source_api" long-name="EMC Descriptor Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_descriptor_source_api/group"/>
-</component>
-<component name="emc_drm_config_intfc_api" long-name="EMC DRM Config Intfc API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
-</component>
-<component name="voip_audio_services_api" long-name="VoIP Audio Services" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/group"/>
-</component>
-<component name="configuration_components_factory_api" long-name="Configuration Components Factory API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
-</component>
-<component name="audio_output_control_utility_api" long-name="Audio Output Control Utility API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/group"/>
-</component>
-<component name="audio_output_control_utility_proxy_api" long-name="Audio Output Control Utility Proxy API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
-</component>
-<component name="emc_audio_effects_api" long-name="EMC Audio Effects API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
-</component>
-<component name="call_audio_control_api" long-name="Call AudioControl API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/group"/>
-</component>
-<component name="radio_utilities_api" long-name="Radio Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/group"/>
-</component>
-<component name="radio_preset_utilities_api" long-name="Radio Preset Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
-</component>
-<component name="radio_monitor_api" long-name="Radio Monitor API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
-</component>
-<component name="thumbnail_engine_api" long-name="Thumbnail Engine API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/thumbnail_engine_api/group"/>
-</component>
-<component name="telephony_multimedia_service_api" long-name="Telephony Multimedia Service API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
-</component>
-<component name="openmax_al_api" long-name="OpenMAX AL API" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/openmax_al_api/group"/>
-</component>
-</collection>
-<collection name="mmfenh" long-name="MMF Enhancements" level="generic">
-<component name="advancedaudiocontroller" filter="s60" long-name="Advanced Audio Controllers" plugin="Y">
-<unit bldFile="mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
-</component>
-<component name="audiooutputcontrolutility" filter="s60" long-name="Audio Output Control Utility">
-<unit bldFile="mw/mmmw/mmfenh/audiooutputcontrolutility/group"/>
-</component>
-<component name="configurationcomponentsfactory" filter="s60" long-name="Configuration Components Factory">
-<unit bldFile="mw/mmmw/mmfenh/configurationcomponentsfactory/group"/>
-</component>
-<component name="enhancedaudioplayerutility" filter="s60" long-name="Enhanced Audio Player Utility">
-<unit bldFile="mw/mmmw/mmfenh/enhancedaudioplayerutility/group"/>
-</component>
-<component name="enhancedmediaclient" filter="s60" long-name="Enhanced Media Client">
-<unit bldFile="mw/mmmw/mmfenh/enhancedmediaclient/group"/>
-</component>
-<component name="profilesettingsmonitor" filter="s60" long-name="Profile Settings Monitor">
-<unit bldFile="mw/mmmw/mmfenh/profilesettingsmonitor/group"/>
-</component>
-<component name="progressivedownload" filter="s60" long-name="Progressive Download">
-<unit bldFile="mw/mmmw/mmfenh/progressivedownload/group"/>
-</component>
-</collection>
-<collection name="mm_fw" long-name="Multimedia Frameworks" level="framework">
-<!-- Id needs to be unique, mmfw already in use -->
-<!-- Placeholder for OpenAX AL and other stuff -->
-</collection>
-<collection name="mmserv" long-name="Multimedia Services" level="specific">
-<component name="audioeffectsui" filter="s60" long-name="Audio Effects UI">
-<unit bldFile="mw/mmmw/mmserv/audioeffectsui/group"/>
-</component>
-<component name="callaudiocontrol" filter="s60" long-name="Call Audio Control">
-<unit bldFile="mw/mmmw/mmserv/callaudiocontrol/group"/>
-</component>
-<component name="metadatautility" filter="s60" long-name="Metadata Utility">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/group"/>
-</component>
-<component name="radioutility" filter="s60" long-name="Radio Utility">
-<unit bldFile="mw/mmmw/mmserv/radioutility/group"/>
-</component>
-<component name="thumbnailengine" filter="s60" long-name="Thumbnail Engine" introduced="^2">
-<unit bldFile="mw/mmmw/mmserv/thumbnailengine/group"/>
-</component>
-<component name="tms" filter="s60" long-name="Telephony Multimedia Service" introduced="^3">
-<unit bldFile="mw/mmmw/mmserv/tms/group"/>
-</component>
-<component name="voipaudioservices" filter="s60" long-name="VoIP Audio Services">
-<unit bldFile="mw/mmmw/mmserv/voipaudioservices/group"/>
-</component>
-<component name="lib3gpextparser" filter="s60" long-name="3GP Extension Metadata Parser Library">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group" filter="sf_build"/>
-</component>
-</collection>
-<collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
-<component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="helix" level="generic" long-name="Helix" levels="plugin framework server generic specific">
-<collection name="helix_ren" long-name="Helix Engine" level="framework">
-<!-- what does "ren" stand for? -->
-<component name="helix_stub" filter="s60" long-name="Helix Stub" introduced="^2" class="api">
-<unit bldFile="mw/helix/helix_ren/helix_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="camerasrv" level="specific" long-name="Camera Services" levels="plugin fw api">
-<collection name="camerasrv_plat" long-name="Camera Services Platform Interfaces" level="api">
-<component name="media_recorder_sink_api" long-name="Media Recorder Sink API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
-</component>
-<component name="custom_onboard_camera_api" long-name="Custom Onboard Camera API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
-</component>
-<component name="imaging_configuration_manager_api" long-name="Imaging Configuration Manager API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
-</component>
-<component name="media_recorder_api" long-name="Media Recorder API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_api/group" filter="!test"/>
-</component>
-<component name="3gp_file_composer_api" long-name="3GP File Composer API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
-</component>
-</collection>
-<collection name="camcordermmfplugin" long-name="Camcorder MMF Plugin" level="plugin">
-<!-- collection is really a component. Should move down a directory -->
-<component name="camcordermmfplugin_build" filter="s60" long-name="Camcorder MMF Plugin Build" plugin="Y">
-<unit bldFile="mw/camerasrv/camcordermmfplugin/build"/>
-</component>
-</collection>
-<collection name="configmanagers" long-name="Config Managers" level="api">
-<component name="imagingconfigmanager" filter="s60" long-name="Imaging Config Manager">
-<unit bldFile="mw/camerasrv/configmanagers/imagingconfigmanager/group"/>
-</component>
-</collection>
-<collection name="camerasrv_info" long-name="Camera Services Info" level="api">
-<component name="camerasrv_build" filter="s60" long-name="Camera Services Build">
-<!-- should split into individual bld.infs -->
-<unit bldFile="mw/camerasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="mmappfw" level="specific" long-name="Multimedia App Framework" levels="fw utils if">
-<collection name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" level="if">
-<component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interfaces Build" introduced="^1" filter="s60">
-<!-- this is no longer necessary when confguration is put in place -->
-<unit bldFile="mw/mmappfw/mmappfw_plat"/>
-</component>
-<component name="collection_helper_api" long-name="Collection Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
-</component>
-<component name="harvester_collection_mediator_api" long-name="Harvester Collection Mediator API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/group"/>
-</component>
-<component name="harvester_metadata_extractor_api" long-name="Harvester Metadata Extractor API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/group"/>
-</component>
-<component name="harvester_server_api" long-name="Harvester Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_server_api/group"/>
-</component>
-<component name="harvester_utility_api" long-name="Harvester Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_utility_api/group"/>
-</component>
-<component name="playlist_engine_api" long-name="Playlist Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playlist_engine_api/group"/>
-</component>
-<component name="mtp_keys_api" long-name="MTP Keys API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mtp_keys_api/group"/>
-</component>
-<component name="mpx_collection_common_definition_api" long-name="MPX Collection Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_common_definition_api/group"/>
-</component>
-<component name="mpx_collection_utility_api" long-name="MPX Collection Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/group"/>
-</component>
-<component name="mpx_common_api" long-name="MPX Common API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_api/group"/>
-</component>
-<component name="mpx_common_definition_api" long-name="MPX Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_common_definition_api" long-name="MPX Playback Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_utility_api" long-name="MPX Playback Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/group"/>
-</component>
-<component name="mpx_base_view_plugins_api" long-name="MPX Base View Plugins API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/group"/>
-</component>
-<component name="mpx_view_utility_api" long-name="MPX View Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_view_utility_api/group"/>
-</component>
-<component name="mpx_albumart_utility_api" long-name="MPX Album Art Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/group"/>
-</component>
-<component name="media_player_settings_engine_api" long-name="Media Player Settings Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
-</component>
-<component name="mpx_backstepping_utility_api" long-name="MPX Backstepping Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_backstepping_utility_api/group"/>
-</component>
-<component name="asx_parser_api" long-name="ASX Parser API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/asx_parser_api/group"/>
-</component>
-<component name="playback_helper_api" long-name="Playback Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playback_helper_api/group"/>
-</component>
-<component name="videoplaylist_utility_api" long-name="Video Playlist Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/videoplaylist_utility_api/group"/>
-</component>
-</collection>
-<collection name="mpx" long-name="Multimedia Player" level="fw">
-<component name="commonframework" filter="s60" long-name="MPX Common Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/commonframework/group"/>
-</component>
-<component name="playbackframework" filter="s60" long-name="MPX Playback Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/playbackframework/group"/>
-</component>
-<component name="mpxcollectionfw" filter="s60" long-name="MPX Collection Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/collectionframework/group"/>
-</component>
-<component name="mpxviewfw" filter="s60" long-name="MPX View Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/viewframework/group"/>
-</component>
-<component name="mpxviewframeworkqt" long-name="MPX View Framework Qt" filter="s60">
-<unit bldFile="mw/mmappfw/mpx/mpxviewframeworkqt" proFile="mpxviewframeworkqt.pro" qmakeArgs="-r -config rom"/>
-</component>
-<component name="mpx_build" filter="s60" long-name="MPX Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/mpx/group"/>
-</component>
-</collection>
-<collection name="mmappcomponents" long-name="Multimedia App Components" level="utils">
-<component name="mmappcomponents_build" filter="s60" long-name="Multimedia App Components Build" introduced="^1">
-<!-- needed for #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
- Can remove this once configuration is in place-->
-<unit bldFile="mw/mmappfw/mmappcomponents/group"/>
-</component>
-<component name="collectionhelper" filter="s60" long-name="Media Player Collection Helper" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/collectionhelper/group"/>
-</component>
-<component name="playlistengine" filter="s60" long-name="Playlist Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/playlistengine/group"/>
-</component>
-<component name="mpxharvester" filter="s60" long-name="Media Player Harvester" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/harvester/group"/>
-</component>
-<component name="mmappcommonui" filter="s60" long-name="Multimedia App Common UI" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmappcommonui/group"/>
-</component>
-<component name="mediaplayersettingsengine" filter="s60" long-name="Media Player Settings Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
-</component>
-<component name="audiofetcher" filter="s60" long-name="Audio Fetcher" introduced="^1" plugin="Y">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
-</component>
-<component name="asxparser" filter="s60" long-name="ASX Parser" introduced="^1">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
-</component>
-<component name="playbackhelper" filter="s60" long-name="Playback Helper" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/playbackhelper/group"/>
-</component>
-<component name="videoplaylistutility" filter="s60" long-name="Video Playlist Utility" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/videoplaylistutility/group"/>
-</component>
-<component name="mmmtpdataprovider" filter="s60" long-name="Multimedia MTP Data Provider" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmmtpdataprovider/group"/>
-</component>
-</collection>
-<collection name="mmappfw_info" long-name="Multimedia App Framework Info" level="if">
-<component name="mmappfw_build" filter="s60" long-name="Multimedia App Framework Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/group"/>
-</component>
-<component name="mmappfw_test" filter="s60,test,api_test,pref_test" long-name="Multimedia App Framework Test" purpose="development" introduced="^1"/>
-</collection>
-</block>
-<block name="hgwidgets" level="specific" long-name="HG Widgets" levels="framework service api">
-<collection name="hgwidgets_pub" long-name="HG Widgets Platform Interfaces" level="api">
-<component name="ganeswidgets_api" long-name="Ganes Widgets API" introduced="^4" class="api placeholder">
-<!-- should separate out unit -->
-</component>
-</collection>
-<collection name="hgwidgets_pub" long-name="HG Widgets Public Interfaces" level="api"/>
-<collection name="ganeswidgets" long-name="Ganes Widgets" level="service">
-<!-- really a component, should move down a dir level and have a unit -->
-<component name="ganeswidgets_build" long-name="Ganes Widgets Build" introduced="^4" class="placeholder">
-<!-- should separate out unit -->
-</component>
-</collection>
-<collection name="hgwidgets_info" long-name="HG Widgets Info" level="framework">
-<component name="hgwidgets_build" long-name="HG Widgets Build" introduced="^4">
-<unit bldFile="mw/hgwidgets" proFile="hgwidgets.pro"/>
-</component>
-</collection>
-</block>
-<block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework api">
-<collection name="inputmethods_pub" long-name="Input Methods Public Interfaces" level="api">
-<component name="ptiengine_iti_api" long-name="PTI Engine API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
-</component>
-<component name="optical_character_recognition_api" long-name="Optical Character Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
-</component>
-<component name="input_language_info_api" long-name="Input Language Info API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
-</component>
-</collection>
-<collection name="inputmethods_plat" long-name="Input Methods Platform Interfaces" level="api">
-<component name="pen_input_server_api" long-name="Pen Input Server API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/group" filter="!test"/>
-</component>
-<component name="ptiengine_hwr_api" long-name="PTI Engine Handwriting Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group" filter="!test"/>
-</component>
-<component name="aknfep_settings_api" long-name="Avkon FEP Settings API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
-</component>
-<component name="aknfep_status_api" long-name="Avkon FEP Status API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
-</component>
-<component name="ptiengine_key_definations_api" long-name="PTI Engine Key Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
-</component>
-<component name="aknfep_definitions_api" long-name="Avkon FEP Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
-</component>
-<component name="aknfep_pen_support_api" long-name="Avkon FEP Pen Support API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
-</component>
-<component name="ptiengine_indic_definitions_api" long-name="PTI Engine Indic Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
-</component>
-<component name="aknfep_uiinterface_api" long-name="Avkon FEP UI Interface API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="textinput" long-name="Text Input" level="framework">
-<component name="ptienginev2" filter="s60" long-name="Predictive Text Input Engine">
-<!--uncomment when configuration is turned on and textinput_build is removed-->
-<!-- <unit bldFile="textinput/ptienginev2/group"/>-->
-</component>
-<component name="akninputlanguage" filter="s60" long-name="Avkon Input Language">
-<unit bldFile="mw/inputmethods/textinput/akninputlanguage/group"/>
-</component>
-<component name="peninputarc" filter="s60" long-name="Pen Input Arc">
-<unit bldFile="mw/inputmethods/textinput/peninputarc/group"/>
-</component>
-<component name="peninputcommonctrls" filter="s60" long-name="Pen Input Common Controls">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonctrls/group"/>
-</component>
-<component name="peninputcommonlayout" filter="s60" long-name="Pen Input Common Layout">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonlayout/group"/>
-</component>
-<component name="peninputhwrtrui" filter="s60" long-name="Pen Input Handwriting Recognition Training UI" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrtrui/group"/>
-</component>
-<component name="textinput_build" filter="s60" long-name="Text Input Build">
-<!--needed for #ifdef, can be removed when configuration is implemented -->
-<unit bldFile="mw/inputmethods/textinput/group"/>
-</component>
-</collection>
-<collection name="fep" long-name="FEP" level="engine">
-<component name="aknfep" filter="s60" long-name="Avkon FEP" plugin="Y">
-<unit bldFile="mw/inputmethods/fep/aknfep/group"/>
-</component>
-<component name="frontendprocessor" long-name="Front End Processor" purpose="mandatory">
-<unit bldFile="mw/inputmethods/fep/frontendprocessor/group" mrp="mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
-</component>
-</collection>
-<collection name="inputmethods_info" long-name="Input Methods Info" level="api">
-<component name="inputmethods_metadata" long-name="Input Methods Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="qt" level="generic" long-name="Qt" levels="tool mw app">
-<collection name="qtconf" long-name="Qt Config" level="tool">
-<component name="qt_deviceconfiguration" long-name="Qt Device Configuration" introduced="^2" class="config tool">
-<unit bldFile="mw/qt/src/s60installs/deviceconfiguration"/>
-</component>
-</collection>
-<collection name="qt_info" long-name="Qt Info" level="mw">
-<component name="qt_build" long-name="Qt Build" introduced="^2">
-<unit bldFile="mw/qt" proFile="projects.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-<collection name="qtdemos" long-name="Qt Demos" level="app">
-<component name="qtdemos_build" long-name="Qt Demos Build" introduced="^2" filter="qtdemos">
-<unit bldFile="mw/qt/demos" proFile="demos.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-<collection name="qtexamples" long-name="Qt Examples" level="app">
-<component name="qtexamples_build" long-name="Qt Examples Build" introduced="^2" filter="qtexamples">
-<unit bldFile="mw/qt/examples" proFile="examples.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-<collection name="qt_tests" long-name="Qt Tests" level="app">
-<component name="qttestsauto" long-name="Qt Automated Tests" introduced="^2" filter="qttestsauto">
-<unit bldFile="mw/qt/tests/auto" proFile="qtpauto.pro"/>
-</component>
-<component name="qttestsbenchmarks" long-name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks">
-<unit bldFile="mw/qt/tests/benchmarks" proFile="benchmarks.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-</block>
-<block name="qtextensions" level="generic" long-name="Qt Extensions" levels="tool mw app">
-<collection name="qtecomplugins" long-name="Qt ECom Plugins" level="app">
-<component name="qtextensions_examples" filter="qtextensionsexamples" long-name="Qt ECom Plugin Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtecomplugins/examples" proFile="examples.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qthighway" long-name="Qt Highway" level="app">
-<component name="qthighway_examples" filter="qtextensionsexamples" long-name="Qt Highway Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qthighway/examples" qmakeArgs="-r"/>
-</component>
-<component name="qthighwaytests" filter="qtextensionstests" long-name="Qt Highway Tests" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qthighway/tests" proFile="tests.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qtmobileextensions" long-name="Qt Mobile Extensions" level="app">
-<component name="qtmobileextensions_examples" filter="qtextensionsexamples" long-name="Qt Mobile Extensions Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtmobileextensions/examples" proFile="examples.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qtmobility" long-name="Qt Mobility">
-<component name="qtmobility_examples" filter="qtextensionsexamples" long-name="Qt Mobility Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtmobility/examples" proFile="examples.pro" qmakeArgs="-r"/>
-</component>
-<component name="qtmobilitytests" filter="qtextensionstests" long-name="Qt Extensions Tests" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtmobility/tests" proFile="tests.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qtextensions_info">
-<component name="qtextensions_build" long-name="Qt Extensions Confgure" introduced="^4" class="conf">
-<unit bldFile="mw/qtextensions/group"/>
-</component>
-<component name="qtextensions_build" long-name="Qt Extensions Build" introduced="^4">
-<!-- break this up into the above collections-->
-<unit bldFile="mw/qtextensions" proFile="qtextensions.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</block>
-<block name="hb" level="generic" long-name="Orbit" levels="engine test api">
-<collection name="hb_info" long-name="Orbit Info" level="api">
-<component name="hb_build" long-name="Orbit Build" introduced="^4">
-<!-- should break this down into actual components -->
-<unit bldFile="mw/hb" proFile="hb.pro" qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
-</component>
-</collection>
-<collection name="hb_test" long-name="Orbit Test" level="test">
-<component name="hb_fute" filter="hb_fute_app" long-name="Fute" introduced="^4">
-<unit bldFile="mw/hb/tsrc/fute" proFile="fute.pro" qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
-</component>
-</collection>
-</block>
-<block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
-<collection name="classicui_plat" long-name="Classic UI Platform Interfaces" level="specific">
-<component name="personalisation_framework_api" long-name="Personalisation Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_framework_api/group" filter="!test"/>
-</component>
-<component name="signal_pane_api" long-name="Signal Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
-</component>
-<component name="japanese_reading_api" long-name="Japanese Reading API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/japanese_reading_api/group" filter="!test"/>
-</component>
-<component name="global_popup_priority_controller_api" long-name="Global Popup Priority Controller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
-</component>
-<component name="item_finder_api" long-name="Item Finder API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/item_finder_api/group" filter="!test"/>
-</component>
-<component name="avkon_fonts_api" long-name="Avkon Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_fonts_api/group" filter="!test"/>
-</component>
-<component name="extended_utilities_api" long-name="Extended Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
-</component>
-<component name="personalisation_plugin_api" long-name="Personalisation Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
-</component>
-<component name="extended_aiw_criteria_api" long-name="Extended AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="personalisation_application_api" long-name="Personalisation Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_application_api/group"/>
-</component>
-<component name="volume_popup_api" long-name="Volume Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
-</component>
-<component name="avkon_secondary_display_support_api" long-name="AVKON Secondary Display Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_support_api/group" filter="!test"/>
-</component>
-<component name="extended_setting_pages_api" long-name="Extended Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_setting_pages_api/group" filter="!test"/>
-</component>
-<component name="extended_lists_api" long-name="Extended Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_lists_api/group" filter="!test"/>
-</component>
-<component name="input_block_api" long-name="Input Block API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/input_block_api/group" filter="!test"/>
-</component>
-<component name="avkon_ui_server_api" long-name="AVKON UI Server API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_ui_server_api/group" filter="!test"/>
-</component>
-<component name="number_grouping_api" long-name="Number Grouping API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/number_grouping_api/group" filter="!test"/>
-</component>
-<component name="extended_status_pane_api" long-name="Extended Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_status_pane_api/group" filter="!test"/>
-</component>
-<component name="extended_notifiers_api" long-name="Extended Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notifiers_api/group" filter="!test"/>
-</component>
-<component name="task_list_api" long-name="Task List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
-</component>
-<component name="personalisation_slide_show_dialog_api" long-name="Personalisation Slide Show Dialog API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
-</component>
-<component name="key_event_utilities_api" long-name="Key Event Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_event_utilities_api/group"/>
-</component>
-<component name="emergency_call_support_api" long-name="Emergency Call Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/emergency_call_support_api/group" filter="!test"/>
-</component>
-<component name="extended_dialogs_api" long-name="Extended Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_dialogs_api/group"/>
-</component>
-<component name="legacy_ui_framework_headers_api" long-name="Legacy UI Framework Headers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/legacy_ui_framework_headers_api/group"/>
-</component>
-<component name="extended_editors_api" long-name="Extended Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_editors_api/group" filter="!test"/>
-</component>
-<component name="alarm_api" long-name="Alarm API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alarm_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_interface_base_api" long-name="AIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_base_api/group" filter="!test"/>
-</component>
-<component name="list_effects_api" long-name="List Effects API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/list_effects_api/group" filter="!test"/>
-</component>
-<component name="find_item_ui_api" long-name="Find Item UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/find_item_ui_api/group" filter="!test"/>
-</component>
-<component name="server_application_services_api" long-name="Server Application Services API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/server_application_services_api/group" filter="!test"/>
-</component>
-<component name="common_ui_settings_api" long-name="Common UI Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_ui_settings_api/group"/>
-</component>
-<component name="aiw_service_interface_menu_api" long-name="AIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_menu_api/group" filter="!test"/>
-</component>
-<component name="eikon_server_extension_client_api" long-name="EIKON Server Extension Client API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/eikon_server_extension_client_api/group" filter="!test"/>
-</component>
-<component name="skinnable_clock_api" long-name="Skinnable Clock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/skinnable_clock_api/group" filter="!test"/>
-</component>
-<component name="battery_pane_api" long-name="Battery Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/battery_pane_api/group" filter="!test"/>
-</component>
-<component name="fep_document_navigation_api" long-name="FEP Document Navigation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
-</component>
-<component name="personalisation_localised_texts_api" long-name="Personalisation Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
-</component>
-<component name="memory_card_ui_api" long-name="Memory Card UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
-</component>
-<component name="avkon_status_api" long-name="AVKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_status_api/group"/>
-</component>
-<component name="application_switching_api" long-name="Application Switching API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/application_switching_api/group" filter="!test"/>
-</component>
-<component name="avkon_localised_texts_api" long-name="AVKON Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_localised_texts_api/group"/>
-</component>
-<component name="avkon_secondary_display_api" long-name="AVKON Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_api/group"/>
-</component>
-<component name="extended_animation_api" long-name="Extended Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_notes_api" long-name="Extended Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notes_api/group" filter="!test"/>
-</component>
-<component name="text_scroller_api" long-name="Text Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/text_scroller_api/group" filter="!test"/>
-</component>
-<component name="custom_cursors_api" long-name="Custom Cursors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/custom_cursors_api/group" filter="!test"/>
-</component>
-<component name="global_window_priorities_api" long-name="Global Window Priorities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_window_priorities_api/group"/>
-</component>
-<component name="extended_indicators_api" long-name="Extended Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_indicators_api/group" filter="!test"/>
-</component>
-<component name="special_character_table_api" long-name="Special Character Table API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/special_character_table_api/group" filter="!test"/>
-</component>
-<component name="avkon_settings_api" long-name="AVKON Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_settings_api/group"/>
-</component>
-<component name="extended_sounds_api" long-name="Extended Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_sounds_api/group"/>
-</component>
-<component name="themes_settings_api" long-name="Themes Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/themes_settings_api/group"/>
-</component>
-<component name="media_shared_document_api" long-name="Media Shared Document API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/media_shared_document_api/group" filter="!test"/>
-</component>
-<component name="extended_queries_api" long-name="Extended Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_queries_api/group"/>
-</component>
-<component name="phone_number_text_utilities_api" long-name="Phone Number Text Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
-</component>
-<component name="extended_scroller_api" long-name="Extended Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_scroller_api/group"/>
-</component>
-<component name="key_rotator_api" long-name="Key Rotator API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_rotator_api/group" filter="!test"/>
-</component>
-<component name="extended_grids_api" long-name="Extended Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_grids_api/group" filter="!test"/>
-</component>
-<component name="generic_parameter_api" long-name="Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="indicator_touch_observer_api" long-name="Indicator Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_touch_observer_api/group"/>
-</component>
-<component name="popup_form_api" long-name="Popup Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/popup_form_api/group" filter="!test"/>
-</component>
-<component name="stylus_activated_popup_api" long-name="Stylus Activated Pop-up API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/stylus_activated_popup_api/group" filter="!test"/>
-</component>
-<component name="indicator_plugin_api" long-name="Indicator Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_plugin_api/group" filter="!test"/>
-</component>
-<component name="layout_configuration_api" long-name="Layout Configuration API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/layout_configuration_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_filter_factory_api" long-name="Common File Dialogs Filter Factory API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group" filter="!test"/>
-</component>
-<component name="avkon_anim_dll_api" long-name="AVKON Anim DLL API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_anim_dll_api/group"/>
-</component>
-<component name="extended_initialization_api" long-name="Extended Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_initialization_api/group" filter="!test"/>
-</component>
-<component name="long_tap_animation_api" long-name="Long Tap Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/long_tap_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_ui_framework_definitions_api" long-name="Extended UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_ui_framework_definitions_api/group"/>
-</component>
-<component name="extended_buttons_api" long-name="Extended Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_buttons_api/group" filter="!test"/>
-</component>
-<component name="aiw_provider_utility_api" long-name="AIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_provider_utility_api/group" filter="!test"/>
-</component>
-<component name="transition_effect_parameters_api" long-name="Transition Effect Parameters API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_parameters_api/group" filter="!test"/>
-</component>
-<component name="extended_input_capabilities_api" long-name="Extended Input Capabilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_input_capabilities_api/group" filter="!test"/>
-</component>
-<component name="uikon_status_api" long-name="UIKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/uikon_status_api/group"/>
-</component>
-<component name="transition_effect_utilities_api" long-name="Transition Effect Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_utilities_api/group" filter="!test"/>
-</component>
-<component name="pointer_event_modifier_api" long-name="Pointer Event Modifier API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/pointer_event_modifier_api/group" filter="!test"/>
-</component>
-<component name="avkon_testability_api" long-name="AVKON Testability API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_testability_api/group"/>
-</component>
-<component name="ganes_api" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ganes_api/group"/>
-</component>
-<component name="ode_api" long-name="Ode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ode_api/group"/>
-</component>
-<component name="physics_api" long-name="Physics API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/physics_api/group"/>
-</component>
-<component name="touch_pane_api" long-name="Touch Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_api/group" filter="!test"/>
-</component>
-<component name="touch_pane_observer_api" long-name="Touch Pane Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_observer_api/group"/>
-</component>
-<component name="alternate_fs_api" long-name="Alternate FS API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alternate_fs_api/group"/>
-</component>
-<component name="discreet_popup_api" long-name="Discreet Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/discreet_popup_api/group"/>
-</component>
-<component name="touch_gesture_framework_api" long-name="Touch Gesture Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_gesture_framework_api/group"/>
-<!-- should this be commented out? -->
-<!--<unit bldFile="classicui_plat/touch_gesture_framework_api/tsrc/group" filter="test,api_test"/> -->
-</component>
-<component name="extended_options_menu_api" long-name="Extended Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="classicui_pub" long-name="Classic UI Public Interfaces" level="specific">
-<component name="input_frame_api" long-name="Input Frame API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/input_frame_api/group" filter="!test"/>
-</component>
-<component name="window_server_event_observer_api" long-name="Window Server Event Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/window_server_event_observer_api/group" filter="!test"/>
-</component>
-<component name="application_framework_api" long-name="Application Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/application_framework_api/group" filter="!test"/>
-</component>
-<component name="scroller_api" long-name="Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/scroller_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_utilities_api" long-name="UI Framework Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_utilities_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_definitions_api" long-name="UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_definitions_api/group" filter="!test"/>
-</component>
-<component name="buttons_api" long-name="Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/buttons_api/group" filter="!test"/>
-</component>
-<component name="queries_api" long-name="Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/queries_api/group" filter="!test"/>
-</component>
-<component name="aiw_generic_parameter_api" long-name="AIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="editors_api" long-name="Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/editors_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_api" long-name="Common File Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/common_file_dialogs_api/group" filter="!test"/>
-</component>
-<component name="dialog_shutter_api" long-name="Dialog Shutter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialog_shutter_api/group" filter="!test"/>
-</component>
-<component name="fonts_api" long-name="Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/fonts_api/group" filter="!test"/>
-</component>
-<component name="screen_clearer_api" long-name="Screen Clearer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_clearer_api/group" filter="!test"/>
-</component>
-<component name="notifiers_api" long-name="Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notifiers_api/group" filter="!test"/>
-</component>
-<component name="notes_api" long-name="Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notes_api/group" filter="!test"/>
-</component>
-<component name="status_pane_api" long-name="Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/status_pane_api/group" filter="!test"/>
-</component>
-<component name="base_controls_api" long-name="Base Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/base_controls_api/group" filter="!test"/>
-</component>
-<component name="grids_api" long-name="Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/grids_api/group" filter="!test"/>
-</component>
-<component name="context_pane_api" long-name="Context Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/context_pane_api/group" filter="!test"/>
-</component>
-<component name="lists_api" long-name="Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/lists_api/group" filter="!test"/>
-</component>
-<component name="popups_api" long-name="Popups API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/popups_api/group" filter="!test"/>
-</component>
-<component name="misc_controls_api" long-name="Misc Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/misc_controls_api/group" filter="!test"/>
-</component>
-<component name="keylock_api" long-name="Keylock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/keylock_api/group" filter="!test"/>
-</component>
-<component name="options_menu_api" long-name="Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/options_menu_api/group" filter="!test"/>
-</component>
-<component name="hierarchical_lists_api" long-name="Hierarchical Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hierarchical_lists_api/group" filter="!test"/>
-</component>
-<component name="navigation_pane_api" long-name="Navigation Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/navigation_pane_api/group" filter="!test"/>
-</component>
-<component name="tabs_api" long-name="Tabs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/tabs_api/group" filter="!test"/>
-</component>
-<component name="title_pane_touch_observer_api" long-name="Title Pane Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_touch_observer_api/group"/>
-</component>
-<component name="choice_list_api" long-name="Choice List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/choice_list_api/group" filter="!test"/>
-</component>
-<component name="info_popup_note_api" long-name="Info Popup Note API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/info_popup_note_api/group" filter="!test"/>
-</component>
-<component name="setting_pages_api" long-name="Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/setting_pages_api/group" filter="!test"/>
-</component>
-<component name="screen_mode_api" long-name="Screen Mode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_mode_api/group" filter="!test"/>
-</component>
-<component name="indicators_api" long-name="Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/indicators_api/group" filter="!test"/>
-</component>
-<component name="error_ui_api" long-name="Error UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/error_ui_api/group" filter="!test"/>
-</component>
-<component name="animation_api" long-name="Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/animation_api/group" filter="!test"/>
-</component>
-<component name="searchfield_api" long-name="Searchfield API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/searchfield_api/group" filter="!test"/>
-</component>
-<component name="labels_api" long-name="Labels API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/labels_api/group" filter="!test"/>
-</component>
-<component name="hotkeys_api" long-name="Hotkeys API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hotkeys_api/group" filter="!test"/>
-</component>
-<component name="initialization_api" long-name="Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/initialization_api/group" filter="!test"/>
-</component>
-<component name="volume_control_api" long-name="Volume Control API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/volume_control_api/group" filter="!test"/>
-</component>
-<component name="title_pane_api" long-name="Title Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_api/group" filter="!test"/>
-</component>
-<component name="sounds_api" long-name="Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/sounds_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_handler_api" long-name="AIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_service_handler_api/group" filter="!test"/>
-</component>
-<component name="aiw_criteria_api" long-name="AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="touch_ui_utilities_api" long-name="Touch UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/touch_ui_utilities_api/group" filter="!test"/>
-</component>
-<component name="generic_button_api" long-name="Generic Button API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/generic_button_api/group" filter="!test"/>
-</component>
-<component name="form_api" long-name="Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/form_api/group" filter="!test"/>
-</component>
-<component name="uikon_core_controls" long-name="Uikon Core Controls" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/uikon_core_controls/group" filter="!test"/>
-</component>
-<component name="calendar_api" long-name="Calendar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/calendar_api/group"/>
-</component>
-<component name="toolbar_api" long-name="Toolbar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/toolbar_api/group" filter="!test"/>
-</component>
-<component name="server_application_api" long-name="Server Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/server_application_api/group"/>
-</component>
-<component name="slider_api" long-name="Slider API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/slider_api/group" filter="!test"/>
-</component>
-<component name="private_ui_framework_api" long-name="Private UI Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/private_ui_framework_api/group" filter="!test"/>
-</component>
-<component name="dialogs_api" long-name="Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialogs_api/group" filter="!test"/>
-</component>
-<component name="document_handler_api" long-name="Document handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/document_handler_api/group"/>
-</component>
-<component name="images_api" long-name="Images API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/images_api/group" filter="!test"/>
-</component>
-<component name="stylus_popup_menu_api" long-name="Stylus Pop-up Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/stylus_popup_menu_api/group" filter="!test"/>
-</component>
-<component name="information_preview_popup_api" long-name="Information Preview Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/information_preview_popup_api/group" filter="!test"/>
-</component>
-<component name="intermediate_state_api" long-name="Intermediate State API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/intermediate_state_api/group"/>
-</component>
-<component name="help_launcher_api" long-name="Help Launcher API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/help_launcher_api/group"/>
-</component>
-</collection>
-<collection name="ode" long-name="Open Dynamics Engine" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="ode_build" filter="s60" long-name="ODE">
-<unit bldFile="mw/classicui/ode/group"/>
-</component>
-</collection>
-<collection name="uifw" long-name="UI Framework" level="server">
-<component name="uiklaf" filter="s60" long-name="Uikon Look-and-Feel">
-<unit bldFile="mw/classicui/uifw/uiklaf/group"/>
-</component>
-<component name="eikctl" filter="s60" long-name="Eikon Controls">
-<unit bldFile="mw/classicui/uifw/eikctl/group"/>
-</component>
-<component name="avkon" filter="s60" long-name="Avkon">
-<!-- can only have one unit. Split into 3 components, or #include all from same bld.inf -->
-<unit bldFile="mw/classicui/uifw/avkon/aknphysics/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/aknconf/group"/>
-</component>
-<component name="eikstd" filter="s60" long-name="Eikon Standard">
-<unit bldFile="mw/classicui/uifw/eikstd/group"/>
-</component>
-<component name="aknglobalui" filter="s60" long-name="Avkon Global UI">
-<unit bldFile="mw/classicui/uifw/aknglobalui/group"/>
-</component>
-<component name="ganes" filter="s60" long-name="Ganes">
-<unit bldFile="mw/classicui/uifw/ganes/group"/>
-</component>
-</collection>
-<collection name="commonuis" long-name="Common UIs" level="specific">
-<component name="commonui" filter="s60" long-name="Common UI">
-<unit bldFile="mw/classicui/commonuis/commonui/group"/>
-</component>
-<component name="commondialogs" filter="s60" long-name="Common Dialogs">
-<unit bldFile="mw/classicui/commonuis/commondialogs/group"/>
-</component>
-</collection>
-<collection name="applicationinterworkingfw" long-name="Application Interworking Framework" level="generic">
-<component name="aifwservicehandler" filter="s60" long-name="Application Interworking Service Handler">
-<unit bldFile="mw/classicui/applicationinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-<collection name="psln" long-name="Personalization" level="specific">
-<!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
-<component name="psln_build" filter="s60" long-name="Personalization Build">
-<unit bldFile="mw/classicui/psln/group"/>
-</component>
-</collection>
-<collection name="commonadapter" long-name="Common Adapter" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="commonadapter_build" filter="s60" long-name="Common Adapter Build">
-<unit bldFile="mw/classicui/commonadapter/group"/>
-</component>
-</collection>
-<collection name="akntouchgesturefw" long-name="Avkon Touch Gesture Framework" level="generic">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="akntouchgesturefw_build" filter="s60" long-name="Avkon Touch Gesture Framework Build" introduced="^3">
-<unit bldFile="mw/classicui/akntouchgesturefw/group"/>
-</component>
-</collection>
-<collection name="uiutils" long-name="UI Utils" level="specific">
-<component name="localizer" filter="s60" long-name="Directory Localizer">
-<unit bldFile="mw/classicui/uiutils/localizer/group"/>
-</component>
-<component name="findutil" filter="s60" long-name="Find Utility">
-<unit bldFile="mw/classicui/uiutils/findutil/group"/>
-</component>
-<component name="gamerecognizer" filter="s60" long-name="Game Recognizer" plugin="Y">
-<unit bldFile="mw/classicui/uiutils/gamerecognizer/group"/>
-</component>
-<component name="aknjapanesereading" filter="s60" long-name="Avkon Japanese Reading">
-<unit bldFile="mw/classicui/uiutils/aknjapanesereading/group"/>
-</component>
-<component name="hlplch" long-name="Help Launcher" filter="s60,bldfirst">
-<unit bldFile="mw/classicui/uiutils/hlplch/group"/>
-</component>
-</collection>
-<collection name="commonuisupport" long-name="Common UI Support" level="support">
-<component name="uikon" long-name="Uikon" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uikon/group" mrp="mw/classicui/commonuisupport/uikon/group/app-framework_uikon.mrp"/>
-</component>
-<component name="errorresolverdata" long-name="Error Resolver Data" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/errorresolverdata/group" mrp="mw/classicui/commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
-</component>
-<component name="uilaf" long-name="UI Look and Feel" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uilaf/GROUP" mrp="mw/classicui/commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
-</component>
-<component name="grid" long-name="Grid" purpose="optional">
-<unit bldFile="mw/classicui/commonuisupport/grid/group" mrp="mw/classicui/commonuisupport/grid/group/app-framework_grid.mrp"/>
-</component>
-<component name="uifwsdocs" long-name="UI Frameworks Documentation" purpose="development" class="doc">
-<unit mrp="mw/classicui/commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
-</component>
-</collection>
-<collection name="lafagnosticuifoundation" long-name="Look-and-Feel Agnostic UI Foundation" level="base">
-<component name="cone" long-name="Control Environment" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/cone/group" mrp="mw/classicui/lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
-</component>
-<component name="graphicseffects" long-name="Graphics Effects" introduced="9.2" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/graphicseffects/group" mrp="mw/classicui/lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
-</component>
-<component name="uigraphicsutils" long-name="UI Graphics Utilities" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group" mrp="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
-</component>
-<component name="clockanim" long-name="Clock" purpose="optional" plugin="Y">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/clockanim/group" mrp="mw/classicui/lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
-</component>
-<component name="bmpanimation" long-name="BMP Animation" introduced="6.0" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/bmpanimation/group" mrp="mw/classicui/lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
-</component>
-<component name="animation" long-name="Animation" introduced="9.1" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/animation/group" mrp="mw/classicui/lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
-</component>
-</collection>
-<collection name="classicui_info" long-name="Classic UI Info" level="specific">
-<!-- the multiple units in the API test components need to be resolved -->
-<component name="classicui_metadata" long-name="Classic UI Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/classicui/classicui_info/classicui_metadata/classicui_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="svgt" level="generic" long-name="SVG Tiny" levels="util ui">
-<collection name="svgt_plat" long-name="SVG Tiny Platform Interfaces" level="ui">
-<component name="svgt_api" long-name="SVGT API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/svgt_api/group"/>
-</component>
-<component name="nvg_api" long-name="NVG API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/nvg_api/group"/>
-</component>
-</collection>
-<collection name="svgtopt" long-name="SVG-T Engine" level="util">
-<component name="svgtopt_build" filter="s60" long-name="SVG Engine" introduced="9.2">
-<!-- component is at collection level. Needs to be moved down a directory -->
-<unit bldFile="mw/svgt/svgtopt/group"/>
-</component>
-<component name="svgtplugin" filter="s60" long-name="SVG Plugin" introduced="9.2" plugin="Y">
-<unit bldFile="mw/svgt/svgtopt/svgtplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="uiaccelerator" level="generic" long-name="UI Accelerator" levels="plugin framework server ex if">
-<collection name="uiaccelerator_plat" long-name="UI Accelerator Platform Interfaces" level="if">
-<component name="alf_core_toolkit_api" long-name="ALF Core Toolkit API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/group"/>
-</component>
-<component name="alf_visual_api" long-name="ALF Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/group"/>
-</component>
-<component name="alf_extended_visual_api" long-name="ALF Extended Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/group"/>
-</component>
-<component name="alf_extension_api" long-name="ALF Extension API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/group"/>
-</component>
-<component name="alf_tracing_api" long-name="ALF Tracing API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/group"/>
-</component>
-<component name="alf_client_server_api" long-name="ALF Client Server API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/group"/>
-</component>
-</collection>
-<collection name="uiacceltk" long-name="UI Accelerator Toolkit" level="framework">
-<component name="hitchcock" filter="s60" long-name="Hitchcock">
-<unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/group"/>
-</component>
-<component name="uiacceltk_build" filter="s60" long-name="UI Accelerator Toolkit Build">
-<!-- move into the other component, or remove the #include and make this UI Accelerator Toolkit ROM-->
-<unit bldFile="mw/uiaccelerator/uiacceltk/group"/>
-</component>
-</collection>
-<collection name="uiaccelerator_test" long-name="UI Accelerator Test" level="ex"/>
-</block>
-<block name="uiresources" level="generic" long-name="UI Resources" levels="compile plugin framework server generic data">
-<!-- are the custom filters below needed? -->
-<collection name="uiresources_pub" long-name="UI Resources Public Interfaces" level="data">
-<component name="pictograph_api" long-name="Pictograph API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/pictograph_api/group" filter="!test"/>
-</component>
-<component name="skins_api" long-name="Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/skins_api/group" filter="!test"/>
-</component>
-<component name="font_definition_api" long-name="Font Definition API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/font_definition_api/group" filter="!test"/>
-</component>
-<component name="graphics_api" long-name="Graphics API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/graphics_api/group" filter="!test"/>
-</component>
-<component name="scalable_icons_api" long-name="Scalable Icons API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/scalable_icons_api/group"/>
-</component>
-<component name="layout_id_definitions_api" long-name="Layout ID Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/layout_id_definitions_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_plat" long-name="UI Resources Platform Interfaces" level="data">
-<component name="layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_system_private_api/group" filter="!test"/>
-</component>
-<component name="layout_data_api" long-name="Layout Data API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_data_api/group" filter="!test"/>
-</component>
-<component name="cdl_api" long-name="CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/cdl_api/group" filter="!test"/>
-</component>
-<component name="extended_skins_api" long-name="Extended Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_skins_api/group" filter="!test"/>
-</component>
-<component name="tfx_server_controller_plugin_api" long-name="TFX Server Controller Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_controller_plugin_api/group"/>
-</component>
-<component name="extended_fonts_api" long-name="Extended Fonts API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_fonts_api/group" filter="!test"/>
-</component>
-<component name="graphic_configuration_api" long-name="Graphic Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/graphic_configuration_api/group" filter="!test"/>
-</component>
-<component name="mif_header_cdl_api" long-name="MIF Header CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mif_header_cdl_api/group"/>
-</component>
-<component name="personalisation_and_skins_settings_api" long-name="Personalisation and Skins Settings API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/personalisation_and_skins_settings_api/group"/>
-</component>
-<component name="tfx_effect_setup_plugin_api" long-name="TFX Effect Setup Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_effect_setup_plugin_api/group"/>
-</component>
-<component name="mifconv_definitions_api" long-name="Mifconv Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mifconv_definitions_api/group"/>
-</component>
-<component name="wallpaper_configuration_api" long-name="Wallpaper Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/wallpaper_configuration_api/group"/>
-</component>
-<component name="language_code_definitions_api" long-name="Language Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/language_code_definitions_api/group"/>
-</component>
-<component name="skins_image_attributes_api" long-name="Skins Image Attributes API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
-</component>
-<component name="private_user_area_code_definitions_api" long-name="Private User Area Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/private_user_area_code_definitions_api/group"/>
-</component>
-<component name="tfx_server_plugin_ids_api" long-name="TFX Server Plug-in IDs API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_plugin_ids_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_info" long-name="UI Resources Info" level="data">
-<component name="uiresources_test" filter="s60,test,api_test" long-name="UI Resources Tests" purpose="development"/>
-</collection>
-<collection name="uigraphics" long-name="UI Graphics" level="generic">
-<component name="bitmaps2" filter="s60" long-name="Bitmaps 2" class="config">
-<unit bldFile="mw/uiresources/uigraphics/bitmaps2/group"/>
-</component>
-<component name="icons" filter="s60" long-name="Icons" class="config">
-<unit bldFile="mw/uiresources/uigraphics/icons/group"/>
-</component>
-<component name="variatedbitmaps" filter="s60" long-name="Variated Bitmaps" class="config">
-<unit bldFile="mw/uiresources/uigraphics/variatedbitmaps/group"/>
-</component>
-<component name="aknicon" filter="s60" long-name="Avkon Icon Framework">
-<unit bldFile="mw/uiresources/uigraphics/aknicon/group"/>
-</component>
-<component name="nvgrenderstage" filter="sf_build" long-name="NVG Render Stage">
-<unit bldFile="mw/uiresources/uigraphics/nvgrenderstage/group"/>
-</component>
-</collection>
-<collection name="layouts" long-name="Layouts" level="plugin">
-<component name="cdl" filter="s60" long-name="Customization Definition Language">
-<!-- can only have one unit. Need to #include them or split into multiple components -->
-<unit bldFile="mw/uiresources/layouts/cdl/cdlengine/group"/>
-<unit bldFile="mw/uiresources/layouts/cdl/cdlserver/group"/>
-</component>
-<component name="aknlayout2" filter="s60" long-name="Avkon Layout 2">
-<unit bldFile="mw/uiresources/layouts/aknlayout2/group"/>
-</component>
-</collection>
-<collection name="skins" long-name="Skins" level="data">
-<component name="aknskincontent" filter="s60" long-name="Avkon Skin Content" class="config">
-<unit bldFile="mw/uiresources/skins/aknskincontent/group"/>
-</component>
-<component name="aknskins" filter="s60" long-name="Avkon Skin Compiler">
-<unit bldFile="mw/uiresources/skins/aknskins/group"/>
-</component>
-</collection>
-<collection name="pictographs" long-name="Pictographs" level="data">
-<component name="aknpictograph" filter="s60" long-name="Avkon Pictograph">
-<unit bldFile="mw/uiresources/pictographs/aknpictograph/group"/>
-</component>
-</collection>
-<collection name="locales" long-name="Locales" level="framework">
-<component name="locales_build" filter="s60" long-name="Locales Build">
-<unit bldFile="mw/uiresources/locales/loce32"/>
-</component>
-</collection>
-<collection name="uiconfig" long-name="UI Config" level="server">
-<component name="s60config" filter="s60" long-name="S60 UI Config">
-<unit bldFile="mw/uiresources/uiconfig/s60config/group"/>
-</component>
-</collection>
-<collection name="fontsupport" long-name="Font Support" level="generic">
-<component name="fontprovider" filter="s60" long-name="Font Provider">
-<unit bldFile="mw/uiresources/fontsupport/fontprovider/group"/>
-</component>
-<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
- <component id="s60_fonts" filter="s60" name="S60 Fonts">
- <unit bldFile="fontsupport/fontutils/group"/>
- </component>
--->
-<component name="fontutils" filter="sf_build" long-name="Font Utils">
-<unit bldFile="mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
-</component>
-</collection>
-<collection name="helpthemes" long-name="Help Themes" level="data">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helpthemes_build" filter="s60" long-name="Help Themes Build" class="config">
-<unit bldFile="mw/uiresources/helpthemes/group"/>
-</component>
-</collection>
-</block>
-<block name="hapticsservices" level="generic" long-name="Haptics Services" levels="fw server api">
-<collection name="hapticsservices_plat" long-name="Haptics Services Platform Interfaces" level="api">
-<component name="tacticon_api" long-name="Tacticon API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tacticon_api/group"/>
-</component>
-<component name="tactile_feedback_core_api" long-name="Tactile Feedback Core API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_core_api/group"/>
-</component>
-<component name="tactile_feedback_server_api" long-name="Tactile Feedback Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_server_api/group"/>
-</component>
-</collection>
-<collection name="hapticsservices_pub" long-name="Haptics Services Public Interfaces" level="api">
-<component name="tactile_feedback_client_api" long-name="Tactile Feedback Client API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_pub/tactile_feedback_client_api/group"/>
-</component>
-</collection>
-<collection name="tacticonserver" long-name="Tacticon Server" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="tacticonserver_build" filter="s60" long-name="Tacticon Server Build" introduced="^3">
-<unit bldFile="mw/hapticsservices/tacticonserver/group"/>
-<!-- clients and servers are suauly the same component. Consider moving pluign to a separate component if needed -->
-</component>
-</collection>
-<collection name="tactilefeedback" long-name="Tactile Feedback" level="fw">
-<component name="tactilearearegistry" filter="s60" long-name="Tactile Area Registry" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilearearegistry/group"/>
-</component>
-<component name="tactilefeedbackresolver" filter="s60" long-name="Tactile Feedback Resolver" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackresolver/group"/>
-</component>
-<component name="tactileclickplugin" filter="s60" long-name="Tactile Click Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileclickplugin/group"/>
-</component>
-<component name="tactilefeedbackclient" filter="s60" long-name="Tactile Feedback Client" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackclient/group"/>
-</component>
-<component name="tactileactionplugin" filter="s60" long-name="Tactile Action Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileactionplugin/group"/>
-</component>
-<component name="tactilefeedback_build" filter="s60" long-name="Tactile Feedback Build" introduced="^1">
-<!-- consider moving IBY to one fo the above components -->
-<unit bldFile="mw/hapticsservices/tactilefeedback/group"/>
-</component>
-</collection>
-</block>
-<block name="platformthemes" level="specific" long-name="Platform Themes" levels="framework generic ui">
-<collection name="platformthemes_info" long-name="Platform Themes Info">
-<component name="platformthemes_build" long-name="Platform Themes Build">
-<!-- no real structure in this package. Should break into collections / components -->
-<unit bldFile="mw/platformthemes" proFile="platformthemes.pro"/>
-</component>
-</collection>
-</block>
-<block name="gsprofilesrv" level="generic" long-name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
-<collection name="gsprofilesrv_pub" long-name="GS and Profiles Services Public Interfaces" level="specific">
-<component name="profiles_engine_active_profile_settings_api" long-name="Profiles Engine Active Profile Settings API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_active_profile_settings_api/group"/>
-</component>
-<component name="profiles_engine_wrapper_api" long-name="Profiles Engine Wrapper API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_wrapper_api/group"/>
-</component>
-</collection>
-<collection name="gsprofilesrv_plat" long-name="GS and Profiles Services Platform Interfaces" level="specific">
-<component name="ftuwizardmodel_api" long-name="FTU Wizard Model API" filter="bldfirst,s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/ftuwizardmodel_api" proFile="ftuwizardmodel_api.pro" qmakeArgs="-r -config rom"/>
-</component>
-<component name="profiles_engine_api" long-name="Profiles Engine API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_engine_api/group"/>
-</component>
-<component name="settings_backgroundimage_api" long-name="Settings Background Image API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_backgroundimage_api/group"/>
-</component>
-<component name="settings_framework_api" long-name="Settings Framework API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_framework_api/group"/>
-</component>
-<component name="settings_launch_api" long-name="Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_launch_api/group"/>
-</component>
-<component name="settings_listbox_api" long-name="Settings List Box API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_listbox_api/group"/>
-</component>
-<component name="settings_plugin_api" long-name="Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_plugin_api/group"/>
-</component>
-<component name="settings_uis_cenrep_collection_api" long-name="Settings UIs CenRep Collection API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
-</component>
-</collection>
-<collection name="gssettingsuis" long-name="General Settings UIs" level="framework">
-<component name="gs" filter="s60" long-name="General Settings" introduced="9.2">
-<unit bldFile="mw/gsprofilesrv/gssettingsuis/gs/group"/>
-</component>
-</collection>
-<collection name="ftuwizardmodel" long-name="FTU Wizard Model" level="generic">
-<component name="ftuwizardmodel_build" long-name="FTU Wizardmodel Build" filter="bldfirst">
-<unit bldFile="mw/gsprofilesrv/ftuwizardmodel" proFile="ftuwizardmodel.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-<collection name="controlpanel" long-name="Control Panel" level="generic">
-<component name="controlpanel_build" long-name="Control Panel Build">
-<unit bldFile="mw/gsprofilesrv/controlpanel" proFile="controlpanel.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-<collection name="profilesservices" long-name="Profiles Services" level="server">
-<component name="profileengine" filter="s60" long-name="Profile Engine" introduced="9.1">
-<unit bldFile="mw/gsprofilesrv/profilesservices/profileengine/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreensrv" level="specific" long-name="Home Screen Services" levels="plugin framework server generic specific">
-<collection name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" level="specific">
-<component name="action_handler_plugin_api" long-name="Action Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/group" filter="!test"/>
-</component>
-<component name="content_harvester_plugin_api" long-name="Content Harvester Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/group" filter="!test"/>
-</component>
-<component name="menu_sat_interface_api" long-name="Menu SAT Interface API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/group" filter="!test"/>
-</component>
-<component name="sapi_contentpublishing" long-name="SAPI Content Publishing" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing/group"/>
-</component>
-<component name="sapi_actionhandler" long-name="SAPI Action Handler" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_actionhandler/group"/>
-</component>
-</collection>
-<collection name="contentpublishingsrv" long-name="Content Publishing Service" level="server">
-<component name="contentpublishingdebug" filter="s60" long-name="Content Publishing Debug">
-<!-- need to move this component outside of contentpublishingutils and into separate component directory -->
-<!-- <unit bldFile="contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/> -->
-</component>
-<component name="contentpublishingutils" filter="s60" long-name="Content Publishing Utils">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingutils/group"/>
-</component>
-<component name="contentpublishingserver" filter="s60" long-name="Content Publishing Server">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingserver/group"/>
-</component>
-<component name="contentharvester" filter="s60" long-name="Content Harvester">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
-</component>
-<component name="contentpublishingsrv_build" filter="s60" long-name="Content Publishing Service Build">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreensrvlegacy" level="generic" long-name="Legacy Home Screen Services" levels="plugin framework server generic specific">
-<collection name="homescreensrvlegacy_plat" long-name="Legacy Home Screen Services Platform Interfaces" level="specific">
-<component name="ai_content_model_api" long-name="AI Content Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrvlegacy/ai_content_model_api/group" proFile="group.pro"/>
-</component>
-<component name="ai_plugin_information_api" long-name="AI Plug-in Information API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrvlegacy/ai_plugin_information_api/group" proFile="group.pro"/>
-</component>
-</collection>
-</block>
-<block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
-<collection name="appinstall_plat" long-name="Application Installation Platform Interfaces" level="api">
-<component name="iaupdate_api" long-name="IA Update API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/iaupdate_api/group"/>
-</component>
-<component name="task_plugin_api" long-name="Task Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_plugin_api/group"/>
-</component>
-<component name="sw_installer_common_ui_api" long-name="SW Installer Common UI API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_common_ui_api/group"/>
-</component>
-<component name="sw_installer_launcher_api" long-name="SW Installer Launcher API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_launcher_api/group"/>
-</component>
-<component name="task_management_api" long-name="Task Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_management_api/group"/>
-</component>
-<component name="sw_installer_ui_plugin_api" long-name="SW Installer UI Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ui_plugin_api/group"/>
-</component>
-<component name="sw_installer_cr_keys" long-name="SW Installer CR Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_cr_keys/group"/>
-</component>
-<component name="sw_installer_ps_keys" long-name="SW Installer PS Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
-</component>
-<component name="appmngr2runtimeapi" long-name="Application Manager 2 Runtime Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
-</component>
-<component name="sifui_api" long-name="STIF UI API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sifui_api/group"/>
-</component>
-</collection>
-<collection name="appinstall_pub" long-name="Application Installation Public Interfaces" level="api">
-<component name="startup_list_management_api" long-name="Startup List Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
-</component>
-</collection>
-<collection name="ncdengine" long-name="Nokia Content Discover" level="framework">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="ncdengine_engine" filter="s60" long-name="NCD Engine" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/engine/group"/>
-</component>
-<component name="debuglogger" filter="s60" long-name="NCD Debug Logger" introduced="^1" class="placeholder">
-<!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
-</component>
-<component name="ncdengine_build" filter="s60" long-name="NCD Build" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/group"/>
-</component>
-</collection>
-<collection name="appinstaller" long-name="Application Installer" level="generic">
-<component name="appinstui" filter="s60" long-name="Application Installer UI" introduced="^2">
-<unit bldFile="mw/appinstall/appinstaller/appinstui/group"/>
-</component>
-</collection>
-<collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="api">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="iaupdateapi_stub_build" long-name="IA Update API Stub Build" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdateapi_stub/group"/>
-</component>
-</collection>
-<collection name="iaupdate" long-name="Independent Apps Update" level="api">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="iad" long-name="Software Update" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/iad/group"/>
-</component>
-<component name="iaupdate_help" filter="s60" long-name="IA Update Help" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/help/group"/>
-</component>
-<component name="iaupdate_build" filter="s60" long-name="IA Update Build" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/group"/>
-</component>
-</collection>
-<collection name="installationservices" long-name="Installation Services" level="generic">
-<component name="swi" long-name="Secure Software Install" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swi/group" mrp="mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
-</component>
-<component name="swidevicetools" long-name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
-<unit bldFile="mw/appinstall/installationservices/swidevicetools/group" mrp="mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
-</component>
-<component name="swcomponentregistry" long-name="Software Component Registry" introduced="^4" purpose="mandatory">
-<unit bldFile="mw/appinstall/installationservices/swcomponentregistry/group" mrp="mw/appinstall/installationservices/swcomponentregistry/group/security_softwarecomponentregistry.mrp"/>
-</component>
-<component name="swinstallationfw" long-name="Software Installation Framework" introduced="^4" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swinstallationfw/group" mrp="mw/appinstall/installationservices/swinstallationfw/group/security_softwareinstallframework.mrp"/>
-</component>
-<component name="swtransactionservices" long-name="Software Transaction Services" introduced="^4" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swtransactionservices/group" mrp="mw/appinstall/installationservices/swtransactionservices/group/security_softwaretransactionservices.mrp"/>
-</component>
-<component name="refswinstallationplugin" long-name="Reference Software Installation Plugin" introduced="^4" purpose="development" plugin="Y">
-<unit bldFile="mw/appinstall/installationservices/refswinstallationplugin/group" mrp="mw/appinstall/installationservices/refswinstallationplugin/group/security_sifrefplugin.mrp"/>
-</component>
-<component name="refsoftwareappmgr" long-name="Reference Software Application Manager" introduced="^4" purpose="development">
-<unit bldFile="mw/appinstall/installationservices/refsoftwareappmgr/group" mrp="mw/appinstall/installationservices/refsoftwareappmgr/group/security_referenceapplicationmanager.mrp"/>
-</component>
-<component name="swiconfig" long-name="Software Install Config" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appinstall/installationservices/swiconfig/group" mrp="mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
-</component>
-</collection>
-<collection name="secureswitools" long-name="Secure Software Install Tools" level="tool">
-<component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/makekeys/group" mrp="mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
-</component>
-<component name="swianalysistoolkit" long-name="SWI Analysis Toolkit" purpose="development" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
-</component>
-<component name="openssllib" long-name="OpenSSL Library" purpose="optional" class="PC">
-<unit mrp="mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
-</component>
-<component name="swisistools" long-name="Secure Software Install SIS Tools" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swisistools/group" mrp="mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
-</component>
-</collection>
-<collection name="appinstall_info" long-name="Application Installation Info" level="api">
-<component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="serviceapifw" level="specific" long-name="Service API Framework" levels="plugin framework server generic specific">
-<collection name="serviceapifw_pub" long-name="Service API Framework Public Interfaces" level="specific"/>
-<collection name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" level="specific">
-<component name="rtsecuritymanager_common_api" long-name="Runtime Security Manager Common API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/group"/>
-</component>
-<component name="rtsecuritymanager_utility_api" long-name="Runtime Security Manager Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
-</component>
-<component name="rtsecuritymanager_client_api" long-name="Runtime Security Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/group"/>
-</component>
-<component name="liw_provider_utility_api" long-name="LIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_provider_utility_api/group"/>
-</component>
-<component name="liw_service_interface_base_api" long-name="LIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_base_api/group"/>
-</component>
-<component name="liw_service_interface_menu_api" long-name="LIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_menu_api/group"/>
-</component>
-<component name="liw_criteria_api" long-name="LIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_criteria_api/group"/>
-</component>
-<component name="liw_generic_parameter_api" long-name="LIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_generic_parameter_api/group"/>
-</component>
-<component name="liw_service_handler_api" long-name="LIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_handler_api/group"/>
-</component>
-</collection>
-<collection name="rtsecuritymanager" long-name="Runtime Security Manager" level="server">
-<component name="rtsecuritymanagerutil" filter="s60" long-name="Runtime Security Manager Util">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
-</component>
-<component name="rtsecuritymanagerserver" filter="s60" long-name="Runtime Security Manager Server">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/>
-</component>
-<component name="rtsecuritymanagerclient" filter="s60" long-name="Runtime Security Manager Client">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/>
-</component>
-<component name="rtsecuritymanager_build" filter="s60" long-name="Runtime Security Manager Build">
-<!-- Move the export to the appropriate components, or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/group"/>
-</component>
-</collection>
-<collection name="languageinterworkingfw" long-name="Language Interworking Framework" level="framework">
-<component name="lifwservicehandler" filter="s60" long-name="Service Handler">
-<unit bldFile="mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-</block>
-<block name="serviceapi" level="specific" long-name="Service API" levels="os mw1 mw2 app">
-<!-- should break up this collection into something meaningful -->
-<collection name="serviceproviders" long-name="Service Providers" level="mw1">
-<component name="sapi_contacts_vpbk" long-name="Contacts Phonebook SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
-</component>
-<component name="sapi_location" long-name="Location SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_location/group"/>
-</component>
-<component name="sapi_mediamanagement" long-name="Media Management SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/group"/>
-</component>
-<component name="sapi_landmarks" long-name="Landmarks SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
-</component>
-<component name="sapi_messaging" long-name="Messaging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/group"/>
-</component>
-<component name="sapi_applicationmanager" long-name="Application Manager SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
-</component>
-<component name="sapi_calendar" long-name="Calendar SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_calendar/group"/>
-</component>
-<component name="sapi_logging" long-name="Logging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_logging/group"/>
-</component>
-<component name="sapi_sensor" long-name="Sensor SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sensor/group"/>
-</component>
-<component name="sapi_sysinfo" long-name="Sysinfo SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sysinfo/group"/>
-</component>
-<component name="sapi_serviceregistry" long-name="Service Registry SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
-</component>
-<component name="jsapi" long-name="Javascript API" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/jsapi/group"/>
-</component>
-<component name="serviceproviders_build" filter="s60" long-name="Service API Build">
-<!-- distribute the exports or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapi/serviceproviders/group"/>
-</component>
-</collection>
-</block>
-<block name="web" level="specific" long-name="Web" levels="plugin utils server generic specific">
-<collection name="web_pub" long-name="Web Public Interfaces" level="specific">
-<component name="browser_control_api" long-name="Browser Control API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_control_api/group"/>
-</component>
-<component name="download_mgr_client_api" long-name="Download Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_client_api/group"/>
-</component>
-<component name="download_mgr_ui_api" long-name="Download Manager UI Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_ui_api/group"/>
-</component>
-<component name="favourites_engine_api" long-name="Favourites Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/favourites_engine_api/group"/>
-</component>
-<component name="browser_plugin_api" long-name="Browser Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_plugin_api/group"/>
-</component>
-<component name="settings_api" long-name="Settings API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/settings_api/group"/>
-</component>
-</collection>
-<collection name="web_plat" long-name="Web Platform Interfaces" level="specific">
-<component name="aiw_browser_provider_api" long-name="AIW Browser Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/aiw_browser_provider_api/group"/>
-</component>
-<component name="browser_dialogs_provider_api" long-name="Browser Dialogs Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_dialogs_provider_api/group"/>
-</component>
-<component name="browser_platform_api" long-name="Browser Platform API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_platform_api/group"/>
-</component>
-<component name="cod_handler_api" long-name="COD Handler API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cod_handler_api/group"/>
-</component>
-<component name="connection_manager_api" long-name="Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/connection_manager_api/group"/>
-</component>
-<component name="cxml_library_api" long-name="cXml Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cxml_library_api/group"/>
-</component>
-<component name="download_mgr_client_api_extn" long-name="Download Manager Client API Extension" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/download_mgr_client_api_extn/group"/>
-</component>
-<component name="download_path_plugin_api" long-name="Download Path Plugin API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/web/web_plat/download_path_plugin_api/group"/>
-</component>
-<component name="feeds_engine_api" long-name="Feeds Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/feeds_engine_api/group"/>
-</component>
-<component name="launcher_api" long-name="Launcher API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/launcher_api/group"/>
-</component>
-<component name="multipart_parser_api" long-name="Multipart Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/multipart_parser_api/group"/>
-</component>
-<component name="recent_url_store_api" long-name="Recent URL Store API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/recent_url_store_api/group"/>
-</component>
-<component name="scheme_handler_plugin_api" long-name="Scheme Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scheme_handler_plugin_api/group"/>
-</component>
-<component name="scriptable_plugin_api" long-name="Scriptable Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scriptable_plugin_api/group"/>
-</component>
-<component name="webutils_api" long-name="Web Utils API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/webutils_api/group"/>
-</component>
-<component name="widget_registry_api" long-name="Widget Registry API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/widget_registry_api/group"/>
-</component>
-<component name="xml_parser_api" long-name="XML Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/xml_parser_api/group"/>
-</component>
-</collection>
-<collection name="web_info" long-name="Web Info" level="specific">
-<component name="web_build" filter="s60" long-name="Web Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/group"/>
-</component>
-</collection>
-<collection name="browserutilities" long-name="Browser Utilities" level="utils">
-<component name="browserdialogsprovider" filter="s60" long-name="Browser Dialogs Provider">
-<unit bldFile="mw/web/browserutilities/browserdialogsprovider/group"/>
-</component>
-<component name="recenturlstore" filter="s60" long-name="Recent URL Store">
-<unit bldFile="mw/web/browserutilities/recenturlstore/group"/>
-</component>
-<component name="xmlparser" filter="s60" long-name="XML Interface">
-<unit bldFile="mw/web/browserutilities/xmlparser/group"/>
-</component>
-<component name="cxmllibrary" filter="s60" long-name="XML Parser Implementation">
-<unit bldFile="mw/web/browserutilities/cxmllibrary/group"/>
-</component>
-<component name="downloadmgr" filter="s60" long-name="Download Manager">
-<unit bldFile="mw/web/browserutilities/downloadmgr/group"/>
-</component>
-<component name="connectionmanager" filter="s60" long-name="Connection Manager">
-<unit bldFile="mw/web/browserutilities/connectionmanager/group"/>
-</component>
-<component name="browsertelservice" filter="s60" long-name="Browser Telephony Service">
-<unit bldFile="mw/web/browserutilities/browsertelservice/group"/>
-</component>
-<component name="favouritesengine" filter="s60" long-name="Favourites Engine">
-<unit bldFile="mw/web/browserutilities/favouritesengine/group"/>
-</component>
-<component name="feedsengine" filter="s60" long-name="Feeds Engine">
-<unit bldFile="mw/web/browserutilities/feedsengine/group"/>
-</component>
-<component name="multipartparser" filter="s60" long-name="Multipart Parser">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
-<!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
-</component>
-<component name="schemehandler" filter="s60" long-name="Scheme Handler">
-<unit bldFile="mw/web/browserutilities/schemehandler/group"/>
-</component>
-<component name="webutils" filter="s60" long-name="Web Utils">
-<unit bldFile="mw/web/browserutilities/webutils/group"/>
-</component>
-<component name="aiwbrowserprovider" filter="s60" long-name="AIW Browser Provider" plugin="Y">
-<unit bldFile="mw/web/browserutilities/aiwbrowserprovider/group"/>
-</component>
-<component name="browserutilities_build" filter="s60" long-name="Browser Utilities Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/browserutilities/group"/>
-</component>
-</collection>
-<collection name="webengine" long-name="Web Engine" level="server">
-<component name="osswebengine" filter="s60" long-name="OSS Web Engine">
-<!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
-<unit bldFile="mw/web/webengine/osswebengine/cache/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/memorymanager/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/npscript/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group/javascriptcore"/>
-</component>
-<component name="webkitutils" filter="s60" long-name="WebKit Utils">
-<unit bldFile="mw/web/webengine/webkitutils/group"/>
-</component>
-<component name="pagescaler" filter="s60" long-name="Page Scaler">
-<unit bldFile="mw/web/webengine/pagescaler/group"/>
-</component>
-<component name="webwidgetinstaller" filter="s60" long-name="Widget Installer">
-<unit bldFile="mw/web/webengine/widgetinstaller/group"/>
-</component>
-<component name="widgetregistry" filter="s60" long-name="Widget Registry">
-<unit bldFile="mw/web/webengine/widgetregistry/group"/>
-</component>
-<component name="wmlengine" filter="s60" long-name="WML Engine">
-<unit bldFile="mw/web/webengine/wmlengine/group"/>
-</component>
-<component name="device" filter="s60" long-name="Device">
-<!-- this needs a more meaningful name -->
-<unit bldFile="mw/web/webengine/device/group"/>
-</component>
-<component name="widgetengine" filter="s60" long-name="Widget Engine">
-<unit bldFile="mw/web/webengine/widgetengine/group"/>
-</component>
-<component name="web_memoryplugin" long-name="Memory Plugin" filter="s60" plugin="Y">
-<unit bldFile="mw/web/webengine/memoryplugin/group"/>
-</component>
-<component name="widgetmemoryplugin" filter="s60" long-name="Widget Memory Plugin" plugin="Y">
-<unit bldFile="mw/web/webengine/widgetmemoryplugin/group"/>
-</component>
-<component name="widgetbackuprestore" filter="s60" long-name="Widget Backup and Restore">
-<unit bldFile="mw/web/webengine/widgetbackuprestore/group"/>
-</component>
-<component name="browserrecognizers" filter="s60" long-name="Browser Recognizers" plugin="Y">
-<unit bldFile="mw/web/webengine/browserrecognizers/group"/>
-</component>
-<component name="wrtharvester" filter="s60" long-name="Web Runtime Harvester" plugin="Y">
-<unit bldFile="mw/web/webengine/wrtharvester/group"/>
-</component>
-</collection>
-<collection name="codhandler" long-name="Content Object Descriptor Handler" level="specific">
-<component name="codeng" filter="s60" long-name="COD Engine">
-<unit bldFile="mw/web/codhandler/codeng/group"/>
-</component>
-<component name="codui" filter="s60" long-name="COD UI">
-<unit bldFile="mw/web/codhandler/codui/group"/>
-</component>
-<component name="codrecog" filter="s60" long-name="COD Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/codrecog/group"/>
-</component>
-<component name="codviewer" filter="s60" long-name="COD Viewer">
-<unit bldFile="mw/web/codhandler/codviewer/group"/>
-</component>
-<component name="ddrecog" filter="s60" long-name="Download Descriptor Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/ddrecog/group"/>
-</component>
-<component name="ddviewer" filter="s60" long-name="Download Descriptor Viewer">
-<unit bldFile="mw/web/codhandler/ddviewer/group"/>
-</component>
-<component name="coddownload" filter="s60" long-name="COD Download">
-<unit bldFile="mw/web/codhandler/coddownload/group"/>
-</component>
-<component name="roapapp" filter="s60" long-name="ROAP Application">
-<unit bldFile="mw/web/codhandler/roapapp/group"/>
-</component>
-<component name="codhandler_build" filter="s60" long-name="COD Handler Build">
-<!-- Exports need to go into another component or make this self-contained.
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/codhandler/group"/>
-</component>
-</collection>
-<collection name="widgets" long-name="Web Widget Framework" level="generic">
-<!-- the following units can be uncommented when configuration is put in place -->
-<component name="widgetrecognizer" filter="s60" long-name="Widget Recognizer" plugin="Y">
-<!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
-</component>
-<component name="widgetinstaller" filter="s60" long-name="Widget Installer UI" plugin="Y">
-<!--<unit bldFile="widgets/widgetinstaller/group"/>-->
-</component>
-<component name="widgetlauncher" filter="s60" long-name="Widget Launcher">
-<!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
-</component>
-<component name="widgetapp" filter="s60" long-name="Widget UI">
-<!--<unit bldFile="widgets/widgetapp/group"/>-->
-</component>
-<component name="widgetsidchecker" filter="s60" long-name="Widget SID Checker" introduced="^3">
-<!--<unit bldFile="widgets/widgetsidchecker/group"/>-->
-</component>
-<component name="widgetpreinstaller" filter="s60" long-name="Widget Pre-Installer">
-<!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
-</component>
-<component name="widgetstartup" filter="s60" long-name="Widget Startup">
-<!--<unit bldFile="widgets/widgetstartup/group"/>-->
-</component>
-<component name="widgets_build" filter="s60" long-name="Widgets Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/widgets/group"/>
-</component>
-</collection>
-</block>
-<block name="websrv" level="generic" long-name="Web Services" levels="plugin framework server generic specific">
-<collection name="websrv_pub" long-name="Web Services Public Interfaces" level="specific">
-<component name="web_service_description_api" long-name="Web Service Description API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_description_api/group"/>
-</component>
-<component name="web_service_connection_api" long-name="Web Service Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/group"/>
-</component>
-<component name="web_service_manager_api" long-name="Web Service Manager API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/group"/>
-</component>
-<component name="hostlet_connection_api" long-name="Hostlet Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/group"/>
-</component>
-<component name="web_service_messaging_api" long-name="Web Service Messaging API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/group"/>
-</component>
-<component name="xml_extensions_api" long-name="XML Extensions API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/group"/>
-</component>
-<component name="xml_fragment_api" long-name="XML Fragment API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/group"/>
-</component>
-</collection>
-<collection name="webservices" long-name="Web Services Framework" level="generic">
-<!-- consider breaking this collection into more meaningful subsets -->
-<component name="wsnotifierplugins" filter="s60" long-name="WS Notifier Plugins" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsnotifierplugins/group"/>
-</component>
-<component name="wslogger" filter="s60" long-name="WS Logger">
-<unit bldFile="mw/websrv/webservices/wslogger/group"/>
-</component>
-<component name="wsxml" filter="s60" long-name="WS XML Extensions">
-<unit bldFile="mw/websrv/webservices/wsxml/group"/>
-</component>
-<component name="wsutils" filter="s60" long-name="WS Utils">
-<unit bldFile="mw/websrv/webservices/wsutils/group"/>
-</component>
-<component name="wsfragment" filter="s60" long-name="WS Fragment">
-<unit bldFile="mw/websrv/webservices/wsfragment/group"/>
-</component>
-<component name="wsdescription" filter="s60" long-name="WS Service Description">
-<unit bldFile="mw/websrv/webservices/wsdescription/group"/>
-</component>
-<component name="wsconnection" filter="s60" long-name="WS Service Connection">
-<unit bldFile="mw/websrv/webservices/wsconnection/group"/>
-</component>
-<component name="wsmessages" filter="s60" long-name="WS Messages">
-<unit bldFile="mw/websrv/webservices/wsmessages/group"/>
-</component>
-<component name="wscredentialmanager" filter="s60" long-name="WS Credential Manager">
-<unit bldFile="mw/websrv/webservices/wscredentialmanager/group"/>
-</component>
-<component name="wsframework" filter="s60" long-name="WS Framework">
-<unit bldFile="mw/websrv/webservices/wsframework/group"/>
-</component>
-<component name="wshttpchanneltransportplugin" filter="s60" long-name="WS HTTP Channel Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshttpchanneltransportplugin/group"/>
-</component>
-<component name="wsconnectionagent" filter="s60" long-name="WS Connection Agent">
-<unit bldFile="mw/websrv/webservices/wsconnectionagent/group"/>
-</component>
-<component name="wsprovider" filter="s60" long-name="WS Provider">
-<unit bldFile="mw/websrv/webservices/wsprovider/group"/>
-</component>
-<component name="wshostletconnection" filter="s60" long-name="WS Hostlet Connection">
-<unit bldFile="mw/websrv/webservices/wshostletconnection/group"/>
-</component>
-<component name="wsmanager" filter="s60" long-name="WS Service Manager">
-<unit bldFile="mw/websrv/webservices/wsmanager/group"/>
-</component>
-<component name="wsidentitymanager" filter="s60" long-name="WS Identity Manager">
-<unit bldFile="mw/websrv/webservices/wsidentitymanager/group"/>
-</component>
-<component name="idwsfplugin" filter="s60" long-name="ID-WSF Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/idwsfplugin/group"/>
-</component>
-<component name="wsibasicplugin" filter="s60" long-name="WS-I Basic Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsibasicplugin/group"/>
-</component>
-<component name="wsrestplugin" filter="s60" long-name="WS REST Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsrestplugin/group"/>
-</component>
-<component name="idwsfsecuritymechanism" filter="s60" long-name="ID-WSF Security Mechanism">
-<unit bldFile="mw/websrv/webservices/idwsfsecuritymechanism/group"/>
-</component>
-<component name="wspasswordtransforms" filter="s60" long-name="WS Password Transforms">
-<unit bldFile="mw/websrv/webservices/wspasswordtransforms/group"/>
-</component>
-<component name="wscore" filter="s60" long-name="WS Core Service Manager">
-<unit bldFile="mw/websrv/webservices/wscore/group"/>
-</component>
-<component name="wslocaltransportplugin" filter="s60" long-name="WS Local Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wslocaltransportplugin/group"/>
-</component>
-<component name="wshostlettransportplugin" filter="s60" long-name="WS Hostlet Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshostlettransportplugin/group"/>
-</component>
-<component name="wsstar" filter="s60" long-name="WS Star">
-<!-- can only have one unit. Need to split into separate components or #include from a single bld.inf -->
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarpolicy/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarplugin/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarmessagehandlers/group"/>
-</component>
-<component name="wsoviplugin" filter="s60" long-name="WS Ovi Plugin">
-<unit bldFile="mw/websrv/webservices/wsoviplugin/group"/>
-</component>
-<component name="webservices_build" filter="s60" long-name="Web Services Build">
-<!-- need to split into self-contained components -->
-<unit bldFile="mw/websrv/webservices/group"/>
-</component>
-</collection>
-<collection name="websrv_info" long-name="Web Services Info" level="specific">
-<component name="websrv_bld" filter="s60" long-name="Web Services Build">
-<!-- need to include common .hrh in each unit -->
-<unit bldFile="mw/websrv/group"/>
-</component>
-</collection>
-</block>
-<block name="webruntime" level="specific" long-name="Web Runtime">
-<!-- need to break up this package nito collections and components -->
-<collection name="webruntime_info" long-name="Web Runtime Info">
-<component name="webruntime_build" long-name="Web Runtime Build" introduced="^4">
-<unit bldFile="mw/webruntime" proFile="cwrt.pro" qmakeArgs=""what+=ninetwo" "what+=tenone" "what+=qt_unstable" "what+=wrtlite" "what+=exportiby""/>
-</component>
-</collection>
-</block>
-<block name="platformtools" level="generic" long-name="Platform Tools">
-<collection name="gfxconversion" long-name="Graphics Conversion">
-<component name="bmconv_s60" filter="s60" long-name="S60 Bitmap Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/bmconv_s60/group"/>
-</component>
-<component name="mifconv" filter="s60" long-name="Multi Icon File Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/mifconv/group"/>
-</component>
-</collection>
-</block>
-<block name="uitools" level="specific" long-name="UI Tools" levels="compile encode tool if">
-<collection name="uitools_pub" long-name="UI Tools Public Interfaces" level="if">
-<component name="third_party_bitmap_palette_api" long-name="Third Party Bitmap Palette API" filter="s60" class="api">
-<unit bldFile="mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
-</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">
-<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">
-<unit bldFile="mw/uitools/uitools_plat/layout_system_private_api/group"/>
-</component>
-</collection>
-<collection name="cdlcompilertoolkit" long-name="CDL Compiler Toolkit" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompilertoolkit_build" filter="s60" long-name="CDL Compiler Toolkit Build">
-<unit bldFile="mw/uitools/cdlcompilertoolkit/group"/>
-</component>
-</collection>
-<collection name="cdlcompiler" long-name="CDL Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompiler_build" filter="s60" long-name="CDL Compiler Build">
-<unit bldFile="mw/uitools/cdlcompiler/group"/>
-</component>
-</collection>
-<collection name="gfxtools" long-name="Graphics Tools" level="tool">
-<component name="gditools" filter="s60" long-name="GDI Tools" class="PC">
-<unit bldFile="mw/uitools/gfxtools/gditools/group"/>
-</component>
-<component name="color" filter="s60" long-name="Bitmap Colour Palette" class="PC">
-<unit bldFile="mw/uitools/gfxtools/color/group"/>
-</component>
-</collection>
-<collection name="aknlayoutcompiler" long-name="Avkon Layout Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="aknlayoutcompiler_build" filter="s60" long-name="Avkon Layout Compiler Build">
-<unit bldFile="mw/uitools/aknlayoutcompiler/group"/>
-</component>
-</collection>
-<collection name="skincompiler" long-name="Skin Compiler" level="compile">
-<component name="aknskindesccompiler" filter="s60" long-name="Avkon Skin Descriptor Compiler">
-<unit bldFile="mw/uitools/skincompiler/AknSkinDescCompiler/group"/>
-</component>
-</collection>
-<collection name="reszip" long-name="Resource Zip" level="encode">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="reszip_build" filter="s60" long-name="Resource Zip Build">
-<unit bldFile="mw/uitools/reszip/group"/>
-</component>
-</collection>
-<collection name="toollibraries" long-name="Tool Libraries" level="tool"/>
-<collection name="svgtencoder" long-name="SVGT Encoder" level="encode">
-<component name="svgtenc" filter="s60" long-name="Standalone SVGT Encoder" class="PC">
-<unit bldFile="mw/uitools/svgtencoder/svgtenc/standalone/group"/>
-</component>
-</collection>
-</block>
-</layer>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="location" level="apps" long-name="Location Apps" levels="ui events loc api">
-<collection name="loc_plat" long-name="Location Apps Platform Interfaces" level="api">
-<component name="location_picker_service_api" long-name="Location Picker Service API" introduced="^4" filter="s60" class="api">
-<unit bldFile="app/location/loc_plat" proFile="location_plat.pro"/>
-</component>
-</collection>
-<collection name="locationpickerservice" long-name="Location Picker Service" level="loc">
-<!--collection is really a component. Should move down a directory -->
-<component name="locationpickerservice_build" filter="s60" long-name="Location Picker Service Build" introduced="^4">
-<unit bldFile="app/location/locationpickerservice" proFile="locationpickerservice.pro"/>
-</component>
-</collection>
-</block>
-<!-- pending removal -->
-<block name="phone" level="apps" span="2" long-name="Phone Apps" levels="engine plugin ui app">
-<collection name="phoneapp" long-name="Phone Application" level="app">
-<component name="blacklist" filter="s60" long-name="Phone Blacklist Clearing" plugin="Y">
-<unit bldFile="app/phone/phoneapp/blacklist/group"/>
-</component>
-<component name="phoneuicontrol" filter="s60" long-name="Phone UI Control">
-<unit bldFile="app/phone/phoneapp/phoneuicontrol/group"/>
-</component>
-<component name="phoneuistates" filter="s60" long-name="Phone UI States">
-<unit bldFile="app/phone/phoneapp/phoneuistates/group"/>
-</component>
-<component name="phoneuiutils" filter="s60" long-name="Phone UI Utils">
-<unit bldFile="app/phone/phoneapp/phoneuiutils/group"/>
-</component>
-<component name="silenceactionplugin" filter="s60" long-name="Silence Action Plugin" plugin="Y">
-<unit bldFile="app/phone/phoneapp/silenceactionplugin/group"/>
-</component>
-<component name="phonemediatorcenter" filter="s60" long-name="Phone Mediator Center">
-<unit bldFile="app/phone/phoneapp/phonemediatorcenter/group"/>
-</component>
-<component name="phoneuiview2" filter="s60" long-name="Phone UI View">
-<unit bldFile="app/phone/phoneapp/phoneuiview2" proFile="phoneuiview2.pro"/>
-</component>
-<component name="phoneuiqtviewadapter" filter="s60" long-name="Phone UI Qt View Adapter" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneapp/phoneuiqtviewadapter" proFile="phoneuiqtviewadapter.pro"/>
-</component>
-<component name="phonestringloader" filter="s60" long-name="Phone String Loader" introduced="^4">
-<unit bldFile="app/phone/phoneapp/phonestringloader" proFile="phonestringloader.pro"/>
-</component>
-<component name="phoneui2" filter="s60" long-name="Phone UI">
-<unit bldFile="app/phone/phoneapp/phoneui2" proFile="phoneui2.pro"/>
-</component>
-</collection>
-<collection name="phoneengine" long-name="Phone Engine" level="engine">
-<component name="phonecntfinder2" filter="s60" long-name="Phone Contact Finder">
-<unit bldFile="app/phone/phoneengine/phonecntfinder2" proFile="phonecntfinder2.pro"/>
-</component>
-<component name="audiohandling" filter="s60" long-name="Phone Audio Handling">
-<unit bldFile="app/phone/phoneengine/audiohandling/group"/>
-</component>
-<component name="callhandling" filter="s60" long-name="Call Handling">
-<unit bldFile="app/phone/phoneengine/callhandling/group"/>
-</component>
-<component name="contacthandling2" filter="s60" long-name="Phone Contact Handling">
-<unit bldFile="app/phone/phoneengine/contacthandling2/group"/>
-</component>
-<component name="loghandling" filter="s60" long-name="Phone Log Handling">
-<unit bldFile="app/phone/phoneengine/loghandling/group"/>
-</component>
-<component name="engineinfo" filter="s60" long-name="Phone Engine Info">
-<unit bldFile="app/phone/phoneengine/engineinfo/group"/>
-</component>
-<component name="phonemodel" filter="s60" long-name="Phone Model">
-<unit bldFile="app/phone/phoneengine/phonemodel" proFile="phonemodel.pro"/>
-</component>
-<component name="servicehandling" filter="s60" long-name="Phone Service Handling">
-<unit bldFile="app/phone/phoneengine/servicehandling/group"/>
-</component>
-<component name="phoneservices" filter="s60" long-name="Phone Server" introduced="^4">
-<unit bldFile="app/phone/phoneengine/phoneservices" proFile="phoneservices.pro"/>
-</component>
-<component name="parserrecognizer" filter="s60" long-name="Parser Recognizer" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneengine/parserrecognizer" proFile="parserrecognizer.pro"/>
-</component>
-</collection>
-<collection name="phoneuis" long-name="Phone UIs" level="ui">
-<component name="bubblemanager2" filter="s60" long-name="Phone Bubble Manager">
-<unit bldFile="app/phone/phoneuis/bubblemanager2" proFile="bubblemanager2.pro"/>
-</component>
-<component name="telephonydevicemode" filter="s60" long-name="Telephony Device Mode">
-<unit bldFile="app/phone/phoneuis/telephonydevicemode/group"/>
-</component>
-</collection>
-<collection name="phone_plat" long-name="Phone Apps Platform Interfaces" level="app">
-<component name="3d_ringing_tone_enabler_api" long-name="3D Ringing Tone Enabler API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
-</component>
-<component name="telephony_comms_information_api" long-name="Telephony Comms Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_comms_information_api/group"/>
-</component>
-<component name="telephony_information_api" long-name="Telephony Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_information_api/group"/>
-</component>
-<component name="telephony_device_mode_api" long-name="Telephony Device Mode API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_device_mode_api/group"/>
-</component>
-<component name="telephony_remote_party_information_api" long-name="Telephony Remote Party Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_remote_party_information_api/group"/>
-</component>
-<component name="telephony_video_mailbox_settings_api" long-name="Telephony Video Mailbox Settings API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_video_mailbox_settings_api/group"/>
-</component>
-<component name="telephony_microphone_mute_status_api" long-name="Telephony Microphone Mute Status API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_microphone_mute_status_api/group"/>
-</component>
-<component name="telephony_logging_extension_api" long-name="Telephony Logging Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_logging_extension_api/group"/>
-</component>
-<component name="telephony_matching_extension_api" long-name="Telephony Matching Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_matching_extension_api/group"/>
-</component>
-<component name="phone_application_commands_api" long-name="Phone Application Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_commands_api/group"/>
-</component>
-<component name="phone_application_voip_commands_api" long-name="Phone Application VOIP Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_voip_commands_api/group"/>
-</component>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_mediator_api/group"/>
-</component>
-<component name="video_telephony_mediator_api" long-name="Video Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/video_telephony_mediator_api/group"/>
-</component>
-<component name="video_telephony_control_mediator_api" long-name="Video Telephony Control Mediator API" filter="s60" introduced="^4" class="api">
-<unit bldFile="app/phone/phone_plat/video_telephony_control_mediator_api/group"/>
-</component>
-</collection>
-<collection name="phoneplugins" long-name="Phone Plugins" level="plugin">
-<component name="csplugin" filter="s60" long-name="Circuit Switched Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/csplugin/group"/>
-</component>
-<component name="hsdialerwidgetplugin" filter="s60" long-name="Home Screen Dialer Widget Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/hsdialerwidgetplugin" proFile="hsdialerwidgetplugin.pro"/>
-</component>
-<component name="infowidgetplugin" filter="s60" long-name="Info Widget Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/infowidgetplugin" proFile=""/>
-</component>
-</collection>
-<collection name="phonesettings" long-name="Phone Settings" level="plugin">
-<component name="cpphonesettingsplugins" filter="s60" long-name="CP Phone Settings Plugins" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phonesettings/cpphonesettingsplugins" proFile="cpphonesettingsplugins.pro"/>
-</component>
-</collection>
-</block>
-<block name="settingsuis" level="services" long-name="Settings UIs" levels="plugin ui">
-<collection name="controlpanelplugins" long-name="Control Panel Plugins" level="plugin">
-<component name="themeplugin" filter="s60" long-name="Theme Plugin" introduced="^4">
-<unit bldFile="app/settingsuis/controlpanelplugins/themeplugin" proFile="themeplugin.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-<collection name="controlpanelui" long-name="Control Panel UI" level="ui">
-<!-- collection is really a component, move down a dir -->
-<component name="controlpanelui_build" filter="s60" long-name="Control Panel UI Build" introduced="^4">
-<unit bldFile="app/settingsuis/controlpanelui" proFile="controlpanelui.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-</block>
-<block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin framework app">
-<collection name="contentctrl_plat" long-name="Content Control Daemons Platforn Interfaces" level="app">
-<component name="ds_contactsdatastoreextension_api" long-name="Adapter Customization API" filter="s60" introduced="^4" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_contactsdatastoreextension_api/group"/>
-</component>
-<component name="ds_data_modification_api" long-name="DS Data Modification API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_data_modification_api/group"/>
-</component>
-</collection>
-<collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
-<component name="secon" filter="s60" long-name="Service Controllers">
-<unit bldFile="app/contentcontrol/connectivitymodules/secon/group"/>
-</component>
-</collection>
-<collection name="dsdcmoadapter" long-name="Data Sync DCMO Adapter" level="plugin">
-<!-- Component at wrong rank, should move down a directory -->
-<component name="dsdcmoadapter_build" filter="s60" long-name="Data Sync Control DCMO Adapter">
-<unit bldFile="app/contentcontrol/dsdcmoadapter/group"/>
-</component>
-</collection>
-<collection name="omads" long-name="OMA Data Sync" level="app">
-<component name="omads_build" filter="s60" long-name="OMA DS Build">
-<unit bldFile="app/contentcontrol/omads/group"/>
-<!-- need to remove #include and rename and OMA DS ROM -->
-</component>
-<component name="omadsextensions" filter="s60" long-name="OMA DS Extensions" plugin="Y">
-<unit bldFile="app/contentcontrol/omads/omadsextensions/group"/>
-</component>
-<component name="omadsextensions" filter="s60" long-name="OMA DS Qt Extensions" plugin="Y">
-<unit bldFile="app/contentcontrol/omads/omadsextensions" proFile="omadsextensions.pro"/>
-</component>
-</collection>
-</block>
-<block name="firsttimeuse" level="apps" long-name="First Time Use" levels="support services ui app">
-<!-- these empty collections are really components. Move down a directory and supply units -->
-<collection name="ftuapplication" long-name="First Time Use Application" level="app"/>
-<collection name="fturuntimeservices" long-name="First Time Use Runtime Services" level="services"/>
-<collection name="wizardproviders" long-name="Wizard Providers" level="support"/>
-<collection name="stateproviders" long-name="State Providers" level="support"/>
-<collection name="runtimeproviders" long-name="Runtime Providers" level="support"/>
-<collection name="firsttimeuse_info" long-name="First Time Use Info" level="ui">
-<component name="firsttimeuse_build" long-name="First Time Use Build">
-<unit bldFile="app/firsttimeuse" proFile="ftu.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-</block>
-<block name="devicecontrol" level="services" long-name="Device Control Daemons" levels="oma mid app">
-<collection name="deviceupdatesui" long-name="Device Updates UI" level="app">
-<component name="deviceupdatesui_adapters" long-name="Device Updates Adapters" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/devicecontrol/deviceupdatesui/adapters/bld"/>
-</component>
-<component name="deviceupdates" long-name="Device Updates" filter="s60" introduced="^4">
-<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdates" proFile="deviceupdates.pro"/>
-</component>
-<component name="deviceupdatesplugin" long-name="Device Updates Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdatesplugin" proFile="deviceupdatesplugin.pro"/>
-</component>
-<component name="deviceupdatesqtsp" long-name="Device Updates Qt Service Provider" filter="s60" introduced="^4">
-<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdatesqtsp" proFile="deviceupdatesqtsp.pro"/>
-</component>
-<component name="cpqtsp" long-name="Client Provisioning Qt Service Provider" filter="s60" introduced="^4">
-<unit bldFile="app/devicecontrol/deviceupdatesui/cpqtsp" proFile="cpqtsp.pro"/>
-</component>
-<component name="devicemanagementnotifiersplugin" long-name="Device Management Notifiers Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/devicecontrol/deviceupdatesui/devicemanagementnotifiersplugin" proFile="devicemanagementnotifiersplugin.pro"/>
-</component>
-</collection>
-</block>
-<block name="printing" level="services" long-name="Printing"/>
-<block name="files" level="apps" long-name="File Manager Apps" levels="support apps">
-<collection name="filemanager" long-name="File Manager" level="apps">
-<component name="filemanager_plat" long-name="File Manager Platform Interfaces" filter="s60" introduced="^4" class="api"/>
-<component name="fmbkupengine" filter="s60" long-name="File Manager Backup Engine" introduced="^4">
-<unit bldFile="app/files/filemanager/src/fmbkupengine/group"/>
-</component>
-<component name="filemanager_build" filter="s60" long-name="File Manager Build">
-<!-- break this up into components or move down a directory -->
-<unit bldFile="app/files/filemanager" proFile="filemanager.pro"/>
-</component>
-</collection>
-</block>
-<block name="search" level="apps" long-name="Search Apps" levels="eng base app api">
-<collection name="search_info" long-name="Search Info">
-<component name="search_build" long-name="Search Build">
-<unit bldFile="app/search/group"/>
-</component>
-</collection>
-<collection name="searchui" long-name="Search UI">
-<component name="searchui_build" long-name="Search UI Build">
-<unit bldFile="app/search/searchui" proFile="searchui.pro"/>
-</component>
-</collection>
-</block>
-<block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
-<collection name="contacts_plat" long-name="Contacts Apps Platform Interfaces" level="ui">
-<component name="logs_engine_api" long-name="Logs Engine API" filter="s60" introduced="^4" class="api"/>
-<component name="logs_engine_api_extensions" long-name="Logs Engine API Extensions" filter="s60" class="api"/>
-<component name="logs_services_api" long-name="Logs Services API" filter="s60" introduced="^4" class="api"/>
-<component name="logs_timers_api" long-name="Logs Timers API" filter="s60" class="api"/>
-<component name="qt_mobility_contacts_api" long-name="Qt Mobility Contacts API" filter="s60" introduced="^4" class="api"/>
-</collection>
-<collection name="logsui" long-name="Logs UI" level="ui">
-<component name="logsui_build" filter="s60" long-name="Logs UI Build">
-<!-- component at too high a rank, should move down one directory -->
-<unit bldFile="app/contacts/logsui" proFile="logsui.pro"/>
-</component>
-</collection>
-<collection name="phonebookui" long-name="Phonebook UI" level="ui">
-<component name="mobhistorymodel" filter="s60" long-name="Mobile History Model" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/mobhistorymodel" qt:proFile="mobhistorymodel.pro"/> -->
-</component>
-<component name="pbkcommonui" filter="s60" long-name="Phonebook Common UI" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/pbkcommonui" qt:proFile="pbkcommonui.pro"/> -->
-</component>
-<component name="phonebookapp" filter="s60" long-name="Phonebook Application" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/phonebookapp" qt:proFile="phonebookapp.pro"/> -->
-</component>
-<component name="phonebookservices" filter="s60" long-name="Phonebook Services" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/phonebookservices" qt:proFile="phonebookservices.pro"/> -->
-</component>
-<component name="phonebookui_build" filter="s60" long-name="Phonebook UI Build" introduced="^4">
-<!-- break up into components -->
-<unit bldFile="app/contacts/phonebookui" proFile="phonebookui.pro"/>
-</component>
-</collection>
-<collection name="qtcontactsmobility" long-name="Qt Contacts Mobility" level="support">
-<component name="qtcontactsmobility_build" filter="s60" long-name="Qt Contacts Mobility Build" introduced="^4" plugin="Y">
-<!-- not really a component, move down a dir? Break up into compnents? -->
-<unit bldFile="app/contacts/qtcontactsmobility" proFile="qtcontactsmobility.pro"/>
-</component>
-</collection>
-<collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
-<component name="cntfindplugin" filter="s60" long-name="Contacts Find Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntfindplugin" proFile="cntfindplugin.pro"/>
-</component>
-<component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
-<unit bldFile="app/contacts/phonebookengines/contactsmodel/groupsql" mrp="app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
-</component>
-<component name="cntsortplugin" filter="s60" long-name="Contacts Sort Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntsortplugin" proFile="cntsortplugin.pro"/>
-</component>
-<component name="mobcntmodel" filter="s60" long-name="Mobile Contacts Model" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/mobcntmodel" proFile="mobcntmodel.pro"/>
-</component>
-<component name="mobcntactions" filter="s60" long-name="Mobile Contacts Actions" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/mobcntactions" proFile="mobcntactions.pro"/>
-</component>
-<component name="cntmaptileservice" filter="s60" long-name="Contacts Map Tile Service" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/cntmaptileservice" proFile="cntmaptileservice.pro"/>
-</component>
-<component name="simutility" filter="s60" long-name="SIM Utility" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/simutility" proFile="simutility.pro"/>
-</component>
-</collection>
-<collection name="pimprotocols" long-name="PIM Protocols" level="services">
-<component name="phonebooksync" long-name="Phonebook Sync" purpose="optional" plugin="Y">
-<unit bldFile="app/contacts/pimprotocols/phonebooksync/group" mrp="app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
-</component>
-<component name="pbap" long-name="Bluetooth PBAP" introduced="9.2" purpose="optional">
-<unit bldFile="app/contacts/pimprotocols/pbap/group" mrp="app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
-</component>
-</collection>
-<collection name="contacts_info" long-name="Contacts Apps Info" level="ui">
-<component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="organizer" level="apps" span="2" long-name="Organizer Application Suite" levels="support services engine ui app">
-<collection name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" level="app">
-<component name="calendar_interim_utils2_api" long-name="Calendar Interim Utils 2 API" filter="s60" class="api">
-<!-- move into own .pro file -->
-<unit bldFile="app/organizer/organizer_pub" proFile="organizer_pub.pro"/>
-</component>
-</collection>
-<collection name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" level="app">
-<component name="organizer_plat_build" long-name="Organizer Application Suite Platform Interface Build" filter="s60" class="api">
-<!-- break up into individual .pro files -->
-<unit bldFile="app/organizer/organizer_plat" proFile="organizer_plat.pro"/>
-</component>
-<component name="agenda_versit_2_api" long-name="Agenda Versit 2 API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="organizer_plat/agenda_versit_2_api/group"/>-->
-</component>
-<component name="calendar_exporter_api" long-name="Calendar Exporter API" filter="s60" class="api placeholder">
-<!--<unit bldFile="organizer_plat/calendar_exporter_api/group"/>-->
-</component>
-<component name="calendar_importer_api" long-name="Calendar Importer API" filter="s60" class="api placeholder">
-<!--<unit bldFile="organizer_plat/calendar_importer_api/group"/>-->
-</component>
-<component name="calendar_launcher_api" long-name="Calendar Launcher API" filter="s60" class="api placeholder">
-<!--<unit bldFile="organizer_plat/calendar_launcher_api/group"/> -->
-</component>
-<component name="agenda_interface_api" long-name="Agenda Interface API" filter="s60" introduced="^4" class="api"/>
-<component name="calendar_editor_api" long-name="Calendar Editor API" filter="s60" introduced="^4" class="api"/>
-<component name="notes_editor_api" long-name="Notes Editor API" filter="s60" introduced="^4" class="api"/>
-<component name="agenda_eventviewer_api" long-name="Agenda Event Viewer API" filter="s60" introduced="^4" class="api"/>
-</collection>
-<collection name="agendainterface" long-name="Agenda Interface" level="services">
-<!-- collection is really a component, should move down a directory -->
-<component name="agendainterface_build" filter="s60" long-name="Agenda Interface Build">
-<unit bldFile="app/organizer/agendainterface" proFile="agendainterface.pro"/>
-</component>
-</collection>
-<collection name="calendarui" long-name="Calendar UI" level="ui">
-<component name="commonutils" filter="s60" long-name="Calendar Common Utils">
-<unit bldFile="app/organizer/calendarui/commonutils" proFile="commonutils.pro"/>
-</component>
-<component name="calenlauncher" filter="s60" long-name="Calendar Launcher">
-<unit bldFile="app/organizer/calendarui/calenlauncher/group" proFile="calenlauncher.pro"/>
-</component>
-<component name="caleneditor" filter="s60" long-name="Calendar Editor" introduced="^4">
-<unit bldFile="app/organizer/calendarui/caleneditor" proFile="caleneditor.pro"/>
-</component>
-<component name="agendaeventviewer" filter="s60" long-name="Agenda Event Viewer" introduced="^4">
-<unit bldFile="app/organizer/calendarui/agendaeventviewer" proFile="agendaeventviewer.pro"/>
-</component>
-<component name="globaldata" filter="s60" long-name="Calendar Global Data">
-<unit bldFile="app/organizer/calendarui/globaldata" proFile="globaldata.pro"/>
-</component>
-<component name="settings" filter="s60" long-name="Calendar Settings">
-<unit bldFile="app/organizer/calendarui/settings" proFile="settings.pro"/>
-</component>
-<component name="calenplugins" filter="s60" long-name="Calendar Plugins" introduced="^4" plugin="Y">
-<unit bldFile="app/organizer/calendarui/calenplugins" proFile="calenplugins.pro"/>
-</component>
-<component name="customisationmanager" filter="s60" long-name="Calendar Customisation Manager">
-<unit bldFile="app/organizer/calendarui/customisationmanager" proFile="customisationmanager.pro"/>
-</component>
-<component name="views" filter="s60" long-name="Calendar Views">
-<unit bldFile="app/organizer/calendarui/views" proFile="views.pro"/>
-</component>
-<component name="calengriditemstyleplugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/organizer/calendarui/styleplugins/calengriditemstyleplugin" proFile="calengriditemstyleplugin.pro"/>
-</component>
-<component name="calendarui_controller" filter="s60" long-name="Calendar Controller">
-<unit bldFile="app/organizer/calendarui/controller" proFile="controller.pro"/>
-</component>
-<component name="calendarui_application" filter="s60" long-name="Calendar Application">
-<unit bldFile="app/organizer/calendarui/application" proFile="application.pro"/>
-</component>
-<component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y">
-<unit bldFile="app/organizer/calendarui/caldav/group"/>
-</component>
-</collection>
-<collection name="notes" long-name="Notes" level="ui">
-<component name="noteseditor" filter="s60" long-name="Notes Editor" introduced="^4">
-<unit bldFile="app/organizer/notes/notesui/noteseditor" proFile="noteseditor.pro"/>
-</component>
-<component name="notes_build" filter="s60" long-name="Notes Build" introduced="^4">
-<unit bldFile="app/organizer/notes" proFile="notes.pro"/>
-</component>
-</collection>
-<collection name="calendarengines" long-name="Calendar Engines" level="engine">
-<component name="versit2" filter="s60" long-name="Versit 2 iCal Parser" introduced="9.2">
-<unit bldFile="app/organizer/calendarengines/versit2/group"/>
-</component>
-<component name="agnversit2" filter="s60" long-name="Versit 2 Agenda Interface" introduced="9.2" plugin="Y">
-<unit bldFile="app/organizer/calendarengines/agnversit2/group"/>
-</component>
-<component name="caleninterimutils" filter="s60" long-name="Calendar Interim Utils" introduced="9.1">
-<unit bldFile="app/organizer/calendarengines/caleninterimutils/group"/>
-</component>
-<component name="calenimp" filter="s60" long-name="Calendar Import Wrapper" introduced="7.0s">
-<unit bldFile="app/organizer/calendarengines/calenimp/group"/>
-</component>
-<component name="caldavsrv" filter="sf_build" long-name="CalDAV Server" introduced="^3">
-<unit bldFile="app/organizer/calendarengines/caldav/group"/>
-</component>
-</collection>
-<collection name="clock" long-name="Clock" level="app">
-<!-- uncomment unit when block_build is split up-->
-<component name="clockengines" filter="s60" long-name="Clock Engines" class="placeholder">
-<!--<unit bldFile="clock/clockengines" qt:proFile="clockengines.pro"/> -->
-</component>
-<component name="clockmw" filter="s60" long-name="Clock Middleware" introduced="^4" class="placeholder">
-<!--<unit bldFile="clock/clockmw" qt:proFile="clockmw.pro"/>-->
-</component>
-<component name="clockui" filter="s60" long-name="Clock UI" class="placeholder">
-<!--<unit bldFile="clock/clockui" qt:proFile="clockui.pro"/>-->
-</component>
-<component name="ftudatetimewizard" filter="s60" long-name="First Time Use Date/Time Wizard" introduced="^4" class="placeholder">
-<!--<unit bldFile="clock/ftudatetimewizard" qt:proFile="ftudatetimewizard.pro"/>-->
-</component>
-<component name="clock_build" filter="s60" long-name="Clock Build">
-<!-- make exports into a component, or just move to one of the above components, then remove this and uncomment the above -->
-<unit bldFile="app/organizer/clock" proFile="clock.pro"/>
-</component>
-</collection>
-<collection name="pimappservices" long-name="PIM Application Services" level="services">
-<component name="calendar" long-name="Calendar" introduced="9.2" purpose="optional">
-<unit bldFile="app/organizer/pimappservices/calendar/group" mrp="app/organizer/pimappservices/calendar/group/app-engines_calendar.mrp" version="2"/>
-</component>
-<component name="calendarvcalplugin" long-name="Calendar vCal Plugin" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="app/organizer/pimappservices/calendarvcalplugin/group" mrp="app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp" version="2"/>
-</component>
-<component name="appenginesdocs" long-name="Application Engines Documentation" purpose="development" class="doc">
-<unit mrp="app/organizer/pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
-</component>
-</collection>
-<collection name="pimappsupport" long-name="PIM Application Support" level="support">
-<component name="vcardandvcal" long-name="vCard and vCal" introduced="ER5" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/vcardandvcal/group" mrp="app/organizer/pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
-</component>
-<component name="chinesecalendarconverter" long-name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
-</component>
-<component name="chinesecalendaralg" long-name="Chinese Calendar Algorithm" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendaralg/group" mrp="app/organizer/pimappsupport/chinesecalendaralg/group/app-services_chinesecalendaralgorithm.mrp"/>
-</component>
-</collection>
-<collection name="alarmui" long-name="Alarm UI" level="app">
-<!-- collection is really a component, should move down a directory -->
-<component name="alarmui_build" filter="s60" long-name="Alarm UI Build">
-<unit bldFile="app/organizer/alarmui" proFile="alarmui.pro"/>
-</component>
-</collection>
-<collection name="organizer_info" long-name="Organizer Application Suite Info" level="app">
-<component name="organizer_metadata" long-name="Organizer Application Suite Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="plugin eng base app api">
-<collection name="msg_plat" long-name="Messaging Apps Platform APIs" level="api">
-<component name="messaging_media_resolver_api" long-name="Messaging Media Resolver API" filter="s60" class="api"/>
-<component name="mms_application_api" long-name="MMS Application API" filter="s60" class="api"/>
-<component name="mms_codec_client_api" long-name="MMS Codec Client API" filter="s60" class="api"/>
-<component name="mms_conformance_api" long-name="MMS Conformance API" filter="s60" class="api"/>
-<component name="mms_engine_settings_api" long-name="MMS Engine Settings API" filter="s60" class="api"/>
-<component name="mms_server_settings_api" long-name="MMS Server Settings API" filter="s60" class="api"/>
-<component name="conversation_services_client_api" long-name="Conversation Services Client API" filter="s60" introduced="^4" class="api"/>
-<component name="conversation_services_plugin_api" long-name="Conversation Services Plugin API" filter="s60" introduced="^4" class="api"/>
-<component name="conversation_services_utilities_api" long-name="Conversation Services Utilities API" filter="s60" introduced="^4" class="api"/>
-<component name="shareui_api" long-name="Share UI API" filter="s60" introduced="^4" class="api"/>
-<component name="messaging_history_api" long-name="Messaging History API" filter="s60" introduced="^4" class="api"/>
-<component name="msg_plat_build" long-name="Messaging Apps Platform APIs Build" filter="s60" introduced="^4" class="api">
-<!-- break this up into the above units and replace their base attributes with bldFile, etc -->
-</component>
-</collection>
-<collection name="msg_pub" long-name="Messaging Apps Public APIs" level="api">
-<component name="mms_client_mtm_api" long-name="MMS Client MTM API" filter="s60" class="api"/>
-<component name="msg_smil_dtd_api" long-name="Messaging SMIL DTD API" filter="s60" introduced="^4" class="api"/>
-<component name="msg_pub_build" long-name="Messaging Apps Public APIs Build" filter="s60" introduced="^4" class="api">
-<!-- break this up into the above units and replace their base attributes with bldFile, etc -->
-</component>
-</collection>
-<collection name="mobilemessaging" long-name="Mobile Messaging" level="plugin">
-<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/mobilemessaging/smsmtm/group" mrp="app/messaging/mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
-</component>
-</collection>
-<collection name="messagingappbase" long-name="Messaging App Base" level="base">
-<component name="messagingappbase_build" filter="s60" long-name="Messaging App Base Build" introduced="^4">
-<!-- break this up into the below components -->
-<unit bldFile="app/messaging/messagingappbase" proFile="messagingappbase.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgmedia" filter="s60" long-name="Message Media"/>
-<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
-<unit mrp="app/messaging/messagingappbase/smsmtm/group/messaging_sms.mrp"/>
-</component>
-<component name="smilparser" long-name="SMIL Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="app/messaging/messagingappbase/smilparser/GROUP" mrp="app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
-</component>
-<component name="obexmtms" long-name="OBEX MTMs" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/obexmtms/Group" mrp="app/messaging/messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
-</component>
-</collection>
-<collection name="mmsengine" long-name="MMS Engine" level="eng">
-<component name="mmsconninit" filter="s60" long-name="MMS Connection Initiator" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsconninit/bld"/> -->
-</component>
-<component name="genutils" filter="s60" long-name="General Utils" class="placeholder">
-<!-- <unit bldFile="mmsengine/genutils/bld"/> -->
-</component>
-<component name="mmsserversettings" filter="s60" long-name="MMS Server Settings" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserversettings/bld"/> -->
-</component>
-<component name="mmsmessage" filter="s60" long-name="MMS Message" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsmessage/bld"/> -->
-</component>
-<component name="mmshttptransport" filter="s60" long-name="MMS HTTP Transport" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmshttptransport/bld"/> -->
-</component>
-<component name="mmscodec" filter="s60" long-name="MMS Codec" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodec/bld"/> -->
-</component>
-<component name="mmsserver" filter="s60" long-name="MMS Server" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserver/bld"/> -->
-</component>
-<component name="clientmtm" filter="s60" long-name="MMS Client MTM" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/clientmtm/bld"/> -->
-</component>
-<component name="mmswatcher" filter="s60" long-name="MMS Watcher" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmswatcher/bld"/> -->
-</component>
-<component name="mmspushhandler" filter="s60" long-name="MMS Push Handler" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmspushhandler/bld"/> -->
-</component>
-<component name="applicationadapter" filter="s60" long-name="MMS Application Adapter" class="placeholder">
-<!-- <unit bldFile="mmsengine/applicationadapter/bld"/> -->
-</component>
-<component name="mmscodecclient" filter="s60" long-name="MMS Codec Client" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodecclient/bld"/> -->
-</component>
-<component name="mmssettings" long-name="MMS Settings" introduced="9.2" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmssettings/group" mrp="app/messaging/mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
-</component>
-<component name="mmsconf" long-name="MMS Configuration" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmsconf" mrp="app/messaging/mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
-</component>
-<component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
-<!-- this should be broken up into the individual other components -->
-<unit bldFile="app/messaging/mmsengine" proFile="mmsengine.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="messagingapp" long-name="Messaging Application" level="app">
-<component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
-<!-- this should be broken up into the individual other components -->
-<unit bldFile="app/messaging/messagingapp" proFile="messagingapp.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgutils" filter="s60" long-name="Messaging Utils" introduced="^4">
-<unit bldFile="app/messaging/messagingapp/msgutils" proFile="msgutils.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgappfw" filter="s60" long-name="Messaging Application Framework" introduced="^4">
-<unit bldFile="app/messaging/messagingapp/msgappfw" proFile="msgappfw.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgsettings" filter="s60" long-name="Messaging Settings" introduced="^4">
-<unit bldFile="app/messaging/messagingapp/msgsettings" proFile="msgsettings.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgnotifications" filter="s60" long-name="Messaging Notifications" introduced="^4">
-<unit bldFile="app/messaging/messagingapp/msgnotifications" proFile="msgnotifications.pro" qmakeArgs="-r"/>
-</component>
-<component name="smartmessaging" filter="s60" long-name="Smart Messaging">
-<unit bldFile="app/messaging/messagingapp/smartmessaging" proFile="smartmessaging.pro" qmakeArgs="-r"/>
-</component>
-<component name="shareui" filter="s60" long-name="Shared UI" introduced="^4">
-<unit bldFile="app/messaging/messagingapp/shareui" proFile="shareui.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgui" filter="s60" long-name="Messaging UI" introduced="^4">
-<unit bldFile="app/messaging/messagingapp/msgui" proFile="msgui.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="email" long-name="Email" level="plugin">
-<!-- use commonemail instead -->
-<component name="pop3andsmtpmtm" long-name="POP3 and SMTP MTM" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/pop3andsmtpmtm/group" mrp="app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
-</component>
-<component name="imap4mtm" long-name="IMAP4 MTM" introduced="9.2" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/imap4mtm/group" mrp="app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
-</component>
-</collection>
-<collection name="messaging_info" long-name="Messaging Apps Info" level="api">
-<component name="messaging_metadata" long-name="Messaging Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commonemail" level="apps" span="2" long-name="Email Apps" levels="service support ui app">
-<!-- need to resolve the qt parts into proper components, then uncomment the units -->
-<collection name="email_plat" long-name="Email Apps Platform Interfaces" level="app">
-<component name="nmail_client_api" long-name="NMail Client API" filter="s60" introduced="^4" class="api placeholder">
-<!--<unit bldFile="email_plat" qt:proFile="email_plat.pro"/> -->
-</component>
-</collection>
-<collection name="emailservices" long-name="Email Services" level="service">
-<component name="nmailbase" filter="s60" long-name="NMail Base" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/nmailbase" qt:proFile="nmailbase.pro"/> -->
-</component>
-<component name="emailcommon" filter="s60" long-name="Email Common" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/emailcommon" qt:proFile="emailcommon.pro"/>-->
-</component>
-<component name="emailframework" filter="s60" long-name="Email Framework" introduced="^2" class="placeholder">
-<!-- <unit bldFile="emailservices/emailframework" qt:proFile="emailframework.pro"/>-->
-</component>
-<component name="emailstore" filter="s60" long-name="Email Store" introduced="^2" class="placeholder">
-<!-- <unit bldFile="emailservices/emailstore" qt:proFile="emailstore.pro"/>-->
-</component>
-<component name="nmclientapi" filter="s60" long-name="Nmail Client API" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/nmclientapi" qt:proFile="nmclientapi.pro"/>-->
-</component>
-<component name="nmailagent" filter="s60" long-name="Nmail Agent" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/nmailagent" qt:proFile="nmailagent.pro"/>-->
-</component>
-</collection>
-<collection name="ipsservices" long-name="IMAP/POP/SMTP Services" level="service">
-<component name="ipssosplugin" filter="s60" long-name="IPS SOS Plugin" introduced="^2" plugin="Y" class="placeholder">
-<!-- SOS? Consider spelling it out since the abbreviation is ambiguous -->
-<!--<unit bldFile="ipsservices/ipssosplugin" qt:proFile="ipssosplugin.pro" />-->
-</component>
-<component name="nmimapclientplugin" filter="s60" long-name="NM IMAP Client Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="ipsservices/nmimapclientplugin" qt:proFile="nmimapclientplugin.pro"/>-->
-</component>
-<component name="nmipsmtms" filter="s60" long-name="NM IPS Client Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="ipsservices/nmipsmtms" qt:proFile="nmipsmtms.pro"/>-->
-</component>
-<component name="nmipssettings" filter="s60" long-name="NM IPS Settings" introduced="^4" class="placeholder">
-<!-- <unit bldFile="ipsservices/nmipssettings" qt:proFile="nmipssettings.pro"/>-->
-</component>
-<component name="ipsservices_build" filter="s60" long-name="IPS Services Build" introduced="^2" class="placeholder">
-<!--<unit bldFile="ipsservices" qt:proFile="ipsservices.pro"/> -->
-<!-- can the exports be broken up into the other components or made a config component?-->
-</component>
-</collection>
-<collection name="emailuis" long-name="Email UIs" level="app">
-<component name="nmailuiengine" filter="s60" long-name="Nmail UI Engine" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailuiengine" qt:proFile="nmailuiengine.pro"/> -->
-</component>
-<component name="nmailuiwidgets" filter="s60" long-name="Nmail UI Widgets" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailuiwidgets" qt:proFile="nmailuiwidgets.pro"/> -->
-</component>
-<component name="nmailuiwidgetsplugin" filter="s60" long-name="Nmail UI Widgets Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailuiwidgetsplugin" qt:proFile="nmailuiwidgetsplugin.pro"/> -->
-</component>
-<component name="nmsettingui" filter="s60" long-name="Nmail Setting UI" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmsettingui" qt:proFile="nmsettingui.pro"/> -->
-</component>
-<component name="nmailcpplugin" filter="s60" long-name="Nmail CP Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailcpplugin" qt:proFile="nmailcpplugin.pro"/> -->
-</component>
-<component name="nmailui" filter="s60" long-name="Nmail UI" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailui" qt:proFile="nmailui.pro"/> -->
-</component>
-<component name="nmindicatorplugin" filter="s60" long-name="Nmail Indicator Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmindicatorplugin" qt:proFile="nmindicatorplugin.pro"/> -->
-</component>
-<component name="nmframeworkadapter" filter="s60" long-name="Nmail Framework Adapter" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmframeworkadapter" qt:proFile="nmframeworkadapter.pro"/> -->
-</component>
-</collection>
-<collection name="commonemail_info" long-name="Email Apps Info" level="app">
-<component name="commonemail_build" long-name="Email Apps Build" introduced="^4">
-<!-- split into actual components -->
-<unit bldFile="app/commonemail" proFile="nmail.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</block>
-<block name="camera" level="apps" long-name="Camera Apps">
-<collection name="camerauis" long-name="Camera UIs">
-<component name="cameraxui" filter="s60" long-name="CameraX UIs">
-<unit bldFile="app/camera/camerauis/cameraxui" filter="!test" proFile="camerax.pro"/>
-</component>
-</collection>
-</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">
-<component name="image_editor_debug_utilities_api" long-name="Image Editor Debug Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
-</component>
-<component name="image_editor_utilities_api" long-name="Image Editor Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_utilities_api/group"/>
-</component>
-<component name="image_editor_definitions_api" long-name="Image Editor Definitions API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_definitions_api/group"/>
-</component>
-<component name="image_editor_system_parameters_api" long-name="Image Editor System Parameters API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_system_parameters_api/group"/>
-</component>
-<component name="image_processing_engine_api" long-name="Image Processing Engine API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_processing_engine_api/group"/>
-</component>
-</collection>
-<collection name="imageeditor" long-name="Image Editor UI" level="ui">
-<component name="pb" filter="s60" long-name="Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/pb/group"/>
-</component>
-<component name="iepb" filter="s60" long-name="Image Editor Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/iepb/group"/>
-</component>
-<component name="imageeditorui" filter="s60" long-name="Image Editor UI">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorui/group"/>
-</component>
-<component name="imageeditormanager" filter="s60" long-name="Image Editor Manager">
-<unit bldFile="app/imgeditor/imageeditor/imageeditormanager/group"/>
-</component>
-<component name="imageeditorapp" filter="s60" long-name="Image Editor Application">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorapp/group"/>
-</component>
-<component name="imageeditor_plugins" filter="s60" long-name="Image Editor Plugins" plugin="Y">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditor/plugins/blackwhiteplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/brightnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/bubbleplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cartoonizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/clipartplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/contrastplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cropplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/drawplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/frameplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/negativeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/redeyeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/resizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotatelplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotaterplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/textplugin/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditor/plugins/drawplugin/group"/>
- -->
-</component>
-<component name="editorprovider" filter="s60" long-name="Image Editor Provider">
-<unit bldFile="app/imgeditor/imageeditor/editorprovider/group"/>
-</component>
-<component name="imageeditor_build" filter="s60" long-name="Image Editor Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditor/group"/>
-</component>
-</collection>
-<collection name="imageeditorengine" long-name="Image Editor Engine" level="engine">
-<component name="filters" filter="s60" long-name="Image Editor Filters">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbrightness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbubble/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbuffer/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercartoon/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterclipart/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercontrast/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercrop/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterdraw/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterframe/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtergrayscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtericlsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegtarget/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filternegate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterredeye/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterrotate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtertext/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
- -->
-</component>
-<component name="imageeditorutils" filter="s60" long-name="Image Editor Utilities">
-<unit bldFile="app/imgeditor/imageeditorengine/imageeditorutils/group"/>
-</component>
-<component name="systemparameters" filter="s60" long-name="System Parameters">
-<unit bldFile="app/imgeditor/imageeditorengine/systemparameters/group"/>
-</component>
-<component name="enginewrapper" filter="s60" long-name="Image Editor Engine Wrapper">
-<unit bldFile="app/imgeditor/imageeditorengine/enginewrapper/group"/>
-</component>
-<component name="imageeditorengine_build" filter="s60" long-name="Image Editor Engine Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoeditor" level="apps" long-name="Video Editor Apps" levels="engine ui">
-<collection name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" level="ui">
-<component name="video_editor_engine_api" long-name="Video Editor Engine API" introduced="^2" class="api">
-<unit bldFile="app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
-</component>
-</collection>
-<collection name="videditor" long-name="Video Editor" level="ui">
-<component name="videoeditorcommon" filter="s60" long-name="Video Editor Common" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditorcommon/group"/>
-</component>
-<component name="videoeditoruicomponents" filter="s60" long-name="Video Editor UI Components" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditoruicomponents/group"/>
-</component>
-<component name="simplevideoeditor" filter="s60" long-name="Simple Video Editor" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplevideoeditor/group"/>
-</component>
-<component name="simplecutvideo" filter="s60" long-name="Simple Cut Video" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplecutvideo/group"/>
-</component>
-<component name="videoprovider" filter="s60" long-name="Video Provider" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoprovider/group"/>
-</component>
-<component name="manualvideoeditor" filter="s60" long-name="Manual Video Editor" introduced="^2" class="placeholder">
-<!-- uncomment when supported
- <meta rel="config">
- <defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
- </meta>
- <unit bldFile="videditor/manualvideoeditor/group"/> -->
-</component>
-<component name="videditor_build" filter="s60" long-name="Video Editor Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videditor/group"/>
-</component>
-</collection>
-<collection name="videoeditorengine" long-name="Video Editor Engine" level="engine">
-<component name="audioeditorengine" filter="s60" long-name="Audio Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/audioeditorengine/group"/>
-</component>
-<component name="avcedit" filter="s60" long-name="AVC Editing" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/avcedit/group"/>
-</component>
-<component name="h263decoder" filter="s60" long-name="H.263 Decoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/h263decoder/group"/>
-</component>
-<component name="mp3aacmaniplib" filter="s60" long-name="MP3 and AAC Manipulation Library" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
-</component>
-<component name="vedtranscoder" filter="s60" long-name="Video Editor Transcoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedtranscoder/group"/>
-</component>
-<component name="vedengine" filter="s60" long-name="Video Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedengine/group"/>
-</component>
-<component name="videoeditorengine_build" filter="s60" long-name="Video Editor Engine Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videoeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
-<collection name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" level="apps">
-<component name="videoplayer_startup_api" long-name="Video Player Startup API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videoplayer_startup_api/group" filter="!test"/>
-</component>
-<component name="videocollection_api" long-name="Video Collection API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videocollection_api/group"/>
-</component>
-</collection>
-<collection name="videocollection" long-name="Video Collection" level="util">
-<component name="mpxmyvideoscollection" filter="s60" long-name="MPX My Videos Collection" introduced="^3">
-<unit bldFile="app/videoplayer/videocollection/mpxmyvideoscollection/group"/>
-</component>
-<component name="videocollectionwrapper" filter="s60" long-name="Video Collection Wrapper" introduced="^4">
-<unit bldFile="app/videoplayer/videocollection/videocollectionwrapper" proFile="videocollectionwrapper.pro" qmakeArgs="-r"/>
-</component>
-<component name="videocollectionview" filter="s60" long-name="Video Collection View" introduced="^4">
-<unit bldFile="app/videoplayer/videocollection/videocollectionview" proFile="videocollectionview.pro" qmakeArgs="-r"/>
-</component>
-<component name="videofiledetailsview" filter="s60" long-name="Video File Details View" introduced="^4">
-<unit bldFile="app/videoplayer/videocollection/videofiledetailsview" proFile="videofiledetailsview.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="mediasettings" long-name="Media Settings" level="support">
-<!-- this is really a component. Should be moved down a directory -->
-<component name="mediasettings_build" filter="s60" long-name="Media Settings Build">
-<unit bldFile="app/videoplayer/mediasettings/group"/>
-</component>
-</collection>
-<collection name="videoplayerapp" long-name="Video Player App" level="apps">
-<component name="videoplayerengine" long-name="Video Player Engine" filter="s60" introduced="^4">
-<unit bldFile="app/videoplayer/videoplayerapp/videoplayerengine" proFile="videoplayerengine.pro" qmakeArgs="-r"/>
-</component>
-<component name="hbvideoplayer" filter="s60" long-name="HB Video Player" introduced="^4">
-<unit bldFile="app/videoplayer/videoplayerapp/hbvideoplayer" proFile="hbvideoplayer.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="videoplayback" long-name="Video Playback Plugins" level="plugin">
-<component name="hbvideoplaybackview" filter="s60" long-name="HB Video Playback View" introduced="^4" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/hbvideoplaybackview" proFile="hbvideoplaybackview.pro" qmakeArgs="-r"/>
-</component>
-<component name="hbvideoplaybackviewplugin" filter="s60" long-name="HB Video Playback View Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/hbvideoplaybackviewplugin" proFile="hbvideoplaybackviewplugin.pro" qmakeArgs="-r"/>
-</component>
-<component name="videohelix" long-name="Video Helix" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videohelix/group"/>
-</component>
-</collection>
-</block>
-<block name="photos" level="apps" long-name="Photos" levels="util support ui app">
-<collection name="photos_group" long-name="Photos Group" level="support">
-<component name="photos_group_build" filter="s60" long-name="Photos Group Build" introduced="^4" class="placeholder">
-<!--<unit bldFile="group" qt:proFile="group.pro"/> -->
-</component>
-</collection>
-<collection name="photos_loggers" long-name="Photos Loggers" level="util">
-<component name="photos_loggerqt" filter="s60" long-name="Photos Logger Qt" introduced="^4" class="placeholder">
-<!--<unit bldFile="loggers/loggerqt" qt:proFile="loggerqt.pro"/> -->
-</component>
-</collection>
-<collection name="photos_commonutilities" long-name="Photos Common Utilities" level="util">
-<component name="photos_externalutility" filter="s60" long-name="Photos External Utility" introduced="^4" class="placeholder">
-<!--<unit bldFile="commonutilities/externalutility" qt:proFile="externalutility.pro"/> -->
-</component>
-<component name="imagedecoderwrapper" filter="s60" long-name="Image Decoder Wrapper" introduced="^4" class="placeholder">
-<!--<unit bldFile="commonutilities/imagedecoderwrapper" qt:proFile="imagedecoderwrapper.pro"/> -->
-</component>
-</collection>
-<collection name="photos_ui" long-name="Photos UI" level="ui">
-<component name="photos_uiengine" filter="s60" long-name="Photos UI Engine" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/uiengine" qt:proFile="uiengine.pro"/> -->
-</component>
-<component name="photos_commandhandlers" filter="s60" long-name="Photos Command Handlers" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/commandhandlers" qt:proFile="commandhandlers.pro"/> -->
-</component>
-<component name="photos_views" filter="s60" long-name="Photos Views" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/views" qt:proFile="views.pro"/> -->
-</component>
-<component name="photos_viewmanagement" filter="s60" long-name="Photos View Management" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/viewmanagement" qt:proFile="viewmanagement.pro"/> -->
-</component>
-</collection>
-<collection name="photos_main" long-name="Photos Main" level="support">
-<component name="photos_main_build" filter="s60" long-name="Photos Main Build" introduced="^4" class="placeholder">
-<!--<unit bldFile="main" qt:proFile="main.pro"/> -->
-</component>
-</collection>
-<collection name="imageviewerapp" long-name="Image Viewer App" level="support">
-<component name="imageviewerapp_build" filter="s60" long-name="Image Viewer App Build" introduced="^4" class="placeholder">
-<!--<unit bldFile="imageviewerapp" qt:proFile="imageviewerapp.pro"/> -->
-</component>
-</collection>
-<collection name="photos_info" long-name="Photos Info" level="support">
-<component name="photos_build" filter="s60" long-name="Photos Build" introduced="^4">
-<!-- split this up into the above components -->
-<unit bldFile="app/photos" proFile="photos.pro"/>
-</component>
-</collection>
-</block>
-<block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support hs app">
-<!-- move the export .pri files into their components and uncomment the units -->
-<collection name="musicplayer_utilities " long-name="Music Player Utilities" level="support">
-<component name="mpnowplayingbanner" filter="s60" long-name="MP Now Playing Banner" introduced="^4" class="placeholder">
-<!-- <unit bldFile="utilities/mpnowplayingbanner" qt:proFile="mpnowplayingbanner.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-<component name="mpsettingsmanager" filter="s60" long-name="MP Settings Manager" introduced="^4" class="placeholder">
-<!-- <unit bldFile="utilities/mpsettingsmanager" qt:proFile="mpsettingsmanager.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-</collection>
-<collection name="musicfetcher " long-name="Music Fetcher" level="support">
-<!-- collection is really a component, move down a directory -->
-<component name="musicfetcher_buld" filter="s60" long-name="Music Fetcher Build" introduced="^4" class="placeholder">
-<!-- <unit bldFile="musicfetcher" qt:proFile="musicfetcher.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-</collection>
-<collection name="musicplayer_app " long-name="Music Player Application" level="app">
-<!-- collection is really a component, move down a directory -->
-<component name="musicplayer_app_build" filter="s60" long-name="Music Player Application Build" introduced="^4" class="placeholder">
-<!-- <unit bldFile="app" qt:proFile="app.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-</collection>
-<collection name="mpviewplugins " long-name="Music Player View Plugins" level="plugins">
-<component name="mpcollectionviewplugin" filter="s60" long-name="MP Collection View Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpviewplugins/mpcollectionviewplugin/group"/>-->
-</component>
-<component name="mpplaybackviewplugin" filter="s60" long-name="MP Playback View Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpviewplugins/mpplaybackviewplugin/group"/>-->
-</component>
-</collection>
-<collection name="mpserviceplugins" long-name="Music Player Service Plugins" level="plugins">
-<component name="audioeffects" filter="s60" long-name="Audio Effects" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/audioeffects/group"/>-->
-</component>
-<component name="localaudio" filter="s60" long-name="Local Audio" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/localaudio/group"/>-->
-</component>
-<!-- Note: it's called SQLite, not SQLLite, just the one "L" -->
-<component name="mpxsqlitedbcommon" filter="s60" long-name="MPX SQLite Database Common" introduced="^4" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitedbcommon/group"/>-->
-</component>
-<component name="mpxsqlitedbplugin" filter="s60" long-name="MPX SQLite Database Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitedbplugin/group"/>-->
-</component>
-<component name="mpxsqlitepodcastdbplugin" filter="s60" long-name="MPX SQLlite Podcast Database Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
-</component>
-<component name="m3uplaylistplugin" filter="s60" long-name="M3U Playlist Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
-</component>
-</collection>
-<collection name="musicplayer_info" long-name="Music Player Apps Info" level="app">
-<component name="musicplayer_build" filter="s60" long-name="Music Player Build">
-<!-- should brak up into individual components -->
-<unit bldFile="app/musicplayer" proFile="qtmusicplayer.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-</block>
-<block name="radio" level="apps" long-name="Radio Apps" levels="engine ui">
-<collection name="radioengine" long-name="Radio Engine" level="engine">
-<component name="radioengineutils" filter="s60" long-name="Radio Engine Utils" introduced="^4">
-<unit bldFile="app/radio/radioengine/utils/group"/>
-</component>
-<component name="radioenginesettings" filter="s60" long-name="Radio Engine Settings" introduced="^4">
-<unit bldFile="app/radio/radioengine/settings/group"/>
-</component>
-<component name="radioengine_engine" filter="s60" long-name="Radio Engine" introduced="^4">
-<unit bldFile="app/radio/radioengine/engine/group"/>
-</component>
-</collection>
-<collection name="radioapp" long-name="Radio App" level="ui">
-<component name="radioenginewrapper" filter="s60" long-name="Radio Engine Wrapper" introduced="^4">
-<unit bldFile="app/radio/radioapp/radioenginewrapper" proFile="radioenginewrapper.pro"/>
-</component>
-<component name="radiopresetstorage" filter="s60" long-name="Radio Preset Storage" introduced="^4">
-<unit bldFile="app/radio/radioapp/radiopresetstorage" proFile="radiopresetstorage.pro"/>
-</component>
-<component name="radiouiengine" filter="s60" long-name="Radio UI Engine" introduced="^4">
-<unit bldFile="app/radio/radioapp/radiouiengine" proFile="radiouiengine.pro"/>
-</component>
-<component name="radiowidgets" filter="s60" long-name="Radio Widgets" introduced="^4">
-<unit bldFile="app/radio/radioapp/radiowidgets" proFile="radiowidgets.pro"/>
-</component>
-<component name="radioapplication" filter="s60" long-name="Radio Application" introduced="^4">
-<unit bldFile="app/radio/radioapp/radioapplication" proFile="radioapplication.pro"/>
-</component>
-<component name="radio_rom" filter="s60" long-name="Radio ROM" introduced="^4">
-<unit bldFile="app/radio/rom"/>
-</component>
-</collection>
-</block>
-<block name="internetradio" level="apps" long-name="Internet Radio Apps" levels="engine server ui">
-<collection name="internetradio2_0" long-name="Internet Radio 2.0" level="ui">
-<!-- collection is really a component. Move down a dir -->
-<component name="internetradio2_0_build" long-name="Internet Radio 2.0 Build">
-<unit bldFile="app/internetradio/internetradio2.0/group"/>
-</component>
-</collection>
-<collection name="presetserver" long-name="Preset Server" level="server">
-<!-- collection is really a component. Move down a dir -->
-<component name="presetserver_build" long-name="Preset Server Build">
-<unit bldFile="app/internetradio/presetserver/group"/>
-</component>
-</collection>
-<collection name="qtinternetradio" long-name="Qt Internet Radio">
-<component name="qtinternetradio_build" long-name="Qt Internet Radio Build">
-<!-- Move down a dir or break into components-->
-<unit bldFile="app/internetradio/qtinternetradio" proFile="all.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-</block>
-<block name="homescreen" level="apps" long-name="Home Screen Apps" levels="support task ss hs">
-<collection name="homescreen_info" long-name="Home Screen Info" level="support">
-<component name="homescreen_build" long-name="Homescreen Build">
-<!-- break this up properly into components -->
-<unit bldFile="app/homescreen" proFile="homescreen.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-<collection name="homescreen_test" long-name="Home Screen Test" level="support"/>
-<!-- fiill in details with broken up homescreen_build -->
-<collection name="homescreenapp" long-name="Home Screen Application" level="hs">
-<component name="hsutils" long-name="Home Screen Utils" introduced="^4"/>
-<component name="hsdomainmodel" long-name="HS Domain Model" introduced="^4"/>
-<component name="hs_runtimeplugins" long-name="HS Runtime Plugins" introduced="^4" plugin="Y"/>
-<component name="hs_serviceproviders" long-name="HS Service Providers" introduced="^4" plugin="Y"/>
-<component name="hs_stateplugins" long-name="HS State Plugins" introduced="^4" plugin="Y"/>
-<component name="hs_widgetplugins" long-name="HS Widget Plugins" introduced="^4" plugin="Y"/>
-<component name="hsapplication" long-name="Home Screen Application" introduced="^4"/>
-<component name="hshomescreenclientplugin" long-name="Home Screen Client Plugin" introduced="^4" plugin="Y"/>
-<component name="hsmenucontentpublish" long-name="HS Menu Content Publish" introduced="^4"/>
-</collection>
-<collection name="screensaverapp" long-name="Screen Saver Application" level="ss">
-<component name="snsrutils" long-name="Screen Saver Utils" introduced="^4"/>
-<component name="snsr_serviceproviders" long-name="Screen Saver Service Providers" introduced="^4" plugin="Y"/>
-<component name="snsr_stateproviders" long-name="Screen Saver State Providers" introduced="^4" plugin="Y"/>
-<component name="snsr_runtimeproviders" long-name="Screen Saver Runtime Providers" introduced="^4" plugin="Y"/>
-<component name="snsrapplication" long-name="Screen Saver Application" introduced="^4"/>
-<component name="screensaverproviders" long-name="Screen Saver Providers" introduced="^4" plugin="Y"/>
-</collection>
-<collection name="taskswitcherapp" long-name="Task Switcher Application" level="task">
-<component name="taskswitcherappecom" long-name="Task Switcher Application ECom" introduced="^4"/>
-<component name="tsserviceplugin" long-name="Task Switcher Service Plugin" introduced="^4" plugin="Y"/>
-<component name="ts_runtimeplugins" long-name="TS Runtime Plugins" introduced="^4" plugin="Y"/>
-<component name="tsapplication" long-name="Task Switcher Application" introduced="^4"/>
-</collection>
-</block>
-<block name="homescreentools" level="services" long-name="Home Screen Tools" levels="tool install">
-<collection name="dtdinstaller" long-name="DTD Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<!-- this needs to be built first, does build order need to be forced with filters? -->
-<component name="dtdinstaller_build" filter="s60,bldmefirst" long-name="DTD Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/dtdinstaller/group"/>
-</component>
-</collection>
-<collection name="themeinstaller" long-name="Theme Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="themeinstaller_build" filter="s60" long-name="Theme Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/themeinstaller/group"/>
-</component>
-</collection>
-<collection name="widgettools" long-name="Widget Tools" level="install">
-<component name="hspluginpreinstaller" filter="s60" long-name="HS Plugin Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/hspluginspreinstaller/group"/>
-</component>
-<component name="wrtwidgetpreinstaller" filter="s60" long-name="WRT Widget Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
-</component>
-</collection>
-</block>
-<block name="jrt" level="services" long-name="Java Runtime" levels="util generic rt ui">
-<collection name="jrt_plat" long-name="JRT Platform Interfaces" level="ui">
-<component name="java_registry_api" long-name="Java Registry API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_registry_api/build"/>
-</component>
-<component name="java_env_info_api" long-name="Java Environment Info API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_env_info_api/build"/>
-</component>
-<component name="java_debug_api" long-name="Java Debug API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_debug_api/build"/>
-</component>
-</collection>
-<collection name="java_stubs" long-name="Java Stubs" level="util">
-<!-- uncomment all components when configuration is in place. Currently #included from jrt_build -->
-<component name="javadrmutils" long-name="Java DRM Utils" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtdrmutils/group"/>-->
-</component>
-<component name="javaenvinfo" long-name="Java Environment Info" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtenvinfo/group"/>-->
-</component>
-<component name="javaregistry" filter="s60,sf_build" long-name="Java Registry" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtregistry/clientserver/client/group"/>-->
-</component>
-<component name="java_stubs_build" filter="s60,sf_build" long-name="Java Stubs ROM" class="placeholder">
-<!-- Remove the #includes and rename JRT ROM-->
-<!--<unit bldFile="java_stubs/group"/>-->
-</component>
-</collection>
-<collection name="jrt_info" long-name="JRT Info" level="rt">
-<component name="jrt_build" filter="s60" long-name="JRT Build">
-<!-- needed for __JAVA_STUBS condition -->
-<unit bldFile="app/jrt/group"/>
-</component>
-</collection>
-</block>
-<block name="conntools" level="services" long-name="Connectivity Tools" levels="config app">
-<collection name="nettools" long-name="Net Tools" level="app">
-<component name="conntest" filter="s60" long-name="Connection Test" purpose="development">
-<unit bldFile="app/conntools/nettools/conntest/group"/>
-</component>
-</collection>
-<collection name="emulatorlan" long-name="Emulator LAN" level="config">
-<!-- component is actually a colleciton, should be moved down a directory -->
-<component name="emulatorlan_build" filter="s60" long-name="Emulator LAN Build" purpose="development" class="config">
-<unit bldFile="app/conntools/emulatorlan/group"/>
-</component>
-</collection>
-</block>
-<block name="rndtools" level="services" long-name="R&D tools" levels="support generic test util">
-<collection name="creator" long-name="Creator" level="support">
-<!-- collection is really a component. Should move down a directory -->
-<component name="creator_build" filter="s60" long-name="Creator Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/creator/group"/>
-</component>
-</collection>
-<collection name="filebrowser" long-name="File Browser" level="util">
-<!-- consider collapsing into a single component -->
-<component name="fileopserver" filter="s60" long-name="File Operations Server" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
-</component>
-<component name="fileopclient" filter="s60" long-name="File Operations Client" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!--<unit bldFile="filebrowser/fileopclient/group"/>-->
-</component>
-<component name="filebrowser_build" filter="s60" long-name="File Browser Application" purpose="development" class="tool">
-<!-- Need to make this a self-contained component by removing #includes. Can only do when configuration is in place-->
-<unit bldFile="app/rndtools/filebrowser/group"/>
-</component>
-</collection>
-<collection name="launcher" long-name="Launcher" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="launcher_build" filter="s60" long-name="Launcher Utility" purpose="development" class="tool">
-<unit bldFile="app/rndtools/launcher/group"/>
-</component>
-</collection>
-<collection name="loadgen" long-name="Load Generator" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="loadgen_build" filter="s60" long-name="Load Generator Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/loadgen/group"/>
-</component>
-</collection>
-<collection name="perfmon" long-name="Performance Monitor" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="perfmon_build" filter="s60" long-name="Performance Monitor Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/perfmon/group"/>
-</component>
-</collection>
-<collection name="screengrabber" long-name="Screen Grabber" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="screengrabber_build" filter="s60" long-name="ScreenGrabber" purpose="development" class="tool">
-<unit bldFile="app/rndtools/screengrabber/group"/>
-</component>
-</collection>
-<collection name="stifui" long-name="STIF UI" level="generic">
-<component name="stifui_stifui" filter="s60" long-name="STIF UI" purpose="development">
-<unit bldFile="app/rndtools/stifui/stifui/group"/>
-</component>
-<component name="uitestserverstarter" filter="s60" long-name="UI Test Server Starter" purpose="development">
-<unit bldFile="app/rndtools/stifui/uitestserverstarter/group"/>
-</component>
-<component name="stifui_build" filter="s60" long-name="STIF UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/stifui/group"/>
-</component>
-</collection>
-<collection name="memspyui" long-name="Memspy UI" level="generic">
-<!-- collection is really a component. Should move down a directory -->
-<component name="memspyui_build" filter="s60" long-name="Memspy UI Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/memspyui/group"/>
-</component>
-</collection>
-<collection name="htiui" long-name="Harmonized Test Interface UI" level="generic">
-<component name="HtiServicePlugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- can only have a single unit. Should #include from a common bld.inf file -->
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiFtpBackupFake/group"/>
-</component>
-<component name="htidevicereboot" filter="s60" long-name="HTI Device Reboot" purpose="development">
-<unit bldFile="app/rndtools/htiui/htidevicereboot/group"/>
-</component>
-<component name="htistartupwait" filter="s60" long-name="HTI Startup Wait" purpose="development">
-<unit bldFile="app/rndtools/htiui/htistartupwait/group"/>
-</component>
-<component name="htiadmin" filter="s60" long-name="HTI Admin" purpose="development">
-<unit bldFile="app/rndtools/htiui/htiadmin/group"/>
-</component>
-<component name="htiui_build" filter="s60" long-name="HTI UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/htiui/group"/>
-</component>
-</collection>
-</block>
-<block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools if ui">
-<collection name="userguide" long-name="User Guide" level="if">
-<!-- collection is really a component. Move down a directory -->
-<component name="userguide_build" long-name="User Guide Build" filter="s60" introduced="^4">
-<unit bldFile="app/helps/userguide" proFile="Userguide.pro"/>
-</component>
-</collection>
-<collection name="symhelp" long-name="Symbian Help" level="eng">
-<component name="helpmodel" long-name="Help" introduced="6.0" purpose="optional">
-<unit bldFile="app/helps/symhelp/helpmodel/group" mrp="app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
-</component>
-</collection>
-<collection name="helps_info" long-name="Help Apps Info" level="ui">
-<component name="helps_metadata" long-name="Help Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/helps/helps_info/helps_metadata/helps_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
-<collection name="buildverification" long-name="Build Verification" level="services">
-<component name="autosmoketest" long-name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
-<unit bldFile="app/techview/buildverification/autosmoketest/Group" mrp="app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
-</component>
-<component name="smoketest" long-name="Smoke Test" filter="gt" purpose="development">
-<unit bldFile="app/techview/buildverification/smoketest/Group" mrp="app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
-</component>
-</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="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"/>
-<collection name="installationapps" long-name="Installation Apps" level="apps2"/>
-<collection name="messagingapps" long-name="Messaging Apps" level="apps2"/>
-<collection name="telephonyapps" long-name="Telephony Apps" level="apps1"/>
-<collection name="networkingapps" long-name="Networking Apps" level="apps1"/>
-<collection name="networkingutils" long-name="Networking Utils" level="utils"/>
-<collection name="shortlinkapps" long-name="Shortlink Apps" level="apps1"/>
-<collection name="testapps" long-name="Test Apps" level="utils"/>
-<collection name="avapps" long-name="A/V Apps" level="apps3"/>
-<collection name="toolkit" long-name="Toolkit" level="utils"/>
-<collection name="techview_info" long-name="Techview Info" level="apps3">
-<component name="techview_metadata" long-name="Techview Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/techview/techview_info/techview_metadata/techview_metadata.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
--- a/symbian4/single/sysdefs/auto/model_20100504151759_038710a76c00.xml Wed May 05 12:21:47 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9088 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a package or prebuilt -->
-<!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) "N"
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile may someday be removed in favour of mrp -->
-<!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="low mw high">
-<block name="stubs" level="high" span="2" long-name="Stubs" levels="adaptation plugin mid engine">
-<collection name="audiostubs" long-name="Audio Stubs" level="adaptation">
-<component name="devsoundextensions_stubs" long-name="Devsound Extensions Stubs">
-<unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/group"/>
-</component>
-<component name="fmradiotunercontrolstub" long-name="FM Radio Tuner Control Stub">
-<unit bldFile="adaptation/stubs/audiostubs/fmradiotunercontrolstub/group"/>
-</component>
-</collection>
-<collection name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaptation Stub" level="adaptation">
-<component name="btaudioadaptation_stub_build" long-name="Bluetooth Audio Adaptation Stub Build" filter="oem_build">
-<unit bldFile="adaptation/stubs/btaudioadaptation_stub/group"/>
-</component>
-</collection>
-<collection name="drm_stubs" long-name="DRM Stubs" level="plugin">
-<component name="drm_stubs_build" long-name="DRM Stubs Build">
-<unit bldFile="adaptation/stubs/drm_stubs/group"/>
-</component>
-</collection>
-<collection name="ocrsrv_stub" long-name="OCR Services Stub" level="mid">
-<component name="ocrsrv_stub_build" long-name="OCR Services Stub Build" filter="!dfs_build">
-<unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
-</component>
-</collection>
-<collection name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
-<component name="omasuplasnconverterstubimpl_build" long-name="OMA SUPL ASN Converter Stub Implementation Build" filter="!dfs_build">
-<unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
-</component>
-</collection>
-<collection name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" level="plugin">
-<component name="posmsgpluginreferenceimpl_build" long-name="POS Message Plugin Reference Implementation Build" plugin="Y">
-<unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
-</component>
-</collection>
-<collection name="srsfenginestub" long-name="SRSF Engine Stub" level="engine">
-<component name="srsfenginestub_build" long-name="SRSF Engine Stub Build" filter="stubs">
-<unit bldFile="adaptation/stubs/srsfenginestub/group"/>
-</component>
-</collection>
-<collection name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub" level="plugin">
-<component name="power_save_display_mode_stub_build" long-name="Power Save Display Mode Stub Build">
-<unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
-</component>
-</collection>
-<collection name="systemswstubs" long-name="System Software Stubs" level="adaptation">
-<component name="ddcaccessstub" long-name="DDC Access Stub">
-<unit bldFile="adaptation/stubs/systemswstubs/ddcaccessstub/group"/>
-</component>
-<component name="tvoutconfig" long-name="TV Out Config">
-<unit bldFile="adaptation/stubs/systemswstubs/TVOutConfig/group" filter="oem_build"/>
-</component>
-<component name="accessorypolicyreference" long-name="Accessory Policy Reference">
-<unit bldFile="adaptation/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
-</component>
-<component name="asyreference" long-name="ASY Reference" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
-</component>
-<component name="examplecommonisc" long-name="Example Common ISC">
-<unit bldFile="adaptation/stubs/systemswstubs/examplecommonisc/group" filter="oem_build"/>
-</component>
-<component name="exampledsy" long-name="Example DSY">
-<unit bldFile="adaptation/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
-</component>
-<component name="featuremanagerstub" long-name="Feature Manager Stub">
-<unit bldFile="adaptation/stubs/systemswstubs/featuremanagerstub/group" filter="oem_build"/>
-</component>
-<component name="hwrmstubplugins" long-name="Hardware Resource Manager Stub Plugins" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
-</component>
-<component name="hwrmhapticsstubplugin" long-name="Hardware Resource Manager Haptics Stub Plugin" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
-</component>
-<component name="sensorchannelsreference" long-name="Sensor Channels Reference">
-<unit bldFile="adaptation/stubs/systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
-</component>
-<component name="ssyreference" long-name="SSY Reference" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
-</component>
-<component name="startupadaptationstub" long-name="Startup Adaptation Stub" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/startupadaptationstub/group" filter="oem_build"/>
-</component>
-<component name="tiltcompensationstub" long-name="Tilt Compensation Stub">
-<unit bldFile="adaptation/stubs/systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
-</component>
-<component name="tvoutbehaviour" long-name="TV Out Behaviour">
-<unit bldFile="adaptation/stubs/systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
-</component>
-<component name="wiredbearerreference" long-name="Wired Bearer Reference" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
-</component>
-</collection>
-<collection name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" level="engine">
-<component name="tactileclickplugin_stub_build" long-name="Tactile Click Plugin Stub Build" plugin="Y">
-<unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
-</component>
-</collection>
-<collection name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub" level="mid">
-<component name="wlanhwinit_stub_build" long-name="WLAN Hardware Init Stub Build">
-<unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
-<collection name="omap3530" long-name="OMAP 3530" level="hw-if">
-<component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530" mrp="adaptation/beagleboard/omap3530/base_beagle.mrp"/>
-</component>
-<component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/kernel"/>
-</component>
-<component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/beagleboard"/>
-</component>
-</collection>
-</block>
-<block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
-<collection name="qemu_baseport" long-name="Baseport" level="hw-if">
-<component name="syborg" long-name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/qemu/baseport/syborg" mrp="adaptation/qemu/baseport/syborg/syborg.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
-<collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
-<component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
-<unit bldFile="os/kernelhwsrv/brdbootldr/ubootldr" mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
-</component>
-</collection>
-<collection name="bsptemplate" long-name="Board Support Package Template" level="hw-if">
-<component name="asspandvariant" long-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 name="kernel" long-name="Kernel Architecture" level="adaptation">
-<component name="eka" long-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 name="kerneltest" long-name="Kernel Test" level="hw-if">
-<component name="e32utils" long-name="E32 Utilities" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32utils/group" mrp="os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/>
-</component>
-<component name="e32test" long-name="E32 Tests" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32test/group" mrp="os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
-</component>
-<component name="f32test" long-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 name="ldds" long-name="Logical Device Drivers" level="adaptation">
-<component name="ethernetldd" long-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 name="audioldd" long-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>
-<component name="serialldd" long-name="Serial Port Drivers" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
-</component>
-<component name="legacydrivers" long-name="Legacy Drivers" purpose="optional">
-<unit mrp="os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
-</component>
-<component name="locmedia" long-name="Local Media Subsystem" introduced="8.1b" purpose="mandatory">
-<!-- these are LDDs for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
-</component>
-<component name="runmodedebugger" long-name="Run Mode Debugger" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/debug/group" mrp="os/kernelhwsrv/kernel/eka/drivers/debug/group/base_e32_drivers_debug.mrp"/>
-</component>
-<component name="btrace" long-name="Kernel Trace Tool" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/trace" mrp="os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
-</component>
-<component name="cameraldd" long-name="Camera Drivers" introduced="^3" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/camerasc" mrp="os/kernelhwsrv/kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
-</component>
-<component name="displayldd" long-name="Display Drivers" introduced="^3" purpose="optional">
-<!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/display" mrp="os/kernelhwsrv/kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
-</component>
-<component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
-</component>
-<component name="usbdescriptors" long-name="USB Descriptors" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors" mrp="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors/base_drivers_usbdescriptors.mrp"/>
-</component>
-<component name="usbdi_utils" long-name="USB DI Utils" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils" mrp="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils/base_drivers_usbdi_utils.mrp"/>
-</component>
-</collection>
-<collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
-<component name="mediadrivers" long-name="Media Drivers" purpose="optional">
-<!-- these are for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/media" mrp="os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
-</component>
-<component name="genericboardsupport" long-name="Generic Board Support" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
-</component>
-</collection>
-<collection name="userlibandfileserver" long-name="User Library and File Server" level="framework">
-<component name="euser" long-name="User Library" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/euser" mrp="os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
-</component>
-<component name="compsupp" long-name="Compiler Runtime Support" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/compsupp" mrp="os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
-</component>
-<component name="fileserver" long-name="File Server" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
-</component>
-<component name="estart" long-name="Base Starter" filter="gt" purpose="optional">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
-</component>
-<component name="domainmgr" long-name="Domain Manager" introduced="8.1b" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
-</component>
-</collection>
-<collection name="filesystems" long-name="File Systems" level="framework">
-<component name="romfs" long-name="ROM File System" filter="gt" purpose="optional" plugin="Y">
-<unit mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
-</component>
-<component name="rofs" long-name="ROFS" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
-</component>
-<component name="usbmsfs" long-name="USB Mass Storage File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
-</component>
-<component name="usbhostmssrv" long-name="USB Host Mass Storage Server" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage/base_f32_shostmassstorage.mrp"/>
-</component>
-<component name="fat32fs" long-name="FAT32 File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
-</component>
-<component name="fatfs" long-name="FAT File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
-</component>
-<component name="compfs" long-name="Composite File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
-</component>
-</collection>
-<collection name="halservices" long-name="HAL Services" level="framework">
-<component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
-<unit bldFile="os/kernelhwsrv/halservices/hal" mrp="os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
-</component>
-</collection>
-<collection name="textmodeshell" long-name="Text Mode Shell" level="test">
-<component name="e32wsrv" long-name="Text Window Server" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/ewsrv" mrp="os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
-</component>
-<component name="textshell" long-name="Text Shell" filter="gt" purpose="development">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
-</component>
-</collection>
-<collection name="baseapitest" long-name="Base API Tests" level="test"/>
-<collection name="kernelhwsrv_info" long-name="Kernel and Hardware Services Info" level="test">
-<component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 config">
-<collection name="emulator" long-name="Emulator" level="bsp">
-<component name="emulatorbsp" long-name="Emulator BSP" purpose="optional">
-<unit bldFile="os/boardsupport/emulator/emulatorbsp" mrp="os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
-</component>
-</collection>
-<collection name="haitest" long-name="HAI Test Suites" level="test">
-<component name="bspsvs" long-name="BSP Verification Suite" introduced="^2" purpose="development">
-<unit mrp="os/boardsupport/haitest/bspsvs/group/bspsvs.mrp"/>
-</component>
-</collection>
-<collection name="boardsupport_info" long-name="Board Support Info" level="config">
-<component name="boardsupport_metadata" long-name="Board Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/boardsupport/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
-<collection name="bldsystemtools" long-name="Build System Tools" level="bld">
-<component name="sysdeftools" long-name="System Definition Tools" purpose="development" introduced="^2">
-<unit mrp="os/buildtools/bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
-</component>
-<component name="commonbldutils" long-name="Common Utils" purpose="development">
-<unit mrp="os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
-</component>
-</collection>
-<collection name="toolsandutils" long-name="Tools and Utils" level="mw">
-<component name="productionbldtools" long-name="Production Build Tools" filter="gt" purpose="development">
-<unit mrp="os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
-</component>
-<component name="e32tools" long-name="E32 Tools" deprecated="^2" purpose="development" class="PC">
-<unit bldFile="os/buildtools/toolsandutils/e32tools/group" mrp="os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
-</component>
-<component name="autotest" long-name="Autotest" purpose="development">
-<unit bldFile="os/buildtools/toolsandutils/autotest/group" mrp="os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
-</component>
-</collection>
-<collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
-<component name="e32toolp" long-name="E32 Perl Tools" purpose="development" filter="sf_build" class="PC">
-<unit mrp="os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="os/buildtools/sbsv1_os/e32toolp/group"/>
-</component>
-</collection>
-<collection name="imgtools_os" long-name="Image Tools" level="fw">
-<component name="romkiteka2" long-name="ROMKIT EKA2" deprecated="^2" purpose="development">
-<unit bldFile="os/buildtools/imgtools_os/romkiteka2/group" mrp="os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
-</component>
-</collection>
-<collection name="misccomponents" long-name="Misc Components" level="mw">
-<component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt" purpose="development">
-<unit bldFile="os/buildtools/misccomponents/emulatorlauncher/group" mrp="os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
-</component>
-</collection>
-<collection name="buildtools_info" long-name="Build Tools Info" level="ui">
-<component name="buildtools_metadata" long-name="Build Tools Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/buildtools/buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
-<collection name="ossrv_pub" long-name="Generic OS Services Public Interfaces" level="utilities">
-<component name="boost_apis" long-name="Boost APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/boost_apis/group"/>
-</component>
-<component name="cpp_wrappers" long-name="Cpp wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cpp_wrappers/group"/>
-</component>
-<component name="character_type_apis" long-name="Character Type APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/character_type_apis/group"/>
-</component>
-<component name="compiler_specific_runtime_support" long-name="Compiler Specific Runtime Support" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/compiler_specific_runtime_support/group"/>
-</component>
-<component name="ossrv_configuration_api" long-name="Generic OS Services Configuration API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/configuration/group"/>
-</component>
-<component name="crypto_authentication_codes_and_hash_functions_api" long-name="Crypto Authentication Codes and Hash Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
-</component>
-<component name="crypto_auxillary_functions_api" long-name="Crypto Auxillary Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_auxillary_functions_api/group"/>
-</component>
-<component name="crypto_certificates_api" long-name="Crypto Certificates API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_certificates_api/group"/>
-</component>
-<component name="crypto_inputoutput_and_data_encoding_api" long-name="Crypto Input/Output and Data Encoding API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
-</component>
-<component name="crypto_public_key_cryptography_and_key_agreement_api" long-name="Crypto Public Key Cryptography and Key Agreement API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
-</component>
-<component name="crypto_symmetric_ciphers_api" long-name="Crypto Symmetric Ciphers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_symmetric_ciphers_api/group"/>
-</component>
-<component name="crypto_utility_functions_api" long-name="Crypto Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_utility_functions_api/group"/>
-</component>
-<component name="cryptogaphy_related_api" long-name="Cryptogaphy Related API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cryptogaphy_related_api/group"/>
-</component>
-<component name="ossrv_debug_api" long-name="Generic OS Services Debug API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/debug/group"/>
-</component>
-<component name="ossrv_exceptions_api" long-name="Generic OS Services Exceptions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/exceptions/group"/>
-</component>
-<component name="gboxed" long-name="GBoxed API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gboxed/group"/>
-</component>
-<component name="glib_arrays" long-name="Glib Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_arrays/group"/>
-</component>
-<component name="glib_asynchronous_queues" long-name="Glib Asynchronous Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_asynchronous_queues/group"/>
-</component>
-<component name="glib_atomic_operations" long-name="Glib Atomic Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_atomic_operations/group"/>
-</component>
-<component name="glib_automatic_string_completion" long-name="Glib Automatic String Completion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_automatic_string_completion/group"/>
-</component>
-<component name="glib_balanced_binary_trees" long-name="Glib Balanced Binary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_balanced_binary_trees/group"/>
-</component>
-<component name="glib_basic_types" long-name="Glib Basic Types API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_basic_types/group"/>
-</component>
-<component name="glib_caches" long-name="Glib Caches API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_caches/group"/>
-</component>
-<component name="glib_character_set_conversion" long-name="Glib Character Set Conversion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_character_set_conversion/group"/>
-</component>
-<component name="glib_closures" long-name="Glib Closures API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_closures/group"/>
-</component>
-<component name="glib_commandline_option_parser" long-name="Glib Command Line Option Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_commandline_option_parser/group"/>
-</component>
-<component name="glib_datasets" long-name="Glib Datasets API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_datasets/group"/>
-</component>
-<component name="glib_date_and_time_functions" long-name="Glib Date and Time Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_date_and_time_functions/group"/>
-</component>
-<component name="glib_doubleended_queues" long-name="Glib Double-ended Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doubleended_queues/group"/>
-</component>
-<component name="glib_doublylinked_lists" long-name="Glib Doubly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doublylinked_lists/group"/>
-</component>
-<component name="glib_dynamic_loading_of_modules" long-name="Glib Dynamic Loading of Modules API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_dynamic_loading_of_modules/group"/>
-</component>
-<component name="glib_enums_and_flags" long-name="Glib Enums and Flags API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_enums_and_flags/group"/>
-</component>
-<component name="glib_error_reporting" long-name="Glib Error Reporting API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_error_reporting/group"/>
-</component>
-<component name="glib_file_utilities" long-name="Glib File Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_file_utilities/group"/>
-</component>
-<component name="glib_generic_values" long-name="Glib Generic Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_generic_values/group"/>
-</component>
-<component name="glib_globstyle_pattern_matching" long-name="Glib Glob-Style Pattern Matching API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_globstyle_pattern_matching/group"/>
-</component>
-<component name="glib_hash_tables" long-name="Glib Hash Tables API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hash_tables/group"/>
-</component>
-<component name="glib_hook_functions" long-name="Glib Hook Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hook_functions/group"/>
-</component>
-<component name="glib_internationalization" long-name="Glib Internationalization API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_internationalization/group"/>
-</component>
-<component name="glib_io_channels" long-name="Glib I/O Channels API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_io_channels/group"/>
-</component>
-<component name="glib_keyvalue_file_parser" long-name="Glib Key-Value File Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_keyvalue_file_parser/group"/>
-</component>
-<component name="glib_lexical_scanner" long-name="Glib Lexical Scanner API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_lexical_scanner/group"/>
-</component>
-<component name="glib_main_event_loop" long-name="Glib Main Event Loop API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_main_event_loop/group"/>
-</component>
-<component name="glib_memory_allocation" long-name="Glib Memory Allocation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_allocation/group"/>
-</component>
-<component name="glib_memory_slices" long-name="Glib Memory Slices API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_slices/group"/>
-</component>
-<component name="glib_message_logging" long-name="Glib Message Logging API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_message_logging/group"/>
-</component>
-<component name="glib_miscellaneous_utility_functions" long-name="Glib Miscellaneous Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_miscellaneous_utility_functions/group"/>
-</component>
-<component name="glib_nary_trees" long-name="Glib N-ary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_nary_trees/group"/>
-</component>
-<component name="glib_parameters_and_values" long-name="Glib Parameters and Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_parameters_and_values/group"/>
-</component>
-<component name="glib_quarks" long-name="Glib Quarks API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_quarks/group"/>
-</component>
-<component name="glib_random_numbers" long-name="Glib Random Numbers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_random_numbers/group"/>
-</component>
-<component name="glib_relations_and_tuples" long-name="Glib Relations and Tuples API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_relations_and_tuples/group"/>
-</component>
-<component name="glib_shellrelated_utilities" long-name="Glib Shell-related Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_shellrelated_utilities/group"/>
-</component>
-<component name="glib_signals" long-name="Glib Signals API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_signals/group"/>
-</component>
-<component name="glib_simple_xml_subset_parser" long-name="Glib Simple XML Subset Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_simple_xml_subset_parser/group"/>
-</component>
-<component name="glib_singlylinked_lists" long-name="Glib Singly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_singlylinked_lists/group"/>
-</component>
-<component name="glib_spawning_processes" long-name="Glib Spawning Processes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_spawning_processes/group"/>
-</component>
-<component name="glib_standard_macros" long-name="Glib Standard Macros API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_standard_macros/group"/>
-</component>
-<component name="glib_string_utility_functions" long-name="Glib String Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_string_utility_functions/group"/>
-</component>
-<component name="glib_strings" long-name="Glib Strings API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_strings/group"/>
-</component>
-<component name="glib_thread_pools" long-name="Glib Thread Pools API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_thread_pools/group"/>
-</component>
-<component name="glib_threads" long-name="Glib Threads API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_threads/group"/>
-</component>
-<component name="glib_timers" long-name="Glib Timers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_timers/group"/>
-</component>
-<component name="glib_unicode_manipulation" long-name="Glib Unicode Manipulation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_unicode_manipulation/group"/>
-</component>
-<component name="glib_value_arrays" long-name="Glib Value Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_value_arrays/group"/>
-</component>
-<component name="glib_varargs_value_collection" long-name="Glib Varargs Value Collection API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_varargs_value_collection/group"/>
-</component>
-<component name="gobject" long-name="GObject API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gobject/group"/>
-</component>
-<component name="gparamspec" long-name="GParamSpec API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gparamspec/group"/>
-</component>
-<component name="gtype" long-name="GType API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtype/group"/>
-</component>
-<component name="gtypemodule" long-name="GTypeModule API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypemodule/group"/>
-</component>
-<component name="gtypeplugin" long-name="GTypePlugin API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypeplugin/group"/>
-</component>
-<component name="io_stream_api" long-name="I/O stream API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/io_stream_api/group"/>
-</component>
-<component name="localization_function_api" long-name="Localization Function API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/localization_function_api/group"/>
-</component>
-<component name="math_operations_api" long-name="Math Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/math_operations_api/group"/>
-</component>
-<component name="ossrv_memory_api" long-name="Generic OS Services Memory API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/memory/group"/>
-</component>
-<component name="no_namespace_headers" long-name="No Namespace Headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/no_namespace_headers/group"/>
-</component>
-<component name="openc_headers" long-name="OpenC headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_headers/group"/>
-</component>
-<component name="openc_wrappers" long-name="OpenC wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_wrappers/group"/>
-</component>
-<component name="ssl_general_api" long-name="SSL General API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_general_api/group"/>
-</component>
-<component name="ssl_protocol_methods_api" long-name="SSL Protocol Methods API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_protocol_methods_api/group"/>
-</component>
-<component name="standard_compressiondecompression_api" long-name="Standard Compression/Decompression API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/standard_compressiondecompression_api/group"/>
-</component>
-<component name="stl" long-name="STL API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/stl/group"/>
-</component>
-<component name="thread_api" long-name="Thread API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/thread_api/group"/>
-</component>
-<component name="type_attributes" long-name="Type Attributes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/type_attributes/group"/>
-</component>
-<component name="typeinfo" long-name="Type Info API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/typeinfo/group"/>
-</component>
-<component name="utility_apis" long-name="Utility APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/utility_apis/group"/>
-</component>
-<component name="wide_character_classapis" long-name="Wide character class/apis" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/wide_character_classapis/group"/>
-</component>
-<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">
-<unit bldFile="os/ossrv/ossrv_pub/dbus-glib/group"/>
-</component>
-</collection>
-<collection name="ossrv_plat" long-name="Generic OS Services Platform Interfaces" level="utilities">
-<component name="libutils_apis" long-name="Utility Library APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_plat/libutils/group"/>
-</component>
-</collection>
-<collection name="stdlibs" long-name="Standard Libraries" level="translation">
-<component name="libz" filter="s60" long-name="Z Compression Library">
-<unit bldFile="os/ossrv/stdlibs/libz/group"/>
-</component>
-<component name="libcrypt" filter="s60" long-name="Crypt Library">
-<unit bldFile="os/ossrv/stdlibs/libcrypt/group"/>
-</component>
-</collection>
-<collection name="ssl" long-name="SSL" level="data-services">
-<component name="libcrypto" filter="s60" long-name="Crypto Library">
-<unit bldFile="os/ossrv/ssl/libcrypto/group"/>
-</component>
-<component name="libssl" filter="s60" purpose="development" long-name="SSL Library">
-<unit bldFile="os/ossrv/ssl/libssl/group"/>
-</component>
-</collection>
-<collection name="glib" long-name="GLib" level="utilities">
-<component name="glibbackend" filter="s60" long-name="GLib Backend">
-<unit bldFile="os/ossrv/glib/build/symbian/glibbackend/group"/>
-<!-- Move to here: <unit bldFile="glib/glibbackend/group"/> -->
-</component>
-<component name="libglib" filter="s60" long-name="GLib Library">
-<unit bldFile="os/ossrv/glib/build/symbian/glib/group"/>
-<!-- Move to here: <unit bldFile="glib/libglib/group"/> -->
-</component>
-<component name="libgthread" filter="s60" long-name="Libg Thread">
-<unit bldFile="os/ossrv/glib/build/symbian/gthread/group"/>
-<!-- Move to here: <unit bldFile="glib/libgthread/group"/> -->
-</component>
-<component name="libgmodule" filter="s60" long-name="Libg Module">
-<unit bldFile="os/ossrv/glib/build/symbian/gmodule/group"/>
-<!-- Move to here: <unit bldFile="glib/libgmodule/group"/> -->
-</component>
-<component name="libgobject" filter="s60" long-name="Libg Object">
-<unit bldFile="os/ossrv/glib/build/symbian/gobject/group"/>
-<!-- Move to here: <unit bldFile="glib/libgobject/group"/> -->
-</component>
-</collection>
-<collection name="stdcpp" long-name="C++ Standard Library" level="translation">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="stdcpp_build" filter="s60" long-name="Stdcpp">
-<unit bldFile="os/ossrv/stdcpp/group"/>
-</component>
-</collection>
-<collection name="ofdbus" long-name="Open Foundation D-Bus" level="utilities">
-<component name="dbus" filter="s60" long-name="D-Bus">
-<unit bldFile="os/ossrv/ofdbus/dbus/group"/>
-</component>
-<component name="dbus-glib" filter="s60" long-name="D-Bus GLib">
-<unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
-</component>
-<component name="ofdbus_rom" filter="s60" long-name="D-Bus ROM">
-<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory
- Consider moving IBY file to one of the above as well and removing this component entirely -->
-<unit bldFile="os/ossrv/ofdbus/group"/>
-</component>
-</collection>
-<collection name="utilitylibraries" long-name="Utility Libraries" level="encoding">
-<component name="libutils" filter="s60" long-name="Utility Library">
-<unit bldFile="os/ossrv/utilitylibraries/libutils/group"/>
-</component>
-</collection>
-<collection name="genericservices" long-name="Generic Services" level="utilities">
-<component name="s60compatibilityheaders" long-name="S60 Compatibility Headers" filter="gt" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp" version="tb101sf"/>
-</component>
-<component name="mimerecognitionfw" long-name="MIME Recognition Framework" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/mimerecognitionfw/group" mrp="os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
-</component>
-<component name="systemagent" long-name="System Agent" introduced="9.0" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/systemagent/group" mrp="os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
-</component>
-<component name="taskscheduler" long-name="Task Scheduler" introduced="6.0" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/taskscheduler/group" mrp="os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
-</component>
-<component name="activebackupclient" long-name="Active Backup Client" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/activebackupclient/group" mrp="os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
-</component>
-<component name="syslibsdocs" long-name="Syslibs Documentation" purpose="development" class="doc">
-<unit mrp="os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
-</component>
-<component name="httputils" long-name="HTTP Utilities Library" introduced="6.2" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/httputils/group" mrp="os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
-</component>
-</collection>
-<collection name="syslibsapitest" long-name="SysLibs API Tests" level="utilities"/>
-<collection name="compressionlibs" long-name="Compression Libraries" level="data-services">
-<component name="ziplib" long-name="Zip Compression Library" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/ossrv/compressionlibs/ziplib/group" mrp="os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
-</component>
-</collection>
-<collection name="genericopenlibs" long-name="Generic Open Libraries" level="translation">
-<component name="cstdlib" long-name="C Standard Library" introduced="ER5" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/cstdlib/group" mrp="os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
-</component>
-<component name="cppstdlib" long-name="C++ Standard Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/cppstdlib/group" mrp="os/ossrv/genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
-</component>
-<component name="openenvcore" long-name="Open Environment Core" introduced="^2" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/openenvcore/group" mrp="os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
-</component>
-<component name="posixrealtimeextensions" long-name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/posixrealtimeextensions/group" mrp="os/ossrv/genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
-</component>
-<component name="liboil" long-name="Liboil" introduced="^4" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/liboil/group" mrp="os/ossrv/genericopenlibs/liboil/group/oeaddons_liboil.mrp"/>
-</component>
-</collection>
-<collection name="lowlevellibsandfws" long-name="Low Level Libraries and Frameworks" level="app-libs">
-<component name="pluginfw" long-name="Plugin Framework" introduced="6.2" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp" version="3"/>
-</component>
-<component name="apputils" long-name="Application Utilities" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/apputils/group" mrp="os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
-</component>
-<component name="genericusabilitylib" long-name="Generic Usability Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/genericusabilitylib/group" mrp="os/ossrv/lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
-</component>
-</collection>
-<collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
-<component name="ossrv_build" filter="s60" long-name="Generic OS Services Build">
-<!-- exports should be moved to individual components -->
-<unit bldFile="os/ossrv/group"/>
-</component>
-<component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="featuremgmt" long-name="Feature Management" level="framework">
-<component name="featuremgr" long-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 name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/persistentdata/featuremgmt/featureregistry/group" mrp="os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
-</component>
-</collection>
-<collection name="loggingservices" long-name="Logging Services" level="server">
-<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">
-<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">
-<unit bldFile="os/persistentdata/loggingservices/rfilelogger/group" mrp="os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
-</component>
-</collection>
-<collection name="traceservices" long-name="Trace Services" level="server">
-<component name="commsdebugutility" long-name="Comms Debug Utility" introduced="7.0s" purpose="optional">
-<unit bldFile="os/persistentdata/traceservices/commsdebugutility/group" mrp="os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
-</component>
-<component name="tracefw" long-name="Trace Framework" introduced="9.2" purpose="development">
-<unit bldFile="os/persistentdata/traceservices/tracefw/ulogger/group" mrp="os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
-</component>
-</collection>
-<collection name="persistentstorage" long-name="Persistent Storage" level="framework">
-<component name="store" long-name="Store" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/store/group" mrp="os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
-</component>
-<component name="dbms" long-name="DBMS" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/dbms/group" mrp="os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
-</component>
-<component name="centralrepository" long-name="Central Repository" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/persistentdata/persistentstorage/centralrepository/group" mrp="os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
-</component>
-<component name="sql" long-name="SQL" introduced="9.3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sql/GROUP" mrp="os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
-</component>
-<component name="sqlite3api" long-name="SQLite 3 API" introduced="^3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sqlite3api/GROUP" mrp="os/persistentdata/persistentstorage/sqlite3api/GROUP/syslibs_sqlite3.mrp"/>
-</component>
-</collection>
-<collection name="persistentdata_info" long-name="Persistent Data Services Info" level="app-if">
-<component name="persistentdata_metadata" long-name="Persistent Data Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/persistentdata/persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
-<component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
-</component>
-<component name="common_platform_security_definitions_api" long-name="Common Platform Security Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group"/>
-</component>
-<component name="feature_discovery_api" long-name="Feature Discovery API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/group"/>
-</component>
-<component name="platform_environment_api" long-name="Platform Environment API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_environment_api/group"/>
-</component>
-<component name="sensor_channel_api" long-name="Sensor Channel API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_channel_api/group"/>
-</component>
-<component name="sensor_definitions_api" long-name="Sensor Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_definitions_api/group"/>
-</component>
-<component name="version_info_api" long-name="Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/group"/>
-</component>
-<component name="accessory_monitoring_api" long-name="Accessory Monitoring API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/group"/>
-</component>
-<component name="haptics_api" long-name="Haptics API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/haptics_api/group"/>
-</component>
-<component name="sensor_data_compensator_api" long-name="Sensor Data Compensator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
-</component>
-</collection>
-<collection name="devicesrv_plat" long-name="Device Services Platform Interfaces" level="app-if">
-<component name="configuration_file_parser_api" long-name="Configuration File Parser API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/configuration_file_parser_api/group"/>
-</component>
-<component name="dos_extension_plugin_api" long-name="DOS Extension Plug-In API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_plugin_api/group"/>
-</component>
-<component name="mediator_command_initiator_api" long-name="Mediator Command Initiator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_initiator_api/group"/>
-</component>
-<component name="syslangutil_api" long-name="SysLangUtil API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/syslangutil_api/group"/>
-</component>
-<component name="wakeup_alarm_api" long-name="Wakeup Alarm API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/wakeup_alarm_api/group"/>
-</component>
-<component name="disk_and_memory_level_keys_api" long-name="Disk and Memory Level Keys API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_and_memory_level_keys_api/group"/>
-</component>
-<component name="mediator_plugin_api" long-name="Mediator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_plugin_api/group"/>
-</component>
-<component name="headset_status_api" long-name="Headset Status API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/headset_status_api/group"/>
-</component>
-<component name="system_startup_extension_plugin_api" long-name="System Startup Extension Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/system_startup_extension_plugin_api/group"/>
-</component>
-<component name="sensor_plugin_api" long-name="Sensor Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_plugin_api/group"/>
-</component>
-<component name="accessory_api" long-name="Accessory API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_api/group"/>
-</component>
-<component name="display_language_definition_api" long-name="Display Language Definition API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/display_language_definition_api/group"/>
-</component>
-<component name="mediator_command_responder_api" long-name="Mediator Command Responder API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_responder_api/group"/>
-</component>
-<component name="accessory_policy_definitions_api" long-name="Accessory Policy Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_definitions_api/group"/>
-</component>
-<component name="hw_settings_api" long-name="Hardware Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/hw_settings_api/group"/>
-</component>
-<component name="mediator_domain_definitions_api" long-name="Mediator Domain Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_domain_definitions_api/group"/>
-</component>
-<component name="sensor_extension_api" long-name="Sensor Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_extension_api/group"/>
-</component>
-<component name="accessory_plugin_api" long-name="Accessory Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_plugin_api/group"/>
-</component>
-<component name="sae_api" long-name="SAE API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sae_api/group"/>
-</component>
-<component name="accessory_control_api" long-name="Accessory Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_control_api/group"/>
-</component>
-<component name="mediator_static_registration_api" long-name="Mediator Static Registration API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_static_registration_api/group"/>
-</component>
-<component name="accessory_key_event_handling_api" long-name="Accessory Key Event Handling API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_key_event_handling_api/group"/>
-</component>
-<component name="mediator_notification_api" long-name="Mediator Notification API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_notification_api/group"/>
-</component>
-<component name="accessory_policy_utility_api" long-name="Accessory Policy Utility API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_utility_api/group"/>
-</component>
-<component name="common_dsy_plugin_api" long-name="Common DSY Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/common_dsy_plugin_api/group"/>
-</component>
-<component name="remote_control_extension_api" long-name="Remote Control Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/remote_control_extension_api/group"/>
-</component>
-<component name="sensor_channel_filter_api" long-name="Sensor Channel Filter API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_channel_filter_api/group"/>
-</component>
-<component name="dos_extension_api" long-name="DOS Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_api/group"/>
-</component>
-<component name="accessory_audio_control_api" long-name="Accessory Audio Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_audio_control_api/group"/>
-</component>
-<component name="mediator_event_consumer_api" long-name="Mediator Event Consumer API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_consumer_api/group"/>
-</component>
-<component name="shared_data_api" long-name="Shared Data API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/shared_data_api/group"/>
-</component>
-<component name="accessory_settings_api" long-name="Accessory Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_settings_api/group"/>
-</component>
-<component name="accessory_bluetooth_control_api" long-name="Accessory Bluetooth Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_bluetooth_control_api/group"/>
-</component>
-<component name="extended_version_info_api" long-name="Extended Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_api/group"/>
-</component>
-<component name="mediator_event_provider_api" long-name="Mediator Event Provider API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_provider_api/group"/>
-</component>
-<component name="tv_out_config_api" long-name="TV Out Config API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_config_api/group"/>
-</component>
-<component name="tspclientmapper_api" long-name="TSP Client Mapper API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tspclientmapper_api/group"/>
-</component>
-<component name="powersave_api" long-name="Power Save API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_api/group"/>
-</component>
-<component name="powersave_definitions_api" long-name="Power Save Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_definitions_api/group"/>
-</component>
-<component name="powersave_plugin_api" long-name="Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_plugin_api/group"/>
-</component>
-<component name="extended_version_info_plugin_api" long-name="Extended Version Info Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_plugin_api/group"/>
-</component>
-<component name="haptics_plugin_api" long-name="Haptics Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_plugin_api/group"/>
-</component>
-<component name="haptics_effect_data_getter_plugin_api" long-name="Haptics Effect Data Getter Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
-</component>
-<component name="haptics_packetizer_plugin_api" long-name="Haptics Packetizer Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_packetizer_plugin_api/group"/>
-</component>
-<component name="tiltcompensation_api" long-name="Tilt Compensation API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tiltcompensation_api/group"/>
-</component>
-<component name="disk_notification_handler_api" long-name="Disk Notification Handler API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_notification_handler_api/group"/>
-</component>
-<component name="accessory_policy_usb_audio_api" long-name="Accessory Policy USB Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_usb_audio_api/group"/>
-</component>
-<component name="accessory_policy_hdmi_audio_api" long-name="Accessory Policy HDMI Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_hdmi_audio_api/group"/>
-</component>
-<component name="sensor_data_compensator_plugin_api" long-name="Sensor Data Compensator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
-</component>
-<component name="ddc_access_api" long-name="DDC Access API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/ddc_access_api/group"/>
-</component>
-<component name="tv_out_behaviour_api" long-name="TV Out Behaviour API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_behaviour_api/group"/>
-</component>
-</collection>
-<collection name="accessoryservices" long-name="Accessory Services" level="framework">
-<component name="accessorymonitor" filter="s60" long-name="Accessory Monitor">
-<unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/group"/>
-</component>
-<component name="accessoryremotecontrol" filter="s60" long-name="Accessory Remote Control">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
-</component>
-<component name="accessoryserver" filter="s60" long-name="Accessory Server">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryserver/group"/>
-</component>
-<component name="pluggeddisplay" filter="s60" long-name="Plugged Display" introduced="^3">
-<unit bldFile="os/devicesrv/accessoryservices/pluggeddisplay/group"/>
-</component>
-<component name="headsetstatusapi" filter="s60" long-name="Headset Status API">
-<unit bldFile="os/devicesrv/accessoryservices/headsetstatusapi/group"/>
-</component>
-<component name="tspclientmapper" filter="s60" long-name="TSP Client Mapper">
-<unit bldFile="os/devicesrv/accessoryservices/tspclientmapper/group"/>
-</component>
-<component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional">
-<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
-</component>
-<component name="gid_pc_tool" filter="s60" long-name="Generic ID PC Tool" class="tool PC">
-<unit bldFile="os/devicesrv/accessoryservices/gid_pc_tool/group"/>
-</component>
-</collection>
-<collection name="commonservices" long-name="Common Services" level="app-if">
-<component name="commonengine" filter="s60" long-name="Common Engine">
-<unit bldFile="os/devicesrv/commonservices/commonengine/group"/>
-</component>
-<component name="commonengineresources" filter="s60" long-name="Common Engine Resources" class="config">
-<unit bldFile="os/devicesrv/commonservices/commonengineresources/group"/>
-</component>
-<component name="platformenv" filter="s60" long-name="Platform Environment">
-<unit bldFile="os/devicesrv/commonservices/platformenv/group"/>
-</component>
-<component name="sysutil" long-name="System Utilities" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/sysutil/group" mrp="os/devicesrv/commonservices/sysutil/group/sysutil.mrp"/>
-</component>
-<component name="activitymanager" long-name="Activity Manager" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/activitymanager/group" mrp="os/devicesrv/commonservices/activitymanager/group/activitymanager.mrp"/>
-</component>
-</collection>
-<collection name="dosservices" long-name="Domestic Operating System Services" level="hw-if">
-<component name="commondsy" filter="s60" long-name="Common DSY" plugin="Y">
-<unit bldFile="os/devicesrv/dosservices/commondsy/group"/>
-</component>
-<component name="dosserver" filter="s60" long-name="Domestic OS Server">
-<unit bldFile="os/devicesrv/dosservices/dosserver/group"/>
-</component>
-</collection>
-<collection name="sensorservices" long-name="Sensor Services" level="framework">
-<component name="sensorserver" filter="s60" long-name="Sensor Server">
-<unit bldFile="os/devicesrv/sensorservices/sensorserver/group"/>
-</component>
-<component name="orientationssy" filter="s60" long-name="Orientation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/orientationssy/group"/>
-</component>
-<component name="tiltcompensationssy" filter="s60" long-name="Tilt Compensation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/tiltcompensationssy/group"/>
-</component>
-<component name="sensordatacompensator" filter="s60" long-name="Sensor Data Compensator">
-<unit bldFile="os/devicesrv/sensorservices/sensordatacompensator/group"/>
-</component>
-</collection>
-<collection name="hwrmhaptics" long-name="HWRM Haptics" level="plugin">
-<component name="hapticseffectdatagetterfw" filter="s60" long-name="Haptics Effect Data Getter Framework">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
-</component>
-<component name="hapticspluginservice" filter="s60" long-name="Haptics Plugin Service">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
-</component>
-<component name="hapticspacketizer" filter="s60" long-name="Haptics Packetizer">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
-</component>
-<component name="hapticspluginmanager" filter="s60" long-name="Haptics Plugin Manager">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
-</component>
-<component name="hapticsserver" filter="s60" long-name="Haptics Server">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsserver/group"/>
-</component>
-<component name="hapticsclient" filter="s60" long-name="Haptics Client">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsclient/group"/>
-</component>
-<component name="hwrmhaptics_build" filter="s60" long-name="HWRM Haptics Build">
-<!-- move these exports into the appropriate above components and delete this component-->
-<unit bldFile="os/devicesrv/hwrmhaptics/group"/>
-</component>
-</collection>
-<collection name="mediator" long-name="Mediator" level="app-if">
-<!--collection is really a component. Move it down a directory -->
-<component name="mediator_build" filter="s60" long-name="Mediator Build">
-<unit bldFile="os/devicesrv/mediator/group"/>
-</component>
-</collection>
-<collection name="psmservices" long-name="Power Save Mode Services" level="app-if">
-<component name="psmserver" filter="s60" long-name="PSM Server">
-<unit bldFile="os/devicesrv/psmservices/psmserver/group"/>
-</component>
-</collection>
-<collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
-<component name="hwrmfmtxwatcherplugin" filter="s60" long-name="HWRM FM Transmitter Watcher Plugin" plugin="Y">
-<unit bldFile="os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
-</component>
-<component name="hwrmtargetmodifierplugin" filter="s60" long-name="HWRM Target Modifier Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build,
- may need to -->
-<!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
-</component>
-<component name="vibractrl" filter="s60" long-name="Vibra Control" deprecated="9.1">
-<unit bldFile="os/devicesrv/resourcemgmt/vibractrl/group"/>
-</component>
-<component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="^2" purpose="optional">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
-</component>
-<component name="hwresourcesmgrconfig" long-name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
-</component>
-<component name="resourcemgmt_build" filter="s60" long-name="Resource Management Build">
-<!-- Move exports to a self-contained component.
- This needs to be kept around until configuration is in place -->
-<unit bldFile="os/devicesrv/resourcemgmt/group"/>
-</component>
-<component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
-</component>
-</collection>
-<collection name="sysstatemgmt" long-name="System State Management" level="server">
-<component name="ssmmapperutility" filter="s60" long-name="SSM Mapper Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmmapperutility/group"/>
-</component>
-<component name="ssmpolicyplugins" filter="s60" long-name="SSM Policy Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmpolicyplugins/group"/>
-</component>
-<component name="ssmutilityplugins" filter="s60" long-name="SSM Utility Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmutilityplugins/group"/>
-</component>
-<component name="ssmcmdlists" filter="s60" long-name="SSM Command Lists" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcmdlists/group"/>
-</component>
-<component name="ssmcustcmds" filter="s60" long-name="SSM Custom Commands" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcustcmds/group"/>
-</component>
-<component name="syslangutil" filter="s60" long-name="System Language Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/syslangutil/group"/>
-</component>
-<component name="sysrestart" filter="s60" long-name="System Restart" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysrestart/group"/>
-</component>
-<component name="sysuiprovider" filter="s60" long-name="System UI Provider" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysuiprovider/group"/>
-</component>
-<component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/group" mrp="os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
-</component>
-<component name="systemstatemgr" long-name="System State Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
-</component>
-<component name="systemstateplugins" long-name="System State Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
-</component>
-<component name="systemstatereferenceplugins" long-name="System State Reference Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
-</component>
-</collection>
-<collection name="resourceinterfaces" long-name="Resource Interfaces" level="hw-if">
-<component name="fmtransmittercontrol" long-name="FM Transmitter Control" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group" mrp="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
-</component>
-</collection>
-<collection name="systemhealthmanagement" long-name="System Health Management" level="server">
-<component name="systemhealthmgr" long-name="System Health Manager" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
-</component>
-</collection>
-<collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if"/>
-<collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
-<component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
-<collection name="authorisation" long-name="Authorisation" level="utilities">
-<component name="userpromptservice" long-name="User Prompt Service" introduced="^3" purpose="mandatory">
-<unit bldFile="os/security/authorisation/userpromptservice/group" mrp="os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
-</component>
-<component name="userpromptutils" long-name="User Prompt Utils" introduced="^3" purpose="optional">
-<unit bldFile="os/security/authorisation/userpromptutils/group" mrp="os/security/authorisation/userpromptutils/group/security_ups_utils.mrp"/>
-</component>
-</collection>
-<collection name="contentmgmt" long-name="Content Management" level="utilities">
-<component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
-<unit bldFile="os/security/contentmgmt/contentaccessfwfordrm/group" mrp="os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
-</component>
-<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">
-<unit bldFile="os/security/crypto/weakcryptospi/group" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
-</component>
-<component name="strongcryptospi" long-name="Strong Crypto SPI" filter="gt" introduced="^3" purpose="optional">
-<unit bldFile="os/security/crypto/weakcryptospi/strong" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
-</component>
-</collection>
-<collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
-<component name="securityutils" long-name="Security Utils" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/securityutils/group" mrp="os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
-</component>
-<component name="securitydocs" long-name="Security Documentation" purpose="development" class="doc">
-<unit mrp="os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
-</component>
-<component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
-</component>
-<component name="securitycommonutils" long-name="Security Common Utils" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/security/cryptomgmtlibs/securitycommonutils/group" mrp="os/security/cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
-</component>
-</collection>
-<collection name="securityanddataprivacytools" long-name="Security and Data Privacy Tools" level="services">
-<component name="securityconfig" long-name="Security Config" introduced="9.1" purpose="optional">
-<unit bldFile="os/security/securityanddataprivacytools/securityconfig/group" mrp="os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
-</component>
-<component name="securitytools" long-name="Security Tools" introduced="^3" purpose="optional" class="PC">
-<unit bldFile="os/security/securityanddataprivacytools/securitytools/group" mrp="os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
-</component>
-</collection>
-<collection name="cryptoplugins" long-name="Crypto Plugins" level="plugins">
-<component name="cryptospiplugins" long-name="Crypto SPI Plugins" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/security/cryptoplugins/cryptospiplugins/group" mrp="os/security/cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
-</component>
-</collection>
-<collection name="cryptoservices" long-name="Crypto Services" level="plugins">
-<component name="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/certificateandkeymgmt/group" mrp="os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
-</component>
-<component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
-</component>
-<component name="browserrootcertificates" long-name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
-<unit mrp="os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
-</component>
-<component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/asnpkcs/group" mrp="os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
-</component>
-</collection>
-<collection name="security_info" long-name="OS Security Info" level="utilities">
-<component name="security_metadata" long-name="OS Security Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/security/security_info/security_metadata/security_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
-<collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
-<component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
-</component>
-<component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
-</component>
-<component name="simulationpositioningmodule" long-name="Simulation Positioning Module" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
-</component>
-<component name="gpspositioningmodule" long-name="GPS/A-GPS Positioning Module" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/gpspositioningmodule/group" mrp="os/lbs/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
-</component>
-<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>
-</collection>
-<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
-<component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
-</component>
-</collection>
-<collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
-<component name="locationserver" long-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 name="networkrequesthandler" long-name="Network Request Handler" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
-</component>
-</collection>
-<collection name="lbstest" long-name="Locating Services Tests" level="application-interface">
-<component name="locationprotocoltest" long-name="Location Protocol Tests" introduced="9.2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/lbstest/locationprotocoltest/group" mrp="os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
-</component>
-</collection>
-<collection name="locationmgmt" long-name="Location Management" level="management">
-<component name="locmonitor" long-name="Location Monitor" introduced="^3" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
-</component>
-<component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/agpslocationmgr/group" mrp="os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
-</component>
-<component name="networklocationmgr" long-name="Network Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/networklocationmgr/group" mrp="os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
-</component>
-<component name="locationcore" long-name="Location Core" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locationcore/group" mrp="os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
-</component>
-<component name="networkgateway" long-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 name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
-<component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
-</component>
-<component name="suplrrlpasn1" filter="sf_build" long-name="SUPL RRLP ASN1 Parser">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
-</component>
-</collection>
-<collection name="lbsapitest" long-name="Location API Tests" level="application-interface"/>
-<collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
-<component name="lbs_metadata" long-name="Locating Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commsfw" level="services" long-name="Communications Framework" levels="server support framework process app-if">
-<collection name="commsprocess" long-name="Comms Process" level="process">
-<component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/commsfw/commsprocess/commsrootserverconfig/group" mrp="os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
-</component>
-</collection>
-<collection name="commsconfig" long-name="Comms Config" level="process">
-<component name="commsdatabase" long-name="Comms Database" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
-</component>
-<component name="commsdatabaseshim" long-name="Comms Database Shim" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/commsfw/commsconfig/commsdatabaseshim/group" mrp="os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
-</component>
-</collection>
-<collection name="datacommsserver" long-name="Data Comms Server" level="framework">
-<component name="esockserver" long-name="ESock Server" purpose="mandatory">
-<unit bldFile="os/commsfw/datacommsserver/esockserver/group" mrp="os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp" version="3"/>
-</component>
-<component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/group" mrp="os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
-</component>
-<component name="networkingdialogstub" long-name="Networking Dialog Stub" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/default" mrp="os/commsfw/datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
-</component>
-<component name="networkcontroller" long-name="Network Controller" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/datacommsserver/networkcontroller/group" mrp="os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
-</component>
-</collection>
-<collection name="serialserver" long-name="Serial Server" level="server">
-<component name="serialportcsy" long-name="Serial Port CSY" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/serialserver/serialportcsy" mrp="os/commsfw/serialserver/serialportcsy/ser-comms_serialportcsy.mrp"/>
-</component>
-<component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" purpose="development">
-<unit bldFile="os/commsfw/serialserver/packetloopbackcsy/group" mrp="os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
-</component>
-<component name="c32serialserver" long-name="C32 Serial Server" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/commsfw/serialserver/c32serialserver/group" mrp="os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
-</component>
-<component name="c32serialserverconfig" long-name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config">
-<unit bldFile="os/commsfw/serialserver/c32serialserverconfig" mrp="os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
-</component>
-<component name="c32serialserverdocs" long-name="C32 Serial Server Documentation" purpose="development" class="doc">
-<unit mrp="os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
-</component>
-</collection>
-<collection name="commsfwutils" long-name="Comms Framework Utilities" level="framework">
-<component name="commsbufs" long-name="Comms Buffers" introduced="^3" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwutils/commsbufs/group" mrp="os/commsfw/commsfwutils/commsbufs/group/comms-infras_commsbufs.mrp"/>
-</component>
-</collection>
-<collection name="commsfw_info" long-name="Comms Framework Info" level="app-if">
-<component name="commsinfrastructuredocs" long-name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
-<unit mrp="os/commsfw/commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
-</component>
-<component name="commsfw_metadata" long-name="Communications Framework Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/commsfw/commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
-</component>
-</collection>
-<collection name="commsfwsupport" long-name="Comms Framework Support" level="support">
-<component name="commselements" long-name="Comms Elements" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwsupport/commselements/group" mrp="os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
-</component>
-</collection>
-<collection name="commsinfrastructureapitest" long-name="Comms-Infras API Tests" level="app-if">
-<component name="commsinfrastructuresvs" long-name="Comms Infrastructure Verification Suite" introduced="^3" purpose="development">
-<unit mrp="os/commsfw/commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
-</component>
-</collection>
-<collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
-<component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
-</component>
-<component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" purpose="mandatory" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
-</component>
-<component name="commstools" long-name="Comms Tools" introduced="^3" purpose="development" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/commstools/group" mrp="os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
-</component>
-</collection>
-</block>
-<block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
-<component name="internetsockets" long-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>
-<collection name="tcpiputils" long-name="TCP/IP Utilities" level="plugin">
-<component name="dnd" long-name="DND" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/dnd/group" mrp="os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
-</component>
-<component name="dhcp" long-name="DHCP" introduced="8.0" purpose="optional">
-<unit bldFile="os/networkingsrv/tcpiputils/dhcp/group" mrp="os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
-</component>
-<component name="networkaddressandporttranslation" long-name="Network Address and Port Translation" introduced="^2" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
-</component>
-<component name="punycodeconv" long-name="Punycode Converter" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/punycodeconv/group" mrp="os/networkingsrv/tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
-</component>
-</collection>
-<collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
-<component name="nullagt" long-name="NULL AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/nullagt/group" mrp="os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
-</component>
-<component name="genericscprparameters" long-name="Generic SCPR Parameters" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/linklayercontrol/genericscprparameters/group" mrp="os/networkingsrv/linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
-</component>
-<component name="mbmsparameters" long-name="MBMS Parameters" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/mbmsparameters/group" mrp="os/networkingsrv/linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
-</component>
-<component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
-<unit bldFile="os/networkingsrv/linklayercontrol/networkinterfacemgr/group" mrp="os/networkingsrv/linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp" version="2"/>
-</component>
-</collection>
-<collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
-<component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
-</component>
-<component name="pppnif" long-name="PPP NIF" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/pppnif/group" mrp="os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp" version="2"/>
-</component>
-<component name="slipnif" long-name="SLIP NIF" purpose="development" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/slipnif/group" mrp="os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
-</component>
-<component name="tunnelnif" long-name="Tunnel NIF" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
-</component>
-</collection>
-<collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
-<component name="packetlogger" long-name="Packet Logger" introduced="8.1" purpose="development">
-<unit bldFile="os/networkingsrv/linklayerutils/packetlogger/group" mrp="os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
-</component>
-</collection>
-<collection name="networkcontrol" long-name="Network Control" level="plugin">
-<component name="qoslib" long-name="QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/qoslib/group" mrp="os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
-</component>
-<component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/pfqoslib/group" mrp="os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
-</component>
-<component name="qosfwprt" long-name="QoS Framework PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
-</component>
-<component name="qosipscpr" long-name="QoS IP SCPR" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosipscpr/group" mrp="os/networkingsrv/networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
-</component>
-<component name="ipnetworklayer" long-name="IP Network Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/ipnetworklayer/group" mrp="os/networkingsrv/networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
-</component>
-<component name="iptransportlayer" long-name="IP Transport Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/iptransportlayer/group" mrp="os/networkingsrv/networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
-</component>
-<component name="commsuserpromptmgr" long-name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkcontrol/commsuserpromptmgr/group" mrp="os/networkingsrv/networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
-</component>
-</collection>
-<collection name="networkprotocols" long-name="Network Protocols" level="plugin">
-<component name="ipeventnotifier" long-name="IP Event Notifier" introduced="8.1" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
-</component>
-<component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
-</component>
-<component name="iphook" long-name="IP Hook" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
-</component>
-<component name="mobileip" long-name="Mobile IP" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/mobileip/group" mrp="os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
-</component>
-<component name="dnsproxy" long-name="DNS Proxy" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/networkprotocols/dnsproxy/group" mrp="os/networkingsrv/networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
-</component>
-</collection>
-<collection name="networksecurity" long-name="Network Security" level="framework">
-<component name="tls" long-name="TLS" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tls/group" mrp="os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
-</component>
-<component name="tlsprovider" long-name="TLS Provider" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tlsprovider/group" mrp="os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
-</component>
-<component name="ipsec" long-name="IPsec" introduced="7.0" purpose="optional">
-<unit bldFile="os/networkingsrv/networksecurity/ipsec/group" mrp="os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
-</component>
-</collection>
-<collection name="networkingtestandutils" long-name="Networking Test and Utils" level="app-if">
-<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">
-<!-- production component: contains the IBY files -->
-<unit bldFile="os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
-</component>
-<component name="networkingdocs" long-name="Networking Documentation" purpose="development" class="doc">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
-</component>
-<component name="networkingsrv_metadata" long-name="Networking Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
-<component name="predictorcompression" long-name="Predictor Compression" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wlan" level="services" long-name="WLAN" levels="hw low mid high tools test">
-<collection name="wlan_plat" long-name="WLAN Platform Interfaces" level="test">
-<component name="wlan_dbif_api" long-name="WLAN DBIF API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_dbif_api/group"/>
-</component>
-<component name="wlan_hal_api" long-name="WLAN HAL API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hal_api/group"/>
-</component>
-<component name="wlan_management_api" long-name="WLAN Management API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_management_api/group"/>
-</component>
-<component name="wlan_device_settings_api" long-name="WLAN Device Settings API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_device_settings_api/group"/>
-</component>
-<component name="wlan_control_api" long-name="WLAN Control API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_control_api/group"/>
-</component>
-<component name="wlan_hw_initialization_data_api" long-name="WLAN Hardware Initialization Data API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hw_initialization_data_api/group"/>
-</component>
-<component name="wlan_power_save_plugin_api" long-name="WLAN Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_power_save_plugin_api/group"/>
-</component>
-<component name="wlan_info_api" long-name="WLAN Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_info_api/group"/>
-</component>
-<component name="wlan_agent_hotspot_plugin_api" long-name="WLAN Agent Hotspot Plug-in API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
-</component>
-<component name="wlan_osa_api" long-name="WLAN OSA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_osa_api/group"/>
-</component>
-<component name="wlan_spia_api" long-name="WLAN SPIA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_spia_api/group"/>
-</component>
-<component name="wlan_hpa_api" long-name="WLAN HPA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hpa_api/group"/>
-</component>
-<component name="wlan_eapol_plugin_api" long-name="WLAN EAPOL Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_eapol_plugin_api/group"/>
-</component>
-<component name="wlan_generic_plugin_api" long-name="WLAN Generic Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_generic_plugin_api/group"/>
-</component>
-<component name="wlan_aws_plugin_api" long-name="WLAN AWS Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_aws_plugin_api/group"/>
-</component>
-</collection>
-<collection name="wlan_pub" long-name="WLAN Public Interfaces" level="test">
-<component name="wlan_sdk_info_api" long-name="WLAN SDK Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_pub/wlan_sdk_info_api/group"/>
-</component>
-</collection>
-<collection name="wlan_bearer" long-name="WLAN Bearer" level="hw">
-<component name="wlanpsmplugin" filter="s60" long-name="WLAN PSM Plugin" plugin="Y">
-<unit bldFile="os/wlan/wlan_bearer/wlanpsmplugin/group"/>
-</component>
-<component name="wlanagent" filter="s60" long-name="WLAN Agent">
-<unit bldFile="os/wlan/wlan_bearer/wlanagent/group"/>
-</component>
-<component name="wlandbif_cd" filter="s60" long-name="WLAN CommsDat interface">
-<unit bldFile="os/wlan/wlan_bearer/wlandbif_cd/group"/>
-</component>
-<!-- should follow component directory rules for stuff in wlan_symbian/ and put in a single component or split up properly -->
-<component name="wlanengine" filter="s60" long-name="WLAN Engine">
-<unit bldFile="os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
-</component>
-<component name="wlanldd" filter="s60" long-name="WLAN LDD">
-<unit bldFile="os/wlan/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
-</component>
-<component name="wlannwif" filter="s60" long-name="WLAN Network Interface">
-<unit bldFile="os/wlan/wlan_bearer/wlannwif/group"/>
-</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="adaptation hw-if plugin framework server app-if">
-<collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
-<component name="basebandchanneladaptor" long-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 name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
-<component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
-</component>
-</collection>
-<collection name="smsprotocols" long-name="SMS Protocols" level="framework">
-<component name="smsstack" long-name="SMS Stack" introduced="6.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/cellularsrv/smsprotocols/smsstack/group" mrp="os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
-</component>
-</collection>
-<collection name="telephonyprotocols" long-name="Telephony Protocols" level="framework">
-<component name="csdagt" long-name="CSD AGT" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/csdagt/group" mrp="os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
-</component>
-<component name="psdagt" long-name="PSD AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/psdagt/group" mrp="os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
-</component>
-<component name="gprsumtsqosprt" long-name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
-</component>
-<component name="gprsumtsqosinterface" long-name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
-</component>
-<component name="qosextnapi" long-name="QoS Extn API" introduced="9.2" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
-</component>
-<component name="secondarypdpcontextumtsdriver" long-name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
-</component>
-<component name="qos3gppcpr" long-name="QoS 3GPP CPR" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
-</component>
-<component name="pdplayer" long-name="PDP Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/pdplayer/group" mrp="os/cellularsrv/telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
-</component>
-<component name="rawipnif" long-name="Raw IP NIF" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserver" long-name="Telephony Server" level="server">
-<component name="etelserverandcore" long-name="ETel Server and Core" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
-</component>
-<component name="etelmultimode" long-name="ETel Multimode" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelmultimode/group" mrp="os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
-</component>
-<component name="etelpacketdata" long-name="ETel Packet Data" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
-</component>
-<component name="etelsimtoolkit" long-name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
-<component name="common_tsy" long-name="Common TSY" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
-</component>
-<component name="licenseetsystub" long-name="Licensee TSY Stub" introduced="^2" purpose="development" filter="sf_build" plugin="Y">
-<unit mrp="os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="os/cellularsrv/telephonyserverplugins/licenseetsystub/group"/>
-</component>
-<component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
-</component>
-<component name="simtsy" long-name="SIM TSY" introduced="7.0" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
-</component>
-<component name="ctsydispatchlayer" long-name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
-</component>
-<component name="simatktsy" long-name="SIMATK TSY" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simatktsy/group" mrp="os/cellularsrv/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
-</component>
-</collection>
-<collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
-<component name="dial" long-name="Dial" deprecated="9.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyutils/dial/group" mrp="os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
-</component>
-<component name="telephonywatchers" long-name="Telephony Watchers" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
-</component>
-<component name="etel3rdpartyapi" long-name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrv_info" long-name="Cellular Baseband Services Info" level="app-if">
-<component name="telephonyconfidentialdocs" long-name="Telephony Confidential Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
-</component>
-<component name="telephonydocs" long-name="Telephony Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
-</component>
-<component name="cellularsrv_metadata" long-name="Cellular Baseband Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
-<component name="mocksy" long-name="MockSY" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if"/>
-</block>
-<block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
-<collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
-<component name="bluetooth_audio_adaptation_api" long-name="Bluetooth Audio Adaptation API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
-</component>
-<component name="bluetooth_power_management_api" long-name="Bluetooth Power Management API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_power_management_api/group"/>
-</component>
-<component name="at_command_handler_plugin_api" long-name="AT Command Handler Plugin API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/at_command_handler_plugin_api/group"/>
-</component>
-</collection>
-<collection name="bluetooth" long-name="Bluetooth Core" level="framework">
-<component name="btstack" long-name="Bluetooth Stack" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btstack" mrp="os/bt/bluetooth/btstack/bluetooth_stack.mrp"/>
-</component>
-<component name="btcomm" long-name="Bluetooth CSY" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetooth/btcomm" mrp="os/bt/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
-</component>
-<component name="btsdp" long-name="Bluetooth SDP" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btsdp" mrp="os/bt/bluetooth/btsdp/bluetooth_sdp.mrp"/>
-</component>
-<component name="btextnotifiers" long-name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btextnotifiers" mrp="os/bt/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
-</component>
-<component name="gavdp" long-name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/gavdp/group" mrp="os/bt/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
-</component>
-<component name="btlogger" long-name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btlogger/group" mrp="os/bt/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
-</component>
-<component name="btdocs" long-name="Bluetooth Documentation" purpose="development" class="doc">
-<unit mrp="os/bt/bluetooth/btdocs/bluetooth_documentation.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothmgmt" long-name="Bluetooth Management" level="plugin">
-<component name="btmgr" long-name="Bluetooth Manager" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btmgr" mrp="os/bt/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
-</component>
-<component name="btconfig" long-name="Bluetooth Config" purpose="optional" class="config">
-<unit bldFile="os/bt/bluetoothmgmt/btconfig" mrp="os/bt/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
-</component>
-<component name="btrom" long-name="Bluetooth ROM" introduced="9.1" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btrom" mrp="os/bt/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
-</component>
-<component name="bluetoothclientlib" long-name="Bluetooth Client Library" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/bluetoothclientlib" mrp="os/bt/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothcommsprofiles" long-name="Bluetooth Comms Profiles" level="app-if">
-<component name="btpan" long-name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetoothcommsprofiles/btpan/group" mrp="os/bt/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
-</component>
-</collection>
-<collection name="bthci" long-name="Host Controller Interface" level="server">
-<component name="bthci2" long-name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bthci/bthci2/group" mrp="os/bt/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
-</component>
-<component name="hciextensioninterface" long-name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bthci/hciextensioninterface" mrp="os/bt/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
-</component>
-<component name="hci2implementations" long-name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bthci/hci2implementations/group" mrp="os/bt/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
-</component>
-</collection>
-<collection name="irda" long-name="IrDA" level="plugin">
-<component name="irdastack" long-name="IrDA Stack" purpose="optional">
-<unit bldFile="os/bt/irda/irdastack/group" mrp="os/bt/irda/irdastack/group/infra-red_irda.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if"/>
-<collection name="atext" long-name="AT Extensions" level="server">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="atext_build" long-name="AT Extension Build" introduced="^3" purpose="optional" filter="s60">
-<unit bldFile="os/bt/atext/group"/>
-</component>
-</collection>
-<collection name="bt_info" long-name="Bluetooth Info" level="app-if">
-<component name="bt_metadata" long-name="Bluetooth Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/bt/bt_info/bt_metadata/bt_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
-<collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
-<!-- usbclientdrivers to be moved here from kernelhwsrv-->
-</collection>
-<collection name="usbmgmt" long-name="USB Management" level="server">
-<component name="usbmgr" long-name="USB Manager" purpose="optional">
-<unit bldFile="os/usb/usbmgmt/usbmgr/group" mrp="os/usb/usbmgmt/usbmgr/group/usb_manager.mrp" version="2"/>
-</component>
-<component name="usbclassandmgrdocs" long-name="USB Class and Manager Documentation" purpose="development" class="doc">
-<unit mrp="os/usb/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
-</component>
-</collection>
-<collection name="usb_info" long-name="USB Info" level="app-if">
-<component name="usb_metadata" long-name="USB Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/usb/usb_info/usb_metadata/usb_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="mm" level="services" long-name="Multimedia" levels="adaptation 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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-</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"/>
-</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"/>
-</component>
-<component name="aac_decoder_config_proxy_api" long-name="AAC Decoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/aac_decoder_config_proxy_api/group"/>
-</component>
-<component name="added_devsound_control_api" long-name="Added DevSound Control API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_api/group"/>
-</component>
-<component name="added_devsound_control_msg_hdlr_api" long-name="Added DevSound Control Msg Hdlr API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_msg_hdlr_api/group"/>
-</component>
-<component name="added_devsound_control_proxy_api" long-name="Added DevSound Control Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_proxy_api/group"/>
-</component>
-<component name="audio_effects_msg_hdlr_api" long-name="Audio Effects Message Handler API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_msg_hdlr_api/group"/>
-</component>
-<component name="audio_effects_proxy_api" long-name="Audio Effects Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_proxy_api/group"/>
-</component>
-<component name="audio_policy_header_api" long-name="Audio Policy Header API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="audio_routing_proxy_api" long-name="Audio Routing Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_routing_proxy_api/group"/>
-</component>
-<component name="custom_interface_builder_api" long-name="Custom Interface Builder API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_builder_api/group"/>
-</component>
-<component name="custom_interface_message_handler_factory_api" long-name="Custom Interface Message Handler Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_message_handler_factory_api/group"/>
-</component>
-<component name="custom_interface_proxy_factory_api" long-name="Custom Interface Proxy Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_proxy_factory_api/group"/>
-</component>
-<component name="custom_interface_utility_api" long-name="Custom Interface Utility API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_utility_api/group"/>
-</component>
-<component name="devsound_adaptation_api" long-name="DevSound Adaptation API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/devsound_adaptation_api/group"/>
-</component>
-<component name="display_posting_api" long-name="Display Posting API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="eaac_plus_decoder_interface_proxy_api" long-name="eAAC Plus Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="error_concealment_interface_proxy_api" long-name="Error Concealment Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
-</component>
-<component name="fm_radio_adaptation_api" long-name="FM Radio Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_decoder_interface_proxy_api" long-name="G711 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_encoder_interface_proxy_api" long-name="G711 Encoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_decoder_interface_proxy_api" long-name="G729 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_encoder_interface_msg_hdlr_api" long-name="G729 Encoder Interface Message Handler API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</component>
-<component name="ilbc_decoder_interface_proxy_api" long-name="Ilbc Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ilbc_encoder_interface_proxy_api" long-name="Ilbc Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="mdf_plugin_uids" long-name="MDF Plug-in UIDs" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/mdf_plugin_uids/group"/>
-</component>
-<component name="multimedia_fourcc_definitions_api" long-name="Multimedia FourCC Definitions API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/multimedia_fourcc_definitions_api/group"/>
-</component>
-<component name="nokia_audio_policy_header_api" long-name="Nokia Audio Policy Header API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/nokia_audio_policy_header_api/group"/>
-</component>
-<component name="nokia_multimedia_fourcc_definitions_api" long-name="Nokia Multimedia Fourcc Definitions API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ra8_decoder_interface_proxy_api" long-name="RA8 Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
-</component>
-<component name="rds_adaptation_api" long-name="RDS Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="restricted_audio_output_proxy_api" long-name="Restricted Audio Output Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="sbc_encoder_interface_proxy_api" long-name="SBC Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/sbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="secure_output_mdf_custom_interface" long-name="Secure Output MDF Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="speech_encoder_config_proxy_api" long-name="Speech Encoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/speech_encoder_config_proxy_api/group"/>
-</component>
-<component name="telephony_audio_routing_client_api" long-name="Telephony Audio Routing Client API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_client_api/group"/>
-</component>
-<component name="telephony_audio_routing_manager_api" long-name="Telephony Audio Routing Manager API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_manager_api/group"/>
-</component>
-<component name="video_buffer_management_mdf_custom_interface" long-name="Video Buffer Management MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_buffer_management_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_rotation_mdf_custom_interface" long-name="Video Decoder Rotation MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_scaling_mdf_custom_interface" long-name="Video Decoder Scaling MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
-</component>
-<component name="video_reclaim_extbuffers_ci" long-name="Video Reclaim Extbuffers Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_reclaim_extbuffers_ci/group"/>
-</component>
-<component name="video_window_control_custom_interface" long-name="Video Window Control Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="wma_decoder_interface_proxy_api" long-name="WMA Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/wma_decoder_interface_proxy_api/group"/>
-</component>
-<component name="eaacplusutil_api" long-name="EAac Plus Util API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/eaacplusutil_api/group"/>
-</component>
-<component name="frametable_api" long-name="Frametable API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/frametable_api/group"/>
-</component>
-</collection>
-<collection name="devsoundextensions" long-name="Devsound Extensions" level="device-fw">
-<component name="drmaudioplayer" filter="s60" long-name="DRM Audio Player">
-<unit bldFile="os/mm/devsoundextensions/drmaudioplayer/group"/>
-</component>
-<component name="mmextfw" filter="s60" long-name="Multimedia Extension Framework">
-<unit bldFile="os/mm/devsoundextensions/mmextfw/group"/>
-</component>
-<component name="audiorouting" filter="s60" long-name="Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/audiorouting/group"/>
-</component>
-<component name="effects" filter="s60" long-name="Effects">
-<unit bldFile="os/mm/devsoundextensions/effects/group"/>
-</component>
-<component name="effectspresets" filter="s60" long-name="Effects Presets">
-<unit bldFile="os/mm/devsoundextensions/effectspresets/group"/>
-</component>
-<component name="effectspresets_utils" filter="s60" long-name="Effects Presets Utils">
-<!-- need to #include the lot from a single bld.inf
- Also move to a standard component location, not under effectspresets -->
-<unit bldFile="os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
-<unit bldFile="os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
-</component>
-<component name="telephonyaudiorouting" filter="s60" long-name="Telephony Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/group"/>
-</component>
-<component name="mmfcustominterfaces" filter="s60" long-name="MMF Custom Interfaces">
-<unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/group"/>
-</component>
-<component name="addeddevsoundcontrol" filter="s60" long-name="Added DevSound Control">
-<unit bldFile="os/mm/devsoundextensions/addeddevsoundcontrol/group"/>
-</component>
-<component name="globalaudiosettings" filter="s60" long-name="Global Audio Settings">
-<unit bldFile="os/mm/devsoundextensions/globalaudiosettings/group"/>
-</component>
-<component name="restrictedaudiooutput" filter="s60" long-name="Restricted Audio Output">
-<unit bldFile="os/mm/devsoundextensions/restrictedaudiooutput/group"/>
-</component>
-<component name="ciextnfactoryplugins" filter="s60" long-name="Custom Interface Extension Factory Plugins" plugin="Y">
-<unit bldFile="os/mm/devsoundextensions/ciextnfactoryplugins/group"/>
-</component>
-</collection>
-<collection name="mdfdevvideoextensions" long-name="MDF Dev Video Extensions" level="device-fw">
-<component name="nga_mdf_postprocessor" long-name="NGA MDF Postprocessor" filter="s60">
-<unit bldFile="os/mm/mdfdevvideoextensions/nga_mdf_postprocessor/group"/>
-</component>
-</collection>
-<collection name="audio" long-name="Audio Codecs" level="middleware">
-<component name="arm_cmmf_codecs" filter="s60" long-name="ARM CMMF Codecs" plugin="Y">
-<unit bldFile="os/mm/audio/arm_cmmf_codecs/group"/>
-</component>
-</collection>
-<collection name="video" long-name="Video Codecs" level="middleware">
-<!-- empty -->
-</collection>
-<collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
-<component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/imagingandcamerafws/imagingfws/group" mrp="os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
-</component>
-<component name="camerafw" long-name="Camera Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/imagingandcamerafws/camerafw/group" mrp="os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
-</component>
-</collection>
-<collection name="mmlibs" long-name="Multimedia Libraries" level="middleware">
-<component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmutilitylib/group" mrp="os/mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
-</component>
-<component name="mmfw" long-name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmfw/group" mrp="os/mm/mmlibs/mmfw/group/multimedia_mmf.mrp"/>
-</component>
-</collection>
-<collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
-<component name="imagingplugins" long-name="Imaging Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/imagingplugins/group" mrp="os/mm/mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
-</component>
-<component name="cameraplugins" long-name="Camera Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/cameraplugins/group" mrp="os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
-</component>
-<component name="lib3gp" long-name="3GP Library" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/mmplugins/lib3gp/group" mrp="os/mm/mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
-</component>
-<component name="mmfwplugins" long-name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/mmfwplugins/group" mrp="os/mm/mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
-</component>
-</collection>
-<collection name="mm_info" long-name="Multimedia Info" level="app-if">
-<component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc">
-<unit mrp="os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
-</component>
-<component name="mm_metadata" long-name="Multimedia Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
-<component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="^2" purpose="development">
-<unit bldFile="os/mm/mmresourcemgmt/mmresctrl/group" mrp="os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
-</component>
-</collection>
-<collection name="mmdevicefw" long-name="Multimedia Device Framework" level="device-fw">
-<component name="mdf" long-name="Media Device Framework" introduced="9.2" purpose="mandatory">
-<unit bldFile="os/mm/mmdevicefw/mdf/group" mrp="os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
-</component>
-<component name="speechrecogsupport" long-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 name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
-<component name="videorenderer" long-name="Video Renderer" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/mmswadaptation/videorenderer/group" mrp="os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
-</component>
-</collection>
-<collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw"/>
-<collection name="omxil" long-name="OpenMAX IL" level="hw-if">
-<component name="omxilapi" long-name="OpenMAX IL API" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilapi/group" mrp="os/mm/omxil/omxilapi/group/multimedia_omx_il_api.mrp" version="1"/>
-</component>
-<component name="omxilcore" long-name="OpenMAX IL Core" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcore/group" mrp="os/mm/omxil/omxilcore/group/multimedia_omx_il_core.mrp" version="1"/>
-</component>
-<component name="omxilcomponentcommon" long-name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcomponentcommon/group" mrp="os/mm/omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp" version="1"/>
-</component>
-<component name="omxilrefcomps" long-name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilrefcomps/ref_components/group" mrp="os/mm/omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp" version="1"/>
-</component>
-<component name="mmilapi" long-name="Multimedia Integration Layer API" introduced="^3" purpose="development">
-<unit bldFile="os/mm/omxil/mmilapi/group" mrp="os/mm/omxil/mmilapi/group/multimedia_il_api.mrp"/>
-</component>
-</collection>
-<collection name="devsound" long-name="Sound Device" level="devices">
-<component name="devsoundapi" long-name="DevSound API" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/devsound/devsoundapi/group" mrp="os/mm/devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
-</component>
-<component name="a3fdevsound" long-name="A3F DevSound" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3fdevsound/group" mrp="os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
-</component>
-<component name="a3facf" long-name="A3F Audio Component Framework" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3facf/group" mrp="os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
-</component>
-<component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/devsound/devsoundpluginsupport/group" mrp="os/mm/devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
-</component>
-<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">
-<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">
-<unit bldFile="os/mm/devsound/a3ftrace/group" mrp="os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
-</component>
-<component name="a3fsrvstart" long-name="A3F Server Start" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
-</component>
-</collection>
-<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
-<component name="devsoundhwdeviceapi" long-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 name="a3facl" long-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 name="a3fdevsoundcustomisation" long-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"/>
-</component>
-<component name="refacladapt" long-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"/>
-</component>
-<component name="videohai" long-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 name="dvbhreceiverhai" long-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>
-</block>
-<block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
-<collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
-<component name="exif_api" long-name="Exif API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagingext_plat" long-name="Imaging Extensions Platform Interfaces" level="app-if">
-<component name="jpeg2000_icl_plugin_api" long-name="JPEG2000 ICL plugin API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/jpeg2000_icl_plugin_api/group"/>
-</component>
-<component name="extended_icl_jpeg_api" long-name="Extended ICL Jpeg API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
-</component>
-<component name="h324_annex_k_custom_api" long-name="H324 Annex K Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/h324_annex_k_custom_api/group"/>
-</component>
-<component name="ecam_orientation_custom_api" long-name="ECam Orientation Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_orientation_custom_api/group"/>
-</component>
-<component name="ecam_ui_orientation_override_custom_api" long-name="ECam UI Orientation Override Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
-</component>
-<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>
-</collection>
-<collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
-<component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
-<unit bldFile="os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
-</component>
-<component name="imageadaptationextensions_build" filter="s60" long-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"/>
-</component>
-</collection>
-<collection name="imagingmodules" long-name="Imaging Modules" level="hw-if">
-<component name="exiflib" filter="s60" long-name="Exif Library">
-<unit bldFile="os/imagingext/imagingmodules/exiflib/group"/>
-</component>
-<component name="jp2kcodec" filter="s60" long-name="JPEG2000 Decoder Plugin" plugin="Y">
-<unit bldFile="os/imagingext/imagingmodules/jp2kcodec/group"/>
-</component>
-</collection>
-</block>
-<block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
-<component name="vgi" filter="s60" long-name="VGI">
-<unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
-</component>
-</collection>
-<collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adaptations">
-<component name="m3gcore11" filter="s60" long-name="M3G Core 1.1">
-<unit bldFile="os/graphics/m3g/m3gcore11/group"/>
-</component>
-</collection>
-<collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines">
-<component name="graphicsresource" long-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 name="graphicsresourceadaptation" long-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"/>
-</component>
-<component name="graphicsresourceimplementation" long-name="Graphics Resource Implementation" introduced="^4" purpose="optional">
-<unit bldFile="os/graphics/graphicsresourceservices/graphicsresourceimplementation/group" mrp="os/graphics/graphicsresourceservices/graphicsresourceimplementation/group/graphics_graphicsresourceimplementation.mrp"/>
-</component>
-<component name="graphicsresourceinterface" long-name="Graphics Resource Interface" introduced="^4" purpose="optional">
-<unit bldFile="os/graphics/graphicsresourceservices/graphicsresourceinterface/group" mrp="os/graphics/graphicsresourceservices/graphicsresourceinterface/group/graphics_graphicsresourceinterface.mrp"/>
-</component>
-</collection>
-<collection name="graphicsutils" long-name="Graphics Utils" level="engines">
-<component name="commongraphicsheaders" long-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 name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
-<!-- displayldd to be moved here -->
-<component name="surfacemgr" long-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 name="graphicscomposition" long-name="Graphics Composition" level="engines">
-<component name="openwfcinterface" long-name="OpenWF Composition Interface" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfcinterface/group" mrp="os/graphics/graphicscomposition/openwfcinterface/group/graphics_openwfcinterface.mrp"/>
-</component>
-<component name="openwfcompositionengine" long-name="OpenWF Composition Engine" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/graphicscomposition/openwfcompositionengine/group" mrp="os/graphics/graphicscomposition/openwfcompositionengine/group/graphics_openwfcompositionengine.mrp"/>
-</component>
-<component name="openwfsupport" long-name="OpenWF Support" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfsupport/group" mrp="os/graphics/graphicscomposition/openwfsupport/group/graphics_openwfsupport.mrp"/>
-</component>
-<component name="surfaceupdate" long-name="Surface Update" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/surfaceupdate/group" mrp="os/graphics/graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
-</component>
-</collection>
-<collection name="graphicstest" long-name="Graphics Test" level="app-if">
-<component name="uibench" long-name="UI Bench" introduced="9.2" purpose="development">
-<unit bldFile="os/graphics/graphicstest/uibench/group" mrp="os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
-</component>
-</collection>
-<collection name="graphics_plat" long-name="Graphics Platform Interfaces" level="app-if">
-<component name="m3g_core_api" filter="sf_build" long-name="M3G Core API" class="api">
-<unit bldFile="os/graphics/graphics_plat/m3g_core_api/group"/>
-</component>
-</collection>
-<collection name="graphics_info" long-name="Graphics Info" level="app-if">
-<component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc">
-<unit mrp="os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
-</component>
-<component name="graphics_metadata" long-name="Graphics Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
-</component>
-</collection>
-<collection name="windowing" long-name="Windowing" level="app-if">
-<component name="windowserver" long-name="Window Server" purpose="mandatory">
-<unit bldFile="os/graphics/windowing/windowserver/group" mrp="os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
-</component>
-<component name="windowserverplugins" long-name="Window Server Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/windowing/windowserverplugins/group" mrp="os/graphics/windowing/windowserverplugins/group/graphics_wserv_std_plugins.mrp"/>
-</component>
-</collection>
-<collection name="printingservices" long-name="Printing Services" level="app-if">
-<component name="printerdriversupport" long-name="Printer Driver Support" purpose="optional">
-<unit bldFile="os/graphics/printingservices/printerdriversupport/group" mrp="os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
-</component>
-<component name="printerdrivers" long-name="Printer Drivers" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/printingservices/printerdrivers/group" mrp="os/graphics/printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
-</component>
-</collection>
-<collection name="fbs" long-name="Font and Bitmap Server" level="device-interface">
-<component name="fontandbitmapserver" long-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 name="opengles" long-name="OpenGLES" level="internal-adaptations">
-<component name="openglesinterface" long-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 name="opengles_stub" filter="sf_build" long-name="OpenGL ES Stub" purpose="optional" introduced="^2">
-<unit bldFile="os/graphics/opengles/openglesinterface/group/opengles_stub"/>
-</component>
-</collection>
-<collection name="openvg" long-name="OpenVG" level="internal-adaptations">
-<component name="openvginterface" long-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 name="openvg11" filter="s60" long-name="OpenVG 1.1">
-<!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
-<unit bldFile="os/graphics/openvg/openvginterface/group/openvg11"/>
-</component>
-<component name="sfopenvg" filter="sf_build" long-name="Khronos OpenVG Reference Implementation" introduced="^2" purpose="optional">
-<unit bldFile="os/graphics/openvg/openvgrefimplementation/sfopenvg/group"/>
-</component>
-</collection>
-<collection name="egl" long-name="EGL" level="internal-adaptations">
-<component name="eglinterface" long-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 name="eglswitch" long-name="EGL Switch" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglswitch/group" mrp="os/graphics/egl/eglswitch/group/graphics_eglswitch.mrp"/>
-</component>
-<component name="eglrefimpl" long-name="EGL Reference Implementation" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglrefimpl/group" mrp="os/graphics/egl/eglrefimpl/group/graphics_eglrefimpl.mrp"/>
-</component>
-<component name="egltest" long-name="EGL Tests" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/egl/egltest/group" mrp="os/graphics/egl/egltest/group/graphics_egltest.mrp"/>
-</component>
-</collection>
-<collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
-<component name="gdi" long-name="GDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/gdi/group" mrp="os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
-</component>
-<component name="bitgdi" long-name="BitGDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
-</component>
-<component name="colourpalette" long-name="Colour Palette" introduced="7.0s" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
-</component>
-<component name="screendriver" long-name="Screen Driver" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/graphicsdeviceinterface/screendriver/group" mrp="os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
-</component>
-<component name="directgdi" long-name="DirectGDI" introduced="^3" deprecated="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/directgdi/group" mrp="os/graphics/graphicsdeviceinterface/directgdi/group/graphics_directgdi.mrp"/>
-</component>
-<component name="directgdiinterface" long-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 name="directgdiadaptation" long-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"/>
-</component>
-</collection>
-<collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
-<component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/gdi_tools/group" mrp="os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
-</component>
-</collection>
-<collection name="graphicsapitest" long-name="Graphics API Tests" level="app-if"/>
-</block>
-<block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
-<collection name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" level="text">
-<component name="findutil_api" long-name="Find Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/findutil_api/group"/>
-</component>
-<component name="japanese_language_utilities_api" long-name="Japanese Language Utilities API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
-</component>
-<component name="sortutil_api" long-name="Sorting Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/sortutil_api/group"/>
-</component>
-</collection>
-<collection name="textandloc_pub" long-name="Text and Localisation Public Interfaces" level="text">
-<component name="directory_localizer_api" long-name="Directory Localizer API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_pub/directory_localizer_api/group"/>
-</component>
-</collection>
-<collection name="charconvfw" long-name="Character Conversion" level="encoding">
-<component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional">
-<unit bldFile="os/textandloc/charconvfw/charconv_fw/group" mrp="os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
-</component>
-<component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/charconvplugins/group" mrp="os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
-</component>
-<component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/fatfilenameconversionplugins/group" mrp="os/textandloc/charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
-</component>
-</collection>
-<collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
-<component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/textshaperplugin/group" mrp="os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
-</component>
-<component name="fontstore" long-name="Font Store" purpose="mandatory">
-<unit bldFile="os/textandloc/fontservices/fontstore/group" mrp="os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
-</component>
-<component name="textrendering" long-name="Text Rendering" purpose="mandatory" class="placeholder">
-<!-- placeholder for text code from GDI -->
-</component>
-<component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/freetypefontrasteriser/group" mrp="os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
-</component>
-<component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional">
-<unit bldFile="os/textandloc/fontservices/referencefonts/group" mrp="os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
-</component>
-</collection>
-<collection name="textlayout" long-name="Text Layout" level="text">
-<component name="texthandling" long-name="Text Handling" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/texthandling/group" mrp="os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
-</component>
-<component name="textformatting" long-name="Text Formatting" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/textformatting/group" mrp="os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
-</component>
-</collection>
-<collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
-<!-- components in this collection need to be moved to the right collection.
- Either move into the units' directories, or create a new textandlocutils directory -->
-<component name="numbergrouping" filter="s60" long-name="Number Grouping">
-<unit bldFile="os/textandloc/charconvfw/numbergrouping/group"/>
-</component>
-<component name="jplangutil" filter="s60" long-name="Japanese Language Utilities">
-<unit bldFile="os/textandloc/charconvfw/jplangutil/group"/>
-</component>
-<component name="sortutil" filter="s60" long-name="Sorting Utility">
-<unit bldFile="os/textandloc/charconvfw/sortutil/group"/>
-</component>
-<component name="inlinetext" filter="s60" long-name="Inline Text">
-<unit bldFile="os/textandloc/charconvfw/inlinetext/group"/>
-</component>
-<component name="nearestlangutil" long-name="Nearest Language Util" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-<component name="numberformatting" long-name="Number Formatting" introduced="7.0s" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/numberformatting/group" mrp="os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
-</component>
-</collection>
-<collection name="localesupport" long-name="Locale Support" level="util">
-<component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/localisation/localesupport" mrp="os/textandloc/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
-</component>
-<component name="initlocale" long-name="Initialise Locale" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-</collection>
-<collection name="textandloctools" long-name="Text and Localisation Tools" level="tools">
-<component name="fontcompiler" long-name="Font Compiler" purpose="development" class="placeholder PC">
-<!-- placeholder for split from GDI Tools -->
-</component>
-<component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/bitmapfonttools/group" mrp="os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
-</component>
-</collection>
-<collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
-<component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
-<collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
-<component name="xmlsrv_plat_build" long-name="XML Services Platform Interface Build" filter="s60" class="api">
-<!-- need to fix the configuration used here.
- Either destribute to other components or use the new feature flags confguration mechanisms.
- Remove this component and uncomment the other units when fixed-->
-<unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
-</component>
-<component name="xml_encryption_api" long-name="XML Encryption API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/> -->
-</component>
-<component name="xml_signature_api" long-name="XML Signature API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_signature_api/group"/> -->
-</component>
-<component name="xml_security_engine_utils_api" long-name="XML Security Engine Utils API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/> -->
-</component>
-</collection>
-<collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
-<component name="xmlseccertman" filter="s60" long-name="XML Security Certificate Manager">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
-</component>
-<component name="xmlsec" filter="s60" long-name="XML Security">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsec/group"/>
-</component>
-<component name="xmlseccrypto" filter="s60" long-name="XML Security Crypto">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccrypto/group"/>
-</component>
-<component name="xmlsecwrapper" filter="s60" long-name="XML Security Wrapper">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsecwrapper/group"/>
-</component>
-</collection>
-<collection name="xml" long-name="XML" level="generic">
-<component name="xmlfw" long-name="XML Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmlfw/group" mrp="os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
-</component>
-<component name="libxml2libs" long-name="Libxml2 Libraries" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/libxml2libs/group" mrp="os/xmlsrv/xml/libxml2libs/group/syslibs_libxml2.mrp"/>
-</component>
-<component name="legacyminidomparser" long-name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/legacyminidomparser/GROUP" mrp="os/xmlsrv/xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp"/>
-</component>
-<component name="xmldomandxpath" long-name="XML DOM and XPath" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmldomandxpath/group" mrp="os/xmlsrv/xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
-</component>
-<component name="xmlexpatparser" long-name="XML Expat Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmlexpatparser/group" mrp="os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
-</component>
-<component name="xmllibxml2parser" long-name="XML Libxml2 Parser" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmllibxml2parser/group" mrp="os/xmlsrv/xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
-</component>
-<component name="wbxmlparser" long-name="WBXML Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/wbxmlparser/group" mrp="os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
-</component>
-</collection>
-<collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
-<component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="deviceplatformrelease" level="services" long-name="Device Platform Release" levels="bld mid top">
-<collection name="s60extras" long-name="S60 Extras" level="mid">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="s60extras_build" filter="s60" long-name="S60 Extras Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/S60Extras/group"/>
-</component>
-</collection>
-<collection name="version" long-name="Version" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="version_build" filter="s60" long-name="Version Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/Version/group"/>
-</component>
-</collection>
-<collection name="helps_loc2" long-name="Helps Locale 2" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helps_loc2_build" long-name="Helps Locale 2 Build" filter="s60">
-<unit bldFile="os/deviceplatformrelease/helps_loc2/group"/>
-</component>
-</collection>
-<collection name="sf_config" long-name="SF Config" level="mid">
-<component name="config" filter="s60" long-name="Config" purpose="development" class="config"/>
-<component name="cenrep" filter="sf_build" long-name="ConE Central Repository Config" purpose="development" class="config">
-<!-- will should give the id/path something more unique than cenrep -->
-<unit bldFile="os/deviceplatformrelease/sf_config/cenrep/group"/>
-</component>
-<component name="rombuild_syborg" filter="sf_build" long-name="Syborg iMaker Config" purpose="development" introduced="^3" class="config">
-<unit bldFile="os/deviceplatformrelease/sf_config/rombuild/syborg/group"/>
-</component>
-<component name="rombuild_zoom2" filter="sf_build" long-name="Zoom2 iMaker Config" purpose="development" introduced="^3" class="config">
-<unit bldFile="os/deviceplatformrelease/sf_config/rombuild/zoom2/group"/>
-</component>
-</collection>
-<!-- should be located locally in buildplatforms/group
- <collection id="s60bld" name="S60 Build">
- <component id="buildplatforms" filter="s60" name="Build Platforms">
- <unit bldFile="/tools/buildplatforms/group"/>
- </component>
- </collection>-->
-<collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
-<component name="cedarutils" long-name="Cedar Utils" purpose="development">
-<unit mrp="os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
-</component>
-<component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt" purpose="development" class="config">
-<unit mrp="os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
-</component>
-<component name="foundation_s60_packages" long-name="Foundation S60 Packages" introduced="^3" deprecated="^3" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/symbianosbld/foundation_s60_packages/foundation_s60_packages.mrp"/>
-</component>
-</collection>
-<collection name="foundation_system" long-name="Foundation System" level="top">
-<component name="system_model" long-name="System Model" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
-</component>
-</collection>
-<collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
-<component name="deviceplatformrelease_metadata" long-name="Device Platform Release Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="osrndtools" level="services" long-name="OS R&D tools" levels="fw trace">
-<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"/>
-</component>
-<component name="testinterface" filter="s60" long-name="Test Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/testinterface/group"/>
-</component>
-<component name="testserver" filter="s60" long-name="Test Server" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserver/group"/>
-</component>
-<component name="testengine" filter="s60" long-name="Test Engine" purpose="development">
-<unit bldFile="os/osrndtools/stif/testengine/group"/>
-</component>
-<component name="testserverstarter" filter="s60" long-name="Test Server Starter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserverstarter/group"/>
-</component>
-<component name="stiftfwif" filter="s60" long-name="STIF Test Framework Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/stiftfwif/group"/>
-</component>
-<component name="consoleui" filter="s60" long-name="Console UI" purpose="development">
-<unit bldFile="os/osrndtools/stif/consoleui/group"/>
-</component>
-<component name="testcombiner" filter="s60" long-name="Test Combiner" purpose="development">
-<unit bldFile="os/osrndtools/stif/testcombiner/group"/>
-</component>
-<component name="demomodule" filter="s60" long-name="Demo Module" purpose="development">
-<unit bldFile="os/osrndtools/stif/demomodule/group"/>
-</component>
-<component name="atslogger" filter="s60" long-name="ATS Logger" purpose="development">
-<unit bldFile="os/osrndtools/stif/atslogger/group"/>
-</component>
-<component name="atsinterface" filter="s60" long-name="ATS Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/atsinterface/group"/>
-</component>
-<component name="testscripter" filter="s60" long-name="Test Scripter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testscripter/group"/>
-</component>
-<component name="suevent" filter="s60" long-name="SU Event" purpose="development">
-<unit bldFile="os/osrndtools/stif/suevent/group"/>
-</component>
-<component name="stifkerneltestclassbase" filter="s60" long-name="STIF Kernel Test Class Base" purpose="development">
-<!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
-<!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
-</component>
-<component name="stif_build" filter="s60" long-name="STIF Build" purpose="development">
-<!-- move exports into self-contained component. Remove this when configuration is in place-->
-<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">
-<unit bldFile="os/osrndtools/memspy/memspy_plat/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/engine/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/console/group"/>
-</component>
-<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>
-</collection>
-<collection name="hti" long-name="Harmonized Test Interface" level="trace">
-<component name="hti_plat" filter="s60" long-name="HTI Platform Interfaces" purpose="development" class="api">
-<unit bldFile="os/osrndtools/hti/hti_plat/group"/>
-</component>
-<component name="hticfg" filter="s60" long-name="HTI Config" purpose="development">
-<unit bldFile="os/osrndtools/hti/hticfg/group"/>
-</component>
-<component name="htiautostart" filter="s60" long-name="HTI Autostart" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiautostart/group"/>
-</component>
-<component name="htiframework" filter="s60" long-name="HTI Framework" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiframework/group"/>
-</component>
-<component name="hticommplugins" filter="s60" long-name="HTI Communication Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
-</component>
-<component name="htiserviceplugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
-</component>
-<component name="htifilehlp" filter="s60" long-name="HTI File Help" purpose="development">
-<unit bldFile="os/osrndtools/hti/htifilehlp/group"/>
-</component>
-<component name="htiwatchdog" filter="s60" long-name="HTI Watchdog" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiwatchdog/group"/>
-</component>
-<component name="hti_build" filter="s60" long-name="HTI Build" purpose="development">
-<!-- move exports into self-contained component.-->
-<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">
-<block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
-<collection name="appsupport_pub" long-name="Generic Application Support Public Interfaces" level="specific">
-<component name="flash_viewer_framework_api" long-name="Flash Viewer Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
-</component>
-<component name="network_status_api" long-name="Network Status API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/network_status_api/group"/>
-</component>
-</collection>
-<collection name="appsupport_plat" long-name="Generic Application Support Platform Interfaces" level="specific">
-<component name="action_plugin_api" long-name="Action Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/action_plugin_api/group"/>
-</component>
-<component name="application_orientation_api" long-name="Application Orientation API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/application_orientation_api/group"/>
-</component>
-<component name="context_access_api" long-name="Context Access API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_access_api/group"/>
-</component>
-<component name="context_framework_services_api" long-name="Context Framework Services API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_services_api/group"/>
-</component>
-<component name="context_framework_client_api" long-name="Context Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_client_api/group"/>
-</component>
-<component name="context_framework_listener_api" long-name="Context Framework Listener API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_listener_api/group"/>
-</component>
-<component name="context_framework_version_api" long-name="Context Framework Version API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_version_api/group"/>
-</component>
-<component name="context_source_plugin_api" long-name="Context Source Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_plugin_api/group"/>
-</component>
-<component name="context_source_settings_manager_api" long-name="Context Source Settings Manager API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_settings_manager_api/group"/>
-</component>
-<component name="context_subscription_api" long-name="Context Subscription API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_subscription_api/group"/>
-</component>
-<component name="key_event_framework_api" long-name="Key Event Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_api/group"/>
-</component>
-<component name="key_event_framework_mapper_api" long-name="Key Event Framework Mapper API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_mapper_api/group"/>
-</component>
-<component name="media_keys_definition_api" long-name="Media Keys Definition API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/media_keys_definition_api/group"/>
-</component>
-<component name="ood_threshold_api" long-name="OOD Threshold API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/ood_threshold_api/group"/>
-</component>
-<component name="oom_monitor_api" long-name="OOM Monitor API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_api/group"/>
-</component>
-<component name="oom_monitor_plugin_api" long-name="OOM Monitor Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_plugin_api/group"/>
-</component>
-<component name="operation_provider_api" long-name="Operation Provider API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/operation_provider_api/group"/>
-</component>
-<component name="phonecmdhandler_api" long-name="Phone Command Handler API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/phonecmdhandler_api/group"/>
-</component>
-<component name="restore_factory_settings_api" long-name="Restore Factory Settings API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_api/group"/>
-</component>
-<component name="restore_factory_settings_plugin_api" long-name="Restore Factory Settings Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_plugin_api/group"/>
-</component>
-<component name="secondary_display_accfw_api" long-name="Secondary Display Accessory Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_accfw_api/group"/>
-</component>
-<component name="secondary_display_startup_api" long-name="Secondary Display Startup API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_startup_api/group"/>
-</component>
-<component name="secondary_display_sysap_api" long-name="Secondary Display System Application API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_sysap_api/group"/>
-</component>
-<component name="secondary_display_system_state_api" long-name="Secondary Display System State API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_system_state_api/group"/>
-</component>
-<component name="sensor_user_setting_api" long-name="Sensor User Setting API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/sensor_user_setting_api/group"/>
-</component>
-<component name="startup_configuration_api" long-name="Startup Configuration API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/startup_configuration_api/group"/>
-</component>
-<component name="system_application_key_handler_plugin_api" long-name="System Application Key Handler Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_key_handler_plugin_api/group"/>
-</component>
-<component name="system_application_light_control_plugin_api" long-name="System Application Light Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_light_control_plugin_api/group"/>
-</component>
-<component name="system_application_notification_api" long-name="System Application Notification API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_notification_api/group"/>
-</component>
-<component name="system_application_plugin_callback_api" long-name="System Application Plug-in Callback API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
-</component>
-<component name="flash_mmi_service_interface_custom_api" long-name="Flash MMI Service Interface Custom API" filter="s60,!sf_build" introduced="^2" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/flash_mmi_service_interface_custom_api/group"/>
-</component>
-<component name="flash_netscape_plugin_command_api" long-name="Flash Netscape Plugin Command API" filter="s60,!sf_build" introduced="^2" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/flash_netscape_plugin_command_api/group"/>
-</component>
-</collection>
-<collection name="contextframework" long-name="Context Framework" level="framework">
-<!-- the units that are commented out need to be put back when configuration is in place.
- They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
-<component name="cfw" filter="s60" long-name="Context Framework">
-<!--<unit bldFile="contextframework/cfw/group"/> -->
-</component>
-<component name="cfwplugins" filter="s60" long-name="Context Framework Plugins" plugin="Y">
-<!--<unit bldFile="contextframework/cfwplugins/group"/>-->
-</component>
-<component name="contextframework_build" filter="s60" long-name="Context Framework Build">
-<unit bldFile="mw/appsupport/contextframework/group"/>
-</component>
-</collection>
-<collection name="coreapplicationuis" long-name="Core Application UIs" level="server">
-<component name="dbrecovery" filter="s60" long-name="Database Recovery">
-<unit bldFile="mw/appsupport/coreapplicationuis/dbrecovery/group"/>
-</component>
-<component name="nspswsplugin" filter="s60" long-name="NSPS WS Plugin" plugin="Y">
-<!-- No Service Power Save? Window Server? Please elaborate-->
-<unit bldFile="mw/appsupport/coreapplicationuis/nspswsplugin/group"/>
-</component>
-<component name="rfs" filter="s60" long-name="Restore Factory Settings">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfs/group"/>
-</component>
-<component name="rfsplugins" filter="s60" long-name="Restore Factory Settings Plugins" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/group"/>
-</component>
-<component name="sysap" filter="s60" long-name="System Application">
-<unit bldFile="mw/appsupport/coreapplicationuis/sysap/group"/>
-</component>
-<component name="variatedsettings" filter="s60" long-name="Variated Settings" class="config">
-<unit bldFile="mw/appsupport/coreapplicationuis/variatedsettings/group"/>
-</component>
-<component name="accfwuinotifier" filter="s60" long-name="Accessory Framework UI Notifier" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/accfwuinotifier/group"/>
-</component>
-<component name="kefmapper" filter="s60" long-name="Key Event Framework">
-<unit bldFile="mw/appsupport/coreapplicationuis/kefmapper/group"/>
-</component>
-<component name="advancedtspcontroller" filter="s60" long-name="Advanced TSP Controller">
-<unit bldFile="mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
-</component>
-<component name="powersaveutilities" filter="s60" long-name="Power Save Utilities">
-<unit bldFile="mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
-</component>
-<component name="gsserverenginestub" filter="s60" long-name="GS Server Engine Stub">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
-</component>
-<component name="gsserverengine" filter="s60" long-name="GS Server Engine">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverengine/group"/>
-</component>
-<component name="sensordatacompensatorplugin" filter="s60" long-name="Sensor Data Compensator Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/group"/>
-</component>
-<component name="atcmdplugin" long-name="AT Command Plugin" filter="s60,!oem_build" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/atcmdplugin/group"/>
-</component>
-</collection>
-<collection name="flashliteapi_3_1" long-name="Flash Lite API 3.1" level="specific">
-<!-- collection is really a component. Move down a directory -->
-<component name="flashliteapi_3_1_build" long-name="Flash Lite API Build" filter="s60" introduced="^2"/>
-</collection>
-<collection name="mediakeys" long-name="Media Keys" level="plugin">
-<!-- collection is really a component. Move down a directory -->
-<component name="mediakeys_build" filter="s60" long-name="Media Keys Build">
-<unit bldFile="mw/appsupport/mediakeys/group"/>
-</component>
-</collection>
-<collection name="startupservices" long-name="Startup Services" level="system">
-<component name="splashscreen" filter="s60" long-name="Splash Screen">
-<unit bldFile="mw/appsupport/startupservices/splashscreen/group"/>
-</component>
-<component name="startupanimation" filter="s60" long-name="Startup Animation">
-<unit bldFile="mw/appsupport/startupservices/startupanimation/group"/>
-</component>
-<component name="startup" long-name="Startup Application" filter="s60">
-<unit bldFile="mw/appsupport/startupservices/startup/group"/>
-</component>
-</collection>
-<collection name="sysresmonitoring" long-name="System Resource Monitoring" level="system">
-<component name="oodmonitor" filter="s60" long-name="OOD Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oodmonitor/group"/>
-</component>
-<component name="oommonitor" filter="s60" long-name="OOM Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oommonitor/group"/>
-</component>
-</collection>
-<collection name="systemsettings" long-name="System Settings" level="system">
-<component name="gssensorplugin" filter="s60" long-name="GS Sensor Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gssensorplugin/group"/>
-</component>
-<component name="gsaccessoryplugin" filter="s60" long-name="GS Accessory Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gsaccessoryplugin/group"/>
-</component>
-</collection>
-<collection name="filehandling" long-name="File Handling" level="server">
-<component name="fileconverterfw" long-name="File Converter Framework" purpose="optional">
-<unit bldFile="mw/appsupport/filehandling/fileconverterfw/group" mrp="mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
-</component>
-<component name="htmltorichtextconverter" long-name="HTML to RichText Converter" introduced="7.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/htmltorichtextconverter/group" mrp="mw/appsupport/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
-</component>
-<component name="richtexttohtmlconverter" long-name="RichText to HTML Converter" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
-</component>
-</collection>
-<collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
-<component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
-</component>
-</collection>
-<collection name="commonappservices" long-name="Common Application Services" level="framework">
-<component name="alarmserver" long-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"/>
-</component>
-<component name="alarmservertest" long-name="Alarm Server Test" deprecated="^3" introduced="8.1" purpose="development">
-<unit bldFile="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
-</component>
-<component name="appservicesdocs" long-name="Application Services Documentation" purpose="development" class="doc">
-<unit mrp="mw/appsupport/commonappservices/appservicesdocs/app-services_documentation.mrp"/>
-</component>
-<component name="backuprestorenotification" long-name="Backup Restore Notification" introduced="8.1" purpose="optional">
-<unit bldFile="mw/appsupport/commonappservices/backuprestorenotification/group" mrp="mw/appsupport/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
-</component>
-</collection>
-<collection name="tzservices" long-name="Time Zone Services" level="plugin">
-<component name="tzserver" long-name="Time Zone Server" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzserver/group" mrp="mw/appsupport/tzservices/tzserver/group/app-services_tz.mrp"/>
-</component>
-<component name="tzloc" long-name="Time Zone Localization" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzloc/group" mrp="mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
-</component>
-<component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzlocrscfactory/group" mrp="mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
-</component>
-<component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzdatabase/group" mrp="mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
-</component>
-</collection>
-<collection name="contenthandling" long-name="Content Handling" level="plugin">
-<component name="webrecognisers" long-name="Web Recognisers" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/contenthandling/webrecognisers/group" mrp="mw/appsupport/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
-</component>
-</collection>
-<collection name="openenvutils" long-name="Open Environment Utilities" level="specific">
-<component name="commandshell" long-name="Command Shell" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/commandshell/group" mrp="mw/appsupport/openenvutils/commandshell/group/oetools_zsh.mrp"/>
-</component>
-<component name="telnetserver" long-name="Telnet Server" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/telnetserver/group" mrp="mw/appsupport/openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
-</component>
-</collection>
-<collection name="printingsupport" long-name="Printing Support" level="generic">
-<component name="printinguisupport" long-name="Printing UI Support" purpose="optional" introduced="^2" deprecated="^3">
-<unit bldFile="mw/appsupport/printingsupport/printinguisupport/group" mrp="mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
-</component>
-</collection>
-<collection name="appfw" long-name="Application Framework" level="framework">
-<component name="apparchitecture" long-name="Application Architecture" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/apparchitecture/group" mrp="mw/appsupport/appfw/apparchitecture/group/app-framework_apparc.mrp"/>
-</component>
-<component name="viewserver" long-name="View Server" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/viewserver/group" mrp="mw/appsupport/appfw/viewserver/group/app-framework_viewsrv.mrp"/>
-</component>
-</collection>
-<collection name="applaunchservices" long-name="Application Launch Services" level="generic">
-<component name="aftermarketappstarter" long-name="After Market Application Starter" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/aftermarketappstarter/group" mrp="mw/appsupport/applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
-</component>
-<component name="applaunchplugins" long-name="Application Launch Plugins" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/applaunchplugins/group" mrp="mw/appsupport/applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
-</component>
-</collection>
-<collection name="tzpcside" long-name="Time Zone PC Side" level="plugin">
-<component name="tzcompiler" long-name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config PC">
-<unit bldFile="mw/appsupport/tzpcside/tzcompiler/group" mrp="mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
-</component>
-</collection>
-<collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
-<component name="appsupport_metadata" long-name="Generic Application Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="securitysrv" level="generic" long-name="Security Services" levels="plugin framework server generic specific">
-<collection name="secsrv_plat" long-name="Security Services Platform Interfaces" level="specific">
-<component name="cms_api" long-name="CMS API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/cms_api/group"/>
-</component>
-<component name="pkcs12_parser_api" long-name="PKCS12 Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkcs12_parser_api/group"/>
-</component>
-<component name="java_utils_api" long-name="Java Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/java_utils_api/group"/>
-</component>
-<component name="wim_cert_api" long-name="WIM Cert API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/wim_cert_api/group"/>
-</component>
-<component name="device_key_store_encryption_plugin_api" long-name="Device Key Store Encryption Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/device_key_store_encryption_plugin_api/group"/>
-</component>
-<component name="x509certnameparser_api" long-name="X.509 Certificate Name Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
-</component>
-<component name="remote_lock_api" long-name="Remote Lock API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
-</component>
-<component name="pkidialog_api" long-name="PKI Dialog API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
-</component>
-<component name="provisioning_api" long-name="Provisioning API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/provisioning_api/group"/>
-</component>
-<component name="keyguard_configuration_api" long-name="Keyguard Configuration API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_configuration_api/group"/>
-</component>
-<component name="keylock_policy_api" long-name="Keylock Policy API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keylock_policy_api/group"/>
-</component>
-<component name="security_code_ui_api" long-name="Security Code UI API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
-</component>
-<component name="gba_api" long-name="GBA API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/gba_api/group"/>
-</component>
-<component name="keyguard_access_api" long-name="Keyguard Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_access_api/group"/>
-</component>
-<component name="devicelock_access_api" long-name="Device Lock Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devicelock_access_api/group"/>
-</component>
-<component name="lockapp_server_api" long-name="Lock Application Server API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
-</component>
-<component name="devencadaptation_api" long-name="Device Encryption Adaptation API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
-</component>
-<component name="devenccommonutils_api" long-name="Device Encryption Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
-</component>
-</collection>
-<collection name="cms" long-name="Certificate Management Service" level="server">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="cms_build" filter="s60" long-name="CMS" introduced="^3">
-<unit bldFile="mw/securitysrv/cms/group"/>
-</component>
-</collection>
-<collection name="pkiutilities" long-name="PKI Utilities" level="plugin">
-<component name="x509certnameparser" filter="s60" long-name="X.509 Certificate Name Parser">
-<unit bldFile="mw/securitysrv/pkiutilities/x509certnameparser/group"/>
-</component>
-<component name="pkcs12" filter="s60" long-name="PKCS #12">
-<unit bldFile="mw/securitysrv/pkiutilities/pkcs12/group"/>
-</component>
-<component name="certmanui" filter="s60" long-name="Certificate Management UI">
-<unit bldFile="mw/securitysrv/pkiutilities/certmanui/group"/>
-</component>
-<component name="ctsecuritydialogs" filter="s60" long-name="Crypto Token Security Dialogs">
-<unit bldFile="mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
-</component>
-<component name="certsaver" filter="s60" long-name="Certificate Saver">
-<unit bldFile="mw/securitysrv/pkiutilities/certsaver/group"/>
-</component>
-<component name="secmodui" filter="s60" long-name="Security Module UI">
-<unit bldFile="mw/securitysrv/pkiutilities/secmodui/group"/>
-</component>
-<component name="devicetoken" filter="s60" long-name="Device Token">
-<unit bldFile="mw/securitysrv/pkiutilities/devicetoken/group"/>
-</component>
-<component name="certificates" filter="s60" long-name="Certificates">
-<unit bldFile="mw/securitysrv/pkiutilities/Certificates/group" filter="sf_build"/>
-</component>
-<component name="pkiutilities_build" filter="s60" long-name="PKI Utilities Build">
-<!-- need to split this into the above components -->
-<unit bldFile="mw/securitysrv/pkiutilities/group"/>
-</component>
-<component name="ocsp" long-name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
-<unit bldFile="mw/securitysrv/pkiutilities/ocsp/group" mrp="mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
-</component>
-</collection>
-<collection name="wim" long-name="Wireless Identity Module " level="framework">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="wim_build" filter="s60" long-name="WIM Build">
-<unit bldFile="mw/securitysrv/wim/group"/>
-</component>
-</collection>
-<collection name="remotelock" long-name="Remote Lock" level="generic">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="remotelock_build" filter="s60" long-name="Remote Lock Build">
-<unit bldFile="mw/securitysrv/remotelock/group"/>
-</component>
-</collection>
-<collection name="securitydialogs" long-name="Security Dialogs" level="specific">
-<component name="keylockpolicyapi" filter="s60" long-name="Keylock Policy API">
-<unit bldFile="mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
-</component>
-<component name="autolock" long-name="Autolock" filter="s60">
-<unit bldFile="mw/securitysrv/securitydialogs/autolock/group"/>
-</component>
-<component name="secui" filter="s60" long-name="Security UI">
-<unit bldFile="mw/securitysrv/securitydialogs/secui/group"/>
-</component>
-<component name="securitynotifier" filter="s60" long-name="Security Notifier">
-<unit bldFile="mw/securitysrv/securitydialogs/securitynotifier/group"/>
-</component>
-<component name="lockclient" filter="s60" long-name="Lock Client" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockclient/group"/>
-</component>
-<component name="lockapp" filter="s60" long-name="Lock Application" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockapp/group"/>
-</component>
-<component name="secuinotifications" long-name="Security UI Notifications" introduced="^4" filter="s60">
-<unit bldFile="mw/securitysrv/securitydialogs/secuinotifications" proFile="secuinotifications.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="boottimeintegritycheck_build" filter="s60" long-name="Boot Time Integrity Check Build">
-<unit bldFile="mw/securitysrv/boottimeintegritycheck/group"/>
-</component>
-</collection>
-<collection name="gba" long-name="Generic Bootstrapping Architecture" level="server">
-<component name="uicc" filter="s60" long-name="UICC" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/uicc/group"/>
-</component>
-<component name="gbaserver" filter="s60" long-name="GBA Server" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaserver/group"/>
-</component>
-<component name="gbaapi" filter="s60" long-name="GBA API" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaapi/group"/>
-</component>
-<component name="gbafilter" filter="s60" long-name="GBA HTTP Filter" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/gbafilter/group"/>
-</component>
-<component name="gba_build" filter="s60" long-name="Generic Boot Architecture Build" introduced="^2">
-<!-- need to split this into the above components, or remove #includes and make this GBA ROM -->
-<unit bldFile="mw/securitysrv/gba/group"/>
-</component>
-</collection>
-<collection name="devencdiskutils" long-name="Device Encryption Disk Utils" level="server">
-<component name="devenccommonutils" filter="s60" long-name="Device Encryption Common Utils" introduced="^3">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncCommonUtils/group"/>
-</component>
-<component name="devencrfsplugin" filter="s60" long-name="Device Encryption RFS Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncRfsPlugin/group"/>
-</component>
-<component name="pk5recognizer" filter="s60" long-name="Device Encryption Pk5 Recognizer" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/Pk5Recognizer/group"/>
-</component>
-<component name="devencstarter" filter="s60" long-name="Device Encryption Starter" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncStarter/group"/>
-</component>
-<component name="devencdiskutils" filter="s60" long-name="Device Encryption Disk Utils Build" introduced="^3">
-<!-- need to split this into the above components, or remove #includes and make this a ROM component-->
-<unit bldFile="mw/securitysrv/devencdiskutils/group"/>
-</component>
-</collection>
-<collection name="securitysrv_info" long-name="Security Services Info" level="specific">
-<component name="securitysrv_metadata" long-name="Security Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="drm" level="generic" long-name="DRM" levels="plugin framework server generic specific">
-<collection name="drm_plat" long-name="DRM Platform Interfaces" level="specific">
-<component name="roap_api" long-name="ROAP API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/roap_api/group"/>
-</component>
-<component name="drm_common_api" long-name="DRM Common API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_common_api/group"/>
-</component>
-<component name="drm_rights_api" long-name="DRM Rights API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_rights_api/group"/>
-</component>
-<component name="drm_legacy_api" long-name="DRM Legacy API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_legacy_api/group"/>
-</component>
-<component name="dcf_repository_api" long-name="DCF Repository API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/dcf_repository_api/group"/>
-</component>
-<component name="drm_service_api" long-name="DRM Service API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_service_api/group"/>
-</component>
-<component name="drm_secondary_display_api" long-name="DRM Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_secondary_display_api/group"/>
-</component>
-<component name="drm_license_manager_api" long-name="DRM License Manager API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_license_manager_api/group"/>
-</component>
-<component name="drm_utility_api" long-name="DRM Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_utility_api/group"/>
-</component>
-<component name="drm_agents_api" long-name="DRM Agents API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_agents_api/group"/>
-</component>
-<component name="wmdrm_core_api" long-name="WM DRM Core API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_core_api/group"/>
-</component>
-<component name="wmdrm_access_api" long-name="WMDRM Access API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_access_api/group"/>
-</component>
-<component name="camese_utility_api" long-name="Camese Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_utility_api/group"/>
-</component>
-<component name="camese_framework_api" long-name="Camese Framework API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_framework_api/group"/>
-</component>
-</collection>
-<collection name="drm_pub" long-name="DRM Public Interfaces" level="specific">
-<component name="drm_helper_api" long-name="DRM Helper API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_helper_api/group"/>
-</component>
-<component name="oma_drm_caf_agent_api" long-name="OMA DRM CAF Agent API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/group"/>
-</component>
-<component name="drm_license_checker_api" long-name="DRM License Checker API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_license_checker_api/group"/>
-</component>
-</collection>
-<collection name="commondrm" long-name="Common DRM" level="generic">
-<!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
-<component name="drmencryptor" filter="s60" long-name="DRM Encryptor" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmsettingsplugin" filter="s60" long-name="DRM Settings Plugin" plugin="Y" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmrightsmanagerui" filter="s60" long-name="DRM Rights Manager UI">
-<unit bldFile="mw/drm/commondrm/drmrightsmanagerui/help/group"/>
-</component>
-<component name="drmutility" filter="s60" long-name="DRM Utility">
-<!-- Uncomment unit when configuration is in place. Currently #included from commondrm_build -->
-<!--<unit bldFile="commondrm/drmutility/group"/>-->
-</component>
-<component name="drmserviceapiwrapper" filter="s60" long-name="DRM Service API Wrapper">
-<unit bldFile="mw/drm/commondrm/drmserviceapiwrapper/group"/>
-</component>
-<component name="drmrightsstoringlocation" filter="s60" long-name="DRM Rights Storing Location">
-<unit bldFile="mw/drm/commondrm/drmrightsstoringlocation/group"/>
-</component>
-<component name="commondrm_build" filter="s60" long-name="Common DRM Build">
-<!-- should be split into the above files, or them collapsed into a single component -->
-<unit bldFile="mw/drm/commondrm/group"/>
-</component>
-</collection>
-<collection name="omadrm" long-name="OMA DRM" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="omadrm_build" filter="s60" long-name="OMA DRM Build">
-<unit bldFile="mw/drm/omadrm/group"/>
-</component>
-<component name="foundationcerts" filter="sf_build" long-name="Foundation Certificates">
-<unit bldFile="mw/drm/omadrm/foundationcerts/group"/>
-</component>
-</collection>
-<collection name="wmdrm" long-name="Windows Media DRM" level="framework">
-<!-- collection is really a component. Move down a directory -->
-<component name="wmdrm_build" filter="s60" long-name="WM DRM Build">
-<unit bldFile="mw/drm/wmdrm/group"/>
-</component>
-</collection>
-<collection name="drm_info" long-name="DRM Info" level="specific"/>
-</block>
-<block name="locationsrv" level="specific" long-name="Location Services" levels="plugin fw server if">
-<collection name="locsrv_pub" long-name="Location Services Public Interfaces" level="if">
-<component name="landmarks_search_api" long-name="Landmarks Search API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
-</component>
-<component name="landmarks_api" long-name="Landmarks API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/group"/>
-</component>
-<component name="landmarks_database_management_api" long-name="Landmarks Database Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/group"/>
-</component>
-<component name="location_triggering_api" long-name="Location Triggering API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/location_triggering_api/group"/>
-</component>
-<component name="blid_application_satellite_info_api" long-name="BLID Application Satellite Info API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/group"/>
-</component>
-</collection>
-<collection name="locsrv_plat" long-name="Location Services Platform Interfaces" level="if">
-<component name="map_and_navigation_api" long-name="Map and Navigation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/group"/>
-</component>
-<component name="map_and_navigation_provider_discovery_api" long-name="Map and Navigation Provider Discovery API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/group"/>
-</component>
-<component name="geocoding_api" long-name="Geocoding API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
-</component>
-<component name="map_image_api" long-name="Map Image API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/group"/>
-</component>
-<component name="map_and_navigation_aiw_api" long-name="Map and Navigation AIW API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_aiw_api/group"/>
-</component>
-<component name="map_and_navigation_provider_api" long-name="Map and Navigation Provider API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_api/group"/>
-</component>
-<component name="landmarks_category_definition_api" long-name="Landmarks Category Definition API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
-</component>
-<component name="supl_settings_api" long-name="SUPL Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
-</component>
-<component name="location_settings_launch_api" long-name="Location Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/group"/>
-</component>
-<component name="map_image_conversion_plugin_api" long-name="Map Image Conversion Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/group"/>
-</component>
-<component name="psy_configuration_ui_plugin_api" long-name="PSY Configuration UI Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/psy_configuration_ui_plugin_api/group"/>
-</component>
-<component name="np_proxy_configuration_api" long-name="NP Proxy Configuration API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/np_proxy_configuration_api/group"/>
-</component>
-<component name="supl_terminal_initiation_api" long-name="SUPL Terminal Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/group"/>
-</component>
-<component name="location_notation_preferences_settings_api" long-name="Location Notation Preferences Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_notation_preferences_settings_api/group"/>
-</component>
-<component name="supl_settings_notifier_secondary_display_api" long-name="SUPL Settings Notifier Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_notifier_secondary_display_api/group"/>
-</component>
-<component name="supl_network_initiation_api" long-name="SUPL Network Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/group"/>
-</component>
-<component name="privacy_notifiers_secondary_display_api" long-name="Privacy Notifiers Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/privacy_notifiers_secondary_display_api/group"/>
-</component>
-<component name="oma_supl_configuration_parameter_api" long-name="OMA SUPL Configuration Parameter API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_configuration_parameter_api/group"/>
-</component>
-<component name="supl_query_secondary_display_api" long-name="SUPL Query Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_query_secondary_display_api/group"/>
-</component>
-<component name="location_triggering_management_api" long-name="Location Triggering Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_management_api/group"/>
-</component>
-<component name="location_triggering_status_information_api" long-name="Location Triggering Status Information API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_status_information_api/group"/>
-</component>
-<component name="oma_supl_asn_codec_plugin_api" long-name="OMA SUPL ASN Codec Plugin API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
-</component>
-<component name="query_and_notification_api" long-name="Query and Notification API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/query_and_notification_api/group"/>
-</component>
-<component name="location_local_variation_api" long-name="Location Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_local_variation_api/group"/>
-</component>
-</collection>
-<collection name="genericpositioningplugins" long-name="Generic Positioning Plugins" level="plugin">
-<component name="locationnpppsy" filter="s60" long-name="Location Positioning Proxy PSY" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
-</component>
-<component name="locationsuplpsy" filter="s60" long-name="Location SUPL PSY" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationsuplpsy/group"/>
-</component>
-<component name="genericpositioningplugins_build" filter="s60" long-name="Generic Positioning Plugins Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/genericpositioningplugins/group"/>
-</component>
-</collection>
-<collection name="landmarks" long-name="Landmarks" level="server">
-<component name="locationlandmarks" filter="s60" long-name="Location Landmarks">
-<unit bldFile="mw/locationsrv/landmarks/locationlandmarks/group"/>
-</component>
-</collection>
-<collection name="locationmapnavfw" long-name="Location Map and Navigation Framework" level="fw">
-<component name="mnlibrary" filter="s60" long-name="Map and Navigation Library">
-<unit bldFile="mw/locationsrv/locationmapnavfw/library/group"/>
-</component>
-<component name="mnaiwprovider" filter="s60" long-name="Map and Navigation AIW Provider" plugin="Y">
-<unit bldFile="mw/locationsrv/locationmapnavfw/aiwprovider/group"/>
-</component>
-<component name="locationmapnavfw_build" filter="s60" long-name="Location Map and Navigation Framework Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/locationmapnavfw/group"/>
-</component>
-</collection>
-<collection name="locationsystemui" long-name="Location System UI" level="if">
-<component name="locationsysui" filter="s60" long-name="Location System UI">
-<unit bldFile="mw/locationsrv/locationsystemui/locationsysui/group"/>
-</component>
-</collection>
-<collection name="supl" long-name="SUPL" level="fw">
-<component name="locationsuplfw" filter="s60" long-name="Location SUPL Framework">
-<unit bldFile="mw/locationsrv/supl/locationsuplfw/group"/>
-</component>
-<component name="locationomasuplprotocolhandler" filter="s60" long-name="OMA SUPL Protocol Handler">
-<unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/group"/>
-</component>
-<component name="supltiapiimplementation" filter="s60" long-name="SUPL TI API Implementation" introduced="^3">
-<unit bldFile="mw/locationsrv/supl/supltiapiimplementation/group"/>
-</component>
-</collection>
-<collection name="locationtriggering" long-name="Location Triggering" level="server">
-<component name="ltlogger" filter="s60" long-name="LT Logger">
-<unit bldFile="mw/locationsrv/locationtriggering/ltlogger/group"/>
-</component>
-<component name="ltclientlib" filter="s60" long-name="LT Client Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltclientlib/group"/>
-</component>
-<component name="ltmanagementlib" filter="s60" long-name="LT Management Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmanagementlib/group"/>
-</component>
-<component name="ltcontainer" filter="s60" long-name="LT Container">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontainer/group"/>
-</component>
-<component name="ltserver" filter="s60" long-name="LT Server">
-<unit bldFile="mw/locationsrv/locationtriggering/ltserver/group"/>
-</component>
-<component name="ltstrategypluginapi" filter="s60" long-name="LT Strategy Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategypluginapi/group"/>
-</component>
-<component name="ltstrategyengine" filter="s60" long-name="LT Strategy Engine">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategyengine/group"/>
-</component>
-<component name="ltmovementdetectionpluginapi" filter="s60" long-name="Movement Detection Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmovementdetectionpluginapi/group"/>
-</component>
-<component name="ltcellidmovementdetector" filter="s60" long-name="Cell ID Movement Detector">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/>
-</component>
-<component name="lbtmgmtui" filter="s60" long-name="LBT Management UI" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/lbtmgmtui/group"/>
-</component>
-<component name="ltcontextsourceplugin" filter="s60" long-name="LT Context Source Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontextsourceplugin/group"/>
-</component>
-<component name="locationtriggering_build" filter="s60" long-name="Location Triggering Build">
-<!-- should remove #include from this and maybe put exports in the above components -->
-<unit bldFile="mw/locationsrv/locationtriggering/group"/>
-</component>
-</collection>
-</block>
-<block name="accesssec" level="generic" long-name="Access Security" levels="plugin framework server generic specific">
-<collection name="accesssec_plat" long-name="Access Security Platform Interfaces" level="specific">
-<component name="wapi_security_settings_ui_api" long-name="WAPI Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_security_settings_ui_api/group"/>
-</component>
-<component name="wep_security_settings_ui_api" long-name="WEP Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wep_security_settings_ui_api/group"/>
-</component>
-<component name="wi-fi_protected_setup_ui_api" long-name="Wi-Fi Protected Setup UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
-</component>
-<component name="wlan_eap_settings_ui_api" long-name="WLAN EAP Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wlan_eap_settings_ui_api/group"/>
-</component>
-<component name="wpa_security_settings_ui_api" long-name="WPA Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wpa_security_settings_ui_api/group"/>
-</component>
-<component name="eap_vpn_api" long-name="EAP VPN API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
-</component>
-<component name="eapsim_db_api" long-name="EAP-SIM DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapsim_db_api/group"/>
-</component>
-<component name="eap_type_api" long-name="EAP Type API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_type_api/group"/>
-</component>
-<component name="eaptlspeap_db_api" long-name="EAP-TLS-PEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eaptlspeap_db_api/group"/>
-</component>
-<component name="eapleap_db_api" long-name="LEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapleap_db_api/group"/>
-</component>
-<component name="eapgtc_db_api" long-name="EAP-GTC DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapgtc_db_api/group"/>
-</component>
-<component name="eapmschapv2_db_api" long-name="EAP-MSCHAPV2 DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapmschapv2_db_api/group"/>
-</component>
-<component name="eapaka_db_api" long-name="EAP-AKA DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapaka_db_api/group"/>
-</component>
-<component name="wapi_db_api" long-name="WAPI DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_db_api/group"/>
-</component>
-</collection>
-<collection name="wlansecuritysettings" long-name="WLAN Security Settings" level="specific">
-<component name="wapisecuritysettingsui" filter="s60" long-name="WAPI Security Settings UI" introduced="9.1">
-<!-- the directory for this needs to be moved up to the right level -->
-<unit bldFile="mw/accesssec/wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
-</component>
-<component name="wepsecuritysettingsui" filter="s60" long-name="WEP Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wepsecuritysettingsui/group"/>
-</component>
-<component name="wifiprotectedsetup" filter="s60" long-name="WIFI Protected Setup" introduced="^1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wifiprotectedsetup/group"/>
-</component>
-<component name="wlaneapsettingsui" filter="s60" long-name="WLAN EAP Settings UI" introduced="9.3">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wlaneapsettingsui/group"/>
-</component>
-<component name="wpasecuritysettingsui" filter="s60" long-name="WPA Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wpasecuritysettingsui/group"/>
-</component>
-</collection>
-<collection name="eapol" long-name="EAPOL" level="framework">
-<component name="eapol_framework" filter="s60" long-name="EAPOL Framework" introduced="9.2">
-<unit bldFile="mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
-</component>
-</collection>
-</block>
-<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>
-<component name="bearer_settings_plugin_api" long-name="Bearer Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/bearer_settings_plugin_api/group"/>
-</component>
-<component name="commsdat_wlan_api" long-name="CommsDat WLAN API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/commsdat_wlan_api/group"/>
-</component>
-<component name="connection_monitor_extension_api" long-name="Connection Monitor Extension API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_monitor_extension_api/group"/>
-</component>
-<component name="connection_ui_utilities_api" long-name="Connection UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_ui_utilities_api/group"/>
-</component>
-<component name="disconnect_dialog_api" long-name="Disconnect Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_api/group"/>
-</component>
-<component name="disconnect_dialog_disable_api" long-name="Disconnect Dialog Disable API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_disable_api/group"/>
-</component>
-<component name="extended_connection_settings_api" long-name="Extended Connection Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/extended_connection_settings_api/group"/>
-</component>
-<component name="mpm_default_connection_api" long-name="MPM Default Connection API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_default_connection_api/group"/>
-</component>
-<component name="pdpcontextmanager2_reset_factory_settings_api" long-name="PDP Context Manager 2 Reset Factory Settings API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_settings_api/group"/>
-</component>
-<component name="mpm_connect_screen_api" long-name="MPM Connect Screen API" filter="s60" class="api">
-<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="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>
-<component name="access_point_engine_api" long-name="Access Point Engine API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_monitor_server_api/group"/>
-</component>
-<component name="connection_settings_ui_api" long-name="Connection Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_ui_api/group"/>
-</component>
-<component name="agent_dialog_api" long-name="Agent Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/agent_dialog_api/group"/>
-</component>
-<component name="extendedconnpref_api" long-name="Extended Connection Preferences API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/extendedconnpref_api/group"/>
-</component>
-</collection>
-<collection name="accesspointcontrol" long-name="Access Point Control" level="plugin">
-<component name="apcontrollistplugin" filter="s60" long-name="Access Point Control List Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
-</component>
-</collection>
-<collection name="alwayson_net_plugin" long-name="Always Online Net Plugin" level="server">
-<component name="pdpcontextmanager2" filter="s60" long-name="PDP Context Manager 2">
-<unit bldFile="mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
-</component>
-</collection>
-<collection name="apengine" long-name="Access Point Engine" level="framework">
-<component name="apeng" filter="s60" long-name="Access Point Engine">
-<unit bldFile="mw/ipconnmgmt/apengine/apeng/group"/>
-</component>
-<component name="apsettingshandlerui" filter="s60" long-name="Access Point Settings Handler UI">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingshandlerui/group"/>
-</component>
-<component name="apsettingsplugin" filter="s60" long-name="Access Point Settings Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="bearermanagement" long-name="Bearer Management" level="framework">
-<component name="mpm" filter="s60" long-name="Mobility Policy Manager">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/mpm/group"/>
-</component>
-<component name="extendedconnpref" filter="s60" long-name="Extended Connection Preferences">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/extendedconnpref/group"/>
-</component>
-<component name="s60mcpr" filter="s60" long-name="S60 Meta-Connection Provider" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/S60MCPR/group"/>
-</component>
-</collection>
-<collection name="cmmanager" long-name="Connection Method Manager" level="framework">
-<component name="cmmgr" filter="s60" long-name="CM Manager">
-<unit bldFile="mw/ipconnmgmt/cmmanager/cmmgr/group"/>
-</component>
-<component name="gsconnsettingsplugin" filter="s60" long-name="GS Connection Settings Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/cmmanager/gsconnsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="connectionmonitoring" long-name="Connection Monitoring" level="server">
-<component name="connectionmonitorplugin" filter="s60" long-name="Connection Monitor Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorplugin/group"/>
-</component>
-<component name="connectionmonitorui" filter="s60" long-name="Connection Monitor UI">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorui/group"/>
-</component>
-<component name="connmon" filter="s60" long-name="Connection Monitor">
-<!-- either split into two components, or #include from a common bld.inf -->
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/connectionmonitor/group"/>
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/dataconnectionlogger/group"/>
-</component>
-<component name="connmonext" filter="s60" long-name="Connection Monitor Extension API">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmonext/group"/>
-</component>
-</collection>
-<collection name="connectionutilities" long-name="Connection Utilities" level="utils">
-<component name="connectiondialogs" filter="s60" long-name="Connection Dialogs">
-<unit bldFile="mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/>
-</component>
-</collection>
-<collection name="dbcreator" long-name="DB Creator" level="utils">
-<component name="commsdatcreator" filter="s60" long-name="Comms Database Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
-</component>
-<component name="commsdatcreatorrfsplugin" filter="s60" long-name="Comms Database Creator RFS Plugin" introduced="9.3" plugin="Y">
-<!-- uncomment when config is turned on -->
-<!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
-</component>
-<component name="commsdatstartup" filter="s60" long-name="Comms Database Startup" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
-</component>
-<component name="dbcreatorexe" filter="s60" long-name="DB Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
-</component>
-<component name="dbcreator_build" filter="s60" long-name="DB Creator Build" introduced="9.3">
-<!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
-<unit bldFile="mw/ipconnmgmt/dbcreator/group"/>
-</component>
-</collection>
-<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"/>
-</component>
-<component name="ipcm_qt_build" long-name="IP Connectivity Management Qt Build" introduced="^4">
-<unit bldFile="mw/ipconnmgmt" proFile="ipconnmgmt.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</block>
-<block name="netprotocols" level="generic" long-name="High-level Internet Protocols" levels="plugin framework server generic specific">
-<collection name="netprotocols_plat" long-name="High-level Internet Protocols Platform Interfaces" level="specific">
-<component name="cookie_manager_api" long-name="Cookie Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/cookie_manager_api/group"/>
-</component>
-<component name="http_cache_mgr_api" long-name="HTTP Cache Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_cache_mgr_api/group"/>
-</component>
-<component name="http_filters_api" long-name="HTTP Filters API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_filters_api/group"/>
-</component>
-</collection>
-<collection name="httpfilters" long-name="HTTP Filters" level="plugin">
-<component name="httpfiltercommon" filter="s60" long-name="HTTP Filter Common">
-<unit bldFile="mw/netprotocols/httpfilters/httpfiltercommon/group"/>
-</component>
-<component name="cookie" filter="s60" long-name="Cookie Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/cookie/group"/>
-</component>
-<component name="deflatefilter" filter="s60" long-name="Deflate Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/deflatefilter/group"/>
-</component>
-<component name="httpfilteracceptheader" filter="s60" long-name="Accept Header Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteracceptheader/group"/>
-</component>
-<component name="httpfilterauthentication" filter="s60" long-name="Authentication Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterauthentication/group"/>
-</component>
-<component name="httpfilterconnhandler" filter="s60" long-name="Connection Handler Fitler" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterconnhandler/group"/>
-</component>
-<component name="httpfilteriop" filter="s60" long-name="HTTP IOP Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteriop/group"/>
-</component>
-<component name="httpfilterproxy" filter="s60" long-name="HTTP Proxy Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterproxy/group"/>
-</component>
-<component name="uaproffilter" filter="s60" long-name="UAProf Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/uaproffilter/group"/>
-</component>
-</collection>
-<collection name="applayerprotocols" long-name="Application Layer Protocols" level="server">
-<component name="httptransportfw" long-name="HTTP Transport Framework" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
-</component>
-<component name="httpexamples" long-name="HTTP Examples" introduced="6.2" purpose="development">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpexamples/group" mrp="mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
-</component>
-<component name="wappushsupport" long-name="WAP Push Support" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
-</component>
-<component name="wapbase" long-name="WAP Base" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wapbase/Group" mrp="mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
-</component>
-<component name="ftpengine" long-name="FTP Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/ftpengine/group" mrp="mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
-</component>
-<component name="telnetengine" long-name="Telnet Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/telnetengine/group" mrp="mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
-</component>
-<component name="httpserviceapi" long-name="HTTP Service API" introduced="TB9.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpservice/group" mrp="mw/netprotocols/applayerprotocols/httpservice/group/http_service.mrp"/>
-</component>
-</collection>
-<collection name="applayerpluginsandutils" long-name="Application Layer Plugins and Utils" level="framework">
-<component name="uripermissionservices" long-name="URI Permission Services" introduced="^2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
-</component>
-<component name="bookmarksupport" long-name="Bookmark Support" introduced="9.1" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
-</component>
-<component name="httpprotocolplugins" long-name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
-</component>
-<component name="httptransportplugins" long-name="HTTP Transport Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
-</component>
-</collection>
-<collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
-<component name="netprotocols_metadata" long-name="High-level Internet Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ipappprotocols" level="generic" long-name="IP App Protocols" levels="plugin conn server if">
-<collection name="ipappprotocols_plat" long-name="IP App Protocols Platform Interfaces" level="if">
-<component name="srtp_api" long-name="SRTP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/srtp_api/group"/>
-</component>
-<component name="rtprtcp_api" long-name="RTP/RTCP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/rtprtcp_api/group"/>
-</component>
-</collection>
-<collection name="rtp" long-name="RTP" level="server">
-<component name="srtpstack" filter="s60" long-name="SRTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/srtpstack/group"/>
-</component>
-<component name="rtpstack" filter="s60" long-name="RTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/rtpstack/group"/>
-</component>
-</collection>
-<collection name="realtimenetprots" long-name="Real Time Net Protocols" level="server">
-<component name="symrtp" long-name="RTP" introduced="9.0" purpose="optional">
-<!-- Real Time Data Protocol -->
-<unit bldFile="mw/ipappprotocols/realtimenetprots/rtp/group" mrp="mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
-</component>
-<component name="sipfw" long-name="SIP Framework" introduced="9.2" purpose="optional">
-<unit bldFile="mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp" version="2"/>
-</component>
-</collection>
-<collection name="sipplugins" long-name="SIP Plugins" level="plugin">
-<component name="sippwlanplugin" filter="s60" long-name="SIP WLAN Plugin" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
-</component>
-<component name="sippsipsettingsui" filter="s60" long-name="SIP Settings UI" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
-</component>
-<component name="sippdevmgmtsipadapter" filter="s60" long-name="Device Management SIP Settings Adapter" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
-</component>
-<component name="sippsystemstatemonitor" filter="s60" long-name="SIP System State Monitor" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsystemstatemonitor/group"/>
-</component>
-<component name="sippsipadapter" filter="s60" long-name="SIP Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipadapter/group"/>
-</component>
-</collection>
-<collection name="sipproviderplugins" long-name="SIP Provider Plugins" level="conn">
-<component name="sipprovider" long-name="SIP Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipproviderplugins/sipprovider/group" mrp="mw/ipappprotocols/sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
-</component>
-</collection>
-<collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="if">
-<component name="ipappprotocols_metadata" long-name="IP App Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wirelessacc" level="specific" long-name="Wireless Access" levels="framework generic ui">
-<collection name="hsfw_plat" long-name="HotSpot Framework Platform Interfaces" level="ui">
-<component name="hotspot_framework_client_api" long-name="HotSpot Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_api" long-name="Internet Connectivity Test Service API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_settings_api" long-name="Internet Connectivity Test Service Settings API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
-</component>
-<component name="hotspot_framework_client_plugin_api" long-name="HotSpot Framework Client Plugin API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
-</component>
-</collection>
-<collection name="hotspotfw" long-name="HotSpot Framework" level="framework">
-<component name="hsserver" filter="s60" long-name="HotSpot Server" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="hsclient" filter="s60" long-name="HotSpot Client" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="internetconnectivitytestservice" filter="s60" long-name="Internet Connectivity Test Service" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
-</component>
-<component name="ictsdialogs" filter="s60" long-name="Internet Connectivity Test Service Dialogs" deprecated="^3" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
-</component>
-<component name="hspluginforagent" filter="s60" long-name="HotSpot Plugin for Agent" plugin="Y" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
-</component>
-<component name="hsbrowser" filter="s60" long-name="HotSpot Browser" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
-</component>
-<component name="hotspotfw_build" filter="s60" long-name="Hotspot Framework Build">
-<!-- should break up this bld.inf into the above components, or collapse them all into a single component -->
-<unit bldFile="mw/wirelessacc/hotspotfw/group"/>
-</component>
-</collection>
-<collection name="wlanutilities" long-name="WLAN Utilities" level="generic">
-<component name="wlanutilities_build" long-name="WLAN Utilities Qt" introduced="^4" filter="s60">
-<!-- is this uinit needed, or is it sufficient to uncomment the units in the below components? -->
-<unit bldFile="mw/wirelessacc/wlanutilities" proFile="wlanutilities.pro" qmakeArgs="-r"/>
-</component>
-<component name="wlanqtutilities" filter="s60" long-name="WLAN Qt Utilities" introduced="^4" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlanplugin/group" qt:proFile="wlanqtutilities.pro"/>-->
-</component>
-<component name="wlansniffer" filter="s60" long-name="WLAN Sniffer" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlansettingsui/group" qt:proFile="wlansniffer.pro"/>-->
-</component>
-<component name="wlanentryplugin" filter="s60" long-name="WLAN Entry Plugin" plugin="Y" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlansniffer/group" qt:proFile="wlanentryplugin.pro"/>-->
-</component>
-<component name="wlanindicatorplugin" filter="s60" long-name="WLAN Indicator Plugin" plugin="Y" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlanindicatorplugin/group" qt:proFile="wlanindicatorplugin.pro"/>-->
-</component>
-<component name="cpwlansettingsplugin" filter="s60" long-name="WLAN Settings Control Panel Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="wlanutilities/cpwlansettingsplugin/group" qt:proFile="cpwlansettingsplugin.pro"/>-->
-</component>
-</collection>
-</block>
-<block name="vpnclient" level="specific" long-name="VPN Client" levels="engine ui api">
-<!-- is the !oem_build filter needed? -->
-<collection name="vpnc_plat" long-name="VPN Client Platform Interfaces" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API" class="api">
-<unit bldFile="mw/vpnclient/vpnc_plat/vpnapi/group"/>
-</component>
-</collection>
-<collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API">
-<unit bldFile="mw/vpnclient/vpnapiimpl/group"/>
-</component>
-</collection>
-<collection name="vpnengine" long-name="VPN Engine" level="engine">
-<!-- too many components in this collection.
- Probably best to group the binaries together into larger components
- or maybe split the collection into more reasonable groups -->
-<component name="eventmediatorapi" filter="s60" long-name="Event Mediator API">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediatorapi/group"/>
-</component>
-<component name="eventviewer" filter="s60" long-name="Event Viewer">
-<unit bldFile="mw/vpnclient/vpnengine/eventviewer/group"/>
-</component>
-<component name="vpnins" filter="s60" long-name="VPN Installer">
-<unit bldFile="mw/vpnclient/vpnengine/vpnins/group"/>
-</component>
-<component name="ikepolparser" filter="s60" long-name="IKE Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/ikepolparser/group"/>
-</component>
-<component name="utlbase64" filter="s60" long-name="Base64 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlbase64/group"/>
-</component>
-<component name="utlcrypto" filter="s60" long-name="Crypto Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlcrypto/group"/>
-</component>
-<component name="utlxml" filter="s60" long-name="XML Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlxml/group"/>
-</component>
-<component name="utlpkcs10" filter="s60" long-name="PKCS#10 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs10/group"/>
-</component>
-<component name="pkiserviceapi" filter="s60" long-name="PKI Service API">
-<unit bldFile="mw/vpnclient/vpnengine/pkiserviceapi/group"/>
-</component>
-<component name="ikecert" filter="s60" long-name="IKE Certificate Management">
-<unit bldFile="mw/vpnclient/vpnengine/ikecert/group"/>
-</component>
-<component name="kmdapi" filter="s60" long-name="Key Management Daemon API">
-<unit bldFile="mw/vpnclient/vpnengine/kmdapi/group"/>
-</component>
-<component name="kmdserver" filter="s60" long-name="Key Management Daemon Server">
-<unit bldFile="mw/vpnclient/vpnengine/kmdserver/group"/>
-</component>
-<component name="ikeutils" filter="s60" long-name="Internet Key Exchange Utils">
-<unit bldFile="mw/vpnclient/vpnengine/ikeutils/group"/>
-</component>
-<component name="ikev1lib" filter="s60" long-name="IKEv1 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev1lib/group"/>
-</component>
-<component name="ikev2lib" filter="s60" long-name="IKEv2 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev2lib/group"/>
-</component>
-<component name="vpnipsecpolparser" filter="s60" long-name="VPN IPsec Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/vpnipsecpolparser/group"/>
-</component>
-<component name="sit" filter="s60" long-name="Socket Interaction Thread">
-<unit bldFile="mw/vpnclient/vpnengine/sit/group"/>
-</component>
-<component name="vpntcwrapper" filter="s60" long-name="VPN Terminal Control Wrapper">
-<unit bldFile="mw/vpnclient/vpnengine/vpntcwrapper/group"/>
-</component>
-<component name="eventmediator" filter="s60" long-name="Event Mediator">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediator/group"/>
-</component>
-<component name="pkiservice" filter="s60" long-name="PKI Service">
-<unit bldFile="mw/vpnclient/vpnengine/pkiservice/group"/>
-</component>
-<component name="vpnconnagt" filter="s60" long-name="VPN Connection Agent">
-<unit bldFile="mw/vpnclient/vpnengine/vpnconnagt/group"/>
-</component>
-<component name="vpnmanager" filter="s60" long-name="VPN Manager">
-<unit bldFile="mw/vpnclient/vpnengine/vpnmanager/group"/>
-</component>
-<component name="vpncleaner" filter="s60" long-name="VPN Cleaner">
-<unit bldFile="mw/vpnclient/vpnengine/vpncleaner/group"/>
-</component>
-<component name="utlpkcs12" filter="s60" long-name="PKCS#12 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs12/group"/>
-</component>
-<component name="dmadengine" filter="s60" long-name="DM Adapter Engine">
-<unit bldFile="mw/vpnclient/vpnengine/dmadengine/group"/>
-</component>
-<component name="dmadipsecvpn" filter="s60" long-name="IPsec VPN DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadipsecvpn/group"/>
-</component>
-<component name="dmadpki" filter="s60" long-name="PKI DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadpki/group"/>
-</component>
-<component name="ikesocket" filter="s60" long-name="IKE Socket" introduced="^3">
-<unit bldFile="mw/vpnclient/vpnengine/ikesocket/group"/>
-</component>
-</collection>
-<collection name="vpnui" long-name="VPN UI" level="ui">
-<component name="vpnecomnotifier" filter="s60" long-name="VPN ECOM Notifier" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnecomnotifier/group"/>
-</component>
-<component name="vpndialogmanager" filter="s60" long-name="VPN Dialog Manager">
-<unit bldFile="mw/vpnclient/vpnui/vpndialogmanager/group"/>
-</component>
-<component name="vpnpolins" filter="s60" long-name="VPN Policy Installer">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolins/group"/>
-</component>
-<component name="vpnpolicyrecognizer" filter="s60" long-name="VPN Policy Recognizer" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolicyrecognizer/group"/>
-</component>
-</collection>
-<collection name="vpnclient_info" long-name="VPN Client Info" level="api">
-<component name="vpnclient_help" filter="s60" long-name="VPN Client Help">
-<unit bldFile="mw/vpnclient/help/group"/>
-</component>
-<component name="vpnclient_build" filter="s60" long-name="VPN Client Build">
-<!-- should split this up into the other components and remove this-->
-<unit bldFile="mw/vpnclient/group"/>
-</component>
-</collection>
-</block>
-<block name="ipappsrv" level="specific" long-name="IP App Services" levels="framework generic server conn plugin">
-<collection name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" level="plugin">
-<component name="transcoder_api" long-name="Transcoder API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
-</component>
-<component name="comms_event_api" long-name="Comms Event API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/comms_event_api/group"/>
-</component>
-<component name="floor_control_api" long-name="Floor Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/floor_control_api/group"/>
-</component>
-<component name="media_control_api" long-name="Media Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/media_control_api/group"/>
-</component>
-<component name="multimedia_comms_api" long-name="Multimedia Comms API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/multimedia_comms_api/group"/>
-</component>
-<component name="nat_settings_api" long-name="NAT Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/nat_settings_api/group"/>
-</component>
-</collection>
-<collection name="natfw" long-name="NAT Framework" level="framework">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="natfw_build" filter="s60" long-name="NAT Framework Build" introduced="^2">
-<unit bldFile="mw/ipappsrv/natfw/group"/>
-</component>
-</collection>
-<collection name="multimediacommscontroller" long-name="Multimedia Comms Controller" level="conn">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommscontroller_build" filter="s60" long-name="Multimedia Comms Controller Build">
-<unit bldFile="mw/ipappsrv/multimediacommscontroller/group"/>
-</component>
-</collection>
-<collection name="multimediacommsengine" long-name="Multimedia Comms Engine" level="generic">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommsengine_build" filter="s60" long-name="Multimedia Comms Engine Build">
-<unit bldFile="mw/ipappsrv/multimediacommsengine/group"/>
-</component>
-</collection>
-<collection name="natplugins" long-name="NAT Plugins" level="plugin">
-<component name="natpcliprovisioningnatfwadapter" filter="s60" long-name="Client Provisioning NAT Framework Traversal Adapter" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/group"/>
-</component>
-<component name="natpdevmgmtnatfwadapter" filter="s60" long-name="Device Management NAT Framework Traversal Adapter" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/group"/>
-</component>
-<component name="natptraversalcontroller" filter="s60" long-name="NAT Traversal Controller" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natptraversalcontroller/group"/>
-</component>
-<component name="natpnatfwsdpprovider" filter="s60" long-name="NAT Framework SDP Provider" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpnatfwsdpprovider/group"/>
-</component>
-</collection>
-<collection name="ipappsrv_info" long-name="IP App Services Info" level="plugin">
-<component name="ipappsrv_build" long-name="IP App Services Build" filter="s60">
-<!-- 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">
-<collection name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" level="specific">
-<component name="string_parser_api" long-name="String Parser API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/string_parser_api/group"/>
-</component>
-<component name="cbs_mcn_client_api" long-name="CBS MCN Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cbs_mcn_client_api/group"/>
-</component>
-<component name="converged_call_engine_api" long-name="Converged Call Engine API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_engine_api/group"/>
-</component>
-<component name="aiw_dial_data_consumer_api" long-name="AIW Dial Data Consumer API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/aiw_dial_data_consumer_api/group"/>
-</component>
-<component name="phone_client_ussd_api" long-name="Phone Client USSD API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_api/group"/>
-</component>
-<component name="sat_refresh_api" long-name="SAT Refresh API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_refresh_api/group" filter="!test"/>
-</component>
-<component name="network_handling_engine_api" long-name="Network Handling Engine API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/network_handling_engine_api/group"/>
-</component>
-<component name="phone_client_emergency_call_api" long-name="Phone Client Emergency Call API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/group"/>
-</component>
-<component name="sat_configuration_api" long-name="SAT Configuration API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_configuration_api/group"/>
-</component>
-<component name="dial_utils_api" long-name="Dial Utils API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/dial_utils_api/group"/>
-</component>
-<component name="phone_client_image_handler_api" long-name="Phone Client Image Handler API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_image_handler_api/group"/>
-</component>
-<component name="phone_client_messenger_api" long-name="Phone Client Messenger API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_messenger_api/group"/>
-</component>
-<component name="sat_client_api" long-name="SAT Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_client_api/group" filter="!test"/>
-</component>
-<component name="phone_client_api" long-name="Phone Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_api/group"/>
-</component>
-<component name="sat_service_api" long-name="SAT Service API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_service_api/group" filter="!test"/>
-</component>
-<component name="cbs_message_api" long-name="CBS Message API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cbs_message_api/group"/>
-</component>
-<component name="phone_client_server_information_api" long-name="Phone Client Server Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_server_information_api/group"/>
-</component>
-<component name="phone_client_ussd_internal_api" long-name="Phone Client USSD Internal API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_internal_api/group"/>
-</component>
-<component name="phone_client_command_handler_api" long-name="Phone Client Command Handler API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_command_handler_api/group"/>
-</component>
-<component name="phone_client_notify_api" long-name="Phone Client Notify API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_notify_api/group"/>
-</component>
-<component name="phone_client_utility_api" long-name="Phone Client Utility API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_utility_api/group"/>
-</component>
-<component name="telephony_network_information_api" long-name="Telephony Network Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_network_information_api/group"/>
-</component>
-<component name="secondary_display_sat_api" long-name="Secondary Display SAT API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/secondary_display_sat_api/group"/>
-</component>
-<component name="callui_reconnect_query_api" long-name="CallUI Reconnect Query API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/callui_reconnect_query_api/group"/>
-</component>
-<component name="service_provider_settings_api" long-name="Service Provider Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/service_provider_settings_api/group"/>
-</component>
-<component name="converged_call_provider_api" long-name="Converged Call Provider API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_provider_api/group"/>
-</component>
-<component name="incoming_call_monitor_api" long-name="Incoming Call Monitor API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/incoming_call_monitor_api/group"/>
-</component>
-<component name="default_emergency_numbers_api" long-name="Default Emergency Numbers API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/default_emergency_numbers_api/group"/>
-</component>
-<component name="cenrep_database_api" long-name="Central Repository Database API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cenrep_database_api/group"/>
-</component>
-<component name="ss_settings_api" long-name="SS Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/ss_settings_api/group"/>
-</component>
-<component name="phone_settings_observer_api" long-name="Phone Settings Observer API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_observer_api/group"/>
-</component>
-<component name="phone_settings_notes_ui_api" long-name="Phone Settings Notes UI API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_notes_ui_api/group"/>
-</component>
-<component name="phone_settings_api" long-name="Phone Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_api/group"/>
-</component>
-<component name="voice_mailbox_number_api" long-name="Voice Mailbox Number API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_number_api/group"/>
-</component>
-<component name="voice_mailbox_settings_api" long-name="Voice Mailbox Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_settings_api/group"/>
-</component>
-<component name="call_information_api" long-name="Call Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/call_information_api/group" filter="!test"/>
-</component>
-<component name="call_remote_party_information_api" long-name="Call Remote Party Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/call_remote_party_information_api/group" filter="!test"/>
-</component>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_mediator_api/group" filter="!test"/>
-</component>
-<component name="dialpad_api" long-name="Dialpad API" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/dialpad_api/group"/>
-</component>
-</collection>
-<collection name="cellular" long-name="Cellular" level="server">
-<component name="telephonysettings" filter="s60" long-name="Telephony Settings" purpose="development"/>
-<component name="sssettings" filter="s60" long-name="Supplementary Service Settings" purpose="development"/>
-<component name="psetnotesui" filter="s60" long-name="Phone Settings Notes UI" purpose="development"/>
-</collection>
-<collection name="convergedcallengine" long-name="Converged Call Engine" level="framework">
-<component name="cce" filter="s60" long-name="CCE" purpose="development"/>
-<component name="spsettings" filter="s60" long-name="Service Provider Settings" purpose="development"/>
-</collection>
-<collection name="phoneclientserver" long-name="Phone Client/Server" level="server">
-<component name="aiwdialdata" filter="s60" long-name="AIW Dial Data" purpose="development"/>
-<component name="dialutils" filter="s60" long-name="Dial Utils" purpose="development"/>
-<component name="phoneclient" filter="s60" long-name="Phone Client" purpose="development"/>
-</collection>
-<collection name="phonesrv_info" long-name="Phone Server Info" level="generic">
-<component name="phonesrv_build" long-name="Phone Server Build" filter="s60">
-<unit bldFile="mw/phonesrv" proFile="phonesrv.pro"/>
-</component>
-</collection>
-</block>
-<block name="messagingmw" level="specific" long-name="Messaging Middleware" levels="stack support fw api">
-<collection name="msgfw_plat" long-name="Messaging Middleware Platform Interfaces" level="api">
-<component name="always_online_plugin_api" long-name="Always Online Plugin API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_plugin_api/group"/>
-</component>
-<component name="always_online_client_api" long-name="Always Online Client API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_client_api/group"/>
-</component>
-<component name="msg_common_utils_api" long-name="Messaging Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/msg_common_utils_api/group"/>
-</component>
-<component name="muiu_utils_api" long-name="Messaging Center UI Utilities API" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/muiu_utils_api/group"/>
-</component>
-</collection>
-<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" class="config">
-<unit bldFile="mw/messagingmw/msgbranched/group"/>
-</component>
-</collection>
-<collection name="messagingfw" long-name="Messaging Framework" level="fw">
-<!-- should break this collection up into smaller related collections -->
-<component name="send_ui_api" long-name="Send UI API" filter="s60" deprecated="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/send_ui_api/group"/>
-</component>
-<component name="send_ui_plugin_api" long-name="Send UI Plug-in API" filter="s60" deprecated="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/send_ui_plugin_api/group"/>
-</component>
-<component name="send_ui_datautils_api" long-name="Send UI Data Utils API" filter="s60" deprecated="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/send_ui_datautils_api/group"/>
-</component>
-<component name="alwaysonline" filter="s60" long-name="Always Online Server" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/alwaysonline/group"/>
-</component>
-<component name="msgcommonutils" filter="s60" long-name="Messaging Common Utils" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/msgcommonutils/group"/>
-</component>
-<component name="senduiservices" filter="s60" long-name="Send UI Services" introduced="^2" deprecated="^4">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/senduiservices/group"/>
-</component>
-<component name="muiuutils" long-name="Messaging Center UI Utilities" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/muiuutils/group"/>
-</component>
-<component name="scheduledsendmtm" long-name="Scheduled Send MTM" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/group" mrp="mw/messagingmw/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
-</component>
-<component name="msgsrvnstore" long-name="Message Server and Store" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/group" mrp="mw/messagingmw/messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
-</component>
-<component name="biomsgfw" long-name="BIO Messaging Framework" introduced="6.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/group" mrp="mw/messagingmw/messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
-</component>
-<component name="msgconf" long-name="Messaging Config" introduced="^2" purpose="optional" class="config">
-<unit bldFile="mw/messagingmw/messagingfw/msgconf/group" mrp="mw/messagingmw/messagingfw/msgconf/group/messaging_config.mrp"/>
-</component>
-<component name="watcherfw" long-name="Watcher Framework" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/watcherfw/group" mrp="mw/messagingmw/messagingfw/watcherfw/group/messaging_watcher.mrp"/>
-</component>
-<component name="msgtest" long-name="Messaging Test" purpose="development">
-<unit bldFile="mw/messagingmw/messagingfw/msgtest/group" mrp="mw/messagingmw/messagingfw/msgtest/group/messaging_test.mrp"/>
-</component>
-<component name="sendas" long-name="Send As" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/sendas/group" mrp="mw/messagingmw/messagingfw/sendas/group/messaging_sendas2.mrp"/>
-</component>
-<component name="msgurlhandler" long-name="Message URL Handler" introduced="7.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/group" mrp="mw/messagingmw/messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
-</component>
-<component name="wappushfw" long-name="WAP Push Framework" introduced="6.1" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/wappushfw/group" mrp="mw/messagingmw/messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
-</component>
-<component name="suplsmshandler" long-name="SUPL SMS Handler" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplsmshandler/group" mrp="mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/>
-</component>
-<component name="suplwappushhandler" long-name="SUPL WAP Push Handler" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
-</component>
-</collection>
-<collection name="messagingmw_info" long-name="Messaging Middleware Info" level="api">
-<component name="messagingmw_metadata" long-name="Messaging Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="imsrv" level="specific" long-name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
-<collection name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" level="specific">
-<component name="ximp_core_data_model_api" long-name="XIMP Core Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_host_api" long-name="XIMP Presence Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_presence_data_model_api" long-name="XIMP Presence Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_api" long-name="XIMP Presence Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_presence_management_api" long-name="XIMP Presence Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_management_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_host_api" long-name="XIMP Core Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_core_management_api" long-name="XIMP Core Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_management_api/group"/>
-</component>
-<component name="ximp_presence_base_api" long-name="XIMP Presence Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_base_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_api" long-name="XIMP Core Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_core_base_api" long-name="XIMP Core Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_base_api/group"/>
-</component>
-<component name="ximp_presence_cache_api" long-name="XIMP Presence Cache API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_cache_api/group"/>
-</component>
-<component name="ximp_core_feature_plugin_api" long-name="XIMP Core Feature Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_host_api" long-name="XIMP IM Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_im_data_model_api" long-name="XIMP IM Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_data_model_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_api" long-name="XIMP IM Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_im_management_api" long-name="XIMP IM Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_management_api/group"/>
-</component>
-<component name="ximp_im_base_api" long-name="XIMP IM Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_base_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_host_api" long-name="XIMP Search Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_search_data_model_api" long-name="XIMP Search Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_data_model_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_api" long-name="XIMP search Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_search_management_api" long-name="XIMP Search Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_management_api/group"/>
-</component>
-<component name="ximp_search_base_api" long-name="XIMP Search Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_base_api/group"/>
-</component>
-<component name="xmpp_settings_api" long-name="XMPP Settings API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/group"/>
-</component>
-<component name="im_cache_client_api" long-name="IM Cache Client API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/im_cache_client_api/group"/>
-</component>
-<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 Avability Text" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
-</component>
-</collection>
-<collection name="ximpfw" long-name="XIMP Framework" level="framework">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="ximpfw_build" filter="s60" long-name="XIMP Framework Build">
-<unit bldFile="mw/imsrv/ximpfw/group"/>
-</component>
-</collection>
-<collection name="imservices" long-name="IM Services" level="generic">
-<component name="imfeatureplugin" filter="s60" long-name="IM Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/imfeatureplugin/group"/>
-</component>
-<component name="searchfeatureplugin" filter="s60" long-name="Search Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/searchfeatureplugin/group"/>
-</component>
-<component name="xmppsettingsapi" filter="s60" long-name="XMPP Settings API" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsapi/group"/>
-</component>
-<component name="xmppsettingsfetcher" filter="s60" long-name="XMPP Settings Fetcher" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/group"/>
-</component>
-<component name="instantmessagingcache" filter="s60" long-name="Instant Messaging Cache" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/instantmessagingcache/group"/>
-</component>
-</collection>
-<collection name="brandingserver" long-name="Branding Server" level="specific">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="brandingserver_build" filter="s60" long-name="Branding Server Build">
-<unit bldFile="mw/imsrv/brandingserver/group"/>
-</component>
-</collection>
-</block>
-<block name="legacypresence" level="specific" long-name="Legacy Presence Services" levels="engine fw ui">
-<collection name="pressrv_plat" long-name="Legacy Presence Services Platform Interfaces" level="ui">
-<component name="presence_list_api" long-name="Presence List API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/presence_list_api/group"/>
-</component>
-<component name="watcher_info_api" long-name="Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_info_api/group"/>
-</component>
-<component name="simple_documents_api" long-name="SIMPLE Documents API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_documents_api/group"/>
-</component>
-<component name="authorization_api" long-name="Authorization API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/authorization_api/group"/>
-</component>
-<component name="xdm_protocol_plugin_api" long-name="XDM Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_protocol_plugin_api/group"/>
-</component>
-<component name="watcher_api" long-name="Watcher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_api/group"/>
-</component>
-<component name="xdm_api" long-name="XDM API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_api/group"/>
-</component>
-<component name="registration_api" long-name="Registration API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/registration_api/group"/>
-</component>
-<component name="publisher_api" long-name="Publisher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/publisher_api/group"/>
-</component>
-<component name="messaging_connection_manager_api" long-name="Messaging Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/messaging_connection_manager_api/group"/>
-</component>
-<component name="xdm_settings_api" long-name="XDM Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_settings_api/group"/>
-</component>
-<component name="simple_settings_api" long-name="SIMPLE Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_settings_api/group"/>
-</component>
-<component name="simple_instant_msg_api" long-name="Simple Instant Msg API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_instant_msg_api/group"/>
-</component>
-</collection>
-<collection name="xdmengine" long-name="XDM Engine" level="engine">
-<!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
-<component name="xdmengine_build" filter="s60" long-name="XDM Engine Build">
-<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">
-<unit bldFile="mw/legacypresence/xdmprotocols/group"/>
-</component>
-</collection>
-<collection name="msgconnmanager" long-name="Messaging Connection Manager" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="msgconnmanager_build" filter="s60" long-name="Messaging Connection Manager Build">
-<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">
-<unit bldFile="mw/legacypresence/simpleengine/group"/>
-</component>
-</collection>
-<collection name="presencefwsimpleadpt" long-name="Presence Framework SIMPLE Adaptation" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="simpleplugin" filter="s60" long-name="SIMPLE Plugin" plugin="Y">
-<unit bldFile="mw/legacypresence/presencefwsimpleadpt/group"/>
-</component>
-</collection>
-<collection name="simpledatamodeladapter" long-name="SIMPLE Data Model Adapter" level="fw">
-<component name="presenceplugin" filter="s60" long-name="Presence Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/legacypresence/simpledatamodeladapter/group"/>
-</component>
-</collection>
-</block>
-<block name="opensrv" level="specific" long-name="Open Services" levels="prt lib server eng">
-<collection name="opensrv_plat" long-name="Open Services Platform Interfaces" level="eng">
-<component name="messagequeue_api" long-name="Message Queue API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/opensrv/opensrv_plat/messagequeue_api/group"/>
-</component>
-</collection>
-<collection name="loudmouth" long-name="Loudmouth" level="prt">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="loudmouth_build" filter="s60" long-name="Loudmouth Build" introduced="^2">
-<unit bldFile="mw/opensrv/loudmouth/group"/>
-</component>
-</collection>
-<collection name="libtelepathy" long-name="Telepathy Library" level="lib">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="libtelepathy_build" filter="s60" long-name="Telepathy Library Build" introduced="^2">
-<unit bldFile="mw/opensrv/libtelepathy/group"/>
-</component>
-</collection>
-<collection name="telepathygabble" long-name="Telepathy Gabble" level="eng">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="telepathygabble_build" filter="s60" long-name="Telepathy Gabble Build" introduced="^2">
-<unit bldFile="mw/opensrv/telepathygabble/group"/>
-</component>
-</collection>
-<collection name="isolationserver" long-name="Isolation Server" level="server">
-<component name="messagequeue" filter="s60" long-name="Message Queue" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/messagequeue/group"/>
-</component>
-<component name="isoserver" filter="s60" long-name="ISO Server" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/isoserver/group"/>
-</component>
-<component name="isolationserver_build" filter="s60" long-name="Isloation Server Build" introduced="^2">
-<!-- needs #includes removed. either move the exports to another component or make this a ROM component -->
-<unit bldFile="mw/opensrv/isolationserver/group"/>
-</component>
-</collection>
-</block>
-<block name="searchsrv" level="specific" long-name="Search Services" levels="services engine generic api">
-<collection name="searchsrv_plat" long-name="Search Services Platform Interfaces" level="api">
-<component name="cpix_utility_api" long-name="CPIX Utility API" filter="s60" class="api">
-<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_utility_api/group"/>
-</component>
-<component name="cpix_framework_api" long-name="CPIX Framework API" filter="s60" class="api">
-<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_framework_api/group"/>
-</component>
-<component name="cpix_search_api" long-name="CPIX Search API" filter="s60" class="api">
-<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_search_api/group"/>
-</component>
-</collection>
-<collection name="searchengine" long-name="Search Engine" level="engine">
-<component name="searchengine_util" long-name="Search Engine Utils" filter="s60">
-<unit bldFile="mw/searchsrv/searchengine/util/group"/>
-</component>
-<component name="searchengine_oss" long-name="Search Engine OSS" filter="s60">
-<unit bldFile="mw/searchsrv/searchengine/oss/group"/>
-</component>
-<component name="cpix" long-name="Cross Platform Indexing Engine" filter="s60">
-<unit bldFile="mw/searchsrv/searchengine/cpix/group"/>
-</component>
-</collection>
-<collection name="searcher" long-name="Searcher" level="generic">
-<component name="searchclient" long-name="Search Client" filter="s60">
-<unit bldFile="mw/searchsrv/searcher/SearchClient/group"/>
-</component>
-<component name="searchserver" long-name="Search Server" filter="s60">
-<unit bldFile="mw/searchsrv/searcher/SearchServer/group"/>
-</component>
-<component name="searcher_test" long-name="Searcher Tests" filter="s60" purpose="development">
-<!-- #include from common bld.inf or split into two components -->
-<unit bldFile="mw/searchsrv/searcher/tsrc/RobustnessTest/group"/>
-<unit bldFile="mw/searchsrv/searcher/tsrc/LogPlayer/group"/>
-</component>
-</collection>
-<collection name="searchsrv_harvester" long-name="Search Services Harvester" level="services">
-<component name="searchsrv_pluginfw" long-name="Search Server" filter="s60">
-<unit bldFile="mw/searchsrv/harvester/pluginfw/group"/>
-</component>
-<component name="searchsrv_harvesterserver" long-name="Search Harvester Server" filter="s60">
-<unit bldFile="mw/searchsrv/harvester/HarvesterServer/group"/>
-</component>
-</collection>
-<collection name="searchsrv_watchdog" long-name="Search Services Watch Dog" level="services">
-<component name="searchsrv_watchdog_build" long-name="Search Services Watch Dog Build" filter="s60">
-<unit bldFile="mw/searchsrv/WatchDog/group"/>
-</component>
-</collection>
-<collection name="qcpix" long-name="Qt CPIX" level="engine">
-<component name="qcpix_build" long-name="Qt CPIX Build">
-<unit bldFile="mw/searchsrv/qcpix" proFile="qcpix.pro"/>
-</component>
-</collection>
-<collection name="searchsrv_info" long-name="Search Services Info">
-<component name="searchsrv_build" long-name="Search Services Build">
-<!-- move exports to own component and remove this -->
-<unit bldFile="mw/searchsrv/group"/>
-</component>
-</collection>
-</block>
-<block name="remotemgmt" level="specific" long-name="Remote Management" levels="plugin framework server generic specific">
-<collection name="remotemgmt_pub" long-name="Remote Management Public Interfaces" level="specific">
-<component name="synchronization_capability_api" long-name="Synchronization Capability API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
-</component>
-</collection>
-<collection name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" level="specific">
-<component name="common_agent_util_and_definitions_api" long-name="Common Agent util and definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
-</component>
-<component name="policy_management_certificate_api" long-name="Policy Management Certificate API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/group"/>
-</component>
-<component name="oma_provisioning_adapter_api" long-name="OMA Provisioning Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_adapter_api/group"/>
-</component>
-<component name="device_management_parameter_api" long-name="Device Management Parameter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_parameter_api/group"/>
-</component>
-<component name="data_synchronization_plugin_api" long-name="Data Synchronization Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/group"/>
-</component>
-<component name="sync_alert_handler_api" long-name="Sync Alert Handler API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
-</component>
-<component name="syncml_notifier_api" long-name="SyncML Notifier API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
-</component>
-<component name="syncml_client_api" long-name="SyncML Client API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
-</component>
-<component name="device_management_plugin_api" long-name="Device Management plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_plugin_api/group"/>
-</component>
-<component name="dm_tree_apis" long-name="DM Tree APIs" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
-</component>
-<component name="terminal_security_device_lock_api" long-name="Terminal Security Device Lock API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/group"/>
-</component>
-<component name="policy_management_request_api" long-name="Policy Management Request API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/group"/>
-</component>
-<component name="ds_constant_definitions_api" long-name="DS Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_constant_definitions_api/group"/>
-</component>
-<component name="scp_server_api" long-name="SCP Server API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/group"/>
-</component>
-<component name="data_synchronization_notification_api" long-name="Data Synchronization Notification API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_notification_api/group"/>
-</component>
-<component name="oma_provisioning_engine_api" long-name="OMA Provisioning Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/group"/>
-</component>
-<component name="dm_utils_api" long-name="DM Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/group"/>
-</component>
-<component name="syncml_alert_api" long-name="SyncML Alert API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/group"/>
-</component>
-<component name="obex_client_session_api" long-name="OBEX Client session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/obex_client_session_api/group"/>
-</component>
-<component name="setting_enforcement_info_api" long-name="Setting Enforcement Info API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/group"/>
-</component>
-<component name="dm_constant_definitions_api" long-name="DM Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
-</component>
-<component name="oma_ds_extensions_api" long-name="OMA DS Extensions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
-</component>
-<component name="pnpms_utils_api" long-name="PNPMS Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
-</component>
-<component name="diagnostics_plugin_utility_api" long-name="Diagnostics Plugin Utility API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
-</component>
-<component name="diagnostics_plugin_api" long-name="Diagnostics Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
-</component>
-<component name="diagnostics_framework_api" long-name="Diagnostics Framework API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
-</component>
-<component name="diagnostics_results_api" long-name="Diagnostics Results API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
-</component>
-<component name="diagnostics_plugin_pool_api" long-name="Diagnostics Plugin Pool API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
-</component>
-<component name="adaptive_history_list_api" long-name="Adaptive History List API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
-</component>
-<component name="adaptive_history_list_session_api" long-name="Adaptive History List Session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
-</component>
-<component name="fota_engine_api" long-name="FOTA Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
-</component>
-<component name="update_package_storage_plugin_api" long-name="Update Package Storage Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
-</component>
-<component name="syncml_notifier_roaming_api" long-name="SyncML Notifier Roaming API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
-</component>
-<component name="sync_service_api" long-name="Sync Service API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_service_api/group"/>
-</component>
-<component name="dcmo_adapter_api" long-name="DCMO Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_adapter_api/group"/>
-</component>
-<component name="dcmo_control_api" long-name="DCMO Control API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_control_api/group"/>
-</component>
-<component name="ds_capability_mgmt_plugin_api" long-name="DS Capability Management Plugin API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
-</component>
-</collection>
-<collection name="policymanagement" long-name="Policy Management" level="generic">
-<component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">
-<unit bldFile="mw/remotemgmt/policymanagement/pmdmadapter/group"/>
-</component>
-<component name="dmutilserver" filter="s60" long-name="DM Util Server">
-<unit bldFile="mw/remotemgmt/policymanagement/dmutilserver/group"/>
-</component>
-<component name="policyengine" filter="s60" long-name="Policy Engine">
-<unit bldFile="mw/remotemgmt/policymanagement/policyengine/group" filter="!dfs_build"/>
-</component>
-<component name="policymanagement_build" filter="s60" long-name="Policy Management Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/policymanagement/group"/>
-</component>
-</collection>
-<collection name="syncmlfw" long-name="SyncML Framework" level="server">
-<component name="syncmlfw_build" filter="s60" long-name="SyncML Framework Build">
-<!-- need to break this up into components. Too convoluted a structure to be in a single bld.inf-->
-<unit bldFile="mw/remotemgmt/syncmlfw/group"/>
-</component>
-</collection>
-<collection name="terminalsecurity" long-name="Terminal Security" level="specific">
-<component name="scp" filter="s60" long-name="Security Code Proxy">
-<!-- can only have one unit, need to have these #included from a single bld.inf -->
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpdatabase/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpserver/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scppatternplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scphistoryplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scptimestampplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpeventhandler/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/dmeventnotifier/group"/>
-</component>
-<component name="terminalsecurity_client" filter="s60" long-name="Terminal Control Client">
-<unit bldFile="mw/remotemgmt/terminalsecurity/client/group"/>
-</component>
-<component name="terminalsecurity_server" filter="s60" long-name="Terminal Control Server">
-<unit bldFile="mw/remotemgmt/terminalsecurity/server/group"/>
-</component>
-<component name="tcadapter" filter="s60" long-name="Terminal Control Adapter">
-<unit bldFile="mw/remotemgmt/terminalsecurity/tcadapter/bld"/>
-</component>
-<component name="terminalsecurity_build" filter="s60" long-name="Terminal Security Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/terminalsecurity/group"/>
-</component>
-</collection>
-<collection name="omaprovisioning" long-name="OMA Provisioning" level="specific">
-<component name="pnputil" filter="s60" long-name="PnP Util">
-<unit bldFile="mw/remotemgmt/omaprovisioning/pnputil/group"/>
-</component>
-<component name="provisioning" filter="s60" long-name="Provisioning">
-<unit bldFile="mw/remotemgmt/omaprovisioning/provisioning/group"/>
-</component>
-</collection>
-<collection name="devicediagnosticsfw" long-name="Device Diagnostics Framework" level="framework">
-<component name="diagframework" filter="s60" long-name="Diagnostics Framework">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
-</component>
-<component name="diagpluginbase" filter="s60" long-name="Diagnostics Plugin Base">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
-</component>
-<component name="diagresultsdb" filter="s60" long-name="Diagnostics Results Database">
-<!-- can only have one unit, merge or split into two components -->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
-</component>
-<component name="devicediagnosticsfw_build" filter="s60" long-name="Device Diagnostics Framework Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/group"/>
-</component>
-</collection>
-<collection name="dcmofw" long-name="Device Capability Management Object Framework" level="framework">
-<component name="dcmoclient" filter="s60" long-name="DCMO Client">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoclient/group"/>
-</component>
-<component name="dcmoserver" filter="s60" long-name="DCMO Server">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoserver/group"/>
-</component>
-<component name="dcmocustcmd" filter="s60" long-name="DCMO Custom Commands">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmocustcmd/group"/>
-</component>
-<component name="dcmofw_build" filter="s60" long-name="DCMO Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/dcmofw/group"/>
-</component>
-</collection>
-<collection name="fotaapplication" long-name="FOTA Application" level="generic">
-<component name="fotaapplication_build" filter="s60" long-name="FOTA Application Build">
-<!-- remove this component when configuration is in place and the #ifdefs have been worked out -->
-<unit bldFile="mw/remotemgmt/fotaapplication/group"/>
-</component>
-<component name="fotaserver" filter="s60" long-name="FOTA Server">
-<!-- uncomment when #ifdefs are resolved -->
-<!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
-</component>
-<component name="fotacustcmds" filter="s60" long-name="FOTA Custom Commands" class="placeholder">
-<!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
-<!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
-</component>
-</collection>
-</block>
-<block name="remoteconn" level="generic" long-name="Remote Connectivity" levels="plugin framework server generic specific">
-<collection name="remoteconn_info" long-name="Remote Connectivity Info" level="specific">
-<component name="remoteconn_metadata" long-name="Remote Connectivity Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mtptransports" long-name="MTP Transports" level="plugin">
-<component name="mtpusbtransport" long-name="MTP USB Transport" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpusbtransport/group" mrp="mw/remoteconn/mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
-</component>
-<component name="mtpptpiptransport" long-name="MTP PTP-IP Transport" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpptpiptransport/group" mrp="mw/remoteconn/mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
-</component>
-<component name="mtpcontroller" long-name="MTP Controller" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpcontroller/group" mrp="mw/remoteconn/mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
-</component>
-</collection>
-<collection name="mtpfws" long-name="MTP Frameworks" level="framework">
-<component name="mtpfw" long-name="MTP Framework" introduced="^2" purpose="optional">
-<unit bldFile="mw/remoteconn/mtpfws/mtpfw/group" mrp="mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/>
-</component>
-</collection>
-<collection name="mtpdataproviders" long-name="MTP Data Providers" level="generic">
-<component name="mtpfileandfolderdp" long-name="MTP File and Folder Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group" mrp="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
-</component>
-<component name="mtpimagedp" long-name="MTP Image Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpimagedp/group" mrp="mw/remoteconn/mtpdataproviders/mtpimagedp/group/mtp_imagedp.mrp"/>
-</component>
-<component name="mtppictbridgedp" long-name="MTP PictBridge Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group" mrp="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group/mtp_pictbridgedp.mrp"/>
-</component>
-</collection>
-<collection name="backupandrestore" long-name="Backup and Restore" level="specific">
-<component name="backupengine" long-name="Backup Engine" introduced="9.0" purpose="optional">
-<unit bldFile="mw/remoteconn/backupandrestore/backupengine/group" mrp="mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
-</component>
-<component name="backuptest" long-name="Backup Test" introduced="^2" purpose="development">
-<unit bldFile="mw/remoteconn/backupandrestore/backuptest/group" mrp="mw/remoteconn/backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
-</component>
-</collection>
-<collection name="obex" long-name="OBEX" level="generic">
-<component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexprotocol/group" mrp="mw/remoteconn/obex/obexprotocol/group/obex.mrp"/>
-</component>
-<component name="obexextensionapi" long-name="OBEX Extension API" introduced="9.2" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexextensionapi/group" mrp="mw/remoteconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
-</component>
-</collection>
-</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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<unit mrp="mw/srvdiscovery/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="dlnasrv" level="specific" long-name="DLNA Services" levels="stack server ctrl framework plugin">
-<!-- uncomment all the units when configuration is in place, they're currently #included from other xxx_build components -->
-<collection name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" level="plugin">
-<component name="upnp_media_server_settings_api" long-name="UPnP Media Server Settings API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_settings_api/group"/>
-</component>
-<component name="upnp_av_objects_api" long-name="UPnP A/V Objects API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_av_objects_api/group"/>
-</component>
-<component name="upnp_media_server_api" long-name="UPnP Media Server API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_api/group"/>
-</component>
-<component name="upnp_security_plugin_api" long-name="UPnP Security Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_security_plugin_api/group"/>
-</component>
-<component name="upnp_avcp_api" long-name="UPnP AVCP API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_avcp_api/group"/>
-</component>
-<component name="upnp_media_server_metadata_api" long-name="UPnP Media Server Metadata API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_metadata_api/group"/>
-</component>
-<component name="upnp_command_api" long-name="UPnP Command API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_command_api/group"/>
-</component>
-<component name="upnp_plugin_api" long-name="UPnP Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_plugin_api/group"/>
-</component>
-</collection>
-<collection name="upnpavcontrolpoint" long-name="UPnP A/V Control Point" level="plugin">
-<component name="avcontrolframework" filter="s60" long-name="A/V Control Famework" introduced="9.1" deprecated="^3">
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
-</component>
-<component name="upnpavcontrolpoint_build" filter="s60" long-name="UPnP A/V Control Point Build" introduced="9.1" deprecated="^3">
-<!-- put exports in other component instead -->
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/group"/>
-</component>
-</collection>
-<collection name="upnpmediaserver" long-name="UPnP Media Server" level="server">
-<component name="avobjects" filter="s60" long-name="A/V Objects">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/avobjects/group"/>
-</component>
-<component name="mediaserverclient" filter="s60" long-name="Media Server Client">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverclient/group"/>
-</component>
-<component name="connectionmanagerservice" filter="s60" long-name="Connection Manager Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/connectionmanagerservice/group"/>
-</component>
-<component name="contentdirectoryservice" filter="s60" long-name="Content Directory Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/contentdirectoryservice/group"/>
-</component>
-<component name="mediaserverengine" filter="s60" long-name="Media Server Engine">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverengine/group"/>
-</component>
-<component name="upnpmediaserver_build" filter="s60" long-name="UPnP Media Server Build">
-<!-- move exports into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpmediaserver/group"/>
-</component>
-</collection>
-<collection name="upnpavcontroller" long-name="UPnP A/V Controller" level="ctrl">
-<component name="upnpxmlparser" filter="s60" long-name="UPnP XML Parser" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpxmlparser/group"/>
-</component>
-<component name="upnpavcontrollerserver" filter="s60" long-name="UPnP A/V Controller Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerserver/group"/>
-</component>
-<component name="upnpavcontrollerclient" filter="s60" long-name="UPnP A/V Ccontroller Client" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerclient/group"/>
-</component>
-<component name="upnpavcontrollerhelper" filter="s60" long-name="UPnP A/V Controller Helper" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerhelper/group"/>
-</component>
-<component name="upnpavcontroller_build" filter="s60" long-name="UPnP A/V Controller Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpavcontroller/group"/>
-</component>
-</collection>
-<collection name="upnpframework" long-name="UPnP Framework" level="framework">
-<component name="upnputilities" filter="s60" long-name="UPnP Utilities" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnputilities/group"/>
-</component>
-<component name="upnpextensionpluginif" filter="s60" long-name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpextensionpluginif/group"/> -->
-</component>
-<component name="upnpfiletransferengine" filter="s60" long-name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>-->
-</component>
-<component name="upnpcommonui" filter="s60" long-name="UPnP Common UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpcommonui/group"/>-->
-</component>
-<component name="upnpaiwengine" filter="s60" long-name="UPnP AIW Engine" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpaiwengine/group"/> -->
-</component>
-<component name="upnpaiwprovider" filter="s60" long-name="UPnP AIW Provider" introduced="^2" deprecated="^3" plugin="Y">
-<!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
-</component>
-<component name="upnpmusicadapter" filter="s60" long-name="UPnP Music Adapter" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
-</component>
-<component name="upnpcommand" filter="s60" long-name="UPnP Command" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpcommand/group"/>
-</component>
-<component name="upnpframework_build" filter="s60" long-name="UPnP Framework Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpframework/group"/>
-</component>
-</collection>
-<collection name="upnpsettings" long-name="UPnP Settings" level="framework">
-<component name="upnpsettingsengine" filter="s60" long-name="UPnP Settings Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
-</component>
-<component name="multiselectionui" filter="s60" long-name="Multi-Selection UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/multiselectionui/group"/>-->
-</component>
-<component name="appwizard" filter="s60" long-name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/appwizard/group"/>-->
-</component>
-<component name="upnpsharingui" filter="s60" long-name="UPnP Sharing UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
-</component>
-<component name="upnpgsplugin" filter="s60" long-name="UPnP GS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
-</component>
-<component name="upnpsettings_build" filter="s60" long-name="UPnP Settings Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsettings/group"/>
-</component>
-</collection>
-<collection name="upnpsharing" long-name="UPnP Sharing" level="server">
-<component name="upnpdlnaprofiler" filter="s60" long-name="UPnP DLNA Profiler" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpdlnaprofiler/group"/>
-</component>
-<component name="upnpsecurity" filter="s60" long-name="UPnP Security" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpsecurity/group"/>
-</component>
-<component name="upnpcontentserver" filter="s60" long-name="UPnP Content Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpcontentserver/group"/>
-</component>
-<component name="applicationengine" filter="s60" long-name="UPnP Application Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/applicationengine/group"/>
-</component>
-<component name="upnpsharing_build" filter="s60" long-name="UPnP Sharing Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsharing/group"/>
-</component>
-</collection>
-<collection name="upnpmpxplugins" long-name="UPnP MPX Plugins" level="plugin">
-<component name="upnpplaybackplugins" filter="s60" long-name="UPnP Playback Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/upnpplaybackplugins/group"/>
-</component>
-<component name="upnpmpxplugins_build" filter="s60" long-name="UPnP MPX Plugins Build" introduced="^2">
-<!-- move exports content into other component? -->
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/group"/>
-</component>
-</collection>
-<collection name="upnpharvester" long-name="UPnP Harvester" level="ctrl">
-<component name="upnpharvester_common" filter="s60" long-name="UPnP Harvester Common" introduced="^2" deprecated="^3" class="placeholder">
-<!-- need to merge or #include these to a single bld.inf -->
-<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
- <unit bldFile="upnpharvester/common/cmsettings/group"/>
- <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
- <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
-</component>
-<component name="cdssync" filter="s60" long-name="CDS Sync" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
-</component>
-<component name="mdhserver" filter="s60" long-name="Metadata Harvester Server" introduced="^2" deprecated="^3" class="placeholder">
-<!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
-</component>
-<component name="upnpharvester_build" filter="s60" long-name="UPnP Harvester Build" introduced="^2" deprecated="^3" class="placeholder">
-<!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
-<!--<unit bldFile="upnpharvester/group"/>-->
-</component>
-</collection>
-<collection name="homesync" long-name="Home Sync" level="plugin">
-<component name="contentmanager" filter="s60" long-name="Content Manager" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homesync/group"/>-->
-<!-- move bld.inf into contentmanager dir -->
-</component>
-</collection>
-<collection name="homemedia" long-name="Home Media" level="framework">
-<!-- collection is really just a component. Move down a directory -->
-<component name="homemedia_build" filter="s60" long-name="Home Media" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homemedia/group"/> -->
-</component>
-</collection>
-<collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin">
-<component name="dlnasrv_build" filter="s60" long-name="DLNA Services Build">
-<!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed -->
-<unit bldFile="mw/dlnasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="btservices" level="generic" long-name="Bluetooth Services" levels="framework server generic specific plugin">
-<collection name="btservices_pub" long-name="BT Services Public Interfaces" level="plugin">
-<component name="bluetooth_power_state_api" long-name="Bluetooth Power State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_power_state_api/group"/>
-</component>
-<component name="bluetooth_notifier_api" long-name="Bluetooth Notifier API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_notifier_api/group"/>
-</component>
-</collection>
-<collection name="btservices_plat" long-name="BT Services Platform Interfaces" level="plugin">
-<component name="bluetooth_dosserver_audio_api" long-name="Bluetooth DOS Server Audio API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dosserver_audio_api/group"/>
-</component>
-<component name="bluetooth_dut_mode_api" long-name="Bluetooth DUT Mode API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dut_mode_api/group"/>
-</component>
-<component name="bluetooth_engine_api" long-name="Bluetooth Engine API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-<component name="bluetooth_local_variation_api" long-name="Bluetooth Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_local_variation_api/group"/>
-</component>
-<component name="bluetooth_notifier_internal_api" long-name="Bluetooth Notifier internal API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_notifier_internal_api/group"/>
-</component>
-<component name="bluetooth_sap_connection_state_api" long-name="Bluetooth SAP Connection State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_sap_connection_state_api/group"/>
-</component>
-<component name="bluetooth_secondary_display_notification_api" long-name="Bluetooth Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_secondary_display_notification_api/group"/>
-</component>
-</collection>
-<collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
-<component name="bteng" filter="s60" long-name="Bluetooth Engine">
-<unit bldFile="mw/btservices/bluetoothengine/bteng/group"/>
-</component>
-<component name="btnotif" filter="s60" long-name="Bluetooth Notifier">
-<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"/>
-</component>
-<component name="btmac" filter="s60" long-name="Bluetooth Mono Audio Controller" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btmac/group"/>
-</component>
-<component name="btsac" filter="s60" long-name="Bluetooth Stereo Audio Controller" plugin="Y">
-<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"/>
-</component>
-<component name="btsap" filter="s60" long-name="Bluetooth SIM Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btsap/group"/>
-</component>
-<component name="btui" filter="s60" long-name="Bluetooth UI">
-<unit bldFile="mw/btservices/bluetoothengine/btui/group"/>
-</component>
-<component name="btpbap" filter="s60" long-name="Bluetooth Phonebook Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btpbap/group"/>
-</component>
-<component name="bthid" filter="s60" long-name="Bluetooth HID">
-<unit bldFile="mw/btservices/bluetoothengine/bthid/group"/>
-</component>
-<component name="btctrldcmoadapter" filter="s60" long-name="Bluetooth Control DCMO Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btctrldcmoadapter/group"/>
-</component>
-</collection>
-<collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
-<component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
-<unit bldFile="mw/btservices/bluetoothappprofiles/avrcp" mrp="mw/btservices/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
-</component>
-</collection>
-<collection name="atcommands" long-name="AT Commands" level="generic">
-<component name="modematplugin" long-name="Modem AT Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/modematplugin/group"/>
-</component>
-<component name="lccustomplugin" long-name="LC Custom Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/lccustomplugin/group"/>
-</component>
-</collection>
-<collection name="btservices_info" long-name="BT Services Info" level="plugin">
-<component name="btservices_metadata" long-name="BT Services Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usbservices" level="generic" long-name="USB Services" levels="framework server generic specific plugin">
-<collection name="usbservices_plat" long-name="USB Services Platform Interfaces" level="plugin">
-<component name="pictbridge_api" long-name="PictBridge API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/pictbridge_api/group"/>
-</component>
-<component name="ptp_responder_api" long-name="PTP Responder API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_responder_api/group"/>
-</component>
-<component name="ptp_transport_api" long-name="PTP Transport API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_transport_api/group"/>
-</component>
-<component name="usb_device_control_plugin_api" long-name="USB Device Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_device_control_plugin_api/group"/>
-</component>
-<component name="usb_notifier_api" long-name="USB Notifier API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_notifier_api/group"/>
-</component>
-<component name="usb_personality_api_header" long-name="USB Personality API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_api_header/group"/>
-</component>
-<component name="usb_personality_plugin_api" long-name="USB Personality Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_plugin_api/group"/>
-</component>
-<component name="usb_secondary_display_api" long-name="USB Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_secondary_display_api/group"/>
-</component>
-<component name="usb_watcher_api" long-name="USB Watcher API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_api/group"/>
-</component>
-<component name="usb_watcher_info_api_header" long-name="USB Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_info_api_header/group"/>
-</component>
-</collection>
-<collection name="usbengines" long-name="USB Engines" level="generic">
-<component name="usbotgwatcher" filter="s60" long-name="USB OTG Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbotgwatcher/group"/>
-</component>
-<component name="usbwatcher" filter="s60" long-name="USB Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbwatcher/group"/>
-</component>
-<component name="usblocodplugin" filter="s60" long-name="USB Local Connectivity Domain Plugin" plugin="Y">
-<unit bldFile="mw/usbservices/usbengines/usblocodplugin/group"/>
-</component>
-<component name="usbdevcon" filter="s60" long-name="USB Device Control">
-<unit bldFile="mw/usbservices/usbengines/usbdevcon/group"/>
-</component>
-<component name="usbremotepersonality" filter="s60" long-name="USB Remote Personality">
-<unit bldFile="mw/usbservices/usbengines/usbremotepersonality/group"/>
-</component>
-</collection>
-<collection name="usbclasses" long-name="USB Classes" level="framework">
-<component name="usbobexclasscontroller" filter="s60" long-name="USB OBEX Class Controller" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbobexclasscontroller/group"/>
-</component>
-<component name="usbbasicpersonality" filter="s60" long-name="USB Basic Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbbasicpersonality/group"/>
-</component>
-<component name="usbmscpersonality" filter="s60" long-name="USB MSC Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbmscpersonality/group"/>
-</component>
-<!-- commented out in bld.inf. Should this be deleted?
- <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
- <unit bldFile="usbclasses/ptpstack/group"/>
- </component>
- <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
- <unit bldFile="usbclasses/sicdusbplugin/group"/>
- </component>
- <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
- <unit bldFile="usbclasses/ptpserver/group"/>
- </component>-->
-<component name="pictbridgeengine" filter="s60" long-name="PictBridge Engine">
-<unit bldFile="mw/usbservices/usbclasses/pictbridgeengine/group"/>
-</component>
-<component name="usbphoneasmodem" filter="s60" long-name="USB Phone as Modem" introduced="^3">
-<unit bldFile="mw/usbservices/usbclasses/usbphoneasmodem/group"/>
-</component>
-</collection>
-<collection name="usbuis" long-name="USB UIs" level="specific">
-<component name="usbui" filter="s60" long-name="USB UI">
-<unit bldFile="mw/usbservices/usbuis/usbui/group"/>
-</component>
-<component name="usbuinotif" filter="s60" long-name="USB UI Notifiers">
-<unit bldFile="mw/usbservices/usbuis/usbuinotif/group"/>
-</component>
-<component name="imageprintuiprovider" filter="s60" long-name="ImagePrint UI Provider" plugin="Y">
-<unit bldFile="mw/usbservices/usbuis/imageprintuiprovider/group"/>
-</component>
-<component name="usbimageprintui" filter="s60" long-name="ImagePrint UI">
-<unit bldFile="mw/usbservices/usbuis/imageprintui/group"/>
-</component>
-<component name="usbuiqt" long-name="USB UI Qt" introduced="^4" filter="s60">
-<unit bldFile="mw/usbservices/usbuis/usbuiqt" proFile="usbapplication.pro"/>
-</component>
-</collection>
-<collection name="usbservices_test" long-name="USB Services Test" level="server"/>
-</block>
-<block name="shortlinkconn" level="generic" long-name="Shortlink Connectivity" levels="framework server generic specific plugin">
-<!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
-<collection name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" level="plugin">
-<component name="obex_service_utils_api" long-name="OBEX Service Utils API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_utils_api/group"/>
-</component>
-<component name="obex_service_plugin_api" long-name="OBEX Service Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_plugin_api/group"/>
-</component>
-<component name="dialup_connection_status_api" long-name="Dial-up Connection Status API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dialup_connection_status_api/group"/>
-</component>
-<component name="dun_secondary_display_notification_api" long-name="DUN Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
-</component>
-<component name="obex_secondary_display_notification_api" long-name="OBEX Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
-</component>
-<component name="generic_hid_api" long-name="Generic HID API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/generic_hid_api/group"/>
-</component>
-<component name="locod_bearer_plugin_api" long-name="Locod Bearer Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/locod_bearer_plugin_api/group"/>
-</component>
-<component name="usb_obexservicemanager_client_api" long-name="USB OBEX Service Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_obexservicemanager_client_api/group"/>
-</component>
-</collection>
-<collection name="localconnectivityservice" long-name="Local Connectivity Service" level="server">
-<component name="locod" long-name="Local Connectivity Daemon">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/locod/group"/>
-</component>
-<component name="obexserviceman" long-name="OBEX Service Managar">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
-</component>
-<component name="obexsendservices" long-name="OBEX Send Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
-</component>
-<component name="obexreceiveservices" long-name="OBEX Receive Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
-</component>
-<component name="dun" long-name="Dial Up Networking">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/dun/group"/>
-</component>
-<component name="lcstylustap" long-name="LC Stylus Tap Plugins" plugin="Y">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/lcstylustap/group"/>
-</component>
-<component name="generichid" long-name="Generic HID">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/generichid/group"/>
-</component>
-<component name="headset" long-name="Headset">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/headset/group"/>
-</component>
-</collection>
-</block>
-<block name="imghandling" level="specific" long-name="Image Handling" levels="lib util if">
-<collection name="imagehandling_plat" long-name="Image Handling Platform Interfaces" level="if">
-<component name="image_handling_library_api" long-name="Image Handling Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
-</component>
-<component name="3gp_library_api" long-name="3GP Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
-</component>
-<component name="thumbnailmanager_api" long-name="Thumbnail Manager API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagehandlinglib" long-name="Image Handling Library" level="lib">
-<!-- collection is really a component, need to move down a directory -->
-<component name="ihl" filter="s60" long-name="IHL">
-<unit bldFile="mw/imghandling/imagehandlinglib/group"/>
-</component>
-</collection>
-<collection name="imagehandlingutilities" long-name="Image Handling Utilities" level="util">
-<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager">
-<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
-</component>
-<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager Qt" introduced="^4">
-<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt" filter="!test" proFile="thumbnailmanagerqt.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</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">
-<unit bldFile="mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
-</component>
-</collection>
-</block>
-<block name="mds" level="specific" long-name="Metadata Services" levels="mgr eng server int">
-<collection name="mds_plat" long-name="Metadata Services Platform Interfaces" level="int">
-<component name="context_engine_plugin_api" long-name="Context Engine Plugin API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/group" filter="!test"/>
-</component>
-<component name="harvester_framework_api" long-name="Harvester Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/harvester_framework_api/group" filter="!test"/>
-<!-- can only have one unit with the same filter, #include the following from the previous unit -->
-</component>
-<component name="location_manager_api" long-name="Location Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/location_manager_api/group" filter="!test"/>
-</component>
-<component name="metadata_engine_api" long-name="Metadata Engine API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/metadata_engine_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_collection_manager_api" long-name="Content Listing Framework Collection Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_extended_api" long-name="Content Listing Framework Extended API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_extended_api/group"/>
-</component>
-</collection>
-<collection name="mds_pub" long-name="Metadata Services Public Interfaces" level="int">
-<component name="content_listing_framework_api" long-name="Content Listing Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_pub/content_listing_framework_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="metadataengine" long-name="Metadata Engine" level="eng">
-<component name="metadataengine_common" filter="s60" long-name="Metadata Engine Common" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/common/group"/>
-</component>
-<component name="metadataengine_server" filter="s60" long-name="Metadata Engine Server" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/server/group"/>
-</component>
-<component name="metadataengine_client" filter="s60" long-name="Metadata Engine Client" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/client/group"/>
-</component>
-<component name="metadataengine_build" filter="s60" long-name="Metadata Engine Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/metadataengine/group"/>
-</component>
-</collection>
-<collection name="locationmanager" long-name="Location Manager" level="mgr">
-<component name="locationtrail" filter="s60" long-name="Location Trail" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/locationtrail/group"/>
-</component>
-<component name="locationmanager_server" filter="s60" long-name="Location Manager Server" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/server/group"/>
-</component>
-<component name="locationmanager_client" filter="s60" long-name="Location Manager Client" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/client/group"/>
-</component>
-<component name="locationmanager_build" filter="s60" long-name="Location Manager Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/locationmanager/group"/>
-</component>
-</collection>
-<collection name="contextengine" long-name="Context Engine" level="eng">
-<component name="contextengine_plugins" filter="s60" long-name="Context Engine Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/contextengine/plugins/group"/>
-</component>
-<component name="contextengine_build" filter="s60" long-name="Context Engine Build" introduced="^2">
-<!--make this collection a single component, or make this unit self-contained -->
-<unit bldFile="mw/mds/contextengine/group"/>
-</component>
-</collection>
-<collection name="harvester" long-name="Harvester" level="eng">
-<component name="blacklistclient" filter="s60" long-name="Blacklist Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistclient/group"/>
-</component>
-<component name="blacklistserver" filter="s60" long-name="Blacklist Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistserver/group"/>
-</component>
-<component name="harvester_common" filter="s60" long-name="Harvester Common" introduced="^2">
-<unit bldFile="mw/mds/harvester/common/group"/>
-</component>
-<component name="composerplugins" filter="s60" long-name="Composer Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/composerplugins/group"/>
-</component>
-<component name="harvesterplugins" filter="s60" long-name="Harvester Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/harvesterplugins/group"/>
-</component>
-<component name="monitorplugins" filter="s60" long-name="Monitor Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/monitorplugins/group"/>
-</component>
-<component name="harvester_server" filter="s60" long-name="Harvester Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/server/group"/>
-</component>
-<component name="harvester_client" filter="s60" long-name="Harvester Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/client/group"/>
-</component>
-<component name="harvester_build" filter="s60" long-name="Harvester Build" introduced="^2">
-<!-- split these exports into the other components -->
-<unit bldFile="mw/mds/harvester/group"/>
-</component>
-</collection>
-<collection name="watchdog" long-name="Watchdog" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="mdswatchdog" filter="s60" long-name="Metadata Watchdog" introduced="^2">
-<unit bldFile="mw/mds/watchdog/group"/>
-</component>
-</collection>
-<collection name="clfwrapper" long-name="Content Listing Framework Wrapper" level="int">
-<!-- collection is really a component. Move down a directory -->
-<component name="clfwrapper_build" filter="s60" long-name="CLF Wrapper Build" introduced="^2" class="placeholder">
-<!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
-<!--<unit bldFile="clfwrapper/group"/>-->
-</component>
-</collection>
-<collection name="mds_info" long-name="Metadata Services Info" level="int">
-<component name="mds_build" filter="s60" long-name="Metadata Services Build" introduced="^2">
-<!-- consider distributiing this into the rest of the components in the package -->
-<unit bldFile="mw/mds/group"/>
-</component>
-</collection>
-</block>
-<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"/>
-</component>
-<component name="videoconnutility_api" long-name="Video Connection Utility API" filter="s60" class="api">
-<unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/group"/>
-</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"/>
-</component>
-</collection>
-<collection name="videoscheduler" long-name="Video Scheduler" level="util">
-<component name="schedulerclient" filter="s60" long-name="Video Scheduler Client">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerclient/group"/>
-</component>
-<component name="schedulerserver" filter="s60" long-name="Video Scheduler Server">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerserver/group"/>
-</component>
-</collection>
-<collection name="videoconnutility" long-name="Video Connection Utility" level="util">
-<component name="connutilpsworker" filter="s60" long-name="Connection Utility Publish and Subscribe Worker">
-<unit bldFile="mw/videoutils/videoconnutility/connutilpsworker/group"/>
-</component>
-<component name="video_connutility" filter="s60" long-name="Video Connection Utility">
-<unit bldFile="mw/videoutils/videoconnutility/connutility/group"/>
-</component>
-</collection>
-<collection name="videoutils_info" long-name="Video Utils Info" level="if"/>
-</block>
-<block name="mmmw" level="generic" long-name="Multimedia Middleware" levels="plugin framework server generic specific">
-<collection name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" level="specific">
-<component name="multimedia_data_source_api" long-name="Multimedia Data Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
-</component>
-<component name="progressive_download_api" long-name="Progressive Download API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/progressive_download_api/group"/>
-</component>
-<component name="equalizer_ui_api" long-name="Equalizer UI API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
-</component>
-<component name="enhanced_media_client_api" long-name="Enhanced Media Client API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
-</component>
-<component name="stream_control_custom_command_api" long-name="Stream Control Custom Command API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
-</component>
-<component name="emc_buffer_source_api" long-name="EMC Buffer Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_buffer_source_api/group"/>
-</component>
-<component name="emc_file_source_api" long-name="EMC File Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
-</component>
-<component name="audio_metadata_reader_api" long-name="Audio MetaData Reader API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
-</component>
-<component name="emc_progressive_download_source_api" long-name="EMC Progressive Download Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
-</component>
-<component name="emc_volume_effect_api" long-name="EMC Volume Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
-</component>
-<component name="emc_balance_effect_api" long-name="EMC Balance Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_balance_effect_api/group"/>
-</component>
-<component name="emc_descriptor_source_api" long-name="EMC Descriptor Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_descriptor_source_api/group"/>
-</component>
-<component name="emc_drm_config_intfc_api" long-name="EMC DRM Config Intfc API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
-</component>
-<component name="voip_audio_services_api" long-name="VoIP Audio Services" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/group"/>
-</component>
-<component name="configuration_components_factory_api" long-name="Configuration Components Factory API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
-</component>
-<component name="audio_output_control_utility_api" long-name="Audio Output Control Utility API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/group"/>
-</component>
-<component name="audio_output_control_utility_proxy_api" long-name="Audio Output Control Utility Proxy API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
-</component>
-<component name="emc_audio_effects_api" long-name="EMC Audio Effects API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
-</component>
-<component name="call_audio_control_api" long-name="Call AudioControl API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/group"/>
-</component>
-<component name="radio_utilities_api" long-name="Radio Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/group"/>
-</component>
-<component name="radio_preset_utilities_api" long-name="Radio Preset Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
-</component>
-<component name="radio_monitor_api" long-name="Radio Monitor API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
-</component>
-<component name="thumbnail_engine_api" long-name="Thumbnail Engine API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/thumbnail_engine_api/group"/>
-</component>
-<component name="telephony_multimedia_service_api" long-name="Telephony Multimedia Service API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
-</component>
-<component name="openmax_al_api" long-name="OpenMAX AL API" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/openmax_al_api/group"/>
-</component>
-</collection>
-<collection name="mmfenh" long-name="MMF Enhancements" level="generic">
-<component name="advancedaudiocontroller" filter="s60" long-name="Advanced Audio Controllers" plugin="Y">
-<unit bldFile="mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
-</component>
-<component name="audiooutputcontrolutility" filter="s60" long-name="Audio Output Control Utility">
-<unit bldFile="mw/mmmw/mmfenh/audiooutputcontrolutility/group"/>
-</component>
-<component name="configurationcomponentsfactory" filter="s60" long-name="Configuration Components Factory">
-<unit bldFile="mw/mmmw/mmfenh/configurationcomponentsfactory/group"/>
-</component>
-<component name="enhancedaudioplayerutility" filter="s60" long-name="Enhanced Audio Player Utility">
-<unit bldFile="mw/mmmw/mmfenh/enhancedaudioplayerutility/group"/>
-</component>
-<component name="enhancedmediaclient" filter="s60" long-name="Enhanced Media Client">
-<unit bldFile="mw/mmmw/mmfenh/enhancedmediaclient/group"/>
-</component>
-<component name="profilesettingsmonitor" filter="s60" long-name="Profile Settings Monitor">
-<unit bldFile="mw/mmmw/mmfenh/profilesettingsmonitor/group"/>
-</component>
-<component name="progressivedownload" filter="s60" long-name="Progressive Download">
-<unit bldFile="mw/mmmw/mmfenh/progressivedownload/group"/>
-</component>
-</collection>
-<collection name="mm_fw" long-name="Multimedia Frameworks" level="framework">
-<!-- Id needs to be unique, mmfw already in use -->
-<!-- Placeholder for OpenAX AL and other stuff -->
-</collection>
-<collection name="mmserv" long-name="Multimedia Services" level="specific">
-<component name="audioeffectsui" filter="s60" long-name="Audio Effects UI">
-<unit bldFile="mw/mmmw/mmserv/audioeffectsui/group"/>
-</component>
-<component name="callaudiocontrol" filter="s60" long-name="Call Audio Control">
-<unit bldFile="mw/mmmw/mmserv/callaudiocontrol/group"/>
-</component>
-<component name="metadatautility" filter="s60" long-name="Metadata Utility">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/group"/>
-</component>
-<component name="radioutility" filter="s60" long-name="Radio Utility">
-<unit bldFile="mw/mmmw/mmserv/radioutility/group"/>
-</component>
-<component name="thumbnailengine" filter="s60" long-name="Thumbnail Engine" introduced="^2">
-<unit bldFile="mw/mmmw/mmserv/thumbnailengine/group"/>
-</component>
-<component name="tms" filter="s60" long-name="Telephony Multimedia Service" introduced="^3">
-<unit bldFile="mw/mmmw/mmserv/tms/group"/>
-</component>
-<component name="voipaudioservices" filter="s60" long-name="VoIP Audio Services">
-<unit bldFile="mw/mmmw/mmserv/voipaudioservices/group"/>
-</component>
-<component name="lib3gpextparser" filter="s60" long-name="3GP Extension Metadata Parser Library">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group" filter="sf_build"/>
-</component>
-</collection>
-<collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
-<component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="helix" level="generic" long-name="Helix" levels="plugin framework server generic specific">
-<collection name="helix_ren" long-name="Helix Engine" level="framework">
-<!-- what does "ren" stand for? -->
-<component name="helix_stub" filter="s60" long-name="Helix Stub" introduced="^2" class="api">
-<unit bldFile="mw/helix/helix_ren/helix_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="camerasrv" level="specific" long-name="Camera Services" levels="plugin fw api">
-<collection name="camerasrv_plat" long-name="Camera Services Platform Interfaces" level="api">
-<component name="media_recorder_sink_api" long-name="Media Recorder Sink API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
-</component>
-<component name="custom_onboard_camera_api" long-name="Custom Onboard Camera API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
-</component>
-<component name="imaging_configuration_manager_api" long-name="Imaging Configuration Manager API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
-</component>
-<component name="media_recorder_api" long-name="Media Recorder API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_api/group" filter="!test"/>
-</component>
-<component name="3gp_file_composer_api" long-name="3GP File Composer API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
-</component>
-</collection>
-<collection name="camcordermmfplugin" long-name="Camcorder MMF Plugin" level="plugin">
-<!-- collection is really a component. Should move down a directory -->
-<component name="camcordermmfplugin_build" filter="s60" long-name="Camcorder MMF Plugin Build" plugin="Y">
-<unit bldFile="mw/camerasrv/camcordermmfplugin/build"/>
-</component>
-</collection>
-<collection name="configmanagers" long-name="Config Managers" level="api">
-<component name="imagingconfigmanager" filter="s60" long-name="Imaging Config Manager">
-<unit bldFile="mw/camerasrv/configmanagers/imagingconfigmanager/group"/>
-</component>
-</collection>
-<collection name="camerasrv_info" long-name="Camera Services Info" level="api">
-<component name="camerasrv_build" filter="s60" long-name="Camera Services Build">
-<!-- should split into individual bld.infs -->
-<unit bldFile="mw/camerasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="mmappfw" level="specific" long-name="Multimedia App Framework" levels="fw utils if">
-<collection name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" level="if">
-<component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interfaces Build" introduced="^1" filter="s60">
-<!-- this is no longer necessary when confguration is put in place -->
-<unit bldFile="mw/mmappfw/mmappfw_plat"/>
-</component>
-<component name="collection_helper_api" long-name="Collection Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
-</component>
-<component name="harvester_collection_mediator_api" long-name="Harvester Collection Mediator API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/group"/>
-</component>
-<component name="harvester_metadata_extractor_api" long-name="Harvester Metadata Extractor API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/group"/>
-</component>
-<component name="harvester_server_api" long-name="Harvester Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_server_api/group"/>
-</component>
-<component name="harvester_utility_api" long-name="Harvester Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_utility_api/group"/>
-</component>
-<component name="playlist_engine_api" long-name="Playlist Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playlist_engine_api/group"/>
-</component>
-<component name="mtp_keys_api" long-name="MTP Keys API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mtp_keys_api/group"/>
-</component>
-<component name="mpx_collection_common_definition_api" long-name="MPX Collection Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_common_definition_api/group"/>
-</component>
-<component name="mpx_collection_utility_api" long-name="MPX Collection Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/group"/>
-</component>
-<component name="mpx_common_api" long-name="MPX Common API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_api/group"/>
-</component>
-<component name="mpx_common_definition_api" long-name="MPX Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_common_definition_api" long-name="MPX Playback Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_utility_api" long-name="MPX Playback Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/group"/>
-</component>
-<component name="mpx_base_view_plugins_api" long-name="MPX Base View Plugins API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/group"/>
-</component>
-<component name="mpx_view_utility_api" long-name="MPX View Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_view_utility_api/group"/>
-</component>
-<component name="mpx_albumart_utility_api" long-name="MPX Album Art Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/group"/>
-</component>
-<component name="media_player_settings_engine_api" long-name="Media Player Settings Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
-</component>
-<component name="mpx_backstepping_utility_api" long-name="MPX Backstepping Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_backstepping_utility_api/group"/>
-</component>
-<component name="asx_parser_api" long-name="ASX Parser API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/asx_parser_api/group"/>
-</component>
-<component name="playback_helper_api" long-name="Playback Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playback_helper_api/group"/>
-</component>
-<component name="videoplaylist_utility_api" long-name="Video Playlist Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/videoplaylist_utility_api/group"/>
-</component>
-</collection>
-<collection name="mpx" long-name="Multimedia Player" level="fw">
-<component name="commonframework" filter="s60" long-name="MPX Common Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/commonframework/group"/>
-</component>
-<component name="playbackframework" filter="s60" long-name="MPX Playback Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/playbackframework/group"/>
-</component>
-<component name="mpxcollectionfw" filter="s60" long-name="MPX Collection Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/collectionframework/group"/>
-</component>
-<component name="mpxviewfw" filter="s60" long-name="MPX View Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/viewframework/group"/>
-</component>
-<component name="mpxviewframeworkqt" long-name="MPX View Framework Qt" filter="s60">
-<unit bldFile="mw/mmappfw/mpx/mpxviewframeworkqt" proFile="mpxviewframeworkqt.pro" qmakeArgs="-r -config rom"/>
-</component>
-<component name="mpx_build" filter="s60" long-name="MPX Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/mpx/group"/>
-</component>
-</collection>
-<collection name="mmappcomponents" long-name="Multimedia App Components" level="utils">
-<component name="mmappcomponents_build" filter="s60" long-name="Multimedia App Components Build" introduced="^1">
-<!-- needed for #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
- Can remove this once configuration is in place-->
-<unit bldFile="mw/mmappfw/mmappcomponents/group"/>
-</component>
-<component name="collectionhelper" filter="s60" long-name="Media Player Collection Helper" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/collectionhelper/group"/>
-</component>
-<component name="playlistengine" filter="s60" long-name="Playlist Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/playlistengine/group"/>
-</component>
-<component name="mpxharvester" filter="s60" long-name="Media Player Harvester" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/harvester/group"/>
-</component>
-<component name="mmappcommonui" filter="s60" long-name="Multimedia App Common UI" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmappcommonui/group"/>
-</component>
-<component name="mediaplayersettingsengine" filter="s60" long-name="Media Player Settings Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
-</component>
-<component name="audiofetcher" filter="s60" long-name="Audio Fetcher" introduced="^1" plugin="Y">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
-</component>
-<component name="asxparser" filter="s60" long-name="ASX Parser" introduced="^1">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
-</component>
-<component name="playbackhelper" filter="s60" long-name="Playback Helper" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/playbackhelper/group"/>
-</component>
-<component name="videoplaylistutility" filter="s60" long-name="Video Playlist Utility" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/videoplaylistutility/group"/>
-</component>
-<component name="mmmtpdataprovider" filter="s60" long-name="Multimedia MTP Data Provider" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmmtpdataprovider/group"/>
-</component>
-</collection>
-<collection name="mmappfw_info" long-name="Multimedia App Framework Info" level="if">
-<component name="mmappfw_build" filter="s60" long-name="Multimedia App Framework Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/group"/>
-</component>
-<component name="mmappfw_test" filter="s60,test,api_test,pref_test" long-name="Multimedia App Framework Test" purpose="development" introduced="^1"/>
-</collection>
-</block>
-<block name="hgwidgets" level="specific" long-name="HG Widgets" levels="framework service api">
-<collection name="hgwidgets_pub" long-name="HG Widgets Platform Interfaces" level="api">
-<component name="ganeswidgets_api" long-name="Ganes Widgets API" introduced="^4" class="api placeholder">
-<!-- should separate out unit -->
-</component>
-</collection>
-<collection name="hgwidgets_pub" long-name="HG Widgets Public Interfaces" level="api"/>
-<collection name="ganeswidgets" long-name="Ganes Widgets" level="service">
-<!-- really a component, should move down a dir level and have a unit -->
-<component name="ganeswidgets_build" long-name="Ganes Widgets Build" introduced="^4" class="placeholder">
-<!-- should separate out unit -->
-</component>
-</collection>
-<collection name="hgwidgets_info" long-name="HG Widgets Info" level="framework">
-<component name="hgwidgets_build" long-name="HG Widgets Build" introduced="^4">
-<unit bldFile="mw/hgwidgets" proFile="hgwidgets.pro"/>
-</component>
-</collection>
-</block>
-<block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework api">
-<collection name="inputmethods_pub" long-name="Input Methods Public Interfaces" level="api">
-<component name="ptiengine_iti_api" long-name="PTI Engine API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
-</component>
-<component name="optical_character_recognition_api" long-name="Optical Character Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
-</component>
-<component name="input_language_info_api" long-name="Input Language Info API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
-</component>
-</collection>
-<collection name="inputmethods_plat" long-name="Input Methods Platform Interfaces" level="api">
-<component name="pen_input_server_api" long-name="Pen Input Server API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/group" filter="!test"/>
-</component>
-<component name="ptiengine_hwr_api" long-name="PTI Engine Handwriting Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group" filter="!test"/>
-</component>
-<component name="aknfep_settings_api" long-name="Avkon FEP Settings API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
-</component>
-<component name="aknfep_status_api" long-name="Avkon FEP Status API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
-</component>
-<component name="ptiengine_key_definations_api" long-name="PTI Engine Key Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
-</component>
-<component name="aknfep_definitions_api" long-name="Avkon FEP Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
-</component>
-<component name="aknfep_pen_support_api" long-name="Avkon FEP Pen Support API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
-</component>
-<component name="ptiengine_indic_definitions_api" long-name="PTI Engine Indic Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
-</component>
-<component name="aknfep_uiinterface_api" long-name="Avkon FEP UI Interface API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="textinput" long-name="Text Input" level="framework">
-<component name="ptienginev2" filter="s60" long-name="Predictive Text Input Engine">
-<!--uncomment when configuration is turned on and textinput_build is removed-->
-<!-- <unit bldFile="textinput/ptienginev2/group"/>-->
-</component>
-<component name="akninputlanguage" filter="s60" long-name="Avkon Input Language">
-<unit bldFile="mw/inputmethods/textinput/akninputlanguage/group"/>
-</component>
-<component name="peninputarc" filter="s60" long-name="Pen Input Arc">
-<unit bldFile="mw/inputmethods/textinput/peninputarc/group"/>
-</component>
-<component name="peninputcommonctrls" filter="s60" long-name="Pen Input Common Controls">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonctrls/group"/>
-</component>
-<component name="peninputcommonlayout" filter="s60" long-name="Pen Input Common Layout">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonlayout/group"/>
-</component>
-<component name="peninputhwrtrui" filter="s60" long-name="Pen Input Handwriting Recognition Training UI" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrtrui/group"/>
-</component>
-<component name="textinput_build" filter="s60" long-name="Text Input Build">
-<!--needed for #ifdef, can be removed when configuration is implemented -->
-<unit bldFile="mw/inputmethods/textinput/group"/>
-</component>
-</collection>
-<collection name="fep" long-name="FEP" level="engine">
-<component name="aknfep" filter="s60" long-name="Avkon FEP" plugin="Y">
-<unit bldFile="mw/inputmethods/fep/aknfep/group"/>
-</component>
-<component name="frontendprocessor" long-name="Front End Processor" purpose="mandatory">
-<unit bldFile="mw/inputmethods/fep/frontendprocessor/group" mrp="mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
-</component>
-</collection>
-<collection name="inputmethods_info" long-name="Input Methods Info" level="api">
-<component name="inputmethods_metadata" long-name="Input Methods Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="qt" level="generic" long-name="Qt" levels="tool mw app">
-<collection name="qtconf" long-name="Qt Config" level="tool">
-<component name="qt_deviceconfiguration" long-name="Qt Device Configuration" introduced="^2" class="config tool">
-<unit bldFile="mw/qt/src/s60installs/deviceconfiguration"/>
-</component>
-</collection>
-<collection name="qt_info" long-name="Qt Info" level="mw">
-<component name="qt_build" long-name="Qt Build" introduced="^2">
-<unit bldFile="mw/qt" proFile="projects.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-<collection name="qtdemos" long-name="Qt Demos" level="app">
-<component name="qtdemos_build" long-name="Qt Demos Build" introduced="^2" filter="qtdemos">
-<unit bldFile="mw/qt/demos" proFile="demos.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-<collection name="qtexamples" long-name="Qt Examples" level="app">
-<component name="qtexamples_build" long-name="Qt Examples Build" introduced="^2" filter="qtexamples">
-<unit bldFile="mw/qt/examples" proFile="examples.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-<collection name="qt_tests" long-name="Qt Tests" level="app">
-<component name="qttestsauto" long-name="Qt Automated Tests" introduced="^2" filter="qttestsauto">
-<unit bldFile="mw/qt/tests/auto" proFile="qtpauto.pro"/>
-</component>
-<component name="qttestsbenchmarks" long-name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks">
-<unit bldFile="mw/qt/tests/benchmarks" proFile="benchmarks.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-</block>
-<block name="qtextensions" level="generic" long-name="Qt Extensions" levels="tool mw app">
-<collection name="qtecomplugins" long-name="Qt ECom Plugins" level="app">
-<component name="qtecomplugins" filter="qtecomplugins" long-name="Qt ECom Plugin" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtecomplugins" proFile="qtecomplugins.pro" qmakeArgs="-r"/>
-</component>
-<component name="qtextensions_examples" filter="qtextensionsexamples" long-name="Qt ECom Plugin Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtecomplugins/examples" proFile="examples.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qthighway" long-name="Qt Highway" level="app">
-<component name="qthighway" filter="qthighway" long-name="Qt Highway" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qthighway" proFile="qthighway.pro" qmakeArgs="-r"/>
-</component>
-<component name="qthighway_examples" filter="qtextensionsexamples" long-name="Qt Highway Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qthighway/examples" qmakeArgs="-r"/>
-</component>
-<component name="qthighwaytests" filter="qtextensionstests" long-name="Qt Highway Tests" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qthighway/tests" proFile="tests.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qtmobileextensions" long-name="Qt Mobile Extensions" level="app">
-<component name="qtmobileextensions" filter="qtextension" long-name="Qt Mobile Extensions" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtmobileextensions" proFile="qtmobileextensions.pro" qmakeArgs="-r"/>
-</component>
-<component name="qtmobileextensions_examples" filter="qtextensionsexamples" long-name="Qt Mobile Extensions Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtmobileextensions/examples" proFile="examples.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qtmobility" long-name="Qt Mobility">
-<component name="qtmobility" filter="qtmobility" long-name="Qt Mobility" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtmobility" proFile="qtmobility.pro" qmakeArgs="-r"/>
-</component>
-<component name="qtmobility_examples" filter="qtextensionsexamples" long-name="Qt Mobility Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtmobility/examples" proFile="examples.pro" qmakeArgs="-r"/>
-</component>
-<component name="qtmobilitytests" filter="qtextensionstests" long-name="Qt Extensions Tests" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtmobility/tests" proFile="tests.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qtextensions_info">
-<component name="qtextensions_build" long-name="Qt Extensions Confgure" introduced="^4" class="conf">
-<unit bldFile="mw/qtextensions/group"/>
-</component>
-<component name="qtextensions_build" long-name="Qt Extensions Build" introduced="^4">
-<!-- break this up into the above collections-->
-<unit bldFile="mw/qtextensions" proFile="qtextensions.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</block>
-<block name="hb" level="generic" long-name="Orbit" levels="engine test api">
-<collection name="hb_info" long-name="Orbit Info" level="api">
-<component name="hb_build" long-name="Orbit Build" introduced="^4">
-<!-- should break this down into actual components -->
-<unit bldFile="mw/hb" proFile="hb.pro" qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
-</component>
-</collection>
-<collection name="hb_test" long-name="Orbit Test" level="test">
-<component name="hb_fute" filter="hb_fute_app" long-name="Fute" introduced="^4">
-<unit bldFile="mw/hb/tsrc/fute" proFile="fute.pro" qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
-</component>
-</collection>
-</block>
-<block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
-<collection name="classicui_plat" long-name="Classic UI Platform Interfaces" level="specific">
-<component name="personalisation_framework_api" long-name="Personalisation Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_framework_api/group" filter="!test"/>
-</component>
-<component name="signal_pane_api" long-name="Signal Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
-</component>
-<component name="japanese_reading_api" long-name="Japanese Reading API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/japanese_reading_api/group" filter="!test"/>
-</component>
-<component name="global_popup_priority_controller_api" long-name="Global Popup Priority Controller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
-</component>
-<component name="item_finder_api" long-name="Item Finder API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/item_finder_api/group" filter="!test"/>
-</component>
-<component name="avkon_fonts_api" long-name="Avkon Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_fonts_api/group" filter="!test"/>
-</component>
-<component name="extended_utilities_api" long-name="Extended Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
-</component>
-<component name="personalisation_plugin_api" long-name="Personalisation Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
-</component>
-<component name="extended_aiw_criteria_api" long-name="Extended AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="personalisation_application_api" long-name="Personalisation Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_application_api/group"/>
-</component>
-<component name="volume_popup_api" long-name="Volume Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
-</component>
-<component name="avkon_secondary_display_support_api" long-name="AVKON Secondary Display Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_support_api/group" filter="!test"/>
-</component>
-<component name="extended_setting_pages_api" long-name="Extended Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_setting_pages_api/group" filter="!test"/>
-</component>
-<component name="extended_lists_api" long-name="Extended Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_lists_api/group" filter="!test"/>
-</component>
-<component name="input_block_api" long-name="Input Block API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/input_block_api/group" filter="!test"/>
-</component>
-<component name="avkon_ui_server_api" long-name="AVKON UI Server API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_ui_server_api/group" filter="!test"/>
-</component>
-<component name="number_grouping_api" long-name="Number Grouping API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/number_grouping_api/group" filter="!test"/>
-</component>
-<component name="extended_status_pane_api" long-name="Extended Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_status_pane_api/group" filter="!test"/>
-</component>
-<component name="extended_notifiers_api" long-name="Extended Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notifiers_api/group" filter="!test"/>
-</component>
-<component name="task_list_api" long-name="Task List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
-</component>
-<component name="personalisation_slide_show_dialog_api" long-name="Personalisation Slide Show Dialog API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
-</component>
-<component name="key_event_utilities_api" long-name="Key Event Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_event_utilities_api/group"/>
-</component>
-<component name="emergency_call_support_api" long-name="Emergency Call Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/emergency_call_support_api/group" filter="!test"/>
-</component>
-<component name="extended_dialogs_api" long-name="Extended Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_dialogs_api/group"/>
-</component>
-<component name="legacy_ui_framework_headers_api" long-name="Legacy UI Framework Headers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/legacy_ui_framework_headers_api/group"/>
-</component>
-<component name="extended_editors_api" long-name="Extended Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_editors_api/group" filter="!test"/>
-</component>
-<component name="alarm_api" long-name="Alarm API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alarm_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_interface_base_api" long-name="AIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_base_api/group" filter="!test"/>
-</component>
-<component name="list_effects_api" long-name="List Effects API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/list_effects_api/group" filter="!test"/>
-</component>
-<component name="find_item_ui_api" long-name="Find Item UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/find_item_ui_api/group" filter="!test"/>
-</component>
-<component name="server_application_services_api" long-name="Server Application Services API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/server_application_services_api/group" filter="!test"/>
-</component>
-<component name="common_ui_settings_api" long-name="Common UI Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_ui_settings_api/group"/>
-</component>
-<component name="aiw_service_interface_menu_api" long-name="AIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_menu_api/group" filter="!test"/>
-</component>
-<component name="eikon_server_extension_client_api" long-name="EIKON Server Extension Client API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/eikon_server_extension_client_api/group" filter="!test"/>
-</component>
-<component name="skinnable_clock_api" long-name="Skinnable Clock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/skinnable_clock_api/group" filter="!test"/>
-</component>
-<component name="battery_pane_api" long-name="Battery Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/battery_pane_api/group" filter="!test"/>
-</component>
-<component name="fep_document_navigation_api" long-name="FEP Document Navigation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
-</component>
-<component name="personalisation_localised_texts_api" long-name="Personalisation Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
-</component>
-<component name="memory_card_ui_api" long-name="Memory Card UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
-</component>
-<component name="avkon_status_api" long-name="AVKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_status_api/group"/>
-</component>
-<component name="application_switching_api" long-name="Application Switching API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/application_switching_api/group" filter="!test"/>
-</component>
-<component name="avkon_localised_texts_api" long-name="AVKON Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_localised_texts_api/group"/>
-</component>
-<component name="avkon_secondary_display_api" long-name="AVKON Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_api/group"/>
-</component>
-<component name="extended_animation_api" long-name="Extended Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_notes_api" long-name="Extended Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notes_api/group" filter="!test"/>
-</component>
-<component name="text_scroller_api" long-name="Text Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/text_scroller_api/group" filter="!test"/>
-</component>
-<component name="custom_cursors_api" long-name="Custom Cursors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/custom_cursors_api/group" filter="!test"/>
-</component>
-<component name="global_window_priorities_api" long-name="Global Window Priorities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_window_priorities_api/group"/>
-</component>
-<component name="extended_indicators_api" long-name="Extended Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_indicators_api/group" filter="!test"/>
-</component>
-<component name="special_character_table_api" long-name="Special Character Table API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/special_character_table_api/group" filter="!test"/>
-</component>
-<component name="avkon_settings_api" long-name="AVKON Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_settings_api/group"/>
-</component>
-<component name="extended_sounds_api" long-name="Extended Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_sounds_api/group"/>
-</component>
-<component name="themes_settings_api" long-name="Themes Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/themes_settings_api/group"/>
-</component>
-<component name="media_shared_document_api" long-name="Media Shared Document API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/media_shared_document_api/group" filter="!test"/>
-</component>
-<component name="extended_queries_api" long-name="Extended Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_queries_api/group"/>
-</component>
-<component name="phone_number_text_utilities_api" long-name="Phone Number Text Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
-</component>
-<component name="extended_scroller_api" long-name="Extended Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_scroller_api/group"/>
-</component>
-<component name="key_rotator_api" long-name="Key Rotator API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_rotator_api/group" filter="!test"/>
-</component>
-<component name="extended_grids_api" long-name="Extended Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_grids_api/group" filter="!test"/>
-</component>
-<component name="generic_parameter_api" long-name="Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="indicator_touch_observer_api" long-name="Indicator Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_touch_observer_api/group"/>
-</component>
-<component name="popup_form_api" long-name="Popup Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/popup_form_api/group" filter="!test"/>
-</component>
-<component name="stylus_activated_popup_api" long-name="Stylus Activated Pop-up API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/stylus_activated_popup_api/group" filter="!test"/>
-</component>
-<component name="indicator_plugin_api" long-name="Indicator Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_plugin_api/group" filter="!test"/>
-</component>
-<component name="layout_configuration_api" long-name="Layout Configuration API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/layout_configuration_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_filter_factory_api" long-name="Common File Dialogs Filter Factory API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group" filter="!test"/>
-</component>
-<component name="avkon_anim_dll_api" long-name="AVKON Anim DLL API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_anim_dll_api/group"/>
-</component>
-<component name="extended_initialization_api" long-name="Extended Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_initialization_api/group" filter="!test"/>
-</component>
-<component name="long_tap_animation_api" long-name="Long Tap Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/long_tap_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_ui_framework_definitions_api" long-name="Extended UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_ui_framework_definitions_api/group"/>
-</component>
-<component name="extended_buttons_api" long-name="Extended Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_buttons_api/group" filter="!test"/>
-</component>
-<component name="aiw_provider_utility_api" long-name="AIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_provider_utility_api/group" filter="!test"/>
-</component>
-<component name="transition_effect_parameters_api" long-name="Transition Effect Parameters API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_parameters_api/group" filter="!test"/>
-</component>
-<component name="extended_input_capabilities_api" long-name="Extended Input Capabilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_input_capabilities_api/group" filter="!test"/>
-</component>
-<component name="uikon_status_api" long-name="UIKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/uikon_status_api/group"/>
-</component>
-<component name="transition_effect_utilities_api" long-name="Transition Effect Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_utilities_api/group" filter="!test"/>
-</component>
-<component name="pointer_event_modifier_api" long-name="Pointer Event Modifier API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/pointer_event_modifier_api/group" filter="!test"/>
-</component>
-<component name="avkon_testability_api" long-name="AVKON Testability API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_testability_api/group"/>
-</component>
-<component name="ganes_api" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ganes_api/group"/>
-</component>
-<component name="ode_api" long-name="Ode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ode_api/group"/>
-</component>
-<component name="physics_api" long-name="Physics API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/physics_api/group"/>
-</component>
-<component name="touch_pane_api" long-name="Touch Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_api/group" filter="!test"/>
-</component>
-<component name="touch_pane_observer_api" long-name="Touch Pane Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_observer_api/group"/>
-</component>
-<component name="alternate_fs_api" long-name="Alternate FS API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alternate_fs_api/group"/>
-</component>
-<component name="discreet_popup_api" long-name="Discreet Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/discreet_popup_api/group"/>
-</component>
-<component name="touch_gesture_framework_api" long-name="Touch Gesture Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_gesture_framework_api/group"/>
-<!-- should this be commented out? -->
-<!--<unit bldFile="classicui_plat/touch_gesture_framework_api/tsrc/group" filter="test,api_test"/> -->
-</component>
-<component name="extended_options_menu_api" long-name="Extended Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="classicui_pub" long-name="Classic UI Public Interfaces" level="specific">
-<component name="input_frame_api" long-name="Input Frame API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/input_frame_api/group" filter="!test"/>
-</component>
-<component name="window_server_event_observer_api" long-name="Window Server Event Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/window_server_event_observer_api/group" filter="!test"/>
-</component>
-<component name="application_framework_api" long-name="Application Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/application_framework_api/group" filter="!test"/>
-</component>
-<component name="scroller_api" long-name="Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/scroller_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_utilities_api" long-name="UI Framework Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_utilities_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_definitions_api" long-name="UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_definitions_api/group" filter="!test"/>
-</component>
-<component name="buttons_api" long-name="Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/buttons_api/group" filter="!test"/>
-</component>
-<component name="queries_api" long-name="Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/queries_api/group" filter="!test"/>
-</component>
-<component name="aiw_generic_parameter_api" long-name="AIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="editors_api" long-name="Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/editors_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_api" long-name="Common File Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/common_file_dialogs_api/group" filter="!test"/>
-</component>
-<component name="dialog_shutter_api" long-name="Dialog Shutter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialog_shutter_api/group" filter="!test"/>
-</component>
-<component name="fonts_api" long-name="Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/fonts_api/group" filter="!test"/>
-</component>
-<component name="screen_clearer_api" long-name="Screen Clearer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_clearer_api/group" filter="!test"/>
-</component>
-<component name="notifiers_api" long-name="Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notifiers_api/group" filter="!test"/>
-</component>
-<component name="notes_api" long-name="Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notes_api/group" filter="!test"/>
-</component>
-<component name="status_pane_api" long-name="Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/status_pane_api/group" filter="!test"/>
-</component>
-<component name="base_controls_api" long-name="Base Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/base_controls_api/group" filter="!test"/>
-</component>
-<component name="grids_api" long-name="Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/grids_api/group" filter="!test"/>
-</component>
-<component name="context_pane_api" long-name="Context Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/context_pane_api/group" filter="!test"/>
-</component>
-<component name="lists_api" long-name="Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/lists_api/group" filter="!test"/>
-</component>
-<component name="popups_api" long-name="Popups API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/popups_api/group" filter="!test"/>
-</component>
-<component name="misc_controls_api" long-name="Misc Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/misc_controls_api/group" filter="!test"/>
-</component>
-<component name="keylock_api" long-name="Keylock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/keylock_api/group" filter="!test"/>
-</component>
-<component name="options_menu_api" long-name="Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/options_menu_api/group" filter="!test"/>
-</component>
-<component name="hierarchical_lists_api" long-name="Hierarchical Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hierarchical_lists_api/group" filter="!test"/>
-</component>
-<component name="navigation_pane_api" long-name="Navigation Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/navigation_pane_api/group" filter="!test"/>
-</component>
-<component name="tabs_api" long-name="Tabs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/tabs_api/group" filter="!test"/>
-</component>
-<component name="title_pane_touch_observer_api" long-name="Title Pane Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_touch_observer_api/group"/>
-</component>
-<component name="choice_list_api" long-name="Choice List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/choice_list_api/group" filter="!test"/>
-</component>
-<component name="info_popup_note_api" long-name="Info Popup Note API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/info_popup_note_api/group" filter="!test"/>
-</component>
-<component name="setting_pages_api" long-name="Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/setting_pages_api/group" filter="!test"/>
-</component>
-<component name="screen_mode_api" long-name="Screen Mode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_mode_api/group" filter="!test"/>
-</component>
-<component name="indicators_api" long-name="Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/indicators_api/group" filter="!test"/>
-</component>
-<component name="error_ui_api" long-name="Error UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/error_ui_api/group" filter="!test"/>
-</component>
-<component name="animation_api" long-name="Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/animation_api/group" filter="!test"/>
-</component>
-<component name="searchfield_api" long-name="Searchfield API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/searchfield_api/group" filter="!test"/>
-</component>
-<component name="labels_api" long-name="Labels API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/labels_api/group" filter="!test"/>
-</component>
-<component name="hotkeys_api" long-name="Hotkeys API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hotkeys_api/group" filter="!test"/>
-</component>
-<component name="initialization_api" long-name="Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/initialization_api/group" filter="!test"/>
-</component>
-<component name="volume_control_api" long-name="Volume Control API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/volume_control_api/group" filter="!test"/>
-</component>
-<component name="title_pane_api" long-name="Title Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_api/group" filter="!test"/>
-</component>
-<component name="sounds_api" long-name="Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/sounds_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_handler_api" long-name="AIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_service_handler_api/group" filter="!test"/>
-</component>
-<component name="aiw_criteria_api" long-name="AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="touch_ui_utilities_api" long-name="Touch UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/touch_ui_utilities_api/group" filter="!test"/>
-</component>
-<component name="generic_button_api" long-name="Generic Button API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/generic_button_api/group" filter="!test"/>
-</component>
-<component name="form_api" long-name="Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/form_api/group" filter="!test"/>
-</component>
-<component name="uikon_core_controls" long-name="Uikon Core Controls" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/uikon_core_controls/group" filter="!test"/>
-</component>
-<component name="calendar_api" long-name="Calendar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/calendar_api/group"/>
-</component>
-<component name="toolbar_api" long-name="Toolbar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/toolbar_api/group" filter="!test"/>
-</component>
-<component name="server_application_api" long-name="Server Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/server_application_api/group"/>
-</component>
-<component name="slider_api" long-name="Slider API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/slider_api/group" filter="!test"/>
-</component>
-<component name="private_ui_framework_api" long-name="Private UI Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/private_ui_framework_api/group" filter="!test"/>
-</component>
-<component name="dialogs_api" long-name="Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialogs_api/group" filter="!test"/>
-</component>
-<component name="document_handler_api" long-name="Document handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/document_handler_api/group"/>
-</component>
-<component name="images_api" long-name="Images API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/images_api/group" filter="!test"/>
-</component>
-<component name="stylus_popup_menu_api" long-name="Stylus Pop-up Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/stylus_popup_menu_api/group" filter="!test"/>
-</component>
-<component name="information_preview_popup_api" long-name="Information Preview Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/information_preview_popup_api/group" filter="!test"/>
-</component>
-<component name="intermediate_state_api" long-name="Intermediate State API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/intermediate_state_api/group"/>
-</component>
-<component name="help_launcher_api" long-name="Help Launcher API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/help_launcher_api/group"/>
-</component>
-</collection>
-<collection name="ode" long-name="Open Dynamics Engine" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="ode_build" filter="s60" long-name="ODE">
-<unit bldFile="mw/classicui/ode/group"/>
-</component>
-</collection>
-<collection name="uifw" long-name="UI Framework" level="server">
-<component name="uiklaf" filter="s60" long-name="Uikon Look-and-Feel">
-<unit bldFile="mw/classicui/uifw/uiklaf/group"/>
-</component>
-<component name="eikctl" filter="s60" long-name="Eikon Controls">
-<unit bldFile="mw/classicui/uifw/eikctl/group"/>
-</component>
-<component name="avkon" filter="s60" long-name="Avkon">
-<!-- can only have one unit. Split into 3 components, or #include all from same bld.inf -->
-<unit bldFile="mw/classicui/uifw/avkon/aknphysics/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/aknconf/group"/>
-</component>
-<component name="eikstd" filter="s60" long-name="Eikon Standard">
-<unit bldFile="mw/classicui/uifw/eikstd/group"/>
-</component>
-<component name="aknglobalui" filter="s60" long-name="Avkon Global UI">
-<unit bldFile="mw/classicui/uifw/aknglobalui/group"/>
-</component>
-<component name="ganes" filter="s60" long-name="Ganes">
-<unit bldFile="mw/classicui/uifw/ganes/group"/>
-</component>
-</collection>
-<collection name="commonuis" long-name="Common UIs" level="specific">
-<component name="commonui" filter="s60" long-name="Common UI">
-<unit bldFile="mw/classicui/commonuis/commonui/group"/>
-</component>
-<component name="commondialogs" filter="s60" long-name="Common Dialogs">
-<unit bldFile="mw/classicui/commonuis/commondialogs/group"/>
-</component>
-</collection>
-<collection name="applicationinterworkingfw" long-name="Application Interworking Framework" level="generic">
-<component name="aifwservicehandler" filter="s60" long-name="Application Interworking Service Handler">
-<unit bldFile="mw/classicui/applicationinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-<collection name="psln" long-name="Personalization" level="specific">
-<!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
-<component name="psln_build" filter="s60" long-name="Personalization Build">
-<unit bldFile="mw/classicui/psln/group"/>
-</component>
-</collection>
-<collection name="commonadapter" long-name="Common Adapter" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="commonadapter_build" filter="s60" long-name="Common Adapter Build">
-<unit bldFile="mw/classicui/commonadapter/group"/>
-</component>
-</collection>
-<collection name="akntouchgesturefw" long-name="Avkon Touch Gesture Framework" level="generic">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="akntouchgesturefw_build" filter="s60" long-name="Avkon Touch Gesture Framework Build" introduced="^3">
-<unit bldFile="mw/classicui/akntouchgesturefw/group"/>
-</component>
-</collection>
-<collection name="uiutils" long-name="UI Utils" level="specific">
-<component name="localizer" filter="s60" long-name="Directory Localizer">
-<unit bldFile="mw/classicui/uiutils/localizer/group"/>
-</component>
-<component name="findutil" filter="s60" long-name="Find Utility">
-<unit bldFile="mw/classicui/uiutils/findutil/group"/>
-</component>
-<component name="gamerecognizer" filter="s60" long-name="Game Recognizer" plugin="Y">
-<unit bldFile="mw/classicui/uiutils/gamerecognizer/group"/>
-</component>
-<component name="aknjapanesereading" filter="s60" long-name="Avkon Japanese Reading">
-<unit bldFile="mw/classicui/uiutils/aknjapanesereading/group"/>
-</component>
-<component name="hlplch" long-name="Help Launcher" filter="s60,bldfirst">
-<unit bldFile="mw/classicui/uiutils/hlplch/group"/>
-</component>
-</collection>
-<collection name="commonuisupport" long-name="Common UI Support" level="support">
-<component name="uikon" long-name="Uikon" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uikon/group" mrp="mw/classicui/commonuisupport/uikon/group/app-framework_uikon.mrp"/>
-</component>
-<component name="errorresolverdata" long-name="Error Resolver Data" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/errorresolverdata/group" mrp="mw/classicui/commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
-</component>
-<component name="uilaf" long-name="UI Look and Feel" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uilaf/GROUP" mrp="mw/classicui/commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
-</component>
-<component name="grid" long-name="Grid" purpose="optional">
-<unit bldFile="mw/classicui/commonuisupport/grid/group" mrp="mw/classicui/commonuisupport/grid/group/app-framework_grid.mrp"/>
-</component>
-<component name="uifwsdocs" long-name="UI Frameworks Documentation" purpose="development" class="doc">
-<unit mrp="mw/classicui/commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
-</component>
-</collection>
-<collection name="lafagnosticuifoundation" long-name="Look-and-Feel Agnostic UI Foundation" level="base">
-<component name="cone" long-name="Control Environment" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/cone/group" mrp="mw/classicui/lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
-</component>
-<component name="graphicseffects" long-name="Graphics Effects" introduced="9.2" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/graphicseffects/group" mrp="mw/classicui/lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
-</component>
-<component name="uigraphicsutils" long-name="UI Graphics Utilities" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group" mrp="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
-</component>
-<component name="clockanim" long-name="Clock" purpose="optional" plugin="Y">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/clockanim/group" mrp="mw/classicui/lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
-</component>
-<component name="bmpanimation" long-name="BMP Animation" introduced="6.0" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/bmpanimation/group" mrp="mw/classicui/lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
-</component>
-<component name="animation" long-name="Animation" introduced="9.1" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/animation/group" mrp="mw/classicui/lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
-</component>
-</collection>
-<collection name="classicui_info" long-name="Classic UI Info" level="specific">
-<!-- the multiple units in the API test components need to be resolved -->
-<component name="classicui_metadata" long-name="Classic UI Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/classicui/classicui_info/classicui_metadata/classicui_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="svgt" level="generic" long-name="SVG Tiny" levels="util ui">
-<collection name="svgt_plat" long-name="SVG Tiny Platform Interfaces" level="ui">
-<component name="svgt_api" long-name="SVGT API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/svgt_api/group"/>
-</component>
-<component name="nvg_api" long-name="NVG API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/nvg_api/group"/>
-</component>
-</collection>
-<collection name="svgtopt" long-name="SVG-T Engine" level="util">
-<component name="svgtopt_build" filter="s60" long-name="SVG Engine" introduced="9.2">
-<!-- component is at collection level. Needs to be moved down a directory -->
-<unit bldFile="mw/svgt/svgtopt/group"/>
-</component>
-<component name="svgtplugin" filter="s60" long-name="SVG Plugin" introduced="9.2" plugin="Y">
-<unit bldFile="mw/svgt/svgtopt/svgtplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="uiaccelerator" level="generic" long-name="UI Accelerator" levels="plugin framework server ex if">
-<collection name="uiaccelerator_plat" long-name="UI Accelerator Platform Interfaces" level="if">
-<component name="alf_core_toolkit_api" long-name="ALF Core Toolkit API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/group"/>
-</component>
-<component name="alf_visual_api" long-name="ALF Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/group"/>
-</component>
-<component name="alf_extended_visual_api" long-name="ALF Extended Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/group"/>
-</component>
-<component name="alf_extension_api" long-name="ALF Extension API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/group"/>
-</component>
-<component name="alf_tracing_api" long-name="ALF Tracing API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/group"/>
-</component>
-<component name="alf_client_server_api" long-name="ALF Client Server API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/group"/>
-</component>
-</collection>
-<collection name="uiacceltk" long-name="UI Accelerator Toolkit" level="framework">
-<component name="hitchcock" filter="s60" long-name="Hitchcock">
-<unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/group"/>
-</component>
-<component name="uiacceltk_build" filter="s60" long-name="UI Accelerator Toolkit Build">
-<!-- move into the other component, or remove the #include and make this UI Accelerator Toolkit ROM-->
-<unit bldFile="mw/uiaccelerator/uiacceltk/group"/>
-</component>
-</collection>
-<collection name="uiaccelerator_test" long-name="UI Accelerator Test" level="ex"/>
-</block>
-<block name="uiresources" level="generic" long-name="UI Resources" levels="compile plugin framework server generic data">
-<!-- are the custom filters below needed? -->
-<collection name="uiresources_pub" long-name="UI Resources Public Interfaces" level="data">
-<component name="pictograph_api" long-name="Pictograph API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/pictograph_api/group" filter="!test"/>
-</component>
-<component name="skins_api" long-name="Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/skins_api/group" filter="!test"/>
-</component>
-<component name="font_definition_api" long-name="Font Definition API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/font_definition_api/group" filter="!test"/>
-</component>
-<component name="graphics_api" long-name="Graphics API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/graphics_api/group" filter="!test"/>
-</component>
-<component name="scalable_icons_api" long-name="Scalable Icons API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/scalable_icons_api/group"/>
-</component>
-<component name="layout_id_definitions_api" long-name="Layout ID Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/layout_id_definitions_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_plat" long-name="UI Resources Platform Interfaces" level="data">
-<component name="layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_system_private_api/group" filter="!test"/>
-</component>
-<component name="layout_data_api" long-name="Layout Data API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_data_api/group" filter="!test"/>
-</component>
-<component name="cdl_api" long-name="CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/cdl_api/group" filter="!test"/>
-</component>
-<component name="extended_skins_api" long-name="Extended Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_skins_api/group" filter="!test"/>
-</component>
-<component name="tfx_server_controller_plugin_api" long-name="TFX Server Controller Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_controller_plugin_api/group"/>
-</component>
-<component name="extended_fonts_api" long-name="Extended Fonts API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_fonts_api/group" filter="!test"/>
-</component>
-<component name="graphic_configuration_api" long-name="Graphic Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/graphic_configuration_api/group" filter="!test"/>
-</component>
-<component name="mif_header_cdl_api" long-name="MIF Header CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mif_header_cdl_api/group"/>
-</component>
-<component name="personalisation_and_skins_settings_api" long-name="Personalisation and Skins Settings API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/personalisation_and_skins_settings_api/group"/>
-</component>
-<component name="tfx_effect_setup_plugin_api" long-name="TFX Effect Setup Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_effect_setup_plugin_api/group"/>
-</component>
-<component name="mifconv_definitions_api" long-name="Mifconv Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mifconv_definitions_api/group"/>
-</component>
-<component name="wallpaper_configuration_api" long-name="Wallpaper Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/wallpaper_configuration_api/group"/>
-</component>
-<component name="language_code_definitions_api" long-name="Language Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/language_code_definitions_api/group"/>
-</component>
-<component name="skins_image_attributes_api" long-name="Skins Image Attributes API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
-</component>
-<component name="private_user_area_code_definitions_api" long-name="Private User Area Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/private_user_area_code_definitions_api/group"/>
-</component>
-<component name="tfx_server_plugin_ids_api" long-name="TFX Server Plug-in IDs API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_plugin_ids_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_info" long-name="UI Resources Info" level="data">
-<component name="uiresources_test" filter="s60,test,api_test" long-name="UI Resources Tests" purpose="development"/>
-</collection>
-<collection name="uigraphics" long-name="UI Graphics" level="generic">
-<component name="bitmaps2" filter="s60" long-name="Bitmaps 2" class="config">
-<unit bldFile="mw/uiresources/uigraphics/bitmaps2/group"/>
-</component>
-<component name="icons" filter="s60" long-name="Icons" class="config">
-<unit bldFile="mw/uiresources/uigraphics/icons/group"/>
-</component>
-<component name="variatedbitmaps" filter="s60" long-name="Variated Bitmaps" class="config">
-<unit bldFile="mw/uiresources/uigraphics/variatedbitmaps/group"/>
-</component>
-<component name="aknicon" filter="s60" long-name="Avkon Icon Framework">
-<unit bldFile="mw/uiresources/uigraphics/aknicon/group"/>
-</component>
-<component name="nvgrenderstage" filter="sf_build" long-name="NVG Render Stage">
-<unit bldFile="mw/uiresources/uigraphics/nvgrenderstage/group"/>
-</component>
-</collection>
-<collection name="layouts" long-name="Layouts" level="plugin">
-<component name="cdl" filter="s60" long-name="Customization Definition Language">
-<!-- can only have one unit. Need to #include them or split into multiple components -->
-<unit bldFile="mw/uiresources/layouts/cdl/cdlengine/group"/>
-<unit bldFile="mw/uiresources/layouts/cdl/cdlserver/group"/>
-</component>
-<component name="aknlayout2" filter="s60" long-name="Avkon Layout 2">
-<unit bldFile="mw/uiresources/layouts/aknlayout2/group"/>
-</component>
-</collection>
-<collection name="skins" long-name="Skins" level="data">
-<component name="aknskincontent" filter="s60" long-name="Avkon Skin Content" class="config">
-<unit bldFile="mw/uiresources/skins/aknskincontent/group"/>
-</component>
-<component name="aknskins" filter="s60" long-name="Avkon Skin Compiler">
-<unit bldFile="mw/uiresources/skins/aknskins/group"/>
-</component>
-</collection>
-<collection name="pictographs" long-name="Pictographs" level="data">
-<component name="aknpictograph" filter="s60" long-name="Avkon Pictograph">
-<unit bldFile="mw/uiresources/pictographs/aknpictograph/group"/>
-</component>
-</collection>
-<collection name="locales" long-name="Locales" level="framework">
-<component name="locales_build" filter="s60" long-name="Locales Build">
-<unit bldFile="mw/uiresources/locales/loce32"/>
-</component>
-</collection>
-<collection name="uiconfig" long-name="UI Config" level="server">
-<component name="s60config" filter="s60" long-name="S60 UI Config">
-<unit bldFile="mw/uiresources/uiconfig/s60config/group"/>
-</component>
-</collection>
-<collection name="fontsupport" long-name="Font Support" level="generic">
-<component name="fontprovider" filter="s60" long-name="Font Provider">
-<unit bldFile="mw/uiresources/fontsupport/fontprovider/group"/>
-</component>
-<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
- <component id="s60_fonts" filter="s60" name="S60 Fonts">
- <unit bldFile="fontsupport/fontutils/group"/>
- </component>
--->
-<component name="fontutils" filter="sf_build" long-name="Font Utils">
-<unit bldFile="mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
-</component>
-</collection>
-<collection name="helpthemes" long-name="Help Themes" level="data">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helpthemes_build" filter="s60" long-name="Help Themes Build" class="config">
-<unit bldFile="mw/uiresources/helpthemes/group"/>
-</component>
-</collection>
-</block>
-<block name="hapticsservices" level="generic" long-name="Haptics Services" levels="fw server api">
-<collection name="hapticsservices_plat" long-name="Haptics Services Platform Interfaces" level="api">
-<component name="tacticon_api" long-name="Tacticon API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tacticon_api/group"/>
-</component>
-<component name="tactile_feedback_core_api" long-name="Tactile Feedback Core API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_core_api/group"/>
-</component>
-<component name="tactile_feedback_server_api" long-name="Tactile Feedback Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_server_api/group"/>
-</component>
-</collection>
-<collection name="hapticsservices_pub" long-name="Haptics Services Public Interfaces" level="api">
-<component name="tactile_feedback_client_api" long-name="Tactile Feedback Client API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_pub/tactile_feedback_client_api/group"/>
-</component>
-</collection>
-<collection name="tacticonserver" long-name="Tacticon Server" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="tacticonserver_build" filter="s60" long-name="Tacticon Server Build" introduced="^3">
-<unit bldFile="mw/hapticsservices/tacticonserver/group"/>
-<!-- clients and servers are suauly the same component. Consider moving pluign to a separate component if needed -->
-</component>
-</collection>
-<collection name="tactilefeedback" long-name="Tactile Feedback" level="fw">
-<component name="tactilearearegistry" filter="s60" long-name="Tactile Area Registry" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilearearegistry/group"/>
-</component>
-<component name="tactilefeedbackresolver" filter="s60" long-name="Tactile Feedback Resolver" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackresolver/group"/>
-</component>
-<component name="tactileclickplugin" filter="s60" long-name="Tactile Click Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileclickplugin/group"/>
-</component>
-<component name="tactilefeedbackclient" filter="s60" long-name="Tactile Feedback Client" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackclient/group"/>
-</component>
-<component name="tactileactionplugin" filter="s60" long-name="Tactile Action Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileactionplugin/group"/>
-</component>
-<component name="tactilefeedback_build" filter="s60" long-name="Tactile Feedback Build" introduced="^1">
-<!-- consider moving IBY to one fo the above components -->
-<unit bldFile="mw/hapticsservices/tactilefeedback/group"/>
-</component>
-</collection>
-</block>
-<block name="platformthemes" level="specific" long-name="Platform Themes" levels="framework generic ui">
-<collection name="platformthemes_info" long-name="Platform Themes Info">
-<component name="platformthemes_build" long-name="Platform Themes Build">
-<!-- no real structure in this package. Should break into collections / components -->
-<unit bldFile="mw/platformthemes" proFile="platformthemes.pro"/>
-</component>
-</collection>
-</block>
-<block name="gsprofilesrv" level="generic" long-name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
-<collection name="gsprofilesrv_pub" long-name="GS and Profiles Services Public Interfaces" level="specific">
-<component name="profiles_engine_active_profile_settings_api" long-name="Profiles Engine Active Profile Settings API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_active_profile_settings_api/group"/>
-</component>
-<component name="profiles_engine_wrapper_api" long-name="Profiles Engine Wrapper API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_wrapper_api/group"/>
-</component>
-</collection>
-<collection name="gsprofilesrv_plat" long-name="GS and Profiles Services Platform Interfaces" level="specific">
-<component name="ftuwizardmodel_api" long-name="FTU Wizard Model API" filter="bldfirst,s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/ftuwizardmodel_api" proFile="ftuwizardmodel_api.pro" qmakeArgs="-r -config rom"/>
-</component>
-<component name="profiles_engine_api" long-name="Profiles Engine API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_engine_api/group"/>
-</component>
-<component name="settings_backgroundimage_api" long-name="Settings Background Image API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_backgroundimage_api/group"/>
-</component>
-<component name="settings_framework_api" long-name="Settings Framework API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_framework_api/group"/>
-</component>
-<component name="settings_launch_api" long-name="Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_launch_api/group"/>
-</component>
-<component name="settings_listbox_api" long-name="Settings List Box API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_listbox_api/group"/>
-</component>
-<component name="settings_plugin_api" long-name="Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_plugin_api/group"/>
-</component>
-<component name="settings_uis_cenrep_collection_api" long-name="Settings UIs CenRep Collection API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
-</component>
-</collection>
-<collection name="gssettingsuis" long-name="General Settings UIs" level="framework">
-<component name="gs" filter="s60" long-name="General Settings" introduced="9.2">
-<unit bldFile="mw/gsprofilesrv/gssettingsuis/gs/group"/>
-</component>
-</collection>
-<collection name="ftuwizardmodel" long-name="FTU Wizard Model" level="generic">
-<component name="ftuwizardmodel_build" long-name="FTU Wizardmodel Build" filter="bldfirst">
-<unit bldFile="mw/gsprofilesrv/ftuwizardmodel" proFile="ftuwizardmodel.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-<collection name="controlpanel" long-name="Control Panel" level="generic">
-<component name="controlpanel_build" long-name="Control Panel Build">
-<unit bldFile="mw/gsprofilesrv/controlpanel" proFile="controlpanel.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-<collection name="profilesservices" long-name="Profiles Services" level="server">
-<component name="profileengine" filter="s60" long-name="Profile Engine" introduced="9.1">
-<unit bldFile="mw/gsprofilesrv/profilesservices/profileengine/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreensrv" level="specific" long-name="Home Screen Services" levels="plugin framework server generic specific">
-<collection name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" level="specific">
-<component name="action_handler_plugin_api" long-name="Action Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/group" filter="!test"/>
-</component>
-<component name="content_harvester_plugin_api" long-name="Content Harvester Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/group" filter="!test"/>
-</component>
-<component name="menu_sat_interface_api" long-name="Menu SAT Interface API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/group" filter="!test"/>
-</component>
-<component name="sapi_contentpublishing" long-name="SAPI Content Publishing" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing/group"/>
-</component>
-<component name="sapi_actionhandler" long-name="SAPI Action Handler" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_actionhandler/group"/>
-</component>
-</collection>
-<collection name="contentpublishingsrv" long-name="Content Publishing Service" level="server">
-<component name="contentpublishingdebug" filter="s60" long-name="Content Publishing Debug">
-<!-- need to move this component outside of contentpublishingutils and into separate component directory -->
-<!-- <unit bldFile="contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/> -->
-</component>
-<component name="contentpublishingutils" filter="s60" long-name="Content Publishing Utils">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingutils/group"/>
-</component>
-<component name="contentpublishingserver" filter="s60" long-name="Content Publishing Server">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingserver/group"/>
-</component>
-<component name="contentharvester" filter="s60" long-name="Content Harvester">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
-</component>
-<component name="contentpublishingsrv_build" filter="s60" long-name="Content Publishing Service Build">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreensrvlegacy" level="generic" long-name="Legacy Home Screen Services" levels="plugin framework server generic specific">
-<collection name="homescreensrvlegacy_plat" long-name="Legacy Home Screen Services Platform Interfaces" level="specific">
-<component name="ai_content_model_api" long-name="AI Content Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrvlegacy/ai_content_model_api/group" proFile="group.pro"/>
-</component>
-<component name="ai_plugin_information_api" long-name="AI Plug-in Information API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrvlegacy/ai_plugin_information_api/group" proFile="group.pro"/>
-</component>
-</collection>
-</block>
-<block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
-<collection name="appinstall_plat" long-name="Application Installation Platform Interfaces" level="api">
-<component name="iaupdate_api" long-name="IA Update API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/iaupdate_api/group"/>
-</component>
-<component name="task_plugin_api" long-name="Task Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_plugin_api/group"/>
-</component>
-<component name="sw_installer_common_ui_api" long-name="SW Installer Common UI API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_common_ui_api/group"/>
-</component>
-<component name="sw_installer_launcher_api" long-name="SW Installer Launcher API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_launcher_api/group"/>
-</component>
-<component name="task_management_api" long-name="Task Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_management_api/group"/>
-</component>
-<component name="sw_installer_ui_plugin_api" long-name="SW Installer UI Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ui_plugin_api/group"/>
-</component>
-<component name="sw_installer_cr_keys" long-name="SW Installer CR Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_cr_keys/group"/>
-</component>
-<component name="sw_installer_ps_keys" long-name="SW Installer PS Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
-</component>
-<component name="appmngr2runtimeapi" long-name="Application Manager 2 Runtime Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
-</component>
-<component name="sifui_api" long-name="STIF UI API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sifui_api/group"/>
-</component>
-</collection>
-<collection name="appinstall_pub" long-name="Application Installation Public Interfaces" level="api">
-<component name="startup_list_management_api" long-name="Startup List Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
-</component>
-</collection>
-<collection name="ncdengine" long-name="Nokia Content Discover" level="framework">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="ncdengine_engine" filter="s60" long-name="NCD Engine" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/engine/group"/>
-</component>
-<component name="debuglogger" filter="s60" long-name="NCD Debug Logger" introduced="^1" class="placeholder">
-<!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
-</component>
-<component name="ncdengine_build" filter="s60" long-name="NCD Build" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/group"/>
-</component>
-</collection>
-<collection name="appinstaller" long-name="Application Installer" level="generic">
-<component name="appinstui" filter="s60" long-name="Application Installer UI" introduced="^2">
-<unit bldFile="mw/appinstall/appinstaller/appinstui/group"/>
-</component>
-</collection>
-<collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="api">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="iaupdateapi_stub_build" long-name="IA Update API Stub Build" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdateapi_stub/group"/>
-</component>
-</collection>
-<collection name="iaupdate" long-name="Independent Apps Update" level="api">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="iad" long-name="Software Update" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/iad/group"/>
-</component>
-<component name="iaupdate_help" filter="s60" long-name="IA Update Help" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/help/group"/>
-</component>
-<component name="iaupdate_build" filter="s60" long-name="IA Update Build" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/group"/>
-</component>
-</collection>
-<collection name="installationservices" long-name="Installation Services" level="generic">
-<component name="swi" long-name="Secure Software Install" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swi/group" mrp="mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
-</component>
-<component name="swidevicetools" long-name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
-<unit bldFile="mw/appinstall/installationservices/swidevicetools/group" mrp="mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
-</component>
-<component name="swcomponentregistry" long-name="Software Component Registry" introduced="^4" purpose="mandatory">
-<unit bldFile="mw/appinstall/installationservices/swcomponentregistry/group" mrp="mw/appinstall/installationservices/swcomponentregistry/group/security_softwarecomponentregistry.mrp"/>
-</component>
-<component name="swinstallationfw" long-name="Software Installation Framework" introduced="^4" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swinstallationfw/group" mrp="mw/appinstall/installationservices/swinstallationfw/group/security_softwareinstallframework.mrp"/>
-</component>
-<component name="swtransactionservices" long-name="Software Transaction Services" introduced="^4" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swtransactionservices/group" mrp="mw/appinstall/installationservices/swtransactionservices/group/security_softwaretransactionservices.mrp"/>
-</component>
-<component name="refswinstallationplugin" long-name="Reference Software Installation Plugin" introduced="^4" purpose="development" plugin="Y">
-<unit bldFile="mw/appinstall/installationservices/refswinstallationplugin/group" mrp="mw/appinstall/installationservices/refswinstallationplugin/group/security_sifrefplugin.mrp"/>
-</component>
-<component name="refsoftwareappmgr" long-name="Reference Software Application Manager" introduced="^4" purpose="development">
-<unit bldFile="mw/appinstall/installationservices/refsoftwareappmgr/group" mrp="mw/appinstall/installationservices/refsoftwareappmgr/group/security_referenceapplicationmanager.mrp"/>
-</component>
-<component name="swiconfig" long-name="Software Install Config" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appinstall/installationservices/swiconfig/group" mrp="mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
-</component>
-</collection>
-<collection name="secureswitools" long-name="Secure Software Install Tools" level="tool">
-<component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/makekeys/group" mrp="mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
-</component>
-<component name="swianalysistoolkit" long-name="SWI Analysis Toolkit" purpose="development" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
-</component>
-<component name="openssllib" long-name="OpenSSL Library" purpose="optional" class="PC">
-<unit mrp="mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
-</component>
-<component name="swisistools" long-name="Secure Software Install SIS Tools" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swisistools/group" mrp="mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
-</component>
-</collection>
-<collection name="appinstall_info" long-name="Application Installation Info" level="api">
-<component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="serviceapifw" level="specific" long-name="Service API Framework" levels="plugin framework server generic specific">
-<collection name="serviceapifw_pub" long-name="Service API Framework Public Interfaces" level="specific"/>
-<collection name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" level="specific">
-<component name="rtsecuritymanager_common_api" long-name="Runtime Security Manager Common API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/group"/>
-</component>
-<component name="rtsecuritymanager_utility_api" long-name="Runtime Security Manager Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
-</component>
-<component name="rtsecuritymanager_client_api" long-name="Runtime Security Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/group"/>
-</component>
-<component name="liw_provider_utility_api" long-name="LIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_provider_utility_api/group"/>
-</component>
-<component name="liw_service_interface_base_api" long-name="LIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_base_api/group"/>
-</component>
-<component name="liw_service_interface_menu_api" long-name="LIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_menu_api/group"/>
-</component>
-<component name="liw_criteria_api" long-name="LIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_criteria_api/group"/>
-</component>
-<component name="liw_generic_parameter_api" long-name="LIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_generic_parameter_api/group"/>
-</component>
-<component name="liw_service_handler_api" long-name="LIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_handler_api/group"/>
-</component>
-</collection>
-<collection name="rtsecuritymanager" long-name="Runtime Security Manager" level="server">
-<component name="rtsecuritymanagerutil" filter="s60" long-name="Runtime Security Manager Util">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
-</component>
-<component name="rtsecuritymanagerserver" filter="s60" long-name="Runtime Security Manager Server">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/>
-</component>
-<component name="rtsecuritymanagerclient" filter="s60" long-name="Runtime Security Manager Client">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/>
-</component>
-<component name="rtsecuritymanager_build" filter="s60" long-name="Runtime Security Manager Build">
-<!-- Move the export to the appropriate components, or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/group"/>
-</component>
-</collection>
-<collection name="languageinterworkingfw" long-name="Language Interworking Framework" level="framework">
-<component name="lifwservicehandler" filter="s60" long-name="Service Handler">
-<unit bldFile="mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-</block>
-<block name="serviceapi" level="specific" long-name="Service API" levels="os mw1 mw2 app">
-<!-- should break up this collection into something meaningful -->
-<collection name="serviceproviders" long-name="Service Providers" level="mw1">
-<component name="sapi_contacts_vpbk" long-name="Contacts Phonebook SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
-</component>
-<component name="sapi_location" long-name="Location SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_location/group"/>
-</component>
-<component name="sapi_mediamanagement" long-name="Media Management SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/group"/>
-</component>
-<component name="sapi_landmarks" long-name="Landmarks SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
-</component>
-<component name="sapi_messaging" long-name="Messaging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/group"/>
-</component>
-<component name="sapi_applicationmanager" long-name="Application Manager SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
-</component>
-<component name="sapi_calendar" long-name="Calendar SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_calendar/group"/>
-</component>
-<component name="sapi_logging" long-name="Logging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_logging/group"/>
-</component>
-<component name="sapi_sensor" long-name="Sensor SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sensor/group"/>
-</component>
-<component name="sapi_sysinfo" long-name="Sysinfo SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sysinfo/group"/>
-</component>
-<component name="sapi_serviceregistry" long-name="Service Registry SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
-</component>
-<component name="jsapi" long-name="Javascript API" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/jsapi/group"/>
-</component>
-<component name="serviceproviders_build" filter="s60" long-name="Service API Build">
-<!-- distribute the exports or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapi/serviceproviders/group"/>
-</component>
-</collection>
-</block>
-<block name="web" level="specific" long-name="Web" levels="plugin utils server generic specific">
-<collection name="web_pub" long-name="Web Public Interfaces" level="specific">
-<component name="browser_control_api" long-name="Browser Control API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_control_api/group"/>
-</component>
-<component name="download_mgr_client_api" long-name="Download Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_client_api/group"/>
-</component>
-<component name="download_mgr_ui_api" long-name="Download Manager UI Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_ui_api/group"/>
-</component>
-<component name="favourites_engine_api" long-name="Favourites Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/favourites_engine_api/group"/>
-</component>
-<component name="browser_plugin_api" long-name="Browser Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_plugin_api/group"/>
-</component>
-<component name="settings_api" long-name="Settings API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/settings_api/group"/>
-</component>
-</collection>
-<collection name="web_plat" long-name="Web Platform Interfaces" level="specific">
-<component name="aiw_browser_provider_api" long-name="AIW Browser Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/aiw_browser_provider_api/group"/>
-</component>
-<component name="browser_dialogs_provider_api" long-name="Browser Dialogs Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_dialogs_provider_api/group"/>
-</component>
-<component name="browser_platform_api" long-name="Browser Platform API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_platform_api/group"/>
-</component>
-<component name="cod_handler_api" long-name="COD Handler API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cod_handler_api/group"/>
-</component>
-<component name="connection_manager_api" long-name="Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/connection_manager_api/group"/>
-</component>
-<component name="cxml_library_api" long-name="cXml Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cxml_library_api/group"/>
-</component>
-<component name="download_mgr_client_api_extn" long-name="Download Manager Client API Extension" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/download_mgr_client_api_extn/group"/>
-</component>
-<component name="download_path_plugin_api" long-name="Download Path Plugin API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/web/web_plat/download_path_plugin_api/group"/>
-</component>
-<component name="feeds_engine_api" long-name="Feeds Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/feeds_engine_api/group"/>
-</component>
-<component name="launcher_api" long-name="Launcher API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/launcher_api/group"/>
-</component>
-<component name="multipart_parser_api" long-name="Multipart Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/multipart_parser_api/group"/>
-</component>
-<component name="recent_url_store_api" long-name="Recent URL Store API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/recent_url_store_api/group"/>
-</component>
-<component name="scheme_handler_plugin_api" long-name="Scheme Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scheme_handler_plugin_api/group"/>
-</component>
-<component name="scriptable_plugin_api" long-name="Scriptable Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scriptable_plugin_api/group"/>
-</component>
-<component name="webutils_api" long-name="Web Utils API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/webutils_api/group"/>
-</component>
-<component name="widget_registry_api" long-name="Widget Registry API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/widget_registry_api/group"/>
-</component>
-<component name="xml_parser_api" long-name="XML Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/xml_parser_api/group"/>
-</component>
-</collection>
-<collection name="web_info" long-name="Web Info" level="specific">
-<component name="web_build" filter="s60" long-name="Web Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/group"/>
-</component>
-</collection>
-<collection name="browserutilities" long-name="Browser Utilities" level="utils">
-<component name="browserdialogsprovider" filter="s60" long-name="Browser Dialogs Provider">
-<unit bldFile="mw/web/browserutilities/browserdialogsprovider/group"/>
-</component>
-<component name="recenturlstore" filter="s60" long-name="Recent URL Store">
-<unit bldFile="mw/web/browserutilities/recenturlstore/group"/>
-</component>
-<component name="xmlparser" filter="s60" long-name="XML Interface">
-<unit bldFile="mw/web/browserutilities/xmlparser/group"/>
-</component>
-<component name="cxmllibrary" filter="s60" long-name="XML Parser Implementation">
-<unit bldFile="mw/web/browserutilities/cxmllibrary/group"/>
-</component>
-<component name="downloadmgr" filter="s60" long-name="Download Manager">
-<unit bldFile="mw/web/browserutilities/downloadmgr/group"/>
-</component>
-<component name="connectionmanager" filter="s60" long-name="Connection Manager">
-<unit bldFile="mw/web/browserutilities/connectionmanager/group"/>
-</component>
-<component name="browsertelservice" filter="s60" long-name="Browser Telephony Service">
-<unit bldFile="mw/web/browserutilities/browsertelservice/group"/>
-</component>
-<component name="favouritesengine" filter="s60" long-name="Favourites Engine">
-<unit bldFile="mw/web/browserutilities/favouritesengine/group"/>
-</component>
-<component name="feedsengine" filter="s60" long-name="Feeds Engine">
-<unit bldFile="mw/web/browserutilities/feedsengine/group"/>
-</component>
-<component name="multipartparser" filter="s60" long-name="Multipart Parser">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
-<!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
-</component>
-<component name="schemehandler" filter="s60" long-name="Scheme Handler">
-<unit bldFile="mw/web/browserutilities/schemehandler/group"/>
-</component>
-<component name="webutils" filter="s60" long-name="Web Utils">
-<unit bldFile="mw/web/browserutilities/webutils/group"/>
-</component>
-<component name="aiwbrowserprovider" filter="s60" long-name="AIW Browser Provider" plugin="Y">
-<unit bldFile="mw/web/browserutilities/aiwbrowserprovider/group"/>
-</component>
-<component name="browserutilities_build" filter="s60" long-name="Browser Utilities Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/browserutilities/group"/>
-</component>
-</collection>
-<collection name="webengine" long-name="Web Engine" level="server">
-<component name="osswebengine" filter="s60" long-name="OSS Web Engine">
-<!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
-<unit bldFile="mw/web/webengine/osswebengine/cache/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/memorymanager/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/npscript/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group/javascriptcore"/>
-</component>
-<component name="webkitutils" filter="s60" long-name="WebKit Utils">
-<unit bldFile="mw/web/webengine/webkitutils/group"/>
-</component>
-<component name="pagescaler" filter="s60" long-name="Page Scaler">
-<unit bldFile="mw/web/webengine/pagescaler/group"/>
-</component>
-<component name="webwidgetinstaller" filter="s60" long-name="Widget Installer">
-<unit bldFile="mw/web/webengine/widgetinstaller/group"/>
-</component>
-<component name="widgetregistry" filter="s60" long-name="Widget Registry">
-<unit bldFile="mw/web/webengine/widgetregistry/group"/>
-</component>
-<component name="wmlengine" filter="s60" long-name="WML Engine">
-<unit bldFile="mw/web/webengine/wmlengine/group"/>
-</component>
-<component name="device" filter="s60" long-name="Device">
-<!-- this needs a more meaningful name -->
-<unit bldFile="mw/web/webengine/device/group"/>
-</component>
-<component name="widgetengine" filter="s60" long-name="Widget Engine">
-<unit bldFile="mw/web/webengine/widgetengine/group"/>
-</component>
-<component name="web_memoryplugin" long-name="Memory Plugin" filter="s60" plugin="Y">
-<unit bldFile="mw/web/webengine/memoryplugin/group"/>
-</component>
-<component name="widgetmemoryplugin" filter="s60" long-name="Widget Memory Plugin" plugin="Y">
-<unit bldFile="mw/web/webengine/widgetmemoryplugin/group"/>
-</component>
-<component name="widgetbackuprestore" filter="s60" long-name="Widget Backup and Restore">
-<unit bldFile="mw/web/webengine/widgetbackuprestore/group"/>
-</component>
-<component name="browserrecognizers" filter="s60" long-name="Browser Recognizers" plugin="Y">
-<unit bldFile="mw/web/webengine/browserrecognizers/group"/>
-</component>
-<component name="wrtharvester" filter="s60" long-name="Web Runtime Harvester" plugin="Y">
-<unit bldFile="mw/web/webengine/wrtharvester/group"/>
-</component>
-</collection>
-<collection name="codhandler" long-name="Content Object Descriptor Handler" level="specific">
-<component name="codeng" filter="s60" long-name="COD Engine">
-<unit bldFile="mw/web/codhandler/codeng/group"/>
-</component>
-<component name="codui" filter="s60" long-name="COD UI">
-<unit bldFile="mw/web/codhandler/codui/group"/>
-</component>
-<component name="codrecog" filter="s60" long-name="COD Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/codrecog/group"/>
-</component>
-<component name="codviewer" filter="s60" long-name="COD Viewer">
-<unit bldFile="mw/web/codhandler/codviewer/group"/>
-</component>
-<component name="ddrecog" filter="s60" long-name="Download Descriptor Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/ddrecog/group"/>
-</component>
-<component name="ddviewer" filter="s60" long-name="Download Descriptor Viewer">
-<unit bldFile="mw/web/codhandler/ddviewer/group"/>
-</component>
-<component name="coddownload" filter="s60" long-name="COD Download">
-<unit bldFile="mw/web/codhandler/coddownload/group"/>
-</component>
-<component name="roapapp" filter="s60" long-name="ROAP Application">
-<unit bldFile="mw/web/codhandler/roapapp/group"/>
-</component>
-<component name="codhandler_build" filter="s60" long-name="COD Handler Build">
-<!-- Exports need to go into another component or make this self-contained.
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/codhandler/group"/>
-</component>
-</collection>
-<collection name="widgets" long-name="Web Widget Framework" level="generic">
-<!-- the following units can be uncommented when configuration is put in place -->
-<component name="widgetrecognizer" filter="s60" long-name="Widget Recognizer" plugin="Y">
-<!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
-</component>
-<component name="widgetinstaller" filter="s60" long-name="Widget Installer UI" plugin="Y">
-<!--<unit bldFile="widgets/widgetinstaller/group"/>-->
-</component>
-<component name="widgetlauncher" filter="s60" long-name="Widget Launcher">
-<!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
-</component>
-<component name="widgetapp" filter="s60" long-name="Widget UI">
-<!--<unit bldFile="widgets/widgetapp/group"/>-->
-</component>
-<component name="widgetsidchecker" filter="s60" long-name="Widget SID Checker" introduced="^3">
-<!--<unit bldFile="widgets/widgetsidchecker/group"/>-->
-</component>
-<component name="widgetpreinstaller" filter="s60" long-name="Widget Pre-Installer">
-<!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
-</component>
-<component name="widgetstartup" filter="s60" long-name="Widget Startup">
-<!--<unit bldFile="widgets/widgetstartup/group"/>-->
-</component>
-<component name="widgets_build" filter="s60" long-name="Widgets Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/widgets/group"/>
-</component>
-</collection>
-</block>
-<block name="websrv" level="generic" long-name="Web Services" levels="plugin framework server generic specific">
-<collection name="websrv_pub" long-name="Web Services Public Interfaces" level="specific">
-<component name="web_service_description_api" long-name="Web Service Description API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_description_api/group"/>
-</component>
-<component name="web_service_connection_api" long-name="Web Service Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/group"/>
-</component>
-<component name="web_service_manager_api" long-name="Web Service Manager API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/group"/>
-</component>
-<component name="hostlet_connection_api" long-name="Hostlet Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/group"/>
-</component>
-<component name="web_service_messaging_api" long-name="Web Service Messaging API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/group"/>
-</component>
-<component name="xml_extensions_api" long-name="XML Extensions API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/group"/>
-</component>
-<component name="xml_fragment_api" long-name="XML Fragment API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/group"/>
-</component>
-</collection>
-<collection name="webservices" long-name="Web Services Framework" level="generic">
-<!-- consider breaking this collection into more meaningful subsets -->
-<component name="wsnotifierplugins" filter="s60" long-name="WS Notifier Plugins" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsnotifierplugins/group"/>
-</component>
-<component name="wslogger" filter="s60" long-name="WS Logger">
-<unit bldFile="mw/websrv/webservices/wslogger/group"/>
-</component>
-<component name="wsxml" filter="s60" long-name="WS XML Extensions">
-<unit bldFile="mw/websrv/webservices/wsxml/group"/>
-</component>
-<component name="wsutils" filter="s60" long-name="WS Utils">
-<unit bldFile="mw/websrv/webservices/wsutils/group"/>
-</component>
-<component name="wsfragment" filter="s60" long-name="WS Fragment">
-<unit bldFile="mw/websrv/webservices/wsfragment/group"/>
-</component>
-<component name="wsdescription" filter="s60" long-name="WS Service Description">
-<unit bldFile="mw/websrv/webservices/wsdescription/group"/>
-</component>
-<component name="wsconnection" filter="s60" long-name="WS Service Connection">
-<unit bldFile="mw/websrv/webservices/wsconnection/group"/>
-</component>
-<component name="wsmessages" filter="s60" long-name="WS Messages">
-<unit bldFile="mw/websrv/webservices/wsmessages/group"/>
-</component>
-<component name="wscredentialmanager" filter="s60" long-name="WS Credential Manager">
-<unit bldFile="mw/websrv/webservices/wscredentialmanager/group"/>
-</component>
-<component name="wsframework" filter="s60" long-name="WS Framework">
-<unit bldFile="mw/websrv/webservices/wsframework/group"/>
-</component>
-<component name="wshttpchanneltransportplugin" filter="s60" long-name="WS HTTP Channel Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshttpchanneltransportplugin/group"/>
-</component>
-<component name="wsconnectionagent" filter="s60" long-name="WS Connection Agent">
-<unit bldFile="mw/websrv/webservices/wsconnectionagent/group"/>
-</component>
-<component name="wsprovider" filter="s60" long-name="WS Provider">
-<unit bldFile="mw/websrv/webservices/wsprovider/group"/>
-</component>
-<component name="wshostletconnection" filter="s60" long-name="WS Hostlet Connection">
-<unit bldFile="mw/websrv/webservices/wshostletconnection/group"/>
-</component>
-<component name="wsmanager" filter="s60" long-name="WS Service Manager">
-<unit bldFile="mw/websrv/webservices/wsmanager/group"/>
-</component>
-<component name="wsidentitymanager" filter="s60" long-name="WS Identity Manager">
-<unit bldFile="mw/websrv/webservices/wsidentitymanager/group"/>
-</component>
-<component name="idwsfplugin" filter="s60" long-name="ID-WSF Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/idwsfplugin/group"/>
-</component>
-<component name="wsibasicplugin" filter="s60" long-name="WS-I Basic Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsibasicplugin/group"/>
-</component>
-<component name="wsrestplugin" filter="s60" long-name="WS REST Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsrestplugin/group"/>
-</component>
-<component name="idwsfsecuritymechanism" filter="s60" long-name="ID-WSF Security Mechanism">
-<unit bldFile="mw/websrv/webservices/idwsfsecuritymechanism/group"/>
-</component>
-<component name="wspasswordtransforms" filter="s60" long-name="WS Password Transforms">
-<unit bldFile="mw/websrv/webservices/wspasswordtransforms/group"/>
-</component>
-<component name="wscore" filter="s60" long-name="WS Core Service Manager">
-<unit bldFile="mw/websrv/webservices/wscore/group"/>
-</component>
-<component name="wslocaltransportplugin" filter="s60" long-name="WS Local Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wslocaltransportplugin/group"/>
-</component>
-<component name="wshostlettransportplugin" filter="s60" long-name="WS Hostlet Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshostlettransportplugin/group"/>
-</component>
-<component name="wsstar" filter="s60" long-name="WS Star">
-<!-- can only have one unit. Need to split into separate components or #include from a single bld.inf -->
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarpolicy/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarplugin/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarmessagehandlers/group"/>
-</component>
-<component name="wsoviplugin" filter="s60" long-name="WS Ovi Plugin">
-<unit bldFile="mw/websrv/webservices/wsoviplugin/group"/>
-</component>
-<component name="webservices_build" filter="s60" long-name="Web Services Build">
-<!-- need to split into self-contained components -->
-<unit bldFile="mw/websrv/webservices/group"/>
-</component>
-</collection>
-<collection name="websrv_info" long-name="Web Services Info" level="specific">
-<component name="websrv_bld" filter="s60" long-name="Web Services Build">
-<!-- need to include common .hrh in each unit -->
-<unit bldFile="mw/websrv/group"/>
-</component>
-</collection>
-</block>
-<block name="webruntime" level="specific" long-name="Web Runtime">
-<!-- need to break up this package nito collections and components -->
-<collection name="webruntime_info" long-name="Web Runtime Info">
-<component name="webruntime_build" long-name="Web Runtime Build" introduced="^4">
-<unit bldFile="mw/webruntime" proFile="cwrt.pro" qmakeArgs=""what+=ninetwo" "what+=tenone" "what+=qt_unstable" "what+=wrtlite" "what+=exportiby""/>
-</component>
-</collection>
-</block>
-<block name="platformtools" level="generic" long-name="Platform Tools">
-<collection name="gfxconversion" long-name="Graphics Conversion">
-<component name="bmconv_s60" filter="s60" long-name="S60 Bitmap Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/bmconv_s60/group"/>
-</component>
-<component name="mifconv" filter="s60" long-name="Multi Icon File Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/mifconv/group"/>
-</component>
-</collection>
-</block>
-<block name="uitools" level="specific" long-name="UI Tools" levels="compile encode tool if">
-<collection name="uitools_pub" long-name="UI Tools Public Interfaces" level="if">
-<component name="third_party_bitmap_palette_api" long-name="Third Party Bitmap Palette API" filter="s60" class="api">
-<unit bldFile="mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
-</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">
-<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">
-<unit bldFile="mw/uitools/uitools_plat/layout_system_private_api/group"/>
-</component>
-</collection>
-<collection name="cdlcompilertoolkit" long-name="CDL Compiler Toolkit" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompilertoolkit_build" filter="s60" long-name="CDL Compiler Toolkit Build">
-<unit bldFile="mw/uitools/cdlcompilertoolkit/group"/>
-</component>
-</collection>
-<collection name="cdlcompiler" long-name="CDL Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompiler_build" filter="s60" long-name="CDL Compiler Build">
-<unit bldFile="mw/uitools/cdlcompiler/group"/>
-</component>
-</collection>
-<collection name="gfxtools" long-name="Graphics Tools" level="tool">
-<component name="gditools" filter="s60" long-name="GDI Tools" class="PC">
-<unit bldFile="mw/uitools/gfxtools/gditools/group"/>
-</component>
-<component name="color" filter="s60" long-name="Bitmap Colour Palette" class="PC">
-<unit bldFile="mw/uitools/gfxtools/color/group"/>
-</component>
-</collection>
-<collection name="aknlayoutcompiler" long-name="Avkon Layout Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="aknlayoutcompiler_build" filter="s60" long-name="Avkon Layout Compiler Build">
-<unit bldFile="mw/uitools/aknlayoutcompiler/group"/>
-</component>
-</collection>
-<collection name="skincompiler" long-name="Skin Compiler" level="compile">
-<component name="aknskindesccompiler" filter="s60" long-name="Avkon Skin Descriptor Compiler">
-<unit bldFile="mw/uitools/skincompiler/AknSkinDescCompiler/group"/>
-</component>
-</collection>
-<collection name="reszip" long-name="Resource Zip" level="encode">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="reszip_build" filter="s60" long-name="Resource Zip Build">
-<unit bldFile="mw/uitools/reszip/group"/>
-</component>
-</collection>
-<collection name="toollibraries" long-name="Tool Libraries" level="tool"/>
-<collection name="svgtencoder" long-name="SVGT Encoder" level="encode">
-<component name="svgtenc" filter="s60" long-name="Standalone SVGT Encoder" class="PC">
-<unit bldFile="mw/uitools/svgtencoder/svgtenc/standalone/group"/>
-</component>
-</collection>
-</block>
-</layer>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="location" level="apps" long-name="Location Apps" levels="ui events loc api">
-<collection name="loc_plat" long-name="Location Apps Platform Interfaces" level="api">
-<component name="location_picker_service_api" long-name="Location Picker Service API" introduced="^4" filter="s60" class="api">
-<unit bldFile="app/location/loc_plat" proFile="location_plat.pro"/>
-</component>
-</collection>
-<collection name="locationpickerservice" long-name="Location Picker Service" level="loc">
-<!--collection is really a component. Should move down a directory -->
-<component name="locationpickerservice_build" filter="s60" long-name="Location Picker Service Build" introduced="^4">
-<unit bldFile="app/location/locationpickerservice" proFile="locationpickerservice.pro"/>
-</component>
-</collection>
-</block>
-<!-- pending removal -->
-<block name="phone" level="apps" span="2" long-name="Phone Apps" levels="engine plugin ui app">
-<collection name="phoneapp" long-name="Phone Application" level="app">
-<component name="blacklist" filter="s60" long-name="Phone Blacklist Clearing" plugin="Y">
-<unit bldFile="app/phone/phoneapp/blacklist/group"/>
-</component>
-<component name="phoneuicontrol" filter="s60" long-name="Phone UI Control">
-<unit bldFile="app/phone/phoneapp/phoneuicontrol/group"/>
-</component>
-<component name="phoneuistates" filter="s60" long-name="Phone UI States">
-<unit bldFile="app/phone/phoneapp/phoneuistates/group"/>
-</component>
-<component name="phoneuiutils" filter="s60" long-name="Phone UI Utils">
-<unit bldFile="app/phone/phoneapp/phoneuiutils/group"/>
-</component>
-<component name="silenceactionplugin" filter="s60" long-name="Silence Action Plugin" plugin="Y">
-<unit bldFile="app/phone/phoneapp/silenceactionplugin/group"/>
-</component>
-<component name="phonemediatorcenter" filter="s60" long-name="Phone Mediator Center">
-<unit bldFile="app/phone/phoneapp/phonemediatorcenter/group"/>
-</component>
-<component name="phoneuiview2" filter="s60" long-name="Phone UI View">
-<unit bldFile="app/phone/phoneapp/phoneuiview2" proFile="phoneuiview2.pro"/>
-</component>
-<component name="phoneuiqtviewadapter" filter="s60" long-name="Phone UI Qt View Adapter" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneapp/phoneuiqtviewadapter" proFile="phoneuiqtviewadapter.pro"/>
-</component>
-<component name="phonestringloader" filter="s60" long-name="Phone String Loader" introduced="^4">
-<unit bldFile="app/phone/phoneapp/phonestringloader" proFile="phonestringloader.pro"/>
-</component>
-<component name="phoneui2" filter="s60" long-name="Phone UI">
-<unit bldFile="app/phone/phoneapp/phoneui2" proFile="phoneui2.pro"/>
-</component>
-</collection>
-<collection name="phoneengine" long-name="Phone Engine" level="engine">
-<component name="phonecntfinder2" filter="s60" long-name="Phone Contact Finder">
-<unit bldFile="app/phone/phoneengine/phonecntfinder2" proFile="phonecntfinder2.pro"/>
-</component>
-<component name="audiohandling" filter="s60" long-name="Phone Audio Handling">
-<unit bldFile="app/phone/phoneengine/audiohandling/group"/>
-</component>
-<component name="callhandling" filter="s60" long-name="Call Handling">
-<unit bldFile="app/phone/phoneengine/callhandling/group"/>
-</component>
-<component name="contacthandling2" filter="s60" long-name="Phone Contact Handling">
-<unit bldFile="app/phone/phoneengine/contacthandling2/group"/>
-</component>
-<component name="loghandling" filter="s60" long-name="Phone Log Handling">
-<unit bldFile="app/phone/phoneengine/loghandling/group"/>
-</component>
-<component name="engineinfo" filter="s60" long-name="Phone Engine Info">
-<unit bldFile="app/phone/phoneengine/engineinfo/group"/>
-</component>
-<component name="phonemodel" filter="s60" long-name="Phone Model">
-<unit bldFile="app/phone/phoneengine/phonemodel" proFile="phonemodel.pro"/>
-</component>
-<component name="servicehandling" filter="s60" long-name="Phone Service Handling">
-<unit bldFile="app/phone/phoneengine/servicehandling/group"/>
-</component>
-<component name="phoneservices" filter="s60" long-name="Phone Server" introduced="^4">
-<unit bldFile="app/phone/phoneengine/phoneservices" proFile="phoneservices.pro"/>
-</component>
-<component name="parserrecognizer" filter="s60" long-name="Parser Recognizer" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneengine/parserrecognizer" proFile="parserrecognizer.pro"/>
-</component>
-</collection>
-<collection name="phoneuis" long-name="Phone UIs" level="ui">
-<component name="bubblemanager2" filter="s60" long-name="Phone Bubble Manager">
-<unit bldFile="app/phone/phoneuis/bubblemanager2" proFile="bubblemanager2.pro"/>
-</component>
-<component name="telephonydevicemode" filter="s60" long-name="Telephony Device Mode">
-<unit bldFile="app/phone/phoneuis/telephonydevicemode/group"/>
-</component>
-</collection>
-<collection name="phone_plat" long-name="Phone Apps Platform Interfaces" level="app">
-<component name="3d_ringing_tone_enabler_api" long-name="3D Ringing Tone Enabler API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
-</component>
-<component name="telephony_comms_information_api" long-name="Telephony Comms Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_comms_information_api/group"/>
-</component>
-<component name="telephony_information_api" long-name="Telephony Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_information_api/group"/>
-</component>
-<component name="telephony_device_mode_api" long-name="Telephony Device Mode API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_device_mode_api/group"/>
-</component>
-<component name="telephony_remote_party_information_api" long-name="Telephony Remote Party Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_remote_party_information_api/group"/>
-</component>
-<component name="telephony_video_mailbox_settings_api" long-name="Telephony Video Mailbox Settings API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_video_mailbox_settings_api/group"/>
-</component>
-<component name="telephony_microphone_mute_status_api" long-name="Telephony Microphone Mute Status API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_microphone_mute_status_api/group"/>
-</component>
-<component name="telephony_logging_extension_api" long-name="Telephony Logging Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_logging_extension_api/group"/>
-</component>
-<component name="telephony_matching_extension_api" long-name="Telephony Matching Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_matching_extension_api/group"/>
-</component>
-<component name="phone_application_commands_api" long-name="Phone Application Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_commands_api/group"/>
-</component>
-<component name="phone_application_voip_commands_api" long-name="Phone Application VOIP Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_voip_commands_api/group"/>
-</component>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_mediator_api/group"/>
-</component>
-<component name="video_telephony_mediator_api" long-name="Video Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/video_telephony_mediator_api/group"/>
-</component>
-<component name="video_telephony_control_mediator_api" long-name="Video Telephony Control Mediator API" filter="s60" introduced="^4" class="api">
-<unit bldFile="app/phone/phone_plat/video_telephony_control_mediator_api/group"/>
-</component>
-</collection>
-<collection name="phoneplugins" long-name="Phone Plugins" level="plugin">
-<component name="csplugin" filter="s60" long-name="Circuit Switched Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/csplugin/group"/>
-</component>
-<component name="hsdialerwidgetplugin" filter="s60" long-name="Home Screen Dialer Widget Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/hsdialerwidgetplugin" proFile="hsdialerwidgetplugin.pro"/>
-</component>
-<component name="infowidgetplugin" filter="s60" long-name="Info Widget Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/infowidgetplugin" proFile=""/>
-</component>
-</collection>
-<collection name="phonesettings" long-name="Phone Settings" level="plugin">
-<component name="cpphonesettingsplugins" filter="s60" long-name="CP Phone Settings Plugins" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phonesettings/cpphonesettingsplugins" proFile="cpphonesettingsplugins.pro"/>
-</component>
-</collection>
-</block>
-<block name="settingsuis" level="services" long-name="Settings UIs" levels="plugin ui">
-<collection name="controlpanelplugins" long-name="Control Panel Plugins" level="plugin">
-<component name="themeplugin" filter="s60" long-name="Theme Plugin" introduced="^4">
-<unit bldFile="app/settingsuis/controlpanelplugins/themeplugin" proFile="themeplugin.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-<collection name="controlpanelui" long-name="Control Panel UI" level="ui">
-<!-- collection is really a component, move down a dir -->
-<component name="controlpanelui_build" filter="s60" long-name="Control Panel UI Build" introduced="^4">
-<unit bldFile="app/settingsuis/controlpanelui" proFile="controlpanelui.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-</block>
-<block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin framework app">
-<collection name="contentctrl_plat" long-name="Content Control Daemons Platforn Interfaces" level="app">
-<component name="ds_contactsdatastoreextension_api" long-name="Adapter Customization API" filter="s60" introduced="^4" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_contactsdatastoreextension_api/group"/>
-</component>
-<component name="ds_data_modification_api" long-name="DS Data Modification API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_data_modification_api/group"/>
-</component>
-</collection>
-<collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
-<component name="secon" filter="s60" long-name="Service Controllers">
-<unit bldFile="app/contentcontrol/connectivitymodules/secon/group"/>
-</component>
-</collection>
-<collection name="dsdcmoadapter" long-name="Data Sync DCMO Adapter" level="plugin">
-<!-- Component at wrong rank, should move down a directory -->
-<component name="dsdcmoadapter_build" filter="s60" long-name="Data Sync Control DCMO Adapter">
-<unit bldFile="app/contentcontrol/dsdcmoadapter/group"/>
-</component>
-</collection>
-<collection name="omads" long-name="OMA Data Sync" level="app">
-<component name="omads_build" filter="s60" long-name="OMA DS Build">
-<unit bldFile="app/contentcontrol/omads/group"/>
-<!-- need to remove #include and rename and OMA DS ROM -->
-</component>
-<component name="omadsextensions" filter="s60" long-name="OMA DS Extensions" plugin="Y">
-<unit bldFile="app/contentcontrol/omads/omadsextensions/group"/>
-</component>
-<component name="omadsextensions" filter="s60" long-name="OMA DS Qt Extensions" plugin="Y">
-<unit bldFile="app/contentcontrol/omads/omadsextensions" proFile="omadsextensions.pro"/>
-</component>
-</collection>
-</block>
-<block name="firsttimeuse" level="apps" long-name="First Time Use" levels="support services ui app">
-<!-- these empty collections are really components. Move down a directory and supply units -->
-<collection name="ftuapplication" long-name="First Time Use Application" level="app"/>
-<collection name="fturuntimeservices" long-name="First Time Use Runtime Services" level="services"/>
-<collection name="wizardproviders" long-name="Wizard Providers" level="support"/>
-<collection name="stateproviders" long-name="State Providers" level="support"/>
-<collection name="runtimeproviders" long-name="Runtime Providers" level="support"/>
-<collection name="firsttimeuse_info" long-name="First Time Use Info" level="ui">
-<component name="firsttimeuse_build" long-name="First Time Use Build">
-<unit bldFile="app/firsttimeuse" proFile="ftu.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-</block>
-<block name="devicecontrol" level="services" long-name="Device Control Daemons" levels="oma mid app">
-<collection name="deviceupdatesui" long-name="Device Updates UI" level="app">
-<component name="deviceupdatesui_adapters" long-name="Device Updates Adapters" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/devicecontrol/deviceupdatesui/adapters/bld"/>
-</component>
-<component name="deviceupdates" long-name="Device Updates" filter="s60" introduced="^4">
-<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdates" proFile="deviceupdates.pro"/>
-</component>
-<component name="deviceupdatesplugin" long-name="Device Updates Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdatesplugin" proFile="deviceupdatesplugin.pro"/>
-</component>
-<component name="deviceupdatesqtsp" long-name="Device Updates Qt Service Provider" filter="s60" introduced="^4">
-<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdatesqtsp" proFile="deviceupdatesqtsp.pro"/>
-</component>
-<component name="cpqtsp" long-name="Client Provisioning Qt Service Provider" filter="s60" introduced="^4">
-<unit bldFile="app/devicecontrol/deviceupdatesui/cpqtsp" proFile="cpqtsp.pro"/>
-</component>
-<component name="devicemanagementnotifiersplugin" long-name="Device Management Notifiers Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/devicecontrol/deviceupdatesui/devicemanagementnotifiersplugin" proFile="devicemanagementnotifiersplugin.pro"/>
-</component>
-</collection>
-</block>
-<block name="printing" level="services" long-name="Printing"/>
-<block name="files" level="apps" long-name="File Manager Apps" levels="support apps">
-<collection name="filemanager" long-name="File Manager" level="apps">
-<component name="filemanager_plat" long-name="File Manager Platform Interfaces" filter="s60" introduced="^4" class="api"/>
-<component name="fmbkupengine" filter="s60" long-name="File Manager Backup Engine" introduced="^4">
-<unit bldFile="app/files/filemanager/src/fmbkupengine/group"/>
-</component>
-<component name="filemanager_build" filter="s60" long-name="File Manager Build">
-<!-- break this up into components or move down a directory -->
-<unit bldFile="app/files/filemanager" proFile="filemanager.pro"/>
-</component>
-</collection>
-</block>
-<block name="search" level="apps" long-name="Search Apps" levels="eng base app api">
-<collection name="search_info" long-name="Search Info">
-<component name="search_build" long-name="Search Build">
-<unit bldFile="app/search/group"/>
-</component>
-</collection>
-<collection name="searchui" long-name="Search UI">
-<component name="searchui_build" long-name="Search UI Build">
-<unit bldFile="app/search/searchui" proFile="searchui.pro"/>
-</component>
-</collection>
-</block>
-<block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
-<collection name="contacts_plat" long-name="Contacts Apps Platform Interfaces" level="ui">
-<component name="logs_engine_api" long-name="Logs Engine API" filter="s60" introduced="^4" class="api"/>
-<component name="logs_engine_api_extensions" long-name="Logs Engine API Extensions" filter="s60" class="api"/>
-<component name="logs_services_api" long-name="Logs Services API" filter="s60" introduced="^4" class="api"/>
-<component name="logs_timers_api" long-name="Logs Timers API" filter="s60" class="api"/>
-<component name="qt_mobility_contacts_api" long-name="Qt Mobility Contacts API" filter="s60" introduced="^4" class="api"/>
-</collection>
-<collection name="logsui" long-name="Logs UI" level="ui">
-<component name="logsui_build" filter="s60" long-name="Logs UI Build">
-<!-- component at too high a rank, should move down one directory -->
-<unit bldFile="app/contacts/logsui" proFile="logsui.pro"/>
-</component>
-</collection>
-<collection name="phonebookui" long-name="Phonebook UI" level="ui">
-<component name="mobhistorymodel" filter="s60" long-name="Mobile History Model" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/mobhistorymodel" qt:proFile="mobhistorymodel.pro"/> -->
-</component>
-<component name="pbkcommonui" filter="s60" long-name="Phonebook Common UI" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/pbkcommonui" qt:proFile="pbkcommonui.pro"/> -->
-</component>
-<component name="phonebookapp" filter="s60" long-name="Phonebook Application" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/phonebookapp" qt:proFile="phonebookapp.pro"/> -->
-</component>
-<component name="phonebookservices" filter="s60" long-name="Phonebook Services" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/phonebookservices" qt:proFile="phonebookservices.pro"/> -->
-</component>
-<component name="phonebookui_build" filter="s60" long-name="Phonebook UI Build" introduced="^4">
-<!-- break up into components -->
-<unit bldFile="app/contacts/phonebookui" proFile="phonebookui.pro"/>
-</component>
-</collection>
-<collection name="qtcontactsmobility" long-name="Qt Contacts Mobility" level="support">
-<component name="qtcontactsmobility_build" filter="s60" long-name="Qt Contacts Mobility Build" introduced="^4" plugin="Y">
-<!-- not really a component, move down a dir? Break up into compnents? -->
-<unit bldFile="app/contacts/qtcontactsmobility" proFile="qtcontactsmobility.pro"/>
-</component>
-</collection>
-<collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
-<component name="cntfindplugin" filter="s60" long-name="Contacts Find Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntfindplugin" proFile="cntfindplugin.pro"/>
-</component>
-<component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
-<unit bldFile="app/contacts/phonebookengines/contactsmodel/groupsql" mrp="app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
-</component>
-<component name="cntsortplugin" filter="s60" long-name="Contacts Sort Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntsortplugin" proFile="cntsortplugin.pro"/>
-</component>
-<component name="mobcntmodel" filter="s60" long-name="Mobile Contacts Model" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/mobcntmodel" proFile="mobcntmodel.pro"/>
-</component>
-<component name="mobcntactions" filter="s60" long-name="Mobile Contacts Actions" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/mobcntactions" proFile="mobcntactions.pro"/>
-</component>
-<component name="cntmaptileservice" filter="s60" long-name="Contacts Map Tile Service" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/cntmaptileservice" proFile="cntmaptileservice.pro"/>
-</component>
-<component name="simutility" filter="s60" long-name="SIM Utility" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/simutility" proFile="simutility.pro"/>
-</component>
-</collection>
-<collection name="pimprotocols" long-name="PIM Protocols" level="services">
-<component name="phonebooksync" long-name="Phonebook Sync" purpose="optional" plugin="Y">
-<unit bldFile="app/contacts/pimprotocols/phonebooksync/group" mrp="app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
-</component>
-<component name="pbap" long-name="Bluetooth PBAP" introduced="9.2" purpose="optional">
-<unit bldFile="app/contacts/pimprotocols/pbap/group" mrp="app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
-</component>
-</collection>
-<collection name="contacts_info" long-name="Contacts Apps Info" level="ui">
-<component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="organizer" level="apps" span="2" long-name="Organizer Application Suite" levels="support services engine ui app">
-<collection name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" level="app">
-<component name="calendar_interim_utils2_api" long-name="Calendar Interim Utils 2 API" filter="s60" class="api">
-<!-- move into own .pro file -->
-<unit bldFile="app/organizer/organizer_pub" proFile="organizer_pub.pro"/>
-</component>
-</collection>
-<collection name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" level="app">
-<component name="organizer_plat_build" long-name="Organizer Application Suite Platform Interface Build" filter="s60" class="api">
-<!-- break up into individual .pro files -->
-<unit bldFile="app/organizer/organizer_plat" proFile="organizer_plat.pro"/>
-</component>
-<component name="agenda_versit_2_api" long-name="Agenda Versit 2 API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="organizer_plat/agenda_versit_2_api/group"/>-->
-</component>
-<component name="calendar_exporter_api" long-name="Calendar Exporter API" filter="s60" class="api placeholder">
-<!--<unit bldFile="organizer_plat/calendar_exporter_api/group"/>-->
-</component>
-<component name="calendar_importer_api" long-name="Calendar Importer API" filter="s60" class="api placeholder">
-<!--<unit bldFile="organizer_plat/calendar_importer_api/group"/>-->
-</component>
-<component name="calendar_launcher_api" long-name="Calendar Launcher API" filter="s60" class="api placeholder">
-<!--<unit bldFile="organizer_plat/calendar_launcher_api/group"/> -->
-</component>
-<component name="agenda_interface_api" long-name="Agenda Interface API" filter="s60" introduced="^4" class="api"/>
-<component name="calendar_editor_api" long-name="Calendar Editor API" filter="s60" introduced="^4" class="api"/>
-<component name="notes_editor_api" long-name="Notes Editor API" filter="s60" introduced="^4" class="api"/>
-<component name="agenda_eventviewer_api" long-name="Agenda Event Viewer API" filter="s60" introduced="^4" class="api"/>
-</collection>
-<collection name="agendainterface" long-name="Agenda Interface" level="services">
-<!-- collection is really a component, should move down a directory -->
-<component name="agendainterface_build" filter="s60" long-name="Agenda Interface Build">
-<unit bldFile="app/organizer/agendainterface" proFile="agendainterface.pro"/>
-</component>
-</collection>
-<collection name="calendarui" long-name="Calendar UI" level="ui">
-<component name="commonutils" filter="s60" long-name="Calendar Common Utils">
-<unit bldFile="app/organizer/calendarui/commonutils" proFile="commonutils.pro"/>
-</component>
-<component name="calenlauncher" filter="s60" long-name="Calendar Launcher">
-<unit bldFile="app/organizer/calendarui/calenlauncher/group" proFile="calenlauncher.pro"/>
-</component>
-<component name="caleneditor" filter="s60" long-name="Calendar Editor" introduced="^4">
-<unit bldFile="app/organizer/calendarui/caleneditor" proFile="caleneditor.pro"/>
-</component>
-<component name="agendaeventviewer" filter="s60" long-name="Agenda Event Viewer" introduced="^4">
-<unit bldFile="app/organizer/calendarui/agendaeventviewer" proFile="agendaeventviewer.pro"/>
-</component>
-<component name="globaldata" filter="s60" long-name="Calendar Global Data">
-<unit bldFile="app/organizer/calendarui/globaldata" proFile="globaldata.pro"/>
-</component>
-<component name="settings" filter="s60" long-name="Calendar Settings">
-<unit bldFile="app/organizer/calendarui/settings" proFile="settings.pro"/>
-</component>
-<component name="calenplugins" filter="s60" long-name="Calendar Plugins" introduced="^4" plugin="Y">
-<unit bldFile="app/organizer/calendarui/calenplugins" proFile="calenplugins.pro"/>
-</component>
-<component name="customisationmanager" filter="s60" long-name="Calendar Customisation Manager">
-<unit bldFile="app/organizer/calendarui/customisationmanager" proFile="customisationmanager.pro"/>
-</component>
-<component name="views" filter="s60" long-name="Calendar Views">
-<unit bldFile="app/organizer/calendarui/views" proFile="views.pro"/>
-</component>
-<component name="calengriditemstyleplugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/organizer/calendarui/styleplugins/calengriditemstyleplugin" proFile="calengriditemstyleplugin.pro"/>
-</component>
-<component name="calendarui_controller" filter="s60" long-name="Calendar Controller">
-<unit bldFile="app/organizer/calendarui/controller" proFile="controller.pro"/>
-</component>
-<component name="calendarui_application" filter="s60" long-name="Calendar Application">
-<unit bldFile="app/organizer/calendarui/application" proFile="application.pro"/>
-</component>
-<component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y">
-<unit bldFile="app/organizer/calendarui/caldav/group"/>
-</component>
-</collection>
-<collection name="notes" long-name="Notes" level="ui">
-<component name="noteseditor" filter="s60" long-name="Notes Editor" introduced="^4">
-<unit bldFile="app/organizer/notes/notesui/noteseditor" proFile="noteseditor.pro"/>
-</component>
-<component name="notes_build" filter="s60" long-name="Notes Build" introduced="^4">
-<unit bldFile="app/organizer/notes" proFile="notes.pro"/>
-</component>
-</collection>
-<collection name="calendarengines" long-name="Calendar Engines" level="engine">
-<component name="versit2" filter="s60" long-name="Versit 2 iCal Parser" introduced="9.2">
-<unit bldFile="app/organizer/calendarengines/versit2/group"/>
-</component>
-<component name="agnversit2" filter="s60" long-name="Versit 2 Agenda Interface" introduced="9.2" plugin="Y">
-<unit bldFile="app/organizer/calendarengines/agnversit2/group"/>
-</component>
-<component name="caleninterimutils" filter="s60" long-name="Calendar Interim Utils" introduced="9.1">
-<unit bldFile="app/organizer/calendarengines/caleninterimutils/group"/>
-</component>
-<component name="calenimp" filter="s60" long-name="Calendar Import Wrapper" introduced="7.0s">
-<unit bldFile="app/organizer/calendarengines/calenimp/group"/>
-</component>
-<component name="caldavsrv" filter="sf_build" long-name="CalDAV Server" introduced="^3">
-<unit bldFile="app/organizer/calendarengines/caldav/group"/>
-</component>
-</collection>
-<collection name="clock" long-name="Clock" level="app">
-<!-- uncomment unit when block_build is split up-->
-<component name="clockengines" filter="s60" long-name="Clock Engines" class="placeholder">
-<!--<unit bldFile="clock/clockengines" qt:proFile="clockengines.pro"/> -->
-</component>
-<component name="clockmw" filter="s60" long-name="Clock Middleware" introduced="^4" class="placeholder">
-<!--<unit bldFile="clock/clockmw" qt:proFile="clockmw.pro"/>-->
-</component>
-<component name="clockui" filter="s60" long-name="Clock UI" class="placeholder">
-<!--<unit bldFile="clock/clockui" qt:proFile="clockui.pro"/>-->
-</component>
-<component name="ftudatetimewizard" filter="s60" long-name="First Time Use Date/Time Wizard" introduced="^4" class="placeholder">
-<!--<unit bldFile="clock/ftudatetimewizard" qt:proFile="ftudatetimewizard.pro"/>-->
-</component>
-<component name="clock_build" filter="s60" long-name="Clock Build">
-<!-- make exports into a component, or just move to one of the above components, then remove this and uncomment the above -->
-<unit bldFile="app/organizer/clock" proFile="clock.pro"/>
-</component>
-</collection>
-<collection name="pimappservices" long-name="PIM Application Services" level="services">
-<component name="calendar" long-name="Calendar" introduced="9.2" purpose="optional">
-<unit bldFile="app/organizer/pimappservices/calendar/group" mrp="app/organizer/pimappservices/calendar/group/app-engines_calendar.mrp" version="2"/>
-</component>
-<component name="calendarvcalplugin" long-name="Calendar vCal Plugin" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="app/organizer/pimappservices/calendarvcalplugin/group" mrp="app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp" version="2"/>
-</component>
-<component name="appenginesdocs" long-name="Application Engines Documentation" purpose="development" class="doc">
-<unit mrp="app/organizer/pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
-</component>
-</collection>
-<collection name="pimappsupport" long-name="PIM Application Support" level="support">
-<component name="vcardandvcal" long-name="vCard and vCal" introduced="ER5" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/vcardandvcal/group" mrp="app/organizer/pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
-</component>
-<component name="chinesecalendarconverter" long-name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
-</component>
-<component name="chinesecalendaralg" long-name="Chinese Calendar Algorithm" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendaralg/group" mrp="app/organizer/pimappsupport/chinesecalendaralg/group/app-services_chinesecalendaralgorithm.mrp"/>
-</component>
-</collection>
-<collection name="alarmui" long-name="Alarm UI" level="app">
-<!-- collection is really a component, should move down a directory -->
-<component name="alarmui_build" filter="s60" long-name="Alarm UI Build">
-<unit bldFile="app/organizer/alarmui" proFile="alarmui.pro"/>
-</component>
-</collection>
-<collection name="organizer_info" long-name="Organizer Application Suite Info" level="app">
-<component name="organizer_metadata" long-name="Organizer Application Suite Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="plugin eng base app api">
-<collection name="msg_plat" long-name="Messaging Apps Platform APIs" level="api">
-<component name="messaging_media_resolver_api" long-name="Messaging Media Resolver API" filter="s60" class="api"/>
-<component name="mms_application_api" long-name="MMS Application API" filter="s60" class="api"/>
-<component name="mms_codec_client_api" long-name="MMS Codec Client API" filter="s60" class="api"/>
-<component name="mms_conformance_api" long-name="MMS Conformance API" filter="s60" class="api"/>
-<component name="mms_engine_settings_api" long-name="MMS Engine Settings API" filter="s60" class="api"/>
-<component name="mms_server_settings_api" long-name="MMS Server Settings API" filter="s60" class="api"/>
-<component name="conversation_services_client_api" long-name="Conversation Services Client API" filter="s60" introduced="^4" class="api"/>
-<component name="conversation_services_plugin_api" long-name="Conversation Services Plugin API" filter="s60" introduced="^4" class="api"/>
-<component name="conversation_services_utilities_api" long-name="Conversation Services Utilities API" filter="s60" introduced="^4" class="api"/>
-<component name="shareui_api" long-name="Share UI API" filter="s60" introduced="^4" class="api"/>
-<component name="messaging_history_api" long-name="Messaging History API" filter="s60" introduced="^4" class="api"/>
-<component name="msg_plat_build" long-name="Messaging Apps Platform APIs Build" filter="s60" introduced="^4" class="api">
-<!-- break this up into the above units and replace their base attributes with bldFile, etc -->
-</component>
-</collection>
-<collection name="msg_pub" long-name="Messaging Apps Public APIs" level="api">
-<component name="mms_client_mtm_api" long-name="MMS Client MTM API" filter="s60" class="api"/>
-<component name="msg_smil_dtd_api" long-name="Messaging SMIL DTD API" filter="s60" introduced="^4" class="api"/>
-<component name="msg_pub_build" long-name="Messaging Apps Public APIs Build" filter="s60" introduced="^4" class="api">
-<!-- break this up into the above units and replace their base attributes with bldFile, etc -->
-</component>
-</collection>
-<collection name="mobilemessaging" long-name="Mobile Messaging" level="plugin">
-<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/mobilemessaging/smsmtm/group" mrp="app/messaging/mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
-</component>
-</collection>
-<collection name="messagingappbase" long-name="Messaging App Base" level="base">
-<component name="messagingappbase_build" filter="s60" long-name="Messaging App Base Build" introduced="^4">
-<!-- break this up into the below components -->
-<unit bldFile="app/messaging/messagingappbase" proFile="messagingappbase.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgmedia" filter="s60" long-name="Message Media"/>
-<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
-<unit mrp="app/messaging/messagingappbase/smsmtm/group/messaging_sms.mrp"/>
-</component>
-<component name="smilparser" long-name="SMIL Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="app/messaging/messagingappbase/smilparser/GROUP" mrp="app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
-</component>
-<component name="obexmtms" long-name="OBEX MTMs" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/obexmtms/Group" mrp="app/messaging/messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
-</component>
-</collection>
-<collection name="mmsengine" long-name="MMS Engine" level="eng">
-<component name="mmsconninit" filter="s60" long-name="MMS Connection Initiator" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsconninit/bld"/> -->
-</component>
-<component name="genutils" filter="s60" long-name="General Utils" class="placeholder">
-<!-- <unit bldFile="mmsengine/genutils/bld"/> -->
-</component>
-<component name="mmsserversettings" filter="s60" long-name="MMS Server Settings" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserversettings/bld"/> -->
-</component>
-<component name="mmsmessage" filter="s60" long-name="MMS Message" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsmessage/bld"/> -->
-</component>
-<component name="mmshttptransport" filter="s60" long-name="MMS HTTP Transport" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmshttptransport/bld"/> -->
-</component>
-<component name="mmscodec" filter="s60" long-name="MMS Codec" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodec/bld"/> -->
-</component>
-<component name="mmsserver" filter="s60" long-name="MMS Server" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserver/bld"/> -->
-</component>
-<component name="clientmtm" filter="s60" long-name="MMS Client MTM" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/clientmtm/bld"/> -->
-</component>
-<component name="mmswatcher" filter="s60" long-name="MMS Watcher" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmswatcher/bld"/> -->
-</component>
-<component name="mmspushhandler" filter="s60" long-name="MMS Push Handler" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmspushhandler/bld"/> -->
-</component>
-<component name="applicationadapter" filter="s60" long-name="MMS Application Adapter" class="placeholder">
-<!-- <unit bldFile="mmsengine/applicationadapter/bld"/> -->
-</component>
-<component name="mmscodecclient" filter="s60" long-name="MMS Codec Client" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodecclient/bld"/> -->
-</component>
-<component name="mmssettings" long-name="MMS Settings" introduced="9.2" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmssettings/group" mrp="app/messaging/mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
-</component>
-<component name="mmsconf" long-name="MMS Configuration" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmsconf" mrp="app/messaging/mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
-</component>
-<component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
-<!-- this should be broken up into the individual other components -->
-<unit bldFile="app/messaging/mmsengine" proFile="mmsengine.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="messagingapp" long-name="Messaging Application" level="app">
-<component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
-<!-- this should be broken up into the individual other components -->
-<unit bldFile="app/messaging/messagingapp" proFile="messagingapp.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgutils" filter="s60" long-name="Messaging Utils" introduced="^4">
-<unit bldFile="app/messaging/messagingapp/msgutils" proFile="msgutils.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgappfw" filter="s60" long-name="Messaging Application Framework" introduced="^4">
-<unit bldFile="app/messaging/messagingapp/msgappfw" proFile="msgappfw.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgsettings" filter="s60" long-name="Messaging Settings" introduced="^4">
-<unit bldFile="app/messaging/messagingapp/msgsettings" proFile="msgsettings.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgnotifications" filter="s60" long-name="Messaging Notifications" introduced="^4">
-<unit bldFile="app/messaging/messagingapp/msgnotifications" proFile="msgnotifications.pro" qmakeArgs="-r"/>
-</component>
-<component name="smartmessaging" filter="s60" long-name="Smart Messaging">
-<unit bldFile="app/messaging/messagingapp/smartmessaging" proFile="smartmessaging.pro" qmakeArgs="-r"/>
-</component>
-<component name="shareui" filter="s60" long-name="Shared UI" introduced="^4">
-<unit bldFile="app/messaging/messagingapp/shareui" proFile="shareui.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgui" filter="s60" long-name="Messaging UI" introduced="^4">
-<unit bldFile="app/messaging/messagingapp/msgui" proFile="msgui.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="email" long-name="Email" level="plugin">
-<!-- use commonemail instead -->
-<component name="pop3andsmtpmtm" long-name="POP3 and SMTP MTM" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/pop3andsmtpmtm/group" mrp="app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
-</component>
-<component name="imap4mtm" long-name="IMAP4 MTM" introduced="9.2" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/imap4mtm/group" mrp="app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
-</component>
-</collection>
-<collection name="messaging_info" long-name="Messaging Apps Info" level="api">
-<component name="messaging_metadata" long-name="Messaging Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commonemail" level="apps" span="2" long-name="Email Apps" levels="service support ui app">
-<!-- need to resolve the qt parts into proper components, then uncomment the units -->
-<collection name="email_plat" long-name="Email Apps Platform Interfaces" level="app">
-<component name="nmail_client_api" long-name="NMail Client API" filter="s60" introduced="^4" class="api placeholder">
-<!--<unit bldFile="email_plat" qt:proFile="email_plat.pro"/> -->
-</component>
-</collection>
-<collection name="emailservices" long-name="Email Services" level="service">
-<component name="nmailbase" filter="s60" long-name="NMail Base" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/nmailbase" qt:proFile="nmailbase.pro"/> -->
-</component>
-<component name="emailcommon" filter="s60" long-name="Email Common" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/emailcommon" qt:proFile="emailcommon.pro"/>-->
-</component>
-<component name="emailframework" filter="s60" long-name="Email Framework" introduced="^2" class="placeholder">
-<!-- <unit bldFile="emailservices/emailframework" qt:proFile="emailframework.pro"/>-->
-</component>
-<component name="emailstore" filter="s60" long-name="Email Store" introduced="^2" class="placeholder">
-<!-- <unit bldFile="emailservices/emailstore" qt:proFile="emailstore.pro"/>-->
-</component>
-<component name="nmclientapi" filter="s60" long-name="Nmail Client API" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/nmclientapi" qt:proFile="nmclientapi.pro"/>-->
-</component>
-<component name="nmailagent" filter="s60" long-name="Nmail Agent" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/nmailagent" qt:proFile="nmailagent.pro"/>-->
-</component>
-</collection>
-<collection name="ipsservices" long-name="IMAP/POP/SMTP Services" level="service">
-<component name="ipssosplugin" filter="s60" long-name="IPS SOS Plugin" introduced="^2" plugin="Y" class="placeholder">
-<!-- SOS? Consider spelling it out since the abbreviation is ambiguous -->
-<!--<unit bldFile="ipsservices/ipssosplugin" qt:proFile="ipssosplugin.pro" />-->
-</component>
-<component name="nmimapclientplugin" filter="s60" long-name="NM IMAP Client Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="ipsservices/nmimapclientplugin" qt:proFile="nmimapclientplugin.pro"/>-->
-</component>
-<component name="nmipsmtms" filter="s60" long-name="NM IPS Client Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="ipsservices/nmipsmtms" qt:proFile="nmipsmtms.pro"/>-->
-</component>
-<component name="nmipssettings" filter="s60" long-name="NM IPS Settings" introduced="^4" class="placeholder">
-<!-- <unit bldFile="ipsservices/nmipssettings" qt:proFile="nmipssettings.pro"/>-->
-</component>
-<component name="ipsservices_build" filter="s60" long-name="IPS Services Build" introduced="^2" class="placeholder">
-<!--<unit bldFile="ipsservices" qt:proFile="ipsservices.pro"/> -->
-<!-- can the exports be broken up into the other components or made a config component?-->
-</component>
-</collection>
-<collection name="emailuis" long-name="Email UIs" level="app">
-<component name="nmailuiengine" filter="s60" long-name="Nmail UI Engine" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailuiengine" qt:proFile="nmailuiengine.pro"/> -->
-</component>
-<component name="nmailuiwidgets" filter="s60" long-name="Nmail UI Widgets" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailuiwidgets" qt:proFile="nmailuiwidgets.pro"/> -->
-</component>
-<component name="nmailuiwidgetsplugin" filter="s60" long-name="Nmail UI Widgets Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailuiwidgetsplugin" qt:proFile="nmailuiwidgetsplugin.pro"/> -->
-</component>
-<component name="nmsettingui" filter="s60" long-name="Nmail Setting UI" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmsettingui" qt:proFile="nmsettingui.pro"/> -->
-</component>
-<component name="nmailcpplugin" filter="s60" long-name="Nmail CP Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailcpplugin" qt:proFile="nmailcpplugin.pro"/> -->
-</component>
-<component name="nmailui" filter="s60" long-name="Nmail UI" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailui" qt:proFile="nmailui.pro"/> -->
-</component>
-<component name="nmindicatorplugin" filter="s60" long-name="Nmail Indicator Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmindicatorplugin" qt:proFile="nmindicatorplugin.pro"/> -->
-</component>
-<component name="nmframeworkadapter" filter="s60" long-name="Nmail Framework Adapter" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmframeworkadapter" qt:proFile="nmframeworkadapter.pro"/> -->
-</component>
-</collection>
-<collection name="commonemail_info" long-name="Email Apps Info" level="app">
-<component name="commonemail_build" long-name="Email Apps Build" introduced="^4">
-<!-- split into actual components -->
-<unit bldFile="app/commonemail" proFile="nmail.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</block>
-<block name="camera" level="apps" long-name="Camera Apps">
-<collection name="camerauis" long-name="Camera UIs">
-<component name="cameraxui" filter="s60" long-name="CameraX UIs">
-<unit bldFile="app/camera/camerauis/cameraxui" filter="!test" proFile="camerax.pro"/>
-</component>
-</collection>
-</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">
-<component name="image_editor_debug_utilities_api" long-name="Image Editor Debug Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
-</component>
-<component name="image_editor_utilities_api" long-name="Image Editor Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_utilities_api/group"/>
-</component>
-<component name="image_editor_definitions_api" long-name="Image Editor Definitions API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_definitions_api/group"/>
-</component>
-<component name="image_editor_system_parameters_api" long-name="Image Editor System Parameters API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_system_parameters_api/group"/>
-</component>
-<component name="image_processing_engine_api" long-name="Image Processing Engine API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_processing_engine_api/group"/>
-</component>
-</collection>
-<collection name="imageeditor" long-name="Image Editor UI" level="ui">
-<component name="pb" filter="s60" long-name="Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/pb/group"/>
-</component>
-<component name="iepb" filter="s60" long-name="Image Editor Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/iepb/group"/>
-</component>
-<component name="imageeditorui" filter="s60" long-name="Image Editor UI">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorui/group"/>
-</component>
-<component name="imageeditormanager" filter="s60" long-name="Image Editor Manager">
-<unit bldFile="app/imgeditor/imageeditor/imageeditormanager/group"/>
-</component>
-<component name="imageeditorapp" filter="s60" long-name="Image Editor Application">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorapp/group"/>
-</component>
-<component name="imageeditor_plugins" filter="s60" long-name="Image Editor Plugins" plugin="Y">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditor/plugins/blackwhiteplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/brightnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/bubbleplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cartoonizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/clipartplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/contrastplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cropplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/drawplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/frameplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/negativeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/redeyeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/resizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotatelplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotaterplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/textplugin/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditor/plugins/drawplugin/group"/>
- -->
-</component>
-<component name="editorprovider" filter="s60" long-name="Image Editor Provider">
-<unit bldFile="app/imgeditor/imageeditor/editorprovider/group"/>
-</component>
-<component name="imageeditor_build" filter="s60" long-name="Image Editor Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditor/group"/>
-</component>
-</collection>
-<collection name="imageeditorengine" long-name="Image Editor Engine" level="engine">
-<component name="filters" filter="s60" long-name="Image Editor Filters">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbrightness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbubble/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbuffer/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercartoon/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterclipart/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercontrast/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercrop/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterdraw/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterframe/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtergrayscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtericlsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegtarget/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filternegate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterredeye/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterrotate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtertext/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
- -->
-</component>
-<component name="imageeditorutils" filter="s60" long-name="Image Editor Utilities">
-<unit bldFile="app/imgeditor/imageeditorengine/imageeditorutils/group"/>
-</component>
-<component name="systemparameters" filter="s60" long-name="System Parameters">
-<unit bldFile="app/imgeditor/imageeditorengine/systemparameters/group"/>
-</component>
-<component name="enginewrapper" filter="s60" long-name="Image Editor Engine Wrapper">
-<unit bldFile="app/imgeditor/imageeditorengine/enginewrapper/group"/>
-</component>
-<component name="imageeditorengine_build" filter="s60" long-name="Image Editor Engine Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoeditor" level="apps" long-name="Video Editor Apps" levels="engine ui">
-<collection name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" level="ui">
-<component name="video_editor_engine_api" long-name="Video Editor Engine API" introduced="^2" class="api">
-<unit bldFile="app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
-</component>
-</collection>
-<collection name="videditor" long-name="Video Editor" level="ui">
-<component name="videoeditorcommon" filter="s60" long-name="Video Editor Common" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditorcommon/group"/>
-</component>
-<component name="videoeditoruicomponents" filter="s60" long-name="Video Editor UI Components" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditoruicomponents/group"/>
-</component>
-<component name="simplevideoeditor" filter="s60" long-name="Simple Video Editor" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplevideoeditor/group"/>
-</component>
-<component name="simplecutvideo" filter="s60" long-name="Simple Cut Video" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplecutvideo/group"/>
-</component>
-<component name="videoprovider" filter="s60" long-name="Video Provider" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoprovider/group"/>
-</component>
-<component name="manualvideoeditor" filter="s60" long-name="Manual Video Editor" introduced="^2" class="placeholder">
-<!-- uncomment when supported
- <meta rel="config">
- <defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
- </meta>
- <unit bldFile="videditor/manualvideoeditor/group"/> -->
-</component>
-<component name="videditor_build" filter="s60" long-name="Video Editor Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videditor/group"/>
-</component>
-</collection>
-<collection name="videoeditorengine" long-name="Video Editor Engine" level="engine">
-<component name="audioeditorengine" filter="s60" long-name="Audio Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/audioeditorengine/group"/>
-</component>
-<component name="avcedit" filter="s60" long-name="AVC Editing" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/avcedit/group"/>
-</component>
-<component name="h263decoder" filter="s60" long-name="H.263 Decoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/h263decoder/group"/>
-</component>
-<component name="mp3aacmaniplib" filter="s60" long-name="MP3 and AAC Manipulation Library" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
-</component>
-<component name="vedtranscoder" filter="s60" long-name="Video Editor Transcoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedtranscoder/group"/>
-</component>
-<component name="vedengine" filter="s60" long-name="Video Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedengine/group"/>
-</component>
-<component name="videoeditorengine_build" filter="s60" long-name="Video Editor Engine Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videoeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
-<collection name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" level="apps">
-<component name="videoplayer_startup_api" long-name="Video Player Startup API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videoplayer_startup_api/group" filter="!test"/>
-</component>
-<component name="videocollection_api" long-name="Video Collection API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videocollection_api/group"/>
-</component>
-</collection>
-<collection name="videocollection" long-name="Video Collection" level="util">
-<component name="mpxmyvideoscollection" filter="s60" long-name="MPX My Videos Collection" introduced="^3">
-<unit bldFile="app/videoplayer/videocollection/mpxmyvideoscollection/group"/>
-</component>
-<component name="videocollectionwrapper" filter="s60" long-name="Video Collection Wrapper" introduced="^4">
-<unit bldFile="app/videoplayer/videocollection/videocollectionwrapper" proFile="videocollectionwrapper.pro" qmakeArgs="-r"/>
-</component>
-<component name="videocollectionview" filter="s60" long-name="Video Collection View" introduced="^4">
-<unit bldFile="app/videoplayer/videocollection/videocollectionview" proFile="videocollectionview.pro" qmakeArgs="-r"/>
-</component>
-<component name="videofiledetailsview" filter="s60" long-name="Video File Details View" introduced="^4">
-<unit bldFile="app/videoplayer/videocollection/videofiledetailsview" proFile="videofiledetailsview.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="mediasettings" long-name="Media Settings" level="support">
-<!-- this is really a component. Should be moved down a directory -->
-<component name="mediasettings_build" filter="s60" long-name="Media Settings Build">
-<unit bldFile="app/videoplayer/mediasettings/group"/>
-</component>
-</collection>
-<collection name="videoplayerapp" long-name="Video Player App" level="apps">
-<component name="videoplayerengine" long-name="Video Player Engine" filter="s60" introduced="^4">
-<unit bldFile="app/videoplayer/videoplayerapp/videoplayerengine" proFile="videoplayerengine.pro" qmakeArgs="-r"/>
-</component>
-<component name="hbvideoplayer" filter="s60" long-name="HB Video Player" introduced="^4">
-<unit bldFile="app/videoplayer/videoplayerapp/hbvideoplayer" proFile="hbvideoplayer.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="videoplayback" long-name="Video Playback Plugins" level="plugin">
-<component name="hbvideoplaybackview" filter="s60" long-name="HB Video Playback View" introduced="^4" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/hbvideoplaybackview" proFile="hbvideoplaybackview.pro" qmakeArgs="-r"/>
-</component>
-<component name="hbvideoplaybackviewplugin" filter="s60" long-name="HB Video Playback View Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/hbvideoplaybackviewplugin" proFile="hbvideoplaybackviewplugin.pro" qmakeArgs="-r"/>
-</component>
-<component name="videohelix" long-name="Video Helix" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videohelix/group"/>
-</component>
-</collection>
-</block>
-<block name="photos" level="apps" long-name="Photos" levels="util support ui app">
-<collection name="photos_group" long-name="Photos Group" level="support">
-<component name="photos_group_build" filter="s60" long-name="Photos Group Build" introduced="^4" class="placeholder">
-<!--<unit bldFile="group" qt:proFile="group.pro"/> -->
-</component>
-</collection>
-<collection name="photos_loggers" long-name="Photos Loggers" level="util">
-<component name="photos_loggerqt" filter="s60" long-name="Photos Logger Qt" introduced="^4" class="placeholder">
-<!--<unit bldFile="loggers/loggerqt" qt:proFile="loggerqt.pro"/> -->
-</component>
-</collection>
-<collection name="photos_commonutilities" long-name="Photos Common Utilities" level="util">
-<component name="photos_externalutility" filter="s60" long-name="Photos External Utility" introduced="^4" class="placeholder">
-<!--<unit bldFile="commonutilities/externalutility" qt:proFile="externalutility.pro"/> -->
-</component>
-<component name="imagedecoderwrapper" filter="s60" long-name="Image Decoder Wrapper" introduced="^4" class="placeholder">
-<!--<unit bldFile="commonutilities/imagedecoderwrapper" qt:proFile="imagedecoderwrapper.pro"/> -->
-</component>
-</collection>
-<collection name="photos_ui" long-name="Photos UI" level="ui">
-<component name="photos_uiengine" filter="s60" long-name="Photos UI Engine" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/uiengine" qt:proFile="uiengine.pro"/> -->
-</component>
-<component name="photos_commandhandlers" filter="s60" long-name="Photos Command Handlers" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/commandhandlers" qt:proFile="commandhandlers.pro"/> -->
-</component>
-<component name="photos_views" filter="s60" long-name="Photos Views" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/views" qt:proFile="views.pro"/> -->
-</component>
-<component name="photos_viewmanagement" filter="s60" long-name="Photos View Management" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/viewmanagement" qt:proFile="viewmanagement.pro"/> -->
-</component>
-</collection>
-<collection name="photos_main" long-name="Photos Main" level="support">
-<component name="photos_main_build" filter="s60" long-name="Photos Main Build" introduced="^4" class="placeholder">
-<!--<unit bldFile="main" qt:proFile="main.pro"/> -->
-</component>
-</collection>
-<collection name="imageviewerapp" long-name="Image Viewer App" level="support">
-<component name="imageviewerapp_build" filter="s60" long-name="Image Viewer App Build" introduced="^4" class="placeholder">
-<!--<unit bldFile="imageviewerapp" qt:proFile="imageviewerapp.pro"/> -->
-</component>
-</collection>
-<collection name="photos_info" long-name="Photos Info" level="support">
-<component name="photos_build" filter="s60" long-name="Photos Build" introduced="^4">
-<!-- split this up into the above components -->
-<unit bldFile="app/photos" proFile="photos.pro"/>
-</component>
-</collection>
-</block>
-<block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support hs app">
-<!-- move the export .pri files into their components and uncomment the units -->
-<collection name="musicplayer_utilities " long-name="Music Player Utilities" level="support">
-<component name="mpnowplayingbanner" filter="s60" long-name="MP Now Playing Banner" introduced="^4" class="placeholder">
-<!-- <unit bldFile="utilities/mpnowplayingbanner" qt:proFile="mpnowplayingbanner.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-<component name="mpsettingsmanager" filter="s60" long-name="MP Settings Manager" introduced="^4" class="placeholder">
-<!-- <unit bldFile="utilities/mpsettingsmanager" qt:proFile="mpsettingsmanager.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-</collection>
-<collection name="musicfetcher " long-name="Music Fetcher" level="support">
-<!-- collection is really a component, move down a directory -->
-<component name="musicfetcher_buld" filter="s60" long-name="Music Fetcher Build" introduced="^4" class="placeholder">
-<!-- <unit bldFile="musicfetcher" qt:proFile="musicfetcher.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-</collection>
-<collection name="musicplayer_app " long-name="Music Player Application" level="app">
-<!-- collection is really a component, move down a directory -->
-<component name="musicplayer_app_build" filter="s60" long-name="Music Player Application Build" introduced="^4" class="placeholder">
-<!-- <unit bldFile="app" qt:proFile="app.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-</collection>
-<collection name="mpviewplugins " long-name="Music Player View Plugins" level="plugins">
-<component name="mpcollectionviewplugin" filter="s60" long-name="MP Collection View Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpviewplugins/mpcollectionviewplugin/group"/>-->
-</component>
-<component name="mpplaybackviewplugin" filter="s60" long-name="MP Playback View Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpviewplugins/mpplaybackviewplugin/group"/>-->
-</component>
-</collection>
-<collection name="mpserviceplugins" long-name="Music Player Service Plugins" level="plugins">
-<component name="audioeffects" filter="s60" long-name="Audio Effects" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/audioeffects/group"/>-->
-</component>
-<component name="localaudio" filter="s60" long-name="Local Audio" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/localaudio/group"/>-->
-</component>
-<!-- Note: it's called SQLite, not SQLLite, just the one "L" -->
-<component name="mpxsqlitedbcommon" filter="s60" long-name="MPX SQLite Database Common" introduced="^4" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitedbcommon/group"/>-->
-</component>
-<component name="mpxsqlitedbplugin" filter="s60" long-name="MPX SQLite Database Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitedbplugin/group"/>-->
-</component>
-<component name="mpxsqlitepodcastdbplugin" filter="s60" long-name="MPX SQLlite Podcast Database Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
-</component>
-<component name="m3uplaylistplugin" filter="s60" long-name="M3U Playlist Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
-</component>
-</collection>
-<collection name="musicplayer_info" long-name="Music Player Apps Info" level="app">
-<component name="musicplayer_build" filter="s60" long-name="Music Player Build">
-<!-- should brak up into individual components -->
-<unit bldFile="app/musicplayer" proFile="qtmusicplayer.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-</block>
-<block name="radio" level="apps" long-name="Radio Apps" levels="engine ui">
-<collection name="radioengine" long-name="Radio Engine" level="engine">
-<component name="radioengineutils" filter="s60" long-name="Radio Engine Utils" introduced="^4">
-<unit bldFile="app/radio/radioengine/utils/group"/>
-</component>
-<component name="radioenginesettings" filter="s60" long-name="Radio Engine Settings" introduced="^4">
-<unit bldFile="app/radio/radioengine/settings/group"/>
-</component>
-<component name="radioengine_engine" filter="s60" long-name="Radio Engine" introduced="^4">
-<unit bldFile="app/radio/radioengine/engine/group"/>
-</component>
-</collection>
-<collection name="radioapp" long-name="Radio App" level="ui">
-<component name="radioenginewrapper" filter="s60" long-name="Radio Engine Wrapper" introduced="^4">
-<unit bldFile="app/radio/radioapp/radioenginewrapper" proFile="radioenginewrapper.pro"/>
-</component>
-<component name="radiopresetstorage" filter="s60" long-name="Radio Preset Storage" introduced="^4">
-<unit bldFile="app/radio/radioapp/radiopresetstorage" proFile="radiopresetstorage.pro"/>
-</component>
-<component name="radiouiengine" filter="s60" long-name="Radio UI Engine" introduced="^4">
-<unit bldFile="app/radio/radioapp/radiouiengine" proFile="radiouiengine.pro"/>
-</component>
-<component name="radiowidgets" filter="s60" long-name="Radio Widgets" introduced="^4">
-<unit bldFile="app/radio/radioapp/radiowidgets" proFile="radiowidgets.pro"/>
-</component>
-<component name="radioapplication" filter="s60" long-name="Radio Application" introduced="^4">
-<unit bldFile="app/radio/radioapp/radioapplication" proFile="radioapplication.pro"/>
-</component>
-<component name="radio_rom" filter="s60" long-name="Radio ROM" introduced="^4">
-<unit bldFile="app/radio/rom"/>
-</component>
-</collection>
-</block>
-<block name="internetradio" level="apps" long-name="Internet Radio Apps" levels="engine server ui">
-<collection name="internetradio2_0" long-name="Internet Radio 2.0" level="ui">
-<!-- collection is really a component. Move down a dir -->
-<component name="internetradio2_0_build" long-name="Internet Radio 2.0 Build">
-<unit bldFile="app/internetradio/internetradio2.0/group"/>
-</component>
-</collection>
-<collection name="presetserver" long-name="Preset Server" level="server">
-<!-- collection is really a component. Move down a dir -->
-<component name="presetserver_build" long-name="Preset Server Build">
-<unit bldFile="app/internetradio/presetserver/group"/>
-</component>
-</collection>
-<collection name="qtinternetradio" long-name="Qt Internet Radio">
-<component name="qtinternetradio_build" long-name="Qt Internet Radio Build">
-<!-- Move down a dir or break into components-->
-<unit bldFile="app/internetradio/qtinternetradio" proFile="all.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-</block>
-<block name="homescreen" level="apps" long-name="Home Screen Apps" levels="support task ss hs">
-<collection name="homescreen_info" long-name="Home Screen Info" level="support">
-<component name="homescreen_build" long-name="Homescreen Build">
-<!-- break this up properly into components -->
-<unit bldFile="app/homescreen" proFile="homescreen.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-<collection name="homescreen_test" long-name="Home Screen Test" level="support"/>
-<!-- fiill in details with broken up homescreen_build -->
-<collection name="homescreenapp" long-name="Home Screen Application" level="hs">
-<component name="hsutils" long-name="Home Screen Utils" introduced="^4"/>
-<component name="hsdomainmodel" long-name="HS Domain Model" introduced="^4"/>
-<component name="hs_runtimeplugins" long-name="HS Runtime Plugins" introduced="^4" plugin="Y"/>
-<component name="hs_serviceproviders" long-name="HS Service Providers" introduced="^4" plugin="Y"/>
-<component name="hs_stateplugins" long-name="HS State Plugins" introduced="^4" plugin="Y"/>
-<component name="hs_widgetplugins" long-name="HS Widget Plugins" introduced="^4" plugin="Y"/>
-<component name="hsapplication" long-name="Home Screen Application" introduced="^4"/>
-<component name="hshomescreenclientplugin" long-name="Home Screen Client Plugin" introduced="^4" plugin="Y"/>
-<component name="hsmenucontentpublish" long-name="HS Menu Content Publish" introduced="^4"/>
-</collection>
-<collection name="screensaverapp" long-name="Screen Saver Application" level="ss">
-<component name="snsrutils" long-name="Screen Saver Utils" introduced="^4"/>
-<component name="snsr_serviceproviders" long-name="Screen Saver Service Providers" introduced="^4" plugin="Y"/>
-<component name="snsr_stateproviders" long-name="Screen Saver State Providers" introduced="^4" plugin="Y"/>
-<component name="snsr_runtimeproviders" long-name="Screen Saver Runtime Providers" introduced="^4" plugin="Y"/>
-<component name="snsrapplication" long-name="Screen Saver Application" introduced="^4"/>
-<component name="screensaverproviders" long-name="Screen Saver Providers" introduced="^4" plugin="Y"/>
-</collection>
-<collection name="taskswitcherapp" long-name="Task Switcher Application" level="task">
-<component name="taskswitcherappecom" long-name="Task Switcher Application ECom" introduced="^4"/>
-<component name="tsserviceplugin" long-name="Task Switcher Service Plugin" introduced="^4" plugin="Y"/>
-<component name="ts_runtimeplugins" long-name="TS Runtime Plugins" introduced="^4" plugin="Y"/>
-<component name="tsapplication" long-name="Task Switcher Application" introduced="^4"/>
-</collection>
-</block>
-<block name="homescreentools" level="services" long-name="Home Screen Tools" levels="tool install">
-<collection name="dtdinstaller" long-name="DTD Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<!-- this needs to be built first, does build order need to be forced with filters? -->
-<component name="dtdinstaller_build" filter="s60,bldmefirst" long-name="DTD Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/dtdinstaller/group"/>
-</component>
-</collection>
-<collection name="themeinstaller" long-name="Theme Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="themeinstaller_build" filter="s60" long-name="Theme Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/themeinstaller/group"/>
-</component>
-</collection>
-<collection name="widgettools" long-name="Widget Tools" level="install">
-<component name="hspluginpreinstaller" filter="s60" long-name="HS Plugin Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/hspluginspreinstaller/group"/>
-</component>
-<component name="wrtwidgetpreinstaller" filter="s60" long-name="WRT Widget Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
-</component>
-</collection>
-</block>
-<block name="jrt" level="services" long-name="Java Runtime" levels="util generic rt ui">
-<collection name="jrt_plat" long-name="JRT Platform Interfaces" level="ui">
-<component name="java_registry_api" long-name="Java Registry API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_registry_api/build"/>
-</component>
-<component name="java_env_info_api" long-name="Java Environment Info API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_env_info_api/build"/>
-</component>
-<component name="java_debug_api" long-name="Java Debug API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_debug_api/build"/>
-</component>
-</collection>
-<collection name="java_stubs" long-name="Java Stubs" level="util">
-<!-- uncomment all components when configuration is in place. Currently #included from jrt_build -->
-<component name="javadrmutils" long-name="Java DRM Utils" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtdrmutils/group"/>-->
-</component>
-<component name="javaenvinfo" long-name="Java Environment Info" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtenvinfo/group"/>-->
-</component>
-<component name="javaregistry" filter="s60,sf_build" long-name="Java Registry" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtregistry/clientserver/client/group"/>-->
-</component>
-<component name="java_stubs_build" filter="s60,sf_build" long-name="Java Stubs ROM" class="placeholder">
-<!-- Remove the #includes and rename JRT ROM-->
-<!--<unit bldFile="java_stubs/group"/>-->
-</component>
-</collection>
-<collection name="jrt_info" long-name="JRT Info" level="rt">
-<component name="jrt_build" filter="s60" long-name="JRT Build">
-<!-- needed for __JAVA_STUBS condition -->
-<unit bldFile="app/jrt/group"/>
-</component>
-</collection>
-</block>
-<block name="conntools" level="services" long-name="Connectivity Tools" levels="config app">
-<collection name="nettools" long-name="Net Tools" level="app">
-<component name="conntest" filter="s60" long-name="Connection Test" purpose="development">
-<unit bldFile="app/conntools/nettools/conntest/group"/>
-</component>
-</collection>
-<collection name="emulatorlan" long-name="Emulator LAN" level="config">
-<!-- component is actually a colleciton, should be moved down a directory -->
-<component name="emulatorlan_build" filter="s60" long-name="Emulator LAN Build" purpose="development" class="config">
-<unit bldFile="app/conntools/emulatorlan/group"/>
-</component>
-</collection>
-</block>
-<block name="rndtools" level="services" long-name="R&D tools" levels="support generic test util">
-<collection name="creator" long-name="Creator" level="support">
-<!-- collection is really a component. Should move down a directory -->
-<component name="creator_build" filter="s60" long-name="Creator Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/creator/group"/>
-</component>
-</collection>
-<collection name="filebrowser" long-name="File Browser" level="util">
-<!-- consider collapsing into a single component -->
-<component name="fileopserver" filter="s60" long-name="File Operations Server" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
-</component>
-<component name="fileopclient" filter="s60" long-name="File Operations Client" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!--<unit bldFile="filebrowser/fileopclient/group"/>-->
-</component>
-<component name="filebrowser_build" filter="s60" long-name="File Browser Application" purpose="development" class="tool">
-<!-- Need to make this a self-contained component by removing #includes. Can only do when configuration is in place-->
-<unit bldFile="app/rndtools/filebrowser/group"/>
-</component>
-</collection>
-<collection name="launcher" long-name="Launcher" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="launcher_build" filter="s60" long-name="Launcher Utility" purpose="development" class="tool">
-<unit bldFile="app/rndtools/launcher/group"/>
-</component>
-</collection>
-<collection name="loadgen" long-name="Load Generator" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="loadgen_build" filter="s60" long-name="Load Generator Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/loadgen/group"/>
-</component>
-</collection>
-<collection name="perfmon" long-name="Performance Monitor" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="perfmon_build" filter="s60" long-name="Performance Monitor Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/perfmon/group"/>
-</component>
-</collection>
-<collection name="screengrabber" long-name="Screen Grabber" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="screengrabber_build" filter="s60" long-name="ScreenGrabber" purpose="development" class="tool">
-<unit bldFile="app/rndtools/screengrabber/group"/>
-</component>
-</collection>
-<collection name="stifui" long-name="STIF UI" level="generic">
-<component name="stifui_stifui" filter="s60" long-name="STIF UI" purpose="development">
-<unit bldFile="app/rndtools/stifui/stifui/group"/>
-</component>
-<component name="uitestserverstarter" filter="s60" long-name="UI Test Server Starter" purpose="development">
-<unit bldFile="app/rndtools/stifui/uitestserverstarter/group"/>
-</component>
-<component name="stifui_build" filter="s60" long-name="STIF UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/stifui/group"/>
-</component>
-</collection>
-<collection name="memspyui" long-name="Memspy UI" level="generic">
-<!-- collection is really a component. Should move down a directory -->
-<component name="memspyui_build" filter="s60" long-name="Memspy UI Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/memspyui/group"/>
-</component>
-</collection>
-<collection name="htiui" long-name="Harmonized Test Interface UI" level="generic">
-<component name="HtiServicePlugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- can only have a single unit. Should #include from a common bld.inf file -->
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiFtpBackupFake/group"/>
-</component>
-<component name="htidevicereboot" filter="s60" long-name="HTI Device Reboot" purpose="development">
-<unit bldFile="app/rndtools/htiui/htidevicereboot/group"/>
-</component>
-<component name="htistartupwait" filter="s60" long-name="HTI Startup Wait" purpose="development">
-<unit bldFile="app/rndtools/htiui/htistartupwait/group"/>
-</component>
-<component name="htiadmin" filter="s60" long-name="HTI Admin" purpose="development">
-<unit bldFile="app/rndtools/htiui/htiadmin/group"/>
-</component>
-<component name="htiui_build" filter="s60" long-name="HTI UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/htiui/group"/>
-</component>
-</collection>
-</block>
-<block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools if ui">
-<collection name="userguide" long-name="User Guide" level="if">
-<!-- collection is really a component. Move down a directory -->
-<component name="userguide_build" long-name="User Guide Build" filter="s60" introduced="^4">
-<unit bldFile="app/helps/userguide" proFile="Userguide.pro"/>
-</component>
-</collection>
-<collection name="symhelp" long-name="Symbian Help" level="eng">
-<component name="helpmodel" long-name="Help" introduced="6.0" purpose="optional">
-<unit bldFile="app/helps/symhelp/helpmodel/group" mrp="app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
-</component>
-</collection>
-<collection name="helps_info" long-name="Help Apps Info" level="ui">
-<component name="helps_metadata" long-name="Help Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/helps/helps_info/helps_metadata/helps_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
-<collection name="buildverification" long-name="Build Verification" level="services">
-<component name="autosmoketest" long-name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
-<unit bldFile="app/techview/buildverification/autosmoketest/Group" mrp="app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
-</component>
-<component name="smoketest" long-name="Smoke Test" filter="gt" purpose="development">
-<unit bldFile="app/techview/buildverification/smoketest/Group" mrp="app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
-</component>
-</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="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"/>
-<collection name="installationapps" long-name="Installation Apps" level="apps2"/>
-<collection name="messagingapps" long-name="Messaging Apps" level="apps2"/>
-<collection name="telephonyapps" long-name="Telephony Apps" level="apps1"/>
-<collection name="networkingapps" long-name="Networking Apps" level="apps1"/>
-<collection name="networkingutils" long-name="Networking Utils" level="utils"/>
-<collection name="shortlinkapps" long-name="Shortlink Apps" level="apps1"/>
-<collection name="testapps" long-name="Test Apps" level="utils"/>
-<collection name="avapps" long-name="A/V Apps" level="apps3"/>
-<collection name="toolkit" long-name="Toolkit" level="utils"/>
-<collection name="techview_info" long-name="Techview Info" level="apps3">
-<component name="techview_metadata" long-name="Techview Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/techview/techview_info/techview_metadata/techview_metadata.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
--- a/symbian4/single/sysdefs/auto/model_20100504153207_77bbfce038b4.xml Wed May 05 12:21:47 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9092 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a package or prebuilt -->
-<!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) "N"
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile may someday be removed in favour of mrp -->
-<!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="low mw high">
-<block name="stubs" level="high" span="2" long-name="Stubs" levels="adaptation plugin mid engine">
-<collection name="audiostubs" long-name="Audio Stubs" level="adaptation">
-<component name="devsoundextensions_stubs" long-name="Devsound Extensions Stubs">
-<unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/group"/>
-</component>
-<component name="fmradiotunercontrolstub" long-name="FM Radio Tuner Control Stub">
-<unit bldFile="adaptation/stubs/audiostubs/fmradiotunercontrolstub/group"/>
-</component>
-</collection>
-<collection name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaptation Stub" level="adaptation">
-<component name="btaudioadaptation_stub_build" long-name="Bluetooth Audio Adaptation Stub Build" filter="oem_build">
-<unit bldFile="adaptation/stubs/btaudioadaptation_stub/group"/>
-</component>
-</collection>
-<collection name="drm_stubs" long-name="DRM Stubs" level="plugin">
-<component name="drm_stubs_build" long-name="DRM Stubs Build">
-<unit bldFile="adaptation/stubs/drm_stubs/group"/>
-</component>
-</collection>
-<collection name="ocrsrv_stub" long-name="OCR Services Stub" level="mid">
-<component name="ocrsrv_stub_build" long-name="OCR Services Stub Build" filter="!dfs_build">
-<unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
-</component>
-</collection>
-<collection name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
-<component name="omasuplasnconverterstubimpl_build" long-name="OMA SUPL ASN Converter Stub Implementation Build" filter="!dfs_build">
-<unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
-</component>
-</collection>
-<collection name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" level="plugin">
-<component name="posmsgpluginreferenceimpl_build" long-name="POS Message Plugin Reference Implementation Build" plugin="Y">
-<unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
-</component>
-</collection>
-<collection name="srsfenginestub" long-name="SRSF Engine Stub" level="engine">
-<component name="srsfenginestub_build" long-name="SRSF Engine Stub Build" filter="stubs">
-<unit bldFile="adaptation/stubs/srsfenginestub/group"/>
-</component>
-</collection>
-<collection name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub" level="plugin">
-<component name="power_save_display_mode_stub_build" long-name="Power Save Display Mode Stub Build">
-<unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
-</component>
-</collection>
-<collection name="systemswstubs" long-name="System Software Stubs" level="adaptation">
-<component name="ddcaccessstub" long-name="DDC Access Stub">
-<unit bldFile="adaptation/stubs/systemswstubs/ddcaccessstub/group"/>
-</component>
-<component name="tvoutconfig" long-name="TV Out Config">
-<unit bldFile="adaptation/stubs/systemswstubs/TVOutConfig/group" filter="oem_build"/>
-</component>
-<component name="accessorypolicyreference" long-name="Accessory Policy Reference">
-<unit bldFile="adaptation/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
-</component>
-<component name="asyreference" long-name="ASY Reference" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
-</component>
-<component name="examplecommonisc" long-name="Example Common ISC">
-<unit bldFile="adaptation/stubs/systemswstubs/examplecommonisc/group" filter="oem_build"/>
-</component>
-<component name="exampledsy" long-name="Example DSY">
-<unit bldFile="adaptation/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
-</component>
-<component name="featuremanagerstub" long-name="Feature Manager Stub">
-<unit bldFile="adaptation/stubs/systemswstubs/featuremanagerstub/group" filter="oem_build"/>
-</component>
-<component name="hwrmstubplugins" long-name="Hardware Resource Manager Stub Plugins" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
-</component>
-<component name="hwrmhapticsstubplugin" long-name="Hardware Resource Manager Haptics Stub Plugin" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
-</component>
-<component name="sensorchannelsreference" long-name="Sensor Channels Reference">
-<unit bldFile="adaptation/stubs/systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
-</component>
-<component name="ssyreference" long-name="SSY Reference" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
-</component>
-<component name="startupadaptationstub" long-name="Startup Adaptation Stub" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/startupadaptationstub/group" filter="oem_build"/>
-</component>
-<component name="tiltcompensationstub" long-name="Tilt Compensation Stub">
-<unit bldFile="adaptation/stubs/systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
-</component>
-<component name="tvoutbehaviour" long-name="TV Out Behaviour">
-<unit bldFile="adaptation/stubs/systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
-</component>
-<component name="wiredbearerreference" long-name="Wired Bearer Reference" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
-</component>
-</collection>
-<collection name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" level="engine">
-<component name="tactileclickplugin_stub_build" long-name="Tactile Click Plugin Stub Build" plugin="Y">
-<unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
-</component>
-</collection>
-<collection name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub" level="mid">
-<component name="wlanhwinit_stub_build" long-name="WLAN Hardware Init Stub Build">
-<unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
-<collection name="omap3530" long-name="OMAP 3530" level="hw-if">
-<component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530" mrp="adaptation/beagleboard/omap3530/base_beagle.mrp"/>
-</component>
-<component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/kernel"/>
-</component>
-<component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/beagleboard"/>
-</component>
-</collection>
-</block>
-<block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
-<collection name="qemu_baseport" long-name="Baseport" level="hw-if">
-<component name="syborg" long-name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/qemu/baseport/syborg" mrp="adaptation/qemu/baseport/syborg/syborg.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
-<collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
-<component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
-<unit bldFile="os/kernelhwsrv/brdbootldr/ubootldr" mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
-</component>
-</collection>
-<collection name="bsptemplate" long-name="Board Support Package Template" level="hw-if">
-<component name="asspandvariant" long-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 name="kernel" long-name="Kernel Architecture" level="adaptation">
-<component name="eka" long-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 name="kerneltest" long-name="Kernel Test" level="hw-if">
-<component name="e32utils" long-name="E32 Utilities" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32utils/group" mrp="os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/>
-</component>
-<component name="e32test" long-name="E32 Tests" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32test/group" mrp="os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
-</component>
-<component name="f32test" long-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 name="ldds" long-name="Logical Device Drivers" level="adaptation">
-<component name="ethernetldd" long-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 name="audioldd" long-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>
-<component name="serialldd" long-name="Serial Port Drivers" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
-</component>
-<component name="legacydrivers" long-name="Legacy Drivers" purpose="optional">
-<unit mrp="os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
-</component>
-<component name="locmedia" long-name="Local Media Subsystem" introduced="8.1b" purpose="mandatory">
-<!-- these are LDDs for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
-</component>
-<component name="runmodedebugger" long-name="Run Mode Debugger" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/debug/group" mrp="os/kernelhwsrv/kernel/eka/drivers/debug/group/base_e32_drivers_debug.mrp"/>
-</component>
-<component name="btrace" long-name="Kernel Trace Tool" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/trace" mrp="os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
-</component>
-<component name="cameraldd" long-name="Camera Drivers" introduced="^3" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/camerasc" mrp="os/kernelhwsrv/kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
-</component>
-<component name="displayldd" long-name="Display Drivers" introduced="^3" purpose="optional">
-<!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/display" mrp="os/kernelhwsrv/kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
-</component>
-<component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
-</component>
-<component name="usbdescriptors" long-name="USB Descriptors" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors" mrp="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors/base_drivers_usbdescriptors.mrp"/>
-</component>
-<component name="usbdi_utils" long-name="USB DI Utils" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils" mrp="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils/base_drivers_usbdi_utils.mrp"/>
-</component>
-</collection>
-<collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
-<component name="mediadrivers" long-name="Media Drivers" purpose="optional">
-<!-- these are for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/media" mrp="os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
-</component>
-<component name="genericboardsupport" long-name="Generic Board Support" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
-</component>
-</collection>
-<collection name="userlibandfileserver" long-name="User Library and File Server" level="framework">
-<component name="euser" long-name="User Library" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/euser" mrp="os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
-</component>
-<component name="compsupp" long-name="Compiler Runtime Support" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/compsupp" mrp="os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
-</component>
-<component name="fileserver" long-name="File Server" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
-</component>
-<component name="estart" long-name="Base Starter" filter="gt" purpose="optional">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
-</component>
-<component name="domainmgr" long-name="Domain Manager" introduced="8.1b" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
-</component>
-</collection>
-<collection name="filesystems" long-name="File Systems" level="framework">
-<component name="romfs" long-name="ROM File System" filter="gt" purpose="optional" plugin="Y">
-<unit mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
-</component>
-<component name="rofs" long-name="ROFS" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
-</component>
-<component name="usbmsfs" long-name="USB Mass Storage File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
-</component>
-<component name="usbhostmssrv" long-name="USB Host Mass Storage Server" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage/base_f32_shostmassstorage.mrp"/>
-</component>
-<component name="fat32fs" long-name="FAT32 File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
-</component>
-<component name="fatfs" long-name="FAT File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
-</component>
-<component name="compfs" long-name="Composite File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
-</component>
-</collection>
-<collection name="halservices" long-name="HAL Services" level="framework">
-<component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
-<unit bldFile="os/kernelhwsrv/halservices/hal" mrp="os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
-</component>
-</collection>
-<collection name="textmodeshell" long-name="Text Mode Shell" level="test">
-<component name="e32wsrv" long-name="Text Window Server" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/ewsrv" mrp="os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
-</component>
-<component name="textshell" long-name="Text Shell" filter="gt" purpose="development">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
-</component>
-</collection>
-<collection name="baseapitest" long-name="Base API Tests" level="test"/>
-<collection name="kernelhwsrv_info" long-name="Kernel and Hardware Services Info" level="test">
-<component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 config">
-<collection name="emulator" long-name="Emulator" level="bsp">
-<component name="emulatorbsp" long-name="Emulator BSP" purpose="optional">
-<unit bldFile="os/boardsupport/emulator/emulatorbsp" mrp="os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
-</component>
-</collection>
-<collection name="haitest" long-name="HAI Test Suites" level="test">
-<component name="bspsvs" long-name="BSP Verification Suite" introduced="^2" purpose="development">
-<unit mrp="os/boardsupport/haitest/bspsvs/group/bspsvs.mrp"/>
-</component>
-</collection>
-<collection name="boardsupport_info" long-name="Board Support Info" level="config">
-<component name="boardsupport_metadata" long-name="Board Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/boardsupport/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
-<collection name="bldsystemtools" long-name="Build System Tools" level="bld">
-<component name="sysdeftools" long-name="System Definition Tools" purpose="development" introduced="^2">
-<unit mrp="os/buildtools/bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
-</component>
-<component name="commonbldutils" long-name="Common Utils" purpose="development">
-<unit mrp="os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
-</component>
-</collection>
-<collection name="toolsandutils" long-name="Tools and Utils" level="mw">
-<component name="productionbldtools" long-name="Production Build Tools" filter="gt" purpose="development">
-<unit mrp="os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
-</component>
-<component name="e32tools" long-name="E32 Tools" deprecated="^2" purpose="development" class="PC">
-<unit bldFile="os/buildtools/toolsandutils/e32tools/group" mrp="os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
-</component>
-<component name="autotest" long-name="Autotest" purpose="development">
-<unit bldFile="os/buildtools/toolsandutils/autotest/group" mrp="os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
-</component>
-</collection>
-<collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
-<component name="e32toolp" long-name="E32 Perl Tools" purpose="development" filter="sf_build" class="PC">
-<unit mrp="os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="os/buildtools/sbsv1_os/e32toolp/group"/>
-</component>
-</collection>
-<collection name="imgtools_os" long-name="Image Tools" level="fw">
-<component name="romkiteka2" long-name="ROMKIT EKA2" deprecated="^2" purpose="development">
-<unit bldFile="os/buildtools/imgtools_os/romkiteka2/group" mrp="os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
-</component>
-</collection>
-<collection name="misccomponents" long-name="Misc Components" level="mw">
-<component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt" purpose="development">
-<unit bldFile="os/buildtools/misccomponents/emulatorlauncher/group" mrp="os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
-</component>
-</collection>
-<collection name="buildtools_info" long-name="Build Tools Info" level="ui">
-<component name="buildtools_metadata" long-name="Build Tools Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/buildtools/buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
-<collection name="ossrv_pub" long-name="Generic OS Services Public Interfaces" level="utilities">
-<component name="boost_apis" long-name="Boost APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/boost_apis/group"/>
-</component>
-<component name="cpp_wrappers" long-name="Cpp wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cpp_wrappers/group"/>
-</component>
-<component name="character_type_apis" long-name="Character Type APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/character_type_apis/group"/>
-</component>
-<component name="compiler_specific_runtime_support" long-name="Compiler Specific Runtime Support" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/compiler_specific_runtime_support/group"/>
-</component>
-<component name="ossrv_configuration_api" long-name="Generic OS Services Configuration API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/configuration/group"/>
-</component>
-<component name="crypto_authentication_codes_and_hash_functions_api" long-name="Crypto Authentication Codes and Hash Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
-</component>
-<component name="crypto_auxillary_functions_api" long-name="Crypto Auxillary Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_auxillary_functions_api/group"/>
-</component>
-<component name="crypto_certificates_api" long-name="Crypto Certificates API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_certificates_api/group"/>
-</component>
-<component name="crypto_inputoutput_and_data_encoding_api" long-name="Crypto Input/Output and Data Encoding API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
-</component>
-<component name="crypto_public_key_cryptography_and_key_agreement_api" long-name="Crypto Public Key Cryptography and Key Agreement API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
-</component>
-<component name="crypto_symmetric_ciphers_api" long-name="Crypto Symmetric Ciphers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_symmetric_ciphers_api/group"/>
-</component>
-<component name="crypto_utility_functions_api" long-name="Crypto Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_utility_functions_api/group"/>
-</component>
-<component name="cryptogaphy_related_api" long-name="Cryptogaphy Related API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cryptogaphy_related_api/group"/>
-</component>
-<component name="ossrv_debug_api" long-name="Generic OS Services Debug API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/debug/group"/>
-</component>
-<component name="ossrv_exceptions_api" long-name="Generic OS Services Exceptions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/exceptions/group"/>
-</component>
-<component name="gboxed" long-name="GBoxed API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gboxed/group"/>
-</component>
-<component name="glib_arrays" long-name="Glib Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_arrays/group"/>
-</component>
-<component name="glib_asynchronous_queues" long-name="Glib Asynchronous Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_asynchronous_queues/group"/>
-</component>
-<component name="glib_atomic_operations" long-name="Glib Atomic Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_atomic_operations/group"/>
-</component>
-<component name="glib_automatic_string_completion" long-name="Glib Automatic String Completion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_automatic_string_completion/group"/>
-</component>
-<component name="glib_balanced_binary_trees" long-name="Glib Balanced Binary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_balanced_binary_trees/group"/>
-</component>
-<component name="glib_basic_types" long-name="Glib Basic Types API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_basic_types/group"/>
-</component>
-<component name="glib_caches" long-name="Glib Caches API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_caches/group"/>
-</component>
-<component name="glib_character_set_conversion" long-name="Glib Character Set Conversion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_character_set_conversion/group"/>
-</component>
-<component name="glib_closures" long-name="Glib Closures API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_closures/group"/>
-</component>
-<component name="glib_commandline_option_parser" long-name="Glib Command Line Option Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_commandline_option_parser/group"/>
-</component>
-<component name="glib_datasets" long-name="Glib Datasets API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_datasets/group"/>
-</component>
-<component name="glib_date_and_time_functions" long-name="Glib Date and Time Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_date_and_time_functions/group"/>
-</component>
-<component name="glib_doubleended_queues" long-name="Glib Double-ended Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doubleended_queues/group"/>
-</component>
-<component name="glib_doublylinked_lists" long-name="Glib Doubly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doublylinked_lists/group"/>
-</component>
-<component name="glib_dynamic_loading_of_modules" long-name="Glib Dynamic Loading of Modules API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_dynamic_loading_of_modules/group"/>
-</component>
-<component name="glib_enums_and_flags" long-name="Glib Enums and Flags API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_enums_and_flags/group"/>
-</component>
-<component name="glib_error_reporting" long-name="Glib Error Reporting API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_error_reporting/group"/>
-</component>
-<component name="glib_file_utilities" long-name="Glib File Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_file_utilities/group"/>
-</component>
-<component name="glib_generic_values" long-name="Glib Generic Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_generic_values/group"/>
-</component>
-<component name="glib_globstyle_pattern_matching" long-name="Glib Glob-Style Pattern Matching API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_globstyle_pattern_matching/group"/>
-</component>
-<component name="glib_hash_tables" long-name="Glib Hash Tables API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hash_tables/group"/>
-</component>
-<component name="glib_hook_functions" long-name="Glib Hook Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hook_functions/group"/>
-</component>
-<component name="glib_internationalization" long-name="Glib Internationalization API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_internationalization/group"/>
-</component>
-<component name="glib_io_channels" long-name="Glib I/O Channels API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_io_channels/group"/>
-</component>
-<component name="glib_keyvalue_file_parser" long-name="Glib Key-Value File Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_keyvalue_file_parser/group"/>
-</component>
-<component name="glib_lexical_scanner" long-name="Glib Lexical Scanner API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_lexical_scanner/group"/>
-</component>
-<component name="glib_main_event_loop" long-name="Glib Main Event Loop API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_main_event_loop/group"/>
-</component>
-<component name="glib_memory_allocation" long-name="Glib Memory Allocation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_allocation/group"/>
-</component>
-<component name="glib_memory_slices" long-name="Glib Memory Slices API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_slices/group"/>
-</component>
-<component name="glib_message_logging" long-name="Glib Message Logging API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_message_logging/group"/>
-</component>
-<component name="glib_miscellaneous_utility_functions" long-name="Glib Miscellaneous Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_miscellaneous_utility_functions/group"/>
-</component>
-<component name="glib_nary_trees" long-name="Glib N-ary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_nary_trees/group"/>
-</component>
-<component name="glib_parameters_and_values" long-name="Glib Parameters and Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_parameters_and_values/group"/>
-</component>
-<component name="glib_quarks" long-name="Glib Quarks API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_quarks/group"/>
-</component>
-<component name="glib_random_numbers" long-name="Glib Random Numbers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_random_numbers/group"/>
-</component>
-<component name="glib_relations_and_tuples" long-name="Glib Relations and Tuples API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_relations_and_tuples/group"/>
-</component>
-<component name="glib_shellrelated_utilities" long-name="Glib Shell-related Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_shellrelated_utilities/group"/>
-</component>
-<component name="glib_signals" long-name="Glib Signals API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_signals/group"/>
-</component>
-<component name="glib_simple_xml_subset_parser" long-name="Glib Simple XML Subset Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_simple_xml_subset_parser/group"/>
-</component>
-<component name="glib_singlylinked_lists" long-name="Glib Singly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_singlylinked_lists/group"/>
-</component>
-<component name="glib_spawning_processes" long-name="Glib Spawning Processes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_spawning_processes/group"/>
-</component>
-<component name="glib_standard_macros" long-name="Glib Standard Macros API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_standard_macros/group"/>
-</component>
-<component name="glib_string_utility_functions" long-name="Glib String Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_string_utility_functions/group"/>
-</component>
-<component name="glib_strings" long-name="Glib Strings API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_strings/group"/>
-</component>
-<component name="glib_thread_pools" long-name="Glib Thread Pools API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_thread_pools/group"/>
-</component>
-<component name="glib_threads" long-name="Glib Threads API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_threads/group"/>
-</component>
-<component name="glib_timers" long-name="Glib Timers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_timers/group"/>
-</component>
-<component name="glib_unicode_manipulation" long-name="Glib Unicode Manipulation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_unicode_manipulation/group"/>
-</component>
-<component name="glib_value_arrays" long-name="Glib Value Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_value_arrays/group"/>
-</component>
-<component name="glib_varargs_value_collection" long-name="Glib Varargs Value Collection API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_varargs_value_collection/group"/>
-</component>
-<component name="gobject" long-name="GObject API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gobject/group"/>
-</component>
-<component name="gparamspec" long-name="GParamSpec API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gparamspec/group"/>
-</component>
-<component name="gtype" long-name="GType API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtype/group"/>
-</component>
-<component name="gtypemodule" long-name="GTypeModule API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypemodule/group"/>
-</component>
-<component name="gtypeplugin" long-name="GTypePlugin API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypeplugin/group"/>
-</component>
-<component name="io_stream_api" long-name="I/O stream API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/io_stream_api/group"/>
-</component>
-<component name="localization_function_api" long-name="Localization Function API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/localization_function_api/group"/>
-</component>
-<component name="math_operations_api" long-name="Math Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/math_operations_api/group"/>
-</component>
-<component name="ossrv_memory_api" long-name="Generic OS Services Memory API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/memory/group"/>
-</component>
-<component name="no_namespace_headers" long-name="No Namespace Headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/no_namespace_headers/group"/>
-</component>
-<component name="openc_headers" long-name="OpenC headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_headers/group"/>
-</component>
-<component name="openc_wrappers" long-name="OpenC wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_wrappers/group"/>
-</component>
-<component name="ssl_general_api" long-name="SSL General API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_general_api/group"/>
-</component>
-<component name="ssl_protocol_methods_api" long-name="SSL Protocol Methods API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_protocol_methods_api/group"/>
-</component>
-<component name="standard_compressiondecompression_api" long-name="Standard Compression/Decompression API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/standard_compressiondecompression_api/group"/>
-</component>
-<component name="stl" long-name="STL API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/stl/group"/>
-</component>
-<component name="thread_api" long-name="Thread API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/thread_api/group"/>
-</component>
-<component name="type_attributes" long-name="Type Attributes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/type_attributes/group"/>
-</component>
-<component name="typeinfo" long-name="Type Info API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/typeinfo/group"/>
-</component>
-<component name="utility_apis" long-name="Utility APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/utility_apis/group"/>
-</component>
-<component name="wide_character_classapis" long-name="Wide character class/apis" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/wide_character_classapis/group"/>
-</component>
-<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">
-<unit bldFile="os/ossrv/ossrv_pub/dbus-glib/group"/>
-</component>
-</collection>
-<collection name="ossrv_plat" long-name="Generic OS Services Platform Interfaces" level="utilities">
-<component name="libutils_apis" long-name="Utility Library APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_plat/libutils/group"/>
-</component>
-</collection>
-<collection name="stdlibs" long-name="Standard Libraries" level="translation">
-<component name="libz" filter="s60" long-name="Z Compression Library">
-<unit bldFile="os/ossrv/stdlibs/libz/group"/>
-</component>
-<component name="libcrypt" filter="s60" long-name="Crypt Library">
-<unit bldFile="os/ossrv/stdlibs/libcrypt/group"/>
-</component>
-</collection>
-<collection name="ssl" long-name="SSL" level="data-services">
-<component name="libcrypto" filter="s60" long-name="Crypto Library">
-<unit bldFile="os/ossrv/ssl/libcrypto/group"/>
-</component>
-<component name="libssl" filter="s60" purpose="development" long-name="SSL Library">
-<unit bldFile="os/ossrv/ssl/libssl/group"/>
-</component>
-</collection>
-<collection name="glib" long-name="GLib" level="utilities">
-<component name="glibbackend" filter="s60" long-name="GLib Backend">
-<unit bldFile="os/ossrv/glib/build/symbian/glibbackend/group"/>
-<!-- Move to here: <unit bldFile="glib/glibbackend/group"/> -->
-</component>
-<component name="libglib" filter="s60" long-name="GLib Library">
-<unit bldFile="os/ossrv/glib/build/symbian/glib/group"/>
-<!-- Move to here: <unit bldFile="glib/libglib/group"/> -->
-</component>
-<component name="libgthread" filter="s60" long-name="Libg Thread">
-<unit bldFile="os/ossrv/glib/build/symbian/gthread/group"/>
-<!-- Move to here: <unit bldFile="glib/libgthread/group"/> -->
-</component>
-<component name="libgmodule" filter="s60" long-name="Libg Module">
-<unit bldFile="os/ossrv/glib/build/symbian/gmodule/group"/>
-<!-- Move to here: <unit bldFile="glib/libgmodule/group"/> -->
-</component>
-<component name="libgobject" filter="s60" long-name="Libg Object">
-<unit bldFile="os/ossrv/glib/build/symbian/gobject/group"/>
-<!-- Move to here: <unit bldFile="glib/libgobject/group"/> -->
-</component>
-</collection>
-<collection name="stdcpp" long-name="C++ Standard Library" level="translation">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="stdcpp_build" filter="s60" long-name="Stdcpp">
-<unit bldFile="os/ossrv/stdcpp/group"/>
-</component>
-</collection>
-<collection name="ofdbus" long-name="Open Foundation D-Bus" level="utilities">
-<component name="dbus" filter="s60" long-name="D-Bus">
-<unit bldFile="os/ossrv/ofdbus/dbus/group"/>
-</component>
-<component name="dbus-glib" filter="s60" long-name="D-Bus GLib">
-<unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
-</component>
-<component name="ofdbus_rom" filter="s60" long-name="D-Bus ROM">
-<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory
- Consider moving IBY file to one of the above as well and removing this component entirely -->
-<unit bldFile="os/ossrv/ofdbus/group"/>
-</component>
-</collection>
-<collection name="utilitylibraries" long-name="Utility Libraries" level="encoding">
-<component name="libutils" filter="s60" long-name="Utility Library">
-<unit bldFile="os/ossrv/utilitylibraries/libutils/group"/>
-</component>
-</collection>
-<collection name="genericservices" long-name="Generic Services" level="utilities">
-<component name="s60compatibilityheaders" long-name="S60 Compatibility Headers" filter="gt" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp" version="tb101sf"/>
-</component>
-<component name="mimerecognitionfw" long-name="MIME Recognition Framework" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/mimerecognitionfw/group" mrp="os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
-</component>
-<component name="systemagent" long-name="System Agent" introduced="9.0" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/systemagent/group" mrp="os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
-</component>
-<component name="taskscheduler" long-name="Task Scheduler" introduced="6.0" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/taskscheduler/group" mrp="os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
-</component>
-<component name="activebackupclient" long-name="Active Backup Client" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/activebackupclient/group" mrp="os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
-</component>
-<component name="syslibsdocs" long-name="Syslibs Documentation" purpose="development" class="doc">
-<unit mrp="os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
-</component>
-<component name="httputils" long-name="HTTP Utilities Library" introduced="6.2" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/httputils/group" mrp="os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
-</component>
-</collection>
-<collection name="syslibsapitest" long-name="SysLibs API Tests" level="utilities"/>
-<collection name="compressionlibs" long-name="Compression Libraries" level="data-services">
-<component name="ziplib" long-name="Zip Compression Library" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/ossrv/compressionlibs/ziplib/group" mrp="os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
-</component>
-</collection>
-<collection name="genericopenlibs" long-name="Generic Open Libraries" level="translation">
-<component name="cstdlib" long-name="C Standard Library" introduced="ER5" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/cstdlib/group" mrp="os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
-</component>
-<component name="cppstdlib" long-name="C++ Standard Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/cppstdlib/group" mrp="os/ossrv/genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
-</component>
-<component name="openenvcore" long-name="Open Environment Core" introduced="^2" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/openenvcore/group" mrp="os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
-</component>
-<component name="posixrealtimeextensions" long-name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/posixrealtimeextensions/group" mrp="os/ossrv/genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
-</component>
-<component name="liboil" long-name="Liboil" introduced="^4" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/liboil/group" mrp="os/ossrv/genericopenlibs/liboil/group/oeaddons_liboil.mrp"/>
-</component>
-</collection>
-<collection name="lowlevellibsandfws" long-name="Low Level Libraries and Frameworks" level="app-libs">
-<component name="pluginfw" long-name="Plugin Framework" introduced="6.2" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp" version="3"/>
-</component>
-<component name="apputils" long-name="Application Utilities" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/apputils/group" mrp="os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
-</component>
-<component name="genericusabilitylib" long-name="Generic Usability Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/genericusabilitylib/group" mrp="os/ossrv/lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
-</component>
-</collection>
-<collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
-<component name="ossrv_build" filter="s60" long-name="Generic OS Services Build">
-<!-- exports should be moved to individual components -->
-<unit bldFile="os/ossrv/group"/>
-</component>
-<component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="featuremgmt" long-name="Feature Management" level="framework">
-<component name="featuremgr" long-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 name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/persistentdata/featuremgmt/featureregistry/group" mrp="os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
-</component>
-</collection>
-<collection name="loggingservices" long-name="Logging Services" level="server">
-<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">
-<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">
-<unit bldFile="os/persistentdata/loggingservices/rfilelogger/group" mrp="os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
-</component>
-</collection>
-<collection name="traceservices" long-name="Trace Services" level="server">
-<component name="commsdebugutility" long-name="Comms Debug Utility" introduced="7.0s" purpose="optional">
-<unit bldFile="os/persistentdata/traceservices/commsdebugutility/group" mrp="os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
-</component>
-<component name="tracefw" long-name="Trace Framework" introduced="9.2" purpose="development">
-<unit bldFile="os/persistentdata/traceservices/tracefw/ulogger/group" mrp="os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
-</component>
-</collection>
-<collection name="persistentstorage" long-name="Persistent Storage" level="framework">
-<component name="store" long-name="Store" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/store/group" mrp="os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
-</component>
-<component name="dbms" long-name="DBMS" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/dbms/group" mrp="os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
-</component>
-<component name="centralrepository" long-name="Central Repository" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/persistentdata/persistentstorage/centralrepository/group" mrp="os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
-</component>
-<component name="sql" long-name="SQL" introduced="9.3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sql/GROUP" mrp="os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
-</component>
-<component name="sqlite3api" long-name="SQLite 3 API" introduced="^3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sqlite3api/GROUP" mrp="os/persistentdata/persistentstorage/sqlite3api/GROUP/syslibs_sqlite3.mrp"/>
-</component>
-</collection>
-<collection name="persistentdata_info" long-name="Persistent Data Services Info" level="app-if">
-<component name="persistentdata_metadata" long-name="Persistent Data Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/persistentdata/persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
-<component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
-</component>
-<component name="common_platform_security_definitions_api" long-name="Common Platform Security Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group"/>
-</component>
-<component name="feature_discovery_api" long-name="Feature Discovery API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/group"/>
-</component>
-<component name="platform_environment_api" long-name="Platform Environment API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_environment_api/group"/>
-</component>
-<component name="sensor_channel_api" long-name="Sensor Channel API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_channel_api/group"/>
-</component>
-<component name="sensor_definitions_api" long-name="Sensor Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_definitions_api/group"/>
-</component>
-<component name="version_info_api" long-name="Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/group"/>
-</component>
-<component name="accessory_monitoring_api" long-name="Accessory Monitoring API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/group"/>
-</component>
-<component name="haptics_api" long-name="Haptics API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/haptics_api/group"/>
-</component>
-<component name="sensor_data_compensator_api" long-name="Sensor Data Compensator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
-</component>
-</collection>
-<collection name="devicesrv_plat" long-name="Device Services Platform Interfaces" level="app-if">
-<component name="configuration_file_parser_api" long-name="Configuration File Parser API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/configuration_file_parser_api/group"/>
-</component>
-<component name="dos_extension_plugin_api" long-name="DOS Extension Plug-In API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_plugin_api/group"/>
-</component>
-<component name="mediator_command_initiator_api" long-name="Mediator Command Initiator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_initiator_api/group"/>
-</component>
-<component name="syslangutil_api" long-name="SysLangUtil API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/syslangutil_api/group"/>
-</component>
-<component name="wakeup_alarm_api" long-name="Wakeup Alarm API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/wakeup_alarm_api/group"/>
-</component>
-<component name="disk_and_memory_level_keys_api" long-name="Disk and Memory Level Keys API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_and_memory_level_keys_api/group"/>
-</component>
-<component name="mediator_plugin_api" long-name="Mediator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_plugin_api/group"/>
-</component>
-<component name="headset_status_api" long-name="Headset Status API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/headset_status_api/group"/>
-</component>
-<component name="system_startup_extension_plugin_api" long-name="System Startup Extension Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/system_startup_extension_plugin_api/group"/>
-</component>
-<component name="sensor_plugin_api" long-name="Sensor Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_plugin_api/group"/>
-</component>
-<component name="accessory_api" long-name="Accessory API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_api/group"/>
-</component>
-<component name="display_language_definition_api" long-name="Display Language Definition API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/display_language_definition_api/group"/>
-</component>
-<component name="mediator_command_responder_api" long-name="Mediator Command Responder API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_responder_api/group"/>
-</component>
-<component name="accessory_policy_definitions_api" long-name="Accessory Policy Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_definitions_api/group"/>
-</component>
-<component name="hw_settings_api" long-name="Hardware Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/hw_settings_api/group"/>
-</component>
-<component name="mediator_domain_definitions_api" long-name="Mediator Domain Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_domain_definitions_api/group"/>
-</component>
-<component name="sensor_extension_api" long-name="Sensor Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_extension_api/group"/>
-</component>
-<component name="accessory_plugin_api" long-name="Accessory Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_plugin_api/group"/>
-</component>
-<component name="sae_api" long-name="SAE API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sae_api/group"/>
-</component>
-<component name="accessory_control_api" long-name="Accessory Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_control_api/group"/>
-</component>
-<component name="mediator_static_registration_api" long-name="Mediator Static Registration API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_static_registration_api/group"/>
-</component>
-<component name="accessory_key_event_handling_api" long-name="Accessory Key Event Handling API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_key_event_handling_api/group"/>
-</component>
-<component name="mediator_notification_api" long-name="Mediator Notification API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_notification_api/group"/>
-</component>
-<component name="accessory_policy_utility_api" long-name="Accessory Policy Utility API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_utility_api/group"/>
-</component>
-<component name="common_dsy_plugin_api" long-name="Common DSY Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/common_dsy_plugin_api/group"/>
-</component>
-<component name="remote_control_extension_api" long-name="Remote Control Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/remote_control_extension_api/group"/>
-</component>
-<component name="sensor_channel_filter_api" long-name="Sensor Channel Filter API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_channel_filter_api/group"/>
-</component>
-<component name="dos_extension_api" long-name="DOS Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_api/group"/>
-</component>
-<component name="accessory_audio_control_api" long-name="Accessory Audio Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_audio_control_api/group"/>
-</component>
-<component name="mediator_event_consumer_api" long-name="Mediator Event Consumer API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_consumer_api/group"/>
-</component>
-<component name="shared_data_api" long-name="Shared Data API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/shared_data_api/group"/>
-</component>
-<component name="accessory_settings_api" long-name="Accessory Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_settings_api/group"/>
-</component>
-<component name="accessory_bluetooth_control_api" long-name="Accessory Bluetooth Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_bluetooth_control_api/group"/>
-</component>
-<component name="extended_version_info_api" long-name="Extended Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_api/group"/>
-</component>
-<component name="mediator_event_provider_api" long-name="Mediator Event Provider API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_provider_api/group"/>
-</component>
-<component name="tv_out_config_api" long-name="TV Out Config API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_config_api/group"/>
-</component>
-<component name="tspclientmapper_api" long-name="TSP Client Mapper API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tspclientmapper_api/group"/>
-</component>
-<component name="powersave_api" long-name="Power Save API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_api/group"/>
-</component>
-<component name="powersave_definitions_api" long-name="Power Save Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_definitions_api/group"/>
-</component>
-<component name="powersave_plugin_api" long-name="Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_plugin_api/group"/>
-</component>
-<component name="extended_version_info_plugin_api" long-name="Extended Version Info Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_plugin_api/group"/>
-</component>
-<component name="haptics_plugin_api" long-name="Haptics Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_plugin_api/group"/>
-</component>
-<component name="haptics_effect_data_getter_plugin_api" long-name="Haptics Effect Data Getter Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
-</component>
-<component name="haptics_packetizer_plugin_api" long-name="Haptics Packetizer Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_packetizer_plugin_api/group"/>
-</component>
-<component name="tiltcompensation_api" long-name="Tilt Compensation API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tiltcompensation_api/group"/>
-</component>
-<component name="disk_notification_handler_api" long-name="Disk Notification Handler API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_notification_handler_api/group"/>
-</component>
-<component name="accessory_policy_usb_audio_api" long-name="Accessory Policy USB Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_usb_audio_api/group"/>
-</component>
-<component name="accessory_policy_hdmi_audio_api" long-name="Accessory Policy HDMI Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_hdmi_audio_api/group"/>
-</component>
-<component name="sensor_data_compensator_plugin_api" long-name="Sensor Data Compensator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
-</component>
-<component name="ddc_access_api" long-name="DDC Access API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/ddc_access_api/group"/>
-</component>
-<component name="tv_out_behaviour_api" long-name="TV Out Behaviour API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_behaviour_api/group"/>
-</component>
-</collection>
-<collection name="accessoryservices" long-name="Accessory Services" level="framework">
-<component name="accessorymonitor" filter="s60" long-name="Accessory Monitor">
-<unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/group"/>
-</component>
-<component name="accessoryremotecontrol" filter="s60" long-name="Accessory Remote Control">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
-</component>
-<component name="accessoryserver" filter="s60" long-name="Accessory Server">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryserver/group"/>
-</component>
-<component name="pluggeddisplay" filter="s60" long-name="Plugged Display" introduced="^3">
-<unit bldFile="os/devicesrv/accessoryservices/pluggeddisplay/group"/>
-</component>
-<component name="headsetstatusapi" filter="s60" long-name="Headset Status API">
-<unit bldFile="os/devicesrv/accessoryservices/headsetstatusapi/group"/>
-</component>
-<component name="tspclientmapper" filter="s60" long-name="TSP Client Mapper">
-<unit bldFile="os/devicesrv/accessoryservices/tspclientmapper/group"/>
-</component>
-<component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional">
-<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
-</component>
-<component name="gid_pc_tool" filter="s60" long-name="Generic ID PC Tool" class="tool PC">
-<unit bldFile="os/devicesrv/accessoryservices/gid_pc_tool/group"/>
-</component>
-</collection>
-<collection name="commonservices" long-name="Common Services" level="app-if">
-<component name="commonengine" filter="s60" long-name="Common Engine">
-<unit bldFile="os/devicesrv/commonservices/commonengine/group"/>
-</component>
-<component name="commonengineresources" filter="s60" long-name="Common Engine Resources" class="config">
-<unit bldFile="os/devicesrv/commonservices/commonengineresources/group"/>
-</component>
-<component name="platformenv" filter="s60" long-name="Platform Environment">
-<unit bldFile="os/devicesrv/commonservices/platformenv/group"/>
-</component>
-<component name="sysutil" long-name="System Utilities" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/sysutil/group" mrp="os/devicesrv/commonservices/sysutil/group/sysutil.mrp"/>
-</component>
-<component name="activitymanager" long-name="Activity Manager" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/activitymanager/group" mrp="os/devicesrv/commonservices/activitymanager/group/activitymanager.mrp"/>
-</component>
-</collection>
-<collection name="dosservices" long-name="Domestic Operating System Services" level="hw-if">
-<component name="commondsy" filter="s60" long-name="Common DSY" plugin="Y">
-<unit bldFile="os/devicesrv/dosservices/commondsy/group"/>
-</component>
-<component name="dosserver" filter="s60" long-name="Domestic OS Server">
-<unit bldFile="os/devicesrv/dosservices/dosserver/group"/>
-</component>
-</collection>
-<collection name="sensorservices" long-name="Sensor Services" level="framework">
-<component name="sensorserver" filter="s60" long-name="Sensor Server">
-<unit bldFile="os/devicesrv/sensorservices/sensorserver/group"/>
-</component>
-<component name="orientationssy" filter="s60" long-name="Orientation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/orientationssy/group"/>
-</component>
-<component name="tiltcompensationssy" filter="s60" long-name="Tilt Compensation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/tiltcompensationssy/group"/>
-</component>
-<component name="sensordatacompensator" filter="s60" long-name="Sensor Data Compensator">
-<unit bldFile="os/devicesrv/sensorservices/sensordatacompensator/group"/>
-</component>
-</collection>
-<collection name="hwrmhaptics" long-name="HWRM Haptics" level="plugin">
-<component name="hapticseffectdatagetterfw" filter="s60" long-name="Haptics Effect Data Getter Framework">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
-</component>
-<component name="hapticspluginservice" filter="s60" long-name="Haptics Plugin Service">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
-</component>
-<component name="hapticspacketizer" filter="s60" long-name="Haptics Packetizer">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
-</component>
-<component name="hapticspluginmanager" filter="s60" long-name="Haptics Plugin Manager">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
-</component>
-<component name="hapticsserver" filter="s60" long-name="Haptics Server">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsserver/group"/>
-</component>
-<component name="hapticsclient" filter="s60" long-name="Haptics Client">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsclient/group"/>
-</component>
-<component name="hwrmhaptics_build" filter="s60" long-name="HWRM Haptics Build">
-<!-- move these exports into the appropriate above components and delete this component-->
-<unit bldFile="os/devicesrv/hwrmhaptics/group"/>
-</component>
-</collection>
-<collection name="mediator" long-name="Mediator" level="app-if">
-<!--collection is really a component. Move it down a directory -->
-<component name="mediator_build" filter="s60" long-name="Mediator Build">
-<unit bldFile="os/devicesrv/mediator/group"/>
-</component>
-</collection>
-<collection name="psmservices" long-name="Power Save Mode Services" level="app-if">
-<component name="psmserver" filter="s60" long-name="PSM Server">
-<unit bldFile="os/devicesrv/psmservices/psmserver/group"/>
-</component>
-</collection>
-<collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
-<component name="hwrmfmtxwatcherplugin" filter="s60" long-name="HWRM FM Transmitter Watcher Plugin" plugin="Y">
-<unit bldFile="os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
-</component>
-<component name="hwrmtargetmodifierplugin" filter="s60" long-name="HWRM Target Modifier Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build,
- may need to -->
-<!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
-</component>
-<component name="vibractrl" filter="s60" long-name="Vibra Control" deprecated="9.1">
-<unit bldFile="os/devicesrv/resourcemgmt/vibractrl/group"/>
-</component>
-<component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="^2" purpose="optional">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
-</component>
-<component name="hwresourcesmgrconfig" long-name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
-</component>
-<component name="resourcemgmt_build" filter="s60" long-name="Resource Management Build">
-<!-- Move exports to a self-contained component.
- This needs to be kept around until configuration is in place -->
-<unit bldFile="os/devicesrv/resourcemgmt/group"/>
-</component>
-<component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
-</component>
-</collection>
-<collection name="sysstatemgmt" long-name="System State Management" level="server">
-<component name="ssmmapperutility" filter="s60" long-name="SSM Mapper Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmmapperutility/group"/>
-</component>
-<component name="ssmpolicyplugins" filter="s60" long-name="SSM Policy Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmpolicyplugins/group"/>
-</component>
-<component name="ssmutilityplugins" filter="s60" long-name="SSM Utility Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmutilityplugins/group"/>
-</component>
-<component name="ssmcmdlists" filter="s60" long-name="SSM Command Lists" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcmdlists/group"/>
-</component>
-<component name="ssmcustcmds" filter="s60" long-name="SSM Custom Commands" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcustcmds/group"/>
-</component>
-<component name="syslangutil" filter="s60" long-name="System Language Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/syslangutil/group"/>
-</component>
-<component name="sysrestart" filter="s60" long-name="System Restart" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysrestart/group"/>
-</component>
-<component name="sysuiprovider" filter="s60" long-name="System UI Provider" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysuiprovider/group"/>
-</component>
-<component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/group" mrp="os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
-</component>
-<component name="systemstatemgr" long-name="System State Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
-</component>
-<component name="systemstateplugins" long-name="System State Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
-</component>
-<component name="systemstatereferenceplugins" long-name="System State Reference Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
-</component>
-</collection>
-<collection name="resourceinterfaces" long-name="Resource Interfaces" level="hw-if">
-<component name="fmtransmittercontrol" long-name="FM Transmitter Control" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group" mrp="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
-</component>
-</collection>
-<collection name="systemhealthmanagement" long-name="System Health Management" level="server">
-<component name="systemhealthmgr" long-name="System Health Manager" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
-</component>
-</collection>
-<collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if"/>
-<collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
-<component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
-<collection name="authorisation" long-name="Authorisation" level="utilities">
-<component name="userpromptservice" long-name="User Prompt Service" introduced="^3" purpose="mandatory">
-<unit bldFile="os/security/authorisation/userpromptservice/group" mrp="os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
-</component>
-<component name="userpromptutils" long-name="User Prompt Utils" introduced="^3" purpose="optional">
-<unit bldFile="os/security/authorisation/userpromptutils/group" mrp="os/security/authorisation/userpromptutils/group/security_ups_utils.mrp"/>
-</component>
-</collection>
-<collection name="contentmgmt" long-name="Content Management" level="utilities">
-<component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
-<unit bldFile="os/security/contentmgmt/contentaccessfwfordrm/group" mrp="os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
-</component>
-<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">
-<unit bldFile="os/security/crypto/weakcryptospi/group" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
-</component>
-<component name="strongcryptospi" long-name="Strong Crypto SPI" filter="gt" introduced="^3" purpose="optional">
-<unit bldFile="os/security/crypto/weakcryptospi/strong" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
-</component>
-</collection>
-<collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
-<component name="securityutils" long-name="Security Utils" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/securityutils/group" mrp="os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
-</component>
-<component name="securitydocs" long-name="Security Documentation" purpose="development" class="doc">
-<unit mrp="os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
-</component>
-<component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
-</component>
-<component name="securitycommonutils" long-name="Security Common Utils" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/security/cryptomgmtlibs/securitycommonutils/group" mrp="os/security/cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
-</component>
-</collection>
-<collection name="securityanddataprivacytools" long-name="Security and Data Privacy Tools" level="services">
-<component name="securityconfig" long-name="Security Config" introduced="9.1" purpose="optional">
-<unit bldFile="os/security/securityanddataprivacytools/securityconfig/group" mrp="os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
-</component>
-<component name="securitytools" long-name="Security Tools" introduced="^3" purpose="optional" class="PC">
-<unit bldFile="os/security/securityanddataprivacytools/securitytools/group" mrp="os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
-</component>
-</collection>
-<collection name="cryptoplugins" long-name="Crypto Plugins" level="plugins">
-<component name="cryptospiplugins" long-name="Crypto SPI Plugins" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/security/cryptoplugins/cryptospiplugins/group" mrp="os/security/cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
-</component>
-</collection>
-<collection name="cryptoservices" long-name="Crypto Services" level="plugins">
-<component name="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/certificateandkeymgmt/group" mrp="os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
-</component>
-<component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
-</component>
-<component name="browserrootcertificates" long-name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
-<unit mrp="os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
-</component>
-<component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/asnpkcs/group" mrp="os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
-</component>
-</collection>
-<collection name="security_info" long-name="OS Security Info" level="utilities">
-<component name="security_metadata" long-name="OS Security Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/security/security_info/security_metadata/security_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
-<collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
-<component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
-</component>
-<component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
-</component>
-<component name="simulationpositioningmodule" long-name="Simulation Positioning Module" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
-</component>
-<component name="gpspositioningmodule" long-name="GPS/A-GPS Positioning Module" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/gpspositioningmodule/group" mrp="os/lbs/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
-</component>
-<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>
-</collection>
-<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
-<component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
-</component>
-</collection>
-<collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
-<component name="locationserver" long-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 name="networkrequesthandler" long-name="Network Request Handler" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
-</component>
-</collection>
-<collection name="lbstest" long-name="Locating Services Tests" level="application-interface">
-<component name="locationprotocoltest" long-name="Location Protocol Tests" introduced="9.2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/lbstest/locationprotocoltest/group" mrp="os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
-</component>
-</collection>
-<collection name="locationmgmt" long-name="Location Management" level="management">
-<component name="locmonitor" long-name="Location Monitor" introduced="^3" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
-</component>
-<component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/agpslocationmgr/group" mrp="os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
-</component>
-<component name="networklocationmgr" long-name="Network Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/networklocationmgr/group" mrp="os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
-</component>
-<component name="locationcore" long-name="Location Core" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locationcore/group" mrp="os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
-</component>
-<component name="networkgateway" long-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 name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
-<component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
-</component>
-<component name="suplrrlpasn1" filter="sf_build" long-name="SUPL RRLP ASN1 Parser">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
-</component>
-</collection>
-<collection name="lbsapitest" long-name="Location API Tests" level="application-interface"/>
-<collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
-<component name="lbs_metadata" long-name="Locating Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commsfw" level="services" long-name="Communications Framework" levels="server support framework process app-if">
-<collection name="commsprocess" long-name="Comms Process" level="process">
-<component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/commsfw/commsprocess/commsrootserverconfig/group" mrp="os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
-</component>
-</collection>
-<collection name="commsconfig" long-name="Comms Config" level="process">
-<component name="commsdatabase" long-name="Comms Database" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
-</component>
-<component name="commsdatabaseshim" long-name="Comms Database Shim" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/commsfw/commsconfig/commsdatabaseshim/group" mrp="os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
-</component>
-</collection>
-<collection name="datacommsserver" long-name="Data Comms Server" level="framework">
-<component name="esockserver" long-name="ESock Server" purpose="mandatory">
-<unit bldFile="os/commsfw/datacommsserver/esockserver/group" mrp="os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp" version="3"/>
-</component>
-<component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/group" mrp="os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
-</component>
-<component name="networkingdialogstub" long-name="Networking Dialog Stub" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/default" mrp="os/commsfw/datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
-</component>
-<component name="networkcontroller" long-name="Network Controller" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/datacommsserver/networkcontroller/group" mrp="os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
-</component>
-</collection>
-<collection name="serialserver" long-name="Serial Server" level="server">
-<component name="serialportcsy" long-name="Serial Port CSY" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/serialserver/serialportcsy" mrp="os/commsfw/serialserver/serialportcsy/ser-comms_serialportcsy.mrp"/>
-</component>
-<component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" purpose="development">
-<unit bldFile="os/commsfw/serialserver/packetloopbackcsy/group" mrp="os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
-</component>
-<component name="c32serialserver" long-name="C32 Serial Server" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/commsfw/serialserver/c32serialserver/group" mrp="os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
-</component>
-<component name="c32serialserverconfig" long-name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config">
-<unit bldFile="os/commsfw/serialserver/c32serialserverconfig" mrp="os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
-</component>
-<component name="c32serialserverdocs" long-name="C32 Serial Server Documentation" purpose="development" class="doc">
-<unit mrp="os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
-</component>
-</collection>
-<collection name="commsfwutils" long-name="Comms Framework Utilities" level="framework">
-<component name="commsbufs" long-name="Comms Buffers" introduced="^3" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwutils/commsbufs/group" mrp="os/commsfw/commsfwutils/commsbufs/group/comms-infras_commsbufs.mrp"/>
-</component>
-</collection>
-<collection name="commsfw_info" long-name="Comms Framework Info" level="app-if">
-<component name="commsinfrastructuredocs" long-name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
-<unit mrp="os/commsfw/commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
-</component>
-<component name="commsfw_metadata" long-name="Communications Framework Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/commsfw/commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
-</component>
-</collection>
-<collection name="commsfwsupport" long-name="Comms Framework Support" level="support">
-<component name="commselements" long-name="Comms Elements" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwsupport/commselements/group" mrp="os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
-</component>
-</collection>
-<collection name="commsinfrastructureapitest" long-name="Comms-Infras API Tests" level="app-if">
-<component name="commsinfrastructuresvs" long-name="Comms Infrastructure Verification Suite" introduced="^3" purpose="development">
-<unit mrp="os/commsfw/commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
-</component>
-</collection>
-<collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
-<component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
-</component>
-<component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" purpose="mandatory" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
-</component>
-<component name="commstools" long-name="Comms Tools" introduced="^3" purpose="development" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/commstools/group" mrp="os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
-</component>
-</collection>
-</block>
-<block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
-<component name="internetsockets" long-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>
-<collection name="tcpiputils" long-name="TCP/IP Utilities" level="plugin">
-<component name="dnd" long-name="DND" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/dnd/group" mrp="os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
-</component>
-<component name="dhcp" long-name="DHCP" introduced="8.0" purpose="optional">
-<unit bldFile="os/networkingsrv/tcpiputils/dhcp/group" mrp="os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
-</component>
-<component name="networkaddressandporttranslation" long-name="Network Address and Port Translation" introduced="^2" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
-</component>
-<component name="punycodeconv" long-name="Punycode Converter" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/punycodeconv/group" mrp="os/networkingsrv/tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
-</component>
-</collection>
-<collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
-<component name="nullagt" long-name="NULL AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/nullagt/group" mrp="os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
-</component>
-<component name="genericscprparameters" long-name="Generic SCPR Parameters" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/linklayercontrol/genericscprparameters/group" mrp="os/networkingsrv/linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
-</component>
-<component name="mbmsparameters" long-name="MBMS Parameters" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/mbmsparameters/group" mrp="os/networkingsrv/linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
-</component>
-<component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
-<unit bldFile="os/networkingsrv/linklayercontrol/networkinterfacemgr/group" mrp="os/networkingsrv/linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp" version="2"/>
-</component>
-</collection>
-<collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
-<component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
-</component>
-<component name="pppnif" long-name="PPP NIF" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/pppnif/group" mrp="os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp" version="2"/>
-</component>
-<component name="slipnif" long-name="SLIP NIF" purpose="development" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/slipnif/group" mrp="os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
-</component>
-<component name="tunnelnif" long-name="Tunnel NIF" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
-</component>
-</collection>
-<collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
-<component name="packetlogger" long-name="Packet Logger" introduced="8.1" purpose="development">
-<unit bldFile="os/networkingsrv/linklayerutils/packetlogger/group" mrp="os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
-</component>
-</collection>
-<collection name="networkcontrol" long-name="Network Control" level="plugin">
-<component name="qoslib" long-name="QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/qoslib/group" mrp="os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
-</component>
-<component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/pfqoslib/group" mrp="os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
-</component>
-<component name="qosfwprt" long-name="QoS Framework PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
-</component>
-<component name="qosipscpr" long-name="QoS IP SCPR" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosipscpr/group" mrp="os/networkingsrv/networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
-</component>
-<component name="ipnetworklayer" long-name="IP Network Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/ipnetworklayer/group" mrp="os/networkingsrv/networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
-</component>
-<component name="iptransportlayer" long-name="IP Transport Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/iptransportlayer/group" mrp="os/networkingsrv/networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
-</component>
-<component name="commsuserpromptmgr" long-name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkcontrol/commsuserpromptmgr/group" mrp="os/networkingsrv/networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
-</component>
-</collection>
-<collection name="networkprotocols" long-name="Network Protocols" level="plugin">
-<component name="ipeventnotifier" long-name="IP Event Notifier" introduced="8.1" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
-</component>
-<component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
-</component>
-<component name="iphook" long-name="IP Hook" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
-</component>
-<component name="mobileip" long-name="Mobile IP" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/mobileip/group" mrp="os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
-</component>
-<component name="dnsproxy" long-name="DNS Proxy" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/networkprotocols/dnsproxy/group" mrp="os/networkingsrv/networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
-</component>
-</collection>
-<collection name="networksecurity" long-name="Network Security" level="framework">
-<component name="tls" long-name="TLS" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tls/group" mrp="os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
-</component>
-<component name="tlsprovider" long-name="TLS Provider" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tlsprovider/group" mrp="os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
-</component>
-<component name="ipsec" long-name="IPsec" introduced="7.0" purpose="optional">
-<unit bldFile="os/networkingsrv/networksecurity/ipsec/group" mrp="os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
-</component>
-</collection>
-<collection name="networkingtestandutils" long-name="Networking Test and Utils" level="app-if">
-<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">
-<!-- production component: contains the IBY files -->
-<unit bldFile="os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
-</component>
-<component name="networkingdocs" long-name="Networking Documentation" purpose="development" class="doc">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
-</component>
-<component name="networkingsrv_metadata" long-name="Networking Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
-<component name="predictorcompression" long-name="Predictor Compression" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wlan" level="services" long-name="WLAN" levels="hw low mid high tools test">
-<collection name="wlan_plat" long-name="WLAN Platform Interfaces" level="test">
-<component name="wlan_dbif_api" long-name="WLAN DBIF API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_dbif_api/group"/>
-</component>
-<component name="wlan_hal_api" long-name="WLAN HAL API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hal_api/group"/>
-</component>
-<component name="wlan_management_api" long-name="WLAN Management API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_management_api/group"/>
-</component>
-<component name="wlan_device_settings_api" long-name="WLAN Device Settings API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_device_settings_api/group"/>
-</component>
-<component name="wlan_control_api" long-name="WLAN Control API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_control_api/group"/>
-</component>
-<component name="wlan_hw_initialization_data_api" long-name="WLAN Hardware Initialization Data API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hw_initialization_data_api/group"/>
-</component>
-<component name="wlan_power_save_plugin_api" long-name="WLAN Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_power_save_plugin_api/group"/>
-</component>
-<component name="wlan_info_api" long-name="WLAN Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_info_api/group"/>
-</component>
-<component name="wlan_agent_hotspot_plugin_api" long-name="WLAN Agent Hotspot Plug-in API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
-</component>
-<component name="wlan_osa_api" long-name="WLAN OSA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_osa_api/group"/>
-</component>
-<component name="wlan_spia_api" long-name="WLAN SPIA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_spia_api/group"/>
-</component>
-<component name="wlan_hpa_api" long-name="WLAN HPA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hpa_api/group"/>
-</component>
-<component name="wlan_eapol_plugin_api" long-name="WLAN EAPOL Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_eapol_plugin_api/group"/>
-</component>
-<component name="wlan_generic_plugin_api" long-name="WLAN Generic Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_generic_plugin_api/group"/>
-</component>
-<component name="wlan_aws_plugin_api" long-name="WLAN AWS Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_aws_plugin_api/group"/>
-</component>
-</collection>
-<collection name="wlan_pub" long-name="WLAN Public Interfaces" level="test">
-<component name="wlan_sdk_info_api" long-name="WLAN SDK Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_pub/wlan_sdk_info_api/group"/>
-</component>
-</collection>
-<collection name="wlan_bearer" long-name="WLAN Bearer" level="hw">
-<component name="wlanpsmplugin" filter="s60" long-name="WLAN PSM Plugin" plugin="Y">
-<unit bldFile="os/wlan/wlan_bearer/wlanpsmplugin/group"/>
-</component>
-<component name="wlanagent" filter="s60" long-name="WLAN Agent">
-<unit bldFile="os/wlan/wlan_bearer/wlanagent/group"/>
-</component>
-<component name="wlandbif_cd" filter="s60" long-name="WLAN CommsDat interface">
-<unit bldFile="os/wlan/wlan_bearer/wlandbif_cd/group"/>
-</component>
-<!-- should follow component directory rules for stuff in wlan_symbian/ and put in a single component or split up properly -->
-<component name="wlanengine" filter="s60" long-name="WLAN Engine">
-<unit bldFile="os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
-</component>
-<component name="wlanldd" filter="s60" long-name="WLAN LDD">
-<unit bldFile="os/wlan/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
-</component>
-<component name="wlannwif" filter="s60" long-name="WLAN Network Interface">
-<unit bldFile="os/wlan/wlan_bearer/wlannwif/group"/>
-</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="adaptation hw-if plugin framework server app-if">
-<collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
-<component name="basebandchanneladaptor" long-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 name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
-<component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
-</component>
-</collection>
-<collection name="smsprotocols" long-name="SMS Protocols" level="framework">
-<component name="smsstack" long-name="SMS Stack" introduced="6.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/cellularsrv/smsprotocols/smsstack/group" mrp="os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
-</component>
-</collection>
-<collection name="telephonyprotocols" long-name="Telephony Protocols" level="framework">
-<component name="csdagt" long-name="CSD AGT" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/csdagt/group" mrp="os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
-</component>
-<component name="psdagt" long-name="PSD AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/psdagt/group" mrp="os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
-</component>
-<component name="gprsumtsqosprt" long-name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
-</component>
-<component name="gprsumtsqosinterface" long-name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
-</component>
-<component name="qosextnapi" long-name="QoS Extn API" introduced="9.2" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
-</component>
-<component name="secondarypdpcontextumtsdriver" long-name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
-</component>
-<component name="qos3gppcpr" long-name="QoS 3GPP CPR" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
-</component>
-<component name="pdplayer" long-name="PDP Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/pdplayer/group" mrp="os/cellularsrv/telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
-</component>
-<component name="rawipnif" long-name="Raw IP NIF" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserver" long-name="Telephony Server" level="server">
-<component name="etelserverandcore" long-name="ETel Server and Core" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
-</component>
-<component name="etelmultimode" long-name="ETel Multimode" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelmultimode/group" mrp="os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
-</component>
-<component name="etelpacketdata" long-name="ETel Packet Data" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
-</component>
-<component name="etelsimtoolkit" long-name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
-<component name="common_tsy" long-name="Common TSY" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
-</component>
-<component name="licenseetsystub" long-name="Licensee TSY Stub" introduced="^2" purpose="development" filter="sf_build" plugin="Y">
-<unit mrp="os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="os/cellularsrv/telephonyserverplugins/licenseetsystub/group"/>
-</component>
-<component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
-</component>
-<component name="simtsy" long-name="SIM TSY" introduced="7.0" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
-</component>
-<component name="ctsydispatchlayer" long-name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
-</component>
-<component name="simatktsy" long-name="SIMATK TSY" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simatktsy/group" mrp="os/cellularsrv/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
-</component>
-</collection>
-<collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
-<component name="dial" long-name="Dial" deprecated="9.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyutils/dial/group" mrp="os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
-</component>
-<component name="telephonywatchers" long-name="Telephony Watchers" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
-</component>
-<component name="etel3rdpartyapi" long-name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrv_info" long-name="Cellular Baseband Services Info" level="app-if">
-<component name="telephonyconfidentialdocs" long-name="Telephony Confidential Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
-</component>
-<component name="telephonydocs" long-name="Telephony Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
-</component>
-<component name="cellularsrv_metadata" long-name="Cellular Baseband Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
-<component name="mocksy" long-name="MockSY" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if"/>
-</block>
-<block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
-<collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
-<component name="bluetooth_audio_adaptation_api" long-name="Bluetooth Audio Adaptation API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
-</component>
-<component name="bluetooth_power_management_api" long-name="Bluetooth Power Management API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_power_management_api/group"/>
-</component>
-<component name="at_command_handler_plugin_api" long-name="AT Command Handler Plugin API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/at_command_handler_plugin_api/group"/>
-</component>
-</collection>
-<collection name="bluetooth" long-name="Bluetooth Core" level="framework">
-<component name="btstack" long-name="Bluetooth Stack" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btstack" mrp="os/bt/bluetooth/btstack/bluetooth_stack.mrp"/>
-</component>
-<component name="btcomm" long-name="Bluetooth CSY" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetooth/btcomm" mrp="os/bt/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
-</component>
-<component name="btsdp" long-name="Bluetooth SDP" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btsdp" mrp="os/bt/bluetooth/btsdp/bluetooth_sdp.mrp"/>
-</component>
-<component name="btextnotifiers" long-name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btextnotifiers" mrp="os/bt/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
-</component>
-<component name="gavdp" long-name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/gavdp/group" mrp="os/bt/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
-</component>
-<component name="btlogger" long-name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btlogger/group" mrp="os/bt/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
-</component>
-<component name="btdocs" long-name="Bluetooth Documentation" purpose="development" class="doc">
-<unit mrp="os/bt/bluetooth/btdocs/bluetooth_documentation.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothmgmt" long-name="Bluetooth Management" level="plugin">
-<component name="btmgr" long-name="Bluetooth Manager" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btmgr" mrp="os/bt/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
-</component>
-<component name="btconfig" long-name="Bluetooth Config" purpose="optional" class="config">
-<unit bldFile="os/bt/bluetoothmgmt/btconfig" mrp="os/bt/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
-</component>
-<component name="btrom" long-name="Bluetooth ROM" introduced="9.1" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btrom" mrp="os/bt/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
-</component>
-<component name="bluetoothclientlib" long-name="Bluetooth Client Library" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/bluetoothclientlib" mrp="os/bt/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothcommsprofiles" long-name="Bluetooth Comms Profiles" level="app-if">
-<component name="btpan" long-name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetoothcommsprofiles/btpan/group" mrp="os/bt/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
-</component>
-</collection>
-<collection name="bthci" long-name="Host Controller Interface" level="server">
-<component name="bthci2" long-name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bthci/bthci2/group" mrp="os/bt/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
-</component>
-<component name="hciextensioninterface" long-name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bthci/hciextensioninterface" mrp="os/bt/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
-</component>
-<component name="hci2implementations" long-name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bthci/hci2implementations/group" mrp="os/bt/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
-</component>
-</collection>
-<collection name="irda" long-name="IrDA" level="plugin">
-<component name="irdastack" long-name="IrDA Stack" purpose="optional">
-<unit bldFile="os/bt/irda/irdastack/group" mrp="os/bt/irda/irdastack/group/infra-red_irda.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if"/>
-<collection name="atext" long-name="AT Extensions" level="server">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="atext_build" long-name="AT Extension Build" introduced="^3" purpose="optional" filter="s60">
-<unit bldFile="os/bt/atext/group"/>
-</component>
-</collection>
-<collection name="bt_info" long-name="Bluetooth Info" level="app-if">
-<component name="bt_metadata" long-name="Bluetooth Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/bt/bt_info/bt_metadata/bt_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
-<collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
-<!-- usbclientdrivers to be moved here from kernelhwsrv-->
-</collection>
-<collection name="usbmgmt" long-name="USB Management" level="server">
-<component name="usbmgr" long-name="USB Manager" purpose="optional">
-<unit bldFile="os/usb/usbmgmt/usbmgr/group" mrp="os/usb/usbmgmt/usbmgr/group/usb_manager.mrp" version="2"/>
-</component>
-<component name="usbclassandmgrdocs" long-name="USB Class and Manager Documentation" purpose="development" class="doc">
-<unit mrp="os/usb/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
-</component>
-</collection>
-<collection name="usb_info" long-name="USB Info" level="app-if">
-<component name="usb_metadata" long-name="USB Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/usb/usb_info/usb_metadata/usb_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="mm" level="services" long-name="Multimedia" levels="adaptation 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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-</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"/>
-</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"/>
-</component>
-<component name="aac_decoder_config_proxy_api" long-name="AAC Decoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/aac_decoder_config_proxy_api/group"/>
-</component>
-<component name="added_devsound_control_api" long-name="Added DevSound Control API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_api/group"/>
-</component>
-<component name="added_devsound_control_msg_hdlr_api" long-name="Added DevSound Control Msg Hdlr API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_msg_hdlr_api/group"/>
-</component>
-<component name="added_devsound_control_proxy_api" long-name="Added DevSound Control Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_proxy_api/group"/>
-</component>
-<component name="audio_effects_msg_hdlr_api" long-name="Audio Effects Message Handler API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_msg_hdlr_api/group"/>
-</component>
-<component name="audio_effects_proxy_api" long-name="Audio Effects Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_proxy_api/group"/>
-</component>
-<component name="audio_policy_header_api" long-name="Audio Policy Header API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="audio_routing_proxy_api" long-name="Audio Routing Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_routing_proxy_api/group"/>
-</component>
-<component name="custom_interface_builder_api" long-name="Custom Interface Builder API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_builder_api/group"/>
-</component>
-<component name="custom_interface_message_handler_factory_api" long-name="Custom Interface Message Handler Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_message_handler_factory_api/group"/>
-</component>
-<component name="custom_interface_proxy_factory_api" long-name="Custom Interface Proxy Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_proxy_factory_api/group"/>
-</component>
-<component name="custom_interface_utility_api" long-name="Custom Interface Utility API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_utility_api/group"/>
-</component>
-<component name="devsound_adaptation_api" long-name="DevSound Adaptation API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/devsound_adaptation_api/group"/>
-</component>
-<component name="display_posting_api" long-name="Display Posting API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="eaac_plus_decoder_interface_proxy_api" long-name="eAAC Plus Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="error_concealment_interface_proxy_api" long-name="Error Concealment Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
-</component>
-<component name="fm_radio_adaptation_api" long-name="FM Radio Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_decoder_interface_proxy_api" long-name="G711 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_encoder_interface_proxy_api" long-name="G711 Encoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_decoder_interface_proxy_api" long-name="G729 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_encoder_interface_msg_hdlr_api" long-name="G729 Encoder Interface Message Handler API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</component>
-<component name="ilbc_decoder_interface_proxy_api" long-name="Ilbc Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ilbc_encoder_interface_proxy_api" long-name="Ilbc Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="mdf_plugin_uids" long-name="MDF Plug-in UIDs" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/mdf_plugin_uids/group"/>
-</component>
-<component name="multimedia_fourcc_definitions_api" long-name="Multimedia FourCC Definitions API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/multimedia_fourcc_definitions_api/group"/>
-</component>
-<component name="nokia_audio_policy_header_api" long-name="Nokia Audio Policy Header API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/nokia_audio_policy_header_api/group"/>
-</component>
-<component name="nokia_multimedia_fourcc_definitions_api" long-name="Nokia Multimedia Fourcc Definitions API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ra8_decoder_interface_proxy_api" long-name="RA8 Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
-</component>
-<component name="rds_adaptation_api" long-name="RDS Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="restricted_audio_output_proxy_api" long-name="Restricted Audio Output Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="sbc_encoder_interface_proxy_api" long-name="SBC Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/sbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="secure_output_mdf_custom_interface" long-name="Secure Output MDF Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="speech_encoder_config_proxy_api" long-name="Speech Encoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/speech_encoder_config_proxy_api/group"/>
-</component>
-<component name="telephony_audio_routing_client_api" long-name="Telephony Audio Routing Client API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_client_api/group"/>
-</component>
-<component name="telephony_audio_routing_manager_api" long-name="Telephony Audio Routing Manager API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_manager_api/group"/>
-</component>
-<component name="video_buffer_management_mdf_custom_interface" long-name="Video Buffer Management MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_buffer_management_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_rotation_mdf_custom_interface" long-name="Video Decoder Rotation MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_scaling_mdf_custom_interface" long-name="Video Decoder Scaling MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
-</component>
-<component name="video_reclaim_extbuffers_ci" long-name="Video Reclaim Extbuffers Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_reclaim_extbuffers_ci/group"/>
-</component>
-<component name="video_window_control_custom_interface" long-name="Video Window Control Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="wma_decoder_interface_proxy_api" long-name="WMA Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/wma_decoder_interface_proxy_api/group"/>
-</component>
-<component name="eaacplusutil_api" long-name="EAac Plus Util API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/eaacplusutil_api/group"/>
-</component>
-<component name="frametable_api" long-name="Frametable API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/frametable_api/group"/>
-</component>
-</collection>
-<collection name="devsoundextensions" long-name="Devsound Extensions" level="device-fw">
-<component name="drmaudioplayer" filter="s60" long-name="DRM Audio Player">
-<unit bldFile="os/mm/devsoundextensions/drmaudioplayer/group"/>
-</component>
-<component name="mmextfw" filter="s60" long-name="Multimedia Extension Framework">
-<unit bldFile="os/mm/devsoundextensions/mmextfw/group"/>
-</component>
-<component name="audiorouting" filter="s60" long-name="Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/audiorouting/group"/>
-</component>
-<component name="effects" filter="s60" long-name="Effects">
-<unit bldFile="os/mm/devsoundextensions/effects/group"/>
-</component>
-<component name="effectspresets" filter="s60" long-name="Effects Presets">
-<unit bldFile="os/mm/devsoundextensions/effectspresets/group"/>
-</component>
-<component name="effectspresets_utils" filter="s60" long-name="Effects Presets Utils">
-<!-- need to #include the lot from a single bld.inf
- Also move to a standard component location, not under effectspresets -->
-<unit bldFile="os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
-<unit bldFile="os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
-</component>
-<component name="telephonyaudiorouting" filter="s60" long-name="Telephony Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/group"/>
-</component>
-<component name="mmfcustominterfaces" filter="s60" long-name="MMF Custom Interfaces">
-<unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/group"/>
-</component>
-<component name="addeddevsoundcontrol" filter="s60" long-name="Added DevSound Control">
-<unit bldFile="os/mm/devsoundextensions/addeddevsoundcontrol/group"/>
-</component>
-<component name="globalaudiosettings" filter="s60" long-name="Global Audio Settings">
-<unit bldFile="os/mm/devsoundextensions/globalaudiosettings/group"/>
-</component>
-<component name="restrictedaudiooutput" filter="s60" long-name="Restricted Audio Output">
-<unit bldFile="os/mm/devsoundextensions/restrictedaudiooutput/group"/>
-</component>
-<component name="ciextnfactoryplugins" filter="s60" long-name="Custom Interface Extension Factory Plugins" plugin="Y">
-<unit bldFile="os/mm/devsoundextensions/ciextnfactoryplugins/group"/>
-</component>
-</collection>
-<collection name="mdfdevvideoextensions" long-name="MDF Dev Video Extensions" level="device-fw">
-<component name="nga_mdf_postprocessor" long-name="NGA MDF Postprocessor" filter="s60">
-<unit bldFile="os/mm/mdfdevvideoextensions/nga_mdf_postprocessor/group"/>
-</component>
-</collection>
-<collection name="audio" long-name="Audio Codecs" level="middleware">
-<component name="arm_cmmf_codecs" filter="s60" long-name="ARM CMMF Codecs" plugin="Y">
-<unit bldFile="os/mm/audio/arm_cmmf_codecs/group"/>
-</component>
-</collection>
-<collection name="video" long-name="Video Codecs" level="middleware">
-<!-- empty -->
-</collection>
-<collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
-<component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/imagingandcamerafws/imagingfws/group" mrp="os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
-</component>
-<component name="camerafw" long-name="Camera Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/imagingandcamerafws/camerafw/group" mrp="os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
-</component>
-</collection>
-<collection name="mmlibs" long-name="Multimedia Libraries" level="middleware">
-<component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmutilitylib/group" mrp="os/mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
-</component>
-<component name="mmfw" long-name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmfw/group" mrp="os/mm/mmlibs/mmfw/group/multimedia_mmf.mrp"/>
-</component>
-</collection>
-<collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
-<component name="imagingplugins" long-name="Imaging Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/imagingplugins/group" mrp="os/mm/mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
-</component>
-<component name="cameraplugins" long-name="Camera Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/cameraplugins/group" mrp="os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
-</component>
-<component name="lib3gp" long-name="3GP Library" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/mmplugins/lib3gp/group" mrp="os/mm/mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
-</component>
-<component name="mmfwplugins" long-name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/mmfwplugins/group" mrp="os/mm/mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
-</component>
-</collection>
-<collection name="mm_info" long-name="Multimedia Info" level="app-if">
-<component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc">
-<unit mrp="os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
-</component>
-<component name="mm_metadata" long-name="Multimedia Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
-<component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="^2" purpose="development">
-<unit bldFile="os/mm/mmresourcemgmt/mmresctrl/group" mrp="os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
-</component>
-</collection>
-<collection name="mmdevicefw" long-name="Multimedia Device Framework" level="device-fw">
-<component name="mdf" long-name="Media Device Framework" introduced="9.2" purpose="mandatory">
-<unit bldFile="os/mm/mmdevicefw/mdf/group" mrp="os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
-</component>
-<component name="speechrecogsupport" long-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 name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
-<component name="videorenderer" long-name="Video Renderer" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/mmswadaptation/videorenderer/group" mrp="os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
-</component>
-</collection>
-<collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw"/>
-<collection name="omxil" long-name="OpenMAX IL" level="hw-if">
-<component name="omxilapi" long-name="OpenMAX IL API" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilapi/group" mrp="os/mm/omxil/omxilapi/group/multimedia_omx_il_api.mrp" version="1"/>
-</component>
-<component name="omxilcore" long-name="OpenMAX IL Core" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcore/group" mrp="os/mm/omxil/omxilcore/group/multimedia_omx_il_core.mrp" version="1"/>
-</component>
-<component name="omxilcomponentcommon" long-name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcomponentcommon/group" mrp="os/mm/omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp" version="1"/>
-</component>
-<component name="omxilrefcomps" long-name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilrefcomps/ref_components/group" mrp="os/mm/omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp" version="1"/>
-</component>
-<component name="mmilapi" long-name="Multimedia Integration Layer API" introduced="^3" purpose="development">
-<unit bldFile="os/mm/omxil/mmilapi/group" mrp="os/mm/omxil/mmilapi/group/multimedia_il_api.mrp"/>
-</component>
-</collection>
-<collection name="devsound" long-name="Sound Device" level="devices">
-<component name="devsoundapi" long-name="DevSound API" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/devsound/devsoundapi/group" mrp="os/mm/devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
-</component>
-<component name="a3fdevsound" long-name="A3F DevSound" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3fdevsound/group" mrp="os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
-</component>
-<component name="a3facf" long-name="A3F Audio Component Framework" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3facf/group" mrp="os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
-</component>
-<component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/devsound/devsoundpluginsupport/group" mrp="os/mm/devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
-</component>
-<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">
-<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">
-<unit bldFile="os/mm/devsound/a3ftrace/group" mrp="os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
-</component>
-<component name="a3fsrvstart" long-name="A3F Server Start" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
-</component>
-</collection>
-<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
-<component name="devsoundhwdeviceapi" long-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 name="a3facl" long-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 name="a3fdevsoundcustomisation" long-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"/>
-</component>
-<component name="refacladapt" long-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"/>
-</component>
-<component name="videohai" long-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 name="dvbhreceiverhai" long-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>
-</block>
-<block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
-<collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
-<component name="exif_api" long-name="Exif API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagingext_plat" long-name="Imaging Extensions Platform Interfaces" level="app-if">
-<component name="jpeg2000_icl_plugin_api" long-name="JPEG2000 ICL plugin API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/jpeg2000_icl_plugin_api/group"/>
-</component>
-<component name="extended_icl_jpeg_api" long-name="Extended ICL Jpeg API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
-</component>
-<component name="h324_annex_k_custom_api" long-name="H324 Annex K Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/h324_annex_k_custom_api/group"/>
-</component>
-<component name="ecam_orientation_custom_api" long-name="ECam Orientation Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_orientation_custom_api/group"/>
-</component>
-<component name="ecam_ui_orientation_override_custom_api" long-name="ECam UI Orientation Override Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
-</component>
-<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>
-</collection>
-<collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
-<component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
-<unit bldFile="os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
-</component>
-<component name="imageadaptationextensions_build" filter="s60" long-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"/>
-</component>
-</collection>
-<collection name="imagingmodules" long-name="Imaging Modules" level="hw-if">
-<component name="exiflib" filter="s60" long-name="Exif Library">
-<unit bldFile="os/imagingext/imagingmodules/exiflib/group"/>
-</component>
-<component name="jp2kcodec" filter="s60" long-name="JPEG2000 Decoder Plugin" plugin="Y">
-<unit bldFile="os/imagingext/imagingmodules/jp2kcodec/group"/>
-</component>
-</collection>
-</block>
-<block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
-<component name="vgi" filter="s60" long-name="VGI">
-<unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
-</component>
-</collection>
-<collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adaptations">
-<component name="m3gcore11" filter="s60" long-name="M3G Core 1.1">
-<unit bldFile="os/graphics/m3g/m3gcore11/group"/>
-</component>
-</collection>
-<collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines">
-<component name="graphicsresource" long-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 name="graphicsresourceadaptation" long-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"/>
-</component>
-<component name="graphicsresourceimplementation" long-name="Graphics Resource Implementation" introduced="^4" purpose="optional">
-<unit bldFile="os/graphics/graphicsresourceservices/graphicsresourceimplementation/group" mrp="os/graphics/graphicsresourceservices/graphicsresourceimplementation/group/graphics_graphicsresourceimplementation.mrp"/>
-</component>
-<component name="graphicsresourceinterface" long-name="Graphics Resource Interface" introduced="^4" purpose="optional">
-<unit bldFile="os/graphics/graphicsresourceservices/graphicsresourceinterface/group" mrp="os/graphics/graphicsresourceservices/graphicsresourceinterface/group/graphics_graphicsresourceinterface.mrp"/>
-</component>
-</collection>
-<collection name="graphicsutils" long-name="Graphics Utils" level="engines">
-<component name="commongraphicsheaders" long-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 name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
-<!-- displayldd to be moved here -->
-<component name="surfacemgr" long-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 name="graphicscomposition" long-name="Graphics Composition" level="engines">
-<component name="openwfcinterface" long-name="OpenWF Composition Interface" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfcinterface/group" mrp="os/graphics/graphicscomposition/openwfcinterface/group/graphics_openwfcinterface.mrp"/>
-</component>
-<component name="openwfcompositionengine" long-name="OpenWF Composition Engine" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/graphicscomposition/openwfcompositionengine/group" mrp="os/graphics/graphicscomposition/openwfcompositionengine/group/graphics_openwfcompositionengine.mrp"/>
-</component>
-<component name="openwfsupport" long-name="OpenWF Support" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfsupport/group" mrp="os/graphics/graphicscomposition/openwfsupport/group/graphics_openwfsupport.mrp"/>
-</component>
-<component name="surfaceupdate" long-name="Surface Update" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/surfaceupdate/group" mrp="os/graphics/graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
-</component>
-</collection>
-<collection name="graphicstest" long-name="Graphics Test" level="app-if">
-<component name="uibench" long-name="UI Bench" introduced="9.2" purpose="development">
-<unit bldFile="os/graphics/graphicstest/uibench/group" mrp="os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
-</component>
-</collection>
-<collection name="graphics_plat" long-name="Graphics Platform Interfaces" level="app-if">
-<component name="m3g_core_api" filter="sf_build" long-name="M3G Core API" class="api">
-<unit bldFile="os/graphics/graphics_plat/m3g_core_api/group"/>
-</component>
-</collection>
-<collection name="graphics_info" long-name="Graphics Info" level="app-if">
-<component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc">
-<unit mrp="os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
-</component>
-<component name="graphics_metadata" long-name="Graphics Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
-</component>
-</collection>
-<collection name="windowing" long-name="Windowing" level="app-if">
-<component name="windowserver" long-name="Window Server" purpose="mandatory">
-<unit bldFile="os/graphics/windowing/windowserver/group" mrp="os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
-</component>
-<component name="windowserverplugins" long-name="Window Server Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/windowing/windowserverplugins/group" mrp="os/graphics/windowing/windowserverplugins/group/graphics_wserv_std_plugins.mrp"/>
-</component>
-</collection>
-<collection name="printingservices" long-name="Printing Services" level="app-if">
-<component name="printerdriversupport" long-name="Printer Driver Support" purpose="optional">
-<unit bldFile="os/graphics/printingservices/printerdriversupport/group" mrp="os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
-</component>
-<component name="printerdrivers" long-name="Printer Drivers" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/printingservices/printerdrivers/group" mrp="os/graphics/printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
-</component>
-</collection>
-<collection name="fbs" long-name="Font and Bitmap Server" level="device-interface">
-<component name="fontandbitmapserver" long-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 name="opengles" long-name="OpenGLES" level="internal-adaptations">
-<component name="openglesinterface" long-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 name="opengles_stub" filter="sf_build" long-name="OpenGL ES Stub" purpose="optional" introduced="^2">
-<unit bldFile="os/graphics/opengles/openglesinterface/group/opengles_stub"/>
-</component>
-</collection>
-<collection name="openvg" long-name="OpenVG" level="internal-adaptations">
-<component name="openvginterface" long-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 name="openvg11" filter="s60" long-name="OpenVG 1.1">
-<!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
-<unit bldFile="os/graphics/openvg/openvginterface/group/openvg11"/>
-</component>
-<component name="sfopenvg" filter="sf_build" long-name="Khronos OpenVG Reference Implementation" introduced="^2" purpose="optional">
-<unit bldFile="os/graphics/openvg/openvgrefimplementation/sfopenvg/group"/>
-</component>
-</collection>
-<collection name="egl" long-name="EGL" level="internal-adaptations">
-<component name="eglinterface" long-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 name="eglswitch" long-name="EGL Switch" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglswitch/group" mrp="os/graphics/egl/eglswitch/group/graphics_eglswitch.mrp"/>
-</component>
-<component name="eglrefimpl" long-name="EGL Reference Implementation" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglrefimpl/group" mrp="os/graphics/egl/eglrefimpl/group/graphics_eglrefimpl.mrp"/>
-</component>
-<component name="egltest" long-name="EGL Tests" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/egl/egltest/group" mrp="os/graphics/egl/egltest/group/graphics_egltest.mrp"/>
-</component>
-</collection>
-<collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
-<component name="gdi" long-name="GDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/gdi/group" mrp="os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
-</component>
-<component name="bitgdi" long-name="BitGDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
-</component>
-<component name="colourpalette" long-name="Colour Palette" introduced="7.0s" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
-</component>
-<component name="screendriver" long-name="Screen Driver" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/graphicsdeviceinterface/screendriver/group" mrp="os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
-</component>
-<component name="directgdi" long-name="DirectGDI" introduced="^3" deprecated="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/directgdi/group" mrp="os/graphics/graphicsdeviceinterface/directgdi/group/graphics_directgdi.mrp"/>
-</component>
-<component name="directgdiinterface" long-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 name="directgdiadaptation" long-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"/>
-</component>
-</collection>
-<collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
-<component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/gdi_tools/group" mrp="os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
-</component>
-</collection>
-<collection name="graphicsapitest" long-name="Graphics API Tests" level="app-if"/>
-</block>
-<block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
-<collection name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" level="text">
-<component name="findutil_api" long-name="Find Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/findutil_api/group"/>
-</component>
-<component name="japanese_language_utilities_api" long-name="Japanese Language Utilities API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
-</component>
-<component name="sortutil_api" long-name="Sorting Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/sortutil_api/group"/>
-</component>
-</collection>
-<collection name="textandloc_pub" long-name="Text and Localisation Public Interfaces" level="text">
-<component name="directory_localizer_api" long-name="Directory Localizer API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_pub/directory_localizer_api/group"/>
-</component>
-</collection>
-<collection name="charconvfw" long-name="Character Conversion" level="encoding">
-<component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional">
-<unit bldFile="os/textandloc/charconvfw/charconv_fw/group" mrp="os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
-</component>
-<component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/charconvplugins/group" mrp="os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
-</component>
-<component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/fatfilenameconversionplugins/group" mrp="os/textandloc/charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
-</component>
-</collection>
-<collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
-<component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/textshaperplugin/group" mrp="os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
-</component>
-<component name="fontstore" long-name="Font Store" purpose="mandatory">
-<unit bldFile="os/textandloc/fontservices/fontstore/group" mrp="os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
-</component>
-<component name="textrendering" long-name="Text Rendering" purpose="mandatory" class="placeholder">
-<!-- placeholder for text code from GDI -->
-</component>
-<component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/freetypefontrasteriser/group" mrp="os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
-</component>
-<component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional">
-<unit bldFile="os/textandloc/fontservices/referencefonts/group" mrp="os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
-</component>
-</collection>
-<collection name="textlayout" long-name="Text Layout" level="text">
-<component name="texthandling" long-name="Text Handling" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/texthandling/group" mrp="os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
-</component>
-<component name="textformatting" long-name="Text Formatting" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/textformatting/group" mrp="os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
-</component>
-</collection>
-<collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
-<!-- components in this collection need to be moved to the right collection.
- Either move into the units' directories, or create a new textandlocutils directory -->
-<component name="numbergrouping" filter="s60" long-name="Number Grouping">
-<unit bldFile="os/textandloc/charconvfw/numbergrouping/group"/>
-</component>
-<component name="jplangutil" filter="s60" long-name="Japanese Language Utilities">
-<unit bldFile="os/textandloc/charconvfw/jplangutil/group"/>
-</component>
-<component name="sortutil" filter="s60" long-name="Sorting Utility">
-<unit bldFile="os/textandloc/charconvfw/sortutil/group"/>
-</component>
-<component name="inlinetext" filter="s60" long-name="Inline Text">
-<unit bldFile="os/textandloc/charconvfw/inlinetext/group"/>
-</component>
-<component name="nearestlangutil" long-name="Nearest Language Util" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-<component name="numberformatting" long-name="Number Formatting" introduced="7.0s" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/numberformatting/group" mrp="os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
-</component>
-</collection>
-<collection name="localesupport" long-name="Locale Support" level="util">
-<component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/localisation/localesupport" mrp="os/textandloc/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
-</component>
-<component name="initlocale" long-name="Initialise Locale" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-</collection>
-<collection name="textandloctools" long-name="Text and Localisation Tools" level="tools">
-<component name="fontcompiler" long-name="Font Compiler" purpose="development" class="placeholder PC">
-<!-- placeholder for split from GDI Tools -->
-</component>
-<component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/bitmapfonttools/group" mrp="os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
-</component>
-</collection>
-<collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
-<component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
-<collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
-<component name="xmlsrv_plat_build" long-name="XML Services Platform Interface Build" filter="s60" class="api">
-<!-- need to fix the configuration used here.
- Either destribute to other components or use the new feature flags confguration mechanisms.
- Remove this component and uncomment the other units when fixed-->
-<unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
-</component>
-<component name="xml_encryption_api" long-name="XML Encryption API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/> -->
-</component>
-<component name="xml_signature_api" long-name="XML Signature API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_signature_api/group"/> -->
-</component>
-<component name="xml_security_engine_utils_api" long-name="XML Security Engine Utils API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/> -->
-</component>
-</collection>
-<collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
-<component name="xmlseccertman" filter="s60" long-name="XML Security Certificate Manager">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
-</component>
-<component name="xmlsec" filter="s60" long-name="XML Security">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsec/group"/>
-</component>
-<component name="xmlseccrypto" filter="s60" long-name="XML Security Crypto">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccrypto/group"/>
-</component>
-<component name="xmlsecwrapper" filter="s60" long-name="XML Security Wrapper">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsecwrapper/group"/>
-</component>
-</collection>
-<collection name="xml" long-name="XML" level="generic">
-<component name="xmlfw" long-name="XML Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmlfw/group" mrp="os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
-</component>
-<component name="libxml2libs" long-name="Libxml2 Libraries" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/libxml2libs/group" mrp="os/xmlsrv/xml/libxml2libs/group/syslibs_libxml2.mrp"/>
-</component>
-<component name="legacyminidomparser" long-name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/legacyminidomparser/GROUP" mrp="os/xmlsrv/xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp"/>
-</component>
-<component name="xmldomandxpath" long-name="XML DOM and XPath" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmldomandxpath/group" mrp="os/xmlsrv/xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
-</component>
-<component name="xmlexpatparser" long-name="XML Expat Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmlexpatparser/group" mrp="os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
-</component>
-<component name="xmllibxml2parser" long-name="XML Libxml2 Parser" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmllibxml2parser/group" mrp="os/xmlsrv/xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
-</component>
-<component name="wbxmlparser" long-name="WBXML Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/wbxmlparser/group" mrp="os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
-</component>
-</collection>
-<collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
-<component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="deviceplatformrelease" level="services" long-name="Device Platform Release" levels="bld mid top">
-<collection name="s60extras" long-name="S60 Extras" level="mid">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="s60extras_build" filter="s60" long-name="S60 Extras Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/S60Extras/group"/>
-</component>
-</collection>
-<collection name="version" long-name="Version" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="version_build" filter="s60" long-name="Version Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/Version/group"/>
-</component>
-</collection>
-<collection name="helps_loc2" long-name="Helps Locale 2" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helps_loc2_build" long-name="Helps Locale 2 Build" filter="s60">
-<unit bldFile="os/deviceplatformrelease/helps_loc2/group"/>
-</component>
-</collection>
-<collection name="sf_config" long-name="SF Config" level="mid">
-<component name="config" filter="s60" long-name="Config" purpose="development" class="config"/>
-<component name="cenrep" filter="sf_build" long-name="ConE Central Repository Config" purpose="development" class="config">
-<!-- will should give the id/path something more unique than cenrep -->
-<unit bldFile="os/deviceplatformrelease/sf_config/cenrep/group"/>
-</component>
-<component name="rombuild_syborg" filter="sf_build" long-name="Syborg iMaker Config" purpose="development" introduced="^3" class="config">
-<unit bldFile="os/deviceplatformrelease/sf_config/rombuild/syborg/group"/>
-</component>
-<component name="rombuild_zoom2" filter="sf_build" long-name="Zoom2 iMaker Config" purpose="development" introduced="^3" class="config">
-<unit bldFile="os/deviceplatformrelease/sf_config/rombuild/zoom2/group"/>
-</component>
-</collection>
-<!-- should be located locally in buildplatforms/group
- <collection id="s60bld" name="S60 Build">
- <component id="buildplatforms" filter="s60" name="Build Platforms">
- <unit bldFile="/tools/buildplatforms/group"/>
- </component>
- </collection>-->
-<collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
-<component name="cedarutils" long-name="Cedar Utils" purpose="development">
-<unit mrp="os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
-</component>
-<component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt" purpose="development" class="config">
-<unit mrp="os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
-</component>
-<component name="foundation_s60_packages" long-name="Foundation S60 Packages" introduced="^3" deprecated="^3" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/symbianosbld/foundation_s60_packages/foundation_s60_packages.mrp"/>
-</component>
-</collection>
-<collection name="foundation_system" long-name="Foundation System" level="top">
-<component name="system_model" long-name="System Model" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
-</component>
-</collection>
-<collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
-<component name="deviceplatformrelease_metadata" long-name="Device Platform Release Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="osrndtools" level="services" long-name="OS R&D tools" levels="fw trace">
-<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"/>
-</component>
-<component name="testinterface" filter="s60" long-name="Test Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/testinterface/group"/>
-</component>
-<component name="testserver" filter="s60" long-name="Test Server" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserver/group"/>
-</component>
-<component name="testengine" filter="s60" long-name="Test Engine" purpose="development">
-<unit bldFile="os/osrndtools/stif/testengine/group"/>
-</component>
-<component name="testserverstarter" filter="s60" long-name="Test Server Starter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserverstarter/group"/>
-</component>
-<component name="stiftfwif" filter="s60" long-name="STIF Test Framework Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/stiftfwif/group"/>
-</component>
-<component name="consoleui" filter="s60" long-name="Console UI" purpose="development">
-<unit bldFile="os/osrndtools/stif/consoleui/group"/>
-</component>
-<component name="testcombiner" filter="s60" long-name="Test Combiner" purpose="development">
-<unit bldFile="os/osrndtools/stif/testcombiner/group"/>
-</component>
-<component name="demomodule" filter="s60" long-name="Demo Module" purpose="development">
-<unit bldFile="os/osrndtools/stif/demomodule/group"/>
-</component>
-<component name="atslogger" filter="s60" long-name="ATS Logger" purpose="development">
-<unit bldFile="os/osrndtools/stif/atslogger/group"/>
-</component>
-<component name="atsinterface" filter="s60" long-name="ATS Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/atsinterface/group"/>
-</component>
-<component name="testscripter" filter="s60" long-name="Test Scripter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testscripter/group"/>
-</component>
-<component name="suevent" filter="s60" long-name="SU Event" purpose="development">
-<unit bldFile="os/osrndtools/stif/suevent/group"/>
-</component>
-<component name="stifkerneltestclassbase" filter="s60" long-name="STIF Kernel Test Class Base" purpose="development">
-<!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
-<!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
-</component>
-<component name="stif_build" filter="s60" long-name="STIF Build" purpose="development">
-<!-- move exports into self-contained component. Remove this when configuration is in place-->
-<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">
-<unit bldFile="os/osrndtools/memspy/memspy_plat/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/engine/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/console/group"/>
-</component>
-<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>
-</collection>
-<collection name="hti" long-name="Harmonized Test Interface" level="trace">
-<component name="hti_plat" filter="s60" long-name="HTI Platform Interfaces" purpose="development" class="api">
-<unit bldFile="os/osrndtools/hti/hti_plat/group"/>
-</component>
-<component name="hticfg" filter="s60" long-name="HTI Config" purpose="development">
-<unit bldFile="os/osrndtools/hti/hticfg/group"/>
-</component>
-<component name="htiautostart" filter="s60" long-name="HTI Autostart" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiautostart/group"/>
-</component>
-<component name="htiframework" filter="s60" long-name="HTI Framework" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiframework/group"/>
-</component>
-<component name="hticommplugins" filter="s60" long-name="HTI Communication Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
-</component>
-<component name="htiserviceplugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
-</component>
-<component name="htifilehlp" filter="s60" long-name="HTI File Help" purpose="development">
-<unit bldFile="os/osrndtools/hti/htifilehlp/group"/>
-</component>
-<component name="htiwatchdog" filter="s60" long-name="HTI Watchdog" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiwatchdog/group"/>
-</component>
-<component name="hti_build" filter="s60" long-name="HTI Build" purpose="development">
-<!-- move exports into self-contained component.-->
-<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">
-<block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
-<collection name="appsupport_pub" long-name="Generic Application Support Public Interfaces" level="specific">
-<component name="flash_viewer_framework_api" long-name="Flash Viewer Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
-</component>
-<component name="network_status_api" long-name="Network Status API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/network_status_api/group"/>
-</component>
-</collection>
-<collection name="appsupport_plat" long-name="Generic Application Support Platform Interfaces" level="specific">
-<component name="action_plugin_api" long-name="Action Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/action_plugin_api/group"/>
-</component>
-<component name="application_orientation_api" long-name="Application Orientation API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/application_orientation_api/group"/>
-</component>
-<component name="context_access_api" long-name="Context Access API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_access_api/group"/>
-</component>
-<component name="context_framework_services_api" long-name="Context Framework Services API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_services_api/group"/>
-</component>
-<component name="context_framework_client_api" long-name="Context Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_client_api/group"/>
-</component>
-<component name="context_framework_listener_api" long-name="Context Framework Listener API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_listener_api/group"/>
-</component>
-<component name="context_framework_version_api" long-name="Context Framework Version API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_version_api/group"/>
-</component>
-<component name="context_source_plugin_api" long-name="Context Source Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_plugin_api/group"/>
-</component>
-<component name="context_source_settings_manager_api" long-name="Context Source Settings Manager API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_settings_manager_api/group"/>
-</component>
-<component name="context_subscription_api" long-name="Context Subscription API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_subscription_api/group"/>
-</component>
-<component name="key_event_framework_api" long-name="Key Event Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_api/group"/>
-</component>
-<component name="key_event_framework_mapper_api" long-name="Key Event Framework Mapper API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_mapper_api/group"/>
-</component>
-<component name="media_keys_definition_api" long-name="Media Keys Definition API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/media_keys_definition_api/group"/>
-</component>
-<component name="ood_threshold_api" long-name="OOD Threshold API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/ood_threshold_api/group"/>
-</component>
-<component name="oom_monitor_api" long-name="OOM Monitor API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_api/group"/>
-</component>
-<component name="oom_monitor_plugin_api" long-name="OOM Monitor Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_plugin_api/group"/>
-</component>
-<component name="operation_provider_api" long-name="Operation Provider API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/operation_provider_api/group"/>
-</component>
-<component name="phonecmdhandler_api" long-name="Phone Command Handler API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/phonecmdhandler_api/group"/>
-</component>
-<component name="restore_factory_settings_api" long-name="Restore Factory Settings API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_api/group"/>
-</component>
-<component name="restore_factory_settings_plugin_api" long-name="Restore Factory Settings Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_plugin_api/group"/>
-</component>
-<component name="secondary_display_accfw_api" long-name="Secondary Display Accessory Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_accfw_api/group"/>
-</component>
-<component name="secondary_display_startup_api" long-name="Secondary Display Startup API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_startup_api/group"/>
-</component>
-<component name="secondary_display_sysap_api" long-name="Secondary Display System Application API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_sysap_api/group"/>
-</component>
-<component name="secondary_display_system_state_api" long-name="Secondary Display System State API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_system_state_api/group"/>
-</component>
-<component name="sensor_user_setting_api" long-name="Sensor User Setting API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/sensor_user_setting_api/group"/>
-</component>
-<component name="startup_configuration_api" long-name="Startup Configuration API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/startup_configuration_api/group"/>
-</component>
-<component name="system_application_key_handler_plugin_api" long-name="System Application Key Handler Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_key_handler_plugin_api/group"/>
-</component>
-<component name="system_application_light_control_plugin_api" long-name="System Application Light Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_light_control_plugin_api/group"/>
-</component>
-<component name="system_application_notification_api" long-name="System Application Notification API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_notification_api/group"/>
-</component>
-<component name="system_application_plugin_callback_api" long-name="System Application Plug-in Callback API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
-</component>
-<component name="flash_mmi_service_interface_custom_api" long-name="Flash MMI Service Interface Custom API" filter="s60,!sf_build" introduced="^2" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/flash_mmi_service_interface_custom_api/group"/>
-</component>
-<component name="flash_netscape_plugin_command_api" long-name="Flash Netscape Plugin Command API" filter="s60,!sf_build" introduced="^2" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/flash_netscape_plugin_command_api/group"/>
-</component>
-</collection>
-<collection name="contextframework" long-name="Context Framework" level="framework">
-<!-- the units that are commented out need to be put back when configuration is in place.
- They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
-<component name="cfw" filter="s60" long-name="Context Framework">
-<!--<unit bldFile="contextframework/cfw/group"/> -->
-</component>
-<component name="cfwplugins" filter="s60" long-name="Context Framework Plugins" plugin="Y">
-<!--<unit bldFile="contextframework/cfwplugins/group"/>-->
-</component>
-<component name="contextframework_build" filter="s60" long-name="Context Framework Build">
-<unit bldFile="mw/appsupport/contextframework/group"/>
-</component>
-</collection>
-<collection name="coreapplicationuis" long-name="Core Application UIs" level="server">
-<component name="dbrecovery" filter="s60" long-name="Database Recovery">
-<unit bldFile="mw/appsupport/coreapplicationuis/dbrecovery/group"/>
-</component>
-<component name="nspswsplugin" filter="s60" long-name="NSPS WS Plugin" plugin="Y">
-<!-- No Service Power Save? Window Server? Please elaborate-->
-<unit bldFile="mw/appsupport/coreapplicationuis/nspswsplugin/group"/>
-</component>
-<component name="rfs" filter="s60" long-name="Restore Factory Settings">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfs/group"/>
-</component>
-<component name="rfsplugins" filter="s60" long-name="Restore Factory Settings Plugins" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/group"/>
-</component>
-<component name="sysap" filter="s60" long-name="System Application">
-<unit bldFile="mw/appsupport/coreapplicationuis/sysap/group"/>
-</component>
-<component name="variatedsettings" filter="s60" long-name="Variated Settings" class="config">
-<unit bldFile="mw/appsupport/coreapplicationuis/variatedsettings/group"/>
-</component>
-<component name="accfwuinotifier" filter="s60" long-name="Accessory Framework UI Notifier" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/accfwuinotifier/group"/>
-</component>
-<component name="kefmapper" filter="s60" long-name="Key Event Framework">
-<unit bldFile="mw/appsupport/coreapplicationuis/kefmapper/group"/>
-</component>
-<component name="advancedtspcontroller" filter="s60" long-name="Advanced TSP Controller">
-<unit bldFile="mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
-</component>
-<component name="powersaveutilities" filter="s60" long-name="Power Save Utilities">
-<unit bldFile="mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
-</component>
-<component name="gsserverenginestub" filter="s60" long-name="GS Server Engine Stub">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
-</component>
-<component name="gsserverengine" filter="s60" long-name="GS Server Engine">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverengine/group"/>
-</component>
-<component name="sensordatacompensatorplugin" filter="s60" long-name="Sensor Data Compensator Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/group"/>
-</component>
-<component name="atcmdplugin" long-name="AT Command Plugin" filter="s60,!oem_build" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/atcmdplugin/group"/>
-</component>
-</collection>
-<collection name="flashliteapi_3_1" long-name="Flash Lite API 3.1" level="specific">
-<!-- collection is really a component. Move down a directory -->
-<component name="flashliteapi_3_1_build" long-name="Flash Lite API Build" filter="s60" introduced="^2"/>
-</collection>
-<collection name="mediakeys" long-name="Media Keys" level="plugin">
-<!-- collection is really a component. Move down a directory -->
-<component name="mediakeys_build" filter="s60" long-name="Media Keys Build">
-<unit bldFile="mw/appsupport/mediakeys/group"/>
-</component>
-</collection>
-<collection name="startupservices" long-name="Startup Services" level="system">
-<component name="splashscreen" filter="s60" long-name="Splash Screen">
-<unit bldFile="mw/appsupport/startupservices/splashscreen/group"/>
-</component>
-<component name="startupanimation" filter="s60" long-name="Startup Animation">
-<unit bldFile="mw/appsupport/startupservices/startupanimation/group"/>
-</component>
-<component name="startup" long-name="Startup Application" filter="s60">
-<unit bldFile="mw/appsupport/startupservices/startup/group"/>
-</component>
-</collection>
-<collection name="sysresmonitoring" long-name="System Resource Monitoring" level="system">
-<component name="oodmonitor" filter="s60" long-name="OOD Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oodmonitor/group"/>
-</component>
-<component name="oommonitor" filter="s60" long-name="OOM Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oommonitor/group"/>
-</component>
-</collection>
-<collection name="systemsettings" long-name="System Settings" level="system">
-<component name="gssensorplugin" filter="s60" long-name="GS Sensor Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gssensorplugin/group"/>
-</component>
-<component name="gsaccessoryplugin" filter="s60" long-name="GS Accessory Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gsaccessoryplugin/group"/>
-</component>
-</collection>
-<collection name="filehandling" long-name="File Handling" level="server">
-<component name="fileconverterfw" long-name="File Converter Framework" purpose="optional">
-<unit bldFile="mw/appsupport/filehandling/fileconverterfw/group" mrp="mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
-</component>
-<component name="htmltorichtextconverter" long-name="HTML to RichText Converter" introduced="7.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/htmltorichtextconverter/group" mrp="mw/appsupport/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
-</component>
-<component name="richtexttohtmlconverter" long-name="RichText to HTML Converter" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
-</component>
-</collection>
-<collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
-<component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
-</component>
-</collection>
-<collection name="commonappservices" long-name="Common Application Services" level="framework">
-<component name="alarmserver" long-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"/>
-</component>
-<component name="alarmservertest" long-name="Alarm Server Test" deprecated="^3" introduced="8.1" purpose="development">
-<unit bldFile="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
-</component>
-<component name="appservicesdocs" long-name="Application Services Documentation" purpose="development" class="doc">
-<unit mrp="mw/appsupport/commonappservices/appservicesdocs/app-services_documentation.mrp"/>
-</component>
-<component name="backuprestorenotification" long-name="Backup Restore Notification" introduced="8.1" purpose="optional">
-<unit bldFile="mw/appsupport/commonappservices/backuprestorenotification/group" mrp="mw/appsupport/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
-</component>
-</collection>
-<collection name="tzservices" long-name="Time Zone Services" level="plugin">
-<component name="tzserver" long-name="Time Zone Server" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzserver/group" mrp="mw/appsupport/tzservices/tzserver/group/app-services_tz.mrp"/>
-</component>
-<component name="tzloc" long-name="Time Zone Localization" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzloc/group" mrp="mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
-</component>
-<component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzlocrscfactory/group" mrp="mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
-</component>
-<component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzdatabase/group" mrp="mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
-</component>
-</collection>
-<collection name="contenthandling" long-name="Content Handling" level="plugin">
-<component name="webrecognisers" long-name="Web Recognisers" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/contenthandling/webrecognisers/group" mrp="mw/appsupport/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
-</component>
-</collection>
-<collection name="openenvutils" long-name="Open Environment Utilities" level="specific">
-<component name="commandshell" long-name="Command Shell" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/commandshell/group" mrp="mw/appsupport/openenvutils/commandshell/group/oetools_zsh.mrp"/>
-</component>
-<component name="telnetserver" long-name="Telnet Server" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/telnetserver/group" mrp="mw/appsupport/openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
-</component>
-</collection>
-<collection name="printingsupport" long-name="Printing Support" level="generic">
-<component name="printinguisupport" long-name="Printing UI Support" purpose="optional" introduced="^2" deprecated="^3">
-<unit bldFile="mw/appsupport/printingsupport/printinguisupport/group" mrp="mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
-</component>
-</collection>
-<collection name="appfw" long-name="Application Framework" level="framework">
-<component name="apparchitecture" long-name="Application Architecture" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/apparchitecture/group" mrp="mw/appsupport/appfw/apparchitecture/group/app-framework_apparc.mrp"/>
-</component>
-<component name="viewserver" long-name="View Server" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/viewserver/group" mrp="mw/appsupport/appfw/viewserver/group/app-framework_viewsrv.mrp"/>
-</component>
-</collection>
-<collection name="applaunchservices" long-name="Application Launch Services" level="generic">
-<component name="aftermarketappstarter" long-name="After Market Application Starter" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/aftermarketappstarter/group" mrp="mw/appsupport/applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
-</component>
-<component name="applaunchplugins" long-name="Application Launch Plugins" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/applaunchplugins/group" mrp="mw/appsupport/applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
-</component>
-</collection>
-<collection name="tzpcside" long-name="Time Zone PC Side" level="plugin">
-<component name="tzcompiler" long-name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config PC">
-<unit bldFile="mw/appsupport/tzpcside/tzcompiler/group" mrp="mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
-</component>
-</collection>
-<collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
-<component name="appsupport_metadata" long-name="Generic Application Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="securitysrv" level="generic" long-name="Security Services" levels="plugin framework server generic specific">
-<collection name="secsrv_plat" long-name="Security Services Platform Interfaces" level="specific">
-<component name="cms_api" long-name="CMS API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/cms_api/group"/>
-</component>
-<component name="pkcs12_parser_api" long-name="PKCS12 Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkcs12_parser_api/group"/>
-</component>
-<component name="java_utils_api" long-name="Java Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/java_utils_api/group"/>
-</component>
-<component name="wim_cert_api" long-name="WIM Cert API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/wim_cert_api/group"/>
-</component>
-<component name="device_key_store_encryption_plugin_api" long-name="Device Key Store Encryption Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/device_key_store_encryption_plugin_api/group"/>
-</component>
-<component name="x509certnameparser_api" long-name="X.509 Certificate Name Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
-</component>
-<component name="remote_lock_api" long-name="Remote Lock API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
-</component>
-<component name="pkidialog_api" long-name="PKI Dialog API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
-</component>
-<component name="provisioning_api" long-name="Provisioning API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/provisioning_api/group"/>
-</component>
-<component name="keyguard_configuration_api" long-name="Keyguard Configuration API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_configuration_api/group"/>
-</component>
-<component name="keylock_policy_api" long-name="Keylock Policy API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keylock_policy_api/group"/>
-</component>
-<component name="security_code_ui_api" long-name="Security Code UI API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
-</component>
-<component name="gba_api" long-name="GBA API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/gba_api/group"/>
-</component>
-<component name="keyguard_access_api" long-name="Keyguard Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_access_api/group"/>
-</component>
-<component name="devicelock_access_api" long-name="Device Lock Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devicelock_access_api/group"/>
-</component>
-<component name="lockapp_server_api" long-name="Lock Application Server API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
-</component>
-<component name="devencadaptation_api" long-name="Device Encryption Adaptation API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
-</component>
-<component name="devenccommonutils_api" long-name="Device Encryption Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
-</component>
-</collection>
-<collection name="cms" long-name="Certificate Management Service" level="server">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="cms_build" filter="s60" long-name="CMS" introduced="^3">
-<unit bldFile="mw/securitysrv/cms/group"/>
-</component>
-</collection>
-<collection name="pkiutilities" long-name="PKI Utilities" level="plugin">
-<component name="x509certnameparser" filter="s60" long-name="X.509 Certificate Name Parser">
-<unit bldFile="mw/securitysrv/pkiutilities/x509certnameparser/group"/>
-</component>
-<component name="pkcs12" filter="s60" long-name="PKCS #12">
-<unit bldFile="mw/securitysrv/pkiutilities/pkcs12/group"/>
-</component>
-<component name="certmanui" filter="s60" long-name="Certificate Management UI">
-<unit bldFile="mw/securitysrv/pkiutilities/certmanui/group"/>
-</component>
-<component name="ctsecuritydialogs" filter="s60" long-name="Crypto Token Security Dialogs">
-<unit bldFile="mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
-</component>
-<component name="certsaver" filter="s60" long-name="Certificate Saver">
-<unit bldFile="mw/securitysrv/pkiutilities/certsaver/group"/>
-</component>
-<component name="secmodui" filter="s60" long-name="Security Module UI">
-<unit bldFile="mw/securitysrv/pkiutilities/secmodui/group"/>
-</component>
-<component name="devicetoken" filter="s60" long-name="Device Token">
-<unit bldFile="mw/securitysrv/pkiutilities/devicetoken/group"/>
-</component>
-<component name="certificates" filter="s60" long-name="Certificates">
-<unit bldFile="mw/securitysrv/pkiutilities/Certificates/group" filter="sf_build"/>
-</component>
-<component name="pkiutilities_build" filter="s60" long-name="PKI Utilities Build">
-<!-- need to split this into the above components -->
-<unit bldFile="mw/securitysrv/pkiutilities/group"/>
-</component>
-<component name="ocsp" long-name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
-<unit bldFile="mw/securitysrv/pkiutilities/ocsp/group" mrp="mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
-</component>
-</collection>
-<collection name="wim" long-name="Wireless Identity Module " level="framework">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="wim_build" filter="s60" long-name="WIM Build">
-<unit bldFile="mw/securitysrv/wim/group"/>
-</component>
-</collection>
-<collection name="remotelock" long-name="Remote Lock" level="generic">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="remotelock_build" filter="s60" long-name="Remote Lock Build">
-<unit bldFile="mw/securitysrv/remotelock/group"/>
-</component>
-</collection>
-<collection name="securitydialogs" long-name="Security Dialogs" level="specific">
-<component name="keylockpolicyapi" filter="s60" long-name="Keylock Policy API">
-<unit bldFile="mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
-</component>
-<component name="autolock" long-name="Autolock" filter="s60">
-<unit bldFile="mw/securitysrv/securitydialogs/autolock/group"/>
-</component>
-<component name="secui" filter="s60" long-name="Security UI">
-<unit bldFile="mw/securitysrv/securitydialogs/secui/group"/>
-</component>
-<component name="securitynotifier" filter="s60" long-name="Security Notifier">
-<unit bldFile="mw/securitysrv/securitydialogs/securitynotifier/group"/>
-</component>
-<component name="lockclient" filter="s60" long-name="Lock Client" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockclient/group"/>
-</component>
-<component name="lockapp" filter="s60" long-name="Lock Application" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockapp/group"/>
-</component>
-<component name="secuinotifications" long-name="Security UI Notifications" introduced="^4" filter="s60">
-<unit bldFile="mw/securitysrv/securitydialogs/secuinotifications" proFile="secuinotifications.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="boottimeintegritycheck_build" filter="s60" long-name="Boot Time Integrity Check Build">
-<unit bldFile="mw/securitysrv/boottimeintegritycheck/group"/>
-</component>
-</collection>
-<collection name="gba" long-name="Generic Bootstrapping Architecture" level="server">
-<component name="uicc" filter="s60" long-name="UICC" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/uicc/group"/>
-</component>
-<component name="gbaserver" filter="s60" long-name="GBA Server" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaserver/group"/>
-</component>
-<component name="gbaapi" filter="s60" long-name="GBA API" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaapi/group"/>
-</component>
-<component name="gbafilter" filter="s60" long-name="GBA HTTP Filter" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/gbafilter/group"/>
-</component>
-<component name="gba_build" filter="s60" long-name="Generic Boot Architecture Build" introduced="^2">
-<!-- need to split this into the above components, or remove #includes and make this GBA ROM -->
-<unit bldFile="mw/securitysrv/gba/group"/>
-</component>
-</collection>
-<collection name="devencdiskutils" long-name="Device Encryption Disk Utils" level="server">
-<component name="devenccommonutils" filter="s60" long-name="Device Encryption Common Utils" introduced="^3">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncCommonUtils/group"/>
-</component>
-<component name="devencrfsplugin" filter="s60" long-name="Device Encryption RFS Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncRfsPlugin/group"/>
-</component>
-<component name="pk5recognizer" filter="s60" long-name="Device Encryption Pk5 Recognizer" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/Pk5Recognizer/group"/>
-</component>
-<component name="devencstarter" filter="s60" long-name="Device Encryption Starter" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncStarter/group"/>
-</component>
-<component name="devencdiskutils" filter="s60" long-name="Device Encryption Disk Utils Build" introduced="^3">
-<!-- need to split this into the above components, or remove #includes and make this a ROM component-->
-<unit bldFile="mw/securitysrv/devencdiskutils/group"/>
-</component>
-</collection>
-<collection name="securitysrv_info" long-name="Security Services Info" level="specific">
-<component name="securitysrv_metadata" long-name="Security Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="drm" level="generic" long-name="DRM" levels="plugin framework server generic specific">
-<collection name="drm_plat" long-name="DRM Platform Interfaces" level="specific">
-<component name="roap_api" long-name="ROAP API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/roap_api/group"/>
-</component>
-<component name="drm_common_api" long-name="DRM Common API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_common_api/group"/>
-</component>
-<component name="drm_rights_api" long-name="DRM Rights API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_rights_api/group"/>
-</component>
-<component name="drm_legacy_api" long-name="DRM Legacy API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_legacy_api/group"/>
-</component>
-<component name="dcf_repository_api" long-name="DCF Repository API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/dcf_repository_api/group"/>
-</component>
-<component name="drm_service_api" long-name="DRM Service API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_service_api/group"/>
-</component>
-<component name="drm_secondary_display_api" long-name="DRM Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_secondary_display_api/group"/>
-</component>
-<component name="drm_license_manager_api" long-name="DRM License Manager API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_license_manager_api/group"/>
-</component>
-<component name="drm_utility_api" long-name="DRM Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_utility_api/group"/>
-</component>
-<component name="drm_agents_api" long-name="DRM Agents API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_agents_api/group"/>
-</component>
-<component name="wmdrm_core_api" long-name="WM DRM Core API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_core_api/group"/>
-</component>
-<component name="wmdrm_access_api" long-name="WMDRM Access API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_access_api/group"/>
-</component>
-<component name="camese_utility_api" long-name="Camese Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_utility_api/group"/>
-</component>
-<component name="camese_framework_api" long-name="Camese Framework API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_framework_api/group"/>
-</component>
-</collection>
-<collection name="drm_pub" long-name="DRM Public Interfaces" level="specific">
-<component name="drm_helper_api" long-name="DRM Helper API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_helper_api/group"/>
-</component>
-<component name="oma_drm_caf_agent_api" long-name="OMA DRM CAF Agent API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/group"/>
-</component>
-<component name="drm_license_checker_api" long-name="DRM License Checker API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_license_checker_api/group"/>
-</component>
-</collection>
-<collection name="commondrm" long-name="Common DRM" level="generic">
-<!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
-<component name="drmencryptor" filter="s60" long-name="DRM Encryptor" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmsettingsplugin" filter="s60" long-name="DRM Settings Plugin" plugin="Y" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmrightsmanagerui" filter="s60" long-name="DRM Rights Manager UI">
-<unit bldFile="mw/drm/commondrm/drmrightsmanagerui/help/group"/>
-</component>
-<component name="drmutility" filter="s60" long-name="DRM Utility">
-<!-- Uncomment unit when configuration is in place. Currently #included from commondrm_build -->
-<!--<unit bldFile="commondrm/drmutility/group"/>-->
-</component>
-<component name="drmserviceapiwrapper" filter="s60" long-name="DRM Service API Wrapper">
-<unit bldFile="mw/drm/commondrm/drmserviceapiwrapper/group"/>
-</component>
-<component name="drmrightsstoringlocation" filter="s60" long-name="DRM Rights Storing Location">
-<unit bldFile="mw/drm/commondrm/drmrightsstoringlocation/group"/>
-</component>
-<component name="commondrm_build" filter="s60" long-name="Common DRM Build">
-<!-- should be split into the above files, or them collapsed into a single component -->
-<unit bldFile="mw/drm/commondrm/group"/>
-</component>
-</collection>
-<collection name="omadrm" long-name="OMA DRM" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="omadrm_build" filter="s60" long-name="OMA DRM Build">
-<unit bldFile="mw/drm/omadrm/group"/>
-</component>
-<component name="foundationcerts" filter="sf_build" long-name="Foundation Certificates">
-<unit bldFile="mw/drm/omadrm/foundationcerts/group"/>
-</component>
-</collection>
-<collection name="wmdrm" long-name="Windows Media DRM" level="framework">
-<!-- collection is really a component. Move down a directory -->
-<component name="wmdrm_build" filter="s60" long-name="WM DRM Build">
-<unit bldFile="mw/drm/wmdrm/group"/>
-</component>
-</collection>
-<collection name="drm_info" long-name="DRM Info" level="specific"/>
-</block>
-<block name="locationsrv" level="specific" long-name="Location Services" levels="plugin fw server if">
-<collection name="locsrv_pub" long-name="Location Services Public Interfaces" level="if">
-<component name="landmarks_search_api" long-name="Landmarks Search API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
-</component>
-<component name="landmarks_api" long-name="Landmarks API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/group"/>
-</component>
-<component name="landmarks_database_management_api" long-name="Landmarks Database Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/group"/>
-</component>
-<component name="location_triggering_api" long-name="Location Triggering API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/location_triggering_api/group"/>
-</component>
-<component name="blid_application_satellite_info_api" long-name="BLID Application Satellite Info API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/group"/>
-</component>
-</collection>
-<collection name="locsrv_plat" long-name="Location Services Platform Interfaces" level="if">
-<component name="map_and_navigation_api" long-name="Map and Navigation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/group"/>
-</component>
-<component name="map_and_navigation_provider_discovery_api" long-name="Map and Navigation Provider Discovery API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/group"/>
-</component>
-<component name="geocoding_api" long-name="Geocoding API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
-</component>
-<component name="map_image_api" long-name="Map Image API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/group"/>
-</component>
-<component name="map_and_navigation_aiw_api" long-name="Map and Navigation AIW API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_aiw_api/group"/>
-</component>
-<component name="map_and_navigation_provider_api" long-name="Map and Navigation Provider API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_api/group"/>
-</component>
-<component name="landmarks_category_definition_api" long-name="Landmarks Category Definition API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
-</component>
-<component name="supl_settings_api" long-name="SUPL Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
-</component>
-<component name="location_settings_launch_api" long-name="Location Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/group"/>
-</component>
-<component name="map_image_conversion_plugin_api" long-name="Map Image Conversion Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/group"/>
-</component>
-<component name="psy_configuration_ui_plugin_api" long-name="PSY Configuration UI Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/psy_configuration_ui_plugin_api/group"/>
-</component>
-<component name="np_proxy_configuration_api" long-name="NP Proxy Configuration API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/np_proxy_configuration_api/group"/>
-</component>
-<component name="supl_terminal_initiation_api" long-name="SUPL Terminal Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/group"/>
-</component>
-<component name="location_notation_preferences_settings_api" long-name="Location Notation Preferences Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_notation_preferences_settings_api/group"/>
-</component>
-<component name="supl_settings_notifier_secondary_display_api" long-name="SUPL Settings Notifier Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_notifier_secondary_display_api/group"/>
-</component>
-<component name="supl_network_initiation_api" long-name="SUPL Network Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/group"/>
-</component>
-<component name="privacy_notifiers_secondary_display_api" long-name="Privacy Notifiers Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/privacy_notifiers_secondary_display_api/group"/>
-</component>
-<component name="oma_supl_configuration_parameter_api" long-name="OMA SUPL Configuration Parameter API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_configuration_parameter_api/group"/>
-</component>
-<component name="supl_query_secondary_display_api" long-name="SUPL Query Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_query_secondary_display_api/group"/>
-</component>
-<component name="location_triggering_management_api" long-name="Location Triggering Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_management_api/group"/>
-</component>
-<component name="location_triggering_status_information_api" long-name="Location Triggering Status Information API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_status_information_api/group"/>
-</component>
-<component name="oma_supl_asn_codec_plugin_api" long-name="OMA SUPL ASN Codec Plugin API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
-</component>
-<component name="query_and_notification_api" long-name="Query and Notification API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/query_and_notification_api/group"/>
-</component>
-<component name="location_local_variation_api" long-name="Location Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_local_variation_api/group"/>
-</component>
-</collection>
-<collection name="genericpositioningplugins" long-name="Generic Positioning Plugins" level="plugin">
-<component name="locationnpppsy" filter="s60" long-name="Location Positioning Proxy PSY" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
-</component>
-<component name="locationsuplpsy" filter="s60" long-name="Location SUPL PSY" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationsuplpsy/group"/>
-</component>
-<component name="genericpositioningplugins_build" filter="s60" long-name="Generic Positioning Plugins Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/genericpositioningplugins/group"/>
-</component>
-</collection>
-<collection name="landmarks" long-name="Landmarks" level="server">
-<component name="locationlandmarks" filter="s60" long-name="Location Landmarks">
-<unit bldFile="mw/locationsrv/landmarks/locationlandmarks/group"/>
-</component>
-</collection>
-<collection name="locationmapnavfw" long-name="Location Map and Navigation Framework" level="fw">
-<component name="mnlibrary" filter="s60" long-name="Map and Navigation Library">
-<unit bldFile="mw/locationsrv/locationmapnavfw/library/group"/>
-</component>
-<component name="mnaiwprovider" filter="s60" long-name="Map and Navigation AIW Provider" plugin="Y">
-<unit bldFile="mw/locationsrv/locationmapnavfw/aiwprovider/group"/>
-</component>
-<component name="locationmapnavfw_build" filter="s60" long-name="Location Map and Navigation Framework Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/locationmapnavfw/group"/>
-</component>
-</collection>
-<collection name="locationsystemui" long-name="Location System UI" level="if">
-<component name="locationsysui" filter="s60" long-name="Location System UI">
-<unit bldFile="mw/locationsrv/locationsystemui/locationsysui/group"/>
-</component>
-</collection>
-<collection name="supl" long-name="SUPL" level="fw">
-<component name="locationsuplfw" filter="s60" long-name="Location SUPL Framework">
-<unit bldFile="mw/locationsrv/supl/locationsuplfw/group"/>
-</component>
-<component name="locationomasuplprotocolhandler" filter="s60" long-name="OMA SUPL Protocol Handler">
-<unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/group"/>
-</component>
-<component name="supltiapiimplementation" filter="s60" long-name="SUPL TI API Implementation" introduced="^3">
-<unit bldFile="mw/locationsrv/supl/supltiapiimplementation/group"/>
-</component>
-</collection>
-<collection name="locationtriggering" long-name="Location Triggering" level="server">
-<component name="ltlogger" filter="s60" long-name="LT Logger">
-<unit bldFile="mw/locationsrv/locationtriggering/ltlogger/group"/>
-</component>
-<component name="ltclientlib" filter="s60" long-name="LT Client Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltclientlib/group"/>
-</component>
-<component name="ltmanagementlib" filter="s60" long-name="LT Management Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmanagementlib/group"/>
-</component>
-<component name="ltcontainer" filter="s60" long-name="LT Container">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontainer/group"/>
-</component>
-<component name="ltserver" filter="s60" long-name="LT Server">
-<unit bldFile="mw/locationsrv/locationtriggering/ltserver/group"/>
-</component>
-<component name="ltstrategypluginapi" filter="s60" long-name="LT Strategy Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategypluginapi/group"/>
-</component>
-<component name="ltstrategyengine" filter="s60" long-name="LT Strategy Engine">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategyengine/group"/>
-</component>
-<component name="ltmovementdetectionpluginapi" filter="s60" long-name="Movement Detection Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmovementdetectionpluginapi/group"/>
-</component>
-<component name="ltcellidmovementdetector" filter="s60" long-name="Cell ID Movement Detector">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/>
-</component>
-<component name="lbtmgmtui" filter="s60" long-name="LBT Management UI" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/lbtmgmtui/group"/>
-</component>
-<component name="ltcontextsourceplugin" filter="s60" long-name="LT Context Source Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontextsourceplugin/group"/>
-</component>
-<component name="locationtriggering_build" filter="s60" long-name="Location Triggering Build">
-<!-- should remove #include from this and maybe put exports in the above components -->
-<unit bldFile="mw/locationsrv/locationtriggering/group"/>
-</component>
-</collection>
-</block>
-<block name="accesssec" level="generic" long-name="Access Security" levels="plugin framework server generic specific">
-<collection name="accesssec_plat" long-name="Access Security Platform Interfaces" level="specific">
-<component name="wapi_security_settings_ui_api" long-name="WAPI Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_security_settings_ui_api/group"/>
-</component>
-<component name="wep_security_settings_ui_api" long-name="WEP Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wep_security_settings_ui_api/group"/>
-</component>
-<component name="wi-fi_protected_setup_ui_api" long-name="Wi-Fi Protected Setup UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
-</component>
-<component name="wlan_eap_settings_ui_api" long-name="WLAN EAP Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wlan_eap_settings_ui_api/group"/>
-</component>
-<component name="wpa_security_settings_ui_api" long-name="WPA Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wpa_security_settings_ui_api/group"/>
-</component>
-<component name="eap_vpn_api" long-name="EAP VPN API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
-</component>
-<component name="eapsim_db_api" long-name="EAP-SIM DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapsim_db_api/group"/>
-</component>
-<component name="eap_type_api" long-name="EAP Type API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_type_api/group"/>
-</component>
-<component name="eaptlspeap_db_api" long-name="EAP-TLS-PEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eaptlspeap_db_api/group"/>
-</component>
-<component name="eapleap_db_api" long-name="LEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapleap_db_api/group"/>
-</component>
-<component name="eapgtc_db_api" long-name="EAP-GTC DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapgtc_db_api/group"/>
-</component>
-<component name="eapmschapv2_db_api" long-name="EAP-MSCHAPV2 DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapmschapv2_db_api/group"/>
-</component>
-<component name="eapaka_db_api" long-name="EAP-AKA DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapaka_db_api/group"/>
-</component>
-<component name="wapi_db_api" long-name="WAPI DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_db_api/group"/>
-</component>
-</collection>
-<collection name="wlansecuritysettings" long-name="WLAN Security Settings" level="specific">
-<component name="wapisecuritysettingsui" filter="s60" long-name="WAPI Security Settings UI" introduced="9.1">
-<!-- the directory for this needs to be moved up to the right level -->
-<unit bldFile="mw/accesssec/wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
-</component>
-<component name="wepsecuritysettingsui" filter="s60" long-name="WEP Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wepsecuritysettingsui/group"/>
-</component>
-<component name="wifiprotectedsetup" filter="s60" long-name="WIFI Protected Setup" introduced="^1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wifiprotectedsetup/group"/>
-</component>
-<component name="wlaneapsettingsui" filter="s60" long-name="WLAN EAP Settings UI" introduced="9.3">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wlaneapsettingsui/group"/>
-</component>
-<component name="wpasecuritysettingsui" filter="s60" long-name="WPA Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wpasecuritysettingsui/group"/>
-</component>
-</collection>
-<collection name="eapol" long-name="EAPOL" level="framework">
-<component name="eapol_framework" filter="s60" long-name="EAPOL Framework" introduced="9.2">
-<unit bldFile="mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
-</component>
-</collection>
-</block>
-<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>
-<component name="bearer_settings_plugin_api" long-name="Bearer Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/bearer_settings_plugin_api/group"/>
-</component>
-<component name="commsdat_wlan_api" long-name="CommsDat WLAN API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/commsdat_wlan_api/group"/>
-</component>
-<component name="connection_monitor_extension_api" long-name="Connection Monitor Extension API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_monitor_extension_api/group"/>
-</component>
-<component name="connection_ui_utilities_api" long-name="Connection UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_ui_utilities_api/group"/>
-</component>
-<component name="disconnect_dialog_api" long-name="Disconnect Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_api/group"/>
-</component>
-<component name="disconnect_dialog_disable_api" long-name="Disconnect Dialog Disable API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_disable_api/group"/>
-</component>
-<component name="extended_connection_settings_api" long-name="Extended Connection Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/extended_connection_settings_api/group"/>
-</component>
-<component name="mpm_default_connection_api" long-name="MPM Default Connection API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_default_connection_api/group"/>
-</component>
-<component name="pdpcontextmanager2_reset_factory_settings_api" long-name="PDP Context Manager 2 Reset Factory Settings API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_settings_api/group"/>
-</component>
-<component name="mpm_connect_screen_api" long-name="MPM Connect Screen API" filter="s60" class="api">
-<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="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>
-<component name="access_point_engine_api" long-name="Access Point Engine API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_monitor_server_api/group"/>
-</component>
-<component name="connection_settings_ui_api" long-name="Connection Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_ui_api/group"/>
-</component>
-<component name="agent_dialog_api" long-name="Agent Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/agent_dialog_api/group"/>
-</component>
-<component name="extendedconnpref_api" long-name="Extended Connection Preferences API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/extendedconnpref_api/group"/>
-</component>
-</collection>
-<collection name="accesspointcontrol" long-name="Access Point Control" level="plugin">
-<component name="apcontrollistplugin" filter="s60" long-name="Access Point Control List Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
-</component>
-</collection>
-<collection name="alwayson_net_plugin" long-name="Always Online Net Plugin" level="server">
-<component name="pdpcontextmanager2" filter="s60" long-name="PDP Context Manager 2">
-<unit bldFile="mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
-</component>
-</collection>
-<collection name="apengine" long-name="Access Point Engine" level="framework">
-<component name="apeng" filter="s60" long-name="Access Point Engine">
-<unit bldFile="mw/ipconnmgmt/apengine/apeng/group"/>
-</component>
-<component name="apsettingshandlerui" filter="s60" long-name="Access Point Settings Handler UI">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingshandlerui/group"/>
-</component>
-<component name="apsettingsplugin" filter="s60" long-name="Access Point Settings Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="bearermanagement" long-name="Bearer Management" level="framework">
-<component name="mpm" filter="s60" long-name="Mobility Policy Manager">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/mpm/group"/>
-</component>
-<component name="extendedconnpref" filter="s60" long-name="Extended Connection Preferences">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/extendedconnpref/group"/>
-</component>
-<component name="s60mcpr" filter="s60" long-name="S60 Meta-Connection Provider" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/S60MCPR/group"/>
-</component>
-</collection>
-<collection name="cmmanager" long-name="Connection Method Manager" level="framework">
-<component name="cmmgr" filter="s60" long-name="CM Manager">
-<unit bldFile="mw/ipconnmgmt/cmmanager/cmmgr/group"/>
-</component>
-<component name="gsconnsettingsplugin" filter="s60" long-name="GS Connection Settings Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/cmmanager/gsconnsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="connectionmonitoring" long-name="Connection Monitoring" level="server">
-<component name="connectionmonitorplugin" filter="s60" long-name="Connection Monitor Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorplugin/group"/>
-</component>
-<component name="connectionmonitorui" filter="s60" long-name="Connection Monitor UI">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorui/group"/>
-</component>
-<component name="connmon" filter="s60" long-name="Connection Monitor">
-<!-- either split into two components, or #include from a common bld.inf -->
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/connectionmonitor/group"/>
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/dataconnectionlogger/group"/>
-</component>
-<component name="connmonext" filter="s60" long-name="Connection Monitor Extension API">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmonext/group"/>
-</component>
-</collection>
-<collection name="connectionutilities" long-name="Connection Utilities" level="utils">
-<component name="connectiondialogs" filter="s60" long-name="Connection Dialogs">
-<unit bldFile="mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/>
-</component>
-</collection>
-<collection name="dbcreator" long-name="DB Creator" level="utils">
-<component name="commsdatcreator" filter="s60" long-name="Comms Database Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
-</component>
-<component name="commsdatcreatorrfsplugin" filter="s60" long-name="Comms Database Creator RFS Plugin" introduced="9.3" plugin="Y">
-<!-- uncomment when config is turned on -->
-<!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
-</component>
-<component name="commsdatstartup" filter="s60" long-name="Comms Database Startup" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
-</component>
-<component name="dbcreatorexe" filter="s60" long-name="DB Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
-</component>
-<component name="dbcreator_build" filter="s60" long-name="DB Creator Build" introduced="9.3">
-<!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
-<unit bldFile="mw/ipconnmgmt/dbcreator/group"/>
-</component>
-</collection>
-<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"/>
-</component>
-<component name="ipcm_qt_build" long-name="IP Connectivity Management Qt Build" introduced="^4">
-<unit bldFile="mw/ipconnmgmt" proFile="ipconnmgmt.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</block>
-<block name="netprotocols" level="generic" long-name="High-level Internet Protocols" levels="plugin framework server generic specific">
-<collection name="netprotocols_plat" long-name="High-level Internet Protocols Platform Interfaces" level="specific">
-<component name="cookie_manager_api" long-name="Cookie Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/cookie_manager_api/group"/>
-</component>
-<component name="http_cache_mgr_api" long-name="HTTP Cache Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_cache_mgr_api/group"/>
-</component>
-<component name="http_filters_api" long-name="HTTP Filters API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_filters_api/group"/>
-</component>
-</collection>
-<collection name="httpfilters" long-name="HTTP Filters" level="plugin">
-<component name="httpfiltercommon" filter="s60" long-name="HTTP Filter Common">
-<unit bldFile="mw/netprotocols/httpfilters/httpfiltercommon/group"/>
-</component>
-<component name="cookie" filter="s60" long-name="Cookie Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/cookie/group"/>
-</component>
-<component name="deflatefilter" filter="s60" long-name="Deflate Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/deflatefilter/group"/>
-</component>
-<component name="httpfilteracceptheader" filter="s60" long-name="Accept Header Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteracceptheader/group"/>
-</component>
-<component name="httpfilterauthentication" filter="s60" long-name="Authentication Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterauthentication/group"/>
-</component>
-<component name="httpfilterconnhandler" filter="s60" long-name="Connection Handler Fitler" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterconnhandler/group"/>
-</component>
-<component name="httpfilteriop" filter="s60" long-name="HTTP IOP Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteriop/group"/>
-</component>
-<component name="httpfilterproxy" filter="s60" long-name="HTTP Proxy Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterproxy/group"/>
-</component>
-<component name="uaproffilter" filter="s60" long-name="UAProf Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/uaproffilter/group"/>
-</component>
-</collection>
-<collection name="applayerprotocols" long-name="Application Layer Protocols" level="server">
-<component name="httptransportfw" long-name="HTTP Transport Framework" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
-</component>
-<component name="httpexamples" long-name="HTTP Examples" introduced="6.2" purpose="development">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpexamples/group" mrp="mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
-</component>
-<component name="wappushsupport" long-name="WAP Push Support" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
-</component>
-<component name="wapbase" long-name="WAP Base" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wapbase/Group" mrp="mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
-</component>
-<component name="ftpengine" long-name="FTP Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/ftpengine/group" mrp="mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
-</component>
-<component name="telnetengine" long-name="Telnet Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/telnetengine/group" mrp="mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
-</component>
-<component name="httpserviceapi" long-name="HTTP Service API" introduced="TB9.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpservice/group" mrp="mw/netprotocols/applayerprotocols/httpservice/group/http_service.mrp"/>
-</component>
-</collection>
-<collection name="applayerpluginsandutils" long-name="Application Layer Plugins and Utils" level="framework">
-<component name="uripermissionservices" long-name="URI Permission Services" introduced="^2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
-</component>
-<component name="bookmarksupport" long-name="Bookmark Support" introduced="9.1" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
-</component>
-<component name="httpprotocolplugins" long-name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
-</component>
-<component name="httptransportplugins" long-name="HTTP Transport Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
-</component>
-</collection>
-<collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
-<component name="netprotocols_metadata" long-name="High-level Internet Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ipappprotocols" level="generic" long-name="IP App Protocols" levels="plugin conn server if">
-<collection name="ipappprotocols_plat" long-name="IP App Protocols Platform Interfaces" level="if">
-<component name="srtp_api" long-name="SRTP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/srtp_api/group"/>
-</component>
-<component name="rtprtcp_api" long-name="RTP/RTCP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/rtprtcp_api/group"/>
-</component>
-</collection>
-<collection name="rtp" long-name="RTP" level="server">
-<component name="srtpstack" filter="s60" long-name="SRTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/srtpstack/group"/>
-</component>
-<component name="rtpstack" filter="s60" long-name="RTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/rtpstack/group"/>
-</component>
-</collection>
-<collection name="realtimenetprots" long-name="Real Time Net Protocols" level="server">
-<component name="symrtp" long-name="RTP" introduced="9.0" purpose="optional">
-<!-- Real Time Data Protocol -->
-<unit bldFile="mw/ipappprotocols/realtimenetprots/rtp/group" mrp="mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
-</component>
-<component name="sipfw" long-name="SIP Framework" introduced="9.2" purpose="optional">
-<unit bldFile="mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp" version="2"/>
-</component>
-</collection>
-<collection name="sipplugins" long-name="SIP Plugins" level="plugin">
-<component name="sippwlanplugin" filter="s60" long-name="SIP WLAN Plugin" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
-</component>
-<component name="sippsipsettingsui" filter="s60" long-name="SIP Settings UI" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
-</component>
-<component name="sippdevmgmtsipadapter" filter="s60" long-name="Device Management SIP Settings Adapter" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
-</component>
-<component name="sippsystemstatemonitor" filter="s60" long-name="SIP System State Monitor" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsystemstatemonitor/group"/>
-</component>
-<component name="sippsipadapter" filter="s60" long-name="SIP Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipadapter/group"/>
-</component>
-</collection>
-<collection name="sipproviderplugins" long-name="SIP Provider Plugins" level="conn">
-<component name="sipprovider" long-name="SIP Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipproviderplugins/sipprovider/group" mrp="mw/ipappprotocols/sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
-</component>
-</collection>
-<collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="if">
-<component name="ipappprotocols_metadata" long-name="IP App Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wirelessacc" level="specific" long-name="Wireless Access" levels="framework generic ui">
-<collection name="hsfw_plat" long-name="HotSpot Framework Platform Interfaces" level="ui">
-<component name="hotspot_framework_client_api" long-name="HotSpot Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_api" long-name="Internet Connectivity Test Service API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_settings_api" long-name="Internet Connectivity Test Service Settings API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
-</component>
-<component name="hotspot_framework_client_plugin_api" long-name="HotSpot Framework Client Plugin API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
-</component>
-</collection>
-<collection name="hotspotfw" long-name="HotSpot Framework" level="framework">
-<component name="hsserver" filter="s60" long-name="HotSpot Server" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="hsclient" filter="s60" long-name="HotSpot Client" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="internetconnectivitytestservice" filter="s60" long-name="Internet Connectivity Test Service" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
-</component>
-<component name="ictsdialogs" filter="s60" long-name="Internet Connectivity Test Service Dialogs" deprecated="^3" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
-</component>
-<component name="hspluginforagent" filter="s60" long-name="HotSpot Plugin for Agent" plugin="Y" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
-</component>
-<component name="hsbrowser" filter="s60" long-name="HotSpot Browser" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
-</component>
-<component name="hotspotfw_build" filter="s60" long-name="Hotspot Framework Build">
-<!-- should break up this bld.inf into the above components, or collapse them all into a single component -->
-<unit bldFile="mw/wirelessacc/hotspotfw/group"/>
-</component>
-</collection>
-<collection name="wlanutilities" long-name="WLAN Utilities" level="generic">
-<component name="wlanutilities_build" long-name="WLAN Utilities Qt" introduced="^4" filter="s60">
-<!-- is this uinit needed, or is it sufficient to uncomment the units in the below components? -->
-<unit bldFile="mw/wirelessacc/wlanutilities" proFile="wlanutilities.pro" qmakeArgs="-r"/>
-</component>
-<component name="wlanqtutilities" filter="s60" long-name="WLAN Qt Utilities" introduced="^4" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlanplugin/group" qt:proFile="wlanqtutilities.pro"/>-->
-</component>
-<component name="wlansniffer" filter="s60" long-name="WLAN Sniffer" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlansettingsui/group" qt:proFile="wlansniffer.pro"/>-->
-</component>
-<component name="wlanentryplugin" filter="s60" long-name="WLAN Entry Plugin" plugin="Y" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlansniffer/group" qt:proFile="wlanentryplugin.pro"/>-->
-</component>
-<component name="wlanindicatorplugin" filter="s60" long-name="WLAN Indicator Plugin" plugin="Y" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlanindicatorplugin/group" qt:proFile="wlanindicatorplugin.pro"/>-->
-</component>
-<component name="cpwlansettingsplugin" filter="s60" long-name="WLAN Settings Control Panel Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="wlanutilities/cpwlansettingsplugin/group" qt:proFile="cpwlansettingsplugin.pro"/>-->
-</component>
-</collection>
-</block>
-<block name="vpnclient" level="specific" long-name="VPN Client" levels="engine ui api">
-<!-- is the !oem_build filter needed? -->
-<collection name="vpnc_plat" long-name="VPN Client Platform Interfaces" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API" class="api">
-<unit bldFile="mw/vpnclient/vpnc_plat/vpnapi/group"/>
-</component>
-</collection>
-<collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API">
-<unit bldFile="mw/vpnclient/vpnapiimpl/group"/>
-</component>
-</collection>
-<collection name="vpnengine" long-name="VPN Engine" level="engine">
-<!-- too many components in this collection.
- Probably best to group the binaries together into larger components
- or maybe split the collection into more reasonable groups -->
-<component name="eventmediatorapi" filter="s60" long-name="Event Mediator API">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediatorapi/group"/>
-</component>
-<component name="eventviewer" filter="s60" long-name="Event Viewer">
-<unit bldFile="mw/vpnclient/vpnengine/eventviewer/group"/>
-</component>
-<component name="vpnins" filter="s60" long-name="VPN Installer">
-<unit bldFile="mw/vpnclient/vpnengine/vpnins/group"/>
-</component>
-<component name="ikepolparser" filter="s60" long-name="IKE Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/ikepolparser/group"/>
-</component>
-<component name="utlbase64" filter="s60" long-name="Base64 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlbase64/group"/>
-</component>
-<component name="utlcrypto" filter="s60" long-name="Crypto Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlcrypto/group"/>
-</component>
-<component name="utlxml" filter="s60" long-name="XML Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlxml/group"/>
-</component>
-<component name="utlpkcs10" filter="s60" long-name="PKCS#10 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs10/group"/>
-</component>
-<component name="pkiserviceapi" filter="s60" long-name="PKI Service API">
-<unit bldFile="mw/vpnclient/vpnengine/pkiserviceapi/group"/>
-</component>
-<component name="ikecert" filter="s60" long-name="IKE Certificate Management">
-<unit bldFile="mw/vpnclient/vpnengine/ikecert/group"/>
-</component>
-<component name="kmdapi" filter="s60" long-name="Key Management Daemon API">
-<unit bldFile="mw/vpnclient/vpnengine/kmdapi/group"/>
-</component>
-<component name="kmdserver" filter="s60" long-name="Key Management Daemon Server">
-<unit bldFile="mw/vpnclient/vpnengine/kmdserver/group"/>
-</component>
-<component name="ikeutils" filter="s60" long-name="Internet Key Exchange Utils">
-<unit bldFile="mw/vpnclient/vpnengine/ikeutils/group"/>
-</component>
-<component name="ikev1lib" filter="s60" long-name="IKEv1 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev1lib/group"/>
-</component>
-<component name="ikev2lib" filter="s60" long-name="IKEv2 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev2lib/group"/>
-</component>
-<component name="vpnipsecpolparser" filter="s60" long-name="VPN IPsec Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/vpnipsecpolparser/group"/>
-</component>
-<component name="sit" filter="s60" long-name="Socket Interaction Thread">
-<unit bldFile="mw/vpnclient/vpnengine/sit/group"/>
-</component>
-<component name="vpntcwrapper" filter="s60" long-name="VPN Terminal Control Wrapper">
-<unit bldFile="mw/vpnclient/vpnengine/vpntcwrapper/group"/>
-</component>
-<component name="eventmediator" filter="s60" long-name="Event Mediator">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediator/group"/>
-</component>
-<component name="pkiservice" filter="s60" long-name="PKI Service">
-<unit bldFile="mw/vpnclient/vpnengine/pkiservice/group"/>
-</component>
-<component name="vpnconnagt" filter="s60" long-name="VPN Connection Agent">
-<unit bldFile="mw/vpnclient/vpnengine/vpnconnagt/group"/>
-</component>
-<component name="vpnmanager" filter="s60" long-name="VPN Manager">
-<unit bldFile="mw/vpnclient/vpnengine/vpnmanager/group"/>
-</component>
-<component name="vpncleaner" filter="s60" long-name="VPN Cleaner">
-<unit bldFile="mw/vpnclient/vpnengine/vpncleaner/group"/>
-</component>
-<component name="utlpkcs12" filter="s60" long-name="PKCS#12 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs12/group"/>
-</component>
-<component name="dmadengine" filter="s60" long-name="DM Adapter Engine">
-<unit bldFile="mw/vpnclient/vpnengine/dmadengine/group"/>
-</component>
-<component name="dmadipsecvpn" filter="s60" long-name="IPsec VPN DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadipsecvpn/group"/>
-</component>
-<component name="dmadpki" filter="s60" long-name="PKI DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadpki/group"/>
-</component>
-<component name="ikesocket" filter="s60" long-name="IKE Socket" introduced="^3">
-<unit bldFile="mw/vpnclient/vpnengine/ikesocket/group"/>
-</component>
-</collection>
-<collection name="vpnui" long-name="VPN UI" level="ui">
-<component name="vpnecomnotifier" filter="s60" long-name="VPN ECOM Notifier" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnecomnotifier/group"/>
-</component>
-<component name="vpndialogmanager" filter="s60" long-name="VPN Dialog Manager">
-<unit bldFile="mw/vpnclient/vpnui/vpndialogmanager/group"/>
-</component>
-<component name="vpnpolins" filter="s60" long-name="VPN Policy Installer">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolins/group"/>
-</component>
-<component name="vpnpolicyrecognizer" filter="s60" long-name="VPN Policy Recognizer" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolicyrecognizer/group"/>
-</component>
-</collection>
-<collection name="vpnclient_info" long-name="VPN Client Info" level="api">
-<component name="vpnclient_help" filter="s60" long-name="VPN Client Help">
-<unit bldFile="mw/vpnclient/help/group"/>
-</component>
-<component name="vpnclient_build" filter="s60" long-name="VPN Client Build">
-<!-- should split this up into the other components and remove this-->
-<unit bldFile="mw/vpnclient/group"/>
-</component>
-</collection>
-</block>
-<block name="ipappsrv" level="specific" long-name="IP App Services" levels="framework generic server conn plugin">
-<collection name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" level="plugin">
-<component name="transcoder_api" long-name="Transcoder API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
-</component>
-<component name="comms_event_api" long-name="Comms Event API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/comms_event_api/group"/>
-</component>
-<component name="floor_control_api" long-name="Floor Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/floor_control_api/group"/>
-</component>
-<component name="media_control_api" long-name="Media Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/media_control_api/group"/>
-</component>
-<component name="multimedia_comms_api" long-name="Multimedia Comms API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/multimedia_comms_api/group"/>
-</component>
-<component name="nat_settings_api" long-name="NAT Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/nat_settings_api/group"/>
-</component>
-</collection>
-<collection name="natfw" long-name="NAT Framework" level="framework">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="natfw_build" filter="s60" long-name="NAT Framework Build" introduced="^2">
-<unit bldFile="mw/ipappsrv/natfw/group"/>
-</component>
-</collection>
-<collection name="multimediacommscontroller" long-name="Multimedia Comms Controller" level="conn">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommscontroller_build" filter="s60" long-name="Multimedia Comms Controller Build">
-<unit bldFile="mw/ipappsrv/multimediacommscontroller/group"/>
-</component>
-</collection>
-<collection name="multimediacommsengine" long-name="Multimedia Comms Engine" level="generic">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommsengine_build" filter="s60" long-name="Multimedia Comms Engine Build">
-<unit bldFile="mw/ipappsrv/multimediacommsengine/group"/>
-</component>
-</collection>
-<collection name="natplugins" long-name="NAT Plugins" level="plugin">
-<component name="natpcliprovisioningnatfwadapter" filter="s60" long-name="Client Provisioning NAT Framework Traversal Adapter" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/group"/>
-</component>
-<component name="natpdevmgmtnatfwadapter" filter="s60" long-name="Device Management NAT Framework Traversal Adapter" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/group"/>
-</component>
-<component name="natptraversalcontroller" filter="s60" long-name="NAT Traversal Controller" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natptraversalcontroller/group"/>
-</component>
-<component name="natpnatfwsdpprovider" filter="s60" long-name="NAT Framework SDP Provider" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpnatfwsdpprovider/group"/>
-</component>
-</collection>
-<collection name="ipappsrv_info" long-name="IP App Services Info" level="plugin">
-<component name="ipappsrv_build" long-name="IP App Services Build" filter="s60">
-<!-- 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">
-<collection name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" level="specific">
-<component name="string_parser_api" long-name="String Parser API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/string_parser_api/group"/>
-</component>
-<component name="cbs_mcn_client_api" long-name="CBS MCN Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cbs_mcn_client_api/group"/>
-</component>
-<component name="converged_call_engine_api" long-name="Converged Call Engine API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_engine_api/group"/>
-</component>
-<component name="aiw_dial_data_consumer_api" long-name="AIW Dial Data Consumer API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/aiw_dial_data_consumer_api/group"/>
-</component>
-<component name="phone_client_ussd_api" long-name="Phone Client USSD API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_api/group"/>
-</component>
-<component name="sat_refresh_api" long-name="SAT Refresh API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_refresh_api/group" filter="!test"/>
-</component>
-<component name="network_handling_engine_api" long-name="Network Handling Engine API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/network_handling_engine_api/group"/>
-</component>
-<component name="phone_client_emergency_call_api" long-name="Phone Client Emergency Call API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/group"/>
-</component>
-<component name="sat_configuration_api" long-name="SAT Configuration API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_configuration_api/group"/>
-</component>
-<component name="dial_utils_api" long-name="Dial Utils API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/dial_utils_api/group"/>
-</component>
-<component name="phone_client_image_handler_api" long-name="Phone Client Image Handler API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_image_handler_api/group"/>
-</component>
-<component name="phone_client_messenger_api" long-name="Phone Client Messenger API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_messenger_api/group"/>
-</component>
-<component name="sat_client_api" long-name="SAT Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_client_api/group" filter="!test"/>
-</component>
-<component name="phone_client_api" long-name="Phone Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_api/group"/>
-</component>
-<component name="sat_service_api" long-name="SAT Service API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_service_api/group" filter="!test"/>
-</component>
-<component name="cbs_message_api" long-name="CBS Message API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cbs_message_api/group"/>
-</component>
-<component name="phone_client_server_information_api" long-name="Phone Client Server Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_server_information_api/group"/>
-</component>
-<component name="phone_client_ussd_internal_api" long-name="Phone Client USSD Internal API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_internal_api/group"/>
-</component>
-<component name="phone_client_command_handler_api" long-name="Phone Client Command Handler API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_command_handler_api/group"/>
-</component>
-<component name="phone_client_notify_api" long-name="Phone Client Notify API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_notify_api/group"/>
-</component>
-<component name="phone_client_utility_api" long-name="Phone Client Utility API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_utility_api/group"/>
-</component>
-<component name="telephony_network_information_api" long-name="Telephony Network Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_network_information_api/group"/>
-</component>
-<component name="secondary_display_sat_api" long-name="Secondary Display SAT API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/secondary_display_sat_api/group"/>
-</component>
-<component name="callui_reconnect_query_api" long-name="CallUI Reconnect Query API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/callui_reconnect_query_api/group"/>
-</component>
-<component name="service_provider_settings_api" long-name="Service Provider Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/service_provider_settings_api/group"/>
-</component>
-<component name="converged_call_provider_api" long-name="Converged Call Provider API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_provider_api/group"/>
-</component>
-<component name="incoming_call_monitor_api" long-name="Incoming Call Monitor API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/incoming_call_monitor_api/group"/>
-</component>
-<component name="default_emergency_numbers_api" long-name="Default Emergency Numbers API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/default_emergency_numbers_api/group"/>
-</component>
-<component name="cenrep_database_api" long-name="Central Repository Database API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cenrep_database_api/group"/>
-</component>
-<component name="ss_settings_api" long-name="SS Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/ss_settings_api/group"/>
-</component>
-<component name="phone_settings_observer_api" long-name="Phone Settings Observer API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_observer_api/group"/>
-</component>
-<component name="phone_settings_notes_ui_api" long-name="Phone Settings Notes UI API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_notes_ui_api/group"/>
-</component>
-<component name="phone_settings_api" long-name="Phone Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_api/group"/>
-</component>
-<component name="voice_mailbox_number_api" long-name="Voice Mailbox Number API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_number_api/group"/>
-</component>
-<component name="voice_mailbox_settings_api" long-name="Voice Mailbox Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_settings_api/group"/>
-</component>
-<component name="call_information_api" long-name="Call Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/call_information_api/group" filter="!test"/>
-</component>
-<component name="call_remote_party_information_api" long-name="Call Remote Party Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/call_remote_party_information_api/group" filter="!test"/>
-</component>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_mediator_api/group" filter="!test"/>
-</component>
-<component name="dialpad_api" long-name="Dialpad API" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/dialpad_api/group"/>
-</component>
-</collection>
-<collection name="cellular" long-name="Cellular" level="server">
-<component name="telephonysettings" filter="s60" long-name="Telephony Settings" purpose="development"/>
-<component name="sssettings" filter="s60" long-name="Supplementary Service Settings" purpose="development"/>
-<component name="psetnotesui" filter="s60" long-name="Phone Settings Notes UI" purpose="development"/>
-</collection>
-<collection name="convergedcallengine" long-name="Converged Call Engine" level="framework">
-<component name="cce" filter="s60" long-name="CCE" purpose="development"/>
-<component name="spsettings" filter="s60" long-name="Service Provider Settings" purpose="development"/>
-</collection>
-<collection name="phoneclientserver" long-name="Phone Client/Server" level="server">
-<component name="aiwdialdata" filter="s60" long-name="AIW Dial Data" purpose="development"/>
-<component name="dialutils" filter="s60" long-name="Dial Utils" purpose="development"/>
-<component name="phoneclient" filter="s60" long-name="Phone Client" purpose="development"/>
-</collection>
-<collection name="phonesrv_info" long-name="Phone Server Info" level="generic">
-<component name="phonesrv_build" long-name="Phone Server Build" filter="s60">
-<unit bldFile="mw/phonesrv" proFile="phonesrv.pro"/>
-</component>
-</collection>
-</block>
-<block name="messagingmw" level="specific" long-name="Messaging Middleware" levels="stack support fw api">
-<collection name="msgfw_plat" long-name="Messaging Middleware Platform Interfaces" level="api">
-<component name="always_online_plugin_api" long-name="Always Online Plugin API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_plugin_api/group"/>
-</component>
-<component name="always_online_client_api" long-name="Always Online Client API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_client_api/group"/>
-</component>
-<component name="msg_common_utils_api" long-name="Messaging Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/msg_common_utils_api/group"/>
-</component>
-<component name="muiu_utils_api" long-name="Messaging Center UI Utilities API" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/muiu_utils_api/group"/>
-</component>
-</collection>
-<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" class="config">
-<unit bldFile="mw/messagingmw/msgbranched/group"/>
-</component>
-</collection>
-<collection name="messagingfw" long-name="Messaging Framework" level="fw">
-<!-- should break this collection up into smaller related collections -->
-<component name="send_ui_api" long-name="Send UI API" filter="s60" deprecated="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/send_ui_api/group"/>
-</component>
-<component name="send_ui_plugin_api" long-name="Send UI Plug-in API" filter="s60" deprecated="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/send_ui_plugin_api/group"/>
-</component>
-<component name="send_ui_datautils_api" long-name="Send UI Data Utils API" filter="s60" deprecated="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/send_ui_datautils_api/group"/>
-</component>
-<component name="alwaysonline" filter="s60" long-name="Always Online Server" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/alwaysonline/group"/>
-</component>
-<component name="msgcommonutils" filter="s60" long-name="Messaging Common Utils" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/msgcommonutils/group"/>
-</component>
-<component name="senduiservices" filter="s60" long-name="Send UI Services" introduced="^2" deprecated="^4">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/senduiservices/group"/>
-</component>
-<component name="muiuutils" long-name="Messaging Center UI Utilities" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/muiuutils/group"/>
-</component>
-<component name="scheduledsendmtm" long-name="Scheduled Send MTM" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/group" mrp="mw/messagingmw/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
-</component>
-<component name="msgsrvnstore" long-name="Message Server and Store" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/group" mrp="mw/messagingmw/messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
-</component>
-<component name="biomsgfw" long-name="BIO Messaging Framework" introduced="6.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/group" mrp="mw/messagingmw/messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
-</component>
-<component name="msgconf" long-name="Messaging Config" introduced="^2" purpose="optional" class="config">
-<unit bldFile="mw/messagingmw/messagingfw/msgconf/group" mrp="mw/messagingmw/messagingfw/msgconf/group/messaging_config.mrp"/>
-</component>
-<component name="watcherfw" long-name="Watcher Framework" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/watcherfw/group" mrp="mw/messagingmw/messagingfw/watcherfw/group/messaging_watcher.mrp"/>
-</component>
-<component name="msgtest" long-name="Messaging Test" purpose="development">
-<unit bldFile="mw/messagingmw/messagingfw/msgtest/group" mrp="mw/messagingmw/messagingfw/msgtest/group/messaging_test.mrp"/>
-</component>
-<component name="sendas" long-name="Send As" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/sendas/group" mrp="mw/messagingmw/messagingfw/sendas/group/messaging_sendas2.mrp"/>
-</component>
-<component name="msgurlhandler" long-name="Message URL Handler" introduced="7.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/group" mrp="mw/messagingmw/messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
-</component>
-<component name="wappushfw" long-name="WAP Push Framework" introduced="6.1" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/wappushfw/group" mrp="mw/messagingmw/messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
-</component>
-<component name="suplsmshandler" long-name="SUPL SMS Handler" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplsmshandler/group" mrp="mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/>
-</component>
-<component name="suplwappushhandler" long-name="SUPL WAP Push Handler" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
-</component>
-</collection>
-<collection name="messagingmw_info" long-name="Messaging Middleware Info" level="api">
-<component name="messagingmw_metadata" long-name="Messaging Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="imsrv" level="specific" long-name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
-<collection name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" level="specific">
-<component name="ximp_core_data_model_api" long-name="XIMP Core Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_host_api" long-name="XIMP Presence Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_presence_data_model_api" long-name="XIMP Presence Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_api" long-name="XIMP Presence Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_presence_management_api" long-name="XIMP Presence Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_management_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_host_api" long-name="XIMP Core Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_core_management_api" long-name="XIMP Core Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_management_api/group"/>
-</component>
-<component name="ximp_presence_base_api" long-name="XIMP Presence Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_base_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_api" long-name="XIMP Core Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_core_base_api" long-name="XIMP Core Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_base_api/group"/>
-</component>
-<component name="ximp_presence_cache_api" long-name="XIMP Presence Cache API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_cache_api/group"/>
-</component>
-<component name="ximp_core_feature_plugin_api" long-name="XIMP Core Feature Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_host_api" long-name="XIMP IM Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_im_data_model_api" long-name="XIMP IM Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_data_model_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_api" long-name="XIMP IM Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_im_management_api" long-name="XIMP IM Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_management_api/group"/>
-</component>
-<component name="ximp_im_base_api" long-name="XIMP IM Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_base_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_host_api" long-name="XIMP Search Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_search_data_model_api" long-name="XIMP Search Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_data_model_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_api" long-name="XIMP search Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_search_management_api" long-name="XIMP Search Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_management_api/group"/>
-</component>
-<component name="ximp_search_base_api" long-name="XIMP Search Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_base_api/group"/>
-</component>
-<component name="xmpp_settings_api" long-name="XMPP Settings API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/group"/>
-</component>
-<component name="im_cache_client_api" long-name="IM Cache Client API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/im_cache_client_api/group"/>
-</component>
-<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 Avability Text" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
-</component>
-</collection>
-<collection name="ximpfw" long-name="XIMP Framework" level="framework">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="ximpfw_build" filter="s60" long-name="XIMP Framework Build">
-<unit bldFile="mw/imsrv/ximpfw/group"/>
-</component>
-</collection>
-<collection name="imservices" long-name="IM Services" level="generic">
-<component name="imfeatureplugin" filter="s60" long-name="IM Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/imfeatureplugin/group"/>
-</component>
-<component name="searchfeatureplugin" filter="s60" long-name="Search Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/searchfeatureplugin/group"/>
-</component>
-<component name="xmppsettingsapi" filter="s60" long-name="XMPP Settings API" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsapi/group"/>
-</component>
-<component name="xmppsettingsfetcher" filter="s60" long-name="XMPP Settings Fetcher" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/group"/>
-</component>
-<component name="instantmessagingcache" filter="s60" long-name="Instant Messaging Cache" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/instantmessagingcache/group"/>
-</component>
-</collection>
-<collection name="brandingserver" long-name="Branding Server" level="specific">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="brandingserver_build" filter="s60" long-name="Branding Server Build">
-<unit bldFile="mw/imsrv/brandingserver/group"/>
-</component>
-</collection>
-</block>
-<block name="legacypresence" level="specific" long-name="Legacy Presence Services" levels="engine fw ui">
-<collection name="pressrv_plat" long-name="Legacy Presence Services Platform Interfaces" level="ui">
-<component name="presence_list_api" long-name="Presence List API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/presence_list_api/group"/>
-</component>
-<component name="watcher_info_api" long-name="Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_info_api/group"/>
-</component>
-<component name="simple_documents_api" long-name="SIMPLE Documents API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_documents_api/group"/>
-</component>
-<component name="authorization_api" long-name="Authorization API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/authorization_api/group"/>
-</component>
-<component name="xdm_protocol_plugin_api" long-name="XDM Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_protocol_plugin_api/group"/>
-</component>
-<component name="watcher_api" long-name="Watcher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_api/group"/>
-</component>
-<component name="xdm_api" long-name="XDM API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_api/group"/>
-</component>
-<component name="registration_api" long-name="Registration API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/registration_api/group"/>
-</component>
-<component name="publisher_api" long-name="Publisher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/publisher_api/group"/>
-</component>
-<component name="messaging_connection_manager_api" long-name="Messaging Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/messaging_connection_manager_api/group"/>
-</component>
-<component name="xdm_settings_api" long-name="XDM Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_settings_api/group"/>
-</component>
-<component name="simple_settings_api" long-name="SIMPLE Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_settings_api/group"/>
-</component>
-<component name="simple_instant_msg_api" long-name="Simple Instant Msg API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_instant_msg_api/group"/>
-</component>
-</collection>
-<collection name="xdmengine" long-name="XDM Engine" level="engine">
-<!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
-<component name="xdmengine_build" filter="s60" long-name="XDM Engine Build">
-<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">
-<unit bldFile="mw/legacypresence/xdmprotocols/group"/>
-</component>
-</collection>
-<collection name="msgconnmanager" long-name="Messaging Connection Manager" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="msgconnmanager_build" filter="s60" long-name="Messaging Connection Manager Build">
-<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">
-<unit bldFile="mw/legacypresence/simpleengine/group"/>
-</component>
-</collection>
-<collection name="presencefwsimpleadpt" long-name="Presence Framework SIMPLE Adaptation" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="simpleplugin" filter="s60" long-name="SIMPLE Plugin" plugin="Y">
-<unit bldFile="mw/legacypresence/presencefwsimpleadpt/group"/>
-</component>
-</collection>
-<collection name="simpledatamodeladapter" long-name="SIMPLE Data Model Adapter" level="fw">
-<component name="presenceplugin" filter="s60" long-name="Presence Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/legacypresence/simpledatamodeladapter/group"/>
-</component>
-</collection>
-</block>
-<block name="opensrv" level="specific" long-name="Open Services" levels="prt lib server eng">
-<collection name="opensrv_plat" long-name="Open Services Platform Interfaces" level="eng">
-<component name="messagequeue_api" long-name="Message Queue API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/opensrv/opensrv_plat/messagequeue_api/group"/>
-</component>
-</collection>
-<collection name="loudmouth" long-name="Loudmouth" level="prt">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="loudmouth_build" filter="s60" long-name="Loudmouth Build" introduced="^2">
-<unit bldFile="mw/opensrv/loudmouth/group"/>
-</component>
-</collection>
-<collection name="libtelepathy" long-name="Telepathy Library" level="lib">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="libtelepathy_build" filter="s60" long-name="Telepathy Library Build" introduced="^2">
-<unit bldFile="mw/opensrv/libtelepathy/group"/>
-</component>
-</collection>
-<collection name="telepathygabble" long-name="Telepathy Gabble" level="eng">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="telepathygabble_build" filter="s60" long-name="Telepathy Gabble Build" introduced="^2">
-<unit bldFile="mw/opensrv/telepathygabble/group"/>
-</component>
-</collection>
-<collection name="isolationserver" long-name="Isolation Server" level="server">
-<component name="messagequeue" filter="s60" long-name="Message Queue" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/messagequeue/group"/>
-</component>
-<component name="isoserver" filter="s60" long-name="ISO Server" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/isoserver/group"/>
-</component>
-<component name="isolationserver_build" filter="s60" long-name="Isloation Server Build" introduced="^2">
-<!-- needs #includes removed. either move the exports to another component or make this a ROM component -->
-<unit bldFile="mw/opensrv/isolationserver/group"/>
-</component>
-</collection>
-</block>
-<block name="searchsrv" level="specific" long-name="Search Services" levels="services engine generic api">
-<collection name="searchsrv_plat" long-name="Search Services Platform Interfaces" level="api">
-<component name="cpix_utility_api" long-name="CPIX Utility API" filter="s60" class="api">
-<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_utility_api/group"/>
-</component>
-<component name="cpix_framework_api" long-name="CPIX Framework API" filter="s60" class="api">
-<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_framework_api/group"/>
-</component>
-<component name="cpix_search_api" long-name="CPIX Search API" filter="s60" class="api">
-<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_search_api/group"/>
-</component>
-</collection>
-<collection name="searchengine" long-name="Search Engine" level="engine">
-<component name="searchengine_util" long-name="Search Engine Utils" filter="s60">
-<unit bldFile="mw/searchsrv/searchengine/util/group"/>
-</component>
-<component name="searchengine_oss" long-name="Search Engine OSS" filter="s60">
-<unit bldFile="mw/searchsrv/searchengine/oss/group"/>
-</component>
-<component name="cpix" long-name="Cross Platform Indexing Engine" filter="s60">
-<unit bldFile="mw/searchsrv/searchengine/cpix/group"/>
-</component>
-</collection>
-<collection name="searcher" long-name="Searcher" level="generic">
-<component name="searchclient" long-name="Search Client" filter="s60">
-<unit bldFile="mw/searchsrv/searcher/SearchClient/group"/>
-</component>
-<component name="searchserver" long-name="Search Server" filter="s60">
-<unit bldFile="mw/searchsrv/searcher/SearchServer/group"/>
-</component>
-<component name="searcher_test" long-name="Searcher Tests" filter="s60" purpose="development">
-<!-- #include from common bld.inf or split into two components -->
-<unit bldFile="mw/searchsrv/searcher/tsrc/RobustnessTest/group"/>
-<unit bldFile="mw/searchsrv/searcher/tsrc/LogPlayer/group"/>
-</component>
-</collection>
-<collection name="searchsrv_harvester" long-name="Search Services Harvester" level="services">
-<component name="searchsrv_pluginfw" long-name="Search Server" filter="s60">
-<unit bldFile="mw/searchsrv/harvester/pluginfw/group"/>
-</component>
-<component name="searchsrv_harvesterserver" long-name="Search Harvester Server" filter="s60">
-<unit bldFile="mw/searchsrv/harvester/HarvesterServer/group"/>
-</component>
-</collection>
-<collection name="searchsrv_watchdog" long-name="Search Services Watch Dog" level="services">
-<component name="searchsrv_watchdog_build" long-name="Search Services Watch Dog Build" filter="s60">
-<unit bldFile="mw/searchsrv/WatchDog/group"/>
-</component>
-</collection>
-<collection name="qcpix" long-name="Qt CPIX" level="engine">
-<component name="qcpix_build" long-name="Qt CPIX Build">
-<unit bldFile="mw/searchsrv/qcpix" proFile="qcpix.pro"/>
-</component>
-</collection>
-<collection name="searchsrv_info" long-name="Search Services Info">
-<component name="searchsrv_build" long-name="Search Services Build">
-<!-- move exports to own component and remove this -->
-<unit bldFile="mw/searchsrv/group"/>
-</component>
-</collection>
-</block>
-<block name="remotemgmt" level="specific" long-name="Remote Management" levels="plugin framework server generic specific">
-<collection name="remotemgmt_pub" long-name="Remote Management Public Interfaces" level="specific">
-<component name="synchronization_capability_api" long-name="Synchronization Capability API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
-</component>
-</collection>
-<collection name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" level="specific">
-<component name="common_agent_util_and_definitions_api" long-name="Common Agent util and definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
-</component>
-<component name="policy_management_certificate_api" long-name="Policy Management Certificate API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/group"/>
-</component>
-<component name="oma_provisioning_adapter_api" long-name="OMA Provisioning Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_adapter_api/group"/>
-</component>
-<component name="device_management_parameter_api" long-name="Device Management Parameter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_parameter_api/group"/>
-</component>
-<component name="data_synchronization_plugin_api" long-name="Data Synchronization Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/group"/>
-</component>
-<component name="sync_alert_handler_api" long-name="Sync Alert Handler API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
-</component>
-<component name="syncml_notifier_api" long-name="SyncML Notifier API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
-</component>
-<component name="syncml_client_api" long-name="SyncML Client API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
-</component>
-<component name="device_management_plugin_api" long-name="Device Management plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_plugin_api/group"/>
-</component>
-<component name="dm_tree_apis" long-name="DM Tree APIs" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
-</component>
-<component name="terminal_security_device_lock_api" long-name="Terminal Security Device Lock API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/group"/>
-</component>
-<component name="policy_management_request_api" long-name="Policy Management Request API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/group"/>
-</component>
-<component name="ds_constant_definitions_api" long-name="DS Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_constant_definitions_api/group"/>
-</component>
-<component name="scp_server_api" long-name="SCP Server API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/group"/>
-</component>
-<component name="data_synchronization_notification_api" long-name="Data Synchronization Notification API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_notification_api/group"/>
-</component>
-<component name="oma_provisioning_engine_api" long-name="OMA Provisioning Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/group"/>
-</component>
-<component name="dm_utils_api" long-name="DM Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/group"/>
-</component>
-<component name="syncml_alert_api" long-name="SyncML Alert API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/group"/>
-</component>
-<component name="obex_client_session_api" long-name="OBEX Client session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/obex_client_session_api/group"/>
-</component>
-<component name="setting_enforcement_info_api" long-name="Setting Enforcement Info API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/group"/>
-</component>
-<component name="dm_constant_definitions_api" long-name="DM Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
-</component>
-<component name="oma_ds_extensions_api" long-name="OMA DS Extensions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
-</component>
-<component name="pnpms_utils_api" long-name="PNPMS Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
-</component>
-<component name="diagnostics_plugin_utility_api" long-name="Diagnostics Plugin Utility API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
-</component>
-<component name="diagnostics_plugin_api" long-name="Diagnostics Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
-</component>
-<component name="diagnostics_framework_api" long-name="Diagnostics Framework API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
-</component>
-<component name="diagnostics_results_api" long-name="Diagnostics Results API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
-</component>
-<component name="diagnostics_plugin_pool_api" long-name="Diagnostics Plugin Pool API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
-</component>
-<component name="adaptive_history_list_api" long-name="Adaptive History List API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
-</component>
-<component name="adaptive_history_list_session_api" long-name="Adaptive History List Session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
-</component>
-<component name="fota_engine_api" long-name="FOTA Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
-</component>
-<component name="update_package_storage_plugin_api" long-name="Update Package Storage Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
-</component>
-<component name="syncml_notifier_roaming_api" long-name="SyncML Notifier Roaming API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
-</component>
-<component name="sync_service_api" long-name="Sync Service API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_service_api/group"/>
-</component>
-<component name="dcmo_adapter_api" long-name="DCMO Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_adapter_api/group"/>
-</component>
-<component name="dcmo_control_api" long-name="DCMO Control API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_control_api/group"/>
-</component>
-<component name="ds_capability_mgmt_plugin_api" long-name="DS Capability Management Plugin API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
-</component>
-</collection>
-<collection name="policymanagement" long-name="Policy Management" level="generic">
-<component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">
-<unit bldFile="mw/remotemgmt/policymanagement/pmdmadapter/group"/>
-</component>
-<component name="dmutilserver" filter="s60" long-name="DM Util Server">
-<unit bldFile="mw/remotemgmt/policymanagement/dmutilserver/group"/>
-</component>
-<component name="policyengine" filter="s60" long-name="Policy Engine">
-<unit bldFile="mw/remotemgmt/policymanagement/policyengine/group" filter="!dfs_build"/>
-</component>
-<component name="policymanagement_build" filter="s60" long-name="Policy Management Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/policymanagement/group"/>
-</component>
-</collection>
-<collection name="syncmlfw" long-name="SyncML Framework" level="server">
-<component name="syncmlfw_build" filter="s60" long-name="SyncML Framework Build">
-<!-- need to break this up into components. Too convoluted a structure to be in a single bld.inf-->
-<unit bldFile="mw/remotemgmt/syncmlfw/group"/>
-</component>
-</collection>
-<collection name="terminalsecurity" long-name="Terminal Security" level="specific">
-<component name="scp" filter="s60" long-name="Security Code Proxy">
-<!-- can only have one unit, need to have these #included from a single bld.inf -->
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpdatabase/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpserver/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scppatternplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scphistoryplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scptimestampplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpeventhandler/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/dmeventnotifier/group"/>
-</component>
-<component name="terminalsecurity_client" filter="s60" long-name="Terminal Control Client">
-<unit bldFile="mw/remotemgmt/terminalsecurity/client/group"/>
-</component>
-<component name="terminalsecurity_server" filter="s60" long-name="Terminal Control Server">
-<unit bldFile="mw/remotemgmt/terminalsecurity/server/group"/>
-</component>
-<component name="tcadapter" filter="s60" long-name="Terminal Control Adapter">
-<unit bldFile="mw/remotemgmt/terminalsecurity/tcadapter/bld"/>
-</component>
-<component name="terminalsecurity_build" filter="s60" long-name="Terminal Security Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/terminalsecurity/group"/>
-</component>
-</collection>
-<collection name="omaprovisioning" long-name="OMA Provisioning" level="specific">
-<component name="pnputil" filter="s60" long-name="PnP Util">
-<unit bldFile="mw/remotemgmt/omaprovisioning/pnputil/group"/>
-</component>
-<component name="provisioning" filter="s60" long-name="Provisioning">
-<unit bldFile="mw/remotemgmt/omaprovisioning/provisioning/group"/>
-</component>
-</collection>
-<collection name="devicediagnosticsfw" long-name="Device Diagnostics Framework" level="framework">
-<component name="diagframework" filter="s60" long-name="Diagnostics Framework">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
-</component>
-<component name="diagpluginbase" filter="s60" long-name="Diagnostics Plugin Base">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
-</component>
-<component name="diagresultsdb" filter="s60" long-name="Diagnostics Results Database">
-<!-- can only have one unit, merge or split into two components -->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
-</component>
-<component name="devicediagnosticsfw_build" filter="s60" long-name="Device Diagnostics Framework Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/group"/>
-</component>
-</collection>
-<collection name="dcmofw" long-name="Device Capability Management Object Framework" level="framework">
-<component name="dcmoclient" filter="s60" long-name="DCMO Client">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoclient/group"/>
-</component>
-<component name="dcmoserver" filter="s60" long-name="DCMO Server">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoserver/group"/>
-</component>
-<component name="dcmocustcmd" filter="s60" long-name="DCMO Custom Commands">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmocustcmd/group"/>
-</component>
-<component name="dcmofw_build" filter="s60" long-name="DCMO Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/dcmofw/group"/>
-</component>
-</collection>
-<collection name="fotaapplication" long-name="FOTA Application" level="generic">
-<component name="fotaapplication_build" filter="s60" long-name="FOTA Application Build">
-<!-- remove this component when configuration is in place and the #ifdefs have been worked out -->
-<unit bldFile="mw/remotemgmt/fotaapplication/group"/>
-</component>
-<component name="fotaserver" filter="s60" long-name="FOTA Server">
-<!-- uncomment when #ifdefs are resolved -->
-<!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
-</component>
-<component name="fotacustcmds" filter="s60" long-name="FOTA Custom Commands" class="placeholder">
-<!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
-<!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
-</component>
-</collection>
-</block>
-<block name="remoteconn" level="generic" long-name="Remote Connectivity" levels="plugin framework server generic specific">
-<collection name="remoteconn_info" long-name="Remote Connectivity Info" level="specific">
-<component name="remoteconn_metadata" long-name="Remote Connectivity Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mtptransports" long-name="MTP Transports" level="plugin">
-<component name="mtpusbtransport" long-name="MTP USB Transport" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpusbtransport/group" mrp="mw/remoteconn/mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
-</component>
-<component name="mtpptpiptransport" long-name="MTP PTP-IP Transport" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpptpiptransport/group" mrp="mw/remoteconn/mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
-</component>
-<component name="mtpcontroller" long-name="MTP Controller" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpcontroller/group" mrp="mw/remoteconn/mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
-</component>
-</collection>
-<collection name="mtpfws" long-name="MTP Frameworks" level="framework">
-<component name="mtpfw" long-name="MTP Framework" introduced="^2" purpose="optional">
-<unit bldFile="mw/remoteconn/mtpfws/mtpfw/group" mrp="mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/>
-</component>
-</collection>
-<collection name="mtpdataproviders" long-name="MTP Data Providers" level="generic">
-<component name="mtpfileandfolderdp" long-name="MTP File and Folder Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group" mrp="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
-</component>
-<component name="mtpimagedp" long-name="MTP Image Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpimagedp/group" mrp="mw/remoteconn/mtpdataproviders/mtpimagedp/group/mtp_imagedp.mrp"/>
-</component>
-<component name="mtppictbridgedp" long-name="MTP PictBridge Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group" mrp="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group/mtp_pictbridgedp.mrp"/>
-</component>
-</collection>
-<collection name="backupandrestore" long-name="Backup and Restore" level="specific">
-<component name="backupengine" long-name="Backup Engine" introduced="9.0" purpose="optional">
-<unit bldFile="mw/remoteconn/backupandrestore/backupengine/group" mrp="mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
-</component>
-<component name="backuptest" long-name="Backup Test" introduced="^2" purpose="development">
-<unit bldFile="mw/remoteconn/backupandrestore/backuptest/group" mrp="mw/remoteconn/backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
-</component>
-</collection>
-<collection name="obex" long-name="OBEX" level="generic">
-<component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexprotocol/group" mrp="mw/remoteconn/obex/obexprotocol/group/obex.mrp"/>
-</component>
-<component name="obexextensionapi" long-name="OBEX Extension API" introduced="9.2" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexextensionapi/group" mrp="mw/remoteconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
-</component>
-</collection>
-</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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<unit mrp="mw/srvdiscovery/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="dlnasrv" level="specific" long-name="DLNA Services" levels="stack server ctrl framework plugin">
-<!-- uncomment all the units when configuration is in place, they're currently #included from other xxx_build components -->
-<collection name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" level="plugin">
-<component name="upnp_media_server_settings_api" long-name="UPnP Media Server Settings API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_settings_api/group"/>
-</component>
-<component name="upnp_av_objects_api" long-name="UPnP A/V Objects API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_av_objects_api/group"/>
-</component>
-<component name="upnp_media_server_api" long-name="UPnP Media Server API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_api/group"/>
-</component>
-<component name="upnp_security_plugin_api" long-name="UPnP Security Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_security_plugin_api/group"/>
-</component>
-<component name="upnp_avcp_api" long-name="UPnP AVCP API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_avcp_api/group"/>
-</component>
-<component name="upnp_media_server_metadata_api" long-name="UPnP Media Server Metadata API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_metadata_api/group"/>
-</component>
-<component name="upnp_command_api" long-name="UPnP Command API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_command_api/group"/>
-</component>
-<component name="upnp_plugin_api" long-name="UPnP Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_plugin_api/group"/>
-</component>
-</collection>
-<collection name="upnpavcontrolpoint" long-name="UPnP A/V Control Point" level="plugin">
-<component name="avcontrolframework" filter="s60" long-name="A/V Control Famework" introduced="9.1" deprecated="^3">
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
-</component>
-<component name="upnpavcontrolpoint_build" filter="s60" long-name="UPnP A/V Control Point Build" introduced="9.1" deprecated="^3">
-<!-- put exports in other component instead -->
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/group"/>
-</component>
-</collection>
-<collection name="upnpmediaserver" long-name="UPnP Media Server" level="server">
-<component name="avobjects" filter="s60" long-name="A/V Objects">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/avobjects/group"/>
-</component>
-<component name="mediaserverclient" filter="s60" long-name="Media Server Client">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverclient/group"/>
-</component>
-<component name="connectionmanagerservice" filter="s60" long-name="Connection Manager Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/connectionmanagerservice/group"/>
-</component>
-<component name="contentdirectoryservice" filter="s60" long-name="Content Directory Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/contentdirectoryservice/group"/>
-</component>
-<component name="mediaserverengine" filter="s60" long-name="Media Server Engine">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverengine/group"/>
-</component>
-<component name="upnpmediaserver_build" filter="s60" long-name="UPnP Media Server Build">
-<!-- move exports into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpmediaserver/group"/>
-</component>
-</collection>
-<collection name="upnpavcontroller" long-name="UPnP A/V Controller" level="ctrl">
-<component name="upnpxmlparser" filter="s60" long-name="UPnP XML Parser" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpxmlparser/group"/>
-</component>
-<component name="upnpavcontrollerserver" filter="s60" long-name="UPnP A/V Controller Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerserver/group"/>
-</component>
-<component name="upnpavcontrollerclient" filter="s60" long-name="UPnP A/V Ccontroller Client" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerclient/group"/>
-</component>
-<component name="upnpavcontrollerhelper" filter="s60" long-name="UPnP A/V Controller Helper" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerhelper/group"/>
-</component>
-<component name="upnpavcontroller_build" filter="s60" long-name="UPnP A/V Controller Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpavcontroller/group"/>
-</component>
-</collection>
-<collection name="upnpframework" long-name="UPnP Framework" level="framework">
-<component name="upnputilities" filter="s60" long-name="UPnP Utilities" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnputilities/group"/>
-</component>
-<component name="upnpextensionpluginif" filter="s60" long-name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpextensionpluginif/group"/> -->
-</component>
-<component name="upnpfiletransferengine" filter="s60" long-name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>-->
-</component>
-<component name="upnpcommonui" filter="s60" long-name="UPnP Common UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpcommonui/group"/>-->
-</component>
-<component name="upnpaiwengine" filter="s60" long-name="UPnP AIW Engine" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpaiwengine/group"/> -->
-</component>
-<component name="upnpaiwprovider" filter="s60" long-name="UPnP AIW Provider" introduced="^2" deprecated="^3" plugin="Y">
-<!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
-</component>
-<component name="upnpmusicadapter" filter="s60" long-name="UPnP Music Adapter" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
-</component>
-<component name="upnpcommand" filter="s60" long-name="UPnP Command" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpcommand/group"/>
-</component>
-<component name="upnpframework_build" filter="s60" long-name="UPnP Framework Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpframework/group"/>
-</component>
-</collection>
-<collection name="upnpsettings" long-name="UPnP Settings" level="framework">
-<component name="upnpsettingsengine" filter="s60" long-name="UPnP Settings Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
-</component>
-<component name="multiselectionui" filter="s60" long-name="Multi-Selection UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/multiselectionui/group"/>-->
-</component>
-<component name="appwizard" filter="s60" long-name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/appwizard/group"/>-->
-</component>
-<component name="upnpsharingui" filter="s60" long-name="UPnP Sharing UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
-</component>
-<component name="upnpgsplugin" filter="s60" long-name="UPnP GS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
-</component>
-<component name="upnpsettings_build" filter="s60" long-name="UPnP Settings Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsettings/group"/>
-</component>
-</collection>
-<collection name="upnpsharing" long-name="UPnP Sharing" level="server">
-<component name="upnpdlnaprofiler" filter="s60" long-name="UPnP DLNA Profiler" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpdlnaprofiler/group"/>
-</component>
-<component name="upnpsecurity" filter="s60" long-name="UPnP Security" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpsecurity/group"/>
-</component>
-<component name="upnpcontentserver" filter="s60" long-name="UPnP Content Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpcontentserver/group"/>
-</component>
-<component name="applicationengine" filter="s60" long-name="UPnP Application Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/applicationengine/group"/>
-</component>
-<component name="upnpsharing_build" filter="s60" long-name="UPnP Sharing Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsharing/group"/>
-</component>
-</collection>
-<collection name="upnpmpxplugins" long-name="UPnP MPX Plugins" level="plugin">
-<component name="upnpplaybackplugins" filter="s60" long-name="UPnP Playback Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/upnpplaybackplugins/group"/>
-</component>
-<component name="upnpmpxplugins_build" filter="s60" long-name="UPnP MPX Plugins Build" introduced="^2">
-<!-- move exports content into other component? -->
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/group"/>
-</component>
-</collection>
-<collection name="upnpharvester" long-name="UPnP Harvester" level="ctrl">
-<component name="upnpharvester_common" filter="s60" long-name="UPnP Harvester Common" introduced="^2" deprecated="^3" class="placeholder">
-<!-- need to merge or #include these to a single bld.inf -->
-<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
- <unit bldFile="upnpharvester/common/cmsettings/group"/>
- <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
- <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
-</component>
-<component name="cdssync" filter="s60" long-name="CDS Sync" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
-</component>
-<component name="mdhserver" filter="s60" long-name="Metadata Harvester Server" introduced="^2" deprecated="^3" class="placeholder">
-<!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
-</component>
-<component name="upnpharvester_build" filter="s60" long-name="UPnP Harvester Build" introduced="^2" deprecated="^3" class="placeholder">
-<!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
-<!--<unit bldFile="upnpharvester/group"/>-->
-</component>
-</collection>
-<collection name="homesync" long-name="Home Sync" level="plugin">
-<component name="contentmanager" filter="s60" long-name="Content Manager" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homesync/group"/>-->
-<!-- move bld.inf into contentmanager dir -->
-</component>
-</collection>
-<collection name="homemedia" long-name="Home Media" level="framework">
-<!-- collection is really just a component. Move down a directory -->
-<component name="homemedia_build" filter="s60" long-name="Home Media" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homemedia/group"/> -->
-</component>
-</collection>
-<collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin">
-<component name="dlnasrv_build" filter="s60" long-name="DLNA Services Build">
-<!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed -->
-<unit bldFile="mw/dlnasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="btservices" level="generic" long-name="Bluetooth Services" levels="framework server generic specific plugin">
-<collection name="btservices_pub" long-name="BT Services Public Interfaces" level="plugin">
-<component name="bluetooth_power_state_api" long-name="Bluetooth Power State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_power_state_api/group"/>
-</component>
-<component name="bluetooth_notifier_api" long-name="Bluetooth Notifier API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_notifier_api/group"/>
-</component>
-</collection>
-<collection name="btservices_plat" long-name="BT Services Platform Interfaces" level="plugin">
-<component name="bluetooth_dosserver_audio_api" long-name="Bluetooth DOS Server Audio API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dosserver_audio_api/group"/>
-</component>
-<component name="bluetooth_dut_mode_api" long-name="Bluetooth DUT Mode API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dut_mode_api/group"/>
-</component>
-<component name="bluetooth_engine_api" long-name="Bluetooth Engine API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-<component name="bluetooth_local_variation_api" long-name="Bluetooth Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_local_variation_api/group"/>
-</component>
-<component name="bluetooth_notifier_internal_api" long-name="Bluetooth Notifier internal API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_notifier_internal_api/group"/>
-</component>
-<component name="bluetooth_sap_connection_state_api" long-name="Bluetooth SAP Connection State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_sap_connection_state_api/group"/>
-</component>
-<component name="bluetooth_secondary_display_notification_api" long-name="Bluetooth Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_secondary_display_notification_api/group"/>
-</component>
-</collection>
-<collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
-<component name="bteng" filter="s60" long-name="Bluetooth Engine">
-<unit bldFile="mw/btservices/bluetoothengine/bteng/group"/>
-</component>
-<component name="btnotif" filter="s60" long-name="Bluetooth Notifier">
-<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"/>
-</component>
-<component name="btmac" filter="s60" long-name="Bluetooth Mono Audio Controller" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btmac/group"/>
-</component>
-<component name="btsac" filter="s60" long-name="Bluetooth Stereo Audio Controller" plugin="Y">
-<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"/>
-</component>
-<component name="btsap" filter="s60" long-name="Bluetooth SIM Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btsap/group"/>
-</component>
-<component name="btui" filter="s60" long-name="Bluetooth UI">
-<unit bldFile="mw/btservices/bluetoothengine/btui/group"/>
-</component>
-<component name="btpbap" filter="s60" long-name="Bluetooth Phonebook Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btpbap/group"/>
-</component>
-<component name="bthid" filter="s60" long-name="Bluetooth HID">
-<unit bldFile="mw/btservices/bluetoothengine/bthid/group"/>
-</component>
-<component name="btctrldcmoadapter" filter="s60" long-name="Bluetooth Control DCMO Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btctrldcmoadapter/group"/>
-</component>
-</collection>
-<collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
-<component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
-<unit bldFile="mw/btservices/bluetoothappprofiles/avrcp" mrp="mw/btservices/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
-</component>
-</collection>
-<collection name="atcommands" long-name="AT Commands" level="generic">
-<component name="modematplugin" long-name="Modem AT Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/modematplugin/group"/>
-</component>
-<component name="lccustomplugin" long-name="LC Custom Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/lccustomplugin/group"/>
-</component>
-</collection>
-<collection name="btservices_info" long-name="BT Services Info" level="plugin">
-<component name="btservices_metadata" long-name="BT Services Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usbservices" level="generic" long-name="USB Services" levels="framework server generic specific plugin">
-<collection name="usbservices_plat" long-name="USB Services Platform Interfaces" level="plugin">
-<component name="pictbridge_api" long-name="PictBridge API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/pictbridge_api/group"/>
-</component>
-<component name="ptp_responder_api" long-name="PTP Responder API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_responder_api/group"/>
-</component>
-<component name="ptp_transport_api" long-name="PTP Transport API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_transport_api/group"/>
-</component>
-<component name="usb_device_control_plugin_api" long-name="USB Device Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_device_control_plugin_api/group"/>
-</component>
-<component name="usb_notifier_api" long-name="USB Notifier API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_notifier_api/group"/>
-</component>
-<component name="usb_personality_api_header" long-name="USB Personality API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_api_header/group"/>
-</component>
-<component name="usb_personality_plugin_api" long-name="USB Personality Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_plugin_api/group"/>
-</component>
-<component name="usb_secondary_display_api" long-name="USB Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_secondary_display_api/group"/>
-</component>
-<component name="usb_watcher_api" long-name="USB Watcher API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_api/group"/>
-</component>
-<component name="usb_watcher_info_api_header" long-name="USB Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_info_api_header/group"/>
-</component>
-</collection>
-<collection name="usbengines" long-name="USB Engines" level="generic">
-<component name="usbotgwatcher" filter="s60" long-name="USB OTG Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbotgwatcher/group"/>
-</component>
-<component name="usbwatcher" filter="s60" long-name="USB Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbwatcher/group"/>
-</component>
-<component name="usblocodplugin" filter="s60" long-name="USB Local Connectivity Domain Plugin" plugin="Y">
-<unit bldFile="mw/usbservices/usbengines/usblocodplugin/group"/>
-</component>
-<component name="usbdevcon" filter="s60" long-name="USB Device Control">
-<unit bldFile="mw/usbservices/usbengines/usbdevcon/group"/>
-</component>
-<component name="usbremotepersonality" filter="s60" long-name="USB Remote Personality">
-<unit bldFile="mw/usbservices/usbengines/usbremotepersonality/group"/>
-</component>
-</collection>
-<collection name="usbclasses" long-name="USB Classes" level="framework">
-<component name="usbobexclasscontroller" filter="s60" long-name="USB OBEX Class Controller" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbobexclasscontroller/group"/>
-</component>
-<component name="usbbasicpersonality" filter="s60" long-name="USB Basic Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbbasicpersonality/group"/>
-</component>
-<component name="usbmscpersonality" filter="s60" long-name="USB MSC Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbmscpersonality/group"/>
-</component>
-<!-- commented out in bld.inf. Should this be deleted?
- <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
- <unit bldFile="usbclasses/ptpstack/group"/>
- </component>
- <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
- <unit bldFile="usbclasses/sicdusbplugin/group"/>
- </component>
- <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
- <unit bldFile="usbclasses/ptpserver/group"/>
- </component>-->
-<component name="pictbridgeengine" filter="s60" long-name="PictBridge Engine">
-<unit bldFile="mw/usbservices/usbclasses/pictbridgeengine/group"/>
-</component>
-<component name="usbphoneasmodem" filter="s60" long-name="USB Phone as Modem" introduced="^3">
-<unit bldFile="mw/usbservices/usbclasses/usbphoneasmodem/group"/>
-</component>
-</collection>
-<collection name="usbuis" long-name="USB UIs" level="specific">
-<component name="usbui" filter="s60" long-name="USB UI">
-<unit bldFile="mw/usbservices/usbuis/usbui/group"/>
-</component>
-<component name="usbuinotif" filter="s60" long-name="USB UI Notifiers">
-<unit bldFile="mw/usbservices/usbuis/usbuinotif/group"/>
-</component>
-<component name="imageprintuiprovider" filter="s60" long-name="ImagePrint UI Provider" plugin="Y">
-<unit bldFile="mw/usbservices/usbuis/imageprintuiprovider/group"/>
-</component>
-<component name="usbimageprintui" filter="s60" long-name="ImagePrint UI">
-<unit bldFile="mw/usbservices/usbuis/imageprintui/group"/>
-</component>
-<component name="usbuiqt" long-name="USB UI Qt" introduced="^4" filter="s60">
-<unit bldFile="mw/usbservices/usbuis/usbuiqt" proFile="usbapplication.pro"/>
-</component>
-</collection>
-<collection name="usbservices_test" long-name="USB Services Test" level="server"/>
-</block>
-<block name="shortlinkconn" level="generic" long-name="Shortlink Connectivity" levels="framework server generic specific plugin">
-<!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
-<collection name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" level="plugin">
-<component name="obex_service_utils_api" long-name="OBEX Service Utils API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_utils_api/group"/>
-</component>
-<component name="obex_service_plugin_api" long-name="OBEX Service Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_plugin_api/group"/>
-</component>
-<component name="dialup_connection_status_api" long-name="Dial-up Connection Status API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dialup_connection_status_api/group"/>
-</component>
-<component name="dun_secondary_display_notification_api" long-name="DUN Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
-</component>
-<component name="obex_secondary_display_notification_api" long-name="OBEX Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
-</component>
-<component name="generic_hid_api" long-name="Generic HID API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/generic_hid_api/group"/>
-</component>
-<component name="locod_bearer_plugin_api" long-name="Locod Bearer Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/locod_bearer_plugin_api/group"/>
-</component>
-<component name="usb_obexservicemanager_client_api" long-name="USB OBEX Service Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_obexservicemanager_client_api/group"/>
-</component>
-</collection>
-<collection name="localconnectivityservice" long-name="Local Connectivity Service" level="server">
-<component name="locod" long-name="Local Connectivity Daemon">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/locod/group"/>
-</component>
-<component name="obexserviceman" long-name="OBEX Service Managar">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
-</component>
-<component name="obexsendservices" long-name="OBEX Send Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
-</component>
-<component name="obexreceiveservices" long-name="OBEX Receive Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
-</component>
-<component name="dun" long-name="Dial Up Networking">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/dun/group"/>
-</component>
-<component name="lcstylustap" long-name="LC Stylus Tap Plugins" plugin="Y">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/lcstylustap/group"/>
-</component>
-<component name="generichid" long-name="Generic HID">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/generichid/group"/>
-</component>
-<component name="headset" long-name="Headset">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/headset/group"/>
-</component>
-</collection>
-</block>
-<block name="imghandling" level="specific" long-name="Image Handling" levels="lib util if">
-<collection name="imagehandling_plat" long-name="Image Handling Platform Interfaces" level="if">
-<component name="image_handling_library_api" long-name="Image Handling Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
-</component>
-<component name="3gp_library_api" long-name="3GP Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
-</component>
-<component name="thumbnailmanager_api" long-name="Thumbnail Manager API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagehandlinglib" long-name="Image Handling Library" level="lib">
-<!-- collection is really a component, need to move down a directory -->
-<component name="ihl" filter="s60" long-name="IHL">
-<unit bldFile="mw/imghandling/imagehandlinglib/group"/>
-</component>
-</collection>
-<collection name="imagehandlingutilities" long-name="Image Handling Utilities" level="util">
-<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager">
-<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
-</component>
-<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager Qt" introduced="^4">
-<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt" filter="!test" proFile="thumbnailmanagerqt.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</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">
-<unit bldFile="mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
-</component>
-</collection>
-</block>
-<block name="mds" level="specific" long-name="Metadata Services" levels="mgr eng server int">
-<collection name="mds_plat" long-name="Metadata Services Platform Interfaces" level="int">
-<component name="context_engine_plugin_api" long-name="Context Engine Plugin API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/group" filter="!test"/>
-</component>
-<component name="harvester_framework_api" long-name="Harvester Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/harvester_framework_api/group" filter="!test"/>
-<!-- can only have one unit with the same filter, #include the following from the previous unit -->
-</component>
-<component name="location_manager_api" long-name="Location Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/location_manager_api/group" filter="!test"/>
-</component>
-<component name="metadata_engine_api" long-name="Metadata Engine API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/metadata_engine_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_collection_manager_api" long-name="Content Listing Framework Collection Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_extended_api" long-name="Content Listing Framework Extended API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_extended_api/group"/>
-</component>
-</collection>
-<collection name="mds_pub" long-name="Metadata Services Public Interfaces" level="int">
-<component name="content_listing_framework_api" long-name="Content Listing Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_pub/content_listing_framework_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="metadataengine" long-name="Metadata Engine" level="eng">
-<component name="metadataengine_common" filter="s60" long-name="Metadata Engine Common" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/common/group"/>
-</component>
-<component name="metadataengine_server" filter="s60" long-name="Metadata Engine Server" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/server/group"/>
-</component>
-<component name="metadataengine_client" filter="s60" long-name="Metadata Engine Client" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/client/group"/>
-</component>
-<component name="metadataengine_build" filter="s60" long-name="Metadata Engine Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/metadataengine/group"/>
-</component>
-</collection>
-<collection name="locationmanager" long-name="Location Manager" level="mgr">
-<component name="locationtrail" filter="s60" long-name="Location Trail" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/locationtrail/group"/>
-</component>
-<component name="locationmanager_server" filter="s60" long-name="Location Manager Server" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/server/group"/>
-</component>
-<component name="locationmanager_client" filter="s60" long-name="Location Manager Client" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/client/group"/>
-</component>
-<component name="locationmanager_build" filter="s60" long-name="Location Manager Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/locationmanager/group"/>
-</component>
-</collection>
-<collection name="contextengine" long-name="Context Engine" level="eng">
-<component name="contextengine_plugins" filter="s60" long-name="Context Engine Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/contextengine/plugins/group"/>
-</component>
-<component name="contextengine_build" filter="s60" long-name="Context Engine Build" introduced="^2">
-<!--make this collection a single component, or make this unit self-contained -->
-<unit bldFile="mw/mds/contextengine/group"/>
-</component>
-</collection>
-<collection name="harvester" long-name="Harvester" level="eng">
-<component name="blacklistclient" filter="s60" long-name="Blacklist Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistclient/group"/>
-</component>
-<component name="blacklistserver" filter="s60" long-name="Blacklist Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistserver/group"/>
-</component>
-<component name="harvester_common" filter="s60" long-name="Harvester Common" introduced="^2">
-<unit bldFile="mw/mds/harvester/common/group"/>
-</component>
-<component name="composerplugins" filter="s60" long-name="Composer Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/composerplugins/group"/>
-</component>
-<component name="harvesterplugins" filter="s60" long-name="Harvester Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/harvesterplugins/group"/>
-</component>
-<component name="monitorplugins" filter="s60" long-name="Monitor Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/monitorplugins/group"/>
-</component>
-<component name="harvester_server" filter="s60" long-name="Harvester Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/server/group"/>
-</component>
-<component name="harvester_client" filter="s60" long-name="Harvester Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/client/group"/>
-</component>
-<component name="harvester_build" filter="s60" long-name="Harvester Build" introduced="^2">
-<!-- split these exports into the other components -->
-<unit bldFile="mw/mds/harvester/group"/>
-</component>
-</collection>
-<collection name="watchdog" long-name="Watchdog" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="mdswatchdog" filter="s60" long-name="Metadata Watchdog" introduced="^2">
-<unit bldFile="mw/mds/watchdog/group"/>
-</component>
-</collection>
-<collection name="clfwrapper" long-name="Content Listing Framework Wrapper" level="int">
-<!-- collection is really a component. Move down a directory -->
-<component name="clfwrapper_build" filter="s60" long-name="CLF Wrapper Build" introduced="^2" class="placeholder">
-<!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
-<!--<unit bldFile="clfwrapper/group"/>-->
-</component>
-</collection>
-<collection name="mds_info" long-name="Metadata Services Info" level="int">
-<component name="mds_build" filter="s60" long-name="Metadata Services Build" introduced="^2">
-<!-- consider distributiing this into the rest of the components in the package -->
-<unit bldFile="mw/mds/group"/>
-</component>
-</collection>
-</block>
-<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"/>
-</component>
-<component name="videoconnutility_api" long-name="Video Connection Utility API" filter="s60" class="api">
-<unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/group"/>
-</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"/>
-</component>
-</collection>
-<collection name="videoscheduler" long-name="Video Scheduler" level="util">
-<component name="schedulerclient" filter="s60" long-name="Video Scheduler Client">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerclient/group"/>
-</component>
-<component name="schedulerserver" filter="s60" long-name="Video Scheduler Server">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerserver/group"/>
-</component>
-</collection>
-<collection name="videoconnutility" long-name="Video Connection Utility" level="util">
-<component name="connutilpsworker" filter="s60" long-name="Connection Utility Publish and Subscribe Worker">
-<unit bldFile="mw/videoutils/videoconnutility/connutilpsworker/group"/>
-</component>
-<component name="video_connutility" filter="s60" long-name="Video Connection Utility">
-<unit bldFile="mw/videoutils/videoconnutility/connutility/group"/>
-</component>
-</collection>
-<collection name="videoutils_info" long-name="Video Utils Info" level="if"/>
-</block>
-<block name="mmmw" level="generic" long-name="Multimedia Middleware" levels="plugin framework server generic specific">
-<collection name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" level="specific">
-<component name="multimedia_data_source_api" long-name="Multimedia Data Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
-</component>
-<component name="progressive_download_api" long-name="Progressive Download API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/progressive_download_api/group"/>
-</component>
-<component name="equalizer_ui_api" long-name="Equalizer UI API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
-</component>
-<component name="enhanced_media_client_api" long-name="Enhanced Media Client API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
-</component>
-<component name="stream_control_custom_command_api" long-name="Stream Control Custom Command API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
-</component>
-<component name="emc_buffer_source_api" long-name="EMC Buffer Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_buffer_source_api/group"/>
-</component>
-<component name="emc_file_source_api" long-name="EMC File Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
-</component>
-<component name="audio_metadata_reader_api" long-name="Audio MetaData Reader API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
-</component>
-<component name="emc_progressive_download_source_api" long-name="EMC Progressive Download Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
-</component>
-<component name="emc_volume_effect_api" long-name="EMC Volume Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
-</component>
-<component name="emc_balance_effect_api" long-name="EMC Balance Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_balance_effect_api/group"/>
-</component>
-<component name="emc_descriptor_source_api" long-name="EMC Descriptor Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_descriptor_source_api/group"/>
-</component>
-<component name="emc_drm_config_intfc_api" long-name="EMC DRM Config Intfc API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
-</component>
-<component name="voip_audio_services_api" long-name="VoIP Audio Services" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/group"/>
-</component>
-<component name="configuration_components_factory_api" long-name="Configuration Components Factory API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
-</component>
-<component name="audio_output_control_utility_api" long-name="Audio Output Control Utility API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/group"/>
-</component>
-<component name="audio_output_control_utility_proxy_api" long-name="Audio Output Control Utility Proxy API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
-</component>
-<component name="emc_audio_effects_api" long-name="EMC Audio Effects API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
-</component>
-<component name="call_audio_control_api" long-name="Call AudioControl API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/group"/>
-</component>
-<component name="radio_utilities_api" long-name="Radio Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/group"/>
-</component>
-<component name="radio_preset_utilities_api" long-name="Radio Preset Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
-</component>
-<component name="radio_monitor_api" long-name="Radio Monitor API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
-</component>
-<component name="thumbnail_engine_api" long-name="Thumbnail Engine API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/thumbnail_engine_api/group"/>
-</component>
-<component name="telephony_multimedia_service_api" long-name="Telephony Multimedia Service API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
-</component>
-<component name="openmax_al_api" long-name="OpenMAX AL API" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/openmax_al_api/group"/>
-</component>
-</collection>
-<collection name="mmfenh" long-name="MMF Enhancements" level="generic">
-<component name="advancedaudiocontroller" filter="s60" long-name="Advanced Audio Controllers" plugin="Y">
-<unit bldFile="mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
-</component>
-<component name="audiooutputcontrolutility" filter="s60" long-name="Audio Output Control Utility">
-<unit bldFile="mw/mmmw/mmfenh/audiooutputcontrolutility/group"/>
-</component>
-<component name="configurationcomponentsfactory" filter="s60" long-name="Configuration Components Factory">
-<unit bldFile="mw/mmmw/mmfenh/configurationcomponentsfactory/group"/>
-</component>
-<component name="enhancedaudioplayerutility" filter="s60" long-name="Enhanced Audio Player Utility">
-<unit bldFile="mw/mmmw/mmfenh/enhancedaudioplayerutility/group"/>
-</component>
-<component name="enhancedmediaclient" filter="s60" long-name="Enhanced Media Client">
-<unit bldFile="mw/mmmw/mmfenh/enhancedmediaclient/group"/>
-</component>
-<component name="profilesettingsmonitor" filter="s60" long-name="Profile Settings Monitor">
-<unit bldFile="mw/mmmw/mmfenh/profilesettingsmonitor/group"/>
-</component>
-<component name="progressivedownload" filter="s60" long-name="Progressive Download">
-<unit bldFile="mw/mmmw/mmfenh/progressivedownload/group"/>
-</component>
-</collection>
-<collection name="mm_fw" long-name="Multimedia Frameworks" level="framework">
-<!-- Id needs to be unique, mmfw already in use -->
-<!-- Placeholder for OpenAX AL and other stuff -->
-</collection>
-<collection name="mmserv" long-name="Multimedia Services" level="specific">
-<component name="audioeffectsui" filter="s60" long-name="Audio Effects UI">
-<unit bldFile="mw/mmmw/mmserv/audioeffectsui/group"/>
-</component>
-<component name="callaudiocontrol" filter="s60" long-name="Call Audio Control">
-<unit bldFile="mw/mmmw/mmserv/callaudiocontrol/group"/>
-</component>
-<component name="metadatautility" filter="s60" long-name="Metadata Utility">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/group"/>
-</component>
-<component name="radioutility" filter="s60" long-name="Radio Utility">
-<unit bldFile="mw/mmmw/mmserv/radioutility/group"/>
-</component>
-<component name="thumbnailengine" filter="s60" long-name="Thumbnail Engine" introduced="^2">
-<unit bldFile="mw/mmmw/mmserv/thumbnailengine/group"/>
-</component>
-<component name="tms" filter="s60" long-name="Telephony Multimedia Service" introduced="^3">
-<unit bldFile="mw/mmmw/mmserv/tms/group"/>
-</component>
-<component name="voipaudioservices" filter="s60" long-name="VoIP Audio Services">
-<unit bldFile="mw/mmmw/mmserv/voipaudioservices/group"/>
-</component>
-<component name="lib3gpextparser" filter="s60" long-name="3GP Extension Metadata Parser Library">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group" filter="sf_build"/>
-</component>
-</collection>
-<collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
-<component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="helix" level="generic" long-name="Helix" levels="plugin framework server generic specific">
-<collection name="helix_ren" long-name="Helix Engine" level="framework">
-<!-- what does "ren" stand for? -->
-<component name="helix_stub" filter="s60" long-name="Helix Stub" introduced="^2" class="api">
-<unit bldFile="mw/helix/helix_ren/helix_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="camerasrv" level="specific" long-name="Camera Services" levels="plugin fw api">
-<collection name="camerasrv_plat" long-name="Camera Services Platform Interfaces" level="api">
-<component name="media_recorder_sink_api" long-name="Media Recorder Sink API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
-</component>
-<component name="custom_onboard_camera_api" long-name="Custom Onboard Camera API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
-</component>
-<component name="imaging_configuration_manager_api" long-name="Imaging Configuration Manager API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
-</component>
-<component name="media_recorder_api" long-name="Media Recorder API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_api/group" filter="!test"/>
-</component>
-<component name="3gp_file_composer_api" long-name="3GP File Composer API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
-</component>
-</collection>
-<collection name="camcordermmfplugin" long-name="Camcorder MMF Plugin" level="plugin">
-<!-- collection is really a component. Should move down a directory -->
-<component name="camcordermmfplugin_build" filter="s60" long-name="Camcorder MMF Plugin Build" plugin="Y">
-<unit bldFile="mw/camerasrv/camcordermmfplugin/build"/>
-</component>
-</collection>
-<collection name="configmanagers" long-name="Config Managers" level="api">
-<component name="imagingconfigmanager" filter="s60" long-name="Imaging Config Manager">
-<unit bldFile="mw/camerasrv/configmanagers/imagingconfigmanager/group"/>
-</component>
-</collection>
-<collection name="camerasrv_info" long-name="Camera Services Info" level="api">
-<component name="camerasrv_build" filter="s60" long-name="Camera Services Build">
-<!-- should split into individual bld.infs -->
-<unit bldFile="mw/camerasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="mmappfw" level="specific" long-name="Multimedia App Framework" levels="fw utils if">
-<collection name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" level="if">
-<component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interfaces Build" introduced="^1" filter="s60">
-<!-- this is no longer necessary when confguration is put in place -->
-<unit bldFile="mw/mmappfw/mmappfw_plat"/>
-</component>
-<component name="collection_helper_api" long-name="Collection Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
-</component>
-<component name="harvester_collection_mediator_api" long-name="Harvester Collection Mediator API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/group"/>
-</component>
-<component name="harvester_metadata_extractor_api" long-name="Harvester Metadata Extractor API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/group"/>
-</component>
-<component name="harvester_server_api" long-name="Harvester Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_server_api/group"/>
-</component>
-<component name="harvester_utility_api" long-name="Harvester Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_utility_api/group"/>
-</component>
-<component name="playlist_engine_api" long-name="Playlist Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playlist_engine_api/group"/>
-</component>
-<component name="mtp_keys_api" long-name="MTP Keys API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mtp_keys_api/group"/>
-</component>
-<component name="mpx_collection_common_definition_api" long-name="MPX Collection Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_common_definition_api/group"/>
-</component>
-<component name="mpx_collection_utility_api" long-name="MPX Collection Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/group"/>
-</component>
-<component name="mpx_common_api" long-name="MPX Common API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_api/group"/>
-</component>
-<component name="mpx_common_definition_api" long-name="MPX Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_common_definition_api" long-name="MPX Playback Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_utility_api" long-name="MPX Playback Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/group"/>
-</component>
-<component name="mpx_base_view_plugins_api" long-name="MPX Base View Plugins API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/group"/>
-</component>
-<component name="mpx_view_utility_api" long-name="MPX View Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_view_utility_api/group"/>
-</component>
-<component name="mpx_albumart_utility_api" long-name="MPX Album Art Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/group"/>
-</component>
-<component name="media_player_settings_engine_api" long-name="Media Player Settings Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
-</component>
-<component name="mpx_backstepping_utility_api" long-name="MPX Backstepping Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_backstepping_utility_api/group"/>
-</component>
-<component name="asx_parser_api" long-name="ASX Parser API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/asx_parser_api/group"/>
-</component>
-<component name="playback_helper_api" long-name="Playback Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playback_helper_api/group"/>
-</component>
-<component name="videoplaylist_utility_api" long-name="Video Playlist Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/videoplaylist_utility_api/group"/>
-</component>
-</collection>
-<collection name="mpx" long-name="Multimedia Player" level="fw">
-<component name="commonframework" filter="s60" long-name="MPX Common Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/commonframework/group"/>
-</component>
-<component name="playbackframework" filter="s60" long-name="MPX Playback Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/playbackframework/group"/>
-</component>
-<component name="mpxcollectionfw" filter="s60" long-name="MPX Collection Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/collectionframework/group"/>
-</component>
-<component name="mpxviewfw" filter="s60" long-name="MPX View Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/viewframework/group"/>
-</component>
-<component name="mpxviewframeworkqt" long-name="MPX View Framework Qt" filter="s60">
-<unit bldFile="mw/mmappfw/mpx/mpxviewframeworkqt" proFile="mpxviewframeworkqt.pro" qmakeArgs="-r -config rom"/>
-</component>
-<component name="mpx_build" filter="s60" long-name="MPX Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/mpx/group"/>
-</component>
-</collection>
-<collection name="mmappcomponents" long-name="Multimedia App Components" level="utils">
-<component name="mmappcomponents_build" filter="s60" long-name="Multimedia App Components Build" introduced="^1">
-<!-- needed for #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
- Can remove this once configuration is in place-->
-<unit bldFile="mw/mmappfw/mmappcomponents/group"/>
-</component>
-<component name="collectionhelper" filter="s60" long-name="Media Player Collection Helper" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/collectionhelper/group"/>
-</component>
-<component name="playlistengine" filter="s60" long-name="Playlist Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/playlistengine/group"/>
-</component>
-<component name="mpxharvester" filter="s60" long-name="Media Player Harvester" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/harvester/group"/>
-</component>
-<component name="mmappcommonui" filter="s60" long-name="Multimedia App Common UI" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmappcommonui/group"/>
-</component>
-<component name="mediaplayersettingsengine" filter="s60" long-name="Media Player Settings Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
-</component>
-<component name="audiofetcher" filter="s60" long-name="Audio Fetcher" introduced="^1" plugin="Y">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
-</component>
-<component name="asxparser" filter="s60" long-name="ASX Parser" introduced="^1">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
-</component>
-<component name="playbackhelper" filter="s60" long-name="Playback Helper" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/playbackhelper/group"/>
-</component>
-<component name="videoplaylistutility" filter="s60" long-name="Video Playlist Utility" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/videoplaylistutility/group"/>
-</component>
-<component name="mmmtpdataprovider" filter="s60" long-name="Multimedia MTP Data Provider" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmmtpdataprovider/group"/>
-</component>
-</collection>
-<collection name="mmappfw_info" long-name="Multimedia App Framework Info" level="if">
-<component name="mmappfw_build" filter="s60" long-name="Multimedia App Framework Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/group"/>
-</component>
-<component name="mmappfw_test" filter="s60,test,api_test,pref_test" long-name="Multimedia App Framework Test" purpose="development" introduced="^1"/>
-</collection>
-</block>
-<block name="hgwidgets" level="specific" long-name="HG Widgets" levels="framework service api">
-<collection name="hgwidgets_pub" long-name="HG Widgets Platform Interfaces" level="api">
-<component name="ganeswidgets_api" long-name="Ganes Widgets API" introduced="^4" class="api placeholder">
-<!-- should separate out unit -->
-</component>
-</collection>
-<collection name="hgwidgets_pub" long-name="HG Widgets Public Interfaces" level="api"/>
-<collection name="ganeswidgets" long-name="Ganes Widgets" level="service">
-<!-- really a component, should move down a dir level and have a unit -->
-<component name="ganeswidgets_build" long-name="Ganes Widgets Build" introduced="^4" class="placeholder">
-<!-- should separate out unit -->
-</component>
-</collection>
-<collection name="hgwidgets_info" long-name="HG Widgets Info" level="framework">
-<component name="hgwidgets_build" long-name="HG Widgets Build" introduced="^4">
-<unit bldFile="mw/hgwidgets" proFile="hgwidgets.pro"/>
-</component>
-</collection>
-</block>
-<block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework api">
-<collection name="inputmethods_pub" long-name="Input Methods Public Interfaces" level="api">
-<component name="ptiengine_iti_api" long-name="PTI Engine API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
-</component>
-<component name="optical_character_recognition_api" long-name="Optical Character Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
-</component>
-<component name="input_language_info_api" long-name="Input Language Info API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
-</component>
-</collection>
-<collection name="inputmethods_plat" long-name="Input Methods Platform Interfaces" level="api">
-<component name="pen_input_server_api" long-name="Pen Input Server API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/group" filter="!test"/>
-</component>
-<component name="ptiengine_hwr_api" long-name="PTI Engine Handwriting Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group" filter="!test"/>
-</component>
-<component name="aknfep_settings_api" long-name="Avkon FEP Settings API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
-</component>
-<component name="aknfep_status_api" long-name="Avkon FEP Status API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
-</component>
-<component name="ptiengine_key_definations_api" long-name="PTI Engine Key Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
-</component>
-<component name="aknfep_definitions_api" long-name="Avkon FEP Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
-</component>
-<component name="aknfep_pen_support_api" long-name="Avkon FEP Pen Support API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
-</component>
-<component name="ptiengine_indic_definitions_api" long-name="PTI Engine Indic Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
-</component>
-<component name="aknfep_uiinterface_api" long-name="Avkon FEP UI Interface API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="textinput" long-name="Text Input" level="framework">
-<component name="ptienginev2" filter="s60" long-name="Predictive Text Input Engine">
-<!--uncomment when configuration is turned on and textinput_build is removed-->
-<!-- <unit bldFile="textinput/ptienginev2/group"/>-->
-</component>
-<component name="akninputlanguage" filter="s60" long-name="Avkon Input Language">
-<unit bldFile="mw/inputmethods/textinput/akninputlanguage/group"/>
-</component>
-<component name="peninputarc" filter="s60" long-name="Pen Input Arc">
-<unit bldFile="mw/inputmethods/textinput/peninputarc/group"/>
-</component>
-<component name="peninputcommonctrls" filter="s60" long-name="Pen Input Common Controls">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonctrls/group"/>
-</component>
-<component name="peninputcommonlayout" filter="s60" long-name="Pen Input Common Layout">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonlayout/group"/>
-</component>
-<component name="peninputhwrtrui" filter="s60" long-name="Pen Input Handwriting Recognition Training UI" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrtrui/group"/>
-</component>
-<component name="textinput_build" filter="s60" long-name="Text Input Build">
-<!--needed for #ifdef, can be removed when configuration is implemented -->
-<unit bldFile="mw/inputmethods/textinput/group"/>
-</component>
-</collection>
-<collection name="fep" long-name="FEP" level="engine">
-<component name="aknfep" filter="s60" long-name="Avkon FEP" plugin="Y">
-<unit bldFile="mw/inputmethods/fep/aknfep/group"/>
-</component>
-<component name="frontendprocessor" long-name="Front End Processor" purpose="mandatory">
-<unit bldFile="mw/inputmethods/fep/frontendprocessor/group" mrp="mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
-</component>
-</collection>
-<collection name="inputmethods_info" long-name="Input Methods Info" level="api">
-<component name="inputmethods_metadata" long-name="Input Methods Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="qt" level="generic" long-name="Qt" levels="tool mw app">
-<collection name="qtconf" long-name="Qt Config" level="tool">
-<component name="qt_deviceconfiguration" long-name="Qt Device Configuration" introduced="^2" class="config tool">
-<unit bldFile="mw/qt/src/s60installs/deviceconfiguration"/>
-</component>
-</collection>
-<collection name="qt_info" long-name="Qt Info" level="mw">
-<component name="qt_build" long-name="Qt Build" introduced="^2">
-<unit bldFile="mw/qt" proFile="projects.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-<collection name="qtdemos" long-name="Qt Demos" level="app">
-<component name="qtdemos_build" long-name="Qt Demos Build" introduced="^2" filter="qtdemos">
-<unit bldFile="mw/qt/demos" proFile="demos.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-<collection name="qtexamples" long-name="Qt Examples" level="app">
-<component name="qtexamples_build" long-name="Qt Examples Build" introduced="^2" filter="qtexamples">
-<unit bldFile="mw/qt/examples" proFile="examples.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-<collection name="qt_tests" long-name="Qt Tests" level="app">
-<component name="qttestsauto" long-name="Qt Automated Tests" introduced="^2" filter="qttestsauto">
-<unit bldFile="mw/qt/tests/auto" proFile="qtpauto.pro"/>
-</component>
-<component name="qttestsbenchmarks" long-name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks">
-<unit bldFile="mw/qt/tests/benchmarks" proFile="benchmarks.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-</block>
-<block name="qtextensions" level="generic" long-name="Qt Extensions" levels="tool mw app">
-<collection name="qtecomplugins" long-name="Qt ECom Plugins" level="app">
-<component name="qtecomplugins" filter="qtecomplugins" long-name="Qt ECom Plugin" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtecomplugins" proFile="qtecomplugins.pro" qmakeArgs="-r"/>
-</component>
-<component name="qtextensions_examples" filter="qtextensionsexamples" long-name="Qt ECom Plugin Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtecomplugins/examples" proFile="examples.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qthighway" long-name="Qt Highway" level="app">
-<component name="qthighway" filter="qthighway" long-name="Qt Highway" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qthighway" proFile="qthighway.pro" qmakeArgs="-r"/>
-</component>
-<component name="qthighway_examples" filter="qtextensionsexamples" long-name="Qt Highway Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qthighway/examples" qmakeArgs="-r"/>
-</component>
-<component name="qthighwaytests" filter="qtextensionstests" long-name="Qt Highway Tests" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qthighway/tests" proFile="tests.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qtmobileextensions" long-name="Qt Mobile Extensions" level="app">
-<component name="qtmobileextensions" filter="qtextension" long-name="Qt Mobile Extensions" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtmobileextensions" proFile="qtmobileextensions.pro" qmakeArgs="-r"/>
-</component>
-<component name="qtmobileextensions_examples" filter="qtextensionsexamples" long-name="Qt Mobile Extensions Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtmobileextensions/examples" proFile="examples.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qtmobility" long-name="Qt Mobility">
-<component name="qtmobility" filter="qtmobility" long-name="Qt Mobility" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtmobility" proFile="qtmobility.pro" qmakeArgs="-r"/>
-</component>
-<component name="qtmobility_examples" filter="qtextensionsexamples" long-name="Qt Mobility Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtmobility/examples" proFile="examples.pro" qmakeArgs="-r"/>
-</component>
-<component name="qtmobilitytests" filter="qtextensionstests" long-name="Qt Extensions Tests" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtmobility/tests" proFile="tests.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qtextensions_info">
-<component name="qtextensions_build" long-name="Qt Extensions Confgure" introduced="^4" class="conf">
-<unit bldFile="mw/qtextensions/group"/>
-</component>
-<component name="qtextensions_build" long-name="Qt Extensions Build" introduced="^4">
-<!-- break this up into the above collections-->
-<unit bldFile="mw/qtextensions" proFile="qtextensions.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</block>
-<block name="hb" level="generic" long-name="Orbit" levels="engine test api">
-<collection name="hb_info" long-name="Orbit Info" level="api">
-<component name="hb_build" long-name="Orbit Build" introduced="^4">
-<!-- should break this down into actual components -->
-<unit bldFile="mw/hb" proFile="hb.pro" qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
-</component>
-</collection>
-<collection name="hb_test" long-name="Orbit Test" level="test">
-<component name="hb_fute" filter="hb_fute_app" long-name="Fute" introduced="^4">
-<unit bldFile="mw/hb/tsrc/fute" proFile="fute.pro" qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
-</component>
-</collection>
-</block>
-<block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
-<collection name="classicui_plat" long-name="Classic UI Platform Interfaces" level="specific">
-<component name="personalisation_framework_api" long-name="Personalisation Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_framework_api/group" filter="!test"/>
-</component>
-<component name="signal_pane_api" long-name="Signal Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
-</component>
-<component name="japanese_reading_api" long-name="Japanese Reading API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/japanese_reading_api/group" filter="!test"/>
-</component>
-<component name="global_popup_priority_controller_api" long-name="Global Popup Priority Controller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
-</component>
-<component name="item_finder_api" long-name="Item Finder API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/item_finder_api/group" filter="!test"/>
-</component>
-<component name="avkon_fonts_api" long-name="Avkon Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_fonts_api/group" filter="!test"/>
-</component>
-<component name="extended_utilities_api" long-name="Extended Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
-</component>
-<component name="personalisation_plugin_api" long-name="Personalisation Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
-</component>
-<component name="extended_aiw_criteria_api" long-name="Extended AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="personalisation_application_api" long-name="Personalisation Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_application_api/group"/>
-</component>
-<component name="volume_popup_api" long-name="Volume Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
-</component>
-<component name="avkon_secondary_display_support_api" long-name="AVKON Secondary Display Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_support_api/group" filter="!test"/>
-</component>
-<component name="extended_setting_pages_api" long-name="Extended Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_setting_pages_api/group" filter="!test"/>
-</component>
-<component name="extended_lists_api" long-name="Extended Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_lists_api/group" filter="!test"/>
-</component>
-<component name="input_block_api" long-name="Input Block API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/input_block_api/group" filter="!test"/>
-</component>
-<component name="avkon_ui_server_api" long-name="AVKON UI Server API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_ui_server_api/group" filter="!test"/>
-</component>
-<component name="number_grouping_api" long-name="Number Grouping API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/number_grouping_api/group" filter="!test"/>
-</component>
-<component name="extended_status_pane_api" long-name="Extended Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_status_pane_api/group" filter="!test"/>
-</component>
-<component name="extended_notifiers_api" long-name="Extended Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notifiers_api/group" filter="!test"/>
-</component>
-<component name="task_list_api" long-name="Task List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
-</component>
-<component name="personalisation_slide_show_dialog_api" long-name="Personalisation Slide Show Dialog API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
-</component>
-<component name="key_event_utilities_api" long-name="Key Event Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_event_utilities_api/group"/>
-</component>
-<component name="emergency_call_support_api" long-name="Emergency Call Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/emergency_call_support_api/group" filter="!test"/>
-</component>
-<component name="extended_dialogs_api" long-name="Extended Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_dialogs_api/group"/>
-</component>
-<component name="legacy_ui_framework_headers_api" long-name="Legacy UI Framework Headers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/legacy_ui_framework_headers_api/group"/>
-</component>
-<component name="extended_editors_api" long-name="Extended Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_editors_api/group" filter="!test"/>
-</component>
-<component name="alarm_api" long-name="Alarm API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alarm_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_interface_base_api" long-name="AIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_base_api/group" filter="!test"/>
-</component>
-<component name="list_effects_api" long-name="List Effects API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/list_effects_api/group" filter="!test"/>
-</component>
-<component name="find_item_ui_api" long-name="Find Item UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/find_item_ui_api/group" filter="!test"/>
-</component>
-<component name="server_application_services_api" long-name="Server Application Services API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/server_application_services_api/group" filter="!test"/>
-</component>
-<component name="common_ui_settings_api" long-name="Common UI Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_ui_settings_api/group"/>
-</component>
-<component name="aiw_service_interface_menu_api" long-name="AIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_menu_api/group" filter="!test"/>
-</component>
-<component name="eikon_server_extension_client_api" long-name="EIKON Server Extension Client API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/eikon_server_extension_client_api/group" filter="!test"/>
-</component>
-<component name="skinnable_clock_api" long-name="Skinnable Clock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/skinnable_clock_api/group" filter="!test"/>
-</component>
-<component name="battery_pane_api" long-name="Battery Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/battery_pane_api/group" filter="!test"/>
-</component>
-<component name="fep_document_navigation_api" long-name="FEP Document Navigation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
-</component>
-<component name="personalisation_localised_texts_api" long-name="Personalisation Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
-</component>
-<component name="memory_card_ui_api" long-name="Memory Card UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
-</component>
-<component name="avkon_status_api" long-name="AVKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_status_api/group"/>
-</component>
-<component name="application_switching_api" long-name="Application Switching API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/application_switching_api/group" filter="!test"/>
-</component>
-<component name="avkon_localised_texts_api" long-name="AVKON Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_localised_texts_api/group"/>
-</component>
-<component name="avkon_secondary_display_api" long-name="AVKON Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_api/group"/>
-</component>
-<component name="extended_animation_api" long-name="Extended Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_notes_api" long-name="Extended Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notes_api/group" filter="!test"/>
-</component>
-<component name="text_scroller_api" long-name="Text Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/text_scroller_api/group" filter="!test"/>
-</component>
-<component name="custom_cursors_api" long-name="Custom Cursors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/custom_cursors_api/group" filter="!test"/>
-</component>
-<component name="global_window_priorities_api" long-name="Global Window Priorities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_window_priorities_api/group"/>
-</component>
-<component name="extended_indicators_api" long-name="Extended Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_indicators_api/group" filter="!test"/>
-</component>
-<component name="special_character_table_api" long-name="Special Character Table API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/special_character_table_api/group" filter="!test"/>
-</component>
-<component name="avkon_settings_api" long-name="AVKON Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_settings_api/group"/>
-</component>
-<component name="extended_sounds_api" long-name="Extended Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_sounds_api/group"/>
-</component>
-<component name="themes_settings_api" long-name="Themes Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/themes_settings_api/group"/>
-</component>
-<component name="media_shared_document_api" long-name="Media Shared Document API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/media_shared_document_api/group" filter="!test"/>
-</component>
-<component name="extended_queries_api" long-name="Extended Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_queries_api/group"/>
-</component>
-<component name="phone_number_text_utilities_api" long-name="Phone Number Text Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
-</component>
-<component name="extended_scroller_api" long-name="Extended Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_scroller_api/group"/>
-</component>
-<component name="key_rotator_api" long-name="Key Rotator API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_rotator_api/group" filter="!test"/>
-</component>
-<component name="extended_grids_api" long-name="Extended Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_grids_api/group" filter="!test"/>
-</component>
-<component name="generic_parameter_api" long-name="Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="indicator_touch_observer_api" long-name="Indicator Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_touch_observer_api/group"/>
-</component>
-<component name="popup_form_api" long-name="Popup Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/popup_form_api/group" filter="!test"/>
-</component>
-<component name="stylus_activated_popup_api" long-name="Stylus Activated Pop-up API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/stylus_activated_popup_api/group" filter="!test"/>
-</component>
-<component name="indicator_plugin_api" long-name="Indicator Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_plugin_api/group" filter="!test"/>
-</component>
-<component name="layout_configuration_api" long-name="Layout Configuration API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/layout_configuration_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_filter_factory_api" long-name="Common File Dialogs Filter Factory API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group" filter="!test"/>
-</component>
-<component name="avkon_anim_dll_api" long-name="AVKON Anim DLL API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_anim_dll_api/group"/>
-</component>
-<component name="extended_initialization_api" long-name="Extended Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_initialization_api/group" filter="!test"/>
-</component>
-<component name="long_tap_animation_api" long-name="Long Tap Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/long_tap_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_ui_framework_definitions_api" long-name="Extended UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_ui_framework_definitions_api/group"/>
-</component>
-<component name="extended_buttons_api" long-name="Extended Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_buttons_api/group" filter="!test"/>
-</component>
-<component name="aiw_provider_utility_api" long-name="AIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_provider_utility_api/group" filter="!test"/>
-</component>
-<component name="transition_effect_parameters_api" long-name="Transition Effect Parameters API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_parameters_api/group" filter="!test"/>
-</component>
-<component name="extended_input_capabilities_api" long-name="Extended Input Capabilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_input_capabilities_api/group" filter="!test"/>
-</component>
-<component name="uikon_status_api" long-name="UIKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/uikon_status_api/group"/>
-</component>
-<component name="transition_effect_utilities_api" long-name="Transition Effect Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_utilities_api/group" filter="!test"/>
-</component>
-<component name="pointer_event_modifier_api" long-name="Pointer Event Modifier API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/pointer_event_modifier_api/group" filter="!test"/>
-</component>
-<component name="avkon_testability_api" long-name="AVKON Testability API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_testability_api/group"/>
-</component>
-<component name="ganes_api" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ganes_api/group"/>
-</component>
-<component name="ode_api" long-name="Ode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ode_api/group"/>
-</component>
-<component name="physics_api" long-name="Physics API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/physics_api/group"/>
-</component>
-<component name="touch_pane_api" long-name="Touch Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_api/group" filter="!test"/>
-</component>
-<component name="touch_pane_observer_api" long-name="Touch Pane Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_observer_api/group"/>
-</component>
-<component name="alternate_fs_api" long-name="Alternate FS API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alternate_fs_api/group"/>
-</component>
-<component name="discreet_popup_api" long-name="Discreet Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/discreet_popup_api/group"/>
-</component>
-<component name="touch_gesture_framework_api" long-name="Touch Gesture Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_gesture_framework_api/group"/>
-<!-- should this be commented out? -->
-<!--<unit bldFile="classicui_plat/touch_gesture_framework_api/tsrc/group" filter="test,api_test"/> -->
-</component>
-<component name="extended_options_menu_api" long-name="Extended Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="classicui_pub" long-name="Classic UI Public Interfaces" level="specific">
-<component name="input_frame_api" long-name="Input Frame API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/input_frame_api/group" filter="!test"/>
-</component>
-<component name="window_server_event_observer_api" long-name="Window Server Event Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/window_server_event_observer_api/group" filter="!test"/>
-</component>
-<component name="application_framework_api" long-name="Application Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/application_framework_api/group" filter="!test"/>
-</component>
-<component name="scroller_api" long-name="Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/scroller_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_utilities_api" long-name="UI Framework Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_utilities_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_definitions_api" long-name="UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_definitions_api/group" filter="!test"/>
-</component>
-<component name="buttons_api" long-name="Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/buttons_api/group" filter="!test"/>
-</component>
-<component name="queries_api" long-name="Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/queries_api/group" filter="!test"/>
-</component>
-<component name="aiw_generic_parameter_api" long-name="AIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="editors_api" long-name="Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/editors_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_api" long-name="Common File Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/common_file_dialogs_api/group" filter="!test"/>
-</component>
-<component name="dialog_shutter_api" long-name="Dialog Shutter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialog_shutter_api/group" filter="!test"/>
-</component>
-<component name="fonts_api" long-name="Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/fonts_api/group" filter="!test"/>
-</component>
-<component name="screen_clearer_api" long-name="Screen Clearer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_clearer_api/group" filter="!test"/>
-</component>
-<component name="notifiers_api" long-name="Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notifiers_api/group" filter="!test"/>
-</component>
-<component name="notes_api" long-name="Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notes_api/group" filter="!test"/>
-</component>
-<component name="status_pane_api" long-name="Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/status_pane_api/group" filter="!test"/>
-</component>
-<component name="base_controls_api" long-name="Base Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/base_controls_api/group" filter="!test"/>
-</component>
-<component name="grids_api" long-name="Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/grids_api/group" filter="!test"/>
-</component>
-<component name="context_pane_api" long-name="Context Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/context_pane_api/group" filter="!test"/>
-</component>
-<component name="lists_api" long-name="Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/lists_api/group" filter="!test"/>
-</component>
-<component name="popups_api" long-name="Popups API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/popups_api/group" filter="!test"/>
-</component>
-<component name="misc_controls_api" long-name="Misc Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/misc_controls_api/group" filter="!test"/>
-</component>
-<component name="keylock_api" long-name="Keylock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/keylock_api/group" filter="!test"/>
-</component>
-<component name="options_menu_api" long-name="Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/options_menu_api/group" filter="!test"/>
-</component>
-<component name="hierarchical_lists_api" long-name="Hierarchical Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hierarchical_lists_api/group" filter="!test"/>
-</component>
-<component name="navigation_pane_api" long-name="Navigation Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/navigation_pane_api/group" filter="!test"/>
-</component>
-<component name="tabs_api" long-name="Tabs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/tabs_api/group" filter="!test"/>
-</component>
-<component name="title_pane_touch_observer_api" long-name="Title Pane Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_touch_observer_api/group"/>
-</component>
-<component name="choice_list_api" long-name="Choice List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/choice_list_api/group" filter="!test"/>
-</component>
-<component name="info_popup_note_api" long-name="Info Popup Note API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/info_popup_note_api/group" filter="!test"/>
-</component>
-<component name="setting_pages_api" long-name="Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/setting_pages_api/group" filter="!test"/>
-</component>
-<component name="screen_mode_api" long-name="Screen Mode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_mode_api/group" filter="!test"/>
-</component>
-<component name="indicators_api" long-name="Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/indicators_api/group" filter="!test"/>
-</component>
-<component name="error_ui_api" long-name="Error UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/error_ui_api/group" filter="!test"/>
-</component>
-<component name="animation_api" long-name="Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/animation_api/group" filter="!test"/>
-</component>
-<component name="searchfield_api" long-name="Searchfield API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/searchfield_api/group" filter="!test"/>
-</component>
-<component name="labels_api" long-name="Labels API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/labels_api/group" filter="!test"/>
-</component>
-<component name="hotkeys_api" long-name="Hotkeys API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hotkeys_api/group" filter="!test"/>
-</component>
-<component name="initialization_api" long-name="Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/initialization_api/group" filter="!test"/>
-</component>
-<component name="volume_control_api" long-name="Volume Control API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/volume_control_api/group" filter="!test"/>
-</component>
-<component name="title_pane_api" long-name="Title Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_api/group" filter="!test"/>
-</component>
-<component name="sounds_api" long-name="Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/sounds_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_handler_api" long-name="AIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_service_handler_api/group" filter="!test"/>
-</component>
-<component name="aiw_criteria_api" long-name="AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="touch_ui_utilities_api" long-name="Touch UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/touch_ui_utilities_api/group" filter="!test"/>
-</component>
-<component name="generic_button_api" long-name="Generic Button API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/generic_button_api/group" filter="!test"/>
-</component>
-<component name="form_api" long-name="Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/form_api/group" filter="!test"/>
-</component>
-<component name="uikon_core_controls" long-name="Uikon Core Controls" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/uikon_core_controls/group" filter="!test"/>
-</component>
-<component name="calendar_api" long-name="Calendar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/calendar_api/group"/>
-</component>
-<component name="toolbar_api" long-name="Toolbar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/toolbar_api/group" filter="!test"/>
-</component>
-<component name="server_application_api" long-name="Server Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/server_application_api/group"/>
-</component>
-<component name="slider_api" long-name="Slider API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/slider_api/group" filter="!test"/>
-</component>
-<component name="private_ui_framework_api" long-name="Private UI Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/private_ui_framework_api/group" filter="!test"/>
-</component>
-<component name="dialogs_api" long-name="Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialogs_api/group" filter="!test"/>
-</component>
-<component name="document_handler_api" long-name="Document handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/document_handler_api/group"/>
-</component>
-<component name="images_api" long-name="Images API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/images_api/group" filter="!test"/>
-</component>
-<component name="stylus_popup_menu_api" long-name="Stylus Pop-up Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/stylus_popup_menu_api/group" filter="!test"/>
-</component>
-<component name="information_preview_popup_api" long-name="Information Preview Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/information_preview_popup_api/group" filter="!test"/>
-</component>
-<component name="intermediate_state_api" long-name="Intermediate State API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/intermediate_state_api/group"/>
-</component>
-<component name="help_launcher_api" long-name="Help Launcher API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/help_launcher_api/group"/>
-</component>
-</collection>
-<collection name="ode" long-name="Open Dynamics Engine" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="ode_build" filter="s60" long-name="ODE">
-<unit bldFile="mw/classicui/ode/group"/>
-</component>
-</collection>
-<collection name="uifw" long-name="UI Framework" level="server">
-<component name="uiklaf" filter="s60" long-name="Uikon Look-and-Feel">
-<unit bldFile="mw/classicui/uifw/uiklaf/group"/>
-</component>
-<component name="eikctl" filter="s60" long-name="Eikon Controls">
-<unit bldFile="mw/classicui/uifw/eikctl/group"/>
-</component>
-<component name="avkon" filter="s60" long-name="Avkon">
-<!-- can only have one unit. Split into 3 components, or #include all from same bld.inf -->
-<unit bldFile="mw/classicui/uifw/avkon/aknphysics/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/aknconf/group"/>
-</component>
-<component name="eikstd" filter="s60" long-name="Eikon Standard">
-<unit bldFile="mw/classicui/uifw/eikstd/group"/>
-</component>
-<component name="aknglobalui" filter="s60" long-name="Avkon Global UI">
-<unit bldFile="mw/classicui/uifw/aknglobalui/group"/>
-</component>
-<component name="ganes" filter="s60" long-name="Ganes">
-<unit bldFile="mw/classicui/uifw/ganes/group"/>
-</component>
-</collection>
-<collection name="commonuis" long-name="Common UIs" level="specific">
-<component name="commonui" filter="s60" long-name="Common UI">
-<unit bldFile="mw/classicui/commonuis/commonui/group"/>
-</component>
-<component name="commondialogs" filter="s60" long-name="Common Dialogs">
-<unit bldFile="mw/classicui/commonuis/commondialogs/group"/>
-</component>
-</collection>
-<collection name="applicationinterworkingfw" long-name="Application Interworking Framework" level="generic">
-<component name="aifwservicehandler" filter="s60" long-name="Application Interworking Service Handler">
-<unit bldFile="mw/classicui/applicationinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-<collection name="psln" long-name="Personalization" level="specific">
-<!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
-<component name="psln_build" filter="s60" long-name="Personalization Build">
-<unit bldFile="mw/classicui/psln/group"/>
-</component>
-</collection>
-<collection name="commonadapter" long-name="Common Adapter" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="commonadapter_build" filter="s60" long-name="Common Adapter Build">
-<unit bldFile="mw/classicui/commonadapter/group"/>
-</component>
-</collection>
-<collection name="akntouchgesturefw" long-name="Avkon Touch Gesture Framework" level="generic">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="akntouchgesturefw_build" filter="s60" long-name="Avkon Touch Gesture Framework Build" introduced="^3">
-<unit bldFile="mw/classicui/akntouchgesturefw/group"/>
-</component>
-</collection>
-<collection name="uiutils" long-name="UI Utils" level="specific">
-<component name="localizer" filter="s60" long-name="Directory Localizer">
-<unit bldFile="mw/classicui/uiutils/localizer/group"/>
-</component>
-<component name="findutil" filter="s60" long-name="Find Utility">
-<unit bldFile="mw/classicui/uiutils/findutil/group"/>
-</component>
-<component name="gamerecognizer" filter="s60" long-name="Game Recognizer" plugin="Y">
-<unit bldFile="mw/classicui/uiutils/gamerecognizer/group"/>
-</component>
-<component name="aknjapanesereading" filter="s60" long-name="Avkon Japanese Reading">
-<unit bldFile="mw/classicui/uiutils/aknjapanesereading/group"/>
-</component>
-<component name="hlplch" long-name="Help Launcher" filter="s60,bldfirst">
-<unit bldFile="mw/classicui/uiutils/hlplch/group"/>
-</component>
-</collection>
-<collection name="commonuisupport" long-name="Common UI Support" level="support">
-<component name="uikon" long-name="Uikon" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uikon/group" mrp="mw/classicui/commonuisupport/uikon/group/app-framework_uikon.mrp"/>
-</component>
-<component name="errorresolverdata" long-name="Error Resolver Data" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/errorresolverdata/group" mrp="mw/classicui/commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
-</component>
-<component name="uilaf" long-name="UI Look and Feel" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uilaf/GROUP" mrp="mw/classicui/commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
-</component>
-<component name="grid" long-name="Grid" purpose="optional">
-<unit bldFile="mw/classicui/commonuisupport/grid/group" mrp="mw/classicui/commonuisupport/grid/group/app-framework_grid.mrp"/>
-</component>
-<component name="uifwsdocs" long-name="UI Frameworks Documentation" purpose="development" class="doc">
-<unit mrp="mw/classicui/commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
-</component>
-</collection>
-<collection name="lafagnosticuifoundation" long-name="Look-and-Feel Agnostic UI Foundation" level="base">
-<component name="cone" long-name="Control Environment" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/cone/group" mrp="mw/classicui/lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
-</component>
-<component name="graphicseffects" long-name="Graphics Effects" introduced="9.2" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/graphicseffects/group" mrp="mw/classicui/lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
-</component>
-<component name="uigraphicsutils" long-name="UI Graphics Utilities" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group" mrp="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
-</component>
-<component name="clockanim" long-name="Clock" purpose="optional" plugin="Y">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/clockanim/group" mrp="mw/classicui/lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
-</component>
-<component name="bmpanimation" long-name="BMP Animation" introduced="6.0" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/bmpanimation/group" mrp="mw/classicui/lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
-</component>
-<component name="animation" long-name="Animation" introduced="9.1" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/animation/group" mrp="mw/classicui/lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
-</component>
-</collection>
-<collection name="classicui_info" long-name="Classic UI Info" level="specific">
-<!-- the multiple units in the API test components need to be resolved -->
-<component name="classicui_metadata" long-name="Classic UI Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/classicui/classicui_info/classicui_metadata/classicui_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="svgt" level="generic" long-name="SVG Tiny" levels="util ui">
-<collection name="svgt_plat" long-name="SVG Tiny Platform Interfaces" level="ui">
-<component name="svgt_api" long-name="SVGT API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/svgt_api/group"/>
-</component>
-<component name="nvg_api" long-name="NVG API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/nvg_api/group"/>
-</component>
-</collection>
-<collection name="svgtopt" long-name="SVG-T Engine" level="util">
-<component name="svgtopt_build" filter="s60" long-name="SVG Engine" introduced="9.2">
-<!-- component is at collection level. Needs to be moved down a directory -->
-<unit bldFile="mw/svgt/svgtopt/group"/>
-</component>
-<component name="svgtplugin" filter="s60" long-name="SVG Plugin" introduced="9.2" plugin="Y">
-<unit bldFile="mw/svgt/svgtopt/svgtplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="uiaccelerator" level="generic" long-name="UI Accelerator" levels="plugin framework server ex if">
-<collection name="uiaccelerator_plat" long-name="UI Accelerator Platform Interfaces" level="if">
-<component name="alf_core_toolkit_api" long-name="ALF Core Toolkit API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/group"/>
-</component>
-<component name="alf_visual_api" long-name="ALF Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/group"/>
-</component>
-<component name="alf_extended_visual_api" long-name="ALF Extended Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/group"/>
-</component>
-<component name="alf_extension_api" long-name="ALF Extension API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/group"/>
-</component>
-<component name="alf_tracing_api" long-name="ALF Tracing API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/group"/>
-</component>
-<component name="alf_client_server_api" long-name="ALF Client Server API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/group"/>
-</component>
-</collection>
-<collection name="uiacceltk" long-name="UI Accelerator Toolkit" level="framework">
-<component name="hitchcock" filter="s60" long-name="Hitchcock">
-<unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/group"/>
-</component>
-<component name="uiacceltk_build" filter="s60" long-name="UI Accelerator Toolkit Build">
-<!-- move into the other component, or remove the #include and make this UI Accelerator Toolkit ROM-->
-<unit bldFile="mw/uiaccelerator/uiacceltk/group"/>
-</component>
-</collection>
-<collection name="uiaccelerator_test" long-name="UI Accelerator Test" level="ex"/>
-</block>
-<block name="uiresources" level="generic" long-name="UI Resources" levels="compile plugin framework server generic data">
-<!-- are the custom filters below needed? -->
-<collection name="uiresources_pub" long-name="UI Resources Public Interfaces" level="data">
-<component name="pictograph_api" long-name="Pictograph API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/pictograph_api/group" filter="!test"/>
-</component>
-<component name="skins_api" long-name="Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/skins_api/group" filter="!test"/>
-</component>
-<component name="font_definition_api" long-name="Font Definition API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/font_definition_api/group" filter="!test"/>
-</component>
-<component name="graphics_api" long-name="Graphics API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/graphics_api/group" filter="!test"/>
-</component>
-<component name="scalable_icons_api" long-name="Scalable Icons API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/scalable_icons_api/group"/>
-</component>
-<component name="layout_id_definitions_api" long-name="Layout ID Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/layout_id_definitions_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_plat" long-name="UI Resources Platform Interfaces" level="data">
-<component name="layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_system_private_api/group" filter="!test"/>
-</component>
-<component name="layout_data_api" long-name="Layout Data API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_data_api/group" filter="!test"/>
-</component>
-<component name="cdl_api" long-name="CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/cdl_api/group" filter="!test"/>
-</component>
-<component name="extended_skins_api" long-name="Extended Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_skins_api/group" filter="!test"/>
-</component>
-<component name="tfx_server_controller_plugin_api" long-name="TFX Server Controller Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_controller_plugin_api/group"/>
-</component>
-<component name="extended_fonts_api" long-name="Extended Fonts API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_fonts_api/group" filter="!test"/>
-</component>
-<component name="graphic_configuration_api" long-name="Graphic Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/graphic_configuration_api/group" filter="!test"/>
-</component>
-<component name="mif_header_cdl_api" long-name="MIF Header CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mif_header_cdl_api/group"/>
-</component>
-<component name="personalisation_and_skins_settings_api" long-name="Personalisation and Skins Settings API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/personalisation_and_skins_settings_api/group"/>
-</component>
-<component name="tfx_effect_setup_plugin_api" long-name="TFX Effect Setup Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_effect_setup_plugin_api/group"/>
-</component>
-<component name="mifconv_definitions_api" long-name="Mifconv Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mifconv_definitions_api/group"/>
-</component>
-<component name="wallpaper_configuration_api" long-name="Wallpaper Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/wallpaper_configuration_api/group"/>
-</component>
-<component name="language_code_definitions_api" long-name="Language Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/language_code_definitions_api/group"/>
-</component>
-<component name="skins_image_attributes_api" long-name="Skins Image Attributes API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
-</component>
-<component name="private_user_area_code_definitions_api" long-name="Private User Area Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/private_user_area_code_definitions_api/group"/>
-</component>
-<component name="tfx_server_plugin_ids_api" long-name="TFX Server Plug-in IDs API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_plugin_ids_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_info" long-name="UI Resources Info" level="data">
-<component name="uiresources_test" filter="s60,test,api_test" long-name="UI Resources Tests" purpose="development"/>
-</collection>
-<collection name="uigraphics" long-name="UI Graphics" level="generic">
-<component name="bitmaps2" filter="s60" long-name="Bitmaps 2" class="config">
-<unit bldFile="mw/uiresources/uigraphics/bitmaps2/group"/>
-</component>
-<component name="icons" filter="s60" long-name="Icons" class="config">
-<unit bldFile="mw/uiresources/uigraphics/icons/group"/>
-</component>
-<component name="variatedbitmaps" filter="s60" long-name="Variated Bitmaps" class="config">
-<unit bldFile="mw/uiresources/uigraphics/variatedbitmaps/group"/>
-</component>
-<component name="aknicon" filter="s60" long-name="Avkon Icon Framework">
-<unit bldFile="mw/uiresources/uigraphics/aknicon/group"/>
-</component>
-<component name="nvgrenderstage" filter="sf_build" long-name="NVG Render Stage">
-<unit bldFile="mw/uiresources/uigraphics/nvgrenderstage/group"/>
-</component>
-</collection>
-<collection name="layouts" long-name="Layouts" level="plugin">
-<component name="cdl" filter="s60" long-name="Customization Definition Language">
-<!-- can only have one unit. Need to #include them or split into multiple components -->
-<unit bldFile="mw/uiresources/layouts/cdl/cdlengine/group"/>
-<unit bldFile="mw/uiresources/layouts/cdl/cdlserver/group"/>
-</component>
-<component name="aknlayout2" filter="s60" long-name="Avkon Layout 2">
-<unit bldFile="mw/uiresources/layouts/aknlayout2/group"/>
-</component>
-</collection>
-<collection name="skins" long-name="Skins" level="data">
-<component name="aknskincontent" filter="s60" long-name="Avkon Skin Content" class="config">
-<unit bldFile="mw/uiresources/skins/aknskincontent/group"/>
-</component>
-<component name="aknskins" filter="s60" long-name="Avkon Skin Compiler">
-<unit bldFile="mw/uiresources/skins/aknskins/group"/>
-</component>
-</collection>
-<collection name="pictographs" long-name="Pictographs" level="data">
-<component name="aknpictograph" filter="s60" long-name="Avkon Pictograph">
-<unit bldFile="mw/uiresources/pictographs/aknpictograph/group"/>
-</component>
-</collection>
-<collection name="locales" long-name="Locales" level="framework">
-<component name="locales_build" filter="s60" long-name="Locales Build">
-<unit bldFile="mw/uiresources/locales/loce32"/>
-</component>
-</collection>
-<collection name="uiconfig" long-name="UI Config" level="server">
-<component name="s60config" filter="s60" long-name="S60 UI Config">
-<unit bldFile="mw/uiresources/uiconfig/s60config/group"/>
-</component>
-</collection>
-<collection name="fontsupport" long-name="Font Support" level="generic">
-<component name="fontprovider" filter="s60" long-name="Font Provider">
-<unit bldFile="mw/uiresources/fontsupport/fontprovider/group"/>
-</component>
-<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
- <component id="s60_fonts" filter="s60" name="S60 Fonts">
- <unit bldFile="fontsupport/fontutils/group"/>
- </component>
--->
-<component name="fontutils" filter="sf_build" long-name="Font Utils">
-<unit bldFile="mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
-</component>
-</collection>
-<collection name="helpthemes" long-name="Help Themes" level="data">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helpthemes_build" filter="s60" long-name="Help Themes Build" class="config">
-<unit bldFile="mw/uiresources/helpthemes/group"/>
-</component>
-</collection>
-</block>
-<block name="hapticsservices" level="generic" long-name="Haptics Services" levels="fw server api">
-<collection name="hapticsservices_plat" long-name="Haptics Services Platform Interfaces" level="api">
-<component name="tacticon_api" long-name="Tacticon API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tacticon_api/group"/>
-</component>
-<component name="tactile_feedback_core_api" long-name="Tactile Feedback Core API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_core_api/group"/>
-</component>
-<component name="tactile_feedback_server_api" long-name="Tactile Feedback Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_server_api/group"/>
-</component>
-</collection>
-<collection name="hapticsservices_pub" long-name="Haptics Services Public Interfaces" level="api">
-<component name="tactile_feedback_client_api" long-name="Tactile Feedback Client API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_pub/tactile_feedback_client_api/group"/>
-</component>
-</collection>
-<collection name="tacticonserver" long-name="Tacticon Server" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="tacticonserver_build" filter="s60" long-name="Tacticon Server Build" introduced="^3">
-<unit bldFile="mw/hapticsservices/tacticonserver/group"/>
-<!-- clients and servers are suauly the same component. Consider moving pluign to a separate component if needed -->
-</component>
-</collection>
-<collection name="tactilefeedback" long-name="Tactile Feedback" level="fw">
-<component name="tactilearearegistry" filter="s60" long-name="Tactile Area Registry" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilearearegistry/group"/>
-</component>
-<component name="tactilefeedbackresolver" filter="s60" long-name="Tactile Feedback Resolver" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackresolver/group"/>
-</component>
-<component name="tactileclickplugin" filter="s60" long-name="Tactile Click Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileclickplugin/group"/>
-</component>
-<component name="tactilefeedbackclient" filter="s60" long-name="Tactile Feedback Client" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackclient/group"/>
-</component>
-<component name="tactileactionplugin" filter="s60" long-name="Tactile Action Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileactionplugin/group"/>
-</component>
-<component name="tactilefeedback_build" filter="s60" long-name="Tactile Feedback Build" introduced="^1">
-<!-- consider moving IBY to one fo the above components -->
-<unit bldFile="mw/hapticsservices/tactilefeedback/group"/>
-</component>
-</collection>
-</block>
-<block name="platformthemes" level="specific" long-name="Platform Themes" levels="framework generic ui">
-<collection name="platformthemes_info" long-name="Platform Themes Info">
-<component name="platformthemes_build" long-name="Platform Themes Build">
-<!-- no real structure in this package. Should break into collections / components -->
-<unit bldFile="mw/platformthemes" proFile="platformthemes.pro"/>
-</component>
-</collection>
-</block>
-<block name="gsprofilesrv" level="generic" long-name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
-<collection name="gsprofilesrv_pub" long-name="GS and Profiles Services Public Interfaces" level="specific">
-<component name="profiles_engine_active_profile_settings_api" long-name="Profiles Engine Active Profile Settings API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_active_profile_settings_api/group"/>
-</component>
-<component name="profiles_engine_wrapper_api" long-name="Profiles Engine Wrapper API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_wrapper_api/group"/>
-</component>
-</collection>
-<collection name="gsprofilesrv_plat" long-name="GS and Profiles Services Platform Interfaces" level="specific">
-<component name="ftuwizardmodel_api" long-name="FTU Wizard Model API" filter="bldfirst,s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/ftuwizardmodel_api" proFile="ftuwizardmodel_api.pro" qmakeArgs="-r -config rom"/>
-</component>
-<component name="profiles_engine_api" long-name="Profiles Engine API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_engine_api/group"/>
-</component>
-<component name="settings_backgroundimage_api" long-name="Settings Background Image API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_backgroundimage_api/group"/>
-</component>
-<component name="settings_framework_api" long-name="Settings Framework API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_framework_api/group"/>
-</component>
-<component name="settings_launch_api" long-name="Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_launch_api/group"/>
-</component>
-<component name="settings_listbox_api" long-name="Settings List Box API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_listbox_api/group"/>
-</component>
-<component name="settings_plugin_api" long-name="Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_plugin_api/group"/>
-</component>
-<component name="settings_uis_cenrep_collection_api" long-name="Settings UIs CenRep Collection API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
-</component>
-</collection>
-<collection name="gssettingsuis" long-name="General Settings UIs" level="framework">
-<component name="gs" filter="s60" long-name="General Settings" introduced="9.2">
-<unit bldFile="mw/gsprofilesrv/gssettingsuis/gs/group"/>
-</component>
-</collection>
-<collection name="ftuwizardmodel" long-name="FTU Wizard Model" level="generic">
-<component name="ftuwizardmodel_build" long-name="FTU Wizardmodel Build" filter="bldfirst">
-<unit bldFile="mw/gsprofilesrv/ftuwizardmodel" proFile="ftuwizardmodel.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-<collection name="controlpanel" long-name="Control Panel" level="generic">
-<component name="controlpanel_build" long-name="Control Panel Build">
-<unit bldFile="mw/gsprofilesrv/controlpanel" proFile="controlpanel.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-<collection name="profilesservices" long-name="Profiles Services" level="server">
-<component name="profileengine" filter="s60" long-name="Profile Engine" introduced="9.1">
-<unit bldFile="mw/gsprofilesrv/profilesservices/profileengine/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreensrv" level="specific" long-name="Home Screen Services" levels="plugin framework server generic specific">
-<collection name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" level="specific">
-<component name="action_handler_plugin_api" long-name="Action Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/group" filter="!test"/>
-</component>
-<component name="content_harvester_plugin_api" long-name="Content Harvester Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/group" filter="!test"/>
-</component>
-<component name="menu_sat_interface_api" long-name="Menu SAT Interface API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/group" filter="!test"/>
-</component>
-<component name="sapi_contentpublishing" long-name="SAPI Content Publishing" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing/group"/>
-</component>
-<component name="sapi_actionhandler" long-name="SAPI Action Handler" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_actionhandler/group"/>
-</component>
-</collection>
-<collection name="contentpublishingsrv" long-name="Content Publishing Service" level="server">
-<component name="contentpublishingdebug" filter="s60" long-name="Content Publishing Debug">
-<!-- need to move this component outside of contentpublishingutils and into separate component directory -->
-<!-- <unit bldFile="contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/> -->
-</component>
-<component name="contentpublishingutils" filter="s60" long-name="Content Publishing Utils">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingutils/group"/>
-</component>
-<component name="contentpublishingserver" filter="s60" long-name="Content Publishing Server">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingserver/group"/>
-</component>
-<component name="contentharvester" filter="s60" long-name="Content Harvester">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
-</component>
-<component name="contentpublishingsrv_build" filter="s60" long-name="Content Publishing Service Build">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreensrvlegacy" level="generic" long-name="Legacy Home Screen Services" levels="plugin framework server generic specific">
-<collection name="homescreensrvlegacy_plat" long-name="Legacy Home Screen Services Platform Interfaces" level="specific">
-<component name="ai_content_model_api" long-name="AI Content Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrvlegacy/ai_content_model_api/group" proFile="group.pro"/>
-</component>
-<component name="ai_plugin_information_api" long-name="AI Plug-in Information API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrvlegacy/ai_plugin_information_api/group" proFile="group.pro"/>
-</component>
-</collection>
-</block>
-<block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
-<collection name="appinstall_plat" long-name="Application Installation Platform Interfaces" level="api">
-<component name="iaupdate_api" long-name="IA Update API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/iaupdate_api/group"/>
-</component>
-<component name="task_plugin_api" long-name="Task Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_plugin_api/group"/>
-</component>
-<component name="sw_installer_common_ui_api" long-name="SW Installer Common UI API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_common_ui_api/group"/>
-</component>
-<component name="sw_installer_launcher_api" long-name="SW Installer Launcher API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_launcher_api/group"/>
-</component>
-<component name="task_management_api" long-name="Task Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_management_api/group"/>
-</component>
-<component name="sw_installer_ui_plugin_api" long-name="SW Installer UI Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ui_plugin_api/group"/>
-</component>
-<component name="sw_installer_cr_keys" long-name="SW Installer CR Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_cr_keys/group"/>
-</component>
-<component name="sw_installer_ps_keys" long-name="SW Installer PS Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
-</component>
-<component name="appmngr2runtimeapi" long-name="Application Manager 2 Runtime Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
-</component>
-<component name="sifui_api" long-name="STIF UI API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sifui_api/group"/>
-</component>
-</collection>
-<collection name="appinstall_pub" long-name="Application Installation Public Interfaces" level="api">
-<component name="startup_list_management_api" long-name="Startup List Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
-</component>
-</collection>
-<collection name="ncdengine" long-name="Nokia Content Discover" level="framework">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="ncdengine_engine" filter="s60" long-name="NCD Engine" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/engine/group"/>
-</component>
-<component name="debuglogger" filter="s60" long-name="NCD Debug Logger" introduced="^1" class="placeholder">
-<!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
-</component>
-<component name="ncdengine_build" filter="s60" long-name="NCD Build" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/group"/>
-</component>
-</collection>
-<collection name="appinstaller" long-name="Application Installer" level="generic">
-<component name="appinstui" filter="s60" long-name="Application Installer UI" introduced="^2">
-<unit bldFile="mw/appinstall/appinstaller/appinstui/group"/>
-</component>
-</collection>
-<collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="api">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="iaupdateapi_stub_build" long-name="IA Update API Stub Build" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdateapi_stub/group"/>
-</component>
-</collection>
-<collection name="iaupdate" long-name="Independent Apps Update" level="api">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="iad" long-name="Software Update" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/iad/group"/>
-</component>
-<component name="iaupdate_help" filter="s60" long-name="IA Update Help" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/help/group"/>
-</component>
-<component name="iaupdate_build" filter="s60" long-name="IA Update Build" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/group"/>
-</component>
-</collection>
-<collection name="installationservices" long-name="Installation Services" level="generic">
-<component name="swi" long-name="Secure Software Install" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swi/group" mrp="mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
-</component>
-<component name="swidevicetools" long-name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
-<unit bldFile="mw/appinstall/installationservices/swidevicetools/group" mrp="mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
-</component>
-<component name="swcomponentregistry" long-name="Software Component Registry" introduced="^4" purpose="mandatory">
-<unit bldFile="mw/appinstall/installationservices/swcomponentregistry/group" mrp="mw/appinstall/installationservices/swcomponentregistry/group/security_softwarecomponentregistry.mrp"/>
-</component>
-<component name="swinstallationfw" long-name="Software Installation Framework" introduced="^4" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swinstallationfw/group" mrp="mw/appinstall/installationservices/swinstallationfw/group/security_softwareinstallframework.mrp"/>
-</component>
-<component name="swtransactionservices" long-name="Software Transaction Services" introduced="^4" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swtransactionservices/group" mrp="mw/appinstall/installationservices/swtransactionservices/group/security_softwaretransactionservices.mrp"/>
-</component>
-<component name="refswinstallationplugin" long-name="Reference Software Installation Plugin" introduced="^4" purpose="development" plugin="Y">
-<unit bldFile="mw/appinstall/installationservices/refswinstallationplugin/group" mrp="mw/appinstall/installationservices/refswinstallationplugin/group/security_sifrefplugin.mrp"/>
-</component>
-<component name="refsoftwareappmgr" long-name="Reference Software Application Manager" introduced="^4" purpose="development">
-<unit bldFile="mw/appinstall/installationservices/refsoftwareappmgr/group" mrp="mw/appinstall/installationservices/refsoftwareappmgr/group/security_referenceapplicationmanager.mrp"/>
-</component>
-<component name="swiconfig" long-name="Software Install Config" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appinstall/installationservices/swiconfig/group" mrp="mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
-</component>
-</collection>
-<collection name="secureswitools" long-name="Secure Software Install Tools" level="tool">
-<component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/makekeys/group" mrp="mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
-</component>
-<component name="swianalysistoolkit" long-name="SWI Analysis Toolkit" purpose="development" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
-</component>
-<component name="openssllib" long-name="OpenSSL Library" purpose="optional" class="PC">
-<unit mrp="mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
-</component>
-<component name="swisistools" long-name="Secure Software Install SIS Tools" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swisistools/group" mrp="mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
-</component>
-</collection>
-<collection name="appinstall_info" long-name="Application Installation Info" level="api">
-<component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="serviceapifw" level="specific" long-name="Service API Framework" levels="plugin framework server generic specific">
-<collection name="serviceapifw_pub" long-name="Service API Framework Public Interfaces" level="specific"/>
-<collection name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" level="specific">
-<component name="rtsecuritymanager_common_api" long-name="Runtime Security Manager Common API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/group"/>
-</component>
-<component name="rtsecuritymanager_utility_api" long-name="Runtime Security Manager Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
-</component>
-<component name="rtsecuritymanager_client_api" long-name="Runtime Security Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/group"/>
-</component>
-<component name="liw_provider_utility_api" long-name="LIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_provider_utility_api/group"/>
-</component>
-<component name="liw_service_interface_base_api" long-name="LIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_base_api/group"/>
-</component>
-<component name="liw_service_interface_menu_api" long-name="LIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_menu_api/group"/>
-</component>
-<component name="liw_criteria_api" long-name="LIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_criteria_api/group"/>
-</component>
-<component name="liw_generic_parameter_api" long-name="LIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_generic_parameter_api/group"/>
-</component>
-<component name="liw_service_handler_api" long-name="LIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_handler_api/group"/>
-</component>
-</collection>
-<collection name="rtsecuritymanager" long-name="Runtime Security Manager" level="server">
-<component name="rtsecuritymanagerutil" filter="s60" long-name="Runtime Security Manager Util">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
-</component>
-<component name="rtsecuritymanagerserver" filter="s60" long-name="Runtime Security Manager Server">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/>
-</component>
-<component name="rtsecuritymanagerclient" filter="s60" long-name="Runtime Security Manager Client">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/>
-</component>
-<component name="rtsecuritymanager_build" filter="s60" long-name="Runtime Security Manager Build">
-<!-- Move the export to the appropriate components, or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/group"/>
-</component>
-</collection>
-<collection name="languageinterworkingfw" long-name="Language Interworking Framework" level="framework">
-<component name="lifwservicehandler" filter="s60" long-name="Service Handler">
-<unit bldFile="mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-</block>
-<block name="serviceapi" level="specific" long-name="Service API" levels="os mw1 mw2 app">
-<!-- should break up this collection into something meaningful -->
-<collection name="serviceproviders" long-name="Service Providers" level="mw1">
-<component name="sapi_contacts_vpbk" long-name="Contacts Phonebook SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
-</component>
-<component name="sapi_location" long-name="Location SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_location/group"/>
-</component>
-<component name="sapi_mediamanagement" long-name="Media Management SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/group"/>
-</component>
-<component name="sapi_landmarks" long-name="Landmarks SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
-</component>
-<component name="sapi_messaging" long-name="Messaging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/group"/>
-</component>
-<component name="sapi_applicationmanager" long-name="Application Manager SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
-</component>
-<component name="sapi_calendar" long-name="Calendar SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_calendar/group"/>
-</component>
-<component name="sapi_logging" long-name="Logging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_logging/group"/>
-</component>
-<component name="sapi_sensor" long-name="Sensor SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sensor/group"/>
-</component>
-<component name="sapi_sysinfo" long-name="Sysinfo SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sysinfo/group"/>
-</component>
-<component name="sapi_serviceregistry" long-name="Service Registry SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
-</component>
-<component name="jsapi" long-name="Javascript API" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/jsapi/group"/>
-</component>
-<component name="serviceproviders_build" filter="s60" long-name="Service API Build">
-<!-- distribute the exports or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapi/serviceproviders/group"/>
-</component>
-</collection>
-</block>
-<block name="web" level="specific" long-name="Web" levels="plugin utils server generic specific">
-<collection name="web_pub" long-name="Web Public Interfaces" level="specific">
-<component name="browser_control_api" long-name="Browser Control API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_control_api/group"/>
-</component>
-<component name="download_mgr_client_api" long-name="Download Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_client_api/group"/>
-</component>
-<component name="download_mgr_ui_api" long-name="Download Manager UI Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_ui_api/group"/>
-</component>
-<component name="favourites_engine_api" long-name="Favourites Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/favourites_engine_api/group"/>
-</component>
-<component name="browser_plugin_api" long-name="Browser Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_plugin_api/group"/>
-</component>
-<component name="settings_api" long-name="Settings API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/settings_api/group"/>
-</component>
-</collection>
-<collection name="web_plat" long-name="Web Platform Interfaces" level="specific">
-<component name="aiw_browser_provider_api" long-name="AIW Browser Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/aiw_browser_provider_api/group"/>
-</component>
-<component name="browser_dialogs_provider_api" long-name="Browser Dialogs Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_dialogs_provider_api/group"/>
-</component>
-<component name="browser_platform_api" long-name="Browser Platform API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_platform_api/group"/>
-</component>
-<component name="cod_handler_api" long-name="COD Handler API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cod_handler_api/group"/>
-</component>
-<component name="connection_manager_api" long-name="Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/connection_manager_api/group"/>
-</component>
-<component name="cxml_library_api" long-name="cXml Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cxml_library_api/group"/>
-</component>
-<component name="download_mgr_client_api_extn" long-name="Download Manager Client API Extension" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/download_mgr_client_api_extn/group"/>
-</component>
-<component name="download_path_plugin_api" long-name="Download Path Plugin API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/web/web_plat/download_path_plugin_api/group"/>
-</component>
-<component name="feeds_engine_api" long-name="Feeds Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/feeds_engine_api/group"/>
-</component>
-<component name="launcher_api" long-name="Launcher API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/launcher_api/group"/>
-</component>
-<component name="multipart_parser_api" long-name="Multipart Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/multipart_parser_api/group"/>
-</component>
-<component name="recent_url_store_api" long-name="Recent URL Store API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/recent_url_store_api/group"/>
-</component>
-<component name="scheme_handler_plugin_api" long-name="Scheme Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scheme_handler_plugin_api/group"/>
-</component>
-<component name="scriptable_plugin_api" long-name="Scriptable Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scriptable_plugin_api/group"/>
-</component>
-<component name="webutils_api" long-name="Web Utils API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/webutils_api/group"/>
-</component>
-<component name="widget_registry_api" long-name="Widget Registry API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/widget_registry_api/group"/>
-</component>
-<component name="xml_parser_api" long-name="XML Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/xml_parser_api/group"/>
-</component>
-</collection>
-<collection name="web_info" long-name="Web Info" level="specific">
-<component name="web_build" filter="s60" long-name="Web Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/group"/>
-</component>
-</collection>
-<collection name="browserutilities" long-name="Browser Utilities" level="utils">
-<component name="browserdialogsprovider" filter="s60" long-name="Browser Dialogs Provider">
-<unit bldFile="mw/web/browserutilities/browserdialogsprovider/group"/>
-</component>
-<component name="recenturlstore" filter="s60" long-name="Recent URL Store">
-<unit bldFile="mw/web/browserutilities/recenturlstore/group"/>
-</component>
-<component name="xmlparser" filter="s60" long-name="XML Interface">
-<unit bldFile="mw/web/browserutilities/xmlparser/group"/>
-</component>
-<component name="cxmllibrary" filter="s60" long-name="XML Parser Implementation">
-<unit bldFile="mw/web/browserutilities/cxmllibrary/group"/>
-</component>
-<component name="downloadmgr" filter="s60" long-name="Download Manager">
-<unit bldFile="mw/web/browserutilities/downloadmgr/group"/>
-</component>
-<component name="connectionmanager" filter="s60" long-name="Connection Manager">
-<unit bldFile="mw/web/browserutilities/connectionmanager/group"/>
-</component>
-<component name="browsertelservice" filter="s60" long-name="Browser Telephony Service">
-<unit bldFile="mw/web/browserutilities/browsertelservice/group"/>
-</component>
-<component name="favouritesengine" filter="s60" long-name="Favourites Engine">
-<unit bldFile="mw/web/browserutilities/favouritesengine/group"/>
-</component>
-<component name="feedsengine" filter="s60" long-name="Feeds Engine">
-<unit bldFile="mw/web/browserutilities/feedsengine/group"/>
-</component>
-<component name="multipartparser" filter="s60" long-name="Multipart Parser">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
-<!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
-</component>
-<component name="schemehandler" filter="s60" long-name="Scheme Handler">
-<unit bldFile="mw/web/browserutilities/schemehandler/group"/>
-</component>
-<component name="webutils" filter="s60" long-name="Web Utils">
-<unit bldFile="mw/web/browserutilities/webutils/group"/>
-</component>
-<component name="aiwbrowserprovider" filter="s60" long-name="AIW Browser Provider" plugin="Y">
-<unit bldFile="mw/web/browserutilities/aiwbrowserprovider/group"/>
-</component>
-<component name="browserutilities_build" filter="s60" long-name="Browser Utilities Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/browserutilities/group"/>
-</component>
-</collection>
-<collection name="webengine" long-name="Web Engine" level="server">
-<component name="osswebengine" filter="s60" long-name="OSS Web Engine">
-<!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
-<unit bldFile="mw/web/webengine/osswebengine/cache/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/memorymanager/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/npscript/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group/javascriptcore"/>
-</component>
-<component name="webkitutils" filter="s60" long-name="WebKit Utils">
-<unit bldFile="mw/web/webengine/webkitutils/group"/>
-</component>
-<component name="pagescaler" filter="s60" long-name="Page Scaler">
-<unit bldFile="mw/web/webengine/pagescaler/group"/>
-</component>
-<component name="webwidgetinstaller" filter="s60" long-name="Widget Installer">
-<unit bldFile="mw/web/webengine/widgetinstaller/group"/>
-</component>
-<component name="widgetregistry" filter="s60" long-name="Widget Registry">
-<unit bldFile="mw/web/webengine/widgetregistry/group"/>
-</component>
-<component name="wmlengine" filter="s60" long-name="WML Engine">
-<unit bldFile="mw/web/webengine/wmlengine/group"/>
-</component>
-<component name="device" filter="s60" long-name="Device">
-<!-- this needs a more meaningful name -->
-<unit bldFile="mw/web/webengine/device/group"/>
-</component>
-<component name="widgetengine" filter="s60" long-name="Widget Engine">
-<unit bldFile="mw/web/webengine/widgetengine/group"/>
-</component>
-<component name="web_memoryplugin" long-name="Memory Plugin" filter="s60" plugin="Y">
-<unit bldFile="mw/web/webengine/memoryplugin/group"/>
-</component>
-<component name="widgetmemoryplugin" filter="s60" long-name="Widget Memory Plugin" plugin="Y">
-<unit bldFile="mw/web/webengine/widgetmemoryplugin/group"/>
-</component>
-<component name="widgetbackuprestore" filter="s60" long-name="Widget Backup and Restore">
-<unit bldFile="mw/web/webengine/widgetbackuprestore/group"/>
-</component>
-<component name="browserrecognizers" filter="s60" long-name="Browser Recognizers" plugin="Y">
-<unit bldFile="mw/web/webengine/browserrecognizers/group"/>
-</component>
-<component name="wrtharvester" filter="s60" long-name="Web Runtime Harvester" plugin="Y">
-<unit bldFile="mw/web/webengine/wrtharvester/group"/>
-</component>
-</collection>
-<collection name="codhandler" long-name="Content Object Descriptor Handler" level="specific">
-<component name="codeng" filter="s60" long-name="COD Engine">
-<unit bldFile="mw/web/codhandler/codeng/group"/>
-</component>
-<component name="codui" filter="s60" long-name="COD UI">
-<unit bldFile="mw/web/codhandler/codui/group"/>
-</component>
-<component name="codrecog" filter="s60" long-name="COD Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/codrecog/group"/>
-</component>
-<component name="codviewer" filter="s60" long-name="COD Viewer">
-<unit bldFile="mw/web/codhandler/codviewer/group"/>
-</component>
-<component name="ddrecog" filter="s60" long-name="Download Descriptor Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/ddrecog/group"/>
-</component>
-<component name="ddviewer" filter="s60" long-name="Download Descriptor Viewer">
-<unit bldFile="mw/web/codhandler/ddviewer/group"/>
-</component>
-<component name="coddownload" filter="s60" long-name="COD Download">
-<unit bldFile="mw/web/codhandler/coddownload/group"/>
-</component>
-<component name="roapapp" filter="s60" long-name="ROAP Application">
-<unit bldFile="mw/web/codhandler/roapapp/group"/>
-</component>
-<component name="codhandler_build" filter="s60" long-name="COD Handler Build">
-<!-- Exports need to go into another component or make this self-contained.
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/codhandler/group"/>
-</component>
-</collection>
-<collection name="widgets" long-name="Web Widget Framework" level="generic">
-<!-- the following units can be uncommented when configuration is put in place -->
-<component name="widgetrecognizer" filter="s60" long-name="Widget Recognizer" plugin="Y">
-<!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
-</component>
-<component name="widgetinstaller" filter="s60" long-name="Widget Installer UI" plugin="Y">
-<!--<unit bldFile="widgets/widgetinstaller/group"/>-->
-</component>
-<component name="widgetlauncher" filter="s60" long-name="Widget Launcher">
-<!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
-</component>
-<component name="widgetapp" filter="s60" long-name="Widget UI">
-<!--<unit bldFile="widgets/widgetapp/group"/>-->
-</component>
-<component name="widgetsidchecker" filter="s60" long-name="Widget SID Checker" introduced="^3">
-<!--<unit bldFile="widgets/widgetsidchecker/group"/>-->
-</component>
-<component name="widgetpreinstaller" filter="s60" long-name="Widget Pre-Installer">
-<!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
-</component>
-<component name="widgetstartup" filter="s60" long-name="Widget Startup">
-<!--<unit bldFile="widgets/widgetstartup/group"/>-->
-</component>
-<component name="widgets_build" filter="s60" long-name="Widgets Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/widgets/group"/>
-</component>
-</collection>
-</block>
-<block name="websrv" level="generic" long-name="Web Services" levels="plugin framework server generic specific">
-<collection name="websrv_pub" long-name="Web Services Public Interfaces" level="specific">
-<component name="web_service_description_api" long-name="Web Service Description API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_description_api/group"/>
-</component>
-<component name="web_service_connection_api" long-name="Web Service Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/group"/>
-</component>
-<component name="web_service_manager_api" long-name="Web Service Manager API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/group"/>
-</component>
-<component name="hostlet_connection_api" long-name="Hostlet Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/group"/>
-</component>
-<component name="web_service_messaging_api" long-name="Web Service Messaging API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/group"/>
-</component>
-<component name="xml_extensions_api" long-name="XML Extensions API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/group"/>
-</component>
-<component name="xml_fragment_api" long-name="XML Fragment API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/group"/>
-</component>
-</collection>
-<collection name="webservices" long-name="Web Services Framework" level="generic">
-<!-- consider breaking this collection into more meaningful subsets -->
-<component name="wsnotifierplugins" filter="s60" long-name="WS Notifier Plugins" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsnotifierplugins/group"/>
-</component>
-<component name="wslogger" filter="s60" long-name="WS Logger">
-<unit bldFile="mw/websrv/webservices/wslogger/group"/>
-</component>
-<component name="wsxml" filter="s60" long-name="WS XML Extensions">
-<unit bldFile="mw/websrv/webservices/wsxml/group"/>
-</component>
-<component name="wsutils" filter="s60" long-name="WS Utils">
-<unit bldFile="mw/websrv/webservices/wsutils/group"/>
-</component>
-<component name="wsfragment" filter="s60" long-name="WS Fragment">
-<unit bldFile="mw/websrv/webservices/wsfragment/group"/>
-</component>
-<component name="wsdescription" filter="s60" long-name="WS Service Description">
-<unit bldFile="mw/websrv/webservices/wsdescription/group"/>
-</component>
-<component name="wsconnection" filter="s60" long-name="WS Service Connection">
-<unit bldFile="mw/websrv/webservices/wsconnection/group"/>
-</component>
-<component name="wsmessages" filter="s60" long-name="WS Messages">
-<unit bldFile="mw/websrv/webservices/wsmessages/group"/>
-</component>
-<component name="wscredentialmanager" filter="s60" long-name="WS Credential Manager">
-<unit bldFile="mw/websrv/webservices/wscredentialmanager/group"/>
-</component>
-<component name="wsframework" filter="s60" long-name="WS Framework">
-<unit bldFile="mw/websrv/webservices/wsframework/group"/>
-</component>
-<component name="wshttpchanneltransportplugin" filter="s60" long-name="WS HTTP Channel Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshttpchanneltransportplugin/group"/>
-</component>
-<component name="wsconnectionagent" filter="s60" long-name="WS Connection Agent">
-<unit bldFile="mw/websrv/webservices/wsconnectionagent/group"/>
-</component>
-<component name="wsprovider" filter="s60" long-name="WS Provider">
-<unit bldFile="mw/websrv/webservices/wsprovider/group"/>
-</component>
-<component name="wshostletconnection" filter="s60" long-name="WS Hostlet Connection">
-<unit bldFile="mw/websrv/webservices/wshostletconnection/group"/>
-</component>
-<component name="wsmanager" filter="s60" long-name="WS Service Manager">
-<unit bldFile="mw/websrv/webservices/wsmanager/group"/>
-</component>
-<component name="wsidentitymanager" filter="s60" long-name="WS Identity Manager">
-<unit bldFile="mw/websrv/webservices/wsidentitymanager/group"/>
-</component>
-<component name="idwsfplugin" filter="s60" long-name="ID-WSF Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/idwsfplugin/group"/>
-</component>
-<component name="wsibasicplugin" filter="s60" long-name="WS-I Basic Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsibasicplugin/group"/>
-</component>
-<component name="wsrestplugin" filter="s60" long-name="WS REST Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsrestplugin/group"/>
-</component>
-<component name="idwsfsecuritymechanism" filter="s60" long-name="ID-WSF Security Mechanism">
-<unit bldFile="mw/websrv/webservices/idwsfsecuritymechanism/group"/>
-</component>
-<component name="wspasswordtransforms" filter="s60" long-name="WS Password Transforms">
-<unit bldFile="mw/websrv/webservices/wspasswordtransforms/group"/>
-</component>
-<component name="wscore" filter="s60" long-name="WS Core Service Manager">
-<unit bldFile="mw/websrv/webservices/wscore/group"/>
-</component>
-<component name="wslocaltransportplugin" filter="s60" long-name="WS Local Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wslocaltransportplugin/group"/>
-</component>
-<component name="wshostlettransportplugin" filter="s60" long-name="WS Hostlet Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshostlettransportplugin/group"/>
-</component>
-<component name="wsstar" filter="s60" long-name="WS Star">
-<!-- can only have one unit. Need to split into separate components or #include from a single bld.inf -->
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarpolicy/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarplugin/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarmessagehandlers/group"/>
-</component>
-<component name="wsoviplugin" filter="s60" long-name="WS Ovi Plugin">
-<unit bldFile="mw/websrv/webservices/wsoviplugin/group"/>
-</component>
-<component name="webservices_build" filter="s60" long-name="Web Services Build">
-<!-- need to split into self-contained components -->
-<unit bldFile="mw/websrv/webservices/group"/>
-</component>
-</collection>
-<collection name="websrv_info" long-name="Web Services Info" level="specific">
-<component name="websrv_bld" filter="s60" long-name="Web Services Build">
-<!-- need to include common .hrh in each unit -->
-<unit bldFile="mw/websrv/group"/>
-</component>
-</collection>
-</block>
-<block name="webruntime" level="specific" long-name="Web Runtime">
-<!-- need to break up this package nito collections and components -->
-<collection name="webruntime_info" long-name="Web Runtime Info">
-<component name="webruntime_build" long-name="Web Runtime Build" introduced="^4">
-<unit bldFile="mw/webruntime" proFile="cwrt.pro" qmakeArgs=""what+=ninetwo" "what+=tenone" "what+=qt_unstable" "what+=wrtlite" "what+=exportiby""/>
-</component>
-</collection>
-</block>
-<block name="platformtools" level="generic" long-name="Platform Tools">
-<collection name="gfxconversion" long-name="Graphics Conversion">
-<component name="bmconv_s60" filter="s60" long-name="S60 Bitmap Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/bmconv_s60/group"/>
-</component>
-<component name="mifconv" filter="s60" long-name="Multi Icon File Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/mifconv/group"/>
-</component>
-</collection>
-</block>
-<block name="uitools" level="specific" long-name="UI Tools" levels="compile encode tool if">
-<collection name="uitools_pub" long-name="UI Tools Public Interfaces" level="if">
-<component name="third_party_bitmap_palette_api" long-name="Third Party Bitmap Palette API" filter="s60" class="api">
-<unit bldFile="mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
-</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">
-<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">
-<unit bldFile="mw/uitools/uitools_plat/layout_system_private_api/group"/>
-</component>
-</collection>
-<collection name="cdlcompilertoolkit" long-name="CDL Compiler Toolkit" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompilertoolkit_build" filter="s60" long-name="CDL Compiler Toolkit Build">
-<unit bldFile="mw/uitools/cdlcompilertoolkit/group"/>
-</component>
-</collection>
-<collection name="cdlcompiler" long-name="CDL Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompiler_build" filter="s60" long-name="CDL Compiler Build">
-<unit bldFile="mw/uitools/cdlcompiler/group"/>
-</component>
-</collection>
-<collection name="gfxtools" long-name="Graphics Tools" level="tool">
-<component name="gditools" filter="s60" long-name="GDI Tools" class="PC">
-<unit bldFile="mw/uitools/gfxtools/gditools/group"/>
-</component>
-<component name="color" filter="s60" long-name="Bitmap Colour Palette" class="PC">
-<unit bldFile="mw/uitools/gfxtools/color/group"/>
-</component>
-</collection>
-<collection name="aknlayoutcompiler" long-name="Avkon Layout Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="aknlayoutcompiler_build" filter="s60" long-name="Avkon Layout Compiler Build">
-<unit bldFile="mw/uitools/aknlayoutcompiler/group"/>
-</component>
-</collection>
-<collection name="skincompiler" long-name="Skin Compiler" level="compile">
-<component name="aknskindesccompiler" filter="s60" long-name="Avkon Skin Descriptor Compiler">
-<unit bldFile="mw/uitools/skincompiler/AknSkinDescCompiler/group"/>
-</component>
-</collection>
-<collection name="reszip" long-name="Resource Zip" level="encode">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="reszip_build" filter="s60" long-name="Resource Zip Build">
-<unit bldFile="mw/uitools/reszip/group"/>
-</component>
-</collection>
-<collection name="toollibraries" long-name="Tool Libraries" level="tool"/>
-<collection name="svgtencoder" long-name="SVGT Encoder" level="encode">
-<component name="svgtenc" filter="s60" long-name="Standalone SVGT Encoder" class="PC">
-<unit bldFile="mw/uitools/svgtencoder/svgtenc/standalone/group"/>
-</component>
-</collection>
-</block>
-</layer>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="location" level="apps" long-name="Location Apps" levels="ui events loc api">
-<collection name="loc_plat" long-name="Location Apps Platform Interfaces" level="api">
-<component name="location_picker_service_api" long-name="Location Picker Service API" introduced="^4" filter="s60" class="api">
-<unit bldFile="app/location/loc_plat" proFile="location_plat.pro"/>
-</component>
-</collection>
-<collection name="locationpickerservice" long-name="Location Picker Service" level="loc">
-<!--collection is really a component. Should move down a directory -->
-<component name="locationpickerservice_build" filter="s60" long-name="Location Picker Service Build" introduced="^4">
-<unit bldFile="app/location/locationpickerservice" proFile="locationpickerservice.pro"/>
-</component>
-</collection>
-</block>
-<!-- pending removal -->
-<block name="phone" level="apps" span="2" long-name="Phone Apps" levels="engine plugin ui app">
-<collection name="phoneapp" long-name="Phone Application" level="app">
-<component name="blacklist" filter="s60" long-name="Phone Blacklist Clearing" plugin="Y">
-<unit bldFile="app/phone/phoneapp/blacklist/group"/>
-</component>
-<component name="phoneuicontrol" filter="s60" long-name="Phone UI Control">
-<unit bldFile="app/phone/phoneapp/phoneuicontrol/group"/>
-</component>
-<component name="phoneuistates" filter="s60" long-name="Phone UI States">
-<unit bldFile="app/phone/phoneapp/phoneuistates/group"/>
-</component>
-<component name="phoneuiutils" filter="s60" long-name="Phone UI Utils">
-<unit bldFile="app/phone/phoneapp/phoneuiutils/group"/>
-</component>
-<component name="silenceactionplugin" filter="s60" long-name="Silence Action Plugin" plugin="Y">
-<unit bldFile="app/phone/phoneapp/silenceactionplugin/group"/>
-</component>
-<component name="phonemediatorcenter" filter="s60" long-name="Phone Mediator Center">
-<unit bldFile="app/phone/phoneapp/phonemediatorcenter/group"/>
-</component>
-<component name="phoneuiview2" filter="s60" long-name="Phone UI View">
-<unit bldFile="app/phone/phoneapp/phoneuiview2" proFile="phoneuiview2.pro"/>
-</component>
-<component name="phoneuiqtviewadapter" filter="s60" long-name="Phone UI Qt View Adapter" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneapp/phoneuiqtviewadapter" proFile="phoneuiqtviewadapter.pro"/>
-</component>
-<component name="phonestringloader" filter="s60" long-name="Phone String Loader" introduced="^4">
-<unit bldFile="app/phone/phoneapp/phonestringloader" proFile="phonestringloader.pro"/>
-</component>
-<component name="phoneui2" filter="s60" long-name="Phone UI">
-<unit bldFile="app/phone/phoneapp/phoneui2" proFile="phoneui2.pro"/>
-</component>
-</collection>
-<collection name="phoneengine" long-name="Phone Engine" level="engine">
-<component name="phonecntfinder2" filter="s60" long-name="Phone Contact Finder">
-<unit bldFile="app/phone/phoneengine/phonecntfinder2" proFile="phonecntfinder2.pro"/>
-</component>
-<component name="audiohandling" filter="s60" long-name="Phone Audio Handling">
-<unit bldFile="app/phone/phoneengine/audiohandling/group"/>
-</component>
-<component name="callhandling" filter="s60" long-name="Call Handling">
-<unit bldFile="app/phone/phoneengine/callhandling/group"/>
-</component>
-<component name="contacthandling2" filter="s60" long-name="Phone Contact Handling">
-<unit bldFile="app/phone/phoneengine/contacthandling2/group"/>
-</component>
-<component name="loghandling" filter="s60" long-name="Phone Log Handling">
-<unit bldFile="app/phone/phoneengine/loghandling/group"/>
-</component>
-<component name="engineinfo" filter="s60" long-name="Phone Engine Info">
-<unit bldFile="app/phone/phoneengine/engineinfo/group"/>
-</component>
-<component name="phonemodel" filter="s60" long-name="Phone Model">
-<unit bldFile="app/phone/phoneengine/phonemodel" proFile="phonemodel.pro"/>
-</component>
-<component name="servicehandling" filter="s60" long-name="Phone Service Handling">
-<unit bldFile="app/phone/phoneengine/servicehandling/group"/>
-</component>
-<component name="phoneservices" filter="s60" long-name="Phone Server" introduced="^4">
-<unit bldFile="app/phone/phoneengine/phoneservices" proFile="phoneservices.pro"/>
-</component>
-<component name="parserrecognizer" filter="s60" long-name="Parser Recognizer" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneengine/parserrecognizer" proFile="parserrecognizer.pro"/>
-</component>
-</collection>
-<collection name="phoneuis" long-name="Phone UIs" level="ui">
-<component name="bubblemanager2" filter="s60" long-name="Phone Bubble Manager">
-<unit bldFile="app/phone/phoneuis/bubblemanager2" proFile="bubblemanager2.pro"/>
-</component>
-<component name="telephonydevicemode" filter="s60" long-name="Telephony Device Mode">
-<unit bldFile="app/phone/phoneuis/telephonydevicemode/group"/>
-</component>
-</collection>
-<collection name="phone_plat" long-name="Phone Apps Platform Interfaces" level="app">
-<component name="3d_ringing_tone_enabler_api" long-name="3D Ringing Tone Enabler API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
-</component>
-<component name="telephony_comms_information_api" long-name="Telephony Comms Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_comms_information_api/group"/>
-</component>
-<component name="telephony_information_api" long-name="Telephony Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_information_api/group"/>
-</component>
-<component name="telephony_device_mode_api" long-name="Telephony Device Mode API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_device_mode_api/group"/>
-</component>
-<component name="telephony_remote_party_information_api" long-name="Telephony Remote Party Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_remote_party_information_api/group"/>
-</component>
-<component name="telephony_video_mailbox_settings_api" long-name="Telephony Video Mailbox Settings API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_video_mailbox_settings_api/group"/>
-</component>
-<component name="telephony_microphone_mute_status_api" long-name="Telephony Microphone Mute Status API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_microphone_mute_status_api/group"/>
-</component>
-<component name="telephony_logging_extension_api" long-name="Telephony Logging Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_logging_extension_api/group"/>
-</component>
-<component name="telephony_matching_extension_api" long-name="Telephony Matching Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_matching_extension_api/group"/>
-</component>
-<component name="phone_application_commands_api" long-name="Phone Application Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_commands_api/group"/>
-</component>
-<component name="phone_application_voip_commands_api" long-name="Phone Application VOIP Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_voip_commands_api/group"/>
-</component>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_mediator_api/group"/>
-</component>
-<component name="video_telephony_mediator_api" long-name="Video Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/video_telephony_mediator_api/group"/>
-</component>
-<component name="video_telephony_control_mediator_api" long-name="Video Telephony Control Mediator API" filter="s60" introduced="^4" class="api">
-<unit bldFile="app/phone/phone_plat/video_telephony_control_mediator_api/group"/>
-</component>
-</collection>
-<collection name="phoneplugins" long-name="Phone Plugins" level="plugin">
-<component name="csplugin" filter="s60" long-name="Circuit Switched Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/csplugin/group"/>
-</component>
-<component name="hsdialerwidgetplugin" filter="s60" long-name="Home Screen Dialer Widget Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/hsdialerwidgetplugin" proFile="hsdialerwidgetplugin.pro"/>
-</component>
-<component name="infowidgetplugin" filter="s60" long-name="Info Widget Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/infowidgetplugin" proFile=""/>
-</component>
-</collection>
-<collection name="phonesettings" long-name="Phone Settings" level="plugin">
-<component name="cpphonesettingsplugins" filter="s60" long-name="CP Phone Settings Plugins" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phonesettings/cpphonesettingsplugins" proFile="cpphonesettingsplugins.pro"/>
-</component>
-</collection>
-</block>
-<block name="settingsuis" level="services" long-name="Settings UIs" levels="plugin ui">
-<collection name="controlpanelplugins" long-name="Control Panel Plugins" level="plugin">
-<component name="themeplugin" filter="s60" long-name="Theme Plugin" introduced="^4">
-<unit bldFile="app/settingsuis/controlpanelplugins/themeplugin" proFile="themeplugin.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-<collection name="controlpanelui" long-name="Control Panel UI" level="ui">
-<!-- collection is really a component, move down a dir -->
-<component name="controlpanelui_build" filter="s60" long-name="Control Panel UI Build" introduced="^4">
-<unit bldFile="app/settingsuis/controlpanelui" proFile="controlpanelui.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-</block>
-<block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin framework app">
-<collection name="contentctrl_plat" long-name="Content Control Daemons Platforn Interfaces" level="app">
-<component name="ds_contactsdatastoreextension_api" long-name="Adapter Customization API" filter="s60" introduced="^4" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_contactsdatastoreextension_api/group"/>
-</component>
-<component name="ds_data_modification_api" long-name="DS Data Modification API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_data_modification_api/group"/>
-</component>
-</collection>
-<collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
-<component name="secon" filter="s60" long-name="Service Controllers">
-<unit bldFile="app/contentcontrol/connectivitymodules/secon/group"/>
-</component>
-</collection>
-<collection name="dsdcmoadapter" long-name="Data Sync DCMO Adapter" level="plugin">
-<!-- Component at wrong rank, should move down a directory -->
-<component name="dsdcmoadapter_build" filter="s60" long-name="Data Sync Control DCMO Adapter">
-<unit bldFile="app/contentcontrol/dsdcmoadapter/group"/>
-</component>
-</collection>
-<collection name="omads" long-name="OMA Data Sync" level="app">
-<component name="omads_build" filter="s60" long-name="OMA DS Build">
-<unit bldFile="app/contentcontrol/omads/group"/>
-<!-- need to remove #include and rename and OMA DS ROM -->
-</component>
-<component name="omadsextensions" filter="s60" long-name="OMA DS Extensions" plugin="Y">
-<unit bldFile="app/contentcontrol/omads/omadsextensions/group"/>
-</component>
-<component name="omadsextensions" filter="s60" long-name="OMA DS Qt Extensions" plugin="Y">
-<unit bldFile="app/contentcontrol/omads/omadsextensions" proFile="omadsextensions.pro"/>
-</component>
-</collection>
-</block>
-<block name="firsttimeuse" level="apps" long-name="First Time Use" levels="support services ui app">
-<!-- these empty collections are really components. Move down a directory and supply units -->
-<collection name="ftuapplication" long-name="First Time Use Application" level="app"/>
-<collection name="fturuntimeservices" long-name="First Time Use Runtime Services" level="services"/>
-<collection name="wizardproviders" long-name="Wizard Providers" level="support"/>
-<collection name="stateproviders" long-name="State Providers" level="support"/>
-<collection name="runtimeproviders" long-name="Runtime Providers" level="support"/>
-<collection name="firsttimeuse_info" long-name="First Time Use Info" level="ui">
-<component name="firsttimeuse_build" long-name="First Time Use Build">
-<unit bldFile="app/firsttimeuse" proFile="ftu.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-</block>
-<block name="devicecontrol" level="services" long-name="Device Control Daemons" levels="oma mid app">
-<collection name="deviceupdatesui" long-name="Device Updates UI" level="app">
-<component name="deviceupdatesui_adapters" long-name="Device Updates Adapters" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/devicecontrol/deviceupdatesui/adapters/bld"/>
-</component>
-<component name="deviceupdates" long-name="Device Updates" filter="s60" introduced="^4">
-<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdates" proFile="deviceupdates.pro"/>
-</component>
-<component name="deviceupdatesplugin" long-name="Device Updates Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdatesplugin" proFile="deviceupdatesplugin.pro"/>
-</component>
-<component name="deviceupdatesqtsp" long-name="Device Updates Qt Service Provider" filter="s60" introduced="^4">
-<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdatesqtsp" proFile="deviceupdatesqtsp.pro"/>
-</component>
-<component name="cpqtsp" long-name="Client Provisioning Qt Service Provider" filter="s60" introduced="^4">
-<unit bldFile="app/devicecontrol/deviceupdatesui/cpqtsp" proFile="cpqtsp.pro"/>
-</component>
-<component name="devicemanagementnotifiersplugin" long-name="Device Management Notifiers Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/devicecontrol/deviceupdatesui/devicemanagementnotifiersplugin" proFile="devicemanagementnotifiersplugin.pro"/>
-</component>
-</collection>
-</block>
-<block name="printing" level="services" long-name="Printing"/>
-<block name="files" level="apps" long-name="File Manager Apps" levels="support apps">
-<collection name="filemanager" long-name="File Manager" level="apps">
-<component name="filemanager_plat" long-name="File Manager Platform Interfaces" filter="s60" introduced="^4" class="api"/>
-<component name="fmbkupengine" filter="s60" long-name="File Manager Backup Engine" introduced="^4">
-<unit bldFile="app/files/filemanager/src/fmbkupengine/group"/>
-</component>
-<component name="filemanager_build" filter="s60" long-name="File Manager Build">
-<!-- break this up into components or move down a directory -->
-<unit bldFile="app/files/filemanager" proFile="filemanager.pro"/>
-</component>
-</collection>
-</block>
-<block name="search" level="apps" long-name="Search Apps" levels="eng base app api">
-<collection name="search_info" long-name="Search Info">
-<component name="search_build" long-name="Search Build">
-<unit bldFile="app/search/group"/>
-</component>
-</collection>
-<collection name="searchui" long-name="Search UI">
-<component name="searchui_build" long-name="Search UI Build">
-<unit bldFile="app/search/searchui" proFile="searchui.pro"/>
-</component>
-</collection>
-</block>
-<block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
-<collection name="contacts_plat" long-name="Contacts Apps Platform Interfaces" level="ui">
-<component name="logs_engine_api" long-name="Logs Engine API" filter="s60" introduced="^4" class="api"/>
-<component name="logs_engine_api_extensions" long-name="Logs Engine API Extensions" filter="s60" class="api"/>
-<component name="logs_services_api" long-name="Logs Services API" filter="s60" introduced="^4" class="api"/>
-<component name="logs_timers_api" long-name="Logs Timers API" filter="s60" class="api"/>
-<component name="qt_mobility_contacts_api" long-name="Qt Mobility Contacts API" filter="s60" introduced="^4" class="api"/>
-</collection>
-<collection name="logsui" long-name="Logs UI" level="ui">
-<component name="logsui_build" filter="s60" long-name="Logs UI Build">
-<!-- component at too high a rank, should move down one directory -->
-<unit bldFile="app/contacts/logsui" proFile="logsui.pro"/>
-</component>
-</collection>
-<collection name="phonebookui" long-name="Phonebook UI" level="ui">
-<component name="mobhistorymodel" filter="s60" long-name="Mobile History Model" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/mobhistorymodel" qt:proFile="mobhistorymodel.pro"/> -->
-</component>
-<component name="pbkcommonui" filter="s60" long-name="Phonebook Common UI" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/pbkcommonui" qt:proFile="pbkcommonui.pro"/> -->
-</component>
-<component name="phonebookapp" filter="s60" long-name="Phonebook Application" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/phonebookapp" qt:proFile="phonebookapp.pro"/> -->
-</component>
-<component name="phonebookservices" filter="s60" long-name="Phonebook Services" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/phonebookservices" qt:proFile="phonebookservices.pro"/> -->
-</component>
-<component name="phonebookui_build" filter="s60" long-name="Phonebook UI Build" introduced="^4">
-<!-- break up into components -->
-<unit bldFile="app/contacts/phonebookui" proFile="phonebookui.pro"/>
-</component>
-</collection>
-<collection name="qtcontactsmobility" long-name="Qt Contacts Mobility" level="support">
-<component name="qtcontactsmobility_build" filter="s60" long-name="Qt Contacts Mobility Build" introduced="^4" plugin="Y">
-<!-- not really a component, move down a dir? Break up into compnents? -->
-<unit bldFile="app/contacts/qtcontactsmobility" proFile="qtcontactsmobility.pro"/>
-</component>
-</collection>
-<collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
-<component name="cntfindplugin" filter="s60" long-name="Contacts Find Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntfindplugin" proFile="cntfindplugin.pro"/>
-</component>
-<component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
-<unit bldFile="app/contacts/phonebookengines/contactsmodel/groupsql" mrp="app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
-</component>
-<component name="cntsortplugin" filter="s60" long-name="Contacts Sort Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntsortplugin" proFile="cntsortplugin.pro"/>
-</component>
-<component name="mobcntmodel" filter="s60" long-name="Mobile Contacts Model" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/mobcntmodel" proFile="mobcntmodel.pro"/>
-</component>
-<component name="mobcntactions" filter="s60" long-name="Mobile Contacts Actions" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/mobcntactions" proFile="mobcntactions.pro"/>
-</component>
-<component name="cntmaptileservice" filter="s60" long-name="Contacts Map Tile Service" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/cntmaptileservice" proFile="cntmaptileservice.pro"/>
-</component>
-<component name="simutility" filter="s60" long-name="SIM Utility" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/simutility" proFile="simutility.pro"/>
-</component>
-</collection>
-<collection name="pimprotocols" long-name="PIM Protocols" level="services">
-<component name="phonebooksync" long-name="Phonebook Sync" purpose="optional" plugin="Y">
-<unit bldFile="app/contacts/pimprotocols/phonebooksync/group" mrp="app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
-</component>
-<component name="pbap" long-name="Bluetooth PBAP" introduced="9.2" purpose="optional">
-<unit bldFile="app/contacts/pimprotocols/pbap/group" mrp="app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
-</component>
-</collection>
-<collection name="contacts_info" long-name="Contacts Apps Info" level="ui">
-<component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="organizer" level="apps" span="2" long-name="Organizer Application Suite" levels="support services engine ui app">
-<collection name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" level="app">
-<component name="calendar_interim_utils2_api" long-name="Calendar Interim Utils 2 API" filter="s60" class="api">
-<!-- move into own .pro file -->
-<unit bldFile="app/organizer/organizer_pub" proFile="organizer_pub.pro"/>
-</component>
-</collection>
-<collection name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" level="app">
-<component name="organizer_plat_build" long-name="Organizer Application Suite Platform Interface Build" filter="s60" class="api">
-<!-- break up into individual .pro files -->
-<unit bldFile="app/organizer/organizer_plat" proFile="organizer_plat.pro"/>
-</component>
-<component name="agenda_versit_2_api" long-name="Agenda Versit 2 API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="organizer_plat/agenda_versit_2_api/group"/>-->
-</component>
-<component name="calendar_exporter_api" long-name="Calendar Exporter API" filter="s60" class="api placeholder">
-<!--<unit bldFile="organizer_plat/calendar_exporter_api/group"/>-->
-</component>
-<component name="calendar_importer_api" long-name="Calendar Importer API" filter="s60" class="api placeholder">
-<!--<unit bldFile="organizer_plat/calendar_importer_api/group"/>-->
-</component>
-<component name="calendar_launcher_api" long-name="Calendar Launcher API" filter="s60" class="api placeholder">
-<!--<unit bldFile="organizer_plat/calendar_launcher_api/group"/> -->
-</component>
-<component name="agenda_interface_api" long-name="Agenda Interface API" filter="s60" introduced="^4" class="api"/>
-<component name="calendar_editor_api" long-name="Calendar Editor API" filter="s60" introduced="^4" class="api"/>
-<component name="notes_editor_api" long-name="Notes Editor API" filter="s60" introduced="^4" class="api"/>
-<component name="agenda_eventviewer_api" long-name="Agenda Event Viewer API" filter="s60" introduced="^4" class="api"/>
-</collection>
-<collection name="agendainterface" long-name="Agenda Interface" level="services">
-<!-- collection is really a component, should move down a directory -->
-<component name="agendainterface_build" filter="s60" long-name="Agenda Interface Build">
-<unit bldFile="app/organizer/agendainterface" proFile="agendainterface.pro"/>
-</component>
-</collection>
-<collection name="calendarui" long-name="Calendar UI" level="ui">
-<component name="commonutils" filter="s60" long-name="Calendar Common Utils">
-<unit bldFile="app/organizer/calendarui/commonutils" proFile="commonutils.pro"/>
-</component>
-<component name="calenlauncher" filter="s60" long-name="Calendar Launcher">
-<unit bldFile="app/organizer/calendarui/calenlauncher/group" proFile="calenlauncher.pro"/>
-</component>
-<component name="caleneditor" filter="s60" long-name="Calendar Editor" introduced="^4">
-<unit bldFile="app/organizer/calendarui/caleneditor" proFile="caleneditor.pro"/>
-</component>
-<component name="agendaeventviewer" filter="s60" long-name="Agenda Event Viewer" introduced="^4">
-<unit bldFile="app/organizer/calendarui/agendaeventviewer" proFile="agendaeventviewer.pro"/>
-</component>
-<component name="globaldata" filter="s60" long-name="Calendar Global Data">
-<unit bldFile="app/organizer/calendarui/globaldata" proFile="globaldata.pro"/>
-</component>
-<component name="settings" filter="s60" long-name="Calendar Settings">
-<unit bldFile="app/organizer/calendarui/settings" proFile="settings.pro"/>
-</component>
-<component name="calenplugins" filter="s60" long-name="Calendar Plugins" introduced="^4" plugin="Y">
-<unit bldFile="app/organizer/calendarui/calenplugins" proFile="calenplugins.pro"/>
-</component>
-<component name="customisationmanager" filter="s60" long-name="Calendar Customisation Manager">
-<unit bldFile="app/organizer/calendarui/customisationmanager" proFile="customisationmanager.pro"/>
-</component>
-<component name="views" filter="s60" long-name="Calendar Views">
-<unit bldFile="app/organizer/calendarui/views" proFile="views.pro"/>
-</component>
-<component name="calengriditemstyleplugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/organizer/calendarui/styleplugins/calengriditemstyleplugin" proFile="calengriditemstyleplugin.pro"/>
-</component>
-<component name="calendarui_controller" filter="s60" long-name="Calendar Controller">
-<unit bldFile="app/organizer/calendarui/controller" proFile="controller.pro"/>
-</component>
-<component name="calendarui_application" filter="s60" long-name="Calendar Application">
-<unit bldFile="app/organizer/calendarui/application" proFile="application.pro"/>
-</component>
-<component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y">
-<unit bldFile="app/organizer/calendarui/caldav/group"/>
-</component>
-</collection>
-<collection name="notes" long-name="Notes" level="ui">
-<component name="noteseditor" filter="s60" long-name="Notes Editor" introduced="^4">
-<unit bldFile="app/organizer/notes/notesui/noteseditor" proFile="noteseditor.pro"/>
-</component>
-<component name="notes_build" filter="s60" long-name="Notes Build" introduced="^4">
-<unit bldFile="app/organizer/notes" proFile="notes.pro"/>
-</component>
-</collection>
-<collection name="calendarengines" long-name="Calendar Engines" level="engine">
-<component name="versit2" filter="s60" long-name="Versit 2 iCal Parser" introduced="9.2">
-<unit bldFile="app/organizer/calendarengines/versit2/group"/>
-</component>
-<component name="agnversit2" filter="s60" long-name="Versit 2 Agenda Interface" introduced="9.2" plugin="Y">
-<unit bldFile="app/organizer/calendarengines/agnversit2/group"/>
-</component>
-<component name="caleninterimutils" filter="s60" long-name="Calendar Interim Utils" introduced="9.1">
-<unit bldFile="app/organizer/calendarengines/caleninterimutils/group"/>
-</component>
-<component name="calenimp" filter="s60" long-name="Calendar Import Wrapper" introduced="7.0s">
-<unit bldFile="app/organizer/calendarengines/calenimp/group"/>
-</component>
-<component name="caldavsrv" filter="sf_build" long-name="CalDAV Server" introduced="^3">
-<unit bldFile="app/organizer/calendarengines/caldav/group"/>
-</component>
-</collection>
-<collection name="clock" long-name="Clock" level="app">
-<!-- uncomment unit when block_build is split up-->
-<component name="clockengines" filter="s60" long-name="Clock Engines" class="placeholder">
-<!--<unit bldFile="clock/clockengines" qt:proFile="clockengines.pro"/> -->
-</component>
-<component name="clockmw" filter="s60" long-name="Clock Middleware" introduced="^4" class="placeholder">
-<!--<unit bldFile="clock/clockmw" qt:proFile="clockmw.pro"/>-->
-</component>
-<component name="clockui" filter="s60" long-name="Clock UI" class="placeholder">
-<!--<unit bldFile="clock/clockui" qt:proFile="clockui.pro"/>-->
-</component>
-<component name="ftudatetimewizard" filter="s60" long-name="First Time Use Date/Time Wizard" introduced="^4" class="placeholder">
-<!--<unit bldFile="clock/ftudatetimewizard" qt:proFile="ftudatetimewizard.pro"/>-->
-</component>
-<component name="clock_build" filter="s60" long-name="Clock Build">
-<!-- make exports into a component, or just move to one of the above components, then remove this and uncomment the above -->
-<unit bldFile="app/organizer/clock" proFile="clock.pro"/>
-</component>
-</collection>
-<collection name="pimappservices" long-name="PIM Application Services" level="services">
-<component name="calendar" long-name="Calendar" introduced="9.2" purpose="optional">
-<unit bldFile="app/organizer/pimappservices/calendar/group" mrp="app/organizer/pimappservices/calendar/group/app-engines_calendar.mrp" version="2"/>
-</component>
-<component name="calendarvcalplugin" long-name="Calendar vCal Plugin" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="app/organizer/pimappservices/calendarvcalplugin/group" mrp="app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp" version="2"/>
-</component>
-<component name="appenginesdocs" long-name="Application Engines Documentation" purpose="development" class="doc">
-<unit mrp="app/organizer/pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
-</component>
-</collection>
-<collection name="pimappsupport" long-name="PIM Application Support" level="support">
-<component name="vcardandvcal" long-name="vCard and vCal" introduced="ER5" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/vcardandvcal/group" mrp="app/organizer/pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
-</component>
-<component name="chinesecalendarconverter" long-name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
-</component>
-<component name="chinesecalendaralg" long-name="Chinese Calendar Algorithm" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendaralg/group" mrp="app/organizer/pimappsupport/chinesecalendaralg/group/app-services_chinesecalendaralgorithm.mrp"/>
-</component>
-</collection>
-<collection name="alarmui" long-name="Alarm UI" level="app">
-<!-- collection is really a component, should move down a directory -->
-<component name="alarmui_build" filter="s60" long-name="Alarm UI Build">
-<unit bldFile="app/organizer/alarmui" proFile="alarmui.pro"/>
-</component>
-</collection>
-<collection name="organizer_info" long-name="Organizer Application Suite Info" level="app">
-<component name="organizer_metadata" long-name="Organizer Application Suite Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="plugin eng base app api">
-<collection name="msg_plat" long-name="Messaging Apps Platform APIs" level="api">
-<component name="messaging_media_resolver_api" long-name="Messaging Media Resolver API" filter="s60" class="api"/>
-<component name="mms_application_api" long-name="MMS Application API" filter="s60" class="api"/>
-<component name="mms_codec_client_api" long-name="MMS Codec Client API" filter="s60" class="api"/>
-<component name="mms_conformance_api" long-name="MMS Conformance API" filter="s60" class="api"/>
-<component name="mms_engine_settings_api" long-name="MMS Engine Settings API" filter="s60" class="api"/>
-<component name="mms_server_settings_api" long-name="MMS Server Settings API" filter="s60" class="api"/>
-<component name="conversation_services_client_api" long-name="Conversation Services Client API" filter="s60" introduced="^4" class="api"/>
-<component name="conversation_services_plugin_api" long-name="Conversation Services Plugin API" filter="s60" introduced="^4" class="api"/>
-<component name="conversation_services_utilities_api" long-name="Conversation Services Utilities API" filter="s60" introduced="^4" class="api"/>
-<component name="shareui_api" long-name="Share UI API" filter="s60" introduced="^4" class="api"/>
-<component name="messaging_history_api" long-name="Messaging History API" filter="s60" introduced="^4" class="api"/>
-<component name="msg_plat_build" long-name="Messaging Apps Platform APIs Build" filter="s60" introduced="^4" class="api">
-<!-- break this up into the above units and replace their base attributes with bldFile, etc -->
-</component>
-</collection>
-<collection name="msg_pub" long-name="Messaging Apps Public APIs" level="api">
-<component name="mms_client_mtm_api" long-name="MMS Client MTM API" filter="s60" class="api"/>
-<component name="msg_smil_dtd_api" long-name="Messaging SMIL DTD API" filter="s60" introduced="^4" class="api"/>
-<component name="msg_pub_build" long-name="Messaging Apps Public APIs Build" filter="s60" introduced="^4" class="api">
-<!-- break this up into the above units and replace their base attributes with bldFile, etc -->
-</component>
-</collection>
-<collection name="mobilemessaging" long-name="Mobile Messaging" level="plugin">
-<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/mobilemessaging/smsmtm/group" mrp="app/messaging/mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
-</component>
-</collection>
-<collection name="messagingappbase" long-name="Messaging App Base" level="base">
-<component name="messagingappbase_build" filter="s60" long-name="Messaging App Base Build" introduced="^4">
-<!-- break this up into the below components -->
-<unit bldFile="app/messaging/messagingappbase" proFile="messagingappbase.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgmedia" filter="s60" long-name="Message Media"/>
-<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
-<unit mrp="app/messaging/messagingappbase/smsmtm/group/messaging_sms.mrp"/>
-</component>
-<component name="smilparser" long-name="SMIL Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="app/messaging/messagingappbase/smilparser/GROUP" mrp="app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
-</component>
-<component name="obexmtms" long-name="OBEX MTMs" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/obexmtms/Group" mrp="app/messaging/messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
-</component>
-</collection>
-<collection name="mmsengine" long-name="MMS Engine" level="eng">
-<component name="mmsconninit" filter="s60" long-name="MMS Connection Initiator" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsconninit/bld"/> -->
-</component>
-<component name="genutils" filter="s60" long-name="General Utils" class="placeholder">
-<!-- <unit bldFile="mmsengine/genutils/bld"/> -->
-</component>
-<component name="mmsserversettings" filter="s60" long-name="MMS Server Settings" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserversettings/bld"/> -->
-</component>
-<component name="mmsmessage" filter="s60" long-name="MMS Message" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsmessage/bld"/> -->
-</component>
-<component name="mmshttptransport" filter="s60" long-name="MMS HTTP Transport" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmshttptransport/bld"/> -->
-</component>
-<component name="mmscodec" filter="s60" long-name="MMS Codec" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodec/bld"/> -->
-</component>
-<component name="mmsserver" filter="s60" long-name="MMS Server" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserver/bld"/> -->
-</component>
-<component name="clientmtm" filter="s60" long-name="MMS Client MTM" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/clientmtm/bld"/> -->
-</component>
-<component name="mmswatcher" filter="s60" long-name="MMS Watcher" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmswatcher/bld"/> -->
-</component>
-<component name="mmspushhandler" filter="s60" long-name="MMS Push Handler" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmspushhandler/bld"/> -->
-</component>
-<component name="applicationadapter" filter="s60" long-name="MMS Application Adapter" class="placeholder">
-<!-- <unit bldFile="mmsengine/applicationadapter/bld"/> -->
-</component>
-<component name="mmscodecclient" filter="s60" long-name="MMS Codec Client" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodecclient/bld"/> -->
-</component>
-<component name="mmssettings" long-name="MMS Settings" introduced="9.2" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmssettings/group" mrp="app/messaging/mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
-</component>
-<component name="mmsconf" long-name="MMS Configuration" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmsconf" mrp="app/messaging/mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
-</component>
-<component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
-<!-- this should be broken up into the individual other components -->
-<unit bldFile="app/messaging/mmsengine" proFile="mmsengine.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="messagingapp" long-name="Messaging Application" level="app">
-<component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
-<!-- this should be broken up into the individual other components -->
-<unit bldFile="app/messaging/messagingapp" proFile="messagingapp.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgutils" filter="s60" long-name="Messaging Utils" introduced="^4">
-<unit bldFile="app/messaging/messagingapp/msgutils" proFile="msgutils.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgappfw" filter="s60" long-name="Messaging Application Framework" introduced="^4">
-<unit bldFile="app/messaging/messagingapp/msgappfw" proFile="msgappfw.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgsettings" filter="s60" long-name="Messaging Settings" introduced="^4">
-<unit bldFile="app/messaging/messagingapp/msgsettings" proFile="msgsettings.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgnotifications" filter="s60" long-name="Messaging Notifications" introduced="^4">
-<unit bldFile="app/messaging/messagingapp/msgnotifications" proFile="msgnotifications.pro" qmakeArgs="-r"/>
-</component>
-<component name="smartmessaging" filter="s60" long-name="Smart Messaging">
-<unit bldFile="app/messaging/messagingapp/smartmessaging" proFile="smartmessaging.pro" qmakeArgs="-r"/>
-</component>
-<component name="shareui" filter="s60" long-name="Shared UI" introduced="^4">
-<unit bldFile="app/messaging/messagingapp/shareui" proFile="shareui.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgui" filter="s60" long-name="Messaging UI" introduced="^4">
-<unit bldFile="app/messaging/messagingapp/msgui" proFile="msgui.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="email" long-name="Email" level="plugin">
-<!-- use commonemail instead -->
-<component name="pop3andsmtpmtm" long-name="POP3 and SMTP MTM" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/pop3andsmtpmtm/group" mrp="app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
-</component>
-<component name="imap4mtm" long-name="IMAP4 MTM" introduced="9.2" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/imap4mtm/group" mrp="app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
-</component>
-</collection>
-<collection name="messaging_info" long-name="Messaging Apps Info" level="api">
-<component name="messaging_metadata" long-name="Messaging Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
-</component>
-<component introduced="^4">
-<!-- break this up into the above collections and eventually remove -->
-<unit bldFile="app/messaging"/>
-</component>
-</collection>
-</block>
-<block name="commonemail" level="apps" span="2" long-name="Email Apps" levels="service support ui app">
-<!-- need to resolve the qt parts into proper components, then uncomment the units -->
-<collection name="email_plat" long-name="Email Apps Platform Interfaces" level="app">
-<component name="nmail_client_api" long-name="NMail Client API" filter="s60" introduced="^4" class="api placeholder">
-<!--<unit bldFile="email_plat" qt:proFile="email_plat.pro"/> -->
-</component>
-</collection>
-<collection name="emailservices" long-name="Email Services" level="service">
-<component name="nmailbase" filter="s60" long-name="NMail Base" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/nmailbase" qt:proFile="nmailbase.pro"/> -->
-</component>
-<component name="emailcommon" filter="s60" long-name="Email Common" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/emailcommon" qt:proFile="emailcommon.pro"/>-->
-</component>
-<component name="emailframework" filter="s60" long-name="Email Framework" introduced="^2" class="placeholder">
-<!-- <unit bldFile="emailservices/emailframework" qt:proFile="emailframework.pro"/>-->
-</component>
-<component name="emailstore" filter="s60" long-name="Email Store" introduced="^2" class="placeholder">
-<!-- <unit bldFile="emailservices/emailstore" qt:proFile="emailstore.pro"/>-->
-</component>
-<component name="nmclientapi" filter="s60" long-name="Nmail Client API" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/nmclientapi" qt:proFile="nmclientapi.pro"/>-->
-</component>
-<component name="nmailagent" filter="s60" long-name="Nmail Agent" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/nmailagent" qt:proFile="nmailagent.pro"/>-->
-</component>
-</collection>
-<collection name="ipsservices" long-name="IMAP/POP/SMTP Services" level="service">
-<component name="ipssosplugin" filter="s60" long-name="IPS SOS Plugin" introduced="^2" plugin="Y" class="placeholder">
-<!-- SOS? Consider spelling it out since the abbreviation is ambiguous -->
-<!--<unit bldFile="ipsservices/ipssosplugin" qt:proFile="ipssosplugin.pro" />-->
-</component>
-<component name="nmimapclientplugin" filter="s60" long-name="NM IMAP Client Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="ipsservices/nmimapclientplugin" qt:proFile="nmimapclientplugin.pro"/>-->
-</component>
-<component name="nmipsmtms" filter="s60" long-name="NM IPS Client Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="ipsservices/nmipsmtms" qt:proFile="nmipsmtms.pro"/>-->
-</component>
-<component name="nmipssettings" filter="s60" long-name="NM IPS Settings" introduced="^4" class="placeholder">
-<!-- <unit bldFile="ipsservices/nmipssettings" qt:proFile="nmipssettings.pro"/>-->
-</component>
-<component name="ipsservices_build" filter="s60" long-name="IPS Services Build" introduced="^2" class="placeholder">
-<!--<unit bldFile="ipsservices" qt:proFile="ipsservices.pro"/> -->
-<!-- can the exports be broken up into the other components or made a config component?-->
-</component>
-</collection>
-<collection name="emailuis" long-name="Email UIs" level="app">
-<component name="nmailuiengine" filter="s60" long-name="Nmail UI Engine" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailuiengine" qt:proFile="nmailuiengine.pro"/> -->
-</component>
-<component name="nmailuiwidgets" filter="s60" long-name="Nmail UI Widgets" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailuiwidgets" qt:proFile="nmailuiwidgets.pro"/> -->
-</component>
-<component name="nmailuiwidgetsplugin" filter="s60" long-name="Nmail UI Widgets Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailuiwidgetsplugin" qt:proFile="nmailuiwidgetsplugin.pro"/> -->
-</component>
-<component name="nmsettingui" filter="s60" long-name="Nmail Setting UI" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmsettingui" qt:proFile="nmsettingui.pro"/> -->
-</component>
-<component name="nmailcpplugin" filter="s60" long-name="Nmail CP Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailcpplugin" qt:proFile="nmailcpplugin.pro"/> -->
-</component>
-<component name="nmailui" filter="s60" long-name="Nmail UI" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailui" qt:proFile="nmailui.pro"/> -->
-</component>
-<component name="nmindicatorplugin" filter="s60" long-name="Nmail Indicator Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmindicatorplugin" qt:proFile="nmindicatorplugin.pro"/> -->
-</component>
-<component name="nmframeworkadapter" filter="s60" long-name="Nmail Framework Adapter" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmframeworkadapter" qt:proFile="nmframeworkadapter.pro"/> -->
-</component>
-</collection>
-<collection name="commonemail_info" long-name="Email Apps Info" level="app">
-<component name="commonemail_build" long-name="Email Apps Build" introduced="^4">
-<!-- split into actual components -->
-<unit bldFile="app/commonemail" proFile="nmail.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</block>
-<block name="camera" level="apps" long-name="Camera Apps">
-<collection name="camerauis" long-name="Camera UIs">
-<component name="cameraxui" filter="s60" long-name="CameraX UIs">
-<unit bldFile="app/camera/camerauis/cameraxui" filter="!test" proFile="camerax.pro"/>
-</component>
-</collection>
-</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">
-<component name="image_editor_debug_utilities_api" long-name="Image Editor Debug Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
-</component>
-<component name="image_editor_utilities_api" long-name="Image Editor Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_utilities_api/group"/>
-</component>
-<component name="image_editor_definitions_api" long-name="Image Editor Definitions API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_definitions_api/group"/>
-</component>
-<component name="image_editor_system_parameters_api" long-name="Image Editor System Parameters API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_system_parameters_api/group"/>
-</component>
-<component name="image_processing_engine_api" long-name="Image Processing Engine API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_processing_engine_api/group"/>
-</component>
-</collection>
-<collection name="imageeditor" long-name="Image Editor UI" level="ui">
-<component name="pb" filter="s60" long-name="Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/pb/group"/>
-</component>
-<component name="iepb" filter="s60" long-name="Image Editor Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/iepb/group"/>
-</component>
-<component name="imageeditorui" filter="s60" long-name="Image Editor UI">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorui/group"/>
-</component>
-<component name="imageeditormanager" filter="s60" long-name="Image Editor Manager">
-<unit bldFile="app/imgeditor/imageeditor/imageeditormanager/group"/>
-</component>
-<component name="imageeditorapp" filter="s60" long-name="Image Editor Application">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorapp/group"/>
-</component>
-<component name="imageeditor_plugins" filter="s60" long-name="Image Editor Plugins" plugin="Y">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditor/plugins/blackwhiteplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/brightnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/bubbleplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cartoonizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/clipartplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/contrastplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cropplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/drawplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/frameplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/negativeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/redeyeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/resizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotatelplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotaterplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/textplugin/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditor/plugins/drawplugin/group"/>
- -->
-</component>
-<component name="editorprovider" filter="s60" long-name="Image Editor Provider">
-<unit bldFile="app/imgeditor/imageeditor/editorprovider/group"/>
-</component>
-<component name="imageeditor_build" filter="s60" long-name="Image Editor Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditor/group"/>
-</component>
-</collection>
-<collection name="imageeditorengine" long-name="Image Editor Engine" level="engine">
-<component name="filters" filter="s60" long-name="Image Editor Filters">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbrightness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbubble/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbuffer/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercartoon/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterclipart/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercontrast/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercrop/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterdraw/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterframe/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtergrayscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtericlsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegtarget/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filternegate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterredeye/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterrotate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtertext/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
- -->
-</component>
-<component name="imageeditorutils" filter="s60" long-name="Image Editor Utilities">
-<unit bldFile="app/imgeditor/imageeditorengine/imageeditorutils/group"/>
-</component>
-<component name="systemparameters" filter="s60" long-name="System Parameters">
-<unit bldFile="app/imgeditor/imageeditorengine/systemparameters/group"/>
-</component>
-<component name="enginewrapper" filter="s60" long-name="Image Editor Engine Wrapper">
-<unit bldFile="app/imgeditor/imageeditorengine/enginewrapper/group"/>
-</component>
-<component name="imageeditorengine_build" filter="s60" long-name="Image Editor Engine Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoeditor" level="apps" long-name="Video Editor Apps" levels="engine ui">
-<collection name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" level="ui">
-<component name="video_editor_engine_api" long-name="Video Editor Engine API" introduced="^2" class="api">
-<unit bldFile="app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
-</component>
-</collection>
-<collection name="videditor" long-name="Video Editor" level="ui">
-<component name="videoeditorcommon" filter="s60" long-name="Video Editor Common" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditorcommon/group"/>
-</component>
-<component name="videoeditoruicomponents" filter="s60" long-name="Video Editor UI Components" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditoruicomponents/group"/>
-</component>
-<component name="simplevideoeditor" filter="s60" long-name="Simple Video Editor" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplevideoeditor/group"/>
-</component>
-<component name="simplecutvideo" filter="s60" long-name="Simple Cut Video" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplecutvideo/group"/>
-</component>
-<component name="videoprovider" filter="s60" long-name="Video Provider" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoprovider/group"/>
-</component>
-<component name="manualvideoeditor" filter="s60" long-name="Manual Video Editor" introduced="^2" class="placeholder">
-<!-- uncomment when supported
- <meta rel="config">
- <defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
- </meta>
- <unit bldFile="videditor/manualvideoeditor/group"/> -->
-</component>
-<component name="videditor_build" filter="s60" long-name="Video Editor Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videditor/group"/>
-</component>
-</collection>
-<collection name="videoeditorengine" long-name="Video Editor Engine" level="engine">
-<component name="audioeditorengine" filter="s60" long-name="Audio Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/audioeditorengine/group"/>
-</component>
-<component name="avcedit" filter="s60" long-name="AVC Editing" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/avcedit/group"/>
-</component>
-<component name="h263decoder" filter="s60" long-name="H.263 Decoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/h263decoder/group"/>
-</component>
-<component name="mp3aacmaniplib" filter="s60" long-name="MP3 and AAC Manipulation Library" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
-</component>
-<component name="vedtranscoder" filter="s60" long-name="Video Editor Transcoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedtranscoder/group"/>
-</component>
-<component name="vedengine" filter="s60" long-name="Video Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedengine/group"/>
-</component>
-<component name="videoeditorengine_build" filter="s60" long-name="Video Editor Engine Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videoeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
-<collection name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" level="apps">
-<component name="videoplayer_startup_api" long-name="Video Player Startup API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videoplayer_startup_api/group" filter="!test"/>
-</component>
-<component name="videocollection_api" long-name="Video Collection API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videocollection_api/group"/>
-</component>
-</collection>
-<collection name="videocollection" long-name="Video Collection" level="util">
-<component name="mpxmyvideoscollection" filter="s60" long-name="MPX My Videos Collection" introduced="^3">
-<unit bldFile="app/videoplayer/videocollection/mpxmyvideoscollection/group"/>
-</component>
-<component name="videocollectionwrapper" filter="s60" long-name="Video Collection Wrapper" introduced="^4">
-<unit bldFile="app/videoplayer/videocollection/videocollectionwrapper" proFile="videocollectionwrapper.pro" qmakeArgs="-r"/>
-</component>
-<component name="videocollectionview" filter="s60" long-name="Video Collection View" introduced="^4">
-<unit bldFile="app/videoplayer/videocollection/videocollectionview" proFile="videocollectionview.pro" qmakeArgs="-r"/>
-</component>
-<component name="videofiledetailsview" filter="s60" long-name="Video File Details View" introduced="^4">
-<unit bldFile="app/videoplayer/videocollection/videofiledetailsview" proFile="videofiledetailsview.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="mediasettings" long-name="Media Settings" level="support">
-<!-- this is really a component. Should be moved down a directory -->
-<component name="mediasettings_build" filter="s60" long-name="Media Settings Build">
-<unit bldFile="app/videoplayer/mediasettings/group"/>
-</component>
-</collection>
-<collection name="videoplayerapp" long-name="Video Player App" level="apps">
-<component name="videoplayerengine" long-name="Video Player Engine" filter="s60" introduced="^4">
-<unit bldFile="app/videoplayer/videoplayerapp/videoplayerengine" proFile="videoplayerengine.pro" qmakeArgs="-r"/>
-</component>
-<component name="hbvideoplayer" filter="s60" long-name="HB Video Player" introduced="^4">
-<unit bldFile="app/videoplayer/videoplayerapp/hbvideoplayer" proFile="hbvideoplayer.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="videoplayback" long-name="Video Playback Plugins" level="plugin">
-<component name="hbvideoplaybackview" filter="s60" long-name="HB Video Playback View" introduced="^4" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/hbvideoplaybackview" proFile="hbvideoplaybackview.pro" qmakeArgs="-r"/>
-</component>
-<component name="hbvideoplaybackviewplugin" filter="s60" long-name="HB Video Playback View Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/hbvideoplaybackviewplugin" proFile="hbvideoplaybackviewplugin.pro" qmakeArgs="-r"/>
-</component>
-<component name="videohelix" long-name="Video Helix" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videohelix/group"/>
-</component>
-</collection>
-</block>
-<block name="photos" level="apps" long-name="Photos" levels="util support ui app">
-<collection name="photos_group" long-name="Photos Group" level="support">
-<component name="photos_group_build" filter="s60" long-name="Photos Group Build" introduced="^4" class="placeholder">
-<!--<unit bldFile="group" qt:proFile="group.pro"/> -->
-</component>
-</collection>
-<collection name="photos_loggers" long-name="Photos Loggers" level="util">
-<component name="photos_loggerqt" filter="s60" long-name="Photos Logger Qt" introduced="^4" class="placeholder">
-<!--<unit bldFile="loggers/loggerqt" qt:proFile="loggerqt.pro"/> -->
-</component>
-</collection>
-<collection name="photos_commonutilities" long-name="Photos Common Utilities" level="util">
-<component name="photos_externalutility" filter="s60" long-name="Photos External Utility" introduced="^4" class="placeholder">
-<!--<unit bldFile="commonutilities/externalutility" qt:proFile="externalutility.pro"/> -->
-</component>
-<component name="imagedecoderwrapper" filter="s60" long-name="Image Decoder Wrapper" introduced="^4" class="placeholder">
-<!--<unit bldFile="commonutilities/imagedecoderwrapper" qt:proFile="imagedecoderwrapper.pro"/> -->
-</component>
-</collection>
-<collection name="photos_ui" long-name="Photos UI" level="ui">
-<component name="photos_uiengine" filter="s60" long-name="Photos UI Engine" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/uiengine" qt:proFile="uiengine.pro"/> -->
-</component>
-<component name="photos_commandhandlers" filter="s60" long-name="Photos Command Handlers" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/commandhandlers" qt:proFile="commandhandlers.pro"/> -->
-</component>
-<component name="photos_views" filter="s60" long-name="Photos Views" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/views" qt:proFile="views.pro"/> -->
-</component>
-<component name="photos_viewmanagement" filter="s60" long-name="Photos View Management" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/viewmanagement" qt:proFile="viewmanagement.pro"/> -->
-</component>
-</collection>
-<collection name="photos_main" long-name="Photos Main" level="support">
-<component name="photos_main_build" filter="s60" long-name="Photos Main Build" introduced="^4" class="placeholder">
-<!--<unit bldFile="main" qt:proFile="main.pro"/> -->
-</component>
-</collection>
-<collection name="imageviewerapp" long-name="Image Viewer App" level="support">
-<component name="imageviewerapp_build" filter="s60" long-name="Image Viewer App Build" introduced="^4" class="placeholder">
-<!--<unit bldFile="imageviewerapp" qt:proFile="imageviewerapp.pro"/> -->
-</component>
-</collection>
-<collection name="photos_info" long-name="Photos Info" level="support">
-<component name="photos_build" filter="s60" long-name="Photos Build" introduced="^4">
-<!-- split this up into the above components -->
-<unit bldFile="app/photos" proFile="photos.pro"/>
-</component>
-</collection>
-</block>
-<block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support hs app">
-<!-- move the export .pri files into their components and uncomment the units -->
-<collection name="musicplayer_utilities " long-name="Music Player Utilities" level="support">
-<component name="mpnowplayingbanner" filter="s60" long-name="MP Now Playing Banner" introduced="^4" class="placeholder">
-<!-- <unit bldFile="utilities/mpnowplayingbanner" qt:proFile="mpnowplayingbanner.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-<component name="mpsettingsmanager" filter="s60" long-name="MP Settings Manager" introduced="^4" class="placeholder">
-<!-- <unit bldFile="utilities/mpsettingsmanager" qt:proFile="mpsettingsmanager.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-</collection>
-<collection name="musicfetcher " long-name="Music Fetcher" level="support">
-<!-- collection is really a component, move down a directory -->
-<component name="musicfetcher_buld" filter="s60" long-name="Music Fetcher Build" introduced="^4" class="placeholder">
-<!-- <unit bldFile="musicfetcher" qt:proFile="musicfetcher.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-</collection>
-<collection name="musicplayer_app " long-name="Music Player Application" level="app">
-<!-- collection is really a component, move down a directory -->
-<component name="musicplayer_app_build" filter="s60" long-name="Music Player Application Build" introduced="^4" class="placeholder">
-<!-- <unit bldFile="app" qt:proFile="app.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-</collection>
-<collection name="mpviewplugins " long-name="Music Player View Plugins" level="plugins">
-<component name="mpcollectionviewplugin" filter="s60" long-name="MP Collection View Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpviewplugins/mpcollectionviewplugin/group"/>-->
-</component>
-<component name="mpplaybackviewplugin" filter="s60" long-name="MP Playback View Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpviewplugins/mpplaybackviewplugin/group"/>-->
-</component>
-</collection>
-<collection name="mpserviceplugins" long-name="Music Player Service Plugins" level="plugins">
-<component name="audioeffects" filter="s60" long-name="Audio Effects" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/audioeffects/group"/>-->
-</component>
-<component name="localaudio" filter="s60" long-name="Local Audio" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/localaudio/group"/>-->
-</component>
-<!-- Note: it's called SQLite, not SQLLite, just the one "L" -->
-<component name="mpxsqlitedbcommon" filter="s60" long-name="MPX SQLite Database Common" introduced="^4" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitedbcommon/group"/>-->
-</component>
-<component name="mpxsqlitedbplugin" filter="s60" long-name="MPX SQLite Database Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitedbplugin/group"/>-->
-</component>
-<component name="mpxsqlitepodcastdbplugin" filter="s60" long-name="MPX SQLlite Podcast Database Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
-</component>
-<component name="m3uplaylistplugin" filter="s60" long-name="M3U Playlist Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
-</component>
-</collection>
-<collection name="musicplayer_info" long-name="Music Player Apps Info" level="app">
-<component name="musicplayer_build" filter="s60" long-name="Music Player Build">
-<!-- should brak up into individual components -->
-<unit bldFile="app/musicplayer" proFile="qtmusicplayer.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-</block>
-<block name="radio" level="apps" long-name="Radio Apps" levels="engine ui">
-<collection name="radioengine" long-name="Radio Engine" level="engine">
-<component name="radioengineutils" filter="s60" long-name="Radio Engine Utils" introduced="^4">
-<unit bldFile="app/radio/radioengine/utils/group"/>
-</component>
-<component name="radioenginesettings" filter="s60" long-name="Radio Engine Settings" introduced="^4">
-<unit bldFile="app/radio/radioengine/settings/group"/>
-</component>
-<component name="radioengine_engine" filter="s60" long-name="Radio Engine" introduced="^4">
-<unit bldFile="app/radio/radioengine/engine/group"/>
-</component>
-</collection>
-<collection name="radioapp" long-name="Radio App" level="ui">
-<component name="radioenginewrapper" filter="s60" long-name="Radio Engine Wrapper" introduced="^4">
-<unit bldFile="app/radio/radioapp/radioenginewrapper" proFile="radioenginewrapper.pro"/>
-</component>
-<component name="radiopresetstorage" filter="s60" long-name="Radio Preset Storage" introduced="^4">
-<unit bldFile="app/radio/radioapp/radiopresetstorage" proFile="radiopresetstorage.pro"/>
-</component>
-<component name="radiouiengine" filter="s60" long-name="Radio UI Engine" introduced="^4">
-<unit bldFile="app/radio/radioapp/radiouiengine" proFile="radiouiengine.pro"/>
-</component>
-<component name="radiowidgets" filter="s60" long-name="Radio Widgets" introduced="^4">
-<unit bldFile="app/radio/radioapp/radiowidgets" proFile="radiowidgets.pro"/>
-</component>
-<component name="radioapplication" filter="s60" long-name="Radio Application" introduced="^4">
-<unit bldFile="app/radio/radioapp/radioapplication" proFile="radioapplication.pro"/>
-</component>
-<component name="radio_rom" filter="s60" long-name="Radio ROM" introduced="^4">
-<unit bldFile="app/radio/rom"/>
-</component>
-</collection>
-</block>
-<block name="internetradio" level="apps" long-name="Internet Radio Apps" levels="engine server ui">
-<collection name="internetradio2_0" long-name="Internet Radio 2.0" level="ui">
-<!-- collection is really a component. Move down a dir -->
-<component name="internetradio2_0_build" long-name="Internet Radio 2.0 Build">
-<unit bldFile="app/internetradio/internetradio2.0/group"/>
-</component>
-</collection>
-<collection name="presetserver" long-name="Preset Server" level="server">
-<!-- collection is really a component. Move down a dir -->
-<component name="presetserver_build" long-name="Preset Server Build">
-<unit bldFile="app/internetradio/presetserver/group"/>
-</component>
-</collection>
-<collection name="qtinternetradio" long-name="Qt Internet Radio">
-<component name="qtinternetradio_build" long-name="Qt Internet Radio Build">
-<!-- Move down a dir or break into components-->
-<unit bldFile="app/internetradio/qtinternetradio" proFile="all.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-</block>
-<block name="homescreen" level="apps" long-name="Home Screen Apps" levels="support task ss hs">
-<collection name="homescreen_info" long-name="Home Screen Info" level="support">
-<component name="homescreen_build" long-name="Homescreen Build">
-<!-- break this up properly into components -->
-<unit bldFile="app/homescreen" proFile="homescreen.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-<collection name="homescreen_test" long-name="Home Screen Test" level="support"/>
-<!-- fiill in details with broken up homescreen_build -->
-<collection name="homescreenapp" long-name="Home Screen Application" level="hs">
-<component name="hsutils" long-name="Home Screen Utils" introduced="^4"/>
-<component name="hsdomainmodel" long-name="HS Domain Model" introduced="^4"/>
-<component name="hs_runtimeplugins" long-name="HS Runtime Plugins" introduced="^4" plugin="Y"/>
-<component name="hs_serviceproviders" long-name="HS Service Providers" introduced="^4" plugin="Y"/>
-<component name="hs_stateplugins" long-name="HS State Plugins" introduced="^4" plugin="Y"/>
-<component name="hs_widgetplugins" long-name="HS Widget Plugins" introduced="^4" plugin="Y"/>
-<component name="hsapplication" long-name="Home Screen Application" introduced="^4"/>
-<component name="hshomescreenclientplugin" long-name="Home Screen Client Plugin" introduced="^4" plugin="Y"/>
-<component name="hsmenucontentpublish" long-name="HS Menu Content Publish" introduced="^4"/>
-</collection>
-<collection name="screensaverapp" long-name="Screen Saver Application" level="ss">
-<component name="snsrutils" long-name="Screen Saver Utils" introduced="^4"/>
-<component name="snsr_serviceproviders" long-name="Screen Saver Service Providers" introduced="^4" plugin="Y"/>
-<component name="snsr_stateproviders" long-name="Screen Saver State Providers" introduced="^4" plugin="Y"/>
-<component name="snsr_runtimeproviders" long-name="Screen Saver Runtime Providers" introduced="^4" plugin="Y"/>
-<component name="snsrapplication" long-name="Screen Saver Application" introduced="^4"/>
-<component name="screensaverproviders" long-name="Screen Saver Providers" introduced="^4" plugin="Y"/>
-</collection>
-<collection name="taskswitcherapp" long-name="Task Switcher Application" level="task">
-<component name="taskswitcherappecom" long-name="Task Switcher Application ECom" introduced="^4"/>
-<component name="tsserviceplugin" long-name="Task Switcher Service Plugin" introduced="^4" plugin="Y"/>
-<component name="ts_runtimeplugins" long-name="TS Runtime Plugins" introduced="^4" plugin="Y"/>
-<component name="tsapplication" long-name="Task Switcher Application" introduced="^4"/>
-</collection>
-</block>
-<block name="homescreentools" level="services" long-name="Home Screen Tools" levels="tool install">
-<collection name="dtdinstaller" long-name="DTD Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<!-- this needs to be built first, does build order need to be forced with filters? -->
-<component name="dtdinstaller_build" filter="s60,bldmefirst" long-name="DTD Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/dtdinstaller/group"/>
-</component>
-</collection>
-<collection name="themeinstaller" long-name="Theme Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="themeinstaller_build" filter="s60" long-name="Theme Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/themeinstaller/group"/>
-</component>
-</collection>
-<collection name="widgettools" long-name="Widget Tools" level="install">
-<component name="hspluginpreinstaller" filter="s60" long-name="HS Plugin Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/hspluginspreinstaller/group"/>
-</component>
-<component name="wrtwidgetpreinstaller" filter="s60" long-name="WRT Widget Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
-</component>
-</collection>
-</block>
-<block name="jrt" level="services" long-name="Java Runtime" levels="util generic rt ui">
-<collection name="jrt_plat" long-name="JRT Platform Interfaces" level="ui">
-<component name="java_registry_api" long-name="Java Registry API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_registry_api/build"/>
-</component>
-<component name="java_env_info_api" long-name="Java Environment Info API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_env_info_api/build"/>
-</component>
-<component name="java_debug_api" long-name="Java Debug API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_debug_api/build"/>
-</component>
-</collection>
-<collection name="java_stubs" long-name="Java Stubs" level="util">
-<!-- uncomment all components when configuration is in place. Currently #included from jrt_build -->
-<component name="javadrmutils" long-name="Java DRM Utils" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtdrmutils/group"/>-->
-</component>
-<component name="javaenvinfo" long-name="Java Environment Info" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtenvinfo/group"/>-->
-</component>
-<component name="javaregistry" filter="s60,sf_build" long-name="Java Registry" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtregistry/clientserver/client/group"/>-->
-</component>
-<component name="java_stubs_build" filter="s60,sf_build" long-name="Java Stubs ROM" class="placeholder">
-<!-- Remove the #includes and rename JRT ROM-->
-<!--<unit bldFile="java_stubs/group"/>-->
-</component>
-</collection>
-<collection name="jrt_info" long-name="JRT Info" level="rt">
-<component name="jrt_build" filter="s60" long-name="JRT Build">
-<!-- needed for __JAVA_STUBS condition -->
-<unit bldFile="app/jrt/group"/>
-</component>
-</collection>
-</block>
-<block name="conntools" level="services" long-name="Connectivity Tools" levels="config app">
-<collection name="nettools" long-name="Net Tools" level="app">
-<component name="conntest" filter="s60" long-name="Connection Test" purpose="development">
-<unit bldFile="app/conntools/nettools/conntest/group"/>
-</component>
-</collection>
-<collection name="emulatorlan" long-name="Emulator LAN" level="config">
-<!-- component is actually a colleciton, should be moved down a directory -->
-<component name="emulatorlan_build" filter="s60" long-name="Emulator LAN Build" purpose="development" class="config">
-<unit bldFile="app/conntools/emulatorlan/group"/>
-</component>
-</collection>
-</block>
-<block name="rndtools" level="services" long-name="R&D tools" levels="support generic test util">
-<collection name="creator" long-name="Creator" level="support">
-<!-- collection is really a component. Should move down a directory -->
-<component name="creator_build" filter="s60" long-name="Creator Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/creator/group"/>
-</component>
-</collection>
-<collection name="filebrowser" long-name="File Browser" level="util">
-<!-- consider collapsing into a single component -->
-<component name="fileopserver" filter="s60" long-name="File Operations Server" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
-</component>
-<component name="fileopclient" filter="s60" long-name="File Operations Client" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!--<unit bldFile="filebrowser/fileopclient/group"/>-->
-</component>
-<component name="filebrowser_build" filter="s60" long-name="File Browser Application" purpose="development" class="tool">
-<!-- Need to make this a self-contained component by removing #includes. Can only do when configuration is in place-->
-<unit bldFile="app/rndtools/filebrowser/group"/>
-</component>
-</collection>
-<collection name="launcher" long-name="Launcher" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="launcher_build" filter="s60" long-name="Launcher Utility" purpose="development" class="tool">
-<unit bldFile="app/rndtools/launcher/group"/>
-</component>
-</collection>
-<collection name="loadgen" long-name="Load Generator" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="loadgen_build" filter="s60" long-name="Load Generator Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/loadgen/group"/>
-</component>
-</collection>
-<collection name="perfmon" long-name="Performance Monitor" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="perfmon_build" filter="s60" long-name="Performance Monitor Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/perfmon/group"/>
-</component>
-</collection>
-<collection name="screengrabber" long-name="Screen Grabber" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="screengrabber_build" filter="s60" long-name="ScreenGrabber" purpose="development" class="tool">
-<unit bldFile="app/rndtools/screengrabber/group"/>
-</component>
-</collection>
-<collection name="stifui" long-name="STIF UI" level="generic">
-<component name="stifui_stifui" filter="s60" long-name="STIF UI" purpose="development">
-<unit bldFile="app/rndtools/stifui/stifui/group"/>
-</component>
-<component name="uitestserverstarter" filter="s60" long-name="UI Test Server Starter" purpose="development">
-<unit bldFile="app/rndtools/stifui/uitestserverstarter/group"/>
-</component>
-<component name="stifui_build" filter="s60" long-name="STIF UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/stifui/group"/>
-</component>
-</collection>
-<collection name="memspyui" long-name="Memspy UI" level="generic">
-<!-- collection is really a component. Should move down a directory -->
-<component name="memspyui_build" filter="s60" long-name="Memspy UI Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/memspyui/group"/>
-</component>
-</collection>
-<collection name="htiui" long-name="Harmonized Test Interface UI" level="generic">
-<component name="HtiServicePlugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- can only have a single unit. Should #include from a common bld.inf file -->
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiFtpBackupFake/group"/>
-</component>
-<component name="htidevicereboot" filter="s60" long-name="HTI Device Reboot" purpose="development">
-<unit bldFile="app/rndtools/htiui/htidevicereboot/group"/>
-</component>
-<component name="htistartupwait" filter="s60" long-name="HTI Startup Wait" purpose="development">
-<unit bldFile="app/rndtools/htiui/htistartupwait/group"/>
-</component>
-<component name="htiadmin" filter="s60" long-name="HTI Admin" purpose="development">
-<unit bldFile="app/rndtools/htiui/htiadmin/group"/>
-</component>
-<component name="htiui_build" filter="s60" long-name="HTI UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/htiui/group"/>
-</component>
-</collection>
-</block>
-<block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools if ui">
-<collection name="userguide" long-name="User Guide" level="if">
-<!-- collection is really a component. Move down a directory -->
-<component name="userguide_build" long-name="User Guide Build" filter="s60" introduced="^4">
-<unit bldFile="app/helps/userguide" proFile="Userguide.pro"/>
-</component>
-</collection>
-<collection name="symhelp" long-name="Symbian Help" level="eng">
-<component name="helpmodel" long-name="Help" introduced="6.0" purpose="optional">
-<unit bldFile="app/helps/symhelp/helpmodel/group" mrp="app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
-</component>
-</collection>
-<collection name="helps_info" long-name="Help Apps Info" level="ui">
-<component name="helps_metadata" long-name="Help Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/helps/helps_info/helps_metadata/helps_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
-<collection name="buildverification" long-name="Build Verification" level="services">
-<component name="autosmoketest" long-name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
-<unit bldFile="app/techview/buildverification/autosmoketest/Group" mrp="app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
-</component>
-<component name="smoketest" long-name="Smoke Test" filter="gt" purpose="development">
-<unit bldFile="app/techview/buildverification/smoketest/Group" mrp="app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
-</component>
-</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="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"/>
-<collection name="installationapps" long-name="Installation Apps" level="apps2"/>
-<collection name="messagingapps" long-name="Messaging Apps" level="apps2"/>
-<collection name="telephonyapps" long-name="Telephony Apps" level="apps1"/>
-<collection name="networkingapps" long-name="Networking Apps" level="apps1"/>
-<collection name="networkingutils" long-name="Networking Utils" level="utils"/>
-<collection name="shortlinkapps" long-name="Shortlink Apps" level="apps1"/>
-<collection name="testapps" long-name="Test Apps" level="utils"/>
-<collection name="avapps" long-name="A/V Apps" level="apps3"/>
-<collection name="toolkit" long-name="Toolkit" level="utils"/>
-<collection name="techview_info" long-name="Techview Info" level="apps3">
-<component name="techview_metadata" long-name="Techview Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/techview/techview_info/techview_metadata/techview_metadata.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
--- a/symbian4/single/sysdefs/auto/model_20100504154918_e13bab546a73.xml Wed May 05 12:21:47 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9092 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a package or prebuilt -->
-<!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) "N"
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile may someday be removed in favour of mrp -->
-<!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="low mw high">
-<block name="stubs" level="high" span="2" long-name="Stubs" levels="adaptation plugin mid engine">
-<collection name="audiostubs" long-name="Audio Stubs" level="adaptation">
-<component name="devsoundextensions_stubs" long-name="Devsound Extensions Stubs">
-<unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/group"/>
-</component>
-<component name="fmradiotunercontrolstub" long-name="FM Radio Tuner Control Stub">
-<unit bldFile="adaptation/stubs/audiostubs/fmradiotunercontrolstub/group"/>
-</component>
-</collection>
-<collection name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaptation Stub" level="adaptation">
-<component name="btaudioadaptation_stub_build" long-name="Bluetooth Audio Adaptation Stub Build" filter="oem_build">
-<unit bldFile="adaptation/stubs/btaudioadaptation_stub/group"/>
-</component>
-</collection>
-<collection name="drm_stubs" long-name="DRM Stubs" level="plugin">
-<component name="drm_stubs_build" long-name="DRM Stubs Build">
-<unit bldFile="adaptation/stubs/drm_stubs/group"/>
-</component>
-</collection>
-<collection name="ocrsrv_stub" long-name="OCR Services Stub" level="mid">
-<component name="ocrsrv_stub_build" long-name="OCR Services Stub Build" filter="!dfs_build">
-<unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
-</component>
-</collection>
-<collection name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
-<component name="omasuplasnconverterstubimpl_build" long-name="OMA SUPL ASN Converter Stub Implementation Build" filter="!dfs_build">
-<unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
-</component>
-</collection>
-<collection name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" level="plugin">
-<component name="posmsgpluginreferenceimpl_build" long-name="POS Message Plugin Reference Implementation Build" plugin="Y">
-<unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
-</component>
-</collection>
-<collection name="srsfenginestub" long-name="SRSF Engine Stub" level="engine">
-<component name="srsfenginestub_build" long-name="SRSF Engine Stub Build" filter="stubs">
-<unit bldFile="adaptation/stubs/srsfenginestub/group"/>
-</component>
-</collection>
-<collection name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub" level="plugin">
-<component name="power_save_display_mode_stub_build" long-name="Power Save Display Mode Stub Build">
-<unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
-</component>
-</collection>
-<collection name="systemswstubs" long-name="System Software Stubs" level="adaptation">
-<component name="ddcaccessstub" long-name="DDC Access Stub">
-<unit bldFile="adaptation/stubs/systemswstubs/ddcaccessstub/group"/>
-</component>
-<component name="tvoutconfig" long-name="TV Out Config">
-<unit bldFile="adaptation/stubs/systemswstubs/TVOutConfig/group" filter="oem_build"/>
-</component>
-<component name="accessorypolicyreference" long-name="Accessory Policy Reference">
-<unit bldFile="adaptation/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
-</component>
-<component name="asyreference" long-name="ASY Reference" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
-</component>
-<component name="examplecommonisc" long-name="Example Common ISC">
-<unit bldFile="adaptation/stubs/systemswstubs/examplecommonisc/group" filter="oem_build"/>
-</component>
-<component name="exampledsy" long-name="Example DSY">
-<unit bldFile="adaptation/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
-</component>
-<component name="featuremanagerstub" long-name="Feature Manager Stub">
-<unit bldFile="adaptation/stubs/systemswstubs/featuremanagerstub/group" filter="oem_build"/>
-</component>
-<component name="hwrmstubplugins" long-name="Hardware Resource Manager Stub Plugins" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
-</component>
-<component name="hwrmhapticsstubplugin" long-name="Hardware Resource Manager Haptics Stub Plugin" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
-</component>
-<component name="sensorchannelsreference" long-name="Sensor Channels Reference">
-<unit bldFile="adaptation/stubs/systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
-</component>
-<component name="ssyreference" long-name="SSY Reference" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
-</component>
-<component name="startupadaptationstub" long-name="Startup Adaptation Stub" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/startupadaptationstub/group" filter="oem_build"/>
-</component>
-<component name="tiltcompensationstub" long-name="Tilt Compensation Stub">
-<unit bldFile="adaptation/stubs/systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
-</component>
-<component name="tvoutbehaviour" long-name="TV Out Behaviour">
-<unit bldFile="adaptation/stubs/systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
-</component>
-<component name="wiredbearerreference" long-name="Wired Bearer Reference" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
-</component>
-</collection>
-<collection name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" level="engine">
-<component name="tactileclickplugin_stub_build" long-name="Tactile Click Plugin Stub Build" plugin="Y">
-<unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
-</component>
-</collection>
-<collection name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub" level="mid">
-<component name="wlanhwinit_stub_build" long-name="WLAN Hardware Init Stub Build">
-<unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
-<collection name="omap3530" long-name="OMAP 3530" level="hw-if">
-<component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530" mrp="adaptation/beagleboard/omap3530/base_beagle.mrp"/>
-</component>
-<component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/kernel"/>
-</component>
-<component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/beagleboard"/>
-</component>
-</collection>
-</block>
-<block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
-<collection name="qemu_baseport" long-name="Baseport" level="hw-if">
-<component name="syborg" long-name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/qemu/baseport/syborg" mrp="adaptation/qemu/baseport/syborg/syborg.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
-<collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
-<component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
-<unit bldFile="os/kernelhwsrv/brdbootldr/ubootldr" mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
-</component>
-</collection>
-<collection name="bsptemplate" long-name="Board Support Package Template" level="hw-if">
-<component name="asspandvariant" long-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 name="kernel" long-name="Kernel Architecture" level="adaptation">
-<component name="eka" long-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 name="kerneltest" long-name="Kernel Test" level="hw-if">
-<component name="e32utils" long-name="E32 Utilities" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32utils/group" mrp="os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/>
-</component>
-<component name="e32test" long-name="E32 Tests" purpose="development">
-<unit bldFile="os/kernelhwsrv/kerneltest/e32test/group" mrp="os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
-</component>
-<component name="f32test" long-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 name="ldds" long-name="Logical Device Drivers" level="adaptation">
-<component name="ethernetldd" long-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 name="audioldd" long-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>
-<component name="serialldd" long-name="Serial Port Drivers" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
-</component>
-<component name="legacydrivers" long-name="Legacy Drivers" purpose="optional">
-<unit mrp="os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
-</component>
-<component name="locmedia" long-name="Local Media Subsystem" introduced="8.1b" purpose="mandatory">
-<!-- these are LDDs for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
-</component>
-<component name="runmodedebugger" long-name="Run Mode Debugger" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/debug/group" mrp="os/kernelhwsrv/kernel/eka/drivers/debug/group/base_e32_drivers_debug.mrp"/>
-</component>
-<component name="btrace" long-name="Kernel Trace Tool" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/trace" mrp="os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
-</component>
-<component name="cameraldd" long-name="Camera Drivers" introduced="^3" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/camerasc" mrp="os/kernelhwsrv/kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
-</component>
-<component name="displayldd" long-name="Display Drivers" introduced="^3" purpose="optional">
-<!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/display" mrp="os/kernelhwsrv/kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
-</component>
-<component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
-</component>
-<component name="usbdescriptors" long-name="USB Descriptors" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors" mrp="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors/base_drivers_usbdescriptors.mrp"/>
-</component>
-<component name="usbdi_utils" long-name="USB DI Utils" purpose="optional">
-<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils" mrp="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils/base_drivers_usbdi_utils.mrp"/>
-</component>
-</collection>
-<collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
-<component name="mediadrivers" long-name="Media Drivers" purpose="optional">
-<!-- these are for storage media-->
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/media" mrp="os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
-</component>
-<component name="genericboardsupport" long-name="Generic Board Support" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
-</component>
-</collection>
-<collection name="userlibandfileserver" long-name="User Library and File Server" level="framework">
-<component name="euser" long-name="User Library" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/euser" mrp="os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
-</component>
-<component name="compsupp" long-name="Compiler Runtime Support" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/compsupp" mrp="os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
-</component>
-<component name="fileserver" long-name="File Server" filter="gt" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
-</component>
-<component name="estart" long-name="Base Starter" filter="gt" purpose="optional">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
-</component>
-<component name="domainmgr" long-name="Domain Manager" introduced="8.1b" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
-</component>
-</collection>
-<collection name="filesystems" long-name="File Systems" level="framework">
-<component name="romfs" long-name="ROM File System" filter="gt" purpose="optional" plugin="Y">
-<unit mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
-</component>
-<component name="rofs" long-name="ROFS" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
-</component>
-<component name="usbmsfs" long-name="USB Mass Storage File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
-</component>
-<component name="usbhostmssrv" long-name="USB Host Mass Storage Server" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage/base_f32_shostmassstorage.mrp"/>
-</component>
-<component name="fat32fs" long-name="FAT32 File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
-</component>
-<component name="fatfs" long-name="FAT File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
-</component>
-<component name="compfs" long-name="Composite File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
-</component>
-</collection>
-<collection name="halservices" long-name="HAL Services" level="framework">
-<component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
-<unit bldFile="os/kernelhwsrv/halservices/hal" mrp="os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
-</component>
-</collection>
-<collection name="textmodeshell" long-name="Text Mode Shell" level="test">
-<component name="e32wsrv" long-name="Text Window Server" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/ewsrv" mrp="os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
-</component>
-<component name="textshell" long-name="Text Shell" filter="gt" purpose="development">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
-</component>
-</collection>
-<collection name="baseapitest" long-name="Base API Tests" level="test"/>
-<collection name="kernelhwsrv_info" long-name="Kernel and Hardware Services Info" level="test">
-<component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 config">
-<collection name="emulator" long-name="Emulator" level="bsp">
-<component name="emulatorbsp" long-name="Emulator BSP" purpose="optional">
-<unit bldFile="os/boardsupport/emulator/emulatorbsp" mrp="os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
-</component>
-</collection>
-<collection name="haitest" long-name="HAI Test Suites" level="test">
-<component name="bspsvs" long-name="BSP Verification Suite" introduced="^2" purpose="development">
-<unit mrp="os/boardsupport/haitest/bspsvs/group/bspsvs.mrp"/>
-</component>
-</collection>
-<collection name="boardsupport_info" long-name="Board Support Info" level="config">
-<component name="boardsupport_metadata" long-name="Board Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/boardsupport/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
-<collection name="bldsystemtools" long-name="Build System Tools" level="bld">
-<component name="sysdeftools" long-name="System Definition Tools" purpose="development" introduced="^2">
-<unit mrp="os/buildtools/bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
-</component>
-<component name="commonbldutils" long-name="Common Utils" purpose="development">
-<unit mrp="os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
-</component>
-</collection>
-<collection name="toolsandutils" long-name="Tools and Utils" level="mw">
-<component name="productionbldtools" long-name="Production Build Tools" filter="gt" purpose="development">
-<unit mrp="os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
-</component>
-<component name="e32tools" long-name="E32 Tools" deprecated="^2" purpose="development" class="PC">
-<unit bldFile="os/buildtools/toolsandutils/e32tools/group" mrp="os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
-</component>
-<component name="autotest" long-name="Autotest" purpose="development">
-<unit bldFile="os/buildtools/toolsandutils/autotest/group" mrp="os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
-</component>
-</collection>
-<collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
-<component name="e32toolp" long-name="E32 Perl Tools" purpose="development" filter="sf_build" class="PC">
-<unit mrp="os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="os/buildtools/sbsv1_os/e32toolp/group"/>
-</component>
-</collection>
-<collection name="imgtools_os" long-name="Image Tools" level="fw">
-<component name="romkiteka2" long-name="ROMKIT EKA2" deprecated="^2" purpose="development">
-<unit bldFile="os/buildtools/imgtools_os/romkiteka2/group" mrp="os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
-</component>
-</collection>
-<collection name="misccomponents" long-name="Misc Components" level="mw">
-<component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt" purpose="development">
-<unit bldFile="os/buildtools/misccomponents/emulatorlauncher/group" mrp="os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
-</component>
-</collection>
-<collection name="buildtools_info" long-name="Build Tools Info" level="ui">
-<component name="buildtools_metadata" long-name="Build Tools Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/buildtools/buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
-<collection name="ossrv_pub" long-name="Generic OS Services Public Interfaces" level="utilities">
-<component name="boost_apis" long-name="Boost APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/boost_apis/group"/>
-</component>
-<component name="cpp_wrappers" long-name="Cpp wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cpp_wrappers/group"/>
-</component>
-<component name="character_type_apis" long-name="Character Type APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/character_type_apis/group"/>
-</component>
-<component name="compiler_specific_runtime_support" long-name="Compiler Specific Runtime Support" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/compiler_specific_runtime_support/group"/>
-</component>
-<component name="ossrv_configuration_api" long-name="Generic OS Services Configuration API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/configuration/group"/>
-</component>
-<component name="crypto_authentication_codes_and_hash_functions_api" long-name="Crypto Authentication Codes and Hash Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
-</component>
-<component name="crypto_auxillary_functions_api" long-name="Crypto Auxillary Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_auxillary_functions_api/group"/>
-</component>
-<component name="crypto_certificates_api" long-name="Crypto Certificates API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_certificates_api/group"/>
-</component>
-<component name="crypto_inputoutput_and_data_encoding_api" long-name="Crypto Input/Output and Data Encoding API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
-</component>
-<component name="crypto_public_key_cryptography_and_key_agreement_api" long-name="Crypto Public Key Cryptography and Key Agreement API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
-</component>
-<component name="crypto_symmetric_ciphers_api" long-name="Crypto Symmetric Ciphers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_symmetric_ciphers_api/group"/>
-</component>
-<component name="crypto_utility_functions_api" long-name="Crypto Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/crypto_utility_functions_api/group"/>
-</component>
-<component name="cryptogaphy_related_api" long-name="Cryptogaphy Related API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/cryptogaphy_related_api/group"/>
-</component>
-<component name="ossrv_debug_api" long-name="Generic OS Services Debug API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/debug/group"/>
-</component>
-<component name="ossrv_exceptions_api" long-name="Generic OS Services Exceptions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/exceptions/group"/>
-</component>
-<component name="gboxed" long-name="GBoxed API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gboxed/group"/>
-</component>
-<component name="glib_arrays" long-name="Glib Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_arrays/group"/>
-</component>
-<component name="glib_asynchronous_queues" long-name="Glib Asynchronous Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_asynchronous_queues/group"/>
-</component>
-<component name="glib_atomic_operations" long-name="Glib Atomic Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_atomic_operations/group"/>
-</component>
-<component name="glib_automatic_string_completion" long-name="Glib Automatic String Completion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_automatic_string_completion/group"/>
-</component>
-<component name="glib_balanced_binary_trees" long-name="Glib Balanced Binary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_balanced_binary_trees/group"/>
-</component>
-<component name="glib_basic_types" long-name="Glib Basic Types API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_basic_types/group"/>
-</component>
-<component name="glib_caches" long-name="Glib Caches API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_caches/group"/>
-</component>
-<component name="glib_character_set_conversion" long-name="Glib Character Set Conversion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_character_set_conversion/group"/>
-</component>
-<component name="glib_closures" long-name="Glib Closures API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_closures/group"/>
-</component>
-<component name="glib_commandline_option_parser" long-name="Glib Command Line Option Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_commandline_option_parser/group"/>
-</component>
-<component name="glib_datasets" long-name="Glib Datasets API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_datasets/group"/>
-</component>
-<component name="glib_date_and_time_functions" long-name="Glib Date and Time Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_date_and_time_functions/group"/>
-</component>
-<component name="glib_doubleended_queues" long-name="Glib Double-ended Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doubleended_queues/group"/>
-</component>
-<component name="glib_doublylinked_lists" long-name="Glib Doubly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doublylinked_lists/group"/>
-</component>
-<component name="glib_dynamic_loading_of_modules" long-name="Glib Dynamic Loading of Modules API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_dynamic_loading_of_modules/group"/>
-</component>
-<component name="glib_enums_and_flags" long-name="Glib Enums and Flags API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_enums_and_flags/group"/>
-</component>
-<component name="glib_error_reporting" long-name="Glib Error Reporting API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_error_reporting/group"/>
-</component>
-<component name="glib_file_utilities" long-name="Glib File Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_file_utilities/group"/>
-</component>
-<component name="glib_generic_values" long-name="Glib Generic Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_generic_values/group"/>
-</component>
-<component name="glib_globstyle_pattern_matching" long-name="Glib Glob-Style Pattern Matching API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_globstyle_pattern_matching/group"/>
-</component>
-<component name="glib_hash_tables" long-name="Glib Hash Tables API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hash_tables/group"/>
-</component>
-<component name="glib_hook_functions" long-name="Glib Hook Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hook_functions/group"/>
-</component>
-<component name="glib_internationalization" long-name="Glib Internationalization API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_internationalization/group"/>
-</component>
-<component name="glib_io_channels" long-name="Glib I/O Channels API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_io_channels/group"/>
-</component>
-<component name="glib_keyvalue_file_parser" long-name="Glib Key-Value File Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_keyvalue_file_parser/group"/>
-</component>
-<component name="glib_lexical_scanner" long-name="Glib Lexical Scanner API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_lexical_scanner/group"/>
-</component>
-<component name="glib_main_event_loop" long-name="Glib Main Event Loop API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_main_event_loop/group"/>
-</component>
-<component name="glib_memory_allocation" long-name="Glib Memory Allocation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_allocation/group"/>
-</component>
-<component name="glib_memory_slices" long-name="Glib Memory Slices API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_slices/group"/>
-</component>
-<component name="glib_message_logging" long-name="Glib Message Logging API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_message_logging/group"/>
-</component>
-<component name="glib_miscellaneous_utility_functions" long-name="Glib Miscellaneous Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_miscellaneous_utility_functions/group"/>
-</component>
-<component name="glib_nary_trees" long-name="Glib N-ary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_nary_trees/group"/>
-</component>
-<component name="glib_parameters_and_values" long-name="Glib Parameters and Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_parameters_and_values/group"/>
-</component>
-<component name="glib_quarks" long-name="Glib Quarks API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_quarks/group"/>
-</component>
-<component name="glib_random_numbers" long-name="Glib Random Numbers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_random_numbers/group"/>
-</component>
-<component name="glib_relations_and_tuples" long-name="Glib Relations and Tuples API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_relations_and_tuples/group"/>
-</component>
-<component name="glib_shellrelated_utilities" long-name="Glib Shell-related Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_shellrelated_utilities/group"/>
-</component>
-<component name="glib_signals" long-name="Glib Signals API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_signals/group"/>
-</component>
-<component name="glib_simple_xml_subset_parser" long-name="Glib Simple XML Subset Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_simple_xml_subset_parser/group"/>
-</component>
-<component name="glib_singlylinked_lists" long-name="Glib Singly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_singlylinked_lists/group"/>
-</component>
-<component name="glib_spawning_processes" long-name="Glib Spawning Processes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_spawning_processes/group"/>
-</component>
-<component name="glib_standard_macros" long-name="Glib Standard Macros API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_standard_macros/group"/>
-</component>
-<component name="glib_string_utility_functions" long-name="Glib String Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_string_utility_functions/group"/>
-</component>
-<component name="glib_strings" long-name="Glib Strings API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_strings/group"/>
-</component>
-<component name="glib_thread_pools" long-name="Glib Thread Pools API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_thread_pools/group"/>
-</component>
-<component name="glib_threads" long-name="Glib Threads API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_threads/group"/>
-</component>
-<component name="glib_timers" long-name="Glib Timers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_timers/group"/>
-</component>
-<component name="glib_unicode_manipulation" long-name="Glib Unicode Manipulation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_unicode_manipulation/group"/>
-</component>
-<component name="glib_value_arrays" long-name="Glib Value Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_value_arrays/group"/>
-</component>
-<component name="glib_varargs_value_collection" long-name="Glib Varargs Value Collection API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_varargs_value_collection/group"/>
-</component>
-<component name="gobject" long-name="GObject API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gobject/group"/>
-</component>
-<component name="gparamspec" long-name="GParamSpec API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gparamspec/group"/>
-</component>
-<component name="gtype" long-name="GType API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtype/group"/>
-</component>
-<component name="gtypemodule" long-name="GTypeModule API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypemodule/group"/>
-</component>
-<component name="gtypeplugin" long-name="GTypePlugin API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypeplugin/group"/>
-</component>
-<component name="io_stream_api" long-name="I/O stream API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/io_stream_api/group"/>
-</component>
-<component name="localization_function_api" long-name="Localization Function API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/localization_function_api/group"/>
-</component>
-<component name="math_operations_api" long-name="Math Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/math_operations_api/group"/>
-</component>
-<component name="ossrv_memory_api" long-name="Generic OS Services Memory API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/memory/group"/>
-</component>
-<component name="no_namespace_headers" long-name="No Namespace Headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/no_namespace_headers/group"/>
-</component>
-<component name="openc_headers" long-name="OpenC headers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_headers/group"/>
-</component>
-<component name="openc_wrappers" long-name="OpenC wrappers" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/openc_wrappers/group"/>
-</component>
-<component name="ssl_general_api" long-name="SSL General API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_general_api/group"/>
-</component>
-<component name="ssl_protocol_methods_api" long-name="SSL Protocol Methods API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/ssl_protocol_methods_api/group"/>
-</component>
-<component name="standard_compressiondecompression_api" long-name="Standard Compression/Decompression API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/standard_compressiondecompression_api/group"/>
-</component>
-<component name="stl" long-name="STL API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/stl/group"/>
-</component>
-<component name="thread_api" long-name="Thread API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/thread_api/group"/>
-</component>
-<component name="type_attributes" long-name="Type Attributes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/type_attributes/group"/>
-</component>
-<component name="typeinfo" long-name="Type Info API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/typeinfo/group"/>
-</component>
-<component name="utility_apis" long-name="Utility APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/utility_apis/group"/>
-</component>
-<component name="wide_character_classapis" long-name="Wide character class/apis" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/wide_character_classapis/group"/>
-</component>
-<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">
-<unit bldFile="os/ossrv/ossrv_pub/dbus-glib/group"/>
-</component>
-</collection>
-<collection name="ossrv_plat" long-name="Generic OS Services Platform Interfaces" level="utilities">
-<component name="libutils_apis" long-name="Utility Library APIs" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_plat/libutils/group"/>
-</component>
-</collection>
-<collection name="stdlibs" long-name="Standard Libraries" level="translation">
-<component name="libz" filter="s60" long-name="Z Compression Library">
-<unit bldFile="os/ossrv/stdlibs/libz/group"/>
-</component>
-<component name="libcrypt" filter="s60" long-name="Crypt Library">
-<unit bldFile="os/ossrv/stdlibs/libcrypt/group"/>
-</component>
-</collection>
-<collection name="ssl" long-name="SSL" level="data-services">
-<component name="libcrypto" filter="s60" long-name="Crypto Library">
-<unit bldFile="os/ossrv/ssl/libcrypto/group"/>
-</component>
-<component name="libssl" filter="s60" purpose="development" long-name="SSL Library">
-<unit bldFile="os/ossrv/ssl/libssl/group"/>
-</component>
-</collection>
-<collection name="glib" long-name="GLib" level="utilities">
-<component name="glibbackend" filter="s60" long-name="GLib Backend">
-<unit bldFile="os/ossrv/glib/build/symbian/glibbackend/group"/>
-<!-- Move to here: <unit bldFile="glib/glibbackend/group"/> -->
-</component>
-<component name="libglib" filter="s60" long-name="GLib Library">
-<unit bldFile="os/ossrv/glib/build/symbian/glib/group"/>
-<!-- Move to here: <unit bldFile="glib/libglib/group"/> -->
-</component>
-<component name="libgthread" filter="s60" long-name="Libg Thread">
-<unit bldFile="os/ossrv/glib/build/symbian/gthread/group"/>
-<!-- Move to here: <unit bldFile="glib/libgthread/group"/> -->
-</component>
-<component name="libgmodule" filter="s60" long-name="Libg Module">
-<unit bldFile="os/ossrv/glib/build/symbian/gmodule/group"/>
-<!-- Move to here: <unit bldFile="glib/libgmodule/group"/> -->
-</component>
-<component name="libgobject" filter="s60" long-name="Libg Object">
-<unit bldFile="os/ossrv/glib/build/symbian/gobject/group"/>
-<!-- Move to here: <unit bldFile="glib/libgobject/group"/> -->
-</component>
-</collection>
-<collection name="stdcpp" long-name="C++ Standard Library" level="translation">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="stdcpp_build" filter="s60" long-name="Stdcpp">
-<unit bldFile="os/ossrv/stdcpp/group"/>
-</component>
-</collection>
-<collection name="ofdbus" long-name="Open Foundation D-Bus" level="utilities">
-<component name="dbus" filter="s60" long-name="D-Bus">
-<unit bldFile="os/ossrv/ofdbus/dbus/group"/>
-</component>
-<component name="dbus-glib" filter="s60" long-name="D-Bus GLib">
-<unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
-</component>
-<component name="ofdbus_rom" filter="s60" long-name="D-Bus ROM">
-<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory
- Consider moving IBY file to one of the above as well and removing this component entirely -->
-<unit bldFile="os/ossrv/ofdbus/group"/>
-</component>
-</collection>
-<collection name="utilitylibraries" long-name="Utility Libraries" level="encoding">
-<component name="libutils" filter="s60" long-name="Utility Library">
-<unit bldFile="os/ossrv/utilitylibraries/libutils/group"/>
-</component>
-</collection>
-<collection name="genericservices" long-name="Generic Services" level="utilities">
-<component name="s60compatibilityheaders" long-name="S60 Compatibility Headers" filter="gt" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp" version="tb101sf"/>
-</component>
-<component name="mimerecognitionfw" long-name="MIME Recognition Framework" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/mimerecognitionfw/group" mrp="os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
-</component>
-<component name="systemagent" long-name="System Agent" introduced="9.0" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/systemagent/group" mrp="os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
-</component>
-<component name="taskscheduler" long-name="Task Scheduler" introduced="6.0" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/taskscheduler/group" mrp="os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
-</component>
-<component name="activebackupclient" long-name="Active Backup Client" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/activebackupclient/group" mrp="os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
-</component>
-<component name="syslibsdocs" long-name="Syslibs Documentation" purpose="development" class="doc">
-<unit mrp="os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
-</component>
-<component name="httputils" long-name="HTTP Utilities Library" introduced="6.2" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/httputils/group" mrp="os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
-</component>
-</collection>
-<collection name="syslibsapitest" long-name="SysLibs API Tests" level="utilities"/>
-<collection name="compressionlibs" long-name="Compression Libraries" level="data-services">
-<component name="ziplib" long-name="Zip Compression Library" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/ossrv/compressionlibs/ziplib/group" mrp="os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
-</component>
-</collection>
-<collection name="genericopenlibs" long-name="Generic Open Libraries" level="translation">
-<component name="cstdlib" long-name="C Standard Library" introduced="ER5" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/cstdlib/group" mrp="os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
-</component>
-<component name="cppstdlib" long-name="C++ Standard Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/cppstdlib/group" mrp="os/ossrv/genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
-</component>
-<component name="openenvcore" long-name="Open Environment Core" introduced="^2" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/openenvcore/group" mrp="os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
-</component>
-<component name="posixrealtimeextensions" long-name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/posixrealtimeextensions/group" mrp="os/ossrv/genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
-</component>
-<component name="liboil" long-name="Liboil" introduced="^4" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/liboil/group" mrp="os/ossrv/genericopenlibs/liboil/group/oeaddons_liboil.mrp"/>
-</component>
-</collection>
-<collection name="lowlevellibsandfws" long-name="Low Level Libraries and Frameworks" level="app-libs">
-<component name="pluginfw" long-name="Plugin Framework" introduced="6.2" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp" version="3"/>
-</component>
-<component name="apputils" long-name="Application Utilities" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/apputils/group" mrp="os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
-</component>
-<component name="genericusabilitylib" long-name="Generic Usability Library" introduced="^3" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/genericusabilitylib/group" mrp="os/ossrv/lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
-</component>
-</collection>
-<collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
-<component name="ossrv_build" filter="s60" long-name="Generic OS Services Build">
-<!-- exports should be moved to individual components -->
-<unit bldFile="os/ossrv/group"/>
-</component>
-<component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="featuremgmt" long-name="Feature Management" level="framework">
-<component name="featuremgr" long-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 name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/persistentdata/featuremgmt/featureregistry/group" mrp="os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
-</component>
-</collection>
-<collection name="loggingservices" long-name="Logging Services" level="server">
-<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">
-<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">
-<unit bldFile="os/persistentdata/loggingservices/rfilelogger/group" mrp="os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
-</component>
-</collection>
-<collection name="traceservices" long-name="Trace Services" level="server">
-<component name="commsdebugutility" long-name="Comms Debug Utility" introduced="7.0s" purpose="optional">
-<unit bldFile="os/persistentdata/traceservices/commsdebugutility/group" mrp="os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
-</component>
-<component name="tracefw" long-name="Trace Framework" introduced="9.2" purpose="development">
-<unit bldFile="os/persistentdata/traceservices/tracefw/ulogger/group" mrp="os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
-</component>
-</collection>
-<collection name="persistentstorage" long-name="Persistent Storage" level="framework">
-<component name="store" long-name="Store" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/store/group" mrp="os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
-</component>
-<component name="dbms" long-name="DBMS" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/dbms/group" mrp="os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
-</component>
-<component name="centralrepository" long-name="Central Repository" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/persistentdata/persistentstorage/centralrepository/group" mrp="os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
-</component>
-<component name="sql" long-name="SQL" introduced="9.3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sql/GROUP" mrp="os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
-</component>
-<component name="sqlite3api" long-name="SQLite 3 API" introduced="^3" purpose="optional">
-<unit bldFile="os/persistentdata/persistentstorage/sqlite3api/GROUP" mrp="os/persistentdata/persistentstorage/sqlite3api/GROUP/syslibs_sqlite3.mrp"/>
-</component>
-</collection>
-<collection name="persistentdata_info" long-name="Persistent Data Services Info" level="app-if">
-<component name="persistentdata_metadata" long-name="Persistent Data Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/persistentdata/persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
-<component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
-</component>
-<component name="common_platform_security_definitions_api" long-name="Common Platform Security Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group"/>
-</component>
-<component name="feature_discovery_api" long-name="Feature Discovery API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/group"/>
-</component>
-<component name="platform_environment_api" long-name="Platform Environment API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/platform_environment_api/group"/>
-</component>
-<component name="sensor_channel_api" long-name="Sensor Channel API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_channel_api/group"/>
-</component>
-<component name="sensor_definitions_api" long-name="Sensor Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_definitions_api/group"/>
-</component>
-<component name="version_info_api" long-name="Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/group"/>
-</component>
-<component name="accessory_monitoring_api" long-name="Accessory Monitoring API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/group"/>
-</component>
-<component name="haptics_api" long-name="Haptics API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/haptics_api/group"/>
-</component>
-<component name="sensor_data_compensator_api" long-name="Sensor Data Compensator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
-</component>
-</collection>
-<collection name="devicesrv_plat" long-name="Device Services Platform Interfaces" level="app-if">
-<component name="configuration_file_parser_api" long-name="Configuration File Parser API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/configuration_file_parser_api/group"/>
-</component>
-<component name="dos_extension_plugin_api" long-name="DOS Extension Plug-In API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_plugin_api/group"/>
-</component>
-<component name="mediator_command_initiator_api" long-name="Mediator Command Initiator API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_initiator_api/group"/>
-</component>
-<component name="syslangutil_api" long-name="SysLangUtil API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/syslangutil_api/group"/>
-</component>
-<component name="wakeup_alarm_api" long-name="Wakeup Alarm API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/wakeup_alarm_api/group"/>
-</component>
-<component name="disk_and_memory_level_keys_api" long-name="Disk and Memory Level Keys API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_and_memory_level_keys_api/group"/>
-</component>
-<component name="mediator_plugin_api" long-name="Mediator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_plugin_api/group"/>
-</component>
-<component name="headset_status_api" long-name="Headset Status API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/headset_status_api/group"/>
-</component>
-<component name="system_startup_extension_plugin_api" long-name="System Startup Extension Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/system_startup_extension_plugin_api/group"/>
-</component>
-<component name="sensor_plugin_api" long-name="Sensor Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_plugin_api/group"/>
-</component>
-<component name="accessory_api" long-name="Accessory API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_api/group"/>
-</component>
-<component name="display_language_definition_api" long-name="Display Language Definition API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/display_language_definition_api/group"/>
-</component>
-<component name="mediator_command_responder_api" long-name="Mediator Command Responder API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_responder_api/group"/>
-</component>
-<component name="accessory_policy_definitions_api" long-name="Accessory Policy Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_definitions_api/group"/>
-</component>
-<component name="hw_settings_api" long-name="Hardware Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/hw_settings_api/group"/>
-</component>
-<component name="mediator_domain_definitions_api" long-name="Mediator Domain Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_domain_definitions_api/group"/>
-</component>
-<component name="sensor_extension_api" long-name="Sensor Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_extension_api/group"/>
-</component>
-<component name="accessory_plugin_api" long-name="Accessory Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_plugin_api/group"/>
-</component>
-<component name="sae_api" long-name="SAE API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sae_api/group"/>
-</component>
-<component name="accessory_control_api" long-name="Accessory Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_control_api/group"/>
-</component>
-<component name="mediator_static_registration_api" long-name="Mediator Static Registration API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_static_registration_api/group"/>
-</component>
-<component name="accessory_key_event_handling_api" long-name="Accessory Key Event Handling API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_key_event_handling_api/group"/>
-</component>
-<component name="mediator_notification_api" long-name="Mediator Notification API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_notification_api/group"/>
-</component>
-<component name="accessory_policy_utility_api" long-name="Accessory Policy Utility API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_utility_api/group"/>
-</component>
-<component name="common_dsy_plugin_api" long-name="Common DSY Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/common_dsy_plugin_api/group"/>
-</component>
-<component name="remote_control_extension_api" long-name="Remote Control Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/remote_control_extension_api/group"/>
-</component>
-<component name="sensor_channel_filter_api" long-name="Sensor Channel Filter API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_channel_filter_api/group"/>
-</component>
-<component name="dos_extension_api" long-name="DOS Extension API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_api/group"/>
-</component>
-<component name="accessory_audio_control_api" long-name="Accessory Audio Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_audio_control_api/group"/>
-</component>
-<component name="mediator_event_consumer_api" long-name="Mediator Event Consumer API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_consumer_api/group"/>
-</component>
-<component name="shared_data_api" long-name="Shared Data API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/shared_data_api/group"/>
-</component>
-<component name="accessory_settings_api" long-name="Accessory Settings API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_settings_api/group"/>
-</component>
-<component name="accessory_bluetooth_control_api" long-name="Accessory Bluetooth Control API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_bluetooth_control_api/group"/>
-</component>
-<component name="extended_version_info_api" long-name="Extended Version Info API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_api/group"/>
-</component>
-<component name="mediator_event_provider_api" long-name="Mediator Event Provider API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_provider_api/group"/>
-</component>
-<component name="tv_out_config_api" long-name="TV Out Config API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_config_api/group"/>
-</component>
-<component name="tspclientmapper_api" long-name="TSP Client Mapper API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tspclientmapper_api/group"/>
-</component>
-<component name="powersave_api" long-name="Power Save API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_api/group"/>
-</component>
-<component name="powersave_definitions_api" long-name="Power Save Definitions API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_definitions_api/group"/>
-</component>
-<component name="powersave_plugin_api" long-name="Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/powersave_plugin_api/group"/>
-</component>
-<component name="extended_version_info_plugin_api" long-name="Extended Version Info Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_plugin_api/group"/>
-</component>
-<component name="haptics_plugin_api" long-name="Haptics Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_plugin_api/group"/>
-</component>
-<component name="haptics_effect_data_getter_plugin_api" long-name="Haptics Effect Data Getter Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
-</component>
-<component name="haptics_packetizer_plugin_api" long-name="Haptics Packetizer Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/haptics_packetizer_plugin_api/group"/>
-</component>
-<component name="tiltcompensation_api" long-name="Tilt Compensation API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tiltcompensation_api/group"/>
-</component>
-<component name="disk_notification_handler_api" long-name="Disk Notification Handler API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/disk_notification_handler_api/group"/>
-</component>
-<component name="accessory_policy_usb_audio_api" long-name="Accessory Policy USB Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_usb_audio_api/group"/>
-</component>
-<component name="accessory_policy_hdmi_audio_api" long-name="Accessory Policy HDMI Audio API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_hdmi_audio_api/group"/>
-</component>
-<component name="sensor_data_compensator_plugin_api" long-name="Sensor Data Compensator Plugin API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
-</component>
-<component name="ddc_access_api" long-name="DDC Access API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/ddc_access_api/group"/>
-</component>
-<component name="tv_out_behaviour_api" long-name="TV Out Behaviour API" filter="s60" class="api">
-<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_behaviour_api/group"/>
-</component>
-</collection>
-<collection name="accessoryservices" long-name="Accessory Services" level="framework">
-<component name="accessorymonitor" filter="s60" long-name="Accessory Monitor">
-<unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/group"/>
-</component>
-<component name="accessoryremotecontrol" filter="s60" long-name="Accessory Remote Control">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
-</component>
-<component name="accessoryserver" filter="s60" long-name="Accessory Server">
-<unit bldFile="os/devicesrv/accessoryservices/accessoryserver/group"/>
-</component>
-<component name="pluggeddisplay" filter="s60" long-name="Plugged Display" introduced="^3">
-<unit bldFile="os/devicesrv/accessoryservices/pluggeddisplay/group"/>
-</component>
-<component name="headsetstatusapi" filter="s60" long-name="Headset Status API">
-<unit bldFile="os/devicesrv/accessoryservices/headsetstatusapi/group"/>
-</component>
-<component name="tspclientmapper" filter="s60" long-name="TSP Client Mapper">
-<unit bldFile="os/devicesrv/accessoryservices/tspclientmapper/group"/>
-</component>
-<component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional">
-<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
-</component>
-<component name="gid_pc_tool" filter="s60" long-name="Generic ID PC Tool" class="tool PC">
-<unit bldFile="os/devicesrv/accessoryservices/gid_pc_tool/group"/>
-</component>
-</collection>
-<collection name="commonservices" long-name="Common Services" level="app-if">
-<component name="commonengine" filter="s60" long-name="Common Engine">
-<unit bldFile="os/devicesrv/commonservices/commonengine/group"/>
-</component>
-<component name="commonengineresources" filter="s60" long-name="Common Engine Resources" class="config">
-<unit bldFile="os/devicesrv/commonservices/commonengineresources/group"/>
-</component>
-<component name="platformenv" filter="s60" long-name="Platform Environment">
-<unit bldFile="os/devicesrv/commonservices/platformenv/group"/>
-</component>
-<component name="sysutil" long-name="System Utilities" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/sysutil/group" mrp="os/devicesrv/commonservices/sysutil/group/sysutil.mrp"/>
-</component>
-<component name="activitymanager" long-name="Activity Manager" purpose="mandatory" introduced="ER5">
-<unit bldFile="os/devicesrv/commonservices/activitymanager/group" mrp="os/devicesrv/commonservices/activitymanager/group/activitymanager.mrp"/>
-</component>
-</collection>
-<collection name="dosservices" long-name="Domestic Operating System Services" level="hw-if">
-<component name="commondsy" filter="s60" long-name="Common DSY" plugin="Y">
-<unit bldFile="os/devicesrv/dosservices/commondsy/group"/>
-</component>
-<component name="dosserver" filter="s60" long-name="Domestic OS Server">
-<unit bldFile="os/devicesrv/dosservices/dosserver/group"/>
-</component>
-</collection>
-<collection name="sensorservices" long-name="Sensor Services" level="framework">
-<component name="sensorserver" filter="s60" long-name="Sensor Server">
-<unit bldFile="os/devicesrv/sensorservices/sensorserver/group"/>
-</component>
-<component name="orientationssy" filter="s60" long-name="Orientation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/orientationssy/group"/>
-</component>
-<component name="tiltcompensationssy" filter="s60" long-name="Tilt Compensation SSY" plugin="Y">
-<unit bldFile="os/devicesrv/sensorservices/tiltcompensationssy/group"/>
-</component>
-<component name="sensordatacompensator" filter="s60" long-name="Sensor Data Compensator">
-<unit bldFile="os/devicesrv/sensorservices/sensordatacompensator/group"/>
-</component>
-</collection>
-<collection name="hwrmhaptics" long-name="HWRM Haptics" level="plugin">
-<component name="hapticseffectdatagetterfw" filter="s60" long-name="Haptics Effect Data Getter Framework">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
-</component>
-<component name="hapticspluginservice" filter="s60" long-name="Haptics Plugin Service">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
-</component>
-<component name="hapticspacketizer" filter="s60" long-name="Haptics Packetizer">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
-</component>
-<component name="hapticspluginmanager" filter="s60" long-name="Haptics Plugin Manager">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
-</component>
-<component name="hapticsserver" filter="s60" long-name="Haptics Server">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsserver/group"/>
-</component>
-<component name="hapticsclient" filter="s60" long-name="Haptics Client">
-<unit bldFile="os/devicesrv/hwrmhaptics/hapticsclient/group"/>
-</component>
-<component name="hwrmhaptics_build" filter="s60" long-name="HWRM Haptics Build">
-<!-- move these exports into the appropriate above components and delete this component-->
-<unit bldFile="os/devicesrv/hwrmhaptics/group"/>
-</component>
-</collection>
-<collection name="mediator" long-name="Mediator" level="app-if">
-<!--collection is really a component. Move it down a directory -->
-<component name="mediator_build" filter="s60" long-name="Mediator Build">
-<unit bldFile="os/devicesrv/mediator/group"/>
-</component>
-</collection>
-<collection name="psmservices" long-name="Power Save Mode Services" level="app-if">
-<component name="psmserver" filter="s60" long-name="PSM Server">
-<unit bldFile="os/devicesrv/psmservices/psmserver/group"/>
-</component>
-</collection>
-<collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
-<component name="hwrmfmtxwatcherplugin" filter="s60" long-name="HWRM FM Transmitter Watcher Plugin" plugin="Y">
-<unit bldFile="os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
-</component>
-<component name="hwrmtargetmodifierplugin" filter="s60" long-name="HWRM Target Modifier Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build,
- may need to -->
-<!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
-</component>
-<component name="vibractrl" filter="s60" long-name="Vibra Control" deprecated="9.1">
-<unit bldFile="os/devicesrv/resourcemgmt/vibractrl/group"/>
-</component>
-<component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="^2" purpose="optional">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
-</component>
-<component name="hwresourcesmgrconfig" long-name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
-</component>
-<component name="resourcemgmt_build" filter="s60" long-name="Resource Management Build">
-<!-- Move exports to a self-contained component.
- This needs to be kept around until configuration is in place -->
-<unit bldFile="os/devicesrv/resourcemgmt/group"/>
-</component>
-<component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
-</component>
-</collection>
-<collection name="sysstatemgmt" long-name="System State Management" level="server">
-<component name="ssmmapperutility" filter="s60" long-name="SSM Mapper Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmmapperutility/group"/>
-</component>
-<component name="ssmpolicyplugins" filter="s60" long-name="SSM Policy Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmpolicyplugins/group"/>
-</component>
-<component name="ssmutilityplugins" filter="s60" long-name="SSM Utility Plugins" introduced="^3" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmutilityplugins/group"/>
-</component>
-<component name="ssmcmdlists" filter="s60" long-name="SSM Command Lists" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcmdlists/group"/>
-</component>
-<component name="ssmcustcmds" filter="s60" long-name="SSM Custom Commands" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/ssmcustcmds/group"/>
-</component>
-<component name="syslangutil" filter="s60" long-name="System Language Utility" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/syslangutil/group"/>
-</component>
-<component name="sysrestart" filter="s60" long-name="System Restart" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysrestart/group"/>
-</component>
-<component name="sysuiprovider" filter="s60" long-name="System UI Provider" introduced="^3">
-<unit bldFile="os/devicesrv/sysstatemgmt/sysuiprovider/group"/>
-</component>
-<component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/group" mrp="os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
-</component>
-<component name="systemstatemgr" long-name="System State Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
-</component>
-<component name="systemstateplugins" long-name="System State Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
-</component>
-<component name="systemstatereferenceplugins" long-name="System State Reference Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
-</component>
-</collection>
-<collection name="resourceinterfaces" long-name="Resource Interfaces" level="hw-if">
-<component name="fmtransmittercontrol" long-name="FM Transmitter Control" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group" mrp="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
-</component>
-</collection>
-<collection name="systemhealthmanagement" long-name="System Health Management" level="server">
-<component name="systemhealthmgr" long-name="System Health Manager" introduced="^3" purpose="optional">
-<unit bldFile="os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
-</component>
-</collection>
-<collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if"/>
-<collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
-<component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
-<collection name="authorisation" long-name="Authorisation" level="utilities">
-<component name="userpromptservice" long-name="User Prompt Service" introduced="^3" purpose="mandatory">
-<unit bldFile="os/security/authorisation/userpromptservice/group" mrp="os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
-</component>
-<component name="userpromptutils" long-name="User Prompt Utils" introduced="^3" purpose="optional">
-<unit bldFile="os/security/authorisation/userpromptutils/group" mrp="os/security/authorisation/userpromptutils/group/security_ups_utils.mrp"/>
-</component>
-</collection>
-<collection name="contentmgmt" long-name="Content Management" level="utilities">
-<component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
-<unit bldFile="os/security/contentmgmt/contentaccessfwfordrm/group" mrp="os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
-</component>
-<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">
-<unit bldFile="os/security/crypto/weakcryptospi/group" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
-</component>
-<component name="strongcryptospi" long-name="Strong Crypto SPI" filter="gt" introduced="^3" purpose="optional">
-<unit bldFile="os/security/crypto/weakcryptospi/strong" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
-</component>
-</collection>
-<collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
-<component name="securityutils" long-name="Security Utils" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/securityutils/group" mrp="os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
-</component>
-<component name="securitydocs" long-name="Security Documentation" purpose="development" class="doc">
-<unit mrp="os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
-</component>
-<component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
-</component>
-<component name="securitycommonutils" long-name="Security Common Utils" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/security/cryptomgmtlibs/securitycommonutils/group" mrp="os/security/cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
-</component>
-</collection>
-<collection name="securityanddataprivacytools" long-name="Security and Data Privacy Tools" level="services">
-<component name="securityconfig" long-name="Security Config" introduced="9.1" purpose="optional">
-<unit bldFile="os/security/securityanddataprivacytools/securityconfig/group" mrp="os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
-</component>
-<component name="securitytools" long-name="Security Tools" introduced="^3" purpose="optional" class="PC">
-<unit bldFile="os/security/securityanddataprivacytools/securitytools/group" mrp="os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
-</component>
-</collection>
-<collection name="cryptoplugins" long-name="Crypto Plugins" level="plugins">
-<component name="cryptospiplugins" long-name="Crypto SPI Plugins" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/security/cryptoplugins/cryptospiplugins/group" mrp="os/security/cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
-</component>
-</collection>
-<collection name="cryptoservices" long-name="Crypto Services" level="plugins">
-<component name="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/certificateandkeymgmt/group" mrp="os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
-</component>
-<component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
-</component>
-<component name="browserrootcertificates" long-name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
-<unit mrp="os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
-</component>
-<component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/asnpkcs/group" mrp="os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
-</component>
-</collection>
-<collection name="security_info" long-name="OS Security Info" level="utilities">
-<component name="security_metadata" long-name="OS Security Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/security/security_info/security_metadata/security_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
-<collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
-<component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
-</component>
-<component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
-</component>
-<component name="simulationpositioningmodule" long-name="Simulation Positioning Module" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
-</component>
-<component name="gpspositioningmodule" long-name="GPS/A-GPS Positioning Module" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/gpspositioningmodule/group" mrp="os/lbs/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
-</component>
-<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>
-</collection>
-<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
-<component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
-</component>
-</collection>
-<collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
-<component name="locationserver" long-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 name="networkrequesthandler" long-name="Network Request Handler" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
-</component>
-</collection>
-<collection name="lbstest" long-name="Locating Services Tests" level="application-interface">
-<component name="locationprotocoltest" long-name="Location Protocol Tests" introduced="9.2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/lbstest/locationprotocoltest/group" mrp="os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
-</component>
-</collection>
-<collection name="locationmgmt" long-name="Location Management" level="management">
-<component name="locmonitor" long-name="Location Monitor" introduced="^3" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
-</component>
-<component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/agpslocationmgr/group" mrp="os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
-</component>
-<component name="networklocationmgr" long-name="Network Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/networklocationmgr/group" mrp="os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
-</component>
-<component name="locationcore" long-name="Location Core" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locationcore/group" mrp="os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
-</component>
-<component name="networkgateway" long-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 name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
-<component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
-</component>
-<component name="suplrrlpasn1" filter="sf_build" long-name="SUPL RRLP ASN1 Parser">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
-</component>
-</collection>
-<collection name="lbsapitest" long-name="Location API Tests" level="application-interface"/>
-<collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
-<component name="lbs_metadata" long-name="Locating Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="commsfw" level="services" long-name="Communications Framework" levels="server support framework process app-if">
-<collection name="commsprocess" long-name="Comms Process" level="process">
-<component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/commsfw/commsprocess/commsrootserverconfig/group" mrp="os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
-</component>
-</collection>
-<collection name="commsconfig" long-name="Comms Config" level="process">
-<component name="commsdatabase" long-name="Comms Database" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
-</component>
-<component name="commsdatabaseshim" long-name="Comms Database Shim" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/commsfw/commsconfig/commsdatabaseshim/group" mrp="os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
-</component>
-</collection>
-<collection name="datacommsserver" long-name="Data Comms Server" level="framework">
-<component name="esockserver" long-name="ESock Server" purpose="mandatory">
-<unit bldFile="os/commsfw/datacommsserver/esockserver/group" mrp="os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp" version="3"/>
-</component>
-<component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/group" mrp="os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
-</component>
-<component name="networkingdialogstub" long-name="Networking Dialog Stub" introduced="6.1" purpose="optional">
-<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/default" mrp="os/commsfw/datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
-</component>
-<component name="networkcontroller" long-name="Network Controller" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/datacommsserver/networkcontroller/group" mrp="os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
-</component>
-</collection>
-<collection name="serialserver" long-name="Serial Server" level="server">
-<component name="serialportcsy" long-name="Serial Port CSY" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/commsfw/serialserver/serialportcsy" mrp="os/commsfw/serialserver/serialportcsy/ser-comms_serialportcsy.mrp"/>
-</component>
-<component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" purpose="development">
-<unit bldFile="os/commsfw/serialserver/packetloopbackcsy/group" mrp="os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
-</component>
-<component name="c32serialserver" long-name="C32 Serial Server" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/commsfw/serialserver/c32serialserver/group" mrp="os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
-</component>
-<component name="c32serialserverconfig" long-name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config">
-<unit bldFile="os/commsfw/serialserver/c32serialserverconfig" mrp="os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
-</component>
-<component name="c32serialserverdocs" long-name="C32 Serial Server Documentation" purpose="development" class="doc">
-<unit mrp="os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
-</component>
-</collection>
-<collection name="commsfwutils" long-name="Comms Framework Utilities" level="framework">
-<component name="commsbufs" long-name="Comms Buffers" introduced="^3" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwutils/commsbufs/group" mrp="os/commsfw/commsfwutils/commsbufs/group/comms-infras_commsbufs.mrp"/>
-</component>
-</collection>
-<collection name="commsfw_info" long-name="Comms Framework Info" level="app-if">
-<component name="commsinfrastructuredocs" long-name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
-<unit mrp="os/commsfw/commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
-</component>
-<component name="commsfw_metadata" long-name="Communications Framework Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/commsfw/commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
-</component>
-</collection>
-<collection name="commsfwsupport" long-name="Comms Framework Support" level="support">
-<component name="commselements" long-name="Comms Elements" introduced="8.0" purpose="mandatory">
-<unit bldFile="os/commsfw/commsfwsupport/commselements/group" mrp="os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
-</component>
-</collection>
-<collection name="commsinfrastructureapitest" long-name="Comms-Infras API Tests" level="app-if">
-<component name="commsinfrastructuresvs" long-name="Comms Infrastructure Verification Suite" introduced="^3" purpose="development">
-<unit mrp="os/commsfw/commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
-</component>
-</collection>
-<collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
-<component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
-</component>
-<component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" purpose="mandatory" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
-</component>
-<component name="commstools" long-name="Comms Tools" introduced="^3" purpose="development" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/commstools/group" mrp="os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
-</component>
-</collection>
-</block>
-<block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
-<component name="internetsockets" long-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>
-<collection name="tcpiputils" long-name="TCP/IP Utilities" level="plugin">
-<component name="dnd" long-name="DND" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/dnd/group" mrp="os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
-</component>
-<component name="dhcp" long-name="DHCP" introduced="8.0" purpose="optional">
-<unit bldFile="os/networkingsrv/tcpiputils/dhcp/group" mrp="os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
-</component>
-<component name="networkaddressandporttranslation" long-name="Network Address and Port Translation" introduced="^2" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
-</component>
-<component name="punycodeconv" long-name="Punycode Converter" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/punycodeconv/group" mrp="os/networkingsrv/tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
-</component>
-</collection>
-<collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
-<component name="nullagt" long-name="NULL AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/nullagt/group" mrp="os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
-</component>
-<component name="genericscprparameters" long-name="Generic SCPR Parameters" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/linklayercontrol/genericscprparameters/group" mrp="os/networkingsrv/linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
-</component>
-<component name="mbmsparameters" long-name="MBMS Parameters" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/mbmsparameters/group" mrp="os/networkingsrv/linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
-</component>
-<component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
-<unit bldFile="os/networkingsrv/linklayercontrol/networkinterfacemgr/group" mrp="os/networkingsrv/linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp" version="2"/>
-</component>
-</collection>
-<collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
-<component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
-</component>
-<component name="pppnif" long-name="PPP NIF" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/pppnif/group" mrp="os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp" version="2"/>
-</component>
-<component name="slipnif" long-name="SLIP NIF" purpose="development" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/slipnif/group" mrp="os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
-</component>
-<component name="tunnelnif" long-name="Tunnel NIF" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
-</component>
-</collection>
-<collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
-<component name="packetlogger" long-name="Packet Logger" introduced="8.1" purpose="development">
-<unit bldFile="os/networkingsrv/linklayerutils/packetlogger/group" mrp="os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
-</component>
-</collection>
-<collection name="networkcontrol" long-name="Network Control" level="plugin">
-<component name="qoslib" long-name="QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/qoslib/group" mrp="os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
-</component>
-<component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/pfqoslib/group" mrp="os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
-</component>
-<component name="qosfwprt" long-name="QoS Framework PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
-</component>
-<component name="qosipscpr" long-name="QoS IP SCPR" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosipscpr/group" mrp="os/networkingsrv/networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
-</component>
-<component name="ipnetworklayer" long-name="IP Network Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/ipnetworklayer/group" mrp="os/networkingsrv/networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
-</component>
-<component name="iptransportlayer" long-name="IP Transport Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/iptransportlayer/group" mrp="os/networkingsrv/networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
-</component>
-<component name="commsuserpromptmgr" long-name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkcontrol/commsuserpromptmgr/group" mrp="os/networkingsrv/networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
-</component>
-</collection>
-<collection name="networkprotocols" long-name="Network Protocols" level="plugin">
-<component name="ipeventnotifier" long-name="IP Event Notifier" introduced="8.1" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
-</component>
-<component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
-</component>
-<component name="iphook" long-name="IP Hook" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
-</component>
-<component name="mobileip" long-name="Mobile IP" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/mobileip/group" mrp="os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
-</component>
-<component name="dnsproxy" long-name="DNS Proxy" introduced="^3" purpose="optional">
-<unit bldFile="os/networkingsrv/networkprotocols/dnsproxy/group" mrp="os/networkingsrv/networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
-</component>
-</collection>
-<collection name="networksecurity" long-name="Network Security" level="framework">
-<component name="tls" long-name="TLS" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tls/group" mrp="os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
-</component>
-<component name="tlsprovider" long-name="TLS Provider" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networksecurity/tlsprovider/group" mrp="os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
-</component>
-<component name="ipsec" long-name="IPsec" introduced="7.0" purpose="optional">
-<unit bldFile="os/networkingsrv/networksecurity/ipsec/group" mrp="os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
-</component>
-</collection>
-<collection name="networkingtestandutils" long-name="Networking Test and Utils" level="app-if">
-<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">
-<!-- production component: contains the IBY files -->
-<unit bldFile="os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
-</component>
-<component name="networkingdocs" long-name="Networking Documentation" purpose="development" class="doc">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
-</component>
-<component name="networkingsrv_metadata" long-name="Networking Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
-<component name="predictorcompression" long-name="Predictor Compression" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wlan" level="services" long-name="WLAN" levels="hw low mid high tools test">
-<collection name="wlan_plat" long-name="WLAN Platform Interfaces" level="test">
-<component name="wlan_dbif_api" long-name="WLAN DBIF API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_dbif_api/group"/>
-</component>
-<component name="wlan_hal_api" long-name="WLAN HAL API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hal_api/group"/>
-</component>
-<component name="wlan_management_api" long-name="WLAN Management API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_management_api/group"/>
-</component>
-<component name="wlan_device_settings_api" long-name="WLAN Device Settings API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_device_settings_api/group"/>
-</component>
-<component name="wlan_control_api" long-name="WLAN Control API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_control_api/group"/>
-</component>
-<component name="wlan_hw_initialization_data_api" long-name="WLAN Hardware Initialization Data API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hw_initialization_data_api/group"/>
-</component>
-<component name="wlan_power_save_plugin_api" long-name="WLAN Power Save Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_power_save_plugin_api/group"/>
-</component>
-<component name="wlan_info_api" long-name="WLAN Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_info_api/group"/>
-</component>
-<component name="wlan_agent_hotspot_plugin_api" long-name="WLAN Agent Hotspot Plug-in API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
-</component>
-<component name="wlan_osa_api" long-name="WLAN OSA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_osa_api/group"/>
-</component>
-<component name="wlan_spia_api" long-name="WLAN SPIA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_spia_api/group"/>
-</component>
-<component name="wlan_hpa_api" long-name="WLAN HPA API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_hpa_api/group"/>
-</component>
-<component name="wlan_eapol_plugin_api" long-name="WLAN EAPOL Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_eapol_plugin_api/group"/>
-</component>
-<component name="wlan_generic_plugin_api" long-name="WLAN Generic Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_generic_plugin_api/group"/>
-</component>
-<component name="wlan_aws_plugin_api" long-name="WLAN AWS Plugin API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_plat/wlan_aws_plugin_api/group"/>
-</component>
-</collection>
-<collection name="wlan_pub" long-name="WLAN Public Interfaces" level="test">
-<component name="wlan_sdk_info_api" long-name="WLAN SDK Info API" filter="s60" class="api">
-<unit bldFile="os/wlan/wlan_pub/wlan_sdk_info_api/group"/>
-</component>
-</collection>
-<collection name="wlan_bearer" long-name="WLAN Bearer" level="hw">
-<component name="wlanpsmplugin" filter="s60" long-name="WLAN PSM Plugin" plugin="Y">
-<unit bldFile="os/wlan/wlan_bearer/wlanpsmplugin/group"/>
-</component>
-<component name="wlanagent" filter="s60" long-name="WLAN Agent">
-<unit bldFile="os/wlan/wlan_bearer/wlanagent/group"/>
-</component>
-<component name="wlandbif_cd" filter="s60" long-name="WLAN CommsDat interface">
-<unit bldFile="os/wlan/wlan_bearer/wlandbif_cd/group"/>
-</component>
-<!-- should follow component directory rules for stuff in wlan_symbian/ and put in a single component or split up properly -->
-<component name="wlanengine" filter="s60" long-name="WLAN Engine">
-<unit bldFile="os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
-</component>
-<component name="wlanldd" filter="s60" long-name="WLAN LDD">
-<unit bldFile="os/wlan/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
-</component>
-<component name="wlannwif" filter="s60" long-name="WLAN Network Interface">
-<unit bldFile="os/wlan/wlan_bearer/wlannwif/group"/>
-</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="adaptation hw-if plugin framework server app-if">
-<collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
-<component name="basebandchanneladaptor" long-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 name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
-<component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
-</component>
-</collection>
-<collection name="smsprotocols" long-name="SMS Protocols" level="framework">
-<component name="smsstack" long-name="SMS Stack" introduced="6.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/cellularsrv/smsprotocols/smsstack/group" mrp="os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
-</component>
-</collection>
-<collection name="telephonyprotocols" long-name="Telephony Protocols" level="framework">
-<component name="csdagt" long-name="CSD AGT" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/csdagt/group" mrp="os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
-</component>
-<component name="psdagt" long-name="PSD AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/psdagt/group" mrp="os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
-</component>
-<component name="gprsumtsqosprt" long-name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
-</component>
-<component name="gprsumtsqosinterface" long-name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
-</component>
-<component name="qosextnapi" long-name="QoS Extn API" introduced="9.2" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
-</component>
-<component name="secondarypdpcontextumtsdriver" long-name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
-</component>
-<component name="qos3gppcpr" long-name="QoS 3GPP CPR" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
-</component>
-<component name="pdplayer" long-name="PDP Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/pdplayer/group" mrp="os/cellularsrv/telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
-</component>
-<component name="rawipnif" long-name="Raw IP NIF" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserver" long-name="Telephony Server" level="server">
-<component name="etelserverandcore" long-name="ETel Server and Core" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
-</component>
-<component name="etelmultimode" long-name="ETel Multimode" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelmultimode/group" mrp="os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
-</component>
-<component name="etelpacketdata" long-name="ETel Packet Data" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
-</component>
-<component name="etelsimtoolkit" long-name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
-<component name="common_tsy" long-name="Common TSY" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
-</component>
-<component name="licenseetsystub" long-name="Licensee TSY Stub" introduced="^2" purpose="development" filter="sf_build" plugin="Y">
-<unit mrp="os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="os/cellularsrv/telephonyserverplugins/licenseetsystub/group"/>
-</component>
-<component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
-</component>
-<component name="simtsy" long-name="SIM TSY" introduced="7.0" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
-</component>
-<component name="ctsydispatchlayer" long-name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
-</component>
-<component name="simatktsy" long-name="SIMATK TSY" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simatktsy/group" mrp="os/cellularsrv/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
-</component>
-</collection>
-<collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
-<component name="dial" long-name="Dial" deprecated="9.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyutils/dial/group" mrp="os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
-</component>
-<component name="telephonywatchers" long-name="Telephony Watchers" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
-</component>
-<component name="etel3rdpartyapi" long-name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrv_info" long-name="Cellular Baseband Services Info" level="app-if">
-<component name="telephonyconfidentialdocs" long-name="Telephony Confidential Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
-</component>
-<component name="telephonydocs" long-name="Telephony Documentation" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
-</component>
-<component name="cellularsrv_metadata" long-name="Cellular Baseband Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
-<component name="mocksy" long-name="MockSY" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if"/>
-</block>
-<block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
-<collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
-<component name="bluetooth_audio_adaptation_api" long-name="Bluetooth Audio Adaptation API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
-</component>
-<component name="bluetooth_power_management_api" long-name="Bluetooth Power Management API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_power_management_api/group"/>
-</component>
-<component name="at_command_handler_plugin_api" long-name="AT Command Handler Plugin API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/at_command_handler_plugin_api/group"/>
-</component>
-</collection>
-<collection name="bluetooth" long-name="Bluetooth Core" level="framework">
-<component name="btstack" long-name="Bluetooth Stack" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btstack" mrp="os/bt/bluetooth/btstack/bluetooth_stack.mrp"/>
-</component>
-<component name="btcomm" long-name="Bluetooth CSY" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetooth/btcomm" mrp="os/bt/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
-</component>
-<component name="btsdp" long-name="Bluetooth SDP" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btsdp" mrp="os/bt/bluetooth/btsdp/bluetooth_sdp.mrp"/>
-</component>
-<component name="btextnotifiers" long-name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btextnotifiers" mrp="os/bt/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
-</component>
-<component name="gavdp" long-name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
-<unit bldFile="os/bt/bluetooth/gavdp/group" mrp="os/bt/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
-</component>
-<component name="btlogger" long-name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bluetooth/btlogger/group" mrp="os/bt/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
-</component>
-<component name="btdocs" long-name="Bluetooth Documentation" purpose="development" class="doc">
-<unit mrp="os/bt/bluetooth/btdocs/bluetooth_documentation.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothmgmt" long-name="Bluetooth Management" level="plugin">
-<component name="btmgr" long-name="Bluetooth Manager" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btmgr" mrp="os/bt/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
-</component>
-<component name="btconfig" long-name="Bluetooth Config" purpose="optional" class="config">
-<unit bldFile="os/bt/bluetoothmgmt/btconfig" mrp="os/bt/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
-</component>
-<component name="btrom" long-name="Bluetooth ROM" introduced="9.1" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/btrom" mrp="os/bt/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
-</component>
-<component name="bluetoothclientlib" long-name="Bluetooth Client Library" introduced="6.0" purpose="optional">
-<unit bldFile="os/bt/bluetoothmgmt/bluetoothclientlib" mrp="os/bt/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothcommsprofiles" long-name="Bluetooth Comms Profiles" level="app-if">
-<component name="btpan" long-name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bluetoothcommsprofiles/btpan/group" mrp="os/bt/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
-</component>
-</collection>
-<collection name="bthci" long-name="Host Controller Interface" level="server">
-<component name="bthci2" long-name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
-<unit bldFile="os/bt/bthci/bthci2/group" mrp="os/bt/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
-</component>
-<component name="hciextensioninterface" long-name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
-<unit bldFile="os/bt/bthci/hciextensioninterface" mrp="os/bt/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
-</component>
-<component name="hci2implementations" long-name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/bt/bthci/hci2implementations/group" mrp="os/bt/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
-</component>
-</collection>
-<collection name="irda" long-name="IrDA" level="plugin">
-<component name="irdastack" long-name="IrDA Stack" purpose="optional">
-<unit bldFile="os/bt/irda/irdastack/group" mrp="os/bt/irda/irdastack/group/infra-red_irda.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if"/>
-<collection name="atext" long-name="AT Extensions" level="server">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="atext_build" long-name="AT Extension Build" introduced="^3" purpose="optional" filter="s60">
-<unit bldFile="os/bt/atext/group"/>
-</component>
-</collection>
-<collection name="bt_info" long-name="Bluetooth Info" level="app-if">
-<component name="bt_metadata" long-name="Bluetooth Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/bt/bt_info/bt_metadata/bt_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
-<collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
-<!-- usbclientdrivers to be moved here from kernelhwsrv-->
-</collection>
-<collection name="usbmgmt" long-name="USB Management" level="server">
-<component name="usbmgr" long-name="USB Manager" purpose="optional">
-<unit bldFile="os/usb/usbmgmt/usbmgr/group" mrp="os/usb/usbmgmt/usbmgr/group/usb_manager.mrp" version="2"/>
-</component>
-<component name="usbclassandmgrdocs" long-name="USB Class and Manager Documentation" purpose="development" class="doc">
-<unit mrp="os/usb/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
-</component>
-</collection>
-<collection name="usb_info" long-name="USB Info" level="app-if">
-<component name="usb_metadata" long-name="USB Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="os/usb/usb_info/usb_metadata/usb_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="mm" level="services" long-name="Multimedia" levels="adaptation 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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-</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"/>
-</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"/>
-</component>
-<component name="aac_decoder_config_proxy_api" long-name="AAC Decoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/aac_decoder_config_proxy_api/group"/>
-</component>
-<component name="added_devsound_control_api" long-name="Added DevSound Control API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_api/group"/>
-</component>
-<component name="added_devsound_control_msg_hdlr_api" long-name="Added DevSound Control Msg Hdlr API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_msg_hdlr_api/group"/>
-</component>
-<component name="added_devsound_control_proxy_api" long-name="Added DevSound Control Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/added_devsound_control_proxy_api/group"/>
-</component>
-<component name="audio_effects_msg_hdlr_api" long-name="Audio Effects Message Handler API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_msg_hdlr_api/group"/>
-</component>
-<component name="audio_effects_proxy_api" long-name="Audio Effects Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_effects_proxy_api/group"/>
-</component>
-<component name="audio_policy_header_api" long-name="Audio Policy Header API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="audio_routing_proxy_api" long-name="Audio Routing Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_routing_proxy_api/group"/>
-</component>
-<component name="custom_interface_builder_api" long-name="Custom Interface Builder API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_builder_api/group"/>
-</component>
-<component name="custom_interface_message_handler_factory_api" long-name="Custom Interface Message Handler Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_message_handler_factory_api/group"/>
-</component>
-<component name="custom_interface_proxy_factory_api" long-name="Custom Interface Proxy Factory API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_proxy_factory_api/group"/>
-</component>
-<component name="custom_interface_utility_api" long-name="Custom Interface Utility API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/custom_interface_utility_api/group"/>
-</component>
-<component name="devsound_adaptation_api" long-name="DevSound Adaptation API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/devsound_adaptation_api/group"/>
-</component>
-<component name="display_posting_api" long-name="Display Posting API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="eaac_plus_decoder_interface_proxy_api" long-name="eAAC Plus Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="error_concealment_interface_proxy_api" long-name="Error Concealment Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
-</component>
-<component name="fm_radio_adaptation_api" long-name="FM Radio Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_decoder_interface_proxy_api" long-name="G711 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g711_encoder_interface_proxy_api" long-name="G711 Encoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_decoder_interface_proxy_api" long-name="G729 Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="g729_encoder_interface_msg_hdlr_api" long-name="G729 Encoder Interface Message Handler API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</component>
-<component name="ilbc_decoder_interface_proxy_api" long-name="Ilbc Decoder Interface Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ilbc_encoder_interface_proxy_api" long-name="Ilbc Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="mdf_plugin_uids" long-name="MDF Plug-in UIDs" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/mdf_plugin_uids/group"/>
-</component>
-<component name="multimedia_fourcc_definitions_api" long-name="Multimedia FourCC Definitions API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/multimedia_fourcc_definitions_api/group"/>
-</component>
-<component name="nokia_audio_policy_header_api" long-name="Nokia Audio Policy Header API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/nokia_audio_policy_header_api/group"/>
-</component>
-<component name="nokia_multimedia_fourcc_definitions_api" long-name="Nokia Multimedia Fourcc Definitions API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="ra8_decoder_interface_proxy_api" long-name="RA8 Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
-</component>
-<component name="rds_adaptation_api" long-name="RDS Adaptation API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="restricted_audio_output_proxy_api" long-name="Restricted Audio Output Proxy API" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="sbc_encoder_interface_proxy_api" long-name="SBC Encoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/sbc_encoder_interface_proxy_api/group"/>
-</component>
-<component name="secure_output_mdf_custom_interface" long-name="Secure Output MDF Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="speech_encoder_config_proxy_api" long-name="Speech Encoder Config Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/speech_encoder_config_proxy_api/group"/>
-</component>
-<component name="telephony_audio_routing_client_api" long-name="Telephony Audio Routing Client API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_client_api/group"/>
-</component>
-<component name="telephony_audio_routing_manager_api" long-name="Telephony Audio Routing Manager API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/telephony_audio_routing_manager_api/group"/>
-</component>
-<component name="video_buffer_management_mdf_custom_interface" long-name="Video Buffer Management MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_buffer_management_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_rotation_mdf_custom_interface" long-name="Video Decoder Rotation MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
-</component>
-<component name="video_decoder_scaling_mdf_custom_interface" long-name="Video Decoder Scaling MDF Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
-</component>
-<component name="video_reclaim_extbuffers_ci" long-name="Video Reclaim Extbuffers Custom Interface" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/video_reclaim_extbuffers_ci/group"/>
-</component>
-<component name="video_window_control_custom_interface" long-name="Video Window Control Custom Interface" filter="s60" class="api">
-<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"/>
-</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"/>
-</component>
-<component name="wma_decoder_interface_proxy_api" long-name="WMA Decoder Interface Proxy API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/wma_decoder_interface_proxy_api/group"/>
-</component>
-<component name="eaacplusutil_api" long-name="EAac Plus Util API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/eaacplusutil_api/group"/>
-</component>
-<component name="frametable_api" long-name="Frametable API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/frametable_api/group"/>
-</component>
-</collection>
-<collection name="devsoundextensions" long-name="Devsound Extensions" level="device-fw">
-<component name="drmaudioplayer" filter="s60" long-name="DRM Audio Player">
-<unit bldFile="os/mm/devsoundextensions/drmaudioplayer/group"/>
-</component>
-<component name="mmextfw" filter="s60" long-name="Multimedia Extension Framework">
-<unit bldFile="os/mm/devsoundextensions/mmextfw/group"/>
-</component>
-<component name="audiorouting" filter="s60" long-name="Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/audiorouting/group"/>
-</component>
-<component name="effects" filter="s60" long-name="Effects">
-<unit bldFile="os/mm/devsoundextensions/effects/group"/>
-</component>
-<component name="effectspresets" filter="s60" long-name="Effects Presets">
-<unit bldFile="os/mm/devsoundextensions/effectspresets/group"/>
-</component>
-<component name="effectspresets_utils" filter="s60" long-name="Effects Presets Utils">
-<!-- need to #include the lot from a single bld.inf
- Also move to a standard component location, not under effectspresets -->
-<unit bldFile="os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
-<unit bldFile="os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
-</component>
-<component name="telephonyaudiorouting" filter="s60" long-name="Telephony Audio Routing">
-<unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/group"/>
-</component>
-<component name="mmfcustominterfaces" filter="s60" long-name="MMF Custom Interfaces">
-<unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/group"/>
-</component>
-<component name="addeddevsoundcontrol" filter="s60" long-name="Added DevSound Control">
-<unit bldFile="os/mm/devsoundextensions/addeddevsoundcontrol/group"/>
-</component>
-<component name="globalaudiosettings" filter="s60" long-name="Global Audio Settings">
-<unit bldFile="os/mm/devsoundextensions/globalaudiosettings/group"/>
-</component>
-<component name="restrictedaudiooutput" filter="s60" long-name="Restricted Audio Output">
-<unit bldFile="os/mm/devsoundextensions/restrictedaudiooutput/group"/>
-</component>
-<component name="ciextnfactoryplugins" filter="s60" long-name="Custom Interface Extension Factory Plugins" plugin="Y">
-<unit bldFile="os/mm/devsoundextensions/ciextnfactoryplugins/group"/>
-</component>
-</collection>
-<collection name="mdfdevvideoextensions" long-name="MDF Dev Video Extensions" level="device-fw">
-<component name="nga_mdf_postprocessor" long-name="NGA MDF Postprocessor" filter="s60">
-<unit bldFile="os/mm/mdfdevvideoextensions/nga_mdf_postprocessor/group"/>
-</component>
-</collection>
-<collection name="audio" long-name="Audio Codecs" level="middleware">
-<component name="arm_cmmf_codecs" filter="s60" long-name="ARM CMMF Codecs" plugin="Y">
-<unit bldFile="os/mm/audio/arm_cmmf_codecs/group"/>
-</component>
-</collection>
-<collection name="video" long-name="Video Codecs" level="middleware">
-<!-- empty -->
-</collection>
-<collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
-<component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/imagingandcamerafws/imagingfws/group" mrp="os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
-</component>
-<component name="camerafw" long-name="Camera Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/imagingandcamerafws/camerafw/group" mrp="os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
-</component>
-</collection>
-<collection name="mmlibs" long-name="Multimedia Libraries" level="middleware">
-<component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmutilitylib/group" mrp="os/mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
-</component>
-<component name="mmfw" long-name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/mmlibs/mmfw/group" mrp="os/mm/mmlibs/mmfw/group/multimedia_mmf.mrp"/>
-</component>
-</collection>
-<collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
-<component name="imagingplugins" long-name="Imaging Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/imagingplugins/group" mrp="os/mm/mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
-</component>
-<component name="cameraplugins" long-name="Camera Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/cameraplugins/group" mrp="os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
-</component>
-<component name="lib3gp" long-name="3GP Library" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/mmplugins/lib3gp/group" mrp="os/mm/mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
-</component>
-<component name="mmfwplugins" long-name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/mmfwplugins/group" mrp="os/mm/mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
-</component>
-</collection>
-<collection name="mm_info" long-name="Multimedia Info" level="app-if">
-<component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc">
-<unit mrp="os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
-</component>
-<component name="mm_metadata" long-name="Multimedia Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
-<component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="^2" purpose="development">
-<unit bldFile="os/mm/mmresourcemgmt/mmresctrl/group" mrp="os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
-</component>
-</collection>
-<collection name="mmdevicefw" long-name="Multimedia Device Framework" level="device-fw">
-<component name="mdf" long-name="Media Device Framework" introduced="9.2" purpose="mandatory">
-<unit bldFile="os/mm/mmdevicefw/mdf/group" mrp="os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
-</component>
-<component name="speechrecogsupport" long-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 name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
-<component name="videorenderer" long-name="Video Renderer" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/mmswadaptation/videorenderer/group" mrp="os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
-</component>
-</collection>
-<collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw"/>
-<collection name="omxil" long-name="OpenMAX IL" level="hw-if">
-<component name="omxilapi" long-name="OpenMAX IL API" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilapi/group" mrp="os/mm/omxil/omxilapi/group/multimedia_omx_il_api.mrp" version="1"/>
-</component>
-<component name="omxilcore" long-name="OpenMAX IL Core" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcore/group" mrp="os/mm/omxil/omxilcore/group/multimedia_omx_il_core.mrp" version="1"/>
-</component>
-<component name="omxilcomponentcommon" long-name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcomponentcommon/group" mrp="os/mm/omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp" version="1"/>
-</component>
-<component name="omxilrefcomps" long-name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilrefcomps/ref_components/group" mrp="os/mm/omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp" version="1"/>
-</component>
-<component name="mmilapi" long-name="Multimedia Integration Layer API" introduced="^3" purpose="development">
-<unit bldFile="os/mm/omxil/mmilapi/group" mrp="os/mm/omxil/mmilapi/group/multimedia_il_api.mrp"/>
-</component>
-</collection>
-<collection name="devsound" long-name="Sound Device" level="devices">
-<component name="devsoundapi" long-name="DevSound API" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/devsound/devsoundapi/group" mrp="os/mm/devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
-</component>
-<component name="a3fdevsound" long-name="A3F DevSound" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3fdevsound/group" mrp="os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
-</component>
-<component name="a3facf" long-name="A3F Audio Component Framework" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/devsound/a3facf/group" mrp="os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
-</component>
-<component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/devsound/devsoundpluginsupport/group" mrp="os/mm/devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
-</component>
-<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">
-<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">
-<unit bldFile="os/mm/devsound/a3ftrace/group" mrp="os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
-</component>
-<component name="a3fsrvstart" long-name="A3F Server Start" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
-</component>
-</collection>
-<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
-<component name="devsoundhwdeviceapi" long-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 name="a3facl" long-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 name="a3fdevsoundcustomisation" long-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"/>
-</component>
-<component name="refacladapt" long-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"/>
-</component>
-<component name="videohai" long-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 name="dvbhreceiverhai" long-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>
-</block>
-<block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
-<collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
-<component name="exif_api" long-name="Exif API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagingext_plat" long-name="Imaging Extensions Platform Interfaces" level="app-if">
-<component name="jpeg2000_icl_plugin_api" long-name="JPEG2000 ICL plugin API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/jpeg2000_icl_plugin_api/group"/>
-</component>
-<component name="extended_icl_jpeg_api" long-name="Extended ICL Jpeg API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
-</component>
-<component name="h324_annex_k_custom_api" long-name="H324 Annex K Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/h324_annex_k_custom_api/group"/>
-</component>
-<component name="ecam_orientation_custom_api" long-name="ECam Orientation Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_orientation_custom_api/group"/>
-</component>
-<component name="ecam_ui_orientation_override_custom_api" long-name="ECam UI Orientation Override Custom API" filter="s60" class="api">
-<unit bldFile="os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
-</component>
-<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>
-</collection>
-<collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
-<component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
-<unit bldFile="os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
-</component>
-<component name="imageadaptationextensions_build" filter="s60" long-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"/>
-</component>
-</collection>
-<collection name="imagingmodules" long-name="Imaging Modules" level="hw-if">
-<component name="exiflib" filter="s60" long-name="Exif Library">
-<unit bldFile="os/imagingext/imagingmodules/exiflib/group"/>
-</component>
-<component name="jp2kcodec" filter="s60" long-name="JPEG2000 Decoder Plugin" plugin="Y">
-<unit bldFile="os/imagingext/imagingmodules/jp2kcodec/group"/>
-</component>
-</collection>
-</block>
-<block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
-<component name="vgi" filter="s60" long-name="VGI">
-<unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
-</component>
-</collection>
-<collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adaptations">
-<component name="m3gcore11" filter="s60" long-name="M3G Core 1.1">
-<unit bldFile="os/graphics/m3g/m3gcore11/group"/>
-</component>
-</collection>
-<collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines">
-<component name="graphicsresource" long-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 name="graphicsresourceadaptation" long-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"/>
-</component>
-<component name="graphicsresourceimplementation" long-name="Graphics Resource Implementation" introduced="^4" purpose="optional">
-<unit bldFile="os/graphics/graphicsresourceservices/graphicsresourceimplementation/group" mrp="os/graphics/graphicsresourceservices/graphicsresourceimplementation/group/graphics_graphicsresourceimplementation.mrp"/>
-</component>
-<component name="graphicsresourceinterface" long-name="Graphics Resource Interface" introduced="^4" purpose="optional">
-<unit bldFile="os/graphics/graphicsresourceservices/graphicsresourceinterface/group" mrp="os/graphics/graphicsresourceservices/graphicsresourceinterface/group/graphics_graphicsresourceinterface.mrp"/>
-</component>
-</collection>
-<collection name="graphicsutils" long-name="Graphics Utils" level="engines">
-<component name="commongraphicsheaders" long-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 name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
-<!-- displayldd to be moved here -->
-<component name="surfacemgr" long-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 name="graphicscomposition" long-name="Graphics Composition" level="engines">
-<component name="openwfcinterface" long-name="OpenWF Composition Interface" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfcinterface/group" mrp="os/graphics/graphicscomposition/openwfcinterface/group/graphics_openwfcinterface.mrp"/>
-</component>
-<component name="openwfcompositionengine" long-name="OpenWF Composition Engine" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/graphicscomposition/openwfcompositionengine/group" mrp="os/graphics/graphicscomposition/openwfcompositionengine/group/graphics_openwfcompositionengine.mrp"/>
-</component>
-<component name="openwfsupport" long-name="OpenWF Support" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfsupport/group" mrp="os/graphics/graphicscomposition/openwfsupport/group/graphics_openwfsupport.mrp"/>
-</component>
-<component name="surfaceupdate" long-name="Surface Update" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/surfaceupdate/group" mrp="os/graphics/graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
-</component>
-</collection>
-<collection name="graphicstest" long-name="Graphics Test" level="app-if">
-<component name="uibench" long-name="UI Bench" introduced="9.2" purpose="development">
-<unit bldFile="os/graphics/graphicstest/uibench/group" mrp="os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
-</component>
-</collection>
-<collection name="graphics_plat" long-name="Graphics Platform Interfaces" level="app-if">
-<component name="m3g_core_api" filter="sf_build" long-name="M3G Core API" class="api">
-<unit bldFile="os/graphics/graphics_plat/m3g_core_api/group"/>
-</component>
-</collection>
-<collection name="graphics_info" long-name="Graphics Info" level="app-if">
-<component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc">
-<unit mrp="os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
-</component>
-<component name="graphics_metadata" long-name="Graphics Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
-</component>
-</collection>
-<collection name="windowing" long-name="Windowing" level="app-if">
-<component name="windowserver" long-name="Window Server" purpose="mandatory">
-<unit bldFile="os/graphics/windowing/windowserver/group" mrp="os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
-</component>
-<component name="windowserverplugins" long-name="Window Server Plugins" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/windowing/windowserverplugins/group" mrp="os/graphics/windowing/windowserverplugins/group/graphics_wserv_std_plugins.mrp"/>
-</component>
-</collection>
-<collection name="printingservices" long-name="Printing Services" level="app-if">
-<component name="printerdriversupport" long-name="Printer Driver Support" purpose="optional">
-<unit bldFile="os/graphics/printingservices/printerdriversupport/group" mrp="os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
-</component>
-<component name="printerdrivers" long-name="Printer Drivers" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/printingservices/printerdrivers/group" mrp="os/graphics/printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
-</component>
-</collection>
-<collection name="fbs" long-name="Font and Bitmap Server" level="device-interface">
-<component name="fontandbitmapserver" long-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 name="opengles" long-name="OpenGLES" level="internal-adaptations">
-<component name="openglesinterface" long-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 name="opengles_stub" filter="sf_build" long-name="OpenGL ES Stub" purpose="optional" introduced="^2">
-<unit bldFile="os/graphics/opengles/openglesinterface/group/opengles_stub"/>
-</component>
-</collection>
-<collection name="openvg" long-name="OpenVG" level="internal-adaptations">
-<component name="openvginterface" long-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 name="openvg11" filter="s60" long-name="OpenVG 1.1">
-<!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
-<unit bldFile="os/graphics/openvg/openvginterface/group/openvg11"/>
-</component>
-<component name="sfopenvg" filter="sf_build" long-name="Khronos OpenVG Reference Implementation" introduced="^2" purpose="optional">
-<unit bldFile="os/graphics/openvg/openvgrefimplementation/sfopenvg/group"/>
-</component>
-</collection>
-<collection name="egl" long-name="EGL" level="internal-adaptations">
-<component name="eglinterface" long-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 name="eglswitch" long-name="EGL Switch" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglswitch/group" mrp="os/graphics/egl/eglswitch/group/graphics_eglswitch.mrp"/>
-</component>
-<component name="eglrefimpl" long-name="EGL Reference Implementation" introduced="^3" purpose="optional">
-<unit bldFile="os/graphics/egl/eglrefimpl/group" mrp="os/graphics/egl/eglrefimpl/group/graphics_eglrefimpl.mrp"/>
-</component>
-<component name="egltest" long-name="EGL Tests" introduced="^3" purpose="development">
-<unit bldFile="os/graphics/egl/egltest/group" mrp="os/graphics/egl/egltest/group/graphics_egltest.mrp"/>
-</component>
-</collection>
-<collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
-<component name="gdi" long-name="GDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/gdi/group" mrp="os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
-</component>
-<component name="bitgdi" long-name="BitGDI" purpose="mandatory">
-<unit bldFile="os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
-</component>
-<component name="colourpalette" long-name="Colour Palette" introduced="7.0s" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
-</component>
-<component name="screendriver" long-name="Screen Driver" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/graphics/graphicsdeviceinterface/screendriver/group" mrp="os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
-</component>
-<component name="directgdi" long-name="DirectGDI" introduced="^3" deprecated="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/directgdi/group" mrp="os/graphics/graphicsdeviceinterface/directgdi/group/graphics_directgdi.mrp"/>
-</component>
-<component name="directgdiinterface" long-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 name="directgdiadaptation" long-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"/>
-</component>
-</collection>
-<collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
-<component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/gdi_tools/group" mrp="os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
-</component>
-</collection>
-<collection name="graphicsapitest" long-name="Graphics API Tests" level="app-if"/>
-</block>
-<block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
-<collection name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" level="text">
-<component name="findutil_api" long-name="Find Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/findutil_api/group"/>
-</component>
-<component name="japanese_language_utilities_api" long-name="Japanese Language Utilities API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
-</component>
-<component name="sortutil_api" long-name="Sorting Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/sortutil_api/group"/>
-</component>
-</collection>
-<collection name="textandloc_pub" long-name="Text and Localisation Public Interfaces" level="text">
-<component name="directory_localizer_api" long-name="Directory Localizer API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_pub/directory_localizer_api/group"/>
-</component>
-</collection>
-<collection name="charconvfw" long-name="Character Conversion" level="encoding">
-<component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional">
-<unit bldFile="os/textandloc/charconvfw/charconv_fw/group" mrp="os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
-</component>
-<component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/charconvplugins/group" mrp="os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
-</component>
-<component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/fatfilenameconversionplugins/group" mrp="os/textandloc/charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
-</component>
-</collection>
-<collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
-<component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/textshaperplugin/group" mrp="os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
-</component>
-<component name="fontstore" long-name="Font Store" purpose="mandatory">
-<unit bldFile="os/textandloc/fontservices/fontstore/group" mrp="os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
-</component>
-<component name="textrendering" long-name="Text Rendering" purpose="mandatory" class="placeholder">
-<!-- placeholder for text code from GDI -->
-</component>
-<component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/freetypefontrasteriser/group" mrp="os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
-</component>
-<component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional">
-<unit bldFile="os/textandloc/fontservices/referencefonts/group" mrp="os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
-</component>
-</collection>
-<collection name="textlayout" long-name="Text Layout" level="text">
-<component name="texthandling" long-name="Text Handling" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/texthandling/group" mrp="os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
-</component>
-<component name="textformatting" long-name="Text Formatting" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/textformatting/group" mrp="os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
-</component>
-</collection>
-<collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
-<!-- components in this collection need to be moved to the right collection.
- Either move into the units' directories, or create a new textandlocutils directory -->
-<component name="numbergrouping" filter="s60" long-name="Number Grouping">
-<unit bldFile="os/textandloc/charconvfw/numbergrouping/group"/>
-</component>
-<component name="jplangutil" filter="s60" long-name="Japanese Language Utilities">
-<unit bldFile="os/textandloc/charconvfw/jplangutil/group"/>
-</component>
-<component name="sortutil" filter="s60" long-name="Sorting Utility">
-<unit bldFile="os/textandloc/charconvfw/sortutil/group"/>
-</component>
-<component name="inlinetext" filter="s60" long-name="Inline Text">
-<unit bldFile="os/textandloc/charconvfw/inlinetext/group"/>
-</component>
-<component name="nearestlangutil" long-name="Nearest Language Util" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-<component name="numberformatting" long-name="Number Formatting" introduced="7.0s" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/numberformatting/group" mrp="os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
-</component>
-</collection>
-<collection name="localesupport" long-name="Locale Support" level="util">
-<component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/localisation/localesupport" mrp="os/textandloc/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
-</component>
-<component name="initlocale" long-name="Initialise Locale" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-</collection>
-<collection name="textandloctools" long-name="Text and Localisation Tools" level="tools">
-<component name="fontcompiler" long-name="Font Compiler" purpose="development" class="placeholder PC">
-<!-- placeholder for split from GDI Tools -->
-</component>
-<component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/bitmapfonttools/group" mrp="os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
-</component>
-</collection>
-<collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
-<component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
-<collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
-<component name="xmlsrv_plat_build" long-name="XML Services Platform Interface Build" filter="s60" class="api">
-<!-- need to fix the configuration used here.
- Either destribute to other components or use the new feature flags confguration mechanisms.
- Remove this component and uncomment the other units when fixed-->
-<unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
-</component>
-<component name="xml_encryption_api" long-name="XML Encryption API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/> -->
-</component>
-<component name="xml_signature_api" long-name="XML Signature API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_signature_api/group"/> -->
-</component>
-<component name="xml_security_engine_utils_api" long-name="XML Security Engine Utils API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/> -->
-</component>
-</collection>
-<collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
-<component name="xmlseccertman" filter="s60" long-name="XML Security Certificate Manager">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
-</component>
-<component name="xmlsec" filter="s60" long-name="XML Security">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsec/group"/>
-</component>
-<component name="xmlseccrypto" filter="s60" long-name="XML Security Crypto">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccrypto/group"/>
-</component>
-<component name="xmlsecwrapper" filter="s60" long-name="XML Security Wrapper">
-<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsecwrapper/group"/>
-</component>
-</collection>
-<collection name="xml" long-name="XML" level="generic">
-<component name="xmlfw" long-name="XML Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmlfw/group" mrp="os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
-</component>
-<component name="libxml2libs" long-name="Libxml2 Libraries" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/libxml2libs/group" mrp="os/xmlsrv/xml/libxml2libs/group/syslibs_libxml2.mrp"/>
-</component>
-<component name="legacyminidomparser" long-name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/legacyminidomparser/GROUP" mrp="os/xmlsrv/xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp"/>
-</component>
-<component name="xmldomandxpath" long-name="XML DOM and XPath" introduced="^3" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmldomandxpath/group" mrp="os/xmlsrv/xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
-</component>
-<component name="xmlexpatparser" long-name="XML Expat Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmlexpatparser/group" mrp="os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
-</component>
-<component name="xmllibxml2parser" long-name="XML Libxml2 Parser" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmllibxml2parser/group" mrp="os/xmlsrv/xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
-</component>
-<component name="wbxmlparser" long-name="WBXML Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/wbxmlparser/group" mrp="os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
-</component>
-</collection>
-<collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
-<component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="deviceplatformrelease" level="services" long-name="Device Platform Release" levels="bld mid top">
-<collection name="s60extras" long-name="S60 Extras" level="mid">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="s60extras_build" filter="s60" long-name="S60 Extras Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/S60Extras/group"/>
-</component>
-</collection>
-<collection name="version" long-name="Version" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="version_build" filter="s60" long-name="Version Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/Version/group"/>
-</component>
-</collection>
-<collection name="helps_loc2" long-name="Helps Locale 2" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helps_loc2_build" long-name="Helps Locale 2 Build" filter="s60">
-<unit bldFile="os/deviceplatformrelease/helps_loc2/group"/>
-</component>
-</collection>
-<collection name="sf_config" long-name="SF Config" level="mid">
-<component name="config" filter="s60" long-name="Config" purpose="development" class="config"/>
-<component name="cenrep" filter="sf_build" long-name="ConE Central Repository Config" purpose="development" class="config">
-<!-- will should give the id/path something more unique than cenrep -->
-<unit bldFile="os/deviceplatformrelease/sf_config/cenrep/group"/>
-</component>
-<component name="rombuild_syborg" filter="sf_build" long-name="Syborg iMaker Config" purpose="development" introduced="^3" class="config">
-<unit bldFile="os/deviceplatformrelease/sf_config/rombuild/syborg/group"/>
-</component>
-<component name="rombuild_zoom2" filter="sf_build" long-name="Zoom2 iMaker Config" purpose="development" introduced="^3" class="config">
-<unit bldFile="os/deviceplatformrelease/sf_config/rombuild/zoom2/group"/>
-</component>
-</collection>
-<!-- should be located locally in buildplatforms/group
- <collection id="s60bld" name="S60 Build">
- <component id="buildplatforms" filter="s60" name="Build Platforms">
- <unit bldFile="/tools/buildplatforms/group"/>
- </component>
- </collection>-->
-<collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
-<component name="cedarutils" long-name="Cedar Utils" purpose="development">
-<unit mrp="os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
-</component>
-<component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt" purpose="development" class="config">
-<unit mrp="os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
-</component>
-<component name="foundation_s60_packages" long-name="Foundation S60 Packages" introduced="^3" deprecated="^3" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/symbianosbld/foundation_s60_packages/foundation_s60_packages.mrp"/>
-</component>
-</collection>
-<collection name="foundation_system" long-name="Foundation System" level="top">
-<component name="system_model" long-name="System Model" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
-</component>
-</collection>
-<collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
-<component name="deviceplatformrelease_metadata" long-name="Device Platform Release Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="osrndtools" level="services" long-name="OS R&D tools" levels="fw trace">
-<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"/>
-</component>
-<component name="testinterface" filter="s60" long-name="Test Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/testinterface/group"/>
-</component>
-<component name="testserver" filter="s60" long-name="Test Server" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserver/group"/>
-</component>
-<component name="testengine" filter="s60" long-name="Test Engine" purpose="development">
-<unit bldFile="os/osrndtools/stif/testengine/group"/>
-</component>
-<component name="testserverstarter" filter="s60" long-name="Test Server Starter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testserverstarter/group"/>
-</component>
-<component name="stiftfwif" filter="s60" long-name="STIF Test Framework Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/stiftfwif/group"/>
-</component>
-<component name="consoleui" filter="s60" long-name="Console UI" purpose="development">
-<unit bldFile="os/osrndtools/stif/consoleui/group"/>
-</component>
-<component name="testcombiner" filter="s60" long-name="Test Combiner" purpose="development">
-<unit bldFile="os/osrndtools/stif/testcombiner/group"/>
-</component>
-<component name="demomodule" filter="s60" long-name="Demo Module" purpose="development">
-<unit bldFile="os/osrndtools/stif/demomodule/group"/>
-</component>
-<component name="atslogger" filter="s60" long-name="ATS Logger" purpose="development">
-<unit bldFile="os/osrndtools/stif/atslogger/group"/>
-</component>
-<component name="atsinterface" filter="s60" long-name="ATS Interface" purpose="development">
-<unit bldFile="os/osrndtools/stif/atsinterface/group"/>
-</component>
-<component name="testscripter" filter="s60" long-name="Test Scripter" purpose="development">
-<unit bldFile="os/osrndtools/stif/testscripter/group"/>
-</component>
-<component name="suevent" filter="s60" long-name="SU Event" purpose="development">
-<unit bldFile="os/osrndtools/stif/suevent/group"/>
-</component>
-<component name="stifkerneltestclassbase" filter="s60" long-name="STIF Kernel Test Class Base" purpose="development">
-<!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
-<!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
-</component>
-<component name="stif_build" filter="s60" long-name="STIF Build" purpose="development">
-<!-- move exports into self-contained component. Remove this when configuration is in place-->
-<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">
-<unit bldFile="os/osrndtools/memspy/memspy_plat/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/engine/group"/>
-</component>
-<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">
-<unit bldFile="os/osrndtools/memspy/console/group"/>
-</component>
-<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>
-</collection>
-<collection name="hti" long-name="Harmonized Test Interface" level="trace">
-<component name="hti_plat" filter="s60" long-name="HTI Platform Interfaces" purpose="development" class="api">
-<unit bldFile="os/osrndtools/hti/hti_plat/group"/>
-</component>
-<component name="hticfg" filter="s60" long-name="HTI Config" purpose="development">
-<unit bldFile="os/osrndtools/hti/hticfg/group"/>
-</component>
-<component name="htiautostart" filter="s60" long-name="HTI Autostart" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiautostart/group"/>
-</component>
-<component name="htiframework" filter="s60" long-name="HTI Framework" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiframework/group"/>
-</component>
-<component name="hticommplugins" filter="s60" long-name="HTI Communication Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
-</component>
-<component name="htiserviceplugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- need to #include these from a single unit or separate into component at the right directory level -->
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
-<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
-</component>
-<component name="htifilehlp" filter="s60" long-name="HTI File Help" purpose="development">
-<unit bldFile="os/osrndtools/hti/htifilehlp/group"/>
-</component>
-<component name="htiwatchdog" filter="s60" long-name="HTI Watchdog" purpose="development">
-<unit bldFile="os/osrndtools/hti/htiwatchdog/group"/>
-</component>
-<component name="hti_build" filter="s60" long-name="HTI Build" purpose="development">
-<!-- move exports into self-contained component.-->
-<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">
-<block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
-<collection name="appsupport_pub" long-name="Generic Application Support Public Interfaces" level="specific">
-<component name="flash_viewer_framework_api" long-name="Flash Viewer Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
-</component>
-<component name="network_status_api" long-name="Network Status API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_pub/network_status_api/group"/>
-</component>
-</collection>
-<collection name="appsupport_plat" long-name="Generic Application Support Platform Interfaces" level="specific">
-<component name="action_plugin_api" long-name="Action Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/action_plugin_api/group"/>
-</component>
-<component name="application_orientation_api" long-name="Application Orientation API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/application_orientation_api/group"/>
-</component>
-<component name="context_access_api" long-name="Context Access API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_access_api/group"/>
-</component>
-<component name="context_framework_services_api" long-name="Context Framework Services API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_services_api/group"/>
-</component>
-<component name="context_framework_client_api" long-name="Context Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_client_api/group"/>
-</component>
-<component name="context_framework_listener_api" long-name="Context Framework Listener API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_listener_api/group"/>
-</component>
-<component name="context_framework_version_api" long-name="Context Framework Version API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_framework_version_api/group"/>
-</component>
-<component name="context_source_plugin_api" long-name="Context Source Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_plugin_api/group"/>
-</component>
-<component name="context_source_settings_manager_api" long-name="Context Source Settings Manager API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_source_settings_manager_api/group"/>
-</component>
-<component name="context_subscription_api" long-name="Context Subscription API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/context_subscription_api/group"/>
-</component>
-<component name="key_event_framework_api" long-name="Key Event Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_api/group"/>
-</component>
-<component name="key_event_framework_mapper_api" long-name="Key Event Framework Mapper API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_mapper_api/group"/>
-</component>
-<component name="media_keys_definition_api" long-name="Media Keys Definition API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/media_keys_definition_api/group"/>
-</component>
-<component name="ood_threshold_api" long-name="OOD Threshold API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/ood_threshold_api/group"/>
-</component>
-<component name="oom_monitor_api" long-name="OOM Monitor API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_api/group"/>
-</component>
-<component name="oom_monitor_plugin_api" long-name="OOM Monitor Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_plugin_api/group"/>
-</component>
-<component name="operation_provider_api" long-name="Operation Provider API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/operation_provider_api/group"/>
-</component>
-<component name="phonecmdhandler_api" long-name="Phone Command Handler API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/phonecmdhandler_api/group"/>
-</component>
-<component name="restore_factory_settings_api" long-name="Restore Factory Settings API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_api/group"/>
-</component>
-<component name="restore_factory_settings_plugin_api" long-name="Restore Factory Settings Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_plugin_api/group"/>
-</component>
-<component name="secondary_display_accfw_api" long-name="Secondary Display Accessory Framework API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_accfw_api/group"/>
-</component>
-<component name="secondary_display_startup_api" long-name="Secondary Display Startup API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_startup_api/group"/>
-</component>
-<component name="secondary_display_sysap_api" long-name="Secondary Display System Application API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_sysap_api/group"/>
-</component>
-<component name="secondary_display_system_state_api" long-name="Secondary Display System State API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_system_state_api/group"/>
-</component>
-<component name="sensor_user_setting_api" long-name="Sensor User Setting API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/sensor_user_setting_api/group"/>
-</component>
-<component name="startup_configuration_api" long-name="Startup Configuration API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/startup_configuration_api/group"/>
-</component>
-<component name="system_application_key_handler_plugin_api" long-name="System Application Key Handler Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_key_handler_plugin_api/group"/>
-</component>
-<component name="system_application_light_control_plugin_api" long-name="System Application Light Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_light_control_plugin_api/group"/>
-</component>
-<component name="system_application_notification_api" long-name="System Application Notification API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_notification_api/group"/>
-</component>
-<component name="system_application_plugin_callback_api" long-name="System Application Plug-in Callback API" filter="s60" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
-</component>
-<component name="flash_mmi_service_interface_custom_api" long-name="Flash MMI Service Interface Custom API" filter="s60,!sf_build" introduced="^2" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/flash_mmi_service_interface_custom_api/group"/>
-</component>
-<component name="flash_netscape_plugin_command_api" long-name="Flash Netscape Plugin Command API" filter="s60,!sf_build" introduced="^2" class="api">
-<unit bldFile="mw/appsupport/appsupport_plat/flash_netscape_plugin_command_api/group"/>
-</component>
-</collection>
-<collection name="contextframework" long-name="Context Framework" level="framework">
-<!-- the units that are commented out need to be put back when configuration is in place.
- They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
-<component name="cfw" filter="s60" long-name="Context Framework">
-<!--<unit bldFile="contextframework/cfw/group"/> -->
-</component>
-<component name="cfwplugins" filter="s60" long-name="Context Framework Plugins" plugin="Y">
-<!--<unit bldFile="contextframework/cfwplugins/group"/>-->
-</component>
-<component name="contextframework_build" filter="s60" long-name="Context Framework Build">
-<unit bldFile="mw/appsupport/contextframework/group"/>
-</component>
-</collection>
-<collection name="coreapplicationuis" long-name="Core Application UIs" level="server">
-<component name="dbrecovery" filter="s60" long-name="Database Recovery">
-<unit bldFile="mw/appsupport/coreapplicationuis/dbrecovery/group"/>
-</component>
-<component name="nspswsplugin" filter="s60" long-name="NSPS WS Plugin" plugin="Y">
-<!-- No Service Power Save? Window Server? Please elaborate-->
-<unit bldFile="mw/appsupport/coreapplicationuis/nspswsplugin/group"/>
-</component>
-<component name="rfs" filter="s60" long-name="Restore Factory Settings">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfs/group"/>
-</component>
-<component name="rfsplugins" filter="s60" long-name="Restore Factory Settings Plugins" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/group"/>
-</component>
-<component name="sysap" filter="s60" long-name="System Application">
-<unit bldFile="mw/appsupport/coreapplicationuis/sysap/group"/>
-</component>
-<component name="variatedsettings" filter="s60" long-name="Variated Settings" class="config">
-<unit bldFile="mw/appsupport/coreapplicationuis/variatedsettings/group"/>
-</component>
-<component name="accfwuinotifier" filter="s60" long-name="Accessory Framework UI Notifier" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/accfwuinotifier/group"/>
-</component>
-<component name="kefmapper" filter="s60" long-name="Key Event Framework">
-<unit bldFile="mw/appsupport/coreapplicationuis/kefmapper/group"/>
-</component>
-<component name="advancedtspcontroller" filter="s60" long-name="Advanced TSP Controller">
-<unit bldFile="mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
-</component>
-<component name="powersaveutilities" filter="s60" long-name="Power Save Utilities">
-<unit bldFile="mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
-</component>
-<component name="gsserverenginestub" filter="s60" long-name="GS Server Engine Stub">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
-</component>
-<component name="gsserverengine" filter="s60" long-name="GS Server Engine">
-<unit bldFile="mw/appsupport/coreapplicationuis/gsserverengine/group"/>
-</component>
-<component name="sensordatacompensatorplugin" filter="s60" long-name="Sensor Data Compensator Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/group"/>
-</component>
-<component name="atcmdplugin" long-name="AT Command Plugin" filter="s60,!oem_build" plugin="Y">
-<unit bldFile="mw/appsupport/coreapplicationuis/atcmdplugin/group"/>
-</component>
-</collection>
-<collection name="flashliteapi_3_1" long-name="Flash Lite API 3.1" level="specific">
-<!-- collection is really a component. Move down a directory -->
-<component name="flashliteapi_3_1_build" long-name="Flash Lite API Build" filter="s60" introduced="^2"/>
-</collection>
-<collection name="mediakeys" long-name="Media Keys" level="plugin">
-<!-- collection is really a component. Move down a directory -->
-<component name="mediakeys_build" filter="s60" long-name="Media Keys Build">
-<unit bldFile="mw/appsupport/mediakeys/group"/>
-</component>
-</collection>
-<collection name="startupservices" long-name="Startup Services" level="system">
-<component name="splashscreen" filter="s60" long-name="Splash Screen">
-<unit bldFile="mw/appsupport/startupservices/splashscreen/group"/>
-</component>
-<component name="startupanimation" filter="s60" long-name="Startup Animation">
-<unit bldFile="mw/appsupport/startupservices/startupanimation/group"/>
-</component>
-<component name="startup" long-name="Startup Application" filter="s60">
-<unit bldFile="mw/appsupport/startupservices/startup/group"/>
-</component>
-</collection>
-<collection name="sysresmonitoring" long-name="System Resource Monitoring" level="system">
-<component name="oodmonitor" filter="s60" long-name="OOD Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oodmonitor/group"/>
-</component>
-<component name="oommonitor" filter="s60" long-name="OOM Monitor" introduced="7.0s">
-<unit bldFile="mw/appsupport/sysresmonitoring/oommonitor/group"/>
-</component>
-</collection>
-<collection name="systemsettings" long-name="System Settings" level="system">
-<component name="gssensorplugin" filter="s60" long-name="GS Sensor Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gssensorplugin/group"/>
-</component>
-<component name="gsaccessoryplugin" filter="s60" long-name="GS Accessory Plugin" plugin="Y">
-<unit bldFile="mw/appsupport/systemsettings/gsaccessoryplugin/group"/>
-</component>
-</collection>
-<collection name="filehandling" long-name="File Handling" level="server">
-<component name="fileconverterfw" long-name="File Converter Framework" purpose="optional">
-<unit bldFile="mw/appsupport/filehandling/fileconverterfw/group" mrp="mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
-</component>
-<component name="htmltorichtextconverter" long-name="HTML to RichText Converter" introduced="7.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/htmltorichtextconverter/group" mrp="mw/appsupport/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
-</component>
-<component name="richtexttohtmlconverter" long-name="RichText to HTML Converter" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
-</component>
-</collection>
-<collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
-<component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
-</component>
-</collection>
-<collection name="commonappservices" long-name="Common Application Services" level="framework">
-<component name="alarmserver" long-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"/>
-</component>
-<component name="alarmservertest" long-name="Alarm Server Test" deprecated="^3" introduced="8.1" purpose="development">
-<unit bldFile="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
-</component>
-<component name="appservicesdocs" long-name="Application Services Documentation" purpose="development" class="doc">
-<unit mrp="mw/appsupport/commonappservices/appservicesdocs/app-services_documentation.mrp"/>
-</component>
-<component name="backuprestorenotification" long-name="Backup Restore Notification" introduced="8.1" purpose="optional">
-<unit bldFile="mw/appsupport/commonappservices/backuprestorenotification/group" mrp="mw/appsupport/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
-</component>
-</collection>
-<collection name="tzservices" long-name="Time Zone Services" level="plugin">
-<component name="tzserver" long-name="Time Zone Server" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzserver/group" mrp="mw/appsupport/tzservices/tzserver/group/app-services_tz.mrp"/>
-</component>
-<component name="tzloc" long-name="Time Zone Localization" introduced="9.1" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzloc/group" mrp="mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
-</component>
-<component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzlocrscfactory/group" mrp="mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
-</component>
-<component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzdatabase/group" mrp="mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
-</component>
-</collection>
-<collection name="contenthandling" long-name="Content Handling" level="plugin">
-<component name="webrecognisers" long-name="Web Recognisers" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/contenthandling/webrecognisers/group" mrp="mw/appsupport/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
-</component>
-</collection>
-<collection name="openenvutils" long-name="Open Environment Utilities" level="specific">
-<component name="commandshell" long-name="Command Shell" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/commandshell/group" mrp="mw/appsupport/openenvutils/commandshell/group/oetools_zsh.mrp"/>
-</component>
-<component name="telnetserver" long-name="Telnet Server" introduced="^3" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/telnetserver/group" mrp="mw/appsupport/openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
-</component>
-</collection>
-<collection name="printingsupport" long-name="Printing Support" level="generic">
-<component name="printinguisupport" long-name="Printing UI Support" purpose="optional" introduced="^2" deprecated="^3">
-<unit bldFile="mw/appsupport/printingsupport/printinguisupport/group" mrp="mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
-</component>
-</collection>
-<collection name="appfw" long-name="Application Framework" level="framework">
-<component name="apparchitecture" long-name="Application Architecture" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/apparchitecture/group" mrp="mw/appsupport/appfw/apparchitecture/group/app-framework_apparc.mrp"/>
-</component>
-<component name="viewserver" long-name="View Server" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/viewserver/group" mrp="mw/appsupport/appfw/viewserver/group/app-framework_viewsrv.mrp"/>
-</component>
-</collection>
-<collection name="applaunchservices" long-name="Application Launch Services" level="generic">
-<component name="aftermarketappstarter" long-name="After Market Application Starter" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/aftermarketappstarter/group" mrp="mw/appsupport/applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
-</component>
-<component name="applaunchplugins" long-name="Application Launch Plugins" introduced="^3" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/applaunchplugins/group" mrp="mw/appsupport/applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
-</component>
-</collection>
-<collection name="tzpcside" long-name="Time Zone PC Side" level="plugin">
-<component name="tzcompiler" long-name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config PC">
-<unit bldFile="mw/appsupport/tzpcside/tzcompiler/group" mrp="mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
-</component>
-</collection>
-<collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
-<component name="appsupport_metadata" long-name="Generic Application Support Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="securitysrv" level="generic" long-name="Security Services" levels="plugin framework server generic specific">
-<collection name="secsrv_plat" long-name="Security Services Platform Interfaces" level="specific">
-<component name="cms_api" long-name="CMS API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/cms_api/group"/>
-</component>
-<component name="pkcs12_parser_api" long-name="PKCS12 Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkcs12_parser_api/group"/>
-</component>
-<component name="java_utils_api" long-name="Java Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/java_utils_api/group"/>
-</component>
-<component name="wim_cert_api" long-name="WIM Cert API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/wim_cert_api/group"/>
-</component>
-<component name="device_key_store_encryption_plugin_api" long-name="Device Key Store Encryption Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/device_key_store_encryption_plugin_api/group"/>
-</component>
-<component name="x509certnameparser_api" long-name="X.509 Certificate Name Parser API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
-</component>
-<component name="remote_lock_api" long-name="Remote Lock API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
-</component>
-<component name="pkidialog_api" long-name="PKI Dialog API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
-</component>
-<component name="provisioning_api" long-name="Provisioning API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/provisioning_api/group"/>
-</component>
-<component name="keyguard_configuration_api" long-name="Keyguard Configuration API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_configuration_api/group"/>
-</component>
-<component name="keylock_policy_api" long-name="Keylock Policy API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keylock_policy_api/group"/>
-</component>
-<component name="security_code_ui_api" long-name="Security Code UI API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
-</component>
-<component name="gba_api" long-name="GBA API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/gba_api/group"/>
-</component>
-<component name="keyguard_access_api" long-name="Keyguard Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_access_api/group"/>
-</component>
-<component name="devicelock_access_api" long-name="Device Lock Access API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devicelock_access_api/group"/>
-</component>
-<component name="lockapp_server_api" long-name="Lock Application Server API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
-</component>
-<component name="devencadaptation_api" long-name="Device Encryption Adaptation API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
-</component>
-<component name="devenccommonutils_api" long-name="Device Encryption Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
-</component>
-</collection>
-<collection name="cms" long-name="Certificate Management Service" level="server">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="cms_build" filter="s60" long-name="CMS" introduced="^3">
-<unit bldFile="mw/securitysrv/cms/group"/>
-</component>
-</collection>
-<collection name="pkiutilities" long-name="PKI Utilities" level="plugin">
-<component name="x509certnameparser" filter="s60" long-name="X.509 Certificate Name Parser">
-<unit bldFile="mw/securitysrv/pkiutilities/x509certnameparser/group"/>
-</component>
-<component name="pkcs12" filter="s60" long-name="PKCS #12">
-<unit bldFile="mw/securitysrv/pkiutilities/pkcs12/group"/>
-</component>
-<component name="certmanui" filter="s60" long-name="Certificate Management UI">
-<unit bldFile="mw/securitysrv/pkiutilities/certmanui/group"/>
-</component>
-<component name="ctsecuritydialogs" filter="s60" long-name="Crypto Token Security Dialogs">
-<unit bldFile="mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
-</component>
-<component name="certsaver" filter="s60" long-name="Certificate Saver">
-<unit bldFile="mw/securitysrv/pkiutilities/certsaver/group"/>
-</component>
-<component name="secmodui" filter="s60" long-name="Security Module UI">
-<unit bldFile="mw/securitysrv/pkiutilities/secmodui/group"/>
-</component>
-<component name="devicetoken" filter="s60" long-name="Device Token">
-<unit bldFile="mw/securitysrv/pkiutilities/devicetoken/group"/>
-</component>
-<component name="certificates" filter="s60" long-name="Certificates">
-<unit bldFile="mw/securitysrv/pkiutilities/Certificates/group" filter="sf_build"/>
-</component>
-<component name="pkiutilities_build" filter="s60" long-name="PKI Utilities Build">
-<!-- need to split this into the above components -->
-<unit bldFile="mw/securitysrv/pkiutilities/group"/>
-</component>
-<component name="ocsp" long-name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
-<unit bldFile="mw/securitysrv/pkiutilities/ocsp/group" mrp="mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
-</component>
-</collection>
-<collection name="wim" long-name="Wireless Identity Module " level="framework">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="wim_build" filter="s60" long-name="WIM Build">
-<unit bldFile="mw/securitysrv/wim/group"/>
-</component>
-</collection>
-<collection name="remotelock" long-name="Remote Lock" level="generic">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="remotelock_build" filter="s60" long-name="Remote Lock Build">
-<unit bldFile="mw/securitysrv/remotelock/group"/>
-</component>
-</collection>
-<collection name="securitydialogs" long-name="Security Dialogs" level="specific">
-<component name="keylockpolicyapi" filter="s60" long-name="Keylock Policy API">
-<unit bldFile="mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
-</component>
-<component name="autolock" long-name="Autolock" filter="s60">
-<unit bldFile="mw/securitysrv/securitydialogs/autolock/group"/>
-</component>
-<component name="secui" filter="s60" long-name="Security UI">
-<unit bldFile="mw/securitysrv/securitydialogs/secui/group"/>
-</component>
-<component name="securitynotifier" filter="s60" long-name="Security Notifier">
-<unit bldFile="mw/securitysrv/securitydialogs/securitynotifier/group"/>
-</component>
-<component name="lockclient" filter="s60" long-name="Lock Client" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockclient/group"/>
-</component>
-<component name="lockapp" filter="s60" long-name="Lock Application" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockapp/group"/>
-</component>
-<component name="secuinotifications" long-name="Security UI Notifications" introduced="^4" filter="s60">
-<unit bldFile="mw/securitysrv/securitydialogs/secuinotifications" proFile="secuinotifications.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="boottimeintegritycheck_build" filter="s60" long-name="Boot Time Integrity Check Build">
-<unit bldFile="mw/securitysrv/boottimeintegritycheck/group"/>
-</component>
-</collection>
-<collection name="gba" long-name="Generic Bootstrapping Architecture" level="server">
-<component name="uicc" filter="s60" long-name="UICC" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/uicc/group"/>
-</component>
-<component name="gbaserver" filter="s60" long-name="GBA Server" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaserver/group"/>
-</component>
-<component name="gbaapi" filter="s60" long-name="GBA API" introduced="^2">
-<unit bldFile="mw/securitysrv/gba/gbaapi/group"/>
-</component>
-<component name="gbafilter" filter="s60" long-name="GBA HTTP Filter" introduced="^2" plugin="Y">
-<unit bldFile="mw/securitysrv/gba/gbafilter/group"/>
-</component>
-<component name="gba_build" filter="s60" long-name="Generic Boot Architecture Build" introduced="^2">
-<!-- need to split this into the above components, or remove #includes and make this GBA ROM -->
-<unit bldFile="mw/securitysrv/gba/group"/>
-</component>
-</collection>
-<collection name="devencdiskutils" long-name="Device Encryption Disk Utils" level="server">
-<component name="devenccommonutils" filter="s60" long-name="Device Encryption Common Utils" introduced="^3">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncCommonUtils/group"/>
-</component>
-<component name="devencrfsplugin" filter="s60" long-name="Device Encryption RFS Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncRfsPlugin/group"/>
-</component>
-<component name="pk5recognizer" filter="s60" long-name="Device Encryption Pk5 Recognizer" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/Pk5Recognizer/group"/>
-</component>
-<component name="devencstarter" filter="s60" long-name="Device Encryption Starter" introduced="^3" plugin="Y">
-<unit bldFile="mw/securitysrv/devencdiskutils/DevEncStarter/group"/>
-</component>
-<component name="devencdiskutils" filter="s60" long-name="Device Encryption Disk Utils Build" introduced="^3">
-<!-- need to split this into the above components, or remove #includes and make this a ROM component-->
-<unit bldFile="mw/securitysrv/devencdiskutils/group"/>
-</component>
-</collection>
-<collection name="securitysrv_info" long-name="Security Services Info" level="specific">
-<component name="securitysrv_metadata" long-name="Security Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="drm" level="generic" long-name="DRM" levels="plugin framework server generic specific">
-<collection name="drm_plat" long-name="DRM Platform Interfaces" level="specific">
-<component name="roap_api" long-name="ROAP API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/roap_api/group"/>
-</component>
-<component name="drm_common_api" long-name="DRM Common API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_common_api/group"/>
-</component>
-<component name="drm_rights_api" long-name="DRM Rights API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_rights_api/group"/>
-</component>
-<component name="drm_legacy_api" long-name="DRM Legacy API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_legacy_api/group"/>
-</component>
-<component name="dcf_repository_api" long-name="DCF Repository API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/dcf_repository_api/group"/>
-</component>
-<component name="drm_service_api" long-name="DRM Service API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_service_api/group"/>
-</component>
-<component name="drm_secondary_display_api" long-name="DRM Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_secondary_display_api/group"/>
-</component>
-<component name="drm_license_manager_api" long-name="DRM License Manager API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_license_manager_api/group"/>
-</component>
-<component name="drm_utility_api" long-name="DRM Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_utility_api/group"/>
-</component>
-<component name="drm_agents_api" long-name="DRM Agents API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/drm_agents_api/group"/>
-</component>
-<component name="wmdrm_core_api" long-name="WM DRM Core API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_core_api/group"/>
-</component>
-<component name="wmdrm_access_api" long-name="WMDRM Access API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/wmdrm_access_api/group"/>
-</component>
-<component name="camese_utility_api" long-name="Camese Utility API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_utility_api/group"/>
-</component>
-<component name="camese_framework_api" long-name="Camese Framework API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_plat/camese_framework_api/group"/>
-</component>
-</collection>
-<collection name="drm_pub" long-name="DRM Public Interfaces" level="specific">
-<component name="drm_helper_api" long-name="DRM Helper API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_helper_api/group"/>
-</component>
-<component name="oma_drm_caf_agent_api" long-name="OMA DRM CAF Agent API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/group"/>
-</component>
-<component name="drm_license_checker_api" long-name="DRM License Checker API" filter="s60" class="api">
-<unit bldFile="mw/drm/drm_pub/drm_license_checker_api/group"/>
-</component>
-</collection>
-<collection name="commondrm" long-name="Common DRM" level="generic">
-<!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
-<component name="drmencryptor" filter="s60" long-name="DRM Encryptor" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmsettingsplugin" filter="s60" long-name="DRM Settings Plugin" plugin="Y" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmrightsmanagerui" filter="s60" long-name="DRM Rights Manager UI">
-<unit bldFile="mw/drm/commondrm/drmrightsmanagerui/help/group"/>
-</component>
-<component name="drmutility" filter="s60" long-name="DRM Utility">
-<!-- Uncomment unit when configuration is in place. Currently #included from commondrm_build -->
-<!--<unit bldFile="commondrm/drmutility/group"/>-->
-</component>
-<component name="drmserviceapiwrapper" filter="s60" long-name="DRM Service API Wrapper">
-<unit bldFile="mw/drm/commondrm/drmserviceapiwrapper/group"/>
-</component>
-<component name="drmrightsstoringlocation" filter="s60" long-name="DRM Rights Storing Location">
-<unit bldFile="mw/drm/commondrm/drmrightsstoringlocation/group"/>
-</component>
-<component name="commondrm_build" filter="s60" long-name="Common DRM Build">
-<!-- should be split into the above files, or them collapsed into a single component -->
-<unit bldFile="mw/drm/commondrm/group"/>
-</component>
-</collection>
-<collection name="omadrm" long-name="OMA DRM" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="omadrm_build" filter="s60" long-name="OMA DRM Build">
-<unit bldFile="mw/drm/omadrm/group"/>
-</component>
-<component name="foundationcerts" filter="sf_build" long-name="Foundation Certificates">
-<unit bldFile="mw/drm/omadrm/foundationcerts/group"/>
-</component>
-</collection>
-<collection name="wmdrm" long-name="Windows Media DRM" level="framework">
-<!-- collection is really a component. Move down a directory -->
-<component name="wmdrm_build" filter="s60" long-name="WM DRM Build">
-<unit bldFile="mw/drm/wmdrm/group"/>
-</component>
-</collection>
-<collection name="drm_info" long-name="DRM Info" level="specific"/>
-</block>
-<block name="locationsrv" level="specific" long-name="Location Services" levels="plugin fw server if">
-<collection name="locsrv_pub" long-name="Location Services Public Interfaces" level="if">
-<component name="landmarks_search_api" long-name="Landmarks Search API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
-</component>
-<component name="landmarks_api" long-name="Landmarks API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/group"/>
-</component>
-<component name="landmarks_database_management_api" long-name="Landmarks Database Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/group"/>
-</component>
-<component name="location_triggering_api" long-name="Location Triggering API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/location_triggering_api/group"/>
-</component>
-<component name="blid_application_satellite_info_api" long-name="BLID Application Satellite Info API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/group"/>
-</component>
-</collection>
-<collection name="locsrv_plat" long-name="Location Services Platform Interfaces" level="if">
-<component name="map_and_navigation_api" long-name="Map and Navigation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/group"/>
-</component>
-<component name="map_and_navigation_provider_discovery_api" long-name="Map and Navigation Provider Discovery API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/group"/>
-</component>
-<component name="geocoding_api" long-name="Geocoding API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
-</component>
-<component name="map_image_api" long-name="Map Image API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/group"/>
-</component>
-<component name="map_and_navigation_aiw_api" long-name="Map and Navigation AIW API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_aiw_api/group"/>
-</component>
-<component name="map_and_navigation_provider_api" long-name="Map and Navigation Provider API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_api/group"/>
-</component>
-<component name="landmarks_category_definition_api" long-name="Landmarks Category Definition API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
-</component>
-<component name="supl_settings_api" long-name="SUPL Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
-</component>
-<component name="location_settings_launch_api" long-name="Location Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/group"/>
-</component>
-<component name="map_image_conversion_plugin_api" long-name="Map Image Conversion Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/group"/>
-</component>
-<component name="psy_configuration_ui_plugin_api" long-name="PSY Configuration UI Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/psy_configuration_ui_plugin_api/group"/>
-</component>
-<component name="np_proxy_configuration_api" long-name="NP Proxy Configuration API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/np_proxy_configuration_api/group"/>
-</component>
-<component name="supl_terminal_initiation_api" long-name="SUPL Terminal Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/group"/>
-</component>
-<component name="location_notation_preferences_settings_api" long-name="Location Notation Preferences Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_notation_preferences_settings_api/group"/>
-</component>
-<component name="supl_settings_notifier_secondary_display_api" long-name="SUPL Settings Notifier Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_notifier_secondary_display_api/group"/>
-</component>
-<component name="supl_network_initiation_api" long-name="SUPL Network Initiation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/group"/>
-</component>
-<component name="privacy_notifiers_secondary_display_api" long-name="Privacy Notifiers Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/privacy_notifiers_secondary_display_api/group"/>
-</component>
-<component name="oma_supl_configuration_parameter_api" long-name="OMA SUPL Configuration Parameter API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_configuration_parameter_api/group"/>
-</component>
-<component name="supl_query_secondary_display_api" long-name="SUPL Query Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_query_secondary_display_api/group"/>
-</component>
-<component name="location_triggering_management_api" long-name="Location Triggering Management API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_management_api/group"/>
-</component>
-<component name="location_triggering_status_information_api" long-name="Location Triggering Status Information API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_status_information_api/group"/>
-</component>
-<component name="oma_supl_asn_codec_plugin_api" long-name="OMA SUPL ASN Codec Plugin API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
-</component>
-<component name="query_and_notification_api" long-name="Query and Notification API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/query_and_notification_api/group"/>
-</component>
-<component name="location_local_variation_api" long-name="Location Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_local_variation_api/group"/>
-</component>
-</collection>
-<collection name="genericpositioningplugins" long-name="Generic Positioning Plugins" level="plugin">
-<component name="locationnpppsy" filter="s60" long-name="Location Positioning Proxy PSY" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
-</component>
-<component name="locationsuplpsy" filter="s60" long-name="Location SUPL PSY" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/genericpositioningplugins/locationsuplpsy/group"/>
-</component>
-<component name="genericpositioningplugins_build" filter="s60" long-name="Generic Positioning Plugins Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/genericpositioningplugins/group"/>
-</component>
-</collection>
-<collection name="landmarks" long-name="Landmarks" level="server">
-<component name="locationlandmarks" filter="s60" long-name="Location Landmarks">
-<unit bldFile="mw/locationsrv/landmarks/locationlandmarks/group"/>
-</component>
-</collection>
-<collection name="locationmapnavfw" long-name="Location Map and Navigation Framework" level="fw">
-<component name="mnlibrary" filter="s60" long-name="Map and Navigation Library">
-<unit bldFile="mw/locationsrv/locationmapnavfw/library/group"/>
-</component>
-<component name="mnaiwprovider" filter="s60" long-name="Map and Navigation AIW Provider" plugin="Y">
-<unit bldFile="mw/locationsrv/locationmapnavfw/aiwprovider/group"/>
-</component>
-<component name="locationmapnavfw_build" filter="s60" long-name="Location Map and Navigation Framework Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/locationmapnavfw/group"/>
-</component>
-</collection>
-<collection name="locationsystemui" long-name="Location System UI" level="if">
-<component name="locationsysui" filter="s60" long-name="Location System UI">
-<unit bldFile="mw/locationsrv/locationsystemui/locationsysui/group"/>
-</component>
-</collection>
-<collection name="supl" long-name="SUPL" level="fw">
-<component name="locationsuplfw" filter="s60" long-name="Location SUPL Framework">
-<unit bldFile="mw/locationsrv/supl/locationsuplfw/group"/>
-</component>
-<component name="locationomasuplprotocolhandler" filter="s60" long-name="OMA SUPL Protocol Handler">
-<unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/group"/>
-</component>
-<component name="supltiapiimplementation" filter="s60" long-name="SUPL TI API Implementation" introduced="^3">
-<unit bldFile="mw/locationsrv/supl/supltiapiimplementation/group"/>
-</component>
-</collection>
-<collection name="locationtriggering" long-name="Location Triggering" level="server">
-<component name="ltlogger" filter="s60" long-name="LT Logger">
-<unit bldFile="mw/locationsrv/locationtriggering/ltlogger/group"/>
-</component>
-<component name="ltclientlib" filter="s60" long-name="LT Client Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltclientlib/group"/>
-</component>
-<component name="ltmanagementlib" filter="s60" long-name="LT Management Library">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmanagementlib/group"/>
-</component>
-<component name="ltcontainer" filter="s60" long-name="LT Container">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontainer/group"/>
-</component>
-<component name="ltserver" filter="s60" long-name="LT Server">
-<unit bldFile="mw/locationsrv/locationtriggering/ltserver/group"/>
-</component>
-<component name="ltstrategypluginapi" filter="s60" long-name="LT Strategy Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategypluginapi/group"/>
-</component>
-<component name="ltstrategyengine" filter="s60" long-name="LT Strategy Engine">
-<unit bldFile="mw/locationsrv/locationtriggering/ltstrategyengine/group"/>
-</component>
-<component name="ltmovementdetectionpluginapi" filter="s60" long-name="Movement Detection Plugin API">
-<unit bldFile="mw/locationsrv/locationtriggering/ltmovementdetectionpluginapi/group"/>
-</component>
-<component name="ltcellidmovementdetector" filter="s60" long-name="Cell ID Movement Detector">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/>
-</component>
-<component name="lbtmgmtui" filter="s60" long-name="LBT Management UI" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/lbtmgmtui/group"/>
-</component>
-<component name="ltcontextsourceplugin" filter="s60" long-name="LT Context Source Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/ltcontextsourceplugin/group"/>
-</component>
-<component name="locationtriggering_build" filter="s60" long-name="Location Triggering Build">
-<!-- should remove #include from this and maybe put exports in the above components -->
-<unit bldFile="mw/locationsrv/locationtriggering/group"/>
-</component>
-</collection>
-</block>
-<block name="accesssec" level="generic" long-name="Access Security" levels="plugin framework server generic specific">
-<collection name="accesssec_plat" long-name="Access Security Platform Interfaces" level="specific">
-<component name="wapi_security_settings_ui_api" long-name="WAPI Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_security_settings_ui_api/group"/>
-</component>
-<component name="wep_security_settings_ui_api" long-name="WEP Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wep_security_settings_ui_api/group"/>
-</component>
-<component name="wi-fi_protected_setup_ui_api" long-name="Wi-Fi Protected Setup UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
-</component>
-<component name="wlan_eap_settings_ui_api" long-name="WLAN EAP Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wlan_eap_settings_ui_api/group"/>
-</component>
-<component name="wpa_security_settings_ui_api" long-name="WPA Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wpa_security_settings_ui_api/group"/>
-</component>
-<component name="eap_vpn_api" long-name="EAP VPN API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
-</component>
-<component name="eapsim_db_api" long-name="EAP-SIM DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapsim_db_api/group"/>
-</component>
-<component name="eap_type_api" long-name="EAP Type API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eap_type_api/group"/>
-</component>
-<component name="eaptlspeap_db_api" long-name="EAP-TLS-PEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eaptlspeap_db_api/group"/>
-</component>
-<component name="eapleap_db_api" long-name="LEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapleap_db_api/group"/>
-</component>
-<component name="eapgtc_db_api" long-name="EAP-GTC DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapgtc_db_api/group"/>
-</component>
-<component name="eapmschapv2_db_api" long-name="EAP-MSCHAPV2 DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapmschapv2_db_api/group"/>
-</component>
-<component name="eapaka_db_api" long-name="EAP-AKA DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapaka_db_api/group"/>
-</component>
-<component name="wapi_db_api" long-name="WAPI DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_db_api/group"/>
-</component>
-</collection>
-<collection name="wlansecuritysettings" long-name="WLAN Security Settings" level="specific">
-<component name="wapisecuritysettingsui" filter="s60" long-name="WAPI Security Settings UI" introduced="9.1">
-<!-- the directory for this needs to be moved up to the right level -->
-<unit bldFile="mw/accesssec/wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
-</component>
-<component name="wepsecuritysettingsui" filter="s60" long-name="WEP Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wepsecuritysettingsui/group"/>
-</component>
-<component name="wifiprotectedsetup" filter="s60" long-name="WIFI Protected Setup" introduced="^1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wifiprotectedsetup/group"/>
-</component>
-<component name="wlaneapsettingsui" filter="s60" long-name="WLAN EAP Settings UI" introduced="9.3">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wlaneapsettingsui/group"/>
-</component>
-<component name="wpasecuritysettingsui" filter="s60" long-name="WPA Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wpasecuritysettingsui/group"/>
-</component>
-</collection>
-<collection name="eapol" long-name="EAPOL" level="framework">
-<component name="eapol_framework" filter="s60" long-name="EAPOL Framework" introduced="9.2">
-<unit bldFile="mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
-</component>
-</collection>
-</block>
-<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>
-<component name="bearer_settings_plugin_api" long-name="Bearer Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/bearer_settings_plugin_api/group"/>
-</component>
-<component name="commsdat_wlan_api" long-name="CommsDat WLAN API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/commsdat_wlan_api/group"/>
-</component>
-<component name="connection_monitor_extension_api" long-name="Connection Monitor Extension API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_monitor_extension_api/group"/>
-</component>
-<component name="connection_ui_utilities_api" long-name="Connection UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_ui_utilities_api/group"/>
-</component>
-<component name="disconnect_dialog_api" long-name="Disconnect Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_api/group"/>
-</component>
-<component name="disconnect_dialog_disable_api" long-name="Disconnect Dialog Disable API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_disable_api/group"/>
-</component>
-<component name="extended_connection_settings_api" long-name="Extended Connection Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/extended_connection_settings_api/group"/>
-</component>
-<component name="mpm_default_connection_api" long-name="MPM Default Connection API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_default_connection_api/group"/>
-</component>
-<component name="pdpcontextmanager2_reset_factory_settings_api" long-name="PDP Context Manager 2 Reset Factory Settings API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_settings_api/group"/>
-</component>
-<component name="mpm_connect_screen_api" long-name="MPM Connect Screen API" filter="s60" class="api">
-<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="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>
-<component name="access_point_engine_api" long-name="Access Point Engine API" filter="s60" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="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" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_monitor_server_api/group"/>
-</component>
-<component name="connection_settings_ui_api" long-name="Connection Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_ui_api/group"/>
-</component>
-<component name="agent_dialog_api" long-name="Agent Dialog API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/agent_dialog_api/group"/>
-</component>
-<component name="extendedconnpref_api" long-name="Extended Connection Preferences API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_pub/extendedconnpref_api/group"/>
-</component>
-</collection>
-<collection name="accesspointcontrol" long-name="Access Point Control" level="plugin">
-<component name="apcontrollistplugin" filter="s60" long-name="Access Point Control List Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
-</component>
-</collection>
-<collection name="alwayson_net_plugin" long-name="Always Online Net Plugin" level="server">
-<component name="pdpcontextmanager2" filter="s60" long-name="PDP Context Manager 2">
-<unit bldFile="mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
-</component>
-</collection>
-<collection name="apengine" long-name="Access Point Engine" level="framework">
-<component name="apeng" filter="s60" long-name="Access Point Engine">
-<unit bldFile="mw/ipconnmgmt/apengine/apeng/group"/>
-</component>
-<component name="apsettingshandlerui" filter="s60" long-name="Access Point Settings Handler UI">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingshandlerui/group"/>
-</component>
-<component name="apsettingsplugin" filter="s60" long-name="Access Point Settings Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="bearermanagement" long-name="Bearer Management" level="framework">
-<component name="mpm" filter="s60" long-name="Mobility Policy Manager">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/mpm/group"/>
-</component>
-<component name="extendedconnpref" filter="s60" long-name="Extended Connection Preferences">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/extendedconnpref/group"/>
-</component>
-<component name="s60mcpr" filter="s60" long-name="S60 Meta-Connection Provider" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/bearermanagement/S60MCPR/group"/>
-</component>
-</collection>
-<collection name="cmmanager" long-name="Connection Method Manager" level="framework">
-<component name="cmmgr" filter="s60" long-name="CM Manager">
-<unit bldFile="mw/ipconnmgmt/cmmanager/cmmgr/group"/>
-</component>
-<component name="gsconnsettingsplugin" filter="s60" long-name="GS Connection Settings Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/cmmanager/gsconnsettingsplugin/group"/>
-</component>
-</collection>
-<collection name="connectionmonitoring" long-name="Connection Monitoring" level="server">
-<component name="connectionmonitorplugin" filter="s60" long-name="Connection Monitor Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorplugin/group"/>
-</component>
-<component name="connectionmonitorui" filter="s60" long-name="Connection Monitor UI">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorui/group"/>
-</component>
-<component name="connmon" filter="s60" long-name="Connection Monitor">
-<!-- either split into two components, or #include from a common bld.inf -->
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/connectionmonitor/group"/>
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/dataconnectionlogger/group"/>
-</component>
-<component name="connmonext" filter="s60" long-name="Connection Monitor Extension API">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmonext/group"/>
-</component>
-</collection>
-<collection name="connectionutilities" long-name="Connection Utilities" level="utils">
-<component name="connectiondialogs" filter="s60" long-name="Connection Dialogs">
-<unit bldFile="mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/>
-</component>
-</collection>
-<collection name="dbcreator" long-name="DB Creator" level="utils">
-<component name="commsdatcreator" filter="s60" long-name="Comms Database Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
-</component>
-<component name="commsdatcreatorrfsplugin" filter="s60" long-name="Comms Database Creator RFS Plugin" introduced="9.3" plugin="Y">
-<!-- uncomment when config is turned on -->
-<!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
-</component>
-<component name="commsdatstartup" filter="s60" long-name="Comms Database Startup" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
-</component>
-<component name="dbcreatorexe" filter="s60" long-name="DB Creator" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
-</component>
-<component name="dbcreator_build" filter="s60" long-name="DB Creator Build" introduced="9.3">
-<!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
-<unit bldFile="mw/ipconnmgmt/dbcreator/group"/>
-</component>
-</collection>
-<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"/>
-</component>
-<component name="ipcm_qt_build" long-name="IP Connectivity Management Qt Build" introduced="^4">
-<unit bldFile="mw/ipconnmgmt" proFile="ipconnmgmt.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</block>
-<block name="netprotocols" level="generic" long-name="High-level Internet Protocols" levels="plugin framework server generic specific">
-<collection name="netprotocols_plat" long-name="High-level Internet Protocols Platform Interfaces" level="specific">
-<component name="cookie_manager_api" long-name="Cookie Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/cookie_manager_api/group"/>
-</component>
-<component name="http_cache_mgr_api" long-name="HTTP Cache Manager API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_cache_mgr_api/group"/>
-</component>
-<component name="http_filters_api" long-name="HTTP Filters API" filter="s60" class="api">
-<unit bldFile="mw/netprotocols/netprotocols_plat/http_filters_api/group"/>
-</component>
-</collection>
-<collection name="httpfilters" long-name="HTTP Filters" level="plugin">
-<component name="httpfiltercommon" filter="s60" long-name="HTTP Filter Common">
-<unit bldFile="mw/netprotocols/httpfilters/httpfiltercommon/group"/>
-</component>
-<component name="cookie" filter="s60" long-name="Cookie Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/cookie/group"/>
-</component>
-<component name="deflatefilter" filter="s60" long-name="Deflate Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/deflatefilter/group"/>
-</component>
-<component name="httpfilteracceptheader" filter="s60" long-name="Accept Header Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteracceptheader/group"/>
-</component>
-<component name="httpfilterauthentication" filter="s60" long-name="Authentication Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterauthentication/group"/>
-</component>
-<component name="httpfilterconnhandler" filter="s60" long-name="Connection Handler Fitler" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterconnhandler/group"/>
-</component>
-<component name="httpfilteriop" filter="s60" long-name="HTTP IOP Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilteriop/group"/>
-</component>
-<component name="httpfilterproxy" filter="s60" long-name="HTTP Proxy Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/httpfilterproxy/group"/>
-</component>
-<component name="uaproffilter" filter="s60" long-name="UAProf Filter" plugin="Y">
-<unit bldFile="mw/netprotocols/httpfilters/uaproffilter/group"/>
-</component>
-</collection>
-<collection name="applayerprotocols" long-name="Application Layer Protocols" level="server">
-<component name="httptransportfw" long-name="HTTP Transport Framework" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
-</component>
-<component name="httpexamples" long-name="HTTP Examples" introduced="6.2" purpose="development">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpexamples/group" mrp="mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
-</component>
-<component name="wappushsupport" long-name="WAP Push Support" introduced="6.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
-</component>
-<component name="wapbase" long-name="WAP Base" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wapbase/Group" mrp="mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
-</component>
-<component name="ftpengine" long-name="FTP Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/ftpengine/group" mrp="mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
-</component>
-<component name="telnetengine" long-name="Telnet Engine" introduced="6.0" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/telnetengine/group" mrp="mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
-</component>
-<component name="httpserviceapi" long-name="HTTP Service API" introduced="TB9.2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpservice/group" mrp="mw/netprotocols/applayerprotocols/httpservice/group/http_service.mrp"/>
-</component>
-</collection>
-<collection name="applayerpluginsandutils" long-name="Application Layer Plugins and Utils" level="framework">
-<component name="uripermissionservices" long-name="URI Permission Services" introduced="^2" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
-</component>
-<component name="bookmarksupport" long-name="Bookmark Support" introduced="9.1" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
-</component>
-<component name="httpprotocolplugins" long-name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
-</component>
-<component name="httptransportplugins" long-name="HTTP Transport Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
-</component>
-</collection>
-<collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
-<component name="netprotocols_metadata" long-name="High-level Internet Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="ipappprotocols" level="generic" long-name="IP App Protocols" levels="plugin conn server if">
-<collection name="ipappprotocols_plat" long-name="IP App Protocols Platform Interfaces" level="if">
-<component name="srtp_api" long-name="SRTP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/srtp_api/group"/>
-</component>
-<component name="rtprtcp_api" long-name="RTP/RTCP API" filter="s60" class="api">
-<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/rtprtcp_api/group"/>
-</component>
-</collection>
-<collection name="rtp" long-name="RTP" level="server">
-<component name="srtpstack" filter="s60" long-name="SRTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/srtpstack/group"/>
-</component>
-<component name="rtpstack" filter="s60" long-name="RTP Stack">
-<unit bldFile="mw/ipappprotocols/rtp/rtpstack/group"/>
-</component>
-</collection>
-<collection name="realtimenetprots" long-name="Real Time Net Protocols" level="server">
-<component name="symrtp" long-name="RTP" introduced="9.0" purpose="optional">
-<!-- Real Time Data Protocol -->
-<unit bldFile="mw/ipappprotocols/realtimenetprots/rtp/group" mrp="mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
-</component>
-<component name="sipfw" long-name="SIP Framework" introduced="9.2" purpose="optional">
-<unit bldFile="mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp" version="2"/>
-</component>
-</collection>
-<collection name="sipplugins" long-name="SIP Plugins" level="plugin">
-<component name="sippwlanplugin" filter="s60" long-name="SIP WLAN Plugin" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
-</component>
-<component name="sippsipsettingsui" filter="s60" long-name="SIP Settings UI" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
-</component>
-<component name="sippdevmgmtsipadapter" filter="s60" long-name="Device Management SIP Settings Adapter" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
-</component>
-<component name="sippsystemstatemonitor" filter="s60" long-name="SIP System State Monitor" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsystemstatemonitor/group"/>
-</component>
-<component name="sippsipadapter" filter="s60" long-name="SIP Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipadapter/group"/>
-</component>
-</collection>
-<collection name="sipproviderplugins" long-name="SIP Provider Plugins" level="conn">
-<component name="sipprovider" long-name="SIP Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipproviderplugins/sipprovider/group" mrp="mw/ipappprotocols/sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
-</component>
-</collection>
-<collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="if">
-<component name="ipappprotocols_metadata" long-name="IP App Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="wirelessacc" level="specific" long-name="Wireless Access" levels="framework generic ui">
-<collection name="hsfw_plat" long-name="HotSpot Framework Platform Interfaces" level="ui">
-<component name="hotspot_framework_client_api" long-name="HotSpot Framework Client API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_api" long-name="Internet Connectivity Test Service API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
-</component>
-<component name="internet_connectivity_test_service_settings_api" long-name="Internet Connectivity Test Service Settings API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
-</component>
-<component name="hotspot_framework_client_plugin_api" long-name="HotSpot Framework Client Plugin API" filter="s60" class="api">
-<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
-</component>
-</collection>
-<collection name="hotspotfw" long-name="HotSpot Framework" level="framework">
-<component name="hsserver" filter="s60" long-name="HotSpot Server" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="hsclient" filter="s60" long-name="HotSpot Client" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="internetconnectivitytestservice" filter="s60" long-name="Internet Connectivity Test Service" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
-</component>
-<component name="ictsdialogs" filter="s60" long-name="Internet Connectivity Test Service Dialogs" deprecated="^3" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
-</component>
-<component name="hspluginforagent" filter="s60" long-name="HotSpot Plugin for Agent" plugin="Y" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
-</component>
-<component name="hsbrowser" filter="s60" long-name="HotSpot Browser" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
-</component>
-<component name="hotspotfw_build" filter="s60" long-name="Hotspot Framework Build">
-<!-- should break up this bld.inf into the above components, or collapse them all into a single component -->
-<unit bldFile="mw/wirelessacc/hotspotfw/group"/>
-</component>
-</collection>
-<collection name="wlanutilities" long-name="WLAN Utilities" level="generic">
-<component name="wlanutilities_build" long-name="WLAN Utilities Qt" introduced="^4" filter="s60">
-<!-- is this uinit needed, or is it sufficient to uncomment the units in the below components? -->
-<unit bldFile="mw/wirelessacc/wlanutilities" proFile="wlanutilities.pro" qmakeArgs="-r"/>
-</component>
-<component name="wlanqtutilities" filter="s60" long-name="WLAN Qt Utilities" introduced="^4" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlanplugin/group" qt:proFile="wlanqtutilities.pro"/>-->
-</component>
-<component name="wlansniffer" filter="s60" long-name="WLAN Sniffer" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlansettingsui/group" qt:proFile="wlansniffer.pro"/>-->
-</component>
-<component name="wlanentryplugin" filter="s60" long-name="WLAN Entry Plugin" plugin="Y" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlansniffer/group" qt:proFile="wlanentryplugin.pro"/>-->
-</component>
-<component name="wlanindicatorplugin" filter="s60" long-name="WLAN Indicator Plugin" plugin="Y" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlanindicatorplugin/group" qt:proFile="wlanindicatorplugin.pro"/>-->
-</component>
-<component name="cpwlansettingsplugin" filter="s60" long-name="WLAN Settings Control Panel Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="wlanutilities/cpwlansettingsplugin/group" qt:proFile="cpwlansettingsplugin.pro"/>-->
-</component>
-</collection>
-</block>
-<block name="vpnclient" level="specific" long-name="VPN Client" levels="engine ui api">
-<!-- is the !oem_build filter needed? -->
-<collection name="vpnc_plat" long-name="VPN Client Platform Interfaces" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API" class="api">
-<unit bldFile="mw/vpnclient/vpnc_plat/vpnapi/group"/>
-</component>
-</collection>
-<collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API">
-<unit bldFile="mw/vpnclient/vpnapiimpl/group"/>
-</component>
-</collection>
-<collection name="vpnengine" long-name="VPN Engine" level="engine">
-<!-- too many components in this collection.
- Probably best to group the binaries together into larger components
- or maybe split the collection into more reasonable groups -->
-<component name="eventmediatorapi" filter="s60" long-name="Event Mediator API">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediatorapi/group"/>
-</component>
-<component name="eventviewer" filter="s60" long-name="Event Viewer">
-<unit bldFile="mw/vpnclient/vpnengine/eventviewer/group"/>
-</component>
-<component name="vpnins" filter="s60" long-name="VPN Installer">
-<unit bldFile="mw/vpnclient/vpnengine/vpnins/group"/>
-</component>
-<component name="ikepolparser" filter="s60" long-name="IKE Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/ikepolparser/group"/>
-</component>
-<component name="utlbase64" filter="s60" long-name="Base64 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlbase64/group"/>
-</component>
-<component name="utlcrypto" filter="s60" long-name="Crypto Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlcrypto/group"/>
-</component>
-<component name="utlxml" filter="s60" long-name="XML Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlxml/group"/>
-</component>
-<component name="utlpkcs10" filter="s60" long-name="PKCS#10 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs10/group"/>
-</component>
-<component name="pkiserviceapi" filter="s60" long-name="PKI Service API">
-<unit bldFile="mw/vpnclient/vpnengine/pkiserviceapi/group"/>
-</component>
-<component name="ikecert" filter="s60" long-name="IKE Certificate Management">
-<unit bldFile="mw/vpnclient/vpnengine/ikecert/group"/>
-</component>
-<component name="kmdapi" filter="s60" long-name="Key Management Daemon API">
-<unit bldFile="mw/vpnclient/vpnengine/kmdapi/group"/>
-</component>
-<component name="kmdserver" filter="s60" long-name="Key Management Daemon Server">
-<unit bldFile="mw/vpnclient/vpnengine/kmdserver/group"/>
-</component>
-<component name="ikeutils" filter="s60" long-name="Internet Key Exchange Utils">
-<unit bldFile="mw/vpnclient/vpnengine/ikeutils/group"/>
-</component>
-<component name="ikev1lib" filter="s60" long-name="IKEv1 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev1lib/group"/>
-</component>
-<component name="ikev2lib" filter="s60" long-name="IKEv2 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev2lib/group"/>
-</component>
-<component name="vpnipsecpolparser" filter="s60" long-name="VPN IPsec Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/vpnipsecpolparser/group"/>
-</component>
-<component name="sit" filter="s60" long-name="Socket Interaction Thread">
-<unit bldFile="mw/vpnclient/vpnengine/sit/group"/>
-</component>
-<component name="vpntcwrapper" filter="s60" long-name="VPN Terminal Control Wrapper">
-<unit bldFile="mw/vpnclient/vpnengine/vpntcwrapper/group"/>
-</component>
-<component name="eventmediator" filter="s60" long-name="Event Mediator">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediator/group"/>
-</component>
-<component name="pkiservice" filter="s60" long-name="PKI Service">
-<unit bldFile="mw/vpnclient/vpnengine/pkiservice/group"/>
-</component>
-<component name="vpnconnagt" filter="s60" long-name="VPN Connection Agent">
-<unit bldFile="mw/vpnclient/vpnengine/vpnconnagt/group"/>
-</component>
-<component name="vpnmanager" filter="s60" long-name="VPN Manager">
-<unit bldFile="mw/vpnclient/vpnengine/vpnmanager/group"/>
-</component>
-<component name="vpncleaner" filter="s60" long-name="VPN Cleaner">
-<unit bldFile="mw/vpnclient/vpnengine/vpncleaner/group"/>
-</component>
-<component name="utlpkcs12" filter="s60" long-name="PKCS#12 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs12/group"/>
-</component>
-<component name="dmadengine" filter="s60" long-name="DM Adapter Engine">
-<unit bldFile="mw/vpnclient/vpnengine/dmadengine/group"/>
-</component>
-<component name="dmadipsecvpn" filter="s60" long-name="IPsec VPN DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadipsecvpn/group"/>
-</component>
-<component name="dmadpki" filter="s60" long-name="PKI DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadpki/group"/>
-</component>
-<component name="ikesocket" filter="s60" long-name="IKE Socket" introduced="^3">
-<unit bldFile="mw/vpnclient/vpnengine/ikesocket/group"/>
-</component>
-</collection>
-<collection name="vpnui" long-name="VPN UI" level="ui">
-<component name="vpnecomnotifier" filter="s60" long-name="VPN ECOM Notifier" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnecomnotifier/group"/>
-</component>
-<component name="vpndialogmanager" filter="s60" long-name="VPN Dialog Manager">
-<unit bldFile="mw/vpnclient/vpnui/vpndialogmanager/group"/>
-</component>
-<component name="vpnpolins" filter="s60" long-name="VPN Policy Installer">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolins/group"/>
-</component>
-<component name="vpnpolicyrecognizer" filter="s60" long-name="VPN Policy Recognizer" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolicyrecognizer/group"/>
-</component>
-</collection>
-<collection name="vpnclient_info" long-name="VPN Client Info" level="api">
-<component name="vpnclient_help" filter="s60" long-name="VPN Client Help">
-<unit bldFile="mw/vpnclient/help/group"/>
-</component>
-<component name="vpnclient_build" filter="s60" long-name="VPN Client Build">
-<!-- should split this up into the other components and remove this-->
-<unit bldFile="mw/vpnclient/group"/>
-</component>
-</collection>
-</block>
-<block name="ipappsrv" level="specific" long-name="IP App Services" levels="framework generic server conn plugin">
-<collection name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" level="plugin">
-<component name="transcoder_api" long-name="Transcoder API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
-</component>
-<component name="comms_event_api" long-name="Comms Event API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/comms_event_api/group"/>
-</component>
-<component name="floor_control_api" long-name="Floor Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/floor_control_api/group"/>
-</component>
-<component name="media_control_api" long-name="Media Control API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/media_control_api/group"/>
-</component>
-<component name="multimedia_comms_api" long-name="Multimedia Comms API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/multimedia_comms_api/group"/>
-</component>
-<component name="nat_settings_api" long-name="NAT Settings API" filter="s60" class="api">
-<unit bldFile="mw/ipappsrv/ipappsrv_plat/nat_settings_api/group"/>
-</component>
-</collection>
-<collection name="natfw" long-name="NAT Framework" level="framework">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="natfw_build" filter="s60" long-name="NAT Framework Build" introduced="^2">
-<unit bldFile="mw/ipappsrv/natfw/group"/>
-</component>
-</collection>
-<collection name="multimediacommscontroller" long-name="Multimedia Comms Controller" level="conn">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommscontroller_build" filter="s60" long-name="Multimedia Comms Controller Build">
-<unit bldFile="mw/ipappsrv/multimediacommscontroller/group"/>
-</component>
-</collection>
-<collection name="multimediacommsengine" long-name="Multimedia Comms Engine" level="generic">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommsengine_build" filter="s60" long-name="Multimedia Comms Engine Build">
-<unit bldFile="mw/ipappsrv/multimediacommsengine/group"/>
-</component>
-</collection>
-<collection name="natplugins" long-name="NAT Plugins" level="plugin">
-<component name="natpcliprovisioningnatfwadapter" filter="s60" long-name="Client Provisioning NAT Framework Traversal Adapter" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/group"/>
-</component>
-<component name="natpdevmgmtnatfwadapter" filter="s60" long-name="Device Management NAT Framework Traversal Adapter" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/group"/>
-</component>
-<component name="natptraversalcontroller" filter="s60" long-name="NAT Traversal Controller" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natptraversalcontroller/group"/>
-</component>
-<component name="natpnatfwsdpprovider" filter="s60" long-name="NAT Framework SDP Provider" plugin="Y">
-<unit bldFile="mw/ipappsrv/natplugins/natpnatfwsdpprovider/group"/>
-</component>
-</collection>
-<collection name="ipappsrv_info" long-name="IP App Services Info" level="plugin">
-<component name="ipappsrv_build" long-name="IP App Services Build" filter="s60">
-<!-- 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">
-<collection name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" level="specific">
-<component name="string_parser_api" long-name="String Parser API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/string_parser_api/group"/>
-</component>
-<component name="cbs_mcn_client_api" long-name="CBS MCN Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cbs_mcn_client_api/group"/>
-</component>
-<component name="converged_call_engine_api" long-name="Converged Call Engine API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_engine_api/group"/>
-</component>
-<component name="aiw_dial_data_consumer_api" long-name="AIW Dial Data Consumer API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/aiw_dial_data_consumer_api/group"/>
-</component>
-<component name="phone_client_ussd_api" long-name="Phone Client USSD API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_api/group"/>
-</component>
-<component name="sat_refresh_api" long-name="SAT Refresh API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_refresh_api/group" filter="!test"/>
-</component>
-<component name="network_handling_engine_api" long-name="Network Handling Engine API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/network_handling_engine_api/group"/>
-</component>
-<component name="phone_client_emergency_call_api" long-name="Phone Client Emergency Call API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/group"/>
-</component>
-<component name="sat_configuration_api" long-name="SAT Configuration API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_configuration_api/group"/>
-</component>
-<component name="dial_utils_api" long-name="Dial Utils API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/dial_utils_api/group"/>
-</component>
-<component name="phone_client_image_handler_api" long-name="Phone Client Image Handler API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_image_handler_api/group"/>
-</component>
-<component name="phone_client_messenger_api" long-name="Phone Client Messenger API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_messenger_api/group"/>
-</component>
-<component name="sat_client_api" long-name="SAT Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_client_api/group" filter="!test"/>
-</component>
-<component name="phone_client_api" long-name="Phone Client API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_api/group"/>
-</component>
-<component name="sat_service_api" long-name="SAT Service API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/sat_service_api/group" filter="!test"/>
-</component>
-<component name="cbs_message_api" long-name="CBS Message API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cbs_message_api/group"/>
-</component>
-<component name="phone_client_server_information_api" long-name="Phone Client Server Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_server_information_api/group"/>
-</component>
-<component name="phone_client_ussd_internal_api" long-name="Phone Client USSD Internal API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_internal_api/group"/>
-</component>
-<component name="phone_client_command_handler_api" long-name="Phone Client Command Handler API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_command_handler_api/group"/>
-</component>
-<component name="phone_client_notify_api" long-name="Phone Client Notify API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_notify_api/group"/>
-</component>
-<component name="phone_client_utility_api" long-name="Phone Client Utility API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_utility_api/group"/>
-</component>
-<component name="telephony_network_information_api" long-name="Telephony Network Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_network_information_api/group"/>
-</component>
-<component name="secondary_display_sat_api" long-name="Secondary Display SAT API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/secondary_display_sat_api/group"/>
-</component>
-<component name="callui_reconnect_query_api" long-name="CallUI Reconnect Query API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/callui_reconnect_query_api/group"/>
-</component>
-<component name="service_provider_settings_api" long-name="Service Provider Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/service_provider_settings_api/group"/>
-</component>
-<component name="converged_call_provider_api" long-name="Converged Call Provider API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_provider_api/group"/>
-</component>
-<component name="incoming_call_monitor_api" long-name="Incoming Call Monitor API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/incoming_call_monitor_api/group"/>
-</component>
-<component name="default_emergency_numbers_api" long-name="Default Emergency Numbers API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/default_emergency_numbers_api/group"/>
-</component>
-<component name="cenrep_database_api" long-name="Central Repository Database API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/cenrep_database_api/group"/>
-</component>
-<component name="ss_settings_api" long-name="SS Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/ss_settings_api/group"/>
-</component>
-<component name="phone_settings_observer_api" long-name="Phone Settings Observer API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_observer_api/group"/>
-</component>
-<component name="phone_settings_notes_ui_api" long-name="Phone Settings Notes UI API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_notes_ui_api/group"/>
-</component>
-<component name="phone_settings_api" long-name="Phone Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_api/group"/>
-</component>
-<component name="voice_mailbox_number_api" long-name="Voice Mailbox Number API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_number_api/group"/>
-</component>
-<component name="voice_mailbox_settings_api" long-name="Voice Mailbox Settings API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_settings_api/group"/>
-</component>
-<component name="call_information_api" long-name="Call Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/call_information_api/group" filter="!test"/>
-</component>
-<component name="call_remote_party_information_api" long-name="Call Remote Party Information API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/call_remote_party_information_api/group" filter="!test"/>
-</component>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_mediator_api/group" filter="!test"/>
-</component>
-<component name="dialpad_api" long-name="Dialpad API" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/dialpad_api/group"/>
-</component>
-</collection>
-<collection name="cellular" long-name="Cellular" level="server">
-<component name="telephonysettings" filter="s60" long-name="Telephony Settings" purpose="development"/>
-<component name="sssettings" filter="s60" long-name="Supplementary Service Settings" purpose="development"/>
-<component name="psetnotesui" filter="s60" long-name="Phone Settings Notes UI" purpose="development"/>
-</collection>
-<collection name="convergedcallengine" long-name="Converged Call Engine" level="framework">
-<component name="cce" filter="s60" long-name="CCE" purpose="development"/>
-<component name="spsettings" filter="s60" long-name="Service Provider Settings" purpose="development"/>
-</collection>
-<collection name="phoneclientserver" long-name="Phone Client/Server" level="server">
-<component name="aiwdialdata" filter="s60" long-name="AIW Dial Data" purpose="development"/>
-<component name="dialutils" filter="s60" long-name="Dial Utils" purpose="development"/>
-<component name="phoneclient" filter="s60" long-name="Phone Client" purpose="development"/>
-</collection>
-<collection name="phonesrv_info" long-name="Phone Server Info" level="generic">
-<component name="phonesrv_build" long-name="Phone Server Build" filter="s60">
-<unit bldFile="mw/phonesrv" proFile="phonesrv.pro"/>
-</component>
-</collection>
-</block>
-<block name="messagingmw" level="specific" long-name="Messaging Middleware" levels="stack support fw api">
-<collection name="msgfw_plat" long-name="Messaging Middleware Platform Interfaces" level="api">
-<component name="always_online_plugin_api" long-name="Always Online Plugin API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_plugin_api/group"/>
-</component>
-<component name="always_online_client_api" long-name="Always Online Client API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/always_online_client_api/group"/>
-</component>
-<component name="msg_common_utils_api" long-name="Messaging Common Utils API" filter="s60" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/msg_common_utils_api/group"/>
-</component>
-<component name="muiu_utils_api" long-name="Messaging Center UI Utilities API" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/messagingmw/msgfw_plat/muiu_utils_api/group"/>
-</component>
-</collection>
-<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" class="config">
-<unit bldFile="mw/messagingmw/msgbranched/group"/>
-</component>
-</collection>
-<collection name="messagingfw" long-name="Messaging Framework" level="fw">
-<!-- should break this collection up into smaller related collections -->
-<component name="send_ui_api" long-name="Send UI API" filter="s60" deprecated="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/send_ui_api/group"/>
-</component>
-<component name="send_ui_plugin_api" long-name="Send UI Plug-in API" filter="s60" deprecated="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/send_ui_plugin_api/group"/>
-</component>
-<component name="send_ui_datautils_api" long-name="Send UI Data Utils API" filter="s60" deprecated="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/send_ui_datautils_api/group"/>
-</component>
-<component name="alwaysonline" filter="s60" long-name="Always Online Server" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/alwaysonline/group"/>
-</component>
-<component name="msgcommonutils" filter="s60" long-name="Messaging Common Utils" introduced="^2">
-<unit bldFile="mw/messagingmw/messagingfw/msgcommonutils/group"/>
-</component>
-<component name="senduiservices" filter="s60" long-name="Send UI Services" introduced="^2" deprecated="^4">
-<unit bldFile="mw/messagingmw/messagingfw/deprecate/senduiservices/group"/>
-</component>
-<component name="muiuutils" long-name="Messaging Center UI Utilities" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/messagingmw/messagingfw/muiuutils/group"/>
-</component>
-<component name="scheduledsendmtm" long-name="Scheduled Send MTM" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/group" mrp="mw/messagingmw/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
-</component>
-<component name="msgsrvnstore" long-name="Message Server and Store" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/group" mrp="mw/messagingmw/messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
-</component>
-<component name="biomsgfw" long-name="BIO Messaging Framework" introduced="6.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/group" mrp="mw/messagingmw/messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
-</component>
-<component name="msgconf" long-name="Messaging Config" introduced="^2" purpose="optional" class="config">
-<unit bldFile="mw/messagingmw/messagingfw/msgconf/group" mrp="mw/messagingmw/messagingfw/msgconf/group/messaging_config.mrp"/>
-</component>
-<component name="watcherfw" long-name="Watcher Framework" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/watcherfw/group" mrp="mw/messagingmw/messagingfw/watcherfw/group/messaging_watcher.mrp"/>
-</component>
-<component name="msgtest" long-name="Messaging Test" purpose="development">
-<unit bldFile="mw/messagingmw/messagingfw/msgtest/group" mrp="mw/messagingmw/messagingfw/msgtest/group/messaging_test.mrp"/>
-</component>
-<component name="sendas" long-name="Send As" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/sendas/group" mrp="mw/messagingmw/messagingfw/sendas/group/messaging_sendas2.mrp"/>
-</component>
-<component name="msgurlhandler" long-name="Message URL Handler" introduced="7.0" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/group" mrp="mw/messagingmw/messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
-</component>
-<component name="wappushfw" long-name="WAP Push Framework" introduced="6.1" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/wappushfw/group" mrp="mw/messagingmw/messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
-</component>
-<component name="suplsmshandler" long-name="SUPL SMS Handler" introduced="^2" purpose="development" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplsmshandler/group" mrp="mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/>
-</component>
-<component name="suplwappushhandler" long-name="SUPL WAP Push Handler" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
-</component>
-</collection>
-<collection name="messagingmw_info" long-name="Messaging Middleware Info" level="api">
-<component name="messagingmw_metadata" long-name="Messaging Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="imsrv" level="specific" long-name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
-<collection name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" level="specific">
-<component name="ximp_core_data_model_api" long-name="XIMP Core Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_host_api" long-name="XIMP Presence Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_presence_data_model_api" long-name="XIMP Presence Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_data_model_api/group"/>
-</component>
-<component name="ximp_presence_protocol_plugin_api" long-name="XIMP Presence Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_presence_management_api" long-name="XIMP Presence Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_management_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_host_api" long-name="XIMP Core Protocol Plug-in Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_core_management_api" long-name="XIMP Core Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_management_api/group"/>
-</component>
-<component name="ximp_presence_base_api" long-name="XIMP Presence Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_base_api/group"/>
-</component>
-<component name="ximp_core_protocol_plugin_api" long-name="XIMP Core Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_core_base_api" long-name="XIMP Core Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_base_api/group"/>
-</component>
-<component name="ximp_presence_cache_api" long-name="XIMP Presence Cache API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_cache_api/group"/>
-</component>
-<component name="ximp_core_feature_plugin_api" long-name="XIMP Core Feature Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_host_api" long-name="XIMP IM Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_im_data_model_api" long-name="XIMP IM Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_data_model_api/group"/>
-</component>
-<component name="ximp_im_protocol_plugin_api" long-name="XIMP IM Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_im_management_api" long-name="XIMP IM Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_management_api/group"/>
-</component>
-<component name="ximp_im_base_api" long-name="XIMP IM Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_base_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_host_api" long-name="XIMP Search Protocol Plugin Host API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_host_api/group"/>
-</component>
-<component name="ximp_search_data_model_api" long-name="XIMP Search Data Model API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_data_model_api/group"/>
-</component>
-<component name="ximp_search_protocol_plugin_api" long-name="XIMP search Protocol Plugin API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_api/group"/>
-</component>
-<component name="ximp_search_management_api" long-name="XIMP Search Management API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_management_api/group"/>
-</component>
-<component name="ximp_search_base_api" long-name="XIMP Search Base API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_base_api/group"/>
-</component>
-<component name="xmpp_settings_api" long-name="XMPP Settings API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/group"/>
-</component>
-<component name="im_cache_client_api" long-name="IM Cache Client API" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/im_cache_client_api/group"/>
-</component>
-<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 Avability Text" filter="s60" class="api">
-<unit bldFile="mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
-</component>
-</collection>
-<collection name="ximpfw" long-name="XIMP Framework" level="framework">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="ximpfw_build" filter="s60" long-name="XIMP Framework Build">
-<unit bldFile="mw/imsrv/ximpfw/group"/>
-</component>
-</collection>
-<collection name="imservices" long-name="IM Services" level="generic">
-<component name="imfeatureplugin" filter="s60" long-name="IM Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/imfeatureplugin/group"/>
-</component>
-<component name="searchfeatureplugin" filter="s60" long-name="Search Feature Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/searchfeatureplugin/group"/>
-</component>
-<component name="xmppsettingsapi" filter="s60" long-name="XMPP Settings API" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsapi/group"/>
-</component>
-<component name="xmppsettingsfetcher" filter="s60" long-name="XMPP Settings Fetcher" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/group"/>
-</component>
-<component name="instantmessagingcache" filter="s60" long-name="Instant Messaging Cache" introduced="^2">
-<unit bldFile="mw/imsrv/imservices/instantmessagingcache/group"/>
-</component>
-</collection>
-<collection name="brandingserver" long-name="Branding Server" level="specific">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="brandingserver_build" filter="s60" long-name="Branding Server Build">
-<unit bldFile="mw/imsrv/brandingserver/group"/>
-</component>
-</collection>
-</block>
-<block name="legacypresence" level="specific" long-name="Legacy Presence Services" levels="engine fw ui">
-<collection name="pressrv_plat" long-name="Legacy Presence Services Platform Interfaces" level="ui">
-<component name="presence_list_api" long-name="Presence List API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/presence_list_api/group"/>
-</component>
-<component name="watcher_info_api" long-name="Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_info_api/group"/>
-</component>
-<component name="simple_documents_api" long-name="SIMPLE Documents API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_documents_api/group"/>
-</component>
-<component name="authorization_api" long-name="Authorization API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/authorization_api/group"/>
-</component>
-<component name="xdm_protocol_plugin_api" long-name="XDM Protocol Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_protocol_plugin_api/group"/>
-</component>
-<component name="watcher_api" long-name="Watcher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/watcher_api/group"/>
-</component>
-<component name="xdm_api" long-name="XDM API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_api/group"/>
-</component>
-<component name="registration_api" long-name="Registration API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/registration_api/group"/>
-</component>
-<component name="publisher_api" long-name="Publisher API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/publisher_api/group"/>
-</component>
-<component name="messaging_connection_manager_api" long-name="Messaging Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/messaging_connection_manager_api/group"/>
-</component>
-<component name="xdm_settings_api" long-name="XDM Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/xdm_settings_api/group"/>
-</component>
-<component name="simple_settings_api" long-name="SIMPLE Settings API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_settings_api/group"/>
-</component>
-<component name="simple_instant_msg_api" long-name="Simple Instant Msg API" filter="s60" class="api">
-<unit bldFile="mw/legacypresence/pressrv_plat/simple_instant_msg_api/group"/>
-</component>
-</collection>
-<collection name="xdmengine" long-name="XDM Engine" level="engine">
-<!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
-<component name="xdmengine_build" filter="s60" long-name="XDM Engine Build">
-<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">
-<unit bldFile="mw/legacypresence/xdmprotocols/group"/>
-</component>
-</collection>
-<collection name="msgconnmanager" long-name="Messaging Connection Manager" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="msgconnmanager_build" filter="s60" long-name="Messaging Connection Manager Build">
-<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">
-<unit bldFile="mw/legacypresence/simpleengine/group"/>
-</component>
-</collection>
-<collection name="presencefwsimpleadpt" long-name="Presence Framework SIMPLE Adaptation" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="simpleplugin" filter="s60" long-name="SIMPLE Plugin" plugin="Y">
-<unit bldFile="mw/legacypresence/presencefwsimpleadpt/group"/>
-</component>
-</collection>
-<collection name="simpledatamodeladapter" long-name="SIMPLE Data Model Adapter" level="fw">
-<component name="presenceplugin" filter="s60" long-name="Presence Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/legacypresence/simpledatamodeladapter/group"/>
-</component>
-</collection>
-</block>
-<block name="opensrv" level="specific" long-name="Open Services" levels="prt lib server eng">
-<collection name="opensrv_plat" long-name="Open Services Platform Interfaces" level="eng">
-<component name="messagequeue_api" long-name="Message Queue API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/opensrv/opensrv_plat/messagequeue_api/group"/>
-</component>
-</collection>
-<collection name="loudmouth" long-name="Loudmouth" level="prt">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="loudmouth_build" filter="s60" long-name="Loudmouth Build" introduced="^2">
-<unit bldFile="mw/opensrv/loudmouth/group"/>
-</component>
-</collection>
-<collection name="libtelepathy" long-name="Telepathy Library" level="lib">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="libtelepathy_build" filter="s60" long-name="Telepathy Library Build" introduced="^2">
-<unit bldFile="mw/opensrv/libtelepathy/group"/>
-</component>
-</collection>
-<collection name="telepathygabble" long-name="Telepathy Gabble" level="eng">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="telepathygabble_build" filter="s60" long-name="Telepathy Gabble Build" introduced="^2">
-<unit bldFile="mw/opensrv/telepathygabble/group"/>
-</component>
-</collection>
-<collection name="isolationserver" long-name="Isolation Server" level="server">
-<component name="messagequeue" filter="s60" long-name="Message Queue" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/messagequeue/group"/>
-</component>
-<component name="isoserver" filter="s60" long-name="ISO Server" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/isoserver/group"/>
-</component>
-<component name="isolationserver_build" filter="s60" long-name="Isloation Server Build" introduced="^2">
-<!-- needs #includes removed. either move the exports to another component or make this a ROM component -->
-<unit bldFile="mw/opensrv/isolationserver/group"/>
-</component>
-</collection>
-</block>
-<block name="searchsrv" level="specific" long-name="Search Services" levels="services engine generic api">
-<collection name="searchsrv_plat" long-name="Search Services Platform Interfaces" level="api">
-<component name="cpix_utility_api" long-name="CPIX Utility API" filter="s60" class="api">
-<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_utility_api/group"/>
-</component>
-<component name="cpix_framework_api" long-name="CPIX Framework API" filter="s60" class="api">
-<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_framework_api/group"/>
-</component>
-<component name="cpix_search_api" long-name="CPIX Search API" filter="s60" class="api">
-<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_search_api/group"/>
-</component>
-</collection>
-<collection name="searchengine" long-name="Search Engine" level="engine">
-<component name="searchengine_util" long-name="Search Engine Utils" filter="s60">
-<unit bldFile="mw/searchsrv/searchengine/util/group"/>
-</component>
-<component name="searchengine_oss" long-name="Search Engine OSS" filter="s60">
-<unit bldFile="mw/searchsrv/searchengine/oss/group"/>
-</component>
-<component name="cpix" long-name="Cross Platform Indexing Engine" filter="s60">
-<unit bldFile="mw/searchsrv/searchengine/cpix/group"/>
-</component>
-</collection>
-<collection name="searcher" long-name="Searcher" level="generic">
-<component name="searchclient" long-name="Search Client" filter="s60">
-<unit bldFile="mw/searchsrv/searcher/SearchClient/group"/>
-</component>
-<component name="searchserver" long-name="Search Server" filter="s60">
-<unit bldFile="mw/searchsrv/searcher/SearchServer/group"/>
-</component>
-<component name="searcher_test" long-name="Searcher Tests" filter="s60" purpose="development">
-<!-- #include from common bld.inf or split into two components -->
-<unit bldFile="mw/searchsrv/searcher/tsrc/RobustnessTest/group"/>
-<unit bldFile="mw/searchsrv/searcher/tsrc/LogPlayer/group"/>
-</component>
-</collection>
-<collection name="searchsrv_harvester" long-name="Search Services Harvester" level="services">
-<component name="searchsrv_pluginfw" long-name="Search Server" filter="s60">
-<unit bldFile="mw/searchsrv/harvester/pluginfw/group"/>
-</component>
-<component name="searchsrv_harvesterserver" long-name="Search Harvester Server" filter="s60">
-<unit bldFile="mw/searchsrv/harvester/HarvesterServer/group"/>
-</component>
-</collection>
-<collection name="searchsrv_watchdog" long-name="Search Services Watch Dog" level="services">
-<component name="searchsrv_watchdog_build" long-name="Search Services Watch Dog Build" filter="s60">
-<unit bldFile="mw/searchsrv/WatchDog/group"/>
-</component>
-</collection>
-<collection name="qcpix" long-name="Qt CPIX" level="engine">
-<component name="qcpix_build" long-name="Qt CPIX Build">
-<unit bldFile="mw/searchsrv/qcpix" proFile="qcpix.pro"/>
-</component>
-</collection>
-<collection name="searchsrv_info" long-name="Search Services Info">
-<component name="searchsrv_build" long-name="Search Services Build">
-<!-- move exports to own component and remove this -->
-<unit bldFile="mw/searchsrv/group"/>
-</component>
-</collection>
-</block>
-<block name="remotemgmt" level="specific" long-name="Remote Management" levels="plugin framework server generic specific">
-<collection name="remotemgmt_pub" long-name="Remote Management Public Interfaces" level="specific">
-<component name="synchronization_capability_api" long-name="Synchronization Capability API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
-</component>
-</collection>
-<collection name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" level="specific">
-<component name="common_agent_util_and_definitions_api" long-name="Common Agent util and definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
-</component>
-<component name="policy_management_certificate_api" long-name="Policy Management Certificate API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/group"/>
-</component>
-<component name="oma_provisioning_adapter_api" long-name="OMA Provisioning Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_adapter_api/group"/>
-</component>
-<component name="device_management_parameter_api" long-name="Device Management Parameter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_parameter_api/group"/>
-</component>
-<component name="data_synchronization_plugin_api" long-name="Data Synchronization Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/group"/>
-</component>
-<component name="sync_alert_handler_api" long-name="Sync Alert Handler API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
-</component>
-<component name="syncml_notifier_api" long-name="SyncML Notifier API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
-</component>
-<component name="syncml_client_api" long-name="SyncML Client API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
-</component>
-<component name="device_management_plugin_api" long-name="Device Management plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_plugin_api/group"/>
-</component>
-<component name="dm_tree_apis" long-name="DM Tree APIs" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
-</component>
-<component name="terminal_security_device_lock_api" long-name="Terminal Security Device Lock API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/group"/>
-</component>
-<component name="policy_management_request_api" long-name="Policy Management Request API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/group"/>
-</component>
-<component name="ds_constant_definitions_api" long-name="DS Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_constant_definitions_api/group"/>
-</component>
-<component name="scp_server_api" long-name="SCP Server API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/group"/>
-</component>
-<component name="data_synchronization_notification_api" long-name="Data Synchronization Notification API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_notification_api/group"/>
-</component>
-<component name="oma_provisioning_engine_api" long-name="OMA Provisioning Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/group"/>
-</component>
-<component name="dm_utils_api" long-name="DM Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/group"/>
-</component>
-<component name="syncml_alert_api" long-name="SyncML Alert API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/group"/>
-</component>
-<component name="obex_client_session_api" long-name="OBEX Client session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/obex_client_session_api/group"/>
-</component>
-<component name="setting_enforcement_info_api" long-name="Setting Enforcement Info API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/group"/>
-</component>
-<component name="dm_constant_definitions_api" long-name="DM Constant Definitions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
-</component>
-<component name="oma_ds_extensions_api" long-name="OMA DS Extensions API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
-</component>
-<component name="pnpms_utils_api" long-name="PNPMS Utils API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
-</component>
-<component name="diagnostics_plugin_utility_api" long-name="Diagnostics Plugin Utility API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
-</component>
-<component name="diagnostics_plugin_api" long-name="Diagnostics Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
-</component>
-<component name="diagnostics_framework_api" long-name="Diagnostics Framework API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
-</component>
-<component name="diagnostics_results_api" long-name="Diagnostics Results API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
-</component>
-<component name="diagnostics_plugin_pool_api" long-name="Diagnostics Plugin Pool API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
-</component>
-<component name="adaptive_history_list_api" long-name="Adaptive History List API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
-</component>
-<component name="adaptive_history_list_session_api" long-name="Adaptive History List Session API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
-</component>
-<component name="fota_engine_api" long-name="FOTA Engine API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
-</component>
-<component name="update_package_storage_plugin_api" long-name="Update Package Storage Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
-</component>
-<component name="syncml_notifier_roaming_api" long-name="SyncML Notifier Roaming API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
-</component>
-<component name="sync_service_api" long-name="Sync Service API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_service_api/group"/>
-</component>
-<component name="dcmo_adapter_api" long-name="DCMO Adapter API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_adapter_api/group"/>
-</component>
-<component name="dcmo_control_api" long-name="DCMO Control API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_control_api/group"/>
-</component>
-<component name="ds_capability_mgmt_plugin_api" long-name="DS Capability Management Plugin API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
-</component>
-</collection>
-<collection name="policymanagement" long-name="Policy Management" level="generic">
-<component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">
-<unit bldFile="mw/remotemgmt/policymanagement/pmdmadapter/group"/>
-</component>
-<component name="dmutilserver" filter="s60" long-name="DM Util Server">
-<unit bldFile="mw/remotemgmt/policymanagement/dmutilserver/group"/>
-</component>
-<component name="policyengine" filter="s60" long-name="Policy Engine">
-<unit bldFile="mw/remotemgmt/policymanagement/policyengine/group" filter="!dfs_build"/>
-</component>
-<component name="policymanagement_build" filter="s60" long-name="Policy Management Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/policymanagement/group"/>
-</component>
-</collection>
-<collection name="syncmlfw" long-name="SyncML Framework" level="server">
-<component name="syncmlfw_build" filter="s60" long-name="SyncML Framework Build">
-<!-- need to break this up into components. Too convoluted a structure to be in a single bld.inf-->
-<unit bldFile="mw/remotemgmt/syncmlfw/group"/>
-</component>
-</collection>
-<collection name="terminalsecurity" long-name="Terminal Security" level="specific">
-<component name="scp" filter="s60" long-name="Security Code Proxy">
-<!-- can only have one unit, need to have these #included from a single bld.inf -->
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpdatabase/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpserver/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scppatternplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scphistoryplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scptimestampplugin/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpeventhandler/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/scp/dmeventnotifier/group"/>
-</component>
-<component name="terminalsecurity_client" filter="s60" long-name="Terminal Control Client">
-<unit bldFile="mw/remotemgmt/terminalsecurity/client/group"/>
-</component>
-<component name="terminalsecurity_server" filter="s60" long-name="Terminal Control Server">
-<unit bldFile="mw/remotemgmt/terminalsecurity/server/group"/>
-</component>
-<component name="tcadapter" filter="s60" long-name="Terminal Control Adapter">
-<unit bldFile="mw/remotemgmt/terminalsecurity/tcadapter/bld"/>
-</component>
-<component name="terminalsecurity_build" filter="s60" long-name="Terminal Security Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/terminalsecurity/group"/>
-</component>
-</collection>
-<collection name="omaprovisioning" long-name="OMA Provisioning" level="specific">
-<component name="pnputil" filter="s60" long-name="PnP Util">
-<unit bldFile="mw/remotemgmt/omaprovisioning/pnputil/group"/>
-</component>
-<component name="provisioning" filter="s60" long-name="Provisioning">
-<unit bldFile="mw/remotemgmt/omaprovisioning/provisioning/group"/>
-</component>
-</collection>
-<collection name="devicediagnosticsfw" long-name="Device Diagnostics Framework" level="framework">
-<component name="diagframework" filter="s60" long-name="Diagnostics Framework">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
-</component>
-<component name="diagpluginbase" filter="s60" long-name="Diagnostics Plugin Base">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
-</component>
-<component name="diagresultsdb" filter="s60" long-name="Diagnostics Results Database">
-<!-- can only have one unit, merge or split into two components -->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
-</component>
-<component name="devicediagnosticsfw_build" filter="s60" long-name="Device Diagnostics Framework Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/group"/>
-</component>
-</collection>
-<collection name="dcmofw" long-name="Device Capability Management Object Framework" level="framework">
-<component name="dcmoclient" filter="s60" long-name="DCMO Client">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoclient/group"/>
-</component>
-<component name="dcmoserver" filter="s60" long-name="DCMO Server">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmoserver/group"/>
-</component>
-<component name="dcmocustcmd" filter="s60" long-name="DCMO Custom Commands">
-<unit bldFile="mw/remotemgmt/dcmofw/dcmocustcmd/group"/>
-</component>
-<component name="dcmofw_build" filter="s60" long-name="DCMO Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/dcmofw/group"/>
-</component>
-</collection>
-<collection name="fotaapplication" long-name="FOTA Application" level="generic">
-<component name="fotaapplication_build" filter="s60" long-name="FOTA Application Build">
-<!-- remove this component when configuration is in place and the #ifdefs have been worked out -->
-<unit bldFile="mw/remotemgmt/fotaapplication/group"/>
-</component>
-<component name="fotaserver" filter="s60" long-name="FOTA Server">
-<!-- uncomment when #ifdefs are resolved -->
-<!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
-</component>
-<component name="fotacustcmds" filter="s60" long-name="FOTA Custom Commands" class="placeholder">
-<!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
-<!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
-</component>
-</collection>
-</block>
-<block name="remoteconn" level="generic" long-name="Remote Connectivity" levels="plugin framework server generic specific">
-<collection name="remoteconn_info" long-name="Remote Connectivity Info" level="specific">
-<component name="remoteconn_metadata" long-name="Remote Connectivity Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mtptransports" long-name="MTP Transports" level="plugin">
-<component name="mtpusbtransport" long-name="MTP USB Transport" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpusbtransport/group" mrp="mw/remoteconn/mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
-</component>
-<component name="mtpptpiptransport" long-name="MTP PTP-IP Transport" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpptpiptransport/group" mrp="mw/remoteconn/mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
-</component>
-<component name="mtpcontroller" long-name="MTP Controller" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpcontroller/group" mrp="mw/remoteconn/mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
-</component>
-</collection>
-<collection name="mtpfws" long-name="MTP Frameworks" level="framework">
-<component name="mtpfw" long-name="MTP Framework" introduced="^2" purpose="optional">
-<unit bldFile="mw/remoteconn/mtpfws/mtpfw/group" mrp="mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/>
-</component>
-</collection>
-<collection name="mtpdataproviders" long-name="MTP Data Providers" level="generic">
-<component name="mtpfileandfolderdp" long-name="MTP File and Folder Provider" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group" mrp="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
-</component>
-<component name="mtpimagedp" long-name="MTP Image Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpimagedp/group" mrp="mw/remoteconn/mtpdataproviders/mtpimagedp/group/mtp_imagedp.mrp"/>
-</component>
-<component name="mtppictbridgedp" long-name="MTP PictBridge Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group" mrp="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group/mtp_pictbridgedp.mrp"/>
-</component>
-</collection>
-<collection name="backupandrestore" long-name="Backup and Restore" level="specific">
-<component name="backupengine" long-name="Backup Engine" introduced="9.0" purpose="optional">
-<unit bldFile="mw/remoteconn/backupandrestore/backupengine/group" mrp="mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
-</component>
-<component name="backuptest" long-name="Backup Test" introduced="^2" purpose="development">
-<unit bldFile="mw/remoteconn/backupandrestore/backuptest/group" mrp="mw/remoteconn/backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
-</component>
-</collection>
-<collection name="obex" long-name="OBEX" level="generic">
-<component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexprotocol/group" mrp="mw/remoteconn/obex/obexprotocol/group/obex.mrp"/>
-</component>
-<component name="obexextensionapi" long-name="OBEX Extension API" introduced="9.2" purpose="optional">
-<unit bldFile="mw/remoteconn/obex/obexextensionapi/group" mrp="mw/remoteconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
-</component>
-</collection>
-</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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<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">
-<unit mrp="mw/srvdiscovery/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="dlnasrv" level="specific" long-name="DLNA Services" levels="stack server ctrl framework plugin">
-<!-- uncomment all the units when configuration is in place, they're currently #included from other xxx_build components -->
-<collection name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" level="plugin">
-<component name="upnp_media_server_settings_api" long-name="UPnP Media Server Settings API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_settings_api/group"/>
-</component>
-<component name="upnp_av_objects_api" long-name="UPnP A/V Objects API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_av_objects_api/group"/>
-</component>
-<component name="upnp_media_server_api" long-name="UPnP Media Server API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_api/group"/>
-</component>
-<component name="upnp_security_plugin_api" long-name="UPnP Security Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_security_plugin_api/group"/>
-</component>
-<component name="upnp_avcp_api" long-name="UPnP AVCP API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_avcp_api/group"/>
-</component>
-<component name="upnp_media_server_metadata_api" long-name="UPnP Media Server Metadata API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_metadata_api/group"/>
-</component>
-<component name="upnp_command_api" long-name="UPnP Command API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_command_api/group"/>
-</component>
-<component name="upnp_plugin_api" long-name="UPnP Plugin API" filter="s60" class="api">
-<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_plugin_api/group"/>
-</component>
-</collection>
-<collection name="upnpavcontrolpoint" long-name="UPnP A/V Control Point" level="plugin">
-<component name="avcontrolframework" filter="s60" long-name="A/V Control Famework" introduced="9.1" deprecated="^3">
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
-</component>
-<component name="upnpavcontrolpoint_build" filter="s60" long-name="UPnP A/V Control Point Build" introduced="9.1" deprecated="^3">
-<!-- put exports in other component instead -->
-<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/group"/>
-</component>
-</collection>
-<collection name="upnpmediaserver" long-name="UPnP Media Server" level="server">
-<component name="avobjects" filter="s60" long-name="A/V Objects">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/avobjects/group"/>
-</component>
-<component name="mediaserverclient" filter="s60" long-name="Media Server Client">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverclient/group"/>
-</component>
-<component name="connectionmanagerservice" filter="s60" long-name="Connection Manager Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/connectionmanagerservice/group"/>
-</component>
-<component name="contentdirectoryservice" filter="s60" long-name="Content Directory Service">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/contentdirectoryservice/group"/>
-</component>
-<component name="mediaserverengine" filter="s60" long-name="Media Server Engine">
-<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverengine/group"/>
-</component>
-<component name="upnpmediaserver_build" filter="s60" long-name="UPnP Media Server Build">
-<!-- move exports into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpmediaserver/group"/>
-</component>
-</collection>
-<collection name="upnpavcontroller" long-name="UPnP A/V Controller" level="ctrl">
-<component name="upnpxmlparser" filter="s60" long-name="UPnP XML Parser" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpxmlparser/group"/>
-</component>
-<component name="upnpavcontrollerserver" filter="s60" long-name="UPnP A/V Controller Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerserver/group"/>
-</component>
-<component name="upnpavcontrollerclient" filter="s60" long-name="UPnP A/V Ccontroller Client" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerclient/group"/>
-</component>
-<component name="upnpavcontrollerhelper" filter="s60" long-name="UPnP A/V Controller Helper" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerhelper/group"/>
-</component>
-<component name="upnpavcontroller_build" filter="s60" long-name="UPnP A/V Controller Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpavcontroller/group"/>
-</component>
-</collection>
-<collection name="upnpframework" long-name="UPnP Framework" level="framework">
-<component name="upnputilities" filter="s60" long-name="UPnP Utilities" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnputilities/group"/>
-</component>
-<component name="upnpextensionpluginif" filter="s60" long-name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpextensionpluginif/group"/> -->
-</component>
-<component name="upnpfiletransferengine" filter="s60" long-name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>-->
-</component>
-<component name="upnpcommonui" filter="s60" long-name="UPnP Common UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpcommonui/group"/>-->
-</component>
-<component name="upnpaiwengine" filter="s60" long-name="UPnP AIW Engine" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpaiwengine/group"/> -->
-</component>
-<component name="upnpaiwprovider" filter="s60" long-name="UPnP AIW Provider" introduced="^2" deprecated="^3" plugin="Y">
-<!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
-</component>
-<component name="upnpmusicadapter" filter="s60" long-name="UPnP Music Adapter" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
-</component>
-<component name="upnpcommand" filter="s60" long-name="UPnP Command" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpframework/upnpcommand/group"/>
-</component>
-<component name="upnpframework_build" filter="s60" long-name="UPnP Framework Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpframework/group"/>
-</component>
-</collection>
-<collection name="upnpsettings" long-name="UPnP Settings" level="framework">
-<component name="upnpsettingsengine" filter="s60" long-name="UPnP Settings Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
-</component>
-<component name="multiselectionui" filter="s60" long-name="Multi-Selection UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/multiselectionui/group"/>-->
-</component>
-<component name="appwizard" filter="s60" long-name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/appwizard/group"/>-->
-</component>
-<component name="upnpsharingui" filter="s60" long-name="UPnP Sharing UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
-</component>
-<component name="upnpgsplugin" filter="s60" long-name="UPnP GS Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
-</component>
-<component name="upnpsettings_build" filter="s60" long-name="UPnP Settings Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsettings/group"/>
-</component>
-</collection>
-<collection name="upnpsharing" long-name="UPnP Sharing" level="server">
-<component name="upnpdlnaprofiler" filter="s60" long-name="UPnP DLNA Profiler" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpdlnaprofiler/group"/>
-</component>
-<component name="upnpsecurity" filter="s60" long-name="UPnP Security" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpsecurity/group"/>
-</component>
-<component name="upnpcontentserver" filter="s60" long-name="UPnP Content Server" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/upnpcontentserver/group"/>
-</component>
-<component name="applicationengine" filter="s60" long-name="UPnP Application Engine" introduced="^2">
-<unit bldFile="mw/dlnasrv/upnpsharing/applicationengine/group"/>
-</component>
-<component name="upnpsharing_build" filter="s60" long-name="UPnP Sharing Build" introduced="^2">
-<!-- move exports content into one of above components -->
-<unit bldFile="mw/dlnasrv/upnpsharing/group"/>
-</component>
-</collection>
-<collection name="upnpmpxplugins" long-name="UPnP MPX Plugins" level="plugin">
-<component name="upnpplaybackplugins" filter="s60" long-name="UPnP Playback Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/upnpplaybackplugins/group"/>
-</component>
-<component name="upnpmpxplugins_build" filter="s60" long-name="UPnP MPX Plugins Build" introduced="^2">
-<!-- move exports content into other component? -->
-<unit bldFile="mw/dlnasrv/upnpmpxplugins/group"/>
-</component>
-</collection>
-<collection name="upnpharvester" long-name="UPnP Harvester" level="ctrl">
-<component name="upnpharvester_common" filter="s60" long-name="UPnP Harvester Common" introduced="^2" deprecated="^3" class="placeholder">
-<!-- need to merge or #include these to a single bld.inf -->
-<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
- <unit bldFile="upnpharvester/common/cmsettings/group"/>
- <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
- <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
-</component>
-<component name="cdssync" filter="s60" long-name="CDS Sync" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
-</component>
-<component name="mdhserver" filter="s60" long-name="Metadata Harvester Server" introduced="^2" deprecated="^3" class="placeholder">
-<!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
-</component>
-<component name="upnpharvester_build" filter="s60" long-name="UPnP Harvester Build" introduced="^2" deprecated="^3" class="placeholder">
-<!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
-<!--<unit bldFile="upnpharvester/group"/>-->
-</component>
-</collection>
-<collection name="homesync" long-name="Home Sync" level="plugin">
-<component name="contentmanager" filter="s60" long-name="Content Manager" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homesync/group"/>-->
-<!-- move bld.inf into contentmanager dir -->
-</component>
-</collection>
-<collection name="homemedia" long-name="Home Media" level="framework">
-<!-- collection is really just a component. Move down a directory -->
-<component name="homemedia_build" filter="s60" long-name="Home Media" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homemedia/group"/> -->
-</component>
-</collection>
-<collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin">
-<component name="dlnasrv_build" filter="s60" long-name="DLNA Services Build">
-<!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed -->
-<unit bldFile="mw/dlnasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="btservices" level="generic" long-name="Bluetooth Services" levels="framework server generic specific plugin">
-<collection name="btservices_pub" long-name="BT Services Public Interfaces" level="plugin">
-<component name="bluetooth_power_state_api" long-name="Bluetooth Power State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_power_state_api/group"/>
-</component>
-<component name="bluetooth_notifier_api" long-name="Bluetooth Notifier API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_pub/bluetooth_notifier_api/group"/>
-</component>
-</collection>
-<collection name="btservices_plat" long-name="BT Services Platform Interfaces" level="plugin">
-<component name="bluetooth_dosserver_audio_api" long-name="Bluetooth DOS Server Audio API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dosserver_audio_api/group"/>
-</component>
-<component name="bluetooth_dut_mode_api" long-name="Bluetooth DUT Mode API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_dut_mode_api/group"/>
-</component>
-<component name="bluetooth_engine_api" long-name="Bluetooth Engine API" filter="s60" class="api">
-<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"/>
-</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"/>
-</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"/>
-</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"/>
-</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"/>
-</component>
-<component name="bluetooth_local_variation_api" long-name="Bluetooth Local Variation API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_local_variation_api/group"/>
-</component>
-<component name="bluetooth_notifier_internal_api" long-name="Bluetooth Notifier internal API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_notifier_internal_api/group"/>
-</component>
-<component name="bluetooth_sap_connection_state_api" long-name="Bluetooth SAP Connection State API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_sap_connection_state_api/group"/>
-</component>
-<component name="bluetooth_secondary_display_notification_api" long-name="Bluetooth Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_secondary_display_notification_api/group"/>
-</component>
-</collection>
-<collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
-<component name="bteng" filter="s60" long-name="Bluetooth Engine">
-<unit bldFile="mw/btservices/bluetoothengine/bteng/group"/>
-</component>
-<component name="btnotif" filter="s60" long-name="Bluetooth Notifier">
-<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"/>
-</component>
-<component name="btmac" filter="s60" long-name="Bluetooth Mono Audio Controller" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btmac/group"/>
-</component>
-<component name="btsac" filter="s60" long-name="Bluetooth Stereo Audio Controller" plugin="Y">
-<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"/>
-</component>
-<component name="btsap" filter="s60" long-name="Bluetooth SIM Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btsap/group"/>
-</component>
-<component name="btui" filter="s60" long-name="Bluetooth UI">
-<unit bldFile="mw/btservices/bluetoothengine/btui/group"/>
-</component>
-<component name="btpbap" filter="s60" long-name="Bluetooth Phonebook Access Profile" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btpbap/group"/>
-</component>
-<component name="bthid" filter="s60" long-name="Bluetooth HID">
-<unit bldFile="mw/btservices/bluetoothengine/bthid/group"/>
-</component>
-<component name="btctrldcmoadapter" filter="s60" long-name="Bluetooth Control DCMO Adapter" introduced="^3" plugin="Y">
-<unit bldFile="mw/btservices/bluetoothengine/btctrldcmoadapter/group"/>
-</component>
-</collection>
-<collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
-<component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
-<unit bldFile="mw/btservices/bluetoothappprofiles/avrcp" mrp="mw/btservices/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
-</component>
-</collection>
-<collection name="atcommands" long-name="AT Commands" level="generic">
-<component name="modematplugin" long-name="Modem AT Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/modematplugin/group"/>
-</component>
-<component name="lccustomplugin" long-name="LC Custom Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="mw/btservices/atcommands/lccustomplugin/group"/>
-</component>
-</collection>
-<collection name="btservices_info" long-name="BT Services Info" level="plugin">
-<component name="btservices_metadata" long-name="BT Services Metadata" introduced="^3" purpose="development" class="config PC">
-<unit mrp="mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="usbservices" level="generic" long-name="USB Services" levels="framework server generic specific plugin">
-<collection name="usbservices_plat" long-name="USB Services Platform Interfaces" level="plugin">
-<component name="pictbridge_api" long-name="PictBridge API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/pictbridge_api/group"/>
-</component>
-<component name="ptp_responder_api" long-name="PTP Responder API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_responder_api/group"/>
-</component>
-<component name="ptp_transport_api" long-name="PTP Transport API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/ptp_transport_api/group"/>
-</component>
-<component name="usb_device_control_plugin_api" long-name="USB Device Control Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_device_control_plugin_api/group"/>
-</component>
-<component name="usb_notifier_api" long-name="USB Notifier API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_notifier_api/group"/>
-</component>
-<component name="usb_personality_api_header" long-name="USB Personality API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_api_header/group"/>
-</component>
-<component name="usb_personality_plugin_api" long-name="USB Personality Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_plugin_api/group"/>
-</component>
-<component name="usb_secondary_display_api" long-name="USB Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_secondary_display_api/group"/>
-</component>
-<component name="usb_watcher_api" long-name="USB Watcher API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_api/group"/>
-</component>
-<component name="usb_watcher_info_api_header" long-name="USB Watcher Info API" filter="s60" class="api">
-<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_info_api_header/group"/>
-</component>
-</collection>
-<collection name="usbengines" long-name="USB Engines" level="generic">
-<component name="usbotgwatcher" filter="s60" long-name="USB OTG Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbotgwatcher/group"/>
-</component>
-<component name="usbwatcher" filter="s60" long-name="USB Watcher">
-<unit bldFile="mw/usbservices/usbengines/usbwatcher/group"/>
-</component>
-<component name="usblocodplugin" filter="s60" long-name="USB Local Connectivity Domain Plugin" plugin="Y">
-<unit bldFile="mw/usbservices/usbengines/usblocodplugin/group"/>
-</component>
-<component name="usbdevcon" filter="s60" long-name="USB Device Control">
-<unit bldFile="mw/usbservices/usbengines/usbdevcon/group"/>
-</component>
-<component name="usbremotepersonality" filter="s60" long-name="USB Remote Personality">
-<unit bldFile="mw/usbservices/usbengines/usbremotepersonality/group"/>
-</component>
-</collection>
-<collection name="usbclasses" long-name="USB Classes" level="framework">
-<component name="usbobexclasscontroller" filter="s60" long-name="USB OBEX Class Controller" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbobexclasscontroller/group"/>
-</component>
-<component name="usbbasicpersonality" filter="s60" long-name="USB Basic Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbbasicpersonality/group"/>
-</component>
-<component name="usbmscpersonality" filter="s60" long-name="USB MSC Personality" plugin="Y">
-<unit bldFile="mw/usbservices/usbclasses/usbmscpersonality/group"/>
-</component>
-<!-- commented out in bld.inf. Should this be deleted?
- <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
- <unit bldFile="usbclasses/ptpstack/group"/>
- </component>
- <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
- <unit bldFile="usbclasses/sicdusbplugin/group"/>
- </component>
- <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
- <unit bldFile="usbclasses/ptpserver/group"/>
- </component>-->
-<component name="pictbridgeengine" filter="s60" long-name="PictBridge Engine">
-<unit bldFile="mw/usbservices/usbclasses/pictbridgeengine/group"/>
-</component>
-<component name="usbphoneasmodem" filter="s60" long-name="USB Phone as Modem" introduced="^3">
-<unit bldFile="mw/usbservices/usbclasses/usbphoneasmodem/group"/>
-</component>
-</collection>
-<collection name="usbuis" long-name="USB UIs" level="specific">
-<component name="usbui" filter="s60" long-name="USB UI">
-<unit bldFile="mw/usbservices/usbuis/usbui/group"/>
-</component>
-<component name="usbuinotif" filter="s60" long-name="USB UI Notifiers">
-<unit bldFile="mw/usbservices/usbuis/usbuinotif/group"/>
-</component>
-<component name="imageprintuiprovider" filter="s60" long-name="ImagePrint UI Provider" plugin="Y">
-<unit bldFile="mw/usbservices/usbuis/imageprintuiprovider/group"/>
-</component>
-<component name="usbimageprintui" filter="s60" long-name="ImagePrint UI">
-<unit bldFile="mw/usbservices/usbuis/imageprintui/group"/>
-</component>
-<component name="usbuiqt" long-name="USB UI Qt" introduced="^4" filter="s60">
-<unit bldFile="mw/usbservices/usbuis/usbuiqt" proFile="usbapplication.pro"/>
-</component>
-</collection>
-<collection name="usbservices_test" long-name="USB Services Test" level="server"/>
-</block>
-<block name="shortlinkconn" level="generic" long-name="Shortlink Connectivity" levels="framework server generic specific plugin">
-<!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
-<collection name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" level="plugin">
-<component name="obex_service_utils_api" long-name="OBEX Service Utils API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_utils_api/group"/>
-</component>
-<component name="obex_service_plugin_api" long-name="OBEX Service Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_plugin_api/group"/>
-</component>
-<component name="dialup_connection_status_api" long-name="Dial-up Connection Status API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dialup_connection_status_api/group"/>
-</component>
-<component name="dun_secondary_display_notification_api" long-name="DUN Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
-</component>
-<component name="obex_secondary_display_notification_api" long-name="OBEX Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
-</component>
-<component name="generic_hid_api" long-name="Generic HID API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/generic_hid_api/group"/>
-</component>
-<component name="locod_bearer_plugin_api" long-name="Locod Bearer Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/locod_bearer_plugin_api/group"/>
-</component>
-<component name="usb_obexservicemanager_client_api" long-name="USB OBEX Service Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_obexservicemanager_client_api/group"/>
-</component>
-</collection>
-<collection name="localconnectivityservice" long-name="Local Connectivity Service" level="server">
-<component name="locod" long-name="Local Connectivity Daemon">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/locod/group"/>
-</component>
-<component name="obexserviceman" long-name="OBEX Service Managar">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
-</component>
-<component name="obexsendservices" long-name="OBEX Send Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
-</component>
-<component name="obexreceiveservices" long-name="OBEX Receive Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
-</component>
-<component name="dun" long-name="Dial Up Networking">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/dun/group"/>
-</component>
-<component name="lcstylustap" long-name="LC Stylus Tap Plugins" plugin="Y">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/lcstylustap/group"/>
-</component>
-<component name="generichid" long-name="Generic HID">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/generichid/group"/>
-</component>
-<component name="headset" long-name="Headset">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/headset/group"/>
-</component>
-</collection>
-</block>
-<block name="imghandling" level="specific" long-name="Image Handling" levels="lib util if">
-<collection name="imagehandling_plat" long-name="Image Handling Platform Interfaces" level="if">
-<component name="image_handling_library_api" long-name="Image Handling Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
-</component>
-<component name="3gp_library_api" long-name="3GP Library API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
-</component>
-<component name="thumbnailmanager_api" long-name="Thumbnail Manager API" filter="s60" class="api">
-<unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="imagehandlinglib" long-name="Image Handling Library" level="lib">
-<!-- collection is really a component, need to move down a directory -->
-<component name="ihl" filter="s60" long-name="IHL">
-<unit bldFile="mw/imghandling/imagehandlinglib/group"/>
-</component>
-</collection>
-<collection name="imagehandlingutilities" long-name="Image Handling Utilities" level="util">
-<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager">
-<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
-</component>
-<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager Qt" introduced="^4">
-<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt" filter="!test" proFile="thumbnailmanagerqt.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</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">
-<unit bldFile="mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
-</component>
-</collection>
-</block>
-<block name="mds" level="specific" long-name="Metadata Services" levels="mgr eng server int">
-<collection name="mds_plat" long-name="Metadata Services Platform Interfaces" level="int">
-<component name="context_engine_plugin_api" long-name="Context Engine Plugin API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/group" filter="!test"/>
-</component>
-<component name="harvester_framework_api" long-name="Harvester Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/harvester_framework_api/group" filter="!test"/>
-<!-- can only have one unit with the same filter, #include the following from the previous unit -->
-</component>
-<component name="location_manager_api" long-name="Location Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/location_manager_api/group" filter="!test"/>
-</component>
-<component name="metadata_engine_api" long-name="Metadata Engine API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/metadata_engine_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_collection_manager_api" long-name="Content Listing Framework Collection Manager API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/group" filter="!test"/>
-</component>
-<component name="content_listing_framework_extended_api" long-name="Content Listing Framework Extended API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_plat/content_listing_framework_extended_api/group"/>
-</component>
-</collection>
-<collection name="mds_pub" long-name="Metadata Services Public Interfaces" level="int">
-<component name="content_listing_framework_api" long-name="Content Listing Framework API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/mds/mds_pub/content_listing_framework_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="metadataengine" long-name="Metadata Engine" level="eng">
-<component name="metadataengine_common" filter="s60" long-name="Metadata Engine Common" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/common/group"/>
-</component>
-<component name="metadataengine_server" filter="s60" long-name="Metadata Engine Server" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/server/group"/>
-</component>
-<component name="metadataengine_client" filter="s60" long-name="Metadata Engine Client" introduced="^2">
-<unit bldFile="mw/mds/metadataengine/client/group"/>
-</component>
-<component name="metadataengine_build" filter="s60" long-name="Metadata Engine Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/metadataengine/group"/>
-</component>
-</collection>
-<collection name="locationmanager" long-name="Location Manager" level="mgr">
-<component name="locationtrail" filter="s60" long-name="Location Trail" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/locationtrail/group"/>
-</component>
-<component name="locationmanager_server" filter="s60" long-name="Location Manager Server" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/server/group"/>
-</component>
-<component name="locationmanager_client" filter="s60" long-name="Location Manager Client" introduced="^2">
-<unit bldFile="mw/mds/locationmanager/client/group"/>
-</component>
-<component name="locationmanager_build" filter="s60" long-name="Location Manager Build" introduced="^2">
-<!--make this collection a single component, or split this bld.inf into the other units -->
-<unit bldFile="mw/mds/locationmanager/group"/>
-</component>
-</collection>
-<collection name="contextengine" long-name="Context Engine" level="eng">
-<component name="contextengine_plugins" filter="s60" long-name="Context Engine Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/contextengine/plugins/group"/>
-</component>
-<component name="contextengine_build" filter="s60" long-name="Context Engine Build" introduced="^2">
-<!--make this collection a single component, or make this unit self-contained -->
-<unit bldFile="mw/mds/contextengine/group"/>
-</component>
-</collection>
-<collection name="harvester" long-name="Harvester" level="eng">
-<component name="blacklistclient" filter="s60" long-name="Blacklist Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistclient/group"/>
-</component>
-<component name="blacklistserver" filter="s60" long-name="Blacklist Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/blacklistserver/group"/>
-</component>
-<component name="harvester_common" filter="s60" long-name="Harvester Common" introduced="^2">
-<unit bldFile="mw/mds/harvester/common/group"/>
-</component>
-<component name="composerplugins" filter="s60" long-name="Composer Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/composerplugins/group"/>
-</component>
-<component name="harvesterplugins" filter="s60" long-name="Harvester Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/harvesterplugins/group"/>
-</component>
-<component name="monitorplugins" filter="s60" long-name="Monitor Plugins" introduced="^2" plugin="Y">
-<unit bldFile="mw/mds/harvester/monitorplugins/group"/>
-</component>
-<component name="harvester_server" filter="s60" long-name="Harvester Server" introduced="^2">
-<unit bldFile="mw/mds/harvester/server/group"/>
-</component>
-<component name="harvester_client" filter="s60" long-name="Harvester Client" introduced="^2">
-<unit bldFile="mw/mds/harvester/client/group"/>
-</component>
-<component name="harvester_build" filter="s60" long-name="Harvester Build" introduced="^2">
-<!-- split these exports into the other components -->
-<unit bldFile="mw/mds/harvester/group"/>
-</component>
-</collection>
-<collection name="watchdog" long-name="Watchdog" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="mdswatchdog" filter="s60" long-name="Metadata Watchdog" introduced="^2">
-<unit bldFile="mw/mds/watchdog/group"/>
-</component>
-</collection>
-<collection name="clfwrapper" long-name="Content Listing Framework Wrapper" level="int">
-<!-- collection is really a component. Move down a directory -->
-<component name="clfwrapper_build" filter="s60" long-name="CLF Wrapper Build" introduced="^2" class="placeholder">
-<!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
-<!--<unit bldFile="clfwrapper/group"/>-->
-</component>
-</collection>
-<collection name="mds_info" long-name="Metadata Services Info" level="int">
-<component name="mds_build" filter="s60" long-name="Metadata Services Build" introduced="^2">
-<!-- consider distributiing this into the rest of the components in the package -->
-<unit bldFile="mw/mds/group"/>
-</component>
-</collection>
-</block>
-<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"/>
-</component>
-<component name="videoconnutility_api" long-name="Video Connection Utility API" filter="s60" class="api">
-<unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/group"/>
-</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"/>
-</component>
-</collection>
-<collection name="videoscheduler" long-name="Video Scheduler" level="util">
-<component name="schedulerclient" filter="s60" long-name="Video Scheduler Client">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerclient/group"/>
-</component>
-<component name="schedulerserver" filter="s60" long-name="Video Scheduler Server">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerserver/group"/>
-</component>
-</collection>
-<collection name="videoconnutility" long-name="Video Connection Utility" level="util">
-<component name="connutilpsworker" filter="s60" long-name="Connection Utility Publish and Subscribe Worker">
-<unit bldFile="mw/videoutils/videoconnutility/connutilpsworker/group"/>
-</component>
-<component name="video_connutility" filter="s60" long-name="Video Connection Utility">
-<unit bldFile="mw/videoutils/videoconnutility/connutility/group"/>
-</component>
-</collection>
-<collection name="videoutils_info" long-name="Video Utils Info" level="if"/>
-</block>
-<block name="mmmw" level="generic" long-name="Multimedia Middleware" levels="plugin framework server generic specific">
-<collection name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" level="specific">
-<component name="multimedia_data_source_api" long-name="Multimedia Data Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
-</component>
-<component name="progressive_download_api" long-name="Progressive Download API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/progressive_download_api/group"/>
-</component>
-<component name="equalizer_ui_api" long-name="Equalizer UI API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
-</component>
-<component name="enhanced_media_client_api" long-name="Enhanced Media Client API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
-</component>
-<component name="stream_control_custom_command_api" long-name="Stream Control Custom Command API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
-</component>
-<component name="emc_buffer_source_api" long-name="EMC Buffer Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_buffer_source_api/group"/>
-</component>
-<component name="emc_file_source_api" long-name="EMC File Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
-</component>
-<component name="audio_metadata_reader_api" long-name="Audio MetaData Reader API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
-</component>
-<component name="emc_progressive_download_source_api" long-name="EMC Progressive Download Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
-</component>
-<component name="emc_volume_effect_api" long-name="EMC Volume Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
-</component>
-<component name="emc_balance_effect_api" long-name="EMC Balance Effect API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_balance_effect_api/group"/>
-</component>
-<component name="emc_descriptor_source_api" long-name="EMC Descriptor Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_descriptor_source_api/group"/>
-</component>
-<component name="emc_drm_config_intfc_api" long-name="EMC DRM Config Intfc API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
-</component>
-<component name="voip_audio_services_api" long-name="VoIP Audio Services" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/group"/>
-</component>
-<component name="configuration_components_factory_api" long-name="Configuration Components Factory API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
-</component>
-<component name="audio_output_control_utility_api" long-name="Audio Output Control Utility API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/group"/>
-</component>
-<component name="audio_output_control_utility_proxy_api" long-name="Audio Output Control Utility Proxy API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
-</component>
-<component name="emc_audio_effects_api" long-name="EMC Audio Effects API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
-</component>
-<component name="call_audio_control_api" long-name="Call AudioControl API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/group"/>
-</component>
-<component name="radio_utilities_api" long-name="Radio Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/group"/>
-</component>
-<component name="radio_preset_utilities_api" long-name="Radio Preset Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
-</component>
-<component name="radio_monitor_api" long-name="Radio Monitor API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
-</component>
-<component name="thumbnail_engine_api" long-name="Thumbnail Engine API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/thumbnail_engine_api/group"/>
-</component>
-<component name="telephony_multimedia_service_api" long-name="Telephony Multimedia Service API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
-</component>
-<component name="openmax_al_api" long-name="OpenMAX AL API" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/openmax_al_api/group"/>
-</component>
-</collection>
-<collection name="mmfenh" long-name="MMF Enhancements" level="generic">
-<component name="advancedaudiocontroller" filter="s60" long-name="Advanced Audio Controllers" plugin="Y">
-<unit bldFile="mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
-</component>
-<component name="audiooutputcontrolutility" filter="s60" long-name="Audio Output Control Utility">
-<unit bldFile="mw/mmmw/mmfenh/audiooutputcontrolutility/group"/>
-</component>
-<component name="configurationcomponentsfactory" filter="s60" long-name="Configuration Components Factory">
-<unit bldFile="mw/mmmw/mmfenh/configurationcomponentsfactory/group"/>
-</component>
-<component name="enhancedaudioplayerutility" filter="s60" long-name="Enhanced Audio Player Utility">
-<unit bldFile="mw/mmmw/mmfenh/enhancedaudioplayerutility/group"/>
-</component>
-<component name="enhancedmediaclient" filter="s60" long-name="Enhanced Media Client">
-<unit bldFile="mw/mmmw/mmfenh/enhancedmediaclient/group"/>
-</component>
-<component name="profilesettingsmonitor" filter="s60" long-name="Profile Settings Monitor">
-<unit bldFile="mw/mmmw/mmfenh/profilesettingsmonitor/group"/>
-</component>
-<component name="progressivedownload" filter="s60" long-name="Progressive Download">
-<unit bldFile="mw/mmmw/mmfenh/progressivedownload/group"/>
-</component>
-</collection>
-<collection name="mm_fw" long-name="Multimedia Frameworks" level="framework">
-<!-- Id needs to be unique, mmfw already in use -->
-<!-- Placeholder for OpenAX AL and other stuff -->
-</collection>
-<collection name="mmserv" long-name="Multimedia Services" level="specific">
-<component name="audioeffectsui" filter="s60" long-name="Audio Effects UI">
-<unit bldFile="mw/mmmw/mmserv/audioeffectsui/group"/>
-</component>
-<component name="callaudiocontrol" filter="s60" long-name="Call Audio Control">
-<unit bldFile="mw/mmmw/mmserv/callaudiocontrol/group"/>
-</component>
-<component name="metadatautility" filter="s60" long-name="Metadata Utility">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/group"/>
-</component>
-<component name="radioutility" filter="s60" long-name="Radio Utility">
-<unit bldFile="mw/mmmw/mmserv/radioutility/group"/>
-</component>
-<component name="thumbnailengine" filter="s60" long-name="Thumbnail Engine" introduced="^2">
-<unit bldFile="mw/mmmw/mmserv/thumbnailengine/group"/>
-</component>
-<component name="tms" filter="s60" long-name="Telephony Multimedia Service" introduced="^3">
-<unit bldFile="mw/mmmw/mmserv/tms/group"/>
-</component>
-<component name="voipaudioservices" filter="s60" long-name="VoIP Audio Services">
-<unit bldFile="mw/mmmw/mmserv/voipaudioservices/group"/>
-</component>
-<component name="lib3gpextparser" filter="s60" long-name="3GP Extension Metadata Parser Library">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group" filter="sf_build"/>
-</component>
-</collection>
-<collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
-<component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="helix" level="generic" long-name="Helix" levels="plugin framework server generic specific">
-<collection name="helix_ren" long-name="Helix Engine" level="framework">
-<!-- what does "ren" stand for? -->
-<component name="helix_stub" filter="s60" long-name="Helix Stub" introduced="^2" class="api">
-<unit bldFile="mw/helix/helix_ren/helix_stub/group"/>
-</component>
-</collection>
-</block>
-<block name="camerasrv" level="specific" long-name="Camera Services" levels="plugin fw api">
-<collection name="camerasrv_plat" long-name="Camera Services Platform Interfaces" level="api">
-<component name="media_recorder_sink_api" long-name="Media Recorder Sink API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
-</component>
-<component name="custom_onboard_camera_api" long-name="Custom Onboard Camera API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
-</component>
-<component name="imaging_configuration_manager_api" long-name="Imaging Configuration Manager API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
-</component>
-<component name="media_recorder_api" long-name="Media Recorder API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_api/group" filter="!test"/>
-</component>
-<component name="3gp_file_composer_api" long-name="3GP File Composer API" filter="s60" class="api">
-<unit bldFile="mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
-</component>
-</collection>
-<collection name="camcordermmfplugin" long-name="Camcorder MMF Plugin" level="plugin">
-<!-- collection is really a component. Should move down a directory -->
-<component name="camcordermmfplugin_build" filter="s60" long-name="Camcorder MMF Plugin Build" plugin="Y">
-<unit bldFile="mw/camerasrv/camcordermmfplugin/build"/>
-</component>
-</collection>
-<collection name="configmanagers" long-name="Config Managers" level="api">
-<component name="imagingconfigmanager" filter="s60" long-name="Imaging Config Manager">
-<unit bldFile="mw/camerasrv/configmanagers/imagingconfigmanager/group"/>
-</component>
-</collection>
-<collection name="camerasrv_info" long-name="Camera Services Info" level="api">
-<component name="camerasrv_build" filter="s60" long-name="Camera Services Build">
-<!-- should split into individual bld.infs -->
-<unit bldFile="mw/camerasrv/group"/>
-</component>
-</collection>
-</block>
-<block name="mmappfw" level="specific" long-name="Multimedia App Framework" levels="fw utils if">
-<collection name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" level="if">
-<component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interfaces Build" introduced="^1" filter="s60">
-<!-- this is no longer necessary when confguration is put in place -->
-<unit bldFile="mw/mmappfw/mmappfw_plat"/>
-</component>
-<component name="collection_helper_api" long-name="Collection Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
-</component>
-<component name="harvester_collection_mediator_api" long-name="Harvester Collection Mediator API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/group"/>
-</component>
-<component name="harvester_metadata_extractor_api" long-name="Harvester Metadata Extractor API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/group"/>
-</component>
-<component name="harvester_server_api" long-name="Harvester Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_server_api/group"/>
-</component>
-<component name="harvester_utility_api" long-name="Harvester Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_utility_api/group"/>
-</component>
-<component name="playlist_engine_api" long-name="Playlist Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playlist_engine_api/group"/>
-</component>
-<component name="mtp_keys_api" long-name="MTP Keys API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mtp_keys_api/group"/>
-</component>
-<component name="mpx_collection_common_definition_api" long-name="MPX Collection Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_common_definition_api/group"/>
-</component>
-<component name="mpx_collection_utility_api" long-name="MPX Collection Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/group"/>
-</component>
-<component name="mpx_common_api" long-name="MPX Common API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_api/group"/>
-</component>
-<component name="mpx_common_definition_api" long-name="MPX Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_common_definition_api" long-name="MPX Playback Common Definition API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_common_definition_api/group"/>
-</component>
-<component name="mpx_playback_utility_api" long-name="MPX Playback Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/group"/>
-</component>
-<component name="mpx_base_view_plugins_api" long-name="MPX Base View Plugins API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/group"/>
-</component>
-<component name="mpx_view_utility_api" long-name="MPX View Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_view_utility_api/group"/>
-</component>
-<component name="mpx_albumart_utility_api" long-name="MPX Album Art Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/group"/>
-</component>
-<component name="media_player_settings_engine_api" long-name="Media Player Settings Engine API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
-</component>
-<component name="mpx_backstepping_utility_api" long-name="MPX Backstepping Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_backstepping_utility_api/group"/>
-</component>
-<component name="asx_parser_api" long-name="ASX Parser API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/asx_parser_api/group"/>
-</component>
-<component name="playback_helper_api" long-name="Playback Helper API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/playback_helper_api/group"/>
-</component>
-<component name="videoplaylist_utility_api" long-name="Video Playlist Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/videoplaylist_utility_api/group"/>
-</component>
-</collection>
-<collection name="mpx" long-name="Multimedia Player" level="fw">
-<component name="commonframework" filter="s60" long-name="MPX Common Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/commonframework/group"/>
-</component>
-<component name="playbackframework" filter="s60" long-name="MPX Playback Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/playbackframework/group"/>
-</component>
-<component name="mpxcollectionfw" filter="s60" long-name="MPX Collection Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/collectionframework/group"/>
-</component>
-<component name="mpxviewfw" filter="s60" long-name="MPX View Framework" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/viewframework/group"/>
-</component>
-<component name="mpxviewframeworkqt" long-name="MPX View Framework Qt" filter="s60">
-<unit bldFile="mw/mmappfw/mpx/mpxviewframeworkqt" proFile="mpxviewframeworkqt.pro" qmakeArgs="-r -config rom"/>
-</component>
-<component name="mpx_build" filter="s60" long-name="MPX Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/mpx/group"/>
-</component>
-</collection>
-<collection name="mmappcomponents" long-name="Multimedia App Components" level="utils">
-<component name="mmappcomponents_build" filter="s60" long-name="Multimedia App Components Build" introduced="^1">
-<!-- needed for #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
- Can remove this once configuration is in place-->
-<unit bldFile="mw/mmappfw/mmappcomponents/group"/>
-</component>
-<component name="collectionhelper" filter="s60" long-name="Media Player Collection Helper" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/collectionhelper/group"/>
-</component>
-<component name="playlistengine" filter="s60" long-name="Playlist Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/playlistengine/group"/>
-</component>
-<component name="mpxharvester" filter="s60" long-name="Media Player Harvester" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/harvester/group"/>
-</component>
-<component name="mmappcommonui" filter="s60" long-name="Multimedia App Common UI" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmappcommonui/group"/>
-</component>
-<component name="mediaplayersettingsengine" filter="s60" long-name="Media Player Settings Engine" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
-</component>
-<component name="audiofetcher" filter="s60" long-name="Audio Fetcher" introduced="^1" plugin="Y">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
-</component>
-<component name="asxparser" filter="s60" long-name="ASX Parser" introduced="^1">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
-</component>
-<component name="playbackhelper" filter="s60" long-name="Playback Helper" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/playbackhelper/group"/>
-</component>
-<component name="videoplaylistutility" filter="s60" long-name="Video Playlist Utility" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/videoplaylistutility/group"/>
-</component>
-<component name="mmmtpdataprovider" filter="s60" long-name="Multimedia MTP Data Provider" introduced="^3">
-<unit bldFile="mw/mmappfw/mmappcomponents/mmmtpdataprovider/group"/>
-</component>
-</collection>
-<collection name="mmappfw_info" long-name="Multimedia App Framework Info" level="if">
-<component name="mmappfw_build" filter="s60" long-name="Multimedia App Framework Build" introduced="^1">
-<!-- Move the export to another component or remove the #includes from this one -->
-<unit bldFile="mw/mmappfw/group"/>
-</component>
-<component name="mmappfw_test" filter="s60,test,api_test,pref_test" long-name="Multimedia App Framework Test" purpose="development" introduced="^1"/>
-</collection>
-</block>
-<block name="hgwidgets" level="specific" long-name="HG Widgets" levels="framework service api">
-<collection name="hgwidgets_pub" long-name="HG Widgets Platform Interfaces" level="api">
-<component name="ganeswidgets_api" long-name="Ganes Widgets API" introduced="^4" class="api placeholder">
-<!-- should separate out unit -->
-</component>
-</collection>
-<collection name="hgwidgets_pub" long-name="HG Widgets Public Interfaces" level="api"/>
-<collection name="ganeswidgets" long-name="Ganes Widgets" level="service">
-<!-- really a component, should move down a dir level and have a unit -->
-<component name="ganeswidgets_build" long-name="Ganes Widgets Build" introduced="^4" class="placeholder">
-<!-- should separate out unit -->
-</component>
-</collection>
-<collection name="hgwidgets_info" long-name="HG Widgets Info" level="framework">
-<component name="hgwidgets_build" long-name="HG Widgets Build" introduced="^4">
-<unit bldFile="mw/hgwidgets" proFile="hgwidgets.pro"/>
-</component>
-</collection>
-</block>
-<block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework api">
-<collection name="inputmethods_pub" long-name="Input Methods Public Interfaces" level="api">
-<component name="ptiengine_iti_api" long-name="PTI Engine API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
-</component>
-<component name="optical_character_recognition_api" long-name="Optical Character Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
-</component>
-<component name="input_language_info_api" long-name="Input Language Info API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
-</component>
-</collection>
-<collection name="inputmethods_plat" long-name="Input Methods Platform Interfaces" level="api">
-<component name="pen_input_server_api" long-name="Pen Input Server API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/group" filter="!test"/>
-</component>
-<component name="ptiengine_hwr_api" long-name="PTI Engine Handwriting Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group" filter="!test"/>
-</component>
-<component name="aknfep_settings_api" long-name="Avkon FEP Settings API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
-</component>
-<component name="aknfep_status_api" long-name="Avkon FEP Status API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
-</component>
-<component name="ptiengine_key_definations_api" long-name="PTI Engine Key Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
-</component>
-<component name="aknfep_definitions_api" long-name="Avkon FEP Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
-</component>
-<component name="aknfep_pen_support_api" long-name="Avkon FEP Pen Support API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
-</component>
-<component name="ptiengine_indic_definitions_api" long-name="PTI Engine Indic Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
-</component>
-<component name="aknfep_uiinterface_api" long-name="Avkon FEP UI Interface API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="textinput" long-name="Text Input" level="framework">
-<component name="ptienginev2" filter="s60" long-name="Predictive Text Input Engine">
-<!--uncomment when configuration is turned on and textinput_build is removed-->
-<!-- <unit bldFile="textinput/ptienginev2/group"/>-->
-</component>
-<component name="akninputlanguage" filter="s60" long-name="Avkon Input Language">
-<unit bldFile="mw/inputmethods/textinput/akninputlanguage/group"/>
-</component>
-<component name="peninputarc" filter="s60" long-name="Pen Input Arc">
-<unit bldFile="mw/inputmethods/textinput/peninputarc/group"/>
-</component>
-<component name="peninputcommonctrls" filter="s60" long-name="Pen Input Common Controls">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonctrls/group"/>
-</component>
-<component name="peninputcommonlayout" filter="s60" long-name="Pen Input Common Layout">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonlayout/group"/>
-</component>
-<component name="peninputhwrtrui" filter="s60" long-name="Pen Input Handwriting Recognition Training UI" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrtrui/group"/>
-</component>
-<component name="textinput_build" filter="s60" long-name="Text Input Build">
-<!--needed for #ifdef, can be removed when configuration is implemented -->
-<unit bldFile="mw/inputmethods/textinput/group"/>
-</component>
-</collection>
-<collection name="fep" long-name="FEP" level="engine">
-<component name="aknfep" filter="s60" long-name="Avkon FEP" plugin="Y">
-<unit bldFile="mw/inputmethods/fep/aknfep/group"/>
-</component>
-<component name="frontendprocessor" long-name="Front End Processor" purpose="mandatory">
-<unit bldFile="mw/inputmethods/fep/frontendprocessor/group" mrp="mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
-</component>
-</collection>
-<collection name="inputmethods_info" long-name="Input Methods Info" level="api">
-<component name="inputmethods_metadata" long-name="Input Methods Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="qt" level="generic" long-name="Qt" levels="tool mw app">
-<collection name="qtconf" long-name="Qt Config" level="tool">
-<component name="qt_deviceconfiguration" long-name="Qt Device Configuration" introduced="^2" class="config tool">
-<unit bldFile="mw/qt/src/s60installs/deviceconfiguration"/>
-</component>
-</collection>
-<collection name="qt_info" long-name="Qt Info" level="mw">
-<component name="qt_build" long-name="Qt Build" introduced="^2">
-<unit bldFile="mw/qt" proFile="projects.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-<collection name="qtdemos" long-name="Qt Demos" level="app">
-<component name="qtdemos_build" long-name="Qt Demos Build" introduced="^2" filter="qtdemos">
-<unit bldFile="mw/qt/demos" proFile="demos.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-<collection name="qtexamples" long-name="Qt Examples" level="app">
-<component name="qtexamples_build" long-name="Qt Examples Build" introduced="^2" filter="qtexamples">
-<unit bldFile="mw/qt/examples" proFile="examples.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-<collection name="qt_tests" long-name="Qt Tests" level="app">
-<component name="qttestsauto" long-name="Qt Automated Tests" introduced="^2" filter="qttestsauto">
-<unit bldFile="mw/qt/tests/auto" proFile="qtpauto.pro"/>
-</component>
-<component name="qttestsbenchmarks" long-name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks">
-<unit bldFile="mw/qt/tests/benchmarks" proFile="benchmarks.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-</block>
-<block name="qtextensions" level="generic" long-name="Qt Extensions" levels="tool mw app">
-<collection name="qtecomplugins" long-name="Qt ECom Plugins" level="app">
-<component name="qtecomplugins" filter="qtecomplugins" long-name="Qt ECom Plugin" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtecomplugins" proFile="qtecomplugins.pro" qmakeArgs="-r"/>
-</component>
-<component name="qtextensions_examples" filter="qtextensionsexamples" long-name="Qt ECom Plugin Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtecomplugins/examples" proFile="examples.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qthighway" long-name="Qt Highway" level="app">
-<component name="qthighway" filter="qthighway" long-name="Qt Highway" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qthighway" proFile="qthighway.pro" qmakeArgs="-r"/>
-</component>
-<component name="qthighway_examples" filter="qtextensionsexamples" long-name="Qt Highway Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qthighway/examples" qmakeArgs="-r"/>
-</component>
-<component name="qthighwaytests" filter="qtextensionstests" long-name="Qt Highway Tests" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qthighway/tests" proFile="tests.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qtmobileextensions" long-name="Qt Mobile Extensions" level="app">
-<component name="qtmobileextensions" filter="qtextension" long-name="Qt Mobile Extensions" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtmobileextensions" proFile="qtmobileextensions.pro" qmakeArgs="-r"/>
-</component>
-<component name="qtmobileextensions_examples" filter="qtextensionsexamples" long-name="Qt Mobile Extensions Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtmobileextensions/examples" proFile="examples.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qtmobility" long-name="Qt Mobility">
-<component name="qtmobility" filter="qtmobility" long-name="Qt Mobility" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtmobility" proFile="qtmobility.pro" qmakeArgs="-r"/>
-</component>
-<component name="qtmobility_examples" filter="qtextensionsexamples" long-name="Qt Mobility Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtmobility/examples" proFile="examples.pro" qmakeArgs="-r"/>
-</component>
-<component name="qtmobilitytests" filter="qtextensionstests" long-name="Qt Extensions Tests" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtmobility/tests" proFile="tests.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qtextensions_info">
-<component name="qtextensions_build" long-name="Qt Extensions Confgure" introduced="^4" class="conf">
-<unit bldFile="mw/qtextensions/group"/>
-</component>
-<component name="qtextensions_build" long-name="Qt Extensions Build" introduced="^4">
-<!-- break this up into the above collections-->
-<unit bldFile="mw/qtextensions" proFile="qtextensions.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</block>
-<block name="hb" level="generic" long-name="Orbit" levels="engine test api">
-<collection name="hb_info" long-name="Orbit Info" level="api">
-<component name="hb_build" long-name="Orbit Build" introduced="^4">
-<!-- should break this down into actual components -->
-<unit bldFile="mw/hb" proFile="hb.pro" qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
-</component>
-</collection>
-<collection name="hb_test" long-name="Orbit Test" level="test">
-<component name="hb_fute" filter="hb_fute_app" long-name="Fute" introduced="^4">
-<unit bldFile="mw/hb/tsrc/fute" proFile="fute.pro" qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
-</component>
-</collection>
-</block>
-<block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
-<collection name="classicui_plat" long-name="Classic UI Platform Interfaces" level="specific">
-<component name="personalisation_framework_api" long-name="Personalisation Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_framework_api/group" filter="!test"/>
-</component>
-<component name="signal_pane_api" long-name="Signal Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
-</component>
-<component name="japanese_reading_api" long-name="Japanese Reading API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/japanese_reading_api/group" filter="!test"/>
-</component>
-<component name="global_popup_priority_controller_api" long-name="Global Popup Priority Controller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
-</component>
-<component name="item_finder_api" long-name="Item Finder API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/item_finder_api/group" filter="!test"/>
-</component>
-<component name="avkon_fonts_api" long-name="Avkon Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_fonts_api/group" filter="!test"/>
-</component>
-<component name="extended_utilities_api" long-name="Extended Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
-</component>
-<component name="personalisation_plugin_api" long-name="Personalisation Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
-</component>
-<component name="extended_aiw_criteria_api" long-name="Extended AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="personalisation_application_api" long-name="Personalisation Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_application_api/group"/>
-</component>
-<component name="volume_popup_api" long-name="Volume Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
-</component>
-<component name="avkon_secondary_display_support_api" long-name="AVKON Secondary Display Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_support_api/group" filter="!test"/>
-</component>
-<component name="extended_setting_pages_api" long-name="Extended Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_setting_pages_api/group" filter="!test"/>
-</component>
-<component name="extended_lists_api" long-name="Extended Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_lists_api/group" filter="!test"/>
-</component>
-<component name="input_block_api" long-name="Input Block API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/input_block_api/group" filter="!test"/>
-</component>
-<component name="avkon_ui_server_api" long-name="AVKON UI Server API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_ui_server_api/group" filter="!test"/>
-</component>
-<component name="number_grouping_api" long-name="Number Grouping API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/number_grouping_api/group" filter="!test"/>
-</component>
-<component name="extended_status_pane_api" long-name="Extended Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_status_pane_api/group" filter="!test"/>
-</component>
-<component name="extended_notifiers_api" long-name="Extended Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notifiers_api/group" filter="!test"/>
-</component>
-<component name="task_list_api" long-name="Task List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
-</component>
-<component name="personalisation_slide_show_dialog_api" long-name="Personalisation Slide Show Dialog API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
-</component>
-<component name="key_event_utilities_api" long-name="Key Event Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_event_utilities_api/group"/>
-</component>
-<component name="emergency_call_support_api" long-name="Emergency Call Support API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/emergency_call_support_api/group" filter="!test"/>
-</component>
-<component name="extended_dialogs_api" long-name="Extended Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_dialogs_api/group"/>
-</component>
-<component name="legacy_ui_framework_headers_api" long-name="Legacy UI Framework Headers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/legacy_ui_framework_headers_api/group"/>
-</component>
-<component name="extended_editors_api" long-name="Extended Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_editors_api/group" filter="!test"/>
-</component>
-<component name="alarm_api" long-name="Alarm API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alarm_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_interface_base_api" long-name="AIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_base_api/group" filter="!test"/>
-</component>
-<component name="list_effects_api" long-name="List Effects API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/list_effects_api/group" filter="!test"/>
-</component>
-<component name="find_item_ui_api" long-name="Find Item UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/find_item_ui_api/group" filter="!test"/>
-</component>
-<component name="server_application_services_api" long-name="Server Application Services API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/server_application_services_api/group" filter="!test"/>
-</component>
-<component name="common_ui_settings_api" long-name="Common UI Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_ui_settings_api/group"/>
-</component>
-<component name="aiw_service_interface_menu_api" long-name="AIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_menu_api/group" filter="!test"/>
-</component>
-<component name="eikon_server_extension_client_api" long-name="EIKON Server Extension Client API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/eikon_server_extension_client_api/group" filter="!test"/>
-</component>
-<component name="skinnable_clock_api" long-name="Skinnable Clock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/skinnable_clock_api/group" filter="!test"/>
-</component>
-<component name="battery_pane_api" long-name="Battery Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/battery_pane_api/group" filter="!test"/>
-</component>
-<component name="fep_document_navigation_api" long-name="FEP Document Navigation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
-</component>
-<component name="personalisation_localised_texts_api" long-name="Personalisation Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
-</component>
-<component name="memory_card_ui_api" long-name="Memory Card UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
-</component>
-<component name="avkon_status_api" long-name="AVKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_status_api/group"/>
-</component>
-<component name="application_switching_api" long-name="Application Switching API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/application_switching_api/group" filter="!test"/>
-</component>
-<component name="avkon_localised_texts_api" long-name="AVKON Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_localised_texts_api/group"/>
-</component>
-<component name="avkon_secondary_display_api" long-name="AVKON Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_api/group"/>
-</component>
-<component name="extended_animation_api" long-name="Extended Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_notes_api" long-name="Extended Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_notes_api/group" filter="!test"/>
-</component>
-<component name="text_scroller_api" long-name="Text Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/text_scroller_api/group" filter="!test"/>
-</component>
-<component name="custom_cursors_api" long-name="Custom Cursors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/custom_cursors_api/group" filter="!test"/>
-</component>
-<component name="global_window_priorities_api" long-name="Global Window Priorities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/global_window_priorities_api/group"/>
-</component>
-<component name="extended_indicators_api" long-name="Extended Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_indicators_api/group" filter="!test"/>
-</component>
-<component name="special_character_table_api" long-name="Special Character Table API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/special_character_table_api/group" filter="!test"/>
-</component>
-<component name="avkon_settings_api" long-name="AVKON Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_settings_api/group"/>
-</component>
-<component name="extended_sounds_api" long-name="Extended Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_sounds_api/group"/>
-</component>
-<component name="themes_settings_api" long-name="Themes Settings API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/themes_settings_api/group"/>
-</component>
-<component name="media_shared_document_api" long-name="Media Shared Document API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/media_shared_document_api/group" filter="!test"/>
-</component>
-<component name="extended_queries_api" long-name="Extended Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_queries_api/group"/>
-</component>
-<component name="phone_number_text_utilities_api" long-name="Phone Number Text Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
-</component>
-<component name="extended_scroller_api" long-name="Extended Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_scroller_api/group"/>
-</component>
-<component name="key_rotator_api" long-name="Key Rotator API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/key_rotator_api/group" filter="!test"/>
-</component>
-<component name="extended_grids_api" long-name="Extended Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_grids_api/group" filter="!test"/>
-</component>
-<component name="generic_parameter_api" long-name="Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="indicator_touch_observer_api" long-name="Indicator Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_touch_observer_api/group"/>
-</component>
-<component name="popup_form_api" long-name="Popup Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/popup_form_api/group" filter="!test"/>
-</component>
-<component name="stylus_activated_popup_api" long-name="Stylus Activated Pop-up API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/stylus_activated_popup_api/group" filter="!test"/>
-</component>
-<component name="indicator_plugin_api" long-name="Indicator Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/indicator_plugin_api/group" filter="!test"/>
-</component>
-<component name="layout_configuration_api" long-name="Layout Configuration API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/layout_configuration_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_filter_factory_api" long-name="Common File Dialogs Filter Factory API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group" filter="!test"/>
-</component>
-<component name="avkon_anim_dll_api" long-name="AVKON Anim DLL API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_anim_dll_api/group"/>
-</component>
-<component name="extended_initialization_api" long-name="Extended Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_initialization_api/group" filter="!test"/>
-</component>
-<component name="long_tap_animation_api" long-name="Long Tap Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/long_tap_animation_api/group" filter="!test"/>
-</component>
-<component name="extended_ui_framework_definitions_api" long-name="Extended UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_ui_framework_definitions_api/group"/>
-</component>
-<component name="extended_buttons_api" long-name="Extended Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_buttons_api/group" filter="!test"/>
-</component>
-<component name="aiw_provider_utility_api" long-name="AIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/aiw_provider_utility_api/group" filter="!test"/>
-</component>
-<component name="transition_effect_parameters_api" long-name="Transition Effect Parameters API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_parameters_api/group" filter="!test"/>
-</component>
-<component name="extended_input_capabilities_api" long-name="Extended Input Capabilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_input_capabilities_api/group" filter="!test"/>
-</component>
-<component name="uikon_status_api" long-name="UIKON Status API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/uikon_status_api/group"/>
-</component>
-<component name="transition_effect_utilities_api" long-name="Transition Effect Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/transition_effect_utilities_api/group" filter="!test"/>
-</component>
-<component name="pointer_event_modifier_api" long-name="Pointer Event Modifier API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/pointer_event_modifier_api/group" filter="!test"/>
-</component>
-<component name="avkon_testability_api" long-name="AVKON Testability API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/avkon_testability_api/group"/>
-</component>
-<component name="ganes_api" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ganes_api/group"/>
-</component>
-<component name="ode_api" long-name="Ode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ode_api/group"/>
-</component>
-<component name="physics_api" long-name="Physics API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/physics_api/group"/>
-</component>
-<component name="touch_pane_api" long-name="Touch Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_api/group" filter="!test"/>
-</component>
-<component name="touch_pane_observer_api" long-name="Touch Pane Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_pane_observer_api/group"/>
-</component>
-<component name="alternate_fs_api" long-name="Alternate FS API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/alternate_fs_api/group"/>
-</component>
-<component name="discreet_popup_api" long-name="Discreet Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/discreet_popup_api/group"/>
-</component>
-<component name="touch_gesture_framework_api" long-name="Touch Gesture Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_gesture_framework_api/group"/>
-<!-- should this be commented out? -->
-<!--<unit bldFile="classicui_plat/touch_gesture_framework_api/tsrc/group" filter="test,api_test"/> -->
-</component>
-<component name="extended_options_menu_api" long-name="Extended Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
-</component>
-</collection>
-<collection name="classicui_pub" long-name="Classic UI Public Interfaces" level="specific">
-<component name="input_frame_api" long-name="Input Frame API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/input_frame_api/group" filter="!test"/>
-</component>
-<component name="window_server_event_observer_api" long-name="Window Server Event Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/window_server_event_observer_api/group" filter="!test"/>
-</component>
-<component name="application_framework_api" long-name="Application Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/application_framework_api/group" filter="!test"/>
-</component>
-<component name="scroller_api" long-name="Scroller API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/scroller_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_utilities_api" long-name="UI Framework Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_utilities_api/group" filter="!test"/>
-</component>
-<component name="ui_framework_definitions_api" long-name="UI Framework Definitions API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_definitions_api/group" filter="!test"/>
-</component>
-<component name="buttons_api" long-name="Buttons API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/buttons_api/group" filter="!test"/>
-</component>
-<component name="queries_api" long-name="Queries API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/queries_api/group" filter="!test"/>
-</component>
-<component name="aiw_generic_parameter_api" long-name="AIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_generic_parameter_api/group" filter="!test"/>
-</component>
-<component name="editors_api" long-name="Editors API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/editors_api/group" filter="!test"/>
-</component>
-<component name="common_file_dialogs_api" long-name="Common File Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/common_file_dialogs_api/group" filter="!test"/>
-</component>
-<component name="dialog_shutter_api" long-name="Dialog Shutter API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialog_shutter_api/group" filter="!test"/>
-</component>
-<component name="fonts_api" long-name="Fonts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/fonts_api/group" filter="!test"/>
-</component>
-<component name="screen_clearer_api" long-name="Screen Clearer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_clearer_api/group" filter="!test"/>
-</component>
-<component name="notifiers_api" long-name="Notifiers API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notifiers_api/group" filter="!test"/>
-</component>
-<component name="notes_api" long-name="Notes API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/notes_api/group" filter="!test"/>
-</component>
-<component name="status_pane_api" long-name="Status Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/status_pane_api/group" filter="!test"/>
-</component>
-<component name="base_controls_api" long-name="Base Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/base_controls_api/group" filter="!test"/>
-</component>
-<component name="grids_api" long-name="Grids API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/grids_api/group" filter="!test"/>
-</component>
-<component name="context_pane_api" long-name="Context Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/context_pane_api/group" filter="!test"/>
-</component>
-<component name="lists_api" long-name="Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/lists_api/group" filter="!test"/>
-</component>
-<component name="popups_api" long-name="Popups API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/popups_api/group" filter="!test"/>
-</component>
-<component name="misc_controls_api" long-name="Misc Controls API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/misc_controls_api/group" filter="!test"/>
-</component>
-<component name="keylock_api" long-name="Keylock API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/keylock_api/group" filter="!test"/>
-</component>
-<component name="options_menu_api" long-name="Options Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/options_menu_api/group" filter="!test"/>
-</component>
-<component name="hierarchical_lists_api" long-name="Hierarchical Lists API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hierarchical_lists_api/group" filter="!test"/>
-</component>
-<component name="navigation_pane_api" long-name="Navigation Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/navigation_pane_api/group" filter="!test"/>
-</component>
-<component name="tabs_api" long-name="Tabs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/tabs_api/group" filter="!test"/>
-</component>
-<component name="title_pane_touch_observer_api" long-name="Title Pane Touch Observer API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_touch_observer_api/group"/>
-</component>
-<component name="choice_list_api" long-name="Choice List API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/choice_list_api/group" filter="!test"/>
-</component>
-<component name="info_popup_note_api" long-name="Info Popup Note API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/info_popup_note_api/group" filter="!test"/>
-</component>
-<component name="setting_pages_api" long-name="Setting Pages API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/setting_pages_api/group" filter="!test"/>
-</component>
-<component name="screen_mode_api" long-name="Screen Mode API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/screen_mode_api/group" filter="!test"/>
-</component>
-<component name="indicators_api" long-name="Indicators API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/indicators_api/group" filter="!test"/>
-</component>
-<component name="error_ui_api" long-name="Error UI API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/error_ui_api/group" filter="!test"/>
-</component>
-<component name="animation_api" long-name="Animation API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/animation_api/group" filter="!test"/>
-</component>
-<component name="searchfield_api" long-name="Searchfield API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/searchfield_api/group" filter="!test"/>
-</component>
-<component name="labels_api" long-name="Labels API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/labels_api/group" filter="!test"/>
-</component>
-<component name="hotkeys_api" long-name="Hotkeys API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/hotkeys_api/group" filter="!test"/>
-</component>
-<component name="initialization_api" long-name="Initialization API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/initialization_api/group" filter="!test"/>
-</component>
-<component name="volume_control_api" long-name="Volume Control API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/volume_control_api/group" filter="!test"/>
-</component>
-<component name="title_pane_api" long-name="Title Pane API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_api/group" filter="!test"/>
-</component>
-<component name="sounds_api" long-name="Sounds API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/sounds_api/group" filter="!test"/>
-</component>
-<component name="aiw_service_handler_api" long-name="AIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_service_handler_api/group" filter="!test"/>
-</component>
-<component name="aiw_criteria_api" long-name="AIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_criteria_api/group" filter="!test"/>
-</component>
-<component name="touch_ui_utilities_api" long-name="Touch UI Utilities API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/touch_ui_utilities_api/group" filter="!test"/>
-</component>
-<component name="generic_button_api" long-name="Generic Button API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/generic_button_api/group" filter="!test"/>
-</component>
-<component name="form_api" long-name="Form API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/form_api/group" filter="!test"/>
-</component>
-<component name="uikon_core_controls" long-name="Uikon Core Controls" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/uikon_core_controls/group" filter="!test"/>
-</component>
-<component name="calendar_api" long-name="Calendar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/calendar_api/group"/>
-</component>
-<component name="toolbar_api" long-name="Toolbar API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/toolbar_api/group" filter="!test"/>
-</component>
-<component name="server_application_api" long-name="Server Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/server_application_api/group"/>
-</component>
-<component name="slider_api" long-name="Slider API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/slider_api/group" filter="!test"/>
-</component>
-<component name="private_ui_framework_api" long-name="Private UI Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/private_ui_framework_api/group" filter="!test"/>
-</component>
-<component name="dialogs_api" long-name="Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/dialogs_api/group" filter="!test"/>
-</component>
-<component name="document_handler_api" long-name="Document handler API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/document_handler_api/group"/>
-</component>
-<component name="images_api" long-name="Images API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/images_api/group" filter="!test"/>
-</component>
-<component name="stylus_popup_menu_api" long-name="Stylus Pop-up Menu API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/stylus_popup_menu_api/group" filter="!test"/>
-</component>
-<component name="information_preview_popup_api" long-name="Information Preview Popup API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/information_preview_popup_api/group" filter="!test"/>
-</component>
-<component name="intermediate_state_api" long-name="Intermediate State API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/intermediate_state_api/group"/>
-</component>
-<component name="help_launcher_api" long-name="Help Launcher API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/help_launcher_api/group"/>
-</component>
-</collection>
-<collection name="ode" long-name="Open Dynamics Engine" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="ode_build" filter="s60" long-name="ODE">
-<unit bldFile="mw/classicui/ode/group"/>
-</component>
-</collection>
-<collection name="uifw" long-name="UI Framework" level="server">
-<component name="uiklaf" filter="s60" long-name="Uikon Look-and-Feel">
-<unit bldFile="mw/classicui/uifw/uiklaf/group"/>
-</component>
-<component name="eikctl" filter="s60" long-name="Eikon Controls">
-<unit bldFile="mw/classicui/uifw/eikctl/group"/>
-</component>
-<component name="avkon" filter="s60" long-name="Avkon">
-<!-- can only have one unit. Split into 3 components, or #include all from same bld.inf -->
-<unit bldFile="mw/classicui/uifw/avkon/aknphysics/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/group"/>
-<unit bldFile="mw/classicui/uifw/avkon/aknconf/group"/>
-</component>
-<component name="eikstd" filter="s60" long-name="Eikon Standard">
-<unit bldFile="mw/classicui/uifw/eikstd/group"/>
-</component>
-<component name="aknglobalui" filter="s60" long-name="Avkon Global UI">
-<unit bldFile="mw/classicui/uifw/aknglobalui/group"/>
-</component>
-<component name="ganes" filter="s60" long-name="Ganes">
-<unit bldFile="mw/classicui/uifw/ganes/group"/>
-</component>
-</collection>
-<collection name="commonuis" long-name="Common UIs" level="specific">
-<component name="commonui" filter="s60" long-name="Common UI">
-<unit bldFile="mw/classicui/commonuis/commonui/group"/>
-</component>
-<component name="commondialogs" filter="s60" long-name="Common Dialogs">
-<unit bldFile="mw/classicui/commonuis/commondialogs/group"/>
-</component>
-</collection>
-<collection name="applicationinterworkingfw" long-name="Application Interworking Framework" level="generic">
-<component name="aifwservicehandler" filter="s60" long-name="Application Interworking Service Handler">
-<unit bldFile="mw/classicui/applicationinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-<collection name="psln" long-name="Personalization" level="specific">
-<!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
-<component name="psln_build" filter="s60" long-name="Personalization Build">
-<unit bldFile="mw/classicui/psln/group"/>
-</component>
-</collection>
-<collection name="commonadapter" long-name="Common Adapter" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="commonadapter_build" filter="s60" long-name="Common Adapter Build">
-<unit bldFile="mw/classicui/commonadapter/group"/>
-</component>
-</collection>
-<collection name="akntouchgesturefw" long-name="Avkon Touch Gesture Framework" level="generic">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="akntouchgesturefw_build" filter="s60" long-name="Avkon Touch Gesture Framework Build" introduced="^3">
-<unit bldFile="mw/classicui/akntouchgesturefw/group"/>
-</component>
-</collection>
-<collection name="uiutils" long-name="UI Utils" level="specific">
-<component name="localizer" filter="s60" long-name="Directory Localizer">
-<unit bldFile="mw/classicui/uiutils/localizer/group"/>
-</component>
-<component name="findutil" filter="s60" long-name="Find Utility">
-<unit bldFile="mw/classicui/uiutils/findutil/group"/>
-</component>
-<component name="gamerecognizer" filter="s60" long-name="Game Recognizer" plugin="Y">
-<unit bldFile="mw/classicui/uiutils/gamerecognizer/group"/>
-</component>
-<component name="aknjapanesereading" filter="s60" long-name="Avkon Japanese Reading">
-<unit bldFile="mw/classicui/uiutils/aknjapanesereading/group"/>
-</component>
-<component name="hlplch" long-name="Help Launcher" filter="s60,bldfirst">
-<unit bldFile="mw/classicui/uiutils/hlplch/group"/>
-</component>
-</collection>
-<collection name="commonuisupport" long-name="Common UI Support" level="support">
-<component name="uikon" long-name="Uikon" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uikon/group" mrp="mw/classicui/commonuisupport/uikon/group/app-framework_uikon.mrp"/>
-</component>
-<component name="errorresolverdata" long-name="Error Resolver Data" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/errorresolverdata/group" mrp="mw/classicui/commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
-</component>
-<component name="uilaf" long-name="UI Look and Feel" introduced="6.0" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uilaf/GROUP" mrp="mw/classicui/commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
-</component>
-<component name="grid" long-name="Grid" purpose="optional">
-<unit bldFile="mw/classicui/commonuisupport/grid/group" mrp="mw/classicui/commonuisupport/grid/group/app-framework_grid.mrp"/>
-</component>
-<component name="uifwsdocs" long-name="UI Frameworks Documentation" purpose="development" class="doc">
-<unit mrp="mw/classicui/commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
-</component>
-</collection>
-<collection name="lafagnosticuifoundation" long-name="Look-and-Feel Agnostic UI Foundation" level="base">
-<component name="cone" long-name="Control Environment" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/cone/group" mrp="mw/classicui/lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
-</component>
-<component name="graphicseffects" long-name="Graphics Effects" introduced="9.2" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/graphicseffects/group" mrp="mw/classicui/lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
-</component>
-<component name="uigraphicsutils" long-name="UI Graphics Utilities" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group" mrp="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
-</component>
-<component name="clockanim" long-name="Clock" purpose="optional" plugin="Y">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/clockanim/group" mrp="mw/classicui/lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
-</component>
-<component name="bmpanimation" long-name="BMP Animation" introduced="6.0" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/bmpanimation/group" mrp="mw/classicui/lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
-</component>
-<component name="animation" long-name="Animation" introduced="9.1" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/animation/group" mrp="mw/classicui/lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
-</component>
-</collection>
-<collection name="classicui_info" long-name="Classic UI Info" level="specific">
-<!-- the multiple units in the API test components need to be resolved -->
-<component name="classicui_metadata" long-name="Classic UI Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/classicui/classicui_info/classicui_metadata/classicui_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="svgt" level="generic" long-name="SVG Tiny" levels="util ui">
-<collection name="svgt_plat" long-name="SVG Tiny Platform Interfaces" level="ui">
-<component name="svgt_api" long-name="SVGT API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/svgt_api/group"/>
-</component>
-<component name="nvg_api" long-name="NVG API" introduced="9.2" filter="s60" class="api">
-<unit bldFile="mw/svgt/svgt_plat/nvg_api/group"/>
-</component>
-</collection>
-<collection name="svgtopt" long-name="SVG-T Engine" level="util">
-<component name="svgtopt_build" filter="s60" long-name="SVG Engine" introduced="9.2">
-<!-- component is at collection level. Needs to be moved down a directory -->
-<unit bldFile="mw/svgt/svgtopt/group"/>
-</component>
-<component name="svgtplugin" filter="s60" long-name="SVG Plugin" introduced="9.2" plugin="Y">
-<unit bldFile="mw/svgt/svgtopt/svgtplugin/group"/>
-</component>
-</collection>
-</block>
-<block name="uiaccelerator" level="generic" long-name="UI Accelerator" levels="plugin framework server ex if">
-<collection name="uiaccelerator_plat" long-name="UI Accelerator Platform Interfaces" level="if">
-<component name="alf_core_toolkit_api" long-name="ALF Core Toolkit API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/group"/>
-</component>
-<component name="alf_visual_api" long-name="ALF Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/group"/>
-</component>
-<component name="alf_extended_visual_api" long-name="ALF Extended Visual API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/group"/>
-</component>
-<component name="alf_extension_api" long-name="ALF Extension API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/group"/>
-</component>
-<component name="alf_tracing_api" long-name="ALF Tracing API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/group"/>
-</component>
-<component name="alf_client_server_api" long-name="ALF Client Server API" filter="s60" class="api">
-<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/group"/>
-</component>
-</collection>
-<collection name="uiacceltk" long-name="UI Accelerator Toolkit" level="framework">
-<component name="hitchcock" filter="s60" long-name="Hitchcock">
-<unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/group"/>
-</component>
-<component name="uiacceltk_build" filter="s60" long-name="UI Accelerator Toolkit Build">
-<!-- move into the other component, or remove the #include and make this UI Accelerator Toolkit ROM-->
-<unit bldFile="mw/uiaccelerator/uiacceltk/group"/>
-</component>
-</collection>
-<collection name="uiaccelerator_test" long-name="UI Accelerator Test" level="ex"/>
-</block>
-<block name="uiresources" level="generic" long-name="UI Resources" levels="compile plugin framework server generic data">
-<!-- are the custom filters below needed? -->
-<collection name="uiresources_pub" long-name="UI Resources Public Interfaces" level="data">
-<component name="pictograph_api" long-name="Pictograph API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/pictograph_api/group" filter="!test"/>
-</component>
-<component name="skins_api" long-name="Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/skins_api/group" filter="!test"/>
-</component>
-<component name="font_definition_api" long-name="Font Definition API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/font_definition_api/group" filter="!test"/>
-</component>
-<component name="graphics_api" long-name="Graphics API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/graphics_api/group" filter="!test"/>
-</component>
-<component name="scalable_icons_api" long-name="Scalable Icons API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/scalable_icons_api/group"/>
-</component>
-<component name="layout_id_definitions_api" long-name="Layout ID Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_pub/layout_id_definitions_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_plat" long-name="UI Resources Platform Interfaces" level="data">
-<component name="layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_system_private_api/group" filter="!test"/>
-</component>
-<component name="layout_data_api" long-name="Layout Data API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/layout_data_api/group" filter="!test"/>
-</component>
-<component name="cdl_api" long-name="CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/cdl_api/group" filter="!test"/>
-</component>
-<component name="extended_skins_api" long-name="Extended Skins API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_skins_api/group" filter="!test"/>
-</component>
-<component name="tfx_server_controller_plugin_api" long-name="TFX Server Controller Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_controller_plugin_api/group"/>
-</component>
-<component name="extended_fonts_api" long-name="Extended Fonts API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/extended_fonts_api/group" filter="!test"/>
-</component>
-<component name="graphic_configuration_api" long-name="Graphic Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/graphic_configuration_api/group" filter="!test"/>
-</component>
-<component name="mif_header_cdl_api" long-name="MIF Header CDL API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mif_header_cdl_api/group"/>
-</component>
-<component name="personalisation_and_skins_settings_api" long-name="Personalisation and Skins Settings API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/personalisation_and_skins_settings_api/group"/>
-</component>
-<component name="tfx_effect_setup_plugin_api" long-name="TFX Effect Setup Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_effect_setup_plugin_api/group"/>
-</component>
-<component name="mifconv_definitions_api" long-name="Mifconv Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/mifconv_definitions_api/group"/>
-</component>
-<component name="wallpaper_configuration_api" long-name="Wallpaper Configuration API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/wallpaper_configuration_api/group"/>
-</component>
-<component name="language_code_definitions_api" long-name="Language Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/language_code_definitions_api/group"/>
-</component>
-<component name="skins_image_attributes_api" long-name="Skins Image Attributes API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
-</component>
-<component name="private_user_area_code_definitions_api" long-name="Private User Area Code Definitions API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/private_user_area_code_definitions_api/group"/>
-</component>
-<component name="tfx_server_plugin_ids_api" long-name="TFX Server Plug-in IDs API" filter="s60" class="api">
-<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_plugin_ids_api/group"/>
-</component>
-</collection>
-<collection name="uiresources_info" long-name="UI Resources Info" level="data">
-<component name="uiresources_test" filter="s60,test,api_test" long-name="UI Resources Tests" purpose="development"/>
-</collection>
-<collection name="uigraphics" long-name="UI Graphics" level="generic">
-<component name="bitmaps2" filter="s60" long-name="Bitmaps 2" class="config">
-<unit bldFile="mw/uiresources/uigraphics/bitmaps2/group"/>
-</component>
-<component name="icons" filter="s60" long-name="Icons" class="config">
-<unit bldFile="mw/uiresources/uigraphics/icons/group"/>
-</component>
-<component name="variatedbitmaps" filter="s60" long-name="Variated Bitmaps" class="config">
-<unit bldFile="mw/uiresources/uigraphics/variatedbitmaps/group"/>
-</component>
-<component name="aknicon" filter="s60" long-name="Avkon Icon Framework">
-<unit bldFile="mw/uiresources/uigraphics/aknicon/group"/>
-</component>
-<component name="nvgrenderstage" filter="sf_build" long-name="NVG Render Stage">
-<unit bldFile="mw/uiresources/uigraphics/nvgrenderstage/group"/>
-</component>
-</collection>
-<collection name="layouts" long-name="Layouts" level="plugin">
-<component name="cdl" filter="s60" long-name="Customization Definition Language">
-<!-- can only have one unit. Need to #include them or split into multiple components -->
-<unit bldFile="mw/uiresources/layouts/cdl/cdlengine/group"/>
-<unit bldFile="mw/uiresources/layouts/cdl/cdlserver/group"/>
-</component>
-<component name="aknlayout2" filter="s60" long-name="Avkon Layout 2">
-<unit bldFile="mw/uiresources/layouts/aknlayout2/group"/>
-</component>
-</collection>
-<collection name="skins" long-name="Skins" level="data">
-<component name="aknskincontent" filter="s60" long-name="Avkon Skin Content" class="config">
-<unit bldFile="mw/uiresources/skins/aknskincontent/group"/>
-</component>
-<component name="aknskins" filter="s60" long-name="Avkon Skin Compiler">
-<unit bldFile="mw/uiresources/skins/aknskins/group"/>
-</component>
-</collection>
-<collection name="pictographs" long-name="Pictographs" level="data">
-<component name="aknpictograph" filter="s60" long-name="Avkon Pictograph">
-<unit bldFile="mw/uiresources/pictographs/aknpictograph/group"/>
-</component>
-</collection>
-<collection name="locales" long-name="Locales" level="framework">
-<component name="locales_build" filter="s60" long-name="Locales Build">
-<unit bldFile="mw/uiresources/locales/loce32"/>
-</component>
-</collection>
-<collection name="uiconfig" long-name="UI Config" level="server">
-<component name="s60config" filter="s60" long-name="S60 UI Config">
-<unit bldFile="mw/uiresources/uiconfig/s60config/group"/>
-</component>
-</collection>
-<collection name="fontsupport" long-name="Font Support" level="generic">
-<component name="fontprovider" filter="s60" long-name="Font Provider">
-<unit bldFile="mw/uiresources/fontsupport/fontprovider/group"/>
-</component>
-<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
- <component id="s60_fonts" filter="s60" name="S60 Fonts">
- <unit bldFile="fontsupport/fontutils/group"/>
- </component>
--->
-<component name="fontutils" filter="sf_build" long-name="Font Utils">
-<unit bldFile="mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
-</component>
-</collection>
-<collection name="helpthemes" long-name="Help Themes" level="data">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helpthemes_build" filter="s60" long-name="Help Themes Build" class="config">
-<unit bldFile="mw/uiresources/helpthemes/group"/>
-</component>
-</collection>
-</block>
-<block name="hapticsservices" level="generic" long-name="Haptics Services" levels="fw server api">
-<collection name="hapticsservices_plat" long-name="Haptics Services Platform Interfaces" level="api">
-<component name="tacticon_api" long-name="Tacticon API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tacticon_api/group"/>
-</component>
-<component name="tactile_feedback_core_api" long-name="Tactile Feedback Core API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_core_api/group"/>
-</component>
-<component name="tactile_feedback_server_api" long-name="Tactile Feedback Server API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_server_api/group"/>
-</component>
-</collection>
-<collection name="hapticsservices_pub" long-name="Haptics Services Public Interfaces" level="api">
-<component name="tactile_feedback_client_api" long-name="Tactile Feedback Client API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/hapticsservices/hapticsservices_pub/tactile_feedback_client_api/group"/>
-</component>
-</collection>
-<collection name="tacticonserver" long-name="Tacticon Server" level="server">
-<!-- collection is really a component. Move down a directory -->
-<component name="tacticonserver_build" filter="s60" long-name="Tacticon Server Build" introduced="^3">
-<unit bldFile="mw/hapticsservices/tacticonserver/group"/>
-<!-- clients and servers are suauly the same component. Consider moving pluign to a separate component if needed -->
-</component>
-</collection>
-<collection name="tactilefeedback" long-name="Tactile Feedback" level="fw">
-<component name="tactilearearegistry" filter="s60" long-name="Tactile Area Registry" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilearearegistry/group"/>
-</component>
-<component name="tactilefeedbackresolver" filter="s60" long-name="Tactile Feedback Resolver" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackresolver/group"/>
-</component>
-<component name="tactileclickplugin" filter="s60" long-name="Tactile Click Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileclickplugin/group"/>
-</component>
-<component name="tactilefeedbackclient" filter="s60" long-name="Tactile Feedback Client" introduced="^1">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackclient/group"/>
-</component>
-<component name="tactileactionplugin" filter="s60" long-name="Tactile Action Plugin" introduced="^1" plugin="Y">
-<unit bldFile="mw/hapticsservices/tactilefeedback/tactileactionplugin/group"/>
-</component>
-<component name="tactilefeedback_build" filter="s60" long-name="Tactile Feedback Build" introduced="^1">
-<!-- consider moving IBY to one fo the above components -->
-<unit bldFile="mw/hapticsservices/tactilefeedback/group"/>
-</component>
-</collection>
-</block>
-<block name="platformthemes" level="specific" long-name="Platform Themes" levels="framework generic ui">
-<collection name="platformthemes_info" long-name="Platform Themes Info">
-<component name="platformthemes_build" long-name="Platform Themes Build">
-<!-- no real structure in this package. Should break into collections / components -->
-<unit bldFile="mw/platformthemes" proFile="platformthemes.pro"/>
-</component>
-</collection>
-</block>
-<block name="gsprofilesrv" level="generic" long-name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
-<collection name="gsprofilesrv_pub" long-name="GS and Profiles Services Public Interfaces" level="specific">
-<component name="profiles_engine_active_profile_settings_api" long-name="Profiles Engine Active Profile Settings API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_active_profile_settings_api/group"/>
-</component>
-<component name="profiles_engine_wrapper_api" long-name="Profiles Engine Wrapper API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_wrapper_api/group"/>
-</component>
-</collection>
-<collection name="gsprofilesrv_plat" long-name="GS and Profiles Services Platform Interfaces" level="specific">
-<component name="ftuwizardmodel_api" long-name="FTU Wizard Model API" filter="bldfirst,s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/ftuwizardmodel_api" proFile="ftuwizardmodel_api.pro" qmakeArgs="-r -config rom"/>
-</component>
-<component name="profiles_engine_api" long-name="Profiles Engine API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_engine_api/group"/>
-</component>
-<component name="settings_backgroundimage_api" long-name="Settings Background Image API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_backgroundimage_api/group"/>
-</component>
-<component name="settings_framework_api" long-name="Settings Framework API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_framework_api/group"/>
-</component>
-<component name="settings_launch_api" long-name="Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_launch_api/group"/>
-</component>
-<component name="settings_listbox_api" long-name="Settings List Box API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_listbox_api/group"/>
-</component>
-<component name="settings_plugin_api" long-name="Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_plugin_api/group"/>
-</component>
-<component name="settings_uis_cenrep_collection_api" long-name="Settings UIs CenRep Collection API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
-</component>
-</collection>
-<collection name="gssettingsuis" long-name="General Settings UIs" level="framework">
-<component name="gs" filter="s60" long-name="General Settings" introduced="9.2">
-<unit bldFile="mw/gsprofilesrv/gssettingsuis/gs/group"/>
-</component>
-</collection>
-<collection name="ftuwizardmodel" long-name="FTU Wizard Model" level="generic">
-<component name="ftuwizardmodel_build" long-name="FTU Wizardmodel Build" filter="bldfirst">
-<unit bldFile="mw/gsprofilesrv/ftuwizardmodel" proFile="ftuwizardmodel.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-<collection name="controlpanel" long-name="Control Panel" level="generic">
-<component name="controlpanel_build" long-name="Control Panel Build">
-<unit bldFile="mw/gsprofilesrv/controlpanel" proFile="controlpanel.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-<collection name="profilesservices" long-name="Profiles Services" level="server">
-<component name="profileengine" filter="s60" long-name="Profile Engine" introduced="9.1">
-<unit bldFile="mw/gsprofilesrv/profilesservices/profileengine/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreensrv" level="specific" long-name="Home Screen Services" levels="plugin framework server generic specific">
-<collection name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" level="specific">
-<component name="action_handler_plugin_api" long-name="Action Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/group" filter="!test"/>
-</component>
-<component name="content_harvester_plugin_api" long-name="Content Harvester Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/group" filter="!test"/>
-</component>
-<component name="menu_sat_interface_api" long-name="Menu SAT Interface API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/group" filter="!test"/>
-</component>
-<component name="sapi_contentpublishing" long-name="SAPI Content Publishing" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing/group"/>
-</component>
-<component name="sapi_actionhandler" long-name="SAPI Action Handler" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_actionhandler/group"/>
-</component>
-</collection>
-<collection name="contentpublishingsrv" long-name="Content Publishing Service" level="server">
-<component name="contentpublishingdebug" filter="s60" long-name="Content Publishing Debug">
-<!-- need to move this component outside of contentpublishingutils and into separate component directory -->
-<!-- <unit bldFile="contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/> -->
-</component>
-<component name="contentpublishingutils" filter="s60" long-name="Content Publishing Utils">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingutils/group"/>
-</component>
-<component name="contentpublishingserver" filter="s60" long-name="Content Publishing Server">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingserver/group"/>
-</component>
-<component name="contentharvester" filter="s60" long-name="Content Harvester">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
-</component>
-<component name="contentpublishingsrv_build" filter="s60" long-name="Content Publishing Service Build">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/group"/>
-</component>
-</collection>
-</block>
-<block name="homescreensrvlegacy" level="generic" long-name="Legacy Home Screen Services" levels="plugin framework server generic specific">
-<collection name="homescreensrvlegacy_plat" long-name="Legacy Home Screen Services Platform Interfaces" level="specific">
-<component name="ai_content_model_api" long-name="AI Content Model API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrvlegacy/ai_content_model_api/group" proFile="group.pro"/>
-</component>
-<component name="ai_plugin_information_api" long-name="AI Plug-in Information API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrvlegacy/ai_plugin_information_api/group" proFile="group.pro"/>
-</component>
-</collection>
-</block>
-<block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
-<collection name="appinstall_plat" long-name="Application Installation Platform Interfaces" level="api">
-<component name="iaupdate_api" long-name="IA Update API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/iaupdate_api/group"/>
-</component>
-<component name="task_plugin_api" long-name="Task Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_plugin_api/group"/>
-</component>
-<component name="sw_installer_common_ui_api" long-name="SW Installer Common UI API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_common_ui_api/group"/>
-</component>
-<component name="sw_installer_launcher_api" long-name="SW Installer Launcher API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_launcher_api/group"/>
-</component>
-<component name="task_management_api" long-name="Task Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/task_management_api/group"/>
-</component>
-<component name="sw_installer_ui_plugin_api" long-name="SW Installer UI Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ui_plugin_api/group"/>
-</component>
-<component name="sw_installer_cr_keys" long-name="SW Installer CR Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_cr_keys/group"/>
-</component>
-<component name="sw_installer_ps_keys" long-name="SW Installer PS Keys" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
-</component>
-<component name="appmngr2runtimeapi" long-name="Application Manager 2 Runtime Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
-</component>
-<component name="sifui_api" long-name="STIF UI API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/sifui_api/group"/>
-</component>
-</collection>
-<collection name="appinstall_pub" long-name="Application Installation Public Interfaces" level="api">
-<component name="startup_list_management_api" long-name="Startup List Management API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
-</component>
-</collection>
-<collection name="ncdengine" long-name="Nokia Content Discover" level="framework">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="ncdengine_engine" filter="s60" long-name="NCD Engine" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/engine/group"/>
-</component>
-<component name="debuglogger" filter="s60" long-name="NCD Debug Logger" introduced="^1" class="placeholder">
-<!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
-</component>
-<component name="ncdengine_build" filter="s60" long-name="NCD Build" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/group"/>
-</component>
-</collection>
-<collection name="appinstaller" long-name="Application Installer" level="generic">
-<component name="appinstui" filter="s60" long-name="Application Installer UI" introduced="^2">
-<unit bldFile="mw/appinstall/appinstaller/appinstui/group"/>
-</component>
-</collection>
-<collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="api">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="iaupdateapi_stub_build" long-name="IA Update API Stub Build" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdateapi_stub/group"/>
-</component>
-</collection>
-<collection name="iaupdate" long-name="Independent Apps Update" level="api">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="iad" long-name="Software Update" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/iad/group"/>
-</component>
-<component name="iaupdate_help" filter="s60" long-name="IA Update Help" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/help/group"/>
-</component>
-<component name="iaupdate_build" filter="s60" long-name="IA Update Build" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/group"/>
-</component>
-</collection>
-<collection name="installationservices" long-name="Installation Services" level="generic">
-<component name="swi" long-name="Secure Software Install" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swi/group" mrp="mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
-</component>
-<component name="swidevicetools" long-name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
-<unit bldFile="mw/appinstall/installationservices/swidevicetools/group" mrp="mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
-</component>
-<component name="swcomponentregistry" long-name="Software Component Registry" introduced="^4" purpose="mandatory">
-<unit bldFile="mw/appinstall/installationservices/swcomponentregistry/group" mrp="mw/appinstall/installationservices/swcomponentregistry/group/security_softwarecomponentregistry.mrp"/>
-</component>
-<component name="swinstallationfw" long-name="Software Installation Framework" introduced="^4" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swinstallationfw/group" mrp="mw/appinstall/installationservices/swinstallationfw/group/security_softwareinstallframework.mrp"/>
-</component>
-<component name="swtransactionservices" long-name="Software Transaction Services" introduced="^4" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swtransactionservices/group" mrp="mw/appinstall/installationservices/swtransactionservices/group/security_softwaretransactionservices.mrp"/>
-</component>
-<component name="refswinstallationplugin" long-name="Reference Software Installation Plugin" introduced="^4" purpose="development" plugin="Y">
-<unit bldFile="mw/appinstall/installationservices/refswinstallationplugin/group" mrp="mw/appinstall/installationservices/refswinstallationplugin/group/security_sifrefplugin.mrp"/>
-</component>
-<component name="refsoftwareappmgr" long-name="Reference Software Application Manager" introduced="^4" purpose="development">
-<unit bldFile="mw/appinstall/installationservices/refsoftwareappmgr/group" mrp="mw/appinstall/installationservices/refsoftwareappmgr/group/security_referenceapplicationmanager.mrp"/>
-</component>
-<component name="swiconfig" long-name="Software Install Config" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appinstall/installationservices/swiconfig/group" mrp="mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
-</component>
-</collection>
-<collection name="secureswitools" long-name="Secure Software Install Tools" level="tool">
-<component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/makekeys/group" mrp="mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
-</component>
-<component name="swianalysistoolkit" long-name="SWI Analysis Toolkit" purpose="development" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
-</component>
-<component name="openssllib" long-name="OpenSSL Library" purpose="optional" class="PC">
-<unit mrp="mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
-</component>
-<component name="swisistools" long-name="Secure Software Install SIS Tools" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/swisistools/group" mrp="mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
-</component>
-</collection>
-<collection name="appinstall_info" long-name="Application Installation Info" level="api">
-<component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="serviceapifw" level="specific" long-name="Service API Framework" levels="plugin framework server generic specific">
-<collection name="serviceapifw_pub" long-name="Service API Framework Public Interfaces" level="specific"/>
-<collection name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" level="specific">
-<component name="rtsecuritymanager_common_api" long-name="Runtime Security Manager Common API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/group"/>
-</component>
-<component name="rtsecuritymanager_utility_api" long-name="Runtime Security Manager Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
-</component>
-<component name="rtsecuritymanager_client_api" long-name="Runtime Security Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/group"/>
-</component>
-<component name="liw_provider_utility_api" long-name="LIW Provider Utility API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_provider_utility_api/group"/>
-</component>
-<component name="liw_service_interface_base_api" long-name="LIW Service Interface Base API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_base_api/group"/>
-</component>
-<component name="liw_service_interface_menu_api" long-name="LIW Service Interface Menu API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_menu_api/group"/>
-</component>
-<component name="liw_criteria_api" long-name="LIW Criteria API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_criteria_api/group"/>
-</component>
-<component name="liw_generic_parameter_api" long-name="LIW Generic Parameter API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_generic_parameter_api/group"/>
-</component>
-<component name="liw_service_handler_api" long-name="LIW Service Handler API" filter="s60" class="api">
-<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_handler_api/group"/>
-</component>
-</collection>
-<collection name="rtsecuritymanager" long-name="Runtime Security Manager" level="server">
-<component name="rtsecuritymanagerutil" filter="s60" long-name="Runtime Security Manager Util">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
-</component>
-<component name="rtsecuritymanagerserver" filter="s60" long-name="Runtime Security Manager Server">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/>
-</component>
-<component name="rtsecuritymanagerclient" filter="s60" long-name="Runtime Security Manager Client">
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/>
-</component>
-<component name="rtsecuritymanager_build" filter="s60" long-name="Runtime Security Manager Build">
-<!-- Move the export to the appropriate components, or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapifw/rtsecuritymanager/group"/>
-</component>
-</collection>
-<collection name="languageinterworkingfw" long-name="Language Interworking Framework" level="framework">
-<component name="lifwservicehandler" filter="s60" long-name="Service Handler">
-<unit bldFile="mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-</block>
-<block name="serviceapi" level="specific" long-name="Service API" levels="os mw1 mw2 app">
-<!-- should break up this collection into something meaningful -->
-<collection name="serviceproviders" long-name="Service Providers" level="mw1">
-<component name="sapi_contacts_vpbk" long-name="Contacts Phonebook SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
-</component>
-<component name="sapi_location" long-name="Location SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_location/group"/>
-</component>
-<component name="sapi_mediamanagement" long-name="Media Management SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/group"/>
-</component>
-<component name="sapi_landmarks" long-name="Landmarks SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
-</component>
-<component name="sapi_messaging" long-name="Messaging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/group"/>
-</component>
-<component name="sapi_applicationmanager" long-name="Application Manager SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
-</component>
-<component name="sapi_calendar" long-name="Calendar SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_calendar/group"/>
-</component>
-<component name="sapi_logging" long-name="Logging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_logging/group"/>
-</component>
-<component name="sapi_sensor" long-name="Sensor SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sensor/group"/>
-</component>
-<component name="sapi_sysinfo" long-name="Sysinfo SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_sysinfo/group"/>
-</component>
-<component name="sapi_serviceregistry" long-name="Service Registry SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
-</component>
-<component name="jsapi" long-name="Javascript API" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/jsapi/group"/>
-</component>
-<component name="serviceproviders_build" filter="s60" long-name="Service API Build">
-<!-- distribute the exports or make this a ROM component by removing the #includes -->
-<unit bldFile="mw/serviceapi/serviceproviders/group"/>
-</component>
-</collection>
-</block>
-<block name="web" level="specific" long-name="Web" levels="plugin utils server generic specific">
-<collection name="web_pub" long-name="Web Public Interfaces" level="specific">
-<component name="browser_control_api" long-name="Browser Control API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_control_api/group"/>
-</component>
-<component name="download_mgr_client_api" long-name="Download Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_client_api/group"/>
-</component>
-<component name="download_mgr_ui_api" long-name="Download Manager UI Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/download_mgr_ui_api/group"/>
-</component>
-<component name="favourites_engine_api" long-name="Favourites Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/favourites_engine_api/group"/>
-</component>
-<component name="browser_plugin_api" long-name="Browser Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/browser_plugin_api/group"/>
-</component>
-<component name="settings_api" long-name="Settings API" filter="s60" class="api">
-<unit bldFile="mw/web/web_pub/settings_api/group"/>
-</component>
-</collection>
-<collection name="web_plat" long-name="Web Platform Interfaces" level="specific">
-<component name="aiw_browser_provider_api" long-name="AIW Browser Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/aiw_browser_provider_api/group"/>
-</component>
-<component name="browser_dialogs_provider_api" long-name="Browser Dialogs Provider API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_dialogs_provider_api/group"/>
-</component>
-<component name="browser_platform_api" long-name="Browser Platform API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/browser_platform_api/group"/>
-</component>
-<component name="cod_handler_api" long-name="COD Handler API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cod_handler_api/group"/>
-</component>
-<component name="connection_manager_api" long-name="Connection Manager API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/connection_manager_api/group"/>
-</component>
-<component name="cxml_library_api" long-name="cXml Library API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/cxml_library_api/group"/>
-</component>
-<component name="download_mgr_client_api_extn" long-name="Download Manager Client API Extension" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/download_mgr_client_api_extn/group"/>
-</component>
-<component name="download_path_plugin_api" long-name="Download Path Plugin API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/web/web_plat/download_path_plugin_api/group"/>
-</component>
-<component name="feeds_engine_api" long-name="Feeds Engine API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/feeds_engine_api/group"/>
-</component>
-<component name="launcher_api" long-name="Launcher API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/launcher_api/group"/>
-</component>
-<component name="multipart_parser_api" long-name="Multipart Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/multipart_parser_api/group"/>
-</component>
-<component name="recent_url_store_api" long-name="Recent URL Store API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/recent_url_store_api/group"/>
-</component>
-<component name="scheme_handler_plugin_api" long-name="Scheme Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scheme_handler_plugin_api/group"/>
-</component>
-<component name="scriptable_plugin_api" long-name="Scriptable Plugin API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/scriptable_plugin_api/group"/>
-</component>
-<component name="webutils_api" long-name="Web Utils API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/webutils_api/group"/>
-</component>
-<component name="widget_registry_api" long-name="Widget Registry API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/widget_registry_api/group"/>
-</component>
-<component name="xml_parser_api" long-name="XML Parser API" filter="s60" class="api">
-<unit bldFile="mw/web/web_plat/xml_parser_api/group"/>
-</component>
-</collection>
-<collection name="web_info" long-name="Web Info" level="specific">
-<component name="web_build" filter="s60" long-name="Web Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/group"/>
-</component>
-</collection>
-<collection name="browserutilities" long-name="Browser Utilities" level="utils">
-<component name="browserdialogsprovider" filter="s60" long-name="Browser Dialogs Provider">
-<unit bldFile="mw/web/browserutilities/browserdialogsprovider/group"/>
-</component>
-<component name="recenturlstore" filter="s60" long-name="Recent URL Store">
-<unit bldFile="mw/web/browserutilities/recenturlstore/group"/>
-</component>
-<component name="xmlparser" filter="s60" long-name="XML Interface">
-<unit bldFile="mw/web/browserutilities/xmlparser/group"/>
-</component>
-<component name="cxmllibrary" filter="s60" long-name="XML Parser Implementation">
-<unit bldFile="mw/web/browserutilities/cxmllibrary/group"/>
-</component>
-<component name="downloadmgr" filter="s60" long-name="Download Manager">
-<unit bldFile="mw/web/browserutilities/downloadmgr/group"/>
-</component>
-<component name="connectionmanager" filter="s60" long-name="Connection Manager">
-<unit bldFile="mw/web/browserutilities/connectionmanager/group"/>
-</component>
-<component name="browsertelservice" filter="s60" long-name="Browser Telephony Service">
-<unit bldFile="mw/web/browserutilities/browsertelservice/group"/>
-</component>
-<component name="favouritesengine" filter="s60" long-name="Favourites Engine">
-<unit bldFile="mw/web/browserutilities/favouritesengine/group"/>
-</component>
-<component name="feedsengine" filter="s60" long-name="Feeds Engine">
-<unit bldFile="mw/web/browserutilities/feedsengine/group"/>
-</component>
-<component name="multipartparser" filter="s60" long-name="Multipart Parser">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
-<!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
-</component>
-<component name="schemehandler" filter="s60" long-name="Scheme Handler">
-<unit bldFile="mw/web/browserutilities/schemehandler/group"/>
-</component>
-<component name="webutils" filter="s60" long-name="Web Utils">
-<unit bldFile="mw/web/browserutilities/webutils/group"/>
-</component>
-<component name="aiwbrowserprovider" filter="s60" long-name="AIW Browser Provider" plugin="Y">
-<unit bldFile="mw/web/browserutilities/aiwbrowserprovider/group"/>
-</component>
-<component name="browserutilities_build" filter="s60" long-name="Browser Utilities Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/browserutilities/group"/>
-</component>
-</collection>
-<collection name="webengine" long-name="Web Engine" level="server">
-<component name="osswebengine" filter="s60" long-name="OSS Web Engine">
-<!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
-<unit bldFile="mw/web/webengine/osswebengine/cache/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/memorymanager/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/npscript/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group"/>
-<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group/javascriptcore"/>
-</component>
-<component name="webkitutils" filter="s60" long-name="WebKit Utils">
-<unit bldFile="mw/web/webengine/webkitutils/group"/>
-</component>
-<component name="pagescaler" filter="s60" long-name="Page Scaler">
-<unit bldFile="mw/web/webengine/pagescaler/group"/>
-</component>
-<component name="webwidgetinstaller" filter="s60" long-name="Widget Installer">
-<unit bldFile="mw/web/webengine/widgetinstaller/group"/>
-</component>
-<component name="widgetregistry" filter="s60" long-name="Widget Registry">
-<unit bldFile="mw/web/webengine/widgetregistry/group"/>
-</component>
-<component name="wmlengine" filter="s60" long-name="WML Engine">
-<unit bldFile="mw/web/webengine/wmlengine/group"/>
-</component>
-<component name="device" filter="s60" long-name="Device">
-<!-- this needs a more meaningful name -->
-<unit bldFile="mw/web/webengine/device/group"/>
-</component>
-<component name="widgetengine" filter="s60" long-name="Widget Engine">
-<unit bldFile="mw/web/webengine/widgetengine/group"/>
-</component>
-<component name="web_memoryplugin" long-name="Memory Plugin" filter="s60" plugin="Y">
-<unit bldFile="mw/web/webengine/memoryplugin/group"/>
-</component>
-<component name="widgetmemoryplugin" filter="s60" long-name="Widget Memory Plugin" plugin="Y">
-<unit bldFile="mw/web/webengine/widgetmemoryplugin/group"/>
-</component>
-<component name="widgetbackuprestore" filter="s60" long-name="Widget Backup and Restore">
-<unit bldFile="mw/web/webengine/widgetbackuprestore/group"/>
-</component>
-<component name="browserrecognizers" filter="s60" long-name="Browser Recognizers" plugin="Y">
-<unit bldFile="mw/web/webengine/browserrecognizers/group"/>
-</component>
-<component name="wrtharvester" filter="s60" long-name="Web Runtime Harvester" plugin="Y">
-<unit bldFile="mw/web/webengine/wrtharvester/group"/>
-</component>
-</collection>
-<collection name="codhandler" long-name="Content Object Descriptor Handler" level="specific">
-<component name="codeng" filter="s60" long-name="COD Engine">
-<unit bldFile="mw/web/codhandler/codeng/group"/>
-</component>
-<component name="codui" filter="s60" long-name="COD UI">
-<unit bldFile="mw/web/codhandler/codui/group"/>
-</component>
-<component name="codrecog" filter="s60" long-name="COD Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/codrecog/group"/>
-</component>
-<component name="codviewer" filter="s60" long-name="COD Viewer">
-<unit bldFile="mw/web/codhandler/codviewer/group"/>
-</component>
-<component name="ddrecog" filter="s60" long-name="Download Descriptor Recogniser" plugin="Y">
-<unit bldFile="mw/web/codhandler/ddrecog/group"/>
-</component>
-<component name="ddviewer" filter="s60" long-name="Download Descriptor Viewer">
-<unit bldFile="mw/web/codhandler/ddviewer/group"/>
-</component>
-<component name="coddownload" filter="s60" long-name="COD Download">
-<unit bldFile="mw/web/codhandler/coddownload/group"/>
-</component>
-<component name="roapapp" filter="s60" long-name="ROAP Application">
-<unit bldFile="mw/web/codhandler/roapapp/group"/>
-</component>
-<component name="codhandler_build" filter="s60" long-name="COD Handler Build">
-<!-- Exports need to go into another component or make this self-contained.
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/codhandler/group"/>
-</component>
-</collection>
-<collection name="widgets" long-name="Web Widget Framework" level="generic">
-<!-- the following units can be uncommented when configuration is put in place -->
-<component name="widgetrecognizer" filter="s60" long-name="Widget Recognizer" plugin="Y">
-<!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
-</component>
-<component name="widgetinstaller" filter="s60" long-name="Widget Installer UI" plugin="Y">
-<!--<unit bldFile="widgets/widgetinstaller/group"/>-->
-</component>
-<component name="widgetlauncher" filter="s60" long-name="Widget Launcher">
-<!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
-</component>
-<component name="widgetapp" filter="s60" long-name="Widget UI">
-<!--<unit bldFile="widgets/widgetapp/group"/>-->
-</component>
-<component name="widgetsidchecker" filter="s60" long-name="Widget SID Checker" introduced="^3">
-<!--<unit bldFile="widgets/widgetsidchecker/group"/>-->
-</component>
-<component name="widgetpreinstaller" filter="s60" long-name="Widget Pre-Installer">
-<!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
-</component>
-<component name="widgetstartup" filter="s60" long-name="Widget Startup">
-<!--<unit bldFile="widgets/widgetstartup/group"/>-->
-</component>
-<component name="widgets_build" filter="s60" long-name="Widgets Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/widgets/group"/>
-</component>
-</collection>
-</block>
-<block name="websrv" level="generic" long-name="Web Services" levels="plugin framework server generic specific">
-<collection name="websrv_pub" long-name="Web Services Public Interfaces" level="specific">
-<component name="web_service_description_api" long-name="Web Service Description API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_description_api/group"/>
-</component>
-<component name="web_service_connection_api" long-name="Web Service Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/group"/>
-</component>
-<component name="web_service_manager_api" long-name="Web Service Manager API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/group"/>
-</component>
-<component name="hostlet_connection_api" long-name="Hostlet Connection API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/group"/>
-</component>
-<component name="web_service_messaging_api" long-name="Web Service Messaging API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/group"/>
-</component>
-<component name="xml_extensions_api" long-name="XML Extensions API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/group"/>
-</component>
-<component name="xml_fragment_api" long-name="XML Fragment API" filter="s60" class="api">
-<unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/group"/>
-</component>
-</collection>
-<collection name="webservices" long-name="Web Services Framework" level="generic">
-<!-- consider breaking this collection into more meaningful subsets -->
-<component name="wsnotifierplugins" filter="s60" long-name="WS Notifier Plugins" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsnotifierplugins/group"/>
-</component>
-<component name="wslogger" filter="s60" long-name="WS Logger">
-<unit bldFile="mw/websrv/webservices/wslogger/group"/>
-</component>
-<component name="wsxml" filter="s60" long-name="WS XML Extensions">
-<unit bldFile="mw/websrv/webservices/wsxml/group"/>
-</component>
-<component name="wsutils" filter="s60" long-name="WS Utils">
-<unit bldFile="mw/websrv/webservices/wsutils/group"/>
-</component>
-<component name="wsfragment" filter="s60" long-name="WS Fragment">
-<unit bldFile="mw/websrv/webservices/wsfragment/group"/>
-</component>
-<component name="wsdescription" filter="s60" long-name="WS Service Description">
-<unit bldFile="mw/websrv/webservices/wsdescription/group"/>
-</component>
-<component name="wsconnection" filter="s60" long-name="WS Service Connection">
-<unit bldFile="mw/websrv/webservices/wsconnection/group"/>
-</component>
-<component name="wsmessages" filter="s60" long-name="WS Messages">
-<unit bldFile="mw/websrv/webservices/wsmessages/group"/>
-</component>
-<component name="wscredentialmanager" filter="s60" long-name="WS Credential Manager">
-<unit bldFile="mw/websrv/webservices/wscredentialmanager/group"/>
-</component>
-<component name="wsframework" filter="s60" long-name="WS Framework">
-<unit bldFile="mw/websrv/webservices/wsframework/group"/>
-</component>
-<component name="wshttpchanneltransportplugin" filter="s60" long-name="WS HTTP Channel Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshttpchanneltransportplugin/group"/>
-</component>
-<component name="wsconnectionagent" filter="s60" long-name="WS Connection Agent">
-<unit bldFile="mw/websrv/webservices/wsconnectionagent/group"/>
-</component>
-<component name="wsprovider" filter="s60" long-name="WS Provider">
-<unit bldFile="mw/websrv/webservices/wsprovider/group"/>
-</component>
-<component name="wshostletconnection" filter="s60" long-name="WS Hostlet Connection">
-<unit bldFile="mw/websrv/webservices/wshostletconnection/group"/>
-</component>
-<component name="wsmanager" filter="s60" long-name="WS Service Manager">
-<unit bldFile="mw/websrv/webservices/wsmanager/group"/>
-</component>
-<component name="wsidentitymanager" filter="s60" long-name="WS Identity Manager">
-<unit bldFile="mw/websrv/webservices/wsidentitymanager/group"/>
-</component>
-<component name="idwsfplugin" filter="s60" long-name="ID-WSF Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/idwsfplugin/group"/>
-</component>
-<component name="wsibasicplugin" filter="s60" long-name="WS-I Basic Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsibasicplugin/group"/>
-</component>
-<component name="wsrestplugin" filter="s60" long-name="WS REST Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wsrestplugin/group"/>
-</component>
-<component name="idwsfsecuritymechanism" filter="s60" long-name="ID-WSF Security Mechanism">
-<unit bldFile="mw/websrv/webservices/idwsfsecuritymechanism/group"/>
-</component>
-<component name="wspasswordtransforms" filter="s60" long-name="WS Password Transforms">
-<unit bldFile="mw/websrv/webservices/wspasswordtransforms/group"/>
-</component>
-<component name="wscore" filter="s60" long-name="WS Core Service Manager">
-<unit bldFile="mw/websrv/webservices/wscore/group"/>
-</component>
-<component name="wslocaltransportplugin" filter="s60" long-name="WS Local Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wslocaltransportplugin/group"/>
-</component>
-<component name="wshostlettransportplugin" filter="s60" long-name="WS Hostlet Transport Plugin" plugin="Y">
-<unit bldFile="mw/websrv/webservices/wshostlettransportplugin/group"/>
-</component>
-<component name="wsstar" filter="s60" long-name="WS Star">
-<!-- can only have one unit. Need to split into separate components or #include from a single bld.inf -->
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarpolicy/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarplugin/group"/>
-<unit bldFile="mw/websrv/webservices/wsstar/wsstarmessagehandlers/group"/>
-</component>
-<component name="wsoviplugin" filter="s60" long-name="WS Ovi Plugin">
-<unit bldFile="mw/websrv/webservices/wsoviplugin/group"/>
-</component>
-<component name="webservices_build" filter="s60" long-name="Web Services Build">
-<!-- need to split into self-contained components -->
-<unit bldFile="mw/websrv/webservices/group"/>
-</component>
-</collection>
-<collection name="websrv_info" long-name="Web Services Info" level="specific">
-<component name="websrv_bld" filter="s60" long-name="Web Services Build">
-<!-- need to include common .hrh in each unit -->
-<unit bldFile="mw/websrv/group"/>
-</component>
-</collection>
-</block>
-<block name="webruntime" level="specific" long-name="Web Runtime">
-<!-- need to break up this package nito collections and components -->
-<collection name="webruntime_info" long-name="Web Runtime Info">
-<component name="webruntime_build" long-name="Web Runtime Build" introduced="^4">
-<unit bldFile="mw/webruntime" proFile="cwrt.pro" qmakeArgs=""what+=ninetwo" "what+=tenone" "what+=qt_unstable" "what+=wrtlite" "what+=exportiby""/>
-</component>
-</collection>
-</block>
-<block name="platformtools" level="generic" long-name="Platform Tools">
-<collection name="gfxconversion" long-name="Graphics Conversion">
-<component name="bmconv_s60" filter="s60" long-name="S60 Bitmap Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/bmconv_s60/group"/>
-</component>
-<component name="mifconv" filter="s60" long-name="Multi Icon File Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/mifconv/group"/>
-</component>
-</collection>
-</block>
-<block name="uitools" level="specific" long-name="UI Tools" levels="compile encode tool if">
-<collection name="uitools_pub" long-name="UI Tools Public Interfaces" level="if">
-<component name="third_party_bitmap_palette_api" long-name="Third Party Bitmap Palette API" filter="s60" class="api">
-<unit bldFile="mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
-</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">
-<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">
-<unit bldFile="mw/uitools/uitools_plat/layout_system_private_api/group"/>
-</component>
-</collection>
-<collection name="cdlcompilertoolkit" long-name="CDL Compiler Toolkit" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompilertoolkit_build" filter="s60" long-name="CDL Compiler Toolkit Build">
-<unit bldFile="mw/uitools/cdlcompilertoolkit/group"/>
-</component>
-</collection>
-<collection name="cdlcompiler" long-name="CDL Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="cdlcompiler_build" filter="s60" long-name="CDL Compiler Build">
-<unit bldFile="mw/uitools/cdlcompiler/group"/>
-</component>
-</collection>
-<collection name="gfxtools" long-name="Graphics Tools" level="tool">
-<component name="gditools" filter="s60" long-name="GDI Tools" class="PC">
-<unit bldFile="mw/uitools/gfxtools/gditools/group"/>
-</component>
-<component name="color" filter="s60" long-name="Bitmap Colour Palette" class="PC">
-<unit bldFile="mw/uitools/gfxtools/color/group"/>
-</component>
-</collection>
-<collection name="aknlayoutcompiler" long-name="Avkon Layout Compiler" level="compile">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="aknlayoutcompiler_build" filter="s60" long-name="Avkon Layout Compiler Build">
-<unit bldFile="mw/uitools/aknlayoutcompiler/group"/>
-</component>
-</collection>
-<collection name="skincompiler" long-name="Skin Compiler" level="compile">
-<component name="aknskindesccompiler" filter="s60" long-name="Avkon Skin Descriptor Compiler">
-<unit bldFile="mw/uitools/skincompiler/AknSkinDescCompiler/group"/>
-</component>
-</collection>
-<collection name="reszip" long-name="Resource Zip" level="encode">
-<!-- collection is actually a component. Needs to be moved down a directory -->
-<component name="reszip_build" filter="s60" long-name="Resource Zip Build">
-<unit bldFile="mw/uitools/reszip/group"/>
-</component>
-</collection>
-<collection name="toollibraries" long-name="Tool Libraries" level="tool"/>
-<collection name="svgtencoder" long-name="SVGT Encoder" level="encode">
-<component name="svgtenc" filter="s60" long-name="Standalone SVGT Encoder" class="PC">
-<unit bldFile="mw/uitools/svgtencoder/svgtenc/standalone/group"/>
-</component>
-</collection>
-</block>
-</layer>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="location" level="apps" long-name="Location Apps" levels="ui events loc api">
-<collection name="loc_plat" long-name="Location Apps Platform Interfaces" level="api">
-<component name="location_picker_service_api" long-name="Location Picker Service API" introduced="^4" filter="s60" class="api">
-<unit bldFile="app/location/loc_plat" proFile="location_plat.pro"/>
-</component>
-</collection>
-<collection name="locationpickerservice" long-name="Location Picker Service" level="loc">
-<!--collection is really a component. Should move down a directory -->
-<component name="locationpickerservice_build" filter="s60" long-name="Location Picker Service Build" introduced="^4">
-<unit bldFile="app/location/locationpickerservice" proFile="locationpickerservice.pro"/>
-</component>
-</collection>
-</block>
-<!-- pending removal -->
-<block name="phone" level="apps" span="2" long-name="Phone Apps" levels="engine plugin ui app">
-<collection name="phoneapp" long-name="Phone Application" level="app">
-<component name="blacklist" filter="s60" long-name="Phone Blacklist Clearing" plugin="Y">
-<unit bldFile="app/phone/phoneapp/blacklist/group"/>
-</component>
-<component name="phoneuicontrol" filter="s60" long-name="Phone UI Control">
-<unit bldFile="app/phone/phoneapp/phoneuicontrol/group"/>
-</component>
-<component name="phoneuistates" filter="s60" long-name="Phone UI States">
-<unit bldFile="app/phone/phoneapp/phoneuistates/group"/>
-</component>
-<component name="phoneuiutils" filter="s60" long-name="Phone UI Utils">
-<unit bldFile="app/phone/phoneapp/phoneuiutils/group"/>
-</component>
-<component name="silenceactionplugin" filter="s60" long-name="Silence Action Plugin" plugin="Y">
-<unit bldFile="app/phone/phoneapp/silenceactionplugin/group"/>
-</component>
-<component name="phonemediatorcenter" filter="s60" long-name="Phone Mediator Center">
-<unit bldFile="app/phone/phoneapp/phonemediatorcenter/group"/>
-</component>
-<component name="phoneuiview2" filter="s60" long-name="Phone UI View">
-<unit bldFile="app/phone/phoneapp/phoneuiview2" proFile="phoneuiview2.pro"/>
-</component>
-<component name="phoneuiqtviewadapter" filter="s60" long-name="Phone UI Qt View Adapter" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneapp/phoneuiqtviewadapter" proFile="phoneuiqtviewadapter.pro"/>
-</component>
-<component name="phonestringloader" filter="s60" long-name="Phone String Loader" introduced="^4">
-<unit bldFile="app/phone/phoneapp/phonestringloader" proFile="phonestringloader.pro"/>
-</component>
-<component name="phoneui2" filter="s60" long-name="Phone UI">
-<unit bldFile="app/phone/phoneapp/phoneui2" proFile="phoneui2.pro"/>
-</component>
-</collection>
-<collection name="phoneengine" long-name="Phone Engine" level="engine">
-<component name="phonecntfinder2" filter="s60" long-name="Phone Contact Finder">
-<unit bldFile="app/phone/phoneengine/phonecntfinder2" proFile="phonecntfinder2.pro"/>
-</component>
-<component name="audiohandling" filter="s60" long-name="Phone Audio Handling">
-<unit bldFile="app/phone/phoneengine/audiohandling/group"/>
-</component>
-<component name="callhandling" filter="s60" long-name="Call Handling">
-<unit bldFile="app/phone/phoneengine/callhandling/group"/>
-</component>
-<component name="contacthandling2" filter="s60" long-name="Phone Contact Handling">
-<unit bldFile="app/phone/phoneengine/contacthandling2/group"/>
-</component>
-<component name="loghandling" filter="s60" long-name="Phone Log Handling">
-<unit bldFile="app/phone/phoneengine/loghandling/group"/>
-</component>
-<component name="engineinfo" filter="s60" long-name="Phone Engine Info">
-<unit bldFile="app/phone/phoneengine/engineinfo/group"/>
-</component>
-<component name="phonemodel" filter="s60" long-name="Phone Model">
-<unit bldFile="app/phone/phoneengine/phonemodel" proFile="phonemodel.pro"/>
-</component>
-<component name="servicehandling" filter="s60" long-name="Phone Service Handling">
-<unit bldFile="app/phone/phoneengine/servicehandling/group"/>
-</component>
-<component name="phoneservices" filter="s60" long-name="Phone Server" introduced="^4">
-<unit bldFile="app/phone/phoneengine/phoneservices" proFile="phoneservices.pro"/>
-</component>
-<component name="parserrecognizer" filter="s60" long-name="Parser Recognizer" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneengine/parserrecognizer" proFile="parserrecognizer.pro"/>
-</component>
-</collection>
-<collection name="phoneuis" long-name="Phone UIs" level="ui">
-<component name="bubblemanager2" filter="s60" long-name="Phone Bubble Manager">
-<unit bldFile="app/phone/phoneuis/bubblemanager2" proFile="bubblemanager2.pro"/>
-</component>
-<component name="telephonydevicemode" filter="s60" long-name="Telephony Device Mode">
-<unit bldFile="app/phone/phoneuis/telephonydevicemode/group"/>
-</component>
-</collection>
-<collection name="phone_plat" long-name="Phone Apps Platform Interfaces" level="app">
-<component name="3d_ringing_tone_enabler_api" long-name="3D Ringing Tone Enabler API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
-</component>
-<component name="telephony_comms_information_api" long-name="Telephony Comms Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_comms_information_api/group"/>
-</component>
-<component name="telephony_information_api" long-name="Telephony Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_information_api/group"/>
-</component>
-<component name="telephony_device_mode_api" long-name="Telephony Device Mode API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_device_mode_api/group"/>
-</component>
-<component name="telephony_remote_party_information_api" long-name="Telephony Remote Party Information API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_remote_party_information_api/group"/>
-</component>
-<component name="telephony_video_mailbox_settings_api" long-name="Telephony Video Mailbox Settings API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_video_mailbox_settings_api/group"/>
-</component>
-<component name="telephony_microphone_mute_status_api" long-name="Telephony Microphone Mute Status API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_microphone_mute_status_api/group"/>
-</component>
-<component name="telephony_logging_extension_api" long-name="Telephony Logging Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_logging_extension_api/group"/>
-</component>
-<component name="telephony_matching_extension_api" long-name="Telephony Matching Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_matching_extension_api/group"/>
-</component>
-<component name="phone_application_commands_api" long-name="Phone Application Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_commands_api/group"/>
-</component>
-<component name="phone_application_voip_commands_api" long-name="Phone Application VOIP Commands API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/phone_application_voip_commands_api/group"/>
-</component>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_mediator_api/group"/>
-</component>
-<component name="video_telephony_mediator_api" long-name="Video Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/video_telephony_mediator_api/group"/>
-</component>
-<component name="video_telephony_control_mediator_api" long-name="Video Telephony Control Mediator API" filter="s60" introduced="^4" class="api">
-<unit bldFile="app/phone/phone_plat/video_telephony_control_mediator_api/group"/>
-</component>
-</collection>
-<collection name="phoneplugins" long-name="Phone Plugins" level="plugin">
-<component name="csplugin" filter="s60" long-name="Circuit Switched Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/csplugin/group"/>
-</component>
-<component name="hsdialerwidgetplugin" filter="s60" long-name="Home Screen Dialer Widget Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/hsdialerwidgetplugin" proFile="hsdialerwidgetplugin.pro"/>
-</component>
-<component name="infowidgetplugin" filter="s60" long-name="Info Widget Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/infowidgetplugin" proFile=""/>
-</component>
-</collection>
-<collection name="phonesettings" long-name="Phone Settings" level="plugin">
-<component name="cpphonesettingsplugins" filter="s60" long-name="CP Phone Settings Plugins" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phonesettings/cpphonesettingsplugins" proFile="cpphonesettingsplugins.pro"/>
-</component>
-</collection>
-</block>
-<block name="settingsuis" level="services" long-name="Settings UIs" levels="plugin ui">
-<collection name="controlpanelplugins" long-name="Control Panel Plugins" level="plugin">
-<component name="themeplugin" filter="s60" long-name="Theme Plugin" introduced="^4">
-<unit bldFile="app/settingsuis/controlpanelplugins/themeplugin" proFile="themeplugin.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-<collection name="controlpanelui" long-name="Control Panel UI" level="ui">
-<!-- collection is really a component, move down a dir -->
-<component name="controlpanelui_build" filter="s60" long-name="Control Panel UI Build" introduced="^4">
-<unit bldFile="app/settingsuis/controlpanelui" proFile="controlpanelui.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-</block>
-<block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin framework app">
-<collection name="contentctrl_plat" long-name="Content Control Daemons Platforn Interfaces" level="app">
-<component name="ds_contactsdatastoreextension_api" long-name="Adapter Customization API" filter="s60" introduced="^4" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_contactsdatastoreextension_api/group"/>
-</component>
-<component name="ds_data_modification_api" long-name="DS Data Modification API" filter="s60" class="api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/ds_data_modification_api/group"/>
-</component>
-</collection>
-<collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
-<component name="secon" filter="s60" long-name="Service Controllers">
-<unit bldFile="app/contentcontrol/connectivitymodules/secon/group"/>
-</component>
-</collection>
-<collection name="dsdcmoadapter" long-name="Data Sync DCMO Adapter" level="plugin">
-<!-- Component at wrong rank, should move down a directory -->
-<component name="dsdcmoadapter_build" filter="s60" long-name="Data Sync Control DCMO Adapter">
-<unit bldFile="app/contentcontrol/dsdcmoadapter/group"/>
-</component>
-</collection>
-<collection name="omads" long-name="OMA Data Sync" level="app">
-<component name="omads_build" filter="s60" long-name="OMA DS Build">
-<unit bldFile="app/contentcontrol/omads/group"/>
-<!-- need to remove #include and rename and OMA DS ROM -->
-</component>
-<component name="omadsextensions" filter="s60" long-name="OMA DS Extensions" plugin="Y">
-<unit bldFile="app/contentcontrol/omads/omadsextensions/group"/>
-</component>
-<component name="omadsextensions" filter="s60" long-name="OMA DS Qt Extensions" plugin="Y">
-<unit bldFile="app/contentcontrol/omads/omadsextensions" proFile="omadsextensions.pro"/>
-</component>
-</collection>
-</block>
-<block name="firsttimeuse" level="apps" long-name="First Time Use" levels="support services ui app">
-<!-- these empty collections are really components. Move down a directory and supply units -->
-<collection name="ftuapplication" long-name="First Time Use Application" level="app"/>
-<collection name="fturuntimeservices" long-name="First Time Use Runtime Services" level="services"/>
-<collection name="wizardproviders" long-name="Wizard Providers" level="support"/>
-<collection name="stateproviders" long-name="State Providers" level="support"/>
-<collection name="runtimeproviders" long-name="Runtime Providers" level="support"/>
-<collection name="firsttimeuse_info" long-name="First Time Use Info" level="ui">
-<component name="firsttimeuse_build" long-name="First Time Use Build">
-<unit bldFile="app/firsttimeuse" proFile="ftu.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-</block>
-<block name="devicecontrol" level="services" long-name="Device Control Daemons" levels="oma mid app">
-<collection name="deviceupdatesui" long-name="Device Updates UI" level="app">
-<component name="deviceupdatesui_adapters" long-name="Device Updates Adapters" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/devicecontrol/deviceupdatesui/adapters/bld"/>
-</component>
-<component name="deviceupdates" long-name="Device Updates" filter="s60" introduced="^4">
-<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdates" proFile="deviceupdates.pro"/>
-</component>
-<component name="deviceupdatesplugin" long-name="Device Updates Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdatesplugin" proFile="deviceupdatesplugin.pro"/>
-</component>
-<component name="deviceupdatesqtsp" long-name="Device Updates Qt Service Provider" filter="s60" introduced="^4">
-<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdatesqtsp" proFile="deviceupdatesqtsp.pro"/>
-</component>
-<component name="cpqtsp" long-name="Client Provisioning Qt Service Provider" filter="s60" introduced="^4">
-<unit bldFile="app/devicecontrol/deviceupdatesui/cpqtsp" proFile="cpqtsp.pro"/>
-</component>
-<component name="devicemanagementnotifiersplugin" long-name="Device Management Notifiers Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/devicecontrol/deviceupdatesui/devicemanagementnotifiersplugin" proFile="devicemanagementnotifiersplugin.pro"/>
-</component>
-</collection>
-</block>
-<block name="printing" level="services" long-name="Printing"/>
-<block name="files" level="apps" long-name="File Manager Apps" levels="support apps">
-<collection name="filemanager" long-name="File Manager" level="apps">
-<component name="filemanager_plat" long-name="File Manager Platform Interfaces" filter="s60" introduced="^4" class="api"/>
-<component name="fmbkupengine" filter="s60" long-name="File Manager Backup Engine" introduced="^4">
-<unit bldFile="app/files/filemanager/src/fmbkupengine/group"/>
-</component>
-<component name="filemanager_build" filter="s60" long-name="File Manager Build">
-<!-- break this up into components or move down a directory -->
-<unit bldFile="app/files/filemanager" proFile="filemanager.pro"/>
-</component>
-</collection>
-</block>
-<block name="search" level="apps" long-name="Search Apps" levels="eng base app api">
-<collection name="search_info" long-name="Search Info">
-<component name="search_build" long-name="Search Build">
-<unit bldFile="app/search/group"/>
-</component>
-</collection>
-<collection name="searchui" long-name="Search UI">
-<component name="searchui_build" long-name="Search UI Build">
-<unit bldFile="app/search/searchui" proFile="searchui.pro"/>
-</component>
-</collection>
-</block>
-<block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
-<collection name="contacts_plat" long-name="Contacts Apps Platform Interfaces" level="ui">
-<component name="logs_engine_api" long-name="Logs Engine API" filter="s60" introduced="^4" class="api"/>
-<component name="logs_engine_api_extensions" long-name="Logs Engine API Extensions" filter="s60" class="api"/>
-<component name="logs_services_api" long-name="Logs Services API" filter="s60" introduced="^4" class="api"/>
-<component name="logs_timers_api" long-name="Logs Timers API" filter="s60" class="api"/>
-<component name="qt_mobility_contacts_api" long-name="Qt Mobility Contacts API" filter="s60" introduced="^4" class="api"/>
-</collection>
-<collection name="logsui" long-name="Logs UI" level="ui">
-<component name="logsui_build" filter="s60" long-name="Logs UI Build">
-<!-- component at too high a rank, should move down one directory -->
-<unit bldFile="app/contacts/logsui" proFile="logsui.pro"/>
-</component>
-</collection>
-<collection name="phonebookui" long-name="Phonebook UI" level="ui">
-<component name="mobhistorymodel" filter="s60" long-name="Mobile History Model" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/mobhistorymodel" qt:proFile="mobhistorymodel.pro"/> -->
-</component>
-<component name="pbkcommonui" filter="s60" long-name="Phonebook Common UI" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/pbkcommonui" qt:proFile="pbkcommonui.pro"/> -->
-</component>
-<component name="phonebookapp" filter="s60" long-name="Phonebook Application" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/phonebookapp" qt:proFile="phonebookapp.pro"/> -->
-</component>
-<component name="phonebookservices" filter="s60" long-name="Phonebook Services" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/phonebookservices" qt:proFile="phonebookservices.pro"/> -->
-</component>
-<component name="phonebookui_build" filter="s60" long-name="Phonebook UI Build" introduced="^4">
-<!-- break up into components -->
-<unit bldFile="app/contacts/phonebookui" proFile="phonebookui.pro"/>
-</component>
-</collection>
-<collection name="qtcontactsmobility" long-name="Qt Contacts Mobility" level="support">
-<component name="qtcontactsmobility_build" filter="s60" long-name="Qt Contacts Mobility Build" introduced="^4" plugin="Y">
-<!-- not really a component, move down a dir? Break up into compnents? -->
-<unit bldFile="app/contacts/qtcontactsmobility" proFile="qtcontactsmobility.pro"/>
-</component>
-</collection>
-<collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
-<component name="cntfindplugin" filter="s60" long-name="Contacts Find Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntfindplugin" proFile="cntfindplugin.pro"/>
-</component>
-<component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
-<unit bldFile="app/contacts/phonebookengines/contactsmodel/groupsql" mrp="app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
-</component>
-<component name="cntsortplugin" filter="s60" long-name="Contacts Sort Plugin" introduced="^2" plugin="Y">
-<unit bldFile="app/contacts/phonebookengines/cntsortplugin" proFile="cntsortplugin.pro"/>
-</component>
-<component name="mobcntmodel" filter="s60" long-name="Mobile Contacts Model" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/mobcntmodel" proFile="mobcntmodel.pro"/>
-</component>
-<component name="mobcntactions" filter="s60" long-name="Mobile Contacts Actions" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/mobcntactions" proFile="mobcntactions.pro"/>
-</component>
-<component name="cntmaptileservice" filter="s60" long-name="Contacts Map Tile Service" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/cntmaptileservice" proFile="cntmaptileservice.pro"/>
-</component>
-<component name="simutility" filter="s60" long-name="SIM Utility" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/simutility" proFile="simutility.pro"/>
-</component>
-</collection>
-<collection name="pimprotocols" long-name="PIM Protocols" level="services">
-<component name="phonebooksync" long-name="Phonebook Sync" purpose="optional" plugin="Y">
-<unit bldFile="app/contacts/pimprotocols/phonebooksync/group" mrp="app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
-</component>
-<component name="pbap" long-name="Bluetooth PBAP" introduced="9.2" purpose="optional">
-<unit bldFile="app/contacts/pimprotocols/pbap/group" mrp="app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
-</component>
-</collection>
-<collection name="contacts_info" long-name="Contacts Apps Info" level="ui">
-<component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="organizer" level="apps" span="2" long-name="Organizer Application Suite" levels="support services engine ui app">
-<collection name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" level="app">
-<component name="calendar_interim_utils2_api" long-name="Calendar Interim Utils 2 API" filter="s60" class="api">
-<!-- move into own .pro file -->
-<unit bldFile="app/organizer/organizer_pub" proFile="organizer_pub.pro"/>
-</component>
-</collection>
-<collection name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" level="app">
-<component name="organizer_plat_build" long-name="Organizer Application Suite Platform Interface Build" filter="s60" class="api">
-<!-- break up into individual .pro files -->
-<unit bldFile="app/organizer/organizer_plat" proFile="organizer_plat.pro"/>
-</component>
-<component name="agenda_versit_2_api" long-name="Agenda Versit 2 API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="organizer_plat/agenda_versit_2_api/group"/>-->
-</component>
-<component name="calendar_exporter_api" long-name="Calendar Exporter API" filter="s60" class="api placeholder">
-<!--<unit bldFile="organizer_plat/calendar_exporter_api/group"/>-->
-</component>
-<component name="calendar_importer_api" long-name="Calendar Importer API" filter="s60" class="api placeholder">
-<!--<unit bldFile="organizer_plat/calendar_importer_api/group"/>-->
-</component>
-<component name="calendar_launcher_api" long-name="Calendar Launcher API" filter="s60" class="api placeholder">
-<!--<unit bldFile="organizer_plat/calendar_launcher_api/group"/> -->
-</component>
-<component name="agenda_interface_api" long-name="Agenda Interface API" filter="s60" introduced="^4" class="api"/>
-<component name="calendar_editor_api" long-name="Calendar Editor API" filter="s60" introduced="^4" class="api"/>
-<component name="notes_editor_api" long-name="Notes Editor API" filter="s60" introduced="^4" class="api"/>
-<component name="agenda_eventviewer_api" long-name="Agenda Event Viewer API" filter="s60" introduced="^4" class="api"/>
-</collection>
-<collection name="agendainterface" long-name="Agenda Interface" level="services">
-<!-- collection is really a component, should move down a directory -->
-<component name="agendainterface_build" filter="s60" long-name="Agenda Interface Build">
-<unit bldFile="app/organizer/agendainterface" proFile="agendainterface.pro"/>
-</component>
-</collection>
-<collection name="calendarui" long-name="Calendar UI" level="ui">
-<component name="commonutils" filter="s60" long-name="Calendar Common Utils">
-<unit bldFile="app/organizer/calendarui/commonutils" proFile="commonutils.pro"/>
-</component>
-<component name="calenlauncher" filter="s60" long-name="Calendar Launcher">
-<unit bldFile="app/organizer/calendarui/calenlauncher/group" proFile="calenlauncher.pro"/>
-</component>
-<component name="caleneditor" filter="s60" long-name="Calendar Editor" introduced="^4">
-<unit bldFile="app/organizer/calendarui/caleneditor" proFile="caleneditor.pro"/>
-</component>
-<component name="agendaeventviewer" filter="s60" long-name="Agenda Event Viewer" introduced="^4">
-<unit bldFile="app/organizer/calendarui/agendaeventviewer" proFile="agendaeventviewer.pro"/>
-</component>
-<component name="globaldata" filter="s60" long-name="Calendar Global Data">
-<unit bldFile="app/organizer/calendarui/globaldata" proFile="globaldata.pro"/>
-</component>
-<component name="settings" filter="s60" long-name="Calendar Settings">
-<unit bldFile="app/organizer/calendarui/settings" proFile="settings.pro"/>
-</component>
-<component name="calenplugins" filter="s60" long-name="Calendar Plugins" introduced="^4" plugin="Y">
-<unit bldFile="app/organizer/calendarui/calenplugins" proFile="calenplugins.pro"/>
-</component>
-<component name="customisationmanager" filter="s60" long-name="Calendar Customisation Manager">
-<unit bldFile="app/organizer/calendarui/customisationmanager" proFile="customisationmanager.pro"/>
-</component>
-<component name="views" filter="s60" long-name="Calendar Views">
-<unit bldFile="app/organizer/calendarui/views" proFile="views.pro"/>
-</component>
-<component name="calengriditemstyleplugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/organizer/calendarui/styleplugins/calengriditemstyleplugin" proFile="calengriditemstyleplugin.pro"/>
-</component>
-<component name="calendarui_controller" filter="s60" long-name="Calendar Controller">
-<unit bldFile="app/organizer/calendarui/controller" proFile="controller.pro"/>
-</component>
-<component name="calendarui_application" filter="s60" long-name="Calendar Application">
-<unit bldFile="app/organizer/calendarui/application" proFile="application.pro"/>
-</component>
-<component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y">
-<unit bldFile="app/organizer/calendarui/caldav/group"/>
-</component>
-</collection>
-<collection name="notes" long-name="Notes" level="ui">
-<component name="noteseditor" filter="s60" long-name="Notes Editor" introduced="^4">
-<unit bldFile="app/organizer/notes/notesui/noteseditor" proFile="noteseditor.pro"/>
-</component>
-<component name="notes_build" filter="s60" long-name="Notes Build" introduced="^4">
-<unit bldFile="app/organizer/notes" proFile="notes.pro"/>
-</component>
-</collection>
-<collection name="calendarengines" long-name="Calendar Engines" level="engine">
-<component name="versit2" filter="s60" long-name="Versit 2 iCal Parser" introduced="9.2">
-<unit bldFile="app/organizer/calendarengines/versit2/group"/>
-</component>
-<component name="agnversit2" filter="s60" long-name="Versit 2 Agenda Interface" introduced="9.2" plugin="Y">
-<unit bldFile="app/organizer/calendarengines/agnversit2/group"/>
-</component>
-<component name="caleninterimutils" filter="s60" long-name="Calendar Interim Utils" introduced="9.1">
-<unit bldFile="app/organizer/calendarengines/caleninterimutils/group"/>
-</component>
-<component name="calenimp" filter="s60" long-name="Calendar Import Wrapper" introduced="7.0s">
-<unit bldFile="app/organizer/calendarengines/calenimp/group"/>
-</component>
-<component name="caldavsrv" filter="sf_build" long-name="CalDAV Server" introduced="^3">
-<unit bldFile="app/organizer/calendarengines/caldav/group"/>
-</component>
-</collection>
-<collection name="clock" long-name="Clock" level="app">
-<!-- uncomment unit when block_build is split up-->
-<component name="clockengines" filter="s60" long-name="Clock Engines" class="placeholder">
-<!--<unit bldFile="clock/clockengines" qt:proFile="clockengines.pro"/> -->
-</component>
-<component name="clockmw" filter="s60" long-name="Clock Middleware" introduced="^4" class="placeholder">
-<!--<unit bldFile="clock/clockmw" qt:proFile="clockmw.pro"/>-->
-</component>
-<component name="clockui" filter="s60" long-name="Clock UI" class="placeholder">
-<!--<unit bldFile="clock/clockui" qt:proFile="clockui.pro"/>-->
-</component>
-<component name="ftudatetimewizard" filter="s60" long-name="First Time Use Date/Time Wizard" introduced="^4" class="placeholder">
-<!--<unit bldFile="clock/ftudatetimewizard" qt:proFile="ftudatetimewizard.pro"/>-->
-</component>
-<component name="clock_build" filter="s60" long-name="Clock Build">
-<!-- make exports into a component, or just move to one of the above components, then remove this and uncomment the above -->
-<unit bldFile="app/organizer/clock" proFile="clock.pro"/>
-</component>
-</collection>
-<collection name="pimappservices" long-name="PIM Application Services" level="services">
-<component name="calendar" long-name="Calendar" introduced="9.2" purpose="optional">
-<unit bldFile="app/organizer/pimappservices/calendar/group" mrp="app/organizer/pimappservices/calendar/group/app-engines_calendar.mrp" version="2"/>
-</component>
-<component name="calendarvcalplugin" long-name="Calendar vCal Plugin" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="app/organizer/pimappservices/calendarvcalplugin/group" mrp="app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp" version="2"/>
-</component>
-<component name="appenginesdocs" long-name="Application Engines Documentation" purpose="development" class="doc">
-<unit mrp="app/organizer/pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
-</component>
-</collection>
-<collection name="pimappsupport" long-name="PIM Application Support" level="support">
-<component name="vcardandvcal" long-name="vCard and vCal" introduced="ER5" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/vcardandvcal/group" mrp="app/organizer/pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
-</component>
-<component name="chinesecalendarconverter" long-name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
-</component>
-<component name="chinesecalendaralg" long-name="Chinese Calendar Algorithm" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendaralg/group" mrp="app/organizer/pimappsupport/chinesecalendaralg/group/app-services_chinesecalendaralgorithm.mrp"/>
-</component>
-</collection>
-<collection name="alarmui" long-name="Alarm UI" level="app">
-<!-- collection is really a component, should move down a directory -->
-<component name="alarmui_build" filter="s60" long-name="Alarm UI Build">
-<unit bldFile="app/organizer/alarmui" proFile="alarmui.pro"/>
-</component>
-</collection>
-<collection name="organizer_info" long-name="Organizer Application Suite Info" level="app">
-<component name="organizer_metadata" long-name="Organizer Application Suite Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="plugin eng base app api">
-<collection name="msg_plat" long-name="Messaging Apps Platform APIs" level="api">
-<component name="messaging_media_resolver_api" long-name="Messaging Media Resolver API" filter="s60" class="api"/>
-<component name="mms_application_api" long-name="MMS Application API" filter="s60" class="api"/>
-<component name="mms_codec_client_api" long-name="MMS Codec Client API" filter="s60" class="api"/>
-<component name="mms_conformance_api" long-name="MMS Conformance API" filter="s60" class="api"/>
-<component name="mms_engine_settings_api" long-name="MMS Engine Settings API" filter="s60" class="api"/>
-<component name="mms_server_settings_api" long-name="MMS Server Settings API" filter="s60" class="api"/>
-<component name="conversation_services_client_api" long-name="Conversation Services Client API" filter="s60" introduced="^4" class="api"/>
-<component name="conversation_services_plugin_api" long-name="Conversation Services Plugin API" filter="s60" introduced="^4" class="api"/>
-<component name="conversation_services_utilities_api" long-name="Conversation Services Utilities API" filter="s60" introduced="^4" class="api"/>
-<component name="shareui_api" long-name="Share UI API" filter="s60" introduced="^4" class="api"/>
-<component name="messaging_history_api" long-name="Messaging History API" filter="s60" introduced="^4" class="api"/>
-<component name="msg_plat_build" long-name="Messaging Apps Platform APIs Build" filter="s60" introduced="^4" class="api">
-<!-- break this up into the above units and replace their base attributes with bldFile, etc -->
-</component>
-</collection>
-<collection name="msg_pub" long-name="Messaging Apps Public APIs" level="api">
-<component name="mms_client_mtm_api" long-name="MMS Client MTM API" filter="s60" class="api"/>
-<component name="msg_smil_dtd_api" long-name="Messaging SMIL DTD API" filter="s60" introduced="^4" class="api"/>
-<component name="msg_pub_build" long-name="Messaging Apps Public APIs Build" filter="s60" introduced="^4" class="api">
-<!-- break this up into the above units and replace their base attributes with bldFile, etc -->
-</component>
-</collection>
-<collection name="mobilemessaging" long-name="Mobile Messaging" level="plugin">
-<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/mobilemessaging/smsmtm/group" mrp="app/messaging/mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
-</component>
-</collection>
-<collection name="messagingappbase" long-name="Messaging App Base" level="base">
-<component name="messagingappbase_build" filter="s60" long-name="Messaging App Base Build" introduced="^4">
-<!-- break this up into the below components -->
-<unit bldFile="app/messaging/messagingappbase" proFile="messagingappbase.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgmedia" filter="s60" long-name="Message Media"/>
-<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
-<unit mrp="app/messaging/messagingappbase/smsmtm/group/messaging_sms.mrp"/>
-</component>
-<component name="smilparser" long-name="SMIL Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="app/messaging/messagingappbase/smilparser/GROUP" mrp="app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
-</component>
-<component name="obexmtms" long-name="OBEX MTMs" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/obexmtms/Group" mrp="app/messaging/messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
-</component>
-</collection>
-<collection name="mmsengine" long-name="MMS Engine" level="eng">
-<component name="mmsconninit" filter="s60" long-name="MMS Connection Initiator" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsconninit/bld"/> -->
-</component>
-<component name="genutils" filter="s60" long-name="General Utils" class="placeholder">
-<!-- <unit bldFile="mmsengine/genutils/bld"/> -->
-</component>
-<component name="mmsserversettings" filter="s60" long-name="MMS Server Settings" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserversettings/bld"/> -->
-</component>
-<component name="mmsmessage" filter="s60" long-name="MMS Message" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsmessage/bld"/> -->
-</component>
-<component name="mmshttptransport" filter="s60" long-name="MMS HTTP Transport" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmshttptransport/bld"/> -->
-</component>
-<component name="mmscodec" filter="s60" long-name="MMS Codec" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodec/bld"/> -->
-</component>
-<component name="mmsserver" filter="s60" long-name="MMS Server" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserver/bld"/> -->
-</component>
-<component name="clientmtm" filter="s60" long-name="MMS Client MTM" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/clientmtm/bld"/> -->
-</component>
-<component name="mmswatcher" filter="s60" long-name="MMS Watcher" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmswatcher/bld"/> -->
-</component>
-<component name="mmspushhandler" filter="s60" long-name="MMS Push Handler" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmspushhandler/bld"/> -->
-</component>
-<component name="applicationadapter" filter="s60" long-name="MMS Application Adapter" class="placeholder">
-<!-- <unit bldFile="mmsengine/applicationadapter/bld"/> -->
-</component>
-<component name="mmscodecclient" filter="s60" long-name="MMS Codec Client" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodecclient/bld"/> -->
-</component>
-<component name="mmssettings" long-name="MMS Settings" introduced="9.2" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmssettings/group" mrp="app/messaging/mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
-</component>
-<component name="mmsconf" long-name="MMS Configuration" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmsconf" mrp="app/messaging/mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
-</component>
-<component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
-<!-- this should be broken up into the individual other components -->
-<unit bldFile="app/messaging/mmsengine" proFile="mmsengine.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="messagingapp" long-name="Messaging Application" level="app">
-<component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
-<!-- this should be broken up into the individual other components -->
-<unit bldFile="app/messaging/messagingapp" proFile="messagingapp.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgutils" filter="s60" long-name="Messaging Utils" introduced="^4">
-<unit bldFile="app/messaging/messagingapp/msgutils" proFile="msgutils.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgappfw" filter="s60" long-name="Messaging Application Framework" introduced="^4">
-<unit bldFile="app/messaging/messagingapp/msgappfw" proFile="msgappfw.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgsettings" filter="s60" long-name="Messaging Settings" introduced="^4">
-<unit bldFile="app/messaging/messagingapp/msgsettings" proFile="msgsettings.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgnotifications" filter="s60" long-name="Messaging Notifications" introduced="^4">
-<unit bldFile="app/messaging/messagingapp/msgnotifications" proFile="msgnotifications.pro" qmakeArgs="-r"/>
-</component>
-<component name="smartmessaging" filter="s60" long-name="Smart Messaging">
-<unit bldFile="app/messaging/messagingapp/smartmessaging" proFile="smartmessaging.pro" qmakeArgs="-r"/>
-</component>
-<component name="shareui" filter="s60" long-name="Shared UI" introduced="^4">
-<unit bldFile="app/messaging/messagingapp/shareui" proFile="shareui.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgui" filter="s60" long-name="Messaging UI" introduced="^4">
-<unit bldFile="app/messaging/messagingapp/msgui" proFile="msgui.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="email" long-name="Email" level="plugin">
-<!-- use commonemail instead -->
-<component name="pop3andsmtpmtm" long-name="POP3 and SMTP MTM" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/pop3andsmtpmtm/group" mrp="app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
-</component>
-<component name="imap4mtm" long-name="IMAP4 MTM" introduced="9.2" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="app/messaging/email/imap4mtm/group" mrp="app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
-</component>
-</collection>
-<collection name="messaging_info" long-name="Messaging Apps Info" level="api">
-<component name="messaging_metadata" long-name="Messaging Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
-</component>
-<component introduced="^4">
-<!-- break this up into the above collections and eventually remove -->
-<unit bldFile="app/messaging" proFile="messaging.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</block>
-<block name="commonemail" level="apps" span="2" long-name="Email Apps" levels="service support ui app">
-<!-- need to resolve the qt parts into proper components, then uncomment the units -->
-<collection name="email_plat" long-name="Email Apps Platform Interfaces" level="app">
-<component name="nmail_client_api" long-name="NMail Client API" filter="s60" introduced="^4" class="api placeholder">
-<!--<unit bldFile="email_plat" qt:proFile="email_plat.pro"/> -->
-</component>
-</collection>
-<collection name="emailservices" long-name="Email Services" level="service">
-<component name="nmailbase" filter="s60" long-name="NMail Base" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/nmailbase" qt:proFile="nmailbase.pro"/> -->
-</component>
-<component name="emailcommon" filter="s60" long-name="Email Common" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/emailcommon" qt:proFile="emailcommon.pro"/>-->
-</component>
-<component name="emailframework" filter="s60" long-name="Email Framework" introduced="^2" class="placeholder">
-<!-- <unit bldFile="emailservices/emailframework" qt:proFile="emailframework.pro"/>-->
-</component>
-<component name="emailstore" filter="s60" long-name="Email Store" introduced="^2" class="placeholder">
-<!-- <unit bldFile="emailservices/emailstore" qt:proFile="emailstore.pro"/>-->
-</component>
-<component name="nmclientapi" filter="s60" long-name="Nmail Client API" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/nmclientapi" qt:proFile="nmclientapi.pro"/>-->
-</component>
-<component name="nmailagent" filter="s60" long-name="Nmail Agent" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/nmailagent" qt:proFile="nmailagent.pro"/>-->
-</component>
-</collection>
-<collection name="ipsservices" long-name="IMAP/POP/SMTP Services" level="service">
-<component name="ipssosplugin" filter="s60" long-name="IPS SOS Plugin" introduced="^2" plugin="Y" class="placeholder">
-<!-- SOS? Consider spelling it out since the abbreviation is ambiguous -->
-<!--<unit bldFile="ipsservices/ipssosplugin" qt:proFile="ipssosplugin.pro" />-->
-</component>
-<component name="nmimapclientplugin" filter="s60" long-name="NM IMAP Client Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="ipsservices/nmimapclientplugin" qt:proFile="nmimapclientplugin.pro"/>-->
-</component>
-<component name="nmipsmtms" filter="s60" long-name="NM IPS Client Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="ipsservices/nmipsmtms" qt:proFile="nmipsmtms.pro"/>-->
-</component>
-<component name="nmipssettings" filter="s60" long-name="NM IPS Settings" introduced="^4" class="placeholder">
-<!-- <unit bldFile="ipsservices/nmipssettings" qt:proFile="nmipssettings.pro"/>-->
-</component>
-<component name="ipsservices_build" filter="s60" long-name="IPS Services Build" introduced="^2" class="placeholder">
-<!--<unit bldFile="ipsservices" qt:proFile="ipsservices.pro"/> -->
-<!-- can the exports be broken up into the other components or made a config component?-->
-</component>
-</collection>
-<collection name="emailuis" long-name="Email UIs" level="app">
-<component name="nmailuiengine" filter="s60" long-name="Nmail UI Engine" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailuiengine" qt:proFile="nmailuiengine.pro"/> -->
-</component>
-<component name="nmailuiwidgets" filter="s60" long-name="Nmail UI Widgets" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailuiwidgets" qt:proFile="nmailuiwidgets.pro"/> -->
-</component>
-<component name="nmailuiwidgetsplugin" filter="s60" long-name="Nmail UI Widgets Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailuiwidgetsplugin" qt:proFile="nmailuiwidgetsplugin.pro"/> -->
-</component>
-<component name="nmsettingui" filter="s60" long-name="Nmail Setting UI" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmsettingui" qt:proFile="nmsettingui.pro"/> -->
-</component>
-<component name="nmailcpplugin" filter="s60" long-name="Nmail CP Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailcpplugin" qt:proFile="nmailcpplugin.pro"/> -->
-</component>
-<component name="nmailui" filter="s60" long-name="Nmail UI" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailui" qt:proFile="nmailui.pro"/> -->
-</component>
-<component name="nmindicatorplugin" filter="s60" long-name="Nmail Indicator Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmindicatorplugin" qt:proFile="nmindicatorplugin.pro"/> -->
-</component>
-<component name="nmframeworkadapter" filter="s60" long-name="Nmail Framework Adapter" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmframeworkadapter" qt:proFile="nmframeworkadapter.pro"/> -->
-</component>
-</collection>
-<collection name="commonemail_info" long-name="Email Apps Info" level="app">
-<component name="commonemail_build" long-name="Email Apps Build" introduced="^4">
-<!-- split into actual components -->
-<unit bldFile="app/commonemail" proFile="nmail.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</block>
-<block name="camera" level="apps" long-name="Camera Apps">
-<collection name="camerauis" long-name="Camera UIs">
-<component name="cameraxui" filter="s60" long-name="CameraX UIs">
-<unit bldFile="app/camera/camerauis/cameraxui" filter="!test" proFile="camerax.pro"/>
-</component>
-</collection>
-</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">
-<component name="image_editor_debug_utilities_api" long-name="Image Editor Debug Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
-</component>
-<component name="image_editor_utilities_api" long-name="Image Editor Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_utilities_api/group"/>
-</component>
-<component name="image_editor_definitions_api" long-name="Image Editor Definitions API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_definitions_api/group"/>
-</component>
-<component name="image_editor_system_parameters_api" long-name="Image Editor System Parameters API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_system_parameters_api/group"/>
-</component>
-<component name="image_processing_engine_api" long-name="Image Processing Engine API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_processing_engine_api/group"/>
-</component>
-</collection>
-<collection name="imageeditor" long-name="Image Editor UI" level="ui">
-<component name="pb" filter="s60" long-name="Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/pb/group"/>
-</component>
-<component name="iepb" filter="s60" long-name="Image Editor Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/iepb/group"/>
-</component>
-<component name="imageeditorui" filter="s60" long-name="Image Editor UI">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorui/group"/>
-</component>
-<component name="imageeditormanager" filter="s60" long-name="Image Editor Manager">
-<unit bldFile="app/imgeditor/imageeditor/imageeditormanager/group"/>
-</component>
-<component name="imageeditorapp" filter="s60" long-name="Image Editor Application">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorapp/group"/>
-</component>
-<component name="imageeditor_plugins" filter="s60" long-name="Image Editor Plugins" plugin="Y">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditor/plugins/blackwhiteplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/brightnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/bubbleplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cartoonizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/clipartplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/contrastplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cropplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/drawplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/frameplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/negativeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/redeyeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/resizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotatelplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotaterplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/textplugin/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditor/plugins/drawplugin/group"/>
- -->
-</component>
-<component name="editorprovider" filter="s60" long-name="Image Editor Provider">
-<unit bldFile="app/imgeditor/imageeditor/editorprovider/group"/>
-</component>
-<component name="imageeditor_build" filter="s60" long-name="Image Editor Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditor/group"/>
-</component>
-</collection>
-<collection name="imageeditorengine" long-name="Image Editor Engine" level="engine">
-<component name="filters" filter="s60" long-name="Image Editor Filters">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbrightness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbubble/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbuffer/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercartoon/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterclipart/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercontrast/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercrop/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterdraw/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterframe/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtergrayscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtericlsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegtarget/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filternegate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterredeye/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterrotate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtertext/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
- -->
-</component>
-<component name="imageeditorutils" filter="s60" long-name="Image Editor Utilities">
-<unit bldFile="app/imgeditor/imageeditorengine/imageeditorutils/group"/>
-</component>
-<component name="systemparameters" filter="s60" long-name="System Parameters">
-<unit bldFile="app/imgeditor/imageeditorengine/systemparameters/group"/>
-</component>
-<component name="enginewrapper" filter="s60" long-name="Image Editor Engine Wrapper">
-<unit bldFile="app/imgeditor/imageeditorengine/enginewrapper/group"/>
-</component>
-<component name="imageeditorengine_build" filter="s60" long-name="Image Editor Engine Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoeditor" level="apps" long-name="Video Editor Apps" levels="engine ui">
-<collection name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" level="ui">
-<component name="video_editor_engine_api" long-name="Video Editor Engine API" introduced="^2" class="api">
-<unit bldFile="app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
-</component>
-</collection>
-<collection name="videditor" long-name="Video Editor" level="ui">
-<component name="videoeditorcommon" filter="s60" long-name="Video Editor Common" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditorcommon/group"/>
-</component>
-<component name="videoeditoruicomponents" filter="s60" long-name="Video Editor UI Components" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditoruicomponents/group"/>
-</component>
-<component name="simplevideoeditor" filter="s60" long-name="Simple Video Editor" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplevideoeditor/group"/>
-</component>
-<component name="simplecutvideo" filter="s60" long-name="Simple Cut Video" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplecutvideo/group"/>
-</component>
-<component name="videoprovider" filter="s60" long-name="Video Provider" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoprovider/group"/>
-</component>
-<component name="manualvideoeditor" filter="s60" long-name="Manual Video Editor" introduced="^2" class="placeholder">
-<!-- uncomment when supported
- <meta rel="config">
- <defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
- </meta>
- <unit bldFile="videditor/manualvideoeditor/group"/> -->
-</component>
-<component name="videditor_build" filter="s60" long-name="Video Editor Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videditor/group"/>
-</component>
-</collection>
-<collection name="videoeditorengine" long-name="Video Editor Engine" level="engine">
-<component name="audioeditorengine" filter="s60" long-name="Audio Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/audioeditorengine/group"/>
-</component>
-<component name="avcedit" filter="s60" long-name="AVC Editing" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/avcedit/group"/>
-</component>
-<component name="h263decoder" filter="s60" long-name="H.263 Decoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/h263decoder/group"/>
-</component>
-<component name="mp3aacmaniplib" filter="s60" long-name="MP3 and AAC Manipulation Library" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
-</component>
-<component name="vedtranscoder" filter="s60" long-name="Video Editor Transcoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedtranscoder/group"/>
-</component>
-<component name="vedengine" filter="s60" long-name="Video Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedengine/group"/>
-</component>
-<component name="videoeditorengine_build" filter="s60" long-name="Video Editor Engine Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videoeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
-<collection name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" level="apps">
-<component name="videoplayer_startup_api" long-name="Video Player Startup API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videoplayer_startup_api/group" filter="!test"/>
-</component>
-<component name="videocollection_api" long-name="Video Collection API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videocollection_api/group"/>
-</component>
-</collection>
-<collection name="videocollection" long-name="Video Collection" level="util">
-<component name="mpxmyvideoscollection" filter="s60" long-name="MPX My Videos Collection" introduced="^3">
-<unit bldFile="app/videoplayer/videocollection/mpxmyvideoscollection/group"/>
-</component>
-<component name="videocollectionwrapper" filter="s60" long-name="Video Collection Wrapper" introduced="^4">
-<unit bldFile="app/videoplayer/videocollection/videocollectionwrapper" proFile="videocollectionwrapper.pro" qmakeArgs="-r"/>
-</component>
-<component name="videocollectionview" filter="s60" long-name="Video Collection View" introduced="^4">
-<unit bldFile="app/videoplayer/videocollection/videocollectionview" proFile="videocollectionview.pro" qmakeArgs="-r"/>
-</component>
-<component name="videofiledetailsview" filter="s60" long-name="Video File Details View" introduced="^4">
-<unit bldFile="app/videoplayer/videocollection/videofiledetailsview" proFile="videofiledetailsview.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="mediasettings" long-name="Media Settings" level="support">
-<!-- this is really a component. Should be moved down a directory -->
-<component name="mediasettings_build" filter="s60" long-name="Media Settings Build">
-<unit bldFile="app/videoplayer/mediasettings/group"/>
-</component>
-</collection>
-<collection name="videoplayerapp" long-name="Video Player App" level="apps">
-<component name="videoplayerengine" long-name="Video Player Engine" filter="s60" introduced="^4">
-<unit bldFile="app/videoplayer/videoplayerapp/videoplayerengine" proFile="videoplayerengine.pro" qmakeArgs="-r"/>
-</component>
-<component name="hbvideoplayer" filter="s60" long-name="HB Video Player" introduced="^4">
-<unit bldFile="app/videoplayer/videoplayerapp/hbvideoplayer" proFile="hbvideoplayer.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="videoplayback" long-name="Video Playback Plugins" level="plugin">
-<component name="hbvideoplaybackview" filter="s60" long-name="HB Video Playback View" introduced="^4" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/hbvideoplaybackview" proFile="hbvideoplaybackview.pro" qmakeArgs="-r"/>
-</component>
-<component name="hbvideoplaybackviewplugin" filter="s60" long-name="HB Video Playback View Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/hbvideoplaybackviewplugin" proFile="hbvideoplaybackviewplugin.pro" qmakeArgs="-r"/>
-</component>
-<component name="videohelix" long-name="Video Helix" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videohelix/group"/>
-</component>
-</collection>
-</block>
-<block name="photos" level="apps" long-name="Photos" levels="util support ui app">
-<collection name="photos_group" long-name="Photos Group" level="support">
-<component name="photos_group_build" filter="s60" long-name="Photos Group Build" introduced="^4" class="placeholder">
-<!--<unit bldFile="group" qt:proFile="group.pro"/> -->
-</component>
-</collection>
-<collection name="photos_loggers" long-name="Photos Loggers" level="util">
-<component name="photos_loggerqt" filter="s60" long-name="Photos Logger Qt" introduced="^4" class="placeholder">
-<!--<unit bldFile="loggers/loggerqt" qt:proFile="loggerqt.pro"/> -->
-</component>
-</collection>
-<collection name="photos_commonutilities" long-name="Photos Common Utilities" level="util">
-<component name="photos_externalutility" filter="s60" long-name="Photos External Utility" introduced="^4" class="placeholder">
-<!--<unit bldFile="commonutilities/externalutility" qt:proFile="externalutility.pro"/> -->
-</component>
-<component name="imagedecoderwrapper" filter="s60" long-name="Image Decoder Wrapper" introduced="^4" class="placeholder">
-<!--<unit bldFile="commonutilities/imagedecoderwrapper" qt:proFile="imagedecoderwrapper.pro"/> -->
-</component>
-</collection>
-<collection name="photos_ui" long-name="Photos UI" level="ui">
-<component name="photos_uiengine" filter="s60" long-name="Photos UI Engine" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/uiengine" qt:proFile="uiengine.pro"/> -->
-</component>
-<component name="photos_commandhandlers" filter="s60" long-name="Photos Command Handlers" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/commandhandlers" qt:proFile="commandhandlers.pro"/> -->
-</component>
-<component name="photos_views" filter="s60" long-name="Photos Views" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/views" qt:proFile="views.pro"/> -->
-</component>
-<component name="photos_viewmanagement" filter="s60" long-name="Photos View Management" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/viewmanagement" qt:proFile="viewmanagement.pro"/> -->
-</component>
-</collection>
-<collection name="photos_main" long-name="Photos Main" level="support">
-<component name="photos_main_build" filter="s60" long-name="Photos Main Build" introduced="^4" class="placeholder">
-<!--<unit bldFile="main" qt:proFile="main.pro"/> -->
-</component>
-</collection>
-<collection name="imageviewerapp" long-name="Image Viewer App" level="support">
-<component name="imageviewerapp_build" filter="s60" long-name="Image Viewer App Build" introduced="^4" class="placeholder">
-<!--<unit bldFile="imageviewerapp" qt:proFile="imageviewerapp.pro"/> -->
-</component>
-</collection>
-<collection name="photos_info" long-name="Photos Info" level="support">
-<component name="photos_build" filter="s60" long-name="Photos Build" introduced="^4">
-<!-- split this up into the above components -->
-<unit bldFile="app/photos" proFile="photos.pro"/>
-</component>
-</collection>
-</block>
-<block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support hs app">
-<!-- move the export .pri files into their components and uncomment the units -->
-<collection name="musicplayer_utilities " long-name="Music Player Utilities" level="support">
-<component name="mpnowplayingbanner" filter="s60" long-name="MP Now Playing Banner" introduced="^4" class="placeholder">
-<!-- <unit bldFile="utilities/mpnowplayingbanner" qt:proFile="mpnowplayingbanner.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-<component name="mpsettingsmanager" filter="s60" long-name="MP Settings Manager" introduced="^4" class="placeholder">
-<!-- <unit bldFile="utilities/mpsettingsmanager" qt:proFile="mpsettingsmanager.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-</collection>
-<collection name="musicfetcher " long-name="Music Fetcher" level="support">
-<!-- collection is really a component, move down a directory -->
-<component name="musicfetcher_buld" filter="s60" long-name="Music Fetcher Build" introduced="^4" class="placeholder">
-<!-- <unit bldFile="musicfetcher" qt:proFile="musicfetcher.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-</collection>
-<collection name="musicplayer_app " long-name="Music Player Application" level="app">
-<!-- collection is really a component, move down a directory -->
-<component name="musicplayer_app_build" filter="s60" long-name="Music Player Application Build" introduced="^4" class="placeholder">
-<!-- <unit bldFile="app" qt:proFile="app.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-</collection>
-<collection name="mpviewplugins " long-name="Music Player View Plugins" level="plugins">
-<component name="mpcollectionviewplugin" filter="s60" long-name="MP Collection View Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpviewplugins/mpcollectionviewplugin/group"/>-->
-</component>
-<component name="mpplaybackviewplugin" filter="s60" long-name="MP Playback View Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpviewplugins/mpplaybackviewplugin/group"/>-->
-</component>
-</collection>
-<collection name="mpserviceplugins" long-name="Music Player Service Plugins" level="plugins">
-<component name="audioeffects" filter="s60" long-name="Audio Effects" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/audioeffects/group"/>-->
-</component>
-<component name="localaudio" filter="s60" long-name="Local Audio" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/localaudio/group"/>-->
-</component>
-<!-- Note: it's called SQLite, not SQLLite, just the one "L" -->
-<component name="mpxsqlitedbcommon" filter="s60" long-name="MPX SQLite Database Common" introduced="^4" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitedbcommon/group"/>-->
-</component>
-<component name="mpxsqlitedbplugin" filter="s60" long-name="MPX SQLite Database Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitedbplugin/group"/>-->
-</component>
-<component name="mpxsqlitepodcastdbplugin" filter="s60" long-name="MPX SQLlite Podcast Database Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
-</component>
-<component name="m3uplaylistplugin" filter="s60" long-name="M3U Playlist Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
-</component>
-</collection>
-<collection name="musicplayer_info" long-name="Music Player Apps Info" level="app">
-<component name="musicplayer_build" filter="s60" long-name="Music Player Build">
-<!-- should brak up into individual components -->
-<unit bldFile="app/musicplayer" proFile="qtmusicplayer.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-</block>
-<block name="radio" level="apps" long-name="Radio Apps" levels="engine ui">
-<collection name="radioengine" long-name="Radio Engine" level="engine">
-<component name="radioengineutils" filter="s60" long-name="Radio Engine Utils" introduced="^4">
-<unit bldFile="app/radio/radioengine/utils/group"/>
-</component>
-<component name="radioenginesettings" filter="s60" long-name="Radio Engine Settings" introduced="^4">
-<unit bldFile="app/radio/radioengine/settings/group"/>
-</component>
-<component name="radioengine_engine" filter="s60" long-name="Radio Engine" introduced="^4">
-<unit bldFile="app/radio/radioengine/engine/group"/>
-</component>
-</collection>
-<collection name="radioapp" long-name="Radio App" level="ui">
-<component name="radioenginewrapper" filter="s60" long-name="Radio Engine Wrapper" introduced="^4">
-<unit bldFile="app/radio/radioapp/radioenginewrapper" proFile="radioenginewrapper.pro"/>
-</component>
-<component name="radiopresetstorage" filter="s60" long-name="Radio Preset Storage" introduced="^4">
-<unit bldFile="app/radio/radioapp/radiopresetstorage" proFile="radiopresetstorage.pro"/>
-</component>
-<component name="radiouiengine" filter="s60" long-name="Radio UI Engine" introduced="^4">
-<unit bldFile="app/radio/radioapp/radiouiengine" proFile="radiouiengine.pro"/>
-</component>
-<component name="radiowidgets" filter="s60" long-name="Radio Widgets" introduced="^4">
-<unit bldFile="app/radio/radioapp/radiowidgets" proFile="radiowidgets.pro"/>
-</component>
-<component name="radioapplication" filter="s60" long-name="Radio Application" introduced="^4">
-<unit bldFile="app/radio/radioapp/radioapplication" proFile="radioapplication.pro"/>
-</component>
-<component name="radio_rom" filter="s60" long-name="Radio ROM" introduced="^4">
-<unit bldFile="app/radio/rom"/>
-</component>
-</collection>
-</block>
-<block name="internetradio" level="apps" long-name="Internet Radio Apps" levels="engine server ui">
-<collection name="internetradio2_0" long-name="Internet Radio 2.0" level="ui">
-<!-- collection is really a component. Move down a dir -->
-<component name="internetradio2_0_build" long-name="Internet Radio 2.0 Build">
-<unit bldFile="app/internetradio/internetradio2.0/group"/>
-</component>
-</collection>
-<collection name="presetserver" long-name="Preset Server" level="server">
-<!-- collection is really a component. Move down a dir -->
-<component name="presetserver_build" long-name="Preset Server Build">
-<unit bldFile="app/internetradio/presetserver/group"/>
-</component>
-</collection>
-<collection name="qtinternetradio" long-name="Qt Internet Radio">
-<component name="qtinternetradio_build" long-name="Qt Internet Radio Build">
-<!-- Move down a dir or break into components-->
-<unit bldFile="app/internetradio/qtinternetradio" proFile="all.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-</block>
-<block name="homescreen" level="apps" long-name="Home Screen Apps" levels="support task ss hs">
-<collection name="homescreen_info" long-name="Home Screen Info" level="support">
-<component name="homescreen_build" long-name="Homescreen Build">
-<!-- break this up properly into components -->
-<unit bldFile="app/homescreen" proFile="homescreen.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-<collection name="homescreen_test" long-name="Home Screen Test" level="support"/>
-<!-- fiill in details with broken up homescreen_build -->
-<collection name="homescreenapp" long-name="Home Screen Application" level="hs">
-<component name="hsutils" long-name="Home Screen Utils" introduced="^4"/>
-<component name="hsdomainmodel" long-name="HS Domain Model" introduced="^4"/>
-<component name="hs_runtimeplugins" long-name="HS Runtime Plugins" introduced="^4" plugin="Y"/>
-<component name="hs_serviceproviders" long-name="HS Service Providers" introduced="^4" plugin="Y"/>
-<component name="hs_stateplugins" long-name="HS State Plugins" introduced="^4" plugin="Y"/>
-<component name="hs_widgetplugins" long-name="HS Widget Plugins" introduced="^4" plugin="Y"/>
-<component name="hsapplication" long-name="Home Screen Application" introduced="^4"/>
-<component name="hshomescreenclientplugin" long-name="Home Screen Client Plugin" introduced="^4" plugin="Y"/>
-<component name="hsmenucontentpublish" long-name="HS Menu Content Publish" introduced="^4"/>
-</collection>
-<collection name="screensaverapp" long-name="Screen Saver Application" level="ss">
-<component name="snsrutils" long-name="Screen Saver Utils" introduced="^4"/>
-<component name="snsr_serviceproviders" long-name="Screen Saver Service Providers" introduced="^4" plugin="Y"/>
-<component name="snsr_stateproviders" long-name="Screen Saver State Providers" introduced="^4" plugin="Y"/>
-<component name="snsr_runtimeproviders" long-name="Screen Saver Runtime Providers" introduced="^4" plugin="Y"/>
-<component name="snsrapplication" long-name="Screen Saver Application" introduced="^4"/>
-<component name="screensaverproviders" long-name="Screen Saver Providers" introduced="^4" plugin="Y"/>
-</collection>
-<collection name="taskswitcherapp" long-name="Task Switcher Application" level="task">
-<component name="taskswitcherappecom" long-name="Task Switcher Application ECom" introduced="^4"/>
-<component name="tsserviceplugin" long-name="Task Switcher Service Plugin" introduced="^4" plugin="Y"/>
-<component name="ts_runtimeplugins" long-name="TS Runtime Plugins" introduced="^4" plugin="Y"/>
-<component name="tsapplication" long-name="Task Switcher Application" introduced="^4"/>
-</collection>
-</block>
-<block name="homescreentools" level="services" long-name="Home Screen Tools" levels="tool install">
-<collection name="dtdinstaller" long-name="DTD Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<!-- this needs to be built first, does build order need to be forced with filters? -->
-<component name="dtdinstaller_build" filter="s60,bldmefirst" long-name="DTD Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/dtdinstaller/group"/>
-</component>
-</collection>
-<collection name="themeinstaller" long-name="Theme Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="themeinstaller_build" filter="s60" long-name="Theme Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/themeinstaller/group"/>
-</component>
-</collection>
-<collection name="widgettools" long-name="Widget Tools" level="install">
-<component name="hspluginpreinstaller" filter="s60" long-name="HS Plugin Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/hspluginspreinstaller/group"/>
-</component>
-<component name="wrtwidgetpreinstaller" filter="s60" long-name="WRT Widget Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
-</component>
-</collection>
-</block>
-<block name="jrt" level="services" long-name="Java Runtime" levels="util generic rt ui">
-<collection name="jrt_plat" long-name="JRT Platform Interfaces" level="ui">
-<component name="java_registry_api" long-name="Java Registry API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_registry_api/build"/>
-</component>
-<component name="java_env_info_api" long-name="Java Environment Info API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_env_info_api/build"/>
-</component>
-<component name="java_debug_api" long-name="Java Debug API" filter="s60" class="api">
-<unit bldFile="app/jrt/jrt_plat/java_debug_api/build"/>
-</component>
-</collection>
-<collection name="java_stubs" long-name="Java Stubs" level="util">
-<!-- uncomment all components when configuration is in place. Currently #included from jrt_build -->
-<component name="javadrmutils" long-name="Java DRM Utils" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtdrmutils/group"/>-->
-</component>
-<component name="javaenvinfo" long-name="Java Environment Info" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtenvinfo/group"/>-->
-</component>
-<component name="javaregistry" filter="s60,sf_build" long-name="Java Registry" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtregistry/clientserver/client/group"/>-->
-</component>
-<component name="java_stubs_build" filter="s60,sf_build" long-name="Java Stubs ROM" class="placeholder">
-<!-- Remove the #includes and rename JRT ROM-->
-<!--<unit bldFile="java_stubs/group"/>-->
-</component>
-</collection>
-<collection name="jrt_info" long-name="JRT Info" level="rt">
-<component name="jrt_build" filter="s60" long-name="JRT Build">
-<!-- needed for __JAVA_STUBS condition -->
-<unit bldFile="app/jrt/group"/>
-</component>
-</collection>
-</block>
-<block name="conntools" level="services" long-name="Connectivity Tools" levels="config app">
-<collection name="nettools" long-name="Net Tools" level="app">
-<component name="conntest" filter="s60" long-name="Connection Test" purpose="development">
-<unit bldFile="app/conntools/nettools/conntest/group"/>
-</component>
-</collection>
-<collection name="emulatorlan" long-name="Emulator LAN" level="config">
-<!-- component is actually a colleciton, should be moved down a directory -->
-<component name="emulatorlan_build" filter="s60" long-name="Emulator LAN Build" purpose="development" class="config">
-<unit bldFile="app/conntools/emulatorlan/group"/>
-</component>
-</collection>
-</block>
-<block name="rndtools" level="services" long-name="R&D tools" levels="support generic test util">
-<collection name="creator" long-name="Creator" level="support">
-<!-- collection is really a component. Should move down a directory -->
-<component name="creator_build" filter="s60" long-name="Creator Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/creator/group"/>
-</component>
-</collection>
-<collection name="filebrowser" long-name="File Browser" level="util">
-<!-- consider collapsing into a single component -->
-<component name="fileopserver" filter="s60" long-name="File Operations Server" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
-</component>
-<component name="fileopclient" filter="s60" long-name="File Operations Client" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!--<unit bldFile="filebrowser/fileopclient/group"/>-->
-</component>
-<component name="filebrowser_build" filter="s60" long-name="File Browser Application" purpose="development" class="tool">
-<!-- Need to make this a self-contained component by removing #includes. Can only do when configuration is in place-->
-<unit bldFile="app/rndtools/filebrowser/group"/>
-</component>
-</collection>
-<collection name="launcher" long-name="Launcher" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="launcher_build" filter="s60" long-name="Launcher Utility" purpose="development" class="tool">
-<unit bldFile="app/rndtools/launcher/group"/>
-</component>
-</collection>
-<collection name="loadgen" long-name="Load Generator" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="loadgen_build" filter="s60" long-name="Load Generator Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/loadgen/group"/>
-</component>
-</collection>
-<collection name="perfmon" long-name="Performance Monitor" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="perfmon_build" filter="s60" long-name="Performance Monitor Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/perfmon/group"/>
-</component>
-</collection>
-<collection name="screengrabber" long-name="Screen Grabber" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="screengrabber_build" filter="s60" long-name="ScreenGrabber" purpose="development" class="tool">
-<unit bldFile="app/rndtools/screengrabber/group"/>
-</component>
-</collection>
-<collection name="stifui" long-name="STIF UI" level="generic">
-<component name="stifui_stifui" filter="s60" long-name="STIF UI" purpose="development">
-<unit bldFile="app/rndtools/stifui/stifui/group"/>
-</component>
-<component name="uitestserverstarter" filter="s60" long-name="UI Test Server Starter" purpose="development">
-<unit bldFile="app/rndtools/stifui/uitestserverstarter/group"/>
-</component>
-<component name="stifui_build" filter="s60" long-name="STIF UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/stifui/group"/>
-</component>
-</collection>
-<collection name="memspyui" long-name="Memspy UI" level="generic">
-<!-- collection is really a component. Should move down a directory -->
-<component name="memspyui_build" filter="s60" long-name="Memspy UI Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/memspyui/group"/>
-</component>
-</collection>
-<collection name="htiui" long-name="Harmonized Test Interface UI" level="generic">
-<component name="HtiServicePlugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- can only have a single unit. Should #include from a common bld.inf file -->
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiFtpBackupFake/group"/>
-</component>
-<component name="htidevicereboot" filter="s60" long-name="HTI Device Reboot" purpose="development">
-<unit bldFile="app/rndtools/htiui/htidevicereboot/group"/>
-</component>
-<component name="htistartupwait" filter="s60" long-name="HTI Startup Wait" purpose="development">
-<unit bldFile="app/rndtools/htiui/htistartupwait/group"/>
-</component>
-<component name="htiadmin" filter="s60" long-name="HTI Admin" purpose="development">
-<unit bldFile="app/rndtools/htiui/htiadmin/group"/>
-</component>
-<component name="htiui_build" filter="s60" long-name="HTI UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/htiui/group"/>
-</component>
-</collection>
-</block>
-<block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools if ui">
-<collection name="userguide" long-name="User Guide" level="if">
-<!-- collection is really a component. Move down a directory -->
-<component name="userguide_build" long-name="User Guide Build" filter="s60" introduced="^4">
-<unit bldFile="app/helps/userguide" proFile="Userguide.pro"/>
-</component>
-</collection>
-<collection name="symhelp" long-name="Symbian Help" level="eng">
-<component name="helpmodel" long-name="Help" introduced="6.0" purpose="optional">
-<unit bldFile="app/helps/symhelp/helpmodel/group" mrp="app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
-</component>
-</collection>
-<collection name="helps_info" long-name="Help Apps Info" level="ui">
-<component name="helps_metadata" long-name="Help Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/helps/helps_info/helps_metadata/helps_metadata.mrp"/>
-</component>
-</collection>
-</block>
-<block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
-<collection name="buildverification" long-name="Build Verification" level="services">
-<component name="autosmoketest" long-name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
-<unit bldFile="app/techview/buildverification/autosmoketest/Group" mrp="app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
-</component>
-<component name="smoketest" long-name="Smoke Test" filter="gt" purpose="development">
-<unit bldFile="app/techview/buildverification/smoketest/Group" mrp="app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
-</component>
-</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="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"/>
-<collection name="installationapps" long-name="Installation Apps" level="apps2"/>
-<collection name="messagingapps" long-name="Messaging Apps" level="apps2"/>
-<collection name="telephonyapps" long-name="Telephony Apps" level="apps1"/>
-<collection name="networkingapps" long-name="Networking Apps" level="apps1"/>
-<collection name="networkingutils" long-name="Networking Utils" level="utils"/>
-<collection name="shortlinkapps" long-name="Shortlink Apps" level="apps1"/>
-<collection name="testapps" long-name="Test Apps" level="utils"/>
-<collection name="avapps" long-name="A/V Apps" level="apps3"/>
-<collection name="toolkit" long-name="Toolkit" level="utils"/>
-<collection name="techview_info" long-name="Techview Info" level="apps3">
-<component name="techview_metadata" long-name="Techview Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/techview/techview_info/techview_metadata/techview_metadata.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian4/single/sysdefs/auto/system_model.xml Tue Jul 13 12:21:44 2010 +0100
@@ -0,0 +1,8623 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^4" schema="2.0.1">
+<systemModel>
+<layer name="adaptation" long-name="Adaptation" levels="low mw high">
+<block name="stubs" level="high" span="2" long-name="Stubs" levels="adaptation plugin mid engine">
+<collection name="audiostubs" long-name="Audio Stubs" level="adaptation">
+<component name="devsoundextensions_stubs" long-name="Devsound Extensions Stubs">
+<unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/group"/>
+</component>
+<component name="fmradiotunercontrolstub" long-name="FM Radio Tuner Control Stub">
+<unit bldFile="adaptation/stubs/audiostubs/fmradiotunercontrolstub/group"/>
+</component>
+</collection>
+<collection name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaptation Stub" level="adaptation">
+<component name="btaudioadaptation_stub_build" long-name="Bluetooth Audio Adaptation Stub Build" filter="oem_build">
+<unit bldFile="adaptation/stubs/btaudioadaptation_stub/group"/>
+</component>
+</collection>
+<collection name="drm_stubs" long-name="DRM Stubs" level="plugin">
+<component name="drm_stubs_build" long-name="DRM Stubs Build">
+<unit bldFile="adaptation/stubs/drm_stubs/group"/>
+</component>
+</collection>
+<collection name="ocrsrv_stub" long-name="OCR Services Stub" level="mid">
+<component name="ocrsrv_stub_build" long-name="OCR Services Stub Build" filter="!dfs_build">
+<unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
+</component>
+</collection>
+<collection name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
+<component name="omasuplasnconverterstubimpl_build" long-name="OMA SUPL ASN Converter Stub Implementation Build" filter="!dfs_build">
+<unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
+</component>
+</collection>
+<collection name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" level="plugin">
+<component name="posmsgpluginreferenceimpl_build" long-name="POS Message Plugin Reference Implementation Build" plugin="Y">
+<unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
+</component>
+</collection>
+<collection name="srsfenginestub" long-name="SRSF Engine Stub" level="engine">
+<component name="srsfenginestub_build" long-name="SRSF Engine Stub Build" filter="stubs">
+<unit bldFile="adaptation/stubs/srsfenginestub/group"/>
+</component>
+</collection>
+<collection name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub" level="plugin">
+<component name="power_save_display_mode_stub_build" long-name="Power Save Display Mode Stub Build">
+<unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
+</component>
+</collection>
+<collection name="systemswstubs" long-name="System Software Stubs" level="adaptation">
+<component name="ddcaccessstub" long-name="DDC Access Stub">
+<unit bldFile="adaptation/stubs/systemswstubs/ddcaccessstub/group"/>
+</component>
+<component name="tvoutconfig" long-name="TV Out Config">
+<unit bldFile="adaptation/stubs/systemswstubs/TVOutConfig/group" filter="oem_build"/>
+</component>
+<component name="accessorypolicyreference" long-name="Accessory Policy Reference">
+<unit bldFile="adaptation/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
+</component>
+<component name="asyreference" long-name="ASY Reference" plugin="Y">
+<unit bldFile="adaptation/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
+</component>
+<component name="examplecommonisc" long-name="Example Common ISC">
+<unit bldFile="adaptation/stubs/systemswstubs/examplecommonisc/group" filter="oem_build"/>
+</component>
+<component name="exampledsy" long-name="Example DSY">
+<unit bldFile="adaptation/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
+</component>
+<component name="featuremanagerstub" long-name="Feature Manager Stub">
+<unit bldFile="adaptation/stubs/systemswstubs/featuremanagerstub/group" filter="oem_build"/>
+</component>
+<component name="hwrmstubplugins" long-name="Hardware Resource Manager Stub Plugins" plugin="Y">
+<unit bldFile="adaptation/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
+</component>
+<component name="hwrmhapticsstubplugin" long-name="Hardware Resource Manager Haptics Stub Plugin" plugin="Y">
+<unit bldFile="adaptation/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
+</component>
+<component name="sensorchannelsreference" long-name="Sensor Channels Reference">
+<unit bldFile="adaptation/stubs/systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
+</component>
+<component name="ssyreference" long-name="SSY Reference" plugin="Y">
+<unit bldFile="adaptation/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
+</component>
+<component name="startupadaptationstub" long-name="Startup Adaptation Stub" plugin="Y">
+<unit bldFile="adaptation/stubs/systemswstubs/startupadaptationstub/group" filter="oem_build"/>
+</component>
+<component name="tiltcompensationstub" long-name="Tilt Compensation Stub">
+<unit bldFile="adaptation/stubs/systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
+</component>
+<component name="tvoutbehaviour" long-name="TV Out Behaviour">
+<unit bldFile="adaptation/stubs/systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
+</component>
+<component name="wiredbearerreference" long-name="Wired Bearer Reference" plugin="Y">
+<unit bldFile="adaptation/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
+</component>
+</collection>
+<collection name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" level="engine">
+<component name="tactileclickplugin_stub_build" long-name="Tactile Click Plugin Stub Build" plugin="Y">
+<unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
+</component>
+</collection>
+<collection name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub" level="mid">
+<component name="wlanhwinit_stub_build" long-name="WLAN Hardware Init Stub Build">
+<unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
+</component>
+</collection>
+</block>
+<block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
+<collection name="omap3530" long-name="OMAP 3530" level="hw-if">
+<component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
+<unit bldFile="adaptation/beagleboard/omap3530" mrp="adaptation/beagleboard/omap3530/base_beagle.mrp"/>
+</component>
+<component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
+<unit bldFile="adaptation/beagleboard/omap3530/kernel"/>
+</component>
+<component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
+<unit bldFile="adaptation/beagleboard/omap3530/beagleboard"/>
+</component>
+</collection>
+</block>
+<block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
+<collection name="qemu_baseport" long-name="Baseport" level="hw-if">
+<component name="syborg" long-name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
+<unit bldFile="adaptation/qemu/baseport/syborg" mrp="adaptation/qemu/baseport/syborg/syborg.mrp"/>
+</component>
+</collection>
+</block>
+</layer>
+<layer name="os" long-name="OS" levels="hw services">
+<block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
+<collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
+<component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
+<unit bldFile="os/kernelhwsrv/brdbootldr/ubootldr" mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
+</component>
+</collection>
+<collection name="bsptemplate" long-name="Board Support Package Template" level="hw-if">
+<component name="asspandvariant" long-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 name="kernel" long-name="Kernel Architecture" level="adaptation">
+<component name="eka" long-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 name="kerneltest" long-name="Kernel Test" level="hw-if">
+<component name="e32utils" long-name="E32 Utilities" purpose="development">
+<unit bldFile="os/kernelhwsrv/kerneltest/e32utils/group" mrp="os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/>
+</component>
+<component name="e32test" long-name="E32 Tests" purpose="development">
+<unit bldFile="os/kernelhwsrv/kerneltest/e32test/group" mrp="os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
+</component>
+<component name="f32test" long-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 name="ldds" long-name="Logical Device Drivers" level="adaptation">
+<component name="ethernetldd" long-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 name="audioldd" long-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>
+<component name="serialldd" long-name="Serial Port Drivers" purpose="optional">
+<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
+</component>
+<component name="legacydrivers" long-name="Legacy Drivers" purpose="optional">
+<unit mrp="os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
+</component>
+<component name="locmedia" long-name="Local Media Subsystem" introduced="8.1b" purpose="mandatory">
+<!-- these are LDDs for storage media-->
+<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
+</component>
+<component name="runmodedebugger" long-name="Run Mode Debugger" purpose="mandatory">
+<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/debug/group" mrp="os/kernelhwsrv/kernel/eka/drivers/debug/group/base_e32_drivers_debug.mrp"/>
+</component>
+<component name="btrace" long-name="Kernel Trace Tool" purpose="mandatory">
+<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/trace" mrp="os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
+</component>
+<component name="cameraldd" long-name="Camera Drivers" introduced="^3" purpose="optional">
+<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/camerasc" mrp="os/kernelhwsrv/kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
+</component>
+<component name="displayldd" long-name="Display Drivers" introduced="^3" purpose="optional">
+<!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
+<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/display" mrp="os/kernelhwsrv/kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
+</component>
+<component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b" purpose="optional">
+<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
+</component>
+<component name="usbdescriptors" long-name="USB Descriptors" purpose="optional">
+<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors" mrp="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors/base_drivers_usbdescriptors.mrp"/>
+</component>
+<component name="usbdi_utils" long-name="USB DI Utils" purpose="optional">
+<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils" mrp="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils/base_drivers_usbdi_utils.mrp"/>
+</component>
+</collection>
+<collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
+<component name="mediadrivers" long-name="Media Drivers" purpose="optional">
+<!-- these are for storage media-->
+<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/media" mrp="os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
+</component>
+<component name="genericboardsupport" long-name="Generic Board Support" purpose="optional">
+<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
+</component>
+</collection>
+<collection name="userlibandfileserver" long-name="User Library and File Server" level="framework">
+<component name="euser" long-name="User Library" purpose="mandatory">
+<unit bldFile="os/kernelhwsrv/kernel/eka/euser" mrp="os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
+</component>
+<component name="compsupp" long-name="Compiler Runtime Support" filter="gt" purpose="mandatory">
+<unit bldFile="os/kernelhwsrv/kernel/eka/compsupp" mrp="os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
+</component>
+<component name="fileserver" long-name="File Server" filter="gt" purpose="mandatory">
+<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
+</component>
+<component name="estart" long-name="Base Starter" filter="gt" purpose="optional">
+<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
+</component>
+<component name="domainmgr" long-name="Domain Manager" introduced="8.1b" purpose="mandatory">
+<unit bldFile="os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
+</component>
+</collection>
+<collection name="filesystems" long-name="File Systems" level="framework">
+<component name="romfs" long-name="ROM File System" filter="gt" purpose="optional" plugin="Y">
+<unit mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
+</component>
+<component name="rofs" long-name="ROFS" filter="gt" purpose="optional" plugin="Y">
+<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
+</component>
+<component name="usbmsfs" long-name="USB Mass Storage File System" filter="gt" purpose="optional" plugin="Y">
+<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
+</component>
+<component name="usbhostmssrv" long-name="USB Host Mass Storage Server" filter="gt" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage/base_f32_shostmassstorage.mrp"/>
+</component>
+<component name="fat32fs" long-name="FAT32 File System" filter="gt" purpose="optional" plugin="Y">
+<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
+</component>
+<component name="fatfs" long-name="FAT File System" filter="gt" purpose="optional" plugin="Y">
+<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
+</component>
+<component name="compfs" long-name="Composite File System" filter="gt" purpose="optional" plugin="Y">
+<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
+</component>
+</collection>
+<collection name="halservices" long-name="HAL Services" level="framework">
+<component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
+<unit bldFile="os/kernelhwsrv/halservices/hal" mrp="os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
+</component>
+</collection>
+<collection name="textmodeshell" long-name="Text Mode Shell" level="test">
+<component name="e32wsrv" long-name="Text Window Server" purpose="optional">
+<unit bldFile="os/kernelhwsrv/kernel/eka/ewsrv" mrp="os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
+</component>
+<component name="textshell" long-name="Text Shell" filter="gt" purpose="development">
+<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
+</component>
+</collection>
+<collection name="baseapitest" long-name="Base API Tests" level="test"/>
+<collection name="kernelhwsrv_info" long-name="Kernel and Hardware Services Info" level="test">
+<component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
+</component>
+<component name="kernelhwsrv_docpub" long-name="Kernel and Hardware Services Public Documentation" introduced="^3" purpose="development" class="doc">
+<unit mrp="os/kernelhwsrv/kernelhwsrv_info/doc_pub/kernelhwsrv_doc_pub.mrp"/>
+</component>
+</collection>
+</block>
+<block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 config">
+<collection name="emulator" long-name="Emulator" level="bsp">
+<component name="emulatorbsp" long-name="Emulator BSP" purpose="optional">
+<unit bldFile="os/boardsupport/emulator/emulatorbsp" mrp="os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
+</component>
+</collection>
+<collection name="haitest" long-name="HAI Test Suites" level="test">
+<component name="bspsvs" long-name="BSP Verification Suite" introduced="^2" purpose="development">
+<unit mrp="os/boardsupport/haitest/bspsvs/group/bspsvs.mrp"/>
+</component>
+</collection>
+<collection name="boardsupport_info" long-name="Board Support Info" level="config">
+<component name="boardsupport_metadata" long-name="Board Support Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/boardsupport/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
+<collection name="bldsystemtools" long-name="Build System Tools" level="bld">
+<component name="sysdeftools" long-name="System Definition Tools" purpose="development" introduced="^2">
+<unit mrp="os/buildtools/bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
+</component>
+<component name="commonbldutils" long-name="Common Utils" purpose="development">
+<unit mrp="os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
+</component>
+</collection>
+<collection name="toolsandutils" long-name="Tools and Utils" level="mw">
+<component name="productionbldtools" long-name="Production Build Tools" filter="gt" purpose="development">
+<unit mrp="os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
+</component>
+<component name="e32tools" long-name="E32 Tools" deprecated="^2" purpose="development" class="PC">
+<unit bldFile="os/buildtools/toolsandutils/e32tools/group" mrp="os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
+</component>
+<component name="autotest" long-name="Autotest" purpose="development">
+<unit bldFile="os/buildtools/toolsandutils/autotest/group" mrp="os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
+</component>
+</collection>
+<collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
+<component name="e32toolp" long-name="E32 Perl Tools" purpose="development" filter="sf_build" class="PC">
+<unit mrp="os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="os/buildtools/sbsv1_os/e32toolp/group"/>
+</component>
+</collection>
+<collection name="imgtools_os" long-name="Image Tools" level="fw">
+<component name="romkiteka2" long-name="ROMKIT EKA2" deprecated="^2" purpose="development">
+<unit bldFile="os/buildtools/imgtools_os/romkiteka2/group" mrp="os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
+</component>
+</collection>
+<collection name="misccomponents" long-name="Misc Components" level="mw">
+<component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt" purpose="development">
+<unit bldFile="os/buildtools/misccomponents/emulatorlauncher/group" mrp="os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
+</component>
+</collection>
+<collection name="buildtools_info" long-name="Build Tools Info" level="ui">
+<component name="buildtools_metadata" long-name="Build Tools Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/buildtools/buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
+<collection name="ossrv_pub" long-name="Generic OS Services Public Interfaces" level="utilities">
+<component name="boost_apis" long-name="Boost APIs" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/boost_apis/group"/>
+</component>
+<component name="cpp_wrappers" long-name="Cpp wrappers" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/cpp_wrappers/group"/>
+</component>
+<component name="character_type_apis" long-name="Character Type APIs" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/character_type_apis/group"/>
+</component>
+<component name="compiler_specific_runtime_support" long-name="Compiler Specific Runtime Support" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/compiler_specific_runtime_support/group"/>
+</component>
+<component name="ossrv_configuration_api" long-name="Generic OS Services Configuration API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/configuration/group"/>
+</component>
+<component name="crypto_authentication_codes_and_hash_functions_api" long-name="Crypto Authentication Codes and Hash Functions API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
+</component>
+<component name="crypto_auxillary_functions_api" long-name="Crypto Auxillary Functions API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/crypto_auxillary_functions_api/group"/>
+</component>
+<component name="crypto_certificates_api" long-name="Crypto Certificates API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/crypto_certificates_api/group"/>
+</component>
+<component name="crypto_inputoutput_and_data_encoding_api" long-name="Crypto Input/Output and Data Encoding API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
+</component>
+<component name="crypto_public_key_cryptography_and_key_agreement_api" long-name="Crypto Public Key Cryptography and Key Agreement API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
+</component>
+<component name="crypto_symmetric_ciphers_api" long-name="Crypto Symmetric Ciphers API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/crypto_symmetric_ciphers_api/group"/>
+</component>
+<component name="crypto_utility_functions_api" long-name="Crypto Utility Functions API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/crypto_utility_functions_api/group"/>
+</component>
+<component name="cryptogaphy_related_api" long-name="Cryptogaphy Related API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/cryptogaphy_related_api/group"/>
+</component>
+<component name="ossrv_debug_api" long-name="Generic OS Services Debug API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/debug/group"/>
+</component>
+<component name="ossrv_exceptions_api" long-name="Generic OS Services Exceptions API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/exceptions/group"/>
+</component>
+<component name="io_stream_api" long-name="I/O stream API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/io_stream_api/group"/>
+</component>
+<component name="localization_function_api" long-name="Localization Function API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/localization_function_api/group"/>
+</component>
+<component name="math_operations_api" long-name="Math Operations API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/math_operations_api/group"/>
+</component>
+<component name="ossrv_memory_api" long-name="Generic OS Services Memory API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/memory/group"/>
+</component>
+<component name="no_namespace_headers" long-name="No Namespace Headers" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/no_namespace_headers/group"/>
+</component>
+<component name="openc_headers" long-name="OpenC headers" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/openc_headers/group"/>
+</component>
+<component name="openc_wrappers" long-name="OpenC wrappers" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/openc_wrappers/group"/>
+</component>
+<component name="ssl_general_api" long-name="SSL General API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/ssl_general_api/group"/>
+</component>
+<component name="ssl_protocol_methods_api" long-name="SSL Protocol Methods API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/ssl_protocol_methods_api/group"/>
+</component>
+<component name="standard_compressiondecompression_api" long-name="Standard Compression/Decompression API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/standard_compressiondecompression_api/group"/>
+</component>
+<component name="stl" long-name="STL API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/stl/group"/>
+</component>
+<component name="thread_api" long-name="Thread API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/thread_api/group"/>
+</component>
+<component name="type_attributes" long-name="Type Attributes API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/type_attributes/group"/>
+</component>
+<component name="typeinfo" long-name="Type Info API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/typeinfo/group"/>
+</component>
+<component name="utility_apis" long-name="Utility APIs" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/utility_apis/group"/>
+</component>
+<component name="wide_character_classapis" long-name="Wide character class/apis" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/wide_character_classapis/group"/>
+</component>
+<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_api" long-name="D-Bus GLib API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/dbus-glib/group"/>
+</component>
+</collection>
+<collection name="ossrv_plat" long-name="Generic OS Services Platform Interfaces" level="utilities">
+<component name="libutils_apis" long-name="Utility Library APIs" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_plat/libutils/group"/>
+</component>
+</collection>
+<collection name="stdlibs" long-name="Standard Libraries" level="translation">
+<component name="libz" filter="s60" long-name="Z Compression Library">
+<unit bldFile="os/ossrv/stdlibs/libz/group"/>
+</component>
+<component name="libcrypt" filter="s60" long-name="Crypt Library">
+<unit bldFile="os/ossrv/stdlibs/libcrypt/group"/>
+</component>
+</collection>
+<collection name="ssl" long-name="SSL" level="data-services">
+<component name="libcrypto" filter="s60" long-name="Crypto Library">
+<unit bldFile="os/ossrv/ssl/libcrypto/group"/>
+</component>
+<component name="libssl" filter="s60" purpose="development" long-name="SSL Library">
+<unit bldFile="os/ossrv/ssl/libssl/group"/>
+</component>
+</collection>
+<collection name="glib" long-name="GLib" level="utilities">
+<component name="glibbackend" filter="s60" long-name="GLib Backend">
+<unit bldFile="os/ossrv/glib/build/symbian/glibbackend/group"/>
+<!-- Move to here: <unit bldFile="glib/glibbackend/group"/> -->
+</component>
+<component name="libglib" filter="s60" long-name="GLib Library">
+<unit bldFile="os/ossrv/glib/build/symbian/glib/group"/>
+<!-- Move to here: <unit bldFile="glib/libglib/group"/> -->
+</component>
+<component name="libgthread" filter="s60" long-name="Libg Thread">
+<unit bldFile="os/ossrv/glib/build/symbian/gthread/group"/>
+<!-- Move to here: <unit bldFile="glib/libgthread/group"/> -->
+</component>
+<component name="libgmodule" filter="s60" long-name="Libg Module">
+<unit bldFile="os/ossrv/glib/build/symbian/gmodule/group"/>
+<!-- Move to here: <unit bldFile="glib/libgmodule/group"/> -->
+</component>
+<component name="libgobject" filter="s60" long-name="Libg Object">
+<unit bldFile="os/ossrv/glib/build/symbian/gobject/group"/>
+<!-- Move to here: <unit bldFile="glib/libgobject/group"/> -->
+</component>
+</collection>
+<collection name="stdcpp" long-name="C++ Standard Library" level="translation">
+<!-- collection is really a component. Needs to be moved down a directory -->
+<component name="stdcpp_build" filter="s60" long-name="Stdcpp">
+<unit bldFile="os/ossrv/stdcpp/group"/>
+</component>
+</collection>
+<collection name="ofdbus" long-name="Open Foundation D-Bus" level="utilities">
+<component name="dbus" filter="s60" long-name="D-Bus">
+<unit bldFile="os/ossrv/ofdbus/dbus/group"/>
+</component>
+<component name="dbus-glib" filter="s60" long-name="D-Bus GLib">
+<unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
+</component>
+<component name="ofdbus_rom" filter="s60" long-name="D-Bus ROM">
+<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory
+ Consider moving IBY file to one of the above as well and removing this component entirely -->
+<unit bldFile="os/ossrv/ofdbus/group"/>
+</component>
+</collection>
+<collection name="utilitylibraries" long-name="Utility Libraries" level="encoding">
+<component name="libutils" filter="s60" long-name="Utility Library">
+<unit bldFile="os/ossrv/utilitylibraries/libutils/group"/>
+</component>
+</collection>
+<collection name="genericservices" long-name="Generic Services" level="utilities">
+<component name="s60compatibilityheaders" long-name="S60 Compatibility Headers" filter="gt" purpose="optional">
+<unit bldFile="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp" version="tb101sf"/>
+</component>
+<component name="mimerecognitionfw" long-name="MIME Recognition Framework" purpose="mandatory">
+<unit bldFile="os/ossrv/genericservices/mimerecognitionfw/group" mrp="os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
+</component>
+<component name="systemagent" long-name="System Agent" introduced="9.0" purpose="mandatory">
+<unit bldFile="os/ossrv/genericservices/systemagent/group" mrp="os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
+</component>
+<component name="taskscheduler" long-name="Task Scheduler" introduced="6.0" purpose="optional">
+<unit bldFile="os/ossrv/genericservices/taskscheduler/group" mrp="os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
+</component>
+<component name="activebackupclient" long-name="Active Backup Client" purpose="optional">
+<unit bldFile="os/ossrv/genericservices/activebackupclient/group" mrp="os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
+</component>
+<component name="syslibsdocs" long-name="Syslibs Documentation" purpose="development" class="doc">
+<unit mrp="os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
+</component>
+<component name="httputils" long-name="HTTP Utilities Library" introduced="6.2" purpose="optional">
+<unit bldFile="os/ossrv/genericservices/httputils/group" mrp="os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
+</component>
+</collection>
+<collection name="syslibsapitest" long-name="SysLibs API Tests" level="utilities"/>
+<collection name="compressionlibs" long-name="Compression Libraries" level="data-services">
+<component name="ziplib" long-name="Zip Compression Library" introduced="6.0" purpose="mandatory">
+<unit bldFile="os/ossrv/compressionlibs/ziplib/group" mrp="os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
+</component>
+</collection>
+<collection name="genericopenlibs" long-name="Generic Open Libraries" level="translation">
+<component name="cstdlib" long-name="C Standard Library" introduced="ER5" purpose="optional">
+<unit bldFile="os/ossrv/genericopenlibs/cstdlib/group" mrp="os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
+</component>
+<component name="cppstdlib" long-name="C++ Standard Library" introduced="^3" purpose="mandatory">
+<unit bldFile="os/ossrv/genericopenlibs/cppstdlib/group" mrp="os/ossrv/genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
+</component>
+<component name="openenvcore" long-name="Open Environment Core" introduced="^2" purpose="mandatory">
+<unit bldFile="os/ossrv/genericopenlibs/openenvcore/group" mrp="os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
+</component>
+<component name="posixrealtimeextensions" long-name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
+<unit bldFile="os/ossrv/genericopenlibs/posixrealtimeextensions/group" mrp="os/ossrv/genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
+</component>
+<component name="liboil" long-name="Liboil" introduced="^4" purpose="optional">
+<unit bldFile="os/ossrv/genericopenlibs/liboil/group" mrp="os/ossrv/genericopenlibs/liboil/group/oeaddons_liboil.mrp"/>
+</component>
+</collection>
+<collection name="lowlevellibsandfws" long-name="Low Level Libraries and Frameworks" level="app-libs">
+<component name="pluginfw" long-name="Plugin Framework" introduced="6.2" purpose="mandatory">
+<unit bldFile="os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp" version="3"/>
+</component>
+<component name="apputils" long-name="Application Utilities" introduced="ER5" purpose="mandatory">
+<unit bldFile="os/ossrv/lowlevellibsandfws/apputils/group" mrp="os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
+</component>
+<component name="genericusabilitylib" long-name="Generic Usability Library" introduced="^3" purpose="mandatory">
+<unit bldFile="os/ossrv/lowlevellibsandfws/genericusabilitylib/group" mrp="os/ossrv/lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
+</component>
+</collection>
+<collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
+<component name="ossrv_build" filter="s60" long-name="Generic OS Services Build">
+<!-- exports should be moved to individual components -->
+<unit bldFile="os/ossrv/group"/>
+</component>
+<component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
+<collection name="featuremgmt" long-name="Feature Management" level="framework">
+<component name="featuremgr" long-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 name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="^3" purpose="mandatory">
+<unit bldFile="os/persistentdata/featuremgmt/featureregistry/group" mrp="os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
+</component>
+</collection>
+<collection name="loggingservices" long-name="Logging Services" level="server">
+<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" 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">
+<unit bldFile="os/persistentdata/loggingservices/rfilelogger/group" mrp="os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
+</component>
+</collection>
+<collection name="traceservices" long-name="Trace Services" level="server">
+<component name="commsdebugutility" long-name="Comms Debug Utility" introduced="7.0s" purpose="optional">
+<unit bldFile="os/persistentdata/traceservices/commsdebugutility/group" mrp="os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
+</component>
+<component name="tracefw" long-name="Trace Framework" introduced="9.2" purpose="development">
+<unit bldFile="os/persistentdata/traceservices/tracefw/ulogger/group" mrp="os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
+</component>
+</collection>
+<collection name="persistentstorage" long-name="Persistent Storage" level="framework">
+<component name="store" long-name="Store" purpose="optional">
+<unit bldFile="os/persistentdata/persistentstorage/store/group" mrp="os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
+</component>
+<component name="dbms" long-name="DBMS" purpose="optional">
+<unit bldFile="os/persistentdata/persistentstorage/dbms/group" mrp="os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
+</component>
+<component name="centralrepository" long-name="Central Repository" introduced="7.0s" purpose="mandatory">
+<unit bldFile="os/persistentdata/persistentstorage/centralrepository/group" mrp="os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
+</component>
+<component name="sql" long-name="SQL" introduced="9.3" purpose="optional">
+<unit bldFile="os/persistentdata/persistentstorage/sql/GROUP" mrp="os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
+</component>
+<component name="sqlite3api" long-name="SQLite 3 API" introduced="^3" purpose="optional">
+<unit bldFile="os/persistentdata/persistentstorage/sqlite3api/GROUP" mrp="os/persistentdata/persistentstorage/sqlite3api/GROUP/syslibs_sqlite3.mrp"/>
+</component>
+</collection>
+<collection name="persistentdata_info" long-name="Persistent Data Services Info" level="app-if">
+<component name="persistentdata_metadata" long-name="Persistent Data Services Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/persistentdata/persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
+<collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
+<component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" class="api">
+<unit bldFile="os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
+</component>
+<component name="common_platform_security_definitions_api" long-name="Common Platform Security Definitions API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group"/>
+</component>
+<component name="feature_discovery_api" long-name="Feature Discovery API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/group"/>
+</component>
+<component name="platform_environment_api" long-name="Platform Environment API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_pub/platform_environment_api/group"/>
+</component>
+<component name="sensor_channel_api" long-name="Sensor Channel API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_pub/sensor_channel_api/group"/>
+</component>
+<component name="sensor_definitions_api" long-name="Sensor Definitions API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_pub/sensor_definitions_api/group"/>
+</component>
+<component name="version_info_api" long-name="Version Info API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/group"/>
+</component>
+<component name="accessory_monitoring_api" long-name="Accessory Monitoring API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/group"/>
+</component>
+<component name="haptics_api" long-name="Haptics API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_pub/haptics_api/group"/>
+</component>
+<component name="sensor_data_compensator_api" long-name="Sensor Data Compensator API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
+</component>
+</collection>
+<collection name="devicesrv_plat" long-name="Device Services Platform Interfaces" level="app-if">
+<component name="configuration_file_parser_api" long-name="Configuration File Parser API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/configuration_file_parser_api/group"/>
+</component>
+<component name="dos_extension_plugin_api" long-name="DOS Extension Plug-In API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_plugin_api/group"/>
+</component>
+<component name="mediator_command_initiator_api" long-name="Mediator Command Initiator API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_initiator_api/group"/>
+</component>
+<component name="syslangutil_api" long-name="SysLangUtil API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/syslangutil_api/group"/>
+</component>
+<component name="wakeup_alarm_api" long-name="Wakeup Alarm API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/wakeup_alarm_api/group"/>
+</component>
+<component name="disk_and_memory_level_keys_api" long-name="Disk and Memory Level Keys API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/disk_and_memory_level_keys_api/group"/>
+</component>
+<component name="mediator_plugin_api" long-name="Mediator Plugin API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/mediator_plugin_api/group"/>
+</component>
+<component name="headset_status_api" long-name="Headset Status API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/headset_status_api/group"/>
+</component>
+<component name="system_startup_extension_plugin_api" long-name="System Startup Extension Plugin API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/system_startup_extension_plugin_api/group"/>
+</component>
+<component name="sensor_plugin_api" long-name="Sensor Plugin API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/sensor_plugin_api/group"/>
+</component>
+<component name="accessory_api" long-name="Accessory API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/accessory_api/group"/>
+</component>
+<component name="display_language_definition_api" long-name="Display Language Definition API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/display_language_definition_api/group"/>
+</component>
+<component name="mediator_command_responder_api" long-name="Mediator Command Responder API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_responder_api/group"/>
+</component>
+<component name="accessory_policy_definitions_api" long-name="Accessory Policy Definitions API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_definitions_api/group"/>
+</component>
+<component name="hw_settings_api" long-name="Hardware Settings API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/hw_settings_api/group"/>
+</component>
+<component name="mediator_domain_definitions_api" long-name="Mediator Domain Definitions API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/mediator_domain_definitions_api/group"/>
+</component>
+<component name="sensor_extension_api" long-name="Sensor Extension API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/sensor_extension_api/group"/>
+</component>
+<component name="accessory_plugin_api" long-name="Accessory Plugin API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/accessory_plugin_api/group"/>
+</component>
+<component name="sae_api" long-name="SAE API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/sae_api/group"/>
+</component>
+<component name="accessory_control_api" long-name="Accessory Control API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/accessory_control_api/group"/>
+</component>
+<component name="mediator_static_registration_api" long-name="Mediator Static Registration API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/mediator_static_registration_api/group"/>
+</component>
+<component name="accessory_key_event_handling_api" long-name="Accessory Key Event Handling API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/accessory_key_event_handling_api/group"/>
+</component>
+<component name="mediator_notification_api" long-name="Mediator Notification API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/mediator_notification_api/group"/>
+</component>
+<component name="accessory_policy_utility_api" long-name="Accessory Policy Utility API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_utility_api/group"/>
+</component>
+<component name="common_dsy_plugin_api" long-name="Common DSY Plugin API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/common_dsy_plugin_api/group"/>
+</component>
+<component name="remote_control_extension_api" long-name="Remote Control Extension API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/remote_control_extension_api/group"/>
+</component>
+<component name="sensor_channel_filter_api" long-name="Sensor Channel Filter API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/sensor_channel_filter_api/group"/>
+</component>
+<component name="dos_extension_api" long-name="DOS Extension API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_api/group"/>
+</component>
+<component name="accessory_audio_control_api" long-name="Accessory Audio Control API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/accessory_audio_control_api/group"/>
+</component>
+<component name="mediator_event_consumer_api" long-name="Mediator Event Consumer API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_consumer_api/group"/>
+</component>
+<component name="shared_data_api" long-name="Shared Data API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/shared_data_api/group"/>
+</component>
+<component name="accessory_settings_api" long-name="Accessory Settings API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/accessory_settings_api/group"/>
+</component>
+<component name="accessory_bluetooth_control_api" long-name="Accessory Bluetooth Control API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/accessory_bluetooth_control_api/group"/>
+</component>
+<component name="extended_version_info_api" long-name="Extended Version Info API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_api/group"/>
+</component>
+<component name="mediator_event_provider_api" long-name="Mediator Event Provider API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_provider_api/group"/>
+</component>
+<component name="tv_out_config_api" long-name="TV Out Config API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_config_api/group"/>
+</component>
+<component name="tspclientmapper_api" long-name="TSP Client Mapper API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/tspclientmapper_api/group"/>
+</component>
+<component name="powersave_api" long-name="Power Save API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/powersave_api/group"/>
+</component>
+<component name="powersave_definitions_api" long-name="Power Save Definitions API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/powersave_definitions_api/group"/>
+</component>
+<component name="powersave_plugin_api" long-name="Power Save Plugin API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/powersave_plugin_api/group"/>
+</component>
+<component name="extended_version_info_plugin_api" long-name="Extended Version Info Plugin API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_plugin_api/group"/>
+</component>
+<component name="haptics_plugin_api" long-name="Haptics Plugin API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/haptics_plugin_api/group"/>
+</component>
+<component name="haptics_effect_data_getter_plugin_api" long-name="Haptics Effect Data Getter Plugin API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
+</component>
+<component name="haptics_packetizer_plugin_api" long-name="Haptics Packetizer Plugin API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/haptics_packetizer_plugin_api/group"/>
+</component>
+<component name="tiltcompensation_api" long-name="Tilt Compensation API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/tiltcompensation_api/group"/>
+</component>
+<component name="disk_notification_handler_api" long-name="Disk Notification Handler API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/disk_notification_handler_api/group"/>
+</component>
+<component name="accessory_policy_usb_audio_api" long-name="Accessory Policy USB Audio API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_usb_audio_api/group"/>
+</component>
+<component name="accessory_policy_hdmi_audio_api" long-name="Accessory Policy HDMI Audio API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_hdmi_audio_api/group"/>
+</component>
+<component name="sensor_data_compensator_plugin_api" long-name="Sensor Data Compensator Plugin API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
+</component>
+<component name="ddc_access_api" long-name="DDC Access API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/ddc_access_api/group"/>
+</component>
+<component name="tv_out_behaviour_api" long-name="TV Out Behaviour API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_behaviour_api/group"/>
+</component>
+<component name="autoaudio_plugin_api" long-name="Auto Audio Plugin API" filter="s60" introduced="^4" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/autoaudio_plugin_api/group"/>
+</component>
+</collection>
+<collection name="accessoryservices" long-name="Accessory Services" level="framework">
+<component name="accessorymonitor" filter="s60" long-name="Accessory Monitor">
+<unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/group"/>
+</component>
+<component name="accessoryremotecontrol" filter="s60" long-name="Accessory Remote Control">
+<unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
+</component>
+<component name="accessoryserver" filter="s60" long-name="Accessory Server">
+<unit bldFile="os/devicesrv/accessoryservices/accessoryserver/group"/>
+</component>
+<component name="pluggeddisplay" filter="s60" long-name="Plugged Display" introduced="^3">
+<unit bldFile="os/devicesrv/accessoryservices/pluggeddisplay/group"/>
+</component>
+<component name="headsetstatusapi" filter="s60" long-name="Headset Status API">
+<unit bldFile="os/devicesrv/accessoryservices/headsetstatusapi/group"/>
+</component>
+<component name="tspclientmapper" filter="s60" long-name="TSP Client Mapper">
+<unit bldFile="os/devicesrv/accessoryservices/tspclientmapper/group"/>
+</component>
+<component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional" filter="s60">
+<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
+</component>
+<component name="gid_pc_tool" filter="s60" long-name="Generic ID PC Tool" class="tool PC">
+<unit bldFile="os/devicesrv/accessoryservices/gid_pc_tool/group"/>
+</component>
+<component name="autoaudioasy" filter="s60" long-name="Auto Audio Plugin" introduced="^4" plugin="Y">
+<unit bldFile="os/devicesrv/accessoryservices/autoaudioasy/group"/>
+</component>
+</collection>
+<collection name="commonservices" long-name="Common Services" level="app-if">
+<component name="commonengine" filter="s60" long-name="Common Engine">
+<unit bldFile="os/devicesrv/commonservices/commonengine/group"/>
+</component>
+<component name="commonengineresources" filter="s60" long-name="Common Engine Resources" class="config">
+<unit bldFile="os/devicesrv/commonservices/commonengineresources/group"/>
+</component>
+<component name="platformenv" filter="s60" long-name="Platform Environment">
+<unit bldFile="os/devicesrv/commonservices/platformenv/group"/>
+</component>
+<component name="sysutil" long-name="System Utilities" purpose="mandatory" introduced="ER5" filter="s60">
+<unit bldFile="os/devicesrv/commonservices/sysutil/group" mrp="os/devicesrv/commonservices/sysutil/group/sysutil.mrp"/>
+</component>
+<component name="activitymanager" long-name="Activity Manager" purpose="mandatory" introduced="ER5" filter="s60">
+<unit bldFile="os/devicesrv/commonservices/activitymanager/group" mrp="os/devicesrv/commonservices/activitymanager/group/activitymanager.mrp"/>
+</component>
+</collection>
+<collection name="dosservices" long-name="Domestic Operating System Services" level="hw-if">
+<component name="commondsy" filter="s60" long-name="Common DSY" plugin="Y">
+<unit bldFile="os/devicesrv/dosservices/commondsy/group"/>
+</component>
+<component name="dosserver" filter="s60" long-name="Domestic OS Server">
+<unit bldFile="os/devicesrv/dosservices/dosserver/group"/>
+</component>
+</collection>
+<collection name="sensorservices" long-name="Sensor Services" level="framework">
+<component name="sensorserver" filter="s60" long-name="Sensor Server">
+<unit bldFile="os/devicesrv/sensorservices/sensorserver/group"/>
+</component>
+<component name="orientationssy" filter="s60" long-name="Orientation SSY" plugin="Y">
+<unit bldFile="os/devicesrv/sensorservices/orientationssy/group"/>
+</component>
+<component name="tiltcompensationssy" filter="s60" long-name="Tilt Compensation SSY" plugin="Y">
+<unit bldFile="os/devicesrv/sensorservices/tiltcompensationssy/group"/>
+</component>
+<component name="sensordatacompensator" filter="s60" long-name="Sensor Data Compensator">
+<unit bldFile="os/devicesrv/sensorservices/sensordatacompensator/group"/>
+</component>
+</collection>
+<collection name="hwrmhaptics" long-name="HWRM Haptics" level="plugin">
+<component name="hapticseffectdatagetterfw" filter="s60" long-name="Haptics Effect Data Getter Framework">
+<unit bldFile="os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
+</component>
+<component name="hapticspluginservice" filter="s60" long-name="Haptics Plugin Service">
+<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
+</component>
+<component name="hapticspacketizer" filter="s60" long-name="Haptics Packetizer">
+<unit bldFile="os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
+</component>
+<component name="hapticspluginmanager" filter="s60" long-name="Haptics Plugin Manager">
+<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
+</component>
+<component name="hapticsserver" filter="s60" long-name="Haptics Server">
+<unit bldFile="os/devicesrv/hwrmhaptics/hapticsserver/group"/>
+</component>
+<component name="hapticsclient" filter="s60" long-name="Haptics Client">
+<unit bldFile="os/devicesrv/hwrmhaptics/hapticsclient/group"/>
+</component>
+<component name="hwrmhaptics_build" filter="s60" long-name="HWRM Haptics Build">
+<!-- move these exports into the appropriate above components and delete this component-->
+<unit bldFile="os/devicesrv/hwrmhaptics/group"/>
+</component>
+</collection>
+<collection name="mediator" long-name="Mediator" level="app-if">
+<!--collection is really a component. Move it down a directory -->
+<component name="mediator_build" filter="s60" long-name="Mediator Build">
+<unit bldFile="os/devicesrv/mediator/group"/>
+</component>
+</collection>
+<collection name="psmservices" long-name="Power Save Mode Services" level="app-if">
+<component name="psmserver" filter="s60" long-name="PSM Server">
+<unit bldFile="os/devicesrv/psmservices/psmserver/group"/>
+</component>
+</collection>
+<collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
+<component name="hwrmfmtxwatcherplugin" filter="s60" long-name="HWRM FM Transmitter Watcher Plugin" plugin="Y">
+<unit bldFile="os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
+</component>
+<component name="hwrmtargetmodifierplugin" filter="s60" long-name="HWRM Target Modifier Plugin" plugin="Y">
+<unit bldFile="os/devicesrv/resourcemgmt/hwrmtargetmodifierplugin/group"/>
+</component>
+<component name="vibractrl" filter="s60" long-name="Vibra Control" deprecated="9.1">
+<unit bldFile="os/devicesrv/resourcemgmt/vibractrl/group"/>
+</component>
+<component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="^2" purpose="optional" filter="s60">
+<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
+</component>
+<component name="hwresourcesmgrconfig" long-name="Hardware Resources Manager Config" introduced="^3" purpose="optional" filter="s60" class="config">
+<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
+</component>
+<component name="resourcemgmt_data" filter="s60" long-name="Resource Management Data" class="config">
+<!-- Move exports to a self-contained component. Or leave as a component but move down a dir -->
+<unit bldFile="os/devicesrv/resourcemgmt/group"/>
+</component>
+<component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
+<unit bldFile="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
+</component>
+</collection>
+<collection name="sysstatemgmt" long-name="System State Management" level="server">
+<component name="ssmmapperutility" filter="s60" long-name="SSM Mapper Utility" introduced="^3">
+<unit bldFile="os/devicesrv/sysstatemgmt/ssmmapperutility/group"/>
+</component>
+<component name="ssmpolicyplugins" filter="s60" long-name="SSM Policy Plugins" introduced="^3" plugin="Y">
+<unit bldFile="os/devicesrv/sysstatemgmt/ssmpolicyplugins/group"/>
+</component>
+<component name="ssmutilityplugins" filter="s60" long-name="SSM Utility Plugins" introduced="^3" plugin="Y">
+<unit bldFile="os/devicesrv/sysstatemgmt/ssmutilityplugins/group"/>
+</component>
+<component name="ssmcmdlists" filter="s60" long-name="SSM Command Lists" introduced="^3">
+<unit bldFile="os/devicesrv/sysstatemgmt/ssmcmdlists/group"/>
+</component>
+<component name="ssmcustcmds" filter="s60" long-name="SSM Custom Commands" introduced="^3">
+<unit bldFile="os/devicesrv/sysstatemgmt/ssmcustcmds/group"/>
+</component>
+<component name="syslangutil" filter="s60" long-name="System Language Utility" introduced="^3">
+<unit bldFile="os/devicesrv/sysstatemgmt/syslangutil/group"/>
+</component>
+<component name="sysrestart" filter="s60" long-name="System Restart" introduced="^3">
+<unit bldFile="os/devicesrv/sysstatemgmt/sysrestart/group"/>
+</component>
+<component name="sysuiprovider" filter="s60" long-name="System UI Provider" introduced="^3">
+<unit bldFile="os/devicesrv/sysstatemgmt/sysuiprovider/group"/>
+</component>
+<component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory" filter="s60">
+<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/group" mrp="os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
+</component>
+<component name="systemstatemgr" long-name="System State Manager" introduced="^3" purpose="mandatory" filter="s60">
+<unit bldFile="os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
+</component>
+<component name="systemstateplugins" long-name="System State Plugins" introduced="^3" purpose="optional" filter="s60" plugin="Y">
+<unit bldFile="os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
+</component>
+<component name="systemstatereferenceplugins" long-name="System State Reference Plugins" introduced="^3" purpose="optional" filter="s60" plugin="Y">
+<unit bldFile="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
+</component>
+</collection>
+<collection name="resourceinterfaces" long-name="Resource Interfaces" level="hw-if">
+<component name="fmtransmittercontrol" long-name="FM Transmitter Control" introduced="^3" purpose="optional">
+<unit bldFile="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group" mrp="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
+</component>
+</collection>
+<collection name="systemhealthmanagement" long-name="System Health Management" level="server">
+<component name="systemhealthmgr" long-name="System Health Manager" introduced="^3" purpose="optional" filter="s60">
+<unit bldFile="os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
+</component>
+</collection>
+<collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if"/>
+<collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
+<component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
+<collection name="authenticationservices" long-name="Authentication Services" level="utilities">
+<component name="authenticationserver" long-name="Authentication Server" introduced="^4" purpose="optional">
+<unit bldFile="os/security/authenticationservices/authenticationserver/group" mrp="os/security/authenticationservices/authenticationserver/group/security_authserver.mrp"/>
+</component>
+</collection>
+<collection name="authorisation" long-name="Authorisation" level="utilities">
+<component name="userpromptservice" long-name="User Prompt Service" introduced="^3" purpose="mandatory">
+<unit bldFile="os/security/authorisation/userpromptservice/group" mrp="os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
+</component>
+<component name="userpromptutils" long-name="User Prompt Utils" introduced="^3" purpose="optional">
+<unit bldFile="os/security/authorisation/userpromptutils/group" mrp="os/security/authorisation/userpromptutils/group/security_ups_utils.mrp"/>
+</component>
+</collection>
+<collection name="contentmgmt" long-name="Content Management" level="utilities">
+<component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
+<unit bldFile="os/security/contentmgmt/contentaccessfwfordrm/group" mrp="os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
+</component>
+<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">
+<unit bldFile="os/security/crypto/weakcryptospi/group" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
+</component>
+<component name="strongcryptospi" long-name="Strong Crypto SPI" filter="gt" introduced="^3" purpose="optional">
+<unit bldFile="os/security/crypto/weakcryptospi/strong" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
+</component>
+</collection>
+<collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
+<component name="securityutils" long-name="Security Utils" introduced="8.0" purpose="optional">
+<unit bldFile="os/security/cryptomgmtlibs/securityutils/group" mrp="os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
+</component>
+<component name="securitydocs" long-name="Security Documentation" purpose="development" class="doc">
+<unit mrp="os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
+</component>
+<component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0" purpose="optional">
+<unit bldFile="os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
+</component>
+<component name="securitycommonutils" long-name="Security Common Utils" introduced="8.0" purpose="mandatory">
+<unit bldFile="os/security/cryptomgmtlibs/securitycommonutils/group" mrp="os/security/cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
+</component>
+</collection>
+<collection name="securityanddataprivacytools" long-name="Security and Data Privacy Tools" level="services">
+<component name="securityconfig" long-name="Security Config" introduced="9.1" purpose="optional">
+<unit bldFile="os/security/securityanddataprivacytools/securityconfig/group" mrp="os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
+</component>
+<component name="securitytools" long-name="Security Tools" introduced="^3" purpose="optional" class="PC">
+<unit bldFile="os/security/securityanddataprivacytools/securitytools/group" mrp="os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
+</component>
+</collection>
+<collection name="cryptoplugins" long-name="Crypto Plugins" level="plugins">
+<component name="cryptospiplugins" long-name="Crypto SPI Plugins" filter="gt" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/security/cryptoplugins/cryptospiplugins/group" mrp="os/security/cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
+</component>
+</collection>
+<collection name="cryptoservices" long-name="Crypto Services" level="plugins">
+<component name="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0" purpose="optional">
+<unit bldFile="os/security/cryptoservices/certificateandkeymgmt/group" mrp="os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
+</component>
+<component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
+<unit bldFile="os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
+</component>
+<component name="browserrootcertificates" long-name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
+<unit mrp="os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
+</component>
+<component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional">
+<unit bldFile="os/security/cryptoservices/asnpkcs/group" mrp="os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
+</component>
+</collection>
+<collection name="security_info" long-name="OS Security Info" level="utilities">
+<component name="security_metadata" long-name="OS Security Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/security/security_info/security_metadata/security_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
+<collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
+<component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
+<unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
+</component>
+<component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" introduced="^2" purpose="optional" plugin="Y">
+<unit bldFile="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
+</component>
+<component name="simulationpositioningmodule" long-name="Simulation Positioning Module" introduced="^2" purpose="development" plugin="Y">
+<unit bldFile="os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
+</component>
+<component name="gpspositioningmodule" long-name="GPS/A-GPS Positioning Module" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/lbs/datasourcemodules/gpspositioningmodule/group" mrp="os/lbs/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
+</component>
+<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 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="adaptation">
+<component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
+<unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
+</component>
+</collection>
+<collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
+<component name="locationserver" long-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 name="networkrequesthandler" long-name="Network Request Handler" introduced="9.2" purpose="optional">
+<unit bldFile="os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
+</component>
+</collection>
+<collection name="lbstest" long-name="Locating Services Tests" level="application-interface">
+<component name="locationprotocoltest" long-name="Location Protocol Tests" introduced="9.2" purpose="development" plugin="Y">
+<unit bldFile="os/lbs/lbstest/locationprotocoltest/group" mrp="os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
+</component>
+</collection>
+<collection name="locationmgmt" long-name="Location Management" level="management">
+<component name="locmonitor" long-name="Location Monitor" introduced="^3" purpose="optional">
+<unit bldFile="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
+</component>
+<component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2" purpose="optional">
+<unit bldFile="os/lbs/locationmgmt/agpslocationmgr/group" mrp="os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
+</component>
+<component name="networklocationmgr" long-name="Network Location Manager" introduced="9.2" purpose="optional">
+<unit bldFile="os/lbs/locationmgmt/networklocationmgr/group" mrp="os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
+</component>
+<component name="locationcore" long-name="Location Core" introduced="9.2" purpose="optional">
+<unit bldFile="os/lbs/locationmgmt/locationcore/group" mrp="os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
+</component>
+<component name="networkgateway" long-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 name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
+<component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
+<unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
+</component>
+<component name="networkpmutils" long-name="Network Protocol Module Utilities" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/lbs/networkprotocolmodules/networkpmutils/group" mrp="os/lbs/networkprotocolmodules/networkpmutils/group/lbs_networkpmutils.mrp"/>
+</component>
+<component name="suplpmcore" long-name="SUPL Protocol Module Core" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/lbs/networkprotocolmodules/suplpmcore/group" mrp="os/lbs/networkprotocolmodules/suplpmcore/group/lbs_suplpmcore.mrp"/>
+</component>
+<component name="networkpmasn1_pub" long-name="Network Protocol Module ASN1 Public Interfaces" introduced="^3" purpose="optional" class="api">
+<unit bldFile="os/lbs/networkprotocolmodules/networkpmasn1_pub/group" mrp="os/lbs/networkprotocolmodules/networkpmasn1_pub/group/lbs_networkpmasn1_pub.mrp"/>
+</component>
+<component name="suplcontrolplaneprotocols" long-name="SUPL Control Plane Protocols" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/group" mrp="os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/group/lbs_suplcontrolplaneprotocols.mrp"/>
+</component>
+<component name="suplproxyprotocolmodule" long-name="SUPL Proxy Protocol Module" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
+</component>
+<component name="suplprotocolmodule" long-name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" plugin="Y">
+<unit bldFile="os/lbs/networkprotocolmodules/suplprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
+</component>
+</collection>
+<collection name="lbsapitest" long-name="Location API Tests" level="application-interface"/>
+<collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
+<component name="lbs_metadata" long-name="Locating Services Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="commsfw" level="services" long-name="Communications Framework" levels="server support framework process app-if">
+<collection name="commsprocess" long-name="Comms Process" level="process">
+<component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s" purpose="mandatory">
+<unit bldFile="os/commsfw/commsprocess/commsrootserverconfig/group" mrp="os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
+</component>
+</collection>
+<collection name="commsconfig" long-name="Comms Config" level="process">
+<component name="commsdatabase" long-name="Comms Database" purpose="mandatory">
+<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
+</component>
+<component name="commsdatabaseshim" long-name="Comms Database Shim" introduced="8.1" purpose="mandatory">
+<unit bldFile="os/commsfw/commsconfig/commsdatabaseshim/group" mrp="os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
+</component>
+</collection>
+<collection name="datacommsserver" long-name="Data Comms Server" level="framework">
+<component name="esockserver" long-name="ESock Server" purpose="mandatory">
+<unit bldFile="os/commsfw/datacommsserver/esockserver/group" mrp="os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp" version="3"/>
+</component>
+<component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1" purpose="optional">
+<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/group" mrp="os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
+</component>
+<component name="networkingdialogstub" long-name="Networking Dialog Stub" introduced="6.1" purpose="optional">
+<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/default" mrp="os/commsfw/datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
+</component>
+<component name="networkcontroller" long-name="Network Controller" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="os/commsfw/datacommsserver/networkcontroller/group" mrp="os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
+</component>
+</collection>
+<collection name="serialserver" long-name="Serial Server" level="server">
+<component name="serialportcsy" long-name="Serial Port CSY" introduced="ER5" purpose="optional" plugin="Y">
+<unit bldFile="os/commsfw/serialserver/serialportcsy" mrp="os/commsfw/serialserver/serialportcsy/ser-comms_serialportcsy.mrp"/>
+</component>
+<component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" purpose="development">
+<unit bldFile="os/commsfw/serialserver/packetloopbackcsy/group" mrp="os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
+</component>
+<component name="c32serialserver" long-name="C32 Serial Server" introduced="ER5" purpose="mandatory">
+<unit bldFile="os/commsfw/serialserver/c32serialserver/group" mrp="os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
+</component>
+<component name="c32serialserverconfig" long-name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config">
+<unit bldFile="os/commsfw/serialserver/c32serialserverconfig" mrp="os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
+</component>
+<component name="c32serialserverdocs" long-name="C32 Serial Server Documentation" purpose="development" class="doc">
+<unit mrp="os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
+</component>
+</collection>
+<collection name="commsfwutils" long-name="Comms Framework Utilities" level="framework">
+<component name="commsbufs" long-name="Comms Buffers" introduced="^3" purpose="mandatory">
+<unit bldFile="os/commsfw/commsfwutils/commsbufs/group" mrp="os/commsfw/commsfwutils/commsbufs/group/comms-infras_commsbufs.mrp"/>
+</component>
+</collection>
+<collection name="commsfw_info" long-name="Comms Framework Info" level="app-if">
+<component name="commsinfrastructuredocs" long-name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
+<unit mrp="os/commsfw/commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
+</component>
+<component name="commsfw_metadata" long-name="Communications Framework Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/commsfw/commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
+</component>
+</collection>
+<collection name="commsfwsupport" long-name="Comms Framework Support" level="support">
+<component name="commselements" long-name="Comms Elements" introduced="8.0" purpose="mandatory">
+<unit bldFile="os/commsfw/commsfwsupport/commselements/group" mrp="os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
+</component>
+</collection>
+<collection name="commsinfrastructureapitest" long-name="Comms-Infras API Tests" level="app-if">
+<component name="commsinfrastructuresvs" long-name="Comms Infrastructure Verification Suite" introduced="^3" purpose="development">
+<unit mrp="os/commsfw/commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
+</component>
+</collection>
+<collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
+<component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC">
+<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
+</component>
+<component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" purpose="mandatory" class="PC">
+<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
+</component>
+<component name="commstools" long-name="Comms Tools" introduced="^3" purpose="development" class="PC">
+<unit bldFile="os/commsfw/commsfwtools/commstools/group" mrp="os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
+</component>
+</collection>
+</block>
+<block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
+<collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
+<component name="internetsockets" long-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>
+<collection name="tcpiputils" long-name="TCP/IP Utilities" level="plugin">
+<component name="dnd" long-name="DND" introduced="7.0" purpose="mandatory">
+<unit bldFile="os/networkingsrv/tcpiputils/dnd/group" mrp="os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
+</component>
+<component name="dhcp" long-name="DHCP" introduced="8.0" purpose="optional">
+<unit bldFile="os/networkingsrv/tcpiputils/dhcp/group" mrp="os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
+</component>
+<component name="networkaddressandporttranslation" long-name="Network Address and Port Translation" introduced="^2" purpose="mandatory" plugin="Y">
+<unit bldFile="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
+</component>
+<component name="punycodeconv" long-name="Punycode Converter" introduced="^3" purpose="mandatory">
+<unit bldFile="os/networkingsrv/tcpiputils/punycodeconv/group" mrp="os/networkingsrv/tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
+</component>
+</collection>
+<collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
+<component name="nullagt" long-name="NULL AGT" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="os/networkingsrv/linklayercontrol/nullagt/group" mrp="os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
+</component>
+<component name="genericscprparameters" long-name="Generic SCPR Parameters" introduced="^3" purpose="optional">
+<unit bldFile="os/networkingsrv/linklayercontrol/genericscprparameters/group" mrp="os/networkingsrv/linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
+</component>
+<component name="mbmsparameters" long-name="MBMS Parameters" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/networkingsrv/linklayercontrol/mbmsparameters/group" mrp="os/networkingsrv/linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
+</component>
+<component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
+<unit bldFile="os/networkingsrv/linklayercontrol/networkinterfacemgr/group" mrp="os/networkingsrv/linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp" version="2"/>
+</component>
+</collection>
+<collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
+<component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y">
+<unit bldFile="os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
+</component>
+<component name="pppnif" long-name="PPP NIF" introduced="ER5" purpose="optional" plugin="Y">
+<unit bldFile="os/networkingsrv/linklayerprotocols/pppnif/group" mrp="os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp" version="2"/>
+</component>
+<component name="slipnif" long-name="SLIP NIF" purpose="development" plugin="Y">
+<unit bldFile="os/networkingsrv/linklayerprotocols/slipnif/group" mrp="os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
+</component>
+<component name="tunnelnif" long-name="Tunnel NIF" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
+</component>
+</collection>
+<collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
+<component name="packetlogger" long-name="Packet Logger" introduced="8.1" purpose="development">
+<unit bldFile="os/networkingsrv/linklayerutils/packetlogger/group" mrp="os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
+</component>
+</collection>
+<collection name="networkcontrol" long-name="Network Control" level="plugin">
+<component name="qoslib" long-name="QoS Library" introduced="7.0s" purpose="optional">
+<unit bldFile="os/networkingsrv/networkcontrol/qoslib/group" mrp="os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
+</component>
+<component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s" purpose="optional">
+<unit bldFile="os/networkingsrv/networkcontrol/pfqoslib/group" mrp="os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
+</component>
+<component name="qosfwprt" long-name="QoS Framework PRT" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
+</component>
+<component name="qosipscpr" long-name="QoS IP SCPR" purpose="optional" plugin="Y">
+<unit bldFile="os/networkingsrv/networkcontrol/qosipscpr/group" mrp="os/networkingsrv/networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
+</component>
+<component name="ipnetworklayer" long-name="IP Network Layer" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/networkingsrv/networkcontrol/ipnetworklayer/group" mrp="os/networkingsrv/networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
+</component>
+<component name="iptransportlayer" long-name="IP Transport Layer" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/networkingsrv/networkcontrol/iptransportlayer/group" mrp="os/networkingsrv/networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
+</component>
+<component name="commsuserpromptmgr" long-name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
+<unit bldFile="os/networkingsrv/networkcontrol/commsuserpromptmgr/group" mrp="os/networkingsrv/networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
+</component>
+</collection>
+<collection name="networkprotocols" long-name="Network Protocols" level="plugin">
+<component name="ipeventnotifier" long-name="IP Event Notifier" introduced="8.1" purpose="mandatory" plugin="Y">
+<unit bldFile="os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
+</component>
+<component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" plugin="Y">
+<unit bldFile="os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
+</component>
+<component name="iphook" long-name="IP Hook" introduced="7.0" purpose="mandatory">
+<unit bldFile="os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
+</component>
+<component name="mobileip" long-name="Mobile IP" introduced="8.1" purpose="optional" plugin="Y">
+<unit bldFile="os/networkingsrv/networkprotocols/mobileip/group" mrp="os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
+</component>
+<component name="dnsproxy" long-name="DNS Proxy" introduced="^3" purpose="optional">
+<unit bldFile="os/networkingsrv/networkprotocols/dnsproxy/group" mrp="os/networkingsrv/networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
+</component>
+</collection>
+<collection name="networksecurity" long-name="Network Security" level="framework">
+<component name="tls" long-name="TLS" introduced="6.0" purpose="mandatory">
+<unit bldFile="os/networkingsrv/networksecurity/tls/group" mrp="os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
+</component>
+<component name="tlsprovider" long-name="TLS Provider" introduced="8.1" purpose="mandatory">
+<unit bldFile="os/networkingsrv/networksecurity/tlsprovider/group" mrp="os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
+</component>
+<component name="ipsec" long-name="IPsec" introduced="7.0" purpose="optional">
+<unit bldFile="os/networkingsrv/networksecurity/ipsec/group" mrp="os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
+</component>
+</collection>
+<collection name="networkingtestandutils" long-name="Networking Test and Utils" level="app-if">
+<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>
+</collection>
+<collection name="networkingsrv_info" long-name="Networking Services Info" level="app-if">
+<component name="networkingrom" long-name="Networking ROM" purpose="mandatory">
+<!-- production component: contains the IBY files -->
+<unit bldFile="os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
+</component>
+<component name="networkingdocs" long-name="Networking Documentation" purpose="development" class="doc">
+<unit mrp="os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
+</component>
+<component name="networkingsrv_metadata" long-name="Networking Services Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
+</component>
+</collection>
+<collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
+<component name="predictorcompression" long-name="Predictor Compression" introduced="6.0" purpose="optional" plugin="Y">
+<unit bldFile="os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
+</component>
+</collection>
+</block>
+<block name="wlan" level="services" long-name="WLAN" levels="hw low mid high tools test">
+<collection name="wlan_plat" long-name="WLAN Platform Interfaces" level="test">
+<component name="wlan_dbif_api" long-name="WLAN DBIF API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_dbif_api/group"/>
+</component>
+<component name="wlan_hal_api" long-name="WLAN HAL API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_hal_api/group"/>
+</component>
+<component name="wlan_management_api" long-name="WLAN Management API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_management_api/group"/>
+</component>
+<component name="wlan_device_settings_api" long-name="WLAN Device Settings API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_device_settings_api/group"/>
+</component>
+<component name="wlan_control_api" long-name="WLAN Control API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_control_api/group"/>
+</component>
+<component name="wlan_hw_initialization_data_api" long-name="WLAN Hardware Initialization Data API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_hw_initialization_data_api/group"/>
+</component>
+<component name="wlan_power_save_plugin_api" long-name="WLAN Power Save Plugin API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_power_save_plugin_api/group"/>
+</component>
+<component name="wlan_info_api" long-name="WLAN Info API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_info_api/group"/>
+</component>
+<component name="wlan_agent_hotspot_plugin_api" long-name="WLAN Agent Hotspot Plug-in API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
+</component>
+<component name="wlan_osa_api" long-name="WLAN OSA API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_osa_api/group"/>
+</component>
+<component name="wlan_spia_api" long-name="WLAN SPIA API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_spia_api/group"/>
+</component>
+<component name="wlan_hpa_api" long-name="WLAN HPA API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_hpa_api/group"/>
+</component>
+<component name="wlan_eapol_plugin_api" long-name="WLAN EAPOL Plugin API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_eapol_plugin_api/group"/>
+</component>
+<component name="wlan_generic_plugin_api" long-name="WLAN Generic Plugin API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_generic_plugin_api/group"/>
+</component>
+<component name="wlan_aws_plugin_api" long-name="WLAN AWS Plugin API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_aws_plugin_api/group"/>
+</component>
+</collection>
+<collection name="wlan_pub" long-name="WLAN Public Interfaces" level="test">
+<component name="wlan_sdk_info_api" long-name="WLAN SDK Info API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_pub/wlan_sdk_info_api/group"/>
+</component>
+</collection>
+<collection name="wlan_bearer" long-name="WLAN Bearer" level="hw">
+<component name="wlanpsmplugin" filter="s60" long-name="WLAN PSM Plugin" plugin="Y">
+<unit bldFile="os/wlan/wlan_bearer/wlanpsmplugin/group"/>
+</component>
+<component name="wlanagent" filter="s60" long-name="WLAN Agent">
+<unit bldFile="os/wlan/wlan_bearer/wlanagent/group"/>
+</component>
+<component name="wlandbif_cd" filter="s60" long-name="WLAN CommsDat interface">
+<unit bldFile="os/wlan/wlan_bearer/wlandbif_cd/group"/>
+</component>
+<!-- should follow component directory rules for stuff in wlan_symbian/ and put in a single component or split up properly -->
+<component name="wlanengine" filter="s60" long-name="WLAN Engine">
+<unit bldFile="os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
+</component>
+<component name="wlanldd" filter="s60" long-name="WLAN LDD">
+<unit bldFile="os/wlan/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
+</component>
+<component name="wlannwif" filter="s60" long-name="WLAN Network Interface">
+<unit bldFile="os/wlan/wlan_bearer/wlannwif/group"/>
+</component>
+</collection>
+</block>
+<block name="cellularsrv" level="services" long-name="Cellular Baseband Services" levels="adaptation hw-if plugin framework server app-if">
+<collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
+<component name="basebandchanneladaptor" long-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 name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
+<component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
+<unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
+</component>
+</collection>
+<collection name="smsprotocols" long-name="SMS Protocols" level="framework">
+<component name="smsstack" long-name="SMS Stack" introduced="6.0" purpose="mandatory" plugin="Y">
+<unit bldFile="os/cellularsrv/smsprotocols/smsstack/group" mrp="os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
+</component>
+</collection>
+<collection name="telephonyprotocols" long-name="Telephony Protocols" level="framework">
+<component name="csdagt" long-name="CSD AGT" introduced="6.1" purpose="optional" plugin="Y">
+<unit bldFile="os/cellularsrv/telephonyprotocols/csdagt/group" mrp="os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
+</component>
+<component name="psdagt" long-name="PSD AGT" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="os/cellularsrv/telephonyprotocols/psdagt/group" mrp="os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
+</component>
+<component name="gprsumtsqosprt" long-name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
+</component>
+<component name="gprsumtsqosinterface" long-name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
+</component>
+<component name="qosextnapi" long-name="QoS Extn API" introduced="9.2" purpose="optional">
+<unit bldFile="os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
+</component>
+<component name="secondarypdpcontextumtsdriver" long-name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
+<unit bldFile="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
+</component>
+<component name="qos3gppcpr" long-name="QoS 3GPP CPR" introduced="9.2" purpose="optional" plugin="Y">
+<unit bldFile="os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
+</component>
+<component name="pdplayer" long-name="PDP Layer" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/cellularsrv/telephonyprotocols/pdplayer/group" mrp="os/cellularsrv/telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
+</component>
+<component name="rawipnif" long-name="Raw IP NIF" introduced="8.1" purpose="optional" plugin="Y">
+<unit bldFile="os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
+</component>
+</collection>
+<collection name="telephonyserver" long-name="Telephony Server" level="server">
+<component name="etelserverandcore" long-name="ETel Server and Core" purpose="mandatory">
+<unit bldFile="os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
+</component>
+<component name="etelmultimode" long-name="ETel Multimode" introduced="7.0" purpose="mandatory">
+<unit bldFile="os/cellularsrv/telephonyserver/etelmultimode/group" mrp="os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
+</component>
+<component name="etelpacketdata" long-name="ETel Packet Data" introduced="7.0" purpose="mandatory">
+<unit bldFile="os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
+</component>
+<component name="etelsimtoolkit" long-name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory">
+<unit bldFile="os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
+</component>
+</collection>
+<collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
+<component name="common_tsy" long-name="Common TSY" introduced="^2" purpose="optional" plugin="Y">
+<unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
+</component>
+<component name="licenseetsystub" long-name="Licensee TSY Stub" introduced="^2" purpose="development" filter="sf_build" plugin="Y">
+<unit mrp="os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="os/cellularsrv/telephonyserverplugins/licenseetsystub/group"/>
+</component>
+<component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y">
+<unit bldFile="os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
+</component>
+<component name="ctsydispatchlayer" long-name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
+</component>
+<component name="simatktsy" long-name="SIMATK TSY" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/cellularsrv/telephonyserverplugins/simatktsy/group" mrp="os/cellularsrv/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
+</component>
+</collection>
+<collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
+<component name="dial" long-name="Dial" deprecated="9.1" purpose="optional">
+<unit bldFile="os/cellularsrv/telephonyutils/dial/group" mrp="os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
+</component>
+<component name="telephonywatchers" long-name="Telephony Watchers" introduced="6.0" purpose="optional" plugin="Y">
+<unit bldFile="os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
+</component>
+<component name="etel3rdpartyapi" long-name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
+<unit bldFile="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
+</component>
+</collection>
+<collection name="cellularsrv_info" long-name="Cellular Baseband Services Info" level="app-if">
+<component name="telephonyconfidentialdocs" long-name="Telephony Confidential Documentation" purpose="development" class="doc">
+<unit mrp="os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
+</component>
+<component name="telephonydocs" long-name="Telephony Documentation" purpose="development" class="doc">
+<unit mrp="os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
+</component>
+<component name="cellularsrv_metadata" long-name="Cellular Baseband Services Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
+</component>
+</collection>
+<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
+<component name="mocksy" long-name="MockSY" introduced="^2" purpose="development" plugin="Y">
+<unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
+</component>
+</collection>
+<collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if"/>
+<collection name="wapstack" long-name="WAP Stack" level="plugin">
+<component name="wapmessageapi" long-name="WAP Message API" purpose="optional">
+<unit bldFile="os/cellularsrv/wapstack/wapmessageapi/group" mrp="os/cellularsrv/wapstack/wapmessageapi/group/wap-stack_wapmessage.mrp"/>
+</component>
+</collection>
+</block>
+<block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
+<collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
+<component name="bluetooth_audio_adaptation_api" long-name="Bluetooth Audio Adaptation API" filter="s60" class="api">
+<unit bldFile="os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
+</component>
+<component name="bluetooth_power_management_api" long-name="Bluetooth Power Management API" filter="s60" class="api">
+<unit bldFile="os/bt/bt_plat/bluetooth_power_management_api/group"/>
+</component>
+<component name="at_command_handler_plugin_api" long-name="AT Command Handler Plugin API" filter="s60" class="api">
+<unit bldFile="os/bt/bt_plat/at_command_handler_plugin_api/group"/>
+</component>
+</collection>
+<collection name="bluetooth" long-name="Bluetooth Core" level="framework">
+<component name="btstack" long-name="Bluetooth Stack" introduced="6.0" purpose="optional">
+<unit bldFile="os/bt/bluetooth/btstack" mrp="os/bt/bluetooth/btstack/bluetooth_stack.mrp"/>
+</component>
+<component name="btcomm" long-name="Bluetooth CSY" introduced="6.0" purpose="optional" plugin="Y">
+<unit bldFile="os/bt/bluetooth/btcomm" mrp="os/bt/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
+</component>
+<component name="btsdp" long-name="Bluetooth SDP" introduced="6.1" purpose="optional">
+<unit bldFile="os/bt/bluetooth/btsdp" mrp="os/bt/bluetooth/btsdp/bluetooth_sdp.mrp"/>
+</component>
+<component name="btextnotifiers" long-name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
+<unit bldFile="os/bt/bluetooth/btextnotifiers" mrp="os/bt/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
+</component>
+<component name="gavdp" long-name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
+<unit bldFile="os/bt/bluetooth/gavdp/group" mrp="os/bt/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
+</component>
+<component name="btlogger" long-name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
+<unit bldFile="os/bt/bluetooth/btlogger/group" mrp="os/bt/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
+</component>
+<component name="btdocs" long-name="Bluetooth Documentation" purpose="development" class="doc">
+<unit mrp="os/bt/bluetooth/btdocs/bluetooth_documentation.mrp"/>
+</component>
+</collection>
+<collection name="bluetoothmgmt" long-name="Bluetooth Management" level="plugin">
+<component name="btmgr" long-name="Bluetooth Manager" introduced="6.0" purpose="optional">
+<unit bldFile="os/bt/bluetoothmgmt/btmgr" mrp="os/bt/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
+</component>
+<component name="btconfig" long-name="Bluetooth Config" purpose="optional" class="config">
+<unit bldFile="os/bt/bluetoothmgmt/btconfig" mrp="os/bt/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
+</component>
+<component name="btrom" long-name="Bluetooth ROM" introduced="9.1" purpose="optional">
+<unit bldFile="os/bt/bluetoothmgmt/btrom" mrp="os/bt/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
+</component>
+<component name="bluetoothclientlib" long-name="Bluetooth Client Library" introduced="6.0" purpose="optional">
+<unit bldFile="os/bt/bluetoothmgmt/bluetoothclientlib" mrp="os/bt/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
+</component>
+</collection>
+<collection name="bluetoothcommsprofiles" long-name="Bluetooth Comms Profiles" level="app-if">
+<component name="btpan" long-name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" plugin="Y">
+<unit bldFile="os/bt/bluetoothcommsprofiles/btpan/group" mrp="os/bt/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
+</component>
+</collection>
+<collection name="bthci" long-name="Host Controller Interface" level="server">
+<component name="bthci2" long-name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
+<unit bldFile="os/bt/bthci/bthci2/group" mrp="os/bt/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
+</component>
+<component name="hciextensioninterface" long-name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
+<unit bldFile="os/bt/bthci/hciextensioninterface" mrp="os/bt/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
+</component>
+<component name="hci2implementations" long-name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" plugin="Y">
+<unit bldFile="os/bt/bthci/hci2implementations/group" mrp="os/bt/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
+</component>
+</collection>
+<collection name="irda" long-name="IrDA" level="plugin">
+<component name="irdastack" long-name="IrDA Stack" purpose="optional">
+<unit bldFile="os/bt/irda/irdastack/group" mrp="os/bt/irda/irdastack/group/infra-red_irda.mrp"/>
+</component>
+</collection>
+<collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if"/>
+<collection name="atext" long-name="AT Extensions" level="server">
+<!-- collection is really a component. Need to move down a directory -->
+<component name="atext_build" long-name="AT Extension Build" introduced="^3" purpose="optional" filter="s60">
+<unit bldFile="os/bt/atext/group"/>
+</component>
+</collection>
+<collection name="bt_info" long-name="Bluetooth Info" level="app-if">
+<component name="bt_metadata" long-name="Bluetooth Metadata" introduced="^3" purpose="development" class="config PC">
+<unit mrp="os/bt/bt_info/bt_metadata/bt_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="usb" level="services" long-name="USB" levels="adaptation 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>
+<collection name="usbmgmt" long-name="USB Management" level="server">
+<component name="usbmgr" long-name="USB Manager" purpose="optional">
+<unit bldFile="os/usb/usbmgmt/usbmgr/group" mrp="os/usb/usbmgmt/usbmgr/group/usb_manager.mrp" version="2"/>
+</component>
+<component name="usbclassandmgrdocs" long-name="USB Class and Manager Documentation" purpose="development" class="doc">
+<unit mrp="os/usb/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
+</component>
+</collection>
+<collection name="usb_info" long-name="USB Info" level="app-if">
+<component name="usb_metadata" long-name="USB Metadata" introduced="^3" purpose="development" class="config PC">
+<unit mrp="os/usb/usb_info/usb_metadata/usb_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="mm" level="services" long-name="Multimedia" levels="adaptation 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" 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" 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" 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"/>
+</component>
+</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" 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"/>
+</component>
+<component name="aac_decoder_config_proxy_api" long-name="AAC Decoder Config Proxy API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/aac_decoder_config_proxy_api/group"/>
+</component>
+<component name="added_devsound_control_api" long-name="Added DevSound Control API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/added_devsound_control_api/group"/>
+</component>
+<component name="added_devsound_control_msg_hdlr_api" long-name="Added DevSound Control Msg Hdlr API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/added_devsound_control_msg_hdlr_api/group"/>
+</component>
+<component name="added_devsound_control_proxy_api" long-name="Added DevSound Control Proxy API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/added_devsound_control_proxy_api/group"/>
+</component>
+<component name="audio_effects_msg_hdlr_api" long-name="Audio Effects Message Handler API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/audio_effects_msg_hdlr_api/group"/>
+</component>
+<component name="audio_effects_proxy_api" long-name="Audio Effects Proxy API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/audio_effects_proxy_api/group"/>
+</component>
+<component name="audio_policy_header_api" long-name="Audio Policy Header API" filter="s60" class="api">
+<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" 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"/>
+</component>
+<component name="audio_routing_proxy_api" long-name="Audio Routing Proxy API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/audio_routing_proxy_api/group"/>
+</component>
+<component name="custom_interface_builder_api" long-name="Custom Interface Builder API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/custom_interface_builder_api/group"/>
+</component>
+<component name="custom_interface_message_handler_factory_api" long-name="Custom Interface Message Handler Factory API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/custom_interface_message_handler_factory_api/group"/>
+</component>
+<component name="custom_interface_proxy_factory_api" long-name="Custom Interface Proxy Factory API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/custom_interface_proxy_factory_api/group"/>
+</component>
+<component name="custom_interface_utility_api" long-name="Custom Interface Utility API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/custom_interface_utility_api/group"/>
+</component>
+<component name="devsound_adaptation_api" long-name="DevSound Adaptation API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/devsound_adaptation_api/group"/>
+</component>
+<component name="display_posting_api" long-name="Display Posting API" filter="s60" class="api">
+<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" 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"/>
+</component>
+<component name="eaac_plus_decoder_interface_proxy_api" long-name="eAAC Plus Decoder Interface Proxy API" filter="s60" class="api">
+<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" 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"/>
+</component>
+<component name="error_concealment_interface_proxy_api" long-name="Error Concealment Interface Proxy API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
+</component>
+<component name="fm_radio_adaptation_api" long-name="FM Radio Adaptation API" filter="s60" class="api">
+<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" 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"/>
+</component>
+<component name="g711_decoder_interface_proxy_api" long-name="G711 Decoder Interface Proxy API" filter="s60" class="api">
+<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" 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"/>
+</component>
+<component name="g711_encoder_interface_proxy_api" long-name="G711 Encoder Interface Proxy API" filter="s60" class="api">
+<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" 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"/>
+</component>
+<component name="g729_decoder_interface_proxy_api" long-name="G729 Decoder Interface Proxy API" filter="s60" class="api">
+<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" 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"/>
+</component>
+<component name="g729_encoder_interface_msg_hdlr_api" long-name="G729 Encoder Interface Message Handler API" filter="s60" class="api">
+<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" 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" 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"/>
+</component>
+<component name="ilbc_decoder_interface_proxy_api" long-name="Ilbc Decoder Interface Proxy API" filter="s60" class="api">
+<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" 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"/>
+</component>
+<component name="ilbc_encoder_interface_proxy_api" long-name="Ilbc Encoder Interface Proxy API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_proxy_api/group"/>
+</component>
+<component name="mdf_plugin_uids" long-name="MDF Plug-in UIDs" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/mdf_plugin_uids/group"/>
+</component>
+<component name="multimedia_fourcc_definitions_api" long-name="Multimedia FourCC Definitions API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/multimedia_fourcc_definitions_api/group"/>
+</component>
+<component name="nokia_audio_policy_header_api" long-name="Nokia Audio Policy Header API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/nokia_audio_policy_header_api/group"/>
+</component>
+<component name="nokia_multimedia_fourcc_definitions_api" long-name="Nokia Multimedia Fourcc Definitions API" filter="s60" class="api">
+<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" 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"/>
+</component>
+<component name="ra8_decoder_interface_proxy_api" long-name="RA8 Decoder Interface Proxy API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
+</component>
+<component name="rds_adaptation_api" long-name="RDS Adaptation API" filter="s60" class="api">
+<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" 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"/>
+</component>
+<component name="restricted_audio_output_proxy_api" long-name="Restricted Audio Output Proxy API" filter="s60" class="api">
+<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" 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"/>
+</component>
+<component name="sbc_encoder_interface_proxy_api" long-name="SBC Encoder Interface Proxy API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/sbc_encoder_interface_proxy_api/group"/>
+</component>
+<component name="secure_output_mdf_custom_interface" long-name="Secure Output MDF Custom Interface" filter="s60" class="api">
+<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" 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"/>
+</component>
+<component name="speech_encoder_config_proxy_api" long-name="Speech Encoder Config Proxy API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/speech_encoder_config_proxy_api/group"/>
+</component>
+<component name="telephony_audio_routing_client_api" long-name="Telephony Audio Routing Client API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/telephony_audio_routing_client_api/group"/>
+</component>
+<component name="telephony_audio_routing_manager_api" long-name="Telephony Audio Routing Manager API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/telephony_audio_routing_manager_api/group"/>
+</component>
+<component name="video_buffer_management_mdf_custom_interface" long-name="Video Buffer Management MDF Custom Interface" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/video_buffer_management_mdf_custom_interface/group"/>
+</component>
+<component name="video_decoder_rotation_mdf_custom_interface" long-name="Video Decoder Rotation MDF Custom Interface" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
+</component>
+<component name="video_decoder_scaling_mdf_custom_interface" long-name="Video Decoder Scaling MDF Custom Interface" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
+</component>
+<component name="video_reclaim_extbuffers_ci" long-name="Video Reclaim Extbuffers Custom Interface" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/video_reclaim_extbuffers_ci/group"/>
+</component>
+<component name="video_window_control_custom_interface" long-name="Video Window Control Custom Interface" filter="s60" class="api">
+<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" 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"/>
+</component>
+<component name="wma_decoder_interface_proxy_api" long-name="WMA Decoder Interface Proxy API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/wma_decoder_interface_proxy_api/group"/>
+</component>
+<component name="eaacplusutil_api" long-name="EAac Plus Util API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/eaacplusutil_api/group"/>
+</component>
+<component name="frametable_api" long-name="Frametable API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/frametable_api/group"/>
+</component>
+</collection>
+<collection name="devsoundextensions" long-name="Devsound Extensions" level="device-fw">
+<component name="drmaudioplayer" filter="s60" long-name="DRM Audio Player">
+<unit bldFile="os/mm/devsoundextensions/drmaudioplayer/group"/>
+</component>
+<component name="mmextfw" filter="s60" long-name="Multimedia Extension Framework">
+<unit bldFile="os/mm/devsoundextensions/mmextfw/group"/>
+</component>
+<component name="audiorouting" filter="s60" long-name="Audio Routing">
+<unit bldFile="os/mm/devsoundextensions/audiorouting/group"/>
+</component>
+<component name="effects" filter="s60" long-name="Effects">
+<unit bldFile="os/mm/devsoundextensions/effects/group"/>
+</component>
+<component name="effectspresets" filter="s60" long-name="Effects Presets">
+<unit bldFile="os/mm/devsoundextensions/effectspresets/group"/>
+</component>
+<component name="effectspresets_utils" filter="s60" long-name="Effects Presets Utils">
+<!-- need to #include the lot from a single bld.inf
+ Also move to a standard component location, not under effectspresets -->
+<unit bldFile="os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
+<unit bldFile="os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
+</component>
+<component name="telephonyaudiorouting" filter="s60" long-name="Telephony Audio Routing">
+<unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/group"/>
+</component>
+<component name="mmfcustominterfaces" filter="s60" long-name="MMF Custom Interfaces">
+<unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/group"/>
+</component>
+<component name="addeddevsoundcontrol" filter="s60" long-name="Added DevSound Control">
+<unit bldFile="os/mm/devsoundextensions/addeddevsoundcontrol/group"/>
+</component>
+<component name="globalaudiosettings" filter="s60" long-name="Global Audio Settings">
+<unit bldFile="os/mm/devsoundextensions/globalaudiosettings/group"/>
+</component>
+<component name="restrictedaudiooutput" filter="s60" long-name="Restricted Audio Output">
+<unit bldFile="os/mm/devsoundextensions/restrictedaudiooutput/group"/>
+</component>
+<component name="ciextnfactoryplugins" filter="s60" long-name="Custom Interface Extension Factory Plugins" plugin="Y">
+<unit bldFile="os/mm/devsoundextensions/ciextnfactoryplugins/group"/>
+</component>
+</collection>
+<collection name="mdfdevvideoextensions" long-name="MDF Dev Video Extensions" level="device-fw">
+<component name="nga_mdf_postprocessor" long-name="NGA MDF Postprocessor" filter="s60">
+<unit bldFile="os/mm/mdfdevvideoextensions/nga_mdf_postprocessor/group"/>
+</component>
+</collection>
+<collection name="audio" long-name="Audio Codecs" level="middleware">
+<component name="arm_cmmf_codecs" filter="s60" long-name="ARM CMMF Codecs" plugin="Y">
+<unit bldFile="os/mm/audio/arm_cmmf_codecs/group"/>
+</component>
+</collection>
+<collection name="video" long-name="Video Codecs" level="middleware">
+<!-- empty -->
+</collection>
+<collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
+<component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
+<unit bldFile="os/mm/imagingandcamerafws/imagingfws/group" mrp="os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
+</component>
+<component name="camerafw" long-name="Camera Framework" introduced="7.0s" purpose="optional">
+<unit bldFile="os/mm/imagingandcamerafws/camerafw/group" mrp="os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
+</component>
+</collection>
+<collection name="mmlibs" long-name="Multimedia Libraries" level="middleware">
+<component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
+<unit bldFile="os/mm/mmlibs/mmutilitylib/group" mrp="os/mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
+</component>
+<component name="mmfw" long-name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
+<unit bldFile="os/mm/mmlibs/mmfw/group" mrp="os/mm/mmlibs/mmfw/group/multimedia_mmf.mrp"/>
+</component>
+</collection>
+<collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
+<component name="imagingplugins" long-name="Imaging Plugins" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="os/mm/mmplugins/imagingplugins/group" mrp="os/mm/mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
+</component>
+<component name="cameraplugins" long-name="Camera Plugins" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="os/mm/mmplugins/cameraplugins/group" mrp="os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
+</component>
+<component name="lib3gp" long-name="3GP Library" introduced="^2" purpose="optional">
+<unit bldFile="os/mm/mmplugins/lib3gp/group" mrp="os/mm/mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
+</component>
+<component name="mmfwplugins" long-name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="os/mm/mmplugins/mmfwplugins/group" mrp="os/mm/mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
+</component>
+</collection>
+<collection name="mm_info" long-name="Multimedia Info" level="app-if">
+<component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc">
+<unit mrp="os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
+</component>
+<component name="mm_metadata" long-name="Multimedia Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
+</component>
+</collection>
+<collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
+<component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="^2" purpose="development">
+<unit bldFile="os/mm/mmresourcemgmt/mmresctrl/group" mrp="os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
+</component>
+</collection>
+<collection name="mmdevicefw" long-name="Multimedia Device Framework" level="device-fw">
+<component name="mdf" long-name="Media Device Framework" introduced="9.2" purpose="mandatory">
+<unit bldFile="os/mm/mmdevicefw/mdf/group" mrp="os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
+</component>
+<component name="speechrecogsupport" long-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 name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
+<component name="videorenderer" long-name="Video Renderer" introduced="^3" purpose="optional">
+<unit bldFile="os/mm/mmswadaptation/videorenderer/group" mrp="os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
+</component>
+</collection>
+<collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw"/>
+<collection name="omxil" long-name="OpenMAX IL" level="hw-if">
+<component name="omxilapi" long-name="OpenMAX IL API" introduced="^3" purpose="optional">
+<unit bldFile="os/mm/omxil/omxilapi/group" mrp="os/mm/omxil/omxilapi/group/multimedia_omx_il_api.mrp" version="1"/>
+</component>
+<component name="omxilcore" long-name="OpenMAX IL Core" introduced="^3" purpose="optional">
+<unit bldFile="os/mm/omxil/omxilcore/group" mrp="os/mm/omxil/omxilcore/group/multimedia_omx_il_core.mrp" version="1"/>
+</component>
+<component name="omxilcomponentcommon" long-name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
+<unit bldFile="os/mm/omxil/omxilcomponentcommon/group" mrp="os/mm/omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp" version="1"/>
+</component>
+<component name="omxilrefcomps" long-name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
+<unit bldFile="os/mm/omxil/omxilrefcomps/ref_components/group" mrp="os/mm/omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp" version="1"/>
+</component>
+<component name="mmilapi" long-name="Multimedia Integration Layer API" introduced="^3" purpose="development">
+<unit bldFile="os/mm/omxil/mmilapi/group" mrp="os/mm/omxil/mmilapi/group/multimedia_il_api.mrp"/>
+</component>
+</collection>
+<collection name="devsound" long-name="Sound Device" level="devices">
+<component name="devsoundapi" long-name="DevSound API" introduced="7.0s" purpose="mandatory">
+<unit bldFile="os/mm/devsound/devsoundapi/group" mrp="os/mm/devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
+</component>
+<component name="a3fdevsound" long-name="A3F DevSound" introduced="^2" purpose="optional">
+<unit bldFile="os/mm/devsound/a3fdevsound/group" mrp="os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
+</component>
+<component name="a3facf" long-name="A3F Audio Component Framework" introduced="^2" purpose="optional">
+<unit bldFile="os/mm/devsound/a3facf/group" mrp="os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
+</component>
+<component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
+<unit bldFile="os/mm/devsound/devsoundpluginsupport/group" mrp="os/mm/devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
+</component>
+<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" 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">
+<unit bldFile="os/mm/devsound/a3ftrace/group" mrp="os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
+</component>
+<component name="a3fsrvstart" long-name="A3F Server Start" introduced="^2" purpose="optional" plugin="Y">
+<unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
+</component>
+</collection>
+<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
+<component name="devsoundhwdeviceapi" long-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 name="a3facl" long-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 name="a3fdevsoundcustomisation" long-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"/>
+</component>
+<component name="refacladapt" long-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"/>
+</component>
+<component name="videohai" long-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 name="dvbhreceiverhai" long-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>
+</block>
+<block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
+<collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
+<component name="exif_api" long-name="Exif API" filter="s60" class="api">
+<unit bldFile="os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
+</component>
+</collection>
+<collection name="imagingext_plat" long-name="Imaging Extensions Platform Interfaces" level="app-if">
+<component name="jpeg2000_icl_plugin_api" long-name="JPEG2000 ICL plugin API" filter="s60" class="api">
+<unit bldFile="os/imagingext/imagingext_plat/jpeg2000_icl_plugin_api/group"/>
+</component>
+<component name="extended_icl_jpeg_api" long-name="Extended ICL Jpeg API" filter="s60" class="api">
+<unit bldFile="os/imagingext/imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
+</component>
+<component name="h324_annex_k_custom_api" long-name="H324 Annex K Custom API" filter="s60" class="api">
+<unit bldFile="os/imagingext/imagingext_plat/h324_annex_k_custom_api/group"/>
+</component>
+<component name="ecam_orientation_custom_api" long-name="ECam Orientation Custom API" filter="s60" class="api">
+<unit bldFile="os/imagingext/imagingext_plat/ecam_orientation_custom_api/group"/>
+</component>
+<component name="ecam_ui_orientation_override_custom_api" long-name="ECam UI Orientation Override Custom API" filter="s60" class="api">
+<unit bldFile="os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
+</component>
+<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" introduced="^3" class="api">
+<unit bldFile="os/imagingext/imagingext_plat/ecam_use_case_hint_custom_api/group"/>
+</component>
+</collection>
+<collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
+<component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
+<unit bldFile="os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
+</component>
+<component name="imageadaptationextensions_build" filter="s60" long-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"/>
+</component>
+</collection>
+<collection name="imagingmodules" long-name="Imaging Modules" level="hw-if">
+<component name="exiflib" filter="s60" long-name="Exif Library">
+<unit bldFile="os/imagingext/imagingmodules/exiflib/group"/>
+</component>
+<component name="jp2kcodec" filter="s60" long-name="JPEG2000 Decoder Plugin" plugin="Y">
+<unit bldFile="os/imagingext/imagingmodules/jp2kcodec/group"/>
+</component>
+</collection>
+</block>
+<block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
+<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
+<component name="vgi" filter="s60" long-name="VGI">
+<unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
+</component>
+</collection>
+<collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adaptations">
+<component name="m3gcore11" filter="s60" long-name="M3G Core 1.1">
+<unit bldFile="os/graphics/m3g/m3gcore11/group"/>
+</component>
+</collection>
+<collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines">
+<component name="graphicsresource" long-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 name="graphicsresourceadaptation" long-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"/>
+</component>
+<component name="graphicsresourceimplementation" long-name="Graphics Resource Implementation" introduced="^4" purpose="optional">
+<unit bldFile="os/graphics/graphicsresourceservices/graphicsresourceimplementation/group" mrp="os/graphics/graphicsresourceservices/graphicsresourceimplementation/group/graphics_graphicsresourceimplementation.mrp"/>
+</component>
+<component name="graphicsresourceinterface" long-name="Graphics Resource Interface" introduced="^4" purpose="optional">
+<unit bldFile="os/graphics/graphicsresourceservices/graphicsresourceinterface/group" mrp="os/graphics/graphicsresourceservices/graphicsresourceinterface/group/graphics_graphicsresourceinterface.mrp"/>
+</component>
+</collection>
+<collection name="graphicsutils" long-name="Graphics Utils" level="engines">
+<component name="commongraphicsheaders" long-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 name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
+<!-- displayldd to be moved here -->
+<component name="surfacemgr" long-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 name="graphicscomposition" long-name="Graphics Composition" level="engines">
+<component name="openwfcinterface" long-name="OpenWF Composition Interface" introduced="^3" purpose="optional">
+<unit bldFile="os/graphics/graphicscomposition/openwfcinterface/group" mrp="os/graphics/graphicscomposition/openwfcinterface/group/graphics_openwfcinterface.mrp"/>
+</component>
+<component name="openwfcompositionengine" long-name="OpenWF Composition Engine" introduced="^3" purpose="development">
+<unit bldFile="os/graphics/graphicscomposition/openwfcompositionengine/group" mrp="os/graphics/graphicscomposition/openwfcompositionengine/group/graphics_openwfcompositionengine.mrp"/>
+</component>
+<component name="openwfsupport" long-name="OpenWF Support" introduced="^3" purpose="optional">
+<unit bldFile="os/graphics/graphicscomposition/openwfsupport/group" mrp="os/graphics/graphicscomposition/openwfsupport/group/graphics_openwfsupport.mrp"/>
+</component>
+<component name="surfaceupdate" long-name="Surface Update" introduced="^3" purpose="optional">
+<unit bldFile="os/graphics/graphicscomposition/surfaceupdate/group" mrp="os/graphics/graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
+</component>
+</collection>
+<collection name="graphicstest" long-name="Graphics Test" level="app-if">
+<component name="uibench" long-name="UI Bench" introduced="9.2" purpose="development">
+<unit bldFile="os/graphics/graphicstest/uibench/group" mrp="os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
+</component>
+</collection>
+<collection name="graphics_plat" long-name="Graphics Platform Interfaces" level="app-if">
+<component name="m3g_core_api" filter="sf_build" long-name="M3G Core API" class="api">
+<unit bldFile="os/graphics/graphics_plat/m3g_core_api/group"/>
+</component>
+</collection>
+<collection name="graphics_info" long-name="Graphics Info" level="app-if">
+<component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc">
+<unit mrp="os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
+</component>
+<component name="graphics_metadata" long-name="Graphics Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
+</component>
+</collection>
+<collection name="windowing" long-name="Windowing" level="app-if">
+<component name="windowserver" long-name="Window Server" purpose="mandatory">
+<unit bldFile="os/graphics/windowing/windowserver/group" mrp="os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
+</component>
+<component name="windowserverplugins" long-name="Window Server Plugins" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/graphics/windowing/windowserverplugins/group" mrp="os/graphics/windowing/windowserverplugins/group/graphics_wserv_std_plugins.mrp"/>
+</component>
+</collection>
+<collection name="printingservices" long-name="Printing Services" level="app-if">
+<component name="printerdriversupport" long-name="Printer Driver Support" purpose="optional">
+<unit bldFile="os/graphics/printingservices/printerdriversupport/group" mrp="os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
+</component>
+<component name="printerdrivers" long-name="Printer Drivers" purpose="optional" plugin="Y">
+<unit bldFile="os/graphics/printingservices/printerdrivers/group" mrp="os/graphics/printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
+</component>
+</collection>
+<collection name="fbs" long-name="Font and Bitmap Server" level="device-interface">
+<component name="fontandbitmapserver" long-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 name="opengles" long-name="OpenGLES" level="internal-adaptations">
+<component name="openglesinterface" long-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 name="opengles_stub" filter="sf_build" long-name="OpenGL ES Stub" purpose="optional" introduced="^2">
+<unit bldFile="os/graphics/opengles/openglesinterface/group/opengles_stub"/>
+</component>
+</collection>
+<collection name="openvg" long-name="OpenVG" level="internal-adaptations">
+<component name="openvginterface" long-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 name="openvg11" filter="s60" long-name="OpenVG 1.1">
+<!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
+<unit bldFile="os/graphics/openvg/openvginterface/group/openvg11"/>
+</component>
+<component name="sfopenvg" filter="sf_build" long-name="Khronos OpenVG Reference Implementation" introduced="^2" purpose="optional">
+<unit bldFile="os/graphics/openvg/openvgrefimplementation/sfopenvg/group"/>
+</component>
+</collection>
+<collection name="egl" long-name="EGL" level="internal-adaptations">
+<component name="eglinterface" long-name="EGL Interface" introduced="^2" purpose="mandatory">
+<unit bldFile="os/graphics/egl/eglinterface/group" mrp="os/graphics/egl/eglinterface/group/graphics_eglheaders.mrp"/>
+</component>
+<component name="eglswitch" long-name="EGL Switch" introduced="^3" purpose="optional">
+<unit bldFile="os/graphics/egl/eglswitch/group" mrp="os/graphics/egl/eglswitch/group/graphics_eglswitch.mrp"/>
+</component>
+<component name="eglrefimpl" long-name="EGL Reference Implementation" introduced="^3" purpose="optional">
+<unit bldFile="os/graphics/egl/eglrefimpl/group" mrp="os/graphics/egl/eglrefimpl/group/graphics_eglrefimpl.mrp"/>
+</component>
+<component name="egltest" long-name="EGL Tests" introduced="^3" purpose="development">
+<unit bldFile="os/graphics/egl/egltest/group" mrp="os/graphics/egl/egltest/group/graphics_egltest.mrp"/>
+</component>
+</collection>
+<collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
+<component name="gdi" long-name="GDI" purpose="mandatory">
+<unit bldFile="os/graphics/graphicsdeviceinterface/gdi/group" mrp="os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
+</component>
+<component name="bitgdi" long-name="BitGDI" purpose="mandatory" filter="api_test">
+<!-- just api_test, not test -->
+<unit bldFile="os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
+</component>
+<component name="colourpalette" long-name="Colour Palette" introduced="7.0s" purpose="optional">
+<unit bldFile="os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
+</component>
+<component name="screendriver" long-name="Screen Driver" introduced="6.1" purpose="optional" plugin="Y">
+<unit bldFile="os/graphics/graphicsdeviceinterface/screendriver/group" mrp="os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
+</component>
+<component name="directgdi" long-name="DirectGDI" introduced="^3" deprecated="^3" purpose="optional">
+<unit bldFile="os/graphics/graphicsdeviceinterface/directgdi/group" mrp="os/graphics/graphicsdeviceinterface/directgdi/group/graphics_directgdi.mrp"/>
+</component>
+<component name="directgdiinterface" long-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 name="directgdiadaptation" long-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"/>
+</component>
+</collection>
+<collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
+<component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC">
+<unit bldFile="os/graphics/graphicstools/gdi_tools/group" mrp="os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
+</component>
+</collection>
+<collection name="graphicsapitest" long-name="Graphics API Tests" level="app-if"/>
+</block>
+<block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
+<collection name="charconvfw" long-name="Character Conversion" level="encoding">
+<component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional" filter="api_test">
+<!-- both production and api_test-->
+<unit bldFile="os/textandloc/charconvfw/charconv_fw/group" mrp="os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
+</component>
+<component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" filter="apit_test" plugin="Y">
+<!-- both production and api_test-->
+<unit bldFile="os/textandloc/charconvfw/charconvplugins/group" mrp="os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
+</component>
+<component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" filter="api_test" plugin="Y">
+<!-- both production and api_test-->
+<unit bldFile="os/textandloc/charconvfw/fatfilenameconversionplugins/group" mrp="os/textandloc/charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
+</component>
+</collection>
+<collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
+<component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" deprecated="^4" plugin="Y">
+<unit bldFile="os/textandloc/fontservices/textshaperplugin/group" mrp="os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
+</component>
+<component name="fontstore" long-name="Font Store" purpose="mandatory" filter="api_test">
+<!-- both production and api_test-->
+<unit bldFile="os/textandloc/fontservices/fontstore/group" mrp="os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
+</component>
+<component name="textbase" long-name="Text Base" purpose="mandatory" class="placeholder">
+<!-- placeholder for text code from GDI -->
+</component>
+<component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y">
+<unit bldFile="os/textandloc/fontservices/freetypefontrasteriser/group" mrp="os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
+</component>
+<component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional">
+<unit bldFile="os/textandloc/fontservices/referencefonts/group" mrp="os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
+</component>
+</collection>
+<collection name="textlayout" long-name="Text Layout" level="text">
+<component name="texthandling" long-name="Text Handling" purpose="optional">
+<unit bldFile="os/textandloc/textrendering/texthandling/group" mrp="os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
+</component>
+<component name="textformatting" long-name="Text Formatting" purpose="optional">
+<unit bldFile="os/textandloc/textrendering/textformatting/group" mrp="os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
+</component>
+</collection>
+<collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
+<component name="numbergrouping" long-name="Number Grouping">
+<unit bldFile="os/textandloc/textandlocutils/numbergrouping/group" mrp="os/textandloc/textandlocutils/numbergrouping/group/tls_numbergrouping.mrp"/>
+</component>
+<component name="jplangutil" long-name="Japanese Language Utilities">
+<unit bldFile="os/textandloc/textandlocutils/jplangutil/group" mrp="os/textandloc/textandlocutils/jplangutil/group/tls_jplangutil.mrp"/>
+</component>
+<component name="sortutil" long-name="Sorting Utility">
+<unit bldFile="os/textandloc/textandlocutils/sortutil/group" mrp="os/textandloc/textandlocutils/sortutil/group/tls_sortutil.mrp"/>
+</component>
+<component name="inlinetext" long-name="Inline Text">
+<unit bldFile="os/textandloc/textandlocutils/inlinetext/group" mrp="os/textandloc/textandlocutils/inlinetext/group/tls_inlinetext.mrp"/>
+</component>
+<component name="numberformatting" long-name="Number Formatting" introduced="7.0s" purpose="optional">
+<unit bldFile="os/textandloc/textrendering/numberformatting/group" mrp="os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
+</component>
+</collection>
+<collection name="localesupport" long-name="Locale Support" level="util">
+<component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y">
+<unit bldFile="os/textandloc/localisation/localesupport" mrp="os/textandloc/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
+</component>
+<component name="initlocale" long-name="Initialise Locale" introduced="^2" purpose="mandatory" class="placeholder">
+<!-- placeholder for split from bafl -->
+</component>
+</collection>
+<collection name="textandloctools" long-name="Text and Localisation Tools" level="tools">
+<component name="fontcompiler" long-name="Font Compiler" purpose="development" class="placeholder PC">
+<!-- placeholder for split from GDI Tools -->
+</component>
+<component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC">
+<unit bldFile="os/graphics/graphicstools/bitmapfonttools/group" mrp="os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
+</component>
+</collection>
+<collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
+<component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
+<collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
+<component name="xml_encryption_api" long-name="XML Encryption API" filter="s60" class="api">
+<unit bldFile="os/xmlsrv/xmlsrv_plat/xml_encryption_api/group"/>
+</component>
+<component name="xml_signature_api" long-name="XML Signature API" filter="s60" class="api">
+<unit bldFile="os/xmlsrv/xmlsrv_plat/xml_signature_api/group"/>
+</component>
+<component name="xml_security_engine_utils_api" long-name="XML Security Engine Utils API" filter="s60" class="api">
+<unit bldFile="os/xmlsrv/xmlsrv_plat/xml_security_engine_utils_api/group"/>
+</component>
+</collection>
+<collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
+<component name="xmlseccertman" filter="s60" long-name="XML Security Certificate Manager">
+<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
+</component>
+<component name="xmlsec" filter="s60" long-name="XML Security">
+<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsec/group"/>
+</component>
+<component name="xmlseccrypto" filter="s60" long-name="XML Security Crypto">
+<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccrypto/group"/>
+</component>
+<component name="xmlsecwrapper" filter="s60" long-name="XML Security Wrapper">
+<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsecwrapper/group"/>
+</component>
+</collection>
+<collection name="xml" long-name="XML" level="generic">
+<component name="xmlfw" long-name="XML Framework" introduced="7.0s" purpose="optional">
+<unit bldFile="os/xmlsrv/xml/xmlfw/group" mrp="os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
+</component>
+<component name="libxml2libs" long-name="Libxml2 Libraries" introduced="^3" purpose="optional">
+<unit bldFile="os/xmlsrv/xml/libxml2libs/group" mrp="os/xmlsrv/xml/libxml2libs/group/syslibs_libxml2.mrp"/>
+</component>
+<component name="legacyminidomparser" long-name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
+<unit bldFile="os/xmlsrv/xml/legacyminidomparser/GROUP" mrp="os/xmlsrv/xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp"/>
+</component>
+<component name="xmldomandxpath" long-name="XML DOM and XPath" introduced="^3" purpose="optional">
+<unit bldFile="os/xmlsrv/xml/xmldomandxpath/group" mrp="os/xmlsrv/xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
+</component>
+<component name="xmlexpatparser" long-name="XML Expat Parser" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="os/xmlsrv/xml/xmlexpatparser/group" mrp="os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
+</component>
+<component name="xmllibxml2parser" long-name="XML Libxml2 Parser" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/xmlsrv/xml/xmllibxml2parser/group" mrp="os/xmlsrv/xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
+</component>
+<component name="wbxmlparser" long-name="WBXML Parser" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="os/xmlsrv/xml/wbxmlparser/group" mrp="os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
+</component>
+</collection>
+<collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
+<component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="deviceplatformrelease" level="services" long-name="Device Platform Release" levels="bld mid top">
+<collection name="s60extras" long-name="S60 Extras" level="mid">
+<!-- collection is really a component. Need to move down a directory -->
+<component name="s60extras_build" filter="s60" long-name="S60 Extras Build" purpose="development" class="config">
+<unit bldFile="os/deviceplatformrelease/s60extras/group"/>
+</component>
+</collection>
+<collection name="version" long-name="Version" level="top">
+<!-- collection is really a component. Need to move down a directory -->
+<component name="version_build" filter="s60" long-name="Version Build" purpose="development" class="config">
+<unit bldFile="os/deviceplatformrelease/version/group"/>
+</component>
+</collection>
+<collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
+<component name="cedarutils" long-name="Cedar Utils" purpose="development">
+<unit mrp="os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
+</component>
+<component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt" purpose="development" class="config">
+<unit mrp="os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
+</component>
+</collection>
+<collection name="foundation_system" long-name="Foundation System" level="top">
+<component name="system_model" long-name="System Model" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
+</component>
+<component name="sf_config" filter="s60,build_as_app" long-name="Foundation Config" introduced="^4">
+<unit bldFile="os/deviceplatformrelease/foundation_system/sf_config/CI_external/group"/>
+</component>
+<component name="config" filter="s60" long-name="Config" purpose="development" class="config"/>
+<component name="cenrep" filter="sf_build" long-name="ConE Central Repository Config" purpose="development" class="config">
+<!-- will should give the id/path something more unique than cenrep -->
+<unit bldFile="os/deviceplatformrelease/foundation_system/sf_config/cenrep/group"/>
+</component>
+<component name="rombuild_syborg" filter="sf_build" long-name="Syborg iMaker Config" purpose="development" introduced="^3" class="config">
+<unit bldFile="os/deviceplatformrelease/foundation_system/sf_config/rombuild/syborg/group"/>
+</component>
+<component name="rombuild_zoom2" filter="sf_build" long-name="Zoom2 iMaker Config" purpose="development" introduced="^3" class="config">
+<unit bldFile="os/deviceplatformrelease/foundation_system/sf_config/rombuild/zoom2/group"/>
+</component>
+</collection>
+<collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
+<component name="deviceplatformrelease_metadata" long-name="Device Platform Release Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<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"/>
+</component>
+<component name="testinterface" filter="s60" long-name="Test Interface" purpose="development">
+<unit bldFile="os/osrndtools/stif/testinterface/group"/>
+</component>
+<component name="testserver" filter="s60" long-name="Test Server" purpose="development">
+<unit bldFile="os/osrndtools/stif/testserver/group"/>
+</component>
+<component name="testengine" filter="s60" long-name="Test Engine" purpose="development">
+<unit bldFile="os/osrndtools/stif/testengine/group"/>
+</component>
+<component name="testserverstarter" filter="s60" long-name="Test Server Starter" purpose="development">
+<unit bldFile="os/osrndtools/stif/testserverstarter/group"/>
+</component>
+<component name="stiftfwif" filter="s60" long-name="STIF Test Framework Interface" purpose="development">
+<unit bldFile="os/osrndtools/stif/stiftfwif/group"/>
+</component>
+<component name="consoleui" filter="s60" long-name="Console UI" purpose="development">
+<unit bldFile="os/osrndtools/stif/consoleui/group"/>
+</component>
+<component name="testcombiner" filter="s60" long-name="Test Combiner" purpose="development">
+<unit bldFile="os/osrndtools/stif/testcombiner/group"/>
+</component>
+<component name="demomodule" filter="s60" long-name="Demo Module" purpose="development">
+<unit bldFile="os/osrndtools/stif/demomodule/group"/>
+</component>
+<component name="atslogger" filter="s60" long-name="ATS Logger" purpose="development">
+<unit bldFile="os/osrndtools/stif/atslogger/group"/>
+</component>
+<component name="atsinterface" filter="s60" long-name="ATS Interface" purpose="development">
+<unit bldFile="os/osrndtools/stif/atsinterface/group"/>
+</component>
+<component name="testscripter" filter="s60" long-name="Test Scripter" purpose="development">
+<unit bldFile="os/osrndtools/stif/testscripter/group"/>
+</component>
+<component name="suevent" filter="s60" long-name="SU Event" purpose="development">
+<unit bldFile="os/osrndtools/stif/suevent/group"/>
+</component>
+<component name="stifkerneltestclassbase" filter="s60" long-name="STIF Kernel Test Class Base" purpose="development">
+<unit bldFile="os/osrndtools/stif/stifkerneltestclassbase/group"/>
+</component>
+<component name="stif_data" filter="s60" long-name="STIF Data" purpose="development" class="config">
+<!-- This is a component. Should move down a directory. or move into other STIF components-->
+<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">
+<unit bldFile="os/osrndtools/memspy/memspy_plat/group"/>
+</component>
+<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">
+<unit bldFile="os/osrndtools/memspy/engine/group"/>
+</component>
+<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">
+<unit bldFile="os/osrndtools/memspy/console/group"/>
+</component>
+<component name="memspyserver" filter="s60" long-name="MemSpy Server" purpose="development" introduced="^4">
+<unit bldFile="os/osrndtools/memspy/MemSpyServer/group"/>
+</component>
+<component name="memspyclient" filter="s60" long-name="MemSpy Client" purpose="development" introduced="^4">
+<unit bldFile="os/osrndtools/memspy/MemSpyClient/group"/>
+</component>
+<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>
+</collection>
+<collection name="hti" long-name="Harmonized Test Interface" level="trace">
+<component name="hti_plat" filter="s60" long-name="HTI Platform Interfaces" purpose="development" class="api">
+<unit bldFile="os/osrndtools/hti/hti_plat/group"/>
+</component>
+<component name="hticfg" filter="s60" long-name="HTI Config" purpose="development">
+<unit bldFile="os/osrndtools/hti/hticfg/group"/>
+</component>
+<component name="htiautostart" filter="s60" long-name="HTI Autostart" purpose="development">
+<unit bldFile="os/osrndtools/hti/htiautostart/group"/>
+</component>
+<component name="htiframework" filter="s60" long-name="HTI Framework" purpose="development">
+<unit bldFile="os/osrndtools/hti/htiframework/group"/>
+</component>
+<component name="hticommplugins" filter="s60" long-name="HTI Communication Plugins" purpose="development" plugin="Y">
+<!-- need to #include these from a single unit or separate into component at the right directory level -->
+<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
+<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
+<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
+<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
+</component>
+<component name="htiserviceplugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
+<!-- need to #include these from a single unit or separate into component at the right directory level -->
+<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
+<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
+<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
+<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
+<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
+</component>
+<component name="htifilehlp" filter="s60" long-name="HTI File Help" purpose="development">
+<unit bldFile="os/osrndtools/hti/htifilehlp/group"/>
+</component>
+<component name="htiwatchdog" filter="s60" long-name="HTI Watchdog" purpose="development">
+<unit bldFile="os/osrndtools/hti/htiwatchdog/group"/>
+</component>
+<component name="hti_build" filter="s60" long-name="HTI Build" purpose="development">
+<!-- move exports into self-contained component.-->
+<unit bldFile="os/osrndtools/hti/group"/>
+</component>
+</collection>
+<collection name="piprofiler" long-name="Performance Investigator Profiler" level="analysis">
+<component name="piprofiler_build" long-name="Performance Investigator Profiler Build" introduced="^4">
+<unit bldFile="os/osrndtools/piprofiler/group"/>
+</component>
+</collection>
+<collection name="analyzetool" long-name="Analyze Tool" level="analysis">
+<component name="analyzetool_build" long-name="Analyze Tool Build" introduced="^4">
+<unit bldFile="os/osrndtools/analyzetool/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">
+<block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
+<collection name="appsupport_pub" long-name="Generic Application Support Public Interfaces" level="specific">
+<component name="flash_viewer_framework_api" long-name="Flash Viewer Framework API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
+</component>
+<component name="network_status_api" long-name="Network Status API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_pub/network_status_api/group"/>
+</component>
+</collection>
+<collection name="appsupport_plat" long-name="Generic Application Support Platform Interfaces" level="specific">
+<component name="action_plugin_api" long-name="Action Plug-In API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/action_plugin_api/group"/>
+</component>
+<component name="application_orientation_api" long-name="Application Orientation API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/application_orientation_api/group"/>
+</component>
+<component name="context_access_api" long-name="Context Access API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/context_access_api/group"/>
+</component>
+<component name="context_framework_services_api" long-name="Context Framework Services API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/context_framework_services_api/group"/>
+</component>
+<component name="context_framework_client_api" long-name="Context Framework Client API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/context_framework_client_api/group"/>
+</component>
+<component name="context_framework_listener_api" long-name="Context Framework Listener API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/context_framework_listener_api/group"/>
+</component>
+<component name="context_framework_version_api" long-name="Context Framework Version API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/context_framework_version_api/group"/>
+</component>
+<component name="context_source_plugin_api" long-name="Context Source Plug-In API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/context_source_plugin_api/group"/>
+</component>
+<component name="context_source_settings_manager_api" long-name="Context Source Settings Manager API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/context_source_settings_manager_api/group"/>
+</component>
+<component name="context_subscription_api" long-name="Context Subscription API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/context_subscription_api/group"/>
+</component>
+<component name="key_event_framework_api" long-name="Key Event Framework API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_api/group"/>
+</component>
+<component name="key_event_framework_mapper_api" long-name="Key Event Framework Mapper API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_mapper_api/group"/>
+</component>
+<component name="media_keys_definition_api" long-name="Media Keys Definition API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/media_keys_definition_api/group"/>
+</component>
+<component name="ood_threshold_api" long-name="OOD Threshold API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/ood_threshold_api/group"/>
+</component>
+<component name="oom_monitor_api" long-name="OOM Monitor API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_api/group"/>
+</component>
+<component name="oom_monitor_plugin_api" long-name="OOM Monitor Plugin API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_plugin_api/group"/>
+</component>
+<component name="operation_provider_api" long-name="Operation Provider API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/operation_provider_api/group"/>
+</component>
+<component name="phonecmdhandler_api" long-name="Phone Command Handler API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/phonecmdhandler_api/group"/>
+</component>
+<component name="restore_factory_settings_api" long-name="Restore Factory Settings API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_api/group"/>
+</component>
+<component name="restore_factory_settings_plugin_api" long-name="Restore Factory Settings Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_plugin_api/group"/>
+</component>
+<component name="secondary_display_accfw_api" long-name="Secondary Display Accessory Framework API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_accfw_api/group"/>
+</component>
+<component name="secondary_display_startup_api" long-name="Secondary Display Startup API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_startup_api/group"/>
+</component>
+<component name="secondary_display_sysap_api" long-name="Secondary Display System Application API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_sysap_api/group"/>
+</component>
+<component name="secondary_display_system_state_api" long-name="Secondary Display System State API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_system_state_api/group"/>
+</component>
+<component name="sensor_user_setting_api" long-name="Sensor User Setting API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/sensor_user_setting_api/group"/>
+</component>
+<component name="startup_configuration_api" long-name="Startup Configuration API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/startup_configuration_api/group"/>
+</component>
+<component name="system_application_key_handler_plugin_api" long-name="System Application Key Handler Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/system_application_key_handler_plugin_api/group"/>
+</component>
+<component name="system_application_light_control_plugin_api" long-name="System Application Light Control Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/system_application_light_control_plugin_api/group"/>
+</component>
+<component name="system_application_notification_api" long-name="System Application Notification API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/system_application_notification_api/group"/>
+</component>
+<component name="system_application_plugin_callback_api" long-name="System Application Plug-in Callback API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
+</component>
+<component name="flash_mmi_service_interface_custom_api" long-name="Flash MMI Service Interface Custom API" filter="s60,!sf_build" introduced="^2" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/flash_mmi_service_interface_custom_api/group"/>
+</component>
+<component name="flash_netscape_plugin_command_api" long-name="Flash Netscape Plugin Command API" filter="s60,!sf_build" introduced="^2" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/flash_netscape_plugin_command_api/group"/>
+</component>
+</collection>
+<collection name="contextframework" long-name="Context Framework" level="framework">
+<component name="cfw" filter="s60" long-name="Context Framework">
+<unit bldFile="mw/appsupport/contextframework/cfw/group"/>
+</component>
+<component name="cfwplugins" filter="s60" long-name="Context Framework Plugins" plugin="Y">
+<unit bldFile="mw/appsupport/contextframework/cfwplugins/group"/>
+</component>
+</collection>
+<collection name="coreapplicationuis" long-name="Core Application UIs" level="server">
+<component name="dbrecovery" filter="s60" long-name="Database Recovery">
+<unit bldFile="mw/appsupport/coreapplicationuis/dbrecovery/group"/>
+</component>
+<component name="nspswsplugin" filter="s60" long-name="NSPS WS Plugin" plugin="Y">
+<!-- No Service Power Save? Window Server? Please elaborate-->
+<unit bldFile="mw/appsupport/coreapplicationuis/nspswsplugin/group"/>
+</component>
+<component name="rfs" filter="s60" long-name="Restore Factory Settings">
+<unit bldFile="mw/appsupport/coreapplicationuis/rfs/group"/>
+</component>
+<component name="rfsplugins" filter="s60" long-name="Restore Factory Settings Plugins" plugin="Y">
+<unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/group"/>
+</component>
+<component name="sysap" filter="s60" long-name="System Application">
+<unit bldFile="mw/appsupport/coreapplicationuis/sysap/group"/>
+</component>
+<component name="variatedsettings" filter="s60" long-name="Variated Settings" class="config">
+<unit bldFile="mw/appsupport/coreapplicationuis/variatedsettings/group"/>
+</component>
+<component name="accfwuinotifier" filter="s60" long-name="Accessory Framework UI Notifier" plugin="Y">
+<unit bldFile="mw/appsupport/coreapplicationuis/accfwuinotifier/group"/>
+</component>
+<component name="kefmapper" filter="s60" long-name="Key Event Framework">
+<unit bldFile="mw/appsupport/coreapplicationuis/kefmapper/group"/>
+</component>
+<component name="advancedtspcontroller" filter="s60" long-name="Advanced TSP Controller">
+<unit bldFile="mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
+</component>
+<component name="powersaveutilities" filter="s60" long-name="Power Save Utilities">
+<unit bldFile="mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
+</component>
+<component name="gsserverenginestub" filter="s60" long-name="GS Server Engine Stub" deprecated="^4">
+<unit bldFile="mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
+</component>
+<component name="gsserverengine" filter="s60" long-name="GS Server Engine" deprecated="^4">
+<unit bldFile="mw/appsupport/coreapplicationuis/gsserverengine/group"/>
+</component>
+<component name="sensordatacompensatorplugin" filter="s60" long-name="Sensor Data Compensator Plugin" plugin="Y">
+<unit bldFile="mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/group"/>
+</component>
+<component name="atcmdplugin" long-name="AT Command Plugin" filter="s60,!oem_build" plugin="Y">
+<unit bldFile="mw/appsupport/coreapplicationuis/atcmdplugin/group"/>
+</component>
+<component name="devicepowermenuplugin" long-name="Device Power Menu Plugin" introduced="^4" plugin="Y">
+<unit bldFile="mw/appsupport/coreapplicationuis/devicepowermenuplugin" proFile="devicepowermenuplugin.pro"/>
+</component>
+</collection>
+<collection name="flashliteapi_3_1" long-name="Flash Lite API 3.1" level="specific">
+<!-- collection is really a component. Move down a directory -->
+<component name="flashliteapi_3_1_build" long-name="Flash Lite API Build" filter="s60" introduced="^2"/>
+</collection>
+<collection name="mediakeys" long-name="Media Keys" level="plugin">
+<!-- collection is really a component. Move down a directory -->
+<component name="mediakeys_build" filter="s60" long-name="Media Keys Build">
+<unit bldFile="mw/appsupport/mediakeys/group"/>
+</component>
+</collection>
+<collection name="startupservices" long-name="Startup Services" level="system">
+<component name="splashscreen" filter="s60" long-name="Splash Screen">
+<unit bldFile="mw/appsupport/startupservices/splashscreen/group"/>
+</component>
+<component name="startupanimation" filter="s60" long-name="Startup Animation">
+<unit bldFile="mw/appsupport/startupservices/startupanimation/group"/>
+</component>
+<component name="startup" long-name="Startup Application" filter="s60">
+<unit bldFile="mw/appsupport/startupservices/startup/group"/>
+</component>
+</collection>
+<collection name="sysresmonitoring" long-name="System Resource Monitoring" level="system">
+<component name="oodmonitor" filter="s60" long-name="OOD Monitor" introduced="7.0s">
+<unit bldFile="mw/appsupport/sysresmonitoring/oodmonitor/group"/>
+</component>
+<component name="oommonitor" filter="s60" long-name="OOM Monitor" introduced="7.0s">
+<unit bldFile="mw/appsupport/sysresmonitoring/oommonitor/group"/>
+</component>
+</collection>
+<collection name="systemsettings" long-name="System Settings" level="system">
+<component name="gssensorplugin" filter="s60" long-name="GS Sensor Plugin" plugin="Y">
+<unit bldFile="mw/appsupport/systemsettings/gssensorplugin/group"/>
+</component>
+<component name="gsaccessoryplugin" filter="s60" long-name="GS Accessory Plugin" plugin="Y">
+<unit bldFile="mw/appsupport/systemsettings/gsaccessoryplugin/group"/>
+</component>
+</collection>
+<collection name="filehandling" long-name="File Handling" level="server">
+<component name="fileconverterfw" long-name="File Converter Framework" purpose="optional">
+<unit bldFile="mw/appsupport/filehandling/fileconverterfw/group" mrp="mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
+</component>
+<component name="htmltorichtextconverter" long-name="HTML to RichText Converter" introduced="7.0" purpose="optional" plugin="Y">
+<unit bldFile="mw/appsupport/filehandling/htmltorichtextconverter/group" mrp="mw/appsupport/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
+</component>
+<component name="richtexttohtmlconverter" long-name="RichText to HTML Converter" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
+</component>
+</collection>
+<collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
+<component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" deprecated="^4" plugin="Y">
+<unit bldFile="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
+</component>
+</collection>
+<collection name="commonappservices" long-name="Common Application Services" level="framework">
+<component name="alarmserver" long-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"/>
+</component>
+<component name="alarmservertest" long-name="Alarm Server Test" deprecated="^3" introduced="8.1" purpose="development">
+<unit bldFile="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
+</component>
+<component name="appservicesdocs" long-name="Application Services Documentation" purpose="development" class="doc">
+<unit mrp="mw/appsupport/commonappservices/appservicesdocs/app-services_documentation.mrp"/>
+</component>
+<component name="backuprestorenotification" long-name="Backup Restore Notification" introduced="8.1" purpose="optional">
+<unit bldFile="mw/appsupport/commonappservices/backuprestorenotification/group" mrp="mw/appsupport/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
+</component>
+</collection>
+<collection name="tzservices" long-name="Time Zone Services" level="plugin">
+<component name="tzserver" long-name="Time Zone Server" introduced="9.1" purpose="optional">
+<unit bldFile="mw/appsupport/tzservices/tzserver/group" mrp="mw/appsupport/tzservices/tzserver/group/app-services_tz.mrp"/>
+</component>
+<component name="tzloc" long-name="Time Zone Localization" introduced="9.1" purpose="optional">
+<unit bldFile="mw/appsupport/tzservices/tzloc/group" mrp="mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
+</component>
+<component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
+<unit bldFile="mw/appsupport/tzservices/tzlocrscfactory/group" mrp="mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
+</component>
+<component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
+<unit bldFile="mw/appsupport/tzservices/tzdatabase/group" mrp="mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
+</component>
+</collection>
+<collection name="contenthandling" long-name="Content Handling" level="plugin">
+<component name="webrecognisers" long-name="Web Recognisers" purpose="optional" plugin="Y">
+<unit bldFile="mw/appsupport/contenthandling/webrecognisers/group" mrp="mw/appsupport/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
+</component>
+</collection>
+<collection name="openenvutils" long-name="Open Environment Utilities" level="specific">
+<component name="commandshell" long-name="Command Shell" introduced="^3" purpose="development">
+<unit bldFile="mw/appsupport/openenvutils/commandshell/group" mrp="mw/appsupport/openenvutils/commandshell/group/oetools_zsh.mrp"/>
+</component>
+<component name="telnetserver" long-name="Telnet Server" introduced="^3" purpose="development">
+<unit bldFile="mw/appsupport/openenvutils/telnetserver/group" mrp="mw/appsupport/openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
+</component>
+</collection>
+<collection name="printingsupport" long-name="Printing Support" level="generic">
+<component name="printinguisupport" long-name="Printing UI Support" purpose="optional" introduced="^2" deprecated="^3">
+<unit bldFile="mw/appsupport/printingsupport/printinguisupport/group" mrp="mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
+</component>
+</collection>
+<collection name="appfw" long-name="Application Framework" level="framework">
+<component name="apparchitecture" long-name="Application Architecture" purpose="mandatory">
+<unit bldFile="mw/appsupport/appfw/apparchitecture/group" mrp="mw/appsupport/appfw/apparchitecture/group/app-framework_apparc.mrp"/>
+</component>
+<component name="viewserver" long-name="View Server" introduced="6.0" purpose="mandatory">
+<unit bldFile="mw/appsupport/appfw/viewserver/group" mrp="mw/appsupport/appfw/viewserver/group/app-framework_viewsrv.mrp"/>
+</component>
+</collection>
+<collection name="applaunchservices" long-name="Application Launch Services" level="generic">
+<component name="aftermarketappstarter" long-name="After Market Application Starter" introduced="^3" purpose="optional">
+<unit bldFile="mw/appsupport/applaunchservices/aftermarketappstarter/group" mrp="mw/appsupport/applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
+</component>
+<component name="applaunchplugins" long-name="Application Launch Plugins" introduced="^3" purpose="optional">
+<unit bldFile="mw/appsupport/applaunchservices/applaunchplugins/group" mrp="mw/appsupport/applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
+</component>
+</collection>
+<collection name="tzpcside" long-name="Time Zone PC Side" level="plugin">
+<component name="tzcompiler" long-name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config PC">
+<unit bldFile="mw/appsupport/tzpcside/tzcompiler/group" mrp="mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
+</component>
+</collection>
+<collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
+<component name="appsupport_metadata" long-name="Generic Application Support Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="securitysrv" level="generic" long-name="Security Services" levels="plugin framework server generic specific">
+<collection name="secsrv_plat" long-name="Security Services Platform Interfaces" level="specific">
+<component name="cms_api" long-name="CMS API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/cms_api/group"/>
+</component>
+<component name="pkcs12_parser_api" long-name="PKCS12 Parser API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/pkcs12_parser_api/group"/>
+</component>
+<component name="java_utils_api" long-name="Java Utils API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/java_utils_api/group"/>
+</component>
+<component name="wim_cert_api" long-name="WIM Cert API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/wim_cert_api/group"/>
+</component>
+<component name="device_key_store_encryption_plugin_api" long-name="Device Key Store Encryption Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/device_key_store_encryption_plugin_api/group"/>
+</component>
+<component name="x509certnameparser_api" long-name="X.509 Certificate Name Parser API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
+</component>
+<component name="remote_lock_api" long-name="Remote Lock API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
+</component>
+<component name="pkidialog_api" long-name="PKI Dialog API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
+</component>
+<component name="provisioning_api" long-name="Provisioning API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/provisioning_api/group"/>
+</component>
+<component name="keyguard_configuration_api" long-name="Keyguard Configuration API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_configuration_api/group"/>
+</component>
+<component name="keylock_policy_api" long-name="Keylock Policy API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/keylock_policy_api/group"/>
+</component>
+<component name="security_code_ui_api" long-name="Security Code UI API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
+</component>
+<component name="gba_api" long-name="GBA API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/gba_api/group"/>
+</component>
+<component name="keyguard_access_api" long-name="Keyguard Access API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_access_api/group"/>
+</component>
+<component name="devicelock_access_api" long-name="Device Lock Access API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/devicelock_access_api/group"/>
+</component>
+<component name="lockapp_server_api" long-name="Lock Application Server API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
+</component>
+<component name="devencadaptation_api" long-name="Device Encryption Adaptation API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
+</component>
+<component name="devenccommonutils_api" long-name="Device Encryption Common Utils API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
+</component>
+</collection>
+<collection name="cms" long-name="Certificate Management Service" level="server">
+<!-- collection is really a component. Need to move down a directory-->
+<component name="cms_build" filter="s60" long-name="CMS" introduced="^3">
+<unit bldFile="mw/securitysrv/cms/group"/>
+</component>
+</collection>
+<collection name="pkiutilities" long-name="PKI Utilities" level="plugin">
+<component name="x509certnameparser" filter="s60" long-name="X.509 Certificate Name Parser">
+<unit bldFile="mw/securitysrv/pkiutilities/x509certnameparser/group"/>
+</component>
+<component name="pkcs12" filter="s60" long-name="PKCS #12">
+<unit bldFile="mw/securitysrv/pkiutilities/pkcs12/group"/>
+</component>
+<component name="ctsecuritydialogs" filter="s60" long-name="Crypto Token Security Dialogs">
+<unit bldFile="mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
+</component>
+<component name="certsaver" filter="s60" long-name="Certificate Saver">
+<unit bldFile="mw/securitysrv/pkiutilities/certsaver/group"/>
+</component>
+<component name="devicetoken" filter="s60" long-name="Device Token">
+<unit bldFile="mw/securitysrv/pkiutilities/devicetoken/group"/>
+</component>
+<component name="certificates" filter="s60" long-name="Certificates">
+<unit bldFile="mw/securitysrv/pkiutilities/Certificates/group" filter="sf_build"/>
+</component>
+<component name="pkiutilities_build" filter="s60" long-name="PKI Utilities Build">
+<!-- need to split this into the above components -->
+<unit bldFile="mw/securitysrv/pkiutilities/group"/>
+</component>
+<component name="ocsp" long-name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
+<unit bldFile="mw/securitysrv/pkiutilities/ocsp/group" mrp="mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
+</component>
+</collection>
+<collection name="wim" long-name="Wireless Identity Module" level="framework">
+<!-- collection is really a component. Need to move down a directory-->
+<component name="wim_build" filter="s60" long-name="WIM Build">
+<unit bldFile="mw/securitysrv/wim/group"/>
+</component>
+</collection>
+<collection name="remotelock" long-name="Remote Lock" level="generic">
+<!-- collection is really a component. Need to move down a directory-->
+<component name="remotelock_build" filter="s60" long-name="Remote Lock Build">
+<unit bldFile="mw/securitysrv/remotelock/group"/>
+</component>
+</collection>
+<collection name="securitydialogs" long-name="Security Dialogs" level="specific">
+<component name="keylockpolicyapi" filter="s60" long-name="Keylock Policy API">
+<unit bldFile="mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
+</component>
+<component name="autolock" long-name="Autolock" filter="s60">
+<unit bldFile="mw/securitysrv/securitydialogs/autolock" proFile="autolock.pro"/>
+</component>
+<component name="secui" filter="s60" long-name="Security UI">
+<unit bldFile="mw/securitysrv/securitydialogs/secui/group"/>
+</component>
+<component name="securitynotifier" filter="s60" long-name="Security Notifier">
+<unit bldFile="mw/securitysrv/securitydialogs/securitynotifier/group"/>
+</component>
+<component name="lockclient" filter="s60" long-name="Lock Client" introduced="^3">
+<!-- This overwrites the bld.inf already in this dir. I'm pretty sure this will cause problems with the export -->
+<unit bldFile="mw/securitysrv/securitydialogs/lockclient/group" proFile="lockclient.pro" qmakeArgs="-r"/>
+</component>
+<component name="lockapp" filter="s60" long-name="Lock Application" introduced="^3">
+<unit bldFile="mw/securitysrv/securitydialogs/lockapp/group"/>
+</component>
+<component name="secuinotifications" long-name="Security UI Notifications" introduced="^4" filter="s60">
+<unit bldFile="mw/securitysrv/securitydialogs/secuinotifications" proFile="secuinotifications.pro" qmakeArgs="-r"/>
+</component>
+<component name="autolockuseractivityservice" long-name="Auto Lock User Activity Service" introduced="^4" filter="s60">
+<unit bldFile="mw/securitysrv/securitydialogs/Autolock/autolockuseractivityservice" proFile="autolockuseractivityservice.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+<collection name="cpsecplugins" long-name="Security Settings Plugins" level="plugin">
+<component name="devicelockplugin" long-name="Device Lock Plugin" introduced="^4" filter="s60">
+<unit bldFile="mw/securitysrv/cpsecplugins/devicelockplugin" proFile="devicelockplugin.pro" qmakeArgs="-r"/>
+</component>
+<component name="simpincodeplugin" long-name="SIM PIN Code Plugin" introduced="^4" filter="s60">
+<unit bldFile="mw/securitysrv/cpsecplugins/simpincodeplugin" proFile="pincodeplugin.pro" qmakeArgs="-r"/>
+</component>
+<component name="cpadvancedsecplugin" long-name="Advanced Security Plugin" introduced="^4" filter="s60">
+<unit bldFile="mw/securitysrv/cpsecplugins/cpadvancedsecplugin/group" proFile="advancedsecplugin.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+<collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
+<!-- collection is really a component. Need to move down a directory-->
+<component name="boottimeintegritycheck_build" filter="s60" long-name="Boot Time Integrity Check Build">
+<unit bldFile="mw/securitysrv/boottimeintegritycheck/group"/>
+</component>
+</collection>
+<collection name="gba" long-name="Generic Bootstrapping Architecture" level="server">
+<component name="uicc" filter="s60" long-name="UICC" introduced="^2" plugin="Y">
+<unit bldFile="mw/securitysrv/gba/uicc/group"/>
+</component>
+<component name="gbaserver" filter="s60" long-name="GBA Server" introduced="^2">
+<unit bldFile="mw/securitysrv/gba/gbaserver/group"/>
+</component>
+<component name="gbaapi" filter="s60" long-name="GBA API" introduced="^2">
+<unit bldFile="mw/securitysrv/gba/gbaapi/group"/>
+</component>
+<component name="gbafilter" filter="s60" long-name="GBA HTTP Filter" introduced="^2" plugin="Y">
+<unit bldFile="mw/securitysrv/gba/gbafilter/group"/>
+</component>
+<component name="gba_build" filter="s60" long-name="Generic Boot Architecture Build" introduced="^2">
+<!-- need to split this into the above components, or remove #includes and make this GBA ROM -->
+<unit bldFile="mw/securitysrv/gba/group"/>
+</component>
+</collection>
+<collection name="devencdiskutils" long-name="Device Encryption Disk Utils" level="server">
+<component name="devenccommonutils" filter="s60" long-name="Device Encryption Common Utils" introduced="^3">
+<unit bldFile="mw/securitysrv/devencdiskutils/DevEncCommonUtils/group"/>
+</component>
+<component name="devencrfsplugin" filter="s60" long-name="Device Encryption RFS Plugin" introduced="^3" plugin="Y">
+<unit bldFile="mw/securitysrv/devencdiskutils/DevEncRfsPlugin/group"/>
+</component>
+<component name="pk5recognizer" filter="s60" long-name="Device Encryption Pk5 Recognizer" introduced="^3" plugin="Y">
+<unit bldFile="mw/securitysrv/devencdiskutils/Pk5Recognizer/group"/>
+</component>
+<component name="devencstarter" filter="s60" long-name="Device Encryption Starter" introduced="^3" plugin="Y">
+<unit bldFile="mw/securitysrv/devencdiskutils/DevEncStarter/group"/>
+</component>
+<component name="devencdiskutils_build" filter="s60" long-name="Device Encryption Disk Utils Build" introduced="^3">
+<!-- need to split this into the above components, or remove #includes and make this a ROM component-->
+<unit bldFile="mw/securitysrv/devencdiskutils/group"/>
+</component>
+</collection>
+<collection name="securitysrv_info" long-name="Security Services Info" level="specific">
+<component name="securitysrv_metadata" long-name="Security Services Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="drm" level="generic" long-name="DRM" levels="plugin framework server generic specific">
+<collection name="drm_plat" long-name="DRM Platform Interfaces" level="specific">
+<component name="roap_api" long-name="ROAP API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/roap_api/group"/>
+</component>
+<component name="drm_common_api" long-name="DRM Common API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/drm_common_api/group"/>
+</component>
+<component name="drm_rights_api" long-name="DRM Rights API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/drm_rights_api/group"/>
+</component>
+<component name="drm_legacy_api" long-name="DRM Legacy API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/drm_legacy_api/group"/>
+</component>
+<component name="dcf_repository_api" long-name="DCF Repository API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/dcf_repository_api/group"/>
+</component>
+<component name="drm_service_api" long-name="DRM Service API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/drm_service_api/group"/>
+</component>
+<component name="drm_secondary_display_api" long-name="DRM Secondary Display API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/drm_secondary_display_api/group"/>
+</component>
+<component name="drm_license_manager_api" long-name="DRM License Manager API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/drm_license_manager_api/group"/>
+</component>
+<component name="drm_utility_api" long-name="DRM Utility API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/drm_utility_api/group"/>
+</component>
+<component name="drm_agents_api" long-name="DRM Agents API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/drm_agents_api/group"/>
+</component>
+<component name="wmdrm_core_api" long-name="WM DRM Core API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/wmdrm_core_api/group"/>
+</component>
+<component name="wmdrm_access_api" long-name="WM DRM Access API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/wmdrm_access_api/group"/>
+</component>
+<component name="wmdrm_ota_access_api" long-name="WM DRM OTA Access API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/wmdrm_ota_access_api/group"/>
+</component>
+<component name="camese_utility_api" long-name="Camese Utility API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/camese_utility_api/group"/>
+</component>
+<component name="camese_framework_api" long-name="Camese Framework API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/camese_framework_api/group"/>
+</component>
+</collection>
+<collection name="drm_pub" long-name="DRM Public Interfaces" level="specific">
+<component name="drm_helper_api" long-name="DRM Helper API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_pub/drm_helper_api/group"/>
+</component>
+<component name="oma_drm_caf_agent_api" long-name="OMA DRM CAF Agent API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/group"/>
+</component>
+<component name="drm_license_checker_api" long-name="DRM License Checker API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_pub/drm_license_checker_api/group"/>
+</component>
+</collection>
+<collection name="commondrm" long-name="Common DRM" level="generic">
+<!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
+<component name="drmqtencryptor" filter="s60" long-name="DRM Qt Encryptor" introduced="^4">
+<unit bldFile="mw/drm/commondrm/drmqtencryptor" proFile="qt_drmencryptor.pro" qmakeArgs="-r"/>
+</component>
+<component name="drmrightsmanagerui" filter="s60" long-name="DRM Rights Manager UI">
+<unit bldFile="mw/drm/commondrm/drmrightsmanagerui/help/group"/>
+</component>
+<component name="drmutility" filter="s60" long-name="DRM Utility">
+<unit bldFile="mw/drm/commondrm/drmutility/group"/>
+</component>
+<component name="drmserviceapiwrapper" filter="s60" long-name="DRM Service API Wrapper">
+<unit bldFile="mw/drm/commondrm/drmserviceapiwrapper/group"/>
+</component>
+<component name="drmrightsstoringlocation" filter="s60" long-name="DRM Rights Storing Location">
+<unit bldFile="mw/drm/commondrm/drmrightsstoringlocation/group"/>
+</component>
+<component name="commondrm_build" filter="s60" long-name="Common DRM Build">
+<!-- should be split into the above files, or them collapsed into a single component -->
+<unit bldFile="mw/drm/commondrm/group"/>
+</component>
+</collection>
+<collection name="omadrm" long-name="OMA DRM" level="server">
+<!-- collection is really a component. Move down a directory -->
+<component name="omadrm_build" filter="s60" long-name="OMA DRM Build">
+<unit bldFile="mw/drm/omadrm/group"/>
+</component>
+<component name="foundationcerts" filter="sf_build" long-name="Foundation Certificates">
+<unit bldFile="mw/drm/omadrm/foundationcerts/group"/>
+</component>
+</collection>
+<collection name="wmdrm" long-name="Windows Media DRM" level="framework">
+<!-- collection is really a component. Move down a directory -->
+<component name="wmdrm_build" filter="s60" long-name="WM DRM Build">
+<unit bldFile="mw/drm/wmdrm/group"/>
+</component>
+</collection>
+<collection name="drm_info" long-name="DRM Info" level="specific"/>
+</block>
+<block name="locationsrv" level="specific" long-name="Location Services" levels="plugin fw server if">
+<collection name="locsrv_pub" long-name="Location Services Public Interfaces" level="if">
+<component name="landmarks_search_api" long-name="Landmarks Search API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
+</component>
+<component name="landmarks_api" long-name="Landmarks API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/group"/>
+</component>
+<component name="landmarks_database_management_api" long-name="Landmarks Database Management API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/group"/>
+</component>
+<component name="location_triggering_api" long-name="Location Triggering API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_pub/location_triggering_api/group"/>
+</component>
+<component name="blid_application_satellite_info_api" long-name="BLID Application Satellite Info API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/group"/>
+</component>
+</collection>
+<collection name="locsrv_plat" long-name="Location Services Platform Interfaces" level="if">
+<component name="geocoding_api" long-name="Geocoding API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
+</component>
+<component name="supl_pos_message_plugin_api" long-name="SUPL POS Message Plugin API" filter="s60" class="api placeholder">
+<!-- placeholder
+ <meta rel="Api" href="locsrv_plat/supl_pos_message_plugin_api/supl_pos_message_plugin_api.metaxml"/>
+ <unit bldFile="locsrv_plat/supl_pos_message_plugin_api/group"/>
+ -->
+</component>
+<component name="landmarks_category_definition_api" long-name="Landmarks Category Definition API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
+</component>
+<component name="supl_settings_api" long-name="SUPL Settings API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
+</component>
+<component name="np_proxy_configuration_api" long-name="NP Proxy Configuration API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/np_proxy_configuration_api/group"/>
+</component>
+<component name="supl_terminal_initiation_api" long-name="SUPL Terminal Initiation API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/group"/>
+</component>
+<component name="supl_network_initiation_api" long-name="SUPL Network Initiation API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/group"/>
+</component>
+<component name="oma_supl_configuration_parameter_api" long-name="OMA SUPL Configuration Parameter API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_configuration_parameter_api/group"/>
+</component>
+<component name="location_triggering_management_api" long-name="Location Triggering Management API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_management_api/group"/>
+</component>
+<component name="location_triggering_status_information_api" long-name="Location Triggering Status Information API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_status_information_api/group"/>
+</component>
+<component name="oma_supl_asn_codec_plugin_api" long-name="OMA SUPL ASN Codec Plugin API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
+</component>
+<component name="query_and_notification_api" long-name="Query and Notification API" filter="s60" introduced="^3" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/query_and_notification_api/group"/>
+</component>
+<component name="location_local_variation_api" long-name="Location Local Variation API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/location_local_variation_api/group"/>
+</component>
+</collection>
+<collection name="genericpositioningplugins" long-name="Generic Positioning Plugins" level="plugin">
+<component name="locationnpppsy" filter="s60" long-name="Location Positioning Proxy PSY" plugin="Y">
+<unit bldFile="mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
+</component>
+<component name="locationsuplpsy" filter="s60" long-name="Location SUPL PSY" introduced="^3" plugin="Y">
+<unit bldFile="mw/locationsrv/genericpositioningplugins/locationsuplpsy/group"/>
+</component>
+<component name="genericpositioningplugins_build" filter="s60" long-name="Generic Positioning Plugins Build">
+<!-- need to break this up into the other components -->
+<unit bldFile="mw/locationsrv/genericpositioningplugins/group"/>
+</component>
+</collection>
+<collection name="landmarks" long-name="Landmarks" level="server">
+<component name="locationlandmarks" filter="s60" long-name="Location Landmarks">
+<unit bldFile="mw/locationsrv/landmarks/locationlandmarks/group"/>
+</component>
+</collection>
+<collection name="locationsystemui" long-name="Location System UI" level="if">
+<component name="locationsysui" filter="s60" long-name="Location System UI">
+<unit bldFile="mw/locationsrv/locationsystemui/locationsysui/group"/>
+</component>
+<component name="qtlocationsysui" filter="s60" long-name="Location System Qt UI">
+<unit bldFile="mw/locationsrv/locationsystemui/locationsysui" proFile="locsysui.pro"/>
+</component>
+</collection>
+<collection name="supl" long-name="SUPL" level="fw">
+<component name="locationsuplfw" filter="s60" long-name="Location SUPL Framework">
+<unit bldFile="mw/locationsrv/supl/locationsuplfw/group"/>
+</component>
+<component name="locationomasuplprotocolhandler" filter="s60" long-name="OMA SUPL Protocol Handler">
+<unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/group"/>
+</component>
+<component name="supltiapiimplementation" filter="s60" long-name="SUPL TI API Implementation" introduced="^3">
+<unit bldFile="mw/locationsrv/supl/supltiapiimplementation/group"/>
+</component>
+</collection>
+<collection name="locationtriggering" long-name="Location Triggering" level="server">
+<component name="ltlogger" filter="s60" long-name="LT Logger">
+<unit bldFile="mw/locationsrv/locationtriggering/ltlogger/group"/>
+</component>
+<component name="ltclientlib" filter="s60" long-name="LT Client Library">
+<unit bldFile="mw/locationsrv/locationtriggering/ltclientlib/group"/>
+</component>
+<component name="ltmanagementlib" filter="s60" long-name="LT Management Library">
+<unit bldFile="mw/locationsrv/locationtriggering/ltmanagementlib/group"/>
+</component>
+<component name="ltcontainer" filter="s60" long-name="LT Container">
+<unit bldFile="mw/locationsrv/locationtriggering/ltcontainer/group"/>
+</component>
+<component name="ltserver" filter="s60" long-name="LT Server">
+<unit bldFile="mw/locationsrv/locationtriggering/ltserver/group"/>
+</component>
+<component name="ltstrategypluginapi" filter="s60" long-name="LT Strategy Plugin API">
+<unit bldFile="mw/locationsrv/locationtriggering/ltstrategypluginapi/group"/>
+</component>
+<component name="ltstrategyengine" filter="s60" long-name="LT Strategy Engine">
+<unit bldFile="mw/locationsrv/locationtriggering/ltstrategyengine/group"/>
+</component>
+<component name="ltmovementdetectionpluginapi" filter="s60" long-name="Movement Detection Plugin API">
+<unit bldFile="mw/locationsrv/locationtriggering/ltmovementdetectionpluginapi/group"/>
+</component>
+<component name="ltcellidmovementdetector" filter="s60" long-name="Cell ID Movement Detector">
+<unit bldFile="mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/>
+</component>
+<component name="ltcontextsourceplugin" filter="s60" long-name="LT Context Source Plugin" introduced="^3" plugin="Y">
+<unit bldFile="mw/locationsrv/locationtriggering/ltcontextsourceplugin/group"/>
+</component>
+<component name="locationtriggering_build" filter="s60" long-name="Location Triggering Build">
+<!-- should remove #include from this and maybe put exports in the above components -->
+<unit bldFile="mw/locationsrv/locationtriggering/group"/>
+</component>
+</collection>
+</block>
+<block name="accesssec" level="generic" long-name="Access Security" levels="plugin framework server generic specific">
+<collection name="accesssec_plat" long-name="Access Security Platform Interfaces" level="specific">
+<component name="eap_vpn_api" long-name="EAP VPN API" filter="s60" class="api">
+<unit bldFile="mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
+</component>
+<component name="eap_type_api" long-name="EAP Type API" filter="s60" class="api">
+<unit bldFile="mw/accesssec/accesssec_plat/eap_type_api/group"/>
+</component>
+</collection>
+<collection name="securitysettings" long-name="WLAN Security Settings" level="specific">
+<component name="accesssec_qtconfigutils" filter="s60" long-name="Access Security Config Utils" introduced="^4">
+<unit bldFile="mw/accesssec/securitysettings/qtconfigutils" proFile="qtconfigutils.pro" qmakeArgs="-r"/>
+</component>
+<component name="cpwlansecurityuiplugins" filter="s60" long-name="Control Panel WLAN Security UI Plugins" introduced="^4">
+<unit bldFile="mw/accesssec/securitysettings/cpwlansecurityuiplugins" proFile="cpwlansecurityuiplugins.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+<collection name="eapol" long-name="EAPOL" level="framework">
+<component name="eapol_framework" filter="s60" long-name="EAPOL Framework" introduced="9.2">
+<unit bldFile="mw/accesssec/eapol/group"/>
+</component>
+</collection>
+</block>
+<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>
+<component name="bearer_settings_plugin_api" long-name="Bearer Settings Plugin API" filter="s60" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_plat/bearer_settings_plugin_api/group"/>
+</component>
+<component name="commsdat_wlan_api" long-name="CommsDat WLAN API" filter="s60" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_plat/commsdat_wlan_api/group"/>
+</component>
+<component name="connection_monitor_extension_api" long-name="Connection Monitor Extension API" filter="s60" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_monitor_extension_api/group"/>
+</component>
+<component name="connection_ui_utilities_api" long-name="Connection UI Utilities API" filter="s60" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_ui_utilities_api/group"/>
+</component>
+<component name="disconnect_dialog_api" long-name="Disconnect Dialog API" filter="s60" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_api/group"/>
+</component>
+<component name="disconnect_dialog_disable_api" long-name="Disconnect Dialog Disable API" filter="s60" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_disable_api/group"/>
+</component>
+<component name="extended_connection_settings_api" long-name="Extended Connection Settings API" filter="s60" class="api">
+<unit bldFile="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" class="api">
+<unit bldFile="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" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_settings_api/group"/>
+</component>
+<component name="mpm_connect_screen_api" long-name="MPM Connect Screen API" filter="s60" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_connect_screen_api/group"/>
+</component>
+<component name="flextimer_api" long-name="Flex Timer API" filter="s60" introduced="^4" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_plat/flextimer_api/group"/>
+</component>
+</collection>
+<collection name="ipcm_pub" long-name="IP Connectivity Management Public Interfaces" level="api">
+<component name="connection_settings_api" long-name="Connection Settings API" filter="s60" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_api/group"/>
+</component>
+<component name="access_point_engine_api" long-name="Access Point Engine API" filter="s60" class="api">
+<unit bldFile="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" class="api">
+<unit bldFile="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" class="api">
+<unit bldFile="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" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_monitor_server_api/group"/>
+</component>
+<component name="connection_settings_ui_api" long-name="Connection Settings UI API" filter="s60" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_ui_api/group"/>
+</component>
+<component name="agent_dialog_api" long-name="Agent Dialog API" filter="s60" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_pub/agent_dialog_api/group"/>
+</component>
+<component name="extendedconnpref_api" long-name="Extended Connection Preferences API" filter="s60" class="api">
+<unit bldFile="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" filter="s60" long-name="PDP Context Manager 2">
+<unit bldFile="mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
+</component>
+</collection>
+<collection name="apengine" long-name="Access Point Engine" level="framework">
+<component name="apeng" filter="s60" long-name="Access Point Engine">
+<unit bldFile="mw/ipconnmgmt/apengine/apeng/group"/>
+</component>
+<component name="apsettingshandlerui" filter="s60" long-name="Access Point Settings Handler UI">
+<unit bldFile="mw/ipconnmgmt/apengine/apsettingshandlerui/group"/>
+</component>
+</collection>
+<collection name="bearermanagement" long-name="Bearer Management" level="framework">
+<component name="mpm" filter="s60" long-name="Mobility Policy Manager">
+<unit bldFile="mw/ipconnmgmt/bearermanagement/mpm/group"/>
+</component>
+<component name="extendedconnpref" filter="s60" long-name="Extended Connection Preferences">
+<unit bldFile="mw/ipconnmgmt/bearermanagement/extendedconnpref/group"/>
+</component>
+<component name="s60mcpr" filter="s60" long-name="S60 Meta-Connection Provider" plugin="Y">
+<unit bldFile="mw/ipconnmgmt/bearermanagement/S60MCPR/group"/>
+</component>
+</collection>
+<collection name="cmmanager" long-name="Connection Method Manager" level="framework">
+<component name="cmmgr" filter="s60" long-name="CM Manager">
+<unit bldFile="mw/ipconnmgmt/cmmanager/cmmgr/group"/>
+</component>
+</collection>
+<collection name="connectionmonitoring" long-name="Connection Monitoring" level="server">
+<component name="connectionmonitorui" filter="s60" long-name="Connection Monitor UI">
+<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorui/group"/>
+</component>
+<component name="connmon" filter="s60" long-name="Connection Monitor">
+<!-- either split into two components, or #include from a common bld.inf -->
+<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/connectionmonitor/group"/>
+<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/dataconnectionlogger/group"/>
+</component>
+<component name="connmonext" filter="s60" long-name="Connection Monitor Extension API">
+<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmonext/group"/>
+</component>
+</collection>
+<collection name="connectionutilities" long-name="Connection Utilities" level="utils">
+<component name="connectiondialogs" filter="s60" long-name="Connection Dialogs">
+<unit bldFile="mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/>
+</component>
+</collection>
+<collection name="keepalive" long-name="Keep Alive" level="server">
+<component name="flextimer" filter="s60" long-name="Flex Timer" introduced="^4">
+<unit bldFile="mw/ipconnmgmt/keepalive/flextimer/group"/>
+</component>
+</collection>
+<collection name="dbcreator" long-name="DB Creator" level="utils">
+<component name="commsdatcreator" filter="s60" long-name="Comms Database Creator" introduced="9.3">
+<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
+</component>
+<component name="commsdatcreatorrfsplugin" filter="s60" long-name="Comms Database Creator RFS Plugin" introduced="9.3" plugin="Y">
+<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreatorrfsplugin/group"/>
+</component>
+<component name="commsdatstartup" filter="s60" long-name="Comms Database Startup" introduced="9.3">
+<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
+</component>
+<component name="dbcreatorexe" filter="s60" long-name="DB Creator" introduced="9.3">
+<unit bldFile="mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
+</component>
+<component name="dbcreator_build" filter="s60" long-name="DB Creator Build" introduced="9.3">
+<!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
+<unit bldFile="mw/ipconnmgmt/dbcreator/group"/>
+</component>
+</collection>
+<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 make this a config component and revmove the #includes -->
+<unit bldFile="mw/ipconnmgmt/group"/>
+</component>
+<component name="ipcm_qt_build" long-name="IP Connectivity Management Qt Build" introduced="^4">
+<unit bldFile="mw/ipconnmgmt" proFile="ipconnmgmt.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+</block>
+<block name="netprotocols" level="generic" long-name="High-level Internet Protocols" levels="plugin framework server generic specific">
+<collection name="netprotocols_plat" long-name="High-level Internet Protocols Platform Interfaces" level="specific">
+<component name="cookie_manager_api" long-name="Cookie Manager API" filter="s60" class="api">
+<unit bldFile="mw/netprotocols/netprotocols_plat/cookie_manager_api/group"/>
+</component>
+<component name="http_cache_mgr_api" long-name="HTTP Cache Manager API" filter="s60" class="api">
+<unit bldFile="mw/netprotocols/netprotocols_plat/http_cache_mgr_api/group"/>
+</component>
+<component name="http_filters_api" long-name="HTTP Filters API" filter="s60" class="api">
+<unit bldFile="mw/netprotocols/netprotocols_plat/http_filters_api/group"/>
+</component>
+</collection>
+<collection name="httpfilters" long-name="HTTP Filters" level="plugin">
+<component name="httpfiltercommon" filter="s60" long-name="HTTP Filter Common">
+<unit bldFile="mw/netprotocols/httpfilters/httpfiltercommon/group"/>
+</component>
+<component name="cookie" filter="s60" long-name="Cookie Filter" plugin="Y">
+<unit bldFile="mw/netprotocols/httpfilters/cookie/group"/>
+</component>
+<component name="deflatefilter" filter="s60" long-name="Deflate Filter" plugin="Y">
+<unit bldFile="mw/netprotocols/httpfilters/deflatefilter/group"/>
+</component>
+<component name="httpfilteracceptheader" filter="s60" long-name="Accept Header Filter" plugin="Y">
+<unit bldFile="mw/netprotocols/httpfilters/httpfilteracceptheader/group"/>
+</component>
+<component name="httpfilterauthentication" filter="s60" long-name="Authentication Filter" plugin="Y">
+<unit bldFile="mw/netprotocols/httpfilters/httpfilterauthentication/group"/>
+</component>
+<component name="httpfilterconnhandler" filter="s60" long-name="Connection Handler Fitler" plugin="Y">
+<unit bldFile="mw/netprotocols/httpfilters/httpfilterconnhandler/group"/>
+</component>
+<component name="httpfilteriop" filter="s60" long-name="HTTP IOP Filter" plugin="Y">
+<unit bldFile="mw/netprotocols/httpfilters/httpfilteriop/group"/>
+</component>
+<component name="httpfilterproxy" filter="s60" long-name="HTTP Proxy Filter" plugin="Y">
+<unit bldFile="mw/netprotocols/httpfilters/httpfilterproxy/group"/>
+</component>
+<component name="uaproffilter" filter="s60" long-name="UAProf Filter" plugin="Y">
+<unit bldFile="mw/netprotocols/httpfilters/uaproffilter/group"/>
+</component>
+</collection>
+<collection name="applayerprotocols" long-name="Application Layer Protocols" level="server">
+<component name="httptransportfw" long-name="HTTP Transport Framework" introduced="6.2" purpose="optional">
+<unit bldFile="mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
+</component>
+<component name="httpexamples" long-name="HTTP Examples" introduced="6.2" purpose="development">
+<unit bldFile="mw/netprotocols/applayerprotocols/httpexamples/group" mrp="mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
+</component>
+<component name="wappushsupport" long-name="WAP Push Support" introduced="6.2" purpose="optional">
+<unit bldFile="mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
+</component>
+<component name="wapbase" long-name="WAP Base" introduced="6.0" purpose="optional">
+<unit bldFile="mw/netprotocols/applayerprotocols/wapbase/Group" mrp="mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
+</component>
+<component name="ftpengine" long-name="FTP Engine" introduced="6.0" purpose="optional">
+<unit bldFile="mw/netprotocols/applayerprotocols/ftpengine/group" mrp="mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
+</component>
+<component name="telnetengine" long-name="Telnet Engine" introduced="6.0" purpose="optional">
+<unit bldFile="mw/netprotocols/applayerprotocols/telnetengine/group" mrp="mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
+</component>
+<component name="httpserviceapi" long-name="HTTP Service API" introduced="TB9.2" purpose="optional">
+<unit bldFile="mw/netprotocols/applayerprotocols/httpservice/group" mrp="mw/netprotocols/applayerprotocols/httpservice/group/http_service.mrp"/>
+</component>
+</collection>
+<collection name="applayerpluginsandutils" long-name="Application Layer Plugins and Utils" level="framework">
+<component name="uripermissionservices" long-name="URI Permission Services" introduced="^2" purpose="optional">
+<unit bldFile="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
+</component>
+<component name="bookmarksupport" long-name="Bookmark Support" introduced="9.1" purpose="optional">
+<unit bldFile="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
+</component>
+<component name="httpprotocolplugins" long-name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" plugin="Y">
+<unit bldFile="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
+</component>
+<component name="httptransportplugins" long-name="HTTP Transport Plugins" introduced="6.2" purpose="optional" plugin="Y">
+<unit bldFile="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
+</component>
+</collection>
+<collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
+<component name="netprotocols_metadata" long-name="High-level Internet Protocols Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="ipappprotocols" level="generic" long-name="IP App Protocols" levels="plugin conn server if">
+<collection name="ipappprotocols_plat" long-name="IP App Protocols Platform Interfaces" level="if">
+<component name="srtp_api" long-name="SRTP API" filter="s60" class="api">
+<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/srtp_api/group"/>
+</component>
+<component name="rtprtcp_api" long-name="RTP/RTCP API" filter="s60" class="api">
+<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/rtprtcp_api/group"/>
+</component>
+</collection>
+<collection name="rtp" long-name="RTP" level="server">
+<component name="srtpstack" filter="s60" long-name="SRTP Stack">
+<unit bldFile="mw/ipappprotocols/rtp/srtpstack/group"/>
+</component>
+<component name="rtpstack" filter="s60" long-name="RTP Stack">
+<unit bldFile="mw/ipappprotocols/rtp/rtpstack/group"/>
+</component>
+</collection>
+<collection name="realtimenetprots" long-name="Real Time Net Protocols" level="server">
+<component name="symrtp" long-name="RTP" introduced="9.0" purpose="optional">
+<!-- Real Time Data Protocol -->
+<unit bldFile="mw/ipappprotocols/realtimenetprots/rtp/group" mrp="mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
+</component>
+<component name="sipfw" long-name="SIP Framework" introduced="9.2" purpose="optional">
+<unit bldFile="mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp" version="2"/>
+</component>
+</collection>
+<collection name="sipplugins" long-name="SIP Plugins" level="plugin">
+<component name="sippwlanplugin" filter="s60" long-name="SIP WLAN Plugin" plugin="Y">
+<unit bldFile="mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
+</component>
+<component name="sippsipsettingsui" filter="s60" long-name="SIP Settings UI" plugin="Y" class="placeholder">
+<!--<unit bldFile="sipplugins/sippsipsettingsui/group"/> -->
+</component>
+<component name="sippdevmgmtsipadapter" filter="s60" long-name="Device Management SIP Settings Adapter" plugin="Y">
+<unit bldFile="mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
+</component>
+<component name="sippsystemstatemonitor" filter="s60" long-name="SIP System State Monitor" plugin="Y">
+<unit bldFile="mw/ipappprotocols/sipplugins/sippsystemstatemonitor/group"/>
+</component>
+<component name="sippsipadapter" filter="s60" long-name="SIP Adapter" introduced="^3" plugin="Y">
+<unit bldFile="mw/ipappprotocols/sipplugins/sippsipadapter/group"/>
+</component>
+</collection>
+<collection name="sipproviderplugins" long-name="SIP Provider Plugins" level="conn">
+<component name="sipprovider" long-name="SIP Provider" introduced="^2" purpose="optional" plugin="Y">
+<unit bldFile="mw/ipappprotocols/sipproviderplugins/sipprovider/group" mrp="mw/ipappprotocols/sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
+</component>
+</collection>
+<collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="if">
+<component name="ipappprotocols_metadata" long-name="IP App Protocols Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="wirelessacc" level="specific" long-name="Wireless Access" levels="framework generic ui">
+<collection name="hsfw_plat" long-name="HotSpot Framework Platform Interfaces" level="ui">
+<component name="hotspot_framework_client_api" long-name="HotSpot Framework Client API" filter="s60" class="api">
+<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
+</component>
+<component name="internet_connectivity_test_service_api" long-name="Internet Connectivity Test Service API" filter="s60" class="api">
+<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
+</component>
+<component name="internet_connectivity_test_service_settings_api" long-name="Internet Connectivity Test Service Settings API" filter="s60" class="api">
+<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
+</component>
+<component name="hotspot_framework_client_plugin_api" long-name="HotSpot Framework Client Plugin API" filter="s60" class="api">
+<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
+</component>
+</collection>
+<collection name="hotspotfw" long-name="HotSpot Framework" level="framework">
+<component name="hsserver" filter="s60" long-name="HotSpot Server" class="placeholder">
+<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
+</component>
+<component name="hsclient" filter="s60" long-name="HotSpot Client" class="placeholder">
+<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
+</component>
+<component name="internetconnectivitytestservice" filter="s60" long-name="Internet Connectivity Test Service" class="placeholder">
+<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+<!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
+</component>
+<component name="ictsdialogs" filter="s60" long-name="Internet Connectivity Test Service Dialogs" deprecated="^3" class="placeholder">
+<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+<!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
+</component>
+<component name="hspluginforagent" filter="s60" long-name="HotSpot Plugin for Agent" plugin="Y" class="placeholder">
+<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+<!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
+</component>
+<component name="hsbrowser" filter="s60" long-name="HotSpot Browser" class="placeholder">
+<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+<!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
+</component>
+<component name="hotspotfw_build" filter="s60" long-name="Hotspot Framework Build">
+<!-- should break up this bld.inf into the above components, or collapse them all into a single component -->
+<unit bldFile="mw/wirelessacc/hotspotfw/group"/>
+</component>
+</collection>
+<collection name="wlanutilities" long-name="WLAN Utilities" level="generic">
+<component name="wlanutilities_build" long-name="WLAN Utilities Qt" introduced="^4" filter="s60">
+<!-- is this uinit needed, or is it sufficient to uncomment the units in the below components? -->
+<unit bldFile="mw/wirelessacc/wlanutilities" proFile="wlanutilities.pro" qmakeArgs="-r"/>
+</component>
+<component name="wlanqtutilities" filter="s60" long-name="WLAN Qt Utilities" introduced="^4" class="placeholder">
+<!--<unit bldFile="wlanutilities/wlanplugin" qt:proFile="wlanqtutilities.pro"/>-->
+</component>
+<component name="wlanwizard " filter="s60" long-name="WLAN Wizard" introduced="^4" class="placeholder">
+<!--<unit bldFile="wlanutilities/wlanwizard" qt:proFile="wlanwizard.pro"/>-->
+</component>
+<component name="wlansniffer" filter="s60" long-name="WLAN Sniffer" class="placeholder">
+<!--<unit bldFile="wlanutilities/wlansettingsui" qt:proFile="wlansniffer.pro"/>-->
+</component>
+<component name="wlanentryplugin" filter="s60" long-name="WLAN Entry Plugin" plugin="Y" class="placeholder">
+<!--<unit bldFile="wlanutilities/wlansniffer" qt:proFile="wlanentryplugin.pro"/>-->
+</component>
+<component name="wlanindicatorplugin" filter="s60" long-name="WLAN Indicator Plugin" plugin="Y" class="placeholder">
+<!--<unit bldFile="wlanutilities/wlanindicatorplugin" qt:proFile="wlanindicatorplugin.pro"/>-->
+</component>
+<component name="cpwlansettingsplugin" filter="s60" long-name="WLAN Settings Control Panel Plugin" introduced="^4" plugin="Y" class="placeholder">
+<!--<unit bldFile="wlanutilities/cpwlansettingsplugin" qt:proFile="cpwlansettingsplugin.pro"/>-->
+</component>
+</collection>
+</block>
+<block name="vpnclient" level="specific" long-name="VPN Client" levels="engine ui api">
+<collection name="vpnc_plat" long-name="VPN Client Platform Interfaces" level="api">
+<component name="vpnapi" filter="s60" long-name="VPN API" class="api">
+<unit bldFile="mw/vpnclient/vpnc_plat/vpnapi/group"/>
+</component>
+</collection>
+<collection name="vpnapiimpl" long-name="VPN API Implementation" level="engine">
+<component name="vpnapi_impl" filter="s60" long-name="VPN Implementation">
+<unit bldFile="mw/vpnclient/vpnapiimpl/group"/>
+</component>
+</collection>
+</block>
+<block name="ipappsrv" level="specific" long-name="IP App Services" levels="framework generic server conn plugin">
+<collection name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" level="plugin">
+<component name="transcoder_api" long-name="Transcoder API" filter="s60" class="api">
+<unit bldFile="mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
+</component>
+<component name="comms_event_api" long-name="Comms Event API" filter="s60" class="api">
+<unit bldFile="mw/ipappsrv/ipappsrv_plat/comms_event_api/group"/>
+</component>
+<component name="floor_control_api" long-name="Floor Control API" filter="s60" class="api">
+<unit bldFile="mw/ipappsrv/ipappsrv_plat/floor_control_api/group"/>
+</component>
+<component name="media_control_api" long-name="Media Control API" filter="s60" class="api">
+<unit bldFile="mw/ipappsrv/ipappsrv_plat/media_control_api/group"/>
+</component>
+<component name="multimedia_comms_api" long-name="Multimedia Comms API" filter="s60" class="api">
+<unit bldFile="mw/ipappsrv/ipappsrv_plat/multimedia_comms_api/group"/>
+</component>
+<component name="nat_settings_api" long-name="NAT Settings API" filter="s60" class="api">
+<unit bldFile="mw/ipappsrv/ipappsrv_plat/nat_settings_api/group"/>
+</component>
+</collection>
+<collection name="natfw" long-name="NAT Framework" level="framework">
+<!-- collection is really a component. Need to move down a directory -->
+<component name="natfw_build" filter="s60" long-name="NAT Framework Build" introduced="^2">
+<unit bldFile="mw/ipappsrv/natfw/group"/>
+</component>
+</collection>
+<collection name="multimediacommscontroller" long-name="Multimedia Comms Controller" level="conn">
+<!-- collection is really a component. Need to move down a directory -->
+<component name="multimediacommscontroller_build" filter="s60" long-name="Multimedia Comms Controller Build">
+<unit bldFile="mw/ipappsrv/multimediacommscontroller/group"/>
+</component>
+</collection>
+<collection name="multimediacommsengine" long-name="Multimedia Comms Engine" level="generic">
+<!-- collection is really a component. Need to move down a directory -->
+<component name="multimediacommsengine_build" filter="s60" long-name="Multimedia Comms Engine Build">
+<unit bldFile="mw/ipappsrv/multimediacommsengine/group"/>
+</component>
+</collection>
+<collection name="natplugins" long-name="NAT Plugins" level="plugin">
+<component name="natpcliprovisioningnatfwadapter" filter="s60" long-name="Client Provisioning NAT Framework Traversal Adapter" introduced="^2" plugin="Y">
+<unit bldFile="mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/group"/>
+</component>
+<component name="natpdevmgmtnatfwadapter" filter="s60" long-name="Device Management NAT Framework Traversal Adapter" plugin="Y">
+<unit bldFile="mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/group"/>
+</component>
+<component name="natptraversalcontroller" filter="s60" long-name="NAT Traversal Controller" plugin="Y">
+<unit bldFile="mw/ipappsrv/natplugins/natptraversalcontroller/group"/>
+</component>
+<component name="natpnatfwsdpprovider" filter="s60" long-name="NAT Framework SDP Provider" plugin="Y">
+<unit bldFile="mw/ipappsrv/natplugins/natpnatfwsdpprovider/group"/>
+</component>
+</collection>
+<collection name="ipappsrv_info" long-name="IP App Services Info" level="plugin">
+<component name="ipappsrv_build" long-name="IP App Services Build" filter="s60">
+<!-- remove the #includes from here and rename as xxx ROM or move iby/sis files into another component-->
+<unit mrp="mw/ipappsrv/group"/>
+</component>
+</collection>
+</block>
+<block name="phonesrv" level="specific" long-name="Telephony and SIM Services" levels="utils framework server ui specific">
+<collection name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" level="specific">
+<component name="string_parser_api" long-name="String Parser API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/string_parser_api/group"/>
+</component>
+<component name="cbs_mcn_client_api" long-name="CBS MCN Client API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/cbs_mcn_client_api/group"/>
+</component>
+<component name="converged_call_engine_api" long-name="Converged Call Engine API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_engine_api/group"/>
+</component>
+<component name="aiw_dial_data_consumer_api" long-name="AIW Dial Data Consumer API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/aiw_dial_data_consumer_api/group"/>
+</component>
+<component name="phone_client_ussd_api" long-name="Phone Client USSD API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_api/group"/>
+</component>
+<component name="sat_refresh_api" long-name="SAT Refresh API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/sat_refresh_api/group" filter="!test"/>
+</component>
+<component name="network_handling_engine_api" long-name="Network Handling Engine API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/network_handling_engine_api/group"/>
+</component>
+<component name="phone_client_emergency_call_api" long-name="Phone Client Emergency Call API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/group"/>
+</component>
+<component name="sat_configuration_api" long-name="SAT Configuration API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/sat_configuration_api/group"/>
+</component>
+<component name="dial_utils_api" long-name="Dial Utils API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/dial_utils_api/group"/>
+</component>
+<component name="phone_client_image_handler_api" long-name="Phone Client Image Handler API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_image_handler_api/group"/>
+</component>
+<component name="phone_client_messenger_api" long-name="Phone Client Messenger API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_messenger_api/group"/>
+</component>
+<component name="sat_client_api" long-name="SAT Client API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/sat_client_api/group" filter="!test"/>
+</component>
+<component name="phone_client_api" long-name="Phone Client API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_api/group"/>
+</component>
+<component name="sat_service_api" long-name="SAT Service API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/sat_service_api/group" filter="!test"/>
+</component>
+<component name="cbs_message_api" long-name="CBS Message API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/cbs_message_api/group"/>
+</component>
+<component name="phone_client_server_information_api" long-name="Phone Client Server Information API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_server_information_api/group"/>
+</component>
+<component name="phone_client_ussd_internal_api" long-name="Phone Client USSD Internal API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_internal_api/group"/>
+</component>
+<component name="phone_client_command_handler_api" long-name="Phone Client Command Handler API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_command_handler_api/group"/>
+</component>
+<component name="phone_client_notify_api" long-name="Phone Client Notify API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_notify_api/group"/>
+</component>
+<component name="phone_client_utility_api" long-name="Phone Client Utility API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_utility_api/group"/>
+</component>
+<component name="telephony_network_information_api" long-name="Telephony Network Information API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_network_information_api/group"/>
+</component>
+<component name="secondary_display_sat_api" long-name="Secondary Display SAT API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/secondary_display_sat_api/group"/>
+</component>
+<component name="callui_reconnect_query_api" long-name="CallUI Reconnect Query API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/callui_reconnect_query_api/group"/>
+</component>
+<component name="service_provider_settings_api" long-name="Service Provider Settings API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/service_provider_settings_api/group"/>
+</component>
+<component name="converged_call_provider_api" long-name="Converged Call Provider API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_provider_api/group"/>
+</component>
+<component name="incoming_call_monitor_api" long-name="Incoming Call Monitor API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/incoming_call_monitor_api/group"/>
+</component>
+<component name="default_emergency_numbers_api" long-name="Default Emergency Numbers API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/default_emergency_numbers_api/group"/>
+</component>
+<component name="cenrep_database_api" long-name="Central Repository Database API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/cenrep_database_api/group"/>
+</component>
+<component name="ss_settings_api" long-name="SS Settings API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/ss_settings_api/group"/>
+</component>
+<component name="phone_settings_observer_api" long-name="Phone Settings Observer API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_observer_api/group"/>
+</component>
+<component name="phone_settings_notes_ui_api" long-name="Phone Settings Notes UI API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_notes_ui_api/group"/>
+</component>
+<component name="phone_settings_api" long-name="Phone Settings API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_api/group"/>
+</component>
+<component name="voice_mailbox_number_api" long-name="Voice Mailbox Number API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_number_api/group"/>
+</component>
+<component name="voice_mailbox_settings_api" long-name="Voice Mailbox Settings API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_settings_api/group"/>
+</component>
+<component name="call_information_api" long-name="Call Information API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/call_information_api/group" filter="!test"/>
+</component>
+<component name="call_remote_party_information_api" long-name="Call Remote Party Information API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/call_remote_party_information_api/group" filter="!test"/>
+</component>
+<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_mediator_api/group" filter="!test"/>
+</component>
+<component name="dialpad_api" long-name="Dialpad API" filter="s60" introduced="^4" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/dialpad_api/group"/>
+</component>
+</collection>
+<collection name="telutils" long-name="Telephony Utils" level="utils">
+<component name="phoneparser" filter="s60" long-name="Phone Parser">
+<unit bldFile="mw/phonesrv/telutils/phoneparser/group"/>
+</component>
+<component name="telephonyservice" filter="s60" long-name="Telephony Service">
+<unit bldFile="mw/phonesrv/telutils/telephonyservice/group"/>
+</component>
+<component name="xqtelephonyservice" filter="s60" long-name="X Qt Telephony Service" introduced="^4">
+<unit bldFile="mw/phonesrv/telutils/xqtelephonyservice" proFile="xqtelephonyservice.pro"/>
+</component>
+<component name="dialpad" filter="s60" long-name="Dial Pad" introduced="^4">
+<unit bldFile="mw/phonesrv/telutils/dialpad" proFile="dialpad.pro"/>
+</component>
+<component name="keysequencerecognitionservice" filter="s60" long-name="Key Sequence Recognition Service" introduced="^4">
+<unit bldFile="mw/phonesrv/telutils/keysequencerecognitionservice" proFile="keysequencerecognitionservice.pro"/>
+</component>
+</collection>
+<collection name="cbs" long-name="Cellular Baseband Services" level="utils">
+<component name="cbsserver" filter="s60" long-name="CBS Server">
+<unit bldFile="mw/phonesrv/cbs/cbsserver/group"/>
+</component>
+</collection>
+<collection name="cellular" long-name="Cellular" level="server">
+<component name="telephonysettings" filter="s60" long-name="Telephony Settings" purpose="development">
+<unit bldFile="mw/phonesrv/cellular/telephonysettings/group" filter="!test"/>
+</component>
+<component name="psetwrapper" filter="s60" long-name="Provider Settings Wrapper" introduced="^4">
+<!-- need to move to own component, not under sssettings -->
+<unit bldFile="mw/phonesrv/cellular/telephonysettings/xqbindings/psetwrapper" proFile="psetwrapper.pro"/>
+</component>
+<component name="sssettings" filter="s60" long-name="Supplementary Service Settings" purpose="development">
+<unit bldFile="mw/phonesrv/cellular/sssettings/group" filter="!test"/>
+</component>
+<component name="sssettingswrapper" filter="s60" long-name="Supplementary Service Settings Wrapper" introduced="^4">
+<!-- need to move to own component, not under sssettings -->
+<unit bldFile="mw/phonesrv/cellular/sssettings/xqbindings/sssettingswrapper" proFile="sssettingswrapper.pro"/>
+</component>
+<component name="psetnotesui" filter="s60" long-name="Phone Settings Notes UI" purpose="development">
+<unit bldFile="mw/phonesrv/cellular/psetnotesui/group" filter="!test"/>
+</component>
+<component name="servicerequest" filter="s60" long-name="Service Request">
+<unit bldFile="mw/phonesrv/cellular/servicerequest/group"/>
+</component>
+</collection>
+<collection name="convergedcallengine" long-name="Converged Call Engine" level="framework">
+<component name="callprovider" filter="s60" long-name="Call Provider">
+<unit bldFile="mw/phonesrv/convergedcallengine/callprovider/group"/>
+</component>
+<component name="cce" filter="s60" long-name="CCE">
+<unit bldFile="mw/phonesrv/convergedcallengine/cce/group" filter="!test"/>
+</component>
+<component name="spsettings" filter="s60" long-name="Service Provider Settings">
+<unit bldFile="mw/phonesrv/convergedcallengine/spsettings/group" filter="!test"/>
+</component>
+<component name="cenrepdatabase" filter="s60" long-name="CCE Cenrep Database">
+<unit bldFile="mw/phonesrv/convergedcallengine/cenrepdatabase/group"/>
+</component>
+<component name="serviceselector" filter="s60" long-name="Service Selector">
+<unit bldFile="mw/phonesrv/convergedcallengine/serviceselector/group"/>
+</component>
+</collection>
+<collection name="networkhandling" long-name="Network Handling" level="framework">
+<component name="networkhandlingengine" filter="s60" long-name="Network Handling Engine">
+<unit bldFile="mw/phonesrv/networkhandling/networkhandlingengine/group"/>
+</component>
+</collection>
+<collection name="phoneclientserver" long-name="Phone Client/Server" level="server">
+<component name="enpolicy" filter="s60" long-name="Emergency Number Policy">
+<unit bldFile="mw/phonesrv/phoneclientserver/enpolicy/group"/>
+</component>
+<component name="aiwdialdata" filter="s60" long-name="AIW Dial Data">
+<unit bldFile="mw/phonesrv/phoneclientserver/aiwdialdata/group" filter="!test"/>
+</component>
+<component name="dialutils" filter="s60" long-name="Dial Utils">
+<unit bldFile="mw/phonesrv/phoneclientserver/dialutils/group" filter="!test"/>
+</component>
+<component name="phoneclient" filter="s60" long-name="Phone Client">
+<unit bldFile="mw/phonesrv/phoneclientserver/phoneclient/group" filter="!test"/>
+</component>
+<component name="phoneserver" filter="s60" long-name="Phone Server">
+<unit bldFile="mw/phonesrv/phoneclientserver/phoneserver/group"/>
+</component>
+</collection>
+<collection name="phonecmdhandler" long-name="Phone Command Handler" level="generic">
+<component name="phonecmdhnlr" filter="s60" long-name="Phone Command Handler">
+<unit bldFile="mw/phonesrv/phonecmdhandler/phonecmdhnlr/group"/>
+</component>
+</collection>
+<collection name="satengine" long-name="SAT Engine" level="server">
+<component name="satserver" filter="s60" long-name="SAT Server">
+<unit bldFile="mw/phonesrv/satengine/satserver/group"/>
+</component>
+</collection>
+<collection name="satui" long-name="SAT UI" level="ui">
+<component name="satshellcontroller" filter="s60" long-name="SAT Shell Controller">
+<unit bldFile="mw/phonesrv/satui/satshellcontroller/group"/>
+</component>
+<component name="satapp" filter="s60" long-name="SAT Application" introduced="^4">
+<unit bldFile="mw/phonesrv/satui/satapp" proFile="satapp.pro"/>
+</component>
+</collection>
+<collection name="vmbx" long-name="Voice Mailbox" level="ui">
+<component name="vmbxcpplugin" filter="s60" long-name="Voice Mailbox CP Plugin" introduced="^4" plugin="Y">
+<unit bldFile="mw/phonesrv/vmbx/vmbxcpplugin" proFile="vmbxcpplugin.pro"/>
+</component>
+<component name="vmbxengine" filter="s60" long-name="Voice Mailbox Engine" introduced="^4">
+<unit bldFile="mw/phonesrv/vmbx/vmbxengine" proFile="vmbxengine.pro"/>
+</component>
+</collection>
+</block>
+<block name="messagingmw" level="specific" long-name="Messaging Middleware" levels="stack support fw api">
+<collection name="msgfw_plat" long-name="Messaging Middleware Platform Interfaces" level="api">
+<component name="always_online_plugin_api" long-name="Always Online Plugin API" filter="s60" class="api">
+<unit bldFile="mw/messagingmw/msgfw_plat/always_online_plugin_api/group"/>
+</component>
+<component name="always_online_client_api" long-name="Always Online Client API" filter="s60" class="api">
+<unit bldFile="mw/messagingmw/msgfw_plat/always_online_client_api/group"/>
+</component>
+<component name="msg_common_utils_api" long-name="Messaging Common Utils API" filter="s60" class="api">
+<unit bldFile="mw/messagingmw/msgfw_plat/msg_common_utils_api/group"/>
+</component>
+<component name="muiu_utils_api" long-name="Messaging Center UI Utilities API" filter="s60" introduced="^4" class="api">
+<unit bldFile="mw/messagingmw/msgfw_plat/muiu_utils_api/group"/>
+</component>
+</collection>
+<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" class="config">
+<unit bldFile="mw/messagingmw/msgbranched/group"/>
+</component>
+</collection>
+<collection name="messagingfw" long-name="Messaging Framework" level="fw">
+<!-- should break this collection up into smaller related collections -->
+<component name="send_ui_api" long-name="Send UI API" filter="s60" deprecated="^4" class="api">
+<unit bldFile="mw/messagingmw/messagingfw/deprecate/send_ui_api/group"/>
+</component>
+<component name="send_ui_plugin_api" long-name="Send UI Plug-in API" filter="s60" deprecated="^4" class="api">
+<unit bldFile="mw/messagingmw/messagingfw/deprecate/send_ui_plugin_api/group"/>
+</component>
+<component name="send_ui_datautils_api" long-name="Send UI Data Utils API" filter="s60" deprecated="^4" class="api">
+<unit bldFile="mw/messagingmw/messagingfw/deprecate/send_ui_datautils_api/group"/>
+</component>
+<component name="alwaysonline" filter="s60" long-name="Always Online Server" introduced="^2">
+<unit bldFile="mw/messagingmw/messagingfw/alwaysonline/group"/>
+</component>
+<component name="msgcommonutils" filter="s60" long-name="Messaging Common Utils" introduced="^2">
+<unit bldFile="mw/messagingmw/messagingfw/msgcommonutils/group"/>
+</component>
+<component name="senduiservices" filter="s60" long-name="Send UI Services" introduced="^2" deprecated="^4">
+<unit bldFile="mw/messagingmw/messagingfw/deprecate/senduiservices/group"/>
+</component>
+<component name="muiuutils" long-name="Messaging Center UI Utilities" filter="s60" introduced="^4" class="api">
+<unit bldFile="mw/messagingmw/messagingfw/muiuutils/group"/>
+</component>
+<component name="scheduledsendmtm" long-name="Scheduled Send MTM" introduced="6.0" purpose="optional" plugin="Y">
+<unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/group" mrp="mw/messagingmw/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
+</component>
+<component name="msgsrvnstore" long-name="Message Server and Store" purpose="optional">
+<unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/group" mrp="mw/messagingmw/messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
+</component>
+<component name="biomsgfw" long-name="BIO Messaging Framework" introduced="6.0" purpose="optional">
+<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/group" mrp="mw/messagingmw/messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
+</component>
+<component name="msgconf" long-name="Messaging Config" introduced="^2" purpose="optional" class="config">
+<unit bldFile="mw/messagingmw/messagingfw/msgconf/group" mrp="mw/messagingmw/messagingfw/msgconf/group/messaging_config.mrp"/>
+</component>
+<component name="watcherfw" long-name="Watcher Framework" purpose="optional">
+<unit bldFile="mw/messagingmw/messagingfw/watcherfw/group" mrp="mw/messagingmw/messagingfw/watcherfw/group/messaging_watcher.mrp"/>
+</component>
+<component name="msgtest" long-name="Messaging Test" purpose="development">
+<unit bldFile="mw/messagingmw/messagingfw/msgtest/group" mrp="mw/messagingmw/messagingfw/msgtest/group/messaging_test.mrp"/>
+</component>
+<component name="sendas" long-name="Send As" purpose="optional">
+<unit bldFile="mw/messagingmw/messagingfw/sendas/group" mrp="mw/messagingmw/messagingfw/sendas/group/messaging_sendas2.mrp"/>
+</component>
+<component name="msgurlhandler" long-name="Message URL Handler" introduced="7.0" purpose="optional">
+<unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/group" mrp="mw/messagingmw/messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
+</component>
+<component name="wappushfw" long-name="WAP Push Framework" introduced="6.1" purpose="optional">
+<unit bldFile="mw/messagingmw/messagingfw/wappushfw/group" mrp="mw/messagingmw/messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
+</component>
+<component name="suplsmshandler" long-name="SUPL SMS Handler" introduced="^2" purpose="development" plugin="Y">
+<unit bldFile="mw/messagingmw/messagingfw/suplsmshandler/group" mrp="mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/>
+</component>
+<component name="suplwappushhandler" long-name="SUPL WAP Push Handler" introduced="^2" purpose="optional" plugin="Y">
+<unit bldFile="mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
+</component>
+</collection>
+<collection name="messagingmw_info" long-name="Messaging Middleware Info" level="api">
+<component name="messagingmw_metadata" long-name="Messaging Middleware Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="imsrv" level="specific" long-name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
+<collection name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" level="specific">
+<component name="ximp_core_data_model_api" long-name="XIMP Core Data Model API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_data_model_api/group"/>
+</component>
+<component name="ximp_presence_protocol_plugin_host_api" long-name="XIMP Presence Protocol Plug-in Host API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_host_api/group"/>
+</component>
+<component name="ximp_presence_data_model_api" long-name="XIMP Presence Data Model API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_data_model_api/group"/>
+</component>
+<component name="ximp_presence_protocol_plugin_api" long-name="XIMP Presence Protocol Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_api/group"/>
+</component>
+<component name="ximp_presence_management_api" long-name="XIMP Presence Management API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_management_api/group"/>
+</component>
+<component name="ximp_core_protocol_plugin_host_api" long-name="XIMP Core Protocol Plug-in Host API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_host_api/group"/>
+</component>
+<component name="ximp_core_management_api" long-name="XIMP Core Management API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_management_api/group"/>
+</component>
+<component name="ximp_presence_base_api" long-name="XIMP Presence Base API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_base_api/group"/>
+</component>
+<component name="ximp_core_protocol_plugin_api" long-name="XIMP Core Protocol Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_api/group"/>
+</component>
+<component name="ximp_core_base_api" long-name="XIMP Core Base API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_base_api/group"/>
+</component>
+<component name="ximp_presence_cache_api" long-name="XIMP Presence Cache API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_cache_api/group"/>
+</component>
+<component name="ximp_core_feature_plugin_api" long-name="XIMP Core Feature Plugin API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/group"/>
+</component>
+<component name="ximp_im_protocol_plugin_host_api" long-name="XIMP IM Protocol Plugin Host API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_host_api/group"/>
+</component>
+<component name="ximp_im_data_model_api" long-name="XIMP IM Data Model API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_data_model_api/group"/>
+</component>
+<component name="ximp_im_protocol_plugin_api" long-name="XIMP IM Protocol Plugin API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_api/group"/>
+</component>
+<component name="ximp_im_management_api" long-name="XIMP IM Management API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_management_api/group"/>
+</component>
+<component name="ximp_im_base_api" long-name="XIMP IM Base API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_base_api/group"/>
+</component>
+<component name="ximp_search_protocol_plugin_host_api" long-name="XIMP Search Protocol Plugin Host API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_host_api/group"/>
+</component>
+<component name="ximp_search_data_model_api" long-name="XIMP Search Data Model API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_data_model_api/group"/>
+</component>
+<component name="ximp_search_protocol_plugin_api" long-name="XIMP search Protocol Plugin API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_api/group"/>
+</component>
+<component name="ximp_search_management_api" long-name="XIMP Search Management API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_management_api/group"/>
+</component>
+<component name="ximp_search_base_api" long-name="XIMP Search Base API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_base_api/group"/>
+</component>
+<component name="xmpp_settings_api" long-name="XMPP Settings API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/group"/>
+</component>
+<component name="im_cache_client_api" long-name="IM Cache Client API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/im_cache_client_api/group"/>
+</component>
+<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 Availability Text" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
+</component>
+</collection>
+<collection name="ximpfw" long-name="XIMP Framework" level="framework">
+<!-- collection is really a component. Needs to be moved down a directory -->
+<component name="ximpfw_build" filter="s60" long-name="XIMP Framework Build">
+<unit bldFile="mw/imsrv/ximpfw/group"/>
+</component>
+</collection>
+<collection name="imservices" long-name="IM Services" level="generic">
+<component name="imfeatureplugin" filter="s60" long-name="IM Feature Plugin" introduced="^2" plugin="Y">
+<unit bldFile="mw/imsrv/imservices/imfeatureplugin/group"/>
+</component>
+<component name="searchfeatureplugin" filter="s60" long-name="Search Feature Plugin" introduced="^2" plugin="Y">
+<unit bldFile="mw/imsrv/imservices/searchfeatureplugin/group"/>
+</component>
+<component name="xmppsettingsapi" filter="s60" long-name="XMPP Settings API" introduced="^2">
+<unit bldFile="mw/imsrv/imservices/xmppsettingsapi/group"/>
+</component>
+<component name="xmppsettingsfetcher" filter="s60" long-name="XMPP Settings Fetcher" introduced="^2">
+<unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/group"/>
+</component>
+<component name="instantmessagingcache" filter="s60" long-name="Instant Messaging Cache" introduced="^2">
+<unit bldFile="mw/imsrv/imservices/instantmessagingcache/group"/>
+</component>
+</collection>
+<collection name="brandingserver" long-name="Branding Server" level="specific">
+<!-- collection is really a component. Needs to be moved down a directory -->
+<component name="brandingserver_build" filter="s60" long-name="Branding Server Build">
+<unit bldFile="mw/imsrv/brandingserver/group"/>
+</component>
+</collection>
+</block>
+<block name="legacypresence" level="specific" long-name="Legacy Presence Services" levels="engine fw ui">
+<collection name="pressrv_plat" long-name="Legacy Presence Services Platform Interfaces" level="ui">
+<component name="presence_list_api" long-name="Presence List API" filter="s60" class="api">
+<unit bldFile="mw/legacypresence/pressrv_plat/presence_list_api/group"/>
+</component>
+<component name="watcher_info_api" long-name="Watcher Info API" filter="s60" class="api">
+<unit bldFile="mw/legacypresence/pressrv_plat/watcher_info_api/group"/>
+</component>
+<component name="simple_documents_api" long-name="SIMPLE Documents API" filter="s60" class="api">
+<unit bldFile="mw/legacypresence/pressrv_plat/simple_documents_api/group"/>
+</component>
+<component name="authorization_api" long-name="Authorization API" filter="s60" class="api">
+<unit bldFile="mw/legacypresence/pressrv_plat/authorization_api/group"/>
+</component>
+<component name="xdm_protocol_plugin_api" long-name="XDM Protocol Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/legacypresence/pressrv_plat/xdm_protocol_plugin_api/group"/>
+</component>
+<component name="watcher_api" long-name="Watcher API" filter="s60" class="api">
+<unit bldFile="mw/legacypresence/pressrv_plat/watcher_api/group"/>
+</component>
+<component name="xdm_api" long-name="XDM API" filter="s60" class="api">
+<unit bldFile="mw/legacypresence/pressrv_plat/xdm_api/group"/>
+</component>
+<component name="registration_api" long-name="Registration API" filter="s60" class="api">
+<unit bldFile="mw/legacypresence/pressrv_plat/registration_api/group"/>
+</component>
+<component name="publisher_api" long-name="Publisher API" filter="s60" class="api">
+<unit bldFile="mw/legacypresence/pressrv_plat/publisher_api/group"/>
+</component>
+<component name="messaging_connection_manager_api" long-name="Messaging Connection Manager API" filter="s60" class="api">
+<unit bldFile="mw/legacypresence/pressrv_plat/messaging_connection_manager_api/group"/>
+</component>
+<component name="xdm_settings_api" long-name="XDM Settings API" filter="s60" class="api">
+<unit bldFile="mw/legacypresence/pressrv_plat/xdm_settings_api/group"/>
+</component>
+<component name="simple_settings_api" long-name="SIMPLE Settings API" filter="s60" class="api">
+<unit bldFile="mw/legacypresence/pressrv_plat/simple_settings_api/group"/>
+</component>
+<component name="simple_instant_msg_api" long-name="Simple Instant Msg API" filter="s60" class="api">
+<unit bldFile="mw/legacypresence/pressrv_plat/simple_instant_msg_api/group"/>
+</component>
+</collection>
+<collection name="xdmengine" long-name="XDM Engine" level="engine">
+<!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
+<component name="xdmengine_build" filter="s60" long-name="XDM Engine Build">
+<unit bldFile="mw/legacypresence/xdmengine/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">
+<unit bldFile="mw/legacypresence/xdmprotocols/group"/>
+</component>
+</collection>
+<collection name="msgconnmanager" long-name="Messaging Connection Manager" level="fw">
+<!-- collection is really a component. Need to move down a directory-->
+<component name="msgconnmanager_build" filter="s60" long-name="Messaging Connection Manager Build">
+<unit bldFile="mw/legacypresence/msgconnmanager/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">
+<unit bldFile="mw/legacypresence/simpleengine/group"/>
+</component>
+</collection>
+<collection name="presencefwsimpleadpt" long-name="Presence Framework SIMPLE Adaptation" level="fw">
+<!-- collection is really a component. Need to move down a directory-->
+<component name="simpleplugin" filter="s60" long-name="SIMPLE Plugin" plugin="Y">
+<unit bldFile="mw/legacypresence/presencefwsimpleadpt/group"/>
+</component>
+</collection>
+<collection name="simpledatamodeladapter" long-name="SIMPLE Data Model Adapter" level="fw">
+<component name="presenceplugin" filter="s60" long-name="Presence Plugin" introduced="^2" plugin="Y">
+<unit bldFile="mw/legacypresence/simpledatamodeladapter/group"/>
+</component>
+</collection>
+</block>
+<block name="searchsrv" level="specific" long-name="Search Services" levels="services engine generic api">
+<collection name="searchsrv_plat" long-name="Search Services Platform Interfaces" level="api">
+<component name="cpix_utility_api" long-name="CPIX Utility API" filter="s60" introduced="^4" class="api">
+<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_utility_api/group"/>
+</component>
+<component name="cpix_framework_api" long-name="CPIX Framework API" filter="s60" introduced="^4" class="api">
+<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_framework_api/group"/>
+</component>
+<component name="cpix_search_api" long-name="CPIX Search API" filter="s60" introduced="^4" class="api">
+<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_search_api/group"/>
+</component>
+</collection>
+<collection name="searchengine" long-name="Search Engine" level="engine">
+<component name="searchengine_util" long-name="Search Engine Utils" filter="s60" introduced="^4">
+<unit bldFile="mw/searchsrv/searchengine/util/group"/>
+</component>
+<component name="searchengine_oss" long-name="Search Engine OSS" filter="s60" introduced="^4">
+<unit bldFile="mw/searchsrv/searchengine/oss/group"/>
+</component>
+<component name="cpix" long-name="Cross Platform Indexing Engine" filter="s60" introduced="^4">
+<unit bldFile="mw/searchsrv/searchengine/cpix/group"/>
+</component>
+</collection>
+<collection name="searcher" long-name="Searcher" level="generic">
+<component name="searchclient" long-name="Search Client" filter="s60" introduced="^4">
+<unit bldFile="mw/searchsrv/searcher/SearchClient/group"/>
+</component>
+<component name="searchserver" long-name="Search Server" filter="s60" introduced="^4">
+<unit bldFile="mw/searchsrv/searcher/SearchServer/group"/>
+</component>
+</collection>
+<collection name="searchsrv_harvester" long-name="Search Services Harvester" level="services">
+<component name="searchsrv_pluginfw" long-name="Search Server" filter="s60" introduced="^4">
+<unit bldFile="mw/searchsrv/harvester/pluginfw/group"/>
+</component>
+<component name="searchsrv_harvesterserver" long-name="Search Harvester Server" filter="s60" introduced="^4">
+<unit bldFile="mw/searchsrv/harvester/HarvesterServer/group"/>
+</component>
+</collection>
+<collection name="searchsrv_watchdog" long-name="Search Services Watch Dog" level="services">
+<component name="searchsrv_watchdog_build" long-name="Search Services Watch Dog Build" filter="s60" introduced="^4">
+<unit bldFile="mw/searchsrv/WatchDog/group"/>
+</component>
+</collection>
+<collection name="qcpix" long-name="Qt CPIX" level="engine">
+<component name="qcpixsearchclient" long-name="Qt CPIX Search Client" introduced="^4">
+<!-- Snag! qcpix.pro and qcpixsearchclient.pro in same directory! -->
+<unit bldFile="mw/searchsrv/qcpix" proFile="qcpixsearchclient.pro"/>
+</component>
+</collection>
+<collection name="searchsrv_info" long-name="Search Services Info">
+<component name="searchsrv_build" long-name="Search Services Build" introduced="^4">
+<!-- move exports to own component and remove this -->
+<unit bldFile="mw/searchsrv/group"/>
+</component>
+</collection>
+</block>
+<block name="remotemgmt" level="specific" long-name="Remote Management" levels="plugin framework server generic specific">
+<collection name="remotemgmt_pub" long-name="Remote Management Public Interfaces" level="specific">
+<component name="synchronization_capability_api" long-name="Synchronization Capability API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
+</component>
+</collection>
+<collection name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" level="specific">
+<component name="common_agent_util_and_definitions_api" long-name="Common Agent util and definitions API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
+</component>
+<component name="policy_management_certificate_api" long-name="Policy Management Certificate API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/group"/>
+</component>
+<component name="oma_provisioning_adapter_api" long-name="OMA Provisioning Adapter API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_adapter_api/group"/>
+</component>
+<component name="device_management_parameter_api" long-name="Device Management Parameter API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_parameter_api/group"/>
+</component>
+<component name="data_synchronization_plugin_api" long-name="Data Synchronization Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/group"/>
+</component>
+<component name="sync_alert_handler_api" long-name="Sync Alert Handler API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
+</component>
+<component name="syncml_notifier_api" long-name="SyncML Notifier API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
+</component>
+<component name="syncml_client_api" long-name="SyncML Client API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
+</component>
+<component name="device_management_plugin_api" long-name="Device Management plug-in API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_plugin_api/group"/>
+</component>
+<component name="dm_tree_apis" long-name="DM Tree APIs" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
+</component>
+<component name="terminal_security_device_lock_api" long-name="Terminal Security Device Lock API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/group"/>
+</component>
+<component name="policy_management_request_api" long-name="Policy Management Request API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/group"/>
+</component>
+<component name="ds_constant_definitions_api" long-name="DS Constant Definitions API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_constant_definitions_api/group"/>
+</component>
+<component name="scp_server_api" long-name="SCP Server API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/group"/>
+</component>
+<component name="data_synchronization_notification_api" long-name="Data Synchronization Notification API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_notification_api/group"/>
+</component>
+<component name="oma_provisioning_engine_api" long-name="OMA Provisioning Engine API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/group"/>
+</component>
+<component name="dm_utils_api" long-name="DM Utils API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/group"/>
+</component>
+<component name="syncml_alert_api" long-name="SyncML Alert API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/group"/>
+</component>
+<component name="obex_client_session_api" long-name="OBEX Client session API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/obex_client_session_api/group"/>
+</component>
+<component name="setting_enforcement_info_api" long-name="Setting Enforcement Info API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/group"/>
+</component>
+<component name="dm_constant_definitions_api" long-name="DM Constant Definitions API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
+</component>
+<component name="oma_ds_extensions_api" long-name="OMA DS Extensions API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
+</component>
+<component name="pnpms_utils_api" long-name="PNPMS Utils API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
+</component>
+<component name="adaptive_history_list_api" long-name="Adaptive History List API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
+</component>
+<component name="adaptive_history_list_session_api" long-name="Adaptive History List Session API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
+</component>
+<component name="fota_engine_api" long-name="FOTA Engine API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
+</component>
+<component name="update_package_storage_plugin_api" long-name="Update Package Storage Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
+</component>
+<component name="syncml_notifier_roaming_api" long-name="SyncML Notifier Roaming API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
+</component>
+<component name="sync_service_api" long-name="Sync Service API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_service_api/group"/>
+</component>
+<component name="dcmo_adapter_api" long-name="DCMO Adapter API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_adapter_api/group"/>
+</component>
+<component name="dcmo_control_api" long-name="DCMO Control API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_control_api/group"/>
+</component>
+<component name="ds_capability_mgmt_plugin_api" long-name="DS Capability Management Plugin API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
+</component>
+<component name="devicemgmt_dialogs_api" long-name="Device Management Dialogs API" filter="s60" introduced="^4" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/devicemgmt_dialogs_api/group"/>
+</component>
+</collection>
+<collection name="policymanagement" long-name="Policy Management" level="generic">
+<component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">
+<unit bldFile="mw/remotemgmt/policymanagement/pmdmadapter/group"/>
+</component>
+<component name="dmutilserver" filter="s60" long-name="DM Util Server">
+<unit bldFile="mw/remotemgmt/policymanagement/dmutilserver/group"/>
+</component>
+<component name="policyengine" filter="s60" long-name="Policy Engine">
+<unit bldFile="mw/remotemgmt/policymanagement/policyengine/group" filter="!dfs_build"/>
+</component>
+<component name="policymanagement_build" filter="s60" long-name="Policy Management Build">
+<!-- need to distribute exports, etc into the other components and remove this-->
+<unit bldFile="mw/remotemgmt/policymanagement/group"/>
+</component>
+</collection>
+<collection name="syncmlfw" long-name="SyncML Framework" level="server">
+<component name="syncmlfw_build" filter="s60" long-name="SyncML Framework Build">
+<!-- need to break this up into components. Too convoluted a structure to be in a single bld.inf-->
+<unit bldFile="mw/remotemgmt/syncmlfw/group"/>
+</component>
+</collection>
+<collection name="terminalsecurity" long-name="Terminal Security" level="specific">
+<component name="scp" filter="s60" long-name="Security Code Proxy">
+<!-- can only have one unit, need to have these #included from a single bld.inf -->
+<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
+<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpdatabase/group"/>
+<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpserver/group"/>
+<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scppatternplugin/group"/>
+<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scphistoryplugin/group"/>
+<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scptimestampplugin/group"/>
+<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpeventhandler/group"/>
+<unit bldFile="mw/remotemgmt/terminalsecurity/scp/dmeventnotifier/group"/>
+</component>
+<component name="terminalsecurity_client" filter="s60" long-name="Terminal Control Client">
+<unit bldFile="mw/remotemgmt/terminalsecurity/client/group"/>
+</component>
+<component name="terminalsecurity_server" filter="s60" long-name="Terminal Control Server">
+<unit bldFile="mw/remotemgmt/terminalsecurity/server/group"/>
+</component>
+<component name="tcadapter" filter="s60" long-name="Terminal Control Adapter">
+<unit bldFile="mw/remotemgmt/terminalsecurity/tcadapter/bld"/>
+</component>
+<component name="terminalsecurity_build" filter="s60" long-name="Terminal Security Build">
+<!-- need to distribute exports, etc into the other components and remove this-->
+<unit bldFile="mw/remotemgmt/terminalsecurity/group"/>
+</component>
+</collection>
+<collection name="omaprovisioning" long-name="OMA Provisioning" level="specific">
+<component name="pnputil" filter="s60" long-name="PnP Util">
+<unit bldFile="mw/remotemgmt/omaprovisioning/pnputil/group"/>
+</component>
+<component name="provisioning" filter="s60" long-name="Provisioning">
+<unit bldFile="mw/remotemgmt/omaprovisioning/provisioning/group"/>
+</component>
+</collection>
+<collection name="dcmofw" long-name="Device Capability Management Object Framework" level="framework">
+<component name="dcmoclient" filter="s60" long-name="DCMO Client">
+<unit bldFile="mw/remotemgmt/dcmofw/dcmoclient/group"/>
+</component>
+<component name="dcmoserver" filter="s60" long-name="DCMO Server">
+<unit bldFile="mw/remotemgmt/dcmofw/dcmoserver/group"/>
+</component>
+<component name="dcmocustcmd" filter="s60" long-name="DCMO Custom Commands">
+<unit bldFile="mw/remotemgmt/dcmofw/dcmocustcmd/group"/>
+</component>
+<component name="dcmofw_build" filter="s60" long-name="DCMO Build">
+<!-- need to distribute exports, etc into the other components and remove this-->
+<unit bldFile="mw/remotemgmt/dcmofw/group"/>
+</component>
+</collection>
+<collection name="fotaapplication" long-name="FOTA Application" level="generic">
+<component name="fotaserver" filter="s60" long-name="FOTA Server">
+<unit bldFile="mw/remotemgmt/fotaapplication/fotaserver/group"/>
+</component>
+<component name="fotacustcmds" filter="s60" long-name="FOTA Custom Commands">
+<unit bldFile="mw/remotemgmt/fotaapplication/fotaserver/fotacustcmds/group"/>
+</component>
+<!-- really need to find a better way to do this -->
+<component name="fotacustcmds-alt" filter="s60" long-name="FOTA Custom Commands">
+<unit bldFile="mw/remotemgmt/fotaapplication/fotaserver/fotacustcmds/group"/>
+</component>
+</collection>
+</block>
+<block name="remoteconn" level="generic" long-name="Remote Connectivity" levels="plugin framework server generic specific">
+<collection name="remoteconn_info" long-name="Remote Connectivity Info" level="specific">
+<component name="remoteconn_metadata" long-name="Remote Connectivity Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
+</component>
+</collection>
+<collection name="mtptransports" long-name="MTP Transports" level="plugin">
+<component name="mtpusbtransport" long-name="MTP USB Transport" introduced="^2" purpose="optional" plugin="Y">
+<unit bldFile="mw/remoteconn/mtptransports/mtpusbtransport/group" mrp="mw/remoteconn/mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
+</component>
+<component name="mtpptpiptransport" long-name="MTP PTP-IP Transport" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="mw/remoteconn/mtptransports/mtpptpiptransport/group" mrp="mw/remoteconn/mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
+</component>
+<component name="mtpcontroller" long-name="MTP Controller" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="mw/remoteconn/mtptransports/mtpcontroller/group" mrp="mw/remoteconn/mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
+</component>
+</collection>
+<collection name="mtpfws" long-name="MTP Frameworks" level="framework">
+<component name="mtpfw" long-name="MTP Framework" introduced="^2" purpose="optional">
+<unit bldFile="mw/remoteconn/mtpfws/mtpfw/group" mrp="mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/>
+</component>
+</collection>
+<collection name="mtpdataproviders" long-name="MTP Data Providers" level="generic">
+<component name="mtpfileandfolderdp" long-name="MTP File and Folder Provider" introduced="^2" purpose="optional" plugin="Y">
+<unit bldFile="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group" mrp="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
+</component>
+<component name="mtpimagedp" long-name="MTP Image Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="mw/remoteconn/mtpdataproviders/mtpimagedp/group" mrp="mw/remoteconn/mtpdataproviders/mtpimagedp/group/mtp_imagedp.mrp"/>
+</component>
+<component name="mtppictbridgedp" long-name="MTP PictBridge Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group" mrp="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group/mtp_pictbridgedp.mrp"/>
+</component>
+</collection>
+<collection name="backupandrestore" long-name="Backup and Restore" level="specific">
+<component name="backupengine" long-name="Backup Engine" introduced="9.0" purpose="optional">
+<unit bldFile="mw/remoteconn/backupandrestore/backupengine/group" mrp="mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
+</component>
+<component name="backuptest" long-name="Backup Test" introduced="^2" purpose="development">
+<unit bldFile="mw/remoteconn/backupandrestore/backuptest/group" mrp="mw/remoteconn/backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
+</component>
+</collection>
+<collection name="obex" long-name="OBEX" level="generic">
+<component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1" purpose="optional">
+<unit bldFile="mw/remoteconn/obex/obexprotocol/group" mrp="mw/remoteconn/obex/obexprotocol/group/obex.mrp"/>
+</component>
+<component name="obexextensionapi" long-name="OBEX Extension API" introduced="9.2" purpose="optional">
+<unit bldFile="mw/remoteconn/obex/obexextensionapi/group" mrp="mw/remoteconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
+</component>
+</collection>
+</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="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="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="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="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="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="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" 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" 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" filter="s60" class="config PC">
+<unit mrp="mw/srvdiscovery/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="dlnasrv" level="specific" long-name="DLNA Services" levels="stack server ctrl framework plugin">
+<!-- uncomment all the units when configuration is in place, they're currently #included from other xxx_build components -->
+<collection name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" level="plugin">
+<component name="upnp_media_server_settings_api" long-name="UPnP Media Server Settings API" filter="s60" class="api">
+<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_settings_api/group"/>
+</component>
+<component name="upnp_av_objects_api" long-name="UPnP A/V Objects API" filter="s60" class="api">
+<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_av_objects_api/group"/>
+</component>
+<component name="upnp_media_server_api" long-name="UPnP Media Server API" filter="s60" class="api">
+<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_api/group"/>
+</component>
+<component name="upnp_security_plugin_api" long-name="UPnP Security Plugin API" filter="s60" class="api">
+<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_security_plugin_api/group"/>
+</component>
+<component name="upnp_avcp_api" long-name="UPnP AVCP API" filter="s60" class="api">
+<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_avcp_api/group"/>
+</component>
+<component name="upnp_media_server_metadata_api" long-name="UPnP Media Server Metadata API" filter="s60" class="api">
+<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_metadata_api/group"/>
+</component>
+<component name="upnp_command_api" long-name="UPnP Command API" filter="s60" class="api">
+<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_command_api/group"/>
+</component>
+<component name="upnp_plugin_api" long-name="UPnP Plugin API" filter="s60" class="api">
+<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_plugin_api/group"/>
+</component>
+</collection>
+<collection name="upnpavcontrolpoint" long-name="UPnP A/V Control Point" level="plugin">
+<component name="avcontrolframework" filter="s60" long-name="A/V Control Famework" introduced="9.1" deprecated="^3">
+<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
+</component>
+<component name="upnpavcontrolpoint_build" filter="s60" long-name="UPnP A/V Control Point Build" introduced="9.1" deprecated="^3">
+<!-- put exports in other component instead -->
+<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/group"/>
+</component>
+</collection>
+<collection name="upnpmediaserver" long-name="UPnP Media Server" level="server">
+<component name="avobjects" filter="s60" long-name="A/V Objects">
+<unit bldFile="mw/dlnasrv/upnpmediaserver/avobjects/group"/>
+</component>
+<component name="mediaserverclient" filter="s60" long-name="Media Server Client">
+<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverclient/group"/>
+</component>
+<component name="connectionmanagerservice" filter="s60" long-name="Connection Manager Service">
+<unit bldFile="mw/dlnasrv/upnpmediaserver/connectionmanagerservice/group"/>
+</component>
+<component name="contentdirectoryservice" filter="s60" long-name="Content Directory Service">
+<unit bldFile="mw/dlnasrv/upnpmediaserver/contentdirectoryservice/group"/>
+</component>
+<component name="mediaserverengine" filter="s60" long-name="Media Server Engine">
+<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverengine/group"/>
+</component>
+<component name="upnpmediaserver_build" filter="s60" long-name="UPnP Media Server Build">
+<!-- move exports into one of above components -->
+<unit bldFile="mw/dlnasrv/upnpmediaserver/group"/>
+</component>
+</collection>
+<collection name="upnpavcontroller" long-name="UPnP A/V Controller" level="ctrl">
+<component name="upnpxmlparser" filter="s60" long-name="UPnP XML Parser" introduced="^2">
+<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpxmlparser/group"/>
+</component>
+<component name="upnpavcontrollerserver" filter="s60" long-name="UPnP A/V Controller Server" introduced="^2">
+<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerserver/group"/>
+</component>
+<component name="upnpavcontrollerclient" filter="s60" long-name="UPnP A/V Ccontroller Client" introduced="^2">
+<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerclient/group"/>
+</component>
+<component name="upnpavcontrollerhelper" filter="s60" long-name="UPnP A/V Controller Helper" introduced="^2">
+<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerhelper/group"/>
+</component>
+<component name="upnpavcontroller_build" filter="s60" long-name="UPnP A/V Controller Build" introduced="^2">
+<!-- move exports content into one of above components -->
+<unit bldFile="mw/dlnasrv/upnpavcontroller/group"/>
+</component>
+</collection>
+<collection name="upnpframework" long-name="UPnP Framework" level="framework">
+<component name="upnputilities" filter="s60" long-name="UPnP Utilities" introduced="^2">
+<unit bldFile="mw/dlnasrv/upnpframework/upnputilities/group"/>
+</component>
+<component name="upnpextensionpluginif" filter="s60" long-name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
+<unit bldFile="mw/dlnasrv/upnpframework/upnpextensionpluginif/group"/>
+</component>
+<component name="upnpfiletransferengine" filter="s60" long-name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
+<unit bldFile="mw/dlnasrv/upnpframework/upnpfiletransferengine/group"/>
+</component>
+<component name="upnpcommonui" filter="s60" long-name="UPnP Common UI" introduced="^2" deprecated="^3">
+<unit bldFile="mw/dlnasrv/upnpframework/upnpcommonui/group"/>
+</component>
+<component name="upnpaiwengine" filter="s60" long-name="UPnP AIW Engine" introduced="^2" deprecated="^3">
+<unit bldFile="mw/dlnasrv/upnpframework/upnpaiwengine/group"/>
+</component>
+<component name="upnpaiwprovider" filter="s60" long-name="UPnP AIW Provider" introduced="^2" deprecated="^3" plugin="Y">
+<unit bldFile="mw/dlnasrv/upnpframework/upnpaiwprovider/group"/>
+</component>
+<component name="upnpmusicadapter" filter="s60" long-name="UPnP Music Adapter" introduced="^2">
+<unit bldFile="mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
+</component>
+<component name="upnpcommand" filter="s60" long-name="UPnP Command" introduced="^2">
+<unit bldFile="mw/dlnasrv/upnpframework/upnpcommand/group"/>
+</component>
+<component name="upnpframework_build" filter="s60" long-name="UPnP Framework Build" introduced="^2">
+<!-- move exports content into one or more of above components -->
+<unit bldFile="mw/dlnasrv/upnpframework/group"/>
+</component>
+</collection>
+<collection name="upnpsettings" long-name="UPnP Settings" level="framework">
+<component name="upnpsettingsengine" filter="s60" long-name="UPnP Settings Engine" introduced="^2">
+<unit bldFile="mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
+</component>
+<component name="multiselectionui" filter="s60" long-name="Multi-Selection UI" introduced="^2" deprecated="^3">
+<unit bldFile="mw/dlnasrv/upnpsettings/multiselectionui/group"/>
+</component>
+<component name="appwizard" filter="s60" long-name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
+<unit bldFile="mw/dlnasrv/upnpsettings/appwizard/group"/>
+</component>
+<component name="upnpsharingui" filter="s60" long-name="UPnP Sharing UI" introduced="^2" deprecated="^3">
+<unit bldFile="mw/dlnasrv/upnpsettings/upnpsharingui/group"/>
+</component>
+<component name="upnpgsplugin" filter="s60" long-name="UPnP GS Plugin" introduced="^2" plugin="Y">
+<unit bldFile="mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
+</component>
+<component name="upnpsettings_build" filter="s60" long-name="UPnP Settings Build" introduced="^2">
+<!-- move exports content into one of above components -->
+<unit bldFile="mw/dlnasrv/upnpsettings/group"/>
+</component>
+</collection>
+<collection name="upnpsharing" long-name="UPnP Sharing" level="server">
+<component name="upnpdlnaprofiler" filter="s60" long-name="UPnP DLNA Profiler" introduced="^2">
+<unit bldFile="mw/dlnasrv/upnpsharing/upnpdlnaprofiler/group"/>
+</component>
+<component name="upnpsecurity" filter="s60" long-name="UPnP Security" introduced="^2">
+<unit bldFile="mw/dlnasrv/upnpsharing/upnpsecurity/group"/>
+</component>
+<component name="upnpcontentserver" filter="s60" long-name="UPnP Content Server" introduced="^2">
+<unit bldFile="mw/dlnasrv/upnpsharing/upnpcontentserver/group"/>
+</component>
+<component name="applicationengine" filter="s60" long-name="UPnP Application Engine" introduced="^2">
+<unit bldFile="mw/dlnasrv/upnpsharing/applicationengine/group"/>
+</component>
+<component name="upnpsharing_build" filter="s60" long-name="UPnP Sharing Build" introduced="^2">
+<!-- move exports content into one of above components -->
+<unit bldFile="mw/dlnasrv/upnpsharing/group"/>
+</component>
+</collection>
+<collection name="upnpmpxplugins" long-name="UPnP MPX Plugins" level="plugin">
+<component name="upnpplaybackplugins" filter="s60" long-name="UPnP Playback Plugins" introduced="^2" plugin="Y">
+<unit bldFile="mw/dlnasrv/upnpmpxplugins/upnpplaybackplugins/group"/>
+</component>
+<component name="upnpmpxplugins_build" filter="s60" long-name="UPnP MPX Plugins Build" introduced="^2">
+<!-- move exports content into other component? -->
+<unit bldFile="mw/dlnasrv/upnpmpxplugins/group"/>
+</component>
+</collection>
+<collection name="upnpharvester" long-name="UPnP Harvester" level="ctrl">
+<component name="upnpharvester_common" filter="s60" long-name="UPnP Harvester Common" introduced="^2" deprecated="^3">
+<!-- need to merge or #include these to a single bld.inf -->
+<unit bldFile="mw/dlnasrv/upnpharvester/common/cmlibrary/group"/>
+<unit bldFile="mw/dlnasrv/upnpharvester/common/cmsettings/group"/>
+<unit bldFile="mw/dlnasrv/upnpharvester/common/cmsqlwrapper/group"/>
+<unit bldFile="mw/dlnasrv/upnpharvester/common/dbmanager/group"/>
+</component>
+<component name="cdssync" filter="s60" long-name="CDS Sync" introduced="^2" deprecated="^3">
+<unit bldFile="mw/dlnasrv/upnpharvester/cdssync/common"/>
+</component>
+<component name="mdhserver" filter="s60" long-name="Metadata Harvester Server" introduced="^2" deprecated="^3">
+<unit bldFile="mw/dlnasrv/upnpharvester/mdhserver/group"/>
+</component>
+<component name="upnpharvester_build" filter="s60" long-name="UPnP Harvester Build" introduced="^2" deprecated="^3">
+<!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
+<unit bldFile="mw/dlnasrv/upnpharvester/group"/>
+</component>
+</collection>
+<collection name="homesync" long-name="Home Sync" level="plugin">
+<component name="contentmanager" filter="s60" long-name="Content Manager" introduced="^2" deprecated="^3">
+<unit bldFile="mw/dlnasrv/homesync/group"/>
+<!-- move bld.inf into contentmanager dir -->
+</component>
+</collection>
+<collection name="homemedia" long-name="Home Media" level="framework">
+<!-- collection is really just a component. Move down a directory -->
+<component name="homemedia_build" filter="s60" long-name="Home Media" introduced="^2" deprecated="^3">
+<unit bldFile="mw/dlnasrv/homemedia/group"/>
+</component>
+</collection>
+<collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin"/>
+</block>
+<block name="btservices" level="generic" long-name="Bluetooth Services" levels="framework server generic specific plugin">
+<collection name="btservices_pub" long-name="BT Services Public Interfaces" level="plugin">
+<component name="bluetooth_power_state_api" long-name="Bluetooth Power State API" filter="s60" class="api">
+<unit bldFile="mw/btservices/btservices_pub/bluetooth_power_state_api/group"/>
+</component>
+<component name="bluetooth_notifier_api" long-name="Bluetooth Notifier API" filter="s60" class="api">
+<unit bldFile="mw/btservices/btservices_pub/bluetooth_notifier_api/group"/>
+</component>
+</collection>
+<collection name="btservices_plat" long-name="BT Services Platform Interfaces" level="plugin">
+<component name="bluetooth_dosserver_audio_api" long-name="Bluetooth DOS Server Audio API" filter="s60" class="api">
+<unit bldFile="mw/btservices/btservices_plat/bluetooth_dosserver_audio_api/group"/>
+</component>
+<component name="bluetooth_dut_mode_api" long-name="Bluetooth DUT Mode API" filter="s60" class="api">
+<unit bldFile="mw/btservices/btservices_plat/bluetooth_dut_mode_api/group"/>
+</component>
+<component name="bluetooth_engine_api" long-name="Bluetooth Engine API" filter="s60" class="api">
+<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" 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" 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" 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" 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"/>
+</component>
+<component name="bluetooth_local_variation_api" long-name="Bluetooth Local Variation API" filter="s60" class="api">
+<unit bldFile="mw/btservices/btservices_plat/bluetooth_local_variation_api/group"/>
+</component>
+<component name="bluetooth_notifier_internal_api" long-name="Bluetooth Notifier internal API" filter="s60" class="api">
+<unit bldFile="mw/btservices/btservices_plat/bluetooth_notifier_internal_api/group"/>
+</component>
+<component name="bluetooth_sap_connection_state_api" long-name="Bluetooth SAP Connection State API" filter="s60" class="api">
+<unit bldFile="mw/btservices/btservices_plat/bluetooth_sap_connection_state_api/group"/>
+</component>
+<component name="bluetooth_secondary_display_notification_api" long-name="Bluetooth Secondary Display Notification API" filter="s60" class="api">
+<unit bldFile="mw/btservices/btservices_plat/bluetooth_secondary_display_notification_api/group"/>
+</component>
+<component name="obex_secondary_display_notification_api" long-name="OBEX Secondary Display Notification API" filter="s60" class="api">
+<unit bldFile="mw/btservices/btservices_plat/obex_secondary_display_notification_api/group"/>
+</component>
+<component name="obex_service_plugin_api" long-name="OBEX Service Plugin API" filter="s60" class="api">
+<unit bldFile="mw/btservices/btservices_plat/obex_service_plugin_api/group"/>
+</component>
+<component name="obex_service_utils_api" long-name="OBEX Service Utils API" filter="s60" class="api">
+<unit bldFile="mw/btservices/btservices_plat/obex_service_utils_api/group"/>
+</component>
+<component name="usb_obexservicemanager_client_api" long-name="OBEX Service Manager Client API" filter="s60" class="api">
+<unit bldFile="mw/btservices/btservices_plat/usb_obexservicemanager_client_api/group"/>
+</component>
+</collection>
+<collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
+<component name="btnotifclient" filter="s60" long-name="Bluetooth Notification Client" introduced="^4">
+<!-- cannot put a component under another component. Move up a directory -->
+<unit bldFile="mw/btservices/bluetoothengine/btnotif/btnotifclient/group"/>
+</component>
+<component name="bteng" filter="s60" long-name="Bluetooth Engine">
+<unit bldFile="mw/btservices/bluetoothengine/bteng/group"/>
+</component>
+<component name="btserviceutil" filter="s60" long-name="Bluetooth Service Utils" introduced="^4">
+<unit bldFile="mw/btservices/bluetoothengine/btserviceutil/group" filter="!test"/>
+</component>
+<component name="btnotif" filter="s60" long-name="Bluetooth Notifier">
+<unit bldFile="mw/btservices/bluetoothengine/btnotif/group"/>
+</component>
+<component name="btdevicedialogplugin" filter="s60" long-name="Bluetooth Device Dialog Plugin" introduced="^4" plugin="Y">
+<unit bldFile="mw/btservices/bluetoothengine/btnotif/btdevicedialogplugin" proFile="btdevicedialogplugin.pro"/>
+</component>
+<component name="btaudioman" filter="s60" long-name="Bluetooth Audio Manager">
+<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"/>
+</component>
+<component name="btsac" filter="s60" long-name="Bluetooth Stereo Audio Controller" plugin="Y">
+<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" filter="!test"/>
+</component>
+<component name="btsap" filter="s60" long-name="Bluetooth SIM Access Profile" plugin="Y">
+<unit bldFile="mw/btservices/bluetoothengine/btsap/group"/>
+</component>
+<component name="btui" filter="s60" long-name="Bluetooth UI">
+<unit bldFile="mw/btservices/bluetoothengine/btui" proFile="btui.pro"/>
+</component>
+<component name="btpbap" filter="s60" long-name="Bluetooth Phonebook Access Profile" plugin="Y">
+<unit bldFile="mw/btservices/bluetoothengine/btpbap/group"/>
+</component>
+<component name="bthid" filter="s60" long-name="Bluetooth HID">
+<unit bldFile="mw/btservices/bluetoothengine/bthid/group"/>
+</component>
+<component name="btctrldcmoadapter" filter="s60" long-name="Bluetooth Control DCMO Adapter" introduced="^3" plugin="Y">
+<unit bldFile="mw/btservices/bluetoothengine/btctrldcmoadapter/group"/>
+</component>
+</collection>
+<collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
+<component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
+<unit bldFile="mw/btservices/bluetoothappprofiles/avrcp" mrp="mw/btservices/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
+</component>
+</collection>
+<collection name="atcommands" long-name="AT Commands" level="generic">
+<component name="modematplugin" long-name="Modem AT Plugin" filter="s60" introduced="^4" plugin="Y">
+<unit bldFile="mw/btservices/atcommands/modematplugin/group"/>
+</component>
+<component name="lccustomplugin" long-name="LC Custom Plugin" filter="s60" introduced="^4" plugin="Y">
+<unit bldFile="mw/btservices/atcommands/lccustomplugin/group"/>
+</component>
+</collection>
+<collection name="cbsatplugin" long-name="CBS AT Plugin" level="plugin">
+<component name="atmisccmdplugin" long-name="AT Misc Commands Plugin" filter="s60" introduced="^4" plugin="Y">
+<unit bldFile="mw/btservices/cbsatplugin/atmisccmdplugin/group"/>
+</component>
+</collection>
+<collection name="btobexprofiles" long-name="BT OBEX Profiles" level="generic">
+<component name="obexreceiveservices" long-name="OBEX Receive Services" filter="s60">
+<unit bldFile="mw/btservices/btobexprofiles/obexreceiveservices/group"/>
+</component>
+<component name="obexsendservices" long-name="OBEX Send Services" filter="s60">
+<unit bldFile="mw/btservices/btobexprofiles/obexsendservices/group"/>
+</component>
+<component name="obexhighway" long-name="OBEX Highway" filter="s60" introduced="^4">
+<!-- should be moved out from under obexsendservices into own component dir -->
+<unit bldFile="mw/btservices/btobexprofiles/obexsendservices/obexhighway" proFile="obexhighway.pro"/>
+</component>
+<component name="obexserviceman" long-name="OBEX Service Manager" filter="s60">
+<unit bldFile="mw/btservices/btobexprofiles/obexserviceman/group"/>
+</component>
+</collection>
+<collection name="btservices_info" long-name="BT Services Info" level="plugin">
+<component name="btservices_metadata" long-name="BT Services Metadata" introduced="^3" purpose="development" class="config PC">
+<unit mrp="mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="usbservices" level="generic" long-name="USB Services" levels="framework server generic specific plugin">
+<collection name="usbservices_plat" long-name="USB Services Platform Interfaces" level="plugin">
+<component name="pictbridge_api" long-name="PictBridge API" filter="s60" class="api">
+<unit bldFile="mw/usbservices/usbservices_plat/pictbridge_api/group"/>
+</component>
+<component name="ptp_responder_api" long-name="PTP Responder API" filter="s60" class="api">
+<unit bldFile="mw/usbservices/usbservices_plat/ptp_responder_api/group"/>
+</component>
+<component name="ptp_transport_api" long-name="PTP Transport API" filter="s60" class="api">
+<unit bldFile="mw/usbservices/usbservices_plat/ptp_transport_api/group"/>
+</component>
+<component name="usb_device_control_plugin_api" long-name="USB Device Control Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/usbservices/usbservices_plat/usb_device_control_plugin_api/group"/>
+</component>
+<component name="usb_notifier_api" long-name="USB Notifier API" filter="s60" class="api">
+<unit bldFile="mw/usbservices/usbservices_plat/usb_notifier_api/group"/>
+</component>
+<component name="usb_personality_api_header" long-name="USB Personality API" filter="s60" class="api">
+<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_api_header/group"/>
+</component>
+<component name="usb_personality_plugin_api" long-name="USB Personality Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_plugin_api/group"/>
+</component>
+<component name="usb_secondary_display_api" long-name="USB Secondary Display API" filter="s60" class="api">
+<unit bldFile="mw/usbservices/usbservices_plat/usb_secondary_display_api/group"/>
+</component>
+<component name="usb_watcher_api" long-name="USB Watcher API" filter="s60" class="api">
+<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_api/group"/>
+</component>
+<component name="usb_watcher_info_api_header" long-name="USB Watcher Info API" filter="s60" class="api">
+<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_info_api_header/group"/>
+</component>
+</collection>
+<collection name="usbengines" long-name="USB Engines" level="generic">
+<component name="usbotgwatcher" filter="s60" long-name="USB OTG Watcher">
+<unit bldFile="mw/usbservices/usbengines/usbotgwatcher/group"/>
+</component>
+<component name="usbwatcher" filter="s60" long-name="USB Watcher">
+<unit bldFile="mw/usbservices/usbengines/usbwatcher/group"/>
+</component>
+<component name="usblocodplugin" filter="s60" long-name="USB Local Connectivity Domain Plugin" plugin="Y">
+<unit bldFile="mw/usbservices/usbengines/usblocodplugin/group"/>
+</component>
+<component name="usbdevcon" filter="s60" long-name="USB Device Control">
+<unit bldFile="mw/usbservices/usbengines/usbdevcon/group"/>
+</component>
+<component name="usbremotepersonality" filter="s60" long-name="USB Remote Personality">
+<unit bldFile="mw/usbservices/usbengines/usbremotepersonality/group"/>
+</component>
+</collection>
+<collection name="usbclasses" long-name="USB Classes" level="framework">
+<component name="usbobexclasscontroller" filter="s60" long-name="USB OBEX Class Controller" plugin="Y">
+<unit bldFile="mw/usbservices/usbclasses/usbobexclasscontroller/group"/>
+</component>
+<component name="usbbasicpersonality" filter="s60" long-name="USB Basic Personality" plugin="Y">
+<unit bldFile="mw/usbservices/usbclasses/usbbasicpersonality/group"/>
+</component>
+<component name="usbmscpersonality" filter="s60" long-name="USB MSC Personality" plugin="Y">
+<unit bldFile="mw/usbservices/usbclasses/usbmscpersonality/group"/>
+</component>
+<component name="usbphoneasmodem" filter="s60" long-name="USB Phone as Modem" introduced="^3">
+<unit bldFile="mw/usbservices/usbclasses/usbphoneasmodem/group"/>
+</component>
+</collection>
+<collection name="usbuis" long-name="USB UIs" level="specific">
+<component name="usbuinotif" filter="s60" long-name="USB UI Notifiers">
+<unit bldFile="mw/usbservices/usbuis/usbuinotif" proFile="usbuinotif.pro" qmakeArgs="-r"/>
+</component>
+<component name="imageprintuiprovider" filter="s60" long-name="ImagePrint UI Provider" plugin="Y">
+<unit bldFile="mw/usbservices/usbuis/imageprintuiprovider/group"/>
+</component>
+<component name="usbimageprintui" filter="s60" long-name="ImagePrint UI">
+<unit bldFile="mw/usbservices/usbuis/imageprintui/group"/>
+</component>
+<component name="usbsettingsapp" long-name="USB Settings Application" introduced="^4" filter="s60">
+<unit bldFile="mw/usbservices/usbuis/usbsettingsapp" proFile="usbsettingsapp.pro" qmakeArgs="-r"/>
+</component>
+<component name="usbindicatorplugin" long-name="USB Indicator Plugin" introduced="^4" filter="s60" plugin="Y">
+<unit bldFile="mw/usbservices/usbuis/usbindicatorplugin" proFile="usbindicatorplugin.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+<collection name="usbservices_test" long-name="USB Services Test" level="server"/>
+</block>
+<block name="imghandling" level="specific" long-name="Image Handling" levels="lib util if">
+<collection name="imagehandling_plat" long-name="Image Handling Platform Interfaces" level="if">
+<component name="image_handling_library_api" long-name="Image Handling Library API" filter="s60" class="api">
+<unit bldFile="mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
+</component>
+<component name="3gp_library_api" long-name="3GP Library API" filter="s60" class="api">
+<unit bldFile="mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
+</component>
+<component name="thumbnailmanager_api" long-name="Thumbnail Manager API" filter="s60" class="api">
+<unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
+</component>
+</collection>
+<collection name="imagehandlinglib" long-name="Image Handling Library" level="lib">
+<!-- collection is really a component, need to move down a directory -->
+<component name="ihl" filter="s60" long-name="IHL">
+<unit bldFile="mw/imghandling/imagehandlinglib/group"/>
+</component>
+</collection>
+<collection name="imagehandlingutilities" long-name="Image Handling Utilities" level="util">
+<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager">
+<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
+</component>
+<component name="thumbnailmanagerqt" filter="s60" long-name="Thumbnail Manager Qt" introduced="^4">
+<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt" filter="!test" proFile="thumbnailmanagerqt.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+</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="media_fetch_api" long-name="Media Fetch API" filter="s60" class="api">
+<unit bldFile="mw/metadatasrv/metadatasrv_pub/media_fetch_api/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>
+</collection>
+<collection name="mediamanagementutilities" long-name="Media Management Utilities" level="generic">
+<component name="mediafetch" filter="s60" long-name="Media Fetch">
+<unit bldFile="mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
+</component>
+</collection>
+</block>
+<block name="mds" level="specific" long-name="Metadata Services" levels="mgr eng server int">
+<collection name="mds_plat" long-name="Metadata Services Platform Interfaces" level="int">
+<component name="context_engine_plugin_api" long-name="Context Engine Plugin API" introduced="^2" filter="s60" class="api">
+<unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/group" filter="!test"/>
+</component>
+<component name="harvester_framework_api" long-name="Harvester Framework API" introduced="^2" filter="s60" class="api">
+<unit bldFile="mw/mds/mds_plat/harvester_framework_api/group" filter="!test"/>
+<!-- can only have one unit with the same filter, #include the following from the previous unit -->
+</component>
+<component name="location_manager_api" long-name="Location Manager API" introduced="^2" filter="s60" class="api">
+<unit bldFile="mw/mds/mds_plat/location_manager_api/group" filter="!test"/>
+</component>
+<component name="metadata_engine_api" long-name="Metadata Engine API" introduced="^2" filter="s60" class="api">
+<unit bldFile="mw/mds/mds_plat/metadata_engine_api/group" filter="!test"/>
+</component>
+<component name="content_listing_framework_collection_manager_api" long-name="Content Listing Framework Collection Manager API" introduced="^2" filter="s60" class="api">
+<unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/group" filter="!test"/>
+</component>
+<component name="content_listing_framework_extended_api" long-name="Content Listing Framework Extended API" introduced="^2" filter="s60" class="api">
+<unit bldFile="mw/mds/mds_plat/content_listing_framework_extended_api/group"/>
+</component>
+</collection>
+<collection name="mds_pub" long-name="Metadata Services Public Interfaces" level="int">
+<component name="content_listing_framework_api" long-name="Content Listing Framework API" introduced="^2" filter="s60" class="api">
+<unit bldFile="mw/mds/mds_pub/content_listing_framework_api/group" filter="!test"/>
+</component>
+</collection>
+<collection name="metadataengine" long-name="Metadata Engine" level="eng">
+<component name="metadataengine_common" filter="s60" long-name="Metadata Engine Common" introduced="^2">
+<unit bldFile="mw/mds/metadataengine/common/group"/>
+</component>
+<component name="metadataengine_server" filter="s60" long-name="Metadata Engine Server" introduced="^2">
+<unit bldFile="mw/mds/metadataengine/server/group"/>
+</component>
+<component name="metadataengine_client" filter="s60" long-name="Metadata Engine Client" introduced="^2">
+<unit bldFile="mw/mds/metadataengine/client/group"/>
+</component>
+<component name="metadataengine_build" filter="s60" long-name="Metadata Engine Build" introduced="^2">
+<!--make this collection a single component, or split this bld.inf into the other units -->
+<unit bldFile="mw/mds/metadataengine/group"/>
+</component>
+</collection>
+<collection name="locationmanager" long-name="Location Manager" level="mgr">
+<component name="locationtrail" filter="s60" long-name="Location Trail" introduced="^2">
+<unit bldFile="mw/mds/locationmanager/locationtrail/group"/>
+</component>
+<component name="locationmanager_server" filter="s60" long-name="Location Manager Server" introduced="^2">
+<unit bldFile="mw/mds/locationmanager/server/group"/>
+</component>
+<component name="locationmanager_client" filter="s60" long-name="Location Manager Client" introduced="^2">
+<unit bldFile="mw/mds/locationmanager/client/group"/>
+</component>
+<component name="locationmanager_build" filter="s60" long-name="Location Manager Build" introduced="^2">
+<!--make this collection a single component, or split this bld.inf into the other units -->
+<unit bldFile="mw/mds/locationmanager/group"/>
+</component>
+</collection>
+<collection name="contextengine" long-name="Context Engine" level="eng">
+<component name="contextengine_plugins" filter="s60" long-name="Context Engine Plugins" introduced="^2" plugin="Y">
+<unit bldFile="mw/mds/contextengine/plugins/group"/>
+</component>
+<component name="contextengine_build" filter="s60" long-name="Context Engine Build" introduced="^2">
+<!--make this collection a single component, or make this unit self-contained -->
+<unit bldFile="mw/mds/contextengine/group"/>
+</component>
+</collection>
+<collection name="harvester" long-name="Harvester" level="eng">
+<component name="blacklistclient" filter="s60" long-name="Blacklist Client" introduced="^2">
+<unit bldFile="mw/mds/harvester/blacklistclient/group"/>
+</component>
+<component name="blacklistserver" filter="s60" long-name="Blacklist Server" introduced="^2">
+<unit bldFile="mw/mds/harvester/blacklistserver/group"/>
+</component>
+<component name="harvester_common" filter="s60" long-name="Harvester Common" introduced="^2">
+<unit bldFile="mw/mds/harvester/common/group"/>
+</component>
+<component name="composerplugins" filter="s60" long-name="Composer Plugins" introduced="^2" plugin="Y">
+<unit bldFile="mw/mds/harvester/composerplugins/group"/>
+</component>
+<component name="harvesterplugins" filter="s60" long-name="Harvester Plugins" introduced="^2" plugin="Y">
+<unit bldFile="mw/mds/harvester/harvesterplugins/group"/>
+</component>
+<component name="monitorplugins" filter="s60" long-name="Monitor Plugins" introduced="^2" plugin="Y">
+<unit bldFile="mw/mds/harvester/monitorplugins/group"/>
+</component>
+<component name="harvester_server" filter="s60" long-name="Harvester Server" introduced="^2">
+<unit bldFile="mw/mds/harvester/server/group"/>
+</component>
+<component name="harvester_client" filter="s60" long-name="Harvester Client" introduced="^2">
+<unit bldFile="mw/mds/harvester/client/group"/>
+</component>
+<component name="harvester_build" filter="s60" long-name="Harvester Build" introduced="^2">
+<!-- split these exports into the other components -->
+<unit bldFile="mw/mds/harvester/group"/>
+</component>
+</collection>
+<collection name="watchdog" long-name="Watchdog" level="server">
+<!-- collection is really a component. Move down a directory -->
+<component name="mdswatchdog" filter="s60" long-name="Metadata Watchdog" introduced="^2">
+<unit bldFile="mw/mds/watchdog/group"/>
+</component>
+</collection>
+<collection name="clfwrapper" long-name="Content Listing Framework Wrapper" level="int">
+<!-- collection is really a component. Move down a directory -->
+<component name="clfwrapper_build" filter="s60" long-name="CLF Wrapper Build" introduced="^2">
+<unit bldFile="mw/mds/clfwrapper/group"/>
+</component>
+</collection>
+<collection name="mds_info" long-name="Metadata Services Info" level="int">
+<component name="mds_build" filter="s60" long-name="Metadata Services Build" introduced="^2">
+<!-- consider distributiing this into the rest of the components in the package -->
+<unit bldFile="mw/mds/group"/>
+</component>
+</collection>
+</block>
+<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"/>
+</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"/>
+</component>
+</collection>
+<collection name="videoscheduler" long-name="Video Scheduler" level="util">
+<!-- don't build these -->
+<component name="schedulerclient" filter="s60" long-name="Video Scheduler Client"/>
+<component name="schedulerserver" filter="s60" long-name="Video Scheduler Server"/>
+</collection>
+</block>
+<block name="mmmw" level="generic" long-name="Multimedia Middleware" levels="plugin framework server generic specific">
+<collection name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" level="specific">
+<component name="multimedia_data_source_api" long-name="Multimedia Data Source API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
+</component>
+<component name="enhanced_media_client_api" long-name="Enhanced Media Client API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/group" filter="!test"/>
+</component>
+<component name="stream_control_custom_command_api" long-name="Stream Control Custom Command API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
+</component>
+<component name="emc_buffer_source_api" long-name="EMC Buffer Source API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/emc_buffer_source_api/group"/>
+</component>
+<component name="emc_file_source_api" long-name="EMC File Source API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
+</component>
+<component name="audio_metadata_reader_api" long-name="Audio MetaData Reader API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/group" filter="!test"/>
+</component>
+<component name="emc_volume_effect_api" long-name="EMC Volume Effect API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
+</component>
+<component name="emc_balance_effect_api" long-name="EMC Balance Effect API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/emc_balance_effect_api/group"/>
+</component>
+<component name="emc_descriptor_source_api" long-name="EMC Descriptor Source API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/emc_descriptor_source_api/group"/>
+</component>
+<component name="emc_drm_config_intfc_api" long-name="EMC DRM Config Intfc API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
+</component>
+<component name="voip_audio_services_api" long-name="VoIP Audio Services" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/group" filter="!test"/>
+</component>
+<component name="configuration_components_factory_api" long-name="Configuration Components Factory API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
+</component>
+<component name="audio_output_control_utility_api" long-name="Audio Output Control Utility API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/group" filter="!test"/>
+</component>
+<component name="audio_output_control_utility_proxy_api" long-name="Audio Output Control Utility Proxy API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
+</component>
+<component name="emc_audio_effects_api" long-name="EMC Audio Effects API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
+</component>
+<component name="call_audio_control_api" long-name="Call AudioControl API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/group" filter="!test"/>
+</component>
+<component name="radio_utilities_api" long-name="Radio Utilities API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/group" filter="!test"/>
+</component>
+<component name="radio_preset_utilities_api" long-name="Radio Preset Utilities API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
+</component>
+<component name="radio_monitor_api" long-name="Radio Monitor API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
+</component>
+<component name="thumbnail_engine_api" long-name="Thumbnail Engine API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/thumbnail_engine_api/group" filter="!test"/>
+</component>
+<component name="telephony_multimedia_service_api" long-name="Telephony Multimedia Service API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
+</component>
+<component name="openmax_al_api" long-name="OpenMAX AL API" filter="s60" introduced="^4" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/openmax_al_api/group" filter="!test"/>
+</component>
+<component name="openmax_al_ext_api" long-name="OpenMAX AL Extensions API" filter="s60" introduced="^4" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/openmax_al_ext_api/group"/>
+</component>
+<component name="system_tone_service_api" long-name="System Tone Service API" filter="s60" introduced="^4" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/system_tone_service_api/group"/>
+</component>
+</collection>
+<collection name="khronosfws" long-name="Khronos Frameworks" level="framework">
+<component name="openmax_al" filter="s60" long-name="OpenMAX AL" introduced="^4">
+<unit bldFile="mw/mmmw/khronosfws/openmax_al/group"/>
+</component>
+</collection>
+<collection name="mmfenh" long-name="MMF Enhancements" level="generic">
+<component name="advancedaudiocontroller" filter="s60" long-name="Advanced Audio Controllers" plugin="Y">
+<unit bldFile="mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
+</component>
+<component name="audiooutputcontrolutility" filter="s60" long-name="Audio Output Control Utility">
+<unit bldFile="mw/mmmw/mmfenh/audiooutputcontrolutility/group"/>
+</component>
+<component name="configurationcomponentsfactory" filter="s60" long-name="Configuration Components Factory">
+<unit bldFile="mw/mmmw/mmfenh/configurationcomponentsfactory/group"/>
+</component>
+<component name="enhancedaudioplayerutility" filter="s60" long-name="Enhanced Audio Player Utility">
+<unit bldFile="mw/mmmw/mmfenh/enhancedaudioplayerutility/group"/>
+</component>
+<component name="enhancedmediaclient" filter="s60" long-name="Enhanced Media Client">
+<unit bldFile="mw/mmmw/mmfenh/enhancedmediaclient/group"/>
+</component>
+<component name="profilesettingsmonitor" filter="s60" long-name="Profile Settings Monitor">
+<unit bldFile="mw/mmmw/mmfenh/profilesettingsmonitor/group"/>
+</component>
+<component name="mmfenh_test" filter="s60,test,module_test,pref_test" long-name="MMF Enhancements Tests" purpose="development"/>
+</collection>
+<collection name="mmserv" long-name="Multimedia Services" level="specific">
+<component name="callaudiocontrol" filter="s60" long-name="Call Audio Control">
+<unit bldFile="mw/mmmw/mmserv/callaudiocontrol/group"/>
+</component>
+<component name="metadatautility" filter="s60" long-name="Metadata Utility">
+<unit bldFile="mw/mmmw/mmserv/metadatautility/group"/>
+</component>
+<component name="radioutility" filter="s60" long-name="Radio Utility">
+<unit bldFile="mw/mmmw/mmserv/radioutility/group"/>
+</component>
+<component name="thumbnailengine" filter="s60" long-name="Thumbnail Engine" introduced="^2">
+<unit bldFile="mw/mmmw/mmserv/thumbnailengine/group"/>
+</component>
+<component name="tms" filter="s60" long-name="Telephony Multimedia Service" introduced="^3">
+<unit bldFile="mw/mmmw/mmserv/tms/group"/>
+</component>
+<component name="voipaudioservices" filter="s60" long-name="VoIP Audio Services">
+<unit bldFile="mw/mmmw/mmserv/voipaudioservices/group"/>
+</component>
+<component name="lib3gpextparser" filter="s60" long-name="3GP Extension Metadata Parser Library">
+<unit bldFile="mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group"/>
+</component>
+<component name="sts" long-name="System Tone Service" filter="s60" introduced="^4">
+<unit bldFile="mw/mmmw/mmserv/sts/group"/>
+</component>
+</collection>
+<collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
+<component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="gstreamer" level="generic" long-name="GStreamer" levels="plugin core api">
+<!-- Uncomment all units when configuration is in place. All currently #included from gstreamer_build -->
+<!-- structure matches planned directory layout -->
+<collection name="gstreamerfw" long-name="GStreamer Framework" level="core">
+<component name="gstreamer_core" long-name="GStreamer Core" introduced="^3" class="placeholder">
+<!--<unit bldFile="gstreamer_core/group"/>-->
+</component>
+</collection>
+<collection name="gst_plugins" long-name="GStreamer Plugins" level="plugin">
+<component name="gst_plugins_base" long-name="GStreamer Base Plugins" introduced="^3" class="placeholder">
+<!--<unit bldFile="gst_plugins_base/group"/>-->
+</component>
+<component name="gst_plugins_good" long-name="GStreamer Good Plugins" introduced="^3" class="placeholder">
+<!--<unit bldFile="gst_plugins_good/group"/>-->
+</component>
+<component name="gst_plugins_symbian" filter="s60" long-name="GStreamer Sybmian Plugins" introduced="^3" class="placeholder">
+<!--<unit bldFile="gst_plugins_symbian/group" filter="!test"/>-->
+<!-- add ,pref_test,TA_GSTREAMER filters later -->
+</component>
+</collection>
+<collection name="gstregistrygenerator" long-name="GStreamer Registry Generator" level="core">
+<!-- collection is really a component. Move down an directory -->
+<component name="gstregistrygenerator_build" filter="s60" long-name="GStreamer Registry Generator Build" introduced="^3" class="placeholder">
+<!-- <unit bldFile="gstregistrygenerator/group"/>-->
+</component>
+</collection>
+<collection name="gst_test_apps" long-name="GStreamer Test Applications" level="api">
+<component name="gst_player" filter="s60" long-name="GStreamer Player" introduced="^3" purpose="development" class="placeholder">
+<!-- <unit bldFile="gst_test_apps/gst_player/group"/>-->
+</component>
+</collection>
+<collection name="gstreamer_info" long-name="GStreamer Info" level="api">
+<component name="gstreamer_build" filter="s60" long-name="GStreamer Build" introduced="^3">
+<!-- make this a ROM component or split up instead? -->
+<unit bldFile="mw/gstreamer/group"/>
+</component>
+</collection>
+</block>
+<block name="helix" level="generic" long-name="Helix" levels="plugin framework server generic specific">
+<collection name="helix_ren" long-name="Helix Engine" level="framework">
+<!-- what does "ren" stand for? -->
+<component name="helix_stub" filter="s60" long-name="Helix Stub" introduced="^2" class="api">
+<unit bldFile="mw/helix/helix_ren/helix_stub/group"/>
+</component>
+</collection>
+</block>
+<block name="camerasrv" level="specific" long-name="Camera Services" levels="plugin fw api">
+<collection name="camerasrv_plat" long-name="Camera Services Platform Interfaces" level="api">
+<component name="media_recorder_sink_api" long-name="Media Recorder Sink API" filter="s60" class="api">
+<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
+</component>
+<component name="custom_onboard_camera_api" long-name="Custom Onboard Camera API" filter="s60" class="api">
+<unit bldFile="mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
+</component>
+<component name="imaging_configuration_manager_api" long-name="Imaging Configuration Manager API" filter="s60" class="api">
+<unit bldFile="mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
+</component>
+<component name="media_recorder_api" long-name="Media Recorder API" filter="s60" class="api">
+<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_api/group" filter="!test"/>
+</component>
+<component name="3gp_file_composer_api" long-name="3GP File Composer API" filter="s60" class="api">
+<unit bldFile="mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
+</component>
+</collection>
+<collection name="camcordermmfplugin" long-name="Camcorder MMF Plugin" level="plugin">
+<!-- collection is really a component. Should move down a directory -->
+<component name="camcordermmfplugin_build" filter="s60" long-name="Camcorder MMF Plugin Build" plugin="Y">
+<unit bldFile="mw/camerasrv/camcordermmfplugin/build"/>
+</component>
+</collection>
+<collection name="configmanagers" long-name="Config Managers" level="api">
+<component name="imagingconfigmanager" filter="s60" long-name="Imaging Config Manager">
+<unit bldFile="mw/camerasrv/configmanagers/imagingconfigmanager/group"/>
+</component>
+</collection>
+<collection name="camerasrv_info" long-name="Camera Services Info" level="api">
+<component name="camerasrv_build" filter="s60" long-name="Camera Services Build">
+<!-- should split into individual bld.infs -->
+<unit bldFile="mw/camerasrv/group"/>
+</component>
+</collection>
+</block>
+<block name="mmappfw" level="specific" long-name="Multimedia App Framework" levels="fw utils if">
+<collection name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" level="if">
+<component name="collection_helper_api" long-name="Collection Helper API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
+</component>
+<component name="harvester_collection_mediator_api" long-name="Harvester Collection Mediator API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/group"/>
+</component>
+<component name="harvester_metadata_extractor_api" long-name="Harvester Metadata Extractor API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/group"/>
+</component>
+<component name="harvester_server_api" long-name="Harvester Server API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_server_api/group"/>
+</component>
+<component name="harvester_utility_api" long-name="Harvester Utility API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_utility_api/group"/>
+</component>
+<component name="playlist_engine_api" long-name="Playlist Engine API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/playlist_engine_api/group"/>
+</component>
+<component name="mtp_keys_api" long-name="MTP Keys API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/mtp_keys_api/group"/>
+</component>
+<component name="mpx_collection_common_definition_api" long-name="MPX Collection Common Definition API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_common_definition_api/group"/>
+</component>
+<component name="mpx_collection_utility_api" long-name="MPX Collection Utility API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/group"/>
+</component>
+<component name="mpx_common_api" long-name="MPX Common API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_api/group"/>
+</component>
+<component name="mpx_common_definition_api" long-name="MPX Common Definition API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_definition_api/group"/>
+</component>
+<component name="mpx_playback_common_definition_api" long-name="MPX Playback Common Definition API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_common_definition_api/group"/>
+</component>
+<component name="mpx_playback_utility_api" long-name="MPX Playback Utility API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/group"/>
+</component>
+<component name="mpx_base_view_plugins_api" long-name="MPX Base View Plugins API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/group"/>
+</component>
+<component name="mpx_view_utility_api" long-name="MPX View Utility API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_view_utility_api/group"/>
+</component>
+<component name="mpx_albumart_utility_api" long-name="MPX Album Art Utility API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/group"/>
+</component>
+<component name="media_player_settings_engine_api" long-name="Media Player Settings Engine API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
+</component>
+<component name="mpx_backstepping_utility_api" long-name="MPX Backstepping Utility API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_backstepping_utility_api/group"/>
+</component>
+<component name="asx_parser_api" long-name="ASX Parser API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/asx_parser_api/group"/>
+</component>
+<component name="playback_helper_api" long-name="Playback Helper API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/playback_helper_api/group"/>
+</component>
+<component name="videoplaylist_utility_api" long-name="Video Playlist Utility API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/videoplaylist_utility_api/group"/>
+</component>
+<component name="qt_telephony_multimedia_service_api" long-name="Qt Telephony Multimedia Service API" introduced="^4" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/qt_telephony_multimedia_service_api/group"/>
+</component>
+</collection>
+<collection name="mpx" long-name="Multimedia Player" level="fw">
+<component name="commonframework" filter="s60" long-name="MPX Common Framework" introduced="^1">
+<unit bldFile="mw/mmappfw/mpx/commonframework/group"/>
+</component>
+<component name="playbackframework" filter="s60" long-name="MPX Playback Framework" introduced="^1">
+<unit bldFile="mw/mmappfw/mpx/playbackframework/group"/>
+</component>
+<component name="mpxcollectionfw" filter="s60" long-name="MPX Collection Framework" introduced="^1">
+<unit bldFile="mw/mmappfw/mpx/collectionframework/group"/>
+</component>
+<component name="mpxviewfw" filter="s60" long-name="MPX View Framework" introduced="^1">
+<unit bldFile="mw/mmappfw/mpx/viewframework/group"/>
+</component>
+<component name="mpxviewframeworkqt" long-name="MPX View Framework Qt" filter="s60" introduced="^4">
+<unit bldFile="mw/mmappfw/mpx/mpxviewframeworkqt" proFile="mpxviewframeworkqt.pro" qmakeArgs="-r -config rom"/>
+</component>
+<component name="mpx_build" filter="s60" long-name="MPX Build" introduced="^1">
+<!-- Move the export to another component or remove the #includes from this one -->
+<unit bldFile="mw/mmappfw/mpx/group"/>
+</component>
+</collection>
+<collection name="mmappcomponents" long-name="Multimedia App Components" level="utils">
+<component name="mmappcomponents_build" filter="s60" long-name="Multimedia App Components Build" introduced="^1">
+<!-- needed for #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
+ Can remove this once configuration is in place-->
+<unit bldFile="mw/mmappfw/mmappcomponents/group"/>
+</component>
+<component name="collectionhelper" filter="s60" long-name="Media Player Collection Helper" introduced="^1">
+<unit bldFile="mw/mmappfw/mmappcomponents/collectionhelper/group"/>
+</component>
+<component name="playlistengine" filter="s60" long-name="Playlist Engine" introduced="^1">
+<unit bldFile="mw/mmappfw/mmappcomponents/playlistengine/group"/>
+</component>
+<component name="mpxharvester" filter="s60" long-name="Media Player Harvester" introduced="^1">
+<unit bldFile="mw/mmappfw/mmappcomponents/harvester/group"/>
+</component>
+<component name="mmappcommonui" filter="s60" long-name="Multimedia App Common UI" introduced="^1">
+<unit bldFile="mw/mmappfw/mmappcomponents/mmappcommonui/group"/>
+</component>
+<component name="mediaplayersettingsengine" filter="s60" long-name="Media Player Settings Engine" introduced="^1">
+<unit bldFile="mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
+</component>
+<component name="audiofetcher" filter="s60" long-name="Audio Fetcher" introduced="^1" plugin="Y">
+<unit bldFile="mw/mmappfw/mmappcomponents/audiofetcher/group"/>
+</component>
+<component name="asxparser" filter="s60" long-name="ASX Parser" introduced="^1">
+<unit bldFile="mw/mmappfw/mmappcomponents/asxparser/group"/>
+</component>
+<component name="playbackhelper" filter="s60" long-name="Playback Helper" introduced="^3">
+<unit bldFile="mw/mmappfw/mmappcomponents/playbackhelper/group"/>
+</component>
+<component name="videoplaylistutility" filter="s60" long-name="Video Playlist Utility" introduced="^3">
+<unit bldFile="mw/mmappfw/mmappcomponents/videoplaylistutility/group"/>
+</component>
+<component name="mmmtpdataprovider" filter="s60" long-name="Multimedia MTP Data Provider" introduced="^3">
+<unit bldFile="mw/mmappfw/mmappcomponents/mmmtpdataprovider/group"/>
+</component>
+</collection>
+<collection name="qtms" long-name="Qt Telephony Multimedia Services" level="fw">
+<component name="qtms_build" filter="s60" long-name="Qt Telephony Multimedia Services Build" introduced="^4">
+<!-- Collection is really a component. Move down a dir -->
+<unit bldFile="mw/mmappfw/qtms" proFile="qtmsapi.pro" qmakeArgs="-r -config rom"/>
+</component>
+</collection>
+<collection name="mmappfw_info" long-name="Multimedia App Framework Info" level="if">
+<component name="mmappfw_build" filter="s60" long-name="Multimedia App Framework Build" introduced="^1">
+<!-- Move the export to another component or remove the #includes from this one -->
+<unit bldFile="mw/mmappfw/group"/>
+</component>
+<component name="mmappfw_test" filter="s60,test,api_test,pref_test" long-name="Multimedia App Framework Test" purpose="development" introduced="^1"/>
+</collection>
+</block>
+<block name="hgwidgets" level="specific" long-name="Multimedia Widgets" levels="framework service api">
+<collection name="hgwidgets_plat" long-name="Multimedia Widgets Platform Interfaces" level="api">
+<component name="ganeswidgets_api" long-name="Ganes Widgets API" introduced="^4" class="api placeholder">
+<!-- should separate out unit -->
+</component>
+<component name="hgcacheproxymodel_api" long-name="Hg Cache Proxy Model API" introduced="^4" class="api placeholder">
+<!-- should separate out unit -->
+</component>
+<component name="hgwidgets_plat_build" long-name="Multimedia Widgets Platform Interfaces Build" introduced="^4" class="api">
+<!-- break this up into separate components -->
+<unit bldFile="mw/hgwidgets/hgwidgets_plat" proFile="hgwidgets_plat.pro"/>
+</component>
+</collection>
+<collection name="ganeswidgets" long-name="Ganes Widgets" level="service">
+<!-- really a component, should move down a dir level and have a unit -->
+<component name="ganeswidgets_build" long-name="Ganes Widgets Build" introduced="^4" filter="build_as_app">
+<unit bldFile="mw/hgwidgets/ganeswidgets" proFile="ganeswidgets.pro"/>
+</component>
+</collection>
+<collection name="hgcacheproxymodel" long-name="Hurriganes Cache Proxy Model" level="framework">
+<!-- really a component, should move down a dir level and have a unit -->
+<component name="hgcacheproxymodel_build" long-name="Hurriganes Cache Proxy Model Build" introduced="^4">
+<unit bldFile="mw/hgwidgets/hgcacheproxymodel" proFile="hgcacheproxymodel.pro"/>
+</component>
+</collection>
+</block>
+<block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework api">
+<collection name="inputmethods_pub" long-name="Input Methods Public Interfaces" level="api">
+<component name="optical_character_recognition_api" long-name="Optical Character Recognition API" filter="s60" class="api">
+<unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
+</component>
+<component name="input_language_info_api" long-name="Input Language Info API" filter="s60" class="api">
+<unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
+</component>
+</collection>
+<collection name="inputmethods_plat" long-name="Input Methods Platform Interfaces" level="api">
+<component name="pen_input_server_api" long-name="Pen Input Server API" filter="s60" class="api">
+<unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/group"/>
+</component>
+<component name="ptiengine_hwr_api" long-name="PTI Engine Handwriting Recognition API" filter="s60" class="api">
+<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group"/>
+</component>
+<component name="aknfep_settings_api" long-name="Avkon FEP Settings API" filter="s60" class="api">
+<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
+</component>
+<component name="aknfep_status_api" long-name="Avkon FEP Status API" filter="s60" class="api">
+<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
+</component>
+<component name="aknfep_definitions_api" long-name="Avkon FEP Definitions API" filter="s60" class="api">
+<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
+</component>
+<component name="aknfep_pen_support_api" long-name="Avkon FEP Pen Support API" filter="s60" class="api">
+<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
+</component>
+<component name="ptiengine_indic_definitions_api" long-name="PTI Engine Indic Definitions API" filter="s60" class="api">
+<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
+</component>
+<component name="aknfep_uiinterface_api" long-name="Avkon FEP UI Interface API" filter="s60" class="api">
+<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group"/>
+</component>
+</collection>
+<collection name="textinput" long-name="Text Input" level="framework">
+<component name="ptienginev2" filter="s60" long-name="Predictive Text Input Engine">
+<unit bldFile="mw/inputmethods/textinput/ptienginev2/group"/>
+</component>
+<component name="akninputlanguage" filter="s60" long-name="Avkon Input Language">
+<unit bldFile="mw/inputmethods/textinput/akninputlanguage/group"/>
+</component>
+<component name="peninputarc" filter="s60" long-name="Pen Input Arc">
+<unit bldFile="mw/inputmethods/textinput/peninputarc/group"/>
+</component>
+</collection>
+<collection name="fep" long-name="FEP" level="engine">
+<component name="aknfep" filter="s60" long-name="Avkon FEP" plugin="Y">
+<unit bldFile="mw/inputmethods/fepstub/group"/>
+</component>
+<component name="frontendprocessor" long-name="Front End Processor" purpose="mandatory">
+<unit bldFile="mw/inputmethods/fep/frontendprocessor/group" mrp="mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
+</component>
+</collection>
+<collection name="inputmethods_info" long-name="Input Methods Info" level="api">
+<component name="inputmethods_metadata" long-name="Input Methods Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="qt" level="generic" long-name="Qt" levels="tool mw app">
+<collection name="qtconf" long-name="Qt Config" level="tool">
+<component name="qt_deviceconfiguration" long-name="Qt Device Configuration" filter="qt_tools" introduced="^2" class="config tool">
+<unit bldFile="mw/qt/src/s60installs/deviceconfiguration"/>
+</component>
+</collection>
+<collection name="qt_info" long-name="Qt Info" level="mw">
+<component name="qt_build" long-name="Qt Build" introduced="^2">
+<unit bldFile="mw/qt" proFile="projects.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/moc.exe" "QMAKE_RCC=/epoc32/tools/rcc.exe" "QMAKE_UIC=/epoc32/tools/uic.exe" -r"/>
+</component>
+</collection>
+<collection name="qtdemos" long-name="Qt Demos" level="app"/>
+<collection name="qtexamples" long-name="Qt Examples" level="app"/>
+<collection name="qt_tests" long-name="Qt Tests" level="app"/>
+</block>
+<block name="qtextensions" level="generic" long-name="Qt Extensions" levels="tool mw app">
+<collection name="qtecomplugins" long-name="Qt ECom Plugins" level="app">
+<component name="qtecomplugins_build" filter="qtecomplugins" long-name="Qt ECom Plugin" purpose="development" introduced="^4" plugin="Y">
+<unit bldFile="mw/qtextensions/qtecomplugins" proFile="qtecomplugins.pro" qmakeArgs="-r"/>
+</component>
+<component name="qtextensions_examples" filter="qtextensionsexamples,build_as_app" long-name="Qt ECom Plugin Examples" purpose="development" introduced="^4">
+<unit bldFile="mw/qtextensions/qtecomplugins/examples" proFile="examples.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+<collection name="qthighway" long-name="Qt Highway" level="app">
+<component name="qthighway_build" filter="qthighway" long-name="Qt Highway" purpose="development" introduced="^4">
+<unit bldFile="mw/qtextensions/qthighway" proFile="qthighway.pro" qmakeArgs="-r"/>
+</component>
+<component name="qthighway_examples" filter="qtextensionsexamples,build_as_app" long-name="Qt Highway Examples" purpose="development" introduced="^4">
+<unit bldFile="mw/qtextensions/qthighway/examples" proFile="examples.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+<collection name="qtmobileextensions" long-name="Qt Mobile Extensions" level="app">
+<component name="qtmobileextensions_build" filter="qtextension" long-name="Qt Mobile Extensions" purpose="development" introduced="^4">
+<unit bldFile="mw/qtextensions/qtmobileextensions" proFile="qtmobileextensions.pro" qmakeArgs="-r"/>
+</component>
+<component name="qtmobileextensions_examples" filter="qtextensionsexamples,build_as_app" long-name="Qt Mobile Extensions Examples" purpose="development" introduced="^4">
+<unit bldFile="mw/qtextensions/qtmobileextensions/examples" proFile="examples.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+<collection name="qtmobility" long-name="Qt Mobility" level="mw">
+<component name="qtmobility_build" filter="qtmobility" long-name="Qt Mobility" purpose="development" introduced="^4">
+<unit bldFile="mw/qtextensions/qtmobility" proFile="qtmobility.pro" qmakeArgs="-r"/>
+</component>
+<component name="qtmobility_examples" filter="qtextensionsexamples,build_as_app" long-name="Qt Mobility Examples" purpose="development" introduced="^4">
+<unit bldFile="mw/qtextensions/qtmobility/examples" proFile="examples.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+<collection name="qhbstyle" level="mw" long-name="Qt Orbit Style">
+<component name="qhbstyle_build" long-name="Qt Orbit Style Build" introduced="^4">
+<unit bldFile="mw/qtextensions/qhbstyle" qmakeArgs="-r" proFile="qhbstyle.pro"/>
+</component>
+</collection>
+<collection name="qtextensions_info" long-name="Qt Extensions Info" level="app">
+<component name="qtextensions_conf" long-name="Qt Extensions Confgure" introduced="^4" filter="qt_tools" class="config">
+<unit bldFile="mw/qtextensions/group"/>
+</component>
+<component name="qtextensions_build" long-name="Qt Extensions Build" introduced="^4">
+<!-- break this up into the above collections-->
+<unit bldFile="mw/qtextensions" proFile="qtextensions.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+</block>
+<block name="hb" level="generic" long-name="Orbit" levels="engine test api">
+<collection name="hb_info" long-name="Orbit Info" level="api">
+<component name="hb_build" long-name="Orbit Build" introduced="^4">
+<!-- should break this down into actual components -->
+<unit bldFile="mw/hb" proFile="hb.pro" qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
+</component>
+</collection>
+</block>
+<block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
+<collection name="classicui_plat" long-name="Classic UI Platform Interfaces" level="specific">
+<component name="signal_pane_api" long-name="Signal Pane API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
+</component>
+<component name="japanese_reading_api" long-name="Japanese Reading API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/japanese_reading_api/group" filter="!test"/>
+</component>
+<component name="global_popup_priority_controller_api" long-name="Global Popup Priority Controller API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
+</component>
+<component name="item_finder_api" long-name="Item Finder API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/item_finder_api/group" filter="!test"/>
+</component>
+<component name="avkon_fonts_api" long-name="Avkon Fonts API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/avkon_fonts_api/group" filter="!test"/>
+</component>
+<component name="extended_utilities_api" long-name="Extended Utilities API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
+</component>
+<component name="extended_aiw_criteria_api" long-name="Extended AIW Criteria API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
+</component>
+<component name="volume_popup_api" long-name="Volume Popup API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
+</component>
+<component name="avkon_secondary_display_support_api" long-name="AVKON Secondary Display Support API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_support_api/group" filter="!test"/>
+</component>
+<component name="extended_setting_pages_api" long-name="Extended Setting Pages API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_setting_pages_api/group" filter="!test"/>
+</component>
+<component name="extended_lists_api" long-name="Extended Lists API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_lists_api/group" filter="!test"/>
+</component>
+<component name="input_block_api" long-name="Input Block API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/input_block_api/group" filter="!test"/>
+</component>
+<component name="avkon_ui_server_api" long-name="AVKON UI Server API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/avkon_ui_server_api/group" filter="!test"/>
+</component>
+<component name="number_grouping_api" long-name="Number Grouping API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/number_grouping_api/group" filter="!test"/>
+</component>
+<component name="extended_status_pane_api" long-name="Extended Status Pane API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_status_pane_api/group" filter="!test"/>
+</component>
+<component name="extended_notifiers_api" long-name="Extended Notifiers API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_notifiers_api/group" filter="!test"/>
+</component>
+<component name="task_list_api" long-name="Task List API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
+</component>
+<component name="key_event_utilities_api" long-name="Key Event Utilities API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/key_event_utilities_api/group"/>
+</component>
+<component name="emergency_call_support_api" long-name="Emergency Call Support API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/emergency_call_support_api/group" filter="!test"/>
+</component>
+<component name="extended_dialogs_api" long-name="Extended Dialogs API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_dialogs_api/group"/>
+</component>
+<component name="legacy_ui_framework_headers_api" long-name="Legacy UI Framework Headers API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/legacy_ui_framework_headers_api/group"/>
+</component>
+<component name="extended_editors_api" long-name="Extended Editors API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_editors_api/group" filter="!test"/>
+</component>
+<component name="alarm_api" long-name="Alarm API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/alarm_api/group" filter="!test"/>
+</component>
+<component name="aiw_service_interface_base_api" long-name="AIW Service Interface Base API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_base_api/group" filter="!test"/>
+</component>
+<component name="list_effects_api" long-name="List Effects API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/list_effects_api/group" filter="!test"/>
+</component>
+<component name="find_item_ui_api" long-name="Find Item UI API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/find_item_ui_api/group" filter="!test"/>
+</component>
+<component name="server_application_services_api" long-name="Server Application Services API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/server_application_services_api/group" filter="!test"/>
+</component>
+<component name="common_ui_settings_api" long-name="Common UI Settings API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/common_ui_settings_api/group"/>
+</component>
+<component name="aiw_service_interface_menu_api" long-name="AIW Service Interface Menu API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_menu_api/group" filter="!test"/>
+</component>
+<component name="eikon_server_extension_client_api" long-name="EIKON Server Extension Client API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/eikon_server_extension_client_api/group" filter="!test"/>
+</component>
+<component name="skinnable_clock_api" long-name="Skinnable Clock API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/skinnable_clock_api/group" filter="!test"/>
+</component>
+<component name="battery_pane_api" long-name="Battery Pane API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/battery_pane_api/group" filter="!test"/>
+</component>
+<component name="fep_document_navigation_api" long-name="FEP Document Navigation API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
+</component>
+<component name="memory_card_ui_api" long-name="Memory Card UI API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
+</component>
+<component name="avkon_status_api" long-name="AVKON Status API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/avkon_status_api/group"/>
+</component>
+<component name="application_switching_api" long-name="Application Switching API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/application_switching_api/group" filter="!test"/>
+</component>
+<component name="avkon_localised_texts_api" long-name="AVKON Localised Texts API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/avkon_localised_texts_api/group"/>
+</component>
+<component name="avkon_secondary_display_api" long-name="AVKON Secondary Display API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_api/group"/>
+</component>
+<component name="extended_animation_api" long-name="Extended Animation API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_animation_api/group" filter="!test"/>
+</component>
+<component name="extended_notes_api" long-name="Extended Notes API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_notes_api/group" filter="!test"/>
+</component>
+<component name="text_scroller_api" long-name="Text Scroller API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/text_scroller_api/group" filter="!test"/>
+</component>
+<component name="custom_cursors_api" long-name="Custom Cursors API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/custom_cursors_api/group" filter="!test"/>
+</component>
+<component name="global_window_priorities_api" long-name="Global Window Priorities API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/global_window_priorities_api/group"/>
+</component>
+<component name="extended_indicators_api" long-name="Extended Indicators API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_indicators_api/group" filter="!test"/>
+</component>
+<component name="special_character_table_api" long-name="Special Character Table API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/special_character_table_api/group" filter="!test"/>
+</component>
+<component name="avkon_settings_api" long-name="AVKON Settings API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/avkon_settings_api/group"/>
+</component>
+<component name="extended_sounds_api" long-name="Extended Sounds API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_sounds_api/group"/>
+</component>
+<component name="themes_settings_api" long-name="Themes Settings API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/themes_settings_api/group"/>
+</component>
+<component name="media_shared_document_api" long-name="Media Shared Document API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/media_shared_document_api/group" filter="!test"/>
+</component>
+<component name="extended_queries_api" long-name="Extended Queries API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_queries_api/group"/>
+</component>
+<component name="phone_number_text_utilities_api" long-name="Phone Number Text Utilities API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
+</component>
+<component name="extended_scroller_api" long-name="Extended Scroller API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_scroller_api/group"/>
+</component>
+<component name="key_rotator_api" long-name="Key Rotator API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/key_rotator_api/group" filter="!test"/>
+</component>
+<component name="extended_grids_api" long-name="Extended Grids API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_grids_api/group" filter="!test"/>
+</component>
+<component name="generic_parameter_api" long-name="Generic Parameter API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/generic_parameter_api/group" filter="!test"/>
+</component>
+<component name="indicator_touch_observer_api" long-name="Indicator Touch Observer API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/indicator_touch_observer_api/group"/>
+</component>
+<component name="popup_form_api" long-name="Popup Form API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/popup_form_api/group" filter="!test"/>
+</component>
+<component name="stylus_activated_popup_api" long-name="Stylus Activated Pop-up API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/stylus_activated_popup_api/group" filter="!test"/>
+</component>
+<component name="indicator_plugin_api" long-name="Indicator Plugin API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/indicator_plugin_api/group" filter="!test"/>
+</component>
+<component name="layout_configuration_api" long-name="Layout Configuration API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/layout_configuration_api/group" filter="!test"/>
+</component>
+<component name="common_file_dialogs_filter_factory_api" long-name="Common File Dialogs Filter Factory API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group"/>
+</component>
+<component name="avkon_anim_dll_api" long-name="AVKON Anim DLL API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/avkon_anim_dll_api/group"/>
+</component>
+<component name="extended_initialization_api" long-name="Extended Initialization API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_initialization_api/group" filter="!test"/>
+</component>
+<component name="long_tap_animation_api" long-name="Long Tap Animation API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/long_tap_animation_api/group" filter="!test"/>
+</component>
+<component name="extended_ui_framework_definitions_api" long-name="Extended UI Framework Definitions API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_ui_framework_definitions_api/group"/>
+</component>
+<component name="extended_buttons_api" long-name="Extended Buttons API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_buttons_api/group" filter="!test"/>
+</component>
+<component name="aiw_provider_utility_api" long-name="AIW Provider Utility API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/aiw_provider_utility_api/group" filter="!test"/>
+</component>
+<component name="transition_effect_parameters_api" long-name="Transition Effect Parameters API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/transition_effect_parameters_api/group" filter="!test"/>
+</component>
+<component name="extended_input_capabilities_api" long-name="Extended Input Capabilities API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_input_capabilities_api/group" filter="!test"/>
+</component>
+<component name="uikon_status_api" long-name="UIKON Status API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/uikon_status_api/group"/>
+</component>
+<component name="transition_effect_utilities_api" long-name="Transition Effect Utilities API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/transition_effect_utilities_api/group" filter="!test"/>
+</component>
+<component name="pointer_event_modifier_api" long-name="Pointer Event Modifier API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/pointer_event_modifier_api/group" filter="!test"/>
+</component>
+<component name="avkon_testability_api" long-name="AVKON Testability API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/avkon_testability_api/group"/>
+</component>
+<component name="ganes_api" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/ganes_api/group"/>
+</component>
+<component name="ode_api" long-name="Ode API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/ode_api/group"/>
+</component>
+<component name="physics_api" long-name="Physics API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/physics_api/group"/>
+</component>
+<component name="touch_pane_api" long-name="Touch Pane API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/touch_pane_api/group" filter="!test"/>
+</component>
+<component name="touch_pane_observer_api" long-name="Touch Pane Observer API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/touch_pane_observer_api/group"/>
+</component>
+<component name="alternate_fs_api" long-name="Alternate FS API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/alternate_fs_api/group"/>
+</component>
+<component name="discreet_popup_api" long-name="Discreet Popup API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/discreet_popup_api/group"/>
+</component>
+<component name="touch_gesture_framework_api" long-name="Touch Gesture Framework API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/touch_gesture_framework_api/group"/>
+<!-- should this be commented out? -->
+<!--<unit bldFile="classicui_plat/touch_gesture_framework_api/tsrc/group" filter="test,api_test"/> -->
+</component>
+<component name="extended_options_menu_api" long-name="Extended Options Menu API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
+</component>
+<component name="directory_localizer_api" long-name="Directory Localizer API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/directory_localizer_api/group"/>
+</component>
+<component name="findutil_api" long-name="Find Util API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/findutil_api/group"/>
+</component>
+</collection>
+<collection name="classicui_pub" long-name="Classic UI Public Interfaces" level="specific">
+<component name="input_frame_api" long-name="Input Frame API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/input_frame_api/group" filter="!test"/>
+</component>
+<component name="window_server_event_observer_api" long-name="Window Server Event Observer API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/window_server_event_observer_api/group" filter="!test"/>
+</component>
+<component name="application_framework_api" long-name="Application Framework API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/application_framework_api/group" filter="!test"/>
+</component>
+<component name="scroller_api" long-name="Scroller API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/scroller_api/group" filter="!test"/>
+</component>
+<component name="ui_framework_utilities_api" long-name="UI Framework Utilities API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/ui_framework_utilities_api/group" filter="!test"/>
+</component>
+<component name="ui_framework_definitions_api" long-name="UI Framework Definitions API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/ui_framework_definitions_api/group" filter="!test"/>
+</component>
+<component name="buttons_api" long-name="Buttons API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/buttons_api/group" filter="!test"/>
+</component>
+<component name="queries_api" long-name="Queries API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/queries_api/group" filter="!test"/>
+</component>
+<component name="aiw_generic_parameter_api" long-name="AIW Generic Parameter API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/aiw_generic_parameter_api/group" filter="!test"/>
+</component>
+<component name="editors_api" long-name="Editors API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/editors_api/group" filter="!test"/>
+</component>
+<component name="common_file_dialogs_api" long-name="Common File Dialogs API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/common_file_dialogs_api/group"/>
+</component>
+<component name="dialog_shutter_api" long-name="Dialog Shutter API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/dialog_shutter_api/group" filter="!test"/>
+</component>
+<component name="fonts_api" long-name="Fonts API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/fonts_api/group" filter="!test"/>
+</component>
+<component name="screen_clearer_api" long-name="Screen Clearer API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/screen_clearer_api/group" filter="!test"/>
+</component>
+<component name="notifiers_api" long-name="Notifiers API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/notifiers_api/group" filter="!test"/>
+</component>
+<component name="notes_api" long-name="Notes API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/notes_api/group" filter="!test"/>
+</component>
+<component name="status_pane_api" long-name="Status Pane API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/status_pane_api/group" filter="!test"/>
+</component>
+<component name="base_controls_api" long-name="Base Controls API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/base_controls_api/group" filter="!test"/>
+</component>
+<component name="grids_api" long-name="Grids API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/grids_api/group" filter="!test"/>
+</component>
+<component name="context_pane_api" long-name="Context Pane API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/context_pane_api/group" filter="!test"/>
+</component>
+<component name="lists_api" long-name="Lists API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/lists_api/group" filter="!test"/>
+</component>
+<component name="popups_api" long-name="Popups API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/popups_api/group" filter="!test"/>
+</component>
+<component name="misc_controls_api" long-name="Misc Controls API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/misc_controls_api/group" filter="!test"/>
+</component>
+<component name="keylock_api" long-name="Keylock API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/keylock_api/group" filter="!test"/>
+</component>
+<component name="options_menu_api" long-name="Options Menu API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/options_menu_api/group" filter="!test"/>
+</component>
+<component name="hierarchical_lists_api" long-name="Hierarchical Lists API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/hierarchical_lists_api/group" filter="!test"/>
+</component>
+<component name="navigation_pane_api" long-name="Navigation Pane API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/navigation_pane_api/group" filter="!test"/>
+</component>
+<component name="tabs_api" long-name="Tabs API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/tabs_api/group" filter="!test"/>
+</component>
+<component name="title_pane_touch_observer_api" long-name="Title Pane Touch Observer API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/title_pane_touch_observer_api/group"/>
+</component>
+<component name="choice_list_api" long-name="Choice List API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/choice_list_api/group" filter="!test"/>
+</component>
+<component name="info_popup_note_api" long-name="Info Popup Note API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/info_popup_note_api/group" filter="!test"/>
+</component>
+<component name="setting_pages_api" long-name="Setting Pages API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/setting_pages_api/group" filter="!test"/>
+</component>
+<component name="screen_mode_api" long-name="Screen Mode API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/screen_mode_api/group" filter="!test"/>
+</component>
+<component name="indicators_api" long-name="Indicators API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/indicators_api/group" filter="!test"/>
+</component>
+<component name="error_ui_api" long-name="Error UI API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/error_ui_api/group" filter="!test"/>
+</component>
+<component name="animation_api" long-name="Animation API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/animation_api/group" filter="!test"/>
+</component>
+<component name="searchfield_api" long-name="Searchfield API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/searchfield_api/group" filter="!test"/>
+</component>
+<component name="labels_api" long-name="Labels API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/labels_api/group" filter="!test"/>
+</component>
+<component name="hotkeys_api" long-name="Hotkeys API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/hotkeys_api/group" filter="!test"/>
+</component>
+<component name="initialization_api" long-name="Initialization API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/initialization_api/group" filter="!test"/>
+</component>
+<component name="volume_control_api" long-name="Volume Control API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/volume_control_api/group" filter="!test"/>
+</component>
+<component name="title_pane_api" long-name="Title Pane API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/title_pane_api/group" filter="!test"/>
+</component>
+<component name="sounds_api" long-name="Sounds API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/sounds_api/group" filter="!test"/>
+</component>
+<component name="aiw_service_handler_api" long-name="AIW Service Handler API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/aiw_service_handler_api/group" filter="!test"/>
+</component>
+<component name="aiw_criteria_api" long-name="AIW Criteria API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/aiw_criteria_api/group" filter="!test"/>
+</component>
+<component name="touch_ui_utilities_api" long-name="Touch UI Utilities API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/touch_ui_utilities_api/group" filter="!test"/>
+</component>
+<component name="generic_button_api" long-name="Generic Button API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/generic_button_api/group" filter="!test"/>
+</component>
+<component name="form_api" long-name="Form API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/form_api/group" filter="!test"/>
+</component>
+<component name="uikon_core_controls" long-name="Uikon Core Controls" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/uikon_core_controls/group" filter="!test"/>
+</component>
+<component name="calendar_api" long-name="Calendar API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/calendar_api/group"/>
+</component>
+<component name="toolbar_api" long-name="Toolbar API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/toolbar_api/group" filter="!test"/>
+</component>
+<component name="server_application_api" long-name="Server Application API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/server_application_api/group"/>
+</component>
+<component name="slider_api" long-name="Slider API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/slider_api/group" filter="!test"/>
+</component>
+<component name="private_ui_framework_api" long-name="Private UI Framework API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/private_ui_framework_api/group" filter="!test"/>
+</component>
+<component name="dialogs_api" long-name="Dialogs API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/dialogs_api/group" filter="!test"/>
+</component>
+<component name="document_handler_api" long-name="Document handler API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/document_handler_api/group"/>
+</component>
+<component name="images_api" long-name="Images API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/images_api/group" filter="!test"/>
+</component>
+<component name="stylus_popup_menu_api" long-name="Stylus Pop-up Menu API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/stylus_popup_menu_api/group" filter="!test"/>
+</component>
+<component name="information_preview_popup_api" long-name="Information Preview Popup API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/information_preview_popup_api/group" filter="!test"/>
+</component>
+<component name="intermediate_state_api" long-name="Intermediate State API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/intermediate_state_api/group"/>
+</component>
+<component name="help_launcher_api" long-name="Help Launcher API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/help_launcher_api/group"/>
+</component>
+</collection>
+<collection name="ode" long-name="Open Dynamics Engine" level="support">
+<!-- the collection is really a component. Move down a directory.-->
+<component name="ode_build" filter="s60" long-name="ODE">
+<unit bldFile="mw/classicui/ode/group"/>
+</component>
+</collection>
+<collection name="uifw" long-name="UI Framework" level="server">
+<component name="uiklaf" filter="s60" long-name="Uikon Look-and-Feel">
+<unit bldFile="mw/classicui/uifw/uiklaf/group"/>
+</component>
+<component name="eikctl" filter="s60" long-name="Eikon Controls">
+<unit bldFile="mw/classicui/uifw/eikctl/group"/>
+</component>
+<component name="avkon" filter="s60" long-name="Avkon">
+<!-- can only have one unit. Split into 3 components, or #include all from same bld.inf -->
+<unit bldFile="mw/classicui/uifw/avkon/aknphysics/group"/>
+<unit bldFile="mw/classicui/uifw/avkon/group"/>
+<unit bldFile="mw/classicui/uifw/avkon/aknconf/group"/>
+</component>
+<component name="eikstd" filter="s60" long-name="Eikon Standard">
+<unit bldFile="mw/classicui/uifw/eikstd/group"/>
+</component>
+<component name="aknglobalui" filter="s60" long-name="Avkon Global UI">
+<unit bldFile="mw/classicui/uifw/aknglobalui/group"/>
+</component>
+<component name="ganes" filter="s60" long-name="Ganes">
+<unit bldFile="mw/classicui/uifw/ganes/group"/>
+</component>
+</collection>
+<collection name="commonuis" long-name="Common UIs" level="specific">
+<component name="commonui" filter="s60" long-name="Common UI">
+<unit bldFile="mw/classicui/commonuis/commonui/group"/>
+</component>
+<component name="commondialogs" filter="s60" long-name="Common Dialogs">
+<unit bldFile="mw/classicui/commonuis/commondialogs/group"/>
+</component>
+</collection>
+<collection name="applicationinterworkingfw" long-name="Application Interworking Framework" level="generic">
+<component name="aifwservicehandler" filter="s60" long-name="Application Interworking Service Handler">
+<unit bldFile="mw/classicui/applicationinterworkingfw/servicehandler/group"/>
+</component>
+</collection>
+<collection name="commonadapter" long-name="Common Adapter" level="support">
+<!-- the collection is really a component. Move down a directory.-->
+<component name="commonadapter_build" filter="s60" long-name="Common Adapter Build">
+<unit bldFile="mw/classicui/commonadapter/group"/>
+</component>
+</collection>
+<collection name="akntouchgesturefw" long-name="Avkon Touch Gesture Framework" level="generic">
+<!-- the collection is really a component. Move down a directory.-->
+<component name="akntouchgesturefw_build" filter="s60" long-name="Avkon Touch Gesture Framework Build" introduced="^3">
+<unit bldFile="mw/classicui/akntouchgesturefw/group"/>
+</component>
+</collection>
+<collection name="uiutils" long-name="UI Utils" level="specific">
+<component name="localizer" filter="s60" long-name="Directory Localizer">
+<unit bldFile="mw/classicui/uiutils/localizer/group"/>
+</component>
+<component name="findutil" filter="s60" long-name="Find Utility">
+<unit bldFile="mw/classicui/uiutils/findutil/group"/>
+</component>
+<component name="gamerecognizer" filter="s60" long-name="Game Recognizer" plugin="Y">
+<unit bldFile="mw/classicui/uiutils/gamerecognizer/group"/>
+</component>
+<component name="aknjapanesereading" filter="s60" long-name="Avkon Japanese Reading">
+<unit bldFile="mw/classicui/uiutils/aknjapanesereading/group"/>
+</component>
+<component name="hlplch" long-name="Help Launcher" filter="s60,bldfirst">
+<unit bldFile="mw/classicui/uiutils/hlplch/group"/>
+</component>
+</collection>
+<collection name="commonuisupport" long-name="Common UI Support" level="support">
+<component name="uikon" long-name="Uikon" introduced="6.0" purpose="mandatory">
+<unit bldFile="mw/classicui/commonuisupport/uikon/group" mrp="mw/classicui/commonuisupport/uikon/group/app-framework_uikon.mrp"/>
+</component>
+<component name="errorresolverdata" long-name="Error Resolver Data" purpose="mandatory">
+<unit bldFile="mw/classicui/commonuisupport/errorresolverdata/group" mrp="mw/classicui/commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
+</component>
+<component name="uilaf" long-name="UI Look and Feel" introduced="6.0" purpose="mandatory">
+<unit bldFile="mw/classicui/commonuisupport/uilaf/GROUP" mrp="mw/classicui/commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
+</component>
+<component name="grid" long-name="Grid" purpose="optional">
+<unit bldFile="mw/classicui/commonuisupport/grid/group" mrp="mw/classicui/commonuisupport/grid/group/app-framework_grid.mrp"/>
+</component>
+<component name="uifwsdocs" long-name="UI Frameworks Documentation" purpose="development" class="doc">
+<unit mrp="mw/classicui/commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
+</component>
+</collection>
+<collection name="lafagnosticuifoundation" long-name="Look-and-Feel Agnostic UI Foundation" level="base">
+<component name="cone" long-name="Control Environment" purpose="mandatory">
+<unit bldFile="mw/classicui/lafagnosticuifoundation/cone/group" mrp="mw/classicui/lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
+</component>
+<component name="graphicseffects" long-name="Graphics Effects" introduced="9.2" purpose="optional">
+<unit bldFile="mw/classicui/lafagnosticuifoundation/graphicseffects/group" mrp="mw/classicui/lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
+</component>
+<component name="uigraphicsutils" long-name="UI Graphics Utilities" purpose="mandatory">
+<unit bldFile="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group" mrp="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
+</component>
+<component name="clockanim" long-name="Clock" purpose="optional" plugin="Y">
+<unit bldFile="mw/classicui/lafagnosticuifoundation/clockanim/group" mrp="mw/classicui/lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
+</component>
+<component name="bmpanimation" long-name="BMP Animation" introduced="6.0" purpose="optional">
+<unit bldFile="mw/classicui/lafagnosticuifoundation/bmpanimation/group" mrp="mw/classicui/lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
+</component>
+<component name="animation" long-name="Animation" introduced="9.1" purpose="optional">
+<unit bldFile="mw/classicui/lafagnosticuifoundation/animation/group" mrp="mw/classicui/lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
+</component>
+</collection>
+<collection name="classicui_info" long-name="Classic UI Info" level="specific">
+<!-- the multiple units in the API test components need to be resolved -->
+<component name="classicui_metadata" long-name="Classic UI Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="mw/classicui/classicui_info/classicui_metadata/classicui_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="svgt" level="generic" long-name="SVG Tiny" levels="util ui">
+<collection name="svgt_plat" long-name="SVG Tiny Platform Interfaces" level="ui">
+<component name="svgt_api" long-name="SVGT API" introduced="9.2" filter="s60" class="api">
+<unit bldFile="mw/svgt/svgt_plat/svgt_api/group"/>
+</component>
+<component name="nvg_api" long-name="NVG API" introduced="9.2" filter="s60" class="api">
+<unit bldFile="mw/svgt/svgt_plat/nvg_api/group"/>
+</component>
+</collection>
+<collection name="svgtopt" long-name="SVG-T Engine" level="util">
+<component name="svgtopt_build" filter="s60" long-name="SVG Engine" introduced="9.2">
+<!-- component is at collection level. Needs to be moved down a directory -->
+<unit bldFile="mw/svgt/svgtopt/group"/>
+</component>
+<component name="svgtplugin" filter="s60" long-name="SVG Plugin" introduced="9.2" plugin="Y">
+<unit bldFile="mw/svgt/svgtopt/svgtplugin/group"/>
+</component>
+</collection>
+</block>
+<block name="uiaccelerator" level="generic" long-name="UI Accelerator" levels="plugin framework server ex if">
+<collection name="uiaccelerator_plat" long-name="UI Accelerator Platform Interfaces" level="if">
+<component name="alf_core_toolkit_api" long-name="ALF Core Toolkit API" filter="s60" class="api">
+<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/group"/>
+</component>
+<component name="alf_visual_api" long-name="ALF Visual API" filter="s60" class="api">
+<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/group"/>
+</component>
+<component name="alf_extended_visual_api" long-name="ALF Extended Visual API" filter="s60" class="api">
+<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/group"/>
+</component>
+<component name="alf_extension_api" long-name="ALF Extension API" filter="s60" class="api">
+<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/group"/>
+</component>
+<component name="alf_tracing_api" long-name="ALF Tracing API" filter="s60" class="api">
+<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/group"/>
+</component>
+<component name="alf_client_server_api" long-name="ALF Client Server API" filter="s60" class="api">
+<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/group"/>
+</component>
+</collection>
+<collection name="uiacceltk" long-name="UI Accelerator Toolkit" level="framework">
+<component name="hitchcock" filter="s60" long-name="Hitchcock">
+<unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/group"/>
+</component>
+<component name="uiacceltk_build" filter="s60" long-name="UI Accelerator Toolkit Build">
+<!-- move into the other component, or remove the #include and make this UI Accelerator Toolkit ROM-->
+<unit bldFile="mw/uiaccelerator/uiacceltk/group"/>
+</component>
+</collection>
+<collection name="uiaccelerator_test" long-name="UI Accelerator Test" level="ex"/>
+</block>
+<block name="uiresources" level="generic" long-name="UI Resources" levels="compile plugin framework server generic data">
+<!-- are the custom filters below needed? -->
+<collection name="uiresources_pub" long-name="UI Resources Public Interfaces" level="data">
+<component name="pictograph_api" long-name="Pictograph API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_pub/pictograph_api/group" filter="!test"/>
+</component>
+<component name="skins_api" long-name="Skins API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_pub/skins_api/group" filter="!test"/>
+</component>
+<component name="font_definition_api" long-name="Font Definition API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_pub/font_definition_api/group" filter="!test"/>
+</component>
+<component name="graphics_api" long-name="Graphics API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_pub/graphics_api/group" filter="!test"/>
+</component>
+<component name="scalable_icons_api" long-name="Scalable Icons API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_pub/scalable_icons_api/group"/>
+</component>
+<component name="layout_id_definitions_api" long-name="Layout ID Definitions API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_pub/layout_id_definitions_api/group"/>
+</component>
+</collection>
+<collection name="uiresources_plat" long-name="UI Resources Platform Interfaces" level="data">
+<component name="layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/layout_system_private_api/group" filter="!test"/>
+</component>
+<component name="layout_data_api" long-name="Layout Data API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/layout_data_api/group" filter="!test"/>
+</component>
+<component name="cdl_api" long-name="CDL API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/cdl_api/group" filter="!test"/>
+</component>
+<component name="extended_skins_api" long-name="Extended Skins API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/extended_skins_api/group" filter="!test"/>
+</component>
+<component name="tfx_server_controller_plugin_api" long-name="TFX Server Controller Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_controller_plugin_api/group"/>
+</component>
+<component name="extended_fonts_api" long-name="Extended Fonts API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/extended_fonts_api/group" filter="!test"/>
+</component>
+<component name="graphic_configuration_api" long-name="Graphic Configuration API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/graphic_configuration_api/group" filter="!test"/>
+</component>
+<component name="mif_header_cdl_api" long-name="MIF Header CDL API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/mif_header_cdl_api/group"/>
+</component>
+<component name="personalisation_and_skins_settings_api" long-name="Personalisation and Skins Settings API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/personalisation_and_skins_settings_api/group"/>
+</component>
+<component name="tfx_effect_setup_plugin_api" long-name="TFX Effect Setup Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/tfx_effect_setup_plugin_api/group"/>
+</component>
+<component name="mifconv_definitions_api" long-name="Mifconv Definitions API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/mifconv_definitions_api/group"/>
+</component>
+<component name="wallpaper_configuration_api" long-name="Wallpaper Configuration API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/wallpaper_configuration_api/group"/>
+</component>
+<component name="language_code_definitions_api" long-name="Language Code Definitions API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/language_code_definitions_api/group"/>
+</component>
+<component name="skins_image_attributes_api" long-name="Skins Image Attributes API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
+</component>
+<component name="private_user_area_code_definitions_api" long-name="Private User Area Code Definitions API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/private_user_area_code_definitions_api/group"/>
+</component>
+<component name="tfx_server_plugin_ids_api" long-name="TFX Server Plug-in IDs API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_plugin_ids_api/group"/>
+</component>
+</collection>
+<collection name="uiresources_info" long-name="UI Resources Info" level="data">
+<component name="uiresources_test" filter="s60,test,api_test" long-name="UI Resources Tests" purpose="development"/>
+</collection>
+<collection name="uigraphics" long-name="UI Graphics" level="generic">
+<component name="bitmaps2" filter="s60" long-name="Bitmaps 2" class="config">
+<unit bldFile="mw/uiresources/uigraphics/bitmaps2/group"/>
+</component>
+<component name="icons" filter="s60" long-name="Icons" class="config">
+<unit bldFile="mw/uiresources/uigraphics/icons/group"/>
+</component>
+<component name="variatedbitmaps" filter="s60" long-name="Variated Bitmaps" class="config">
+<unit bldFile="mw/uiresources/uigraphics/variatedbitmaps/group"/>
+</component>
+<component name="aknicon" filter="s60" long-name="Avkon Icon Framework">
+<unit bldFile="mw/uiresources/uigraphics/aknicon/group"/>
+</component>
+<component name="nvgrenderstage" filter="sf_build" long-name="NVG Render Stage">
+<unit bldFile="mw/uiresources/uigraphics/nvgrenderstage/group"/>
+</component>
+</collection>
+<collection name="layouts" long-name="Layouts" level="plugin">
+<component name="cdl" filter="s60" long-name="Customization Definition Language">
+<!-- can only have one unit. Need to #include them or split into multiple components -->
+<unit bldFile="mw/uiresources/layouts/cdl/cdlengine/group"/>
+<unit bldFile="mw/uiresources/layouts/cdl/cdlserver/group"/>
+</component>
+<component name="aknlayout2" filter="s60" long-name="Avkon Layout 2">
+<unit bldFile="mw/uiresources/layouts/aknlayout2/group"/>
+</component>
+</collection>
+<collection name="skins" long-name="Skins" level="data">
+<component name="aknskincontent" filter="s60" long-name="Avkon Skin Content" class="config">
+<unit bldFile="mw/uiresources/skins/aknskincontent/group"/>
+</component>
+<component name="aknskins" filter="s60" long-name="Avkon Skin Compiler">
+<unit bldFile="mw/uiresources/skins/aknskins/group"/>
+</component>
+</collection>
+<collection name="pictographs" long-name="Pictographs" level="data">
+<component name="aknpictograph" filter="s60" long-name="Avkon Pictograph">
+<unit bldFile="mw/uiresources/pictographs/aknpictograph/group"/>
+</component>
+</collection>
+<collection name="locales" long-name="Locales" level="framework">
+<component name="locales_build" filter="s60" long-name="Locales Build">
+<unit bldFile="mw/uiresources/locales/loce32"/>
+</component>
+</collection>
+<collection name="uiconfig" long-name="UI Config" level="server">
+<component name="s60config" filter="s60" long-name="S60 UI Config">
+<unit bldFile="mw/uiresources/uiconfig/s60config/group"/>
+</component>
+</collection>
+<collection name="fontsupport" long-name="Font Support" level="generic">
+<component name="fontprovider" filter="s60" long-name="Font Provider">
+<unit bldFile="mw/uiresources/fontsupport/fontprovider/group"/>
+</component>
+<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
+ <component id="s60_fonts" filter="s60" name="S60 Fonts">
+ <unit bldFile="fontsupport/fontutils/group"/>
+ </component>
+-->
+<component name="fontutils" filter="sf_build" long-name="Font Utils">
+<unit bldFile="mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
+</component>
+</collection>
+<collection name="helpthemes" long-name="Help Themes" level="data">
+<!-- collection is really a component. Need to move down a directory -->
+<component name="helpthemes_build" filter="s60" long-name="Help Themes Build" class="config">
+<unit bldFile="mw/uiresources/helpthemes/group"/>
+</component>
+</collection>
+</block>
+<block name="hapticsservices" level="generic" long-name="Haptics Services" levels="fw server api">
+<collection name="hapticsservices_plat" long-name="Haptics Services Platform Interfaces" level="api">
+<component name="tacticon_api" long-name="Tacticon API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/hapticsservices/hapticsservices_plat/tacticon_api/group"/>
+</component>
+<component name="tactile_feedback_core_api" long-name="Tactile Feedback Core API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_core_api/group"/>
+</component>
+<component name="tactile_feedback_server_api" long-name="Tactile Feedback Server API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_server_api/group"/>
+</component>
+</collection>
+<collection name="hapticsservices_pub" long-name="Haptics Services Public Interfaces" level="api">
+<component name="tactile_feedback_client_api" long-name="Tactile Feedback Client API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/hapticsservices/hapticsservices_pub/tactile_feedback_client_api/group"/>
+</component>
+</collection>
+<collection name="tacticonserver" long-name="Tacticon Server" level="server">
+<!-- collection is really a component. Move down a directory -->
+<component name="tacticonserver_build" filter="s60" long-name="Tacticon Server Build" introduced="^3">
+<unit bldFile="mw/hapticsservices/tacticonserver/group"/>
+<!-- clients and servers are suauly the same component. Consider moving pluign to a separate component if needed -->
+</component>
+</collection>
+<collection name="tactilefeedback" long-name="Tactile Feedback" level="fw">
+<component name="tactilearearegistry" filter="s60" long-name="Tactile Area Registry" introduced="^1">
+<unit bldFile="mw/hapticsservices/tactilefeedback/tactilearearegistry/group"/>
+</component>
+<component name="tactilefeedbackresolver" filter="s60" long-name="Tactile Feedback Resolver" introduced="^1">
+<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackresolver/group"/>
+</component>
+<component name="tactileclickplugin" filter="s60" long-name="Tactile Click Plugin" introduced="^1" plugin="Y">
+<unit bldFile="mw/hapticsservices/tactilefeedback/tactileclickplugin/group"/>
+</component>
+<component name="tactilefeedbackclient" filter="s60" long-name="Tactile Feedback Client" introduced="^1">
+<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackclient/group"/>
+</component>
+<component name="tactileactionplugin" filter="s60" long-name="Tactile Action Plugin" introduced="^1" plugin="Y">
+<unit bldFile="mw/hapticsservices/tactilefeedback/tactileactionplugin/group"/>
+</component>
+<component name="tactilefeedback_build" filter="s60" long-name="Tactile Feedback Build" introduced="^1">
+<!-- consider moving IBY to one fo the above components -->
+<unit bldFile="mw/hapticsservices/tactilefeedback/group"/>
+</component>
+</collection>
+</block>
+<block name="platformthemes" level="specific" long-name="Platform Themes" levels="framework generic ui">
+<collection name="platformthemes_info" long-name="Platform Themes Info">
+<component name="platformthemes_build" long-name="Platform Themes Build">
+<!-- no real structure in this package. Should break into collections / components -->
+<unit bldFile="mw/platformthemes" proFile="platformthemes.pro"/>
+</component>
+</collection>
+</block>
+<block name="gsprofilesrv" level="generic" long-name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
+<collection name="gsprofilesrv_pub" long-name="GS and Profiles Services Public Interfaces" level="specific">
+<component name="profiles_engine_active_profile_settings_api" long-name="Profiles Engine Active Profile Settings API" filter="s60" class="api">
+<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_active_profile_settings_api/group"/>
+</component>
+<component name="profiles_engine_wrapper_api" long-name="Profiles Engine Wrapper API" filter="s60" class="api">
+<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_wrapper_api/group"/>
+</component>
+</collection>
+<collection name="gsprofilesrv_plat" long-name="GS and Profiles Services Platform Interfaces" level="specific">
+<component name="ftuwizardmodel_api" long-name="FTU Wizard Model API" filter="bldfirst,s60" class="api">
+<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/ftuwizardmodel_api" proFile="ftuwizardmodel_api.pro" qmakeArgs="-r -config rom"/>
+</component>
+<component name="profiles_engine_api" long-name="Profiles Engine API" filter="s60" class="api">
+<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_engine_api/group"/>
+</component>
+<component name="settings_uis_cenrep_collection_api" long-name="Settings UIs CenRep Collection API" filter="s60" class="api">
+<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
+</component>
+</collection>
+<collection name="ftuwizardmodel" long-name="FTU Wizard Model" level="generic">
+<component name="ftuwizardmodel_build" long-name="FTU Wizardmodel Build" filter="bldfirst">
+<unit bldFile="mw/gsprofilesrv/ftuwizardmodel" proFile="ftuwizardmodel.pro" qmakeArgs="-r -config rom"/>
+</component>
+</collection>
+<collection name="controlpanel" long-name="Control Panel" level="generic">
+<component name="controlpanel_rom" long-name="Control Panel ROM" filter="s60" class="placeholder">
+<!-- Need to create a real .pro file for this
+ <unit bldFile="controlpanel/rom" qt:proFile="cp_rom.pri" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+<component name="controlpanel_config" long-name="Control Panel Config" filter="s60" introduced="^4" class="config placeholder">
+<!-- Need to create a real .pro file for this
+ <unit bldFile="controlpanel/conf" qt:proFile="conf.pri" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+<component name="controlpanel_source" long-name="Control Panel Source" filter="s60" class="placeholder">
+<!-- Uncomment when controlpanel_build is removed
+ <unit bldFile="controlpanel/src" qt:qmakeArgs="-r -config rom" qt:proFile="src.pro"/> -->
+</component>
+<component name="controlpanel_build" long-name="Control Panel Build" filter="s60">
+<!-- need to make included .pri file into a real .pro file -->
+<unit bldFile="mw/gsprofilesrv/controlpanel" qmakeArgs="-r -config rom" proFile="controlpanel.pro"/>
+</component>
+</collection>
+<collection name="profilesservices" long-name="Profiles Services" level="server">
+<component name="profileengine" filter="s60" long-name="Profile Engine" introduced="9.1">
+<unit bldFile="mw/gsprofilesrv/profilesservices/profileengine/group"/>
+</component>
+</collection>
+</block>
+<block name="homescreensrv" level="specific" long-name="Home Screen Services" levels="plugin framework server generic specific">
+<collection name="appfoundation" long-name="App Foundation" level="generic">
+<component name="appfoundation_build" long-name="App Foundation Build" introduced="^4">
+<unit bldFile="mw/homescreensrv/appfoundation" qmakeArgs="-r" proFile="appfoundation.pro"/>
+</component>
+</collection>
+<collection name="hswidgetmodel" long-name="Home Screen Widget Model" level="framework">
+<component name="hswidgetmodel_build" long-name="Home Screen Widget Model Build" introduced="^4">
+<unit bldFile="mw/homescreensrv/hswidgetmodel" qmakeArgs="-r" proFile="hswidgetmodel.pro"/>
+</component>
+</collection>
+<collection name="contentstorage" long-name="Content Storage" level="framework">
+<component name="cautils" long-name="Content Arsenal Utils" introduced="^4">
+<unit bldFile="mw/homescreensrv/contentstorage/cautils" qmakeArgs="-r" proFile="cautils.pro"/>
+</component>
+<component name="contentstorage_build" long-name="Content Storage Build" introduced="^4">
+<unit bldFile="mw/homescreensrv/contentstorage/group" qmakeArgs="-r" proFile="group.pro"/>
+</component>
+<component name="casrv/calocalizerscanner" long-name="Content Arsenal Server Localizer Scanner" introduced="^4">
+<unit bldFile="mw/homescreensrv/contentstorage/casrv/calocalizerscanner" qmakeArgs="-r" proFile="calocalizerscanner.pro"/>
+</component>
+<component name="cahandler" long-name="Content Arsenal Handler" introduced="^4">
+<unit bldFile="mw/homescreensrv/contentstorage/cahandler" qmakeArgs="-r" proFile="cahandler.pro"/>
+</component>
+<component name="caclient" long-name="Content Arsenal Client" introduced="^4">
+<unit bldFile="mw/homescreensrv/contentstorage/caclient" qmakeArgs="-r" proFile="caclient.pro"/>
+</component>
+<component name="casoftwareregistry" long-name="Content Arsenal Software Registry" introduced="^4">
+<unit bldFile="mw/homescreensrv/contentstorage/casoftwareregistry" qmakeArgs="-r" proFile="casoftwareregistry.pro"/>
+</component>
+</collection>
+<collection name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" level="specific">
+<component name="homescreensrv_plat_build" long-name="Home Screen Services Platform Interfaces build" introduced="^4">
+<unit bldFile="mw/homescreensrv/homescreensrv_plat" qmakeArgs="-r" proFile="homescreensrv_plat.pro"/>
+</component>
+<component name="menu_sat_interface_api" long-name="Menu SAT Interface API" filter="s60" class="api"/>
+<component name="appruntimemodel_api" long-name="Appliction Run-Time Model API" filter="s60" introduced="^4" class="api"/>
+<component name="contentstorage_api" long-name="Content Storage API" filter="s60" introduced="^4" class="api"/>
+<component name="hswidgetmodel_api" long-name="HS Widget Model API" filter="s60" introduced="^4" class="api"/>
+<component name="statemodel_api" long-name="State Model API" filter="s60" introduced="^4" class="api"/>
+<component name="homescreen_information_api" long-name="Homescreen Information API" filter="s60" introduced="^4" class="api"/>
+</collection>
+<collection name="hsactivityfw" long-name="Activity Framework" level="fw">
+<component name="hsactivityfw_build" long-name="Activity Framework Build" introduced="^4">
+<unit bldFile="mw/homescreensrv/activityfw" qmakeArgs="-r" proFile="activityfw.pro"/>
+</component>
+</collection>
+<collection name="tstaskmonitor" long-name="Task Switcher Task Monitor" level="fw">
+<!-- move collection down to a component directory or split up into component .pro files -->
+<component name="tstaskmonitor_build" long-name="Task Switcher Task Monitor Build" introduced="^4">
+<unit bldFile="mw/homescreensrv/tstaskmonitor" qmakeArgs="-r" proFile="tstaskmonitor.pro"/>
+</component>
+</collection>
+<collection name="hsappkeyhandler" long-name="HS Appplication Key Handler" level="server">
+<component name="hsappkeyhandler_build" long-name="Appplication Key Handler Build" introduced="^4">
+<unit bldFile="mw/homescreensrv/hsappkeyhandler" qmakeArgs="-r" proFile="hsappkeyhandler.pro"/>
+</component>
+</collection>
+<collection name="homescreensrv_info" long-name="Home Screen Services Info" level="specific">
+<component name="homescreensrvconf" long-name="Home Screen Services Config" introduced="^4" class="config">
+<unit bldFile="mw/homescreensrv" qmakeArgs="-r" proFile="homescreensrv_exports_to_rom.pri"/>
+</component>
+<component name="homescreensrvrom" long-name="Home Screen Services ROM" introduced="^4">
+<unit bldFile="mw/homescreensrv/group"/>
+</component>
+</collection>
+</block>
+<block name="homescreensrvlegacy" level="generic" long-name="Legacy Home Screen Services" levels="plugin framework server generic specific">
+<collection name="homescreensrvlegacy_plat" long-name="Legacy Home Screen Services Platform Interfaces" level="specific">
+<component name="ai_content_model_api" long-name="AI Content Model API" filter="s60" class="api">
+<unit bldFile="mw/homescreensrvlegacy/ai_content_model_api/group" proFile="group.pro"/>
+</component>
+<component name="ai_plugin_information_api" long-name="AI Plug-in Information API" filter="s60" class="api">
+<unit bldFile="mw/homescreensrvlegacy/ai_plugin_information_api/group" proFile="group.pro"/>
+</component>
+<component name="content_harvester_plugin_api" long-name="Content Harvester Plugin API " filter="s60" class="api">
+<unit bldFile="mw/homescreensrvlegacy/content_harvester_plugin_api/group"/>
+</component>
+</collection>
+</block>
+<block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
+<collection name="appinstall_plat" long-name="Application Installation Platform Interfaces" level="api">
+<component name="iaupdate_api" long-name="IA Update API" filter="s60" class="api">
+<unit bldFile="mw/appinstall/appinstall_plat/iaupdate_api/group"/>
+</component>
+<component name="task_plugin_api" long-name="Task Plugin API" filter="s60" class="api">
+<unit bldFile="mw/appinstall/appinstall_plat/task_plugin_api/group"/>
+</component>
+<component name="sw_installer_common_ui_api" long-name="SW Installer Common UI API" filter="s60" class="api">
+<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_common_ui_api/group"/>
+</component>
+<component name="sw_installer_launcher_api" long-name="SW Installer Launcher API" filter="s60" class="api">
+<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_launcher_api/group"/>
+</component>
+<component name="task_management_api" long-name="Task Management API" filter="s60" class="api">
+<unit bldFile="mw/appinstall/appinstall_plat/task_management_api/group"/>
+</component>
+<component name="sw_installer_ui_plugin_api" long-name="SW Installer UI Plugin API" filter="s60" class="api">
+<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ui_plugin_api/group"/>
+</component>
+<component name="sw_installer_cr_keys" long-name="SW Installer CR Keys" filter="s60" class="api">
+<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_cr_keys/group"/>
+</component>
+<component name="sw_installer_ps_keys" long-name="SW Installer PS Keys" filter="s60" class="api">
+<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
+</component>
+<component name="sifui_api" long-name="STIF UI API" filter="s60" class="api">
+<unit bldFile="mw/appinstall/appinstall_plat/sifui_api/group"/>
+</component>
+</collection>
+<collection name="appinstall_pub" long-name="Application Installation Public Interfaces" level="api">
+<component name="startup_list_management_api" long-name="Startup List Management API" filter="s60" class="api">
+<unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
+</component>
+</collection>
+<collection name="ncdengine" long-name="Nokia Content Discover" level="framework">
+<!-- collection is really just a component. Move down one diretcory -->
+<component name="ncdengine_build" filter="s60" long-name="NCD Build" introduced="^1">
+<unit bldFile="mw/appinstall/ncdengine/group"/>
+</component>
+</collection>
+<collection name="appinstaller" long-name="Application Installer" level="generic">
+<component name="appinstui" filter="s60" long-name="Application Installer UI" introduced="^2">
+<unit bldFile="mw/appinstall/appinstaller/appinstui/group"/>
+</component>
+<component name="appinstui_qt" filter="s60" long-name="Application Installer Qt UI" introduced="^2">
+<unit bldFile="mw/appinstall/appinstaller/appinstui" proFile="appinstui.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+<collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="api">
+<!-- the collection is really a component. Move down a directory.-->
+<component name="iaupdateapi_stub_build" long-name="IA Update API Stub Build" filter="s60" introduced="^2">
+<unit bldFile="mw/appinstall/iaupdateapi_stub/group"/>
+</component>
+</collection>
+<collection name="iaupdate" long-name="Independent Apps Update" level="api">
+<!-- Should reorganise into actual components -->
+<component name="iad" long-name="Independent App delivery" filter="s60" introduced="^4" purpose="development">
+<unit bldFile="mw/appinstall/iaupdate" proFile="iaupdate.pro" qmakeArgs="-r"/>
+</component>
+<component name="iaupdate_build" filter="s60" long-name="IA Update Build" introduced="^2">
+<unit bldFile="mw/appinstall/iaupdate/group"/>
+</component>
+</collection>
+<collection name="installationservices" long-name="Installation Services" level="generic">
+<component name="swi" long-name="Secure Software Install" purpose="optional">
+<unit bldFile="mw/appinstall/installationservices/swi/group" mrp="mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
+</component>
+<component name="swidevicetools" long-name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
+<unit bldFile="mw/appinstall/installationservices/swidevicetools/group" mrp="mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
+</component>
+<component name="swcomponentregistry" long-name="Software Component Registry" introduced="^4" purpose="mandatory">
+<unit bldFile="mw/appinstall/installationservices/swcomponentregistry/group" mrp="mw/appinstall/installationservices/swcomponentregistry/group/security_softwarecomponentregistry.mrp"/>
+</component>
+<component name="swinstallationfw" long-name="Software Installation Framework" introduced="^4" purpose="optional">
+<unit bldFile="mw/appinstall/installationservices/swinstallationfw/group" mrp="mw/appinstall/installationservices/swinstallationfw/group/security_softwareinstallframework.mrp"/>
+</component>
+<component name="swtransactionservices" long-name="Software Transaction Services" introduced="^4" purpose="optional">
+<unit bldFile="mw/appinstall/installationservices/swtransactionservices/group" mrp="mw/appinstall/installationservices/swtransactionservices/group/security_softwaretransactionservices.mrp"/>
+</component>
+<component name="refswinstallationplugin" long-name="Reference Software Installation Plugin" introduced="^4" purpose="development" plugin="Y">
+<unit bldFile="mw/appinstall/installationservices/refswinstallationplugin/group" mrp="mw/appinstall/installationservices/refswinstallationplugin/group/security_sifrefplugin.mrp"/>
+</component>
+<component name="refsoftwareappmgr" long-name="Reference Software Application Manager" introduced="^4" purpose="development">
+<unit bldFile="mw/appinstall/installationservices/refsoftwareappmgr/group" mrp="mw/appinstall/installationservices/refsoftwareappmgr/group/security_referenceapplicationmanager.mrp"/>
+</component>
+<component name="swiconfig" long-name="Software Install Config" introduced="9.1" purpose="optional" class="config">
+<unit bldFile="mw/appinstall/installationservices/swiconfig/group" mrp="mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
+</component>
+</collection>
+<collection name="secureswitools" long-name="Secure Software Install Tools" level="tool">
+<component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" class="PC">
+<unit bldFile="mw/appinstall/secureswitools/makekeys/group" mrp="mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
+</component>
+<component name="swianalysistoolkit" long-name="SWI Analysis Toolkit" purpose="development" class="PC">
+<unit bldFile="mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
+</component>
+<component name="openssllib" long-name="OpenSSL Library" purpose="optional" class="PC">
+<unit mrp="mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
+</component>
+<component name="swisistools" long-name="Secure Software Install SIS Tools" purpose="optional" class="PC">
+<unit bldFile="mw/appinstall/secureswitools/swisistools/group" mrp="mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
+</component>
+</collection>
+<collection name="appinstall_info" long-name="Application Installation Info" level="api">
+<component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="serviceapifw" level="specific" long-name="Service API Framework" levels="plugin framework server generic specific">
+<collection name="serviceapifw_pub" long-name="Service API Framework Public Interfaces" level="specific"/>
+<collection name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" level="specific">
+<component name="rtsecuritymanager_common_api" long-name="Runtime Security Manager Common API" filter="s60" class="api">
+<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/group"/>
+</component>
+<component name="rtsecuritymanager_utility_api" long-name="Runtime Security Manager Utility API" filter="s60" class="api">
+<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
+</component>
+<component name="rtsecuritymanager_client_api" long-name="Runtime Security Manager Client API" filter="s60" class="api">
+<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/group"/>
+</component>
+<component name="liw_provider_utility_api" long-name="LIW Provider Utility API" filter="s60" class="api">
+<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_provider_utility_api/group"/>
+</component>
+<component name="liw_service_interface_base_api" long-name="LIW Service Interface Base API" filter="s60" class="api">
+<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_base_api/group"/>
+</component>
+<component name="liw_service_interface_menu_api" long-name="LIW Service Interface Menu API" filter="s60" class="api">
+<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_menu_api/group"/>
+</component>
+<component name="liw_criteria_api" long-name="LIW Criteria API" filter="s60" class="api">
+<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_criteria_api/group"/>
+</component>
+<component name="liw_generic_parameter_api" long-name="LIW Generic Parameter API" filter="s60" class="api">
+<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_generic_parameter_api/group"/>
+</component>
+<component name="liw_service_handler_api" long-name="LIW Service Handler API" filter="s60" class="api">
+<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_handler_api/group"/>
+</component>
+</collection>
+<collection name="rtsecuritymanager" long-name="Runtime Security Manager" level="server">
+<component name="rtsecuritymanagerutil" filter="s60" long-name="Runtime Security Manager Util">
+<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
+</component>
+<component name="rtsecuritymanagerserver" filter="s60" long-name="Runtime Security Manager Server">
+<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/>
+</component>
+<component name="rtsecuritymanagerclient" filter="s60" long-name="Runtime Security Manager Client">
+<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/>
+</component>
+<component name="rtsecuritymanager_build" filter="s60" long-name="Runtime Security Manager Build">
+<!-- Move the export to the appropriate components, or make this a ROM component by removing the #includes -->
+<unit bldFile="mw/serviceapifw/rtsecuritymanager/group"/>
+</component>
+</collection>
+<collection name="languageinterworkingfw" long-name="Language Interworking Framework" level="framework">
+<component name="lifwservicehandler" filter="s60" long-name="Service Handler">
+<unit bldFile="mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
+</component>
+</collection>
+</block>
+<block name="serviceapi" level="specific" long-name="Service API" levels="os mw1 mw2 app">
+<!-- should break up this collection into something meaningful -->
+<collection name="serviceproviders" long-name="Service Providers" level="mw1">
+<!-- are commented out components to be removed? -->
+<component name="sapi_contacts_vpbk" long-name="Contacts Phonebook SAPI" filter="s60" plugin="Y" class="placeholder">
+<!--<unit bldFile="serviceproviders/sapi_contacts_vpbk/group"/>-->
+</component>
+<component name="sapi_location" long-name="Location SAPI" filter="s60" plugin="Y">
+<unit bldFile="mw/serviceapi/serviceproviders/sapi_location/group"/>
+</component>
+<component name="sapi_mediamanagement" long-name="Media Management SAPI" filter="s60" plugin="Y">
+<unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/group"/>
+</component>
+<component name="sapi_landmarks" long-name="Landmarks SAPI" filter="s60" plugin="Y">
+<unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
+</component>
+<component name="sapi_messaging" long-name="Messaging SAPI" filter="s60" plugin="Y" class="placeholder">
+<!-- <unit bldFile="serviceproviders/sapi_messaging/group"/> -->
+</component>
+<component name="sapi_applicationmanager" long-name="Application Manager SAPI" filter="s60" plugin="Y" class="placeholder">
+<!-- <unit bldFile="serviceproviders/sapi_applicationmanager/group"/>-->
+</component>
+<component name="sapi_calendar" long-name="Calendar SAPI" filter="s60" plugin="Y" class="placeholder">
+<!-- <unit bldFile="serviceproviders/sapi_calendar/group"/> -->
+</component>
+<component name="sapi_logging" long-name="Logging SAPI" filter="s60" plugin="Y">
+<unit bldFile="mw/serviceapi/serviceproviders/sapi_logging/group"/>
+</component>
+<component name="sapi_sensor" long-name="Sensor SAPI" filter="s60" plugin="Y">
+<unit bldFile="mw/serviceapi/serviceproviders/sapi_sensor/group"/>
+</component>
+<component name="sapi_sysinfo" long-name="Sysinfo SAPI" filter="s60" plugin="Y">
+<unit bldFile="mw/serviceapi/serviceproviders/sapi_sysinfo/group"/>
+</component>
+<component name="sapi_serviceregistry" long-name="Service Registry SAPI" filter="s60" plugin="Y">
+<unit bldFile="mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
+</component>
+<component name="jsapi" long-name="Javascript API" filter="s60" plugin="Y">
+<unit bldFile="mw/serviceapi/serviceproviders/jsapi/group"/>
+</component>
+<component name="serviceproviders_build" filter="s60" long-name="Service API Build">
+<!-- distribute the exports or make this a ROM component by removing the #includes -->
+<unit bldFile="mw/serviceapi/serviceproviders/group"/>
+</component>
+</collection>
+</block>
+<block name="browser" level="specific" long-name="Browser" levels="plugin utils support main">
+<collection name="bookmarksengine" long-name="Bookmarks Engine" level="support">
+<component name="bookmarksengine_build" long-name="Bookmarks Engine Build" introduced="^4">
+<unit bldFile="mw/browser/bookmarksengine" proFile="bookmarksengine.pro"/>
+</component>
+</collection>
+</block>
+<block name="web" level="specific" long-name="Web" levels="plugin utils server generic specific">
+<collection name="web_pub" long-name="Web Public Interfaces" level="specific">
+<component name="browser_control_api" long-name="Browser Control API" filter="s60" class="api">
+<unit bldFile="mw/web/web_pub/browser_control_api/group"/>
+</component>
+<component name="download_mgr_client_api" long-name="Download Manager Client API" filter="s60" class="api">
+<unit bldFile="mw/web/web_pub/download_mgr_client_api/group"/>
+</component>
+<component name="download_mgr_ui_api" long-name="Download Manager UI Library API" filter="s60" class="api">
+<unit bldFile="mw/web/web_pub/download_mgr_ui_api/group"/>
+</component>
+<component name="favourites_engine_api" long-name="Favourites Engine API" filter="s60" class="api">
+<unit bldFile="mw/web/web_pub/favourites_engine_api/group"/>
+</component>
+<component name="browser_plugin_api" long-name="Browser Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/web/web_pub/browser_plugin_api/group"/>
+</component>
+<component name="settings_api" long-name="Settings API" filter="s60" class="api">
+<unit bldFile="mw/web/web_pub/settings_api/group"/>
+</component>
+</collection>
+<collection name="web_plat" long-name="Web Platform Interfaces" level="specific">
+<component name="aiw_browser_provider_api" long-name="AIW Browser Provider API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/aiw_browser_provider_api/group"/>
+</component>
+<component name="browser_dialogs_provider_api" long-name="Browser Dialogs Provider API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/browser_dialogs_provider_api/group"/>
+</component>
+<component name="browser_platform_api" long-name="Browser Platform API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/browser_platform_api/group"/>
+</component>
+<component name="cod_handler_api" long-name="COD Handler API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/cod_handler_api/group"/>
+</component>
+<component name="connection_manager_api" long-name="Connection Manager API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/connection_manager_api/group"/>
+</component>
+<component name="cxml_library_api" long-name="cXml Library API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/cxml_library_api/group"/>
+</component>
+<component name="download_mgr_client_api_extn" long-name="Download Manager Client API Extension" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/download_mgr_client_api_extn/group"/>
+</component>
+<component name="feeds_engine_api" long-name="Feeds Engine API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/feeds_engine_api/group"/>
+</component>
+<component name="launcher_api" long-name="Launcher API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/launcher_api/group"/>
+</component>
+<component name="multipart_parser_api" long-name="Multipart Parser API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/multipart_parser_api/group"/>
+</component>
+<component name="recent_url_store_api" long-name="Recent URL Store API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/recent_url_store_api/group"/>
+</component>
+<component name="rt_gesturehelper_api" long-name="Runtime Gesture Helper API" filter="s60" introduced="^4" class="api">
+<unit bldFile="mw/web/web_plat/rt_gesturehelper_api/group"/>
+</component>
+<component name="scheme_handler_plugin_api" long-name="Scheme Handler Plugin API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/scheme_handler_plugin_api/group"/>
+</component>
+<component name="scriptable_plugin_api" long-name="Scriptable Plugin API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/scriptable_plugin_api/group"/>
+</component>
+<component name="webutils_api" long-name="Web Utils API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/webutils_api/group"/>
+</component>
+<component name="widget_registry_api" long-name="Widget Registry API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/widget_registry_api/group"/>
+</component>
+<component name="xml_parser_api" long-name="XML Parser API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/xml_parser_api/group"/>
+</component>
+</collection>
+<collection name="browserutilities" long-name="Browser Utilities" level="utils">
+<component name="browserdialogsprovider" filter="s60" long-name="Browser Dialogs Provider">
+<unit bldFile="mw/web/browserutilities/browserdialogsprovider/group"/>
+</component>
+<component name="recenturlstore" filter="s60" long-name="Recent URL Store">
+<unit bldFile="mw/web/browserutilities/recenturlstore/group"/>
+</component>
+<component name="xmlparser" filter="s60" long-name="XML Interface">
+<unit bldFile="mw/web/browserutilities/xmlparser/group"/>
+</component>
+<component name="cxmllibrary" filter="s60" long-name="XML Parser Implementation">
+<unit bldFile="mw/web/browserutilities/cxmllibrary/group"/>
+</component>
+<component name="downloadmgr" filter="s60" long-name="Download Manager">
+<unit bldFile="mw/web/browserutilities/downloadmgr/group"/>
+</component>
+<component name="connectionmanager" filter="s60" long-name="Connection Manager">
+<unit bldFile="mw/web/browserutilities/connectionmanager/group"/>
+</component>
+<component name="browsertelservice" filter="s60" long-name="Browser Telephony Service">
+<unit bldFile="mw/web/browserutilities/browsertelservice/group"/>
+</component>
+<component name="favouritesengine" filter="s60" long-name="Favourites Engine">
+<unit bldFile="mw/web/browserutilities/favouritesengine/group"/>
+</component>
+<component name="feedsengine" filter="s60" long-name="Feeds Engine">
+<unit bldFile="mw/web/browserutilities/feedsengine/group"/>
+</component>
+<component name="multipartparser" filter="s60" long-name="Multipart Parser">
+<unit bldFile="mw/web/browserutilities/multipartparser/group"/>
+</component>
+<component name="schemehandler" filter="s60" long-name="Scheme Handler">
+<unit bldFile="mw/web/browserutilities/schemehandler/group"/>
+</component>
+<component name="webutils" filter="s60" long-name="Web Utils">
+<unit bldFile="mw/web/browserutilities/webutils/group"/>
+</component>
+<component name="aiwbrowserprovider" filter="s60" long-name="AIW Browser Provider" plugin="Y">
+<unit bldFile="mw/web/browserutilities/aiwbrowserprovider/group"/>
+</component>
+</collection>
+<collection name="webengine" long-name="Web Engine" level="server">
+<component name="osswebengine" filter="s60" long-name="OSS Web Engine">
+<!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
+<unit bldFile="mw/web/webengine/osswebengine/cache/group"/>
+<unit bldFile="mw/web/webengine/osswebengine/memorymanager/group"/>
+<unit bldFile="mw/web/webengine/osswebengine/npscript/group"/>
+<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group"/>
+<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group/javascriptcore"/>
+</component>
+<component name="webkitutils" filter="s60" long-name="WebKit Utils">
+<unit bldFile="mw/web/webengine/webkitutils/group"/>
+</component>
+<component name="pagescaler" filter="s60" long-name="Page Scaler">
+<unit bldFile="mw/web/webengine/pagescaler/group"/>
+</component>
+<component name="webwidgetinstaller" filter="s60" long-name="Widget Installer">
+<unit bldFile="mw/web/webengine/widgetinstaller/group"/>
+</component>
+<component name="widgetregistry" filter="s60" long-name="Widget Registry">
+<unit bldFile="mw/web/webengine/widgetregistry/group"/>
+</component>
+<component name="device" filter="s60" long-name="Device">
+<!-- this needs a more meaningful name -->
+<unit bldFile="mw/web/webengine/device/group"/>
+</component>
+<component name="widgetengine" filter="s60" long-name="Widget Engine">
+<unit bldFile="mw/web/webengine/widgetengine/group"/>
+</component>
+<component name="web_memoryplugin" long-name="Memory Plugin" filter="s60" plugin="Y">
+<unit bldFile="mw/web/webengine/memoryplugin/group"/>
+</component>
+<component name="widgetmemoryplugin" filter="s60" long-name="Widget Memory Plugin" plugin="Y">
+<unit bldFile="mw/web/webengine/widgetmemoryplugin/group"/>
+</component>
+<component name="widgetbackuprestore" filter="s60" long-name="Widget Backup and Restore">
+<unit bldFile="mw/web/webengine/widgetbackuprestore/group"/>
+</component>
+<component name="browserrecognizers" filter="s60" long-name="Browser Recognizers" plugin="Y">
+<unit bldFile="mw/web/webengine/browserrecognizers/group"/>
+</component>
+<component name="wrtharvester" filter="s60" long-name="Web Runtime Harvester" plugin="Y">
+<unit bldFile="mw/web/webengine/wrtharvester/group"/>
+</component>
+</collection>
+<collection name="codhandler" long-name="Content Object Descriptor Handler" level="specific">
+<component name="codeng" filter="s60" long-name="COD Engine">
+<unit bldFile="mw/web/codhandler/codeng/group"/>
+</component>
+<component name="codui" filter="s60" long-name="COD UI">
+<unit bldFile="mw/web/codhandler/codui/group"/>
+</component>
+<component name="codrecog" filter="s60" long-name="COD Recogniser" plugin="Y">
+<unit bldFile="mw/web/codhandler/codrecog/group"/>
+</component>
+<component name="codviewer" filter="s60" long-name="COD Viewer">
+<unit bldFile="mw/web/codhandler/codviewer/group"/>
+</component>
+<component name="ddrecog" filter="s60" long-name="Download Descriptor Recogniser" plugin="Y">
+<unit bldFile="mw/web/codhandler/ddrecog/group"/>
+</component>
+<component name="ddviewer" filter="s60" long-name="Download Descriptor Viewer">
+<unit bldFile="mw/web/codhandler/ddviewer/group"/>
+</component>
+<component name="coddownload" filter="s60" long-name="COD Download">
+<unit bldFile="mw/web/codhandler/coddownload/group"/>
+</component>
+<component name="roapapp" filter="s60" long-name="ROAP Application">
+<unit bldFile="mw/web/codhandler/roapapp/group"/>
+</component>
+<component name="codhandler_build" filter="s60" long-name="COD Handler Build">
+<!-- Exports need to go into another component or make this self-contained.
+ #included .hrh file needs to be #included in each of the other components -->
+<unit bldFile="mw/web/codhandler/group"/>
+</component>
+</collection>
+<collection name="widgets" long-name="Web Widget Framework" level="generic">
+<component name="widgetrecognizer" filter="s60" long-name="Widget Recognizer" plugin="Y">
+<unit bldFile="mw/web/widgets/widgetrecognizer/group"/>
+</component>
+<component name="widgetinstaller" filter="s60" long-name="Widget Installer UI" plugin="Y">
+<unit bldFile="mw/web/widgets/widgetinstaller/group"/>
+</component>
+<component name="widgetlauncher" filter="s60" long-name="Widget Launcher">
+<unit bldFile="mw/web/widgets/widgetlauncher/group"/>
+</component>
+<component name="widgetapp" filter="s60" long-name="Widget UI">
+<unit bldFile="mw/web/widgets/widgetapp/group"/>
+</component>
+<component name="widgetpreinstaller" filter="s60" long-name="Widget Pre-Installer">
+<unit bldFile="mw/web/widgets/widgetpreinstaller/group"/>
+</component>
+<component name="widgetstartup" filter="s60" long-name="Widget Startup">
+<unit bldFile="mw/web/widgets/widgetstartup/group"/>
+</component>
+</collection>
+</block>
+<block name="websrv" level="generic" long-name="Web Services" levels="plugin framework server generic specific">
+<collection name="websrv_pub" long-name="Web Services Public Interfaces" level="specific">
+<component name="web_service_description_api" long-name="Web Service Description API" filter="s60" class="api">
+<unit bldFile="mw/websrv/websrv_pub/web_service_description_api/group"/>
+</component>
+<component name="web_service_connection_api" long-name="Web Service Connection API" filter="s60" class="api">
+<unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/group"/>
+</component>
+<component name="web_service_manager_api" long-name="Web Service Manager API" filter="s60" class="api">
+<unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/group"/>
+</component>
+<component name="hostlet_connection_api" long-name="Hostlet Connection API" filter="s60" class="api">
+<unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/group"/>
+</component>
+<component name="web_service_messaging_api" long-name="Web Service Messaging API" filter="s60" class="api">
+<unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/group"/>
+</component>
+<component name="xml_extensions_api" long-name="XML Extensions API" filter="s60" class="api">
+<unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/group"/>
+</component>
+<component name="xml_fragment_api" long-name="XML Fragment API" filter="s60" class="api">
+<unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/group"/>
+</component>
+</collection>
+<collection name="webservices" long-name="Web Services Framework" level="generic">
+<!-- consider breaking this collection into more meaningful subsets -->
+<component name="wsnotifierplugins" filter="s60" long-name="WS Notifier Plugins" plugin="Y">
+<unit bldFile="mw/websrv/webservices/wsnotifierplugins/group"/>
+</component>
+<component name="wslogger" filter="s60" long-name="WS Logger">
+<unit bldFile="mw/websrv/webservices/wslogger/group"/>
+</component>
+<component name="wsxml" filter="s60" long-name="WS XML Extensions">
+<unit bldFile="mw/websrv/webservices/wsxml/group"/>
+</component>
+<component name="wsutils" filter="s60" long-name="WS Utils">
+<unit bldFile="mw/websrv/webservices/wsutils/group"/>
+</component>
+<component name="wsfragment" filter="s60" long-name="WS Fragment">
+<unit bldFile="mw/websrv/webservices/wsfragment/group"/>
+</component>
+<component name="wsdescription" filter="s60" long-name="WS Service Description">
+<unit bldFile="mw/websrv/webservices/wsdescription/group"/>
+</component>
+<component name="wsconnection" filter="s60" long-name="WS Service Connection">
+<unit bldFile="mw/websrv/webservices/wsconnection/group"/>
+</component>
+<component name="wsmessages" filter="s60" long-name="WS Messages">
+<unit bldFile="mw/websrv/webservices/wsmessages/group"/>
+</component>
+<component name="wscredentialmanager" filter="s60" long-name="WS Credential Manager">
+<unit bldFile="mw/websrv/webservices/wscredentialmanager/group"/>
+</component>
+<component name="wsframework" filter="s60" long-name="WS Framework">
+<unit bldFile="mw/websrv/webservices/wsframework/group"/>
+</component>
+<component name="wshttpchanneltransportplugin" filter="s60" long-name="WS HTTP Channel Transport Plugin" plugin="Y">
+<unit bldFile="mw/websrv/webservices/wshttpchanneltransportplugin/group"/>
+</component>
+<component name="wsconnectionagent" filter="s60" long-name="WS Connection Agent">
+<unit bldFile="mw/websrv/webservices/wsconnectionagent/group"/>
+</component>
+<component name="wsprovider" filter="s60" long-name="WS Provider">
+<unit bldFile="mw/websrv/webservices/wsprovider/group"/>
+</component>
+<component name="wshostletconnection" filter="s60" long-name="WS Hostlet Connection">
+<unit bldFile="mw/websrv/webservices/wshostletconnection/group"/>
+</component>
+<component name="wsmanager" filter="s60" long-name="WS Service Manager">
+<unit bldFile="mw/websrv/webservices/wsmanager/group"/>
+</component>
+<component name="wsidentitymanager" filter="s60" long-name="WS Identity Manager">
+<unit bldFile="mw/websrv/webservices/wsidentitymanager/group"/>
+</component>
+<component name="idwsfplugin" filter="s60" long-name="ID-WSF Plugin" plugin="Y">
+<unit bldFile="mw/websrv/webservices/idwsfplugin/group"/>
+</component>
+<component name="wsibasicplugin" filter="s60" long-name="WS-I Basic Plugin" plugin="Y">
+<unit bldFile="mw/websrv/webservices/wsibasicplugin/group"/>
+</component>
+<component name="wsrestplugin" filter="s60" long-name="WS REST Plugin" plugin="Y">
+<unit bldFile="mw/websrv/webservices/wsrestplugin/group"/>
+</component>
+<component name="idwsfsecuritymechanism" filter="s60" long-name="ID-WSF Security Mechanism">
+<unit bldFile="mw/websrv/webservices/idwsfsecuritymechanism/group"/>
+</component>
+<component name="wspasswordtransforms" filter="s60" long-name="WS Password Transforms">
+<unit bldFile="mw/websrv/webservices/wspasswordtransforms/group"/>
+</component>
+<component name="wscore" filter="s60" long-name="WS Core Service Manager">
+<unit bldFile="mw/websrv/webservices/wscore/group"/>
+</component>
+<component name="wslocaltransportplugin" filter="s60" long-name="WS Local Transport Plugin" plugin="Y">
+<unit bldFile="mw/websrv/webservices/wslocaltransportplugin/group"/>
+</component>
+<component name="wshostlettransportplugin" filter="s60" long-name="WS Hostlet Transport Plugin" plugin="Y">
+<unit bldFile="mw/websrv/webservices/wshostlettransportplugin/group"/>
+</component>
+<component name="wsstar" filter="s60" long-name="WS Star">
+<!-- can only have one unit. Need to split into separate components or #include from a single bld.inf -->
+<unit bldFile="mw/websrv/webservices/wsstar/wsstarpolicy/group"/>
+<unit bldFile="mw/websrv/webservices/wsstar/wsstarplugin/group"/>
+<unit bldFile="mw/websrv/webservices/wsstar/wsstarmessagehandlers/group"/>
+</component>
+<component name="wsoviplugin" filter="s60" long-name="WS Ovi Plugin">
+<unit bldFile="mw/websrv/webservices/wsoviplugin/group"/>
+</component>
+<component name="webservices_build" filter="s60" long-name="Web Services Build">
+<!-- need to split into self-contained components -->
+<unit bldFile="mw/websrv/webservices/group"/>
+</component>
+</collection>
+<collection name="websrv_info" long-name="Web Services Info" level="specific">
+<component name="websrv_bld" filter="s60" long-name="Web Services Build">
+<!-- need to include common .hrh in each unit -->
+<unit bldFile="mw/websrv/group"/>
+</component>
+</collection>
+</block>
+<block name="webruntime" level="specific" long-name="Web Runtime">
+<!-- need to break up this package into collections and components -->
+<collection name="webruntime_info" long-name="Web Runtime Info">
+<component name="webruntime_build" long-name="Web Runtime Build" introduced="^4">
+<unit bldFile="mw/webruntime" proFile="cwrt.pro" qmakeArgs=""what+=qtsfw" "what+=tenone" "what+=usif" "what+=services" "what+=wrtlite" "what+=exportiby""/>
+</component>
+</collection>
+</block>
+<block name="platformtools" level="generic" long-name="Platform Tools">
+<collection name="gfxconversion" long-name="Graphics Conversion">
+<component name="bmconv_s60" filter="s60" long-name="S60 Bitmap Converter" class="placeholder PC">
+<!-- Removed bmconv from builds <unit bldFile="gfxconversion/bmconv_s60/group"/> -->
+</component>
+<component name="mifconv" filter="s60" long-name="Multi Icon File Converter" class="PC">
+<unit bldFile="mw/platformtools/gfxconversion/mifconv/group"/>
+</component>
+</collection>
+</block>
+<block name="uitools" level="specific" long-name="UI Tools" levels="compile encode tool if">
+<collection name="uitools_pub" long-name="UI Tools Public Interfaces" level="if">
+<component name="third_party_bitmap_palette_api" long-name="Third Party Bitmap Palette API" filter="s60" class="api">
+<unit bldFile="mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
+</component>
+</collection>
+<collection name="uitools_plat" long-name="UI Tools Platform Interfaces" level="if">
+<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="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>
+<collection name="cdlcompilertoolkit" long-name="CDL Compiler Toolkit" level="compile">
+<!-- collection is actually a component. Needs to be moved down a directory -->
+<component name="cdlcompilertoolkit_build" filter="s60" long-name="CDL Compiler Toolkit Build">
+<unit bldFile="mw/uitools/cdlcompilertoolkit/group"/>
+</component>
+</collection>
+<collection name="cdlcompiler" long-name="CDL Compiler" level="compile">
+<!-- collection is actually a component. Needs to be moved down a directory -->
+<component name="cdlcompiler_build" filter="s60" long-name="CDL Compiler Build">
+<unit bldFile="mw/uitools/cdlcompiler/group"/>
+</component>
+</collection>
+<collection name="gfxtools" long-name="Graphics Tools" level="tool">
+<component name="color" filter="s60" long-name="Bitmap Colour Palette" class="PC">
+<unit bldFile="mw/uitools/gfxtools/color/group"/>
+</component>
+</collection>
+<collection name="aknlayoutcompiler" long-name="Avkon Layout Compiler" level="compile">
+<!-- collection is actually a component. Needs to be moved down a directory -->
+<component name="aknlayoutcompiler_build" filter="s60" long-name="Avkon Layout Compiler Build">
+<unit bldFile="mw/uitools/aknlayoutcompiler/group"/>
+</component>
+</collection>
+<collection name="skincompiler" long-name="Skin Compiler" level="compile">
+<component name="aknskindesccompiler" filter="s60" long-name="Avkon Skin Descriptor Compiler">
+<unit bldFile="mw/uitools/skincompiler/AknSkinDescCompiler/group"/>
+</component>
+</collection>
+<collection name="reszip" long-name="Resource Zip" level="encode">
+<!-- collection is actually a component. Needs to be moved down a directory -->
+<component name="reszip_build" filter="s60" long-name="Resource Zip Build">
+<unit bldFile="mw/uitools/reszip/group"/>
+</component>
+</collection>
+<collection name="toollibraries" long-name="Tool Libraries" level="tool"/>
+<collection name="svgtencoder" long-name="SVGT Encoder" level="encode">
+<component name="svgtenc" filter="s60" long-name="Standalone SVGT Encoder" class="PC">
+<unit bldFile="mw/uitools/svgtencoder/svgtenc/standalone/group"/>
+</component>
+</collection>
+</block>
+</layer>
+<layer name="app" long-name="Applications" levels="services apps">
+<block name="location" level="apps" long-name="Location Apps" levels="ui events loc api">
+<collection name="location_plat" long-name="Location Apps Platform Interfaces" level="api">
+<component name="location_picker_service_api" long-name="Location Picker Service API" introduced="^4" filter="s60" class="api">
+<unit bldFile="app/location/location_plat" proFile="location_plat.pro"/>
+</component>
+</collection>
+<collection name="locationpickerservice" long-name="Location Picker Service" level="loc">
+<!--collection is really a component. Should move down a directory -->
+<component name="locationpickerservice_build" filter="s60" long-name="Location Picker Service Build" introduced="^4">
+<unit bldFile="app/location/locationpickerservice" proFile="locationpickerservice.pro"/>
+</component>
+</collection>
+<collection name="locationdataharvester" long-name="Location Data Harvester" level="events">
+<!--collection is really a component. Should move down a directory -->
+<component name="locationdataharvester_build" long-name="Location Data Harvester Build" filter="s60" introduced="^4">
+<unit bldFile="app/location/locationdataharvester" proFile="locationdataharvester.pro"/>
+</component>
+</collection>
+</block>
+<!-- pending removal -->
+<block name="phone" level="apps" span="2" long-name="Phone Apps" levels="engine plugin ui app">
+<collection name="phoneapp" long-name="Phone Application" level="app">
+<component name="blacklist" filter="s60" long-name="Phone Blacklist Clearing" plugin="Y">
+<unit bldFile="app/phone/phoneapp/blacklist/group"/>
+</component>
+<component name="phoneuicontrol" filter="s60" long-name="Phone UI Control">
+<unit bldFile="app/phone/phoneapp/phoneuicontrol/group"/>
+</component>
+<component name="phoneuistates" filter="s60" long-name="Phone UI States">
+<unit bldFile="app/phone/phoneapp/phoneuistates/group"/>
+</component>
+<component name="phoneuiutils" filter="s60" long-name="Phone UI Utils">
+<unit bldFile="app/phone/phoneapp/phoneuiutils/group"/>
+</component>
+<component name="silenceactionplugin" filter="s60" long-name="Silence Action Plugin" plugin="Y">
+<unit bldFile="app/phone/phoneapp/silenceactionplugin/group"/>
+</component>
+<component name="phonemediatorcenter" filter="s60" long-name="Phone Mediator Center">
+<unit bldFile="app/phone/phoneapp/phonemediatorcenter/group"/>
+</component>
+<component name="phoneuiview2" filter="s60" long-name="Phone UI View">
+<unit bldFile="app/phone/phoneapp/phoneuiview2" proFile="phoneuiview2.pro"/>
+</component>
+<component name="phoneuiqtviewadapter" filter="s60" long-name="Phone UI Qt View Adapter" introduced="^4" plugin="Y">
+<unit bldFile="app/phone/phoneapp/phoneuiqtviewadapter" proFile="phoneuiqtviewadapter.pro"/>
+</component>
+<component name="phonestringloader" filter="s60" long-name="Phone String Loader" introduced="^4">
+<unit bldFile="app/phone/phoneapp/phonestringloader" proFile="phonestringloader.pro"/>
+</component>
+<component name="phoneui2" filter="s60" long-name="Phone UI">
+<unit bldFile="app/phone/phoneapp/phoneui2" proFile="phoneui2.pro"/>
+</component>
+</collection>
+<collection name="phoneengine" long-name="Phone Engine" level="engine">
+<component name="phonecntfinder2" filter="s60" long-name="Phone Contact Finder">
+<unit bldFile="app/phone/phoneengine/phonecntfinder2" proFile="phonecntfinder2.pro"/>
+</component>
+<component name="audiohandling" filter="s60" long-name="Phone Audio Handling">
+<unit bldFile="app/phone/phoneengine/audiohandling/group"/>
+</component>
+<component name="callhandling" filter="s60" long-name="Call Handling">
+<unit bldFile="app/phone/phoneengine/callhandling/group"/>
+</component>
+<component name="contacthandling2" filter="s60" long-name="Phone Contact Handling">
+<unit bldFile="app/phone/phoneengine/contacthandling2/group"/>
+</component>
+<component name="loghandling" filter="s60" long-name="Phone Log Handling">
+<unit bldFile="app/phone/phoneengine/loghandling/group"/>
+</component>
+<component name="engineinfo" filter="s60" long-name="Phone Engine Info">
+<unit bldFile="app/phone/phoneengine/engineinfo/group"/>
+</component>
+<component name="phonemodel" filter="s60" long-name="Phone Model">
+<unit bldFile="app/phone/phoneengine/phonemodel" proFile="phonemodel.pro"/>
+</component>
+<component name="servicehandling" filter="s60" long-name="Phone Service Handling">
+<unit bldFile="app/phone/phoneengine/servicehandling/group"/>
+</component>
+<component name="phoneservices" filter="s60" long-name="Phone Server" introduced="^4">
+<unit bldFile="app/phone/phoneengine/phoneservices" proFile="phoneservices.pro"/>
+</component>
+</collection>
+<collection name="phoneuis" long-name="Phone UIs" level="ui">
+<component name="bubblemanager2" filter="s60" long-name="Phone Bubble Manager">
+<unit bldFile="app/phone/phoneuis/bubblemanager2" proFile="bubblemanager2.pro"/>
+</component>
+<component name="telephonydevicemode" filter="s60" long-name="Telephony Device Mode">
+<unit bldFile="app/phone/phoneuis/telephonydevicemode/group"/>
+</component>
+</collection>
+<collection name="phone_plat" long-name="Phone Apps Platform Interfaces" level="app">
+<component name="3d_ringing_tone_enabler_api" long-name="3D Ringing Tone Enabler API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
+</component>
+<component name="telephony_comms_information_api" long-name="Telephony Comms Information API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/telephony_comms_information_api/group"/>
+</component>
+<component name="telephony_information_api" long-name="Telephony Information API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/telephony_information_api/group"/>
+</component>
+<component name="telephony_device_mode_api" long-name="Telephony Device Mode API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/telephony_device_mode_api/group"/>
+</component>
+<component name="telephony_remote_party_information_api" long-name="Telephony Remote Party Information API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/telephony_remote_party_information_api/group"/>
+</component>
+<component name="telephony_video_mailbox_settings_api" long-name="Telephony Video Mailbox Settings API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/telephony_video_mailbox_settings_api/group"/>
+</component>
+<component name="telephony_microphone_mute_status_api" long-name="Telephony Microphone Mute Status API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/telephony_microphone_mute_status_api/group"/>
+</component>
+<component name="telephony_logging_extension_api" long-name="Telephony Logging Extension API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/telephony_logging_extension_api/group"/>
+</component>
+<component name="telephony_matching_extension_api" long-name="Telephony Matching Extension API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/telephony_matching_extension_api/group"/>
+</component>
+<component name="phone_application_commands_api" long-name="Phone Application Commands API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/phone_application_commands_api/group"/>
+</component>
+<component name="phone_application_voip_commands_api" long-name="Phone Application VOIP Commands API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/phone_application_voip_commands_api/group"/>
+</component>
+<component name="phone_telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/telephony_mediator_api/group"/>
+</component>
+<component name="video_telephony_mediator_api" long-name="Video Telephony Mediator API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/video_telephony_mediator_api/group"/>
+</component>
+<component name="video_telephony_control_mediator_api" long-name="Video Telephony Control Mediator API" filter="s60" introduced="^4" class="api">
+<unit bldFile="app/phone/phone_plat/video_telephony_control_mediator_api/group"/>
+</component>
+</collection>
+<collection name="phoneplugins" long-name="Phone Plugins" level="plugin">
+<component name="csplugin" filter="s60" long-name="Circuit Switched Plugin" introduced="^4" plugin="Y">
+<unit bldFile="app/phone/phoneplugins/csplugin/group"/>
+</component>
+<component name="hsdialerwidgetplugin" filter="s60" long-name="Home Screen Dialer Widget Plugin" introduced="^4" plugin="Y">
+<unit bldFile="app/phone/phoneplugins/hsdialerwidgetplugin" proFile="hsdialerwidgetplugin.pro"/>
+</component>
+<component name="infowidgetplugin" filter="s60" long-name="Info Widget Plugin" introduced="^4" plugin="Y">
+<unit bldFile="app/phone/phoneplugins/infowidgetplugin" proFile="infowidgetplugin.pro"/>
+</component>
+</collection>
+<collection name="phonesettings" long-name="Phone Settings" level="plugin">
+<component name="cpphonesettingsplugins" filter="s60" long-name="CP Phone Settings Plugins" introduced="^4" plugin="Y">
+<unit bldFile="app/phone/phonesettings/cpphonesettingsplugins" proFile="cpphonesettingsplugins.pro"/>
+</component>
+</collection>
+</block>
+<block name="recents" level="apps" long-name="Recent Events" levels="engine support ui api">
+<collection name="recents_plat" long-name="Recent Events Platform Interfaces" level="api">
+<component name="logs_services_api" long-name="Logs Services API" filter="s60" introduced="^4" class="api"/>
+<component name="logs_engine_api" long-name="Logs Engine API" filter="s60" introduced="^4" class="api"/>
+<component name="logs_timers_api" long-name="Logs Timers API" filter="s60" class="api"/>
+<component name="logs_engine_api_extensions" long-name="Logs Engine API Extensions" filter="s60" class="api"/>
+</collection>
+<collection name="logsui" long-name="Logs UI" level="ui">
+<!-- split into actual components -->
+<component name="logsservices" filter="s60" long-name="Logs Services" introduced="^4" class="placeholder">
+<!-- <unit bldFile="logsui/logsservices" qt:proFile="logsui.pro"/> -->
+</component>
+<component name="logscntfinder" filter="s60" long-name="Logs Contact finder" class="placeholder">
+<!--<unit bldFile="logsui/logscntfinder" qt:proFile="logscntfinder.pro"/> -->
+</component>
+<component name="logsengine" filter="s60" long-name="Logs Engine" introduced="^4" class="placeholder">
+<!--<unit bldFile="logsui/logsengine" qt:proFile="logsengine.pro"/> -->
+</component>
+<component name="logsapp" filter="s60" long-name="Logs Application" class="placeholder">
+<!--<unit bldFile="logsui/logsengine" qt:proFile="logsengine.pro"/> -->
+</component>
+<component name="logsui_build" filter="s60" long-name="Logs UI Build">
+<unit bldFile="app/recents/logsui" proFile="logsui.pro"/>
+</component>
+</collection>
+</block>
+<block name="settingsuis" level="services" long-name="Settings UIs" levels="plugin ui">
+<collection name="controlpanelplugins" long-name="Control Panel Plugins" level="plugin">
+<component name="themeplugin" filter="s60" long-name="Theme Plugin" introduced="^4">
+<unit bldFile="app/settingsuis/controlpanelplugins/themeplugin" proFile="themeplugin.pro" qmakeArgs="-r -config rom"/>
+</component>
+</collection>
+<collection name="controlpanelui" long-name="Control Panel UI" level="ui">
+<!-- collection is really a component, move down a dir -->
+<component name="controlpanelui_build" filter="s60" long-name="Control Panel UI Build" introduced="^4">
+<unit bldFile="app/settingsuis/controlpanelui" proFile="controlpanelui.pro" qmakeArgs="-r -config rom"/>
+</component>
+</collection>
+</block>
+<block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin framework app">
+<collection name="contentctrl_plat" long-name="Content Control Daemons Platforn Interfaces" level="app">
+<component name="ds_contactsdatastoreextension_api" long-name="DS Contacts Data Store Extension API" filter="s60" introduced="^4" class="api">
+<unit bldFile="app/contentcontrol/contentctrl_plat/ds_contactsdatastoreextension_api/group"/>
+</component>
+<component name="ds_data_modification_api" long-name="DS Data Modification API" filter="s60" introduced="^3" class="api">
+<unit bldFile="app/contentcontrol/contentctrl_plat/ds_data_modification_api/group"/>
+</component>
+</collection>
+<collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
+<component name="secon" filter="s60" long-name="Service Controllers">
+<unit bldFile="app/contentcontrol/connectivitymodules/secon/group"/>
+</component>
+</collection>
+<collection name="dsdcmoadapter" long-name="Data Sync DCMO Adapter" level="plugin">
+<!-- Component at wrong rank, should move down a directory -->
+<component name="dsdcmoadapter_build" filter="s60" long-name="Data Sync Control DCMO Adapter">
+<unit bldFile="app/contentcontrol/dsdcmoadapter/group"/>
+</component>
+</collection>
+<collection name="omads" long-name="OMA Data Sync" level="app">
+<component name="omads_build" filter="s60" long-name="OMA DS Build">
+<unit bldFile="app/contentcontrol/omads/group"/>
+<!-- need to remove #include and rename and OMA DS ROM -->
+</component>
+<component name="omadsextensions" filter="s60" long-name="OMA DS Extensions" plugin="Y">
+<unit bldFile="app/contentcontrol/omads/omadsextensions/group"/>
+</component>
+<component name="omadsextensions_qt" filter="s60" long-name="OMA DS Qt Extensions" plugin="Y">
+<unit bldFile="app/contentcontrol/omads/omadsextensions" proFile="omadsextensions.pro"/>
+</component>
+</collection>
+</block>
+<block name="firsttimeuse" level="apps" long-name="First Time Use" levels="support services ui app">
+<!-- these empty collections are really components. Move down a directory and supply units -->
+<collection name="ftuapplication" long-name="First Time Use Application" level="app"/>
+<collection name="fturuntimeservices" long-name="First Time Use Runtime Services" level="services"/>
+<collection name="wizardproviders" long-name="Wizard Providers" level="support"/>
+<collection name="stateproviders" long-name="State Providers" level="support"/>
+<collection name="runtimeproviders" long-name="Runtime Providers" level="support"/>
+<collection name="firsttimeuse_info" long-name="First Time Use Info" level="ui">
+<component name="firsttimeuse_build" long-name="First Time Use Build">
+<unit bldFile="app/firsttimeuse" proFile="ftu.pro" qmakeArgs="-r -config rom"/>
+</component>
+</collection>
+</block>
+<block name="devicecontrol" level="services" long-name="Device Control Daemons" levels="support mid app">
+<collection name="devicemgmtdialogsplugin" long-name="Device Management Dialogs Plugin" level="support">
+<!-- need to put component at the proper directory level -->
+<component name="devicemanagementnotifiersplugin" long-name="Device Management Notifiers Plugin" filter="s60" introduced="^4" plugin="Y">
+<unit bldFile="app/devicecontrol/devicemgmtdialogsplugin" proFile="devicemgmtdialogsplugin.pro"/>
+</component>
+</collection>
+<collection name="deviceupdatesui" long-name="Device Updates UI" level="app">
+<component name="deviceupdates" long-name="Device Updates" filter="s60" introduced="^4">
+<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdates" proFile="deviceupdates.pro"/>
+</component>
+<component name="deviceupdatesplugin" long-name="Device Updates Plugin" filter="s60" introduced="^4" plugin="Y">
+<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdatesplugin" proFile="deviceupdatesplugin.pro"/>
+</component>
+<component name="deviceupdatesqtsp" long-name="Device Updates Qt Service Provider" filter="s60" introduced="^4">
+<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdatesqtsp" proFile="deviceupdatesqtsp.pro"/>
+</component>
+</collection>
+<collection name="clientprovisioning" long-name="Client Provisioning" level="mid">
+<component name="cpqtsp" long-name="Client Provisioning Qt Service Provider" filter="s60" introduced="^4">
+<unit bldFile="app/devicecontrol/clientprovisioning/cpqtsp" proFile="cpqtsp.pro"/>
+</component>
+</collection>
+<collection name="omadmadapters" long-name="OMA DM Adapters" level="support">
+<component name="omadmadapters_build" long-name="OMA DM Adapters Build" filter="s60">
+<!-- need to split IBY into the components or make this a ROM component -->
+<unit bldFile="app/devicecontrol/omadmadapters/bld"/>
+</component>
+<component name="devinfo" long-name="Device Info" filter="s60">
+<unit bldFile="app/devicecontrol/omadmadapters/devinfo/bld"/>
+</component>
+<component name="devdetail" long-name="Device Detail" filter="s60">
+<unit bldFile="app/devicecontrol/omadmadapters/devdetail/bld"/>
+</component>
+<component name="syncmldm" long-name="SyncML DM" filter="s60">
+<unit bldFile="app/devicecontrol/omadmadapters/syncmldm/bld"/>
+</component>
+<component name="syncmldm12" long-name="SyncML DM 1.2" filter="s60">
+<unit bldFile="app/devicecontrol/omadmadapters/syncmldm12/bld"/>
+</component>
+<component name="omadm_browseradapter" long-name="Browser Adapter" filter="s60" plugin="Y" class="placeholder">
+<!-- <unit bldFile="omadmadapters/browseradapter/bld"/> -->
+</component>
+<component name="omadm_streamingadapter" long-name="Streaming Adapter" filter="s60" plugin="Y">
+<unit bldFile="app/devicecontrol/omadmadapters/streamingadapter/bld"/>
+</component>
+<component name="globalwlansettings" long-name="Global WLAN Settings" filter="s60">
+<unit bldFile="app/devicecontrol/omadmadapters/globalwlansettings/group"/>
+</component>
+<component name="nsmldminternet" filter="s60" class="placeholder">
+<!-- <unit bldFile="omadmadapters/nsmldminternet/group"/> -->
+</component>
+<component name="nsmldmalwaysonadapter" long-name="Always Online Device Management Adapter" filter="s60" introduced="9.1" plugin="Y">
+<unit bldFile="app/devicecontrol/omadmadapters/nsmldmalwaysonadapter/group"/>
+</component>
+<component name="nsmldmbmadapter" long-name="NSML DM BM Adapter" filter="s60" plugin="Y">
+<unit bldFile="app/devicecontrol/omadmadapters/nsmldmbmadapter/group"/>
+</component>
+<component name="connmoadapter" long-name="Connection Management Object Adapter" filter="s60" plugin="Y">
+<unit bldFile="app/devicecontrol/omadmadapters/connmoadapter/group"/>
+</component>
+<component name="syncmlds" long-name="SyncML Data Sync" filter="s60">
+<unit bldFile="app/devicecontrol/omadmadapters/syncmlds/bld"/>
+</component>
+<component name="omadm_email" long-name="OMA DM Email" filter="s60">
+<unit bldFile="app/devicecontrol/omadmadapters/email/bld"/>
+</component>
+<component name="omadm_mms" long-name="OMA DM MMS" filter="s60">
+<unit bldFile="app/devicecontrol/omadmadapters/mms/bld"/>
+</component>
+<component name="omadm_fota" long-name="OMA DM FOTA" filter="s60">
+<!-- <unit bldFile="omadmadapters/fota/bld"/> -->
+</component>
+<component name="omadm_imps" long-name="OMA DM IMPS" filter="s60">
+<!-- <unit bldFile="omadmadapters/imps/bld"/> -->
+</component>
+<component name="dcmodmadapter" long-name="DC Management Object DM Adapter" filter="s60" plugin="Y" class="placeholder">
+<!-- <unit bldFile="omadmadapters/dcmodmadapter/group"/> -->
+</component>
+</collection>
+</block>
+<block name="printing" level="services" long-name="Printing"/>
+<block name="files" level="apps" long-name="File Manager Apps" levels="support apps">
+<collection name="filemanager" long-name="File Manager" level="apps">
+<component name="filemanager_plat" long-name="File Manager Platform Interfaces" filter="s60" introduced="^4" class="api"/>
+<component name="fmbkupengine" filter="s60,bldfirst" long-name="File Manager Backup Engine" introduced="^4">
+<unit bldFile="app/files/filemanager/src/fmbkupengine/group"/>
+</component>
+<component name="fmfiledialog" filter="s60,bldfirst" long-name="File Manager File Dialog" introduced="^4">
+<unit bldFile="app/files/filemanager/src/fmfiledialog" proFile="fmfiledialog.pro" qmakeArgs="-r -config rom"/>
+</component>
+<component name="filemanager_build" filter="s60" long-name="File Manager Build">
+<!-- break this up into components or move down a directory -->
+<unit bldFile="app/files/filemanager" qmakeArgs="-r" proFile="filemanager.pro"/>
+</component>
+</collection>
+</block>
+<block name="search" level="apps" long-name="Search Apps" levels="eng base app api">
+<collection name="search_info" long-name="Search Info">
+<component name="search_build" long-name="Search Build" introduced="^4">
+<unit bldFile="app/search/group"/>
+</component>
+</collection>
+<collection name="searchui" long-name="Search UI">
+<component name="searchui_build" long-name="Search UI Build" introduced="^4">
+<unit bldFile="app/search/searchui" proFile="searchui.pro"/>
+</component>
+</collection>
+</block>
+<block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
+<collection name="contacts_plat" long-name="Contacts Apps Platform Interfaces" level="ui">
+<component name="qt_mobility_contacts_api" long-name="Qt Mobility Contacts API" filter="s60" introduced="^4" class="api"/>
+</collection>
+<collection name="phonebookui" long-name="Phonebook UI" level="ui">
+<component name="cnthistorymodel" filter="s60" long-name="Contacts History Model" introduced="^4" class="placeholder">
+<!--<unit bldFile="phonebookui/cnthistorymodel" qt:proFile="cnthistorymodel.pro"/> -->
+</component>
+<component name="pbkcommonui" filter="s60" long-name="Phonebook Common UI" introduced="^4" class="placeholder">
+<!--<unit bldFile="phonebookui/pbkcommonui" qt:proFile="pbkcommonui.pro"/> -->
+</component>
+<component name="phonebookapp" filter="s60" long-name="Phonebook Application" introduced="^4" class="placeholder">
+<!--<unit bldFile="phonebookui/phonebookapp" qt:proFile="phonebookapp.pro"/> -->
+</component>
+<component name="phonebookservices" filter="s60" long-name="Phonebook Services" introduced="^4" class="placeholder">
+<!--<unit bldFile="phonebookui/phonebookservices" qt:proFile="phonebookservices.pro"/> -->
+</component>
+<component name="phonebookui_build" filter="s60" long-name="Phonebook UI Build" introduced="^4">
+<!-- break up into components -->
+<unit bldFile="app/contacts/phonebookui" proFile="phonebookui.pro"/>
+</component>
+</collection>
+<collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
+<component name="cntfindplugin" filter="s60" long-name="Contacts Find Plugin" introduced="^2" plugin="Y">
+<unit bldFile="app/contacts/phonebookengines/cntfindplugin" proFile="cntfindplugin.pro"/>
+</component>
+<component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
+<unit bldFile="app/contacts/phonebookengines_old/contactsmodel/groupsql" mrp="app/contacts/phonebookengines_old/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
+</component>
+<component name="cntsortplugin" filter="s60" long-name="Contacts Sort Plugin" introduced="^2" plugin="Y">
+<unit bldFile="app/contacts/phonebookengines/cntsortplugin" proFile="cntsortplugin.pro"/>
+</component>
+<component name="qtcontactsmobility" filter="s60" long-name="Qt Contacts Mobility" introduced="^4" plugin="Y">
+<!-- need to move to this actual dir rather than including something from another collection -->
+<unit bldFile="app/contacts/qtcontactsmobility" proFile="qtcontactsmobility.pro"/>
+</component>
+<component name="cntlistmodel" filter="s60" long-name="Contact List Model" introduced="^4">
+<unit bldFile="app/contacts/phonebookengines/cntlistmodel" proFile="cntlistmodel.pro"/>
+</component>
+<component name="cntactions" filter="s60" long-name="Contacts Actions" introduced="^4">
+<unit bldFile="app/contacts/phonebookengines/cntactions" proFile="cntactions.pro"/>
+</component>
+<component name="cntmaptileservice" filter="s60" long-name="Contacts Map Tile Service" introduced="^4">
+<unit bldFile="app/contacts/phonebookengines/cntmaptileservice" proFile="cntmaptileservice.pro"/>
+</component>
+<component name="cntsimutility" filter="s60" long-name="Contacts SIM Utility" introduced="^4">
+<unit bldFile="app/contacts/phonebookengines/cntsimutility" proFile="cntsimutility.pro"/>
+</component>
+<component name="cntimageutility" long-name="Contacts Image Utility" filter="s60" introduced="^4">
+<unit bldFile="app/contacts/phonebookengines/cntimageutility" proFile="cntimageutility.pro"/>
+</component>
+</collection>
+<collection name="pimprotocols" long-name="PIM Protocols" level="services">
+<component name="phonebooksync" long-name="Phonebook Sync" purpose="optional" plugin="Y">
+<unit bldFile="app/contacts/pimprotocols/phonebooksync/group" mrp="app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
+</component>
+<component name="pbap" filter="s60" long-name="Bluetooth PBAP" introduced="9.2" purpose="optional">
+<unit bldFile="app/contacts/pimprotocols/pbap/group" mrp="app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
+</component>
+</collection>
+<collection name="presencecache" long-name="Presence Cache" level="support">
+<component name="presencecachesymbian" filter="s60" long-name="Presence Cache Symbian" introduced="^4">
+<unit bldFile="app/contacts/presencecache/presencecachesymbian" proFile="presencecachesymbian.pro"/>
+</component>
+<component name="presencecacheqt" filter="s60" long-name="Presence Cache Qt" introduced="^4">
+<unit bldFile="app/contacts/presencecache/presencecacheqt" proFile="presencecacheqt.pro"/>
+</component>
+</collection>
+<collection name="contacts_info" long-name="Contacts Apps Info" level="ui">
+<component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="organizer" level="apps" span="2" long-name="Organizer Application Suite" levels="support services engine ui app">
+<collection name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" level="app">
+<component name="calendar_interim_utils2_api" long-name="Calendar Interim Utils 2 API" filter="s60" class="api">
+<!-- move into own .pro file -->
+<unit bldFile="app/organizer/organizer_pub" proFile="organizer_pub.pro"/>
+</component>
+</collection>
+<collection name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" level="app">
+<component name="organizer_plat_build" long-name="Organizer Application Suite Platform Interface Build" filter="s60" class="api">
+<!-- break up into individual .pro files, move the above metaxmls to those components -->
+<unit bldFile="app/organizer/organizer_plat" proFile="organizer_plat.pro"/>
+</component>
+<component name="agenda_versit_2_api" long-name="Agenda Versit 2 API" filter="s60" class="api placeholder">
+<!-- <unit bldFile="organizer_plat/agenda_versit_2_api/group"/>-->
+</component>
+<component name="calendar_exporter_api" long-name="Calendar Exporter API" filter="s60" class="api placeholder">
+<!--<unit bldFile="organizer_plat/calendar_exporter_api/group"/>-->
+</component>
+<component name="calendar_importer_api" long-name="Calendar Importer API" filter="s60" class="api placeholder">
+<!--<unit bldFile="organizer_plat/calendar_importer_api/group"/>-->
+</component>
+<component name="calendar_launcher_api" long-name="Calendar Launcher API" filter="s60" class="api placeholder">
+<!--<unit bldFile="organizer_plat/calendar_launcher_api/group"/> -->
+</component>
+<component name="agenda_interface_api" long-name="Agenda Interface API" filter="s60" introduced="^4" class="api"/>
+<component name="calendar_editor_api" long-name="Calendar Editor API" filter="s60" introduced="^4" class="api"/>
+<component name="notes_editor_api" long-name="Notes Editor API" filter="s60" introduced="^4" class="api"/>
+<component name="clock_settingsview_plugin_api" long-name="Clock Settings View Plugin API" filter="s60" introduced="^4" class="api"/>
+</collection>
+<collection name="agendainterface" long-name="Agenda Interface" level="services">
+<!-- collection is really a component, should move down a directory -->
+<component name="agendainterface_build" filter="s60" long-name="Agenda Interface Build">
+<unit bldFile="app/organizer/agendainterface" proFile="agendainterface.pro"/>
+</component>
+</collection>
+<collection name="calendarui" long-name="Calendar UI" level="ui">
+<component name="commonutils" filter="s60" long-name="Calendar Common Utils">
+<unit bldFile="app/organizer/calendarui/commonutils" proFile="commonutils.pro"/>
+</component>
+<component name="calenlauncher" filter="s60" long-name="Calendar Launcher">
+<unit bldFile="app/organizer/calendarui/calenlauncher" proFile="calenlauncher.pro"/>
+</component>
+<component name="caleneditor" filter="s60" long-name="Calendar Editor" introduced="^4">
+<unit bldFile="app/organizer/calendarui/caleneditor" proFile="caleneditor.pro"/>
+</component>
+<component name="agendaeventviewer" filter="s60" long-name="Agenda Event Viewer" introduced="^4">
+<unit bldFile="app/organizer/calendarui/agendaeventviewer" proFile="agendaeventviewer.pro"/>
+</component>
+<component name="globaldata" filter="s60" long-name="Calendar Global Data">
+<unit bldFile="app/organizer/calendarui/globaldata" proFile="globaldata.pro"/>
+</component>
+<component name="settings" filter="s60" long-name="Calendar Settings">
+<unit bldFile="app/organizer/calendarui/settings" proFile="settings.pro"/>
+</component>
+<component name="calenplugins" filter="s60" long-name="Calendar Plugins" introduced="^4" plugin="Y">
+<unit bldFile="app/organizer/calendarui/calenplugins" proFile="calenplugins.pro"/>
+</component>
+<component name="customisationmanager" filter="s60" long-name="Calendar Customisation Manager">
+<unit bldFile="app/organizer/calendarui/customisationmanager" proFile="customisationmanager.pro"/>
+</component>
+<component name="calendarui_views" filter="s60" long-name="Calendar Views">
+<unit bldFile="app/organizer/calendarui/views" proFile="views.pro"/>
+</component>
+<component name="calendarui_controller" filter="s60" long-name="Calendar Controller">
+<unit bldFile="app/organizer/calendarui/controller" proFile="controller.pro"/>
+</component>
+<component name="calendarui_application" filter="s60" long-name="Calendar Application">
+<unit bldFile="app/organizer/calendarui/application" proFile="application.pro"/>
+</component>
+<component name="regionalplugins" long-name="Regional Plugins" filter="s60" introduced="^4" plugin="Y">
+<unit bldFile="app/organizer/calendarui/regionalplugins" proFile="regionalplugins.pro"/>
+</component>
+<component name="calenviewerservice" long-name="Calendar Viewer Service" filter="s60" introduced="^4" plugin="Y">
+<unit bldFile="app/organizer/calendarui/calenviewerservice" proFile="calenviewerservice.pro"/>
+</component>
+<component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y" class="placeholder">
+<!-- not yet delivered in S^4 <unit bldFile="calendarui/caldav/group"/>-->
+</component>
+</collection>
+<collection name="notes" long-name="Notes" level="ui">
+<component name="notes_build" filter="s60" long-name="Notes Build" introduced="^4">
+<unit bldFile="app/organizer/notes" proFile="notes.pro"/>
+</component>
+</collection>
+<collection name="calendarengines" long-name="Calendar Engines" level="engine">
+<component name="versit2" filter="s60" long-name="Versit 2 iCal Parser" introduced="9.2">
+<unit bldFile="app/organizer/calendarengines/versit2/group"/>
+</component>
+<component name="agnversit2" filter="s60" long-name="Versit 2 Agenda Interface" introduced="9.2" plugin="Y">
+<unit bldFile="app/organizer/calendarengines/agnversit2/group"/>
+</component>
+<component name="caleninterimutils" filter="s60" long-name="Calendar Interim Utils" introduced="9.1">
+<unit bldFile="app/organizer/calendarengines/caleninterimutils/group"/>
+</component>
+<component name="calenimp" filter="s60" long-name="Calendar Import Wrapper" introduced="7.0s">
+<unit bldFile="app/organizer/calendarengines/calenimp/group"/>
+</component>
+<component name="caldavsrv" filter="sf_build" long-name="CalDAV Server" introduced="^3" class="placeholder">
+<!-- Not yet delivered in S^4 <unit bldFile="calendarengines/caldav/group"/> -->
+</component>
+</collection>
+<collection name="clock" long-name="Clock" level="app">
+<!-- uncomment unit when block_build is split up-->
+<component name="clockengines" filter="s60" long-name="Clock Engines" class="placeholder">
+<!--<unit bldFile="clock/clockengines" qt:proFile="clockengines.pro"/> -->
+</component>
+<component name="clockmw" filter="s60" long-name="Clock Middleware" introduced="^4" class="placeholder">
+<!--<unit bldFile="clock/clockmw" qt:proFile="clockmw.pro"/>-->
+</component>
+<component name="clockui" filter="s60" long-name="Clock UI" class="placeholder">
+<!--<unit bldFile="clock/clockui" qt:proFile="clockui.pro"/>-->
+</component>
+<component name="clock_build" filter="s60" long-name="Clock Build">
+<!-- make exports into a component, or just move to one of the above components, then remove this and uncomment the above -->
+<unit bldFile="app/organizer/clock" proFile="clock.pro"/>
+</component>
+</collection>
+<collection name="pimappservices" long-name="PIM Application Services" level="services">
+<component name="calendar" long-name="Calendar" introduced="9.2" purpose="optional">
+<unit bldFile="app/organizer/pimappservices/calendar/group" mrp="app/organizer/pimappservices/calendar/group/app-engines_calendar.mrp" version="2"/>
+</component>
+<component name="calendarvcalplugin" long-name="Calendar vCal Plugin" introduced="8.1" purpose="optional" plugin="Y">
+<unit bldFile="app/organizer/pimappservices/calendarvcalplugin/group" mrp="app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp" version="2"/>
+</component>
+<component name="appenginesdocs" long-name="Application Engines Documentation" purpose="development" class="doc">
+<unit mrp="app/organizer/pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
+</component>
+</collection>
+<collection name="pimappsupport" long-name="PIM Application Support" level="support">
+<component name="vcardandvcal" long-name="vCard and vCal" introduced="ER5" purpose="optional">
+<unit bldFile="app/organizer/pimappsupport/vcardandvcal/group" mrp="app/organizer/pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
+</component>
+<component name="chinesecalendarconverter" long-name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
+<unit bldFile="app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
+</component>
+<component name="chinesecalendaralg" long-name="Chinese Calendar Algorithm" introduced="^2" purpose="optional" plugin="Y">
+<unit bldFile="app/organizer/pimappsupport/chinesecalendaralg/group" mrp="app/organizer/pimappsupport/chinesecalendaralg/group/app-services_chinesecalendaralgorithm.mrp"/>
+</component>
+</collection>
+<collection name="alarmui" long-name="Alarm UI" level="app">
+<!-- collection is really a component, should move down a directory -->
+<component name="alarmui_build" filter="s60" long-name="Alarm UI Build">
+<unit bldFile="app/organizer/alarmui" proFile="alarmui.pro"/>
+</component>
+</collection>
+<collection name="organizer_info" long-name="Organizer Application Suite Info" level="app">
+<component name="organizer_metadata" long-name="Organizer Application Suite Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="plugin eng base app api">
+<collection name="msg_plat" long-name="Messaging Apps Platform APIs" level="api">
+<component name="messaging_media_resolver_api" long-name="Messaging Media Resolver API" filter="s60" class="api"/>
+<component name="mms_application_api" long-name="MMS Application API" filter="s60" class="api"/>
+<component name="mms_codec_client_api" long-name="MMS Codec Client API" filter="s60" class="api"/>
+<component name="mms_conformance_api" long-name="MMS Conformance API" filter="s60" class="api"/>
+<component name="mms_engine_settings_api" long-name="MMS Engine Settings API" filter="s60" class="api"/>
+<component name="mms_server_settings_api" long-name="MMS Server Settings API" filter="s60" class="api"/>
+<component name="conversation_services_client_api" long-name="Conversation Services Client API" filter="s60" introduced="^4" class="api"/>
+<component name="conversation_services_plugin_api" long-name="Conversation Services Plugin API" filter="s60" introduced="^4" class="api"/>
+<component name="conversation_services_utilities_api" long-name="Conversation Services Utilities API" filter="s60" introduced="^4" class="api"/>
+<component name="shareui_api" long-name="Share UI API" filter="s60" introduced="^4" class="api"/>
+<component name="messaging_history_api" long-name="Messaging History API" filter="s60" introduced="^4" class="api"/>
+<component name="msg_plat_build" long-name="Messaging Apps Platform APIs Build" filter="s60" introduced="^4" class="api">
+<!-- break this up into the above units and replace their base attributes with bldFile, etc -->
+<unit bldFile="app/messaging/msg_plat" proFile="msg_plat.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+<collection name="msg_pub" long-name="Messaging Apps Public APIs" level="api">
+<component name="mms_client_mtm_api" long-name="MMS Client MTM API" filter="s60" class="api"/>
+<component name="msg_smil_dtd_api" long-name="Messaging SMIL DTD API" filter="s60" introduced="^4" class="api"/>
+<component name="msg_pub_build" long-name="Messaging Apps Public APIs Build" filter="s60" introduced="^4" class="api">
+<!-- break this up into the above units and replace their base attributes with bldFile, etc -->
+<unit bldFile="app/messaging/msg_pub" proFile="msg_pub.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+<collection name="mobilemessaging" long-name="Mobile Messaging" level="plugin">
+<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
+<unit bldFile="app/messaging/mobilemessaging/smsmtm/group" mrp="app/messaging/mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
+</component>
+</collection>
+<collection name="messagingappbase" long-name="Messaging App Base" level="base">
+<component name="messagingappbase_build" filter="s60" long-name="Messaging App Base Build" introduced="^4">
+<!-- break this up into the below components -->
+<unit bldFile="app/messaging/messagingappbase" proFile="messagingappbase.pro" qmakeArgs="-r"/>
+</component>
+<component name="msgmedia" filter="s60" long-name="Message Media"/>
+<component name="smilparser" long-name="SMIL Parser" introduced="7.0s" purpose="optional">
+<unit bldFile="app/messaging/messagingappbase/smilparser/GROUP" mrp="app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
+</component>
+<component name="obexmtms" long-name="OBEX MTMs" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="app/messaging/messagingappbase/obexmtms/Group" mrp="app/messaging/messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
+</component>
+</collection>
+<collection name="mmsengine" long-name="MMS Engine" level="eng">
+<component name="mmsconninit" filter="s60" long-name="MMS Connection Initiator" class="placeholder">
+<!-- <unit bldFile="mmsengine/mmsconninit/bld"/> -->
+</component>
+<component name="genutils" filter="s60" long-name="General Utils" class="placeholder">
+<!-- <unit bldFile="mmsengine/genutils/bld"/> -->
+</component>
+<component name="mmsserversettings" filter="s60" long-name="MMS Server Settings" class="placeholder">
+<!-- <unit bldFile="mmsengine/mmsserversettings/bld"/> -->
+</component>
+<component name="mmsmessage" filter="s60" long-name="MMS Message" class="placeholder">
+<!-- <unit bldFile="mmsengine/mmsmessage/bld"/> -->
+</component>
+<component name="mmshttptransport" filter="s60" long-name="MMS HTTP Transport" class="placeholder">
+<!-- <unit bldFile="mmsengine/mmshttptransport/bld"/> -->
+</component>
+<component name="mmscodec" filter="s60" long-name="MMS Codec" class="placeholder">
+<!-- <unit bldFile="mmsengine/mmscodec/bld"/> -->
+</component>
+<component name="mmsserver" filter="s60" long-name="MMS Server" class="placeholder">
+<!-- <unit bldFile="mmsengine/mmsserver/bld"/> -->
+</component>
+<component name="clientmtm" filter="s60" long-name="MMS Client MTM" plugin="Y" class="placeholder">
+<!-- <unit bldFile="mmsengine/clientmtm/bld"/> -->
+</component>
+<component name="mmswatcher" filter="s60" long-name="MMS Watcher" plugin="Y" class="placeholder">
+<!-- <unit bldFile="mmsengine/mmswatcher/bld"/> -->
+</component>
+<component name="mmspushhandler" filter="s60" long-name="MMS Push Handler" plugin="Y" class="placeholder">
+<!-- <unit bldFile="mmsengine/mmspushhandler/bld"/> -->
+</component>
+<component name="applicationadapter" filter="s60" long-name="MMS Application Adapter" class="placeholder">
+<!-- <unit bldFile="mmsengine/applicationadapter/bld"/> -->
+</component>
+<component name="mmscodecclient" filter="s60" long-name="MMS Codec Client" class="placeholder">
+<!-- <unit bldFile="mmsengine/mmscodecclient/bld"/> -->
+</component>
+<component name="mmssettings" long-name="MMS Settings" introduced="9.2" purpose="optional">
+<unit bldFile="app/messaging/mmsengine/mmssettings/group" mrp="app/messaging/mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
+</component>
+<component name="mmsconf" long-name="MMS Configuration" purpose="optional">
+<unit bldFile="app/messaging/mmsengine/mmsconf" mrp="app/messaging/mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
+</component>
+<component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
+<!-- this should be broken up into the individual other components -->
+<unit bldFile="app/messaging/mmsengine" proFile="mmsengine.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+<collection name="messagingapp" long-name="Messaging Application" level="app">
+<component name="messaging_conf" filter="s60" long-name="Messaging Application Configuration" introduced="^4" class="config">
+<unit bldFile="app/messaging/messagingapp/conf" proFile="messaging_conf.pro" qmakeArgs="-r"/>
+</component>
+<component name="msgutils" filter="s60" long-name="Messaging Utils" introduced="^4">
+<unit bldFile="app/messaging/messagingapp/msgutils" proFile="msgutils.pro" qmakeArgs="-r"/>
+</component>
+<component name="msgappfw" filter="s60" long-name="Messaging Application Framework" introduced="^4">
+<unit bldFile="app/messaging/messagingapp/msgappfw" proFile="msgappfw.pro" qmakeArgs="-r"/>
+</component>
+<component name="msgsettings" filter="s60" long-name="Messaging Settings" introduced="^4">
+<unit bldFile="app/messaging/messagingapp/msgsettings" proFile="msgsettings.pro" qmakeArgs="-r"/>
+</component>
+<component name="msgnotifications" filter="s60" long-name="Messaging Notifications" introduced="^4">
+<unit bldFile="app/messaging/messagingapp/msgnotifications" proFile="msgnotifications.pro" qmakeArgs="-r"/>
+</component>
+<component name="smartmessaging" filter="s60" long-name="Smart Messaging">
+<unit bldFile="app/messaging/messagingapp/smartmessaging" proFile="smartmessaging.pro" qmakeArgs="-r"/>
+</component>
+<component name="shareui" filter="s60" long-name="Shared UI" introduced="^4">
+<unit bldFile="app/messaging/messagingapp/shareui" proFile="shareui.pro" qmakeArgs="-r"/>
+</component>
+<component name="msgui" filter="s60" long-name="Messaging UI" introduced="^4">
+<unit bldFile="app/messaging/messagingapp/msgui" proFile="msgui.pro" qmakeArgs="-r"/>
+</component>
+<component name="msgservices" filter="s60" long-name="Messaging Services" introduced="^4">
+<unit bldFile="app/messaging/messagingapp/msgservices" proFile="msgservices.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+<collection name="email" long-name="Email" level="plugin">
+<!-- use commonemail instead -->
+<component name="pop3andsmtpmtm" long-name="POP3 and SMTP MTM" purpose="optional" deprecated="^3" plugin="Y">
+<unit bldFile="app/messaging/email/pop3andsmtpmtm/group" mrp="app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
+</component>
+<component name="imap4mtm" long-name="IMAP4 MTM" introduced="9.2" purpose="optional" deprecated="^3" plugin="Y">
+<unit bldFile="app/messaging/email/imap4mtm/group" mrp="app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
+</component>
+</collection>
+<collection name="messaging_info" long-name="Messaging Apps Info" level="api">
+<component name="messaging_metadata" long-name="Messaging Apps Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="commonemail" level="apps" span="2" long-name="Email Apps" levels="service support ui app">
+<!-- need to resolve the qt parts into proper components, then uncomment the units -->
+<collection name="email_plat" long-name="Email Apps Platform Interfaces" level="app">
+<component name="nmail_client_api" long-name="NMail Client API" filter="s60" introduced="^4" class="api placeholder">
+<!--<unit bldFile="email_plat" qt:proFile="email_plat.pro"/> -->
+</component>
+</collection>
+<collection name="emailservices" long-name="Email Services" level="service">
+<component name="nmailbase" filter="s60" long-name="NMail Base" introduced="^4" class="placeholder">
+<!-- <unit bldFile="emailservices/nmailbase" qt:proFile="nmailbase.pro"/> -->
+</component>
+<component name="emailcommon" filter="s60" long-name="Email Common" introduced="^4" class="placeholder">
+<!-- <unit bldFile="emailservices/emailcommon" qt:proFile="emailcommon.pro"/>-->
+</component>
+<component name="emailframework" filter="s60" long-name="Email Framework" introduced="^2" class="placeholder">
+<!-- <unit bldFile="emailservices/emailframework" qt:proFile="emailframework.pro"/>-->
+</component>
+<component name="emailstore" filter="s60" long-name="Email Store" introduced="^2" class="placeholder">
+<!-- <unit bldFile="emailservices/emailstore" qt:proFile="emailstore.pro"/>-->
+</component>
+<component name="nmclientapi" filter="s60" long-name="Nmail Client API" introduced="^4" class="placeholder">
+<!-- <unit bldFile="emailservices/nmclientapi" qt:proFile="nmclientapi.pro"/>-->
+</component>
+<component name="nmailagent" filter="s60" long-name="Nmail Agent" introduced="^4" class="placeholder">
+<!-- <unit bldFile="emailservices/nmailagent" qt:proFile="nmailagent.pro"/>-->
+</component>
+<component name="nmutilities" filter="s60" long-name="Nmail Utilities" introduced="^4" class="placeholder">
+<!-- <unit bldFile="emailservices/nmutilities" qt:proFile="nmutilities.pro"/> -->
+</component>
+</collection>
+<collection name="ipsservices" long-name="IMAP/POP/SMTP Services" level="service">
+<component name="ipssosplugin" filter="s60" long-name="IPS SOS Plugin" introduced="^2" plugin="Y" class="placeholder">
+<!-- SOS? Consider spelling it out since the abbreviation is ambiguous -->
+<!--<unit bldFile="ipsservices/ipssosplugin" qt:proFile="ipssosplugin.pro" />-->
+</component>
+<component name="nmimapclientplugin" filter="s60" long-name="NM IMAP Client Plugin" introduced="^4" plugin="Y" class="placeholder">
+<!--<unit bldFile="ipsservices/nmimapclientplugin" qt:proFile="nmimapclientplugin.pro"/>-->
+</component>
+<component name="nmipsmtms" filter="s60" long-name="NM IPS Client Plugin" introduced="^4" plugin="Y" class="placeholder">
+<!-- <unit bldFile="ipsservices/nmipsmtms" qt:proFile="nmipsmtms.pro"/>-->
+</component>
+<component name="nmipssettings" filter="s60" long-name="NM IPS Settings" introduced="^4" class="placeholder">
+<!-- <unit bldFile="ipsservices/nmipssettings" qt:proFile="nmipssettings.pro"/>-->
+</component>
+<component name="ipsservices_build" filter="s60" long-name="IPS Services Build" introduced="^2" class="placeholder">
+<!--<unit bldFile="ipsservices" qt:proFile="ipsservices.pro"/> -->
+<!-- can the exports be broken up into the other components or made a config component?-->
+</component>
+</collection>
+<collection name="emailuis" long-name="Email UIs" level="app">
+<component name="nmailuiengine" filter="s60" long-name="Nmail UI Engine" introduced="^4" class="placeholder">
+<!-- <unit bldFile="emailuis/nmailuiengine" qt:proFile="nmailuiengine.pro"/> -->
+</component>
+<component name="nmailuiwidgets" filter="s60" long-name="Nmail UI Widgets" introduced="^4" class="placeholder">
+<!-- <unit bldFile="emailuis/nmailuiwidgets" qt:proFile="nmailuiwidgets.pro"/> -->
+</component>
+<component name="nmailuiwidgetsplugin" filter="s60" long-name="Nmail UI Widgets Plugin" introduced="^4" plugin="Y" class="placeholder">
+<!-- <unit bldFile="emailuis/nmailuiwidgetsplugin" qt:proFile="nmailuiwidgetsplugin.pro"/> -->
+</component>
+<component name="nmsettingui" filter="s60" long-name="Nmail Setting UI" introduced="^4" plugin="Y" class="placeholder">
+<!-- <unit bldFile="emailuis/nmsettingui" qt:proFile="nmsettingui.pro"/> -->
+</component>
+<component name="nmailcpplugin" filter="s60" long-name="Nmail CP Plugin" introduced="^4" plugin="Y" class="placeholder">
+<!-- <unit bldFile="emailuis/nmailcpplugin" qt:proFile="nmailcpplugin.pro"/> -->
+</component>
+<component name="nmailui" filter="s60" long-name="Nmail UI" introduced="^4" class="placeholder">
+<!-- <unit bldFile="emailuis/nmailui" qt:proFile="nmailui.pro"/> -->
+</component>
+<component name="nmindicatorplugin" filter="s60" long-name="Nmail Indicator Plugin" introduced="^4" plugin="Y" class="placeholder">
+<!-- <unit bldFile="emailuis/nmindicatorplugin" qt:proFile="nmindicatorplugin.pro"/> -->
+</component>
+<component name="nmframeworkadapter" filter="s60" long-name="Nmail Framework Adapter" introduced="^4" plugin="Y" class="placeholder">
+<!-- <unit bldFile="emailuis/nmframeworkadapter" qt:proFile="nmframeworkadapter.pro"/> -->
+</component>
+</collection>
+<collection name="commonemail_info" long-name="Email Apps Info" level="app">
+<component name="commonemail_build" long-name="Email Apps Build" introduced="^4">
+<!-- split into actual components -->
+<unit bldFile="app/commonemail/group"/>
+</component>
+</collection>
+</block>
+<block name="camera" level="apps" long-name="Camera Apps">
+<collection name="camerauis" long-name="Camera UIs">
+<component name="cameraxui" filter="s60" long-name="CameraX UIs">
+<unit bldFile="app/camera/camerauis/cameraxui" filter="!test" proFile="camerax.pro"/>
+</component>
+</collection>
+</block>
+<block name="imgeditor" level="apps" long-name="Image Editor"/>
+<block name="videoeditor" level="apps" long-name="Video Editor"/>
+<block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
+<collection name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" level="apps">
+<component name="videoplayer_startup_api" long-name="Video Player Startup API" filter="s60" class="api">
+<unit bldFile="app/videoplayer/videoplayer_plat/videoplayer_startup_api/group"/>
+</component>
+<component name="videocollection_api" long-name="Video Collection API" filter="s60" class="api">
+<unit bldFile="app/videoplayer/videoplayer_plat/videocollection_api/group"/>
+</component>
+</collection>
+<collection name="videocollection" long-name="Video Collection" level="util">
+<component name="mpxmyvideoscollection" filter="s60" long-name="MPX My Videos Collection" introduced="^3">
+<unit bldFile="app/videoplayer/videocollection/mpxmyvideoscollection/group" filter="!test"/>
+</component>
+<component name="videocollectionwrapper" filter="s60" long-name="Video Collection Wrapper" introduced="^4">
+<unit bldFile="app/videoplayer/videocollection/videocollectionwrapper" proFile="videocollectionwrapper.pro" qmakeArgs="-r"/>
+</component>
+<component name="videocollectionview" filter="s60" long-name="Video Collection View" introduced="^4">
+<unit bldFile="app/videoplayer/videocollection/videocollectionview" proFile="videocollectionview.pro" qmakeArgs="-r"/>
+</component>
+<component name="videofiledetailsview" filter="s60" long-name="Video File Details View" introduced="^4">
+<unit bldFile="app/videoplayer/videocollection/videofiledetailsview" proFile="videofiledetailsview.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+<collection name="mediasettings" long-name="Media Settings" level="support">
+<component name="mediasettingsengine" filter="s60" long-name="Media Settings Engine">
+<unit bldFile="app/videoplayer/mediasettings/mediasettingsengine/group"/>
+</component>
+<component name="videosettingsplugin" filter="s60" long-name="Video Settings Plugin" plugin="Y" class="placeholder">
+<!--<unit bldFile="mediasettings/videosettingsplugin" qt:proFile="videosettingsplugin.pro"/> -->
+</component>
+</collection>
+<collection name="videoplayerapp" long-name="Video Player App" level="apps">
+<component name="videoplayerengine" long-name="Video Player Engine" filter="s60" introduced="^4">
+<unit bldFile="app/videoplayer/videoplayerapp/videoplayerengine" proFile="videoplayerengine.pro" qmakeArgs="-r"/>
+</component>
+<component name="hbvideoplayer" filter="s60" long-name="Video Player" introduced="^4">
+<unit bldFile="app/videoplayer/videoplayerapp/videoplayer" proFile="videoplayer.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+<collection name="videoplayback" long-name="Video Playback Plugins" level="plugin">
+<component name="hbvideoplaybackview" filter="s60" long-name="HB Video Playback View" introduced="^4" plugin="Y">
+<unit bldFile="app/videoplayer/videoplayback/hbvideoplaybackview" proFile="hbvideoplaybackview.pro" qmakeArgs="-r"/>
+</component>
+<component name="hbvideoplaybackviewplugin" filter="s60" long-name="HB Video Playback View Plugin" introduced="^4" plugin="Y">
+<unit bldFile="app/videoplayer/videoplayback/hbvideoplaybackviewplugin" proFile="hbvideoplaybackviewplugin.pro" qmakeArgs="-r"/>
+</component>
+<component name="videohelix" long-name="Video Helix" filter="s60" introduced="^3" plugin="Y">
+<unit bldFile="app/videoplayer/videoplayback/videohelix/group" filter="!test"/>
+</component>
+</collection>
+</block>
+<block name="photos" level="apps" long-name="Photos" levels="util support ui app">
+<collection name="photos_group" long-name="Photos Group" level="support">
+<component name="photos_group_build" filter="s60" long-name="Photos Group Build" introduced="^4" class="placeholder">
+<!--<unit bldFile="group" qt:proFile="group.pro"/> -->
+</component>
+</collection>
+<collection name="photos_loggers" long-name="Photos Loggers" level="util">
+<component name="photos_loggerqt" filter="s60" long-name="Photos Logger Qt" introduced="^4" class="placeholder">
+<!--<unit bldFile="loggers/loggerqt" qt:proFile="loggerqt.pro"/> -->
+</component>
+</collection>
+<collection name="photos_commonutilities" long-name="Photos Common Utilities" level="util">
+<component name="photos_externalutility" filter="s60" long-name="Photos External Utility" introduced="^4" class="placeholder">
+<!--<unit bldFile="commonutilities/externalutility" qt:proFile="externalutility.pro"/> -->
+</component>
+<component name="imagedecoderwrapper" filter="s60" long-name="Image Decoder Wrapper" introduced="^4" class="placeholder">
+<!--<unit bldFile="commonutilities/imagedecoderwrapper" qt:proFile="imagedecoderwrapper.pro"/> -->
+</component>
+</collection>
+<collection name="photos_ui" long-name="Photos UI" level="ui">
+<!-- need to move exports from ui.pro into separate .pro or bld.inf -->
+<component name="detailscustomwidget " filter="s60" long-name="Details Custom Widget" introduced="^4" class="placeholder">
+<!--<unit bldFile="ui/detailscustomwidget " qt:proFile="detailscustomwidget .pro"/> -->
+</component>
+<component name="photos_uiengine" filter="s60" long-name="Photos UI Engine" introduced="^4" class="placeholder">
+<!--<unit bldFile="ui/uiengine" qt:proFile="uiengine.pro"/> -->
+</component>
+<component name="photos_commandhandlers" filter="s60" long-name="Photos Command Handlers" introduced="^4" class="placeholder">
+<!--<unit bldFile="ui/commandhandlers" qt:proFile="commandhandlers.pro"/> -->
+</component>
+<component name="photos_viewutilities" filter="s60" long-name="Photos View Utilities" introduced="^4" class="placeholder">
+<!--<unit bldFile="ui/viewutilities" qt:proFile="commandhandlers.pro"/> -->
+</component>
+<component name="photos_widgets" filter="s60" long-name="Photos Widgets" introduced="^4" class="placeholder">
+<!--<unit bldFile="ui/widgets" qt:proFile="widgets.pro"/> -->
+</component>
+<component name="photos_views" filter="s60" long-name="Photos Views" introduced="^4" class="placeholder">
+<!--<unit bldFile="ui/views" qt:proFile="views.pro"/> -->
+</component>
+<component name="photos_viewmanagement" filter="s60" long-name="Photos View Management" introduced="^4" class="placeholder">
+<!--<unit bldFile="ui/viewmanagement" qt:proFile="viewmanagement.pro"/> -->
+</component>
+</collection>
+<collection name="photos_main" long-name="Photos Main" level="support">
+<component name="photos_main_build" filter="s60" long-name="Photos Main Build" introduced="^4" class="placeholder">
+<!--<unit bldFile="main" qt:proFile="main.pro"/> -->
+</component>
+</collection>
+<collection name="gallery" long-name="Gallery" level="ui">
+<component name="gallery_build" filter="s60" long-name="Gallery Build" introduced="^4" class="placeholder">
+<!--<unit bldFile="gallery" qt:proFile="gallery.pro"/> -->
+</component>
+</collection>
+<collection name="imageviewerapp" long-name="Image Viewer App" level="support">
+<component name="imageviewerapp_build" filter="s60" long-name="Image Viewer App Build" introduced="^4" class="placeholder">
+<!--<unit bldFile="imageviewerapp" qt:proFile="imageviewerapp.pro"/> -->
+</component>
+</collection>
+<collection name="photos_info" long-name="Photos Info" level="support">
+<component name="photos_build" filter="s60" long-name="Photos Build" introduced="^4">
+<!-- split this up into the above components -->
+<unit bldFile="app/photos" proFile="photos.pro"/>
+</component>
+</collection>
+</block>
+<block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support engine app">
+<!-- move the rom .pri files into their components and uncomment the units -->
+<collection name="mpdata " long-name="Music Player Data" level="support">
+<!-- collection is really a component, move down a directory -->
+<component name="mpdata_build" filter="s60" long-name="Music Player Data Build" introduced="^4" class="placeholder">
+<!-- <unit bldFile="mpdata" qt:proFile="mpdata.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+</collection>
+<collection name="mpengine " long-name="Music Player Engine" level="engine">
+<!-- collection is really a component, move down a directory -->
+<component name="mpengine_build" filter="s60" long-name="Music Player Engine Build" introduced="^4" class="placeholder">
+<!-- <unit bldFile="mpengine" qt:proFile="mpengine.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+</collection>
+<collection name="musicplayer_utilities " long-name="Music Player Utilities" level="support">
+<component name="mpnowplayingbanner" filter="s60" long-name="MP Now Playing Banner" introduced="^4" class="placeholder">
+<!-- <unit bldFile="utilities/mpnowplayingbanner" qt:proFile="mpnowplayingbanner.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+<component name="mpsettingsmanager" filter="s60" long-name="MP Settings Manager" introduced="^4" class="placeholder">
+<!-- <unit bldFile="utilities/mpsettingsmanager" qt:proFile="mpsettingsmanager.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+</collection>
+<collection name="musicservices " long-name="Music Services" level="support">
+<!-- collection is really a component, move down a directory -->
+<component name="musicservices_build" filter="s60" long-name="Music Services Build" introduced="^4" class="placeholder">
+<!-- <unit bldFile="musicservices" qt:proFile="musicservices.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+</collection>
+<collection name="musicplayer_app " long-name="Music Player Application" level="app">
+<!-- collection is really a component, move down a directory -->
+<component name="musicplayer_app_build" filter="s60" long-name="Music Player Application Build" introduced="^4" class="placeholder">
+<!-- <unit bldFile="app" qt:proFile="app.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+</collection>
+<collection name="mpviewplugins" long-name="Music Player View Plugins" level="plugins">
+<component name="mpcollectionviewplugin" filter="s60" long-name="MP Collection View Plugin" introduced="^4" plugin="Y" class="placeholder">
+<!--<unit bldFile="mpviewplugins/mpcollectionviewplugin" qt:proFile="mpcollectionviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+<component name="mpplaybackviewplugin" filter="s60" long-name="MP Playback View Plugin" introduced="^4" plugin="Y" class="placeholder">
+<!--<unit bldFile="mpviewplugins/mpplaybackviewplugin" qt:proFile="mpplaybackviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+<component name="mpsettingsviewplugin" filter="s60" long-name="MP Settings View Plugin" introduced="^4" plugin="Y" class="placeholder">
+<!--<unit bldFile="mpviewplugins/mpsettingsviewplugin" qt:proFile="mpsettingsviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+<component name="mpdetailsviewplugin" filter="s60" long-name="MP Details View Plugin" introduced="^4" plugin="Y" class="placeholder">
+<!--<unit bldFile="mpviewplugins/mpdetailsviewplugin" qt:proFile="mpdetailsviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+<component name="mpmediawallviewplugin" filter="s60" long-name="MP Media Wall View Plugin" introduced="^4" plugin="Y" class="placeholder">
+<!--<unit bldFile="mpviewplugins/mpmediawallviewplugin" qt:proFile="mpmediawallviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+</collection>
+<collection name="musicwidgetplugin" long-name="Music Widget Plugin" level="plugins">
+<component name="musicwidgetplugin_build" filter="s60" long-name="Music Widget Plugin" introduced="^4" plugin="Y" class="placeholder">
+<!--<unit bldFile="musicwidgetplugin" qt:proFile="musicwidgetplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+</collection>
+<collection name="mpserviceplugins" long-name="Music Player Service Plugins" level="plugins">
+<component name="audioeffects" filter="s60" long-name="Audio Effects" introduced="^4" plugin="Y" class="placeholder">
+<!--<unit bldFile="mpserviceplugins/audioeffects/group"/>-->
+</component>
+<component name="localaudio" filter="s60" long-name="Local Audio" introduced="^4" plugin="Y" class="placeholder">
+<!--<unit bldFile="mpserviceplugins/localaudio/group"/>-->
+</component>
+<!-- Note: it's called SQLite, not SQLLite, just the one "L" -->
+<component name="mpxsqlitedbcommon" filter="s60" long-name="MPX SQLite Database Common" introduced="^4" class="placeholder">
+<!--<unit bldFile="mpserviceplugins/mpxsqlitedbcommon/group"/>-->
+</component>
+<component name="mpxsqlitedbhgplugin" filter="s60" long-name="MPX SQLite Database Hg Plugin" introduced="^4" plugin="Y" class="placeholder">
+<!--<unit bldFile="mpserviceplugins/mpxsqlitedbhgplugin/group"/>-->
+</component>
+<component name="mpxsqlitedbplugin" filter="s60" long-name="MPX SQLite Database Plugin" introduced="^4" plugin="Y" class="placeholder">
+<!--<unit bldFile="mpserviceplugins/mpxsqlitedbplugin/group"/>-->
+</component>
+<component name="mpxsqlitepodcastdbplugin" filter="s60" long-name="MPX SQLlite Podcast Database Plugin" introduced="^4" plugin="Y" class="placeholder">
+<!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
+</component>
+<component name="mpxinmemoryplugin" filter="s60" long-name="MPX In-Memory Plugin" introduced="^4" plugin="Y" class="placeholder">
+<!--<unit bldFile="mpserviceplugins/mpxinmemoryplugin/group"/>-->
+</component>
+<component name="m3uplaylistplugin" filter="s60" long-name="M3U Playlist Plugin" introduced="^4" plugin="Y" class="placeholder">
+<!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
+</component>
+</collection>
+<collection name="musicplayer_info" long-name="Music Player Apps Info" level="app">
+<component name="musicplayer_build" filter="s60" long-name="Music Player Build">
+<!-- break up into individual components. ROM includes should be in their components -->
+<unit bldFile="app/musicplayer" proFile="qtmusicplayer.pro" qmakeArgs="-r -config rom"/>
+</component>
+</collection>
+</block>
+<block name="radio" level="apps" long-name="Radio Apps" levels="engine plugin ui">
+<collection name="radioengine" long-name="Radio Engine" level="engine">
+<component name="radioengineutils" filter="s60" long-name="Radio Engine Utils" introduced="^4">
+<unit bldFile="app/radio/radioengine/utils/group"/>
+</component>
+<component name="radioenginesettings" filter="s60" long-name="Radio Engine Settings" introduced="^4">
+<unit bldFile="app/radio/radioengine/settings/group"/>
+</component>
+<component name="radioengine_engine" filter="s60" long-name="Radio Engine" introduced="^4">
+<unit bldFile="app/radio/radioengine/engine/group"/>
+</component>
+</collection>
+<collection name="radioapp" long-name="Radio App" level="ui">
+<component name="radioenginewrapper" filter="s60" long-name="Radio Engine Wrapper" introduced="^4">
+<unit bldFile="app/radio/radioapp/radioenginewrapper" proFile="radioenginewrapper.pro"/>
+</component>
+<component name="radiopresetstorage" filter="s60" long-name="Radio Preset Storage" introduced="^4">
+<unit bldFile="app/radio/radioapp/radiopresetstorage" proFile="radiopresetstorage.pro"/>
+</component>
+<component name="radiouiengine" filter="s60" long-name="Radio UI Engine" introduced="^4">
+<unit bldFile="app/radio/radioapp/radiouiengine" proFile="radiouiengine.pro"/>
+</component>
+<component name="radiowidgets" filter="s60" long-name="Radio Widgets" introduced="^4">
+<unit bldFile="app/radio/radioapp/radiowidgets" proFile="radiowidgets.pro"/>
+</component>
+<component name="radioapplication" filter="s60" long-name="Radio Application" introduced="^4">
+<unit bldFile="app/radio/radioapp/radioapplication" proFile="radioapplication.pro"/>
+</component>
+<component name="radio_rom" filter="s60" long-name="Radio ROM" introduced="^4">
+<unit bldFile="app/radio/rom"/>
+</component>
+</collection>
+<collection name="radiohswidget" long-name="Radio Homescreen Widget" level="plugin">
+<!-- collection is really a component. Move down a directory -->
+<component name="radiohswidget_build" filter="s60" long-name="Radio HS Widget Build" introduced="^4">
+<unit bldFile="app/radio/radiohswidget" proFile="radiohswidget.pro"/>
+</component>
+</collection>
+</block>
+<block name="internetradio" level="apps" long-name="Internet Radio Apps" levels="engine server ui">
+<collection name="internetradio2_0" long-name="Internet Radio 2.0" level="ui">
+<!-- collection is really a component. Move down a dir -->
+<component name="internetradio2_0_build" long-name="Internet Radio 2.0 Build">
+<unit bldFile="app/internetradio/internetradio2.0/group"/>
+</component>
+</collection>
+<collection name="presetserver" long-name="Preset Server" level="server">
+<!-- collection is really a component. Move down a dir -->
+<component name="presetserver_build" long-name="Preset Server Build">
+<unit bldFile="app/internetradio/presetserver/group"/>
+</component>
+</collection>
+<collection name="qtinternetradio" long-name="Qt Internet Radio">
+<component name="qtinternetradio_build" long-name="Qt Internet Radio Build">
+<!-- Move down a dir or break into components-->
+<unit bldFile="app/internetradio/qtinternetradio" proFile="all.pro" qmakeArgs="-r -config rom"/>
+</component>
+</collection>
+</block>
+<block name="podcatcher" level="apps" long-name="Podcatcher" levels="app">
+<collection name="podcatcher_info" long-name="Podcatcher" level="app">
+<component name="podcatcher_build" filter="sf_build" long-name="Podcatcher Build" introduced="^3">
+<!-- has exports from top level bld.inf -->
+<unit bldFile="app/podcatcher/group"/>
+</component>
+<component name="podcatcher_app" filter="sf_build" long-name="Podcatcher Application" introduced="^3">
+<unit bldFile="app/podcatcher/application/group"/>
+</component>
+<component name="podcatcher_engine" filter="sf_build" long-name="Podcatcher Engine" introduced="^3">
+<unit bldFile="app/podcatcher/engine/group"/>
+</component>
+</collection>
+</block>
+<block name="homescreen" level="apps" long-name="Home Screen Apps" levels="support task ss hs">
+<collection name="homescreen_test" long-name="Home Screen Test" level="support"/>
+<collection name="homescreenapp" long-name="Home Screen Application" level="hs">
+<component name="hsutils" long-name="Home Screen Utils" introduced="^4">
+<unit bldFile="app/homescreen/homescreenapp/hsutils" proFile="hsutils.pro" qmakeArgs="-r -config rom"/>
+</component>
+<component name="hsdomainmodel" long-name="HS Domain Model" introduced="^4">
+<unit bldFile="app/homescreen/homescreenapp/hsdomainmodel" proFile="hsdomainmodel.pro" qmakeArgs="-r -config rom"/>
+</component>
+<component name="hs_runtimeplugins" long-name="HS Runtime Plugins" introduced="^4" plugin="Y">
+<unit bldFile="app/homescreen/homescreenapp/runtimeplugins" proFile="runtimeplugins.pro" qmakeArgs="-r -config rom"/>
+</component>
+<component name="hs_serviceproviders" long-name="HS Service Providers" introduced="^4" plugin="Y">
+<unit bldFile="app/homescreen/homescreenapp/serviceproviders" proFile="serviceproviders.pro" qmakeArgs="-r -config rom"/>
+</component>
+<component name="hs_stateplugins" long-name="HS State Plugins" introduced="^4" plugin="Y">
+<unit bldFile="app/homescreen/homescreenapp/stateplugins" proFile="stateplugins.pro" qmakeArgs="-r -config rom"/>
+</component>
+<component name="hs_widgetplugins" long-name="HS Widget Plugins" introduced="^4" plugin="Y">
+<unit bldFile="app/homescreen/homescreenapp/widgetplugins" proFile="widgetplugins.pro" qmakeArgs="-r -config rom"/>
+</component>
+<component name="hsapplication" long-name="Home Screen Application" introduced="^4">
+<unit bldFile="app/homescreen/homescreenapp/hsapplication" proFile="hsapplication.pro" qmakeArgs="-r -config rom"/>
+</component>
+<component name="hsmenuclientplugin" long-name="Home Screen Menu Client Plugin" introduced="^4" plugin="Y">
+<unit bldFile="app/homescreen/homescreenapp/hsmenuclientplugin" proFile="hsmenuclientplugin.pro" qmakeArgs="-r -config rom"/>
+</component>
+<component name="hshomescreenclientplugin" long-name="HS Menu Client Plugin" introduced="^4" plugin="Y">
+<unit bldFile="app/homescreen/homescreenapp/hshomescreenclientplugin" proFile="hshomescreenclientplugin.pro" qmakeArgs="-r -config rom"/>
+</component>
+<component name="hswidgetuninstaller" long-name="HS Widget Uninstaller" introduced="^4">
+<unit bldFile="app/homescreen/homescreenapp/hswidgetuninstaller" proFile="hswidgetuninstaller.pro" qmakeArgs="-r -config rom"/>
+</component>
+<component name="homescreenapp_rom" long-name="Home Screen App ROM" introduced="^4">
+<unit bldFile="app/homescreen/homescreenapp" proFile="homescreenapp_exports_to_rom.pri" qmakeArgs="-r -config rom"/>
+</component>
+</collection>
+<collection name="taskswitcherapp" long-name="Task Switcher Application" level="task">
+<!-- break collection info components, or move down a dir and make it a component -->
+<component name="taskswitcherapp_build" long-name="Task Switcher Application Build">
+<unit bldFile="app/homescreen/taskswitcherapp" proFile="taskswitcherapp.pro" qmakeArgs="-r -config rom"/>
+</component>
+<component name="tsdevicedialogplugin" long-name="Task Switcher Device Dialog Plugin" introduced="^4" plugin="Y"/>
+</collection>
+</block>
+<block name="jrt" level="services" long-name="Java Runtime" levels="util generic rt ui">
+<collection name="jrt_plat" long-name="JRT Platform Interfaces" level="ui">
+<component name="java_registry_api" long-name="Java Registry API" filter="s60" class="api">
+<unit bldFile="app/jrt/jrt_plat/java_registry_api/build"/>
+</component>
+<component name="java_env_info_api" long-name="Java Environment Info API" filter="s60" class="api">
+<unit bldFile="app/jrt/jrt_plat/java_env_info_api/build"/>
+</component>
+<component name="java_debug_api" long-name="Java Debug API" filter="s60" class="api">
+<unit bldFile="app/jrt/jrt_plat/java_debug_api/build"/>
+</component>
+</collection>
+<collection name="java_stubs" long-name="Java Stubs" level="rt">
+<component name="java_stubs_build" long-name="Build Native Java" filter="sf_build" introduced="^4">
+<unit bldFile="app/jrt/java_stubs/group"/>
+</component>
+</collection>
+<collection name="build_nativejava" long-name="Build Native Java">
+<component name="nativejava" long-name="Build Native Java" filter="s60" introduced="^4">
+<unit bldFile="app/jrt/build/nativejava" filter="!sf_build" proFile="nativejava.pro" qmakeArgs="-r"/>
+<unit bldFile="app/jrt/build/nativejava" filter="sf_build" proFile="nativejava.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
+</component>
+</collection>
+<collection name="javacommons" long-name="Java Commons" level="generic">
+<component name="javacommons_build" filter="s60" long-name="JRT Build">
+<unit bldFile="app/jrt/javacommons" filter="!sf_build" proFile="javacommons.pro" qmakeArgs="-r"/>
+<unit bldFile="app/jrt/javacommons" filter="sf_build" proFile="javacommons.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
+</component>
+</collection>
+<collection name="javaruntimes" long-name="Java Runtimes" level="rt">
+<component name="javaruntimes_build" filter="s60" long-name="JRT Build">
+<unit bldFile="app/jrt/javaruntimes" filter="!sf_build" proFile="javaruntimes.pro" qmakeArgs="-r"/>
+<unit bldFile="app/jrt/javaruntimes" filter="sf_build" proFile="javaruntimes.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
+</component>
+</collection>
+<collection name="javauis" long-name="Java UIs" level="ui">
+<component name="javauis_build" filter="s60" long-name="JRT Build">
+<unit bldFile="app/jrt/javauis" filter="!sf_build" proFile="javauis.pro" qmakeArgs="-r"/>
+<unit bldFile="app/jrt/javauis" filter="sf_build" proFile="javauis.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
+</component>
+</collection>
+<collection name="javamanager" level="generic">
+<component name="javamanager_build" filter="s60" long-name="JRT Build">
+<unit bldFile="app/jrt/javamanager" filter="!sf_build" proFile="javamanager.pro" qmakeArgs="-r"/>
+<unit bldFile="app/jrt/javamanager" filter="sf_build" proFile="javamanager.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
+</component>
+</collection>
+<collection name="javatools" long-name="Java Tools" level="util">
+<component name="javatools_build" filter="s60" long-name="JRT Build">
+<unit bldFile="app/jrt/javatools" filter="!sf_build" proFile="javatools.pro" qmakeArgs="-r"/>
+<unit bldFile="app/jrt/javatools" filter="sf_build" proFile="javatools.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
+</component>
+</collection>
+<collection name="javaextensions" long-name="Java Extensions" level="generic">
+<component name="javaextensions_build" filter="s60" long-name="JRT Build">
+<unit bldFile="app/jrt/javaextensions" filter="!sf_build" proFile="javaextensions.pro" qmakeArgs="-r"/>
+<unit bldFile="app/jrt/javaextensions" filter="sf_build" proFile="javaextensions.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
+</component>
+</collection>
+</block>
+<block name="browserui" level="services" long-name="Browser UI" levels="utils support ui">
+<collection name="browserui_info" long-name="Browser UI Info" level="ui">
+<component name="browserui_build" long-name="Bookmarks Engine Build" introduced="^4">
+<unit bldFile="app/browserui" proFile="browserui.pro"/>
+</component>
+</collection>
+</block>
+<block name="conntools" level="services" long-name="Connectivity Tools" levels="config app">
+<collection name="nettools" long-name="Net Tools" level="app">
+<component name="conntest" filter="s60" long-name="Connection Test" purpose="development">
+<unit bldFile="app/conntools/nettools/conntest/group"/>
+</component>
+</collection>
+<collection name="emulatorlan" long-name="Emulator LAN" level="config">
+<!-- component is actually a colleciton, should be moved down a directory -->
+<component name="emulatorlan_build" filter="s60" long-name="Emulator LAN Build" purpose="development" class="config">
+<unit bldFile="app/conntools/emulatorlan/group"/>
+</component>
+</collection>
+</block>
+<block name="rndtools" level="services" long-name="R&D tools" levels="support generic test util">
+<collection name="creator" long-name="Creator" level="support">
+<!-- collection is really a component. Should move down a directory -->
+<component name="creator_build" filter="s60" long-name="Creator Tool" purpose="development" class="tool">
+<unit bldFile="app/rndtools/creator" proFile="creator.pro"/>
+</component>
+</collection>
+<collection name="filebrowser" long-name="File Browser" level="util">
+<!-- collection is really a component. Should move down a directory -->
+<component name="filebrowser_build" filter="s60" long-name="File Browser Build" purpose="development" class="tool">
+<unit bldFile="app/rndtools/filebrowser" proFile="filebrowser.pro"/>
+</component>
+</collection>
+<collection name="launcher" long-name="Launcher" level="util">
+<!-- collection is really a component. Should move down a directory -->
+<component name="launcher_build" filter="s60" long-name="Launcher Utility" purpose="development" class="tool">
+<unit bldFile="app/rndtools/launcher" proFile="launcher.pro"/>
+</component>
+</collection>
+<collection name="loadgen" long-name="Load Generator" level="test">
+<!-- collection is really a component. Should move down a directory -->
+<component name="loadgen_build" filter="s60" long-name="Load Generator Application" purpose="development" class="tool">
+<unit bldFile="app/rndtools/loadgen" proFile="loadgen.pro"/>
+</component>
+</collection>
+<collection name="perfmon" long-name="Performance Monitor" level="test">
+<!-- collection is really a component. Should move down a directory -->
+<component name="perfmon_build" filter="s60" long-name="Performance Monitor Tool" purpose="development" class="tool">
+<unit bldFile="app/rndtools/perfmon" proFile="perfmon.pro"/>
+</component>
+</collection>
+<collection name="piprofilerui" long-name="Performance Investigator Profiler UI" level="generic">
+<!-- collection is really a component. Should move down a directory -->
+<component name="piprofilerui_build" filter="s60" long-name="Performance Investigator Profiler UI Build" purpose="development" introduced="^4">
+<unit bldFile="app/rndtools/piprofilerui" proFile="piprofilerui.pro"/>
+</component>
+</collection>
+<collection name="screengrabber" long-name="Screen Grabber" level="util">
+<!-- collection is really a component. Should move down a directory -->
+<component name="screengrabber_build" filter="s60" long-name="ScreenGrabber" purpose="development" class="tool">
+<unit bldFile="app/rndtools/screengrabber" proFile="screengrabber.pro"/>
+</component>
+</collection>
+<collection name="stifui" long-name="STIF UI" level="generic">
+<component name="stifuiqt" filter="s60" long-name="STIF Qt UI" purpose="development" introduced="^4">
+<unit bldFile="app/rndtools/stifui/qt" proFile="stifqtui.pro"/>
+<!-- should use stifuiqt as the dir name -->
+</component>
+</collection>
+<collection name="memspyui" long-name="Memspy UI" level="generic">
+<!-- collection is really a component. Should move down a directory -->
+<component name="memspyui_build" filter="s60" long-name="Memspy UI Application" purpose="development" class="tool">
+<unit bldFile="app/rndtools/memspyui" proFile="memspyui.pro"/>
+</component>
+</collection>
+<collection name="htiui" long-name="Harmonized Test Interface UI" level="generic">
+<component name="htiui_build" filter="s60" long-name="HTI UI Build" purpose="development">
+<!-- should split up into individual components -->
+<unit bldFile="app/rndtools/htiui/group"/>
+</component>
+<component name="htiadminqt" filter="s60" long-name="HTI Admin Qt" purpose="development">
+<unit bldFile="app/rndtools/htiui/htiadminqt" proFile="HtiAdmin.pro"/>
+</component>
+</collection>
+</block>
+<block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools if ui">
+<collection name="userguide" long-name="User Guide" level="if">
+<!-- collection is really a component. Move down a directory -->
+<component name="userguide_build" long-name="User Guide Build" filter="s60" introduced="^4">
+<unit bldFile="app/helps/userguide" proFile="Userguide.pro"/>
+</component>
+</collection>
+<collection name="symhelp" long-name="Symbian Help" level="eng">
+<component name="helpmodel" long-name="Help" introduced="6.0" purpose="optional">
+<unit bldFile="app/helps/symhelp/helpmodel/group" mrp="app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
+</component>
+</collection>
+</block>
+<block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
+<collection name="buildverification" long-name="Build Verification" level="services">
+<component name="autosmoketest" long-name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
+<unit bldFile="app/techview/buildverification/autosmoketest/Group" mrp="app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
+</component>
+<component name="smoketest" long-name="Smoke Test" filter="gt" purpose="development">
+<unit bldFile="app/techview/buildverification/smoketest/Group" mrp="app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
+</component>
+</collection>
+<collection name="techviewplat" long-name="Techview Platform" level="services"/>
+<collection name="techviewui" long-name="Techview UI" 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"/>
+<collection name="installationapps" long-name="Installation Apps" level="apps2"/>
+<collection name="messagingapps" long-name="Messaging Apps" level="apps2"/>
+<collection name="telephonyapps" long-name="Telephony Apps" level="apps1"/>
+<collection name="networkingapps" long-name="Networking Apps" level="apps1"/>
+<collection name="networkingutils" long-name="Networking Utils" level="utils"/>
+<collection name="shortlinkapps" long-name="Shortlink Apps" level="apps1"/>
+<collection name="testapps" long-name="Test Apps" level="utils"/>
+<collection name="avapps" long-name="A/V Apps" level="apps3"/>
+<collection name="toolkit" long-name="Toolkit" level="utils"/>
+<collection name="techview_info" long-name="Techview Info" level="apps3">
+<component name="techview_metadata" long-name="Techview Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="app/techview/techview_info/techview_metadata/techview_metadata.mrp"/>
+</component>
+</collection>
+</block>
+</layer>
+</systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian4/single/sysdefs/auto/system_model_3.0.xml Tue Jul 13 12:21:44 2010 +0100
@@ -0,0 +1,9097 @@
+<?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^4">
+<layer id="adaptation" name="Adaptation" levels="low mw high">
+<package id="stubs" tech-domain="hb" level="high" span="2" name="Stubs" levels="adaptation plugin mid engine">
+<collection id="audiostubs" name="Audio Stubs" level="adaptation">
+<component id="devsoundextensions_stubs" name="Devsound Extensions Stubs">
+<unit bldFile="/adaptation/stubs/audiostubs/devsoundextensions_stubs/group"/>
+</component>
+<component id="fmradiotunercontrolstub" name="FM Radio Tuner Control Stub">
+<unit bldFile="/adaptation/stubs/audiostubs/fmradiotunercontrolstub/group"/>
+</component>
+</collection>
+<collection id="btaudioadaptation_stub" name="Bluetooth Audio Adaptation Stub" level="adaptation">
+<component id="btaudioadaptation_stub_build" name="Bluetooth Audio Adaptation Stub Build" filter="oem_build">
+<unit bldFile="/adaptation/stubs/btaudioadaptation_stub/group"/>
+</component>
+</collection>
+<collection id="drm_stubs" name="DRM Stubs" level="plugin">
+<component id="drm_stubs_build" name="DRM Stubs Build">
+<unit bldFile="/adaptation/stubs/drm_stubs/group"/>
+</component>
+</collection>
+<collection id="ocrsrv_stub" name="OCR Services Stub" level="mid">
+<component id="ocrsrv_stub_build" name="OCR Services Stub Build" filter="!dfs_build">
+<unit bldFile="/adaptation/stubs/ocrsrv_stub/group"/>
+</component>
+</collection>
+<collection id="omasuplasnconverterstubimpl" name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
+<component id="omasuplasnconverterstubimpl_build" name="OMA SUPL ASN Converter Stub Implementation Build" filter="!dfs_build">
+<unit bldFile="/adaptation/stubs/omasuplasnconverterstubimpl/group"/>
+</component>
+</collection>
+<collection id="posmsgpluginreferenceimpl" name="POS Message Plugin Reference Implementation" level="plugin">
+<component id="posmsgpluginreferenceimpl_build" name="POS Message Plugin Reference Implementation Build" class="plugin">
+<unit bldFile="/adaptation/stubs/posmsgpluginreferenceimpl/group"/>
+</component>
+</collection>
+<collection id="srsfenginestub" name="SRSF Engine Stub" level="engine">
+<component id="srsfenginestub_build" name="SRSF Engine Stub Build" filter="stubs">
+<unit bldFile="/adaptation/stubs/srsfenginestub/group"/>
+</component>
+</collection>
+<collection id="power_save_display_mode_stub" name="Power Save Display Mode Stub" level="plugin">
+<component id="power_save_display_mode_stub_build" name="Power Save Display Mode Stub Build">
+<unit bldFile="/adaptation/stubs/power_save_display_mode_stub/group"/>
+</component>
+</collection>
+<collection id="systemswstubs" name="System Software Stubs" level="adaptation">
+<component id="ddcaccessstub" name="DDC Access Stub">
+<unit bldFile="/adaptation/stubs/systemswstubs/ddcaccessstub/group"/>
+</component>
+<component id="tvoutconfig" name="TV Out Config">
+<unit bldFile="/adaptation/stubs/systemswstubs/TVOutConfig/group" filter="oem_build"/>
+</component>
+<component id="accessorypolicyreference" name="Accessory Policy Reference">
+<meta rel="config">
+<defined condition="__ACCESSORY_FW"/>
+</meta>
+<unit bldFile="/adaptation/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
+</component>
+<component id="asyreference" name="ASY Reference" class="plugin">
+<meta rel="config">
+<defined condition="__ACCESSORY_FW"/>
+</meta>
+<unit bldFile="/adaptation/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
+</component>
+<component id="examplecommonisc" name="Example Common ISC">
+<unit bldFile="/adaptation/stubs/systemswstubs/examplecommonisc/group" filter="oem_build"/>
+</component>
+<component id="exampledsy" name="Example DSY">
+<meta rel="config">
+<defined condition="RD_STARTUP_CHANGE"/>
+</meta>
+<unit bldFile="/adaptation/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
+</component>
+<component id="featuremanagerstub" name="Feature Manager Stub">
+<unit bldFile="/adaptation/stubs/systemswstubs/featuremanagerstub/group" filter="oem_build"/>
+</component>
+<component id="hwrmstubplugins" name="Hardware Resource Manager Stub Plugins" class="plugin">
+<unit bldFile="/adaptation/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
+</component>
+<component id="hwrmhapticsstubplugin" name="Hardware Resource Manager Haptics Stub Plugin" class="plugin">
+<unit bldFile="/adaptation/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
+</component>
+<component id="sensorchannelsreference" name="Sensor Channels Reference">
+<unit bldFile="/adaptation/stubs/systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
+</component>
+<component id="ssyreference" name="SSY Reference" class="plugin">
+<meta rel="config">
+<defined condition="RD_SENSOR_FW"/>
+</meta>
+<unit bldFile="/adaptation/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
+</component>
+<component id="startupadaptationstub" name="Startup Adaptation Stub" class="plugin">
+<unit bldFile="/adaptation/stubs/systemswstubs/startupadaptationstub/group" filter="oem_build"/>
+</component>
+<component id="tiltcompensationstub" name="Tilt Compensation Stub">
+<unit bldFile="/adaptation/stubs/systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
+</component>
+<component id="tvoutbehaviour" name="TV Out Behaviour">
+<unit bldFile="/adaptation/stubs/systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
+</component>
+<component id="wiredbearerreference" name="Wired Bearer Reference" class="plugin">
+<unit bldFile="/adaptation/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
+</component>
+</collection>
+<collection id="tactileclickplugin_stub" name="Tactile Click Plugin Stub" level="engine">
+<meta rel="config">
+<defined condition="RD_TACTILE_FEEDBACK"/>
+</meta>
+<component id="tactileclickplugin_stub_build" name="Tactile Click Plugin Stub Build" class="plugin">
+<unit bldFile="/adaptation/stubs/tactileclickplugin_stub/group"/>
+</component>
+</collection>
+<collection id="wlanhwinit_stub" name="WLAN Hardware Init Stub" level="mid">
+<component id="wlanhwinit_stub_build" name="WLAN Hardware Init Stub Build">
+<unit bldFile="/adaptation/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"/>
+</component>
+<component id="omap3530_kernel" name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
+<unit bldFile="/adaptation/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"/>
+</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"/>
+</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">
+<collection id="brdbootldr" name="Board Boot Loader" level="hw-if">
+<component id="ubootldr" name="Boot Loader" introduced="9.2" purpose="optional">
+<unit bldFile="/os/kernelhwsrv/brdbootldr/ubootldr" 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">
+<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 id="e32utils" name="E32 Utilities" purpose="development">
+<unit bldFile="/os/kernelhwsrv/kerneltest/e32utils/group" mrp="/os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/>
+</component>
+<component id="e32test" name="E32 Tests" purpose="development">
+<unit bldFile="/os/kernelhwsrv/kerneltest/e32test/group" mrp="/os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
+</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">
+<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>
+<component id="serialldd" name="Serial Port Drivers" purpose="optional">
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="/os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
+</component>
+<component id="legacydrivers" name="Legacy Drivers" purpose="optional">
+<unit mrp="/os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
+</component>
+<component id="locmedia" name="Local Media Subsystem" introduced="8.1b" purpose="mandatory">
+<!-- these are LDDs for storage media-->
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="/os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
+</component>
+<component id="runmodedebugger" name="Run Mode Debugger" purpose="mandatory">
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/debug/group" mrp="/os/kernelhwsrv/kernel/eka/drivers/debug/group/base_e32_drivers_debug.mrp"/>
+</component>
+<component id="btrace" name="Kernel Trace Tool" purpose="mandatory">
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/trace" mrp="/os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
+</component>
+<component id="cameraldd" name="Camera Drivers" introduced="^3" purpose="optional">
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/camerasc" mrp="/os/kernelhwsrv/kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
+</component>
+<component id="displayldd" name="Display Drivers" introduced="^3" purpose="optional">
+<!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/display" mrp="/os/kernelhwsrv/kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
+</component>
+<component id="usbclientdrivers" name="USB Client Drivers" introduced="8.1b" purpose="optional">
+<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="/os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
+</component>
+<component id="usbdescriptors" name="USB Descriptors" purpose="optional">
+<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors" mrp="/os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors/base_drivers_usbdescriptors.mrp"/>
+</component>
+<component id="usbdi_utils" name="USB DI Utils" purpose="optional">
+<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils" mrp="/os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils/base_drivers_usbdi_utils.mrp"/>
+</component>
+</collection>
+<collection id="driversupport" name="Generic Driver Support" level="hw-if">
+<component id="mediadrivers" name="Media Drivers" purpose="optional">
+<!-- these are for storage media-->
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/media" mrp="/os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
+</component>
+<component id="genericboardsupport" name="Generic Board Support" purpose="optional">
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="/os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
+</component>
+</collection>
+<collection id="userlibandfileserver" name="User Library and File Server" level="framework">
+<component id="euser" name="User Library" purpose="mandatory">
+<unit bldFile="/os/kernelhwsrv/kernel/eka/euser" mrp="/os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
+</component>
+<component id="compsupp" name="Compiler Runtime Support" filter="gt" purpose="mandatory">
+<unit bldFile="/os/kernelhwsrv/kernel/eka/compsupp" mrp="/os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
+</component>
+<component id="fileserver" name="File Server" filter="gt" purpose="mandatory">
+<unit bldFile="/os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
+</component>
+<component id="estart" name="Base Starter" filter="gt" purpose="optional">
+<unit bldFile="/os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
+</component>
+<component id="domainmgr" name="Domain Manager" introduced="8.1b" purpose="mandatory">
+<unit bldFile="/os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="/os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
+</component>
+</collection>
+<collection id="filesystems" name="File Systems" level="framework">
+<component id="romfs" name="ROM File System" filter="gt" purpose="optional" class="plugin">
+<unit mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
+</component>
+<component id="rofs" name="ROFS" filter="gt" purpose="optional" class="plugin">
+<unit bldFile="/os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
+</component>
+<component id="usbmsfs" name="USB Mass Storage File System" filter="gt" purpose="optional" class="plugin">
+<unit bldFile="/os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
+</component>
+<component id="usbhostmssrv" name="USB Host Mass Storage Server" filter="gt" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage" mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage/base_f32_shostmassstorage.mrp"/>
+</component>
+<component id="fat32fs" name="FAT32 File System" filter="gt" purpose="optional" class="plugin">
+<unit bldFile="/os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
+</component>
+<component id="fatfs" name="FAT File System" filter="gt" purpose="optional" class="plugin">
+<unit bldFile="/os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
+</component>
+<component id="compfs" name="Composite File System" filter="gt" purpose="optional" class="plugin">
+<unit bldFile="/os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
+</component>
+</collection>
+<collection id="halservices" name="HAL Services" level="framework">
+<component id="hal" name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
+<unit bldFile="/os/kernelhwsrv/halservices/hal" mrp="/os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
+</component>
+</collection>
+<collection id="textmodeshell" name="Text Mode Shell" level="test">
+<component id="e32wsrv" name="Text Window Server" purpose="optional">
+<unit bldFile="/os/kernelhwsrv/kernel/eka/ewsrv" mrp="/os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
+</component>
+<component id="textshell" name="Text Shell" filter="gt" purpose="development">
+<unit bldFile="/os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
+</component>
+</collection>
+<collection id="baseapitest" name="Base API Tests" level="test">
+
+</collection>
+<collection id="kernelhwsrv_info" name="Kernel and Hardware Services Info" level="test">
+<component id="kernelhwsrv_metadata" name="Kernel and Hardware Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
+</component>
+<component id="kernelhwsrv_metadata" name="Kernel and Hardware Services Public Documentation" class="doc" introduced="^3" purpose="development">
+<unit mrp="/os/kernelhwsrv/kernelhwsrv_info/doc_pub/kernelhwsrv_doc_pub.mrp"/>
+</component>
+</collection>
+</package>
+<package id="boardsupport" level="hw" tech-domain="hb" name="Board Support" levels="bsp test 2 3 config">
+<collection id="emulator" name="Emulator" level="bsp">
+<component id="emulatorbsp" name="Emulator BSP" purpose="optional">
+<unit bldFile="/os/boardsupport/emulator/emulatorbsp" mrp="/os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
+</component>
+</collection>
+<collection id="haitest" name="HAI Test Suites" level="test">
+<component id="bspsvs" name="BSP Verification Suite" introduced="^2" purpose="development">
+<unit mrp="/os/boardsupport/haitest/bspsvs/group/bspsvs.mrp"/>
+</component>
+</collection>
+<collection id="boardsupport_info" name="Board Support Info" level="config">
+<component id="boardsupport_metadata" name="Board Support Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/boardsupport/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="buildtools" level="hw" tech-domain="to" name="Build Tools" levels="bld mw fw ui">
+<collection id="bldsystemtools" name="Build System Tools" level="bld">
+<component id="sysdeftools" name="System Definition Tools" purpose="development" introduced="^2">
+<unit mrp="/os/buildtools/bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
+</component>
+<component id="commonbldutils" name="Common Utils" purpose="development">
+<unit mrp="/os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
+</component>
+</collection>
+<collection id="toolsandutils" name="Tools and Utils" level="mw">
+<component id="productionbldtools" name="Production Build Tools" filter="gt" purpose="development">
+<unit mrp="/os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
+</component>
+<component id="e32tools" name="E32 Tools" deprecated="^2" purpose="development" target="desktop">
+<unit bldFile="/os/buildtools/toolsandutils/e32tools/group" mrp="/os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
+</component>
+
+<component id="autotest" name="Autotest" purpose="development">
+<unit bldFile="/os/buildtools/toolsandutils/autotest/group" mrp="/os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
+</component>
+</collection>
+<collection id="sbsv1_os" name="Symbian Build System v1" level="fw">
+<component id="e32toolp" name="E32 Perl Tools" purpose="development" target="desktop" filter="sf_build">
+<unit mrp="/os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="/os/buildtools/sbsv1_os/e32toolp/group"/>
+</component>
+</collection>
+<collection id="imgtools_os" name="Image Tools" level="fw">
+<component id="romkiteka2" name="ROMKIT EKA2" deprecated="^2" purpose="development">
+<unit bldFile="/os/buildtools/imgtools_os/romkiteka2/group" mrp="/os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
+</component>
+</collection>
+<collection id="misccomponents" name="Misc Components" level="mw">
+<component id="emulatorlauncher" name="Emulator Launcher" filter="gt" purpose="development">
+<unit bldFile="/os/buildtools/misccomponents/emulatorlauncher/group" mrp="/os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
+</component>
+</collection>
+<collection id="buildtools_info" name="Build Tools Info" level="ui">
+<component id="buildtools_metadata" name="Build Tools Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/buildtools/buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="ossrv" level="services" tech-domain="hb" name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
+<collection id="ossrv_pub" name="Generic OS Services Public Interfaces" level="utilities">
+<component id="boost_apis" name="Boost APIs" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/boost_apis/group"/>
+</component>
+<component id="cpp_wrappers" name="Cpp wrappers" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/cpp_wrappers/group"/>
+</component>
+<component id="character_type_apis" name="Character Type APIs" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/character_type_apis/group"/>
+</component>
+<component id="compiler_specific_runtime_support" name="Compiler Specific Runtime Support" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/compiler_specific_runtime_support/group"/>
+</component>
+<component id="ossrv_configuration_api" name="Generic OS Services Configuration API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/configuration/group"/>
+</component>
+<component id="crypto_authentication_codes_and_hash_functions_api" name="Crypto Authentication Codes and Hash Functions API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
+</component>
+<component id="crypto_auxillary_functions_api" name="Crypto Auxillary Functions API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/crypto_auxillary_functions_api/group"/>
+</component>
+<component id="crypto_certificates_api" name="Crypto Certificates API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/crypto_certificates_api/group"/>
+</component>
+<component id="crypto_inputoutput_and_data_encoding_api" name="Crypto Input/Output and Data Encoding API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
+</component>
+<component id="crypto_public_key_cryptography_and_key_agreement_api" name="Crypto Public Key Cryptography and Key Agreement API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
+</component>
+<component id="crypto_symmetric_ciphers_api" name="Crypto Symmetric Ciphers API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/crypto_symmetric_ciphers_api/group"/>
+</component>
+<component id="crypto_utility_functions_api" name="Crypto Utility Functions API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/crypto_utility_functions_api/group"/>
+</component>
+<component id="cryptogaphy_related_api" name="Cryptogaphy Related API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/cryptogaphy_related_api/group"/>
+</component>
+<component id="ossrv_debug_api" name="Generic OS Services Debug API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/debug/group"/>
+</component>
+<component id="ossrv_exceptions_api" name="Generic OS Services Exceptions API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/exceptions/group"/>
+</component>
+<component id="io_stream_api" name="I/O stream API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/io_stream_api/group"/>
+</component>
+<component id="localization_function_api" name="Localization Function API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/localization_function_api/group"/>
+</component>
+<component id="math_operations_api" name="Math Operations API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/math_operations_api/group"/>
+</component>
+<component id="ossrv_memory_api" name="Generic OS Services Memory API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/memory/group"/>
+</component>
+<component id="no_namespace_headers" name="No Namespace Headers" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/no_namespace_headers/group"/>
+</component>
+<component id="openc_headers" name="OpenC headers" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/openc_headers/group"/>
+</component>
+<component id="openc_wrappers" name="OpenC wrappers" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/openc_wrappers/group"/>
+</component>
+<component id="ssl_general_api" name="SSL General API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/ssl_general_api/group"/>
+</component>
+<component id="ssl_protocol_methods_api" name="SSL Protocol Methods API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/ssl_protocol_methods_api/group"/>
+</component>
+<component id="standard_compressiondecompression_api" name="Standard Compression/Decompression API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/standard_compressiondecompression_api/group"/>
+</component>
+<component id="stl" name="STL API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/stl/group"/>
+</component>
+<component id="thread_api" name="Thread API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/thread_api/group"/>
+</component>
+<component id="type_attributes" name="Type Attributes API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/type_attributes/group"/>
+</component>
+<component id="typeinfo" name="Type Info API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/typeinfo/group"/>
+</component>
+<component id="utility_apis" name="Utility APIs" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/utility_apis/group"/>
+</component>
+<component id="wide_character_classapis" name="Wide character class/apis" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/wide_character_classapis/group"/>
+</component>
+<component id="dbus_api" name="Dbus API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/dbus/group"/>
+</component>
+<component id="dbus-glib_api" name="D-Bus GLib API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/dbus-glib/group"/>
+</component>
+</collection>
+<collection id="ossrv_plat" name="Generic OS Services Platform Interfaces" level="utilities">
+<component id="libutils_apis" name="Utility Library APIs" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_plat/libutils/group"/>
+</component>
+</collection>
+<collection id="stdlibs" name="Standard Libraries" level="translation">
+<component id="libz" filter="s60" name="Z Compression Library">
+<unit bldFile="/os/ossrv/stdlibs/libz/group"/>
+</component>
+<component id="libcrypt" filter="s60" name="Crypt Library">
+<unit bldFile="/os/ossrv/stdlibs/libcrypt/group"/>
+</component>
+</collection>
+<collection id="ssl" name="SSL" level="data-services">
+<component id="libcrypto" filter="s60" name="Crypto Library">
+<unit bldFile="/os/ossrv/ssl/libcrypto/group"/>
+</component>
+<component id="libssl" filter="s60" purpose="development" name="SSL Library">
+<unit bldFile="/os/ossrv/ssl/libssl/group"/>
+</component>
+</collection>
+<collection id="glib" name="GLib" level="utilities">
+<component id="glibbackend" filter="s60" name="GLib Backend">
+<unit bldFile="/os/ossrv/glib/build/symbian/glibbackend/group"/>
+<!-- Move to here: <unit bldFile="glib/glibbackend/group"/> -->
+</component>
+<component id="libglib" filter="s60" name="GLib Library">
+<unit bldFile="/os/ossrv/glib/build/symbian/glib/group"/>
+<!-- Move to here: <unit bldFile="glib/libglib/group"/> -->
+</component>
+<component id="libgthread" filter="s60" name="Libg Thread">
+<unit bldFile="/os/ossrv/glib/build/symbian/gthread/group"/>
+<!-- Move to here: <unit bldFile="glib/libgthread/group"/> -->
+</component>
+<component id="libgmodule" filter="s60" name="Libg Module">
+<unit bldFile="/os/ossrv/glib/build/symbian/gmodule/group"/>
+<!-- Move to here: <unit bldFile="glib/libgmodule/group"/> -->
+</component>
+<component id="libgobject" filter="s60" name="Libg Object">
+<unit bldFile="/os/ossrv/glib/build/symbian/gobject/group"/>
+<!-- Move to here: <unit bldFile="glib/libgobject/group"/> -->
+</component>
+</collection>
+<collection id="stdcpp" name="C++ Standard Library" level="translation">
+<!-- collection is really a component. Needs to be moved down a directory -->
+<component id="stdcpp_build" filter="s60" name="Stdcpp">
+<unit bldFile="/os/ossrv/stdcpp/group"/>
+</component>
+</collection>
+<collection id="ofdbus" name="Open Foundation D-Bus" level="utilities">
+<component id="dbus" filter="s60" name="D-Bus">
+<unit bldFile="/os/ossrv/ofdbus/dbus/group"/>
+</component>
+<component id="dbus-glib" filter="s60" name="D-Bus GLib">
+<unit bldFile="/os/ossrv/ofdbus/dbus-glib/group"/>
+</component>
+<component id="ofdbus_rom" filter="s60" name="D-Bus ROM">
+<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory
+ Consider moving IBY file to one of the above as well and removing this component entirely -->
+<unit bldFile="/os/ossrv/ofdbus/group"/>
+</component>
+</collection>
+<collection id="utilitylibraries" name="Utility Libraries" level="encoding">
+<component id="libutils" filter="s60" name="Utility Library">
+<unit bldFile="/os/ossrv/utilitylibraries/libutils/group"/>
+</component>
+</collection>
+<collection id="genericservices" name="Generic Services" level="utilities">
+<component id="s60compatibilityheaders" name="S60 Compatibility Headers" filter="gt" purpose="optional">
+<unit version="tb101sf" bldFile="/os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="/os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp"/>
+</component>
+<component id="mimerecognitionfw" name="MIME Recognition Framework" purpose="mandatory">
+<unit bldFile="/os/ossrv/genericservices/mimerecognitionfw/group" mrp="/os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
+</component>
+<component id="systemagent" name="System Agent" introduced="9.0" purpose="mandatory">
+<unit bldFile="/os/ossrv/genericservices/systemagent/group" mrp="/os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
+</component>
+<component id="taskscheduler" name="Task Scheduler" introduced="6.0" purpose="optional">
+<unit bldFile="/os/ossrv/genericservices/taskscheduler/group" mrp="/os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
+</component>
+<component id="activebackupclient" name="Active Backup Client" purpose="optional">
+<unit bldFile="/os/ossrv/genericservices/activebackupclient/group" mrp="/os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
+</component>
+<component id="syslibsdocs" name="Syslibs Documentation" purpose="development" class="doc">
+<unit mrp="/os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
+</component>
+<component id="httputils" name="HTTP Utilities Library" introduced="6.2" purpose="optional">
+<unit bldFile="/os/ossrv/genericservices/httputils/group" mrp="/os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
+</component>
+</collection>
+<collection id="syslibsapitest" name="SysLibs API Tests" level="utilities">
+
+</collection>
+<collection id="compressionlibs" name="Compression Libraries" level="data-services">
+<component id="ziplib" name="Zip Compression Library" introduced="6.0" purpose="mandatory">
+<unit bldFile="/os/ossrv/compressionlibs/ziplib/group" mrp="/os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
+</component>
+</collection>
+<collection id="genericopenlibs" name="Generic Open Libraries" level="translation">
+<component id="cstdlib" name="C Standard Library" introduced="ER5" purpose="optional">
+<unit bldFile="/os/ossrv/genericopenlibs/cstdlib/group" mrp="/os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
+</component>
+<component id="cppstdlib" name="C++ Standard Library" introduced="^3" purpose="mandatory">
+<unit bldFile="/os/ossrv/genericopenlibs/cppstdlib/group" mrp="/os/ossrv/genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
+</component>
+<component id="openenvcore" name="Open Environment Core" introduced="^2" purpose="mandatory">
+<unit bldFile="/os/ossrv/genericopenlibs/openenvcore/group" mrp="/os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
+</component>
+<component id="posixrealtimeextensions" name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
+<unit bldFile="/os/ossrv/genericopenlibs/posixrealtimeextensions/group" mrp="/os/ossrv/genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
+</component>
+<component id="liboil" name="Liboil" introduced="^4" purpose="optional">
+<unit bldFile="/os/ossrv/genericopenlibs/liboil/group" mrp="/os/ossrv/genericopenlibs/liboil/group/oeaddons_liboil.mrp"/>
+</component>
+</collection>
+<collection id="lowlevellibsandfws" name="Low Level Libraries and Frameworks" level="app-libs">
+<component id="pluginfw" name="Plugin Framework" introduced="6.2" purpose="mandatory">
+<unit version="3" bldFile="/os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="/os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp"/>
+</component>
+<component id="apputils" name="Application Utilities" introduced="ER5" purpose="mandatory">
+<unit bldFile="/os/ossrv/lowlevellibsandfws/apputils/group" mrp="/os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
+</component>
+<component id="genericusabilitylib" name="Generic Usability Library" introduced="^3" purpose="mandatory">
+<unit bldFile="/os/ossrv/lowlevellibsandfws/genericusabilitylib/group" mrp="/os/ossrv/lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
+</component>
+</collection>
+<collection id="ossrv_info" name="Generic OS Services Info" level="utilities">
+<component id="ossrv_build" filter="s60" name="Generic OS Services Build">
+<!-- exports should be moved to individual components -->
+<unit bldFile="/os/ossrv/group"/>
+</component>
+<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">
+<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">
+<unit bldFile="/os/persistentdata/featuremgmt/featureregistry/group" mrp="/os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
+</component>
+</collection>
+<collection id="loggingservices" name="Logging Services" level="server">
+<component id="eventlogger" 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 id="filelogger" 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 id="rfilelogger" name="RFile Logger" deprecated="^3" introduced="9.1" purpose="development">
+<unit bldFile="/os/persistentdata/loggingservices/rfilelogger/group" mrp="/os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
+</component>
+</collection>
+<collection id="traceservices" name="Trace Services" level="server">
+<component id="commsdebugutility" name="Comms Debug Utility" introduced="7.0s" purpose="optional">
+<unit bldFile="/os/persistentdata/traceservices/commsdebugutility/group" mrp="/os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
+</component>
+<component id="tracefw" name="Trace Framework" introduced="9.2" purpose="development">
+<unit bldFile="/os/persistentdata/traceservices/tracefw/ulogger/group" mrp="/os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
+</component>
+</collection>
+<collection id="persistentstorage" name="Persistent Storage" level="framework">
+<component id="store" name="Store" purpose="optional">
+<unit bldFile="/os/persistentdata/persistentstorage/store/group" mrp="/os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
+</component>
+<component id="dbms" name="DBMS" purpose="optional">
+<unit bldFile="/os/persistentdata/persistentstorage/dbms/group" mrp="/os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
+</component>
+<component id="centralrepository" name="Central Repository" introduced="7.0s" purpose="mandatory">
+<unit bldFile="/os/persistentdata/persistentstorage/centralrepository/group" mrp="/os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
+</component>
+<component id="sql" name="SQL" introduced="9.3" purpose="optional">
+<unit bldFile="/os/persistentdata/persistentstorage/sql/GROUP" mrp="/os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
+</component>
+<component id="sqlite3api" name="SQLite 3 API" introduced="^3" purpose="optional">
+<unit bldFile="/os/persistentdata/persistentstorage/sqlite3api/GROUP" mrp="/os/persistentdata/persistentstorage/sqlite3api/GROUP/syslibs_sqlite3.mrp"/>
+</component>
+</collection>
+<collection id="persistentdata_info" name="Persistent Data Services Info" level="app-if">
+<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">
+<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">
+<unit bldFile="/os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group"/>
+</component>
+<component id="feature_discovery_api" name="Feature Discovery API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_pub/feature_discovery_api/group"/>
+</component>
+<component id="platform_environment_api" name="Platform Environment API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_pub/platform_environment_api/group"/>
+</component>
+<component id="sensor_channel_api" name="Sensor Channel API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_pub/sensor_channel_api/group"/>
+</component>
+<component id="sensor_definitions_api" name="Sensor Definitions API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_pub/sensor_definitions_api/group"/>
+</component>
+<component id="version_info_api" name="Version Info API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_pub/version_info_api/group"/>
+</component>
+<component id="accessory_monitoring_api" name="Accessory Monitoring API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_pub/accessory_monitoring_api/group"/>
+</component>
+<component id="haptics_api" name="Haptics API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_pub/haptics_api/group"/>
+</component>
+<component id="sensor_data_compensator_api" name="Sensor Data Compensator API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
+</component>
+</collection>
+<collection id="devicesrv_plat" name="Device Services Platform Interfaces" level="app-if">
+<component id="configuration_file_parser_api" name="Configuration File Parser API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/configuration_file_parser_api/group"/>
+</component>
+<component id="dos_extension_plugin_api" name="DOS Extension Plug-In API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/dos_extension_plugin_api/group"/>
+</component>
+<component id="mediator_command_initiator_api" name="Mediator Command Initiator API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/mediator_command_initiator_api/group"/>
+</component>
+<component id="syslangutil_api" name="SysLangUtil API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/syslangutil_api/group"/>
+</component>
+<component id="wakeup_alarm_api" name="Wakeup Alarm API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/wakeup_alarm_api/group"/>
+</component>
+<component id="disk_and_memory_level_keys_api" name="Disk and Memory Level Keys API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/disk_and_memory_level_keys_api/group"/>
+</component>
+<component id="mediator_plugin_api" name="Mediator Plugin API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/mediator_plugin_api/group"/>
+</component>
+<component id="headset_status_api" name="Headset Status API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/headset_status_api/group"/>
+</component>
+<component id="system_startup_extension_plugin_api" name="System Startup Extension Plugin API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/system_startup_extension_plugin_api/group"/>
+</component>
+<component id="sensor_plugin_api" name="Sensor Plugin API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/sensor_plugin_api/group"/>
+</component>
+<component id="accessory_api" name="Accessory API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_api/group"/>
+</component>
+<component id="display_language_definition_api" name="Display Language Definition API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/display_language_definition_api/group"/>
+</component>
+<component id="mediator_command_responder_api" name="Mediator Command Responder API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/mediator_command_responder_api/group"/>
+</component>
+<component id="accessory_policy_definitions_api" name="Accessory Policy Definitions API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_policy_definitions_api/group"/>
+</component>
+<component id="hw_settings_api" name="Hardware Settings API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/hw_settings_api/group"/>
+</component>
+<component id="mediator_domain_definitions_api" name="Mediator Domain Definitions API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/mediator_domain_definitions_api/group"/>
+</component>
+<component id="sensor_extension_api" name="Sensor Extension API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/sensor_extension_api/group"/>
+</component>
+<component id="accessory_plugin_api" name="Accessory Plugin API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_plugin_api/group"/>
+</component>
+<component id="sae_api" name="SAE API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/sae_api/group"/>
+</component>
+<component id="accessory_control_api" name="Accessory Control API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_control_api/group"/>
+</component>
+<component id="mediator_static_registration_api" name="Mediator Static Registration API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/mediator_static_registration_api/group"/>
+</component>
+<component id="accessory_key_event_handling_api" name="Accessory Key Event Handling API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_key_event_handling_api/group"/>
+</component>
+<component id="mediator_notification_api" name="Mediator Notification API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/mediator_notification_api/group"/>
+</component>
+<component id="accessory_policy_utility_api" name="Accessory Policy Utility API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_policy_utility_api/group"/>
+</component>
+<component id="common_dsy_plugin_api" name="Common DSY Plugin API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/common_dsy_plugin_api/group"/>
+</component>
+<component id="remote_control_extension_api" name="Remote Control Extension API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/remote_control_extension_api/group"/>
+</component>
+<component id="sensor_channel_filter_api" name="Sensor Channel Filter API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/sensor_channel_filter_api/group"/>
+</component>
+<component id="dos_extension_api" name="DOS Extension API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/dos_extension_api/group"/>
+</component>
+<component id="accessory_audio_control_api" name="Accessory Audio Control API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_audio_control_api/group"/>
+</component>
+<component id="mediator_event_consumer_api" name="Mediator Event Consumer API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/mediator_event_consumer_api/group"/>
+</component>
+<component id="shared_data_api" name="Shared Data API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/shared_data_api/group"/>
+</component>
+<component id="accessory_settings_api" name="Accessory Settings API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_settings_api/group"/>
+</component>
+<component id="accessory_bluetooth_control_api" name="Accessory Bluetooth Control API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_bluetooth_control_api/group"/>
+</component>
+<component id="extended_version_info_api" name="Extended Version Info API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/extended_version_info_api/group"/>
+</component>
+<component id="mediator_event_provider_api" name="Mediator Event Provider API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/mediator_event_provider_api/group"/>
+</component>
+<component id="tv_out_config_api" name="TV Out Config API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/tv_out_config_api/group"/>
+</component>
+<component id="tspclientmapper_api" name="TSP Client Mapper API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/tspclientmapper_api/group"/>
+</component>
+<component id="powersave_api" name="Power Save API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/powersave_api/group"/>
+</component>
+<component id="powersave_definitions_api" name="Power Save Definitions API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/powersave_definitions_api/group"/>
+</component>
+<component id="powersave_plugin_api" name="Power Save Plugin API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/powersave_plugin_api/group"/>
+</component>
+<component id="extended_version_info_plugin_api" name="Extended Version Info Plugin API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/extended_version_info_plugin_api/group"/>
+</component>
+<component id="haptics_plugin_api" name="Haptics Plugin API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/haptics_plugin_api/group"/>
+</component>
+<component id="haptics_effect_data_getter_plugin_api" name="Haptics Effect Data Getter Plugin API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
+</component>
+<component id="haptics_packetizer_plugin_api" name="Haptics Packetizer Plugin API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/haptics_packetizer_plugin_api/group"/>
+</component>
+<component id="tiltcompensation_api" name="Tilt Compensation API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/tiltcompensation_api/group"/>
+</component>
+<component id="disk_notification_handler_api" name="Disk Notification Handler API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/disk_notification_handler_api/group"/>
+</component>
+<component id="accessory_policy_usb_audio_api" name="Accessory Policy USB Audio API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_policy_usb_audio_api/group"/>
+</component>
+<component id="accessory_policy_hdmi_audio_api" name="Accessory Policy HDMI Audio API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_policy_hdmi_audio_api/group"/>
+</component>
+<component id="sensor_data_compensator_plugin_api" name="Sensor Data Compensator Plugin API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
+</component>
+<component id="ddc_access_api" name="DDC Access API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/ddc_access_api/group"/>
+</component>
+<component id="tv_out_behaviour_api" name="TV Out Behaviour API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/tv_out_behaviour_api/group"/>
+</component>
+</collection>
+<collection id="accessoryservices" name="Accessory Services" level="framework">
+<component id="accessorymonitor" filter="s60" name="Accessory Monitor">
+<unit bldFile="/os/devicesrv/accessoryservices/accessorymonitor/group"/>
+</component>
+<component id="accessoryremotecontrol" filter="s60" name="Accessory Remote Control">
+<unit bldFile="/os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
+</component>
+<component id="accessoryserver" filter="s60" name="Accessory Server">
+<unit bldFile="/os/devicesrv/accessoryservices/accessoryserver/group"/>
+</component>
+<component id="pluggeddisplay" filter="s60" name="Plugged Display" introduced="^3">
+<unit bldFile="/os/devicesrv/accessoryservices/pluggeddisplay/group"/>
+</component>
+<component id="headsetstatusapi" filter="s60" name="Headset Status API">
+<unit bldFile="/os/devicesrv/accessoryservices/headsetstatusapi/group"/>
+</component>
+<component id="tspclientmapper" filter="s60" name="TSP Client Mapper">
+<unit bldFile="/os/devicesrv/accessoryservices/tspclientmapper/group"/>
+</component>
+<component id="remotecontrolfw" name="Remote Control Framework" introduced="9.1" purpose="optional">
+<unit bldFile="/os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="/os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
+</component>
+<component id="gid_pc_tool" filter="s60" name="Generic ID PC Tool" target="desktop" class="tool">
+<unit bldFile="/os/devicesrv/accessoryservices/gid_pc_tool/group"/>
+</component>
+</collection>
+<collection id="commonservices" name="Common Services" level="app-if">
+<component id="commonengine" filter="s60" name="Common Engine">
+<unit bldFile="/os/devicesrv/commonservices/commonengine/group"/>
+</component>
+<component id="commonengineresources" filter="s60" name="Common Engine Resources" class="config">
+<unit bldFile="/os/devicesrv/commonservices/commonengineresources/group"/>
+</component>
+<component id="platformenv" filter="s60" name="Platform Environment">
+<unit bldFile="/os/devicesrv/commonservices/platformenv/group"/>
+</component>
+<component id="sysutil" name="System Utilities" purpose="mandatory" introduced="ER5">
+<meta rel="config">
+<defined condition="SYMBIAN_BAFL_SYSUTIL"/>
+</meta>
+<unit bldFile="/os/devicesrv/commonservices/sysutil/group" mrp="/os/devicesrv/commonservices/sysutil/group/sysutil.mrp"/>
+</component>
+<component id="activitymanager" name="Activity Manager" purpose="mandatory" introduced="ER5">
+<meta rel="config">
+<defined condition="SYMBIAN_BAFL_SYSUTIL"/>
+</meta>
+<unit bldFile="/os/devicesrv/commonservices/activitymanager/group" mrp="/os/devicesrv/commonservices/activitymanager/group/activitymanager.mrp"/>
+</component>
+</collection>
+<collection id="dosservices" name="Domestic Operating System Services" level="hw-if">
+<component id="commondsy" filter="s60" name="Common DSY" class="plugin">
+<unit bldFile="/os/devicesrv/dosservices/commondsy/group"/>
+</component>
+<component id="dosserver" filter="s60" name="Domestic OS Server">
+<unit bldFile="/os/devicesrv/dosservices/dosserver/group"/>
+</component>
+</collection>
+<collection id="sensorservices" name="Sensor Services" level="framework">
+<component id="sensorserver" filter="s60" name="Sensor Server">
+<unit bldFile="/os/devicesrv/sensorservices/sensorserver/group"/>
+</component>
+<component id="orientationssy" filter="s60" name="Orientation SSY" class="plugin">
+<unit bldFile="/os/devicesrv/sensorservices/orientationssy/group"/>
+</component>
+<component id="tiltcompensationssy" filter="s60" name="Tilt Compensation SSY" class="plugin">
+<unit bldFile="/os/devicesrv/sensorservices/tiltcompensationssy/group"/>
+</component>
+<component id="sensordatacompensator" filter="s60" name="Sensor Data Compensator">
+<unit bldFile="/os/devicesrv/sensorservices/sensordatacompensator/group"/>
+</component>
+</collection>
+<collection id="hwrmhaptics" name="HWRM Haptics" level="plugin">
+<component id="hapticseffectdatagetterfw" filter="s60" name="Haptics Effect Data Getter Framework">
+<unit bldFile="/os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
+</component>
+<component id="hapticspluginservice" filter="s60" name="Haptics Plugin Service">
+<unit bldFile="/os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
+</component>
+<component id="hapticspacketizer" filter="s60" name="Haptics Packetizer">
+<unit bldFile="/os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
+</component>
+<component id="hapticspluginmanager" filter="s60" name="Haptics Plugin Manager">
+<unit bldFile="/os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
+</component>
+<component id="hapticsserver" filter="s60" name="Haptics Server">
+<unit bldFile="/os/devicesrv/hwrmhaptics/hapticsserver/group"/>
+</component>
+<component id="hapticsclient" filter="s60" name="Haptics Client">
+<unit bldFile="/os/devicesrv/hwrmhaptics/hapticsclient/group"/>
+</component>
+<component id="hwrmhaptics_build" filter="s60" name="HWRM Haptics Build">
+<!-- move these exports into the appropriate above components and delete this component-->
+<unit bldFile="/os/devicesrv/hwrmhaptics/group"/>
+</component>
+</collection>
+<collection id="mediator" name="Mediator" level="app-if">
+<!--collection is really a component. Move it down a directory -->
+<component id="mediator_build" filter="s60" name="Mediator Build">
+<unit bldFile="/os/devicesrv/mediator/group"/>
+</component>
+</collection>
+<collection id="psmservices" name="Power Save Mode Services" level="app-if">
+<component id="psmserver" filter="s60" name="PSM Server">
+<unit bldFile="/os/devicesrv/psmservices/psmserver/group"/>
+</component>
+</collection>
+<collection id="resourcemgmt" name="Resource Management" level="hw-if">
+<component id="hwrmfmtxwatcherplugin" filter="s60" name="HWRM FM Transmitter Watcher Plugin" class="plugin">
+<unit bldFile="/os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
+</component>
+<component id="hwrmtargetmodifierplugin" filter="s60" name="HWRM Target Modifier Plugin" class="plugin">
+<meta rel="config">
+<defined condition="__HWRM_TARGET_MODIFIER_PLUGIN"/>
+</meta>
+<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build,
+ may need to -->
+<!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
+</component>
+<component id="vibractrl" filter="s60" name="Vibra Control" deprecated="9.1">
+<unit bldFile="/os/devicesrv/resourcemgmt/vibractrl/group"/>
+</component>
+<component id="hwresourcesmgr" name="Hardware Resources Manager" introduced="^2" purpose="optional">
+<unit bldFile="/os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="/os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
+</component>
+<component id="hwresourcesmgrconfig" name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
+<unit bldFile="/os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="/os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
+</component>
+<component id="resourcemgmt_build" filter="s60" name="Resource Management Build">
+<!-- Move exports to a self-contained component.
+ This needs to be kept around until configuration is in place -->
+<unit bldFile="/os/devicesrv/resourcemgmt/group"/>
+</component>
+<component id="powerandmemorynotificationservice" name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
+<unit bldFile="/os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="/os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
+</component>
+</collection>
+<collection id="sysstatemgmt" name="System State Management" level="server">
+<component id="ssmmapperutility" filter="s60" name="SSM Mapper Utility" introduced="^3">
+<unit bldFile="/os/devicesrv/sysstatemgmt/ssmmapperutility/group"/>
+</component>
+<component id="ssmpolicyplugins" filter="s60" name="SSM Policy Plugins" class="plugin" introduced="^3">
+<unit bldFile="/os/devicesrv/sysstatemgmt/ssmpolicyplugins/group"/>
+</component>
+<component id="ssmutilityplugins" filter="s60" name="SSM Utility Plugins" class="plugin" introduced="^3">
+<unit bldFile="/os/devicesrv/sysstatemgmt/ssmutilityplugins/group"/>
+</component>
+<component id="ssmcmdlists" filter="s60" name="SSM Command Lists" introduced="^3">
+<unit bldFile="/os/devicesrv/sysstatemgmt/ssmcmdlists/group"/>
+</component>
+<component id="ssmcustcmds" filter="s60" name="SSM Custom Commands" introduced="^3">
+<unit bldFile="/os/devicesrv/sysstatemgmt/ssmcustcmds/group"/>
+</component>
+<component id="syslangutil" filter="s60" name="System Language Utility" introduced="^3">
+<unit bldFile="/os/devicesrv/sysstatemgmt/syslangutil/group"/>
+</component>
+<component id="sysrestart" filter="s60" name="System Restart" introduced="^3">
+<unit bldFile="/os/devicesrv/sysstatemgmt/sysrestart/group"/>
+</component>
+<component id="sysuiprovider" filter="s60" name="System UI Provider" introduced="^3">
+<unit bldFile="/os/devicesrv/sysstatemgmt/sysuiprovider/group"/>
+</component>
+<component id="systemstarter" name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
+<unit bldFile="/os/devicesrv/sysstatemgmt/systemstarter/group" mrp="/os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
+</component>
+<component id="systemstatemgr" name="System State Manager" introduced="^3" purpose="mandatory">
+<meta rel="config">
+<defined condition="SYMBIAN_SYSTEM_STATE_MANAGEMENT"/>
+</meta>
+<unit bldFile="/os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="/os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
+</component>
+<component id="systemstateplugins" name="System State Plugins" introduced="^3" purpose="optional" class="plugin">
+<meta rel="config">
+<defined condition="SYMBIAN_SYSTEM_STATE_MANAGEMENT"/>
+</meta>
+<unit bldFile="/os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="/os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
+</component>
+<meta rel="config">
+<defined condition="SYMBIAN_SYSTEM_STATE_MANAGEMENT"/>
+</meta>
+<component id="systemstatereferenceplugins" name="System State Reference Plugins" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="/os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
+</component>
+</collection>
+<collection id="resourceinterfaces" name="Resource Interfaces" level="hw-if">
+<component id="fmtransmittercontrol" name="FM Transmitter Control" introduced="^3" purpose="optional">
+<unit bldFile="/os/devicesrv/resourceinterfaces/fmtransmittercontrol/group" mrp="/os/devicesrv/resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
+</component>
+</collection>
+<collection id="systemhealthmanagement" name="System Health Management" level="server">
+<component id="systemhealthmgr" name="System Health Manager" introduced="^3" purpose="optional">
+<unit bldFile="/os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="/os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
+</component>
+</collection>
+<collection id="devicesrvapitest" name="Devices Services API Tests" level="app-if">
+
+
+</collection>
+<collection id="devicesrv_info" name="Device Services Info" level="app-if">
+<component id="devicesrv_metadata" name="Device Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="security" level="services" tech-domain="se" name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
+<collection id="authenticationservices" name="Authentication Services" level="utilities">
+<component id="authenticationserver" name="Authentication Server" introduced="^4" purpose="optional">
+<unit bldFile="/os/security/authenticationservices/authenticationserver/group" mrp="/os/security/authenticationservices/authenticationserver/group/security_authserver.mrp"/>
+</component>
+</collection>
+<collection id="authorisation" name="Authorisation" level="utilities">
+<component id="userpromptservice" name="User Prompt Service" introduced="^3" purpose="mandatory">
+<unit bldFile="/os/security/authorisation/userpromptservice/group" mrp="/os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
+</component>
+<component id="userpromptutils" name="User Prompt Utils" introduced="^3" purpose="optional">
+<unit bldFile="/os/security/authorisation/userpromptutils/group" mrp="/os/security/authorisation/userpromptutils/group/security_ups_utils.mrp"/>
+</component>
+</collection>
+<collection id="contentmgmt" name="Content Management" level="utilities">
+<component id="contentaccessfwfordrm" name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
+<unit bldFile="/os/security/contentmgmt/contentaccessfwfordrm/group" mrp="/os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
+</component>
+<component id="cafrecogniserconfig" 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 id="referencedrmagent" 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 id="cafstreamingsupport" 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 id="crypto" name="Crypto Libraries" level="libraries">
+<component id="weakcryptospi" name="Weak Crypto SPI" filter="gt" introduced="^3" purpose="optional">
+<unit bldFile="/os/security/crypto/weakcryptospi/group" mrp="/os/security/crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
+</component>
+<component id="strongcryptospi" name="Strong Crypto SPI" filter="gt" introduced="^3" purpose="optional">
+<unit bldFile="/os/security/crypto/weakcryptospi/strong" mrp="/os/security/crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
+</component>
+</collection>
+<collection id="cryptomgmtlibs" name="Crypto Management Libraries" level="management">
+<component id="securityutils" name="Security Utils" introduced="8.0" purpose="optional">
+<unit bldFile="/os/security/cryptomgmtlibs/securityutils/group" mrp="/os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
+</component>
+
+<component id="securitydocs" name="Security Documentation" purpose="development" class="doc">
+<unit mrp="/os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
+</component>
+<component id="cryptotokenfw" name="Crypto Token Framework" introduced="7.0" purpose="optional">
+<unit bldFile="/os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="/os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
+</component>
+<component id="securitycommonutils" name="Security Common Utils" introduced="8.0" purpose="mandatory">
+<unit bldFile="/os/security/cryptomgmtlibs/securitycommonutils/group" mrp="/os/security/cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
+</component>
+</collection>
+<collection id="securityanddataprivacytools" name="Security and Data Privacy Tools" level="services">
+<component id="securityconfig" name="Security Config" introduced="9.1" purpose="optional">
+<unit bldFile="/os/security/securityanddataprivacytools/securityconfig/group" mrp="/os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
+</component>
+<component id="securitytools" name="Security Tools" introduced="^3" purpose="optional" target="desktop">
+<unit bldFile="/os/security/securityanddataprivacytools/securitytools/group" mrp="/os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
+</component>
+</collection>
+<collection id="cryptoplugins" name="Crypto Plugins" level="plugins">
+<component id="cryptospiplugins" name="Crypto SPI Plugins" filter="gt" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/security/cryptoplugins/cryptospiplugins/group" mrp="/os/security/cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
+</component>
+</collection>
+<collection id="cryptoservices" name="Crypto Services" level="plugins">
+<component id="certificateandkeymgmt" name="Certificate and Key Management" introduced="6.0" purpose="optional">
+<unit bldFile="/os/security/cryptoservices/certificateandkeymgmt/group" mrp="/os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
+</component>
+<component id="filebasedcertificateandkeystores" name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
+<unit bldFile="/os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="/os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
+</component>
+<component id="browserrootcertificates" name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
+<unit mrp="/os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
+</component>
+<component id="asnpkcs" name="ASN PKCS" introduced="8.0" purpose="optional">
+<unit bldFile="/os/security/cryptoservices/asnpkcs/group" mrp="/os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
+</component>
+</collection>
+<collection id="security_info" name="OS Security Info" level="utilities">
+<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">
+<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">
+<unit bldFile="/os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="/os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
+</component>
+<component id="simulationpositioningmodule" name="Simulation Positioning Module" introduced="^2" purpose="development" class="plugin">
+<unit bldFile="/os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="/os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
+</component>
+<component id="gpspositioningmodule" name="GPS/A-GPS Positioning Module" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/lbs/datasourcemodules/gpspositioningmodule/group" mrp="/os/lbs/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
+</component>
+<component id="networkpositioningmodule" name="Network Positioning Module" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/lbs/datasourcemodules/networkpositioningmodule/group" mrp="/os/lbs/datasourcemodules/networkpositioningmodule/group/lbs_network_positioning_module.mrp"/>
+</component>
+<component id="locationapesuplpsy" name="APE SUPL Positioning Module" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/lbs/datasourcemodules/locationapesuplpsy/group" mrp="/os/lbs/datasourcemodules/locationapesuplpsy/group/lbs_ape_supl_positioning_module.mrp"/>
+</component>
+</collection>
+<collection id="datasourceadaptation" name="Data Source Adaptation" level="adaptation">
+<component id="gpsdatasourceadaptation" 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"/>
+</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="networkrequesthandler" name="Network Request Handler" introduced="9.2" purpose="optional">
+<unit bldFile="/os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="/os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
+</component>
+</collection>
+<collection id="lbstest" name="Locating Services Tests" level="application-interface">
+
+<component id="locationprotocoltest" name="Location Protocol Tests" introduced="9.2" purpose="development" class="plugin">
+<unit bldFile="/os/lbs/lbstest/locationprotocoltest/group" mrp="/os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
+</component>
+</collection>
+<collection id="locationmgmt" name="Location Management" level="management">
+<component id="locmonitor" name="Location Monitor" introduced="^3" purpose="optional">
+<unit bldFile="/os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="/os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
+</component>
+<component id="agpslocationmgr" name="A-GPS Location Manager" introduced="9.2" purpose="optional">
+<unit bldFile="/os/lbs/locationmgmt/agpslocationmgr/group" mrp="/os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
+</component>
+<component id="networklocationmgr" name="Network Location Manager" introduced="9.2" purpose="optional">
+<unit bldFile="/os/lbs/locationmgmt/networklocationmgr/group" mrp="/os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
+</component>
+<component id="locationcore" name="Location Core" introduced="9.2" purpose="optional">
+<unit bldFile="/os/lbs/locationmgmt/locationcore/group" mrp="/os/lbs/locationmgmt/locationcore/group/lbs_admin.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">
+<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 -->
+<unit bldFile="/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/sfgroup" mrp="/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
+</component>
+<component id="suplprotocolmodule" name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" class="plugin">
+<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+<unit bldFile="/os/lbs/networkprotocolmodules/suplprotocolmodule/sfgroup" mrp="/os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
+</component>
+<component id="suplrrlpasn1" filter="sf_build" name="SUPL RRLP ASN1 Parser">
+<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+<unit bldFile="/os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
+</component>
+<component id="suplrrlpprotocol" name="SUPL RRLP Protocol Module">
+<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+<unit bldFile="/os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup"/>
+</component>
+</collection>
+<collection id="lbsapitest" name="Location API Tests" level="application-interface">
+
+</collection>
+<collection id="lbs_info" name="Locating Services Info" level="application-interface">
+<component id="lbs_metadata" name="Locating Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="commsfw" level="services" tech-domain="dc" name="Communications Framework" levels="server support framework process app-if">
+<collection id="commsprocess" name="Comms Process" level="process">
+<component id="commsrootserver" name="Comms Root Server" introduced="7.0s" purpose="mandatory">
+<unit bldFile="/os/commsfw/commsprocess/commsrootserverconfig/group" mrp="/os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
+</component>
+
+</collection>
+<collection id="commsconfig" name="Comms Config" level="process">
+<component id="commsdatabase" name="Comms Database" purpose="mandatory">
+<unit bldFile="/os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="/os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
+</component>
+<component id="commsdatabaseshim" name="Comms Database Shim" introduced="8.1" purpose="mandatory">
+<unit bldFile="/os/commsfw/commsconfig/commsdatabaseshim/group" mrp="/os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
+</component>
+</collection>
+<collection id="datacommsserver" name="Data Comms Server" level="framework">
+<component id="esockserver" name="ESock Server" purpose="mandatory">
+<unit version="3" bldFile="/os/commsfw/datacommsserver/esockserver/group" mrp="/os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp"/>
+</component>
+
+<component id="networkingdialogapi" name="Networking Dialog API" introduced="6.1" purpose="optional">
+<unit bldFile="/os/commsfw/datacommsserver/networkingdialogapi/group" mrp="/os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
+</component>
+<component id="networkingdialogstub" name="Networking Dialog Stub" introduced="6.1" purpose="optional">
+<unit bldFile="/os/commsfw/datacommsserver/networkingdialogapi/default" mrp="/os/commsfw/datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
+</component>
+<component id="networkcontroller" name="Network Controller" introduced="7.0s" purpose="optional" class="plugin">
+<unit bldFile="/os/commsfw/datacommsserver/networkcontroller/group" mrp="/os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
+</component>
+</collection>
+<collection id="serialserver" name="Serial Server" level="server">
+<component id="serialportcsy" name="Serial Port CSY" introduced="ER5" purpose="optional" class="plugin">
+<unit bldFile="/os/commsfw/serialserver/serialportcsy" mrp="/os/commsfw/serialserver/serialportcsy/ser-comms_serialportcsy.mrp"/>
+</component>
+<component id="packetloopbackcsy" name="Packet Loopback CSY" introduced="8.1" purpose="development">
+<unit bldFile="/os/commsfw/serialserver/packetloopbackcsy/group" mrp="/os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
+</component>
+<component id="c32serialserver" name="C32 Serial Server" introduced="ER5" purpose="mandatory">
+<unit bldFile="/os/commsfw/serialserver/c32serialserver/group" mrp="/os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
+</component>
+<component id="c32serialserverconfig" name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config">
+<unit bldFile="/os/commsfw/serialserver/c32serialserverconfig" mrp="/os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
+</component>
+<component id="c32serialserverdocs" name="C32 Serial Server Documentation" purpose="development" class="doc">
+<unit mrp="/os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
+</component>
+</collection>
+<collection id="commsfwutils" name="Comms Framework Utilities" level="framework">
+<component id="commsbufs" name="Comms Buffers" introduced="^3" purpose="mandatory">
+<unit bldFile="/os/commsfw/commsfwutils/commsbufs/group" mrp="/os/commsfw/commsfwutils/commsbufs/group/comms-infras_commsbufs.mrp"/>
+</component>
+</collection>
+<collection id="commsfw_info" name="Comms Framework Info" level="app-if">
+<component id="commsinfrastructuredocs" name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
+<unit mrp="/os/commsfw/commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
+</component>
+<component id="commsfw_metadata" name="Communications Framework Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/commsfw/commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
+</component>
+</collection>
+<collection id="commsfwsupport" name="Comms Framework Support" level="support">
+<component id="commselements" name="Comms Elements" introduced="8.0" purpose="mandatory">
+<unit bldFile="/os/commsfw/commsfwsupport/commselements/group" mrp="/os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
+</component>
+</collection>
+<collection id="commsinfrastructureapitest" name="Comms-Infras API Tests" level="app-if">
+<component id="commsinfrastructuresvs" name="Comms Infrastructure Verification Suite" introduced="^3" purpose="development">
+<unit mrp="/os/commsfw/commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
+</component>
+</collection>
+<collection id="commsfwtools" name="Comms Framework Tools" level="app-if">
+<component id="preparedefaultcommsdatabase" name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config" target="desktop">
+<unit bldFile="/os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="/os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
+</component>
+<component id="installdefaultcommsdatabase" name="Install Default Comms Database" purpose="mandatory" target="desktop">
+<unit bldFile="/os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="/os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
+</component>
+<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">
+<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>
+<collection id="tcpiputils" name="TCP/IP Utilities" level="plugin">
+<component id="dnd" name="DND" introduced="7.0" purpose="mandatory">
+<unit bldFile="/os/networkingsrv/tcpiputils/dnd/group" mrp="/os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
+</component>
+
+<component id="dhcp" name="DHCP" introduced="8.0" purpose="optional">
+<unit bldFile="/os/networkingsrv/tcpiputils/dhcp/group" mrp="/os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
+</component>
+<component id="networkaddressandporttranslation" name="Network Address and Port Translation" introduced="^2" purpose="mandatory" class="plugin">
+<unit bldFile="/os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="/os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
+</component>
+<component id="punycodeconv" name="Punycode Converter" introduced="^3" purpose="mandatory">
+<unit bldFile="/os/networkingsrv/tcpiputils/punycodeconv/group" mrp="/os/networkingsrv/tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
+</component>
+</collection>
+<collection id="linklayercontrol" name="Link Layer Control" level="hw-if">
+<component id="nullagt" name="NULL AGT" introduced="7.0s" purpose="optional" class="plugin">
+<unit bldFile="/os/networkingsrv/linklayercontrol/nullagt/group" mrp="/os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
+</component>
+<component id="genericscprparameters" name="Generic SCPR Parameters" introduced="^3" purpose="optional">
+<unit bldFile="/os/networkingsrv/linklayercontrol/genericscprparameters/group" mrp="/os/networkingsrv/linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
+</component>
+<component id="mbmsparameters" name="MBMS Parameters" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/networkingsrv/linklayercontrol/mbmsparameters/group" mrp="/os/networkingsrv/linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
+</component>
+<component id="networkinterfacemgr" name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
+<unit version="2" bldFile="/os/networkingsrv/linklayercontrol/networkinterfacemgr/group" mrp="/os/networkingsrv/linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp"/>
+</component>
+</collection>
+<collection id="linklayerprotocols" name="Link Layer Protocols" level="hw-if">
+<component id="ethernetnif" name="Ethernet NIF" purpose="optional" class="plugin">
+<unit bldFile="/os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="/os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
+</component>
+
+<component id="pppnif" name="PPP NIF" introduced="ER5" purpose="optional" class="plugin">
+<unit version="2" bldFile="/os/networkingsrv/linklayerprotocols/pppnif/group" mrp="/os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp"/>
+</component>
+
+<component id="slipnif" name="SLIP NIF" purpose="development" class="plugin">
+<unit bldFile="/os/networkingsrv/linklayerprotocols/slipnif/group" mrp="/os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
+</component>
+<component id="tunnelnif" name="Tunnel NIF" introduced="7.0s" purpose="optional" class="plugin">
+<unit bldFile="/os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="/os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
+</component>
+</collection>
+<collection id="linklayerutils" name="Link Layer Utilities" level="hw-if">
+<component id="packetlogger" name="Packet Logger" introduced="8.1" purpose="development">
+<unit bldFile="/os/networkingsrv/linklayerutils/packetlogger/group" mrp="/os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
+</component>
+</collection>
+<collection id="networkcontrol" name="Network Control" level="plugin">
+
+<component id="qoslib" name="QoS Library" introduced="7.0s" purpose="optional">
+<unit bldFile="/os/networkingsrv/networkcontrol/qoslib/group" mrp="/os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
+</component>
+<component id="pfqoslib" name="PF QoS Library" introduced="7.0s" purpose="optional">
+<unit bldFile="/os/networkingsrv/networkcontrol/pfqoslib/group" mrp="/os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
+</component>
+<component id="qosfwprt" name="QoS Framework PRT" introduced="7.0s" purpose="optional" class="plugin">
+<unit bldFile="/os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="/os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
+</component>
+<component id="qosipscpr" name="QoS IP SCPR" purpose="optional" class="plugin">
+<unit bldFile="/os/networkingsrv/networkcontrol/qosipscpr/group" mrp="/os/networkingsrv/networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
+</component>
+<component id="ipnetworklayer" name="IP Network Layer" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/networkingsrv/networkcontrol/ipnetworklayer/group" mrp="/os/networkingsrv/networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
+</component>
+<component id="iptransportlayer" name="IP Transport Layer" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/networkingsrv/networkcontrol/iptransportlayer/group" mrp="/os/networkingsrv/networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
+</component>
+<component id="commsuserpromptmgr" name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
+<unit bldFile="/os/networkingsrv/networkcontrol/commsuserpromptmgr/group" mrp="/os/networkingsrv/networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
+</component>
+</collection>
+<collection id="networkprotocols" name="Network Protocols" level="plugin">
+
+<component id="ipeventnotifier" name="IP Event Notifier" introduced="8.1" purpose="mandatory" class="plugin">
+<unit bldFile="/os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="/os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
+</component>
+<component id="tcpipv4v6prt" name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" class="plugin">
+<unit bldFile="/os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="/os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
+</component>
+<component id="iphook" name="IP Hook" introduced="7.0" purpose="mandatory">
+<unit bldFile="/os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="/os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
+</component>
+<component id="mobileip" name="Mobile IP" introduced="8.1" purpose="optional" class="plugin">
+<unit bldFile="/os/networkingsrv/networkprotocols/mobileip/group" mrp="/os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
+</component>
+<component id="dnsproxy" name="DNS Proxy" introduced="^3" purpose="optional">
+<unit bldFile="/os/networkingsrv/networkprotocols/dnsproxy/group" mrp="/os/networkingsrv/networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
+</component>
+</collection>
+<collection id="networksecurity" name="Network Security" level="framework">
+<component id="tls" name="TLS" introduced="6.0" purpose="mandatory">
+<unit bldFile="/os/networkingsrv/networksecurity/tls/group" mrp="/os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
+</component>
+<component id="tlsprovider" name="TLS Provider" introduced="8.1" purpose="mandatory">
+<unit bldFile="/os/networkingsrv/networksecurity/tlsprovider/group" mrp="/os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
+</component>
+<component id="ipsec" name="IPsec" introduced="7.0" purpose="optional">
+<unit bldFile="/os/networkingsrv/networksecurity/ipsec/group" mrp="/os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
+</component>
+</collection>
+<collection id="networkingtestandutils" name="Networking Test and Utils" level="app-if">
+
+<component id="networkingexamples" 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>
+
+
+
+
+
+
+</collection>
+<collection id="networkingsrv_info" name="Networking Services Info" level="app-if">
+<component id="networkingrom" name="Networking ROM" purpose="mandatory">
+<!-- production component: contains the IBY files -->
+<unit bldFile="/os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="/os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
+</component>
+<component id="networkingdocs" name="Networking Documentation" purpose="development" class="doc">
+<unit mrp="/os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
+</component>
+<component id="networkingsrv_metadata" name="Networking Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
+</component>
+</collection>
+<collection id="pppcompressionplugins" name="PPP Compression Plugins" level="plugin">
+<component id="predictorcompression" name="Predictor Compression" introduced="6.0" purpose="optional" class="plugin">
+<unit bldFile="/os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="/os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
+</component>
+</collection>
+</package>
+<package id="wlan" level="services" tech-domain="dc" name="WLAN" levels="hw low mid high tools test">
+<collection id="wlan_plat" name="WLAN Platform Interfaces" level="test">
+<component id="wlan_dbif_api" name="WLAN DBIF API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_dbif_api/group"/>
+</component>
+<component id="wlan_hal_api" name="WLAN HAL API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_hal_api/group"/>
+</component>
+<component id="wlan_management_api" name="WLAN Management API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_management_api/group"/>
+</component>
+<component id="wlan_device_settings_api" name="WLAN Device Settings API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_device_settings_api/group"/>
+</component>
+<component id="wlan_control_api" name="WLAN Control API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_control_api/group"/>
+</component>
+<component id="wlan_hw_initialization_data_api" name="WLAN Hardware Initialization Data API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_hw_initialization_data_api/group"/>
+</component>
+<component id="wlan_power_save_plugin_api" name="WLAN Power Save Plugin API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_power_save_plugin_api/group"/>
+</component>
+<component id="wlan_info_api" name="WLAN Info API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_info_api/group"/>
+</component>
+<component id="wlan_agent_hotspot_plugin_api" name="WLAN Agent Hotspot Plug-in API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
+</component>
+<component id="wlan_osa_api" name="WLAN OSA API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_osa_api/group"/>
+</component>
+<component id="wlan_spia_api" name="WLAN SPIA API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_spia_api/group"/>
+</component>
+<component id="wlan_hpa_api" name="WLAN HPA API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_hpa_api/group"/>
+</component>
+<component id="wlan_eapol_plugin_api" name="WLAN EAPOL Plugin API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_eapol_plugin_api/group"/>
+</component>
+<component id="wlan_generic_plugin_api" name="WLAN Generic Plugin API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_generic_plugin_api/group"/>
+</component>
+<component id="wlan_aws_plugin_api" name="WLAN AWS Plugin API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_aws_plugin_api/group"/>
+</component>
+</collection>
+<collection id="wlan_pub" name="WLAN Public Interfaces" level="test">
+<component id="wlan_sdk_info_api" name="WLAN SDK Info API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_pub/wlan_sdk_info_api/group"/>
+</component>
+</collection>
+<collection id="wlan_bearer" name="WLAN Bearer" level="hw">
+<component id="wlanpsmplugin" filter="s60" name="WLAN PSM Plugin" class="plugin">
+<unit bldFile="/os/wlan/wlan_bearer/wlanpsmplugin/group"/>
+</component>
+<component id="wlanagent" filter="s60" name="WLAN Agent">
+<unit bldFile="/os/wlan/wlan_bearer/wlanagent/group"/>
+</component>
+<component id="wlandbif_cd" filter="s60" name="WLAN CommsDat interface">
+<unit bldFile="/os/wlan/wlan_bearer/wlandbif_cd/group"/>
+</component>
+<!-- should follow component directory rules for stuff in wlan_symbian/ and put in a single component or split up properly -->
+<component id="wlanengine" filter="s60" name="WLAN Engine">
+<unit bldFile="/os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
+</component>
+<component id="wlanldd" filter="s60" name="WLAN LDD">
+<unit bldFile="/os/wlan/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
+</component>
+<component id="wlannwif" filter="s60" name="WLAN Network Interface">
+<unit bldFile="/os/wlan/wlan_bearer/wlannwif/group"/>
+</component>
+</collection>
+<collection id="wlanapitest" name="WLAN API Tests" level="test">
+
+</collection>
+<collection id="wlan_info" name="WLAN Info" level="test">
+<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">
+<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">
+<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"/>
+</component>
+</collection>
+<collection id="smsprotocols" name="SMS Protocols" level="framework">
+<component id="smsstack" name="SMS Stack" introduced="6.0" purpose="mandatory" class="plugin">
+<unit bldFile="/os/cellularsrv/smsprotocols/smsstack/group" mrp="/os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
+</component>
+</collection>
+<collection id="telephonyprotocols" name="Telephony Protocols" level="framework">
+<component id="csdagt" name="CSD AGT" introduced="6.1" purpose="optional" class="plugin">
+<unit bldFile="/os/cellularsrv/telephonyprotocols/csdagt/group" mrp="/os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
+</component>
+<component id="psdagt" name="PSD AGT" introduced="7.0s" purpose="optional" class="plugin">
+<unit bldFile="/os/cellularsrv/telephonyprotocols/psdagt/group" mrp="/os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
+</component>
+<component id="gprsumtsqosprt" name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" class="plugin">
+<unit bldFile="/os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="/os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
+</component>
+<component id="gprsumtsqosinterface" name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" class="plugin">
+<unit bldFile="/os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="/os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
+</component>
+<component id="qosextnapi" name="QoS Extn API" introduced="9.2" purpose="optional">
+<unit bldFile="/os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="/os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
+</component>
+<component id="secondarypdpcontextumtsdriver" name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
+<unit bldFile="/os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="/os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
+</component>
+<component id="qos3gppcpr" name="QoS 3GPP CPR" introduced="9.2" purpose="optional" class="plugin">
+<unit bldFile="/os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="/os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
+</component>
+<component id="pdplayer" name="PDP Layer" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/cellularsrv/telephonyprotocols/pdplayer/group" mrp="/os/cellularsrv/telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
+</component>
+<component id="rawipnif" name="Raw IP NIF" introduced="8.1" purpose="optional" class="plugin">
+<unit bldFile="/os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="/os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
+</component>
+</collection>
+<collection id="telephonyserver" name="Telephony Server" level="server">
+<component id="etelserverandcore" name="ETel Server and Core" purpose="mandatory">
+<unit bldFile="/os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="/os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
+</component>
+
+<component id="etelmultimode" name="ETel Multimode" introduced="7.0" purpose="mandatory">
+<unit bldFile="/os/cellularsrv/telephonyserver/etelmultimode/group" mrp="/os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
+</component>
+<component id="etelpacketdata" name="ETel Packet Data" introduced="7.0" purpose="mandatory">
+<unit bldFile="/os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="/os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
+</component>
+<component id="etelsimtoolkit" name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory">
+<unit bldFile="/os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="/os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
+</component>
+</collection>
+<collection id="telephonyserverplugins" name="Telephony Server Plugins" level="plugin">
+<component id="common_tsy" name="Common TSY" introduced="^2" purpose="optional" class="plugin">
+<unit bldFile="/os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="/os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
+</component>
+<component id="licenseetsystub" name="Licensee TSY Stub" introduced="^2" purpose="development" class="plugin" filter="sf_build">
+<unit mrp="/os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="/os/cellularsrv/telephonyserverplugins/licenseetsystub/group"/>
+</component>
+<component id="multimodetsy" name="Multimode TSY" purpose="development" class="plugin">
+<unit bldFile="/os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="/os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
+</component>
+
+<component id="ctsydispatchlayer" name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="/os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
+</component>
+<component id="simatktsy" name="SIMATK TSY" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/cellularsrv/telephonyserverplugins/simatktsy/group" mrp="/os/cellularsrv/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
+</component>
+</collection>
+<collection id="telephonyutils" name="Telephony Utilities" level="app-if">
+<component id="dial" name="Dial" deprecated="9.1" purpose="optional">
+<unit bldFile="/os/cellularsrv/telephonyutils/dial/group" mrp="/os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
+</component>
+<component id="telephonywatchers" name="Telephony Watchers" introduced="6.0" purpose="optional" class="plugin">
+<unit bldFile="/os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="/os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
+</component>
+<component id="etel3rdpartyapi" name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
+<unit bldFile="/os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="/os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
+</component>
+</collection>
+<collection id="cellularsrv_info" name="Cellular Baseband Services Info" level="app-if">
+<component id="telephonyconfidentialdocs" name="Telephony Confidential Documentation" purpose="development" class="doc">
+<unit mrp="/os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
+</component>
+<component id="telephonydocs" name="Telephony Documentation" purpose="development" class="doc">
+<unit mrp="/os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.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">
+<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">
+
+
+
+</collection>
+</package>
+<package id="bt" level="services" tech-domain="de" name="Bluetooth" levels="adaptation 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">
+<unit bldFile="/os/bt/bt_plat/bluetooth_audio_adaptation_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">
+<unit bldFile="/os/bt/bt_plat/at_command_handler_plugin_api/group"/>
+</component>
+</collection>
+<collection id="bluetooth" name="Bluetooth Core" level="framework">
+<component id="btstack" name="Bluetooth Stack" introduced="6.0" purpose="optional">
+<unit bldFile="/os/bt/bluetooth/btstack" mrp="/os/bt/bluetooth/btstack/bluetooth_stack.mrp"/>
+</component>
+<component id="btcomm" name="Bluetooth CSY" introduced="6.0" purpose="optional" class="plugin">
+<unit bldFile="/os/bt/bluetooth/btcomm" mrp="/os/bt/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
+</component>
+<component id="btsdp" name="Bluetooth SDP" introduced="6.1" purpose="optional">
+<unit bldFile="/os/bt/bluetooth/btsdp" mrp="/os/bt/bluetooth/btsdp/bluetooth_sdp.mrp"/>
+</component>
+<component id="btextnotifiers" name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
+<unit bldFile="/os/bt/bluetooth/btextnotifiers" mrp="/os/bt/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
+</component>
+<component id="gavdp" name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
+<unit bldFile="/os/bt/bluetooth/gavdp/group" mrp="/os/bt/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
+</component>
+
+<component id="btlogger" name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
+<unit bldFile="/os/bt/bluetooth/btlogger/group" mrp="/os/bt/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
+</component>
+<component id="btdocs" name="Bluetooth Documentation" purpose="development" class="doc">
+<unit mrp="/os/bt/bluetooth/btdocs/bluetooth_documentation.mrp"/>
+</component>
+</collection>
+<collection id="bluetoothmgmt" name="Bluetooth Management" level="plugin">
+<component id="btmgr" name="Bluetooth Manager" introduced="6.0" purpose="optional">
+<unit bldFile="/os/bt/bluetoothmgmt/btmgr" mrp="/os/bt/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
+</component>
+<component id="btconfig" name="Bluetooth Config" purpose="optional" class="config">
+<unit bldFile="/os/bt/bluetoothmgmt/btconfig" mrp="/os/bt/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
+</component>
+<component id="btrom" name="Bluetooth ROM" introduced="9.1" purpose="optional">
+<unit bldFile="/os/bt/bluetoothmgmt/btrom" mrp="/os/bt/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
+</component>
+<component id="bluetoothclientlib" name="Bluetooth Client Library" introduced="6.0" purpose="optional">
+<unit bldFile="/os/bt/bluetoothmgmt/bluetoothclientlib" mrp="/os/bt/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
+</component>
+
+</collection>
+<collection id="bluetoothcommsprofiles" name="Bluetooth Comms Profiles" level="app-if">
+<component id="btpan" name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" class="plugin">
+<unit bldFile="/os/bt/bluetoothcommsprofiles/btpan/group" mrp="/os/bt/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
+</component>
+</collection>
+<collection id="bthci" name="Host Controller Interface" level="server">
+<component id="bthci2" name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
+<unit bldFile="/os/bt/bthci/bthci2/group" mrp="/os/bt/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
+</component>
+<component id="hciextensioninterface" name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
+<unit bldFile="/os/bt/bthci/hciextensioninterface" mrp="/os/bt/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
+</component>
+<component id="hci2implementations" name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" class="plugin">
+<unit bldFile="/os/bt/bthci/hci2implementations/group" mrp="/os/bt/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
+</component>
+</collection>
+<collection id="irda" name="IrDA" level="plugin">
+<component id="irdastack" name="IrDA Stack" purpose="optional">
+<unit bldFile="/os/bt/irda/irdastack/group" mrp="/os/bt/irda/irdastack/group/infra-red_irda.mrp"/>
+</component>
+</collection>
+<collection id="bluetoothapitest" name="Bluetooth API Tests" level="app-if">
+
+</collection>
+<collection id="atext" name="AT Extensions" level="server">
+<!-- collection is really a component. Need to move down a directory -->
+<component id="atext_build" name="AT Extension Build" introduced="^3" purpose="optional" filter="s60">
+<unit bldFile="/os/bt/atext/group"/>
+</component>
+</collection>
+<collection id="bt_info" name="Bluetooth Info" level="app-if">
+<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">
+<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">
+<unit version="2" bldFile="/os/usb/usbmgmt/usbmgr/group" mrp="/os/usb/usbmgmt/usbmgr/group/usb_manager.mrp"/>
+</component>
+
+<component id="usbclassandmgrdocs" name="USB Class and Manager Documentation" purpose="development" class="doc">
+<unit mrp="/os/usb/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
+</component>
+</collection>
+<collection id="usb_info" name="USB Info" level="app-if">
+<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">
+<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_pub/audio_effects_presets_api/group"/>
+</component>
+<component id="drm_audio_player_api" name="DRM Audio Player API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_pub/drm_audio_player_api/group"/>
+</component>
+<component id="multimedia_extension_interfaces_api" name="Multimedia Extension Interfaces API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_pub/multimedia_extension_interfaces_api/group"/>
+</component>
+</collection>
+<collection id="mm_plat" name="Multimedia Platform Interfaces" level="app-if">
+<component id="aac_decoder_config_api" name="AAC Decoder Config API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/aac_decoder_config_api/group"/>
+</component>
+<component id="aac_decoder_config_msg_hdlr_api" name="AAC Decoder Config Msg Hdlr API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/aac_decoder_config_msg_hdlr_api/group"/>
+</component>
+<component id="aac_decoder_config_proxy_api" name="AAC Decoder Config Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/aac_decoder_config_proxy_api/group"/>
+</component>
+<component id="added_devsound_control_api" name="Added DevSound Control API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/added_devsound_control_api/group"/>
+</component>
+<component id="added_devsound_control_msg_hdlr_api" name="Added DevSound Control Msg Hdlr API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/added_devsound_control_msg_hdlr_api/group"/>
+</component>
+<component id="added_devsound_control_proxy_api" name="Added DevSound Control Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/added_devsound_control_proxy_api/group"/>
+</component>
+<component id="audio_effects_msg_hdlr_api" name="Audio Effects Message Handler API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/audio_effects_msg_hdlr_api/group"/>
+</component>
+<component id="audio_effects_proxy_api" name="Audio Effects Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/audio_effects_proxy_api/group"/>
+</component>
+<component id="audio_policy_header_api" name="Audio Policy Header API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/audio_policy_header_api/group"/>
+</component>
+<component id="audio_routing_api" name="Audio Routing API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/audio_routing_api/group"/>
+</component>
+<component id="audio_routing_msg_hdlr_api" name="Audio Routing Msg Hdlr API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/audio_routing_msg_hdlr_api/group"/>
+</component>
+<component id="audio_routing_proxy_api" name="Audio Routing Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/audio_routing_proxy_api/group"/>
+</component>
+<component id="custom_interface_builder_api" name="Custom Interface Builder API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/custom_interface_builder_api/group"/>
+</component>
+<component id="custom_interface_message_handler_factory_api" name="Custom Interface Message Handler Factory API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/custom_interface_message_handler_factory_api/group"/>
+</component>
+<component id="custom_interface_proxy_factory_api" name="Custom Interface Proxy Factory 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">
+<unit bldFile="/os/mm/mm_plat/devsound_adaptation_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/eaac_plus_decoder_interface_api/group"/>
+</component>
+<component id="eaac_plus_decoder_interface_msg_hdlr_api" name="eAAC Plus Decoder Interface Message Handler API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/eaac_plus_decoder_interface_msg_hdlr_api/group"/>
+</component>
+<component id="eaac_plus_decoder_interface_proxy_api" name="eAAC Plus Decoder Interface Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/eaac_plus_decoder_interface_proxy_api/group"/>
+</component>
+<component id="error_concealment_interface_api" name="Error Concealment Interface API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/error_concealment_interface_api/group"/>
+</component>
+<component id="error_concealment_interface_msg_hdlr_api" name="Error Concealment Interface Message Handler 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">
+<unit bldFile="/os/mm/mm_plat/fm_radio_adaptation_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/g711_decoder_interface_msg_hdlr_api/group"/>
+</component>
+<component id="g711_decoder_interface_proxy_api" name="G711 Decoder Interface Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/g711_decoder_interface_proxy_api/group"/>
+</component>
+<component id="g711_encoder_interface_api" name="G711 Encoder Interface API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/g711_encoder_interface_api/group"/>
+</component>
+<component id="g711_encoder_interface_msg_hdlr_api" name="G711 Encoder Interface Message Handler API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/g711_encoder_interface_msg_hdlr_api/group"/>
+</component>
+<component id="g711_encoder_interface_proxy_api" name="G711 Encoder Interface Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/g711_encoder_interface_proxy_api/group"/>
+</component>
+<component id="g729_decoder_interface_api" name="G729 Decoder Interface API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/g729_decoder_interface_api/group"/>
+</component>
+<component id="g729_decoder_interface_msg_hdlr_api" name="G729 Decoder Interface Message Handler API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/g729_decoder_interface_msg_hdlr_api/group"/>
+</component>
+<component id="g729_decoder_interface_proxy_api" name="G729 Decoder Interface Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/g729_decoder_interface_proxy_api/group"/>
+</component>
+<component id="g729_encoder_interface_api" name="G729 Encoder Interface API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/g729_encoder_interface_api/group"/>
+</component>
+<component id="g729_encoder_interface_proxy_api" name="G729 Encoder Interface Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/g729_encoder_interface_proxy_api/group"/>
+</component>
+<component id="g729_encoder_interface_msg_hdlr_api" name="G729 Encoder Interface Message Handler API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/g729_encoder_interface_msg_hdlr_api/group"/>
+</component>
+<component id="global_audio_settings_api" name="Global Audio Settings API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/global_audio_settings_api/group"/>
+</component>
+<component id="global_audio_settings_definition_api" name="Global Audio Settings Definition API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/global_audio_settings_definition_api/group"/>
+</component>
+<component id="ilbc_decoder_interface_api" name="Ilbc Decoder Interface API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/ilbc_decoder_interface_api/group"/>
+</component>
+<component id="ilbc_decoder_interface_msg_hdlr_api" name="Ilbc Decoder Interface Message Handler API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/ilbc_decoder_interface_msg_hdlr_api/group"/>
+</component>
+<component id="ilbc_decoder_interface_proxy_api" name="Ilbc Decoder Interface Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/ilbc_decoder_interface_proxy_api/group"/>
+</component>
+<component id="ilbc_encoder_interface_api" name="Ilbc Encoder Interface API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/ilbc_encoder_interface_api/group"/>
+</component>
+<component id="ilbc_encoder_interface_msg_hdlr_api" name="Ilbc Encoder Interface Message Handler API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/ilbc_encoder_interface_msg_hdlr_api/group"/>
+</component>
+<component id="ilbc_encoder_interface_proxy_api" name="Ilbc Encoder Interface Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/ilbc_encoder_interface_proxy_api/group"/>
+</component>
+<component id="mdf_plugin_uids" name="MDF Plug-in UIDs" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/mdf_plugin_uids/group"/>
+</component>
+<component id="multimedia_fourcc_definitions_api" name="Multimedia FourCC Definitions API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/multimedia_fourcc_definitions_api/group"/>
+</component>
+<component id="nokia_audio_policy_header_api" name="Nokia Audio Policy Header API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/nokia_audio_policy_header_api/group"/>
+</component>
+<component id="nokia_multimedia_fourcc_definitions_api" name="Nokia Multimedia Fourcc Definitions API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/nokia_multimedia_fourcc_definitions_api/group"/>
+</component>
+<component id="ra8_decoder_interface_api" name="RA8 Decoder Interface API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/ra8_decoder_interface_api/group"/>
+</component>
+<component id="ra8_decoder_interface_msg_hdlr_api" name="RA8 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">
+<unit bldFile="/os/mm/mm_plat/rds_adaptation_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">
+<unit bldFile="/os/mm/mm_plat/restricted_audio_output_msg_hdlr_api/group"/>
+</component>
+<component id="restricted_audio_output_proxy_api" name="Restricted Audio Output Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/restricted_audio_output_proxy_api/group"/>
+</component>
+<component id="sbc_encoder_interface_api" name="SBC Encoder Interface API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/sbc_encoder_interface_api/group"/>
+</component>
+<component id="sbc_encoder_interface_msg_hdlr_api" name="SBC Encoder Interface Message Handler API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/sbc_encoder_interface_msg_hdlr_api/group"/>
+</component>
+<component id="sbc_encoder_interface_proxy_api" name="SBC Encoder Interface Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/sbc_encoder_interface_proxy_api/group"/>
+</component>
+<component id="secure_output_mdf_custom_interface" name="Secure Output MDF Custom Interface" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/secure_output_mdf_custom_interface/group"/>
+</component>
+<component id="speech_encoder_config_api" name="Speech Encoder Config API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/speech_encoder_config_api/group"/>
+</component>
+<component id="speech_encoder_config_msg_hdlr_api" name="Speech Encoder Config Message Handler API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/speech_encoder_config_msg_hdlr_api/group"/>
+</component>
+<component id="speech_encoder_config_proxy_api" name="Speech Encoder Config Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/speech_encoder_config_proxy_api/group"/>
+</component>
+<component id="telephony_audio_routing_client_api" name="Telephony Audio Routing Client API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/telephony_audio_routing_client_api/group"/>
+</component>
+<component id="telephony_audio_routing_manager_api" name="Telephony Audio Routing Manager API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/telephony_audio_routing_manager_api/group"/>
+</component>
+<component id="video_buffer_management_mdf_custom_interface" name="Video Buffer Management MDF Custom Interface" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/video_buffer_management_mdf_custom_interface/group"/>
+</component>
+<component id="video_decoder_rotation_mdf_custom_interface" name="Video Decoder Rotation MDF Custom Interface" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
+</component>
+<component id="video_decoder_scaling_mdf_custom_interface" name="Video Decoder Scaling MDF Custom Interface" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
+</component>
+<component id="video_reclaim_extbuffers_ci" name="Video Reclaim Extbuffers Custom Interface" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/video_reclaim_extbuffers_ci/group"/>
+</component>
+<component id="video_window_control_custom_interface" name="Video Window Control Custom Interface" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/video_window_control_custom_interface/group"/>
+</component>
+<component id="wma_decoder_interface_api" name="WMA Decoder Interface API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/wma_decoder_interface_api/group"/>
+</component>
+<component id="wma_decoder_interface_msg_hdlr_api" name="WMA Decoder Interface Message Handler API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/wma_decoder_interface_msg_hdlr_api/group"/>
+</component>
+<component id="wma_decoder_interface_proxy_api" name="WMA Decoder Interface Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/wma_decoder_interface_proxy_api/group"/>
+</component>
+<component id="eaacplusutil_api" name="EAac Plus Util API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/eaacplusutil_api/group"/>
+</component>
+<component id="frametable_api" name="Frametable API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/frametable_api/group"/>
+</component>
+</collection>
+<collection id="devsoundextensions" name="Devsound Extensions" level="device-fw">
+<component id="drmaudioplayer" filter="s60" name="DRM Audio Player">
+<unit bldFile="/os/mm/devsoundextensions/drmaudioplayer/group"/>
+</component>
+<component id="mmextfw" filter="s60" name="Multimedia Extension Framework">
+<unit bldFile="/os/mm/devsoundextensions/mmextfw/group"/>
+</component>
+<component id="audiorouting" filter="s60" name="Audio Routing">
+<unit bldFile="/os/mm/devsoundextensions/audiorouting/group"/>
+</component>
+<component id="effects" filter="s60" name="Effects">
+<unit bldFile="/os/mm/devsoundextensions/effects/group"/>
+</component>
+<component id="effectspresets" filter="s60" name="Effects Presets">
+<unit bldFile="/os/mm/devsoundextensions/effectspresets/group"/>
+</component>
+<component id="effectspresets_utils" filter="s60" name="Effects Presets Utils">
+<!-- need to #include the lot from a single bld.inf
+ Also move to a standard component location, not under effectspresets -->
+<unit bldFile="/os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
+<unit bldFile="/os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
+</component>
+<component id="telephonyaudiorouting" filter="s60" name="Telephony Audio Routing">
+<unit bldFile="/os/mm/devsoundextensions/telephonyaudiorouting/group"/>
+</component>
+<component id="mmfcustominterfaces" filter="s60" name="MMF Custom Interfaces">
+<unit bldFile="/os/mm/devsoundextensions/mmfcustominterfaces/group"/>
+</component>
+<component id="addeddevsoundcontrol" filter="s60" name="Added DevSound Control">
+<unit bldFile="/os/mm/devsoundextensions/addeddevsoundcontrol/group"/>
+</component>
+<component id="globalaudiosettings" filter="s60" name="Global Audio Settings">
+<unit bldFile="/os/mm/devsoundextensions/globalaudiosettings/group"/>
+</component>
+<component id="restrictedaudiooutput" filter="s60" name="Restricted Audio Output">
+<unit bldFile="/os/mm/devsoundextensions/restrictedaudiooutput/group"/>
+</component>
+<component id="ciextnfactoryplugins" filter="s60" name="Custom Interface Extension Factory Plugins" class="plugin">
+<unit bldFile="/os/mm/devsoundextensions/ciextnfactoryplugins/group"/>
+</component>
+</collection>
+<collection id="mdfdevvideoextensions" name="MDF Dev Video Extensions" level="device-fw">
+<component id="nga_mdf_postprocessor" name="NGA MDF Postprocessor" filter="s60">
+<unit bldFile="/os/mm/mdfdevvideoextensions/nga_mdf_postprocessor/group"/>
+</component>
+</collection>
+<collection id="audio" name="Audio Codecs" level="middleware">
+<component id="arm_cmmf_codecs" filter="s60" name="ARM CMMF Codecs" class="plugin">
+<unit bldFile="/os/mm/audio/arm_cmmf_codecs/group"/>
+</component>
+</collection>
+<collection id="video" name="Video Codecs" level="middleware">
+<!-- empty -->
+</collection>
+<collection id="imagingandcamerafws" name="Imaging and Camera Frameworks" level="app-if">
+<component id="imagingfws" name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
+<unit bldFile="/os/mm/imagingandcamerafws/imagingfws/group" mrp="/os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
+</component>
+
+
+<component id="camerafw" name="Camera Framework" introduced="7.0s" purpose="optional">
+<unit bldFile="/os/mm/imagingandcamerafws/camerafw/group" mrp="/os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
+</component>
+
+</collection>
+<collection id="mmlibs" name="Multimedia Libraries" level="middleware">
+<component id="mmutilitylib" name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
+<unit bldFile="/os/mm/mmlibs/mmutilitylib/group" mrp="/os/mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
+</component>
+<component id="mmfw" name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
+<unit bldFile="/os/mm/mmlibs/mmfw/group" mrp="/os/mm/mmlibs/mmfw/group/multimedia_mmf.mrp"/>
+</component>
+</collection>
+<collection id="mmplugins" name="Multimedia Plugins" level="middleware">
+<component id="imagingplugins" name="Imaging Plugins" introduced="7.0s" purpose="optional" class="plugin">
+<unit bldFile="/os/mm/mmplugins/imagingplugins/group" mrp="/os/mm/mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
+</component>
+<component id="cameraplugins" name="Camera Plugins" introduced="7.0s" purpose="optional" class="plugin">
+<unit bldFile="/os/mm/mmplugins/cameraplugins/group" mrp="/os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
+</component>
+<component id="lib3gp" name="3GP Library" introduced="^2" purpose="optional">
+<unit bldFile="/os/mm/mmplugins/lib3gp/group" mrp="/os/mm/mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
+</component>
+
+<component id="mmfwplugins" name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" class="plugin">
+<unit bldFile="/os/mm/mmplugins/mmfwplugins/group" mrp="/os/mm/mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
+</component>
+</collection>
+<collection id="mm_info" name="Multimedia Info" level="app-if">
+<component id="mmdocs" name="Multimedia Documentation" purpose="development" class="doc">
+<unit mrp="/os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
+</component>
+
+<component id="mm_metadata" name="Multimedia Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
+</component>
+</collection>
+<collection id="mmresourcemgmt" name="Multimedia Resource Management" level="middleware">
+<component id="mmresctrl" name="Multimedia Resource Controller" introduced="^2" purpose="development">
+<unit bldFile="/os/mm/mmresourcemgmt/mmresctrl/group" mrp="/os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
+</component>
+</collection>
+<collection id="mmdevicefw" name="Multimedia Device Framework" level="device-fw">
+<component id="mdf" name="Media Device Framework" introduced="9.2" purpose="mandatory">
+<unit bldFile="/os/mm/mmdevicefw/mdf/group" mrp="/os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
+</component>
+
+<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">
+<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"/>
+</component>
+</collection>
+<collection id="mmtestenv" name="Multimedia Test Environment" level="device-fw">
+
+
+
+
+</collection>
+<collection id="omxil" name="OpenMAX IL" level="hw-if">
+<component id="omxilapi" name="OpenMAX IL API" introduced="^3" purpose="optional">
+<unit version="1" bldFile="/os/mm/omxil/omxilapi/group" mrp="/os/mm/omxil/omxilapi/group/multimedia_omx_il_api.mrp"/>
+</component>
+<component id="omxilcore" name="OpenMAX IL Core" introduced="^3" purpose="optional">
+<unit version="1" bldFile="/os/mm/omxil/omxilcore/group" mrp="/os/mm/omxil/omxilcore/group/multimedia_omx_il_core.mrp"/>
+</component>
+<component id="omxilcomponentcommon" name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
+<unit version="1" bldFile="/os/mm/omxil/omxilcomponentcommon/group" mrp="/os/mm/omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp"/>
+</component>
+<component id="omxilrefcomps" name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
+<unit version="1" bldFile="/os/mm/omxil/omxilrefcomps/ref_components/group" mrp="/os/mm/omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp"/>
+</component>
+
+
+<component id="mmilapi" name="Multimedia Integration Layer API" introduced="^3" purpose="development">
+<unit bldFile="/os/mm/omxil/mmilapi/group" mrp="/os/mm/omxil/mmilapi/group/multimedia_il_api.mrp"/>
+</component>
+</collection>
+<collection id="devsound" name="Sound Device" level="devices">
+<component id="devsoundapi" name="DevSound API" introduced="7.0s" purpose="mandatory">
+<unit bldFile="/os/mm/devsound/devsoundapi/group" mrp="/os/mm/devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
+</component>
+<component id="a3fdevsound" name="A3F DevSound" introduced="^2" purpose="optional">
+<unit bldFile="/os/mm/devsound/a3fdevsound/group" mrp="/os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
+</component>
+<component id="a3facf" name="A3F Audio Component Framework" introduced="^2" purpose="optional">
+<unit bldFile="/os/mm/devsound/a3facf/group" mrp="/os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
+</component>
+<component id="devsoundpluginsupport" name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
+<unit bldFile="/os/mm/devsound/devsoundpluginsupport/group" mrp="/os/mm/devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
+</component>
+<component id="refdevsound" 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 id="btdevsound" name="Bluetooth DevSound Plugin" introduced="7.0s" purpose="development" class="plugin" deprecated="^4">
+<unit bldFile="/os/mm/devsound/sounddevbt/group" mrp="/os/mm/devsound/sounddevbt/group/multimedia_mdf_devsound_refbtplugin.mrp"/>
+</component>
+<component id="a3ftrace" name="A3F Trace Utility" introduced="^2" purpose="development">
+<unit bldFile="/os/mm/devsound/a3ftrace/group" mrp="/os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
+</component>
+
+<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">
+<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"/>
+</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"/>
+</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">
+<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>
+</collection>
+<collection id="imagingext_plat" name="Imaging Extensions Platform Interfaces" level="app-if">
+<component id="jpeg2000_icl_plugin_api" name="JPEG2000 ICL plugin API" class="api" filter="s60">
+<unit bldFile="/os/imagingext/imagingext_plat/jpeg2000_icl_plugin_api/group"/>
+</component>
+<component id="extended_icl_jpeg_api" name="Extended ICL Jpeg API" class="api" filter="s60">
+<unit bldFile="/os/imagingext/imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
+
+</component>
+<component id="h324_annex_k_custom_api" name="H324 Annex K Custom API" class="api" filter="s60">
+<unit bldFile="/os/imagingext/imagingext_plat/h324_annex_k_custom_api/group"/>
+</component>
+<component id="ecam_orientation_custom_api" name="ECam Orientation Custom API" class="api" filter="s60">
+<unit bldFile="/os/imagingext/imagingext_plat/ecam_orientation_custom_api/group"/>
+</component>
+<component id="ecam_ui_orientation_override_custom_api" name="ECam UI Orientation Override Custom API" class="api" filter="s60">
+<unit bldFile="/os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
+</component>
+<component id="ecam_face_tracking_custom_api" name="ECam Face Tracking Custom API" class="api" filter="s60">
+<unit bldFile="/os/imagingext/imagingext_plat/ecam_face_tracking_custom_api/group"/>
+</component>
+<component id="ecam_use_case_hint_custom_api" class="api" name="ECam Use Case Hint Custom API" filter="s60" introduced="^4">
+<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">
+<component id="iclextjpegapi" filter="s60" name="ICL Extension JPEG API">
+<unit bldFile="/os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
+</component>
+<component id="imageadaptationextensions_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"/>
+</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>
+<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">
+<collection id="graphicsaccelaration" name="Graphics Acceleration" level="adaptation">
+<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">
+<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">
+<unit bldFile="/os/graphics/graphicsresourceservices/graphicsresourceadaptation/group" mrp="/os/graphics/graphicsresourceservices/graphicsresourceadaptation/group/graphics_graphicsresourceadapter.mrp"/>
+</component>
+<component id="graphicsresourceimplementation" name="Graphics Resource Implementation" introduced="^4" purpose="optional">
+<unit bldFile="/os/graphics/graphicsresourceservices/graphicsresourceimplementation/group" mrp="/os/graphics/graphicsresourceservices/graphicsresourceimplementation/group/graphics_graphicsresourceimplementation.mrp"/>
+</component>
+<component id="graphicsresourceinterface" name="Graphics Resource Interface" introduced="^4" purpose="optional">
+<unit bldFile="/os/graphics/graphicsresourceservices/graphicsresourceinterface/group" mrp="/os/graphics/graphicsresourceservices/graphicsresourceinterface/group/graphics_graphicsresourceinterface.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">
+<!-- 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="graphicscomposition" name="Graphics Composition" level="engines">
+<component id="openwfcinterface" name="OpenWF Composition Interface" introduced="^3" purpose="optional">
+<unit bldFile="/os/graphics/graphicscomposition/openwfcinterface/group" mrp="/os/graphics/graphicscomposition/openwfcinterface/group/graphics_openwfcinterface.mrp"/>
+</component>
+<component id="openwfcompositionengine" name="OpenWF Composition Engine" introduced="^3" purpose="development">
+<unit bldFile="/os/graphics/graphicscomposition/openwfcompositionengine/group" mrp="/os/graphics/graphicscomposition/openwfcompositionengine/group/graphics_openwfcompositionengine.mrp"/>
+</component>
+<component id="openwfsupport" name="OpenWF Support" introduced="^3" purpose="optional">
+<unit bldFile="/os/graphics/graphicscomposition/openwfsupport/group" mrp="/os/graphics/graphicscomposition/openwfsupport/group/graphics_openwfsupport.mrp"/>
+</component>
+<component id="surfaceupdate" name="Surface Update" introduced="^3" purpose="optional">
+<unit bldFile="/os/graphics/graphicscomposition/surfaceupdate/group" mrp="/os/graphics/graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
+</component>
+</collection>
+<collection id="graphicstest" name="Graphics Test" level="app-if">
+
+<component id="uibench" name="UI Bench" introduced="9.2" purpose="development">
+<unit bldFile="/os/graphics/graphicstest/uibench/group" mrp="/os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
+</component>
+</collection>
+<collection id="graphics_plat" name="Graphics Platform Interfaces" level="app-if">
+<component id="m3g_core_api" filter="sf_build" name="M3G Core API" class="api">
+<unit bldFile="/os/graphics/graphics_plat/m3g_core_api/group"/>
+</component>
+</collection>
+<collection id="graphics_info" name="Graphics Info" level="app-if">
+<component id="graphicsdocs" name="Graphics Documentation" purpose="development" class="doc">
+<unit mrp="/os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
+</component>
+<component id="graphics_metadata" name="Graphics Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
+</component>
+</collection>
+<collection id="windowing" name="Windowing" level="app-if">
+<component id="windowserver" name="Window Server" purpose="mandatory">
+<unit bldFile="/os/graphics/windowing/windowserver/group" mrp="/os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
+</component>
+<component id="windowserverplugins" name="Window Server Plugins" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/graphics/windowing/windowserverplugins/group" mrp="/os/graphics/windowing/windowserverplugins/group/graphics_wserv_std_plugins.mrp"/>
+</component>
+</collection>
+<collection id="printingservices" name="Printing Services" level="app-if">
+<component id="printerdriversupport" name="Printer Driver Support" purpose="optional">
+<unit bldFile="/os/graphics/printingservices/printerdriversupport/group" mrp="/os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
+</component>
+<component id="printerdrivers" name="Printer Drivers" purpose="optional" class="plugin">
+<unit bldFile="/os/graphics/printingservices/printerdrivers/group" mrp="/os/graphics/printingservices/printerdrivers/group/graphics_printdrv.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">
+<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">
+<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 -->
+<unit bldFile="/os/graphics/openvg/openvginterface/group/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">
+<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"/>
+</component>
+<component id="eglrefimpl" name="EGL Reference Implementation" introduced="^3" purpose="optional">
+<unit bldFile="/os/graphics/egl/eglrefimpl/group" mrp="/os/graphics/egl/eglrefimpl/group/graphics_eglrefimpl.mrp"/>
+</component>
+<component id="egltest" name="EGL Tests" introduced="^3" purpose="development">
+<unit bldFile="/os/graphics/egl/egltest/group" mrp="/os/graphics/egl/egltest/group/graphics_egltest.mrp"/>
+</component>
+</collection>
+<collection id="graphicsdeviceinterface" name="Graphics Device Interface" level="device-interface">
+<component id="gdi" name="GDI" purpose="mandatory">
+<unit bldFile="/os/graphics/graphicsdeviceinterface/gdi/group" mrp="/os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
+</component>
+<component id="bitgdi" name="BitGDI" purpose="mandatory">
+<unit bldFile="/os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="/os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
+</component>
+<component id="colourpalette" name="Colour Palette" introduced="7.0s" purpose="optional">
+<unit bldFile="/os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="/os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
+</component>
+<component id="screendriver" name="Screen Driver" introduced="6.1" purpose="optional" class="plugin">
+<unit bldFile="/os/graphics/graphicsdeviceinterface/screendriver/group" mrp="/os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
+</component>
+<component id="directgdi" name="DirectGDI" introduced="^3" deprecated="^3" purpose="optional">
+<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">
+<unit bldFile="/os/graphics/graphicsdeviceinterface/directgdiadaptation/group" mrp="/os/graphics/graphicsdeviceinterface/directgdiadaptation/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>
+</collection>
+<collection id="graphicsapitest" name="Graphics API Tests" level="app-if">
+
+
+</collection>
+</package>
+<package id="textandloc" level="services" tech-domain="ui" name="Text and Localisation Services" levels="encoding util fonts tools text">
+<collection id="textandloc_plat" name="Text and Localisation Platform Interfaces" level="text">
+<component id="findutil_api" class="api" name="Find Util API" filter="s60">
+<unit bldFile="/os/textandloc/textandloc_plat/findutil_api/group"/>
+</component>
+<component id="japanese_language_utilities_api" class="api" name="Japanese Language Utilities API" filter="s60">
+<unit bldFile="/os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
+</component>
+<component id="sortutil_api" class="api" name="Sort Util API" filter="s60">
+<unit bldFile="/os/textandloc/textandloc_plat/sortutil_api/group"/>
+</component>
+</collection>
+<collection id="textandloc_pub" name="Text and Localisation Public Interfaces" level="text">
+<component id="directory_localizer_api" class="api" name="Directory Localizer API" filter="s60">
+<unit bldFile="/os/textandloc/textandloc_pub/directory_localizer_api/group"/>
+</component>
+</collection>
+<collection id="charconvfw" name="Character Conversion" level="encoding">
+<component id="charconv_fw" name="Character Encoding and Conversion Framework" purpose="optional">
+<unit bldFile="/os/textandloc/charconvfw/charconv_fw/group" mrp="/os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
+</component>
+<component id="charconvplugins" name="Character Encoding and Conversion Plugins" purpose="optional" class="plugin">
+<unit bldFile="/os/textandloc/charconvfw/charconvplugins/group" mrp="/os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
+</component>
+<component id="fatfilenameconversionplugins" name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" class="plugin">
+<unit bldFile="/os/textandloc/charconvfw/fatfilenameconversionplugins/group" mrp="/os/textandloc/charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
+</component>
+</collection>
+<collection id="fontandtxtsrv" name="Font and Text Services" level="fonts">
+<component id="iculayoutengine" name="ICU Layout Engine" introduced="9.2" purpose="optional" class="plugin" deprecated="^4">
+<unit bldFile="/os/textandloc/fontservices/textshaperplugin/group" mrp="/os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
+</component>
+<component id="fontstore" name="Font Store" purpose="mandatory">
+<unit bldFile="/os/textandloc/fontservices/fontstore/group" mrp="/os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
+</component>
+<component id="textbase" name="Text Base" purpose="mandatory">
+<!-- placeholder for text code from GDI -->
+</component>
+<component id="freetypefontrasteriser" name="FreeType Font Rasteriser" purpose="optional" class="plugin">
+<unit bldFile="/os/textandloc/fontservices/freetypefontrasteriser/group" mrp="/os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
+</component>
+<component id="referencefonts" name="Reference Fonts" introduced="6.0" purpose="optional">
+<unit bldFile="/os/textandloc/fontservices/referencefonts/group" mrp="/os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
+</component>
+</collection>
+<collection id="textlayout" name="Text Layout" level="text">
+<component id="texthandling" name="Text Handling" purpose="optional">
+<unit bldFile="/os/textandloc/textrendering/texthandling/group" mrp="/os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
+</component>
+<component id="textformatting" name="Text Formatting" purpose="optional">
+<unit bldFile="/os/textandloc/textrendering/textformatting/group" mrp="/os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
+</component>
+
+</collection>
+<collection id="textandlocutils" name="Text and Localisation Utils" level="util">
+<component id="numbergrouping" name="Number Grouping">
+<unit bldFile="/os/textandloc/charconvfw/numbergrouping/group"/>
+</component>
+<component id="jplangutil" name="Japanese Language Utilities">
+<unit bldFile="/os/textandloc/charconvfw/jplangutil/group"/>
+</component>
+<component id="sortutil" name="Sorting Utility">
+<unit bldFile="/os/textandloc/charconvfw/sortutil/group"/>
+</component>
+<component id="inlinetext" name="Inline Text">
+<unit bldFile="/os/textandloc/charconvfw/inlinetext/group"/>
+</component>
+<component id="nearestlangutil" name="Nearest Language Util" introduced="^2" purpose="mandatory">
+<!-- placeholder for split from bafl -->
+</component>
+<component id="numberformatting" name="Number Formatting" introduced="7.0s" purpose="optional">
+<unit bldFile="/os/textandloc/textrendering/numberformatting/group" mrp="/os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
+</component>
+</collection>
+<collection id="localesupport" name="Locale Support" level="util">
+<component id="reflocales" name="Reference Locales" purpose="optional" class="plugin">
+<unit bldFile="/os/textandloc/localisation/localesupport" mrp="/os/textandloc/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
+</component>
+<component id="initlocale" name="Initialise Locale" introduced="^2" purpose="mandatory">
+<!-- placeholder for split from bafl -->
+</component>
+</collection>
+<collection id="textandloctools" name="Text and Localisation Tools" level="tools">
+<component id="fontcompiler" name="Font Compiler" purpose="development" target="desktop">
+<!-- placeholder for split from GDI Tools -->
+</component>
+<component id="bitmapfonttools" name="Bitmap Font Tools" purpose="development" target="desktop">
+<unit bldFile="/os/graphics/graphicstools/bitmapfonttools/group" mrp="/os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
+</component>
+</collection>
+<collection id="textandloc_info" name="Text and Localisation Info" level="text">
+<component id="textandloc_metadata" name="Text and Localisation Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="xmlsrv" level="services" tech-domain="rt" name="XML Services" levels="plugin server framework generic specific">
+<collection id="xmlsrv_plat" name="XML Services Platform Interfaces" level="specific">
+<component id="xmlsrv_plat_build" name="XML Services Platform Interface Build" class="api" filter="s60">
+<!-- need to fix the configuration used here.
+ Either destribute to other components or use the new feature flags confguration mechanisms.
+ Remove this component and uncomment the other units when fixed-->
+<unit bldFile="/os/xmlsrv/xmlsrv_plat/group"/>
+</component>
+<component id="xml_encryption_api" name="XML Encryption API" class="api" filter="s60">
+<!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/> -->
+</component>
+<component id="xml_signature_api" name="XML Signature API" class="api" filter="s60">
+<!-- <unit bldFile="xmlsrv_plat/xml_signature_api/group"/> -->
+</component>
+<component id="xml_security_engine_utils_api" name="XML Security Engine Utils API" class="api" filter="s60">
+<!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/> -->
+</component>
+</collection>
+<collection id="xmlsecurityengine" name="XML Security Engine" level="framework">
+<component id="xmlseccertman" filter="s60" name="XML Security Certificate Manager">
+<unit bldFile="/os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
+</component>
+<component id="xmlsec" filter="s60" name="XML Security">
+<unit bldFile="/os/xmlsrv/xmlsecurityengine/xmlsec/group"/>
+</component>
+<component id="xmlseccrypto" filter="s60" name="XML Security Crypto">
+<unit bldFile="/os/xmlsrv/xmlsecurityengine/xmlseccrypto/group"/>
+</component>
+<component id="xmlsecwrapper" filter="s60" name="XML Security Wrapper">
+<unit bldFile="/os/xmlsrv/xmlsecurityengine/xmlsecwrapper/group"/>
+</component>
+</collection>
+<collection id="xml" name="XML" level="generic">
+<component id="xmlfw" name="XML Framework" introduced="7.0s" purpose="optional">
+<unit bldFile="/os/xmlsrv/xml/xmlfw/group" mrp="/os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
+</component>
+<component id="libxml2libs" name="Libxml2 Libraries" introduced="^3" purpose="optional">
+<unit bldFile="/os/xmlsrv/xml/libxml2libs/group" mrp="/os/xmlsrv/xml/libxml2libs/group/syslibs_libxml2.mrp"/>
+</component>
+<component id="legacyminidomparser" name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
+<unit bldFile="/os/xmlsrv/xml/legacyminidomparser/GROUP" mrp="/os/xmlsrv/xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp"/>
+</component>
+<component id="xmldomandxpath" name="XML DOM and XPath" introduced="^3" purpose="optional">
+<unit bldFile="/os/xmlsrv/xml/xmldomandxpath/group" mrp="/os/xmlsrv/xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
+</component>
+<component id="xmlexpatparser" name="XML Expat Parser" introduced="7.0s" purpose="optional" class="plugin">
+<unit bldFile="/os/xmlsrv/xml/xmlexpatparser/group" mrp="/os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
+</component>
+<component id="xmllibxml2parser" name="XML Libxml2 Parser" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/xmlsrv/xml/xmllibxml2parser/group" mrp="/os/xmlsrv/xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
+</component>
+<component id="wbxmlparser" name="WBXML Parser" introduced="7.0s" purpose="optional" class="plugin">
+<unit bldFile="/os/xmlsrv/xml/wbxmlparser/group" mrp="/os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
+</component>
+</collection>
+<collection id="xmlsrv_info" name="XML Services Info" level="specific">
+<component id="xmlsrv_metadata" name="XML Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="deviceplatformrelease" level="services" tech-domain="to" name="Device Platform Release" levels="bld mid top">
+<collection id="s60extras" name="S60 Extras" level="mid">
+<!-- collection is really a component. Need to move down a directory -->
+<component id="s60extras_build" filter="s60" name="S60 Extras Build" class="config" purpose="development">
+<unit bldFile="/os/deviceplatformrelease/S60Extras/group"/>
+</component>
+</collection>
+<collection id="version" name="Version" level="top">
+<!-- collection is really a component. Need to move down a directory -->
+<component id="version_build" filter="s60" name="Version Build" class="config" purpose="development">
+<unit bldFile="/os/deviceplatformrelease/Version/group"/>
+</component>
+</collection>
+<collection id="symbianosbld" name="Symbian OS Build" level="bld">
+<component id="cedarutils" name="Cedar Utils" purpose="development">
+<unit mrp="/os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
+</component>
+<component id="productionbldcbrconfig" name="Production Build CBR Config" filter="gt" purpose="development" class="config">
+<unit mrp="/os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
+</component>
+</collection>
+<collection id="foundation_system" name="Foundation System" level="top">
+<component id="system_model" name="System Model" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
+</component>
+<component id="sf_config" name="Foundation Config" introduced="^4">
+<unit bldFile="/os/deviceplatformrelease/foundation_system/sf_config/CI_external/group"/>
+</component>
+<component id="config" filter="s60" name="Config" class="config" purpose="development">
+<unit base="/os/deviceplatformrelease/foundation_system/sf_config/config"/>
+</component>
+<component id="cenrep" filter="sf_build" name="ConE Central Repository Config" class="config" purpose="development">
+<!-- will should give the id/path something more unique than cenrep -->
+<unit bldFile="/os/deviceplatformrelease/foundation_system/sf_config/cenrep/group"/>
+</component>
+<component id="rombuild_syborg" filter="sf_build" name="Syborg iMaker Config" purpose="development" class="config" introduced="^3">
+<unit bldFile="/os/deviceplatformrelease/foundation_system/sf_config/rombuild/syborg/group"/>
+</component>
+<component id="rombuild_zoom2" filter="sf_build" name="Zoom2 iMaker Config" purpose="development" class="config" introduced="^3">
+<unit bldFile="/os/deviceplatformrelease/foundation_system/sf_config/rombuild/zoom2/group"/>
+</component>
+</collection>
+<collection id="deviceplatformrelease_info" name="Device Platform Release Info" level="top">
+<component id="deviceplatformrelease_metadata" name="Device Platform Release Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="osrndtools" level="services" tech-domain="to" name="OS R&D tools" levels="fw trace">
+<collection id="stif" name="STIF" level="fw">
+<component id="stif_plat" filter="s60" name="STIF Platform Interfaces" class="api" purpose="development">
+<unit bldFile="/os/osrndtools/stif/stif_plat/group"/>
+</component>
+<component id="testinterface" filter="s60" name="Test Interface" purpose="development">
+<unit bldFile="/os/osrndtools/stif/testinterface/group"/>
+</component>
+<component id="testserver" filter="s60" name="Test Server" purpose="development">
+<unit bldFile="/os/osrndtools/stif/testserver/group"/>
+</component>
+<component id="testengine" filter="s60" name="Test Engine" purpose="development">
+<unit bldFile="/os/osrndtools/stif/testengine/group"/>
+</component>
+<component id="testserverstarter" filter="s60" name="Test Server Starter" purpose="development">
+<unit bldFile="/os/osrndtools/stif/testserverstarter/group"/>
+</component>
+<component id="stiftfwif" filter="s60" name="STIF Test Framework Interface" purpose="development">
+<unit bldFile="/os/osrndtools/stif/stiftfwif/group"/>
+</component>
+<component id="consoleui" filter="s60" name="Console UI" purpose="development">
+<unit bldFile="/os/osrndtools/stif/consoleui/group"/>
+</component>
+<component id="testcombiner" filter="s60" name="Test Combiner" purpose="development">
+<unit bldFile="/os/osrndtools/stif/testcombiner/group"/>
+</component>
+<component id="demomodule" filter="s60" name="Demo Module" purpose="development">
+<unit bldFile="/os/osrndtools/stif/demomodule/group"/>
+</component>
+<component id="atslogger" filter="s60" name="ATS Logger" purpose="development">
+<unit bldFile="/os/osrndtools/stif/atslogger/group"/>
+</component>
+<component id="atsinterface" filter="s60" name="ATS Interface" purpose="development">
+<unit bldFile="/os/osrndtools/stif/atsinterface/group"/>
+</component>
+<component id="testscripter" filter="s60" name="Test Scripter" purpose="development">
+<unit bldFile="/os/osrndtools/stif/testscripter/group"/>
+</component>
+<component id="suevent" filter="s60" name="SU Event" purpose="development">
+<unit bldFile="/os/osrndtools/stif/suevent/group"/>
+</component>
+<component id="stifkerneltestclassbase" filter="s60" name="STIF Kernel Test Class Base" purpose="development">
+<meta rel="config">
+<defined condition="__S60_"/>
+</meta>
+<!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
+<!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
+</component>
+<component id="stif_build" filter="s60" name="STIF Build" purpose="development">
+<!-- move exports into self-contained component. Remove this when configuration is in place-->
+<unit bldFile="/os/osrndtools/stif/group"/>
+</component>
+</collection>
+<collection id="memspy" name="Memspy" level="trace">
+<component id="memspy_plat" filter="s60" name="Memspy Platform Interfaces" class="api" purpose="development">
+<unit bldFile="/os/osrndtools/memspy/memspy_plat/group"/>
+</component>
+<component id="driver" filter="s60" name="Memspy Driver" purpose="development">
+<unit bldFile="/os/osrndtools/memspy/driver/group"/>
+</component>
+<component id="memspy_engine" filter="s60" name="Memspy Engine" purpose="development">
+<unit bldFile="/os/osrndtools/memspy/engine/group"/>
+</component>
+<component id="commandline" filter="s60" name="Memspy Command Line" purpose="development">
+<unit bldFile="/os/osrndtools/memspy/commandline/group"/>
+</component>
+<component id="console" filter="s60" name="Memspy Console" purpose="development">
+<unit bldFile="/os/osrndtools/memspy/console/group"/>
+</component>
+<component id="memspy_build" filter="s60" name="Memspy Build" purpose="development">
+<!-- move exports into self-contained component.-->
+<unit bldFile="/os/osrndtools/memspy/group"/>
+</component>
+</collection>
+<collection id="hti" name="Harmonized Test Interface" level="trace">
+<component id="hti_plat" filter="s60" name="HTI Platform Interfaces" class="api" purpose="development">
+<unit bldFile="/os/osrndtools/hti/hti_plat/group"/>
+</component>
+<component id="hticfg" filter="s60" name="HTI Config" purpose="development">
+<unit bldFile="/os/osrndtools/hti/hticfg/group"/>
+</component>
+<component id="htiautostart" filter="s60" name="HTI Autostart" purpose="development">
+<unit bldFile="/os/osrndtools/hti/htiautostart/group"/>
+</component>
+<component id="htiframework" filter="s60" name="HTI Framework" purpose="development">
+<unit bldFile="/os/osrndtools/hti/htiframework/group"/>
+</component>
+<component id="hticommplugins" filter="s60" name="HTI Communication Plugins" purpose="development" class="plugin">
+<!-- need to #include these from a single unit or separate into component at the right directory level -->
+<unit bldFile="/os/osrndtools/hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
+<unit bldFile="/os/osrndtools/hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
+<unit bldFile="/os/osrndtools/hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
+<unit bldFile="/os/osrndtools/hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
+</component>
+<component id="htiserviceplugins" filter="s60" name="HTI Service Plugins" purpose="development" class="plugin">
+<!-- need to #include these from a single unit or separate into component at the right directory level -->
+<unit bldFile="/os/osrndtools/hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
+<unit bldFile="/os/osrndtools/hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
+<unit bldFile="/os/osrndtools/hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
+<unit bldFile="/os/osrndtools/hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
+<unit bldFile="/os/osrndtools/hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
+</component>
+<component id="htifilehlp" filter="s60" name="HTI File Help" purpose="development">
+<unit bldFile="/os/osrndtools/hti/htifilehlp/group"/>
+</component>
+<component id="htiwatchdog" filter="s60" name="HTI Watchdog" purpose="development">
+<unit bldFile="/os/osrndtools/hti/htiwatchdog/group"/>
+</component>
+<component id="hti_build" filter="s60" name="HTI Build" purpose="development">
+<!-- move exports into self-contained component.-->
+<unit bldFile="/os/osrndtools/hti/group"/>
+</component>
+</collection>
+<collection id="osrndtools_info" name="OS R&D tools Info" level="trace">
+<component id="osrndtools_metadata" name="OS R&D tools Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/osrndtools/osrndtools_info/osrndtools_metadata/osrndtools_metadata.mrp"/>
+</component>
+</collection>
+</package>
+</layer>
+<layer id="mw" name="Middleware" levels="generic specific">
+<package id="appsupport" level="generic" tech-domain="rt" name="Generic Application Support" levels="system plugin framework server generic specific">
+<collection id="appsupport_pub" name="Generic Application Support Public Interfaces" level="specific">
+<component id="flash_viewer_framework_api" name="Flash Viewer Framework API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
+</component>
+<component id="network_status_api" name="Network Status API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_pub/network_status_api/group"/>
+</component>
+</collection>
+<collection id="appsupport_plat" name="Generic Application Support Platform Interfaces" level="specific">
+<component id="action_plugin_api" name="Action Plug-In API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/action_plugin_api/group"/>
+</component>
+<component id="application_orientation_api" name="Application Orientation API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/application_orientation_api/group"/>
+</component>
+<component id="context_access_api" name="Context Access API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/context_access_api/group"/>
+</component>
+<component id="context_framework_services_api" name="Context Framework Services API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/context_framework_services_api/group"/>
+</component>
+<component id="context_framework_client_api" name="Context Framework Client API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/context_framework_client_api/group"/>
+</component>
+<component id="context_framework_listener_api" name="Context Framework Listener API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/context_framework_listener_api/group"/>
+</component>
+<component id="context_framework_version_api" name="Context Framework Version API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/context_framework_version_api/group"/>
+</component>
+<component id="context_source_plugin_api" name="Context Source Plug-In API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/context_source_plugin_api/group"/>
+</component>
+<component id="context_source_settings_manager_api" name="Context Source Settings Manager API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/context_source_settings_manager_api/group"/>
+</component>
+<component id="context_subscription_api" name="Context Subscription API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/context_subscription_api/group"/>
+</component>
+<component id="key_event_framework_api" name="Key Event Framework API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/key_event_framework_api/group"/>
+</component>
+<component id="key_event_framework_mapper_api" name="Key Event Framework Mapper API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/key_event_framework_mapper_api/group"/>
+</component>
+<component id="media_keys_definition_api" name="Media Keys Definition API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/media_keys_definition_api/group"/>
+</component>
+<component id="ood_threshold_api" name="OOD Threshold API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/ood_threshold_api/group"/>
+</component>
+<component id="oom_monitor_api" name="OOM Monitor API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/oom_monitor_api/group"/>
+</component>
+<component id="oom_monitor_plugin_api" name="OOM Monitor Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/oom_monitor_plugin_api/group"/>
+</component>
+<component id="operation_provider_api" name="Operation Provider API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/operation_provider_api/group"/>
+</component>
+<component id="phonecmdhandler_api" name="Phone Command Handler API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/phonecmdhandler_api/group"/>
+</component>
+<component id="restore_factory_settings_api" name="Restore Factory Settings API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/restore_factory_settings_api/group"/>
+</component>
+<component id="restore_factory_settings_plugin_api" name="Restore Factory Settings Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/restore_factory_settings_plugin_api/group"/>
+</component>
+<component id="secondary_display_accfw_api" name="Secondary Display Accessory Framework API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/secondary_display_accfw_api/group"/>
+</component>
+<component id="secondary_display_startup_api" name="Secondary Display Startup API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/secondary_display_startup_api/group"/>
+</component>
+<component id="secondary_display_sysap_api" name="Secondary Display System Application API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/secondary_display_sysap_api/group"/>
+</component>
+<component id="secondary_display_system_state_api" name="Secondary Display System State API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/secondary_display_system_state_api/group"/>
+</component>
+<component id="sensor_user_setting_api" name="Sensor User Setting API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/sensor_user_setting_api/group"/>
+</component>
+<component id="startup_configuration_api" name="Startup Configuration API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/startup_configuration_api/group"/>
+</component>
+<component id="system_application_key_handler_plugin_api" name="System Application Key Handler Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/system_application_key_handler_plugin_api/group"/>
+</component>
+<component id="system_application_light_control_plugin_api" name="System Application Light Control Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/system_application_light_control_plugin_api/group"/>
+</component>
+<component id="system_application_notification_api" name="System Application Notification API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/system_application_notification_api/group"/>
+</component>
+<component id="system_application_plugin_callback_api" name="System Application Plug-in Callback API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
+</component>
+<component id="flash_mmi_service_interface_custom_api" name="Flash MMI Service Interface Custom API" class="api" filter="s60,!sf_build" introduced="^2">
+<unit bldFile="/mw/appsupport/appsupport_plat/flash_mmi_service_interface_custom_api/group"/>
+</component>
+<component id="flash_netscape_plugin_command_api" name="Flash Netscape Plugin Command API" class="api" filter="s60,!sf_build" introduced="^2">
+<unit bldFile="/mw/appsupport/appsupport_plat/flash_netscape_plugin_command_api/group"/>
+</component>
+</collection>
+<collection id="contextframework" name="Context Framework" level="framework">
+<!-- the units that are commented out need to be put back when configuration is in place.
+ They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
+<component id="cfw" filter="s60" name="Context Framework">
+<meta rel="config">
+<defined condition="RD_CONTEXT_FRAMEWORK"/>
+</meta>
+<!--<unit bldFile="contextframework/cfw/group"/> -->
+</component>
+<component id="cfwplugins" filter="s60" name="Context Framework Plugins" class="plugin">
+<meta rel="config">
+<defined condition="RD_CONTEXT_FRAMEWORK"/>
+</meta>
+<!--<unit bldFile="contextframework/cfwplugins/group"/>-->
+</component>
+<component id="contextframework_build" filter="s60" name="Context Framework Build">
+<unit bldFile="/mw/appsupport/contextframework/group"/>
+</component>
+</collection>
+<collection id="coreapplicationuis" name="Core Application UIs" level="server">
+<component id="dbrecovery" filter="s60" name="Database Recovery">
+<unit bldFile="/mw/appsupport/coreapplicationuis/dbrecovery/group"/>
+</component>
+<component id="nspswsplugin" filter="s60" name="NSPS WS Plugin" class="plugin">
+<!-- No Service Power Save? Window Server? Please elaborate-->
+<unit bldFile="/mw/appsupport/coreapplicationuis/nspswsplugin/group"/>
+</component>
+<component id="rfs" filter="s60" name="Restore Factory Settings">
+<unit bldFile="/mw/appsupport/coreapplicationuis/rfs/group"/>
+</component>
+<component id="rfsplugins" filter="s60" name="Restore Factory Settings Plugins" class="plugin">
+<unit bldFile="/mw/appsupport/coreapplicationuis/rfsplugins/group"/>
+</component>
+<component id="sysap" filter="s60" name="System Application">
+<unit bldFile="/mw/appsupport/coreapplicationuis/sysap/group"/>
+</component>
+<component id="variatedsettings" filter="s60" name="Variated Settings" class="config">
+<unit bldFile="/mw/appsupport/coreapplicationuis/variatedsettings/group"/>
+</component>
+<component id="accfwuinotifier" filter="s60" name="Accessory Framework UI Notifier" class="plugin">
+<unit bldFile="/mw/appsupport/coreapplicationuis/accfwuinotifier/group"/>
+</component>
+<component id="kefmapper" filter="s60" name="Key Event Framework">
+<unit bldFile="/mw/appsupport/coreapplicationuis/kefmapper/group"/>
+</component>
+<component id="advancedtspcontroller" filter="s60" name="Advanced TSP Controller">
+<unit bldFile="/mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
+</component>
+<component id="powersaveutilities" filter="s60" name="Power Save Utilities">
+<unit bldFile="/mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
+</component>
+<component id="gsserverenginestub" filter="s60" name="GS Server Engine Stub" deprecated="^4">
+<unit bldFile="/mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
+</component>
+<component id="gsserverengine" filter="s60" name="GS Server Engine" deprecated="^4">
+<unit bldFile="/mw/appsupport/coreapplicationuis/gsserverengine/group"/>
+</component>
+<component id="sensordatacompensatorplugin" filter="s60" name="Sensor Data Compensator Plugin" class="plugin">
+<unit bldFile="/mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/group"/>
+</component>
+<component id="atcmdplugin" name="AT Command Plugin" class="plugin" filter="s60,!oem_build">
+<unit bldFile="/mw/appsupport/coreapplicationuis/atcmdplugin/group"/>
+</component>
+</collection>
+<collection id="flashliteapi_3_1" name="Flash Lite API 3.1" level="specific">
+<!-- collection is really a component. Move down a directory -->
+<component id="flashliteapi_3_1_build" name="Flash Lite API Build" filter="s60" introduced="^2">
+<unit base="/mw/appsupport/flashliteapi_3_1/group"/>
+</component>
+</collection>
+<collection id="mediakeys" name="Media Keys" level="plugin">
+<!-- collection is really a component. Move down a directory -->
+<component id="mediakeys_build" filter="s60" name="Media Keys Build">
+<unit bldFile="/mw/appsupport/mediakeys/group"/>
+</component>
+</collection>
+<collection id="startupservices" name="Startup Services" level="system">
+<component id="splashscreen" filter="s60" name="Splash Screen">
+<unit bldFile="/mw/appsupport/startupservices/splashscreen/group"/>
+</component>
+<component id="startupanimation" filter="s60" name="Startup Animation">
+<unit bldFile="/mw/appsupport/startupservices/startupanimation/group"/>
+</component>
+<component id="startup" name="Startup Application" filter="s60">
+<unit bldFile="/mw/appsupport/startupservices/startup/group"/>
+</component>
+</collection>
+<collection id="sysresmonitoring" name="System Resource Monitoring" level="system">
+<component id="oodmonitor" filter="s60" name="OOD Monitor" introduced="7.0s">
+<unit bldFile="/mw/appsupport/sysresmonitoring/oodmonitor/group"/>
+</component>
+<component id="oommonitor" filter="s60" name="OOM Monitor" introduced="7.0s">
+<unit bldFile="/mw/appsupport/sysresmonitoring/oommonitor/group"/>
+</component>
+</collection>
+<collection id="systemsettings" name="System Settings" level="system">
+<component id="gssensorplugin" filter="s60" name="GS Sensor Plugin" class="plugin">
+<unit bldFile="/mw/appsupport/systemsettings/gssensorplugin/group"/>
+</component>
+<component id="gsaccessoryplugin" filter="s60" name="GS Accessory Plugin" class="plugin">
+<unit bldFile="/mw/appsupport/systemsettings/gsaccessoryplugin/group"/>
+</component>
+</collection>
+<collection id="filehandling" name="File Handling" level="server">
+<component id="fileconverterfw" name="File Converter Framework" purpose="optional">
+<unit bldFile="/mw/appsupport/filehandling/fileconverterfw/group" mrp="/mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
+</component>
+<component id="htmltorichtextconverter" name="HTML to RichText Converter" introduced="7.0" purpose="optional" class="plugin">
+<unit bldFile="/mw/appsupport/filehandling/htmltorichtextconverter/group" mrp="/mw/appsupport/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.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">
+<component id="hwresourcemgruiplugin" name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" class="plugin" deprecated="^4">
+<unit bldFile="/mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="/mw/appsupport/hwresourceadaptation/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"/>
+</component>
+<component id="alarmservertest" name="Alarm Server Test" deprecated="^3" introduced="8.1" purpose="development">
+<unit bldFile="/mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="/mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
+</component>
+
+<component id="appservicesdocs" name="Application Services Documentation" purpose="development" class="doc">
+<unit mrp="/mw/appsupport/commonappservices/appservicesdocs/app-services_documentation.mrp"/>
+</component>
+<component id="backuprestorenotification" name="Backup Restore Notification" introduced="8.1" purpose="optional">
+<unit bldFile="/mw/appsupport/commonappservices/backuprestorenotification/group" mrp="/mw/appsupport/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
+</component>
+</collection>
+<collection id="tzservices" name="Time Zone Services" level="plugin">
+<component id="tzserver" name="Time Zone Server" introduced="9.1" purpose="optional">
+<unit bldFile="/mw/appsupport/tzservices/tzserver/group" mrp="/mw/appsupport/tzservices/tzserver/group/app-services_tz.mrp"/>
+</component>
+<component id="tzloc" name="Time Zone Localization" introduced="9.1" purpose="optional">
+<unit bldFile="/mw/appsupport/tzservices/tzloc/group" mrp="/mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
+</component>
+<component id="tzlocrscfactory" name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
+<unit bldFile="/mw/appsupport/tzservices/tzlocrscfactory/group" mrp="/mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
+</component>
+<component id="tzdatabase" name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
+<unit bldFile="/mw/appsupport/tzservices/tzdatabase/group" mrp="/mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
+</component>
+</collection>
+<collection id="contenthandling" name="Content Handling" level="plugin">
+<component id="webrecognisers" name="Web Recognisers" purpose="optional" class="plugin">
+<unit bldFile="/mw/appsupport/contenthandling/webrecognisers/group" mrp="/mw/appsupport/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
+</component>
+</collection>
+<collection id="openenvutils" name="Open Environment Utilities" level="specific">
+<component id="commandshell" name="Command Shell" introduced="^3" purpose="development">
+<unit bldFile="/mw/appsupport/openenvutils/commandshell/group" mrp="/mw/appsupport/openenvutils/commandshell/group/oetools_zsh.mrp"/>
+</component>
+<component id="telnetserver" name="Telnet Server" introduced="^3" purpose="development">
+<unit bldFile="/mw/appsupport/openenvutils/telnetserver/group" mrp="/mw/appsupport/openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
+</component>
+</collection>
+<collection id="printingsupport" name="Printing Support" level="generic">
+<component id="printinguisupport" name="Printing UI Support" purpose="optional" introduced="^2" deprecated="^3">
+<unit bldFile="/mw/appsupport/printingsupport/printinguisupport/group" mrp="/mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
+</component>
+</collection>
+<collection id="appfw" name="Application Framework" level="framework">
+<component id="apparchitecture" name="Application Architecture" purpose="mandatory">
+<unit bldFile="/mw/appsupport/appfw/apparchitecture/group" mrp="/mw/appsupport/appfw/apparchitecture/group/app-framework_apparc.mrp"/>
+</component>
+<component id="viewserver" name="View Server" introduced="6.0" purpose="mandatory">
+<unit bldFile="/mw/appsupport/appfw/viewserver/group" mrp="/mw/appsupport/appfw/viewserver/group/app-framework_viewsrv.mrp"/>
+</component>
+
+</collection>
+<collection id="applaunchservices" name="Application Launch Services" level="generic">
+<component id="aftermarketappstarter" name="After Market Application Starter" introduced="^3" purpose="optional">
+<unit bldFile="/mw/appsupport/applaunchservices/aftermarketappstarter/group" mrp="/mw/appsupport/applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
+</component>
+<component id="applaunchplugins" name="Application Launch Plugins" introduced="^3" purpose="optional">
+<unit bldFile="/mw/appsupport/applaunchservices/applaunchplugins/group" mrp="/mw/appsupport/applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
+</component>
+</collection>
+<collection id="tzpcside" name="Time Zone PC Side" level="plugin">
+<component id="tzcompiler" name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config" target="desktop">
+<unit bldFile="/mw/appsupport/tzpcside/tzcompiler/group" mrp="/mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
+</component>
+</collection>
+<collection id="appsupport_info" name="Generic Application Support Info" level="specific">
+<component id="appsupport_metadata" name="Generic Application Support Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="securitysrv" level="generic" tech-domain="se" name="Security Services" levels="plugin framework server generic specific">
+<collection id="secsrv_plat" name="Security Services Platform Interfaces" level="specific">
+<component id="cms_api" name="CMS API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/cms_api/group"/>
+</component>
+<component id="pkcs12_parser_api" name="PKCS12 Parser API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/pkcs12_parser_api/group"/>
+</component>
+<component id="java_utils_api" name="Java Utils API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/java_utils_api/group"/>
+</component>
+<component id="wim_cert_api" name="WIM Cert API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/wim_cert_api/group"/>
+</component>
+<component id="device_key_store_encryption_plugin_api" name="Device Key Store Encryption Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/device_key_store_encryption_plugin_api/group"/>
+</component>
+<component id="x509certnameparser_api" name="X.509 Certificate Name Parser API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
+</component>
+<component id="remote_lock_api" name="Remote Lock API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
+</component>
+<component id="pkidialog_api" name="PKI Dialog API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
+</component>
+<component id="provisioning_api" name="Provisioning API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/provisioning_api/group"/>
+</component>
+<component id="keyguard_configuration_api" name="Keyguard Configuration API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/keyguard_configuration_api/group"/>
+</component>
+<component id="keylock_policy_api" name="Keylock Policy API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/keylock_policy_api/group"/>
+</component>
+<component id="security_code_ui_api" name="Security Code UI API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
+</component>
+<component id="gba_api" name="GBA API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/gba_api/group"/>
+</component>
+<component id="keyguard_access_api" name="Keyguard Access API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/keyguard_access_api/group"/>
+</component>
+<component id="devicelock_access_api" name="Device Lock Access API" class="api" filter="s60">
+<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">
+<unit bldFile="/mw/securitysrv/secsrv_plat/devencadaptation_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>
+<collection id="cms" name="Certificate Management Service" level="server">
+<!-- collection is really a component. Need to move down a directory-->
+<component id="cms_build" filter="s60" name="CMS" introduced="^3">
+<unit bldFile="/mw/securitysrv/cms/group"/>
+</component>
+</collection>
+<collection id="pkiutilities" name="PKI Utilities" level="plugin">
+<component id="x509certnameparser" filter="s60" name="X.509 Certificate Name Parser">
+<unit bldFile="/mw/securitysrv/pkiutilities/x509certnameparser/group"/>
+</component>
+<component id="pkcs12" filter="s60" name="PKCS #12">
+<unit bldFile="/mw/securitysrv/pkiutilities/pkcs12/group"/>
+</component>
+<component id="certmanui" filter="s60" name="Certificate Management UI">
+<unit bldFile="/mw/securitysrv/pkiutilities/certmanui/group"/>
+</component>
+<component id="ctsecuritydialogs" filter="s60" name="Crypto Token Security Dialogs">
+<unit bldFile="/mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
+</component>
+<component id="certsaver" filter="s60" name="Certificate Saver">
+<unit bldFile="/mw/securitysrv/pkiutilities/certsaver/group"/>
+</component>
+<component id="secmodui" filter="s60" name="Security Module UI">
+<unit bldFile="/mw/securitysrv/pkiutilities/secmodui/group"/>
+</component>
+<component id="devicetoken" filter="s60" name="Device Token">
+<unit bldFile="/mw/securitysrv/pkiutilities/devicetoken/group"/>
+</component>
+<component id="certificates" filter="s60" name="Certificates">
+<unit bldFile="/mw/securitysrv/pkiutilities/Certificates/group" filter="sf_build"/>
+</component>
+<component id="pkiutilities_build" filter="s60" name="PKI Utilities Build">
+<!-- need to split this into the above components -->
+<unit bldFile="/mw/securitysrv/pkiutilities/group"/>
+</component>
+<component id="ocsp" name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
+<unit bldFile="/mw/securitysrv/pkiutilities/ocsp/group" mrp="/mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
+</component>
+</collection>
+<collection id="wim" name="Wireless Identity Module" level="framework">
+<!-- collection is really a component. Need to move down a directory-->
+<component id="wim_build" filter="s60" name="WIM Build">
+<unit bldFile="/mw/securitysrv/wim/group"/>
+</component>
+</collection>
+<collection id="remotelock" name="Remote Lock" level="generic">
+<!-- collection is really a component. Need to move down a directory-->
+<component id="remotelock_build" filter="s60" name="Remote Lock Build">
+<unit bldFile="/mw/securitysrv/remotelock/group"/>
+</component>
+</collection>
+<collection id="securitydialogs" name="Security Dialogs" level="specific">
+<component id="keylockpolicyapi" filter="s60" name="Keylock Policy API">
+<unit bldFile="/mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
+</component>
+<component id="autolock" name="Autolock" filter="s60">
+<unit bldFile="/mw/securitysrv/securitydialogs/autolock/group"/>
+</component>
+<component id="secui" filter="s60" name="Security UI">
+<unit bldFile="/mw/securitysrv/securitydialogs/secui/group"/>
+</component>
+<component id="securitynotifier" filter="s60" name="Security Notifier">
+<unit bldFile="/mw/securitysrv/securitydialogs/securitynotifier/group"/>
+</component>
+<component id="lockclient" filter="s60" name="Lock Client" introduced="^4">
+<unit bldFile="/mw/securitysrv/securitydialogs/lockclient/group" qt:proFile="lockclient.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="lockapp" filter="s60" name="Lock Application" introduced="^3">
+<unit bldFile="/mw/securitysrv/securitydialogs/lockapp/group"/>
+</component>
+<component id="secuinotifications" name="Security UI Notifications" introduced="^4" filter="s60">
+<unit bldFile="/mw/securitysrv/securitydialogs/secuinotifications" qt:proFile="secuinotifications.pro" qt:qmakeArgs="-r"/>
+</component>
+</collection>
+<collection id="boottimeintegritycheck" name="Boot Time Integrity Check" level="plugin">
+<!-- collection is really a component. Need to move down a directory-->
+<component id="boottimeintegritycheck_build" filter="s60" name="Boot Time Integrity Check Build">
+<unit bldFile="/mw/securitysrv/boottimeintegritycheck/group"/>
+</component>
+</collection>
+<collection id="gba" name="Generic Bootstrapping Architecture" level="server">
+<component id="uicc" filter="s60" name="UICC" class="plugin" introduced="^2">
+<unit bldFile="/mw/securitysrv/gba/uicc/group"/>
+</component>
+<component id="gbaserver" filter="s60" name="GBA Server" introduced="^2">
+<unit bldFile="/mw/securitysrv/gba/gbaserver/group"/>
+</component>
+<component id="gbaapi" filter="s60" name="GBA API" introduced="^2">
+<unit bldFile="/mw/securitysrv/gba/gbaapi/group"/>
+</component>
+<component id="gbafilter" filter="s60" name="GBA HTTP Filter" class="plugin" introduced="^2">
+<unit bldFile="/mw/securitysrv/gba/gbafilter/group"/>
+</component>
+<component id="gba_build" filter="s60" name="Generic Boot Architecture Build" introduced="^2">
+<!-- need to split this into the above components, or remove #includes and make this GBA ROM -->
+<unit bldFile="/mw/securitysrv/gba/group"/>
+</component>
+</collection>
+<collection id="devencdiskutils" name="Device Encryption Disk Utils" level="server">
+<component id="devenccommonutils" filter="s60" name="Device Encryption Common Utils" introduced="^3">
+<unit bldFile="/mw/securitysrv/devencdiskutils/DevEncCommonUtils/group"/>
+</component>
+<component id="devencrfsplugin" filter="s60" name="Device Encryption RFS Plugin" introduced="^3" class="plugin">
+<unit bldFile="/mw/securitysrv/devencdiskutils/DevEncRfsPlugin/group"/>
+</component>
+<component id="pk5recognizer" filter="s60" name="Device Encryption Pk5 Recognizer" introduced="^3" class="plugin">
+<unit bldFile="/mw/securitysrv/devencdiskutils/Pk5Recognizer/group"/>
+</component>
+<component id="devencstarter" filter="s60" name="Device Encryption Starter" introduced="^3" class="plugin">
+<unit bldFile="/mw/securitysrv/devencdiskutils/DevEncStarter/group"/>
+</component>
+<component id="devencdiskutils_build" filter="s60" name="Device Encryption Disk Utils Build" introduced="^3">
+<!-- need to split this into the above components, or remove #includes and make this a ROM component-->
+<unit bldFile="/mw/securitysrv/devencdiskutils/group"/>
+</component>
+</collection>
+<collection id="securitysrv_info" name="Security Services Info" level="specific">
+
+<component id="securitysrv_metadata" name="Security Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="drm" level="generic" tech-domain="se" name="DRM" levels="plugin framework server generic specific">
+<collection id="drm_plat" name="DRM Platform Interfaces" level="specific">
+<component id="roap_api" name="ROAP API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/roap_api/group"/>
+</component>
+<component id="drm_common_api" name="DRM Common API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/drm_common_api/group"/>
+</component>
+<component id="drm_rights_api" name="DRM Rights API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/drm_rights_api/group"/>
+</component>
+<component id="drm_legacy_api" name="DRM Legacy API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/drm_legacy_api/group"/>
+</component>
+<component id="dcf_repository_api" name="DCF Repository API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/dcf_repository_api/group"/>
+</component>
+<component id="drm_service_api" name="DRM Service API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/drm_service_api/group"/>
+</component>
+<component id="drm_secondary_display_api" name="DRM Secondary Display API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/drm_secondary_display_api/group"/>
+</component>
+<component id="drm_license_manager_api" name="DRM License Manager API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/drm_license_manager_api/group"/>
+</component>
+<component id="drm_utility_api" name="DRM Utility API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/drm_utility_api/group"/>
+</component>
+<component id="drm_agents_api" name="DRM Agents API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/drm_agents_api/group"/>
+</component>
+<component id="wmdrm_core_api" name="WM DRM Core API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/wmdrm_core_api/group"/>
+</component>
+<component id="wmdrm_access_api" name="WM DRM Access API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/wmdrm_access_api/group"/>
+</component>
+<component id="wmdrm_ota_access_api" name="WM DRM OTA Access API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/wmdrm_ota_access_api/group"/>
+</component>
+<component id="camese_utility_api" name="Camese Utility API" class="api" filter="s60">
+<meta rel="config">
+<defined condition="__WINDOWS_MEDIA_DRM"/>
+</meta>
+<unit bldFile="/mw/drm/drm_plat/camese_utility_api/group"/>
+</component>
+<component id="camese_framework_api" name="Camese Framework API" class="api" filter="s60">
+<meta rel="config">
+<defined condition="__WINDOWS_MEDIA_DRM"/>
+</meta>
+<unit bldFile="/mw/drm/drm_plat/camese_framework_api/group"/>
+</component>
+</collection>
+<collection id="drm_pub" name="DRM Public Interfaces" level="specific">
+<component id="drm_helper_api" name="DRM Helper API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_pub/drm_helper_api/group"/>
+</component>
+<component id="oma_drm_caf_agent_api" name="OMA DRM CAF Agent API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_pub/oma_drm_caf_agent_api/group"/>
+</component>
+<component id="drm_license_checker_api" name="DRM License Checker API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_pub/drm_license_checker_api/group"/>
+</component>
+</collection>
+<collection id="commondrm" name="Common DRM" level="generic">
+<!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
+<component id="drmencryptor" filter="s60" name="DRM Encryptor">
+<!-- this should have its own bld.inf or be removed as a component -->
+</component>
+<component id="drmsettingsplugin" filter="s60" name="DRM Settings Plugin" class="plugin">
+<!-- this should have its own bld.inf or be removed as a component -->
+</component>
+<component id="drmrightsmanagerui" filter="s60" name="DRM Rights Manager UI">
+<unit bldFile="/mw/drm/commondrm/drmrightsmanagerui/help/group"/>
+</component>
+<component id="drmutility" filter="s60" name="DRM Utility">
+<unit bldFile="/mw/drm/commondrm/drmutility/group"/>
+</component>
+<component id="drmserviceapiwrapper" filter="s60" name="DRM Service API Wrapper">
+<unit bldFile="/mw/drm/commondrm/drmserviceapiwrapper/group"/>
+</component>
+<component id="drmrightsstoringlocation" filter="s60" name="DRM Rights Storing Location">
+<unit bldFile="/mw/drm/commondrm/drmrightsstoringlocation/group"/>
+</component>
+<component id="commondrm_build" filter="s60" name="Common DRM Build">
+<!-- should be split into the above files, or them collapsed into a single component -->
+<unit bldFile="/mw/drm/commondrm/group"/>
+</component>
+</collection>
+<collection id="omadrm" name="OMA DRM" level="server">
+<!-- collection is really a component. Move down a directory -->
+<component id="omadrm_build" filter="s60" name="OMA DRM Build">
+<unit bldFile="/mw/drm/omadrm/group"/>
+</component>
+<component id="foundationcerts" filter="sf_build" name="Foundation Certificates">
+<unit bldFile="/mw/drm/omadrm/foundationcerts/group"/>
+</component>
+</collection>
+<collection id="wmdrm" name="Windows Media DRM" level="framework">
+<!-- collection is really a component. Move down a directory -->
+<component id="wmdrm_build" filter="s60" name="WM DRM Build">
+<unit bldFile="/mw/drm/wmdrm/group"/>
+</component>
+</collection>
+<collection id="drm_info" name="DRM Info" level="specific">
+
+</collection>
+</package>
+<package id="locationsrv" level="specific" tech-domain="lo" name="Location Services" levels="plugin fw server if">
+<collection id="locsrv_pub" name="Location Services Public Interfaces" level="if">
+<component id="landmarks_search_api" name="Landmarks Search API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
+</component>
+<component id="landmarks_api" name="Landmarks API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_pub/landmarks_api/group"/>
+</component>
+<component id="landmarks_database_management_api" name="Landmarks Database Management API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_pub/landmarks_database_management_api/group"/>
+</component>
+<component id="location_triggering_api" name="Location Triggering API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_pub/location_triggering_api/group"/>
+</component>
+<component id="blid_application_satellite_info_api" name="BLID Application Satellite Info API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/group"/>
+</component>
+</collection>
+<collection id="locsrv_plat" name="Location Services Platform Interfaces" level="if">
+<component id="geocoding_api" name="Geocoding API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/geocoding_api/group"/>
+</component>
+<component id="landmarks_category_definition_api" name="Landmarks Category Definition API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
+</component>
+<component id="supl_settings_api" name="SUPL Settings API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
+</component>
+<component id="np_proxy_configuration_api" name="NP Proxy Configuration API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/np_proxy_configuration_api/group"/>
+</component>
+<component id="supl_terminal_initiation_api" name="SUPL Terminal Initiation API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/group"/>
+</component>
+<component id="supl_network_initiation_api" name="SUPL Network Initiation API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/supl_network_initiation_api/group"/>
+</component>
+<component id="oma_supl_configuration_parameter_api" name="OMA SUPL Configuration Parameter API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/oma_supl_configuration_parameter_api/group"/>
+</component>
+<component id="location_triggering_management_api" name="Location Triggering Management API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/location_triggering_management_api/group"/>
+</component>
+<component id="location_triggering_status_information_api" name="Location Triggering Status Information API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/location_triggering_status_information_api/group"/>
+</component>
+<component id="oma_supl_asn_codec_plugin_api" name="OMA SUPL ASN Codec Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
+</component>
+<component id="query_and_notification_api" name="Query and Notification API" class="api" filter="s60" introduced="^3">
+<unit bldFile="/mw/locationsrv/locsrv_plat/query_and_notification_api/group"/>
+</component>
+<component id="location_local_variation_api" name="Location Local Variation API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/location_local_variation_api/group"/>
+</component>
+</collection>
+<collection id="genericpositioningplugins" name="Generic Positioning Plugins" level="plugin">
+<component id="locationnpppsy" filter="s60" name="Location Positioning Proxy PSY" class="plugin">
+<unit bldFile="/mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
+</component>
+<component id="locationsuplpsy" filter="s60" name="Location SUPL PSY" class="plugin" introduced="^3">
+<unit bldFile="/mw/locationsrv/genericpositioningplugins/locationsuplpsy/group"/>
+</component>
+<component id="genericpositioningplugins_build" filter="s60" name="Generic Positioning Plugins Build">
+<!-- need to break this up into the other components -->
+<unit bldFile="/mw/locationsrv/genericpositioningplugins/group"/>
+</component>
+</collection>
+<collection id="landmarks" name="Landmarks" level="server">
+<component id="locationlandmarks" filter="s60" name="Location Landmarks">
+<unit bldFile="/mw/locationsrv/landmarks/locationlandmarks/group"/>
+</component>
+</collection>
+<collection id="locationsystemui" name="Location System UI" level="if">
+<component id="locationsysui" filter="s60" name="Location System UI">
+<unit bldFile="/mw/locationsrv/locationsystemui/locationsysui/group"/>
+</component>
+</collection>
+<collection id="supl" name="SUPL" level="fw">
+<component id="locationsuplfw" filter="s60" name="Location SUPL Framework">
+<unit bldFile="/mw/locationsrv/supl/locationsuplfw/group"/>
+</component>
+<component id="locationomasuplprotocolhandler" filter="s60" name="OMA SUPL Protocol Handler">
+<unit bldFile="/mw/locationsrv/supl/locationomasuplprotocolhandler/group"/>
+</component>
+<component id="supltiapiimplementation" filter="s60" name="SUPL TI API Implementation" introduced="^3">
+<unit bldFile="/mw/locationsrv/supl/supltiapiimplementation/group"/>
+</component>
+</collection>
+<collection id="locationtriggering" name="Location Triggering" level="server">
+<component id="ltlogger" filter="s60" name="LT Logger">
+<unit bldFile="/mw/locationsrv/locationtriggering/ltlogger/group"/>
+</component>
+<component id="ltclientlib" filter="s60" name="LT Client Library">
+<unit bldFile="/mw/locationsrv/locationtriggering/ltclientlib/group"/>
+</component>
+<component id="ltmanagementlib" filter="s60" name="LT Management Library">
+<unit bldFile="/mw/locationsrv/locationtriggering/ltmanagementlib/group"/>
+</component>
+<component id="ltcontainer" filter="s60" name="LT Container">
+<unit bldFile="/mw/locationsrv/locationtriggering/ltcontainer/group"/>
+</component>
+<component id="ltserver" filter="s60" name="LT Server">
+<unit bldFile="/mw/locationsrv/locationtriggering/ltserver/group"/>
+</component>
+<component id="ltstrategypluginapi" filter="s60" name="LT Strategy Plugin API">
+<unit bldFile="/mw/locationsrv/locationtriggering/ltstrategypluginapi/group"/>
+</component>
+<component id="ltstrategyengine" filter="s60" name="LT Strategy Engine">
+<unit bldFile="/mw/locationsrv/locationtriggering/ltstrategyengine/group"/>
+</component>
+<component id="ltmovementdetectionpluginapi" filter="s60" name="Movement Detection Plugin API">
+<unit bldFile="/mw/locationsrv/locationtriggering/ltmovementdetectionpluginapi/group"/>
+</component>
+<component id="ltcellidmovementdetector" filter="s60" name="Cell ID Movement Detector">
+<unit bldFile="/mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/>
+</component>
+<component id="ltcontextsourceplugin" filter="s60" name="LT Context Source Plugin" class="plugin" introduced="^3">
+<unit bldFile="/mw/locationsrv/locationtriggering/ltcontextsourceplugin/group"/>
+</component>
+<component id="locationtriggering_build" filter="s60" name="Location Triggering Build">
+<!-- should remove #include from this and maybe put exports in the above components -->
+<unit bldFile="/mw/locationsrv/locationtriggering/group"/>
+</component>
+</collection>
+</package>
+<package id="accesssec" level="generic" tech-domain="dc"/>
+<package id="ipconnmgmt" level="generic" tech-domain="dc" name="IP Connectivity Management" levels="plugin framework server utils api">
+<collection id="ipcm_plat" name="IP Connectivity Management Platform Interfaces" level="api">
+<component id="access_point_engine_misc_api" name="Access Point Engine Misc API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/access_point_engine_misc_api/group"/>
+</component>
+<component id="bearer_settings_plugin_api" name="Bearer Settings Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/bearer_settings_plugin_api/group"/>
+</component>
+<component id="commsdat_wlan_api" name="CommsDat WLAN API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/commsdat_wlan_api/group"/>
+</component>
+<component id="connection_monitor_extension_api" name="Connection Monitor Extension API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/connection_monitor_extension_api/group"/>
+</component>
+<component id="connection_ui_utilities_api" name="Connection UI Utilities API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/connection_ui_utilities_api/group"/>
+</component>
+<component id="disconnect_dialog_api" name="Disconnect Dialog API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/disconnect_dialog_api/group"/>
+</component>
+<component id="disconnect_dialog_disable_api" name="Disconnect Dialog Disable API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/disconnect_dialog_disable_api/group"/>
+</component>
+<component id="extended_connection_settings_api" name="Extended Connection Settings API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/extended_connection_settings_api/group"/>
+</component>
+<component id="mpm_default_connection_api" name="MPM Default Connection API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/mpm_default_connection_api/group"/>
+</component>
+<component id="pdpcontextmanager2_reset_factory_settings_api" name="PDP Context Manager 2 Reset Factory Settings API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_reset_factory_settings_api/group"/>
+</component>
+<component id="pdpcontextmanager2_settings_api" name="PDP Context Manager 2 Settings API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_settings_api/group"/>
+</component>
+<component id="mpm_connect_screen_api" name="MPM Connect Screen API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/mpm_connect_screen_api/group"/>
+</component>
+</collection>
+<collection id="ipcm_pub" name="IP Connectivity Management Public Interfaces" level="api">
+<component id="connection_settings_api" name="Connection Settings API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_pub/connection_settings_api/group"/>
+</component>
+<component id="access_point_engine_api" name="Access Point Engine API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_pub/access_point_engine_api/group"/>
+</component>
+<component id="access_point_settings_handler_api" name="Access Point Settings Handler API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_pub/access_point_settings_handler_api/group"/>
+</component>
+<component id="data_connection_log_counters_api" name="Data Connection Log Counters API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_pub/data_connection_log_counters_api/group"/>
+</component>
+<component id="connection_monitor_server_api" name="Connection Monitor Server API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_pub/connection_monitor_server_api/group"/>
+</component>
+<component id="connection_settings_ui_api" name="Connection Settings UI API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_pub/connection_settings_ui_api/group"/>
+</component>
+<component id="agent_dialog_api" name="Agent Dialog API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_pub/agent_dialog_api/group"/>
+</component>
+<component id="extendedconnpref_api" name="Extended Connection Preferences API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_pub/extendedconnpref_api/group"/>
+</component>
+</collection>
+<collection id="accesspointcontrol" name="Access Point Control" level="plugin">
+<component id="apcontrollistplugin" filter="s60" name="Access Point Control List Plugin" class="plugin" introduced="^2">
+<unit bldFile="/mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
+</component>
+</collection>
+<collection id="alwayson_net_plugin" name="Always Online Net Plugin" level="server">
+<component id="pdpcontextmanager2" filter="s60" name="PDP Context Manager 2">
+<unit bldFile="/mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
+</component>
+</collection>
+<collection id="apengine" name="Access Point Engine" level="framework">
+<component id="apeng" filter="s60" name="Access Point Engine">
+<unit bldFile="/mw/ipconnmgmt/apengine/apeng/group"/>
+</component>
+<component id="apsettingshandlerui" filter="s60" name="Access Point Settings Handler UI">
+<unit bldFile="/mw/ipconnmgmt/apengine/apsettingshandlerui/group"/>
+</component>
+</collection>
+<collection id="bearermanagement" name="Bearer Management" level="framework">
+<component id="mpm" filter="s60" name="Mobility Policy Manager">
+<unit bldFile="/mw/ipconnmgmt/bearermanagement/mpm/group"/>
+</component>
+<component id="extendedconnpref" filter="s60" name="Extended Connection Preferences">
+<unit bldFile="/mw/ipconnmgmt/bearermanagement/extendedconnpref/group"/>
+</component>
+<component id="s60mcpr" filter="s60" name="S60 Meta-Connection Provider" class="plugin">
+<unit bldFile="/mw/ipconnmgmt/bearermanagement/S60MCPR/group"/>
+</component>
+</collection>
+<collection id="cmmanager" name="Connection Method Manager" level="framework">
+<component id="cmmgr" filter="s60" name="CM Manager">
+<unit bldFile="/mw/ipconnmgmt/cmmanager/cmmgr/group"/>
+</component>
+</collection>
+<collection id="connectionmonitoring" name="Connection Monitoring" level="server">
+<component id="connectionmonitorui" filter="s60" name="Connection Monitor UI">
+<unit bldFile="/mw/ipconnmgmt/connectionmonitoring/connectionmonitorui/group"/>
+</component>
+<component id="connmon" filter="s60" name="Connection Monitor">
+<!-- either split into two components, or #include from a common bld.inf -->
+<unit bldFile="/mw/ipconnmgmt/connectionmonitoring/connmon/connectionmonitor/group"/>
+<unit bldFile="/mw/ipconnmgmt/connectionmonitoring/connmon/dataconnectionlogger/group"/>
+</component>
+<component id="connmonext" filter="s60" name="Connection Monitor Extension API">
+<unit bldFile="/mw/ipconnmgmt/connectionmonitoring/connmonext/group"/>
+</component>
+</collection>
+<collection id="connectionutilities" name="Connection Utilities" level="utils">
+<component id="connectiondialogs" filter="s60" name="Connection Dialogs">
+<unit bldFile="/mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/>
+</component>
+</collection>
+<collection id="dbcreator" name="DB Creator" level="utils">
+<component id="commsdatcreator" filter="s60" name="Comms Database Creator" introduced="9.3">
+<unit bldFile="/mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
+</component>
+<component id="commsdatcreatorrfsplugin" filter="s60" name="Comms Database Creator RFS Plugin" class="plugin" introduced="9.3">
+<meta rel="config">
+<not-defined condition="WINSCW"/>
+</meta>
+<!-- uncomment when config is turned on -->
+<!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
+</component>
+<component id="commsdatstartup" filter="s60" name="Comms Database Startup" introduced="9.3">
+<unit bldFile="/mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
+</component>
+<component id="dbcreatorexe" filter="s60" name="DB Creator" introduced="9.3">
+<unit bldFile="/mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
+</component>
+<component id="dbcreator_build" filter="s60" name="DB Creator Build" introduced="9.3">
+<!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
+<unit bldFile="/mw/ipconnmgmt/dbcreator/group"/>
+</component>
+</collection>
+<collection id="ipconnmgmt_info" name="IP Connectivity Management Info" level="api">
+<component id="ipcm_build" filter="s60" 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"/>
+</component>
+<component id="ipcm_qt_build" name="IP Connectivity Management Qt Build" introduced="^4">
+<unit bldFile="/mw/ipconnmgmt" qt:proFile="ipconnmgmt.pro" qt:qmakeArgs="-r"/>
+</component>
+</collection>
+</package>
+<package id="netprotocols" level="generic" tech-domain="dc" name="High-level Internet Protocols" levels="plugin framework server generic specific">
+<collection id="netprotocols_plat" name="High-level Internet Protocols Platform Interfaces" level="specific">
+<component id="cookie_manager_api" name="Cookie Manager API" class="api" filter="s60">
+<unit bldFile="/mw/netprotocols/netprotocols_plat/cookie_manager_api/group"/>
+</component>
+<component id="http_cache_mgr_api" name="HTTP Cache Manager API" class="api" filter="s60">
+<unit bldFile="/mw/netprotocols/netprotocols_plat/http_cache_mgr_api/group"/>
+</component>
+<component id="http_filters_api" name="HTTP Filters API" class="api" filter="s60">
+<unit bldFile="/mw/netprotocols/netprotocols_plat/http_filters_api/group"/>
+</component>
+</collection>
+<collection id="httpfilters" name="HTTP Filters" level="plugin">
+<component id="httpfiltercommon" filter="s60" name="HTTP Filter Common">
+<unit bldFile="/mw/netprotocols/httpfilters/httpfiltercommon/group"/>
+</component>
+<component id="cookie" filter="s60" name="Cookie Filter" class="plugin">
+<unit bldFile="/mw/netprotocols/httpfilters/cookie/group"/>
+</component>
+<component id="deflatefilter" filter="s60" name="Deflate Filter" class="plugin">
+<unit bldFile="/mw/netprotocols/httpfilters/deflatefilter/group"/>
+</component>
+<component id="httpfilteracceptheader" filter="s60" name="Accept Header Filter" class="plugin">
+<unit bldFile="/mw/netprotocols/httpfilters/httpfilteracceptheader/group"/>
+</component>
+<component id="httpfilterauthentication" filter="s60" name="Authentication Filter" class="plugin">
+<unit bldFile="/mw/netprotocols/httpfilters/httpfilterauthentication/group"/>
+</component>
+<component id="httpfilterconnhandler" filter="s60" name="Connection Handler Fitler" class="plugin">
+<unit bldFile="/mw/netprotocols/httpfilters/httpfilterconnhandler/group"/>
+</component>
+<component id="httpfilteriop" filter="s60" name="HTTP IOP Filter" class="plugin">
+<unit bldFile="/mw/netprotocols/httpfilters/httpfilteriop/group"/>
+</component>
+<component id="httpfilterproxy" filter="s60" name="HTTP Proxy Filter" class="plugin">
+<unit bldFile="/mw/netprotocols/httpfilters/httpfilterproxy/group"/>
+</component>
+<component id="uaproffilter" filter="s60" name="UAProf Filter" class="plugin">
+<unit bldFile="/mw/netprotocols/httpfilters/uaproffilter/group"/>
+</component>
+</collection>
+<collection id="applayerprotocols" name="Application Layer Protocols" level="server">
+<component id="httptransportfw" name="HTTP Transport Framework" introduced="6.2" purpose="optional">
+<unit bldFile="/mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="/mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
+</component>
+<component id="httpexamples" name="HTTP Examples" introduced="6.2" purpose="development">
+<unit bldFile="/mw/netprotocols/applayerprotocols/httpexamples/group" mrp="/mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
+</component>
+<component id="wappushsupport" name="WAP Push Support" introduced="6.2" purpose="optional">
+<unit bldFile="/mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="/mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
+</component>
+<component id="wapbase" name="WAP Base" introduced="6.0" purpose="optional">
+<unit bldFile="/mw/netprotocols/applayerprotocols/wapbase/Group" mrp="/mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
+</component>
+<component id="ftpengine" name="FTP Engine" introduced="6.0" purpose="optional">
+<unit bldFile="/mw/netprotocols/applayerprotocols/ftpengine/group" mrp="/mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
+</component>
+<component id="telnetengine" name="Telnet Engine" introduced="6.0" purpose="optional">
+<unit bldFile="/mw/netprotocols/applayerprotocols/telnetengine/group" mrp="/mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
+</component>
+<component id="httpserviceapi" name="HTTP Service API" introduced="TB9.2" purpose="optional">
+<unit bldFile="/mw/netprotocols/applayerprotocols/httpservice/group" mrp="/mw/netprotocols/applayerprotocols/httpservice/group/http_service.mrp"/>
+</component>
+</collection>
+<collection id="applayerpluginsandutils" name="Application Layer Plugins and Utils" level="framework">
+<component id="uripermissionservices" name="URI Permission Services" introduced="^2" purpose="optional">
+<unit bldFile="/mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="/mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
+</component>
+<component id="bookmarksupport" name="Bookmark Support" introduced="9.1" purpose="optional">
+<unit bldFile="/mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="/mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
+</component>
+<component id="httpprotocolplugins" name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" class="plugin">
+<unit bldFile="/mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="/mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
+</component>
+<component id="httptransportplugins" name="HTTP Transport Plugins" introduced="6.2" purpose="optional" class="plugin">
+<unit bldFile="/mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="/mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
+</component>
+</collection>
+<collection id="netprotocols_info" name="High-level Internet Protocols Info" level="specific">
+<component id="netprotocols_metadata" name="High-level Internet Protocols Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="ipappprotocols" level="generic" tech-domain="dc" name="IP App Protocols" levels="plugin conn server if">
+<collection id="ipappprotocols_plat" name="IP App Protocols Platform Interfaces" level="if">
+<component id="srtp_api" name="SRTP API" class="api" filter="s60">
+<unit bldFile="/mw/ipappprotocols/ipappprotocols_plat/srtp_api/group"/>
+</component>
+<component id="rtprtcp_api" name="RTP/RTCP API" class="api" filter="s60">
+<unit bldFile="/mw/ipappprotocols/ipappprotocols_plat/rtprtcp_api/group"/>
+</component>
+</collection>
+<collection id="rtp" name="RTP" level="server">
+<component id="srtpstack" filter="s60" name="SRTP Stack">
+<unit bldFile="/mw/ipappprotocols/rtp/srtpstack/group"/>
+</component>
+<component id="rtpstack" filter="s60" name="RTP Stack">
+<unit bldFile="/mw/ipappprotocols/rtp/rtpstack/group"/>
+</component>
+</collection>
+<collection id="realtimenetprots" name="Real Time Net Protocols" level="server">
+<component id="symrtp" name="RTP" introduced="9.0" purpose="optional">
+<!-- Real Time Data Protocol -->
+<unit bldFile="/mw/ipappprotocols/realtimenetprots/rtp/group" mrp="/mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
+</component>
+<component id="sipfw" name="SIP Framework" introduced="9.2" purpose="optional">
+<unit version="2" bldFile="/mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="/mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp"/>
+</component>
+</collection>
+<collection id="sipplugins" name="SIP Plugins" level="plugin">
+<component id="sippwlanplugin" filter="s60" name="SIP WLAN Plugin" class="plugin">
+<unit bldFile="/mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
+</component>
+<component id="sippsipsettingsui" filter="s60" name="SIP Settings UI" class="plugin">
+<unit bldFile="/mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
+</component>
+<component id="sippdevmgmtsipadapter" filter="s60" name="Device Management SIP Settings Adapter" class="plugin">
+<unit bldFile="/mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
+</component>
+<component id="sippsystemstatemonitor" filter="s60" name="SIP System State Monitor" class="plugin">
+<unit bldFile="/mw/ipappprotocols/sipplugins/sippsystemstatemonitor/group"/>
+</component>
+<component id="sippsipadapter" filter="s60" name="SIP Adapter" class="plugin" introduced="^3">
+<unit bldFile="/mw/ipappprotocols/sipplugins/sippsipadapter/group"/>
+</component>
+</collection>
+<collection id="sipproviderplugins" name="SIP Provider Plugins" level="conn">
+<component id="sipprovider" name="SIP Provider" introduced="^2" purpose="optional" class="plugin">
+<unit bldFile="/mw/ipappprotocols/sipproviderplugins/sipprovider/group" mrp="/mw/ipappprotocols/sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
+</component>
+</collection>
+<collection id="ipappprotocols_info" name="IP App Protocols Info" level="if">
+<component id="ipappprotocols_metadata" name="IP App Protocols Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="wirelessacc" level="specific" tech-domain="dc" name="Wireless Access" levels="framework generic ui">
+<collection id="hsfw_plat" name="HotSpot Framework Platform Interfaces" level="ui">
+<component id="hotspot_framework_client_api" name="HotSpot Framework Client API" class="api" filter="s60">
+<unit bldFile="/mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
+</component>
+<component id="internet_connectivity_test_service_api" name="Internet Connectivity Test Service API" class="api" filter="s60">
+<unit bldFile="/mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
+</component>
+<component id="internet_connectivity_test_service_settings_api" name="Internet Connectivity Test Service Settings API" class="api" filter="s60">
+<unit bldFile="/mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
+</component>
+<component id="hotspot_framework_client_plugin_api" name="HotSpot Framework Client Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
+</component>
+</collection>
+<collection id="hotspotfw" name="HotSpot Framework" level="framework">
+<component id="hsserver" filter="s60" name="HotSpot Server">
+<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
+</component>
+<component id="hsclient" filter="s60" name="HotSpot Client">
+<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
+</component>
+<component id="internetconnectivitytestservice" filter="s60" name="Internet Connectivity Test Service">
+<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+<!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
+</component>
+<component id="ictsdialogs" filter="s60" name="Internet Connectivity Test Service Dialogs" deprecated="^3">
+<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+<!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
+</component>
+<component id="hspluginforagent" filter="s60" name="HotSpot Plugin for Agent" class="plugin">
+<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+<!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
+</component>
+<component id="hsbrowser" filter="s60" name="HotSpot Browser">
+<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+<!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
+</component>
+<component id="hotspotfw_build" filter="s60" name="Hotspot Framework Build">
+<!-- should break up this bld.inf into the above components, or collapse them all into a single component -->
+<unit bldFile="/mw/wirelessacc/hotspotfw/group"/>
+</component>
+</collection>
+<collection id="wlanutilities" name="WLAN Utilities" level="generic">
+<component id="wlanutilities_build" name="WLAN Utilities Qt" introduced="^4" filter="s60">
+<!-- is this uinit needed, or is it sufficient to uncomment the units in the below components? -->
+<unit bldFile="/mw/wirelessacc/wlanutilities" qt:proFile="wlanutilities.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="wlanqtutilities" filter="s60" name="WLAN Qt Utilities" introduced="^4">
+<!--<unit bldFile="wlanutilities/wlanplugin/group" qt:proFile="wlanqtutilities.pro"/>-->
+</component>
+<component id="wlansniffer" filter="s60" name="WLAN Sniffer">
+<!--<unit bldFile="wlanutilities/wlansettingsui/group" qt:proFile="wlansniffer.pro"/>-->
+</component>
+<component id="wlanentryplugin" filter="s60" name="WLAN Entry Plugin" class="plugin">
+<!--<unit bldFile="wlanutilities/wlansniffer/group" qt:proFile="wlanentryplugin.pro"/>-->
+</component>
+<component id="wlanindicatorplugin" filter="s60" name="WLAN Indicator Plugin" class="plugin">
+<!--<unit bldFile="wlanutilities/wlanindicatorplugin/group" qt:proFile="wlanindicatorplugin.pro"/>-->
+</component>
+<component id="cpwlansettingsplugin" filter="s60" name="WLAN Settings Control Panel Plugin" class="plugin" introduced="^4">
+<!--<unit bldFile="wlanutilities/cpwlansettingsplugin/group" qt:proFile="cpwlansettingsplugin.pro"/>-->
+</component>
+</collection>
+</package>
+<package id="vpnclient" level="specific" tech-domain="dc" name="VPN Client" levels="engine ui api">
+<!-- is the !oem_build filter needed? -->
+<collection id="vpnc_plat" name="VPN Client Platform Interfaces" level="api">
+<component id="vpnapi" filter="s60" class="api" name="VPN API">
+<unit bldFile="/mw/vpnclient/vpnc_plat/vpnapi/group"/>
+</component>
+</collection>
+<collection id="vpnapiimpl" name="VPN API Implementation" level="api">
+<component id="vpnapi_impl" filter="s60" name="VPN API">
+<unit bldFile="/mw/vpnclient/vpnapiimpl/group"/>
+</component>
+</collection>
+<collection id="vpnengine" name="VPN Engine" level="engine">
+<!-- too many components in this collection.
+ Probably best to group the binaries together into larger components
+ or maybe split the collection into more reasonable groups -->
+<component id="eventmediatorapi" filter="s60" name="Event Mediator API">
+<unit bldFile="/mw/vpnclient/vpnengine/eventmediatorapi/group"/>
+</component>
+<component id="eventviewer" filter="s60" name="Event Viewer">
+<unit bldFile="/mw/vpnclient/vpnengine/eventviewer/group"/>
+</component>
+<component id="vpnins" filter="s60" name="VPN Installer">
+<unit bldFile="/mw/vpnclient/vpnengine/vpnins/group"/>
+</component>
+<component id="ikepolparser" filter="s60" name="IKE Policy Parser">
+<unit bldFile="/mw/vpnclient/vpnengine/ikepolparser/group"/>
+</component>
+<component id="utlbase64" filter="s60" name="Base64 Utilities">
+<unit bldFile="/mw/vpnclient/vpnengine/utlbase64/group"/>
+</component>
+<component id="utlcrypto" filter="s60" name="Crypto Utilities">
+<unit bldFile="/mw/vpnclient/vpnengine/utlcrypto/group"/>
+</component>
+<component id="utlxml" filter="s60" name="XML Utilities">
+<unit bldFile="/mw/vpnclient/vpnengine/utlxml/group"/>
+</component>
+<component id="utlpkcs10" filter="s60" name="PKCS#10 Utilities">
+<unit bldFile="/mw/vpnclient/vpnengine/utlpkcs10/group"/>
+</component>
+<component id="pkiserviceapi" filter="s60" name="PKI Service API">
+<unit bldFile="/mw/vpnclient/vpnengine/pkiserviceapi/group"/>
+</component>
+<component id="ikecert" filter="s60" name="IKE Certificate Management">
+<unit bldFile="/mw/vpnclient/vpnengine/ikecert/group"/>
+</component>
+<component id="kmdapi" filter="s60" name="Key Management Daemon API">
+<unit bldFile="/mw/vpnclient/vpnengine/kmdapi/group"/>
+</component>
+<component id="kmdserver" filter="s60" name="Key Management Daemon Server">
+<unit bldFile="/mw/vpnclient/vpnengine/kmdserver/group"/>
+</component>
+<component id="ikeutils" filter="s60" name="Internet Key Exchange Utils">
+<unit bldFile="/mw/vpnclient/vpnengine/ikeutils/group"/>
+</component>
+<component id="ikev1lib" filter="s60" name="IKEv1 Library">
+<unit bldFile="/mw/vpnclient/vpnengine/ikev1lib/group"/>
+</component>
+<component id="ikev2lib" filter="s60" name="IKEv2 Library">
+<unit bldFile="/mw/vpnclient/vpnengine/ikev2lib/group"/>
+</component>
+<component id="vpnipsecpolparser" filter="s60" name="VPN IPsec Policy Parser">
+<unit bldFile="/mw/vpnclient/vpnengine/vpnipsecpolparser/group"/>
+</component>
+<component id="sit" filter="s60" name="Socket Interaction Thread">
+<unit bldFile="/mw/vpnclient/vpnengine/sit/group"/>
+</component>
+<component id="vpntcwrapper" filter="s60" name="VPN Terminal Control Wrapper">
+<unit bldFile="/mw/vpnclient/vpnengine/vpntcwrapper/group"/>
+</component>
+<component id="eventmediator" filter="s60" name="Event Mediator">
+<unit bldFile="/mw/vpnclient/vpnengine/eventmediator/group"/>
+</component>
+<component id="pkiservice" filter="s60" name="PKI Service">
+<unit bldFile="/mw/vpnclient/vpnengine/pkiservice/group"/>
+</component>
+<component id="vpnconnagt" filter="s60" name="VPN Connection Agent">
+<unit bldFile="/mw/vpnclient/vpnengine/vpnconnagt/group"/>
+</component>
+<component id="vpnmanager" filter="s60" name="VPN Manager">
+<unit bldFile="/mw/vpnclient/vpnengine/vpnmanager/group"/>
+</component>
+<component id="vpncleaner" filter="s60" name="VPN Cleaner">
+<unit bldFile="/mw/vpnclient/vpnengine/vpncleaner/group"/>
+</component>
+<component id="utlpkcs12" filter="s60" name="PKCS#12 Utilities">
+<unit bldFile="/mw/vpnclient/vpnengine/utlpkcs12/group"/>
+</component>
+<component id="dmadengine" filter="s60" name="DM Adapter Engine">
+<unit bldFile="/mw/vpnclient/vpnengine/dmadengine/group"/>
+</component>
+<component id="dmadipsecvpn" filter="s60" name="IPsec VPN DM Adapter" class="plugin">
+<unit bldFile="/mw/vpnclient/vpnengine/dmadipsecvpn/group"/>
+</component>
+<component id="dmadpki" filter="s60" name="PKI DM Adapter" class="plugin">
+<unit bldFile="/mw/vpnclient/vpnengine/dmadpki/group"/>
+</component>
+<component id="ikesocket" filter="s60" name="IKE Socket" introduced="^3">
+<unit bldFile="/mw/vpnclient/vpnengine/ikesocket/group"/>
+</component>
+</collection>
+<collection id="vpnui" name="VPN UI" level="ui">
+<component id="vpnecomnotifier" filter="s60" name="VPN ECOM Notifier" class="plugin">
+<unit bldFile="/mw/vpnclient/vpnui/vpnecomnotifier/group"/>
+</component>
+<component id="vpndialogmanager" filter="s60" name="VPN Dialog Manager">
+<unit bldFile="/mw/vpnclient/vpnui/vpndialogmanager/group"/>
+</component>
+<component id="vpnpolins" filter="s60" name="VPN Policy Installer">
+<unit bldFile="/mw/vpnclient/vpnui/vpnpolins/group"/>
+</component>
+<component id="vpnpolicyrecognizer" filter="s60" name="VPN Policy Recognizer" class="plugin">
+<unit bldFile="/mw/vpnclient/vpnui/vpnpolicyrecognizer/group"/>
+</component>
+</collection>
+<collection id="vpnclient_info" name="VPN Client Info" level="api">
+<component id="vpnclient_help" filter="s60" name="VPN Client Help">
+<unit bldFile="/mw/vpnclient/help/group"/>
+</component>
+<component id="vpnclient_build" filter="s60" name="VPN Client Build">
+<!-- should split this up into the other components and remove this-->
+<unit bldFile="/mw/vpnclient/group"/>
+</component>
+</collection>
+</package>
+<package id="ipappsrv" level="specific" tech-domain="vc" name="IP App Services" levels="framework generic server conn plugin">
+<collection id="ipappsrv_plat" name="IP App Services Platform Interfaces" level="plugin">
+<component id="transcoder_api" name="Transcoder API" class="api" filter="s60">
+<unit bldFile="/mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
+</component>
+<component id="comms_event_api" name="Comms Event API" class="api" filter="s60">
+<unit bldFile="/mw/ipappsrv/ipappsrv_plat/comms_event_api/group"/>
+</component>
+<component id="floor_control_api" name="Floor Control API" class="api" filter="s60">
+<unit bldFile="/mw/ipappsrv/ipappsrv_plat/floor_control_api/group"/>
+</component>
+<component id="media_control_api" name="Media Control API" class="api" filter="s60">
+<unit bldFile="/mw/ipappsrv/ipappsrv_plat/media_control_api/group"/>
+</component>
+<component id="multimedia_comms_api" name="Multimedia Comms API" class="api" filter="s60">
+<unit bldFile="/mw/ipappsrv/ipappsrv_plat/multimedia_comms_api/group"/>
+</component>
+<component id="nat_settings_api" name="NAT Settings API" class="api" filter="s60">
+<unit bldFile="/mw/ipappsrv/ipappsrv_plat/nat_settings_api/group"/>
+</component>
+</collection>
+<collection id="natfw" name="NAT Framework" level="framework">
+<!-- collection is really a component. Need to move down a directory -->
+<component id="natfw_build" filter="s60" name="NAT Framework Build" introduced="^2">
+<unit bldFile="/mw/ipappsrv/natfw/group"/>
+</component>
+</collection>
+<collection id="multimediacommscontroller" name="Multimedia Comms Controller" level="conn">
+<!-- collection is really a component. Need to move down a directory -->
+<component id="multimediacommscontroller_build" filter="s60" name="Multimedia Comms Controller Build">
+<unit bldFile="/mw/ipappsrv/multimediacommscontroller/group"/>
+</component>
+</collection>
+<collection id="multimediacommsengine" name="Multimedia Comms Engine" level="generic">
+<!-- collection is really a component. Need to move down a directory -->
+<component id="multimediacommsengine_build" filter="s60" name="Multimedia Comms Engine Build">
+<unit bldFile="/mw/ipappsrv/multimediacommsengine/group"/>
+</component>
+</collection>
+<collection id="natplugins" name="NAT Plugins" level="plugin">
+<component id="natpcliprovisioningnatfwadapter" filter="s60" name="Client Provisioning NAT Framework Traversal Adapter" class="plugin" introduced="^2">
+<unit bldFile="/mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/group"/>
+</component>
+<component id="natpdevmgmtnatfwadapter" filter="s60" name="Device Management NAT Framework Traversal Adapter" class="plugin">
+<unit bldFile="/mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/group"/>
+</component>
+<component id="natptraversalcontroller" filter="s60" name="NAT Traversal Controller" class="plugin">
+<unit bldFile="/mw/ipappsrv/natplugins/natptraversalcontroller/group"/>
+</component>
+<component id="natpnatfwsdpprovider" filter="s60" name="NAT Framework SDP Provider" class="plugin">
+<unit bldFile="/mw/ipappsrv/natplugins/natpnatfwsdpprovider/group"/>
+</component>
+</collection>
+<collection id="ipappsrv_info" name="IP App Services Info" level="plugin">
+<component id="ipappsrv_build" name="IP App Services Build" filter="s60">
+<!-- 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 id="ipappsrv_metadata" name="IP App Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/mw/ipappsrv/ipappsrv_info/ipappsrv_metadata/ipappsrv_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="phonesrv" level="specific" tech-domain="vc" name="Telephony and SIM Services" levels="plugin framework server generic specific">
+<collection id="phonesrv_plat" name="Telephony and SIM Services Platform Interfaces" level="specific">
+<component id="string_parser_api" name="String Parser API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/string_parser_api/group"/>
+</component>
+<component id="cbs_mcn_client_api" name="CBS MCN Client API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/cbs_mcn_client_api/group"/>
+</component>
+<component id="converged_call_engine_api" name="Converged Call Engine API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/converged_call_engine_api/group"/>
+</component>
+<component id="aiw_dial_data_consumer_api" name="AIW Dial Data Consumer API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/aiw_dial_data_consumer_api/group"/>
+</component>
+<component id="phone_client_ussd_api" name="Phone Client USSD API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_ussd_api/group"/>
+</component>
+<component id="sat_refresh_api" name="SAT Refresh API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/sat_refresh_api/group" filter="!test"/>
+
+</component>
+<component id="network_handling_engine_api" name="Network Handling Engine API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/network_handling_engine_api/group"/>
+</component>
+<component id="phone_client_emergency_call_api" name="Phone Client Emergency Call API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/group"/>
+</component>
+<component id="sat_configuration_api" name="SAT Configuration API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/sat_configuration_api/group"/>
+</component>
+<component id="dial_utils_api" name="Dial Utils API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/dial_utils_api/group"/>
+</component>
+<component id="phone_client_image_handler_api" name="Phone Client Image Handler API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_image_handler_api/group"/>
+</component>
+<component id="phone_client_messenger_api" name="Phone Client Messenger API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_messenger_api/group"/>
+</component>
+<component id="sat_client_api" name="SAT Client API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/sat_client_api/group" filter="!test"/>
+
+</component>
+<component id="phone_client_api" name="Phone Client API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_api/group"/>
+</component>
+<component id="sat_service_api" name="SAT Service API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/sat_service_api/group" filter="!test"/>
+
+</component>
+<component id="cbs_message_api" name="CBS Message API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/cbs_message_api/group"/>
+</component>
+<component id="phone_client_server_information_api" name="Phone Client Server Information API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_server_information_api/group"/>
+</component>
+<component id="phone_client_ussd_internal_api" name="Phone Client USSD Internal API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_ussd_internal_api/group"/>
+</component>
+<component id="phone_client_command_handler_api" name="Phone Client Command Handler API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_command_handler_api/group"/>
+</component>
+<component id="phone_client_notify_api" name="Phone Client Notify API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_notify_api/group"/>
+</component>
+<component id="phone_client_utility_api" name="Phone Client Utility API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_utility_api/group"/>
+</component>
+<component id="telephony_network_information_api" name="Telephony Network Information API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/telephony_network_information_api/group"/>
+</component>
+<component id="secondary_display_sat_api" name="Secondary Display SAT API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/secondary_display_sat_api/group"/>
+</component>
+<component id="callui_reconnect_query_api" name="CallUI Reconnect Query API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/callui_reconnect_query_api/group"/>
+</component>
+<component id="service_provider_settings_api" name="Service Provider Settings API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/service_provider_settings_api/group"/>
+</component>
+<component id="converged_call_provider_api" name="Converged Call Provider API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/converged_call_provider_api/group"/>
+</component>
+<component id="incoming_call_monitor_api" name="Incoming Call Monitor API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/incoming_call_monitor_api/group"/>
+</component>
+<component id="default_emergency_numbers_api" name="Default Emergency Numbers API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/default_emergency_numbers_api/group"/>
+</component>
+<component id="cenrep_database_api" name="Central Repository Database API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/cenrep_database_api/group"/>
+</component>
+<component id="ss_settings_api" name="SS Settings API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/ss_settings_api/group"/>
+</component>
+<component id="phone_settings_observer_api" name="Phone Settings Observer API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_settings_observer_api/group"/>
+</component>
+<component id="phone_settings_notes_ui_api" name="Phone Settings Notes UI API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_settings_notes_ui_api/group"/>
+</component>
+<component id="phone_settings_api" name="Phone Settings API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_settings_api/group"/>
+</component>
+<component id="voice_mailbox_number_api" name="Voice Mailbox Number API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/voice_mailbox_number_api/group"/>
+</component>
+<component id="voice_mailbox_settings_api" name="Voice Mailbox Settings API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/voice_mailbox_settings_api/group"/>
+</component>
+<component id="call_information_api" name="Call Information API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/call_information_api/group" filter="!test"/>
+
+</component>
+<component id="call_remote_party_information_api" name="Call Remote Party Information API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/call_remote_party_information_api/group" filter="!test"/>
+
+</component>
+<component id="telephony_mediator_api" name="Telephony Mediator API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/telephony_mediator_api/group" filter="!test"/>
+
+</component>
+<component id="dialpad_api" name="Dialpad API" class="api" filter="s60" introduced="^4">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/dialpad_api/group"/>
+</component>
+</collection>
+<collection id="cellular" name="Cellular" level="server">
+<component id="telephonysettings" filter="s60" name="Telephony Settings" purpose="development">
+
+</component>
+<component id="sssettings" filter="s60" name="Supplementary Service Settings" purpose="development">
+
+</component>
+<component id="psetnotesui" filter="s60" name="Phone Settings Notes UI" purpose="development">
+
+</component>
+</collection>
+<collection id="convergedcallengine" name="Converged Call Engine" level="framework">
+<component id="cce" filter="s60" name="CCE" purpose="development">
+
+</component>
+<component id="spsettings" filter="s60" name="Service Provider Settings" purpose="development">
+
+</component>
+</collection>
+<collection id="phoneclientserver" name="Phone Client/Server" level="server">
+<component id="aiwdialdata" filter="s60" name="AIW Dial Data" purpose="development">
+
+</component>
+<component id="dialutils" filter="s60" name="Dial Utils" purpose="development">
+
+</component>
+<component id="phoneclient" filter="s60" name="Phone Client" purpose="development">
+
+</component>
+</collection>
+<collection id="phonesrv_info" name="Phone Server Info" level="generic">
+<component id="phonesrv_build" name="Phone Server Build" filter="s60">
+<unit bldFile="/mw/phonesrv" qt:proFile="phonesrv.pro"/>
+</component>
+</collection>
+</package>
+<package id="messagingmw" level="specific" tech-domain="pr" name="Messaging Middleware" levels="stack support fw api">
+<collection id="msgfw_plat" name="Messaging Middleware Platform Interfaces" level="api">
+<component id="always_online_plugin_api" name="Always Online Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/messagingmw/msgfw_plat/always_online_plugin_api/group"/>
+</component>
+<component id="always_online_client_api" name="Always Online Client API" class="api" filter="s60">
+<unit bldFile="/mw/messagingmw/msgfw_plat/always_online_client_api/group"/>
+</component>
+<component id="msg_common_utils_api" name="Messaging Common Utils API" class="api" filter="s60">
+<unit bldFile="/mw/messagingmw/msgfw_plat/msg_common_utils_api/group"/>
+</component>
+<component id="muiu_utils_api" name="Messaging Center UI Utilities API" class="api" filter="s60" introduced="^4">
+<unit bldFile="/mw/messagingmw/msgfw_plat/muiu_utils_api/group"/>
+</component>
+</collection>
+<collection id="msgbranched" name="Messaging Branched" level="support">
+<!-- collection is really a component. Need to move down a directory -->
+<component id="msgbranched_build" filter="s60" name="Messaging Branched Build" class="config">
+<unit bldFile="/mw/messagingmw/msgbranched/group"/>
+</component>
+</collection>
+<collection id="messagingfw" name="Messaging Framework" level="fw">
+<!-- should break this collection up into smaller related collections -->
+<component id="send_ui_api" name="Send UI API" class="api" filter="s60" deprecated="^4">
+<unit bldFile="/mw/messagingmw/messagingfw/deprecate/send_ui_api/group"/>
+</component>
+<component id="send_ui_plugin_api" name="Send UI Plug-in API" class="api" filter="s60" deprecated="^4">
+<unit bldFile="/mw/messagingmw/messagingfw/deprecate/send_ui_plugin_api/group"/>
+</component>
+<component id="send_ui_datautils_api" name="Send UI Data Utils API" class="api" filter="s60" deprecated="^4">
+<unit bldFile="/mw/messagingmw/messagingfw/deprecate/send_ui_datautils_api/group"/>
+</component>
+<component id="alwaysonline" filter="s60" name="Always Online Server" introduced="^2">
+<unit bldFile="/mw/messagingmw/messagingfw/alwaysonline/group"/>
+</component>
+<component id="msgcommonutils" filter="s60" name="Messaging Common Utils" introduced="^2">
+<unit bldFile="/mw/messagingmw/messagingfw/msgcommonutils/group"/>
+</component>
+<component id="senduiservices" filter="s60" name="Send UI Services" introduced="^2" deprecated="^4">
+<unit bldFile="/mw/messagingmw/messagingfw/deprecate/senduiservices/group"/>
+</component>
+<component id="muiuutils" name="Messaging Center UI Utilities" class="api" filter="s60" introduced="^4">
+<unit bldFile="/mw/messagingmw/messagingfw/muiuutils/group"/>
+</component>
+<component id="scheduledsendmtm" name="Scheduled Send MTM" introduced="6.0" purpose="optional" class="plugin">
+<unit bldFile="/mw/messagingmw/messagingfw/scheduledsendmtm/group" mrp="/mw/messagingmw/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
+</component>
+<component id="msgsrvnstore" name="Message Server and Store" purpose="optional">
+<unit bldFile="/mw/messagingmw/messagingfw/msgsrvnstore/group" mrp="/mw/messagingmw/messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
+</component>
+<component id="biomsgfw" name="BIO Messaging Framework" introduced="6.0" purpose="optional">
+<unit bldFile="/mw/messagingmw/messagingfw/biomsgfw/group" mrp="/mw/messagingmw/messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
+</component>
+<component id="msgconf" name="Messaging Config" introduced="^2" purpose="optional" class="config">
+<unit bldFile="/mw/messagingmw/messagingfw/msgconf/group" mrp="/mw/messagingmw/messagingfw/msgconf/group/messaging_config.mrp"/>
+</component>
+<component id="watcherfw" name="Watcher Framework" purpose="optional">
+<unit bldFile="/mw/messagingmw/messagingfw/watcherfw/group" mrp="/mw/messagingmw/messagingfw/watcherfw/group/messaging_watcher.mrp"/>
+</component>
+<component id="msgtest" name="Messaging Test" purpose="development">
+<unit bldFile="/mw/messagingmw/messagingfw/msgtest/group" mrp="/mw/messagingmw/messagingfw/msgtest/group/messaging_test.mrp"/>
+</component>
+
+
+
+<component id="sendas" name="Send As" purpose="optional">
+<unit bldFile="/mw/messagingmw/messagingfw/sendas/group" mrp="/mw/messagingmw/messagingfw/sendas/group/messaging_sendas2.mrp"/>
+</component>
+<component id="msgurlhandler" name="Message URL Handler" introduced="7.0" purpose="optional">
+<unit bldFile="/mw/messagingmw/messagingfw/msgurlhandler/group" mrp="/mw/messagingmw/messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
+</component>
+<component id="wappushfw" name="WAP Push Framework" introduced="6.1" purpose="optional">
+<unit bldFile="/mw/messagingmw/messagingfw/wappushfw/group" mrp="/mw/messagingmw/messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
+</component>
+<component id="suplsmshandler" name="SUPL SMS Handler" introduced="^2" purpose="development" class="plugin">
+<unit bldFile="/mw/messagingmw/messagingfw/suplsmshandler/group" mrp="/mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/>
+</component>
+<component id="suplwappushhandler" name="SUPL WAP Push Handler" introduced="^2" purpose="optional" class="plugin">
+<unit bldFile="/mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="/mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
+</component>
+</collection>
+<collection id="messagingmw_info" name="Messaging Middleware Info" level="api">
+<component id="messagingmw_metadata" name="Messaging Middleware Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="imsrv" level="specific" tech-domain="pr" name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
+<collection id="imsrv_plat" name="Instant Messaging and Presence Services Platform Interfaces" level="specific">
+<component id="ximp_core_data_model_api" name="XIMP Core Data Model API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_core_data_model_api/group"/>
+</component>
+<component id="ximp_presence_protocol_plugin_host_api" name="XIMP Presence Protocol Plug-in Host API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_host_api/group"/>
+</component>
+<component id="ximp_presence_data_model_api" name="XIMP Presence Data Model API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_presence_data_model_api/group"/>
+</component>
+<component id="ximp_presence_protocol_plugin_api" name="XIMP Presence Protocol Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_api/group"/>
+</component>
+<component id="ximp_presence_management_api" name="XIMP Presence Management API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_presence_management_api/group"/>
+</component>
+<component id="ximp_core_protocol_plugin_host_api" name="XIMP Core Protocol Plug-in Host API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_host_api/group"/>
+</component>
+<component id="ximp_core_management_api" name="XIMP Core Management API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_core_management_api/group"/>
+</component>
+<component id="ximp_presence_base_api" name="XIMP Presence Base API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_presence_base_api/group"/>
+</component>
+<component id="ximp_core_protocol_plugin_api" name="XIMP Core Protocol Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_api/group"/>
+</component>
+<component id="ximp_core_base_api" name="XIMP Core Base API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_core_base_api/group"/>
+</component>
+<component id="ximp_presence_cache_api" name="XIMP Presence Cache API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_presence_cache_api/group"/>
+</component>
+<component id="ximp_core_feature_plugin_api" name="XIMP Core Feature Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/group"/>
+</component>
+<component id="ximp_im_protocol_plugin_host_api" name="XIMP IM Protocol Plugin Host API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_host_api/group"/>
+</component>
+<component id="ximp_im_data_model_api" name="XIMP IM Data Model API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_im_data_model_api/group"/>
+</component>
+<component id="ximp_im_protocol_plugin_api" name="XIMP IM Protocol Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_api/group"/>
+</component>
+<component id="ximp_im_management_api" name="XIMP IM Management API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_im_management_api/group"/>
+</component>
+<component id="ximp_im_base_api" name="XIMP IM Base API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_im_base_api/group"/>
+</component>
+<component id="ximp_search_protocol_plugin_host_api" name="XIMP Search Protocol Plugin Host API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_host_api/group"/>
+</component>
+<component id="ximp_search_data_model_api" name="XIMP Search Data Model API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_search_data_model_api/group"/>
+</component>
+<component id="ximp_search_protocol_plugin_api" name="XIMP search Protocol Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_api/group"/>
+</component>
+<component id="ximp_search_management_api" name="XIMP Search Management API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_search_management_api/group"/>
+</component>
+<component id="ximp_search_base_api" name="XIMP Search Base API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_search_base_api/group"/>
+</component>
+<component id="xmpp_settings_api" name="XMPP Settings API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/xmpp_settings_api/group"/>
+</component>
+<component id="im_cache_client_api" name="IM Cache Client API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/im_cache_client_api/group"/>
+</component>
+<component id="im_cache_server_api" name="IM Cache Server API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/im_cache_server_api/group"/>
+</component>
+<component id="presence_avabilitytext" name="Presence Avability Text" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
+</component>
+</collection>
+<collection id="ximpfw" name="XIMP Framework" level="framework">
+<!-- collection is really a component. Needs to be moved down a directory -->
+<component id="ximpfw_build" filter="s60" name="XIMP Framework Build">
+<unit bldFile="/mw/imsrv/ximpfw/group"/>
+</component>
+</collection>
+<collection id="imservices" name="IM Services" level="generic">
+<component id="imfeatureplugin" filter="s60" name="IM Feature Plugin" class="plugin" introduced="^2">
+<unit bldFile="/mw/imsrv/imservices/imfeatureplugin/group"/>
+</component>
+<component id="searchfeatureplugin" filter="s60" name="Search Feature Plugin" class="plugin" introduced="^2">
+<unit bldFile="/mw/imsrv/imservices/searchfeatureplugin/group"/>
+</component>
+<component id="xmppsettingsapi" filter="s60" name="XMPP Settings API" introduced="^2">
+<unit bldFile="/mw/imsrv/imservices/xmppsettingsapi/group"/>
+</component>
+<component id="xmppsettingsfetcher" filter="s60" name="XMPP Settings Fetcher" introduced="^2">
+<unit bldFile="/mw/imsrv/imservices/xmppsettingsfetcher/group"/>
+</component>
+<component id="instantmessagingcache" filter="s60" name="Instant Messaging Cache" introduced="^2">
+<unit bldFile="/mw/imsrv/imservices/instantmessagingcache/group"/>
+</component>
+</collection>
+<collection id="brandingserver" name="Branding Server" level="specific">
+<!-- collection is really a component. Needs to be moved down a directory -->
+<component id="brandingserver_build" filter="s60" name="Branding Server Build">
+<unit bldFile="/mw/imsrv/brandingserver/group"/>
+</component>
+</collection>
+</package>
+<package id="legacypresence" level="specific" tech-domain="pr" name="Legacy Presence Services" levels="engine fw ui">
+<collection id="pressrv_plat" name="Legacy Presence Services Platform Interfaces" level="ui">
+<component id="presence_list_api" name="Presence List API" class="api" filter="s60">
+<unit bldFile="/mw/legacypresence/pressrv_plat/presence_list_api/group"/>
+</component>
+<component id="watcher_info_api" name="Watcher Info API" class="api" filter="s60">
+<unit bldFile="/mw/legacypresence/pressrv_plat/watcher_info_api/group"/>
+</component>
+<component id="simple_documents_api" name="SIMPLE Documents API" class="api" filter="s60">
+<unit bldFile="/mw/legacypresence/pressrv_plat/simple_documents_api/group"/>
+</component>
+<component id="authorization_api" name="Authorization API" class="api" filter="s60">
+<unit bldFile="/mw/legacypresence/pressrv_plat/authorization_api/group"/>
+</component>
+<component id="xdm_protocol_plugin_api" name="XDM Protocol Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/legacypresence/pressrv_plat/xdm_protocol_plugin_api/group"/>
+</component>
+<component id="watcher_api" name="Watcher API" class="api" filter="s60">
+<unit bldFile="/mw/legacypresence/pressrv_plat/watcher_api/group"/>
+</component>
+<component id="xdm_api" name="XDM API" class="api" filter="s60">
+<unit bldFile="/mw/legacypresence/pressrv_plat/xdm_api/group"/>
+</component>
+<component id="registration_api" name="Registration API" class="api" filter="s60">
+<unit bldFile="/mw/legacypresence/pressrv_plat/registration_api/group"/>
+</component>
+<component id="publisher_api" name="Publisher API" class="api" filter="s60">
+<unit bldFile="/mw/legacypresence/pressrv_plat/publisher_api/group"/>
+</component>
+<component id="messaging_connection_manager_api" name="Messaging Connection Manager API" class="api" filter="s60">
+<unit bldFile="/mw/legacypresence/pressrv_plat/messaging_connection_manager_api/group"/>
+</component>
+<component id="xdm_settings_api" name="XDM Settings API" class="api" filter="s60">
+<unit bldFile="/mw/legacypresence/pressrv_plat/xdm_settings_api/group"/>
+</component>
+<component id="simple_settings_api" name="SIMPLE Settings API" class="api" filter="s60">
+<unit bldFile="/mw/legacypresence/pressrv_plat/simple_settings_api/group"/>
+</component>
+<component id="simple_instant_msg_api" name="Simple Instant Msg API" class="api" filter="s60">
+<unit bldFile="/mw/legacypresence/pressrv_plat/simple_instant_msg_api/group"/>
+</component>
+</collection>
+<collection id="xdmengine" name="XDM Engine" level="engine">
+<!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
+<component id="xdmengine_build" filter="s60" name="XDM Engine Build">
+<unit bldFile="/mw/legacypresence/xdmengine/group"/>
+</component>
+</collection>
+<collection id="xdmsettingsui" name="XDM Settings UI" level="ui">
+<!-- collection is really a component. Need to move down a directory (eg xdm/xdmsettingsui)-->
+<component id="xdmsettingsui_build" filter="s60" name="XDM Settings UI Build">
+<unit bldFile="/mw/legacypresence/xdmsettingsui/group"/>
+</component>
+</collection>
+<collection id="xdmprotocols" name="XDM Protocols" level="fw">
+<!-- collection is really a component. Need to move down a directory (eg xdm/xdmprotocols)-->
+<component id="xdmprotocols_build" filter="s60" name="XDM Protocols Build">
+<unit bldFile="/mw/legacypresence/xdmprotocols/group"/>
+</component>
+</collection>
+<collection id="msgconnmanager" name="Messaging Connection Manager" level="fw">
+<!-- collection is really a component. Need to move down a directory-->
+<component id="msgconnmanager_build" filter="s60" name="Messaging Connection Manager Build">
+<unit bldFile="/mw/legacypresence/msgconnmanager/group"/>
+</component>
+</collection>
+<collection id="presencesettingsui" name="Presence Settings UI" level="ui">
+<!-- collection is really a component. Need to move down a directory-->
+<component id="presencesettingsui_build" filter="s60" name="Presence Settings UI Build">
+<unit bldFile="/mw/legacypresence/presencesettingsui/group"/>
+</component>
+</collection>
+<collection id="simpleengine" name="SIMPLE Engine" level="engine">
+<!-- collection is really a component. Need to move down a directory-->
+<component id="simpleengine_build" filter="s60" name="SIMPLE Engine Build">
+<unit bldFile="/mw/legacypresence/simpleengine/group"/>
+</component>
+</collection>
+<collection id="presencefwsimpleadpt" name="Presence Framework SIMPLE Adaptation" level="fw">
+<!-- collection is really a component. Need to move down a directory-->
+<component id="simpleplugin" filter="s60" class="plugin" name="SIMPLE Plugin">
+<unit bldFile="/mw/legacypresence/presencefwsimpleadpt/group"/>
+</component>
+</collection>
+<collection id="simpledatamodeladapter" name="SIMPLE Data Model Adapter" level="fw">
+<component id="presenceplugin" filter="s60" class="plugin" name="Presence Plugin" introduced="^2">
+<unit bldFile="/mw/legacypresence/simpledatamodeladapter/group"/>
+</component>
+</collection>
+</package>
+<package id="searchsrv" level="specific" tech-domain="pr" name="Search Services" levels="services engine generic api">
+<collection id="searchsrv_plat" name="Search Services Platform Interfaces" level="api">
+<component id="cpix_utility_api" name="CPIX Utility API" filter="s60" class="api" introduced="^4">
+<unit bldFile="/mw/searchsrv/searchsrv_plat/cpix_utility_api/group"/>
+</component>
+<component id="cpix_framework_api" name="CPIX Framework API" filter="s60" class="api" introduced="^4">
+<unit bldFile="/mw/searchsrv/searchsrv_plat/cpix_framework_api/group"/>
+</component>
+<component id="cpix_search_api" name="CPIX Search API" filter="s60" class="api" introduced="^4">
+<unit bldFile="/mw/searchsrv/searchsrv_plat/cpix_search_api/group"/>
+</component>
+</collection>
+<collection id="searchengine" name="Search Engine" level="engine">
+<component id="searchengine_util" name="Search Engine Utils" filter="s60" introduced="^4">
+<unit bldFile="/mw/searchsrv/searchengine/util/group"/>
+</component>
+<component id="searchengine_oss" name="Search Engine OSS" filter="s60" introduced="^4">
+<unit bldFile="/mw/searchsrv/searchengine/oss/group"/>
+</component>
+<component id="cpix" name="Cross Platform Indexing Engine" filter="s60" introduced="^4">
+<unit bldFile="/mw/searchsrv/searchengine/cpix/group"/>
+</component>
+</collection>
+<collection id="searcher" name="Searcher" level="generic">
+<component id="searchclient" name="Search Client" filter="s60" introduced="^4">
+<unit bldFile="/mw/searchsrv/searcher/SearchClient/group"/>
+</component>
+<component id="searchserver" name="Search Server" filter="s60" introduced="^4">
+<unit bldFile="/mw/searchsrv/searcher/SearchServer/group"/>
+</component>
+<component id="searcher_test" name="Searcher Tests" filter="s60" purpose="development" introduced="^4">
+<!-- #include from common bld.inf or split into two components -->
+<unit bldFile="/mw/searchsrv/searcher/tsrc/RobustnessTest/group"/>
+<unit bldFile="/mw/searchsrv/searcher/tsrc/LogPlayer/group"/>
+</component>
+</collection>
+<collection id="searchsrv_harvester" name="Search Services Harvester" level="services">
+<component id="searchsrv_pluginfw" name="Search Server" filter="s60" introduced="^4">
+<unit bldFile="/mw/searchsrv/harvester/pluginfw/group"/>
+</component>
+<component id="searchsrv_harvesterserver" name="Search Harvester Server" filter="s60" introduced="^4">
+<unit bldFile="/mw/searchsrv/harvester/HarvesterServer/group"/>
+</component>
+</collection>
+<collection id="searchsrv_watchdog" name="Search Services Watch Dog" level="services">
+<component id="searchsrv_watchdog_build" name="Search Services Watch Dog Build" filter="s60" introduced="^4">
+<unit bldFile="/mw/searchsrv/WatchDog/group"/>
+</component>
+</collection>
+<collection id="qcpix" name="Qt CPIX" level="engine">
+<component id="qcpix_build" name="Qt CPIX Build" introduced="^4">
+<unit bldFile="/mw/searchsrv/qcpix" qt:proFile="qcpix.pro"/>
+</component>
+</collection>
+<collection id="searchsrv_info" name="Search Services Info">
+<component id="searchsrv_build" name="Search Services Build" introduced="^4">
+<!-- move exports to own component and remove this -->
+<unit bldFile="/mw/searchsrv/group"/>
+</component>
+
+</collection>
+</package>
+<package id="remotemgmt" level="specific" tech-domain="dm" name="Remote Management" levels="plugin framework server generic specific">
+<collection id="remotemgmt_pub" name="Remote Management Public Interfaces" level="specific">
+<component id="synchronization_capability_api" name="Synchronization Capability API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
+</component>
+</collection>
+<collection id="remotemgmt_plat" name="Remote Management Platform Interfaces" level="specific">
+<component id="common_agent_util_and_definitions_api" name="Common Agent util and definitions API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
+</component>
+<component id="policy_management_certificate_api" name="Policy Management Certificate API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/group"/>
+</component>
+<component id="oma_provisioning_adapter_api" name="OMA Provisioning Adapter API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/oma_provisioning_adapter_api/group"/>
+</component>
+<component id="device_management_parameter_api" name="Device Management Parameter API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/device_management_parameter_api/group"/>
+</component>
+<component id="data_synchronization_plugin_api" name="Data Synchronization Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/group"/>
+</component>
+<component id="sync_alert_handler_api" name="Sync Alert Handler API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
+</component>
+<component id="syncml_notifier_api" name="SyncML Notifier API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
+</component>
+<component id="syncml_client_api" name="SyncML Client API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
+</component>
+<component id="device_management_plugin_api" name="Device Management plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/device_management_plugin_api/group"/>
+</component>
+<component id="dm_tree_apis" name="DM Tree APIs" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
+</component>
+<component id="terminal_security_device_lock_api" name="Terminal Security Device Lock API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/group"/>
+</component>
+<component id="policy_management_request_api" name="Policy Management Request API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/policy_management_request_api/group"/>
+</component>
+<component id="ds_constant_definitions_api" name="DS Constant Definitions API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/ds_constant_definitions_api/group"/>
+</component>
+<component id="scp_server_api" name="SCP Server API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/scp_server_api/group"/>
+</component>
+<component id="data_synchronization_notification_api" name="Data Synchronization Notification API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/data_synchronization_notification_api/group"/>
+</component>
+<component id="oma_provisioning_engine_api" name="OMA Provisioning Engine API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/group"/>
+</component>
+<component id="dm_utils_api" name="DM Utils API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/dm_utils_api/group"/>
+</component>
+<component id="syncml_alert_api" name="SyncML Alert API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/syncml_alert_api/group"/>
+</component>
+<component id="obex_client_session_api" name="OBEX Client session API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/obex_client_session_api/group"/>
+</component>
+<component id="setting_enforcement_info_api" name="Setting Enforcement Info API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/group"/>
+</component>
+<component id="dm_constant_definitions_api" name="DM Constant Definitions API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
+</component>
+<component id="oma_ds_extensions_api" name="OMA DS Extensions API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
+</component>
+<component id="pnpms_utils_api" name="PNPMS Utils API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
+</component>
+<component id="diagnostics_plugin_utility_api" name="Diagnostics Plugin Utility API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
+</component>
+<component id="diagnostics_plugin_api" name="Diagnostics Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
+</component>
+<component id="diagnostics_framework_api" name="Diagnostics Framework API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
+</component>
+<component id="diagnostics_results_api" name="Diagnostics Results API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
+</component>
+<component id="diagnostics_plugin_pool_api" name="Diagnostics Plugin Pool API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
+</component>
+<component id="adaptive_history_list_api" name="Adaptive History List API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
+</component>
+<component id="adaptive_history_list_session_api" name="Adaptive History List Session API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
+</component>
+<component id="fota_engine_api" name="FOTA Engine API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
+</component>
+<component id="update_package_storage_plugin_api" name="Update Package Storage Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
+</component>
+<component id="syncml_notifier_roaming_api" name="SyncML Notifier Roaming API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
+</component>
+<component id="sync_service_api" name="Sync Service API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/sync_service_api/group"/>
+</component>
+<component id="dcmo_adapter_api" name="DCMO Adapter API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/dcmo_adapter_api/group"/>
+</component>
+<component id="dcmo_control_api" name="DCMO Control API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/dcmo_control_api/group"/>
+</component>
+<component id="ds_capability_mgmt_plugin_api" name="DS Capability Management Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
+</component>
+</collection>
+<collection id="policymanagement" name="Policy Management" level="generic">
+<component id="pmdmadapter" filter="s60" name="PM DM Adapter" class="plugin">
+<unit bldFile="/mw/remotemgmt/policymanagement/pmdmadapter/group"/>
+</component>
+<component id="dmutilserver" filter="s60" name="DM Util Server">
+<unit bldFile="/mw/remotemgmt/policymanagement/dmutilserver/group"/>
+</component>
+<component id="policyengine" filter="s60" name="Policy Engine">
+<unit bldFile="/mw/remotemgmt/policymanagement/policyengine/group" filter="!dfs_build"/>
+</component>
+<component id="policymanagement_build" filter="s60" name="Policy Management Build">
+<!-- need to distribute exports, etc into the other components and remove this-->
+<unit bldFile="/mw/remotemgmt/policymanagement/group"/>
+</component>
+</collection>
+<collection id="syncmlfw" name="SyncML Framework" level="server">
+<component id="syncmlfw_build" filter="s60" name="SyncML Framework Build">
+<!-- need to break this up into components. Too convoluted a structure to be in a single bld.inf-->
+<unit bldFile="/mw/remotemgmt/syncmlfw/group"/>
+</component>
+</collection>
+<collection id="terminalsecurity" name="Terminal Security" level="specific">
+<component id="scp" filter="s60" name="Security Code Proxy">
+<!-- can only have one unit, need to have these #included from a single bld.inf -->
+<unit bldFile="/mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
+<unit bldFile="/mw/remotemgmt/terminalsecurity/scp/scpdatabase/group"/>
+<unit bldFile="/mw/remotemgmt/terminalsecurity/scp/scpserver/group"/>
+<unit bldFile="/mw/remotemgmt/terminalsecurity/scp/scppatternplugin/group"/>
+<unit bldFile="/mw/remotemgmt/terminalsecurity/scp/scphistoryplugin/group"/>
+<unit bldFile="/mw/remotemgmt/terminalsecurity/scp/scptimestampplugin/group"/>
+<unit bldFile="/mw/remotemgmt/terminalsecurity/scp/scpeventhandler/group"/>
+<unit bldFile="/mw/remotemgmt/terminalsecurity/scp/dmeventnotifier/group"/>
+</component>
+<component id="terminalsecurity_client" filter="s60" name="Terminal Control Client">
+<unit bldFile="/mw/remotemgmt/terminalsecurity/client/group"/>
+</component>
+<component id="terminalsecurity_server" filter="s60" name="Terminal Control Server">
+<unit bldFile="/mw/remotemgmt/terminalsecurity/server/group"/>
+</component>
+<component id="tcadapter" filter="s60" name="Terminal Control Adapter">
+<unit bldFile="/mw/remotemgmt/terminalsecurity/tcadapter/bld"/>
+</component>
+<component id="terminalsecurity_build" filter="s60" name="Terminal Security Build">
+<!-- need to distribute exports, etc into the other components and remove this-->
+<unit bldFile="/mw/remotemgmt/terminalsecurity/group"/>
+</component>
+</collection>
+<collection id="omaprovisioning" name="OMA Provisioning" level="specific">
+<component id="pnputil" filter="s60" name="PnP Util">
+<unit bldFile="/mw/remotemgmt/omaprovisioning/pnputil/group"/>
+</component>
+<component id="provisioning" filter="s60" name="Provisioning">
+<unit bldFile="/mw/remotemgmt/omaprovisioning/provisioning/group"/>
+</component>
+</collection>
+<collection id="devicediagnosticsfw" name="Device Diagnostics Framework" level="framework">
+<component id="diagframework" filter="s60" name="Diagnostics Framework">
+<unit bldFile="/mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
+</component>
+<component id="diagpluginbase" filter="s60" name="Diagnostics Plugin Base">
+<unit bldFile="/mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
+</component>
+<component id="diagresultsdb" filter="s60" name="Diagnostics Results Database">
+<!-- can only have one unit, merge or split into two components -->
+<unit bldFile="/mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
+<unit bldFile="/mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
+</component>
+<component id="devicediagnosticsfw_build" filter="s60" name="Device Diagnostics Framework Build">
+<!-- need to distribute exports, etc into the other components and remove this-->
+<unit bldFile="/mw/remotemgmt/devicediagnosticsfw/group"/>
+</component>
+</collection>
+<collection id="dcmofw" name="Device Capability Management Object Framework" level="framework">
+<component id="dcmoclient" filter="s60" name="DCMO Client">
+<unit bldFile="/mw/remotemgmt/dcmofw/dcmoclient/group"/>
+</component>
+<component id="dcmoserver" filter="s60" name="DCMO Server">
+<unit bldFile="/mw/remotemgmt/dcmofw/dcmoserver/group"/>
+</component>
+<component id="dcmocustcmd" filter="s60" name="DCMO Custom Commands">
+<unit bldFile="/mw/remotemgmt/dcmofw/dcmocustcmd/group"/>
+</component>
+<component id="dcmofw_build" filter="s60" name="DCMO Build">
+<!-- need to distribute exports, etc into the other components and remove this-->
+<unit bldFile="/mw/remotemgmt/dcmofw/group"/>
+</component>
+</collection>
+<collection id="fotaapplication" name="FOTA Application" level="generic">
+<component id="fotaapplication_build" filter="s60" name="FOTA Application Build">
+<!-- remove this component when configuration is in place and the #ifdefs have been worked out -->
+<unit bldFile="/mw/remotemgmt/fotaapplication/group"/>
+</component>
+<component id="fotaserver" filter="s60" name="FOTA Server">
+<meta rel="config">
+<defined condition="__SYNCML_DM_FOTA"/>
+</meta>
+<!-- uncomment when #ifdefs are resolved -->
+<!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
+</component>
+<component id="fotacustcmds" filter="s60" name="FOTA Custom Commands">
+<!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
+<!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
+</component>
+</collection>
+</package>
+<package id="remoteconn" level="generic" tech-domain="de" name="Remote Connectivity" levels="plugin framework server generic specific">
+<collection id="remoteconn_info" name="Remote Connectivity Info" level="specific">
+<component id="remoteconn_metadata" name="Remote Connectivity Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
+</component>
+</collection>
+<collection id="mtptransports" name="MTP Transports" level="plugin">
+<component id="mtpusbtransport" name="MTP USB Transport" introduced="^2" purpose="optional" class="plugin">
+<unit bldFile="/mw/remoteconn/mtptransports/mtpusbtransport/group" mrp="/mw/remoteconn/mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
+</component>
+<component id="mtpptpiptransport" name="MTP PTP-IP Transport" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/mw/remoteconn/mtptransports/mtpptpiptransport/group" mrp="/mw/remoteconn/mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
+</component>
+<component id="mtpcontroller" name="MTP Controller" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/mw/remoteconn/mtptransports/mtpcontroller/group" mrp="/mw/remoteconn/mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
+</component>
+</collection>
+<collection id="mtpfws" name="MTP Frameworks" level="framework">
+<component id="mtpfw" name="MTP Framework" introduced="^2" purpose="optional">
+<unit bldFile="/mw/remoteconn/mtpfws/mtpfw/group" mrp="/mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/>
+</component>
+</collection>
+<collection id="mtpdataproviders" name="MTP Data Providers" level="generic">
+<component id="mtpfileandfolderdp" name="MTP File and Folder Provider" introduced="^2" purpose="optional" class="plugin">
+<unit bldFile="/mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group" mrp="/mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
+</component>
+<component id="mtpimagedp" name="MTP Image Data Provider" filter="gt" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/mw/remoteconn/mtpdataproviders/mtpimagedp/group" mrp="/mw/remoteconn/mtpdataproviders/mtpimagedp/group/mtp_imagedp.mrp"/>
+</component>
+<component id="mtppictbridgedp" name="MTP PictBridge Data Provider" filter="gt" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/mw/remoteconn/mtpdataproviders/mtppictbridgedp/group" mrp="/mw/remoteconn/mtpdataproviders/mtppictbridgedp/group/mtp_pictbridgedp.mrp"/>
+</component>
+</collection>
+<collection id="backupandrestore" name="Backup and Restore" level="specific">
+<component id="backupengine" name="Backup Engine" introduced="9.0" purpose="optional">
+<unit bldFile="/mw/remoteconn/backupandrestore/backupengine/group" mrp="/mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
+</component>
+<component id="backuptest" name="Backup Test" introduced="^2" purpose="development">
+<unit bldFile="/mw/remoteconn/backupandrestore/backuptest/group" mrp="/mw/remoteconn/backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
+</component>
+</collection>
+<collection id="obex" name="OBEX" level="generic">
+<component id="obexprotocol" name="OBEX Protocol" introduced="9.1" purpose="optional">
+<unit bldFile="/mw/remoteconn/obex/obexprotocol/group" mrp="/mw/remoteconn/obex/obexprotocol/group/obex.mrp"/>
+</component>
+<component id="obexextensionapi" name="OBEX Extension API" introduced="9.2" purpose="optional">
+<unit bldFile="/mw/remoteconn/obex/obexextensionapi/group" mrp="/mw/remoteconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
+</component>
+</collection>
+</package>
+<package id="srvdiscovery" level="generic" tech-domain="de" name="Service Discovery and Usage" levels="plugin framework server generic specific">
+<collection id="upnpstack_plat" name="UPnP Stack Platform Interfaces" level="specific">
+<component id="upnp_device_api" name="UPnP Device API" purpose="optional" introduced="^3" class="api">
+<unit bldFile="/mw/srvdiscovery/upnp/upnpstack_plat/upnp_device_api/group"/>
+</component>
+<component id="upnp_common_api" name="UPnP Common API" purpose="optional" introduced="^3" class="api">
+<unit bldFile="/mw/srvdiscovery/upnp/upnpstack_plat/upnp_common_api/group"/>
+</component>
+<component id="upnp_utils_api" name="UPnP Utils API" purpose="optional" introduced="^3" class="api">
+<unit bldFile="/mw/srvdiscovery/upnp/upnpstack_plat/upnp_utils_api/group"/>
+</component>
+<component id="upnp_control_point_api" 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 id="upnp_httpserver_api" name="UPnP HTTP Server API" purpose="optional" introduced="^3" class="api">
+<unit bldFile="/mw/srvdiscovery/upnp/upnpstack_plat/upnp_httpserver_api/group"/>
+</component>
+<component id="upnp_http_transfer_api" 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 id="servicediscoveryandcontrol" name="Service Discovery and Control" level="framework">
+<component id="servicediscoveryfw" name="Service Discovery Framework" introduced="^3" purpose="optional">
+<unit bldFile="/mw/srvdiscovery/servicediscoveryandcontrol/pnp/group" mrp="/mw/srvdiscovery/servicediscoveryandcontrol/pnp/group/servicediscoveryframework.mrp"/>
+</component>
+</collection>
+<collection id="upnp" name="UPnP" level="server">
+<component id="upnpstack" name="UPnP Stack" introduced="^3" purpose="optional">
+<unit bldFile="/mw/srvdiscovery/upnp/upnpstack/group"/>
+</component>
+</collection>
+<collection id="srvdiscovery_info" name="Service Discovery and Usage Info" level="specific">
+<component id="srvdiscovery_metadata" name="Service Discovery and Usage Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/mw/srvdiscovery/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="dlnasrv" level="specific" tech-domain="de" name="DLNA Services" levels="stack server ctrl framework plugin">
+<!-- uncomment all the units when configuration is in place, they're currently #included from other xxx_build components -->
+<collection id="dlnasrv_plat" name="DLNA Services Platform Interfaces" level="plugin">
+<component id="upnp_media_server_settings_api" name="UPnP Media Server Settings API" class="api" filter="s60">
+<unit bldFile="/mw/dlnasrv/dlnasrv_plat/upnp_media_server_settings_api/group"/>
+</component>
+<component id="upnp_av_objects_api" name="UPnP A/V Objects API" class="api" filter="s60">
+<unit bldFile="/mw/dlnasrv/dlnasrv_plat/upnp_av_objects_api/group"/>
+</component>
+<component id="upnp_media_server_api" name="UPnP Media Server API" class="api" filter="s60">
+<unit bldFile="/mw/dlnasrv/dlnasrv_plat/upnp_media_server_api/group"/>
+</component>
+<component id="upnp_security_plugin_api" name="UPnP Security Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/dlnasrv/dlnasrv_plat/upnp_security_plugin_api/group"/>
+</component>
+<component id="upnp_avcp_api" name="UPnP AVCP API" class="api" filter="s60">
+<unit bldFile="/mw/dlnasrv/dlnasrv_plat/upnp_avcp_api/group"/>
+</component>
+<component id="upnp_media_server_metadata_api" name="UPnP Media Server Metadata API" class="api" filter="s60">
+<unit bldFile="/mw/dlnasrv/dlnasrv_plat/upnp_media_server_metadata_api/group"/>
+</component>
+<component id="upnp_command_api" name="UPnP Command API" class="api" filter="s60">
+<unit bldFile="/mw/dlnasrv/dlnasrv_plat/upnp_command_api/group"/>
+</component>
+<component id="upnp_plugin_api" name="UPnP Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/dlnasrv/dlnasrv_plat/upnp_plugin_api/group"/>
+</component>
+</collection>
+<collection id="upnpavcontrolpoint" name="UPnP A/V Control Point" level="plugin">
+<component id="avcontrolframework" filter="s60" name="A/V Control Famework" introduced="9.1" deprecated="^3">
+<unit bldFile="/mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
+</component>
+<component id="upnpavcontrolpoint_build" filter="s60" name="UPnP A/V Control Point Build" introduced="9.1" deprecated="^3">
+<!-- put exports in other component instead -->
+<unit bldFile="/mw/dlnasrv/upnpavcontrolpoint/group"/>
+</component>
+</collection>
+<collection id="upnpmediaserver" name="UPnP Media Server" level="server">
+<component id="avobjects" filter="s60" name="A/V Objects">
+<unit bldFile="/mw/dlnasrv/upnpmediaserver/avobjects/group"/>
+</component>
+<component id="mediaserverclient" filter="s60" name="Media Server Client">
+<unit bldFile="/mw/dlnasrv/upnpmediaserver/mediaserverclient/group"/>
+</component>
+<component id="connectionmanagerservice" filter="s60" name="Connection Manager Service">
+<unit bldFile="/mw/dlnasrv/upnpmediaserver/connectionmanagerservice/group"/>
+</component>
+<component id="contentdirectoryservice" filter="s60" name="Content Directory Service">
+<unit bldFile="/mw/dlnasrv/upnpmediaserver/contentdirectoryservice/group"/>
+</component>
+<component id="mediaserverengine" filter="s60" name="Media Server Engine">
+<unit bldFile="/mw/dlnasrv/upnpmediaserver/mediaserverengine/group"/>
+</component>
+<component id="upnpmediaserver_build" filter="s60" name="UPnP Media Server Build">
+<!-- move exports into one of above components -->
+<unit bldFile="/mw/dlnasrv/upnpmediaserver/group"/>
+</component>
+</collection>
+<collection id="upnpavcontroller" name="UPnP A/V Controller" level="ctrl">
+<component id="upnpxmlparser" filter="s60" name="UPnP XML Parser" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpavcontroller/upnpxmlparser/group"/>
+</component>
+<component id="upnpavcontrollerserver" filter="s60" name="UPnP A/V Controller Server" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpavcontroller/upnpavcontrollerserver/group"/>
+</component>
+<component id="upnpavcontrollerclient" filter="s60" name="UPnP A/V Ccontroller Client" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpavcontroller/upnpavcontrollerclient/group"/>
+</component>
+<component id="upnpavcontrollerhelper" filter="s60" name="UPnP A/V Controller Helper" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpavcontroller/upnpavcontrollerhelper/group"/>
+</component>
+<component id="upnpavcontroller_build" filter="s60" name="UPnP A/V Controller Build" introduced="^2">
+<!-- move exports content into one of above components -->
+<unit bldFile="/mw/dlnasrv/upnpavcontroller/group"/>
+</component>
+</collection>
+<collection id="upnpframework" name="UPnP Framework" level="framework">
+<component id="upnputilities" filter="s60" name="UPnP Utilities" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpframework/upnputilities/group"/>
+</component>
+<component id="upnpextensionpluginif" filter="s60" name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
+<meta rel="config">
+<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+</meta>
+<!-- <unit bldFile="upnpframework/upnpextensionpluginif/group"/> -->
+</component>
+<component id="upnpfiletransferengine" filter="s60" name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
+<meta rel="config">
+<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+</meta>
+<!-- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>-->
+</component>
+<component id="upnpcommonui" filter="s60" name="UPnP Common UI" introduced="^2" deprecated="^3">
+<meta rel="config">
+<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+</meta>
+<!--<unit bldFile="upnpframework/upnpcommonui/group"/>-->
+</component>
+<component id="upnpaiwengine" filter="s60" name="UPnP AIW Engine" introduced="^2" deprecated="^3">
+<meta rel="config">
+<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+</meta>
+<!--<unit bldFile="upnpframework/upnpaiwengine/group"/> -->
+</component>
+<component id="upnpaiwprovider" filter="s60" name="UPnP AIW Provider" class="plugin" introduced="^2" deprecated="^3">
+<meta rel="config">
+<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+</meta>
+<!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
+</component>
+<component id="upnpmusicadapter" filter="s60" name="UPnP Music Adapter" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
+</component>
+<component id="upnpcommand" filter="s60" name="UPnP Command" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpframework/upnpcommand/group"/>
+</component>
+<component id="upnpframework_build" filter="s60" name="UPnP Framework Build" introduced="^2">
+<!-- move exports content into one of above components -->
+<unit bldFile="/mw/dlnasrv/upnpframework/group"/>
+</component>
+</collection>
+<collection id="upnpsettings" name="UPnP Settings" level="framework">
+<component id="upnpsettingsengine" filter="s60" name="UPnP Settings Engine" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
+</component>
+<component id="multiselectionui" filter="s60" name="Multi-Selection UI" introduced="^2" deprecated="^3">
+<meta rel="config">
+<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+</meta>
+<!--<unit bldFile="upnpsettings/multiselectionui/group"/>-->
+</component>
+<component id="appwizard" filter="s60" name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
+<meta rel="config">
+<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+</meta>
+<!--<unit bldFile="upnpsettings/appwizard/group"/>-->
+</component>
+<component id="upnpsharingui" filter="s60" name="UPnP Sharing UI" introduced="^2" deprecated="^3">
+<meta rel="config">
+<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+</meta>
+<!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
+</component>
+<component id="upnpgsplugin" filter="s60" name="UPnP GS Plugin" class="plugin" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
+</component>
+<component id="upnpsettings_build" filter="s60" name="UPnP Settings Build" introduced="^2">
+<!-- move exports content into one of above components -->
+<unit bldFile="/mw/dlnasrv/upnpsettings/group"/>
+</component>
+</collection>
+<collection id="upnpsharing" name="UPnP Sharing" level="server">
+<component id="upnpdlnaprofiler" filter="s60" name="UPnP DLNA Profiler" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpsharing/upnpdlnaprofiler/group"/>
+</component>
+<component id="upnpsecurity" filter="s60" name="UPnP Security" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpsharing/upnpsecurity/group"/>
+</component>
+<component id="upnpcontentserver" filter="s60" name="UPnP Content Server" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpsharing/upnpcontentserver/group"/>
+</component>
+<component id="applicationengine" filter="s60" name="UPnP Application Engine" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpsharing/applicationengine/group"/>
+</component>
+<component id="upnpsharing_build" filter="s60" name="UPnP Sharing Build" introduced="^2">
+<!-- move exports content into one of above components -->
+<unit bldFile="/mw/dlnasrv/upnpsharing/group"/>
+</component>
+</collection>
+<collection id="upnpmpxplugins" name="UPnP MPX Plugins" level="plugin">
+<component id="upnpplaybackplugins" filter="s60" name="UPnP Playback Plugins" class="plugin" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpmpxplugins/upnpplaybackplugins/group"/>
+</component>
+<component id="upnpmpxplugins_build" filter="s60" name="UPnP MPX Plugins Build" introduced="^2">
+<!-- move exports content into other component? -->
+<unit bldFile="/mw/dlnasrv/upnpmpxplugins/group"/>
+</component>
+</collection>
+<collection id="upnpharvester" name="UPnP Harvester" level="ctrl">
+<meta rel="config">
+<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+</meta>
+<component id="upnpharvester_common" filter="s60" name="UPnP Harvester Common" introduced="^2" deprecated="^3">
+<!-- need to merge or #include these to a single bld.inf -->
+<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
+ <unit bldFile="upnpharvester/common/cmsettings/group"/>
+ <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
+ <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
+</component>
+<component id="cdssync" filter="s60" name="CDS Sync" introduced="^2" deprecated="^3">
+<!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
+</component>
+<component id="mdhserver" filter="s60" name="Metadata Harvester Server" introduced="^2" deprecated="^3">
+<!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
+</component>
+<component id="upnpharvester_build" filter="s60" name="UPnP Harvester Build" introduced="^2" deprecated="^3">
+<!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
+<!--<unit bldFile="upnpharvester/group"/>-->
+</component>
+</collection>
+<collection id="homesync" name="Home Sync" level="plugin">
+<meta rel="config">
+<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+</meta>
+<component id="contentmanager" filter="s60" name="Content Manager" introduced="^2" deprecated="^3">
+<!-- <unit bldFile="homesync/group"/>-->
+<!-- move bld.inf into contentmanager dir -->
+</component>
+</collection>
+<collection id="homemedia" name="Home Media" level="framework">
+<meta rel="config">
+<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+</meta>
+<!-- collection is really just a component. Move down a directory -->
+<component id="homemedia_build" filter="s60" name="Home Media" introduced="^2" deprecated="^3">
+<!-- <unit bldFile="homemedia/group"/> -->
+</component>
+</collection>
+<collection id="dlnasrv_info" name="DLNA Services Info" level="plugin">
+<component id="dlnasrv_build" filter="s60" name="DLNA Services Build">
+<!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed -->
+<unit bldFile="/mw/dlnasrv/group"/>
+</component>
+
+</collection>
+</package>
+<package id="btservices" level="generic" tech-domain="de" name="Bluetooth Services" levels="framework server generic specific plugin">
+<collection id="btservices_pub" name="BT Services Public Interfaces" level="plugin">
+<component id="bluetooth_power_state_api" name="Bluetooth Power State API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_pub/bluetooth_power_state_api/group"/>
+</component>
+<component id="bluetooth_notifier_api" name="Bluetooth Notifier API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_pub/bluetooth_notifier_api/group"/>
+</component>
+</collection>
+<collection id="btservices_plat" name="BT Services Platform Interfaces" level="plugin">
+<component id="bluetooth_dosserver_audio_api" name="Bluetooth DOS Server Audio API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_dosserver_audio_api/group"/>
+</component>
+<component id="bluetooth_dut_mode_api" name="Bluetooth DUT Mode API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_dut_mode_api/group"/>
+</component>
+<component id="bluetooth_engine_api" name="Bluetooth Engine API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_engine_api/group"/>
+</component>
+<component id="bluetooth_engine_connection_management_api" name="Bluetooth Engine Connection Management API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_engine_connection_management_api/group"/>
+</component>
+<component id="bluetooth_engine_device_management_api" name="Bluetooth Engine Device Management API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_engine_device_management_api/group"/>
+</component>
+<component id="bluetooth_engine_discovery_api" name="Bluetooth Engine Discovery API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_engine_discovery_api/group"/>
+</component>
+<component id="bluetooth_engine_features_api" name="Bluetooth Engine Features API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_engine_features_api/group"/>
+</component>
+<component id="bluetooth_engine_settings_api" name="Bluetooth Engine Settings API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_engine_settings_api/group"/>
+</component>
+<component id="bluetooth_engine_plugin_api" name="Bluetooth Engine Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_engine_plugin_api/group"/>
+</component>
+<component id="bluetooth_local_variation_api" name="Bluetooth Local Variation API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_local_variation_api/group"/>
+</component>
+<component id="bluetooth_notifier_internal_api" name="Bluetooth Notifier internal API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_notifier_internal_api/group"/>
+</component>
+<component id="bluetooth_sap_connection_state_api" name="Bluetooth SAP Connection State API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_sap_connection_state_api/group"/>
+</component>
+<component id="bluetooth_secondary_display_notification_api" name="Bluetooth Secondary Display Notification API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_secondary_display_notification_api/group"/>
+</component>
+</collection>
+<collection id="bluetoothengine" name="Bluetooth Engine" level="framework">
+<component id="bteng" filter="s60" name="Bluetooth Engine">
+<unit bldFile="/mw/btservices/bluetoothengine/bteng/group"/>
+</component>
+<component id="btnotif" filter="s60" name="Bluetooth Notifier">
+<unit bldFile="/mw/btservices/bluetoothengine/btnotif/group"/>
+</component>
+<component id="btaudioman" filter="s60" name="Bluetooth Audio Manager">
+<unit bldFile="/mw/btservices/bluetoothengine/btaudioman/group"/>
+</component>
+<component id="btmac" filter="s60" name="Bluetooth Mono Audio Controller" class="plugin">
+<unit bldFile="/mw/btservices/bluetoothengine/btmac/group"/>
+</component>
+<component id="btsac" filter="s60" name="Bluetooth Stereo Audio Controller" class="plugin">
+<unit bldFile="/mw/btservices/bluetoothengine/btsac/group"/>
+</component>
+<component id="btaudiostreamer" filter="s60" name="Bluetooth Audio Streamer">
+<unit bldFile="/mw/btservices/bluetoothengine/btaudiostreamer/group"/>
+</component>
+<component id="btsap" filter="s60" name="Bluetooth SIM Access Profile" class="plugin">
+<unit bldFile="/mw/btservices/bluetoothengine/btsap/group"/>
+</component>
+<component id="btui" filter="s60" name="Bluetooth UI">
+<unit bldFile="/mw/btservices/bluetoothengine/btui/group"/>
+</component>
+<component id="btpbap" filter="s60" name="Bluetooth Phonebook Access Profile" class="plugin">
+<unit bldFile="/mw/btservices/bluetoothengine/btpbap/group"/>
+</component>
+<component id="bthid" filter="s60" name="Bluetooth HID">
+<unit bldFile="/mw/btservices/bluetoothengine/bthid/group"/>
+</component>
+<component id="btctrldcmoadapter" filter="s60" name="Bluetooth Control DCMO Adapter" class="plugin" introduced="^3">
+<unit bldFile="/mw/btservices/bluetoothengine/btctrldcmoadapter/group"/>
+</component>
+<component id="btserviceutil" filter="s60" name="Bluetooth Service Utils">
+<unit bldFile="/mw/btservices/bluetoothengine/btserviceutil/group"/>
+</component>
+<component id="btnotifclient" filter="s60" name="Bluetooth Notifier Client">
+<unit bldFile="/mw/btservices/bluetoothengine/btnotif/btnotifclient/group"/>
+</component>
+</collection>
+<collection id="bluetoothappprofiles" name="Bluetooth Application Profiles" level="plugin">
+<component id="avrcp" name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
+<unit bldFile="/mw/btservices/bluetoothappprofiles/avrcp" mrp="/mw/btservices/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
+</component>
+</collection>
+<collection id="atcommands" name="AT Commands" level="generic">
+<component id="modematplugin" name="Modem AT Plugin" filter="s60" class="plugin" introduced="^4">
+<unit bldFile="/mw/btservices/atcommands/modematplugin/group"/>
+</component>
+<component id="lccustomplugin" name="LC Custom Plugin" filter="s60" class="plugin" introduced="^4">
+<unit bldFile="/mw/btservices/atcommands/lccustomplugin/group"/>
+</component>
+</collection>
+<collection id="cbsatplugin" name="CBS AT Plugin">
+<component id="atmisccmdplugin" name="AT Misc Commands Plugin" filter="s60" class="plugin" introduced="^4">
+<unit bldFile="/mw/btservices/cbsatplugin/atmisccmdplugin/group"/>
+</component>
+</collection>
+<collection id="btservices_info" name="BT Services Info" level="plugin">
+<component id="btservices_metadata" name="BT Services Metadata" class="config" introduced="^3" purpose="development" target="desktop">
+<unit mrp="/mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
+</component>
+
+</collection>
+</package>
+<package id="usbservices" level="generic" tech-domain="de" name="USB Services" levels="framework server generic specific plugin">
+<collection id="usbservices_plat" name="USB Services Platform Interfaces" level="plugin">
+<component id="pictbridge_api" name="PictBridge API" class="api" filter="s60">
+<unit bldFile="/mw/usbservices/usbservices_plat/pictbridge_api/group"/>
+</component>
+<component id="ptp_responder_api" name="PTP Responder API" class="api" filter="s60">
+<unit bldFile="/mw/usbservices/usbservices_plat/ptp_responder_api/group"/>
+</component>
+<component id="ptp_transport_api" name="PTP Transport API" class="api" filter="s60">
+<unit bldFile="/mw/usbservices/usbservices_plat/ptp_transport_api/group"/>
+</component>
+<component id="usb_device_control_plugin_api" name="USB Device Control Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/usbservices/usbservices_plat/usb_device_control_plugin_api/group"/>
+</component>
+<component id="usb_notifier_api" name="USB Notifier API" class="api" filter="s60">
+<unit bldFile="/mw/usbservices/usbservices_plat/usb_notifier_api/group"/>
+</component>
+<component id="usb_personality_api_header" name="USB Personality API" class="api" filter="s60">
+<unit bldFile="/mw/usbservices/usbservices_plat/usb_personality_api_header/group"/>
+</component>
+<component id="usb_personality_plugin_api" name="USB Personality Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/usbservices/usbservices_plat/usb_personality_plugin_api/group"/>
+</component>
+<component id="usb_secondary_display_api" name="USB Secondary Display API" class="api" filter="s60">
+<unit bldFile="/mw/usbservices/usbservices_plat/usb_secondary_display_api/group"/>
+</component>
+<component id="usb_watcher_api" name="USB Watcher API" class="api" filter="s60">
+<unit bldFile="/mw/usbservices/usbservices_plat/usb_watcher_api/group"/>
+</component>
+<component id="usb_watcher_info_api_header" name="USB Watcher Info API" class="api" filter="s60">
+<unit bldFile="/mw/usbservices/usbservices_plat/usb_watcher_info_api_header/group"/>
+</component>
+</collection>
+<collection id="usbengines" name="USB Engines" level="generic">
+<component id="usbotgwatcher" filter="s60" name="USB OTG Watcher">
+<unit bldFile="/mw/usbservices/usbengines/usbotgwatcher/group"/>
+</component>
+<component id="usbwatcher" filter="s60" name="USB Watcher">
+<unit bldFile="/mw/usbservices/usbengines/usbwatcher/group"/>
+</component>
+<component id="usblocodplugin" filter="s60" name="USB Local Connectivity Domain Plugin" class="plugin">
+<unit bldFile="/mw/usbservices/usbengines/usblocodplugin/group"/>
+</component>
+<component id="usbdevcon" filter="s60" name="USB Device Control">
+<unit bldFile="/mw/usbservices/usbengines/usbdevcon/group"/>
+</component>
+<component id="usbremotepersonality" filter="s60" name="USB Remote Personality">
+<unit bldFile="/mw/usbservices/usbengines/usbremotepersonality/group"/>
+</component>
+</collection>
+<collection id="usbclasses" name="USB Classes" level="framework">
+<component id="usbobexclasscontroller" filter="s60" name="USB OBEX Class Controller" class="plugin">
+<unit bldFile="/mw/usbservices/usbclasses/usbobexclasscontroller/group"/>
+</component>
+<component id="usbbasicpersonality" filter="s60" name="USB Basic Personality" class="plugin">
+<unit bldFile="/mw/usbservices/usbclasses/usbbasicpersonality/group"/>
+</component>
+<component id="usbmscpersonality" filter="s60" name="USB MSC Personality" class="plugin">
+<unit bldFile="/mw/usbservices/usbclasses/usbmscpersonality/group"/>
+</component>
+<!-- commented out in bld.inf. Should this be deleted?
+ <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
+ <unit bldFile="usbclasses/ptpstack/group"/>
+ </component>
+ <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
+ <unit bldFile="usbclasses/sicdusbplugin/group"/>
+ </component>
+ <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
+ <unit bldFile="usbclasses/ptpserver/group"/>
+ </component>-->
+<component id="pictbridgeengine" filter="s60" name="PictBridge Engine">
+<unit bldFile="/mw/usbservices/usbclasses/pictbridgeengine/group"/>
+</component>
+<component id="usbphoneasmodem" filter="s60" name="USB Phone as Modem" introduced="^3">
+<unit bldFile="/mw/usbservices/usbclasses/usbphoneasmodem/group"/>
+</component>
+</collection>
+<collection id="usbuis" name="USB UIs" level="specific">
+<component id="usbui" filter="s60" name="USB UI">
+<unit bldFile="/mw/usbservices/usbuis/usbui/group"/>
+</component>
+<component id="usbuinotif" filter="s60" name="USB UI Notifiers">
+<unit bldFile="/mw/usbservices/usbuis/usbuinotif/group"/>
+</component>
+<component id="imageprintuiprovider" filter="s60" name="ImagePrint UI Provider" class="plugin">
+<unit bldFile="/mw/usbservices/usbuis/imageprintuiprovider/group"/>
+</component>
+<component id="usbimageprintui" filter="s60" name="ImagePrint UI">
+<unit bldFile="/mw/usbservices/usbuis/imageprintui/group"/>
+</component>
+<component id="usbuiqt" name="USB UI Qt" introduced="^4" filter="s60">
+<unit bldFile="/mw/usbservices/usbuis/usbuiqt" qt:proFile="usbapplication.pro"/>
+</component>
+</collection>
+<collection id="usbservices_test" name="USB Services Test" level="server">
+
+</collection>
+</package>
+<package id="shortlinkconn" level="generic" tech-domain="de" name="Shortlink Connectivity" levels="framework server generic specific plugin">
+<!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
+<collection id="shortlinkconn_plat" name="Shortlink Connectivity Platform Interfaces" level="plugin">
+<component id="obex_service_utils_api" name="OBEX Service Utils API" class="api" filter="s60">
+<unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/obex_service_utils_api/group"/>
+</component>
+<component id="obex_service_plugin_api" name="OBEX Service Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/obex_service_plugin_api/group"/>
+</component>
+<component id="dialup_connection_status_api" name="Dial-up Connection Status API" class="api" filter="s60">
+<unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/dialup_connection_status_api/group"/>
+</component>
+<component id="dun_secondary_display_notification_api" name="DUN Secondary Display Notification API" class="api" filter="s60">
+<unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
+</component>
+<component id="obex_secondary_display_notification_api" name="OBEX Secondary Display Notification API" class="api" filter="s60">
+<unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
+</component>
+<component id="generic_hid_api" name="Generic HID API" class="api" filter="s60">
+<unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/generic_hid_api/group"/>
+</component>
+<component id="locod_bearer_plugin_api" name="Locod Bearer Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/locod_bearer_plugin_api/group"/>
+</component>
+<component id="usb_obexservicemanager_client_api" name="USB OBEX Service Manager Client API" class="api" filter="s60">
+<unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/usb_obexservicemanager_client_api/group"/>
+</component>
+</collection>
+<collection id="localconnectivityservice" name="Local Connectivity Service" level="server">
+<component id="locod" name="Local Connectivity Daemon">
+<unit bldFile="/mw/shortlinkconn/localconnectivityservice/locod/group"/>
+</component>
+<component id="obexserviceman" name="OBEX Service Managar">
+<unit bldFile="/mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
+</component>
+<component id="obexsendservices" name="OBEX Send Services">
+<unit bldFile="/mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
+</component>
+<component id="obexreceiveservices" name="OBEX Receive Services">
+<unit bldFile="/mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
+</component>
+<component id="dun" name="Dial Up Networking">
+<unit bldFile="/mw/shortlinkconn/localconnectivityservice/dun/group"/>
+</component>
+<component id="generichid" name="Generic HID">
+<unit bldFile="/mw/shortlinkconn/localconnectivityservice/generichid/group"/>
+</component>
+<component id="headset" name="Headset">
+<unit bldFile="/mw/shortlinkconn/localconnectivityservice/headset/group"/>
+</component>
+</collection>
+</package>
+<package id="imghandling" level="specific" tech-domain="mm" name="Image Handling" levels="lib util if">
+<collection id="imagehandling_plat" name="Image Handling Platform Interfaces" level="if">
+<component id="image_handling_library_api" name="Image Handling Library API" class="api" filter="s60">
+<unit bldFile="/mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
+</component>
+<component id="3gp_library_api" name="3GP Library API" class="api" filter="s60">
+<unit bldFile="/mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
+</component>
+<component id="thumbnailmanager_api" name="Thumbnail Manager API" class="api" filter="s60">
+<unit bldFile="/mw/imghandling/imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
+
+</component>
+</collection>
+<collection id="imagehandlinglib" name="Image Handling Library" level="lib">
+<!-- collection is really a component, need to move down a directory -->
+<component id="ihl" filter="s60" name="IHL">
+<unit bldFile="/mw/imghandling/imagehandlinglib/group"/>
+</component>
+
+</collection>
+<collection id="imagehandlingutilities" name="Image Handling Utilities" level="util">
+<component id="thumbnailmanager" filter="s60" name="Thumbnail Manager">
+<unit bldFile="/mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
+</component>
+<component id="thumbnailmanagerqt" filter="s60" name="Thumbnail Manager Qt" introduced="^4">
+<unit bldFile="/mw/imghandling/imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt" qt:proFile="thumbnailmanagerqt.pro" qt:qmakeArgs="-r" filter="!test"/>
+
+</component>
+</collection>
+</package>
+<package id="metadatasrv" level="specific" tech-domain="mm" name="Legacy Metadata Services" levels="plugin framework server generic specific">
+<collection id="metadatasrv_pub" name="Legacy Metadata Services Public Interfaces" level="specific">
+<component id="media_fetch_api" name="Media Fetch API" class="api" filter="s60">
+<unit bldFile="/mw/metadatasrv/metadatasrv_pub/media_fetch_api/group"/>
+</component>
+</collection>
+<collection id="metadatasrv_plat" name="Legacy Metadata Services Platform Interfaces" level="specific">
+<component id="media_fetch_implementation_api" name="Media Fetch Implementation API" class="api" filter="s60">
+<unit bldFile="/mw/metadatasrv/metadatasrv_plat/media_fetch_implementation_api/group"/>
+</component>
+</collection>
+<collection id="mediamanagementutilities" name="Media Management Utilities" level="generic">
+<component id="mediafetch" filter="s60" name="Media Fetch">
+<unit bldFile="/mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
+</component>
+</collection>
+</package>
+<package id="mds" level="specific" tech-domain="mm" name="Metadata Services" levels="mgr eng server int">
+<collection id="mds_plat" name="Metadata Services Platform Interfaces" level="int">
+<component id="context_engine_plugin_api" name="Context Engine Plugin API" introduced="^2" class="api" filter="s60">
+<unit bldFile="/mw/mds/mds_plat/context_engine_plugin_api/group" filter="!test"/>
+
+</component>
+<component id="harvester_framework_api" name="Harvester Framework API" introduced="^2" class="api" filter="s60">
+<unit bldFile="/mw/mds/mds_plat/harvester_framework_api/group" filter="!test"/>
+
+<!-- can only have one unit with the same filter, #include the following from the previous unit -->
+
+
+
+
+
+</component>
+<component id="location_manager_api" name="Location Manager API" introduced="^2" class="api" filter="s60">
+<unit bldFile="/mw/mds/mds_plat/location_manager_api/group" filter="!test"/>
+
+</component>
+<component id="metadata_engine_api" name="Metadata Engine API" introduced="^2" class="api" filter="s60">
+<unit bldFile="/mw/mds/mds_plat/metadata_engine_api/group" filter="!test"/>
+
+</component>
+<component id="content_listing_framework_collection_manager_api" name="Content Listing Framework Collection Manager API" introduced="^2" class="api" filter="s60">
+<meta rel="config">
+<defined condition="RD_MDS_2_5"/>
+</meta>
+<unit bldFile="/mw/mds/mds_plat/content_listing_framework_collection_manager_api/group" filter="!test"/>
+
+</component>
+<component id="content_listing_framework_extended_api" name="Content Listing Framework Extended API" introduced="^2" class="api" filter="s60">
+<meta rel="config">
+<defined condition="RD_MDS_2_5"/>
+</meta>
+<unit bldFile="/mw/mds/mds_plat/content_listing_framework_extended_api/group"/>
+</component>
+</collection>
+<collection id="mds_pub" name="Metadata Services Public Interfaces" level="int">
+<component id="content_listing_framework_api" name="Content Listing Framework API" introduced="^2" class="api" filter="s60">
+<meta rel="config">
+<defined condition="RD_MDS_2_5"/>
+</meta>
+<unit bldFile="/mw/mds/mds_pub/content_listing_framework_api/group" filter="!test"/>
+
+</component>
+</collection>
+<collection id="metadataengine" name="Metadata Engine" level="eng">
+<component id="metadataengine_common" filter="s60" name="Metadata Engine Common" introduced="^2">
+<unit bldFile="/mw/mds/metadataengine/common/group"/>
+</component>
+<component id="metadataengine_server" filter="s60" name="Metadata Engine Server" introduced="^2">
+<unit bldFile="/mw/mds/metadataengine/server/group"/>
+</component>
+<component id="metadataengine_client" filter="s60" name="Metadata Engine Client" introduced="^2">
+<unit bldFile="/mw/mds/metadataengine/client/group"/>
+</component>
+<component id="metadataengine_build" filter="s60" name="Metadata Engine Build" introduced="^2">
+<!--make this collection a single component, or split this bld.inf into the other units -->
+<unit bldFile="/mw/mds/metadataengine/group"/>
+</component>
+</collection>
+<collection id="locationmanager" name="Location Manager" level="mgr">
+<component id="locationtrail" filter="s60" name="Location Trail" introduced="^2">
+<unit bldFile="/mw/mds/locationmanager/locationtrail/group"/>
+</component>
+<component id="locationmanager_server" filter="s60" name="Location Manager Server" introduced="^2">
+<unit bldFile="/mw/mds/locationmanager/server/group"/>
+</component>
+<component id="locationmanager_client" filter="s60" name="Location Manager Client" introduced="^2">
+<unit bldFile="/mw/mds/locationmanager/client/group"/>
+</component>
+<component id="locationmanager_build" filter="s60" name="Location Manager Build" introduced="^2">
+<!--make this collection a single component, or split this bld.inf into the other units -->
+<unit bldFile="/mw/mds/locationmanager/group"/>
+</component>
+</collection>
+<collection id="contextengine" name="Context Engine" level="eng">
+<component id="contextengine_plugins" filter="s60" name="Context Engine Plugins" class="plugin" introduced="^2">
+<unit bldFile="/mw/mds/contextengine/plugins/group"/>
+</component>
+<component id="contextengine_build" filter="s60" name="Context Engine Build" introduced="^2">
+<!--make this collection a single component, or make this unit self-contained -->
+<unit bldFile="/mw/mds/contextengine/group"/>
+</component>
+</collection>
+<collection id="harvester" name="Harvester" level="eng">
+<component id="blacklistclient" filter="s60" name="Blacklist Client" introduced="^2">
+<unit bldFile="/mw/mds/harvester/blacklistclient/group"/>
+</component>
+<component id="blacklistserver" filter="s60" name="Blacklist Server" introduced="^2">
+<unit bldFile="/mw/mds/harvester/blacklistserver/group"/>
+</component>
+<component id="harvester_common" filter="s60" name="Harvester Common" introduced="^2">
+<unit bldFile="/mw/mds/harvester/common/group"/>
+</component>
+<component id="composerplugins" filter="s60" name="Composer Plugins" class="plugin" introduced="^2">
+<unit bldFile="/mw/mds/harvester/composerplugins/group"/>
+</component>
+<component id="harvesterplugins" filter="s60" name="Harvester Plugins" class="plugin" introduced="^2">
+<unit bldFile="/mw/mds/harvester/harvesterplugins/group"/>
+</component>
+<component id="monitorplugins" filter="s60" name="Monitor Plugins" class="plugin" introduced="^2">
+<unit bldFile="/mw/mds/harvester/monitorplugins/group"/>
+</component>
+<component id="harvester_server" filter="s60" name="Harvester Server" introduced="^2">
+<unit bldFile="/mw/mds/harvester/server/group"/>
+</component>
+<component id="harvester_client" filter="s60" name="Harvester Client" introduced="^2">
+<unit bldFile="/mw/mds/harvester/client/group"/>
+</component>
+<component id="harvester_build" filter="s60" name="Harvester Build" introduced="^2">
+<!-- split these exports into the other components -->
+<unit bldFile="/mw/mds/harvester/group"/>
+</component>
+</collection>
+<collection id="watchdog" name="Watchdog" level="server">
+<!-- collection is really a component. Move down a directory -->
+<component id="mdswatchdog" filter="s60" name="Metadata Watchdog" introduced="^2">
+<unit bldFile="/mw/mds/watchdog/group"/>
+</component>
+</collection>
+<collection id="clfwrapper" name="Content Listing Framework Wrapper" level="int">
+<!-- collection is really a component. Move down a directory -->
+<meta rel="config">
+<defined condition="RD_MDS_2_5"/>
+</meta>
+<component id="clfwrapper_build" filter="s60" name="CLF Wrapper Build" introduced="^2">
+<!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
+<!--<unit bldFile="clfwrapper/group"/>-->
+</component>
+</collection>
+<collection id="mds_info" name="Metadata Services Info" level="int">
+<component id="mds_build" filter="s60" name="Metadata Services Build" introduced="^2">
+<!-- consider distributiing this into the rest of the components in the package -->
+<unit bldFile="/mw/mds/group"/>
+</component>
+</collection>
+</package>
+<package id="videoutils" level="specific" tech-domain="mm" name="Video Utils" levels="eng util if">
+<collection id="videoutils_plat" name="Video Utils Platform Interfaces" level="if">
+<component id="videoscheduler_api" name="Video Scheduler API" class="api" filter="s60">
+<unit bldFile="/mw/videoutils/videoutils_plat/videoscheduler_api/group"/>
+</component>
+<component id="videoplayer_constants_api" name="Videoplayer Constants API" class="api" filter="s60">
+<unit bldFile="/mw/videoutils/videoutils_plat/videoplayer_constants_api/group"/>
+</component>
+</collection>
+<collection id="videoscheduler" name="Video Scheduler" level="util">
+<!-- don't build these -->
+<component id="schedulerclient" filter="s60" name="Video Scheduler Client">
+
+</component>
+<component id="schedulerserver" filter="s60" name="Video Scheduler Server">
+
+</component>
+</collection>
+</package>
+<package id="mmmw" level="generic" tech-domain="mm" name="Multimedia Middleware" levels="plugin framework server generic specific">
+<collection id="mmmw_plat" name="Multimedia Middleware Platform Interfaces" level="specific">
+<component id="multimedia_data_source_api" name="Multimedia Data Source API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
+</component>
+<component id="progressive_download_api" name="Progressive Download API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/progressive_download_api/group"/>
+</component>
+<component id="equalizer_ui_api" name="Equalizer UI API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
+</component>
+<component id="enhanced_media_client_api" name="Enhanced Media Client API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
+</component>
+<component id="stream_control_custom_command_api" name="Stream Control Custom Command API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
+</component>
+<component id="emc_buffer_source_api" name="EMC Buffer Source API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/emc_buffer_source_api/group"/>
+</component>
+<component id="emc_file_source_api" name="EMC File Source API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
+</component>
+<component id="audio_metadata_reader_api" name="Audio MetaData Reader API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
+</component>
+<component id="emc_progressive_download_source_api" name="EMC Progressive Download Source API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
+</component>
+<component id="emc_volume_effect_api" name="EMC Volume Effect API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
+</component>
+<component id="emc_balance_effect_api" name="EMC Balance Effect API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/emc_balance_effect_api/group"/>
+</component>
+<component id="emc_descriptor_source_api" name="EMC Descriptor Source API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/emc_descriptor_source_api/group"/>
+</component>
+<component id="emc_drm_config_intfc_api" name="EMC DRM Config Intfc API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
+</component>
+<component id="voip_audio_services_api" name="VoIP Audio Services" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/voip_audio_services_api/group"/>
+</component>
+<component id="configuration_components_factory_api" name="Configuration Components Factory API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
+</component>
+<component id="audio_output_control_utility_api" name="Audio Output Control Utility API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/audio_output_control_utility_api/group"/>
+</component>
+<component id="audio_output_control_utility_proxy_api" name="Audio Output Control Utility Proxy API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
+</component>
+<component id="emc_audio_effects_api" name="EMC Audio Effects API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
+</component>
+<component id="call_audio_control_api" name="Call AudioControl API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/call_audio_control_api/group"/>
+</component>
+<component id="radio_utilities_api" name="Radio Utilities API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/radio_utilities_api/group"/>
+</component>
+<component id="radio_preset_utilities_api" name="Radio Preset Utilities API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
+</component>
+<component id="radio_monitor_api" name="Radio Monitor API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
+</component>
+<component id="thumbnail_engine_api" name="Thumbnail Engine API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/thumbnail_engine_api/group"/>
+</component>
+<component id="telephony_multimedia_service_api" name="Telephony Multimedia Service API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
+
+</component>
+<component id="openmax_al_api" name="OpenMAX AL API" class="api" filter="s60" introduced="^4">
+<unit bldFile="/mw/mmmw/mmmw_plat/openmax_al_api/group"/>
+</component>
+<component id="system_tone_service_api" name="System Tone Service API" class="api" filter="s60" introduced="^4">
+<unit bldFile="/mw/mmmw/mmmw_plat/system_tone_service_api/group"/>
+</component>
+</collection>
+<collection id="mmfenh" name="MMF Enhancements" level="generic">
+<component id="advancedaudiocontroller" filter="s60" name="Advanced Audio Controllers" class="plugin">
+<unit bldFile="/mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
+</component>
+<component id="audiooutputcontrolutility" filter="s60" name="Audio Output Control Utility">
+<unit bldFile="/mw/mmmw/mmfenh/audiooutputcontrolutility/group"/>
+</component>
+<component id="configurationcomponentsfactory" filter="s60" name="Configuration Components Factory">
+<unit bldFile="/mw/mmmw/mmfenh/configurationcomponentsfactory/group"/>
+</component>
+<component id="enhancedaudioplayerutility" filter="s60" name="Enhanced Audio Player Utility">
+<unit bldFile="/mw/mmmw/mmfenh/enhancedaudioplayerutility/group"/>
+</component>
+<component id="enhancedmediaclient" filter="s60" name="Enhanced Media Client">
+<unit bldFile="/mw/mmmw/mmfenh/enhancedmediaclient/group"/>
+</component>
+<component id="profilesettingsmonitor" filter="s60" name="Profile Settings Monitor">
+<unit bldFile="/mw/mmmw/mmfenh/profilesettingsmonitor/group"/>
+</component>
+<component id="progressivedownload" filter="s60" name="Progressive Download">
+<unit bldFile="/mw/mmmw/mmfenh/progressivedownload/group"/>
+</component>
+
+</collection>
+<collection id="mm_fw" name="Multimedia Frameworks" level="framework">
+<!-- Id needs to be unique, mmfw already in use -->
+<!-- Placeholder for OpenAX AL and other stuff -->
+</collection>
+<collection id="mmserv" name="Multimedia Services" level="specific">
+<component id="audioeffectsui" filter="s60" name="Audio Effects UI">
+<unit bldFile="/mw/mmmw/mmserv/audioeffectsui/group"/>
+</component>
+<component id="callaudiocontrol" filter="s60" name="Call Audio Control">
+<unit bldFile="/mw/mmmw/mmserv/callaudiocontrol/group"/>
+</component>
+<component id="metadatautility" filter="s60" name="Metadata Utility">
+<unit bldFile="/mw/mmmw/mmserv/metadatautility/group"/>
+</component>
+<component id="radioutility" filter="s60" name="Radio Utility">
+<unit bldFile="/mw/mmmw/mmserv/radioutility/group"/>
+</component>
+<component id="thumbnailengine" filter="s60" name="Thumbnail Engine" introduced="^2">
+<unit bldFile="/mw/mmmw/mmserv/thumbnailengine/group"/>
+</component>
+<component id="tms" filter="s60" name="Telephony Multimedia Service" introduced="^3">
+<unit bldFile="/mw/mmmw/mmserv/tms/group"/>
+</component>
+<component id="voipaudioservices" filter="s60" name="VoIP Audio Services">
+<unit bldFile="/mw/mmmw/mmserv/voipaudioservices/group"/>
+</component>
+<component id="lib3gpextparser" filter="s60" name="3GP Extension Metadata Parser Library">
+<unit bldFile="/mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group"/>
+</component>
+<component id="sts" name="System Tone Service" filter="s60" introduced="^4">
+<unit bldFile="/mw/mmmw/mmserv/sts/group"/>
+</component>
+</collection>
+<collection id="mmmw_info" name="Multimedia Middleware Info" level="specific">
+
+<component id="mmmw_metadata" name="Multimedia Middleware Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="gstreamer" level="generic" tech-domain="mm" name="GStreamer" levels="plugin core api">
+<meta rel="config">
+<defined condition="FF_GSTREAMER"/>
+</meta>
+<!-- Uncomment all units when configuration is in place. All currently #included from gstreamer_build -->
+<!-- structure matches planned directory layout -->
+<collection id="gstreamerfw" name="GStreamer Framework" level="core">
+<component id="gstreamer_core" name="GStreamer Core" introduced="^3">
+<!--<unit bldFile="gstreamer_core/group"/>-->
+</component>
+</collection>
+<collection id="gst_plugins" name="GStreamer Plugins" level="plugin">
+<component id="gst_plugins_base" name="GStreamer Base Plugins" introduced="^3">
+<!--<unit bldFile="gst_plugins_base/group"/>-->
+</component>
+<component id="gst_plugins_good" name="GStreamer Good Plugins" introduced="^3">
+<!--<unit bldFile="gst_plugins_good/group"/>-->
+</component>
+<component id="gst_plugins_symbian" filter="s60" name="GStreamer Sybmian Plugins" introduced="^3">
+<!--<unit bldFile="gst_plugins_symbian/group" filter="!test"/>-->
+<!--<unit bldFile="gst_plugins_symbian/tsrc/GStreamerTestModule/group" filter="test,pref_test"/>-->
+</component>
+</collection>
+<collection id="gstregistrygenerator" name="GStreamer Registry Generator" level="core">
+<!-- collection is really a component. Move down an directory -->
+<component id="gstregistrygenerator_build" filter="s60" name="GStreamer Registry Generator Build" introduced="^3">
+<!-- <unit bldFile="gstregistrygenerator/group"/>-->
+</component>
+</collection>
+<collection id="gst_test_apps" name="GStreamer Test Applications" level="api">
+<component id="gst_player" filter="s60" name="GStreamer Player" introduced="^3" purpose="development">
+<!-- <unit bldFile="gst_test_apps/gst_player/group"/>-->
+</component>
+</collection>
+<collection id="gstreamer_info" name="GStreamer Info" level="api">
+<component id="gstreamer_build" filter="s60" name="GStreamer Build" introduced="^3">
+<!-- make this a ROM component or split up instead? -->
+<unit bldFile="/mw/gstreamer/group"/>
+</component>
+</collection>
+</package>
+<package id="helix" level="generic" tech-domain="mm" name="Helix" levels="plugin framework server generic specific">
+<collection id="helix_ren" name="Helix Engine" level="framework">
+<!-- what does "ren" stand for? -->
+<component id="helix_stub" filter="s60" name="Helix Stub" class="api" introduced="^2">
+<unit bldFile="/mw/helix/helix_ren/helix_stub/group"/>
+</component>
+</collection>
+</package>
+<package id="camerasrv" level="specific" tech-domain="mm" name="Camera Services" levels="plugin fw api">
+<collection id="camerasrv_plat" name="Camera Services Platform Interfaces" level="api">
+<component id="media_recorder_sink_api" name="Media Recorder Sink API" class="api" filter="s60">
+<unit bldFile="/mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
+</component>
+<component id="custom_onboard_camera_api" name="Custom Onboard Camera API" class="api" filter="s60">
+<unit bldFile="/mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
+</component>
+<component id="imaging_configuration_manager_api" name="Imaging Configuration Manager API" class="api" filter="s60">
+<unit bldFile="/mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
+
+</component>
+<component id="media_recorder_api" name="Media Recorder API" class="api" filter="s60">
+<unit bldFile="/mw/camerasrv/camerasrv_plat/media_recorder_api/group" filter="!test"/>
+
+</component>
+<component id="3gp_file_composer_api" name="3GP File Composer API" class="api" filter="s60">
+<unit bldFile="/mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
+</component>
+</collection>
+<collection id="camcordermmfplugin" name="Camcorder MMF Plugin" level="plugin">
+<!-- collection is really a component. Should move down a directory -->
+<component id="camcordermmfplugin_build" filter="s60" name="Camcorder MMF Plugin Build" class="plugin">
+<unit bldFile="/mw/camerasrv/camcordermmfplugin/build"/>
+</component>
+</collection>
+<collection id="configmanagers" name="Config Managers" level="api">
+<component id="imagingconfigmanager" filter="s60" name="Imaging Config Manager">
+<unit bldFile="/mw/camerasrv/configmanagers/imagingconfigmanager/group"/>
+</component>
+</collection>
+<collection id="camerasrv_info" name="Camera Services Info" level="api">
+<component id="camerasrv_build" filter="s60" name="Camera Services Build">
+<!-- should split into individual bld.infs -->
+<unit bldFile="/mw/camerasrv/group"/>
+</component>
+</collection>
+</package>
+<package id="mmappfw" level="specific" tech-domain="mm" name="Multimedia App Framework" levels="fw utils if">
+<collection id="mmappfw_plat" name="Multimedia App Framework Platform Interfaces" level="if">
+<component id="collection_helper_api" name="Collection Helper API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
+</component>
+<component id="harvester_collection_mediator_api" name="Harvester Collection Mediator API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/group"/>
+</component>
+<component id="harvester_metadata_extractor_api" name="Harvester Metadata Extractor API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/group"/>
+</component>
+<component id="harvester_server_api" name="Harvester Server API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/harvester_server_api/group"/>
+</component>
+<component id="harvester_utility_api" name="Harvester Utility API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/harvester_utility_api/group"/>
+</component>
+<component id="playlist_engine_api" name="Playlist Engine API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/playlist_engine_api/group"/>
+</component>
+<component id="mtp_keys_api" name="MTP Keys API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mtp_keys_api/group"/>
+</component>
+<component id="mpx_collection_common_definition_api" name="MPX Collection Common Definition API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_collection_common_definition_api/group"/>
+</component>
+<component id="mpx_collection_utility_api" name="MPX Collection Utility API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/group"/>
+</component>
+<component id="mpx_common_api" name="MPX Common API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_common_api/group"/>
+</component>
+<component id="mpx_common_definition_api" name="MPX Common Definition API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_common_definition_api/group"/>
+</component>
+<component id="mpx_playback_common_definition_api" name="MPX Playback Common Definition API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_playback_common_definition_api/group"/>
+</component>
+<component id="mpx_playback_utility_api" name="MPX Playback Utility API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/group"/>
+</component>
+<component id="mpx_base_view_plugins_api" name="MPX Base View Plugins API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/group"/>
+</component>
+<component id="mpx_view_utility_api" name="MPX View Utility API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_view_utility_api/group"/>
+</component>
+<component id="mpx_albumart_utility_api" name="MPX Album Art Utility API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/group"/>
+</component>
+<component id="media_player_settings_engine_api" name="Media Player Settings Engine API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
+</component>
+<component id="mpx_backstepping_utility_api" name="MPX Backstepping Utility API" introduced="^1" class="api" filter="s60">
+<meta rel="config">
+<defined condition="IAD_INCLUDE_BACKSTEPPING"/>
+</meta>
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_backstepping_utility_api/group"/>
+</component>
+<component id="asx_parser_api" name="ASX Parser API" introduced="^1" class="api" filter="s60">
+<meta rel="config">
+<defined condition="__WINDOWS_MEDIA"/>
+</meta>
+<unit bldFile="/mw/mmappfw/mmappfw_plat/asx_parser_api/group"/>
+</component>
+<component id="playback_helper_api" name="Playback Helper API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/playback_helper_api/group"/>
+</component>
+<component id="videoplaylist_utility_api" name="Video Playlist Utility API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/videoplaylist_utility_api/group"/>
+</component>
+</collection>
+<collection id="mpx" name="Multimedia Player" level="fw">
+<component id="commonframework" filter="s60" name="MPX Common Framework" introduced="^1">
+<unit bldFile="/mw/mmappfw/mpx/commonframework/group"/>
+</component>
+<component id="playbackframework" filter="s60" name="MPX Playback Framework" introduced="^1">
+<unit bldFile="/mw/mmappfw/mpx/playbackframework/group"/>
+</component>
+<component id="mpxcollectionfw" filter="s60" name="MPX Collection Framework" introduced="^1">
+<unit bldFile="/mw/mmappfw/mpx/collectionframework/group"/>
+</component>
+<component id="mpxviewfw" filter="s60" name="MPX View Framework" introduced="^1">
+<unit bldFile="/mw/mmappfw/mpx/viewframework/group"/>
+</component>
+<component id="mpxviewframeworkqt" name="MPX View Framework Qt" filter="s60" introducde="^4">
+<unit bldFile="/mw/mmappfw/mpx/mpxviewframeworkqt" qt:proFile="mpxviewframeworkqt.pro" qt:qmakeArgs="-r -config rom"/>
+</component>
+<component id="mpx_build" filter="s60" name="MPX Build" introduced="^1">
+<!-- Move the export to another component or remove the #includes from this one -->
+<unit bldFile="/mw/mmappfw/mpx/group"/>
+</component>
+</collection>
+<collection id="mmappcomponents" name="Multimedia App Components" level="utils">
+<component id="mmappcomponents_build" filter="s60" name="Multimedia App Components Build" introduced="^1">
+<!-- needed for #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
+ Can remove this once configuration is in place-->
+<unit bldFile="/mw/mmappfw/mmappcomponents/group"/>
+</component>
+<component id="collectionhelper" filter="s60" name="Media Player Collection Helper" introduced="^1">
+<unit bldFile="/mw/mmappfw/mmappcomponents/collectionhelper/group"/>
+</component>
+<component id="playlistengine" filter="s60" name="Playlist Engine" introduced="^1">
+<unit bldFile="/mw/mmappfw/mmappcomponents/playlistengine/group"/>
+</component>
+<component id="mpxharvester" filter="s60" name="Media Player Harvester" introduced="^1">
+<unit bldFile="/mw/mmappfw/mmappcomponents/harvester/group"/>
+</component>
+<component id="mmappcommonui" filter="s60" name="Multimedia App Common UI" introduced="^1">
+<unit bldFile="/mw/mmappfw/mmappcomponents/mmappcommonui/group"/>
+</component>
+<component id="mediaplayersettingsengine" filter="s60" name="Media Player Settings Engine" introduced="^1">
+<unit bldFile="/mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
+</component>
+<component id="audiofetcher" filter="s60" name="Audio Fetcher" class="plugin" introduced="^1">
+<meta rel="config">
+<defined condition="IAD_INCLUDE_AUDIOFETCHER"/>
+</meta>
+<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
+<!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
+</component>
+<component id="asxparser" filter="s60" name="ASX Parser" introduced="^1">
+<meta rel="config">
+<defined condition="__WINDOWS_MEDIA"/>
+</meta>
+<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
+<!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
+</component>
+<component id="playbackhelper" filter="s60" name="Playback Helper" introduced="^3">
+<unit bldFile="/mw/mmappfw/mmappcomponents/playbackhelper/group"/>
+</component>
+<component id="videoplaylistutility" filter="s60" name="Video Playlist Utility" introduced="^3">
+<unit bldFile="/mw/mmappfw/mmappcomponents/videoplaylistutility/group"/>
+</component>
+<component id="mmmtpdataprovider" filter="s60" name="Multimedia MTP Data Provider" introduced="^3">
+<unit bldFile="/mw/mmappfw/mmappcomponents/mmmtpdataprovider/group"/>
+</component>
+</collection>
+<collection id="mmappfw_info" name="Multimedia App Framework Info" level="if">
+<component id="mmappfw_build" filter="s60" name="Multimedia App Framework Build" introduced="^1">
+<!-- Move the export to another component or remove the #includes from this one -->
+<unit bldFile="/mw/mmappfw/group"/>
+</component>
+<component id="mmappfw_test" filter="s60,test,api_test,pref_test" name="Multimedia App Framework Test" purpose="development" introduced="^1">
+
+</component>
+</collection>
+</package>
+<package id="hgwidgets" level="specific" tech-domain="mm" name="HG Widgets" levels="framework service api">
+<collection id="hgwidgets_plat" name="HG Widgets Platform Interfaces" level="api">
+<component id="ganeswidgets_api" name="Ganes Widgets API" class="api" introduced="^4">
+<!-- should separate out unit -->
+</component>
+</collection>
+<collection id="hgwidgets_pub" name="HG Widgets Public Interfaces" level="api"/>
+<collection id="ganeswidgets" name="Ganes Widgets" level="service">
+<!-- really a component, should move down a dir level and have a unit -->
+<component id="ganeswidgets_build" name="Ganes Widgets Build" introduced="^4">
+<!-- should separate out unit -->
+</component>
+</collection>
+<collection id="hgwidgets_info" name="HG Widgets Info" level="framework">
+<component id="hgwidgets_build" name="HG Widgets Build" introduced="^4">
+<unit bldFile="/mw/hgwidgets" qt:proFile="hgwidgets.pro"/>
+</component>
+</collection>
+</package>
+<package id="inputmethods" level="generic" tech-domain="ui" name="Input Methods" levels="plugin engine framework api">
+<collection id="inputmethods_pub" name="Input Methods Public Interfaces" level="api">
+<component id="ptiengine_iti_api" name="PTI Engine API" class="api" filter="s60">
+<meta rel="config">
+<defined condition="RD_INTELLIGENT_TEXT_INPUT"/>
+</meta>
+<unit bldFile="/mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
+</component>
+<component id="optical_character_recognition_api" name="Optical Character Recognition API" class="api" filter="s60">
+<unit bldFile="/mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
+</component>
+<component id="input_language_info_api" name="Input Language Info API" class="api" filter="s60">
+<unit bldFile="/mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
+</component>
+</collection>
+<collection id="inputmethods_plat" name="Input Methods Platform Interfaces" level="api">
+<component id="pen_input_server_api" name="Pen Input Server API" class="api" filter="s60">
+<unit bldFile="/mw/inputmethods/inputmethods_plat/pen_input_server_api/group"/>
+</component>
+<component id="ptiengine_hwr_api" name="PTI Engine Handwriting Recognition API" class="api" filter="s60">
+<unit bldFile="/mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group"/>
+</component>
+<component id="aknfep_settings_api" name="Avkon FEP Settings API" class="api" filter="s60">
+<unit bldFile="/mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
+</component>
+<component id="aknfep_status_api" name="Avkon FEP Status API" class="api" filter="s60">
+<meta rel="config">
+<defined condition="RD_INTELLIGENT_TEXT_INPUT"/>
+</meta>
+<unit bldFile="/mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
+</component>
+<component id="ptiengine_key_definations_api" name="PTI Engine Key Definitions API" class="api" filter="s60">
+<meta rel="config">
+<defined condition="RD_INTELLIGENT_TEXT_INPUT"/>
+</meta>
+<unit bldFile="/mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
+</component>
+<component id="aknfep_definitions_api" name="Avkon FEP Definitions API" class="api" filter="s60">
+<unit bldFile="/mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
+</component>
+<component id="aknfep_pen_support_api" name="Avkon FEP Pen Support API" class="api" filter="s60">
+<unit bldFile="/mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
+</component>
+<component id="ptiengine_indic_definitions_api" name="PTI Engine Indic Definitions API" class="api" filter="s60">
+<unit bldFile="/mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
+</component>
+<component id="aknfep_uiinterface_api" name="Avkon FEP UI Interface API" class="api" filter="s60">
+<unit bldFile="/mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group"/>
+</component>
+</collection>
+<collection id="textinput" name="Text Input" level="framework">
+<component id="ptienginev2" filter="s60" name="Predictive Text Input Engine">
+<meta rel="config">
+<defined condition="RD_INTELLIGENT_TEXT_INPUT"/>
+</meta>
+<!--uncomment when configuration is turned on and textinput_build is removed-->
+<!-- <unit bldFile="textinput/ptienginev2/group"/>-->
+</component>
+<component id="akninputlanguage" filter="s60" name="Avkon Input Language">
+<unit bldFile="/mw/inputmethods/textinput/akninputlanguage/group"/>
+</component>
+<component id="peninputarc" filter="s60" name="Pen Input Arc">
+<unit bldFile="/mw/inputmethods/textinput/peninputarc/group"/>
+</component>
+<component id="peninputcommonctrls" filter="s60" name="Pen Input Common Controls">
+<unit bldFile="/mw/inputmethods/textinput/peninputcommonctrls/group"/>
+</component>
+<component id="peninputcommonlayout" filter="s60" name="Pen Input Common Layout">
+<unit bldFile="/mw/inputmethods/textinput/peninputcommonlayout/group"/>
+</component>
+<component id="peninputhwrtrui" filter="s60" name="Pen Input Handwriting Recognition Training UI" class="plugin" introduced="^3">
+<unit bldFile="/mw/inputmethods/textinput/peninputhwrtrui/group"/>
+</component>
+<component id="textinput_build" filter="s60" name="Text Input Build">
+<!--needed for #ifdef, can be removed when configuration is implemented -->
+<unit bldFile="/mw/inputmethods/textinput/group"/>
+</component>
+</collection>
+<collection id="fep" name="FEP" level="engine">
+<component id="aknfep" filter="s60" name="Avkon FEP" class="plugin">
+<unit bldFile="/mw/inputmethods/fep/aknfep/group"/>
+</component>
+<component id="frontendprocessor" name="Front End Processor" purpose="mandatory">
+<unit bldFile="/mw/inputmethods/fep/frontendprocessor/group" mrp="/mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
+</component>
+</collection>
+<collection id="inputmethods_info" name="Input Methods Info" level="api">
+
+<component id="inputmethods_metadata" name="Input Methods Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="qt" level="generic" tech-domain="ui" name="Qt" levels="tool mw app">
+<collection id="qtconf" name="Qt Config" level="tool">
+<component id="qt_deviceconfiguration" name="Qt Device Configuration" class="config tool" filter="qt_tools" introduced="^2">
+<unit bldFile="/mw/qt/src/s60installs/deviceconfiguration"/>
+</component>
+</collection>
+<collection id="qt_info" name="Qt Info" level="mw">
+<component id="qt_build" name="Qt Build" introduced="^2">
+<unit bldFile="/mw/qt" qt:proFile="projects.pro" qt:qmakeArgs="-r -config sgimagelite_support"/>
+</component>
+</collection>
+<collection id="qtdemos" name="Qt Demos" level="app">
+<component id="qtdemos_build" name="Qt Demos Build" introduced="^2" filter="qtdemos">
+<unit bldFile="/mw/qt/demos" qt:proFile="demos.pro" qt:qmakeArgs="-r"/>
+</component>
+</collection>
+<collection id="qtexamples" name="Qt Examples" level="app">
+<component id="qtexamples_build" name="Qt Examples Build" introduced="^2" filter="qtexamples">
+<unit bldFile="/mw/qt/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
+</component>
+</collection>
+<collection id="qt_tests" name="Qt Tests" level="app">
+
+
+</collection>
+</package>
+<package id="qtextensions" level="generic" tech-domain="ui" name="Qt Extensions" levels="tool mw app">
+<collection id="qtecomplugins" name="Qt ECom Plugins" level="app">
+<component id="qtecomplugins_build" filter="qtecomplugins" name="Qt ECom Plugin" purpose="development" introduced="^4" class="plugin">
+<unit bldFile="/mw/qtextensions/qtecomplugins" qt:proFile="qtecomplugins.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="qtextensions_examples" filter="qtextensionsexamples" name="Qt ECom Plugin Examples" purpose="development" introduced="^4">
+<unit bldFile="/mw/qtextensions/qtecomplugins/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
+</component>
+</collection>
+<collection id="qthighway" name="Qt Highway" level="app">
+<component id="qthighway_build" filter="qthighway" name="Qt Highway" purpose="development" introduced="^4">
+<unit bldFile="/mw/qtextensions/qthighway" qt:proFile="qthighway.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="qthighway_examples" filter="qtextensionsexamples" name="Qt Highway Examples" purpose="development" introduced="^4">
+<unit bldFile="/mw/qtextensions/qthighway/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
+</component>
+
+</collection>
+<collection id="qtmobileextensions" name="Qt Mobile Extensions" level="app">
+<component id="qtmobileextensions_build" filter="qtextension" name="Qt Mobile Extensions" purpose="development" introduced="^4">
+<unit bldFile="/mw/qtextensions/qtmobileextensions" qt:proFile="qtmobileextensions.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="qtmobileextensions_examples" filter="qtextensionsexamples" name="Qt Mobile Extensions Examples" purpose="development" introduced="^4">
+<unit bldFile="/mw/qtextensions/qtmobileextensions/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
+</component>
+</collection>
+<collection id="qtmobility" name="Qt Mobility" level="mw">
+<component id="qtmobility_build" filter="qtmobility" name="Qt Mobility" purpose="development" introduced="^4">
+<unit bldFile="/mw/qtextensions/qtmobility" qt:proFile="qtmobility.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="qtmobility_examples" filter="qtextensionsexamples" name="Qt Mobility Examples" purpose="development" introduced="^4">
+<unit bldFile="/mw/qtextensions/qtmobility/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
+</component>
+
+</collection>
+<collection id="qhbstyle" level="mw" name="Qt Orbit Style">
+<component id="qhbstyle_build" name="Qt Orbit Style Build" introduced="^4">
+<unit bldFile="/mw/qtextensions/qhbstyle" qt:qmakeArgs="-r" qt:proFile="qhbstyle.pro"/>
+</component>
+</collection>
+<collection id="qtextensions_info" name="Qt Extensions Info" level="app">
+<component id="qtextensions_conf" name="Qt Extensions Confgure" class="conf" introduced="^4" filter="qt_tools">
+<unit bldFile="/mw/qtextensions/group"/>
+</component>
+<component id="qtextensions_build" name="Qt Extensions Build" introduced="^4">
+<!-- break this up into the above collections-->
+<unit bldFile="/mw/qtextensions" qt:proFile="qtextensions.pro" qt:qmakeArgs="-r"/>
+</component>
+</collection>
+</package>
+<package id="hb" level="generic" tech-domain="ui" name="Orbit" levels="engine test api">
+<collection id="hb_info" name="Orbit Info" level="api">
+<component id="hb_build" name="Orbit Build" introduced="^4">
+<!-- should break this down into actual components -->
+<unit bldFile="/mw/hb" qt:proFile="hb.pro" qt:qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
+</component>
+</collection>
+</package>
+<package id="classicui" level="generic" tech-domain="ui" name="Classic UI" levels="base support server generic specific">
+<collection id="classicui_plat" name="Classic UI Platform Interfaces" level="specific">
+<component id="personalisation_framework_api" name="Personalisation Framework API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/personalisation_framework_api/group"/>
+</component>
+<component id="signal_pane_api" name="Signal Pane API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
+
+</component>
+<component id="japanese_reading_api" name="Japanese Reading API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/japanese_reading_api/group" filter="!test"/>
+
+</component>
+<component id="global_popup_priority_controller_api" name="Global Popup Priority Controller API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
+
+</component>
+<component id="item_finder_api" name="Item Finder API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/item_finder_api/group" filter="!test"/>
+
+</component>
+<component id="avkon_fonts_api" name="Avkon Fonts API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/avkon_fonts_api/group" filter="!test"/>
+
+</component>
+<component id="extended_utilities_api" name="Extended Utilities API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
+
+</component>
+<component id="personalisation_plugin_api" name="Personalisation Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
+</component>
+<component id="extended_aiw_criteria_api" name="Extended AIW Criteria API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
+
+</component>
+<component id="personalisation_application_api" name="Personalisation Application API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/personalisation_application_api/group"/>
+</component>
+<component id="volume_popup_api" name="Volume Popup API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
+
+</component>
+<component id="avkon_secondary_display_support_api" name="AVKON Secondary Display Support API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/avkon_secondary_display_support_api/group" filter="!test"/>
+
+</component>
+<component id="extended_setting_pages_api" name="Extended Setting Pages API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_setting_pages_api/group" filter="!test"/>
+
+</component>
+<component id="extended_lists_api" name="Extended Lists API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_lists_api/group" filter="!test"/>
+
+</component>
+<component id="input_block_api" name="Input Block API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/input_block_api/group" filter="!test"/>
+
+</component>
+<component id="avkon_ui_server_api" name="AVKON UI Server API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/avkon_ui_server_api/group" filter="!test"/>
+
+</component>
+<component id="number_grouping_api" name="Number Grouping API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/number_grouping_api/group" filter="!test"/>
+
+</component>
+<component id="extended_status_pane_api" name="Extended Status Pane API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_status_pane_api/group" filter="!test"/>
+
+</component>
+<component id="extended_notifiers_api" name="Extended Notifiers API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_notifiers_api/group" filter="!test"/>
+
+</component>
+<component id="task_list_api" name="Task List API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
+
+</component>
+<component id="personalisation_slide_show_dialog_api" name="Personalisation Slide Show Dialog API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
+</component>
+<component id="key_event_utilities_api" name="Key Event Utilities API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/key_event_utilities_api/group"/>
+</component>
+<component id="emergency_call_support_api" name="Emergency Call Support API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/emergency_call_support_api/group" filter="!test"/>
+
+</component>
+<component id="extended_dialogs_api" name="Extended Dialogs API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_dialogs_api/group"/>
+</component>
+<component id="legacy_ui_framework_headers_api" name="Legacy UI Framework Headers API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/legacy_ui_framework_headers_api/group"/>
+</component>
+<component id="extended_editors_api" name="Extended Editors API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_editors_api/group" filter="!test"/>
+
+</component>
+<component id="alarm_api" name="Alarm API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/alarm_api/group" filter="!test"/>
+
+</component>
+<component id="aiw_service_interface_base_api" name="AIW Service Interface Base API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/aiw_service_interface_base_api/group" filter="!test"/>
+
+</component>
+<component id="list_effects_api" name="List Effects API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/list_effects_api/group" filter="!test"/>
+
+</component>
+<component id="find_item_ui_api" name="Find Item UI API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/find_item_ui_api/group" filter="!test"/>
+
+</component>
+<component id="server_application_services_api" name="Server Application Services API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/server_application_services_api/group" filter="!test"/>
+
+</component>
+<component id="common_ui_settings_api" name="Common UI Settings API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/common_ui_settings_api/group"/>
+</component>
+<component id="aiw_service_interface_menu_api" name="AIW Service Interface Menu API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/aiw_service_interface_menu_api/group" filter="!test"/>
+
+</component>
+<component id="eikon_server_extension_client_api" name="EIKON Server Extension Client API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/eikon_server_extension_client_api/group" filter="!test"/>
+
+</component>
+<component id="skinnable_clock_api" name="Skinnable Clock API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/skinnable_clock_api/group" filter="!test"/>
+
+</component>
+<component id="battery_pane_api" name="Battery Pane API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/battery_pane_api/group" filter="!test"/>
+
+</component>
+<component id="fep_document_navigation_api" name="FEP Document Navigation API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
+</component>
+<component id="personalisation_localised_texts_api" name="Personalisation Localised Texts API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
+</component>
+<component id="memory_card_ui_api" name="Memory Card UI API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
+
+</component>
+<component id="avkon_status_api" name="AVKON Status API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/avkon_status_api/group"/>
+</component>
+<component id="application_switching_api" name="Application Switching API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/application_switching_api/group" filter="!test"/>
+
+</component>
+<component id="avkon_localised_texts_api" name="AVKON Localised Texts API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/avkon_localised_texts_api/group"/>
+</component>
+<component id="avkon_secondary_display_api" name="AVKON Secondary Display API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/avkon_secondary_display_api/group"/>
+</component>
+<component id="extended_animation_api" name="Extended Animation API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_animation_api/group" filter="!test"/>
+
+</component>
+<component id="extended_notes_api" name="Extended Notes API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_notes_api/group" filter="!test"/>
+
+</component>
+<component id="text_scroller_api" name="Text Scroller API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/text_scroller_api/group" filter="!test"/>
+
+</component>
+<component id="custom_cursors_api" name="Custom Cursors API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/custom_cursors_api/group" filter="!test"/>
+
+</component>
+<component id="global_window_priorities_api" name="Global Window Priorities API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/global_window_priorities_api/group"/>
+</component>
+<component id="extended_indicators_api" name="Extended Indicators API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_indicators_api/group" filter="!test"/>
+
+</component>
+<component id="special_character_table_api" name="Special Character Table API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/special_character_table_api/group" filter="!test"/>
+
+</component>
+<component id="avkon_settings_api" name="AVKON Settings API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/avkon_settings_api/group"/>
+</component>
+<component id="extended_sounds_api" name="Extended Sounds API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_sounds_api/group"/>
+</component>
+<component id="themes_settings_api" name="Themes Settings API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/themes_settings_api/group"/>
+</component>
+<component id="media_shared_document_api" name="Media Shared Document API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/media_shared_document_api/group" filter="!test"/>
+
+</component>
+<component id="extended_queries_api" name="Extended Queries API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_queries_api/group"/>
+</component>
+<component id="phone_number_text_utilities_api" name="Phone Number Text Utilities API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
+
+</component>
+<component id="extended_scroller_api" name="Extended Scroller API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_scroller_api/group"/>
+</component>
+<component id="key_rotator_api" name="Key Rotator API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/key_rotator_api/group" filter="!test"/>
+
+</component>
+<component id="extended_grids_api" name="Extended Grids API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_grids_api/group" filter="!test"/>
+
+</component>
+<component id="generic_parameter_api" name="Generic Parameter API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/generic_parameter_api/group" filter="!test"/>
+
+</component>
+<component id="indicator_touch_observer_api" name="Indicator Touch Observer API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/indicator_touch_observer_api/group"/>
+</component>
+<component id="popup_form_api" name="Popup Form API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/popup_form_api/group" filter="!test"/>
+
+</component>
+<component id="stylus_activated_popup_api" name="Stylus Activated Pop-up API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/stylus_activated_popup_api/group" filter="!test"/>
+
+</component>
+<component id="indicator_plugin_api" name="Indicator Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/indicator_plugin_api/group" filter="!test"/>
+
+</component>
+<component id="layout_configuration_api" name="Layout Configuration API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/layout_configuration_api/group" filter="!test"/>
+
+</component>
+<component id="common_file_dialogs_filter_factory_api" name="Common File Dialogs Filter Factory API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group" filter="!test"/>
+
+</component>
+<component id="avkon_anim_dll_api" name="AVKON Anim DLL API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/avkon_anim_dll_api/group"/>
+</component>
+<component id="extended_initialization_api" name="Extended Initialization API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_initialization_api/group" filter="!test"/>
+
+</component>
+<component id="long_tap_animation_api" name="Long Tap Animation API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/long_tap_animation_api/group" filter="!test"/>
+
+</component>
+<component id="extended_ui_framework_definitions_api" name="Extended UI Framework Definitions API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_ui_framework_definitions_api/group"/>
+</component>
+<component id="extended_buttons_api" name="Extended Buttons API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_buttons_api/group" filter="!test"/>
+
+</component>
+<component id="aiw_provider_utility_api" name="AIW Provider Utility API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/aiw_provider_utility_api/group" filter="!test"/>
+
+</component>
+<component id="transition_effect_parameters_api" name="Transition Effect Parameters API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/transition_effect_parameters_api/group" filter="!test"/>
+
+</component>
+<component id="extended_input_capabilities_api" name="Extended Input Capabilities API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_input_capabilities_api/group" filter="!test"/>
+
+</component>
+<component id="uikon_status_api" name="UIKON Status API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/uikon_status_api/group"/>
+</component>
+<component id="transition_effect_utilities_api" name="Transition Effect Utilities API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/transition_effect_utilities_api/group" filter="!test"/>
+
+</component>
+<component id="pointer_event_modifier_api" name="Pointer Event Modifier API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/pointer_event_modifier_api/group" filter="!test"/>
+
+</component>
+<component id="avkon_testability_api" name="AVKON Testability API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/avkon_testability_api/group"/>
+</component>
+<component id="ganes_api" name="ganes_api" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/ganes_api/group"/>
+</component>
+<component id="ode_api" name="Ode API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/ode_api/group"/>
+</component>
+<component id="physics_api" name="Physics API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/physics_api/group"/>
+</component>
+<component id="touch_pane_api" name="Touch Pane API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/touch_pane_api/group" filter="!test"/>
+
+</component>
+<component id="touch_pane_observer_api" name="Touch Pane Observer API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/touch_pane_observer_api/group"/>
+</component>
+<component id="alternate_fs_api" name="Alternate FS API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/alternate_fs_api/group"/>
+</component>
+<component id="discreet_popup_api" name="Discreet Popup API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/discreet_popup_api/group"/>
+</component>
+<component id="touch_gesture_framework_api" name="Touch Gesture Framework API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/touch_gesture_framework_api/group"/>
+<!-- should this be commented out? -->
+<!--<unit bldFile="classicui_plat/touch_gesture_framework_api/tsrc/group" filter="test,api_test"/> -->
+</component>
+<component id="extended_options_menu_api" name="Extended Options Menu API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
+
+</component>
+</collection>
+<collection id="classicui_pub" name="Classic UI Public Interfaces" level="specific">
+<component id="input_frame_api" name="Input Frame API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/input_frame_api/group" filter="!test"/>
+
+</component>
+<component id="window_server_event_observer_api" name="Window Server Event Observer API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/window_server_event_observer_api/group" filter="!test"/>
+
+</component>
+<component id="application_framework_api" name="Application Framework API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/application_framework_api/group" filter="!test"/>
+
+</component>
+<component id="scroller_api" name="Scroller API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/scroller_api/group" filter="!test"/>
+
+</component>
+<component id="ui_framework_utilities_api" name="UI Framework Utilities API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/ui_framework_utilities_api/group" filter="!test"/>
+
+</component>
+<component id="ui_framework_definitions_api" name="UI Framework Definitions API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/ui_framework_definitions_api/group" filter="!test"/>
+
+</component>
+<component id="buttons_api" name="Buttons API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/buttons_api/group" filter="!test"/>
+
+</component>
+<component id="queries_api" name="Queries API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/queries_api/group" filter="!test"/>
+
+</component>
+<component id="aiw_generic_parameter_api" name="AIW Generic Parameter API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/aiw_generic_parameter_api/group" filter="!test"/>
+
+</component>
+<component id="editors_api" name="Editors API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/editors_api/group" filter="!test"/>
+
+</component>
+<component id="common_file_dialogs_api" name="Common File Dialogs API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/common_file_dialogs_api/group" filter="!test"/>
+
+</component>
+<component id="dialog_shutter_api" name="Dialog Shutter API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/dialog_shutter_api/group" filter="!test"/>
+
+</component>
+<component id="fonts_api" name="Fonts API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/fonts_api/group" filter="!test"/>
+
+</component>
+<component id="screen_clearer_api" name="Screen Clearer API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/screen_clearer_api/group" filter="!test"/>
+
+</component>
+<component id="notifiers_api" name="Notifiers API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/notifiers_api/group" filter="!test"/>
+
+</component>
+<component id="notes_api" name="Notes API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/notes_api/group" filter="!test"/>
+
+</component>
+<component id="status_pane_api" name="Status Pane API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/status_pane_api/group" filter="!test"/>
+
+</component>
+<component id="base_controls_api" name="Base Controls API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/base_controls_api/group" filter="!test"/>
+
+</component>
+<component id="grids_api" name="Grids API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/grids_api/group" filter="!test"/>
+
+</component>
+<component id="context_pane_api" name="Context Pane API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/context_pane_api/group" filter="!test"/>
+
+</component>
+<component id="lists_api" name="Lists API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/lists_api/group" filter="!test"/>
+
+</component>
+<component id="popups_api" name="Popups API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/popups_api/group" filter="!test"/>
+
+</component>
+<component id="misc_controls_api" name="Misc Controls API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/misc_controls_api/group" filter="!test"/>
+
+</component>
+<component id="keylock_api" name="Keylock API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/keylock_api/group" filter="!test"/>
+
+</component>
+<component id="options_menu_api" name="Options Menu API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/options_menu_api/group" filter="!test"/>
+
+</component>
+<component id="hierarchical_lists_api" name="Hierarchical Lists API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/hierarchical_lists_api/group" filter="!test"/>
+
+</component>
+<component id="navigation_pane_api" name="Navigation Pane API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/navigation_pane_api/group" filter="!test"/>
+
+</component>
+<component id="tabs_api" name="Tabs API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/tabs_api/group" filter="!test"/>
+
+</component>
+<component id="title_pane_touch_observer_api" name="Title Pane Touch Observer API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/title_pane_touch_observer_api/group"/>
+</component>
+<component id="choice_list_api" name="Choice List API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/choice_list_api/group" filter="!test"/>
+
+</component>
+<component id="info_popup_note_api" name="Info Popup Note API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/info_popup_note_api/group" filter="!test"/>
+
+</component>
+<component id="setting_pages_api" name="Setting Pages API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/setting_pages_api/group" filter="!test"/>
+
+</component>
+<component id="screen_mode_api" name="Screen Mode API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/screen_mode_api/group" filter="!test"/>
+
+</component>
+<component id="indicators_api" name="Indicators API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/indicators_api/group" filter="!test"/>
+
+</component>
+<component id="error_ui_api" name="Error UI API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/error_ui_api/group" filter="!test"/>
+
+</component>
+<component id="animation_api" name="Animation API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/animation_api/group" filter="!test"/>
+
+</component>
+<component id="searchfield_api" name="Searchfield API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/searchfield_api/group" filter="!test"/>
+
+</component>
+<component id="labels_api" name="Labels API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/labels_api/group" filter="!test"/>
+
+</component>
+<component id="hotkeys_api" name="Hotkeys API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/hotkeys_api/group" filter="!test"/>
+
+</component>
+<component id="initialization_api" name="Initialization API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/initialization_api/group" filter="!test"/>
+
+</component>
+<component id="volume_control_api" name="Volume Control API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/volume_control_api/group" filter="!test"/>
+
+</component>
+<component id="title_pane_api" name="Title Pane API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/title_pane_api/group" filter="!test"/>
+
+</component>
+<component id="sounds_api" name="Sounds API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/sounds_api/group" filter="!test"/>
+
+</component>
+<component id="aiw_service_handler_api" name="AIW Service Handler API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/aiw_service_handler_api/group" filter="!test"/>
+
+</component>
+<component id="aiw_criteria_api" name="AIW Criteria API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/aiw_criteria_api/group" filter="!test"/>
+
+</component>
+<component id="touch_ui_utilities_api" name="Touch UI Utilities API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/touch_ui_utilities_api/group" filter="!test"/>
+
+</component>
+<component id="generic_button_api" name="Generic Button API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/generic_button_api/group" filter="!test"/>
+
+</component>
+<component id="form_api" name="Form API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/form_api/group" filter="!test"/>
+
+</component>
+<component id="uikon_core_controls" name="Uikon Core Controls" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/uikon_core_controls/group" filter="!test"/>
+
+</component>
+<component id="calendar_api" name="Calendar API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/calendar_api/group"/>
+</component>
+<component id="toolbar_api" name="Toolbar API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/toolbar_api/group" filter="!test"/>
+
+</component>
+<component id="server_application_api" name="Server Application API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/server_application_api/group"/>
+</component>
+<component id="slider_api" name="Slider API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/slider_api/group" filter="!test"/>
+
+</component>
+<component id="private_ui_framework_api" name="Private UI Framework API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/private_ui_framework_api/group" filter="!test"/>
+
+</component>
+<component id="dialogs_api" name="Dialogs API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/dialogs_api/group" filter="!test"/>
+
+</component>
+<component id="document_handler_api" name="Document handler API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/document_handler_api/group"/>
+</component>
+<component id="images_api" name="Images API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/images_api/group" filter="!test"/>
+
+</component>
+<component id="stylus_popup_menu_api" name="Stylus Pop-up Menu API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/stylus_popup_menu_api/group" filter="!test"/>
+
+</component>
+<component id="information_preview_popup_api" name="Information Preview Popup API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/information_preview_popup_api/group" filter="!test"/>
+
+</component>
+<component id="intermediate_state_api" name="Intermediate State API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/intermediate_state_api/group"/>
+</component>
+<component id="help_launcher_api" name="Help Launcher API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/help_launcher_api/group"/>
+</component>
+</collection>
+<collection id="ode" name="Open Dynamics Engine" level="support">
+<!-- the collection is really a component. Move down a directory.-->
+<component id="ode_build" filter="s60" name="ODE">
+<unit bldFile="/mw/classicui/ode/group"/>
+</component>
+</collection>
+<collection id="uifw" name="UI Framework" level="server">
+<component id="uiklaf" filter="s60" name="Uikon Look-and-Feel">
+<unit bldFile="/mw/classicui/uifw/uiklaf/group"/>
+</component>
+<component id="eikctl" filter="s60" name="Eikon Controls">
+<unit bldFile="/mw/classicui/uifw/eikctl/group"/>
+</component>
+<component id="avkon" filter="s60" name="Avkon">
+<!-- can only have one unit. Split into 3 components, or #include all from same bld.inf -->
+<unit bldFile="/mw/classicui/uifw/avkon/aknphysics/group"/>
+<unit bldFile="/mw/classicui/uifw/avkon/group"/>
+<unit bldFile="/mw/classicui/uifw/avkon/aknconf/group"/>
+</component>
+<component id="eikstd" filter="s60" name="Eikon Standard">
+<unit bldFile="/mw/classicui/uifw/eikstd/group"/>
+</component>
+<component id="aknglobalui" filter="s60" name="Avkon Global UI">
+<unit bldFile="/mw/classicui/uifw/aknglobalui/group"/>
+</component>
+<component id="ganes" filter="s60" name="Ganes">
+<unit bldFile="/mw/classicui/uifw/ganes/group"/>
+</component>
+</collection>
+<collection id="commonuis" name="Common UIs" level="specific">
+<component id="commonui" filter="s60" name="Common UI">
+<unit bldFile="/mw/classicui/commonuis/commonui/group"/>
+</component>
+<component id="commondialogs" filter="s60" name="Common Dialogs">
+<unit bldFile="/mw/classicui/commonuis/commondialogs/group"/>
+</component>
+</collection>
+<collection id="applicationinterworkingfw" name="Application Interworking Framework" level="generic">
+<component id="aifwservicehandler" filter="s60" name="Application Interworking Service Handler">
+<unit bldFile="/mw/classicui/applicationinterworkingfw/servicehandler/group"/>
+</component>
+</collection>
+<collection id="psln" name="Personalization" level="specific">
+<!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
+<component id="psln_build" filter="s60" name="Personalization Build">
+<unit bldFile="/mw/classicui/psln/group"/>
+</component>
+</collection>
+<collection id="commonadapter" name="Common Adapter" level="support">
+<!-- the collection is really a component. Move down a directory.-->
+<component id="commonadapter_build" filter="s60" name="Common Adapter Build">
+<unit bldFile="/mw/classicui/commonadapter/group"/>
+</component>
+</collection>
+<collection id="akntouchgesturefw" name="Avkon Touch Gesture Framework" level="generic">
+<!-- the collection is really a component. Move down a directory.-->
+<component id="akntouchgesturefw_build" filter="s60" name="Avkon Touch Gesture Framework Build" introduced="^3">
+<unit bldFile="/mw/classicui/akntouchgesturefw/group"/>
+</component>
+</collection>
+<collection id="uiutils" name="UI Utils" level="specific">
+<component id="localizer" filter="s60" name="Directory Localizer">
+<unit bldFile="/mw/classicui/uiutils/localizer/group"/>
+</component>
+<component id="findutil" filter="s60" name="Find Utility">
+<unit bldFile="/mw/classicui/uiutils/findutil/group"/>
+</component>
+<component id="gamerecognizer" filter="s60" name="Game Recognizer" class="plugin">
+<unit bldFile="/mw/classicui/uiutils/gamerecognizer/group"/>
+</component>
+<component id="aknjapanesereading" filter="s60" name="Avkon Japanese Reading">
+<unit bldFile="/mw/classicui/uiutils/aknjapanesereading/group"/>
+</component>
+<component id="hlplch" name="Help Launcher" filter="s60,bldfirst">
+<unit bldFile="/mw/classicui/uiutils/hlplch/group"/>
+</component>
+</collection>
+<collection id="commonuisupport" name="Common UI Support" level="support">
+<component id="uikon" name="Uikon" introduced="6.0" purpose="mandatory">
+<unit bldFile="/mw/classicui/commonuisupport/uikon/group" mrp="/mw/classicui/commonuisupport/uikon/group/app-framework_uikon.mrp"/>
+</component>
+<component id="errorresolverdata" name="Error Resolver Data" purpose="mandatory">
+<unit bldFile="/mw/classicui/commonuisupport/errorresolverdata/group" mrp="/mw/classicui/commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
+</component>
+<component id="uilaf" name="UI Look and Feel" introduced="6.0" purpose="mandatory">
+<unit bldFile="/mw/classicui/commonuisupport/uilaf/GROUP" mrp="/mw/classicui/commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
+</component>
+<component id="grid" name="Grid" purpose="optional">
+<unit bldFile="/mw/classicui/commonuisupport/grid/group" mrp="/mw/classicui/commonuisupport/grid/group/app-framework_grid.mrp"/>
+</component>
+<component id="uifwsdocs" name="UI Frameworks Documentation" purpose="development" class="doc">
+<unit mrp="/mw/classicui/commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
+</component>
+</collection>
+<collection id="lafagnosticuifoundation" name="Look-and-Feel Agnostic UI Foundation" level="base">
+<component id="cone" name="Control Environment" purpose="mandatory">
+<unit bldFile="/mw/classicui/lafagnosticuifoundation/cone/group" mrp="/mw/classicui/lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
+</component>
+<component id="graphicseffects" name="Graphics Effects" introduced="9.2" purpose="optional">
+<unit bldFile="/mw/classicui/lafagnosticuifoundation/graphicseffects/group" mrp="/mw/classicui/lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
+</component>
+<component id="uigraphicsutils" name="UI Graphics Utilities" purpose="mandatory">
+<unit bldFile="/mw/classicui/lafagnosticuifoundation/uigraphicsutils/group" mrp="/mw/classicui/lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
+</component>
+<component id="clockanim" name="Clock" purpose="optional" class="plugin">
+<unit bldFile="/mw/classicui/lafagnosticuifoundation/clockanim/group" mrp="/mw/classicui/lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
+</component>
+<component id="bmpanimation" name="BMP Animation" introduced="6.0" purpose="optional">
+<unit bldFile="/mw/classicui/lafagnosticuifoundation/bmpanimation/group" mrp="/mw/classicui/lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
+</component>
+<component id="animation" name="Animation" introduced="9.1" purpose="optional">
+<unit bldFile="/mw/classicui/lafagnosticuifoundation/animation/group" mrp="/mw/classicui/lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
+</component>
+</collection>
+<collection id="classicui_info" name="Classic UI Info" level="specific">
+<!-- the multiple units in the API test components need to be resolved -->
+
+<component id="classicui_metadata" name="Classic UI Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/mw/classicui/classicui_info/classicui_metadata/classicui_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="svgt" level="generic" tech-domain="ui" name="SVG Tiny" levels="util ui">
+<collection id="svgt_plat" name="SVG Tiny Platform Interfaces" level="ui">
+<component id="svgt_api" name="SVGT API" introduced="9.2" class="api" filter="s60">
+<unit bldFile="/mw/svgt/svgt_plat/svgt_api/group"/>
+</component>
+<component id="nvg_api" name="NVG API" introduced="9.2" class="api" filter="s60">
+<unit bldFile="/mw/svgt/svgt_plat/nvg_api/group"/>
+</component>
+</collection>
+<collection id="svgtopt" name="SVG-T Engine" level="util">
+<component id="svgtopt_build" filter="s60" name="SVG Engine" introduced="9.2">
+<!-- component is at collection level. Needs to be moved down a directory -->
+<unit bldFile="/mw/svgt/svgtopt/group"/>
+</component>
+<component id="svgtplugin" filter="s60" name="SVG Plugin" class="plugin" introduced="9.2">
+<unit bldFile="/mw/svgt/svgtopt/svgtplugin/group"/>
+</component>
+</collection>
+</package>
+<package id="uiaccelerator" level="generic" tech-domain="ui" name="UI Accelerator" levels="plugin framework server ex if">
+<collection id="uiaccelerator_plat" name="UI Accelerator Platform Interfaces" level="if">
+<component id="alf_core_toolkit_api" name="ALF Core Toolkit API" class="api" filter="s60">
+<unit bldFile="/mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/group"/>
+</component>
+<component id="alf_visual_api" name="ALF Visual API" class="api" filter="s60">
+<unit bldFile="/mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/group"/>
+</component>
+<component id="alf_extended_visual_api" name="ALF Extended Visual API" class="api" filter="s60">
+<unit bldFile="/mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/group"/>
+</component>
+<component id="alf_extension_api" name="ALF Extension API" class="api" filter="s60">
+<unit bldFile="/mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/group"/>
+</component>
+<component id="alf_tracing_api" name="ALF Tracing API" class="api" filter="s60">
+<unit bldFile="/mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/group"/>
+</component>
+<component id="alf_client_server_api" name="ALF Client Server API" class="api" filter="s60">
+<unit bldFile="/mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/group"/>
+</component>
+</collection>
+<collection id="uiacceltk" name="UI Accelerator Toolkit" level="framework">
+<component id="hitchcock" filter="s60" name="Hitchcock">
+<unit bldFile="/mw/uiaccelerator/uiacceltk/hitchcock/group"/>
+</component>
+<component id="uiacceltk_build" filter="s60" name="UI Accelerator Toolkit Build">
+<!-- move into the other component, or remove the #include and make this UI Accelerator Toolkit ROM-->
+<unit bldFile="/mw/uiaccelerator/uiacceltk/group"/>
+</component>
+</collection>
+<collection id="uiaccelerator_test" name="UI Accelerator Test" level="ex">
+
+</collection>
+</package>
+<package id="uiresources" level="generic" tech-domain="ui" name="UI Resources" levels="compile plugin framework server generic data">
+<!-- are the custom filters below needed? -->
+<collection id="uiresources_pub" name="UI Resources Public Interfaces" level="data">
+<component id="pictograph_api" name="Pictograph API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_pub/pictograph_api/group" filter="!test"/>
+
+</component>
+<component id="skins_api" name="Skins API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_pub/skins_api/group" filter="!test"/>
+
+</component>
+<component id="font_definition_api" name="Font Definition API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_pub/font_definition_api/group" filter="!test"/>
+
+</component>
+<component id="graphics_api" name="Graphics API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_pub/graphics_api/group" filter="!test"/>
+
+</component>
+<component id="scalable_icons_api" name="Scalable Icons API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_pub/scalable_icons_api/group"/>
+</component>
+<component id="layout_id_definitions_api" name="Layout ID Definitions API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_pub/layout_id_definitions_api/group"/>
+</component>
+</collection>
+<collection id="uiresources_plat" name="UI Resources Platform Interfaces" level="data">
+<component id="layout_system_private_api" name="Layout System Private API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/layout_system_private_api/group" filter="!test"/>
+
+</component>
+<component id="layout_data_api" name="Layout Data API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/layout_data_api/group" filter="!test"/>
+
+</component>
+<component id="cdl_api" name="CDL API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/cdl_api/group" filter="!test"/>
+
+</component>
+<component id="extended_skins_api" name="Extended Skins API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/extended_skins_api/group" filter="!test"/>
+
+</component>
+<component id="tfx_server_controller_plugin_api" name="TFX Server Controller Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/tfx_server_controller_plugin_api/group"/>
+</component>
+<component id="extended_fonts_api" name="Extended Fonts API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/extended_fonts_api/group" filter="!test"/>
+
+</component>
+<component id="graphic_configuration_api" name="Graphic Configuration API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/graphic_configuration_api/group" filter="!test"/>
+
+</component>
+<component id="mif_header_cdl_api" name="MIF Header CDL API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/mif_header_cdl_api/group"/>
+</component>
+<component id="personalisation_and_skins_settings_api" name="Personalisation and Skins Settings API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/personalisation_and_skins_settings_api/group"/>
+</component>
+<component id="tfx_effect_setup_plugin_api" name="TFX Effect Setup Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/tfx_effect_setup_plugin_api/group"/>
+</component>
+<component id="mifconv_definitions_api" name="Mifconv Definitions API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/mifconv_definitions_api/group"/>
+</component>
+<component id="wallpaper_configuration_api" name="Wallpaper Configuration API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/wallpaper_configuration_api/group"/>
+</component>
+<component id="language_code_definitions_api" name="Language Code Definitions API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/language_code_definitions_api/group"/>
+</component>
+<component id="skins_image_attributes_api" name="Skins Image Attributes API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
+
+</component>
+<component id="private_user_area_code_definitions_api" name="Private User Area Code Definitions API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/private_user_area_code_definitions_api/group"/>
+</component>
+<component id="tfx_server_plugin_ids_api" name="TFX Server Plug-in IDs API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/tfx_server_plugin_ids_api/group"/>
+</component>
+</collection>
+<collection id="uiresources_info" name="UI Resources Info" level="data">
+<component id="uiresources_test" filter="s60,test,api_test" name="UI Resources Tests" purpose="development">
+
+</component>
+</collection>
+<collection id="uigraphics" name="UI Graphics" level="generic">
+<component id="bitmaps2" filter="s60" name="Bitmaps 2" class="config">
+<unit bldFile="/mw/uiresources/uigraphics/bitmaps2/group"/>
+</component>
+<component id="icons" filter="s60" class="config" name="Icons">
+<unit bldFile="/mw/uiresources/uigraphics/icons/group"/>
+</component>
+<component id="variatedbitmaps" filter="s60" name="Variated Bitmaps" class="config">
+<unit bldFile="/mw/uiresources/uigraphics/variatedbitmaps/group"/>
+</component>
+<component id="aknicon" filter="s60" name="Avkon Icon Framework">
+<unit bldFile="/mw/uiresources/uigraphics/aknicon/group"/>
+</component>
+<component id="nvgrenderstage" filter="sf_build" name="NVG Render Stage">
+<unit bldFile="/mw/uiresources/uigraphics/nvgrenderstage/group"/>
+</component>
+</collection>
+<collection id="layouts" name="Layouts" level="plugin">
+<component id="cdl" filter="s60" name="Customization Definition Language">
+<!-- can only have one unit. Need to #include them or split into multiple components -->
+<unit bldFile="/mw/uiresources/layouts/cdl/cdlengine/group"/>
+<unit bldFile="/mw/uiresources/layouts/cdl/cdlserver/group"/>
+</component>
+<component id="aknlayout2" filter="s60" name="Avkon Layout 2">
+<unit bldFile="/mw/uiresources/layouts/aknlayout2/group"/>
+</component>
+</collection>
+<collection id="skins" name="Skins" level="data">
+<component id="aknskincontent" filter="s60" name="Avkon Skin Content" class="config">
+<unit bldFile="/mw/uiresources/skins/aknskincontent/group"/>
+</component>
+<component id="aknskins" filter="s60" name="Avkon Skin Compiler">
+<unit bldFile="/mw/uiresources/skins/aknskins/group"/>
+</component>
+</collection>
+<collection id="pictographs" name="Pictographs" level="data">
+<component id="aknpictograph" filter="s60" name="Avkon Pictograph">
+<unit bldFile="/mw/uiresources/pictographs/aknpictograph/group"/>
+</component>
+</collection>
+<collection id="locales" name="Locales" level="framework">
+<component id="locales_build" filter="s60" name="Locales Build">
+<unit bldFile="/mw/uiresources/locales/loce32"/>
+</component>
+</collection>
+<collection id="uiconfig" name="UI Config" level="server">
+<component id="s60config" filter="s60" name="S60 UI Config">
+<unit bldFile="/mw/uiresources/uiconfig/s60config/group"/>
+</component>
+</collection>
+<collection id="fontsupport" name="Font Support" level="generic">
+<component id="fontprovider" filter="s60" name="Font Provider">
+<unit bldFile="/mw/uiresources/fontsupport/fontprovider/group"/>
+</component>
+<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
+ <component id="s60_fonts" filter="s60" name="S60 Fonts">
+ <unit bldFile="fontsupport/fontutils/group"/>
+ </component>
+-->
+<component id="fontutils" filter="sf_build" name="Font Utils">
+<unit bldFile="/mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
+</component>
+</collection>
+<collection id="helpthemes" name="Help Themes" level="data">
+<!-- collection is really a component. Need to move down a directory -->
+<component id="helpthemes_build" filter="s60" name="Help Themes Build" class="config">
+<unit bldFile="/mw/uiresources/helpthemes/group"/>
+</component>
+</collection>
+</package>
+<package id="hapticsservices" level="generic" tech-domain="ui" name="Haptics Services" levels="fw server api">
+<collection id="hapticsservices_plat" name="Haptics Services Platform Interfaces" level="api">
+<component id="tacticon_api" name="Tacticon API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/hapticsservices/hapticsservices_plat/tacticon_api/group"/>
+</component>
+<component id="tactile_feedback_core_api" name="Tactile Feedback Core API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/hapticsservices/hapticsservices_plat/tactile_feedback_core_api/group"/>
+</component>
+<component id="tactile_feedback_server_api" name="Tactile Feedback Server API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/hapticsservices/hapticsservices_plat/tactile_feedback_server_api/group"/>
+</component>
+</collection>
+<collection id="hapticsservices_pub" name="Haptics Services Public Interfaces" level="api">
+<component id="tactile_feedback_client_api" name="Tactile Feedback Client API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/hapticsservices/hapticsservices_pub/tactile_feedback_client_api/group"/>
+</component>
+</collection>
+<collection id="tacticonserver" name="Tacticon Server" level="server">
+<!-- collection is really a component. Move down a directory -->
+<component id="tacticonserver_build" filter="s60" name="Tacticon Server Build" introduced="^3">
+<unit bldFile="/mw/hapticsservices/tacticonserver/group"/>
+<!-- clients and servers are suauly the same component. Consider moving pluign to a separate component if needed -->
+</component>
+</collection>
+<collection id="tactilefeedback" name="Tactile Feedback" level="fw">
+<component id="tactilearearegistry" filter="s60" name="Tactile Area Registry" introduced="^1">
+<unit bldFile="/mw/hapticsservices/tactilefeedback/tactilearearegistry/group"/>
+</component>
+<component id="tactilefeedbackresolver" filter="s60" name="Tactile Feedback Resolver" introduced="^1">
+<unit bldFile="/mw/hapticsservices/tactilefeedback/tactilefeedbackresolver/group"/>
+</component>
+<component id="tactileclickplugin" filter="s60" name="Tactile Click Plugin" class="plugin" introduced="^1">
+<unit bldFile="/mw/hapticsservices/tactilefeedback/tactileclickplugin/group"/>
+</component>
+<component id="tactilefeedbackclient" filter="s60" name="Tactile Feedback Client" introduced="^1">
+<unit bldFile="/mw/hapticsservices/tactilefeedback/tactilefeedbackclient/group"/>
+</component>
+<component id="tactileactionplugin" filter="s60" name="Tactile Action Plugin" class="plugin" introduced="^1">
+<unit bldFile="/mw/hapticsservices/tactilefeedback/tactileactionplugin/group"/>
+</component>
+<component id="tactilefeedback_build" filter="s60" name="Tactile Feedback Build" introduced="^1">
+<!-- consider moving IBY to one fo the above components -->
+<unit bldFile="/mw/hapticsservices/tactilefeedback/group"/>
+</component>
+</collection>
+</package>
+<package id="platformthemes" level="specific" tech-domain="ui" name="Platform Themes" levels="framework generic ui">
+<collection id="platformthemes_info" name="Platform Themes Info">
+<component id="platformthemes_build" name="Platform Themes Build">
+<!-- no real structure in this package. Should break into collections / components -->
+<unit bldFile="/mw/platformthemes" qt:proFile="platformthemes.pro"/>
+</component>
+</collection>
+</package>
+<package id="gsprofilesrv" level="generic" tech-domain="ui" name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
+<collection id="gsprofilesrv_pub" name="GS and Profiles Services Public Interfaces" level="specific">
+<component id="profiles_engine_active_profile_settings_api" name="Profiles Engine Active Profile Settings API" class="api" filter="s60">
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_active_profile_settings_api/group"/>
+</component>
+<component id="profiles_engine_wrapper_api" name="Profiles Engine Wrapper API" class="api" filter="s60">
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_wrapper_api/group"/>
+</component>
+</collection>
+<collection id="gsprofilesrv_plat" name="GS and Profiles Services Platform Interfaces" level="specific">
+<component id="ftuwizardmodel_api" name="FTU Wizard Model API" filter="bldfirst,s60" class="api">
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/ftuwizardmodel_api" qt:proFile="ftuwizardmodel_api.pro" qt:qmakeArgs="-r -config rom"/>
+</component>
+<component id="profiles_engine_api" name="Profiles Engine API" class="api" filter="s60">
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/profiles_engine_api/group"/>
+</component>
+<component id="settings_backgroundimage_api" name="Settings Background Image API" class="api" filter="s60">
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_backgroundimage_api/group"/>
+</component>
+<component id="settings_framework_api" name="Settings Framework API" class="api" filter="s60">
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_framework_api/group"/>
+</component>
+<component id="settings_launch_api" name="Settings Launch API" class="api" filter="s60">
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_launch_api/group"/>
+</component>
+<component id="settings_listbox_api" name="Settings List Box API" class="api" filter="s60">
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_listbox_api/group"/>
+</component>
+<component id="settings_plugin_api" name="Settings Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_plugin_api/group"/>
+</component>
+<component id="settings_uis_cenrep_collection_api" name="Settings UIs CenRep Collection API" class="api" filter="s60">
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
+</component>
+</collection>
+<collection id="gssettingsuis" name="General Settings UIs" level="framework">
+<component id="gs" filter="s60" name="General Settings" introduced="9.2">
+<unit bldFile="/mw/gsprofilesrv/gssettingsuis/gs/group"/>
+</component>
+</collection>
+<collection id="ftuwizardmodel" name="FTU Wizard Model" level="generic">
+<component id="ftuwizardmodel_build" name="FTU Wizardmodel Build" filter="bldfirst">
+<unit bldFile="/mw/gsprofilesrv/ftuwizardmodel" qt:proFile="ftuwizardmodel.pro" qt:qmakeArgs="-r -config rom"/>
+</component>
+</collection>
+<collection id="controlpanel" name="Control Panel" level="generic">
+
+<component id="controlpanel_rom" name="Control Panel ROM" filter="s60">
+<unit bldFile="/mw/gsprofilesrv/controlpanel/rom" qt:proFile="cp_rom.pri" qt:qmakeArgs="-r -config rom"/>
+</component>
+<component id="controlpanel_source" name="Control Panel Source" filter="s60">
+<unit bldFile="/mw/gsprofilesrv/controlpanel/src" qt:qmakeArgs="-r -config rom" qt:proFile="src.pro"/>
+</component>
+</collection>
+<collection id="profilesservices" name="Profiles Services" level="server">
+<component id="profileengine" filter="s60" name="Profile Engine" introduced="9.1">
+<unit bldFile="/mw/gsprofilesrv/profilesservices/profileengine/group"/>
+</component>
+</collection>
+</package>
+<package id="homescreensrv" level="specific" tech-domain="ui" name="Home Screen Services" levels="plugin framework server generic specific">
+<collection id="appfoundation" name="App Foundation" level="generic">
+<component id="appfoundation_build" name="App Foundation Build" introduced="^4">
+<unit bldFile="/mw/homescreensrv/appfoundation" qt:qmakeArgs="-r" qt:proFile="appfoundation.pro"/>
+</component>
+</collection>
+<collection id="hswidgetmodel" name="Home Screen Widget Model" level="framework">
+<component id="hswidgetmodel_build" name="Home Screen Widget Model Build" introduced="^4">
+<unit bldFile="/mw/homescreensrv/hswidgetmodel" qt:qmakeArgs="-r" qt:proFile="hswidgetmodel.pro"/>
+</component>
+</collection>
+<collection id="contentstorage" name="Content Storage" level="framework">
+<component id="cautils" name="Content Arsenal Utils" introduced="^4">
+<unit bldFile="/mw/homescreensrv/contentstorage/cautils" qt:qmakeArgs="-r" qt:proFile="cautils.pro"/>
+</component>
+<component id="contentstorage_build" name="Content Storage Build" introduced="^4">
+<unit bldFile="/mw/homescreensrv/contentstorage/group" qt:qmakeArgs="-r" qt:proFile="group.pro"/>
+</component>
+<component id="casrv/calocalizerscanner" name="Content Arsenal Server Localizer Scanner" introduced="^4">
+<unit bldFile="/mw/homescreensrv/contentstorage/casrv/calocalizerscanner" qt:qmakeArgs="-r" qt:proFile="calocalizerscanner.pro"/>
+</component>
+<component id="cahandler" name="Content Arsenal Handler" introduced="^4">
+<unit bldFile="/mw/homescreensrv/contentstorage/cahandler" qt:qmakeArgs="-r" qt:proFile="cahandler.pro"/>
+</component>
+<component id="caclient" name="Content Arsenal Client" introduced="^4">
+<unit bldFile="/mw/homescreensrv/contentstorage/caclient" qt:qmakeArgs="-r" qt:proFile="caclient.pro"/>
+</component>
+</collection>
+<collection id="homescreensrv_plat" name="Home Screen Services Platform Interfaces" level="specific">
+<component id="homescreensrv_plat_build" name="Home Screen Services Platform Interfaces build" introduced="^4">
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat" qt:qmakeArgs="-r" qt:proFile="homescreensrv_plat.pro"/>
+</component>
+<component id="action_handler_plugin_api" name="Action Handler Plugin API" class="api" filter="s60">
+<unit base="/mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api"/>
+</component>
+<component id="content_harvester_plugin_api" name="Content Harvester Plugin API" class="api" filter="s60">
+<unit base="/mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api"/>
+</component>
+<component id="sapi_contentpublishing" name="SAPI Content Publishing" class="api" filter="s60">
+<unit base="/mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing"/>
+</component>
+<component id="sapi_actionhandler" name="SAPI Action Handler" class="api" filter="s60">
+<unit base="/mw/homescreensrv/homescreensrv_plat/sapi_actionhandler"/>
+</component>
+<component id="menu_sat_interface_api" name="Menu SAT Interface API" class="api" filter="s60">
+<unit base="/mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api"/>
+</component>
+<component id="appruntimemodel_api" name="Appliction Run-Time Model API" class="api" filter="s60" introduced="^4">
+<unit base="/mw/homescreensrv/homescreensrv_plat/appruntimemodel_api"/>
+</component>
+<component id="contentstorage_api" name="Content Storage API" class="api" filter="s60" introduced="^4">
+<unit base="/mw/homescreensrv/homescreensrv_plat/contentstorage_api"/>
+</component>
+<component id="hswidgetmodel_api" name="HS Widget Model API" class="api" filter="s60" introduced="^4">
+<unit base="/mw/homescreensrv/homescreensrv_plat/hswidgetmodel_api"/>
+</component>
+<component id="statemodel_api" name="State Model API" class="api" filter="s60" introduced="^4">
+<unit base="/mw/homescreensrv/homescreensrv_plat/statemodel_api"/>
+</component>
+<component id="homescreen_information_api" name="Homescreen Information API" class="api" filter="s60" introduced="^4">
+<unit base="/mw/homescreensrv/homescreensrv_plat/homescreen_information_api"/>
+</component>
+</collection>
+<collection id="hsactivityfw" name="Activity Framework" level="activityfw">
+<component id="hsactivityfw_build" name="Activity Framework Build" introduced="^4">
+<unit bldFile="/mw/homescreensrv/activityfw" qt:qmakeArgs="-r" qt:proFile="activityfw.pro"/>
+</component>
+</collection>
+<collection id="hsappkeyhandler" name="HS Appplication Key Handler" level="server">
+<component id="hsappkeyhandler_build" name="Appplication Key Handler Build" introduced="^4">
+<unit bldFile="/mw/homescreensrv/hsappkeyhandler" qt:qmakeArgs="-r" qt:proFile="hsappkeyhandler.pro"/>
+</component>
+</collection>
+<collection id="homescreensrv_info" name="Home Screen Services Info" level="specific">
+<component id="homescreensrvconf" name="Home Screen Services Config" class="config" introduced="^4">
+<unit bldFile="/mw/homescreensrv" qt:qmakeArgs="-r" qt:proFile="homescreensrv.pro"/>
+</component>
+<component id="homescreensrvrom" name="Home Screen Services ROM" introduced="^4">
+<unit bldFile="/mw/homescreensrv/group"/>
+</component>
+
+</collection>
+</package>
+<package id="homescreensrvlegacy" level="generic" tech-domain="ui" name="Legacy Home Screen Services" levels="plugin framework server generic specific">
+<collection id="homescreensrvlegacy_plat" name="Legacy Home Screen Services Platform Interfaces" level="specific">
+<component id="ai_content_model_api" name="AI Content Model API" class="api" filter="s60">
+<unit bldFile="/mw/homescreensrvlegacy/ai_content_model_api/group" qt:proFile="group.pro"/>
+</component>
+<component id="ai_plugin_information_api" name="AI Plug-in Information API" class="api" filter="s60">
+<unit bldFile="/mw/homescreensrvlegacy/ai_plugin_information_api/group" qt:proFile="group.pro"/>
+</component>
+</collection>
+</package>
+<package id="appinstall" level="generic" tech-domain="rt" name="Application Installation" levels="tool framework generic api">
+<collection id="appinstall_plat" name="Application Installation Platform Interfaces" level="api">
+<component id="iaupdate_api" name="IA Update API" class="api" filter="s60">
+<unit bldFile="/mw/appinstall/appinstall_plat/iaupdate_api/group"/>
+</component>
+<component id="task_plugin_api" name="Task Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/appinstall/appinstall_plat/task_plugin_api/group"/>
+</component>
+<component id="sw_installer_common_ui_api" name="SW Installer Common UI API" class="api" filter="s60">
+<unit bldFile="/mw/appinstall/appinstall_plat/sw_installer_common_ui_api/group"/>
+</component>
+<component id="sw_installer_launcher_api" name="SW Installer Launcher API" class="api" filter="s60">
+<unit bldFile="/mw/appinstall/appinstall_plat/sw_installer_launcher_api/group"/>
+</component>
+<component id="task_management_api" name="Task Management API" class="api" filter="s60">
+<unit bldFile="/mw/appinstall/appinstall_plat/task_management_api/group"/>
+</component>
+<component id="sw_installer_ui_plugin_api" name="SW Installer UI Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/appinstall/appinstall_plat/sw_installer_ui_plugin_api/group"/>
+</component>
+<component id="sw_installer_cr_keys" name="SW Installer CR Keys" class="api" filter="s60">
+<unit bldFile="/mw/appinstall/appinstall_plat/sw_installer_cr_keys/group"/>
+</component>
+<component id="sw_installer_ps_keys" name="SW Installer PS Keys" class="api" filter="s60">
+<unit bldFile="/mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
+</component>
+<component id="appmngr2runtimeapi" name="Application Manager 2 Runtime Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
+</component>
+<component id="sifui_api" name="STIF UI API" class="api" filter="s60">
+<unit bldFile="/mw/appinstall/appinstall_plat/sifui_api/group"/>
+</component>
+</collection>
+<collection id="appinstall_pub" name="Application Installation Public Interfaces" level="api">
+<component id="startup_list_management_api" name="Startup List Management API" class="api" filter="s60">
+<unit bldFile="/mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
+</component>
+</collection>
+<collection id="ncdengine" name="Nokia Content Discover" level="framework">
+<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
+<component id="ncdengine_engine" filter="s60" name="NCD Engine" introduced="^1">
+<unit bldFile="/mw/appinstall/ncdengine/engine/group"/>
+</component>
+<component id="debuglogger" filter="s60" name="NCD Debug Logger" introduced="^1">
+<!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
+</component>
+<component id="ncdengine_build" filter="s60" name="NCD Build" introduced="^1">
+<unit bldFile="/mw/appinstall/ncdengine/group"/>
+</component>
+</collection>
+<collection id="appinstaller" name="Application Installer" level="generic">
+<component id="appinstui" filter="s60" name="Application Installer UI" introduced="^2">
+<unit bldFile="/mw/appinstall/appinstaller/appinstui/group"/>
+</component>
+</collection>
+<collection id="iaupdateapi_stub" name="IA Update API Stub" level="api">
+<!-- the collection is really a component. Move down a directory.-->
+<component id="iaupdateapi_stub_build" name="IA Update API Stub Build" filter="s60" introduced="^2">
+<unit bldFile="/mw/appinstall/iaupdateapi_stub/group"/>
+</component>
+</collection>
+<collection id="iaupdate" name="Independent Apps Update" level="api">
+<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
+<component id="iad" name="Software Update" filter="s60" introduced="^2">
+<unit bldFile="/mw/appinstall/iaupdate/iad/group"/>
+</component>
+<component id="iaupdate_help" filter="s60" name="IA Update Help" introduced="^2">
+<unit bldFile="/mw/appinstall/iaupdate/help/group"/>
+</component>
+<component id="iaupdate_build" filter="s60" name="IA Update Build" introduced="^2">
+<unit bldFile="/mw/appinstall/iaupdate/group"/>
+</component>
+</collection>
+<collection id="installationservices" name="Installation Services" level="generic">
+<component id="swi" name="Secure Software Install" purpose="optional">
+<unit bldFile="/mw/appinstall/installationservices/swi/group" mrp="/mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
+</component>
+<component id="swidevicetools" name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
+<unit bldFile="/mw/appinstall/installationservices/swidevicetools/group" mrp="/mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
+</component>
+<component id="swcomponentregistry" name="Software Component Registry" introduced="^4" purpose="mandatory">
+<unit bldFile="/mw/appinstall/installationservices/swcomponentregistry/group" mrp="/mw/appinstall/installationservices/swcomponentregistry/group/security_softwarecomponentregistry.mrp"/>
+</component>
+<component id="swinstallationfw" name="Software Installation Framework" introduced="^4" purpose="optional">
+<unit bldFile="/mw/appinstall/installationservices/swinstallationfw/group" mrp="/mw/appinstall/installationservices/swinstallationfw/group/security_softwareinstallframework.mrp"/>
+</component>
+<component id="swtransactionservices" name="Software Transaction Services" introduced="^4" purpose="optional">
+<unit bldFile="/mw/appinstall/installationservices/swtransactionservices/group" mrp="/mw/appinstall/installationservices/swtransactionservices/group/security_softwaretransactionservices.mrp"/>
+</component>
+<component id="refswinstallationplugin" name="Reference Software Installation Plugin" introduced="^4" purpose="development" class="plugin">
+<unit bldFile="/mw/appinstall/installationservices/refswinstallationplugin/group" mrp="/mw/appinstall/installationservices/refswinstallationplugin/group/security_sifrefplugin.mrp"/>
+</component>
+<component id="refsoftwareappmgr" name="Reference Software Application Manager" introduced="^4" purpose="development">
+<unit bldFile="/mw/appinstall/installationservices/refsoftwareappmgr/group" mrp="/mw/appinstall/installationservices/refsoftwareappmgr/group/security_referenceapplicationmanager.mrp"/>
+</component>
+
+<component id="swiconfig" name="Software Install Config" introduced="9.1" purpose="optional" class="config">
+<unit bldFile="/mw/appinstall/installationservices/swiconfig/group" mrp="/mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
+</component>
+</collection>
+<collection id="secureswitools" name="Secure Software Install Tools" level="tool">
+<component id="makekeys" name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" target="desktop">
+<unit bldFile="/mw/appinstall/secureswitools/makekeys/group" mrp="/mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
+</component>
+<component id="swianalysistoolkit" name="SWI Analysis Toolkit" purpose="development" target="desktop">
+<unit bldFile="/mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="/mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
+</component>
+<component id="openssllib" name="OpenSSL Library" purpose="optional" target="desktop">
+<unit mrp="/mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
+</component>
+<component id="swisistools" name="Secure Software Install SIS Tools" purpose="optional" target="desktop">
+<unit bldFile="/mw/appinstall/secureswitools/swisistools/group" mrp="/mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
+</component>
+</collection>
+<collection id="appinstall_info" name="Application Installation Info" level="api">
+
+
+<component id="appinstall_metadata" name="Application Installation Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="serviceapifw" level="specific" tech-domain="rt" name="Service API Framework" levels="plugin framework server generic specific">
+<collection id="serviceapifw_pub" name="Service API Framework Public Interfaces" level="specific"/>
+<collection id="serviceapifw_plat" name="Service API Framework Platform Interfaces" level="specific">
+<component id="rtsecuritymanager_common_api" name="Runtime Security Manager Common API" class="api" filter="s60">
+<unit bldFile="/mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/group"/>
+</component>
+<component id="rtsecuritymanager_utility_api" name="Runtime Security Manager Utility API" class="api" filter="s60">
+<unit bldFile="/mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
+</component>
+<component id="rtsecuritymanager_client_api" name="Runtime Security Manager Client API" class="api" filter="s60">
+<unit bldFile="/mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/group"/>
+</component>
+<component id="liw_provider_utility_api" name="LIW Provider Utility API" class="api" filter="s60">
+<unit bldFile="/mw/serviceapifw/serviceapifw_plat/liw_provider_utility_api/group"/>
+</component>
+<component id="liw_service_interface_base_api" name="LIW Service Interface Base API" class="api" filter="s60">
+<unit bldFile="/mw/serviceapifw/serviceapifw_plat/liw_service_interface_base_api/group"/>
+</component>
+<component id="liw_service_interface_menu_api" name="LIW Service Interface Menu API" class="api" filter="s60">
+<unit bldFile="/mw/serviceapifw/serviceapifw_plat/liw_service_interface_menu_api/group"/>
+</component>
+<component id="liw_criteria_api" name="LIW Criteria API" class="api" filter="s60">
+<unit bldFile="/mw/serviceapifw/serviceapifw_plat/liw_criteria_api/group"/>
+</component>
+<component id="liw_generic_parameter_api" name="LIW Generic Parameter API" class="api" filter="s60">
+<unit bldFile="/mw/serviceapifw/serviceapifw_plat/liw_generic_parameter_api/group"/>
+</component>
+<component id="liw_service_handler_api" name="LIW Service Handler API" class="api" filter="s60">
+<unit bldFile="/mw/serviceapifw/serviceapifw_plat/liw_service_handler_api/group"/>
+</component>
+</collection>
+<collection id="rtsecuritymanager" name="Runtime Security Manager" level="server">
+<component id="rtsecuritymanagerutil" filter="s60" name="Runtime Security Manager Util">
+<unit bldFile="/mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
+</component>
+<component id="rtsecuritymanagerserver" filter="s60" name="Runtime Security Manager Server">
+<unit bldFile="/mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/>
+</component>
+<component id="rtsecuritymanagerclient" filter="s60" name="Runtime Security Manager Client">
+<unit bldFile="/mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/>
+</component>
+<component id="rtsecuritymanager_build" filter="s60" name="Runtime Security Manager Build">
+<!-- Move the export to the appropriate components, or make this a ROM component by removing the #includes -->
+<unit bldFile="/mw/serviceapifw/rtsecuritymanager/group"/>
+</component>
+</collection>
+<collection id="languageinterworkingfw" name="Language Interworking Framework" level="framework">
+<component id="lifwservicehandler" filter="s60" name="Service Handler">
+<unit bldFile="/mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
+</component>
+</collection>
+</package>
+<package id="serviceapi" level="specific" tech-domain="rt" name="Service API" levels="os mw1 mw2 app">
+<!-- should break up this collection into something meaningful -->
+<collection id="serviceproviders" name="Service Providers" level="mw1">
+<component id="sapi_contacts_vpbk" name="Contacts Phonebook SAPI" filter="s60" class="plugin">
+<unit bldFile="/mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
+</component>
+<component id="sapi_location" name="Location SAPI" filter="s60" class="plugin">
+<unit bldFile="/mw/serviceapi/serviceproviders/sapi_location/group"/>
+</component>
+<component id="sapi_mediamanagement" name="Media Management SAPI" filter="s60" class="plugin">
+<unit bldFile="/mw/serviceapi/serviceproviders/sapi_mediamanagement/group"/>
+</component>
+<component id="sapi_landmarks" name="Landmarks SAPI" filter="s60" class="plugin">
+<unit bldFile="/mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
+</component>
+<component id="sapi_messaging" name="Messaging SAPI" filter="s60" class="plugin">
+<unit bldFile="/mw/serviceapi/serviceproviders/sapi_messaging/group"/>
+</component>
+<component id="sapi_applicationmanager" name="Application Manager SAPI" filter="s60" class="plugin">
+<unit bldFile="/mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
+</component>
+<component id="sapi_calendar" name="Calendar SAPI" filter="s60" class="plugin">
+<unit bldFile="/mw/serviceapi/serviceproviders/sapi_calendar/group"/>
+</component>
+<component id="sapi_logging" name="Logging SAPI" filter="s60" class="plugin">
+<unit bldFile="/mw/serviceapi/serviceproviders/sapi_logging/group"/>
+</component>
+<component id="sapi_sensor" name="Sensor SAPI" filter="s60" class="plugin">
+<unit bldFile="/mw/serviceapi/serviceproviders/sapi_sensor/group"/>
+</component>
+<component id="sapi_sysinfo" name="Sysinfo SAPI" filter="s60" class="plugin">
+<unit bldFile="/mw/serviceapi/serviceproviders/sapi_sysinfo/group"/>
+</component>
+<component id="sapi_serviceregistry" name="Service Registry SAPI" filter="s60" class="plugin">
+<unit bldFile="/mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
+</component>
+<component id="jsapi" name="Javascript API" filter="s60" class="plugin">
+<unit bldFile="/mw/serviceapi/serviceproviders/jsapi/group"/>
+</component>
+<component id="serviceproviders_build" filter="s60" name="Service API Build">
+<!-- distribute the exports or make this a ROM component by removing the #includes -->
+<unit bldFile="/mw/serviceapi/serviceproviders/group"/>
+</component>
+</collection>
+</package>
+<package id="browser" level="specific" tech-domain="rt" name="Browser" levels="plugin utils support main">
+<collection id="bookmarksengine" name="Bookmarks Engine" level="support">
+<component id="bookmarksengine_build" name="Bookmarks Engine Build" introduced="^4">
+<unit bldFile="/mw/browser/bookmarksengine" qt:proFile="bookmarksengine.pro" qt:qmakeArgs=""what+=plat_101""/>
+</component>
+</collection>
+</package>
+<package id="web" level="specific" tech-domain="rt" name="Web" levels="plugin utils server generic specific">
+<collection id="web_pub" name="Web Public Interfaces" level="specific">
+<component id="browser_control_api" name="Browser Control API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_pub/browser_control_api/group"/>
+</component>
+<component id="download_mgr_client_api" name="Download Manager Client API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_pub/download_mgr_client_api/group"/>
+</component>
+<component id="download_mgr_ui_api" name="Download Manager UI Library API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_pub/download_mgr_ui_api/group"/>
+</component>
+<component id="favourites_engine_api" name="Favourites Engine API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_pub/favourites_engine_api/group"/>
+</component>
+<component id="browser_plugin_api" name="Browser Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_pub/browser_plugin_api/group"/>
+</component>
+<component id="settings_api" name="Settings API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_pub/settings_api/group"/>
+</component>
+</collection>
+<collection id="web_plat" name="Web Platform Interfaces" level="specific">
+<component id="aiw_browser_provider_api" name="AIW Browser Provider API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/aiw_browser_provider_api/group"/>
+</component>
+<component id="browser_dialogs_provider_api" name="Browser Dialogs Provider API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/browser_dialogs_provider_api/group"/>
+</component>
+<component id="browser_platform_api" name="Browser Platform API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/browser_platform_api/group"/>
+</component>
+<component id="cod_handler_api" name="COD Handler API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/cod_handler_api/group"/>
+</component>
+<component id="connection_manager_api" name="Connection Manager API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/connection_manager_api/group"/>
+</component>
+<component id="cxml_library_api" name="cXml Library API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/cxml_library_api/group"/>
+</component>
+<component id="download_mgr_client_api_extn" name="Download Manager Client API Extension" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/download_mgr_client_api_extn/group"/>
+</component>
+<component id="feeds_engine_api" name="Feeds Engine API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/feeds_engine_api/group"/>
+</component>
+<component id="launcher_api" name="Launcher API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/launcher_api/group"/>
+</component>
+<component id="multipart_parser_api" name="Multipart Parser API" class="api" filter="s60">
+<meta rel="config">
+<defined condition="BRDO_MULTIPART_PARSER_FF"/>
+</meta>
+<unit bldFile="/mw/web/web_plat/multipart_parser_api/group"/>
+</component>
+<component id="recent_url_store_api" name="Recent URL Store API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/recent_url_store_api/group"/>
+</component>
+<component id="rt_gesturehelper_api" name="Runtime Gesture Helper API" class="api" filter="s60" introduced="^4">
+<unit bldFile="/mw/web/web_plat/rt_gesturehelper_api/group"/>
+</component>
+<component id="scheme_handler_plugin_api" name="Scheme Handler Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/scheme_handler_plugin_api/group"/>
+</component>
+<component id="scriptable_plugin_api" name="Scriptable Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/scriptable_plugin_api/group"/>
+</component>
+<component id="webutils_api" name="Web Utils API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/webutils_api/group"/>
+</component>
+<component id="widget_registry_api" name="Widget Registry API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/widget_registry_api/group"/>
+</component>
+<component id="xml_parser_api" name="XML Parser API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/xml_parser_api/group"/>
+</component>
+</collection>
+<collection id="web_info" name="Web Info" level="specific">
+<component id="web_build" filter="s60" name="Web Build">
+<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
+<unit bldFile="/mw/web/group"/>
+</component>
+</collection>
+<collection id="browserutilities" name="Browser Utilities" level="utils">
+<component id="browserdialogsprovider" filter="s60" name="Browser Dialogs Provider">
+<unit bldFile="/mw/web/browserutilities/browserdialogsprovider/group"/>
+</component>
+<component id="recenturlstore" filter="s60" name="Recent URL Store">
+<unit bldFile="/mw/web/browserutilities/recenturlstore/group"/>
+</component>
+<component id="xmlparser" filter="s60" name="XML Interface">
+<unit bldFile="/mw/web/browserutilities/xmlparser/group"/>
+</component>
+<component id="cxmllibrary" filter="s60" name="XML Parser Implementation">
+<unit bldFile="/mw/web/browserutilities/cxmllibrary/group"/>
+</component>
+<component id="downloadmgr" filter="s60" name="Download Manager">
+<unit bldFile="/mw/web/browserutilities/downloadmgr/group"/>
+</component>
+<component id="connectionmanager" filter="s60" name="Connection Manager">
+<unit bldFile="/mw/web/browserutilities/connectionmanager/group"/>
+</component>
+<component id="browsertelservice" filter="s60" name="Browser Telephony Service">
+<unit bldFile="/mw/web/browserutilities/browsertelservice/group"/>
+</component>
+<component id="favouritesengine" filter="s60" name="Favourites Engine">
+<unit bldFile="/mw/web/browserutilities/favouritesengine/group"/>
+</component>
+<component id="feedsengine" filter="s60" name="Feeds Engine">
+<unit bldFile="/mw/web/browserutilities/feedsengine/group"/>
+</component>
+<component id="multipartparser" filter="s60" name="Multipart Parser">
+<meta rel="config">
+<defined condition="BRDO_MULTIPART_PARSER_FF"/>
+</meta>
+<!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
+<!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
+</component>
+<component id="schemehandler" filter="s60" name="Scheme Handler">
+<unit bldFile="/mw/web/browserutilities/schemehandler/group"/>
+</component>
+<component id="webutils" filter="s60" name="Web Utils">
+<unit bldFile="/mw/web/browserutilities/webutils/group"/>
+</component>
+<component id="aiwbrowserprovider" filter="s60" name="AIW Browser Provider" class="plugin">
+<unit bldFile="/mw/web/browserutilities/aiwbrowserprovider/group"/>
+</component>
+<component id="browserutilities_build" filter="s60" name="Browser Utilities Build">
+<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
+<unit bldFile="/mw/web/browserutilities/group"/>
+</component>
+</collection>
+<collection id="webengine" name="Web Engine" level="server">
+<component id="osswebengine" filter="s60" name="OSS Web Engine">
+<!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
+<unit bldFile="/mw/web/webengine/osswebengine/cache/group"/>
+<unit bldFile="/mw/web/webengine/osswebengine/memorymanager/group"/>
+<unit bldFile="/mw/web/webengine/osswebengine/npscript/group"/>
+<unit bldFile="/mw/web/webengine/osswebengine/webkit/s60/group"/>
+<unit bldFile="/mw/web/webengine/osswebengine/webkit/s60/group/javascriptcore"/>
+</component>
+<component id="webkitutils" filter="s60" name="WebKit Utils">
+<unit bldFile="/mw/web/webengine/webkitutils/group"/>
+</component>
+<component id="pagescaler" filter="s60" name="Page Scaler">
+<unit bldFile="/mw/web/webengine/pagescaler/group"/>
+</component>
+<component id="webwidgetinstaller" filter="s60" name="Widget Installer">
+<unit bldFile="/mw/web/webengine/widgetinstaller/group"/>
+</component>
+<component id="widgetregistry" filter="s60" name="Widget Registry">
+<unit bldFile="/mw/web/webengine/widgetregistry/group"/>
+</component>
+<component id="wmlengine" filter="s60" name="WML Engine">
+<unit bldFile="/mw/web/webengine/wmlengine/group"/>
+</component>
+<component id="device" filter="s60" name="Device">
+<!-- this needs a more meaningful name -->
+<unit bldFile="/mw/web/webengine/device/group"/>
+</component>
+<component id="widgetengine" filter="s60" name="Widget Engine">
+<unit bldFile="/mw/web/webengine/widgetengine/group"/>
+</component>
+<component id="web_memoryplugin" name="Memory Plugin" filter="s60" class="plugin">
+<unit bldFile="/mw/web/webengine/memoryplugin/group"/>
+</component>
+<component id="widgetmemoryplugin" filter="s60" name="Widget Memory Plugin" class="plugin">
+<unit bldFile="/mw/web/webengine/widgetmemoryplugin/group"/>
+</component>
+<component id="widgetbackuprestore" filter="s60" name="Widget Backup and Restore">
+<unit bldFile="/mw/web/webengine/widgetbackuprestore/group"/>
+</component>
+<component id="browserrecognizers" filter="s60" name="Browser Recognizers" class="plugin">
+<unit bldFile="/mw/web/webengine/browserrecognizers/group"/>
+</component>
+<component id="wrtharvester" filter="s60" name="Web Runtime Harvester" class="plugin">
+<unit bldFile="/mw/web/webengine/wrtharvester/group"/>
+</component>
+</collection>
+<collection id="codhandler" name="Content Object Descriptor Handler" level="specific">
+<component id="codeng" filter="s60" name="COD Engine">
+<unit bldFile="/mw/web/codhandler/codeng/group"/>
+</component>
+<component id="codui" filter="s60" name="COD UI">
+<unit bldFile="/mw/web/codhandler/codui/group"/>
+</component>
+<component id="codrecog" filter="s60" name="COD Recogniser" class="plugin">
+<unit bldFile="/mw/web/codhandler/codrecog/group"/>
+</component>
+<component id="codviewer" filter="s60" name="COD Viewer">
+<unit bldFile="/mw/web/codhandler/codviewer/group"/>
+</component>
+<component id="ddrecog" filter="s60" name="Download Descriptor Recogniser" class="plugin">
+<unit bldFile="/mw/web/codhandler/ddrecog/group"/>
+</component>
+<component id="ddviewer" filter="s60" name="Download Descriptor Viewer">
+<unit bldFile="/mw/web/codhandler/ddviewer/group"/>
+</component>
+<component id="coddownload" filter="s60" name="COD Download">
+<unit bldFile="/mw/web/codhandler/coddownload/group"/>
+</component>
+<component id="roapapp" filter="s60" name="ROAP Application">
+<unit bldFile="/mw/web/codhandler/roapapp/group"/>
+</component>
+<component id="codhandler_build" filter="s60" name="COD Handler Build">
+<!-- Exports need to go into another component or make this self-contained.
+ #included .hrh file needs to be #included in each of the other components -->
+<unit bldFile="/mw/web/codhandler/group"/>
+</component>
+</collection>
+<collection id="widgets" name="Web Widget Framework" level="generic">
+<meta rel="config">
+<defined condition="RD_BROWSER_WIDGETS"/>
+<defined condition="__WEB_WIDGETS"/>
+</meta>
+<!-- the following units can be uncommented when configuration is put in place -->
+<component id="widgetrecognizer" filter="s60" name="Widget Recognizer" class="plugin">
+<!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
+</component>
+<component id="widgetinstaller" filter="s60" name="Widget Installer UI" class="plugin">
+<!--<unit bldFile="widgets/widgetinstaller/group"/>-->
+</component>
+<component id="widgetlauncher" filter="s60" name="Widget Launcher">
+<!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
+</component>
+<component id="widgetapp" filter="s60" name="Widget UI">
+<!--<unit bldFile="widgets/widgetapp/group"/>-->
+</component>
+<component id="widgetpreinstaller" filter="s60" name="Widget Pre-Installer">
+<meta rel="config">
+<defined condition="RD_WIDGET_PREINSTALLER"/>
+</meta>
+<!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
+</component>
+<component id="widgetstartup" filter="s60" name="Widget Startup">
+<meta rel="config">
+<defined condition="RD_WIDGET_PREINSTALLER"/>
+</meta>
+<!--<unit bldFile="widgets/widgetstartup/group"/>-->
+</component>
+<component id="widgets_build" filter="s60" name="Widgets Build">
+<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed
+ #included .hrh file needs to be #included in each of the other components -->
+<unit bldFile="/mw/web/widgets/group"/>
+</component>
+</collection>
+</package>
+<package id="websrv" level="generic" tech-domain="rt" name="Web Services" levels="plugin framework server generic specific">
+<collection id="websrv_pub" name="Web Services Public Interfaces" level="specific">
+<component id="web_service_description_api" name="Web Service Description API" class="api" filter="s60">
+<unit bldFile="/mw/websrv/websrv_pub/web_service_description_api/group"/>
+</component>
+<component id="web_service_connection_api" name="Web Service Connection API" class="api" filter="s60">
+<unit bldFile="/mw/websrv/websrv_pub/web_service_connection_api/group"/>
+</component>
+<component id="web_service_manager_api" name="Web Service Manager API" class="api" filter="s60">
+<unit bldFile="/mw/websrv/websrv_pub/web_service_manager_api/group"/>
+</component>
+<component id="hostlet_connection_api" name="Hostlet Connection API" class="api" filter="s60">
+<unit bldFile="/mw/websrv/websrv_pub/hostlet_connection_api/group"/>
+</component>
+<component id="web_service_messaging_api" name="Web Service Messaging API" class="api" filter="s60">
+<unit bldFile="/mw/websrv/websrv_pub/web_service_messaging_api/group"/>
+</component>
+<component id="xml_extensions_api" name="XML Extensions API" class="api" filter="s60">
+<unit bldFile="/mw/websrv/websrv_pub/xml_extensions_api/group"/>
+</component>
+<component id="xml_fragment_api" name="XML Fragment API" class="api" filter="s60">
+<unit bldFile="/mw/websrv/websrv_pub/xml_fragment_api/group"/>
+</component>
+</collection>
+<collection id="webservices" name="Web Services Framework" level="generic">
+<!-- consider breaking this collection into more meaningful subsets -->
+<component id="wsnotifierplugins" filter="s60" name="WS Notifier Plugins" class="plugin">
+<unit bldFile="/mw/websrv/webservices/wsnotifierplugins/group"/>
+</component>
+<component id="wslogger" filter="s60" name="WS Logger">
+<unit bldFile="/mw/websrv/webservices/wslogger/group"/>
+</component>
+<component id="wsxml" filter="s60" name="WS XML Extensions">
+<unit bldFile="/mw/websrv/webservices/wsxml/group"/>
+</component>
+<component id="wsutils" filter="s60" name="WS Utils">
+<unit bldFile="/mw/websrv/webservices/wsutils/group"/>
+</component>
+<component id="wsfragment" filter="s60" name="WS Fragment">
+<unit bldFile="/mw/websrv/webservices/wsfragment/group"/>
+</component>
+<component id="wsdescription" filter="s60" name="WS Service Description">
+<unit bldFile="/mw/websrv/webservices/wsdescription/group"/>
+</component>
+<component id="wsconnection" filter="s60" name="WS Service Connection">
+<unit bldFile="/mw/websrv/webservices/wsconnection/group"/>
+</component>
+<component id="wsmessages" filter="s60" name="WS Messages">
+<unit bldFile="/mw/websrv/webservices/wsmessages/group"/>
+</component>
+<component id="wscredentialmanager" filter="s60" name="WS Credential Manager">
+<unit bldFile="/mw/websrv/webservices/wscredentialmanager/group"/>
+</component>
+<component id="wsframework" filter="s60" name="WS Framework">
+<unit bldFile="/mw/websrv/webservices/wsframework/group"/>
+</component>
+<component id="wshttpchanneltransportplugin" filter="s60" name="WS HTTP Channel Transport Plugin" class="plugin">
+<unit bldFile="/mw/websrv/webservices/wshttpchanneltransportplugin/group"/>
+</component>
+<component id="wsconnectionagent" filter="s60" name="WS Connection Agent">
+<unit bldFile="/mw/websrv/webservices/wsconnectionagent/group"/>
+</component>
+<component id="wsprovider" filter="s60" name="WS Provider">
+<unit bldFile="/mw/websrv/webservices/wsprovider/group"/>
+</component>
+<component id="wshostletconnection" filter="s60" name="WS Hostlet Connection">
+<unit bldFile="/mw/websrv/webservices/wshostletconnection/group"/>
+</component>
+<component id="wsmanager" filter="s60" name="WS Service Manager">
+<unit bldFile="/mw/websrv/webservices/wsmanager/group"/>
+</component>
+<component id="wsidentitymanager" filter="s60" name="WS Identity Manager">
+<unit bldFile="/mw/websrv/webservices/wsidentitymanager/group"/>
+</component>
+<component id="idwsfplugin" filter="s60" name="ID-WSF Plugin" class="plugin">
+<unit bldFile="/mw/websrv/webservices/idwsfplugin/group"/>
+</component>
+<component id="wsibasicplugin" filter="s60" name="WS-I Basic Plugin" class="plugin">
+<unit bldFile="/mw/websrv/webservices/wsibasicplugin/group"/>
+</component>
+<component id="wsrestplugin" filter="s60" name="WS REST Plugin" class="plugin">
+<unit bldFile="/mw/websrv/webservices/wsrestplugin/group"/>
+</component>
+<component id="idwsfsecuritymechanism" filter="s60" name="ID-WSF Security Mechanism">
+<unit bldFile="/mw/websrv/webservices/idwsfsecuritymechanism/group"/>
+</component>
+<component id="wspasswordtransforms" filter="s60" name="WS Password Transforms">
+<unit bldFile="/mw/websrv/webservices/wspasswordtransforms/group"/>
+</component>
+<component id="wscore" filter="s60" name="WS Core Service Manager">
+<unit bldFile="/mw/websrv/webservices/wscore/group"/>
+</component>
+<component id="wslocaltransportplugin" filter="s60" name="WS Local Transport Plugin" class="plugin">
+<unit bldFile="/mw/websrv/webservices/wslocaltransportplugin/group"/>
+</component>
+<component id="wshostlettransportplugin" filter="s60" name="WS Hostlet Transport Plugin" class="plugin">
+<unit bldFile="/mw/websrv/webservices/wshostlettransportplugin/group"/>
+</component>
+<component id="wsstar" filter="s60" name="WS Star">
+<!-- can only have one unit. Need to split into separate components or #include from a single bld.inf -->
+<unit bldFile="/mw/websrv/webservices/wsstar/wsstarpolicy/group"/>
+<unit bldFile="/mw/websrv/webservices/wsstar/wsstarplugin/group"/>
+<unit bldFile="/mw/websrv/webservices/wsstar/wsstarmessagehandlers/group"/>
+</component>
+<component id="wsoviplugin" filter="s60" name="WS Ovi Plugin">
+<unit bldFile="/mw/websrv/webservices/wsoviplugin/group"/>
+</component>
+<component id="webservices_build" filter="s60" name="Web Services Build">
+<!-- need to split into self-contained components -->
+<unit bldFile="/mw/websrv/webservices/group"/>
+</component>
+</collection>
+<collection id="websrv_info" name="Web Services Info" level="specific">
+<component id="websrv_bld" filter="s60" name="Web Services Build">
+<!-- need to include common .hrh in each unit -->
+<unit bldFile="/mw/websrv/group"/>
+</component>
+</collection>
+</package>
+<package id="webruntime" level="specific" tech-domain="rt" name="Web Runtime">
+<!-- need to break up this package nito collections and components -->
+<collection id="webruntime_info" name="Web Runtime Info">
+<component id="webruntime_build" name="Web Runtime Build" introduced="^4">
+<unit bldFile="/mw/webruntime" qt:proFile="cwrt.pro" qt:qmakeArgs=""what+=ninetwo" "what+=tenone" "what+=qt_unstable" "what+=wrtlite" "what+=exportiby""/>
+</component>
+</collection>
+</package>
+<package id="platformtools" level="generic" tech-domain="to" name="Platform Tools">
+<collection id="gfxconversion" name="Graphics Conversion">
+<component id="bmconv_s60" filter="s60" name="S60 Bitmap Converter" target="desktop">
+<unit bldFile="/mw/platformtools/gfxconversion/bmconv_s60/group"/>
+</component>
+<component id="mifconv" filter="s60" name="Multi Icon File Converter" target="desktop">
+<unit bldFile="/mw/platformtools/gfxconversion/mifconv/group"/>
+</component>
+</collection>
+</package>
+<package id="uitools" level="specific" tech-domain="to" name="UI Tools" levels="compile encode tool if">
+<collection id="uitools_pub" name="UI Tools Public Interfaces" level="if">
+<component id="third_party_bitmap_palette_api" name="Third Party Bitmap Palette API" class="api" filter="s60">
+<unit bldFile="/mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
+</component>
+</collection>
+<collection id="uitools_plat" name="UI Tools Platform Interfaces" level="if">
+<component id="uitools_cdl_api" name="CDL API" class="api" filter="s60">
+<unit bldFile="/mw/uitools/uitools_plat/cdl_api/group"/>
+</component>
+<component id="uitools_layout_system_private_api" name="Layout System Private API" class="api" filter="s60">
+<unit bldFile="/mw/uitools/uitools_plat/layout_system_private_api/group"/>
+</component>
+</collection>
+<collection id="cdlcompilertoolkit" name="CDL Compiler Toolkit" level="compile">
+<!-- collection is actually a component. Needs to be moved down a directory -->
+<component id="cdlcompilertoolkit_build" filter="s60" name="CDL Compiler Toolkit Build">
+<unit bldFile="/mw/uitools/cdlcompilertoolkit/group"/>
+</component>
+</collection>
+<collection id="cdlcompiler" name="CDL Compiler" level="compile">
+<!-- collection is actually a component. Needs to be moved down a directory -->
+<component id="cdlcompiler_build" filter="s60" name="CDL Compiler Build">
+<unit bldFile="/mw/uitools/cdlcompiler/group"/>
+</component>
+</collection>
+<collection id="gfxtools" name="Graphics Tools" level="tool">
+<component id="color" filter="s60" name="Bitmap Colour Palette" target="desktop">
+<unit bldFile="/mw/uitools/gfxtools/color/group"/>
+</component>
+</collection>
+<collection id="aknlayoutcompiler" name="Avkon Layout Compiler" level="compile">
+<!-- collection is actually a component. Needs to be moved down a directory -->
+<component id="aknlayoutcompiler_build" filter="s60" name="Avkon Layout Compiler Build">
+<unit bldFile="/mw/uitools/aknlayoutcompiler/group"/>
+</component>
+</collection>
+<collection id="skincompiler" name="Skin Compiler" level="compile">
+<component id="aknskindesccompiler" filter="s60" name="Avkon Skin Descriptor Compiler">
+<unit bldFile="/mw/uitools/skincompiler/AknSkinDescCompiler/group"/>
+</component>
+</collection>
+<collection id="reszip" name="Resource Zip" level="encode">
+<!-- collection is actually a component. Needs to be moved down a directory -->
+<component id="reszip_build" filter="s60" name="Resource Zip Build">
+<unit bldFile="/mw/uitools/reszip/group"/>
+</component>
+</collection>
+<collection id="toollibraries" name="Tool Libraries" level="tool"/>
+<collection id="svgtencoder" name="SVGT Encoder" level="encode">
+<component id="svgtenc" filter="s60" name="Standalone SVGT Encoder" target="desktop">
+<unit bldFile="/mw/uitools/svgtencoder/svgtenc/standalone/group"/>
+</component>
+</collection>
+</package>
+</layer>
+<layer id="app" name="Applications" levels="services apps">
+<package id="location" level="apps" tech-domain="lo" name="Location Apps" levels="ui events loc api">
+<collection id="location_plat" name="Location Apps Platform Interfaces" level="api">
+<component id="location_picker_service_api" name="Location Picker Service API" introduced="^4" class="api" filter="s60">
+<unit bldFile="/app/location/location_plat" qt:proFile="location_plat.pro"/>
+</component>
+</collection>
+<collection id="locationpickerservice" name="Location Picker Service" level="loc">
+<!--collection is really a component. Should move down a directory -->
+<component id="locationpickerservice_build" filter="s60" name="Location Picker Service Build" introduced="^4">
+<unit bldFile="/app/location/locationpickerservice" qt:proFile="locationpickerservice.pro"/>
+</component>
+</collection>
+<collection id="locationdataharvester" name="Location Data Harvester" level="events">
+<!--collection is really a component. Should move down a directory -->
+<component id="locationdataharvester_build" name="Location Data Harvester Build" filter="s60" introduced="^4">
+<unit bldFile="/app/location/locationdataharvester" qt:proFile="locationdataharvester.pro"/>
+</component>
+</collection>
+</package>
+<!-- pending removal -->
+<package id="phone" level="apps" span="2" tech-domain="vc" name="Phone Apps" levels="engine plugin ui app">
+<collection id="phoneapp" name="Phone Application" level="app">
+<component id="blacklist" filter="s60" name="Phone Blacklist Clearing" class="plugin">
+<unit bldFile="/app/phone/phoneapp/blacklist/group"/>
+</component>
+<component id="phoneuicontrol" filter="s60" name="Phone UI Control">
+<unit bldFile="/app/phone/phoneapp/phoneuicontrol/group"/>
+</component>
+<component id="phoneuistates" filter="s60" name="Phone UI States">
+<unit bldFile="/app/phone/phoneapp/phoneuistates/group"/>
+</component>
+<component id="phoneuiutils" filter="s60" name="Phone UI Utils">
+<unit bldFile="/app/phone/phoneapp/phoneuiutils/group"/>
+</component>
+<component id="silenceactionplugin" filter="s60" name="Silence Action Plugin" class="plugin">
+<unit bldFile="/app/phone/phoneapp/silenceactionplugin/group"/>
+</component>
+<component id="phonemediatorcenter" filter="s60" name="Phone Mediator Center">
+<unit bldFile="/app/phone/phoneapp/phonemediatorcenter/group"/>
+</component>
+<component id="phoneuiview2" filter="s60" name="Phone UI View">
+<unit bldFile="/app/phone/phoneapp/phoneuiview2" qt:proFile="phoneuiview2.pro"/>
+</component>
+<component id="phoneuiqtviewadapter" filter="s60" name="Phone UI Qt View Adapter" introduced="^4" class="plugin">
+<unit bldFile="/app/phone/phoneapp/phoneuiqtviewadapter" qt:proFile="phoneuiqtviewadapter.pro"/>
+</component>
+<component id="phonestringloader" filter="s60" name="Phone String Loader" introduced="^4">
+<unit bldFile="/app/phone/phoneapp/phonestringloader" qt:proFile="phonestringloader.pro"/>
+</component>
+<component id="phoneui2" filter="s60" name="Phone UI">
+<unit bldFile="/app/phone/phoneapp/phoneui2" qt:proFile="phoneui2.pro"/>
+</component>
+</collection>
+<collection id="phoneengine" name="Phone Engine" level="engine">
+<component id="phonecntfinder2" filter="s60" name="Phone Contact Finder">
+<unit bldFile="/app/phone/phoneengine/phonecntfinder2" qt:proFile="phonecntfinder2.pro"/>
+</component>
+<component id="audiohandling" filter="s60" name="Phone Audio Handling">
+<unit bldFile="/app/phone/phoneengine/audiohandling/group"/>
+</component>
+<component id="callhandling" filter="s60" name="Call Handling">
+<unit bldFile="/app/phone/phoneengine/callhandling/group"/>
+</component>
+<component id="contacthandling2" filter="s60" name="Phone Contact Handling">
+<unit bldFile="/app/phone/phoneengine/contacthandling2/group"/>
+</component>
+<component id="loghandling" filter="s60" name="Phone Log Handling">
+<unit bldFile="/app/phone/phoneengine/loghandling/group"/>
+</component>
+<component id="engineinfo" filter="s60" name="Phone Engine Info">
+<unit bldFile="/app/phone/phoneengine/engineinfo/group"/>
+</component>
+<component id="phonemodel" filter="s60" name="Phone Model">
+<unit bldFile="/app/phone/phoneengine/phonemodel" qt:proFile="phonemodel.pro"/>
+</component>
+<component id="servicehandling" filter="s60" name="Phone Service Handling">
+<unit bldFile="/app/phone/phoneengine/servicehandling/group"/>
+</component>
+<component id="phoneservices" filter="s60" name="Phone Server" introduced="^4">
+<unit bldFile="/app/phone/phoneengine/phoneservices" qt:proFile="phoneservices.pro"/>
+</component>
+<component id="parserrecognizer" filter="s60" name="Parser Recognizer" introduced="^4" class="plugin">
+<unit bldFile="/app/phone/phoneengine/parserrecognizer" qt:proFile="parserrecognizer.pro"/>
+</component>
+</collection>
+<collection id="phoneuis" name="Phone UIs" level="ui">
+<component id="bubblemanager2" filter="s60" name="Phone Bubble Manager">
+<unit bldFile="/app/phone/phoneuis/bubblemanager2" qt:proFile="bubblemanager2.pro"/>
+</component>
+<component id="telephonydevicemode" filter="s60" name="Telephony Device Mode">
+<unit bldFile="/app/phone/phoneuis/telephonydevicemode/group"/>
+</component>
+</collection>
+<collection id="phone_plat" name="Phone Apps Platform Interfaces" level="app">
+<component id="3d_ringing_tone_enabler_api" name="3D Ringing Tone Enabler API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
+</component>
+<component id="telephony_comms_information_api" name="Telephony Comms Information API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/telephony_comms_information_api/group"/>
+</component>
+<component id="telephony_information_api" name="Telephony Information API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/telephony_information_api/group"/>
+</component>
+<component id="telephony_device_mode_api" name="Telephony Device Mode API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/telephony_device_mode_api/group"/>
+</component>
+<component id="telephony_remote_party_information_api" name="Telephony Remote Party Information API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/telephony_remote_party_information_api/group"/>
+</component>
+<component id="telephony_video_mailbox_settings_api" name="Telephony Video Mailbox Settings API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/telephony_video_mailbox_settings_api/group"/>
+</component>
+<component id="telephony_microphone_mute_status_api" name="Telephony Microphone Mute Status API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/telephony_microphone_mute_status_api/group"/>
+</component>
+<component id="telephony_logging_extension_api" name="Telephony Logging Extension API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/telephony_logging_extension_api/group"/>
+</component>
+<component id="telephony_matching_extension_api" name="Telephony Matching Extension API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/telephony_matching_extension_api/group"/>
+</component>
+<component id="phone_application_commands_api" name="Phone Application Commands API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/phone_application_commands_api/group"/>
+</component>
+<component id="phone_application_voip_commands_api" name="Phone Application VOIP Commands API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/phone_application_voip_commands_api/group"/>
+</component>
+<component id="phone_telephony_mediator_api" name="Telephony Mediator API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/telephony_mediator_api/group"/>
+</component>
+<component id="video_telephony_mediator_api" name="Video Telephony Mediator API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/video_telephony_mediator_api/group"/>
+</component>
+<component id="video_telephony_control_mediator_api" name="Video Telephony Control Mediator API" class="api" filter="s60" introduced="^4">
+<unit bldFile="/app/phone/phone_plat/video_telephony_control_mediator_api/group"/>
+</component>
+</collection>
+<collection id="phoneplugins" name="Phone Plugins" level="plugin">
+<component id="csplugin" filter="s60" name="Circuit Switched Plugin" class="plugin" introduced="^4">
+<unit bldFile="/app/phone/phoneplugins/csplugin/group"/>
+</component>
+<component id="hsdialerwidgetplugin" filter="s60" name="Home Screen Dialer Widget Plugin" class="plugin" introduced="^4">
+<unit bldFile="/app/phone/phoneplugins/hsdialerwidgetplugin" qt:proFile="hsdialerwidgetplugin.pro"/>
+</component>
+<component id="infowidgetplugin" filter="s60" name="Info Widget Plugin" class="plugin" introduced="^4">
+<unit bldFile="/app/phone/phoneplugins/infowidgetplugin" qt:proFile="infowidgetplugin.pro"/>
+</component>
+</collection>
+<collection id="phonesettings" name="Phone Settings" level="plugin">
+<component id="cpphonesettingsplugins" filter="s60" name="CP Phone Settings Plugins" class="plugin" introduced="^4">
+<unit bldFile="/app/phone/phonesettings/cpphonesettingsplugins" qt:proFile="cpphonesettingsplugins.pro"/>
+</component>
+</collection>
+</package>
+<package id="recents" level="apps" tech-domain="vc" name="Recent Events" levels="engine support ui api">
+<collection id="recents_plat" name="Recent Events Platform Interfaces" level="api">
+<component id="logs_services_api" name="Logs Services API" class="api" filter="s60" introduced="^4">
+<unit base="/app/recents/recents_plat/logs_services_api"/>
+</component>
+<component id="logs_engine_api" name="Logs Engine API" class="api" filter="s60" introduced="^4">
+<unit base="/app/recents/recents_plat/logs_engine_api"/>
+</component>
+<component id="logs_timers_api" name="Logs Timers API" class="api" filter="s60">
+<unit base="/app/recents/recents_plat/logs_timers_api"/>
+</component>
+<component id="logs_engine_api_extensions" name="Logs Engine API Extensions" class="api" filter="s60">
+<unit base="/app/recents/recents_plat/logs_engine_api_extensions"/>
+</component>
+</collection>
+<collection id="logsui" name="Logs UI" level="ui">
+<component id="logsui_build" filter="s60" name="Logs UI Build">
+<!-- component at too high a rank, should move down one directory -->
+<unit bldFile="/app/recents/logsui" qt:proFile="logsui.pro"/>
+</component>
+</collection>
+</package>
+<package id="settingsuis" level="services" tech-domain="dm" name="Settings UIs" levels="plugin ui">
+<collection id="controlpanelplugins" name="Control Panel Plugins" level="plugin">
+<component id="themeplugin" filter="s60" name="Theme Plugin" introduced="^4">
+<unit bldFile="/app/settingsuis/controlpanelplugins/themeplugin" qt:proFile="themeplugin.pro" qt:qmakeArgs="-r -config rom"/>
+</component>
+</collection>
+<collection id="controlpanelui" name="Control Panel UI" level="ui">
+<!-- collection is really a component, move down a dir -->
+<component id="controlpanelui_build" filter="s60" name="Control Panel UI Build" introduced="^4">
+<unit bldFile="/app/settingsuis/controlpanelui" qt:proFile="controlpanelui.pro" qt:qmakeArgs="-r -config rom"/>
+</component>
+</collection>
+</package>
+<package id="contentcontrol" level="services" tech-domain="dm" name="Content Control Daemons" levels="plugin framework app">
+<collection id="contentctrl_plat" name="Content Control Daemons Platforn Interfaces" level="app">
+<component id="ds_contactsdatastoreextension_api" name="DS Contacts Data Store Extension API" class="api" filter="s60" introduced="^4">
+<unit bldFile="/app/contentcontrol/contentctrl_plat/ds_contactsdatastoreextension_api/group"/>
+</component>
+<component id="ds_data_modification_api" name="DS Data Modification API" class="api" filter="s60" introduced="^3">
+<unit bldFile="/app/contentcontrol/contentctrl_plat/ds_data_modification_api/group"/>
+</component>
+</collection>
+<collection id="connectivitymodules" name="Connectivity Modules" level="framework">
+<component id="secon" filter="s60" name="Service Controllers">
+<unit bldFile="/app/contentcontrol/connectivitymodules/secon/group"/>
+</component>
+</collection>
+<collection id="dsdcmoadapter" name="Data Sync DCMO Adapter" level="plugin">
+<!-- Component at wrong rank, should move down a directory -->
+<component id="dsdcmoadapter_build" filter="s60" name="Data Sync Control DCMO Adapter">
+<unit bldFile="/app/contentcontrol/dsdcmoadapter/group"/>
+</component>
+</collection>
+<collection id="omads" name="OMA Data Sync" level="app">
+<component id="omads_build" filter="s60" name="OMA DS Build">
+<unit bldFile="/app/contentcontrol/omads/group"/>
+<!-- need to remove #include and rename and OMA DS ROM -->
+</component>
+<component id="omadsextensions" filter="s60" name="OMA DS Extensions" class="plugin">
+<unit bldFile="/app/contentcontrol/omads/omadsextensions/group"/>
+</component>
+<component id="omadsextensions_qt" filter="s60" name="OMA DS Qt Extensions" class="plugin">
+<unit bldFile="/app/contentcontrol/omads/omadsextensions" qt:proFile="omadsextensions.pro"/>
+</component>
+</collection>
+</package>
+<package id="firsttimeuse" level="apps" tech-domain="dm" name="First Time Use" levels="support services ui app">
+<!-- these empty collections are really components. Move down a directory and supply units -->
+<collection id="ftuapplication" name="First Time Use Application" level="app"/>
+<collection id="fturuntimeservices" name="First Time Use Runtime Services" level="services"/>
+<collection id="wizardproviders" name="Wizard Providers" level="support"/>
+<collection id="stateproviders" name="State Providers" level="support"/>
+<collection id="runtimeproviders" name="Runtime Providers" level="support"/>
+<collection id="firsttimeuse_info" name="First Time Use Info" level="ui">
+<component id="firsttimeuse_build" name="First Time Use Build">
+<unit bldFile="/app/firsttimeuse" qt:proFile="ftu.pro" qt:qmakeArgs="-r -config rom"/>
+</component>
+</collection>
+</package>
+<package id="devicecontrol" level="services" tech-domain="dm" name="Device Control Daemons" levels="oma mid app">
+<collection id="deviceupdatesui" name="Device Updates UI" level="app">
+<component id="deviceupdatesui_adapters" name="Device Updates Adapters" filter="s60" class="plugin" introduced="^4">
+<unit bldFile="/app/devicecontrol/deviceupdatesui/adapters/bld"/>
+</component>
+<component id="deviceupdates" name="Device Updates" filter="s60" introduced="^4">
+<unit bldFile="/app/devicecontrol/deviceupdatesui/deviceupdates" qt:proFile="deviceupdates.pro"/>
+</component>
+<component id="deviceupdatesplugin" name="Device Updates Plugin" filter="s60" introduced="^4" class="plugin">
+<unit bldFile="/app/devicecontrol/deviceupdatesui/deviceupdatesplugin" qt:proFile="deviceupdatesplugin.pro"/>
+</component>
+<component id="deviceupdatesqtsp" name="Device Updates Qt Service Provider" filter="s60" introduced="^4">
+<unit bldFile="/app/devicecontrol/deviceupdatesui/deviceupdatesqtsp" qt:proFile="deviceupdatesqtsp.pro"/>
+</component>
+<component id="cpqtsp" name="Client Provisioning Qt Service Provider" filter="s60" introduced="^4">
+<unit bldFile="/app/devicecontrol/deviceupdatesui/cpqtsp" qt:proFile="cpqtsp.pro"/>
+</component>
+<component id="devicemanagementnotifiersplugin" name="Device Management Notifiers Plugin" filter="s60" introduced="^4" class="plugin">
+<unit bldFile="/app/devicecontrol/deviceupdatesui/devicemanagementnotifiersplugin" qt:proFile="devicemanagementnotifiersplugin.pro"/>
+</component>
+</collection>
+</package>
+<package id="printing" level="services" tech-domain="de" name="Printing"/>
+<package id="files" level="apps" tech-domain="pr" name="File Manager Apps" levels="support apps">
+<collection id="filemanager" name="File Manager" level="apps">
+<component id="filemanager_plat" name="File Manager Platform Interfaces" class="api" filter="s60" introduced="^4">
+<unit base="/app/files/filemanager/filemanager_plat"/>
+</component>
+<component id="fmbkupengine" filter="s60" name="File Manager Backup Engine" introduced="^4">
+<unit bldFile="/app/files/filemanager/src/fmbkupengine/group"/>
+</component>
+<component id="filemanager_build" filter="s60" name="File Manager Build">
+<!-- break this up into components or move down a directory -->
+<unit bldFile="/app/files/filemanager" qt:qmakeArgs="-r" qt:proFile="filemanager.pro"/>
+</component>
+</collection>
+</package>
+<package id="search" level="apps" tech-domain="pr" name="Search Apps" levels="eng base app api">
+<collection id="search_info" name="Search Info">
+<component id="search_build" name="Search Build" introduced="^4">
+<unit bldFile="/app/search/group"/>
+</component>
+</collection>
+<collection id="searchui" name="Search UI">
+<component id="searchui_build" name="Search UI Build" introduced="^4">
+<unit bldFile="/app/search/searchui" qt:proFile="searchui.pro"/>
+</component>
+</collection>
+</package>
+<package id="contacts" level="apps" span="2" tech-domain="pr" name="Contacts Apps" levels="engine support services ui">
+<collection id="contacts_plat" name="Contacts Apps Platform Interfaces" level="ui">
+<component id="qt_mobility_contacts_api" name="Qt Mobility Contacts API" class="api" filter="s60" introduced="^4">
+<unit base="/app/contacts/contacts_plat/qt_mobility_contacts_api"/>
+</component>
+</collection>
+<collection id="phonebookui" name="Phonebook UI" level="ui">
+<component id="mobhistorymodel" filter="s60" name="Mobile History Model" introduced="^4">
+<!--<unit bldFile="phonebookui/mobhistorymodel" qt:proFile="mobhistorymodel.pro"/> -->
+</component>
+<component id="pbkcommonui" filter="s60" name="Phonebook Common UI" introduced="^4">
+<!--<unit bldFile="phonebookui/pbkcommonui" qt:proFile="pbkcommonui.pro"/> -->
+</component>
+<component id="phonebookapp" filter="s60" name="Phonebook Application" introduced="^4">
+<!--<unit bldFile="phonebookui/phonebookapp" qt:proFile="phonebookapp.pro"/> -->
+</component>
+<component id="phonebookservices" filter="s60" name="Phonebook Services" introduced="^4">
+<!--<unit bldFile="phonebookui/phonebookservices" qt:proFile="phonebookservices.pro"/> -->
+</component>
+<component id="phonebookui_build" filter="s60" name="Phonebook UI Build" introduced="^4">
+<!-- break up into components -->
+<unit bldFile="/app/contacts/phonebookui" qt:proFile="phonebookui.pro"/>
+</component>
+</collection>
+<collection id="qtcontactsmobility" name="Qt Contacts Mobility" level="support">
+<component id="qtcontactsmobility_build" filter="s60" name="Qt Contacts Mobility Build" class="plugin" introduced="^4">
+<!-- not really a component, move down a dir? Break up into compnents? -->
+<unit bldFile="/app/contacts/qtcontactsmobility" qt:proFile="qtcontactsmobility.pro"/>
+</component>
+</collection>
+<collection id="phonebookengines" name="Phonebook Engines" level="engine">
+<component id="cntfindplugin" filter="s60" name="Contacts Find Plugin" class="plugin" introduced="^2">
+<unit bldFile="/app/contacts/phonebookengines/cntfindplugin" qt:proFile="cntfindplugin.pro"/>
+</component>
+<component id="contactsmodel" name="Contacts Model" introduced="ER5" purpose="optional">
+<unit version="2" bldFile="/app/contacts/phonebookengines/contactsmodel/groupsql" mrp="/app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp"/>
+</component>
+<component id="cntsortplugin" filter="s60" name="Contacts Sort Plugin" class="plugin" introduced="^2">
+<unit bldFile="/app/contacts/phonebookengines/cntsortplugin" qt:proFile="cntsortplugin.pro"/>
+</component>
+<component id="mobcntmodel" filter="s60" name="Mobile Contacts Model" introduced="^4">
+<unit bldFile="/app/contacts/phonebookengines/mobcntmodel" qt:proFile="mobcntmodel.pro"/>
+</component>
+<component id="mobcntactions" filter="s60" name="Mobile Contacts Actions" introduced="^4">
+<unit bldFile="/app/contacts/phonebookengines/mobcntactions" qt:proFile="mobcntactions.pro"/>
+</component>
+<component id="cntmaptileservice" filter="s60" name="Contacts Map Tile Service" introduced="^4">
+<unit bldFile="/app/contacts/phonebookengines/cntmaptileservice" qt:proFile="cntmaptileservice.pro"/>
+</component>
+<component id="simutility" filter="s60" name="SIM Utility" introduced="^4">
+<unit bldFile="/app/contacts/phonebookengines/simutility" qt:proFile="simutility.pro"/>
+</component>
+<component id="cntimageutility" name="Contacts Image Utility" filter="s60" introduced="^4">
+<unit bldFile="/app/contacts/phonebookengines/cntimageutility" qt:proFile="cntimageutility.pro"/>
+</component>
+</collection>
+<collection id="pimprotocols" name="PIM Protocols" level="services">
+<component id="phonebooksync" name="Phonebook Sync" purpose="optional" class="plugin">
+<unit bldFile="/app/contacts/pimprotocols/phonebooksync/group" mrp="/app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
+</component>
+<component id="pbap" name="Bluetooth PBAP" introduced="9.2" purpose="optional">
+<unit bldFile="/app/contacts/pimprotocols/pbap/group" mrp="/app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
+</component>
+</collection>
+<collection id="contacts_info" name="Contacts Apps Info" level="ui">
+<component id="contacts_metadata" name="Contacts Apps Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="organizer" level="apps" span="2" tech-domain="pr" name="Organizer Application Suite" levels="support services engine ui app">
+<collection id="organizer_pub" name="Organizer Application Suite Public Interfaces" level="app">
+<component id="calendar_interim_utils2_api" name="Calendar Interim Utils 2 API" class="api" filter="s60">
+<!-- move into own .pro file -->
+<unit bldFile="/app/organizer/organizer_pub" qt:proFile="organizer_pub.pro"/>
+</component>
+</collection>
+<collection id="organizer_plat" name="Organizer Application Suite Platform Interfaces" level="app">
+<component id="organizer_plat_build" name="Organizer Application Suite Platform Interface Build" class="api" filter="s60">
+<!-- break up into individual .pro files -->
+<unit bldFile="/app/organizer/organizer_plat" qt:proFile="organizer_plat.pro"/>
+</component>
+<component id="agenda_versit_2_api" name="Agenda Versit 2 API" class="api" filter="s60">
+<!-- <unit bldFile="organizer_plat/agenda_versit_2_api/group"/>-->
+</component>
+<component id="calendar_exporter_api" name="Calendar Exporter API" class="api" filter="s60">
+<!--<unit bldFile="organizer_plat/calendar_exporter_api/group"/>-->
+</component>
+<component id="calendar_importer_api" name="Calendar Importer API" class="api" filter="s60">
+<!--<unit bldFile="organizer_plat/calendar_importer_api/group"/>-->
+</component>
+<component id="calendar_launcher_api" name="Calendar Launcher API" class="api" filter="s60">
+<!--<unit bldFile="organizer_plat/calendar_launcher_api/group"/> -->
+</component>
+<component id="agenda_interface_api" name="Agenda Interface API" class="api" filter="s60" introduced="^4">
+<unit base="/app/organizer/organizer_plat/agenda_interface_api"/>
+</component>
+<component id="calendar_editor_api" name="Calendar Editor API" class="api" filter="s60" introduced="^4">
+<unit base="/app/organizer/organizer_plat/calendar_editor_api"/>
+</component>
+<component id="notes_editor_api" name="Notes Editor API" class="api" filter="s60" introduced="^4">
+<unit base="/app/organizer/organizer_plat/notes_editor_api"/>
+</component>
+</collection>
+<collection id="agendainterface" name="Agenda Interface" level="services">
+<!-- collection is really a component, should move down a directory -->
+<component id="agendainterface_build" filter="s60" name="Agenda Interface Build">
+<unit bldFile="/app/organizer/agendainterface" qt:proFile="agendainterface.pro"/>
+</component>
+</collection>
+<collection id="calendarui" name="Calendar UI" level="ui">
+<component id="commonutils" filter="s60" name="Calendar Common Utils">
+<unit bldFile="/app/organizer/calendarui/commonutils" qt:proFile="commonutils.pro"/>
+</component>
+<component id="calenlauncher" filter="s60" name="Calendar Launcher">
+<unit bldFile="/app/organizer/calendarui/calenlauncher" qt:proFile="calenlauncher.pro"/>
+</component>
+<component id="caleneditor" filter="s60" name="Calendar Editor" introduced="^4">
+<unit bldFile="/app/organizer/calendarui/caleneditor" qt:proFile="caleneditor.pro"/>
+</component>
+<component id="agendaeventviewer" filter="s60" name="Agenda Event Viewer" introduced="^4">
+<unit bldFile="/app/organizer/calendarui/agendaeventviewer" qt:proFile="agendaeventviewer.pro"/>
+</component>
+<component id="globaldata" filter="s60" name="Calendar Global Data">
+<unit bldFile="/app/organizer/calendarui/globaldata" qt:proFile="globaldata.pro"/>
+</component>
+<component id="settings" filter="s60" name="Calendar Settings">
+<unit bldFile="/app/organizer/calendarui/settings" qt:proFile="settings.pro"/>
+</component>
+<component id="calenplugins" filter="s60" name="Calendar Plugins" introduced="^4" class="plugin">
+<unit bldFile="/app/organizer/calendarui/calenplugins" qt:proFile="calenplugins.pro"/>
+</component>
+<component id="customisationmanager" filter="s60" name="Calendar Customisation Manager">
+<unit bldFile="/app/organizer/calendarui/customisationmanager" qt:proFile="customisationmanager.pro"/>
+</component>
+<component id="views" filter="s60" name="Calendar Views">
+<unit bldFile="/app/organizer/calendarui/views" qt:proFile="views.pro"/>
+</component>
+<component id="calendarui_controller" filter="s60" name="Calendar Controller">
+<unit bldFile="/app/organizer/calendarui/controller" qt:proFile="controller.pro"/>
+</component>
+<component id="calendarui_application" filter="s60" name="Calendar Application">
+<unit bldFile="/app/organizer/calendarui/application" qt:proFile="application.pro"/>
+</component>
+<component id="regionalplugins" name="Regional Plugins" filter="s60" introduced="^4" class="plugin">
+<unit bldFile="/app/organizer/calendarui/regionalplugins" qt:proFile="regionalplugins.pro"/>
+</component>
+<component id="caldav" filter="sf_build" name="CalDAV" class="plugin" introduced="^3">
+<!-- not yet delivered in S^4 <unit bldFile="calendarui/caldav/group"/>-->
+</component>
+</collection>
+<collection id="notes" name="Notes" level="ui">
+<component id="noteseditor" filter="s60" name="Notes Editor" introduced="^4">
+<unit bldFile="/app/organizer/notes/notesui/noteseditor" qt:proFile="noteseditor.pro"/>
+</component>
+<component id="notes_build" filter="s60" name="Notes Build" introduced="^4">
+<unit bldFile="/app/organizer/notes" qt:proFile="notes.pro"/>
+</component>
+</collection>
+<collection id="calendarengines" name="Calendar Engines" level="engine">
+<component id="versit2" filter="s60" name="Versit 2 iCal Parser" introduced="9.2">
+<unit bldFile="/app/organizer/calendarengines/versit2/group"/>
+</component>
+<component id="agnversit2" filter="s60" name="Versit 2 Agenda Interface" class="plugin" introduced="9.2">
+<unit bldFile="/app/organizer/calendarengines/agnversit2/group"/>
+</component>
+<component id="caleninterimutils" filter="s60" name="Calendar Interim Utils" introduced="9.1">
+<unit bldFile="/app/organizer/calendarengines/caleninterimutils/group"/>
+</component>
+<component id="calenimp" filter="s60" name="Calendar Import Wrapper" introduced="7.0s">
+<unit bldFile="/app/organizer/calendarengines/calenimp/group"/>
+</component>
+<component id="caldavsrv" filter="sf_build" name="CalDAV Server" introduced="^3">
+<!-- Not yet delivered in S^4 <unit bldFile="calendarengines/caldav/group"/> -->
+</component>
+</collection>
+<collection id="clock" name="Clock" level="app">
+<!-- uncomment unit when block_build is split up-->
+<component id="clockengines" filter="s60" name="Clock Engines">
+<!--<unit bldFile="clock/clockengines" qt:proFile="clockengines.pro"/> -->
+</component>
+<component id="clockmw" filter="s60" name="Clock Middleware" introduced="^4">
+<!--<unit bldFile="clock/clockmw" qt:proFile="clockmw.pro"/>-->
+</component>
+<component id="clockui" filter="s60" name="Clock UI">
+<!--<unit bldFile="clock/clockui" qt:proFile="clockui.pro"/>-->
+</component>
+<component id="ftudatetimewizard" filter="s60" name="First Time Use Date/Time Wizard" introduced="^4">
+<!--<unit bldFile="clock/ftudatetimewizard" qt:proFile="ftudatetimewizard.pro"/>-->
+</component>
+<component id="clock_build" filter="s60" name="Clock Build">
+<!-- make exports into a component, or just move to one of the above components, then remove this and uncomment the above -->
+<unit bldFile="/app/organizer/clock" qt:proFile="clock.pro"/>
+</component>
+</collection>
+<collection id="pimappservices" name="PIM Application Services" level="services">
+<component id="calendar" name="Calendar" introduced="9.2" purpose="optional">
+<unit version="2" bldFile="/app/organizer/pimappservices/calendar/group" mrp="/app/organizer/pimappservices/calendar/group/app-engines_calendar.mrp"/>
+</component>
+<component id="calendarvcalplugin" name="Calendar vCal Plugin" introduced="8.1" purpose="optional" class="plugin">
+<unit version="2" bldFile="/app/organizer/pimappservices/calendarvcalplugin/group" mrp="/app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp"/>
+</component>
+<component id="appenginesdocs" name="Application Engines Documentation" purpose="development" class="doc">
+<unit mrp="/app/organizer/pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
+</component>
+</collection>
+<collection id="pimappsupport" name="PIM Application Support" level="support">
+<component id="vcardandvcal" name="vCard and vCal" introduced="ER5" purpose="optional">
+<unit bldFile="/app/organizer/pimappsupport/vcardandvcal/group" mrp="/app/organizer/pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
+</component>
+<component id="chinesecalendarconverter" name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
+<unit bldFile="/app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="/app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
+</component>
+<component id="chinesecalendaralg" name="Chinese Calendar Algorithm" introduced="^2" purpose="optional" class="plugin">
+<unit bldFile="/app/organizer/pimappsupport/chinesecalendaralg/group" mrp="/app/organizer/pimappsupport/chinesecalendaralg/group/app-services_chinesecalendaralgorithm.mrp"/>
+</component>
+</collection>
+<collection id="alarmui" name="Alarm UI" level="app">
+<!-- collection is really a component, should move down a directory -->
+<component id="alarmui_build" filter="s60" name="Alarm UI Build">
+<unit bldFile="/app/organizer/alarmui" qt:proFile="alarmui.pro"/>
+</component>
+</collection>
+<collection id="organizer_info" name="Organizer Application Suite Info" level="app">
+<component id="organizer_metadata" name="Organizer Application Suite Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="messaging" level="apps" span="2" tech-domain="pr" name="Messaging Apps" levels="plugin eng base app api">
+<collection id="msg_plat" name="Messaging Apps Platform APIs" level="api">
+<component id="messaging_media_resolver_api" name="Messaging Media Resolver API" class="api" filter="s60">
+<unit base="/app/messaging/msg_plat/messaging_media_resolver_api"/>
+</component>
+<component id="mms_application_api" name="MMS Application API" class="api" filter="s60">
+<unit base="/app/messaging/msg_plat/mms_application_api"/>
+</component>
+<component id="mms_codec_client_api" name="MMS Codec Client API" class="api" filter="s60">
+<unit base="/app/messaging/msg_plat/mms_codec_client_api"/>
+</component>
+<component id="mms_conformance_api" name="MMS Conformance API" class="api" filter="s60">
+<unit base="/app/messaging/msg_plat/mms_conformance_api"/>
+</component>
+<component id="mms_engine_settings_api" name="MMS Engine Settings API" class="api" filter="s60">
+<unit base="/app/messaging/msg_plat/mms_engine_settings_api"/>
+</component>
+<component id="mms_server_settings_api" name="MMS Server Settings API" class="api" filter="s60">
+<unit base="/app/messaging/msg_plat/mms_server_settings_api"/>
+</component>
+<component id="conversation_services_client_api" name="Conversation Services Client API" class="api" filter="s60" introduced="^4">
+<unit base="/app/messaging/msg_plat/conversation_services_client_api"/>
+</component>
+<component id="conversation_services_plugin_api" name="Conversation Services Plugin API" class="api" filter="s60" introduced="^4">
+<unit base="/app/messaging/msg_plat/conversation_services_plugin_api"/>
+</component>
+<component id="conversation_services_utilities_api" name="Conversation Services Utilities API" class="api" filter="s60" introduced="^4">
+<unit base="/app/messaging/msg_plat/conversation_services_utilities_api"/>
+</component>
+<component id="shareui_api" name="Share UI API" class="api" filter="s60" introduced="^4">
+<unit base="/app/messaging/msg_plat/shareui_api"/>
+</component>
+<component id="messaging_history_api" name="Messaging History API" class="api" filter="s60" introduced="^4">
+<unit base="/app/messaging/msg_plat/messaging_history_api"/>
+</component>
+<component id="msg_plat_build" name="Messaging Apps Platform APIs Build" class="api" filter="s60" introduced="^4">
+<!-- break this up into the above units and replace their base attributes with bldFile, etc -->
+<unit base="/app/messaging/msg_plat" qt:proFile="msg_plat.pro" qt:qmakeArgs="-r"/>
+</component>
+</collection>
+<collection id="msg_pub" name="Messaging Apps Public APIs" level="api">
+<component id="mms_client_mtm_api" name="MMS Client MTM API" class="api" filter="s60">
+<unit base="/app/messaging/msg_pub/mms_client_mtm_api"/>
+</component>
+<component id="msg_smil_dtd_api" name="Messaging SMIL DTD API" class="api" filter="s60" introduced="^4">
+<unit base="/app/messaging/msg_pub/msg_smil_dtd_api"/>
+</component>
+<component id="msg_pub_build" name="Messaging Apps Public APIs Build" class="api" filter="s60" introduced="^4">
+<!-- break this up into the above units and replace their base attributes with bldFile, etc -->
+<unit base="/app/messaging/msg_pub" qt:proFile="msg_pub.pro" qt:qmakeArgs="-r"/>
+</component>
+</collection>
+<collection id="mobilemessaging" name="Mobile Messaging" level="plugin">
+<component id="smsmtm" name="SMS MTM" purpose="optional" class="plugin">
+<unit bldFile="/app/messaging/mobilemessaging/smsmtm/group" mrp="/app/messaging/mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
+</component>
+</collection>
+<collection id="messagingappbase" name="Messaging App Base" level="base">
+<component id="messagingappbase_build" filter="s60" name="Messaging App Base Build" introduced="^4">
+<!-- break this up into the below components -->
+<unit bldFile="/app/messaging/messagingappbase" qt:proFile="messagingappbase.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="msgmedia" filter="s60" name="Message Media">
+<unit base="/app/messaging/messagingappbase/msgmedia"/>
+</component>
+<component id="smilparser" name="SMIL Parser" introduced="7.0s" purpose="optional">
+<unit bldFile="/app/messaging/messagingappbase/smilparser/GROUP" mrp="/app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
+</component>
+<component id="obexmtms" name="OBEX MTMs" introduced="7.0s" purpose="optional" class="plugin">
+<unit bldFile="/app/messaging/messagingappbase/obexmtms/Group" mrp="/app/messaging/messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
+</component>
+</collection>
+<collection id="mmsengine" name="MMS Engine" level="eng">
+<component id="mmsconninit" filter="s60" name="MMS Connection Initiator">
+<!-- <unit bldFile="mmsengine/mmsconninit/bld"/> -->
+</component>
+<component id="genutils" filter="s60" name="General Utils">
+<!-- <unit bldFile="mmsengine/genutils/bld"/> -->
+</component>
+<component id="mmsserversettings" filter="s60" name="MMS Server Settings">
+<!-- <unit bldFile="mmsengine/mmsserversettings/bld"/> -->
+</component>
+<component id="mmsmessage" filter="s60" name="MMS Message">
+<!-- <unit bldFile="mmsengine/mmsmessage/bld"/> -->
+</component>
+<component id="mmshttptransport" filter="s60" name="MMS HTTP Transport">
+<!-- <unit bldFile="mmsengine/mmshttptransport/bld"/> -->
+</component>
+<component id="mmscodec" filter="s60" name="MMS Codec">
+<!-- <unit bldFile="mmsengine/mmscodec/bld"/> -->
+</component>
+<component id="mmsserver" filter="s60" name="MMS Server">
+<!-- <unit bldFile="mmsengine/mmsserver/bld"/> -->
+</component>
+<component id="clientmtm" filter="s60" name="MMS Client MTM" class="plugin">
+<!-- <unit bldFile="mmsengine/clientmtm/bld"/> -->
+</component>
+<component id="mmswatcher" filter="s60" name="MMS Watcher" class="plugin">
+<!-- <unit bldFile="mmsengine/mmswatcher/bld"/> -->
+</component>
+<component id="mmspushhandler" filter="s60" name="MMS Push Handler" class="plugin">
+<!-- <unit bldFile="mmsengine/mmspushhandler/bld"/> -->
+</component>
+<component id="applicationadapter" filter="s60" name="MMS Application Adapter">
+<!-- <unit bldFile="mmsengine/applicationadapter/bld"/> -->
+</component>
+<component id="mmscodecclient" filter="s60" name="MMS Codec Client">
+<!-- <unit bldFile="mmsengine/mmscodecclient/bld"/> -->
+</component>
+<component id="mmssettings" name="MMS Settings" introduced="9.2" purpose="optional">
+<unit bldFile="/app/messaging/mmsengine/mmssettings/group" mrp="/app/messaging/mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
+</component>
+<component id="mmsconf" name="MMS Configuration" purpose="optional">
+<unit bldFile="/app/messaging/mmsengine/mmsconf" mrp="/app/messaging/mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
+</component>
+<component id="mmsengine_build" filter="s60" name="MMS Engine Build">
+<!-- this should be broken up into the individual other components -->
+<unit bldFile="/app/messaging/mmsengine" qt:proFile="mmsengine.pro" qt:qmakeArgs="-r"/>
+</component>
+</collection>
+<collection id="messagingapp" name="Messaging Application" level="app">
+<component id="messagingapp_build" filter="s60" name="MMS Engine Build">
+<!-- this should be broken up into the individual other components -->
+<unit bldFile="/app/messaging/messagingapp" qt:proFile="messagingapp.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="msgutils" filter="s60" name="Messaging Utils" introduced="^4">
+<unit bldFile="/app/messaging/messagingapp/msgutils" qt:proFile="msgutils.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="msgappfw" filter="s60" name="Messaging Application Framework" introduced="^4">
+<unit bldFile="/app/messaging/messagingapp/msgappfw" qt:proFile="msgappfw.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="msgsettings" filter="s60" name="Messaging Settings" introduced="^4">
+<unit bldFile="/app/messaging/messagingapp/msgsettings" qt:proFile="msgsettings.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="msgnotifications" filter="s60" name="Messaging Notifications" introduced="^4">
+<unit bldFile="/app/messaging/messagingapp/msgnotifications" qt:proFile="msgnotifications.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="smartmessaging" filter="s60" name="Smart Messaging">
+<unit bldFile="/app/messaging/messagingapp/smartmessaging" qt:proFile="smartmessaging.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="shareui" filter="s60" name="Shared UI" introduced="^4">
+<unit bldFile="/app/messaging/messagingapp/shareui" qt:proFile="shareui.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="msgui" filter="s60" name="Messaging UI" introduced="^4">
+<unit bldFile="/app/messaging/messagingapp/msgui" qt:proFile="msgui.pro" qt:qmakeArgs="-r"/>
+</component>
+</collection>
+<collection id="email" name="Email" level="plugin">
+<!-- use commonemail instead -->
+<component id="pop3andsmtpmtm" name="POP3 and SMTP MTM" purpose="optional" class="plugin" deprecated="^3">
+<unit bldFile="/app/messaging/email/pop3andsmtpmtm/group" mrp="/app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
+</component>
+<component id="imap4mtm" name="IMAP4 MTM" introduced="9.2" purpose="optional" class="plugin" deprecated="^3">
+<unit bldFile="/app/messaging/email/imap4mtm/group" mrp="/app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
+</component>
+</collection>
+<collection id="messaging_info" name="Messaging Apps Info" level="api">
+<component id="messaging_metadata" name="Messaging Apps Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="commonemail" level="apps" span="2" tech-domain="pr" name="Email Apps" levels="service support ui app">
+<!-- need to resolve the qt parts into proper components, then uncomment the units -->
+<collection id="email_plat" name="Email Apps Platform Interfaces" level="app">
+<component id="nmail_client_api" name="NMail Client API" class="api" filter="s60" introduced="^4">
+<!--<unit bldFile="email_plat" qt:proFile="email_plat.pro"/> -->
+</component>
+</collection>
+<collection id="emailservices" name="Email Services" level="service">
+<component id="nmailbase" filter="s60" name="NMail Base" introduced="^4">
+<!-- <unit bldFile="emailservices/nmailbase" qt:proFile="nmailbase.pro"/> -->
+</component>
+<component id="emailcommon" filter="s60" name="Email Common" introduced="^4">
+<!-- <unit bldFile="emailservices/emailcommon" qt:proFile="emailcommon.pro"/>-->
+</component>
+<component id="emailframework" filter="s60" name="Email Framework" introduced="^2">
+<!-- <unit bldFile="emailservices/emailframework" qt:proFile="emailframework.pro"/>-->
+</component>
+<component id="emailstore" filter="s60" name="Email Store" introduced="^2">
+<!-- <unit bldFile="emailservices/emailstore" qt:proFile="emailstore.pro"/>-->
+</component>
+<component id="nmclientapi" filter="s60" name="Nmail Client API" introduced="^4">
+<!-- <unit bldFile="emailservices/nmclientapi" qt:proFile="nmclientapi.pro"/>-->
+</component>
+<component id="nmailagent" filter="s60" name="Nmail Agent" introduced="^4">
+<!-- <unit bldFile="emailservices/nmailagent" qt:proFile="nmailagent.pro"/>-->
+</component>
+</collection>
+<collection id="ipsservices" name="IMAP/POP/SMTP Services" level="service">
+<component id="ipssosplugin" filter="s60" name="IPS SOS Plugin" class="plugin" introduced="^2">
+<!-- SOS? Consider spelling it out since the abbreviation is ambiguous -->
+<!--<unit bldFile="ipsservices/ipssosplugin" qt:proFile="ipssosplugin.pro" />-->
+</component>
+<component id="nmimapclientplugin" filter="s60" name="NM IMAP Client Plugin" introduced="^4" class="plugin">
+<!--<unit bldFile="ipsservices/nmimapclientplugin" qt:proFile="nmimapclientplugin.pro"/>-->
+</component>
+<component id="nmipsmtms" filter="s60" name="NM IPS Client Plugin" introduced="^4" class="plugin">
+<!-- <unit bldFile="ipsservices/nmipsmtms" qt:proFile="nmipsmtms.pro"/>-->
+</component>
+<component id="nmipssettings" filter="s60" name="NM IPS Settings" introduced="^4">
+<!-- <unit bldFile="ipsservices/nmipssettings" qt:proFile="nmipssettings.pro"/>-->
+</component>
+<component id="ipsservices_build" filter="s60" name="IPS Services Build" introduced="^2">
+<!--<unit bldFile="ipsservices" qt:proFile="ipsservices.pro"/> -->
+<!-- can the exports be broken up into the other components or made a config component?-->
+</component>
+</collection>
+<collection id="emailuis" name="Email UIs" level="app">
+<component id="nmailuiengine" filter="s60" name="Nmail UI Engine" introduced="^4">
+<!-- <unit bldFile="emailuis/nmailuiengine" qt:proFile="nmailuiengine.pro"/> -->
+</component>
+<component id="nmailuiwidgets" filter="s60" name="Nmail UI Widgets" introduced="^4">
+<!-- <unit bldFile="emailuis/nmailuiwidgets" qt:proFile="nmailuiwidgets.pro"/> -->
+</component>
+<component id="nmailuiwidgetsplugin" filter="s60" name="Nmail UI Widgets Plugin" introduced="^4" class="plugin">
+<!-- <unit bldFile="emailuis/nmailuiwidgetsplugin" qt:proFile="nmailuiwidgetsplugin.pro"/> -->
+</component>
+<component id="nmsettingui" filter="s60" name="Nmail Setting UI" introduced="^4" class="plugin">
+<!-- <unit bldFile="emailuis/nmsettingui" qt:proFile="nmsettingui.pro"/> -->
+</component>
+<component id="nmailcpplugin" filter="s60" name="Nmail CP Plugin" introduced="^4" class="plugin">
+<!-- <unit bldFile="emailuis/nmailcpplugin" qt:proFile="nmailcpplugin.pro"/> -->
+</component>
+<component id="nmailui" filter="s60" name="Nmail UI" introduced="^4">
+<!-- <unit bldFile="emailuis/nmailui" qt:proFile="nmailui.pro"/> -->
+</component>
+<component id="nmindicatorplugin" filter="s60" name="Nmail Indicator Plugin" class="plugin" introduced="^4">
+<!-- <unit bldFile="emailuis/nmindicatorplugin" qt:proFile="nmindicatorplugin.pro"/> -->
+</component>
+<component id="nmframeworkadapter" filter="s60" name="Nmail Framework Adapter" introduced="^4" class="plugin">
+<!-- <unit bldFile="emailuis/nmframeworkadapter" qt:proFile="nmframeworkadapter.pro"/> -->
+</component>
+
+</collection>
+<collection id="commonemail_info" name="Email Apps Info" level="app">
+<component id="commonemail_build" name="Email Apps Build" introduced="^4">
+<!-- split into actual components -->
+<unit bldFile="/app/commonemail" qt:proFile="nmail.pro" qt:qmakeArgs="-r"/>
+</component>
+</collection>
+</package>
+<package id="camera" level="apps" tech-domain="ma" name="Camera Apps">
+<collection id="camerauis" name="Camera UIs">
+<component id="cameraxui" filter="s60" name="CameraX UIs">
+<meta rel="testbuild">
+<group name="camera_unit_tests"/>
+</meta>
+<unit bldFile="/app/camera/camerauis/cameraxui" qt:proFile="camerax.pro" filter="!test"/>
+
+</component>
+</collection>
+</package>
+<!-- <package id="imgeditor" level="apps" tech-domain="ma" href="../../../../app/imgeditor/package_definition.xml"/> -->
+<!-- <package id="videoeditor" level="apps" tech-domain="ma" href="../../../../app/videoeditor/package_definition.xml"/> -->
+<package id="videoplayer" level="apps" tech-domain="ma" name="Video Player Apps" levels="support plugin util apps">
+<collection id="videoplayer_plat" name="Video Player Apps Platform Interfaces" level="apps">
+<component id="videoplayer_startup_api" name="Video Player Startup API" class="api" filter="s60">
+<unit bldFile="/app/videoplayer/videoplayer_plat/videoplayer_startup_api/group"/>
+</component>
+<component id="videocollection_api" name="Video Collection API" class="api" filter="s60">
+<unit bldFile="/app/videoplayer/videoplayer_plat/videocollection_api/group"/>
+</component>
+</collection>
+<collection id="videocollection" name="Video Collection" level="util">
+<component id="mpxmyvideoscollection" filter="s60" name="MPX My Videos Collection" introduced="^3">
+<unit bldFile="/app/videoplayer/videocollection/mpxmyvideoscollection/group"/>
+</component>
+<component id="videocollectionwrapper" filter="s60" name="Video Collection Wrapper" introduced="^4">
+<unit bldFile="/app/videoplayer/videocollection/videocollectionwrapper" qt:proFile="videocollectionwrapper.pro" qt:qmakeArgs="-r"/>
+</component>
+
+<component id="videocollectionview" filter="s60" name="Video Collection View" introduced="^4">
+<unit bldFile="/app/videoplayer/videocollection/videocollectionview" qt:proFile="videocollectionview.pro" qt:qmakeArgs="-r"/>
+</component>
+
+<component id="videofiledetailsview" filter="s60" name="Video File Details View" introduced="^4">
+<unit bldFile="/app/videoplayer/videocollection/videofiledetailsview" qt:proFile="videofiledetailsview.pro" qt:qmakeArgs="-r"/>
+</component>
+</collection>
+<collection id="mediasettings" name="Media Settings" level="support">
+<!-- this is really a component. Should be moved down a directory -->
+<component id="mediasettings_build" filter="s60" name="Media Settings Build">
+<unit bldFile="/app/videoplayer/mediasettings/group"/>
+</component>
+</collection>
+<collection id="videoplayerapp" name="Video Player App" level="apps">
+<component id="videoplayerengine" name="Video Player Engine" filter="s60" introduced="^4">
+<unit bldFile="/app/videoplayer/videoplayerapp/videoplayerengine" qt:proFile="videoplayerengine.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="hbvideoplayer" filter="s60" name="HB Video Player" introduced="^4">
+<unit bldFile="/app/videoplayer/videoplayerapp/hbvideoplayer" qt:proFile="hbvideoplayer.pro" qt:qmakeArgs="-r"/>
+</component>
+</collection>
+<collection id="videoplayback" name="Video Playback Plugins" level="plugin">
+<component id="hbvideoplaybackview" filter="s60" name="HB Video Playback View" class="plugin" introduced="^4">
+<unit bldFile="/app/videoplayer/videoplayback/hbvideoplaybackview" qt:proFile="hbvideoplaybackview.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="hbvideoplaybackviewplugin" filter="s60" name="HB Video Playback View Plugin" introduced="^4" class="plugin">
+<unit bldFile="/app/videoplayer/videoplayback/hbvideoplaybackviewplugin" qt:proFile="hbvideoplaybackviewplugin.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="videohelix" name="Video Helix" filter="s60" introduced="^3" class="plugin">
+<unit bldFile="/app/videoplayer/videoplayback/videohelix/group"/>
+</component>
+</collection>
+</package>
+<package id="photos" level="apps" tech-domain="ma" name="Photos" levels="util support ui app">
+<collection id="photos_group" name="Photos Group" level="support">
+<component id="photos_group_build" filter="s60" name="Photos Group Build" introduced="^4">
+<!--<unit bldFile="group" qt:proFile="group.pro"/> -->
+</component>
+</collection>
+<collection id="photos_loggers" name="Photos Loggers" level="util">
+<component id="photos_loggerqt" filter="s60" name="Photos Logger Qt" introduced="^4">
+<!--<unit bldFile="loggers/loggerqt" qt:proFile="loggerqt.pro"/> -->
+</component>
+</collection>
+<collection id="photos_commonutilities" name="Photos Common Utilities" level="util">
+<component id="photos_externalutility" filter="s60" name="Photos External Utility" introduced="^4">
+<!--<unit bldFile="commonutilities/externalutility" qt:proFile="externalutility.pro"/> -->
+</component>
+<component id="imagedecoderwrapper" filter="s60" name="Image Decoder Wrapper" introduced="^4">
+<!--<unit bldFile="commonutilities/imagedecoderwrapper" qt:proFile="imagedecoderwrapper.pro"/> -->
+</component>
+</collection>
+<collection id="photos_ui" name="Photos UI" level="ui">
+<component id="photos_uiengine" filter="s60" name="Photos UI Engine" introduced="^4">
+<!--<unit bldFile="ui/uiengine" qt:proFile="uiengine.pro"/> -->
+</component>
+<component id="photos_commandhandlers" filter="s60" name="Photos Command Handlers" introduced="^4">
+<!--<unit bldFile="ui/commandhandlers" qt:proFile="commandhandlers.pro"/> -->
+</component>
+<component id="photos_views" filter="s60" name="Photos Views" introduced="^4">
+<!--<unit bldFile="ui/views" qt:proFile="views.pro"/> -->
+</component>
+<component id="photos_viewmanagement" filter="s60" name="Photos View Management" introduced="^4">
+<!--<unit bldFile="ui/viewmanagement" qt:proFile="viewmanagement.pro"/> -->
+</component>
+</collection>
+<collection id="photos_main" name="Photos Main" level="support">
+<component id="photos_main_build" filter="s60" name="Photos Main Build" introduced="^4">
+<!--<unit bldFile="main" qt:proFile="main.pro"/> -->
+</component>
+</collection>
+<collection id="imageviewerapp" name="Image Viewer App" level="support">
+<component id="imageviewerapp_build" filter="s60" name="Image Viewer App Build" introduced="^4">
+<!--<unit bldFile="imageviewerapp" qt:proFile="imageviewerapp.pro"/> -->
+</component>
+</collection>
+<collection id="photos_info" name="Photos Info" level="support">
+<component id="photos_build" filter="s60" name="Photos Build" introduced="^4">
+<!-- split this up into the above components -->
+<unit bldFile="/app/photos" qt:proFile="photos.pro"/>
+</component>
+</collection>
+</package>
+<package id="musicplayer" level="apps" tech-domain="ma" name="Music Player Apps" levels="plugins support hs app">
+<!-- move the export .pri files into their components and uncomment the units -->
+<collection id="musicplayer_utilities " name="Music Player Utilities" level="support">
+<component id="mpnowplayingbanner" filter="s60" name="MP Now Playing Banner" introduced="^4">
+<!-- <unit bldFile="utilities/mpnowplayingbanner" qt:proFile="mpnowplayingbanner.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+<component id="mpsettingsmanager" filter="s60" name="MP Settings Manager" introduced="^4">
+<!-- <unit bldFile="utilities/mpsettingsmanager" qt:proFile="mpsettingsmanager.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+</collection>
+<collection id="musicfetcher " name="Music Fetcher" level="support">
+<!-- collection is really a component, move down a directory -->
+<component id="musicfetcher_buld" filter="s60" name="Music Fetcher Build" introduced="^4">
+<!-- <unit bldFile="musicfetcher" qt:proFile="musicfetcher.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+</collection>
+<collection id="musicplayer_app " name="Music Player Application" level="app">
+<!-- collection is really a component, move down a directory -->
+<component id="musicplayer_app_build" filter="s60" name="Music Player Application Build" introduced="^4">
+<!-- <unit bldFile="app" qt:proFile="app.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+</collection>
+<collection id="mpviewplugins " name="Music Player View Plugins" level="plugins">
+<component id="mpcollectionviewplugin" filter="s60" name="MP Collection View Plugin" introduced="^4" class="plugin">
+<!--<unit bldFile="mpviewplugins/mpcollectionviewplugin/group"/>-->
+</component>
+<component id="mpplaybackviewplugin" filter="s60" name="MP Playback View Plugin" introduced="^4" class="plugin">
+<!--<unit bldFile="mpviewplugins/mpplaybackviewplugin/group"/>-->
+</component>
+</collection>
+<collection id="mpserviceplugins" name="Music Player Service Plugins" level="plugins">
+<component id="audioeffects" filter="s60" name="Audio Effects" introduced="^4" class="plugin">
+<!--<unit bldFile="mpserviceplugins/audioeffects/group"/>-->
+</component>
+<component id="localaudio" filter="s60" name="Local Audio" introduced="^4" class="plugin">
+<!--<unit bldFile="mpserviceplugins/localaudio/group"/>-->
+</component>
+<!-- Note: it's called SQLite, not SQLLite, just the one "L" -->
+<component id="mpxsqlitedbcommon" filter="s60" name="MPX SQLite Database Common" introduced="^4">
+<!--<unit bldFile="mpserviceplugins/mpxsqlitedbcommon/group"/>-->
+</component>
+<component id="mpxsqlitedbplugin" filter="s60" name="MPX SQLite Database Plugin" introduced="^4" class="plugin">
+<!--<unit bldFile="mpserviceplugins/mpxsqlitedbplugin/group"/>-->
+</component>
+<component id="mpxsqlitepodcastdbplugin" filter="s60" name="MPX SQLlite Podcast Database Plugin" introduced="^4" class="plugin">
+<!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
+</component>
+<component id="m3uplaylistplugin" filter="s60" name="M3U Playlist Plugin" introduced="^4" class="plugin">
+<!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
+</component>
+</collection>
+<collection id="musicplayer_info" name="Music Player Apps Info" level="app">
+<component id="musicplayer_build" filter="s60" name="Music Player Build">
+<!-- should brak up into individual components -->
+<unit bldFile="/app/musicplayer" qt:proFile="qtmusicplayer.pro" qt:qmakeArgs="-r -config rom"/>
+</component>
+</collection>
+</package>
+<package id="radio" level="apps" tech-domain="ma" name="Radio Apps" levels="engine ui">
+<collection id="radioengine" name="Radio Engine" level="engine">
+<component id="radioengineutils" filter="s60" name="Radio Engine Utils" introduced="^4">
+<unit bldFile="/app/radio/radioengine/utils/group"/>
+</component>
+<component id="radioenginesettings" filter="s60" name="Radio Engine Settings" introduced="^4">
+<unit bldFile="/app/radio/radioengine/settings/group"/>
+</component>
+<component id="radioengine_engine" filter="s60" name="Radio Engine" introduced="^4">
+<unit bldFile="/app/radio/radioengine/engine/group"/>
+</component>
+</collection>
+<collection id="radioapp" name="Radio App" level="ui">
+<component id="radioenginewrapper" filter="s60" name="Radio Engine Wrapper" introduced="^4">
+<unit bldFile="/app/radio/radioapp/radioenginewrapper" qt:proFile="radioenginewrapper.pro"/>
+</component>
+<component id="radiopresetstorage" filter="s60" name="Radio Preset Storage" introduced="^4">
+<unit bldFile="/app/radio/radioapp/radiopresetstorage" qt:proFile="radiopresetstorage.pro"/>
+</component>
+<component id="radiouiengine" filter="s60" name="Radio UI Engine" introduced="^4">
+<unit bldFile="/app/radio/radioapp/radiouiengine" qt:proFile="radiouiengine.pro"/>
+</component>
+<component id="radiowidgets" filter="s60" name="Radio Widgets" introduced="^4">
+<unit bldFile="/app/radio/radioapp/radiowidgets" qt:proFile="radiowidgets.pro"/>
+</component>
+<component id="radioapplication" filter="s60" name="Radio Application" introduced="^4">
+<unit bldFile="/app/radio/radioapp/radioapplication" qt:proFile="radioapplication.pro"/>
+</component>
+<component id="radio_rom" filter="s60" name="Radio ROM" introduced="^4">
+<unit bldFile="/app/radio/rom"/>
+</component>
+</collection>
+</package>
+<package id="internetradio" level="apps" tech-domain="ma" name="Internet Radio Apps" levels="engine server ui">
+<collection id="internetradio2_0" name="Internet Radio 2.0" level="ui">
+<!-- collection is really a component. Move down a dir -->
+<component id="internetradio2_0_build" name="Internet Radio 2.0 Build">
+<unit bldFile="/app/internetradio/internetradio2.0/group"/>
+</component>
+</collection>
+<collection id="presetserver" name="Preset Server" level="server">
+<!-- collection is really a component. Move down a dir -->
+<component id="presetserver_build" name="Preset Server Build">
+<unit bldFile="/app/internetradio/presetserver/group"/>
+</component>
+</collection>
+<collection id="qtinternetradio" name="Qt Internet Radio">
+<component id="qtinternetradio_build" name="Qt Internet Radio Build">
+<!-- Move down a dir or break into components-->
+<unit bldFile="/app/internetradio/qtinternetradio" qt:proFile="all.pro" qt:qmakeArgs="-r -config rom"/>
+</component>
+
+</collection>
+</package>
+<package id="podcatcher" level="apps" tech-domain="ma" name="Podcatcher" levels="app">
+<collection id="podcatcher_info" name="Podcatcher" level="app">
+<component id="podcatcher_build" filter="sf_build" name="Podcatcher Build" introduced="^3">
+<!-- has exports from top level bld.inf -->
+<unit bldFile="/app/podcatcher/group"/>
+</component>
+<component id="podcatcher_app" filter="sf_build" name="Podcatcher Application" introduced="^3">
+<unit bldFile="/app/podcatcher/application/group"/>
+</component>
+<component id="podcatcher_engine" filter="sf_build" name="Podcatcher Engine" introduced="^3">
+<unit bldFile="/app/podcatcher/engine/group"/>
+</component>
+</collection>
+</package>
+<package id="homescreen" level="apps" tech-domain="ui" name="Home Screen Apps" levels="support task ss hs">
+<collection id="homescreen_info" name="Home Screen Info" level="support">
+<component id="homescreen_build" name="Homescreen Build">
+<!-- break this up properly into components -->
+<unit bldFile="/app/homescreen" qt:proFile="homescreen.pro" qt:qmakeArgs="-r -config rom"/>
+</component>
+</collection>
+<collection id="homescreen_test" name="Home Screen Test" level="support">
+
+</collection>
+<!-- fiill in details with broken up homescreen_build -->
+<collection id="homescreenapp" name="Home Screen Application" level="hs">
+<component id="hsutils" name="Home Screen Utils" introduced="^4"/>
+<component id="hsdomainmodel" name="HS Domain Model" introduced="^4"/>
+<component id="hs_runtimeplugins" name="HS Runtime Plugins" introduced="^4" class="plugin"/>
+<component id="hs_serviceproviders" name="HS Service Providers" introduced="^4" class="plugin"/>
+<component id="hs_stateplugins" name="HS State Plugins" introduced="^4" class="plugin"/>
+<component id="hs_widgetplugins" name="HS Widget Plugins" introduced="^4" class="plugin"/>
+<component id="hsapplication" name="Home Screen Application" introduced="^4"/>
+<component id="hshomescreenclientplugin" name="Home Screen Client Plugin" introduced="^4" class="plugin"/>
+<component id="hsmenucontentpublish" name="HS Menu Content Publish" introduced="^4"/>
+</collection>
+<collection id="screensaverapp" name="Screen Saver Application" level="ss">
+<component id="snsrutils" name="Screen Saver Utils" introduced="^4"/>
+<component id="snsr_serviceproviders" name="Screen Saver Service Providers" introduced="^4" class="plugin"/>
+<component id="snsr_stateproviders" name="Screen Saver State Providers" introduced="^4" class="plugin"/>
+<component id="snsr_runtimeproviders" name="Screen Saver Runtime Providers" introduced="^4" class="plugin"/>
+<component id="snsrapplication" name="Screen Saver Application" introduced="^4"/>
+<component id="screensaverproviders" name="Screen Saver Providers" introduced="^4" class="plugin"/>
+</collection>
+<collection id="taskswitcherapp" name="Task Switcher Application" level="task">
+<component id="taskswitcherappecom" name="Task Switcher Application ECom" introduced="^4"/>
+<component id="tsserviceplugin" name="Task Switcher Service Plugin" introduced="^4" class="plugin"/>
+<component id="ts_runtimeplugins" name="TS Runtime Plugins" introduced="^4" class="plugin"/>
+<component id="tsapplication" name="Task Switcher Application" introduced="^4"/>
+</collection>
+</package>
+<package id="jrt" level="services" tech-domain="rt" name="Java Runtime" levels="util generic rt ui">
+<collection id="jrt_plat" name="JRT Platform Interfaces" level="ui">
+<component id="java_registry_api" name="Java Registry API" class="api" filter="s60">
+<unit bldFile="/app/jrt/jrt_plat/java_registry_api/build"/>
+</component>
+<component id="java_env_info_api" name="Java Environment Info API" class="api" filter="s60">
+<unit bldFile="/app/jrt/jrt_plat/java_env_info_api/build"/>
+</component>
+<component id="java_debug_api" name="Java Debug API" class="api" filter="s60">
+<unit bldFile="/app/jrt/jrt_plat/java_debug_api/build"/>
+</component>
+</collection>
+<collection id="build_nativejava" name="Build Native Java">
+<component id="nativejava" name="Build Native Java" filter="s60" introduced="^4">
+<unit bldFile="/app/jrt/build/nativejava" qt:proFile="nativejava.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+<unit bldFile="/app/jrt/build/nativejava" qt:proFile="nativejava.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+</component>
+</collection>
+<collection id="javacommons" name="Java Commons" level="generic">
+<component id="javacommons_build" filter="s60" name="JRT Build">
+<unit bldFile="/app/jrt/javacommons" qt:proFile="javacommons.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+<unit bldFile="/app/jrt/javacommons" qt:proFile="javacommons.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+</component>
+</collection>
+<collection id="javaruntimes" name="Java Runtimes" level="rt">
+<component id="javaruntimes_build" filter="s60" name="JRT Build">
+<unit bldFile="/app/jrt/javaruntimes" qt:proFile="javaruntimes.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+<unit bldFile="/app/jrt/javaruntimes" qt:proFile="javaruntimes.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+</component>
+</collection>
+<collection id="javauis" name="Java UIs" level="ui">
+<component id="javauis_build" filter="s60" name="JRT Build">
+<unit bldFile="/app/jrt/javauis" qt:proFile="javauis.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+<unit bldFile="/app/jrt/javauis" qt:proFile="javauis.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+</component>
+</collection>
+<collection id="javamanager" level="generic">
+<component id="javamanager_build" filter="s60" name="JRT Build">
+<unit bldFile="/app/jrt/javamanager" qt:proFile="javamanager.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+<unit bldFile="/app/jrt/javamanager" qt:proFile="javamanager.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+</component>
+</collection>
+<collection id="javatools" name="Java Tools" level="util">
+<component id="javatools_build" filter="s60" name="JRT Build">
+<unit bldFile="/app/jrt/javatools" qt:proFile="javatools.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+<unit bldFile="/app/jrt/javatools" qt:proFile="javatools.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+</component>
+</collection>
+<collection id="javaextensions" name="Java Extensions" level="generic">
+<component id="javaextensions_build" filter="s60" name="JRT Build">
+<unit bldFile="/app/jrt/javaextensions" qt:proFile="javaextensions.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+<unit bldFile="/app/jrt/javaextensions" qt:proFile="javaextensions.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+</component>
+</collection>
+</package>
+<package id="browserui" level="services" tech-domain="rt" name="Browser UI" levels="utils support ui">
+<collection id="browserui_info" name="Browser UI Info" level="ui">
+<component id="browserui_build" name="Bookmarks Engine Build" introduced="^4">
+<unit bldFile="/app/browserui" qt:proFile="browserui.pro" qt:qmakeArgs=""what+=plat_101""/>
+</component>
+</collection>
+</package>
+<package id="conntools" level="services" tech-domain="dc" name="Connectivity Tools" levels="config app">
+<collection id="nettools" name="Net Tools" level="app">
+<component id="conntest" filter="s60" name="Connection Test" purpose="development">
+<unit bldFile="/app/conntools/nettools/conntest/group"/>
+</component>
+</collection>
+<collection id="emulatorlan" name="Emulator LAN" level="config">
+<!-- component is actually a colleciton, should be moved down a directory -->
+<component id="emulatorlan_build" filter="s60" name="Emulator LAN Build" class="config" purpose="development">
+<unit bldFile="/app/conntools/emulatorlan/group"/>
+</component>
+</collection>
+</package>
+<package id="rndtools" level="services" tech-domain="to" name="R&D tools" levels="support generic test util">
+<collection id="creator" name="Creator" level="support">
+<!-- collection is really a component. Should move down a directory -->
+<component id="creator_build" filter="s60" name="Creator Tool" purpose="development" target="device" class="tool">
+<unit bldFile="/app/rndtools/creator" qt:qmakeArgs="-r" qt:proFile="creator.pro"/>
+</component>
+</collection>
+<collection id="filebrowser" name="File Browser" level="util">
+<!-- consider collapsing into a single component -->
+<component id="fileopserver" filter="s60" name="File Operations Server" purpose="development" target="device" class="tool">
+<meta rel="config">
+<not-defined condition="FILEBROWSER_LITE"/>
+</meta>
+<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
+<!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
+</component>
+<component id="fileopclient" filter="s60" name="File Operations Client" purpose="development" target="device" class="tool">
+<meta rel="config">
+<not-defined condition="FILEBROWSER_LITE"/>
+</meta>
+<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
+<!--<unit bldFile="filebrowser/fileopclient/group"/>-->
+</component>
+<component id="filebrowser_build" filter="s60" name="File Browser Application" purpose="development" target="device" class="tool">
+<!-- Need to make this a self-contained component by removing #includes. Can only do when configuration is in place-->
+<unit bldFile="/app/rndtools/filebrowser/group"/>
+</component>
+</collection>
+<collection id="launcher" name="Launcher" level="util">
+<!-- collection is really a component. Should move down a directory -->
+<component id="launcher_build" filter="s60" name="Launcher Utility" purpose="development" target="device" class="tool">
+<unit bldFile="/app/rndtools/launcher/group"/>
+</component>
+</collection>
+<collection id="loadgen" name="Load Generator" level="test">
+<!-- collection is really a component. Should move down a directory -->
+<component id="loadgen_build" filter="s60" name="Load Generator Application" purpose="development" target="device" class="tool">
+<unit bldFile="/app/rndtools/loadgen/group"/>
+</component>
+</collection>
+<collection id="perfmon" name="Performance Monitor" level="test">
+<!-- collection is really a component. Should move down a directory -->
+<component id="perfmon_build" filter="s60" name="Performance Monitor Tool" purpose="development" target="device" class="tool">
+<unit bldFile="/app/rndtools/perfmon" qt:proFile="perfmon.pro"/>
+</component>
+</collection>
+<collection id="screengrabber" name="Screen Grabber" level="util">
+<!-- collection is really a component. Should move down a directory -->
+<component id="screengrabber_build" filter="s60" name="ScreenGrabber" purpose="development" target="device" class="tool">
+<unit bldFile="/app/rndtools/screengrabber" qt:proFile="screengrabber.pro"/>
+</component>
+</collection>
+<collection id="stifui" name="STIF UI" level="generic">
+<component id="stifui_avkon" filter="s60" name="STIF UI for Avkon" purpose="development" target="device">
+<unit bldFile="/app/rndtools/stifui/akvon/group"/>
+</component>
+</collection>
+<collection id="htiui" name="Harmonized Test Interface UI" level="generic">
+<component id="HtiServicePlugins" filter="s60" name="HTI Service Plugins" purpose="development" target="device" class="plugin">
+<!-- can only have a single unit. Should #include from a common bld.inf file -->
+<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
+<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
+<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
+<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
+<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
+<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
+<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
+<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiFtpBackupFake/group"/>
+</component>
+<component id="htidevicereboot" filter="s60" name="HTI Device Reboot" purpose="development" target="device">
+<unit bldFile="/app/rndtools/htiui/htidevicereboot/group"/>
+</component>
+<component id="htistartupwait" filter="s60" name="HTI Startup Wait" purpose="development" target="device">
+<unit bldFile="/app/rndtools/htiui/htistartupwait/group"/>
+</component>
+<component id="htiadmin" filter="s60" name="HTI Admin" purpose="development" target="device">
+<unit bldFile="/app/rndtools/htiui/htiadmin/group"/>
+</component>
+</collection>
+</package>
+<package id="helps" level="apps" span="2" tech-domain="ui" name="Help Apps" levels="eng tools if ui">
+<collection id="userguide" name="User Guide" level="if">
+<!-- collection is really a component. Move down a directory -->
+<component id="userguide_build" name="User Guide Build" filter="s60" introduced="^4">
+<unit bldFile="/app/helps/userguide" qt:proFile="Userguide.pro"/>
+</component>
+</collection>
+<collection id="symhelp" name="Symbian Help" level="eng">
+<component id="helpmodel" name="Help" introduced="6.0" purpose="optional">
+<unit bldFile="/app/helps/symhelp/helpmodel/group" mrp="/app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
+</component>
+</collection>
+<collection id="helps_info" name="Help Apps Info" level="ui">
+<component id="helps_metadata" name="Help Apps Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/app/helps/helps_info/helps_metadata/helps_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="techview" level="apps" span="2" tech-domain="ui" name="Techview" levels="services ui utils apps1 apps2 apps3">
+<collection id="buildverification" name="Build Verification" level="services">
+<component id="autosmoketest" name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
+<unit bldFile="/app/techview/buildverification/autosmoketest/Group" mrp="/app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
+</component>
+<component id="smoketest" name="Smoke Test" filter="gt" purpose="development">
+<unit bldFile="/app/techview/buildverification/smoketest/Group" mrp="/app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
+</component>
+</collection>
+<collection id="techviewplat" name="Techview Platform" level="services">
+
+
+
+</collection>
+<collection id="techviewui" name="Techview UI" level="ui">
+
+
+
+
+</collection>
+<collection id="tv_controlpanel" name="Control Panel" level="ui">
+
+
+
+
+</collection>
+<collection id="pimapps" name="PIM Apps" level="apps3">
+
+
+
+</collection>
+<collection id="securityapps" name="Security Apps" level="apps3">
+
+
+</collection>
+<collection id="utilityapps" name="Utility Apps" level="apps2">
+
+
+
+</collection>
+<collection id="installationapps" name="Installation Apps" level="apps2">
+
+</collection>
+<collection id="messagingapps" name="Messaging Apps" level="apps2">
+
+</collection>
+<collection id="telephonyapps" name="Telephony Apps" level="apps1">
+
+</collection>
+<collection id="networkingapps" name="Networking Apps" level="apps1">
+
+
+
+</collection>
+<collection id="networkingutils" name="Networking Utils" level="utils">
+
+
+</collection>
+<collection id="shortlinkapps" name="Shortlink Apps" level="apps1">
+
+
+
+</collection>
+<collection id="testapps" name="Test Apps" level="utils">
+
+
+
+
+
+</collection>
+<collection id="avapps" name="A/V Apps" level="apps3">
+
+</collection>
+<collection id="toolkit" name="Toolkit" level="utils">
+
+
+
+</collection>
+<collection id="techview_info" name="Techview Info" level="apps3">
+<component id="techview_metadata" name="Techview Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/app/techview/techview_info/techview_metadata/techview_metadata.mrp"/>
+</component>
+</collection>
+</package>
+</layer>
+</systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian4/single/sysdefs/system_model.surge.xml Tue Jul 13 12:21:44 2010 +0100
@@ -0,0 +1,8682 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^4" schema="2.0.1">
+<systemModel>
+<layer name="adaptation" long-name="Adaptation" levels="low mw high">
+<block name="stubs" level="high" span="2" long-name="Stubs" levels="adaptation plugin mid engine">
+<collection name="audiostubs" long-name="Audio Stubs" level="adaptation">
+<component name="devsoundextensions_stubs" long-name="Devsound Extensions Stubs">
+<unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/group"/>
+</component>
+<component name="fmradiotunercontrolstub" long-name="FM Radio Tuner Control Stub">
+<unit bldFile="adaptation/stubs/audiostubs/fmradiotunercontrolstub/group"/>
+</component>
+</collection>
+<collection name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaptation Stub" level="adaptation">
+<component name="btaudioadaptation_stub_build" long-name="Bluetooth Audio Adaptation Stub Build" filter="oem_build">
+<unit bldFile="adaptation/stubs/btaudioadaptation_stub/group"/>
+</component>
+</collection>
+<collection name="drm_stubs" long-name="DRM Stubs" level="plugin">
+<component name="drm_stubs_build" long-name="DRM Stubs Build">
+<unit bldFile="adaptation/stubs/drm_stubs/group"/>
+</component>
+</collection>
+<collection name="ocrsrv_stub" long-name="OCR Services Stub" level="mid">
+<component name="ocrsrv_stub_build" long-name="OCR Services Stub Build" filter="!dfs_build">
+<unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
+</component>
+</collection>
+<collection name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
+<component name="omasuplasnconverterstubimpl_build" long-name="OMA SUPL ASN Converter Stub Implementation Build" filter="!dfs_build">
+<unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
+</component>
+</collection>
+<collection name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" level="plugin">
+<component name="posmsgpluginreferenceimpl_build" long-name="POS Message Plugin Reference Implementation Build" plugin="Y">
+<unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
+</component>
+</collection>
+<collection name="srsfenginestub" long-name="SRSF Engine Stub" level="engine">
+<component name="srsfenginestub_build" long-name="SRSF Engine Stub Build" filter="stubs">
+<unit bldFile="adaptation/stubs/srsfenginestub/group"/>
+</component>
+</collection>
+<collection name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub" level="plugin">
+<component name="power_save_display_mode_stub_build" long-name="Power Save Display Mode Stub Build">
+<unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
+</component>
+</collection>
+<collection name="systemswstubs" long-name="System Software Stubs" level="adaptation">
+<component name="ddcaccessstub" long-name="DDC Access Stub">
+<unit bldFile="adaptation/stubs/systemswstubs/ddcaccessstub/group"/>
+</component>
+<component name="tvoutconfig" long-name="TV Out Config">
+<unit bldFile="adaptation/stubs/systemswstubs/TVOutConfig/group" filter="oem_build"/>
+</component>
+<component name="accessorypolicyreference" long-name="Accessory Policy Reference">
+<unit bldFile="adaptation/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
+</component>
+<component name="asyreference" long-name="ASY Reference" plugin="Y">
+<unit bldFile="adaptation/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
+</component>
+<component name="examplecommonisc" long-name="Example Common ISC">
+<unit bldFile="adaptation/stubs/systemswstubs/examplecommonisc/group" filter="oem_build"/>
+</component>
+<component name="exampledsy" long-name="Example DSY">
+<unit bldFile="adaptation/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
+</component>
+<component name="featuremanagerstub" long-name="Feature Manager Stub">
+<unit bldFile="adaptation/stubs/systemswstubs/featuremanagerstub/group" filter="oem_build"/>
+</component>
+<component name="hwrmstubplugins" long-name="Hardware Resource Manager Stub Plugins" plugin="Y">
+<unit bldFile="adaptation/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
+</component>
+<component name="hwrmhapticsstubplugin" long-name="Hardware Resource Manager Haptics Stub Plugin" plugin="Y">
+<unit bldFile="adaptation/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
+</component>
+<component name="sensorchannelsreference" long-name="Sensor Channels Reference">
+<unit bldFile="adaptation/stubs/systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
+</component>
+<component name="ssyreference" long-name="SSY Reference" plugin="Y">
+<unit bldFile="adaptation/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
+</component>
+<component name="startupadaptationstub" long-name="Startup Adaptation Stub" plugin="Y">
+<unit bldFile="adaptation/stubs/systemswstubs/startupadaptationstub/group" filter="oem_build"/>
+</component>
+<component name="tiltcompensationstub" long-name="Tilt Compensation Stub">
+<unit bldFile="adaptation/stubs/systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
+</component>
+<component name="tvoutbehaviour" long-name="TV Out Behaviour">
+<unit bldFile="adaptation/stubs/systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
+</component>
+<component name="wiredbearerreference" long-name="Wired Bearer Reference" plugin="Y">
+<unit bldFile="adaptation/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
+</component>
+</collection>
+<collection name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" level="engine">
+<component name="tactileclickplugin_stub_build" long-name="Tactile Click Plugin Stub Build" plugin="Y">
+<unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
+</component>
+</collection>
+<collection name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub" level="mid">
+<component name="wlanhwinit_stub_build" long-name="WLAN Hardware Init Stub Build">
+<unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
+</component>
+</collection>
+</block>
+<block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
+<collection name="omap3530" long-name="OMAP 3530" level="hw-if">
+<component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
+<unit bldFile="adaptation/beagleboard/omap3530" mrp="adaptation/beagleboard/omap3530/base_beagle.mrp"/>
+</component>
+<component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
+<unit bldFile="adaptation/beagleboard/omap3530/kernel"/>
+</component>
+<component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
+<unit bldFile="adaptation/beagleboard/omap3530/beagleboard"/>
+</component>
+</collection>
+</block>
+<block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
+<collection name="qemu_baseport" long-name="Baseport" level="hw-if">
+<component name="syborg" long-name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
+<unit bldFile="adaptation/qemu/baseport/syborg" mrp="adaptation/qemu/baseport/syborg/syborg.mrp"/>
+</component>
+</collection>
+</block>
+</layer>
+<layer name="os" long-name="OS" levels="hw services">
+<block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
+<collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
+<component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
+<unit bldFile="os/kernelhwsrv/brdbootldr/ubootldr" mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
+</component>
+</collection>
+<collection name="bsptemplate" long-name="Board Support Package Template" level="hw-if">
+<component name="asspandvariant" long-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 name="kernel" long-name="Kernel Architecture" level="adaptation">
+<component name="eka" long-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 name="kerneltest" long-name="Kernel Test" level="hw-if">
+<component name="e32utils" long-name="E32 Utilities" purpose="development">
+<unit bldFile="os/kernelhwsrv/kerneltest/e32utils/group" mrp="os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/>
+</component>
+<component name="e32test" long-name="E32 Tests" purpose="development">
+<unit bldFile="os/kernelhwsrv/kerneltest/e32test/group" mrp="os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
+</component>
+<component name="f32test" long-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 name="ldds" long-name="Logical Device Drivers" level="adaptation">
+<component name="ethernetldd" long-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 name="audioldd" long-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>
+<component name="serialldd" long-name="Serial Port Drivers" purpose="optional">
+<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
+</component>
+<component name="legacydrivers" long-name="Legacy Drivers" purpose="optional">
+<unit mrp="os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
+</component>
+<component name="locmedia" long-name="Local Media Subsystem" introduced="8.1b" purpose="mandatory">
+<!-- these are LDDs for storage media-->
+<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
+</component>
+<component name="runmodedebugger" long-name="Run Mode Debugger" purpose="mandatory">
+<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/debug/group" mrp="os/kernelhwsrv/kernel/eka/drivers/debug/group/base_e32_drivers_debug.mrp"/>
+</component>
+<component name="btrace" long-name="Kernel Trace Tool" purpose="mandatory">
+<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/trace" mrp="os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
+</component>
+<component name="cameraldd" long-name="Camera Drivers" introduced="^3" purpose="optional">
+<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/camerasc" mrp="os/kernelhwsrv/kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
+</component>
+<component name="displayldd" long-name="Display Drivers" introduced="^3" purpose="optional">
+<!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
+<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/display" mrp="os/kernelhwsrv/kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
+</component>
+<component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b" purpose="optional">
+<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
+</component>
+<component name="usbdescriptors" long-name="USB Descriptors" purpose="optional">
+<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors" mrp="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors/base_drivers_usbdescriptors.mrp"/>
+</component>
+<component name="usbdi_utils" long-name="USB DI Utils" purpose="optional">
+<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils" mrp="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils/base_drivers_usbdi_utils.mrp"/>
+</component>
+</collection>
+<collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
+<component name="mediadrivers" long-name="Media Drivers" purpose="optional">
+<!-- these are for storage media-->
+<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/media" mrp="os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
+</component>
+<component name="genericboardsupport" long-name="Generic Board Support" purpose="optional">
+<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
+</component>
+</collection>
+<collection name="userlibandfileserver" long-name="User Library and File Server" level="framework">
+<component name="euser" long-name="User Library" purpose="mandatory">
+<unit bldFile="os/kernelhwsrv/kernel/eka/euser" mrp="os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
+</component>
+<component name="compsupp" long-name="RVCT Compiler Runtime Support" filter="gt" purpose="mandatory">
+<unit bldFile="os/kernelhwsrv/kernel/eka/compsupp" mrp="os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
+</component>
+<component name="compsupp_gcc" long-name="GCC Compiler Runtime Support" filter="gt,sf_build" purpose="mandatory">
+<unit bldFile="os/kernelhwsrv/kernel/eka/compsupp/gcce"/>
+</component>
+<component name="fileserver" long-name="File Server" filter="gt" purpose="mandatory">
+<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
+</component>
+<component name="estart" long-name="Base Starter" filter="gt" purpose="optional">
+<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
+</component>
+<component name="domainmgr" long-name="Domain Manager" introduced="8.1b" purpose="mandatory">
+<unit bldFile="os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
+</component>
+</collection>
+<collection name="filesystems" long-name="File Systems" level="framework">
+<component name="romfs" long-name="ROM File System" filter="gt" purpose="optional" plugin="Y">
+<unit mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
+</component>
+<component name="rofs" long-name="ROFS" filter="gt" purpose="optional" plugin="Y">
+<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
+</component>
+<component name="usbmsfs" long-name="USB Mass Storage File System" filter="gt" purpose="optional" plugin="Y">
+<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
+</component>
+<component name="usbhostmssrv" long-name="USB Host Mass Storage Server" filter="gt" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage/base_f32_shostmassstorage.mrp"/>
+</component>
+<component name="fat32fs" long-name="FAT32 File System" filter="gt" purpose="optional" plugin="Y">
+<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
+</component>
+<component name="fatfs" long-name="FAT File System" filter="gt" purpose="optional" plugin="Y">
+<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
+</component>
+<component name="compfs" long-name="Composite File System" filter="gt" purpose="optional" plugin="Y">
+<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
+</component>
+</collection>
+<collection name="halservices" long-name="HAL Services" level="framework">
+<component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
+<unit bldFile="os/kernelhwsrv/halservices/hal" mrp="os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
+</component>
+</collection>
+<collection name="textmodeshell" long-name="Text Mode Shell" level="test">
+<component name="e32wsrv" long-name="Text Window Server" purpose="optional">
+<unit bldFile="os/kernelhwsrv/kernel/eka/ewsrv" mrp="os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
+</component>
+<component name="textshell" long-name="Text Shell" filter="gt" purpose="development">
+<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
+</component>
+</collection>
+<collection name="baseapitest" long-name="Base API Tests" level="test"/>
+<collection name="kernelhwsrv_info" long-name="Kernel and Hardware Services Info" level="test">
+<component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 config">
+<collection name="emulator" long-name="Emulator" level="bsp">
+<component name="emulatorbsp" long-name="Emulator BSP" purpose="optional">
+<unit bldFile="os/boardsupport/emulator/emulatorbsp" mrp="os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
+</component>
+</collection>
+<collection name="haitest" long-name="HAI Test Suites" level="test">
+<component name="bspsvs" long-name="BSP Verification Suite" introduced="^2" purpose="development">
+<unit mrp="os/boardsupport/haitest/bspsvs/group/bspsvs.mrp"/>
+</component>
+</collection>
+<collection name="boardsupport_info" long-name="Board Support Info" level="config">
+<component name="boardsupport_metadata" long-name="Board Support Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/boardsupport/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
+<collection name="bldsystemtools" long-name="Build System Tools" level="bld">
+<component name="sysdeftools" long-name="System Definition Tools" purpose="development" introduced="^2">
+<unit mrp="os/buildtools/bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
+</component>
+<component name="commonbldutils" long-name="Common Utils" purpose="development">
+<unit mrp="os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
+</component>
+</collection>
+<collection name="toolsandutils" long-name="Tools and Utils" level="mw">
+<component name="productionbldtools" long-name="Production Build Tools" filter="gt" purpose="development">
+<unit mrp="os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
+</component>
+<component name="e32tools" long-name="E32 Tools" deprecated="^2" purpose="development" class="PC">
+<unit bldFile="os/buildtools/toolsandutils/e32tools/group" mrp="os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
+</component>
+<component name="autotest" long-name="Autotest" purpose="development">
+<unit bldFile="os/buildtools/toolsandutils/autotest/group" mrp="os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
+</component>
+</collection>
+<collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
+<component name="e32toolp" long-name="E32 Perl Tools" purpose="development" filter="sf_build" class="PC">
+<unit mrp="os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="os/buildtools/sbsv1_os/e32toolp/group"/>
+</component>
+</collection>
+<collection name="imgtools_os" long-name="Image Tools" level="fw">
+<component name="romkiteka2" long-name="ROMKIT EKA2" deprecated="^2" purpose="development">
+<unit bldFile="os/buildtools/imgtools_os/romkiteka2/group" mrp="os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
+</component>
+</collection>
+<collection name="misccomponents" long-name="Misc Components" level="mw">
+<component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt" purpose="development">
+<unit bldFile="os/buildtools/misccomponents/emulatorlauncher/group" mrp="os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
+</component>
+</collection>
+<collection name="buildtools_info" long-name="Build Tools Info" level="ui">
+<component name="buildtools_metadata" long-name="Build Tools Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/buildtools/buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
+<collection name="ossrv_pub" long-name="Generic OS Services Public Interfaces" level="utilities">
+<component name="boost_apis" long-name="Boost APIs" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/boost_apis/group"/>
+</component>
+<component name="cpp_wrappers" long-name="Cpp wrappers" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/cpp_wrappers/group"/>
+</component>
+<component name="character_type_apis" long-name="Character Type APIs" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/character_type_apis/group"/>
+</component>
+<component name="compiler_specific_runtime_support" long-name="Compiler Specific Runtime Support" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/compiler_specific_runtime_support/group"/>
+</component>
+<component name="ossrv_configuration_api" long-name="Generic OS Services Configuration API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/configuration/group"/>
+</component>
+<component name="crypto_authentication_codes_and_hash_functions_api" long-name="Crypto Authentication Codes and Hash Functions API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
+</component>
+<component name="crypto_auxillary_functions_api" long-name="Crypto Auxillary Functions API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/crypto_auxillary_functions_api/group"/>
+</component>
+<component name="crypto_certificates_api" long-name="Crypto Certificates API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/crypto_certificates_api/group"/>
+</component>
+<component name="crypto_inputoutput_and_data_encoding_api" long-name="Crypto Input/Output and Data Encoding API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
+</component>
+<component name="crypto_public_key_cryptography_and_key_agreement_api" long-name="Crypto Public Key Cryptography and Key Agreement API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
+</component>
+<component name="crypto_symmetric_ciphers_api" long-name="Crypto Symmetric Ciphers API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/crypto_symmetric_ciphers_api/group"/>
+</component>
+<component name="crypto_utility_functions_api" long-name="Crypto Utility Functions API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/crypto_utility_functions_api/group"/>
+</component>
+<component name="cryptogaphy_related_api" long-name="Cryptogaphy Related API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/cryptogaphy_related_api/group"/>
+</component>
+<component name="ossrv_debug_api" long-name="Generic OS Services Debug API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/debug/group"/>
+</component>
+<component name="ossrv_exceptions_api" long-name="Generic OS Services Exceptions API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/exceptions/group"/>
+</component>
+<component name="io_stream_api" long-name="I/O stream API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/io_stream_api/group"/>
+</component>
+<component name="localization_function_api" long-name="Localization Function API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/localization_function_api/group"/>
+</component>
+<component name="math_operations_api" long-name="Math Operations API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/math_operations_api/group"/>
+</component>
+<component name="ossrv_memory_api" long-name="Generic OS Services Memory API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/memory/group"/>
+</component>
+<component name="no_namespace_headers" long-name="No Namespace Headers" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/no_namespace_headers/group"/>
+</component>
+<component name="openc_headers" long-name="OpenC headers" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/openc_headers/group"/>
+</component>
+<component name="openc_wrappers" long-name="OpenC wrappers" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/openc_wrappers/group"/>
+</component>
+<component name="ssl_general_api" long-name="SSL General API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/ssl_general_api/group"/>
+</component>
+<component name="ssl_protocol_methods_api" long-name="SSL Protocol Methods API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/ssl_protocol_methods_api/group"/>
+</component>
+<component name="standard_compressiondecompression_api" long-name="Standard Compression/Decompression API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/standard_compressiondecompression_api/group"/>
+</component>
+<component name="stl" long-name="STL API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/stl/group"/>
+</component>
+<component name="thread_api" long-name="Thread API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/thread_api/group"/>
+</component>
+<component name="type_attributes" long-name="Type Attributes API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/type_attributes/group"/>
+</component>
+<component name="typeinfo" long-name="Type Info API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/typeinfo/group"/>
+</component>
+<component name="utility_apis" long-name="Utility APIs" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/utility_apis/group"/>
+</component>
+<component name="wide_character_classapis" long-name="Wide character class/apis" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/wide_character_classapis/group"/>
+</component>
+<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_api" long-name="D-Bus GLib API" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_pub/dbus-glib/group"/>
+</component>
+</collection>
+<collection name="ossrv_plat" long-name="Generic OS Services Platform Interfaces" level="utilities">
+<component name="libutils_apis" long-name="Utility Library APIs" filter="s60" class="api">
+<unit bldFile="os/ossrv/ossrv_plat/libutils/group"/>
+</component>
+</collection>
+<collection name="stdlibs" long-name="Standard Libraries" level="translation">
+<component name="libz" filter="s60" long-name="Z Compression Library">
+<unit bldFile="os/ossrv/stdlibs/libz/group"/>
+</component>
+<component name="libcrypt" filter="s60" long-name="Crypt Library">
+<unit bldFile="os/ossrv/stdlibs/libcrypt/group"/>
+</component>
+</collection>
+<collection name="ssl" long-name="SSL" level="data-services">
+<component name="libcrypto" filter="s60" long-name="Crypto Library">
+<unit bldFile="os/ossrv/ssl/libcrypto/group"/>
+</component>
+<component name="libssl" filter="s60" purpose="development" long-name="SSL Library">
+<unit bldFile="os/ossrv/ssl/libssl/group"/>
+</component>
+</collection>
+<collection name="glib" long-name="GLib" level="utilities">
+<component name="glibbackend" filter="s60" long-name="GLib Backend">
+<unit bldFile="os/ossrv/glib/build/symbian/glibbackend/group"/>
+<!-- Move to here: <unit bldFile="glib/glibbackend/group"/> -->
+</component>
+<component name="libglib" filter="s60" long-name="GLib Library">
+<unit bldFile="os/ossrv/glib/build/symbian/glib/group"/>
+<!-- Move to here: <unit bldFile="glib/libglib/group"/> -->
+</component>
+<component name="libgthread" filter="s60" long-name="Libg Thread">
+<unit bldFile="os/ossrv/glib/build/symbian/gthread/group"/>
+<!-- Move to here: <unit bldFile="glib/libgthread/group"/> -->
+</component>
+<component name="libgmodule" filter="s60" long-name="Libg Module">
+<unit bldFile="os/ossrv/glib/build/symbian/gmodule/group"/>
+<!-- Move to here: <unit bldFile="glib/libgmodule/group"/> -->
+</component>
+<component name="libgobject" filter="s60" long-name="Libg Object">
+<unit bldFile="os/ossrv/glib/build/symbian/gobject/group"/>
+<!-- Move to here: <unit bldFile="glib/libgobject/group"/> -->
+</component>
+</collection>
+<collection name="stdcpp" long-name="C++ Standard Library" level="translation">
+<!-- collection is really a component. Needs to be moved down a directory -->
+<component name="stdcpp_build" filter="s60" long-name="Stdcpp">
+<unit bldFile="os/ossrv/stdcpp/group"/>
+</component>
+</collection>
+<collection name="ofdbus" long-name="Open Foundation D-Bus" level="utilities">
+<component name="dbus" filter="s60" long-name="D-Bus">
+<unit bldFile="os/ossrv/ofdbus/dbus/group"/>
+</component>
+<component name="dbus-glib" filter="s60" long-name="D-Bus GLib">
+<unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
+</component>
+<component name="ofdbus_rom" filter="s60" long-name="D-Bus ROM">
+<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory
+ Consider moving IBY file to one of the above as well and removing this component entirely -->
+<unit bldFile="os/ossrv/ofdbus/group"/>
+</component>
+</collection>
+<collection name="utilitylibraries" long-name="Utility Libraries" level="encoding">
+<component name="libutils" filter="s60" long-name="Utility Library">
+<unit bldFile="os/ossrv/utilitylibraries/libutils/group"/>
+</component>
+</collection>
+<collection name="genericservices" long-name="Generic Services" level="utilities">
+<component name="s60compatibilityheaders" long-name="S60 Compatibility Headers" filter="gt" purpose="optional">
+<unit bldFile="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp" version="tb101sf"/>
+</component>
+<component name="mimerecognitionfw" long-name="MIME Recognition Framework" purpose="mandatory">
+<unit bldFile="os/ossrv/genericservices/mimerecognitionfw/group" mrp="os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
+</component>
+<component name="systemagent" long-name="System Agent" introduced="9.0" purpose="mandatory">
+<unit bldFile="os/ossrv/genericservices/systemagent/group" mrp="os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
+</component>
+<component name="taskscheduler" long-name="Task Scheduler" introduced="6.0" purpose="optional">
+<unit bldFile="os/ossrv/genericservices/taskscheduler/group" mrp="os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
+</component>
+<component name="activebackupclient" long-name="Active Backup Client" purpose="optional">
+<unit bldFile="os/ossrv/genericservices/activebackupclient/group" mrp="os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
+</component>
+<component name="syslibsdocs" long-name="Syslibs Documentation" purpose="development" class="doc">
+<unit mrp="os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
+</component>
+<component name="httputils" long-name="HTTP Utilities Library" introduced="6.2" purpose="optional">
+<unit bldFile="os/ossrv/genericservices/httputils/group" mrp="os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
+</component>
+</collection>
+<collection name="syslibsapitest" long-name="SysLibs API Tests" level="utilities"/>
+<collection name="compressionlibs" long-name="Compression Libraries" level="data-services">
+<component name="ziplib" long-name="Zip Compression Library" introduced="6.0" purpose="mandatory">
+<unit bldFile="os/ossrv/compressionlibs/ziplib/group" mrp="os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
+</component>
+</collection>
+<collection name="genericopenlibs" long-name="Generic Open Libraries" level="translation">
+<component name="cstdlib" long-name="C Standard Library" introduced="ER5" purpose="optional">
+<unit bldFile="os/ossrv/genericopenlibs/cstdlib/group" mrp="os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
+</component>
+<component name="cppstdlib" long-name="C++ Standard Library" introduced="^3" purpose="mandatory">
+<unit bldFile="os/ossrv/genericopenlibs/cppstdlib/group" mrp="os/ossrv/genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
+</component>
+<component name="openenvcore" long-name="Open Environment Core" introduced="^2" purpose="mandatory">
+<unit bldFile="os/ossrv/genericopenlibs/openenvcore/group" mrp="os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
+</component>
+<component name="posixrealtimeextensions" long-name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
+<unit bldFile="os/ossrv/genericopenlibs/posixrealtimeextensions/group" mrp="os/ossrv/genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
+</component>
+<component name="liboil" long-name="Liboil" introduced="^4" purpose="optional">
+<unit bldFile="os/ossrv/genericopenlibs/liboil/group" mrp="os/ossrv/genericopenlibs/liboil/group/oeaddons_liboil.mrp"/>
+</component>
+</collection>
+<collection name="lowlevellibsandfws" long-name="Low Level Libraries and Frameworks" level="app-libs">
+<component name="pluginfw" long-name="Plugin Framework" introduced="6.2" purpose="mandatory">
+<unit bldFile="os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp" version="3"/>
+</component>
+<component name="apputils" long-name="Application Utilities" introduced="ER5" purpose="mandatory">
+<unit bldFile="os/ossrv/lowlevellibsandfws/apputils/group" mrp="os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
+</component>
+<component name="genericusabilitylib" long-name="Generic Usability Library" introduced="^3" purpose="mandatory">
+<unit bldFile="os/ossrv/lowlevellibsandfws/genericusabilitylib/group" mrp="os/ossrv/lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
+</component>
+</collection>
+<collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
+<component name="ossrv_build" filter="s60" long-name="Generic OS Services Build">
+<!-- exports should be moved to individual components -->
+<unit bldFile="os/ossrv/group"/>
+</component>
+<component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
+<collection name="featuremgmt" long-name="Feature Management" level="framework">
+<component name="featuremgr" long-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 name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="^3" purpose="mandatory">
+<unit bldFile="os/persistentdata/featuremgmt/featureregistry/group" mrp="os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
+</component>
+</collection>
+<collection name="loggingservices" long-name="Logging Services" level="server">
+<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" 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">
+<unit bldFile="os/persistentdata/loggingservices/rfilelogger/group" mrp="os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
+</component>
+</collection>
+<collection name="traceservices" long-name="Trace Services" level="server">
+<component name="commsdebugutility" long-name="Comms Debug Utility" introduced="7.0s" purpose="optional">
+<unit bldFile="os/persistentdata/traceservices/commsdebugutility/group" mrp="os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
+</component>
+<component name="tracefw" long-name="Trace Framework" introduced="9.2" purpose="development">
+<unit bldFile="os/persistentdata/traceservices/tracefw/ulogger/group" mrp="os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
+</component>
+</collection>
+<collection name="persistentstorage" long-name="Persistent Storage" level="framework">
+<component name="store" long-name="Store" purpose="optional">
+<unit bldFile="os/persistentdata/persistentstorage/store/group" mrp="os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
+</component>
+<component name="dbms" long-name="DBMS" purpose="optional">
+<unit bldFile="os/persistentdata/persistentstorage/dbms/group" mrp="os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
+</component>
+<component name="centralrepository" long-name="Central Repository" introduced="7.0s" purpose="mandatory">
+<unit bldFile="os/persistentdata/persistentstorage/centralrepository/group" mrp="os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
+</component>
+<component name="sql" long-name="SQL" introduced="9.3" purpose="optional">
+<unit bldFile="os/persistentdata/persistentstorage/sql/GROUP" mrp="os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
+</component>
+<component name="sqlite3api" long-name="SQLite 3 API" introduced="^3" purpose="optional">
+<unit bldFile="os/persistentdata/persistentstorage/sqlite3api/GROUP" mrp="os/persistentdata/persistentstorage/sqlite3api/GROUP/syslibs_sqlite3.mrp"/>
+</component>
+</collection>
+<collection name="persistentdata_info" long-name="Persistent Data Services Info" level="app-if">
+<component name="persistentdata_metadata" long-name="Persistent Data Services Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/persistentdata/persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
+<collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
+<component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" class="api">
+<unit bldFile="os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
+</component>
+<component name="common_platform_security_definitions_api" long-name="Common Platform Security Definitions API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group"/>
+</component>
+<component name="feature_discovery_api" long-name="Feature Discovery API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/group"/>
+</component>
+<component name="platform_environment_api" long-name="Platform Environment API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_pub/platform_environment_api/group"/>
+</component>
+<component name="sensor_channel_api" long-name="Sensor Channel API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_pub/sensor_channel_api/group"/>
+</component>
+<component name="sensor_definitions_api" long-name="Sensor Definitions API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_pub/sensor_definitions_api/group"/>
+</component>
+<component name="version_info_api" long-name="Version Info API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/group"/>
+</component>
+<component name="accessory_monitoring_api" long-name="Accessory Monitoring API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/group"/>
+</component>
+<component name="haptics_api" long-name="Haptics API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_pub/haptics_api/group"/>
+</component>
+<component name="sensor_data_compensator_api" long-name="Sensor Data Compensator API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
+</component>
+</collection>
+<collection name="devicesrv_plat" long-name="Device Services Platform Interfaces" level="app-if">
+<component name="configuration_file_parser_api" long-name="Configuration File Parser API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/configuration_file_parser_api/group"/>
+</component>
+<component name="dos_extension_plugin_api" long-name="DOS Extension Plug-In API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_plugin_api/group"/>
+</component>
+<component name="mediator_command_initiator_api" long-name="Mediator Command Initiator API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_initiator_api/group"/>
+</component>
+<component name="syslangutil_api" long-name="SysLangUtil API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/syslangutil_api/group"/>
+</component>
+<component name="wakeup_alarm_api" long-name="Wakeup Alarm API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/wakeup_alarm_api/group"/>
+</component>
+<component name="disk_and_memory_level_keys_api" long-name="Disk and Memory Level Keys API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/disk_and_memory_level_keys_api/group"/>
+</component>
+<component name="mediator_plugin_api" long-name="Mediator Plugin API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/mediator_plugin_api/group"/>
+</component>
+<component name="headset_status_api" long-name="Headset Status API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/headset_status_api/group"/>
+</component>
+<component name="system_startup_extension_plugin_api" long-name="System Startup Extension Plugin API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/system_startup_extension_plugin_api/group"/>
+</component>
+<component name="sensor_plugin_api" long-name="Sensor Plugin API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/sensor_plugin_api/group"/>
+</component>
+<component name="accessory_api" long-name="Accessory API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/accessory_api/group"/>
+</component>
+<component name="display_language_definition_api" long-name="Display Language Definition API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/display_language_definition_api/group"/>
+</component>
+<component name="mediator_command_responder_api" long-name="Mediator Command Responder API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_responder_api/group"/>
+</component>
+<component name="accessory_policy_definitions_api" long-name="Accessory Policy Definitions API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_definitions_api/group"/>
+</component>
+<component name="hw_settings_api" long-name="Hardware Settings API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/hw_settings_api/group"/>
+</component>
+<component name="mediator_domain_definitions_api" long-name="Mediator Domain Definitions API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/mediator_domain_definitions_api/group"/>
+</component>
+<component name="sensor_extension_api" long-name="Sensor Extension API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/sensor_extension_api/group"/>
+</component>
+<component name="accessory_plugin_api" long-name="Accessory Plugin API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/accessory_plugin_api/group"/>
+</component>
+<component name="sae_api" long-name="SAE API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/sae_api/group"/>
+</component>
+<component name="accessory_control_api" long-name="Accessory Control API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/accessory_control_api/group"/>
+</component>
+<component name="mediator_static_registration_api" long-name="Mediator Static Registration API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/mediator_static_registration_api/group"/>
+</component>
+<component name="accessory_key_event_handling_api" long-name="Accessory Key Event Handling API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/accessory_key_event_handling_api/group"/>
+</component>
+<component name="mediator_notification_api" long-name="Mediator Notification API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/mediator_notification_api/group"/>
+</component>
+<component name="accessory_policy_utility_api" long-name="Accessory Policy Utility API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_utility_api/group"/>
+</component>
+<component name="common_dsy_plugin_api" long-name="Common DSY Plugin API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/common_dsy_plugin_api/group"/>
+</component>
+<component name="remote_control_extension_api" long-name="Remote Control Extension API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/remote_control_extension_api/group"/>
+</component>
+<component name="sensor_channel_filter_api" long-name="Sensor Channel Filter API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/sensor_channel_filter_api/group"/>
+</component>
+<component name="dos_extension_api" long-name="DOS Extension API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_api/group"/>
+</component>
+<component name="accessory_audio_control_api" long-name="Accessory Audio Control API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/accessory_audio_control_api/group"/>
+</component>
+<component name="mediator_event_consumer_api" long-name="Mediator Event Consumer API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_consumer_api/group"/>
+</component>
+<component name="shared_data_api" long-name="Shared Data API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/shared_data_api/group"/>
+</component>
+<component name="accessory_settings_api" long-name="Accessory Settings API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/accessory_settings_api/group"/>
+</component>
+<component name="accessory_bluetooth_control_api" long-name="Accessory Bluetooth Control API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/accessory_bluetooth_control_api/group"/>
+</component>
+<component name="extended_version_info_api" long-name="Extended Version Info API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_api/group"/>
+</component>
+<component name="mediator_event_provider_api" long-name="Mediator Event Provider API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_provider_api/group"/>
+</component>
+<component name="tv_out_config_api" long-name="TV Out Config API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_config_api/group"/>
+</component>
+<component name="tspclientmapper_api" long-name="TSP Client Mapper API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/tspclientmapper_api/group"/>
+</component>
+<component name="powersave_api" long-name="Power Save API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/powersave_api/group"/>
+</component>
+<component name="powersave_definitions_api" long-name="Power Save Definitions API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/powersave_definitions_api/group"/>
+</component>
+<component name="powersave_plugin_api" long-name="Power Save Plugin API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/powersave_plugin_api/group"/>
+</component>
+<component name="extended_version_info_plugin_api" long-name="Extended Version Info Plugin API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_plugin_api/group"/>
+</component>
+<component name="haptics_plugin_api" long-name="Haptics Plugin API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/haptics_plugin_api/group"/>
+</component>
+<component name="haptics_effect_data_getter_plugin_api" long-name="Haptics Effect Data Getter Plugin API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
+</component>
+<component name="haptics_packetizer_plugin_api" long-name="Haptics Packetizer Plugin API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/haptics_packetizer_plugin_api/group"/>
+</component>
+<component name="tiltcompensation_api" long-name="Tilt Compensation API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/tiltcompensation_api/group"/>
+</component>
+<component name="disk_notification_handler_api" long-name="Disk Notification Handler API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/disk_notification_handler_api/group"/>
+</component>
+<component name="accessory_policy_usb_audio_api" long-name="Accessory Policy USB Audio API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_usb_audio_api/group"/>
+</component>
+<component name="accessory_policy_hdmi_audio_api" long-name="Accessory Policy HDMI Audio API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_hdmi_audio_api/group"/>
+</component>
+<component name="sensor_data_compensator_plugin_api" long-name="Sensor Data Compensator Plugin API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
+</component>
+<component name="ddc_access_api" long-name="DDC Access API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/ddc_access_api/group"/>
+</component>
+<component name="tv_out_behaviour_api" long-name="TV Out Behaviour API" filter="s60" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_behaviour_api/group"/>
+</component>
+</collection>
+<collection name="accessoryservices" long-name="Accessory Services" level="framework">
+<component name="accessorymonitor" filter="s60" long-name="Accessory Monitor">
+<unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/group"/>
+</component>
+<component name="accessoryremotecontrol" filter="s60" long-name="Accessory Remote Control">
+<unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
+</component>
+<component name="accessoryserver" filter="s60" long-name="Accessory Server">
+<unit bldFile="os/devicesrv/accessoryservices/accessoryserver/group"/>
+</component>
+<component name="pluggeddisplay" filter="s60" long-name="Plugged Display" introduced="^3">
+<unit bldFile="os/devicesrv/accessoryservices/pluggeddisplay/group"/>
+</component>
+<component name="headsetstatusapi" filter="s60" long-name="Headset Status API">
+<unit bldFile="os/devicesrv/accessoryservices/headsetstatusapi/group"/>
+</component>
+<component name="tspclientmapper" filter="s60" long-name="TSP Client Mapper">
+<unit bldFile="os/devicesrv/accessoryservices/tspclientmapper/group"/>
+</component>
+<component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional">
+<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
+</component>
+<component name="gid_pc_tool" filter="s60" long-name="Generic ID PC Tool" class="tool PC">
+<unit bldFile="os/devicesrv/accessoryservices/gid_pc_tool/group"/>
+</component>
+</collection>
+<collection name="commonservices" long-name="Common Services" level="app-if">
+<component name="commonengine" filter="s60" long-name="Common Engine">
+<unit bldFile="os/devicesrv/commonservices/commonengine/group"/>
+</component>
+<component name="commonengineresources" filter="s60" long-name="Common Engine Resources" class="config">
+<unit bldFile="os/devicesrv/commonservices/commonengineresources/group"/>
+</component>
+<component name="platformenv" filter="s60" long-name="Platform Environment">
+<unit bldFile="os/devicesrv/commonservices/platformenv/group"/>
+</component>
+<component name="sysutil" long-name="System Utilities" purpose="mandatory" introduced="ER5">
+<unit bldFile="os/devicesrv/commonservices/sysutil/group" mrp="os/devicesrv/commonservices/sysutil/group/sysutil.mrp"/>
+</component>
+<component name="activitymanager" long-name="Activity Manager" purpose="mandatory" introduced="ER5">
+<unit bldFile="os/devicesrv/commonservices/activitymanager/group" mrp="os/devicesrv/commonservices/activitymanager/group/activitymanager.mrp"/>
+</component>
+</collection>
+<collection name="dosservices" long-name="Domestic Operating System Services" level="hw-if">
+<component name="commondsy" filter="s60" long-name="Common DSY" plugin="Y">
+<unit bldFile="os/devicesrv/dosservices/commondsy/group"/>
+</component>
+<component name="dosserver" filter="s60" long-name="Domestic OS Server">
+<unit bldFile="os/devicesrv/dosservices/dosserver/group"/>
+</component>
+</collection>
+<collection name="sensorservices" long-name="Sensor Services" level="framework">
+<component name="sensorserver" filter="s60" long-name="Sensor Server">
+<unit bldFile="os/devicesrv/sensorservices/sensorserver/group"/>
+</component>
+<component name="orientationssy" filter="s60" long-name="Orientation SSY" plugin="Y">
+<unit bldFile="os/devicesrv/sensorservices/orientationssy/group"/>
+</component>
+<component name="tiltcompensationssy" filter="s60" long-name="Tilt Compensation SSY" plugin="Y">
+<unit bldFile="os/devicesrv/sensorservices/tiltcompensationssy/group"/>
+</component>
+<component name="sensordatacompensator" filter="s60" long-name="Sensor Data Compensator">
+<unit bldFile="os/devicesrv/sensorservices/sensordatacompensator/group"/>
+</component>
+</collection>
+<collection name="hwrmhaptics" long-name="HWRM Haptics" level="plugin">
+<component name="hapticseffectdatagetterfw" filter="s60" long-name="Haptics Effect Data Getter Framework">
+<unit bldFile="os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
+</component>
+<component name="hapticspluginservice" filter="s60" long-name="Haptics Plugin Service">
+<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
+</component>
+<component name="hapticspacketizer" filter="s60" long-name="Haptics Packetizer">
+<unit bldFile="os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
+</component>
+<component name="hapticspluginmanager" filter="s60" long-name="Haptics Plugin Manager">
+<unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
+</component>
+<component name="hapticsserver" filter="s60" long-name="Haptics Server">
+<unit bldFile="os/devicesrv/hwrmhaptics/hapticsserver/group"/>
+</component>
+<component name="hapticsclient" filter="s60" long-name="Haptics Client">
+<unit bldFile="os/devicesrv/hwrmhaptics/hapticsclient/group"/>
+</component>
+<component name="hwrmhaptics_build" filter="s60" long-name="HWRM Haptics Build">
+<!-- move these exports into the appropriate above components and delete this component-->
+<unit bldFile="os/devicesrv/hwrmhaptics/group"/>
+</component>
+</collection>
+<collection name="mediator" long-name="Mediator" level="app-if">
+<!--collection is really a component. Move it down a directory -->
+<component name="mediator_build" filter="s60" long-name="Mediator Build">
+<unit bldFile="os/devicesrv/mediator/group"/>
+</component>
+</collection>
+<collection name="psmservices" long-name="Power Save Mode Services" level="app-if">
+<component name="psmserver" filter="s60" long-name="PSM Server">
+<unit bldFile="os/devicesrv/psmservices/psmserver/group"/>
+</component>
+</collection>
+<collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
+<component name="hwrmfmtxwatcherplugin" filter="s60" long-name="HWRM FM Transmitter Watcher Plugin" plugin="Y">
+<unit bldFile="os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
+</component>
+<component name="hwrmtargetmodifierplugin" filter="s60" long-name="HWRM Target Modifier Plugin" plugin="Y">
+<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build,
+ may need to -->
+<!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
+</component>
+<component name="vibractrl" filter="s60" long-name="Vibra Control" deprecated="9.1">
+<unit bldFile="os/devicesrv/resourcemgmt/vibractrl/group"/>
+</component>
+<component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="^2" purpose="optional">
+<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
+</component>
+<component name="hwresourcesmgrconfig" long-name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
+<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
+</component>
+<component name="resourcemgmt_build" filter="s60" long-name="Resource Management Build">
+<!-- Move exports to a self-contained component.
+ This needs to be kept around until configuration is in place -->
+<unit bldFile="os/devicesrv/resourcemgmt/group"/>
+</component>
+<component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
+<unit bldFile="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
+</component>
+</collection>
+<collection name="sysstatemgmt" long-name="System State Management" level="server">
+<component name="ssmmapperutility" filter="s60" long-name="SSM Mapper Utility" introduced="^3">
+<unit bldFile="os/devicesrv/sysstatemgmt/ssmmapperutility/group"/>
+</component>
+<component name="ssmpolicyplugins" filter="s60" long-name="SSM Policy Plugins" introduced="^3" plugin="Y">
+<unit bldFile="os/devicesrv/sysstatemgmt/ssmpolicyplugins/group"/>
+</component>
+<component name="ssmutilityplugins" filter="s60" long-name="SSM Utility Plugins" introduced="^3" plugin="Y">
+<unit bldFile="os/devicesrv/sysstatemgmt/ssmutilityplugins/group"/>
+</component>
+<component name="ssmcmdlists" filter="s60" long-name="SSM Command Lists" introduced="^3">
+<unit bldFile="os/devicesrv/sysstatemgmt/ssmcmdlists/group"/>
+</component>
+<component name="ssmcustcmds" filter="s60" long-name="SSM Custom Commands" introduced="^3">
+<unit bldFile="os/devicesrv/sysstatemgmt/ssmcustcmds/group"/>
+</component>
+<component name="syslangutil" filter="s60" long-name="System Language Utility" introduced="^3">
+<unit bldFile="os/devicesrv/sysstatemgmt/syslangutil/group"/>
+</component>
+<component name="sysrestart" filter="s60" long-name="System Restart" introduced="^3">
+<unit bldFile="os/devicesrv/sysstatemgmt/sysrestart/group"/>
+</component>
+<component name="sysuiprovider" filter="s60" long-name="System UI Provider" introduced="^3">
+<unit bldFile="os/devicesrv/sysstatemgmt/sysuiprovider/group"/>
+</component>
+<component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
+<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/group" mrp="os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
+</component>
+<component name="systemstatemgr" long-name="System State Manager" introduced="^3" purpose="mandatory">
+<unit bldFile="os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
+</component>
+<component name="systemstateplugins" long-name="System State Plugins" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
+</component>
+<component name="systemstatereferenceplugins" long-name="System State Reference Plugins" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
+</component>
+</collection>
+<collection name="resourceinterfaces" long-name="Resource Interfaces" level="hw-if">
+<component name="fmtransmittercontrol" long-name="FM Transmitter Control" introduced="^3" purpose="optional">
+<unit bldFile="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group" mrp="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
+</component>
+</collection>
+<collection name="systemhealthmanagement" long-name="System Health Management" level="server">
+<component name="systemhealthmgr" long-name="System Health Manager" introduced="^3" purpose="optional">
+<unit bldFile="os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
+</component>
+</collection>
+<collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if"/>
+<collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
+<component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
+<collection name="authenticationservices" long-name="Authentication Services" level="utilities">
+<component name="authenticationserver" long-name="Authentication Server" introduced="^4" purpose="optional">
+<unit bldFile="os/security/authenticationservices/authenticationserver/group" mrp="os/security/authenticationservices/authenticationserver/group/security_authserver.mrp"/>
+</component>
+</collection>
+<collection name="authorisation" long-name="Authorisation" level="utilities">
+<component name="userpromptservice" long-name="User Prompt Service" introduced="^3" purpose="mandatory">
+<unit bldFile="os/security/authorisation/userpromptservice/group" mrp="os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
+</component>
+<component name="userpromptutils" long-name="User Prompt Utils" introduced="^3" purpose="optional">
+<unit bldFile="os/security/authorisation/userpromptutils/group" mrp="os/security/authorisation/userpromptutils/group/security_ups_utils.mrp"/>
+</component>
+</collection>
+<collection name="contentmgmt" long-name="Content Management" level="utilities">
+<component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
+<unit bldFile="os/security/contentmgmt/contentaccessfwfordrm/group" mrp="os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
+</component>
+<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">
+<unit bldFile="os/security/crypto/weakcryptospi/group" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
+</component>
+<component name="strongcryptospi" long-name="Strong Crypto SPI" filter="gt" introduced="^3" purpose="optional">
+<unit bldFile="os/security/crypto/weakcryptospi/strong" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
+</component>
+</collection>
+<collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
+<component name="securityutils" long-name="Security Utils" introduced="8.0" purpose="optional">
+<unit bldFile="os/security/cryptomgmtlibs/securityutils/group" mrp="os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
+</component>
+<component name="securitydocs" long-name="Security Documentation" purpose="development" class="doc">
+<unit mrp="os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
+</component>
+<component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0" purpose="optional">
+<unit bldFile="os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
+</component>
+<component name="securitycommonutils" long-name="Security Common Utils" introduced="8.0" purpose="mandatory">
+<unit bldFile="os/security/cryptomgmtlibs/securitycommonutils/group" mrp="os/security/cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
+</component>
+</collection>
+<collection name="securityanddataprivacytools" long-name="Security and Data Privacy Tools" level="services">
+<component name="securityconfig" long-name="Security Config" introduced="9.1" purpose="optional">
+<unit bldFile="os/security/securityanddataprivacytools/securityconfig/group" mrp="os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
+</component>
+<component name="securitytools" long-name="Security Tools" introduced="^3" purpose="optional" class="PC">
+<unit bldFile="os/security/securityanddataprivacytools/securitytools/group" mrp="os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
+</component>
+</collection>
+<collection name="cryptoplugins" long-name="Crypto Plugins" level="plugins">
+<component name="cryptospiplugins" long-name="Crypto SPI Plugins" filter="gt" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/security/cryptoplugins/cryptospiplugins/group" mrp="os/security/cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
+</component>
+</collection>
+<collection name="cryptoservices" long-name="Crypto Services" level="plugins">
+<component name="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0" purpose="optional">
+<unit bldFile="os/security/cryptoservices/certificateandkeymgmt/group" mrp="os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
+</component>
+<component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
+<unit bldFile="os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
+</component>
+<component name="browserrootcertificates" long-name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
+<unit mrp="os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
+</component>
+<component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional">
+<unit bldFile="os/security/cryptoservices/asnpkcs/group" mrp="os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
+</component>
+</collection>
+<collection name="security_info" long-name="OS Security Info" level="utilities">
+<component name="security_metadata" long-name="OS Security Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/security/security_info/security_metadata/security_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
+<collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
+<component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
+<unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
+</component>
+<component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" introduced="^2" purpose="optional" plugin="Y">
+<unit bldFile="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
+</component>
+<component name="simulationpositioningmodule" long-name="Simulation Positioning Module" introduced="^2" purpose="development" plugin="Y">
+<unit bldFile="os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
+</component>
+<component name="gpspositioningmodule" long-name="GPS/A-GPS Positioning Module" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/lbs/datasourcemodules/gpspositioningmodule/group" mrp="os/lbs/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
+</component>
+<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 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="adaptation">
+<component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
+<unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
+</component>
+</collection>
+<collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
+<component name="locationserver" long-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 name="networkrequesthandler" long-name="Network Request Handler" introduced="9.2" purpose="optional">
+<unit bldFile="os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
+</component>
+</collection>
+<collection name="lbstest" long-name="Locating Services Tests" level="application-interface">
+<component name="locationprotocoltest" long-name="Location Protocol Tests" introduced="9.2" purpose="development" plugin="Y">
+<unit bldFile="os/lbs/lbstest/locationprotocoltest/group" mrp="os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
+</component>
+</collection>
+<collection name="locationmgmt" long-name="Location Management" level="management">
+<component name="locmonitor" long-name="Location Monitor" introduced="^3" purpose="optional">
+<unit bldFile="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
+</component>
+<component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2" purpose="optional">
+<unit bldFile="os/lbs/locationmgmt/agpslocationmgr/group" mrp="os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
+</component>
+<component name="networklocationmgr" long-name="Network Location Manager" introduced="9.2" purpose="optional">
+<unit bldFile="os/lbs/locationmgmt/networklocationmgr/group" mrp="os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
+</component>
+<component name="locationcore" long-name="Location Core" introduced="9.2" purpose="optional">
+<unit bldFile="os/lbs/locationmgmt/locationcore/group" mrp="os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
+</component>
+<component name="networkgateway" long-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 name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
+<component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
+<unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
+</component>
+<component name="suplproxyprotocolmodule" long-name="SUPL Proxy Protocol Module" introduced="^3" purpose="optional" plugin="Y">
+<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+<unit bldFile="os/lbs/networkprotocolmodules/suplproxyprotocolmodule/sfgroup" mrp="os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
+</component>
+<component name="suplprotocolmodule" long-name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" plugin="Y">
+<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+<unit bldFile="os/lbs/networkprotocolmodules/suplprotocolmodule/sfgroup" mrp="os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
+</component>
+<component name="suplrrlpasn1" filter="sf_build" long-name="SUPL RRLP ASN1 Parser">
+<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+<unit bldFile="os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
+</component>
+<component name="suplrrlpprotocol" long-name="SUPL RRLP Protocol Module">
+<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+<unit bldFile="os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup"/>
+</component>
+</collection>
+<collection name="lbsapitest" long-name="Location API Tests" level="application-interface"/>
+<collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
+<component name="lbs_metadata" long-name="Locating Services Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="commsfw" level="services" long-name="Communications Framework" levels="server support framework process app-if">
+<collection name="commsprocess" long-name="Comms Process" level="process">
+<component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s" purpose="mandatory">
+<unit bldFile="os/commsfw/commsprocess/commsrootserverconfig/group" mrp="os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
+</component>
+</collection>
+<collection name="commsconfig" long-name="Comms Config" level="process">
+<component name="commsdatabase" long-name="Comms Database" purpose="mandatory">
+<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
+</component>
+<component name="commsdatabaseshim" long-name="Comms Database Shim" introduced="8.1" purpose="mandatory">
+<unit bldFile="os/commsfw/commsconfig/commsdatabaseshim/group" mrp="os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
+</component>
+</collection>
+<collection name="datacommsserver" long-name="Data Comms Server" level="framework">
+<component name="esockserver" long-name="ESock Server" purpose="mandatory">
+<unit bldFile="os/commsfw/datacommsserver/esockserver/group" mrp="os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp" version="3"/>
+</component>
+<component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1" purpose="optional">
+<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/group" mrp="os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
+</component>
+<component name="networkingdialogstub" long-name="Networking Dialog Stub" introduced="6.1" purpose="optional">
+<unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/default" mrp="os/commsfw/datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
+</component>
+<component name="networkcontroller" long-name="Network Controller" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="os/commsfw/datacommsserver/networkcontroller/group" mrp="os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
+</component>
+</collection>
+<collection name="serialserver" long-name="Serial Server" level="server">
+<component name="serialportcsy" long-name="Serial Port CSY" introduced="ER5" purpose="optional" plugin="Y">
+<unit bldFile="os/commsfw/serialserver/serialportcsy" mrp="os/commsfw/serialserver/serialportcsy/ser-comms_serialportcsy.mrp"/>
+</component>
+<component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" purpose="development">
+<unit bldFile="os/commsfw/serialserver/packetloopbackcsy/group" mrp="os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
+</component>
+<component name="c32serialserver" long-name="C32 Serial Server" introduced="ER5" purpose="mandatory">
+<unit bldFile="os/commsfw/serialserver/c32serialserver/group" mrp="os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
+</component>
+<component name="c32serialserverconfig" long-name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config">
+<unit bldFile="os/commsfw/serialserver/c32serialserverconfig" mrp="os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
+</component>
+<component name="c32serialserverdocs" long-name="C32 Serial Server Documentation" purpose="development" class="doc">
+<unit mrp="os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
+</component>
+</collection>
+<collection name="commsfwutils" long-name="Comms Framework Utilities" level="framework">
+<component name="commsbufs" long-name="Comms Buffers" introduced="^3" purpose="mandatory">
+<unit bldFile="os/commsfw/commsfwutils/commsbufs/group" mrp="os/commsfw/commsfwutils/commsbufs/group/comms-infras_commsbufs.mrp"/>
+</component>
+</collection>
+<collection name="commsfw_info" long-name="Comms Framework Info" level="app-if">
+<component name="commsinfrastructuredocs" long-name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
+<unit mrp="os/commsfw/commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
+</component>
+<component name="commsfw_metadata" long-name="Communications Framework Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/commsfw/commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
+</component>
+</collection>
+<collection name="commsfwsupport" long-name="Comms Framework Support" level="support">
+<component name="commselements" long-name="Comms Elements" introduced="8.0" purpose="mandatory">
+<unit bldFile="os/commsfw/commsfwsupport/commselements/group" mrp="os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
+</component>
+</collection>
+<collection name="commsinfrastructureapitest" long-name="Comms-Infras API Tests" level="app-if">
+<component name="commsinfrastructuresvs" long-name="Comms Infrastructure Verification Suite" introduced="^3" purpose="development">
+<unit mrp="os/commsfw/commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
+</component>
+</collection>
+<collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
+<component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC">
+<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
+</component>
+<component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" purpose="mandatory" class="PC">
+<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
+</component>
+<component name="commstools" long-name="Comms Tools" introduced="^3" purpose="development" class="PC">
+<unit bldFile="os/commsfw/commsfwtools/commstools/group" mrp="os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
+</component>
+</collection>
+</block>
+<block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
+<collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
+<component name="internetsockets" long-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>
+<collection name="tcpiputils" long-name="TCP/IP Utilities" level="plugin">
+<component name="dnd" long-name="DND" introduced="7.0" purpose="mandatory">
+<unit bldFile="os/networkingsrv/tcpiputils/dnd/group" mrp="os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
+</component>
+<component name="dhcp" long-name="DHCP" introduced="8.0" purpose="optional">
+<unit bldFile="os/networkingsrv/tcpiputils/dhcp/group" mrp="os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
+</component>
+<component name="networkaddressandporttranslation" long-name="Network Address and Port Translation" introduced="^2" purpose="mandatory" plugin="Y">
+<unit bldFile="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
+</component>
+<component name="punycodeconv" long-name="Punycode Converter" introduced="^3" purpose="mandatory">
+<unit bldFile="os/networkingsrv/tcpiputils/punycodeconv/group" mrp="os/networkingsrv/tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
+</component>
+</collection>
+<collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
+<component name="nullagt" long-name="NULL AGT" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="os/networkingsrv/linklayercontrol/nullagt/group" mrp="os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
+</component>
+<component name="genericscprparameters" long-name="Generic SCPR Parameters" introduced="^3" purpose="optional">
+<unit bldFile="os/networkingsrv/linklayercontrol/genericscprparameters/group" mrp="os/networkingsrv/linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
+</component>
+<component name="mbmsparameters" long-name="MBMS Parameters" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/networkingsrv/linklayercontrol/mbmsparameters/group" mrp="os/networkingsrv/linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
+</component>
+<component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
+<unit bldFile="os/networkingsrv/linklayercontrol/networkinterfacemgr/group" mrp="os/networkingsrv/linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp" version="2"/>
+</component>
+</collection>
+<collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
+<component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y">
+<unit bldFile="os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
+</component>
+<component name="pppnif" long-name="PPP NIF" introduced="ER5" purpose="optional" plugin="Y">
+<unit bldFile="os/networkingsrv/linklayerprotocols/pppnif/group" mrp="os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp" version="2"/>
+</component>
+<component name="slipnif" long-name="SLIP NIF" purpose="development" plugin="Y">
+<unit bldFile="os/networkingsrv/linklayerprotocols/slipnif/group" mrp="os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
+</component>
+<component name="tunnelnif" long-name="Tunnel NIF" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
+</component>
+</collection>
+<collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
+<component name="packetlogger" long-name="Packet Logger" introduced="8.1" purpose="development">
+<unit bldFile="os/networkingsrv/linklayerutils/packetlogger/group" mrp="os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
+</component>
+</collection>
+<collection name="networkcontrol" long-name="Network Control" level="plugin">
+<component name="qoslib" long-name="QoS Library" introduced="7.0s" purpose="optional">
+<unit bldFile="os/networkingsrv/networkcontrol/qoslib/group" mrp="os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
+</component>
+<component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s" purpose="optional">
+<unit bldFile="os/networkingsrv/networkcontrol/pfqoslib/group" mrp="os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
+</component>
+<component name="qosfwprt" long-name="QoS Framework PRT" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
+</component>
+<component name="qosipscpr" long-name="QoS IP SCPR" purpose="optional" plugin="Y">
+<unit bldFile="os/networkingsrv/networkcontrol/qosipscpr/group" mrp="os/networkingsrv/networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
+</component>
+<component name="ipnetworklayer" long-name="IP Network Layer" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/networkingsrv/networkcontrol/ipnetworklayer/group" mrp="os/networkingsrv/networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
+</component>
+<component name="iptransportlayer" long-name="IP Transport Layer" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/networkingsrv/networkcontrol/iptransportlayer/group" mrp="os/networkingsrv/networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
+</component>
+<component name="commsuserpromptmgr" long-name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
+<unit bldFile="os/networkingsrv/networkcontrol/commsuserpromptmgr/group" mrp="os/networkingsrv/networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
+</component>
+</collection>
+<collection name="networkprotocols" long-name="Network Protocols" level="plugin">
+<component name="ipeventnotifier" long-name="IP Event Notifier" introduced="8.1" purpose="mandatory" plugin="Y">
+<unit bldFile="os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
+</component>
+<component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" plugin="Y">
+<unit bldFile="os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
+</component>
+<component name="iphook" long-name="IP Hook" introduced="7.0" purpose="mandatory">
+<unit bldFile="os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
+</component>
+<component name="mobileip" long-name="Mobile IP" introduced="8.1" purpose="optional" plugin="Y">
+<unit bldFile="os/networkingsrv/networkprotocols/mobileip/group" mrp="os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
+</component>
+<component name="dnsproxy" long-name="DNS Proxy" introduced="^3" purpose="optional">
+<unit bldFile="os/networkingsrv/networkprotocols/dnsproxy/group" mrp="os/networkingsrv/networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
+</component>
+</collection>
+<collection name="networksecurity" long-name="Network Security" level="framework">
+<component name="tls" long-name="TLS" introduced="6.0" purpose="mandatory">
+<unit bldFile="os/networkingsrv/networksecurity/tls/group" mrp="os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
+</component>
+<component name="tlsprovider" long-name="TLS Provider" introduced="8.1" purpose="mandatory">
+<unit bldFile="os/networkingsrv/networksecurity/tlsprovider/group" mrp="os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
+</component>
+<component name="ipsec" long-name="IPsec" introduced="7.0" purpose="optional">
+<unit bldFile="os/networkingsrv/networksecurity/ipsec/group" mrp="os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
+</component>
+</collection>
+<collection name="networkingtestandutils" long-name="Networking Test and Utils" level="app-if">
+<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>
+</collection>
+<collection name="networkingsrv_info" long-name="Networking Services Info" level="app-if">
+<component name="networkingrom" long-name="Networking ROM" purpose="mandatory">
+<!-- production component: contains the IBY files -->
+<unit bldFile="os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
+</component>
+<component name="networkingdocs" long-name="Networking Documentation" purpose="development" class="doc">
+<unit mrp="os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
+</component>
+<component name="networkingsrv_metadata" long-name="Networking Services Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
+</component>
+</collection>
+<collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
+<component name="predictorcompression" long-name="Predictor Compression" introduced="6.0" purpose="optional" plugin="Y">
+<unit bldFile="os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
+</component>
+</collection>
+</block>
+<block name="wlan" level="services" long-name="WLAN" levels="hw low mid high tools test">
+<collection name="wlan_plat" long-name="WLAN Platform Interfaces" level="test">
+<component name="wlan_dbif_api" long-name="WLAN DBIF API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_dbif_api/group"/>
+</component>
+<component name="wlan_hal_api" long-name="WLAN HAL API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_hal_api/group"/>
+</component>
+<component name="wlan_management_api" long-name="WLAN Management API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_management_api/group"/>
+</component>
+<component name="wlan_device_settings_api" long-name="WLAN Device Settings API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_device_settings_api/group"/>
+</component>
+<component name="wlan_control_api" long-name="WLAN Control API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_control_api/group"/>
+</component>
+<component name="wlan_hw_initialization_data_api" long-name="WLAN Hardware Initialization Data API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_hw_initialization_data_api/group"/>
+</component>
+<component name="wlan_power_save_plugin_api" long-name="WLAN Power Save Plugin API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_power_save_plugin_api/group"/>
+</component>
+<component name="wlan_info_api" long-name="WLAN Info API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_info_api/group"/>
+</component>
+<component name="wlan_agent_hotspot_plugin_api" long-name="WLAN Agent Hotspot Plug-in API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
+</component>
+<component name="wlan_osa_api" long-name="WLAN OSA API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_osa_api/group"/>
+</component>
+<component name="wlan_spia_api" long-name="WLAN SPIA API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_spia_api/group"/>
+</component>
+<component name="wlan_hpa_api" long-name="WLAN HPA API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_hpa_api/group"/>
+</component>
+<component name="wlan_eapol_plugin_api" long-name="WLAN EAPOL Plugin API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_eapol_plugin_api/group"/>
+</component>
+<component name="wlan_generic_plugin_api" long-name="WLAN Generic Plugin API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_generic_plugin_api/group"/>
+</component>
+<component name="wlan_aws_plugin_api" long-name="WLAN AWS Plugin API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_plat/wlan_aws_plugin_api/group"/>
+</component>
+</collection>
+<collection name="wlan_pub" long-name="WLAN Public Interfaces" level="test">
+<component name="wlan_sdk_info_api" long-name="WLAN SDK Info API" filter="s60" class="api">
+<unit bldFile="os/wlan/wlan_pub/wlan_sdk_info_api/group"/>
+</component>
+</collection>
+<collection name="wlan_bearer" long-name="WLAN Bearer" level="hw">
+<component name="wlanpsmplugin" filter="s60" long-name="WLAN PSM Plugin" plugin="Y">
+<unit bldFile="os/wlan/wlan_bearer/wlanpsmplugin/group"/>
+</component>
+<component name="wlanagent" filter="s60" long-name="WLAN Agent">
+<unit bldFile="os/wlan/wlan_bearer/wlanagent/group"/>
+</component>
+<component name="wlandbif_cd" filter="s60" long-name="WLAN CommsDat interface">
+<unit bldFile="os/wlan/wlan_bearer/wlandbif_cd/group"/>
+</component>
+<!-- should follow component directory rules for stuff in wlan_symbian/ and put in a single component or split up properly -->
+<component name="wlanengine" filter="s60" long-name="WLAN Engine">
+<unit bldFile="os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
+</component>
+<component name="wlanldd" filter="s60" long-name="WLAN LDD">
+<unit bldFile="os/wlan/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
+</component>
+<component name="wlannwif" filter="s60" long-name="WLAN Network Interface">
+<unit bldFile="os/wlan/wlan_bearer/wlannwif/group"/>
+</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="adaptation hw-if plugin framework server app-if">
+<collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
+<component name="basebandchanneladaptor" long-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 name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
+<component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
+<unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
+</component>
+</collection>
+<collection name="smsprotocols" long-name="SMS Protocols" level="framework">
+<component name="smsstack" long-name="SMS Stack" introduced="6.0" purpose="mandatory" plugin="Y">
+<unit bldFile="os/cellularsrv/smsprotocols/smsstack/group" mrp="os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
+</component>
+</collection>
+<collection name="telephonyprotocols" long-name="Telephony Protocols" level="framework">
+<component name="csdagt" long-name="CSD AGT" introduced="6.1" purpose="optional" plugin="Y">
+<unit bldFile="os/cellularsrv/telephonyprotocols/csdagt/group" mrp="os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
+</component>
+<component name="psdagt" long-name="PSD AGT" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="os/cellularsrv/telephonyprotocols/psdagt/group" mrp="os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
+</component>
+<component name="gprsumtsqosprt" long-name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
+</component>
+<component name="gprsumtsqosinterface" long-name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
+</component>
+<component name="qosextnapi" long-name="QoS Extn API" introduced="9.2" purpose="optional">
+<unit bldFile="os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
+</component>
+<component name="secondarypdpcontextumtsdriver" long-name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
+<unit bldFile="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
+</component>
+<component name="qos3gppcpr" long-name="QoS 3GPP CPR" introduced="9.2" purpose="optional" plugin="Y">
+<unit bldFile="os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
+</component>
+<component name="pdplayer" long-name="PDP Layer" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/cellularsrv/telephonyprotocols/pdplayer/group" mrp="os/cellularsrv/telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
+</component>
+<component name="rawipnif" long-name="Raw IP NIF" introduced="8.1" purpose="optional" plugin="Y">
+<unit bldFile="os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
+</component>
+</collection>
+<collection name="telephonyserver" long-name="Telephony Server" level="server">
+<component name="etelserverandcore" long-name="ETel Server and Core" purpose="mandatory">
+<unit bldFile="os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
+</component>
+<component name="etelmultimode" long-name="ETel Multimode" introduced="7.0" purpose="mandatory">
+<unit bldFile="os/cellularsrv/telephonyserver/etelmultimode/group" mrp="os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
+</component>
+<component name="etelpacketdata" long-name="ETel Packet Data" introduced="7.0" purpose="mandatory">
+<unit bldFile="os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
+</component>
+<component name="etelsimtoolkit" long-name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory">
+<unit bldFile="os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
+</component>
+</collection>
+<collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
+<component name="common_tsy" long-name="Common TSY" introduced="^2" purpose="optional" plugin="Y">
+<unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
+</component>
+<component name="licenseetsystub" long-name="Licensee TSY Stub" introduced="^2" purpose="development" filter="sf_build" plugin="Y">
+<unit mrp="os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="os/cellularsrv/telephonyserverplugins/licenseetsystub/group"/>
+</component>
+<component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y">
+<unit bldFile="os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
+</component>
+<component name="ctsydispatchlayer" long-name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
+</component>
+<component name="simatktsy" long-name="SIMATK TSY" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/cellularsrv/telephonyserverplugins/simatktsy/group" mrp="os/cellularsrv/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
+</component>
+</collection>
+<collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
+<component name="dial" long-name="Dial" deprecated="9.1" purpose="optional">
+<unit bldFile="os/cellularsrv/telephonyutils/dial/group" mrp="os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
+</component>
+<component name="telephonywatchers" long-name="Telephony Watchers" introduced="6.0" purpose="optional" plugin="Y">
+<unit bldFile="os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
+</component>
+<component name="etel3rdpartyapi" long-name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
+<unit bldFile="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
+</component>
+</collection>
+<collection name="cellularsrv_info" long-name="Cellular Baseband Services Info" level="app-if">
+<component name="telephonyconfidentialdocs" long-name="Telephony Confidential Documentation" purpose="development" class="doc">
+<unit mrp="os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
+</component>
+<component name="telephonydocs" long-name="Telephony Documentation" purpose="development" class="doc">
+<unit mrp="os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
+</component>
+<component name="cellularsrv_metadata" long-name="Cellular Baseband Services Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
+</component>
+</collection>
+<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
+<component name="mocksy" long-name="MockSY" introduced="^2" purpose="development" plugin="Y">
+<unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
+</component>
+</collection>
+<collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if"/>
+</block>
+<block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
+<collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
+<component name="bluetooth_audio_adaptation_api" long-name="Bluetooth Audio Adaptation API" filter="s60" class="api">
+<unit bldFile="os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
+</component>
+<component name="bluetooth_power_management_api" long-name="Bluetooth Power Management API" filter="s60" class="api">
+<unit bldFile="os/bt/bt_plat/bluetooth_power_management_api/group"/>
+</component>
+<component name="at_command_handler_plugin_api" long-name="AT Command Handler Plugin API" filter="s60" class="api">
+<unit bldFile="os/bt/bt_plat/at_command_handler_plugin_api/group"/>
+</component>
+</collection>
+<collection name="bluetooth" long-name="Bluetooth Core" level="framework">
+<component name="btstack" long-name="Bluetooth Stack" introduced="6.0" purpose="optional">
+<unit bldFile="os/bt/bluetooth/btstack" mrp="os/bt/bluetooth/btstack/bluetooth_stack.mrp"/>
+</component>
+<component name="btcomm" long-name="Bluetooth CSY" introduced="6.0" purpose="optional" plugin="Y">
+<unit bldFile="os/bt/bluetooth/btcomm" mrp="os/bt/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
+</component>
+<component name="btsdp" long-name="Bluetooth SDP" introduced="6.1" purpose="optional">
+<unit bldFile="os/bt/bluetooth/btsdp" mrp="os/bt/bluetooth/btsdp/bluetooth_sdp.mrp"/>
+</component>
+<component name="btextnotifiers" long-name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
+<unit bldFile="os/bt/bluetooth/btextnotifiers" mrp="os/bt/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
+</component>
+<component name="gavdp" long-name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
+<unit bldFile="os/bt/bluetooth/gavdp/group" mrp="os/bt/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
+</component>
+<component name="btlogger" long-name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
+<unit bldFile="os/bt/bluetooth/btlogger/group" mrp="os/bt/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
+</component>
+<component name="btdocs" long-name="Bluetooth Documentation" purpose="development" class="doc">
+<unit mrp="os/bt/bluetooth/btdocs/bluetooth_documentation.mrp"/>
+</component>
+</collection>
+<collection name="bluetoothmgmt" long-name="Bluetooth Management" level="plugin">
+<component name="btmgr" long-name="Bluetooth Manager" introduced="6.0" purpose="optional">
+<unit bldFile="os/bt/bluetoothmgmt/btmgr" mrp="os/bt/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
+</component>
+<component name="btconfig" long-name="Bluetooth Config" purpose="optional" class="config">
+<unit bldFile="os/bt/bluetoothmgmt/btconfig" mrp="os/bt/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
+</component>
+<component name="btrom" long-name="Bluetooth ROM" introduced="9.1" purpose="optional">
+<unit bldFile="os/bt/bluetoothmgmt/btrom" mrp="os/bt/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
+</component>
+<component name="bluetoothclientlib" long-name="Bluetooth Client Library" introduced="6.0" purpose="optional">
+<unit bldFile="os/bt/bluetoothmgmt/bluetoothclientlib" mrp="os/bt/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
+</component>
+</collection>
+<collection name="bluetoothcommsprofiles" long-name="Bluetooth Comms Profiles" level="app-if">
+<component name="btpan" long-name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" plugin="Y">
+<unit bldFile="os/bt/bluetoothcommsprofiles/btpan/group" mrp="os/bt/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
+</component>
+</collection>
+<collection name="bthci" long-name="Host Controller Interface" level="server">
+<component name="bthci2" long-name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
+<unit bldFile="os/bt/bthci/bthci2/group" mrp="os/bt/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
+</component>
+<component name="hciextensioninterface" long-name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
+<unit bldFile="os/bt/bthci/hciextensioninterface" mrp="os/bt/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
+</component>
+<component name="hci2implementations" long-name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" plugin="Y">
+<unit bldFile="os/bt/bthci/hci2implementations/group" mrp="os/bt/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
+</component>
+</collection>
+<collection name="irda" long-name="IrDA" level="plugin">
+<component name="irdastack" long-name="IrDA Stack" purpose="optional">
+<unit bldFile="os/bt/irda/irdastack/group" mrp="os/bt/irda/irdastack/group/infra-red_irda.mrp"/>
+</component>
+</collection>
+<collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if"/>
+<collection name="atext" long-name="AT Extensions" level="server">
+<!-- collection is really a component. Need to move down a directory -->
+<component name="atext_build" long-name="AT Extension Build" introduced="^3" purpose="optional" filter="s60">
+<unit bldFile="os/bt/atext/group"/>
+</component>
+</collection>
+<collection name="bt_info" long-name="Bluetooth Info" level="app-if">
+<component name="bt_metadata" long-name="Bluetooth Metadata" introduced="^3" purpose="development" class="config PC">
+<unit mrp="os/bt/bt_info/bt_metadata/bt_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
+<collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
+<!-- usbclientdrivers to be moved here from kernelhwsrv-->
+</collection>
+<collection name="usbmgmt" long-name="USB Management" level="server">
+<component name="usbmgr" long-name="USB Manager" purpose="optional">
+<unit bldFile="os/usb/usbmgmt/usbmgr/group" mrp="os/usb/usbmgmt/usbmgr/group/usb_manager.mrp" version="2"/>
+</component>
+<component name="usbclassandmgrdocs" long-name="USB Class and Manager Documentation" purpose="development" class="doc">
+<unit mrp="os/usb/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
+</component>
+</collection>
+<collection name="usb_info" long-name="USB Info" level="app-if">
+<component name="usb_metadata" long-name="USB Metadata" introduced="^3" purpose="development" class="config PC">
+<unit mrp="os/usb/usb_info/usb_metadata/usb_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="mm" level="services" long-name="Multimedia" levels="adaptation 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"/>
+</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"/>
+</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"/>
+</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"/>
+</component>
+</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"/>
+</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"/>
+</component>
+<component name="aac_decoder_config_proxy_api" long-name="AAC Decoder Config Proxy API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/aac_decoder_config_proxy_api/group"/>
+</component>
+<component name="added_devsound_control_api" long-name="Added DevSound Control API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/added_devsound_control_api/group"/>
+</component>
+<component name="added_devsound_control_msg_hdlr_api" long-name="Added DevSound Control Msg Hdlr API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/added_devsound_control_msg_hdlr_api/group"/>
+</component>
+<component name="added_devsound_control_proxy_api" long-name="Added DevSound Control Proxy API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/added_devsound_control_proxy_api/group"/>
+</component>
+<component name="audio_effects_msg_hdlr_api" long-name="Audio Effects Message Handler API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/audio_effects_msg_hdlr_api/group"/>
+</component>
+<component name="audio_effects_proxy_api" long-name="Audio Effects Proxy API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/audio_effects_proxy_api/group"/>
+</component>
+<component name="audio_policy_header_api" long-name="Audio Policy Header API" filter="s60" class="api">
+<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"/>
+</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"/>
+</component>
+<component name="audio_routing_proxy_api" long-name="Audio Routing Proxy API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/audio_routing_proxy_api/group"/>
+</component>
+<component name="custom_interface_builder_api" long-name="Custom Interface Builder API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/custom_interface_builder_api/group"/>
+</component>
+<component name="custom_interface_message_handler_factory_api" long-name="Custom Interface Message Handler Factory API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/custom_interface_message_handler_factory_api/group"/>
+</component>
+<component name="custom_interface_proxy_factory_api" long-name="Custom Interface Proxy Factory API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/custom_interface_proxy_factory_api/group"/>
+</component>
+<component name="custom_interface_utility_api" long-name="Custom Interface Utility API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/custom_interface_utility_api/group"/>
+</component>
+<component name="devsound_adaptation_api" long-name="DevSound Adaptation API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/devsound_adaptation_api/group"/>
+</component>
+<component name="display_posting_api" long-name="Display Posting API" filter="s60" class="api">
+<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"/>
+</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"/>
+</component>
+<component name="eaac_plus_decoder_interface_proxy_api" long-name="eAAC Plus Decoder Interface Proxy API" filter="s60" class="api">
+<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"/>
+</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"/>
+</component>
+<component name="error_concealment_interface_proxy_api" long-name="Error Concealment Interface Proxy API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
+</component>
+<component name="fm_radio_adaptation_api" long-name="FM Radio Adaptation API" filter="s60" class="api">
+<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"/>
+</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"/>
+</component>
+<component name="g711_decoder_interface_proxy_api" long-name="G711 Decoder Interface Proxy API" filter="s60" class="api">
+<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"/>
+</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"/>
+</component>
+<component name="g711_encoder_interface_proxy_api" long-name="G711 Encoder Interface Proxy API" filter="s60" class="api">
+<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"/>
+</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"/>
+</component>
+<component name="g729_decoder_interface_proxy_api" long-name="G729 Decoder Interface Proxy API" filter="s60" class="api">
+<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"/>
+</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"/>
+</component>
+<component name="g729_encoder_interface_msg_hdlr_api" long-name="G729 Encoder Interface Message Handler API" filter="s60" class="api">
+<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"/>
+</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"/>
+</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"/>
+</component>
+<component name="ilbc_decoder_interface_proxy_api" long-name="Ilbc Decoder Interface Proxy API" filter="s60" class="api">
+<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"/>
+</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"/>
+</component>
+<component name="ilbc_encoder_interface_proxy_api" long-name="Ilbc Encoder Interface Proxy API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_proxy_api/group"/>
+</component>
+<component name="mdf_plugin_uids" long-name="MDF Plug-in UIDs" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/mdf_plugin_uids/group"/>
+</component>
+<component name="multimedia_fourcc_definitions_api" long-name="Multimedia FourCC Definitions API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/multimedia_fourcc_definitions_api/group"/>
+</component>
+<component name="nokia_audio_policy_header_api" long-name="Nokia Audio Policy Header API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/nokia_audio_policy_header_api/group"/>
+</component>
+<component name="nokia_multimedia_fourcc_definitions_api" long-name="Nokia Multimedia Fourcc Definitions API" filter="s60" class="api">
+<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"/>
+</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"/>
+</component>
+<component name="ra8_decoder_interface_proxy_api" long-name="RA8 Decoder Interface Proxy API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
+</component>
+<component name="rds_adaptation_api" long-name="RDS Adaptation API" filter="s60" class="api">
+<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"/>
+</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"/>
+</component>
+<component name="restricted_audio_output_proxy_api" long-name="Restricted Audio Output Proxy API" filter="s60" class="api">
+<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"/>
+</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"/>
+</component>
+<component name="sbc_encoder_interface_proxy_api" long-name="SBC Encoder Interface Proxy API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/sbc_encoder_interface_proxy_api/group"/>
+</component>
+<component name="secure_output_mdf_custom_interface" long-name="Secure Output MDF Custom Interface" filter="s60" class="api">
+<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"/>
+</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"/>
+</component>
+<component name="speech_encoder_config_proxy_api" long-name="Speech Encoder Config Proxy API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/speech_encoder_config_proxy_api/group"/>
+</component>
+<component name="telephony_audio_routing_client_api" long-name="Telephony Audio Routing Client API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/telephony_audio_routing_client_api/group"/>
+</component>
+<component name="telephony_audio_routing_manager_api" long-name="Telephony Audio Routing Manager API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/telephony_audio_routing_manager_api/group"/>
+</component>
+<component name="video_buffer_management_mdf_custom_interface" long-name="Video Buffer Management MDF Custom Interface" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/video_buffer_management_mdf_custom_interface/group"/>
+</component>
+<component name="video_decoder_rotation_mdf_custom_interface" long-name="Video Decoder Rotation MDF Custom Interface" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
+</component>
+<component name="video_decoder_scaling_mdf_custom_interface" long-name="Video Decoder Scaling MDF Custom Interface" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
+</component>
+<component name="video_reclaim_extbuffers_ci" long-name="Video Reclaim Extbuffers Custom Interface" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/video_reclaim_extbuffers_ci/group"/>
+</component>
+<component name="video_window_control_custom_interface" long-name="Video Window Control Custom Interface" filter="s60" class="api">
+<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"/>
+</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"/>
+</component>
+<component name="wma_decoder_interface_proxy_api" long-name="WMA Decoder Interface Proxy API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/wma_decoder_interface_proxy_api/group"/>
+</component>
+<component name="eaacplusutil_api" long-name="EAac Plus Util API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/eaacplusutil_api/group"/>
+</component>
+<component name="frametable_api" long-name="Frametable API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/frametable_api/group"/>
+</component>
+</collection>
+<collection name="devsoundextensions" long-name="Devsound Extensions" level="device-fw">
+<component name="drmaudioplayer" filter="s60" long-name="DRM Audio Player">
+<unit bldFile="os/mm/devsoundextensions/drmaudioplayer/group"/>
+</component>
+<component name="mmextfw" filter="s60" long-name="Multimedia Extension Framework">
+<unit bldFile="os/mm/devsoundextensions/mmextfw/group"/>
+</component>
+<component name="audiorouting" filter="s60" long-name="Audio Routing">
+<unit bldFile="os/mm/devsoundextensions/audiorouting/group"/>
+</component>
+<component name="effects" filter="s60" long-name="Effects">
+<unit bldFile="os/mm/devsoundextensions/effects/group"/>
+</component>
+<component name="effectspresets" filter="s60" long-name="Effects Presets">
+<unit bldFile="os/mm/devsoundextensions/effectspresets/group"/>
+</component>
+<component name="effectspresets_utils" filter="s60" long-name="Effects Presets Utils">
+<!-- need to #include the lot from a single bld.inf
+ Also move to a standard component location, not under effectspresets -->
+<unit bldFile="os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
+<unit bldFile="os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
+</component>
+<component name="telephonyaudiorouting" filter="s60" long-name="Telephony Audio Routing">
+<unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/group"/>
+</component>
+<component name="mmfcustominterfaces" filter="s60" long-name="MMF Custom Interfaces">
+<unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/group"/>
+</component>
+<component name="addeddevsoundcontrol" filter="s60" long-name="Added DevSound Control">
+<unit bldFile="os/mm/devsoundextensions/addeddevsoundcontrol/group"/>
+</component>
+<component name="globalaudiosettings" filter="s60" long-name="Global Audio Settings">
+<unit bldFile="os/mm/devsoundextensions/globalaudiosettings/group"/>
+</component>
+<component name="restrictedaudiooutput" filter="s60" long-name="Restricted Audio Output">
+<unit bldFile="os/mm/devsoundextensions/restrictedaudiooutput/group"/>
+</component>
+<component name="ciextnfactoryplugins" filter="s60" long-name="Custom Interface Extension Factory Plugins" plugin="Y">
+<unit bldFile="os/mm/devsoundextensions/ciextnfactoryplugins/group"/>
+</component>
+</collection>
+<collection name="mdfdevvideoextensions" long-name="MDF Dev Video Extensions" level="device-fw">
+<component name="nga_mdf_postprocessor" long-name="NGA MDF Postprocessor" filter="s60">
+<unit bldFile="os/mm/mdfdevvideoextensions/nga_mdf_postprocessor/group"/>
+</component>
+</collection>
+<collection name="audio" long-name="Audio Codecs" level="middleware">
+<component name="arm_cmmf_codecs" filter="s60" long-name="ARM CMMF Codecs" plugin="Y">
+<unit bldFile="os/mm/audio/arm_cmmf_codecs/group"/>
+</component>
+</collection>
+<collection name="video" long-name="Video Codecs" level="middleware">
+<!-- empty -->
+</collection>
+<collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
+<component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
+<unit bldFile="os/mm/imagingandcamerafws/imagingfws/group" mrp="os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
+</component>
+<component name="camerafw" long-name="Camera Framework" introduced="7.0s" purpose="optional">
+<unit bldFile="os/mm/imagingandcamerafws/camerafw/group" mrp="os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
+</component>
+</collection>
+<collection name="mmlibs" long-name="Multimedia Libraries" level="middleware">
+<component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
+<unit bldFile="os/mm/mmlibs/mmutilitylib/group" mrp="os/mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
+</component>
+<component name="mmfw" long-name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
+<unit bldFile="os/mm/mmlibs/mmfw/group" mrp="os/mm/mmlibs/mmfw/group/multimedia_mmf.mrp"/>
+</component>
+</collection>
+<collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
+<component name="imagingplugins" long-name="Imaging Plugins" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="os/mm/mmplugins/imagingplugins/group" mrp="os/mm/mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
+</component>
+<component name="cameraplugins" long-name="Camera Plugins" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="os/mm/mmplugins/cameraplugins/group" mrp="os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
+</component>
+<component name="lib3gp" long-name="3GP Library" introduced="^2" purpose="optional">
+<unit bldFile="os/mm/mmplugins/lib3gp/group" mrp="os/mm/mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
+</component>
+<component name="mmfwplugins" long-name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="os/mm/mmplugins/mmfwplugins/group" mrp="os/mm/mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
+</component>
+</collection>
+<collection name="mm_info" long-name="Multimedia Info" level="app-if">
+<component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc">
+<unit mrp="os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
+</component>
+<component name="mm_metadata" long-name="Multimedia Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
+</component>
+</collection>
+<collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
+<component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="^2" purpose="development">
+<unit bldFile="os/mm/mmresourcemgmt/mmresctrl/group" mrp="os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
+</component>
+</collection>
+<collection name="mmdevicefw" long-name="Multimedia Device Framework" level="device-fw">
+<component name="mdf" long-name="Media Device Framework" introduced="9.2" purpose="mandatory">
+<unit bldFile="os/mm/mmdevicefw/mdf/group" mrp="os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
+</component>
+<component name="speechrecogsupport" long-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 name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
+<component name="videorenderer" long-name="Video Renderer" introduced="^3" purpose="optional">
+<unit bldFile="os/mm/mmswadaptation/videorenderer/group" mrp="os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
+</component>
+</collection>
+<collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw"/>
+<collection name="omxil" long-name="OpenMAX IL" level="hw-if">
+<component name="omxilapi" long-name="OpenMAX IL API" introduced="^3" purpose="optional">
+<unit bldFile="os/mm/omxil/omxilapi/group" mrp="os/mm/omxil/omxilapi/group/multimedia_omx_il_api.mrp" version="1"/>
+</component>
+<component name="omxilcore" long-name="OpenMAX IL Core" introduced="^3" purpose="optional">
+<unit bldFile="os/mm/omxil/omxilcore/group" mrp="os/mm/omxil/omxilcore/group/multimedia_omx_il_core.mrp" version="1"/>
+</component>
+<component name="omxilcomponentcommon" long-name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
+<unit bldFile="os/mm/omxil/omxilcomponentcommon/group" mrp="os/mm/omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp" version="1"/>
+</component>
+<component name="omxilrefcomps" long-name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
+<unit bldFile="os/mm/omxil/omxilrefcomps/ref_components/group" mrp="os/mm/omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp" version="1"/>
+</component>
+<component name="mmilapi" long-name="Multimedia Integration Layer API" introduced="^3" purpose="development">
+<unit bldFile="os/mm/omxil/mmilapi/group" mrp="os/mm/omxil/mmilapi/group/multimedia_il_api.mrp"/>
+</component>
+</collection>
+<collection name="devsound" long-name="Sound Device" level="devices">
+<component name="devsoundapi" long-name="DevSound API" introduced="7.0s" purpose="mandatory">
+<unit bldFile="os/mm/devsound/devsoundapi/group" mrp="os/mm/devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
+</component>
+<component name="a3fdevsound" long-name="A3F DevSound" introduced="^2" purpose="optional">
+<unit bldFile="os/mm/devsound/a3fdevsound/group" mrp="os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
+</component>
+<component name="a3facf" long-name="A3F Audio Component Framework" introduced="^2" purpose="optional">
+<unit bldFile="os/mm/devsound/a3facf/group" mrp="os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
+</component>
+<component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
+<unit bldFile="os/mm/devsound/devsoundpluginsupport/group" mrp="os/mm/devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
+</component>
+<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" 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">
+<unit bldFile="os/mm/devsound/a3ftrace/group" mrp="os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
+</component>
+<component name="a3fsrvstart" long-name="A3F Server Start" introduced="^2" purpose="optional" plugin="Y">
+<unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
+</component>
+</collection>
+<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
+<component name="devsoundhwdeviceapi" long-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 name="a3facl" long-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 name="a3fdevsoundcustomisation" long-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"/>
+</component>
+<component name="refacladapt" long-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"/>
+</component>
+<component name="videohai" long-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 name="dvbhreceiverhai" long-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>
+</block>
+<block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
+<collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
+<component name="exif_api" long-name="Exif API" filter="s60" class="api">
+<unit bldFile="os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
+</component>
+</collection>
+<collection name="imagingext_plat" long-name="Imaging Extensions Platform Interfaces" level="app-if">
+<component name="jpeg2000_icl_plugin_api" long-name="JPEG2000 ICL plugin API" filter="s60" class="api">
+<unit bldFile="os/imagingext/imagingext_plat/jpeg2000_icl_plugin_api/group"/>
+</component>
+<component name="extended_icl_jpeg_api" long-name="Extended ICL Jpeg API" filter="s60" class="api">
+<unit bldFile="os/imagingext/imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
+</component>
+<component name="h324_annex_k_custom_api" long-name="H324 Annex K Custom API" filter="s60" class="api">
+<unit bldFile="os/imagingext/imagingext_plat/h324_annex_k_custom_api/group"/>
+</component>
+<component name="ecam_orientation_custom_api" long-name="ECam Orientation Custom API" filter="s60" class="api">
+<unit bldFile="os/imagingext/imagingext_plat/ecam_orientation_custom_api/group"/>
+</component>
+<component name="ecam_ui_orientation_override_custom_api" long-name="ECam UI Orientation Override Custom API" filter="s60" class="api">
+<unit bldFile="os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
+</component>
+<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" introduced="^4" class="api">
+<unit bldFile="os/imagingext/imagingext_plat/ecam_use_case_hint_custom_api/group"/>
+</component>
+</collection>
+<collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
+<component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
+<unit bldFile="os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
+</component>
+<component name="imageadaptationextensions_build" filter="s60" long-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"/>
+</component>
+</collection>
+<collection name="imagingmodules" long-name="Imaging Modules" level="hw-if">
+<component name="exiflib" filter="s60" long-name="Exif Library">
+<unit bldFile="os/imagingext/imagingmodules/exiflib/group"/>
+</component>
+<component name="jp2kcodec" filter="s60" long-name="JPEG2000 Decoder Plugin" plugin="Y">
+<unit bldFile="os/imagingext/imagingmodules/jp2kcodec/group"/>
+</component>
+</collection>
+</block>
+<block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
+<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
+<component name="vgi" filter="s60" long-name="VGI">
+<unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
+</component>
+</collection>
+<collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adaptations">
+<component name="m3gcore11" filter="s60" long-name="M3G Core 1.1">
+<unit bldFile="os/graphics/m3g/m3gcore11/group"/>
+</component>
+</collection>
+<collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines">
+<component name="graphicsresource" long-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 name="graphicsresourceadaptation" long-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"/>
+</component>
+<component name="graphicsresourceimplementation" long-name="Graphics Resource Implementation" introduced="^4" purpose="optional">
+<unit bldFile="os/graphics/graphicsresourceservices/graphicsresourceimplementation/group" mrp="os/graphics/graphicsresourceservices/graphicsresourceimplementation/group/graphics_graphicsresourceimplementation.mrp"/>
+</component>
+<component name="graphicsresourceinterface" long-name="Graphics Resource Interface" introduced="^4" purpose="optional">
+<unit bldFile="os/graphics/graphicsresourceservices/graphicsresourceinterface/group" mrp="os/graphics/graphicsresourceservices/graphicsresourceinterface/group/graphics_graphicsresourceinterface.mrp"/>
+</component>
+</collection>
+<collection name="graphicsutils" long-name="Graphics Utils" level="engines">
+<component name="commongraphicsheaders" long-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 name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
+<!-- displayldd to be moved here -->
+<component name="surfacemgr" long-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 name="graphicscomposition" long-name="Graphics Composition" level="engines">
+<component name="openwfcinterface" long-name="OpenWF Composition Interface" introduced="^3" purpose="optional">
+<unit bldFile="os/graphics/graphicscomposition/openwfcinterface/group" mrp="os/graphics/graphicscomposition/openwfcinterface/group/graphics_openwfcinterface.mrp"/>
+</component>
+<component name="openwfcompositionengine" long-name="OpenWF Composition Engine" introduced="^3" purpose="development">
+<unit bldFile="os/graphics/graphicscomposition/openwfcompositionengine/group" mrp="os/graphics/graphicscomposition/openwfcompositionengine/group/graphics_openwfcompositionengine.mrp"/>
+</component>
+<component name="openwfsupport" long-name="OpenWF Support" introduced="^3" purpose="optional">
+<unit bldFile="os/graphics/graphicscomposition/openwfsupport/group" mrp="os/graphics/graphicscomposition/openwfsupport/group/graphics_openwfsupport.mrp"/>
+</component>
+<component name="surfaceupdate" long-name="Surface Update" introduced="^3" purpose="optional">
+<unit bldFile="os/graphics/graphicscomposition/surfaceupdate/group" mrp="os/graphics/graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
+</component>
+</collection>
+<collection name="graphicstest" long-name="Graphics Test" level="app-if">
+<component name="uibench" long-name="UI Bench" introduced="9.2" purpose="development">
+<unit bldFile="os/graphics/graphicstest/uibench/group" mrp="os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
+</component>
+</collection>
+<collection name="graphics_plat" long-name="Graphics Platform Interfaces" level="app-if">
+<component name="m3g_core_api" filter="sf_build" long-name="M3G Core API" class="api">
+<unit bldFile="os/graphics/graphics_plat/m3g_core_api/group"/>
+</component>
+</collection>
+<collection name="graphics_info" long-name="Graphics Info" level="app-if">
+<component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc">
+<unit mrp="os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
+</component>
+<component name="graphics_metadata" long-name="Graphics Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
+</component>
+</collection>
+<collection name="windowing" long-name="Windowing" level="app-if">
+<component name="windowserver" long-name="Window Server" purpose="mandatory">
+<unit bldFile="os/graphics/windowing/windowserver/group" mrp="os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
+</component>
+<component name="windowserverplugins" long-name="Window Server Plugins" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/graphics/windowing/windowserverplugins/group" mrp="os/graphics/windowing/windowserverplugins/group/graphics_wserv_std_plugins.mrp"/>
+</component>
+</collection>
+<collection name="printingservices" long-name="Printing Services" level="app-if">
+<component name="printerdriversupport" long-name="Printer Driver Support" purpose="optional">
+<unit bldFile="os/graphics/printingservices/printerdriversupport/group" mrp="os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
+</component>
+<component name="printerdrivers" long-name="Printer Drivers" purpose="optional" plugin="Y">
+<unit bldFile="os/graphics/printingservices/printerdrivers/group" mrp="os/graphics/printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
+</component>
+</collection>
+<collection name="fbs" long-name="Font and Bitmap Server" level="device-interface">
+<component name="fontandbitmapserver" long-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 name="opengles" long-name="OpenGLES" level="internal-adaptations">
+<component name="openglesinterface" long-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 name="opengles_stub" filter="sf_build" long-name="OpenGL ES Stub" purpose="optional" introduced="^2">
+<unit bldFile="os/graphics/opengles/openglesinterface/group/opengles_stub"/>
+</component>
+</collection>
+<collection name="openvg" long-name="OpenVG" level="internal-adaptations">
+<component name="openvginterface" long-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 name="openvg11" filter="s60" long-name="OpenVG 1.1">
+<!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
+<unit bldFile="os/graphics/openvg/openvginterface/group/openvg11"/>
+</component>
+<component name="sfopenvg" filter="sf_build" long-name="Khronos OpenVG Reference Implementation" introduced="^2" purpose="optional">
+<unit bldFile="os/graphics/openvg/openvgrefimplementation/sfopenvg/group"/>
+</component>
+</collection>
+<collection name="egl" long-name="EGL" level="internal-adaptations">
+<component name="eglinterface" long-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 name="eglswitch" long-name="EGL Switch" introduced="^3" purpose="optional">
+<unit bldFile="os/graphics/egl/eglswitch/group" mrp="os/graphics/egl/eglswitch/group/graphics_eglswitch.mrp"/>
+</component>
+<component name="eglrefimpl" long-name="EGL Reference Implementation" introduced="^3" purpose="optional">
+<unit bldFile="os/graphics/egl/eglrefimpl/group" mrp="os/graphics/egl/eglrefimpl/group/graphics_eglrefimpl.mrp"/>
+</component>
+<component name="egltest" long-name="EGL Tests" introduced="^3" purpose="development">
+<unit bldFile="os/graphics/egl/egltest/group" mrp="os/graphics/egl/egltest/group/graphics_egltest.mrp"/>
+</component>
+</collection>
+<collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
+<component name="gdi" long-name="GDI" purpose="mandatory">
+<unit bldFile="os/graphics/graphicsdeviceinterface/gdi/group" mrp="os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
+</component>
+<component name="bitgdi" long-name="BitGDI" purpose="mandatory">
+<unit bldFile="os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
+</component>
+<component name="colourpalette" long-name="Colour Palette" introduced="7.0s" purpose="optional">
+<unit bldFile="os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
+</component>
+<component name="screendriver" long-name="Screen Driver" introduced="6.1" purpose="optional" plugin="Y">
+<unit bldFile="os/graphics/graphicsdeviceinterface/screendriver/group" mrp="os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
+</component>
+<component name="directgdi" long-name="DirectGDI" introduced="^3" deprecated="^3" purpose="optional">
+<unit bldFile="os/graphics/graphicsdeviceinterface/directgdi/group" mrp="os/graphics/graphicsdeviceinterface/directgdi/group/graphics_directgdi.mrp"/>
+</component>
+<component name="directgdiinterface" long-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 name="directgdiadaptation" long-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"/>
+</component>
+</collection>
+<collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
+<component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC">
+<unit bldFile="os/graphics/graphicstools/gdi_tools/group" mrp="os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
+</component>
+</collection>
+<collection name="graphicsapitest" long-name="Graphics API Tests" level="app-if"/>
+</block>
+<block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
+<collection name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" level="text">
+<component name="findutil_api" long-name="Find Util API" filter="s60" class="api">
+<unit bldFile="os/textandloc/textandloc_plat/findutil_api/group"/>
+</component>
+<component name="japanese_language_utilities_api" long-name="Japanese Language Utilities API" filter="s60" class="api">
+<unit bldFile="os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
+</component>
+<component name="sortutil_api" long-name="Sort Util API" filter="s60" class="api">
+<unit bldFile="os/textandloc/textandloc_plat/sortutil_api/group"/>
+</component>
+</collection>
+<collection name="textandloc_pub" long-name="Text and Localisation Public Interfaces" level="text">
+<component name="directory_localizer_api" long-name="Directory Localizer API" filter="s60" class="api">
+<unit bldFile="os/textandloc/textandloc_pub/directory_localizer_api/group"/>
+</component>
+</collection>
+<collection name="charconvfw" long-name="Character Conversion" level="encoding">
+<component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional">
+<unit bldFile="os/textandloc/charconvfw/charconv_fw/group" mrp="os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
+</component>
+<component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" plugin="Y">
+<unit bldFile="os/textandloc/charconvfw/charconvplugins/group" mrp="os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
+</component>
+<component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y">
+<unit bldFile="os/textandloc/charconvfw/fatfilenameconversionplugins/group" mrp="os/textandloc/charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
+</component>
+</collection>
+<collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
+<component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" deprecated="^4" plugin="Y">
+<unit bldFile="os/textandloc/fontservices/textshaperplugin/group" mrp="os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
+</component>
+<component name="fontstore" long-name="Font Store" purpose="mandatory">
+<unit bldFile="os/textandloc/fontservices/fontstore/group" mrp="os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
+</component>
+<component name="textbase" long-name="Text Base" purpose="mandatory" class="placeholder">
+<!-- placeholder for text code from GDI -->
+</component>
+<component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y">
+<unit bldFile="os/textandloc/fontservices/freetypefontrasteriser/group" mrp="os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
+</component>
+<component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional">
+<unit bldFile="os/textandloc/fontservices/referencefonts/group" mrp="os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
+</component>
+</collection>
+<collection name="textlayout" long-name="Text Layout" level="text">
+<component name="texthandling" long-name="Text Handling" purpose="optional">
+<unit bldFile="os/textandloc/textrendering/texthandling/group" mrp="os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
+</component>
+<component name="textformatting" long-name="Text Formatting" purpose="optional">
+<unit bldFile="os/textandloc/textrendering/textformatting/group" mrp="os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
+</component>
+</collection>
+<collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
+<component name="numbergrouping" long-name="Number Grouping">
+<unit bldFile="os/textandloc/charconvfw/numbergrouping/group"/>
+</component>
+<component name="jplangutil" long-name="Japanese Language Utilities">
+<unit bldFile="os/textandloc/charconvfw/jplangutil/group"/>
+</component>
+<component name="sortutil" long-name="Sorting Utility">
+<unit bldFile="os/textandloc/charconvfw/sortutil/group"/>
+</component>
+<component name="inlinetext" long-name="Inline Text">
+<unit bldFile="os/textandloc/charconvfw/inlinetext/group"/>
+</component>
+<component name="nearestlangutil" long-name="Nearest Language Util" introduced="^2" purpose="mandatory" class="placeholder">
+<!-- placeholder for split from bafl -->
+</component>
+<component name="numberformatting" long-name="Number Formatting" introduced="7.0s" purpose="optional">
+<unit bldFile="os/textandloc/textrendering/numberformatting/group" mrp="os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
+</component>
+</collection>
+<collection name="localesupport" long-name="Locale Support" level="util">
+<component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y">
+<unit bldFile="os/textandloc/localisation/localesupport" mrp="os/textandloc/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
+</component>
+<component name="initlocale" long-name="Initialise Locale" introduced="^2" purpose="mandatory" class="placeholder">
+<!-- placeholder for split from bafl -->
+</component>
+</collection>
+<collection name="textandloctools" long-name="Text and Localisation Tools" level="tools">
+<component name="fontcompiler" long-name="Font Compiler" purpose="development" class="placeholder PC">
+<!-- placeholder for split from GDI Tools -->
+</component>
+<component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC">
+<unit bldFile="os/graphics/graphicstools/bitmapfonttools/group" mrp="os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
+</component>
+</collection>
+<collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
+<component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
+<collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
+<component name="xmlsrv_plat_build" long-name="XML Services Platform Interface Build" filter="s60" class="api">
+<!-- need to fix the configuration used here.
+ Either destribute to other components or use the new feature flags confguration mechanisms.
+ Remove this component and uncomment the other units when fixed-->
+<unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
+</component>
+<component name="xml_encryption_api" long-name="XML Encryption API" filter="s60" class="api placeholder">
+<!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/> -->
+</component>
+<component name="xml_signature_api" long-name="XML Signature API" filter="s60" class="api placeholder">
+<!-- <unit bldFile="xmlsrv_plat/xml_signature_api/group"/> -->
+</component>
+<component name="xml_security_engine_utils_api" long-name="XML Security Engine Utils API" filter="s60" class="api placeholder">
+<!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/> -->
+</component>
+</collection>
+<collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
+<component name="xmlseccertman" filter="s60" long-name="XML Security Certificate Manager">
+<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
+</component>
+<component name="xmlsec" filter="s60" long-name="XML Security">
+<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsec/group"/>
+</component>
+<component name="xmlseccrypto" filter="s60" long-name="XML Security Crypto">
+<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccrypto/group"/>
+</component>
+<component name="xmlsecwrapper" filter="s60" long-name="XML Security Wrapper">
+<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsecwrapper/group"/>
+</component>
+</collection>
+<collection name="xml" long-name="XML" level="generic">
+<component name="xmlfw" long-name="XML Framework" introduced="7.0s" purpose="optional">
+<unit bldFile="os/xmlsrv/xml/xmlfw/group" mrp="os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
+</component>
+<component name="libxml2libs" long-name="Libxml2 Libraries" introduced="^3" purpose="optional">
+<unit bldFile="os/xmlsrv/xml/libxml2libs/group" mrp="os/xmlsrv/xml/libxml2libs/group/syslibs_libxml2.mrp"/>
+</component>
+<component name="legacyminidomparser" long-name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
+<unit bldFile="os/xmlsrv/xml/legacyminidomparser/GROUP" mrp="os/xmlsrv/xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp"/>
+</component>
+<component name="xmldomandxpath" long-name="XML DOM and XPath" introduced="^3" purpose="optional">
+<unit bldFile="os/xmlsrv/xml/xmldomandxpath/group" mrp="os/xmlsrv/xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
+</component>
+<component name="xmlexpatparser" long-name="XML Expat Parser" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="os/xmlsrv/xml/xmlexpatparser/group" mrp="os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
+</component>
+<component name="xmllibxml2parser" long-name="XML Libxml2 Parser" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/xmlsrv/xml/xmllibxml2parser/group" mrp="os/xmlsrv/xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
+</component>
+<component name="wbxmlparser" long-name="WBXML Parser" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="os/xmlsrv/xml/wbxmlparser/group" mrp="os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
+</component>
+</collection>
+<collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
+<component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="deviceplatformrelease" level="services" long-name="Device Platform Release" levels="bld mid top">
+<collection name="s60extras" long-name="S60 Extras" level="mid">
+<!-- collection is really a component. Need to move down a directory -->
+<component name="s60extras_build" filter="s60" long-name="S60 Extras Build" purpose="development" class="config">
+<unit bldFile="os/deviceplatformrelease/S60Extras/group"/>
+</component>
+</collection>
+<collection name="version" long-name="Version" level="top">
+<!-- collection is really a component. Need to move down a directory -->
+<component name="version_build" filter="s60" long-name="Version Build" purpose="development" class="config">
+<unit bldFile="os/deviceplatformrelease/Version/group"/>
+</component>
+</collection>
+<collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
+<component name="cedarutils" long-name="Cedar Utils" purpose="development">
+<unit mrp="os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
+</component>
+<component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt" purpose="development" class="config">
+<unit mrp="os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
+</component>
+</collection>
+<collection name="foundation_system" long-name="Foundation System" level="top">
+<component name="system_model" long-name="System Model" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
+</component>
+<component name="sf_config" long-name="Foundation Config" introduced="^4">
+<unit bldFile="os/deviceplatformrelease/foundation_system/sf_config/CI_external/group"/>
+</component>
+<component name="config" filter="s60" long-name="Config" purpose="development" class="config"/>
+<component name="cenrep" filter="sf_build" long-name="ConE Central Repository Config" purpose="development" class="config">
+<!-- will should give the id/path something more unique than cenrep -->
+<unit bldFile="os/deviceplatformrelease/foundation_system/sf_config/cenrep/group"/>
+</component>
+<!-- comment out until rom configs are added -->
+<!-- component name="rombuild_syborg" filter="sf_build" long-name="Syborg iMaker Config" purpose="development" introduced="^3" class="config">
+<unit bldFile="os/deviceplatformrelease/foundation_system/sf_config/rombuild/syborg/group"/>
+</component>
+<component name="rombuild_zoom2" filter="sf_build" long-name="Zoom2 iMaker Config" purpose="development" introduced="^3" class="config">
+<unit bldFile="os/deviceplatformrelease/foundation_system/sf_config/rombuild/zoom2/group"/>
+</component -->
+<component name="sbs" filter="sf_build" long-name="Foundation SBS config" purpose="development" class="config">
+<!-- will should give the id/path something more unique than sbs -->
+<unit bldFile="os/deviceplatformrelease/foundation_system/sf_config/sbs/group"/>
+</component>
+</collection>
+<collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
+<component name="deviceplatformrelease_metadata" long-name="Device Platform Release Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="osrndtools" level="services" long-name="OS R&D tools" levels="fw trace">
+<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"/>
+</component>
+<component name="testinterface" filter="s60" long-name="Test Interface" purpose="development">
+<unit bldFile="os/osrndtools/stif/testinterface/group"/>
+</component>
+<component name="testserver" filter="s60" long-name="Test Server" purpose="development">
+<unit bldFile="os/osrndtools/stif/testserver/group"/>
+</component>
+<component name="testengine" filter="s60" long-name="Test Engine" purpose="development">
+<unit bldFile="os/osrndtools/stif/testengine/group"/>
+</component>
+<component name="testserverstarter" filter="s60" long-name="Test Server Starter" purpose="development">
+<unit bldFile="os/osrndtools/stif/testserverstarter/group"/>
+</component>
+<component name="stiftfwif" filter="s60" long-name="STIF Test Framework Interface" purpose="development">
+<unit bldFile="os/osrndtools/stif/stiftfwif/group"/>
+</component>
+<component name="consoleui" filter="s60" long-name="Console UI" purpose="development">
+<unit bldFile="os/osrndtools/stif/consoleui/group"/>
+</component>
+<component name="testcombiner" filter="s60" long-name="Test Combiner" purpose="development">
+<unit bldFile="os/osrndtools/stif/testcombiner/group"/>
+</component>
+<component name="demomodule" filter="s60" long-name="Demo Module" purpose="development">
+<unit bldFile="os/osrndtools/stif/demomodule/group"/>
+</component>
+<component name="atslogger" filter="s60" long-name="ATS Logger" purpose="development">
+<unit bldFile="os/osrndtools/stif/atslogger/group"/>
+</component>
+<component name="atsinterface" filter="s60" long-name="ATS Interface" purpose="development">
+<unit bldFile="os/osrndtools/stif/atsinterface/group"/>
+</component>
+<component name="testscripter" filter="s60" long-name="Test Scripter" purpose="development">
+<unit bldFile="os/osrndtools/stif/testscripter/group"/>
+</component>
+<component name="suevent" filter="s60" long-name="SU Event" purpose="development">
+<unit bldFile="os/osrndtools/stif/suevent/group"/>
+</component>
+<component name="stifkerneltestclassbase" filter="s60" long-name="STIF Kernel Test Class Base" purpose="development">
+<!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
+<!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
+</component>
+<component name="stif_build" filter="s60" long-name="STIF Build" purpose="development">
+<!-- move exports into self-contained component. Remove this when configuration is in place-->
+<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">
+<unit bldFile="os/osrndtools/memspy/memspy_plat/group"/>
+</component>
+<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">
+<unit bldFile="os/osrndtools/memspy/engine/group"/>
+</component>
+<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">
+<unit bldFile="os/osrndtools/memspy/console/group"/>
+</component>
+<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>
+</collection>
+<collection name="hti" long-name="Harmonized Test Interface" level="trace">
+<component name="hti_plat" filter="s60" long-name="HTI Platform Interfaces" purpose="development" class="api">
+<unit bldFile="os/osrndtools/hti/hti_plat/group"/>
+</component>
+<component name="hticfg" filter="s60" long-name="HTI Config" purpose="development">
+<unit bldFile="os/osrndtools/hti/hticfg/group"/>
+</component>
+<component name="htiautostart" filter="s60" long-name="HTI Autostart" purpose="development">
+<unit bldFile="os/osrndtools/hti/htiautostart/group"/>
+</component>
+<component name="htiframework" filter="s60" long-name="HTI Framework" purpose="development">
+<unit bldFile="os/osrndtools/hti/htiframework/group"/>
+</component>
+<component name="hticommplugins" filter="s60" long-name="HTI Communication Plugins" purpose="development" plugin="Y">
+<!-- need to #include these from a single unit or separate into component at the right directory level -->
+<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
+<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
+<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
+<unit bldFile="os/osrndtools/hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
+</component>
+<component name="htiserviceplugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
+<!-- need to #include these from a single unit or separate into component at the right directory level -->
+<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
+<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
+<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
+<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
+<unit bldFile="os/osrndtools/hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
+</component>
+<component name="htifilehlp" filter="s60" long-name="HTI File Help" purpose="development">
+<unit bldFile="os/osrndtools/hti/htifilehlp/group"/>
+</component>
+<component name="htiwatchdog" filter="s60" long-name="HTI Watchdog" purpose="development">
+<unit bldFile="os/osrndtools/hti/htiwatchdog/group"/>
+</component>
+<component name="hti_build" filter="s60" long-name="HTI Build" purpose="development">
+<!-- move exports into self-contained component.-->
+<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">
+<block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
+<collection name="appsupport_pub" long-name="Generic Application Support Public Interfaces" level="specific">
+<component name="flash_viewer_framework_api" long-name="Flash Viewer Framework API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
+</component>
+<component name="network_status_api" long-name="Network Status API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_pub/network_status_api/group"/>
+</component>
+</collection>
+<collection name="appsupport_plat" long-name="Generic Application Support Platform Interfaces" level="specific">
+<component name="action_plugin_api" long-name="Action Plug-In API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/action_plugin_api/group"/>
+</component>
+<component name="application_orientation_api" long-name="Application Orientation API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/application_orientation_api/group"/>
+</component>
+<component name="context_access_api" long-name="Context Access API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/context_access_api/group"/>
+</component>
+<component name="context_framework_services_api" long-name="Context Framework Services API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/context_framework_services_api/group"/>
+</component>
+<component name="context_framework_client_api" long-name="Context Framework Client API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/context_framework_client_api/group"/>
+</component>
+<component name="context_framework_listener_api" long-name="Context Framework Listener API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/context_framework_listener_api/group"/>
+</component>
+<component name="context_framework_version_api" long-name="Context Framework Version API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/context_framework_version_api/group"/>
+</component>
+<component name="context_source_plugin_api" long-name="Context Source Plug-In API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/context_source_plugin_api/group"/>
+</component>
+<component name="context_source_settings_manager_api" long-name="Context Source Settings Manager API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/context_source_settings_manager_api/group"/>
+</component>
+<component name="context_subscription_api" long-name="Context Subscription API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/context_subscription_api/group"/>
+</component>
+<component name="key_event_framework_api" long-name="Key Event Framework API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_api/group"/>
+</component>
+<component name="key_event_framework_mapper_api" long-name="Key Event Framework Mapper API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_mapper_api/group"/>
+</component>
+<component name="media_keys_definition_api" long-name="Media Keys Definition API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/media_keys_definition_api/group"/>
+</component>
+<component name="ood_threshold_api" long-name="OOD Threshold API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/ood_threshold_api/group"/>
+</component>
+<component name="oom_monitor_api" long-name="OOM Monitor API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_api/group"/>
+</component>
+<component name="oom_monitor_plugin_api" long-name="OOM Monitor Plugin API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_plugin_api/group"/>
+</component>
+<component name="operation_provider_api" long-name="Operation Provider API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/operation_provider_api/group"/>
+</component>
+<component name="phonecmdhandler_api" long-name="Phone Command Handler API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/phonecmdhandler_api/group"/>
+</component>
+<component name="restore_factory_settings_api" long-name="Restore Factory Settings API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_api/group"/>
+</component>
+<component name="restore_factory_settings_plugin_api" long-name="Restore Factory Settings Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_plugin_api/group"/>
+</component>
+<component name="secondary_display_accfw_api" long-name="Secondary Display Accessory Framework API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_accfw_api/group"/>
+</component>
+<component name="secondary_display_startup_api" long-name="Secondary Display Startup API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_startup_api/group"/>
+</component>
+<component name="secondary_display_sysap_api" long-name="Secondary Display System Application API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_sysap_api/group"/>
+</component>
+<component name="secondary_display_system_state_api" long-name="Secondary Display System State API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/secondary_display_system_state_api/group"/>
+</component>
+<component name="sensor_user_setting_api" long-name="Sensor User Setting API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/sensor_user_setting_api/group"/>
+</component>
+<component name="startup_configuration_api" long-name="Startup Configuration API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/startup_configuration_api/group"/>
+</component>
+<component name="system_application_key_handler_plugin_api" long-name="System Application Key Handler Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/system_application_key_handler_plugin_api/group"/>
+</component>
+<component name="system_application_light_control_plugin_api" long-name="System Application Light Control Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/system_application_light_control_plugin_api/group"/>
+</component>
+<component name="system_application_notification_api" long-name="System Application Notification API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/system_application_notification_api/group"/>
+</component>
+<component name="system_application_plugin_callback_api" long-name="System Application Plug-in Callback API" filter="s60" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
+</component>
+<component name="flash_mmi_service_interface_custom_api" long-name="Flash MMI Service Interface Custom API" filter="s60,!sf_build" introduced="^2" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/flash_mmi_service_interface_custom_api/group"/>
+</component>
+<component name="flash_netscape_plugin_command_api" long-name="Flash Netscape Plugin Command API" filter="s60,!sf_build" introduced="^2" class="api">
+<unit bldFile="mw/appsupport/appsupport_plat/flash_netscape_plugin_command_api/group"/>
+</component>
+</collection>
+<collection name="contextframework" long-name="Context Framework" level="framework">
+<!-- the units that are commented out need to be put back when configuration is in place.
+ They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
+<component name="cfw" filter="s60" long-name="Context Framework">
+<!--<unit bldFile="contextframework/cfw/group"/> -->
+</component>
+<component name="cfwplugins" filter="s60" long-name="Context Framework Plugins" plugin="Y">
+<!--<unit bldFile="contextframework/cfwplugins/group"/>-->
+</component>
+<component name="contextframework_build" filter="s60" long-name="Context Framework Build">
+<unit bldFile="mw/appsupport/contextframework/group"/>
+</component>
+</collection>
+<collection name="coreapplicationuis" long-name="Core Application UIs" level="server">
+<component name="dbrecovery" filter="s60" long-name="Database Recovery">
+<unit bldFile="mw/appsupport/coreapplicationuis/dbrecovery/group"/>
+</component>
+<component name="nspswsplugin" filter="s60" long-name="NSPS WS Plugin" plugin="Y">
+<!-- No Service Power Save? Window Server? Please elaborate-->
+<unit bldFile="mw/appsupport/coreapplicationuis/nspswsplugin/group"/>
+</component>
+<component name="rfs" filter="s60" long-name="Restore Factory Settings">
+<unit bldFile="mw/appsupport/coreapplicationuis/rfs/group"/>
+</component>
+<component name="rfsplugins" filter="s60" long-name="Restore Factory Settings Plugins" plugin="Y">
+<unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/group"/>
+</component>
+<component name="sysap" filter="s60" long-name="System Application">
+<unit bldFile="mw/appsupport/coreapplicationuis/sysap/group"/>
+</component>
+<component name="variatedsettings" filter="s60" long-name="Variated Settings" class="config">
+<unit bldFile="mw/appsupport/coreapplicationuis/variatedsettings/group"/>
+</component>
+<component name="accfwuinotifier" filter="s60" long-name="Accessory Framework UI Notifier" plugin="Y">
+<unit bldFile="mw/appsupport/coreapplicationuis/accfwuinotifier/group"/>
+</component>
+<component name="kefmapper" filter="s60" long-name="Key Event Framework">
+<unit bldFile="mw/appsupport/coreapplicationuis/kefmapper/group"/>
+</component>
+<component name="advancedtspcontroller" filter="s60" long-name="Advanced TSP Controller">
+<unit bldFile="mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
+</component>
+<component name="powersaveutilities" filter="s60" long-name="Power Save Utilities">
+<unit bldFile="mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
+</component>
+<component name="gsserverenginestub" filter="s60" long-name="GS Server Engine Stub" deprecated="^4">
+<unit bldFile="mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
+</component>
+<component name="gsserverengine" filter="s60" long-name="GS Server Engine" deprecated="^4">
+<unit bldFile="mw/appsupport/coreapplicationuis/gsserverengine/group"/>
+</component>
+<component name="sensordatacompensatorplugin" filter="s60" long-name="Sensor Data Compensator Plugin" plugin="Y">
+<unit bldFile="mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/group"/>
+</component>
+<component name="atcmdplugin" long-name="AT Command Plugin" filter="s60,!oem_build" plugin="Y">
+<unit bldFile="mw/appsupport/coreapplicationuis/atcmdplugin/group"/>
+</component>
+</collection>
+<collection name="flashliteapi_3_1" long-name="Flash Lite API 3.1" level="specific">
+<!-- collection is really a component. Move down a directory -->
+<component name="flashliteapi_3_1_build" long-name="Flash Lite API Build" filter="s60" introduced="^2"/>
+</collection>
+<collection name="mediakeys" long-name="Media Keys" level="plugin">
+<!-- collection is really a component. Move down a directory -->
+<component name="mediakeys_build" filter="s60" long-name="Media Keys Build">
+<unit bldFile="mw/appsupport/mediakeys/group"/>
+</component>
+</collection>
+<collection name="startupservices" long-name="Startup Services" level="system">
+<component name="splashscreen" filter="s60" long-name="Splash Screen">
+<unit bldFile="mw/appsupport/startupservices/splashscreen/group"/>
+</component>
+<component name="startupanimation" filter="s60" long-name="Startup Animation">
+<unit bldFile="mw/appsupport/startupservices/startupanimation/group"/>
+</component>
+<component name="startup" long-name="Startup Application" filter="s60">
+<unit bldFile="mw/appsupport/startupservices/startup/group"/>
+</component>
+</collection>
+<collection name="sysresmonitoring" long-name="System Resource Monitoring" level="system">
+<component name="oodmonitor" filter="s60" long-name="OOD Monitor" introduced="7.0s">
+<unit bldFile="mw/appsupport/sysresmonitoring/oodmonitor/group"/>
+</component>
+<component name="oommonitor" filter="s60" long-name="OOM Monitor" introduced="7.0s">
+<unit bldFile="mw/appsupport/sysresmonitoring/oommonitor/group"/>
+</component>
+</collection>
+<collection name="systemsettings" long-name="System Settings" level="system">
+<component name="gssensorplugin" filter="s60" long-name="GS Sensor Plugin" plugin="Y">
+<unit bldFile="mw/appsupport/systemsettings/gssensorplugin/group"/>
+</component>
+<component name="gsaccessoryplugin" filter="s60" long-name="GS Accessory Plugin" plugin="Y">
+<unit bldFile="mw/appsupport/systemsettings/gsaccessoryplugin/group"/>
+</component>
+</collection>
+<collection name="filehandling" long-name="File Handling" level="server">
+<component name="fileconverterfw" long-name="File Converter Framework" purpose="optional">
+<unit bldFile="mw/appsupport/filehandling/fileconverterfw/group" mrp="mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
+</component>
+<component name="htmltorichtextconverter" long-name="HTML to RichText Converter" introduced="7.0" purpose="optional" plugin="Y">
+<unit bldFile="mw/appsupport/filehandling/htmltorichtextconverter/group" mrp="mw/appsupport/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
+</component>
+<component name="richtexttohtmlconverter" long-name="RichText to HTML Converter" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
+</component>
+</collection>
+<collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
+<component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" deprecated="^4" plugin="Y">
+<unit bldFile="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
+</component>
+</collection>
+<collection name="commonappservices" long-name="Common Application Services" level="framework">
+<component name="alarmserver" long-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"/>
+</component>
+<component name="alarmservertest" long-name="Alarm Server Test" deprecated="^3" introduced="8.1" purpose="development">
+<unit bldFile="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
+</component>
+<component name="appservicesdocs" long-name="Application Services Documentation" purpose="development" class="doc">
+<unit mrp="mw/appsupport/commonappservices/appservicesdocs/app-services_documentation.mrp"/>
+</component>
+<component name="backuprestorenotification" long-name="Backup Restore Notification" introduced="8.1" purpose="optional">
+<unit bldFile="mw/appsupport/commonappservices/backuprestorenotification/group" mrp="mw/appsupport/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
+</component>
+</collection>
+<collection name="tzservices" long-name="Time Zone Services" level="plugin">
+<component name="tzserver" long-name="Time Zone Server" introduced="9.1" purpose="optional">
+<unit bldFile="mw/appsupport/tzservices/tzserver/group" mrp="mw/appsupport/tzservices/tzserver/group/app-services_tz.mrp"/>
+</component>
+<component name="tzloc" long-name="Time Zone Localization" introduced="9.1" purpose="optional">
+<unit bldFile="mw/appsupport/tzservices/tzloc/group" mrp="mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
+</component>
+<component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
+<unit bldFile="mw/appsupport/tzservices/tzlocrscfactory/group" mrp="mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
+</component>
+<component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
+<unit bldFile="mw/appsupport/tzservices/tzdatabase/group" mrp="mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
+</component>
+</collection>
+<collection name="contenthandling" long-name="Content Handling" level="plugin">
+<component name="webrecognisers" long-name="Web Recognisers" purpose="optional" plugin="Y">
+<unit bldFile="mw/appsupport/contenthandling/webrecognisers/group" mrp="mw/appsupport/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
+</component>
+</collection>
+<collection name="openenvutils" long-name="Open Environment Utilities" level="specific">
+<component name="commandshell" long-name="Command Shell" introduced="^3" purpose="development">
+<unit bldFile="mw/appsupport/openenvutils/commandshell/group" mrp="mw/appsupport/openenvutils/commandshell/group/oetools_zsh.mrp"/>
+</component>
+<component name="telnetserver" long-name="Telnet Server" introduced="^3" purpose="development">
+<unit bldFile="mw/appsupport/openenvutils/telnetserver/group" mrp="mw/appsupport/openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
+</component>
+</collection>
+<collection name="printingsupport" long-name="Printing Support" level="generic">
+<component name="printinguisupport" long-name="Printing UI Support" purpose="optional" introduced="^2" deprecated="^3">
+<unit bldFile="mw/appsupport/printingsupport/printinguisupport/group" mrp="mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
+</component>
+</collection>
+<collection name="appfw" long-name="Application Framework" level="framework">
+<component name="apparchitecture" long-name="Application Architecture" purpose="mandatory">
+<unit bldFile="mw/appsupport/appfw/apparchitecture/group" mrp="mw/appsupport/appfw/apparchitecture/group/app-framework_apparc.mrp"/>
+</component>
+<component name="viewserver" long-name="View Server" introduced="6.0" purpose="mandatory">
+<unit bldFile="mw/appsupport/appfw/viewserver/group" mrp="mw/appsupport/appfw/viewserver/group/app-framework_viewsrv.mrp"/>
+</component>
+</collection>
+<collection name="applaunchservices" long-name="Application Launch Services" level="generic">
+<component name="aftermarketappstarter" long-name="After Market Application Starter" introduced="^3" purpose="optional">
+<unit bldFile="mw/appsupport/applaunchservices/aftermarketappstarter/group" mrp="mw/appsupport/applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
+</component>
+<component name="applaunchplugins" long-name="Application Launch Plugins" introduced="^3" purpose="optional">
+<unit bldFile="mw/appsupport/applaunchservices/applaunchplugins/group" mrp="mw/appsupport/applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
+</component>
+</collection>
+<collection name="tzpcside" long-name="Time Zone PC Side" level="plugin">
+<component name="tzcompiler" long-name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config PC">
+<unit bldFile="mw/appsupport/tzpcside/tzcompiler/group" mrp="mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
+</component>
+</collection>
+<collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
+<component name="appsupport_metadata" long-name="Generic Application Support Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="securitysrv" level="generic" long-name="Security Services" levels="plugin framework server generic specific">
+<collection name="secsrv_plat" long-name="Security Services Platform Interfaces" level="specific">
+<component name="cms_api" long-name="CMS API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/cms_api/group"/>
+</component>
+<component name="pkcs12_parser_api" long-name="PKCS12 Parser API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/pkcs12_parser_api/group"/>
+</component>
+<component name="java_utils_api" long-name="Java Utils API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/java_utils_api/group"/>
+</component>
+<component name="wim_cert_api" long-name="WIM Cert API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/wim_cert_api/group"/>
+</component>
+<component name="device_key_store_encryption_plugin_api" long-name="Device Key Store Encryption Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/device_key_store_encryption_plugin_api/group"/>
+</component>
+<component name="x509certnameparser_api" long-name="X.509 Certificate Name Parser API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
+</component>
+<component name="remote_lock_api" long-name="Remote Lock API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
+</component>
+<component name="pkidialog_api" long-name="PKI Dialog API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
+</component>
+<component name="provisioning_api" long-name="Provisioning API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/provisioning_api/group"/>
+</component>
+<component name="keyguard_configuration_api" long-name="Keyguard Configuration API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_configuration_api/group"/>
+</component>
+<component name="keylock_policy_api" long-name="Keylock Policy API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/keylock_policy_api/group"/>
+</component>
+<component name="security_code_ui_api" long-name="Security Code UI API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
+</component>
+<component name="gba_api" long-name="GBA API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/gba_api/group"/>
+</component>
+<component name="keyguard_access_api" long-name="Keyguard Access API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/keyguard_access_api/group"/>
+</component>
+<component name="devicelock_access_api" long-name="Device Lock Access API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/devicelock_access_api/group"/>
+</component>
+<component name="lockapp_server_api" long-name="Lock Application Server API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
+</component>
+<component name="devencadaptation_api" long-name="Device Encryption Adaptation API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
+</component>
+<component name="devenccommonutils_api" long-name="Device Encryption Common Utils API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
+</component>
+</collection>
+<collection name="cms" long-name="Certificate Management Service" level="server">
+<!-- collection is really a component. Need to move down a directory-->
+<component name="cms_build" filter="s60" long-name="CMS" introduced="^3">
+<unit bldFile="mw/securitysrv/cms/group"/>
+</component>
+</collection>
+<collection name="pkiutilities" long-name="PKI Utilities" level="plugin">
+<component name="x509certnameparser" filter="s60" long-name="X.509 Certificate Name Parser">
+<unit bldFile="mw/securitysrv/pkiutilities/x509certnameparser/group"/>
+</component>
+<component name="pkcs12" filter="s60" long-name="PKCS #12">
+<unit bldFile="mw/securitysrv/pkiutilities/pkcs12/group"/>
+</component>
+<component name="certmanui" filter="s60" long-name="Certificate Management UI">
+<unit bldFile="mw/securitysrv/pkiutilities/certmanui/group"/>
+</component>
+<component name="ctsecuritydialogs" filter="s60" long-name="Crypto Token Security Dialogs">
+<unit bldFile="mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
+</component>
+<component name="certsaver" filter="s60" long-name="Certificate Saver">
+<unit bldFile="mw/securitysrv/pkiutilities/certsaver/group"/>
+</component>
+<component name="secmodui" filter="s60" long-name="Security Module UI">
+<unit bldFile="mw/securitysrv/pkiutilities/secmodui/group"/>
+</component>
+<component name="devicetoken" filter="s60" long-name="Device Token">
+<unit bldFile="mw/securitysrv/pkiutilities/devicetoken/group"/>
+</component>
+<component name="certificates" filter="s60" long-name="Certificates">
+<unit bldFile="mw/securitysrv/pkiutilities/Certificates/group" filter="sf_build"/>
+</component>
+<component name="pkiutilities_build" filter="s60" long-name="PKI Utilities Build">
+<!-- need to split this into the above components -->
+<unit bldFile="mw/securitysrv/pkiutilities/group"/>
+</component>
+<component name="ocsp" long-name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
+<unit bldFile="mw/securitysrv/pkiutilities/ocsp/group" mrp="mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
+</component>
+</collection>
+<collection name="wim" long-name="Wireless Identity Module" level="framework">
+<!-- collection is really a component. Need to move down a directory-->
+<component name="wim_build" filter="s60" long-name="WIM Build">
+<unit bldFile="mw/securitysrv/wim/group"/>
+</component>
+</collection>
+<collection name="remotelock" long-name="Remote Lock" level="generic">
+<!-- collection is really a component. Need to move down a directory-->
+<component name="remotelock_build" filter="s60" long-name="Remote Lock Build">
+<unit bldFile="mw/securitysrv/remotelock/group"/>
+</component>
+</collection>
+<collection name="securitydialogs" long-name="Security Dialogs" level="specific">
+<component name="keylockpolicyapi" filter="s60" long-name="Keylock Policy API">
+<unit bldFile="mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
+</component>
+<component name="autolock" long-name="Autolock" filter="s60">
+<unit bldFile="mw/securitysrv/securitydialogs/autolock/group"/>
+</component>
+<component name="secui" filter="s60" long-name="Security UI">
+<unit bldFile="mw/securitysrv/securitydialogs/secui/group"/>
+</component>
+<component name="securitynotifier" filter="s60" long-name="Security Notifier">
+<unit bldFile="mw/securitysrv/securitydialogs/securitynotifier/group"/>
+</component>
+<component name="lockclient" filter="s60" long-name="Lock Client" introduced="^4">
+<unit bldFile="mw/securitysrv/securitydialogs/lockclient/group" proFile="lockclient.pro" qmakeArgs="-r"/>
+</component>
+<component name="lockapp" filter="s60" long-name="Lock Application" introduced="^3">
+<unit bldFile="mw/securitysrv/securitydialogs/lockapp/group"/>
+</component>
+<component name="secuinotifications" long-name="Security UI Notifications" introduced="^4" filter="s60">
+<unit bldFile="mw/securitysrv/securitydialogs/secuinotifications" proFile="secuinotifications.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+<collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
+<!-- collection is really a component. Need to move down a directory-->
+<component name="boottimeintegritycheck_build" filter="s60" long-name="Boot Time Integrity Check Build">
+<unit bldFile="mw/securitysrv/boottimeintegritycheck/group"/>
+</component>
+</collection>
+<collection name="gba" long-name="Generic Bootstrapping Architecture" level="server">
+<component name="uicc" filter="s60" long-name="UICC" introduced="^2" plugin="Y">
+<unit bldFile="mw/securitysrv/gba/uicc/group"/>
+</component>
+<component name="gbaserver" filter="s60" long-name="GBA Server" introduced="^2">
+<unit bldFile="mw/securitysrv/gba/gbaserver/group"/>
+</component>
+<component name="gbaapi" filter="s60" long-name="GBA API" introduced="^2">
+<unit bldFile="mw/securitysrv/gba/gbaapi/group"/>
+</component>
+<component name="gbafilter" filter="s60" long-name="GBA HTTP Filter" introduced="^2" plugin="Y">
+<unit bldFile="mw/securitysrv/gba/gbafilter/group"/>
+</component>
+<component name="gba_build" filter="s60" long-name="Generic Boot Architecture Build" introduced="^2">
+<!-- need to split this into the above components, or remove #includes and make this GBA ROM -->
+<unit bldFile="mw/securitysrv/gba/group"/>
+</component>
+</collection>
+<collection name="devencdiskutils" long-name="Device Encryption Disk Utils" level="server">
+<component name="devenccommonutils" filter="s60" long-name="Device Encryption Common Utils" introduced="^3">
+<unit bldFile="mw/securitysrv/devencdiskutils/DevEncCommonUtils/group"/>
+</component>
+<component name="devencrfsplugin" filter="s60" long-name="Device Encryption RFS Plugin" introduced="^3" plugin="Y">
+<unit bldFile="mw/securitysrv/devencdiskutils/DevEncRfsPlugin/group"/>
+</component>
+<component name="pk5recognizer" filter="s60" long-name="Device Encryption Pk5 Recognizer" introduced="^3" plugin="Y">
+<unit bldFile="mw/securitysrv/devencdiskutils/Pk5Recognizer/group"/>
+</component>
+<component name="devencstarter" filter="s60" long-name="Device Encryption Starter" introduced="^3" plugin="Y">
+<unit bldFile="mw/securitysrv/devencdiskutils/DevEncStarter/group"/>
+</component>
+<component name="devencdiskutils_build" filter="s60" long-name="Device Encryption Disk Utils Build" introduced="^3">
+<!-- need to split this into the above components, or remove #includes and make this a ROM component-->
+<unit bldFile="mw/securitysrv/devencdiskutils/group"/>
+</component>
+</collection>
+<collection name="securitysrv_info" long-name="Security Services Info" level="specific">
+<component name="securitysrv_metadata" long-name="Security Services Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="drm" level="generic" long-name="DRM" levels="plugin framework server generic specific">
+<collection name="drm_plat" long-name="DRM Platform Interfaces" level="specific">
+<component name="roap_api" long-name="ROAP API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/roap_api/group"/>
+</component>
+<component name="drm_common_api" long-name="DRM Common API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/drm_common_api/group"/>
+</component>
+<component name="drm_rights_api" long-name="DRM Rights API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/drm_rights_api/group"/>
+</component>
+<component name="drm_legacy_api" long-name="DRM Legacy API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/drm_legacy_api/group"/>
+</component>
+<component name="dcf_repository_api" long-name="DCF Repository API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/dcf_repository_api/group"/>
+</component>
+<component name="drm_service_api" long-name="DRM Service API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/drm_service_api/group"/>
+</component>
+<component name="drm_secondary_display_api" long-name="DRM Secondary Display API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/drm_secondary_display_api/group"/>
+</component>
+<component name="drm_license_manager_api" long-name="DRM License Manager API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/drm_license_manager_api/group"/>
+</component>
+<component name="drm_utility_api" long-name="DRM Utility API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/drm_utility_api/group"/>
+</component>
+<component name="drm_agents_api" long-name="DRM Agents API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/drm_agents_api/group"/>
+</component>
+<component name="wmdrm_core_api" long-name="WM DRM Core API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/wmdrm_core_api/group"/>
+</component>
+<component name="wmdrm_access_api" long-name="WM DRM Access API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/wmdrm_access_api/group"/>
+</component>
+<component name="wmdrm_ota_access_api" long-name="WM DRM OTA Access API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/wmdrm_ota_access_api/group"/>
+</component>
+<component name="camese_utility_api" long-name="Camese Utility API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/camese_utility_api/group"/>
+</component>
+<component name="camese_framework_api" long-name="Camese Framework API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/camese_framework_api/group"/>
+</component>
+</collection>
+<collection name="drm_pub" long-name="DRM Public Interfaces" level="specific">
+<component name="drm_helper_api" long-name="DRM Helper API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_pub/drm_helper_api/group"/>
+</component>
+<component name="oma_drm_caf_agent_api" long-name="OMA DRM CAF Agent API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/group"/>
+</component>
+<component name="drm_license_checker_api" long-name="DRM License Checker API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_pub/drm_license_checker_api/group"/>
+</component>
+</collection>
+<collection name="commondrm" long-name="Common DRM" level="generic">
+<!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
+<component name="drmencryptor" filter="s60" long-name="DRM Encryptor" class="placeholder">
+<!-- this should have its own bld.inf or be removed as a component -->
+</component>
+<component name="drmsettingsplugin" filter="s60" long-name="DRM Settings Plugin" plugin="Y" class="placeholder">
+<!-- this should have its own bld.inf or be removed as a component -->
+</component>
+<component name="drmrightsmanagerui" filter="s60" long-name="DRM Rights Manager UI">
+<unit bldFile="mw/drm/commondrm/drmrightsmanagerui/help/group"/>
+</component>
+<component name="drmutility" filter="s60" long-name="DRM Utility">
+<unit bldFile="mw/drm/commondrm/drmutility/group"/>
+</component>
+<component name="drmserviceapiwrapper" filter="s60" long-name="DRM Service API Wrapper">
+<unit bldFile="mw/drm/commondrm/drmserviceapiwrapper/group"/>
+</component>
+<component name="drmrightsstoringlocation" filter="s60" long-name="DRM Rights Storing Location">
+<unit bldFile="mw/drm/commondrm/drmrightsstoringlocation/group"/>
+</component>
+<component name="commondrm_build" filter="s60" long-name="Common DRM Build">
+<!-- should be split into the above files, or them collapsed into a single component -->
+<unit bldFile="mw/drm/commondrm/group"/>
+</component>
+</collection>
+<collection name="omadrm" long-name="OMA DRM" level="server">
+<!-- collection is really a component. Move down a directory -->
+<component name="omadrm_build" filter="s60" long-name="OMA DRM Build">
+<unit bldFile="mw/drm/omadrm/group"/>
+</component>
+<component name="foundationcerts" filter="sf_build" long-name="Foundation Certificates">
+<unit bldFile="mw/drm/omadrm/foundationcerts/group"/>
+</component>
+</collection>
+<collection name="wmdrm" long-name="Windows Media DRM" level="framework">
+<!-- collection is really a component. Move down a directory -->
+<component name="wmdrm_build" filter="s60" long-name="WM DRM Build">
+<unit bldFile="mw/drm/wmdrm/group"/>
+</component>
+</collection>
+<collection name="drm_info" long-name="DRM Info" level="specific"/>
+</block>
+<block name="locationsrv" level="specific" long-name="Location Services" levels="plugin fw server if">
+<collection name="locsrv_pub" long-name="Location Services Public Interfaces" level="if">
+<component name="landmarks_search_api" long-name="Landmarks Search API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
+</component>
+<component name="landmarks_api" long-name="Landmarks API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/group"/>
+</component>
+<component name="landmarks_database_management_api" long-name="Landmarks Database Management API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/group"/>
+</component>
+<component name="location_triggering_api" long-name="Location Triggering API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_pub/location_triggering_api/group"/>
+</component>
+<component name="blid_application_satellite_info_api" long-name="BLID Application Satellite Info API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/group"/>
+</component>
+</collection>
+<collection name="locsrv_plat" long-name="Location Services Platform Interfaces" level="if">
+<component name="geocoding_api" long-name="Geocoding API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
+</component>
+<component name="landmarks_category_definition_api" long-name="Landmarks Category Definition API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
+</component>
+<component name="supl_settings_api" long-name="SUPL Settings API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
+</component>
+<component name="np_proxy_configuration_api" long-name="NP Proxy Configuration API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/np_proxy_configuration_api/group"/>
+</component>
+<component name="supl_terminal_initiation_api" long-name="SUPL Terminal Initiation API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/group"/>
+</component>
+<component name="supl_network_initiation_api" long-name="SUPL Network Initiation API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/group"/>
+</component>
+<component name="oma_supl_configuration_parameter_api" long-name="OMA SUPL Configuration Parameter API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_configuration_parameter_api/group"/>
+</component>
+<component name="location_triggering_management_api" long-name="Location Triggering Management API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_management_api/group"/>
+</component>
+<component name="location_triggering_status_information_api" long-name="Location Triggering Status Information API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_status_information_api/group"/>
+</component>
+<component name="oma_supl_asn_codec_plugin_api" long-name="OMA SUPL ASN Codec Plugin API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
+</component>
+<component name="query_and_notification_api" long-name="Query and Notification API" filter="s60" introduced="^3" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/query_and_notification_api/group"/>
+</component>
+<component name="location_local_variation_api" long-name="Location Local Variation API" filter="s60" class="api">
+<unit bldFile="mw/locationsrv/locsrv_plat/location_local_variation_api/group"/>
+</component>
+</collection>
+<collection name="genericpositioningplugins" long-name="Generic Positioning Plugins" level="plugin">
+<component name="locationnpppsy" filter="s60" long-name="Location Positioning Proxy PSY" plugin="Y">
+<unit bldFile="mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
+</component>
+<component name="locationsuplpsy" filter="s60" long-name="Location SUPL PSY" introduced="^3" plugin="Y">
+<unit bldFile="mw/locationsrv/genericpositioningplugins/locationsuplpsy/group"/>
+</component>
+<component name="genericpositioningplugins_build" filter="s60" long-name="Generic Positioning Plugins Build">
+<!-- need to break this up into the other components -->
+<unit bldFile="mw/locationsrv/genericpositioningplugins/group"/>
+</component>
+</collection>
+<collection name="landmarks" long-name="Landmarks" level="server">
+<component name="locationlandmarks" filter="s60" long-name="Location Landmarks">
+<unit bldFile="mw/locationsrv/landmarks/locationlandmarks/group"/>
+</component>
+</collection>
+<collection name="locationsystemui" long-name="Location System UI" level="if">
+<component name="locationsysui" filter="s60" long-name="Location System UI">
+<unit bldFile="mw/locationsrv/locationsystemui/locationsysui/group"/>
+</component>
+</collection>
+<collection name="supl" long-name="SUPL" level="fw">
+<component name="locationsuplfw" filter="s60" long-name="Location SUPL Framework">
+<unit bldFile="mw/locationsrv/supl/locationsuplfw/group"/>
+</component>
+<component name="locationomasuplprotocolhandler" filter="s60" long-name="OMA SUPL Protocol Handler">
+<unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/group"/>
+</component>
+<component name="supltiapiimplementation" filter="s60" long-name="SUPL TI API Implementation" introduced="^3">
+<unit bldFile="mw/locationsrv/supl/supltiapiimplementation/group"/>
+</component>
+</collection>
+<collection name="locationtriggering" long-name="Location Triggering" level="server">
+<component name="ltlogger" filter="s60" long-name="LT Logger">
+<unit bldFile="mw/locationsrv/locationtriggering/ltlogger/group"/>
+</component>
+<component name="ltclientlib" filter="s60" long-name="LT Client Library">
+<unit bldFile="mw/locationsrv/locationtriggering/ltclientlib/group"/>
+</component>
+<component name="ltmanagementlib" filter="s60" long-name="LT Management Library">
+<unit bldFile="mw/locationsrv/locationtriggering/ltmanagementlib/group"/>
+</component>
+<component name="ltcontainer" filter="s60" long-name="LT Container">
+<unit bldFile="mw/locationsrv/locationtriggering/ltcontainer/group"/>
+</component>
+<component name="ltserver" filter="s60" long-name="LT Server">
+<unit bldFile="mw/locationsrv/locationtriggering/ltserver/group"/>
+</component>
+<component name="ltstrategypluginapi" filter="s60" long-name="LT Strategy Plugin API">
+<unit bldFile="mw/locationsrv/locationtriggering/ltstrategypluginapi/group"/>
+</component>
+<component name="ltstrategyengine" filter="s60" long-name="LT Strategy Engine">
+<unit bldFile="mw/locationsrv/locationtriggering/ltstrategyengine/group"/>
+</component>
+<component name="ltmovementdetectionpluginapi" filter="s60" long-name="Movement Detection Plugin API">
+<unit bldFile="mw/locationsrv/locationtriggering/ltmovementdetectionpluginapi/group"/>
+</component>
+<component name="ltcellidmovementdetector" filter="s60" long-name="Cell ID Movement Detector">
+<unit bldFile="mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/>
+</component>
+<component name="ltcontextsourceplugin" filter="s60" long-name="LT Context Source Plugin" introduced="^3" plugin="Y">
+<unit bldFile="mw/locationsrv/locationtriggering/ltcontextsourceplugin/group"/>
+</component>
+<component name="locationtriggering_build" filter="s60" long-name="Location Triggering Build">
+<!-- should remove #include from this and maybe put exports in the above components -->
+<unit bldFile="mw/locationsrv/locationtriggering/group"/>
+</component>
+</collection>
+</block>
+<block name="accesssec" level="generic" long-name="Access Security" levels="plugin framework server generic specific">
+<collection name="accesssec_plat" long-name="Access Security Platform Interfaces" level="specific">
+<component name="eap_vpn_api" long-name="EAP VPN API" filter="s60" class="api">
+<unit bldFile="mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
+</component>
+<component name="eap_type_api" long-name="EAP Type API" filter="s60" class="api">
+<unit bldFile="mw/accesssec/accesssec_plat/eap_type_api/group"/>
+</component>
+</collection>
+<collection name="securitysettings" long-name="Security Settings" level="generic">
+<component name="securitysettings_build" long-name="Security Settings Build" introduced="^4">
+<unit bldFile="mw/accesssec/securitysettings" qmakeArgs="-r" proFile="securitysettings.pro"/>
+</component>
+</collection>
+<collection name="eapol" long-name="EAPOL" level="framework">
+<component name="eapol_framework" filter="s60" long-name="EAPOL Framework" introduced="9.2">
+<unit bldFile="mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
+</component>
+</collection>
+</block>
+<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>
+<component name="bearer_settings_plugin_api" long-name="Bearer Settings Plugin API" filter="s60" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_plat/bearer_settings_plugin_api/group"/>
+</component>
+<component name="commsdat_wlan_api" long-name="CommsDat WLAN API" filter="s60" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_plat/commsdat_wlan_api/group"/>
+</component>
+<component name="connection_monitor_extension_api" long-name="Connection Monitor Extension API" filter="s60" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_monitor_extension_api/group"/>
+</component>
+<component name="connection_ui_utilities_api" long-name="Connection UI Utilities API" filter="s60" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_ui_utilities_api/group"/>
+</component>
+<component name="disconnect_dialog_api" long-name="Disconnect Dialog API" filter="s60" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_api/group"/>
+</component>
+<component name="disconnect_dialog_disable_api" long-name="Disconnect Dialog Disable API" filter="s60" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_disable_api/group"/>
+</component>
+<component name="extended_connection_settings_api" long-name="Extended Connection Settings API" filter="s60" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_plat/extended_connection_settings_api/group"/>
+</component>
+<component name="mpm_default_connection_api" long-name="MPM Default Connection API" filter="s60" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_default_connection_api/group"/>
+</component>
+<component name="pdpcontextmanager2_reset_factory_settings_api" long-name="PDP Context Manager 2 Reset Factory Settings API" filter="s60" class="api">
+<unit bldFile="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" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_settings_api/group"/>
+</component>
+<component name="mpm_connect_screen_api" long-name="MPM Connect Screen API" filter="s60" class="api">
+<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="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>
+<component name="access_point_engine_api" long-name="Access Point Engine API" filter="s60" class="api">
+<unit bldFile="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" class="api">
+<unit bldFile="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" class="api">
+<unit bldFile="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" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_monitor_server_api/group"/>
+</component>
+<component name="connection_settings_ui_api" long-name="Connection Settings UI API" filter="s60" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_ui_api/group"/>
+</component>
+<component name="agent_dialog_api" long-name="Agent Dialog API" filter="s60" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_pub/agent_dialog_api/group"/>
+</component>
+<component name="extendedconnpref_api" long-name="Extended Connection Preferences API" filter="s60" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_pub/extendedconnpref_api/group"/>
+</component>
+</collection>
+<collection name="accesspointcontrol" long-name="Access Point Control" level="plugin">
+<component name="apcontrollistplugin" filter="s60" long-name="Access Point Control List Plugin" introduced="^2" plugin="Y">
+<unit bldFile="mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
+</component>
+</collection>
+<collection name="alwayson_net_plugin" long-name="Always Online Net Plugin" level="server">
+<component name="pdpcontextmanager2" filter="s60" long-name="PDP Context Manager 2">
+<unit bldFile="mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
+</component>
+</collection>
+<collection name="apengine" long-name="Access Point Engine" level="framework">
+<component name="apeng" filter="s60" long-name="Access Point Engine">
+<unit bldFile="mw/ipconnmgmt/apengine/apeng/group"/>
+</component>
+<component name="apsettingshandlerui" filter="s60" long-name="Access Point Settings Handler UI">
+<unit bldFile="mw/ipconnmgmt/apengine/apsettingshandlerui/group"/>
+</component>
+</collection>
+<collection name="bearermanagement" long-name="Bearer Management" level="framework">
+<component name="mpm" filter="s60" long-name="Mobility Policy Manager">
+<unit bldFile="mw/ipconnmgmt/bearermanagement/mpm/group"/>
+</component>
+<component name="extendedconnpref" filter="s60" long-name="Extended Connection Preferences">
+<unit bldFile="mw/ipconnmgmt/bearermanagement/extendedconnpref/group"/>
+</component>
+<component name="s60mcpr" filter="s60" long-name="S60 Meta-Connection Provider" plugin="Y">
+<unit bldFile="mw/ipconnmgmt/bearermanagement/S60MCPR/group"/>
+</component>
+</collection>
+<collection name="cmmanager" long-name="Connection Method Manager" level="framework">
+<component name="cmmgr" filter="s60" long-name="CM Manager">
+<unit bldFile="mw/ipconnmgmt/cmmanager/cmmgr/group"/>
+</component>
+</collection>
+<collection name="connectionmonitoring" long-name="Connection Monitoring" level="server">
+<component name="connectionmonitorui" filter="s60" long-name="Connection Monitor UI">
+<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorui/group"/>
+</component>
+<component name="connmon" filter="s60" long-name="Connection Monitor">
+<!-- either split into two components, or #include from a common bld.inf -->
+<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/connectionmonitor/group"/>
+<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/dataconnectionlogger/group"/>
+</component>
+<component name="connmonext" filter="s60" long-name="Connection Monitor Extension API">
+<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmonext/group"/>
+</component>
+</collection>
+<collection name="connectionutilities" long-name="Connection Utilities" level="utils">
+<component name="connectiondialogs" filter="s60" long-name="Connection Dialogs">
+<unit bldFile="mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/>
+</component>
+</collection>
+<collection name="dbcreator" long-name="DB Creator" level="utils">
+<component name="commsdatcreator" filter="s60" long-name="Comms Database Creator" introduced="9.3">
+<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
+</component>
+<component name="commsdatcreatorrfsplugin" filter="s60" long-name="Comms Database Creator RFS Plugin" introduced="9.3" plugin="Y">
+<!-- uncomment when config is turned on -->
+<!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
+</component>
+<component name="commsdatstartup" filter="s60" long-name="Comms Database Startup" introduced="9.3">
+<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
+</component>
+<component name="dbcreatorexe" filter="s60" long-name="DB Creator" introduced="9.3">
+<unit bldFile="mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
+</component>
+<component name="dbcreator_build" filter="s60" long-name="DB Creator Build" introduced="9.3">
+<!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
+<unit bldFile="mw/ipconnmgmt/dbcreator/group"/>
+</component>
+</collection>
+<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"/>
+</component>
+<component name="ipcm_qt_build" long-name="IP Connectivity Management Qt Build" introduced="^4">
+<unit bldFile="mw/ipconnmgmt" proFile="ipconnmgmt.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+</block>
+<block name="netprotocols" level="generic" long-name="High-level Internet Protocols" levels="plugin framework server generic specific">
+<collection name="netprotocols_plat" long-name="High-level Internet Protocols Platform Interfaces" level="specific">
+<component name="cookie_manager_api" long-name="Cookie Manager API" filter="s60" class="api">
+<unit bldFile="mw/netprotocols/netprotocols_plat/cookie_manager_api/group"/>
+</component>
+<component name="http_cache_mgr_api" long-name="HTTP Cache Manager API" filter="s60" class="api">
+<unit bldFile="mw/netprotocols/netprotocols_plat/http_cache_mgr_api/group"/>
+</component>
+<component name="http_filters_api" long-name="HTTP Filters API" filter="s60" class="api">
+<unit bldFile="mw/netprotocols/netprotocols_plat/http_filters_api/group"/>
+</component>
+</collection>
+<collection name="httpfilters" long-name="HTTP Filters" level="plugin">
+<component name="httpfiltercommon" filter="s60" long-name="HTTP Filter Common">
+<unit bldFile="mw/netprotocols/httpfilters/httpfiltercommon/group"/>
+</component>
+<component name="cookie" filter="s60" long-name="Cookie Filter" plugin="Y">
+<unit bldFile="mw/netprotocols/httpfilters/cookie/group"/>
+</component>
+<component name="deflatefilter" filter="s60" long-name="Deflate Filter" plugin="Y">
+<unit bldFile="mw/netprotocols/httpfilters/deflatefilter/group"/>
+</component>
+<component name="httpfilteracceptheader" filter="s60" long-name="Accept Header Filter" plugin="Y">
+<unit bldFile="mw/netprotocols/httpfilters/httpfilteracceptheader/group"/>
+</component>
+<component name="httpfilterauthentication" filter="s60" long-name="Authentication Filter" plugin="Y">
+<unit bldFile="mw/netprotocols/httpfilters/httpfilterauthentication/group"/>
+</component>
+<component name="httpfilterconnhandler" filter="s60" long-name="Connection Handler Fitler" plugin="Y">
+<unit bldFile="mw/netprotocols/httpfilters/httpfilterconnhandler/group"/>
+</component>
+<component name="httpfilteriop" filter="s60" long-name="HTTP IOP Filter" plugin="Y">
+<unit bldFile="mw/netprotocols/httpfilters/httpfilteriop/group"/>
+</component>
+<component name="httpfilterproxy" filter="s60" long-name="HTTP Proxy Filter" plugin="Y">
+<unit bldFile="mw/netprotocols/httpfilters/httpfilterproxy/group"/>
+</component>
+<component name="uaproffilter" filter="s60" long-name="UAProf Filter" plugin="Y">
+<unit bldFile="mw/netprotocols/httpfilters/uaproffilter/group"/>
+</component>
+</collection>
+<collection name="applayerprotocols" long-name="Application Layer Protocols" level="server">
+<component name="httptransportfw" long-name="HTTP Transport Framework" introduced="6.2" purpose="optional">
+<unit bldFile="mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
+</component>
+<component name="httpexamples" long-name="HTTP Examples" introduced="6.2" purpose="development">
+<unit bldFile="mw/netprotocols/applayerprotocols/httpexamples/group" mrp="mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
+</component>
+<component name="wappushsupport" long-name="WAP Push Support" introduced="6.2" purpose="optional">
+<unit bldFile="mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
+</component>
+<component name="wapbase" long-name="WAP Base" introduced="6.0" purpose="optional">
+<unit bldFile="mw/netprotocols/applayerprotocols/wapbase/Group" mrp="mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
+</component>
+<component name="ftpengine" long-name="FTP Engine" introduced="6.0" purpose="optional">
+<unit bldFile="mw/netprotocols/applayerprotocols/ftpengine/group" mrp="mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
+</component>
+<component name="telnetengine" long-name="Telnet Engine" introduced="6.0" purpose="optional">
+<unit bldFile="mw/netprotocols/applayerprotocols/telnetengine/group" mrp="mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
+</component>
+<component name="httpserviceapi" long-name="HTTP Service API" introduced="TB9.2" purpose="optional">
+<unit bldFile="mw/netprotocols/applayerprotocols/httpservice/group" mrp="mw/netprotocols/applayerprotocols/httpservice/group/http_service.mrp"/>
+</component>
+</collection>
+<collection name="applayerpluginsandutils" long-name="Application Layer Plugins and Utils" level="framework">
+<component name="uripermissionservices" long-name="URI Permission Services" introduced="^2" purpose="optional">
+<unit bldFile="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
+</component>
+<component name="bookmarksupport" long-name="Bookmark Support" introduced="9.1" purpose="optional">
+<unit bldFile="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
+</component>
+<component name="httpprotocolplugins" long-name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" plugin="Y">
+<unit bldFile="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
+</component>
+<component name="httptransportplugins" long-name="HTTP Transport Plugins" introduced="6.2" purpose="optional" plugin="Y">
+<unit bldFile="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
+</component>
+</collection>
+<collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
+<component name="netprotocols_metadata" long-name="High-level Internet Protocols Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="ipappprotocols" level="generic" long-name="IP App Protocols" levels="plugin conn server if">
+<collection name="ipappprotocols_plat" long-name="IP App Protocols Platform Interfaces" level="if">
+<component name="srtp_api" long-name="SRTP API" filter="s60" class="api">
+<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/srtp_api/group"/>
+</component>
+<component name="rtprtcp_api" long-name="RTP/RTCP API" filter="s60" class="api">
+<unit bldFile="mw/ipappprotocols/ipappprotocols_plat/rtprtcp_api/group"/>
+</component>
+</collection>
+<collection name="rtp" long-name="RTP" level="server">
+<component name="srtpstack" filter="s60" long-name="SRTP Stack">
+<unit bldFile="mw/ipappprotocols/rtp/srtpstack/group"/>
+</component>
+<component name="rtpstack" filter="s60" long-name="RTP Stack">
+<unit bldFile="mw/ipappprotocols/rtp/rtpstack/group"/>
+</component>
+</collection>
+<collection name="realtimenetprots" long-name="Real Time Net Protocols" level="server">
+<component name="symrtp" long-name="RTP" introduced="9.0" purpose="optional">
+<!-- Real Time Data Protocol -->
+<unit bldFile="mw/ipappprotocols/realtimenetprots/rtp/group" mrp="mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
+</component>
+<component name="sipfw" long-name="SIP Framework" introduced="9.2" purpose="optional">
+<unit bldFile="mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp" version="2"/>
+</component>
+</collection>
+<collection name="sipplugins" long-name="SIP Plugins" level="plugin">
+<component name="sippwlanplugin" filter="s60" long-name="SIP WLAN Plugin" plugin="Y">
+<unit bldFile="mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
+</component>
+<component name="sippsipsettingsui" filter="s60" long-name="SIP Settings UI" plugin="Y">
+<unit bldFile="mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
+</component>
+<component name="sippdevmgmtsipadapter" filter="s60" long-name="Device Management SIP Settings Adapter" plugin="Y">
+<unit bldFile="mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
+</component>
+<component name="sippsystemstatemonitor" filter="s60" long-name="SIP System State Monitor" plugin="Y">
+<unit bldFile="mw/ipappprotocols/sipplugins/sippsystemstatemonitor/group"/>
+</component>
+<component name="sippsipadapter" filter="s60" long-name="SIP Adapter" introduced="^3" plugin="Y">
+<unit bldFile="mw/ipappprotocols/sipplugins/sippsipadapter/group"/>
+</component>
+</collection>
+<collection name="sipproviderplugins" long-name="SIP Provider Plugins" level="conn">
+<component name="sipprovider" long-name="SIP Provider" introduced="^2" purpose="optional" plugin="Y">
+<unit bldFile="mw/ipappprotocols/sipproviderplugins/sipprovider/group" mrp="mw/ipappprotocols/sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
+</component>
+</collection>
+<collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="if">
+<component name="ipappprotocols_metadata" long-name="IP App Protocols Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="wirelessacc" level="specific" long-name="Wireless Access" levels="framework generic ui">
+<collection name="hsfw_plat" long-name="HotSpot Framework Platform Interfaces" level="ui">
+<component name="hotspot_framework_client_api" long-name="HotSpot Framework Client API" filter="s60" class="api">
+<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
+</component>
+<component name="internet_connectivity_test_service_api" long-name="Internet Connectivity Test Service API" filter="s60" class="api">
+<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
+</component>
+<component name="internet_connectivity_test_service_settings_api" long-name="Internet Connectivity Test Service Settings API" filter="s60" class="api">
+<unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
+</component>
+<component name="hotspot_framework_client_plugin_api" long-name="HotSpot Framework Client Plugin API" filter="s60" class="api">
+<unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
+</component>
+</collection>
+<collection name="hotspotfw" long-name="HotSpot Framework" level="framework">
+<component name="hsserver" filter="s60" long-name="HotSpot Server" class="placeholder">
+<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
+</component>
+<component name="hsclient" filter="s60" long-name="HotSpot Client" class="placeholder">
+<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
+</component>
+<component name="internetconnectivitytestservice" filter="s60" long-name="Internet Connectivity Test Service" class="placeholder">
+<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+<!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
+</component>
+<component name="ictsdialogs" filter="s60" long-name="Internet Connectivity Test Service Dialogs" deprecated="^3" class="placeholder">
+<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+<!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
+</component>
+<component name="hspluginforagent" filter="s60" long-name="HotSpot Plugin for Agent" plugin="Y" class="placeholder">
+<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+<!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
+</component>
+<component name="hsbrowser" filter="s60" long-name="HotSpot Browser" class="placeholder">
+<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+<!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
+</component>
+<component name="hotspotfw_build" filter="s60" long-name="Hotspot Framework Build">
+<!-- should break up this bld.inf into the above components, or collapse them all into a single component -->
+<unit bldFile="mw/wirelessacc/hotspotfw/group"/>
+</component>
+</collection>
+<collection name="wlanutilities" long-name="WLAN Utilities" level="generic">
+<component name="wlanutilities_build" long-name="WLAN Utilities Qt" introduced="^4" filter="s60">
+<!-- is this uinit needed, or is it sufficient to uncomment the units in the below components? -->
+<unit bldFile="mw/wirelessacc/wlanutilities" proFile="wlanutilities.pro" qmakeArgs="-r"/>
+</component>
+<component name="wlanqtutilities" filter="s60" long-name="WLAN Qt Utilities" introduced="^4" class="placeholder">
+<!--<unit bldFile="wlanutilities/wlanplugin/group" qt:proFile="wlanqtutilities.pro"/>-->
+</component>
+<component name="wlansniffer" filter="s60" long-name="WLAN Sniffer" class="placeholder">
+<!--<unit bldFile="wlanutilities/wlansettingsui/group" qt:proFile="wlansniffer.pro"/>-->
+</component>
+<component name="wlanentryplugin" filter="s60" long-name="WLAN Entry Plugin" plugin="Y" class="placeholder">
+<!--<unit bldFile="wlanutilities/wlansniffer/group" qt:proFile="wlanentryplugin.pro"/>-->
+</component>
+<component name="wlanindicatorplugin" filter="s60" long-name="WLAN Indicator Plugin" plugin="Y" class="placeholder">
+<!--<unit bldFile="wlanutilities/wlanindicatorplugin/group" qt:proFile="wlanindicatorplugin.pro"/>-->
+</component>
+<component name="cpwlansettingsplugin" filter="s60" long-name="WLAN Settings Control Panel Plugin" introduced="^4" plugin="Y" class="placeholder">
+<!--<unit bldFile="wlanutilities/cpwlansettingsplugin/group" qt:proFile="cpwlansettingsplugin.pro"/>-->
+</component>
+</collection>
+</block>
+<block name="vpnclient" level="specific" long-name="VPN Client" levels="engine ui api">
+<!-- is the !oem_build filter needed? -->
+<collection name="vpnc_plat" long-name="VPN Client Platform Interfaces" level="api">
+<component name="vpnapi" filter="s60" long-name="VPN API" class="api">
+<unit bldFile="mw/vpnclient/vpnc_plat/vpnapi/group"/>
+</component>
+</collection>
+<collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
+<component name="vpnapi_impl" filter="s60" long-name="VPN API">
+<unit bldFile="mw/vpnclient/vpnapiimpl/group"/>
+</component>
+</collection>
+<collection name="vpnengine" long-name="VPN Engine" level="engine">
+<!-- too many components in this collection.
+ Probably best to group the binaries together into larger components
+ or maybe split the collection into more reasonable groups -->
+<component name="eventmediatorapi" filter="s60" long-name="Event Mediator API">
+<unit bldFile="mw/vpnclient/vpnengine/eventmediatorapi/group"/>
+</component>
+<component name="eventviewer" filter="s60" long-name="Event Viewer">
+<unit bldFile="mw/vpnclient/vpnengine/eventviewer/group"/>
+</component>
+<component name="vpnins" filter="s60" long-name="VPN Installer">
+<unit bldFile="mw/vpnclient/vpnengine/vpnins/group"/>
+</component>
+<component name="ikepolparser" filter="s60" long-name="IKE Policy Parser">
+<unit bldFile="mw/vpnclient/vpnengine/ikepolparser/group"/>
+</component>
+<component name="utlbase64" filter="s60" long-name="Base64 Utilities">
+<unit bldFile="mw/vpnclient/vpnengine/utlbase64/group"/>
+</component>
+<component name="utlcrypto" filter="s60" long-name="Crypto Utilities">
+<unit bldFile="mw/vpnclient/vpnengine/utlcrypto/group"/>
+</component>
+<component name="utlxml" filter="s60" long-name="XML Utilities">
+<unit bldFile="mw/vpnclient/vpnengine/utlxml/group"/>
+</component>
+<component name="utlpkcs10" filter="s60" long-name="PKCS#10 Utilities">
+<unit bldFile="mw/vpnclient/vpnengine/utlpkcs10/group"/>
+</component>
+<component name="pkiserviceapi" filter="s60" long-name="PKI Service API">
+<unit bldFile="mw/vpnclient/vpnengine/pkiserviceapi/group"/>
+</component>
+<component name="ikecert" filter="s60" long-name="IKE Certificate Management">
+<unit bldFile="mw/vpnclient/vpnengine/ikecert/group"/>
+</component>
+<component name="kmdapi" filter="s60" long-name="Key Management Daemon API">
+<unit bldFile="mw/vpnclient/vpnengine/kmdapi/group"/>
+</component>
+<component name="kmdserver" filter="s60" long-name="Key Management Daemon Server">
+<unit bldFile="mw/vpnclient/vpnengine/kmdserver/group"/>
+</component>
+<component name="ikeutils" filter="s60" long-name="Internet Key Exchange Utils">
+<unit bldFile="mw/vpnclient/vpnengine/ikeutils/group"/>
+</component>
+<component name="ikev1lib" filter="s60" long-name="IKEv1 Library">
+<unit bldFile="mw/vpnclient/vpnengine/ikev1lib/group"/>
+</component>
+<component name="ikev2lib" filter="s60" long-name="IKEv2 Library">
+<unit bldFile="mw/vpnclient/vpnengine/ikev2lib/group"/>
+</component>
+<component name="vpnipsecpolparser" filter="s60" long-name="VPN IPsec Policy Parser">
+<unit bldFile="mw/vpnclient/vpnengine/vpnipsecpolparser/group"/>
+</component>
+<component name="sit" filter="s60" long-name="Socket Interaction Thread">
+<unit bldFile="mw/vpnclient/vpnengine/sit/group"/>
+</component>
+<component name="vpntcwrapper" filter="s60" long-name="VPN Terminal Control Wrapper">
+<unit bldFile="mw/vpnclient/vpnengine/vpntcwrapper/group"/>
+</component>
+<component name="eventmediator" filter="s60" long-name="Event Mediator">
+<unit bldFile="mw/vpnclient/vpnengine/eventmediator/group"/>
+</component>
+<component name="pkiservice" filter="s60" long-name="PKI Service">
+<unit bldFile="mw/vpnclient/vpnengine/pkiservice/group"/>
+</component>
+<component name="vpnconnagt" filter="s60" long-name="VPN Connection Agent">
+<unit bldFile="mw/vpnclient/vpnengine/vpnconnagt/group"/>
+</component>
+<component name="vpnmanager" filter="s60" long-name="VPN Manager">
+<unit bldFile="mw/vpnclient/vpnengine/vpnmanager/group"/>
+</component>
+<component name="vpncleaner" filter="s60" long-name="VPN Cleaner">
+<unit bldFile="mw/vpnclient/vpnengine/vpncleaner/group"/>
+</component>
+<component name="utlpkcs12" filter="s60" long-name="PKCS#12 Utilities">
+<unit bldFile="mw/vpnclient/vpnengine/utlpkcs12/group"/>
+</component>
+<component name="dmadengine" filter="s60" long-name="DM Adapter Engine">
+<unit bldFile="mw/vpnclient/vpnengine/dmadengine/group"/>
+</component>
+<component name="dmadipsecvpn" filter="s60" long-name="IPsec VPN DM Adapter" plugin="Y">
+<unit bldFile="mw/vpnclient/vpnengine/dmadipsecvpn/group"/>
+</component>
+<component name="dmadpki" filter="s60" long-name="PKI DM Adapter" plugin="Y">
+<unit bldFile="mw/vpnclient/vpnengine/dmadpki/group"/>
+</component>
+<component name="ikesocket" filter="s60" long-name="IKE Socket" introduced="^3">
+<unit bldFile="mw/vpnclient/vpnengine/ikesocket/group"/>
+</component>
+</collection>
+<collection name="vpnui" long-name="VPN UI" level="ui">
+<component name="vpnecomnotifier" filter="s60" long-name="VPN ECOM Notifier" plugin="Y">
+<unit bldFile="mw/vpnclient/vpnui/vpnecomnotifier/group"/>
+</component>
+<component name="vpndialogmanager" filter="s60" long-name="VPN Dialog Manager">
+<unit bldFile="mw/vpnclient/vpnui/vpndialogmanager/group"/>
+</component>
+<component name="vpnpolins" filter="s60" long-name="VPN Policy Installer">
+<unit bldFile="mw/vpnclient/vpnui/vpnpolins/group"/>
+</component>
+<component name="vpnpolicyrecognizer" filter="s60" long-name="VPN Policy Recognizer" plugin="Y">
+<unit bldFile="mw/vpnclient/vpnui/vpnpolicyrecognizer/group"/>
+</component>
+</collection>
+<collection name="vpnclient_info" long-name="VPN Client Info" level="api">
+<component name="vpnclient_help" filter="s60" long-name="VPN Client Help">
+<unit bldFile="mw/vpnclient/help/group"/>
+</component>
+<component name="vpnclient_build" filter="s60" long-name="VPN Client Build">
+<!-- should split this up into the other components and remove this-->
+<unit bldFile="mw/vpnclient/group"/>
+</component>
+</collection>
+</block>
+<block name="ipappsrv" level="specific" long-name="IP App Services" levels="framework generic server conn plugin">
+<collection name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" level="plugin">
+<component name="transcoder_api" long-name="Transcoder API" filter="s60" class="api">
+<unit bldFile="mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
+</component>
+<component name="comms_event_api" long-name="Comms Event API" filter="s60" class="api">
+<unit bldFile="mw/ipappsrv/ipappsrv_plat/comms_event_api/group"/>
+</component>
+<component name="floor_control_api" long-name="Floor Control API" filter="s60" class="api">
+<unit bldFile="mw/ipappsrv/ipappsrv_plat/floor_control_api/group"/>
+</component>
+<component name="media_control_api" long-name="Media Control API" filter="s60" class="api">
+<unit bldFile="mw/ipappsrv/ipappsrv_plat/media_control_api/group"/>
+</component>
+<component name="multimedia_comms_api" long-name="Multimedia Comms API" filter="s60" class="api">
+<unit bldFile="mw/ipappsrv/ipappsrv_plat/multimedia_comms_api/group"/>
+</component>
+<component name="nat_settings_api" long-name="NAT Settings API" filter="s60" class="api">
+<unit bldFile="mw/ipappsrv/ipappsrv_plat/nat_settings_api/group"/>
+</component>
+</collection>
+<collection name="natfw" long-name="NAT Framework" level="framework">
+<!-- collection is really a component. Need to move down a directory -->
+<component name="natfw_build" filter="s60" long-name="NAT Framework Build" introduced="^2">
+<unit bldFile="mw/ipappsrv/natfw/group"/>
+</component>
+</collection>
+<collection name="multimediacommscontroller" long-name="Multimedia Comms Controller" level="conn">
+<!-- collection is really a component. Need to move down a directory -->
+<component name="multimediacommscontroller_build" filter="s60" long-name="Multimedia Comms Controller Build">
+<unit bldFile="mw/ipappsrv/multimediacommscontroller/group"/>
+</component>
+</collection>
+<collection name="multimediacommsengine" long-name="Multimedia Comms Engine" level="generic">
+<!-- collection is really a component. Need to move down a directory -->
+<component name="multimediacommsengine_build" filter="s60" long-name="Multimedia Comms Engine Build">
+<unit bldFile="mw/ipappsrv/multimediacommsengine/group"/>
+</component>
+</collection>
+<collection name="natplugins" long-name="NAT Plugins" level="plugin">
+<component name="natpcliprovisioningnatfwadapter" filter="s60" long-name="Client Provisioning NAT Framework Traversal Adapter" introduced="^2" plugin="Y">
+<unit bldFile="mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/group"/>
+</component>
+<component name="natpdevmgmtnatfwadapter" filter="s60" long-name="Device Management NAT Framework Traversal Adapter" plugin="Y">
+<unit bldFile="mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/group"/>
+</component>
+<component name="natptraversalcontroller" filter="s60" long-name="NAT Traversal Controller" plugin="Y">
+<unit bldFile="mw/ipappsrv/natplugins/natptraversalcontroller/group"/>
+</component>
+<component name="natpnatfwsdpprovider" filter="s60" long-name="NAT Framework SDP Provider" plugin="Y">
+<unit bldFile="mw/ipappsrv/natplugins/natpnatfwsdpprovider/group"/>
+</component>
+</collection>
+<collection name="ipappsrv_info" long-name="IP App Services Info" level="plugin">
+<component name="ipappsrv_build" long-name="IP App Services Build" filter="s60">
+<!-- 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">
+<collection name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" level="specific">
+<component name="string_parser_api" long-name="String Parser API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/string_parser_api/group"/>
+</component>
+<component name="cbs_mcn_client_api" long-name="CBS MCN Client API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/cbs_mcn_client_api/group"/>
+</component>
+<component name="converged_call_engine_api" long-name="Converged Call Engine API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_engine_api/group"/>
+</component>
+<component name="aiw_dial_data_consumer_api" long-name="AIW Dial Data Consumer API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/aiw_dial_data_consumer_api/group"/>
+</component>
+<component name="phone_client_ussd_api" long-name="Phone Client USSD API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_api/group"/>
+</component>
+<component name="sat_refresh_api" long-name="SAT Refresh API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/sat_refresh_api/group" filter="!test"/>
+</component>
+<component name="network_handling_engine_api" long-name="Network Handling Engine API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/network_handling_engine_api/group"/>
+</component>
+<component name="phone_client_emergency_call_api" long-name="Phone Client Emergency Call API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/group"/>
+</component>
+<component name="sat_configuration_api" long-name="SAT Configuration API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/sat_configuration_api/group"/>
+</component>
+<component name="dial_utils_api" long-name="Dial Utils API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/dial_utils_api/group"/>
+</component>
+<component name="phone_client_image_handler_api" long-name="Phone Client Image Handler API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_image_handler_api/group"/>
+</component>
+<component name="phone_client_messenger_api" long-name="Phone Client Messenger API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_messenger_api/group"/>
+</component>
+<component name="sat_client_api" long-name="SAT Client API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/sat_client_api/group" filter="!test"/>
+</component>
+<component name="phone_client_api" long-name="Phone Client API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_api/group"/>
+</component>
+<component name="sat_service_api" long-name="SAT Service API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/sat_service_api/group" filter="!test"/>
+</component>
+<component name="cbs_message_api" long-name="CBS Message API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/cbs_message_api/group"/>
+</component>
+<component name="phone_client_server_information_api" long-name="Phone Client Server Information API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_server_information_api/group"/>
+</component>
+<component name="phone_client_ussd_internal_api" long-name="Phone Client USSD Internal API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_internal_api/group"/>
+</component>
+<component name="phone_client_command_handler_api" long-name="Phone Client Command Handler API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_command_handler_api/group"/>
+</component>
+<component name="phone_client_notify_api" long-name="Phone Client Notify API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_notify_api/group"/>
+</component>
+<component name="phone_client_utility_api" long-name="Phone Client Utility API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_utility_api/group"/>
+</component>
+<component name="telephony_network_information_api" long-name="Telephony Network Information API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_network_information_api/group"/>
+</component>
+<component name="secondary_display_sat_api" long-name="Secondary Display SAT API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/secondary_display_sat_api/group"/>
+</component>
+<component name="callui_reconnect_query_api" long-name="CallUI Reconnect Query API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/callui_reconnect_query_api/group"/>
+</component>
+<component name="service_provider_settings_api" long-name="Service Provider Settings API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/service_provider_settings_api/group"/>
+</component>
+<component name="converged_call_provider_api" long-name="Converged Call Provider API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_provider_api/group"/>
+</component>
+<component name="incoming_call_monitor_api" long-name="Incoming Call Monitor API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/incoming_call_monitor_api/group"/>
+</component>
+<component name="default_emergency_numbers_api" long-name="Default Emergency Numbers API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/default_emergency_numbers_api/group"/>
+</component>
+<component name="cenrep_database_api" long-name="Central Repository Database API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/cenrep_database_api/group"/>
+</component>
+<component name="ss_settings_api" long-name="SS Settings API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/ss_settings_api/group"/>
+</component>
+<component name="phone_settings_observer_api" long-name="Phone Settings Observer API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_observer_api/group"/>
+</component>
+<component name="phone_settings_notes_ui_api" long-name="Phone Settings Notes UI API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_notes_ui_api/group"/>
+</component>
+<component name="phone_settings_api" long-name="Phone Settings API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_api/group"/>
+</component>
+<component name="voice_mailbox_number_api" long-name="Voice Mailbox Number API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_number_api/group"/>
+</component>
+<component name="voice_mailbox_settings_api" long-name="Voice Mailbox Settings API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_settings_api/group"/>
+</component>
+<component name="call_information_api" long-name="Call Information API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/call_information_api/group" filter="!test"/>
+</component>
+<component name="call_remote_party_information_api" long-name="Call Remote Party Information API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/call_remote_party_information_api/group" filter="!test"/>
+</component>
+<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_mediator_api/group" filter="!test"/>
+</component>
+<component name="dialpad_api" long-name="Dialpad API" filter="s60" introduced="^4" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/dialpad_api/group"/>
+</component>
+</collection>
+<collection name="cellular" long-name="Cellular" level="server">
+<component name="telephonysettings" filter="s60" long-name="Telephony Settings" purpose="development"/>
+<component name="sssettings" filter="s60" long-name="Supplementary Service Settings" purpose="development"/>
+<component name="psetnotesui" filter="s60" long-name="Phone Settings Notes UI" purpose="development"/>
+</collection>
+<collection name="convergedcallengine" long-name="Converged Call Engine" level="framework">
+<component name="cce" filter="s60" long-name="CCE" purpose="development"/>
+<component name="spsettings" filter="s60" long-name="Service Provider Settings" purpose="development"/>
+</collection>
+<collection name="phoneclientserver" long-name="Phone Client/Server" level="server">
+<component name="aiwdialdata" filter="s60" long-name="AIW Dial Data" purpose="development"/>
+<component name="dialutils" filter="s60" long-name="Dial Utils" purpose="development"/>
+<component name="phoneclient" filter="s60" long-name="Phone Client" purpose="development"/>
+</collection>
+<collection name="phonesrv_info" long-name="Phone Server Info" level="generic">
+<component name="phonesrv_build" long-name="Phone Server Build" filter="s60">
+<unit bldFile="mw/phonesrv" proFile="phonesrv.pro"/>
+</component>
+</collection>
+</block>
+<block name="messagingmw" level="specific" long-name="Messaging Middleware" levels="stack support fw api">
+<collection name="msgfw_plat" long-name="Messaging Middleware Platform Interfaces" level="api">
+<component name="always_online_plugin_api" long-name="Always Online Plugin API" filter="s60" class="api">
+<unit bldFile="mw/messagingmw/msgfw_plat/always_online_plugin_api/group"/>
+</component>
+<component name="always_online_client_api" long-name="Always Online Client API" filter="s60" class="api">
+<unit bldFile="mw/messagingmw/msgfw_plat/always_online_client_api/group"/>
+</component>
+<component name="msg_common_utils_api" long-name="Messaging Common Utils API" filter="s60" class="api">
+<unit bldFile="mw/messagingmw/msgfw_plat/msg_common_utils_api/group"/>
+</component>
+<component name="muiu_utils_api" long-name="Messaging Center UI Utilities API" filter="s60" introduced="^4" class="api">
+<unit bldFile="mw/messagingmw/msgfw_plat/muiu_utils_api/group"/>
+</component>
+</collection>
+<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" class="config">
+<unit bldFile="mw/messagingmw/msgbranched/group"/>
+</component>
+</collection>
+<collection name="messagingfw" long-name="Messaging Framework" level="fw">
+<!-- should break this collection up into smaller related collections -->
+<component name="send_ui_api" long-name="Send UI API" filter="s60" deprecated="^4" class="api">
+<unit bldFile="mw/messagingmw/messagingfw/deprecate/send_ui_api/group"/>
+</component>
+<component name="send_ui_plugin_api" long-name="Send UI Plug-in API" filter="s60" deprecated="^4" class="api">
+<unit bldFile="mw/messagingmw/messagingfw/deprecate/send_ui_plugin_api/group"/>
+</component>
+<component name="send_ui_datautils_api" long-name="Send UI Data Utils API" filter="s60" deprecated="^4" class="api">
+<unit bldFile="mw/messagingmw/messagingfw/deprecate/send_ui_datautils_api/group"/>
+</component>
+<component name="alwaysonline" filter="s60" long-name="Always Online Server" introduced="^2">
+<unit bldFile="mw/messagingmw/messagingfw/alwaysonline/group"/>
+</component>
+<component name="msgcommonutils" filter="s60" long-name="Messaging Common Utils" introduced="^2">
+<unit bldFile="mw/messagingmw/messagingfw/msgcommonutils/group"/>
+</component>
+<component name="senduiservices" filter="s60" long-name="Send UI Services" introduced="^2" deprecated="^4">
+<unit bldFile="mw/messagingmw/messagingfw/deprecate/senduiservices/group"/>
+</component>
+<component name="muiuutils" long-name="Messaging Center UI Utilities" filter="s60" introduced="^4" class="api">
+<unit bldFile="mw/messagingmw/messagingfw/muiuutils/group"/>
+</component>
+<component name="scheduledsendmtm" long-name="Scheduled Send MTM" introduced="6.0" purpose="optional" plugin="Y">
+<unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/group" mrp="mw/messagingmw/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
+</component>
+<component name="msgsrvnstore" long-name="Message Server and Store" purpose="optional">
+<unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/group" mrp="mw/messagingmw/messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
+</component>
+<component name="biomsgfw" long-name="BIO Messaging Framework" introduced="6.0" purpose="optional">
+<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/group" mrp="mw/messagingmw/messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
+</component>
+<component name="msgconf" long-name="Messaging Config" introduced="^2" purpose="optional" class="config">
+<unit bldFile="mw/messagingmw/messagingfw/msgconf/group" mrp="mw/messagingmw/messagingfw/msgconf/group/messaging_config.mrp"/>
+</component>
+<component name="watcherfw" long-name="Watcher Framework" purpose="optional">
+<unit bldFile="mw/messagingmw/messagingfw/watcherfw/group" mrp="mw/messagingmw/messagingfw/watcherfw/group/messaging_watcher.mrp"/>
+</component>
+<component name="msgtest" long-name="Messaging Test" purpose="development">
+<unit bldFile="mw/messagingmw/messagingfw/msgtest/group" mrp="mw/messagingmw/messagingfw/msgtest/group/messaging_test.mrp"/>
+</component>
+<component name="sendas" long-name="Send As" purpose="optional">
+<unit bldFile="mw/messagingmw/messagingfw/sendas/group" mrp="mw/messagingmw/messagingfw/sendas/group/messaging_sendas2.mrp"/>
+</component>
+<component name="msgurlhandler" long-name="Message URL Handler" introduced="7.0" purpose="optional">
+<unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/group" mrp="mw/messagingmw/messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
+</component>
+<component name="wappushfw" long-name="WAP Push Framework" introduced="6.1" purpose="optional">
+<unit bldFile="mw/messagingmw/messagingfw/wappushfw/group" mrp="mw/messagingmw/messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
+</component>
+<component name="suplsmshandler" long-name="SUPL SMS Handler" introduced="^2" purpose="development" plugin="Y">
+<unit bldFile="mw/messagingmw/messagingfw/suplsmshandler/group" mrp="mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/>
+</component>
+<component name="suplwappushhandler" long-name="SUPL WAP Push Handler" introduced="^2" purpose="optional" plugin="Y">
+<unit bldFile="mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
+</component>
+</collection>
+<collection name="messagingmw_info" long-name="Messaging Middleware Info" level="api">
+<component name="messagingmw_metadata" long-name="Messaging Middleware Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="imsrv" level="specific" long-name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
+<collection name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" level="specific">
+<component name="ximp_core_data_model_api" long-name="XIMP Core Data Model API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_data_model_api/group"/>
+</component>
+<component name="ximp_presence_protocol_plugin_host_api" long-name="XIMP Presence Protocol Plug-in Host API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_host_api/group"/>
+</component>
+<component name="ximp_presence_data_model_api" long-name="XIMP Presence Data Model API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_data_model_api/group"/>
+</component>
+<component name="ximp_presence_protocol_plugin_api" long-name="XIMP Presence Protocol Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_api/group"/>
+</component>
+<component name="ximp_presence_management_api" long-name="XIMP Presence Management API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_management_api/group"/>
+</component>
+<component name="ximp_core_protocol_plugin_host_api" long-name="XIMP Core Protocol Plug-in Host API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_host_api/group"/>
+</component>
+<component name="ximp_core_management_api" long-name="XIMP Core Management API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_management_api/group"/>
+</component>
+<component name="ximp_presence_base_api" long-name="XIMP Presence Base API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_base_api/group"/>
+</component>
+<component name="ximp_core_protocol_plugin_api" long-name="XIMP Core Protocol Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_api/group"/>
+</component>
+<component name="ximp_core_base_api" long-name="XIMP Core Base API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_base_api/group"/>
+</component>
+<component name="ximp_presence_cache_api" long-name="XIMP Presence Cache API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_cache_api/group"/>
+</component>
+<component name="ximp_core_feature_plugin_api" long-name="XIMP Core Feature Plugin API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/group"/>
+</component>
+<component name="ximp_im_protocol_plugin_host_api" long-name="XIMP IM Protocol Plugin Host API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_host_api/group"/>
+</component>
+<component name="ximp_im_data_model_api" long-name="XIMP IM Data Model API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_data_model_api/group"/>
+</component>
+<component name="ximp_im_protocol_plugin_api" long-name="XIMP IM Protocol Plugin API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_api/group"/>
+</component>
+<component name="ximp_im_management_api" long-name="XIMP IM Management API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_management_api/group"/>
+</component>
+<component name="ximp_im_base_api" long-name="XIMP IM Base API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_im_base_api/group"/>
+</component>
+<component name="ximp_search_protocol_plugin_host_api" long-name="XIMP Search Protocol Plugin Host API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_host_api/group"/>
+</component>
+<component name="ximp_search_data_model_api" long-name="XIMP Search Data Model API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_data_model_api/group"/>
+</component>
+<component name="ximp_search_protocol_plugin_api" long-name="XIMP search Protocol Plugin API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_api/group"/>
+</component>
+<component name="ximp_search_management_api" long-name="XIMP Search Management API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_management_api/group"/>
+</component>
+<component name="ximp_search_base_api" long-name="XIMP Search Base API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/ximp_search_base_api/group"/>
+</component>
+<component name="xmpp_settings_api" long-name="XMPP Settings API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/group"/>
+</component>
+<component name="im_cache_client_api" long-name="IM Cache Client API" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/im_cache_client_api/group"/>
+</component>
+<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 Avability Text" filter="s60" class="api">
+<unit bldFile="mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
+</component>
+</collection>
+<collection name="ximpfw" long-name="XIMP Framework" level="framework">
+<!-- collection is really a component. Needs to be moved down a directory -->
+<component name="ximpfw_build" filter="s60" long-name="XIMP Framework Build">
+<unit bldFile="mw/imsrv/ximpfw/group"/>
+</component>
+</collection>
+<collection name="imservices" long-name="IM Services" level="generic">
+<component name="imfeatureplugin" filter="s60" long-name="IM Feature Plugin" introduced="^2" plugin="Y">
+<unit bldFile="mw/imsrv/imservices/imfeatureplugin/group"/>
+</component>
+<component name="searchfeatureplugin" filter="s60" long-name="Search Feature Plugin" introduced="^2" plugin="Y">
+<unit bldFile="mw/imsrv/imservices/searchfeatureplugin/group"/>
+</component>
+<component name="xmppsettingsapi" filter="s60" long-name="XMPP Settings API" introduced="^2">
+<unit bldFile="mw/imsrv/imservices/xmppsettingsapi/group"/>
+</component>
+<component name="xmppsettingsfetcher" filter="s60" long-name="XMPP Settings Fetcher" introduced="^2">
+<unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/group"/>
+</component>
+<component name="instantmessagingcache" filter="s60" long-name="Instant Messaging Cache" introduced="^2">
+<unit bldFile="mw/imsrv/imservices/instantmessagingcache/group"/>
+</component>
+</collection>
+<collection name="brandingserver" long-name="Branding Server" level="specific">
+<!-- collection is really a component. Needs to be moved down a directory -->
+<component name="brandingserver_build" filter="s60" long-name="Branding Server Build">
+<unit bldFile="mw/imsrv/brandingserver/group"/>
+</component>
+</collection>
+</block>
+<block name="legacypresence" level="specific" long-name="Legacy Presence Services" levels="engine fw ui">
+<collection name="pressrv_plat" long-name="Legacy Presence Services Platform Interfaces" level="ui">
+<component name="presence_list_api" long-name="Presence List API" filter="s60" class="api">
+<unit bldFile="mw/legacypresence/pressrv_plat/presence_list_api/group"/>
+</component>
+<component name="watcher_info_api" long-name="Watcher Info API" filter="s60" class="api">
+<unit bldFile="mw/legacypresence/pressrv_plat/watcher_info_api/group"/>
+</component>
+<component name="simple_documents_api" long-name="SIMPLE Documents API" filter="s60" class="api">
+<unit bldFile="mw/legacypresence/pressrv_plat/simple_documents_api/group"/>
+</component>
+<component name="authorization_api" long-name="Authorization API" filter="s60" class="api">
+<unit bldFile="mw/legacypresence/pressrv_plat/authorization_api/group"/>
+</component>
+<component name="xdm_protocol_plugin_api" long-name="XDM Protocol Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/legacypresence/pressrv_plat/xdm_protocol_plugin_api/group"/>
+</component>
+<component name="watcher_api" long-name="Watcher API" filter="s60" class="api">
+<unit bldFile="mw/legacypresence/pressrv_plat/watcher_api/group"/>
+</component>
+<component name="xdm_api" long-name="XDM API" filter="s60" class="api">
+<unit bldFile="mw/legacypresence/pressrv_plat/xdm_api/group"/>
+</component>
+<component name="registration_api" long-name="Registration API" filter="s60" class="api">
+<unit bldFile="mw/legacypresence/pressrv_plat/registration_api/group"/>
+</component>
+<component name="publisher_api" long-name="Publisher API" filter="s60" class="api">
+<unit bldFile="mw/legacypresence/pressrv_plat/publisher_api/group"/>
+</component>
+<component name="messaging_connection_manager_api" long-name="Messaging Connection Manager API" filter="s60" class="api">
+<unit bldFile="mw/legacypresence/pressrv_plat/messaging_connection_manager_api/group"/>
+</component>
+<component name="xdm_settings_api" long-name="XDM Settings API" filter="s60" class="api">
+<unit bldFile="mw/legacypresence/pressrv_plat/xdm_settings_api/group"/>
+</component>
+<component name="simple_settings_api" long-name="SIMPLE Settings API" filter="s60" class="api">
+<unit bldFile="mw/legacypresence/pressrv_plat/simple_settings_api/group"/>
+</component>
+<component name="simple_instant_msg_api" long-name="Simple Instant Msg API" filter="s60" class="api">
+<unit bldFile="mw/legacypresence/pressrv_plat/simple_instant_msg_api/group"/>
+</component>
+</collection>
+<collection name="xdmengine" long-name="XDM Engine" level="engine">
+<!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
+<component name="xdmengine_build" filter="s60" long-name="XDM Engine Build">
+<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">
+<unit bldFile="mw/legacypresence/xdmprotocols/group"/>
+</component>
+</collection>
+<collection name="msgconnmanager" long-name="Messaging Connection Manager" level="fw">
+<!-- collection is really a component. Need to move down a directory-->
+<component name="msgconnmanager_build" filter="s60" long-name="Messaging Connection Manager Build">
+<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">
+<unit bldFile="mw/legacypresence/simpleengine/group"/>
+</component>
+</collection>
+<collection name="presencefwsimpleadpt" long-name="Presence Framework SIMPLE Adaptation" level="fw">
+<!-- collection is really a component. Need to move down a directory-->
+<component name="simpleplugin" filter="s60" long-name="SIMPLE Plugin" plugin="Y">
+<unit bldFile="mw/legacypresence/presencefwsimpleadpt/group"/>
+</component>
+</collection>
+<collection name="simpledatamodeladapter" long-name="SIMPLE Data Model Adapter" level="fw">
+<component name="presenceplugin" filter="s60" long-name="Presence Plugin" introduced="^2" plugin="Y">
+<unit bldFile="mw/legacypresence/simpledatamodeladapter/group"/>
+</component>
+</collection>
+</block>
+<block name="searchsrv" level="specific" long-name="Search Services" levels="services engine generic api">
+<collection name="searchsrv_plat" long-name="Search Services Platform Interfaces" level="api">
+<component name="cpix_utility_api" long-name="CPIX Utility API" filter="s60" introduced="^4" class="api">
+<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_utility_api/group"/>
+</component>
+<component name="cpix_framework_api" long-name="CPIX Framework API" filter="s60" introduced="^4" class="api">
+<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_framework_api/group"/>
+</component>
+<component name="cpix_search_api" long-name="CPIX Search API" filter="s60" introduced="^4" class="api">
+<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_search_api/group"/>
+</component>
+</collection>
+<collection name="searchengine" long-name="Search Engine" level="engine">
+<component name="searchengine_util" long-name="Search Engine Utils" filter="s60" introduced="^4">
+<unit bldFile="mw/searchsrv/searchengine/util/group"/>
+</component>
+<component name="searchengine_oss" long-name="Search Engine OSS" filter="s60" introduced="^4">
+<unit bldFile="mw/searchsrv/searchengine/oss/group"/>
+</component>
+<component name="cpix" long-name="Cross Platform Indexing Engine" filter="s60" introduced="^4">
+<unit bldFile="mw/searchsrv/searchengine/cpix/group"/>
+</component>
+</collection>
+<collection name="searcher" long-name="Searcher" level="generic">
+<component name="searchclient" long-name="Search Client" filter="s60" introduced="^4">
+<unit bldFile="mw/searchsrv/searcher/SearchClient/group"/>
+</component>
+<component name="searchserver" long-name="Search Server" filter="s60" introduced="^4">
+<unit bldFile="mw/searchsrv/searcher/SearchServer/group"/>
+</component>
+<component name="searcher_test" long-name="Searcher Tests" filter="s60" purpose="development" introduced="^4">
+<!-- #include from common bld.inf or split into two components -->
+<unit bldFile="mw/searchsrv/searcher/tsrc/RobustnessTest/group"/>
+<unit bldFile="mw/searchsrv/searcher/tsrc/LogPlayer/group"/>
+</component>
+</collection>
+<collection name="searchsrv_harvester" long-name="Search Services Harvester" level="services">
+<component name="searchsrv_pluginfw" long-name="Search Server" filter="s60" introduced="^4">
+<unit bldFile="mw/searchsrv/harvester/pluginfw/group"/>
+</component>
+<component name="searchsrv_harvesterserver" long-name="Search Harvester Server" filter="s60" introduced="^4">
+<unit bldFile="mw/searchsrv/harvester/HarvesterServer/group"/>
+</component>
+</collection>
+<collection name="searchsrv_watchdog" long-name="Search Services Watch Dog" level="services">
+<component name="searchsrv_watchdog_build" long-name="Search Services Watch Dog Build" filter="s60" introduced="^4">
+<unit bldFile="mw/searchsrv/WatchDog/group"/>
+</component>
+</collection>
+<collection name="qcpix" long-name="Qt CPIX" level="engine">
+<component name="qcpixsearchclient" long-name="Qt CPIX Search Client" introduced="^4">
+<!-- Snag! qcpix.pro and qcpixsearchclient.pro in same directory! -->
+<unit bldFile="mw/searchsrv/qcpix" proFile="qcpixsearchclient.pro"/>
+</component>
+</collection>
+<collection name="searchsrv_info" long-name="Search Services Info">
+<component name="searchsrv_build" long-name="Search Services Build" introduced="^4">
+<!-- move exports to own component and remove this -->
+<unit bldFile="mw/searchsrv/group"/>
+</component>
+</collection>
+</block>
+<block name="remotemgmt" level="specific" long-name="Remote Management" levels="plugin framework server generic specific">
+<collection name="remotemgmt_pub" long-name="Remote Management Public Interfaces" level="specific">
+<component name="synchronization_capability_api" long-name="Synchronization Capability API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
+</component>
+</collection>
+<collection name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" level="specific">
+<component name="common_agent_util_and_definitions_api" long-name="Common Agent util and definitions API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
+</component>
+<component name="policy_management_certificate_api" long-name="Policy Management Certificate API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/group"/>
+</component>
+<component name="oma_provisioning_adapter_api" long-name="OMA Provisioning Adapter API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_adapter_api/group"/>
+</component>
+<component name="device_management_parameter_api" long-name="Device Management Parameter API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_parameter_api/group"/>
+</component>
+<component name="data_synchronization_plugin_api" long-name="Data Synchronization Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/group"/>
+</component>
+<component name="sync_alert_handler_api" long-name="Sync Alert Handler API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
+</component>
+<component name="syncml_notifier_api" long-name="SyncML Notifier API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
+</component>
+<component name="syncml_client_api" long-name="SyncML Client API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
+</component>
+<component name="device_management_plugin_api" long-name="Device Management plug-in API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_plugin_api/group"/>
+</component>
+<component name="dm_tree_apis" long-name="DM Tree APIs" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
+</component>
+<component name="terminal_security_device_lock_api" long-name="Terminal Security Device Lock API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/group"/>
+</component>
+<component name="policy_management_request_api" long-name="Policy Management Request API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/group"/>
+</component>
+<component name="ds_constant_definitions_api" long-name="DS Constant Definitions API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_constant_definitions_api/group"/>
+</component>
+<component name="scp_server_api" long-name="SCP Server API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/group"/>
+</component>
+<component name="data_synchronization_notification_api" long-name="Data Synchronization Notification API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_notification_api/group"/>
+</component>
+<component name="oma_provisioning_engine_api" long-name="OMA Provisioning Engine API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/group"/>
+</component>
+<component name="dm_utils_api" long-name="DM Utils API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/group"/>
+</component>
+<component name="syncml_alert_api" long-name="SyncML Alert API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/group"/>
+</component>
+<component name="obex_client_session_api" long-name="OBEX Client session API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/obex_client_session_api/group"/>
+</component>
+<component name="setting_enforcement_info_api" long-name="Setting Enforcement Info API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/group"/>
+</component>
+<component name="dm_constant_definitions_api" long-name="DM Constant Definitions API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
+</component>
+<component name="oma_ds_extensions_api" long-name="OMA DS Extensions API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
+</component>
+<component name="pnpms_utils_api" long-name="PNPMS Utils API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
+</component>
+<component name="diagnostics_plugin_utility_api" long-name="Diagnostics Plugin Utility API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
+</component>
+<component name="diagnostics_plugin_api" long-name="Diagnostics Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
+</component>
+<component name="diagnostics_framework_api" long-name="Diagnostics Framework API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
+</component>
+<component name="diagnostics_results_api" long-name="Diagnostics Results API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
+</component>
+<component name="diagnostics_plugin_pool_api" long-name="Diagnostics Plugin Pool API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
+</component>
+<component name="adaptive_history_list_api" long-name="Adaptive History List API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
+</component>
+<component name="adaptive_history_list_session_api" long-name="Adaptive History List Session API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
+</component>
+<component name="fota_engine_api" long-name="FOTA Engine API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
+</component>
+<component name="update_package_storage_plugin_api" long-name="Update Package Storage Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
+</component>
+<component name="syncml_notifier_roaming_api" long-name="SyncML Notifier Roaming API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
+</component>
+<component name="sync_service_api" long-name="Sync Service API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_service_api/group"/>
+</component>
+<component name="dcmo_adapter_api" long-name="DCMO Adapter API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_adapter_api/group"/>
+</component>
+<component name="dcmo_control_api" long-name="DCMO Control API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_control_api/group"/>
+</component>
+<component name="ds_capability_mgmt_plugin_api" long-name="DS Capability Management Plugin API" filter="s60" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
+</component>
+</collection>
+<collection name="policymanagement" long-name="Policy Management" level="generic">
+<component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">
+<unit bldFile="mw/remotemgmt/policymanagement/pmdmadapter/group"/>
+</component>
+<component name="dmutilserver" filter="s60" long-name="DM Util Server">
+<unit bldFile="mw/remotemgmt/policymanagement/dmutilserver/group"/>
+</component>
+<component name="policyengine" filter="s60" long-name="Policy Engine">
+<unit bldFile="mw/remotemgmt/policymanagement/policyengine/group" filter="!dfs_build"/>
+</component>
+<component name="policymanagement_build" filter="s60" long-name="Policy Management Build">
+<!-- need to distribute exports, etc into the other components and remove this-->
+<unit bldFile="mw/remotemgmt/policymanagement/group"/>
+</component>
+</collection>
+<collection name="syncmlfw" long-name="SyncML Framework" level="server">
+<component name="syncmlfw_build" filter="s60" long-name="SyncML Framework Build">
+<!-- need to break this up into components. Too convoluted a structure to be in a single bld.inf-->
+<unit bldFile="mw/remotemgmt/syncmlfw/group"/>
+</component>
+</collection>
+<collection name="terminalsecurity" long-name="Terminal Security" level="specific">
+<component name="scp" filter="s60" long-name="Security Code Proxy">
+<!-- can only have one unit, need to have these #included from a single bld.inf -->
+<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
+<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpdatabase/group"/>
+<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpserver/group"/>
+<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scppatternplugin/group"/>
+<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scphistoryplugin/group"/>
+<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scptimestampplugin/group"/>
+<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpeventhandler/group"/>
+<unit bldFile="mw/remotemgmt/terminalsecurity/scp/dmeventnotifier/group"/>
+</component>
+<component name="terminalsecurity_client" filter="s60" long-name="Terminal Control Client">
+<unit bldFile="mw/remotemgmt/terminalsecurity/client/group"/>
+</component>
+<component name="terminalsecurity_server" filter="s60" long-name="Terminal Control Server">
+<unit bldFile="mw/remotemgmt/terminalsecurity/server/group"/>
+</component>
+<component name="tcadapter" filter="s60" long-name="Terminal Control Adapter">
+<unit bldFile="mw/remotemgmt/terminalsecurity/tcadapter/bld"/>
+</component>
+<component name="terminalsecurity_build" filter="s60" long-name="Terminal Security Build">
+<!-- need to distribute exports, etc into the other components and remove this-->
+<unit bldFile="mw/remotemgmt/terminalsecurity/group"/>
+</component>
+</collection>
+<collection name="omaprovisioning" long-name="OMA Provisioning" level="specific">
+<component name="pnputil" filter="s60" long-name="PnP Util">
+<unit bldFile="mw/remotemgmt/omaprovisioning/pnputil/group"/>
+</component>
+<component name="provisioning" filter="s60" long-name="Provisioning">
+<unit bldFile="mw/remotemgmt/omaprovisioning/provisioning/group"/>
+</component>
+</collection>
+<collection name="devicediagnosticsfw" long-name="Device Diagnostics Framework" level="framework">
+<component name="diagframework" filter="s60" long-name="Diagnostics Framework">
+<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
+</component>
+<component name="diagpluginbase" filter="s60" long-name="Diagnostics Plugin Base">
+<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
+</component>
+<component name="diagresultsdb" filter="s60" long-name="Diagnostics Results Database">
+<!-- can only have one unit, merge or split into two components -->
+<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
+<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
+</component>
+<component name="devicediagnosticsfw_build" filter="s60" long-name="Device Diagnostics Framework Build">
+<!-- need to distribute exports, etc into the other components and remove this-->
+<unit bldFile="mw/remotemgmt/devicediagnosticsfw/group"/>
+</component>
+</collection>
+<collection name="dcmofw" long-name="Device Capability Management Object Framework" level="framework">
+<component name="dcmoclient" filter="s60" long-name="DCMO Client">
+<unit bldFile="mw/remotemgmt/dcmofw/dcmoclient/group"/>
+</component>
+<component name="dcmoserver" filter="s60" long-name="DCMO Server">
+<unit bldFile="mw/remotemgmt/dcmofw/dcmoserver/group"/>
+</component>
+<component name="dcmocustcmd" filter="s60" long-name="DCMO Custom Commands">
+<unit bldFile="mw/remotemgmt/dcmofw/dcmocustcmd/group"/>
+</component>
+<component name="dcmofw_build" filter="s60" long-name="DCMO Build">
+<!-- need to distribute exports, etc into the other components and remove this-->
+<unit bldFile="mw/remotemgmt/dcmofw/group"/>
+</component>
+</collection>
+<collection name="fotaapplication" long-name="FOTA Application" level="generic">
+<component name="fotaapplication_build" filter="s60" long-name="FOTA Application Build">
+<!-- remove this component when configuration is in place and the #ifdefs have been worked out -->
+<unit bldFile="mw/remotemgmt/fotaapplication/group"/>
+</component>
+<component name="fotaserver" filter="s60" long-name="FOTA Server">
+<!-- uncomment when #ifdefs are resolved -->
+<!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
+</component>
+<component name="fotacustcmds" filter="s60" long-name="FOTA Custom Commands" class="placeholder">
+<!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
+<!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
+</component>
+</collection>
+</block>
+<block name="remoteconn" level="generic" long-name="Remote Connectivity" levels="plugin framework server generic specific">
+<collection name="remoteconn_info" long-name="Remote Connectivity Info" level="specific">
+<component name="remoteconn_metadata" long-name="Remote Connectivity Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
+</component>
+</collection>
+<collection name="mtptransports" long-name="MTP Transports" level="plugin">
+<component name="mtpusbtransport" long-name="MTP USB Transport" introduced="^2" purpose="optional" plugin="Y">
+<unit bldFile="mw/remoteconn/mtptransports/mtpusbtransport/group" mrp="mw/remoteconn/mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
+</component>
+<component name="mtpptpiptransport" long-name="MTP PTP-IP Transport" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="mw/remoteconn/mtptransports/mtpptpiptransport/group" mrp="mw/remoteconn/mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
+</component>
+<component name="mtpcontroller" long-name="MTP Controller" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="mw/remoteconn/mtptransports/mtpcontroller/group" mrp="mw/remoteconn/mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
+</component>
+</collection>
+<collection name="mtpfws" long-name="MTP Frameworks" level="framework">
+<component name="mtpfw" long-name="MTP Framework" introduced="^2" purpose="optional">
+<unit bldFile="mw/remoteconn/mtpfws/mtpfw/group" mrp="mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/>
+</component>
+</collection>
+<collection name="mtpdataproviders" long-name="MTP Data Providers" level="generic">
+<component name="mtpfileandfolderdp" long-name="MTP File and Folder Provider" introduced="^2" purpose="optional" plugin="Y">
+<unit bldFile="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group" mrp="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
+</component>
+<component name="mtpimagedp" long-name="MTP Image Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="mw/remoteconn/mtpdataproviders/mtpimagedp/group" mrp="mw/remoteconn/mtpdataproviders/mtpimagedp/group/mtp_imagedp.mrp"/>
+</component>
+<component name="mtppictbridgedp" long-name="MTP PictBridge Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group" mrp="mw/remoteconn/mtpdataproviders/mtppictbridgedp/group/mtp_pictbridgedp.mrp"/>
+</component>
+</collection>
+<collection name="backupandrestore" long-name="Backup and Restore" level="specific">
+<component name="backupengine" long-name="Backup Engine" introduced="9.0" purpose="optional">
+<unit bldFile="mw/remoteconn/backupandrestore/backupengine/group" mrp="mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
+</component>
+<component name="backuptest" long-name="Backup Test" introduced="^2" purpose="development">
+<unit bldFile="mw/remoteconn/backupandrestore/backuptest/group" mrp="mw/remoteconn/backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
+</component>
+</collection>
+<collection name="obex" long-name="OBEX" level="generic">
+<component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1" purpose="optional">
+<unit bldFile="mw/remoteconn/obex/obexprotocol/group" mrp="mw/remoteconn/obex/obexprotocol/group/obex.mrp"/>
+</component>
+<component name="obexextensionapi" long-name="OBEX Extension API" introduced="9.2" purpose="optional">
+<unit bldFile="mw/remoteconn/obex/obexextensionapi/group" mrp="mw/remoteconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
+</component>
+</collection>
+</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="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="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="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="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="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="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">
+<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">
+<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">
+<unit mrp="mw/srvdiscovery/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="dlnasrv" level="specific" long-name="DLNA Services" levels="stack server ctrl framework plugin">
+<!-- uncomment all the units when configuration is in place, they're currently #included from other xxx_build components -->
+<collection name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" level="plugin">
+<component name="upnp_media_server_settings_api" long-name="UPnP Media Server Settings API" filter="s60" class="api">
+<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_settings_api/group"/>
+</component>
+<component name="upnp_av_objects_api" long-name="UPnP A/V Objects API" filter="s60" class="api">
+<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_av_objects_api/group"/>
+</component>
+<component name="upnp_media_server_api" long-name="UPnP Media Server API" filter="s60" class="api">
+<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_api/group"/>
+</component>
+<component name="upnp_security_plugin_api" long-name="UPnP Security Plugin API" filter="s60" class="api">
+<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_security_plugin_api/group"/>
+</component>
+<component name="upnp_avcp_api" long-name="UPnP AVCP API" filter="s60" class="api">
+<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_avcp_api/group"/>
+</component>
+<component name="upnp_media_server_metadata_api" long-name="UPnP Media Server Metadata API" filter="s60" class="api">
+<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_metadata_api/group"/>
+</component>
+<component name="upnp_command_api" long-name="UPnP Command API" filter="s60" class="api">
+<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_command_api/group"/>
+</component>
+<component name="upnp_plugin_api" long-name="UPnP Plugin API" filter="s60" class="api">
+<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_plugin_api/group"/>
+</component>
+</collection>
+<collection name="upnpavcontrolpoint" long-name="UPnP A/V Control Point" level="plugin">
+<component name="avcontrolframework" filter="s60" long-name="A/V Control Famework" introduced="9.1" deprecated="^3">
+<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
+</component>
+<component name="upnpavcontrolpoint_build" filter="s60" long-name="UPnP A/V Control Point Build" introduced="9.1" deprecated="^3">
+<!-- put exports in other component instead -->
+<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/group"/>
+</component>
+</collection>
+<collection name="upnpmediaserver" long-name="UPnP Media Server" level="server">
+<component name="avobjects" filter="s60" long-name="A/V Objects">
+<unit bldFile="mw/dlnasrv/upnpmediaserver/avobjects/group"/>
+</component>
+<component name="mediaserverclient" filter="s60" long-name="Media Server Client">
+<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverclient/group"/>
+</component>
+<component name="connectionmanagerservice" filter="s60" long-name="Connection Manager Service">
+<unit bldFile="mw/dlnasrv/upnpmediaserver/connectionmanagerservice/group"/>
+</component>
+<component name="contentdirectoryservice" filter="s60" long-name="Content Directory Service">
+<unit bldFile="mw/dlnasrv/upnpmediaserver/contentdirectoryservice/group"/>
+</component>
+<component name="mediaserverengine" filter="s60" long-name="Media Server Engine">
+<unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverengine/group"/>
+</component>
+<component name="upnpmediaserver_build" filter="s60" long-name="UPnP Media Server Build">
+<!-- move exports into one of above components -->
+<unit bldFile="mw/dlnasrv/upnpmediaserver/group"/>
+</component>
+</collection>
+<collection name="upnpavcontroller" long-name="UPnP A/V Controller" level="ctrl">
+<component name="upnpxmlparser" filter="s60" long-name="UPnP XML Parser" introduced="^2">
+<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpxmlparser/group"/>
+</component>
+<component name="upnpavcontrollerserver" filter="s60" long-name="UPnP A/V Controller Server" introduced="^2">
+<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerserver/group"/>
+</component>
+<component name="upnpavcontrollerclient" filter="s60" long-name="UPnP A/V Ccontroller Client" introduced="^2">
+<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerclient/group"/>
+</component>
+<component name="upnpavcontrollerhelper" filter="s60" long-name="UPnP A/V Controller Helper" introduced="^2">
+<unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerhelper/group"/>
+</component>
+<component name="upnpavcontroller_build" filter="s60" long-name="UPnP A/V Controller Build" introduced="^2">
+<!-- move exports content into one of above components -->
+<unit bldFile="mw/dlnasrv/upnpavcontroller/group"/>
+</component>
+</collection>
+<collection name="upnpframework" long-name="UPnP Framework" level="framework">
+<component name="upnputilities" filter="s60" long-name="UPnP Utilities" introduced="^2">
+<unit bldFile="mw/dlnasrv/upnpframework/upnputilities/group"/>
+</component>
+<component name="upnpextensionpluginif" filter="s60" long-name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
+<!-- <unit bldFile="upnpframework/upnpextensionpluginif/group"/> -->
+</component>
+<component name="upnpfiletransferengine" filter="s60" long-name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
+<!-- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>-->
+</component>
+<component name="upnpcommonui" filter="s60" long-name="UPnP Common UI" introduced="^2" deprecated="^3">
+<!--<unit bldFile="upnpframework/upnpcommonui/group"/>-->
+</component>
+<component name="upnpaiwengine" filter="s60" long-name="UPnP AIW Engine" introduced="^2" deprecated="^3">
+<!--<unit bldFile="upnpframework/upnpaiwengine/group"/> -->
+</component>
+<component name="upnpaiwprovider" filter="s60" long-name="UPnP AIW Provider" introduced="^2" deprecated="^3" plugin="Y">
+<!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
+</component>
+<component name="upnpmusicadapter" filter="s60" long-name="UPnP Music Adapter" introduced="^2">
+<unit bldFile="mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
+</component>
+<component name="upnpcommand" filter="s60" long-name="UPnP Command" introduced="^2">
+<unit bldFile="mw/dlnasrv/upnpframework/upnpcommand/group"/>
+</component>
+<component name="upnpframework_build" filter="s60" long-name="UPnP Framework Build" introduced="^2">
+<!-- move exports content into one of above components -->
+<unit bldFile="mw/dlnasrv/upnpframework/group"/>
+</component>
+</collection>
+<collection name="upnpsettings" long-name="UPnP Settings" level="framework">
+<component name="upnpsettingsengine" filter="s60" long-name="UPnP Settings Engine" introduced="^2">
+<unit bldFile="mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
+</component>
+<component name="multiselectionui" filter="s60" long-name="Multi-Selection UI" introduced="^2" deprecated="^3">
+<!--<unit bldFile="upnpsettings/multiselectionui/group"/>-->
+</component>
+<component name="appwizard" filter="s60" long-name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
+<!--<unit bldFile="upnpsettings/appwizard/group"/>-->
+</component>
+<component name="upnpsharingui" filter="s60" long-name="UPnP Sharing UI" introduced="^2" deprecated="^3">
+<!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
+</component>
+<component name="upnpgsplugin" filter="s60" long-name="UPnP GS Plugin" introduced="^2" plugin="Y">
+<unit bldFile="mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
+</component>
+<component name="upnpsettings_build" filter="s60" long-name="UPnP Settings Build" introduced="^2">
+<!-- move exports content into one of above components -->
+<unit bldFile="mw/dlnasrv/upnpsettings/group"/>
+</component>
+</collection>
+<collection name="upnpsharing" long-name="UPnP Sharing" level="server">
+<component name="upnpdlnaprofiler" filter="s60" long-name="UPnP DLNA Profiler" introduced="^2">
+<unit bldFile="mw/dlnasrv/upnpsharing/upnpdlnaprofiler/group"/>
+</component>
+<component name="upnpsecurity" filter="s60" long-name="UPnP Security" introduced="^2">
+<unit bldFile="mw/dlnasrv/upnpsharing/upnpsecurity/group"/>
+</component>
+<component name="upnpcontentserver" filter="s60" long-name="UPnP Content Server" introduced="^2">
+<unit bldFile="mw/dlnasrv/upnpsharing/upnpcontentserver/group"/>
+</component>
+<component name="applicationengine" filter="s60" long-name="UPnP Application Engine" introduced="^2">
+<unit bldFile="mw/dlnasrv/upnpsharing/applicationengine/group"/>
+</component>
+<component name="upnpsharing_build" filter="s60" long-name="UPnP Sharing Build" introduced="^2">
+<!-- move exports content into one of above components -->
+<unit bldFile="mw/dlnasrv/upnpsharing/group"/>
+</component>
+</collection>
+<collection name="upnpmpxplugins" long-name="UPnP MPX Plugins" level="plugin">
+<component name="upnpplaybackplugins" filter="s60" long-name="UPnP Playback Plugins" introduced="^2" plugin="Y">
+<unit bldFile="mw/dlnasrv/upnpmpxplugins/upnpplaybackplugins/group"/>
+</component>
+<component name="upnpmpxplugins_build" filter="s60" long-name="UPnP MPX Plugins Build" introduced="^2">
+<!-- move exports content into other component? -->
+<unit bldFile="mw/dlnasrv/upnpmpxplugins/group"/>
+</component>
+</collection>
+<collection name="upnpharvester" long-name="UPnP Harvester" level="ctrl">
+<component name="upnpharvester_common" filter="s60" long-name="UPnP Harvester Common" introduced="^2" deprecated="^3" class="placeholder">
+<!-- need to merge or #include these to a single bld.inf -->
+<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
+ <unit bldFile="upnpharvester/common/cmsettings/group"/>
+ <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
+ <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
+</component>
+<component name="cdssync" filter="s60" long-name="CDS Sync" introduced="^2" deprecated="^3" class="placeholder">
+<!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
+</component>
+<component name="mdhserver" filter="s60" long-name="Metadata Harvester Server" introduced="^2" deprecated="^3" class="placeholder">
+<!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
+</component>
+<component name="upnpharvester_build" filter="s60" long-name="UPnP Harvester Build" introduced="^2" deprecated="^3" class="placeholder">
+<!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
+<!--<unit bldFile="upnpharvester/group"/>-->
+</component>
+</collection>
+<collection name="homesync" long-name="Home Sync" level="plugin">
+<component name="contentmanager" filter="s60" long-name="Content Manager" introduced="^2" deprecated="^3" class="placeholder">
+<!-- <unit bldFile="homesync/group"/>-->
+<!-- move bld.inf into contentmanager dir -->
+</component>
+</collection>
+<collection name="homemedia" long-name="Home Media" level="framework">
+<!-- collection is really just a component. Move down a directory -->
+<component name="homemedia_build" filter="s60" long-name="Home Media" introduced="^2" deprecated="^3" class="placeholder">
+<!-- <unit bldFile="homemedia/group"/> -->
+</component>
+</collection>
+<collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin">
+<component name="dlnasrv_build" filter="s60" long-name="DLNA Services Build">
+<!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed -->
+<unit bldFile="mw/dlnasrv/group"/>
+</component>
+</collection>
+</block>
+<block name="btservices" level="generic" long-name="Bluetooth Services" levels="framework server generic specific plugin">
+<collection name="btservices_pub" long-name="BT Services Public Interfaces" level="plugin">
+<component name="bluetooth_power_state_api" long-name="Bluetooth Power State API" filter="s60" class="api">
+<unit bldFile="mw/btservices/btservices_pub/bluetooth_power_state_api/group"/>
+</component>
+<component name="bluetooth_notifier_api" long-name="Bluetooth Notifier API" filter="s60" class="api">
+<unit bldFile="mw/btservices/btservices_pub/bluetooth_notifier_api/group"/>
+</component>
+</collection>
+<collection name="btservices_plat" long-name="BT Services Platform Interfaces" level="plugin">
+<component name="bluetooth_dosserver_audio_api" long-name="Bluetooth DOS Server Audio API" filter="s60" class="api">
+<unit bldFile="mw/btservices/btservices_plat/bluetooth_dosserver_audio_api/group"/>
+</component>
+<component name="bluetooth_dut_mode_api" long-name="Bluetooth DUT Mode API" filter="s60" class="api">
+<unit bldFile="mw/btservices/btservices_plat/bluetooth_dut_mode_api/group"/>
+</component>
+<component name="bluetooth_engine_api" long-name="Bluetooth Engine API" filter="s60" class="api">
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</component>
+<component name="bluetooth_local_variation_api" long-name="Bluetooth Local Variation API" filter="s60" class="api">
+<unit bldFile="mw/btservices/btservices_plat/bluetooth_local_variation_api/group"/>
+</component>
+<component name="bluetooth_notifier_internal_api" long-name="Bluetooth Notifier internal API" filter="s60" class="api">
+<unit bldFile="mw/btservices/btservices_plat/bluetooth_notifier_internal_api/group"/>
+</component>
+<component name="bluetooth_sap_connection_state_api" long-name="Bluetooth SAP Connection State API" filter="s60" class="api">
+<unit bldFile="mw/btservices/btservices_plat/bluetooth_sap_connection_state_api/group"/>
+</component>
+<component name="bluetooth_secondary_display_notification_api" long-name="Bluetooth Secondary Display Notification API" filter="s60" class="api">
+<unit bldFile="mw/btservices/btservices_plat/bluetooth_secondary_display_notification_api/group"/>
+</component>
+</collection>
+<collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
+<component name="bteng" filter="s60" long-name="Bluetooth Engine">
+<unit bldFile="mw/btservices/bluetoothengine/bteng/group"/>
+</component>
+<component name="btnotif" filter="s60" long-name="Bluetooth Notifier">
+<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"/>
+</component>
+<component name="btmac" filter="s60" long-name="Bluetooth Mono Audio Controller" plugin="Y">
+<unit bldFile="mw/btservices/bluetoothengine/btmac/group"/>
+</component>
+<component name="btsac" filter="s60" long-name="Bluetooth Stereo Audio Controller" plugin="Y">
+<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"/>
+</component>
+<component name="btsap" filter="s60" long-name="Bluetooth SIM Access Profile" plugin="Y">
+<unit bldFile="mw/btservices/bluetoothengine/btsap/group"/>
+</component>
+<component name="btui" filter="s60" long-name="Bluetooth UI">
+<unit bldFile="mw/btservices/bluetoothengine/btui/group"/>
+</component>
+<component name="btpbap" filter="s60" long-name="Bluetooth Phonebook Access Profile" plugin="Y">
+<unit bldFile="mw/btservices/bluetoothengine/btpbap/group"/>
+</component>
+<component name="bthid" filter="s60" long-name="Bluetooth HID">
+<unit bldFile="mw/btservices/bluetoothengine/bthid/group"/>
+</component>
+<component name="btctrldcmoadapter" filter="s60" long-name="Bluetooth Control DCMO Adapter" introduced="^3" plugin="Y">
+<unit bldFile="mw/btservices/bluetoothengine/btctrldcmoadapter/group"/>
+</component>
+<component name="btserviceutil" filter="s60" long-name="Bluetooth Service Utils">
+<unit bldFile="mw/btservices/bluetoothengine/btserviceutil/group"/>
+</component>
+<component name="btnotifclient" filter="s60" long-name="Bluetooth Notifier Client">
+<unit bldFile="mw/btservices/bluetoothengine/btnotif/btnotifclient/group"/>
+</component>
+</collection>
+<collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
+<component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
+<unit bldFile="mw/btservices/bluetoothappprofiles/avrcp" mrp="mw/btservices/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
+</component>
+</collection>
+<collection name="atcommands" long-name="AT Commands" level="generic">
+<component name="modematplugin" long-name="Modem AT Plugin" filter="s60" introduced="^4" plugin="Y">
+<unit bldFile="mw/btservices/atcommands/modematplugin/group"/>
+</component>
+<component name="lccustomplugin" long-name="LC Custom Plugin" filter="s60" introduced="^4" plugin="Y">
+<unit bldFile="mw/btservices/atcommands/lccustomplugin/group"/>
+</component>
+</collection>
+<collection name="cbsatplugin" long-name="CBS AT Plugin">
+<component name="atmisccmdplugin" long-name="AT Misc Commands Plugin" filter="s60" introduced="^4" plugin="Y">
+<unit bldFile="mw/btservices/cbsatplugin/atmisccmdplugin/group"/>
+</component>
+</collection>
+<collection name="btservices_info" long-name="BT Services Info" level="plugin">
+<component name="btservices_metadata" long-name="BT Services Metadata" introduced="^3" purpose="development" class="config PC">
+<unit mrp="mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="usbservices" level="generic" long-name="USB Services" levels="framework server generic specific plugin">
+<collection name="usbservices_plat" long-name="USB Services Platform Interfaces" level="plugin">
+<component name="pictbridge_api" long-name="PictBridge API" filter="s60" class="api">
+<unit bldFile="mw/usbservices/usbservices_plat/pictbridge_api/group"/>
+</component>
+<component name="ptp_responder_api" long-name="PTP Responder API" filter="s60" class="api">
+<unit bldFile="mw/usbservices/usbservices_plat/ptp_responder_api/group"/>
+</component>
+<component name="ptp_transport_api" long-name="PTP Transport API" filter="s60" class="api">
+<unit bldFile="mw/usbservices/usbservices_plat/ptp_transport_api/group"/>
+</component>
+<component name="usb_device_control_plugin_api" long-name="USB Device Control Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/usbservices/usbservices_plat/usb_device_control_plugin_api/group"/>
+</component>
+<component name="usb_notifier_api" long-name="USB Notifier API" filter="s60" class="api">
+<unit bldFile="mw/usbservices/usbservices_plat/usb_notifier_api/group"/>
+</component>
+<component name="usb_personality_api_header" long-name="USB Personality API" filter="s60" class="api">
+<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_api_header/group"/>
+</component>
+<component name="usb_personality_plugin_api" long-name="USB Personality Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/usbservices/usbservices_plat/usb_personality_plugin_api/group"/>
+</component>
+<component name="usb_secondary_display_api" long-name="USB Secondary Display API" filter="s60" class="api">
+<unit bldFile="mw/usbservices/usbservices_plat/usb_secondary_display_api/group"/>
+</component>
+<component name="usb_watcher_api" long-name="USB Watcher API" filter="s60" class="api">
+<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_api/group"/>
+</component>
+<component name="usb_watcher_info_api_header" long-name="USB Watcher Info API" filter="s60" class="api">
+<unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_info_api_header/group"/>
+</component>
+</collection>
+<collection name="usbengines" long-name="USB Engines" level="generic">
+<component name="usbotgwatcher" filter="s60" long-name="USB OTG Watcher">
+<unit bldFile="mw/usbservices/usbengines/usbotgwatcher/group"/>
+</component>
+<component name="usbwatcher" filter="s60" long-name="USB Watcher">
+<unit bldFile="mw/usbservices/usbengines/usbwatcher/group"/>
+</component>
+<component name="usblocodplugin" filter="s60" long-name="USB Local Connectivity Domain Plugin" plugin="Y">
+<unit bldFile="mw/usbservices/usbengines/usblocodplugin/group"/>
+</component>
+<component name="usbdevcon" filter="s60" long-name="USB Device Control">
+<unit bldFile="mw/usbservices/usbengines/usbdevcon/group"/>
+</component>
+<component name="usbremotepersonality" filter="s60" long-name="USB Remote Personality">
+<unit bldFile="mw/usbservices/usbengines/usbremotepersonality/group"/>
+</component>
+</collection>
+<collection name="usbclasses" long-name="USB Classes" level="framework">
+<component name="usbobexclasscontroller" filter="s60" long-name="USB OBEX Class Controller" plugin="Y">
+<unit bldFile="mw/usbservices/usbclasses/usbobexclasscontroller/group"/>
+</component>
+<component name="usbbasicpersonality" filter="s60" long-name="USB Basic Personality" plugin="Y">
+<unit bldFile="mw/usbservices/usbclasses/usbbasicpersonality/group"/>
+</component>
+<component name="usbmscpersonality" filter="s60" long-name="USB MSC Personality" plugin="Y">
+<unit bldFile="mw/usbservices/usbclasses/usbmscpersonality/group"/>
+</component>
+<!-- commented out in bld.inf. Should this be deleted?
+ <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
+ <unit bldFile="usbclasses/ptpstack/group"/>
+ </component>
+ <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
+ <unit bldFile="usbclasses/sicdusbplugin/group"/>
+ </component>
+ <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
+ <unit bldFile="usbclasses/ptpserver/group"/>
+ </component>-->
+<component name="pictbridgeengine" filter="s60" long-name="PictBridge Engine">
+<unit bldFile="mw/usbservices/usbclasses/pictbridgeengine/group"/>
+</component>
+<component name="usbphoneasmodem" filter="s60" long-name="USB Phone as Modem" introduced="^3">
+<unit bldFile="mw/usbservices/usbclasses/usbphoneasmodem/group"/>
+</component>
+</collection>
+<collection name="usbuis" long-name="USB UIs" level="specific">
+<component name="usbui" filter="s60" long-name="USB UI">
+<unit bldFile="mw/usbservices/usbuis/usbui/group"/>
+</component>
+<component name="usbuinotif" filter="s60" long-name="USB UI Notifiers">
+<unit bldFile="mw/usbservices/usbuis/usbuinotif/group"/>
+</component>
+<component name="imageprintuiprovider" filter="s60" long-name="ImagePrint UI Provider" plugin="Y">
+<unit bldFile="mw/usbservices/usbuis/imageprintuiprovider/group"/>
+</component>
+<component name="usbimageprintui" filter="s60" long-name="ImagePrint UI">
+<unit bldFile="mw/usbservices/usbuis/imageprintui/group"/>
+</component>
+<component name="usbuiqt" long-name="USB UI Qt" introduced="^4" filter="s60">
+<unit bldFile="mw/usbservices/usbuis/usbuiqt" proFile="usbapplication.pro"/>
+</component>
+</collection>
+<collection name="usbservices_test" long-name="USB Services Test" level="server"/>
+</block>
+<block name="shortlinkconn" level="generic" long-name="Shortlink Connectivity" levels="framework server generic specific plugin">
+<!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
+<collection name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" level="plugin">
+<component name="obex_service_utils_api" long-name="OBEX Service Utils API" filter="s60" class="api">
+<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_utils_api/group"/>
+</component>
+<component name="obex_service_plugin_api" long-name="OBEX Service Plugin API" filter="s60" class="api">
+<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_plugin_api/group"/>
+</component>
+<component name="dialup_connection_status_api" long-name="Dial-up Connection Status API" filter="s60" class="api">
+<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dialup_connection_status_api/group"/>
+</component>
+<component name="dun_secondary_display_notification_api" long-name="DUN Secondary Display Notification API" filter="s60" class="api">
+<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
+</component>
+<component name="obex_secondary_display_notification_api" long-name="OBEX Secondary Display Notification API" filter="s60" class="api">
+<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
+</component>
+<component name="generic_hid_api" long-name="Generic HID API" filter="s60" class="api">
+<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/generic_hid_api/group"/>
+</component>
+<component name="locod_bearer_plugin_api" long-name="Locod Bearer Plugin API" filter="s60" class="api">
+<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/locod_bearer_plugin_api/group"/>
+</component>
+<component name="usb_obexservicemanager_client_api" long-name="USB OBEX Service Manager Client API" filter="s60" class="api">
+<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_obexservicemanager_client_api/group"/>
+</component>
+</collection>
+<collection name="localconnectivityservice" long-name="Local Connectivity Service" level="server">
+<component name="locod" long-name="Local Connectivity Daemon">
+<unit bldFile="mw/shortlinkconn/localconnectivityservice/locod/group"/>
+</component>
+<component name="obexserviceman" long-name="OBEX Service Managar">
+<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
+</component>
+<component name="obexsendservices" long-name="OBEX Send Services">
+<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
+</component>
+<component name="obexreceiveservices" long-name="OBEX Receive Services">
+<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
+</component>
+<component name="dun" long-name="Dial Up Networking">
+<unit bldFile="mw/shortlinkconn/localconnectivityservice/dun/group"/>
+</component>
+<component name="generichid" long-name="Generic HID">
+<unit bldFile="mw/shortlinkconn/localconnectivityservice/generichid/group"/>
+</component>
+<component name="headset" long-name="Headset">
+<unit bldFile="mw/shortlinkconn/localconnectivityservice/headset/group"/>
+</component>
+</collection>
+</block>
+<block name="imghandling" level="specific" long-name="Image Handling" levels="lib util if">
+<collection name="imagehandling_plat" long-name="Image Handling Platform Interfaces" level="if">
+<component name="image_handling_library_api" long-name="Image Handling Library API" filter="s60" class="api">
+<unit bldFile="mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
+</component>
+<component name="3gp_library_api" long-name="3GP Library API" filter="s60" class="api">
+<unit bldFile="mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
+</component>
+<component name="thumbnailmanager_api" long-name="Thumbnail Manager API" filter="s60" class="api">
+<unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
+</component>
+</collection>
+<collection name="imagehandlinglib" long-name="Image Handling Library" level="lib">
+<!-- collection is really a component, need to move down a directory -->
+<component name="ihl" filter="s60" long-name="IHL">
+<unit bldFile="mw/imghandling/imagehandlinglib/group"/>
+</component>
+</collection>
+<collection name="imagehandlingutilities" long-name="Image Handling Utilities" level="util">
+<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager">
+<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
+</component>
+<component name="thumbnailmanagerqt" filter="s60" long-name="Thumbnail Manager Qt" introduced="^4">
+<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt" filter="!test" proFile="thumbnailmanagerqt.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+</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="media_fetch_api" long-name="Media Fetch API" filter="s60" class="api">
+<unit bldFile="mw/metadatasrv/metadatasrv_pub/media_fetch_api/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>
+</collection>
+<collection name="mediamanagementutilities" long-name="Media Management Utilities" level="generic">
+<component name="mediafetch" filter="s60" long-name="Media Fetch">
+<unit bldFile="mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
+</component>
+</collection>
+</block>
+<block name="mds" level="specific" long-name="Metadata Services" levels="mgr eng server int">
+<collection name="mds_plat" long-name="Metadata Services Platform Interfaces" level="int">
+<component name="context_engine_plugin_api" long-name="Context Engine Plugin API" introduced="^2" filter="s60" class="api">
+<unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/group" filter="!test"/>
+</component>
+<component name="harvester_framework_api" long-name="Harvester Framework API" introduced="^2" filter="s60" class="api">
+<unit bldFile="mw/mds/mds_plat/harvester_framework_api/group" filter="!test"/>
+<!-- can only have one unit with the same filter, #include the following from the previous unit -->
+</component>
+<component name="location_manager_api" long-name="Location Manager API" introduced="^2" filter="s60" class="api">
+<unit bldFile="mw/mds/mds_plat/location_manager_api/group" filter="!test"/>
+</component>
+<component name="metadata_engine_api" long-name="Metadata Engine API" introduced="^2" filter="s60" class="api">
+<unit bldFile="mw/mds/mds_plat/metadata_engine_api/group" filter="!test"/>
+</component>
+<component name="content_listing_framework_collection_manager_api" long-name="Content Listing Framework Collection Manager API" introduced="^2" filter="s60" class="api">
+<unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/group" filter="!test"/>
+</component>
+<component name="content_listing_framework_extended_api" long-name="Content Listing Framework Extended API" introduced="^2" filter="s60" class="api">
+<unit bldFile="mw/mds/mds_plat/content_listing_framework_extended_api/group"/>
+</component>
+</collection>
+<collection name="mds_pub" long-name="Metadata Services Public Interfaces" level="int">
+<component name="content_listing_framework_api" long-name="Content Listing Framework API" introduced="^2" filter="s60" class="api">
+<unit bldFile="mw/mds/mds_pub/content_listing_framework_api/group" filter="!test"/>
+</component>
+</collection>
+<collection name="metadataengine" long-name="Metadata Engine" level="eng">
+<component name="metadataengine_common" filter="s60" long-name="Metadata Engine Common" introduced="^2">
+<unit bldFile="mw/mds/metadataengine/common/group"/>
+</component>
+<component name="metadataengine_server" filter="s60" long-name="Metadata Engine Server" introduced="^2">
+<unit bldFile="mw/mds/metadataengine/server/group"/>
+</component>
+<component name="metadataengine_client" filter="s60" long-name="Metadata Engine Client" introduced="^2">
+<unit bldFile="mw/mds/metadataengine/client/group"/>
+</component>
+<component name="metadataengine_build" filter="s60" long-name="Metadata Engine Build" introduced="^2">
+<!--make this collection a single component, or split this bld.inf into the other units -->
+<unit bldFile="mw/mds/metadataengine/group"/>
+</component>
+</collection>
+<collection name="locationmanager" long-name="Location Manager" level="mgr">
+<component name="locationtrail" filter="s60" long-name="Location Trail" introduced="^2">
+<unit bldFile="mw/mds/locationmanager/locationtrail/group"/>
+</component>
+<component name="locationmanager_server" filter="s60" long-name="Location Manager Server" introduced="^2">
+<unit bldFile="mw/mds/locationmanager/server/group"/>
+</component>
+<component name="locationmanager_client" filter="s60" long-name="Location Manager Client" introduced="^2">
+<unit bldFile="mw/mds/locationmanager/client/group"/>
+</component>
+<component name="locationmanager_build" filter="s60" long-name="Location Manager Build" introduced="^2">
+<!--make this collection a single component, or split this bld.inf into the other units -->
+<unit bldFile="mw/mds/locationmanager/group"/>
+</component>
+</collection>
+<collection name="contextengine" long-name="Context Engine" level="eng">
+<component name="contextengine_plugins" filter="s60" long-name="Context Engine Plugins" introduced="^2" plugin="Y">
+<unit bldFile="mw/mds/contextengine/plugins/group"/>
+</component>
+<component name="contextengine_build" filter="s60" long-name="Context Engine Build" introduced="^2">
+<!--make this collection a single component, or make this unit self-contained -->
+<unit bldFile="mw/mds/contextengine/group"/>
+</component>
+</collection>
+<collection name="harvester" long-name="Harvester" level="eng">
+<component name="blacklistclient" filter="s60" long-name="Blacklist Client" introduced="^2">
+<unit bldFile="mw/mds/harvester/blacklistclient/group"/>
+</component>
+<component name="blacklistserver" filter="s60" long-name="Blacklist Server" introduced="^2">
+<unit bldFile="mw/mds/harvester/blacklistserver/group"/>
+</component>
+<component name="harvester_common" filter="s60" long-name="Harvester Common" introduced="^2">
+<unit bldFile="mw/mds/harvester/common/group"/>
+</component>
+<component name="composerplugins" filter="s60" long-name="Composer Plugins" introduced="^2" plugin="Y">
+<unit bldFile="mw/mds/harvester/composerplugins/group"/>
+</component>
+<component name="harvesterplugins" filter="s60" long-name="Harvester Plugins" introduced="^2" plugin="Y">
+<unit bldFile="mw/mds/harvester/harvesterplugins/group"/>
+</component>
+<component name="monitorplugins" filter="s60" long-name="Monitor Plugins" introduced="^2" plugin="Y">
+<unit bldFile="mw/mds/harvester/monitorplugins/group"/>
+</component>
+<component name="harvester_server" filter="s60" long-name="Harvester Server" introduced="^2">
+<unit bldFile="mw/mds/harvester/server/group"/>
+</component>
+<component name="harvester_client" filter="s60" long-name="Harvester Client" introduced="^2">
+<unit bldFile="mw/mds/harvester/client/group"/>
+</component>
+<component name="harvester_build" filter="s60" long-name="Harvester Build" introduced="^2">
+<!-- split these exports into the other components -->
+<unit bldFile="mw/mds/harvester/group"/>
+</component>
+</collection>
+<collection name="watchdog" long-name="Watchdog" level="server">
+<!-- collection is really a component. Move down a directory -->
+<component name="mdswatchdog" filter="s60" long-name="Metadata Watchdog" introduced="^2">
+<unit bldFile="mw/mds/watchdog/group"/>
+</component>
+</collection>
+<collection name="clfwrapper" long-name="Content Listing Framework Wrapper" level="int">
+<!-- collection is really a component. Move down a directory -->
+<component name="clfwrapper_build" filter="s60" long-name="CLF Wrapper Build" introduced="^2" class="placeholder">
+<!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
+<!--<unit bldFile="clfwrapper/group"/>-->
+</component>
+</collection>
+<collection name="mds_info" long-name="Metadata Services Info" level="int">
+<component name="mds_build" filter="s60" long-name="Metadata Services Build" introduced="^2">
+<!-- consider distributiing this into the rest of the components in the package -->
+<unit bldFile="mw/mds/group"/>
+</component>
+</collection>
+</block>
+<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"/>
+</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"/>
+</component>
+</collection>
+<collection name="videoscheduler" long-name="Video Scheduler" level="util">
+<!-- don't build these -->
+<component name="schedulerclient" filter="s60" long-name="Video Scheduler Client"/>
+<component name="schedulerserver" filter="s60" long-name="Video Scheduler Server"/>
+</collection>
+</block>
+<block name="mmmw" level="generic" long-name="Multimedia Middleware" levels="plugin framework server generic specific">
+<collection name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" level="specific">
+<component name="multimedia_data_source_api" long-name="Multimedia Data Source API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
+</component>
+<component name="progressive_download_api" long-name="Progressive Download API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/progressive_download_api/group"/>
+</component>
+<component name="equalizer_ui_api" long-name="Equalizer UI API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
+</component>
+<component name="enhanced_media_client_api" long-name="Enhanced Media Client API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
+</component>
+<component name="stream_control_custom_command_api" long-name="Stream Control Custom Command API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
+</component>
+<component name="emc_buffer_source_api" long-name="EMC Buffer Source API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/emc_buffer_source_api/group"/>
+</component>
+<component name="emc_file_source_api" long-name="EMC File Source API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
+</component>
+<component name="audio_metadata_reader_api" long-name="Audio MetaData Reader API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
+</component>
+<component name="emc_progressive_download_source_api" long-name="EMC Progressive Download Source API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
+</component>
+<component name="emc_volume_effect_api" long-name="EMC Volume Effect API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
+</component>
+<component name="emc_balance_effect_api" long-name="EMC Balance Effect API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/emc_balance_effect_api/group"/>
+</component>
+<component name="emc_descriptor_source_api" long-name="EMC Descriptor Source API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/emc_descriptor_source_api/group"/>
+</component>
+<component name="emc_drm_config_intfc_api" long-name="EMC DRM Config Intfc API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
+</component>
+<component name="voip_audio_services_api" long-name="VoIP Audio Services" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/group"/>
+</component>
+<component name="configuration_components_factory_api" long-name="Configuration Components Factory API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
+</component>
+<component name="audio_output_control_utility_api" long-name="Audio Output Control Utility API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/group"/>
+</component>
+<component name="audio_output_control_utility_proxy_api" long-name="Audio Output Control Utility Proxy API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
+</component>
+<component name="emc_audio_effects_api" long-name="EMC Audio Effects API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
+</component>
+<component name="call_audio_control_api" long-name="Call AudioControl API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/group"/>
+</component>
+<component name="radio_utilities_api" long-name="Radio Utilities API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/group"/>
+</component>
+<component name="radio_preset_utilities_api" long-name="Radio Preset Utilities API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
+</component>
+<component name="radio_monitor_api" long-name="Radio Monitor API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
+</component>
+<component name="thumbnail_engine_api" long-name="Thumbnail Engine API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/thumbnail_engine_api/group"/>
+</component>
+<component name="telephony_multimedia_service_api" long-name="Telephony Multimedia Service API" filter="s60" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
+</component>
+<component name="openmax_al_api" long-name="OpenMAX AL API" filter="s60" introduced="^4" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/openmax_al_api/group"/>
+</component>
+<component name="system_tone_service_api" long-name="System Tone Service API" filter="s60" introduced="^4" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/system_tone_service_api/group"/>
+</component>
+</collection>
+<collection name="mmfenh" long-name="MMF Enhancements" level="generic">
+<component name="advancedaudiocontroller" filter="s60" long-name="Advanced Audio Controllers" plugin="Y">
+<unit bldFile="mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
+</component>
+<component name="audiooutputcontrolutility" filter="s60" long-name="Audio Output Control Utility">
+<unit bldFile="mw/mmmw/mmfenh/audiooutputcontrolutility/group"/>
+</component>
+<component name="configurationcomponentsfactory" filter="s60" long-name="Configuration Components Factory">
+<unit bldFile="mw/mmmw/mmfenh/configurationcomponentsfactory/group"/>
+</component>
+<component name="enhancedaudioplayerutility" filter="s60" long-name="Enhanced Audio Player Utility">
+<unit bldFile="mw/mmmw/mmfenh/enhancedaudioplayerutility/group"/>
+</component>
+<component name="enhancedmediaclient" filter="s60" long-name="Enhanced Media Client">
+<unit bldFile="mw/mmmw/mmfenh/enhancedmediaclient/group"/>
+</component>
+<component name="profilesettingsmonitor" filter="s60" long-name="Profile Settings Monitor">
+<unit bldFile="mw/mmmw/mmfenh/profilesettingsmonitor/group"/>
+</component>
+<component name="progressivedownload" filter="s60" long-name="Progressive Download">
+<unit bldFile="mw/mmmw/mmfenh/progressivedownload/group"/>
+</component>
+</collection>
+<collection name="mm_fw" long-name="Multimedia Frameworks" level="framework">
+<!-- Id needs to be unique, mmfw already in use -->
+<!-- Placeholder for OpenAX AL and other stuff -->
+</collection>
+<collection name="mmserv" long-name="Multimedia Services" level="specific">
+<component name="audioeffectsui" filter="s60" long-name="Audio Effects UI">
+<unit bldFile="mw/mmmw/mmserv/audioeffectsui/group"/>
+</component>
+<component name="callaudiocontrol" filter="s60" long-name="Call Audio Control">
+<unit bldFile="mw/mmmw/mmserv/callaudiocontrol/group"/>
+</component>
+<component name="metadatautility" filter="s60" long-name="Metadata Utility">
+<unit bldFile="mw/mmmw/mmserv/metadatautility/group"/>
+</component>
+<component name="radioutility" filter="s60" long-name="Radio Utility">
+<unit bldFile="mw/mmmw/mmserv/radioutility/group"/>
+</component>
+<component name="thumbnailengine" filter="s60" long-name="Thumbnail Engine" introduced="^2">
+<unit bldFile="mw/mmmw/mmserv/thumbnailengine/group"/>
+</component>
+<component name="tms" filter="s60" long-name="Telephony Multimedia Service" introduced="^3">
+<unit bldFile="mw/mmmw/mmserv/tms/group"/>
+</component>
+<component name="voipaudioservices" filter="s60" long-name="VoIP Audio Services">
+<unit bldFile="mw/mmmw/mmserv/voipaudioservices/group"/>
+</component>
+<component name="lib3gpextparser" filter="s60" long-name="3GP Extension Metadata Parser Library">
+<unit bldFile="mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group"/>
+</component>
+<component name="sts" long-name="System Tone Service" filter="s60" introduced="^4">
+<unit bldFile="mw/mmmw/mmserv/sts/group"/>
+</component>
+</collection>
+<collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
+<component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="gstreamer" level="generic" long-name="GStreamer" levels="plugin core api">
+<!-- Uncomment all units when configuration is in place. All currently #included from gstreamer_build -->
+<!-- structure matches planned directory layout -->
+<collection name="gstreamerfw" long-name="GStreamer Framework" level="core">
+<component name="gstreamer_core" long-name="GStreamer Core" introduced="^3" class="placeholder">
+<!--<unit bldFile="gstreamer_core/group"/>-->
+</component>
+</collection>
+<collection name="gst_plugins" long-name="GStreamer Plugins" level="plugin">
+<component name="gst_plugins_base" long-name="GStreamer Base Plugins" introduced="^3" class="placeholder">
+<!--<unit bldFile="gst_plugins_base/group"/>-->
+</component>
+<component name="gst_plugins_good" long-name="GStreamer Good Plugins" introduced="^3" class="placeholder">
+<!--<unit bldFile="gst_plugins_good/group"/>-->
+</component>
+<component name="gst_plugins_symbian" filter="s60" long-name="GStreamer Sybmian Plugins" introduced="^3" class="placeholder">
+<!--<unit bldFile="gst_plugins_symbian/group" filter="!test"/>-->
+<!--<unit bldFile="gst_plugins_symbian/tsrc/GStreamerTestModule/group" filter="test,pref_test"/>-->
+</component>
+</collection>
+<collection name="gstregistrygenerator" long-name="GStreamer Registry Generator" level="core">
+<!-- collection is really a component. Move down an directory -->
+<component name="gstregistrygenerator_build" filter="s60" long-name="GStreamer Registry Generator Build" introduced="^3" class="placeholder">
+<!-- <unit bldFile="gstregistrygenerator/group"/>-->
+</component>
+</collection>
+<collection name="gst_test_apps" long-name="GStreamer Test Applications" level="api">
+<component name="gst_player" filter="s60" long-name="GStreamer Player" introduced="^3" purpose="development" class="placeholder">
+<!-- <unit bldFile="gst_test_apps/gst_player/group"/>-->
+</component>
+</collection>
+<collection name="gstreamer_info" long-name="GStreamer Info" level="api">
+<component name="gstreamer_build" filter="s60" long-name="GStreamer Build" introduced="^3">
+<!-- make this a ROM component or split up instead? -->
+<unit bldFile="mw/gstreamer/group"/>
+</component>
+</collection>
+</block>
+<block name="helix" level="generic" long-name="Helix" levels="plugin framework server generic specific">
+<collection name="helix_ren" long-name="Helix Engine" level="framework">
+<!-- what does "ren" stand for? -->
+<component name="helix_stub" filter="s60" long-name="Helix Stub" introduced="^2" class="api">
+<unit bldFile="mw/helix/helix_ren/helix_stub/group"/>
+</component>
+</collection>
+</block>
+<block name="camerasrv" level="specific" long-name="Camera Services" levels="plugin fw api">
+<collection name="camerasrv_plat" long-name="Camera Services Platform Interfaces" level="api">
+<component name="media_recorder_sink_api" long-name="Media Recorder Sink API" filter="s60" class="api">
+<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
+</component>
+<component name="custom_onboard_camera_api" long-name="Custom Onboard Camera API" filter="s60" class="api">
+<unit bldFile="mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
+</component>
+<component name="imaging_configuration_manager_api" long-name="Imaging Configuration Manager API" filter="s60" class="api">
+<unit bldFile="mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
+</component>
+<component name="media_recorder_api" long-name="Media Recorder API" filter="s60" class="api">
+<unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_api/group" filter="!test"/>
+</component>
+<component name="3gp_file_composer_api" long-name="3GP File Composer API" filter="s60" class="api">
+<unit bldFile="mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
+</component>
+</collection>
+<collection name="camcordermmfplugin" long-name="Camcorder MMF Plugin" level="plugin">
+<!-- collection is really a component. Should move down a directory -->
+<component name="camcordermmfplugin_build" filter="s60" long-name="Camcorder MMF Plugin Build" plugin="Y">
+<unit bldFile="mw/camerasrv/camcordermmfplugin/build"/>
+</component>
+</collection>
+<collection name="configmanagers" long-name="Config Managers" level="api">
+<component name="imagingconfigmanager" filter="s60" long-name="Imaging Config Manager">
+<unit bldFile="mw/camerasrv/configmanagers/imagingconfigmanager/group"/>
+</component>
+</collection>
+<collection name="camerasrv_info" long-name="Camera Services Info" level="api">
+<component name="camerasrv_build" filter="s60" long-name="Camera Services Build">
+<!-- should split into individual bld.infs -->
+<unit bldFile="mw/camerasrv/group"/>
+</component>
+</collection>
+</block>
+<block name="mmappfw" level="specific" long-name="Multimedia App Framework" levels="fw utils if">
+<collection name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" level="if">
+<component name="collection_helper_api" long-name="Collection Helper API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
+</component>
+<component name="harvester_collection_mediator_api" long-name="Harvester Collection Mediator API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/group"/>
+</component>
+<component name="harvester_metadata_extractor_api" long-name="Harvester Metadata Extractor API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/group"/>
+</component>
+<component name="harvester_server_api" long-name="Harvester Server API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_server_api/group"/>
+</component>
+<component name="harvester_utility_api" long-name="Harvester Utility API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/harvester_utility_api/group"/>
+</component>
+<component name="playlist_engine_api" long-name="Playlist Engine API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/playlist_engine_api/group"/>
+</component>
+<component name="mtp_keys_api" long-name="MTP Keys API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/mtp_keys_api/group"/>
+</component>
+<component name="mpx_collection_common_definition_api" long-name="MPX Collection Common Definition API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_common_definition_api/group"/>
+</component>
+<component name="mpx_collection_utility_api" long-name="MPX Collection Utility API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/group"/>
+</component>
+<component name="mpx_common_api" long-name="MPX Common API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_api/group"/>
+</component>
+<component name="mpx_common_definition_api" long-name="MPX Common Definition API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_definition_api/group"/>
+</component>
+<component name="mpx_playback_common_definition_api" long-name="MPX Playback Common Definition API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_common_definition_api/group"/>
+</component>
+<component name="mpx_playback_utility_api" long-name="MPX Playback Utility API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/group"/>
+</component>
+<component name="mpx_base_view_plugins_api" long-name="MPX Base View Plugins API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/group"/>
+</component>
+<component name="mpx_view_utility_api" long-name="MPX View Utility API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_view_utility_api/group"/>
+</component>
+<component name="mpx_albumart_utility_api" long-name="MPX Album Art Utility API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/group"/>
+</component>
+<component name="media_player_settings_engine_api" long-name="Media Player Settings Engine API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
+</component>
+<component name="mpx_backstepping_utility_api" long-name="MPX Backstepping Utility API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_backstepping_utility_api/group"/>
+</component>
+<component name="asx_parser_api" long-name="ASX Parser API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/asx_parser_api/group"/>
+</component>
+<component name="playback_helper_api" long-name="Playback Helper API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/playback_helper_api/group"/>
+</component>
+<component name="videoplaylist_utility_api" long-name="Video Playlist Utility API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/videoplaylist_utility_api/group"/>
+</component>
+</collection>
+<collection name="mpx" long-name="Multimedia Player" level="fw">
+<component name="commonframework" filter="s60" long-name="MPX Common Framework" introduced="^1">
+<unit bldFile="mw/mmappfw/mpx/commonframework/group"/>
+</component>
+<component name="playbackframework" filter="s60" long-name="MPX Playback Framework" introduced="^1">
+<unit bldFile="mw/mmappfw/mpx/playbackframework/group"/>
+</component>
+<component name="mpxcollectionfw" filter="s60" long-name="MPX Collection Framework" introduced="^1">
+<unit bldFile="mw/mmappfw/mpx/collectionframework/group"/>
+</component>
+<component name="mpxviewfw" filter="s60" long-name="MPX View Framework" introduced="^1">
+<unit bldFile="mw/mmappfw/mpx/viewframework/group"/>
+</component>
+<component name="mpxviewframeworkqt" long-name="MPX View Framework Qt" filter="s60">
+<unit bldFile="mw/mmappfw/mpx/mpxviewframeworkqt" proFile="mpxviewframeworkqt.pro" qmakeArgs="-r -config rom"/>
+</component>
+<component name="mpx_build" filter="s60" long-name="MPX Build" introduced="^1">
+<!-- Move the export to another component or remove the #includes from this one -->
+<unit bldFile="mw/mmappfw/mpx/group"/>
+</component>
+</collection>
+<collection name="mmappcomponents" long-name="Multimedia App Components" level="utils">
+<component name="mmappcomponents_build" filter="s60" long-name="Multimedia App Components Build" introduced="^1">
+<!-- needed for #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
+ Can remove this once configuration is in place-->
+<unit bldFile="mw/mmappfw/mmappcomponents/group"/>
+</component>
+<component name="collectionhelper" filter="s60" long-name="Media Player Collection Helper" introduced="^1">
+<unit bldFile="mw/mmappfw/mmappcomponents/collectionhelper/group"/>
+</component>
+<component name="playlistengine" filter="s60" long-name="Playlist Engine" introduced="^1">
+<unit bldFile="mw/mmappfw/mmappcomponents/playlistengine/group"/>
+</component>
+<component name="mpxharvester" filter="s60" long-name="Media Player Harvester" introduced="^1">
+<unit bldFile="mw/mmappfw/mmappcomponents/harvester/group"/>
+</component>
+<component name="mmappcommonui" filter="s60" long-name="Multimedia App Common UI" introduced="^1">
+<unit bldFile="mw/mmappfw/mmappcomponents/mmappcommonui/group"/>
+</component>
+<component name="mediaplayersettingsengine" filter="s60" long-name="Media Player Settings Engine" introduced="^1">
+<unit bldFile="mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
+</component>
+<component name="audiofetcher" filter="s60" long-name="Audio Fetcher" introduced="^1" plugin="Y">
+<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
+<!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
+</component>
+<component name="asxparser" filter="s60" long-name="ASX Parser" introduced="^1">
+<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
+<!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
+</component>
+<component name="playbackhelper" filter="s60" long-name="Playback Helper" introduced="^3">
+<unit bldFile="mw/mmappfw/mmappcomponents/playbackhelper/group"/>
+</component>
+<component name="videoplaylistutility" filter="s60" long-name="Video Playlist Utility" introduced="^3">
+<unit bldFile="mw/mmappfw/mmappcomponents/videoplaylistutility/group"/>
+</component>
+<component name="mmmtpdataprovider" filter="s60" long-name="Multimedia MTP Data Provider" introduced="^3">
+<unit bldFile="mw/mmappfw/mmappcomponents/mmmtpdataprovider/group"/>
+</component>
+</collection>
+<collection name="mmappfw_info" long-name="Multimedia App Framework Info" level="if">
+<component name="mmappfw_build" filter="s60" long-name="Multimedia App Framework Build" introduced="^1">
+<!-- Move the export to another component or remove the #includes from this one -->
+<unit bldFile="mw/mmappfw/group"/>
+</component>
+<component name="mmappfw_test" filter="s60,test,api_test,pref_test" long-name="Multimedia App Framework Test" purpose="development" introduced="^1"/>
+</collection>
+</block>
+<block name="hgwidgets" level="specific" long-name="HG Widgets" levels="framework service api">
+<collection name="hgwidgets_plat" long-name="HG Widgets Platform Interfaces" level="api">
+<component name="ganeswidgets_api" long-name="Ganes Widgets API" introduced="^4" class="api placeholder">
+<!-- should separate out unit -->
+</component>
+</collection>
+<collection name="hgwidgets_pub" long-name="HG Widgets Public Interfaces" level="api"/>
+<collection name="ganeswidgets" long-name="Ganes Widgets" level="service">
+<!-- really a component, should move down a dir level and have a unit -->
+<component name="ganeswidgets_build" long-name="Ganes Widgets Build" introduced="^4" class="placeholder">
+<!-- should separate out unit -->
+</component>
+</collection>
+<collection name="hgwidgets_info" long-name="HG Widgets Info" level="framework">
+<component name="hgwidgets_build" long-name="HG Widgets Build" introduced="^4">
+<unit bldFile="mw/hgwidgets" proFile="hgwidgets.pro"/>
+</component>
+</collection>
+</block>
+<block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework api">
+<collection name="inputmethods_pub" long-name="Input Methods Public Interfaces" level="api">
+<component name="ptiengine_iti_api" long-name="PTI Engine API" filter="s60" class="api">
+<unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
+</component>
+<component name="optical_character_recognition_api" long-name="Optical Character Recognition API" filter="s60" class="api">
+<unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
+</component>
+<component name="input_language_info_api" long-name="Input Language Info API" filter="s60" class="api">
+<unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
+</component>
+</collection>
+<collection name="inputmethods_plat" long-name="Input Methods Platform Interfaces" level="api">
+<component name="pen_input_server_api" long-name="Pen Input Server API" filter="s60" class="api">
+<unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/group"/>
+</component>
+<component name="ptiengine_hwr_api" long-name="PTI Engine Handwriting Recognition API" filter="s60" class="api">
+<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group"/>
+</component>
+<component name="aknfep_settings_api" long-name="Avkon FEP Settings API" filter="s60" class="api">
+<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
+</component>
+<component name="aknfep_status_api" long-name="Avkon FEP Status API" filter="s60" class="api">
+<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
+</component>
+<component name="ptiengine_key_definations_api" long-name="PTI Engine Key Definitions API" filter="s60" class="api">
+<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
+</component>
+<component name="aknfep_definitions_api" long-name="Avkon FEP Definitions API" filter="s60" class="api">
+<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
+</component>
+<component name="aknfep_pen_support_api" long-name="Avkon FEP Pen Support API" filter="s60" class="api">
+<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
+</component>
+<component name="ptiengine_indic_definitions_api" long-name="PTI Engine Indic Definitions API" filter="s60" class="api">
+<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
+</component>
+<component name="aknfep_uiinterface_api" long-name="Avkon FEP UI Interface API" filter="s60" class="api">
+<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group"/>
+</component>
+</collection>
+<collection name="textinput" long-name="Text Input" level="framework">
+<component name="ptienginev2" filter="s60" long-name="Predictive Text Input Engine">
+<!--uncomment when configuration is turned on and textinput_build is removed-->
+<!-- <unit bldFile="textinput/ptienginev2/group"/>-->
+</component>
+<component name="akninputlanguage" filter="s60" long-name="Avkon Input Language">
+<unit bldFile="mw/inputmethods/textinput/akninputlanguage/group"/>
+</component>
+<component name="peninputarc" filter="s60" long-name="Pen Input Arc">
+<unit bldFile="mw/inputmethods/textinput/peninputarc/group"/>
+</component>
+<component name="peninputcommonctrls" filter="s60" long-name="Pen Input Common Controls">
+<unit bldFile="mw/inputmethods/textinput/peninputcommonctrls/group"/>
+</component>
+<component name="peninputcommonlayout" filter="s60" long-name="Pen Input Common Layout">
+<unit bldFile="mw/inputmethods/textinput/peninputcommonlayout/group"/>
+</component>
+<component name="peninputhwrtrui" filter="s60" long-name="Pen Input Handwriting Recognition Training UI" introduced="^3" plugin="Y">
+<unit bldFile="mw/inputmethods/textinput/peninputhwrtrui/group"/>
+</component>
+<component name="textinput_build" filter="s60" long-name="Text Input Build">
+<!--needed for #ifdef, can be removed when configuration is implemented -->
+<unit bldFile="mw/inputmethods/textinput/group"/>
+</component>
+</collection>
+<collection name="fep" long-name="FEP" level="engine">
+<component name="aknfep" filter="s60" long-name="Avkon FEP" plugin="Y">
+<unit bldFile="mw/inputmethods/fep/aknfep/group"/>
+</component>
+<component name="frontendprocessor" long-name="Front End Processor" purpose="mandatory">
+<unit bldFile="mw/inputmethods/fep/frontendprocessor/group" mrp="mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
+</component>
+</collection>
+<collection name="inputmethods_info" long-name="Input Methods Info" level="api">
+<component name="inputmethods_metadata" long-name="Input Methods Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="qt" level="generic" long-name="Qt" levels="tool mw app">
+<collection name="qtconf" long-name="Qt Config" level="tool">
+<component name="qt_deviceconfiguration" long-name="Qt Device Configuration" filter="qt_tools" introduced="^2" class="config tool">
+<unit bldFile="mw/qt/src/s60installs/deviceconfiguration"/>
+</component>
+</collection>
+<collection name="qt_info" long-name="Qt Info" level="mw">
+<component name="qt_build" long-name="Qt Build" introduced="^2">
+<unit bldFile="mw/qt" proFile="projects.pro" qmakeArgs="-r -config sgimagelite_support"/>
+</component>
+</collection>
+<collection name="qtdemos" long-name="Qt Demos" level="app">
+<component name="qtdemos_build" long-name="Qt Demos Build" introduced="^2" filter="qtdemos">
+<unit bldFile="mw/qt/demos" proFile="demos.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+<collection name="qtexamples" long-name="Qt Examples" level="app">
+<component name="qtexamples_build" long-name="Qt Examples Build" introduced="^2" filter="qtexamples">
+<unit bldFile="mw/qt/examples" proFile="examples.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+<collection name="qt_tests" long-name="Qt Tests" level="app"/>
+</block>
+<block name="qtextensions" level="generic" long-name="Qt Extensions" levels="tool mw app">
+<collection name="qtecomplugins" long-name="Qt ECom Plugins" level="app">
+<component name="qtecomplugins_build" filter="qtecomplugins" long-name="Qt ECom Plugin" purpose="development" introduced="^4" plugin="Y">
+<unit bldFile="mw/qtextensions/qtecomplugins" proFile="qtecomplugins.pro" qmakeArgs="-r"/>
+</component>
+<component name="qtextensions_examples" filter="qtextensionsexamples" long-name="Qt ECom Plugin Examples" purpose="development" introduced="^4">
+<unit bldFile="mw/qtextensions/qtecomplugins/examples" proFile="examples.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+<collection name="qthighway" long-name="Qt Highway" level="app">
+<component name="qthighway_build" filter="qthighway" long-name="Qt Highway" purpose="development" introduced="^4">
+<unit bldFile="mw/qtextensions/qthighway" proFile="qthighway.pro" qmakeArgs="-r"/>
+</component>
+<component name="qthighway_examples" filter="qtextensionsexamples" long-name="Qt Highway Examples" purpose="development" introduced="^4">
+<unit bldFile="mw/qtextensions/qthighway/examples" proFile="examples.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+<collection name="qtmobileextensions" long-name="Qt Mobile Extensions" level="app">
+<component name="qtmobileextensions_build" filter="qtextension" long-name="Qt Mobile Extensions" purpose="development" introduced="^4">
+<unit bldFile="mw/qtextensions/qtmobileextensions" proFile="qtmobileextensions.pro" qmakeArgs="-r"/>
+</component>
+<component name="qtmobileextensions_examples" filter="qtextensionsexamples" long-name="Qt Mobile Extensions Examples" purpose="development" introduced="^4">
+<unit bldFile="mw/qtextensions/qtmobileextensions/examples" proFile="examples.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+<collection name="qtmobility" long-name="Qt Mobility" level="mw">
+<component name="qtmobility_build" filter="qtmobility" long-name="Qt Mobility" purpose="development" introduced="^4">
+<unit bldFile="mw/qtextensions/qtmobility" proFile="qtmobility.pro" qmakeArgs="-r"/>
+</component>
+<component name="qtmobility_examples" filter="qtextensionsexamples" long-name="Qt Mobility Examples" purpose="development" introduced="^4">
+<unit bldFile="mw/qtextensions/qtmobility/examples" proFile="examples.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+<collection name="qhbstyle" level="mw" long-name="Qt Orbit Style">
+<component name="qhbstyle_build" long-name="Qt Orbit Style Build" introduced="^4">
+<unit bldFile="mw/qtextensions/qhbstyle" qmakeArgs="-r" proFile="qhbstyle.pro"/>
+</component>
+</collection>
+<collection name="qtextensions_info" long-name="Qt Extensions Info" level="app">
+<component name="qtextensions_conf" long-name="Qt Extensions Confgure" introduced="^4" filter="qt_tools" class="conf">
+<unit bldFile="mw/qtextensions/group"/>
+</component>
+<component name="qtextensions_build" long-name="Qt Extensions Build" introduced="^4">
+<!-- break this up into the above collections-->
+<unit bldFile="mw/qtextensions" proFile="qtextensions.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+</block>
+<block name="hb" level="generic" long-name="Orbit" levels="engine test api">
+<collection name="hb_info" long-name="Orbit Info" level="api">
+<component name="hb_build" long-name="Orbit Build" introduced="^4">
+<!-- should break this down into actual components -->
+<unit bldFile="mw/hb" proFile="hb.pro" qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
+</component>
+</collection>
+</block>
+<block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
+<collection name="classicui_plat" long-name="Classic UI Platform Interfaces" level="specific">
+<component name="personalisation_framework_api" long-name="Personalisation Framework API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/personalisation_framework_api/group"/>
+</component>
+<component name="signal_pane_api" long-name="Signal Pane API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
+</component>
+<component name="japanese_reading_api" long-name="Japanese Reading API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/japanese_reading_api/group" filter="!test"/>
+</component>
+<component name="global_popup_priority_controller_api" long-name="Global Popup Priority Controller API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
+</component>
+<component name="item_finder_api" long-name="Item Finder API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/item_finder_api/group" filter="!test"/>
+</component>
+<component name="avkon_fonts_api" long-name="Avkon Fonts API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/avkon_fonts_api/group" filter="!test"/>
+</component>
+<component name="extended_utilities_api" long-name="Extended Utilities API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
+</component>
+<component name="personalisation_plugin_api" long-name="Personalisation Plugin API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
+</component>
+<component name="extended_aiw_criteria_api" long-name="Extended AIW Criteria API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
+</component>
+<component name="personalisation_application_api" long-name="Personalisation Application API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/personalisation_application_api/group"/>
+</component>
+<component name="volume_popup_api" long-name="Volume Popup API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
+</component>
+<component name="avkon_secondary_display_support_api" long-name="AVKON Secondary Display Support API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_support_api/group" filter="!test"/>
+</component>
+<component name="extended_setting_pages_api" long-name="Extended Setting Pages API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_setting_pages_api/group" filter="!test"/>
+</component>
+<component name="extended_lists_api" long-name="Extended Lists API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_lists_api/group" filter="!test"/>
+</component>
+<component name="input_block_api" long-name="Input Block API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/input_block_api/group" filter="!test"/>
+</component>
+<component name="avkon_ui_server_api" long-name="AVKON UI Server API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/avkon_ui_server_api/group" filter="!test"/>
+</component>
+<component name="number_grouping_api" long-name="Number Grouping API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/number_grouping_api/group" filter="!test"/>
+</component>
+<component name="extended_status_pane_api" long-name="Extended Status Pane API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_status_pane_api/group" filter="!test"/>
+</component>
+<component name="extended_notifiers_api" long-name="Extended Notifiers API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_notifiers_api/group" filter="!test"/>
+</component>
+<component name="task_list_api" long-name="Task List API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
+</component>
+<component name="personalisation_slide_show_dialog_api" long-name="Personalisation Slide Show Dialog API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
+</component>
+<component name="key_event_utilities_api" long-name="Key Event Utilities API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/key_event_utilities_api/group"/>
+</component>
+<component name="emergency_call_support_api" long-name="Emergency Call Support API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/emergency_call_support_api/group" filter="!test"/>
+</component>
+<component name="extended_dialogs_api" long-name="Extended Dialogs API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_dialogs_api/group"/>
+</component>
+<component name="legacy_ui_framework_headers_api" long-name="Legacy UI Framework Headers API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/legacy_ui_framework_headers_api/group"/>
+</component>
+<component name="extended_editors_api" long-name="Extended Editors API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_editors_api/group" filter="!test"/>
+</component>
+<component name="alarm_api" long-name="Alarm API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/alarm_api/group" filter="!test"/>
+</component>
+<component name="aiw_service_interface_base_api" long-name="AIW Service Interface Base API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_base_api/group" filter="!test"/>
+</component>
+<component name="list_effects_api" long-name="List Effects API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/list_effects_api/group" filter="!test"/>
+</component>
+<component name="find_item_ui_api" long-name="Find Item UI API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/find_item_ui_api/group" filter="!test"/>
+</component>
+<component name="server_application_services_api" long-name="Server Application Services API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/server_application_services_api/group" filter="!test"/>
+</component>
+<component name="common_ui_settings_api" long-name="Common UI Settings API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/common_ui_settings_api/group"/>
+</component>
+<component name="aiw_service_interface_menu_api" long-name="AIW Service Interface Menu API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_menu_api/group" filter="!test"/>
+</component>
+<component name="eikon_server_extension_client_api" long-name="EIKON Server Extension Client API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/eikon_server_extension_client_api/group" filter="!test"/>
+</component>
+<component name="skinnable_clock_api" long-name="Skinnable Clock API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/skinnable_clock_api/group" filter="!test"/>
+</component>
+<component name="battery_pane_api" long-name="Battery Pane API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/battery_pane_api/group" filter="!test"/>
+</component>
+<component name="fep_document_navigation_api" long-name="FEP Document Navigation API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
+</component>
+<component name="personalisation_localised_texts_api" long-name="Personalisation Localised Texts API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
+</component>
+<component name="memory_card_ui_api" long-name="Memory Card UI API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
+</component>
+<component name="avkon_status_api" long-name="AVKON Status API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/avkon_status_api/group"/>
+</component>
+<component name="application_switching_api" long-name="Application Switching API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/application_switching_api/group" filter="!test"/>
+</component>
+<component name="avkon_localised_texts_api" long-name="AVKON Localised Texts API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/avkon_localised_texts_api/group"/>
+</component>
+<component name="avkon_secondary_display_api" long-name="AVKON Secondary Display API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_api/group"/>
+</component>
+<component name="extended_animation_api" long-name="Extended Animation API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_animation_api/group" filter="!test"/>
+</component>
+<component name="extended_notes_api" long-name="Extended Notes API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_notes_api/group" filter="!test"/>
+</component>
+<component name="text_scroller_api" long-name="Text Scroller API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/text_scroller_api/group" filter="!test"/>
+</component>
+<component name="custom_cursors_api" long-name="Custom Cursors API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/custom_cursors_api/group" filter="!test"/>
+</component>
+<component name="global_window_priorities_api" long-name="Global Window Priorities API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/global_window_priorities_api/group"/>
+</component>
+<component name="extended_indicators_api" long-name="Extended Indicators API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_indicators_api/group" filter="!test"/>
+</component>
+<component name="special_character_table_api" long-name="Special Character Table API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/special_character_table_api/group" filter="!test"/>
+</component>
+<component name="avkon_settings_api" long-name="AVKON Settings API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/avkon_settings_api/group"/>
+</component>
+<component name="extended_sounds_api" long-name="Extended Sounds API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_sounds_api/group"/>
+</component>
+<component name="themes_settings_api" long-name="Themes Settings API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/themes_settings_api/group"/>
+</component>
+<component name="media_shared_document_api" long-name="Media Shared Document API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/media_shared_document_api/group" filter="!test"/>
+</component>
+<component name="extended_queries_api" long-name="Extended Queries API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_queries_api/group"/>
+</component>
+<component name="phone_number_text_utilities_api" long-name="Phone Number Text Utilities API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
+</component>
+<component name="extended_scroller_api" long-name="Extended Scroller API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_scroller_api/group"/>
+</component>
+<component name="key_rotator_api" long-name="Key Rotator API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/key_rotator_api/group" filter="!test"/>
+</component>
+<component name="extended_grids_api" long-name="Extended Grids API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_grids_api/group" filter="!test"/>
+</component>
+<component name="generic_parameter_api" long-name="Generic Parameter API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/generic_parameter_api/group" filter="!test"/>
+</component>
+<component name="indicator_touch_observer_api" long-name="Indicator Touch Observer API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/indicator_touch_observer_api/group"/>
+</component>
+<component name="popup_form_api" long-name="Popup Form API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/popup_form_api/group" filter="!test"/>
+</component>
+<component name="stylus_activated_popup_api" long-name="Stylus Activated Pop-up API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/stylus_activated_popup_api/group" filter="!test"/>
+</component>
+<component name="indicator_plugin_api" long-name="Indicator Plugin API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/indicator_plugin_api/group" filter="!test"/>
+</component>
+<component name="layout_configuration_api" long-name="Layout Configuration API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/layout_configuration_api/group" filter="!test"/>
+</component>
+<component name="common_file_dialogs_filter_factory_api" long-name="Common File Dialogs Filter Factory API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group" filter="!test"/>
+</component>
+<component name="avkon_anim_dll_api" long-name="AVKON Anim DLL API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/avkon_anim_dll_api/group"/>
+</component>
+<component name="extended_initialization_api" long-name="Extended Initialization API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_initialization_api/group" filter="!test"/>
+</component>
+<component name="long_tap_animation_api" long-name="Long Tap Animation API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/long_tap_animation_api/group" filter="!test"/>
+</component>
+<component name="extended_ui_framework_definitions_api" long-name="Extended UI Framework Definitions API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_ui_framework_definitions_api/group"/>
+</component>
+<component name="extended_buttons_api" long-name="Extended Buttons API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_buttons_api/group" filter="!test"/>
+</component>
+<component name="aiw_provider_utility_api" long-name="AIW Provider Utility API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/aiw_provider_utility_api/group" filter="!test"/>
+</component>
+<component name="transition_effect_parameters_api" long-name="Transition Effect Parameters API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/transition_effect_parameters_api/group" filter="!test"/>
+</component>
+<component name="extended_input_capabilities_api" long-name="Extended Input Capabilities API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_input_capabilities_api/group" filter="!test"/>
+</component>
+<component name="uikon_status_api" long-name="UIKON Status API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/uikon_status_api/group"/>
+</component>
+<component name="transition_effect_utilities_api" long-name="Transition Effect Utilities API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/transition_effect_utilities_api/group" filter="!test"/>
+</component>
+<component name="pointer_event_modifier_api" long-name="Pointer Event Modifier API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/pointer_event_modifier_api/group" filter="!test"/>
+</component>
+<component name="avkon_testability_api" long-name="AVKON Testability API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/avkon_testability_api/group"/>
+</component>
+<component name="ganes_api" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/ganes_api/group"/>
+</component>
+<component name="ode_api" long-name="Ode API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/ode_api/group"/>
+</component>
+<component name="physics_api" long-name="Physics API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/physics_api/group"/>
+</component>
+<component name="touch_pane_api" long-name="Touch Pane API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/touch_pane_api/group" filter="!test"/>
+</component>
+<component name="touch_pane_observer_api" long-name="Touch Pane Observer API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/touch_pane_observer_api/group"/>
+</component>
+<component name="alternate_fs_api" long-name="Alternate FS API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/alternate_fs_api/group"/>
+</component>
+<component name="discreet_popup_api" long-name="Discreet Popup API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/discreet_popup_api/group"/>
+</component>
+<component name="touch_gesture_framework_api" long-name="Touch Gesture Framework API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/touch_gesture_framework_api/group"/>
+<!-- should this be commented out? -->
+<!--<unit bldFile="classicui_plat/touch_gesture_framework_api/tsrc/group" filter="test,api_test"/> -->
+</component>
+<component name="extended_options_menu_api" long-name="Extended Options Menu API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
+</component>
+</collection>
+<collection name="classicui_pub" long-name="Classic UI Public Interfaces" level="specific">
+<component name="input_frame_api" long-name="Input Frame API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/input_frame_api/group" filter="!test"/>
+</component>
+<component name="window_server_event_observer_api" long-name="Window Server Event Observer API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/window_server_event_observer_api/group" filter="!test"/>
+</component>
+<component name="application_framework_api" long-name="Application Framework API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/application_framework_api/group" filter="!test"/>
+</component>
+<component name="scroller_api" long-name="Scroller API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/scroller_api/group" filter="!test"/>
+</component>
+<component name="ui_framework_utilities_api" long-name="UI Framework Utilities API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/ui_framework_utilities_api/group" filter="!test"/>
+</component>
+<component name="ui_framework_definitions_api" long-name="UI Framework Definitions API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/ui_framework_definitions_api/group" filter="!test"/>
+</component>
+<component name="buttons_api" long-name="Buttons API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/buttons_api/group" filter="!test"/>
+</component>
+<component name="queries_api" long-name="Queries API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/queries_api/group" filter="!test"/>
+</component>
+<component name="aiw_generic_parameter_api" long-name="AIW Generic Parameter API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/aiw_generic_parameter_api/group" filter="!test"/>
+</component>
+<component name="editors_api" long-name="Editors API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/editors_api/group" filter="!test"/>
+</component>
+<component name="common_file_dialogs_api" long-name="Common File Dialogs API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/common_file_dialogs_api/group" filter="!test"/>
+</component>
+<component name="dialog_shutter_api" long-name="Dialog Shutter API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/dialog_shutter_api/group" filter="!test"/>
+</component>
+<component name="fonts_api" long-name="Fonts API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/fonts_api/group" filter="!test"/>
+</component>
+<component name="screen_clearer_api" long-name="Screen Clearer API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/screen_clearer_api/group" filter="!test"/>
+</component>
+<component name="notifiers_api" long-name="Notifiers API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/notifiers_api/group" filter="!test"/>
+</component>
+<component name="notes_api" long-name="Notes API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/notes_api/group" filter="!test"/>
+</component>
+<component name="status_pane_api" long-name="Status Pane API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/status_pane_api/group" filter="!test"/>
+</component>
+<component name="base_controls_api" long-name="Base Controls API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/base_controls_api/group" filter="!test"/>
+</component>
+<component name="grids_api" long-name="Grids API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/grids_api/group" filter="!test"/>
+</component>
+<component name="context_pane_api" long-name="Context Pane API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/context_pane_api/group" filter="!test"/>
+</component>
+<component name="lists_api" long-name="Lists API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/lists_api/group" filter="!test"/>
+</component>
+<component name="popups_api" long-name="Popups API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/popups_api/group" filter="!test"/>
+</component>
+<component name="misc_controls_api" long-name="Misc Controls API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/misc_controls_api/group" filter="!test"/>
+</component>
+<component name="keylock_api" long-name="Keylock API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/keylock_api/group" filter="!test"/>
+</component>
+<component name="options_menu_api" long-name="Options Menu API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/options_menu_api/group" filter="!test"/>
+</component>
+<component name="hierarchical_lists_api" long-name="Hierarchical Lists API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/hierarchical_lists_api/group" filter="!test"/>
+</component>
+<component name="navigation_pane_api" long-name="Navigation Pane API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/navigation_pane_api/group" filter="!test"/>
+</component>
+<component name="tabs_api" long-name="Tabs API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/tabs_api/group" filter="!test"/>
+</component>
+<component name="title_pane_touch_observer_api" long-name="Title Pane Touch Observer API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/title_pane_touch_observer_api/group"/>
+</component>
+<component name="choice_list_api" long-name="Choice List API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/choice_list_api/group" filter="!test"/>
+</component>
+<component name="info_popup_note_api" long-name="Info Popup Note API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/info_popup_note_api/group" filter="!test"/>
+</component>
+<component name="setting_pages_api" long-name="Setting Pages API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/setting_pages_api/group" filter="!test"/>
+</component>
+<component name="screen_mode_api" long-name="Screen Mode API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/screen_mode_api/group" filter="!test"/>
+</component>
+<component name="indicators_api" long-name="Indicators API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/indicators_api/group" filter="!test"/>
+</component>
+<component name="error_ui_api" long-name="Error UI API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/error_ui_api/group" filter="!test"/>
+</component>
+<component name="animation_api" long-name="Animation API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/animation_api/group" filter="!test"/>
+</component>
+<component name="searchfield_api" long-name="Searchfield API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/searchfield_api/group" filter="!test"/>
+</component>
+<component name="labels_api" long-name="Labels API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/labels_api/group" filter="!test"/>
+</component>
+<component name="hotkeys_api" long-name="Hotkeys API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/hotkeys_api/group" filter="!test"/>
+</component>
+<component name="initialization_api" long-name="Initialization API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/initialization_api/group" filter="!test"/>
+</component>
+<component name="volume_control_api" long-name="Volume Control API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/volume_control_api/group" filter="!test"/>
+</component>
+<component name="title_pane_api" long-name="Title Pane API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/title_pane_api/group" filter="!test"/>
+</component>
+<component name="sounds_api" long-name="Sounds API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/sounds_api/group" filter="!test"/>
+</component>
+<component name="aiw_service_handler_api" long-name="AIW Service Handler API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/aiw_service_handler_api/group" filter="!test"/>
+</component>
+<component name="aiw_criteria_api" long-name="AIW Criteria API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/aiw_criteria_api/group" filter="!test"/>
+</component>
+<component name="touch_ui_utilities_api" long-name="Touch UI Utilities API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/touch_ui_utilities_api/group" filter="!test"/>
+</component>
+<component name="generic_button_api" long-name="Generic Button API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/generic_button_api/group" filter="!test"/>
+</component>
+<component name="form_api" long-name="Form API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/form_api/group" filter="!test"/>
+</component>
+<component name="uikon_core_controls" long-name="Uikon Core Controls" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/uikon_core_controls/group" filter="!test"/>
+</component>
+<component name="calendar_api" long-name="Calendar API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/calendar_api/group"/>
+</component>
+<component name="toolbar_api" long-name="Toolbar API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/toolbar_api/group" filter="!test"/>
+</component>
+<component name="server_application_api" long-name="Server Application API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/server_application_api/group"/>
+</component>
+<component name="slider_api" long-name="Slider API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/slider_api/group" filter="!test"/>
+</component>
+<component name="private_ui_framework_api" long-name="Private UI Framework API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/private_ui_framework_api/group" filter="!test"/>
+</component>
+<component name="dialogs_api" long-name="Dialogs API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/dialogs_api/group" filter="!test"/>
+</component>
+<component name="document_handler_api" long-name="Document handler API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/document_handler_api/group"/>
+</component>
+<component name="images_api" long-name="Images API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/images_api/group" filter="!test"/>
+</component>
+<component name="stylus_popup_menu_api" long-name="Stylus Pop-up Menu API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/stylus_popup_menu_api/group" filter="!test"/>
+</component>
+<component name="information_preview_popup_api" long-name="Information Preview Popup API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/information_preview_popup_api/group" filter="!test"/>
+</component>
+<component name="intermediate_state_api" long-name="Intermediate State API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/intermediate_state_api/group"/>
+</component>
+<component name="help_launcher_api" long-name="Help Launcher API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_pub/help_launcher_api/group"/>
+</component>
+</collection>
+<collection name="ode" long-name="Open Dynamics Engine" level="support">
+<!-- the collection is really a component. Move down a directory.-->
+<component name="ode_build" filter="s60" long-name="ODE">
+<unit bldFile="mw/classicui/ode/group"/>
+</component>
+</collection>
+<collection name="uifw" long-name="UI Framework" level="server">
+<component name="uiklaf" filter="s60" long-name="Uikon Look-and-Feel">
+<unit bldFile="mw/classicui/uifw/uiklaf/group"/>
+</component>
+<component name="eikctl" filter="s60" long-name="Eikon Controls">
+<unit bldFile="mw/classicui/uifw/eikctl/group"/>
+</component>
+<component name="avkon" filter="s60" long-name="Avkon">
+<!-- can only have one unit. Split into 3 components, or #include all from same bld.inf -->
+<unit bldFile="mw/classicui/uifw/avkon/aknphysics/group"/>
+<unit bldFile="mw/classicui/uifw/avkon/group"/>
+<unit bldFile="mw/classicui/uifw/avkon/aknconf/group"/>
+</component>
+<component name="eikstd" filter="s60" long-name="Eikon Standard">
+<unit bldFile="mw/classicui/uifw/eikstd/group"/>
+</component>
+<component name="aknglobalui" filter="s60" long-name="Avkon Global UI">
+<unit bldFile="mw/classicui/uifw/aknglobalui/group"/>
+</component>
+<component name="ganes" filter="s60" long-name="Ganes">
+<unit bldFile="mw/classicui/uifw/ganes/group"/>
+</component>
+</collection>
+<collection name="commonuis" long-name="Common UIs" level="specific">
+<component name="commonui" filter="s60" long-name="Common UI">
+<unit bldFile="mw/classicui/commonuis/commonui/group"/>
+</component>
+<component name="commondialogs" filter="s60" long-name="Common Dialogs">
+<unit bldFile="mw/classicui/commonuis/commondialogs/group"/>
+</component>
+</collection>
+<collection name="applicationinterworkingfw" long-name="Application Interworking Framework" level="generic">
+<component name="aifwservicehandler" filter="s60" long-name="Application Interworking Service Handler">
+<unit bldFile="mw/classicui/applicationinterworkingfw/servicehandler/group"/>
+</component>
+</collection>
+<collection name="psln" long-name="Personalization" level="specific">
+<!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
+<component name="psln_build" filter="s60" long-name="Personalization Build">
+<unit bldFile="mw/classicui/psln/group"/>
+</component>
+</collection>
+<collection name="commonadapter" long-name="Common Adapter" level="support">
+<!-- the collection is really a component. Move down a directory.-->
+<component name="commonadapter_build" filter="s60" long-name="Common Adapter Build">
+<unit bldFile="mw/classicui/commonadapter/group"/>
+</component>
+</collection>
+<collection name="akntouchgesturefw" long-name="Avkon Touch Gesture Framework" level="generic">
+<!-- the collection is really a component. Move down a directory.-->
+<component name="akntouchgesturefw_build" filter="s60" long-name="Avkon Touch Gesture Framework Build" introduced="^3">
+<unit bldFile="mw/classicui/akntouchgesturefw/group"/>
+</component>
+</collection>
+<collection name="uiutils" long-name="UI Utils" level="specific">
+<component name="localizer" filter="s60" long-name="Directory Localizer">
+<unit bldFile="mw/classicui/uiutils/localizer/group"/>
+</component>
+<component name="findutil" filter="s60" long-name="Find Utility">
+<unit bldFile="mw/classicui/uiutils/findutil/group"/>
+</component>
+<component name="gamerecognizer" filter="s60" long-name="Game Recognizer" plugin="Y">
+<unit bldFile="mw/classicui/uiutils/gamerecognizer/group"/>
+</component>
+<component name="aknjapanesereading" filter="s60" long-name="Avkon Japanese Reading">
+<unit bldFile="mw/classicui/uiutils/aknjapanesereading/group"/>
+</component>
+<component name="hlplch" long-name="Help Launcher" filter="s60,bldfirst">
+<unit bldFile="mw/classicui/uiutils/hlplch/group"/>
+</component>
+</collection>
+<collection name="commonuisupport" long-name="Common UI Support" level="support">
+<component name="uikon" long-name="Uikon" introduced="6.0" purpose="mandatory">
+<unit bldFile="mw/classicui/commonuisupport/uikon/group" mrp="mw/classicui/commonuisupport/uikon/group/app-framework_uikon.mrp"/>
+</component>
+<component name="errorresolverdata" long-name="Error Resolver Data" purpose="mandatory">
+<unit bldFile="mw/classicui/commonuisupport/errorresolverdata/group" mrp="mw/classicui/commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
+</component>
+<component name="uilaf" long-name="UI Look and Feel" introduced="6.0" purpose="mandatory">
+<unit bldFile="mw/classicui/commonuisupport/uilaf/GROUP" mrp="mw/classicui/commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
+</component>
+<component name="grid" long-name="Grid" purpose="optional">
+<unit bldFile="mw/classicui/commonuisupport/grid/group" mrp="mw/classicui/commonuisupport/grid/group/app-framework_grid.mrp"/>
+</component>
+<component name="uifwsdocs" long-name="UI Frameworks Documentation" purpose="development" class="doc">
+<unit mrp="mw/classicui/commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
+</component>
+</collection>
+<collection name="lafagnosticuifoundation" long-name="Look-and-Feel Agnostic UI Foundation" level="base">
+<component name="cone" long-name="Control Environment" purpose="mandatory">
+<unit bldFile="mw/classicui/lafagnosticuifoundation/cone/group" mrp="mw/classicui/lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
+</component>
+<component name="graphicseffects" long-name="Graphics Effects" introduced="9.2" purpose="optional">
+<unit bldFile="mw/classicui/lafagnosticuifoundation/graphicseffects/group" mrp="mw/classicui/lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
+</component>
+<component name="uigraphicsutils" long-name="UI Graphics Utilities" purpose="mandatory">
+<unit bldFile="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group" mrp="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
+</component>
+<component name="clockanim" long-name="Clock" purpose="optional" plugin="Y">
+<unit bldFile="mw/classicui/lafagnosticuifoundation/clockanim/group" mrp="mw/classicui/lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
+</component>
+<component name="bmpanimation" long-name="BMP Animation" introduced="6.0" purpose="optional">
+<unit bldFile="mw/classicui/lafagnosticuifoundation/bmpanimation/group" mrp="mw/classicui/lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
+</component>
+<component name="animation" long-name="Animation" introduced="9.1" purpose="optional">
+<unit bldFile="mw/classicui/lafagnosticuifoundation/animation/group" mrp="mw/classicui/lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
+</component>
+</collection>
+<collection name="classicui_info" long-name="Classic UI Info" level="specific">
+<!-- the multiple units in the API test components need to be resolved -->
+<component name="classicui_metadata" long-name="Classic UI Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="mw/classicui/classicui_info/classicui_metadata/classicui_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="svgt" level="generic" long-name="SVG Tiny" levels="util ui">
+<collection name="svgt_plat" long-name="SVG Tiny Platform Interfaces" level="ui">
+<component name="svgt_api" long-name="SVGT API" introduced="9.2" filter="s60" class="api">
+<unit bldFile="mw/svgt/svgt_plat/svgt_api/group"/>
+</component>
+<component name="nvg_api" long-name="NVG API" introduced="9.2" filter="s60" class="api">
+<unit bldFile="mw/svgt/svgt_plat/nvg_api/group"/>
+</component>
+</collection>
+<collection name="svgtopt" long-name="SVG-T Engine" level="util">
+<component name="svgtopt_build" filter="s60" long-name="SVG Engine" introduced="9.2">
+<!-- component is at collection level. Needs to be moved down a directory -->
+<unit bldFile="mw/svgt/svgtopt/group"/>
+</component>
+<component name="svgtplugin" filter="s60" long-name="SVG Plugin" introduced="9.2" plugin="Y">
+<unit bldFile="mw/svgt/svgtopt/svgtplugin/group"/>
+</component>
+</collection>
+</block>
+<block name="uiaccelerator" level="generic" long-name="UI Accelerator" levels="plugin framework server ex if">
+<collection name="uiaccelerator_plat" long-name="UI Accelerator Platform Interfaces" level="if">
+<component name="alf_core_toolkit_api" long-name="ALF Core Toolkit API" filter="s60" class="api">
+<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/group"/>
+</component>
+<component name="alf_visual_api" long-name="ALF Visual API" filter="s60" class="api">
+<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/group"/>
+</component>
+<component name="alf_extended_visual_api" long-name="ALF Extended Visual API" filter="s60" class="api">
+<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/group"/>
+</component>
+<component name="alf_extension_api" long-name="ALF Extension API" filter="s60" class="api">
+<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/group"/>
+</component>
+<component name="alf_tracing_api" long-name="ALF Tracing API" filter="s60" class="api">
+<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/group"/>
+</component>
+<component name="alf_client_server_api" long-name="ALF Client Server API" filter="s60" class="api">
+<unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/group"/>
+</component>
+</collection>
+<collection name="uiacceltk" long-name="UI Accelerator Toolkit" level="framework">
+<component name="hitchcock" filter="s60" long-name="Hitchcock">
+<unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/group"/>
+</component>
+<component name="uiacceltk_build" filter="s60" long-name="UI Accelerator Toolkit Build">
+<!-- move into the other component, or remove the #include and make this UI Accelerator Toolkit ROM-->
+<unit bldFile="mw/uiaccelerator/uiacceltk/group"/>
+</component>
+</collection>
+<collection name="uiaccelerator_test" long-name="UI Accelerator Test" level="ex"/>
+</block>
+<block name="uiresources" level="generic" long-name="UI Resources" levels="compile plugin framework server generic data">
+<!-- are the custom filters below needed? -->
+<collection name="uiresources_pub" long-name="UI Resources Public Interfaces" level="data">
+<component name="pictograph_api" long-name="Pictograph API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_pub/pictograph_api/group" filter="!test"/>
+</component>
+<component name="skins_api" long-name="Skins API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_pub/skins_api/group" filter="!test"/>
+</component>
+<component name="font_definition_api" long-name="Font Definition API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_pub/font_definition_api/group" filter="!test"/>
+</component>
+<component name="graphics_api" long-name="Graphics API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_pub/graphics_api/group" filter="!test"/>
+</component>
+<component name="scalable_icons_api" long-name="Scalable Icons API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_pub/scalable_icons_api/group"/>
+</component>
+<component name="layout_id_definitions_api" long-name="Layout ID Definitions API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_pub/layout_id_definitions_api/group"/>
+</component>
+</collection>
+<collection name="uiresources_plat" long-name="UI Resources Platform Interfaces" level="data">
+<component name="layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/layout_system_private_api/group" filter="!test"/>
+</component>
+<component name="layout_data_api" long-name="Layout Data API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/layout_data_api/group" filter="!test"/>
+</component>
+<component name="cdl_api" long-name="CDL API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/cdl_api/group" filter="!test"/>
+</component>
+<component name="extended_skins_api" long-name="Extended Skins API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/extended_skins_api/group" filter="!test"/>
+</component>
+<component name="tfx_server_controller_plugin_api" long-name="TFX Server Controller Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_controller_plugin_api/group"/>
+</component>
+<component name="extended_fonts_api" long-name="Extended Fonts API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/extended_fonts_api/group" filter="!test"/>
+</component>
+<component name="graphic_configuration_api" long-name="Graphic Configuration API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/graphic_configuration_api/group" filter="!test"/>
+</component>
+<component name="mif_header_cdl_api" long-name="MIF Header CDL API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/mif_header_cdl_api/group"/>
+</component>
+<component name="personalisation_and_skins_settings_api" long-name="Personalisation and Skins Settings API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/personalisation_and_skins_settings_api/group"/>
+</component>
+<component name="tfx_effect_setup_plugin_api" long-name="TFX Effect Setup Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/tfx_effect_setup_plugin_api/group"/>
+</component>
+<component name="mifconv_definitions_api" long-name="Mifconv Definitions API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/mifconv_definitions_api/group"/>
+</component>
+<component name="wallpaper_configuration_api" long-name="Wallpaper Configuration API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/wallpaper_configuration_api/group"/>
+</component>
+<component name="language_code_definitions_api" long-name="Language Code Definitions API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/language_code_definitions_api/group"/>
+</component>
+<component name="skins_image_attributes_api" long-name="Skins Image Attributes API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
+</component>
+<component name="private_user_area_code_definitions_api" long-name="Private User Area Code Definitions API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/private_user_area_code_definitions_api/group"/>
+</component>
+<component name="tfx_server_plugin_ids_api" long-name="TFX Server Plug-in IDs API" filter="s60" class="api">
+<unit bldFile="mw/uiresources/uiresources_plat/tfx_server_plugin_ids_api/group"/>
+</component>
+</collection>
+<collection name="uiresources_info" long-name="UI Resources Info" level="data">
+<component name="uiresources_test" filter="s60,test,api_test" long-name="UI Resources Tests" purpose="development"/>
+</collection>
+<collection name="uigraphics" long-name="UI Graphics" level="generic">
+<component name="bitmaps2" filter="s60" long-name="Bitmaps 2" class="config">
+<unit bldFile="mw/uiresources/uigraphics/bitmaps2/group"/>
+</component>
+<component name="icons" filter="s60" long-name="Icons" class="config">
+<unit bldFile="mw/uiresources/uigraphics/icons/group"/>
+</component>
+<component name="variatedbitmaps" filter="s60" long-name="Variated Bitmaps" class="config">
+<unit bldFile="mw/uiresources/uigraphics/variatedbitmaps/group"/>
+</component>
+<component name="aknicon" filter="s60" long-name="Avkon Icon Framework">
+<unit bldFile="mw/uiresources/uigraphics/aknicon/group"/>
+</component>
+<component name="nvgrenderstage" filter="sf_build" long-name="NVG Render Stage">
+<unit bldFile="mw/uiresources/uigraphics/nvgrenderstage/group"/>
+</component>
+</collection>
+<collection name="layouts" long-name="Layouts" level="plugin">
+<component name="cdl" filter="s60" long-name="Customization Definition Language">
+<!-- can only have one unit. Need to #include them or split into multiple components -->
+<unit bldFile="mw/uiresources/layouts/cdl/cdlengine/group"/>
+<unit bldFile="mw/uiresources/layouts/cdl/cdlserver/group"/>
+</component>
+<component name="aknlayout2" filter="s60" long-name="Avkon Layout 2">
+<unit bldFile="mw/uiresources/layouts/aknlayout2/group"/>
+</component>
+</collection>
+<collection name="skins" long-name="Skins" level="data">
+<component name="aknskincontent" filter="s60" long-name="Avkon Skin Content" class="config">
+<unit bldFile="mw/uiresources/skins/aknskincontent/group"/>
+</component>
+<component name="aknskins" filter="s60" long-name="Avkon Skin Compiler">
+<unit bldFile="mw/uiresources/skins/aknskins/group"/>
+</component>
+</collection>
+<collection name="pictographs" long-name="Pictographs" level="data">
+<component name="aknpictograph" filter="s60" long-name="Avkon Pictograph">
+<unit bldFile="mw/uiresources/pictographs/aknpictograph/group"/>
+</component>
+</collection>
+<collection name="locales" long-name="Locales" level="framework">
+<component name="locales_build" filter="s60" long-name="Locales Build">
+<unit bldFile="mw/uiresources/locales/loce32"/>
+</component>
+</collection>
+<collection name="uiconfig" long-name="UI Config" level="server">
+<component name="s60config" filter="s60" long-name="S60 UI Config">
+<unit bldFile="mw/uiresources/uiconfig/s60config/group"/>
+</component>
+</collection>
+<collection name="fontsupport" long-name="Font Support" level="generic">
+<component name="fontprovider" filter="s60" long-name="Font Provider">
+<unit bldFile="mw/uiresources/fontsupport/fontprovider/group"/>
+</component>
+<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
+ <component id="s60_fonts" filter="s60" name="S60 Fonts">
+ <unit bldFile="fontsupport/fontutils/group"/>
+ </component>
+-->
+<component name="fontutils" filter="sf_build" long-name="Font Utils">
+<unit bldFile="mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
+</component>
+</collection>
+<collection name="helpthemes" long-name="Help Themes" level="data">
+<!-- collection is really a component. Need to move down a directory -->
+<component name="helpthemes_build" filter="s60" long-name="Help Themes Build" class="config">
+<unit bldFile="mw/uiresources/helpthemes/group"/>
+</component>
+</collection>
+</block>
+<block name="hapticsservices" level="generic" long-name="Haptics Services" levels="fw server api">
+<collection name="hapticsservices_plat" long-name="Haptics Services Platform Interfaces" level="api">
+<component name="tacticon_api" long-name="Tacticon API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/hapticsservices/hapticsservices_plat/tacticon_api/group"/>
+</component>
+<component name="tactile_feedback_core_api" long-name="Tactile Feedback Core API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_core_api/group"/>
+</component>
+<component name="tactile_feedback_server_api" long-name="Tactile Feedback Server API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_server_api/group"/>
+</component>
+</collection>
+<collection name="hapticsservices_pub" long-name="Haptics Services Public Interfaces" level="api">
+<component name="tactile_feedback_client_api" long-name="Tactile Feedback Client API" introduced="^1" filter="s60" class="api">
+<unit bldFile="mw/hapticsservices/hapticsservices_pub/tactile_feedback_client_api/group"/>
+</component>
+</collection>
+<collection name="tacticonserver" long-name="Tacticon Server" level="server">
+<!-- collection is really a component. Move down a directory -->
+<component name="tacticonserver_build" filter="s60" long-name="Tacticon Server Build" introduced="^3">
+<unit bldFile="mw/hapticsservices/tacticonserver/group"/>
+<!-- clients and servers are suauly the same component. Consider moving pluign to a separate component if needed -->
+</component>
+</collection>
+<collection name="tactilefeedback" long-name="Tactile Feedback" level="fw">
+<component name="tactilearearegistry" filter="s60" long-name="Tactile Area Registry" introduced="^1">
+<unit bldFile="mw/hapticsservices/tactilefeedback/tactilearearegistry/group"/>
+</component>
+<component name="tactilefeedbackresolver" filter="s60" long-name="Tactile Feedback Resolver" introduced="^1">
+<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackresolver/group"/>
+</component>
+<component name="tactileclickplugin" filter="s60" long-name="Tactile Click Plugin" introduced="^1" plugin="Y">
+<unit bldFile="mw/hapticsservices/tactilefeedback/tactileclickplugin/group"/>
+</component>
+<component name="tactilefeedbackclient" filter="s60" long-name="Tactile Feedback Client" introduced="^1">
+<unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackclient/group"/>
+</component>
+<component name="tactileactionplugin" filter="s60" long-name="Tactile Action Plugin" introduced="^1" plugin="Y">
+<unit bldFile="mw/hapticsservices/tactilefeedback/tactileactionplugin/group"/>
+</component>
+<component name="tactilefeedback_build" filter="s60" long-name="Tactile Feedback Build" introduced="^1">
+<!-- consider moving IBY to one fo the above components -->
+<unit bldFile="mw/hapticsservices/tactilefeedback/group"/>
+</component>
+</collection>
+</block>
+<block name="platformthemes" level="specific" long-name="Platform Themes" levels="framework generic ui">
+<collection name="platformthemes_info" long-name="Platform Themes Info">
+<component name="platformthemes_build" long-name="Platform Themes Build">
+<!-- no real structure in this package. Should break into collections / components -->
+<unit bldFile="mw/platformthemes" proFile="platformthemes.pro"/>
+</component>
+</collection>
+</block>
+<block name="gsprofilesrv" level="generic" long-name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
+<collection name="gsprofilesrv_pub" long-name="GS and Profiles Services Public Interfaces" level="specific">
+<component name="profiles_engine_active_profile_settings_api" long-name="Profiles Engine Active Profile Settings API" filter="s60" class="api">
+<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_active_profile_settings_api/group"/>
+</component>
+<component name="profiles_engine_wrapper_api" long-name="Profiles Engine Wrapper API" filter="s60" class="api">
+<unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_wrapper_api/group"/>
+</component>
+</collection>
+<collection name="gsprofilesrv_plat" long-name="GS and Profiles Services Platform Interfaces" level="specific">
+<component name="ftuwizardmodel_api" long-name="FTU Wizard Model API" filter="bldfirst,s60" class="api">
+<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/ftuwizardmodel_api" proFile="ftuwizardmodel_api.pro" qmakeArgs="-r -config rom"/>
+</component>
+<component name="profiles_engine_api" long-name="Profiles Engine API" filter="s60" class="api">
+<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_engine_api/group"/>
+</component>
+<component name="settings_backgroundimage_api" long-name="Settings Background Image API" filter="s60" class="api">
+<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_backgroundimage_api/group"/>
+</component>
+<component name="settings_framework_api" long-name="Settings Framework API" filter="s60" class="api">
+<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_framework_api/group"/>
+</component>
+<component name="settings_launch_api" long-name="Settings Launch API" filter="s60" class="api">
+<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_launch_api/group"/>
+</component>
+<component name="settings_listbox_api" long-name="Settings List Box API" filter="s60" class="api">
+<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_listbox_api/group"/>
+</component>
+<component name="settings_plugin_api" long-name="Settings Plugin API" filter="s60" class="api">
+<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_plugin_api/group"/>
+</component>
+<component name="settings_uis_cenrep_collection_api" long-name="Settings UIs CenRep Collection API" filter="s60" class="api">
+<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
+</component>
+</collection>
+<collection name="gssettingsuis" long-name="General Settings UIs" level="framework">
+<component name="gs" filter="s60" long-name="General Settings" introduced="9.2">
+<unit bldFile="mw/gsprofilesrv/gssettingsuis/gs/group"/>
+</component>
+</collection>
+<collection name="ftuwizardmodel" long-name="FTU Wizard Model" level="generic">
+<component name="ftuwizardmodel_build" long-name="FTU Wizardmodel Build" filter="bldfirst">
+<unit bldFile="mw/gsprofilesrv/ftuwizardmodel" proFile="ftuwizardmodel.pro" qmakeArgs="-r -config rom"/>
+</component>
+</collection>
+<collection name="controlpanel" long-name="Control Panel" level="generic">
+<component name="controlpanel_rom" long-name="Control Panel ROM" filter="s60">
+<unit bldFile="mw/gsprofilesrv/controlpanel/rom" proFile="cp_rom.pri" qmakeArgs="-r -config rom"/>
+</component>
+<component name="controlpanel_source" long-name="Control Panel Source" filter="s60">
+<unit bldFile="mw/gsprofilesrv/controlpanel/src" qmakeArgs="-r -config rom" proFile="src.pro"/>
+</component>
+</collection>
+<collection name="profilesservices" long-name="Profiles Services" level="server">
+<component name="profileengine" filter="s60" long-name="Profile Engine" introduced="9.1">
+<unit bldFile="mw/gsprofilesrv/profilesservices/profileengine/group"/>
+</component>
+</collection>
+</block>
+<block name="homescreensrv" level="specific" long-name="Home Screen Services" levels="plugin framework server generic specific">
+<collection name="appfoundation" long-name="App Foundation" level="generic">
+<component name="appfoundation_build" long-name="App Foundation Build" introduced="^4">
+<unit bldFile="mw/homescreensrv/appfoundation" qmakeArgs="-r" proFile="appfoundation.pro"/>
+</component>
+</collection>
+<collection name="hswidgetmodel" long-name="Home Screen Widget Model" level="framework">
+<component name="hswidgetmodel_build" long-name="Home Screen Widget Model Build" introduced="^4">
+<unit bldFile="mw/homescreensrv/hswidgetmodel" qmakeArgs="-r" proFile="hswidgetmodel.pro"/>
+</component>
+</collection>
+<collection name="contentstorage" long-name="Content Storage" level="framework">
+<component name="cautils" long-name="Content Arsenal Utils" introduced="^4">
+<unit bldFile="mw/homescreensrv/contentstorage/cautils" qmakeArgs="-r" proFile="cautils.pro"/>
+</component>
+<component name="contentstorage_build" long-name="Content Storage Build" introduced="^4">
+<unit bldFile="mw/homescreensrv/contentstorage/group" qmakeArgs="-r" proFile="group.pro"/>
+</component>
+<component name="casrv/calocalizerscanner" long-name="Content Arsenal Server Localizer Scanner" introduced="^4">
+<unit bldFile="mw/homescreensrv/contentstorage/casrv/calocalizerscanner" qmakeArgs="-r" proFile="calocalizerscanner.pro"/>
+</component>
+<component name="cahandler" long-name="Content Arsenal Handler" introduced="^4">
+<unit bldFile="mw/homescreensrv/contentstorage/cahandler" qmakeArgs="-r" proFile="cahandler.pro"/>
+</component>
+<component name="caclient" long-name="Content Arsenal Client" introduced="^4">
+<unit bldFile="mw/homescreensrv/contentstorage/caclient" qmakeArgs="-r" proFile="caclient.pro"/>
+</component>
+</collection>
+<collection name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" level="specific">
+<component name="homescreensrv_plat_build" long-name="Home Screen Services Platform Interfaces build" introduced="^4">
+<unit bldFile="mw/homescreensrv/homescreensrv_plat" qmakeArgs="-r" proFile="homescreensrv_plat.pro"/>
+</component>
+<component name="action_handler_plugin_api" long-name="Action Handler Plugin API" filter="s60" class="api"/>
+<component name="content_harvester_plugin_api" long-name="Content Harvester Plugin API" filter="s60" class="api"/>
+<component name="sapi_contentpublishing" long-name="SAPI Content Publishing" filter="s60" class="api"/>
+<component name="sapi_actionhandler" long-name="SAPI Action Handler" filter="s60" class="api"/>
+<component name="menu_sat_interface_api" long-name="Menu SAT Interface API" filter="s60" class="api"/>
+<component name="appruntimemodel_api" long-name="Appliction Run-Time Model API" filter="s60" introduced="^4" class="api"/>
+<component name="contentstorage_api" long-name="Content Storage API" filter="s60" introduced="^4" class="api"/>
+<component name="hswidgetmodel_api" long-name="HS Widget Model API" filter="s60" introduced="^4" class="api"/>
+<component name="statemodel_api" long-name="State Model API" filter="s60" introduced="^4" class="api"/>
+<component name="homescreen_information_api" long-name="Homescreen Information API" filter="s60" introduced="^4" class="api"/>
+</collection>
+<collection name="hsactivityfw" long-name="Activity Framework" level="activityfw">
+<component name="hsactivityfw_build" long-name="Activity Framework Build" introduced="^4">
+<unit bldFile="mw/homescreensrv/activityfw" qmakeArgs="-r" proFile="activityfw.pro"/>
+</component>
+</collection>
+<collection name="hsappkeyhandler" long-name="HS Appplication Key Handler" level="server">
+<component name="hsappkeyhandler_build" long-name="Appplication Key Handler Build" introduced="^4">
+<unit bldFile="mw/homescreensrv/hsappkeyhandler" qmakeArgs="-r" proFile="hsappkeyhandler.pro"/>
+</component>
+</collection>
+<collection name="homescreensrv_info" long-name="Home Screen Services Info" level="specific">
+<component name="homescreensrvconf" long-name="Home Screen Services Config" introduced="^4" class="config">
+<unit bldFile="mw/homescreensrv" qmakeArgs="-r" proFile="homescreensrv.pro"/>
+</component>
+<component name="homescreensrvrom" long-name="Home Screen Services ROM" introduced="^4">
+<unit bldFile="mw/homescreensrv/group"/>
+</component>
+</collection>
+</block>
+<block name="homescreensrvlegacy" level="generic" long-name="Legacy Home Screen Services" levels="plugin framework server generic specific">
+<collection name="homescreensrvlegacy_plat" long-name="Legacy Home Screen Services Platform Interfaces" level="specific">
+<component name="ai_content_model_api" long-name="AI Content Model API" filter="s60" class="api">
+<unit bldFile="mw/homescreensrvlegacy/ai_content_model_api/group" proFile="group.pro"/>
+</component>
+<component name="ai_plugin_information_api" long-name="AI Plug-in Information API" filter="s60" class="api">
+<unit bldFile="mw/homescreensrvlegacy/ai_plugin_information_api/group" proFile="group.pro"/>
+</component>
+<component name="content_harvester_plugin_api" long-name="Content Harvester Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/homescreensrvlegacy/content_harvester_plugin_api/group"/>
+</component>
+</collection>
+</block>
+<block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
+<collection name="appinstall_plat" long-name="Application Installation Platform Interfaces" level="api">
+<component name="iaupdate_api" long-name="IA Update API" filter="s60" class="api">
+<unit bldFile="mw/appinstall/appinstall_plat/iaupdate_api/group"/>
+</component>
+<component name="task_plugin_api" long-name="Task Plugin API" filter="s60" class="api">
+<unit bldFile="mw/appinstall/appinstall_plat/task_plugin_api/group"/>
+</component>
+<component name="sw_installer_common_ui_api" long-name="SW Installer Common UI API" filter="s60" class="api">
+<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_common_ui_api/group"/>
+</component>
+<component name="sw_installer_launcher_api" long-name="SW Installer Launcher API" filter="s60" class="api">
+<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_launcher_api/group"/>
+</component>
+<component name="task_management_api" long-name="Task Management API" filter="s60" class="api">
+<unit bldFile="mw/appinstall/appinstall_plat/task_management_api/group"/>
+</component>
+<component name="sw_installer_ui_plugin_api" long-name="SW Installer UI Plugin API" filter="s60" class="api">
+<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ui_plugin_api/group"/>
+</component>
+<component name="sw_installer_cr_keys" long-name="SW Installer CR Keys" filter="s60" class="api">
+<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_cr_keys/group"/>
+</component>
+<component name="sw_installer_ps_keys" long-name="SW Installer PS Keys" filter="s60" class="api">
+<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
+</component>
+<component name="appmngr2runtimeapi" long-name="Application Manager 2 Runtime Plugin API" filter="s60" class="api">
+<unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
+</component>
+<component name="sifui_api" long-name="STIF UI API" filter="s60" class="api">
+<unit bldFile="mw/appinstall/appinstall_plat/sifui_api/group"/>
+</component>
+</collection>
+<collection name="appinstall_pub" long-name="Application Installation Public Interfaces" level="api">
+<component name="startup_list_management_api" long-name="Startup List Management API" filter="s60" class="api">
+<unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
+</component>
+</collection>
+<collection name="ncdengine" long-name="Nokia Content Discover" level="framework">
+<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
+<component name="ncdengine_engine" filter="s60" long-name="NCD Engine" introduced="^1">
+<unit bldFile="mw/appinstall/ncdengine/engine/group"/>
+</component>
+<component name="debuglogger" filter="s60" long-name="NCD Debug Logger" introduced="^1" class="placeholder">
+<!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
+</component>
+<component name="ncdengine_build" filter="s60" long-name="NCD Build" introduced="^1">
+<unit bldFile="mw/appinstall/ncdengine/group"/>
+</component>
+</collection>
+<collection name="appinstaller" long-name="Application Installer" level="generic">
+<component name="appinstui" filter="s60" long-name="Application Installer UI" introduced="^2">
+<unit bldFile="mw/appinstall/appinstaller/appinstui/group"/>
+</component>
+</collection>
+<collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="api">
+<!-- the collection is really a component. Move down a directory.-->
+<component name="iaupdateapi_stub_build" long-name="IA Update API Stub Build" filter="s60" introduced="^2">
+<unit bldFile="mw/appinstall/iaupdateapi_stub/group"/>
+</component>
+</collection>
+<collection name="iaupdate" long-name="Independent Apps Update" level="api">
+<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
+<component name="iad" long-name="Software Update" filter="s60" introduced="^2">
+<unit bldFile="mw/appinstall/iaupdate/iad/group"/>
+</component>
+<component name="iaupdate_help" filter="s60" long-name="IA Update Help" introduced="^2">
+<unit bldFile="mw/appinstall/iaupdate/help/group"/>
+</component>
+<component name="iaupdate_build" filter="s60" long-name="IA Update Build" introduced="^2">
+<unit bldFile="mw/appinstall/iaupdate/group"/>
+</component>
+</collection>
+<collection name="installationservices" long-name="Installation Services" level="generic">
+<component name="swi" long-name="Secure Software Install" purpose="optional">
+<unit bldFile="mw/appinstall/installationservices/swi/group" mrp="mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
+</component>
+<component name="swidevicetools" long-name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
+<unit bldFile="mw/appinstall/installationservices/swidevicetools/group" mrp="mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
+</component>
+<component name="swcomponentregistry" long-name="Software Component Registry" introduced="^4" purpose="mandatory">
+<unit bldFile="mw/appinstall/installationservices/swcomponentregistry/group" mrp="mw/appinstall/installationservices/swcomponentregistry/group/security_softwarecomponentregistry.mrp"/>
+</component>
+<component name="swinstallationfw" long-name="Software Installation Framework" introduced="^4" purpose="optional">
+<unit bldFile="mw/appinstall/installationservices/swinstallationfw/group" mrp="mw/appinstall/installationservices/swinstallationfw/group/security_softwareinstallframework.mrp"/>
+</component>
+<component name="swtransactionservices" long-name="Software Transaction Services" introduced="^4" purpose="optional">
+<unit bldFile="mw/appinstall/installationservices/swtransactionservices/group" mrp="mw/appinstall/installationservices/swtransactionservices/group/security_softwaretransactionservices.mrp"/>
+</component>
+<component name="refswinstallationplugin" long-name="Reference Software Installation Plugin" introduced="^4" purpose="development" plugin="Y">
+<unit bldFile="mw/appinstall/installationservices/refswinstallationplugin/group" mrp="mw/appinstall/installationservices/refswinstallationplugin/group/security_sifrefplugin.mrp"/>
+</component>
+<component name="refsoftwareappmgr" long-name="Reference Software Application Manager" introduced="^4" purpose="development">
+<unit bldFile="mw/appinstall/installationservices/refsoftwareappmgr/group" mrp="mw/appinstall/installationservices/refsoftwareappmgr/group/security_referenceapplicationmanager.mrp"/>
+</component>
+<component name="swiconfig" long-name="Software Install Config" introduced="9.1" purpose="optional" class="config">
+<unit bldFile="mw/appinstall/installationservices/swiconfig/group" mrp="mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
+</component>
+</collection>
+<collection name="secureswitools" long-name="Secure Software Install Tools" level="tool">
+<component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" class="PC">
+<unit bldFile="mw/appinstall/secureswitools/makekeys/group" mrp="mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
+</component>
+<component name="swianalysistoolkit" long-name="SWI Analysis Toolkit" purpose="development" class="PC">
+<unit bldFile="mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
+</component>
+<component name="openssllib" long-name="OpenSSL Library" purpose="optional" class="PC">
+<unit mrp="mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
+</component>
+<component name="swisistools" long-name="Secure Software Install SIS Tools" purpose="optional" class="PC">
+<unit bldFile="mw/appinstall/secureswitools/swisistools/group" mrp="mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
+</component>
+</collection>
+<collection name="appinstall_info" long-name="Application Installation Info" level="api">
+<component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="serviceapifw" level="specific" long-name="Service API Framework" levels="plugin framework server generic specific">
+<collection name="serviceapifw_pub" long-name="Service API Framework Public Interfaces" level="specific"/>
+<collection name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" level="specific">
+<component name="rtsecuritymanager_common_api" long-name="Runtime Security Manager Common API" filter="s60" class="api">
+<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/group"/>
+</component>
+<component name="rtsecuritymanager_utility_api" long-name="Runtime Security Manager Utility API" filter="s60" class="api">
+<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
+</component>
+<component name="rtsecuritymanager_client_api" long-name="Runtime Security Manager Client API" filter="s60" class="api">
+<unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/group"/>
+</component>
+<component name="liw_provider_utility_api" long-name="LIW Provider Utility API" filter="s60" class="api">
+<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_provider_utility_api/group"/>
+</component>
+<component name="liw_service_interface_base_api" long-name="LIW Service Interface Base API" filter="s60" class="api">
+<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_base_api/group"/>
+</component>
+<component name="liw_service_interface_menu_api" long-name="LIW Service Interface Menu API" filter="s60" class="api">
+<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_menu_api/group"/>
+</component>
+<component name="liw_criteria_api" long-name="LIW Criteria API" filter="s60" class="api">
+<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_criteria_api/group"/>
+</component>
+<component name="liw_generic_parameter_api" long-name="LIW Generic Parameter API" filter="s60" class="api">
+<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_generic_parameter_api/group"/>
+</component>
+<component name="liw_service_handler_api" long-name="LIW Service Handler API" filter="s60" class="api">
+<unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_handler_api/group"/>
+</component>
+</collection>
+<collection name="rtsecuritymanager" long-name="Runtime Security Manager" level="server">
+<component name="rtsecuritymanagerutil" filter="s60" long-name="Runtime Security Manager Util">
+<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
+</component>
+<component name="rtsecuritymanagerserver" filter="s60" long-name="Runtime Security Manager Server">
+<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/>
+</component>
+<component name="rtsecuritymanagerclient" filter="s60" long-name="Runtime Security Manager Client">
+<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/>
+</component>
+<component name="rtsecuritymanager_build" filter="s60" long-name="Runtime Security Manager Build">
+<!-- Move the export to the appropriate components, or make this a ROM component by removing the #includes -->
+<unit bldFile="mw/serviceapifw/rtsecuritymanager/group"/>
+</component>
+</collection>
+<collection name="languageinterworkingfw" long-name="Language Interworking Framework" level="framework">
+<component name="lifwservicehandler" filter="s60" long-name="Service Handler">
+<unit bldFile="mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
+</component>
+</collection>
+</block>
+<block name="serviceapi" level="specific" long-name="Service API" levels="os mw1 mw2 app">
+<!-- should break up this collection into something meaningful -->
+<collection name="serviceproviders" long-name="Service Providers" level="mw1">
+<component name="sapi_contacts_vpbk" long-name="Contacts Phonebook SAPI" filter="s60" plugin="Y">
+<unit bldFile="mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
+</component>
+<component name="sapi_location" long-name="Location SAPI" filter="s60" plugin="Y">
+<unit bldFile="mw/serviceapi/serviceproviders/sapi_location/group"/>
+</component>
+<component name="sapi_mediamanagement" long-name="Media Management SAPI" filter="s60" plugin="Y">
+<unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/group"/>
+</component>
+<component name="sapi_landmarks" long-name="Landmarks SAPI" filter="s60" plugin="Y">
+<unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
+</component>
+<component name="sapi_messaging" long-name="Messaging SAPI" filter="s60" plugin="Y">
+<unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/group"/>
+</component>
+<component name="sapi_applicationmanager" long-name="Application Manager SAPI" filter="s60" plugin="Y">
+<unit bldFile="mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
+</component>
+<component name="sapi_calendar" long-name="Calendar SAPI" filter="s60" plugin="Y">
+<unit bldFile="mw/serviceapi/serviceproviders/sapi_calendar/group"/>
+</component>
+<component name="sapi_logging" long-name="Logging SAPI" filter="s60" plugin="Y">
+<unit bldFile="mw/serviceapi/serviceproviders/sapi_logging/group"/>
+</component>
+<component name="sapi_sensor" long-name="Sensor SAPI" filter="s60" plugin="Y">
+<unit bldFile="mw/serviceapi/serviceproviders/sapi_sensor/group"/>
+</component>
+<component name="sapi_sysinfo" long-name="Sysinfo SAPI" filter="s60" plugin="Y">
+<unit bldFile="mw/serviceapi/serviceproviders/sapi_sysinfo/group"/>
+</component>
+<component name="sapi_serviceregistry" long-name="Service Registry SAPI" filter="s60" plugin="Y">
+<unit bldFile="mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
+</component>
+<component name="jsapi" long-name="Javascript API" filter="s60" plugin="Y">
+<unit bldFile="mw/serviceapi/serviceproviders/jsapi/group"/>
+</component>
+<component name="serviceproviders_build" filter="s60" long-name="Service API Build">
+<!-- distribute the exports or make this a ROM component by removing the #includes -->
+<unit bldFile="mw/serviceapi/serviceproviders/group"/>
+</component>
+</collection>
+</block>
+<block name="browser" level="specific" long-name="Browser" levels="plugin utils support main">
+<collection name="bookmarksengine" long-name="Bookmarks Engine" level="support">
+<component name="bookmarksengine_build" long-name="Bookmarks Engine Build" introduced="^4">
+<unit bldFile="mw/browser/bookmarksengine" proFile="bookmarksengine.pro" qmakeArgs=""what+=plat_101""/>
+</component>
+</collection>
+</block>
+<block name="web" level="specific" long-name="Web" levels="plugin utils server generic specific">
+<collection name="web_pub" long-name="Web Public Interfaces" level="specific">
+<component name="browser_control_api" long-name="Browser Control API" filter="s60" class="api">
+<unit bldFile="mw/web/web_pub/browser_control_api/group"/>
+</component>
+<component name="download_mgr_client_api" long-name="Download Manager Client API" filter="s60" class="api">
+<unit bldFile="mw/web/web_pub/download_mgr_client_api/group"/>
+</component>
+<component name="download_mgr_ui_api" long-name="Download Manager UI Library API" filter="s60" class="api">
+<unit bldFile="mw/web/web_pub/download_mgr_ui_api/group"/>
+</component>
+<component name="favourites_engine_api" long-name="Favourites Engine API" filter="s60" class="api">
+<unit bldFile="mw/web/web_pub/favourites_engine_api/group"/>
+</component>
+<component name="browser_plugin_api" long-name="Browser Plug-in API" filter="s60" class="api">
+<unit bldFile="mw/web/web_pub/browser_plugin_api/group"/>
+</component>
+<component name="settings_api" long-name="Settings API" filter="s60" class="api">
+<unit bldFile="mw/web/web_pub/settings_api/group"/>
+</component>
+</collection>
+<collection name="web_plat" long-name="Web Platform Interfaces" level="specific">
+<component name="aiw_browser_provider_api" long-name="AIW Browser Provider API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/aiw_browser_provider_api/group"/>
+</component>
+<component name="browser_dialogs_provider_api" long-name="Browser Dialogs Provider API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/browser_dialogs_provider_api/group"/>
+</component>
+<component name="browser_platform_api" long-name="Browser Platform API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/browser_platform_api/group"/>
+</component>
+<component name="cod_handler_api" long-name="COD Handler API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/cod_handler_api/group"/>
+</component>
+<component name="connection_manager_api" long-name="Connection Manager API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/connection_manager_api/group"/>
+</component>
+<component name="cxml_library_api" long-name="cXml Library API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/cxml_library_api/group"/>
+</component>
+<component name="download_mgr_client_api_extn" long-name="Download Manager Client API Extension" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/download_mgr_client_api_extn/group"/>
+</component>
+<component name="feeds_engine_api" long-name="Feeds Engine API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/feeds_engine_api/group"/>
+</component>
+<component name="launcher_api" long-name="Launcher API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/launcher_api/group"/>
+</component>
+<component name="multipart_parser_api" long-name="Multipart Parser API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/multipart_parser_api/group"/>
+</component>
+<component name="recent_url_store_api" long-name="Recent URL Store API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/recent_url_store_api/group"/>
+</component>
+<component name="rt_gesturehelper_api" long-name="Runtime Gesture Helper API" filter="s60" introduced="^4" class="api">
+<unit bldFile="mw/web/web_plat/rt_gesturehelper_api/group"/>
+</component>
+<component name="scheme_handler_plugin_api" long-name="Scheme Handler Plugin API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/scheme_handler_plugin_api/group"/>
+</component>
+<component name="scriptable_plugin_api" long-name="Scriptable Plugin API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/scriptable_plugin_api/group"/>
+</component>
+<component name="webutils_api" long-name="Web Utils API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/webutils_api/group"/>
+</component>
+<component name="widget_registry_api" long-name="Widget Registry API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/widget_registry_api/group"/>
+</component>
+<component name="xml_parser_api" long-name="XML Parser API" filter="s60" class="api">
+<unit bldFile="mw/web/web_plat/xml_parser_api/group"/>
+</component>
+</collection>
+<collection name="web_info" long-name="Web Info" level="specific">
+<component name="web_build" filter="s60" long-name="Web Build">
+<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
+<unit bldFile="mw/web/group"/>
+</component>
+</collection>
+<collection name="browserutilities" long-name="Browser Utilities" level="utils">
+<component name="browserdialogsprovider" filter="s60" long-name="Browser Dialogs Provider">
+<unit bldFile="mw/web/browserutilities/browserdialogsprovider/group"/>
+</component>
+<component name="recenturlstore" filter="s60" long-name="Recent URL Store">
+<unit bldFile="mw/web/browserutilities/recenturlstore/group"/>
+</component>
+<component name="xmlparser" filter="s60" long-name="XML Interface">
+<unit bldFile="mw/web/browserutilities/xmlparser/group"/>
+</component>
+<component name="cxmllibrary" filter="s60" long-name="XML Parser Implementation">
+<unit bldFile="mw/web/browserutilities/cxmllibrary/group"/>
+</component>
+<component name="downloadmgr" filter="s60" long-name="Download Manager">
+<unit bldFile="mw/web/browserutilities/downloadmgr/group"/>
+</component>
+<component name="connectionmanager" filter="s60" long-name="Connection Manager">
+<unit bldFile="mw/web/browserutilities/connectionmanager/group"/>
+</component>
+<component name="browsertelservice" filter="s60" long-name="Browser Telephony Service">
+<unit bldFile="mw/web/browserutilities/browsertelservice/group"/>
+</component>
+<component name="favouritesengine" filter="s60" long-name="Favourites Engine">
+<unit bldFile="mw/web/browserutilities/favouritesengine/group"/>
+</component>
+<component name="feedsengine" filter="s60" long-name="Feeds Engine">
+<unit bldFile="mw/web/browserutilities/feedsengine/group"/>
+</component>
+<component name="multipartparser" filter="s60" long-name="Multipart Parser">
+<!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
+<!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
+</component>
+<component name="schemehandler" filter="s60" long-name="Scheme Handler">
+<unit bldFile="mw/web/browserutilities/schemehandler/group"/>
+</component>
+<component name="webutils" filter="s60" long-name="Web Utils">
+<unit bldFile="mw/web/browserutilities/webutils/group"/>
+</component>
+<component name="aiwbrowserprovider" filter="s60" long-name="AIW Browser Provider" plugin="Y">
+<unit bldFile="mw/web/browserutilities/aiwbrowserprovider/group"/>
+</component>
+<component name="browserutilities_build" filter="s60" long-name="Browser Utilities Build">
+<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
+<unit bldFile="mw/web/browserutilities/group"/>
+</component>
+</collection>
+<collection name="webengine" long-name="Web Engine" level="server">
+<component name="osswebengine" filter="s60" long-name="OSS Web Engine">
+<!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
+<unit bldFile="mw/web/webengine/osswebengine/cache/group"/>
+<unit bldFile="mw/web/webengine/osswebengine/memorymanager/group"/>
+<unit bldFile="mw/web/webengine/osswebengine/npscript/group"/>
+<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group"/>
+<unit bldFile="mw/web/webengine/osswebengine/webkit/s60/group/javascriptcore"/>
+</component>
+<component name="webkitutils" filter="s60" long-name="WebKit Utils">
+<unit bldFile="mw/web/webengine/webkitutils/group"/>
+</component>
+<component name="pagescaler" filter="s60" long-name="Page Scaler">
+<unit bldFile="mw/web/webengine/pagescaler/group"/>
+</component>
+<component name="webwidgetinstaller" filter="s60" long-name="Widget Installer">
+<unit bldFile="mw/web/webengine/widgetinstaller/group"/>
+</component>
+<component name="widgetregistry" filter="s60" long-name="Widget Registry">
+<unit bldFile="mw/web/webengine/widgetregistry/group"/>
+</component>
+<component name="wmlengine" filter="s60" long-name="WML Engine">
+<unit bldFile="mw/web/webengine/wmlengine/group"/>
+</component>
+<component name="device" filter="s60" long-name="Device">
+<!-- this needs a more meaningful name -->
+<unit bldFile="mw/web/webengine/device/group"/>
+</component>
+<component name="widgetengine" filter="s60" long-name="Widget Engine">
+<unit bldFile="mw/web/webengine/widgetengine/group"/>
+</component>
+<component name="web_memoryplugin" long-name="Memory Plugin" filter="s60" plugin="Y">
+<unit bldFile="mw/web/webengine/memoryplugin/group"/>
+</component>
+<component name="widgetmemoryplugin" filter="s60" long-name="Widget Memory Plugin" plugin="Y">
+<unit bldFile="mw/web/webengine/widgetmemoryplugin/group"/>
+</component>
+<component name="widgetbackuprestore" filter="s60" long-name="Widget Backup and Restore">
+<unit bldFile="mw/web/webengine/widgetbackuprestore/group"/>
+</component>
+<component name="browserrecognizers" filter="s60" long-name="Browser Recognizers" plugin="Y">
+<unit bldFile="mw/web/webengine/browserrecognizers/group"/>
+</component>
+<component name="wrtharvester" filter="s60" long-name="Web Runtime Harvester" plugin="Y">
+<unit bldFile="mw/web/webengine/wrtharvester/group"/>
+</component>
+</collection>
+<collection name="codhandler" long-name="Content Object Descriptor Handler" level="specific">
+<component name="codeng" filter="s60" long-name="COD Engine">
+<unit bldFile="mw/web/codhandler/codeng/group"/>
+</component>
+<component name="codui" filter="s60" long-name="COD UI">
+<unit bldFile="mw/web/codhandler/codui/group"/>
+</component>
+<component name="codrecog" filter="s60" long-name="COD Recogniser" plugin="Y">
+<unit bldFile="mw/web/codhandler/codrecog/group"/>
+</component>
+<component name="codviewer" filter="s60" long-name="COD Viewer">
+<unit bldFile="mw/web/codhandler/codviewer/group"/>
+</component>
+<component name="ddrecog" filter="s60" long-name="Download Descriptor Recogniser" plugin="Y">
+<unit bldFile="mw/web/codhandler/ddrecog/group"/>
+</component>
+<component name="ddviewer" filter="s60" long-name="Download Descriptor Viewer">
+<unit bldFile="mw/web/codhandler/ddviewer/group"/>
+</component>
+<component name="coddownload" filter="s60" long-name="COD Download">
+<unit bldFile="mw/web/codhandler/coddownload/group"/>
+</component>
+<component name="roapapp" filter="s60" long-name="ROAP Application">
+<unit bldFile="mw/web/codhandler/roapapp/group"/>
+</component>
+<component name="codhandler_build" filter="s60" long-name="COD Handler Build">
+<!-- Exports need to go into another component or make this self-contained.
+ #included .hrh file needs to be #included in each of the other components -->
+<unit bldFile="mw/web/codhandler/group"/>
+</component>
+</collection>
+<collection name="widgets" long-name="Web Widget Framework" level="generic">
+<!-- the following units can be uncommented when configuration is put in place -->
+<component name="widgetrecognizer" filter="s60" long-name="Widget Recognizer" plugin="Y" class="placeholder">
+<!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
+</component>
+<component name="widgetinstaller" filter="s60" long-name="Widget Installer UI" plugin="Y" class="placeholder">
+<!--<unit bldFile="widgets/widgetinstaller/group"/>-->
+</component>
+<component name="widgetlauncher" filter="s60" long-name="Widget Launcher" class="placeholder">
+<!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
+</component>
+<component name="widgetapp" filter="s60" long-name="Widget UI" class="placeholder">
+<!--<unit bldFile="widgets/widgetapp/group"/>-->
+</component>
+<component name="widgetpreinstaller" filter="s60" long-name="Widget Pre-Installer">
+<!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
+</component>
+<component name="widgetstartup" filter="s60" long-name="Widget Startup">
+<!--<unit bldFile="widgets/widgetstartup/group"/>-->
+</component>
+<component name="widgets_build" filter="s60" long-name="Widgets Build">
+<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed
+ #included .hrh file needs to be #included in each of the other components -->
+<unit bldFile="mw/web/widgets/group"/>
+</component>
+</collection>
+</block>
+<block name="websrv" level="generic" long-name="Web Services" levels="plugin framework server generic specific">
+<collection name="websrv_pub" long-name="Web Services Public Interfaces" level="specific">
+<component name="web_service_description_api" long-name="Web Service Description API" filter="s60" class="api">
+<unit bldFile="mw/websrv/websrv_pub/web_service_description_api/group"/>
+</component>
+<component name="web_service_connection_api" long-name="Web Service Connection API" filter="s60" class="api">
+<unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/group"/>
+</component>
+<component name="web_service_manager_api" long-name="Web Service Manager API" filter="s60" class="api">
+<unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/group"/>
+</component>
+<component name="hostlet_connection_api" long-name="Hostlet Connection API" filter="s60" class="api">
+<unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/group"/>
+</component>
+<component name="web_service_messaging_api" long-name="Web Service Messaging API" filter="s60" class="api">
+<unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/group"/>
+</component>
+<component name="xml_extensions_api" long-name="XML Extensions API" filter="s60" class="api">
+<unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/group"/>
+</component>
+<component name="xml_fragment_api" long-name="XML Fragment API" filter="s60" class="api">
+<unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/group"/>
+</component>
+</collection>
+<collection name="webservices" long-name="Web Services Framework" level="generic">
+<!-- consider breaking this collection into more meaningful subsets -->
+<component name="wsnotifierplugins" filter="s60" long-name="WS Notifier Plugins" plugin="Y">
+<unit bldFile="mw/websrv/webservices/wsnotifierplugins/group"/>
+</component>
+<component name="wslogger" filter="s60" long-name="WS Logger">
+<unit bldFile="mw/websrv/webservices/wslogger/group"/>
+</component>
+<component name="wsxml" filter="s60" long-name="WS XML Extensions">
+<unit bldFile="mw/websrv/webservices/wsxml/group"/>
+</component>
+<component name="wsutils" filter="s60" long-name="WS Utils">
+<unit bldFile="mw/websrv/webservices/wsutils/group"/>
+</component>
+<component name="wsfragment" filter="s60" long-name="WS Fragment">
+<unit bldFile="mw/websrv/webservices/wsfragment/group"/>
+</component>
+<component name="wsdescription" filter="s60" long-name="WS Service Description">
+<unit bldFile="mw/websrv/webservices/wsdescription/group"/>
+</component>
+<component name="wsconnection" filter="s60" long-name="WS Service Connection">
+<unit bldFile="mw/websrv/webservices/wsconnection/group"/>
+</component>
+<component name="wsmessages" filter="s60" long-name="WS Messages">
+<unit bldFile="mw/websrv/webservices/wsmessages/group"/>
+</component>
+<component name="wscredentialmanager" filter="s60" long-name="WS Credential Manager">
+<unit bldFile="mw/websrv/webservices/wscredentialmanager/group"/>
+</component>
+<component name="wsframework" filter="s60" long-name="WS Framework">
+<unit bldFile="mw/websrv/webservices/wsframework/group"/>
+</component>
+<component name="wshttpchanneltransportplugin" filter="s60" long-name="WS HTTP Channel Transport Plugin" plugin="Y">
+<unit bldFile="mw/websrv/webservices/wshttpchanneltransportplugin/group"/>
+</component>
+<component name="wsconnectionagent" filter="s60" long-name="WS Connection Agent">
+<unit bldFile="mw/websrv/webservices/wsconnectionagent/group"/>
+</component>
+<component name="wsprovider" filter="s60" long-name="WS Provider">
+<unit bldFile="mw/websrv/webservices/wsprovider/group"/>
+</component>
+<component name="wshostletconnection" filter="s60" long-name="WS Hostlet Connection">
+<unit bldFile="mw/websrv/webservices/wshostletconnection/group"/>
+</component>
+<component name="wsmanager" filter="s60" long-name="WS Service Manager">
+<unit bldFile="mw/websrv/webservices/wsmanager/group"/>
+</component>
+<component name="wsidentitymanager" filter="s60" long-name="WS Identity Manager">
+<unit bldFile="mw/websrv/webservices/wsidentitymanager/group"/>
+</component>
+<component name="idwsfplugin" filter="s60" long-name="ID-WSF Plugin" plugin="Y">
+<unit bldFile="mw/websrv/webservices/idwsfplugin/group"/>
+</component>
+<component name="wsibasicplugin" filter="s60" long-name="WS-I Basic Plugin" plugin="Y">
+<unit bldFile="mw/websrv/webservices/wsibasicplugin/group"/>
+</component>
+<component name="wsrestplugin" filter="s60" long-name="WS REST Plugin" plugin="Y">
+<unit bldFile="mw/websrv/webservices/wsrestplugin/group"/>
+</component>
+<component name="idwsfsecuritymechanism" filter="s60" long-name="ID-WSF Security Mechanism">
+<unit bldFile="mw/websrv/webservices/idwsfsecuritymechanism/group"/>
+</component>
+<component name="wspasswordtransforms" filter="s60" long-name="WS Password Transforms">
+<unit bldFile="mw/websrv/webservices/wspasswordtransforms/group"/>
+</component>
+<component name="wscore" filter="s60" long-name="WS Core Service Manager">
+<unit bldFile="mw/websrv/webservices/wscore/group"/>
+</component>
+<component name="wslocaltransportplugin" filter="s60" long-name="WS Local Transport Plugin" plugin="Y">
+<unit bldFile="mw/websrv/webservices/wslocaltransportplugin/group"/>
+</component>
+<component name="wshostlettransportplugin" filter="s60" long-name="WS Hostlet Transport Plugin" plugin="Y">
+<unit bldFile="mw/websrv/webservices/wshostlettransportplugin/group"/>
+</component>
+<component name="wsstar" filter="s60" long-name="WS Star">
+<!-- can only have one unit. Need to split into separate components or #include from a single bld.inf -->
+<unit bldFile="mw/websrv/webservices/wsstar/wsstarpolicy/group"/>
+<unit bldFile="mw/websrv/webservices/wsstar/wsstarplugin/group"/>
+<unit bldFile="mw/websrv/webservices/wsstar/wsstarmessagehandlers/group"/>
+</component>
+<component name="wsoviplugin" filter="s60" long-name="WS Ovi Plugin">
+<unit bldFile="mw/websrv/webservices/wsoviplugin/group"/>
+</component>
+<component name="webservices_build" filter="s60" long-name="Web Services Build">
+<!-- need to split into self-contained components -->
+<unit bldFile="mw/websrv/webservices/group"/>
+</component>
+</collection>
+<collection name="websrv_info" long-name="Web Services Info" level="specific">
+<component name="websrv_bld" filter="s60" long-name="Web Services Build">
+<!-- need to include common .hrh in each unit -->
+<unit bldFile="mw/websrv/group"/>
+</component>
+</collection>
+</block>
+<block name="webruntime" level="specific" long-name="Web Runtime">
+<!-- need to break up this package nito collections and components -->
+<collection name="webruntime_info" long-name="Web Runtime Info">
+<component name="webruntime_build" long-name="Web Runtime Build" introduced="^4">
+<unit bldFile="mw/webruntime" proFile="cwrt.pro" qmakeArgs=""what+=ninetwo" "what+=tenone" "what+=qt_unstable" "what+=wrtlite" "what+=exportiby""/>
+</component>
+</collection>
+</block>
+<block name="platformtools" level="generic" long-name="Platform Tools">
+<collection name="gfxconversion" long-name="Graphics Conversion">
+<component name="bmconv_s60" filter="s60" long-name="S60 Bitmap Converter" class="PC">
+<unit bldFile="mw/platformtools/gfxconversion/bmconv_s60/group"/>
+</component>
+<component name="mifconv" filter="s60" long-name="Multi Icon File Converter" class="PC">
+<unit bldFile="mw/platformtools/gfxconversion/mifconv/group"/>
+</component>
+</collection>
+</block>
+<block name="uitools" level="specific" long-name="UI Tools" levels="compile encode tool if">
+<collection name="uitools_pub" long-name="UI Tools Public Interfaces" level="if">
+<component name="third_party_bitmap_palette_api" long-name="Third Party Bitmap Palette API" filter="s60" class="api">
+<unit bldFile="mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
+</component>
+</collection>
+<collection name="uitools_plat" long-name="UI Tools Platform Interfaces" level="if">
+<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="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>
+<collection name="cdlcompilertoolkit" long-name="CDL Compiler Toolkit" level="compile">
+<!-- collection is actually a component. Needs to be moved down a directory -->
+<component name="cdlcompilertoolkit_build" filter="s60" long-name="CDL Compiler Toolkit Build">
+<unit bldFile="mw/uitools/cdlcompilertoolkit/group"/>
+</component>
+</collection>
+<collection name="cdlcompiler" long-name="CDL Compiler" level="compile">
+<!-- collection is actually a component. Needs to be moved down a directory -->
+<component name="cdlcompiler_build" filter="s60" long-name="CDL Compiler Build">
+<unit bldFile="mw/uitools/cdlcompiler/group"/>
+</component>
+</collection>
+<collection name="gfxtools" long-name="Graphics Tools" level="tool">
+<component name="color" filter="s60" long-name="Bitmap Colour Palette" class="PC">
+<unit bldFile="mw/uitools/gfxtools/color/group"/>
+</component>
+</collection>
+<collection name="aknlayoutcompiler" long-name="Avkon Layout Compiler" level="compile">
+<!-- collection is actually a component. Needs to be moved down a directory -->
+<component name="aknlayoutcompiler_build" filter="s60" long-name="Avkon Layout Compiler Build">
+<unit bldFile="mw/uitools/aknlayoutcompiler/group"/>
+</component>
+</collection>
+<collection name="skincompiler" long-name="Skin Compiler" level="compile">
+<component name="aknskindesccompiler" filter="s60" long-name="Avkon Skin Descriptor Compiler">
+<unit bldFile="mw/uitools/skincompiler/AknSkinDescCompiler/group"/>
+</component>
+</collection>
+<collection name="reszip" long-name="Resource Zip" level="encode">
+<!-- collection is actually a component. Needs to be moved down a directory -->
+<component name="reszip_build" filter="s60" long-name="Resource Zip Build">
+<unit bldFile="mw/uitools/reszip/group"/>
+</component>
+</collection>
+<collection name="toollibraries" long-name="Tool Libraries" level="tool"/>
+<collection name="svgtencoder" long-name="SVGT Encoder" level="encode">
+<component name="svgtenc" filter="s60" long-name="Standalone SVGT Encoder" class="PC">
+<unit bldFile="mw/uitools/svgtencoder/svgtenc/standalone/group"/>
+</component>
+</collection>
+</block>
+</layer>
+<layer name="app" long-name="Applications" levels="services apps">
+<block name="location" level="apps" long-name="Location Apps" levels="ui events loc api">
+<collection name="location_plat" long-name="Location Apps Platform Interfaces" level="api">
+<component name="location_picker_service_api" long-name="Location Picker Service API" introduced="^4" filter="s60" class="api">
+<unit bldFile="app/location/location_plat" proFile="location_plat.pro"/>
+</component>
+</collection>
+<collection name="locationpickerservice" long-name="Location Picker Service" level="loc">
+<!--collection is really a component. Should move down a directory -->
+<component name="locationpickerservice_build" filter="s60" long-name="Location Picker Service Build" introduced="^4">
+<unit bldFile="app/location/locationpickerservice" proFile="locationpickerservice.pro"/>
+</component>
+</collection>
+<collection name="locationdataharvester" long-name="Location Data Harvester" level="events">
+<!--collection is really a component. Should move down a directory -->
+<component name="locationdataharvester_build" long-name="Location Data Harvester Build" filter="s60" introduced="^4">
+<unit bldFile="app/location/locationdataharvester" proFile="locationdataharvester.pro"/>
+</component>
+</collection>
+</block>
+<!-- pending removal -->
+<block name="phone" level="apps" span="2" long-name="Phone Apps" levels="engine plugin ui app">
+<collection name="phoneapp" long-name="Phone Application" level="app">
+<component name="blacklist" filter="s60" long-name="Phone Blacklist Clearing" plugin="Y">
+<unit bldFile="app/phone/phoneapp/blacklist/group"/>
+</component>
+
+<component name="phoneringingtoneplayer" filter="s60" long-name="Phone Rining Tone Player">
+<unit bldFile="app/phone/phoneapp/phoneringingtoneplayer/group"/>
+</component>
+
+<component name="phoneuicontrol" filter="s60" long-name="Phone UI Control">
+<unit bldFile="app/phone/phoneapp/phoneuicontrol/group"/>
+</component>
+<component name="phoneuistates" filter="s60" long-name="Phone UI States">
+<unit bldFile="app/phone/phoneapp/phoneuistates/group"/>
+</component>
+<component name="phoneuiutils" filter="s60" long-name="Phone UI Utils">
+<unit bldFile="app/phone/phoneapp/phoneuiutils/group"/>
+</component>
+<component name="silenceactionplugin" filter="s60" long-name="Silence Action Plugin" plugin="Y">
+<unit bldFile="app/phone/phoneapp/silenceactionplugin/group"/>
+</component>
+<component name="phonemediatorcenter" filter="s60" long-name="Phone Mediator Center">
+<unit bldFile="app/phone/phoneapp/phonemediatorcenter/group"/>
+</component>
+<component name="phoneuiview2" filter="s60" long-name="Phone UI View">
+<unit bldFile="app/phone/phoneapp/phoneuiview2" proFile="phoneuiview2.pro"/>
+</component>
+<component name="phoneuiqtviewadapter" filter="s60" long-name="Phone UI Qt View Adapter" introduced="^4" plugin="Y">
+<unit bldFile="app/phone/phoneapp/phoneuiqtviewadapter" proFile="phoneuiqtviewadapter.pro"/>
+</component>
+<component name="phonestringloader" filter="s60" long-name="Phone String Loader" introduced="^4">
+<unit bldFile="app/phone/phoneapp/phonestringloader" proFile="phonestringloader.pro"/>
+</component>
+<component name="phoneui2" filter="s60" long-name="Phone UI">
+<unit bldFile="app/phone/phoneapp/phoneui2" proFile="phoneui2.pro"/>
+</component>
+</collection>
+<collection name="phoneengine" long-name="Phone Engine" level="engine">
+<component name="phonecntfinder2" filter="s60" long-name="Phone Contact Finder">
+<unit bldFile="app/phone/phoneengine/phonecntfinder2" proFile="phonecntfinder2.pro"/>
+</component>
+<component name="audiohandling" filter="s60" long-name="Phone Audio Handling">
+<unit bldFile="app/phone/phoneengine/audiohandling/group"/>
+</component>
+<component name="callhandling" filter="s60" long-name="Call Handling">
+<unit bldFile="app/phone/phoneengine/callhandling/group"/>
+</component>
+<component name="contacthandling2" filter="s60" long-name="Phone Contact Handling">
+<unit bldFile="app/phone/phoneengine/contacthandling2/group"/>
+</component>
+<component name="loghandling" filter="s60" long-name="Phone Log Handling">
+<unit bldFile="app/phone/phoneengine/loghandling/group"/>
+</component>
+<component name="engineinfo" filter="s60" long-name="Phone Engine Info">
+<unit bldFile="app/phone/phoneengine/engineinfo/group"/>
+</component>
+<component name="phonemodel" filter="s60" long-name="Phone Model">
+<unit bldFile="app/phone/phoneengine/phonemodel" proFile="phonemodel.pro"/>
+</component>
+<component name="servicehandling" filter="s60" long-name="Phone Service Handling">
+<unit bldFile="app/phone/phoneengine/servicehandling/group"/>
+</component>
+<component name="phoneservices" filter="s60" long-name="Phone Server" introduced="^4">
+<unit bldFile="app/phone/phoneengine/phoneservices" proFile="phoneservices.pro"/>
+</component>
+<component name="parserrecognizer" filter="s60" long-name="Parser Recognizer" introduced="^4" plugin="Y">
+<unit bldFile="app/phone/phoneengine/parserrecognizer" proFile="parserrecognizer.pro"/>
+</component>
+</collection>
+<collection name="phoneuis" long-name="Phone UIs" level="ui">
+<component name="bubblemanager2" filter="s60" long-name="Phone Bubble Manager">
+<unit bldFile="app/phone/phoneuis/bubblemanager2" proFile="bubblemanager2.pro"/>
+</component>
+<component name="telephonydevicemode" filter="s60" long-name="Telephony Device Mode">
+<unit bldFile="app/phone/phoneuis/telephonydevicemode/group"/>
+</component>
+</collection>
+<collection name="phone_plat" long-name="Phone Apps Platform Interfaces" level="app">
+<component name="3d_ringing_tone_enabler_api" long-name="3D Ringing Tone Enabler API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
+</component>
+<component name="telephony_comms_information_api" long-name="Telephony Comms Information API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/telephony_comms_information_api/group"/>
+</component>
+<component name="telephony_information_api" long-name="Telephony Information API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/telephony_information_api/group"/>
+</component>
+<component name="telephony_device_mode_api" long-name="Telephony Device Mode API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/telephony_device_mode_api/group"/>
+</component>
+
+<component name="telephony_menu_extension_api" long-name="Telephony Menu Extension API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/telephony_menu_extension_api/group"/>
+</component>
+
+<component name="telephony_remote_party_information_api" long-name="Telephony Remote Party Information API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/telephony_remote_party_information_api/group"/>
+</component>
+<component name="telephony_video_mailbox_settings_api" long-name="Telephony Video Mailbox Settings API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/telephony_video_mailbox_settings_api/group"/>
+</component>
+<component name="telephony_microphone_mute_status_api" long-name="Telephony Microphone Mute Status API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/telephony_microphone_mute_status_api/group"/>
+</component>
+<component name="telephony_logging_extension_api" long-name="Telephony Logging Extension API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/telephony_logging_extension_api/group"/>
+</component>
+<component name="telephony_matching_extension_api" long-name="Telephony Matching Extension API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/telephony_matching_extension_api/group"/>
+</component>
+<component name="phone_application_commands_api" long-name="Phone Application Commands API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/phone_application_commands_api/group"/>
+</component>
+<component name="phone_application_voip_commands_api" long-name="Phone Application VOIP Commands API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/phone_application_voip_commands_api/group"/>
+</component>
+<component name="phone_telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/telephony_mediator_api/group"/>
+</component>
+<component name="video_telephony_mediator_api" long-name="Video Telephony Mediator API" filter="s60" class="api">
+<unit bldFile="app/phone/phone_plat/video_telephony_mediator_api/group"/>
+</component>
+<component name="video_telephony_control_mediator_api" long-name="Video Telephony Control Mediator API" filter="s60" introduced="^4" class="api">
+<unit bldFile="app/phone/phone_plat/video_telephony_control_mediator_api/group"/>
+</component>
+</collection>
+<collection name="phoneplugins" long-name="Phone Plugins" level="plugin">
+<component name="csplugin" filter="s60" long-name="Circuit Switched Plugin" introduced="^4" plugin="Y">
+<unit bldFile="app/phone/phoneplugins/csplugin/group"/>
+</component>
+<component name="phoneindicatorplugin" filter="s60" long-name="Info Indicator Plugin" introduced="^4" plugin="Y">
+<unit bldFile="app/phone/phoneplugins/phoneindicatorplugin" proFile="phoneindicatorplugin.pro"/>
+</component>
+<component name="hsdialerwidgetplugin" filter="s60" long-name="Home Screen Dialer Widget Plugin" introduced="^4" plugin="Y">
+<unit bldFile="app/phone/phoneplugins/hsdialerwidgetplugin" proFile="hsdialerwidgetplugin.pro"/>
+</component>
+<component name="infowidgetplugin" filter="s60" long-name="Info Widget Plugin" introduced="^4" plugin="Y">
+<unit bldFile="app/phone/phoneplugins/infowidgetplugin" proFile="infowidgetplugin.pro"/>
+</component>
+</collection>
+<collection name="phonesettings" long-name="Phone Settings" level="plugin">
+<component name="cpphonesettingsplugins" filter="s60" long-name="CP Phone Settings Plugins" introduced="^4" plugin="Y">
+<unit bldFile="app/phone/phonesettings/cpphonesettingsplugins" proFile="cpphonesettingsplugins.pro"/>
+</component>
+</collection>
+</block>
+<block name="recents" level="apps" long-name="Recent Events" levels="engine support ui api">
+<collection name="recents_plat" long-name="Recent Events Platform Interfaces" level="api">
+<component name="logs_services_api" long-name="Logs Services API" filter="s60" introduced="^4" class="api"/>
+<component name="logs_engine_api" long-name="Logs Engine API" filter="s60" introduced="^4" class="api"/>
+<component name="logs_timers_api" long-name="Logs Timers API" filter="s60" class="api"/>
+<component name="logs_engine_api_extensions" long-name="Logs Engine API Extensions" filter="s60" class="api"/>
+</collection>
+<collection name="logsui" long-name="Logs UI" level="ui">
+<component name="logsui_build" filter="s60" long-name="Logs UI Build">
+<!-- component at too high a rank, should move down one directory -->
+<unit bldFile="app/recents/logsui" proFile="logsui.pro"/>
+</component>
+</collection>
+</block>
+<block name="settingsuis" level="services" long-name="Settings UIs" levels="plugin ui">
+<collection name="controlpanelplugins" long-name="Control Panel Plugins" level="plugin">
+<component name="themeplugin" filter="s60" long-name="Theme Plugin" introduced="^4">
+<unit bldFile="app/settingsuis/controlpanelplugins/themeplugin" proFile="themeplugin.pro" qmakeArgs="-r -config rom"/>
+</component>
+</collection>
+<collection name="controlpanelui" long-name="Control Panel UI" level="ui">
+<!-- collection is really a component, move down a dir -->
+<component name="controlpanelui_build" filter="s60" long-name="Control Panel UI Build" introduced="^4">
+<unit bldFile="app/settingsuis/controlpanelui" proFile="controlpanelui.pro" qmakeArgs="-r -config rom"/>
+</component>
+</collection>
+</block>
+<block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin framework app">
+<collection name="contentctrl_plat" long-name="Content Control Daemons Platforn Interfaces" level="app">
+<component name="ds_contactsdatastoreextension_api" long-name="DS Contacts Data Store Extension API" filter="s60" introduced="^4" class="api">
+<unit bldFile="app/contentcontrol/contentctrl_plat/ds_contactsdatastoreextension_api/group"/>
+</component>
+<component name="ds_data_modification_api" long-name="DS Data Modification API" filter="s60" introduced="^3" class="api">
+<unit bldFile="app/contentcontrol/contentctrl_plat/ds_data_modification_api/group"/>
+</component>
+</collection>
+<collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
+<component name="secon" filter="s60" long-name="Service Controllers">
+<unit bldFile="app/contentcontrol/connectivitymodules/secon/group"/>
+</component>
+</collection>
+<collection name="dsdcmoadapter" long-name="Data Sync DCMO Adapter" level="plugin">
+<!-- Component at wrong rank, should move down a directory -->
+<component name="dsdcmoadapter_build" filter="s60" long-name="Data Sync Control DCMO Adapter">
+<unit bldFile="app/contentcontrol/dsdcmoadapter/group"/>
+</component>
+</collection>
+<collection name="omads" long-name="OMA Data Sync" level="app">
+<component name="omads_build" filter="s60" long-name="OMA DS Build">
+<unit bldFile="app/contentcontrol/omads/group"/>
+<!-- need to remove #include and rename and OMA DS ROM -->
+</component>
+<component name="omadsextensions" filter="s60" long-name="OMA DS Extensions" plugin="Y">
+<unit bldFile="app/contentcontrol/omads/omadsextensions/group"/>
+</component>
+<component name="omadsextensions_qt" filter="s60" long-name="OMA DS Qt Extensions" plugin="Y">
+<unit bldFile="app/contentcontrol/omads/omadsextensions" proFile="omadsextensions.pro"/>
+</component>
+</collection>
+</block>
+<block name="firsttimeuse" level="apps" long-name="First Time Use" levels="support services ui app">
+<!-- these empty collections are really components. Move down a directory and supply units -->
+<collection name="ftuapplication" long-name="First Time Use Application" level="app"/>
+<collection name="fturuntimeservices" long-name="First Time Use Runtime Services" level="services"/>
+<collection name="wizardproviders" long-name="Wizard Providers" level="support"/>
+<collection name="stateproviders" long-name="State Providers" level="support"/>
+<collection name="runtimeproviders" long-name="Runtime Providers" level="support"/>
+<collection name="firsttimeuse_info" long-name="First Time Use Info" level="ui">
+<component name="firsttimeuse_build" long-name="First Time Use Build">
+<unit bldFile="app/firsttimeuse" proFile="ftu.pro" qmakeArgs="-r -config rom"/>
+</component>
+</collection>
+</block>
+<block name="devicecontrol" level="services" long-name="Device Control Daemons" levels="oma mid app">
+<collection name="deviceupdatesui" long-name="Device Updates UI" level="app">
+<component name="deviceupdatesui_adapters" long-name="Device Updates Adapters" filter="s60" introduced="^4" plugin="Y">
+<unit bldFile="app/devicecontrol/deviceupdatesui/adapters/bld"/>
+</component>
+<component name="deviceupdates" long-name="Device Updates" filter="s60" introduced="^4">
+<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdates" proFile="deviceupdates.pro"/>
+</component>
+<component name="deviceupdatesplugin" long-name="Device Updates Plugin" filter="s60" introduced="^4" plugin="Y">
+<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdatesplugin" proFile="deviceupdatesplugin.pro"/>
+</component>
+<component name="deviceupdatesqtsp" long-name="Device Updates Qt Service Provider" filter="s60" introduced="^4">
+<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdatesqtsp" proFile="deviceupdatesqtsp.pro"/>
+</component>
+<component name="cpqtsp" long-name="Client Provisioning Qt Service Provider" filter="s60" introduced="^4">
+<unit bldFile="app/devicecontrol/deviceupdatesui/cpqtsp" proFile="cpqtsp.pro"/>
+</component>
+<component name="devicemanagementnotifiersplugin" long-name="Device Management Notifiers Plugin" filter="s60" introduced="^4" plugin="Y">
+<unit bldFile="app/devicecontrol/deviceupdatesui/devicemanagementnotifiersplugin" proFile="devicemanagementnotifiersplugin.pro"/>
+</component>
+</collection>
+</block>
+<block name="printing" level="services" long-name="Printing"/>
+<block name="files" level="apps" long-name="File Manager Apps" levels="support apps">
+<collection name="filemanager" long-name="File Manager" level="apps">
+<component name="filemanager_plat" long-name="File Manager Platform Interfaces" filter="s60" introduced="^4" class="api"/>
+<component name="fmbkupengine" filter="s60" long-name="File Manager Backup Engine" introduced="^4">
+<unit bldFile="app/files/filemanager/src/fmbkupengine/group"/>
+</component>
+<component name="fmfiledialog" filter="s60,bldfirst" long-name="File Manager File Dialog" introduced="^4">
+<unit bldFile="app/files/filemanager/src/fmfiledialog" proFile="fmfiledialog.pro" qmakeArgs="-r -config rom"/>
+</component>
+<component name="filemanager_build" filter="s60" long-name="File Manager Build">
+<!-- break this up into components or move down a directory -->
+<unit bldFile="app/files/filemanager" qmakeArgs="-r" proFile="filemanager.pro"/>
+</component>
+</collection>
+</block>
+<block name="search" level="apps" long-name="Search Apps" levels="eng base app api">
+<collection name="search_info" long-name="Search Info">
+<component name="search_build" long-name="Search Build" introduced="^4">
+<unit bldFile="app/search/group"/>
+</component>
+</collection>
+<collection name="searchui" long-name="Search UI">
+<component name="searchui_build" long-name="Search UI Build" introduced="^4">
+<unit bldFile="app/search/searchui" proFile="searchui.pro"/>
+</component>
+</collection>
+</block>
+<block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
+<collection name="contacts_plat" long-name="Contacts Apps Platform Interfaces" level="ui">
+<component name="qt_mobility_contacts_api" long-name="Qt Mobility Contacts API" filter="s60" introduced="^4" class="api"/>
+</collection>
+<collection name="phonebookui" long-name="Phonebook UI" level="ui">
+<component name="cnthistorymodel" filter="s60" long-name="Contacts History Model" introduced="^4" class="placeholder">
+<!--<unit bldFile="phonebookui/cnthistorymodel" qt:proFile="cnthistorymodel.pro"/> -->
+</component>
+<component name="pbkcommonui" filter="s60" long-name="Phonebook Common UI" introduced="^4" class="placeholder">
+<!--<unit bldFile="phonebookui/pbkcommonui" qt:proFile="pbkcommonui.pro"/> -->
+</component>
+<component name="phonebookapp" filter="s60" long-name="Phonebook Application" introduced="^4" class="placeholder">
+<!--<unit bldFile="phonebookui/phonebookapp" qt:proFile="phonebookapp.pro"/> -->
+</component>
+<component name="phonebookservices" filter="s60" long-name="Phonebook Services" introduced="^4" class="placeholder">
+<!--<unit bldFile="phonebookui/phonebookservices" qt:proFile="phonebookservices.pro"/> -->
+</component>
+<component name="phonebookui_build" filter="s60" long-name="Phonebook UI Build" introduced="^4">
+<!-- break up into components -->
+<unit bldFile="app/contacts/phonebookui" proFile="phonebookui.pro"/>
+</component>
+</collection>
+<collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
+<component name="cntfindplugin" filter="s60" long-name="Contacts Find Plugin" introduced="^2" plugin="Y">
+<unit bldFile="app/contacts/phonebookengines/cntfindplugin" proFile="cntfindplugin.pro"/>
+</component>
+<component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
+<unit bldFile="app/contacts/phonebookengines_old/contactsmodel/groupsql" mrp="app/contacts/phonebookengines_old/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
+</component>
+<component name="cntsortplugin" filter="s60" long-name="Contacts Sort Plugin" introduced="^2" plugin="Y">
+<unit bldFile="app/contacts/phonebookengines/cntsortplugin" proFile="cntsortplugin.pro"/>
+</component>
+<component name="qtcontactsmobility" filter="s60" long-name="Qt Contacts Mobility" introduced="^4" plugin="Y">
+<!-- need to move to this actual dir rather than including something from another collection -->
+<unit bldFile="app/contacts/qtcontactsmobility" proFile="qtcontactsmobility.pro"/>
+</component>
+<component name="cntlistmodel" filter="s60" long-name="Contact List Model" introduced="^4">
+<unit bldFile="app/contacts/phonebookengines/cntlistmodel" proFile="cntlistmodel.pro"/>
+</component>
+<component name="cntactions" filter="s60" long-name="Contacts Actions" introduced="^4">
+<unit bldFile="app/contacts/phonebookengines/cntactions" proFile="cntactions.pro"/>
+</component>
+<component name="cntmaptileservice" filter="s60" long-name="Contacts Map Tile Service" introduced="^4">
+<unit bldFile="app/contacts/phonebookengines/cntmaptileservice" proFile="cntmaptileservice.pro"/>
+</component>
+<component name="cntsimutility" filter="s60" long-name="Contacts SIM Utility" introduced="^4">
+<unit bldFile="app/contacts/phonebookengines/cntsimutility" proFile="cntsimutility.pro"/>
+</component>
+<component name="cntimageutility" long-name="Contacts Image Utility" filter="s60" introduced="^4">
+<unit bldFile="app/contacts/phonebookengines/cntimageutility" proFile="cntimageutility.pro"/>
+</component>
+</collection>
+<collection name="pimprotocols" long-name="PIM Protocols" level="services">
+<component name="phonebooksync" long-name="Phonebook Sync" purpose="optional" plugin="Y">
+<unit bldFile="app/contacts/pimprotocols/phonebooksync/group" mrp="app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
+</component>
+<component name="pbap" filter="s60" long-name="Bluetooth PBAP" introduced="9.2" purpose="optional">
+<unit bldFile="app/contacts/pimprotocols/pbap/group" mrp="app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
+</component>
+</collection>
+<collection name="presencecache" long-name="Presence Cache" level="support">
+<component name="presencecachesymbian" filter="s60" long-name="Presence Cache Symbian" introduced="^4">
+<unit bldFile="app/contacts/presencecache/presencecachesymbian" proFile="presencecachesymbian.pro"/>
+</component>
+<component name="presencecacheqt" filter="s60" long-name="Presence Cache Qt" introduced="^4">
+<unit bldFile="app/contacts/presencecache/presencecacheqt" proFile="presencecacheqt.pro"/>
+</component>
+</collection>
+<collection name="contacts_info" long-name="Contacts Apps Info" level="ui">
+<component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="organizer" level="apps" span="2" long-name="Organizer Application Suite" levels="support services engine ui app">
+<collection name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" level="app">
+<component name="calendar_interim_utils2_api" long-name="Calendar Interim Utils 2 API" filter="s60" class="api">
+<!-- move into own .pro file -->
+<unit bldFile="app/organizer/organizer_pub" proFile="organizer_pub.pro"/>
+</component>
+</collection>
+<collection name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" level="app">
+<component name="organizer_plat_build" long-name="Organizer Application Suite Platform Interface Build" filter="s60" class="api">
+<!-- break up into individual .pro files -->
+<unit bldFile="app/organizer/organizer_plat" proFile="organizer_plat.pro"/>
+</component>
+<component name="agenda_versit_2_api" long-name="Agenda Versit 2 API" filter="s60" class="api placeholder">
+<!-- <unit bldFile="organizer_plat/agenda_versit_2_api/group"/>-->
+</component>
+<component name="calendar_exporter_api" long-name="Calendar Exporter API" filter="s60" class="api placeholder">
+<!--<unit bldFile="organizer_plat/calendar_exporter_api/group"/>-->
+</component>
+<component name="calendar_importer_api" long-name="Calendar Importer API" filter="s60" class="api placeholder">
+<!--<unit bldFile="organizer_plat/calendar_importer_api/group"/>-->
+</component>
+<component name="calendar_launcher_api" long-name="Calendar Launcher API" filter="s60" class="api placeholder">
+<!--<unit bldFile="organizer_plat/calendar_launcher_api/group"/> -->
+</component>
+<component name="agenda_interface_api" long-name="Agenda Interface API" filter="s60" introduced="^4" class="api"/>
+<component name="calendar_editor_api" long-name="Calendar Editor API" filter="s60" introduced="^4" class="api"/>
+<component name="notes_editor_api" long-name="Notes Editor API" filter="s60" introduced="^4" class="api"/>
+</collection>
+<collection name="agendainterface" long-name="Agenda Interface" level="services">
+<!-- collection is really a component, should move down a directory -->
+<component name="agendainterface_build" filter="s60" long-name="Agenda Interface Build">
+<unit bldFile="app/organizer/agendainterface" proFile="agendainterface.pro"/>
+</component>
+</collection>
+<collection name="calendarui" long-name="Calendar UI" level="ui">
+<component name="commonutils" filter="s60" long-name="Calendar Common Utils">
+<unit bldFile="app/organizer/calendarui/commonutils" proFile="commonutils.pro"/>
+</component>
+<component name="calenlauncher" filter="s60" long-name="Calendar Launcher">
+<unit bldFile="app/organizer/calendarui/calenlauncher" proFile="calenlauncher.pro"/>
+</component>
+<component name="caleneditor" filter="s60" long-name="Calendar Editor" introduced="^4">
+<unit bldFile="app/organizer/calendarui/caleneditor" proFile="caleneditor.pro"/>
+</component>
+<component name="agendaeventviewer" filter="s60" long-name="Agenda Event Viewer" introduced="^4">
+<unit bldFile="app/organizer/calendarui/agendaeventviewer" proFile="agendaeventviewer.pro"/>
+</component>
+<component name="globaldata" filter="s60" long-name="Calendar Global Data">
+<unit bldFile="app/organizer/calendarui/globaldata" proFile="globaldata.pro"/>
+</component>
+<component name="settings" filter="s60" long-name="Calendar Settings">
+<unit bldFile="app/organizer/calendarui/settings" proFile="settings.pro"/>
+</component>
+<component name="calenplugins" filter="s60" long-name="Calendar Plugins" introduced="^4" plugin="Y">
+<unit bldFile="app/organizer/calendarui/calenplugins" proFile="calenplugins.pro"/>
+</component>
+<component name="customisationmanager" filter="s60" long-name="Calendar Customisation Manager">
+<unit bldFile="app/organizer/calendarui/customisationmanager" proFile="customisationmanager.pro"/>
+</component>
+<component name="views" filter="s60" long-name="Calendar Views">
+<unit bldFile="app/organizer/calendarui/views" proFile="views.pro"/>
+</component>
+<component name="calendarui_controller" filter="s60" long-name="Calendar Controller">
+<unit bldFile="app/organizer/calendarui/controller" proFile="controller.pro"/>
+</component>
+<component name="calendarui_application" filter="s60" long-name="Calendar Application">
+<unit bldFile="app/organizer/calendarui/application" proFile="application.pro"/>
+</component>
+<component name="regionalplugins" long-name="Regional Plugins" filter="s60" introduced="^4" plugin="Y">
+<unit bldFile="app/organizer/calendarui/regionalplugins" proFile="regionalplugins.pro"/>
+</component>
+</collection>
+<collection name="notes" long-name="Notes" level="ui">
+<component name="noteseditor" filter="s60" long-name="Notes Editor" introduced="^4">
+<unit bldFile="app/organizer/notes/notesui/noteseditor" proFile="noteseditor.pro"/>
+</component>
+<component name="notes_build" filter="s60" long-name="Notes Build" introduced="^4">
+<unit bldFile="app/organizer/notes" proFile="notes.pro"/>
+</component>
+</collection>
+<collection name="calendarengines" long-name="Calendar Engines" level="engine">
+<component name="versit2" filter="s60" long-name="Versit 2 iCal Parser" introduced="9.2">
+<unit bldFile="app/organizer/calendarengines/versit2/group"/>
+</component>
+<component name="agnversit2" filter="s60" long-name="Versit 2 Agenda Interface" introduced="9.2" plugin="Y">
+<unit bldFile="app/organizer/calendarengines/agnversit2/group"/>
+</component>
+<component name="caleninterimutils" filter="s60" long-name="Calendar Interim Utils" introduced="9.1">
+<unit bldFile="app/organizer/calendarengines/caleninterimutils/group"/>
+</component>
+<component name="calenimp" filter="s60" long-name="Calendar Import Wrapper" introduced="7.0s">
+<unit bldFile="app/organizer/calendarengines/calenimp/group"/>
+</component>
+</collection>
+<collection name="clock" long-name="Clock" level="app">
+<!-- uncomment unit when block_build is split up-->
+<component name="clockengines" filter="s60" long-name="Clock Engines" class="placeholder">
+<!--<unit bldFile="clock/clockengines" qt:proFile="clockengines.pro"/> -->
+</component>
+<component name="clockmw" filter="s60" long-name="Clock Middleware" introduced="^4" class="placeholder">
+<!--<unit bldFile="clock/clockmw" qt:proFile="clockmw.pro"/>-->
+</component>
+<component name="clockui" filter="s60" long-name="Clock UI" class="placeholder">
+<!--<unit bldFile="clock/clockui" qt:proFile="clockui.pro"/>-->
+</component>
+<component name="ftudatetimewizard" filter="s60" long-name="First Time Use Date/Time Wizard" introduced="^4" class="placeholder">
+<!--<unit bldFile="clock/ftudatetimewizard" qt:proFile="ftudatetimewizard.pro"/>-->
+</component>
+<component name="clock_build" filter="s60" long-name="Clock Build">
+<!-- make exports into a component, or just move to one of the above components, then remove this and uncomment the above -->
+<unit bldFile="app/organizer/clock" proFile="clock.pro"/>
+</component>
+</collection>
+<collection name="pimappservices" long-name="PIM Application Services" level="services">
+<component name="calendar" long-name="Calendar" introduced="9.2" purpose="optional">
+<unit bldFile="app/organizer/pimappservices/calendar/group" mrp="app/organizer/pimappservices/calendar/group/app-engines_calendar.mrp" version="2"/>
+</component>
+<component name="calendarvcalplugin" long-name="Calendar vCal Plugin" introduced="8.1" purpose="optional" plugin="Y">
+<unit bldFile="app/organizer/pimappservices/calendarvcalplugin/group" mrp="app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp" version="2"/>
+</component>
+<component name="appenginesdocs" long-name="Application Engines Documentation" purpose="development" class="doc">
+<unit mrp="app/organizer/pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
+</component>
+</collection>
+<collection name="pimappsupport" long-name="PIM Application Support" level="support">
+<component name="vcardandvcal" long-name="vCard and vCal" introduced="ER5" purpose="optional">
+<unit bldFile="app/organizer/pimappsupport/vcardandvcal/group" mrp="app/organizer/pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
+</component>
+<component name="chinesecalendarconverter" long-name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
+<unit bldFile="app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
+</component>
+<component name="chinesecalendaralg" long-name="Chinese Calendar Algorithm" introduced="^2" purpose="optional" plugin="Y">
+<unit bldFile="app/organizer/pimappsupport/chinesecalendaralg/group" mrp="app/organizer/pimappsupport/chinesecalendaralg/group/app-services_chinesecalendaralgorithm.mrp"/>
+</component>
+</collection>
+<collection name="alarmui" long-name="Alarm UI" level="app">
+<!-- collection is really a component, should move down a directory -->
+<component name="alarmui_build" filter="s60" long-name="Alarm UI Build">
+<unit bldFile="app/organizer/alarmui" proFile="alarmui.pro"/>
+</component>
+</collection>
+<collection name="organizer_info" long-name="Organizer Application Suite Info" level="app">
+<component name="organizer_metadata" long-name="Organizer Application Suite Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="plugin eng base app api">
+<collection name="msg_plat" long-name="Messaging Apps Platform APIs" level="api">
+<component name="messaging_media_resolver_api" long-name="Messaging Media Resolver API" filter="s60" class="api"/>
+<component name="mms_application_api" long-name="MMS Application API" filter="s60" class="api"/>
+<component name="mms_codec_client_api" long-name="MMS Codec Client API" filter="s60" class="api"/>
+<component name="mms_conformance_api" long-name="MMS Conformance API" filter="s60" class="api"/>
+<component name="mms_engine_settings_api" long-name="MMS Engine Settings API" filter="s60" class="api"/>
+<component name="mms_server_settings_api" long-name="MMS Server Settings API" filter="s60" class="api"/>
+<component name="conversation_services_client_api" long-name="Conversation Services Client API" filter="s60" introduced="^4" class="api"/>
+<component name="conversation_services_plugin_api" long-name="Conversation Services Plugin API" filter="s60" introduced="^4" class="api"/>
+<component name="conversation_services_utilities_api" long-name="Conversation Services Utilities API" filter="s60" introduced="^4" class="api"/>
+<component name="shareui_api" long-name="Share UI API" filter="s60" introduced="^4" class="api"/>
+<component name="messaging_history_api" long-name="Messaging History API" filter="s60" introduced="^4" class="api"/>
+<component name="msg_plat_build" long-name="Messaging Apps Platform APIs Build" filter="s60" introduced="^4" class="api">
+<unit bldFile="app/messaging/msg_plat" proFile="msg_plat.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+<collection name="msg_pub" long-name="Messaging Apps Public APIs" level="api">
+<component name="mms_client_mtm_api" long-name="MMS Client MTM API" filter="s60" class="api"/>
+<component name="msg_smil_dtd_api" long-name="Messaging SMIL DTD API" filter="s60" introduced="^4" class="api"/>
+<component name="msg_pub_build" long-name="Messaging Apps Public APIs Build" filter="s60" introduced="^4" class="api">
+<unit bldFile="app/messaging/msg_pub" proFile="msg_pub.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+<collection name="mobilemessaging" long-name="Mobile Messaging" level="plugin">
+<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
+<unit bldFile="app/messaging/mobilemessaging/smsmtm/group" mrp="app/messaging/mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
+</component>
+</collection>
+<collection name="messagingappbase" long-name="Messaging App Base" level="base">
+<component name="messagingappbase_build" filter="s60" long-name="Messaging App Base Build" introduced="^4">
+<!-- break this up into the below components -->
+<unit bldFile="app/messaging/messagingappbase" proFile="messagingappbase.pro" qmakeArgs="-r"/>
+</component>
+<component name="msgmedia" filter="s60" long-name="Message Media"/>
+<component name="smilparser" long-name="SMIL Parser" introduced="7.0s" purpose="optional">
+<unit bldFile="app/messaging/messagingappbase/smilparser/GROUP" mrp="app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
+</component>
+<component name="obexmtms" long-name="OBEX MTMs" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="app/messaging/messagingappbase/obexmtms/Group" mrp="app/messaging/messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
+</component>
+</collection>
+<collection name="mmsengine" long-name="MMS Engine" level="eng">
+<component name="mmsconninit" filter="s60" long-name="MMS Connection Initiator" class="placeholder">
+<!-- <unit bldFile="mmsengine/mmsconninit/bld"/> -->
+</component>
+<component name="genutils" filter="s60" long-name="General Utils" class="placeholder">
+<!-- <unit bldFile="mmsengine/genutils/bld"/> -->
+</component>
+<component name="mmsserversettings" filter="s60" long-name="MMS Server Settings" class="placeholder">
+<!-- <unit bldFile="mmsengine/mmsserversettings/bld"/> -->
+</component>
+<component name="mmsmessage" filter="s60" long-name="MMS Message" class="placeholder">
+<!-- <unit bldFile="mmsengine/mmsmessage/bld"/> -->
+</component>
+<component name="mmshttptransport" filter="s60" long-name="MMS HTTP Transport" class="placeholder">
+<!-- <unit bldFile="mmsengine/mmshttptransport/bld"/> -->
+</component>
+<component name="mmscodec" filter="s60" long-name="MMS Codec" class="placeholder">
+<!-- <unit bldFile="mmsengine/mmscodec/bld"/> -->
+</component>
+<component name="mmsserver" filter="s60" long-name="MMS Server" class="placeholder">
+<!-- <unit bldFile="mmsengine/mmsserver/bld"/> -->
+</component>
+<component name="clientmtm" filter="s60" long-name="MMS Client MTM" plugin="Y" class="placeholder">
+<!-- <unit bldFile="mmsengine/clientmtm/bld"/> -->
+</component>
+<component name="mmswatcher" filter="s60" long-name="MMS Watcher" plugin="Y" class="placeholder">
+<!-- <unit bldFile="mmsengine/mmswatcher/bld"/> -->
+</component>
+<component name="mmspushhandler" filter="s60" long-name="MMS Push Handler" plugin="Y" class="placeholder">
+<!-- <unit bldFile="mmsengine/mmspushhandler/bld"/> -->
+</component>
+<component name="applicationadapter" filter="s60" long-name="MMS Application Adapter" class="placeholder">
+<!-- <unit bldFile="mmsengine/applicationadapter/bld"/> -->
+</component>
+<component name="mmscodecclient" filter="s60" long-name="MMS Codec Client" class="placeholder">
+<!-- <unit bldFile="mmsengine/mmscodecclient/bld"/> -->
+</component>
+<component name="mmssettings" long-name="MMS Settings" introduced="9.2" purpose="optional">
+<unit bldFile="app/messaging/mmsengine/mmssettings/group" mrp="app/messaging/mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
+</component>
+<component name="mmsconf" long-name="MMS Configuration" purpose="optional">
+<unit bldFile="app/messaging/mmsengine/mmsconf" mrp="app/messaging/mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
+</component>
+<component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
+<!-- this should be broken up into the individual other components -->
+<unit bldFile="app/messaging/mmsengine" proFile="mmsengine.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+<collection name="messagingapp" long-name="Messaging Application" level="app">
+<component name="messagingapp_build" filter="s60" long-name="MMS Engine Build">
+<!-- this should be broken up into the individual other components -->
+<unit bldFile="app/messaging/messagingapp" proFile="messagingapp.pro" qmakeArgs="-r"/>
+</component>
+<component name="msgutils" filter="s60" long-name="Messaging Utils" introduced="^4">
+<unit bldFile="app/messaging/messagingapp/msgutils" proFile="msgutils.pro" qmakeArgs="-r"/>
+</component>
+<component name="msgappfw" filter="s60" long-name="Messaging Application Framework" introduced="^4">
+<unit bldFile="app/messaging/messagingapp/msgappfw" proFile="msgappfw.pro" qmakeArgs="-r"/>
+</component>
+<component name="msgsettings" filter="s60" long-name="Messaging Settings" introduced="^4">
+<unit bldFile="app/messaging/messagingapp/msgsettings" proFile="msgsettings.pro" qmakeArgs="-r"/>
+</component>
+<component name="msgnotifications" filter="s60" long-name="Messaging Notifications" introduced="^4">
+<unit bldFile="app/messaging/messagingapp/msgnotifications" proFile="msgnotifications.pro" qmakeArgs="-r"/>
+</component>
+<component name="smartmessaging" filter="s60" long-name="Smart Messaging">
+<unit bldFile="app/messaging/messagingapp/smartmessaging" proFile="smartmessaging.pro" qmakeArgs="-r"/>
+</component>
+<component name="shareui" filter="s60" long-name="Shared UI" introduced="^4">
+<unit bldFile="app/messaging/messagingapp/shareui" proFile="shareui.pro" qmakeArgs="-r"/>
+</component>
+<component name="msgui" filter="s60" long-name="Messaging UI" introduced="^4">
+<unit bldFile="app/messaging/messagingapp/msgui" proFile="msgui.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+<collection name="email" long-name="Email" level="plugin">
+<!-- use commonemail instead -->
+<component name="pop3andsmtpmtm" long-name="POP3 and SMTP MTM" purpose="optional" deprecated="^3" plugin="Y">
+<unit bldFile="app/messaging/email/pop3andsmtpmtm/group" mrp="app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
+</component>
+<component name="imap4mtm" long-name="IMAP4 MTM" introduced="9.2" purpose="optional" deprecated="^3" plugin="Y">
+<unit bldFile="app/messaging/email/imap4mtm/group" mrp="app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
+</component>
+</collection>
+<collection name="messaging_info" long-name="Messaging Apps Info" level="api">
+<component name="messaging_metadata" long-name="Messaging Apps Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="commonemail" level="apps" span="2" long-name="Email Apps" levels="service support ui app">
+<!-- need to resolve the qt parts into proper components, then uncomment the units -->
+<collection name="email_plat" long-name="Email Apps Platform Interfaces" level="app">
+<component name="nmail_client_api" long-name="NMail Client API" filter="s60" introduced="^4" class="api placeholder">
+<!--<unit bldFile="email_plat" qt:proFile="email_plat.pro"/> -->
+</component>
+</collection>
+<collection name="emailservices" long-name="Email Services" level="service">
+<component name="nmailbase" filter="s60" long-name="NMail Base" introduced="^4" class="placeholder">
+<!-- <unit bldFile="emailservices/nmailbase" qt:proFile="nmailbase.pro"/> -->
+</component>
+<component name="emailcommon" filter="s60" long-name="Email Common" introduced="^4" class="placeholder">
+<!-- <unit bldFile="emailservices/emailcommon" qt:proFile="emailcommon.pro"/>-->
+</component>
+<component name="emailframework" filter="s60" long-name="Email Framework" introduced="^2" class="placeholder">
+<!-- <unit bldFile="emailservices/emailframework" qt:proFile="emailframework.pro"/>-->
+</component>
+<component name="emailstore" filter="s60" long-name="Email Store" introduced="^2" class="placeholder">
+<!-- <unit bldFile="emailservices/emailstore" qt:proFile="emailstore.pro"/>-->
+</component>
+<component name="nmclientapi" filter="s60" long-name="Nmail Client API" introduced="^4" class="placeholder">
+<!-- <unit bldFile="emailservices/nmclientapi" qt:proFile="nmclientapi.pro"/>-->
+</component>
+<component name="nmailagent" filter="s60" long-name="Nmail Agent" introduced="^4" class="placeholder">
+<!-- <unit bldFile="emailservices/nmailagent" qt:proFile="nmailagent.pro"/>-->
+</component>
+</collection>
+<collection name="ipsservices" long-name="IMAP/POP/SMTP Services" level="service">
+<component name="ipssosplugin" filter="s60" long-name="IPS SOS Plugin" introduced="^2" plugin="Y" class="placeholder">
+<!-- SOS? Consider spelling it out since the abbreviation is ambiguous -->
+<!--<unit bldFile="ipsservices/ipssosplugin" qt:proFile="ipssosplugin.pro" />-->
+</component>
+<component name="nmimapclientplugin" filter="s60" long-name="NM IMAP Client Plugin" introduced="^4" plugin="Y" class="placeholder">
+<!--<unit bldFile="ipsservices/nmimapclientplugin" qt:proFile="nmimapclientplugin.pro"/>-->
+</component>
+<component name="nmipsmtms" filter="s60" long-name="NM IPS Client Plugin" introduced="^4" plugin="Y" class="placeholder">
+<!-- <unit bldFile="ipsservices/nmipsmtms" qt:proFile="nmipsmtms.pro"/>-->
+</component>
+<component name="nmipssettings" filter="s60" long-name="NM IPS Settings" introduced="^4" class="placeholder">
+<!-- <unit bldFile="ipsservices/nmipssettings" qt:proFile="nmipssettings.pro"/>-->
+</component>
+<component name="ipsservices_build" filter="s60" long-name="IPS Services Build" introduced="^2" class="placeholder">
+<!--<unit bldFile="ipsservices" qt:proFile="ipsservices.pro"/> -->
+<!-- can the exports be broken up into the other components or made a config component?-->
+</component>
+</collection>
+<collection name="emailuis" long-name="Email UIs" level="app">
+<component name="nmailuiengine" filter="s60" long-name="Nmail UI Engine" introduced="^4" class="placeholder">
+<!-- <unit bldFile="emailuis/nmailuiengine" qt:proFile="nmailuiengine.pro"/> -->
+</component>
+<component name="nmailuiwidgets" filter="s60" long-name="Nmail UI Widgets" introduced="^4" class="placeholder">
+<!-- <unit bldFile="emailuis/nmailuiwidgets" qt:proFile="nmailuiwidgets.pro"/> -->
+</component>
+<component name="nmailuiwidgetsplugin" filter="s60" long-name="Nmail UI Widgets Plugin" introduced="^4" plugin="Y" class="placeholder">
+<!-- <unit bldFile="emailuis/nmailuiwidgetsplugin" qt:proFile="nmailuiwidgetsplugin.pro"/> -->
+</component>
+<component name="nmsettingui" filter="s60" long-name="Nmail Setting UI" introduced="^4" plugin="Y" class="placeholder">
+<!-- <unit bldFile="emailuis/nmsettingui" qt:proFile="nmsettingui.pro"/> -->
+</component>
+<component name="nmailcpplugin" filter="s60" long-name="Nmail CP Plugin" introduced="^4" plugin="Y" class="placeholder">
+<!-- <unit bldFile="emailuis/nmailcpplugin" qt:proFile="nmailcpplugin.pro"/> -->
+</component>
+<component name="nmailui" filter="s60" long-name="Nmail UI" introduced="^4" class="placeholder">
+<!-- <unit bldFile="emailuis/nmailui" qt:proFile="nmailui.pro"/> -->
+</component>
+<component name="nmindicatorplugin" filter="s60" long-name="Nmail Indicator Plugin" introduced="^4" plugin="Y" class="placeholder">
+<!-- <unit bldFile="emailuis/nmindicatorplugin" qt:proFile="nmindicatorplugin.pro"/> -->
+</component>
+<component name="nmframeworkadapter" filter="s60" long-name="Nmail Framework Adapter" introduced="^4" plugin="Y" class="placeholder">
+<!-- <unit bldFile="emailuis/nmframeworkadapter" qt:proFile="nmframeworkadapter.pro"/> -->
+</component>
+</collection>
+<collection name="commonemail_info" long-name="Email Apps Info" level="app">
+<component name="commonemail_build" long-name="Email Apps Build" introduced="^4">
+<!-- split into actual components -->
+<unit bldFile="app/commonemail" proFile="nmail.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+</block>
+<block name="camera" level="apps" long-name="Camera Apps">
+<collection name="camerauis" long-name="Camera UIs">
+<component name="cameraxui" filter="s60" long-name="CameraX UIs">
+<unit bldFile="app/camera/camerauis/cameraxui" filter="!test" proFile="camerax.pro"/>
+</component>
+</collection>
+</block>
+<block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
+<collection name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" level="apps">
+<component name="videoplayer_startup_api" long-name="Video Player Startup API" filter="s60" class="api">
+<unit bldFile="app/videoplayer/videoplayer_plat/videoplayer_startup_api/group"/>
+</component>
+<component name="videocollection_api" long-name="Video Collection API" filter="s60" class="api">
+<unit bldFile="app/videoplayer/videoplayer_plat/videocollection_api/group"/>
+</component>
+</collection>
+<collection name="videocollection" long-name="Video Collection" level="util">
+<component name="mpxmyvideoscollection" filter="s60" long-name="MPX My Videos Collection" introduced="^3">
+<unit bldFile="app/videoplayer/videocollection/mpxmyvideoscollection/group"/>
+</component>
+<component name="videocollectionwrapper" filter="s60" long-name="Video Collection Wrapper" introduced="^4">
+<unit bldFile="app/videoplayer/videocollection/videocollectionwrapper" proFile="videocollectionwrapper.pro" qmakeArgs="-r"/>
+</component>
+<component name="videocollectionview" filter="s60" long-name="Video Collection View" introduced="^4">
+<unit bldFile="app/videoplayer/videocollection/videocollectionview" proFile="videocollectionview.pro" qmakeArgs="-r"/>
+</component>
+<component name="videofiledetailsview" filter="s60" long-name="Video File Details View" introduced="^4">
+<unit bldFile="app/videoplayer/videocollection/videofiledetailsview" proFile="videofiledetailsview.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+<collection name="mediasettings" long-name="Media Settings" level="support">
+<!-- this is really a component. Should be moved down a directory -->
+<component name="mediasettings_build" filter="s60" long-name="Media Settings Build">
+<unit bldFile="app/videoplayer/mediasettings/group"/>
+</component>
+</collection>
+<collection name="videoplayerapp" long-name="Video Player App" level="apps">
+<component name="videoplayerengine" long-name="Video Player Engine" filter="s60" introduced="^4">
+<unit bldFile="app/videoplayer/videoplayerapp/videoplayerengine" proFile="videoplayerengine.pro" qmakeArgs="-r"/>
+</component>
+<component name="hbvideoplayer" filter="s60" long-name="Video Player" introduced="^4">
+<unit bldFile="app/videoplayer/videoplayerapp/videoplayer" proFile="videoplayer.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+<collection name="videoplayback" long-name="Video Playback Plugins" level="plugin">
+<component name="hbvideoplaybackview" filter="s60" long-name="HB Video Playback View" introduced="^4" plugin="Y">
+<unit bldFile="app/videoplayer/videoplayback/hbvideoplaybackview" proFile="hbvideoplaybackview.pro" qmakeArgs="-r"/>
+</component>
+<component name="hbvideoplaybackviewplugin" filter="s60" long-name="HB Video Playback View Plugin" introduced="^4" plugin="Y">
+<unit bldFile="app/videoplayer/videoplayback/hbvideoplaybackviewplugin" proFile="hbvideoplaybackviewplugin.pro" qmakeArgs="-r"/>
+</component>
+<component name="videohelix" long-name="Video Helix" filter="s60" introduced="^3" plugin="Y">
+<unit bldFile="app/videoplayer/videoplayback/videohelix/group"/>
+</component>
+</collection>
+</block>
+<block name="photos" level="apps" long-name="Photos" levels="util support ui app">
+<collection name="photos_group" long-name="Photos Group" level="support">
+<component name="photos_group_build" filter="s60" long-name="Photos Group Build" introduced="^4" class="placeholder">
+<!--<unit bldFile="group" qt:proFile="group.pro"/> -->
+</component>
+</collection>
+<collection name="photos_loggers" long-name="Photos Loggers" level="util">
+<component name="photos_loggerqt" filter="s60" long-name="Photos Logger Qt" introduced="^4" class="placeholder">
+<!--<unit bldFile="loggers/loggerqt" qt:proFile="loggerqt.pro"/> -->
+</component>
+</collection>
+<collection name="photos_commonutilities" long-name="Photos Common Utilities" level="util">
+<component name="photos_externalutility" filter="s60" long-name="Photos External Utility" introduced="^4" class="placeholder">
+<!--<unit bldFile="commonutilities/externalutility" qt:proFile="externalutility.pro"/> -->
+</component>
+<component name="imagedecoderwrapper" filter="s60" long-name="Image Decoder Wrapper" introduced="^4" class="placeholder">
+<!--<unit bldFile="commonutilities/imagedecoderwrapper" qt:proFile="imagedecoderwrapper.pro"/> -->
+</component>
+</collection>
+<collection name="photos_ui" long-name="Photos UI" level="ui">
+<component name="photos_uiengine" filter="s60" long-name="Photos UI Engine" introduced="^4" class="placeholder">
+<!--<unit bldFile="ui/uiengine" qt:proFile="uiengine.pro"/> -->
+</component>
+<component name="photos_commandhandlers" filter="s60" long-name="Photos Command Handlers" introduced="^4" class="placeholder">
+<!--<unit bldFile="ui/commandhandlers" qt:proFile="commandhandlers.pro"/> -->
+</component>
+<component name="photos_views" filter="s60" long-name="Photos Views" introduced="^4" class="placeholder">
+<!--<unit bldFile="ui/views" qt:proFile="views.pro"/> -->
+</component>
+<component name="photos_viewmanagement" filter="s60" long-name="Photos View Management" introduced="^4" class="placeholder">
+<!--<unit bldFile="ui/viewmanagement" qt:proFile="viewmanagement.pro"/> -->
+</component>
+</collection>
+<collection name="photos_main" long-name="Photos Main" level="support">
+<component name="photos_main_build" filter="s60" long-name="Photos Main Build" introduced="^4" class="placeholder">
+<!--<unit bldFile="main" qt:proFile="main.pro"/> -->
+</component>
+</collection>
+<collection name="imageviewerapp" long-name="Image Viewer App" level="support">
+<component name="imageviewerapp_build" filter="s60" long-name="Image Viewer App Build" introduced="^4" class="placeholder">
+<!--<unit bldFile="imageviewerapp" qt:proFile="imageviewerapp.pro"/> -->
+</component>
+</collection>
+<collection name="photos_info" long-name="Photos Info" level="support">
+<component name="photos_build" filter="s60" long-name="Photos Build" introduced="^4">
+<!-- split this up into the above components -->
+<unit bldFile="app/photos" proFile="photos.pro"/>
+</component>
+</collection>
+</block>
+<block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support hs app">
+<!-- move the export .pri files into their components and uncomment the units -->
+<collection name="musicplayer_utilities " long-name="Music Player Utilities" level="support">
+<component name="mpnowplayingbanner" filter="s60" long-name="MP Now Playing Banner" introduced="^4" class="placeholder">
+<!-- <unit bldFile="utilities/mpnowplayingbanner" qt:proFile="mpnowplayingbanner.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+<component name="mpsettingsmanager" filter="s60" long-name="MP Settings Manager" introduced="^4" class="placeholder">
+<!-- <unit bldFile="utilities/mpsettingsmanager" qt:proFile="mpsettingsmanager.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+</collection>
+<collection name="musicfetcher " long-name="Music Fetcher" level="support">
+<!-- collection is really a component, move down a directory -->
+<component name="musicfetcher_buld" filter="s60" long-name="Music Fetcher Build" introduced="^4" class="placeholder">
+<!-- <unit bldFile="musicfetcher" qt:proFile="musicfetcher.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+</collection>
+<collection name="musicplayer_app " long-name="Music Player Application" level="app">
+<!-- collection is really a component, move down a directory -->
+<component name="musicplayer_app_build" filter="s60" long-name="Music Player Application Build" introduced="^4" class="placeholder">
+<!-- <unit bldFile="app" qt:proFile="app.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+</collection>
+<collection name="mpviewplugins " long-name="Music Player View Plugins" level="plugins">
+<component name="mpcollectionviewplugin" filter="s60" long-name="MP Collection View Plugin" introduced="^4" plugin="Y" class="placeholder">
+<!--<unit bldFile="mpviewplugins/mpcollectionviewplugin/group"/>-->
+</component>
+<component name="mpplaybackviewplugin" filter="s60" long-name="MP Playback View Plugin" introduced="^4" plugin="Y" class="placeholder">
+<!--<unit bldFile="mpviewplugins/mpplaybackviewplugin/group"/>-->
+</component>
+</collection>
+<collection name="mpserviceplugins" long-name="Music Player Service Plugins" level="plugins">
+<component name="audioeffects" filter="s60" long-name="Audio Effects" introduced="^4" plugin="Y" class="placeholder">
+<!--<unit bldFile="mpserviceplugins/audioeffects/group"/>-->
+</component>
+<component name="localaudio" filter="s60" long-name="Local Audio" introduced="^4" plugin="Y" class="placeholder">
+<!--<unit bldFile="mpserviceplugins/localaudio/group"/>-->
+</component>
+<!-- Note: it's called SQLite, not SQLLite, just the one "L" -->
+<component name="mpxsqlitedbcommon" filter="s60" long-name="MPX SQLite Database Common" introduced="^4" class="placeholder">
+<!--<unit bldFile="mpserviceplugins/mpxsqlitedbcommon/group"/>-->
+</component>
+<component name="mpxsqlitedbplugin" filter="s60" long-name="MPX SQLite Database Plugin" introduced="^4" plugin="Y" class="placeholder">
+<!--<unit bldFile="mpserviceplugins/mpxsqlitedbplugin/group"/>-->
+</component>
+<component name="mpxsqlitepodcastdbplugin" filter="s60" long-name="MPX SQLlite Podcast Database Plugin" introduced="^4" plugin="Y" class="placeholder">
+<!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
+</component>
+<component name="m3uplaylistplugin" filter="s60" long-name="M3U Playlist Plugin" introduced="^4" plugin="Y" class="placeholder">
+<!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
+</component>
+</collection>
+<collection name="musicplayer_info" long-name="Music Player Apps Info" level="app">
+<component name="musicplayer_build" filter="s60" long-name="Music Player Build">
+<!-- should brak up into individual components -->
+<unit bldFile="app/musicplayer" proFile="qtmusicplayer.pro" qmakeArgs="-r -config rom"/>
+</component>
+</collection>
+</block>
+<block name="radio" level="apps" long-name="Radio Apps" levels="engine ui">
+<collection name="radioengine" long-name="Radio Engine" level="engine">
+<component name="radioengineutils" filter="s60" long-name="Radio Engine Utils" introduced="^4">
+<unit bldFile="app/radio/radioengine/utils/group"/>
+</component>
+<component name="radioenginesettings" filter="s60" long-name="Radio Engine Settings" introduced="^4">
+<unit bldFile="app/radio/radioengine/settings/group"/>
+</component>
+<component name="radioengine_engine" filter="s60" long-name="Radio Engine" introduced="^4">
+<unit bldFile="app/radio/radioengine/engine/group"/>
+</component>
+</collection>
+<collection name="radioapp" long-name="Radio App" level="ui">
+<component name="radioenginewrapper" filter="s60" long-name="Radio Engine Wrapper" introduced="^4">
+<unit bldFile="app/radio/radioapp/radioenginewrapper" proFile="radioenginewrapper.pro"/>
+</component>
+<component name="radiopresetstorage" filter="s60" long-name="Radio Preset Storage" introduced="^4">
+<unit bldFile="app/radio/radioapp/radiopresetstorage" proFile="radiopresetstorage.pro"/>
+</component>
+<component name="radiouiengine" filter="s60" long-name="Radio UI Engine" introduced="^4">
+<unit bldFile="app/radio/radioapp/radiouiengine" proFile="radiouiengine.pro"/>
+</component>
+<component name="radiowidgets" filter="s60" long-name="Radio Widgets" introduced="^4">
+<unit bldFile="app/radio/radioapp/radiowidgets" proFile="radiowidgets.pro"/>
+</component>
+<component name="radioapplication" filter="s60" long-name="Radio Application" introduced="^4">
+<unit bldFile="app/radio/radioapp/radioapplication" proFile="radioapplication.pro"/>
+</component>
+<component name="radio_rom" filter="s60" long-name="Radio ROM" introduced="^4">
+<unit bldFile="app/radio/rom"/>
+</component>
+</collection>
+</block>
+<block name="internetradio" level="apps" long-name="Internet Radio Apps" levels="engine server ui">
+<collection name="internetradio2_0" long-name="Internet Radio 2.0" level="ui">
+<!-- collection is really a component. Move down a dir -->
+<component name="internetradio2_0_build" long-name="Internet Radio 2.0 Build">
+<unit bldFile="app/internetradio/internetradio2.0/group"/>
+</component>
+</collection>
+<collection name="presetserver" long-name="Preset Server" level="server">
+<!-- collection is really a component. Move down a dir -->
+<component name="presetserver_build" long-name="Preset Server Build">
+<unit bldFile="app/internetradio/presetserver/group"/>
+</component>
+</collection>
+<collection name="qtinternetradio" long-name="Qt Internet Radio">
+<component name="qtinternetradio_build" long-name="Qt Internet Radio Build">
+<!-- Move down a dir or break into components-->
+<unit bldFile="app/internetradio/qtinternetradio" proFile="all.pro" qmakeArgs="-r -config rom"/>
+</component>
+</collection>
+</block>
+<block name="podcatcher" level="apps" long-name="Podcatcher" levels="app">
+<collection name="podcatcher_info" long-name="Podcatcher" level="app">
+<component name="podcatcher_build" filter="sf_build" long-name="Podcatcher Build" introduced="^3">
+<!-- has exports from top level bld.inf -->
+<unit bldFile="app/podcatcher/group"/>
+</component>
+<component name="podcatcher_app" filter="sf_build" long-name="Podcatcher Application" introduced="^3">
+<unit bldFile="app/podcatcher/application/group"/>
+</component>
+<component name="podcatcher_engine" filter="sf_build" long-name="Podcatcher Engine" introduced="^3">
+<unit bldFile="app/podcatcher/engine/group"/>
+</component>
+</collection>
+</block>
+<block name="homescreen" level="apps" long-name="Home Screen Apps" levels="support task ss hs">
+<collection name="homescreen_info" long-name="Home Screen Info" level="support">
+<component name="homescreen_build" long-name="Homescreen Build">
+<!-- break this up properly into components -->
+<unit bldFile="app/homescreen" proFile="homescreen.pro" qmakeArgs="-r -config rom"/>
+</component>
+</collection>
+<collection name="homescreen_test" long-name="Home Screen Test" level="support"/>
+<!-- fiill in details with broken up homescreen_build -->
+<collection name="homescreenapp" long-name="Home Screen Application" level="hs">
+<component name="hsutils" long-name="Home Screen Utils" introduced="^4"/>
+<component name="hsdomainmodel" long-name="HS Domain Model" introduced="^4"/>
+<component name="hs_runtimeplugins" long-name="HS Runtime Plugins" introduced="^4" plugin="Y"/>
+<component name="hs_serviceproviders" long-name="HS Service Providers" introduced="^4" plugin="Y"/>
+<component name="hs_stateplugins" long-name="HS State Plugins" introduced="^4" plugin="Y"/>
+<component name="hs_widgetplugins" long-name="HS Widget Plugins" introduced="^4" plugin="Y"/>
+<component name="hsapplication" long-name="Home Screen Application" introduced="^4"/>
+<component name="hshomescreenclientplugin" long-name="Home Screen Client Plugin" introduced="^4" plugin="Y"/>
+<component name="hsmenucontentpublish" long-name="HS Menu Content Publish" introduced="^4"/>
+</collection>
+<collection name="screensaverapp" long-name="Screen Saver Application" level="ss">
+<component name="snsrutils" long-name="Screen Saver Utils" introduced="^4"/>
+<component name="snsr_serviceproviders" long-name="Screen Saver Service Providers" introduced="^4" plugin="Y"/>
+<component name="snsr_stateproviders" long-name="Screen Saver State Providers" introduced="^4" plugin="Y"/>
+<component name="snsr_runtimeproviders" long-name="Screen Saver Runtime Providers" introduced="^4" plugin="Y"/>
+<component name="snsrapplication" long-name="Screen Saver Application" introduced="^4"/>
+<component name="screensaverproviders" long-name="Screen Saver Providers" introduced="^4" plugin="Y"/>
+</collection>
+<collection name="taskswitcherapp" long-name="Task Switcher Application" level="task">
+<component name="taskswitcherappecom" long-name="Task Switcher Application ECom" introduced="^4"/>
+<component name="tsserviceplugin" long-name="Task Switcher Service Plugin" introduced="^4" plugin="Y"/>
+<component name="ts_runtimeplugins" long-name="TS Runtime Plugins" introduced="^4" plugin="Y"/>
+<component name="tsapplication" long-name="Task Switcher Application" introduced="^4"/>
+</collection>
+</block>
+<block name="jrt" level="services" long-name="Java Runtime" levels="util generic rt ui">
+<collection name="jrt_plat" long-name="JRT Platform Interfaces" level="ui">
+<component name="java_registry_api" long-name="Java Registry API" filter="s60" class="api">
+<unit bldFile="app/jrt/jrt_plat/java_registry_api/build"/>
+</component>
+<component name="java_env_info_api" long-name="Java Environment Info API" filter="s60" class="api">
+<unit bldFile="app/jrt/jrt_plat/java_env_info_api/build"/>
+</component>
+<component name="java_debug_api" long-name="Java Debug API" filter="s60" class="api">
+<unit bldFile="app/jrt/jrt_plat/java_debug_api/build"/>
+</component>
+</collection>
+<collection name="build_nativejava" long-name="Build Native Java">
+<component name="nativejava" long-name="Build Native Java" filter="s60" introduced="^4">
+<unit bldFile="app/jrt/build/nativejava" filter="sf_build" proFile="nativejava.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
+</component>
+</collection>
+<collection name="javacommons" long-name="Java Commons" level="generic">
+<component name="javacommons_build" filter="s60" long-name="JRT Build">
+<unit bldFile="app/jrt/javacommons" filter="!sf_build" proFile="javacommons.pro" qmakeArgs="-r"/>
+<unit bldFile="app/jrt/javacommons" filter="sf_build" proFile="javacommons.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
+</component>
+</collection>
+<collection name="javaruntimes" long-name="Java Runtimes" level="rt">
+<component name="javaruntimes_build" filter="s60" long-name="JRT Build">
+<unit bldFile="app/jrt/javaruntimes" filter="!sf_build" proFile="javaruntimes.pro" qmakeArgs="-r"/>
+<unit bldFile="app/jrt/javaruntimes" filter="sf_build" proFile="javaruntimes.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
+</component>
+</collection>
+<collection name="javauis" long-name="Java UIs" level="ui">
+<component name="javauis_build" filter="s60" long-name="JRT Build">
+<unit bldFile="app/jrt/javauis" filter="!sf_build" proFile="javauis.pro" qmakeArgs="-r"/>
+<unit bldFile="app/jrt/javauis" filter="sf_build" proFile="javauis.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
+</component>
+</collection>
+<collection name="javamanager" level="generic">
+<component name="javamanager_build" filter="s60" long-name="JRT Build">
+<unit bldFile="app/jrt/javamanager" filter="!sf_build" proFile="javamanager.pro" qmakeArgs="-r"/>
+<unit bldFile="app/jrt/javamanager" filter="sf_build" proFile="javamanager.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
+</component>
+</collection>
+<collection name="javatools" long-name="Java Tools" level="util">
+<component name="javatools_build" filter="s60" long-name="JRT Build">
+<unit bldFile="app/jrt/javatools" filter="!sf_build" proFile="javatools.pro" qmakeArgs="-r"/>
+<unit bldFile="app/jrt/javatools" filter="sf_build" proFile="javatools.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
+</component>
+</collection>
+<collection name="javaextensions" long-name="Java Extensions" level="generic">
+<component name="javaextensions_build" filter="s60" long-name="JRT Build">
+<unit bldFile="app/jrt/javaextensions" filter="!sf_build" proFile="javaextensions.pro" qmakeArgs="-r"/>
+<unit bldFile="app/jrt/javaextensions" filter="sf_build" proFile="javaextensions.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
+</component>
+</collection>
+</block>
+<block name="browserui" level="services" long-name="Browser UI" levels="utils support ui">
+<collection name="browserui_info" long-name="Browser UI Info" level="ui">
+<component name="browserui_build" long-name="Bookmarks Engine Build" introduced="^4">
+<unit bldFile="app/browserui" proFile="browserui.pro" qmakeArgs=""what+=plat_101""/>
+</component>
+</collection>
+</block>
+<block name="conntools" level="services" long-name="Connectivity Tools" levels="config app">
+<collection name="nettools" long-name="Net Tools" level="app">
+<component name="conntest" filter="s60" long-name="Connection Test" purpose="development">
+<unit bldFile="app/conntools/nettools/conntest/group"/>
+</component>
+</collection>
+<collection name="emulatorlan" long-name="Emulator LAN" level="config">
+<!-- component is actually a colleciton, should be moved down a directory -->
+<component name="emulatorlan_build" filter="s60" long-name="Emulator LAN Build" purpose="development" class="config">
+<unit bldFile="app/conntools/emulatorlan/group"/>
+</component>
+</collection>
+</block>
+<block name="rndtools" level="services" long-name="R&D tools" levels="support generic test util">
+<collection name="creator" long-name="Creator" level="support">
+<!-- collection is really a component. Should move down a directory -->
+<component name="creator_build" filter="s60" long-name="Creator Tool" purpose="development" class="tool">
+<unit bldFile="app/rndtools/creator/group"/>
+</component>
+</collection>
+<collection name="filebrowser" long-name="File Browser" level="util">
+<!-- consider collapsing into a single component -->
+<component name="fileopserver" filter="s60" long-name="File Operations Server" purpose="development" class="tool">
+<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
+<!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
+</component>
+<component name="fileopclient" filter="s60" long-name="File Operations Client" purpose="development" class="tool">
+<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
+<!--<unit bldFile="filebrowser/fileopclient/group"/>-->
+</component>
+<component name="filebrowser_build" filter="s60" long-name="File Browser Application" purpose="development" class="tool">
+<!-- Need to make this a self-contained component by removing #includes. Can only do when configuration is in place-->
+<unit bldFile="app/rndtools/filebrowser/group"/>
+</component>
+</collection>
+<collection name="launcher" long-name="Launcher" level="util">
+<!-- collection is really a component. Should move down a directory -->
+<component name="launcher_build" filter="s60" long-name="Launcher Utility" purpose="development" class="tool">
+<unit bldFile="app/rndtools/launcher/group"/>
+</component>
+</collection>
+<collection name="loadgen" long-name="Load Generator" level="test">
+<!-- collection is really a component. Should move down a directory -->
+<component name="loadgen_build" filter="s60" long-name="Load Generator Application" purpose="development" class="tool">
+<unit bldFile="app/rndtools/loadgen/group"/>
+</component>
+</collection>
+<collection name="perfmon" long-name="Performance Monitor" level="test">
+<!-- collection is really a component. Should move down a directory -->
+<component name="perfmon_build" filter="s60" long-name="Performance Monitor Tool" purpose="development" class="tool">
+<unit bldFile="app/rndtools/perfmon" proFile="perfmon.pro"/>
+</component>
+</collection>
+<collection name="screengrabber" long-name="Screen Grabber" level="util">
+<!-- collection is really a component. Should move down a directory -->
+<component name="screengrabber_build" filter="s60" long-name="ScreenGrabber" purpose="development" class="tool">
+<unit bldFile="app/rndtools/screengrabber" proFile="screengrabber.pro"/>
+</component>
+</collection>
+<collection name="stifui" long-name="STIF UI" level="generic">
+<component name="stifui_avkon" filter="s60" long-name="STIF UI" purpose="development">
+<unit bldFile="app/rndtools/stifui/avkon/group"/>
+</component>
+<component name="uitestserverstarter" filter="s60" long-name="UI Test Server Starter" purpose="development">
+<unit bldFile="app/rndtools/stifui/uitestserverstarter/group"/>
+</component>
+</collection>
+<collection name="memspyui" long-name="Memspy UI" level="generic">
+<!-- collection is really a component. Should move down a directory -->
+<component name="memspyui_build" filter="s60" long-name="Memspy UI Application" purpose="development" class="tool">
+<unit bldFile="app/rndtools/memspyui/group"/>
+</component>
+</collection>
+<collection name="htiui" long-name="Harmonized Test Interface UI" level="generic">
+<component name="HtiServicePlugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
+<!-- can only have a single unit. Should #include from a common bld.inf file -->
+<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
+<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
+<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
+<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
+<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
+<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
+<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
+<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiFtpBackupFake/group"/>
+</component>
+<component name="htidevicereboot" filter="s60" long-name="HTI Device Reboot" purpose="development">
+<unit bldFile="app/rndtools/htiui/htidevicereboot/group"/>
+</component>
+<component name="htistartupwait" filter="s60" long-name="HTI Startup Wait" purpose="development">
+<unit bldFile="app/rndtools/htiui/htistartupwait/group"/>
+</component>
+<component name="htiadmin" filter="s60" long-name="HTI Admin" purpose="development">
+<unit bldFile="app/rndtools/htiui/htiadmin/group"/>
+</component>
+<component name="htiui_build" filter="s60" long-name="HTI UI Build" purpose="development">
+<!-- can this be split up into the other components or made a ROM component? -->
+<unit bldFile="app/rndtools/htiui/group"/>
+</component>
+</collection>
+</block>
+<block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools if ui">
+<collection name="userguide" long-name="User Guide" level="if">
+<!-- collection is really a component. Move down a directory -->
+<component name="userguide_build" long-name="User Guide Build" filter="s60" introduced="^4">
+<unit bldFile="app/helps/userguide" proFile="Userguide.pro"/>
+</component>
+</collection>
+<collection name="symhelp" long-name="Symbian Help" level="eng">
+<component name="helpmodel" long-name="Help" introduced="6.0" purpose="optional">
+<unit bldFile="app/helps/symhelp/helpmodel/group" mrp="app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
+</component>
+</collection>
+<collection name="helps_info" long-name="Help Apps Info" level="ui">
+<component name="helps_metadata" long-name="Help Apps Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="app/helps/helps_info/helps_metadata/helps_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
+<collection name="buildverification" long-name="Build Verification" level="services">
+<component name="autosmoketest" long-name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
+<unit bldFile="app/techview/buildverification/autosmoketest/Group" mrp="app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
+</component>
+<component name="smoketest" long-name="Smoke Test" filter="gt" purpose="development">
+<unit bldFile="app/techview/buildverification/smoketest/Group" mrp="app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
+</component>
+</collection>
+<collection name="techviewplat" long-name="Techview Platform" level="services"/>
+<collection name="techviewui" long-name="Techview UI" 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"/>
+<collection name="installationapps" long-name="Installation Apps" level="apps2"/>
+<collection name="messagingapps" long-name="Messaging Apps" level="apps2"/>
+<collection name="telephonyapps" long-name="Telephony Apps" level="apps1"/>
+<collection name="networkingapps" long-name="Networking Apps" level="apps1"/>
+<collection name="networkingutils" long-name="Networking Utils" level="utils"/>
+<collection name="shortlinkapps" long-name="Shortlink Apps" level="apps1"/>
+<collection name="testapps" long-name="Test Apps" level="utils"/>
+<collection name="avapps" long-name="A/V Apps" level="apps3"/>
+<collection name="toolkit" long-name="Toolkit" level="utils"/>
+<collection name="techview_info" long-name="Techview Info" level="apps3">
+<component name="techview_metadata" long-name="Techview Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="app/techview/techview_info/techview_metadata/techview_metadata.mrp"/>
+</component>
+</collection>
+</block>
+</layer>
+</systemModel>
+</SystemDefinition>
--- a/symbian4/single/sysdefs/system_model.xml Wed May 05 12:21:47 2010 +0100
+++ b/symbian4/single/sysdefs/system_model.xml Tue Jul 13 12:21:44 2010 +0100
@@ -337,6 +337,9 @@
<component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="^2" purpose="development" class="config PC">
<unit mrp="os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
</component>
+<component name="kernelhwsrv_docpub" long-name="Kernel and Hardware Services Public Documentation" introduced="^3" purpose="development" class="doc">
+<unit mrp="os/kernelhwsrv/kernelhwsrv_info/doc_pub/kernelhwsrv_doc_pub.mrp"/>
+</component>
</collection>
</block>
<block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 config">
@@ -444,174 +447,6 @@
<component name="ossrv_exceptions_api" long-name="Generic OS Services Exceptions API" filter="s60" class="api">
<unit bldFile="os/ossrv/ossrv_pub/exceptions/group"/>
</component>
-<component name="gboxed" long-name="GBoxed API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gboxed/group"/>
-</component>
-<component name="glib_arrays" long-name="Glib Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_arrays/group"/>
-</component>
-<component name="glib_asynchronous_queues" long-name="Glib Asynchronous Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_asynchronous_queues/group"/>
-</component>
-<component name="glib_atomic_operations" long-name="Glib Atomic Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_atomic_operations/group"/>
-</component>
-<component name="glib_automatic_string_completion" long-name="Glib Automatic String Completion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_automatic_string_completion/group"/>
-</component>
-<component name="glib_balanced_binary_trees" long-name="Glib Balanced Binary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_balanced_binary_trees/group"/>
-</component>
-<component name="glib_basic_types" long-name="Glib Basic Types API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_basic_types/group"/>
-</component>
-<component name="glib_caches" long-name="Glib Caches API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_caches/group"/>
-</component>
-<component name="glib_character_set_conversion" long-name="Glib Character Set Conversion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_character_set_conversion/group"/>
-</component>
-<component name="glib_closures" long-name="Glib Closures API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_closures/group"/>
-</component>
-<component name="glib_commandline_option_parser" long-name="Glib Command Line Option Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_commandline_option_parser/group"/>
-</component>
-<component name="glib_datasets" long-name="Glib Datasets API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_datasets/group"/>
-</component>
-<component name="glib_date_and_time_functions" long-name="Glib Date and Time Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_date_and_time_functions/group"/>
-</component>
-<component name="glib_doubleended_queues" long-name="Glib Double-ended Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doubleended_queues/group"/>
-</component>
-<component name="glib_doublylinked_lists" long-name="Glib Doubly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doublylinked_lists/group"/>
-</component>
-<component name="glib_dynamic_loading_of_modules" long-name="Glib Dynamic Loading of Modules API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_dynamic_loading_of_modules/group"/>
-</component>
-<component name="glib_enums_and_flags" long-name="Glib Enums and Flags API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_enums_and_flags/group"/>
-</component>
-<component name="glib_error_reporting" long-name="Glib Error Reporting API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_error_reporting/group"/>
-</component>
-<component name="glib_file_utilities" long-name="Glib File Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_file_utilities/group"/>
-</component>
-<component name="glib_generic_values" long-name="Glib Generic Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_generic_values/group"/>
-</component>
-<component name="glib_globstyle_pattern_matching" long-name="Glib Glob-Style Pattern Matching API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_globstyle_pattern_matching/group"/>
-</component>
-<component name="glib_hash_tables" long-name="Glib Hash Tables API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hash_tables/group"/>
-</component>
-<component name="glib_hook_functions" long-name="Glib Hook Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hook_functions/group"/>
-</component>
-<component name="glib_internationalization" long-name="Glib Internationalization API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_internationalization/group"/>
-</component>
-<component name="glib_io_channels" long-name="Glib I/O Channels API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_io_channels/group"/>
-</component>
-<component name="glib_keyvalue_file_parser" long-name="Glib Key-Value File Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_keyvalue_file_parser/group"/>
-</component>
-<component name="glib_lexical_scanner" long-name="Glib Lexical Scanner API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_lexical_scanner/group"/>
-</component>
-<component name="glib_main_event_loop" long-name="Glib Main Event Loop API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_main_event_loop/group"/>
-</component>
-<component name="glib_memory_allocation" long-name="Glib Memory Allocation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_allocation/group"/>
-</component>
-<component name="glib_memory_slices" long-name="Glib Memory Slices API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_slices/group"/>
-</component>
-<component name="glib_message_logging" long-name="Glib Message Logging API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_message_logging/group"/>
-</component>
-<component name="glib_miscellaneous_utility_functions" long-name="Glib Miscellaneous Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_miscellaneous_utility_functions/group"/>
-</component>
-<component name="glib_nary_trees" long-name="Glib N-ary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_nary_trees/group"/>
-</component>
-<component name="glib_parameters_and_values" long-name="Glib Parameters and Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_parameters_and_values/group"/>
-</component>
-<component name="glib_quarks" long-name="Glib Quarks API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_quarks/group"/>
-</component>
-<component name="glib_random_numbers" long-name="Glib Random Numbers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_random_numbers/group"/>
-</component>
-<component name="glib_relations_and_tuples" long-name="Glib Relations and Tuples API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_relations_and_tuples/group"/>
-</component>
-<component name="glib_shellrelated_utilities" long-name="Glib Shell-related Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_shellrelated_utilities/group"/>
-</component>
-<component name="glib_signals" long-name="Glib Signals API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_signals/group"/>
-</component>
-<component name="glib_simple_xml_subset_parser" long-name="Glib Simple XML Subset Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_simple_xml_subset_parser/group"/>
-</component>
-<component name="glib_singlylinked_lists" long-name="Glib Singly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_singlylinked_lists/group"/>
-</component>
-<component name="glib_spawning_processes" long-name="Glib Spawning Processes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_spawning_processes/group"/>
-</component>
-<component name="glib_standard_macros" long-name="Glib Standard Macros API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_standard_macros/group"/>
-</component>
-<component name="glib_string_utility_functions" long-name="Glib String Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_string_utility_functions/group"/>
-</component>
-<component name="glib_strings" long-name="Glib Strings API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_strings/group"/>
-</component>
-<component name="glib_thread_pools" long-name="Glib Thread Pools API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_thread_pools/group"/>
-</component>
-<component name="glib_threads" long-name="Glib Threads API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_threads/group"/>
-</component>
-<component name="glib_timers" long-name="Glib Timers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_timers/group"/>
-</component>
-<component name="glib_unicode_manipulation" long-name="Glib Unicode Manipulation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_unicode_manipulation/group"/>
-</component>
-<component name="glib_value_arrays" long-name="Glib Value Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_value_arrays/group"/>
-</component>
-<component name="glib_varargs_value_collection" long-name="Glib Varargs Value Collection API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_varargs_value_collection/group"/>
-</component>
-<component name="gobject" long-name="GObject API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gobject/group"/>
-</component>
-<component name="gparamspec" long-name="GParamSpec API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gparamspec/group"/>
-</component>
-<component name="gtype" long-name="GType API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtype/group"/>
-</component>
-<component name="gtypemodule" long-name="GTypeModule API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypemodule/group"/>
-</component>
-<component name="gtypeplugin" long-name="GTypePlugin API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypeplugin/group"/>
-</component>
<component name="io_stream_api" long-name="I/O stream API" filter="s60" class="api">
<unit bldFile="os/ossrv/ossrv_pub/io_stream_api/group"/>
</component>
@@ -663,7 +498,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>
@@ -814,7 +649,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">
@@ -1039,6 +874,9 @@
<component name="tv_out_behaviour_api" long-name="TV Out Behaviour API" filter="s60" class="api">
<unit bldFile="os/devicesrv/devicesrv_plat/tv_out_behaviour_api/group"/>
</component>
+<component name="autoaudio_plugin_api" long-name="Auto Audio Plugin API" filter="s60" introduced="^4" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/autoaudio_plugin_api/group"/>
+</component>
</collection>
<collection name="accessoryservices" long-name="Accessory Services" level="framework">
<component name="accessorymonitor" filter="s60" long-name="Accessory Monitor">
@@ -1059,12 +897,15 @@
<component name="tspclientmapper" filter="s60" long-name="TSP Client Mapper">
<unit bldFile="os/devicesrv/accessoryservices/tspclientmapper/group"/>
</component>
-<component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional">
+<component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional" filter="s60">
<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
</component>
<component name="gid_pc_tool" filter="s60" long-name="Generic ID PC Tool" class="tool PC">
<unit bldFile="os/devicesrv/accessoryservices/gid_pc_tool/group"/>
</component>
+<component name="autoaudioasy" filter="s60" long-name="Auto Audio Plugin" introduced="^4" plugin="Y">
+<unit bldFile="os/devicesrv/accessoryservices/autoaudioasy/group"/>
+</component>
</collection>
<collection name="commonservices" long-name="Common Services" level="app-if">
<component name="commonengine" filter="s60" long-name="Common Engine">
@@ -1076,10 +917,10 @@
<component name="platformenv" filter="s60" long-name="Platform Environment">
<unit bldFile="os/devicesrv/commonservices/platformenv/group"/>
</component>
-<component name="sysutil" long-name="System Utilities" purpose="mandatory" introduced="ER5">
+<component name="sysutil" long-name="System Utilities" purpose="mandatory" introduced="ER5" filter="s60">
<unit bldFile="os/devicesrv/commonservices/sysutil/group" mrp="os/devicesrv/commonservices/sysutil/group/sysutil.mrp"/>
</component>
-<component name="activitymanager" long-name="Activity Manager" purpose="mandatory" introduced="ER5">
+<component name="activitymanager" long-name="Activity Manager" purpose="mandatory" introduced="ER5" filter="s60">
<unit bldFile="os/devicesrv/commonservices/activitymanager/group" mrp="os/devicesrv/commonservices/activitymanager/group/activitymanager.mrp"/>
</component>
</collection>
@@ -1145,22 +986,19 @@
<unit bldFile="os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
</component>
<component name="hwrmtargetmodifierplugin" filter="s60" long-name="HWRM Target Modifier Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build,
- may need to -->
-<!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
+<unit bldFile="os/devicesrv/resourcemgmt/hwrmtargetmodifierplugin/group"/>
</component>
<component name="vibractrl" filter="s60" long-name="Vibra Control" deprecated="9.1">
<unit bldFile="os/devicesrv/resourcemgmt/vibractrl/group"/>
</component>
-<component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="^2" purpose="optional">
+<component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="^2" purpose="optional" filter="s60">
<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
</component>
-<component name="hwresourcesmgrconfig" long-name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
+<component name="hwresourcesmgrconfig" long-name="Hardware Resources Manager Config" introduced="^3" purpose="optional" filter="s60" class="config">
<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
</component>
-<component name="resourcemgmt_build" filter="s60" long-name="Resource Management Build">
-<!-- Move exports to a self-contained component.
- This needs to be kept around until configuration is in place -->
+<component name="resourcemgmt_data" filter="s60" long-name="Resource Management Data" class="config">
+<!-- Move exports to a self-contained component. Or leave as a component but move down a dir -->
<unit bldFile="os/devicesrv/resourcemgmt/group"/>
</component>
<component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
@@ -1192,16 +1030,16 @@
<component name="sysuiprovider" filter="s60" long-name="System UI Provider" introduced="^3">
<unit bldFile="os/devicesrv/sysstatemgmt/sysuiprovider/group"/>
</component>
-<component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
+<component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory" filter="s60">
<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/group" mrp="os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
</component>
-<component name="systemstatemgr" long-name="System State Manager" introduced="^3" purpose="mandatory">
+<component name="systemstatemgr" long-name="System State Manager" introduced="^3" purpose="mandatory" filter="s60">
<unit bldFile="os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
</component>
-<component name="systemstateplugins" long-name="System State Plugins" introduced="^3" purpose="optional" plugin="Y">
+<component name="systemstateplugins" long-name="System State Plugins" introduced="^3" purpose="optional" filter="s60" plugin="Y">
<unit bldFile="os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
</component>
-<component name="systemstatereferenceplugins" long-name="System State Reference Plugins" introduced="^3" purpose="optional" plugin="Y">
+<component name="systemstatereferenceplugins" long-name="System State Reference Plugins" introduced="^3" purpose="optional" filter="s60" plugin="Y">
<unit bldFile="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
</component>
</collection>
@@ -1211,7 +1049,7 @@
</component>
</collection>
<collection name="systemhealthmanagement" long-name="System Health Management" level="server">
-<component name="systemhealthmgr" long-name="System Health Manager" introduced="^3" purpose="optional">
+<component name="systemhealthmgr" long-name="System Health Manager" introduced="^3" purpose="optional" filter="s60">
<unit bldFile="os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
</component>
</collection>
@@ -1223,6 +1061,11 @@
</collection>
</block>
<block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
+<collection name="authenticationservices" long-name="Authentication Services" level="utilities">
+<component name="authenticationserver" long-name="Authentication Server" introduced="^4" purpose="optional">
+<unit bldFile="os/security/authenticationservices/authenticationserver/group" mrp="os/security/authenticationservices/authenticationserver/group/security_authserver.mrp"/>
+</component>
+</collection>
<collection name="authorisation" long-name="Authorisation" level="utilities">
<component name="userpromptservice" long-name="User Prompt Service" introduced="^3" purpose="mandatory">
<unit bldFile="os/security/authorisation/userpromptservice/group" mrp="os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
@@ -1317,8 +1160,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="adaptation">
@@ -1360,9 +1203,23 @@
<component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
<unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
</component>
-<component name="suplrrlpasn1" filter="sf_build" long-name="SUPL RRLP ASN1 Parser">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
+<component name="networkpmutils" long-name="Network Protocol Module Utilities" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/lbs/networkprotocolmodules/networkpmutils/group" mrp="os/lbs/networkprotocolmodules/networkpmutils/group/lbs_networkpmutils.mrp"/>
+</component>
+<component name="suplpmcore" long-name="SUPL Protocol Module Core" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/lbs/networkprotocolmodules/suplpmcore/group" mrp="os/lbs/networkprotocolmodules/suplpmcore/group/lbs_suplpmcore.mrp"/>
+</component>
+<component name="networkpmasn1_pub" long-name="Network Protocol Module ASN1 Public Interfaces" introduced="^3" purpose="optional" class="api">
+<unit bldFile="os/lbs/networkprotocolmodules/networkpmasn1_pub/group" mrp="os/lbs/networkprotocolmodules/networkpmasn1_pub/group/lbs_networkpmasn1_pub.mrp"/>
+</component>
+<component name="suplcontrolplaneprotocols" long-name="SUPL Control Plane Protocols" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/group" mrp="os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/group/lbs_suplcontrolplaneprotocols.mrp"/>
+</component>
+<component name="suplproxyprotocolmodule" long-name="SUPL Proxy Protocol Module" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
+</component>
+<component name="suplprotocolmodule" long-name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" plugin="Y">
+<unit bldFile="os/lbs/networkprotocolmodules/suplprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
</component>
</collection>
<collection name="lbsapitest" long-name="Location API Tests" level="application-interface"/>
@@ -1560,12 +1417,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">
@@ -1659,12 +1510,6 @@
<unit bldFile="os/wlan/wlan_bearer/wlannwif/group"/>
</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="adaptation hw-if plugin framework server app-if">
<collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
@@ -1735,9 +1580,6 @@
<component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y">
<unit bldFile="os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
</component>
-<component name="simtsy" long-name="SIM TSY" introduced="7.0" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
-</component>
<component name="ctsydispatchlayer" long-name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" plugin="Y">
<unit bldFile="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
</component>
@@ -1773,6 +1615,11 @@
</component>
</collection>
<collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if"/>
+<collection name="wapstack" long-name="WAP Stack" level="plugin">
+<component name="wapmessageapi" long-name="WAP Message API" purpose="optional">
+<unit bldFile="os/cellularsrv/wapstack/wapmessageapi/group" mrp="os/cellularsrv/wapstack/wapmessageapi/group/wap-stack_wapmessage.mrp"/>
+</component>
+</collection>
</block>
<block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
<collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
@@ -1858,6 +1705,9 @@
</collection>
</block>
<block name="usb" level="services" long-name="USB" levels="adaptation 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>
@@ -1878,13 +1728,13 @@
<block name="mm" level="services" long-name="Multimedia" levels="adaptation 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"/>
@@ -1892,7 +1742,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"/>
@@ -1919,7 +1769,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"/>
@@ -1946,7 +1796,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"/>
@@ -1955,7 +1805,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"/>
@@ -1967,7 +1817,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"/>
@@ -1976,7 +1826,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"/>
@@ -1985,7 +1835,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"/>
@@ -1994,7 +1844,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"/>
@@ -2003,13 +1853,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"/>
@@ -2018,7 +1868,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"/>
@@ -2039,7 +1889,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"/>
@@ -2051,7 +1901,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"/>
@@ -2060,7 +1910,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"/>
@@ -2072,7 +1922,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"/>
@@ -2102,7 +1952,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"/>
@@ -2261,7 +2111,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">
@@ -2317,6 +2167,9 @@
<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" introduced="^3" class="api">
+<unit bldFile="os/imagingext/imagingext_plat/ecam_use_case_hint_custom_api/group"/>
+</component>
</collection>
<collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
<component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
@@ -2446,7 +2299,7 @@
</component>
</collection>
<collection name="egl" long-name="EGL" level="internal-adaptations">
-<component name="eglinterface" long-name="EGL Interface" introduced="^2" purpose="optional">
+<component name="eglinterface" long-name="EGL Interface" introduced="^2" purpose="mandatory">
<unit bldFile="os/graphics/egl/eglinterface/group" mrp="os/graphics/egl/eglinterface/group/graphics_eglheaders.mrp"/>
</component>
<component name="eglswitch" long-name="EGL Switch" introduced="^3" purpose="optional">
@@ -2463,7 +2316,8 @@
<component name="gdi" long-name="GDI" purpose="mandatory">
<unit bldFile="os/graphics/graphicsdeviceinterface/gdi/group" mrp="os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
</component>
-<component name="bitgdi" long-name="BitGDI" purpose="mandatory">
+<component name="bitgdi" long-name="BitGDI" purpose="mandatory" filter="api_test">
+<!-- just api_test, not test -->
<unit bldFile="os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
</component>
<component name="colourpalette" long-name="Colour Palette" introduced="7.0s" purpose="optional">
@@ -2490,41 +2344,29 @@
<collection name="graphicsapitest" long-name="Graphics API Tests" level="app-if"/>
</block>
<block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
-<collection name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" level="text">
-<component name="findutil_api" long-name="Find Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/findutil_api/group"/>
-</component>
-<component name="japanese_language_utilities_api" long-name="Japanese Language Utilities API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
-</component>
-<component name="sortutil_api" long-name="Sorting Utility API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/sortutil_api/group"/>
-</component>
-</collection>
-<collection name="textandloc_pub" long-name="Text and Localisation Public Interfaces" level="text">
-<component name="directory_localizer_api" long-name="Directory Localizer API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_pub/directory_localizer_api/group"/>
-</component>
-</collection>
<collection name="charconvfw" long-name="Character Conversion" level="encoding">
-<component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional">
+<component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional" filter="api_test">
+<!-- both production and api_test-->
<unit bldFile="os/textandloc/charconvfw/charconv_fw/group" mrp="os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
</component>
-<component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" plugin="Y">
+<component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" filter="apit_test" plugin="Y">
+<!-- both production and api_test-->
<unit bldFile="os/textandloc/charconvfw/charconvplugins/group" mrp="os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
</component>
-<component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y">
+<component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" filter="api_test" plugin="Y">
+<!-- both production and api_test-->
<unit bldFile="os/textandloc/charconvfw/fatfilenameconversionplugins/group" mrp="os/textandloc/charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
</component>
</collection>
<collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
-<component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" plugin="Y">
+<component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" deprecated="^4" plugin="Y">
<unit bldFile="os/textandloc/fontservices/textshaperplugin/group" mrp="os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
</component>
-<component name="fontstore" long-name="Font Store" purpose="mandatory">
+<component name="fontstore" long-name="Font Store" purpose="mandatory" filter="api_test">
+<!-- both production and api_test-->
<unit bldFile="os/textandloc/fontservices/fontstore/group" mrp="os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
</component>
-<component name="textrendering" long-name="Text Rendering" purpose="mandatory" class="placeholder">
+<component name="textbase" long-name="Text Base" purpose="mandatory" class="placeholder">
<!-- placeholder for text code from GDI -->
</component>
<component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y">
@@ -2543,22 +2385,17 @@
</component>
</collection>
<collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
-<!-- components in this collection need to be moved to the right collection.
- Either move into the units' directories, or create a new textandlocutils directory -->
-<component name="numbergrouping" filter="s60" long-name="Number Grouping">
-<unit bldFile="os/textandloc/charconvfw/numbergrouping/group"/>
-</component>
-<component name="jplangutil" filter="s60" long-name="Japanese Language Utilities">
-<unit bldFile="os/textandloc/charconvfw/jplangutil/group"/>
-</component>
-<component name="sortutil" filter="s60" long-name="Sorting Utility">
-<unit bldFile="os/textandloc/charconvfw/sortutil/group"/>
-</component>
-<component name="inlinetext" filter="s60" long-name="Inline Text">
-<unit bldFile="os/textandloc/charconvfw/inlinetext/group"/>
-</component>
-<component name="nearestlangutil" long-name="Nearest Language Util" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
+<component name="numbergrouping" long-name="Number Grouping">
+<unit bldFile="os/textandloc/textandlocutils/numbergrouping/group" mrp="os/textandloc/textandlocutils/numbergrouping/group/tls_numbergrouping.mrp"/>
+</component>
+<component name="jplangutil" long-name="Japanese Language Utilities">
+<unit bldFile="os/textandloc/textandlocutils/jplangutil/group" mrp="os/textandloc/textandlocutils/jplangutil/group/tls_jplangutil.mrp"/>
+</component>
+<component name="sortutil" long-name="Sorting Utility">
+<unit bldFile="os/textandloc/textandlocutils/sortutil/group" mrp="os/textandloc/textandlocutils/sortutil/group/tls_sortutil.mrp"/>
+</component>
+<component name="inlinetext" long-name="Inline Text">
+<unit bldFile="os/textandloc/textandlocutils/inlinetext/group" mrp="os/textandloc/textandlocutils/inlinetext/group/tls_inlinetext.mrp"/>
</component>
<component name="numberformatting" long-name="Number Formatting" introduced="7.0s" purpose="optional">
<unit bldFile="os/textandloc/textrendering/numberformatting/group" mrp="os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
@@ -2588,20 +2425,14 @@
</block>
<block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
<collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
-<component name="xmlsrv_plat_build" long-name="XML Services Platform Interface Build" filter="s60" class="api">
-<!-- need to fix the configuration used here.
- Either destribute to other components or use the new feature flags confguration mechanisms.
- Remove this component and uncomment the other units when fixed-->
-<unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
-</component>
-<component name="xml_encryption_api" long-name="XML Encryption API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/> -->
-</component>
-<component name="xml_signature_api" long-name="XML Signature API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_signature_api/group"/> -->
-</component>
-<component name="xml_security_engine_utils_api" long-name="XML Security Engine Utils API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/> -->
+<component name="xml_encryption_api" long-name="XML Encryption API" filter="s60" class="api">
+<unit bldFile="os/xmlsrv/xmlsrv_plat/xml_encryption_api/group"/>
+</component>
+<component name="xml_signature_api" long-name="XML Signature API" filter="s60" class="api">
+<unit bldFile="os/xmlsrv/xmlsrv_plat/xml_signature_api/group"/>
+</component>
+<component name="xml_security_engine_utils_api" long-name="XML Security Engine Utils API" filter="s60" class="api">
+<unit bldFile="os/xmlsrv/xmlsrv_plat/xml_security_engine_utils_api/group"/>
</component>
</collection>
<collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
@@ -2651,40 +2482,15 @@
<collection name="s60extras" long-name="S60 Extras" level="mid">
<!-- collection is really a component. Need to move down a directory -->
<component name="s60extras_build" filter="s60" long-name="S60 Extras Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/S60Extras/group"/>
+<unit bldFile="os/deviceplatformrelease/s60extras/group"/>
</component>
</collection>
<collection name="version" long-name="Version" level="top">
<!-- collection is really a component. Need to move down a directory -->
<component name="version_build" filter="s60" long-name="Version Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/Version/group"/>
-</component>
-</collection>
-<collection name="helps_loc2" long-name="Helps Locale 2" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helps_loc2_build" long-name="Helps Locale 2 Build" filter="s60">
-<unit bldFile="os/deviceplatformrelease/helps_loc2/group"/>
-</component>
-</collection>
-<collection name="sf_config" long-name="SF Config" level="mid">
-<component name="config" filter="s60" long-name="Config" purpose="development" class="config"/>
-<component name="cenrep" filter="sf_build" long-name="ConE Central Repository Config" purpose="development" class="config">
-<!-- will should give the id/path something more unique than cenrep -->
-<unit bldFile="os/deviceplatformrelease/sf_config/cenrep/group"/>
-</component>
-<component name="rombuild_syborg" filter="sf_build" long-name="Syborg iMaker Config" purpose="development" introduced="^3" class="config">
-<unit bldFile="os/deviceplatformrelease/sf_config/rombuild/syborg/group"/>
-</component>
-<component name="rombuild_zoom2" filter="sf_build" long-name="Zoom2 iMaker Config" purpose="development" introduced="^3" class="config">
-<unit bldFile="os/deviceplatformrelease/sf_config/rombuild/zoom2/group"/>
-</component>
-</collection>
-<!-- should be located locally in buildplatforms/group
- <collection id="s60bld" name="S60 Build">
- <component id="buildplatforms" filter="s60" name="Build Platforms">
- <unit bldFile="/tools/buildplatforms/group"/>
- </component>
- </collection>-->
+<unit bldFile="os/deviceplatformrelease/version/group"/>
+</component>
+</collection>
<collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
<component name="cedarutils" long-name="Cedar Utils" purpose="development">
<unit mrp="os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
@@ -2692,14 +2498,25 @@
<component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt" purpose="development" class="config">
<unit mrp="os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
</component>
-<component name="foundation_s60_packages" long-name="Foundation S60 Packages" introduced="^3" deprecated="^3" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/symbianosbld/foundation_s60_packages/foundation_s60_packages.mrp"/>
-</component>
</collection>
<collection name="foundation_system" long-name="Foundation System" level="top">
<component name="system_model" long-name="System Model" introduced="^2" purpose="development" class="config PC">
<unit mrp="os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
</component>
+<component name="sf_config" filter="s60,build_as_app" long-name="Foundation Config" introduced="^4">
+<unit bldFile="os/deviceplatformrelease/foundation_system/sf_config/CI_external/group"/>
+</component>
+<component name="config" filter="s60" long-name="Config" purpose="development" class="config"/>
+<component name="cenrep" filter="sf_build" long-name="ConE Central Repository Config" purpose="development" class="config">
+<!-- will should give the id/path something more unique than cenrep -->
+<unit bldFile="os/deviceplatformrelease/foundation_system/sf_config/cenrep/group"/>
+</component>
+<component name="rombuild_syborg" filter="sf_build" long-name="Syborg iMaker Config" purpose="development" introduced="^3" class="config">
+<unit bldFile="os/deviceplatformrelease/foundation_system/sf_config/rombuild/syborg/group"/>
+</component>
+<component name="rombuild_zoom2" filter="sf_build" long-name="Zoom2 iMaker Config" purpose="development" introduced="^3" class="config">
+<unit bldFile="os/deviceplatformrelease/foundation_system/sf_config/rombuild/zoom2/group"/>
+</component>
</collection>
<collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
<component name="deviceplatformrelease_metadata" long-name="Device Platform Release Metadata" introduced="^2" purpose="development" class="config PC">
@@ -2707,7 +2524,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"/>
@@ -2749,31 +2566,36 @@
<unit bldFile="os/osrndtools/stif/suevent/group"/>
</component>
<component name="stifkerneltestclassbase" filter="s60" long-name="STIF Kernel Test Class Base" purpose="development">
-<!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
-<!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
-</component>
-<component name="stif_build" filter="s60" long-name="STIF Build" purpose="development">
-<!-- move exports into self-contained component. Remove this when configuration is in place-->
+<unit bldFile="os/osrndtools/stif/stifkerneltestclassbase/group"/>
+</component>
+<component name="stif_data" filter="s60" long-name="STIF Data" purpose="development" class="config">
+<!-- This is a component. Should move down a directory. or move into other STIF components-->
<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="memspyserver" filter="s60" long-name="MemSpy Server" purpose="development" introduced="^4">
+<unit bldFile="os/osrndtools/memspy/MemSpyServer/group"/>
+</component>
+<component name="memspyclient" filter="s60" long-name="MemSpy Client" purpose="development" introduced="^4">
+<unit bldFile="os/osrndtools/memspy/MemSpyClient/group"/>
+</component>
+<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>
@@ -2817,6 +2639,16 @@
<unit bldFile="os/osrndtools/hti/group"/>
</component>
</collection>
+<collection name="piprofiler" long-name="Performance Investigator Profiler" level="analysis">
+<component name="piprofiler_build" long-name="Performance Investigator Profiler Build" introduced="^4">
+<unit bldFile="os/osrndtools/piprofiler/group"/>
+</component>
+</collection>
+<collection name="analyzetool" long-name="Analyze Tool" level="analysis">
+<component name="analyzetool_build" long-name="Analyze Tool Build" introduced="^4">
+<unit bldFile="os/osrndtools/analyzetool/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"/>
@@ -2933,16 +2765,11 @@
</component>
</collection>
<collection name="contextframework" long-name="Context Framework" level="framework">
-<!-- the units that are commented out need to be put back when configuration is in place.
- They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
<component name="cfw" filter="s60" long-name="Context Framework">
-<!--<unit bldFile="contextframework/cfw/group"/> -->
+<unit bldFile="mw/appsupport/contextframework/cfw/group"/>
</component>
<component name="cfwplugins" filter="s60" long-name="Context Framework Plugins" plugin="Y">
-<!--<unit bldFile="contextframework/cfwplugins/group"/>-->
-</component>
-<component name="contextframework_build" filter="s60" long-name="Context Framework Build">
-<unit bldFile="mw/appsupport/contextframework/group"/>
+<unit bldFile="mw/appsupport/contextframework/cfwplugins/group"/>
</component>
</collection>
<collection name="coreapplicationuis" long-name="Core Application UIs" level="server">
@@ -2977,10 +2804,10 @@
<component name="powersaveutilities" filter="s60" long-name="Power Save Utilities">
<unit bldFile="mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
</component>
-<component name="gsserverenginestub" filter="s60" long-name="GS Server Engine Stub">
+<component name="gsserverenginestub" filter="s60" long-name="GS Server Engine Stub" deprecated="^4">
<unit bldFile="mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
</component>
-<component name="gsserverengine" filter="s60" long-name="GS Server Engine">
+<component name="gsserverengine" filter="s60" long-name="GS Server Engine" deprecated="^4">
<unit bldFile="mw/appsupport/coreapplicationuis/gsserverengine/group"/>
</component>
<component name="sensordatacompensatorplugin" filter="s60" long-name="Sensor Data Compensator Plugin" plugin="Y">
@@ -2989,6 +2816,9 @@
<component name="atcmdplugin" long-name="AT Command Plugin" filter="s60,!oem_build" plugin="Y">
<unit bldFile="mw/appsupport/coreapplicationuis/atcmdplugin/group"/>
</component>
+<component name="devicepowermenuplugin" long-name="Device Power Menu Plugin" introduced="^4" plugin="Y">
+<unit bldFile="mw/appsupport/coreapplicationuis/devicepowermenuplugin" proFile="devicepowermenuplugin.pro"/>
+</component>
</collection>
<collection name="flashliteapi_3_1" long-name="Flash Lite API 3.1" level="specific">
<!-- collection is really a component. Move down a directory -->
@@ -3039,7 +2869,7 @@
</component>
</collection>
<collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
-<component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" plugin="Y">
+<component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" deprecated="^4" plugin="Y">
<unit bldFile="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
</component>
</collection>
@@ -3186,18 +3016,12 @@
<component name="pkcs12" filter="s60" long-name="PKCS #12">
<unit bldFile="mw/securitysrv/pkiutilities/pkcs12/group"/>
</component>
-<component name="certmanui" filter="s60" long-name="Certificate Management UI">
-<unit bldFile="mw/securitysrv/pkiutilities/certmanui/group"/>
-</component>
<component name="ctsecuritydialogs" filter="s60" long-name="Crypto Token Security Dialogs">
<unit bldFile="mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
</component>
<component name="certsaver" filter="s60" long-name="Certificate Saver">
<unit bldFile="mw/securitysrv/pkiutilities/certsaver/group"/>
</component>
-<component name="secmodui" filter="s60" long-name="Security Module UI">
-<unit bldFile="mw/securitysrv/pkiutilities/secmodui/group"/>
-</component>
<component name="devicetoken" filter="s60" long-name="Device Token">
<unit bldFile="mw/securitysrv/pkiutilities/devicetoken/group"/>
</component>
@@ -3212,7 +3036,7 @@
<unit bldFile="mw/securitysrv/pkiutilities/ocsp/group" mrp="mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
</component>
</collection>
-<collection name="wim" long-name="Wireless Identity Module " level="framework">
+<collection name="wim" long-name="Wireless Identity Module" level="framework">
<!-- collection is really a component. Need to move down a directory-->
<component name="wim_build" filter="s60" long-name="WIM Build">
<unit bldFile="mw/securitysrv/wim/group"/>
@@ -3229,7 +3053,7 @@
<unit bldFile="mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
</component>
<component name="autolock" long-name="Autolock" filter="s60">
-<unit bldFile="mw/securitysrv/securitydialogs/autolock/group"/>
+<unit bldFile="mw/securitysrv/securitydialogs/autolock" proFile="autolock.pro"/>
</component>
<component name="secui" filter="s60" long-name="Security UI">
<unit bldFile="mw/securitysrv/securitydialogs/secui/group"/>
@@ -3238,7 +3062,8 @@
<unit bldFile="mw/securitysrv/securitydialogs/securitynotifier/group"/>
</component>
<component name="lockclient" filter="s60" long-name="Lock Client" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockclient/group"/>
+<!-- This overwrites the bld.inf already in this dir. I'm pretty sure this will cause problems with the export -->
+<unit bldFile="mw/securitysrv/securitydialogs/lockclient/group" proFile="lockclient.pro" qmakeArgs="-r"/>
</component>
<component name="lockapp" filter="s60" long-name="Lock Application" introduced="^3">
<unit bldFile="mw/securitysrv/securitydialogs/lockapp/group"/>
@@ -3246,6 +3071,20 @@
<component name="secuinotifications" long-name="Security UI Notifications" introduced="^4" filter="s60">
<unit bldFile="mw/securitysrv/securitydialogs/secuinotifications" proFile="secuinotifications.pro" qmakeArgs="-r"/>
</component>
+<component name="autolockuseractivityservice" long-name="Auto Lock User Activity Service" introduced="^4" filter="s60">
+<unit bldFile="mw/securitysrv/securitydialogs/Autolock/autolockuseractivityservice" proFile="autolockuseractivityservice.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+<collection name="cpsecplugins" long-name="Security Settings Plugins" level="plugin">
+<component name="devicelockplugin" long-name="Device Lock Plugin" introduced="^4" filter="s60">
+<unit bldFile="mw/securitysrv/cpsecplugins/devicelockplugin" proFile="devicelockplugin.pro" qmakeArgs="-r"/>
+</component>
+<component name="simpincodeplugin" long-name="SIM PIN Code Plugin" introduced="^4" filter="s60">
+<unit bldFile="mw/securitysrv/cpsecplugins/simpincodeplugin" proFile="pincodeplugin.pro" qmakeArgs="-r"/>
+</component>
+<component name="cpadvancedsecplugin" long-name="Advanced Security Plugin" introduced="^4" filter="s60">
+<unit bldFile="mw/securitysrv/cpsecplugins/cpadvancedsecplugin/group" proFile="advancedsecplugin.pro" qmakeArgs="-r"/>
+</component>
</collection>
<collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
<!-- collection is really a component. Need to move down a directory-->
@@ -3284,7 +3123,7 @@
<component name="devencstarter" filter="s60" long-name="Device Encryption Starter" introduced="^3" plugin="Y">
<unit bldFile="mw/securitysrv/devencdiskutils/DevEncStarter/group"/>
</component>
-<component name="devencdiskutils" filter="s60" long-name="Device Encryption Disk Utils Build" introduced="^3">
+<component name="devencdiskutils_build" filter="s60" long-name="Device Encryption Disk Utils Build" introduced="^3">
<!-- need to split this into the above components, or remove #includes and make this a ROM component-->
<unit bldFile="mw/securitysrv/devencdiskutils/group"/>
</component>
@@ -3330,9 +3169,12 @@
<component name="wmdrm_core_api" long-name="WM DRM Core API" filter="s60" class="api">
<unit bldFile="mw/drm/drm_plat/wmdrm_core_api/group"/>
</component>
-<component name="wmdrm_access_api" long-name="WMDRM Access API" filter="s60" class="api">
+<component name="wmdrm_access_api" long-name="WM DRM Access API" filter="s60" class="api">
<unit bldFile="mw/drm/drm_plat/wmdrm_access_api/group"/>
</component>
+<component name="wmdrm_ota_access_api" long-name="WM DRM OTA Access API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/wmdrm_ota_access_api/group"/>
+</component>
<component name="camese_utility_api" long-name="Camese Utility API" filter="s60" class="api">
<unit bldFile="mw/drm/drm_plat/camese_utility_api/group"/>
</component>
@@ -3353,18 +3195,14 @@
</collection>
<collection name="commondrm" long-name="Common DRM" level="generic">
<!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
-<component name="drmencryptor" filter="s60" long-name="DRM Encryptor" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
-<component name="drmsettingsplugin" filter="s60" long-name="DRM Settings Plugin" plugin="Y" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
+<component name="drmqtencryptor" filter="s60" long-name="DRM Qt Encryptor" introduced="^4">
+<unit bldFile="mw/drm/commondrm/drmqtencryptor" proFile="qt_drmencryptor.pro" qmakeArgs="-r"/>
</component>
<component name="drmrightsmanagerui" filter="s60" long-name="DRM Rights Manager UI">
<unit bldFile="mw/drm/commondrm/drmrightsmanagerui/help/group"/>
</component>
<component name="drmutility" filter="s60" long-name="DRM Utility">
-<!-- Uncomment unit when configuration is in place. Currently #included from commondrm_build -->
-<!--<unit bldFile="commondrm/drmutility/group"/>-->
+<unit bldFile="mw/drm/commondrm/drmutility/group"/>
</component>
<component name="drmserviceapiwrapper" filter="s60" long-name="DRM Service API Wrapper">
<unit bldFile="mw/drm/commondrm/drmserviceapiwrapper/group"/>
@@ -3413,23 +3251,14 @@
</component>
</collection>
<collection name="locsrv_plat" long-name="Location Services Platform Interfaces" level="if">
-<component name="map_and_navigation_api" long-name="Map and Navigation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/group"/>
-</component>
-<component name="map_and_navigation_provider_discovery_api" long-name="Map and Navigation Provider Discovery API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/group"/>
-</component>
<component name="geocoding_api" long-name="Geocoding API" filter="s60" class="api">
<unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
</component>
-<component name="map_image_api" long-name="Map Image API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/group"/>
-</component>
-<component name="map_and_navigation_aiw_api" long-name="Map and Navigation AIW API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_aiw_api/group"/>
-</component>
-<component name="map_and_navigation_provider_api" long-name="Map and Navigation Provider API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_api/group"/>
+<component name="supl_pos_message_plugin_api" long-name="SUPL POS Message Plugin API" filter="s60" class="api placeholder">
+<!-- placeholder
+ <meta rel="Api" href="locsrv_plat/supl_pos_message_plugin_api/supl_pos_message_plugin_api.metaxml"/>
+ <unit bldFile="locsrv_plat/supl_pos_message_plugin_api/group"/>
+ -->
</component>
<component name="landmarks_category_definition_api" long-name="Landmarks Category Definition API" filter="s60" class="api">
<unit bldFile="mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
@@ -3437,39 +3266,18 @@
<component name="supl_settings_api" long-name="SUPL Settings API" filter="s60" class="api">
<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
</component>
-<component name="location_settings_launch_api" long-name="Location Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/group"/>
-</component>
-<component name="map_image_conversion_plugin_api" long-name="Map Image Conversion Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/group"/>
-</component>
-<component name="psy_configuration_ui_plugin_api" long-name="PSY Configuration UI Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/psy_configuration_ui_plugin_api/group"/>
-</component>
<component name="np_proxy_configuration_api" long-name="NP Proxy Configuration API" filter="s60" class="api">
<unit bldFile="mw/locationsrv/locsrv_plat/np_proxy_configuration_api/group"/>
</component>
<component name="supl_terminal_initiation_api" long-name="SUPL Terminal Initiation API" filter="s60" class="api">
<unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/group"/>
</component>
-<component name="location_notation_preferences_settings_api" long-name="Location Notation Preferences Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_notation_preferences_settings_api/group"/>
-</component>
-<component name="supl_settings_notifier_secondary_display_api" long-name="SUPL Settings Notifier Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_notifier_secondary_display_api/group"/>
-</component>
<component name="supl_network_initiation_api" long-name="SUPL Network Initiation API" filter="s60" class="api">
<unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/group"/>
</component>
-<component name="privacy_notifiers_secondary_display_api" long-name="Privacy Notifiers Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/privacy_notifiers_secondary_display_api/group"/>
-</component>
<component name="oma_supl_configuration_parameter_api" long-name="OMA SUPL Configuration Parameter API" filter="s60" class="api">
<unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_configuration_parameter_api/group"/>
</component>
-<component name="supl_query_secondary_display_api" long-name="SUPL Query Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_query_secondary_display_api/group"/>
-</component>
<component name="location_triggering_management_api" long-name="Location Triggering Management API" filter="s60" class="api">
<unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_management_api/group"/>
</component>
@@ -3503,22 +3311,13 @@
<unit bldFile="mw/locationsrv/landmarks/locationlandmarks/group"/>
</component>
</collection>
-<collection name="locationmapnavfw" long-name="Location Map and Navigation Framework" level="fw">
-<component name="mnlibrary" filter="s60" long-name="Map and Navigation Library">
-<unit bldFile="mw/locationsrv/locationmapnavfw/library/group"/>
-</component>
-<component name="mnaiwprovider" filter="s60" long-name="Map and Navigation AIW Provider" plugin="Y">
-<unit bldFile="mw/locationsrv/locationmapnavfw/aiwprovider/group"/>
-</component>
-<component name="locationmapnavfw_build" filter="s60" long-name="Location Map and Navigation Framework Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/locationmapnavfw/group"/>
-</component>
-</collection>
<collection name="locationsystemui" long-name="Location System UI" level="if">
<component name="locationsysui" filter="s60" long-name="Location System UI">
<unit bldFile="mw/locationsrv/locationsystemui/locationsysui/group"/>
</component>
+<component name="qtlocationsysui" filter="s60" long-name="Location System Qt UI">
+<unit bldFile="mw/locationsrv/locationsystemui/locationsysui" proFile="locsysui.pro"/>
+</component>
</collection>
<collection name="supl" long-name="SUPL" level="fw">
<component name="locationsuplfw" filter="s60" long-name="Location SUPL Framework">
@@ -3559,9 +3358,6 @@
<component name="ltcellidmovementdetector" filter="s60" long-name="Cell ID Movement Detector">
<unit bldFile="mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/>
</component>
-<component name="lbtmgmtui" filter="s60" long-name="LBT Management UI" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/lbtmgmtui/group"/>
-</component>
<component name="ltcontextsourceplugin" filter="s60" long-name="LT Context Source Plugin" introduced="^3" plugin="Y">
<unit bldFile="mw/locationsrv/locationtriggering/ltcontextsourceplugin/group"/>
</component>
@@ -3573,70 +3369,24 @@
</block>
<block name="accesssec" level="generic" long-name="Access Security" levels="plugin framework server generic specific">
<collection name="accesssec_plat" long-name="Access Security Platform Interfaces" level="specific">
-<component name="wapi_security_settings_ui_api" long-name="WAPI Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_security_settings_ui_api/group"/>
-</component>
-<component name="wep_security_settings_ui_api" long-name="WEP Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wep_security_settings_ui_api/group"/>
-</component>
-<component name="wi-fi_protected_setup_ui_api" long-name="Wi-Fi Protected Setup UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
-</component>
-<component name="wlan_eap_settings_ui_api" long-name="WLAN EAP Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wlan_eap_settings_ui_api/group"/>
-</component>
-<component name="wpa_security_settings_ui_api" long-name="WPA Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wpa_security_settings_ui_api/group"/>
-</component>
<component name="eap_vpn_api" long-name="EAP VPN API" filter="s60" class="api">
<unit bldFile="mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
</component>
-<component name="eapsim_db_api" long-name="EAP-SIM DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapsim_db_api/group"/>
-</component>
<component name="eap_type_api" long-name="EAP Type API" filter="s60" class="api">
<unit bldFile="mw/accesssec/accesssec_plat/eap_type_api/group"/>
</component>
-<component name="eaptlspeap_db_api" long-name="EAP-TLS-PEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eaptlspeap_db_api/group"/>
-</component>
-<component name="eapleap_db_api" long-name="LEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapleap_db_api/group"/>
-</component>
-<component name="eapgtc_db_api" long-name="EAP-GTC DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapgtc_db_api/group"/>
-</component>
-<component name="eapmschapv2_db_api" long-name="EAP-MSCHAPV2 DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapmschapv2_db_api/group"/>
-</component>
-<component name="eapaka_db_api" long-name="EAP-AKA DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapaka_db_api/group"/>
-</component>
-<component name="wapi_db_api" long-name="WAPI DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_db_api/group"/>
-</component>
-</collection>
-<collection name="wlansecuritysettings" long-name="WLAN Security Settings" level="specific">
-<component name="wapisecuritysettingsui" filter="s60" long-name="WAPI Security Settings UI" introduced="9.1">
-<!-- the directory for this needs to be moved up to the right level -->
-<unit bldFile="mw/accesssec/wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
-</component>
-<component name="wepsecuritysettingsui" filter="s60" long-name="WEP Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wepsecuritysettingsui/group"/>
-</component>
-<component name="wifiprotectedsetup" filter="s60" long-name="WIFI Protected Setup" introduced="^1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wifiprotectedsetup/group"/>
-</component>
-<component name="wlaneapsettingsui" filter="s60" long-name="WLAN EAP Settings UI" introduced="9.3">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wlaneapsettingsui/group"/>
-</component>
-<component name="wpasecuritysettingsui" filter="s60" long-name="WPA Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wpasecuritysettingsui/group"/>
+</collection>
+<collection name="securitysettings" long-name="WLAN Security Settings" level="specific">
+<component name="accesssec_qtconfigutils" filter="s60" long-name="Access Security Config Utils" introduced="^4">
+<unit bldFile="mw/accesssec/securitysettings/qtconfigutils" proFile="qtconfigutils.pro" qmakeArgs="-r"/>
+</component>
+<component name="cpwlansecurityuiplugins" filter="s60" long-name="Control Panel WLAN Security UI Plugins" introduced="^4">
+<unit bldFile="mw/accesssec/securitysettings/cpwlansecurityuiplugins" proFile="cpwlansecurityuiplugins.pro" qmakeArgs="-r"/>
</component>
</collection>
<collection name="eapol" long-name="EAPOL" level="framework">
<component name="eapol_framework" filter="s60" long-name="EAPOL Framework" introduced="9.2">
-<unit bldFile="mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
+<unit bldFile="mw/accesssec/eapol/group"/>
</component>
</collection>
</block>
@@ -3666,9 +3416,6 @@
<component name="extended_connection_settings_api" long-name="Extended Connection Settings API" filter="s60" class="api">
<unit bldFile="mw/ipconnmgmt/ipcm_plat/extended_connection_settings_api/group"/>
</component>
-<component name="mpm_default_connection_api" long-name="MPM Default Connection API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_default_connection_api/group"/>
-</component>
<component name="pdpcontextmanager2_reset_factory_settings_api" long-name="PDP Context Manager 2 Reset Factory Settings API" filter="s60" class="api">
<unit bldFile="mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_reset_factory_settings_api/group"/>
</component>
@@ -3678,6 +3425,9 @@
<component name="mpm_connect_screen_api" long-name="MPM Connect Screen API" filter="s60" class="api">
<unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_connect_screen_api/group"/>
</component>
+<component name="flextimer_api" long-name="Flex Timer API" filter="s60" introduced="^4" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_plat/flextimer_api/group"/>
+</component>
</collection>
<collection name="ipcm_pub" long-name="IP Connectivity Management Public Interfaces" level="api">
<component name="connection_settings_api" long-name="Connection Settings API" filter="s60" class="api">
@@ -3705,11 +3455,6 @@
<unit bldFile="mw/ipconnmgmt/ipcm_pub/extendedconnpref_api/group"/>
</component>
</collection>
-<collection name="accesspointcontrol" long-name="Access Point Control" level="plugin">
-<component name="apcontrollistplugin" filter="s60" long-name="Access Point Control List Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
-</component>
-</collection>
<collection name="alwayson_net_plugin" long-name="Always Online Net Plugin" level="server">
<component name="pdpcontextmanager2" filter="s60" long-name="PDP Context Manager 2">
<unit bldFile="mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
@@ -3722,9 +3467,6 @@
<component name="apsettingshandlerui" filter="s60" long-name="Access Point Settings Handler UI">
<unit bldFile="mw/ipconnmgmt/apengine/apsettingshandlerui/group"/>
</component>
-<component name="apsettingsplugin" filter="s60" long-name="Access Point Settings Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/apengine/apsettingsplugin/group"/>
-</component>
</collection>
<collection name="bearermanagement" long-name="Bearer Management" level="framework">
<component name="mpm" filter="s60" long-name="Mobility Policy Manager">
@@ -3741,14 +3483,8 @@
<component name="cmmgr" filter="s60" long-name="CM Manager">
<unit bldFile="mw/ipconnmgmt/cmmanager/cmmgr/group"/>
</component>
-<component name="gsconnsettingsplugin" filter="s60" long-name="GS Connection Settings Plugin" introduced="^3" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/cmmanager/gsconnsettingsplugin/group"/>
-</component>
</collection>
<collection name="connectionmonitoring" long-name="Connection Monitoring" level="server">
-<component name="connectionmonitorplugin" filter="s60" long-name="Connection Monitor Plugin" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorplugin/group"/>
-</component>
<component name="connectionmonitorui" filter="s60" long-name="Connection Monitor UI">
<unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorui/group"/>
</component>
@@ -3766,13 +3502,17 @@
<unit bldFile="mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/>
</component>
</collection>
+<collection name="keepalive" long-name="Keep Alive" level="server">
+<component name="flextimer" filter="s60" long-name="Flex Timer" introduced="^4">
+<unit bldFile="mw/ipconnmgmt/keepalive/flextimer/group"/>
+</component>
+</collection>
<collection name="dbcreator" long-name="DB Creator" level="utils">
<component name="commsdatcreator" filter="s60" long-name="Comms Database Creator" introduced="9.3">
<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
</component>
<component name="commsdatcreatorrfsplugin" filter="s60" long-name="Comms Database Creator RFS Plugin" introduced="9.3" plugin="Y">
-<!-- uncomment when config is turned on -->
-<!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
+<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreatorrfsplugin/group"/>
</component>
<component name="commsdatstartup" filter="s60" long-name="Comms Database Startup" introduced="9.3">
<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
@@ -3787,7 +3527,7 @@
</collection>
<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 -->
+<!-- need to move exports to another component, or make this a config component and revmove the #includes -->
<unit bldFile="mw/ipconnmgmt/group"/>
</component>
<component name="ipcm_qt_build" long-name="IP Connectivity Management Qt Build" introduced="^4">
@@ -3909,8 +3649,8 @@
<component name="sippwlanplugin" filter="s60" long-name="SIP WLAN Plugin" plugin="Y">
<unit bldFile="mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
</component>
-<component name="sippsipsettingsui" filter="s60" long-name="SIP Settings UI" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
+<component name="sippsipsettingsui" filter="s60" long-name="SIP Settings UI" plugin="Y" class="placeholder">
+<!--<unit bldFile="sipplugins/sippsipsettingsui/group"/> -->
</component>
<component name="sippdevmgmtsipadapter" filter="s60" long-name="Device Management SIP Settings Adapter" plugin="Y">
<unit bldFile="mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
@@ -3982,146 +3722,36 @@
<unit bldFile="mw/wirelessacc/wlanutilities" proFile="wlanutilities.pro" qmakeArgs="-r"/>
</component>
<component name="wlanqtutilities" filter="s60" long-name="WLAN Qt Utilities" introduced="^4" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlanplugin/group" qt:proFile="wlanqtutilities.pro"/>-->
+<!--<unit bldFile="wlanutilities/wlanplugin" qt:proFile="wlanqtutilities.pro"/>-->
+</component>
+<component name="wlanwizard " filter="s60" long-name="WLAN Wizard" introduced="^4" class="placeholder">
+<!--<unit bldFile="wlanutilities/wlanwizard" qt:proFile="wlanwizard.pro"/>-->
</component>
<component name="wlansniffer" filter="s60" long-name="WLAN Sniffer" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlansettingsui/group" qt:proFile="wlansniffer.pro"/>-->
+<!--<unit bldFile="wlanutilities/wlansettingsui" qt:proFile="wlansniffer.pro"/>-->
</component>
<component name="wlanentryplugin" filter="s60" long-name="WLAN Entry Plugin" plugin="Y" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlansniffer/group" qt:proFile="wlanentryplugin.pro"/>-->
+<!--<unit bldFile="wlanutilities/wlansniffer" qt:proFile="wlanentryplugin.pro"/>-->
</component>
<component name="wlanindicatorplugin" filter="s60" long-name="WLAN Indicator Plugin" plugin="Y" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlanindicatorplugin/group" qt:proFile="wlanindicatorplugin.pro"/>-->
+<!--<unit bldFile="wlanutilities/wlanindicatorplugin" qt:proFile="wlanindicatorplugin.pro"/>-->
</component>
<component name="cpwlansettingsplugin" filter="s60" long-name="WLAN Settings Control Panel Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="wlanutilities/cpwlansettingsplugin/group" qt:proFile="cpwlansettingsplugin.pro"/>-->
+<!--<unit bldFile="wlanutilities/cpwlansettingsplugin" qt:proFile="cpwlansettingsplugin.pro"/>-->
</component>
</collection>
</block>
<block name="vpnclient" level="specific" long-name="VPN Client" levels="engine ui api">
-<!-- is the !oem_build filter needed? -->
<collection name="vpnc_plat" long-name="VPN Client Platform Interfaces" level="api">
<component name="vpnapi" filter="s60" long-name="VPN API" class="api">
<unit bldFile="mw/vpnclient/vpnc_plat/vpnapi/group"/>
</component>
</collection>
-<collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API">
+<collection name="vpnapiimpl" long-name="VPN API Implementation" level="engine">
+<component name="vpnapi_impl" filter="s60" long-name="VPN Implementation">
<unit bldFile="mw/vpnclient/vpnapiimpl/group"/>
</component>
</collection>
-<collection name="vpnengine" long-name="VPN Engine" level="engine">
-<!-- too many components in this collection.
- Probably best to group the binaries together into larger components
- or maybe split the collection into more reasonable groups -->
-<component name="eventmediatorapi" filter="s60" long-name="Event Mediator API">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediatorapi/group"/>
-</component>
-<component name="eventviewer" filter="s60" long-name="Event Viewer">
-<unit bldFile="mw/vpnclient/vpnengine/eventviewer/group"/>
-</component>
-<component name="vpnins" filter="s60" long-name="VPN Installer">
-<unit bldFile="mw/vpnclient/vpnengine/vpnins/group"/>
-</component>
-<component name="ikepolparser" filter="s60" long-name="IKE Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/ikepolparser/group"/>
-</component>
-<component name="utlbase64" filter="s60" long-name="Base64 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlbase64/group"/>
-</component>
-<component name="utlcrypto" filter="s60" long-name="Crypto Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlcrypto/group"/>
-</component>
-<component name="utlxml" filter="s60" long-name="XML Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlxml/group"/>
-</component>
-<component name="utlpkcs10" filter="s60" long-name="PKCS#10 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs10/group"/>
-</component>
-<component name="pkiserviceapi" filter="s60" long-name="PKI Service API">
-<unit bldFile="mw/vpnclient/vpnengine/pkiserviceapi/group"/>
-</component>
-<component name="ikecert" filter="s60" long-name="IKE Certificate Management">
-<unit bldFile="mw/vpnclient/vpnengine/ikecert/group"/>
-</component>
-<component name="kmdapi" filter="s60" long-name="Key Management Daemon API">
-<unit bldFile="mw/vpnclient/vpnengine/kmdapi/group"/>
-</component>
-<component name="kmdserver" filter="s60" long-name="Key Management Daemon Server">
-<unit bldFile="mw/vpnclient/vpnengine/kmdserver/group"/>
-</component>
-<component name="ikeutils" filter="s60" long-name="Internet Key Exchange Utils">
-<unit bldFile="mw/vpnclient/vpnengine/ikeutils/group"/>
-</component>
-<component name="ikev1lib" filter="s60" long-name="IKEv1 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev1lib/group"/>
-</component>
-<component name="ikev2lib" filter="s60" long-name="IKEv2 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev2lib/group"/>
-</component>
-<component name="vpnipsecpolparser" filter="s60" long-name="VPN IPsec Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/vpnipsecpolparser/group"/>
-</component>
-<component name="sit" filter="s60" long-name="Socket Interaction Thread">
-<unit bldFile="mw/vpnclient/vpnengine/sit/group"/>
-</component>
-<component name="vpntcwrapper" filter="s60" long-name="VPN Terminal Control Wrapper">
-<unit bldFile="mw/vpnclient/vpnengine/vpntcwrapper/group"/>
-</component>
-<component name="eventmediator" filter="s60" long-name="Event Mediator">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediator/group"/>
-</component>
-<component name="pkiservice" filter="s60" long-name="PKI Service">
-<unit bldFile="mw/vpnclient/vpnengine/pkiservice/group"/>
-</component>
-<component name="vpnconnagt" filter="s60" long-name="VPN Connection Agent">
-<unit bldFile="mw/vpnclient/vpnengine/vpnconnagt/group"/>
-</component>
-<component name="vpnmanager" filter="s60" long-name="VPN Manager">
-<unit bldFile="mw/vpnclient/vpnengine/vpnmanager/group"/>
-</component>
-<component name="vpncleaner" filter="s60" long-name="VPN Cleaner">
-<unit bldFile="mw/vpnclient/vpnengine/vpncleaner/group"/>
-</component>
-<component name="utlpkcs12" filter="s60" long-name="PKCS#12 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs12/group"/>
-</component>
-<component name="dmadengine" filter="s60" long-name="DM Adapter Engine">
-<unit bldFile="mw/vpnclient/vpnengine/dmadengine/group"/>
-</component>
-<component name="dmadipsecvpn" filter="s60" long-name="IPsec VPN DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadipsecvpn/group"/>
-</component>
-<component name="dmadpki" filter="s60" long-name="PKI DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadpki/group"/>
-</component>
-<component name="ikesocket" filter="s60" long-name="IKE Socket" introduced="^3">
-<unit bldFile="mw/vpnclient/vpnengine/ikesocket/group"/>
-</component>
-</collection>
-<collection name="vpnui" long-name="VPN UI" level="ui">
-<component name="vpnecomnotifier" filter="s60" long-name="VPN ECOM Notifier" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnecomnotifier/group"/>
-</component>
-<component name="vpndialogmanager" filter="s60" long-name="VPN Dialog Manager">
-<unit bldFile="mw/vpnclient/vpnui/vpndialogmanager/group"/>
-</component>
-<component name="vpnpolins" filter="s60" long-name="VPN Policy Installer">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolins/group"/>
-</component>
-<component name="vpnpolicyrecognizer" filter="s60" long-name="VPN Policy Recognizer" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolicyrecognizer/group"/>
-</component>
-</collection>
-<collection name="vpnclient_info" long-name="VPN Client Info" level="api">
-<component name="vpnclient_help" filter="s60" long-name="VPN Client Help">
-<unit bldFile="mw/vpnclient/help/group"/>
-</component>
-<component name="vpnclient_build" filter="s60" long-name="VPN Client Build">
-<!-- should split this up into the other components and remove this-->
-<unit bldFile="mw/vpnclient/group"/>
-</component>
-</collection>
</block>
<block name="ipappsrv" level="specific" long-name="IP App Services" levels="framework generic server conn plugin">
<collection name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" level="plugin">
@@ -4181,12 +3811,9 @@
<!-- 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">
+<block name="phonesrv" level="specific" long-name="Telephony and SIM Services" levels="utils framework server ui specific">
<collection name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" level="specific">
<component name="string_parser_api" long-name="String Parser API" filter="s60" class="api">
<unit bldFile="mw/phonesrv/phonesrv_plat/string_parser_api/group"/>
@@ -4306,23 +3933,113 @@
<unit bldFile="mw/phonesrv/phonesrv_plat/dialpad_api/group"/>
</component>
</collection>
+<collection name="telutils" long-name="Telephony Utils" level="utils">
+<component name="phoneparser" filter="s60" long-name="Phone Parser">
+<unit bldFile="mw/phonesrv/telutils/phoneparser/group"/>
+</component>
+<component name="telephonyservice" filter="s60" long-name="Telephony Service">
+<unit bldFile="mw/phonesrv/telutils/telephonyservice/group"/>
+</component>
+<component name="xqtelephonyservice" filter="s60" long-name="X Qt Telephony Service" introduced="^4">
+<unit bldFile="mw/phonesrv/telutils/xqtelephonyservice" proFile="xqtelephonyservice.pro"/>
+</component>
+<component name="dialpad" filter="s60" long-name="Dial Pad" introduced="^4">
+<unit bldFile="mw/phonesrv/telutils/dialpad" proFile="dialpad.pro"/>
+</component>
+<component name="keysequencerecognitionservice" filter="s60" long-name="Key Sequence Recognition Service" introduced="^4">
+<unit bldFile="mw/phonesrv/telutils/keysequencerecognitionservice" proFile="keysequencerecognitionservice.pro"/>
+</component>
+</collection>
+<collection name="cbs" long-name="Cellular Baseband Services" level="utils">
+<component name="cbsserver" filter="s60" long-name="CBS Server">
+<unit bldFile="mw/phonesrv/cbs/cbsserver/group"/>
+</component>
+</collection>
<collection name="cellular" long-name="Cellular" level="server">
-<component name="telephonysettings" filter="s60" long-name="Telephony Settings" purpose="development"/>
-<component name="sssettings" filter="s60" long-name="Supplementary Service Settings" purpose="development"/>
-<component name="psetnotesui" filter="s60" long-name="Phone Settings Notes UI" purpose="development"/>
+<component name="telephonysettings" filter="s60" long-name="Telephony Settings" purpose="development">
+<unit bldFile="mw/phonesrv/cellular/telephonysettings/group" filter="!test"/>
+</component>
+<component name="psetwrapper" filter="s60" long-name="Provider Settings Wrapper" introduced="^4">
+<!-- need to move to own component, not under sssettings -->
+<unit bldFile="mw/phonesrv/cellular/telephonysettings/xqbindings/psetwrapper" proFile="psetwrapper.pro"/>
+</component>
+<component name="sssettings" filter="s60" long-name="Supplementary Service Settings" purpose="development">
+<unit bldFile="mw/phonesrv/cellular/sssettings/group" filter="!test"/>
+</component>
+<component name="sssettingswrapper" filter="s60" long-name="Supplementary Service Settings Wrapper" introduced="^4">
+<!-- need to move to own component, not under sssettings -->
+<unit bldFile="mw/phonesrv/cellular/sssettings/xqbindings/sssettingswrapper" proFile="sssettingswrapper.pro"/>
+</component>
+<component name="psetnotesui" filter="s60" long-name="Phone Settings Notes UI" purpose="development">
+<unit bldFile="mw/phonesrv/cellular/psetnotesui/group" filter="!test"/>
+</component>
+<component name="servicerequest" filter="s60" long-name="Service Request">
+<unit bldFile="mw/phonesrv/cellular/servicerequest/group"/>
+</component>
</collection>
<collection name="convergedcallengine" long-name="Converged Call Engine" level="framework">
-<component name="cce" filter="s60" long-name="CCE" purpose="development"/>
-<component name="spsettings" filter="s60" long-name="Service Provider Settings" purpose="development"/>
+<component name="callprovider" filter="s60" long-name="Call Provider">
+<unit bldFile="mw/phonesrv/convergedcallengine/callprovider/group"/>
+</component>
+<component name="cce" filter="s60" long-name="CCE">
+<unit bldFile="mw/phonesrv/convergedcallengine/cce/group" filter="!test"/>
+</component>
+<component name="spsettings" filter="s60" long-name="Service Provider Settings">
+<unit bldFile="mw/phonesrv/convergedcallengine/spsettings/group" filter="!test"/>
+</component>
+<component name="cenrepdatabase" filter="s60" long-name="CCE Cenrep Database">
+<unit bldFile="mw/phonesrv/convergedcallengine/cenrepdatabase/group"/>
+</component>
+<component name="serviceselector" filter="s60" long-name="Service Selector">
+<unit bldFile="mw/phonesrv/convergedcallengine/serviceselector/group"/>
+</component>
+</collection>
+<collection name="networkhandling" long-name="Network Handling" level="framework">
+<component name="networkhandlingengine" filter="s60" long-name="Network Handling Engine">
+<unit bldFile="mw/phonesrv/networkhandling/networkhandlingengine/group"/>
+</component>
</collection>
<collection name="phoneclientserver" long-name="Phone Client/Server" level="server">
-<component name="aiwdialdata" filter="s60" long-name="AIW Dial Data" purpose="development"/>
-<component name="dialutils" filter="s60" long-name="Dial Utils" purpose="development"/>
-<component name="phoneclient" filter="s60" long-name="Phone Client" purpose="development"/>
-</collection>
-<collection name="phonesrv_info" long-name="Phone Server Info" level="generic">
-<component name="phonesrv_build" long-name="Phone Server Build" filter="s60">
-<unit bldFile="mw/phonesrv" proFile="phonesrv.pro"/>
+<component name="enpolicy" filter="s60" long-name="Emergency Number Policy">
+<unit bldFile="mw/phonesrv/phoneclientserver/enpolicy/group"/>
+</component>
+<component name="aiwdialdata" filter="s60" long-name="AIW Dial Data">
+<unit bldFile="mw/phonesrv/phoneclientserver/aiwdialdata/group" filter="!test"/>
+</component>
+<component name="dialutils" filter="s60" long-name="Dial Utils">
+<unit bldFile="mw/phonesrv/phoneclientserver/dialutils/group" filter="!test"/>
+</component>
+<component name="phoneclient" filter="s60" long-name="Phone Client">
+<unit bldFile="mw/phonesrv/phoneclientserver/phoneclient/group" filter="!test"/>
+</component>
+<component name="phoneserver" filter="s60" long-name="Phone Server">
+<unit bldFile="mw/phonesrv/phoneclientserver/phoneserver/group"/>
+</component>
+</collection>
+<collection name="phonecmdhandler" long-name="Phone Command Handler" level="generic">
+<component name="phonecmdhnlr" filter="s60" long-name="Phone Command Handler">
+<unit bldFile="mw/phonesrv/phonecmdhandler/phonecmdhnlr/group"/>
+</component>
+</collection>
+<collection name="satengine" long-name="SAT Engine" level="server">
+<component name="satserver" filter="s60" long-name="SAT Server">
+<unit bldFile="mw/phonesrv/satengine/satserver/group"/>
+</component>
+</collection>
+<collection name="satui" long-name="SAT UI" level="ui">
+<component name="satshellcontroller" filter="s60" long-name="SAT Shell Controller">
+<unit bldFile="mw/phonesrv/satui/satshellcontroller/group"/>
+</component>
+<component name="satapp" filter="s60" long-name="SAT Application" introduced="^4">
+<unit bldFile="mw/phonesrv/satui/satapp" proFile="satapp.pro"/>
+</component>
+</collection>
+<collection name="vmbx" long-name="Voice Mailbox" level="ui">
+<component name="vmbxcpplugin" filter="s60" long-name="Voice Mailbox CP Plugin" introduced="^4" plugin="Y">
+<unit bldFile="mw/phonesrv/vmbx/vmbxcpplugin" proFile="vmbxcpplugin.pro"/>
+</component>
+<component name="vmbxengine" filter="s60" long-name="Voice Mailbox Engine" introduced="^4">
+<unit bldFile="mw/phonesrv/vmbx/vmbxengine" proFile="vmbxengine.pro"/>
</component>
</collection>
</block>
@@ -4487,7 +4204,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 Avability 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>
@@ -4569,12 +4286,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">
@@ -4587,12 +4298,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">
@@ -4611,99 +4316,58 @@
</component>
</collection>
</block>
-<block name="opensrv" level="specific" long-name="Open Services" levels="prt lib server eng">
-<collection name="opensrv_plat" long-name="Open Services Platform Interfaces" level="eng">
-<component name="messagequeue_api" long-name="Message Queue API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/opensrv/opensrv_plat/messagequeue_api/group"/>
-</component>
-</collection>
-<collection name="loudmouth" long-name="Loudmouth" level="prt">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="loudmouth_build" filter="s60" long-name="Loudmouth Build" introduced="^2">
-<unit bldFile="mw/opensrv/loudmouth/group"/>
-</component>
-</collection>
-<collection name="libtelepathy" long-name="Telepathy Library" level="lib">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="libtelepathy_build" filter="s60" long-name="Telepathy Library Build" introduced="^2">
-<unit bldFile="mw/opensrv/libtelepathy/group"/>
-</component>
-</collection>
-<collection name="telepathygabble" long-name="Telepathy Gabble" level="eng">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="telepathygabble_build" filter="s60" long-name="Telepathy Gabble Build" introduced="^2">
-<unit bldFile="mw/opensrv/telepathygabble/group"/>
-</component>
-</collection>
-<collection name="isolationserver" long-name="Isolation Server" level="server">
-<component name="messagequeue" filter="s60" long-name="Message Queue" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/messagequeue/group"/>
-</component>
-<component name="isoserver" filter="s60" long-name="ISO Server" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/isoserver/group"/>
-</component>
-<component name="isolationserver_build" filter="s60" long-name="Isloation Server Build" introduced="^2">
-<!-- needs #includes removed. either move the exports to another component or make this a ROM component -->
-<unit bldFile="mw/opensrv/isolationserver/group"/>
-</component>
-</collection>
-</block>
<block name="searchsrv" level="specific" long-name="Search Services" levels="services engine generic api">
<collection name="searchsrv_plat" long-name="Search Services Platform Interfaces" level="api">
-<component name="cpix_utility_api" long-name="CPIX Utility API" filter="s60" class="api">
+<component name="cpix_utility_api" long-name="CPIX Utility API" filter="s60" introduced="^4" class="api">
<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_utility_api/group"/>
</component>
-<component name="cpix_framework_api" long-name="CPIX Framework API" filter="s60" class="api">
+<component name="cpix_framework_api" long-name="CPIX Framework API" filter="s60" introduced="^4" class="api">
<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_framework_api/group"/>
</component>
-<component name="cpix_search_api" long-name="CPIX Search API" filter="s60" class="api">
+<component name="cpix_search_api" long-name="CPIX Search API" filter="s60" introduced="^4" class="api">
<unit bldFile="mw/searchsrv/searchsrv_plat/cpix_search_api/group"/>
</component>
</collection>
<collection name="searchengine" long-name="Search Engine" level="engine">
-<component name="searchengine_util" long-name="Search Engine Utils" filter="s60">
+<component name="searchengine_util" long-name="Search Engine Utils" filter="s60" introduced="^4">
<unit bldFile="mw/searchsrv/searchengine/util/group"/>
</component>
-<component name="searchengine_oss" long-name="Search Engine OSS" filter="s60">
+<component name="searchengine_oss" long-name="Search Engine OSS" filter="s60" introduced="^4">
<unit bldFile="mw/searchsrv/searchengine/oss/group"/>
</component>
-<component name="cpix" long-name="Cross Platform Indexing Engine" filter="s60">
+<component name="cpix" long-name="Cross Platform Indexing Engine" filter="s60" introduced="^4">
<unit bldFile="mw/searchsrv/searchengine/cpix/group"/>
</component>
</collection>
<collection name="searcher" long-name="Searcher" level="generic">
-<component name="searchclient" long-name="Search Client" filter="s60">
+<component name="searchclient" long-name="Search Client" filter="s60" introduced="^4">
<unit bldFile="mw/searchsrv/searcher/SearchClient/group"/>
</component>
-<component name="searchserver" long-name="Search Server" filter="s60">
+<component name="searchserver" long-name="Search Server" filter="s60" introduced="^4">
<unit bldFile="mw/searchsrv/searcher/SearchServer/group"/>
</component>
-<component name="searcher_test" long-name="Searcher Tests" filter="s60" purpose="development">
-<!-- #include from common bld.inf or split into two components -->
-<unit bldFile="mw/searchsrv/searcher/tsrc/RobustnessTest/group"/>
-<unit bldFile="mw/searchsrv/searcher/tsrc/LogPlayer/group"/>
-</component>
</collection>
<collection name="searchsrv_harvester" long-name="Search Services Harvester" level="services">
-<component name="searchsrv_pluginfw" long-name="Search Server" filter="s60">
+<component name="searchsrv_pluginfw" long-name="Search Server" filter="s60" introduced="^4">
<unit bldFile="mw/searchsrv/harvester/pluginfw/group"/>
</component>
-<component name="searchsrv_harvesterserver" long-name="Search Harvester Server" filter="s60">
+<component name="searchsrv_harvesterserver" long-name="Search Harvester Server" filter="s60" introduced="^4">
<unit bldFile="mw/searchsrv/harvester/HarvesterServer/group"/>
</component>
</collection>
<collection name="searchsrv_watchdog" long-name="Search Services Watch Dog" level="services">
-<component name="searchsrv_watchdog_build" long-name="Search Services Watch Dog Build" filter="s60">
+<component name="searchsrv_watchdog_build" long-name="Search Services Watch Dog Build" filter="s60" introduced="^4">
<unit bldFile="mw/searchsrv/WatchDog/group"/>
</component>
</collection>
<collection name="qcpix" long-name="Qt CPIX" level="engine">
-<component name="qcpix_build" long-name="Qt CPIX Build">
-<unit bldFile="mw/searchsrv/qcpix" proFile="qcpix.pro"/>
+<component name="qcpixsearchclient" long-name="Qt CPIX Search Client" introduced="^4">
+<!-- Snag! qcpix.pro and qcpixsearchclient.pro in same directory! -->
+<unit bldFile="mw/searchsrv/qcpix" proFile="qcpixsearchclient.pro"/>
</component>
</collection>
<collection name="searchsrv_info" long-name="Search Services Info">
-<component name="searchsrv_build" long-name="Search Services Build">
+<component name="searchsrv_build" long-name="Search Services Build" introduced="^4">
<!-- move exports to own component and remove this -->
<unit bldFile="mw/searchsrv/group"/>
</component>
@@ -4785,21 +4449,6 @@
<component name="pnpms_utils_api" long-name="PNPMS Utils API" filter="s60" class="api">
<unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
</component>
-<component name="diagnostics_plugin_utility_api" long-name="Diagnostics Plugin Utility API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
-</component>
-<component name="diagnostics_plugin_api" long-name="Diagnostics Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
-</component>
-<component name="diagnostics_framework_api" long-name="Diagnostics Framework API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
-</component>
-<component name="diagnostics_results_api" long-name="Diagnostics Results API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
-</component>
-<component name="diagnostics_plugin_pool_api" long-name="Diagnostics Plugin Pool API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
-</component>
<component name="adaptive_history_list_api" long-name="Adaptive History List API" filter="s60" class="api">
<unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
</component>
@@ -4827,6 +4476,9 @@
<component name="ds_capability_mgmt_plugin_api" long-name="DS Capability Management Plugin API" filter="s60" class="api">
<unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
</component>
+<component name="devicemgmt_dialogs_api" long-name="Device Management Dialogs API" filter="s60" introduced="^4" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/devicemgmt_dialogs_api/group"/>
+</component>
</collection>
<collection name="policymanagement" long-name="Policy Management" level="generic">
<component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">
@@ -4883,23 +4535,6 @@
<unit bldFile="mw/remotemgmt/omaprovisioning/provisioning/group"/>
</component>
</collection>
-<collection name="devicediagnosticsfw" long-name="Device Diagnostics Framework" level="framework">
-<component name="diagframework" filter="s60" long-name="Diagnostics Framework">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
-</component>
-<component name="diagpluginbase" filter="s60" long-name="Diagnostics Plugin Base">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
-</component>
-<component name="diagresultsdb" filter="s60" long-name="Diagnostics Results Database">
-<!-- can only have one unit, merge or split into two components -->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
-</component>
-<component name="devicediagnosticsfw_build" filter="s60" long-name="Device Diagnostics Framework Build">
-<!-- need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/group"/>
-</component>
-</collection>
<collection name="dcmofw" long-name="Device Capability Management Object Framework" level="framework">
<component name="dcmoclient" filter="s60" long-name="DCMO Client">
<unit bldFile="mw/remotemgmt/dcmofw/dcmoclient/group"/>
@@ -4916,17 +4551,15 @@
</component>
</collection>
<collection name="fotaapplication" long-name="FOTA Application" level="generic">
-<component name="fotaapplication_build" filter="s60" long-name="FOTA Application Build">
-<!-- remove this component when configuration is in place and the #ifdefs have been worked out -->
-<unit bldFile="mw/remotemgmt/fotaapplication/group"/>
-</component>
<component name="fotaserver" filter="s60" long-name="FOTA Server">
-<!-- uncomment when #ifdefs are resolved -->
-<!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
-</component>
-<component name="fotacustcmds" filter="s60" long-name="FOTA Custom Commands" class="placeholder">
-<!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
-<!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
+<unit bldFile="mw/remotemgmt/fotaapplication/fotaserver/group"/>
+</component>
+<component name="fotacustcmds" filter="s60" long-name="FOTA Custom Commands">
+<unit bldFile="mw/remotemgmt/fotaapplication/fotaserver/fotacustcmds/group"/>
+</component>
+<!-- really need to find a better way to do this -->
+<component name="fotacustcmds-alt" filter="s60" long-name="FOTA Custom Commands">
+<unit bldFile="mw/remotemgmt/fotaapplication/fotaserver/fotacustcmds/group"/>
</component>
</collection>
</block>
@@ -4982,37 +4615,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>
@@ -5098,19 +4731,19 @@
<unit bldFile="mw/dlnasrv/upnpframework/upnputilities/group"/>
</component>
<component name="upnpextensionpluginif" filter="s60" long-name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpextensionpluginif/group"/> -->
+<unit bldFile="mw/dlnasrv/upnpframework/upnpextensionpluginif/group"/>
</component>
<component name="upnpfiletransferengine" filter="s60" long-name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>-->
+<unit bldFile="mw/dlnasrv/upnpframework/upnpfiletransferengine/group"/>
</component>
<component name="upnpcommonui" filter="s60" long-name="UPnP Common UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpcommonui/group"/>-->
+<unit bldFile="mw/dlnasrv/upnpframework/upnpcommonui/group"/>
</component>
<component name="upnpaiwengine" filter="s60" long-name="UPnP AIW Engine" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpaiwengine/group"/> -->
+<unit bldFile="mw/dlnasrv/upnpframework/upnpaiwengine/group"/>
</component>
<component name="upnpaiwprovider" filter="s60" long-name="UPnP AIW Provider" introduced="^2" deprecated="^3" plugin="Y">
-<!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
+<unit bldFile="mw/dlnasrv/upnpframework/upnpaiwprovider/group"/>
</component>
<component name="upnpmusicadapter" filter="s60" long-name="UPnP Music Adapter" introduced="^2">
<unit bldFile="mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
@@ -5119,7 +4752,7 @@
<unit bldFile="mw/dlnasrv/upnpframework/upnpcommand/group"/>
</component>
<component name="upnpframework_build" filter="s60" long-name="UPnP Framework Build" introduced="^2">
-<!-- move exports content into one of above components -->
+<!-- move exports content into one or more of above components -->
<unit bldFile="mw/dlnasrv/upnpframework/group"/>
</component>
</collection>
@@ -5128,13 +4761,13 @@
<unit bldFile="mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
</component>
<component name="multiselectionui" filter="s60" long-name="Multi-Selection UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/multiselectionui/group"/>-->
+<unit bldFile="mw/dlnasrv/upnpsettings/multiselectionui/group"/>
</component>
<component name="appwizard" filter="s60" long-name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/appwizard/group"/>-->
+<unit bldFile="mw/dlnasrv/upnpsettings/appwizard/group"/>
</component>
<component name="upnpsharingui" filter="s60" long-name="UPnP Sharing UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
+<unit bldFile="mw/dlnasrv/upnpsettings/upnpsharingui/group"/>
</component>
<component name="upnpgsplugin" filter="s60" long-name="UPnP GS Plugin" introduced="^2" plugin="Y">
<unit bldFile="mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
@@ -5172,42 +4805,37 @@
</component>
</collection>
<collection name="upnpharvester" long-name="UPnP Harvester" level="ctrl">
-<component name="upnpharvester_common" filter="s60" long-name="UPnP Harvester Common" introduced="^2" deprecated="^3" class="placeholder">
+<component name="upnpharvester_common" filter="s60" long-name="UPnP Harvester Common" introduced="^2" deprecated="^3">
<!-- need to merge or #include these to a single bld.inf -->
-<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
- <unit bldFile="upnpharvester/common/cmsettings/group"/>
- <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
- <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
-</component>
-<component name="cdssync" filter="s60" long-name="CDS Sync" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
-</component>
-<component name="mdhserver" filter="s60" long-name="Metadata Harvester Server" introduced="^2" deprecated="^3" class="placeholder">
-<!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
-</component>
-<component name="upnpharvester_build" filter="s60" long-name="UPnP Harvester Build" introduced="^2" deprecated="^3" class="placeholder">
+<unit bldFile="mw/dlnasrv/upnpharvester/common/cmlibrary/group"/>
+<unit bldFile="mw/dlnasrv/upnpharvester/common/cmsettings/group"/>
+<unit bldFile="mw/dlnasrv/upnpharvester/common/cmsqlwrapper/group"/>
+<unit bldFile="mw/dlnasrv/upnpharvester/common/dbmanager/group"/>
+</component>
+<component name="cdssync" filter="s60" long-name="CDS Sync" introduced="^2" deprecated="^3">
+<unit bldFile="mw/dlnasrv/upnpharvester/cdssync/common"/>
+</component>
+<component name="mdhserver" filter="s60" long-name="Metadata Harvester Server" introduced="^2" deprecated="^3">
+<unit bldFile="mw/dlnasrv/upnpharvester/mdhserver/group"/>
+</component>
+<component name="upnpharvester_build" filter="s60" long-name="UPnP Harvester Build" introduced="^2" deprecated="^3">
<!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
-<!--<unit bldFile="upnpharvester/group"/>-->
+<unit bldFile="mw/dlnasrv/upnpharvester/group"/>
</component>
</collection>
<collection name="homesync" long-name="Home Sync" level="plugin">
-<component name="contentmanager" filter="s60" long-name="Content Manager" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homesync/group"/>-->
+<component name="contentmanager" filter="s60" long-name="Content Manager" introduced="^2" deprecated="^3">
+<unit bldFile="mw/dlnasrv/homesync/group"/>
<!-- move bld.inf into contentmanager dir -->
</component>
</collection>
<collection name="homemedia" long-name="Home Media" level="framework">
<!-- collection is really just a component. Move down a directory -->
-<component name="homemedia_build" filter="s60" long-name="Home Media" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homemedia/group"/> -->
-</component>
-</collection>
-<collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin">
-<component name="dlnasrv_build" filter="s60" long-name="DLNA Services Build">
-<!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed -->
-<unit bldFile="mw/dlnasrv/group"/>
-</component>
-</collection>
+<component name="homemedia_build" filter="s60" long-name="Home Media" introduced="^2" deprecated="^3">
+<unit bldFile="mw/dlnasrv/homemedia/group"/>
+</component>
+</collection>
+<collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin"/>
</block>
<block name="btservices" level="generic" long-name="Bluetooth Services" levels="framework server generic specific plugin">
<collection name="btservices_pub" long-name="BT Services Public Interfaces" level="plugin">
@@ -5229,19 +4857,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"/>
@@ -5258,16 +4886,38 @@
<component name="bluetooth_secondary_display_notification_api" long-name="Bluetooth Secondary Display Notification API" filter="s60" class="api">
<unit bldFile="mw/btservices/btservices_plat/bluetooth_secondary_display_notification_api/group"/>
</component>
+<component name="obex_secondary_display_notification_api" long-name="OBEX Secondary Display Notification API" filter="s60" class="api">
+<unit bldFile="mw/btservices/btservices_plat/obex_secondary_display_notification_api/group"/>
+</component>
+<component name="obex_service_plugin_api" long-name="OBEX Service Plugin API" filter="s60" class="api">
+<unit bldFile="mw/btservices/btservices_plat/obex_service_plugin_api/group"/>
+</component>
+<component name="obex_service_utils_api" long-name="OBEX Service Utils API" filter="s60" class="api">
+<unit bldFile="mw/btservices/btservices_plat/obex_service_utils_api/group"/>
+</component>
+<component name="usb_obexservicemanager_client_api" long-name="OBEX Service Manager Client API" filter="s60" class="api">
+<unit bldFile="mw/btservices/btservices_plat/usb_obexservicemanager_client_api/group"/>
+</component>
</collection>
<collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
+<component name="btnotifclient" filter="s60" long-name="Bluetooth Notification Client" introduced="^4">
+<!-- cannot put a component under another component. Move up a directory -->
+<unit bldFile="mw/btservices/bluetoothengine/btnotif/btnotifclient/group"/>
+</component>
<component name="bteng" filter="s60" long-name="Bluetooth Engine">
<unit bldFile="mw/btservices/bluetoothengine/bteng/group"/>
</component>
+<component name="btserviceutil" filter="s60" long-name="Bluetooth Service Utils" introduced="^4">
+<unit bldFile="mw/btservices/bluetoothengine/btserviceutil/group" filter="!test"/>
+</component>
<component name="btnotif" filter="s60" long-name="Bluetooth Notifier">
<unit bldFile="mw/btservices/bluetoothengine/btnotif/group"/>
</component>
+<component name="btdevicedialogplugin" filter="s60" long-name="Bluetooth Device Dialog Plugin" introduced="^4" plugin="Y">
+<unit bldFile="mw/btservices/bluetoothengine/btnotif/btdevicedialogplugin" proFile="btdevicedialogplugin.pro"/>
+</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"/>
@@ -5276,13 +4926,13 @@
<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"/>
</component>
<component name="btui" filter="s60" long-name="Bluetooth UI">
-<unit bldFile="mw/btservices/bluetoothengine/btui/group"/>
+<unit bldFile="mw/btservices/bluetoothengine/btui" proFile="btui.pro"/>
</component>
<component name="btpbap" filter="s60" long-name="Bluetooth Phonebook Access Profile" plugin="Y">
<unit bldFile="mw/btservices/bluetoothengine/btpbap/group"/>
@@ -5307,6 +4957,26 @@
<unit bldFile="mw/btservices/atcommands/lccustomplugin/group"/>
</component>
</collection>
+<collection name="cbsatplugin" long-name="CBS AT Plugin" level="plugin">
+<component name="atmisccmdplugin" long-name="AT Misc Commands Plugin" filter="s60" introduced="^4" plugin="Y">
+<unit bldFile="mw/btservices/cbsatplugin/atmisccmdplugin/group"/>
+</component>
+</collection>
+<collection name="btobexprofiles" long-name="BT OBEX Profiles" level="generic">
+<component name="obexreceiveservices" long-name="OBEX Receive Services" filter="s60">
+<unit bldFile="mw/btservices/btobexprofiles/obexreceiveservices/group"/>
+</component>
+<component name="obexsendservices" long-name="OBEX Send Services" filter="s60">
+<unit bldFile="mw/btservices/btobexprofiles/obexsendservices/group"/>
+</component>
+<component name="obexhighway" long-name="OBEX Highway" filter="s60" introduced="^4">
+<!-- should be moved out from under obexsendservices into own component dir -->
+<unit bldFile="mw/btservices/btobexprofiles/obexsendservices/obexhighway" proFile="obexhighway.pro"/>
+</component>
+<component name="obexserviceman" long-name="OBEX Service Manager" filter="s60">
+<unit bldFile="mw/btservices/btobexprofiles/obexserviceman/group"/>
+</component>
+</collection>
<collection name="btservices_info" long-name="BT Services Info" level="plugin">
<component name="btservices_metadata" long-name="BT Services Metadata" introduced="^3" purpose="development" class="config PC">
<unit mrp="mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
@@ -5373,29 +5043,13 @@
<component name="usbmscpersonality" filter="s60" long-name="USB MSC Personality" plugin="Y">
<unit bldFile="mw/usbservices/usbclasses/usbmscpersonality/group"/>
</component>
-<!-- commented out in bld.inf. Should this be deleted?
- <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
- <unit bldFile="usbclasses/ptpstack/group"/>
- </component>
- <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
- <unit bldFile="usbclasses/sicdusbplugin/group"/>
- </component>
- <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
- <unit bldFile="usbclasses/ptpserver/group"/>
- </component>-->
-<component name="pictbridgeengine" filter="s60" long-name="PictBridge Engine">
-<unit bldFile="mw/usbservices/usbclasses/pictbridgeengine/group"/>
-</component>
<component name="usbphoneasmodem" filter="s60" long-name="USB Phone as Modem" introduced="^3">
<unit bldFile="mw/usbservices/usbclasses/usbphoneasmodem/group"/>
</component>
</collection>
<collection name="usbuis" long-name="USB UIs" level="specific">
-<component name="usbui" filter="s60" long-name="USB UI">
-<unit bldFile="mw/usbservices/usbuis/usbui/group"/>
-</component>
<component name="usbuinotif" filter="s60" long-name="USB UI Notifiers">
-<unit bldFile="mw/usbservices/usbuis/usbuinotif/group"/>
+<unit bldFile="mw/usbservices/usbuis/usbuinotif" proFile="usbuinotif.pro" qmakeArgs="-r"/>
</component>
<component name="imageprintuiprovider" filter="s60" long-name="ImagePrint UI Provider" plugin="Y">
<unit bldFile="mw/usbservices/usbuis/imageprintuiprovider/group"/>
@@ -5403,67 +5057,15 @@
<component name="usbimageprintui" filter="s60" long-name="ImagePrint UI">
<unit bldFile="mw/usbservices/usbuis/imageprintui/group"/>
</component>
-<component name="usbuiqt" long-name="USB UI Qt" introduced="^4" filter="s60">
-<unit bldFile="mw/usbservices/usbuis/usbuiqt" proFile="usbapplication.pro"/>
+<component name="usbsettingsapp" long-name="USB Settings Application" introduced="^4" filter="s60">
+<unit bldFile="mw/usbservices/usbuis/usbsettingsapp" proFile="usbsettingsapp.pro" qmakeArgs="-r"/>
+</component>
+<component name="usbindicatorplugin" long-name="USB Indicator Plugin" introduced="^4" filter="s60" plugin="Y">
+<unit bldFile="mw/usbservices/usbuis/usbindicatorplugin" proFile="usbindicatorplugin.pro" qmakeArgs="-r"/>
</component>
</collection>
<collection name="usbservices_test" long-name="USB Services Test" level="server"/>
</block>
-<block name="shortlinkconn" level="generic" long-name="Shortlink Connectivity" levels="framework server generic specific plugin">
-<!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
-<collection name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" level="plugin">
-<component name="obex_service_utils_api" long-name="OBEX Service Utils API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_utils_api/group"/>
-</component>
-<component name="obex_service_plugin_api" long-name="OBEX Service Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_plugin_api/group"/>
-</component>
-<component name="dialup_connection_status_api" long-name="Dial-up Connection Status API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dialup_connection_status_api/group"/>
-</component>
-<component name="dun_secondary_display_notification_api" long-name="DUN Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
-</component>
-<component name="obex_secondary_display_notification_api" long-name="OBEX Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
-</component>
-<component name="generic_hid_api" long-name="Generic HID API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/generic_hid_api/group"/>
-</component>
-<component name="locod_bearer_plugin_api" long-name="Locod Bearer Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/locod_bearer_plugin_api/group"/>
-</component>
-<component name="usb_obexservicemanager_client_api" long-name="USB OBEX Service Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_obexservicemanager_client_api/group"/>
-</component>
-</collection>
-<collection name="localconnectivityservice" long-name="Local Connectivity Service" level="server">
-<component name="locod" long-name="Local Connectivity Daemon">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/locod/group"/>
-</component>
-<component name="obexserviceman" long-name="OBEX Service Managar">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
-</component>
-<component name="obexsendservices" long-name="OBEX Send Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
-</component>
-<component name="obexreceiveservices" long-name="OBEX Receive Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
-</component>
-<component name="dun" long-name="Dial Up Networking">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/dun/group"/>
-</component>
-<component name="lcstylustap" long-name="LC Stylus Tap Plugins" plugin="Y">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/lcstylustap/group"/>
-</component>
-<component name="generichid" long-name="Generic HID">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/generichid/group"/>
-</component>
-<component name="headset" long-name="Headset">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/headset/group"/>
-</component>
-</collection>
-</block>
<block name="imghandling" level="specific" long-name="Image Handling" levels="lib util if">
<collection name="imagehandling_plat" long-name="Image Handling Platform Interfaces" level="if">
<component name="image_handling_library_api" long-name="Image Handling Library API" filter="s60" class="api">
@@ -5486,41 +5088,21 @@
<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager">
<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
</component>
-<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager Qt" introduced="^4">
+<component name="thumbnailmanagerqt" filter="s60" long-name="Thumbnail Manager Qt" introduced="^4">
<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt" filter="!test" proFile="thumbnailmanagerqt.pro" qmakeArgs="-r"/>
</component>
</collection>
</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">
@@ -5632,9 +5214,8 @@
</collection>
<collection name="clfwrapper" long-name="Content Listing Framework Wrapper" level="int">
<!-- collection is really a component. Move down a directory -->
-<component name="clfwrapper_build" filter="s60" long-name="CLF Wrapper Build" introduced="^2" class="placeholder">
-<!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
-<!--<unit bldFile="clfwrapper/group"/>-->
+<component name="clfwrapper_build" filter="s60" long-name="CLF Wrapper Build" introduced="^2">
+<unit bldFile="mw/mds/clfwrapper/group"/>
</component>
</collection>
<collection name="mds_info" long-name="Metadata Services Info" level="int">
@@ -5649,44 +5230,23 @@
<component name="videoscheduler_api" long-name="Video Scheduler API" filter="s60" class="api">
<unit bldFile="mw/videoutils/videoutils_plat/videoscheduler_api/group"/>
</component>
-<component name="videoconnutility_api" long-name="Video Connection Utility API" filter="s60" class="api">
-<unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/group"/>
-</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"/>
</component>
</collection>
<collection name="videoscheduler" long-name="Video Scheduler" level="util">
-<component name="schedulerclient" filter="s60" long-name="Video Scheduler Client">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerclient/group"/>
-</component>
-<component name="schedulerserver" filter="s60" long-name="Video Scheduler Server">
-<unit bldFile="mw/videoutils/videoscheduler/schedulerserver/group"/>
-</component>
-</collection>
-<collection name="videoconnutility" long-name="Video Connection Utility" level="util">
-<component name="connutilpsworker" filter="s60" long-name="Connection Utility Publish and Subscribe Worker">
-<unit bldFile="mw/videoutils/videoconnutility/connutilpsworker/group"/>
-</component>
-<component name="video_connutility" filter="s60" long-name="Video Connection Utility">
-<unit bldFile="mw/videoutils/videoconnutility/connutility/group"/>
-</component>
-</collection>
-<collection name="videoutils_info" long-name="Video Utils Info" level="if"/>
+<!-- don't build these -->
+<component name="schedulerclient" filter="s60" long-name="Video Scheduler Client"/>
+<component name="schedulerserver" filter="s60" long-name="Video Scheduler Server"/>
+</collection>
</block>
<block name="mmmw" level="generic" long-name="Multimedia Middleware" levels="plugin framework server generic specific">
<collection name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" level="specific">
<component name="multimedia_data_source_api" long-name="Multimedia Data Source API" filter="s60" class="api">
<unit bldFile="mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
</component>
-<component name="progressive_download_api" long-name="Progressive Download API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/progressive_download_api/group"/>
-</component>
-<component name="equalizer_ui_api" long-name="Equalizer UI API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
-</component>
<component name="enhanced_media_client_api" long-name="Enhanced Media Client API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
+<unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/group" filter="!test"/>
</component>
<component name="stream_control_custom_command_api" long-name="Stream Control Custom Command API" filter="s60" class="api">
<unit bldFile="mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
@@ -5698,10 +5258,7 @@
<unit bldFile="mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
</component>
<component name="audio_metadata_reader_api" long-name="Audio MetaData Reader API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
-</component>
-<component name="emc_progressive_download_source_api" long-name="EMC Progressive Download Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
+<unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/group" filter="!test"/>
</component>
<component name="emc_volume_effect_api" long-name="EMC Volume Effect API" filter="s60" class="api">
<unit bldFile="mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
@@ -5716,13 +5273,13 @@
<unit bldFile="mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
</component>
<component name="voip_audio_services_api" long-name="VoIP Audio Services" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/group"/>
+<unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/group" filter="!test"/>
</component>
<component name="configuration_components_factory_api" long-name="Configuration Components Factory API" filter="s60" class="api">
<unit bldFile="mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
</component>
<component name="audio_output_control_utility_api" long-name="Audio Output Control Utility API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/group"/>
+<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/group" filter="!test"/>
</component>
<component name="audio_output_control_utility_proxy_api" long-name="Audio Output Control Utility Proxy API" filter="s60" class="api">
<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
@@ -5731,10 +5288,10 @@
<unit bldFile="mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
</component>
<component name="call_audio_control_api" long-name="Call AudioControl API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/group"/>
+<unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/group" filter="!test"/>
</component>
<component name="radio_utilities_api" long-name="Radio Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/group"/>
+<unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/group" filter="!test"/>
</component>
<component name="radio_preset_utilities_api" long-name="Radio Preset Utilities API" filter="s60" class="api">
<unit bldFile="mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
@@ -5743,13 +5300,24 @@
<unit bldFile="mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
</component>
<component name="thumbnail_engine_api" long-name="Thumbnail Engine API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/thumbnail_engine_api/group"/>
+<unit bldFile="mw/mmmw/mmmw_plat/thumbnail_engine_api/group" filter="!test"/>
</component>
<component name="telephony_multimedia_service_api" long-name="Telephony Multimedia Service API" filter="s60" class="api">
<unit bldFile="mw/mmmw/mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
</component>
<component name="openmax_al_api" long-name="OpenMAX AL API" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/openmax_al_api/group"/>
+<unit bldFile="mw/mmmw/mmmw_plat/openmax_al_api/group" filter="!test"/>
+</component>
+<component name="openmax_al_ext_api" long-name="OpenMAX AL Extensions API" filter="s60" introduced="^4" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/openmax_al_ext_api/group"/>
+</component>
+<component name="system_tone_service_api" long-name="System Tone Service API" filter="s60" introduced="^4" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/system_tone_service_api/group"/>
+</component>
+</collection>
+<collection name="khronosfws" long-name="Khronos Frameworks" level="framework">
+<component name="openmax_al" filter="s60" long-name="OpenMAX AL" introduced="^4">
+<unit bldFile="mw/mmmw/khronosfws/openmax_al/group"/>
</component>
</collection>
<collection name="mmfenh" long-name="MMF Enhancements" level="generic">
@@ -5771,18 +5339,9 @@
<component name="profilesettingsmonitor" filter="s60" long-name="Profile Settings Monitor">
<unit bldFile="mw/mmmw/mmfenh/profilesettingsmonitor/group"/>
</component>
-<component name="progressivedownload" filter="s60" long-name="Progressive Download">
-<unit bldFile="mw/mmmw/mmfenh/progressivedownload/group"/>
-</component>
-</collection>
-<collection name="mm_fw" long-name="Multimedia Frameworks" level="framework">
-<!-- Id needs to be unique, mmfw already in use -->
-<!-- Placeholder for OpenAX AL and other stuff -->
+<component name="mmfenh_test" filter="s60,test,module_test,pref_test" long-name="MMF Enhancements Tests" purpose="development"/>
</collection>
<collection name="mmserv" long-name="Multimedia Services" level="specific">
-<component name="audioeffectsui" filter="s60" long-name="Audio Effects UI">
-<unit bldFile="mw/mmmw/mmserv/audioeffectsui/group"/>
-</component>
<component name="callaudiocontrol" filter="s60" long-name="Call Audio Control">
<unit bldFile="mw/mmmw/mmserv/callaudiocontrol/group"/>
</component>
@@ -5802,7 +5361,10 @@
<unit bldFile="mw/mmmw/mmserv/voipaudioservices/group"/>
</component>
<component name="lib3gpextparser" filter="s60" long-name="3GP Extension Metadata Parser Library">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group" filter="sf_build"/>
+<unit bldFile="mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group"/>
+</component>
+<component name="sts" long-name="System Tone Service" filter="s60" introduced="^4">
+<unit bldFile="mw/mmmw/mmserv/sts/group"/>
</component>
</collection>
<collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
@@ -5811,6 +5373,44 @@
</component>
</collection>
</block>
+<block name="gstreamer" level="generic" long-name="GStreamer" levels="plugin core api">
+<!-- Uncomment all units when configuration is in place. All currently #included from gstreamer_build -->
+<!-- structure matches planned directory layout -->
+<collection name="gstreamerfw" long-name="GStreamer Framework" level="core">
+<component name="gstreamer_core" long-name="GStreamer Core" introduced="^3" class="placeholder">
+<!--<unit bldFile="gstreamer_core/group"/>-->
+</component>
+</collection>
+<collection name="gst_plugins" long-name="GStreamer Plugins" level="plugin">
+<component name="gst_plugins_base" long-name="GStreamer Base Plugins" introduced="^3" class="placeholder">
+<!--<unit bldFile="gst_plugins_base/group"/>-->
+</component>
+<component name="gst_plugins_good" long-name="GStreamer Good Plugins" introduced="^3" class="placeholder">
+<!--<unit bldFile="gst_plugins_good/group"/>-->
+</component>
+<component name="gst_plugins_symbian" filter="s60" long-name="GStreamer Sybmian Plugins" introduced="^3" class="placeholder">
+<!--<unit bldFile="gst_plugins_symbian/group" filter="!test"/>-->
+<!-- add ,pref_test,TA_GSTREAMER filters later -->
+</component>
+</collection>
+<collection name="gstregistrygenerator" long-name="GStreamer Registry Generator" level="core">
+<!-- collection is really a component. Move down an directory -->
+<component name="gstregistrygenerator_build" filter="s60" long-name="GStreamer Registry Generator Build" introduced="^3" class="placeholder">
+<!-- <unit bldFile="gstregistrygenerator/group"/>-->
+</component>
+</collection>
+<collection name="gst_test_apps" long-name="GStreamer Test Applications" level="api">
+<component name="gst_player" filter="s60" long-name="GStreamer Player" introduced="^3" purpose="development" class="placeholder">
+<!-- <unit bldFile="gst_test_apps/gst_player/group"/>-->
+</component>
+</collection>
+<collection name="gstreamer_info" long-name="GStreamer Info" level="api">
+<component name="gstreamer_build" filter="s60" long-name="GStreamer Build" introduced="^3">
+<!-- make this a ROM component or split up instead? -->
+<unit bldFile="mw/gstreamer/group"/>
+</component>
+</collection>
+</block>
<block name="helix" level="generic" long-name="Helix" levels="plugin framework server generic specific">
<collection name="helix_ren" long-name="Helix Engine" level="framework">
<!-- what does "ren" stand for? -->
@@ -5857,10 +5457,6 @@
</block>
<block name="mmappfw" level="specific" long-name="Multimedia App Framework" levels="fw utils if">
<collection name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" level="if">
-<component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interfaces Build" introduced="^1" filter="s60">
-<!-- this is no longer necessary when confguration is put in place -->
-<unit bldFile="mw/mmappfw/mmappfw_plat"/>
-</component>
<component name="collection_helper_api" long-name="Collection Helper API" introduced="^1" filter="s60" class="api">
<unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
</component>
@@ -5924,6 +5520,9 @@
<component name="videoplaylist_utility_api" long-name="Video Playlist Utility API" introduced="^1" filter="s60" class="api">
<unit bldFile="mw/mmappfw/mmappfw_plat/videoplaylist_utility_api/group"/>
</component>
+<component name="qt_telephony_multimedia_service_api" long-name="Qt Telephony Multimedia Service API" introduced="^4" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/qt_telephony_multimedia_service_api/group"/>
+</component>
</collection>
<collection name="mpx" long-name="Multimedia Player" level="fw">
<component name="commonframework" filter="s60" long-name="MPX Common Framework" introduced="^1">
@@ -5938,7 +5537,7 @@
<component name="mpxviewfw" filter="s60" long-name="MPX View Framework" introduced="^1">
<unit bldFile="mw/mmappfw/mpx/viewframework/group"/>
</component>
-<component name="mpxviewframeworkqt" long-name="MPX View Framework Qt" filter="s60">
+<component name="mpxviewframeworkqt" long-name="MPX View Framework Qt" filter="s60" introduced="^4">
<unit bldFile="mw/mmappfw/mpx/mpxviewframeworkqt" proFile="mpxviewframeworkqt.pro" qmakeArgs="-r -config rom"/>
</component>
<component name="mpx_build" filter="s60" long-name="MPX Build" introduced="^1">
@@ -5968,12 +5567,10 @@
<unit bldFile="mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
</component>
<component name="audiofetcher" filter="s60" long-name="Audio Fetcher" introduced="^1" plugin="Y">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
+<unit bldFile="mw/mmappfw/mmappcomponents/audiofetcher/group"/>
</component>
<component name="asxparser" filter="s60" long-name="ASX Parser" introduced="^1">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
+<unit bldFile="mw/mmappfw/mmappcomponents/asxparser/group"/>
</component>
<component name="playbackhelper" filter="s60" long-name="Playback Helper" introduced="^3">
<unit bldFile="mw/mmappfw/mmappcomponents/playbackhelper/group"/>
@@ -5985,6 +5582,12 @@
<unit bldFile="mw/mmappfw/mmappcomponents/mmmtpdataprovider/group"/>
</component>
</collection>
+<collection name="qtms" long-name="Qt Telephony Multimedia Services" level="fw">
+<component name="qtms_build" filter="s60" long-name="Qt Telephony Multimedia Services Build" introduced="^4">
+<!-- Collection is really a component. Move down a dir -->
+<unit bldFile="mw/mmappfw/qtms" proFile="qtmsapi.pro" qmakeArgs="-r -config rom"/>
+</component>
+</collection>
<collection name="mmappfw_info" long-name="Multimedia App Framework Info" level="if">
<component name="mmappfw_build" filter="s60" long-name="Multimedia App Framework Build" introduced="^1">
<!-- Move the export to another component or remove the #includes from this one -->
@@ -5993,30 +5596,34 @@
<component name="mmappfw_test" filter="s60,test,api_test,pref_test" long-name="Multimedia App Framework Test" purpose="development" introduced="^1"/>
</collection>
</block>
-<block name="hgwidgets" level="specific" long-name="HG Widgets" levels="framework service api">
-<collection name="hgwidgets_pub" long-name="HG Widgets Platform Interfaces" level="api">
+<block name="hgwidgets" level="specific" long-name="Multimedia Widgets" levels="framework service api">
+<collection name="hgwidgets_plat" long-name="Multimedia Widgets Platform Interfaces" level="api">
<component name="ganeswidgets_api" long-name="Ganes Widgets API" introduced="^4" class="api placeholder">
<!-- should separate out unit -->
</component>
-</collection>
-<collection name="hgwidgets_pub" long-name="HG Widgets Public Interfaces" level="api"/>
+<component name="hgcacheproxymodel_api" long-name="Hg Cache Proxy Model API" introduced="^4" class="api placeholder">
+<!-- should separate out unit -->
+</component>
+<component name="hgwidgets_plat_build" long-name="Multimedia Widgets Platform Interfaces Build" introduced="^4" class="api">
+<!-- break this up into separate components -->
+<unit bldFile="mw/hgwidgets/hgwidgets_plat" proFile="hgwidgets_plat.pro"/>
+</component>
+</collection>
<collection name="ganeswidgets" long-name="Ganes Widgets" level="service">
<!-- really a component, should move down a dir level and have a unit -->
-<component name="ganeswidgets_build" long-name="Ganes Widgets Build" introduced="^4" class="placeholder">
-<!-- should separate out unit -->
-</component>
-</collection>
-<collection name="hgwidgets_info" long-name="HG Widgets Info" level="framework">
-<component name="hgwidgets_build" long-name="HG Widgets Build" introduced="^4">
-<unit bldFile="mw/hgwidgets" proFile="hgwidgets.pro"/>
+<component name="ganeswidgets_build" long-name="Ganes Widgets Build" introduced="^4" filter="build_as_app">
+<unit bldFile="mw/hgwidgets/ganeswidgets" proFile="ganeswidgets.pro"/>
+</component>
+</collection>
+<collection name="hgcacheproxymodel" long-name="Hurriganes Cache Proxy Model" level="framework">
+<!-- really a component, should move down a dir level and have a unit -->
+<component name="hgcacheproxymodel_build" long-name="Hurriganes Cache Proxy Model Build" introduced="^4">
+<unit bldFile="mw/hgwidgets/hgcacheproxymodel" proFile="hgcacheproxymodel.pro"/>
</component>
</collection>
</block>
<block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework api">
<collection name="inputmethods_pub" long-name="Input Methods Public Interfaces" level="api">
-<component name="ptiengine_iti_api" long-name="PTI Engine API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
-</component>
<component name="optical_character_recognition_api" long-name="Optical Character Recognition API" filter="s60" class="api">
<unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
</component>
@@ -6026,10 +5633,10 @@
</collection>
<collection name="inputmethods_plat" long-name="Input Methods Platform Interfaces" level="api">
<component name="pen_input_server_api" long-name="Pen Input Server API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/group" filter="!test"/>
+<unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/group"/>
</component>
<component name="ptiengine_hwr_api" long-name="PTI Engine Handwriting Recognition API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group" filter="!test"/>
+<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group"/>
</component>
<component name="aknfep_settings_api" long-name="Avkon FEP Settings API" filter="s60" class="api">
<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
@@ -6037,9 +5644,6 @@
<component name="aknfep_status_api" long-name="Avkon FEP Status API" filter="s60" class="api">
<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
</component>
-<component name="ptiengine_key_definations_api" long-name="PTI Engine Key Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
-</component>
<component name="aknfep_definitions_api" long-name="Avkon FEP Definitions API" filter="s60" class="api">
<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
</component>
@@ -6050,13 +5654,12 @@
<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
</component>
<component name="aknfep_uiinterface_api" long-name="Avkon FEP UI Interface API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group" filter="!test"/>
+<unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group"/>
</component>
</collection>
<collection name="textinput" long-name="Text Input" level="framework">
<component name="ptienginev2" filter="s60" long-name="Predictive Text Input Engine">
-<!--uncomment when configuration is turned on and textinput_build is removed-->
-<!-- <unit bldFile="textinput/ptienginev2/group"/>-->
+<unit bldFile="mw/inputmethods/textinput/ptienginev2/group"/>
</component>
<component name="akninputlanguage" filter="s60" long-name="Avkon Input Language">
<unit bldFile="mw/inputmethods/textinput/akninputlanguage/group"/>
@@ -6064,23 +5667,10 @@
<component name="peninputarc" filter="s60" long-name="Pen Input Arc">
<unit bldFile="mw/inputmethods/textinput/peninputarc/group"/>
</component>
-<component name="peninputcommonctrls" filter="s60" long-name="Pen Input Common Controls">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonctrls/group"/>
-</component>
-<component name="peninputcommonlayout" filter="s60" long-name="Pen Input Common Layout">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonlayout/group"/>
-</component>
-<component name="peninputhwrtrui" filter="s60" long-name="Pen Input Handwriting Recognition Training UI" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrtrui/group"/>
-</component>
-<component name="textinput_build" filter="s60" long-name="Text Input Build">
-<!--needed for #ifdef, can be removed when configuration is implemented -->
-<unit bldFile="mw/inputmethods/textinput/group"/>
-</component>
</collection>
<collection name="fep" long-name="FEP" level="engine">
<component name="aknfep" filter="s60" long-name="Avkon FEP" plugin="Y">
-<unit bldFile="mw/inputmethods/fep/aknfep/group"/>
+<unit bldFile="mw/inputmethods/fepstub/group"/>
</component>
<component name="frontendprocessor" long-name="Front End Processor" purpose="mandatory">
<unit bldFile="mw/inputmethods/fep/frontendprocessor/group" mrp="mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
@@ -6094,75 +5684,59 @@
</block>
<block name="qt" level="generic" long-name="Qt" levels="tool mw app">
<collection name="qtconf" long-name="Qt Config" level="tool">
-<component name="qt_deviceconfiguration" long-name="Qt Device Configuration" introduced="^2" class="config tool">
+<component name="qt_deviceconfiguration" long-name="Qt Device Configuration" filter="qt_tools" introduced="^2" class="config tool">
<unit bldFile="mw/qt/src/s60installs/deviceconfiguration"/>
</component>
</collection>
<collection name="qt_info" long-name="Qt Info" level="mw">
<component name="qt_build" long-name="Qt Build" introduced="^2">
-<unit bldFile="mw/qt" proFile="projects.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-<collection name="qtdemos" long-name="Qt Demos" level="app">
-<component name="qtdemos_build" long-name="Qt Demos Build" introduced="^2" filter="qtdemos">
-<unit bldFile="mw/qt/demos" proFile="demos.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-<collection name="qtexamples" long-name="Qt Examples" level="app">
-<component name="qtexamples_build" long-name="Qt Examples Build" introduced="^2" filter="qtexamples">
-<unit bldFile="mw/qt/examples" proFile="examples.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
-<collection name="qt_tests" long-name="Qt Tests" level="app">
-<component name="qttestsauto" long-name="Qt Automated Tests" introduced="^2" filter="qttestsauto">
-<unit bldFile="mw/qt/tests/auto" proFile="qtpauto.pro"/>
-</component>
-<component name="qttestsbenchmarks" long-name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks">
-<unit bldFile="mw/qt/tests/benchmarks" proFile="benchmarks.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
-</component>
-</collection>
+<unit bldFile="mw/qt" proFile="projects.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/moc.exe" "QMAKE_RCC=/epoc32/tools/rcc.exe" "QMAKE_UIC=/epoc32/tools/uic.exe" -r"/>
+</component>
+</collection>
+<collection name="qtdemos" long-name="Qt Demos" level="app"/>
+<collection name="qtexamples" long-name="Qt Examples" level="app"/>
+<collection name="qt_tests" long-name="Qt Tests" level="app"/>
</block>
<block name="qtextensions" level="generic" long-name="Qt Extensions" levels="tool mw app">
<collection name="qtecomplugins" long-name="Qt ECom Plugins" level="app">
-<component name="qtecomplugins" filter="qtecomplugins" long-name="Qt ECom Plugin" purpose="development" introduced="^4">
+<component name="qtecomplugins_build" filter="qtecomplugins" long-name="Qt ECom Plugin" purpose="development" introduced="^4" plugin="Y">
<unit bldFile="mw/qtextensions/qtecomplugins" proFile="qtecomplugins.pro" qmakeArgs="-r"/>
</component>
-<component name="qtextensions_examples" filter="qtextensionsexamples" long-name="Qt ECom Plugin Examples" purpose="development" introduced="^4">
+<component name="qtextensions_examples" filter="qtextensionsexamples,build_as_app" long-name="Qt ECom Plugin Examples" purpose="development" introduced="^4">
<unit bldFile="mw/qtextensions/qtecomplugins/examples" proFile="examples.pro" qmakeArgs="-r"/>
</component>
</collection>
<collection name="qthighway" long-name="Qt Highway" level="app">
-<component name="qthighway" filter="qthighway" long-name="Qt Highway" purpose="development" introduced="^4">
+<component name="qthighway_build" filter="qthighway" long-name="Qt Highway" purpose="development" introduced="^4">
<unit bldFile="mw/qtextensions/qthighway" proFile="qthighway.pro" qmakeArgs="-r"/>
</component>
-<component name="qthighway_examples" filter="qtextensionsexamples" long-name="Qt Highway Examples" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qthighway/examples" qmakeArgs="-r"/>
-</component>
-<component name="qthighwaytests" filter="qtextensionstests" long-name="Qt Highway Tests" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qthighway/tests" proFile="tests.pro" qmakeArgs="-r"/>
+<component name="qthighway_examples" filter="qtextensionsexamples,build_as_app" long-name="Qt Highway Examples" purpose="development" introduced="^4">
+<unit bldFile="mw/qtextensions/qthighway/examples" proFile="examples.pro" qmakeArgs="-r"/>
</component>
</collection>
<collection name="qtmobileextensions" long-name="Qt Mobile Extensions" level="app">
-<component name="qtmobileextensions" filter="qtextension" long-name="Qt Mobile Extensions" purpose="development" introduced="^4">
+<component name="qtmobileextensions_build" filter="qtextension" long-name="Qt Mobile Extensions" purpose="development" introduced="^4">
<unit bldFile="mw/qtextensions/qtmobileextensions" proFile="qtmobileextensions.pro" qmakeArgs="-r"/>
</component>
-<component name="qtmobileextensions_examples" filter="qtextensionsexamples" long-name="Qt Mobile Extensions Examples" purpose="development" introduced="^4">
+<component name="qtmobileextensions_examples" filter="qtextensionsexamples,build_as_app" long-name="Qt Mobile Extensions Examples" purpose="development" introduced="^4">
<unit bldFile="mw/qtextensions/qtmobileextensions/examples" proFile="examples.pro" qmakeArgs="-r"/>
</component>
</collection>
-<collection name="qtmobility" long-name="Qt Mobility">
-<component name="qtmobility" filter="qtmobility" long-name="Qt Mobility" purpose="development" introduced="^4">
+<collection name="qtmobility" long-name="Qt Mobility" level="mw">
+<component name="qtmobility_build" filter="qtmobility" long-name="Qt Mobility" purpose="development" introduced="^4">
<unit bldFile="mw/qtextensions/qtmobility" proFile="qtmobility.pro" qmakeArgs="-r"/>
</component>
-<component name="qtmobility_examples" filter="qtextensionsexamples" long-name="Qt Mobility Examples" purpose="development" introduced="^4">
+<component name="qtmobility_examples" filter="qtextensionsexamples,build_as_app" long-name="Qt Mobility Examples" purpose="development" introduced="^4">
<unit bldFile="mw/qtextensions/qtmobility/examples" proFile="examples.pro" qmakeArgs="-r"/>
</component>
-<component name="qtmobilitytests" filter="qtextensionstests" long-name="Qt Extensions Tests" purpose="development" introduced="^4">
-<unit bldFile="mw/qtextensions/qtmobility/tests" proFile="tests.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qtextensions_info">
-<component name="qtextensions_build" long-name="Qt Extensions Confgure" introduced="^4" class="conf">
+</collection>
+<collection name="qhbstyle" level="mw" long-name="Qt Orbit Style">
+<component name="qhbstyle_build" long-name="Qt Orbit Style Build" introduced="^4">
+<unit bldFile="mw/qtextensions/qhbstyle" qmakeArgs="-r" proFile="qhbstyle.pro"/>
+</component>
+</collection>
+<collection name="qtextensions_info" long-name="Qt Extensions Info" level="app">
+<component name="qtextensions_conf" long-name="Qt Extensions Confgure" introduced="^4" filter="qt_tools" class="config">
<unit bldFile="mw/qtextensions/group"/>
</component>
<component name="qtextensions_build" long-name="Qt Extensions Build" introduced="^4">
@@ -6178,17 +5752,9 @@
<unit bldFile="mw/hb" proFile="hb.pro" qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
</component>
</collection>
-<collection name="hb_test" long-name="Orbit Test" level="test">
-<component name="hb_fute" filter="hb_fute_app" long-name="Fute" introduced="^4">
-<unit bldFile="mw/hb/tsrc/fute" proFile="fute.pro" qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
-</component>
-</collection>
</block>
<block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
<collection name="classicui_plat" long-name="Classic UI Platform Interfaces" level="specific">
-<component name="personalisation_framework_api" long-name="Personalisation Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_framework_api/group" filter="!test"/>
-</component>
<component name="signal_pane_api" long-name="Signal Pane API" filter="s60" class="api">
<unit bldFile="mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
</component>
@@ -6207,15 +5773,9 @@
<component name="extended_utilities_api" long-name="Extended Utilities API" filter="s60" class="api">
<unit bldFile="mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
</component>
-<component name="personalisation_plugin_api" long-name="Personalisation Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
-</component>
<component name="extended_aiw_criteria_api" long-name="Extended AIW Criteria API" filter="s60" class="api">
<unit bldFile="mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
</component>
-<component name="personalisation_application_api" long-name="Personalisation Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_application_api/group"/>
-</component>
<component name="volume_popup_api" long-name="Volume Popup API" filter="s60" class="api">
<unit bldFile="mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
</component>
@@ -6246,9 +5806,6 @@
<component name="task_list_api" long-name="Task List API" filter="s60" class="api">
<unit bldFile="mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
</component>
-<component name="personalisation_slide_show_dialog_api" long-name="Personalisation Slide Show Dialog API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
-</component>
<component name="key_event_utilities_api" long-name="Key Event Utilities API" filter="s60" class="api">
<unit bldFile="mw/classicui/classicui_plat/key_event_utilities_api/group"/>
</component>
@@ -6297,9 +5854,6 @@
<component name="fep_document_navigation_api" long-name="FEP Document Navigation API" filter="s60" class="api">
<unit bldFile="mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
</component>
-<component name="personalisation_localised_texts_api" long-name="Personalisation Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
-</component>
<component name="memory_card_ui_api" long-name="Memory Card UI API" filter="s60" class="api">
<unit bldFile="mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
</component>
@@ -6382,7 +5936,7 @@
<unit bldFile="mw/classicui/classicui_plat/layout_configuration_api/group" filter="!test"/>
</component>
<component name="common_file_dialogs_filter_factory_api" long-name="Common File Dialogs Filter Factory API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group" filter="!test"/>
+<unit bldFile="mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group"/>
</component>
<component name="avkon_anim_dll_api" long-name="AVKON Anim DLL API" filter="s60" class="api">
<unit bldFile="mw/classicui/classicui_plat/avkon_anim_dll_api/group"/>
@@ -6449,6 +6003,12 @@
<component name="extended_options_menu_api" long-name="Extended Options Menu API" filter="s60" class="api">
<unit bldFile="mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
</component>
+<component name="directory_localizer_api" long-name="Directory Localizer API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/directory_localizer_api/group"/>
+</component>
+<component name="findutil_api" long-name="Find Util API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/findutil_api/group"/>
+</component>
</collection>
<collection name="classicui_pub" long-name="Classic UI Public Interfaces" level="specific">
<component name="input_frame_api" long-name="Input Frame API" filter="s60" class="api">
@@ -6482,7 +6042,7 @@
<unit bldFile="mw/classicui/classicui_pub/editors_api/group" filter="!test"/>
</component>
<component name="common_file_dialogs_api" long-name="Common File Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/common_file_dialogs_api/group" filter="!test"/>
+<unit bldFile="mw/classicui/classicui_pub/common_file_dialogs_api/group"/>
</component>
<component name="dialog_shutter_api" long-name="Dialog Shutter API" filter="s60" class="api">
<unit bldFile="mw/classicui/classicui_pub/dialog_shutter_api/group" filter="!test"/>
@@ -6677,12 +6237,6 @@
<unit bldFile="mw/classicui/applicationinterworkingfw/servicehandler/group"/>
</component>
</collection>
-<collection name="psln" long-name="Personalization" level="specific">
-<!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
-<component name="psln_build" filter="s60" long-name="Personalization Build">
-<unit bldFile="mw/classicui/psln/group"/>
-</component>
-</collection>
<collection name="commonadapter" long-name="Common Adapter" level="support">
<!-- the collection is really a component. Move down a directory.-->
<component name="commonadapter_build" filter="s60" long-name="Common Adapter Build">
@@ -7022,38 +6576,31 @@
<component name="profiles_engine_api" long-name="Profiles Engine API" filter="s60" class="api">
<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_engine_api/group"/>
</component>
-<component name="settings_backgroundimage_api" long-name="Settings Background Image API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_backgroundimage_api/group"/>
-</component>
-<component name="settings_framework_api" long-name="Settings Framework API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_framework_api/group"/>
-</component>
-<component name="settings_launch_api" long-name="Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_launch_api/group"/>
-</component>
-<component name="settings_listbox_api" long-name="Settings List Box API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_listbox_api/group"/>
-</component>
-<component name="settings_plugin_api" long-name="Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_plugin_api/group"/>
-</component>
<component name="settings_uis_cenrep_collection_api" long-name="Settings UIs CenRep Collection API" filter="s60" class="api">
<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
</component>
</collection>
-<collection name="gssettingsuis" long-name="General Settings UIs" level="framework">
-<component name="gs" filter="s60" long-name="General Settings" introduced="9.2">
-<unit bldFile="mw/gsprofilesrv/gssettingsuis/gs/group"/>
-</component>
-</collection>
<collection name="ftuwizardmodel" long-name="FTU Wizard Model" level="generic">
<component name="ftuwizardmodel_build" long-name="FTU Wizardmodel Build" filter="bldfirst">
<unit bldFile="mw/gsprofilesrv/ftuwizardmodel" proFile="ftuwizardmodel.pro" qmakeArgs="-r -config rom"/>
</component>
</collection>
<collection name="controlpanel" long-name="Control Panel" level="generic">
-<component name="controlpanel_build" long-name="Control Panel Build">
-<unit bldFile="mw/gsprofilesrv/controlpanel" proFile="controlpanel.pro" qmakeArgs="-r -config rom"/>
+<component name="controlpanel_rom" long-name="Control Panel ROM" filter="s60" class="placeholder">
+<!-- Need to create a real .pro file for this
+ <unit bldFile="controlpanel/rom" qt:proFile="cp_rom.pri" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+<component name="controlpanel_config" long-name="Control Panel Config" filter="s60" introduced="^4" class="config placeholder">
+<!-- Need to create a real .pro file for this
+ <unit bldFile="controlpanel/conf" qt:proFile="conf.pri" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+<component name="controlpanel_source" long-name="Control Panel Source" filter="s60" class="placeholder">
+<!-- Uncomment when controlpanel_build is removed
+ <unit bldFile="controlpanel/src" qt:qmakeArgs="-r -config rom" qt:proFile="src.pro"/> -->
+</component>
+<component name="controlpanel_build" long-name="Control Panel Build" filter="s60">
+<!-- need to make included .pri file into a real .pro file -->
+<unit bldFile="mw/gsprofilesrv/controlpanel" qmakeArgs="-r -config rom" proFile="controlpanel.pro"/>
</component>
</collection>
<collection name="profilesservices" long-name="Profiles Services" level="server">
@@ -7063,41 +6610,69 @@
</collection>
</block>
<block name="homescreensrv" level="specific" long-name="Home Screen Services" levels="plugin framework server generic specific">
+<collection name="appfoundation" long-name="App Foundation" level="generic">
+<component name="appfoundation_build" long-name="App Foundation Build" introduced="^4">
+<unit bldFile="mw/homescreensrv/appfoundation" qmakeArgs="-r" proFile="appfoundation.pro"/>
+</component>
+</collection>
+<collection name="hswidgetmodel" long-name="Home Screen Widget Model" level="framework">
+<component name="hswidgetmodel_build" long-name="Home Screen Widget Model Build" introduced="^4">
+<unit bldFile="mw/homescreensrv/hswidgetmodel" qmakeArgs="-r" proFile="hswidgetmodel.pro"/>
+</component>
+</collection>
+<collection name="contentstorage" long-name="Content Storage" level="framework">
+<component name="cautils" long-name="Content Arsenal Utils" introduced="^4">
+<unit bldFile="mw/homescreensrv/contentstorage/cautils" qmakeArgs="-r" proFile="cautils.pro"/>
+</component>
+<component name="contentstorage_build" long-name="Content Storage Build" introduced="^4">
+<unit bldFile="mw/homescreensrv/contentstorage/group" qmakeArgs="-r" proFile="group.pro"/>
+</component>
+<component name="casrv/calocalizerscanner" long-name="Content Arsenal Server Localizer Scanner" introduced="^4">
+<unit bldFile="mw/homescreensrv/contentstorage/casrv/calocalizerscanner" qmakeArgs="-r" proFile="calocalizerscanner.pro"/>
+</component>
+<component name="cahandler" long-name="Content Arsenal Handler" introduced="^4">
+<unit bldFile="mw/homescreensrv/contentstorage/cahandler" qmakeArgs="-r" proFile="cahandler.pro"/>
+</component>
+<component name="caclient" long-name="Content Arsenal Client" introduced="^4">
+<unit bldFile="mw/homescreensrv/contentstorage/caclient" qmakeArgs="-r" proFile="caclient.pro"/>
+</component>
+<component name="casoftwareregistry" long-name="Content Arsenal Software Registry" introduced="^4">
+<unit bldFile="mw/homescreensrv/contentstorage/casoftwareregistry" qmakeArgs="-r" proFile="casoftwareregistry.pro"/>
+</component>
+</collection>
<collection name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" level="specific">
-<component name="action_handler_plugin_api" long-name="Action Handler Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/group" filter="!test"/>
-</component>
-<component name="content_harvester_plugin_api" long-name="Content Harvester Plugin API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/group" filter="!test"/>
-</component>
-<component name="menu_sat_interface_api" long-name="Menu SAT Interface API" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/group" filter="!test"/>
-</component>
-<component name="sapi_contentpublishing" long-name="SAPI Content Publishing" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing/group"/>
-</component>
-<component name="sapi_actionhandler" long-name="SAPI Action Handler" filter="s60" class="api">
-<unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_actionhandler/group"/>
-</component>
-</collection>
-<collection name="contentpublishingsrv" long-name="Content Publishing Service" level="server">
-<component name="contentpublishingdebug" filter="s60" long-name="Content Publishing Debug">
-<!-- need to move this component outside of contentpublishingutils and into separate component directory -->
-<!-- <unit bldFile="contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/> -->
-</component>
-<component name="contentpublishingutils" filter="s60" long-name="Content Publishing Utils">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingutils/group"/>
-</component>
-<component name="contentpublishingserver" filter="s60" long-name="Content Publishing Server">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingserver/group"/>
-</component>
-<component name="contentharvester" filter="s60" long-name="Content Harvester">
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
-</component>
-<component name="contentpublishingsrv_build" filter="s60" long-name="Content Publishing Service Build">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
- If keeping, it need to move down a directory.-->
-<unit bldFile="mw/homescreensrv/contentpublishingsrv/group"/>
+<component name="homescreensrv_plat_build" long-name="Home Screen Services Platform Interfaces build" introduced="^4">
+<unit bldFile="mw/homescreensrv/homescreensrv_plat" qmakeArgs="-r" proFile="homescreensrv_plat.pro"/>
+</component>
+<component name="menu_sat_interface_api" long-name="Menu SAT Interface API" filter="s60" class="api"/>
+<component name="appruntimemodel_api" long-name="Appliction Run-Time Model API" filter="s60" introduced="^4" class="api"/>
+<component name="contentstorage_api" long-name="Content Storage API" filter="s60" introduced="^4" class="api"/>
+<component name="hswidgetmodel_api" long-name="HS Widget Model API" filter="s60" introduced="^4" class="api"/>
+<component name="statemodel_api" long-name="State Model API" filter="s60" introduced="^4" class="api"/>
+<component name="homescreen_information_api" long-name="Homescreen Information API" filter="s60" introduced="^4" class="api"/>
+</collection>
+<collection name="hsactivityfw" long-name="Activity Framework" level="fw">
+<component name="hsactivityfw_build" long-name="Activity Framework Build" introduced="^4">
+<unit bldFile="mw/homescreensrv/activityfw" qmakeArgs="-r" proFile="activityfw.pro"/>
+</component>
+</collection>
+<collection name="tstaskmonitor" long-name="Task Switcher Task Monitor" level="fw">
+<!-- move collection down to a component directory or split up into component .pro files -->
+<component name="tstaskmonitor_build" long-name="Task Switcher Task Monitor Build" introduced="^4">
+<unit bldFile="mw/homescreensrv/tstaskmonitor" qmakeArgs="-r" proFile="tstaskmonitor.pro"/>
+</component>
+</collection>
+<collection name="hsappkeyhandler" long-name="HS Appplication Key Handler" level="server">
+<component name="hsappkeyhandler_build" long-name="Appplication Key Handler Build" introduced="^4">
+<unit bldFile="mw/homescreensrv/hsappkeyhandler" qmakeArgs="-r" proFile="hsappkeyhandler.pro"/>
+</component>
+</collection>
+<collection name="homescreensrv_info" long-name="Home Screen Services Info" level="specific">
+<component name="homescreensrvconf" long-name="Home Screen Services Config" introduced="^4" class="config">
+<unit bldFile="mw/homescreensrv" qmakeArgs="-r" proFile="homescreensrv_exports_to_rom.pri"/>
+</component>
+<component name="homescreensrvrom" long-name="Home Screen Services ROM" introduced="^4">
+<unit bldFile="mw/homescreensrv/group"/>
</component>
</collection>
</block>
@@ -7109,6 +6684,9 @@
<component name="ai_plugin_information_api" long-name="AI Plug-in Information API" filter="s60" class="api">
<unit bldFile="mw/homescreensrvlegacy/ai_plugin_information_api/group" proFile="group.pro"/>
</component>
+<component name="content_harvester_plugin_api" long-name="Content Harvester Plugin API " filter="s60" class="api">
+<unit bldFile="mw/homescreensrvlegacy/content_harvester_plugin_api/group"/>
+</component>
</collection>
</block>
<block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
@@ -7137,9 +6715,6 @@
<component name="sw_installer_ps_keys" long-name="SW Installer PS Keys" filter="s60" class="api">
<unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
</component>
-<component name="appmngr2runtimeapi" long-name="Application Manager 2 Runtime Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
-</component>
<component name="sifui_api" long-name="STIF UI API" filter="s60" class="api">
<unit bldFile="mw/appinstall/appinstall_plat/sifui_api/group"/>
</component>
@@ -7150,13 +6725,7 @@
</component>
</collection>
<collection name="ncdengine" long-name="Nokia Content Discover" level="framework">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="ncdengine_engine" filter="s60" long-name="NCD Engine" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/engine/group"/>
-</component>
-<component name="debuglogger" filter="s60" long-name="NCD Debug Logger" introduced="^1" class="placeholder">
-<!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
-</component>
+<!-- collection is really just a component. Move down one diretcory -->
<component name="ncdengine_build" filter="s60" long-name="NCD Build" introduced="^1">
<unit bldFile="mw/appinstall/ncdengine/group"/>
</component>
@@ -7165,6 +6734,9 @@
<component name="appinstui" filter="s60" long-name="Application Installer UI" introduced="^2">
<unit bldFile="mw/appinstall/appinstaller/appinstui/group"/>
</component>
+<component name="appinstui_qt" filter="s60" long-name="Application Installer Qt UI" introduced="^2">
+<unit bldFile="mw/appinstall/appinstaller/appinstui" proFile="appinstui.pro" qmakeArgs="-r"/>
+</component>
</collection>
<collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="api">
<!-- the collection is really a component. Move down a directory.-->
@@ -7173,12 +6745,9 @@
</component>
</collection>
<collection name="iaupdate" long-name="Independent Apps Update" level="api">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="iad" long-name="Software Update" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/iad/group"/>
-</component>
-<component name="iaupdate_help" filter="s60" long-name="IA Update Help" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/help/group"/>
+<!-- Should reorganise into actual components -->
+<component name="iad" long-name="Independent App delivery" filter="s60" introduced="^4" purpose="development">
+<unit bldFile="mw/appinstall/iaupdate" proFile="iaupdate.pro" qmakeArgs="-r"/>
</component>
<component name="iaupdate_build" filter="s60" long-name="IA Update Build" introduced="^2">
<unit bldFile="mw/appinstall/iaupdate/group"/>
@@ -7285,8 +6854,9 @@
<block name="serviceapi" level="specific" long-name="Service API" levels="os mw1 mw2 app">
<!-- should break up this collection into something meaningful -->
<collection name="serviceproviders" long-name="Service Providers" level="mw1">
-<component name="sapi_contacts_vpbk" long-name="Contacts Phonebook SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
+<!-- are commented out components to be removed? -->
+<component name="sapi_contacts_vpbk" long-name="Contacts Phonebook SAPI" filter="s60" plugin="Y" class="placeholder">
+<!--<unit bldFile="serviceproviders/sapi_contacts_vpbk/group"/>-->
</component>
<component name="sapi_location" long-name="Location SAPI" filter="s60" plugin="Y">
<unit bldFile="mw/serviceapi/serviceproviders/sapi_location/group"/>
@@ -7297,14 +6867,14 @@
<component name="sapi_landmarks" long-name="Landmarks SAPI" filter="s60" plugin="Y">
<unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
</component>
-<component name="sapi_messaging" long-name="Messaging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/group"/>
-</component>
-<component name="sapi_applicationmanager" long-name="Application Manager SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
-</component>
-<component name="sapi_calendar" long-name="Calendar SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_calendar/group"/>
+<component name="sapi_messaging" long-name="Messaging SAPI" filter="s60" plugin="Y" class="placeholder">
+<!-- <unit bldFile="serviceproviders/sapi_messaging/group"/> -->
+</component>
+<component name="sapi_applicationmanager" long-name="Application Manager SAPI" filter="s60" plugin="Y" class="placeholder">
+<!-- <unit bldFile="serviceproviders/sapi_applicationmanager/group"/>-->
+</component>
+<component name="sapi_calendar" long-name="Calendar SAPI" filter="s60" plugin="Y" class="placeholder">
+<!-- <unit bldFile="serviceproviders/sapi_calendar/group"/> -->
</component>
<component name="sapi_logging" long-name="Logging SAPI" filter="s60" plugin="Y">
<unit bldFile="mw/serviceapi/serviceproviders/sapi_logging/group"/>
@@ -7327,6 +6897,13 @@
</component>
</collection>
</block>
+<block name="browser" level="specific" long-name="Browser" levels="plugin utils support main">
+<collection name="bookmarksengine" long-name="Bookmarks Engine" level="support">
+<component name="bookmarksengine_build" long-name="Bookmarks Engine Build" introduced="^4">
+<unit bldFile="mw/browser/bookmarksengine" proFile="bookmarksengine.pro"/>
+</component>
+</collection>
+</block>
<block name="web" level="specific" long-name="Web" levels="plugin utils server generic specific">
<collection name="web_pub" long-name="Web Public Interfaces" level="specific">
<component name="browser_control_api" long-name="Browser Control API" filter="s60" class="api">
@@ -7370,9 +6947,6 @@
<component name="download_mgr_client_api_extn" long-name="Download Manager Client API Extension" filter="s60" class="api">
<unit bldFile="mw/web/web_plat/download_mgr_client_api_extn/group"/>
</component>
-<component name="download_path_plugin_api" long-name="Download Path Plugin API" filter="s60" introduced="^3" class="api">
-<unit bldFile="mw/web/web_plat/download_path_plugin_api/group"/>
-</component>
<component name="feeds_engine_api" long-name="Feeds Engine API" filter="s60" class="api">
<unit bldFile="mw/web/web_plat/feeds_engine_api/group"/>
</component>
@@ -7385,6 +6959,9 @@
<component name="recent_url_store_api" long-name="Recent URL Store API" filter="s60" class="api">
<unit bldFile="mw/web/web_plat/recent_url_store_api/group"/>
</component>
+<component name="rt_gesturehelper_api" long-name="Runtime Gesture Helper API" filter="s60" introduced="^4" class="api">
+<unit bldFile="mw/web/web_plat/rt_gesturehelper_api/group"/>
+</component>
<component name="scheme_handler_plugin_api" long-name="Scheme Handler Plugin API" filter="s60" class="api">
<unit bldFile="mw/web/web_plat/scheme_handler_plugin_api/group"/>
</component>
@@ -7401,12 +6978,6 @@
<unit bldFile="mw/web/web_plat/xml_parser_api/group"/>
</component>
</collection>
-<collection name="web_info" long-name="Web Info" level="specific">
-<component name="web_build" filter="s60" long-name="Web Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/group"/>
-</component>
-</collection>
<collection name="browserutilities" long-name="Browser Utilities" level="utils">
<component name="browserdialogsprovider" filter="s60" long-name="Browser Dialogs Provider">
<unit bldFile="mw/web/browserutilities/browserdialogsprovider/group"/>
@@ -7436,8 +7007,7 @@
<unit bldFile="mw/web/browserutilities/feedsengine/group"/>
</component>
<component name="multipartparser" filter="s60" long-name="Multipart Parser">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
-<!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
+<unit bldFile="mw/web/browserutilities/multipartparser/group"/>
</component>
<component name="schemehandler" filter="s60" long-name="Scheme Handler">
<unit bldFile="mw/web/browserutilities/schemehandler/group"/>
@@ -7448,10 +7018,6 @@
<component name="aiwbrowserprovider" filter="s60" long-name="AIW Browser Provider" plugin="Y">
<unit bldFile="mw/web/browserutilities/aiwbrowserprovider/group"/>
</component>
-<component name="browserutilities_build" filter="s60" long-name="Browser Utilities Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="mw/web/browserutilities/group"/>
-</component>
</collection>
<collection name="webengine" long-name="Web Engine" level="server">
<component name="osswebengine" filter="s60" long-name="OSS Web Engine">
@@ -7474,9 +7040,6 @@
<component name="widgetregistry" filter="s60" long-name="Widget Registry">
<unit bldFile="mw/web/webengine/widgetregistry/group"/>
</component>
-<component name="wmlengine" filter="s60" long-name="WML Engine">
-<unit bldFile="mw/web/webengine/wmlengine/group"/>
-</component>
<component name="device" filter="s60" long-name="Device">
<!-- this needs a more meaningful name -->
<unit bldFile="mw/web/webengine/device/group"/>
@@ -7532,32 +7095,23 @@
</component>
</collection>
<collection name="widgets" long-name="Web Widget Framework" level="generic">
-<!-- the following units can be uncommented when configuration is put in place -->
<component name="widgetrecognizer" filter="s60" long-name="Widget Recognizer" plugin="Y">
-<!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
+<unit bldFile="mw/web/widgets/widgetrecognizer/group"/>
</component>
<component name="widgetinstaller" filter="s60" long-name="Widget Installer UI" plugin="Y">
-<!--<unit bldFile="widgets/widgetinstaller/group"/>-->
+<unit bldFile="mw/web/widgets/widgetinstaller/group"/>
</component>
<component name="widgetlauncher" filter="s60" long-name="Widget Launcher">
-<!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
+<unit bldFile="mw/web/widgets/widgetlauncher/group"/>
</component>
<component name="widgetapp" filter="s60" long-name="Widget UI">
-<!--<unit bldFile="widgets/widgetapp/group"/>-->
-</component>
-<component name="widgetsidchecker" filter="s60" long-name="Widget SID Checker" introduced="^3">
-<!--<unit bldFile="widgets/widgetsidchecker/group"/>-->
+<unit bldFile="mw/web/widgets/widgetapp/group"/>
</component>
<component name="widgetpreinstaller" filter="s60" long-name="Widget Pre-Installer">
-<!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
+<unit bldFile="mw/web/widgets/widgetpreinstaller/group"/>
</component>
<component name="widgetstartup" filter="s60" long-name="Widget Startup">
-<!--<unit bldFile="widgets/widgetstartup/group"/>-->
-</component>
-<component name="widgets_build" filter="s60" long-name="Widgets Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed
- #included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/widgets/group"/>
+<unit bldFile="mw/web/widgets/widgetstartup/group"/>
</component>
</collection>
</block>
@@ -7681,17 +7235,17 @@
</collection>
</block>
<block name="webruntime" level="specific" long-name="Web Runtime">
-<!-- need to break up this package nito collections and components -->
+<!-- need to break up this package into collections and components -->
<collection name="webruntime_info" long-name="Web Runtime Info">
<component name="webruntime_build" long-name="Web Runtime Build" introduced="^4">
-<unit bldFile="mw/webruntime" proFile="cwrt.pro" qmakeArgs=""what+=ninetwo" "what+=tenone" "what+=qt_unstable" "what+=wrtlite" "what+=exportiby""/>
+<unit bldFile="mw/webruntime" proFile="cwrt.pro" qmakeArgs=""what+=qtsfw" "what+=tenone" "what+=usif" "what+=services" "what+=wrtlite" "what+=exportiby""/>
</component>
</collection>
</block>
<block name="platformtools" level="generic" long-name="Platform Tools">
<collection name="gfxconversion" long-name="Graphics Conversion">
-<component name="bmconv_s60" filter="s60" long-name="S60 Bitmap Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/bmconv_s60/group"/>
+<component name="bmconv_s60" filter="s60" long-name="S60 Bitmap Converter" class="placeholder PC">
+<!-- Removed bmconv from builds <unit bldFile="gfxconversion/bmconv_s60/group"/> -->
</component>
<component name="mifconv" filter="s60" long-name="Multi Icon File Converter" class="PC">
<unit bldFile="mw/platformtools/gfxconversion/mifconv/group"/>
@@ -7705,10 +7259,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>
@@ -7725,9 +7279,6 @@
</component>
</collection>
<collection name="gfxtools" long-name="Graphics Tools" level="tool">
-<component name="gditools" filter="s60" long-name="GDI Tools" class="PC">
-<unit bldFile="mw/uitools/gfxtools/gditools/group"/>
-</component>
<component name="color" filter="s60" long-name="Bitmap Colour Palette" class="PC">
<unit bldFile="mw/uitools/gfxtools/color/group"/>
</component>
@@ -7759,9 +7310,9 @@
</layer>
<layer name="app" long-name="Applications" levels="services apps">
<block name="location" level="apps" long-name="Location Apps" levels="ui events loc api">
-<collection name="loc_plat" long-name="Location Apps Platform Interfaces" level="api">
+<collection name="location_plat" long-name="Location Apps Platform Interfaces" level="api">
<component name="location_picker_service_api" long-name="Location Picker Service API" introduced="^4" filter="s60" class="api">
-<unit bldFile="app/location/loc_plat" proFile="location_plat.pro"/>
+<unit bldFile="app/location/location_plat" proFile="location_plat.pro"/>
</component>
</collection>
<collection name="locationpickerservice" long-name="Location Picker Service" level="loc">
@@ -7770,6 +7321,12 @@
<unit bldFile="app/location/locationpickerservice" proFile="locationpickerservice.pro"/>
</component>
</collection>
+<collection name="locationdataharvester" long-name="Location Data Harvester" level="events">
+<!--collection is really a component. Should move down a directory -->
+<component name="locationdataharvester_build" long-name="Location Data Harvester Build" filter="s60" introduced="^4">
+<unit bldFile="app/location/locationdataharvester" proFile="locationdataharvester.pro"/>
+</component>
+</collection>
</block>
<!-- pending removal -->
<block name="phone" level="apps" span="2" long-name="Phone Apps" levels="engine plugin ui app">
@@ -7833,9 +7390,6 @@
<component name="phoneservices" filter="s60" long-name="Phone Server" introduced="^4">
<unit bldFile="app/phone/phoneengine/phoneservices" proFile="phoneservices.pro"/>
</component>
-<component name="parserrecognizer" filter="s60" long-name="Parser Recognizer" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneengine/parserrecognizer" proFile="parserrecognizer.pro"/>
-</component>
</collection>
<collection name="phoneuis" long-name="Phone UIs" level="ui">
<component name="bubblemanager2" filter="s60" long-name="Phone Bubble Manager">
@@ -7879,7 +7433,7 @@
<component name="phone_application_voip_commands_api" long-name="Phone Application VOIP Commands API" filter="s60" class="api">
<unit bldFile="app/phone/phone_plat/phone_application_voip_commands_api/group"/>
</component>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
+<component name="phone_telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
<unit bldFile="app/phone/phone_plat/telephony_mediator_api/group"/>
</component>
<component name="video_telephony_mediator_api" long-name="Video Telephony Mediator API" filter="s60" class="api">
@@ -7897,7 +7451,7 @@
<unit bldFile="app/phone/phoneplugins/hsdialerwidgetplugin" proFile="hsdialerwidgetplugin.pro"/>
</component>
<component name="infowidgetplugin" filter="s60" long-name="Info Widget Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/infowidgetplugin" proFile=""/>
+<unit bldFile="app/phone/phoneplugins/infowidgetplugin" proFile="infowidgetplugin.pro"/>
</component>
</collection>
<collection name="phonesettings" long-name="Phone Settings" level="plugin">
@@ -7906,6 +7460,32 @@
</component>
</collection>
</block>
+<block name="recents" level="apps" long-name="Recent Events" levels="engine support ui api">
+<collection name="recents_plat" long-name="Recent Events Platform Interfaces" level="api">
+<component name="logs_services_api" long-name="Logs Services API" filter="s60" introduced="^4" class="api"/>
+<component name="logs_engine_api" long-name="Logs Engine API" filter="s60" introduced="^4" class="api"/>
+<component name="logs_timers_api" long-name="Logs Timers API" filter="s60" class="api"/>
+<component name="logs_engine_api_extensions" long-name="Logs Engine API Extensions" filter="s60" class="api"/>
+</collection>
+<collection name="logsui" long-name="Logs UI" level="ui">
+<!-- split into actual components -->
+<component name="logsservices" filter="s60" long-name="Logs Services" introduced="^4" class="placeholder">
+<!-- <unit bldFile="logsui/logsservices" qt:proFile="logsui.pro"/> -->
+</component>
+<component name="logscntfinder" filter="s60" long-name="Logs Contact finder" class="placeholder">
+<!--<unit bldFile="logsui/logscntfinder" qt:proFile="logscntfinder.pro"/> -->
+</component>
+<component name="logsengine" filter="s60" long-name="Logs Engine" introduced="^4" class="placeholder">
+<!--<unit bldFile="logsui/logsengine" qt:proFile="logsengine.pro"/> -->
+</component>
+<component name="logsapp" filter="s60" long-name="Logs Application" class="placeholder">
+<!--<unit bldFile="logsui/logsengine" qt:proFile="logsengine.pro"/> -->
+</component>
+<component name="logsui_build" filter="s60" long-name="Logs UI Build">
+<unit bldFile="app/recents/logsui" proFile="logsui.pro"/>
+</component>
+</collection>
+</block>
<block name="settingsuis" level="services" long-name="Settings UIs" levels="plugin ui">
<collection name="controlpanelplugins" long-name="Control Panel Plugins" level="plugin">
<component name="themeplugin" filter="s60" long-name="Theme Plugin" introduced="^4">
@@ -7921,10 +7501,10 @@
</block>
<block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin framework app">
<collection name="contentctrl_plat" long-name="Content Control Daemons Platforn Interfaces" level="app">
-<component name="ds_contactsdatastoreextension_api" long-name="Adapter Customization API" filter="s60" introduced="^4" class="api">
+<component name="ds_contactsdatastoreextension_api" long-name="DS Contacts Data Store Extension API" filter="s60" introduced="^4" class="api">
<unit bldFile="app/contentcontrol/contentctrl_plat/ds_contactsdatastoreextension_api/group"/>
</component>
-<component name="ds_data_modification_api" long-name="DS Data Modification API" filter="s60" class="api">
+<component name="ds_data_modification_api" long-name="DS Data Modification API" filter="s60" introduced="^3" class="api">
<unit bldFile="app/contentcontrol/contentctrl_plat/ds_data_modification_api/group"/>
</component>
</collection>
@@ -7947,7 +7527,7 @@
<component name="omadsextensions" filter="s60" long-name="OMA DS Extensions" plugin="Y">
<unit bldFile="app/contentcontrol/omads/omadsextensions/group"/>
</component>
-<component name="omadsextensions" filter="s60" long-name="OMA DS Qt Extensions" plugin="Y">
+<component name="omadsextensions_qt" filter="s60" long-name="OMA DS Qt Extensions" plugin="Y">
<unit bldFile="app/contentcontrol/omads/omadsextensions" proFile="omadsextensions.pro"/>
</component>
</collection>
@@ -7965,11 +7545,14 @@
</component>
</collection>
</block>
-<block name="devicecontrol" level="services" long-name="Device Control Daemons" levels="oma mid app">
+<block name="devicecontrol" level="services" long-name="Device Control Daemons" levels="support mid app">
+<collection name="devicemgmtdialogsplugin" long-name="Device Management Dialogs Plugin" level="support">
+<!-- need to put component at the proper directory level -->
+<component name="devicemanagementnotifiersplugin" long-name="Device Management Notifiers Plugin" filter="s60" introduced="^4" plugin="Y">
+<unit bldFile="app/devicecontrol/devicemgmtdialogsplugin" proFile="devicemgmtdialogsplugin.pro"/>
+</component>
+</collection>
<collection name="deviceupdatesui" long-name="Device Updates UI" level="app">
-<component name="deviceupdatesui_adapters" long-name="Device Updates Adapters" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/devicecontrol/deviceupdatesui/adapters/bld"/>
-</component>
<component name="deviceupdates" long-name="Device Updates" filter="s60" introduced="^4">
<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdates" proFile="deviceupdates.pro"/>
</component>
@@ -7979,11 +7562,67 @@
<component name="deviceupdatesqtsp" long-name="Device Updates Qt Service Provider" filter="s60" introduced="^4">
<unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdatesqtsp" proFile="deviceupdatesqtsp.pro"/>
</component>
+</collection>
+<collection name="clientprovisioning" long-name="Client Provisioning" level="mid">
<component name="cpqtsp" long-name="Client Provisioning Qt Service Provider" filter="s60" introduced="^4">
-<unit bldFile="app/devicecontrol/deviceupdatesui/cpqtsp" proFile="cpqtsp.pro"/>
-</component>
-<component name="devicemanagementnotifiersplugin" long-name="Device Management Notifiers Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/devicecontrol/deviceupdatesui/devicemanagementnotifiersplugin" proFile="devicemanagementnotifiersplugin.pro"/>
+<unit bldFile="app/devicecontrol/clientprovisioning/cpqtsp" proFile="cpqtsp.pro"/>
+</component>
+</collection>
+<collection name="omadmadapters" long-name="OMA DM Adapters" level="support">
+<component name="omadmadapters_build" long-name="OMA DM Adapters Build" filter="s60">
+<!-- need to split IBY into the components or make this a ROM component -->
+<unit bldFile="app/devicecontrol/omadmadapters/bld"/>
+</component>
+<component name="devinfo" long-name="Device Info" filter="s60">
+<unit bldFile="app/devicecontrol/omadmadapters/devinfo/bld"/>
+</component>
+<component name="devdetail" long-name="Device Detail" filter="s60">
+<unit bldFile="app/devicecontrol/omadmadapters/devdetail/bld"/>
+</component>
+<component name="syncmldm" long-name="SyncML DM" filter="s60">
+<unit bldFile="app/devicecontrol/omadmadapters/syncmldm/bld"/>
+</component>
+<component name="syncmldm12" long-name="SyncML DM 1.2" filter="s60">
+<unit bldFile="app/devicecontrol/omadmadapters/syncmldm12/bld"/>
+</component>
+<component name="omadm_browseradapter" long-name="Browser Adapter" filter="s60" plugin="Y" class="placeholder">
+<!-- <unit bldFile="omadmadapters/browseradapter/bld"/> -->
+</component>
+<component name="omadm_streamingadapter" long-name="Streaming Adapter" filter="s60" plugin="Y">
+<unit bldFile="app/devicecontrol/omadmadapters/streamingadapter/bld"/>
+</component>
+<component name="globalwlansettings" long-name="Global WLAN Settings" filter="s60">
+<unit bldFile="app/devicecontrol/omadmadapters/globalwlansettings/group"/>
+</component>
+<component name="nsmldminternet" filter="s60" class="placeholder">
+<!-- <unit bldFile="omadmadapters/nsmldminternet/group"/> -->
+</component>
+<component name="nsmldmalwaysonadapter" long-name="Always Online Device Management Adapter" filter="s60" introduced="9.1" plugin="Y">
+<unit bldFile="app/devicecontrol/omadmadapters/nsmldmalwaysonadapter/group"/>
+</component>
+<component name="nsmldmbmadapter" long-name="NSML DM BM Adapter" filter="s60" plugin="Y">
+<unit bldFile="app/devicecontrol/omadmadapters/nsmldmbmadapter/group"/>
+</component>
+<component name="connmoadapter" long-name="Connection Management Object Adapter" filter="s60" plugin="Y">
+<unit bldFile="app/devicecontrol/omadmadapters/connmoadapter/group"/>
+</component>
+<component name="syncmlds" long-name="SyncML Data Sync" filter="s60">
+<unit bldFile="app/devicecontrol/omadmadapters/syncmlds/bld"/>
+</component>
+<component name="omadm_email" long-name="OMA DM Email" filter="s60">
+<unit bldFile="app/devicecontrol/omadmadapters/email/bld"/>
+</component>
+<component name="omadm_mms" long-name="OMA DM MMS" filter="s60">
+<unit bldFile="app/devicecontrol/omadmadapters/mms/bld"/>
+</component>
+<component name="omadm_fota" long-name="OMA DM FOTA" filter="s60">
+<!-- <unit bldFile="omadmadapters/fota/bld"/> -->
+</component>
+<component name="omadm_imps" long-name="OMA DM IMPS" filter="s60">
+<!-- <unit bldFile="omadmadapters/imps/bld"/> -->
+</component>
+<component name="dcmodmadapter" long-name="DC Management Object DM Adapter" filter="s60" plugin="Y" class="placeholder">
+<!-- <unit bldFile="omadmadapters/dcmodmadapter/group"/> -->
</component>
</collection>
</block>
@@ -7991,44 +7630,37 @@
<block name="files" level="apps" long-name="File Manager Apps" levels="support apps">
<collection name="filemanager" long-name="File Manager" level="apps">
<component name="filemanager_plat" long-name="File Manager Platform Interfaces" filter="s60" introduced="^4" class="api"/>
-<component name="fmbkupengine" filter="s60" long-name="File Manager Backup Engine" introduced="^4">
+<component name="fmbkupengine" filter="s60,bldfirst" long-name="File Manager Backup Engine" introduced="^4">
<unit bldFile="app/files/filemanager/src/fmbkupengine/group"/>
</component>
+<component name="fmfiledialog" filter="s60,bldfirst" long-name="File Manager File Dialog" introduced="^4">
+<unit bldFile="app/files/filemanager/src/fmfiledialog" proFile="fmfiledialog.pro" qmakeArgs="-r -config rom"/>
+</component>
<component name="filemanager_build" filter="s60" long-name="File Manager Build">
<!-- break this up into components or move down a directory -->
-<unit bldFile="app/files/filemanager" proFile="filemanager.pro"/>
+<unit bldFile="app/files/filemanager" qmakeArgs="-r" proFile="filemanager.pro"/>
</component>
</collection>
</block>
<block name="search" level="apps" long-name="Search Apps" levels="eng base app api">
<collection name="search_info" long-name="Search Info">
-<component name="search_build" long-name="Search Build">
+<component name="search_build" long-name="Search Build" introduced="^4">
<unit bldFile="app/search/group"/>
</component>
</collection>
<collection name="searchui" long-name="Search UI">
-<component name="searchui_build" long-name="Search UI Build">
+<component name="searchui_build" long-name="Search UI Build" introduced="^4">
<unit bldFile="app/search/searchui" proFile="searchui.pro"/>
</component>
</collection>
</block>
<block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
<collection name="contacts_plat" long-name="Contacts Apps Platform Interfaces" level="ui">
-<component name="logs_engine_api" long-name="Logs Engine API" filter="s60" introduced="^4" class="api"/>
-<component name="logs_engine_api_extensions" long-name="Logs Engine API Extensions" filter="s60" class="api"/>
-<component name="logs_services_api" long-name="Logs Services API" filter="s60" introduced="^4" class="api"/>
-<component name="logs_timers_api" long-name="Logs Timers API" filter="s60" class="api"/>
<component name="qt_mobility_contacts_api" long-name="Qt Mobility Contacts API" filter="s60" introduced="^4" class="api"/>
</collection>
-<collection name="logsui" long-name="Logs UI" level="ui">
-<component name="logsui_build" filter="s60" long-name="Logs UI Build">
-<!-- component at too high a rank, should move down one directory -->
-<unit bldFile="app/contacts/logsui" proFile="logsui.pro"/>
-</component>
-</collection>
<collection name="phonebookui" long-name="Phonebook UI" level="ui">
-<component name="mobhistorymodel" filter="s60" long-name="Mobile History Model" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/mobhistorymodel" qt:proFile="mobhistorymodel.pro"/> -->
+<component name="cnthistorymodel" filter="s60" long-name="Contacts History Model" introduced="^4" class="placeholder">
+<!--<unit bldFile="phonebookui/cnthistorymodel" qt:proFile="cnthistorymodel.pro"/> -->
</component>
<component name="pbkcommonui" filter="s60" long-name="Phonebook Common UI" introduced="^4" class="placeholder">
<!--<unit bldFile="phonebookui/pbkcommonui" qt:proFile="pbkcommonui.pro"/> -->
@@ -8044,43 +7676,52 @@
<unit bldFile="app/contacts/phonebookui" proFile="phonebookui.pro"/>
</component>
</collection>
-<collection name="qtcontactsmobility" long-name="Qt Contacts Mobility" level="support">
-<component name="qtcontactsmobility_build" filter="s60" long-name="Qt Contacts Mobility Build" introduced="^4" plugin="Y">
-<!-- not really a component, move down a dir? Break up into compnents? -->
-<unit bldFile="app/contacts/qtcontactsmobility" proFile="qtcontactsmobility.pro"/>
-</component>
-</collection>
<collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
<component name="cntfindplugin" filter="s60" long-name="Contacts Find Plugin" introduced="^2" plugin="Y">
<unit bldFile="app/contacts/phonebookengines/cntfindplugin" proFile="cntfindplugin.pro"/>
</component>
<component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
-<unit bldFile="app/contacts/phonebookengines/contactsmodel/groupsql" mrp="app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
+<unit bldFile="app/contacts/phonebookengines_old/contactsmodel/groupsql" mrp="app/contacts/phonebookengines_old/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
</component>
<component name="cntsortplugin" filter="s60" long-name="Contacts Sort Plugin" introduced="^2" plugin="Y">
<unit bldFile="app/contacts/phonebookengines/cntsortplugin" proFile="cntsortplugin.pro"/>
</component>
-<component name="mobcntmodel" filter="s60" long-name="Mobile Contacts Model" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/mobcntmodel" proFile="mobcntmodel.pro"/>
-</component>
-<component name="mobcntactions" filter="s60" long-name="Mobile Contacts Actions" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/mobcntactions" proFile="mobcntactions.pro"/>
+<component name="qtcontactsmobility" filter="s60" long-name="Qt Contacts Mobility" introduced="^4" plugin="Y">
+<!-- need to move to this actual dir rather than including something from another collection -->
+<unit bldFile="app/contacts/qtcontactsmobility" proFile="qtcontactsmobility.pro"/>
+</component>
+<component name="cntlistmodel" filter="s60" long-name="Contact List Model" introduced="^4">
+<unit bldFile="app/contacts/phonebookengines/cntlistmodel" proFile="cntlistmodel.pro"/>
+</component>
+<component name="cntactions" filter="s60" long-name="Contacts Actions" introduced="^4">
+<unit bldFile="app/contacts/phonebookengines/cntactions" proFile="cntactions.pro"/>
</component>
<component name="cntmaptileservice" filter="s60" long-name="Contacts Map Tile Service" introduced="^4">
<unit bldFile="app/contacts/phonebookengines/cntmaptileservice" proFile="cntmaptileservice.pro"/>
</component>
-<component name="simutility" filter="s60" long-name="SIM Utility" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/simutility" proFile="simutility.pro"/>
+<component name="cntsimutility" filter="s60" long-name="Contacts SIM Utility" introduced="^4">
+<unit bldFile="app/contacts/phonebookengines/cntsimutility" proFile="cntsimutility.pro"/>
+</component>
+<component name="cntimageutility" long-name="Contacts Image Utility" filter="s60" introduced="^4">
+<unit bldFile="app/contacts/phonebookengines/cntimageutility" proFile="cntimageutility.pro"/>
</component>
</collection>
<collection name="pimprotocols" long-name="PIM Protocols" level="services">
<component name="phonebooksync" long-name="Phonebook Sync" purpose="optional" plugin="Y">
<unit bldFile="app/contacts/pimprotocols/phonebooksync/group" mrp="app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
</component>
-<component name="pbap" long-name="Bluetooth PBAP" introduced="9.2" purpose="optional">
+<component name="pbap" filter="s60" long-name="Bluetooth PBAP" introduced="9.2" purpose="optional">
<unit bldFile="app/contacts/pimprotocols/pbap/group" mrp="app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
</component>
</collection>
+<collection name="presencecache" long-name="Presence Cache" level="support">
+<component name="presencecachesymbian" filter="s60" long-name="Presence Cache Symbian" introduced="^4">
+<unit bldFile="app/contacts/presencecache/presencecachesymbian" proFile="presencecachesymbian.pro"/>
+</component>
+<component name="presencecacheqt" filter="s60" long-name="Presence Cache Qt" introduced="^4">
+<unit bldFile="app/contacts/presencecache/presencecacheqt" proFile="presencecacheqt.pro"/>
+</component>
+</collection>
<collection name="contacts_info" long-name="Contacts Apps Info" level="ui">
<component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="^2" purpose="development" class="config PC">
<unit mrp="app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
@@ -8096,7 +7737,7 @@
</collection>
<collection name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" level="app">
<component name="organizer_plat_build" long-name="Organizer Application Suite Platform Interface Build" filter="s60" class="api">
-<!-- break up into individual .pro files -->
+<!-- break up into individual .pro files, move the above metaxmls to those components -->
<unit bldFile="app/organizer/organizer_plat" proFile="organizer_plat.pro"/>
</component>
<component name="agenda_versit_2_api" long-name="Agenda Versit 2 API" filter="s60" class="api placeholder">
@@ -8114,7 +7755,7 @@
<component name="agenda_interface_api" long-name="Agenda Interface API" filter="s60" introduced="^4" class="api"/>
<component name="calendar_editor_api" long-name="Calendar Editor API" filter="s60" introduced="^4" class="api"/>
<component name="notes_editor_api" long-name="Notes Editor API" filter="s60" introduced="^4" class="api"/>
-<component name="agenda_eventviewer_api" long-name="Agenda Event Viewer API" filter="s60" introduced="^4" class="api"/>
+<component name="clock_settingsview_plugin_api" long-name="Clock Settings View Plugin API" filter="s60" introduced="^4" class="api"/>
</collection>
<collection name="agendainterface" long-name="Agenda Interface" level="services">
<!-- collection is really a component, should move down a directory -->
@@ -8127,7 +7768,7 @@
<unit bldFile="app/organizer/calendarui/commonutils" proFile="commonutils.pro"/>
</component>
<component name="calenlauncher" filter="s60" long-name="Calendar Launcher">
-<unit bldFile="app/organizer/calendarui/calenlauncher/group" proFile="calenlauncher.pro"/>
+<unit bldFile="app/organizer/calendarui/calenlauncher" proFile="calenlauncher.pro"/>
</component>
<component name="caleneditor" filter="s60" long-name="Calendar Editor" introduced="^4">
<unit bldFile="app/organizer/calendarui/caleneditor" proFile="caleneditor.pro"/>
@@ -8147,26 +7788,26 @@
<component name="customisationmanager" filter="s60" long-name="Calendar Customisation Manager">
<unit bldFile="app/organizer/calendarui/customisationmanager" proFile="customisationmanager.pro"/>
</component>
-<component name="views" filter="s60" long-name="Calendar Views">
+<component name="calendarui_views" filter="s60" long-name="Calendar Views">
<unit bldFile="app/organizer/calendarui/views" proFile="views.pro"/>
</component>
-<component name="calengriditemstyleplugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/organizer/calendarui/styleplugins/calengriditemstyleplugin" proFile="calengriditemstyleplugin.pro"/>
-</component>
<component name="calendarui_controller" filter="s60" long-name="Calendar Controller">
<unit bldFile="app/organizer/calendarui/controller" proFile="controller.pro"/>
</component>
<component name="calendarui_application" filter="s60" long-name="Calendar Application">
<unit bldFile="app/organizer/calendarui/application" proFile="application.pro"/>
</component>
-<component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y">
-<unit bldFile="app/organizer/calendarui/caldav/group"/>
+<component name="regionalplugins" long-name="Regional Plugins" filter="s60" introduced="^4" plugin="Y">
+<unit bldFile="app/organizer/calendarui/regionalplugins" proFile="regionalplugins.pro"/>
+</component>
+<component name="calenviewerservice" long-name="Calendar Viewer Service" filter="s60" introduced="^4" plugin="Y">
+<unit bldFile="app/organizer/calendarui/calenviewerservice" proFile="calenviewerservice.pro"/>
+</component>
+<component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y" class="placeholder">
+<!-- not yet delivered in S^4 <unit bldFile="calendarui/caldav/group"/>-->
</component>
</collection>
<collection name="notes" long-name="Notes" level="ui">
-<component name="noteseditor" filter="s60" long-name="Notes Editor" introduced="^4">
-<unit bldFile="app/organizer/notes/notesui/noteseditor" proFile="noteseditor.pro"/>
-</component>
<component name="notes_build" filter="s60" long-name="Notes Build" introduced="^4">
<unit bldFile="app/organizer/notes" proFile="notes.pro"/>
</component>
@@ -8184,8 +7825,8 @@
<component name="calenimp" filter="s60" long-name="Calendar Import Wrapper" introduced="7.0s">
<unit bldFile="app/organizer/calendarengines/calenimp/group"/>
</component>
-<component name="caldavsrv" filter="sf_build" long-name="CalDAV Server" introduced="^3">
-<unit bldFile="app/organizer/calendarengines/caldav/group"/>
+<component name="caldavsrv" filter="sf_build" long-name="CalDAV Server" introduced="^3" class="placeholder">
+<!-- Not yet delivered in S^4 <unit bldFile="calendarengines/caldav/group"/> -->
</component>
</collection>
<collection name="clock" long-name="Clock" level="app">
@@ -8199,9 +7840,6 @@
<component name="clockui" filter="s60" long-name="Clock UI" class="placeholder">
<!--<unit bldFile="clock/clockui" qt:proFile="clockui.pro"/>-->
</component>
-<component name="ftudatetimewizard" filter="s60" long-name="First Time Use Date/Time Wizard" introduced="^4" class="placeholder">
-<!--<unit bldFile="clock/ftudatetimewizard" qt:proFile="ftudatetimewizard.pro"/>-->
-</component>
<component name="clock_build" filter="s60" long-name="Clock Build">
<!-- make exports into a component, or just move to one of the above components, then remove this and uncomment the above -->
<unit bldFile="app/organizer/clock" proFile="clock.pro"/>
@@ -8256,6 +7894,7 @@
<component name="messaging_history_api" long-name="Messaging History API" filter="s60" introduced="^4" class="api"/>
<component name="msg_plat_build" long-name="Messaging Apps Platform APIs Build" filter="s60" introduced="^4" class="api">
<!-- break this up into the above units and replace their base attributes with bldFile, etc -->
+<unit bldFile="app/messaging/msg_plat" proFile="msg_plat.pro" qmakeArgs="-r"/>
</component>
</collection>
<collection name="msg_pub" long-name="Messaging Apps Public APIs" level="api">
@@ -8263,6 +7902,7 @@
<component name="msg_smil_dtd_api" long-name="Messaging SMIL DTD API" filter="s60" introduced="^4" class="api"/>
<component name="msg_pub_build" long-name="Messaging Apps Public APIs Build" filter="s60" introduced="^4" class="api">
<!-- break this up into the above units and replace their base attributes with bldFile, etc -->
+<unit bldFile="app/messaging/msg_pub" proFile="msg_pub.pro" qmakeArgs="-r"/>
</component>
</collection>
<collection name="mobilemessaging" long-name="Mobile Messaging" level="plugin">
@@ -8276,9 +7916,6 @@
<unit bldFile="app/messaging/messagingappbase" proFile="messagingappbase.pro" qmakeArgs="-r"/>
</component>
<component name="msgmedia" filter="s60" long-name="Message Media"/>
-<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
-<unit mrp="app/messaging/messagingappbase/smsmtm/group/messaging_sms.mrp"/>
-</component>
<component name="smilparser" long-name="SMIL Parser" introduced="7.0s" purpose="optional">
<unit bldFile="app/messaging/messagingappbase/smilparser/GROUP" mrp="app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
</component>
@@ -8335,9 +7972,8 @@
</component>
</collection>
<collection name="messagingapp" long-name="Messaging Application" level="app">
-<component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
-<!-- this should be broken up into the individual other components -->
-<unit bldFile="app/messaging/messagingapp" proFile="messagingapp.pro" qmakeArgs="-r"/>
+<component name="messaging_conf" filter="s60" long-name="Messaging Application Configuration" introduced="^4" class="config">
+<unit bldFile="app/messaging/messagingapp/conf" proFile="messaging_conf.pro" qmakeArgs="-r"/>
</component>
<component name="msgutils" filter="s60" long-name="Messaging Utils" introduced="^4">
<unit bldFile="app/messaging/messagingapp/msgutils" proFile="msgutils.pro" qmakeArgs="-r"/>
@@ -8360,6 +7996,9 @@
<component name="msgui" filter="s60" long-name="Messaging UI" introduced="^4">
<unit bldFile="app/messaging/messagingapp/msgui" proFile="msgui.pro" qmakeArgs="-r"/>
</component>
+<component name="msgservices" filter="s60" long-name="Messaging Services" introduced="^4">
+<unit bldFile="app/messaging/messagingapp/msgservices" proFile="msgservices.pro" qmakeArgs="-r"/>
+</component>
</collection>
<collection name="email" long-name="Email" level="plugin">
<!-- use commonemail instead -->
@@ -8374,10 +8013,6 @@
<component name="messaging_metadata" long-name="Messaging Apps Metadata" introduced="^2" purpose="development" class="config PC">
<unit mrp="app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
</component>
-<component introduced="^4">
-<!-- break this up into the above collections and eventually remove -->
-<unit bldFile="app/messaging" proFile="messaging.pro" qmakeArgs="-r"/>
-</component>
</collection>
</block>
<block name="commonemail" level="apps" span="2" long-name="Email Apps" levels="service support ui app">
@@ -8406,6 +8041,9 @@
<component name="nmailagent" filter="s60" long-name="Nmail Agent" introduced="^4" class="placeholder">
<!-- <unit bldFile="emailservices/nmailagent" qt:proFile="nmailagent.pro"/>-->
</component>
+<component name="nmutilities" filter="s60" long-name="Nmail Utilities" introduced="^4" class="placeholder">
+<!-- <unit bldFile="emailservices/nmutilities" qt:proFile="nmutilities.pro"/> -->
+</component>
</collection>
<collection name="ipsservices" long-name="IMAP/POP/SMTP Services" level="service">
<component name="ipssosplugin" filter="s60" long-name="IPS SOS Plugin" introduced="^2" plugin="Y" class="placeholder">
@@ -8455,7 +8093,7 @@
<collection name="commonemail_info" long-name="Email Apps Info" level="app">
<component name="commonemail_build" long-name="Email Apps Build" introduced="^4">
<!-- split into actual components -->
-<unit bldFile="app/commonemail" proFile="nmail.pro" qmakeArgs="-r"/>
+<unit bldFile="app/commonemail/group"/>
</component>
</collection>
</block>
@@ -8466,176 +8104,12 @@
</component>
</collection>
</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">
-<component name="image_editor_debug_utilities_api" long-name="Image Editor Debug Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
-</component>
-<component name="image_editor_utilities_api" long-name="Image Editor Utilities API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_utilities_api/group"/>
-</component>
-<component name="image_editor_definitions_api" long-name="Image Editor Definitions API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_definitions_api/group"/>
-</component>
-<component name="image_editor_system_parameters_api" long-name="Image Editor System Parameters API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_system_parameters_api/group"/>
-</component>
-<component name="image_processing_engine_api" long-name="Image Processing Engine API" filter="s60" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_processing_engine_api/group"/>
-</component>
-</collection>
-<collection name="imageeditor" long-name="Image Editor UI" level="ui">
-<component name="pb" filter="s60" long-name="Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/pb/group"/>
-</component>
-<component name="iepb" filter="s60" long-name="Image Editor Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/iepb/group"/>
-</component>
-<component name="imageeditorui" filter="s60" long-name="Image Editor UI">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorui/group"/>
-</component>
-<component name="imageeditormanager" filter="s60" long-name="Image Editor Manager">
-<unit bldFile="app/imgeditor/imageeditor/imageeditormanager/group"/>
-</component>
-<component name="imageeditorapp" filter="s60" long-name="Image Editor Application">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorapp/group"/>
-</component>
-<component name="imageeditor_plugins" filter="s60" long-name="Image Editor Plugins" plugin="Y">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditor/plugins/blackwhiteplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/brightnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/bubbleplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cartoonizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/clipartplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/contrastplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cropplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/drawplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/frameplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/negativeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/redeyeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/resizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotatelplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotaterplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/textplugin/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditor/plugins/drawplugin/group"/>
- -->
-</component>
-<component name="editorprovider" filter="s60" long-name="Image Editor Provider">
-<unit bldFile="app/imgeditor/imageeditor/editorprovider/group"/>
-</component>
-<component name="imageeditor_build" filter="s60" long-name="Image Editor Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditor/group"/>
-</component>
-</collection>
-<collection name="imageeditorengine" long-name="Image Editor Engine" level="engine">
-<component name="filters" filter="s60" long-name="Image Editor Filters">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbrightness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbubble/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbuffer/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercartoon/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterclipart/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercontrast/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercrop/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterdraw/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterframe/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtergrayscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtericlsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegtarget/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filternegate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterredeye/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterrotate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtertext/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
- -->
-</component>
-<component name="imageeditorutils" filter="s60" long-name="Image Editor Utilities">
-<unit bldFile="app/imgeditor/imageeditorengine/imageeditorutils/group"/>
-</component>
-<component name="systemparameters" filter="s60" long-name="System Parameters">
-<unit bldFile="app/imgeditor/imageeditorengine/systemparameters/group"/>
-</component>
-<component name="enginewrapper" filter="s60" long-name="Image Editor Engine Wrapper">
-<unit bldFile="app/imgeditor/imageeditorengine/enginewrapper/group"/>
-</component>
-<component name="imageeditorengine_build" filter="s60" long-name="Image Editor Engine Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditorengine/group"/>
-</component>
-</collection>
-</block>
-<block name="videoeditor" level="apps" long-name="Video Editor Apps" levels="engine ui">
-<collection name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" level="ui">
-<component name="video_editor_engine_api" long-name="Video Editor Engine API" introduced="^2" class="api">
-<unit bldFile="app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
-</component>
-</collection>
-<collection name="videditor" long-name="Video Editor" level="ui">
-<component name="videoeditorcommon" filter="s60" long-name="Video Editor Common" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditorcommon/group"/>
-</component>
-<component name="videoeditoruicomponents" filter="s60" long-name="Video Editor UI Components" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditoruicomponents/group"/>
-</component>
-<component name="simplevideoeditor" filter="s60" long-name="Simple Video Editor" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplevideoeditor/group"/>
-</component>
-<component name="simplecutvideo" filter="s60" long-name="Simple Cut Video" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplecutvideo/group"/>
-</component>
-<component name="videoprovider" filter="s60" long-name="Video Provider" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoprovider/group"/>
-</component>
-<component name="manualvideoeditor" filter="s60" long-name="Manual Video Editor" introduced="^2" class="placeholder">
-<!-- uncomment when supported
- <meta rel="config">
- <defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
- </meta>
- <unit bldFile="videditor/manualvideoeditor/group"/> -->
-</component>
-<component name="videditor_build" filter="s60" long-name="Video Editor Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videditor/group"/>
-</component>
-</collection>
-<collection name="videoeditorengine" long-name="Video Editor Engine" level="engine">
-<component name="audioeditorengine" filter="s60" long-name="Audio Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/audioeditorengine/group"/>
-</component>
-<component name="avcedit" filter="s60" long-name="AVC Editing" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/avcedit/group"/>
-</component>
-<component name="h263decoder" filter="s60" long-name="H.263 Decoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/h263decoder/group"/>
-</component>
-<component name="mp3aacmaniplib" filter="s60" long-name="MP3 and AAC Manipulation Library" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
-</component>
-<component name="vedtranscoder" filter="s60" long-name="Video Editor Transcoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedtranscoder/group"/>
-</component>
-<component name="vedengine" filter="s60" long-name="Video Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedengine/group"/>
-</component>
-<component name="videoeditorengine_build" filter="s60" long-name="Video Editor Engine Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videoeditorengine/group"/>
-</component>
-</collection>
-</block>
+<block name="imgeditor" level="apps" long-name="Image Editor"/>
+<block name="videoeditor" level="apps" long-name="Video Editor"/>
<block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
<collection name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" level="apps">
<component name="videoplayer_startup_api" long-name="Video Player Startup API" filter="s60" class="api">
-<unit bldFile="app/videoplayer/videoplayer_plat/videoplayer_startup_api/group" filter="!test"/>
+<unit bldFile="app/videoplayer/videoplayer_plat/videoplayer_startup_api/group"/>
</component>
<component name="videocollection_api" long-name="Video Collection API" filter="s60" class="api">
<unit bldFile="app/videoplayer/videoplayer_plat/videocollection_api/group"/>
@@ -8643,7 +8117,7 @@
</collection>
<collection name="videocollection" long-name="Video Collection" level="util">
<component name="mpxmyvideoscollection" filter="s60" long-name="MPX My Videos Collection" introduced="^3">
-<unit bldFile="app/videoplayer/videocollection/mpxmyvideoscollection/group"/>
+<unit bldFile="app/videoplayer/videocollection/mpxmyvideoscollection/group" filter="!test"/>
</component>
<component name="videocollectionwrapper" filter="s60" long-name="Video Collection Wrapper" introduced="^4">
<unit bldFile="app/videoplayer/videocollection/videocollectionwrapper" proFile="videocollectionwrapper.pro" qmakeArgs="-r"/>
@@ -8656,17 +8130,19 @@
</component>
</collection>
<collection name="mediasettings" long-name="Media Settings" level="support">
-<!-- this is really a component. Should be moved down a directory -->
-<component name="mediasettings_build" filter="s60" long-name="Media Settings Build">
-<unit bldFile="app/videoplayer/mediasettings/group"/>
+<component name="mediasettingsengine" filter="s60" long-name="Media Settings Engine">
+<unit bldFile="app/videoplayer/mediasettings/mediasettingsengine/group"/>
+</component>
+<component name="videosettingsplugin" filter="s60" long-name="Video Settings Plugin" plugin="Y" class="placeholder">
+<!--<unit bldFile="mediasettings/videosettingsplugin" qt:proFile="videosettingsplugin.pro"/> -->
</component>
</collection>
<collection name="videoplayerapp" long-name="Video Player App" level="apps">
<component name="videoplayerengine" long-name="Video Player Engine" filter="s60" introduced="^4">
<unit bldFile="app/videoplayer/videoplayerapp/videoplayerengine" proFile="videoplayerengine.pro" qmakeArgs="-r"/>
</component>
-<component name="hbvideoplayer" filter="s60" long-name="HB Video Player" introduced="^4">
-<unit bldFile="app/videoplayer/videoplayerapp/hbvideoplayer" proFile="hbvideoplayer.pro" qmakeArgs="-r"/>
+<component name="hbvideoplayer" filter="s60" long-name="Video Player" introduced="^4">
+<unit bldFile="app/videoplayer/videoplayerapp/videoplayer" proFile="videoplayer.pro" qmakeArgs="-r"/>
</component>
</collection>
<collection name="videoplayback" long-name="Video Playback Plugins" level="plugin">
@@ -8677,7 +8153,7 @@
<unit bldFile="app/videoplayer/videoplayback/hbvideoplaybackviewplugin" proFile="hbvideoplaybackviewplugin.pro" qmakeArgs="-r"/>
</component>
<component name="videohelix" long-name="Video Helix" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videohelix/group"/>
+<unit bldFile="app/videoplayer/videoplayback/videohelix/group" filter="!test"/>
</component>
</collection>
</block>
@@ -8701,12 +8177,22 @@
</component>
</collection>
<collection name="photos_ui" long-name="Photos UI" level="ui">
+<!-- need to move exports from ui.pro into separate .pro or bld.inf -->
+<component name="detailscustomwidget " filter="s60" long-name="Details Custom Widget" introduced="^4" class="placeholder">
+<!--<unit bldFile="ui/detailscustomwidget " qt:proFile="detailscustomwidget .pro"/> -->
+</component>
<component name="photos_uiengine" filter="s60" long-name="Photos UI Engine" introduced="^4" class="placeholder">
<!--<unit bldFile="ui/uiengine" qt:proFile="uiengine.pro"/> -->
</component>
<component name="photos_commandhandlers" filter="s60" long-name="Photos Command Handlers" introduced="^4" class="placeholder">
<!--<unit bldFile="ui/commandhandlers" qt:proFile="commandhandlers.pro"/> -->
</component>
+<component name="photos_viewutilities" filter="s60" long-name="Photos View Utilities" introduced="^4" class="placeholder">
+<!--<unit bldFile="ui/viewutilities" qt:proFile="commandhandlers.pro"/> -->
+</component>
+<component name="photos_widgets" filter="s60" long-name="Photos Widgets" introduced="^4" class="placeholder">
+<!--<unit bldFile="ui/widgets" qt:proFile="widgets.pro"/> -->
+</component>
<component name="photos_views" filter="s60" long-name="Photos Views" introduced="^4" class="placeholder">
<!--<unit bldFile="ui/views" qt:proFile="views.pro"/> -->
</component>
@@ -8719,6 +8205,11 @@
<!--<unit bldFile="main" qt:proFile="main.pro"/> -->
</component>
</collection>
+<collection name="gallery" long-name="Gallery" level="ui">
+<component name="gallery_build" filter="s60" long-name="Gallery Build" introduced="^4" class="placeholder">
+<!--<unit bldFile="gallery" qt:proFile="gallery.pro"/> -->
+</component>
+</collection>
<collection name="imageviewerapp" long-name="Image Viewer App" level="support">
<component name="imageviewerapp_build" filter="s60" long-name="Image Viewer App Build" introduced="^4" class="placeholder">
<!--<unit bldFile="imageviewerapp" qt:proFile="imageviewerapp.pro"/> -->
@@ -8731,8 +8222,20 @@
</component>
</collection>
</block>
-<block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support hs app">
-<!-- move the export .pri files into their components and uncomment the units -->
+<block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support engine app">
+<!-- move the rom .pri files into their components and uncomment the units -->
+<collection name="mpdata " long-name="Music Player Data" level="support">
+<!-- collection is really a component, move down a directory -->
+<component name="mpdata_build" filter="s60" long-name="Music Player Data Build" introduced="^4" class="placeholder">
+<!-- <unit bldFile="mpdata" qt:proFile="mpdata.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+</collection>
+<collection name="mpengine " long-name="Music Player Engine" level="engine">
+<!-- collection is really a component, move down a directory -->
+<component name="mpengine_build" filter="s60" long-name="Music Player Engine Build" introduced="^4" class="placeholder">
+<!-- <unit bldFile="mpengine" qt:proFile="mpengine.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+</collection>
<collection name="musicplayer_utilities " long-name="Music Player Utilities" level="support">
<component name="mpnowplayingbanner" filter="s60" long-name="MP Now Playing Banner" introduced="^4" class="placeholder">
<!-- <unit bldFile="utilities/mpnowplayingbanner" qt:proFile="mpnowplayingbanner.pro" qt:qmakeArgs="-r -config rom"/> -->
@@ -8741,10 +8244,10 @@
<!-- <unit bldFile="utilities/mpsettingsmanager" qt:proFile="mpsettingsmanager.pro" qt:qmakeArgs="-r -config rom"/> -->
</component>
</collection>
-<collection name="musicfetcher " long-name="Music Fetcher" level="support">
+<collection name="musicservices " long-name="Music Services" level="support">
<!-- collection is really a component, move down a directory -->
-<component name="musicfetcher_buld" filter="s60" long-name="Music Fetcher Build" introduced="^4" class="placeholder">
-<!-- <unit bldFile="musicfetcher" qt:proFile="musicfetcher.pro" qt:qmakeArgs="-r -config rom"/> -->
+<component name="musicservices_build" filter="s60" long-name="Music Services Build" introduced="^4" class="placeholder">
+<!-- <unit bldFile="musicservices" qt:proFile="musicservices.pro" qt:qmakeArgs="-r -config rom"/> -->
</component>
</collection>
<collection name="musicplayer_app " long-name="Music Player Application" level="app">
@@ -8753,12 +8256,26 @@
<!-- <unit bldFile="app" qt:proFile="app.pro" qt:qmakeArgs="-r -config rom"/> -->
</component>
</collection>
-<collection name="mpviewplugins " long-name="Music Player View Plugins" level="plugins">
+<collection name="mpviewplugins" long-name="Music Player View Plugins" level="plugins">
<component name="mpcollectionviewplugin" filter="s60" long-name="MP Collection View Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpviewplugins/mpcollectionviewplugin/group"/>-->
+<!--<unit bldFile="mpviewplugins/mpcollectionviewplugin" qt:proFile="mpcollectionviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
</component>
<component name="mpplaybackviewplugin" filter="s60" long-name="MP Playback View Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpviewplugins/mpplaybackviewplugin/group"/>-->
+<!--<unit bldFile="mpviewplugins/mpplaybackviewplugin" qt:proFile="mpplaybackviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+<component name="mpsettingsviewplugin" filter="s60" long-name="MP Settings View Plugin" introduced="^4" plugin="Y" class="placeholder">
+<!--<unit bldFile="mpviewplugins/mpsettingsviewplugin" qt:proFile="mpsettingsviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+<component name="mpdetailsviewplugin" filter="s60" long-name="MP Details View Plugin" introduced="^4" plugin="Y" class="placeholder">
+<!--<unit bldFile="mpviewplugins/mpdetailsviewplugin" qt:proFile="mpdetailsviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+<component name="mpmediawallviewplugin" filter="s60" long-name="MP Media Wall View Plugin" introduced="^4" plugin="Y" class="placeholder">
+<!--<unit bldFile="mpviewplugins/mpmediawallviewplugin" qt:proFile="mpmediawallviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+</collection>
+<collection name="musicwidgetplugin" long-name="Music Widget Plugin" level="plugins">
+<component name="musicwidgetplugin_build" filter="s60" long-name="Music Widget Plugin" introduced="^4" plugin="Y" class="placeholder">
+<!--<unit bldFile="musicwidgetplugin" qt:proFile="musicwidgetplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
</component>
</collection>
<collection name="mpserviceplugins" long-name="Music Player Service Plugins" level="plugins">
@@ -8772,24 +8289,30 @@
<component name="mpxsqlitedbcommon" filter="s60" long-name="MPX SQLite Database Common" introduced="^4" class="placeholder">
<!--<unit bldFile="mpserviceplugins/mpxsqlitedbcommon/group"/>-->
</component>
+<component name="mpxsqlitedbhgplugin" filter="s60" long-name="MPX SQLite Database Hg Plugin" introduced="^4" plugin="Y" class="placeholder">
+<!--<unit bldFile="mpserviceplugins/mpxsqlitedbhgplugin/group"/>-->
+</component>
<component name="mpxsqlitedbplugin" filter="s60" long-name="MPX SQLite Database Plugin" introduced="^4" plugin="Y" class="placeholder">
<!--<unit bldFile="mpserviceplugins/mpxsqlitedbplugin/group"/>-->
</component>
<component name="mpxsqlitepodcastdbplugin" filter="s60" long-name="MPX SQLlite Podcast Database Plugin" introduced="^4" plugin="Y" class="placeholder">
<!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
</component>
+<component name="mpxinmemoryplugin" filter="s60" long-name="MPX In-Memory Plugin" introduced="^4" plugin="Y" class="placeholder">
+<!--<unit bldFile="mpserviceplugins/mpxinmemoryplugin/group"/>-->
+</component>
<component name="m3uplaylistplugin" filter="s60" long-name="M3U Playlist Plugin" introduced="^4" plugin="Y" class="placeholder">
<!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
</component>
</collection>
<collection name="musicplayer_info" long-name="Music Player Apps Info" level="app">
<component name="musicplayer_build" filter="s60" long-name="Music Player Build">
-<!-- should brak up into individual components -->
+<!-- break up into individual components. ROM includes should be in their components -->
<unit bldFile="app/musicplayer" proFile="qtmusicplayer.pro" qmakeArgs="-r -config rom"/>
</component>
</collection>
</block>
-<block name="radio" level="apps" long-name="Radio Apps" levels="engine ui">
+<block name="radio" level="apps" long-name="Radio Apps" levels="engine plugin ui">
<collection name="radioengine" long-name="Radio Engine" level="engine">
<component name="radioengineutils" filter="s60" long-name="Radio Engine Utils" introduced="^4">
<unit bldFile="app/radio/radioengine/utils/group"/>
@@ -8821,6 +8344,12 @@
<unit bldFile="app/radio/rom"/>
</component>
</collection>
+<collection name="radiohswidget" long-name="Radio Homescreen Widget" level="plugin">
+<!-- collection is really a component. Move down a directory -->
+<component name="radiohswidget_build" filter="s60" long-name="Radio HS Widget Build" introduced="^4">
+<unit bldFile="app/radio/radiohswidget" proFile="radiohswidget.pro"/>
+</component>
+</collection>
</block>
<block name="internetradio" level="apps" long-name="Internet Radio Apps" levels="engine server ui">
<collection name="internetradio2_0" long-name="Internet Radio 2.0" level="ui">
@@ -8842,62 +8371,63 @@
</component>
</collection>
</block>
+<block name="podcatcher" level="apps" long-name="Podcatcher" levels="app">
+<collection name="podcatcher_info" long-name="Podcatcher" level="app">
+<component name="podcatcher_build" filter="sf_build" long-name="Podcatcher Build" introduced="^3">
+<!-- has exports from top level bld.inf -->
+<unit bldFile="app/podcatcher/group"/>
+</component>
+<component name="podcatcher_app" filter="sf_build" long-name="Podcatcher Application" introduced="^3">
+<unit bldFile="app/podcatcher/application/group"/>
+</component>
+<component name="podcatcher_engine" filter="sf_build" long-name="Podcatcher Engine" introduced="^3">
+<unit bldFile="app/podcatcher/engine/group"/>
+</component>
+</collection>
+</block>
<block name="homescreen" level="apps" long-name="Home Screen Apps" levels="support task ss hs">
-<collection name="homescreen_info" long-name="Home Screen Info" level="support">
-<component name="homescreen_build" long-name="Homescreen Build">
-<!-- break this up properly into components -->
-<unit bldFile="app/homescreen" proFile="homescreen.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
<collection name="homescreen_test" long-name="Home Screen Test" level="support"/>
-<!-- fiill in details with broken up homescreen_build -->
<collection name="homescreenapp" long-name="Home Screen Application" level="hs">
-<component name="hsutils" long-name="Home Screen Utils" introduced="^4"/>
-<component name="hsdomainmodel" long-name="HS Domain Model" introduced="^4"/>
-<component name="hs_runtimeplugins" long-name="HS Runtime Plugins" introduced="^4" plugin="Y"/>
-<component name="hs_serviceproviders" long-name="HS Service Providers" introduced="^4" plugin="Y"/>
-<component name="hs_stateplugins" long-name="HS State Plugins" introduced="^4" plugin="Y"/>
-<component name="hs_widgetplugins" long-name="HS Widget Plugins" introduced="^4" plugin="Y"/>
-<component name="hsapplication" long-name="Home Screen Application" introduced="^4"/>
-<component name="hshomescreenclientplugin" long-name="Home Screen Client Plugin" introduced="^4" plugin="Y"/>
-<component name="hsmenucontentpublish" long-name="HS Menu Content Publish" introduced="^4"/>
-</collection>
-<collection name="screensaverapp" long-name="Screen Saver Application" level="ss">
-<component name="snsrutils" long-name="Screen Saver Utils" introduced="^4"/>
-<component name="snsr_serviceproviders" long-name="Screen Saver Service Providers" introduced="^4" plugin="Y"/>
-<component name="snsr_stateproviders" long-name="Screen Saver State Providers" introduced="^4" plugin="Y"/>
-<component name="snsr_runtimeproviders" long-name="Screen Saver Runtime Providers" introduced="^4" plugin="Y"/>
-<component name="snsrapplication" long-name="Screen Saver Application" introduced="^4"/>
-<component name="screensaverproviders" long-name="Screen Saver Providers" introduced="^4" plugin="Y"/>
+<component name="hsutils" long-name="Home Screen Utils" introduced="^4">
+<unit bldFile="app/homescreen/homescreenapp/hsutils" proFile="hsutils.pro" qmakeArgs="-r -config rom"/>
+</component>
+<component name="hsdomainmodel" long-name="HS Domain Model" introduced="^4">
+<unit bldFile="app/homescreen/homescreenapp/hsdomainmodel" proFile="hsdomainmodel.pro" qmakeArgs="-r -config rom"/>
+</component>
+<component name="hs_runtimeplugins" long-name="HS Runtime Plugins" introduced="^4" plugin="Y">
+<unit bldFile="app/homescreen/homescreenapp/runtimeplugins" proFile="runtimeplugins.pro" qmakeArgs="-r -config rom"/>
+</component>
+<component name="hs_serviceproviders" long-name="HS Service Providers" introduced="^4" plugin="Y">
+<unit bldFile="app/homescreen/homescreenapp/serviceproviders" proFile="serviceproviders.pro" qmakeArgs="-r -config rom"/>
+</component>
+<component name="hs_stateplugins" long-name="HS State Plugins" introduced="^4" plugin="Y">
+<unit bldFile="app/homescreen/homescreenapp/stateplugins" proFile="stateplugins.pro" qmakeArgs="-r -config rom"/>
+</component>
+<component name="hs_widgetplugins" long-name="HS Widget Plugins" introduced="^4" plugin="Y">
+<unit bldFile="app/homescreen/homescreenapp/widgetplugins" proFile="widgetplugins.pro" qmakeArgs="-r -config rom"/>
+</component>
+<component name="hsapplication" long-name="Home Screen Application" introduced="^4">
+<unit bldFile="app/homescreen/homescreenapp/hsapplication" proFile="hsapplication.pro" qmakeArgs="-r -config rom"/>
+</component>
+<component name="hsmenuclientplugin" long-name="Home Screen Menu Client Plugin" introduced="^4" plugin="Y">
+<unit bldFile="app/homescreen/homescreenapp/hsmenuclientplugin" proFile="hsmenuclientplugin.pro" qmakeArgs="-r -config rom"/>
+</component>
+<component name="hshomescreenclientplugin" long-name="HS Menu Client Plugin" introduced="^4" plugin="Y">
+<unit bldFile="app/homescreen/homescreenapp/hshomescreenclientplugin" proFile="hshomescreenclientplugin.pro" qmakeArgs="-r -config rom"/>
+</component>
+<component name="hswidgetuninstaller" long-name="HS Widget Uninstaller" introduced="^4">
+<unit bldFile="app/homescreen/homescreenapp/hswidgetuninstaller" proFile="hswidgetuninstaller.pro" qmakeArgs="-r -config rom"/>
+</component>
+<component name="homescreenapp_rom" long-name="Home Screen App ROM" introduced="^4">
+<unit bldFile="app/homescreen/homescreenapp" proFile="homescreenapp_exports_to_rom.pri" qmakeArgs="-r -config rom"/>
+</component>
</collection>
<collection name="taskswitcherapp" long-name="Task Switcher Application" level="task">
-<component name="taskswitcherappecom" long-name="Task Switcher Application ECom" introduced="^4"/>
-<component name="tsserviceplugin" long-name="Task Switcher Service Plugin" introduced="^4" plugin="Y"/>
-<component name="ts_runtimeplugins" long-name="TS Runtime Plugins" introduced="^4" plugin="Y"/>
-<component name="tsapplication" long-name="Task Switcher Application" introduced="^4"/>
-</collection>
-</block>
-<block name="homescreentools" level="services" long-name="Home Screen Tools" levels="tool install">
-<collection name="dtdinstaller" long-name="DTD Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<!-- this needs to be built first, does build order need to be forced with filters? -->
-<component name="dtdinstaller_build" filter="s60,bldmefirst" long-name="DTD Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/dtdinstaller/group"/>
-</component>
-</collection>
-<collection name="themeinstaller" long-name="Theme Installer" level="install">
-<!-- collection is really a component. Needs to be moved down a directory -->
-<component name="themeinstaller_build" filter="s60" long-name="Theme Installer Build" class="tool PC">
-<unit bldFile="app/homescreentools/themeinstaller/group"/>
-</component>
-</collection>
-<collection name="widgettools" long-name="Widget Tools" level="install">
-<component name="hspluginpreinstaller" filter="s60" long-name="HS Plugin Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/hspluginspreinstaller/group"/>
-</component>
-<component name="wrtwidgetpreinstaller" filter="s60" long-name="WRT Widget Preinstaller" introduced="^3" class="tool PC">
-<unit bldFile="app/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
-</component>
+<!-- break collection info components, or move down a dir and make it a component -->
+<component name="taskswitcherapp_build" long-name="Task Switcher Application Build">
+<unit bldFile="app/homescreen/taskswitcherapp" proFile="taskswitcherapp.pro" qmakeArgs="-r -config rom"/>
+</component>
+<component name="tsdevicedialogplugin" long-name="Task Switcher Device Dialog Plugin" introduced="^4" plugin="Y"/>
</collection>
</block>
<block name="jrt" level="services" long-name="Java Runtime" levels="util generic rt ui">
@@ -8912,26 +8442,58 @@
<unit bldFile="app/jrt/jrt_plat/java_debug_api/build"/>
</component>
</collection>
-<collection name="java_stubs" long-name="Java Stubs" level="util">
-<!-- uncomment all components when configuration is in place. Currently #included from jrt_build -->
-<component name="javadrmutils" long-name="Java DRM Utils" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtdrmutils/group"/>-->
-</component>
-<component name="javaenvinfo" long-name="Java Environment Info" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtenvinfo/group"/>-->
-</component>
-<component name="javaregistry" filter="s60,sf_build" long-name="Java Registry" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtregistry/clientserver/client/group"/>-->
-</component>
-<component name="java_stubs_build" filter="s60,sf_build" long-name="Java Stubs ROM" class="placeholder">
-<!-- Remove the #includes and rename JRT ROM-->
-<!--<unit bldFile="java_stubs/group"/>-->
-</component>
-</collection>
-<collection name="jrt_info" long-name="JRT Info" level="rt">
-<component name="jrt_build" filter="s60" long-name="JRT Build">
-<!-- needed for __JAVA_STUBS condition -->
-<unit bldFile="app/jrt/group"/>
+<collection name="java_stubs" long-name="Java Stubs" level="rt">
+<component name="java_stubs_build" long-name="Build Native Java" filter="sf_build" introduced="^4">
+<unit bldFile="app/jrt/java_stubs/group"/>
+</component>
+</collection>
+<collection name="build_nativejava" long-name="Build Native Java">
+<component name="nativejava" long-name="Build Native Java" filter="s60" introduced="^4">
+<unit bldFile="app/jrt/build/nativejava" filter="!sf_build" proFile="nativejava.pro" qmakeArgs="-r"/>
+<unit bldFile="app/jrt/build/nativejava" filter="sf_build" proFile="nativejava.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
+</component>
+</collection>
+<collection name="javacommons" long-name="Java Commons" level="generic">
+<component name="javacommons_build" filter="s60" long-name="JRT Build">
+<unit bldFile="app/jrt/javacommons" filter="!sf_build" proFile="javacommons.pro" qmakeArgs="-r"/>
+<unit bldFile="app/jrt/javacommons" filter="sf_build" proFile="javacommons.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
+</component>
+</collection>
+<collection name="javaruntimes" long-name="Java Runtimes" level="rt">
+<component name="javaruntimes_build" filter="s60" long-name="JRT Build">
+<unit bldFile="app/jrt/javaruntimes" filter="!sf_build" proFile="javaruntimes.pro" qmakeArgs="-r"/>
+<unit bldFile="app/jrt/javaruntimes" filter="sf_build" proFile="javaruntimes.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
+</component>
+</collection>
+<collection name="javauis" long-name="Java UIs" level="ui">
+<component name="javauis_build" filter="s60" long-name="JRT Build">
+<unit bldFile="app/jrt/javauis" filter="!sf_build" proFile="javauis.pro" qmakeArgs="-r"/>
+<unit bldFile="app/jrt/javauis" filter="sf_build" proFile="javauis.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
+</component>
+</collection>
+<collection name="javamanager" level="generic">
+<component name="javamanager_build" filter="s60" long-name="JRT Build">
+<unit bldFile="app/jrt/javamanager" filter="!sf_build" proFile="javamanager.pro" qmakeArgs="-r"/>
+<unit bldFile="app/jrt/javamanager" filter="sf_build" proFile="javamanager.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
+</component>
+</collection>
+<collection name="javatools" long-name="Java Tools" level="util">
+<component name="javatools_build" filter="s60" long-name="JRT Build">
+<unit bldFile="app/jrt/javatools" filter="!sf_build" proFile="javatools.pro" qmakeArgs="-r"/>
+<unit bldFile="app/jrt/javatools" filter="sf_build" proFile="javatools.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
+</component>
+</collection>
+<collection name="javaextensions" long-name="Java Extensions" level="generic">
+<component name="javaextensions_build" filter="s60" long-name="JRT Build">
+<unit bldFile="app/jrt/javaextensions" filter="!sf_build" proFile="javaextensions.pro" qmakeArgs="-r"/>
+<unit bldFile="app/jrt/javaextensions" filter="sf_build" proFile="javaextensions.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
+</component>
+</collection>
+</block>
+<block name="browserui" level="services" long-name="Browser UI" levels="utils support ui">
+<collection name="browserui_info" long-name="Browser UI Info" level="ui">
+<component name="browserui_build" long-name="Bookmarks Engine Build" introduced="^4">
+<unit bldFile="app/browserui" proFile="browserui.pro"/>
</component>
</collection>
</block>
@@ -8952,91 +8514,65 @@
<collection name="creator" long-name="Creator" level="support">
<!-- collection is really a component. Should move down a directory -->
<component name="creator_build" filter="s60" long-name="Creator Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/creator/group"/>
+<unit bldFile="app/rndtools/creator" proFile="creator.pro"/>
</component>
</collection>
<collection name="filebrowser" long-name="File Browser" level="util">
-<!-- consider collapsing into a single component -->
-<component name="fileopserver" filter="s60" long-name="File Operations Server" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
-</component>
-<component name="fileopclient" filter="s60" long-name="File Operations Client" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!--<unit bldFile="filebrowser/fileopclient/group"/>-->
-</component>
-<component name="filebrowser_build" filter="s60" long-name="File Browser Application" purpose="development" class="tool">
-<!-- Need to make this a self-contained component by removing #includes. Can only do when configuration is in place-->
-<unit bldFile="app/rndtools/filebrowser/group"/>
+<!-- collection is really a component. Should move down a directory -->
+<component name="filebrowser_build" filter="s60" long-name="File Browser Build" purpose="development" class="tool">
+<unit bldFile="app/rndtools/filebrowser" proFile="filebrowser.pro"/>
</component>
</collection>
<collection name="launcher" long-name="Launcher" level="util">
<!-- collection is really a component. Should move down a directory -->
<component name="launcher_build" filter="s60" long-name="Launcher Utility" purpose="development" class="tool">
-<unit bldFile="app/rndtools/launcher/group"/>
+<unit bldFile="app/rndtools/launcher" proFile="launcher.pro"/>
</component>
</collection>
<collection name="loadgen" long-name="Load Generator" level="test">
<!-- collection is really a component. Should move down a directory -->
<component name="loadgen_build" filter="s60" long-name="Load Generator Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/loadgen/group"/>
+<unit bldFile="app/rndtools/loadgen" proFile="loadgen.pro"/>
</component>
</collection>
<collection name="perfmon" long-name="Performance Monitor" level="test">
<!-- collection is really a component. Should move down a directory -->
<component name="perfmon_build" filter="s60" long-name="Performance Monitor Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/perfmon/group"/>
+<unit bldFile="app/rndtools/perfmon" proFile="perfmon.pro"/>
+</component>
+</collection>
+<collection name="piprofilerui" long-name="Performance Investigator Profiler UI" level="generic">
+<!-- collection is really a component. Should move down a directory -->
+<component name="piprofilerui_build" filter="s60" long-name="Performance Investigator Profiler UI Build" purpose="development" introduced="^4">
+<unit bldFile="app/rndtools/piprofilerui" proFile="piprofilerui.pro"/>
</component>
</collection>
<collection name="screengrabber" long-name="Screen Grabber" level="util">
<!-- collection is really a component. Should move down a directory -->
<component name="screengrabber_build" filter="s60" long-name="ScreenGrabber" purpose="development" class="tool">
-<unit bldFile="app/rndtools/screengrabber/group"/>
+<unit bldFile="app/rndtools/screengrabber" proFile="screengrabber.pro"/>
</component>
</collection>
<collection name="stifui" long-name="STIF UI" level="generic">
-<component name="stifui_stifui" filter="s60" long-name="STIF UI" purpose="development">
-<unit bldFile="app/rndtools/stifui/stifui/group"/>
-</component>
-<component name="uitestserverstarter" filter="s60" long-name="UI Test Server Starter" purpose="development">
-<unit bldFile="app/rndtools/stifui/uitestserverstarter/group"/>
-</component>
-<component name="stifui_build" filter="s60" long-name="STIF UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/stifui/group"/>
+<component name="stifuiqt" filter="s60" long-name="STIF Qt UI" purpose="development" introduced="^4">
+<unit bldFile="app/rndtools/stifui/qt" proFile="stifqtui.pro"/>
+<!-- should use stifuiqt as the dir name -->
</component>
</collection>
<collection name="memspyui" long-name="Memspy UI" level="generic">
<!-- collection is really a component. Should move down a directory -->
<component name="memspyui_build" filter="s60" long-name="Memspy UI Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/memspyui/group"/>
+<unit bldFile="app/rndtools/memspyui" proFile="memspyui.pro"/>
</component>
</collection>
<collection name="htiui" long-name="Harmonized Test Interface UI" level="generic">
-<component name="HtiServicePlugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- can only have a single unit. Should #include from a common bld.inf file -->
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiFtpBackupFake/group"/>
-</component>
-<component name="htidevicereboot" filter="s60" long-name="HTI Device Reboot" purpose="development">
-<unit bldFile="app/rndtools/htiui/htidevicereboot/group"/>
-</component>
-<component name="htistartupwait" filter="s60" long-name="HTI Startup Wait" purpose="development">
-<unit bldFile="app/rndtools/htiui/htistartupwait/group"/>
-</component>
-<component name="htiadmin" filter="s60" long-name="HTI Admin" purpose="development">
-<unit bldFile="app/rndtools/htiui/htiadmin/group"/>
-</component>
<component name="htiui_build" filter="s60" long-name="HTI UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
+<!-- should split up into individual components -->
<unit bldFile="app/rndtools/htiui/group"/>
</component>
+<component name="htiadminqt" filter="s60" long-name="HTI Admin Qt" purpose="development">
+<unit bldFile="app/rndtools/htiui/htiadminqt" proFile="HtiAdmin.pro"/>
+</component>
</collection>
</block>
<block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools if ui">
@@ -9051,11 +8587,6 @@
<unit bldFile="app/helps/symhelp/helpmodel/group" mrp="app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
</component>
</collection>
-<collection name="helps_info" long-name="Help Apps Info" level="ui">
-<component name="helps_metadata" long-name="Help Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/helps/helps_info/helps_metadata/helps_metadata.mrp"/>
-</component>
-</collection>
</block>
<block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
<collection name="buildverification" long-name="Build Verification" level="services">
@@ -9068,7 +8599,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"/>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian4/single/sysdefs/system_model_3.0.xml Tue Jul 13 12:21:44 2010 +0100
@@ -0,0 +1,9097 @@
+<?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^4">
+<layer id="adaptation" name="Adaptation" levels="low mw high">
+<package id="stubs" tech-domain="hb" level="high" span="2" name="Stubs" levels="adaptation plugin mid engine">
+<collection id="audiostubs" name="Audio Stubs" level="adaptation">
+<component id="devsoundextensions_stubs" name="Devsound Extensions Stubs">
+<unit bldFile="/adaptation/stubs/audiostubs/devsoundextensions_stubs/group"/>
+</component>
+<component id="fmradiotunercontrolstub" name="FM Radio Tuner Control Stub">
+<unit bldFile="/adaptation/stubs/audiostubs/fmradiotunercontrolstub/group"/>
+</component>
+</collection>
+<collection id="btaudioadaptation_stub" name="Bluetooth Audio Adaptation Stub" level="adaptation">
+<component id="btaudioadaptation_stub_build" name="Bluetooth Audio Adaptation Stub Build" filter="oem_build">
+<unit bldFile="/adaptation/stubs/btaudioadaptation_stub/group"/>
+</component>
+</collection>
+<collection id="drm_stubs" name="DRM Stubs" level="plugin">
+<component id="drm_stubs_build" name="DRM Stubs Build">
+<unit bldFile="/adaptation/stubs/drm_stubs/group"/>
+</component>
+</collection>
+<collection id="ocrsrv_stub" name="OCR Services Stub" level="mid">
+<component id="ocrsrv_stub_build" name="OCR Services Stub Build" filter="!dfs_build">
+<unit bldFile="/adaptation/stubs/ocrsrv_stub/group"/>
+</component>
+</collection>
+<collection id="omasuplasnconverterstubimpl" name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
+<component id="omasuplasnconverterstubimpl_build" name="OMA SUPL ASN Converter Stub Implementation Build" filter="!dfs_build">
+<unit bldFile="/adaptation/stubs/omasuplasnconverterstubimpl/group"/>
+</component>
+</collection>
+<collection id="posmsgpluginreferenceimpl" name="POS Message Plugin Reference Implementation" level="plugin">
+<component id="posmsgpluginreferenceimpl_build" name="POS Message Plugin Reference Implementation Build" class="plugin">
+<unit bldFile="/adaptation/stubs/posmsgpluginreferenceimpl/group"/>
+</component>
+</collection>
+<collection id="srsfenginestub" name="SRSF Engine Stub" level="engine">
+<component id="srsfenginestub_build" name="SRSF Engine Stub Build" filter="stubs">
+<unit bldFile="/adaptation/stubs/srsfenginestub/group"/>
+</component>
+</collection>
+<collection id="power_save_display_mode_stub" name="Power Save Display Mode Stub" level="plugin">
+<component id="power_save_display_mode_stub_build" name="Power Save Display Mode Stub Build">
+<unit bldFile="/adaptation/stubs/power_save_display_mode_stub/group"/>
+</component>
+</collection>
+<collection id="systemswstubs" name="System Software Stubs" level="adaptation">
+<component id="ddcaccessstub" name="DDC Access Stub">
+<unit bldFile="/adaptation/stubs/systemswstubs/ddcaccessstub/group"/>
+</component>
+<component id="tvoutconfig" name="TV Out Config">
+<unit bldFile="/adaptation/stubs/systemswstubs/TVOutConfig/group" filter="oem_build"/>
+</component>
+<component id="accessorypolicyreference" name="Accessory Policy Reference">
+<meta rel="config">
+<defined condition="__ACCESSORY_FW"/>
+</meta>
+<unit bldFile="/adaptation/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
+</component>
+<component id="asyreference" name="ASY Reference" class="plugin">
+<meta rel="config">
+<defined condition="__ACCESSORY_FW"/>
+</meta>
+<unit bldFile="/adaptation/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
+</component>
+<component id="examplecommonisc" name="Example Common ISC">
+<unit bldFile="/adaptation/stubs/systemswstubs/examplecommonisc/group" filter="oem_build"/>
+</component>
+<component id="exampledsy" name="Example DSY">
+<meta rel="config">
+<defined condition="RD_STARTUP_CHANGE"/>
+</meta>
+<unit bldFile="/adaptation/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
+</component>
+<component id="featuremanagerstub" name="Feature Manager Stub">
+<unit bldFile="/adaptation/stubs/systemswstubs/featuremanagerstub/group" filter="oem_build"/>
+</component>
+<component id="hwrmstubplugins" name="Hardware Resource Manager Stub Plugins" class="plugin">
+<unit bldFile="/adaptation/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
+</component>
+<component id="hwrmhapticsstubplugin" name="Hardware Resource Manager Haptics Stub Plugin" class="plugin">
+<unit bldFile="/adaptation/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
+</component>
+<component id="sensorchannelsreference" name="Sensor Channels Reference">
+<unit bldFile="/adaptation/stubs/systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
+</component>
+<component id="ssyreference" name="SSY Reference" class="plugin">
+<meta rel="config">
+<defined condition="RD_SENSOR_FW"/>
+</meta>
+<unit bldFile="/adaptation/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
+</component>
+<component id="startupadaptationstub" name="Startup Adaptation Stub" class="plugin">
+<unit bldFile="/adaptation/stubs/systemswstubs/startupadaptationstub/group" filter="oem_build"/>
+</component>
+<component id="tiltcompensationstub" name="Tilt Compensation Stub">
+<unit bldFile="/adaptation/stubs/systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
+</component>
+<component id="tvoutbehaviour" name="TV Out Behaviour">
+<unit bldFile="/adaptation/stubs/systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
+</component>
+<component id="wiredbearerreference" name="Wired Bearer Reference" class="plugin">
+<unit bldFile="/adaptation/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
+</component>
+</collection>
+<collection id="tactileclickplugin_stub" name="Tactile Click Plugin Stub" level="engine">
+<meta rel="config">
+<defined condition="RD_TACTILE_FEEDBACK"/>
+</meta>
+<component id="tactileclickplugin_stub_build" name="Tactile Click Plugin Stub Build" class="plugin">
+<unit bldFile="/adaptation/stubs/tactileclickplugin_stub/group"/>
+</component>
+</collection>
+<collection id="wlanhwinit_stub" name="WLAN Hardware Init Stub" level="mid">
+<component id="wlanhwinit_stub_build" name="WLAN Hardware Init Stub Build">
+<unit bldFile="/adaptation/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"/>
+</component>
+<component id="omap3530_kernel" name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
+<unit bldFile="/adaptation/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"/>
+</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"/>
+</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">
+<collection id="brdbootldr" name="Board Boot Loader" level="hw-if">
+<component id="ubootldr" name="Boot Loader" introduced="9.2" purpose="optional">
+<unit bldFile="/os/kernelhwsrv/brdbootldr/ubootldr" 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">
+<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 id="e32utils" name="E32 Utilities" purpose="development">
+<unit bldFile="/os/kernelhwsrv/kerneltest/e32utils/group" mrp="/os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/>
+</component>
+<component id="e32test" name="E32 Tests" purpose="development">
+<unit bldFile="/os/kernelhwsrv/kerneltest/e32test/group" mrp="/os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
+</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">
+<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>
+<component id="serialldd" name="Serial Port Drivers" purpose="optional">
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="/os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
+</component>
+<component id="legacydrivers" name="Legacy Drivers" purpose="optional">
+<unit mrp="/os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
+</component>
+<component id="locmedia" name="Local Media Subsystem" introduced="8.1b" purpose="mandatory">
+<!-- these are LDDs for storage media-->
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="/os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
+</component>
+<component id="runmodedebugger" name="Run Mode Debugger" purpose="mandatory">
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/debug/group" mrp="/os/kernelhwsrv/kernel/eka/drivers/debug/group/base_e32_drivers_debug.mrp"/>
+</component>
+<component id="btrace" name="Kernel Trace Tool" purpose="mandatory">
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/trace" mrp="/os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
+</component>
+<component id="cameraldd" name="Camera Drivers" introduced="^3" purpose="optional">
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/camerasc" mrp="/os/kernelhwsrv/kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
+</component>
+<component id="displayldd" name="Display Drivers" introduced="^3" purpose="optional">
+<!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/display" mrp="/os/kernelhwsrv/kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
+</component>
+<component id="usbclientdrivers" name="USB Client Drivers" introduced="8.1b" purpose="optional">
+<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="/os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
+</component>
+<component id="usbdescriptors" name="USB Descriptors" purpose="optional">
+<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors" mrp="/os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors/base_drivers_usbdescriptors.mrp"/>
+</component>
+<component id="usbdi_utils" name="USB DI Utils" purpose="optional">
+<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils" mrp="/os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils/base_drivers_usbdi_utils.mrp"/>
+</component>
+</collection>
+<collection id="driversupport" name="Generic Driver Support" level="hw-if">
+<component id="mediadrivers" name="Media Drivers" purpose="optional">
+<!-- these are for storage media-->
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/media" mrp="/os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
+</component>
+<component id="genericboardsupport" name="Generic Board Support" purpose="optional">
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="/os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
+</component>
+</collection>
+<collection id="userlibandfileserver" name="User Library and File Server" level="framework">
+<component id="euser" name="User Library" purpose="mandatory">
+<unit bldFile="/os/kernelhwsrv/kernel/eka/euser" mrp="/os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
+</component>
+<component id="compsupp" name="Compiler Runtime Support" filter="gt" purpose="mandatory">
+<unit bldFile="/os/kernelhwsrv/kernel/eka/compsupp" mrp="/os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
+</component>
+<component id="fileserver" name="File Server" filter="gt" purpose="mandatory">
+<unit bldFile="/os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
+</component>
+<component id="estart" name="Base Starter" filter="gt" purpose="optional">
+<unit bldFile="/os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
+</component>
+<component id="domainmgr" name="Domain Manager" introduced="8.1b" purpose="mandatory">
+<unit bldFile="/os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="/os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
+</component>
+</collection>
+<collection id="filesystems" name="File Systems" level="framework">
+<component id="romfs" name="ROM File System" filter="gt" purpose="optional" class="plugin">
+<unit mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
+</component>
+<component id="rofs" name="ROFS" filter="gt" purpose="optional" class="plugin">
+<unit bldFile="/os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
+</component>
+<component id="usbmsfs" name="USB Mass Storage File System" filter="gt" purpose="optional" class="plugin">
+<unit bldFile="/os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
+</component>
+<component id="usbhostmssrv" name="USB Host Mass Storage Server" filter="gt" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage" mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage/base_f32_shostmassstorage.mrp"/>
+</component>
+<component id="fat32fs" name="FAT32 File System" filter="gt" purpose="optional" class="plugin">
+<unit bldFile="/os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
+</component>
+<component id="fatfs" name="FAT File System" filter="gt" purpose="optional" class="plugin">
+<unit bldFile="/os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
+</component>
+<component id="compfs" name="Composite File System" filter="gt" purpose="optional" class="plugin">
+<unit bldFile="/os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
+</component>
+</collection>
+<collection id="halservices" name="HAL Services" level="framework">
+<component id="hal" name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
+<unit bldFile="/os/kernelhwsrv/halservices/hal" mrp="/os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
+</component>
+</collection>
+<collection id="textmodeshell" name="Text Mode Shell" level="test">
+<component id="e32wsrv" name="Text Window Server" purpose="optional">
+<unit bldFile="/os/kernelhwsrv/kernel/eka/ewsrv" mrp="/os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
+</component>
+<component id="textshell" name="Text Shell" filter="gt" purpose="development">
+<unit bldFile="/os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
+</component>
+</collection>
+<collection id="baseapitest" name="Base API Tests" level="test">
+
+</collection>
+<collection id="kernelhwsrv_info" name="Kernel and Hardware Services Info" level="test">
+<component id="kernelhwsrv_metadata" name="Kernel and Hardware Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
+</component>
+<component id="kernelhwsrv_metadata" name="Kernel and Hardware Services Public Documentation" class="doc" introduced="^3" purpose="development">
+<unit mrp="/os/kernelhwsrv/kernelhwsrv_info/doc_pub/kernelhwsrv_doc_pub.mrp"/>
+</component>
+</collection>
+</package>
+<package id="boardsupport" level="hw" tech-domain="hb" name="Board Support" levels="bsp test 2 3 config">
+<collection id="emulator" name="Emulator" level="bsp">
+<component id="emulatorbsp" name="Emulator BSP" purpose="optional">
+<unit bldFile="/os/boardsupport/emulator/emulatorbsp" mrp="/os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
+</component>
+</collection>
+<collection id="haitest" name="HAI Test Suites" level="test">
+<component id="bspsvs" name="BSP Verification Suite" introduced="^2" purpose="development">
+<unit mrp="/os/boardsupport/haitest/bspsvs/group/bspsvs.mrp"/>
+</component>
+</collection>
+<collection id="boardsupport_info" name="Board Support Info" level="config">
+<component id="boardsupport_metadata" name="Board Support Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/boardsupport/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="buildtools" level="hw" tech-domain="to" name="Build Tools" levels="bld mw fw ui">
+<collection id="bldsystemtools" name="Build System Tools" level="bld">
+<component id="sysdeftools" name="System Definition Tools" purpose="development" introduced="^2">
+<unit mrp="/os/buildtools/bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
+</component>
+<component id="commonbldutils" name="Common Utils" purpose="development">
+<unit mrp="/os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
+</component>
+</collection>
+<collection id="toolsandutils" name="Tools and Utils" level="mw">
+<component id="productionbldtools" name="Production Build Tools" filter="gt" purpose="development">
+<unit mrp="/os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
+</component>
+<component id="e32tools" name="E32 Tools" deprecated="^2" purpose="development" target="desktop">
+<unit bldFile="/os/buildtools/toolsandutils/e32tools/group" mrp="/os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
+</component>
+
+<component id="autotest" name="Autotest" purpose="development">
+<unit bldFile="/os/buildtools/toolsandutils/autotest/group" mrp="/os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
+</component>
+</collection>
+<collection id="sbsv1_os" name="Symbian Build System v1" level="fw">
+<component id="e32toolp" name="E32 Perl Tools" purpose="development" target="desktop" filter="sf_build">
+<unit mrp="/os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="/os/buildtools/sbsv1_os/e32toolp/group"/>
+</component>
+</collection>
+<collection id="imgtools_os" name="Image Tools" level="fw">
+<component id="romkiteka2" name="ROMKIT EKA2" deprecated="^2" purpose="development">
+<unit bldFile="/os/buildtools/imgtools_os/romkiteka2/group" mrp="/os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
+</component>
+</collection>
+<collection id="misccomponents" name="Misc Components" level="mw">
+<component id="emulatorlauncher" name="Emulator Launcher" filter="gt" purpose="development">
+<unit bldFile="/os/buildtools/misccomponents/emulatorlauncher/group" mrp="/os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
+</component>
+</collection>
+<collection id="buildtools_info" name="Build Tools Info" level="ui">
+<component id="buildtools_metadata" name="Build Tools Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/buildtools/buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="ossrv" level="services" tech-domain="hb" name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
+<collection id="ossrv_pub" name="Generic OS Services Public Interfaces" level="utilities">
+<component id="boost_apis" name="Boost APIs" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/boost_apis/group"/>
+</component>
+<component id="cpp_wrappers" name="Cpp wrappers" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/cpp_wrappers/group"/>
+</component>
+<component id="character_type_apis" name="Character Type APIs" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/character_type_apis/group"/>
+</component>
+<component id="compiler_specific_runtime_support" name="Compiler Specific Runtime Support" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/compiler_specific_runtime_support/group"/>
+</component>
+<component id="ossrv_configuration_api" name="Generic OS Services Configuration API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/configuration/group"/>
+</component>
+<component id="crypto_authentication_codes_and_hash_functions_api" name="Crypto Authentication Codes and Hash Functions API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
+</component>
+<component id="crypto_auxillary_functions_api" name="Crypto Auxillary Functions API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/crypto_auxillary_functions_api/group"/>
+</component>
+<component id="crypto_certificates_api" name="Crypto Certificates API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/crypto_certificates_api/group"/>
+</component>
+<component id="crypto_inputoutput_and_data_encoding_api" name="Crypto Input/Output and Data Encoding API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
+</component>
+<component id="crypto_public_key_cryptography_and_key_agreement_api" name="Crypto Public Key Cryptography and Key Agreement API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
+</component>
+<component id="crypto_symmetric_ciphers_api" name="Crypto Symmetric Ciphers API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/crypto_symmetric_ciphers_api/group"/>
+</component>
+<component id="crypto_utility_functions_api" name="Crypto Utility Functions API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/crypto_utility_functions_api/group"/>
+</component>
+<component id="cryptogaphy_related_api" name="Cryptogaphy Related API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/cryptogaphy_related_api/group"/>
+</component>
+<component id="ossrv_debug_api" name="Generic OS Services Debug API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/debug/group"/>
+</component>
+<component id="ossrv_exceptions_api" name="Generic OS Services Exceptions API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/exceptions/group"/>
+</component>
+<component id="io_stream_api" name="I/O stream API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/io_stream_api/group"/>
+</component>
+<component id="localization_function_api" name="Localization Function API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/localization_function_api/group"/>
+</component>
+<component id="math_operations_api" name="Math Operations API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/math_operations_api/group"/>
+</component>
+<component id="ossrv_memory_api" name="Generic OS Services Memory API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/memory/group"/>
+</component>
+<component id="no_namespace_headers" name="No Namespace Headers" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/no_namespace_headers/group"/>
+</component>
+<component id="openc_headers" name="OpenC headers" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/openc_headers/group"/>
+</component>
+<component id="openc_wrappers" name="OpenC wrappers" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/openc_wrappers/group"/>
+</component>
+<component id="ssl_general_api" name="SSL General API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/ssl_general_api/group"/>
+</component>
+<component id="ssl_protocol_methods_api" name="SSL Protocol Methods API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/ssl_protocol_methods_api/group"/>
+</component>
+<component id="standard_compressiondecompression_api" name="Standard Compression/Decompression API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/standard_compressiondecompression_api/group"/>
+</component>
+<component id="stl" name="STL API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/stl/group"/>
+</component>
+<component id="thread_api" name="Thread API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/thread_api/group"/>
+</component>
+<component id="type_attributes" name="Type Attributes API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/type_attributes/group"/>
+</component>
+<component id="typeinfo" name="Type Info API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/typeinfo/group"/>
+</component>
+<component id="utility_apis" name="Utility APIs" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/utility_apis/group"/>
+</component>
+<component id="wide_character_classapis" name="Wide character class/apis" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/wide_character_classapis/group"/>
+</component>
+<component id="dbus_api" name="Dbus API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/dbus/group"/>
+</component>
+<component id="dbus-glib_api" name="D-Bus GLib API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/dbus-glib/group"/>
+</component>
+</collection>
+<collection id="ossrv_plat" name="Generic OS Services Platform Interfaces" level="utilities">
+<component id="libutils_apis" name="Utility Library APIs" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_plat/libutils/group"/>
+</component>
+</collection>
+<collection id="stdlibs" name="Standard Libraries" level="translation">
+<component id="libz" filter="s60" name="Z Compression Library">
+<unit bldFile="/os/ossrv/stdlibs/libz/group"/>
+</component>
+<component id="libcrypt" filter="s60" name="Crypt Library">
+<unit bldFile="/os/ossrv/stdlibs/libcrypt/group"/>
+</component>
+</collection>
+<collection id="ssl" name="SSL" level="data-services">
+<component id="libcrypto" filter="s60" name="Crypto Library">
+<unit bldFile="/os/ossrv/ssl/libcrypto/group"/>
+</component>
+<component id="libssl" filter="s60" purpose="development" name="SSL Library">
+<unit bldFile="/os/ossrv/ssl/libssl/group"/>
+</component>
+</collection>
+<collection id="glib" name="GLib" level="utilities">
+<component id="glibbackend" filter="s60" name="GLib Backend">
+<unit bldFile="/os/ossrv/glib/build/symbian/glibbackend/group"/>
+<!-- Move to here: <unit bldFile="glib/glibbackend/group"/> -->
+</component>
+<component id="libglib" filter="s60" name="GLib Library">
+<unit bldFile="/os/ossrv/glib/build/symbian/glib/group"/>
+<!-- Move to here: <unit bldFile="glib/libglib/group"/> -->
+</component>
+<component id="libgthread" filter="s60" name="Libg Thread">
+<unit bldFile="/os/ossrv/glib/build/symbian/gthread/group"/>
+<!-- Move to here: <unit bldFile="glib/libgthread/group"/> -->
+</component>
+<component id="libgmodule" filter="s60" name="Libg Module">
+<unit bldFile="/os/ossrv/glib/build/symbian/gmodule/group"/>
+<!-- Move to here: <unit bldFile="glib/libgmodule/group"/> -->
+</component>
+<component id="libgobject" filter="s60" name="Libg Object">
+<unit bldFile="/os/ossrv/glib/build/symbian/gobject/group"/>
+<!-- Move to here: <unit bldFile="glib/libgobject/group"/> -->
+</component>
+</collection>
+<collection id="stdcpp" name="C++ Standard Library" level="translation">
+<!-- collection is really a component. Needs to be moved down a directory -->
+<component id="stdcpp_build" filter="s60" name="Stdcpp">
+<unit bldFile="/os/ossrv/stdcpp/group"/>
+</component>
+</collection>
+<collection id="ofdbus" name="Open Foundation D-Bus" level="utilities">
+<component id="dbus" filter="s60" name="D-Bus">
+<unit bldFile="/os/ossrv/ofdbus/dbus/group"/>
+</component>
+<component id="dbus-glib" filter="s60" name="D-Bus GLib">
+<unit bldFile="/os/ossrv/ofdbus/dbus-glib/group"/>
+</component>
+<component id="ofdbus_rom" filter="s60" name="D-Bus ROM">
+<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory
+ Consider moving IBY file to one of the above as well and removing this component entirely -->
+<unit bldFile="/os/ossrv/ofdbus/group"/>
+</component>
+</collection>
+<collection id="utilitylibraries" name="Utility Libraries" level="encoding">
+<component id="libutils" filter="s60" name="Utility Library">
+<unit bldFile="/os/ossrv/utilitylibraries/libutils/group"/>
+</component>
+</collection>
+<collection id="genericservices" name="Generic Services" level="utilities">
+<component id="s60compatibilityheaders" name="S60 Compatibility Headers" filter="gt" purpose="optional">
+<unit version="tb101sf" bldFile="/os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="/os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp"/>
+</component>
+<component id="mimerecognitionfw" name="MIME Recognition Framework" purpose="mandatory">
+<unit bldFile="/os/ossrv/genericservices/mimerecognitionfw/group" mrp="/os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
+</component>
+<component id="systemagent" name="System Agent" introduced="9.0" purpose="mandatory">
+<unit bldFile="/os/ossrv/genericservices/systemagent/group" mrp="/os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
+</component>
+<component id="taskscheduler" name="Task Scheduler" introduced="6.0" purpose="optional">
+<unit bldFile="/os/ossrv/genericservices/taskscheduler/group" mrp="/os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
+</component>
+<component id="activebackupclient" name="Active Backup Client" purpose="optional">
+<unit bldFile="/os/ossrv/genericservices/activebackupclient/group" mrp="/os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
+</component>
+<component id="syslibsdocs" name="Syslibs Documentation" purpose="development" class="doc">
+<unit mrp="/os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
+</component>
+<component id="httputils" name="HTTP Utilities Library" introduced="6.2" purpose="optional">
+<unit bldFile="/os/ossrv/genericservices/httputils/group" mrp="/os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
+</component>
+</collection>
+<collection id="syslibsapitest" name="SysLibs API Tests" level="utilities">
+
+</collection>
+<collection id="compressionlibs" name="Compression Libraries" level="data-services">
+<component id="ziplib" name="Zip Compression Library" introduced="6.0" purpose="mandatory">
+<unit bldFile="/os/ossrv/compressionlibs/ziplib/group" mrp="/os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
+</component>
+</collection>
+<collection id="genericopenlibs" name="Generic Open Libraries" level="translation">
+<component id="cstdlib" name="C Standard Library" introduced="ER5" purpose="optional">
+<unit bldFile="/os/ossrv/genericopenlibs/cstdlib/group" mrp="/os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
+</component>
+<component id="cppstdlib" name="C++ Standard Library" introduced="^3" purpose="mandatory">
+<unit bldFile="/os/ossrv/genericopenlibs/cppstdlib/group" mrp="/os/ossrv/genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
+</component>
+<component id="openenvcore" name="Open Environment Core" introduced="^2" purpose="mandatory">
+<unit bldFile="/os/ossrv/genericopenlibs/openenvcore/group" mrp="/os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
+</component>
+<component id="posixrealtimeextensions" name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
+<unit bldFile="/os/ossrv/genericopenlibs/posixrealtimeextensions/group" mrp="/os/ossrv/genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
+</component>
+<component id="liboil" name="Liboil" introduced="^4" purpose="optional">
+<unit bldFile="/os/ossrv/genericopenlibs/liboil/group" mrp="/os/ossrv/genericopenlibs/liboil/group/oeaddons_liboil.mrp"/>
+</component>
+</collection>
+<collection id="lowlevellibsandfws" name="Low Level Libraries and Frameworks" level="app-libs">
+<component id="pluginfw" name="Plugin Framework" introduced="6.2" purpose="mandatory">
+<unit version="3" bldFile="/os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="/os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp"/>
+</component>
+<component id="apputils" name="Application Utilities" introduced="ER5" purpose="mandatory">
+<unit bldFile="/os/ossrv/lowlevellibsandfws/apputils/group" mrp="/os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
+</component>
+<component id="genericusabilitylib" name="Generic Usability Library" introduced="^3" purpose="mandatory">
+<unit bldFile="/os/ossrv/lowlevellibsandfws/genericusabilitylib/group" mrp="/os/ossrv/lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
+</component>
+</collection>
+<collection id="ossrv_info" name="Generic OS Services Info" level="utilities">
+<component id="ossrv_build" filter="s60" name="Generic OS Services Build">
+<!-- exports should be moved to individual components -->
+<unit bldFile="/os/ossrv/group"/>
+</component>
+<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">
+<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">
+<unit bldFile="/os/persistentdata/featuremgmt/featureregistry/group" mrp="/os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
+</component>
+</collection>
+<collection id="loggingservices" name="Logging Services" level="server">
+<component id="eventlogger" 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 id="filelogger" 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 id="rfilelogger" name="RFile Logger" deprecated="^3" introduced="9.1" purpose="development">
+<unit bldFile="/os/persistentdata/loggingservices/rfilelogger/group" mrp="/os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
+</component>
+</collection>
+<collection id="traceservices" name="Trace Services" level="server">
+<component id="commsdebugutility" name="Comms Debug Utility" introduced="7.0s" purpose="optional">
+<unit bldFile="/os/persistentdata/traceservices/commsdebugutility/group" mrp="/os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
+</component>
+<component id="tracefw" name="Trace Framework" introduced="9.2" purpose="development">
+<unit bldFile="/os/persistentdata/traceservices/tracefw/ulogger/group" mrp="/os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
+</component>
+</collection>
+<collection id="persistentstorage" name="Persistent Storage" level="framework">
+<component id="store" name="Store" purpose="optional">
+<unit bldFile="/os/persistentdata/persistentstorage/store/group" mrp="/os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
+</component>
+<component id="dbms" name="DBMS" purpose="optional">
+<unit bldFile="/os/persistentdata/persistentstorage/dbms/group" mrp="/os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
+</component>
+<component id="centralrepository" name="Central Repository" introduced="7.0s" purpose="mandatory">
+<unit bldFile="/os/persistentdata/persistentstorage/centralrepository/group" mrp="/os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
+</component>
+<component id="sql" name="SQL" introduced="9.3" purpose="optional">
+<unit bldFile="/os/persistentdata/persistentstorage/sql/GROUP" mrp="/os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
+</component>
+<component id="sqlite3api" name="SQLite 3 API" introduced="^3" purpose="optional">
+<unit bldFile="/os/persistentdata/persistentstorage/sqlite3api/GROUP" mrp="/os/persistentdata/persistentstorage/sqlite3api/GROUP/syslibs_sqlite3.mrp"/>
+</component>
+</collection>
+<collection id="persistentdata_info" name="Persistent Data Services Info" level="app-if">
+<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">
+<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">
+<unit bldFile="/os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group"/>
+</component>
+<component id="feature_discovery_api" name="Feature Discovery API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_pub/feature_discovery_api/group"/>
+</component>
+<component id="platform_environment_api" name="Platform Environment API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_pub/platform_environment_api/group"/>
+</component>
+<component id="sensor_channel_api" name="Sensor Channel API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_pub/sensor_channel_api/group"/>
+</component>
+<component id="sensor_definitions_api" name="Sensor Definitions API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_pub/sensor_definitions_api/group"/>
+</component>
+<component id="version_info_api" name="Version Info API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_pub/version_info_api/group"/>
+</component>
+<component id="accessory_monitoring_api" name="Accessory Monitoring API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_pub/accessory_monitoring_api/group"/>
+</component>
+<component id="haptics_api" name="Haptics API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_pub/haptics_api/group"/>
+</component>
+<component id="sensor_data_compensator_api" name="Sensor Data Compensator API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
+</component>
+</collection>
+<collection id="devicesrv_plat" name="Device Services Platform Interfaces" level="app-if">
+<component id="configuration_file_parser_api" name="Configuration File Parser API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/configuration_file_parser_api/group"/>
+</component>
+<component id="dos_extension_plugin_api" name="DOS Extension Plug-In API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/dos_extension_plugin_api/group"/>
+</component>
+<component id="mediator_command_initiator_api" name="Mediator Command Initiator API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/mediator_command_initiator_api/group"/>
+</component>
+<component id="syslangutil_api" name="SysLangUtil API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/syslangutil_api/group"/>
+</component>
+<component id="wakeup_alarm_api" name="Wakeup Alarm API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/wakeup_alarm_api/group"/>
+</component>
+<component id="disk_and_memory_level_keys_api" name="Disk and Memory Level Keys API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/disk_and_memory_level_keys_api/group"/>
+</component>
+<component id="mediator_plugin_api" name="Mediator Plugin API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/mediator_plugin_api/group"/>
+</component>
+<component id="headset_status_api" name="Headset Status API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/headset_status_api/group"/>
+</component>
+<component id="system_startup_extension_plugin_api" name="System Startup Extension Plugin API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/system_startup_extension_plugin_api/group"/>
+</component>
+<component id="sensor_plugin_api" name="Sensor Plugin API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/sensor_plugin_api/group"/>
+</component>
+<component id="accessory_api" name="Accessory API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_api/group"/>
+</component>
+<component id="display_language_definition_api" name="Display Language Definition API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/display_language_definition_api/group"/>
+</component>
+<component id="mediator_command_responder_api" name="Mediator Command Responder API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/mediator_command_responder_api/group"/>
+</component>
+<component id="accessory_policy_definitions_api" name="Accessory Policy Definitions API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_policy_definitions_api/group"/>
+</component>
+<component id="hw_settings_api" name="Hardware Settings API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/hw_settings_api/group"/>
+</component>
+<component id="mediator_domain_definitions_api" name="Mediator Domain Definitions API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/mediator_domain_definitions_api/group"/>
+</component>
+<component id="sensor_extension_api" name="Sensor Extension API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/sensor_extension_api/group"/>
+</component>
+<component id="accessory_plugin_api" name="Accessory Plugin API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_plugin_api/group"/>
+</component>
+<component id="sae_api" name="SAE API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/sae_api/group"/>
+</component>
+<component id="accessory_control_api" name="Accessory Control API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_control_api/group"/>
+</component>
+<component id="mediator_static_registration_api" name="Mediator Static Registration API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/mediator_static_registration_api/group"/>
+</component>
+<component id="accessory_key_event_handling_api" name="Accessory Key Event Handling API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_key_event_handling_api/group"/>
+</component>
+<component id="mediator_notification_api" name="Mediator Notification API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/mediator_notification_api/group"/>
+</component>
+<component id="accessory_policy_utility_api" name="Accessory Policy Utility API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_policy_utility_api/group"/>
+</component>
+<component id="common_dsy_plugin_api" name="Common DSY Plugin API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/common_dsy_plugin_api/group"/>
+</component>
+<component id="remote_control_extension_api" name="Remote Control Extension API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/remote_control_extension_api/group"/>
+</component>
+<component id="sensor_channel_filter_api" name="Sensor Channel Filter API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/sensor_channel_filter_api/group"/>
+</component>
+<component id="dos_extension_api" name="DOS Extension API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/dos_extension_api/group"/>
+</component>
+<component id="accessory_audio_control_api" name="Accessory Audio Control API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_audio_control_api/group"/>
+</component>
+<component id="mediator_event_consumer_api" name="Mediator Event Consumer API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/mediator_event_consumer_api/group"/>
+</component>
+<component id="shared_data_api" name="Shared Data API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/shared_data_api/group"/>
+</component>
+<component id="accessory_settings_api" name="Accessory Settings API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_settings_api/group"/>
+</component>
+<component id="accessory_bluetooth_control_api" name="Accessory Bluetooth Control API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_bluetooth_control_api/group"/>
+</component>
+<component id="extended_version_info_api" name="Extended Version Info API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/extended_version_info_api/group"/>
+</component>
+<component id="mediator_event_provider_api" name="Mediator Event Provider API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/mediator_event_provider_api/group"/>
+</component>
+<component id="tv_out_config_api" name="TV Out Config API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/tv_out_config_api/group"/>
+</component>
+<component id="tspclientmapper_api" name="TSP Client Mapper API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/tspclientmapper_api/group"/>
+</component>
+<component id="powersave_api" name="Power Save API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/powersave_api/group"/>
+</component>
+<component id="powersave_definitions_api" name="Power Save Definitions API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/powersave_definitions_api/group"/>
+</component>
+<component id="powersave_plugin_api" name="Power Save Plugin API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/powersave_plugin_api/group"/>
+</component>
+<component id="extended_version_info_plugin_api" name="Extended Version Info Plugin API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/extended_version_info_plugin_api/group"/>
+</component>
+<component id="haptics_plugin_api" name="Haptics Plugin API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/haptics_plugin_api/group"/>
+</component>
+<component id="haptics_effect_data_getter_plugin_api" name="Haptics Effect Data Getter Plugin API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
+</component>
+<component id="haptics_packetizer_plugin_api" name="Haptics Packetizer Plugin API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/haptics_packetizer_plugin_api/group"/>
+</component>
+<component id="tiltcompensation_api" name="Tilt Compensation API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/tiltcompensation_api/group"/>
+</component>
+<component id="disk_notification_handler_api" name="Disk Notification Handler API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/disk_notification_handler_api/group"/>
+</component>
+<component id="accessory_policy_usb_audio_api" name="Accessory Policy USB Audio API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_policy_usb_audio_api/group"/>
+</component>
+<component id="accessory_policy_hdmi_audio_api" name="Accessory Policy HDMI Audio API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_policy_hdmi_audio_api/group"/>
+</component>
+<component id="sensor_data_compensator_plugin_api" name="Sensor Data Compensator Plugin API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
+</component>
+<component id="ddc_access_api" name="DDC Access API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/ddc_access_api/group"/>
+</component>
+<component id="tv_out_behaviour_api" name="TV Out Behaviour API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_plat/tv_out_behaviour_api/group"/>
+</component>
+</collection>
+<collection id="accessoryservices" name="Accessory Services" level="framework">
+<component id="accessorymonitor" filter="s60" name="Accessory Monitor">
+<unit bldFile="/os/devicesrv/accessoryservices/accessorymonitor/group"/>
+</component>
+<component id="accessoryremotecontrol" filter="s60" name="Accessory Remote Control">
+<unit bldFile="/os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
+</component>
+<component id="accessoryserver" filter="s60" name="Accessory Server">
+<unit bldFile="/os/devicesrv/accessoryservices/accessoryserver/group"/>
+</component>
+<component id="pluggeddisplay" filter="s60" name="Plugged Display" introduced="^3">
+<unit bldFile="/os/devicesrv/accessoryservices/pluggeddisplay/group"/>
+</component>
+<component id="headsetstatusapi" filter="s60" name="Headset Status API">
+<unit bldFile="/os/devicesrv/accessoryservices/headsetstatusapi/group"/>
+</component>
+<component id="tspclientmapper" filter="s60" name="TSP Client Mapper">
+<unit bldFile="/os/devicesrv/accessoryservices/tspclientmapper/group"/>
+</component>
+<component id="remotecontrolfw" name="Remote Control Framework" introduced="9.1" purpose="optional">
+<unit bldFile="/os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="/os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
+</component>
+<component id="gid_pc_tool" filter="s60" name="Generic ID PC Tool" target="desktop" class="tool">
+<unit bldFile="/os/devicesrv/accessoryservices/gid_pc_tool/group"/>
+</component>
+</collection>
+<collection id="commonservices" name="Common Services" level="app-if">
+<component id="commonengine" filter="s60" name="Common Engine">
+<unit bldFile="/os/devicesrv/commonservices/commonengine/group"/>
+</component>
+<component id="commonengineresources" filter="s60" name="Common Engine Resources" class="config">
+<unit bldFile="/os/devicesrv/commonservices/commonengineresources/group"/>
+</component>
+<component id="platformenv" filter="s60" name="Platform Environment">
+<unit bldFile="/os/devicesrv/commonservices/platformenv/group"/>
+</component>
+<component id="sysutil" name="System Utilities" purpose="mandatory" introduced="ER5">
+<meta rel="config">
+<defined condition="SYMBIAN_BAFL_SYSUTIL"/>
+</meta>
+<unit bldFile="/os/devicesrv/commonservices/sysutil/group" mrp="/os/devicesrv/commonservices/sysutil/group/sysutil.mrp"/>
+</component>
+<component id="activitymanager" name="Activity Manager" purpose="mandatory" introduced="ER5">
+<meta rel="config">
+<defined condition="SYMBIAN_BAFL_SYSUTIL"/>
+</meta>
+<unit bldFile="/os/devicesrv/commonservices/activitymanager/group" mrp="/os/devicesrv/commonservices/activitymanager/group/activitymanager.mrp"/>
+</component>
+</collection>
+<collection id="dosservices" name="Domestic Operating System Services" level="hw-if">
+<component id="commondsy" filter="s60" name="Common DSY" class="plugin">
+<unit bldFile="/os/devicesrv/dosservices/commondsy/group"/>
+</component>
+<component id="dosserver" filter="s60" name="Domestic OS Server">
+<unit bldFile="/os/devicesrv/dosservices/dosserver/group"/>
+</component>
+</collection>
+<collection id="sensorservices" name="Sensor Services" level="framework">
+<component id="sensorserver" filter="s60" name="Sensor Server">
+<unit bldFile="/os/devicesrv/sensorservices/sensorserver/group"/>
+</component>
+<component id="orientationssy" filter="s60" name="Orientation SSY" class="plugin">
+<unit bldFile="/os/devicesrv/sensorservices/orientationssy/group"/>
+</component>
+<component id="tiltcompensationssy" filter="s60" name="Tilt Compensation SSY" class="plugin">
+<unit bldFile="/os/devicesrv/sensorservices/tiltcompensationssy/group"/>
+</component>
+<component id="sensordatacompensator" filter="s60" name="Sensor Data Compensator">
+<unit bldFile="/os/devicesrv/sensorservices/sensordatacompensator/group"/>
+</component>
+</collection>
+<collection id="hwrmhaptics" name="HWRM Haptics" level="plugin">
+<component id="hapticseffectdatagetterfw" filter="s60" name="Haptics Effect Data Getter Framework">
+<unit bldFile="/os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
+</component>
+<component id="hapticspluginservice" filter="s60" name="Haptics Plugin Service">
+<unit bldFile="/os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
+</component>
+<component id="hapticspacketizer" filter="s60" name="Haptics Packetizer">
+<unit bldFile="/os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
+</component>
+<component id="hapticspluginmanager" filter="s60" name="Haptics Plugin Manager">
+<unit bldFile="/os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
+</component>
+<component id="hapticsserver" filter="s60" name="Haptics Server">
+<unit bldFile="/os/devicesrv/hwrmhaptics/hapticsserver/group"/>
+</component>
+<component id="hapticsclient" filter="s60" name="Haptics Client">
+<unit bldFile="/os/devicesrv/hwrmhaptics/hapticsclient/group"/>
+</component>
+<component id="hwrmhaptics_build" filter="s60" name="HWRM Haptics Build">
+<!-- move these exports into the appropriate above components and delete this component-->
+<unit bldFile="/os/devicesrv/hwrmhaptics/group"/>
+</component>
+</collection>
+<collection id="mediator" name="Mediator" level="app-if">
+<!--collection is really a component. Move it down a directory -->
+<component id="mediator_build" filter="s60" name="Mediator Build">
+<unit bldFile="/os/devicesrv/mediator/group"/>
+</component>
+</collection>
+<collection id="psmservices" name="Power Save Mode Services" level="app-if">
+<component id="psmserver" filter="s60" name="PSM Server">
+<unit bldFile="/os/devicesrv/psmservices/psmserver/group"/>
+</component>
+</collection>
+<collection id="resourcemgmt" name="Resource Management" level="hw-if">
+<component id="hwrmfmtxwatcherplugin" filter="s60" name="HWRM FM Transmitter Watcher Plugin" class="plugin">
+<unit bldFile="/os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
+</component>
+<component id="hwrmtargetmodifierplugin" filter="s60" name="HWRM Target Modifier Plugin" class="plugin">
+<meta rel="config">
+<defined condition="__HWRM_TARGET_MODIFIER_PLUGIN"/>
+</meta>
+<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build,
+ may need to -->
+<!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
+</component>
+<component id="vibractrl" filter="s60" name="Vibra Control" deprecated="9.1">
+<unit bldFile="/os/devicesrv/resourcemgmt/vibractrl/group"/>
+</component>
+<component id="hwresourcesmgr" name="Hardware Resources Manager" introduced="^2" purpose="optional">
+<unit bldFile="/os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="/os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
+</component>
+<component id="hwresourcesmgrconfig" name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
+<unit bldFile="/os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="/os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
+</component>
+<component id="resourcemgmt_build" filter="s60" name="Resource Management Build">
+<!-- Move exports to a self-contained component.
+ This needs to be kept around until configuration is in place -->
+<unit bldFile="/os/devicesrv/resourcemgmt/group"/>
+</component>
+<component id="powerandmemorynotificationservice" name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
+<unit bldFile="/os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="/os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
+</component>
+</collection>
+<collection id="sysstatemgmt" name="System State Management" level="server">
+<component id="ssmmapperutility" filter="s60" name="SSM Mapper Utility" introduced="^3">
+<unit bldFile="/os/devicesrv/sysstatemgmt/ssmmapperutility/group"/>
+</component>
+<component id="ssmpolicyplugins" filter="s60" name="SSM Policy Plugins" class="plugin" introduced="^3">
+<unit bldFile="/os/devicesrv/sysstatemgmt/ssmpolicyplugins/group"/>
+</component>
+<component id="ssmutilityplugins" filter="s60" name="SSM Utility Plugins" class="plugin" introduced="^3">
+<unit bldFile="/os/devicesrv/sysstatemgmt/ssmutilityplugins/group"/>
+</component>
+<component id="ssmcmdlists" filter="s60" name="SSM Command Lists" introduced="^3">
+<unit bldFile="/os/devicesrv/sysstatemgmt/ssmcmdlists/group"/>
+</component>
+<component id="ssmcustcmds" filter="s60" name="SSM Custom Commands" introduced="^3">
+<unit bldFile="/os/devicesrv/sysstatemgmt/ssmcustcmds/group"/>
+</component>
+<component id="syslangutil" filter="s60" name="System Language Utility" introduced="^3">
+<unit bldFile="/os/devicesrv/sysstatemgmt/syslangutil/group"/>
+</component>
+<component id="sysrestart" filter="s60" name="System Restart" introduced="^3">
+<unit bldFile="/os/devicesrv/sysstatemgmt/sysrestart/group"/>
+</component>
+<component id="sysuiprovider" filter="s60" name="System UI Provider" introduced="^3">
+<unit bldFile="/os/devicesrv/sysstatemgmt/sysuiprovider/group"/>
+</component>
+<component id="systemstarter" name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
+<unit bldFile="/os/devicesrv/sysstatemgmt/systemstarter/group" mrp="/os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
+</component>
+<component id="systemstatemgr" name="System State Manager" introduced="^3" purpose="mandatory">
+<meta rel="config">
+<defined condition="SYMBIAN_SYSTEM_STATE_MANAGEMENT"/>
+</meta>
+<unit bldFile="/os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="/os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
+</component>
+<component id="systemstateplugins" name="System State Plugins" introduced="^3" purpose="optional" class="plugin">
+<meta rel="config">
+<defined condition="SYMBIAN_SYSTEM_STATE_MANAGEMENT"/>
+</meta>
+<unit bldFile="/os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="/os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
+</component>
+<meta rel="config">
+<defined condition="SYMBIAN_SYSTEM_STATE_MANAGEMENT"/>
+</meta>
+<component id="systemstatereferenceplugins" name="System State Reference Plugins" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="/os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
+</component>
+</collection>
+<collection id="resourceinterfaces" name="Resource Interfaces" level="hw-if">
+<component id="fmtransmittercontrol" name="FM Transmitter Control" introduced="^3" purpose="optional">
+<unit bldFile="/os/devicesrv/resourceinterfaces/fmtransmittercontrol/group" mrp="/os/devicesrv/resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
+</component>
+</collection>
+<collection id="systemhealthmanagement" name="System Health Management" level="server">
+<component id="systemhealthmgr" name="System Health Manager" introduced="^3" purpose="optional">
+<unit bldFile="/os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="/os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
+</component>
+</collection>
+<collection id="devicesrvapitest" name="Devices Services API Tests" level="app-if">
+
+
+</collection>
+<collection id="devicesrv_info" name="Device Services Info" level="app-if">
+<component id="devicesrv_metadata" name="Device Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="security" level="services" tech-domain="se" name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
+<collection id="authenticationservices" name="Authentication Services" level="utilities">
+<component id="authenticationserver" name="Authentication Server" introduced="^4" purpose="optional">
+<unit bldFile="/os/security/authenticationservices/authenticationserver/group" mrp="/os/security/authenticationservices/authenticationserver/group/security_authserver.mrp"/>
+</component>
+</collection>
+<collection id="authorisation" name="Authorisation" level="utilities">
+<component id="userpromptservice" name="User Prompt Service" introduced="^3" purpose="mandatory">
+<unit bldFile="/os/security/authorisation/userpromptservice/group" mrp="/os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
+</component>
+<component id="userpromptutils" name="User Prompt Utils" introduced="^3" purpose="optional">
+<unit bldFile="/os/security/authorisation/userpromptutils/group" mrp="/os/security/authorisation/userpromptutils/group/security_ups_utils.mrp"/>
+</component>
+</collection>
+<collection id="contentmgmt" name="Content Management" level="utilities">
+<component id="contentaccessfwfordrm" name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
+<unit bldFile="/os/security/contentmgmt/contentaccessfwfordrm/group" mrp="/os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
+</component>
+<component id="cafrecogniserconfig" 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 id="referencedrmagent" 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 id="cafstreamingsupport" 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 id="crypto" name="Crypto Libraries" level="libraries">
+<component id="weakcryptospi" name="Weak Crypto SPI" filter="gt" introduced="^3" purpose="optional">
+<unit bldFile="/os/security/crypto/weakcryptospi/group" mrp="/os/security/crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
+</component>
+<component id="strongcryptospi" name="Strong Crypto SPI" filter="gt" introduced="^3" purpose="optional">
+<unit bldFile="/os/security/crypto/weakcryptospi/strong" mrp="/os/security/crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
+</component>
+</collection>
+<collection id="cryptomgmtlibs" name="Crypto Management Libraries" level="management">
+<component id="securityutils" name="Security Utils" introduced="8.0" purpose="optional">
+<unit bldFile="/os/security/cryptomgmtlibs/securityutils/group" mrp="/os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
+</component>
+
+<component id="securitydocs" name="Security Documentation" purpose="development" class="doc">
+<unit mrp="/os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
+</component>
+<component id="cryptotokenfw" name="Crypto Token Framework" introduced="7.0" purpose="optional">
+<unit bldFile="/os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="/os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
+</component>
+<component id="securitycommonutils" name="Security Common Utils" introduced="8.0" purpose="mandatory">
+<unit bldFile="/os/security/cryptomgmtlibs/securitycommonutils/group" mrp="/os/security/cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
+</component>
+</collection>
+<collection id="securityanddataprivacytools" name="Security and Data Privacy Tools" level="services">
+<component id="securityconfig" name="Security Config" introduced="9.1" purpose="optional">
+<unit bldFile="/os/security/securityanddataprivacytools/securityconfig/group" mrp="/os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
+</component>
+<component id="securitytools" name="Security Tools" introduced="^3" purpose="optional" target="desktop">
+<unit bldFile="/os/security/securityanddataprivacytools/securitytools/group" mrp="/os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
+</component>
+</collection>
+<collection id="cryptoplugins" name="Crypto Plugins" level="plugins">
+<component id="cryptospiplugins" name="Crypto SPI Plugins" filter="gt" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/security/cryptoplugins/cryptospiplugins/group" mrp="/os/security/cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
+</component>
+</collection>
+<collection id="cryptoservices" name="Crypto Services" level="plugins">
+<component id="certificateandkeymgmt" name="Certificate and Key Management" introduced="6.0" purpose="optional">
+<unit bldFile="/os/security/cryptoservices/certificateandkeymgmt/group" mrp="/os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
+</component>
+<component id="filebasedcertificateandkeystores" name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
+<unit bldFile="/os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="/os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
+</component>
+<component id="browserrootcertificates" name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
+<unit mrp="/os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
+</component>
+<component id="asnpkcs" name="ASN PKCS" introduced="8.0" purpose="optional">
+<unit bldFile="/os/security/cryptoservices/asnpkcs/group" mrp="/os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
+</component>
+</collection>
+<collection id="security_info" name="OS Security Info" level="utilities">
+<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">
+<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">
+<unit bldFile="/os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="/os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
+</component>
+<component id="simulationpositioningmodule" name="Simulation Positioning Module" introduced="^2" purpose="development" class="plugin">
+<unit bldFile="/os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="/os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
+</component>
+<component id="gpspositioningmodule" name="GPS/A-GPS Positioning Module" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/lbs/datasourcemodules/gpspositioningmodule/group" mrp="/os/lbs/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
+</component>
+<component id="networkpositioningmodule" name="Network Positioning Module" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/lbs/datasourcemodules/networkpositioningmodule/group" mrp="/os/lbs/datasourcemodules/networkpositioningmodule/group/lbs_network_positioning_module.mrp"/>
+</component>
+<component id="locationapesuplpsy" name="APE SUPL Positioning Module" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/lbs/datasourcemodules/locationapesuplpsy/group" mrp="/os/lbs/datasourcemodules/locationapesuplpsy/group/lbs_ape_supl_positioning_module.mrp"/>
+</component>
+</collection>
+<collection id="datasourceadaptation" name="Data Source Adaptation" level="adaptation">
+<component id="gpsdatasourceadaptation" 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"/>
+</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="networkrequesthandler" name="Network Request Handler" introduced="9.2" purpose="optional">
+<unit bldFile="/os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="/os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
+</component>
+</collection>
+<collection id="lbstest" name="Locating Services Tests" level="application-interface">
+
+<component id="locationprotocoltest" name="Location Protocol Tests" introduced="9.2" purpose="development" class="plugin">
+<unit bldFile="/os/lbs/lbstest/locationprotocoltest/group" mrp="/os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
+</component>
+</collection>
+<collection id="locationmgmt" name="Location Management" level="management">
+<component id="locmonitor" name="Location Monitor" introduced="^3" purpose="optional">
+<unit bldFile="/os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="/os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
+</component>
+<component id="agpslocationmgr" name="A-GPS Location Manager" introduced="9.2" purpose="optional">
+<unit bldFile="/os/lbs/locationmgmt/agpslocationmgr/group" mrp="/os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
+</component>
+<component id="networklocationmgr" name="Network Location Manager" introduced="9.2" purpose="optional">
+<unit bldFile="/os/lbs/locationmgmt/networklocationmgr/group" mrp="/os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
+</component>
+<component id="locationcore" name="Location Core" introduced="9.2" purpose="optional">
+<unit bldFile="/os/lbs/locationmgmt/locationcore/group" mrp="/os/lbs/locationmgmt/locationcore/group/lbs_admin.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">
+<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 -->
+<unit bldFile="/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/sfgroup" mrp="/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
+</component>
+<component id="suplprotocolmodule" name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" class="plugin">
+<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+<unit bldFile="/os/lbs/networkprotocolmodules/suplprotocolmodule/sfgroup" mrp="/os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
+</component>
+<component id="suplrrlpasn1" filter="sf_build" name="SUPL RRLP ASN1 Parser">
+<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+<unit bldFile="/os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
+</component>
+<component id="suplrrlpprotocol" name="SUPL RRLP Protocol Module">
+<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+<unit bldFile="/os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup"/>
+</component>
+</collection>
+<collection id="lbsapitest" name="Location API Tests" level="application-interface">
+
+</collection>
+<collection id="lbs_info" name="Locating Services Info" level="application-interface">
+<component id="lbs_metadata" name="Locating Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="commsfw" level="services" tech-domain="dc" name="Communications Framework" levels="server support framework process app-if">
+<collection id="commsprocess" name="Comms Process" level="process">
+<component id="commsrootserver" name="Comms Root Server" introduced="7.0s" purpose="mandatory">
+<unit bldFile="/os/commsfw/commsprocess/commsrootserverconfig/group" mrp="/os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
+</component>
+
+</collection>
+<collection id="commsconfig" name="Comms Config" level="process">
+<component id="commsdatabase" name="Comms Database" purpose="mandatory">
+<unit bldFile="/os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="/os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
+</component>
+<component id="commsdatabaseshim" name="Comms Database Shim" introduced="8.1" purpose="mandatory">
+<unit bldFile="/os/commsfw/commsconfig/commsdatabaseshim/group" mrp="/os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
+</component>
+</collection>
+<collection id="datacommsserver" name="Data Comms Server" level="framework">
+<component id="esockserver" name="ESock Server" purpose="mandatory">
+<unit version="3" bldFile="/os/commsfw/datacommsserver/esockserver/group" mrp="/os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp"/>
+</component>
+
+<component id="networkingdialogapi" name="Networking Dialog API" introduced="6.1" purpose="optional">
+<unit bldFile="/os/commsfw/datacommsserver/networkingdialogapi/group" mrp="/os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
+</component>
+<component id="networkingdialogstub" name="Networking Dialog Stub" introduced="6.1" purpose="optional">
+<unit bldFile="/os/commsfw/datacommsserver/networkingdialogapi/default" mrp="/os/commsfw/datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
+</component>
+<component id="networkcontroller" name="Network Controller" introduced="7.0s" purpose="optional" class="plugin">
+<unit bldFile="/os/commsfw/datacommsserver/networkcontroller/group" mrp="/os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
+</component>
+</collection>
+<collection id="serialserver" name="Serial Server" level="server">
+<component id="serialportcsy" name="Serial Port CSY" introduced="ER5" purpose="optional" class="plugin">
+<unit bldFile="/os/commsfw/serialserver/serialportcsy" mrp="/os/commsfw/serialserver/serialportcsy/ser-comms_serialportcsy.mrp"/>
+</component>
+<component id="packetloopbackcsy" name="Packet Loopback CSY" introduced="8.1" purpose="development">
+<unit bldFile="/os/commsfw/serialserver/packetloopbackcsy/group" mrp="/os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
+</component>
+<component id="c32serialserver" name="C32 Serial Server" introduced="ER5" purpose="mandatory">
+<unit bldFile="/os/commsfw/serialserver/c32serialserver/group" mrp="/os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
+</component>
+<component id="c32serialserverconfig" name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config">
+<unit bldFile="/os/commsfw/serialserver/c32serialserverconfig" mrp="/os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
+</component>
+<component id="c32serialserverdocs" name="C32 Serial Server Documentation" purpose="development" class="doc">
+<unit mrp="/os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
+</component>
+</collection>
+<collection id="commsfwutils" name="Comms Framework Utilities" level="framework">
+<component id="commsbufs" name="Comms Buffers" introduced="^3" purpose="mandatory">
+<unit bldFile="/os/commsfw/commsfwutils/commsbufs/group" mrp="/os/commsfw/commsfwutils/commsbufs/group/comms-infras_commsbufs.mrp"/>
+</component>
+</collection>
+<collection id="commsfw_info" name="Comms Framework Info" level="app-if">
+<component id="commsinfrastructuredocs" name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
+<unit mrp="/os/commsfw/commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
+</component>
+<component id="commsfw_metadata" name="Communications Framework Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/commsfw/commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
+</component>
+</collection>
+<collection id="commsfwsupport" name="Comms Framework Support" level="support">
+<component id="commselements" name="Comms Elements" introduced="8.0" purpose="mandatory">
+<unit bldFile="/os/commsfw/commsfwsupport/commselements/group" mrp="/os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
+</component>
+</collection>
+<collection id="commsinfrastructureapitest" name="Comms-Infras API Tests" level="app-if">
+<component id="commsinfrastructuresvs" name="Comms Infrastructure Verification Suite" introduced="^3" purpose="development">
+<unit mrp="/os/commsfw/commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
+</component>
+</collection>
+<collection id="commsfwtools" name="Comms Framework Tools" level="app-if">
+<component id="preparedefaultcommsdatabase" name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config" target="desktop">
+<unit bldFile="/os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="/os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
+</component>
+<component id="installdefaultcommsdatabase" name="Install Default Comms Database" purpose="mandatory" target="desktop">
+<unit bldFile="/os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="/os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
+</component>
+<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">
+<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>
+<collection id="tcpiputils" name="TCP/IP Utilities" level="plugin">
+<component id="dnd" name="DND" introduced="7.0" purpose="mandatory">
+<unit bldFile="/os/networkingsrv/tcpiputils/dnd/group" mrp="/os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
+</component>
+
+<component id="dhcp" name="DHCP" introduced="8.0" purpose="optional">
+<unit bldFile="/os/networkingsrv/tcpiputils/dhcp/group" mrp="/os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
+</component>
+<component id="networkaddressandporttranslation" name="Network Address and Port Translation" introduced="^2" purpose="mandatory" class="plugin">
+<unit bldFile="/os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="/os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
+</component>
+<component id="punycodeconv" name="Punycode Converter" introduced="^3" purpose="mandatory">
+<unit bldFile="/os/networkingsrv/tcpiputils/punycodeconv/group" mrp="/os/networkingsrv/tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
+</component>
+</collection>
+<collection id="linklayercontrol" name="Link Layer Control" level="hw-if">
+<component id="nullagt" name="NULL AGT" introduced="7.0s" purpose="optional" class="plugin">
+<unit bldFile="/os/networkingsrv/linklayercontrol/nullagt/group" mrp="/os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
+</component>
+<component id="genericscprparameters" name="Generic SCPR Parameters" introduced="^3" purpose="optional">
+<unit bldFile="/os/networkingsrv/linklayercontrol/genericscprparameters/group" mrp="/os/networkingsrv/linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
+</component>
+<component id="mbmsparameters" name="MBMS Parameters" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/networkingsrv/linklayercontrol/mbmsparameters/group" mrp="/os/networkingsrv/linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
+</component>
+<component id="networkinterfacemgr" name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
+<unit version="2" bldFile="/os/networkingsrv/linklayercontrol/networkinterfacemgr/group" mrp="/os/networkingsrv/linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp"/>
+</component>
+</collection>
+<collection id="linklayerprotocols" name="Link Layer Protocols" level="hw-if">
+<component id="ethernetnif" name="Ethernet NIF" purpose="optional" class="plugin">
+<unit bldFile="/os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="/os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
+</component>
+
+<component id="pppnif" name="PPP NIF" introduced="ER5" purpose="optional" class="plugin">
+<unit version="2" bldFile="/os/networkingsrv/linklayerprotocols/pppnif/group" mrp="/os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp"/>
+</component>
+
+<component id="slipnif" name="SLIP NIF" purpose="development" class="plugin">
+<unit bldFile="/os/networkingsrv/linklayerprotocols/slipnif/group" mrp="/os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
+</component>
+<component id="tunnelnif" name="Tunnel NIF" introduced="7.0s" purpose="optional" class="plugin">
+<unit bldFile="/os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="/os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
+</component>
+</collection>
+<collection id="linklayerutils" name="Link Layer Utilities" level="hw-if">
+<component id="packetlogger" name="Packet Logger" introduced="8.1" purpose="development">
+<unit bldFile="/os/networkingsrv/linklayerutils/packetlogger/group" mrp="/os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
+</component>
+</collection>
+<collection id="networkcontrol" name="Network Control" level="plugin">
+
+<component id="qoslib" name="QoS Library" introduced="7.0s" purpose="optional">
+<unit bldFile="/os/networkingsrv/networkcontrol/qoslib/group" mrp="/os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
+</component>
+<component id="pfqoslib" name="PF QoS Library" introduced="7.0s" purpose="optional">
+<unit bldFile="/os/networkingsrv/networkcontrol/pfqoslib/group" mrp="/os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
+</component>
+<component id="qosfwprt" name="QoS Framework PRT" introduced="7.0s" purpose="optional" class="plugin">
+<unit bldFile="/os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="/os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
+</component>
+<component id="qosipscpr" name="QoS IP SCPR" purpose="optional" class="plugin">
+<unit bldFile="/os/networkingsrv/networkcontrol/qosipscpr/group" mrp="/os/networkingsrv/networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
+</component>
+<component id="ipnetworklayer" name="IP Network Layer" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/networkingsrv/networkcontrol/ipnetworklayer/group" mrp="/os/networkingsrv/networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
+</component>
+<component id="iptransportlayer" name="IP Transport Layer" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/networkingsrv/networkcontrol/iptransportlayer/group" mrp="/os/networkingsrv/networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
+</component>
+<component id="commsuserpromptmgr" name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
+<unit bldFile="/os/networkingsrv/networkcontrol/commsuserpromptmgr/group" mrp="/os/networkingsrv/networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
+</component>
+</collection>
+<collection id="networkprotocols" name="Network Protocols" level="plugin">
+
+<component id="ipeventnotifier" name="IP Event Notifier" introduced="8.1" purpose="mandatory" class="plugin">
+<unit bldFile="/os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="/os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
+</component>
+<component id="tcpipv4v6prt" name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" class="plugin">
+<unit bldFile="/os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="/os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
+</component>
+<component id="iphook" name="IP Hook" introduced="7.0" purpose="mandatory">
+<unit bldFile="/os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="/os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
+</component>
+<component id="mobileip" name="Mobile IP" introduced="8.1" purpose="optional" class="plugin">
+<unit bldFile="/os/networkingsrv/networkprotocols/mobileip/group" mrp="/os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
+</component>
+<component id="dnsproxy" name="DNS Proxy" introduced="^3" purpose="optional">
+<unit bldFile="/os/networkingsrv/networkprotocols/dnsproxy/group" mrp="/os/networkingsrv/networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
+</component>
+</collection>
+<collection id="networksecurity" name="Network Security" level="framework">
+<component id="tls" name="TLS" introduced="6.0" purpose="mandatory">
+<unit bldFile="/os/networkingsrv/networksecurity/tls/group" mrp="/os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
+</component>
+<component id="tlsprovider" name="TLS Provider" introduced="8.1" purpose="mandatory">
+<unit bldFile="/os/networkingsrv/networksecurity/tlsprovider/group" mrp="/os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
+</component>
+<component id="ipsec" name="IPsec" introduced="7.0" purpose="optional">
+<unit bldFile="/os/networkingsrv/networksecurity/ipsec/group" mrp="/os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
+</component>
+</collection>
+<collection id="networkingtestandutils" name="Networking Test and Utils" level="app-if">
+
+<component id="networkingexamples" 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>
+
+
+
+
+
+
+</collection>
+<collection id="networkingsrv_info" name="Networking Services Info" level="app-if">
+<component id="networkingrom" name="Networking ROM" purpose="mandatory">
+<!-- production component: contains the IBY files -->
+<unit bldFile="/os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="/os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
+</component>
+<component id="networkingdocs" name="Networking Documentation" purpose="development" class="doc">
+<unit mrp="/os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
+</component>
+<component id="networkingsrv_metadata" name="Networking Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
+</component>
+</collection>
+<collection id="pppcompressionplugins" name="PPP Compression Plugins" level="plugin">
+<component id="predictorcompression" name="Predictor Compression" introduced="6.0" purpose="optional" class="plugin">
+<unit bldFile="/os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="/os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
+</component>
+</collection>
+</package>
+<package id="wlan" level="services" tech-domain="dc" name="WLAN" levels="hw low mid high tools test">
+<collection id="wlan_plat" name="WLAN Platform Interfaces" level="test">
+<component id="wlan_dbif_api" name="WLAN DBIF API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_dbif_api/group"/>
+</component>
+<component id="wlan_hal_api" name="WLAN HAL API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_hal_api/group"/>
+</component>
+<component id="wlan_management_api" name="WLAN Management API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_management_api/group"/>
+</component>
+<component id="wlan_device_settings_api" name="WLAN Device Settings API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_device_settings_api/group"/>
+</component>
+<component id="wlan_control_api" name="WLAN Control API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_control_api/group"/>
+</component>
+<component id="wlan_hw_initialization_data_api" name="WLAN Hardware Initialization Data API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_hw_initialization_data_api/group"/>
+</component>
+<component id="wlan_power_save_plugin_api" name="WLAN Power Save Plugin API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_power_save_plugin_api/group"/>
+</component>
+<component id="wlan_info_api" name="WLAN Info API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_info_api/group"/>
+</component>
+<component id="wlan_agent_hotspot_plugin_api" name="WLAN Agent Hotspot Plug-in API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
+</component>
+<component id="wlan_osa_api" name="WLAN OSA API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_osa_api/group"/>
+</component>
+<component id="wlan_spia_api" name="WLAN SPIA API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_spia_api/group"/>
+</component>
+<component id="wlan_hpa_api" name="WLAN HPA API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_hpa_api/group"/>
+</component>
+<component id="wlan_eapol_plugin_api" name="WLAN EAPOL Plugin API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_eapol_plugin_api/group"/>
+</component>
+<component id="wlan_generic_plugin_api" name="WLAN Generic Plugin API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_generic_plugin_api/group"/>
+</component>
+<component id="wlan_aws_plugin_api" name="WLAN AWS Plugin API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_plat/wlan_aws_plugin_api/group"/>
+</component>
+</collection>
+<collection id="wlan_pub" name="WLAN Public Interfaces" level="test">
+<component id="wlan_sdk_info_api" name="WLAN SDK Info API" class="api" filter="s60">
+<unit bldFile="/os/wlan/wlan_pub/wlan_sdk_info_api/group"/>
+</component>
+</collection>
+<collection id="wlan_bearer" name="WLAN Bearer" level="hw">
+<component id="wlanpsmplugin" filter="s60" name="WLAN PSM Plugin" class="plugin">
+<unit bldFile="/os/wlan/wlan_bearer/wlanpsmplugin/group"/>
+</component>
+<component id="wlanagent" filter="s60" name="WLAN Agent">
+<unit bldFile="/os/wlan/wlan_bearer/wlanagent/group"/>
+</component>
+<component id="wlandbif_cd" filter="s60" name="WLAN CommsDat interface">
+<unit bldFile="/os/wlan/wlan_bearer/wlandbif_cd/group"/>
+</component>
+<!-- should follow component directory rules for stuff in wlan_symbian/ and put in a single component or split up properly -->
+<component id="wlanengine" filter="s60" name="WLAN Engine">
+<unit bldFile="/os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
+</component>
+<component id="wlanldd" filter="s60" name="WLAN LDD">
+<unit bldFile="/os/wlan/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
+</component>
+<component id="wlannwif" filter="s60" name="WLAN Network Interface">
+<unit bldFile="/os/wlan/wlan_bearer/wlannwif/group"/>
+</component>
+</collection>
+<collection id="wlanapitest" name="WLAN API Tests" level="test">
+
+</collection>
+<collection id="wlan_info" name="WLAN Info" level="test">
+<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">
+<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">
+<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"/>
+</component>
+</collection>
+<collection id="smsprotocols" name="SMS Protocols" level="framework">
+<component id="smsstack" name="SMS Stack" introduced="6.0" purpose="mandatory" class="plugin">
+<unit bldFile="/os/cellularsrv/smsprotocols/smsstack/group" mrp="/os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
+</component>
+</collection>
+<collection id="telephonyprotocols" name="Telephony Protocols" level="framework">
+<component id="csdagt" name="CSD AGT" introduced="6.1" purpose="optional" class="plugin">
+<unit bldFile="/os/cellularsrv/telephonyprotocols/csdagt/group" mrp="/os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
+</component>
+<component id="psdagt" name="PSD AGT" introduced="7.0s" purpose="optional" class="plugin">
+<unit bldFile="/os/cellularsrv/telephonyprotocols/psdagt/group" mrp="/os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
+</component>
+<component id="gprsumtsqosprt" name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" class="plugin">
+<unit bldFile="/os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="/os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
+</component>
+<component id="gprsumtsqosinterface" name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" class="plugin">
+<unit bldFile="/os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="/os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
+</component>
+<component id="qosextnapi" name="QoS Extn API" introduced="9.2" purpose="optional">
+<unit bldFile="/os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="/os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
+</component>
+<component id="secondarypdpcontextumtsdriver" name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
+<unit bldFile="/os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="/os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
+</component>
+<component id="qos3gppcpr" name="QoS 3GPP CPR" introduced="9.2" purpose="optional" class="plugin">
+<unit bldFile="/os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="/os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
+</component>
+<component id="pdplayer" name="PDP Layer" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/cellularsrv/telephonyprotocols/pdplayer/group" mrp="/os/cellularsrv/telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
+</component>
+<component id="rawipnif" name="Raw IP NIF" introduced="8.1" purpose="optional" class="plugin">
+<unit bldFile="/os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="/os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
+</component>
+</collection>
+<collection id="telephonyserver" name="Telephony Server" level="server">
+<component id="etelserverandcore" name="ETel Server and Core" purpose="mandatory">
+<unit bldFile="/os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="/os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
+</component>
+
+<component id="etelmultimode" name="ETel Multimode" introduced="7.0" purpose="mandatory">
+<unit bldFile="/os/cellularsrv/telephonyserver/etelmultimode/group" mrp="/os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
+</component>
+<component id="etelpacketdata" name="ETel Packet Data" introduced="7.0" purpose="mandatory">
+<unit bldFile="/os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="/os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
+</component>
+<component id="etelsimtoolkit" name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory">
+<unit bldFile="/os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="/os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
+</component>
+</collection>
+<collection id="telephonyserverplugins" name="Telephony Server Plugins" level="plugin">
+<component id="common_tsy" name="Common TSY" introduced="^2" purpose="optional" class="plugin">
+<unit bldFile="/os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="/os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
+</component>
+<component id="licenseetsystub" name="Licensee TSY Stub" introduced="^2" purpose="development" class="plugin" filter="sf_build">
+<unit mrp="/os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="/os/cellularsrv/telephonyserverplugins/licenseetsystub/group"/>
+</component>
+<component id="multimodetsy" name="Multimode TSY" purpose="development" class="plugin">
+<unit bldFile="/os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="/os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
+</component>
+
+<component id="ctsydispatchlayer" name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="/os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
+</component>
+<component id="simatktsy" name="SIMATK TSY" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/cellularsrv/telephonyserverplugins/simatktsy/group" mrp="/os/cellularsrv/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
+</component>
+</collection>
+<collection id="telephonyutils" name="Telephony Utilities" level="app-if">
+<component id="dial" name="Dial" deprecated="9.1" purpose="optional">
+<unit bldFile="/os/cellularsrv/telephonyutils/dial/group" mrp="/os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
+</component>
+<component id="telephonywatchers" name="Telephony Watchers" introduced="6.0" purpose="optional" class="plugin">
+<unit bldFile="/os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="/os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
+</component>
+<component id="etel3rdpartyapi" name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
+<unit bldFile="/os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="/os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
+</component>
+</collection>
+<collection id="cellularsrv_info" name="Cellular Baseband Services Info" level="app-if">
+<component id="telephonyconfidentialdocs" name="Telephony Confidential Documentation" purpose="development" class="doc">
+<unit mrp="/os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
+</component>
+<component id="telephonydocs" name="Telephony Documentation" purpose="development" class="doc">
+<unit mrp="/os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.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">
+<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">
+
+
+
+</collection>
+</package>
+<package id="bt" level="services" tech-domain="de" name="Bluetooth" levels="adaptation 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">
+<unit bldFile="/os/bt/bt_plat/bluetooth_audio_adaptation_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">
+<unit bldFile="/os/bt/bt_plat/at_command_handler_plugin_api/group"/>
+</component>
+</collection>
+<collection id="bluetooth" name="Bluetooth Core" level="framework">
+<component id="btstack" name="Bluetooth Stack" introduced="6.0" purpose="optional">
+<unit bldFile="/os/bt/bluetooth/btstack" mrp="/os/bt/bluetooth/btstack/bluetooth_stack.mrp"/>
+</component>
+<component id="btcomm" name="Bluetooth CSY" introduced="6.0" purpose="optional" class="plugin">
+<unit bldFile="/os/bt/bluetooth/btcomm" mrp="/os/bt/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
+</component>
+<component id="btsdp" name="Bluetooth SDP" introduced="6.1" purpose="optional">
+<unit bldFile="/os/bt/bluetooth/btsdp" mrp="/os/bt/bluetooth/btsdp/bluetooth_sdp.mrp"/>
+</component>
+<component id="btextnotifiers" name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
+<unit bldFile="/os/bt/bluetooth/btextnotifiers" mrp="/os/bt/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
+</component>
+<component id="gavdp" name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
+<unit bldFile="/os/bt/bluetooth/gavdp/group" mrp="/os/bt/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
+</component>
+
+<component id="btlogger" name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
+<unit bldFile="/os/bt/bluetooth/btlogger/group" mrp="/os/bt/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
+</component>
+<component id="btdocs" name="Bluetooth Documentation" purpose="development" class="doc">
+<unit mrp="/os/bt/bluetooth/btdocs/bluetooth_documentation.mrp"/>
+</component>
+</collection>
+<collection id="bluetoothmgmt" name="Bluetooth Management" level="plugin">
+<component id="btmgr" name="Bluetooth Manager" introduced="6.0" purpose="optional">
+<unit bldFile="/os/bt/bluetoothmgmt/btmgr" mrp="/os/bt/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
+</component>
+<component id="btconfig" name="Bluetooth Config" purpose="optional" class="config">
+<unit bldFile="/os/bt/bluetoothmgmt/btconfig" mrp="/os/bt/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
+</component>
+<component id="btrom" name="Bluetooth ROM" introduced="9.1" purpose="optional">
+<unit bldFile="/os/bt/bluetoothmgmt/btrom" mrp="/os/bt/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
+</component>
+<component id="bluetoothclientlib" name="Bluetooth Client Library" introduced="6.0" purpose="optional">
+<unit bldFile="/os/bt/bluetoothmgmt/bluetoothclientlib" mrp="/os/bt/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
+</component>
+
+</collection>
+<collection id="bluetoothcommsprofiles" name="Bluetooth Comms Profiles" level="app-if">
+<component id="btpan" name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" class="plugin">
+<unit bldFile="/os/bt/bluetoothcommsprofiles/btpan/group" mrp="/os/bt/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
+</component>
+</collection>
+<collection id="bthci" name="Host Controller Interface" level="server">
+<component id="bthci2" name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
+<unit bldFile="/os/bt/bthci/bthci2/group" mrp="/os/bt/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
+</component>
+<component id="hciextensioninterface" name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
+<unit bldFile="/os/bt/bthci/hciextensioninterface" mrp="/os/bt/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
+</component>
+<component id="hci2implementations" name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" class="plugin">
+<unit bldFile="/os/bt/bthci/hci2implementations/group" mrp="/os/bt/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
+</component>
+</collection>
+<collection id="irda" name="IrDA" level="plugin">
+<component id="irdastack" name="IrDA Stack" purpose="optional">
+<unit bldFile="/os/bt/irda/irdastack/group" mrp="/os/bt/irda/irdastack/group/infra-red_irda.mrp"/>
+</component>
+</collection>
+<collection id="bluetoothapitest" name="Bluetooth API Tests" level="app-if">
+
+</collection>
+<collection id="atext" name="AT Extensions" level="server">
+<!-- collection is really a component. Need to move down a directory -->
+<component id="atext_build" name="AT Extension Build" introduced="^3" purpose="optional" filter="s60">
+<unit bldFile="/os/bt/atext/group"/>
+</component>
+</collection>
+<collection id="bt_info" name="Bluetooth Info" level="app-if">
+<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">
+<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">
+<unit version="2" bldFile="/os/usb/usbmgmt/usbmgr/group" mrp="/os/usb/usbmgmt/usbmgr/group/usb_manager.mrp"/>
+</component>
+
+<component id="usbclassandmgrdocs" name="USB Class and Manager Documentation" purpose="development" class="doc">
+<unit mrp="/os/usb/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
+</component>
+</collection>
+<collection id="usb_info" name="USB Info" level="app-if">
+<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">
+<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_pub/audio_effects_presets_api/group"/>
+</component>
+<component id="drm_audio_player_api" name="DRM Audio Player API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_pub/drm_audio_player_api/group"/>
+</component>
+<component id="multimedia_extension_interfaces_api" name="Multimedia Extension Interfaces API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_pub/multimedia_extension_interfaces_api/group"/>
+</component>
+</collection>
+<collection id="mm_plat" name="Multimedia Platform Interfaces" level="app-if">
+<component id="aac_decoder_config_api" name="AAC Decoder Config API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/aac_decoder_config_api/group"/>
+</component>
+<component id="aac_decoder_config_msg_hdlr_api" name="AAC Decoder Config Msg Hdlr API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/aac_decoder_config_msg_hdlr_api/group"/>
+</component>
+<component id="aac_decoder_config_proxy_api" name="AAC Decoder Config Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/aac_decoder_config_proxy_api/group"/>
+</component>
+<component id="added_devsound_control_api" name="Added DevSound Control API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/added_devsound_control_api/group"/>
+</component>
+<component id="added_devsound_control_msg_hdlr_api" name="Added DevSound Control Msg Hdlr API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/added_devsound_control_msg_hdlr_api/group"/>
+</component>
+<component id="added_devsound_control_proxy_api" name="Added DevSound Control Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/added_devsound_control_proxy_api/group"/>
+</component>
+<component id="audio_effects_msg_hdlr_api" name="Audio Effects Message Handler API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/audio_effects_msg_hdlr_api/group"/>
+</component>
+<component id="audio_effects_proxy_api" name="Audio Effects Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/audio_effects_proxy_api/group"/>
+</component>
+<component id="audio_policy_header_api" name="Audio Policy Header API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/audio_policy_header_api/group"/>
+</component>
+<component id="audio_routing_api" name="Audio Routing API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/audio_routing_api/group"/>
+</component>
+<component id="audio_routing_msg_hdlr_api" name="Audio Routing Msg Hdlr API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/audio_routing_msg_hdlr_api/group"/>
+</component>
+<component id="audio_routing_proxy_api" name="Audio Routing Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/audio_routing_proxy_api/group"/>
+</component>
+<component id="custom_interface_builder_api" name="Custom Interface Builder API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/custom_interface_builder_api/group"/>
+</component>
+<component id="custom_interface_message_handler_factory_api" name="Custom Interface Message Handler Factory API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/custom_interface_message_handler_factory_api/group"/>
+</component>
+<component id="custom_interface_proxy_factory_api" name="Custom Interface Proxy Factory 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">
+<unit bldFile="/os/mm/mm_plat/devsound_adaptation_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/eaac_plus_decoder_interface_api/group"/>
+</component>
+<component id="eaac_plus_decoder_interface_msg_hdlr_api" name="eAAC Plus Decoder Interface Message Handler API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/eaac_plus_decoder_interface_msg_hdlr_api/group"/>
+</component>
+<component id="eaac_plus_decoder_interface_proxy_api" name="eAAC Plus Decoder Interface Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/eaac_plus_decoder_interface_proxy_api/group"/>
+</component>
+<component id="error_concealment_interface_api" name="Error Concealment Interface API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/error_concealment_interface_api/group"/>
+</component>
+<component id="error_concealment_interface_msg_hdlr_api" name="Error Concealment Interface Message Handler 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">
+<unit bldFile="/os/mm/mm_plat/fm_radio_adaptation_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/g711_decoder_interface_msg_hdlr_api/group"/>
+</component>
+<component id="g711_decoder_interface_proxy_api" name="G711 Decoder Interface Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/g711_decoder_interface_proxy_api/group"/>
+</component>
+<component id="g711_encoder_interface_api" name="G711 Encoder Interface API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/g711_encoder_interface_api/group"/>
+</component>
+<component id="g711_encoder_interface_msg_hdlr_api" name="G711 Encoder Interface Message Handler API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/g711_encoder_interface_msg_hdlr_api/group"/>
+</component>
+<component id="g711_encoder_interface_proxy_api" name="G711 Encoder Interface Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/g711_encoder_interface_proxy_api/group"/>
+</component>
+<component id="g729_decoder_interface_api" name="G729 Decoder Interface API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/g729_decoder_interface_api/group"/>
+</component>
+<component id="g729_decoder_interface_msg_hdlr_api" name="G729 Decoder Interface Message Handler API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/g729_decoder_interface_msg_hdlr_api/group"/>
+</component>
+<component id="g729_decoder_interface_proxy_api" name="G729 Decoder Interface Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/g729_decoder_interface_proxy_api/group"/>
+</component>
+<component id="g729_encoder_interface_api" name="G729 Encoder Interface API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/g729_encoder_interface_api/group"/>
+</component>
+<component id="g729_encoder_interface_proxy_api" name="G729 Encoder Interface Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/g729_encoder_interface_proxy_api/group"/>
+</component>
+<component id="g729_encoder_interface_msg_hdlr_api" name="G729 Encoder Interface Message Handler API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/g729_encoder_interface_msg_hdlr_api/group"/>
+</component>
+<component id="global_audio_settings_api" name="Global Audio Settings API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/global_audio_settings_api/group"/>
+</component>
+<component id="global_audio_settings_definition_api" name="Global Audio Settings Definition API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/global_audio_settings_definition_api/group"/>
+</component>
+<component id="ilbc_decoder_interface_api" name="Ilbc Decoder Interface API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/ilbc_decoder_interface_api/group"/>
+</component>
+<component id="ilbc_decoder_interface_msg_hdlr_api" name="Ilbc Decoder Interface Message Handler API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/ilbc_decoder_interface_msg_hdlr_api/group"/>
+</component>
+<component id="ilbc_decoder_interface_proxy_api" name="Ilbc Decoder Interface Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/ilbc_decoder_interface_proxy_api/group"/>
+</component>
+<component id="ilbc_encoder_interface_api" name="Ilbc Encoder Interface API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/ilbc_encoder_interface_api/group"/>
+</component>
+<component id="ilbc_encoder_interface_msg_hdlr_api" name="Ilbc Encoder Interface Message Handler API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/ilbc_encoder_interface_msg_hdlr_api/group"/>
+</component>
+<component id="ilbc_encoder_interface_proxy_api" name="Ilbc Encoder Interface Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/ilbc_encoder_interface_proxy_api/group"/>
+</component>
+<component id="mdf_plugin_uids" name="MDF Plug-in UIDs" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/mdf_plugin_uids/group"/>
+</component>
+<component id="multimedia_fourcc_definitions_api" name="Multimedia FourCC Definitions API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/multimedia_fourcc_definitions_api/group"/>
+</component>
+<component id="nokia_audio_policy_header_api" name="Nokia Audio Policy Header API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/nokia_audio_policy_header_api/group"/>
+</component>
+<component id="nokia_multimedia_fourcc_definitions_api" name="Nokia Multimedia Fourcc Definitions API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/nokia_multimedia_fourcc_definitions_api/group"/>
+</component>
+<component id="ra8_decoder_interface_api" name="RA8 Decoder Interface API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/ra8_decoder_interface_api/group"/>
+</component>
+<component id="ra8_decoder_interface_msg_hdlr_api" name="RA8 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">
+<unit bldFile="/os/mm/mm_plat/rds_adaptation_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">
+<unit bldFile="/os/mm/mm_plat/restricted_audio_output_msg_hdlr_api/group"/>
+</component>
+<component id="restricted_audio_output_proxy_api" name="Restricted Audio Output Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/restricted_audio_output_proxy_api/group"/>
+</component>
+<component id="sbc_encoder_interface_api" name="SBC Encoder Interface API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/sbc_encoder_interface_api/group"/>
+</component>
+<component id="sbc_encoder_interface_msg_hdlr_api" name="SBC Encoder Interface Message Handler API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/sbc_encoder_interface_msg_hdlr_api/group"/>
+</component>
+<component id="sbc_encoder_interface_proxy_api" name="SBC Encoder Interface Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/sbc_encoder_interface_proxy_api/group"/>
+</component>
+<component id="secure_output_mdf_custom_interface" name="Secure Output MDF Custom Interface" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/secure_output_mdf_custom_interface/group"/>
+</component>
+<component id="speech_encoder_config_api" name="Speech Encoder Config API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/speech_encoder_config_api/group"/>
+</component>
+<component id="speech_encoder_config_msg_hdlr_api" name="Speech Encoder Config Message Handler API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/speech_encoder_config_msg_hdlr_api/group"/>
+</component>
+<component id="speech_encoder_config_proxy_api" name="Speech Encoder Config Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/speech_encoder_config_proxy_api/group"/>
+</component>
+<component id="telephony_audio_routing_client_api" name="Telephony Audio Routing Client API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/telephony_audio_routing_client_api/group"/>
+</component>
+<component id="telephony_audio_routing_manager_api" name="Telephony Audio Routing Manager API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/telephony_audio_routing_manager_api/group"/>
+</component>
+<component id="video_buffer_management_mdf_custom_interface" name="Video Buffer Management MDF Custom Interface" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/video_buffer_management_mdf_custom_interface/group"/>
+</component>
+<component id="video_decoder_rotation_mdf_custom_interface" name="Video Decoder Rotation MDF Custom Interface" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
+</component>
+<component id="video_decoder_scaling_mdf_custom_interface" name="Video Decoder Scaling MDF Custom Interface" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
+</component>
+<component id="video_reclaim_extbuffers_ci" name="Video Reclaim Extbuffers Custom Interface" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/video_reclaim_extbuffers_ci/group"/>
+</component>
+<component id="video_window_control_custom_interface" name="Video Window Control Custom Interface" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/video_window_control_custom_interface/group"/>
+</component>
+<component id="wma_decoder_interface_api" name="WMA Decoder Interface API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/wma_decoder_interface_api/group"/>
+</component>
+<component id="wma_decoder_interface_msg_hdlr_api" name="WMA Decoder Interface Message Handler API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/wma_decoder_interface_msg_hdlr_api/group"/>
+</component>
+<component id="wma_decoder_interface_proxy_api" name="WMA Decoder Interface Proxy API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/wma_decoder_interface_proxy_api/group"/>
+</component>
+<component id="eaacplusutil_api" name="EAac Plus Util API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/eaacplusutil_api/group"/>
+</component>
+<component id="frametable_api" name="Frametable API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/frametable_api/group"/>
+</component>
+</collection>
+<collection id="devsoundextensions" name="Devsound Extensions" level="device-fw">
+<component id="drmaudioplayer" filter="s60" name="DRM Audio Player">
+<unit bldFile="/os/mm/devsoundextensions/drmaudioplayer/group"/>
+</component>
+<component id="mmextfw" filter="s60" name="Multimedia Extension Framework">
+<unit bldFile="/os/mm/devsoundextensions/mmextfw/group"/>
+</component>
+<component id="audiorouting" filter="s60" name="Audio Routing">
+<unit bldFile="/os/mm/devsoundextensions/audiorouting/group"/>
+</component>
+<component id="effects" filter="s60" name="Effects">
+<unit bldFile="/os/mm/devsoundextensions/effects/group"/>
+</component>
+<component id="effectspresets" filter="s60" name="Effects Presets">
+<unit bldFile="/os/mm/devsoundextensions/effectspresets/group"/>
+</component>
+<component id="effectspresets_utils" filter="s60" name="Effects Presets Utils">
+<!-- need to #include the lot from a single bld.inf
+ Also move to a standard component location, not under effectspresets -->
+<unit bldFile="/os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
+<unit bldFile="/os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
+</component>
+<component id="telephonyaudiorouting" filter="s60" name="Telephony Audio Routing">
+<unit bldFile="/os/mm/devsoundextensions/telephonyaudiorouting/group"/>
+</component>
+<component id="mmfcustominterfaces" filter="s60" name="MMF Custom Interfaces">
+<unit bldFile="/os/mm/devsoundextensions/mmfcustominterfaces/group"/>
+</component>
+<component id="addeddevsoundcontrol" filter="s60" name="Added DevSound Control">
+<unit bldFile="/os/mm/devsoundextensions/addeddevsoundcontrol/group"/>
+</component>
+<component id="globalaudiosettings" filter="s60" name="Global Audio Settings">
+<unit bldFile="/os/mm/devsoundextensions/globalaudiosettings/group"/>
+</component>
+<component id="restrictedaudiooutput" filter="s60" name="Restricted Audio Output">
+<unit bldFile="/os/mm/devsoundextensions/restrictedaudiooutput/group"/>
+</component>
+<component id="ciextnfactoryplugins" filter="s60" name="Custom Interface Extension Factory Plugins" class="plugin">
+<unit bldFile="/os/mm/devsoundextensions/ciextnfactoryplugins/group"/>
+</component>
+</collection>
+<collection id="mdfdevvideoextensions" name="MDF Dev Video Extensions" level="device-fw">
+<component id="nga_mdf_postprocessor" name="NGA MDF Postprocessor" filter="s60">
+<unit bldFile="/os/mm/mdfdevvideoextensions/nga_mdf_postprocessor/group"/>
+</component>
+</collection>
+<collection id="audio" name="Audio Codecs" level="middleware">
+<component id="arm_cmmf_codecs" filter="s60" name="ARM CMMF Codecs" class="plugin">
+<unit bldFile="/os/mm/audio/arm_cmmf_codecs/group"/>
+</component>
+</collection>
+<collection id="video" name="Video Codecs" level="middleware">
+<!-- empty -->
+</collection>
+<collection id="imagingandcamerafws" name="Imaging and Camera Frameworks" level="app-if">
+<component id="imagingfws" name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
+<unit bldFile="/os/mm/imagingandcamerafws/imagingfws/group" mrp="/os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
+</component>
+
+
+<component id="camerafw" name="Camera Framework" introduced="7.0s" purpose="optional">
+<unit bldFile="/os/mm/imagingandcamerafws/camerafw/group" mrp="/os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
+</component>
+
+</collection>
+<collection id="mmlibs" name="Multimedia Libraries" level="middleware">
+<component id="mmutilitylib" name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
+<unit bldFile="/os/mm/mmlibs/mmutilitylib/group" mrp="/os/mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
+</component>
+<component id="mmfw" name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
+<unit bldFile="/os/mm/mmlibs/mmfw/group" mrp="/os/mm/mmlibs/mmfw/group/multimedia_mmf.mrp"/>
+</component>
+</collection>
+<collection id="mmplugins" name="Multimedia Plugins" level="middleware">
+<component id="imagingplugins" name="Imaging Plugins" introduced="7.0s" purpose="optional" class="plugin">
+<unit bldFile="/os/mm/mmplugins/imagingplugins/group" mrp="/os/mm/mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
+</component>
+<component id="cameraplugins" name="Camera Plugins" introduced="7.0s" purpose="optional" class="plugin">
+<unit bldFile="/os/mm/mmplugins/cameraplugins/group" mrp="/os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
+</component>
+<component id="lib3gp" name="3GP Library" introduced="^2" purpose="optional">
+<unit bldFile="/os/mm/mmplugins/lib3gp/group" mrp="/os/mm/mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
+</component>
+
+<component id="mmfwplugins" name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" class="plugin">
+<unit bldFile="/os/mm/mmplugins/mmfwplugins/group" mrp="/os/mm/mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
+</component>
+</collection>
+<collection id="mm_info" name="Multimedia Info" level="app-if">
+<component id="mmdocs" name="Multimedia Documentation" purpose="development" class="doc">
+<unit mrp="/os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
+</component>
+
+<component id="mm_metadata" name="Multimedia Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
+</component>
+</collection>
+<collection id="mmresourcemgmt" name="Multimedia Resource Management" level="middleware">
+<component id="mmresctrl" name="Multimedia Resource Controller" introduced="^2" purpose="development">
+<unit bldFile="/os/mm/mmresourcemgmt/mmresctrl/group" mrp="/os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
+</component>
+</collection>
+<collection id="mmdevicefw" name="Multimedia Device Framework" level="device-fw">
+<component id="mdf" name="Media Device Framework" introduced="9.2" purpose="mandatory">
+<unit bldFile="/os/mm/mmdevicefw/mdf/group" mrp="/os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
+</component>
+
+<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">
+<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"/>
+</component>
+</collection>
+<collection id="mmtestenv" name="Multimedia Test Environment" level="device-fw">
+
+
+
+
+</collection>
+<collection id="omxil" name="OpenMAX IL" level="hw-if">
+<component id="omxilapi" name="OpenMAX IL API" introduced="^3" purpose="optional">
+<unit version="1" bldFile="/os/mm/omxil/omxilapi/group" mrp="/os/mm/omxil/omxilapi/group/multimedia_omx_il_api.mrp"/>
+</component>
+<component id="omxilcore" name="OpenMAX IL Core" introduced="^3" purpose="optional">
+<unit version="1" bldFile="/os/mm/omxil/omxilcore/group" mrp="/os/mm/omxil/omxilcore/group/multimedia_omx_il_core.mrp"/>
+</component>
+<component id="omxilcomponentcommon" name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
+<unit version="1" bldFile="/os/mm/omxil/omxilcomponentcommon/group" mrp="/os/mm/omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp"/>
+</component>
+<component id="omxilrefcomps" name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
+<unit version="1" bldFile="/os/mm/omxil/omxilrefcomps/ref_components/group" mrp="/os/mm/omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp"/>
+</component>
+
+
+<component id="mmilapi" name="Multimedia Integration Layer API" introduced="^3" purpose="development">
+<unit bldFile="/os/mm/omxil/mmilapi/group" mrp="/os/mm/omxil/mmilapi/group/multimedia_il_api.mrp"/>
+</component>
+</collection>
+<collection id="devsound" name="Sound Device" level="devices">
+<component id="devsoundapi" name="DevSound API" introduced="7.0s" purpose="mandatory">
+<unit bldFile="/os/mm/devsound/devsoundapi/group" mrp="/os/mm/devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
+</component>
+<component id="a3fdevsound" name="A3F DevSound" introduced="^2" purpose="optional">
+<unit bldFile="/os/mm/devsound/a3fdevsound/group" mrp="/os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
+</component>
+<component id="a3facf" name="A3F Audio Component Framework" introduced="^2" purpose="optional">
+<unit bldFile="/os/mm/devsound/a3facf/group" mrp="/os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
+</component>
+<component id="devsoundpluginsupport" name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
+<unit bldFile="/os/mm/devsound/devsoundpluginsupport/group" mrp="/os/mm/devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
+</component>
+<component id="refdevsound" 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 id="btdevsound" name="Bluetooth DevSound Plugin" introduced="7.0s" purpose="development" class="plugin" deprecated="^4">
+<unit bldFile="/os/mm/devsound/sounddevbt/group" mrp="/os/mm/devsound/sounddevbt/group/multimedia_mdf_devsound_refbtplugin.mrp"/>
+</component>
+<component id="a3ftrace" name="A3F Trace Utility" introduced="^2" purpose="development">
+<unit bldFile="/os/mm/devsound/a3ftrace/group" mrp="/os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
+</component>
+
+<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">
+<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"/>
+</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"/>
+</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">
+<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>
+</collection>
+<collection id="imagingext_plat" name="Imaging Extensions Platform Interfaces" level="app-if">
+<component id="jpeg2000_icl_plugin_api" name="JPEG2000 ICL plugin API" class="api" filter="s60">
+<unit bldFile="/os/imagingext/imagingext_plat/jpeg2000_icl_plugin_api/group"/>
+</component>
+<component id="extended_icl_jpeg_api" name="Extended ICL Jpeg API" class="api" filter="s60">
+<unit bldFile="/os/imagingext/imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
+
+</component>
+<component id="h324_annex_k_custom_api" name="H324 Annex K Custom API" class="api" filter="s60">
+<unit bldFile="/os/imagingext/imagingext_plat/h324_annex_k_custom_api/group"/>
+</component>
+<component id="ecam_orientation_custom_api" name="ECam Orientation Custom API" class="api" filter="s60">
+<unit bldFile="/os/imagingext/imagingext_plat/ecam_orientation_custom_api/group"/>
+</component>
+<component id="ecam_ui_orientation_override_custom_api" name="ECam UI Orientation Override Custom API" class="api" filter="s60">
+<unit bldFile="/os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
+</component>
+<component id="ecam_face_tracking_custom_api" name="ECam Face Tracking Custom API" class="api" filter="s60">
+<unit bldFile="/os/imagingext/imagingext_plat/ecam_face_tracking_custom_api/group"/>
+</component>
+<component id="ecam_use_case_hint_custom_api" class="api" name="ECam Use Case Hint Custom API" filter="s60" introduced="^4">
+<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">
+<component id="iclextjpegapi" filter="s60" name="ICL Extension JPEG API">
+<unit bldFile="/os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
+</component>
+<component id="imageadaptationextensions_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"/>
+</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>
+<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">
+<collection id="graphicsaccelaration" name="Graphics Acceleration" level="adaptation">
+<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">
+<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">
+<unit bldFile="/os/graphics/graphicsresourceservices/graphicsresourceadaptation/group" mrp="/os/graphics/graphicsresourceservices/graphicsresourceadaptation/group/graphics_graphicsresourceadapter.mrp"/>
+</component>
+<component id="graphicsresourceimplementation" name="Graphics Resource Implementation" introduced="^4" purpose="optional">
+<unit bldFile="/os/graphics/graphicsresourceservices/graphicsresourceimplementation/group" mrp="/os/graphics/graphicsresourceservices/graphicsresourceimplementation/group/graphics_graphicsresourceimplementation.mrp"/>
+</component>
+<component id="graphicsresourceinterface" name="Graphics Resource Interface" introduced="^4" purpose="optional">
+<unit bldFile="/os/graphics/graphicsresourceservices/graphicsresourceinterface/group" mrp="/os/graphics/graphicsresourceservices/graphicsresourceinterface/group/graphics_graphicsresourceinterface.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">
+<!-- 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="graphicscomposition" name="Graphics Composition" level="engines">
+<component id="openwfcinterface" name="OpenWF Composition Interface" introduced="^3" purpose="optional">
+<unit bldFile="/os/graphics/graphicscomposition/openwfcinterface/group" mrp="/os/graphics/graphicscomposition/openwfcinterface/group/graphics_openwfcinterface.mrp"/>
+</component>
+<component id="openwfcompositionengine" name="OpenWF Composition Engine" introduced="^3" purpose="development">
+<unit bldFile="/os/graphics/graphicscomposition/openwfcompositionengine/group" mrp="/os/graphics/graphicscomposition/openwfcompositionengine/group/graphics_openwfcompositionengine.mrp"/>
+</component>
+<component id="openwfsupport" name="OpenWF Support" introduced="^3" purpose="optional">
+<unit bldFile="/os/graphics/graphicscomposition/openwfsupport/group" mrp="/os/graphics/graphicscomposition/openwfsupport/group/graphics_openwfsupport.mrp"/>
+</component>
+<component id="surfaceupdate" name="Surface Update" introduced="^3" purpose="optional">
+<unit bldFile="/os/graphics/graphicscomposition/surfaceupdate/group" mrp="/os/graphics/graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
+</component>
+</collection>
+<collection id="graphicstest" name="Graphics Test" level="app-if">
+
+<component id="uibench" name="UI Bench" introduced="9.2" purpose="development">
+<unit bldFile="/os/graphics/graphicstest/uibench/group" mrp="/os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
+</component>
+</collection>
+<collection id="graphics_plat" name="Graphics Platform Interfaces" level="app-if">
+<component id="m3g_core_api" filter="sf_build" name="M3G Core API" class="api">
+<unit bldFile="/os/graphics/graphics_plat/m3g_core_api/group"/>
+</component>
+</collection>
+<collection id="graphics_info" name="Graphics Info" level="app-if">
+<component id="graphicsdocs" name="Graphics Documentation" purpose="development" class="doc">
+<unit mrp="/os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
+</component>
+<component id="graphics_metadata" name="Graphics Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
+</component>
+</collection>
+<collection id="windowing" name="Windowing" level="app-if">
+<component id="windowserver" name="Window Server" purpose="mandatory">
+<unit bldFile="/os/graphics/windowing/windowserver/group" mrp="/os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
+</component>
+<component id="windowserverplugins" name="Window Server Plugins" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/graphics/windowing/windowserverplugins/group" mrp="/os/graphics/windowing/windowserverplugins/group/graphics_wserv_std_plugins.mrp"/>
+</component>
+</collection>
+<collection id="printingservices" name="Printing Services" level="app-if">
+<component id="printerdriversupport" name="Printer Driver Support" purpose="optional">
+<unit bldFile="/os/graphics/printingservices/printerdriversupport/group" mrp="/os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
+</component>
+<component id="printerdrivers" name="Printer Drivers" purpose="optional" class="plugin">
+<unit bldFile="/os/graphics/printingservices/printerdrivers/group" mrp="/os/graphics/printingservices/printerdrivers/group/graphics_printdrv.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">
+<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">
+<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 -->
+<unit bldFile="/os/graphics/openvg/openvginterface/group/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">
+<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"/>
+</component>
+<component id="eglrefimpl" name="EGL Reference Implementation" introduced="^3" purpose="optional">
+<unit bldFile="/os/graphics/egl/eglrefimpl/group" mrp="/os/graphics/egl/eglrefimpl/group/graphics_eglrefimpl.mrp"/>
+</component>
+<component id="egltest" name="EGL Tests" introduced="^3" purpose="development">
+<unit bldFile="/os/graphics/egl/egltest/group" mrp="/os/graphics/egl/egltest/group/graphics_egltest.mrp"/>
+</component>
+</collection>
+<collection id="graphicsdeviceinterface" name="Graphics Device Interface" level="device-interface">
+<component id="gdi" name="GDI" purpose="mandatory">
+<unit bldFile="/os/graphics/graphicsdeviceinterface/gdi/group" mrp="/os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
+</component>
+<component id="bitgdi" name="BitGDI" purpose="mandatory">
+<unit bldFile="/os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="/os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
+</component>
+<component id="colourpalette" name="Colour Palette" introduced="7.0s" purpose="optional">
+<unit bldFile="/os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="/os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
+</component>
+<component id="screendriver" name="Screen Driver" introduced="6.1" purpose="optional" class="plugin">
+<unit bldFile="/os/graphics/graphicsdeviceinterface/screendriver/group" mrp="/os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
+</component>
+<component id="directgdi" name="DirectGDI" introduced="^3" deprecated="^3" purpose="optional">
+<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">
+<unit bldFile="/os/graphics/graphicsdeviceinterface/directgdiadaptation/group" mrp="/os/graphics/graphicsdeviceinterface/directgdiadaptation/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>
+</collection>
+<collection id="graphicsapitest" name="Graphics API Tests" level="app-if">
+
+
+</collection>
+</package>
+<package id="textandloc" level="services" tech-domain="ui" name="Text and Localisation Services" levels="encoding util fonts tools text">
+<collection id="textandloc_plat" name="Text and Localisation Platform Interfaces" level="text">
+<component id="findutil_api" class="api" name="Find Util API" filter="s60">
+<unit bldFile="/os/textandloc/textandloc_plat/findutil_api/group"/>
+</component>
+<component id="japanese_language_utilities_api" class="api" name="Japanese Language Utilities API" filter="s60">
+<unit bldFile="/os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
+</component>
+<component id="sortutil_api" class="api" name="Sort Util API" filter="s60">
+<unit bldFile="/os/textandloc/textandloc_plat/sortutil_api/group"/>
+</component>
+</collection>
+<collection id="textandloc_pub" name="Text and Localisation Public Interfaces" level="text">
+<component id="directory_localizer_api" class="api" name="Directory Localizer API" filter="s60">
+<unit bldFile="/os/textandloc/textandloc_pub/directory_localizer_api/group"/>
+</component>
+</collection>
+<collection id="charconvfw" name="Character Conversion" level="encoding">
+<component id="charconv_fw" name="Character Encoding and Conversion Framework" purpose="optional">
+<unit bldFile="/os/textandloc/charconvfw/charconv_fw/group" mrp="/os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
+</component>
+<component id="charconvplugins" name="Character Encoding and Conversion Plugins" purpose="optional" class="plugin">
+<unit bldFile="/os/textandloc/charconvfw/charconvplugins/group" mrp="/os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
+</component>
+<component id="fatfilenameconversionplugins" name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" class="plugin">
+<unit bldFile="/os/textandloc/charconvfw/fatfilenameconversionplugins/group" mrp="/os/textandloc/charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
+</component>
+</collection>
+<collection id="fontandtxtsrv" name="Font and Text Services" level="fonts">
+<component id="iculayoutengine" name="ICU Layout Engine" introduced="9.2" purpose="optional" class="plugin" deprecated="^4">
+<unit bldFile="/os/textandloc/fontservices/textshaperplugin/group" mrp="/os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
+</component>
+<component id="fontstore" name="Font Store" purpose="mandatory">
+<unit bldFile="/os/textandloc/fontservices/fontstore/group" mrp="/os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
+</component>
+<component id="textbase" name="Text Base" purpose="mandatory">
+<!-- placeholder for text code from GDI -->
+</component>
+<component id="freetypefontrasteriser" name="FreeType Font Rasteriser" purpose="optional" class="plugin">
+<unit bldFile="/os/textandloc/fontservices/freetypefontrasteriser/group" mrp="/os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
+</component>
+<component id="referencefonts" name="Reference Fonts" introduced="6.0" purpose="optional">
+<unit bldFile="/os/textandloc/fontservices/referencefonts/group" mrp="/os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
+</component>
+</collection>
+<collection id="textlayout" name="Text Layout" level="text">
+<component id="texthandling" name="Text Handling" purpose="optional">
+<unit bldFile="/os/textandloc/textrendering/texthandling/group" mrp="/os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
+</component>
+<component id="textformatting" name="Text Formatting" purpose="optional">
+<unit bldFile="/os/textandloc/textrendering/textformatting/group" mrp="/os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
+</component>
+
+</collection>
+<collection id="textandlocutils" name="Text and Localisation Utils" level="util">
+<component id="numbergrouping" name="Number Grouping">
+<unit bldFile="/os/textandloc/charconvfw/numbergrouping/group"/>
+</component>
+<component id="jplangutil" name="Japanese Language Utilities">
+<unit bldFile="/os/textandloc/charconvfw/jplangutil/group"/>
+</component>
+<component id="sortutil" name="Sorting Utility">
+<unit bldFile="/os/textandloc/charconvfw/sortutil/group"/>
+</component>
+<component id="inlinetext" name="Inline Text">
+<unit bldFile="/os/textandloc/charconvfw/inlinetext/group"/>
+</component>
+<component id="nearestlangutil" name="Nearest Language Util" introduced="^2" purpose="mandatory">
+<!-- placeholder for split from bafl -->
+</component>
+<component id="numberformatting" name="Number Formatting" introduced="7.0s" purpose="optional">
+<unit bldFile="/os/textandloc/textrendering/numberformatting/group" mrp="/os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
+</component>
+</collection>
+<collection id="localesupport" name="Locale Support" level="util">
+<component id="reflocales" name="Reference Locales" purpose="optional" class="plugin">
+<unit bldFile="/os/textandloc/localisation/localesupport" mrp="/os/textandloc/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
+</component>
+<component id="initlocale" name="Initialise Locale" introduced="^2" purpose="mandatory">
+<!-- placeholder for split from bafl -->
+</component>
+</collection>
+<collection id="textandloctools" name="Text and Localisation Tools" level="tools">
+<component id="fontcompiler" name="Font Compiler" purpose="development" target="desktop">
+<!-- placeholder for split from GDI Tools -->
+</component>
+<component id="bitmapfonttools" name="Bitmap Font Tools" purpose="development" target="desktop">
+<unit bldFile="/os/graphics/graphicstools/bitmapfonttools/group" mrp="/os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
+</component>
+</collection>
+<collection id="textandloc_info" name="Text and Localisation Info" level="text">
+<component id="textandloc_metadata" name="Text and Localisation Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="xmlsrv" level="services" tech-domain="rt" name="XML Services" levels="plugin server framework generic specific">
+<collection id="xmlsrv_plat" name="XML Services Platform Interfaces" level="specific">
+<component id="xmlsrv_plat_build" name="XML Services Platform Interface Build" class="api" filter="s60">
+<!-- need to fix the configuration used here.
+ Either destribute to other components or use the new feature flags confguration mechanisms.
+ Remove this component and uncomment the other units when fixed-->
+<unit bldFile="/os/xmlsrv/xmlsrv_plat/group"/>
+</component>
+<component id="xml_encryption_api" name="XML Encryption API" class="api" filter="s60">
+<!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/> -->
+</component>
+<component id="xml_signature_api" name="XML Signature API" class="api" filter="s60">
+<!-- <unit bldFile="xmlsrv_plat/xml_signature_api/group"/> -->
+</component>
+<component id="xml_security_engine_utils_api" name="XML Security Engine Utils API" class="api" filter="s60">
+<!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/> -->
+</component>
+</collection>
+<collection id="xmlsecurityengine" name="XML Security Engine" level="framework">
+<component id="xmlseccertman" filter="s60" name="XML Security Certificate Manager">
+<unit bldFile="/os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
+</component>
+<component id="xmlsec" filter="s60" name="XML Security">
+<unit bldFile="/os/xmlsrv/xmlsecurityengine/xmlsec/group"/>
+</component>
+<component id="xmlseccrypto" filter="s60" name="XML Security Crypto">
+<unit bldFile="/os/xmlsrv/xmlsecurityengine/xmlseccrypto/group"/>
+</component>
+<component id="xmlsecwrapper" filter="s60" name="XML Security Wrapper">
+<unit bldFile="/os/xmlsrv/xmlsecurityengine/xmlsecwrapper/group"/>
+</component>
+</collection>
+<collection id="xml" name="XML" level="generic">
+<component id="xmlfw" name="XML Framework" introduced="7.0s" purpose="optional">
+<unit bldFile="/os/xmlsrv/xml/xmlfw/group" mrp="/os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
+</component>
+<component id="libxml2libs" name="Libxml2 Libraries" introduced="^3" purpose="optional">
+<unit bldFile="/os/xmlsrv/xml/libxml2libs/group" mrp="/os/xmlsrv/xml/libxml2libs/group/syslibs_libxml2.mrp"/>
+</component>
+<component id="legacyminidomparser" name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
+<unit bldFile="/os/xmlsrv/xml/legacyminidomparser/GROUP" mrp="/os/xmlsrv/xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp"/>
+</component>
+<component id="xmldomandxpath" name="XML DOM and XPath" introduced="^3" purpose="optional">
+<unit bldFile="/os/xmlsrv/xml/xmldomandxpath/group" mrp="/os/xmlsrv/xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
+</component>
+<component id="xmlexpatparser" name="XML Expat Parser" introduced="7.0s" purpose="optional" class="plugin">
+<unit bldFile="/os/xmlsrv/xml/xmlexpatparser/group" mrp="/os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
+</component>
+<component id="xmllibxml2parser" name="XML Libxml2 Parser" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/xmlsrv/xml/xmllibxml2parser/group" mrp="/os/xmlsrv/xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
+</component>
+<component id="wbxmlparser" name="WBXML Parser" introduced="7.0s" purpose="optional" class="plugin">
+<unit bldFile="/os/xmlsrv/xml/wbxmlparser/group" mrp="/os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
+</component>
+</collection>
+<collection id="xmlsrv_info" name="XML Services Info" level="specific">
+<component id="xmlsrv_metadata" name="XML Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="deviceplatformrelease" level="services" tech-domain="to" name="Device Platform Release" levels="bld mid top">
+<collection id="s60extras" name="S60 Extras" level="mid">
+<!-- collection is really a component. Need to move down a directory -->
+<component id="s60extras_build" filter="s60" name="S60 Extras Build" class="config" purpose="development">
+<unit bldFile="/os/deviceplatformrelease/S60Extras/group"/>
+</component>
+</collection>
+<collection id="version" name="Version" level="top">
+<!-- collection is really a component. Need to move down a directory -->
+<component id="version_build" filter="s60" name="Version Build" class="config" purpose="development">
+<unit bldFile="/os/deviceplatformrelease/Version/group"/>
+</component>
+</collection>
+<collection id="symbianosbld" name="Symbian OS Build" level="bld">
+<component id="cedarutils" name="Cedar Utils" purpose="development">
+<unit mrp="/os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
+</component>
+<component id="productionbldcbrconfig" name="Production Build CBR Config" filter="gt" purpose="development" class="config">
+<unit mrp="/os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
+</component>
+</collection>
+<collection id="foundation_system" name="Foundation System" level="top">
+<component id="system_model" name="System Model" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
+</component>
+<component id="sf_config" name="Foundation Config" introduced="^4">
+<unit bldFile="/os/deviceplatformrelease/foundation_system/sf_config/CI_external/group"/>
+</component>
+<component id="config" filter="s60" name="Config" class="config" purpose="development">
+<unit base="/os/deviceplatformrelease/foundation_system/sf_config/config"/>
+</component>
+<component id="cenrep" filter="sf_build" name="ConE Central Repository Config" class="config" purpose="development">
+<!-- will should give the id/path something more unique than cenrep -->
+<unit bldFile="/os/deviceplatformrelease/foundation_system/sf_config/cenrep/group"/>
+</component>
+<component id="rombuild_syborg" filter="sf_build" name="Syborg iMaker Config" purpose="development" class="config" introduced="^3">
+<unit bldFile="/os/deviceplatformrelease/foundation_system/sf_config/rombuild/syborg/group"/>
+</component>
+<component id="rombuild_zoom2" filter="sf_build" name="Zoom2 iMaker Config" purpose="development" class="config" introduced="^3">
+<unit bldFile="/os/deviceplatformrelease/foundation_system/sf_config/rombuild/zoom2/group"/>
+</component>
+</collection>
+<collection id="deviceplatformrelease_info" name="Device Platform Release Info" level="top">
+<component id="deviceplatformrelease_metadata" name="Device Platform Release Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="osrndtools" level="services" tech-domain="to" name="OS R&D tools" levels="fw trace">
+<collection id="stif" name="STIF" level="fw">
+<component id="stif_plat" filter="s60" name="STIF Platform Interfaces" class="api" purpose="development">
+<unit bldFile="/os/osrndtools/stif/stif_plat/group"/>
+</component>
+<component id="testinterface" filter="s60" name="Test Interface" purpose="development">
+<unit bldFile="/os/osrndtools/stif/testinterface/group"/>
+</component>
+<component id="testserver" filter="s60" name="Test Server" purpose="development">
+<unit bldFile="/os/osrndtools/stif/testserver/group"/>
+</component>
+<component id="testengine" filter="s60" name="Test Engine" purpose="development">
+<unit bldFile="/os/osrndtools/stif/testengine/group"/>
+</component>
+<component id="testserverstarter" filter="s60" name="Test Server Starter" purpose="development">
+<unit bldFile="/os/osrndtools/stif/testserverstarter/group"/>
+</component>
+<component id="stiftfwif" filter="s60" name="STIF Test Framework Interface" purpose="development">
+<unit bldFile="/os/osrndtools/stif/stiftfwif/group"/>
+</component>
+<component id="consoleui" filter="s60" name="Console UI" purpose="development">
+<unit bldFile="/os/osrndtools/stif/consoleui/group"/>
+</component>
+<component id="testcombiner" filter="s60" name="Test Combiner" purpose="development">
+<unit bldFile="/os/osrndtools/stif/testcombiner/group"/>
+</component>
+<component id="demomodule" filter="s60" name="Demo Module" purpose="development">
+<unit bldFile="/os/osrndtools/stif/demomodule/group"/>
+</component>
+<component id="atslogger" filter="s60" name="ATS Logger" purpose="development">
+<unit bldFile="/os/osrndtools/stif/atslogger/group"/>
+</component>
+<component id="atsinterface" filter="s60" name="ATS Interface" purpose="development">
+<unit bldFile="/os/osrndtools/stif/atsinterface/group"/>
+</component>
+<component id="testscripter" filter="s60" name="Test Scripter" purpose="development">
+<unit bldFile="/os/osrndtools/stif/testscripter/group"/>
+</component>
+<component id="suevent" filter="s60" name="SU Event" purpose="development">
+<unit bldFile="/os/osrndtools/stif/suevent/group"/>
+</component>
+<component id="stifkerneltestclassbase" filter="s60" name="STIF Kernel Test Class Base" purpose="development">
+<meta rel="config">
+<defined condition="__S60_"/>
+</meta>
+<!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
+<!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
+</component>
+<component id="stif_build" filter="s60" name="STIF Build" purpose="development">
+<!-- move exports into self-contained component. Remove this when configuration is in place-->
+<unit bldFile="/os/osrndtools/stif/group"/>
+</component>
+</collection>
+<collection id="memspy" name="Memspy" level="trace">
+<component id="memspy_plat" filter="s60" name="Memspy Platform Interfaces" class="api" purpose="development">
+<unit bldFile="/os/osrndtools/memspy/memspy_plat/group"/>
+</component>
+<component id="driver" filter="s60" name="Memspy Driver" purpose="development">
+<unit bldFile="/os/osrndtools/memspy/driver/group"/>
+</component>
+<component id="memspy_engine" filter="s60" name="Memspy Engine" purpose="development">
+<unit bldFile="/os/osrndtools/memspy/engine/group"/>
+</component>
+<component id="commandline" filter="s60" name="Memspy Command Line" purpose="development">
+<unit bldFile="/os/osrndtools/memspy/commandline/group"/>
+</component>
+<component id="console" filter="s60" name="Memspy Console" purpose="development">
+<unit bldFile="/os/osrndtools/memspy/console/group"/>
+</component>
+<component id="memspy_build" filter="s60" name="Memspy Build" purpose="development">
+<!-- move exports into self-contained component.-->
+<unit bldFile="/os/osrndtools/memspy/group"/>
+</component>
+</collection>
+<collection id="hti" name="Harmonized Test Interface" level="trace">
+<component id="hti_plat" filter="s60" name="HTI Platform Interfaces" class="api" purpose="development">
+<unit bldFile="/os/osrndtools/hti/hti_plat/group"/>
+</component>
+<component id="hticfg" filter="s60" name="HTI Config" purpose="development">
+<unit bldFile="/os/osrndtools/hti/hticfg/group"/>
+</component>
+<component id="htiautostart" filter="s60" name="HTI Autostart" purpose="development">
+<unit bldFile="/os/osrndtools/hti/htiautostart/group"/>
+</component>
+<component id="htiframework" filter="s60" name="HTI Framework" purpose="development">
+<unit bldFile="/os/osrndtools/hti/htiframework/group"/>
+</component>
+<component id="hticommplugins" filter="s60" name="HTI Communication Plugins" purpose="development" class="plugin">
+<!-- need to #include these from a single unit or separate into component at the right directory level -->
+<unit bldFile="/os/osrndtools/hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
+<unit bldFile="/os/osrndtools/hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
+<unit bldFile="/os/osrndtools/hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
+<unit bldFile="/os/osrndtools/hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
+</component>
+<component id="htiserviceplugins" filter="s60" name="HTI Service Plugins" purpose="development" class="plugin">
+<!-- need to #include these from a single unit or separate into component at the right directory level -->
+<unit bldFile="/os/osrndtools/hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
+<unit bldFile="/os/osrndtools/hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
+<unit bldFile="/os/osrndtools/hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
+<unit bldFile="/os/osrndtools/hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
+<unit bldFile="/os/osrndtools/hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
+</component>
+<component id="htifilehlp" filter="s60" name="HTI File Help" purpose="development">
+<unit bldFile="/os/osrndtools/hti/htifilehlp/group"/>
+</component>
+<component id="htiwatchdog" filter="s60" name="HTI Watchdog" purpose="development">
+<unit bldFile="/os/osrndtools/hti/htiwatchdog/group"/>
+</component>
+<component id="hti_build" filter="s60" name="HTI Build" purpose="development">
+<!-- move exports into self-contained component.-->
+<unit bldFile="/os/osrndtools/hti/group"/>
+</component>
+</collection>
+<collection id="osrndtools_info" name="OS R&D tools Info" level="trace">
+<component id="osrndtools_metadata" name="OS R&D tools Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/os/osrndtools/osrndtools_info/osrndtools_metadata/osrndtools_metadata.mrp"/>
+</component>
+</collection>
+</package>
+</layer>
+<layer id="mw" name="Middleware" levels="generic specific">
+<package id="appsupport" level="generic" tech-domain="rt" name="Generic Application Support" levels="system plugin framework server generic specific">
+<collection id="appsupport_pub" name="Generic Application Support Public Interfaces" level="specific">
+<component id="flash_viewer_framework_api" name="Flash Viewer Framework API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
+</component>
+<component id="network_status_api" name="Network Status API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_pub/network_status_api/group"/>
+</component>
+</collection>
+<collection id="appsupport_plat" name="Generic Application Support Platform Interfaces" level="specific">
+<component id="action_plugin_api" name="Action Plug-In API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/action_plugin_api/group"/>
+</component>
+<component id="application_orientation_api" name="Application Orientation API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/application_orientation_api/group"/>
+</component>
+<component id="context_access_api" name="Context Access API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/context_access_api/group"/>
+</component>
+<component id="context_framework_services_api" name="Context Framework Services API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/context_framework_services_api/group"/>
+</component>
+<component id="context_framework_client_api" name="Context Framework Client API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/context_framework_client_api/group"/>
+</component>
+<component id="context_framework_listener_api" name="Context Framework Listener API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/context_framework_listener_api/group"/>
+</component>
+<component id="context_framework_version_api" name="Context Framework Version API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/context_framework_version_api/group"/>
+</component>
+<component id="context_source_plugin_api" name="Context Source Plug-In API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/context_source_plugin_api/group"/>
+</component>
+<component id="context_source_settings_manager_api" name="Context Source Settings Manager API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/context_source_settings_manager_api/group"/>
+</component>
+<component id="context_subscription_api" name="Context Subscription API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/context_subscription_api/group"/>
+</component>
+<component id="key_event_framework_api" name="Key Event Framework API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/key_event_framework_api/group"/>
+</component>
+<component id="key_event_framework_mapper_api" name="Key Event Framework Mapper API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/key_event_framework_mapper_api/group"/>
+</component>
+<component id="media_keys_definition_api" name="Media Keys Definition API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/media_keys_definition_api/group"/>
+</component>
+<component id="ood_threshold_api" name="OOD Threshold API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/ood_threshold_api/group"/>
+</component>
+<component id="oom_monitor_api" name="OOM Monitor API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/oom_monitor_api/group"/>
+</component>
+<component id="oom_monitor_plugin_api" name="OOM Monitor Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/oom_monitor_plugin_api/group"/>
+</component>
+<component id="operation_provider_api" name="Operation Provider API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/operation_provider_api/group"/>
+</component>
+<component id="phonecmdhandler_api" name="Phone Command Handler API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/phonecmdhandler_api/group"/>
+</component>
+<component id="restore_factory_settings_api" name="Restore Factory Settings API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/restore_factory_settings_api/group"/>
+</component>
+<component id="restore_factory_settings_plugin_api" name="Restore Factory Settings Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/restore_factory_settings_plugin_api/group"/>
+</component>
+<component id="secondary_display_accfw_api" name="Secondary Display Accessory Framework API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/secondary_display_accfw_api/group"/>
+</component>
+<component id="secondary_display_startup_api" name="Secondary Display Startup API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/secondary_display_startup_api/group"/>
+</component>
+<component id="secondary_display_sysap_api" name="Secondary Display System Application API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/secondary_display_sysap_api/group"/>
+</component>
+<component id="secondary_display_system_state_api" name="Secondary Display System State API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/secondary_display_system_state_api/group"/>
+</component>
+<component id="sensor_user_setting_api" name="Sensor User Setting API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/sensor_user_setting_api/group"/>
+</component>
+<component id="startup_configuration_api" name="Startup Configuration API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/startup_configuration_api/group"/>
+</component>
+<component id="system_application_key_handler_plugin_api" name="System Application Key Handler Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/system_application_key_handler_plugin_api/group"/>
+</component>
+<component id="system_application_light_control_plugin_api" name="System Application Light Control Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/system_application_light_control_plugin_api/group"/>
+</component>
+<component id="system_application_notification_api" name="System Application Notification API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/system_application_notification_api/group"/>
+</component>
+<component id="system_application_plugin_callback_api" name="System Application Plug-in Callback API" class="api" filter="s60">
+<unit bldFile="/mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
+</component>
+<component id="flash_mmi_service_interface_custom_api" name="Flash MMI Service Interface Custom API" class="api" filter="s60,!sf_build" introduced="^2">
+<unit bldFile="/mw/appsupport/appsupport_plat/flash_mmi_service_interface_custom_api/group"/>
+</component>
+<component id="flash_netscape_plugin_command_api" name="Flash Netscape Plugin Command API" class="api" filter="s60,!sf_build" introduced="^2">
+<unit bldFile="/mw/appsupport/appsupport_plat/flash_netscape_plugin_command_api/group"/>
+</component>
+</collection>
+<collection id="contextframework" name="Context Framework" level="framework">
+<!-- the units that are commented out need to be put back when configuration is in place.
+ They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
+<component id="cfw" filter="s60" name="Context Framework">
+<meta rel="config">
+<defined condition="RD_CONTEXT_FRAMEWORK"/>
+</meta>
+<!--<unit bldFile="contextframework/cfw/group"/> -->
+</component>
+<component id="cfwplugins" filter="s60" name="Context Framework Plugins" class="plugin">
+<meta rel="config">
+<defined condition="RD_CONTEXT_FRAMEWORK"/>
+</meta>
+<!--<unit bldFile="contextframework/cfwplugins/group"/>-->
+</component>
+<component id="contextframework_build" filter="s60" name="Context Framework Build">
+<unit bldFile="/mw/appsupport/contextframework/group"/>
+</component>
+</collection>
+<collection id="coreapplicationuis" name="Core Application UIs" level="server">
+<component id="dbrecovery" filter="s60" name="Database Recovery">
+<unit bldFile="/mw/appsupport/coreapplicationuis/dbrecovery/group"/>
+</component>
+<component id="nspswsplugin" filter="s60" name="NSPS WS Plugin" class="plugin">
+<!-- No Service Power Save? Window Server? Please elaborate-->
+<unit bldFile="/mw/appsupport/coreapplicationuis/nspswsplugin/group"/>
+</component>
+<component id="rfs" filter="s60" name="Restore Factory Settings">
+<unit bldFile="/mw/appsupport/coreapplicationuis/rfs/group"/>
+</component>
+<component id="rfsplugins" filter="s60" name="Restore Factory Settings Plugins" class="plugin">
+<unit bldFile="/mw/appsupport/coreapplicationuis/rfsplugins/group"/>
+</component>
+<component id="sysap" filter="s60" name="System Application">
+<unit bldFile="/mw/appsupport/coreapplicationuis/sysap/group"/>
+</component>
+<component id="variatedsettings" filter="s60" name="Variated Settings" class="config">
+<unit bldFile="/mw/appsupport/coreapplicationuis/variatedsettings/group"/>
+</component>
+<component id="accfwuinotifier" filter="s60" name="Accessory Framework UI Notifier" class="plugin">
+<unit bldFile="/mw/appsupport/coreapplicationuis/accfwuinotifier/group"/>
+</component>
+<component id="kefmapper" filter="s60" name="Key Event Framework">
+<unit bldFile="/mw/appsupport/coreapplicationuis/kefmapper/group"/>
+</component>
+<component id="advancedtspcontroller" filter="s60" name="Advanced TSP Controller">
+<unit bldFile="/mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
+</component>
+<component id="powersaveutilities" filter="s60" name="Power Save Utilities">
+<unit bldFile="/mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
+</component>
+<component id="gsserverenginestub" filter="s60" name="GS Server Engine Stub" deprecated="^4">
+<unit bldFile="/mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
+</component>
+<component id="gsserverengine" filter="s60" name="GS Server Engine" deprecated="^4">
+<unit bldFile="/mw/appsupport/coreapplicationuis/gsserverengine/group"/>
+</component>
+<component id="sensordatacompensatorplugin" filter="s60" name="Sensor Data Compensator Plugin" class="plugin">
+<unit bldFile="/mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/group"/>
+</component>
+<component id="atcmdplugin" name="AT Command Plugin" class="plugin" filter="s60,!oem_build">
+<unit bldFile="/mw/appsupport/coreapplicationuis/atcmdplugin/group"/>
+</component>
+</collection>
+<collection id="flashliteapi_3_1" name="Flash Lite API 3.1" level="specific">
+<!-- collection is really a component. Move down a directory -->
+<component id="flashliteapi_3_1_build" name="Flash Lite API Build" filter="s60" introduced="^2">
+<unit base="/mw/appsupport/flashliteapi_3_1/group"/>
+</component>
+</collection>
+<collection id="mediakeys" name="Media Keys" level="plugin">
+<!-- collection is really a component. Move down a directory -->
+<component id="mediakeys_build" filter="s60" name="Media Keys Build">
+<unit bldFile="/mw/appsupport/mediakeys/group"/>
+</component>
+</collection>
+<collection id="startupservices" name="Startup Services" level="system">
+<component id="splashscreen" filter="s60" name="Splash Screen">
+<unit bldFile="/mw/appsupport/startupservices/splashscreen/group"/>
+</component>
+<component id="startupanimation" filter="s60" name="Startup Animation">
+<unit bldFile="/mw/appsupport/startupservices/startupanimation/group"/>
+</component>
+<component id="startup" name="Startup Application" filter="s60">
+<unit bldFile="/mw/appsupport/startupservices/startup/group"/>
+</component>
+</collection>
+<collection id="sysresmonitoring" name="System Resource Monitoring" level="system">
+<component id="oodmonitor" filter="s60" name="OOD Monitor" introduced="7.0s">
+<unit bldFile="/mw/appsupport/sysresmonitoring/oodmonitor/group"/>
+</component>
+<component id="oommonitor" filter="s60" name="OOM Monitor" introduced="7.0s">
+<unit bldFile="/mw/appsupport/sysresmonitoring/oommonitor/group"/>
+</component>
+</collection>
+<collection id="systemsettings" name="System Settings" level="system">
+<component id="gssensorplugin" filter="s60" name="GS Sensor Plugin" class="plugin">
+<unit bldFile="/mw/appsupport/systemsettings/gssensorplugin/group"/>
+</component>
+<component id="gsaccessoryplugin" filter="s60" name="GS Accessory Plugin" class="plugin">
+<unit bldFile="/mw/appsupport/systemsettings/gsaccessoryplugin/group"/>
+</component>
+</collection>
+<collection id="filehandling" name="File Handling" level="server">
+<component id="fileconverterfw" name="File Converter Framework" purpose="optional">
+<unit bldFile="/mw/appsupport/filehandling/fileconverterfw/group" mrp="/mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
+</component>
+<component id="htmltorichtextconverter" name="HTML to RichText Converter" introduced="7.0" purpose="optional" class="plugin">
+<unit bldFile="/mw/appsupport/filehandling/htmltorichtextconverter/group" mrp="/mw/appsupport/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.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">
+<component id="hwresourcemgruiplugin" name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" class="plugin" deprecated="^4">
+<unit bldFile="/mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="/mw/appsupport/hwresourceadaptation/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"/>
+</component>
+<component id="alarmservertest" name="Alarm Server Test" deprecated="^3" introduced="8.1" purpose="development">
+<unit bldFile="/mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="/mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
+</component>
+
+<component id="appservicesdocs" name="Application Services Documentation" purpose="development" class="doc">
+<unit mrp="/mw/appsupport/commonappservices/appservicesdocs/app-services_documentation.mrp"/>
+</component>
+<component id="backuprestorenotification" name="Backup Restore Notification" introduced="8.1" purpose="optional">
+<unit bldFile="/mw/appsupport/commonappservices/backuprestorenotification/group" mrp="/mw/appsupport/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
+</component>
+</collection>
+<collection id="tzservices" name="Time Zone Services" level="plugin">
+<component id="tzserver" name="Time Zone Server" introduced="9.1" purpose="optional">
+<unit bldFile="/mw/appsupport/tzservices/tzserver/group" mrp="/mw/appsupport/tzservices/tzserver/group/app-services_tz.mrp"/>
+</component>
+<component id="tzloc" name="Time Zone Localization" introduced="9.1" purpose="optional">
+<unit bldFile="/mw/appsupport/tzservices/tzloc/group" mrp="/mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
+</component>
+<component id="tzlocrscfactory" name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
+<unit bldFile="/mw/appsupport/tzservices/tzlocrscfactory/group" mrp="/mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
+</component>
+<component id="tzdatabase" name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
+<unit bldFile="/mw/appsupport/tzservices/tzdatabase/group" mrp="/mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
+</component>
+</collection>
+<collection id="contenthandling" name="Content Handling" level="plugin">
+<component id="webrecognisers" name="Web Recognisers" purpose="optional" class="plugin">
+<unit bldFile="/mw/appsupport/contenthandling/webrecognisers/group" mrp="/mw/appsupport/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
+</component>
+</collection>
+<collection id="openenvutils" name="Open Environment Utilities" level="specific">
+<component id="commandshell" name="Command Shell" introduced="^3" purpose="development">
+<unit bldFile="/mw/appsupport/openenvutils/commandshell/group" mrp="/mw/appsupport/openenvutils/commandshell/group/oetools_zsh.mrp"/>
+</component>
+<component id="telnetserver" name="Telnet Server" introduced="^3" purpose="development">
+<unit bldFile="/mw/appsupport/openenvutils/telnetserver/group" mrp="/mw/appsupport/openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
+</component>
+</collection>
+<collection id="printingsupport" name="Printing Support" level="generic">
+<component id="printinguisupport" name="Printing UI Support" purpose="optional" introduced="^2" deprecated="^3">
+<unit bldFile="/mw/appsupport/printingsupport/printinguisupport/group" mrp="/mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
+</component>
+</collection>
+<collection id="appfw" name="Application Framework" level="framework">
+<component id="apparchitecture" name="Application Architecture" purpose="mandatory">
+<unit bldFile="/mw/appsupport/appfw/apparchitecture/group" mrp="/mw/appsupport/appfw/apparchitecture/group/app-framework_apparc.mrp"/>
+</component>
+<component id="viewserver" name="View Server" introduced="6.0" purpose="mandatory">
+<unit bldFile="/mw/appsupport/appfw/viewserver/group" mrp="/mw/appsupport/appfw/viewserver/group/app-framework_viewsrv.mrp"/>
+</component>
+
+</collection>
+<collection id="applaunchservices" name="Application Launch Services" level="generic">
+<component id="aftermarketappstarter" name="After Market Application Starter" introduced="^3" purpose="optional">
+<unit bldFile="/mw/appsupport/applaunchservices/aftermarketappstarter/group" mrp="/mw/appsupport/applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
+</component>
+<component id="applaunchplugins" name="Application Launch Plugins" introduced="^3" purpose="optional">
+<unit bldFile="/mw/appsupport/applaunchservices/applaunchplugins/group" mrp="/mw/appsupport/applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
+</component>
+</collection>
+<collection id="tzpcside" name="Time Zone PC Side" level="plugin">
+<component id="tzcompiler" name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config" target="desktop">
+<unit bldFile="/mw/appsupport/tzpcside/tzcompiler/group" mrp="/mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
+</component>
+</collection>
+<collection id="appsupport_info" name="Generic Application Support Info" level="specific">
+<component id="appsupport_metadata" name="Generic Application Support Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="securitysrv" level="generic" tech-domain="se" name="Security Services" levels="plugin framework server generic specific">
+<collection id="secsrv_plat" name="Security Services Platform Interfaces" level="specific">
+<component id="cms_api" name="CMS API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/cms_api/group"/>
+</component>
+<component id="pkcs12_parser_api" name="PKCS12 Parser API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/pkcs12_parser_api/group"/>
+</component>
+<component id="java_utils_api" name="Java Utils API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/java_utils_api/group"/>
+</component>
+<component id="wim_cert_api" name="WIM Cert API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/wim_cert_api/group"/>
+</component>
+<component id="device_key_store_encryption_plugin_api" name="Device Key Store Encryption Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/device_key_store_encryption_plugin_api/group"/>
+</component>
+<component id="x509certnameparser_api" name="X.509 Certificate Name Parser API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
+</component>
+<component id="remote_lock_api" name="Remote Lock API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
+</component>
+<component id="pkidialog_api" name="PKI Dialog API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
+</component>
+<component id="provisioning_api" name="Provisioning API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/provisioning_api/group"/>
+</component>
+<component id="keyguard_configuration_api" name="Keyguard Configuration API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/keyguard_configuration_api/group"/>
+</component>
+<component id="keylock_policy_api" name="Keylock Policy API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/keylock_policy_api/group"/>
+</component>
+<component id="security_code_ui_api" name="Security Code UI API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
+</component>
+<component id="gba_api" name="GBA API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/gba_api/group"/>
+</component>
+<component id="keyguard_access_api" name="Keyguard Access API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/keyguard_access_api/group"/>
+</component>
+<component id="devicelock_access_api" name="Device Lock Access API" class="api" filter="s60">
+<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">
+<unit bldFile="/mw/securitysrv/secsrv_plat/devencadaptation_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>
+<collection id="cms" name="Certificate Management Service" level="server">
+<!-- collection is really a component. Need to move down a directory-->
+<component id="cms_build" filter="s60" name="CMS" introduced="^3">
+<unit bldFile="/mw/securitysrv/cms/group"/>
+</component>
+</collection>
+<collection id="pkiutilities" name="PKI Utilities" level="plugin">
+<component id="x509certnameparser" filter="s60" name="X.509 Certificate Name Parser">
+<unit bldFile="/mw/securitysrv/pkiutilities/x509certnameparser/group"/>
+</component>
+<component id="pkcs12" filter="s60" name="PKCS #12">
+<unit bldFile="/mw/securitysrv/pkiutilities/pkcs12/group"/>
+</component>
+<component id="certmanui" filter="s60" name="Certificate Management UI">
+<unit bldFile="/mw/securitysrv/pkiutilities/certmanui/group"/>
+</component>
+<component id="ctsecuritydialogs" filter="s60" name="Crypto Token Security Dialogs">
+<unit bldFile="/mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
+</component>
+<component id="certsaver" filter="s60" name="Certificate Saver">
+<unit bldFile="/mw/securitysrv/pkiutilities/certsaver/group"/>
+</component>
+<component id="secmodui" filter="s60" name="Security Module UI">
+<unit bldFile="/mw/securitysrv/pkiutilities/secmodui/group"/>
+</component>
+<component id="devicetoken" filter="s60" name="Device Token">
+<unit bldFile="/mw/securitysrv/pkiutilities/devicetoken/group"/>
+</component>
+<component id="certificates" filter="s60" name="Certificates">
+<unit bldFile="/mw/securitysrv/pkiutilities/Certificates/group" filter="sf_build"/>
+</component>
+<component id="pkiutilities_build" filter="s60" name="PKI Utilities Build">
+<!-- need to split this into the above components -->
+<unit bldFile="/mw/securitysrv/pkiutilities/group"/>
+</component>
+<component id="ocsp" name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
+<unit bldFile="/mw/securitysrv/pkiutilities/ocsp/group" mrp="/mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
+</component>
+</collection>
+<collection id="wim" name="Wireless Identity Module" level="framework">
+<!-- collection is really a component. Need to move down a directory-->
+<component id="wim_build" filter="s60" name="WIM Build">
+<unit bldFile="/mw/securitysrv/wim/group"/>
+</component>
+</collection>
+<collection id="remotelock" name="Remote Lock" level="generic">
+<!-- collection is really a component. Need to move down a directory-->
+<component id="remotelock_build" filter="s60" name="Remote Lock Build">
+<unit bldFile="/mw/securitysrv/remotelock/group"/>
+</component>
+</collection>
+<collection id="securitydialogs" name="Security Dialogs" level="specific">
+<component id="keylockpolicyapi" filter="s60" name="Keylock Policy API">
+<unit bldFile="/mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
+</component>
+<component id="autolock" name="Autolock" filter="s60">
+<unit bldFile="/mw/securitysrv/securitydialogs/autolock/group"/>
+</component>
+<component id="secui" filter="s60" name="Security UI">
+<unit bldFile="/mw/securitysrv/securitydialogs/secui/group"/>
+</component>
+<component id="securitynotifier" filter="s60" name="Security Notifier">
+<unit bldFile="/mw/securitysrv/securitydialogs/securitynotifier/group"/>
+</component>
+<component id="lockclient" filter="s60" name="Lock Client" introduced="^4">
+<unit bldFile="/mw/securitysrv/securitydialogs/lockclient/group" qt:proFile="lockclient.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="lockapp" filter="s60" name="Lock Application" introduced="^3">
+<unit bldFile="/mw/securitysrv/securitydialogs/lockapp/group"/>
+</component>
+<component id="secuinotifications" name="Security UI Notifications" introduced="^4" filter="s60">
+<unit bldFile="/mw/securitysrv/securitydialogs/secuinotifications" qt:proFile="secuinotifications.pro" qt:qmakeArgs="-r"/>
+</component>
+</collection>
+<collection id="boottimeintegritycheck" name="Boot Time Integrity Check" level="plugin">
+<!-- collection is really a component. Need to move down a directory-->
+<component id="boottimeintegritycheck_build" filter="s60" name="Boot Time Integrity Check Build">
+<unit bldFile="/mw/securitysrv/boottimeintegritycheck/group"/>
+</component>
+</collection>
+<collection id="gba" name="Generic Bootstrapping Architecture" level="server">
+<component id="uicc" filter="s60" name="UICC" class="plugin" introduced="^2">
+<unit bldFile="/mw/securitysrv/gba/uicc/group"/>
+</component>
+<component id="gbaserver" filter="s60" name="GBA Server" introduced="^2">
+<unit bldFile="/mw/securitysrv/gba/gbaserver/group"/>
+</component>
+<component id="gbaapi" filter="s60" name="GBA API" introduced="^2">
+<unit bldFile="/mw/securitysrv/gba/gbaapi/group"/>
+</component>
+<component id="gbafilter" filter="s60" name="GBA HTTP Filter" class="plugin" introduced="^2">
+<unit bldFile="/mw/securitysrv/gba/gbafilter/group"/>
+</component>
+<component id="gba_build" filter="s60" name="Generic Boot Architecture Build" introduced="^2">
+<!-- need to split this into the above components, or remove #includes and make this GBA ROM -->
+<unit bldFile="/mw/securitysrv/gba/group"/>
+</component>
+</collection>
+<collection id="devencdiskutils" name="Device Encryption Disk Utils" level="server">
+<component id="devenccommonutils" filter="s60" name="Device Encryption Common Utils" introduced="^3">
+<unit bldFile="/mw/securitysrv/devencdiskutils/DevEncCommonUtils/group"/>
+</component>
+<component id="devencrfsplugin" filter="s60" name="Device Encryption RFS Plugin" introduced="^3" class="plugin">
+<unit bldFile="/mw/securitysrv/devencdiskutils/DevEncRfsPlugin/group"/>
+</component>
+<component id="pk5recognizer" filter="s60" name="Device Encryption Pk5 Recognizer" introduced="^3" class="plugin">
+<unit bldFile="/mw/securitysrv/devencdiskutils/Pk5Recognizer/group"/>
+</component>
+<component id="devencstarter" filter="s60" name="Device Encryption Starter" introduced="^3" class="plugin">
+<unit bldFile="/mw/securitysrv/devencdiskutils/DevEncStarter/group"/>
+</component>
+<component id="devencdiskutils_build" filter="s60" name="Device Encryption Disk Utils Build" introduced="^3">
+<!-- need to split this into the above components, or remove #includes and make this a ROM component-->
+<unit bldFile="/mw/securitysrv/devencdiskutils/group"/>
+</component>
+</collection>
+<collection id="securitysrv_info" name="Security Services Info" level="specific">
+
+<component id="securitysrv_metadata" name="Security Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="drm" level="generic" tech-domain="se" name="DRM" levels="plugin framework server generic specific">
+<collection id="drm_plat" name="DRM Platform Interfaces" level="specific">
+<component id="roap_api" name="ROAP API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/roap_api/group"/>
+</component>
+<component id="drm_common_api" name="DRM Common API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/drm_common_api/group"/>
+</component>
+<component id="drm_rights_api" name="DRM Rights API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/drm_rights_api/group"/>
+</component>
+<component id="drm_legacy_api" name="DRM Legacy API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/drm_legacy_api/group"/>
+</component>
+<component id="dcf_repository_api" name="DCF Repository API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/dcf_repository_api/group"/>
+</component>
+<component id="drm_service_api" name="DRM Service API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/drm_service_api/group"/>
+</component>
+<component id="drm_secondary_display_api" name="DRM Secondary Display API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/drm_secondary_display_api/group"/>
+</component>
+<component id="drm_license_manager_api" name="DRM License Manager API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/drm_license_manager_api/group"/>
+</component>
+<component id="drm_utility_api" name="DRM Utility API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/drm_utility_api/group"/>
+</component>
+<component id="drm_agents_api" name="DRM Agents API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/drm_agents_api/group"/>
+</component>
+<component id="wmdrm_core_api" name="WM DRM Core API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/wmdrm_core_api/group"/>
+</component>
+<component id="wmdrm_access_api" name="WM DRM Access API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/wmdrm_access_api/group"/>
+</component>
+<component id="wmdrm_ota_access_api" name="WM DRM OTA Access API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/wmdrm_ota_access_api/group"/>
+</component>
+<component id="camese_utility_api" name="Camese Utility API" class="api" filter="s60">
+<meta rel="config">
+<defined condition="__WINDOWS_MEDIA_DRM"/>
+</meta>
+<unit bldFile="/mw/drm/drm_plat/camese_utility_api/group"/>
+</component>
+<component id="camese_framework_api" name="Camese Framework API" class="api" filter="s60">
+<meta rel="config">
+<defined condition="__WINDOWS_MEDIA_DRM"/>
+</meta>
+<unit bldFile="/mw/drm/drm_plat/camese_framework_api/group"/>
+</component>
+</collection>
+<collection id="drm_pub" name="DRM Public Interfaces" level="specific">
+<component id="drm_helper_api" name="DRM Helper API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_pub/drm_helper_api/group"/>
+</component>
+<component id="oma_drm_caf_agent_api" name="OMA DRM CAF Agent API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_pub/oma_drm_caf_agent_api/group"/>
+</component>
+<component id="drm_license_checker_api" name="DRM License Checker API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_pub/drm_license_checker_api/group"/>
+</component>
+</collection>
+<collection id="commondrm" name="Common DRM" level="generic">
+<!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
+<component id="drmencryptor" filter="s60" name="DRM Encryptor">
+<!-- this should have its own bld.inf or be removed as a component -->
+</component>
+<component id="drmsettingsplugin" filter="s60" name="DRM Settings Plugin" class="plugin">
+<!-- this should have its own bld.inf or be removed as a component -->
+</component>
+<component id="drmrightsmanagerui" filter="s60" name="DRM Rights Manager UI">
+<unit bldFile="/mw/drm/commondrm/drmrightsmanagerui/help/group"/>
+</component>
+<component id="drmutility" filter="s60" name="DRM Utility">
+<unit bldFile="/mw/drm/commondrm/drmutility/group"/>
+</component>
+<component id="drmserviceapiwrapper" filter="s60" name="DRM Service API Wrapper">
+<unit bldFile="/mw/drm/commondrm/drmserviceapiwrapper/group"/>
+</component>
+<component id="drmrightsstoringlocation" filter="s60" name="DRM Rights Storing Location">
+<unit bldFile="/mw/drm/commondrm/drmrightsstoringlocation/group"/>
+</component>
+<component id="commondrm_build" filter="s60" name="Common DRM Build">
+<!-- should be split into the above files, or them collapsed into a single component -->
+<unit bldFile="/mw/drm/commondrm/group"/>
+</component>
+</collection>
+<collection id="omadrm" name="OMA DRM" level="server">
+<!-- collection is really a component. Move down a directory -->
+<component id="omadrm_build" filter="s60" name="OMA DRM Build">
+<unit bldFile="/mw/drm/omadrm/group"/>
+</component>
+<component id="foundationcerts" filter="sf_build" name="Foundation Certificates">
+<unit bldFile="/mw/drm/omadrm/foundationcerts/group"/>
+</component>
+</collection>
+<collection id="wmdrm" name="Windows Media DRM" level="framework">
+<!-- collection is really a component. Move down a directory -->
+<component id="wmdrm_build" filter="s60" name="WM DRM Build">
+<unit bldFile="/mw/drm/wmdrm/group"/>
+</component>
+</collection>
+<collection id="drm_info" name="DRM Info" level="specific">
+
+</collection>
+</package>
+<package id="locationsrv" level="specific" tech-domain="lo" name="Location Services" levels="plugin fw server if">
+<collection id="locsrv_pub" name="Location Services Public Interfaces" level="if">
+<component id="landmarks_search_api" name="Landmarks Search API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
+</component>
+<component id="landmarks_api" name="Landmarks API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_pub/landmarks_api/group"/>
+</component>
+<component id="landmarks_database_management_api" name="Landmarks Database Management API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_pub/landmarks_database_management_api/group"/>
+</component>
+<component id="location_triggering_api" name="Location Triggering API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_pub/location_triggering_api/group"/>
+</component>
+<component id="blid_application_satellite_info_api" name="BLID Application Satellite Info API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/group"/>
+</component>
+</collection>
+<collection id="locsrv_plat" name="Location Services Platform Interfaces" level="if">
+<component id="geocoding_api" name="Geocoding API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/geocoding_api/group"/>
+</component>
+<component id="landmarks_category_definition_api" name="Landmarks Category Definition API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
+</component>
+<component id="supl_settings_api" name="SUPL Settings API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
+</component>
+<component id="np_proxy_configuration_api" name="NP Proxy Configuration API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/np_proxy_configuration_api/group"/>
+</component>
+<component id="supl_terminal_initiation_api" name="SUPL Terminal Initiation API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/group"/>
+</component>
+<component id="supl_network_initiation_api" name="SUPL Network Initiation API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/supl_network_initiation_api/group"/>
+</component>
+<component id="oma_supl_configuration_parameter_api" name="OMA SUPL Configuration Parameter API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/oma_supl_configuration_parameter_api/group"/>
+</component>
+<component id="location_triggering_management_api" name="Location Triggering Management API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/location_triggering_management_api/group"/>
+</component>
+<component id="location_triggering_status_information_api" name="Location Triggering Status Information API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/location_triggering_status_information_api/group"/>
+</component>
+<component id="oma_supl_asn_codec_plugin_api" name="OMA SUPL ASN Codec Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
+</component>
+<component id="query_and_notification_api" name="Query and Notification API" class="api" filter="s60" introduced="^3">
+<unit bldFile="/mw/locationsrv/locsrv_plat/query_and_notification_api/group"/>
+</component>
+<component id="location_local_variation_api" name="Location Local Variation API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/location_local_variation_api/group"/>
+</component>
+</collection>
+<collection id="genericpositioningplugins" name="Generic Positioning Plugins" level="plugin">
+<component id="locationnpppsy" filter="s60" name="Location Positioning Proxy PSY" class="plugin">
+<unit bldFile="/mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
+</component>
+<component id="locationsuplpsy" filter="s60" name="Location SUPL PSY" class="plugin" introduced="^3">
+<unit bldFile="/mw/locationsrv/genericpositioningplugins/locationsuplpsy/group"/>
+</component>
+<component id="genericpositioningplugins_build" filter="s60" name="Generic Positioning Plugins Build">
+<!-- need to break this up into the other components -->
+<unit bldFile="/mw/locationsrv/genericpositioningplugins/group"/>
+</component>
+</collection>
+<collection id="landmarks" name="Landmarks" level="server">
+<component id="locationlandmarks" filter="s60" name="Location Landmarks">
+<unit bldFile="/mw/locationsrv/landmarks/locationlandmarks/group"/>
+</component>
+</collection>
+<collection id="locationsystemui" name="Location System UI" level="if">
+<component id="locationsysui" filter="s60" name="Location System UI">
+<unit bldFile="/mw/locationsrv/locationsystemui/locationsysui/group"/>
+</component>
+</collection>
+<collection id="supl" name="SUPL" level="fw">
+<component id="locationsuplfw" filter="s60" name="Location SUPL Framework">
+<unit bldFile="/mw/locationsrv/supl/locationsuplfw/group"/>
+</component>
+<component id="locationomasuplprotocolhandler" filter="s60" name="OMA SUPL Protocol Handler">
+<unit bldFile="/mw/locationsrv/supl/locationomasuplprotocolhandler/group"/>
+</component>
+<component id="supltiapiimplementation" filter="s60" name="SUPL TI API Implementation" introduced="^3">
+<unit bldFile="/mw/locationsrv/supl/supltiapiimplementation/group"/>
+</component>
+</collection>
+<collection id="locationtriggering" name="Location Triggering" level="server">
+<component id="ltlogger" filter="s60" name="LT Logger">
+<unit bldFile="/mw/locationsrv/locationtriggering/ltlogger/group"/>
+</component>
+<component id="ltclientlib" filter="s60" name="LT Client Library">
+<unit bldFile="/mw/locationsrv/locationtriggering/ltclientlib/group"/>
+</component>
+<component id="ltmanagementlib" filter="s60" name="LT Management Library">
+<unit bldFile="/mw/locationsrv/locationtriggering/ltmanagementlib/group"/>
+</component>
+<component id="ltcontainer" filter="s60" name="LT Container">
+<unit bldFile="/mw/locationsrv/locationtriggering/ltcontainer/group"/>
+</component>
+<component id="ltserver" filter="s60" name="LT Server">
+<unit bldFile="/mw/locationsrv/locationtriggering/ltserver/group"/>
+</component>
+<component id="ltstrategypluginapi" filter="s60" name="LT Strategy Plugin API">
+<unit bldFile="/mw/locationsrv/locationtriggering/ltstrategypluginapi/group"/>
+</component>
+<component id="ltstrategyengine" filter="s60" name="LT Strategy Engine">
+<unit bldFile="/mw/locationsrv/locationtriggering/ltstrategyengine/group"/>
+</component>
+<component id="ltmovementdetectionpluginapi" filter="s60" name="Movement Detection Plugin API">
+<unit bldFile="/mw/locationsrv/locationtriggering/ltmovementdetectionpluginapi/group"/>
+</component>
+<component id="ltcellidmovementdetector" filter="s60" name="Cell ID Movement Detector">
+<unit bldFile="/mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/>
+</component>
+<component id="ltcontextsourceplugin" filter="s60" name="LT Context Source Plugin" class="plugin" introduced="^3">
+<unit bldFile="/mw/locationsrv/locationtriggering/ltcontextsourceplugin/group"/>
+</component>
+<component id="locationtriggering_build" filter="s60" name="Location Triggering Build">
+<!-- should remove #include from this and maybe put exports in the above components -->
+<unit bldFile="/mw/locationsrv/locationtriggering/group"/>
+</component>
+</collection>
+</package>
+<package id="accesssec" level="generic" tech-domain="dc"/>
+<package id="ipconnmgmt" level="generic" tech-domain="dc" name="IP Connectivity Management" levels="plugin framework server utils api">
+<collection id="ipcm_plat" name="IP Connectivity Management Platform Interfaces" level="api">
+<component id="access_point_engine_misc_api" name="Access Point Engine Misc API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/access_point_engine_misc_api/group"/>
+</component>
+<component id="bearer_settings_plugin_api" name="Bearer Settings Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/bearer_settings_plugin_api/group"/>
+</component>
+<component id="commsdat_wlan_api" name="CommsDat WLAN API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/commsdat_wlan_api/group"/>
+</component>
+<component id="connection_monitor_extension_api" name="Connection Monitor Extension API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/connection_monitor_extension_api/group"/>
+</component>
+<component id="connection_ui_utilities_api" name="Connection UI Utilities API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/connection_ui_utilities_api/group"/>
+</component>
+<component id="disconnect_dialog_api" name="Disconnect Dialog API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/disconnect_dialog_api/group"/>
+</component>
+<component id="disconnect_dialog_disable_api" name="Disconnect Dialog Disable API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/disconnect_dialog_disable_api/group"/>
+</component>
+<component id="extended_connection_settings_api" name="Extended Connection Settings API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/extended_connection_settings_api/group"/>
+</component>
+<component id="mpm_default_connection_api" name="MPM Default Connection API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/mpm_default_connection_api/group"/>
+</component>
+<component id="pdpcontextmanager2_reset_factory_settings_api" name="PDP Context Manager 2 Reset Factory Settings API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_reset_factory_settings_api/group"/>
+</component>
+<component id="pdpcontextmanager2_settings_api" name="PDP Context Manager 2 Settings API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_settings_api/group"/>
+</component>
+<component id="mpm_connect_screen_api" name="MPM Connect Screen API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/mpm_connect_screen_api/group"/>
+</component>
+</collection>
+<collection id="ipcm_pub" name="IP Connectivity Management Public Interfaces" level="api">
+<component id="connection_settings_api" name="Connection Settings API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_pub/connection_settings_api/group"/>
+</component>
+<component id="access_point_engine_api" name="Access Point Engine API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_pub/access_point_engine_api/group"/>
+</component>
+<component id="access_point_settings_handler_api" name="Access Point Settings Handler API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_pub/access_point_settings_handler_api/group"/>
+</component>
+<component id="data_connection_log_counters_api" name="Data Connection Log Counters API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_pub/data_connection_log_counters_api/group"/>
+</component>
+<component id="connection_monitor_server_api" name="Connection Monitor Server API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_pub/connection_monitor_server_api/group"/>
+</component>
+<component id="connection_settings_ui_api" name="Connection Settings UI API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_pub/connection_settings_ui_api/group"/>
+</component>
+<component id="agent_dialog_api" name="Agent Dialog API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_pub/agent_dialog_api/group"/>
+</component>
+<component id="extendedconnpref_api" name="Extended Connection Preferences API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_pub/extendedconnpref_api/group"/>
+</component>
+</collection>
+<collection id="accesspointcontrol" name="Access Point Control" level="plugin">
+<component id="apcontrollistplugin" filter="s60" name="Access Point Control List Plugin" class="plugin" introduced="^2">
+<unit bldFile="/mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
+</component>
+</collection>
+<collection id="alwayson_net_plugin" name="Always Online Net Plugin" level="server">
+<component id="pdpcontextmanager2" filter="s60" name="PDP Context Manager 2">
+<unit bldFile="/mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
+</component>
+</collection>
+<collection id="apengine" name="Access Point Engine" level="framework">
+<component id="apeng" filter="s60" name="Access Point Engine">
+<unit bldFile="/mw/ipconnmgmt/apengine/apeng/group"/>
+</component>
+<component id="apsettingshandlerui" filter="s60" name="Access Point Settings Handler UI">
+<unit bldFile="/mw/ipconnmgmt/apengine/apsettingshandlerui/group"/>
+</component>
+</collection>
+<collection id="bearermanagement" name="Bearer Management" level="framework">
+<component id="mpm" filter="s60" name="Mobility Policy Manager">
+<unit bldFile="/mw/ipconnmgmt/bearermanagement/mpm/group"/>
+</component>
+<component id="extendedconnpref" filter="s60" name="Extended Connection Preferences">
+<unit bldFile="/mw/ipconnmgmt/bearermanagement/extendedconnpref/group"/>
+</component>
+<component id="s60mcpr" filter="s60" name="S60 Meta-Connection Provider" class="plugin">
+<unit bldFile="/mw/ipconnmgmt/bearermanagement/S60MCPR/group"/>
+</component>
+</collection>
+<collection id="cmmanager" name="Connection Method Manager" level="framework">
+<component id="cmmgr" filter="s60" name="CM Manager">
+<unit bldFile="/mw/ipconnmgmt/cmmanager/cmmgr/group"/>
+</component>
+</collection>
+<collection id="connectionmonitoring" name="Connection Monitoring" level="server">
+<component id="connectionmonitorui" filter="s60" name="Connection Monitor UI">
+<unit bldFile="/mw/ipconnmgmt/connectionmonitoring/connectionmonitorui/group"/>
+</component>
+<component id="connmon" filter="s60" name="Connection Monitor">
+<!-- either split into two components, or #include from a common bld.inf -->
+<unit bldFile="/mw/ipconnmgmt/connectionmonitoring/connmon/connectionmonitor/group"/>
+<unit bldFile="/mw/ipconnmgmt/connectionmonitoring/connmon/dataconnectionlogger/group"/>
+</component>
+<component id="connmonext" filter="s60" name="Connection Monitor Extension API">
+<unit bldFile="/mw/ipconnmgmt/connectionmonitoring/connmonext/group"/>
+</component>
+</collection>
+<collection id="connectionutilities" name="Connection Utilities" level="utils">
+<component id="connectiondialogs" filter="s60" name="Connection Dialogs">
+<unit bldFile="/mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/>
+</component>
+</collection>
+<collection id="dbcreator" name="DB Creator" level="utils">
+<component id="commsdatcreator" filter="s60" name="Comms Database Creator" introduced="9.3">
+<unit bldFile="/mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
+</component>
+<component id="commsdatcreatorrfsplugin" filter="s60" name="Comms Database Creator RFS Plugin" class="plugin" introduced="9.3">
+<meta rel="config">
+<not-defined condition="WINSCW"/>
+</meta>
+<!-- uncomment when config is turned on -->
+<!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
+</component>
+<component id="commsdatstartup" filter="s60" name="Comms Database Startup" introduced="9.3">
+<unit bldFile="/mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
+</component>
+<component id="dbcreatorexe" filter="s60" name="DB Creator" introduced="9.3">
+<unit bldFile="/mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
+</component>
+<component id="dbcreator_build" filter="s60" name="DB Creator Build" introduced="9.3">
+<!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
+<unit bldFile="/mw/ipconnmgmt/dbcreator/group"/>
+</component>
+</collection>
+<collection id="ipconnmgmt_info" name="IP Connectivity Management Info" level="api">
+<component id="ipcm_build" filter="s60" 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"/>
+</component>
+<component id="ipcm_qt_build" name="IP Connectivity Management Qt Build" introduced="^4">
+<unit bldFile="/mw/ipconnmgmt" qt:proFile="ipconnmgmt.pro" qt:qmakeArgs="-r"/>
+</component>
+</collection>
+</package>
+<package id="netprotocols" level="generic" tech-domain="dc" name="High-level Internet Protocols" levels="plugin framework server generic specific">
+<collection id="netprotocols_plat" name="High-level Internet Protocols Platform Interfaces" level="specific">
+<component id="cookie_manager_api" name="Cookie Manager API" class="api" filter="s60">
+<unit bldFile="/mw/netprotocols/netprotocols_plat/cookie_manager_api/group"/>
+</component>
+<component id="http_cache_mgr_api" name="HTTP Cache Manager API" class="api" filter="s60">
+<unit bldFile="/mw/netprotocols/netprotocols_plat/http_cache_mgr_api/group"/>
+</component>
+<component id="http_filters_api" name="HTTP Filters API" class="api" filter="s60">
+<unit bldFile="/mw/netprotocols/netprotocols_plat/http_filters_api/group"/>
+</component>
+</collection>
+<collection id="httpfilters" name="HTTP Filters" level="plugin">
+<component id="httpfiltercommon" filter="s60" name="HTTP Filter Common">
+<unit bldFile="/mw/netprotocols/httpfilters/httpfiltercommon/group"/>
+</component>
+<component id="cookie" filter="s60" name="Cookie Filter" class="plugin">
+<unit bldFile="/mw/netprotocols/httpfilters/cookie/group"/>
+</component>
+<component id="deflatefilter" filter="s60" name="Deflate Filter" class="plugin">
+<unit bldFile="/mw/netprotocols/httpfilters/deflatefilter/group"/>
+</component>
+<component id="httpfilteracceptheader" filter="s60" name="Accept Header Filter" class="plugin">
+<unit bldFile="/mw/netprotocols/httpfilters/httpfilteracceptheader/group"/>
+</component>
+<component id="httpfilterauthentication" filter="s60" name="Authentication Filter" class="plugin">
+<unit bldFile="/mw/netprotocols/httpfilters/httpfilterauthentication/group"/>
+</component>
+<component id="httpfilterconnhandler" filter="s60" name="Connection Handler Fitler" class="plugin">
+<unit bldFile="/mw/netprotocols/httpfilters/httpfilterconnhandler/group"/>
+</component>
+<component id="httpfilteriop" filter="s60" name="HTTP IOP Filter" class="plugin">
+<unit bldFile="/mw/netprotocols/httpfilters/httpfilteriop/group"/>
+</component>
+<component id="httpfilterproxy" filter="s60" name="HTTP Proxy Filter" class="plugin">
+<unit bldFile="/mw/netprotocols/httpfilters/httpfilterproxy/group"/>
+</component>
+<component id="uaproffilter" filter="s60" name="UAProf Filter" class="plugin">
+<unit bldFile="/mw/netprotocols/httpfilters/uaproffilter/group"/>
+</component>
+</collection>
+<collection id="applayerprotocols" name="Application Layer Protocols" level="server">
+<component id="httptransportfw" name="HTTP Transport Framework" introduced="6.2" purpose="optional">
+<unit bldFile="/mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="/mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
+</component>
+<component id="httpexamples" name="HTTP Examples" introduced="6.2" purpose="development">
+<unit bldFile="/mw/netprotocols/applayerprotocols/httpexamples/group" mrp="/mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
+</component>
+<component id="wappushsupport" name="WAP Push Support" introduced="6.2" purpose="optional">
+<unit bldFile="/mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="/mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
+</component>
+<component id="wapbase" name="WAP Base" introduced="6.0" purpose="optional">
+<unit bldFile="/mw/netprotocols/applayerprotocols/wapbase/Group" mrp="/mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
+</component>
+<component id="ftpengine" name="FTP Engine" introduced="6.0" purpose="optional">
+<unit bldFile="/mw/netprotocols/applayerprotocols/ftpengine/group" mrp="/mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
+</component>
+<component id="telnetengine" name="Telnet Engine" introduced="6.0" purpose="optional">
+<unit bldFile="/mw/netprotocols/applayerprotocols/telnetengine/group" mrp="/mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
+</component>
+<component id="httpserviceapi" name="HTTP Service API" introduced="TB9.2" purpose="optional">
+<unit bldFile="/mw/netprotocols/applayerprotocols/httpservice/group" mrp="/mw/netprotocols/applayerprotocols/httpservice/group/http_service.mrp"/>
+</component>
+</collection>
+<collection id="applayerpluginsandutils" name="Application Layer Plugins and Utils" level="framework">
+<component id="uripermissionservices" name="URI Permission Services" introduced="^2" purpose="optional">
+<unit bldFile="/mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="/mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
+</component>
+<component id="bookmarksupport" name="Bookmark Support" introduced="9.1" purpose="optional">
+<unit bldFile="/mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="/mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
+</component>
+<component id="httpprotocolplugins" name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" class="plugin">
+<unit bldFile="/mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="/mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
+</component>
+<component id="httptransportplugins" name="HTTP Transport Plugins" introduced="6.2" purpose="optional" class="plugin">
+<unit bldFile="/mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="/mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
+</component>
+</collection>
+<collection id="netprotocols_info" name="High-level Internet Protocols Info" level="specific">
+<component id="netprotocols_metadata" name="High-level Internet Protocols Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="ipappprotocols" level="generic" tech-domain="dc" name="IP App Protocols" levels="plugin conn server if">
+<collection id="ipappprotocols_plat" name="IP App Protocols Platform Interfaces" level="if">
+<component id="srtp_api" name="SRTP API" class="api" filter="s60">
+<unit bldFile="/mw/ipappprotocols/ipappprotocols_plat/srtp_api/group"/>
+</component>
+<component id="rtprtcp_api" name="RTP/RTCP API" class="api" filter="s60">
+<unit bldFile="/mw/ipappprotocols/ipappprotocols_plat/rtprtcp_api/group"/>
+</component>
+</collection>
+<collection id="rtp" name="RTP" level="server">
+<component id="srtpstack" filter="s60" name="SRTP Stack">
+<unit bldFile="/mw/ipappprotocols/rtp/srtpstack/group"/>
+</component>
+<component id="rtpstack" filter="s60" name="RTP Stack">
+<unit bldFile="/mw/ipappprotocols/rtp/rtpstack/group"/>
+</component>
+</collection>
+<collection id="realtimenetprots" name="Real Time Net Protocols" level="server">
+<component id="symrtp" name="RTP" introduced="9.0" purpose="optional">
+<!-- Real Time Data Protocol -->
+<unit bldFile="/mw/ipappprotocols/realtimenetprots/rtp/group" mrp="/mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
+</component>
+<component id="sipfw" name="SIP Framework" introduced="9.2" purpose="optional">
+<unit version="2" bldFile="/mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="/mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp"/>
+</component>
+</collection>
+<collection id="sipplugins" name="SIP Plugins" level="plugin">
+<component id="sippwlanplugin" filter="s60" name="SIP WLAN Plugin" class="plugin">
+<unit bldFile="/mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
+</component>
+<component id="sippsipsettingsui" filter="s60" name="SIP Settings UI" class="plugin">
+<unit bldFile="/mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
+</component>
+<component id="sippdevmgmtsipadapter" filter="s60" name="Device Management SIP Settings Adapter" class="plugin">
+<unit bldFile="/mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
+</component>
+<component id="sippsystemstatemonitor" filter="s60" name="SIP System State Monitor" class="plugin">
+<unit bldFile="/mw/ipappprotocols/sipplugins/sippsystemstatemonitor/group"/>
+</component>
+<component id="sippsipadapter" filter="s60" name="SIP Adapter" class="plugin" introduced="^3">
+<unit bldFile="/mw/ipappprotocols/sipplugins/sippsipadapter/group"/>
+</component>
+</collection>
+<collection id="sipproviderplugins" name="SIP Provider Plugins" level="conn">
+<component id="sipprovider" name="SIP Provider" introduced="^2" purpose="optional" class="plugin">
+<unit bldFile="/mw/ipappprotocols/sipproviderplugins/sipprovider/group" mrp="/mw/ipappprotocols/sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
+</component>
+</collection>
+<collection id="ipappprotocols_info" name="IP App Protocols Info" level="if">
+<component id="ipappprotocols_metadata" name="IP App Protocols Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="wirelessacc" level="specific" tech-domain="dc" name="Wireless Access" levels="framework generic ui">
+<collection id="hsfw_plat" name="HotSpot Framework Platform Interfaces" level="ui">
+<component id="hotspot_framework_client_api" name="HotSpot Framework Client API" class="api" filter="s60">
+<unit bldFile="/mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
+</component>
+<component id="internet_connectivity_test_service_api" name="Internet Connectivity Test Service API" class="api" filter="s60">
+<unit bldFile="/mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
+</component>
+<component id="internet_connectivity_test_service_settings_api" name="Internet Connectivity Test Service Settings API" class="api" filter="s60">
+<unit bldFile="/mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
+</component>
+<component id="hotspot_framework_client_plugin_api" name="HotSpot Framework Client Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
+</component>
+</collection>
+<collection id="hotspotfw" name="HotSpot Framework" level="framework">
+<component id="hsserver" filter="s60" name="HotSpot Server">
+<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
+</component>
+<component id="hsclient" filter="s60" name="HotSpot Client">
+<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
+</component>
+<component id="internetconnectivitytestservice" filter="s60" name="Internet Connectivity Test Service">
+<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+<!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
+</component>
+<component id="ictsdialogs" filter="s60" name="Internet Connectivity Test Service Dialogs" deprecated="^3">
+<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+<!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
+</component>
+<component id="hspluginforagent" filter="s60" name="HotSpot Plugin for Agent" class="plugin">
+<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+<!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
+</component>
+<component id="hsbrowser" filter="s60" name="HotSpot Browser">
+<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+<!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
+</component>
+<component id="hotspotfw_build" filter="s60" name="Hotspot Framework Build">
+<!-- should break up this bld.inf into the above components, or collapse them all into a single component -->
+<unit bldFile="/mw/wirelessacc/hotspotfw/group"/>
+</component>
+</collection>
+<collection id="wlanutilities" name="WLAN Utilities" level="generic">
+<component id="wlanutilities_build" name="WLAN Utilities Qt" introduced="^4" filter="s60">
+<!-- is this uinit needed, or is it sufficient to uncomment the units in the below components? -->
+<unit bldFile="/mw/wirelessacc/wlanutilities" qt:proFile="wlanutilities.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="wlanqtutilities" filter="s60" name="WLAN Qt Utilities" introduced="^4">
+<!--<unit bldFile="wlanutilities/wlanplugin/group" qt:proFile="wlanqtutilities.pro"/>-->
+</component>
+<component id="wlansniffer" filter="s60" name="WLAN Sniffer">
+<!--<unit bldFile="wlanutilities/wlansettingsui/group" qt:proFile="wlansniffer.pro"/>-->
+</component>
+<component id="wlanentryplugin" filter="s60" name="WLAN Entry Plugin" class="plugin">
+<!--<unit bldFile="wlanutilities/wlansniffer/group" qt:proFile="wlanentryplugin.pro"/>-->
+</component>
+<component id="wlanindicatorplugin" filter="s60" name="WLAN Indicator Plugin" class="plugin">
+<!--<unit bldFile="wlanutilities/wlanindicatorplugin/group" qt:proFile="wlanindicatorplugin.pro"/>-->
+</component>
+<component id="cpwlansettingsplugin" filter="s60" name="WLAN Settings Control Panel Plugin" class="plugin" introduced="^4">
+<!--<unit bldFile="wlanutilities/cpwlansettingsplugin/group" qt:proFile="cpwlansettingsplugin.pro"/>-->
+</component>
+</collection>
+</package>
+<package id="vpnclient" level="specific" tech-domain="dc" name="VPN Client" levels="engine ui api">
+<!-- is the !oem_build filter needed? -->
+<collection id="vpnc_plat" name="VPN Client Platform Interfaces" level="api">
+<component id="vpnapi" filter="s60" class="api" name="VPN API">
+<unit bldFile="/mw/vpnclient/vpnc_plat/vpnapi/group"/>
+</component>
+</collection>
+<collection id="vpnapiimpl" name="VPN API Implementation" level="api">
+<component id="vpnapi_impl" filter="s60" name="VPN API">
+<unit bldFile="/mw/vpnclient/vpnapiimpl/group"/>
+</component>
+</collection>
+<collection id="vpnengine" name="VPN Engine" level="engine">
+<!-- too many components in this collection.
+ Probably best to group the binaries together into larger components
+ or maybe split the collection into more reasonable groups -->
+<component id="eventmediatorapi" filter="s60" name="Event Mediator API">
+<unit bldFile="/mw/vpnclient/vpnengine/eventmediatorapi/group"/>
+</component>
+<component id="eventviewer" filter="s60" name="Event Viewer">
+<unit bldFile="/mw/vpnclient/vpnengine/eventviewer/group"/>
+</component>
+<component id="vpnins" filter="s60" name="VPN Installer">
+<unit bldFile="/mw/vpnclient/vpnengine/vpnins/group"/>
+</component>
+<component id="ikepolparser" filter="s60" name="IKE Policy Parser">
+<unit bldFile="/mw/vpnclient/vpnengine/ikepolparser/group"/>
+</component>
+<component id="utlbase64" filter="s60" name="Base64 Utilities">
+<unit bldFile="/mw/vpnclient/vpnengine/utlbase64/group"/>
+</component>
+<component id="utlcrypto" filter="s60" name="Crypto Utilities">
+<unit bldFile="/mw/vpnclient/vpnengine/utlcrypto/group"/>
+</component>
+<component id="utlxml" filter="s60" name="XML Utilities">
+<unit bldFile="/mw/vpnclient/vpnengine/utlxml/group"/>
+</component>
+<component id="utlpkcs10" filter="s60" name="PKCS#10 Utilities">
+<unit bldFile="/mw/vpnclient/vpnengine/utlpkcs10/group"/>
+</component>
+<component id="pkiserviceapi" filter="s60" name="PKI Service API">
+<unit bldFile="/mw/vpnclient/vpnengine/pkiserviceapi/group"/>
+</component>
+<component id="ikecert" filter="s60" name="IKE Certificate Management">
+<unit bldFile="/mw/vpnclient/vpnengine/ikecert/group"/>
+</component>
+<component id="kmdapi" filter="s60" name="Key Management Daemon API">
+<unit bldFile="/mw/vpnclient/vpnengine/kmdapi/group"/>
+</component>
+<component id="kmdserver" filter="s60" name="Key Management Daemon Server">
+<unit bldFile="/mw/vpnclient/vpnengine/kmdserver/group"/>
+</component>
+<component id="ikeutils" filter="s60" name="Internet Key Exchange Utils">
+<unit bldFile="/mw/vpnclient/vpnengine/ikeutils/group"/>
+</component>
+<component id="ikev1lib" filter="s60" name="IKEv1 Library">
+<unit bldFile="/mw/vpnclient/vpnengine/ikev1lib/group"/>
+</component>
+<component id="ikev2lib" filter="s60" name="IKEv2 Library">
+<unit bldFile="/mw/vpnclient/vpnengine/ikev2lib/group"/>
+</component>
+<component id="vpnipsecpolparser" filter="s60" name="VPN IPsec Policy Parser">
+<unit bldFile="/mw/vpnclient/vpnengine/vpnipsecpolparser/group"/>
+</component>
+<component id="sit" filter="s60" name="Socket Interaction Thread">
+<unit bldFile="/mw/vpnclient/vpnengine/sit/group"/>
+</component>
+<component id="vpntcwrapper" filter="s60" name="VPN Terminal Control Wrapper">
+<unit bldFile="/mw/vpnclient/vpnengine/vpntcwrapper/group"/>
+</component>
+<component id="eventmediator" filter="s60" name="Event Mediator">
+<unit bldFile="/mw/vpnclient/vpnengine/eventmediator/group"/>
+</component>
+<component id="pkiservice" filter="s60" name="PKI Service">
+<unit bldFile="/mw/vpnclient/vpnengine/pkiservice/group"/>
+</component>
+<component id="vpnconnagt" filter="s60" name="VPN Connection Agent">
+<unit bldFile="/mw/vpnclient/vpnengine/vpnconnagt/group"/>
+</component>
+<component id="vpnmanager" filter="s60" name="VPN Manager">
+<unit bldFile="/mw/vpnclient/vpnengine/vpnmanager/group"/>
+</component>
+<component id="vpncleaner" filter="s60" name="VPN Cleaner">
+<unit bldFile="/mw/vpnclient/vpnengine/vpncleaner/group"/>
+</component>
+<component id="utlpkcs12" filter="s60" name="PKCS#12 Utilities">
+<unit bldFile="/mw/vpnclient/vpnengine/utlpkcs12/group"/>
+</component>
+<component id="dmadengine" filter="s60" name="DM Adapter Engine">
+<unit bldFile="/mw/vpnclient/vpnengine/dmadengine/group"/>
+</component>
+<component id="dmadipsecvpn" filter="s60" name="IPsec VPN DM Adapter" class="plugin">
+<unit bldFile="/mw/vpnclient/vpnengine/dmadipsecvpn/group"/>
+</component>
+<component id="dmadpki" filter="s60" name="PKI DM Adapter" class="plugin">
+<unit bldFile="/mw/vpnclient/vpnengine/dmadpki/group"/>
+</component>
+<component id="ikesocket" filter="s60" name="IKE Socket" introduced="^3">
+<unit bldFile="/mw/vpnclient/vpnengine/ikesocket/group"/>
+</component>
+</collection>
+<collection id="vpnui" name="VPN UI" level="ui">
+<component id="vpnecomnotifier" filter="s60" name="VPN ECOM Notifier" class="plugin">
+<unit bldFile="/mw/vpnclient/vpnui/vpnecomnotifier/group"/>
+</component>
+<component id="vpndialogmanager" filter="s60" name="VPN Dialog Manager">
+<unit bldFile="/mw/vpnclient/vpnui/vpndialogmanager/group"/>
+</component>
+<component id="vpnpolins" filter="s60" name="VPN Policy Installer">
+<unit bldFile="/mw/vpnclient/vpnui/vpnpolins/group"/>
+</component>
+<component id="vpnpolicyrecognizer" filter="s60" name="VPN Policy Recognizer" class="plugin">
+<unit bldFile="/mw/vpnclient/vpnui/vpnpolicyrecognizer/group"/>
+</component>
+</collection>
+<collection id="vpnclient_info" name="VPN Client Info" level="api">
+<component id="vpnclient_help" filter="s60" name="VPN Client Help">
+<unit bldFile="/mw/vpnclient/help/group"/>
+</component>
+<component id="vpnclient_build" filter="s60" name="VPN Client Build">
+<!-- should split this up into the other components and remove this-->
+<unit bldFile="/mw/vpnclient/group"/>
+</component>
+</collection>
+</package>
+<package id="ipappsrv" level="specific" tech-domain="vc" name="IP App Services" levels="framework generic server conn plugin">
+<collection id="ipappsrv_plat" name="IP App Services Platform Interfaces" level="plugin">
+<component id="transcoder_api" name="Transcoder API" class="api" filter="s60">
+<unit bldFile="/mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
+</component>
+<component id="comms_event_api" name="Comms Event API" class="api" filter="s60">
+<unit bldFile="/mw/ipappsrv/ipappsrv_plat/comms_event_api/group"/>
+</component>
+<component id="floor_control_api" name="Floor Control API" class="api" filter="s60">
+<unit bldFile="/mw/ipappsrv/ipappsrv_plat/floor_control_api/group"/>
+</component>
+<component id="media_control_api" name="Media Control API" class="api" filter="s60">
+<unit bldFile="/mw/ipappsrv/ipappsrv_plat/media_control_api/group"/>
+</component>
+<component id="multimedia_comms_api" name="Multimedia Comms API" class="api" filter="s60">
+<unit bldFile="/mw/ipappsrv/ipappsrv_plat/multimedia_comms_api/group"/>
+</component>
+<component id="nat_settings_api" name="NAT Settings API" class="api" filter="s60">
+<unit bldFile="/mw/ipappsrv/ipappsrv_plat/nat_settings_api/group"/>
+</component>
+</collection>
+<collection id="natfw" name="NAT Framework" level="framework">
+<!-- collection is really a component. Need to move down a directory -->
+<component id="natfw_build" filter="s60" name="NAT Framework Build" introduced="^2">
+<unit bldFile="/mw/ipappsrv/natfw/group"/>
+</component>
+</collection>
+<collection id="multimediacommscontroller" name="Multimedia Comms Controller" level="conn">
+<!-- collection is really a component. Need to move down a directory -->
+<component id="multimediacommscontroller_build" filter="s60" name="Multimedia Comms Controller Build">
+<unit bldFile="/mw/ipappsrv/multimediacommscontroller/group"/>
+</component>
+</collection>
+<collection id="multimediacommsengine" name="Multimedia Comms Engine" level="generic">
+<!-- collection is really a component. Need to move down a directory -->
+<component id="multimediacommsengine_build" filter="s60" name="Multimedia Comms Engine Build">
+<unit bldFile="/mw/ipappsrv/multimediacommsengine/group"/>
+</component>
+</collection>
+<collection id="natplugins" name="NAT Plugins" level="plugin">
+<component id="natpcliprovisioningnatfwadapter" filter="s60" name="Client Provisioning NAT Framework Traversal Adapter" class="plugin" introduced="^2">
+<unit bldFile="/mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/group"/>
+</component>
+<component id="natpdevmgmtnatfwadapter" filter="s60" name="Device Management NAT Framework Traversal Adapter" class="plugin">
+<unit bldFile="/mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/group"/>
+</component>
+<component id="natptraversalcontroller" filter="s60" name="NAT Traversal Controller" class="plugin">
+<unit bldFile="/mw/ipappsrv/natplugins/natptraversalcontroller/group"/>
+</component>
+<component id="natpnatfwsdpprovider" filter="s60" name="NAT Framework SDP Provider" class="plugin">
+<unit bldFile="/mw/ipappsrv/natplugins/natpnatfwsdpprovider/group"/>
+</component>
+</collection>
+<collection id="ipappsrv_info" name="IP App Services Info" level="plugin">
+<component id="ipappsrv_build" name="IP App Services Build" filter="s60">
+<!-- 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 id="ipappsrv_metadata" name="IP App Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/mw/ipappsrv/ipappsrv_info/ipappsrv_metadata/ipappsrv_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="phonesrv" level="specific" tech-domain="vc" name="Telephony and SIM Services" levels="plugin framework server generic specific">
+<collection id="phonesrv_plat" name="Telephony and SIM Services Platform Interfaces" level="specific">
+<component id="string_parser_api" name="String Parser API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/string_parser_api/group"/>
+</component>
+<component id="cbs_mcn_client_api" name="CBS MCN Client API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/cbs_mcn_client_api/group"/>
+</component>
+<component id="converged_call_engine_api" name="Converged Call Engine API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/converged_call_engine_api/group"/>
+</component>
+<component id="aiw_dial_data_consumer_api" name="AIW Dial Data Consumer API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/aiw_dial_data_consumer_api/group"/>
+</component>
+<component id="phone_client_ussd_api" name="Phone Client USSD API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_ussd_api/group"/>
+</component>
+<component id="sat_refresh_api" name="SAT Refresh API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/sat_refresh_api/group" filter="!test"/>
+
+</component>
+<component id="network_handling_engine_api" name="Network Handling Engine API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/network_handling_engine_api/group"/>
+</component>
+<component id="phone_client_emergency_call_api" name="Phone Client Emergency Call API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/group"/>
+</component>
+<component id="sat_configuration_api" name="SAT Configuration API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/sat_configuration_api/group"/>
+</component>
+<component id="dial_utils_api" name="Dial Utils API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/dial_utils_api/group"/>
+</component>
+<component id="phone_client_image_handler_api" name="Phone Client Image Handler API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_image_handler_api/group"/>
+</component>
+<component id="phone_client_messenger_api" name="Phone Client Messenger API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_messenger_api/group"/>
+</component>
+<component id="sat_client_api" name="SAT Client API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/sat_client_api/group" filter="!test"/>
+
+</component>
+<component id="phone_client_api" name="Phone Client API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_api/group"/>
+</component>
+<component id="sat_service_api" name="SAT Service API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/sat_service_api/group" filter="!test"/>
+
+</component>
+<component id="cbs_message_api" name="CBS Message API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/cbs_message_api/group"/>
+</component>
+<component id="phone_client_server_information_api" name="Phone Client Server Information API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_server_information_api/group"/>
+</component>
+<component id="phone_client_ussd_internal_api" name="Phone Client USSD Internal API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_ussd_internal_api/group"/>
+</component>
+<component id="phone_client_command_handler_api" name="Phone Client Command Handler API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_command_handler_api/group"/>
+</component>
+<component id="phone_client_notify_api" name="Phone Client Notify API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_notify_api/group"/>
+</component>
+<component id="phone_client_utility_api" name="Phone Client Utility API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_utility_api/group"/>
+</component>
+<component id="telephony_network_information_api" name="Telephony Network Information API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/telephony_network_information_api/group"/>
+</component>
+<component id="secondary_display_sat_api" name="Secondary Display SAT API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/secondary_display_sat_api/group"/>
+</component>
+<component id="callui_reconnect_query_api" name="CallUI Reconnect Query API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/callui_reconnect_query_api/group"/>
+</component>
+<component id="service_provider_settings_api" name="Service Provider Settings API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/service_provider_settings_api/group"/>
+</component>
+<component id="converged_call_provider_api" name="Converged Call Provider API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/converged_call_provider_api/group"/>
+</component>
+<component id="incoming_call_monitor_api" name="Incoming Call Monitor API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/incoming_call_monitor_api/group"/>
+</component>
+<component id="default_emergency_numbers_api" name="Default Emergency Numbers API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/default_emergency_numbers_api/group"/>
+</component>
+<component id="cenrep_database_api" name="Central Repository Database API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/cenrep_database_api/group"/>
+</component>
+<component id="ss_settings_api" name="SS Settings API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/ss_settings_api/group"/>
+</component>
+<component id="phone_settings_observer_api" name="Phone Settings Observer API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_settings_observer_api/group"/>
+</component>
+<component id="phone_settings_notes_ui_api" name="Phone Settings Notes UI API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_settings_notes_ui_api/group"/>
+</component>
+<component id="phone_settings_api" name="Phone Settings API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_settings_api/group"/>
+</component>
+<component id="voice_mailbox_number_api" name="Voice Mailbox Number API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/voice_mailbox_number_api/group"/>
+</component>
+<component id="voice_mailbox_settings_api" name="Voice Mailbox Settings API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/voice_mailbox_settings_api/group"/>
+</component>
+<component id="call_information_api" name="Call Information API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/call_information_api/group" filter="!test"/>
+
+</component>
+<component id="call_remote_party_information_api" name="Call Remote Party Information API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/call_remote_party_information_api/group" filter="!test"/>
+
+</component>
+<component id="telephony_mediator_api" name="Telephony Mediator API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/telephony_mediator_api/group" filter="!test"/>
+
+</component>
+<component id="dialpad_api" name="Dialpad API" class="api" filter="s60" introduced="^4">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/dialpad_api/group"/>
+</component>
+</collection>
+<collection id="cellular" name="Cellular" level="server">
+<component id="telephonysettings" filter="s60" name="Telephony Settings" purpose="development">
+
+</component>
+<component id="sssettings" filter="s60" name="Supplementary Service Settings" purpose="development">
+
+</component>
+<component id="psetnotesui" filter="s60" name="Phone Settings Notes UI" purpose="development">
+
+</component>
+</collection>
+<collection id="convergedcallengine" name="Converged Call Engine" level="framework">
+<component id="cce" filter="s60" name="CCE" purpose="development">
+
+</component>
+<component id="spsettings" filter="s60" name="Service Provider Settings" purpose="development">
+
+</component>
+</collection>
+<collection id="phoneclientserver" name="Phone Client/Server" level="server">
+<component id="aiwdialdata" filter="s60" name="AIW Dial Data" purpose="development">
+
+</component>
+<component id="dialutils" filter="s60" name="Dial Utils" purpose="development">
+
+</component>
+<component id="phoneclient" filter="s60" name="Phone Client" purpose="development">
+
+</component>
+</collection>
+<collection id="phonesrv_info" name="Phone Server Info" level="generic">
+<component id="phonesrv_build" name="Phone Server Build" filter="s60">
+<unit bldFile="/mw/phonesrv" qt:proFile="phonesrv.pro"/>
+</component>
+</collection>
+</package>
+<package id="messagingmw" level="specific" tech-domain="pr" name="Messaging Middleware" levels="stack support fw api">
+<collection id="msgfw_plat" name="Messaging Middleware Platform Interfaces" level="api">
+<component id="always_online_plugin_api" name="Always Online Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/messagingmw/msgfw_plat/always_online_plugin_api/group"/>
+</component>
+<component id="always_online_client_api" name="Always Online Client API" class="api" filter="s60">
+<unit bldFile="/mw/messagingmw/msgfw_plat/always_online_client_api/group"/>
+</component>
+<component id="msg_common_utils_api" name="Messaging Common Utils API" class="api" filter="s60">
+<unit bldFile="/mw/messagingmw/msgfw_plat/msg_common_utils_api/group"/>
+</component>
+<component id="muiu_utils_api" name="Messaging Center UI Utilities API" class="api" filter="s60" introduced="^4">
+<unit bldFile="/mw/messagingmw/msgfw_plat/muiu_utils_api/group"/>
+</component>
+</collection>
+<collection id="msgbranched" name="Messaging Branched" level="support">
+<!-- collection is really a component. Need to move down a directory -->
+<component id="msgbranched_build" filter="s60" name="Messaging Branched Build" class="config">
+<unit bldFile="/mw/messagingmw/msgbranched/group"/>
+</component>
+</collection>
+<collection id="messagingfw" name="Messaging Framework" level="fw">
+<!-- should break this collection up into smaller related collections -->
+<component id="send_ui_api" name="Send UI API" class="api" filter="s60" deprecated="^4">
+<unit bldFile="/mw/messagingmw/messagingfw/deprecate/send_ui_api/group"/>
+</component>
+<component id="send_ui_plugin_api" name="Send UI Plug-in API" class="api" filter="s60" deprecated="^4">
+<unit bldFile="/mw/messagingmw/messagingfw/deprecate/send_ui_plugin_api/group"/>
+</component>
+<component id="send_ui_datautils_api" name="Send UI Data Utils API" class="api" filter="s60" deprecated="^4">
+<unit bldFile="/mw/messagingmw/messagingfw/deprecate/send_ui_datautils_api/group"/>
+</component>
+<component id="alwaysonline" filter="s60" name="Always Online Server" introduced="^2">
+<unit bldFile="/mw/messagingmw/messagingfw/alwaysonline/group"/>
+</component>
+<component id="msgcommonutils" filter="s60" name="Messaging Common Utils" introduced="^2">
+<unit bldFile="/mw/messagingmw/messagingfw/msgcommonutils/group"/>
+</component>
+<component id="senduiservices" filter="s60" name="Send UI Services" introduced="^2" deprecated="^4">
+<unit bldFile="/mw/messagingmw/messagingfw/deprecate/senduiservices/group"/>
+</component>
+<component id="muiuutils" name="Messaging Center UI Utilities" class="api" filter="s60" introduced="^4">
+<unit bldFile="/mw/messagingmw/messagingfw/muiuutils/group"/>
+</component>
+<component id="scheduledsendmtm" name="Scheduled Send MTM" introduced="6.0" purpose="optional" class="plugin">
+<unit bldFile="/mw/messagingmw/messagingfw/scheduledsendmtm/group" mrp="/mw/messagingmw/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
+</component>
+<component id="msgsrvnstore" name="Message Server and Store" purpose="optional">
+<unit bldFile="/mw/messagingmw/messagingfw/msgsrvnstore/group" mrp="/mw/messagingmw/messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
+</component>
+<component id="biomsgfw" name="BIO Messaging Framework" introduced="6.0" purpose="optional">
+<unit bldFile="/mw/messagingmw/messagingfw/biomsgfw/group" mrp="/mw/messagingmw/messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
+</component>
+<component id="msgconf" name="Messaging Config" introduced="^2" purpose="optional" class="config">
+<unit bldFile="/mw/messagingmw/messagingfw/msgconf/group" mrp="/mw/messagingmw/messagingfw/msgconf/group/messaging_config.mrp"/>
+</component>
+<component id="watcherfw" name="Watcher Framework" purpose="optional">
+<unit bldFile="/mw/messagingmw/messagingfw/watcherfw/group" mrp="/mw/messagingmw/messagingfw/watcherfw/group/messaging_watcher.mrp"/>
+</component>
+<component id="msgtest" name="Messaging Test" purpose="development">
+<unit bldFile="/mw/messagingmw/messagingfw/msgtest/group" mrp="/mw/messagingmw/messagingfw/msgtest/group/messaging_test.mrp"/>
+</component>
+
+
+
+<component id="sendas" name="Send As" purpose="optional">
+<unit bldFile="/mw/messagingmw/messagingfw/sendas/group" mrp="/mw/messagingmw/messagingfw/sendas/group/messaging_sendas2.mrp"/>
+</component>
+<component id="msgurlhandler" name="Message URL Handler" introduced="7.0" purpose="optional">
+<unit bldFile="/mw/messagingmw/messagingfw/msgurlhandler/group" mrp="/mw/messagingmw/messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
+</component>
+<component id="wappushfw" name="WAP Push Framework" introduced="6.1" purpose="optional">
+<unit bldFile="/mw/messagingmw/messagingfw/wappushfw/group" mrp="/mw/messagingmw/messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
+</component>
+<component id="suplsmshandler" name="SUPL SMS Handler" introduced="^2" purpose="development" class="plugin">
+<unit bldFile="/mw/messagingmw/messagingfw/suplsmshandler/group" mrp="/mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/>
+</component>
+<component id="suplwappushhandler" name="SUPL WAP Push Handler" introduced="^2" purpose="optional" class="plugin">
+<unit bldFile="/mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="/mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
+</component>
+</collection>
+<collection id="messagingmw_info" name="Messaging Middleware Info" level="api">
+<component id="messagingmw_metadata" name="Messaging Middleware Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="imsrv" level="specific" tech-domain="pr" name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
+<collection id="imsrv_plat" name="Instant Messaging and Presence Services Platform Interfaces" level="specific">
+<component id="ximp_core_data_model_api" name="XIMP Core Data Model API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_core_data_model_api/group"/>
+</component>
+<component id="ximp_presence_protocol_plugin_host_api" name="XIMP Presence Protocol Plug-in Host API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_host_api/group"/>
+</component>
+<component id="ximp_presence_data_model_api" name="XIMP Presence Data Model API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_presence_data_model_api/group"/>
+</component>
+<component id="ximp_presence_protocol_plugin_api" name="XIMP Presence Protocol Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_api/group"/>
+</component>
+<component id="ximp_presence_management_api" name="XIMP Presence Management API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_presence_management_api/group"/>
+</component>
+<component id="ximp_core_protocol_plugin_host_api" name="XIMP Core Protocol Plug-in Host API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_host_api/group"/>
+</component>
+<component id="ximp_core_management_api" name="XIMP Core Management API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_core_management_api/group"/>
+</component>
+<component id="ximp_presence_base_api" name="XIMP Presence Base API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_presence_base_api/group"/>
+</component>
+<component id="ximp_core_protocol_plugin_api" name="XIMP Core Protocol Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_api/group"/>
+</component>
+<component id="ximp_core_base_api" name="XIMP Core Base API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_core_base_api/group"/>
+</component>
+<component id="ximp_presence_cache_api" name="XIMP Presence Cache API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_presence_cache_api/group"/>
+</component>
+<component id="ximp_core_feature_plugin_api" name="XIMP Core Feature Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/group"/>
+</component>
+<component id="ximp_im_protocol_plugin_host_api" name="XIMP IM Protocol Plugin Host API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_host_api/group"/>
+</component>
+<component id="ximp_im_data_model_api" name="XIMP IM Data Model API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_im_data_model_api/group"/>
+</component>
+<component id="ximp_im_protocol_plugin_api" name="XIMP IM Protocol Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_api/group"/>
+</component>
+<component id="ximp_im_management_api" name="XIMP IM Management API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_im_management_api/group"/>
+</component>
+<component id="ximp_im_base_api" name="XIMP IM Base API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_im_base_api/group"/>
+</component>
+<component id="ximp_search_protocol_plugin_host_api" name="XIMP Search Protocol Plugin Host API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_host_api/group"/>
+</component>
+<component id="ximp_search_data_model_api" name="XIMP Search Data Model API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_search_data_model_api/group"/>
+</component>
+<component id="ximp_search_protocol_plugin_api" name="XIMP search Protocol Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_api/group"/>
+</component>
+<component id="ximp_search_management_api" name="XIMP Search Management API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_search_management_api/group"/>
+</component>
+<component id="ximp_search_base_api" name="XIMP Search Base API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_search_base_api/group"/>
+</component>
+<component id="xmpp_settings_api" name="XMPP Settings API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/xmpp_settings_api/group"/>
+</component>
+<component id="im_cache_client_api" name="IM Cache Client API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/im_cache_client_api/group"/>
+</component>
+<component id="im_cache_server_api" name="IM Cache Server API" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/im_cache_server_api/group"/>
+</component>
+<component id="presence_avabilitytext" name="Presence Avability Text" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
+</component>
+</collection>
+<collection id="ximpfw" name="XIMP Framework" level="framework">
+<!-- collection is really a component. Needs to be moved down a directory -->
+<component id="ximpfw_build" filter="s60" name="XIMP Framework Build">
+<unit bldFile="/mw/imsrv/ximpfw/group"/>
+</component>
+</collection>
+<collection id="imservices" name="IM Services" level="generic">
+<component id="imfeatureplugin" filter="s60" name="IM Feature Plugin" class="plugin" introduced="^2">
+<unit bldFile="/mw/imsrv/imservices/imfeatureplugin/group"/>
+</component>
+<component id="searchfeatureplugin" filter="s60" name="Search Feature Plugin" class="plugin" introduced="^2">
+<unit bldFile="/mw/imsrv/imservices/searchfeatureplugin/group"/>
+</component>
+<component id="xmppsettingsapi" filter="s60" name="XMPP Settings API" introduced="^2">
+<unit bldFile="/mw/imsrv/imservices/xmppsettingsapi/group"/>
+</component>
+<component id="xmppsettingsfetcher" filter="s60" name="XMPP Settings Fetcher" introduced="^2">
+<unit bldFile="/mw/imsrv/imservices/xmppsettingsfetcher/group"/>
+</component>
+<component id="instantmessagingcache" filter="s60" name="Instant Messaging Cache" introduced="^2">
+<unit bldFile="/mw/imsrv/imservices/instantmessagingcache/group"/>
+</component>
+</collection>
+<collection id="brandingserver" name="Branding Server" level="specific">
+<!-- collection is really a component. Needs to be moved down a directory -->
+<component id="brandingserver_build" filter="s60" name="Branding Server Build">
+<unit bldFile="/mw/imsrv/brandingserver/group"/>
+</component>
+</collection>
+</package>
+<package id="legacypresence" level="specific" tech-domain="pr" name="Legacy Presence Services" levels="engine fw ui">
+<collection id="pressrv_plat" name="Legacy Presence Services Platform Interfaces" level="ui">
+<component id="presence_list_api" name="Presence List API" class="api" filter="s60">
+<unit bldFile="/mw/legacypresence/pressrv_plat/presence_list_api/group"/>
+</component>
+<component id="watcher_info_api" name="Watcher Info API" class="api" filter="s60">
+<unit bldFile="/mw/legacypresence/pressrv_plat/watcher_info_api/group"/>
+</component>
+<component id="simple_documents_api" name="SIMPLE Documents API" class="api" filter="s60">
+<unit bldFile="/mw/legacypresence/pressrv_plat/simple_documents_api/group"/>
+</component>
+<component id="authorization_api" name="Authorization API" class="api" filter="s60">
+<unit bldFile="/mw/legacypresence/pressrv_plat/authorization_api/group"/>
+</component>
+<component id="xdm_protocol_plugin_api" name="XDM Protocol Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/legacypresence/pressrv_plat/xdm_protocol_plugin_api/group"/>
+</component>
+<component id="watcher_api" name="Watcher API" class="api" filter="s60">
+<unit bldFile="/mw/legacypresence/pressrv_plat/watcher_api/group"/>
+</component>
+<component id="xdm_api" name="XDM API" class="api" filter="s60">
+<unit bldFile="/mw/legacypresence/pressrv_plat/xdm_api/group"/>
+</component>
+<component id="registration_api" name="Registration API" class="api" filter="s60">
+<unit bldFile="/mw/legacypresence/pressrv_plat/registration_api/group"/>
+</component>
+<component id="publisher_api" name="Publisher API" class="api" filter="s60">
+<unit bldFile="/mw/legacypresence/pressrv_plat/publisher_api/group"/>
+</component>
+<component id="messaging_connection_manager_api" name="Messaging Connection Manager API" class="api" filter="s60">
+<unit bldFile="/mw/legacypresence/pressrv_plat/messaging_connection_manager_api/group"/>
+</component>
+<component id="xdm_settings_api" name="XDM Settings API" class="api" filter="s60">
+<unit bldFile="/mw/legacypresence/pressrv_plat/xdm_settings_api/group"/>
+</component>
+<component id="simple_settings_api" name="SIMPLE Settings API" class="api" filter="s60">
+<unit bldFile="/mw/legacypresence/pressrv_plat/simple_settings_api/group"/>
+</component>
+<component id="simple_instant_msg_api" name="Simple Instant Msg API" class="api" filter="s60">
+<unit bldFile="/mw/legacypresence/pressrv_plat/simple_instant_msg_api/group"/>
+</component>
+</collection>
+<collection id="xdmengine" name="XDM Engine" level="engine">
+<!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
+<component id="xdmengine_build" filter="s60" name="XDM Engine Build">
+<unit bldFile="/mw/legacypresence/xdmengine/group"/>
+</component>
+</collection>
+<collection id="xdmsettingsui" name="XDM Settings UI" level="ui">
+<!-- collection is really a component. Need to move down a directory (eg xdm/xdmsettingsui)-->
+<component id="xdmsettingsui_build" filter="s60" name="XDM Settings UI Build">
+<unit bldFile="/mw/legacypresence/xdmsettingsui/group"/>
+</component>
+</collection>
+<collection id="xdmprotocols" name="XDM Protocols" level="fw">
+<!-- collection is really a component. Need to move down a directory (eg xdm/xdmprotocols)-->
+<component id="xdmprotocols_build" filter="s60" name="XDM Protocols Build">
+<unit bldFile="/mw/legacypresence/xdmprotocols/group"/>
+</component>
+</collection>
+<collection id="msgconnmanager" name="Messaging Connection Manager" level="fw">
+<!-- collection is really a component. Need to move down a directory-->
+<component id="msgconnmanager_build" filter="s60" name="Messaging Connection Manager Build">
+<unit bldFile="/mw/legacypresence/msgconnmanager/group"/>
+</component>
+</collection>
+<collection id="presencesettingsui" name="Presence Settings UI" level="ui">
+<!-- collection is really a component. Need to move down a directory-->
+<component id="presencesettingsui_build" filter="s60" name="Presence Settings UI Build">
+<unit bldFile="/mw/legacypresence/presencesettingsui/group"/>
+</component>
+</collection>
+<collection id="simpleengine" name="SIMPLE Engine" level="engine">
+<!-- collection is really a component. Need to move down a directory-->
+<component id="simpleengine_build" filter="s60" name="SIMPLE Engine Build">
+<unit bldFile="/mw/legacypresence/simpleengine/group"/>
+</component>
+</collection>
+<collection id="presencefwsimpleadpt" name="Presence Framework SIMPLE Adaptation" level="fw">
+<!-- collection is really a component. Need to move down a directory-->
+<component id="simpleplugin" filter="s60" class="plugin" name="SIMPLE Plugin">
+<unit bldFile="/mw/legacypresence/presencefwsimpleadpt/group"/>
+</component>
+</collection>
+<collection id="simpledatamodeladapter" name="SIMPLE Data Model Adapter" level="fw">
+<component id="presenceplugin" filter="s60" class="plugin" name="Presence Plugin" introduced="^2">
+<unit bldFile="/mw/legacypresence/simpledatamodeladapter/group"/>
+</component>
+</collection>
+</package>
+<package id="searchsrv" level="specific" tech-domain="pr" name="Search Services" levels="services engine generic api">
+<collection id="searchsrv_plat" name="Search Services Platform Interfaces" level="api">
+<component id="cpix_utility_api" name="CPIX Utility API" filter="s60" class="api" introduced="^4">
+<unit bldFile="/mw/searchsrv/searchsrv_plat/cpix_utility_api/group"/>
+</component>
+<component id="cpix_framework_api" name="CPIX Framework API" filter="s60" class="api" introduced="^4">
+<unit bldFile="/mw/searchsrv/searchsrv_plat/cpix_framework_api/group"/>
+</component>
+<component id="cpix_search_api" name="CPIX Search API" filter="s60" class="api" introduced="^4">
+<unit bldFile="/mw/searchsrv/searchsrv_plat/cpix_search_api/group"/>
+</component>
+</collection>
+<collection id="searchengine" name="Search Engine" level="engine">
+<component id="searchengine_util" name="Search Engine Utils" filter="s60" introduced="^4">
+<unit bldFile="/mw/searchsrv/searchengine/util/group"/>
+</component>
+<component id="searchengine_oss" name="Search Engine OSS" filter="s60" introduced="^4">
+<unit bldFile="/mw/searchsrv/searchengine/oss/group"/>
+</component>
+<component id="cpix" name="Cross Platform Indexing Engine" filter="s60" introduced="^4">
+<unit bldFile="/mw/searchsrv/searchengine/cpix/group"/>
+</component>
+</collection>
+<collection id="searcher" name="Searcher" level="generic">
+<component id="searchclient" name="Search Client" filter="s60" introduced="^4">
+<unit bldFile="/mw/searchsrv/searcher/SearchClient/group"/>
+</component>
+<component id="searchserver" name="Search Server" filter="s60" introduced="^4">
+<unit bldFile="/mw/searchsrv/searcher/SearchServer/group"/>
+</component>
+<component id="searcher_test" name="Searcher Tests" filter="s60" purpose="development" introduced="^4">
+<!-- #include from common bld.inf or split into two components -->
+<unit bldFile="/mw/searchsrv/searcher/tsrc/RobustnessTest/group"/>
+<unit bldFile="/mw/searchsrv/searcher/tsrc/LogPlayer/group"/>
+</component>
+</collection>
+<collection id="searchsrv_harvester" name="Search Services Harvester" level="services">
+<component id="searchsrv_pluginfw" name="Search Server" filter="s60" introduced="^4">
+<unit bldFile="/mw/searchsrv/harvester/pluginfw/group"/>
+</component>
+<component id="searchsrv_harvesterserver" name="Search Harvester Server" filter="s60" introduced="^4">
+<unit bldFile="/mw/searchsrv/harvester/HarvesterServer/group"/>
+</component>
+</collection>
+<collection id="searchsrv_watchdog" name="Search Services Watch Dog" level="services">
+<component id="searchsrv_watchdog_build" name="Search Services Watch Dog Build" filter="s60" introduced="^4">
+<unit bldFile="/mw/searchsrv/WatchDog/group"/>
+</component>
+</collection>
+<collection id="qcpix" name="Qt CPIX" level="engine">
+<component id="qcpix_build" name="Qt CPIX Build" introduced="^4">
+<unit bldFile="/mw/searchsrv/qcpix" qt:proFile="qcpix.pro"/>
+</component>
+</collection>
+<collection id="searchsrv_info" name="Search Services Info">
+<component id="searchsrv_build" name="Search Services Build" introduced="^4">
+<!-- move exports to own component and remove this -->
+<unit bldFile="/mw/searchsrv/group"/>
+</component>
+
+</collection>
+</package>
+<package id="remotemgmt" level="specific" tech-domain="dm" name="Remote Management" levels="plugin framework server generic specific">
+<collection id="remotemgmt_pub" name="Remote Management Public Interfaces" level="specific">
+<component id="synchronization_capability_api" name="Synchronization Capability API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
+</component>
+</collection>
+<collection id="remotemgmt_plat" name="Remote Management Platform Interfaces" level="specific">
+<component id="common_agent_util_and_definitions_api" name="Common Agent util and definitions API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
+</component>
+<component id="policy_management_certificate_api" name="Policy Management Certificate API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/group"/>
+</component>
+<component id="oma_provisioning_adapter_api" name="OMA Provisioning Adapter API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/oma_provisioning_adapter_api/group"/>
+</component>
+<component id="device_management_parameter_api" name="Device Management Parameter API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/device_management_parameter_api/group"/>
+</component>
+<component id="data_synchronization_plugin_api" name="Data Synchronization Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/group"/>
+</component>
+<component id="sync_alert_handler_api" name="Sync Alert Handler API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
+</component>
+<component id="syncml_notifier_api" name="SyncML Notifier API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
+</component>
+<component id="syncml_client_api" name="SyncML Client API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
+</component>
+<component id="device_management_plugin_api" name="Device Management plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/device_management_plugin_api/group"/>
+</component>
+<component id="dm_tree_apis" name="DM Tree APIs" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
+</component>
+<component id="terminal_security_device_lock_api" name="Terminal Security Device Lock API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/group"/>
+</component>
+<component id="policy_management_request_api" name="Policy Management Request API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/policy_management_request_api/group"/>
+</component>
+<component id="ds_constant_definitions_api" name="DS Constant Definitions API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/ds_constant_definitions_api/group"/>
+</component>
+<component id="scp_server_api" name="SCP Server API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/scp_server_api/group"/>
+</component>
+<component id="data_synchronization_notification_api" name="Data Synchronization Notification API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/data_synchronization_notification_api/group"/>
+</component>
+<component id="oma_provisioning_engine_api" name="OMA Provisioning Engine API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/group"/>
+</component>
+<component id="dm_utils_api" name="DM Utils API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/dm_utils_api/group"/>
+</component>
+<component id="syncml_alert_api" name="SyncML Alert API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/syncml_alert_api/group"/>
+</component>
+<component id="obex_client_session_api" name="OBEX Client session API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/obex_client_session_api/group"/>
+</component>
+<component id="setting_enforcement_info_api" name="Setting Enforcement Info API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/group"/>
+</component>
+<component id="dm_constant_definitions_api" name="DM Constant Definitions API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
+</component>
+<component id="oma_ds_extensions_api" name="OMA DS Extensions API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
+</component>
+<component id="pnpms_utils_api" name="PNPMS Utils API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
+</component>
+<component id="diagnostics_plugin_utility_api" name="Diagnostics Plugin Utility API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
+</component>
+<component id="diagnostics_plugin_api" name="Diagnostics Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
+</component>
+<component id="diagnostics_framework_api" name="Diagnostics Framework API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
+</component>
+<component id="diagnostics_results_api" name="Diagnostics Results API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
+</component>
+<component id="diagnostics_plugin_pool_api" name="Diagnostics Plugin Pool API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
+</component>
+<component id="adaptive_history_list_api" name="Adaptive History List API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
+</component>
+<component id="adaptive_history_list_session_api" name="Adaptive History List Session API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
+</component>
+<component id="fota_engine_api" name="FOTA Engine API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
+</component>
+<component id="update_package_storage_plugin_api" name="Update Package Storage Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
+</component>
+<component id="syncml_notifier_roaming_api" name="SyncML Notifier Roaming API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
+</component>
+<component id="sync_service_api" name="Sync Service API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/sync_service_api/group"/>
+</component>
+<component id="dcmo_adapter_api" name="DCMO Adapter API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/dcmo_adapter_api/group"/>
+</component>
+<component id="dcmo_control_api" name="DCMO Control API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/dcmo_control_api/group"/>
+</component>
+<component id="ds_capability_mgmt_plugin_api" name="DS Capability Management Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
+</component>
+</collection>
+<collection id="policymanagement" name="Policy Management" level="generic">
+<component id="pmdmadapter" filter="s60" name="PM DM Adapter" class="plugin">
+<unit bldFile="/mw/remotemgmt/policymanagement/pmdmadapter/group"/>
+</component>
+<component id="dmutilserver" filter="s60" name="DM Util Server">
+<unit bldFile="/mw/remotemgmt/policymanagement/dmutilserver/group"/>
+</component>
+<component id="policyengine" filter="s60" name="Policy Engine">
+<unit bldFile="/mw/remotemgmt/policymanagement/policyengine/group" filter="!dfs_build"/>
+</component>
+<component id="policymanagement_build" filter="s60" name="Policy Management Build">
+<!-- need to distribute exports, etc into the other components and remove this-->
+<unit bldFile="/mw/remotemgmt/policymanagement/group"/>
+</component>
+</collection>
+<collection id="syncmlfw" name="SyncML Framework" level="server">
+<component id="syncmlfw_build" filter="s60" name="SyncML Framework Build">
+<!-- need to break this up into components. Too convoluted a structure to be in a single bld.inf-->
+<unit bldFile="/mw/remotemgmt/syncmlfw/group"/>
+</component>
+</collection>
+<collection id="terminalsecurity" name="Terminal Security" level="specific">
+<component id="scp" filter="s60" name="Security Code Proxy">
+<!-- can only have one unit, need to have these #included from a single bld.inf -->
+<unit bldFile="/mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
+<unit bldFile="/mw/remotemgmt/terminalsecurity/scp/scpdatabase/group"/>
+<unit bldFile="/mw/remotemgmt/terminalsecurity/scp/scpserver/group"/>
+<unit bldFile="/mw/remotemgmt/terminalsecurity/scp/scppatternplugin/group"/>
+<unit bldFile="/mw/remotemgmt/terminalsecurity/scp/scphistoryplugin/group"/>
+<unit bldFile="/mw/remotemgmt/terminalsecurity/scp/scptimestampplugin/group"/>
+<unit bldFile="/mw/remotemgmt/terminalsecurity/scp/scpeventhandler/group"/>
+<unit bldFile="/mw/remotemgmt/terminalsecurity/scp/dmeventnotifier/group"/>
+</component>
+<component id="terminalsecurity_client" filter="s60" name="Terminal Control Client">
+<unit bldFile="/mw/remotemgmt/terminalsecurity/client/group"/>
+</component>
+<component id="terminalsecurity_server" filter="s60" name="Terminal Control Server">
+<unit bldFile="/mw/remotemgmt/terminalsecurity/server/group"/>
+</component>
+<component id="tcadapter" filter="s60" name="Terminal Control Adapter">
+<unit bldFile="/mw/remotemgmt/terminalsecurity/tcadapter/bld"/>
+</component>
+<component id="terminalsecurity_build" filter="s60" name="Terminal Security Build">
+<!-- need to distribute exports, etc into the other components and remove this-->
+<unit bldFile="/mw/remotemgmt/terminalsecurity/group"/>
+</component>
+</collection>
+<collection id="omaprovisioning" name="OMA Provisioning" level="specific">
+<component id="pnputil" filter="s60" name="PnP Util">
+<unit bldFile="/mw/remotemgmt/omaprovisioning/pnputil/group"/>
+</component>
+<component id="provisioning" filter="s60" name="Provisioning">
+<unit bldFile="/mw/remotemgmt/omaprovisioning/provisioning/group"/>
+</component>
+</collection>
+<collection id="devicediagnosticsfw" name="Device Diagnostics Framework" level="framework">
+<component id="diagframework" filter="s60" name="Diagnostics Framework">
+<unit bldFile="/mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
+</component>
+<component id="diagpluginbase" filter="s60" name="Diagnostics Plugin Base">
+<unit bldFile="/mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
+</component>
+<component id="diagresultsdb" filter="s60" name="Diagnostics Results Database">
+<!-- can only have one unit, merge or split into two components -->
+<unit bldFile="/mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
+<unit bldFile="/mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
+</component>
+<component id="devicediagnosticsfw_build" filter="s60" name="Device Diagnostics Framework Build">
+<!-- need to distribute exports, etc into the other components and remove this-->
+<unit bldFile="/mw/remotemgmt/devicediagnosticsfw/group"/>
+</component>
+</collection>
+<collection id="dcmofw" name="Device Capability Management Object Framework" level="framework">
+<component id="dcmoclient" filter="s60" name="DCMO Client">
+<unit bldFile="/mw/remotemgmt/dcmofw/dcmoclient/group"/>
+</component>
+<component id="dcmoserver" filter="s60" name="DCMO Server">
+<unit bldFile="/mw/remotemgmt/dcmofw/dcmoserver/group"/>
+</component>
+<component id="dcmocustcmd" filter="s60" name="DCMO Custom Commands">
+<unit bldFile="/mw/remotemgmt/dcmofw/dcmocustcmd/group"/>
+</component>
+<component id="dcmofw_build" filter="s60" name="DCMO Build">
+<!-- need to distribute exports, etc into the other components and remove this-->
+<unit bldFile="/mw/remotemgmt/dcmofw/group"/>
+</component>
+</collection>
+<collection id="fotaapplication" name="FOTA Application" level="generic">
+<component id="fotaapplication_build" filter="s60" name="FOTA Application Build">
+<!-- remove this component when configuration is in place and the #ifdefs have been worked out -->
+<unit bldFile="/mw/remotemgmt/fotaapplication/group"/>
+</component>
+<component id="fotaserver" filter="s60" name="FOTA Server">
+<meta rel="config">
+<defined condition="__SYNCML_DM_FOTA"/>
+</meta>
+<!-- uncomment when #ifdefs are resolved -->
+<!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
+</component>
+<component id="fotacustcmds" filter="s60" name="FOTA Custom Commands">
+<!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
+<!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
+</component>
+</collection>
+</package>
+<package id="remoteconn" level="generic" tech-domain="de" name="Remote Connectivity" levels="plugin framework server generic specific">
+<collection id="remoteconn_info" name="Remote Connectivity Info" level="specific">
+<component id="remoteconn_metadata" name="Remote Connectivity Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
+</component>
+</collection>
+<collection id="mtptransports" name="MTP Transports" level="plugin">
+<component id="mtpusbtransport" name="MTP USB Transport" introduced="^2" purpose="optional" class="plugin">
+<unit bldFile="/mw/remoteconn/mtptransports/mtpusbtransport/group" mrp="/mw/remoteconn/mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
+</component>
+<component id="mtpptpiptransport" name="MTP PTP-IP Transport" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/mw/remoteconn/mtptransports/mtpptpiptransport/group" mrp="/mw/remoteconn/mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
+</component>
+<component id="mtpcontroller" name="MTP Controller" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/mw/remoteconn/mtptransports/mtpcontroller/group" mrp="/mw/remoteconn/mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
+</component>
+</collection>
+<collection id="mtpfws" name="MTP Frameworks" level="framework">
+<component id="mtpfw" name="MTP Framework" introduced="^2" purpose="optional">
+<unit bldFile="/mw/remoteconn/mtpfws/mtpfw/group" mrp="/mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/>
+</component>
+</collection>
+<collection id="mtpdataproviders" name="MTP Data Providers" level="generic">
+<component id="mtpfileandfolderdp" name="MTP File and Folder Provider" introduced="^2" purpose="optional" class="plugin">
+<unit bldFile="/mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group" mrp="/mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
+</component>
+<component id="mtpimagedp" name="MTP Image Data Provider" filter="gt" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/mw/remoteconn/mtpdataproviders/mtpimagedp/group" mrp="/mw/remoteconn/mtpdataproviders/mtpimagedp/group/mtp_imagedp.mrp"/>
+</component>
+<component id="mtppictbridgedp" name="MTP PictBridge Data Provider" filter="gt" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/mw/remoteconn/mtpdataproviders/mtppictbridgedp/group" mrp="/mw/remoteconn/mtpdataproviders/mtppictbridgedp/group/mtp_pictbridgedp.mrp"/>
+</component>
+</collection>
+<collection id="backupandrestore" name="Backup and Restore" level="specific">
+<component id="backupengine" name="Backup Engine" introduced="9.0" purpose="optional">
+<unit bldFile="/mw/remoteconn/backupandrestore/backupengine/group" mrp="/mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
+</component>
+<component id="backuptest" name="Backup Test" introduced="^2" purpose="development">
+<unit bldFile="/mw/remoteconn/backupandrestore/backuptest/group" mrp="/mw/remoteconn/backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
+</component>
+</collection>
+<collection id="obex" name="OBEX" level="generic">
+<component id="obexprotocol" name="OBEX Protocol" introduced="9.1" purpose="optional">
+<unit bldFile="/mw/remoteconn/obex/obexprotocol/group" mrp="/mw/remoteconn/obex/obexprotocol/group/obex.mrp"/>
+</component>
+<component id="obexextensionapi" name="OBEX Extension API" introduced="9.2" purpose="optional">
+<unit bldFile="/mw/remoteconn/obex/obexextensionapi/group" mrp="/mw/remoteconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
+</component>
+</collection>
+</package>
+<package id="srvdiscovery" level="generic" tech-domain="de" name="Service Discovery and Usage" levels="plugin framework server generic specific">
+<collection id="upnpstack_plat" name="UPnP Stack Platform Interfaces" level="specific">
+<component id="upnp_device_api" name="UPnP Device API" purpose="optional" introduced="^3" class="api">
+<unit bldFile="/mw/srvdiscovery/upnp/upnpstack_plat/upnp_device_api/group"/>
+</component>
+<component id="upnp_common_api" name="UPnP Common API" purpose="optional" introduced="^3" class="api">
+<unit bldFile="/mw/srvdiscovery/upnp/upnpstack_plat/upnp_common_api/group"/>
+</component>
+<component id="upnp_utils_api" name="UPnP Utils API" purpose="optional" introduced="^3" class="api">
+<unit bldFile="/mw/srvdiscovery/upnp/upnpstack_plat/upnp_utils_api/group"/>
+</component>
+<component id="upnp_control_point_api" 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 id="upnp_httpserver_api" name="UPnP HTTP Server API" purpose="optional" introduced="^3" class="api">
+<unit bldFile="/mw/srvdiscovery/upnp/upnpstack_plat/upnp_httpserver_api/group"/>
+</component>
+<component id="upnp_http_transfer_api" 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 id="servicediscoveryandcontrol" name="Service Discovery and Control" level="framework">
+<component id="servicediscoveryfw" name="Service Discovery Framework" introduced="^3" purpose="optional">
+<unit bldFile="/mw/srvdiscovery/servicediscoveryandcontrol/pnp/group" mrp="/mw/srvdiscovery/servicediscoveryandcontrol/pnp/group/servicediscoveryframework.mrp"/>
+</component>
+</collection>
+<collection id="upnp" name="UPnP" level="server">
+<component id="upnpstack" name="UPnP Stack" introduced="^3" purpose="optional">
+<unit bldFile="/mw/srvdiscovery/upnp/upnpstack/group"/>
+</component>
+</collection>
+<collection id="srvdiscovery_info" name="Service Discovery and Usage Info" level="specific">
+<component id="srvdiscovery_metadata" name="Service Discovery and Usage Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/mw/srvdiscovery/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="dlnasrv" level="specific" tech-domain="de" name="DLNA Services" levels="stack server ctrl framework plugin">
+<!-- uncomment all the units when configuration is in place, they're currently #included from other xxx_build components -->
+<collection id="dlnasrv_plat" name="DLNA Services Platform Interfaces" level="plugin">
+<component id="upnp_media_server_settings_api" name="UPnP Media Server Settings API" class="api" filter="s60">
+<unit bldFile="/mw/dlnasrv/dlnasrv_plat/upnp_media_server_settings_api/group"/>
+</component>
+<component id="upnp_av_objects_api" name="UPnP A/V Objects API" class="api" filter="s60">
+<unit bldFile="/mw/dlnasrv/dlnasrv_plat/upnp_av_objects_api/group"/>
+</component>
+<component id="upnp_media_server_api" name="UPnP Media Server API" class="api" filter="s60">
+<unit bldFile="/mw/dlnasrv/dlnasrv_plat/upnp_media_server_api/group"/>
+</component>
+<component id="upnp_security_plugin_api" name="UPnP Security Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/dlnasrv/dlnasrv_plat/upnp_security_plugin_api/group"/>
+</component>
+<component id="upnp_avcp_api" name="UPnP AVCP API" class="api" filter="s60">
+<unit bldFile="/mw/dlnasrv/dlnasrv_plat/upnp_avcp_api/group"/>
+</component>
+<component id="upnp_media_server_metadata_api" name="UPnP Media Server Metadata API" class="api" filter="s60">
+<unit bldFile="/mw/dlnasrv/dlnasrv_plat/upnp_media_server_metadata_api/group"/>
+</component>
+<component id="upnp_command_api" name="UPnP Command API" class="api" filter="s60">
+<unit bldFile="/mw/dlnasrv/dlnasrv_plat/upnp_command_api/group"/>
+</component>
+<component id="upnp_plugin_api" name="UPnP Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/dlnasrv/dlnasrv_plat/upnp_plugin_api/group"/>
+</component>
+</collection>
+<collection id="upnpavcontrolpoint" name="UPnP A/V Control Point" level="plugin">
+<component id="avcontrolframework" filter="s60" name="A/V Control Famework" introduced="9.1" deprecated="^3">
+<unit bldFile="/mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
+</component>
+<component id="upnpavcontrolpoint_build" filter="s60" name="UPnP A/V Control Point Build" introduced="9.1" deprecated="^3">
+<!-- put exports in other component instead -->
+<unit bldFile="/mw/dlnasrv/upnpavcontrolpoint/group"/>
+</component>
+</collection>
+<collection id="upnpmediaserver" name="UPnP Media Server" level="server">
+<component id="avobjects" filter="s60" name="A/V Objects">
+<unit bldFile="/mw/dlnasrv/upnpmediaserver/avobjects/group"/>
+</component>
+<component id="mediaserverclient" filter="s60" name="Media Server Client">
+<unit bldFile="/mw/dlnasrv/upnpmediaserver/mediaserverclient/group"/>
+</component>
+<component id="connectionmanagerservice" filter="s60" name="Connection Manager Service">
+<unit bldFile="/mw/dlnasrv/upnpmediaserver/connectionmanagerservice/group"/>
+</component>
+<component id="contentdirectoryservice" filter="s60" name="Content Directory Service">
+<unit bldFile="/mw/dlnasrv/upnpmediaserver/contentdirectoryservice/group"/>
+</component>
+<component id="mediaserverengine" filter="s60" name="Media Server Engine">
+<unit bldFile="/mw/dlnasrv/upnpmediaserver/mediaserverengine/group"/>
+</component>
+<component id="upnpmediaserver_build" filter="s60" name="UPnP Media Server Build">
+<!-- move exports into one of above components -->
+<unit bldFile="/mw/dlnasrv/upnpmediaserver/group"/>
+</component>
+</collection>
+<collection id="upnpavcontroller" name="UPnP A/V Controller" level="ctrl">
+<component id="upnpxmlparser" filter="s60" name="UPnP XML Parser" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpavcontroller/upnpxmlparser/group"/>
+</component>
+<component id="upnpavcontrollerserver" filter="s60" name="UPnP A/V Controller Server" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpavcontroller/upnpavcontrollerserver/group"/>
+</component>
+<component id="upnpavcontrollerclient" filter="s60" name="UPnP A/V Ccontroller Client" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpavcontroller/upnpavcontrollerclient/group"/>
+</component>
+<component id="upnpavcontrollerhelper" filter="s60" name="UPnP A/V Controller Helper" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpavcontroller/upnpavcontrollerhelper/group"/>
+</component>
+<component id="upnpavcontroller_build" filter="s60" name="UPnP A/V Controller Build" introduced="^2">
+<!-- move exports content into one of above components -->
+<unit bldFile="/mw/dlnasrv/upnpavcontroller/group"/>
+</component>
+</collection>
+<collection id="upnpframework" name="UPnP Framework" level="framework">
+<component id="upnputilities" filter="s60" name="UPnP Utilities" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpframework/upnputilities/group"/>
+</component>
+<component id="upnpextensionpluginif" filter="s60" name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
+<meta rel="config">
+<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+</meta>
+<!-- <unit bldFile="upnpframework/upnpextensionpluginif/group"/> -->
+</component>
+<component id="upnpfiletransferengine" filter="s60" name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
+<meta rel="config">
+<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+</meta>
+<!-- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>-->
+</component>
+<component id="upnpcommonui" filter="s60" name="UPnP Common UI" introduced="^2" deprecated="^3">
+<meta rel="config">
+<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+</meta>
+<!--<unit bldFile="upnpframework/upnpcommonui/group"/>-->
+</component>
+<component id="upnpaiwengine" filter="s60" name="UPnP AIW Engine" introduced="^2" deprecated="^3">
+<meta rel="config">
+<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+</meta>
+<!--<unit bldFile="upnpframework/upnpaiwengine/group"/> -->
+</component>
+<component id="upnpaiwprovider" filter="s60" name="UPnP AIW Provider" class="plugin" introduced="^2" deprecated="^3">
+<meta rel="config">
+<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+</meta>
+<!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
+</component>
+<component id="upnpmusicadapter" filter="s60" name="UPnP Music Adapter" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
+</component>
+<component id="upnpcommand" filter="s60" name="UPnP Command" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpframework/upnpcommand/group"/>
+</component>
+<component id="upnpframework_build" filter="s60" name="UPnP Framework Build" introduced="^2">
+<!-- move exports content into one of above components -->
+<unit bldFile="/mw/dlnasrv/upnpframework/group"/>
+</component>
+</collection>
+<collection id="upnpsettings" name="UPnP Settings" level="framework">
+<component id="upnpsettingsengine" filter="s60" name="UPnP Settings Engine" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
+</component>
+<component id="multiselectionui" filter="s60" name="Multi-Selection UI" introduced="^2" deprecated="^3">
+<meta rel="config">
+<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+</meta>
+<!--<unit bldFile="upnpsettings/multiselectionui/group"/>-->
+</component>
+<component id="appwizard" filter="s60" name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
+<meta rel="config">
+<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+</meta>
+<!--<unit bldFile="upnpsettings/appwizard/group"/>-->
+</component>
+<component id="upnpsharingui" filter="s60" name="UPnP Sharing UI" introduced="^2" deprecated="^3">
+<meta rel="config">
+<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+</meta>
+<!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
+</component>
+<component id="upnpgsplugin" filter="s60" name="UPnP GS Plugin" class="plugin" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
+</component>
+<component id="upnpsettings_build" filter="s60" name="UPnP Settings Build" introduced="^2">
+<!-- move exports content into one of above components -->
+<unit bldFile="/mw/dlnasrv/upnpsettings/group"/>
+</component>
+</collection>
+<collection id="upnpsharing" name="UPnP Sharing" level="server">
+<component id="upnpdlnaprofiler" filter="s60" name="UPnP DLNA Profiler" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpsharing/upnpdlnaprofiler/group"/>
+</component>
+<component id="upnpsecurity" filter="s60" name="UPnP Security" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpsharing/upnpsecurity/group"/>
+</component>
+<component id="upnpcontentserver" filter="s60" name="UPnP Content Server" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpsharing/upnpcontentserver/group"/>
+</component>
+<component id="applicationengine" filter="s60" name="UPnP Application Engine" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpsharing/applicationengine/group"/>
+</component>
+<component id="upnpsharing_build" filter="s60" name="UPnP Sharing Build" introduced="^2">
+<!-- move exports content into one of above components -->
+<unit bldFile="/mw/dlnasrv/upnpsharing/group"/>
+</component>
+</collection>
+<collection id="upnpmpxplugins" name="UPnP MPX Plugins" level="plugin">
+<component id="upnpplaybackplugins" filter="s60" name="UPnP Playback Plugins" class="plugin" introduced="^2">
+<unit bldFile="/mw/dlnasrv/upnpmpxplugins/upnpplaybackplugins/group"/>
+</component>
+<component id="upnpmpxplugins_build" filter="s60" name="UPnP MPX Plugins Build" introduced="^2">
+<!-- move exports content into other component? -->
+<unit bldFile="/mw/dlnasrv/upnpmpxplugins/group"/>
+</component>
+</collection>
+<collection id="upnpharvester" name="UPnP Harvester" level="ctrl">
+<meta rel="config">
+<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+</meta>
+<component id="upnpharvester_common" filter="s60" name="UPnP Harvester Common" introduced="^2" deprecated="^3">
+<!-- need to merge or #include these to a single bld.inf -->
+<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
+ <unit bldFile="upnpharvester/common/cmsettings/group"/>
+ <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
+ <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
+</component>
+<component id="cdssync" filter="s60" name="CDS Sync" introduced="^2" deprecated="^3">
+<!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
+</component>
+<component id="mdhserver" filter="s60" name="Metadata Harvester Server" introduced="^2" deprecated="^3">
+<!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
+</component>
+<component id="upnpharvester_build" filter="s60" name="UPnP Harvester Build" introduced="^2" deprecated="^3">
+<!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
+<!--<unit bldFile="upnpharvester/group"/>-->
+</component>
+</collection>
+<collection id="homesync" name="Home Sync" level="plugin">
+<meta rel="config">
+<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+</meta>
+<component id="contentmanager" filter="s60" name="Content Manager" introduced="^2" deprecated="^3">
+<!-- <unit bldFile="homesync/group"/>-->
+<!-- move bld.inf into contentmanager dir -->
+</component>
+</collection>
+<collection id="homemedia" name="Home Media" level="framework">
+<meta rel="config">
+<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+</meta>
+<!-- collection is really just a component. Move down a directory -->
+<component id="homemedia_build" filter="s60" name="Home Media" introduced="^2" deprecated="^3">
+<!-- <unit bldFile="homemedia/group"/> -->
+</component>
+</collection>
+<collection id="dlnasrv_info" name="DLNA Services Info" level="plugin">
+<component id="dlnasrv_build" filter="s60" name="DLNA Services Build">
+<!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed -->
+<unit bldFile="/mw/dlnasrv/group"/>
+</component>
+
+</collection>
+</package>
+<package id="btservices" level="generic" tech-domain="de" name="Bluetooth Services" levels="framework server generic specific plugin">
+<collection id="btservices_pub" name="BT Services Public Interfaces" level="plugin">
+<component id="bluetooth_power_state_api" name="Bluetooth Power State API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_pub/bluetooth_power_state_api/group"/>
+</component>
+<component id="bluetooth_notifier_api" name="Bluetooth Notifier API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_pub/bluetooth_notifier_api/group"/>
+</component>
+</collection>
+<collection id="btservices_plat" name="BT Services Platform Interfaces" level="plugin">
+<component id="bluetooth_dosserver_audio_api" name="Bluetooth DOS Server Audio API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_dosserver_audio_api/group"/>
+</component>
+<component id="bluetooth_dut_mode_api" name="Bluetooth DUT Mode API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_dut_mode_api/group"/>
+</component>
+<component id="bluetooth_engine_api" name="Bluetooth Engine API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_engine_api/group"/>
+</component>
+<component id="bluetooth_engine_connection_management_api" name="Bluetooth Engine Connection Management API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_engine_connection_management_api/group"/>
+</component>
+<component id="bluetooth_engine_device_management_api" name="Bluetooth Engine Device Management API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_engine_device_management_api/group"/>
+</component>
+<component id="bluetooth_engine_discovery_api" name="Bluetooth Engine Discovery API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_engine_discovery_api/group"/>
+</component>
+<component id="bluetooth_engine_features_api" name="Bluetooth Engine Features API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_engine_features_api/group"/>
+</component>
+<component id="bluetooth_engine_settings_api" name="Bluetooth Engine Settings API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_engine_settings_api/group"/>
+</component>
+<component id="bluetooth_engine_plugin_api" name="Bluetooth Engine Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_engine_plugin_api/group"/>
+</component>
+<component id="bluetooth_local_variation_api" name="Bluetooth Local Variation API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_local_variation_api/group"/>
+</component>
+<component id="bluetooth_notifier_internal_api" name="Bluetooth Notifier internal API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_notifier_internal_api/group"/>
+</component>
+<component id="bluetooth_sap_connection_state_api" name="Bluetooth SAP Connection State API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_sap_connection_state_api/group"/>
+</component>
+<component id="bluetooth_secondary_display_notification_api" name="Bluetooth Secondary Display Notification API" class="api" filter="s60">
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_secondary_display_notification_api/group"/>
+</component>
+</collection>
+<collection id="bluetoothengine" name="Bluetooth Engine" level="framework">
+<component id="bteng" filter="s60" name="Bluetooth Engine">
+<unit bldFile="/mw/btservices/bluetoothengine/bteng/group"/>
+</component>
+<component id="btnotif" filter="s60" name="Bluetooth Notifier">
+<unit bldFile="/mw/btservices/bluetoothengine/btnotif/group"/>
+</component>
+<component id="btaudioman" filter="s60" name="Bluetooth Audio Manager">
+<unit bldFile="/mw/btservices/bluetoothengine/btaudioman/group"/>
+</component>
+<component id="btmac" filter="s60" name="Bluetooth Mono Audio Controller" class="plugin">
+<unit bldFile="/mw/btservices/bluetoothengine/btmac/group"/>
+</component>
+<component id="btsac" filter="s60" name="Bluetooth Stereo Audio Controller" class="plugin">
+<unit bldFile="/mw/btservices/bluetoothengine/btsac/group"/>
+</component>
+<component id="btaudiostreamer" filter="s60" name="Bluetooth Audio Streamer">
+<unit bldFile="/mw/btservices/bluetoothengine/btaudiostreamer/group"/>
+</component>
+<component id="btsap" filter="s60" name="Bluetooth SIM Access Profile" class="plugin">
+<unit bldFile="/mw/btservices/bluetoothengine/btsap/group"/>
+</component>
+<component id="btui" filter="s60" name="Bluetooth UI">
+<unit bldFile="/mw/btservices/bluetoothengine/btui/group"/>
+</component>
+<component id="btpbap" filter="s60" name="Bluetooth Phonebook Access Profile" class="plugin">
+<unit bldFile="/mw/btservices/bluetoothengine/btpbap/group"/>
+</component>
+<component id="bthid" filter="s60" name="Bluetooth HID">
+<unit bldFile="/mw/btservices/bluetoothengine/bthid/group"/>
+</component>
+<component id="btctrldcmoadapter" filter="s60" name="Bluetooth Control DCMO Adapter" class="plugin" introduced="^3">
+<unit bldFile="/mw/btservices/bluetoothengine/btctrldcmoadapter/group"/>
+</component>
+<component id="btserviceutil" filter="s60" name="Bluetooth Service Utils">
+<unit bldFile="/mw/btservices/bluetoothengine/btserviceutil/group"/>
+</component>
+<component id="btnotifclient" filter="s60" name="Bluetooth Notifier Client">
+<unit bldFile="/mw/btservices/bluetoothengine/btnotif/btnotifclient/group"/>
+</component>
+</collection>
+<collection id="bluetoothappprofiles" name="Bluetooth Application Profiles" level="plugin">
+<component id="avrcp" name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
+<unit bldFile="/mw/btservices/bluetoothappprofiles/avrcp" mrp="/mw/btservices/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
+</component>
+</collection>
+<collection id="atcommands" name="AT Commands" level="generic">
+<component id="modematplugin" name="Modem AT Plugin" filter="s60" class="plugin" introduced="^4">
+<unit bldFile="/mw/btservices/atcommands/modematplugin/group"/>
+</component>
+<component id="lccustomplugin" name="LC Custom Plugin" filter="s60" class="plugin" introduced="^4">
+<unit bldFile="/mw/btservices/atcommands/lccustomplugin/group"/>
+</component>
+</collection>
+<collection id="cbsatplugin" name="CBS AT Plugin">
+<component id="atmisccmdplugin" name="AT Misc Commands Plugin" filter="s60" class="plugin" introduced="^4">
+<unit bldFile="/mw/btservices/cbsatplugin/atmisccmdplugin/group"/>
+</component>
+</collection>
+<collection id="btservices_info" name="BT Services Info" level="plugin">
+<component id="btservices_metadata" name="BT Services Metadata" class="config" introduced="^3" purpose="development" target="desktop">
+<unit mrp="/mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
+</component>
+
+</collection>
+</package>
+<package id="usbservices" level="generic" tech-domain="de" name="USB Services" levels="framework server generic specific plugin">
+<collection id="usbservices_plat" name="USB Services Platform Interfaces" level="plugin">
+<component id="pictbridge_api" name="PictBridge API" class="api" filter="s60">
+<unit bldFile="/mw/usbservices/usbservices_plat/pictbridge_api/group"/>
+</component>
+<component id="ptp_responder_api" name="PTP Responder API" class="api" filter="s60">
+<unit bldFile="/mw/usbservices/usbservices_plat/ptp_responder_api/group"/>
+</component>
+<component id="ptp_transport_api" name="PTP Transport API" class="api" filter="s60">
+<unit bldFile="/mw/usbservices/usbservices_plat/ptp_transport_api/group"/>
+</component>
+<component id="usb_device_control_plugin_api" name="USB Device Control Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/usbservices/usbservices_plat/usb_device_control_plugin_api/group"/>
+</component>
+<component id="usb_notifier_api" name="USB Notifier API" class="api" filter="s60">
+<unit bldFile="/mw/usbservices/usbservices_plat/usb_notifier_api/group"/>
+</component>
+<component id="usb_personality_api_header" name="USB Personality API" class="api" filter="s60">
+<unit bldFile="/mw/usbservices/usbservices_plat/usb_personality_api_header/group"/>
+</component>
+<component id="usb_personality_plugin_api" name="USB Personality Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/usbservices/usbservices_plat/usb_personality_plugin_api/group"/>
+</component>
+<component id="usb_secondary_display_api" name="USB Secondary Display API" class="api" filter="s60">
+<unit bldFile="/mw/usbservices/usbservices_plat/usb_secondary_display_api/group"/>
+</component>
+<component id="usb_watcher_api" name="USB Watcher API" class="api" filter="s60">
+<unit bldFile="/mw/usbservices/usbservices_plat/usb_watcher_api/group"/>
+</component>
+<component id="usb_watcher_info_api_header" name="USB Watcher Info API" class="api" filter="s60">
+<unit bldFile="/mw/usbservices/usbservices_plat/usb_watcher_info_api_header/group"/>
+</component>
+</collection>
+<collection id="usbengines" name="USB Engines" level="generic">
+<component id="usbotgwatcher" filter="s60" name="USB OTG Watcher">
+<unit bldFile="/mw/usbservices/usbengines/usbotgwatcher/group"/>
+</component>
+<component id="usbwatcher" filter="s60" name="USB Watcher">
+<unit bldFile="/mw/usbservices/usbengines/usbwatcher/group"/>
+</component>
+<component id="usblocodplugin" filter="s60" name="USB Local Connectivity Domain Plugin" class="plugin">
+<unit bldFile="/mw/usbservices/usbengines/usblocodplugin/group"/>
+</component>
+<component id="usbdevcon" filter="s60" name="USB Device Control">
+<unit bldFile="/mw/usbservices/usbengines/usbdevcon/group"/>
+</component>
+<component id="usbremotepersonality" filter="s60" name="USB Remote Personality">
+<unit bldFile="/mw/usbservices/usbengines/usbremotepersonality/group"/>
+</component>
+</collection>
+<collection id="usbclasses" name="USB Classes" level="framework">
+<component id="usbobexclasscontroller" filter="s60" name="USB OBEX Class Controller" class="plugin">
+<unit bldFile="/mw/usbservices/usbclasses/usbobexclasscontroller/group"/>
+</component>
+<component id="usbbasicpersonality" filter="s60" name="USB Basic Personality" class="plugin">
+<unit bldFile="/mw/usbservices/usbclasses/usbbasicpersonality/group"/>
+</component>
+<component id="usbmscpersonality" filter="s60" name="USB MSC Personality" class="plugin">
+<unit bldFile="/mw/usbservices/usbclasses/usbmscpersonality/group"/>
+</component>
+<!-- commented out in bld.inf. Should this be deleted?
+ <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
+ <unit bldFile="usbclasses/ptpstack/group"/>
+ </component>
+ <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
+ <unit bldFile="usbclasses/sicdusbplugin/group"/>
+ </component>
+ <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
+ <unit bldFile="usbclasses/ptpserver/group"/>
+ </component>-->
+<component id="pictbridgeengine" filter="s60" name="PictBridge Engine">
+<unit bldFile="/mw/usbservices/usbclasses/pictbridgeengine/group"/>
+</component>
+<component id="usbphoneasmodem" filter="s60" name="USB Phone as Modem" introduced="^3">
+<unit bldFile="/mw/usbservices/usbclasses/usbphoneasmodem/group"/>
+</component>
+</collection>
+<collection id="usbuis" name="USB UIs" level="specific">
+<component id="usbui" filter="s60" name="USB UI">
+<unit bldFile="/mw/usbservices/usbuis/usbui/group"/>
+</component>
+<component id="usbuinotif" filter="s60" name="USB UI Notifiers">
+<unit bldFile="/mw/usbservices/usbuis/usbuinotif/group"/>
+</component>
+<component id="imageprintuiprovider" filter="s60" name="ImagePrint UI Provider" class="plugin">
+<unit bldFile="/mw/usbservices/usbuis/imageprintuiprovider/group"/>
+</component>
+<component id="usbimageprintui" filter="s60" name="ImagePrint UI">
+<unit bldFile="/mw/usbservices/usbuis/imageprintui/group"/>
+</component>
+<component id="usbuiqt" name="USB UI Qt" introduced="^4" filter="s60">
+<unit bldFile="/mw/usbservices/usbuis/usbuiqt" qt:proFile="usbapplication.pro"/>
+</component>
+</collection>
+<collection id="usbservices_test" name="USB Services Test" level="server">
+
+</collection>
+</package>
+<package id="shortlinkconn" level="generic" tech-domain="de" name="Shortlink Connectivity" levels="framework server generic specific plugin">
+<!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
+<collection id="shortlinkconn_plat" name="Shortlink Connectivity Platform Interfaces" level="plugin">
+<component id="obex_service_utils_api" name="OBEX Service Utils API" class="api" filter="s60">
+<unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/obex_service_utils_api/group"/>
+</component>
+<component id="obex_service_plugin_api" name="OBEX Service Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/obex_service_plugin_api/group"/>
+</component>
+<component id="dialup_connection_status_api" name="Dial-up Connection Status API" class="api" filter="s60">
+<unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/dialup_connection_status_api/group"/>
+</component>
+<component id="dun_secondary_display_notification_api" name="DUN Secondary Display Notification API" class="api" filter="s60">
+<unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
+</component>
+<component id="obex_secondary_display_notification_api" name="OBEX Secondary Display Notification API" class="api" filter="s60">
+<unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
+</component>
+<component id="generic_hid_api" name="Generic HID API" class="api" filter="s60">
+<unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/generic_hid_api/group"/>
+</component>
+<component id="locod_bearer_plugin_api" name="Locod Bearer Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/locod_bearer_plugin_api/group"/>
+</component>
+<component id="usb_obexservicemanager_client_api" name="USB OBEX Service Manager Client API" class="api" filter="s60">
+<unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/usb_obexservicemanager_client_api/group"/>
+</component>
+</collection>
+<collection id="localconnectivityservice" name="Local Connectivity Service" level="server">
+<component id="locod" name="Local Connectivity Daemon">
+<unit bldFile="/mw/shortlinkconn/localconnectivityservice/locod/group"/>
+</component>
+<component id="obexserviceman" name="OBEX Service Managar">
+<unit bldFile="/mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
+</component>
+<component id="obexsendservices" name="OBEX Send Services">
+<unit bldFile="/mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
+</component>
+<component id="obexreceiveservices" name="OBEX Receive Services">
+<unit bldFile="/mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
+</component>
+<component id="dun" name="Dial Up Networking">
+<unit bldFile="/mw/shortlinkconn/localconnectivityservice/dun/group"/>
+</component>
+<component id="generichid" name="Generic HID">
+<unit bldFile="/mw/shortlinkconn/localconnectivityservice/generichid/group"/>
+</component>
+<component id="headset" name="Headset">
+<unit bldFile="/mw/shortlinkconn/localconnectivityservice/headset/group"/>
+</component>
+</collection>
+</package>
+<package id="imghandling" level="specific" tech-domain="mm" name="Image Handling" levels="lib util if">
+<collection id="imagehandling_plat" name="Image Handling Platform Interfaces" level="if">
+<component id="image_handling_library_api" name="Image Handling Library API" class="api" filter="s60">
+<unit bldFile="/mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
+</component>
+<component id="3gp_library_api" name="3GP Library API" class="api" filter="s60">
+<unit bldFile="/mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
+</component>
+<component id="thumbnailmanager_api" name="Thumbnail Manager API" class="api" filter="s60">
+<unit bldFile="/mw/imghandling/imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
+
+</component>
+</collection>
+<collection id="imagehandlinglib" name="Image Handling Library" level="lib">
+<!-- collection is really a component, need to move down a directory -->
+<component id="ihl" filter="s60" name="IHL">
+<unit bldFile="/mw/imghandling/imagehandlinglib/group"/>
+</component>
+
+</collection>
+<collection id="imagehandlingutilities" name="Image Handling Utilities" level="util">
+<component id="thumbnailmanager" filter="s60" name="Thumbnail Manager">
+<unit bldFile="/mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
+</component>
+<component id="thumbnailmanagerqt" filter="s60" name="Thumbnail Manager Qt" introduced="^4">
+<unit bldFile="/mw/imghandling/imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt" qt:proFile="thumbnailmanagerqt.pro" qt:qmakeArgs="-r" filter="!test"/>
+
+</component>
+</collection>
+</package>
+<package id="metadatasrv" level="specific" tech-domain="mm" name="Legacy Metadata Services" levels="plugin framework server generic specific">
+<collection id="metadatasrv_pub" name="Legacy Metadata Services Public Interfaces" level="specific">
+<component id="media_fetch_api" name="Media Fetch API" class="api" filter="s60">
+<unit bldFile="/mw/metadatasrv/metadatasrv_pub/media_fetch_api/group"/>
+</component>
+</collection>
+<collection id="metadatasrv_plat" name="Legacy Metadata Services Platform Interfaces" level="specific">
+<component id="media_fetch_implementation_api" name="Media Fetch Implementation API" class="api" filter="s60">
+<unit bldFile="/mw/metadatasrv/metadatasrv_plat/media_fetch_implementation_api/group"/>
+</component>
+</collection>
+<collection id="mediamanagementutilities" name="Media Management Utilities" level="generic">
+<component id="mediafetch" filter="s60" name="Media Fetch">
+<unit bldFile="/mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
+</component>
+</collection>
+</package>
+<package id="mds" level="specific" tech-domain="mm" name="Metadata Services" levels="mgr eng server int">
+<collection id="mds_plat" name="Metadata Services Platform Interfaces" level="int">
+<component id="context_engine_plugin_api" name="Context Engine Plugin API" introduced="^2" class="api" filter="s60">
+<unit bldFile="/mw/mds/mds_plat/context_engine_plugin_api/group" filter="!test"/>
+
+</component>
+<component id="harvester_framework_api" name="Harvester Framework API" introduced="^2" class="api" filter="s60">
+<unit bldFile="/mw/mds/mds_plat/harvester_framework_api/group" filter="!test"/>
+
+<!-- can only have one unit with the same filter, #include the following from the previous unit -->
+
+
+
+
+
+</component>
+<component id="location_manager_api" name="Location Manager API" introduced="^2" class="api" filter="s60">
+<unit bldFile="/mw/mds/mds_plat/location_manager_api/group" filter="!test"/>
+
+</component>
+<component id="metadata_engine_api" name="Metadata Engine API" introduced="^2" class="api" filter="s60">
+<unit bldFile="/mw/mds/mds_plat/metadata_engine_api/group" filter="!test"/>
+
+</component>
+<component id="content_listing_framework_collection_manager_api" name="Content Listing Framework Collection Manager API" introduced="^2" class="api" filter="s60">
+<meta rel="config">
+<defined condition="RD_MDS_2_5"/>
+</meta>
+<unit bldFile="/mw/mds/mds_plat/content_listing_framework_collection_manager_api/group" filter="!test"/>
+
+</component>
+<component id="content_listing_framework_extended_api" name="Content Listing Framework Extended API" introduced="^2" class="api" filter="s60">
+<meta rel="config">
+<defined condition="RD_MDS_2_5"/>
+</meta>
+<unit bldFile="/mw/mds/mds_plat/content_listing_framework_extended_api/group"/>
+</component>
+</collection>
+<collection id="mds_pub" name="Metadata Services Public Interfaces" level="int">
+<component id="content_listing_framework_api" name="Content Listing Framework API" introduced="^2" class="api" filter="s60">
+<meta rel="config">
+<defined condition="RD_MDS_2_5"/>
+</meta>
+<unit bldFile="/mw/mds/mds_pub/content_listing_framework_api/group" filter="!test"/>
+
+</component>
+</collection>
+<collection id="metadataengine" name="Metadata Engine" level="eng">
+<component id="metadataengine_common" filter="s60" name="Metadata Engine Common" introduced="^2">
+<unit bldFile="/mw/mds/metadataengine/common/group"/>
+</component>
+<component id="metadataengine_server" filter="s60" name="Metadata Engine Server" introduced="^2">
+<unit bldFile="/mw/mds/metadataengine/server/group"/>
+</component>
+<component id="metadataengine_client" filter="s60" name="Metadata Engine Client" introduced="^2">
+<unit bldFile="/mw/mds/metadataengine/client/group"/>
+</component>
+<component id="metadataengine_build" filter="s60" name="Metadata Engine Build" introduced="^2">
+<!--make this collection a single component, or split this bld.inf into the other units -->
+<unit bldFile="/mw/mds/metadataengine/group"/>
+</component>
+</collection>
+<collection id="locationmanager" name="Location Manager" level="mgr">
+<component id="locationtrail" filter="s60" name="Location Trail" introduced="^2">
+<unit bldFile="/mw/mds/locationmanager/locationtrail/group"/>
+</component>
+<component id="locationmanager_server" filter="s60" name="Location Manager Server" introduced="^2">
+<unit bldFile="/mw/mds/locationmanager/server/group"/>
+</component>
+<component id="locationmanager_client" filter="s60" name="Location Manager Client" introduced="^2">
+<unit bldFile="/mw/mds/locationmanager/client/group"/>
+</component>
+<component id="locationmanager_build" filter="s60" name="Location Manager Build" introduced="^2">
+<!--make this collection a single component, or split this bld.inf into the other units -->
+<unit bldFile="/mw/mds/locationmanager/group"/>
+</component>
+</collection>
+<collection id="contextengine" name="Context Engine" level="eng">
+<component id="contextengine_plugins" filter="s60" name="Context Engine Plugins" class="plugin" introduced="^2">
+<unit bldFile="/mw/mds/contextengine/plugins/group"/>
+</component>
+<component id="contextengine_build" filter="s60" name="Context Engine Build" introduced="^2">
+<!--make this collection a single component, or make this unit self-contained -->
+<unit bldFile="/mw/mds/contextengine/group"/>
+</component>
+</collection>
+<collection id="harvester" name="Harvester" level="eng">
+<component id="blacklistclient" filter="s60" name="Blacklist Client" introduced="^2">
+<unit bldFile="/mw/mds/harvester/blacklistclient/group"/>
+</component>
+<component id="blacklistserver" filter="s60" name="Blacklist Server" introduced="^2">
+<unit bldFile="/mw/mds/harvester/blacklistserver/group"/>
+</component>
+<component id="harvester_common" filter="s60" name="Harvester Common" introduced="^2">
+<unit bldFile="/mw/mds/harvester/common/group"/>
+</component>
+<component id="composerplugins" filter="s60" name="Composer Plugins" class="plugin" introduced="^2">
+<unit bldFile="/mw/mds/harvester/composerplugins/group"/>
+</component>
+<component id="harvesterplugins" filter="s60" name="Harvester Plugins" class="plugin" introduced="^2">
+<unit bldFile="/mw/mds/harvester/harvesterplugins/group"/>
+</component>
+<component id="monitorplugins" filter="s60" name="Monitor Plugins" class="plugin" introduced="^2">
+<unit bldFile="/mw/mds/harvester/monitorplugins/group"/>
+</component>
+<component id="harvester_server" filter="s60" name="Harvester Server" introduced="^2">
+<unit bldFile="/mw/mds/harvester/server/group"/>
+</component>
+<component id="harvester_client" filter="s60" name="Harvester Client" introduced="^2">
+<unit bldFile="/mw/mds/harvester/client/group"/>
+</component>
+<component id="harvester_build" filter="s60" name="Harvester Build" introduced="^2">
+<!-- split these exports into the other components -->
+<unit bldFile="/mw/mds/harvester/group"/>
+</component>
+</collection>
+<collection id="watchdog" name="Watchdog" level="server">
+<!-- collection is really a component. Move down a directory -->
+<component id="mdswatchdog" filter="s60" name="Metadata Watchdog" introduced="^2">
+<unit bldFile="/mw/mds/watchdog/group"/>
+</component>
+</collection>
+<collection id="clfwrapper" name="Content Listing Framework Wrapper" level="int">
+<!-- collection is really a component. Move down a directory -->
+<meta rel="config">
+<defined condition="RD_MDS_2_5"/>
+</meta>
+<component id="clfwrapper_build" filter="s60" name="CLF Wrapper Build" introduced="^2">
+<!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
+<!--<unit bldFile="clfwrapper/group"/>-->
+</component>
+</collection>
+<collection id="mds_info" name="Metadata Services Info" level="int">
+<component id="mds_build" filter="s60" name="Metadata Services Build" introduced="^2">
+<!-- consider distributiing this into the rest of the components in the package -->
+<unit bldFile="/mw/mds/group"/>
+</component>
+</collection>
+</package>
+<package id="videoutils" level="specific" tech-domain="mm" name="Video Utils" levels="eng util if">
+<collection id="videoutils_plat" name="Video Utils Platform Interfaces" level="if">
+<component id="videoscheduler_api" name="Video Scheduler API" class="api" filter="s60">
+<unit bldFile="/mw/videoutils/videoutils_plat/videoscheduler_api/group"/>
+</component>
+<component id="videoplayer_constants_api" name="Videoplayer Constants API" class="api" filter="s60">
+<unit bldFile="/mw/videoutils/videoutils_plat/videoplayer_constants_api/group"/>
+</component>
+</collection>
+<collection id="videoscheduler" name="Video Scheduler" level="util">
+<!-- don't build these -->
+<component id="schedulerclient" filter="s60" name="Video Scheduler Client">
+
+</component>
+<component id="schedulerserver" filter="s60" name="Video Scheduler Server">
+
+</component>
+</collection>
+</package>
+<package id="mmmw" level="generic" tech-domain="mm" name="Multimedia Middleware" levels="plugin framework server generic specific">
+<collection id="mmmw_plat" name="Multimedia Middleware Platform Interfaces" level="specific">
+<component id="multimedia_data_source_api" name="Multimedia Data Source API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
+</component>
+<component id="progressive_download_api" name="Progressive Download API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/progressive_download_api/group"/>
+</component>
+<component id="equalizer_ui_api" name="Equalizer UI API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
+</component>
+<component id="enhanced_media_client_api" name="Enhanced Media Client API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
+</component>
+<component id="stream_control_custom_command_api" name="Stream Control Custom Command API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
+</component>
+<component id="emc_buffer_source_api" name="EMC Buffer Source API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/emc_buffer_source_api/group"/>
+</component>
+<component id="emc_file_source_api" name="EMC File Source API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
+</component>
+<component id="audio_metadata_reader_api" name="Audio MetaData Reader API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
+</component>
+<component id="emc_progressive_download_source_api" name="EMC Progressive Download Source API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
+</component>
+<component id="emc_volume_effect_api" name="EMC Volume Effect API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
+</component>
+<component id="emc_balance_effect_api" name="EMC Balance Effect API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/emc_balance_effect_api/group"/>
+</component>
+<component id="emc_descriptor_source_api" name="EMC Descriptor Source API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/emc_descriptor_source_api/group"/>
+</component>
+<component id="emc_drm_config_intfc_api" name="EMC DRM Config Intfc API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
+</component>
+<component id="voip_audio_services_api" name="VoIP Audio Services" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/voip_audio_services_api/group"/>
+</component>
+<component id="configuration_components_factory_api" name="Configuration Components Factory API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
+</component>
+<component id="audio_output_control_utility_api" name="Audio Output Control Utility API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/audio_output_control_utility_api/group"/>
+</component>
+<component id="audio_output_control_utility_proxy_api" name="Audio Output Control Utility Proxy API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
+</component>
+<component id="emc_audio_effects_api" name="EMC Audio Effects API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
+</component>
+<component id="call_audio_control_api" name="Call AudioControl API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/call_audio_control_api/group"/>
+</component>
+<component id="radio_utilities_api" name="Radio Utilities API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/radio_utilities_api/group"/>
+</component>
+<component id="radio_preset_utilities_api" name="Radio Preset Utilities API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
+</component>
+<component id="radio_monitor_api" name="Radio Monitor API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
+</component>
+<component id="thumbnail_engine_api" name="Thumbnail Engine API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/thumbnail_engine_api/group"/>
+</component>
+<component id="telephony_multimedia_service_api" name="Telephony Multimedia Service API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
+
+</component>
+<component id="openmax_al_api" name="OpenMAX AL API" class="api" filter="s60" introduced="^4">
+<unit bldFile="/mw/mmmw/mmmw_plat/openmax_al_api/group"/>
+</component>
+<component id="system_tone_service_api" name="System Tone Service API" class="api" filter="s60" introduced="^4">
+<unit bldFile="/mw/mmmw/mmmw_plat/system_tone_service_api/group"/>
+</component>
+</collection>
+<collection id="mmfenh" name="MMF Enhancements" level="generic">
+<component id="advancedaudiocontroller" filter="s60" name="Advanced Audio Controllers" class="plugin">
+<unit bldFile="/mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
+</component>
+<component id="audiooutputcontrolutility" filter="s60" name="Audio Output Control Utility">
+<unit bldFile="/mw/mmmw/mmfenh/audiooutputcontrolutility/group"/>
+</component>
+<component id="configurationcomponentsfactory" filter="s60" name="Configuration Components Factory">
+<unit bldFile="/mw/mmmw/mmfenh/configurationcomponentsfactory/group"/>
+</component>
+<component id="enhancedaudioplayerutility" filter="s60" name="Enhanced Audio Player Utility">
+<unit bldFile="/mw/mmmw/mmfenh/enhancedaudioplayerutility/group"/>
+</component>
+<component id="enhancedmediaclient" filter="s60" name="Enhanced Media Client">
+<unit bldFile="/mw/mmmw/mmfenh/enhancedmediaclient/group"/>
+</component>
+<component id="profilesettingsmonitor" filter="s60" name="Profile Settings Monitor">
+<unit bldFile="/mw/mmmw/mmfenh/profilesettingsmonitor/group"/>
+</component>
+<component id="progressivedownload" filter="s60" name="Progressive Download">
+<unit bldFile="/mw/mmmw/mmfenh/progressivedownload/group"/>
+</component>
+
+</collection>
+<collection id="mm_fw" name="Multimedia Frameworks" level="framework">
+<!-- Id needs to be unique, mmfw already in use -->
+<!-- Placeholder for OpenAX AL and other stuff -->
+</collection>
+<collection id="mmserv" name="Multimedia Services" level="specific">
+<component id="audioeffectsui" filter="s60" name="Audio Effects UI">
+<unit bldFile="/mw/mmmw/mmserv/audioeffectsui/group"/>
+</component>
+<component id="callaudiocontrol" filter="s60" name="Call Audio Control">
+<unit bldFile="/mw/mmmw/mmserv/callaudiocontrol/group"/>
+</component>
+<component id="metadatautility" filter="s60" name="Metadata Utility">
+<unit bldFile="/mw/mmmw/mmserv/metadatautility/group"/>
+</component>
+<component id="radioutility" filter="s60" name="Radio Utility">
+<unit bldFile="/mw/mmmw/mmserv/radioutility/group"/>
+</component>
+<component id="thumbnailengine" filter="s60" name="Thumbnail Engine" introduced="^2">
+<unit bldFile="/mw/mmmw/mmserv/thumbnailengine/group"/>
+</component>
+<component id="tms" filter="s60" name="Telephony Multimedia Service" introduced="^3">
+<unit bldFile="/mw/mmmw/mmserv/tms/group"/>
+</component>
+<component id="voipaudioservices" filter="s60" name="VoIP Audio Services">
+<unit bldFile="/mw/mmmw/mmserv/voipaudioservices/group"/>
+</component>
+<component id="lib3gpextparser" filter="s60" name="3GP Extension Metadata Parser Library">
+<unit bldFile="/mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group"/>
+</component>
+<component id="sts" name="System Tone Service" filter="s60" introduced="^4">
+<unit bldFile="/mw/mmmw/mmserv/sts/group"/>
+</component>
+</collection>
+<collection id="mmmw_info" name="Multimedia Middleware Info" level="specific">
+
+<component id="mmmw_metadata" name="Multimedia Middleware Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="gstreamer" level="generic" tech-domain="mm" name="GStreamer" levels="plugin core api">
+<meta rel="config">
+<defined condition="FF_GSTREAMER"/>
+</meta>
+<!-- Uncomment all units when configuration is in place. All currently #included from gstreamer_build -->
+<!-- structure matches planned directory layout -->
+<collection id="gstreamerfw" name="GStreamer Framework" level="core">
+<component id="gstreamer_core" name="GStreamer Core" introduced="^3">
+<!--<unit bldFile="gstreamer_core/group"/>-->
+</component>
+</collection>
+<collection id="gst_plugins" name="GStreamer Plugins" level="plugin">
+<component id="gst_plugins_base" name="GStreamer Base Plugins" introduced="^3">
+<!--<unit bldFile="gst_plugins_base/group"/>-->
+</component>
+<component id="gst_plugins_good" name="GStreamer Good Plugins" introduced="^3">
+<!--<unit bldFile="gst_plugins_good/group"/>-->
+</component>
+<component id="gst_plugins_symbian" filter="s60" name="GStreamer Sybmian Plugins" introduced="^3">
+<!--<unit bldFile="gst_plugins_symbian/group" filter="!test"/>-->
+<!--<unit bldFile="gst_plugins_symbian/tsrc/GStreamerTestModule/group" filter="test,pref_test"/>-->
+</component>
+</collection>
+<collection id="gstregistrygenerator" name="GStreamer Registry Generator" level="core">
+<!-- collection is really a component. Move down an directory -->
+<component id="gstregistrygenerator_build" filter="s60" name="GStreamer Registry Generator Build" introduced="^3">
+<!-- <unit bldFile="gstregistrygenerator/group"/>-->
+</component>
+</collection>
+<collection id="gst_test_apps" name="GStreamer Test Applications" level="api">
+<component id="gst_player" filter="s60" name="GStreamer Player" introduced="^3" purpose="development">
+<!-- <unit bldFile="gst_test_apps/gst_player/group"/>-->
+</component>
+</collection>
+<collection id="gstreamer_info" name="GStreamer Info" level="api">
+<component id="gstreamer_build" filter="s60" name="GStreamer Build" introduced="^3">
+<!-- make this a ROM component or split up instead? -->
+<unit bldFile="/mw/gstreamer/group"/>
+</component>
+</collection>
+</package>
+<package id="helix" level="generic" tech-domain="mm" name="Helix" levels="plugin framework server generic specific">
+<collection id="helix_ren" name="Helix Engine" level="framework">
+<!-- what does "ren" stand for? -->
+<component id="helix_stub" filter="s60" name="Helix Stub" class="api" introduced="^2">
+<unit bldFile="/mw/helix/helix_ren/helix_stub/group"/>
+</component>
+</collection>
+</package>
+<package id="camerasrv" level="specific" tech-domain="mm" name="Camera Services" levels="plugin fw api">
+<collection id="camerasrv_plat" name="Camera Services Platform Interfaces" level="api">
+<component id="media_recorder_sink_api" name="Media Recorder Sink API" class="api" filter="s60">
+<unit bldFile="/mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
+</component>
+<component id="custom_onboard_camera_api" name="Custom Onboard Camera API" class="api" filter="s60">
+<unit bldFile="/mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
+</component>
+<component id="imaging_configuration_manager_api" name="Imaging Configuration Manager API" class="api" filter="s60">
+<unit bldFile="/mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
+
+</component>
+<component id="media_recorder_api" name="Media Recorder API" class="api" filter="s60">
+<unit bldFile="/mw/camerasrv/camerasrv_plat/media_recorder_api/group" filter="!test"/>
+
+</component>
+<component id="3gp_file_composer_api" name="3GP File Composer API" class="api" filter="s60">
+<unit bldFile="/mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
+</component>
+</collection>
+<collection id="camcordermmfplugin" name="Camcorder MMF Plugin" level="plugin">
+<!-- collection is really a component. Should move down a directory -->
+<component id="camcordermmfplugin_build" filter="s60" name="Camcorder MMF Plugin Build" class="plugin">
+<unit bldFile="/mw/camerasrv/camcordermmfplugin/build"/>
+</component>
+</collection>
+<collection id="configmanagers" name="Config Managers" level="api">
+<component id="imagingconfigmanager" filter="s60" name="Imaging Config Manager">
+<unit bldFile="/mw/camerasrv/configmanagers/imagingconfigmanager/group"/>
+</component>
+</collection>
+<collection id="camerasrv_info" name="Camera Services Info" level="api">
+<component id="camerasrv_build" filter="s60" name="Camera Services Build">
+<!-- should split into individual bld.infs -->
+<unit bldFile="/mw/camerasrv/group"/>
+</component>
+</collection>
+</package>
+<package id="mmappfw" level="specific" tech-domain="mm" name="Multimedia App Framework" levels="fw utils if">
+<collection id="mmappfw_plat" name="Multimedia App Framework Platform Interfaces" level="if">
+<component id="collection_helper_api" name="Collection Helper API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
+</component>
+<component id="harvester_collection_mediator_api" name="Harvester Collection Mediator API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/group"/>
+</component>
+<component id="harvester_metadata_extractor_api" name="Harvester Metadata Extractor API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/group"/>
+</component>
+<component id="harvester_server_api" name="Harvester Server API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/harvester_server_api/group"/>
+</component>
+<component id="harvester_utility_api" name="Harvester Utility API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/harvester_utility_api/group"/>
+</component>
+<component id="playlist_engine_api" name="Playlist Engine API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/playlist_engine_api/group"/>
+</component>
+<component id="mtp_keys_api" name="MTP Keys API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mtp_keys_api/group"/>
+</component>
+<component id="mpx_collection_common_definition_api" name="MPX Collection Common Definition API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_collection_common_definition_api/group"/>
+</component>
+<component id="mpx_collection_utility_api" name="MPX Collection Utility API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/group"/>
+</component>
+<component id="mpx_common_api" name="MPX Common API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_common_api/group"/>
+</component>
+<component id="mpx_common_definition_api" name="MPX Common Definition API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_common_definition_api/group"/>
+</component>
+<component id="mpx_playback_common_definition_api" name="MPX Playback Common Definition API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_playback_common_definition_api/group"/>
+</component>
+<component id="mpx_playback_utility_api" name="MPX Playback Utility API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/group"/>
+</component>
+<component id="mpx_base_view_plugins_api" name="MPX Base View Plugins API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/group"/>
+</component>
+<component id="mpx_view_utility_api" name="MPX View Utility API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_view_utility_api/group"/>
+</component>
+<component id="mpx_albumart_utility_api" name="MPX Album Art Utility API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/group"/>
+</component>
+<component id="media_player_settings_engine_api" name="Media Player Settings Engine API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
+</component>
+<component id="mpx_backstepping_utility_api" name="MPX Backstepping Utility API" introduced="^1" class="api" filter="s60">
+<meta rel="config">
+<defined condition="IAD_INCLUDE_BACKSTEPPING"/>
+</meta>
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_backstepping_utility_api/group"/>
+</component>
+<component id="asx_parser_api" name="ASX Parser API" introduced="^1" class="api" filter="s60">
+<meta rel="config">
+<defined condition="__WINDOWS_MEDIA"/>
+</meta>
+<unit bldFile="/mw/mmappfw/mmappfw_plat/asx_parser_api/group"/>
+</component>
+<component id="playback_helper_api" name="Playback Helper API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/playback_helper_api/group"/>
+</component>
+<component id="videoplaylist_utility_api" name="Video Playlist Utility API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/videoplaylist_utility_api/group"/>
+</component>
+</collection>
+<collection id="mpx" name="Multimedia Player" level="fw">
+<component id="commonframework" filter="s60" name="MPX Common Framework" introduced="^1">
+<unit bldFile="/mw/mmappfw/mpx/commonframework/group"/>
+</component>
+<component id="playbackframework" filter="s60" name="MPX Playback Framework" introduced="^1">
+<unit bldFile="/mw/mmappfw/mpx/playbackframework/group"/>
+</component>
+<component id="mpxcollectionfw" filter="s60" name="MPX Collection Framework" introduced="^1">
+<unit bldFile="/mw/mmappfw/mpx/collectionframework/group"/>
+</component>
+<component id="mpxviewfw" filter="s60" name="MPX View Framework" introduced="^1">
+<unit bldFile="/mw/mmappfw/mpx/viewframework/group"/>
+</component>
+<component id="mpxviewframeworkqt" name="MPX View Framework Qt" filter="s60" introducde="^4">
+<unit bldFile="/mw/mmappfw/mpx/mpxviewframeworkqt" qt:proFile="mpxviewframeworkqt.pro" qt:qmakeArgs="-r -config rom"/>
+</component>
+<component id="mpx_build" filter="s60" name="MPX Build" introduced="^1">
+<!-- Move the export to another component or remove the #includes from this one -->
+<unit bldFile="/mw/mmappfw/mpx/group"/>
+</component>
+</collection>
+<collection id="mmappcomponents" name="Multimedia App Components" level="utils">
+<component id="mmappcomponents_build" filter="s60" name="Multimedia App Components Build" introduced="^1">
+<!-- needed for #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
+ Can remove this once configuration is in place-->
+<unit bldFile="/mw/mmappfw/mmappcomponents/group"/>
+</component>
+<component id="collectionhelper" filter="s60" name="Media Player Collection Helper" introduced="^1">
+<unit bldFile="/mw/mmappfw/mmappcomponents/collectionhelper/group"/>
+</component>
+<component id="playlistengine" filter="s60" name="Playlist Engine" introduced="^1">
+<unit bldFile="/mw/mmappfw/mmappcomponents/playlistengine/group"/>
+</component>
+<component id="mpxharvester" filter="s60" name="Media Player Harvester" introduced="^1">
+<unit bldFile="/mw/mmappfw/mmappcomponents/harvester/group"/>
+</component>
+<component id="mmappcommonui" filter="s60" name="Multimedia App Common UI" introduced="^1">
+<unit bldFile="/mw/mmappfw/mmappcomponents/mmappcommonui/group"/>
+</component>
+<component id="mediaplayersettingsengine" filter="s60" name="Media Player Settings Engine" introduced="^1">
+<unit bldFile="/mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
+</component>
+<component id="audiofetcher" filter="s60" name="Audio Fetcher" class="plugin" introduced="^1">
+<meta rel="config">
+<defined condition="IAD_INCLUDE_AUDIOFETCHER"/>
+</meta>
+<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
+<!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
+</component>
+<component id="asxparser" filter="s60" name="ASX Parser" introduced="^1">
+<meta rel="config">
+<defined condition="__WINDOWS_MEDIA"/>
+</meta>
+<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
+<!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
+</component>
+<component id="playbackhelper" filter="s60" name="Playback Helper" introduced="^3">
+<unit bldFile="/mw/mmappfw/mmappcomponents/playbackhelper/group"/>
+</component>
+<component id="videoplaylistutility" filter="s60" name="Video Playlist Utility" introduced="^3">
+<unit bldFile="/mw/mmappfw/mmappcomponents/videoplaylistutility/group"/>
+</component>
+<component id="mmmtpdataprovider" filter="s60" name="Multimedia MTP Data Provider" introduced="^3">
+<unit bldFile="/mw/mmappfw/mmappcomponents/mmmtpdataprovider/group"/>
+</component>
+</collection>
+<collection id="mmappfw_info" name="Multimedia App Framework Info" level="if">
+<component id="mmappfw_build" filter="s60" name="Multimedia App Framework Build" introduced="^1">
+<!-- Move the export to another component or remove the #includes from this one -->
+<unit bldFile="/mw/mmappfw/group"/>
+</component>
+<component id="mmappfw_test" filter="s60,test,api_test,pref_test" name="Multimedia App Framework Test" purpose="development" introduced="^1">
+
+</component>
+</collection>
+</package>
+<package id="hgwidgets" level="specific" tech-domain="mm" name="HG Widgets" levels="framework service api">
+<collection id="hgwidgets_plat" name="HG Widgets Platform Interfaces" level="api">
+<component id="ganeswidgets_api" name="Ganes Widgets API" class="api" introduced="^4">
+<!-- should separate out unit -->
+</component>
+</collection>
+<collection id="hgwidgets_pub" name="HG Widgets Public Interfaces" level="api"/>
+<collection id="ganeswidgets" name="Ganes Widgets" level="service">
+<!-- really a component, should move down a dir level and have a unit -->
+<component id="ganeswidgets_build" name="Ganes Widgets Build" introduced="^4">
+<!-- should separate out unit -->
+</component>
+</collection>
+<collection id="hgwidgets_info" name="HG Widgets Info" level="framework">
+<component id="hgwidgets_build" name="HG Widgets Build" introduced="^4">
+<unit bldFile="/mw/hgwidgets" qt:proFile="hgwidgets.pro"/>
+</component>
+</collection>
+</package>
+<package id="inputmethods" level="generic" tech-domain="ui" name="Input Methods" levels="plugin engine framework api">
+<collection id="inputmethods_pub" name="Input Methods Public Interfaces" level="api">
+<component id="ptiengine_iti_api" name="PTI Engine API" class="api" filter="s60">
+<meta rel="config">
+<defined condition="RD_INTELLIGENT_TEXT_INPUT"/>
+</meta>
+<unit bldFile="/mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
+</component>
+<component id="optical_character_recognition_api" name="Optical Character Recognition API" class="api" filter="s60">
+<unit bldFile="/mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
+</component>
+<component id="input_language_info_api" name="Input Language Info API" class="api" filter="s60">
+<unit bldFile="/mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
+</component>
+</collection>
+<collection id="inputmethods_plat" name="Input Methods Platform Interfaces" level="api">
+<component id="pen_input_server_api" name="Pen Input Server API" class="api" filter="s60">
+<unit bldFile="/mw/inputmethods/inputmethods_plat/pen_input_server_api/group"/>
+</component>
+<component id="ptiengine_hwr_api" name="PTI Engine Handwriting Recognition API" class="api" filter="s60">
+<unit bldFile="/mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group"/>
+</component>
+<component id="aknfep_settings_api" name="Avkon FEP Settings API" class="api" filter="s60">
+<unit bldFile="/mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
+</component>
+<component id="aknfep_status_api" name="Avkon FEP Status API" class="api" filter="s60">
+<meta rel="config">
+<defined condition="RD_INTELLIGENT_TEXT_INPUT"/>
+</meta>
+<unit bldFile="/mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
+</component>
+<component id="ptiengine_key_definations_api" name="PTI Engine Key Definitions API" class="api" filter="s60">
+<meta rel="config">
+<defined condition="RD_INTELLIGENT_TEXT_INPUT"/>
+</meta>
+<unit bldFile="/mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
+</component>
+<component id="aknfep_definitions_api" name="Avkon FEP Definitions API" class="api" filter="s60">
+<unit bldFile="/mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
+</component>
+<component id="aknfep_pen_support_api" name="Avkon FEP Pen Support API" class="api" filter="s60">
+<unit bldFile="/mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
+</component>
+<component id="ptiengine_indic_definitions_api" name="PTI Engine Indic Definitions API" class="api" filter="s60">
+<unit bldFile="/mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
+</component>
+<component id="aknfep_uiinterface_api" name="Avkon FEP UI Interface API" class="api" filter="s60">
+<unit bldFile="/mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group"/>
+</component>
+</collection>
+<collection id="textinput" name="Text Input" level="framework">
+<component id="ptienginev2" filter="s60" name="Predictive Text Input Engine">
+<meta rel="config">
+<defined condition="RD_INTELLIGENT_TEXT_INPUT"/>
+</meta>
+<!--uncomment when configuration is turned on and textinput_build is removed-->
+<!-- <unit bldFile="textinput/ptienginev2/group"/>-->
+</component>
+<component id="akninputlanguage" filter="s60" name="Avkon Input Language">
+<unit bldFile="/mw/inputmethods/textinput/akninputlanguage/group"/>
+</component>
+<component id="peninputarc" filter="s60" name="Pen Input Arc">
+<unit bldFile="/mw/inputmethods/textinput/peninputarc/group"/>
+</component>
+<component id="peninputcommonctrls" filter="s60" name="Pen Input Common Controls">
+<unit bldFile="/mw/inputmethods/textinput/peninputcommonctrls/group"/>
+</component>
+<component id="peninputcommonlayout" filter="s60" name="Pen Input Common Layout">
+<unit bldFile="/mw/inputmethods/textinput/peninputcommonlayout/group"/>
+</component>
+<component id="peninputhwrtrui" filter="s60" name="Pen Input Handwriting Recognition Training UI" class="plugin" introduced="^3">
+<unit bldFile="/mw/inputmethods/textinput/peninputhwrtrui/group"/>
+</component>
+<component id="textinput_build" filter="s60" name="Text Input Build">
+<!--needed for #ifdef, can be removed when configuration is implemented -->
+<unit bldFile="/mw/inputmethods/textinput/group"/>
+</component>
+</collection>
+<collection id="fep" name="FEP" level="engine">
+<component id="aknfep" filter="s60" name="Avkon FEP" class="plugin">
+<unit bldFile="/mw/inputmethods/fep/aknfep/group"/>
+</component>
+<component id="frontendprocessor" name="Front End Processor" purpose="mandatory">
+<unit bldFile="/mw/inputmethods/fep/frontendprocessor/group" mrp="/mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
+</component>
+</collection>
+<collection id="inputmethods_info" name="Input Methods Info" level="api">
+
+<component id="inputmethods_metadata" name="Input Methods Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="qt" level="generic" tech-domain="ui" name="Qt" levels="tool mw app">
+<collection id="qtconf" name="Qt Config" level="tool">
+<component id="qt_deviceconfiguration" name="Qt Device Configuration" class="config tool" filter="qt_tools" introduced="^2">
+<unit bldFile="/mw/qt/src/s60installs/deviceconfiguration"/>
+</component>
+</collection>
+<collection id="qt_info" name="Qt Info" level="mw">
+<component id="qt_build" name="Qt Build" introduced="^2">
+<unit bldFile="/mw/qt" qt:proFile="projects.pro" qt:qmakeArgs="-r -config sgimagelite_support"/>
+</component>
+</collection>
+<collection id="qtdemos" name="Qt Demos" level="app">
+<component id="qtdemos_build" name="Qt Demos Build" introduced="^2" filter="qtdemos">
+<unit bldFile="/mw/qt/demos" qt:proFile="demos.pro" qt:qmakeArgs="-r"/>
+</component>
+</collection>
+<collection id="qtexamples" name="Qt Examples" level="app">
+<component id="qtexamples_build" name="Qt Examples Build" introduced="^2" filter="qtexamples">
+<unit bldFile="/mw/qt/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
+</component>
+</collection>
+<collection id="qt_tests" name="Qt Tests" level="app">
+
+
+</collection>
+</package>
+<package id="qtextensions" level="generic" tech-domain="ui" name="Qt Extensions" levels="tool mw app">
+<collection id="qtecomplugins" name="Qt ECom Plugins" level="app">
+<component id="qtecomplugins_build" filter="qtecomplugins" name="Qt ECom Plugin" purpose="development" introduced="^4" class="plugin">
+<unit bldFile="/mw/qtextensions/qtecomplugins" qt:proFile="qtecomplugins.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="qtextensions_examples" filter="qtextensionsexamples" name="Qt ECom Plugin Examples" purpose="development" introduced="^4">
+<unit bldFile="/mw/qtextensions/qtecomplugins/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
+</component>
+</collection>
+<collection id="qthighway" name="Qt Highway" level="app">
+<component id="qthighway_build" filter="qthighway" name="Qt Highway" purpose="development" introduced="^4">
+<unit bldFile="/mw/qtextensions/qthighway" qt:proFile="qthighway.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="qthighway_examples" filter="qtextensionsexamples" name="Qt Highway Examples" purpose="development" introduced="^4">
+<unit bldFile="/mw/qtextensions/qthighway/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
+</component>
+
+</collection>
+<collection id="qtmobileextensions" name="Qt Mobile Extensions" level="app">
+<component id="qtmobileextensions_build" filter="qtextension" name="Qt Mobile Extensions" purpose="development" introduced="^4">
+<unit bldFile="/mw/qtextensions/qtmobileextensions" qt:proFile="qtmobileextensions.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="qtmobileextensions_examples" filter="qtextensionsexamples" name="Qt Mobile Extensions Examples" purpose="development" introduced="^4">
+<unit bldFile="/mw/qtextensions/qtmobileextensions/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
+</component>
+</collection>
+<collection id="qtmobility" name="Qt Mobility" level="mw">
+<component id="qtmobility_build" filter="qtmobility" name="Qt Mobility" purpose="development" introduced="^4">
+<unit bldFile="/mw/qtextensions/qtmobility" qt:proFile="qtmobility.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="qtmobility_examples" filter="qtextensionsexamples" name="Qt Mobility Examples" purpose="development" introduced="^4">
+<unit bldFile="/mw/qtextensions/qtmobility/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
+</component>
+
+</collection>
+<collection id="qhbstyle" level="mw" name="Qt Orbit Style">
+<component id="qhbstyle_build" name="Qt Orbit Style Build" introduced="^4">
+<unit bldFile="/mw/qtextensions/qhbstyle" qt:qmakeArgs="-r" qt:proFile="qhbstyle.pro"/>
+</component>
+</collection>
+<collection id="qtextensions_info" name="Qt Extensions Info" level="app">
+<component id="qtextensions_conf" name="Qt Extensions Confgure" class="conf" introduced="^4" filter="qt_tools">
+<unit bldFile="/mw/qtextensions/group"/>
+</component>
+<component id="qtextensions_build" name="Qt Extensions Build" introduced="^4">
+<!-- break this up into the above collections-->
+<unit bldFile="/mw/qtextensions" qt:proFile="qtextensions.pro" qt:qmakeArgs="-r"/>
+</component>
+</collection>
+</package>
+<package id="hb" level="generic" tech-domain="ui" name="Orbit" levels="engine test api">
+<collection id="hb_info" name="Orbit Info" level="api">
+<component id="hb_build" name="Orbit Build" introduced="^4">
+<!-- should break this down into actual components -->
+<unit bldFile="/mw/hb" qt:proFile="hb.pro" qt:qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
+</component>
+</collection>
+</package>
+<package id="classicui" level="generic" tech-domain="ui" name="Classic UI" levels="base support server generic specific">
+<collection id="classicui_plat" name="Classic UI Platform Interfaces" level="specific">
+<component id="personalisation_framework_api" name="Personalisation Framework API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/personalisation_framework_api/group"/>
+</component>
+<component id="signal_pane_api" name="Signal Pane API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
+
+</component>
+<component id="japanese_reading_api" name="Japanese Reading API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/japanese_reading_api/group" filter="!test"/>
+
+</component>
+<component id="global_popup_priority_controller_api" name="Global Popup Priority Controller API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
+
+</component>
+<component id="item_finder_api" name="Item Finder API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/item_finder_api/group" filter="!test"/>
+
+</component>
+<component id="avkon_fonts_api" name="Avkon Fonts API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/avkon_fonts_api/group" filter="!test"/>
+
+</component>
+<component id="extended_utilities_api" name="Extended Utilities API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
+
+</component>
+<component id="personalisation_plugin_api" name="Personalisation Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
+</component>
+<component id="extended_aiw_criteria_api" name="Extended AIW Criteria API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
+
+</component>
+<component id="personalisation_application_api" name="Personalisation Application API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/personalisation_application_api/group"/>
+</component>
+<component id="volume_popup_api" name="Volume Popup API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
+
+</component>
+<component id="avkon_secondary_display_support_api" name="AVKON Secondary Display Support API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/avkon_secondary_display_support_api/group" filter="!test"/>
+
+</component>
+<component id="extended_setting_pages_api" name="Extended Setting Pages API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_setting_pages_api/group" filter="!test"/>
+
+</component>
+<component id="extended_lists_api" name="Extended Lists API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_lists_api/group" filter="!test"/>
+
+</component>
+<component id="input_block_api" name="Input Block API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/input_block_api/group" filter="!test"/>
+
+</component>
+<component id="avkon_ui_server_api" name="AVKON UI Server API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/avkon_ui_server_api/group" filter="!test"/>
+
+</component>
+<component id="number_grouping_api" name="Number Grouping API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/number_grouping_api/group" filter="!test"/>
+
+</component>
+<component id="extended_status_pane_api" name="Extended Status Pane API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_status_pane_api/group" filter="!test"/>
+
+</component>
+<component id="extended_notifiers_api" name="Extended Notifiers API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_notifiers_api/group" filter="!test"/>
+
+</component>
+<component id="task_list_api" name="Task List API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
+
+</component>
+<component id="personalisation_slide_show_dialog_api" name="Personalisation Slide Show Dialog API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
+</component>
+<component id="key_event_utilities_api" name="Key Event Utilities API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/key_event_utilities_api/group"/>
+</component>
+<component id="emergency_call_support_api" name="Emergency Call Support API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/emergency_call_support_api/group" filter="!test"/>
+
+</component>
+<component id="extended_dialogs_api" name="Extended Dialogs API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_dialogs_api/group"/>
+</component>
+<component id="legacy_ui_framework_headers_api" name="Legacy UI Framework Headers API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/legacy_ui_framework_headers_api/group"/>
+</component>
+<component id="extended_editors_api" name="Extended Editors API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_editors_api/group" filter="!test"/>
+
+</component>
+<component id="alarm_api" name="Alarm API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/alarm_api/group" filter="!test"/>
+
+</component>
+<component id="aiw_service_interface_base_api" name="AIW Service Interface Base API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/aiw_service_interface_base_api/group" filter="!test"/>
+
+</component>
+<component id="list_effects_api" name="List Effects API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/list_effects_api/group" filter="!test"/>
+
+</component>
+<component id="find_item_ui_api" name="Find Item UI API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/find_item_ui_api/group" filter="!test"/>
+
+</component>
+<component id="server_application_services_api" name="Server Application Services API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/server_application_services_api/group" filter="!test"/>
+
+</component>
+<component id="common_ui_settings_api" name="Common UI Settings API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/common_ui_settings_api/group"/>
+</component>
+<component id="aiw_service_interface_menu_api" name="AIW Service Interface Menu API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/aiw_service_interface_menu_api/group" filter="!test"/>
+
+</component>
+<component id="eikon_server_extension_client_api" name="EIKON Server Extension Client API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/eikon_server_extension_client_api/group" filter="!test"/>
+
+</component>
+<component id="skinnable_clock_api" name="Skinnable Clock API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/skinnable_clock_api/group" filter="!test"/>
+
+</component>
+<component id="battery_pane_api" name="Battery Pane API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/battery_pane_api/group" filter="!test"/>
+
+</component>
+<component id="fep_document_navigation_api" name="FEP Document Navigation API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
+</component>
+<component id="personalisation_localised_texts_api" name="Personalisation Localised Texts API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
+</component>
+<component id="memory_card_ui_api" name="Memory Card UI API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
+
+</component>
+<component id="avkon_status_api" name="AVKON Status API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/avkon_status_api/group"/>
+</component>
+<component id="application_switching_api" name="Application Switching API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/application_switching_api/group" filter="!test"/>
+
+</component>
+<component id="avkon_localised_texts_api" name="AVKON Localised Texts API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/avkon_localised_texts_api/group"/>
+</component>
+<component id="avkon_secondary_display_api" name="AVKON Secondary Display API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/avkon_secondary_display_api/group"/>
+</component>
+<component id="extended_animation_api" name="Extended Animation API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_animation_api/group" filter="!test"/>
+
+</component>
+<component id="extended_notes_api" name="Extended Notes API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_notes_api/group" filter="!test"/>
+
+</component>
+<component id="text_scroller_api" name="Text Scroller API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/text_scroller_api/group" filter="!test"/>
+
+</component>
+<component id="custom_cursors_api" name="Custom Cursors API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/custom_cursors_api/group" filter="!test"/>
+
+</component>
+<component id="global_window_priorities_api" name="Global Window Priorities API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/global_window_priorities_api/group"/>
+</component>
+<component id="extended_indicators_api" name="Extended Indicators API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_indicators_api/group" filter="!test"/>
+
+</component>
+<component id="special_character_table_api" name="Special Character Table API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/special_character_table_api/group" filter="!test"/>
+
+</component>
+<component id="avkon_settings_api" name="AVKON Settings API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/avkon_settings_api/group"/>
+</component>
+<component id="extended_sounds_api" name="Extended Sounds API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_sounds_api/group"/>
+</component>
+<component id="themes_settings_api" name="Themes Settings API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/themes_settings_api/group"/>
+</component>
+<component id="media_shared_document_api" name="Media Shared Document API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/media_shared_document_api/group" filter="!test"/>
+
+</component>
+<component id="extended_queries_api" name="Extended Queries API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_queries_api/group"/>
+</component>
+<component id="phone_number_text_utilities_api" name="Phone Number Text Utilities API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
+
+</component>
+<component id="extended_scroller_api" name="Extended Scroller API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_scroller_api/group"/>
+</component>
+<component id="key_rotator_api" name="Key Rotator API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/key_rotator_api/group" filter="!test"/>
+
+</component>
+<component id="extended_grids_api" name="Extended Grids API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_grids_api/group" filter="!test"/>
+
+</component>
+<component id="generic_parameter_api" name="Generic Parameter API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/generic_parameter_api/group" filter="!test"/>
+
+</component>
+<component id="indicator_touch_observer_api" name="Indicator Touch Observer API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/indicator_touch_observer_api/group"/>
+</component>
+<component id="popup_form_api" name="Popup Form API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/popup_form_api/group" filter="!test"/>
+
+</component>
+<component id="stylus_activated_popup_api" name="Stylus Activated Pop-up API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/stylus_activated_popup_api/group" filter="!test"/>
+
+</component>
+<component id="indicator_plugin_api" name="Indicator Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/indicator_plugin_api/group" filter="!test"/>
+
+</component>
+<component id="layout_configuration_api" name="Layout Configuration API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/layout_configuration_api/group" filter="!test"/>
+
+</component>
+<component id="common_file_dialogs_filter_factory_api" name="Common File Dialogs Filter Factory API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group" filter="!test"/>
+
+</component>
+<component id="avkon_anim_dll_api" name="AVKON Anim DLL API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/avkon_anim_dll_api/group"/>
+</component>
+<component id="extended_initialization_api" name="Extended Initialization API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_initialization_api/group" filter="!test"/>
+
+</component>
+<component id="long_tap_animation_api" name="Long Tap Animation API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/long_tap_animation_api/group" filter="!test"/>
+
+</component>
+<component id="extended_ui_framework_definitions_api" name="Extended UI Framework Definitions API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_ui_framework_definitions_api/group"/>
+</component>
+<component id="extended_buttons_api" name="Extended Buttons API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_buttons_api/group" filter="!test"/>
+
+</component>
+<component id="aiw_provider_utility_api" name="AIW Provider Utility API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/aiw_provider_utility_api/group" filter="!test"/>
+
+</component>
+<component id="transition_effect_parameters_api" name="Transition Effect Parameters API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/transition_effect_parameters_api/group" filter="!test"/>
+
+</component>
+<component id="extended_input_capabilities_api" name="Extended Input Capabilities API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_input_capabilities_api/group" filter="!test"/>
+
+</component>
+<component id="uikon_status_api" name="UIKON Status API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/uikon_status_api/group"/>
+</component>
+<component id="transition_effect_utilities_api" name="Transition Effect Utilities API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/transition_effect_utilities_api/group" filter="!test"/>
+
+</component>
+<component id="pointer_event_modifier_api" name="Pointer Event Modifier API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/pointer_event_modifier_api/group" filter="!test"/>
+
+</component>
+<component id="avkon_testability_api" name="AVKON Testability API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/avkon_testability_api/group"/>
+</component>
+<component id="ganes_api" name="ganes_api" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/ganes_api/group"/>
+</component>
+<component id="ode_api" name="Ode API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/ode_api/group"/>
+</component>
+<component id="physics_api" name="Physics API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/physics_api/group"/>
+</component>
+<component id="touch_pane_api" name="Touch Pane API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/touch_pane_api/group" filter="!test"/>
+
+</component>
+<component id="touch_pane_observer_api" name="Touch Pane Observer API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/touch_pane_observer_api/group"/>
+</component>
+<component id="alternate_fs_api" name="Alternate FS API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/alternate_fs_api/group"/>
+</component>
+<component id="discreet_popup_api" name="Discreet Popup API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/discreet_popup_api/group"/>
+</component>
+<component id="touch_gesture_framework_api" name="Touch Gesture Framework API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/touch_gesture_framework_api/group"/>
+<!-- should this be commented out? -->
+<!--<unit bldFile="classicui_plat/touch_gesture_framework_api/tsrc/group" filter="test,api_test"/> -->
+</component>
+<component id="extended_options_menu_api" name="Extended Options Menu API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
+
+</component>
+</collection>
+<collection id="classicui_pub" name="Classic UI Public Interfaces" level="specific">
+<component id="input_frame_api" name="Input Frame API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/input_frame_api/group" filter="!test"/>
+
+</component>
+<component id="window_server_event_observer_api" name="Window Server Event Observer API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/window_server_event_observer_api/group" filter="!test"/>
+
+</component>
+<component id="application_framework_api" name="Application Framework API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/application_framework_api/group" filter="!test"/>
+
+</component>
+<component id="scroller_api" name="Scroller API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/scroller_api/group" filter="!test"/>
+
+</component>
+<component id="ui_framework_utilities_api" name="UI Framework Utilities API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/ui_framework_utilities_api/group" filter="!test"/>
+
+</component>
+<component id="ui_framework_definitions_api" name="UI Framework Definitions API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/ui_framework_definitions_api/group" filter="!test"/>
+
+</component>
+<component id="buttons_api" name="Buttons API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/buttons_api/group" filter="!test"/>
+
+</component>
+<component id="queries_api" name="Queries API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/queries_api/group" filter="!test"/>
+
+</component>
+<component id="aiw_generic_parameter_api" name="AIW Generic Parameter API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/aiw_generic_parameter_api/group" filter="!test"/>
+
+</component>
+<component id="editors_api" name="Editors API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/editors_api/group" filter="!test"/>
+
+</component>
+<component id="common_file_dialogs_api" name="Common File Dialogs API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/common_file_dialogs_api/group" filter="!test"/>
+
+</component>
+<component id="dialog_shutter_api" name="Dialog Shutter API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/dialog_shutter_api/group" filter="!test"/>
+
+</component>
+<component id="fonts_api" name="Fonts API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/fonts_api/group" filter="!test"/>
+
+</component>
+<component id="screen_clearer_api" name="Screen Clearer API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/screen_clearer_api/group" filter="!test"/>
+
+</component>
+<component id="notifiers_api" name="Notifiers API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/notifiers_api/group" filter="!test"/>
+
+</component>
+<component id="notes_api" name="Notes API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/notes_api/group" filter="!test"/>
+
+</component>
+<component id="status_pane_api" name="Status Pane API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/status_pane_api/group" filter="!test"/>
+
+</component>
+<component id="base_controls_api" name="Base Controls API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/base_controls_api/group" filter="!test"/>
+
+</component>
+<component id="grids_api" name="Grids API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/grids_api/group" filter="!test"/>
+
+</component>
+<component id="context_pane_api" name="Context Pane API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/context_pane_api/group" filter="!test"/>
+
+</component>
+<component id="lists_api" name="Lists API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/lists_api/group" filter="!test"/>
+
+</component>
+<component id="popups_api" name="Popups API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/popups_api/group" filter="!test"/>
+
+</component>
+<component id="misc_controls_api" name="Misc Controls API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/misc_controls_api/group" filter="!test"/>
+
+</component>
+<component id="keylock_api" name="Keylock API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/keylock_api/group" filter="!test"/>
+
+</component>
+<component id="options_menu_api" name="Options Menu API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/options_menu_api/group" filter="!test"/>
+
+</component>
+<component id="hierarchical_lists_api" name="Hierarchical Lists API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/hierarchical_lists_api/group" filter="!test"/>
+
+</component>
+<component id="navigation_pane_api" name="Navigation Pane API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/navigation_pane_api/group" filter="!test"/>
+
+</component>
+<component id="tabs_api" name="Tabs API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/tabs_api/group" filter="!test"/>
+
+</component>
+<component id="title_pane_touch_observer_api" name="Title Pane Touch Observer API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/title_pane_touch_observer_api/group"/>
+</component>
+<component id="choice_list_api" name="Choice List API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/choice_list_api/group" filter="!test"/>
+
+</component>
+<component id="info_popup_note_api" name="Info Popup Note API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/info_popup_note_api/group" filter="!test"/>
+
+</component>
+<component id="setting_pages_api" name="Setting Pages API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/setting_pages_api/group" filter="!test"/>
+
+</component>
+<component id="screen_mode_api" name="Screen Mode API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/screen_mode_api/group" filter="!test"/>
+
+</component>
+<component id="indicators_api" name="Indicators API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/indicators_api/group" filter="!test"/>
+
+</component>
+<component id="error_ui_api" name="Error UI API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/error_ui_api/group" filter="!test"/>
+
+</component>
+<component id="animation_api" name="Animation API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/animation_api/group" filter="!test"/>
+
+</component>
+<component id="searchfield_api" name="Searchfield API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/searchfield_api/group" filter="!test"/>
+
+</component>
+<component id="labels_api" name="Labels API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/labels_api/group" filter="!test"/>
+
+</component>
+<component id="hotkeys_api" name="Hotkeys API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/hotkeys_api/group" filter="!test"/>
+
+</component>
+<component id="initialization_api" name="Initialization API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/initialization_api/group" filter="!test"/>
+
+</component>
+<component id="volume_control_api" name="Volume Control API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/volume_control_api/group" filter="!test"/>
+
+</component>
+<component id="title_pane_api" name="Title Pane API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/title_pane_api/group" filter="!test"/>
+
+</component>
+<component id="sounds_api" name="Sounds API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/sounds_api/group" filter="!test"/>
+
+</component>
+<component id="aiw_service_handler_api" name="AIW Service Handler API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/aiw_service_handler_api/group" filter="!test"/>
+
+</component>
+<component id="aiw_criteria_api" name="AIW Criteria API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/aiw_criteria_api/group" filter="!test"/>
+
+</component>
+<component id="touch_ui_utilities_api" name="Touch UI Utilities API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/touch_ui_utilities_api/group" filter="!test"/>
+
+</component>
+<component id="generic_button_api" name="Generic Button API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/generic_button_api/group" filter="!test"/>
+
+</component>
+<component id="form_api" name="Form API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/form_api/group" filter="!test"/>
+
+</component>
+<component id="uikon_core_controls" name="Uikon Core Controls" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/uikon_core_controls/group" filter="!test"/>
+
+</component>
+<component id="calendar_api" name="Calendar API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/calendar_api/group"/>
+</component>
+<component id="toolbar_api" name="Toolbar API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/toolbar_api/group" filter="!test"/>
+
+</component>
+<component id="server_application_api" name="Server Application API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/server_application_api/group"/>
+</component>
+<component id="slider_api" name="Slider API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/slider_api/group" filter="!test"/>
+
+</component>
+<component id="private_ui_framework_api" name="Private UI Framework API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/private_ui_framework_api/group" filter="!test"/>
+
+</component>
+<component id="dialogs_api" name="Dialogs API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/dialogs_api/group" filter="!test"/>
+
+</component>
+<component id="document_handler_api" name="Document handler API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/document_handler_api/group"/>
+</component>
+<component id="images_api" name="Images API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/images_api/group" filter="!test"/>
+
+</component>
+<component id="stylus_popup_menu_api" name="Stylus Pop-up Menu API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/stylus_popup_menu_api/group" filter="!test"/>
+
+</component>
+<component id="information_preview_popup_api" name="Information Preview Popup API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/information_preview_popup_api/group" filter="!test"/>
+
+</component>
+<component id="intermediate_state_api" name="Intermediate State API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/intermediate_state_api/group"/>
+</component>
+<component id="help_launcher_api" name="Help Launcher API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/help_launcher_api/group"/>
+</component>
+</collection>
+<collection id="ode" name="Open Dynamics Engine" level="support">
+<!-- the collection is really a component. Move down a directory.-->
+<component id="ode_build" filter="s60" name="ODE">
+<unit bldFile="/mw/classicui/ode/group"/>
+</component>
+</collection>
+<collection id="uifw" name="UI Framework" level="server">
+<component id="uiklaf" filter="s60" name="Uikon Look-and-Feel">
+<unit bldFile="/mw/classicui/uifw/uiklaf/group"/>
+</component>
+<component id="eikctl" filter="s60" name="Eikon Controls">
+<unit bldFile="/mw/classicui/uifw/eikctl/group"/>
+</component>
+<component id="avkon" filter="s60" name="Avkon">
+<!-- can only have one unit. Split into 3 components, or #include all from same bld.inf -->
+<unit bldFile="/mw/classicui/uifw/avkon/aknphysics/group"/>
+<unit bldFile="/mw/classicui/uifw/avkon/group"/>
+<unit bldFile="/mw/classicui/uifw/avkon/aknconf/group"/>
+</component>
+<component id="eikstd" filter="s60" name="Eikon Standard">
+<unit bldFile="/mw/classicui/uifw/eikstd/group"/>
+</component>
+<component id="aknglobalui" filter="s60" name="Avkon Global UI">
+<unit bldFile="/mw/classicui/uifw/aknglobalui/group"/>
+</component>
+<component id="ganes" filter="s60" name="Ganes">
+<unit bldFile="/mw/classicui/uifw/ganes/group"/>
+</component>
+</collection>
+<collection id="commonuis" name="Common UIs" level="specific">
+<component id="commonui" filter="s60" name="Common UI">
+<unit bldFile="/mw/classicui/commonuis/commonui/group"/>
+</component>
+<component id="commondialogs" filter="s60" name="Common Dialogs">
+<unit bldFile="/mw/classicui/commonuis/commondialogs/group"/>
+</component>
+</collection>
+<collection id="applicationinterworkingfw" name="Application Interworking Framework" level="generic">
+<component id="aifwservicehandler" filter="s60" name="Application Interworking Service Handler">
+<unit bldFile="/mw/classicui/applicationinterworkingfw/servicehandler/group"/>
+</component>
+</collection>
+<collection id="psln" name="Personalization" level="specific">
+<!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
+<component id="psln_build" filter="s60" name="Personalization Build">
+<unit bldFile="/mw/classicui/psln/group"/>
+</component>
+</collection>
+<collection id="commonadapter" name="Common Adapter" level="support">
+<!-- the collection is really a component. Move down a directory.-->
+<component id="commonadapter_build" filter="s60" name="Common Adapter Build">
+<unit bldFile="/mw/classicui/commonadapter/group"/>
+</component>
+</collection>
+<collection id="akntouchgesturefw" name="Avkon Touch Gesture Framework" level="generic">
+<!-- the collection is really a component. Move down a directory.-->
+<component id="akntouchgesturefw_build" filter="s60" name="Avkon Touch Gesture Framework Build" introduced="^3">
+<unit bldFile="/mw/classicui/akntouchgesturefw/group"/>
+</component>
+</collection>
+<collection id="uiutils" name="UI Utils" level="specific">
+<component id="localizer" filter="s60" name="Directory Localizer">
+<unit bldFile="/mw/classicui/uiutils/localizer/group"/>
+</component>
+<component id="findutil" filter="s60" name="Find Utility">
+<unit bldFile="/mw/classicui/uiutils/findutil/group"/>
+</component>
+<component id="gamerecognizer" filter="s60" name="Game Recognizer" class="plugin">
+<unit bldFile="/mw/classicui/uiutils/gamerecognizer/group"/>
+</component>
+<component id="aknjapanesereading" filter="s60" name="Avkon Japanese Reading">
+<unit bldFile="/mw/classicui/uiutils/aknjapanesereading/group"/>
+</component>
+<component id="hlplch" name="Help Launcher" filter="s60,bldfirst">
+<unit bldFile="/mw/classicui/uiutils/hlplch/group"/>
+</component>
+</collection>
+<collection id="commonuisupport" name="Common UI Support" level="support">
+<component id="uikon" name="Uikon" introduced="6.0" purpose="mandatory">
+<unit bldFile="/mw/classicui/commonuisupport/uikon/group" mrp="/mw/classicui/commonuisupport/uikon/group/app-framework_uikon.mrp"/>
+</component>
+<component id="errorresolverdata" name="Error Resolver Data" purpose="mandatory">
+<unit bldFile="/mw/classicui/commonuisupport/errorresolverdata/group" mrp="/mw/classicui/commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
+</component>
+<component id="uilaf" name="UI Look and Feel" introduced="6.0" purpose="mandatory">
+<unit bldFile="/mw/classicui/commonuisupport/uilaf/GROUP" mrp="/mw/classicui/commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
+</component>
+<component id="grid" name="Grid" purpose="optional">
+<unit bldFile="/mw/classicui/commonuisupport/grid/group" mrp="/mw/classicui/commonuisupport/grid/group/app-framework_grid.mrp"/>
+</component>
+<component id="uifwsdocs" name="UI Frameworks Documentation" purpose="development" class="doc">
+<unit mrp="/mw/classicui/commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
+</component>
+</collection>
+<collection id="lafagnosticuifoundation" name="Look-and-Feel Agnostic UI Foundation" level="base">
+<component id="cone" name="Control Environment" purpose="mandatory">
+<unit bldFile="/mw/classicui/lafagnosticuifoundation/cone/group" mrp="/mw/classicui/lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
+</component>
+<component id="graphicseffects" name="Graphics Effects" introduced="9.2" purpose="optional">
+<unit bldFile="/mw/classicui/lafagnosticuifoundation/graphicseffects/group" mrp="/mw/classicui/lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
+</component>
+<component id="uigraphicsutils" name="UI Graphics Utilities" purpose="mandatory">
+<unit bldFile="/mw/classicui/lafagnosticuifoundation/uigraphicsutils/group" mrp="/mw/classicui/lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
+</component>
+<component id="clockanim" name="Clock" purpose="optional" class="plugin">
+<unit bldFile="/mw/classicui/lafagnosticuifoundation/clockanim/group" mrp="/mw/classicui/lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
+</component>
+<component id="bmpanimation" name="BMP Animation" introduced="6.0" purpose="optional">
+<unit bldFile="/mw/classicui/lafagnosticuifoundation/bmpanimation/group" mrp="/mw/classicui/lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
+</component>
+<component id="animation" name="Animation" introduced="9.1" purpose="optional">
+<unit bldFile="/mw/classicui/lafagnosticuifoundation/animation/group" mrp="/mw/classicui/lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
+</component>
+</collection>
+<collection id="classicui_info" name="Classic UI Info" level="specific">
+<!-- the multiple units in the API test components need to be resolved -->
+
+<component id="classicui_metadata" name="Classic UI Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/mw/classicui/classicui_info/classicui_metadata/classicui_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="svgt" level="generic" tech-domain="ui" name="SVG Tiny" levels="util ui">
+<collection id="svgt_plat" name="SVG Tiny Platform Interfaces" level="ui">
+<component id="svgt_api" name="SVGT API" introduced="9.2" class="api" filter="s60">
+<unit bldFile="/mw/svgt/svgt_plat/svgt_api/group"/>
+</component>
+<component id="nvg_api" name="NVG API" introduced="9.2" class="api" filter="s60">
+<unit bldFile="/mw/svgt/svgt_plat/nvg_api/group"/>
+</component>
+</collection>
+<collection id="svgtopt" name="SVG-T Engine" level="util">
+<component id="svgtopt_build" filter="s60" name="SVG Engine" introduced="9.2">
+<!-- component is at collection level. Needs to be moved down a directory -->
+<unit bldFile="/mw/svgt/svgtopt/group"/>
+</component>
+<component id="svgtplugin" filter="s60" name="SVG Plugin" class="plugin" introduced="9.2">
+<unit bldFile="/mw/svgt/svgtopt/svgtplugin/group"/>
+</component>
+</collection>
+</package>
+<package id="uiaccelerator" level="generic" tech-domain="ui" name="UI Accelerator" levels="plugin framework server ex if">
+<collection id="uiaccelerator_plat" name="UI Accelerator Platform Interfaces" level="if">
+<component id="alf_core_toolkit_api" name="ALF Core Toolkit API" class="api" filter="s60">
+<unit bldFile="/mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/group"/>
+</component>
+<component id="alf_visual_api" name="ALF Visual API" class="api" filter="s60">
+<unit bldFile="/mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/group"/>
+</component>
+<component id="alf_extended_visual_api" name="ALF Extended Visual API" class="api" filter="s60">
+<unit bldFile="/mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/group"/>
+</component>
+<component id="alf_extension_api" name="ALF Extension API" class="api" filter="s60">
+<unit bldFile="/mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/group"/>
+</component>
+<component id="alf_tracing_api" name="ALF Tracing API" class="api" filter="s60">
+<unit bldFile="/mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/group"/>
+</component>
+<component id="alf_client_server_api" name="ALF Client Server API" class="api" filter="s60">
+<unit bldFile="/mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/group"/>
+</component>
+</collection>
+<collection id="uiacceltk" name="UI Accelerator Toolkit" level="framework">
+<component id="hitchcock" filter="s60" name="Hitchcock">
+<unit bldFile="/mw/uiaccelerator/uiacceltk/hitchcock/group"/>
+</component>
+<component id="uiacceltk_build" filter="s60" name="UI Accelerator Toolkit Build">
+<!-- move into the other component, or remove the #include and make this UI Accelerator Toolkit ROM-->
+<unit bldFile="/mw/uiaccelerator/uiacceltk/group"/>
+</component>
+</collection>
+<collection id="uiaccelerator_test" name="UI Accelerator Test" level="ex">
+
+</collection>
+</package>
+<package id="uiresources" level="generic" tech-domain="ui" name="UI Resources" levels="compile plugin framework server generic data">
+<!-- are the custom filters below needed? -->
+<collection id="uiresources_pub" name="UI Resources Public Interfaces" level="data">
+<component id="pictograph_api" name="Pictograph API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_pub/pictograph_api/group" filter="!test"/>
+
+</component>
+<component id="skins_api" name="Skins API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_pub/skins_api/group" filter="!test"/>
+
+</component>
+<component id="font_definition_api" name="Font Definition API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_pub/font_definition_api/group" filter="!test"/>
+
+</component>
+<component id="graphics_api" name="Graphics API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_pub/graphics_api/group" filter="!test"/>
+
+</component>
+<component id="scalable_icons_api" name="Scalable Icons API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_pub/scalable_icons_api/group"/>
+</component>
+<component id="layout_id_definitions_api" name="Layout ID Definitions API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_pub/layout_id_definitions_api/group"/>
+</component>
+</collection>
+<collection id="uiresources_plat" name="UI Resources Platform Interfaces" level="data">
+<component id="layout_system_private_api" name="Layout System Private API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/layout_system_private_api/group" filter="!test"/>
+
+</component>
+<component id="layout_data_api" name="Layout Data API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/layout_data_api/group" filter="!test"/>
+
+</component>
+<component id="cdl_api" name="CDL API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/cdl_api/group" filter="!test"/>
+
+</component>
+<component id="extended_skins_api" name="Extended Skins API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/extended_skins_api/group" filter="!test"/>
+
+</component>
+<component id="tfx_server_controller_plugin_api" name="TFX Server Controller Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/tfx_server_controller_plugin_api/group"/>
+</component>
+<component id="extended_fonts_api" name="Extended Fonts API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/extended_fonts_api/group" filter="!test"/>
+
+</component>
+<component id="graphic_configuration_api" name="Graphic Configuration API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/graphic_configuration_api/group" filter="!test"/>
+
+</component>
+<component id="mif_header_cdl_api" name="MIF Header CDL API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/mif_header_cdl_api/group"/>
+</component>
+<component id="personalisation_and_skins_settings_api" name="Personalisation and Skins Settings API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/personalisation_and_skins_settings_api/group"/>
+</component>
+<component id="tfx_effect_setup_plugin_api" name="TFX Effect Setup Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/tfx_effect_setup_plugin_api/group"/>
+</component>
+<component id="mifconv_definitions_api" name="Mifconv Definitions API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/mifconv_definitions_api/group"/>
+</component>
+<component id="wallpaper_configuration_api" name="Wallpaper Configuration API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/wallpaper_configuration_api/group"/>
+</component>
+<component id="language_code_definitions_api" name="Language Code Definitions API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/language_code_definitions_api/group"/>
+</component>
+<component id="skins_image_attributes_api" name="Skins Image Attributes API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
+
+</component>
+<component id="private_user_area_code_definitions_api" name="Private User Area Code Definitions API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/private_user_area_code_definitions_api/group"/>
+</component>
+<component id="tfx_server_plugin_ids_api" name="TFX Server Plug-in IDs API" class="api" filter="s60">
+<unit bldFile="/mw/uiresources/uiresources_plat/tfx_server_plugin_ids_api/group"/>
+</component>
+</collection>
+<collection id="uiresources_info" name="UI Resources Info" level="data">
+<component id="uiresources_test" filter="s60,test,api_test" name="UI Resources Tests" purpose="development">
+
+</component>
+</collection>
+<collection id="uigraphics" name="UI Graphics" level="generic">
+<component id="bitmaps2" filter="s60" name="Bitmaps 2" class="config">
+<unit bldFile="/mw/uiresources/uigraphics/bitmaps2/group"/>
+</component>
+<component id="icons" filter="s60" class="config" name="Icons">
+<unit bldFile="/mw/uiresources/uigraphics/icons/group"/>
+</component>
+<component id="variatedbitmaps" filter="s60" name="Variated Bitmaps" class="config">
+<unit bldFile="/mw/uiresources/uigraphics/variatedbitmaps/group"/>
+</component>
+<component id="aknicon" filter="s60" name="Avkon Icon Framework">
+<unit bldFile="/mw/uiresources/uigraphics/aknicon/group"/>
+</component>
+<component id="nvgrenderstage" filter="sf_build" name="NVG Render Stage">
+<unit bldFile="/mw/uiresources/uigraphics/nvgrenderstage/group"/>
+</component>
+</collection>
+<collection id="layouts" name="Layouts" level="plugin">
+<component id="cdl" filter="s60" name="Customization Definition Language">
+<!-- can only have one unit. Need to #include them or split into multiple components -->
+<unit bldFile="/mw/uiresources/layouts/cdl/cdlengine/group"/>
+<unit bldFile="/mw/uiresources/layouts/cdl/cdlserver/group"/>
+</component>
+<component id="aknlayout2" filter="s60" name="Avkon Layout 2">
+<unit bldFile="/mw/uiresources/layouts/aknlayout2/group"/>
+</component>
+</collection>
+<collection id="skins" name="Skins" level="data">
+<component id="aknskincontent" filter="s60" name="Avkon Skin Content" class="config">
+<unit bldFile="/mw/uiresources/skins/aknskincontent/group"/>
+</component>
+<component id="aknskins" filter="s60" name="Avkon Skin Compiler">
+<unit bldFile="/mw/uiresources/skins/aknskins/group"/>
+</component>
+</collection>
+<collection id="pictographs" name="Pictographs" level="data">
+<component id="aknpictograph" filter="s60" name="Avkon Pictograph">
+<unit bldFile="/mw/uiresources/pictographs/aknpictograph/group"/>
+</component>
+</collection>
+<collection id="locales" name="Locales" level="framework">
+<component id="locales_build" filter="s60" name="Locales Build">
+<unit bldFile="/mw/uiresources/locales/loce32"/>
+</component>
+</collection>
+<collection id="uiconfig" name="UI Config" level="server">
+<component id="s60config" filter="s60" name="S60 UI Config">
+<unit bldFile="/mw/uiresources/uiconfig/s60config/group"/>
+</component>
+</collection>
+<collection id="fontsupport" name="Font Support" level="generic">
+<component id="fontprovider" filter="s60" name="Font Provider">
+<unit bldFile="/mw/uiresources/fontsupport/fontprovider/group"/>
+</component>
+<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
+ <component id="s60_fonts" filter="s60" name="S60 Fonts">
+ <unit bldFile="fontsupport/fontutils/group"/>
+ </component>
+-->
+<component id="fontutils" filter="sf_build" name="Font Utils">
+<unit bldFile="/mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
+</component>
+</collection>
+<collection id="helpthemes" name="Help Themes" level="data">
+<!-- collection is really a component. Need to move down a directory -->
+<component id="helpthemes_build" filter="s60" name="Help Themes Build" class="config">
+<unit bldFile="/mw/uiresources/helpthemes/group"/>
+</component>
+</collection>
+</package>
+<package id="hapticsservices" level="generic" tech-domain="ui" name="Haptics Services" levels="fw server api">
+<collection id="hapticsservices_plat" name="Haptics Services Platform Interfaces" level="api">
+<component id="tacticon_api" name="Tacticon API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/hapticsservices/hapticsservices_plat/tacticon_api/group"/>
+</component>
+<component id="tactile_feedback_core_api" name="Tactile Feedback Core API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/hapticsservices/hapticsservices_plat/tactile_feedback_core_api/group"/>
+</component>
+<component id="tactile_feedback_server_api" name="Tactile Feedback Server API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/hapticsservices/hapticsservices_plat/tactile_feedback_server_api/group"/>
+</component>
+</collection>
+<collection id="hapticsservices_pub" name="Haptics Services Public Interfaces" level="api">
+<component id="tactile_feedback_client_api" name="Tactile Feedback Client API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/hapticsservices/hapticsservices_pub/tactile_feedback_client_api/group"/>
+</component>
+</collection>
+<collection id="tacticonserver" name="Tacticon Server" level="server">
+<!-- collection is really a component. Move down a directory -->
+<component id="tacticonserver_build" filter="s60" name="Tacticon Server Build" introduced="^3">
+<unit bldFile="/mw/hapticsservices/tacticonserver/group"/>
+<!-- clients and servers are suauly the same component. Consider moving pluign to a separate component if needed -->
+</component>
+</collection>
+<collection id="tactilefeedback" name="Tactile Feedback" level="fw">
+<component id="tactilearearegistry" filter="s60" name="Tactile Area Registry" introduced="^1">
+<unit bldFile="/mw/hapticsservices/tactilefeedback/tactilearearegistry/group"/>
+</component>
+<component id="tactilefeedbackresolver" filter="s60" name="Tactile Feedback Resolver" introduced="^1">
+<unit bldFile="/mw/hapticsservices/tactilefeedback/tactilefeedbackresolver/group"/>
+</component>
+<component id="tactileclickplugin" filter="s60" name="Tactile Click Plugin" class="plugin" introduced="^1">
+<unit bldFile="/mw/hapticsservices/tactilefeedback/tactileclickplugin/group"/>
+</component>
+<component id="tactilefeedbackclient" filter="s60" name="Tactile Feedback Client" introduced="^1">
+<unit bldFile="/mw/hapticsservices/tactilefeedback/tactilefeedbackclient/group"/>
+</component>
+<component id="tactileactionplugin" filter="s60" name="Tactile Action Plugin" class="plugin" introduced="^1">
+<unit bldFile="/mw/hapticsservices/tactilefeedback/tactileactionplugin/group"/>
+</component>
+<component id="tactilefeedback_build" filter="s60" name="Tactile Feedback Build" introduced="^1">
+<!-- consider moving IBY to one fo the above components -->
+<unit bldFile="/mw/hapticsservices/tactilefeedback/group"/>
+</component>
+</collection>
+</package>
+<package id="platformthemes" level="specific" tech-domain="ui" name="Platform Themes" levels="framework generic ui">
+<collection id="platformthemes_info" name="Platform Themes Info">
+<component id="platformthemes_build" name="Platform Themes Build">
+<!-- no real structure in this package. Should break into collections / components -->
+<unit bldFile="/mw/platformthemes" qt:proFile="platformthemes.pro"/>
+</component>
+</collection>
+</package>
+<package id="gsprofilesrv" level="generic" tech-domain="ui" name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
+<collection id="gsprofilesrv_pub" name="GS and Profiles Services Public Interfaces" level="specific">
+<component id="profiles_engine_active_profile_settings_api" name="Profiles Engine Active Profile Settings API" class="api" filter="s60">
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_active_profile_settings_api/group"/>
+</component>
+<component id="profiles_engine_wrapper_api" name="Profiles Engine Wrapper API" class="api" filter="s60">
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_wrapper_api/group"/>
+</component>
+</collection>
+<collection id="gsprofilesrv_plat" name="GS and Profiles Services Platform Interfaces" level="specific">
+<component id="ftuwizardmodel_api" name="FTU Wizard Model API" filter="bldfirst,s60" class="api">
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/ftuwizardmodel_api" qt:proFile="ftuwizardmodel_api.pro" qt:qmakeArgs="-r -config rom"/>
+</component>
+<component id="profiles_engine_api" name="Profiles Engine API" class="api" filter="s60">
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/profiles_engine_api/group"/>
+</component>
+<component id="settings_backgroundimage_api" name="Settings Background Image API" class="api" filter="s60">
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_backgroundimage_api/group"/>
+</component>
+<component id="settings_framework_api" name="Settings Framework API" class="api" filter="s60">
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_framework_api/group"/>
+</component>
+<component id="settings_launch_api" name="Settings Launch API" class="api" filter="s60">
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_launch_api/group"/>
+</component>
+<component id="settings_listbox_api" name="Settings List Box API" class="api" filter="s60">
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_listbox_api/group"/>
+</component>
+<component id="settings_plugin_api" name="Settings Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_plugin_api/group"/>
+</component>
+<component id="settings_uis_cenrep_collection_api" name="Settings UIs CenRep Collection API" class="api" filter="s60">
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
+</component>
+</collection>
+<collection id="gssettingsuis" name="General Settings UIs" level="framework">
+<component id="gs" filter="s60" name="General Settings" introduced="9.2">
+<unit bldFile="/mw/gsprofilesrv/gssettingsuis/gs/group"/>
+</component>
+</collection>
+<collection id="ftuwizardmodel" name="FTU Wizard Model" level="generic">
+<component id="ftuwizardmodel_build" name="FTU Wizardmodel Build" filter="bldfirst">
+<unit bldFile="/mw/gsprofilesrv/ftuwizardmodel" qt:proFile="ftuwizardmodel.pro" qt:qmakeArgs="-r -config rom"/>
+</component>
+</collection>
+<collection id="controlpanel" name="Control Panel" level="generic">
+
+<component id="controlpanel_rom" name="Control Panel ROM" filter="s60">
+<unit bldFile="/mw/gsprofilesrv/controlpanel/rom" qt:proFile="cp_rom.pri" qt:qmakeArgs="-r -config rom"/>
+</component>
+<component id="controlpanel_source" name="Control Panel Source" filter="s60">
+<unit bldFile="/mw/gsprofilesrv/controlpanel/src" qt:qmakeArgs="-r -config rom" qt:proFile="src.pro"/>
+</component>
+</collection>
+<collection id="profilesservices" name="Profiles Services" level="server">
+<component id="profileengine" filter="s60" name="Profile Engine" introduced="9.1">
+<unit bldFile="/mw/gsprofilesrv/profilesservices/profileengine/group"/>
+</component>
+</collection>
+</package>
+<package id="homescreensrv" level="specific" tech-domain="ui" name="Home Screen Services" levels="plugin framework server generic specific">
+<collection id="appfoundation" name="App Foundation" level="generic">
+<component id="appfoundation_build" name="App Foundation Build" introduced="^4">
+<unit bldFile="/mw/homescreensrv/appfoundation" qt:qmakeArgs="-r" qt:proFile="appfoundation.pro"/>
+</component>
+</collection>
+<collection id="hswidgetmodel" name="Home Screen Widget Model" level="framework">
+<component id="hswidgetmodel_build" name="Home Screen Widget Model Build" introduced="^4">
+<unit bldFile="/mw/homescreensrv/hswidgetmodel" qt:qmakeArgs="-r" qt:proFile="hswidgetmodel.pro"/>
+</component>
+</collection>
+<collection id="contentstorage" name="Content Storage" level="framework">
+<component id="cautils" name="Content Arsenal Utils" introduced="^4">
+<unit bldFile="/mw/homescreensrv/contentstorage/cautils" qt:qmakeArgs="-r" qt:proFile="cautils.pro"/>
+</component>
+<component id="contentstorage_build" name="Content Storage Build" introduced="^4">
+<unit bldFile="/mw/homescreensrv/contentstorage/group" qt:qmakeArgs="-r" qt:proFile="group.pro"/>
+</component>
+<component id="casrv/calocalizerscanner" name="Content Arsenal Server Localizer Scanner" introduced="^4">
+<unit bldFile="/mw/homescreensrv/contentstorage/casrv/calocalizerscanner" qt:qmakeArgs="-r" qt:proFile="calocalizerscanner.pro"/>
+</component>
+<component id="cahandler" name="Content Arsenal Handler" introduced="^4">
+<unit bldFile="/mw/homescreensrv/contentstorage/cahandler" qt:qmakeArgs="-r" qt:proFile="cahandler.pro"/>
+</component>
+<component id="caclient" name="Content Arsenal Client" introduced="^4">
+<unit bldFile="/mw/homescreensrv/contentstorage/caclient" qt:qmakeArgs="-r" qt:proFile="caclient.pro"/>
+</component>
+</collection>
+<collection id="homescreensrv_plat" name="Home Screen Services Platform Interfaces" level="specific">
+<component id="homescreensrv_plat_build" name="Home Screen Services Platform Interfaces build" introduced="^4">
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat" qt:qmakeArgs="-r" qt:proFile="homescreensrv_plat.pro"/>
+</component>
+<component id="action_handler_plugin_api" name="Action Handler Plugin API" class="api" filter="s60">
+<unit base="/mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api"/>
+</component>
+<component id="content_harvester_plugin_api" name="Content Harvester Plugin API" class="api" filter="s60">
+<unit base="/mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api"/>
+</component>
+<component id="sapi_contentpublishing" name="SAPI Content Publishing" class="api" filter="s60">
+<unit base="/mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing"/>
+</component>
+<component id="sapi_actionhandler" name="SAPI Action Handler" class="api" filter="s60">
+<unit base="/mw/homescreensrv/homescreensrv_plat/sapi_actionhandler"/>
+</component>
+<component id="menu_sat_interface_api" name="Menu SAT Interface API" class="api" filter="s60">
+<unit base="/mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api"/>
+</component>
+<component id="appruntimemodel_api" name="Appliction Run-Time Model API" class="api" filter="s60" introduced="^4">
+<unit base="/mw/homescreensrv/homescreensrv_plat/appruntimemodel_api"/>
+</component>
+<component id="contentstorage_api" name="Content Storage API" class="api" filter="s60" introduced="^4">
+<unit base="/mw/homescreensrv/homescreensrv_plat/contentstorage_api"/>
+</component>
+<component id="hswidgetmodel_api" name="HS Widget Model API" class="api" filter="s60" introduced="^4">
+<unit base="/mw/homescreensrv/homescreensrv_plat/hswidgetmodel_api"/>
+</component>
+<component id="statemodel_api" name="State Model API" class="api" filter="s60" introduced="^4">
+<unit base="/mw/homescreensrv/homescreensrv_plat/statemodel_api"/>
+</component>
+<component id="homescreen_information_api" name="Homescreen Information API" class="api" filter="s60" introduced="^4">
+<unit base="/mw/homescreensrv/homescreensrv_plat/homescreen_information_api"/>
+</component>
+</collection>
+<collection id="hsactivityfw" name="Activity Framework" level="activityfw">
+<component id="hsactivityfw_build" name="Activity Framework Build" introduced="^4">
+<unit bldFile="/mw/homescreensrv/activityfw" qt:qmakeArgs="-r" qt:proFile="activityfw.pro"/>
+</component>
+</collection>
+<collection id="hsappkeyhandler" name="HS Appplication Key Handler" level="server">
+<component id="hsappkeyhandler_build" name="Appplication Key Handler Build" introduced="^4">
+<unit bldFile="/mw/homescreensrv/hsappkeyhandler" qt:qmakeArgs="-r" qt:proFile="hsappkeyhandler.pro"/>
+</component>
+</collection>
+<collection id="homescreensrv_info" name="Home Screen Services Info" level="specific">
+<component id="homescreensrvconf" name="Home Screen Services Config" class="config" introduced="^4">
+<unit bldFile="/mw/homescreensrv" qt:qmakeArgs="-r" qt:proFile="homescreensrv.pro"/>
+</component>
+<component id="homescreensrvrom" name="Home Screen Services ROM" introduced="^4">
+<unit bldFile="/mw/homescreensrv/group"/>
+</component>
+
+</collection>
+</package>
+<package id="homescreensrvlegacy" level="generic" tech-domain="ui" name="Legacy Home Screen Services" levels="plugin framework server generic specific">
+<collection id="homescreensrvlegacy_plat" name="Legacy Home Screen Services Platform Interfaces" level="specific">
+<component id="ai_content_model_api" name="AI Content Model API" class="api" filter="s60">
+<unit bldFile="/mw/homescreensrvlegacy/ai_content_model_api/group" qt:proFile="group.pro"/>
+</component>
+<component id="ai_plugin_information_api" name="AI Plug-in Information API" class="api" filter="s60">
+<unit bldFile="/mw/homescreensrvlegacy/ai_plugin_information_api/group" qt:proFile="group.pro"/>
+</component>
+</collection>
+</package>
+<package id="appinstall" level="generic" tech-domain="rt" name="Application Installation" levels="tool framework generic api">
+<collection id="appinstall_plat" name="Application Installation Platform Interfaces" level="api">
+<component id="iaupdate_api" name="IA Update API" class="api" filter="s60">
+<unit bldFile="/mw/appinstall/appinstall_plat/iaupdate_api/group"/>
+</component>
+<component id="task_plugin_api" name="Task Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/appinstall/appinstall_plat/task_plugin_api/group"/>
+</component>
+<component id="sw_installer_common_ui_api" name="SW Installer Common UI API" class="api" filter="s60">
+<unit bldFile="/mw/appinstall/appinstall_plat/sw_installer_common_ui_api/group"/>
+</component>
+<component id="sw_installer_launcher_api" name="SW Installer Launcher API" class="api" filter="s60">
+<unit bldFile="/mw/appinstall/appinstall_plat/sw_installer_launcher_api/group"/>
+</component>
+<component id="task_management_api" name="Task Management API" class="api" filter="s60">
+<unit bldFile="/mw/appinstall/appinstall_plat/task_management_api/group"/>
+</component>
+<component id="sw_installer_ui_plugin_api" name="SW Installer UI Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/appinstall/appinstall_plat/sw_installer_ui_plugin_api/group"/>
+</component>
+<component id="sw_installer_cr_keys" name="SW Installer CR Keys" class="api" filter="s60">
+<unit bldFile="/mw/appinstall/appinstall_plat/sw_installer_cr_keys/group"/>
+</component>
+<component id="sw_installer_ps_keys" name="SW Installer PS Keys" class="api" filter="s60">
+<unit bldFile="/mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
+</component>
+<component id="appmngr2runtimeapi" name="Application Manager 2 Runtime Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
+</component>
+<component id="sifui_api" name="STIF UI API" class="api" filter="s60">
+<unit bldFile="/mw/appinstall/appinstall_plat/sifui_api/group"/>
+</component>
+</collection>
+<collection id="appinstall_pub" name="Application Installation Public Interfaces" level="api">
+<component id="startup_list_management_api" name="Startup List Management API" class="api" filter="s60">
+<unit bldFile="/mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
+</component>
+</collection>
+<collection id="ncdengine" name="Nokia Content Discover" level="framework">
+<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
+<component id="ncdengine_engine" filter="s60" name="NCD Engine" introduced="^1">
+<unit bldFile="/mw/appinstall/ncdengine/engine/group"/>
+</component>
+<component id="debuglogger" filter="s60" name="NCD Debug Logger" introduced="^1">
+<!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
+</component>
+<component id="ncdengine_build" filter="s60" name="NCD Build" introduced="^1">
+<unit bldFile="/mw/appinstall/ncdengine/group"/>
+</component>
+</collection>
+<collection id="appinstaller" name="Application Installer" level="generic">
+<component id="appinstui" filter="s60" name="Application Installer UI" introduced="^2">
+<unit bldFile="/mw/appinstall/appinstaller/appinstui/group"/>
+</component>
+</collection>
+<collection id="iaupdateapi_stub" name="IA Update API Stub" level="api">
+<!-- the collection is really a component. Move down a directory.-->
+<component id="iaupdateapi_stub_build" name="IA Update API Stub Build" filter="s60" introduced="^2">
+<unit bldFile="/mw/appinstall/iaupdateapi_stub/group"/>
+</component>
+</collection>
+<collection id="iaupdate" name="Independent Apps Update" level="api">
+<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
+<component id="iad" name="Software Update" filter="s60" introduced="^2">
+<unit bldFile="/mw/appinstall/iaupdate/iad/group"/>
+</component>
+<component id="iaupdate_help" filter="s60" name="IA Update Help" introduced="^2">
+<unit bldFile="/mw/appinstall/iaupdate/help/group"/>
+</component>
+<component id="iaupdate_build" filter="s60" name="IA Update Build" introduced="^2">
+<unit bldFile="/mw/appinstall/iaupdate/group"/>
+</component>
+</collection>
+<collection id="installationservices" name="Installation Services" level="generic">
+<component id="swi" name="Secure Software Install" purpose="optional">
+<unit bldFile="/mw/appinstall/installationservices/swi/group" mrp="/mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
+</component>
+<component id="swidevicetools" name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
+<unit bldFile="/mw/appinstall/installationservices/swidevicetools/group" mrp="/mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
+</component>
+<component id="swcomponentregistry" name="Software Component Registry" introduced="^4" purpose="mandatory">
+<unit bldFile="/mw/appinstall/installationservices/swcomponentregistry/group" mrp="/mw/appinstall/installationservices/swcomponentregistry/group/security_softwarecomponentregistry.mrp"/>
+</component>
+<component id="swinstallationfw" name="Software Installation Framework" introduced="^4" purpose="optional">
+<unit bldFile="/mw/appinstall/installationservices/swinstallationfw/group" mrp="/mw/appinstall/installationservices/swinstallationfw/group/security_softwareinstallframework.mrp"/>
+</component>
+<component id="swtransactionservices" name="Software Transaction Services" introduced="^4" purpose="optional">
+<unit bldFile="/mw/appinstall/installationservices/swtransactionservices/group" mrp="/mw/appinstall/installationservices/swtransactionservices/group/security_softwaretransactionservices.mrp"/>
+</component>
+<component id="refswinstallationplugin" name="Reference Software Installation Plugin" introduced="^4" purpose="development" class="plugin">
+<unit bldFile="/mw/appinstall/installationservices/refswinstallationplugin/group" mrp="/mw/appinstall/installationservices/refswinstallationplugin/group/security_sifrefplugin.mrp"/>
+</component>
+<component id="refsoftwareappmgr" name="Reference Software Application Manager" introduced="^4" purpose="development">
+<unit bldFile="/mw/appinstall/installationservices/refsoftwareappmgr/group" mrp="/mw/appinstall/installationservices/refsoftwareappmgr/group/security_referenceapplicationmanager.mrp"/>
+</component>
+
+<component id="swiconfig" name="Software Install Config" introduced="9.1" purpose="optional" class="config">
+<unit bldFile="/mw/appinstall/installationservices/swiconfig/group" mrp="/mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
+</component>
+</collection>
+<collection id="secureswitools" name="Secure Software Install Tools" level="tool">
+<component id="makekeys" name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" target="desktop">
+<unit bldFile="/mw/appinstall/secureswitools/makekeys/group" mrp="/mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
+</component>
+<component id="swianalysistoolkit" name="SWI Analysis Toolkit" purpose="development" target="desktop">
+<unit bldFile="/mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="/mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
+</component>
+<component id="openssllib" name="OpenSSL Library" purpose="optional" target="desktop">
+<unit mrp="/mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
+</component>
+<component id="swisistools" name="Secure Software Install SIS Tools" purpose="optional" target="desktop">
+<unit bldFile="/mw/appinstall/secureswitools/swisistools/group" mrp="/mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
+</component>
+</collection>
+<collection id="appinstall_info" name="Application Installation Info" level="api">
+
+
+<component id="appinstall_metadata" name="Application Installation Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="serviceapifw" level="specific" tech-domain="rt" name="Service API Framework" levels="plugin framework server generic specific">
+<collection id="serviceapifw_pub" name="Service API Framework Public Interfaces" level="specific"/>
+<collection id="serviceapifw_plat" name="Service API Framework Platform Interfaces" level="specific">
+<component id="rtsecuritymanager_common_api" name="Runtime Security Manager Common API" class="api" filter="s60">
+<unit bldFile="/mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/group"/>
+</component>
+<component id="rtsecuritymanager_utility_api" name="Runtime Security Manager Utility API" class="api" filter="s60">
+<unit bldFile="/mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
+</component>
+<component id="rtsecuritymanager_client_api" name="Runtime Security Manager Client API" class="api" filter="s60">
+<unit bldFile="/mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/group"/>
+</component>
+<component id="liw_provider_utility_api" name="LIW Provider Utility API" class="api" filter="s60">
+<unit bldFile="/mw/serviceapifw/serviceapifw_plat/liw_provider_utility_api/group"/>
+</component>
+<component id="liw_service_interface_base_api" name="LIW Service Interface Base API" class="api" filter="s60">
+<unit bldFile="/mw/serviceapifw/serviceapifw_plat/liw_service_interface_base_api/group"/>
+</component>
+<component id="liw_service_interface_menu_api" name="LIW Service Interface Menu API" class="api" filter="s60">
+<unit bldFile="/mw/serviceapifw/serviceapifw_plat/liw_service_interface_menu_api/group"/>
+</component>
+<component id="liw_criteria_api" name="LIW Criteria API" class="api" filter="s60">
+<unit bldFile="/mw/serviceapifw/serviceapifw_plat/liw_criteria_api/group"/>
+</component>
+<component id="liw_generic_parameter_api" name="LIW Generic Parameter API" class="api" filter="s60">
+<unit bldFile="/mw/serviceapifw/serviceapifw_plat/liw_generic_parameter_api/group"/>
+</component>
+<component id="liw_service_handler_api" name="LIW Service Handler API" class="api" filter="s60">
+<unit bldFile="/mw/serviceapifw/serviceapifw_plat/liw_service_handler_api/group"/>
+</component>
+</collection>
+<collection id="rtsecuritymanager" name="Runtime Security Manager" level="server">
+<component id="rtsecuritymanagerutil" filter="s60" name="Runtime Security Manager Util">
+<unit bldFile="/mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
+</component>
+<component id="rtsecuritymanagerserver" filter="s60" name="Runtime Security Manager Server">
+<unit bldFile="/mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/>
+</component>
+<component id="rtsecuritymanagerclient" filter="s60" name="Runtime Security Manager Client">
+<unit bldFile="/mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/>
+</component>
+<component id="rtsecuritymanager_build" filter="s60" name="Runtime Security Manager Build">
+<!-- Move the export to the appropriate components, or make this a ROM component by removing the #includes -->
+<unit bldFile="/mw/serviceapifw/rtsecuritymanager/group"/>
+</component>
+</collection>
+<collection id="languageinterworkingfw" name="Language Interworking Framework" level="framework">
+<component id="lifwservicehandler" filter="s60" name="Service Handler">
+<unit bldFile="/mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
+</component>
+</collection>
+</package>
+<package id="serviceapi" level="specific" tech-domain="rt" name="Service API" levels="os mw1 mw2 app">
+<!-- should break up this collection into something meaningful -->
+<collection id="serviceproviders" name="Service Providers" level="mw1">
+<component id="sapi_contacts_vpbk" name="Contacts Phonebook SAPI" filter="s60" class="plugin">
+<unit bldFile="/mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
+</component>
+<component id="sapi_location" name="Location SAPI" filter="s60" class="plugin">
+<unit bldFile="/mw/serviceapi/serviceproviders/sapi_location/group"/>
+</component>
+<component id="sapi_mediamanagement" name="Media Management SAPI" filter="s60" class="plugin">
+<unit bldFile="/mw/serviceapi/serviceproviders/sapi_mediamanagement/group"/>
+</component>
+<component id="sapi_landmarks" name="Landmarks SAPI" filter="s60" class="plugin">
+<unit bldFile="/mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
+</component>
+<component id="sapi_messaging" name="Messaging SAPI" filter="s60" class="plugin">
+<unit bldFile="/mw/serviceapi/serviceproviders/sapi_messaging/group"/>
+</component>
+<component id="sapi_applicationmanager" name="Application Manager SAPI" filter="s60" class="plugin">
+<unit bldFile="/mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
+</component>
+<component id="sapi_calendar" name="Calendar SAPI" filter="s60" class="plugin">
+<unit bldFile="/mw/serviceapi/serviceproviders/sapi_calendar/group"/>
+</component>
+<component id="sapi_logging" name="Logging SAPI" filter="s60" class="plugin">
+<unit bldFile="/mw/serviceapi/serviceproviders/sapi_logging/group"/>
+</component>
+<component id="sapi_sensor" name="Sensor SAPI" filter="s60" class="plugin">
+<unit bldFile="/mw/serviceapi/serviceproviders/sapi_sensor/group"/>
+</component>
+<component id="sapi_sysinfo" name="Sysinfo SAPI" filter="s60" class="plugin">
+<unit bldFile="/mw/serviceapi/serviceproviders/sapi_sysinfo/group"/>
+</component>
+<component id="sapi_serviceregistry" name="Service Registry SAPI" filter="s60" class="plugin">
+<unit bldFile="/mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
+</component>
+<component id="jsapi" name="Javascript API" filter="s60" class="plugin">
+<unit bldFile="/mw/serviceapi/serviceproviders/jsapi/group"/>
+</component>
+<component id="serviceproviders_build" filter="s60" name="Service API Build">
+<!-- distribute the exports or make this a ROM component by removing the #includes -->
+<unit bldFile="/mw/serviceapi/serviceproviders/group"/>
+</component>
+</collection>
+</package>
+<package id="browser" level="specific" tech-domain="rt" name="Browser" levels="plugin utils support main">
+<collection id="bookmarksengine" name="Bookmarks Engine" level="support">
+<component id="bookmarksengine_build" name="Bookmarks Engine Build" introduced="^4">
+<unit bldFile="/mw/browser/bookmarksengine" qt:proFile="bookmarksengine.pro" qt:qmakeArgs=""what+=plat_101""/>
+</component>
+</collection>
+</package>
+<package id="web" level="specific" tech-domain="rt" name="Web" levels="plugin utils server generic specific">
+<collection id="web_pub" name="Web Public Interfaces" level="specific">
+<component id="browser_control_api" name="Browser Control API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_pub/browser_control_api/group"/>
+</component>
+<component id="download_mgr_client_api" name="Download Manager Client API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_pub/download_mgr_client_api/group"/>
+</component>
+<component id="download_mgr_ui_api" name="Download Manager UI Library API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_pub/download_mgr_ui_api/group"/>
+</component>
+<component id="favourites_engine_api" name="Favourites Engine API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_pub/favourites_engine_api/group"/>
+</component>
+<component id="browser_plugin_api" name="Browser Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_pub/browser_plugin_api/group"/>
+</component>
+<component id="settings_api" name="Settings API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_pub/settings_api/group"/>
+</component>
+</collection>
+<collection id="web_plat" name="Web Platform Interfaces" level="specific">
+<component id="aiw_browser_provider_api" name="AIW Browser Provider API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/aiw_browser_provider_api/group"/>
+</component>
+<component id="browser_dialogs_provider_api" name="Browser Dialogs Provider API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/browser_dialogs_provider_api/group"/>
+</component>
+<component id="browser_platform_api" name="Browser Platform API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/browser_platform_api/group"/>
+</component>
+<component id="cod_handler_api" name="COD Handler API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/cod_handler_api/group"/>
+</component>
+<component id="connection_manager_api" name="Connection Manager API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/connection_manager_api/group"/>
+</component>
+<component id="cxml_library_api" name="cXml Library API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/cxml_library_api/group"/>
+</component>
+<component id="download_mgr_client_api_extn" name="Download Manager Client API Extension" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/download_mgr_client_api_extn/group"/>
+</component>
+<component id="feeds_engine_api" name="Feeds Engine API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/feeds_engine_api/group"/>
+</component>
+<component id="launcher_api" name="Launcher API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/launcher_api/group"/>
+</component>
+<component id="multipart_parser_api" name="Multipart Parser API" class="api" filter="s60">
+<meta rel="config">
+<defined condition="BRDO_MULTIPART_PARSER_FF"/>
+</meta>
+<unit bldFile="/mw/web/web_plat/multipart_parser_api/group"/>
+</component>
+<component id="recent_url_store_api" name="Recent URL Store API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/recent_url_store_api/group"/>
+</component>
+<component id="rt_gesturehelper_api" name="Runtime Gesture Helper API" class="api" filter="s60" introduced="^4">
+<unit bldFile="/mw/web/web_plat/rt_gesturehelper_api/group"/>
+</component>
+<component id="scheme_handler_plugin_api" name="Scheme Handler Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/scheme_handler_plugin_api/group"/>
+</component>
+<component id="scriptable_plugin_api" name="Scriptable Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/scriptable_plugin_api/group"/>
+</component>
+<component id="webutils_api" name="Web Utils API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/webutils_api/group"/>
+</component>
+<component id="widget_registry_api" name="Widget Registry API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/widget_registry_api/group"/>
+</component>
+<component id="xml_parser_api" name="XML Parser API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/xml_parser_api/group"/>
+</component>
+</collection>
+<collection id="web_info" name="Web Info" level="specific">
+<component id="web_build" filter="s60" name="Web Build">
+<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
+<unit bldFile="/mw/web/group"/>
+</component>
+</collection>
+<collection id="browserutilities" name="Browser Utilities" level="utils">
+<component id="browserdialogsprovider" filter="s60" name="Browser Dialogs Provider">
+<unit bldFile="/mw/web/browserutilities/browserdialogsprovider/group"/>
+</component>
+<component id="recenturlstore" filter="s60" name="Recent URL Store">
+<unit bldFile="/mw/web/browserutilities/recenturlstore/group"/>
+</component>
+<component id="xmlparser" filter="s60" name="XML Interface">
+<unit bldFile="/mw/web/browserutilities/xmlparser/group"/>
+</component>
+<component id="cxmllibrary" filter="s60" name="XML Parser Implementation">
+<unit bldFile="/mw/web/browserutilities/cxmllibrary/group"/>
+</component>
+<component id="downloadmgr" filter="s60" name="Download Manager">
+<unit bldFile="/mw/web/browserutilities/downloadmgr/group"/>
+</component>
+<component id="connectionmanager" filter="s60" name="Connection Manager">
+<unit bldFile="/mw/web/browserutilities/connectionmanager/group"/>
+</component>
+<component id="browsertelservice" filter="s60" name="Browser Telephony Service">
+<unit bldFile="/mw/web/browserutilities/browsertelservice/group"/>
+</component>
+<component id="favouritesengine" filter="s60" name="Favourites Engine">
+<unit bldFile="/mw/web/browserutilities/favouritesengine/group"/>
+</component>
+<component id="feedsengine" filter="s60" name="Feeds Engine">
+<unit bldFile="/mw/web/browserutilities/feedsengine/group"/>
+</component>
+<component id="multipartparser" filter="s60" name="Multipart Parser">
+<meta rel="config">
+<defined condition="BRDO_MULTIPART_PARSER_FF"/>
+</meta>
+<!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
+<!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
+</component>
+<component id="schemehandler" filter="s60" name="Scheme Handler">
+<unit bldFile="/mw/web/browserutilities/schemehandler/group"/>
+</component>
+<component id="webutils" filter="s60" name="Web Utils">
+<unit bldFile="/mw/web/browserutilities/webutils/group"/>
+</component>
+<component id="aiwbrowserprovider" filter="s60" name="AIW Browser Provider" class="plugin">
+<unit bldFile="/mw/web/browserutilities/aiwbrowserprovider/group"/>
+</component>
+<component id="browserutilities_build" filter="s60" name="Browser Utilities Build">
+<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
+<unit bldFile="/mw/web/browserutilities/group"/>
+</component>
+</collection>
+<collection id="webengine" name="Web Engine" level="server">
+<component id="osswebengine" filter="s60" name="OSS Web Engine">
+<!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
+<unit bldFile="/mw/web/webengine/osswebengine/cache/group"/>
+<unit bldFile="/mw/web/webengine/osswebengine/memorymanager/group"/>
+<unit bldFile="/mw/web/webengine/osswebengine/npscript/group"/>
+<unit bldFile="/mw/web/webengine/osswebengine/webkit/s60/group"/>
+<unit bldFile="/mw/web/webengine/osswebengine/webkit/s60/group/javascriptcore"/>
+</component>
+<component id="webkitutils" filter="s60" name="WebKit Utils">
+<unit bldFile="/mw/web/webengine/webkitutils/group"/>
+</component>
+<component id="pagescaler" filter="s60" name="Page Scaler">
+<unit bldFile="/mw/web/webengine/pagescaler/group"/>
+</component>
+<component id="webwidgetinstaller" filter="s60" name="Widget Installer">
+<unit bldFile="/mw/web/webengine/widgetinstaller/group"/>
+</component>
+<component id="widgetregistry" filter="s60" name="Widget Registry">
+<unit bldFile="/mw/web/webengine/widgetregistry/group"/>
+</component>
+<component id="wmlengine" filter="s60" name="WML Engine">
+<unit bldFile="/mw/web/webengine/wmlengine/group"/>
+</component>
+<component id="device" filter="s60" name="Device">
+<!-- this needs a more meaningful name -->
+<unit bldFile="/mw/web/webengine/device/group"/>
+</component>
+<component id="widgetengine" filter="s60" name="Widget Engine">
+<unit bldFile="/mw/web/webengine/widgetengine/group"/>
+</component>
+<component id="web_memoryplugin" name="Memory Plugin" filter="s60" class="plugin">
+<unit bldFile="/mw/web/webengine/memoryplugin/group"/>
+</component>
+<component id="widgetmemoryplugin" filter="s60" name="Widget Memory Plugin" class="plugin">
+<unit bldFile="/mw/web/webengine/widgetmemoryplugin/group"/>
+</component>
+<component id="widgetbackuprestore" filter="s60" name="Widget Backup and Restore">
+<unit bldFile="/mw/web/webengine/widgetbackuprestore/group"/>
+</component>
+<component id="browserrecognizers" filter="s60" name="Browser Recognizers" class="plugin">
+<unit bldFile="/mw/web/webengine/browserrecognizers/group"/>
+</component>
+<component id="wrtharvester" filter="s60" name="Web Runtime Harvester" class="plugin">
+<unit bldFile="/mw/web/webengine/wrtharvester/group"/>
+</component>
+</collection>
+<collection id="codhandler" name="Content Object Descriptor Handler" level="specific">
+<component id="codeng" filter="s60" name="COD Engine">
+<unit bldFile="/mw/web/codhandler/codeng/group"/>
+</component>
+<component id="codui" filter="s60" name="COD UI">
+<unit bldFile="/mw/web/codhandler/codui/group"/>
+</component>
+<component id="codrecog" filter="s60" name="COD Recogniser" class="plugin">
+<unit bldFile="/mw/web/codhandler/codrecog/group"/>
+</component>
+<component id="codviewer" filter="s60" name="COD Viewer">
+<unit bldFile="/mw/web/codhandler/codviewer/group"/>
+</component>
+<component id="ddrecog" filter="s60" name="Download Descriptor Recogniser" class="plugin">
+<unit bldFile="/mw/web/codhandler/ddrecog/group"/>
+</component>
+<component id="ddviewer" filter="s60" name="Download Descriptor Viewer">
+<unit bldFile="/mw/web/codhandler/ddviewer/group"/>
+</component>
+<component id="coddownload" filter="s60" name="COD Download">
+<unit bldFile="/mw/web/codhandler/coddownload/group"/>
+</component>
+<component id="roapapp" filter="s60" name="ROAP Application">
+<unit bldFile="/mw/web/codhandler/roapapp/group"/>
+</component>
+<component id="codhandler_build" filter="s60" name="COD Handler Build">
+<!-- Exports need to go into another component or make this self-contained.
+ #included .hrh file needs to be #included in each of the other components -->
+<unit bldFile="/mw/web/codhandler/group"/>
+</component>
+</collection>
+<collection id="widgets" name="Web Widget Framework" level="generic">
+<meta rel="config">
+<defined condition="RD_BROWSER_WIDGETS"/>
+<defined condition="__WEB_WIDGETS"/>
+</meta>
+<!-- the following units can be uncommented when configuration is put in place -->
+<component id="widgetrecognizer" filter="s60" name="Widget Recognizer" class="plugin">
+<!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
+</component>
+<component id="widgetinstaller" filter="s60" name="Widget Installer UI" class="plugin">
+<!--<unit bldFile="widgets/widgetinstaller/group"/>-->
+</component>
+<component id="widgetlauncher" filter="s60" name="Widget Launcher">
+<!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
+</component>
+<component id="widgetapp" filter="s60" name="Widget UI">
+<!--<unit bldFile="widgets/widgetapp/group"/>-->
+</component>
+<component id="widgetpreinstaller" filter="s60" name="Widget Pre-Installer">
+<meta rel="config">
+<defined condition="RD_WIDGET_PREINSTALLER"/>
+</meta>
+<!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
+</component>
+<component id="widgetstartup" filter="s60" name="Widget Startup">
+<meta rel="config">
+<defined condition="RD_WIDGET_PREINSTALLER"/>
+</meta>
+<!--<unit bldFile="widgets/widgetstartup/group"/>-->
+</component>
+<component id="widgets_build" filter="s60" name="Widgets Build">
+<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed
+ #included .hrh file needs to be #included in each of the other components -->
+<unit bldFile="/mw/web/widgets/group"/>
+</component>
+</collection>
+</package>
+<package id="websrv" level="generic" tech-domain="rt" name="Web Services" levels="plugin framework server generic specific">
+<collection id="websrv_pub" name="Web Services Public Interfaces" level="specific">
+<component id="web_service_description_api" name="Web Service Description API" class="api" filter="s60">
+<unit bldFile="/mw/websrv/websrv_pub/web_service_description_api/group"/>
+</component>
+<component id="web_service_connection_api" name="Web Service Connection API" class="api" filter="s60">
+<unit bldFile="/mw/websrv/websrv_pub/web_service_connection_api/group"/>
+</component>
+<component id="web_service_manager_api" name="Web Service Manager API" class="api" filter="s60">
+<unit bldFile="/mw/websrv/websrv_pub/web_service_manager_api/group"/>
+</component>
+<component id="hostlet_connection_api" name="Hostlet Connection API" class="api" filter="s60">
+<unit bldFile="/mw/websrv/websrv_pub/hostlet_connection_api/group"/>
+</component>
+<component id="web_service_messaging_api" name="Web Service Messaging API" class="api" filter="s60">
+<unit bldFile="/mw/websrv/websrv_pub/web_service_messaging_api/group"/>
+</component>
+<component id="xml_extensions_api" name="XML Extensions API" class="api" filter="s60">
+<unit bldFile="/mw/websrv/websrv_pub/xml_extensions_api/group"/>
+</component>
+<component id="xml_fragment_api" name="XML Fragment API" class="api" filter="s60">
+<unit bldFile="/mw/websrv/websrv_pub/xml_fragment_api/group"/>
+</component>
+</collection>
+<collection id="webservices" name="Web Services Framework" level="generic">
+<!-- consider breaking this collection into more meaningful subsets -->
+<component id="wsnotifierplugins" filter="s60" name="WS Notifier Plugins" class="plugin">
+<unit bldFile="/mw/websrv/webservices/wsnotifierplugins/group"/>
+</component>
+<component id="wslogger" filter="s60" name="WS Logger">
+<unit bldFile="/mw/websrv/webservices/wslogger/group"/>
+</component>
+<component id="wsxml" filter="s60" name="WS XML Extensions">
+<unit bldFile="/mw/websrv/webservices/wsxml/group"/>
+</component>
+<component id="wsutils" filter="s60" name="WS Utils">
+<unit bldFile="/mw/websrv/webservices/wsutils/group"/>
+</component>
+<component id="wsfragment" filter="s60" name="WS Fragment">
+<unit bldFile="/mw/websrv/webservices/wsfragment/group"/>
+</component>
+<component id="wsdescription" filter="s60" name="WS Service Description">
+<unit bldFile="/mw/websrv/webservices/wsdescription/group"/>
+</component>
+<component id="wsconnection" filter="s60" name="WS Service Connection">
+<unit bldFile="/mw/websrv/webservices/wsconnection/group"/>
+</component>
+<component id="wsmessages" filter="s60" name="WS Messages">
+<unit bldFile="/mw/websrv/webservices/wsmessages/group"/>
+</component>
+<component id="wscredentialmanager" filter="s60" name="WS Credential Manager">
+<unit bldFile="/mw/websrv/webservices/wscredentialmanager/group"/>
+</component>
+<component id="wsframework" filter="s60" name="WS Framework">
+<unit bldFile="/mw/websrv/webservices/wsframework/group"/>
+</component>
+<component id="wshttpchanneltransportplugin" filter="s60" name="WS HTTP Channel Transport Plugin" class="plugin">
+<unit bldFile="/mw/websrv/webservices/wshttpchanneltransportplugin/group"/>
+</component>
+<component id="wsconnectionagent" filter="s60" name="WS Connection Agent">
+<unit bldFile="/mw/websrv/webservices/wsconnectionagent/group"/>
+</component>
+<component id="wsprovider" filter="s60" name="WS Provider">
+<unit bldFile="/mw/websrv/webservices/wsprovider/group"/>
+</component>
+<component id="wshostletconnection" filter="s60" name="WS Hostlet Connection">
+<unit bldFile="/mw/websrv/webservices/wshostletconnection/group"/>
+</component>
+<component id="wsmanager" filter="s60" name="WS Service Manager">
+<unit bldFile="/mw/websrv/webservices/wsmanager/group"/>
+</component>
+<component id="wsidentitymanager" filter="s60" name="WS Identity Manager">
+<unit bldFile="/mw/websrv/webservices/wsidentitymanager/group"/>
+</component>
+<component id="idwsfplugin" filter="s60" name="ID-WSF Plugin" class="plugin">
+<unit bldFile="/mw/websrv/webservices/idwsfplugin/group"/>
+</component>
+<component id="wsibasicplugin" filter="s60" name="WS-I Basic Plugin" class="plugin">
+<unit bldFile="/mw/websrv/webservices/wsibasicplugin/group"/>
+</component>
+<component id="wsrestplugin" filter="s60" name="WS REST Plugin" class="plugin">
+<unit bldFile="/mw/websrv/webservices/wsrestplugin/group"/>
+</component>
+<component id="idwsfsecuritymechanism" filter="s60" name="ID-WSF Security Mechanism">
+<unit bldFile="/mw/websrv/webservices/idwsfsecuritymechanism/group"/>
+</component>
+<component id="wspasswordtransforms" filter="s60" name="WS Password Transforms">
+<unit bldFile="/mw/websrv/webservices/wspasswordtransforms/group"/>
+</component>
+<component id="wscore" filter="s60" name="WS Core Service Manager">
+<unit bldFile="/mw/websrv/webservices/wscore/group"/>
+</component>
+<component id="wslocaltransportplugin" filter="s60" name="WS Local Transport Plugin" class="plugin">
+<unit bldFile="/mw/websrv/webservices/wslocaltransportplugin/group"/>
+</component>
+<component id="wshostlettransportplugin" filter="s60" name="WS Hostlet Transport Plugin" class="plugin">
+<unit bldFile="/mw/websrv/webservices/wshostlettransportplugin/group"/>
+</component>
+<component id="wsstar" filter="s60" name="WS Star">
+<!-- can only have one unit. Need to split into separate components or #include from a single bld.inf -->
+<unit bldFile="/mw/websrv/webservices/wsstar/wsstarpolicy/group"/>
+<unit bldFile="/mw/websrv/webservices/wsstar/wsstarplugin/group"/>
+<unit bldFile="/mw/websrv/webservices/wsstar/wsstarmessagehandlers/group"/>
+</component>
+<component id="wsoviplugin" filter="s60" name="WS Ovi Plugin">
+<unit bldFile="/mw/websrv/webservices/wsoviplugin/group"/>
+</component>
+<component id="webservices_build" filter="s60" name="Web Services Build">
+<!-- need to split into self-contained components -->
+<unit bldFile="/mw/websrv/webservices/group"/>
+</component>
+</collection>
+<collection id="websrv_info" name="Web Services Info" level="specific">
+<component id="websrv_bld" filter="s60" name="Web Services Build">
+<!-- need to include common .hrh in each unit -->
+<unit bldFile="/mw/websrv/group"/>
+</component>
+</collection>
+</package>
+<package id="webruntime" level="specific" tech-domain="rt" name="Web Runtime">
+<!-- need to break up this package nito collections and components -->
+<collection id="webruntime_info" name="Web Runtime Info">
+<component id="webruntime_build" name="Web Runtime Build" introduced="^4">
+<unit bldFile="/mw/webruntime" qt:proFile="cwrt.pro" qt:qmakeArgs=""what+=ninetwo" "what+=tenone" "what+=qt_unstable" "what+=wrtlite" "what+=exportiby""/>
+</component>
+</collection>
+</package>
+<package id="platformtools" level="generic" tech-domain="to" name="Platform Tools">
+<collection id="gfxconversion" name="Graphics Conversion">
+<component id="bmconv_s60" filter="s60" name="S60 Bitmap Converter" target="desktop">
+<unit bldFile="/mw/platformtools/gfxconversion/bmconv_s60/group"/>
+</component>
+<component id="mifconv" filter="s60" name="Multi Icon File Converter" target="desktop">
+<unit bldFile="/mw/platformtools/gfxconversion/mifconv/group"/>
+</component>
+</collection>
+</package>
+<package id="uitools" level="specific" tech-domain="to" name="UI Tools" levels="compile encode tool if">
+<collection id="uitools_pub" name="UI Tools Public Interfaces" level="if">
+<component id="third_party_bitmap_palette_api" name="Third Party Bitmap Palette API" class="api" filter="s60">
+<unit bldFile="/mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
+</component>
+</collection>
+<collection id="uitools_plat" name="UI Tools Platform Interfaces" level="if">
+<component id="uitools_cdl_api" name="CDL API" class="api" filter="s60">
+<unit bldFile="/mw/uitools/uitools_plat/cdl_api/group"/>
+</component>
+<component id="uitools_layout_system_private_api" name="Layout System Private API" class="api" filter="s60">
+<unit bldFile="/mw/uitools/uitools_plat/layout_system_private_api/group"/>
+</component>
+</collection>
+<collection id="cdlcompilertoolkit" name="CDL Compiler Toolkit" level="compile">
+<!-- collection is actually a component. Needs to be moved down a directory -->
+<component id="cdlcompilertoolkit_build" filter="s60" name="CDL Compiler Toolkit Build">
+<unit bldFile="/mw/uitools/cdlcompilertoolkit/group"/>
+</component>
+</collection>
+<collection id="cdlcompiler" name="CDL Compiler" level="compile">
+<!-- collection is actually a component. Needs to be moved down a directory -->
+<component id="cdlcompiler_build" filter="s60" name="CDL Compiler Build">
+<unit bldFile="/mw/uitools/cdlcompiler/group"/>
+</component>
+</collection>
+<collection id="gfxtools" name="Graphics Tools" level="tool">
+<component id="color" filter="s60" name="Bitmap Colour Palette" target="desktop">
+<unit bldFile="/mw/uitools/gfxtools/color/group"/>
+</component>
+</collection>
+<collection id="aknlayoutcompiler" name="Avkon Layout Compiler" level="compile">
+<!-- collection is actually a component. Needs to be moved down a directory -->
+<component id="aknlayoutcompiler_build" filter="s60" name="Avkon Layout Compiler Build">
+<unit bldFile="/mw/uitools/aknlayoutcompiler/group"/>
+</component>
+</collection>
+<collection id="skincompiler" name="Skin Compiler" level="compile">
+<component id="aknskindesccompiler" filter="s60" name="Avkon Skin Descriptor Compiler">
+<unit bldFile="/mw/uitools/skincompiler/AknSkinDescCompiler/group"/>
+</component>
+</collection>
+<collection id="reszip" name="Resource Zip" level="encode">
+<!-- collection is actually a component. Needs to be moved down a directory -->
+<component id="reszip_build" filter="s60" name="Resource Zip Build">
+<unit bldFile="/mw/uitools/reszip/group"/>
+</component>
+</collection>
+<collection id="toollibraries" name="Tool Libraries" level="tool"/>
+<collection id="svgtencoder" name="SVGT Encoder" level="encode">
+<component id="svgtenc" filter="s60" name="Standalone SVGT Encoder" target="desktop">
+<unit bldFile="/mw/uitools/svgtencoder/svgtenc/standalone/group"/>
+</component>
+</collection>
+</package>
+</layer>
+<layer id="app" name="Applications" levels="services apps">
+<package id="location" level="apps" tech-domain="lo" name="Location Apps" levels="ui events loc api">
+<collection id="location_plat" name="Location Apps Platform Interfaces" level="api">
+<component id="location_picker_service_api" name="Location Picker Service API" introduced="^4" class="api" filter="s60">
+<unit bldFile="/app/location/location_plat" qt:proFile="location_plat.pro"/>
+</component>
+</collection>
+<collection id="locationpickerservice" name="Location Picker Service" level="loc">
+<!--collection is really a component. Should move down a directory -->
+<component id="locationpickerservice_build" filter="s60" name="Location Picker Service Build" introduced="^4">
+<unit bldFile="/app/location/locationpickerservice" qt:proFile="locationpickerservice.pro"/>
+</component>
+</collection>
+<collection id="locationdataharvester" name="Location Data Harvester" level="events">
+<!--collection is really a component. Should move down a directory -->
+<component id="locationdataharvester_build" name="Location Data Harvester Build" filter="s60" introduced="^4">
+<unit bldFile="/app/location/locationdataharvester" qt:proFile="locationdataharvester.pro"/>
+</component>
+</collection>
+</package>
+<!-- pending removal -->
+<package id="phone" level="apps" span="2" tech-domain="vc" name="Phone Apps" levels="engine plugin ui app">
+<collection id="phoneapp" name="Phone Application" level="app">
+<component id="blacklist" filter="s60" name="Phone Blacklist Clearing" class="plugin">
+<unit bldFile="/app/phone/phoneapp/blacklist/group"/>
+</component>
+<component id="phoneuicontrol" filter="s60" name="Phone UI Control">
+<unit bldFile="/app/phone/phoneapp/phoneuicontrol/group"/>
+</component>
+<component id="phoneuistates" filter="s60" name="Phone UI States">
+<unit bldFile="/app/phone/phoneapp/phoneuistates/group"/>
+</component>
+<component id="phoneuiutils" filter="s60" name="Phone UI Utils">
+<unit bldFile="/app/phone/phoneapp/phoneuiutils/group"/>
+</component>
+<component id="silenceactionplugin" filter="s60" name="Silence Action Plugin" class="plugin">
+<unit bldFile="/app/phone/phoneapp/silenceactionplugin/group"/>
+</component>
+<component id="phonemediatorcenter" filter="s60" name="Phone Mediator Center">
+<unit bldFile="/app/phone/phoneapp/phonemediatorcenter/group"/>
+</component>
+<component id="phoneuiview2" filter="s60" name="Phone UI View">
+<unit bldFile="/app/phone/phoneapp/phoneuiview2" qt:proFile="phoneuiview2.pro"/>
+</component>
+<component id="phoneuiqtviewadapter" filter="s60" name="Phone UI Qt View Adapter" introduced="^4" class="plugin">
+<unit bldFile="/app/phone/phoneapp/phoneuiqtviewadapter" qt:proFile="phoneuiqtviewadapter.pro"/>
+</component>
+<component id="phonestringloader" filter="s60" name="Phone String Loader" introduced="^4">
+<unit bldFile="/app/phone/phoneapp/phonestringloader" qt:proFile="phonestringloader.pro"/>
+</component>
+<component id="phoneui2" filter="s60" name="Phone UI">
+<unit bldFile="/app/phone/phoneapp/phoneui2" qt:proFile="phoneui2.pro"/>
+</component>
+</collection>
+<collection id="phoneengine" name="Phone Engine" level="engine">
+<component id="phonecntfinder2" filter="s60" name="Phone Contact Finder">
+<unit bldFile="/app/phone/phoneengine/phonecntfinder2" qt:proFile="phonecntfinder2.pro"/>
+</component>
+<component id="audiohandling" filter="s60" name="Phone Audio Handling">
+<unit bldFile="/app/phone/phoneengine/audiohandling/group"/>
+</component>
+<component id="callhandling" filter="s60" name="Call Handling">
+<unit bldFile="/app/phone/phoneengine/callhandling/group"/>
+</component>
+<component id="contacthandling2" filter="s60" name="Phone Contact Handling">
+<unit bldFile="/app/phone/phoneengine/contacthandling2/group"/>
+</component>
+<component id="loghandling" filter="s60" name="Phone Log Handling">
+<unit bldFile="/app/phone/phoneengine/loghandling/group"/>
+</component>
+<component id="engineinfo" filter="s60" name="Phone Engine Info">
+<unit bldFile="/app/phone/phoneengine/engineinfo/group"/>
+</component>
+<component id="phonemodel" filter="s60" name="Phone Model">
+<unit bldFile="/app/phone/phoneengine/phonemodel" qt:proFile="phonemodel.pro"/>
+</component>
+<component id="servicehandling" filter="s60" name="Phone Service Handling">
+<unit bldFile="/app/phone/phoneengine/servicehandling/group"/>
+</component>
+<component id="phoneservices" filter="s60" name="Phone Server" introduced="^4">
+<unit bldFile="/app/phone/phoneengine/phoneservices" qt:proFile="phoneservices.pro"/>
+</component>
+<component id="parserrecognizer" filter="s60" name="Parser Recognizer" introduced="^4" class="plugin">
+<unit bldFile="/app/phone/phoneengine/parserrecognizer" qt:proFile="parserrecognizer.pro"/>
+</component>
+</collection>
+<collection id="phoneuis" name="Phone UIs" level="ui">
+<component id="bubblemanager2" filter="s60" name="Phone Bubble Manager">
+<unit bldFile="/app/phone/phoneuis/bubblemanager2" qt:proFile="bubblemanager2.pro"/>
+</component>
+<component id="telephonydevicemode" filter="s60" name="Telephony Device Mode">
+<unit bldFile="/app/phone/phoneuis/telephonydevicemode/group"/>
+</component>
+</collection>
+<collection id="phone_plat" name="Phone Apps Platform Interfaces" level="app">
+<component id="3d_ringing_tone_enabler_api" name="3D Ringing Tone Enabler API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
+</component>
+<component id="telephony_comms_information_api" name="Telephony Comms Information API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/telephony_comms_information_api/group"/>
+</component>
+<component id="telephony_information_api" name="Telephony Information API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/telephony_information_api/group"/>
+</component>
+<component id="telephony_device_mode_api" name="Telephony Device Mode API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/telephony_device_mode_api/group"/>
+</component>
+<component id="telephony_remote_party_information_api" name="Telephony Remote Party Information API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/telephony_remote_party_information_api/group"/>
+</component>
+<component id="telephony_video_mailbox_settings_api" name="Telephony Video Mailbox Settings API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/telephony_video_mailbox_settings_api/group"/>
+</component>
+<component id="telephony_microphone_mute_status_api" name="Telephony Microphone Mute Status API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/telephony_microphone_mute_status_api/group"/>
+</component>
+<component id="telephony_logging_extension_api" name="Telephony Logging Extension API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/telephony_logging_extension_api/group"/>
+</component>
+<component id="telephony_matching_extension_api" name="Telephony Matching Extension API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/telephony_matching_extension_api/group"/>
+</component>
+<component id="phone_application_commands_api" name="Phone Application Commands API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/phone_application_commands_api/group"/>
+</component>
+<component id="phone_application_voip_commands_api" name="Phone Application VOIP Commands API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/phone_application_voip_commands_api/group"/>
+</component>
+<component id="phone_telephony_mediator_api" name="Telephony Mediator API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/telephony_mediator_api/group"/>
+</component>
+<component id="video_telephony_mediator_api" name="Video Telephony Mediator API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/video_telephony_mediator_api/group"/>
+</component>
+<component id="video_telephony_control_mediator_api" name="Video Telephony Control Mediator API" class="api" filter="s60" introduced="^4">
+<unit bldFile="/app/phone/phone_plat/video_telephony_control_mediator_api/group"/>
+</component>
+</collection>
+<collection id="phoneplugins" name="Phone Plugins" level="plugin">
+<component id="csplugin" filter="s60" name="Circuit Switched Plugin" class="plugin" introduced="^4">
+<unit bldFile="/app/phone/phoneplugins/csplugin/group"/>
+</component>
+<component id="hsdialerwidgetplugin" filter="s60" name="Home Screen Dialer Widget Plugin" class="plugin" introduced="^4">
+<unit bldFile="/app/phone/phoneplugins/hsdialerwidgetplugin" qt:proFile="hsdialerwidgetplugin.pro"/>
+</component>
+<component id="infowidgetplugin" filter="s60" name="Info Widget Plugin" class="plugin" introduced="^4">
+<unit bldFile="/app/phone/phoneplugins/infowidgetplugin" qt:proFile="infowidgetplugin.pro"/>
+</component>
+</collection>
+<collection id="phonesettings" name="Phone Settings" level="plugin">
+<component id="cpphonesettingsplugins" filter="s60" name="CP Phone Settings Plugins" class="plugin" introduced="^4">
+<unit bldFile="/app/phone/phonesettings/cpphonesettingsplugins" qt:proFile="cpphonesettingsplugins.pro"/>
+</component>
+</collection>
+</package>
+<package id="recents" level="apps" tech-domain="vc" name="Recent Events" levels="engine support ui api">
+<collection id="recents_plat" name="Recent Events Platform Interfaces" level="api">
+<component id="logs_services_api" name="Logs Services API" class="api" filter="s60" introduced="^4">
+<unit base="/app/recents/recents_plat/logs_services_api"/>
+</component>
+<component id="logs_engine_api" name="Logs Engine API" class="api" filter="s60" introduced="^4">
+<unit base="/app/recents/recents_plat/logs_engine_api"/>
+</component>
+<component id="logs_timers_api" name="Logs Timers API" class="api" filter="s60">
+<unit base="/app/recents/recents_plat/logs_timers_api"/>
+</component>
+<component id="logs_engine_api_extensions" name="Logs Engine API Extensions" class="api" filter="s60">
+<unit base="/app/recents/recents_plat/logs_engine_api_extensions"/>
+</component>
+</collection>
+<collection id="logsui" name="Logs UI" level="ui">
+<component id="logsui_build" filter="s60" name="Logs UI Build">
+<!-- component at too high a rank, should move down one directory -->
+<unit bldFile="/app/recents/logsui" qt:proFile="logsui.pro"/>
+</component>
+</collection>
+</package>
+<package id="settingsuis" level="services" tech-domain="dm" name="Settings UIs" levels="plugin ui">
+<collection id="controlpanelplugins" name="Control Panel Plugins" level="plugin">
+<component id="themeplugin" filter="s60" name="Theme Plugin" introduced="^4">
+<unit bldFile="/app/settingsuis/controlpanelplugins/themeplugin" qt:proFile="themeplugin.pro" qt:qmakeArgs="-r -config rom"/>
+</component>
+</collection>
+<collection id="controlpanelui" name="Control Panel UI" level="ui">
+<!-- collection is really a component, move down a dir -->
+<component id="controlpanelui_build" filter="s60" name="Control Panel UI Build" introduced="^4">
+<unit bldFile="/app/settingsuis/controlpanelui" qt:proFile="controlpanelui.pro" qt:qmakeArgs="-r -config rom"/>
+</component>
+</collection>
+</package>
+<package id="contentcontrol" level="services" tech-domain="dm" name="Content Control Daemons" levels="plugin framework app">
+<collection id="contentctrl_plat" name="Content Control Daemons Platforn Interfaces" level="app">
+<component id="ds_contactsdatastoreextension_api" name="DS Contacts Data Store Extension API" class="api" filter="s60" introduced="^4">
+<unit bldFile="/app/contentcontrol/contentctrl_plat/ds_contactsdatastoreextension_api/group"/>
+</component>
+<component id="ds_data_modification_api" name="DS Data Modification API" class="api" filter="s60" introduced="^3">
+<unit bldFile="/app/contentcontrol/contentctrl_plat/ds_data_modification_api/group"/>
+</component>
+</collection>
+<collection id="connectivitymodules" name="Connectivity Modules" level="framework">
+<component id="secon" filter="s60" name="Service Controllers">
+<unit bldFile="/app/contentcontrol/connectivitymodules/secon/group"/>
+</component>
+</collection>
+<collection id="dsdcmoadapter" name="Data Sync DCMO Adapter" level="plugin">
+<!-- Component at wrong rank, should move down a directory -->
+<component id="dsdcmoadapter_build" filter="s60" name="Data Sync Control DCMO Adapter">
+<unit bldFile="/app/contentcontrol/dsdcmoadapter/group"/>
+</component>
+</collection>
+<collection id="omads" name="OMA Data Sync" level="app">
+<component id="omads_build" filter="s60" name="OMA DS Build">
+<unit bldFile="/app/contentcontrol/omads/group"/>
+<!-- need to remove #include and rename and OMA DS ROM -->
+</component>
+<component id="omadsextensions" filter="s60" name="OMA DS Extensions" class="plugin">
+<unit bldFile="/app/contentcontrol/omads/omadsextensions/group"/>
+</component>
+<component id="omadsextensions_qt" filter="s60" name="OMA DS Qt Extensions" class="plugin">
+<unit bldFile="/app/contentcontrol/omads/omadsextensions" qt:proFile="omadsextensions.pro"/>
+</component>
+</collection>
+</package>
+<package id="firsttimeuse" level="apps" tech-domain="dm" name="First Time Use" levels="support services ui app">
+<!-- these empty collections are really components. Move down a directory and supply units -->
+<collection id="ftuapplication" name="First Time Use Application" level="app"/>
+<collection id="fturuntimeservices" name="First Time Use Runtime Services" level="services"/>
+<collection id="wizardproviders" name="Wizard Providers" level="support"/>
+<collection id="stateproviders" name="State Providers" level="support"/>
+<collection id="runtimeproviders" name="Runtime Providers" level="support"/>
+<collection id="firsttimeuse_info" name="First Time Use Info" level="ui">
+<component id="firsttimeuse_build" name="First Time Use Build">
+<unit bldFile="/app/firsttimeuse" qt:proFile="ftu.pro" qt:qmakeArgs="-r -config rom"/>
+</component>
+</collection>
+</package>
+<package id="devicecontrol" level="services" tech-domain="dm" name="Device Control Daemons" levels="oma mid app">
+<collection id="deviceupdatesui" name="Device Updates UI" level="app">
+<component id="deviceupdatesui_adapters" name="Device Updates Adapters" filter="s60" class="plugin" introduced="^4">
+<unit bldFile="/app/devicecontrol/deviceupdatesui/adapters/bld"/>
+</component>
+<component id="deviceupdates" name="Device Updates" filter="s60" introduced="^4">
+<unit bldFile="/app/devicecontrol/deviceupdatesui/deviceupdates" qt:proFile="deviceupdates.pro"/>
+</component>
+<component id="deviceupdatesplugin" name="Device Updates Plugin" filter="s60" introduced="^4" class="plugin">
+<unit bldFile="/app/devicecontrol/deviceupdatesui/deviceupdatesplugin" qt:proFile="deviceupdatesplugin.pro"/>
+</component>
+<component id="deviceupdatesqtsp" name="Device Updates Qt Service Provider" filter="s60" introduced="^4">
+<unit bldFile="/app/devicecontrol/deviceupdatesui/deviceupdatesqtsp" qt:proFile="deviceupdatesqtsp.pro"/>
+</component>
+<component id="cpqtsp" name="Client Provisioning Qt Service Provider" filter="s60" introduced="^4">
+<unit bldFile="/app/devicecontrol/deviceupdatesui/cpqtsp" qt:proFile="cpqtsp.pro"/>
+</component>
+<component id="devicemanagementnotifiersplugin" name="Device Management Notifiers Plugin" filter="s60" introduced="^4" class="plugin">
+<unit bldFile="/app/devicecontrol/deviceupdatesui/devicemanagementnotifiersplugin" qt:proFile="devicemanagementnotifiersplugin.pro"/>
+</component>
+</collection>
+</package>
+<package id="printing" level="services" tech-domain="de" name="Printing"/>
+<package id="files" level="apps" tech-domain="pr" name="File Manager Apps" levels="support apps">
+<collection id="filemanager" name="File Manager" level="apps">
+<component id="filemanager_plat" name="File Manager Platform Interfaces" class="api" filter="s60" introduced="^4">
+<unit base="/app/files/filemanager/filemanager_plat"/>
+</component>
+<component id="fmbkupengine" filter="s60" name="File Manager Backup Engine" introduced="^4">
+<unit bldFile="/app/files/filemanager/src/fmbkupengine/group"/>
+</component>
+<component id="filemanager_build" filter="s60" name="File Manager Build">
+<!-- break this up into components or move down a directory -->
+<unit bldFile="/app/files/filemanager" qt:qmakeArgs="-r" qt:proFile="filemanager.pro"/>
+</component>
+</collection>
+</package>
+<package id="search" level="apps" tech-domain="pr" name="Search Apps" levels="eng base app api">
+<collection id="search_info" name="Search Info">
+<component id="search_build" name="Search Build" introduced="^4">
+<unit bldFile="/app/search/group"/>
+</component>
+</collection>
+<collection id="searchui" name="Search UI">
+<component id="searchui_build" name="Search UI Build" introduced="^4">
+<unit bldFile="/app/search/searchui" qt:proFile="searchui.pro"/>
+</component>
+</collection>
+</package>
+<package id="contacts" level="apps" span="2" tech-domain="pr" name="Contacts Apps" levels="engine support services ui">
+<collection id="contacts_plat" name="Contacts Apps Platform Interfaces" level="ui">
+<component id="qt_mobility_contacts_api" name="Qt Mobility Contacts API" class="api" filter="s60" introduced="^4">
+<unit base="/app/contacts/contacts_plat/qt_mobility_contacts_api"/>
+</component>
+</collection>
+<collection id="phonebookui" name="Phonebook UI" level="ui">
+<component id="mobhistorymodel" filter="s60" name="Mobile History Model" introduced="^4">
+<!--<unit bldFile="phonebookui/mobhistorymodel" qt:proFile="mobhistorymodel.pro"/> -->
+</component>
+<component id="pbkcommonui" filter="s60" name="Phonebook Common UI" introduced="^4">
+<!--<unit bldFile="phonebookui/pbkcommonui" qt:proFile="pbkcommonui.pro"/> -->
+</component>
+<component id="phonebookapp" filter="s60" name="Phonebook Application" introduced="^4">
+<!--<unit bldFile="phonebookui/phonebookapp" qt:proFile="phonebookapp.pro"/> -->
+</component>
+<component id="phonebookservices" filter="s60" name="Phonebook Services" introduced="^4">
+<!--<unit bldFile="phonebookui/phonebookservices" qt:proFile="phonebookservices.pro"/> -->
+</component>
+<component id="phonebookui_build" filter="s60" name="Phonebook UI Build" introduced="^4">
+<!-- break up into components -->
+<unit bldFile="/app/contacts/phonebookui" qt:proFile="phonebookui.pro"/>
+</component>
+</collection>
+<collection id="qtcontactsmobility" name="Qt Contacts Mobility" level="support">
+<component id="qtcontactsmobility_build" filter="s60" name="Qt Contacts Mobility Build" class="plugin" introduced="^4">
+<!-- not really a component, move down a dir? Break up into compnents? -->
+<unit bldFile="/app/contacts/qtcontactsmobility" qt:proFile="qtcontactsmobility.pro"/>
+</component>
+</collection>
+<collection id="phonebookengines" name="Phonebook Engines" level="engine">
+<component id="cntfindplugin" filter="s60" name="Contacts Find Plugin" class="plugin" introduced="^2">
+<unit bldFile="/app/contacts/phonebookengines/cntfindplugin" qt:proFile="cntfindplugin.pro"/>
+</component>
+<component id="contactsmodel" name="Contacts Model" introduced="ER5" purpose="optional">
+<unit version="2" bldFile="/app/contacts/phonebookengines/contactsmodel/groupsql" mrp="/app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp"/>
+</component>
+<component id="cntsortplugin" filter="s60" name="Contacts Sort Plugin" class="plugin" introduced="^2">
+<unit bldFile="/app/contacts/phonebookengines/cntsortplugin" qt:proFile="cntsortplugin.pro"/>
+</component>
+<component id="mobcntmodel" filter="s60" name="Mobile Contacts Model" introduced="^4">
+<unit bldFile="/app/contacts/phonebookengines/mobcntmodel" qt:proFile="mobcntmodel.pro"/>
+</component>
+<component id="mobcntactions" filter="s60" name="Mobile Contacts Actions" introduced="^4">
+<unit bldFile="/app/contacts/phonebookengines/mobcntactions" qt:proFile="mobcntactions.pro"/>
+</component>
+<component id="cntmaptileservice" filter="s60" name="Contacts Map Tile Service" introduced="^4">
+<unit bldFile="/app/contacts/phonebookengines/cntmaptileservice" qt:proFile="cntmaptileservice.pro"/>
+</component>
+<component id="simutility" filter="s60" name="SIM Utility" introduced="^4">
+<unit bldFile="/app/contacts/phonebookengines/simutility" qt:proFile="simutility.pro"/>
+</component>
+<component id="cntimageutility" name="Contacts Image Utility" filter="s60" introduced="^4">
+<unit bldFile="/app/contacts/phonebookengines/cntimageutility" qt:proFile="cntimageutility.pro"/>
+</component>
+</collection>
+<collection id="pimprotocols" name="PIM Protocols" level="services">
+<component id="phonebooksync" name="Phonebook Sync" purpose="optional" class="plugin">
+<unit bldFile="/app/contacts/pimprotocols/phonebooksync/group" mrp="/app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
+</component>
+<component id="pbap" name="Bluetooth PBAP" introduced="9.2" purpose="optional">
+<unit bldFile="/app/contacts/pimprotocols/pbap/group" mrp="/app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
+</component>
+</collection>
+<collection id="contacts_info" name="Contacts Apps Info" level="ui">
+<component id="contacts_metadata" name="Contacts Apps Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="organizer" level="apps" span="2" tech-domain="pr" name="Organizer Application Suite" levels="support services engine ui app">
+<collection id="organizer_pub" name="Organizer Application Suite Public Interfaces" level="app">
+<component id="calendar_interim_utils2_api" name="Calendar Interim Utils 2 API" class="api" filter="s60">
+<!-- move into own .pro file -->
+<unit bldFile="/app/organizer/organizer_pub" qt:proFile="organizer_pub.pro"/>
+</component>
+</collection>
+<collection id="organizer_plat" name="Organizer Application Suite Platform Interfaces" level="app">
+<component id="organizer_plat_build" name="Organizer Application Suite Platform Interface Build" class="api" filter="s60">
+<!-- break up into individual .pro files -->
+<unit bldFile="/app/organizer/organizer_plat" qt:proFile="organizer_plat.pro"/>
+</component>
+<component id="agenda_versit_2_api" name="Agenda Versit 2 API" class="api" filter="s60">
+<!-- <unit bldFile="organizer_plat/agenda_versit_2_api/group"/>-->
+</component>
+<component id="calendar_exporter_api" name="Calendar Exporter API" class="api" filter="s60">
+<!--<unit bldFile="organizer_plat/calendar_exporter_api/group"/>-->
+</component>
+<component id="calendar_importer_api" name="Calendar Importer API" class="api" filter="s60">
+<!--<unit bldFile="organizer_plat/calendar_importer_api/group"/>-->
+</component>
+<component id="calendar_launcher_api" name="Calendar Launcher API" class="api" filter="s60">
+<!--<unit bldFile="organizer_plat/calendar_launcher_api/group"/> -->
+</component>
+<component id="agenda_interface_api" name="Agenda Interface API" class="api" filter="s60" introduced="^4">
+<unit base="/app/organizer/organizer_plat/agenda_interface_api"/>
+</component>
+<component id="calendar_editor_api" name="Calendar Editor API" class="api" filter="s60" introduced="^4">
+<unit base="/app/organizer/organizer_plat/calendar_editor_api"/>
+</component>
+<component id="notes_editor_api" name="Notes Editor API" class="api" filter="s60" introduced="^4">
+<unit base="/app/organizer/organizer_plat/notes_editor_api"/>
+</component>
+</collection>
+<collection id="agendainterface" name="Agenda Interface" level="services">
+<!-- collection is really a component, should move down a directory -->
+<component id="agendainterface_build" filter="s60" name="Agenda Interface Build">
+<unit bldFile="/app/organizer/agendainterface" qt:proFile="agendainterface.pro"/>
+</component>
+</collection>
+<collection id="calendarui" name="Calendar UI" level="ui">
+<component id="commonutils" filter="s60" name="Calendar Common Utils">
+<unit bldFile="/app/organizer/calendarui/commonutils" qt:proFile="commonutils.pro"/>
+</component>
+<component id="calenlauncher" filter="s60" name="Calendar Launcher">
+<unit bldFile="/app/organizer/calendarui/calenlauncher" qt:proFile="calenlauncher.pro"/>
+</component>
+<component id="caleneditor" filter="s60" name="Calendar Editor" introduced="^4">
+<unit bldFile="/app/organizer/calendarui/caleneditor" qt:proFile="caleneditor.pro"/>
+</component>
+<component id="agendaeventviewer" filter="s60" name="Agenda Event Viewer" introduced="^4">
+<unit bldFile="/app/organizer/calendarui/agendaeventviewer" qt:proFile="agendaeventviewer.pro"/>
+</component>
+<component id="globaldata" filter="s60" name="Calendar Global Data">
+<unit bldFile="/app/organizer/calendarui/globaldata" qt:proFile="globaldata.pro"/>
+</component>
+<component id="settings" filter="s60" name="Calendar Settings">
+<unit bldFile="/app/organizer/calendarui/settings" qt:proFile="settings.pro"/>
+</component>
+<component id="calenplugins" filter="s60" name="Calendar Plugins" introduced="^4" class="plugin">
+<unit bldFile="/app/organizer/calendarui/calenplugins" qt:proFile="calenplugins.pro"/>
+</component>
+<component id="customisationmanager" filter="s60" name="Calendar Customisation Manager">
+<unit bldFile="/app/organizer/calendarui/customisationmanager" qt:proFile="customisationmanager.pro"/>
+</component>
+<component id="views" filter="s60" name="Calendar Views">
+<unit bldFile="/app/organizer/calendarui/views" qt:proFile="views.pro"/>
+</component>
+<component id="calendarui_controller" filter="s60" name="Calendar Controller">
+<unit bldFile="/app/organizer/calendarui/controller" qt:proFile="controller.pro"/>
+</component>
+<component id="calendarui_application" filter="s60" name="Calendar Application">
+<unit bldFile="/app/organizer/calendarui/application" qt:proFile="application.pro"/>
+</component>
+<component id="regionalplugins" name="Regional Plugins" filter="s60" introduced="^4" class="plugin">
+<unit bldFile="/app/organizer/calendarui/regionalplugins" qt:proFile="regionalplugins.pro"/>
+</component>
+<component id="caldav" filter="sf_build" name="CalDAV" class="plugin" introduced="^3">
+<!-- not yet delivered in S^4 <unit bldFile="calendarui/caldav/group"/>-->
+</component>
+</collection>
+<collection id="notes" name="Notes" level="ui">
+<component id="noteseditor" filter="s60" name="Notes Editor" introduced="^4">
+<unit bldFile="/app/organizer/notes/notesui/noteseditor" qt:proFile="noteseditor.pro"/>
+</component>
+<component id="notes_build" filter="s60" name="Notes Build" introduced="^4">
+<unit bldFile="/app/organizer/notes" qt:proFile="notes.pro"/>
+</component>
+</collection>
+<collection id="calendarengines" name="Calendar Engines" level="engine">
+<component id="versit2" filter="s60" name="Versit 2 iCal Parser" introduced="9.2">
+<unit bldFile="/app/organizer/calendarengines/versit2/group"/>
+</component>
+<component id="agnversit2" filter="s60" name="Versit 2 Agenda Interface" class="plugin" introduced="9.2">
+<unit bldFile="/app/organizer/calendarengines/agnversit2/group"/>
+</component>
+<component id="caleninterimutils" filter="s60" name="Calendar Interim Utils" introduced="9.1">
+<unit bldFile="/app/organizer/calendarengines/caleninterimutils/group"/>
+</component>
+<component id="calenimp" filter="s60" name="Calendar Import Wrapper" introduced="7.0s">
+<unit bldFile="/app/organizer/calendarengines/calenimp/group"/>
+</component>
+<component id="caldavsrv" filter="sf_build" name="CalDAV Server" introduced="^3">
+<!-- Not yet delivered in S^4 <unit bldFile="calendarengines/caldav/group"/> -->
+</component>
+</collection>
+<collection id="clock" name="Clock" level="app">
+<!-- uncomment unit when block_build is split up-->
+<component id="clockengines" filter="s60" name="Clock Engines">
+<!--<unit bldFile="clock/clockengines" qt:proFile="clockengines.pro"/> -->
+</component>
+<component id="clockmw" filter="s60" name="Clock Middleware" introduced="^4">
+<!--<unit bldFile="clock/clockmw" qt:proFile="clockmw.pro"/>-->
+</component>
+<component id="clockui" filter="s60" name="Clock UI">
+<!--<unit bldFile="clock/clockui" qt:proFile="clockui.pro"/>-->
+</component>
+<component id="ftudatetimewizard" filter="s60" name="First Time Use Date/Time Wizard" introduced="^4">
+<!--<unit bldFile="clock/ftudatetimewizard" qt:proFile="ftudatetimewizard.pro"/>-->
+</component>
+<component id="clock_build" filter="s60" name="Clock Build">
+<!-- make exports into a component, or just move to one of the above components, then remove this and uncomment the above -->
+<unit bldFile="/app/organizer/clock" qt:proFile="clock.pro"/>
+</component>
+</collection>
+<collection id="pimappservices" name="PIM Application Services" level="services">
+<component id="calendar" name="Calendar" introduced="9.2" purpose="optional">
+<unit version="2" bldFile="/app/organizer/pimappservices/calendar/group" mrp="/app/organizer/pimappservices/calendar/group/app-engines_calendar.mrp"/>
+</component>
+<component id="calendarvcalplugin" name="Calendar vCal Plugin" introduced="8.1" purpose="optional" class="plugin">
+<unit version="2" bldFile="/app/organizer/pimappservices/calendarvcalplugin/group" mrp="/app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp"/>
+</component>
+<component id="appenginesdocs" name="Application Engines Documentation" purpose="development" class="doc">
+<unit mrp="/app/organizer/pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
+</component>
+</collection>
+<collection id="pimappsupport" name="PIM Application Support" level="support">
+<component id="vcardandvcal" name="vCard and vCal" introduced="ER5" purpose="optional">
+<unit bldFile="/app/organizer/pimappsupport/vcardandvcal/group" mrp="/app/organizer/pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
+</component>
+<component id="chinesecalendarconverter" name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
+<unit bldFile="/app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="/app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
+</component>
+<component id="chinesecalendaralg" name="Chinese Calendar Algorithm" introduced="^2" purpose="optional" class="plugin">
+<unit bldFile="/app/organizer/pimappsupport/chinesecalendaralg/group" mrp="/app/organizer/pimappsupport/chinesecalendaralg/group/app-services_chinesecalendaralgorithm.mrp"/>
+</component>
+</collection>
+<collection id="alarmui" name="Alarm UI" level="app">
+<!-- collection is really a component, should move down a directory -->
+<component id="alarmui_build" filter="s60" name="Alarm UI Build">
+<unit bldFile="/app/organizer/alarmui" qt:proFile="alarmui.pro"/>
+</component>
+</collection>
+<collection id="organizer_info" name="Organizer Application Suite Info" level="app">
+<component id="organizer_metadata" name="Organizer Application Suite Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="messaging" level="apps" span="2" tech-domain="pr" name="Messaging Apps" levels="plugin eng base app api">
+<collection id="msg_plat" name="Messaging Apps Platform APIs" level="api">
+<component id="messaging_media_resolver_api" name="Messaging Media Resolver API" class="api" filter="s60">
+<unit base="/app/messaging/msg_plat/messaging_media_resolver_api"/>
+</component>
+<component id="mms_application_api" name="MMS Application API" class="api" filter="s60">
+<unit base="/app/messaging/msg_plat/mms_application_api"/>
+</component>
+<component id="mms_codec_client_api" name="MMS Codec Client API" class="api" filter="s60">
+<unit base="/app/messaging/msg_plat/mms_codec_client_api"/>
+</component>
+<component id="mms_conformance_api" name="MMS Conformance API" class="api" filter="s60">
+<unit base="/app/messaging/msg_plat/mms_conformance_api"/>
+</component>
+<component id="mms_engine_settings_api" name="MMS Engine Settings API" class="api" filter="s60">
+<unit base="/app/messaging/msg_plat/mms_engine_settings_api"/>
+</component>
+<component id="mms_server_settings_api" name="MMS Server Settings API" class="api" filter="s60">
+<unit base="/app/messaging/msg_plat/mms_server_settings_api"/>
+</component>
+<component id="conversation_services_client_api" name="Conversation Services Client API" class="api" filter="s60" introduced="^4">
+<unit base="/app/messaging/msg_plat/conversation_services_client_api"/>
+</component>
+<component id="conversation_services_plugin_api" name="Conversation Services Plugin API" class="api" filter="s60" introduced="^4">
+<unit base="/app/messaging/msg_plat/conversation_services_plugin_api"/>
+</component>
+<component id="conversation_services_utilities_api" name="Conversation Services Utilities API" class="api" filter="s60" introduced="^4">
+<unit base="/app/messaging/msg_plat/conversation_services_utilities_api"/>
+</component>
+<component id="shareui_api" name="Share UI API" class="api" filter="s60" introduced="^4">
+<unit base="/app/messaging/msg_plat/shareui_api"/>
+</component>
+<component id="messaging_history_api" name="Messaging History API" class="api" filter="s60" introduced="^4">
+<unit base="/app/messaging/msg_plat/messaging_history_api"/>
+</component>
+<component id="msg_plat_build" name="Messaging Apps Platform APIs Build" class="api" filter="s60" introduced="^4">
+<!-- break this up into the above units and replace their base attributes with bldFile, etc -->
+<unit base="/app/messaging/msg_plat" qt:proFile="msg_plat.pro" qt:qmakeArgs="-r"/>
+</component>
+</collection>
+<collection id="msg_pub" name="Messaging Apps Public APIs" level="api">
+<component id="mms_client_mtm_api" name="MMS Client MTM API" class="api" filter="s60">
+<unit base="/app/messaging/msg_pub/mms_client_mtm_api"/>
+</component>
+<component id="msg_smil_dtd_api" name="Messaging SMIL DTD API" class="api" filter="s60" introduced="^4">
+<unit base="/app/messaging/msg_pub/msg_smil_dtd_api"/>
+</component>
+<component id="msg_pub_build" name="Messaging Apps Public APIs Build" class="api" filter="s60" introduced="^4">
+<!-- break this up into the above units and replace their base attributes with bldFile, etc -->
+<unit base="/app/messaging/msg_pub" qt:proFile="msg_pub.pro" qt:qmakeArgs="-r"/>
+</component>
+</collection>
+<collection id="mobilemessaging" name="Mobile Messaging" level="plugin">
+<component id="smsmtm" name="SMS MTM" purpose="optional" class="plugin">
+<unit bldFile="/app/messaging/mobilemessaging/smsmtm/group" mrp="/app/messaging/mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
+</component>
+</collection>
+<collection id="messagingappbase" name="Messaging App Base" level="base">
+<component id="messagingappbase_build" filter="s60" name="Messaging App Base Build" introduced="^4">
+<!-- break this up into the below components -->
+<unit bldFile="/app/messaging/messagingappbase" qt:proFile="messagingappbase.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="msgmedia" filter="s60" name="Message Media">
+<unit base="/app/messaging/messagingappbase/msgmedia"/>
+</component>
+<component id="smilparser" name="SMIL Parser" introduced="7.0s" purpose="optional">
+<unit bldFile="/app/messaging/messagingappbase/smilparser/GROUP" mrp="/app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
+</component>
+<component id="obexmtms" name="OBEX MTMs" introduced="7.0s" purpose="optional" class="plugin">
+<unit bldFile="/app/messaging/messagingappbase/obexmtms/Group" mrp="/app/messaging/messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
+</component>
+</collection>
+<collection id="mmsengine" name="MMS Engine" level="eng">
+<component id="mmsconninit" filter="s60" name="MMS Connection Initiator">
+<!-- <unit bldFile="mmsengine/mmsconninit/bld"/> -->
+</component>
+<component id="genutils" filter="s60" name="General Utils">
+<!-- <unit bldFile="mmsengine/genutils/bld"/> -->
+</component>
+<component id="mmsserversettings" filter="s60" name="MMS Server Settings">
+<!-- <unit bldFile="mmsengine/mmsserversettings/bld"/> -->
+</component>
+<component id="mmsmessage" filter="s60" name="MMS Message">
+<!-- <unit bldFile="mmsengine/mmsmessage/bld"/> -->
+</component>
+<component id="mmshttptransport" filter="s60" name="MMS HTTP Transport">
+<!-- <unit bldFile="mmsengine/mmshttptransport/bld"/> -->
+</component>
+<component id="mmscodec" filter="s60" name="MMS Codec">
+<!-- <unit bldFile="mmsengine/mmscodec/bld"/> -->
+</component>
+<component id="mmsserver" filter="s60" name="MMS Server">
+<!-- <unit bldFile="mmsengine/mmsserver/bld"/> -->
+</component>
+<component id="clientmtm" filter="s60" name="MMS Client MTM" class="plugin">
+<!-- <unit bldFile="mmsengine/clientmtm/bld"/> -->
+</component>
+<component id="mmswatcher" filter="s60" name="MMS Watcher" class="plugin">
+<!-- <unit bldFile="mmsengine/mmswatcher/bld"/> -->
+</component>
+<component id="mmspushhandler" filter="s60" name="MMS Push Handler" class="plugin">
+<!-- <unit bldFile="mmsengine/mmspushhandler/bld"/> -->
+</component>
+<component id="applicationadapter" filter="s60" name="MMS Application Adapter">
+<!-- <unit bldFile="mmsengine/applicationadapter/bld"/> -->
+</component>
+<component id="mmscodecclient" filter="s60" name="MMS Codec Client">
+<!-- <unit bldFile="mmsengine/mmscodecclient/bld"/> -->
+</component>
+<component id="mmssettings" name="MMS Settings" introduced="9.2" purpose="optional">
+<unit bldFile="/app/messaging/mmsengine/mmssettings/group" mrp="/app/messaging/mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
+</component>
+<component id="mmsconf" name="MMS Configuration" purpose="optional">
+<unit bldFile="/app/messaging/mmsengine/mmsconf" mrp="/app/messaging/mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
+</component>
+<component id="mmsengine_build" filter="s60" name="MMS Engine Build">
+<!-- this should be broken up into the individual other components -->
+<unit bldFile="/app/messaging/mmsengine" qt:proFile="mmsengine.pro" qt:qmakeArgs="-r"/>
+</component>
+</collection>
+<collection id="messagingapp" name="Messaging Application" level="app">
+<component id="messagingapp_build" filter="s60" name="MMS Engine Build">
+<!-- this should be broken up into the individual other components -->
+<unit bldFile="/app/messaging/messagingapp" qt:proFile="messagingapp.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="msgutils" filter="s60" name="Messaging Utils" introduced="^4">
+<unit bldFile="/app/messaging/messagingapp/msgutils" qt:proFile="msgutils.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="msgappfw" filter="s60" name="Messaging Application Framework" introduced="^4">
+<unit bldFile="/app/messaging/messagingapp/msgappfw" qt:proFile="msgappfw.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="msgsettings" filter="s60" name="Messaging Settings" introduced="^4">
+<unit bldFile="/app/messaging/messagingapp/msgsettings" qt:proFile="msgsettings.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="msgnotifications" filter="s60" name="Messaging Notifications" introduced="^4">
+<unit bldFile="/app/messaging/messagingapp/msgnotifications" qt:proFile="msgnotifications.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="smartmessaging" filter="s60" name="Smart Messaging">
+<unit bldFile="/app/messaging/messagingapp/smartmessaging" qt:proFile="smartmessaging.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="shareui" filter="s60" name="Shared UI" introduced="^4">
+<unit bldFile="/app/messaging/messagingapp/shareui" qt:proFile="shareui.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="msgui" filter="s60" name="Messaging UI" introduced="^4">
+<unit bldFile="/app/messaging/messagingapp/msgui" qt:proFile="msgui.pro" qt:qmakeArgs="-r"/>
+</component>
+</collection>
+<collection id="email" name="Email" level="plugin">
+<!-- use commonemail instead -->
+<component id="pop3andsmtpmtm" name="POP3 and SMTP MTM" purpose="optional" class="plugin" deprecated="^3">
+<unit bldFile="/app/messaging/email/pop3andsmtpmtm/group" mrp="/app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
+</component>
+<component id="imap4mtm" name="IMAP4 MTM" introduced="9.2" purpose="optional" class="plugin" deprecated="^3">
+<unit bldFile="/app/messaging/email/imap4mtm/group" mrp="/app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
+</component>
+</collection>
+<collection id="messaging_info" name="Messaging Apps Info" level="api">
+<component id="messaging_metadata" name="Messaging Apps Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="commonemail" level="apps" span="2" tech-domain="pr" name="Email Apps" levels="service support ui app">
+<!-- need to resolve the qt parts into proper components, then uncomment the units -->
+<collection id="email_plat" name="Email Apps Platform Interfaces" level="app">
+<component id="nmail_client_api" name="NMail Client API" class="api" filter="s60" introduced="^4">
+<!--<unit bldFile="email_plat" qt:proFile="email_plat.pro"/> -->
+</component>
+</collection>
+<collection id="emailservices" name="Email Services" level="service">
+<component id="nmailbase" filter="s60" name="NMail Base" introduced="^4">
+<!-- <unit bldFile="emailservices/nmailbase" qt:proFile="nmailbase.pro"/> -->
+</component>
+<component id="emailcommon" filter="s60" name="Email Common" introduced="^4">
+<!-- <unit bldFile="emailservices/emailcommon" qt:proFile="emailcommon.pro"/>-->
+</component>
+<component id="emailframework" filter="s60" name="Email Framework" introduced="^2">
+<!-- <unit bldFile="emailservices/emailframework" qt:proFile="emailframework.pro"/>-->
+</component>
+<component id="emailstore" filter="s60" name="Email Store" introduced="^2">
+<!-- <unit bldFile="emailservices/emailstore" qt:proFile="emailstore.pro"/>-->
+</component>
+<component id="nmclientapi" filter="s60" name="Nmail Client API" introduced="^4">
+<!-- <unit bldFile="emailservices/nmclientapi" qt:proFile="nmclientapi.pro"/>-->
+</component>
+<component id="nmailagent" filter="s60" name="Nmail Agent" introduced="^4">
+<!-- <unit bldFile="emailservices/nmailagent" qt:proFile="nmailagent.pro"/>-->
+</component>
+</collection>
+<collection id="ipsservices" name="IMAP/POP/SMTP Services" level="service">
+<component id="ipssosplugin" filter="s60" name="IPS SOS Plugin" class="plugin" introduced="^2">
+<!-- SOS? Consider spelling it out since the abbreviation is ambiguous -->
+<!--<unit bldFile="ipsservices/ipssosplugin" qt:proFile="ipssosplugin.pro" />-->
+</component>
+<component id="nmimapclientplugin" filter="s60" name="NM IMAP Client Plugin" introduced="^4" class="plugin">
+<!--<unit bldFile="ipsservices/nmimapclientplugin" qt:proFile="nmimapclientplugin.pro"/>-->
+</component>
+<component id="nmipsmtms" filter="s60" name="NM IPS Client Plugin" introduced="^4" class="plugin">
+<!-- <unit bldFile="ipsservices/nmipsmtms" qt:proFile="nmipsmtms.pro"/>-->
+</component>
+<component id="nmipssettings" filter="s60" name="NM IPS Settings" introduced="^4">
+<!-- <unit bldFile="ipsservices/nmipssettings" qt:proFile="nmipssettings.pro"/>-->
+</component>
+<component id="ipsservices_build" filter="s60" name="IPS Services Build" introduced="^2">
+<!--<unit bldFile="ipsservices" qt:proFile="ipsservices.pro"/> -->
+<!-- can the exports be broken up into the other components or made a config component?-->
+</component>
+</collection>
+<collection id="emailuis" name="Email UIs" level="app">
+<component id="nmailuiengine" filter="s60" name="Nmail UI Engine" introduced="^4">
+<!-- <unit bldFile="emailuis/nmailuiengine" qt:proFile="nmailuiengine.pro"/> -->
+</component>
+<component id="nmailuiwidgets" filter="s60" name="Nmail UI Widgets" introduced="^4">
+<!-- <unit bldFile="emailuis/nmailuiwidgets" qt:proFile="nmailuiwidgets.pro"/> -->
+</component>
+<component id="nmailuiwidgetsplugin" filter="s60" name="Nmail UI Widgets Plugin" introduced="^4" class="plugin">
+<!-- <unit bldFile="emailuis/nmailuiwidgetsplugin" qt:proFile="nmailuiwidgetsplugin.pro"/> -->
+</component>
+<component id="nmsettingui" filter="s60" name="Nmail Setting UI" introduced="^4" class="plugin">
+<!-- <unit bldFile="emailuis/nmsettingui" qt:proFile="nmsettingui.pro"/> -->
+</component>
+<component id="nmailcpplugin" filter="s60" name="Nmail CP Plugin" introduced="^4" class="plugin">
+<!-- <unit bldFile="emailuis/nmailcpplugin" qt:proFile="nmailcpplugin.pro"/> -->
+</component>
+<component id="nmailui" filter="s60" name="Nmail UI" introduced="^4">
+<!-- <unit bldFile="emailuis/nmailui" qt:proFile="nmailui.pro"/> -->
+</component>
+<component id="nmindicatorplugin" filter="s60" name="Nmail Indicator Plugin" class="plugin" introduced="^4">
+<!-- <unit bldFile="emailuis/nmindicatorplugin" qt:proFile="nmindicatorplugin.pro"/> -->
+</component>
+<component id="nmframeworkadapter" filter="s60" name="Nmail Framework Adapter" introduced="^4" class="plugin">
+<!-- <unit bldFile="emailuis/nmframeworkadapter" qt:proFile="nmframeworkadapter.pro"/> -->
+</component>
+
+</collection>
+<collection id="commonemail_info" name="Email Apps Info" level="app">
+<component id="commonemail_build" name="Email Apps Build" introduced="^4">
+<!-- split into actual components -->
+<unit bldFile="/app/commonemail" qt:proFile="nmail.pro" qt:qmakeArgs="-r"/>
+</component>
+</collection>
+</package>
+<package id="camera" level="apps" tech-domain="ma" name="Camera Apps">
+<collection id="camerauis" name="Camera UIs">
+<component id="cameraxui" filter="s60" name="CameraX UIs">
+<meta rel="testbuild">
+<group name="camera_unit_tests"/>
+</meta>
+<unit bldFile="/app/camera/camerauis/cameraxui" qt:proFile="camerax.pro" filter="!test"/>
+
+</component>
+</collection>
+</package>
+<!-- <package id="imgeditor" level="apps" tech-domain="ma" href="../../../../app/imgeditor/package_definition.xml"/> -->
+<!-- <package id="videoeditor" level="apps" tech-domain="ma" href="../../../../app/videoeditor/package_definition.xml"/> -->
+<package id="videoplayer" level="apps" tech-domain="ma" name="Video Player Apps" levels="support plugin util apps">
+<collection id="videoplayer_plat" name="Video Player Apps Platform Interfaces" level="apps">
+<component id="videoplayer_startup_api" name="Video Player Startup API" class="api" filter="s60">
+<unit bldFile="/app/videoplayer/videoplayer_plat/videoplayer_startup_api/group"/>
+</component>
+<component id="videocollection_api" name="Video Collection API" class="api" filter="s60">
+<unit bldFile="/app/videoplayer/videoplayer_plat/videocollection_api/group"/>
+</component>
+</collection>
+<collection id="videocollection" name="Video Collection" level="util">
+<component id="mpxmyvideoscollection" filter="s60" name="MPX My Videos Collection" introduced="^3">
+<unit bldFile="/app/videoplayer/videocollection/mpxmyvideoscollection/group"/>
+</component>
+<component id="videocollectionwrapper" filter="s60" name="Video Collection Wrapper" introduced="^4">
+<unit bldFile="/app/videoplayer/videocollection/videocollectionwrapper" qt:proFile="videocollectionwrapper.pro" qt:qmakeArgs="-r"/>
+</component>
+
+<component id="videocollectionview" filter="s60" name="Video Collection View" introduced="^4">
+<unit bldFile="/app/videoplayer/videocollection/videocollectionview" qt:proFile="videocollectionview.pro" qt:qmakeArgs="-r"/>
+</component>
+
+<component id="videofiledetailsview" filter="s60" name="Video File Details View" introduced="^4">
+<unit bldFile="/app/videoplayer/videocollection/videofiledetailsview" qt:proFile="videofiledetailsview.pro" qt:qmakeArgs="-r"/>
+</component>
+</collection>
+<collection id="mediasettings" name="Media Settings" level="support">
+<!-- this is really a component. Should be moved down a directory -->
+<component id="mediasettings_build" filter="s60" name="Media Settings Build">
+<unit bldFile="/app/videoplayer/mediasettings/group"/>
+</component>
+</collection>
+<collection id="videoplayerapp" name="Video Player App" level="apps">
+<component id="videoplayerengine" name="Video Player Engine" filter="s60" introduced="^4">
+<unit bldFile="/app/videoplayer/videoplayerapp/videoplayerengine" qt:proFile="videoplayerengine.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="hbvideoplayer" filter="s60" name="HB Video Player" introduced="^4">
+<unit bldFile="/app/videoplayer/videoplayerapp/hbvideoplayer" qt:proFile="hbvideoplayer.pro" qt:qmakeArgs="-r"/>
+</component>
+</collection>
+<collection id="videoplayback" name="Video Playback Plugins" level="plugin">
+<component id="hbvideoplaybackview" filter="s60" name="HB Video Playback View" class="plugin" introduced="^4">
+<unit bldFile="/app/videoplayer/videoplayback/hbvideoplaybackview" qt:proFile="hbvideoplaybackview.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="hbvideoplaybackviewplugin" filter="s60" name="HB Video Playback View Plugin" introduced="^4" class="plugin">
+<unit bldFile="/app/videoplayer/videoplayback/hbvideoplaybackviewplugin" qt:proFile="hbvideoplaybackviewplugin.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="videohelix" name="Video Helix" filter="s60" introduced="^3" class="plugin">
+<unit bldFile="/app/videoplayer/videoplayback/videohelix/group"/>
+</component>
+</collection>
+</package>
+<package id="photos" level="apps" tech-domain="ma" name="Photos" levels="util support ui app">
+<collection id="photos_group" name="Photos Group" level="support">
+<component id="photos_group_build" filter="s60" name="Photos Group Build" introduced="^4">
+<!--<unit bldFile="group" qt:proFile="group.pro"/> -->
+</component>
+</collection>
+<collection id="photos_loggers" name="Photos Loggers" level="util">
+<component id="photos_loggerqt" filter="s60" name="Photos Logger Qt" introduced="^4">
+<!--<unit bldFile="loggers/loggerqt" qt:proFile="loggerqt.pro"/> -->
+</component>
+</collection>
+<collection id="photos_commonutilities" name="Photos Common Utilities" level="util">
+<component id="photos_externalutility" filter="s60" name="Photos External Utility" introduced="^4">
+<!--<unit bldFile="commonutilities/externalutility" qt:proFile="externalutility.pro"/> -->
+</component>
+<component id="imagedecoderwrapper" filter="s60" name="Image Decoder Wrapper" introduced="^4">
+<!--<unit bldFile="commonutilities/imagedecoderwrapper" qt:proFile="imagedecoderwrapper.pro"/> -->
+</component>
+</collection>
+<collection id="photos_ui" name="Photos UI" level="ui">
+<component id="photos_uiengine" filter="s60" name="Photos UI Engine" introduced="^4">
+<!--<unit bldFile="ui/uiengine" qt:proFile="uiengine.pro"/> -->
+</component>
+<component id="photos_commandhandlers" filter="s60" name="Photos Command Handlers" introduced="^4">
+<!--<unit bldFile="ui/commandhandlers" qt:proFile="commandhandlers.pro"/> -->
+</component>
+<component id="photos_views" filter="s60" name="Photos Views" introduced="^4">
+<!--<unit bldFile="ui/views" qt:proFile="views.pro"/> -->
+</component>
+<component id="photos_viewmanagement" filter="s60" name="Photos View Management" introduced="^4">
+<!--<unit bldFile="ui/viewmanagement" qt:proFile="viewmanagement.pro"/> -->
+</component>
+</collection>
+<collection id="photos_main" name="Photos Main" level="support">
+<component id="photos_main_build" filter="s60" name="Photos Main Build" introduced="^4">
+<!--<unit bldFile="main" qt:proFile="main.pro"/> -->
+</component>
+</collection>
+<collection id="imageviewerapp" name="Image Viewer App" level="support">
+<component id="imageviewerapp_build" filter="s60" name="Image Viewer App Build" introduced="^4">
+<!--<unit bldFile="imageviewerapp" qt:proFile="imageviewerapp.pro"/> -->
+</component>
+</collection>
+<collection id="photos_info" name="Photos Info" level="support">
+<component id="photos_build" filter="s60" name="Photos Build" introduced="^4">
+<!-- split this up into the above components -->
+<unit bldFile="/app/photos" qt:proFile="photos.pro"/>
+</component>
+</collection>
+</package>
+<package id="musicplayer" level="apps" tech-domain="ma" name="Music Player Apps" levels="plugins support hs app">
+<!-- move the export .pri files into their components and uncomment the units -->
+<collection id="musicplayer_utilities " name="Music Player Utilities" level="support">
+<component id="mpnowplayingbanner" filter="s60" name="MP Now Playing Banner" introduced="^4">
+<!-- <unit bldFile="utilities/mpnowplayingbanner" qt:proFile="mpnowplayingbanner.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+<component id="mpsettingsmanager" filter="s60" name="MP Settings Manager" introduced="^4">
+<!-- <unit bldFile="utilities/mpsettingsmanager" qt:proFile="mpsettingsmanager.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+</collection>
+<collection id="musicfetcher " name="Music Fetcher" level="support">
+<!-- collection is really a component, move down a directory -->
+<component id="musicfetcher_buld" filter="s60" name="Music Fetcher Build" introduced="^4">
+<!-- <unit bldFile="musicfetcher" qt:proFile="musicfetcher.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+</collection>
+<collection id="musicplayer_app " name="Music Player Application" level="app">
+<!-- collection is really a component, move down a directory -->
+<component id="musicplayer_app_build" filter="s60" name="Music Player Application Build" introduced="^4">
+<!-- <unit bldFile="app" qt:proFile="app.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+</collection>
+<collection id="mpviewplugins " name="Music Player View Plugins" level="plugins">
+<component id="mpcollectionviewplugin" filter="s60" name="MP Collection View Plugin" introduced="^4" class="plugin">
+<!--<unit bldFile="mpviewplugins/mpcollectionviewplugin/group"/>-->
+</component>
+<component id="mpplaybackviewplugin" filter="s60" name="MP Playback View Plugin" introduced="^4" class="plugin">
+<!--<unit bldFile="mpviewplugins/mpplaybackviewplugin/group"/>-->
+</component>
+</collection>
+<collection id="mpserviceplugins" name="Music Player Service Plugins" level="plugins">
+<component id="audioeffects" filter="s60" name="Audio Effects" introduced="^4" class="plugin">
+<!--<unit bldFile="mpserviceplugins/audioeffects/group"/>-->
+</component>
+<component id="localaudio" filter="s60" name="Local Audio" introduced="^4" class="plugin">
+<!--<unit bldFile="mpserviceplugins/localaudio/group"/>-->
+</component>
+<!-- Note: it's called SQLite, not SQLLite, just the one "L" -->
+<component id="mpxsqlitedbcommon" filter="s60" name="MPX SQLite Database Common" introduced="^4">
+<!--<unit bldFile="mpserviceplugins/mpxsqlitedbcommon/group"/>-->
+</component>
+<component id="mpxsqlitedbplugin" filter="s60" name="MPX SQLite Database Plugin" introduced="^4" class="plugin">
+<!--<unit bldFile="mpserviceplugins/mpxsqlitedbplugin/group"/>-->
+</component>
+<component id="mpxsqlitepodcastdbplugin" filter="s60" name="MPX SQLlite Podcast Database Plugin" introduced="^4" class="plugin">
+<!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
+</component>
+<component id="m3uplaylistplugin" filter="s60" name="M3U Playlist Plugin" introduced="^4" class="plugin">
+<!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
+</component>
+</collection>
+<collection id="musicplayer_info" name="Music Player Apps Info" level="app">
+<component id="musicplayer_build" filter="s60" name="Music Player Build">
+<!-- should brak up into individual components -->
+<unit bldFile="/app/musicplayer" qt:proFile="qtmusicplayer.pro" qt:qmakeArgs="-r -config rom"/>
+</component>
+</collection>
+</package>
+<package id="radio" level="apps" tech-domain="ma" name="Radio Apps" levels="engine ui">
+<collection id="radioengine" name="Radio Engine" level="engine">
+<component id="radioengineutils" filter="s60" name="Radio Engine Utils" introduced="^4">
+<unit bldFile="/app/radio/radioengine/utils/group"/>
+</component>
+<component id="radioenginesettings" filter="s60" name="Radio Engine Settings" introduced="^4">
+<unit bldFile="/app/radio/radioengine/settings/group"/>
+</component>
+<component id="radioengine_engine" filter="s60" name="Radio Engine" introduced="^4">
+<unit bldFile="/app/radio/radioengine/engine/group"/>
+</component>
+</collection>
+<collection id="radioapp" name="Radio App" level="ui">
+<component id="radioenginewrapper" filter="s60" name="Radio Engine Wrapper" introduced="^4">
+<unit bldFile="/app/radio/radioapp/radioenginewrapper" qt:proFile="radioenginewrapper.pro"/>
+</component>
+<component id="radiopresetstorage" filter="s60" name="Radio Preset Storage" introduced="^4">
+<unit bldFile="/app/radio/radioapp/radiopresetstorage" qt:proFile="radiopresetstorage.pro"/>
+</component>
+<component id="radiouiengine" filter="s60" name="Radio UI Engine" introduced="^4">
+<unit bldFile="/app/radio/radioapp/radiouiengine" qt:proFile="radiouiengine.pro"/>
+</component>
+<component id="radiowidgets" filter="s60" name="Radio Widgets" introduced="^4">
+<unit bldFile="/app/radio/radioapp/radiowidgets" qt:proFile="radiowidgets.pro"/>
+</component>
+<component id="radioapplication" filter="s60" name="Radio Application" introduced="^4">
+<unit bldFile="/app/radio/radioapp/radioapplication" qt:proFile="radioapplication.pro"/>
+</component>
+<component id="radio_rom" filter="s60" name="Radio ROM" introduced="^4">
+<unit bldFile="/app/radio/rom"/>
+</component>
+</collection>
+</package>
+<package id="internetradio" level="apps" tech-domain="ma" name="Internet Radio Apps" levels="engine server ui">
+<collection id="internetradio2_0" name="Internet Radio 2.0" level="ui">
+<!-- collection is really a component. Move down a dir -->
+<component id="internetradio2_0_build" name="Internet Radio 2.0 Build">
+<unit bldFile="/app/internetradio/internetradio2.0/group"/>
+</component>
+</collection>
+<collection id="presetserver" name="Preset Server" level="server">
+<!-- collection is really a component. Move down a dir -->
+<component id="presetserver_build" name="Preset Server Build">
+<unit bldFile="/app/internetradio/presetserver/group"/>
+</component>
+</collection>
+<collection id="qtinternetradio" name="Qt Internet Radio">
+<component id="qtinternetradio_build" name="Qt Internet Radio Build">
+<!-- Move down a dir or break into components-->
+<unit bldFile="/app/internetradio/qtinternetradio" qt:proFile="all.pro" qt:qmakeArgs="-r -config rom"/>
+</component>
+
+</collection>
+</package>
+<package id="podcatcher" level="apps" tech-domain="ma" name="Podcatcher" levels="app">
+<collection id="podcatcher_info" name="Podcatcher" level="app">
+<component id="podcatcher_build" filter="sf_build" name="Podcatcher Build" introduced="^3">
+<!-- has exports from top level bld.inf -->
+<unit bldFile="/app/podcatcher/group"/>
+</component>
+<component id="podcatcher_app" filter="sf_build" name="Podcatcher Application" introduced="^3">
+<unit bldFile="/app/podcatcher/application/group"/>
+</component>
+<component id="podcatcher_engine" filter="sf_build" name="Podcatcher Engine" introduced="^3">
+<unit bldFile="/app/podcatcher/engine/group"/>
+</component>
+</collection>
+</package>
+<package id="homescreen" level="apps" tech-domain="ui" name="Home Screen Apps" levels="support task ss hs">
+<collection id="homescreen_info" name="Home Screen Info" level="support">
+<component id="homescreen_build" name="Homescreen Build">
+<!-- break this up properly into components -->
+<unit bldFile="/app/homescreen" qt:proFile="homescreen.pro" qt:qmakeArgs="-r -config rom"/>
+</component>
+</collection>
+<collection id="homescreen_test" name="Home Screen Test" level="support">
+
+</collection>
+<!-- fiill in details with broken up homescreen_build -->
+<collection id="homescreenapp" name="Home Screen Application" level="hs">
+<component id="hsutils" name="Home Screen Utils" introduced="^4"/>
+<component id="hsdomainmodel" name="HS Domain Model" introduced="^4"/>
+<component id="hs_runtimeplugins" name="HS Runtime Plugins" introduced="^4" class="plugin"/>
+<component id="hs_serviceproviders" name="HS Service Providers" introduced="^4" class="plugin"/>
+<component id="hs_stateplugins" name="HS State Plugins" introduced="^4" class="plugin"/>
+<component id="hs_widgetplugins" name="HS Widget Plugins" introduced="^4" class="plugin"/>
+<component id="hsapplication" name="Home Screen Application" introduced="^4"/>
+<component id="hshomescreenclientplugin" name="Home Screen Client Plugin" introduced="^4" class="plugin"/>
+<component id="hsmenucontentpublish" name="HS Menu Content Publish" introduced="^4"/>
+</collection>
+<collection id="screensaverapp" name="Screen Saver Application" level="ss">
+<component id="snsrutils" name="Screen Saver Utils" introduced="^4"/>
+<component id="snsr_serviceproviders" name="Screen Saver Service Providers" introduced="^4" class="plugin"/>
+<component id="snsr_stateproviders" name="Screen Saver State Providers" introduced="^4" class="plugin"/>
+<component id="snsr_runtimeproviders" name="Screen Saver Runtime Providers" introduced="^4" class="plugin"/>
+<component id="snsrapplication" name="Screen Saver Application" introduced="^4"/>
+<component id="screensaverproviders" name="Screen Saver Providers" introduced="^4" class="plugin"/>
+</collection>
+<collection id="taskswitcherapp" name="Task Switcher Application" level="task">
+<component id="taskswitcherappecom" name="Task Switcher Application ECom" introduced="^4"/>
+<component id="tsserviceplugin" name="Task Switcher Service Plugin" introduced="^4" class="plugin"/>
+<component id="ts_runtimeplugins" name="TS Runtime Plugins" introduced="^4" class="plugin"/>
+<component id="tsapplication" name="Task Switcher Application" introduced="^4"/>
+</collection>
+</package>
+<package id="jrt" level="services" tech-domain="rt" name="Java Runtime" levels="util generic rt ui">
+<collection id="jrt_plat" name="JRT Platform Interfaces" level="ui">
+<component id="java_registry_api" name="Java Registry API" class="api" filter="s60">
+<unit bldFile="/app/jrt/jrt_plat/java_registry_api/build"/>
+</component>
+<component id="java_env_info_api" name="Java Environment Info API" class="api" filter="s60">
+<unit bldFile="/app/jrt/jrt_plat/java_env_info_api/build"/>
+</component>
+<component id="java_debug_api" name="Java Debug API" class="api" filter="s60">
+<unit bldFile="/app/jrt/jrt_plat/java_debug_api/build"/>
+</component>
+</collection>
+<collection id="build_nativejava" name="Build Native Java">
+<component id="nativejava" name="Build Native Java" filter="s60" introduced="^4">
+<unit bldFile="/app/jrt/build/nativejava" qt:proFile="nativejava.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+<unit bldFile="/app/jrt/build/nativejava" qt:proFile="nativejava.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+</component>
+</collection>
+<collection id="javacommons" name="Java Commons" level="generic">
+<component id="javacommons_build" filter="s60" name="JRT Build">
+<unit bldFile="/app/jrt/javacommons" qt:proFile="javacommons.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+<unit bldFile="/app/jrt/javacommons" qt:proFile="javacommons.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+</component>
+</collection>
+<collection id="javaruntimes" name="Java Runtimes" level="rt">
+<component id="javaruntimes_build" filter="s60" name="JRT Build">
+<unit bldFile="/app/jrt/javaruntimes" qt:proFile="javaruntimes.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+<unit bldFile="/app/jrt/javaruntimes" qt:proFile="javaruntimes.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+</component>
+</collection>
+<collection id="javauis" name="Java UIs" level="ui">
+<component id="javauis_build" filter="s60" name="JRT Build">
+<unit bldFile="/app/jrt/javauis" qt:proFile="javauis.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+<unit bldFile="/app/jrt/javauis" qt:proFile="javauis.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+</component>
+</collection>
+<collection id="javamanager" level="generic">
+<component id="javamanager_build" filter="s60" name="JRT Build">
+<unit bldFile="/app/jrt/javamanager" qt:proFile="javamanager.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+<unit bldFile="/app/jrt/javamanager" qt:proFile="javamanager.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+</component>
+</collection>
+<collection id="javatools" name="Java Tools" level="util">
+<component id="javatools_build" filter="s60" name="JRT Build">
+<unit bldFile="/app/jrt/javatools" qt:proFile="javatools.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+<unit bldFile="/app/jrt/javatools" qt:proFile="javatools.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+</component>
+</collection>
+<collection id="javaextensions" name="Java Extensions" level="generic">
+<component id="javaextensions_build" filter="s60" name="JRT Build">
+<unit bldFile="/app/jrt/javaextensions" qt:proFile="javaextensions.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+<unit bldFile="/app/jrt/javaextensions" qt:proFile="javaextensions.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+</component>
+</collection>
+</package>
+<package id="browserui" level="services" tech-domain="rt" name="Browser UI" levels="utils support ui">
+<collection id="browserui_info" name="Browser UI Info" level="ui">
+<component id="browserui_build" name="Bookmarks Engine Build" introduced="^4">
+<unit bldFile="/app/browserui" qt:proFile="browserui.pro" qt:qmakeArgs=""what+=plat_101""/>
+</component>
+</collection>
+</package>
+<package id="conntools" level="services" tech-domain="dc" name="Connectivity Tools" levels="config app">
+<collection id="nettools" name="Net Tools" level="app">
+<component id="conntest" filter="s60" name="Connection Test" purpose="development">
+<unit bldFile="/app/conntools/nettools/conntest/group"/>
+</component>
+</collection>
+<collection id="emulatorlan" name="Emulator LAN" level="config">
+<!-- component is actually a colleciton, should be moved down a directory -->
+<component id="emulatorlan_build" filter="s60" name="Emulator LAN Build" class="config" purpose="development">
+<unit bldFile="/app/conntools/emulatorlan/group"/>
+</component>
+</collection>
+</package>
+<package id="rndtools" level="services" tech-domain="to" name="R&D tools" levels="support generic test util">
+<collection id="creator" name="Creator" level="support">
+<!-- collection is really a component. Should move down a directory -->
+<component id="creator_build" filter="s60" name="Creator Tool" purpose="development" target="device" class="tool">
+<unit bldFile="/app/rndtools/creator" qt:qmakeArgs="-r" qt:proFile="creator.pro"/>
+</component>
+</collection>
+<collection id="filebrowser" name="File Browser" level="util">
+<!-- consider collapsing into a single component -->
+<component id="fileopserver" filter="s60" name="File Operations Server" purpose="development" target="device" class="tool">
+<meta rel="config">
+<not-defined condition="FILEBROWSER_LITE"/>
+</meta>
+<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
+<!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
+</component>
+<component id="fileopclient" filter="s60" name="File Operations Client" purpose="development" target="device" class="tool">
+<meta rel="config">
+<not-defined condition="FILEBROWSER_LITE"/>
+</meta>
+<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
+<!--<unit bldFile="filebrowser/fileopclient/group"/>-->
+</component>
+<component id="filebrowser_build" filter="s60" name="File Browser Application" purpose="development" target="device" class="tool">
+<!-- Need to make this a self-contained component by removing #includes. Can only do when configuration is in place-->
+<unit bldFile="/app/rndtools/filebrowser/group"/>
+</component>
+</collection>
+<collection id="launcher" name="Launcher" level="util">
+<!-- collection is really a component. Should move down a directory -->
+<component id="launcher_build" filter="s60" name="Launcher Utility" purpose="development" target="device" class="tool">
+<unit bldFile="/app/rndtools/launcher/group"/>
+</component>
+</collection>
+<collection id="loadgen" name="Load Generator" level="test">
+<!-- collection is really a component. Should move down a directory -->
+<component id="loadgen_build" filter="s60" name="Load Generator Application" purpose="development" target="device" class="tool">
+<unit bldFile="/app/rndtools/loadgen/group"/>
+</component>
+</collection>
+<collection id="perfmon" name="Performance Monitor" level="test">
+<!-- collection is really a component. Should move down a directory -->
+<component id="perfmon_build" filter="s60" name="Performance Monitor Tool" purpose="development" target="device" class="tool">
+<unit bldFile="/app/rndtools/perfmon" qt:proFile="perfmon.pro"/>
+</component>
+</collection>
+<collection id="screengrabber" name="Screen Grabber" level="util">
+<!-- collection is really a component. Should move down a directory -->
+<component id="screengrabber_build" filter="s60" name="ScreenGrabber" purpose="development" target="device" class="tool">
+<unit bldFile="/app/rndtools/screengrabber" qt:proFile="screengrabber.pro"/>
+</component>
+</collection>
+<collection id="stifui" name="STIF UI" level="generic">
+<component id="stifui_avkon" filter="s60" name="STIF UI for Avkon" purpose="development" target="device">
+<unit bldFile="/app/rndtools/stifui/akvon/group"/>
+</component>
+</collection>
+<collection id="htiui" name="Harmonized Test Interface UI" level="generic">
+<component id="HtiServicePlugins" filter="s60" name="HTI Service Plugins" purpose="development" target="device" class="plugin">
+<!-- can only have a single unit. Should #include from a common bld.inf file -->
+<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
+<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
+<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
+<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
+<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
+<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
+<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
+<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiFtpBackupFake/group"/>
+</component>
+<component id="htidevicereboot" filter="s60" name="HTI Device Reboot" purpose="development" target="device">
+<unit bldFile="/app/rndtools/htiui/htidevicereboot/group"/>
+</component>
+<component id="htistartupwait" filter="s60" name="HTI Startup Wait" purpose="development" target="device">
+<unit bldFile="/app/rndtools/htiui/htistartupwait/group"/>
+</component>
+<component id="htiadmin" filter="s60" name="HTI Admin" purpose="development" target="device">
+<unit bldFile="/app/rndtools/htiui/htiadmin/group"/>
+</component>
+</collection>
+</package>
+<package id="helps" level="apps" span="2" tech-domain="ui" name="Help Apps" levels="eng tools if ui">
+<collection id="userguide" name="User Guide" level="if">
+<!-- collection is really a component. Move down a directory -->
+<component id="userguide_build" name="User Guide Build" filter="s60" introduced="^4">
+<unit bldFile="/app/helps/userguide" qt:proFile="Userguide.pro"/>
+</component>
+</collection>
+<collection id="symhelp" name="Symbian Help" level="eng">
+<component id="helpmodel" name="Help" introduced="6.0" purpose="optional">
+<unit bldFile="/app/helps/symhelp/helpmodel/group" mrp="/app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
+</component>
+</collection>
+<collection id="helps_info" name="Help Apps Info" level="ui">
+<component id="helps_metadata" name="Help Apps Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/app/helps/helps_info/helps_metadata/helps_metadata.mrp"/>
+</component>
+</collection>
+</package>
+<package id="techview" level="apps" span="2" tech-domain="ui" name="Techview" levels="services ui utils apps1 apps2 apps3">
+<collection id="buildverification" name="Build Verification" level="services">
+<component id="autosmoketest" name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
+<unit bldFile="/app/techview/buildverification/autosmoketest/Group" mrp="/app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
+</component>
+<component id="smoketest" name="Smoke Test" filter="gt" purpose="development">
+<unit bldFile="/app/techview/buildverification/smoketest/Group" mrp="/app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
+</component>
+</collection>
+<collection id="techviewplat" name="Techview Platform" level="services">
+
+
+
+</collection>
+<collection id="techviewui" name="Techview UI" level="ui">
+
+
+
+
+</collection>
+<collection id="tv_controlpanel" name="Control Panel" level="ui">
+
+
+
+
+</collection>
+<collection id="pimapps" name="PIM Apps" level="apps3">
+
+
+
+</collection>
+<collection id="securityapps" name="Security Apps" level="apps3">
+
+
+</collection>
+<collection id="utilityapps" name="Utility Apps" level="apps2">
+
+
+
+</collection>
+<collection id="installationapps" name="Installation Apps" level="apps2">
+
+</collection>
+<collection id="messagingapps" name="Messaging Apps" level="apps2">
+
+</collection>
+<collection id="telephonyapps" name="Telephony Apps" level="apps1">
+
+</collection>
+<collection id="networkingapps" name="Networking Apps" level="apps1">
+
+
+
+</collection>
+<collection id="networkingutils" name="Networking Utils" level="utils">
+
+
+</collection>
+<collection id="shortlinkapps" name="Shortlink Apps" level="apps1">
+
+
+
+</collection>
+<collection id="testapps" name="Test Apps" level="utils">
+
+
+
+
+
+</collection>
+<collection id="avapps" name="A/V Apps" level="apps3">
+
+</collection>
+<collection id="toolkit" name="Toolkit" level="utils">
+
+
+
+</collection>
+<collection id="techview_info" name="Techview Info" level="apps3">
+<component id="techview_metadata" name="Techview Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+<unit mrp="/app/techview/techview_info/techview_metadata/techview_metadata.mrp"/>
+</component>
+</collection>
+</package>
+</layer>
+</systemModel>
+</SystemDefinition>